From 41013b2febb92f429e2063500f9af4b8b0afe17f Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 10 Oct 2015 03:12:48 -0700 Subject: [PATCH] update for modified assembler --- asm/dma3_manager.s | 202 +- asm/emerald.s | 271660 +++++++++++++++++++-------------------- asm/gpu_bg.s | 1386 +- asm/gpu_obj.s | 1134 +- asm/gpu_reg_manager.s | 154 +- asm/libagbbackup.s | 56 +- asm/libagbsyscall.s | 49 +- asm/libgcc.s | 164 +- asm/libmks4agb.s | 226 +- asm/librfu.s | 302 +- asm/macros.s | 4 +- asm/main.s | 218 +- asm/malloc.s | 150 +- asm/pixel_buffer.s | 198 +- asm/task.s | 174 +- asm/text_renderer.s | 1730 +- asm/unknown_lib_1.s | 64 +- asm/unknown_lib_2.s | 32 +- asm/window.s | 746 +- data/data1.s | 2 +- data/data2.s | 86 +- data/pokedex_order.s | 6 +- 22 files changed, 139371 insertions(+), 139372 deletions(-) diff --git a/asm/dma3_manager.s b/asm/dma3_manager.s index e75e70179..ceda19826 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, =0x03000810 movs r0, 0x1 @@ -11,14 +11,14 @@ ClearDma3Requests: @ 8000BB8 movs r3, 0 ldr r0, =0x03000010 movs r1, 0x7F -_08000BCC: +@loop: strh r3, [r0, 0x8] str r3, [r0] str r3, [r0, 0x4] adds r0, 0x10 subs r1, 0x1 cmp r1, 0 - bge _08000BCC + bge @loop movs r0, 0 strb r0, [r2] pop {r0} @@ -28,8 +28,8 @@ _08000BCC: 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 @@ -39,9 +39,9 @@ ProcessDma3Requests: @ 8000BF0 ldr r0, =0x03000810 ldrb r0, [r0] cmp r0, 0 - beq _08000C06 - b _08000E46 -_08000C06: + beq @08000C06 + b @08000E46 +@08000C06: movs r0, 0 str r0, [sp, 0x8] ldr r1, =0x03000010 @@ -52,9 +52,9 @@ _08000C06: ldrh r0, [r0, 0x8] mov r12, r2 cmp r0, 0 - bne _08000C1E - b _08000E46 -_08000C1E: + bne @08000C1E + b @08000E46 +@08000C1E: mov r8, r1 adds r1, 0x4 mov r10, r1 @@ -63,7 +63,7 @@ _08000C1E: ldr r7, =0x040000d4 movs r2, 0 mov r9, r2 -_08000C2E: +@08000C2E: mov r3, r12 ldrb r0, [r3] lsls r5, r0, 4 @@ -79,48 +79,48 @@ _08000C2E: lsls r0, 8 ldr r3, [sp, 0x8] cmp r3, r0 - bls _08000C50 - b _08000E46 -_08000C50: + bls @08000C50 + b @08000E46 +@08000C50: ldr r0, =0x04000006 ldrb r0, [r0] cmp r0, 0xE0 - bls _08000C5A - b _08000E46 -_08000C5A: + bls @08000C5A + b @08000E46 +@08000C5A: ldrh r0, [r1, 0xA] cmp r0, 0x2 - beq _08000CD0 + beq @08000CD0 cmp r0, 0x2 - bgt _08000C80 + bgt @08000C80 cmp r0, 0x1 - beq _08000C8C - b _08000DF0 + beq @08000C8C + b @08000DF0 .align 2, 0 .pool -_08000C80: +@08000C80: cmp r0, 0x3 - beq _08000D3C + beq @08000D3C cmp r0, 0x4 - bne _08000C8A - b _08000D88 -_08000C8A: - b _08000DF0 -_08000C8C: + bne @08000C8A + b @08000D88 +@08000C8A: + b @08000DF0 +@08000C8C: ldr r3, [r1] mov r2, r10 adds r0, r5, r2 ldr r2, [r0] ldrh r1, [r1, 0x8] cmp r1, r6 - bhi _08000CA6 + bhi @08000CA6 str r3, [r7] str r2, [r7, 0x4] lsrs r0, r1, 2 movs r1, 0x84 lsls r1, 24 - b _08000DAA -_08000CA6: + b @08000DAA +@08000CA6: ldr r4, =0x040000d4 str r3, [r4] str r2, [r4, 0x4] @@ -131,22 +131,22 @@ _08000CA6: adds r2, r6 subs r1, r6 cmp r1, r6 - bhi _08000CA6 + bhi @08000CA6 str r3, [r4] str r2, [r4, 0x4] lsrs r0, r1, 2 movs r1, 0x84 lsls r1, 24 - b _08000D76 + b @08000D76 .align 2, 0 .pool -_08000CD0: +@08000CD0: mov r3, r10 adds r0, r5, r3 ldr r4, [r0] ldrh r1, [r1, 0x8] cmp r1, r6 - bhi _08000CF4 + bhi @08000CF4 mov r0, r8 adds r0, 0xC adds r0, r5, r0 @@ -158,8 +158,8 @@ _08000CD0: lsrs r0, r1, 2 movs r1, 0x85 lsls r1, 24 - b _08000DAA -_08000CF4: + b @08000DAA +@08000CF4: mov r2, r12 ldrb r0, [r2] lsls r0, 4 @@ -178,7 +178,7 @@ _08000CF4: adds r4, r6 subs r1, r6 cmp r1, r6 - bhi _08000CF4 + bhi @08000CF4 ldrb r0, [r2] lsls r0, 4 adds r0, r5 @@ -190,24 +190,24 @@ _08000CF4: lsrs r0, r1, 2 movs r1, 0x85 lsls r1, 24 - b _08000DEA + b @08000DEA .align 2, 0 .pool -_08000D3C: +@08000D3C: ldr r3, [r1] mov r2, r10 adds r0, r5, r2 ldr r2, [r0] ldrh r1, [r1, 0x8] cmp r1, r6 - bhi _08000D56 + bhi @08000D56 str r3, [r7] str r2, [r7, 0x4] lsrs r0, r1, 1 movs r1, 0x80 lsls r1, 24 - b _08000DAA -_08000D56: + b @08000DAA +@08000D56: ldr r4, =0x040000d4 str r3, [r4] str r2, [r4, 0x4] @@ -218,27 +218,27 @@ _08000D56: adds r2, r6 subs r1, r6 cmp r1, r6 - bhi _08000D56 + bhi @08000D56 str r3, [r4] str r2, [r4, 0x4] lsrs r0, r1, 1 movs r1, 0x80 lsls r1, 24 -_08000D76: +@08000D76: orrs r0, r1 str r0, [r4, 0x8] ldr r0, [r4, 0x8] - b _08000DF0 + b @08000DF0 .align 2, 0 .pool -_08000D88: +@08000D88: mov r3, r10 adds r0, r5, r3 ldr r2, [r0] ldrh r4, [r1, 0x8] add r1, sp, 0x4 cmp r4, r6 - bhi _08000DB2 + bhi @08000DB2 mov r0, r8 adds r0, 0xC adds r0, r5, r0 @@ -249,12 +249,12 @@ _08000D88: lsrs r0, r4, 1 movs r1, 0x81 lsls r1, 24 -_08000DAA: +@08000DAA: orrs r0, r1 str r0, [r7, 0x8] ldr r0, [r7, 0x8] - b _08000DF0 -_08000DB2: + b @08000DF0 +@08000DB2: mov r5, r12 ldrb r0, [r5] lsls r0, 4 @@ -271,7 +271,7 @@ _08000DB2: adds r2, r6 subs r4, r6 cmp r4, r6 - bhi _08000DB2 + bhi @08000DB2 ldrb r0, [r5] lsls r0, 4 ldr r5, =0x0300001c @@ -283,11 +283,11 @@ _08000DB2: lsrs r0, r4, 1 movs r1, 0x81 lsls r1, 24 -_08000DEA: +@08000DEA: orrs r0, r1 str r0, [r3, 0x8] ldr r0, [r3, 0x8] -_08000DF0: +@08000DF0: ldr r1, =0x03000010 mov r3, r12 ldrb r0, [r3] @@ -320,9 +320,9 @@ _08000DF0: strb r0, [r3] lsls r0, 24 cmp r0, 0 - bge _08000E34 + bge @08000E34 strb r4, [r3] -_08000E34: +@08000E34: mov r2, r12 ldrb r0, [r2] lsls r0, 4 @@ -330,9 +330,9 @@ _08000E34: adds r0, r3 ldrh r0, [r0, 0x8] cmp r0, 0 - beq _08000E46 - b _08000C2E -_08000E46: + beq @08000E46 + b @08000C2E +@08000E46: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -346,8 +346,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 @@ -370,11 +370,11 @@ RequestDma3Copy: @ 8000E68 mov r9, r6 lsls r0, r2, 4 adds r1, r0, r6 -_08000E94: +@08000E94: lsls r3, r2, 4 ldrh r0, [r1, 0x8] cmp r0, 0 - bne _08000ED4 + bne @08000ED4 mov r0, r12 str r0, [r1] mov r0, r9 @@ -384,40 +384,40 @@ _08000E94: str r3, [r0] strh r7, [r1, 0x8] cmp r4, 0x1 - bne _08000EC0 + bne @08000EC0 strh r4, [r1, 0xA] - b _08000EC4 + b @08000EC4 .align 2, 0 .pool -_08000EC0: +@08000EC0: movs r0, 0x3 strh r0, [r1, 0xA] -_08000EC4: +@08000EC4: movs r0, 0 ldr r1, =0x03000810 strb r0, [r1] lsls r0, r2, 16 asrs r0, 16 - b _08000EF0 + b @08000EF0 .align 2, 0 .pool -_08000ED4: +@08000ED4: adds r1, 0x10 adds r2, 0x1 cmp r2, 0x7F - ble _08000EE0 + ble @08000EE0 adds r1, r6, 0 movs r2, 0 -_08000EE0: +@08000EE0: adds r5, 0x1 cmp r5, 0x7F - ble _08000E94 + ble @08000E94 movs r0, 0 mov r3, r10 strb r0, [r3] movs r0, 0x1 negs r0, r0 -_08000EF0: +@08000EF0: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -428,8 +428,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 @@ -454,11 +454,11 @@ RequestDma3Fill: @ 8000F00 lsls r0, r2, 4 adds r0, 0x8 adds r1, r0, r4 -_08000F30: +@loop: lsls r3, r2, 4 ldrh r0, [r1] cmp r0, 0 - bne _08000F78 + bne @08000F78 adds r0, r4, 0x4 adds r0, r3, r0 mov r6, r8 @@ -471,41 +471,41 @@ _08000F30: mov r3, r9 str r3, [r0] cmp r5, 0x1 - bne _08000F64 + bne @08000F64 movs r0, 0x2 - b _08000F66 + b @08000F66 .align 2, 0 .pool -_08000F64: +@08000F64: movs r0, 0x4 -_08000F66: +@08000F66: strh r0, [r1, 0x2] movs r0, 0 ldr r6, =0x03000810 strb r0, [r6] lsls r0, r2, 16 asrs r0, 16 - b _08000F96 + b @08000F96 .align 2, 0 .pool -_08000F78: +@08000F78: adds r1, 0x10 adds r2, 0x1 cmp r2, 0x7F - ble _08000F86 + ble @08000F86 mov r1, r12 adds r1, 0x8 movs r2, 0 -_08000F86: +@08000F86: adds r6, 0x1 cmp r6, 0x7F - ble _08000F30 + ble @loop movs r0, 0 mov r1, r10 strb r0, [r1] movs r0, 0x1 negs r0, r0 -_08000F96: +@08000F96: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -516,8 +516,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 @@ -525,32 +525,32 @@ CheckForSpaceForDma3Request: @ 8000FA4 movs r3, 0x1 negs r3, r3 cmp r1, r3 - bne _08000FCC + bne @08000FCC ldr r1, =0x03000010 -_08000FB6: +@08000FB6: ldrh r0, [r1, 0x8] cmp r0, 0 - bne _08000FD8 + bne @08000FD8 adds r1, 0x10 adds r2, 0x1 cmp r2, 0x7F - ble _08000FB6 -_08000FC4: + ble @08000FB6 +@08000FC4: movs r0, 0 - b _08000FDC + b @08000FDC .align 2, 0 .pool -_08000FCC: +@08000FCC: ldr r0, =0x03000010 lsls r1, 4 adds r1, r0 ldrh r0, [r1, 0x8] cmp r0, 0 - beq _08000FC4 -_08000FD8: + beq @08000FC4 +@08000FD8: movs r0, 0x1 negs r0, r0 -_08000FDC: +@08000FDC: pop {r1} bx r1 .align 2, 0 diff --git a/asm/emerald.s b/asm/emerald.s index 105868f98..176258ddc 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -25,12 +25,12 @@ Start: .include "asm/gpu_obj.s" thumb_func_start strcpy_limit_10_chars -strcpy_limit_10_chars: @ 8008B10 +strcpy_limit_10_chars: ; 8008B10 push {r4,r5,lr} adds r4, r0, 0 movs r5, 0xA movs r3, 0 -_08008B18: +@08008B18: adds r2, r4, r3 adds r0, r1, r3 ldrb r0, [r0] @@ -38,59 +38,59 @@ _08008B18: lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _08008B2C + bne @08008B2C adds r0, r2, 0 - b _08008B3C -_08008B2C: + b @08008B3C +@08008B2C: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, r5 - bcc _08008B18 + bcc @08008B18 adds r0, r4, r3 movs r1, 0xFF strb r1, [r0] -_08008B3C: +@08008B3C: pop {r4,r5} pop {r1} bx r1 thumb_func_end strcpy_limit_10_chars thumb_func_start get_end_of_string_ptr_limit_10_chars -get_end_of_string_ptr_limit_10_chars: @ 8008B44 +get_end_of_string_ptr_limit_10_chars: ; 8008B44 push {r4,lr} adds r3, r0, 0 movs r4, 0xA movs r2, 0 -_08008B4C: +@08008B4C: adds r1, r3, r2 ldrb r0, [r1] cmp r0, 0xFF - bne _08008B58 + bne @08008B58 adds r0, r1, 0 - b _08008B68 -_08008B58: + b @08008B68 +@08008B58: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, r4 - bcc _08008B4C + bcc @08008B4C adds r0, r3, r2 movs r1, 0xFF strb r1, [r0] -_08008B68: +@08008B68: pop {r4} pop {r1} bx r1 thumb_func_end get_end_of_string_ptr_limit_10_chars thumb_func_start strcpy_limit_7_chars -strcpy_limit_7_chars: @ 8008B70 +strcpy_limit_7_chars: ; 8008B70 push {r4,r5,lr} adds r4, r0, 0 movs r5, 0x7 movs r3, 0 -_08008B78: +@08008B78: adds r2, r4, r3 adds r0, r1, r3 ldrb r0, [r0] @@ -98,36 +98,36 @@ _08008B78: lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _08008B8C + bne @08008B8C adds r0, r2, 0 - b _08008B98 -_08008B8C: + b @08008B98 +@08008B8C: adds r3, 0x1 cmp r3, r5 - blt _08008B78 + blt @08008B78 adds r0, r4, r3 movs r1, 0xFF strb r1, [r0] -_08008B98: +@08008B98: pop {r4,r5} pop {r1} bx r1 thumb_func_end strcpy_limit_7_chars thumb_func_start gf_strcpy -gf_strcpy: @ 8008BA0 +gf_strcpy: ; 8008BA0 push {lr} adds r3, r0, 0 - b _08008BAC -_08008BA6: + b @08008BAC +@08008BA6: strb r2, [r3] adds r3, 0x1 adds r1, 0x1 -_08008BAC: +@08008BAC: ldrb r2, [r1] adds r0, r2, 0 cmp r0, 0xFF - bne _08008BA6 + bne @08008BA6 movs r0, 0xFF strb r0, [r3] adds r0, r3, 0 @@ -136,16 +136,16 @@ _08008BAC: thumb_func_end gf_strcpy thumb_func_start gf_strcat -gf_strcat: @ 8008BC0 +gf_strcat: ; 8008BC0 push {lr} adds r2, r0, 0 - b _08008BC8 -_08008BC6: + b @08008BC8 +@08008BC6: adds r2, 0x1 -_08008BC8: +@08008BC8: ldrb r0, [r2] cmp r0, 0xFF - bne _08008BC6 + bne @08008BC6 adds r0, r2, 0 bl gf_strcpy pop {r1} @@ -153,7 +153,7 @@ _08008BC8: thumb_func_end gf_strcat thumb_func_start gf_strncpy -gf_strncpy: @ 8008BD8 +gf_strncpy: ; 8008BD8 push {r4-r6,lr} adds r4, r0, 0 adds r6, r1, 0 @@ -162,9 +162,9 @@ gf_strncpy: @ 8008BD8 movs r3, 0 adds r0, r5, 0 cmp r3, r0 - bcs _08008BFE + bcs @08008BFE adds r2, r0, 0 -_08008BEC: +@08008BEC: adds r1, r4, r3 adds r0, r6, r3 ldrb r0, [r0] @@ -173,8 +173,8 @@ _08008BEC: lsls r0, 16 lsrs r3, r0, 16 cmp r3, r2 - bcc _08008BEC -_08008BFE: + bcc @08008BEC +@08008BFE: adds r0, r4, r5 pop {r4-r6} pop {r1} @@ -182,18 +182,18 @@ _08008BFE: thumb_func_end gf_strncpy thumb_func_start sub_8008C08 -sub_8008C08: @ 8008C08 +sub_8008C08: ; 8008C08 push {lr} adds r3, r0, 0 lsls r2, 24 lsrs r2, 24 - b _08008C14 -_08008C12: + b @08008C14 +@08008C12: adds r3, 0x1 -_08008C14: +@08008C14: ldrb r0, [r3] cmp r0, 0xFF - bne _08008C12 + bne @08008C12 adds r0, r3, 0 bl gf_strncpy pop {r1} @@ -201,115 +201,115 @@ _08008C14: thumb_func_end sub_8008C08 thumb_func_start sub_8008C24 -sub_8008C24: @ 8008C24 +sub_8008C24: ; 8008C24 push {lr} adds r2, r0, 0 movs r1, 0 ldrb r0, [r2] cmp r0, 0xFF - beq _08008C3E -_08008C30: + beq @08008C3E +@08008C30: adds r0, r1, 0x1 lsls r0, 16 lsrs r1, r0, 16 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0xFF - bne _08008C30 -_08008C3E: + bne @08008C30 +@08008C3E: adds r0, r1, 0 pop {r1} bx r1 thumb_func_end sub_8008C24 thumb_func_start sub_8008C44 -sub_8008C44: @ 8008C44 +sub_8008C44: ; 8008C44 push {lr} adds r2, r0, 0 - b _08008C56 -_08008C4A: + b @08008C56 +@08008C4A: cmp r0, 0xFF - bne _08008C52 + bne @08008C52 movs r0, 0 - b _08008C64 -_08008C52: + b @08008C64 +@08008C52: adds r2, 0x1 adds r1, 0x1 -_08008C56: +@08008C56: ldrb r0, [r2] ldrb r3, [r1] cmp r0, r3 - beq _08008C4A + beq @08008C4A ldrb r0, [r2] ldrb r1, [r1] subs r0, r1 -_08008C64: +@08008C64: pop {r1} bx r1 thumb_func_end sub_8008C44 thumb_func_start sub_8008C68 -sub_8008C68: @ 8008C68 +sub_8008C68: ; 8008C68 push {r4,lr} adds r3, r0, 0 - b _08008C80 -_08008C6E: + b @08008C80 +@08008C6E: cmp r0, 0xFF - beq _08008C7C + beq @08008C7C adds r3, 0x1 adds r1, 0x1 subs r2, 0x1 cmp r2, 0 - bne _08008C80 -_08008C7C: + bne @08008C80 +@08008C7C: movs r0, 0 - b _08008C8E -_08008C80: + b @08008C8E +@08008C80: ldrb r0, [r3] ldrb r4, [r1] cmp r0, r4 - beq _08008C6E + beq @08008C6E ldrb r0, [r3] ldrb r1, [r1] subs r0, r1 -_08008C8E: +@08008C8E: pop {r4} pop {r1} bx r1 thumb_func_end sub_8008C68 thumb_func_start sub_8008C94 -sub_8008C94: @ 8008C94 +sub_8008C94: ; 8008C94 push {lr} adds r3, r0, 0 movs r2, 0 cmp r2, r1 - bge _08008CB8 -_08008C9E: + bge @08008CB8 +@08008C9E: adds r0, r3, r2 ldrb r0, [r0] cmp r0, 0 - beq _08008CAE + beq @08008CAE cmp r0, 0xFF - beq _08008CAE + beq @08008CAE movs r0, 0x1 - b _08008CBA -_08008CAE: + b @08008CBA +@08008CAE: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, r1 - blt _08008C9E -_08008CB8: + blt @08008C9E +@08008CB8: movs r0, 0 -_08008CBA: +@08008CBA: pop {r1} bx r1 thumb_func_end sub_8008C94 thumb_func_start decimal_int_to_string -@ int decimal_int_to_string(char *dest, int decimal_num, int mode, int max_digits) -decimal_int_to_string: @ 8008CC0 +; int decimal_int_to_string(char *dest, int decimal_num, int mode, int max_digits) +decimal_int_to_string: ; 8008CC0 push {r4-r7,lr} mov r7, r8 push {r7} @@ -323,19 +323,19 @@ decimal_int_to_string: @ 8008CC0 ldr r0, [r3] movs r7, 0 cmp r2, 0x1 - bne _08008CDE + bne @08008CDE movs r7, 0x2 -_08008CDE: +@08008CDE: cmp r2, 0x2 - bne _08008CE4 + bne @08008CE4 movs r7, 0x1 -_08008CE4: +@08008CE4: adds r5, r0, 0 cmp r5, 0 - ble _08008D60 + ble @08008D60 ldr r0, =0x082ec7d4 mov r8, r0 -_08008CEE: +@08008CEE: adds r0, r6, 0 adds r1, r5, 0 bl __divsi3 @@ -346,57 +346,57 @@ _08008CEE: muls r0, r2 subs r1, r6, r0 cmp r7, 0x1 - bne _08008D26 + bne @08008D26 adds r3, r4, 0 adds r4, 0x1 cmp r2, 0x9 - bhi _08008D20 + bhi @08008D20 mov r6, r8 adds r0, r2, r6 ldrb r0, [r0] - b _08008D22 + b @08008D22 .align 2, 0 .pool -_08008D20: +@08008D20: movs r0, 0xAC -_08008D22: +@08008D22: strb r0, [r3] - b _08008D50 -_08008D26: + b @08008D50 +@08008D26: cmp r2, 0 - bne _08008D2E + bne @08008D2E cmp r5, 0x1 - bne _08008D46 -_08008D2E: + bne @08008D46 +@08008D2E: movs r7, 0x1 adds r2, r4, 0 adds r4, 0x1 cmp r3, 0x9 - bhi _08008D40 + bhi @08008D40 mov r6, r8 adds r0, r3, r6 ldrb r0, [r0] - b _08008D42 -_08008D40: + b @08008D42 +@08008D40: movs r0, 0xAC -_08008D42: +@08008D42: strb r0, [r2] - b _08008D50 -_08008D46: + b @08008D50 +@08008D46: cmp r7, 0x2 - bne _08008D50 + bne @08008D50 movs r0, 0x77 strb r0, [r4] adds r4, 0x1 -_08008D50: +@08008D50: adds r6, r1, 0 adds r0, r5, 0 movs r1, 0xA bl __divsi3 adds r5, r0, 0 cmp r5, 0 - bgt _08008CEE -_08008D60: + bgt @08008CEE +@08008D60: movs r0, 0xFF strb r0, [r4] adds r0, r4, 0 @@ -408,7 +408,7 @@ _08008D60: thumb_func_end decimal_int_to_string thumb_func_start sub_8008D70 -sub_8008D70: @ 8008D70 +sub_8008D70: ; 8008D70 push {r4-r7,lr} mov r7, r8 push {r7} @@ -422,19 +422,19 @@ sub_8008D70: @ 8008D70 ldr r0, [r3] movs r7, 0 cmp r2, 0x1 - bne _08008D8E + bne @08008D8E movs r7, 0x2 -_08008D8E: +@08008D8E: cmp r2, 0x2 - bne _08008D94 + bne @08008D94 movs r7, 0x1 -_08008D94: +@08008D94: adds r5, r0, 0 cmp r5, 0 - ble _08008E10 + ble @08008E10 ldr r0, =0x082ec7d4 mov r8, r0 -_08008D9E: +@08008D9E: adds r0, r6, 0 adds r1, r5, 0 bl __udivsi3 @@ -445,57 +445,57 @@ _08008D9E: muls r0, r2 subs r1, r6, r0 cmp r7, 0x1 - bne _08008DD6 + bne @08008DD6 adds r3, r4, 0 adds r4, 0x1 cmp r2, 0x9 - bhi _08008DD0 + bhi @08008DD0 mov r6, r8 adds r0, r2, r6 ldrb r0, [r0] - b _08008DD2 + b @08008DD2 .align 2, 0 .pool -_08008DD0: +@08008DD0: movs r0, 0xAC -_08008DD2: +@08008DD2: strb r0, [r3] - b _08008E00 -_08008DD6: + b @08008E00 +@08008DD6: cmp r2, 0 - bne _08008DDE + bne @08008DDE cmp r5, 0x1 - bne _08008DF6 -_08008DDE: + bne @08008DF6 +@08008DDE: movs r7, 0x1 adds r2, r4, 0 adds r4, 0x1 cmp r3, 0x9 - bhi _08008DF0 + bhi @08008DF0 mov r6, r8 adds r0, r3, r6 ldrb r0, [r0] - b _08008DF2 -_08008DF0: + b @08008DF2 +@08008DF0: movs r0, 0xAC -_08008DF2: +@08008DF2: strb r0, [r2] - b _08008E00 -_08008DF6: + b @08008E00 +@08008DF6: cmp r7, 0x2 - bne _08008E00 + bne @08008E00 movs r0, 0x77 strb r0, [r4] adds r4, 0x1 -_08008E00: +@08008E00: adds r6, r1, 0 adds r0, r5, 0 movs r1, 0xA bl __divsi3 adds r5, r0, 0 cmp r5, 0 - bgt _08008D9E -_08008E10: + bgt @08008D9E +@08008E10: movs r0, 0xFF strb r0, [r4] adds r0, r4, 0 @@ -507,7 +507,7 @@ _08008E10: thumb_func_end sub_8008D70 thumb_func_start sub_8008E20 -sub_8008E20: @ 8008E20 +sub_8008E20: ; 8008E20 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -520,30 +520,30 @@ sub_8008E20: @ 8008E20 movs r1, 0x1 movs r0, 0x1 cmp r1, r3 - bcs _08008E46 -_08008E3A: + bcs @08008E46 +@08008E3A: lsls r1, 4 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 cmp r0, r3 - bcc _08008E3A -_08008E46: + bcc @08008E3A +@08008E46: movs r3, 0 cmp r2, 0x1 - bne _08008E4E + bne @08008E4E movs r3, 0x2 -_08008E4E: +@08008E4E: cmp r2, 0x2 - bne _08008E54 + bne @08008E54 movs r3, 0x1 -_08008E54: +@08008E54: adds r5, r1, 0 cmp r5, 0 - ble _08008ECA + ble @08008ECA ldr r0, =0x082ec7d4 mov r9, r0 -_08008E5E: +@08008E5E: mov r0, r8 adds r1, r5, 0 str r3, [sp] @@ -556,54 +556,54 @@ _08008E5E: adds r1, r0, 0 ldr r3, [sp] cmp r3, 0x1 - bne _08008E90 + bne @08008E90 adds r2, r6, 0 adds r6, 0x1 cmp r4, 0xF - bhi _08008EAA + bhi @08008EAA mov r7, r9 adds r0, r4, r7 ldrb r0, [r0] - b _08008EAC + b @08008EAC .align 2, 0 .pool -_08008E90: +@08008E90: cmp r4, 0 - bne _08008E98 + bne @08008E98 cmp r5, 0x1 - bne _08008EB0 -_08008E98: + bne @08008EB0 +@08008E98: movs r3, 0x1 adds r2, r6, 0 adds r6, 0x1 cmp r7, 0xF - bhi _08008EAA + bhi @08008EAA mov r4, r9 adds r0, r7, r4 ldrb r0, [r0] - b _08008EAC -_08008EAA: + b @08008EAC +@08008EAA: movs r0, 0xAC -_08008EAC: +@08008EAC: strb r0, [r2] - b _08008EBA -_08008EB0: + b @08008EBA +@08008EB0: cmp r3, 0x2 - bne _08008EBA + bne @08008EBA movs r0, 0x77 strb r0, [r6] adds r6, 0x1 -_08008EBA: +@08008EBA: mov r8, r1 adds r0, r5, 0 cmp r5, 0 - bge _08008EC4 + bge @08008EC4 adds r0, 0xF -_08008EC4: +@08008EC4: asrs r5, r0, 4 cmp r5, 0 - bgt _08008E5E -_08008ECA: + bgt @08008E5E +@08008ECA: movs r0, 0xFF strb r0, [r6] adds r0, r6, 0 @@ -617,34 +617,34 @@ _08008ECA: thumb_func_end sub_8008E20 thumb_func_start ExpandTextCodes -@ char *ExpandTextCodes(char *dest, char *src) -ExpandTextCodes: @ 8008EE0 +; char *ExpandTextCodes(char *dest, char *src) +ExpandTextCodes: ; 8008EE0 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 -_08008EE6: +@08008EE6: ldrb r2, [r5] adds r5, 0x1 adds r0, r2, 0 subs r0, 0xFA cmp r0, 0x5 - bhi _08008FBA + bhi @08008FBA lsls r0, 2 - ldr r1, =_08008F00 + ldr r1, =@08008F00 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08008F00: - .4byte _08008FBA - .4byte _08008FBA - .4byte _08008F2C - .4byte _08008F18 - .4byte _08008FBA - .4byte _08008FC0 -_08008F18: +@08008F00: + .4byte @08008FBA + .4byte @08008FBA + .4byte @08008F2C + .4byte @08008F18 + .4byte @08008FBA + .4byte @08008FC0 +@08008F18: ldrb r0, [r5] adds r5, 0x1 bl get_fcode_buffer @@ -652,8 +652,8 @@ _08008F18: adds r0, r4, 0 bl ExpandTextCodes adds r4, r0, 0 - b _08008EE6 -_08008F2C: + b @08008EE6 +@08008F2C: strb r2, [r4] adds r4, 0x1 ldrb r2, [r5] @@ -662,58 +662,58 @@ _08008F2C: adds r4, 0x1 subs r0, r2, 0x4 cmp r0, 0x14 - bhi _08008FB0 + bhi @08008FB0 lsls r0, 2 - ldr r1, =_08008F4C + ldr r1, =@08008F4C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08008F4C: - .4byte _08008FA0 - .4byte _08008FB0 - .4byte _08008FB0 - .4byte _08008EE6 - .4byte _08008FB0 - .4byte _08008EE6 - .4byte _08008FB0 - .4byte _08008FA8 - .4byte _08008FB0 - .4byte _08008FB0 - .4byte _08008FB0 - .4byte _08008EE6 - .4byte _08008FB0 - .4byte _08008FB0 - .4byte _08008FB0 - .4byte _08008FB0 - .4byte _08008FB0 - .4byte _08008EE6 - .4byte _08008EE6 - .4byte _08008EE6 - .4byte _08008EE6 -_08008FA0: +@08008F4C: + .4byte @08008FA0 + .4byte @08008FB0 + .4byte @08008FB0 + .4byte @08008EE6 + .4byte @08008FB0 + .4byte @08008EE6 + .4byte @08008FB0 + .4byte @08008FA8 + .4byte @08008FB0 + .4byte @08008FB0 + .4byte @08008FB0 + .4byte @08008EE6 + .4byte @08008FB0 + .4byte @08008FB0 + .4byte @08008FB0 + .4byte @08008FB0 + .4byte @08008FB0 + .4byte @08008EE6 + .4byte @08008EE6 + .4byte @08008EE6 + .4byte @08008EE6 +@08008FA0: ldrb r0, [r5] strb r0, [r4] adds r5, 0x1 adds r4, 0x1 -_08008FA8: +@08008FA8: ldrb r0, [r5] strb r0, [r4] adds r5, 0x1 adds r4, 0x1 -_08008FB0: +@08008FB0: ldrb r0, [r5] strb r0, [r4] adds r5, 0x1 adds r4, 0x1 - b _08008EE6 -_08008FBA: + b @08008EE6 +@08008FBA: strb r2, [r4] adds r4, 0x1 - b _08008EE6 -_08008FC0: + b @08008EE6 +@08008FC0: movs r0, 0xFF strb r0, [r4] adds r0, r4, 0 @@ -723,7 +723,7 @@ _08008FC0: thumb_func_end ExpandTextCodes thumb_func_start sub_8008FCC -sub_8008FCC: @ 8008FCC +sub_8008FCC: ; 8008FCC push {r4-r6,lr} sub sp, 0xC adds r5, r0, 0 @@ -739,31 +739,31 @@ sub_8008FCC: @ 8008FCC bl memcpy adds r0, r5, 0 mov r1, sp -_08008FEE: +@08008FEE: bl gf_strcpy adds r5, r0, 0 -_08008FF4: +@08008FF4: ldrb r0, [r6] adds r6, 0x1 cmp r0, 0xFE - beq _0800900C + beq @0800900C cmp r0, 0xFF - bne _08009012 - b _0800901E + bne @08009012 + b @0800901E .align 2, 0 .pool -_0800900C: +@0800900C: adds r0, r5, 0 adds r1, r4, 0 - b _08008FEE -_08009012: + b @08008FEE +@08009012: strb r0, [r5] adds r5, 0x1 adds r0, 0x40 strb r0, [r5] adds r5, 0x1 - b _08008FF4 -_0800901E: + b @08008FF4 +@0800901E: strb r0, [r5] adds r0, r5, 0 add sp, 0xC @@ -773,7 +773,7 @@ _0800901E: thumb_func_end sub_8008FCC thumb_func_start sub_800902C -sub_800902C: @ 800902C +sub_800902C: ; 800902C ldr r0, =0x020223ac bx lr .align 2, 0 @@ -781,7 +781,7 @@ sub_800902C: @ 800902C thumb_func_end sub_800902C thumb_func_start sub_8009034 -sub_8009034: @ 8009034 +sub_8009034: ; 8009034 ldr r0, =0x03005d90 ldr r0, [r0] bx lr @@ -790,7 +790,7 @@ sub_8009034: @ 8009034 thumb_func_end sub_8009034 thumb_func_start sub_8009040 -sub_8009040: @ 8009040 +sub_8009040: ; 8009040 ldr r0, =0x02021cc4 bx lr .align 2, 0 @@ -798,7 +798,7 @@ sub_8009040: @ 8009040 thumb_func_end sub_8009040 thumb_func_start sub_8009048 -sub_8009048: @ 8009048 +sub_8009048: ; 8009048 ldr r0, =0x02021dc4 bx lr .align 2, 0 @@ -806,7 +806,7 @@ sub_8009048: @ 8009048 thumb_func_end sub_8009048 thumb_func_start sub_8009050 -sub_8009050: @ 8009050 +sub_8009050: ; 8009050 ldr r0, =0x02021ec4 bx lr .align 2, 0 @@ -814,20 +814,20 @@ sub_8009050: @ 8009050 thumb_func_end sub_8009050 thumb_func_start sub_8009058 -sub_8009058: @ 8009058 +sub_8009058: ; 8009058 push {lr} ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - beq _08009070 + beq @08009070 ldr r0, =0x085e821a - b _08009072 + b @08009072 .align 2, 0 .pool -_08009070: +@08009070: ldr r0, =0x085e8219 -_08009072: +@08009072: pop {r1} bx r1 .align 2, 0 @@ -835,20 +835,20 @@ _08009072: thumb_func_end sub_8009058 thumb_func_start sub_800907C -sub_800907C: @ 800907C +sub_800907C: ; 800907C push {lr} ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - beq _08009094 + beq @08009094 ldr r0, =0x085e8258 - b _08009096 + b @08009096 .align 2, 0 .pool -_08009094: +@08009094: ldr r0, =0x085e8260 -_08009096: +@08009096: pop {r1} bx r1 .align 2, 0 @@ -856,7 +856,7 @@ _08009096: thumb_func_end sub_800907C thumb_func_start sub_80090A0 -sub_80090A0: @ 80090A0 +sub_80090A0: ; 80090A0 ldr r0, =0x085e8229 bx lr .align 2, 0 @@ -864,7 +864,7 @@ sub_80090A0: @ 80090A0 thumb_func_end sub_80090A0 thumb_func_start sub_80090A8 -sub_80090A8: @ 80090A8 +sub_80090A8: ; 80090A8 ldr r0, =0x085e8231 bx lr .align 2, 0 @@ -872,7 +872,7 @@ sub_80090A8: @ 80090A8 thumb_func_end sub_80090A8 thumb_func_start sub_80090B0 -sub_80090B0: @ 80090B0 +sub_80090B0: ; 80090B0 ldr r0, =0x085e8236 bx lr .align 2, 0 @@ -880,7 +880,7 @@ sub_80090B0: @ 80090B0 thumb_func_end sub_80090B0 thumb_func_start sub_80090B8 -sub_80090B8: @ 80090B8 +sub_80090B8: ; 80090B8 ldr r0, =0x085e823c bx lr .align 2, 0 @@ -888,7 +888,7 @@ sub_80090B8: @ 80090B8 thumb_func_end sub_80090B8 thumb_func_start sub_80090C0 -sub_80090C0: @ 80090C0 +sub_80090C0: ; 80090C0 ldr r0, =0x085e8243 bx lr .align 2, 0 @@ -896,7 +896,7 @@ sub_80090C0: @ 80090C0 thumb_func_end sub_80090C0 thumb_func_start sub_80090C8 -sub_80090C8: @ 80090C8 +sub_80090C8: ; 80090C8 ldr r0, =0x085e8249 bx lr .align 2, 0 @@ -904,7 +904,7 @@ sub_80090C8: @ 80090C8 thumb_func_end sub_80090C8 thumb_func_start sub_80090D0 -sub_80090D0: @ 80090D0 +sub_80090D0: ; 80090D0 ldr r0, =0x085e8250 bx lr .align 2, 0 @@ -912,21 +912,21 @@ sub_80090D0: @ 80090D0 thumb_func_end sub_80090D0 thumb_func_start get_fcode_buffer -get_fcode_buffer: @ 80090D8 +get_fcode_buffer: ; 80090D8 push {lr} cmp r0, 0xD - bhi _080090F0 + bhi @080090F0 ldr r1, =0x082ec818 lsls r0, 2 adds r0, r1 ldr r0, [r0] bl _call_via_r0 - b _080090F2 + b @080090F2 .align 2, 0 .pool -_080090F0: +@080090F0: ldr r0, =0x085e8218 -_080090F2: +@080090F2: pop {r1} bx r1 .align 2, 0 @@ -934,8 +934,8 @@ _080090F2: thumb_func_end get_fcode_buffer thumb_func_start RepeatChar -@ int RepeatChar(char *dest, char c, u16 length) -RepeatChar: @ 80090FC +; int RepeatChar(char *dest, char c, u16 length) +RepeatChar: ; 80090FC push {lr} adds r3, r0, 0 lsls r1, 24 @@ -944,16 +944,16 @@ RepeatChar: @ 80090FC lsrs r2, 16 movs r0, 0 cmp r0, r2 - bcs _0800911C -_0800910E: + bcs @0800911C +@0800910E: strb r1, [r3] adds r3, 0x1 adds r0, 0x1 lsls r0, 16 lsrs r0, 16 cmp r0, r2 - bcc _0800910E -_0800911C: + bcc @0800910E +@0800911C: movs r0, 0xFF strb r0, [r3] adds r0, r3, 0 @@ -962,7 +962,7 @@ _0800911C: thumb_func_end RepeatChar thumb_func_start sub_8009128 -sub_8009128: @ 8009128 +sub_8009128: ; 8009128 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -970,37 +970,37 @@ sub_8009128: @ 8009128 lsrs r2, 24 lsls r3, 16 lsrs r3, 16 - b _08009148 -_08009138: + b @08009148 +@08009138: strb r1, [r4] adds r5, 0x1 adds r4, 0x1 cmp r3, 0 - beq _08009148 + beq @08009148 subs r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 -_08009148: +@08009148: ldrb r1, [r5] adds r0, r1, 0 cmp r0, 0xFF - bne _08009138 + bne @08009138 subs r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 ldr r0, =0x0000ffff cmp r3, r0 - beq _0800916C + beq @0800916C adds r1, r0, 0 -_0800915E: +@0800915E: strb r2, [r4] adds r4, 0x1 subs r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, r1 - bne _0800915E -_0800916C: + bne @0800915E +@0800916C: movs r0, 0xFF strb r0, [r4] adds r0, r4, 0 @@ -1012,7 +1012,7 @@ _0800916C: thumb_func_end sub_8009128 thumb_func_start sub_800917C -sub_800917C: @ 800917C +sub_800917C: ; 800917C push {lr} lsls r2, r1, 16 lsrs r2, 16 @@ -1023,36 +1023,36 @@ sub_800917C: @ 800917C thumb_func_end sub_800917C thumb_func_start sub_800918C -sub_800918C: @ 800918C +sub_800918C: ; 800918C push {r4,r5,lr} adds r4, r0, 0 adds r3, r1, 0 subs r2, 0x1 movs r5, 0x1 negs r5, r5 - b _080091B2 -_0800919A: + b @080091B2 +@0800919A: strb r0, [r4] adds r3, 0x1 adds r4, 0x1 subs r0, r3, 0x1 ldrb r0, [r0] cmp r0, 0xF9 - bne _080091B0 + bne @080091B0 ldrb r0, [r3] strb r0, [r4] adds r3, 0x1 adds r4, 0x1 -_080091B0: +@080091B0: subs r2, 0x1 -_080091B2: +@080091B2: cmp r2, r5 - beq _080091BE + beq @080091BE ldrb r0, [r3] adds r1, r0, 0 cmp r1, 0xFF - bne _0800919A -_080091BE: + bne @0800919A +@080091BE: movs r0, 0xFF strb r0, [r4] adds r0, r4, 0 @@ -1062,30 +1062,30 @@ _080091BE: thumb_func_end sub_800918C thumb_func_start sub_80091CC -sub_80091CC: @ 80091CC +sub_80091CC: ; 80091CC push {lr} adds r2, r0, 0 movs r3, 0 - b _080091DE -_080091D4: + b @080091DE +@080091D4: cmp r1, 0xF9 - bne _080091DA + bne @080091DA adds r2, 0x1 -_080091DA: +@080091DA: adds r2, 0x1 adds r3, 0x1 -_080091DE: +@080091DE: ldrb r1, [r2] adds r0, r1, 0 cmp r0, 0xFF - bne _080091D4 + bne @080091D4 adds r0, r3, 0 pop {r1} bx r1 thumb_func_end sub_80091CC thumb_func_start sub_80091EC -sub_80091EC: @ 80091EC +sub_80091EC: ; 80091EC push {lr} adds r3, r0, 0 lsls r2, 24 @@ -1094,25 +1094,25 @@ sub_80091EC: @ 80091EC strb r0, [r3] adds r3, 0x1 cmp r1, 0x1 - beq _0800920E + beq @0800920E cmp r1, 0x1 - bcc _08009208 + bcc @08009208 cmp r1, 0x2 - beq _08009214 - b _08009218 -_08009208: + beq @08009214 + b @08009218 +@08009208: movs r0, 0x1 strb r0, [r3] - b _08009216 -_0800920E: + b @08009216 +@0800920E: movs r0, 0x3 strb r0, [r3] - b _08009216 -_08009214: + b @08009216 +@08009214: strb r1, [r3] -_08009216: +@08009216: adds r3, 0x1 -_08009218: +@08009218: strb r2, [r3] adds r3, 0x1 movs r0, 0xFF @@ -1123,76 +1123,76 @@ _08009218: thumb_func_end sub_80091EC thumb_func_start sub_8009228 -sub_8009228: @ 8009228 +sub_8009228: ; 8009228 push {lr} adds r2, r0, 0 - b _0800923E -_0800922E: + b @0800923E +@0800922E: adds r0, r1, 0 cmp r0, 0xA0 - bhi _0800923C + bhi @0800923C cmp r0, 0 - beq _0800923C + beq @0800923C movs r0, 0x1 - b _08009248 -_0800923C: + b @08009248 +@0800923C: adds r2, 0x1 -_0800923E: +@0800923E: ldrb r1, [r2] adds r0, r1, 0 cmp r0, 0xFF - bne _0800922E + bne @0800922E movs r0, 0 -_08009248: +@08009248: pop {r1} bx r1 thumb_func_end sub_8009228 thumb_func_start sub_800924C -sub_800924C: @ 800924C +sub_800924C: ; 800924C push {r4,lr} adds r3, r0, 0 adds r4, r1, 0 movs r1, 0 - b _08009268 -_08009256: + b @08009268 +@08009256: adds r0, r2, 0 cmp r0, 0xA0 - bhi _08009264 + bhi @08009264 cmp r0, 0 - beq _08009264 + beq @08009264 movs r0, 0x1 - b _08009276 -_08009264: + b @08009276 +@08009264: adds r3, 0x1 adds r1, 0x1 -_08009268: +@08009268: ldrb r2, [r3] adds r0, r2, 0 cmp r0, 0xFF - beq _08009274 + beq @08009274 cmp r1, r4 - blt _08009256 -_08009274: + blt @08009256 +@08009274: movs r0, 0 -_08009276: +@08009276: pop {r4} pop {r1} bx r1 thumb_func_end sub_800924C thumb_func_start sub_800927C -sub_800927C: @ 800927C +sub_800927C: ; 800927C push {lr} lsls r0, 24 lsrs r1, r0, 24 movs r0, 0 cmp r1, 0x18 - bhi _0800928E + bhi @0800928E ldr r0, =0x082ec850 adds r0, r1, r0 ldrb r0, [r0] -_0800928E: +@0800928E: pop {r1} bx r1 .align 2, 0 @@ -1200,21 +1200,21 @@ _0800928E: thumb_func_end sub_800927C thumb_func_start sub_8009298 -sub_8009298: @ 8009298 +sub_8009298: ; 8009298 push {r4,lr} adds r4, r0, 0 - b _080092AC -_0800929E: + b @080092AC +@0800929E: adds r4, 0x1 ldrb r0, [r4] bl sub_800927C lsls r0, 24 lsrs r0, 24 adds r4, r0 -_080092AC: +@080092AC: ldrb r0, [r4] cmp r0, 0xFC - beq _0800929E + beq @0800929E adds r0, r4, 0 pop {r4} pop {r1} @@ -1222,27 +1222,27 @@ _080092AC: thumb_func_end sub_8009298 thumb_func_start sub_80092BC -sub_80092BC: @ 80092BC +sub_80092BC: ; 80092BC push {r4-r6,lr} adds r4, r0, 0 adds r5, r1, 0 movs r6, 0 - b _080092DE -_080092C6: + b @080092DE +@080092C6: cmp r1, r0 - bcs _080092D4 + bcs @080092D4 movs r6, 0x1 negs r6, r6 cmp r0, 0xFF - bne _080092D4 + bne @080092D4 movs r6, 0x1 -_080092D4: +@080092D4: ldrb r0, [r4] cmp r0, 0xFF - beq _080092FE + beq @080092FE adds r4, 0x1 adds r5, 0x1 -_080092DE: +@080092DE: adds r0, r4, 0 bl sub_8009298 adds r4, r0, 0 @@ -1252,12 +1252,12 @@ _080092DE: ldrb r1, [r4] ldrb r0, [r5] cmp r1, r0 - bls _080092C6 + bls @080092C6 movs r6, 0x1 cmp r1, 0xFF - bne _080092FE + bne @080092FE subs r6, 0x2 -_080092FE: +@080092FE: adds r0, r6, 0 pop {r4-r6} pop {r1} @@ -1265,13 +1265,13 @@ _080092FE: thumb_func_end sub_80092BC thumb_func_start sub_8009308 -sub_8009308: @ 8009308 +sub_8009308: ; 8009308 push {r4,lr} adds r4, r0, 0 lsls r1, 24 lsrs r1, 24 cmp r1, 0x1 - bne _08009368 + bne @08009368 bl sub_8009370 adds r0, r4, 0 bl sub_8008C24 @@ -1299,41 +1299,41 @@ sub_8009308: @ 8009308 movs r1, 0xFF lsls r1, 24 adds r0, r1 - b _0800935A -_08009350: + b @0800935A +@08009350: adds r1, r2, r4 ldrb r0, [r1] strb r0, [r1, 0x2] subs r0, r2, 0x1 lsls r0, 24 -_0800935A: +@0800935A: lsrs r2, r0, 24 cmp r2, 0xFF - bne _08009350 + bne @08009350 movs r0, 0xFC strb r0, [r4] movs r0, 0x15 strb r0, [r4, 0x1] -_08009368: +@08009368: pop {r4} pop {r0} bx r0 thumb_func_end sub_8009308 thumb_func_start sub_8009370 -sub_8009370: @ 8009370 +sub_8009370: ; 8009370 push {r4-r6,lr} adds r5, r0, 0 movs r4, 0 movs r6, 0 ldrb r0, [r5] cmp r0, 0xFF - beq _080093C0 -_0800937E: + beq @080093C0 +@0800937E: adds r0, r5, r4 ldrb r0, [r0] cmp r0, 0xFC - bne _080093A0 + bne @080093A0 adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -1345,8 +1345,8 @@ _0800937E: adds r0, r4, r0 lsls r0, 16 lsrs r4, r0, 16 - b _080093B8 -_080093A0: + b @080093B8 +@080093A0: adds r2, r6, 0 adds r0, r2, 0x1 lsls r0, 16 @@ -1359,12 +1359,12 @@ _080093A0: adds r1, r5, r1 ldrb r0, [r1] strb r0, [r2] -_080093B8: +@080093B8: adds r0, r5, r4 ldrb r0, [r0] cmp r0, 0xFF - bne _0800937E -_080093C0: + bne @0800937E +@080093C0: adds r1, r5, r6 movs r0, 0xFF strb r0, [r1] @@ -1374,32 +1374,32 @@ _080093C0: thumb_func_end sub_8009370 thumb_func_start sub_80093CC -sub_80093CC: @ 80093CC +sub_80093CC: ; 80093CC push {lr} bl sub_800B488 bl sub_800E700 bl sub_800BEC0 ldr r1, =0x00008001 cmp r0, r1 - beq _080093F4 + beq @080093F4 bl sub_800B4A4 bl sub_80097E8 bl restore_serial_timer3_irq_handlers movs r0, 0 - b _080093FE + b @080093FE .align 2, 0 .pool -_080093F4: +@080093F4: bl rfu_REQ_stopMode bl rfu_waitREQComplete movs r0, 0x1 -_080093FE: +@080093FE: pop {r1} bx r1 thumb_func_end sub_80093CC thumb_func_start sub_8009404 -sub_8009404: @ 8009404 +sub_8009404: ; 8009404 push {lr} lsls r0, 24 lsrs r0, 24 @@ -1409,7 +1409,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} @@ -1449,20 +1449,20 @@ sub_8009414: @ 8009414 str r4, [r0, 0x8] mov r0, r8 cmp r0, 0x2 - beq _0800949E + beq @0800949E cmp r0, 0x2 - bgt _08009484 + bgt @08009484 cmp r0, 0x1 - beq _0800948C - b _080094C0 + beq @0800948C + b @080094C0 .align 2, 0 .pool -_08009484: +@08009484: mov r0, r8 cmp r0, 0x3 - beq _080094B0 - b _080094C0 -_0800948C: + beq @080094B0 + b @080094C0 +@0800948C: lsls r1, r6, 8 movs r0, 0x1 orrs r1, r0 @@ -1470,8 +1470,8 @@ _0800948C: orrs r1, r0 movs r0, 0xA bl lcd_io_set - b _080094C0 -_0800949E: + b @080094C0 +@0800949E: lsls r1, r6, 8 movs r0, 0x1 orrs r1, r0 @@ -1479,8 +1479,8 @@ _0800949E: orrs r1, r0 movs r0, 0xC bl lcd_io_set - b _080094C0 -_080094B0: + b @080094C0 +@080094B0: lsls r1, r6, 8 movs r0, 0x1 orrs r1, r0 @@ -1488,7 +1488,7 @@ _080094B0: orrs r1, r0 movs r0, 0xE bl lcd_io_set -_080094C0: +@080094C0: mov r0, r8 lsls r4, r0, 2 adds r0, r4, 0 @@ -1511,7 +1511,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} @@ -1568,7 +1568,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 reset_all_obj_data @@ -1586,7 +1586,7 @@ sub_8009570: @ 8009570 ldrh r0, [r0, 0x24] bl SeedRng movs r4, 0 -_080095A0: +@080095A0: bl GenerateRandomNumber ldr r1, =0x03005d90 ldr r1, [r1] @@ -1595,7 +1595,7 @@ _080095A0: strb r0, [r1] adds r4, 0x1 cmp r4, 0x3 - ble _080095A0 + ble @080095A0 movs r4, 0 str r4, [sp] movs r0, 0 @@ -1631,7 +1631,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 @@ -1642,7 +1642,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 @@ -1686,12 +1686,12 @@ sub_8009638: @ 8009638 bl flag_check lsls r0, 24 cmp r0, 0 - beq _0800969E + beq @0800969E ldrb r0, [r5, 0x10] movs r1, 0x10 orrs r0, r1 strb r0, [r5, 0x10] -_0800969E: +@0800969E: pop {r4,r5} pop {r0} bx r0 @@ -1700,7 +1700,7 @@ _0800969E: thumb_func_end sub_8009638 thumb_func_start sub_80096BC -sub_80096BC: @ 80096BC +sub_80096BC: ; 80096BC push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -1710,18 +1710,18 @@ 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 ldr r2, =0x0000efff adds r0, r1, 0 adds r0, 0xE -_080096DC: +@080096DC: strh r2, [r0] subs r0, 0x2 cmp r0, r1 - bge _080096DC + bge @080096DC movs r0, 0x1 strb r0, [r3] bl sub_800B594 @@ -1732,7 +1732,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 @@ -1747,13 +1747,13 @@ task02_080097CC: @ 80096FC lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - bne _08009726 + bne @08009726 ldr r1, =0x03003144 movs r0, 0x1 strb r0, [r1] adds r0, r2, 0 bl remove_task -_08009726: +@08009726: pop {r0} bx r0 .align 2, 0 @@ -1761,12 +1761,12 @@ _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] cmp r4, 0 - bne _080097A8 + bne @080097A8 bl sub_800B628 bl sub_80096D0 ldr r1, =0x03003140 @@ -1791,12 +1791,12 @@ sub_8009734: @ 8009734 ldr r0, =task02_080097CC + 1 movs r1, 0x2 bl AddTask - b _080097AC + b @080097AC .align 2, 0 .pool -_080097A8: +@080097A8: bl sub_800E700 -_080097AC: +@080097AC: ldr r1, =0x03003124 movs r0, 0 strb r0, [r1] @@ -1806,7 +1806,7 @@ _080097AC: movs r5, 0x1 ldr r4, =0x030030f0 ldr r3, =0x030030ec -_080097BE: +@080097BE: adds r0, r1, r6 strb r5, [r0] adds r0, r1, r4 @@ -1815,7 +1815,7 @@ _080097BE: strb r2, [r0] adds r1, 0x1 cmp r1, 0x3 - ble _080097BE + ble @080097BE pop {r4-r6} pop {r0} bx r0 @@ -1824,7 +1824,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 @@ -1832,9 +1832,9 @@ sub_80097E8: @ 80097E8 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _080097FC + beq @080097FC bl sub_800EDD4 -_080097FC: +@080097FC: ldr r0, =0x020229c4 strb r4, [r0] bl sub_800B53C @@ -1846,7 +1846,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 @@ -1856,7 +1856,7 @@ sub_8009818: @ 8009818 ldrb r0, [r5] ldrh r1, [r4] cmp r0, r1 - beq _0800983C + beq @0800983C ldrh r0, [r4] movs r1, 0x2 movs r2, 0x3 @@ -1864,10 +1864,10 @@ sub_8009818: @ 8009818 bl sub_800A6E8 ldrh r0, [r4] strb r0, [r5] -_0800983C: +@0800983C: movs r5, 0 ldr r7, =0x03000d20 -_08009840: +@08009840: ldr r0, =0x03000d68 adds r6, r5, r0 lsls r0, r5, 1 @@ -1877,7 +1877,7 @@ _08009840: ldrb r0, [r6] ldrh r1, [r4] cmp r0, r1 - beq _08009868 + beq @08009868 ldrh r0, [r4] adds r2, r5, 0x4 lsls r2, 24 @@ -1887,29 +1887,29 @@ _08009840: bl sub_800A6E8 ldrh r0, [r4] strb r0, [r6] -_08009868: +@08009868: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _08009840 + bls @08009840 bl sub_800A550 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0xF - bne _080098CE + bne @080098CE movs r5, 0 ldr r0, =0x03000d20 mov r9, r0 ldr r1, =0x00000342 mov r8, r1 -_08009888: +@08009888: adds r0, r7, 0 asrs r0, r5 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _080098C4 + beq @080098C4 lsls r0, r5, 8 ldr r1, =0x020223c4 adds r0, r1 @@ -1927,18 +1927,18 @@ _08009888: bl sub_800A5EC ldrh r0, [r4] cmp r0, r8 - beq _080098C4 + beq @080098C4 ldr r0, =0x020223bc strb r6, [r0] ldr r0, =0x020223bd strb r6, [r0] -_080098C4: +@080098C4: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _08009888 -_080098CE: + bls @08009888 +@080098CE: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -1950,7 +1950,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 @@ -1958,27 +1958,27 @@ sub_8009900: @ 8009900 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08009916 + beq @08009916 ldr r1, =0x03003144 movs r0, 0x1 strb r0, [r1] -_08009916: +@08009916: ldrh r1, [r4, 0x2C] movs r5, 0x2 adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _0800992A + beq @0800992A ldr r0, =0x02004000 ldr r1, =0x00002004 bl sub_800A2F4 -_0800992A: +@0800992A: ldrh r1, [r4, 0x2E] movs r0, 0x80 lsls r0, 2 ands r0, r1 cmp r0, 0 - beq _08009946 + beq @08009946 movs r0, 0x1 negs r0, r0 str r5, [sp] @@ -1986,48 +1986,48 @@ _0800992A: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 -_08009946: +@08009946: ldrh r1, [r4, 0x2E] movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _08009956 + beq @08009956 movs r0, 0x1 bl sub_800B330 -_08009956: +@08009956: ldrh r1, [r4, 0x2E] movs r0, 0x80 lsls r0, 1 ands r0, r1 cmp r0, 0 - beq _08009968 + beq @08009968 movs r0, 0x1 bl save_game_when_memory_present -_08009968: +@08009968: ldrh r1, [r4, 0x2E] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08009976 + beq @08009976 bl sub_800AC34 -_08009976: +@08009976: ldr r0, =0x020223bc ldrb r0, [r0] cmp r0, 0 - beq _08009996 + beq @08009996 ldr r2, [r4, 0x24] ldr r0, =0x03002748 ldrb r1, [r0] ldr r0, =0x03003140 ldr r0, [r0] cmp r0, 0 - bne _08009990 + bne @08009990 movs r0, 0x10 orrs r1, r0 -_08009990: +@08009990: adds r0, r2, 0 bl sub_800A994 -_08009996: +@08009996: add sp, 0x4 pop {r4,r5} pop {r0} @@ -2037,7 +2037,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 @@ -2053,23 +2053,23 @@ 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 ldrb r0, [r0] cmp r0, 0 - bne _080099F4 + bne @080099F4 movs r0, 0 - b _08009A3C + b @08009A3C .align 2, 0 .pool -_080099F4: +@080099F4: movs r1, 0 ldr r5, =0x03003084 ldr r3, =0x03003110 movs r2, 0 -_080099FC: +@080099FC: lsls r0, r1, 1 adds r0, r3 strh r2, [r0] @@ -2077,7 +2077,7 @@ _080099FC: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x7 - bls _080099FC + bls @080099FC ldrh r0, [r4] strh r0, [r5] ldr r0, =0x030030e0 @@ -2085,7 +2085,7 @@ _080099FC: movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _08009A38 + beq @08009A38 ldr r0, =0x04000128 ldr r0, [r0] lsls r0, 26 @@ -2094,14 +2094,14 @@ _080099FC: ldr r0, =0x03003140 ldr r0, [r0] cmp r0, 0 - beq _08009A34 + beq @08009A34 bl _call_via_r0 -_08009A34: +@08009A34: bl sub_800AEB4 -_08009A38: +@08009A38: ldr r0, =0x030030e0 ldrh r0, [r0] -_08009A3C: +@08009A3C: pop {r4,r5} pop {r1} bx r1 @@ -2110,7 +2110,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 @@ -2120,29 +2120,29 @@ sub_8009A58: @ 8009A58 strb r5, [r0] movs r4, 0 adds r6, r1, 0 - b _08009A78 + b @08009A78 .align 2, 0 .pool -_08009A70: +@08009A70: adds r0, r4, r6 ldrb r0, [r0] adds r5, r0 adds r4, 0x1 -_08009A78: +@08009A78: bl sub_800ABAC lsls r0, 24 lsrs r0, 24 cmp r4, r0 - blt _08009A70 + blt @08009A70 cmp r5, 0 - bne _08009A94 + bne @08009A94 ldr r1, =0x03003124 ldrb r0, [r1] cmp r0, 0 - bne _08009A94 + bne @08009A94 movs r0, 0x1 strb r0, [r1] -_08009A94: +@08009A94: pop {r4-r6} pop {r0} bx r0 @@ -2151,7 +2151,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 @@ -2159,7 +2159,7 @@ sub_8009AA0: @ 8009AA0 push {r5-r7} sub sp, 0x4 movs r6, 0 -_08009AAE: +@08009AAE: ldr r0, =0x03003020 lsls r1, r6, 1 adds r3, r1, r0 @@ -2173,77 +2173,77 @@ _08009AAE: adds r7, r6, 0x1 str r7, [sp] cmp r0, 0 - bne _08009ACC - b _08009D6E -_08009ACC: + bne @08009ACC + b @08009D6E +@08009ACC: ldrh r1, [r2] ldr r0, =0x00005fff cmp r1, r0 - bne _08009AD6 - b _08009D20 -_08009AD6: + bne @08009AD6 + b @08009D20 +@08009AD6: cmp r1, r0 - bgt _08009B24 + bgt @08009B24 ldr r0, =0x00004444 cmp r1, r0 - bne _08009AE2 - b _08009D64 -_08009AE2: + bne @08009AE2 + b @08009D64 +@08009AE2: cmp r1, r0 - bgt _08009B10 + bgt @08009B10 ldr r0, =0x00002222 cmp r1, r0 - beq _08009B68 + beq @08009B68 ldr r0, =0x00002ffe cmp r1, r0 - bne _08009AF4 - b _08009D28 -_08009AF4: - b _08009D6E + bne @08009AF4 + b @08009D28 +@08009AF4: + b @08009D6E .align 2, 0 .pool -_08009B10: +@08009B10: ldr r0, =0x00005555 cmp r1, r0 - beq _08009BB8 + beq @08009BB8 adds r0, 0x11 cmp r1, r0 - beq _08009BB8 - b _08009D6E + beq @08009BB8 + b @08009D6E .align 2, 0 .pool -_08009B24: +@08009B24: ldr r0, =0x0000bbbb cmp r1, r0 - beq _08009BC4 + beq @08009BC4 cmp r1, r0 - bgt _08009B4C + bgt @08009B4C ldr r0, =0x00008888 cmp r1, r0 - beq _08009BF0 + beq @08009BF0 ldr r0, =0x0000aaaa cmp r1, r0 - bne _08009B3C - b _08009D38 -_08009B3C: - b _08009D6E + bne @08009B3C + b @08009D38 +@08009B3C: + b @08009D6E .align 2, 0 .pool -_08009B4C: +@08009B4C: ldr r0, =0x0000cafe cmp r1, r0 - bne _08009B54 - b _08009D64 -_08009B54: + bne @08009B54 + b @08009D64 +@08009B54: ldr r0, =0x0000cccc cmp r1, r0 - bne _08009B5C - b _08009D3E -_08009B5C: - b _08009D6E + bne @08009B5C + b @08009D3E +@08009B5C: + b @08009D6E .align 2, 0 .pool -_08009B68: +@08009B68: bl sub_8009638 ldr r0, =0x03003030 adds r2, r0, 0 @@ -2274,17 +2274,17 @@ _08009B68: strb r2, [r1, 0x2] movs r1, 0x3C bl sub_800A2F4 - b _08009D6E + b @08009D6E .align 2, 0 .pool -_08009BB8: +@08009BB8: ldr r1, =0x030030e8 movs r0, 0x1 strb r0, [r1] - b _08009D6E + b @08009D6E .align 2, 0 .pool -_08009BC4: +@08009BC4: mov r7, r12 adds r1, r7, r6 lsls r1, 2 @@ -2302,10 +2302,10 @@ _08009BC4: adds r0, r4, r0 ldrh r0, [r0] strb r0, [r1, 0x9] - b _08009D6E + b @08009D6E .align 2, 0 .pool -_08009BF0: +@08009BF0: mov r3, r12 adds r0, r3, r6 lsls r0, 2 @@ -2317,14 +2317,14 @@ _08009BF0: adds r7, r5, 0 mov r10, r7 cmp r1, r0 - bls _08009C40 + bls @08009C40 ldr r0, =0x0201c000 mov r8, r0 movs r2, 0 adds r5, r3, 0 ldr r7, =0x03003090 adds r3, r4, 0 -_08009C14: +@08009C14: ldrh r1, [r5] lsrs r1, 1 adds r1, r2 @@ -2339,11 +2339,11 @@ _08009C14: lsls r2, 16 lsrs r2, 16 cmp r2, 0x6 - bls _08009C14 - b _08009C70 + bls @08009C14 + b @08009C70 .align 2, 0 .pool -_08009C40: +@08009C40: movs r2, 0 ldr r1, =0x020223c4 mov r9, r1 @@ -2352,7 +2352,7 @@ _08009C40: mov r8, r3 lsls r5, r6, 8 adds r3, r4, 0 -_08009C50: +@08009C50: ldrh r1, [r7] lsrs r1, 1 adds r1, r2 @@ -2368,8 +2368,8 @@ _08009C50: lsls r2, 16 lsrs r2, 16 cmp r2, 0x6 - bls _08009C50 -_08009C70: + bls @08009C50 +@08009C70: mov r4, r12 adds r1, r4, r6 lsls r1, 2 @@ -2382,12 +2382,12 @@ _08009C70: lsrs r0, 16 ldrh r1, [r1, 0x2] cmp r0, r1 - bcc _08009D6E + bcc @08009D6E ldr r0, =0x03003078 adds r0, r6, r0 ldrb r0, [r0] cmp r0, 0x1 - bne _08009D16 + bne @08009D16 lsls r1, r6, 8 ldr r0, =0x020223c4 adds r1, r0 @@ -2411,11 +2411,11 @@ _08009C70: lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bhi _08009CCA + bhi @08009CCA strb r3, [r2, 0x12] strb r3, [r2, 0x11] strb r3, [r2, 0x10] -_08009CCA: +@08009CCA: adds r0, r2, 0 bl sub_800B524 ldr r5, =0x082ed1d4 @@ -2423,47 +2423,47 @@ _08009CCA: adds r1, r5, 0 bl strcmp cmp r0, 0 - bne _08009CEC + bne @08009CEC mov r0, r8 adds r0, 0x2C adds r1, r5, 0 bl strcmp cmp r0, 0 - beq _08009D0C -_08009CEC: + beq @08009D0C +@08009CEC: ldr r0, =c2_800ACD4 + 1 bl set_callback2 - b _08009D6E + b @08009D6E .align 2, 0 .pool -_08009D0C: +@08009D0C: lsls r0, r6, 24 lsrs r0, 24 bl sub_8009A58 - b _08009D6E -_08009D16: + b @08009D6E +@08009D16: lsls r0, r6, 24 lsrs r0, 24 bl sub_800A588 - b _08009D6E -_08009D20: + b @08009D6E +@08009D20: ldr r0, =0x030030f0 - b _08009D2A + b @08009D2A .align 2, 0 .pool -_08009D28: +@08009D28: ldr r0, =0x030030ec -_08009D2A: +@08009D2A: adds r0, r6, r0 movs r1, 0x1 strb r1, [r0] - b _08009D6E + b @08009D6E .align 2, 0 .pool -_08009D38: +@08009D38: bl sub_800A418 - b _08009D6E -_08009D3E: + b @08009D6E +@08009D3E: ldr r3, =0x082ed1a8 ldr r0, =0x03003090 adds r0, 0x2 @@ -2477,23 +2477,23 @@ _08009D3E: ldrh r2, [r2] movs r0, 0 bl link_0800A448 - b _08009D6E + b @08009D6E .align 2, 0 .pool -_08009D64: +@08009D64: ldr r0, =0x03003090 adds r0, 0x2 adds r0, r4, r0 ldrh r0, [r0] strh r0, [r3] -_08009D6E: +@08009D6E: ldr r5, [sp] lsls r0, r5, 16 lsrs r6, r0, 16 cmp r6, 0x3 - bhi _08009D7A - b _08009AAE -_08009D7A: + bhi @08009D7A + b @08009AAE +@08009D7A: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -2507,114 +2507,114 @@ _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 ldr r0, =0x00006666 cmp r2, r0 - beq _08009E60 + beq @08009E60 cmp r2, r0 - bgt _08009DF0 + bgt @08009DF0 ldr r0, =0x00004444 cmp r2, r0 - beq _08009E4C + beq @08009E4C cmp r2, r0 - bgt _08009DCC + bgt @08009DCC ldr r0, =0x00002222 cmp r2, r0 - beq _08009E38 + beq @08009E38 ldr r0, =0x00002ffe -_08009DB2: +@08009DB2: cmp r2, r0 - bne _08009DB8 - b _08009EE4 -_08009DB8: - b _08009F06 + bne @08009DB8 + b @08009EE4 +@08009DB8: + b @08009F06 .align 2, 0 .pool -_08009DCC: +@08009DCC: ldr r0, =0x00005566 cmp r2, r0 - bne _08009DD4 - b _08009EE4 -_08009DD4: + bne @08009DD4 + b @08009EE4 +@08009DD4: cmp r2, r0 - bgt _08009DE0 + bgt @08009DE0 subs r0, 0x11 - b _08009DB2 + b @08009DB2 .align 2, 0 .pool -_08009DE0: +@08009DE0: ldr r0, =0x00005fff cmp r2, r0 - bne _08009DE8 - b _08009ED0 -_08009DE8: - b _08009F06 + bne @08009DE8 + b @08009ED0 +@08009DE8: + b @08009F06 .align 2, 0 .pool -_08009DF0: +@08009DF0: ldr r0, =0x0000aaab cmp r2, r0 - beq _08009EA8 + beq @08009EA8 cmp r2, r0 - bgt _08009E10 + bgt @08009E10 ldr r0, =0x00007777 cmp r2, r0 - beq _08009E6C + beq @08009E6C ldr r0, =0x0000aaaa - b _08009DB2 + b @08009DB2 .align 2, 0 .pool -_08009E10: +@08009E10: ldr r0, =0x0000cafe cmp r2, r0 - beq _08009EF0 + beq @08009EF0 cmp r2, r0 - bgt _08009E2C + bgt @08009E2C ldr r0, =0x0000bbbb cmp r2, r0 - beq _08009E8C - b _08009F06 + beq @08009E8C + b @08009F06 .align 2, 0 .pool -_08009E2C: +@08009E2C: ldr r0, =0x0000cccc cmp r2, r0 - beq _08009EBC - b _08009F06 + beq @08009EBC + b @08009F06 .align 2, 0 .pool -_08009E38: +@08009E38: ldr r0, =0x03003110 strh r2, [r0] ldr r1, =0x020229c6 ldrh r1, [r1] - b _08009F04 + b @08009F04 .align 2, 0 .pool -_08009E4C: +@08009E4C: ldr r0, =0x03003110 strh r2, [r0] ldr r1, =0x030022c0 ldrh r1, [r1, 0x2C] - b _08009F04 + b @08009F04 .align 2, 0 .pool -_08009E60: +@08009E60: ldr r0, =0x03003110 movs r1, 0 - b _08009F02 + b @08009F02 .align 2, 0 .pool -_08009E6C: +@08009E6C: ldr r0, =0x03003110 strh r2, [r0] movs r1, 0 adds r3, r0, 0 movs r2, 0xEE -_08009E76: +@08009E76: adds r1, 0x1 lsls r0, r1, 1 adds r0, r3 @@ -2622,11 +2622,11 @@ _08009E76: lsls r1, 24 lsrs r1, 24 cmp r1, 0x4 - bls _08009E76 - b _08009F06 + bls @08009E76 + b @08009F06 .align 2, 0 .pool -_08009E8C: +@08009E8C: ldr r1, =0x03003110 strh r2, [r1] ldr r2, =0x03000d10 @@ -2635,54 +2635,54 @@ _08009E8C: ldrb r0, [r2, 0x9] adds r0, 0x80 strh r0, [r1, 0x4] - b _08009F06 + b @08009F06 .align 2, 0 .pool -_08009EA8: +@08009EA8: ldr r0, =0x03003110 strh r2, [r0] ldr r1, =0x0203ce7c ldrh r1, [r1] - b _08009F04 + b @08009F04 .align 2, 0 .pool -_08009EBC: +@08009EBC: ldr r0, =0x03003110 strh r2, [r0] ldr r1, =0x03003150 ldrb r1, [r1] - b _08009F04 + b @08009F04 .align 2, 0 .pool -_08009ED0: +@08009ED0: ldr r0, =0x03003110 strh r2, [r0] ldr r1, =0x030030f4 ldrh r1, [r1] - b _08009F04 + b @08009F04 .align 2, 0 .pool -_08009EE4: +@08009EE4: ldr r0, =0x03003110 strh r2, [r0] - b _08009F06 + b @08009F06 .align 2, 0 .pool -_08009EF0: +@08009EF0: ldr r0, =0x03005da8 ldrh r1, [r0] cmp r1, 0 - beq _08009F06 + beq @08009F06 ldr r0, =0x030022b4 ldrb r0, [r0] cmp r0, 0 - bne _08009F06 + bne @08009F06 ldr r0, =0x03003110 -_08009F02: +@08009F02: strh r2, [r0] -_08009F04: +@08009F04: strh r1, [r0, 0x2] -_08009F06: +@08009F06: pop {r0} bx r0 .align 2, 0 @@ -2690,14 +2690,14 @@ _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] cmp r0, 0 - beq _08009F26 + beq @08009F26 bl sub_800F804 -_08009F26: +@08009F26: ldr r1, =0x03003140 ldr r0, =sub_8009F70 + 1 str r0, [r1] @@ -2708,43 +2708,43 @@ _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] cmp r0, 0 - beq _08009F50 + beq @08009F50 bl sub_800F7E4 - b _08009F6A + b @08009F6A .align 2, 0 .pool -_08009F50: +@08009F50: ldr r0, =0x03003140 ldr r1, [r0] ldr r0, =sub_8009F70 + 1 cmp r1, r0 - beq _08009F68 + beq @08009F68 movs r0, 0 - b _08009F6A + b @08009F6A .align 2, 0 .pool -_08009F68: +@08009F68: movs r0, 0x1 -_08009F6A: +@08009F6A: pop {r1} bx r1 thumb_func_end sub_8009F3C thumb_func_start sub_8009F70 -sub_8009F70: @ 8009F70 +sub_8009F70: ; 8009F70 push {lr} ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 - bne _08009F80 + bne @08009F80 ldr r0, =0x0000cafe bl sub_8009D90 -_08009F80: +@08009F80: pop {r0} bx r0 .align 2, 0 @@ -2752,20 +2752,20 @@ _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] cmp r1, 0 - beq _08009FA0 + beq @08009FA0 bl Rfu_set_zero - b _08009FA4 + b @08009FA4 .align 2, 0 .pool -_08009FA0: +@08009FA0: ldr r0, =0x03003140 str r1, [r0] -_08009FA4: +@08009FA4: pop {r0} bx r0 .align 2, 0 @@ -2773,20 +2773,20 @@ _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] cmp r1, 0 - beq _08009FC0 + beq @08009FC0 bl Rfu_set_zero - b _08009FC4 + b @08009FC4 .align 2, 0 .pool -_08009FC0: +@08009FC0: ldr r0, =0x03003140 str r1, [r0] -_08009FC4: +@08009FC4: pop {r0} bx r0 .align 2, 0 @@ -2794,31 +2794,31 @@ _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] cmp r0, 0 - bne _08009FEC + bne @08009FEC ldr r0, =0x030030e0 ldr r0, [r0] movs r1, 0x1C ands r0, r1 lsrs r0, 2 - b _08009FF4 + b @08009FF4 .align 2, 0 .pool -_08009FEC: +@08009FEC: bl sub_80104F4 lsls r0, 24 lsrs r0, 24 -_08009FF4: +@08009FF4: pop {r1} bx r1 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 @@ -2827,91 +2827,91 @@ sub_8009FF8: @ 8009FF8 lsrs r4, r0, 24 movs r2, 0 cmp r2, r4 - bge _0800A030 + bge @0800A030 movs r7, 0xFF ldr r3, =0x020229e8 -_0800A010: +@0800A010: ldrh r0, [r3] adds r1, r7, 0 ands r1, r0 cmp r1, r6 - beq _0800A01E + beq @0800A01E cmp r1, r5 - bne _0800A028 -_0800A01E: + bne @0800A028 +@0800A01E: movs r0, 0x1 - b _0800A034 + b @0800A034 .align 2, 0 .pool -_0800A028: +@0800A028: adds r3, 0x1C adds r2, 0x1 cmp r2, r4 - blt _0800A010 -_0800A030: + blt @0800A010 +@0800A030: movs r0, 0x1 negs r0, r0 -_0800A034: +@0800A034: pop {r4-r7} pop {r1} bx r1 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 lsrs r0, 24 cmp r0, 0x4 - bne _0800A05A + bne @0800A05A movs r0, 0x2 movs r1, 0x1 bl sub_8009FF8 cmp r0, 0 - bge _0800A05E -_0800A05A: + bge @0800A05E +@0800A05A: movs r0, 0 - b _0800A060 -_0800A05E: + b @0800A060 +@0800A05E: movs r0, 0x1 -_0800A060: +@0800A060: pop {r1} bx r1 thumb_func_end sub_800A040 thumb_func_start sub_800A064 -sub_800A064: @ 800A064 +sub_800A064: ; 800A064 push {lr} movs r0, 0x2 movs r1, 0x1 bl sub_8009FF8 cmp r0, 0 - bge _0800A076 + bge @0800A076 movs r0, 0 - b _0800A078 -_0800A076: + b @0800A078 +@0800A076: movs r0, 0x1 -_0800A078: +@0800A078: pop {r1} bx r1 thumb_func_end sub_800A064 thumb_func_start sub_800A07C -sub_800A07C: @ 800A07C +sub_800A07C: ; 800A07C push {lr} movs r0, 0x4 movs r1, 0x5 bl sub_8009FF8 adds r2, r0, 0 cmp r2, 0 - blt _0800A0A4 + blt @0800A0A4 ldr r0, =0x020229e8 lsls r1, r2, 3 subs r1, r2 @@ -2919,20 +2919,20 @@ sub_800A07C: @ 800A07C adds r1, r0 ldrh r0, [r1, 0x1A] cmp r0, 0x1 - bne _0800A0A4 + bne @0800A0A4 movs r0, 0x1 - b _0800A0A6 + b @0800A0A6 .align 2, 0 .pool -_0800A0A4: +@0800A0A4: movs r0, 0 -_0800A0A6: +@0800A0A6: pop {r1} bx r1 thumb_func_end sub_800A07C thumb_func_start sub_800A0AC -sub_800A0AC: @ 800A0AC +sub_800A0AC: ; 800A0AC push {lr} ldr r0, =0x03000d5c movs r1, 0 @@ -2947,7 +2947,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 @@ -2955,106 +2955,106 @@ sub_800A0C8: @ 800A0C8 ldr r0, =0x03003124 ldrb r4, [r0] cmp r4, 0x1 - beq _0800A0DA - b _0800A214 -_0800A0DA: + beq @0800A0DA + b @0800A214 +@0800A0DA: bl sub_800ABAC lsls r0, 24 lsrs r0, 24 cmp r5, r0 - bgt _0800A0EA + bgt @0800A0EA cmp r0, r6 - ble _0800A0FC -_0800A0EA: + ble @0800A0FC +@0800A0EA: ldr r1, =0x03000d5c movs r0, 0x6 str r0, [r1] - b _0800A22E + b @0800A22E .align 2, 0 .pool -_0800A0FC: +@0800A0FC: bl sub_8009FCC lsls r0, 24 cmp r0, 0 - bne _0800A10E + bne @0800A10E ldr r0, =0x0300306c strb r4, [r0] bl sub_80097E8 -_0800A10E: +@0800A10E: movs r6, 0 ldr r4, =0x020229e8 movs r5, 0 - b _0800A134 + b @0800A134 .align 2, 0 .pool -_0800A120: +@0800A120: adds r0, r4, 0 adds r0, 0x14 adds r0, r5, r0 ldr r1, [r0] ldr r0, [r4, 0x14] cmp r1, r0 - bne _0800A130 + bne @0800A130 adds r7, 0x1 -_0800A130: +@0800A130: adds r5, 0x1C adds r6, 0x1 -_0800A134: +@0800A134: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r6, r0 - blt _0800A120 + blt @0800A120 bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r7, r0 - bne _0800A1AC + bne @0800A1AC ldr r0, =0x020229e8 ldr r1, [r0, 0x14] ldr r0, =0x00001133 cmp r1, r0 - bne _0800A19C + bne @0800A19C bl sub_807A728 cmp r0, 0x1 - beq _0800A184 + beq @0800A184 cmp r0, 0x1 - bgt _0800A178 + bgt @0800A178 cmp r0, 0 - beq _0800A19C + beq @0800A19C ldr r3, =0x03000d5c - b _0800A22C + b @0800A22C .align 2, 0 .pool -_0800A178: +@0800A178: cmp r0, 0x2 - beq _0800A190 + beq @0800A190 ldr r3, =0x03000d5c - b _0800A22C + b @0800A22C .align 2, 0 .pool -_0800A184: +@0800A184: ldr r1, =0x03000d5c movs r0, 0x4 - b _0800A1A0 + b @0800A1A0 .align 2, 0 .pool -_0800A190: +@0800A190: ldr r1, =0x03000d5c movs r0, 0x5 - b _0800A1A0 + b @0800A1A0 .align 2, 0 .pool -_0800A19C: +@0800A19C: ldr r1, =0x03000d5c movs r0, 0x1 -_0800A1A0: +@0800A1A0: str r0, [r1] adds r3, r1, 0 - b _0800A22C + b @0800A22C .align 2, 0 .pool -_0800A1AC: +@0800A1AC: ldr r6, =0x03000d5c movs r0, 0x3 str r0, [r6] @@ -3080,26 +3080,26 @@ _0800A1AC: ldr r1, [r1] ldr r2, =0x00002266 cmp r5, r2 - bne _0800A1EA + bne @0800A1EA ldr r0, =0x00002277 cmp r1, r0 - beq _0800A1F6 -_0800A1EA: + beq @0800A1F6 +@0800A1EA: ldr r0, =0x00002277 adds r3, r6, 0 cmp r5, r0 - bne _0800A22C + bne @0800A22C cmp r1, r2 - bne _0800A22C -_0800A1F6: + bne @0800A22C +@0800A1F6: ldr r1, =0x020375e2 movs r0, 0x3 strh r0, [r1] ldr r3, =0x03000d5c - b _0800A22C + b @0800A22C .align 2, 0 .pool -_0800A214: +@0800A214: ldr r0, =0x020229c8 ldrh r1, [r0] adds r1, 0x1 @@ -3109,12 +3109,12 @@ _0800A214: lsls r0, 18 ldr r3, =0x03000d5c cmp r1, r0 - bls _0800A22C + bls @0800A22C movs r0, 0x2 str r0, [r3] -_0800A22C: +@0800A22C: ldrb r0, [r3] -_0800A22E: +@0800A22E: pop {r4-r7} pop {r1} bx r1 @@ -3123,15 +3123,15 @@ _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 ldr r5, =0x020229e8 - b _0800A26C + b @0800A26C .align 2, 0 .pool -_0800A24C: +@0800A24C: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 @@ -3141,37 +3141,37 @@ _0800A24C: ldr r1, [r0] ldr r0, [r5, 0x14] cmp r1, r0 - bne _0800A266 + bne @0800A266 adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_0800A266: +@0800A266: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_0800A26C: +@0800A26C: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bcc _0800A24C + bcc @0800A24C bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r6, r0 - bne _0800A290 + bne @0800A290 movs r2, 0x1 ldr r0, =0x03000d5c str r2, [r0] - b _0800A298 + b @0800A298 .align 2, 0 .pool -_0800A290: +@0800A290: movs r2, 0 ldr r1, =0x03000d5c movs r0, 0x3 str r0, [r1] -_0800A298: +@0800A298: adds r0, r2, 0 pop {r4-r6} pop {r1} @@ -3181,7 +3181,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 @@ -3197,11 +3197,11 @@ 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 -_0800A2C2: +@0800A2C2: adds r0, r5, 0 movs r1, 0 movs r2, 0x1C @@ -3209,7 +3209,7 @@ _0800A2C2: adds r5, 0x1C subs r4, 0x1 cmp r4, 0 - bge _0800A2C2 + bge @0800A2C2 pop {r4,r5} pop {r0} bx r0 @@ -3218,7 +3218,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] @@ -3231,19 +3231,19 @@ 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 ldr r4, =0x03000d10 ldrb r5, [r4, 0x8] cmp r5, 0 - beq _0800A30C + beq @0800A30C movs r0, 0 - b _0800A34A + b @0800A34A .align 2, 0 .pool -_0800A30C: +@0800A30C: bl link_get_multiplayer_id strb r0, [r4, 0x9] movs r0, 0x1 @@ -3252,20 +3252,20 @@ _0800A30C: strh r5, [r4] adds r0, 0xFF cmp r6, r0 - bls _0800A324 + bls @0800A324 str r7, [r4, 0x4] - b _0800A336 -_0800A324: + b @0800A336 +@0800A324: ldr r5, =0x020228c4 cmp r7, r5 - beq _0800A334 + beq @0800A334 adds r0, r5, 0 adds r1, r7, 0 adds r2, r6, 0 bl memcpy -_0800A334: +@0800A334: str r5, [r4, 0x4] -_0800A336: +@0800A336: ldr r0, =0x0000bbbb bl sub_8009D90 ldr r1, =0x03003140 @@ -3275,7 +3275,7 @@ _0800A336: movs r0, 0 str r0, [r1] movs r0, 0x1 -_0800A34A: +@0800A34A: pop {r4-r7} pop {r1} bx r1 @@ -3284,18 +3284,18 @@ _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] adds r0, 0x1 str r0, [r1] cmp r0, 0x2 - bls _0800A378 + bls @0800A378 ldr r1, =0x03003140 ldr r0, =sub_800A388 + 1 str r0, [r1] -_0800A378: +@0800A378: pop {r0} bx r0 .align 2, 0 @@ -3303,7 +3303,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] @@ -3314,7 +3314,7 @@ sub_800A388: @ 800A388 adds r4, r0, 0 adds r6, r4, 0 adds r2, 0x2 -_0800A39C: +@0800A39C: lsls r0, r3, 1 ldrh r1, [r6] adds r0, r1 @@ -3327,7 +3327,7 @@ _0800A39C: adds r2, 0x2 adds r3, 0x1 cmp r3, 0x6 - ble _0800A39C + ble @0800A39C ldrh r0, [r4] adds r0, 0xE strh r0, [r4] @@ -3335,13 +3335,13 @@ _0800A39C: lsls r0, 16 lsrs r0, 16 cmp r1, r0 - bhi _0800A3D0 + bhi @0800A3D0 movs r0, 0 strb r0, [r4, 0x8] ldr r1, =0x03003140 ldr r0, =sub_800A3EC + 1 str r0, [r1] -_0800A3D0: +@0800A3D0: pop {r4-r6} pop {r0} bx r0 @@ -3350,7 +3350,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] @@ -3360,7 +3360,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 @@ -3376,7 +3376,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 @@ -3384,16 +3384,16 @@ sub_800A418: @ 800A418 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _0800A438 + beq @0800A438 bl sub_800F850 - b _0800A43E + b @0800A43E .align 2, 0 .pool -_0800A438: +@0800A438: ldr r1, =0x03003140 ldr r0, =sub_800A3F8 + 1 str r0, [r1] -_0800A43E: +@0800A43E: pop {r0} bx r0 .align 2, 0 @@ -3401,7 +3401,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 @@ -3410,7 +3410,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 @@ -3421,30 +3421,30 @@ 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] cmp r0, 0x1 - beq _0800A484 + beq @0800A484 ldr r0, =0x04000128 ldr r0, [r0] lsls r0, 26 lsrs r0, 30 - b _0800A48C + b @0800A48C .align 2, 0 .pool -_0800A484: +@0800A484: bl rfu_get_multiplayer_id lsls r0, 24 lsrs r0, 24 -_0800A48C: +@0800A48C: pop {r1} bx r1 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 @@ -3461,7 +3461,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 @@ -3469,16 +3469,16 @@ link_0800A448: @ 800A4AC ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 - beq _0800A4C8 + beq @0800A4C8 adds r0, r3, 0 bl sub_800A2F4 - b _0800A4CE + b @0800A4CE .align 2, 0 .pool -_0800A4C8: +@0800A4C8: adds r0, r3, 0 bl sub_800FE84 -_0800A4CE: +@0800A4CE: lsls r0, 24 lsrs r0, 24 pop {r1} @@ -3486,7 +3486,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 @@ -3494,30 +3494,30 @@ sub_800A4D8: @ 800A4D8 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 - bne _0800A4F8 + bne @0800A4F8 adds r0, r1, 0 bl sub_8010100 lsls r0, 24 lsrs r0, 24 - b _0800A514 + b @0800A514 .align 2, 0 .pool -_0800A4F8: +@0800A4F8: ldr r0, =0x03003140 ldr r0, [r0] cmp r0, 0 - beq _0800A508 + beq @0800A508 movs r0, 0 - b _0800A514 + b @0800A514 .align 2, 0 .pool -_0800A508: +@0800A508: ldr r0, =0x03003150 strb r2, [r0] ldr r0, =0x0000cccc bl sub_8009D90 movs r0, 0x1 -_0800A514: +@0800A514: pop {r1} bx r1 .align 2, 0 @@ -3525,28 +3525,28 @@ _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] cmp r0, 0x1 - bne _0800A538 + bne @0800A538 bl sub_8010500 lsls r0, 24 lsrs r0, 24 - b _0800A546 + b @0800A546 .align 2, 0 .pool -_0800A538: +@0800A538: movs r1, 0 ldr r0, =0x03003140 ldr r0, [r0] cmp r0, 0 - bne _0800A544 + bne @0800A544 movs r1, 0x1 -_0800A544: +@0800A544: adds r0, r1, 0 -_0800A546: +@0800A546: pop {r1} bx r1 .align 2, 0 @@ -3554,12 +3554,12 @@ _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] cmp r0, 0x1 - beq _0800A57C + beq @0800A57C ldr r2, =0x0300307c ldrb r0, [r2, 0x3] lsls r0, 3 @@ -3571,12 +3571,12 @@ sub_800A550: @ 800A550 orrs r0, r1 ldrb r1, [r2] orrs r0, r1 - b _0800A580 + b @0800A580 .align 2, 0 .pool -_0800A57C: +@0800A57C: bl sub_800FCD8 -_0800A580: +@0800A580: lsls r0, 24 lsrs r0, 24 pop {r1} @@ -3584,25 +3584,25 @@ _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 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 - bne _0800A5A4 + bne @0800A5A4 adds r0, r1, 0 bl sub_800F6FC - b _0800A5AC + b @0800A5AC .align 2, 0 .pool -_0800A5A4: +@0800A5A4: ldr r0, =0x0300307c adds r0, r1, r0 movs r1, 0x1 strb r1, [r0] -_0800A5AC: +@0800A5AC: pop {r0} bx r0 .align 2, 0 @@ -3610,33 +3610,33 @@ _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] cmp r0, 0x1 - bne _0800A5D4 + bne @0800A5D4 movs r4, 0 -_0800A5C0: +@0800A5C0: lsls r0, r4, 24 lsrs r0, 24 bl sub_800F728 adds r4, 0x1 cmp r4, 0x4 - ble _0800A5C0 - b _0800A5E2 + ble @0800A5C0 + b @0800A5E2 .align 2, 0 .pool -_0800A5D4: +@0800A5D4: ldr r1, =0x0300307c movs r2, 0 adds r0, r1, 0x3 -_0800A5DA: +@0800A5DA: strb r2, [r0] subs r0, 0x1 cmp r0, r1 - bge _0800A5DA -_0800A5E2: + bge @0800A5DA +@0800A5E2: pop {r4} pop {r0} bx r0 @@ -3645,28 +3645,28 @@ _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 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 - bne _0800A608 + bne @0800A608 adds r0, r1, 0 bl sub_800F728 - b _0800A616 + b @0800A616 .align 2, 0 .pool -_0800A608: +@0800A608: ldr r0, =0x0300307c adds r1, r0 ldrb r0, [r1] cmp r0, 0 - beq _0800A616 + beq @0800A616 movs r0, 0 strb r0, [r1] -_0800A616: +@0800A616: pop {r0} bx r0 .align 2, 0 @@ -3674,22 +3674,22 @@ _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] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0800A63C + beq @0800A63C movs r0, 0x1C ands r1, r0 cmp r1, 0x4 - bls _0800A63C + bls @0800A63C ldr r1, =0x03003144 movs r0, 0x1 strb r0, [r1] -_0800A63C: +@0800A63C: pop {r0} bx r0 .align 2, 0 @@ -3697,7 +3697,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 @@ -3705,8 +3705,8 @@ sub_800A648: @ 800A648 movs r2, 0 lsrs r1, 17 cmp r3, r1 - bcs _0800A66E -_0800A658: + bcs @0800A66E +@0800A658: lsls r0, r2, 1 adds r0, r4 ldrh r0, [r0] @@ -3717,8 +3717,8 @@ _0800A658: lsls r0, 16 lsrs r2, r0, 16 cmp r2, r1 - bcc _0800A658 -_0800A66E: + bcc @0800A658 +@0800A66E: adds r0, r3, 0 pop {r4} pop {r1} @@ -3726,7 +3726,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 @@ -3758,7 +3758,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 @@ -3789,7 +3789,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 @@ -3801,9 +3801,9 @@ sub_800A6E8: @ 800A6E8 lsrs r3, 24 movs r4, 0 cmp r4, r3 - bge _0800A714 + bge @0800A714 movs r2, 0xF -_0800A702: +@0800A702: mov r0, sp adds r1, r0, r4 adds r0, r5, 0 @@ -3812,12 +3812,12 @@ _0800A702: lsrs r5, 4 adds r4, 0x1 cmp r4, r3 - blt _0800A702 -_0800A714: + blt @0800A702 +@0800A714: subs r4, r3, 0x1 cmp r4, 0 - blt _0800A734 -_0800A71A: + blt @0800A734 +@0800A71A: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -3829,8 +3829,8 @@ _0800A71A: lsrs r6, r0, 24 subs r4, 0x1 cmp r4, 0 - bge _0800A71A -_0800A734: + bge @0800A71A +@0800A734: add sp, 0x10 pop {r4-r7} pop {r0} @@ -3838,7 +3838,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 @@ -3858,18 +3858,18 @@ sub_800A73C: @ 800A73C negs r0, r0 str r0, [sp, 0x10] cmp r6, 0 - bge _0800A768 + bge @0800A768 str r7, [sp, 0x10] negs r6, r6 -_0800A768: +@0800A768: movs r5, 0 movs r1, 0x1 negs r1, r1 add r1, r8 mov r10, r1 cmp r5, r8 - bge _0800A794 -_0800A776: + bge @0800A794 +@0800A776: mov r0, sp adds r4, r0, r5 adds r0, r6, 0 @@ -3882,12 +3882,12 @@ _0800A776: adds r6, r0, 0 adds r5, 0x1 cmp r5, r8 - blt _0800A776 -_0800A794: + blt @0800A776 +@0800A794: mov r5, r10 cmp r5, 0 - blt _0800A7B4 -_0800A79A: + blt @0800A7B4 +@0800A79A: mov r1, sp adds r0, r1, r5 ldrb r0, [r0] @@ -3899,19 +3899,19 @@ _0800A79A: lsrs r7, r0, 24 subs r5, 0x1 cmp r5, 0 - bge _0800A79A -_0800A7B4: + bge @0800A79A +@0800A7B4: movs r0, 0x1 negs r0, r0 ldr r1, [sp, 0x10] cmp r1, r0 - beq _0800A7CA + beq @0800A7CA lsls r1, 24 lsrs r1, 24 movs r0, 0xA mov r2, r9 bl sub_800A678 -_0800A7CA: +@0800A7CA: add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -3923,7 +3923,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 @@ -3933,19 +3933,19 @@ sub_800A7DC: @ 800A7DC movs r6, 0 ldrb r0, [r3] cmp r0, 0 - beq _0800A81C + beq @0800A81C adds r4, r3, 0 lsls r5, r2, 24 -_0800A7F4: +@0800A7F4: ldrb r0, [r4] cmp r0, 0xA - bne _0800A804 + bne @0800A804 movs r0, 0x80 lsls r0, 17 adds r5, r0 movs r6, 0 - b _0800A814 -_0800A804: + b @0800A814 +@0800A804: ldrb r0, [r4] adds r1, r7, r6 lsls r1, 24 @@ -3953,30 +3953,30 @@ _0800A804: lsrs r2, r5, 24 bl sub_800A6B0 adds r6, 0x1 -_0800A814: +@0800A814: adds r4, 0x1 ldrb r0, [r4] cmp r0, 0 - bne _0800A7F4 -_0800A81C: + bne @0800A7F4 +@0800A81C: pop {r4-r7} pop {r0} bx r0 thumb_func_end sub_800A7DC thumb_func_start sub_800A824 -sub_800A824: @ 800A824 +sub_800A824: ; 800A824 push {lr} ldr r0, =0x030030e0 ldr r0, [r0] movs r1, 0x20 ands r0, r1 cmp r0, 0 -_0800A830: - beq _0800A838 +@0800A830: + beq @0800A838 ldr r0, =0x00002222 bl sub_8009D90 -_0800A838: +@0800A838: ldr r1, =0x03003140 movs r0, 0 str r0, [r1] @@ -3987,7 +3987,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, =0x082ed1e4 @@ -4093,7 +4093,7 @@ task00_link_test: @ 800A850 movs r5, 0x80 lsls r5, 19 ldr r4, =0x03003148 -_0800A94E: +@0800A94E: ldrh r0, [r4] lsrs r2, r5, 24 movs r1, 0xA @@ -4105,7 +4105,7 @@ _0800A94E: adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble _0800A94E + ble @0800A94E add sp, 0x20 pop {r4-r6} pop {r0} @@ -4115,7 +4115,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 @@ -4126,17 +4126,17 @@ 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 ldr r0, =0x03003100 ldrb r0, [r0] cmp r1, r0 - bge _0800A9CA + bge @0800A9CA movs r4, 0x1 adds r3, r0, 0 -_0800A9BA: +@0800A9BA: adds r0, r4, 0 lsls r0, r2 orrs r1, r0 @@ -4144,8 +4144,8 @@ _0800A9BA: lsrs r1, r0, 24 adds r2, 0x1 cmp r2, r3 - blt _0800A9BA -_0800A9CA: + blt @0800A9BA +@0800A9CA: adds r0, r1, 0 pop {r4} pop {r1} @@ -4155,25 +4155,25 @@ _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 movs r6, 0x1 - b _0800A9EE -_0800A9E2: + b @0800A9EE +@0800A9E2: adds r0, r6, 0 lsls r0, r5 orrs r4, r0 lsls r0, r4, 24 lsrs r4, r0, 24 adds r5, 0x1 -_0800A9EE: +@0800A9EE: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r5, r0 - blt _0800A9E2 + blt @0800A9E2 adds r0, r4, 0 pop {r4-r6} pop {r1} @@ -4181,7 +4181,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] @@ -4191,7 +4191,7 @@ sub_800AA04: @ 800AA04 ldr r4, =0x020229e8 ldr r3, =0x02022a74 movs r2, 0x4 -_0800AA18: +@0800AA18: adds r0, r3, 0 adds r1, r4, 0 ldm r1!, {r5-r7} @@ -4204,7 +4204,7 @@ _0800AA18: adds r3, 0x1C subs r2, 0x1 cmp r2, 0 - bge _0800AA18 + bge @0800AA18 pop {r4-r7} pop {r0} bx r0 @@ -4213,7 +4213,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 @@ -4222,7 +4222,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 @@ -4231,7 +4231,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 @@ -4241,7 +4241,7 @@ sub_800AA60: @ 800AA60 ldrb r1, [r0] mov r9, r0 cmp r3, r1 - bge _0800AAB4 + bge @0800AAB4 ldr r0, =0x020229e8 mov r12, r0 ldr r0, =0x02022a74 @@ -4253,49 +4253,49 @@ sub_800AA60: @ 800AA60 adds r5, r0, 0x4 movs r4, 0 adds r2, r1, 0 -_0800AA8A: +@0800AA8A: mov r0, r12 adds r0, 0x4 adds r0, r4, r0 ldr r1, [r0] ldr r0, [r5] cmp r1, r0 - bne _0800AAA8 + bne @0800AAA8 ldrh r0, [r7] cmp r0, r8 - bne _0800AAA6 + bne @0800AAA6 adds r1, r0, 0 ldr r0, [r6] cmp r1, r0 - bne _0800AAA8 -_0800AAA6: + bne @0800AAA8 +@0800AAA6: adds r3, 0x1 -_0800AAA8: +@0800AAA8: adds r6, 0x1C adds r5, 0x1C adds r4, 0x1C subs r2, 0x1 cmp r2, 0 - bne _0800AA8A -_0800AAB4: + bne @0800AA8A +@0800AAB4: mov r0, r9 ldrb r0, [r0] cmp r3, r0 - bne _0800AAE4 + bne @0800AAE4 bl sub_800ABAC lsls r0, 24 lsrs r0, 24 mov r1, r9 ldrb r1, [r1] cmp r0, r1 - bne _0800AAE4 + bne @0800AAE4 movs r0, 0x1 - b _0800AAE6 + b @0800AAE6 .align 2, 0 .pool -_0800AAE4: +@0800AAE4: movs r0, 0 -_0800AAE6: +@0800AAE6: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -4305,11 +4305,11 @@ _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 -_0800AAFA: +@0800AAFA: adds r0, r5, 0 movs r1, 0 movs r2, 0x1C @@ -4317,7 +4317,7 @@ _0800AAFA: adds r5, 0x1C subs r4, 0x1 cmp r4, 0 - bge _0800AAFA + bge @0800AAFA pop {r4,r5} pop {r0} bx r0 @@ -4326,7 +4326,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} @@ -4334,7 +4334,7 @@ sub_800AB18: @ 800AB18 ldr r0, =0x03003100 ldrb r0, [r0] cmp r4, r0 - bcs _0800AB78 + bcs @0800AB78 ldr r6, =0x02022a74 ldr r5, =0x020229e8 movs r0, 0x8 @@ -4342,7 +4342,7 @@ sub_800AB18: @ 800AB18 mov r8, r0 adds r7, r5, 0 adds r7, 0x8 -_0800AB36: +@0800AB36: lsls r0, r4, 3 subs r0, r4 lsls r2, r0, 2 @@ -4353,29 +4353,29 @@ _0800AB36: ldr r1, [r1] ldr r0, [r0] cmp r1, r0 - bne _0800AB5A + bne @0800AB5A mov r1, r8 adds r0, r2, r1 adds r1, r2, r7 bl sub_8008C44 cmp r0, 0 - beq _0800AB6A -_0800AB5A: + beq @0800AB6A +@0800AB5A: ldr r1, =0x0300306c movs r0, 0x1 strb r0, [r1] bl sub_80097E8 ldr r0, =c2_800ACD4 + 1 bl set_callback2 -_0800AB6A: +@0800AB6A: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 ldr r0, =0x03003100 ldrb r0, [r0] cmp r4, r0 - bcc _0800AB36 -_0800AB78: + bcc @0800AB36 +@0800AB78: pop {r3} mov r8, r3 pop {r4-r7} @@ -4386,7 +4386,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] @@ -4398,7 +4398,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 @@ -4410,31 +4410,31 @@ 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] cmp r0, 0 - bne _0800ABDC + bne @0800ABDC ldr r0, =0x030030e0 ldr r0, [r0] lsrs r0, 5 movs r1, 0x1 ands r0, r1 - b _0800ABE4 + b @0800ABE4 .align 2, 0 .pool -_0800ABDC: +@0800ABDC: bl sub_8011AB0 lsls r0, 24 lsrs r0, 24 -_0800ABE4: +@0800ABE4: pop {r1} bx r1 thumb_func_end sub_800ABBC thumb_func_start sub_800ABE8 -sub_800ABE8: @ 800ABE8 +sub_800ABE8: ; 800ABE8 ldr r0, =0x03000d58 ldrb r0, [r0] bx lr @@ -4443,30 +4443,30 @@ 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 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 - bne _0800AC0C + bne @0800AC0C bl task_add_05_task_del_08FA224_when_no_RfuFunc - b _0800AC20 + b @0800AC20 .align 2, 0 .pool -_0800AC0C: +@0800AC0C: ldr r2, =0x03003140 ldr r1, [r2] cmp r1, 0 - bne _0800AC20 + bne @0800AC20 ldr r0, =sub_800AC80 + 1 str r0, [r2] ldr r0, =0x030030e4 strb r1, [r0] ldr r0, =0x030030f4 strh r3, [r0] -_0800AC20: +@0800AC20: pop {r0} bx r0 .align 2, 0 @@ -4474,36 +4474,36 @@ _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] cmp r0, 0x1 - bne _0800AC48 + bne @0800AC48 bl task_add_05_task_del_08FA224_when_no_RfuFunc - b _0800AC70 + b @0800AC70 .align 2, 0 .pool -_0800AC48: +@0800AC48: ldr r2, =0x03003140 ldr r1, [r2] cmp r1, 0 - beq _0800AC64 + beq @0800AC64 ldr r1, =0x02022b08 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0800AC70 + b @0800AC70 .align 2, 0 .pool -_0800AC64: +@0800AC64: ldr r0, =sub_800AC80 + 1 str r0, [r2] ldr r0, =0x030030e4 strb r1, [r0] ldr r0, =0x030030f4 strh r1, [r0] -_0800AC70: +@0800AC70: pop {r0} bx r0 .align 2, 0 @@ -4511,18 +4511,18 @@ _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] cmp r0, 0 - bne _0800AC96 + bne @0800AC96 ldr r0, =0x00005fff bl sub_8009D90 ldr r1, =0x03003140 ldr r0, =sub_800ACAC + 1 str r0, [r1] -_0800AC96: +@0800AC96: pop {r0} bx r0 .align 2, 0 @@ -4530,7 +4530,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 @@ -4538,21 +4538,21 @@ sub_800ACAC: @ 800ACAC movs r3, 0 movs r1, 0 cmp r3, r2 - bge _0800ACD0 + bge @0800ACD0 ldr r4, =0x030030f0 -_0800ACC0: +@0800ACC0: adds r0, r1, r4 ldrb r0, [r0] cmp r0, 0 - beq _0800ACCA + beq @0800ACCA adds r3, 0x1 -_0800ACCA: +@0800ACCA: adds r1, 0x1 cmp r1, r2 - blt _0800ACC0 -_0800ACD0: + blt @0800ACC0 +@0800ACD0: cmp r3, r2 - bne _0800ACF4 + bne @0800ACF4 ldr r2, =0x02022fec ldr r0, [r2] movs r1, 0x21 @@ -4568,7 +4568,7 @@ _0800ACD0: str r0, [r1] ldr r0, =0x030030e4 strb r4, [r0] -_0800ACF4: +@0800ACF4: pop {r4} pop {r0} bx r0 @@ -4577,36 +4577,36 @@ _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] cmp r0, 0x1 - bne _0800AD24 + bne @0800AD24 bl task_add_05_task_del_08FA224_when_no_RfuFunc - b _0800AD4C + b @0800AD4C .align 2, 0 .pool -_0800AD24: +@0800AD24: ldr r2, =0x03003140 ldr r1, [r2] cmp r1, 0 - beq _0800AD40 + beq @0800AD40 ldr r1, =0x02022b08 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0800AD4C + b @0800AD4C .align 2, 0 .pool -_0800AD40: +@0800AD40: ldr r0, =sub_800AD5C + 1 str r0, [r2] ldr r0, =0x030030e4 strb r1, [r0] ldr r0, =0x030030f4 strh r1, [r0] -_0800AD4C: +@0800AD4C: pop {r0} bx r0 .align 2, 0 @@ -4614,18 +4614,18 @@ _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] cmp r0, 0 - bne _0800AD72 + bne @0800AD72 ldr r0, =0x00005fff bl sub_8009D90 ldr r1, =0x03003140 ldr r0, =sub_800AD88 + 1 str r0, [r1] -_0800AD72: +@0800AD72: pop {r0} bx r0 .align 2, 0 @@ -4633,7 +4633,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 @@ -4641,27 +4641,27 @@ sub_800AD88: @ 800AD88 movs r1, 0 movs r2, 0 cmp r1, r3 - bge _0800ADB6 + bge @0800ADB6 ldr r5, =0x030030f0 ldr r4, =0x020229e8 -_0800AD9E: +@0800AD9E: ldrh r0, [r4, 0x1A] cmp r0, 0x1 - beq _0800ADAC + beq @0800ADAC adds r0, r2, r5 ldrb r0, [r0] cmp r0, 0 - beq _0800ADAE -_0800ADAC: + beq @0800ADAE +@0800ADAC: adds r1, 0x1 -_0800ADAE: +@0800ADAE: adds r4, 0x1C adds r2, 0x1 cmp r2, r3 - blt _0800AD9E -_0800ADB6: + blt @0800AD9E +@0800ADB6: cmp r1, r3 - bne _0800ADDA + bne @0800ADDA ldr r2, =0x02022fec ldr r0, [r2] movs r1, 0x21 @@ -4677,7 +4677,7 @@ _0800ADB6: str r0, [r1] ldr r0, =0x030030e4 strb r4, [r0] -_0800ADDA: +@0800ADDA: pop {r4,r5} pop {r0} bx r0 @@ -4686,28 +4686,28 @@ _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] cmp r0, 0x1 - bne _0800AE0C + bne @0800AE0C bl sub_8010434 - b _0800AE1E + b @0800AE1E .align 2, 0 .pool -_0800AE0C: +@0800AE0C: ldr r1, =0x03003140 ldr r0, [r1] cmp r0, 0 - bne _0800AE18 + bne @0800AE18 ldr r0, =sub_800AE30 + 1 str r0, [r1] -_0800AE18: +@0800AE18: ldr r1, =0x030030e4 movs r0, 0 strb r0, [r1] -_0800AE1E: +@0800AE1E: pop {r0} bx r0 .align 2, 0 @@ -4715,18 +4715,18 @@ _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] cmp r0, 0 - bne _0800AE46 + bne @0800AE46 ldr r0, =0x00002ffe bl sub_8009D90 ldr r1, =0x03003140 ldr r0, =sub_800AE5C + 1 str r0, [r1] -_0800AE46: +@0800AE46: pop {r0} bx r0 .align 2, 0 @@ -4734,46 +4734,46 @@ _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 lsrs r2, r0, 24 movs r1, 0 cmp r1, r2 - bcs _0800AE86 + bcs @0800AE86 ldr r3, =0x030030ec ldrb r0, [r3] cmp r0, 0 - beq _0800AE86 -_0800AE74: + beq @0800AE86 +@0800AE74: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, r2 - bcs _0800AE86 + bcs @0800AE86 adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 - bne _0800AE74 -_0800AE86: + bne @0800AE74 +@0800AE86: cmp r1, r2 - bne _0800AEA4 + bne @0800AEA4 movs r1, 0 ldr r4, =0x03003140 ldr r3, =0x030030ec movs r2, 0 -_0800AE92: +@0800AE92: adds r0, r1, r3 strb r2, [r0] adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x3 - bls _0800AE92 + bls @0800AE92 movs r0, 0 str r0, [r4] -_0800AEA4: +@0800AEA4: pop {r4} pop {r0} bx r0 @@ -4782,23 +4782,23 @@ _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] cmp r0, 0 - beq _0800AEF4 + beq @0800AEF4 ldr r0, =0x030030e0 ldr r2, [r0] movs r0, 0xFE lsls r0, 11 ands r0, r2 cmp r0, 0 - beq _0800AEF4 + beq @0800AEF4 ldr r0, =0x030030f8 ldrb r0, [r0] cmp r0, 0 - bne _0800AEEA + bne @0800AEEA ldr r1, =0x02022b00 str r2, [r1] ldr r0, =0x03004130 @@ -4809,12 +4809,12 @@ sub_800AEB4: @ 800AEB4 strb r0, [r1, 0x5] ldr r0, =c2_800ACD4 + 1 bl set_callback2 -_0800AEEA: +@0800AEEA: ldr r1, =0x0300306c movs r0, 0x1 strb r0, [r1] bl sub_80097E8 -_0800AEF4: +@0800AEF4: pop {r0} bx r0 .align 2, 0 @@ -4822,7 +4822,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] @@ -4837,7 +4837,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 @@ -4864,16 +4864,16 @@ c2_800ACD4: @ 800AF30 ldr r1, =0x030030fc ldrb r0, [r1] cmp r0, 0 - beq _0800AF8C + beq @0800AF8C ldr r0, =0x02022b00 ldrb r0, [r0, 0x6] cmp r0, 0 - bne _0800AF88 + bne @0800AF88 movs r0, 0x3 strb r0, [r1] -_0800AF88: +@0800AF88: bl sub_800E604 -_0800AF8C: +@0800AF8C: ldr r0, =sub_80096BC + 1 bl SetVBlankCallback movs r0, 0 @@ -4894,7 +4894,7 @@ _0800AF8C: bl Window_InitFromTemplates lsls r0, 16 cmp r0, 0 - beq _0800B03C + beq @0800B03C bl TextBox_ResetSomeField bl reset_temp_tile_data_buffers movs r0, 0x50 @@ -4939,7 +4939,7 @@ _0800AF8C: bl fade_and_return_progress_probably ldr r0, =sub_800B1A0 + 1 bl set_callback2 -_0800B03C: +@0800B03C: pop {r4} pop {r0} bx r0 @@ -4948,7 +4948,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, =0x082ed168 @@ -5018,7 +5018,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, =0x082ed168 @@ -5061,7 +5061,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 @@ -5070,61 +5070,61 @@ sub_800B1A0: @ 800B1A0 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1E - beq _0800B20C + beq @0800B20C cmp r0, 0x1E - bgt _0800B1C4 + bgt @0800B1C4 cmp r0, 0 - beq _0800B1D8 + beq @0800B1D8 cmp r0, 0x2 - beq _0800B1F2 - b _0800B260 + beq @0800B1F2 + b @0800B260 .align 2, 0 .pool -_0800B1C4: +@0800B1C4: cmp r0, 0x5A - beq _0800B20C + beq @0800B20C cmp r0, 0x5A - bgt _0800B1D2 + bgt @0800B1D2 cmp r0, 0x3C - beq _0800B20C - b _0800B260 -_0800B1D2: + beq @0800B20C + b @0800B260 +@0800B1D2: cmp r0, 0x82 - beq _0800B214 - b _0800B260 -_0800B1D8: + beq @0800B214 + b @0800B260 +@0800B1D8: ldr r0, =0x02022b00 ldrb r0, [r0, 0x6] cmp r0, 0 - beq _0800B1EC + beq @0800B1EC bl sub_800B080 - b _0800B260 + b @0800B260 .align 2, 0 .pool -_0800B1EC: +@0800B1EC: bl sub_800B138 - b _0800B260 -_0800B1F2: + b @0800B260 +@0800B1F2: movs r0, 0 bl gpu_sync_bg_show ldr r0, =0x02022b00 ldrb r0, [r0, 0x6] cmp r0, 0 - beq _0800B260 + beq @0800B260 movs r0, 0x1 bl gpu_sync_bg_show - b _0800B260 + b @0800B260 .align 2, 0 .pool -_0800B20C: +@0800B20C: movs r0, 0x16 bl audio_play - b _0800B260 -_0800B214: + b @0800B260 +@0800B214: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x2 - bne _0800B244 + bne @0800B244 ldr r0, =0x082ed224 str r0, [sp] movs r0, 0 @@ -5136,12 +5136,12 @@ _0800B214: movs r2, 0x2 movs r3, 0x14 bl box_print - b _0800B260 + b @0800B260 .align 2, 0 .pool -_0800B244: +@0800B244: cmp r0, 0x1 - bne _0800B260 + bne @0800B260 ldr r0, =0x082ed224 str r0, [sp] movs r0, 0 @@ -5153,22 +5153,22 @@ _0800B244: movs r2, 0x2 movs r3, 0x14 bl box_print -_0800B260: +@0800B260: ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r0, r2 ldrb r1, [r1] cmp r1, 0xA0 - bne _0800B2D0 + bne @0800B2D0 ldr r4, =0x030030fc ldrb r2, [r4] cmp r2, 0x1 - bne _0800B2A8 + bne @0800B2A8 ldrh r0, [r0, 0x2E] ands r2, r0 cmp r2, 0 - beq _0800B2C2 + beq @0800B2C2 movs r0, 0x15 bl audio_play movs r0, 0 @@ -5177,36 +5177,36 @@ _0800B260: movs r0, 0 strb r0, [r1, 0x6] bl sub_81700F8 - b _0800B2C2 + b @0800B2C2 .align 2, 0 .pool -_0800B2A8: +@0800B2A8: cmp r2, 0x2 - bne _0800B2C2 + bne @0800B2C2 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0800B2C2 + beq @0800B2C2 bl rfu_REQ_stopMode bl rfu_waitREQComplete bl do_reset -_0800B2C2: +@0800B2C2: ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r0, r2 ldrb r1, [r1] cmp r1, 0xA0 - beq _0800B2DC -_0800B2D0: + beq @0800B2DC +@0800B2D0: movs r2, 0x87 lsls r2, 3 adds r1, r0, r2 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_0800B2DC: +@0800B2DC: add sp, 0xC pop {r4} pop {r0} @@ -5216,7 +5216,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 @@ -5228,7 +5228,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 @@ -5236,14 +5236,14 @@ sub_800B2F8: @ 800B2F8 movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _0800B314 + beq @0800B314 ldrh r1, [r2] movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne _0800B314 + bne @0800B314 movs r3, 0x1 -_0800B314: +@0800B314: adds r0, r3, 0 pop {r1} bx r1 @@ -5252,7 +5252,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 @@ -5264,7 +5264,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 @@ -5273,7 +5273,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 @@ -5282,7 +5282,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 @@ -5323,7 +5323,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 @@ -5351,17 +5351,17 @@ sub_800B3A4: @ 800B3A4 adds r1, r5, 0 bl strcmp cmp r0, 0 - bne _0800B3EE + bne @0800B3EE adds r0, r4, 0 adds r0, 0x2C adds r1, r5, 0 bl strcmp cmp r0, 0 - beq _0800B3F4 -_0800B3EE: + beq @0800B3F4 +@0800B3EE: ldr r0, =c2_800ACD4 + 1 bl set_callback2 -_0800B3F4: +@0800B3F4: pop {r4-r6} pop {r0} bx r0 @@ -5370,12 +5370,12 @@ _0800B3F4: thumb_func_end sub_800B3A4 thumb_func_start sub_800B40C -sub_800B40C: @ 800B40C +sub_800B40C: ; 800B40C push {r4,r5,lr} ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - bne _0800B45C + bne @0800B45C ldr r0, =0x03003144 ldr r1, =0x03003110 ldr r2, =0x03003090 @@ -5389,49 +5389,49 @@ sub_800B40C: @ 800B40C lsls r1, 1 ands r0, r1 cmp r0, 0 - beq _0800B480 + beq @0800B480 bl sub_808766C cmp r0, 0x1 - bne _0800B480 -_0800B43E: + bne @0800B480 +@0800B43E: movs r0, 0x1 - b _0800B482 + b @0800B482 .align 2, 0 .pool -_0800B45C: +@0800B45C: bl sub_8010EC0 adds r4, r0, 0 bl sub_8010F1C adds r5, r0, 0 bl sub_808766C cmp r0, 0x1 - bne _0800B480 + bne @0800B480 cmp r4, 0x1 - beq _0800B43E + beq @0800B43E bl sub_800F0B8 cmp r0, 0 - bne _0800B43E + bne @0800B43E cmp r5, 0 - bne _0800B43E -_0800B480: + bne @0800B43E +@0800B480: movs r0, 0 -_0800B482: +@0800B482: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_800B40C thumb_func_start sub_800B488 -sub_800B488: @ 800B488 +sub_800B488: ; 800B488 push {lr} ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _0800B498 + bne @0800B498 ldr r1, =0x030030fc movs r0, 0x1 strb r0, [r1] -_0800B498: +@0800B498: pop {r0} bx r0 .align 2, 0 @@ -5439,15 +5439,15 @@ _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] cmp r1, 0 - bne _0800B4B2 + bne @0800B4B2 ldr r0, =0x030030fc strb r1, [r0] -_0800B4B2: +@0800B4B2: pop {r0} bx r0 .align 2, 0 @@ -5455,15 +5455,15 @@ _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] cmp r1, 0 - bne _0800B4CE + bne @0800B4CE ldr r0, =0x030030fc strb r1, [r0] -_0800B4CE: +@0800B4CE: pop {r0} bx r0 .align 2, 0 @@ -5471,43 +5471,43 @@ _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] cmp r0, 0 - bne _0800B4FC + bne @0800B4FC ldr r0, =0x03003170 ldr r1, =0x00000fbd adds r0, r1 ldrb r0, [r0] - b _0800B500 + b @0800B500 .align 2, 0 .pool -_0800B4FC: +@0800B4FC: bl sub_80124D4 -_0800B500: +@0800B500: pop {r1} bx r1 thumb_func_end sub_800B4DC thumb_func_start sub_800B504 -sub_800B504: @ 800B504 +sub_800B504: ; 800B504 push {lr} bl sub_800B4DC cmp r0, 0x2 - bhi _0800B512 + bhi @0800B512 movs r0, 0 - b _0800B514 -_0800B512: + b @0800B514 +@0800B512: movs r0, 0x1 -_0800B514: +@0800B514: pop {r1} bx r1 thumb_func_end sub_800B504 thumb_func_start sub_800B518 -sub_800B518: @ 800B518 +sub_800B518: ; 800B518 ldr r0, =0x030030fc ldrb r0, [r0] bx lr @@ -5516,7 +5516,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] @@ -5530,7 +5530,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 @@ -5566,7 +5566,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 @@ -5617,7 +5617,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 @@ -5626,7 +5626,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 @@ -5634,80 +5634,80 @@ sub_800B638: @ 800B638 ldr r0, =0x03003170 ldrb r0, [r0, 0x1] cmp r0, 0x4 - bhi _0800B6EA + bhi @0800B6EA lsls r0, 2 - ldr r1, =_0800B65C + ldr r1, =@0800B65C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0800B65C: - .4byte _0800B670 - .4byte _0800B680 - .4byte _0800B698 - .4byte _0800B6D4 - .4byte _0800B6DE -_0800B670: +@0800B65C: + .4byte @0800B670 + .4byte @0800B680 + .4byte @0800B698 + .4byte @0800B6D4 + .4byte @0800B6DE +@0800B670: bl sub_800B53C ldr r1, =0x03003170 movs r0, 0x1 strb r0, [r1, 0x1] - b _0800B6EA + b @0800B6EA .align 2, 0 .pool -_0800B680: +@0800B680: ldrb r0, [r4] cmp r0, 0x1 - bne _0800B6EA + bne @0800B6EA bl sub_800B594 ldr r1, =0x03003170 movs r0, 0x2 strb r0, [r1, 0x1] - b _0800B6EA + b @0800B6EA .align 2, 0 .pool -_0800B698: +@0800B698: ldrb r1, [r4] cmp r1, 0x1 - beq _0800B6A8 + beq @0800B6A8 cmp r1, 0x2 - beq _0800B6C0 + beq @0800B6C0 bl sub_800B764 - b _0800B6EA -_0800B6A8: + b @0800B6EA +@0800B6A8: ldr r2, =0x03003170 ldrb r0, [r2] cmp r0, 0x8 - bne _0800B6EA + bne @0800B6EA ldrb r0, [r2, 0x3] cmp r0, 0x1 - bls _0800B6EA + bls @0800B6EA strb r1, [r2, 0xE] - b _0800B6EA + b @0800B6EA .align 2, 0 .pool -_0800B6C0: +@0800B6C0: ldr r0, =0x03003170 movs r1, 0 strb r1, [r0, 0x1] ldr r0, =0x0400012a strh r1, [r0] - b _0800B6EA + b @0800B6EA .align 2, 0 .pool -_0800B6D4: +@0800B6D4: bl sub_800B790 ldr r1, =0x03003170 movs r0, 0x4 strb r0, [r1, 0x1] -_0800B6DE: +@0800B6DE: adds r0, r5, 0 bl sub_800B7C0 adds r0, r6, 0 bl sub_800B8A8 -_0800B6EA: +@0800B6EA: movs r0, 0 strb r0, [r4] ldr r1, =0x03003170 @@ -5717,10 +5717,10 @@ _0800B6EA: orrs r2, r0 ldrb r0, [r1] cmp r0, 0x8 - bne _0800B702 + bne @0800B702 movs r0, 0x20 orrs r2, r0 -_0800B702: +@0800B702: ldrb r0, [r1, 0xC] lsls r3, r0, 8 ldrb r0, [r1, 0xF] @@ -5733,17 +5733,17 @@ _0800B702: lsls r7, r0, 14 ldrb r0, [r1, 0x1] cmp r0, 0x4 - bne _0800B728 + bne @0800B728 movs r0, 0x40 orrs r0, r3 orrs r0, r2 - b _0800B72C + b @0800B72C .align 2, 0 .pool -_0800B728: +@0800B728: adds r0, r2, 0 orrs r0, r3 -_0800B72C: +@0800B72C: orrs r0, r4 orrs r0, r5 orrs r0, r6 @@ -5751,25 +5751,25 @@ _0800B72C: adds r2, r0, 0 ldrb r3, [r1, 0x13] cmp r3, 0x1 - bne _0800B742 + bne @0800B742 movs r0, 0x80 lsls r0, 9 orrs r2, r0 -_0800B742: +@0800B742: ldrb r0, [r1, 0x2] cmp r0, 0x3 - bls _0800B74E + bls @0800B74E movs r0, 0x80 lsls r0, 10 orrs r2, r0 -_0800B74E: +@0800B74E: adds r1, r2, 0 cmp r3, 0x2 - bne _0800B75A + bne @0800B75A movs r0, 0x80 lsls r0, 11 orrs r1, r0 -_0800B75A: +@0800B75A: adds r0, r1, 0 pop {r4-r7} pop {r1} @@ -5777,7 +5777,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] @@ -5785,29 +5785,29 @@ sub_800B764: @ 800B764 ands r1, r0 ldr r2, =0x03003170 cmp r1, 0x8 - bne _0800B788 + bne @0800B788 ldrb r0, [r2, 0x2] cmp r0, 0 - bne _0800B788 + bne @0800B788 strb r1, [r2] - b _0800B78C + b @0800B78C .align 2, 0 .pool -_0800B788: +@0800B788: movs r0, 0 strb r0, [r2] -_0800B78C: +@0800B78C: pop {r0} bx r0 thumb_func_end sub_800B764 thumb_func_start sub_800B790 -sub_800B790: @ 800B790 +sub_800B790: ; 800B790 push {lr} ldr r0, =0x03003170 ldrb r0, [r0] cmp r0, 0 - beq _0800B7AE + beq @0800B7AE ldr r1, =0x0400010c ldr r2, =0x0000ff3b adds r0, r2, 0 @@ -5817,7 +5817,7 @@ sub_800B790: @ 800B790 strh r0, [r1] movs r0, 0x40 bl enable_irqs -_0800B7AE: +@0800B7AE: pop {r0} bx r0 .align 2, 0 @@ -5825,7 +5825,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 @@ -5844,7 +5844,7 @@ sub_800B7C0: @ 800B7C0 ldrb r4, [r0] adds r6, r1, 0 cmp r4, 0x31 - bhi _0800B850 + bhi @0800B850 movs r1, 0xCE lsls r1, 2 adds r0, r6, r1 @@ -5853,11 +5853,11 @@ sub_800B7C0: @ 800B7C0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x31 - bls _0800B7FE + bls @0800B7FE subs r0, 0x32 lsls r0, 24 lsrs r0, 24 -_0800B7FE: +@0800B7FE: movs r2, 0 ldr r4, =0x03000d6e mov r9, r4 @@ -5869,7 +5869,7 @@ _0800B7FE: mov r8, r0 mov r12, r2 movs r7, 0x64 -_0800B814: +@0800B814: ldrh r0, [r4] ldrh r1, [r3] orrs r0, r1 @@ -5886,22 +5886,22 @@ _0800B814: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x7 - bls _0800B814 - b _0800B85C + bls @0800B814 + b @0800B85C .align 2, 0 .pool -_0800B850: +@0800B850: movs r0, 0x1 strb r0, [r6, 0x12] ldr r2, =0x03000d6e mov r9, r2 ldr r4, =0x03003160 mov r10, r4 -_0800B85C: +@0800B85C: mov r1, r9 ldrh r0, [r1] cmp r0, 0 - beq _0800B874 + beq @0800B874 ldr r2, =0x00000339 adds r0, r6, r2 ldrb r1, [r0] @@ -5910,7 +5910,7 @@ _0800B85C: strb r1, [r0] mov r4, r9 strh r2, [r4] -_0800B874: +@0800B874: ldr r1, =0x04000208 ldr r2, =0x03004134 ldrh r0, [r2] @@ -5932,7 +5932,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 @@ -5951,19 +5951,19 @@ sub_800B8A8: @ 800B8A8 ldrb r0, [r0] mov r12, r1 cmp r0, 0 - bne _0800B914 + bne @0800B914 movs r3, 0 ldrb r0, [r1, 0x3] cmp r3, r0 - bcs _0800B8FA + bcs @0800B8FA movs r5, 0 adds r6, r0, 0 -_0800B8DA: +@0800B8DA: movs r2, 0 lsls r1, r3, 4 adds r4, r3, 0x1 add r1, r9 -_0800B8E2: +@0800B8E2: lsls r0, r2, 1 adds r0, r1 strh r5, [r0] @@ -5971,24 +5971,24 @@ _0800B8E2: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x7 - bls _0800B8E2 + bls @0800B8E2 lsls r0, r4, 24 lsrs r3, r0, 24 cmp r3, r6 - bcc _0800B8DA -_0800B8FA: + bcc @0800B8DA +@0800B8FA: movs r0, 0x1 mov r7, r12 strb r0, [r7, 0xC] - b _0800B990 + b @0800B990 .align 2, 0 .pool -_0800B914: +@0800B914: movs r3, 0 mov r0, r12 ldrb r1, [r0, 0x3] cmp r3, r1 - bcs _0800B96A + bcs @0800B96A ldr r0, =0x00000fbc add r0, r12 ldrb r0, [r0] @@ -5998,7 +5998,7 @@ _0800B914: add r2, r12 mov r8, r2 mov r10, r1 -_0800B930: +@0800B930: movs r2, 0 lsls r1, r3, 4 adds r4, r3, 0x1 @@ -6009,7 +6009,7 @@ _0800B930: lsls r0, 3 adds r0, r3 lsls r3, r0, 5 -_0800B944: +@0800B944: lsls r1, r2, 1 adds r1, r5 movs r7, 0x64 @@ -6024,12 +6024,12 @@ _0800B944: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x7 - bls _0800B944 + bls @0800B944 lsls r0, r4, 24 lsrs r3, r0, 24 cmp r3, r10 - bcc _0800B930 -_0800B96A: + bcc @0800B930 +@0800B96A: mov r2, r12 ldr r0, =0x00000fbd adds r1, r2, r0 @@ -6045,12 +6045,12 @@ _0800B96A: lsls r0, 24 lsrs r0, 24 cmp r0, 0x31 - bls _0800B98C + bls @0800B98C strb r3, [r2] -_0800B98C: +@0800B98C: mov r2, r12 strb r3, [r2, 0xC] -_0800B990: +@0800B990: ldr r1, =0x04000208 ldr r3, =0x03004134 ldrh r0, [r3] @@ -6067,45 +6067,45 @@ _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] cmp r4, 0 - beq _0800B9F4 + beq @0800B9F4 ldrb r0, [r3, 0x1] cmp r0, 0x2 - beq _0800B9EE + beq @0800B9EE cmp r0, 0x4 - bne _0800BA1E + bne @0800BA1E movs r0, 0xD ldrsb r0, [r3, r0] cmp r0, 0x8 - bgt _0800B9E4 + bgt @0800B9E4 ldrb r0, [r3, 0x10] cmp r0, 0x1 - beq _0800B9EE + beq @0800B9EE movs r0, 0x1 strb r0, [r3, 0x13] - b _0800BA1E + b @0800BA1E .align 2, 0 .pool -_0800B9E4: +@0800B9E4: ldrb r0, [r3, 0x13] cmp r0, 0x1 - beq _0800BA1E + beq @0800BA1E movs r0, 0 strb r0, [r3, 0xD] -_0800B9EE: +@0800B9EE: bl sub_800BAC0 - b _0800BA1E -_0800B9F4: + b @0800BA1E +@0800B9F4: ldrb r2, [r3, 0x1] cmp r2, 0x4 - beq _0800B9FE + beq @0800B9FE cmp r2, 0x2 - bne _0800BA1E -_0800B9FE: + bne @0800BA1E +@0800B9FE: ldr r1, =0x03000d6c ldrb r0, [r1] adds r0, 0x1 @@ -6113,17 +6113,17 @@ _0800B9FE: lsls r0, 24 lsrs r0, 24 cmp r0, 0xA - bls _0800BA1E + bls @0800BA1E cmp r2, 0x4 - bne _0800BA16 + bne @0800BA16 movs r0, 0x2 strb r0, [r3, 0x13] -_0800BA16: +@0800BA16: cmp r2, 0x2 - bne _0800BA1E + bne @0800BA1E strb r4, [r3, 0x3] strb r4, [r3, 0xF] -_0800BA1E: +@0800BA1E: pop {r4} pop {r0} bx r0 @@ -6132,7 +6132,7 @@ _0800BA1E: thumb_func_end sub_800B9B8 thumb_func_start irq_timer3 -irq_timer3: @ 800BA28 +irq_timer3: ; 800BA28 push {lr} bl sub_800BD98 bl sub_800BAC0 @@ -6141,7 +6141,7 @@ irq_timer3: @ 800BA28 thumb_func_end irq_timer3 thumb_func_start sub_800BA38 -sub_800BA38: @ 800BA38 +sub_800BA38: ; 800BA38 push {r4,lr} ldr r4, =0x03003170 ldr r0, =0x04000128 @@ -6151,35 +6151,35 @@ sub_800BA38: @ 800BA38 strb r0, [r4, 0x2] ldrb r0, [r4, 0x1] cmp r0, 0x2 - beq _0800BA6C + beq @0800BA6C cmp r0, 0x4 - bne _0800BA8A + bne @0800BA8A lsls r0, r1, 25 lsrs r0, 31 strb r0, [r4, 0x10] bl sub_800BBCC bl sub_800BCE4 bl sub_800BDCC - b _0800BA8A + b @0800BA8A .align 2, 0 .pool -_0800BA6C: +@0800BA6C: bl sub_800BAD0 lsls r0, 24 cmp r0, 0 - beq _0800BA8A + beq @0800BA8A ldrb r0, [r4] cmp r0, 0 - beq _0800BA86 + beq @0800BA86 movs r0, 0x3 strb r0, [r4, 0x1] movs r0, 0x8 strb r0, [r4, 0xD] - b _0800BA8A -_0800BA86: + b @0800BA8A +@0800BA86: movs r0, 0x4 strb r0, [r4, 0x1] -_0800BA8A: +@0800BA8A: ldr r3, =0x03003170 ldrb r0, [r3, 0xD] adds r0, 0x1 @@ -6190,13 +6190,13 @@ _0800BA8A: lsls r0, 24 asrs r0, 24 cmp r0, 0x8 - bne _0800BAAA + bne @0800BAAA ldr r0, =0x03004130 ldr r2, =0x00000fbd adds r1, r3, r2 ldrb r1, [r1] strb r1, [r0] -_0800BAAA: +@0800BAAA: pop {r4} pop {r0} bx r0 @@ -6205,7 +6205,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 @@ -6217,7 +6217,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 @@ -6228,16 +6228,16 @@ sub_800BAD0: @ 800BAD0 ldrb r1, [r0, 0xE] adds r7, r0, 0 cmp r1, 0x1 - bne _0800BAFC + bne @0800BAFC ldr r1, =0x0400012a ldr r2, =0x00008fff - b _0800BB00 + b @0800BB00 .align 2, 0 .pool -_0800BAFC: +@0800BAFC: ldr r1, =0x0400012a ldr r2, =0x0000b9a0 -_0800BB00: +@0800BB00: adds r0, r2, 0 strh r0, [r1] ldr r2, =0x03003174 @@ -6258,7 +6258,7 @@ _0800BB00: ldr r2, =0x00008fff ldr r1, =0x0000ffff mov r12, r1 -_0800BB28: +@0800BB28: lsls r0, r4, 1 add r0, r8 ldrh r3, [r0] @@ -6267,68 +6267,68 @@ _0800BB28: ands r0, r3 ldr r1, =0x0000b9a0 cmp r0, r1 - beq _0800BB40 + beq @0800BB40 adds r0, r3, 0 cmp r0, r2 - bne _0800BB70 -_0800BB40: + bne @0800BB70 +@0800BB40: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 adds r0, r3, 0 cmp r6, r0 - bls _0800BB78 + bls @0800BB78 cmp r0, 0 - beq _0800BB78 + beq @0800BB78 adds r6, r3, 0 - b _0800BB78 + b @0800BB78 .align 2, 0 .pool -_0800BB70: +@0800BB70: cmp r0, r12 - beq _0800BB82 + beq @0800BB82 movs r5, 0 - b _0800BB82 -_0800BB78: + b @0800BB82 +@0800BB78: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _0800BB28 -_0800BB82: + bls @0800BB28 +@0800BB82: strb r5, [r7, 0x3] adds r0, r5, 0 cmp r0, 0x1 - bls _0800BBB2 + bls @0800BBB2 mov r2, r9 ldrb r2, [r2] cmp r0, r2 - bne _0800BBA4 + bne @0800BBA4 ldrh r1, [r7, 0x4] ldr r0, =0x00008fff cmp r1, r0 - bne _0800BBA4 + bne @0800BBA4 movs r0, 0x1 - b _0800BBBE + b @0800BBBE .align 2, 0 .pool -_0800BBA4: +@0800BBA4: ldrb r0, [r7, 0x3] cmp r0, 0x1 - bls _0800BBB2 + bls @0800BBB2 movs r0, 0x3 ands r6, r0 adds r0, r6, 0x1 - b _0800BBB4 -_0800BBB2: + b @0800BBB4 +@0800BBB2: movs r0, 0 -_0800BBB4: +@0800BBB4: strb r0, [r7, 0xF] ldrb r0, [r7, 0x3] mov r1, r9 strb r0, [r1] movs r0, 0 -_0800BBBE: +@0800BBBE: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -6338,7 +6338,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} @@ -6352,43 +6352,43 @@ sub_800BBCC: @ 800BBCC ldrb r1, [r0, 0x16] adds r6, r0, 0 cmp r1, 0 - bne _0800BC30 + bne @0800BC30 movs r4, 0 ldr r7, =0x03000d72 ldrb r0, [r6, 0x3] cmp r4, r0 - bcs _0800BC1A + bcs @0800BC1A adds r5, r6, 0 ldrh r1, [r6, 0x14] adds r3, r7, 0 adds r2, r6, 0 -_0800BBFA: +@0800BBFA: lsls r0, r4, 1 add r0, sp ldrh r0, [r0] cmp r1, r0 - beq _0800BC0E + beq @0800BC0E ldrb r0, [r3] cmp r0, 0 - beq _0800BC0E + beq @0800BC0E movs r0, 0x1 strb r0, [r5, 0x11] -_0800BC0E: +@0800BC0E: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 ldrb r0, [r2, 0x3] cmp r4, r0 - bcc _0800BBFA -_0800BC1A: + bcc @0800BBFA +@0800BC1A: movs r0, 0 strh r0, [r6, 0x14] movs r0, 0x1 strb r0, [r7] - b _0800BCD0 + b @0800BCD0 .align 2, 0 .pool -_0800BC30: +@0800BC30: ldr r2, =0x00000fbc adds r1, r6, r2 adds r2, 0x1 @@ -6399,17 +6399,17 @@ _0800BC30: lsls r0, 24 lsrs r0, 24 cmp r0, 0x31 - bls _0800BC4C + bls @0800BC4C subs r0, 0x32 lsls r0, 24 lsrs r0, 24 -_0800BC4C: +@0800BC4C: cmp r2, 0x31 - bhi _0800BCA8 + bhi @0800BCA8 movs r4, 0 ldrb r1, [r6, 0x3] cmp r4, r1 - bcs _0800BCAC + bcs @0800BCAC adds r5, r6, 0 ldr r7, =0x03000d70 lsls r0, 1 @@ -6418,7 +6418,7 @@ _0800BC4C: lsls r2, 2 adds r2, r6 mov r8, r2 -_0800BC68: +@0800BC68: lsls r1, r4, 1 mov r2, sp adds r0, r2, r1 @@ -6445,25 +6445,25 @@ _0800BC68: lsrs r4, r0, 24 ldrb r0, [r5, 0x3] cmp r4, r0 - bcc _0800BC68 - b _0800BCAC + bcc @0800BC68 + b @0800BCAC .align 2, 0 .pool -_0800BCA8: +@0800BCA8: movs r0, 0x2 strb r0, [r6, 0x12] -_0800BCAC: +@0800BCAC: ldrb r0, [r6, 0x17] adds r0, 0x1 strb r0, [r6, 0x17] lsls r0, 24 lsrs r0, 24 cmp r0, 0x8 - bne _0800BCD0 + bne @0800BCD0 ldr r2, =0x03000d70 ldrh r0, [r2] cmp r0, 0 - beq _0800BCD0 + beq @0800BCD0 ldr r1, =0x00000fbd adds r0, r6, r1 ldrb r1, [r0] @@ -6471,7 +6471,7 @@ _0800BCAC: strb r1, [r0] movs r0, 0 strh r0, [r2] -_0800BCD0: +@0800BCD0: add sp, 0x8 pop {r3} mov r8, r3 @@ -6483,20 +6483,20 @@ _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] adds r4, r0, 0 cmp r1, 0x8 - bne _0800BD36 + bne @0800BD36 ldr r1, =0x0400012a ldrh r0, [r4, 0x14] strh r0, [r1] ldr r1, =0x03000d6d ldrb r2, [r1] cmp r2, 0 - bne _0800BD30 + bne @0800BD30 ldr r0, =0x00000339 adds r1, r4, r0 ldrb r0, [r1] @@ -6511,39 +6511,39 @@ sub_800BCE4: @ 800BCE4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x31 - bls _0800BD8C + bls @0800BD8C strb r2, [r1] - b _0800BD8C + b @0800BD8C .align 2, 0 .pool -_0800BD30: +@0800BD30: movs r0, 0 strb r0, [r1] - b _0800BD8C -_0800BD36: + b @0800BD8C +@0800BD36: ldr r1, =0x03000d6d ldrb r0, [r1] cmp r0, 0 - bne _0800BD52 + bne @0800BD52 ldr r2, =0x00000339 adds r0, r4, r2 ldrb r0, [r0] cmp r0, 0 - bne _0800BD4C + bne @0800BD4C movs r0, 0x1 strb r0, [r1] -_0800BD4C: +@0800BD4C: ldrb r0, [r1] cmp r0, 0 - beq _0800BD68 -_0800BD52: + beq @0800BD68 +@0800BD52: ldr r1, =0x0400012a movs r0, 0 strh r0, [r1] - b _0800BD86 + b @0800BD86 .align 2, 0 .pool -_0800BD68: +@0800BD68: ldr r3, =0x0400012a movs r1, 0xCE lsls r1, 2 @@ -6559,11 +6559,11 @@ _0800BD68: adds r0, r1 ldrh r0, [r0] strh r0, [r3] -_0800BD86: +@0800BD86: ldrb r0, [r4, 0x16] adds r0, 0x1 strb r0, [r4, 0x16] -_0800BD8C: +@0800BD8C: pop {r4} pop {r0} bx r0 @@ -6572,12 +6572,12 @@ _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] cmp r0, 0 - beq _0800BDB4 + beq @0800BDB4 ldr r2, =0x0400010e ldrh r1, [r2] ldr r0, =0x0000ff7f @@ -6587,7 +6587,7 @@ sub_800BD98: @ 800BD98 ldr r2, =0x0000ff3b adds r0, r2, 0 strh r0, [r1] -_0800BDB4: +@0800BDB4: pop {r0} bx r0 .align 2, 0 @@ -6595,28 +6595,28 @@ _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] cmp r0, 0x8 - bne _0800BDE4 + bne @0800BDE4 movs r0, 0 strb r0, [r1, 0x16] strb r0, [r1, 0x17] - b _0800BDF4 + b @0800BDF4 .align 2, 0 .pool -_0800BDE4: +@0800BDE4: ldrb r0, [r1] cmp r0, 0 - beq _0800BDF4 + beq @0800BDF4 ldr r0, =0x0400010e ldrh r1, [r0] movs r2, 0x80 orrs r1, r2 strh r1, [r0] -_0800BDF4: +@0800BDF4: pop {r0} bx r0 .align 2, 0 @@ -6624,7 +6624,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 @@ -6640,12 +6640,12 @@ sub_800BDFC: @ 800BDFC adds r5, r1, 0 adds r5, 0x18 ldr r4, =0x0000efff -_0800BE1A: +@0800BE1A: movs r2, 0 adds r1, r0, 0x1 adds r3, r0, 0 muls r3, r6 -_0800BE22: +@0800BE22: lsls r0, r2, 1 adds r0, r3 adds r0, r5 @@ -6654,11 +6654,11 @@ _0800BE22: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x31 - bls _0800BE22 + bls @0800BE22 lsls r0, r1, 24 lsrs r0, 24 cmp r0, 0x7 - bls _0800BE1A + bls @0800BE1A pop {r4-r6} pop {r0} bx r0 @@ -6667,7 +6667,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 @@ -6683,7 +6683,7 @@ sub_800BE50: @ 800BE50 lsls r3, 2 adds r7, r1, r3 ldr r6, =0x0000efff -_0800BE6E: +@0800BE6E: movs r3, 0 lsls r0, r2, 1 adds r5, r2, 0x1 @@ -6691,13 +6691,13 @@ _0800BE6E: lsls r0, 3 adds r0, r2 lsls r4, r0, 5 -_0800BE7C: +@0800BE7C: movs r2, 0 adds r1, r3, 0x1 mov r0, r12 muls r0, r3 adds r3, r0, 0 -_0800BE86: +@0800BE86: lsls r0, r2, 1 adds r0, r3 adds r0, r4 @@ -6707,15 +6707,15 @@ _0800BE86: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x31 - bls _0800BE86 + bls @0800BE86 lsls r0, r1, 24 lsrs r3, r0, 24 cmp r3, 0x7 - bls _0800BE7C + bls @0800BE7C lsls r0, r5, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls _0800BE6E + bls @0800BE6E pop {r4-r7} pop {r0} bx r0 @@ -6724,28 +6724,28 @@ _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 ldr r0, =0x00008001 cmp r4, r0 - bne _0800BED4 + bne @0800BED4 ldr r1, =0x03004140 movs r0, 0x1 strb r0, [r1, 0x8] -_0800BED4: +@0800BED4: ldr r0, =0x03004140 ldrb r2, [r0, 0x4] adds r1, r0, 0 cmp r2, 0x17 - beq _0800BEE8 + beq @0800BEE8 cmp r2, 0x1 - beq _0800BEE8 + beq @0800BEE8 movs r0, 0 strb r0, [r1, 0x5] strb r0, [r1, 0x4] -_0800BEE8: +@0800BEE8: movs r0, 0 strb r0, [r1, 0x7] strb r0, [r1, 0xD] @@ -6763,7 +6763,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 @@ -6771,22 +6771,22 @@ rfu_REQ_sendData_wrapper: @ 800BF0C ldr r0, [r0] ldrb r0, [r0] cmp r0, 0 - bne _0800BF34 + bne @0800BF34 ldr r0, =0x03004140 ldrb r0, [r0, 0x2] movs r2, 0 cmp r0, 0x1 - bne _0800BF3C + bne @0800BF3C movs r2, 0x1 - b _0800BF3C + b @0800BF3C .align 2, 0 .pool -_0800BF34: +@0800BF34: ldr r0, =0x03004140 ldrb r1, [r0, 0x3] movs r1, 0 strb r1, [r0, 0x3] -_0800BF3C: +@0800BF3C: adds r0, r2, 0 bl rfu_REQ_sendData pop {r0} @@ -6796,13 +6796,13 @@ _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 adds r6, r1, 0 cmp r5, 0 - beq _0800BF94 + beq @0800BF94 mov r1, sp movs r0, 0 strh r0, [r1] @@ -6820,12 +6820,12 @@ sub_800BF4C: @ 800BF4C ldr r0, =sub_800C7B4 + 1 bl rfu_setREQCallback movs r0, 0 - b _0800BF96 + b @0800BF96 .align 2, 0 .pool -_0800BF94: +@0800BF94: movs r0, 0x4 -_0800BF96: +@0800BF96: add sp, 0x4 pop {r4-r6} pop {r1} @@ -6833,7 +6833,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 @@ -6855,7 +6855,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 @@ -6873,9 +6873,9 @@ sub_800BFCC: @ 800BFCC strh r0, [r1, 0x18] ldrb r0, [r4, 0x10] cmp r0, 0 - beq _0800BFF4 + beq @0800BFF4 strb r2, [r1, 0xB] -_0800BFF4: +@0800BFF4: pop {r4} pop {r0} bx r0 @@ -6884,7 +6884,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 @@ -6905,7 +6905,7 @@ sub_800C000: @ 800C000 adds r5, 0x28 movs r4, 0 adds r2, 0x34 -_0800C028: +@0800C028: lsls r1, r3, 1 adds r0, r1, r5 strh r4, [r0] @@ -6915,7 +6915,7 @@ _0800C028: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3 - bls _0800C028 + bls @0800C028 pop {r4,r5} pop {r0} bx r0 @@ -6924,7 +6924,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] @@ -6934,7 +6934,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} @@ -6949,26 +6949,26 @@ sub_800C054: @ 800C054 ldr r1, =0x03004140 ldrb r0, [r1, 0x4] cmp r0, 0 - beq _0800C090 + beq @0800C090 cmp r0, 0x8 - bne _0800C07A + bne @0800C07A cmp r5, 0x1 - beq _0800C090 -_0800C07A: + beq @0800C090 +@0800C07A: movs r0, 0x1 strh r0, [r1, 0x14] movs r0, 0xF3 movs r1, 0x1 bl sub_800D30C movs r0, 0x1 - b _0800C122 + b @0800C122 .align 2, 0 .pool -_0800C090: +@0800C090: bl rfu_getMasterSlave lsls r0, 24 cmp r0, 0 - bne _0800C0B0 + bne @0800C0B0 ldr r1, =0x03004140 movs r0, 0x2 strh r0, [r1, 0x14] @@ -6976,72 +6976,72 @@ _0800C090: movs r1, 0x1 bl sub_800D30C movs r0, 0x2 - b _0800C122 + b @0800C122 .align 2, 0 .pool -_0800C0B0: +@0800C0B0: movs r2, 0 ldrh r0, [r6] ldr r4, =0x0000ffff adds r1, r6, 0x2 ldr r3, =0x03004140 cmp r0, r4 - beq _0800C0D0 -_0800C0BE: + beq @0800C0D0 +@0800C0BE: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xF - bhi _0800C0D0 + bhi @0800C0D0 ldrh r0, [r1] adds r1, 0x2 cmp r0, r4 - bne _0800C0BE -_0800C0D0: + bne @0800C0BE +@0800C0D0: cmp r2, 0x10 - bne _0800C0EC + bne @0800C0EC movs r0, 0x4 strh r0, [r3, 0x14] movs r0, 0xF3 movs r1, 0x1 bl sub_800D30C movs r0, 0x4 - b _0800C122 + b @0800C122 .align 2, 0 .pool -_0800C0EC: +@0800C0EC: cmp r5, 0x1 - bls _0800C0FA + bls @0800C0FA movs r0, 0x1 strb r0, [r3, 0x7] movs r5, 0x1 movs r7, 0 - b _0800C0FE -_0800C0FA: + b @0800C0FE +@0800C0FA: movs r0, 0 strb r0, [r3, 0x7] -_0800C0FE: +@0800C0FE: cmp r5, 0 - beq _0800C108 + beq @0800C108 movs r0, 0x5 strb r0, [r3, 0x4] - b _0800C116 -_0800C108: + b @0800C116 +@0800C108: movs r0, 0x9 strb r0, [r3, 0x4] ldrb r0, [r3, 0xB] cmp r0, 0 - beq _0800C116 + beq @0800C116 movs r0, 0x2 strb r0, [r3, 0xB] -_0800C116: +@0800C116: strb r5, [r3, 0x6] strh r7, [r3, 0x1A] mov r0, r8 strh r0, [r3, 0x26] str r6, [r3, 0x20] movs r0, 0 -_0800C122: +@0800C122: pop {r3} mov r8, r3 pop {r4-r7} @@ -7050,7 +7050,7 @@ _0800C122: thumb_func_end sub_800C054 thumb_func_start mega_func_4 -mega_func_4: @ 800C12C +mega_func_4: ; 800C12C push {r4-r7,lr} mov r7, r8 push {r7} @@ -7062,26 +7062,26 @@ mega_func_4: @ 800C12C ldr r1, =0x03004140 ldrb r0, [r1, 0x4] cmp r0, 0 - beq _0800C164 + beq @0800C164 subs r0, 0x9 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bls _0800C164 + bls @0800C164 movs r0, 0x1 strh r0, [r1, 0x14] movs r0, 0xF3 movs r1, 0x1 bl sub_800D30C movs r0, 0x1 - b _0800C204 + b @0800C204 .align 2, 0 .pool -_0800C164: +@0800C164: bl rfu_getMasterSlave lsls r0, 24 cmp r0, 0 - bne _0800C184 + bne @0800C184 ldr r1, =0x03004140 movs r0, 0x2 strh r0, [r1, 0x14] @@ -7089,10 +7089,10 @@ _0800C164: movs r1, 0x1 bl sub_800D30C movs r0, 0x2 - b _0800C204 + b @0800C204 .align 2, 0 .pool -_0800C184: +@0800C184: movs r2, 0 ldr r0, =0x03007890 ldr r1, [r0] @@ -7100,68 +7100,68 @@ _0800C184: ldr r5, =0x03004140 adds r7, r0, 0 cmp r2, r3 - bcs _0800C1B2 + bcs @0800C1B2 ldrh r0, [r1, 0x14] cmp r0, r6 - beq _0800C1B2 + beq @0800C1B2 adds r4, r1, 0 adds r1, r3, 0 -_0800C19E: +@0800C19E: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, r1 - bcs _0800C1B2 + bcs @0800C1B2 lsls r0, r2, 5 adds r0, r4, r0 ldrh r0, [r0, 0x14] cmp r0, r6 - bne _0800C19E -_0800C1B2: + bne @0800C19E +@0800C1B2: ldr r0, [r7] ldrb r0, [r0, 0x8] cmp r0, 0 - beq _0800C1BE + beq @0800C1BE cmp r2, r0 - bne _0800C1D8 -_0800C1BE: + bne @0800C1D8 +@0800C1BE: movs r0, 0x3 strh r0, [r5, 0x14] movs r0, 0xF3 movs r1, 0x1 bl sub_800D30C movs r0, 0x3 - b _0800C204 + b @0800C204 .align 2, 0 .pool -_0800C1D8: +@0800C1D8: ldrb r0, [r5, 0x4] cmp r0, 0 - beq _0800C1E2 + beq @0800C1E2 cmp r0, 0x9 - bne _0800C1EA -_0800C1E2: + bne @0800C1EA +@0800C1E2: movs r0, 0xC strb r0, [r5, 0x4] movs r0, 0xD - b _0800C1F0 -_0800C1EA: + b @0800C1F0 +@0800C1EA: movs r0, 0xB strb r0, [r5, 0x4] movs r0, 0xC -_0800C1F0: +@0800C1F0: strb r0, [r5, 0x5] strh r6, [r5, 0x1E] mov r0, r8 strh r0, [r5, 0x1A] ldrb r0, [r5, 0x7] cmp r0, 0 - beq _0800C202 + beq @0800C202 movs r0, 0x7 strb r0, [r5, 0x7] -_0800C202: +@0800C202: movs r0, 0 -_0800C204: +@0800C204: pop {r3} mov r8, r3 pop {r4-r7} @@ -7170,7 +7170,7 @@ _0800C204: thumb_func_end mega_func_4 thumb_func_start sub_800C210 -sub_800C210: @ 800C210 +sub_800C210: ; 800C210 push {r4-r7,lr} lsls r0, 24 lsrs r1, r0, 24 @@ -7181,7 +7181,7 @@ sub_800C210: @ 800C210 adds r0, r1, 0 ands r0, r2 cmp r0, 0 - beq _0800C26C + beq @0800C26C adds r0, r2, 0 bics r0, r1 strb r0, [r3] @@ -7190,35 +7190,35 @@ sub_800C210: @ 800C210 movs r5, 0x1 adds r3, 0x4 movs r2, 0 -_0800C236: +@0800C236: adds r0, r1, 0 asrs r0, r4 ands r0, r5 cmp r0, 0 - beq _0800C246 + beq @0800C246 lsls r0, r4, 1 adds r0, r3 strh r2, [r0] -_0800C246: +@0800C246: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _0800C236 + bls @0800C236 ldr r0, [r7] ldrb r4, [r0, 0x3] ands r4, r1 cmp r4, 0 - beq _0800C260 + beq @0800C260 adds r0, r4, 0 bl sub_800D334 -_0800C260: +@0800C260: ldr r0, =0x03004140 strh r4, [r0, 0x14] movs r0, 0x33 adds r1, r4, 0 bl sub_800D30C -_0800C26C: +@0800C26C: pop {r4-r7} pop {r0} bx r0 @@ -7227,7 +7227,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 @@ -7235,77 +7235,77 @@ sub_800C27C: @ 800C27C strb r2, [r1, 0x7] adds r5, r1, 0 cmp r0, 0 - beq _0800C29C + beq @0800C29C bl sub_800C000 movs r0, 0x17 strb r0, [r5, 0x4] - b _0800C366 + b @0800C366 .align 2, 0 .pool -_0800C29C: +@0800C29C: ldrb r0, [r5, 0x4] subs r0, 0x5 cmp r0, 0xD - bhi _0800C352 + bhi @0800C352 lsls r0, 2 - ldr r1, =_0800C2B4 + ldr r1, =@0800C2B4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0800C2B4: - .4byte _0800C2EC - .4byte _0800C2F8 - .4byte _0800C2F8 - .4byte _0800C358 - .4byte _0800C302 - .4byte _0800C30C - .4byte _0800C30C - .4byte _0800C316 - .4byte _0800C320 - .4byte _0800C320 - .4byte _0800C358 - .4byte _0800C326 - .4byte _0800C34C - .4byte _0800C34C -_0800C2EC: +@0800C2B4: + .4byte @0800C2EC + .4byte @0800C2F8 + .4byte @0800C2F8 + .4byte @0800C358 + .4byte @0800C302 + .4byte @0800C30C + .4byte @0800C30C + .4byte @0800C316 + .4byte @0800C320 + .4byte @0800C320 + .4byte @0800C358 + .4byte @0800C326 + .4byte @0800C34C + .4byte @0800C34C +@0800C2EC: movs r1, 0 movs r0, 0x8 strb r0, [r5, 0x4] strb r1, [r5, 0x5] movs r2, 0x13 - b _0800C358 -_0800C2F8: + b @0800C358 +@0800C2F8: movs r0, 0x7 strb r0, [r5, 0x4] movs r0, 0x8 strb r0, [r5, 0x5] - b _0800C358 -_0800C302: + b @0800C358 +@0800C302: movs r0, 0 strb r0, [r5, 0x5] strb r0, [r5, 0x4] movs r2, 0x21 - b _0800C358 -_0800C30C: + b @0800C358 +@0800C30C: movs r1, 0 movs r0, 0xB strb r0, [r5, 0x4] strb r1, [r5, 0x5] - b _0800C358 -_0800C316: + b @0800C358 +@0800C316: movs r0, 0 strb r0, [r5, 0x5] strb r0, [r5, 0x4] movs r2, 0x23 - b _0800C358 -_0800C320: + b @0800C358 +@0800C320: movs r0, 0xE strb r0, [r5, 0x4] - b _0800C358 -_0800C326: + b @0800C358 +@0800C326: ldrb r0, [r5, 0x11] strb r0, [r5, 0x4] ldrb r0, [r5, 0x12] @@ -7320,32 +7320,32 @@ _0800C326: movs r0, 0x33 movs r1, 0x1 bl sub_800D30C - b _0800C366 + b @0800C366 .align 2, 0 .pool -_0800C34C: +@0800C34C: movs r0, 0x12 strb r0, [r5, 0x4] - b _0800C358 -_0800C352: + b @0800C358 +@0800C352: strb r2, [r5, 0x5] strb r2, [r5, 0x4] movs r2, 0x43 -_0800C358: +@0800C358: ldrb r0, [r5, 0x4] cmp r0, 0 - bne _0800C366 + bne @0800C366 adds r0, r2, 0 movs r1, 0 bl sub_800D30C -_0800C366: +@0800C366: pop {r4,r5} pop {r0} bx r0 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 @@ -7367,7 +7367,7 @@ sub_800C36C: @ 800C36C ldrb r0, [r0] adds r7, r4, 0 cmp r0, 0 - beq _0800C43E + beq @0800C43E ldr r1, =0x03004140 mov r0, sp ldrb r0, [r0] @@ -7377,21 +7377,21 @@ sub_800C36C: @ 800C36C ldrb r0, [r1, 0x9] adds r6, r1, 0 cmp r0, 0 - beq _0800C426 + beq @0800C426 movs r0, 0x1 strb r0, [r6, 0xA] ldrb r0, [r6, 0x6] cmp r0, 0 - bne _0800C3C2 + bne @0800C3C2 ldrb r0, [r5] cmp r0, 0 - bne _0800C3C2 + bne @0800C3C2 movs r0, 0x4 strb r0, [r6, 0xA] -_0800C3C2: +@0800C3C2: ldrb r0, [r6, 0xA] cmp r0, 0x1 - bne _0800C40C + bne @0800C40C movs r2, 0 mov r4, sp movs r5, 0x1 @@ -7401,12 +7401,12 @@ _0800C3C2: movs r6, 0x34 add r6, r12 mov r9, r6 -_0800C3DA: +@0800C3DA: ldrb r0, [r4] asrs r0, r2 ands r0, r5 cmp r0, 0 - beq _0800C3F8 + beq @0800C3F8 adds r0, r5, 0 lsls r0, r2 ldrb r1, [r3] @@ -7417,17 +7417,17 @@ _0800C3DA: mov r6, r12 ldrh r1, [r6, 0x32] strh r1, [r0] -_0800C3F8: +@0800C3F8: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls _0800C3DA + bls @0800C3DA movs r0, 0x31 - b _0800C41E + b @0800C41E .align 2, 0 .pool -_0800C40C: +@0800C40C: movs r0, 0 strb r0, [r6, 0xA] mov r0, sp @@ -7436,11 +7436,11 @@ _0800C40C: movs r0, 0x1 mov r8, r0 movs r0, 0x33 -_0800C41E: +@0800C41E: movs r1, 0x1 bl sub_800D30C - b _0800C43A -_0800C426: + b @0800C43A +@0800C426: mov r0, sp ldrb r0, [r0] bl sub_800D334 @@ -7449,17 +7449,17 @@ _0800C426: movs r0, 0x30 movs r1, 0x2 bl sub_800D30C -_0800C43A: +@0800C43A: bl sub_800D610 -_0800C43E: +@0800C43E: ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x1 - bne _0800C518 + bne @0800C518 ldrb r0, [r7] cmp r0, 0 - beq _0800C49C + beq @0800C49C movs r2, 0 ldr r6, =0x03004140 movs r3, 0x1 @@ -7467,27 +7467,27 @@ _0800C43E: adds r4, 0x34 adds r6, 0x30 adds r5, r7, 0 -_0800C45C: +@0800C45C: ldrb r0, [r6] asrs r0, r2 ands r0, r3 cmp r0, 0 - beq _0800C478 + beq @0800C478 ldrb r0, [r5] asrs r0, r2 ands r0, r3 cmp r0, 0 - beq _0800C478 + beq @0800C478 lsls r0, r2, 1 adds r0, r4 movs r1, 0 strh r1, [r0] -_0800C478: +@0800C478: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls _0800C45C + bls @0800C45C ldr r3, =0x03004140 adds r2, r3, 0 adds r2, 0x30 @@ -7500,35 +7500,35 @@ _0800C478: movs r0, 0x32 movs r1, 0x1 bl sub_800D30C -_0800C49C: +@0800C49C: ldr r0, =0x03004140 adds r3, r0, 0 adds r3, 0x30 ldrb r1, [r3] adds r6, r0, 0 cmp r1, 0 - beq _0800C514 + beq @0800C514 movs r4, 0 movs r2, 0 movs r5, 0x1 -_0800C4B0: +@0800C4B0: ldrb r0, [r3] asrs r0, r2 ands r0, r5 cmp r0, 0 - beq _0800C4E2 + beq @0800C4E2 lsls r1, r2, 1 adds r0, r6, 0 adds r0, 0x34 adds r1, r0 ldrh r0, [r1] cmp r0, 0 - beq _0800C4E2 + beq @0800C4E2 subs r0, 0x1 strh r0, [r1] lsls r0, 16 cmp r0, 0 - bne _0800C4E2 + bne @0800C4E2 adds r0, r5, 0 lsls r0, r2 ldrb r1, [r3] @@ -7537,14 +7537,14 @@ _0800C4B0: orrs r4, r0 lsls r0, r4, 24 lsrs r4, r0, 24 -_0800C4E2: +@0800C4E2: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls _0800C4B0 + bls @0800C4B0 cmp r4, 0 - beq _0800C506 + beq @0800C506 adds r0, r4, 0 bl sub_800D334 movs r6, 0x1 @@ -7554,18 +7554,18 @@ _0800C4E2: movs r0, 0x33 movs r1, 0x1 bl sub_800D30C -_0800C506: +@0800C506: ldr r0, =0x03004140 adds r1, r0, 0 adds r1, 0x30 ldrb r1, [r1] adds r6, r0, 0 cmp r1, 0 - bne _0800C518 -_0800C514: + bne @0800C518 +@0800C514: movs r0, 0 strb r0, [r6, 0xA] -_0800C518: +@0800C518: mov r0, r8 add sp, 0x4 pop {r3,r4} @@ -7579,146 +7579,146 @@ _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 cmp r0, 0 - beq _0800C548 + beq @0800C548 movs r0, 0xF1 movs r1, 0 bl sub_800D30C bl sub_800D610 -_0800C548: +@0800C548: pop {r0} bx r0 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 ldr r2, [r1, 0x40] cmp r2, 0 - bne _0800C568 + bne @0800C568 ldrb r0, [r1, 0x4] cmp r0, 0 - beq _0800C568 + beq @0800C568 strb r2, [r1, 0x4] - b _0800C736 + b @0800C736 .align 2, 0 .pool -_0800C568: +@0800C568: ldr r0, =0x03004140 ldrb r0, [r0, 0x7] cmp r0, 0 - beq _0800C576 + beq @0800C576 adds r0, r3, 0 bl sub_800C744 -_0800C576: +@0800C576: ldr r4, =0x03004140 ldrb r0, [r4, 0x4] cmp r0, 0 - bne _0800C580 - b _0800C700 -_0800C580: + bne @0800C580 + b @0800C700 +@0800C580: bl rfu_waitREQComplete movs r0, 0x1 strb r0, [r4, 0xE] ldrb r0, [r4, 0x4] subs r0, 0x1 cmp r0, 0x16 - bls _0800C592 - b _0800C6F6 -_0800C592: + bls @0800C592 + b @0800C6F6 +@0800C592: lsls r0, 2 - ldr r1, =_0800C5A4 + ldr r1, =@0800C5A4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0800C5A4: - .4byte _0800C624 - .4byte _0800C65C - .4byte _0800C662 - .4byte _0800C678 - .4byte _0800C690 - .4byte _0800C696 - .4byte _0800C69C - .4byte _0800C6F6 - .4byte _0800C6A2 - .4byte _0800C6A8 - .4byte _0800C6AE - .4byte _0800C6B4 - .4byte _0800C6C4 - .4byte _0800C6CA - .4byte _0800C6F6 - .4byte _0800C6D0 - .4byte _0800C6E0 - .4byte _0800C6E6 - .4byte _0800C6EC - .4byte _0800C6F6 - .4byte _0800C6F2 - .4byte _0800C6F6 - .4byte _0800C600 -_0800C600: +@0800C5A4: + .4byte @0800C624 + .4byte @0800C65C + .4byte @0800C662 + .4byte @0800C678 + .4byte @0800C690 + .4byte @0800C696 + .4byte @0800C69C + .4byte @0800C6F6 + .4byte @0800C6A2 + .4byte @0800C6A8 + .4byte @0800C6AE + .4byte @0800C6B4 + .4byte @0800C6C4 + .4byte @0800C6CA + .4byte @0800C6F6 + .4byte @0800C6D0 + .4byte @0800C6E0 + .4byte @0800C6E6 + .4byte @0800C6EC + .4byte @0800C6F6 + .4byte @0800C6F2 + .4byte @0800C6F6 + .4byte @0800C600 +@0800C600: bl sub_800BEC0 ldr r1, =0x00008001 movs r2, 0xFF cmp r0, r1 - bne _0800C60E + bne @0800C60E movs r2, 0x44 -_0800C60E: +@0800C60E: ldr r1, =0x03004140 movs r0, 0 strb r0, [r1, 0x5] strb r0, [r1, 0x4] adds r0, r2, 0 - b _0800C64E + b @0800C64E .align 2, 0 .pool -_0800C624: +@0800C624: bl sub_800BEC0 ldr r1, =0x00008001 cmp r0, r1 - bne _0800C644 + bne @0800C644 ldr r0, =0x03004140 ldrb r1, [r0, 0x5] strb r1, [r0, 0x4] movs r1, 0x3 strb r1, [r0, 0x5] - b _0800C6F6 + b @0800C6F6 .align 2, 0 .pool -_0800C644: +@0800C644: ldr r1, =0x03004140 movs r0, 0 strb r0, [r1, 0x5] strb r0, [r1, 0x4] movs r0, 0xFF -_0800C64E: +@0800C64E: movs r1, 0 bl sub_800D30C - b _0800C6F6 + b @0800C6F6 .align 2, 0 .pool -_0800C65C: +@0800C65C: bl rfu_REQ_reset - b _0800C6F6 -_0800C662: + b @0800C6F6 +@0800C662: ldr r0, =0x03004140 ldr r2, [r0, 0x3C] ldrh r0, [r2, 0x2] ldrb r1, [r2] ldrb r2, [r2, 0x1] bl rfu_REQ_configSystem - b _0800C6F6 + b @0800C6F6 .align 2, 0 .pool -_0800C678: +@0800C678: ldr r0, =0x03004140 ldr r3, [r0, 0x3C] ldrb r0, [r3, 0x4] @@ -7726,90 +7726,90 @@ _0800C678: ldr r2, [r3, 0x8] ldr r3, [r3, 0xC] bl rfu_REQ_configGameData - b _0800C6F6 + b @0800C6F6 .align 2, 0 .pool -_0800C690: +@0800C690: bl rfu_REQ_startSearchChild - b _0800C6F6 -_0800C696: + b @0800C6F6 +@0800C696: bl rfu_REQ_pollSearchChild - b _0800C6F6 -_0800C69C: + b @0800C6F6 +@0800C69C: bl rfu_REQ_endSearchChild - b _0800C6F6 -_0800C6A2: + b @0800C6F6 +@0800C6A2: bl rfu_REQ_startSearchParent - b _0800C6F6 -_0800C6A8: + b @0800C6F6 +@0800C6A8: bl rfu_REQ_pollSearchParent - b _0800C6F6 -_0800C6AE: + b @0800C6F6 +@0800C6AE: bl rfu_REQ_endSearchParent - b _0800C6F6 -_0800C6B4: + b @0800C6F6 +@0800C6B4: ldr r0, =0x03004140 ldrh r0, [r0, 0x1E] bl rfu_REQ_startConnectParent - b _0800C6F6 + b @0800C6F6 .align 2, 0 .pool -_0800C6C4: +@0800C6C4: bl rfu_REQ_pollConnectParent - b _0800C6F6 -_0800C6CA: + b @0800C6F6 +@0800C6CA: bl rfu_REQ_endConnectParent - b _0800C6F6 -_0800C6D0: + b @0800C6F6 +@0800C6D0: ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0, 0x3] bl rfu_REQ_CHILD_startConnectRecovery - b _0800C6F6 + b @0800C6F6 .align 2, 0 .pool -_0800C6E0: +@0800C6E0: bl rfu_REQ_CHILD_pollConnectRecovery - b _0800C6F6 -_0800C6E6: + b @0800C6F6 +@0800C6E6: bl rfu_REQ_CHILD_endConnectRecovery - b _0800C6F6 -_0800C6EC: + b @0800C6F6 +@0800C6EC: bl rfu_REQ_changeMasterSlave - b _0800C6F6 -_0800C6F2: + b @0800C6F6 +@0800C6F2: bl rfu_REQ_stopMode -_0800C6F6: +@0800C6F6: bl rfu_waitREQComplete ldr r1, =0x03004140 movs r0, 0 strb r0, [r1, 0xE] -_0800C700: +@0800C700: ldr r0, =0x03004140 ldrb r0, [r0, 0x4] subs r0, 0x12 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _0800C710 - b _0800C576 -_0800C710: + bhi @0800C710 + b @0800C576 +@0800C710: ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x1 - bne _0800C726 + bne @0800C726 movs r0, 0 bl sub_800C36C lsls r0, 24 cmp r0, 0 - bne _0800C736 -_0800C726: + bne @0800C736 +@0800C726: bl sub_800CF34 bl sub_800D158 bl sub_800D268 bl sub_800D434 -_0800C736: +@0800C736: pop {r4} pop {r0} bx r0 @@ -7818,14 +7818,14 @@ _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 ldrb r1, [r0, 0x7] adds r4, r0, 0 cmp r1, 0x5 - bne _0800C76E + bne @0800C76E movs r2, 0x1 strb r2, [r4, 0x6] strb r1, [r4, 0x4] @@ -7833,18 +7833,18 @@ sub_800C744: @ 800C744 strh r0, [r4, 0x1A] lsls r0, 16 cmp r0, 0 - beq _0800C76C + beq @0800C76C movs r0, 0x6 strb r0, [r4, 0x7] - b _0800C76E + b @0800C76E .align 2, 0 .pool -_0800C76C: +@0800C76C: strb r2, [r4, 0x7] -_0800C76E: +@0800C76E: ldrb r0, [r4, 0x7] cmp r0, 0x1 - bne _0800C798 + bne @0800C798 strb r0, [r4, 0x6] movs r0, 0x5 strb r0, [r4, 0x4] @@ -7857,17 +7857,17 @@ _0800C76E: strh r1, [r4, 0x1C] lsls r0, 16 cmp r0, 0 - beq _0800C794 + beq @0800C794 movs r0, 0x2 - b _0800C796 -_0800C794: + b @0800C796 +@0800C794: movs r0, 0x3 -_0800C796: +@0800C796: strb r0, [r4, 0x7] -_0800C798: +@0800C798: ldrb r0, [r4, 0x7] cmp r0, 0x3 - bne _0800C7AE + bne @0800C7AE movs r0, 0 strb r0, [r4, 0x6] movs r0, 0x28 @@ -7876,14 +7876,14 @@ _0800C798: strb r0, [r4, 0x7] movs r0, 0x9 strb r0, [r4, 0x4] -_0800C7AE: +@0800C7AE: pop {r4} pop {r0} bx r0 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} @@ -7897,180 +7897,180 @@ sub_800C7B4: @ 800C7B4 ldrb r1, [r0, 0xE] adds r7, r0, 0 cmp r1, 0 - bne _0800C7D2 - b _0800CC98 -_0800C7D2: + bne @0800C7D2 + b @0800CC98 +@0800C7D2: movs r0, 0 strb r0, [r7, 0xE] mov r0, r8 subs r0, 0x10 cmp r0, 0x2D - bls _0800C7E0 - b _0800CC8A -_0800C7E0: + bls @0800C7E0 + b @0800CC8A +@0800C7E0: lsls r0, 2 - ldr r1, =_0800C7F4 + ldr r1, =@0800C7F4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0800C7F4: - .4byte _0800C8AC - .4byte _0800CC8A - .4byte _0800CC8A - .4byte _0800CC8A - .4byte _0800CC8A - .4byte _0800CC8A - .4byte _0800C8D8 - .4byte _0800C8C4 - .4byte _0800CC8A - .4byte _0800C8EC - .4byte _0800C8FC - .4byte _0800C920 - .4byte _0800C940 - .4byte _0800C960 - .4byte _0800C9D0 - .4byte _0800CA02 - .4byte _0800CA18 - .4byte _0800CA60 - .4byte _0800CC8A - .4byte _0800CC8A - .4byte _0800CC8A - .4byte _0800CC8A - .4byte _0800CC8A - .4byte _0800CBD8 - .4byte _0800CC8A - .4byte _0800CC8A - .4byte _0800CC8A - .4byte _0800CC8A - .4byte _0800CC8A - .4byte _0800CC8A - .4byte _0800CC8A - .4byte _0800CC8A - .4byte _0800CC8A - .4byte _0800CC8A - .4byte _0800CAD0 - .4byte _0800CB1C - .4byte _0800CB64 - .4byte _0800CC8A - .4byte _0800CC8A - .4byte _0800CC8A - .4byte _0800CC8A - .4byte _0800CC8A - .4byte _0800CC8A - .4byte _0800CC8A - .4byte _0800CC8A - .4byte _0800CC78 -_0800C8AC: +@0800C7F4: + .4byte @0800C8AC + .4byte @0800CC8A + .4byte @0800CC8A + .4byte @0800CC8A + .4byte @0800CC8A + .4byte @0800CC8A + .4byte @0800C8D8 + .4byte @0800C8C4 + .4byte @0800CC8A + .4byte @0800C8EC + .4byte @0800C8FC + .4byte @0800C920 + .4byte @0800C940 + .4byte @0800C960 + .4byte @0800C9D0 + .4byte @0800CA02 + .4byte @0800CA18 + .4byte @0800CA60 + .4byte @0800CC8A + .4byte @0800CC8A + .4byte @0800CC8A + .4byte @0800CC8A + .4byte @0800CC8A + .4byte @0800CBD8 + .4byte @0800CC8A + .4byte @0800CC8A + .4byte @0800CC8A + .4byte @0800CC8A + .4byte @0800CC8A + .4byte @0800CC8A + .4byte @0800CC8A + .4byte @0800CC8A + .4byte @0800CC8A + .4byte @0800CC8A + .4byte @0800CAD0 + .4byte @0800CB1C + .4byte @0800CB64 + .4byte @0800CC8A + .4byte @0800CC8A + .4byte @0800CC8A + .4byte @0800CC8A + .4byte @0800CC8A + .4byte @0800CC8A + .4byte @0800CC8A + .4byte @0800CC8A + .4byte @0800CC78 +@0800C8AC: cmp r6, 0 - beq _0800C8B2 - b _0800CC8A -_0800C8B2: + beq @0800C8B2 + b @0800CC8A +@0800C8B2: ldr r0, =0x03004140 ldrb r1, [r0, 0x5] strb r1, [r0, 0x4] movs r1, 0x4 strb r1, [r0, 0x5] - b _0800CC8A + b @0800CC8A .align 2, 0 .pool -_0800C8C4: +@0800C8C4: cmp r6, 0 - beq _0800C8CA - b _0800CC8A -_0800C8CA: + beq @0800C8CA + b @0800CC8A +@0800C8CA: ldr r0, =0x03004140 ldrb r1, [r0, 0x5] strb r1, [r0, 0x4] strb r6, [r0, 0x5] - b _0800CC8A + b @0800CC8A .align 2, 0 .pool -_0800C8D8: +@0800C8D8: cmp r6, 0 - beq _0800C8DE - b _0800CC8A -_0800C8DE: + beq @0800C8DE + b @0800CC8A +@0800C8DE: ldr r0, =0x03004140 strb r6, [r0, 0x5] strb r6, [r0, 0x4] movs r0, 0 - b _0800CBF6 + b @0800CBF6 .align 2, 0 .pool -_0800C8EC: +@0800C8EC: cmp r6, 0 - beq _0800C8F2 - b _0800CC8A -_0800C8F2: + beq @0800C8F2 + b @0800CC8A +@0800C8F2: ldr r1, =0x03004140 movs r0, 0x6 - b _0800CA0C + b @0800CA0C .align 2, 0 .pool -_0800C8FC: +@0800C8FC: ldr r1, =0x03004140 ldrh r0, [r1, 0x1A] cmp r0, 0 - bne _0800C906 - b _0800CC8A -_0800C906: + bne @0800C906 + b @0800CC8A +@0800C906: subs r0, 0x1 strh r0, [r1, 0x1A] lsls r0, 16 cmp r0, 0 - beq _0800C912 - b _0800CC8A -_0800C912: + beq @0800C912 + b @0800CC8A +@0800C912: movs r0, 0x7 strb r0, [r1, 0x4] movs r0, 0x8 strb r0, [r1, 0x5] - b _0800CC8A + b @0800CC8A .align 2, 0 .pool -_0800C920: +@0800C920: cmp r6, 0 - beq _0800C926 - b _0800CC8A -_0800C926: + beq @0800C926 + b @0800CC8A +@0800C926: ldr r0, =0x03004140 ldrb r1, [r0, 0x5] strb r1, [r0, 0x4] strb r6, [r0, 0x5] ldrb r0, [r0, 0x7] cmp r0, 0 - beq _0800C936 - b _0800CC8A -_0800C936: + beq @0800C936 + b @0800CC8A +@0800C936: movs r0, 0x13 - b _0800CBF6 + b @0800CBF6 .align 2, 0 .pool -_0800C940: +@0800C940: cmp r6, 0 - beq _0800C946 - b _0800CC8A -_0800C946: + beq @0800C946 + b @0800CC8A +@0800C946: ldrb r0, [r7, 0xB] cmp r0, 0x1 - bne _0800C956 + bne @0800C956 ldrh r0, [r7, 0x1A] cmp r0, 0x1 - bls _0800C956 + bls @0800C956 subs r0, 0x1 strh r0, [r7, 0x1A] -_0800C956: +@0800C956: ldr r1, =0x03004140 movs r0, 0xA - b _0800CA0C + b @0800CA0C .align 2, 0 .pool -_0800C960: +@0800C960: cmp r6, 0 - bne _0800C9A6 + bne @0800C9A6 bl sub_800D294 lsls r0, 24 lsrs r0, 24 @@ -8079,146 +8079,146 @@ _0800C960: ldr r4, =0x03004140 strh r0, [r4, 0x14] cmp r0, 0 - beq _0800C980 + beq @0800C980 movs r0, 0x20 movs r1, 0x1 bl sub_800D30C -_0800C980: +@0800C980: ldrb r0, [r4, 0xB] cmp r0, 0 - beq _0800C9A6 + beq @0800C9A6 ldrh r0, [r4, 0x1A] cmp r0, 0x1 - beq _0800C9A6 + beq @0800C9A6 ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0x4 - bne _0800C9A6 + bne @0800C9A6 bl rfu_REQ_endSearchParent bl rfu_waitREQComplete movs r0, 0x9 strb r0, [r4, 0x4] movs r0, 0x1 strb r0, [r4, 0xB] -_0800C9A6: +@0800C9A6: ldr r1, =0x03004140 ldrh r0, [r1, 0x1A] cmp r0, 0 - bne _0800C9B0 - b _0800CC8A -_0800C9B0: + bne @0800C9B0 + b @0800CC8A +@0800C9B0: subs r0, 0x1 strh r0, [r1, 0x1A] lsls r0, 16 cmp r0, 0 - beq _0800C9BC - b _0800CC8A -_0800C9BC: + beq @0800C9BC + b @0800CC8A +@0800C9BC: movs r0, 0xB strb r0, [r1, 0x4] movs r0, 0 strb r0, [r1, 0x5] - b _0800CC8A + b @0800CC8A .align 2, 0 .pool -_0800C9D0: +@0800C9D0: cmp r6, 0 - beq _0800C9D6 - b _0800CC8A -_0800C9D6: + beq @0800C9D6 + b @0800CC8A +@0800C9D6: ldr r2, =0x03004140 ldrb r0, [r2, 0x5] strb r0, [r2, 0x4] ldrb r1, [r2, 0x7] cmp r1, 0 - bne _0800C9F4 + bne @0800C9F4 lsls r0, 24 cmp r0, 0 - beq _0800C9EA - b _0800CC8A -_0800C9EA: + beq @0800C9EA + b @0800CC8A +@0800C9EA: movs r0, 0x21 - b _0800CBF6 + b @0800CBF6 .align 2, 0 .pool -_0800C9F4: +@0800C9F4: cmp r1, 0x7 - bne _0800C9FA - b _0800CC8A -_0800C9FA: + bne @0800C9FA + b @0800CC8A +@0800C9FA: movs r0, 0x5 strb r0, [r2, 0x4] strb r0, [r2, 0x7] - b _0800CC8A -_0800CA02: + b @0800CC8A +@0800CA02: cmp r6, 0 - beq _0800CA08 - b _0800CC8A -_0800CA08: + beq @0800CA08 + b @0800CC8A +@0800CA08: ldr r1, =0x03004140 movs r0, 0xD -_0800CA0C: +@0800CA0C: strb r0, [r1, 0x5] strb r0, [r1, 0x4] - b _0800CC8A + b @0800CC8A .align 2, 0 .pool -_0800CA18: +@0800CA18: cmp r6, 0 - bne _0800CA3C + bne @0800CA3C ldr r4, =0x03004150 mov r0, sp adds r1, r4, 0 bl rfu_getConnectParentStatus lsls r0, 16 cmp r0, 0 - bne _0800CA3C + bne @0800CA3C mov r0, sp ldrb r0, [r0] cmp r0, 0 - bne _0800CA3C + bne @0800CA3C adds r1, r4, 0 subs r1, 0x10 movs r0, 0xE strb r0, [r1, 0x4] -_0800CA3C: +@0800CA3C: ldr r1, =0x03004140 ldrh r0, [r1, 0x1A] cmp r0, 0 - bne _0800CA46 - b _0800CC8A -_0800CA46: + bne @0800CA46 + b @0800CC8A +@0800CA46: subs r0, 0x1 strh r0, [r1, 0x1A] lsls r0, 16 cmp r0, 0 - beq _0800CA52 - b _0800CC8A -_0800CA52: + beq @0800CA52 + b @0800CC8A +@0800CA52: movs r0, 0xE strb r0, [r1, 0x4] - b _0800CC8A + b @0800CC8A .align 2, 0 .pool -_0800CA60: +@0800CA60: cmp r6, 0 - beq _0800CA66 - b _0800CC8A -_0800CA66: + beq @0800CA66 + b @0800CC8A +@0800CA66: ldr r4, =0x03004150 mov r0, sp adds r1, r4, 0 bl rfu_getConnectParentStatus lsls r0, 16 cmp r0, 0 - beq _0800CA78 - b _0800CC8A -_0800CA78: + beq @0800CA78 + b @0800CC8A +@0800CA78: mov r0, sp ldrb r0, [r0] cmp r0, 0 - bne _0800CA9C + bne @0800CA9C adds r1, r4, 0 subs r1, 0x10 movs r0, 0x13 @@ -8229,10 +8229,10 @@ _0800CA78: strh r0, [r1, 0x1E] ldrb r0, [r1, 0x10] strh r0, [r1, 0x14] - b _0800CABC + b @0800CABC .align 2, 0 .pool -_0800CA9C: +@0800CA9C: adds r1, r4, 0 subs r1, 0x10 strb r6, [r1, 0x5] @@ -8244,26 +8244,26 @@ _0800CA9C: strh r0, [r1, 0x14] ldrb r0, [r1, 0x7] cmp r0, 0 - beq _0800CABC + beq @0800CABC movs r0, 0x3 strb r0, [r1, 0x7] movs r0, 0x9 strb r0, [r1, 0x4] -_0800CABC: +@0800CABC: ldr r4, =0x03004140 ldrb r0, [r4, 0x1E] movs r1, 0x1 bl sub_800D30C movs r0, 0 strh r0, [r4, 0x1E] - b _0800CC8A + b @0800CC8A .align 2, 0 .pool -_0800CAD0: +@0800CAD0: cmp r6, 0 - beq _0800CAD6 - b _0800CC8A -_0800CAD6: + beq @0800CAD6 + b @0800CC8A +@0800CAD6: ldr r2, =0x03007890 ldr r3, [r2] ldrb r0, [r3, 0x3] @@ -8277,47 +8277,47 @@ _0800CAD6: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0800CAF4 - b _0800CC8A -_0800CAF4: + beq @0800CAF4 + b @0800CC8A +@0800CAF4: adds r1, r7, 0 movs r3, 0x1 -_0800CAF8: +@0800CAF8: ldrb r0, [r1, 0x10] adds r0, 0x1 strb r0, [r1, 0x10] lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bls _0800CB08 - b _0800CC8A -_0800CB08: + bls @0800CB08 + b @0800CC8A +@0800CB08: ldr r0, [r2] ldrb r0, [r0, 0x3] ldrb r4, [r7, 0x10] asrs r0, r4 ands r0, r3 cmp r0, 0 - beq _0800CAF8 - b _0800CC8A + beq @0800CAF8 + b @0800CC8A .align 2, 0 .pool -_0800CB1C: +@0800CB1C: cmp r6, 0 - bne _0800CB3A + bne @0800CB3A mov r0, sp bl rfu_CHILD_getConnectRecoveryStatus lsls r0, 16 cmp r0, 0 - bne _0800CB3A + bne @0800CB3A mov r0, sp ldrb r0, [r0] cmp r0, 0x1 - bhi _0800CB3A + bhi @0800CB3A ldr r1, =0x03004140 movs r0, 0x12 strb r0, [r1, 0x4] -_0800CB3A: +@0800CB3A: ldr r2, =0x03004140 ldrb r0, [r2, 0x10] lsls r0, 1 @@ -8326,37 +8326,37 @@ _0800CB3A: adds r1, r0, r1 ldrh r0, [r1] cmp r0, 0 - bne _0800CB4E - b _0800CC8A -_0800CB4E: + bne @0800CB4E + b @0800CC8A +@0800CB4E: subs r0, 0x1 strh r0, [r1] lsls r0, 16 cmp r0, 0 - beq _0800CB5A - b _0800CC8A -_0800CB5A: + beq @0800CB5A + b @0800CC8A +@0800CB5A: movs r0, 0x12 strb r0, [r2, 0x4] - b _0800CC8A + b @0800CC8A .align 2, 0 .pool -_0800CB64: +@0800CB64: cmp r6, 0 - beq _0800CB6A - b _0800CC8A -_0800CB6A: + beq @0800CB6A + b @0800CC8A +@0800CB6A: mov r0, sp bl rfu_CHILD_getConnectRecoveryStatus lsls r0, 16 cmp r0, 0 - beq _0800CB78 - b _0800CC8A -_0800CB78: + beq @0800CB78 + b @0800CC8A +@0800CB78: mov r0, sp ldrb r0, [r0] cmp r0, 0 - bne _0800CB94 + bne @0800CB94 ldr r1, =0x03004140 movs r0, 0x13 strb r0, [r1, 0x4] @@ -8364,10 +8364,10 @@ _0800CB78: strb r0, [r1, 0x5] movs r0, 0x32 strh r0, [r1, 0x1E] - b _0800CBA8 + b @0800CBA8 .align 2, 0 .pool -_0800CB94: +@0800CB94: ldr r4, =0x03004140 strb r6, [r4, 0x5] strb r6, [r4, 0x4] @@ -8377,7 +8377,7 @@ _0800CB94: bl sub_800D334 movs r0, 0x33 strh r0, [r4, 0x1E] -_0800CBA8: +@0800CBA8: ldr r5, =0x03004140 ldrb r0, [r5, 0x10] lsls r0, 1 @@ -8395,17 +8395,17 @@ _0800CBA8: movs r1, 0x1 bl sub_800D30C strh r4, [r5, 0x1E] - b _0800CC8A + b @0800CC8A .align 2, 0 .pool -_0800CBD8: +@0800CBD8: cmp r6, 0 - bne _0800CC8A + bne @0800CC8A ldr r5, =0x03004140 ldrb r1, [r5, 0x5] adds r0, r1, 0 cmp r0, 0x16 - bne _0800CC04 + bne @0800CC04 ldrb r0, [r5, 0x11] strb r0, [r5, 0x4] ldrb r0, [r5, 0x12] @@ -8414,15 +8414,15 @@ _0800CBD8: movs r0, 0x1 strb r0, [r5, 0x2] movs r0, 0x41 -_0800CBF6: +@0800CBF6: movs r1, 0 bl sub_800D30C - b _0800CC8A + b @0800CC8A .align 2, 0 .pool -_0800CC04: +@0800CC04: cmp r0, 0xF - bne _0800CC8A + bne @0800CC8A strb r1, [r5, 0x4] ldrb r0, [r5, 0x2] movs r4, 0x1 @@ -8454,7 +8454,7 @@ _0800CC04: strb r0, [r4] lsls r0, 24 cmp r0, 0 - beq _0800CC8A + beq @0800CC8A strb r7, [r5, 0x5] strb r7, [r5, 0x4] bl sub_800D610 @@ -8470,39 +8470,39 @@ _0800CC04: movs r0, 0x25 movs r1, 0x1 bl sub_800D30C - b _0800CC8A + b @0800CC8A .align 2, 0 .pool -_0800CC78: +@0800CC78: cmp r6, 0 - bne _0800CC8A + bne @0800CC8A ldr r0, =0x03004140 strb r6, [r0, 0x5] strb r6, [r0, 0x4] movs r0, 0x42 movs r1, 0 bl sub_800D30C -_0800CC8A: +@0800CC8A: ldr r1, =0x03004140 movs r0, 0x1 strb r0, [r1, 0xE] - b _0800CCE6 + b @0800CCE6 .align 2, 0 .pool -_0800CC98: +@0800CC98: cmp r6, 0x3 - bne _0800CCE6 + bne @0800CCE6 ldrb r0, [r7, 0xF] cmp r0, 0 - beq _0800CCE6 + beq @0800CCE6 mov r3, r8 cmp r3, 0x24 - beq _0800CCB0 + beq @0800CCB0 cmp r3, 0x26 - beq _0800CCB0 + beq @0800CCB0 cmp r3, 0x27 - bne _0800CCE6 -_0800CCB0: + bne @0800CCE6 +@0800CCB0: bl rfu_REQ_RFUStatus bl rfu_waitREQComplete mov r0, sp @@ -8510,12 +8510,12 @@ _0800CCB0: mov r0, sp ldrb r0, [r0] cmp r0, 0 - bne _0800CCE6 + bne @0800CCE6 ldr r4, =0x03007890 ldr r0, [r4] ldrb r0, [r0] cmp r0, 0 - bne _0800CCE6 + bne @0800CCE6 bl rfu_getSTWIRecvBuffer ldr r1, [r4] ldrb r1, [r1, 0x2] @@ -8525,35 +8525,35 @@ _0800CCB0: movs r0, 0x29 bl sub_800C36C movs r6, 0 -_0800CCE6: +@0800CCE6: mov r4, r8 cmp r4, 0x26 - bne _0800CCEE - b _0800CE02 -_0800CCEE: + bne @0800CCEE + b @0800CE02 +@0800CCEE: cmp r4, 0x26 - bgt _0800CD00 + bgt @0800CD00 cmp r4, 0x10 - bne _0800CCF8 - b _0800CE20 -_0800CCF8: - b _0800CE3E + bne @0800CCF8 + b @0800CE20 +@0800CCF8: + b @0800CE3E .align 2, 0 .pool -_0800CD00: +@0800CD00: mov r0, r8 cmp r0, 0x30 - beq _0800CD0E + beq @0800CD0E cmp r0, 0x3D - bne _0800CD0C - b _0800CE20 -_0800CD0C: - b _0800CE3E -_0800CD0E: + bne @0800CD0C + b @0800CE20 +@0800CD0C: + b @0800CE3E +@0800CD0E: cmp r6, 0 - beq _0800CD14 - b _0800CE42 -_0800CD14: + beq @0800CD14 + b @0800CE42 +@0800CD14: bl rfu_getSTWIRecvBuffer ldr r4, =0x03004140 ldrb r0, [r0, 0x8] @@ -8563,7 +8563,7 @@ _0800CD14: adds r2, 0x30 ldrb r1, [r2] cmp r1, 0 - beq _0800CD6A + beq @0800CD6A ldrb r0, [r4, 0x14] adds r3, r1, 0 bics r3, r0 @@ -8576,28 +8576,28 @@ _0800CD14: adds r4, r1, 0 adds r4, 0x34 movs r2, 0 -_0800CD44: +@0800CD44: ldrh r0, [r1, 0x14] asrs r0, r3 ands r0, r5 cmp r0, 0 - beq _0800CD54 + beq @0800CD54 lsls r0, r3, 1 adds r0, r4 strh r2, [r0] -_0800CD54: +@0800CD54: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3 - bls _0800CD44 + bls @0800CD44 ldr r1, =0x03004140 ldrb r0, [r1, 0x6] cmp r0, 0 - bne _0800CD6A + bne @0800CD6A strb r0, [r1, 0x5] strb r0, [r1, 0x4] -_0800CD6A: +@0800CD6A: mov r3, sp ldr r1, =0x03004140 ldrb r2, [r1] @@ -8610,89 +8610,89 @@ _0800CD6A: mov r1, sp movs r5, 0x1 adds r4, r7, 0 -_0800CD82: +@0800CD82: ldrb r0, [r1] asrs r0, r3 ands r0, r5 cmp r0, 0 - beq _0800CD96 + beq @0800CD96 ldrb r0, [r4, 0x1] cmp r0, 0 - beq _0800CD96 + beq @0800CD96 subs r0, 0x1 strb r0, [r7, 0x1] -_0800CD96: +@0800CD96: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3 - bls _0800CD82 + bls @0800CD82 ldrb r1, [r7, 0x14] ldrb r0, [r7] bics r0, r1 strb r0, [r7] ldrb r1, [r7, 0x7] cmp r1, 0 - beq _0800CDE0 + beq @0800CDE0 ldr r0, [r2] ldrb r0, [r0] cmp r0, 0xFF - bne _0800CDF2 + bne @0800CDF2 cmp r1, 0x8 - bne _0800CDCC + bne @0800CDCC ldrh r0, [r7, 0x1C] strh r0, [r7, 0x1A] movs r0, 0x6 strb r0, [r7, 0x7] - b _0800CDDE + b @0800CDDE .align 2, 0 .pool -_0800CDCC: +@0800CDCC: ldrb r0, [r7, 0x4] subs r0, 0x6 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bls _0800CDE0 + bls @0800CDE0 movs r0, 0x1 strb r0, [r7, 0x7] movs r0, 0x5 -_0800CDDE: +@0800CDDE: strb r0, [r7, 0x4] -_0800CDE0: +@0800CDE0: ldr r0, [r2] ldrb r0, [r0] cmp r0, 0xFF - bne _0800CDF2 + bne @0800CDF2 ldrb r0, [r7, 0x4] cmp r0, 0 - bne _0800CDF2 + bne @0800CDF2 movs r0, 0xFF strb r0, [r7, 0x6] -_0800CDF2: +@0800CDF2: ldrb r0, [r7, 0xE] cmp r0, 0 - bne _0800CE3E + bne @0800CE3E movs r0, 0x40 movs r1, 0x1 bl sub_800D30C - b _0800CE3E -_0800CE02: + b @0800CE3E +@0800CE02: bl sub_800D20C ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0xFF - beq _0800CE3E + beq @0800CE3E movs r0, 0x50 movs r1, 0 bl sub_800D30C - b _0800CE3E + b @0800CE3E .align 2, 0 .pool -_0800CE20: +@0800CE20: cmp r6, 0 - bne _0800CE42 + bne @0800CE42 ldr r0, =0x03004140 strb r6, [r0, 0xD] strb r6, [r0, 0x1] @@ -8702,21 +8702,21 @@ _0800CE20: bl sub_800D610 mov r4, r8 cmp r4, 0x3D - bne _0800CE3E + bne @0800CE3E bl sub_800BFA0 -_0800CE3E: +@0800CE3E: cmp r6, 0 - beq _0800CE92 -_0800CE42: + beq @0800CE92 +@0800CE42: ldr r7, =0x03004140 mov r0, r8 cmp r0, 0x1C - bne _0800CE74 + bne @0800CE74 cmp r6, 0 - beq _0800CE74 + beq @0800CE74 ldrb r0, [r7, 0x7] cmp r0, 0x4 - bne _0800CE74 + bne @0800CE74 ldr r2, =0x03007890 ldr r1, [r2] movs r0, 0x1 @@ -8726,33 +8726,33 @@ _0800CE42: strb r0, [r1, 0x2] bl sub_800D334 bl rfu_waitREQComplete - b _0800CEA4 + b @0800CEA4 .align 2, 0 .pool -_0800CE74: +@0800CE74: movs r1, 0 mov r3, r8 strh r3, [r7, 0x14] strh r6, [r7, 0x16] ldrb r0, [r7, 0xE] cmp r0, 0 - beq _0800CE86 + beq @0800CE86 strb r1, [r7, 0x5] strb r1, [r7, 0x4] -_0800CE86: +@0800CE86: movs r0, 0xF0 movs r1, 0x2 bl sub_800D30C bl sub_800D610 -_0800CE92: +@0800CE92: mov r4, r8 cmp r4, 0xFF - bne _0800CEA4 + bne @0800CEA4 movs r0, 0xF2 movs r1, 0 bl sub_800D30C bl sub_800D610 -_0800CEA4: +@0800CEA4: add sp, 0x4 pop {r3} mov r8, r3 @@ -8762,7 +8762,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 @@ -8777,48 +8777,48 @@ sub_800CEB0: @ 800CEB0 ldr r0, [r0] ldrb r5, [r0] cmp r5, 0 - bne _0800CEEC + bne @0800CEEC adds r0, r6, 0 bl sub_800C36C ldrb r0, [r4, 0x2] cmp r0, 0x1 - beq _0800CF04 + beq @0800CF04 bl sub_800D610 strb r5, [r4, 0xF] strb r7, [r4, 0xE] - b _0800CF28 + b @0800CF28 .align 2, 0 .pool -_0800CEEC: +@0800CEEC: mov r0, sp bl rfu_UNI_PARENT_getDRAC_ACK lsls r0, 16 cmp r0, 0 - bne _0800CF04 + bne @0800CF04 mov r1, sp ldrb r0, [r4, 0x3] ldrb r1, [r1] orrs r0, r1 ldrb r1, [r4, 0x3] strb r0, [r4, 0x3] -_0800CF04: +@0800CF04: ldr r4, =0x03004140 ldr r1, [r4, 0x44] cmp r1, 0 - beq _0800CF20 + beq @0800CF20 adds r0, r6, 0 bl _call_via_r1 bl rfu_waitREQComplete ldrb r0, [r4, 0x2] cmp r0, 0x2 - bne _0800CF20 + bne @0800CF20 bl sub_800D610 -_0800CF20: +@0800CF20: ldr r1, =0x03004140 movs r0, 0 strb r0, [r1, 0xF] strb r7, [r1, 0xE] -_0800CF28: +@0800CF28: add sp, 0x4 pop {r4-r7} pop {r0} @@ -8828,7 +8828,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 @@ -8842,9 +8842,9 @@ sub_800CF34: @ 800CF34 lsrs r0, 24 adds r3, r1, 0 cmp r0, 0x3 - bls _0800CF52 - b _0800D146 -_0800CF52: + bls @0800CF52 + b @0800D146 +@0800CF52: ldr r0, =0x03007890 ldr r2, [r0] ldrb r1, [r2, 0x2] @@ -8857,14 +8857,14 @@ _0800CF52: mov r8, r4 strb r1, [r3, 0xC] cmp r4, 0 - beq _0800CF7A + beq @0800CF7A strh r4, [r3, 0x14] movs r0, 0x10 movs r1, 0x1 str r3, [sp, 0x4] bl sub_800D30C ldr r3, [sp, 0x4] -_0800CF7A: +@0800CF7A: movs r0, 0 str r0, [sp] movs r6, 0 @@ -8872,7 +8872,7 @@ _0800CF7A: movs r1, 0x24 adds r1, r3 mov r9, r1 -_0800CF88: +@0800CF88: movs r0, 0x80 lsls r0, 17 lsls r0, r6 @@ -8881,7 +8881,7 @@ _0800CF88: mov r0, r8 ands r0, r4 cmp r0, 0 - beq _0800CFDA + beq @0800CFDA lsls r1, r6, 1 adds r0, r7, 0 adds r0, 0x28 @@ -8895,10 +8895,10 @@ _0800CF88: strb r0, [r2] adds r6, 0x1 mov r10, r6 - b _0800D090 + b @0800D090 .align 2, 0 .pool -_0800CFC0: +@0800CFC0: ldrb r1, [r7] adds r0, r4, 0 orrs r0, r1 @@ -8911,57 +8911,57 @@ _0800CFC0: str r0, [sp] movs r0, 0x1 orrs r5, r0 - b _0800D024 -_0800CFDA: + b @0800D024 +@0800CFDA: mov r1, r9 ldrb r0, [r1] ands r0, r4 adds r2, r6, 0x1 mov r10, r2 cmp r0, 0 - beq _0800D090 + beq @0800D090 ldr r0, =0x03007880 lsls r1, r6, 2 adds r1, r0 ldr r1, [r1] ldrh r0, [r1, 0x34] cmp r0, 0x46 - bne _0800D040 + bne @0800D040 adds r0, r1, 0 adds r0, 0x61 ldrb r0, [r0] cmp r0, 0x1 - bne _0800D058 + bne @0800D058 movs r5, 0x2 ldr r3, [r3, 0x20] ldrh r2, [r3] ldr r0, =0x0000ffff cmp r2, r0 - beq _0800D024 + beq @0800D024 ldr r0, =0x03007890 ldr r0, [r0] lsls r1, r6, 5 adds r0, r1 ldrh r0, [r0, 0x18] ldr r1, =0x0000ffff -_0800D018: +@0800D018: cmp r0, r2 - beq _0800CFC0 + beq @0800CFC0 adds r3, 0x2 ldrh r2, [r3] cmp r2, r1 - bne _0800D018 -_0800D024: + bne @0800D018 +@0800D024: movs r0, 0x1 ands r0, r5 cmp r0, 0 - bne _0800D058 + bne @0800D058 movs r0, 0x4 orrs r5, r0 - b _0800D058 + b @0800D058 .align 2, 0 .pool -_0800D040: +@0800D040: lsls r1, r6, 1 adds r0, r3, 0 adds r0, 0x28 @@ -8972,13 +8972,13 @@ _0800D040: ldr r1, =0x0000ffff ands r0, r1 cmp r0, 0 - bne _0800D058 + bne @0800D058 movs r5, 0x6 -_0800D058: +@0800D058: movs r0, 0x2 ands r0, r5 cmp r0, 0 - beq _0800D07E + beq @0800D07E mov r2, r9 ldrb r0, [r2] bics r0, r4 @@ -8993,52 +8993,52 @@ _0800D058: movs r0, 0x8 adds r1, r6, 0 bl rfu_clearSlot -_0800D07E: +@0800D07E: movs r0, 0x4 ands r5, r0 ldr r3, =0x03004140 cmp r5, 0 - beq _0800D090 + beq @0800D090 ldrb r1, [r7, 0xD] adds r0, r4, 0 orrs r0, r1 strb r0, [r7, 0xD] -_0800D090: +@0800D090: mov r2, r10 lsls r0, r2, 24 lsrs r6, r0, 24 cmp r6, 0x3 - bhi _0800D09C - b _0800CF88 -_0800D09C: + bhi @0800D09C + b @0800CF88 +@0800D09C: ldr r4, [sp] cmp r4, 0 - beq _0800D0AE + beq @0800D0AE ldr r0, =0x03004140 strh r4, [r0, 0x14] movs r0, 0x11 movs r1, 0x1 bl sub_800D30C -_0800D0AE: +@0800D0AE: ldr r1, =0x03004140 ldrb r0, [r1, 0xD] cmp r0, 0 - beq _0800D0EA + beq @0800D0EA movs r5, 0x1 ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0, 0x6] cmp r0, 0 - beq _0800D0CE + beq @0800D0CE ldrb r0, [r1, 0x3] ldrb r1, [r1] ands r0, r1 cmp r0, r1 - beq _0800D0CE + beq @0800D0CE movs r5, 0 -_0800D0CE: +@0800D0CE: cmp r5, 0 - beq _0800D0EA + beq @0800D0EA ldr r4, =0x03004140 ldrb r0, [r4, 0xD] bl sub_800D334 @@ -9049,51 +9049,51 @@ _0800D0CE: movs r0, 0x12 movs r1, 0x1 bl sub_800D30C -_0800D0EA: +@0800D0EA: ldr r0, =0x03004140 adds r1, r0, 0 adds r1, 0x24 ldrb r1, [r1] adds r3, r0, 0 cmp r1, 0 - bne _0800D146 + bne @0800D146 ldrb r0, [r3, 0x4] cmp r0, 0x8 - bne _0800D146 + bne @0800D146 ldrb r0, [r3, 0x7] cmp r0, 0 - bne _0800D120 + bne @0800D120 strb r0, [r3, 0x5] strb r0, [r3, 0x4] movs r0, 0x14 movs r1, 0 bl sub_800D30C - b _0800D146 + b @0800D146 .align 2, 0 .pool -_0800D120: +@0800D120: cmp r0, 0x2 - bne _0800D12C + bne @0800D12C movs r0, 0x3 strb r0, [r3, 0x7] movs r0, 0x9 - b _0800D132 -_0800D12C: + b @0800D132 +@0800D12C: movs r0, 0x1 strb r0, [r3, 0x7] movs r0, 0x5 -_0800D132: +@0800D132: strb r0, [r3, 0x4] ldrb r0, [r3] cmp r0, 0 - beq _0800D146 + beq @0800D146 movs r0, 0 strh r0, [r3, 0x1A] movs r0, 0x8 strb r0, [r3, 0x7] movs r0, 0x5 strb r0, [r3, 0x4] -_0800D146: +@0800D146: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -9105,7 +9105,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] @@ -9115,7 +9115,7 @@ sub_800D158: @ 800D158 ldr r4, =0x03004140 ldrb r0, [r4, 0x4] cmp r0, 0xF - bne _0800D1BC + bne @0800D1BC ldrb r1, [r4, 0x10] lsls r1, 1 adds r5, r4, 0 @@ -9126,7 +9126,7 @@ sub_800D158: @ 800D158 strh r0, [r1] lsls r0, 16 cmp r0, 0 - beq _0800D192 + beq @0800D192 ldr r1, =0x03007880 ldrb r0, [r4, 0x10] lsls r0, 2 @@ -9134,8 +9134,8 @@ sub_800D158: @ 800D158 ldr r0, [r0] ldrh r0, [r0] cmp r0, 0x27 - bne _0800D1BC -_0800D192: + bne @0800D1BC +@0800D192: bl sub_800D630 movs r0, 0x18 strb r0, [r4, 0x4] @@ -9155,22 +9155,22 @@ _0800D192: adds r0, r5 movs r1, 0 strh r1, [r0] -_0800D1BC: +@0800D1BC: ldr r0, =0x04000208 strh r6, [r0] ldr r5, =0x03004140 ldrb r0, [r5, 0x4] cmp r0, 0x18 - bne _0800D1F6 + bne @0800D1F6 ldrb r0, [r5, 0x2] cmp r0, 0x1 - bne _0800D1D2 + bne @0800D1D2 bl sub_800D630 -_0800D1D2: +@0800D1D2: ldrb r0, [r5, 0x2] adds r4, r0, 0 cmp r4, 0 - bne _0800D1F6 + bne @0800D1F6 strb r4, [r5, 0x5] strb r4, [r5, 0x4] ldr r0, =0x03007890 @@ -9183,7 +9183,7 @@ _0800D1D2: movs r0, 0x25 movs r1, 0x1 bl sub_800D30C -_0800D1F6: +@0800D1F6: pop {r4-r6} pop {r0} bx r0 @@ -9192,12 +9192,12 @@ _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] cmp r0, 0xF - bne _0800D258 + bne @0800D258 ldr r1, =0x03007880 ldrb r2, [r5, 0x10] lsls r0, r2, 2 @@ -9205,7 +9205,7 @@ sub_800D20C: @ 800D20C ldr r0, [r0] ldrh r0, [r0] cmp r0, 0x26 - bne _0800D258 + bne @0800D258 movs r4, 0 strb r4, [r5, 0x5] strb r4, [r5, 0x4] @@ -9229,7 +9229,7 @@ sub_800D20C: @ 800D20C movs r0, 0x24 movs r1, 0 bl sub_800D30C -_0800D258: +@0800D258: pop {r4,r5} pop {r0} bx r0 @@ -9238,15 +9238,15 @@ _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] cmp r0, 0 - bne _0800D28C + bne @0800D28C ldrb r0, [r1, 0xA] cmp r0, 0x1 - bne _0800D28C + bne @0800D28C ldrb r0, [r1, 0x4] strb r0, [r1, 0x11] ldrb r0, [r1, 0x5] @@ -9257,7 +9257,7 @@ sub_800D268: @ 800D268 strb r0, [r1, 0x5] movs r0, 0x2 strb r0, [r1, 0xA] -_0800D28C: +@0800D28C: pop {r0} bx r0 .align 2, 0 @@ -9265,7 +9265,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 @@ -9277,12 +9277,12 @@ sub_800D294: @ 800D294 ldr r0, [r1] ldrb r0, [r0, 0x8] cmp r6, r0 - bcs _0800D2F0 + bcs @0800D2F0 mov r8, r0 ldr r0, =0x03004140 mov r10, r0 mov r9, r1 -_0800D2B4: +@0800D2B4: mov r1, r10 ldr r3, [r1, 0x20] ldrh r2, [r3] @@ -9290,7 +9290,7 @@ _0800D2B4: mov r12, r0 ldr r1, =0x0000ffff cmp r2, r1 - beq _0800D2E6 + beq @0800D2E6 mov r1, r9 ldr r0, [r1] lsls r1, r5, 5 @@ -9299,24 +9299,24 @@ _0800D2B4: ldr r7, =0x0000ffff movs r1, 0x1 lsls r1, r5 -_0800D2D4: +@0800D2D4: cmp r4, r2 - bne _0800D2DE + bne @0800D2DE orrs r6, r1 lsls r0, r6, 24 lsrs r6, r0, 24 -_0800D2DE: +@0800D2DE: adds r3, 0x2 ldrh r2, [r3] cmp r2, r7 - bne _0800D2D4 -_0800D2E6: + bne @0800D2D4 +@0800D2E6: mov r1, r12 lsls r0, r1, 24 lsrs r5, r0, 24 cmp r5, r8 - bcc _0800D2B4 -_0800D2F0: + bcc @0800D2B4 +@0800D2F0: adds r0, r6, 0 pop {r3-r5} mov r8, r3 @@ -9330,7 +9330,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 @@ -9339,9 +9339,9 @@ sub_800D30C: @ 800D30C ldr r4, =0x03004140 ldr r2, [r4, 0x40] cmp r2, 0 - beq _0800D322 + beq @0800D322 bl _call_via_r2 -_0800D322: +@0800D322: movs r0, 0 strh r0, [r4, 0x16] strh r0, [r4, 0x14] @@ -9353,7 +9353,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 @@ -9372,7 +9372,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 @@ -9380,9 +9380,9 @@ sub_800D358: @ 800D358 ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r0, 0 - beq _0800D3A0 + beq @0800D3A0 movs r4, 0 -_0800D36A: +@0800D36A: ldr r1, =0x03007880 lsls r0, r4, 2 adds r0, r1 @@ -9393,31 +9393,31 @@ _0800D36A: adds r1, r3, 0 ands r0, r1 cmp r0, 0 - beq _0800D396 + beq @0800D396 ldrb r1, [r2, 0x1A] adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _0800D396 + beq @0800D396 adds r2, r1, 0 bics r2, r5 movs r0, 0x20 adds r1, r4, 0 bl rfu_changeSendTarget -_0800D396: +@0800D396: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _0800D36A -_0800D3A0: + bls @0800D36A +@0800D3A0: ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0, 0x5] cmp r0, 0 - beq _0800D3DE + beq @0800D3DE movs r4, 0 -_0800D3AC: +@0800D3AC: ldr r1, =0x03007880 lsls r0, r4, 2 adds r0, r1 @@ -9428,27 +9428,27 @@ _0800D3AC: adds r1, r3, 0 ands r0, r1 cmp r0, 0 - beq _0800D3D4 + beq @0800D3D4 adds r0, r2, 0 adds r0, 0x4E ldrb r0, [r0] ands r0, r5 cmp r0, 0 - beq _0800D3D4 + beq @0800D3D4 adds r0, r4, 0 bl rfu_NI_stopReceivingData -_0800D3D4: +@0800D3D4: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _0800D3AC -_0800D3DE: + bls @0800D3AC +@0800D3DE: ldr r0, =0x03007890 ldr r3, [r0] ldrb r2, [r3, 0x6] cmp r2, 0 - beq _0800D41C + beq @0800D41C mvns r1, r5 adds r0, r1, 0 ands r0, r2 @@ -9456,28 +9456,28 @@ _0800D3DE: movs r4, 0 ldr r7, =0x03007870 ldr r6, =0x00008024 -_0800D3F6: +@0800D3F6: lsls r0, r4, 2 adds r0, r7 ldr r2, [r0] ldrh r0, [r2] cmp r0, r6 - bne _0800D412 + bne @0800D412 ldrb r3, [r2, 0x3] adds r0, r5, 0 ands r0, r3 cmp r0, 0 - beq _0800D412 + beq @0800D412 adds r0, r1, 0 ands r0, r3 strb r0, [r2, 0x3] -_0800D412: +@0800D412: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _0800D3F6 -_0800D41C: + bls @0800D3F6 +@0800D41C: pop {r4-r7} pop {r0} bx r0 @@ -9486,7 +9486,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 @@ -9496,14 +9496,14 @@ sub_800D434: @ 800D434 ldr r0, =0x03004140 ldrh r0, [r0, 0x18] cmp r0, 0 - beq _0800D510 + beq @0800D510 ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r0, 0 - beq _0800D4D4 + beq @0800D4D4 movs r6, 0 -_0800D454: +@0800D454: ldr r3, =0x03007880 lsls r2, r6, 2 adds r0, r2, r3 @@ -9517,13 +9517,13 @@ _0800D454: adds r0, r6, 0x1 mov r9, r0 cmp r1, 0 - beq _0800D4CA + beq @0800D4CA movs r5, 0 movs r4, 0 movs r1, 0x1 mov r8, r1 mov r10, r3 -_0800D47A: +@0800D47A: adds r0, r7, r3 ldr r0, [r0] ldrb r0, [r0, 0x1A] @@ -9531,7 +9531,7 @@ _0800D47A: mov r1, r8 ands r0, r1 cmp r0, 0 - beq _0800D4A4 + beq @0800D4A4 lsls r0, r4, 2 adds r0, r3 ldr r0, [r0] @@ -9539,15 +9539,15 @@ _0800D47A: ldrh r0, [r0, 0x2] ldrh r1, [r1, 0x18] cmp r0, r1 - bls _0800D4A4 + bls @0800D4A4 mov r0, r8 lsls r0, r4 orrs r5, r0 lsls r0, r5, 24 lsrs r5, r0, 24 -_0800D4A4: +@0800D4A4: cmp r5, 0 - beq _0800D4C0 + beq @0800D4C0 mov r1, r10 adds r0, r7, r1 ldr r0, [r0] @@ -9559,26 +9559,26 @@ _0800D4A4: str r3, [sp] bl rfu_changeSendTarget ldr r3, [sp] -_0800D4C0: +@0800D4C0: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _0800D47A -_0800D4CA: + bls @0800D47A +@0800D4CA: mov r3, r9 lsls r0, r3, 24 lsrs r6, r0, 24 cmp r6, 0x3 - bls _0800D454 -_0800D4D4: + bls @0800D454 +@0800D4D4: ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0, 0x5] cmp r0, 0 - beq _0800D510 + beq @0800D510 movs r6, 0 -_0800D4E0: +@0800D4E0: ldr r1, =0x03007880 lsls r0, r6, 2 adds r0, r1 @@ -9589,21 +9589,21 @@ _0800D4E0: adds r1, r4, 0 ands r0, r1 cmp r0, 0 - beq _0800D506 + beq @0800D506 ldr r1, =0x03004140 ldrh r0, [r2, 0x36] ldrh r1, [r1, 0x18] cmp r0, r1 - bls _0800D506 + bls @0800D506 adds r0, r6, 0 bl rfu_NI_stopReceivingData -_0800D506: +@0800D506: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x3 - bls _0800D4E0 -_0800D510: + bls @0800D4E0 +@0800D510: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -9617,7 +9617,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] @@ -9630,7 +9630,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 @@ -9639,7 +9639,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 @@ -9649,18 +9649,18 @@ sub_800D550: @ 800D550 ldrb r1, [r0, 0x9] adds r3, r0, 0 cmp r1, 0 - beq _0800D578 + beq @0800D578 cmp r4, 0 - bne _0800D578 + bne @0800D578 adds r0, 0x30 ldrb r0, [r0] cmp r0, 0 - beq _0800D578 + beq @0800D578 movs r0, 0x5 - b _0800D588 + b @0800D588 .align 2, 0 .pool -_0800D578: +@0800D578: ldr r2, =0x04000208 ldrh r1, [r2] movs r0, 0 @@ -9669,7 +9669,7 @@ _0800D578: strh r5, [r3, 0x32] strh r1, [r2] movs r0, 0 -_0800D588: +@0800D588: pop {r4,r5} pop {r1} bx r1 @@ -9678,7 +9678,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 @@ -9688,14 +9688,14 @@ sub_800D594: @ 800D594 ldrb r0, [r0, 0x5] orrs r0, r1 cmp r0, 0 - bne _0800D5B8 + bne @0800D5B8 ldr r0, =0x03004140 strh r2, [r0, 0x18] movs r0, 0 - b _0800D5C8 + b @0800D5C8 .align 2, 0 .pool -_0800D5B8: +@0800D5B8: ldr r1, =0x03004140 movs r0, 0x6 strh r0, [r1, 0x14] @@ -9703,7 +9703,7 @@ _0800D5B8: movs r1, 0x1 bl sub_800D30C movs r0, 0x6 -_0800D5C8: +@0800D5C8: pop {r1} bx r1 .align 2, 0 @@ -9711,7 +9711,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 @@ -9722,45 +9722,45 @@ sub_800D5D0: @ 800D5D0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bhi _0800D5FC + bhi @0800D5FC movs r0, 0x7 strh r0, [r1, 0x14] movs r0, 0xF3 movs r1, 0x1 bl sub_800D30C movs r0, 0x7 - b _0800D60A + b @0800D60A .align 2, 0 .pool -_0800D5FC: +@0800D5FC: cmp r2, 0 - beq _0800D606 + beq @0800D606 movs r0, 0x1 strb r0, [r1, 0xB] - b _0800D608 -_0800D606: + b @0800D608 +@0800D606: strb r3, [r1, 0xB] -_0800D608: +@0800D608: movs r0, 0 -_0800D60A: +@0800D60A: pop {r1} bx r1 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] cmp r0, 0 - beq _0800D628 + beq @0800D628 ldrb r0, [r1, 0x2] movs r0, 0 strb r0, [r1, 0x2] movs r0, 0x45 movs r1, 0 bl sub_800D30C -_0800D628: +@0800D628: pop {r0} bx r0 .align 2, 0 @@ -9768,110 +9768,110 @@ _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] cmp r0, 0 - bne _0800D648 + bne @0800D648 movs r0, 0x45 movs r1, 0 bl sub_800D30C - b _0800D654 + b @0800D654 .align 2, 0 .pool -_0800D648: +@0800D648: ldrb r0, [r1, 0x2] cmp r0, 0x1 - bne _0800D654 + bne @0800D654 ldrb r0, [r1, 0x2] movs r0, 0x2 strb r0, [r1, 0x2] -_0800D654: +@0800D654: pop {r0} bx r0 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] adds r2, r0, 0 cmp r1, 0 - beq _0800D6C2 + beq @0800D6C2 ldrb r0, [r2, 0x4] subs r0, 0x5 cmp r0, 0x6 - bhi _0800D6C2 + bhi @0800D6C2 lsls r0, 2 - ldr r1, =_0800D680 + ldr r1, =@0800D680 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0800D680: - .4byte _0800D69C - .4byte _0800D6A4 - .4byte _0800D6AE - .4byte _0800D6AE - .4byte _0800D6B4 - .4byte _0800D6B4 - .4byte _0800D6BA -_0800D69C: +@0800D680: + .4byte @0800D69C + .4byte @0800D6A4 + .4byte @0800D6AE + .4byte @0800D6AE + .4byte @0800D6B4 + .4byte @0800D6B4 + .4byte @0800D6BA +@0800D69C: movs r0, 0x3 strb r0, [r2, 0x7] movs r0, 0x9 - b _0800D6C0 -_0800D6A4: + b @0800D6C0 +@0800D6A4: movs r0, 0x2 strb r0, [r2, 0x7] movs r0, 0x1 strh r0, [r2, 0x1A] - b _0800D6C2 -_0800D6AE: + b @0800D6C2 +@0800D6AE: movs r0, 0x2 strb r0, [r2, 0x7] - b _0800D6C2 -_0800D6B4: + b @0800D6C2 +@0800D6B4: movs r0, 0x28 strh r0, [r2, 0x1A] - b _0800D6C2 -_0800D6BA: + b @0800D6C2 +@0800D6BA: movs r0, 0x28 strh r0, [r2, 0x1A] movs r0, 0xA -_0800D6C0: +@0800D6C0: strb r0, [r2, 0x4] -_0800D6C2: +@0800D6C2: pop {r0} bx r0 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 movs r4, 0 movs r5, 0x46 -_0800D6D2: +@0800D6D2: adds r2, r0, 0x1 movs r1, 0x45 muls r0, r5 adds r0, r3 adds r0, 0x45 -_0800D6DC: +@0800D6DC: strb r4, [r0] subs r0, 0x1 subs r1, 0x1 cmp r1, 0 - bge _0800D6DC + bge @0800D6DC adds r0, r2, 0 cmp r0, 0x1F - ble _0800D6D2 + ble @0800D6D2 movs r1, 0 ldr r2, =0x000008c1 adds r0, r3, r2 @@ -9898,12 +9898,12 @@ _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 movs r4, 0 -_0800D72C: +@0800D72C: lsls r0, r1, 3 adds r2, r1, 0x1 subs r0, r1 @@ -9911,15 +9911,15 @@ _0800D72C: lsls r0, 1 adds r0, r3 adds r0, 0xD -_0800D73A: +@0800D73A: strb r4, [r0] subs r0, 0x1 subs r1, 0x1 cmp r1, 0 - bge _0800D73A + bge @0800D73A adds r1, r2, 0 cmp r1, 0x27 - ble _0800D72C + ble @0800D72C movs r1, 0 ldr r2, =0x00000231 adds r0, r3, r2 @@ -9946,26 +9946,26 @@ _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 movs r4, 0 -_0800D788: +@0800D788: lsls r0, r1, 8 adds r2, r1, 0x1 movs r1, 0xFF adds r0, r3 adds r0, 0xFF -_0800D792: +@0800D792: strb r4, [r0] subs r0, 0x1 subs r1, 0x1 cmp r1, 0 - bge _0800D792 + bge @0800D792 adds r1, r2, 0 cmp r1, 0x1 - ble _0800D788 + ble @0800D788 movs r1, 0 ldr r2, =0x00000201 adds r0, r3, r2 @@ -9992,7 +9992,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 @@ -10000,7 +10000,7 @@ sub_800D7D8: @ 800D7D8 adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0x1F - bhi _0800D874 + bhi @0800D874 ldr r0, =0x04000208 ldrh r1, [r0] adds r7, r1, 0 @@ -10008,29 +10008,29 @@ sub_800D7D8: @ 800D7D8 strh r1, [r0] movs r5, 0 movs r2, 0 -_0800D7F6: +@0800D7F6: adds r1, r4, r2 ldrb r0, [r1] cmp r0, 0 - bne _0800D80A + bne @0800D80A ldrb r0, [r1, 0x1] cmp r0, 0 - bne _0800D80A + bne @0800D80A adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_0800D80A: +@0800D80A: adds r2, 0xE cmp r2, 0x45 - ble _0800D7F6 + ble @0800D7F6 cmp r5, 0x5 - beq _0800D866 + beq @0800D866 movs r2, 0 movs r0, 0x8C lsls r0, 4 adds r5, r3, r0 movs r6, 0x46 -_0800D81E: +@0800D81E: ldrb r0, [r5] adds r1, r0, 0 muls r1, r6 @@ -10041,7 +10041,7 @@ _0800D81E: strb r0, [r1] adds r2, 0x1 cmp r2, 0x45 - ble _0800D81E + ble @0800D81E movs r0, 0x8C lsls r0, 4 adds r1, r3, r0 @@ -10063,24 +10063,24 @@ _0800D81E: movs r1, 0 adds r0, r4, 0 adds r0, 0x45 -_0800D85E: +@0800D85E: strb r1, [r0] subs r0, 0x1 cmp r0, r4 - bge _0800D85E -_0800D866: + bge @0800D85E +@0800D866: ldr r0, =0x04000208 strh r7, [r0] - b _0800D87E + b @0800D87E .align 2, 0 .pool -_0800D874: +@0800D874: ldr r1, =0x000008c3 adds r0, r3, r1 ldrb r1, [r0] movs r1, 0x1 strb r1, [r0] -_0800D87E: +@0800D87E: pop {r4-r7} pop {r0} bx r0 @@ -10089,7 +10089,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 @@ -10097,7 +10097,7 @@ sub_800D888: @ 800D888 adds r0, r6, r1 ldrb r0, [r0] cmp r0, 0x27 - bhi _0800D920 + bhi @0800D920 ldr r1, =0x04000208 ldrh r0, [r1] adds r7, r0, 0 @@ -10106,23 +10106,23 @@ sub_800D888: @ 800D888 movs r2, 0 ldrb r0, [r5] cmp r0, 0 - bne _0800D8B8 -_0800D8AA: + bne @0800D8B8 +@0800D8AA: adds r2, 0x1 cmp r2, 0xD - bgt _0800D8B8 + bgt @0800D8B8 adds r0, r5, r2 ldrb r0, [r0] cmp r0, 0 - beq _0800D8AA -_0800D8B8: + beq @0800D8AA +@0800D8B8: cmp r2, 0xE - beq _0800D910 + beq @0800D910 movs r2, 0 movs r0, 0x8C lsls r0, 2 adds r3, r6, r0 -_0800D8C4: +@0800D8C4: ldrb r1, [r3] lsls r0, r1, 3 subs r0, r1 @@ -10134,7 +10134,7 @@ _0800D8C4: strb r1, [r0] adds r2, 0x1 cmp r2, 0xD - ble _0800D8C4 + ble @0800D8C4 movs r1, 0x8C lsls r1, 2 adds r4, r6, r1 @@ -10156,24 +10156,24 @@ _0800D8C4: movs r1, 0 adds r0, r5, 0 adds r0, 0xD -_0800D908: +@0800D908: strb r1, [r0] subs r0, 0x1 cmp r0, r5 - bge _0800D908 -_0800D910: + bge @0800D908 +@0800D910: ldr r0, =0x04000208 strh r7, [r0] - b _0800D92A + b @0800D92A .align 2, 0 .pool -_0800D920: +@0800D920: ldr r1, =0x00000233 adds r0, r6, r1 ldrb r1, [r0] movs r1, 0x1 strb r1, [r0] -_0800D92A: +@0800D92A: pop {r4-r7} pop {r0} bx r0 @@ -10182,7 +10182,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 @@ -10199,32 +10199,32 @@ sub_800D934: @ 800D934 ldrb r1, [r0] ldrb r0, [r5] cmp r1, r0 - beq _0800D960 + beq @0800D960 ldr r1, =0x000008c3 adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0 - beq _0800D984 -_0800D960: + beq @0800D984 +@0800D960: movs r1, 0 adds r0, r4, 0 adds r0, 0x45 -_0800D966: +@0800D966: strb r1, [r0] subs r0, 0x1 cmp r0, r4 - bge _0800D966 + bge @0800D966 ldr r0, =0x04000208 mov r7, r12 strh r7, [r0] movs r0, 0 - b _0800D9CA + b @0800D9CA .align 2, 0 .pool -_0800D984: +@0800D984: movs r2, 0 movs r6, 0x46 -_0800D988: +@0800D988: adds r1, r4, r2 ldrb r0, [r5] adds r7, r0, 0 @@ -10236,7 +10236,7 @@ _0800D988: strb r0, [r1] adds r2, 0x1 cmp r2, 0x45 - ble _0800D988 + ble @0800D988 ldr r0, =0x000008c1 adds r1, r3, r0 ldrb r0, [r1] @@ -10258,7 +10258,7 @@ _0800D988: mov r1, r12 strh r1, [r0] movs r0, 0x1 -_0800D9CA: +@0800D9CA: pop {r4-r7} pop {r1} bx r1 @@ -10267,7 +10267,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 @@ -10279,25 +10279,25 @@ sub_800D9DC: @ 800D9DC ldrb r1, [r0] ldrb r0, [r4] cmp r1, r0 - beq _0800DA00 + beq @0800DA00 ldr r1, =0x00000233 adds r0, r5, r1 ldrb r0, [r0] adds r2, r0, 0 cmp r2, 0 - beq _0800DA08 -_0800DA00: + beq @0800DA08 +@0800DA00: movs r0, 0 - b _0800DA54 + b @0800DA54 .align 2, 0 .pool -_0800DA08: +@0800DA08: ldr r1, =0x04000208 ldrh r0, [r1] adds r7, r0, 0 strh r2, [r1] movs r3, 0 -_0800DA12: +@0800DA12: adds r2, r6, r3 ldrb r1, [r4] lsls r0, r1, 3 @@ -10309,7 +10309,7 @@ _0800DA12: strb r0, [r2] adds r3, 0x1 cmp r3, 0xD - ble _0800DA12 + ble @0800DA12 ldr r0, =0x00000231 adds r4, r5, r0 ldrb r0, [r4] @@ -10330,7 +10330,7 @@ _0800DA12: ldr r0, =0x04000208 strh r7, [r0] movs r0, 0x1 -_0800DA54: +@0800DA54: pop {r4-r7} pop {r1} bx r1 @@ -10339,20 +10339,20 @@ _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 ldrb r0, [r4, 0x1] cmp r0, 0 - bne _0800DA7E + bne @0800DA7E adds r0, r2, 0 movs r1, 0 bl sub_800DAC8 - b _0800DAC0 -_0800DA7E: + b @0800DAC0 +@0800DA7E: movs r3, 0 -_0800DA80: +@0800DA80: ldrb r1, [r2, 0x1C] lsls r0, r1, 3 subs r0, r1 @@ -10364,7 +10364,7 @@ _0800DA80: strb r1, [r0] adds r3, 0x1 cmp r3, 0xD - ble _0800DA80 + ble @0800DA80 ldrb r0, [r2, 0x1C] adds r0, 0x1 ldrb r1, [r2, 0x1C] @@ -10376,37 +10376,37 @@ _0800DA80: strb r0, [r2, 0x1C] ldrb r0, [r2, 0x1E] cmp r0, 0x1 - bhi _0800DABA + bhi @0800DABA ldrb r0, [r2, 0x1E] adds r0, 0x1 ldrb r1, [r2, 0x1E] strb r0, [r2, 0x1E] - b _0800DAC0 -_0800DABA: + b @0800DAC0 +@0800DABA: ldrb r0, [r2, 0x1C] ldrb r1, [r2, 0x1D] strb r0, [r2, 0x1D] -_0800DAC0: +@0800DAC0: pop {r4} pop {r0} bx r0 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 ldrb r0, [r3, 0x1E] cmp r0, 0 - bne _0800DAD8 + bne @0800DAD8 movs r0, 0 - b _0800DB12 -_0800DAD8: + b @0800DB12 +@0800DAD8: cmp r5, 0 - beq _0800DAF6 + beq @0800DAF6 movs r4, 0 -_0800DADE: +@0800DADE: adds r2, r5, r4 ldrb r1, [r3, 0x1D] lsls r0, r1, 3 @@ -10418,8 +10418,8 @@ _0800DADE: strb r0, [r2] adds r4, 0x1 cmp r4, 0xD - ble _0800DADE -_0800DAF6: + ble @0800DADE +@0800DAF6: ldrb r0, [r3, 0x1D] adds r0, 0x1 ldrb r1, [r3, 0x1D] @@ -10434,14 +10434,14 @@ _0800DAF6: ldrb r1, [r3, 0x1E] strb r0, [r3, 0x1E] movs r0, 0x1 -_0800DB12: +@0800DB12: pop {r4,r5} pop {r1} bx r1 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 @@ -10449,12 +10449,12 @@ sub_800DB18: @ 800DB18 adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0x1 - bhi _0800DB70 + bhi @0800DB70 movs r2, 0 movs r0, 0x80 lsls r0, 2 adds r4, r3, r0 -_0800DB30: +@0800DB30: ldrb r0, [r4] lsls r0, 8 adds r0, r2, r0 @@ -10464,7 +10464,7 @@ _0800DB30: strb r1, [r0] adds r2, 0x1 cmp r2, 0xFF - ble _0800DB30 + ble @0800DB30 movs r0, 0x80 lsls r0, 2 adds r1, r3, r0 @@ -10483,16 +10483,16 @@ _0800DB30: adds r0, 0x1 ldrb r2, [r1] strb r0, [r1] - b _0800DB7A + b @0800DB7A .align 2, 0 .pool -_0800DB70: +@0800DB70: ldr r1, =0x00000203 adds r0, r3, r1 ldrb r1, [r0] movs r1, 0x1 strb r1, [r0] -_0800DB7A: +@0800DB7A: pop {r4,r5} pop {r0} bx r0 @@ -10501,7 +10501,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 @@ -10513,20 +10513,20 @@ sub_800DB84: @ 800DB84 ldrb r1, [r0] ldrb r0, [r4] cmp r1, r0 - beq _0800DBA6 + beq @0800DBA6 ldr r1, =0x00000203 adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0 - beq _0800DBB0 -_0800DBA6: + beq @0800DBB0 +@0800DBA6: movs r0, 0 - b _0800DBEA + b @0800DBEA .align 2, 0 .pool -_0800DBB0: +@0800DBB0: movs r2, 0 -_0800DBB2: +@0800DBB2: adds r0, r5, r2 ldrb r1, [r4] lsls r1, 8 @@ -10536,7 +10536,7 @@ _0800DBB2: strb r1, [r0] adds r2, 0x1 cmp r2, 0xFF - ble _0800DBB2 + ble @0800DBB2 ldr r0, =0x00000201 adds r1, r3, r0 ldrb r0, [r1] @@ -10555,7 +10555,7 @@ _0800DBB2: ldrb r2, [r1] strb r0, [r1] movs r0, 0x1 -_0800DBEA: +@0800DBEA: pop {r4,r5} pop {r1} bx r1 @@ -10564,7 +10564,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 @@ -10572,21 +10572,21 @@ sub_800DBF8: @ 800DBF8 adds r0, r1, 0 movs r5, 0 cmp r1, 0x1 - beq _0800DC36 + beq @0800DC36 cmp r1, 0x1 - bgt _0800DC12 + bgt @0800DC12 cmp r1, 0 - beq _0800DC1C - b _0800DCAA -_0800DC12: + beq @0800DC1C + b @0800DCAA +@0800DC12: cmp r0, 0x2 - beq _0800DC56 + beq @0800DC56 cmp r0, 0x3 - beq _0800DC76 - b _0800DCAA -_0800DC1C: + beq @0800DC76 + b @0800DCAA +@0800DC1C: movs r4, 0 -_0800DC1E: +@0800DC1E: adds r0, r6, r4 adds r1, r4, 0x1 strb r1, [r0] @@ -10597,13 +10597,13 @@ _0800DC1E: lsrs r5, r0, 16 adds r4, r1, 0 cmp r4, 0xC7 - ble _0800DC1E - b _0800DC70 -_0800DC36: + ble @0800DC1E + b @0800DC70 +@0800DC36: movs r4, 0 adds r2, r6, 0 adds r2, 0xC8 -_0800DC3C: +@0800DC3C: adds r0, r6, r4 adds r1, r4, 0x1 strb r1, [r0] @@ -10614,12 +10614,12 @@ _0800DC3C: lsrs r5, r0, 16 adds r4, r1, 0 cmp r4, 0x63 - ble _0800DC3C + ble @0800DC3C strh r5, [r2] - b _0800DCAA -_0800DC56: + b @0800DCAA +@0800DC56: movs r4, 0 -_0800DC58: +@0800DC58: bl GenerateRandomNumber lsls r0, 24 lsrs r0, 24 @@ -10630,12 +10630,12 @@ _0800DC58: lsrs r5, r0, 16 adds r4, 0x1 cmp r4, 0xC7 - ble _0800DC58 -_0800DC70: + ble @0800DC58 +@0800DC70: adds r0, r6, r4 strh r5, [r0] - b _0800DCAA -_0800DC76: + b @0800DCAA +@0800DC76: movs r4, 0 ldr r3, =0x03000d74 ldrb r1, [r3] @@ -10644,7 +10644,7 @@ _0800DC76: adds r2, r1, 0x1 movs r0, 0xFF mov r12, r0 -_0800DC86: +@0800DC86: adds r0, r6, r4 adds r1, r4, 0x1 strb r2, [r0] @@ -10657,13 +10657,13 @@ _0800DC86: adds r2, 0x1 adds r4, r1, 0 cmp r1, 0xC7 - ble _0800DC86 + ble @0800DC86 adds r0, r6, r1 strh r5, [r0] ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] -_0800DCAA: +@0800DCAA: pop {r4-r7} pop {r0} bx r0 @@ -10672,16 +10672,16 @@ _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 ldrb r0, [r1] cmp r0, 0xFF - beq _0800DCD8 + beq @0800DCD8 ldr r5, =0x082ed470 adds r2, r1, 0 -_0800DCC4: +@0800DCC4: adds r1, r4, r3 ldrb r0, [r2] adds r0, r5 @@ -10691,8 +10691,8 @@ _0800DCC4: adds r3, 0x1 ldrb r0, [r2] cmp r0, 0xFF - bne _0800DCC4 -_0800DCD8: + bne @0800DCC4 +@0800DCD8: adds r1, r4, r3 movs r0, 0 strb r0, [r1] @@ -10704,16 +10704,16 @@ _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 ldrb r0, [r1] cmp r0, 0 - beq _0800DD0C + beq @0800DD0C ldr r5, =0x082ed370 adds r2, r1, 0 -_0800DCF8: +@0800DCF8: adds r1, r4, r3 ldrb r0, [r2] adds r0, r5 @@ -10723,8 +10723,8 @@ _0800DCF8: adds r3, 0x1 ldrb r0, [r2] cmp r0, 0 - bne _0800DCF8 -_0800DD0C: + bne @0800DCF8 +@0800DD0C: adds r1, r4, r3 movs r0, 0xFF strb r0, [r1] @@ -10736,7 +10736,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 @@ -10747,65 +10747,65 @@ sub_800DD1C: @ 800DD1C ldrb r1, [r4] adds r7, r0, 0 cmp r1, 0x1 - bne _0800DD72 + bne @0800DD72 movs r3, 0 ands r1, r2 cmp r1, 0 - beq _0800DD4E + beq @0800DD4E cmp r5, 0x1 - bne _0800DD48 + bne @0800DD48 ldrb r0, [r4, 0xA] - b _0800DD8C + b @0800DD8C .align 2, 0 .pool -_0800DD48: +@0800DD48: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_0800DD4E: +@0800DD4E: lsrs r2, 1 adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3 - bhi _0800DD8A + bhi @0800DD8A movs r0, 0x1 ands r0, r2 cmp r0, 0 - beq _0800DD4E + beq @0800DD4E adds r0, r6, 0x1 cmp r5, r0 - bne _0800DD48 -_0800DD68: + bne @0800DD48 +@0800DD68: ldr r0, [r7] adds r0, 0xA adds r0, r3 ldrb r0, [r0] - b _0800DD8C -_0800DD72: + b @0800DD8C +@0800DD72: movs r3, 0 movs r1, 0x1 -_0800DD76: +@0800DD76: adds r0, r2, 0 ands r0, r1 cmp r0, 0 - bne _0800DD68 + bne @0800DD68 lsrs r2, 1 adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3 - bls _0800DD76 -_0800DD8A: + bls @0800DD76 +@0800DD8A: movs r0, 0 -_0800DD8C: +@0800DD8C: pop {r4-r7} pop {r1} bx r1 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 @@ -10821,25 +10821,25 @@ sub_800DD94: @ 800DD94 ldr r0, [r0] adds r5, r0, 0 adds r5, 0xA -_0800DDB2: +@0800DDB2: adds r0, r6, r4 adds r1, r5, r4 ldrb r1, [r1] strb r1, [r0] adds r4, 0x1 cmp r4, 0x1 - ble _0800DDB2 + ble @0800DDB2 movs r4, 0 lsls r2, 7 mov r12, r2 adds r1, r7, 0x4 -_0800DDC8: +@0800DDC8: adds r0, r1, r4 strb r3, [r0] asrs r3, 8 adds r4, 0x1 cmp r4, 0x3 - ble _0800DDC8 + ble @0800DDC8 mov r1, r8 ldr r0, [r1] ldrb r0, [r0, 0x8] @@ -10920,7 +10920,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 @@ -10932,7 +10932,7 @@ sub_800DE7C: @ 800DE7C ldr r0, =0x03004140 ldrb r0, [r0, 0x6] cmp r0, 0x1 - bne _0800DED8 + bne @0800DED8 movs r0, 0x1 mov r9, r0 ldr r6, =0x03007890 @@ -10942,15 +10942,15 @@ sub_800DE7C: @ 800DE7C ldrh r0, [r0, 0x18] bl sub_8010454 cmp r0, 0 - beq _0800DEB8 + beq @0800DEB8 ldr r1, [r6] ldrb r0, [r1, 0x7] asrs r0, r5 mov r2, r9 ands r0, r2 cmp r0, 0 - bne _0800DEF0 -_0800DEB8: + bne @0800DEF0 +@0800DEB8: adds r0, r7, 0 movs r1, 0 movs r2, 0xD @@ -10959,10 +10959,10 @@ _0800DEB8: movs r1, 0 movs r2, 0x8 bl memset - b _0800DF24 + b @0800DF24 .align 2, 0 .pool -_0800DED8: +@0800DED8: movs r0, 0 mov r9, r0 ldr r6, =0x03007890 @@ -10972,9 +10972,9 @@ _0800DED8: ldrh r0, [r0, 0x18] bl sub_8010454 cmp r0, 0 - beq _0800DF10 + beq @0800DF10 ldr r1, [r6] -_0800DEF0: +@0800DEF0: adds r1, r4, r1 adds r1, 0x1A adds r0, r7, 0 @@ -10986,10 +10986,10 @@ _0800DEF0: mov r0, r8 movs r2, 0x8 bl memcpy - b _0800DF24 + b @0800DF24 .align 2, 0 .pool -_0800DF10: +@0800DF10: adds r0, r7, 0 movs r1, 0 movs r2, 0xD @@ -10998,7 +10998,7 @@ _0800DF10: movs r1, 0 movs r2, 0x8 bl memset -_0800DF24: +@0800DF24: mov r0, r9 pop {r3,r4} mov r8, r3 @@ -11009,7 +11009,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 @@ -11022,7 +11022,7 @@ sub_800DF34: @ 800DF34 ldrh r1, [r2, 0x18] ldr r0, =0x00007f7d cmp r1, r0 - bne _0800DF74 + bne @0800DF74 adds r1, r2, 0 adds r1, 0x1A adds r0, r3, 0 @@ -11035,10 +11035,10 @@ sub_800DF34: @ 800DF34 movs r2, 0x8 bl memcpy movs r7, 0x1 - b _0800DF88 + b @0800DF88 .align 2, 0 .pool -_0800DF74: +@0800DF74: adds r0, r3, 0 movs r1, 0 movs r2, 0xD @@ -11047,7 +11047,7 @@ _0800DF74: movs r1, 0 movs r2, 0x8 bl memset -_0800DF88: +@0800DF88: adds r0, r7, 0 pop {r4-r7} pop {r1} @@ -11055,7 +11055,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 @@ -11073,24 +11073,24 @@ 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 lsls r1, 24 lsrs r2, r1, 24 cmp r3, 0 - bne _0800DFCA + bne @0800DFCA cmp r2, 0 - bne _0800DFCA + bne @0800DFCA movs r3, 0xE7 movs r2, 0x8 -_0800DFCA: +@0800DFCA: ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x1 - bne _0800E024 + bne @0800E024 ldr r0, =0x082ed5f0 adds r1, r3, 0 movs r3, 0 @@ -11116,10 +11116,10 @@ _0800DFCA: strb r0, [r4] ldr r0, =0x02022b10 strb r5, [r0] - b _0800E06A + b @0800E06A .align 2, 0 .pool -_0800E024: +@0800E024: ldr r0, =0x082ed5f0 adds r1, r3, 0 movs r3, 0 @@ -11153,7 +11153,7 @@ _0800E024: movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_0800E06A: +@0800E06A: pop {r4,r5} pop {r0} bx r0 @@ -11162,7 +11162,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 @@ -11175,7 +11175,7 @@ sub_800E084: @ 800E084 ldrsh r1, [r2, r0] ldr r0, =0x00001234 cmp r1, r0 - bne _0800E0CA + bne @0800E0CA movs r0, 0 strh r0, [r2, 0x3C] ldrb r1, [r3] @@ -11196,7 +11196,7 @@ sub_800E084: @ 800E084 ldr r1, =0x070003e8 movs r2, 0x4 bl CpuSet -_0800E0CA: +@0800E0CA: pop {r4} pop {r0} bx r0 @@ -11205,7 +11205,7 @@ _0800E0CA: thumb_func_end sub_800E084 thumb_func_start sub_800E0E8 -sub_800E0E8: @ 800E0E8 +sub_800E0E8: ; 800E0E8 push {r4,lr} ldr r4, =0x082ed5e0 ldrh r0, [r4, 0x6] @@ -11213,10 +11213,10 @@ sub_800E0E8: @ 800E0E8 lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 - bne _0800E100 + bne @0800E100 adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load -_0800E100: +@0800E100: ldr r0, =0x082ed5e8 bl gpu_pal_obj_alloc_tag_and_apply ldr r1, =0x02022b10 @@ -11230,67 +11230,67 @@ _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] ldrb r2, [r0, 0x2] movs r3, 0 movs r4, 0x1 -_0800E130: +@0800E130: adds r0, r2, 0 ands r0, r4 cmp r0, 0 - beq _0800E148 + beq @0800E148 ldr r0, [r1] adds r0, 0xA adds r0, r3 ldrb r0, [r0] - b _0800E156 + b @0800E156 .align 2, 0 .pool -_0800E148: +@0800E148: lsrs r2, 1 adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3 - bls _0800E130 + bls @0800E130 movs r0, 0 -_0800E156: +@0800E156: pop {r4} pop {r1} bx r1 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 ldrsh r0, [r2, r3] cmp r0, r1 - beq _0800E170 + beq @0800E170 movs r0, 0 strh r1, [r2, 0x32] strh r0, [r2, 0x34] strh r0, [r2, 0x36] -_0800E170: +@0800E170: pop {r0} bx r0 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} ldr r1, =0x02022b10 ldrb r0, [r1] cmp r0, 0xFF - bne _0800E184 - b _0800E346 -_0800E184: + bne @0800E184 + b @0800E346 +@0800E184: ldr r2, =0x02020630 adds r1, r0, 0 lsls r0, r1, 4 @@ -11301,9 +11301,9 @@ _0800E184: ldrsh r1, [r2, r0] ldr r0, =0x00001234 cmp r1, r0 - beq _0800E19C - b _0800E346 -_0800E19C: + beq @0800E19C + b @0800E346 +@0800E19C: adds r6, r2, 0 movs r5, 0xFF movs r4, 0 @@ -11311,16 +11311,16 @@ _0800E19C: ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x1 - bne _0800E1F6 + bne @0800E1F6 adds r7, r6, 0 adds r7, 0x28 movs r1, 0x29 adds r1, r6 mov r8, r1 - b _0800E1E6 + b @0800E1E6 .align 2, 0 .pool -_0800E1C8: +@0800E1C8: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -11329,20 +11329,20 @@ _0800E1C8: lsls r0, 24 lsrs r0, 24 cmp r5, r0 - bcc _0800E1E6 + bcc @0800E1E6 adds r0, r4, 0 bl sub_800DD1C lsls r0, 24 lsrs r5, r0, 24 -_0800E1E6: +@0800E1E6: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 subs r0, 0x1 cmp r4, r0 - blt _0800E1C8 - b _0800E208 -_0800E1F6: + blt @0800E1C8 + b @0800E208 +@0800E1F6: bl sub_800E124 lsls r0, 24 lsrs r5, r0, 24 @@ -11351,55 +11351,55 @@ _0800E1F6: movs r2, 0x29 adds r2, r6 mov r8, r2 -_0800E208: +@0800E208: bl sub_8012224 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0800E218 + bne @0800E218 movs r0, 0x4 - b _0800E246 -_0800E218: + b @0800E246 +@0800E218: cmp r5, 0x18 - bhi _0800E220 + bhi @0800E220 movs r0, 0x3 - b _0800E246 -_0800E220: + b @0800E246 +@0800E220: adds r0, r5, 0 subs r0, 0x19 lsls r0, 24 lsrs r0, 24 cmp r0, 0x65 - bhi _0800E230 + bhi @0800E230 movs r0, 0x2 - b _0800E246 -_0800E230: + b @0800E246 +@0800E230: adds r0, r5, 0 subs r0, 0x7F lsls r0, 24 lsrs r0, 24 cmp r0, 0x65 - bhi _0800E240 + bhi @0800E240 movs r0, 0x1 - b _0800E246 -_0800E240: + b @0800E246 +@0800E240: cmp r5, 0xE4 - bls _0800E248 + bls @0800E248 movs r0, 0 -_0800E246: +@0800E246: strh r0, [r6, 0x2E] -_0800E248: +@0800E248: movs r3, 0x2E ldrsh r1, [r6, r3] movs r2, 0x30 ldrsh r0, [r6, r2] cmp r1, r0 - beq _0800E25E + beq @0800E25E adds r0, r6, 0 bl sub_800E15C ldrh r0, [r6, 0x2E] strh r0, [r6, 0x30] -_0800E25E: +@0800E25E: movs r0, 0x32 ldrsh r1, [r6, r0] ldr r2, [r6, 0x8] @@ -11416,7 +11416,7 @@ _0800E25E: movs r3, 0x34 ldrsh r1, [r6, r3] cmp r0, r1 - bge _0800E2AC + bge @0800E2AC ldrh r0, [r6, 0x36] adds r0, 0x1 movs r3, 0 @@ -11436,14 +11436,14 @@ _0800E25E: movs r0, 0x2 negs r0, r0 cmp r1, r0 - bne _0800E2B2 + bne @0800E2B2 strh r3, [r6, 0x36] - b _0800E2B2 -_0800E2AC: + b @0800E2B2 +@0800E2AC: ldrh r0, [r6, 0x34] adds r0, 0x1 strh r0, [r6, 0x34] -_0800E2B2: +@0800E2B2: ldr r4, =0x030022c0 movs r1, 0x84 lsls r1, 3 @@ -11513,9 +11513,9 @@ _0800E2B2: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0800E346 + bne @0800E346 bl sub_800E084 -_0800E346: +@0800E346: pop {r3} mov r8, r3 pop {r4-r7} @@ -11526,7 +11526,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 @@ -11536,29 +11536,29 @@ 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 -_0800E38E: +@0800E38E: adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 - beq _0800E39A + beq @0800E39A movs r0, 0x1 - b _0800E3A2 -_0800E39A: + b @0800E3A2 +@0800E39A: adds r1, 0x1 cmp r1, 0x7 - ble _0800E38E + ble @0800E38E movs r0, 0 -_0800E3A2: +@0800E3A2: pop {r1} bx r1 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 @@ -11568,17 +11568,17 @@ sub_800E3A8: @ 800E3A8 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - bne _0800E3BE - b _0800E520 -_0800E3BE: + bne @0800E3BE + b @0800E520 +@0800E3BE: movs r0, 0xF0 bl malloc_and_clear str r0, [sp, 0x14] movs r4, 0 - b _0800E434 + b @0800E434 .align 2, 0 .pool -_0800E3D0: +@0800E3D0: lsls r2, r4, 2 mov r0, sp adds r1, r0, r2 @@ -11601,7 +11601,7 @@ _0800E3D0: subs r0, 0x4 ldr r1, [sp, 0x1C] adds r3, r1, r0 -_0800E3FC: +@0800E3FC: ldrh r1, [r3] ldr r0, =0x03005d8c ldr r2, [r0] @@ -11610,7 +11610,7 @@ _0800E3FC: adds r0, r4 ldr r0, [r0] cmp r1, r0 - bne _0800E428 + bne @0800E428 adds r1, r2, r6 adds r1, 0x4 ldr r0, [sp, 0x1C] @@ -11619,43 +11619,43 @@ _0800E3FC: bl sub_8008C44 ldr r3, [sp, 0x18] cmp r0, 0 - bne _0800E428 + bne @0800E428 mov r0, sp add r0, r8 str r5, [r0] -_0800E428: +@0800E428: adds r6, 0xC adds r4, 0xC adds r5, 0x1 cmp r5, 0x13 - ble _0800E3FC + ble @0800E3FC mov r4, r9 -_0800E434: +@0800E434: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r4, r0 - blt _0800E3D0 + blt @0800E3D0 movs r0, 0 mov r8, r0 movs r4, 0 mov r7, sp movs r5, 0 ldr r6, [sp, 0x14] - b _0800E4AC + b @0800E4AC .align 2, 0 .pool -_0800E45C: +@0800E45C: bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 cmp r4, r0 - beq _0800E4A6 + beq @0800E4A6 ldr r2, =0x020229e8 adds r0, r5, r2 ldrh r0, [r0, 0x1A] cmp r0, 0x1 - beq _0800E4A6 + beq @0800E4A6 adds r0, r2, 0x4 adds r0, r5, r0 ldrh r1, [r0] @@ -11665,7 +11665,7 @@ _0800E45C: bl sub_800E378 ldr r2, [r7] cmp r2, 0 - blt _0800E4A0 + blt @0800E4A0 ldr r0, =0x03005d8c ldr r1, [r0] lsls r0, r2, 1 @@ -11677,20 +11677,20 @@ _0800E45C: movs r1, 0 movs r2, 0x8 bl memset -_0800E4A0: +@0800E4A0: adds r6, 0xC movs r0, 0x1 add r8, r0 -_0800E4A6: +@0800E4A6: adds r7, 0x4 adds r5, 0x1C adds r4, 0x1 -_0800E4AC: +@0800E4AC: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r4, r0 - blt _0800E45C + blt @0800E45C movs r4, 0 ldr r1, =0x03005d8c mov r9, r1 @@ -11702,14 +11702,14 @@ _0800E4AC: lsls r0, 2 ldr r1, [sp, 0x14] adds r5, r0, r1 -_0800E4CE: +@0800E4CE: mov r1, r9 ldr r0, [r1] adds r0, r6 adds r0, 0x4 bl sub_800E388 cmp r0, 0 - beq _0800E500 + beq @0800E500 mov r0, r9 ldr r2, [r0] ldr r1, =0x00003b98 @@ -11725,14 +11725,14 @@ _0800E4CE: add r8, r0 mov r1, r8 cmp r1, 0x13 - bgt _0800E50A -_0800E500: + bgt @0800E50A +@0800E500: adds r6, 0xC adds r7, 0xC adds r4, 0x1 cmp r4, 0x13 - ble _0800E4CE -_0800E50A: + ble @0800E4CE +@0800E50A: ldr r0, =0x03005d8c ldr r0, [r0] ldr r7, =0x00003b98 @@ -11742,7 +11742,7 @@ _0800E50A: bl memcpy ldr r0, [sp, 0x14] bl free -_0800E520: +@0800E520: add sp, 0x20 pop {r3-r5} mov r8, r3 @@ -11756,7 +11756,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 @@ -11769,40 +11769,40 @@ sub_800E540: @ 800E540 ldr r6, =0x03005d8c ldr r4, =0x00003b98 movs r5, 0 -_0800E558: +@0800E558: ldr r0, [r6] adds r0, r4 adds r0, 0x4 mov r1, r9 bl sub_8008C44 cmp r0, 0 - bne _0800E584 + bne @0800E584 ldr r0, [r6] ldr r1, =0x00003b98 adds r0, r1 adds r0, r5 ldr r0, [r0] cmp r0, r8 - bne _0800E584 + bne @0800E584 movs r0, 0x1 - b _0800E59E + b @0800E59E .align 2, 0 .pool -_0800E584: +@0800E584: ldr r0, [r6] adds r0, r4 adds r0, 0x4 bl sub_800E388 cmp r0, 0 - beq _0800E59C + beq @0800E59C adds r4, 0xC adds r5, 0xC adds r7, 0x1 cmp r7, 0x13 - ble _0800E558 -_0800E59C: + ble @0800E558 +@0800E59C: movs r0, 0 -_0800E59E: +@0800E59E: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -11812,7 +11812,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} @@ -11823,7 +11823,7 @@ sub_800E5AC: @ 800E5AC mov r6, r8 movs r5, 0 movs r4, 0x13 -_0800E5C0: +@0800E5C0: ldr r0, =0x03005d8c ldr r1, [r0] mov r2, r8 @@ -11840,7 +11840,7 @@ _0800E5C0: adds r5, 0xC subs r4, 0x1 cmp r4, 0 - bge _0800E5C0 + bge @0800E5C0 add sp, 0x4 pop {r3} mov r8, r3 @@ -11852,17 +11852,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 @@ -11884,10 +11884,10 @@ sub_800E604: @ 800E604 strb r0, [r6, 0xC] ldrb r0, [r5] cmp r0, 0x4 - beq _0800E636 + beq @0800E636 ldrb r0, [r5] strb r7, [r5] -_0800E636: +@0800E636: mov r7, sp adds r7, 0x2 add r0, sp, 0x4 @@ -11898,13 +11898,13 @@ _0800E636: adds r5, r6, 0 adds r5, 0x80 movs r4, 0x4 -_0800E64A: +@0800E64A: adds r0, r5, 0 bl sub_800FCC4 adds r5, 0x14 subs r4, 0x1 cmp r4, 0 - bge _0800E64A + bge @0800E64A movs r5, 0 ldr r4, =0x0300506c adds r0, r4, 0 @@ -11943,7 +11943,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] @@ -11966,7 +11966,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 @@ -11977,7 +11977,7 @@ sub_800E700: @ 800E700 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - bne _0800E732 + bne @0800E732 ldr r0, =0x020229c6 strh r1, [r0] bl sub_800AAF4 @@ -11987,7 +11987,7 @@ sub_800E700: @ 800E700 adds r1, r4, 0x4 movs r0, 0x3 bl rfu_setTimerInterrupt -_0800E732: +@0800E732: pop {r4} pop {r0} bx r0 @@ -11996,7 +11996,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 @@ -12004,38 +12004,38 @@ sub_800E748: @ 800E748 ldr r0, =0x03005000 ldrh r0, [r0, 0x4] cmp r0, 0x12 - bls _0800E75C - b _0800E862 -_0800E75C: + bls @0800E75C + b @0800E862 +@0800E75C: lsls r0, 2 - ldr r1, =_0800E770 + ldr r1, =@0800E770 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0800E770: - .4byte _0800E7BC - .4byte _0800E862 - .4byte _0800E7E4 - .4byte _0800E862 - .4byte _0800E814 - .4byte _0800E862 - .4byte _0800E862 - .4byte _0800E862 - .4byte _0800E862 - .4byte _0800E862 - .4byte _0800E862 - .4byte _0800E862 - .4byte _0800E862 - .4byte _0800E862 - .4byte _0800E862 - .4byte _0800E862 - .4byte _0800E862 - .4byte _0800E862 - .4byte _0800E828 -_0800E7BC: +@0800E770: + .4byte @0800E7BC + .4byte @0800E862 + .4byte @0800E7E4 + .4byte @0800E862 + .4byte @0800E814 + .4byte @0800E862 + .4byte @0800E862 + .4byte @0800E862 + .4byte @0800E862 + .4byte @0800E862 + .4byte @0800E862 + .4byte @0800E862 + .4byte @0800E862 + .4byte @0800E862 + .4byte @0800E862 + .4byte @0800E862 + .4byte @0800E862 + .4byte @0800E862 + .4byte @0800E828 +@0800E7BC: ldr r0, =0x02022b2c bl sub_800BFCC ldr r0, =0x03005000 @@ -12047,10 +12047,10 @@ _0800E7BC: lsls r0, 3 adds r0, r1 strh r2, [r0, 0xA] - b _0800E862 + b @0800E862 .align 2, 0 .pool -_0800E7E4: +@0800E7E4: ldr r4, =0x03005000 ldrb r0, [r4, 0xC] ldr r3, =0x082ed6e0 @@ -12066,19 +12066,19 @@ _0800E7E4: adds r0, r1 movs r1, 0x6 strh r1, [r0, 0xA] - b _0800E862 + b @0800E862 .align 2, 0 .pool -_0800E814: +@0800E814: movs r0, 0 bl sub_800C27C ldr r1, =0x03005000 movs r0, 0x5 strh r0, [r1, 0x4] - b _0800E862 + b @0800E862 .align 2, 0 .pool -_0800E828: +@0800E828: ldr r4, =0x03005000 ldr r0, =0x00000cdb adds r1, r4, r0 @@ -12103,7 +12103,7 @@ _0800E828: bl AddTask adds r0, r5, 0 bl remove_task -_0800E862: +@0800E862: pop {r4,r5} pop {r0} bx r0 @@ -12112,7 +12112,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, =0x082ed6a5 @@ -12124,7 +12124,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 @@ -12134,99 +12134,99 @@ sub_800E88C: @ 800E88C movs r0, 0x1 negs r0, r0 cmp r5, r0 - bne _0800E8CC + bne @0800E8CC movs r3, 0 movs r5, 0x1 ldr r1, =0x03005cde -_0800E8A6: +@0800E8A6: adds r0, r2, 0 ands r0, r5 cmp r0, 0 - beq _0800E8B8 + beq @0800E8B8 adds r0, r3, r1 strb r4, [r0] adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_0800E8B8: +@0800E8B8: asrs r2, 1 adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3 - bls _0800E8A6 - b _0800E942 + bls @0800E8A6 + b @0800E942 .align 2, 0 .pool -_0800E8CC: +@0800E8CC: movs r3, 0 mvns r0, r1 mov r12, r0 movs r7, 0x1 ldr r4, =0x03005cde -_0800E8D6: +@0800E8D6: adds r2, r1, 0 ands r2, r7 cmp r2, 0 - bne _0800E8E2 + bne @0800E8E2 adds r0, r3, r4 strb r2, [r0] -_0800E8E2: +@0800E8E2: asrs r1, 1 adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3 - bls _0800E8D6 + bls @0800E8D6 movs r4, 0x4 ldr r0, =0x03005cde ldrb r7, [r0] -_0800E8F4: +@0800E8F4: movs r3, 0 subs r1, r4, 0x1 cmp r7, r4 - beq _0800E910 + beq @0800E910 ldr r2, =0x03005cde -_0800E8FE: +@0800E8FE: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3 - bhi _0800E910 + bhi @0800E910 adds r0, r3, r2 ldrb r0, [r0] cmp r0, r4 - bne _0800E8FE -_0800E910: + bne @0800E8FE +@0800E910: cmp r3, 0x4 - bne _0800E916 + bne @0800E916 adds r6, r4, 0 -_0800E916: +@0800E916: lsls r0, r1, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _0800E8F4 + bne @0800E8F4 mov r0, r12 ands r5, r0 movs r3, 0 movs r2, 0x1 ldr r1, =0x03005cde -_0800E928: +@0800E928: adds r0, r5, 0 ands r0, r2 cmp r0, 0 - beq _0800E936 + beq @0800E936 adds r0, r3, r1 strb r6, [r0] adds r6, 0x1 -_0800E936: +@0800E936: asrs r5, 1 adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3 - bls _0800E928 -_0800E942: + bls @0800E928 +@0800E942: pop {r4-r7} pop {r0} bx r0 @@ -12235,7 +12235,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 @@ -12243,41 +12243,41 @@ sub_800E94C: @ 800E94C ldrh r3, [r0, 0x4] adds r7, r0, 0 cmp r3, 0xC - bls _0800E95E - b _0800EA9A -_0800E95E: + bls @0800E95E + b @0800EA9A +@0800E95E: lsls r0, r3, 2 - ldr r1, =_0800E970 + ldr r1, =@0800E970 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0800E970: - .4byte _0800E9A4 - .4byte _0800EA9A - .4byte _0800EA9A - .4byte _0800EA9A - .4byte _0800EA9A - .4byte _0800EA9A - .4byte _0800E9BC - .4byte _0800EA9A - .4byte _0800EA9A - .4byte _0800E9E4 - .4byte _0800EA9A - .4byte _0800E9F8 - .4byte _0800EA3C -_0800E9A4: +@0800E970: + .4byte @0800E9A4 + .4byte @0800EA9A + .4byte @0800EA9A + .4byte @0800EA9A + .4byte @0800EA9A + .4byte @0800EA9A + .4byte @0800E9BC + .4byte @0800EA9A + .4byte @0800EA9A + .4byte @0800E9E4 + .4byte @0800EA9A + .4byte @0800E9F8 + .4byte @0800EA3C +@0800E9A4: ldr r0, =0x082ed608 bl sub_800BFCC ldr r0, =0x03005000 movs r2, 0x1 strh r2, [r0, 0x4] - b _0800E9CC + b @0800E9CC .align 2, 0 .pool -_0800E9BC: +@0800E9BC: ldrb r0, [r7, 0xC] ldr r3, =0x082ed6e0 movs r1, 0 @@ -12285,17 +12285,17 @@ _0800E9BC: bl sub_800C054 movs r2, 0x7 strh r2, [r7, 0x4] -_0800E9CC: +@0800E9CC: ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 strh r2, [r0, 0xA] - b _0800EA9A + b @0800EA9A .align 2, 0 .pool -_0800E9E4: +@0800E9E4: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -12303,30 +12303,30 @@ _0800E9E4: adds r1, r0 movs r0, 0xA strh r0, [r1, 0xA] - b _0800EA9A + b @0800EA9A .align 2, 0 .pool -_0800E9F8: +@0800E9F8: bl sub_80107A0 cmp r0, 0x6 - beq _0800EA1C + beq @0800EA1C cmp r0, 0x6 - bgt _0800EA0A + bgt @0800EA0A cmp r0, 0x5 - beq _0800EA10 - b _0800EA9A -_0800EA0A: + beq @0800EA10 + b @0800EA9A +@0800EA0A: cmp r0, 0x9 - beq _0800EA1C - b _0800EA9A -_0800EA10: + beq @0800EA1C + b @0800EA9A +@0800EA10: ldr r1, =0x03005000 movs r0, 0xC strh r0, [r1, 0x4] - b _0800EA9A + b @0800EA9A .align 2, 0 .pool -_0800EA1C: +@0800EA1C: bl sub_800D630 ldr r0, =0x03005000 ldr r1, =0x00000ce4 @@ -12335,10 +12335,10 @@ _0800EA1C: strb r1, [r0] adds r0, r6, 0 bl remove_task - b _0800EA9A + b @0800EA9A .align 2, 0 .pool -_0800EA3C: +@0800EA3C: ldr r0, =0x00000c3e adds r4, r7, r0 ldrb r0, [r4] @@ -12372,16 +12372,16 @@ _0800EA3C: ldr r4, =0x02022b44 ldrb r0, [r4, 0xF] cmp r0, 0 - bne _0800EA92 + bne @0800EA92 bl sub_801227C ldrb r0, [r4, 0xF] adds r0, 0x1 strb r0, [r4, 0xF] -_0800EA92: +@0800EA92: ldr r0, =sub_801084C + 1 movs r1, 0x5 bl AddTask -_0800EA9A: +@0800EA9A: pop {r4-r7} pop {r0} bx r0 @@ -12390,16 +12390,16 @@ _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] movs r4, 0 -_0800EABC: +@0800EABC: movs r0, 0x1 ands r0, r5 cmp r0, 0 - beq _0800EAE0 + beq @0800EAE0 lsls r2, r4, 3 subs r2, r4 lsls r2, 1 @@ -12412,13 +12412,13 @@ _0800EABC: movs r0, 0x3 adds r1, r4, 0 bl rfu_clearSlot -_0800EAE0: +@0800EAE0: lsrs r5, 1 adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _0800EABC + bls @0800EABC pop {r4,r5} pop {r0} bx r0 @@ -12427,7 +12427,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] @@ -12459,7 +12459,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 @@ -12468,12 +12468,12 @@ sub_800EB44: @ 800EB44 movs r0, 0x7F ands r0, r1 cmp r0, 0x54 - bne _0800EB78 + bne @0800EB78 bl sub_8011A74 lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bne _0800EB78 + bne @0800EB78 ldr r0, =0x03004140 ldrb r0, [r0] bl rfu_REQ_disconnect @@ -12481,43 +12481,43 @@ sub_800EB44: @ 800EB44 movs r0, 0 movs r1, 0 bl sub_8011A64 -_0800EB78: +@0800EB78: ldr r0, =0x03005000 ldrh r2, [r0, 0x4] adds r6, r0, 0 cmp r2, 0x12 - bls _0800EB84 - b _0800ECF4 -_0800EB84: + bls @0800EB84 + b @0800ECF4 +@0800EB84: lsls r0, r2, 2 - ldr r1, =_0800EB9C + ldr r1, =@0800EB9C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0800EB9C: - .4byte _0800EBE8 - .4byte _0800ECF4 - .4byte _0800ECF4 - .4byte _0800ECF4 - .4byte _0800ECF4 - .4byte _0800ECF4 - .4byte _0800ECF4 - .4byte _0800ECF4 - .4byte _0800ECF4 - .4byte _0800ECF4 - .4byte _0800ECF4 - .4byte _0800ECF4 - .4byte _0800ECF4 - .4byte _0800EC38 - .4byte _0800EC98 - .4byte _0800ECF4 - .4byte _0800ECAC - .4byte _0800EC10 - .4byte _0800ECF4 -_0800EBE8: +@0800EB9C: + .4byte @0800EBE8 + .4byte @0800ECF4 + .4byte @0800ECF4 + .4byte @0800ECF4 + .4byte @0800ECF4 + .4byte @0800ECF4 + .4byte @0800ECF4 + .4byte @0800ECF4 + .4byte @0800ECF4 + .4byte @0800ECF4 + .4byte @0800ECF4 + .4byte @0800ECF4 + .4byte @0800ECF4 + .4byte @0800EC38 + .4byte @0800EC98 + .4byte @0800ECF4 + .4byte @0800ECAC + .4byte @0800EC10 + .4byte @0800ECF4 +@0800EBE8: ldr r0, =0x02022b2c bl sub_800BFCC ldr r0, =0x03005000 @@ -12529,10 +12529,10 @@ _0800EBE8: lsls r0, 3 adds r0, r1 strh r2, [r0, 0xA] - b _0800ECF4 + b @0800ECF4 .align 2, 0 .pool -_0800EC10: +@0800EC10: ldr r3, =0x082ed6e0 movs r0, 0x2 movs r1, 0 @@ -12543,10 +12543,10 @@ _0800EC10: ldr r1, =0x03005000 movs r0, 0x12 strh r0, [r1, 0x4] - b _0800ECF4 + b @0800ECF4 .align 2, 0 .pool -_0800EC38: +@0800EC38: ldr r1, =0x00000c3e adds r0, r6, r1 ldrb r1, [r0] @@ -12561,7 +12561,7 @@ _0800EC38: lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne _0800ECF4 + bne @0800ECF4 strb r0, [r6, 0xC] adds r0, r5, 0 bl remove_task @@ -12573,30 +12573,30 @@ _0800EC38: movs r2, 0x16 ldrsh r0, [r1, r2] cmp r0, 0 - beq _0800EC88 + beq @0800EC88 ldr r0, =sub_8010D0C + 1 movs r1, 0x1 bl AddTask - b _0800ECF4 + b @0800ECF4 .align 2, 0 .pool -_0800EC88: +@0800EC88: ldr r0, =sub_801084C + 1 movs r1, 0x5 bl AddTask - b _0800ECF4 + b @0800ECF4 .align 2, 0 .pool -_0800EC98: +@0800EC98: movs r0, 0 bl sub_800C27C ldr r1, =0x03005000 movs r0, 0xF strh r0, [r1, 0x4] - b _0800ECF4 + b @0800ECF4 .align 2, 0 .pool -_0800ECAC: +@0800ECAC: ldr r0, =0x00000cdb adds r1, r6, r0 ldrb r0, [r1] @@ -12627,7 +12627,7 @@ _0800ECAC: strb r4, [r0] adds r0, r5, 0 bl remove_task -_0800ECF4: +@0800ECF4: pop {r4-r6} pop {r0} bx r0 @@ -12636,7 +12636,7 @@ _0800ECF4: thumb_func_end sub_800EB44 thumb_func_start sub_800ED10 -sub_800ED10: @ 800ED10 +sub_800ED10: ; 800ED10 push {lr} ldr r3, =0x082ed6e0 movs r0, 0x1 @@ -12650,7 +12650,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 @@ -12659,18 +12659,18 @@ 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 movs r1, 0xD adds r0, 0x59 -_0800ED3E: +@0800ED3E: strb r2, [r0] subs r0, 0x1 subs r1, 0x1 cmp r1, 0 - bge _0800ED3E + bge @0800ED3E bl rfu_REQ_recvData bl rfu_waitREQComplete ldr r1, =0x03007870 @@ -12683,7 +12683,7 @@ _0800ED3E: ldr r0, [r0] ldrb r0, [r0, 0x12] cmp r0, 0 - beq _0800ED9A + beq @0800ED9A movs r2, 0xCD lsls r2, 4 adds r1, r3, r2 @@ -12706,7 +12706,7 @@ _0800ED3E: bl rfu_UNI_readySendData ldrb r0, [r4] bl rfu_UNI_clearRecvNewDataFlag -_0800ED9A: +@0800ED9A: movs r0, 0x1 bl rfu_REQ_sendData_wrapper pop {r4} @@ -12717,7 +12717,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 @@ -12730,53 +12730,53 @@ 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 ldrb r0, [r4, 0xC] cmp r0, 0x1 - bne _0800EDF0 + bne @0800EDF0 ldr r0, =sub_800E748 + 1 - b _0800EDF6 + b @0800EDF6 .align 2, 0 .pool -_0800EDF0: +@0800EDF0: cmp r0, 0 - bne _0800EE18 + bne @0800EE18 ldr r0, =sub_800E94C + 1 -_0800EDF6: +@0800EDF6: bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0800EE38 + bne @0800EE38 adds r0, r4, 0 adds r0, 0x67 ldrb r0, [r0] bl remove_task bl sub_800E604 - b _0800EE38 + b @0800EE38 .align 2, 0 .pool -_0800EE18: +@0800EE18: cmp r0, 0x2 - bne _0800EE38 + bne @0800EE38 ldr r0, =sub_800EB44 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0800EE38 + bne @0800EE38 adds r0, r4, 0 adds r0, 0x67 ldrb r0, [r0] bl remove_task bl sub_800E604 -_0800EE38: +@0800EE38: movs r5, 0 ldr r6, =0x082ed7e0 -_0800EE3C: +@0800EE3C: lsls r0, r5, 2 adds r0, r6 ldr r4, [r0] @@ -12785,18 +12785,18 @@ _0800EE3C: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0800EE5E + bne @0800EE5E adds r0, r4, 0 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task -_0800EE5E: +@0800EE5E: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x2 - bls _0800EE3C + bls @0800EE3C pop {r4-r6} pop {r0} bx r0 @@ -12805,7 +12805,7 @@ _0800EE5E: thumb_func_end sub_800EDD4 thumb_func_start sub_800EE78 -sub_800EE78: @ 800EE78 +sub_800EE78: ; 800EE78 push {lr} ldr r0, =sub_800E748 + 1 movs r1, 0x1 @@ -12820,35 +12820,35 @@ 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] cmp r0, 0x7 - bne _0800EEB4 + bne @0800EEB4 ldr r2, =0x00000ccd adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _0800EEB4 + beq @0800EEB4 movs r0, 0x1 - b _0800EEB6 + b @0800EEB6 .align 2, 0 .pool -_0800EEB4: +@0800EEB4: movs r0, 0 -_0800EEB6: +@0800EEB6: pop {r1} bx r1 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] cmp r0, 0x7 - bne _0800EEF8 + bne @0800EEF8 ldr r0, =0x03007890 ldr r1, [r0] ldr r2, =0x00000c3d @@ -12861,23 +12861,23 @@ sub_800EEBC: @ 800EEBC bl mega_func_4 lsls r0, 24 cmp r0, 0 - bne _0800EEF8 + bne @0800EEF8 movs r0, 0x9 strh r0, [r4, 0x4] movs r0, 0x1 - b _0800EEFA + b @0800EEFA .align 2, 0 .pool -_0800EEF8: +@0800EEF8: movs r0, 0 -_0800EEFA: +@0800EEFA: pop {r4} pop {r1} bx r1 thumb_func_end sub_800EEBC thumb_func_start sub_800EF00 -sub_800EF00: @ 800EF00 +sub_800EF00: ; 800EF00 push {lr} ldr r0, =sub_800E94C + 1 movs r1, 0x1 @@ -12892,25 +12892,25 @@ 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] cmp r0, 0 - bne _0800EF30 + bne @0800EF30 movs r0, 0 - b _0800EF32 + b @0800EF32 .align 2, 0 .pool -_0800EF30: +@0800EF30: movs r0, 0x1 -_0800EF32: +@0800EF32: pop {r1} bx r1 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] @@ -12925,31 +12925,31 @@ 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 ldrh r0, [r2, 0x4] cmp r0, 0x11 - beq _0800EF68 + beq @0800EF68 cmp r1, 0 - beq _0800EF74 -_0800EF68: + beq @0800EF74 +@0800EF68: movs r0, 0x12 strh r0, [r2, 0x4] movs r0, 0x1 - b _0800EF76 + b @0800EF76 .align 2, 0 .pool -_0800EF74: +@0800EF74: movs r0, 0 -_0800EF76: +@0800EF76: pop {r1} bx r1 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] @@ -12959,33 +12959,33 @@ 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 movs r2, 0 - b _0800EF9A -_0800EF92: + b @0800EF9A +@0800EF92: lsrs r1, 1 adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 -_0800EF9A: +@0800EF9A: cmp r2, 0x3 - bhi _0800EFAC + bhi @0800EFAC movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0800EF92 + beq @0800EF92 adds r0, r2, 0 bl rfu_UNI_readySendData -_0800EFAC: +@0800EFAC: pop {r0} bx r0 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 @@ -12994,7 +12994,7 @@ sub_800EFB0: @ 800EFB0 adds r6, r7, 0 ldr r1, =0x00000c87 adds r5, r0, r1 -_0800EFC0: +@0800EFC0: movs r3, 0 lsls r0, r2, 3 lsls r1, r2, 4 @@ -13003,7 +13003,7 @@ _0800EFC0: lsls r0, 1 adds r2, r0, r5 adds r1, r6 -_0800EFD0: +@0800EFD0: ldrh r0, [r1] lsrs r0, 8 strb r0, [r2, 0x1] @@ -13013,10 +13013,10 @@ _0800EFD0: adds r1, 0x2 adds r3, 0x1 cmp r3, 0x6 - ble _0800EFD0 + ble @0800EFD0 adds r2, r4, 0 cmp r2, 0x4 - ble _0800EFC0 + ble @0800EFC0 movs r0, 0 mov r1, sp strh r0, [r1] @@ -13033,28 +13033,28 @@ _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 movs r1, 0x6 -_0800F01C: +@0800F01C: ldrh r0, [r3] strh r0, [r2] adds r3, 0x2 adds r2, 0x2 subs r1, 0x1 cmp r1, 0 - bge _0800F01C + bge @0800F01C ldr r1, =0x03003110 movs r2, 0 adds r0, r1, 0 adds r0, 0xC -_0800F032: +@0800F032: strh r2, [r0] subs r0, 0x2 cmp r0, r1 - bge _0800F032 + bge @0800F032 pop {r0} bx r0 .align 2, 0 @@ -13062,14 +13062,14 @@ _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 adds r5, r4, r0 ldrb r0, [r5] cmp r0, 0 - beq _0800F07A + beq @0800F07A ldr r1, =0x00000c1c adds r0, r4, r1 adds r1, r4, 0 @@ -13082,19 +13082,19 @@ sub_800F048: @ 800F048 ldrb r0, [r0] adds r1, r0, 0 cmp r1, 0 - bne _0800F076 + bne @0800F076 ldrb r0, [r5] strb r1, [r5] -_0800F076: +@0800F076: cmp r2, 0 - bne _0800F09E -_0800F07A: + bne @0800F09E +@0800F07A: ldr r5, =0x03005000 ldr r1, =0x00000c3c adds r0, r5, r1 ldrb r0, [r0] cmp r0, 0 - bne _0800F09E + bne @0800F09E ldr r1, =0x000009e8 adds r0, r5, r1 adds r4, r5, 0 @@ -13105,7 +13105,7 @@ _0800F07A: adds r0, r5, r1 adds r1, r4, 0 bl sub_800DA68 -_0800F09E: +@0800F09E: pop {r4,r5} pop {r0} bx r0 @@ -13114,38 +13114,38 @@ _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] ldrb r0, [r0, 0x6] cmp r0, 0 - bne _0800F0CC -_0800F0C4: + bne @0800F0CC +@0800F0C4: movs r0, 0 - b _0800F0EC + b @0800F0EC .align 2, 0 .pool -_0800F0CC: +@0800F0CC: movs r3, 0 ldr r4, =0x03003090 -_0800F0D0: +@0800F0D0: movs r2, 0 lsls r0, r3, 4 adds r1, r0, r4 -_0800F0D6: +@0800F0D6: ldrh r0, [r1] cmp r0, 0 - bne _0800F0C4 + bne @0800F0C4 adds r1, 0x2 adds r2, 0x1 cmp r2, 0x6 - ble _0800F0D6 + ble @0800F0D6 adds r3, 0x1 cmp r3, 0x4 - ble _0800F0D0 + ble @0800F0D0 movs r0, 0x1 -_0800F0EC: +@0800F0EC: pop {r4} pop {r1} bx r1 @@ -13154,20 +13154,20 @@ _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] cmp r0, 0x13 - bhi _0800F118 + bhi @0800F118 bl rfu_REQ_recvData bl rfu_waitREQComplete movs r0, 0 bl rfu_REQ_sendData_wrapper - b _0800F1D2 + b @0800F1D2 .align 2, 0 .pool -_0800F118: +@0800F118: ldr r0, =0x00000cdb adds r1, r6, r0 ldrb r0, [r1] @@ -13181,27 +13181,27 @@ _0800F118: ldrb r0, [r0, 0x2] ands r0, r1 cmp r0, r1 - bne _0800F1D2 + bne @0800F1D2 cmp r0, 0 - beq _0800F1D2 + beq @0800F1D2 ldr r1, =0x00000cdc adds r0, r6, r1 ldrb r0, [r0] adds r5, r0, 0 cmp r5, 0 - bne _0800F1C8 + bne @0800F1C8 ldr r0, =0x00000ce3 adds r4, r6, r0 ldrb r0, [r4] cmp r0, 0 - beq _0800F1A8 + beq @0800F1A8 bl sub_8011D6C strb r5, [r4] ldr r1, =0x00000ce4 adds r0, r6, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _0800F18C + bne @0800F18C movs r4, 0x80 lsls r4, 8 movs r0, 0x2 @@ -13209,21 +13209,21 @@ _0800F118: bl sub_8011A64 adds r0, r4, 0 bl sub_8011170 - b _0800F1D2 + b @0800F1D2 .align 2, 0 .pool -_0800F18C: +@0800F18C: ldr r0, =0x03004140 ldrb r4, [r0] cmp r4, 0 - bne _0800F1A8 + bne @0800F1A8 bl sub_800EDD4 ldr r0, =0x03003124 strb r4, [r0] - b _0800F1D2 + b @0800F1D2 .align 2, 0 .pool -_0800F1A8: +@0800F1A8: bl sub_800EFB0 ldr r0, =0x03005000 ldr r1, =0x00000cda @@ -13232,16 +13232,16 @@ _0800F1A8: bl rfu_UNI_readySendData movs r0, 0x1 bl rfu_REQ_sendData_wrapper - b _0800F1CC + b @0800F1CC .align 2, 0 .pool -_0800F1C8: +@0800F1C8: bl rfu_REQ_PARENT_resumeRetransmitAndChange -_0800F1CC: +@0800F1CC: ldr r1, =0x03005000 movs r0, 0x1 strb r0, [r1, 0xE] -_0800F1D2: +@0800F1D2: movs r0, 0 pop {r4-r6} pop {r1} @@ -13251,7 +13251,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 @@ -13262,32 +13262,32 @@ sub_800F1E0: @ 800F1E0 ldrh r1, [r0, 0x4] adds r6, r0, 0 cmp r1, 0x13 - bhi _0800F1F8 - b _0800F45A -_0800F1F8: + bhi @0800F1F8 + b @0800F45A +@0800F1F8: ldrb r0, [r6, 0xE] cmp r0, 0x1 - beq _0800F200 - b _0800F45A -_0800F200: + beq @0800F200 + b @0800F45A +@0800F200: bl rfu_waitREQComplete ldr r0, =0x00000cdb adds r2, r6, r0 ldrb r0, [r2] cmp r0, 0 - bne _0800F220 + bne @0800F220 adds r1, r6, 0 adds r1, 0xEE -_0800F212: +@0800F212: ldrb r0, [r1] cmp r0, 0 - beq _0800F21A - b _0800F480 -_0800F21A: + beq @0800F21A + b @0800F480 +@0800F21A: ldrb r0, [r2] cmp r0, 0 - beq _0800F212 -_0800F220: + beq @0800F212 +@0800F220: bl rfu_REQ_recvData bl rfu_waitREQComplete ldr r2, =0x03004140 @@ -13298,9 +13298,9 @@ _0800F220: ldrb r0, [r0] ands r1, r0 cmp r1, r0 - beq _0800F23C - b _0800F444 -_0800F23C: + beq @0800F23C + b @0800F444 +@0800F23C: ldr r6, =0x00000cdc adds r1, r4, r6 ldrb r0, [r1] @@ -13312,7 +13312,7 @@ _0800F23C: strh r0, [r1, 0x6] ldrb r7, [r2] movs r5, 0 -_0800F252: +@0800F252: movs r0, 0x1 ands r0, r7 lsrs r1, r7, 1 @@ -13320,9 +13320,9 @@ _0800F252: adds r2, r5, 0x1 str r2, [sp] cmp r0, 0 - bne _0800F264 - b _0800F364 -_0800F264: + bne @0800F264 + b @0800F364 +@0800F264: ldr r1, =0x03005000 lsls r2, r5, 3 subs r0, r2, r5 @@ -13336,13 +13336,13 @@ _0800F264: lsls r1, r5, 24 mov r10, r1 cmp r0, 0 - beq _0800F35C + beq @0800F35C ldr r2, =0x00000cee adds r0, r6, r2 adds r1, r5, r0 ldrb r0, [r1] cmp r0, 0xFF - beq _0800F2E0 + beq @0800F2E0 adds r0, r6, 0 adds r0, 0x14 adds r0, r4, r0 @@ -13353,7 +13353,7 @@ _0800F264: movs r1, 0x7 ands r0, r1 cmp r2, r0 - beq _0800F2E0 + beq @0800F2E0 ldr r0, =0x00000cea adds r1, r6, r0 adds r1, r5, r1 @@ -13363,14 +13363,14 @@ _0800F264: lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bls _0800F35C + bls @0800F35C movs r0, 0x81 lsls r0, 8 bl sub_8011170 - b _0800F35C + b @0800F35C .align 2, 0 .pool -_0800F2E0: +@0800F2E0: ldr r2, =0x03005000 ldr r6, =0x00000cee adds r1, r2, r6 @@ -13411,7 +13411,7 @@ _0800F2E0: mov r8, r0 adds r2, r5, 0x1 mov r12, r2 -_0800F330: +@0800F330: lsls r1, r6, 1 mov r0, r8 adds r4, r1, r0 @@ -13433,12 +13433,12 @@ _0800F330: lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x6 - bls _0800F330 -_0800F35C: + bls @0800F330 +@0800F35C: mov r1, r10 lsrs r0, r1, 24 bl rfu_UNI_clearRecvNewDataFlag -_0800F364: +@0800F364: ldr r2, [sp, 0x4] lsls r0, r2, 16 lsrs r7, r0, 16 @@ -13446,9 +13446,9 @@ _0800F364: lsls r0, r6, 16 lsrs r5, r0, 16 cmp r5, 0x3 - bhi _0800F376 - b _0800F252 -_0800F376: + bhi @0800F376 + b @0800F252 +@0800F376: bl sub_800F014 movs r0, 0 bl sub_800F86C @@ -13458,12 +13458,12 @@ _0800F376: adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0 - beq _0800F452 + beq @0800F452 ldr r2, =0x00000cd9 adds r0, r4, r2 ldrb r2, [r0] cmp r2, 0 - bne _0800F452 + bne @0800F452 ldr r0, =0x02022b44 ldrb r1, [r0, 0xE] strb r2, [r0, 0xE] @@ -13475,7 +13475,7 @@ _0800F376: movs r5, 0 adds r7, r4, 0 adds r7, 0x14 -_0800F3B2: +@0800F3B2: ldr r0, =0x00000ce5 adds r6, r4, r0 ldrb r0, [r6] @@ -13483,7 +13483,7 @@ _0800F3B2: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0800F3D6 + beq @0800F3D6 lsls r1, r5, 24 lsrs r1, 24 lsls r2, r5, 3 @@ -13493,12 +13493,12 @@ _0800F3B2: movs r0, 0x10 movs r3, 0xE bl rfu_setRecvBuffer -_0800F3D6: +@0800F3D6: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x3 - bls _0800F3B2 + bls @0800F3B2 subs r4, r6, 0x3 ldrb r0, [r4] ldrb r2, [r6] @@ -13525,10 +13525,10 @@ _0800F3D6: ldr r0, =sub_8010AAC + 1 movs r1, 0 bl AddTask - b _0800F452 + b @0800F452 .align 2, 0 .pool -_0800F444: +@0800F444: ldr r2, =0x00000cdc adds r1, r4, r2 ldrb r0, [r1] @@ -13536,12 +13536,12 @@ _0800F444: movs r0, 0x1 strb r0, [r1] strb r2, [r4, 0xE] -_0800F452: +@0800F452: ldr r1, =0x03005000 movs r0, 0 strb r0, [r1, 0xE] adds r6, r1, 0 -_0800F45A: +@0800F45A: ldr r1, =0x00000cdc adds r0, r6, r1 ldrb r0, [r0] @@ -13550,18 +13550,18 @@ _0800F45A: ldr r0, [r0] ldrb r0, [r0, 0x6] cmp r0, 0 - beq _0800F484 + beq @0800F484 movs r0, 0x1 ands r0, r1 - b _0800F486 + b @0800F486 .align 2, 0 .pool -_0800F480: +@0800F480: movs r0, 0 - b _0800F486 -_0800F484: + b @0800F486 +@0800F484: movs r0, 0 -_0800F486: +@0800F486: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -13573,13 +13573,13 @@ _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 ldrh r1, [r4] cmp r1, 0 - beq _0800F4DC + beq @0800F4DC ldr r0, =0x03005000 movs r5, 0x81 lsls r5, 1 @@ -13595,7 +13595,7 @@ sub_800F498: @ 800F498 strb r0, [r3] adds r3, r4, 0 movs r4, 0x6 -_0800F4C2: +@0800F4C2: ldrh r1, [r3] lsrs r0, r1, 8 strb r0, [r2, 0x1] @@ -13604,27 +13604,27 @@ _0800F4C2: adds r3, 0x2 subs r4, 0x1 cmp r4, 0 - bge _0800F4C2 - b _0800F4EA + bge @0800F4C2 + b @0800F4EA .align 2, 0 .pool -_0800F4DC: +@0800F4DC: movs r1, 0 adds r0, r2, 0 adds r0, 0xD -_0800F4E2: +@0800F4E2: strb r1, [r0] subs r0, 0x1 cmp r0, r2 - bge _0800F4E2 -_0800F4EA: + bge @0800F4E2 +@0800F4EA: pop {r4,r5} pop {r0} bx r0 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} @@ -13635,7 +13635,7 @@ sub_800F4F0: @ 800F4F0 movs r1, 0 ldr r0, =0x03003090 mov r12, r0 -_0800F506: +@0800F506: movs r4, 0 lsls r0, r1, 3 adds r2, r1, 0x1 @@ -13643,7 +13643,7 @@ _0800F506: lsls r6, r1, 4 subs r0, r1 lsls r5, r0, 1 -_0800F514: +@0800F514: lsls r1, r4, 1 adds r3, r1, r6 add r3, r12 @@ -13661,24 +13661,24 @@ _0800F514: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x6 - bls _0800F514 + bls @0800F514 mov r1, r8 lsls r0, r1, 24 lsrs r1, r0, 24 cmp r1, 0x4 - bls _0800F506 + bls @0800F506 movs r0, 0 bl sub_800F86C ldr r0, =0x03004140 ldrb r0, [r0, 0x2] cmp r0, 0 - bne _0800F5C0 + bne @0800F5C0 ldr r0, =0x03005000 ldr r2, =0x00000ce4 adds r0, r2 ldrb r0, [r0] cmp r0, 0 - beq _0800F5C0 + beq @0800F5C0 ldr r0, =0x03007890 ldr r0, [r0] ldrb r1, [r0, 0x2] @@ -13690,16 +13690,16 @@ _0800F514: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0800F58C + beq @0800F58C cmp r0, 0x6 - beq _0800F58C + beq @0800F58C cmp r0, 0x9 - beq _0800F58C + beq @0800F58C movs r1, 0x90 lsls r1, 8 movs r0, 0x2 bl sub_8011A64 -_0800F58C: +@0800F58C: bl rfu_clearAllSlot ldr r1, =0x03003124 movs r0, 0 @@ -13711,7 +13711,7 @@ _0800F58C: adds r6, r0, r7 ldrb r0, [r6] cmp r0, 0x1 - bne _0800F5B8 + bne @0800F5B8 movs r4, 0x90 lsls r4, 8 movs r0, 0x2 @@ -13719,19 +13719,19 @@ _0800F58C: bl sub_8011A64 adds r0, r4, 0 bl sub_8011170 -_0800F5B8: +@0800F5B8: ldr r0, =0x03004140 strb r5, [r0, 0x5] strb r5, [r0, 0x4] strb r5, [r6] -_0800F5C0: +@0800F5C0: ldr r6, =0x03005000 movs r0, 0xCD lsls r0, 4 adds r2, r6, r0 ldrb r0, [r2] cmp r0, 0 - beq _0800F604 + beq @0800F604 ldrb r0, [r2] subs r0, 0x1 ldrb r1, [r2] @@ -13748,7 +13748,7 @@ _0800F5C0: bl sub_800D888 movs r1, 0 movs r2, 0 -_0800F5F4: +@0800F5F4: lsls r0, r1, 1 adds r0, r5 strh r2, [r0] @@ -13756,8 +13756,8 @@ _0800F5F4: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x6 - bls _0800F5F4 -_0800F604: + bls @0800F5F4 +@0800F604: bl sub_800F0B8 add sp, 0x58 pop {r3} @@ -13770,7 +13770,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 @@ -13784,17 +13784,17 @@ sub_800F638: @ 800F638 adds r2, 0x6E ldrh r3, [r2] cmp r5, r3 - bge _0800F6D4 + bge @0800F6D4 mov r9, r0 ldr r0, =0x03000d90 mov r8, r0 -_0800F65A: +@0800F65A: movs r0, 0x1 ands r0, r1 lsrs r7, r1, 1 adds r6, r5, 0x1 cmp r0, 0 - bne _0800F6C8 + bne @0800F6C8 ldr r1, =0xffff8900 adds r0, r1, 0 adds r1, r5, 0 @@ -13811,7 +13811,7 @@ _0800F65A: adds r2, r0, r1 mov r3, r8 adds r3, 0x2 -_0800F686: +@0800F686: ldrb r1, [r2, 0x1] lsls r1, 8 ldrb r0, [r2] @@ -13821,11 +13821,11 @@ _0800F686: adds r3, 0x2 adds r4, 0x1 cmp r4, 0x6 - ble _0800F686 + ble @0800F686 movs r4, 0 ldr r2, =0x03000d90 ldr r1, =0x03000d80 -_0800F6A0: +@0800F6A0: ldrh r0, [r2] lsrs r0, 8 strb r0, [r1, 0x1] @@ -13835,7 +13835,7 @@ _0800F6A0: adds r1, 0x2 adds r4, 0x1 cmp r4, 0x6 - ble _0800F6A0 + ble @0800F6A0 ldr r0, =0x030059e8 mov r1, r12 bl sub_800D888 @@ -13845,14 +13845,14 @@ _0800F6A0: ldr r0, [r2, 0x78] orrs r0, r1 str r0, [r2, 0x78] -_0800F6C8: +@0800F6C8: adds r1, r7, 0 adds r5, r6, 0 ldr r3, =0x0300506e ldrh r3, [r3] cmp r5, r3 - blt _0800F65A -_0800F6D4: + blt @0800F65A +@0800F6D4: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -13865,34 +13865,34 @@ _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 ldr r0, =0x03005000 ldrb r2, [r0, 0xC] cmp r2, 0x1 - bne _0800F71C + bne @0800F71C cmp r1, 0 - beq _0800F71C + beq @0800F71C adds r0, 0x61 adds r0, r1, r0 strb r2, [r0] - b _0800F724 + b @0800F724 .align 2, 0 .pool -_0800F71C: +@0800F71C: adds r0, 0x5C adds r0, r1, r0 movs r1, 0x1 strb r1, [r0] -_0800F724: +@0800F724: pop {r0} bx r0 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 @@ -13913,23 +13913,23 @@ 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 ldrb r1, [r0, 0xC] adds r5, r0, 0 cmp r1, 0x1 - bne _0800F764 + bne @0800F764 movs r0, 0 - b _0800F786 + b @0800F786 .align 2, 0 .pool -_0800F764: +@0800F764: movs r2, 0 ldr r0, =0x00000cde adds r4, r5, r0 -_0800F76A: +@0800F76A: adds r1, r2, r4 adds r0, r3, r2 ldrb r0, [r0] @@ -13938,13 +13938,13 @@ _0800F76A: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls _0800F76A + bls @0800F76A ldr r1, =0x00000c3e adds r0, r5, r1 ldrb r0, [r0] adds r0, r3 ldrb r0, [r0] -_0800F786: +@0800F786: pop {r4,r5} pop {r1} bx r1 @@ -13953,20 +13953,20 @@ _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] cmp r0, 0 - beq _0800F7C6 + beq @0800F7C6 ldr r3, =0x03005da8 ldrh r2, [r3] cmp r2, 0 - beq _0800F7C6 + beq @0800F7C6 ldr r0, =0x030022b4 ldrb r0, [r0] cmp r0, 0x1 - beq _0800F7C6 + beq @0800F7C6 ldr r1, =0x03000d78 ldrb r0, [r1] adds r0, 0x1 @@ -13978,7 +13978,7 @@ rfu_func_080F97B8: @ 800F794 movs r0, 0xBE lsls r0, 8 bl sub_800FD14 -_0800F7C6: +@0800F7C6: pop {r0} bx r0 .align 2, 0 @@ -13986,7 +13986,7 @@ _0800F7C6: thumb_func_end rfu_func_080F97B8 thumb_func_start sub_800F7DC -sub_800F7DC: @ 800F7DC +sub_800F7DC: ; 800F7DC ldr r0, =0x02022b14 bx lr .align 2, 0 @@ -13994,16 +13994,16 @@ sub_800F7DC: @ 800F7DC thumb_func_end sub_800F7DC thumb_func_start sub_800F7E4 -sub_800F7E4: @ 800F7E4 +sub_800F7E4: ; 800F7E4 push {lr} movs r2, 0 ldr r0, =0x03005000 ldr r1, [r0] ldr r0, =rfu_func_080F97B8 + 1 cmp r1, r0 - bne _0800F7F4 + bne @0800F7F4 movs r2, 0x1 -_0800F7F4: +@0800F7F4: adds r0, r2, 0 pop {r1} bx r1 @@ -14012,7 +14012,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 + 1 str r0, [r1] @@ -14022,7 +14022,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] @@ -14032,7 +14032,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 @@ -14040,11 +14040,11 @@ sub_800F820: @ 800F820 bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - bne _0800F83C + bne @0800F83C bl sub_8082D18 ldr r1, =0x03003110 strh r0, [r1, 0xC] -_0800F83C: +@0800F83C: ldr r1, =0x020223c0 ldr r0, [r1] adds r0, 0x1 @@ -14056,15 +14056,15 @@ _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] cmp r0, 0 - bne _0800F85E + bne @0800F85E ldr r0, =sub_800F820 + 1 str r0, [r1] -_0800F85E: +@0800F85E: pop {r0} bx r0 .align 2, 0 @@ -14072,7 +14072,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 @@ -14080,7 +14080,7 @@ sub_800F86C: @ 800F86C push {r5-r7} movs r0, 0 mov r8, r0 -_0800F87A: +@0800F87A: mov r1, r8 lsls r0, r1, 4 ldr r2, =0x03003090 @@ -14094,96 +14094,96 @@ _0800F87A: lsls r2, 8 adds r5, r0, 0 cmp r1, r2 - beq _0800F960 + beq @0800F960 cmp r1, r2 - bgt _0800F8D6 + bgt @0800F8D6 movs r0, 0xCC lsls r0, 7 cmp r1, r0 - bne _0800F8A4 - b _0800FAE0 -_0800F8A4: + bne @0800F8A4 + b @0800FAE0 +@0800F8A4: cmp r1, r0 - bgt _0800F8C4 + bgt @0800F8C4 movs r0, 0x88 lsls r0, 7 cmp r1, r0 - bne _0800F8B2 - b _0800FBF4 -_0800F8B2: + bne @0800F8B2 + b @0800FBF4 +@0800F8B2: movs r0, 0xBE lsls r0, 7 cmp r1, r0 - bne _0800F8BC - b _0800FAD0 -_0800F8BC: - b _0800FC04 + bne @0800F8BC + b @0800FAD0 +@0800F8BC: + b @0800FC04 .align 2, 0 .pool -_0800F8C4: +@0800F8C4: movs r0, 0xEE lsls r0, 7 cmp r1, r0 - beq _0800F920 + beq @0800F920 movs r0, 0xF0 lsls r0, 7 cmp r1, r0 - beq _0800F90E - b _0800FC04 -_0800F8D6: + beq @0800F90E + b @0800FC04 +@0800F8D6: movs r0, 0xBE lsls r0, 8 cmp r1, r0 - bne _0800F8E0 - b _0800FBF4 -_0800F8E0: + bne @0800F8E0 + b @0800FBF4 +@0800F8E0: cmp r1, r0 - bgt _0800F8F8 + bgt @0800F8F8 movs r0, 0x89 lsls r0, 8 cmp r1, r0 - beq _0800F9C8 + beq @0800F9C8 movs r0, 0xA1 lsls r0, 8 cmp r1, r0 - bne _0800F8F6 - b _0800FAAC -_0800F8F6: - b _0800FC04 -_0800F8F8: + bne @0800F8F6 + b @0800FAAC +@0800F8F6: + b @0800FC04 +@0800F8F8: movs r0, 0xED lsls r0, 8 cmp r1, r0 - bne _0800F902 - b _0800FB10 -_0800F902: + bne @0800F902 + b @0800FB10 +@0800F902: movs r0, 0xEE lsls r0, 8 cmp r1, r0 - bne _0800F90C - b _0800FBB0 -_0800F90C: - b _0800FC04 -_0800F90E: + bne @0800F90C + b @0800FBB0 +@0800F90C: + b @0800FC04 +@0800F90E: ldr r4, =0x03005000 ldrb r0, [r4, 0xC] cmp r0, 0 - bne _0800F920 + bne @0800F920 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _0800F920 - b _0800FC50 -_0800F920: + beq @0800F920 + b @0800FC50 +@0800F920: ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0] mov r6, r8 adds r6, 0x1 cmp r0, 0 - beq _0800F930 - b _0800FC08 -_0800F930: + beq @0800F930 + b @0800FC08 +@0800F930: ldr r1, =0x03003092 adds r0, r5, r1 ldrh r0, [r0] @@ -14194,10 +14194,10 @@ _0800F930: bl sub_800F74C ldr r4, =0x03005cce strb r0, [r4] - b _0800FC08 + b @0800FC08 .align 2, 0 .pool -_0800F960: +@0800F960: ldr r0, =0x03005000 mov r9, r0 mov r1, r8 @@ -14213,9 +14213,9 @@ _0800F960: mov r6, r8 adds r6, 0x1 cmp r4, 0 - beq _0800F982 - b _0800FC08 -_0800F982: + beq @0800F982 + b @0800FC08 +@0800F982: adds r0, r3, 0 adds r0, 0x80 movs r2, 0 @@ -14243,10 +14243,10 @@ _0800F982: adds r0, 0x5C add r0, r8 strb r2, [r0] - b _0800FC08 + b @0800FC08 .align 2, 0 .pool -_0800F9C8: +@0800F9C8: ldr r4, =0x03005000 mov r9, r4 mov r0, r8 @@ -14262,9 +14262,9 @@ _0800F9C8: mov r6, r8 adds r6, 0x1 cmp r3, 0x1 - beq _0800F9EA - b _0800FC08 -_0800F9EA: + beq @0800F9EA + b @0800FC08 +@0800F9EA: movs r0, 0xFF ands r0, r7 adds r2, 0x80 @@ -14283,7 +14283,7 @@ _0800F9EA: mov r1, r8 lsls r7, r1, 8 adds r3, r5, 0 -_0800FA0E: +@0800FA0E: mov r2, r12 ldrh r0, [r2] lsls r1, r0, 1 @@ -14303,7 +14303,7 @@ _0800FA0E: lsls r2, 16 lsrs r4, r2, 16 cmp r4, 0x5 - bls _0800FA0E + bls @0800FA0E ldr r4, =0x03005000 mov r0, r10 add r0, r8 @@ -14321,9 +14321,9 @@ _0800FA0E: ldr r1, [r1] ldr r0, [r0] cmp r1, r0 - beq _0800FA5C - b _0800FC08 -_0800FA5C: + beq @0800FA5C + b @0800FC08 +@0800FA5C: adds r1, r2, 0 adds r1, 0x92 movs r0, 0x2 @@ -14337,26 +14337,26 @@ _0800FA5C: movs r0, 0x7F ands r0, r1 cmp r0, 0x45 - beq _0800FA7E - b _0800FC08 -_0800FA7E: + beq @0800FA7E + b @0800FC08 +@0800FA7E: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _0800FA88 - b _0800FC08 -_0800FA88: + bne @0800FA88 + b @0800FC08 +@0800FA88: ldrb r0, [r4, 0xC] cmp r0, 0 - beq _0800FA90 - b _0800FC08 -_0800FA90: + beq @0800FA90 + b @0800FC08 +@0800FA90: ldr r0, =0x020223c4 bl sub_8010A70 - b _0800FC08 + b @0800FC08 .align 2, 0 .pool -_0800FAAC: +@0800FAAC: ldr r2, =0x082ed6b8 ldr r3, =0x03003092 adds r0, r5, r3 @@ -14368,18 +14368,18 @@ _0800FAAC: adds r1, r2 ldrh r1, [r1] bl sub_800FE84 - b _0800FC04 + b @0800FC04 .align 2, 0 .pool -_0800FAD0: +@0800FAD0: ldr r1, =0x030050e4 add r1, r8 movs r0, 0x1 strb r0, [r1] - b _0800FC04 + b @0800FC04 .align 2, 0 .pool -_0800FAE0: +@0800FAE0: ldr r2, =0x03005000 movs r4, 0x80 lsls r4, 1 @@ -14391,28 +14391,28 @@ _0800FAE0: adds r6, 0x1 ldrh r1, [r1] cmp r0, r1 - beq _0800FAFA - b _0800FC08 -_0800FAFA: + beq @0800FAFA + b @0800FC08 +@0800FAFA: adds r0, r2, 0 adds r0, 0xE9 add r0, r8 movs r1, 0x1 strb r1, [r0] - b _0800FC08 + b @0800FC08 .align 2, 0 .pool -_0800FB10: +@0800FB10: ldr r7, =0x03005000 ldrb r2, [r7, 0xC] cmp r2, 0 - bne _0800FB78 + bne @0800FB78 ldr r3, =0x03003124 ldrb r0, [r3] mov r6, r8 adds r6, 0x1 cmp r0, 0 - beq _0800FC08 + beq @0800FC08 ldr r0, =0x03003092 adds r4, r5, r0 ldrh r1, [r4] @@ -14421,7 +14421,7 @@ _0800FB10: ldrb r0, [r0, 0x2] ands r1, r0 cmp r1, 0 - beq _0800FB48 + beq @0800FB48 strb r2, [r3] bl sub_800D630 ldr r1, =0x03003094 @@ -14430,7 +14430,7 @@ _0800FB10: ldr r2, =0x00000ce4 adds r0, r7, r2 strb r1, [r0] -_0800FB48: +@0800FB48: ldr r0, =0x03003090 adds r0, 0x6 adds r0, r5, r0 @@ -14438,10 +14438,10 @@ _0800FB48: strb r0, [r7, 0xD] ldrh r0, [r4] bl sub_80109E8 - b _0800FC08 + b @0800FC08 .align 2, 0 .pool -_0800FB78: +@0800FB78: movs r0, 0xEE lsls r0, 8 bl sub_800FD14 @@ -14459,16 +14459,16 @@ _0800FB78: adds r0, r5, r0 ldrh r0, [r0] strh r0, [r1, 0x6] - b _0800FC04 + b @0800FC04 .align 2, 0 .pool -_0800FBB0: +@0800FBB0: ldr r4, =0x03005000 ldrb r0, [r4, 0xC] mov r6, r8 adds r6, 0x1 cmp r0, 0x1 - bne _0800FC44 + bne @0800FC44 ldr r0, =0x00000ce3 adds r2, r4, r0 ldr r1, =0x03003092 @@ -14485,10 +14485,10 @@ _0800FBB0: strb r1, [r0] ldrh r0, [r3] bl sub_80109E8 - b _0800FC08 + b @0800FC08 .align 2, 0 .pool -_0800FBF4: +@0800FBF4: ldr r0, =0x03003020 mov r3, r8 lsls r1, r3, 1 @@ -14497,14 +14497,14 @@ _0800FBF4: adds r0, r5, r4 ldrh r0, [r0] strh r0, [r1] -_0800FC04: +@0800FC04: mov r6, r8 adds r6, 0x1 -_0800FC08: +@0800FC08: ldr r3, =0x03005000 ldrb r4, [r3, 0xC] cmp r4, 0x1 - bne _0800FC44 + bne @0800FC44 adds r0, r3, 0 adds r0, 0x61 mov r1, r8 @@ -14512,29 +14512,29 @@ _0800FC08: ldrb r0, [r2] adds r1, r0, 0 cmp r1, 0 - beq _0800FC44 + beq @0800FC44 cmp r1, 0x4 - bne _0800FC40 + bne @0800FC40 adds r0, r3, 0 adds r0, 0x5C add r0, r8 movs r1, 0 strb r4, [r0] strb r1, [r2] - b _0800FC44 + b @0800FC44 .align 2, 0 .pool -_0800FC40: +@0800FC40: adds r0, 0x1 strb r0, [r2] -_0800FC44: +@0800FC44: lsls r0, r6, 16 lsrs r0, 16 mov r8, r0 cmp r0, 0x4 - bhi _0800FC50 - b _0800F87A -_0800FC50: + bhi @0800FC50 + b @0800F87A +@0800FC50: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -14545,71 +14545,71 @@ _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 adds r1, r0, 0 adds r1, 0x92 -_0800FC6A: +@0800FC6A: ldrb r0, [r1] cmp r0, 0 - beq _0800FC78 + beq @0800FC78 movs r0, 0 - b _0800FC82 + b @0800FC82 .align 2, 0 .pool -_0800FC78: +@0800FC78: adds r1, 0x14 adds r2, 0x1 cmp r2, 0x4 - ble _0800FC6A + ble @0800FC6A movs r0, 0x1 -_0800FC82: +@0800FC82: pop {r1} bx r1 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 ldrb r0, [r2, 0xD] cmp r1, r0 - bge _0800FCBC + bge @0800FCBC adds r4, r0, 0 adds r3, r2, 0 adds r3, 0x92 adds r2, 0x5C -_0800FC9C: +@0800FC9C: ldrb r0, [r3] cmp r0, 0x2 - bne _0800FCAA + bne @0800FCAA adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x1 - beq _0800FCB4 -_0800FCAA: + beq @0800FCB4 +@0800FCAA: movs r0, 0 - b _0800FCBE + b @0800FCBE .align 2, 0 .pool -_0800FCB4: +@0800FCB4: adds r3, 0x14 adds r1, 0x1 cmp r1, r4 - blt _0800FC9C -_0800FCBC: + blt @0800FC9C +@0800FCBC: movs r0, 0x1 -_0800FCBE: +@0800FCBE: pop {r4} pop {r1} bx r1 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] @@ -14623,7 +14623,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 @@ -14632,23 +14632,23 @@ sub_800FCD8: @ 800FCD8 adds r3, 0x92 adds r4, r0, 0 adds r4, 0x5C -_0800FCE8: +@0800FCE8: ldrb r0, [r3] cmp r0, 0x2 - bne _0800FCFE + bne @0800FCFE adds r0, r1, r4 ldrb r0, [r0] cmp r0, 0x1 - bne _0800FCFE + bne @0800FCFE lsls r0, r1 orrs r2, r0 lsls r0, r2, 24 lsrs r2, r0, 24 -_0800FCFE: +@0800FCFE: adds r3, 0x14 adds r1, 0x1 cmp r1, 0x4 - ble _0800FCE8 + ble @0800FCE8 adds r0, r2, 0 pop {r4} pop {r1} @@ -14658,7 +14658,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 @@ -14668,53 +14668,53 @@ sub_800FD14: @ 800FD14 lsls r0, 7 adds r4, r5, 0 cmp r1, r0 - beq _0800FDB0 + beq @0800FDB0 cmp r1, r0 - bgt _0800FD62 + bgt @0800FD62 movs r0, 0xBE lsls r0, 7 cmp r1, r0 - beq _0800FE00 + beq @0800FE00 cmp r1, r0 - bgt _0800FD50 + bgt @0800FD50 movs r0, 0xBC lsls r0, 6 cmp r1, r0 - beq _0800FE20 + beq @0800FE20 movs r0, 0x88 lsls r0, 7 cmp r1, r0 - beq _0800FE14 - b _0800FE46 + beq @0800FE14 + b @0800FE46 .align 2, 0 .pool -_0800FD50: +@0800FD50: movs r0, 0xCC lsls r0, 7 cmp r1, r0 - beq _0800FE00 + beq @0800FE00 movs r0, 0xEE lsls r0, 7 cmp r1, r0 - beq _0800FDB0 - b _0800FE46 -_0800FD62: + beq @0800FDB0 + b @0800FE46 +@0800FD62: movs r0, 0xBE lsls r0, 8 cmp r1, r0 - beq _0800FE40 + beq @0800FE40 cmp r1, r0 - bgt _0800FE46 + bgt @0800FE46 movs r0, 0x88 lsls r0, 8 cmp r1, r0 - beq _0800FD80 + beq @0800FD80 movs r0, 0xA1 lsls r0, 8 cmp r1, r0 - beq _0800FD98 - b _0800FE46 -_0800FD80: + beq @0800FD98 + b @0800FE46 +@0800FD80: ldr r0, =0x03005000 adds r1, r0, 0 adds r1, 0x6E @@ -14724,21 +14724,21 @@ _0800FD80: ldrb r0, [r0] adds r0, 0x80 strh r0, [r5, 0x4] - b _0800FE46 + b @0800FE46 .align 2, 0 .pool -_0800FD98: +@0800FD98: bl sub_800FC60 lsls r0, 24 cmp r0, 0 - beq _0800FE46 + beq @0800FE46 ldr r0, =0x03005000 adds r0, 0x5A ldrb r0, [r0] - b _0800FE44 + b @0800FE44 .align 2, 0 .pool -_0800FDB0: +@0800FDB0: ldr r3, =0x03005000 ldr r1, =0x00000ce2 adds r0, r3, r1 @@ -14758,7 +14758,7 @@ _0800FDB0: movs r4, 0 ldr r0, =0x00000cde adds r3, r0 -_0800FDD6: +@0800FDD6: adds r1, r2, r4 adds r0, r4, r3 ldrb r0, [r0] @@ -14767,31 +14767,31 @@ _0800FDD6: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _0800FDD6 - b _0800FE46 + bls @0800FDD6 + b @0800FE46 .align 2, 0 .pool -_0800FE00: +@0800FE00: ldr r0, =0x03005000 movs r1, 0x80 lsls r1, 1 adds r0, r1 ldrh r0, [r0] strh r0, [r4, 0x2] - b _0800FE46 + b @0800FE46 .align 2, 0 .pool -_0800FE14: +@0800FE14: strh r1, [r5] ldr r0, =0x030022c0 ldrh r0, [r0, 0x2C] - b _0800FE44 + b @0800FE44 .align 2, 0 .pool -_0800FE20: +@0800FE20: movs r4, 0 ldr r3, =0x030050f2 -_0800FE24: +@0800FE24: adds r2, r4, 0x1 lsls r1, r2, 1 adds r1, r5 @@ -14802,16 +14802,16 @@ _0800FE24: lsls r2, 24 lsrs r4, r2, 24 cmp r4, 0x5 - bls _0800FE24 - b _0800FE46 + bls @0800FE24 + b @0800FE46 .align 2, 0 .pool -_0800FE40: +@0800FE40: ldr r0, =0x03005da8 ldrh r0, [r0] -_0800FE44: +@0800FE44: strh r0, [r5, 0x2] -_0800FE46: +@0800FE46: pop {r4,r5} pop {r0} bx r0 @@ -14820,16 +14820,16 @@ _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 ldrh r0, [r0] cmp r0, 0 - bne _0800FE76 + bne @0800FE76 bl sub_8011A80 cmp r0, 0 - bne _0800FE76 + bne @0800FE76 ldr r0, =0x030050f2 adds r1, r4, 0 movs r2, 0xC @@ -14837,7 +14837,7 @@ sub_800FE50: @ 800FE50 movs r0, 0xBC lsls r0, 6 bl sub_800FD14 -_0800FE76: +@0800FE76: pop {r4} pop {r0} bx r0 @@ -14846,7 +14846,7 @@ _0800FE76: thumb_func_end sub_800FE50 thumb_func_start sub_800FE84 -sub_800FE84: @ 800FE84 +sub_800FE84: ; 800FE84 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -14856,29 +14856,29 @@ sub_800FE84: @ 800FE84 ldr r5, =0x03005000 ldr r0, [r5] cmp r0, 0 - bne _0800FEB8 + bne @0800FEB8 ldr r0, =0x03003110 ldrh r0, [r0] cmp r0, 0 - bne _0800FEB8 + bne @0800FEB8 movs r0, 0x7C adds r0, r5 mov r9, r0 ldrb r1, [r0] mov r8, r1 cmp r1, 0 - beq _0800FEC8 + beq @0800FEC8 ldr r1, =0x02022b44 adds r1, 0x83 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_0800FEB8: +@0800FEB8: movs r0, 0 - b _0800FF32 + b @0800FF32 .align 2, 0 .pool -_0800FEC8: +@0800FEC8: adds r0, r6, 0 movs r1, 0xC bl __umodsi3 @@ -14906,20 +14906,20 @@ _0800FEC8: movs r0, 0x80 lsls r0, 1 cmp r6, r0 - bls _0800FF0A + bls @0800FF0A str r7, [r5, 0x70] - b _0800FF1C -_0800FF0A: + b @0800FF1C +@0800FF0A: ldr r4, =0x020228c4 cmp r7, r4 - beq _0800FF1A + beq @0800FF1A adds r0, r4, 0 adds r1, r7, 0 adds r2, r6, 0 bl memcpy -_0800FF1A: +@0800FF1A: str r4, [r5, 0x70] -_0800FF1C: +@0800FF1C: movs r0, 0x88 lsls r0, 8 bl sub_800FD14 @@ -14930,7 +14930,7 @@ _0800FF1C: movs r1, 0 strb r1, [r0] movs r0, 0x1 -_0800FF32: +@0800FF32: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -14942,12 +14942,12 @@ _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] cmp r0, 0 - bne _0800FFA0 + bne @0800FFA0 movs r5, 0x88 lsls r5, 8 adds r0, r5, 0 @@ -14955,7 +14955,7 @@ rfufunc_80F9F44: @ 800FF4C ldr r4, =0x03005000 ldrb r0, [r4, 0xC] cmp r0, 0x1 - bne _0800FF84 + bne @0800FF84 adds r1, r4, 0 adds r1, 0x5B ldrb r0, [r1] @@ -14964,11 +14964,11 @@ rfufunc_80F9F44: @ 800FF4C lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bls _0800FFA0 - b _0800FF9C + bls @0800FFA0 + b @0800FF9C .align 2, 0 .pool -_0800FF84: +@0800FF84: bl link_get_multiplayer_id ldr r1, =0x03003090 lsls r0, 24 @@ -14979,11 +14979,11 @@ _0800FF84: lsls r0, 8 ands r0, r1 cmp r0, r5 - bne _0800FFA0 -_0800FF9C: + bne @0800FFA0 +@0800FF9C: ldr r0, =sub_800FFB0 + 1 str r0, [r4] -_0800FFA0: +@0800FFA0: pop {r4,r5} pop {r0} bx r0 @@ -14992,7 +14992,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 @@ -15009,7 +15009,7 @@ sub_800FFB0: @ 800FFB0 movs r4, 0 adds r6, r2, 0 adds r3, 0x2 -_0800FFD0: +@0800FFD0: lsls r2, r4, 1 ldrh r1, [r6] lsls r0, r1, 1 @@ -15025,7 +15025,7 @@ _0800FFD0: adds r3, 0x2 adds r4, 0x1 cmp r4, 0x6 - ble _0800FFD0 + ble @0800FFD0 mov r0, r12 adds r0, 0x6C ldrh r1, [r0] @@ -15036,7 +15036,7 @@ _0800FFD0: lsls r1, 16 lsrs r1, 16 cmp r0, r1 - bhi _08010014 + bhi @08010014 mov r0, r12 adds r0, 0x7C movs r1, 0 @@ -15044,7 +15044,7 @@ _0800FFD0: ldr r0, =rfufunc_80FA020 + 1 mov r1, r12 str r0, [r1] -_08010014: +@08010014: pop {r4-r6} pop {r0} bx r0 @@ -15053,7 +15053,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 @@ -15066,7 +15066,7 @@ rfufunc_80FA020: @ 8010028 lsrs r6, r0, 24 ldrb r0, [r5, 0xC] cmp r0, 0 - bne _080100F0 + bne @080100F0 ldr r3, =0x03003110 adds r2, r5, 0 adds r2, 0x6E @@ -15083,7 +15083,7 @@ rfufunc_80FA020: @ 8010028 lsls r5, r6, 4 adds r7, r2, 0 adds r3, 0x2 -_08010064: +@08010064: lsls r2, r4, 1 ldrh r1, [r7] lsls r0, r1, 1 @@ -15102,7 +15102,7 @@ _08010064: adds r3, 0x2 adds r4, 0x1 cmp r4, 0x6 - ble _08010064 + ble @08010064 mov r1, r12 adds r0, r5, r1 ldrb r1, [r0] @@ -15112,7 +15112,7 @@ _08010064: ldrh r0, [r0] subs r0, 0x1 cmp r1, r0 - bne _080100F4 + bne @080100F4 lsls r0, r6, 2 adds r0, r6 lsls r0, 2 @@ -15128,7 +15128,7 @@ _08010064: ldr r1, [r1] ldr r0, [r0] cmp r1, r0 - beq _080100E8 + beq @080100E8 adds r0, r6, 0 bl sub_800F638 ldr r1, =0x02022b44 @@ -15136,18 +15136,18 @@ _08010064: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _080100F4 + b @080100F4 .align 2, 0 .pool -_080100E8: +@080100E8: movs r0, 0 mov r4, r9 str r0, [r4] - b _080100F4 -_080100F0: + b @080100F4 +@080100F0: movs r0, 0 str r0, [r5] -_080100F4: +@080100F4: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -15157,7 +15157,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 @@ -15173,7 +15173,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 @@ -15194,7 +15194,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] @@ -15211,24 +15211,24 @@ 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] cmp r0, 0 - bne _08010188 + bne @08010188 bl sub_800D630 ldr r0, =0x00000ce4 adds r1, r4, r0 movs r0, 0x2 strb r0, [r1] - b _0801018C + b @0801018C .align 2, 0 .pool -_08010188: +@08010188: ldr r0, =sub_8010148 + 1 str r0, [r4] -_0801018C: +@0801018C: pop {r4} pop {r0} bx r0 @@ -15237,7 +15237,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 @@ -15260,7 +15260,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] @@ -15269,18 +15269,18 @@ sub_80101CC: @ 80101CC adds r3, r0, 0 adds r4, r3, 0 adds r4, 0xE4 -_080101DC: +@080101DC: adds r0, r1, r4 ldrb r0, [r0] cmp r0, 0 - beq _080101E6 + beq @080101E6 adds r2, 0x1 -_080101E6: +@080101E6: adds r1, 0x1 cmp r1, 0x4 - ble _080101DC + ble @080101DC cmp r2, r5 - bne _08010220 + bne @08010220 ldr r2, =0x02022fec ldr r0, [r2] movs r1, 0x21 @@ -15289,20 +15289,20 @@ _080101E6: str r0, [r2] ldrb r0, [r3, 0xC] cmp r0, 0 - bne _0801021C + bne @0801021C adds r0, r3, 0 adds r0, 0xEE ldrb r1, [r0] movs r1, 0x3 strb r1, [r0] bl sub_8010168 - b _08010220 + b @08010220 .align 2, 0 .pool -_0801021C: +@0801021C: ldr r0, =sub_8010168 + 1 str r0, [r3] -_08010220: +@08010220: pop {r4,r5} pop {r0} bx r0 @@ -15311,24 +15311,24 @@ _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] cmp r0, 0 - bne _0801024E + bne @0801024E ldr r4, =0x03005000 ldr r1, =0x00000ce8 adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0 - bne _0801024E + bne @0801024E movs r0, 0xBE lsls r0, 7 bl sub_800FD14 ldr r0, =sub_80101CC + 1 str r0, [r4] -_0801024E: +@0801024E: pop {r4} pop {r0} bx r0 @@ -15337,14 +15337,14 @@ _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 ldr r2, =0x03005000 ldr r0, [r2] cmp r0, 0 - bne _08010284 + bne @08010284 ldr r1, =0x00000cd9 adds r0, r2, r1 movs r1, 0x1 @@ -15353,7 +15353,7 @@ sub_8010264: @ 8010264 str r0, [r2] adds r0, r3, 0 bl remove_task -_08010284: +@08010284: pop {r0} bx r0 .align 2, 0 @@ -15361,18 +15361,18 @@ _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 + 1 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _080102AC + bne @080102AC adds r0, r4, 0 movs r1, 0x5 bl AddTask -_080102AC: +@080102AC: pop {r4} pop {r0} bx r0 @@ -15381,67 +15381,67 @@ _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 cmp r0, 0 - beq _080102E6 + beq @080102E6 ldr r1, =0x03005000 ldr r2, =0x000009e6 adds r0, r1, r2 ldrb r0, [r0] adds r4, r0, 0 cmp r4, 0 - bne _080102E6 + bne @080102E6 adds r5, r1, 0 adds r5, 0xFE ldrh r0, [r5] cmp r0, 0x3C - bls _080102E6 + bls @080102E6 movs r0, 0xCC lsls r0, 7 bl sub_800FD14 strh r4, [r5] -_080102E6: +@080102E6: bl sub_8009FCC lsls r0, 24 lsrs r2, r0, 24 movs r1, 0 cmp r1, r2 - bcs _08010312 + bcs @08010312 ldr r0, =0x03005000 adds r3, r0, 0 adds r3, 0xE9 ldrb r0, [r3] cmp r0, 0 - beq _08010312 -_08010300: + beq @08010312 +@08010300: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, r2 - bcs _08010312 + bcs @08010312 adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 - bne _08010300 -_08010312: + bne @08010300 +@08010312: ldr r4, =0x03005000 cmp r1, r2 - bne _0801033E + bne @0801033E movs r1, 0 adds r3, r4, 0 adds r3, 0xE9 movs r2, 0 -_08010320: +@08010320: adds r0, r1, r3 strb r2, [r0] adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x4 - bls _08010320 + bls @08010320 movs r1, 0x80 lsls r1, 1 adds r0, r4, r1 @@ -15450,7 +15450,7 @@ _08010320: movs r2, 0 strh r1, [r0] str r2, [r4] -_0801033E: +@0801033E: adds r1, r4, 0 adds r1, 0xFE ldrh r0, [r1] @@ -15464,24 +15464,24 @@ _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 adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0 - bne _0801037A + bne @0801037A ldr r0, =0x03003110 ldrh r0, [r0] cmp r0, 0 - bne _0801037A + bne @0801037A movs r0, 0xCC lsls r0, 7 bl sub_800FD14 ldr r0, =sub_80102B8 + 1 str r0, [r4] -_0801037A: +@0801037A: pop {r4} pop {r0} bx r0 @@ -15490,73 +15490,73 @@ _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 cmp r0, 0 - beq _080103CC + beq @080103CC ldr r4, =0x03005000 ldr r1, =0x000009e6 adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0 - bne _0801041E + bne @0801041E ldr r0, =0x03003110 ldrh r0, [r0] cmp r0, 0 - bne _0801041E + bne @0801041E movs r0, 0xCC lsls r0, 7 bl sub_800FD14 ldr r0, =sub_80102B8 + 1 - b _0801041C + b @0801041C .align 2, 0 .pool -_080103CC: +@080103CC: bl sub_8009FCC lsls r0, 24 lsrs r2, r0, 24 movs r1, 0x1 cmp r1, r2 - bcs _080103FA + bcs @080103FA ldr r3, =0x03005000 adds r0, r3, 0 adds r0, 0xEA ldrb r0, [r0] cmp r0, 0 - beq _080103FA + beq @080103FA adds r3, 0xE9 -_080103E8: +@080103E8: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, r2 - bcs _080103FA + bcs @080103FA adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 - bne _080103E8 -_080103FA: + bne @080103E8 +@080103FA: cmp r1, r2 - bne _0801041E + bne @0801041E ldr r4, =0x03005000 ldr r1, =0x000009e6 adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0 - bne _0801041E + bne @0801041E ldr r0, =0x03003110 ldrh r0, [r0] cmp r0, 0 - bne _0801041E + bne @0801041E movs r0, 0xCC lsls r0, 7 bl sub_800FD14 ldr r0, =sub_8010358 + 1 -_0801041C: +@0801041C: str r0, [r4] -_0801041E: +@0801041E: pop {r4} pop {r0} bx r0 @@ -15565,18 +15565,18 @@ _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] cmp r2, 0 - bne _08010448 + bne @08010448 ldr r0, =sub_8010390 + 1 str r0, [r1] adds r0, r1, 0 adds r0, 0xFE strh r2, [r0] -_08010448: +@08010448: pop {r0} bx r0 .align 2, 0 @@ -15584,61 +15584,61 @@ _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, =0x082ed6e0 ldrh r0, [r1] cmp r0, r3 - beq _08010482 + beq @08010482 ldr r4, =0x0000ffff adds r2, r1, 0 -_08010464: +@08010464: ldrh r0, [r2] cmp r0, r4 - bne _08010478 + bne @08010478 movs r0, 0 - b _08010484 + b @08010484 .align 2, 0 .pool -_08010478: +@08010478: adds r1, 0x2 adds r2, 0x2 ldrh r0, [r1] cmp r0, r3 - bne _08010464 -_08010482: + bne @08010464 +@08010482: movs r0, 0x1 -_08010484: +@08010484: pop {r4} pop {r1} bx r1 thumb_func_end sub_8010454 thumb_func_start sub_801048C -sub_801048C: @ 801048C +sub_801048C: ; 801048C push {lr} cmp r0, 0 - beq _080104A0 + beq @080104A0 movs r1, 0x96 lsls r1, 2 movs r0, 0x1 bl sub_800D550 movs r0, 0 - b _080104AC -_080104A0: + b @080104AC +@080104A0: movs r0, 0 movs r1, 0 bl sub_800D550 lsls r0, 24 lsrs r0, 24 -_080104AC: +@080104AC: pop {r1} bx r1 thumb_func_end sub_801048C thumb_func_start sub_80104B0 -sub_80104B0: @ 80104B0 +sub_80104B0: ; 80104B0 push {lr} ldr r0, =0x03005000 ldr r1, =0x00000cd9 @@ -15654,27 +15654,27 @@ 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] cmp r0, 0x1 - beq _080104EC + beq @080104EC ldr r2, =0x00000cce adds r0, r1, r2 ldrb r0, [r0] - b _080104EE + b @080104EE .align 2, 0 .pool -_080104EC: +@080104EC: movs r0, 0 -_080104EE: +@080104EE: pop {r1} bx r1 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 @@ -15683,40 +15683,40 @@ 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 adds r0, 0xF1 ldrb r0, [r0] cmp r0, 0x2 - bne _08010518 + bne @08010518 movs r0, 0 - b _08010524 + b @08010524 .align 2, 0 .pool -_08010518: +@08010518: movs r1, 0 ldr r0, [r2] cmp r0, 0 - bne _08010522 + bne @08010522 movs r1, 0x1 -_08010522: +@08010522: adds r0, r1, 0 -_08010524: +@08010524: pop {r1} bx r1 thumb_func_end sub_8010500 thumb_func_start sub_8010528 -sub_8010528: @ 8010528 +sub_8010528: ; 8010528 push {lr} ldr r0, =0x03005000 ldr r0, [r0] cmp r0, 0 - beq _08010536 + beq @08010536 bl _call_via_r0 -_08010536: +@08010536: pop {r0} bx r0 .align 2, 0 @@ -15724,7 +15724,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} @@ -15734,7 +15734,7 @@ sub_8010540: @ 8010540 ldr r0, =0x00000c3e adds r0, r6 mov r8, r0 -_08010552: +@08010552: ldr r1, =0x00000cd1 adds r0, r6, r1 adds r4, r5, r0 @@ -15743,23 +15743,23 @@ _08010552: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bls _080105DA + bls @080105DA ldr r1, =0x03007880 lsls r0, r5, 2 adds r0, r1 ldr r0, [r0] ldrh r0, [r0, 0x34] cmp r0, 0x46 - beq _08010576 + beq @08010576 cmp r0, 0x48 - bne _080105C0 -_08010576: + bne @080105C0 +@08010576: ldr r2, =0x00000cd5 adds r0, r6, r2 adds r1, r5, r0 ldrb r0, [r1] cmp r0, 0x8 - bne _080105DA + bne @080105DA movs r0, 0x9 strb r0, [r4] movs r0, 0xA @@ -15777,10 +15777,10 @@ _08010576: movs r3, 0x1 bl rfu_NI_setSendData movs r7, 0x1 - b _080105DA + b @080105DA .align 2, 0 .pool -_080105C0: +@080105C0: mov r2, r8 ldrb r0, [r2] lsls r0, 2 @@ -15788,15 +15788,15 @@ _080105C0: ldr r0, [r0] ldrh r0, [r0, 0x34] cmp r0, 0x47 - bne _080105DA + bne @080105DA lsls r1, r5, 24 lsrs r1, 24 movs r0, 0x8 bl rfu_clearSlot -_080105DA: +@080105DA: adds r5, 0x1 cmp r5, 0x3 - ble _08010552 + ble @08010552 adds r0, r7, 0 pop {r3} mov r8, r3 @@ -15806,61 +15806,61 @@ _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 ldr r5, =0x03005cd5 movs r6, 0x1 movs r4, 0 -_080105F8: +@080105F8: adds r2, r1, r5 ldrb r0, [r2] cmp r0, 0xB - bne _0801060C + bne @0801060C adds r0, r6, 0 lsls r0, r1 orrs r3, r0 lsls r0, r3, 24 lsrs r3, r0, 24 strb r4, [r2] -_0801060C: +@0801060C: adds r1, 0x1 cmp r1, 0x3 - ble _080105F8 + ble @080105F8 cmp r3, 0 - beq _08010620 + beq @08010620 adds r0, r3, 0 bl rfu_REQ_disconnect bl rfu_waitREQComplete -_08010620: +@08010620: movs r1, 0 ldr r2, =0x03005cd5 -_08010624: +@08010624: adds r0, r1, r2 ldrb r0, [r0] subs r0, 0xA lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _0801063C + bhi @0801063C movs r0, 0x1 - b _08010644 + b @08010644 .align 2, 0 .pool -_0801063C: +@0801063C: adds r1, 0x1 cmp r1, 0x3 - ble _08010624 + ble @08010624 movs r0, 0 -_08010644: +@08010644: pop {r4-r6} pop {r1} bx r1 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 @@ -15871,27 +15871,27 @@ sub_801064C: @ 801064C lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xFF - beq _08010680 + beq @08010680 ldr r0, =0x03005000 ldr r2, =0x00000cd1 adds r0, r2 adds r0, r1, r0 ldrb r0, [r0] cmp r0, 0x9 - beq _08010680 + beq @08010680 movs r0, 0 - b _08010682 + b @08010682 .align 2, 0 .pool -_08010680: +@08010680: movs r0, 0x1 -_08010682: +@08010682: pop {r1} bx r1 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 @@ -15927,7 +15927,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 @@ -15956,7 +15956,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 @@ -15967,37 +15967,37 @@ sub_8010714: @ 8010714 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _08010730 + bne @08010730 movs r0, 0x2 - b _0801074A -_08010730: + b @0801074A +@08010730: ldr r1, =0x03007880 lsls r0, 2 adds r0, r1 ldr r0, [r0] ldrh r0, [r0] cmp r0, 0 - beq _08010748 + beq @08010748 movs r0, 0 - b _0801074A + b @0801074A .align 2, 0 .pool -_08010748: +@08010748: movs r0, 0x1 -_0801074A: +@0801074A: pop {r1} bx r1 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 ldr r0, =0x03005000 ldr r1, =0x00000cd5 adds r5, r0, r1 -_0801075E: +@0801075E: ldr r1, =0x03007880 lsls r0, r4, 2 adds r0, r1 @@ -16007,22 +16007,22 @@ _0801075E: lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bhi _08010788 + bhi @08010788 adds r1, r4, r5 ldrb r0, [r1] cmp r0, 0xA - bne _0801077E + bne @0801077E movs r0, 0xB strb r0, [r1] -_0801077E: +@0801077E: lsls r1, r4, 24 lsrs r1, 24 movs r0, 0x4 bl rfu_clearSlot -_08010788: +@08010788: adds r4, 0x1 cmp r4, 0x3 - ble _0801075E + ble @0801075E pop {r4,r5} pop {r0} bx r0 @@ -16031,7 +16031,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 @@ -16039,7 +16039,7 @@ sub_80107A0: @ 80107A0 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x8 - bne _080107DA + bne @080107DA ldr r2, =0x03007880 ldr r0, =0x00000c3e adds r1, r0 @@ -16049,19 +16049,19 @@ sub_80107A0: @ 80107A0 ldr r0, [r0] ldrh r0, [r0] cmp r0, 0x26 - beq _080107D2 + beq @080107D2 ldrb r0, [r1] lsls r0, 2 adds r0, r2 ldr r0, [r0] ldrh r0, [r0] cmp r0, 0x27 - bne _080107DA -_080107D2: + bne @080107DA +@080107D2: ldrb r1, [r1] movs r0, 0x4 bl rfu_clearSlot -_080107DA: +@080107DA: ldr r2, =0x03007880 ldr r5, =0x03005000 ldr r0, =0x00000c3e @@ -16072,15 +16072,15 @@ _080107DA: ldr r0, [r0] ldrh r0, [r0, 0x34] cmp r0, 0x46 - beq _080107FE + beq @080107FE ldrb r0, [r1] lsls r0, 2 adds r0, r2 ldr r0, [r0] ldrh r0, [r0, 0x34] cmp r0, 0x48 - bne _0801082C -_080107FE: + bne @0801082C +@080107FE: ldrb r1, [r1] movs r0, 0x8 bl rfu_clearSlot @@ -16090,22 +16090,22 @@ _080107FE: movs r1, 0 bl sub_8011A64 ldrb r4, [r4] - b _08010844 + b @08010844 .align 2, 0 .pool -_0801082C: +@0801082C: ldrb r0, [r1] lsls r0, 2 adds r0, r2 ldr r0, [r0] ldrh r0, [r0, 0x34] cmp r0, 0x47 - bne _08010844 + bne @08010844 ldrb r1, [r1] movs r0, 0x8 bl rfu_clearSlot movs r4, 0x6 -_08010844: +@08010844: adds r0, r4, 0 pop {r4,r5} pop {r1} @@ -16113,7 +16113,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 @@ -16125,14 +16125,14 @@ sub_801084C: @ 801084C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _08010872 + bhi @08010872 ldr r0, =0x00000ce8 adds r1, r5, r0 movs r0, 0 strb r0, [r1] adds r0, r6, 0 bl remove_task -_08010872: +@08010872: ldr r2, =0x03005e00 lsls r1, r6, 2 adds r0, r1, r6 @@ -16142,88 +16142,88 @@ _08010872: ldrsh r0, [r4, r2] adds r7, r1, 0 cmp r0, 0x3 - beq _0801091C + beq @0801091C cmp r0, 0x3 - bgt _080108A4 + bgt @080108A4 cmp r0, 0x1 - beq _080108CC + beq @080108CC cmp r0, 0x1 - bgt _08010918 + bgt @08010918 cmp r0, 0 - beq _080108B6 - b _080109D2 + beq @080108B6 + b @080109D2 .align 2, 0 .pool -_080108A4: +@080108A4: cmp r0, 0x5 - beq _08010950 + beq @08010950 cmp r0, 0x5 - blt _0801093E + blt @0801093E cmp r0, 0x6 - beq _08010984 + beq @08010984 cmp r0, 0x65 - beq _08010904 - b _080109D2 -_080108B6: + beq @08010904 + b @080109D2 +@080108B6: bl sub_800FC60 lsls r0, 24 cmp r0, 0 - bne _080108C2 - b _080109D2 -_080108C2: + bne @080108C2 + b @080109D2 +@080108C2: bl sub_800A5B4 bl sub_800B348 - b _08010948 -_080108CC: + b @08010948 +@080108CC: ldrb r0, [r5, 0xC] cmp r0, 0x1 - bne _0801090C + bne @0801090C ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _080108E8 + beq @080108E8 movs r0, 0xF0 lsls r0, 7 bl sub_800FD14 - b _080108F0 + b @080108F0 .align 2, 0 .pool -_080108E8: +@080108E8: movs r0, 0xEE lsls r0, 7 bl sub_800FD14 -_080108F0: +@080108F0: ldr r0, =0x03005e00 adds r1, r7, r6 lsls r1, 3 adds r1, r0 movs r0, 0x65 strh r0, [r1, 0x8] - b _080109D2 + b @080109D2 .align 2, 0 .pool -_08010904: +@08010904: ldr r0, =0x03003110 ldrh r0, [r0] cmp r0, 0 - bne _080109D2 -_0801090C: + bne @080109D2 +@0801090C: movs r0, 0x2 strh r0, [r4, 0x8] - b _080109D2 + b @080109D2 .align 2, 0 .pool -_08010918: +@08010918: ldrb r0, [r5, 0xD] - b _08010944 -_0801091C: + b @08010944 +@0801091C: ldrb r0, [r5, 0xC] cmp r0, 0x1 - bne _08010948 + bne @08010948 bl sub_800FC60 lsls r0, 24 cmp r0, 0 - beq _080109D2 + beq @080109D2 adds r1, r5, 0 adds r1, 0x5A movs r0, 0 @@ -16231,24 +16231,24 @@ _0801091C: movs r0, 0xA1 lsls r0, 8 bl sub_800FD14 - b _08010948 -_0801093E: + b @08010948 +@0801093E: bl sub_800FC88 lsls r0, 24 -_08010944: +@08010944: cmp r0, 0 - beq _080109D2 -_08010948: + beq @080109D2 +@08010948: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080109D2 -_08010950: + b @080109D2 +@08010950: movs r4, 0 ldrb r0, [r5, 0xD] cmp r4, r0 - bge _0801096E -_08010958: + bge @0801096E +@08010958: adds r0, r4, 0 bl sub_800B3A4 lsls r0, r4, 24 @@ -16257,8 +16257,8 @@ _08010958: adds r4, 0x1 ldrb r2, [r5, 0xD] cmp r4, r2 - blt _08010958 -_0801096E: + blt @08010958 +@0801096E: ldr r0, =0x03005e00 adds r1, r7, r6 lsls r1, 3 @@ -16266,10 +16266,10 @@ _0801096E: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _080109D2 + b @080109D2 .align 2, 0 .pool -_08010984: +@08010984: adds r0, r6, 0 bl remove_task ldr r1, =0x03003124 @@ -16287,29 +16287,29 @@ _08010984: adds r1, r5, r2 ldrb r0, [r1] cmp r0, 0 - beq _080109D2 + beq @080109D2 movs r4, 0 adds r2, r1, 0 movs r3, 0x1 ldr r0, =0x00000ce5 adds r5, r0 -_080109B6: +@080109B6: ldrb r0, [r2] asrs r0, r4 ands r0, r3 cmp r0, 0 - beq _080109CC + beq @080109CC adds r0, r3, 0 lsls r0, r4 strb r0, [r5] ldrb r1, [r2] eors r0, r1 strb r0, [r2] -_080109CC: +@080109CC: adds r4, 0x1 cmp r4, 0x3 - ble _080109B6 -_080109D2: + ble @080109B6 +@080109D2: pop {r4-r7} pop {r0} bx r0 @@ -16318,7 +16318,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 @@ -16326,18 +16326,18 @@ sub_80109E8: @ 80109E8 movs r5, 0x1 ldr r4, =0x03005cde movs r3, 0 -_080109F6: +@080109F6: adds r0, r2, 0 asrs r0, r1 ands r0, r5 cmp r0, 0 - beq _08010A04 + beq @08010A04 adds r0, r1, r4 strb r3, [r0] -_08010A04: +@08010A04: adds r1, 0x1 cmp r1, 0x3 - ble _080109F6 + ble @080109F6 pop {r4,r5} pop {r0} bx r0 @@ -16346,7 +16346,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 @@ -16357,18 +16357,18 @@ sub_8010A14: @ 8010A14 adds r5, r1, r0 adds r3, r2, 0 adds r3, 0x10 -_08010A28: +@08010A28: adds r0, r4, r5 adds r1, r3, r4 ldrb r1, [r1] strb r1, [r0] adds r4, 0x1 cmp r4, 0x3 - ble _08010A28 + ble @08010A28 adds r6, r2, 0 ldr r5, =0x020229e8 movs r4, 0x4 -_08010A3C: +@08010A3C: adds r0, r5, 0 adds r1, r6, 0 adds r1, 0x14 @@ -16384,7 +16384,7 @@ _08010A3C: adds r5, 0x1C subs r4, 0x1 cmp r4, 0 - bge _08010A3C + bge @08010A3C pop {r4-r7} pop {r0} bx r0 @@ -16393,7 +16393,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 @@ -16402,7 +16402,7 @@ sub_8010A70: @ 8010A70 bl strcmp adds r5, r0, 0 cmp r5, 0 - bne _08010A9C + bne @08010A9C adds r0, r4, 0 bl sub_8010A14 mov r0, sp @@ -16412,7 +16412,7 @@ sub_8010A70: @ 8010A70 bl CpuSet movs r0, 0 bl sub_800A5EC -_08010A9C: +@08010A9C: add sp, 0x4 pop {r4,r5} pop {r0} @@ -16422,7 +16422,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 @@ -16445,14 +16445,14 @@ sub_8010AAC: @ 8010AAC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _08010AE8 + bhi @08010AE8 ldr r5, =0x00000ce8 adds r1, r3, r5 movs r0, 0 strb r0, [r1] adds r0, r6, 0 bl remove_task -_08010AE8: +@08010AE8: ldr r0, =0x03005e00 lsls r2, r6, 2 adds r1, r2, r6 @@ -16463,53 +16463,53 @@ _08010AE8: adds r3, r0, 0 adds r7, r2, 0 cmp r1, 0x5 - bls _08010B00 - b _08010CF0 -_08010B00: + bls @08010B00 + b @08010CF0 +@08010B00: lsls r0, r1, 2 - ldr r1, =_08010B28 + ldr r1, =@08010B28 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08010B28: - .4byte _08010B40 - .4byte _08010B60 - .4byte _08010B78 - .4byte _08010BC0 - .4byte _08010C0A - .4byte _08010C94 -_08010B40: +@08010B28: + .4byte @08010B40 + .4byte @08010B60 + .4byte @08010B78 + .4byte @08010BC0 + .4byte @08010C0A + .4byte @08010C94 +@08010B40: ldr r0, =0x03003110 ldrh r0, [r0] cmp r0, 0 - beq _08010B4A - b _08010CF0 -_08010B4A: + beq @08010B4A + b @08010CF0 +@08010B4A: adds r0, r4, 0 bl sub_800A5EC movs r0, 0xF0 lsls r0, 7 bl sub_800FD14 - b _08010C4A + b @08010C4A .align 2, 0 .pool -_08010B60: +@08010B60: ldr r0, =0x03003110 ldrh r0, [r0] cmp r0, 0 - beq _08010B6A - b _08010CF0 -_08010B6A: + beq @08010B6A + b @08010CF0 +@08010B6A: adds r1, r7, r6 lsls r1, 3 adds r1, r3 - b _08010C52 + b @08010C52 .align 2, 0 .pool -_08010B78: +@08010B78: bl sub_800A550 lsls r0, 24 lsrs r0, 24 @@ -16517,9 +16517,9 @@ _08010B78: movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _08010B8C - b _08010CF0 -_08010B8C: + bne @08010B8C + b @08010CF0 +@08010B8C: adds r0, r4, 0 bl sub_800A5EC lsls r2, r4, 8 @@ -16539,10 +16539,10 @@ _08010B8C: ldr r2, [r2] str r2, [r1] bl sub_800B524 - b _08010C4A + b @08010C4A .align 2, 0 .pool -_08010BC0: +@08010BC0: ldr r5, =0x020228c4 adds r1, r5, 0 ldr r0, =0x082ed7ec @@ -16560,14 +16560,14 @@ _08010BC0: adds r4, 0x10 ldr r0, =0x00000cde adds r3, r1, r0 -_08010BE2: +@08010BE2: adds r0, r4, r2 adds r1, r2, r3 ldrb r1, [r1] strb r1, [r0] adds r2, 0x1 cmp r2, 0x3 - ble _08010BE2 + ble @08010BE2 ldr r1, =0x020229e8 adds r0, r5, 0 adds r0, 0x14 @@ -16580,7 +16580,7 @@ _08010BE2: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_08010C0A: +@08010C0A: ldr r5, =0x020228c4 ldr r1, =0x03005000 ldrb r0, [r1, 0xD] @@ -16592,14 +16592,14 @@ _08010C0A: adds r4, 0x10 ldr r0, =0x00000cde adds r3, r1, r0 -_08010C20: +@08010C20: adds r0, r4, r2 adds r1, r2, r3 ldrb r1, [r1] strb r1, [r0] adds r2, 0x1 cmp r2, 0x3 - ble _08010C20 + ble @08010C20 adds r0, r5, 0 adds r0, 0x14 mov r1, r12 @@ -16611,20 +16611,20 @@ _08010C20: bl link_0800A448 lsls r0, 24 cmp r0, 0 - beq _08010CF0 -_08010C4A: + beq @08010CF0 +@08010C4A: ldr r0, =0x03005e00 adds r1, r7, r6 lsls r1, 3 adds r1, r0 -_08010C52: +@08010C52: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _08010CF0 + b @08010CF0 .align 2, 0 .pool -_08010C74: +@08010C74: adds r0, r3, 0 lsls r0, r2 ldr r2, =0x00000ce5 @@ -16636,19 +16636,19 @@ _08010C74: ldr r4, =0x00000ce8 adds r0, r5, r4 strb r3, [r0] - b _08010CEA + b @08010CEA .align 2, 0 .pool -_08010C94: +@08010C94: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08010CF0 + beq @08010CF0 bl sub_800A550 movs r1, 0x1 ands r1, r0 cmp r1, 0 - beq _08010CF0 + beq @08010CF0 mov r0, sp movs r4, 0 strh r4, [r0] @@ -16665,25 +16665,25 @@ _08010C94: adds r3, r1, r0 ldrb r0, [r3] cmp r0, 0 - beq _08010CEA + beq @08010CEA movs r2, 0 adds r5, r1, 0 adds r4, r3, 0 ldrb r1, [r4] movs r3, 0x1 -_08010CDA: +@08010CDA: adds r0, r1, 0 asrs r0, r2 ands r0, r3 cmp r0, 0 - bne _08010C74 + bne @08010C74 adds r2, 0x1 cmp r2, 0x3 - ble _08010CDA -_08010CEA: + ble @08010CDA +@08010CEA: adds r0, r6, 0 bl remove_task -_08010CF0: +@08010CF0: add sp, 0x4 pop {r4-r7} pop {r0} @@ -16693,7 +16693,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 @@ -16705,10 +16705,10 @@ sub_8010D0C: @ 8010D0C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _08010D2A + bhi @08010D2A adds r0, r5, 0 bl remove_task -_08010D2A: +@08010D2A: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -16717,47 +16717,47 @@ _08010D2A: movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _08010D70 + beq @08010D70 cmp r0, 0x1 - bgt _08010D50 + bgt @08010D50 cmp r0, 0 - beq _08010D56 - b _08010DA6 + beq @08010D56 + b @08010DA6 .align 2, 0 .pool -_08010D50: +@08010D50: cmp r0, 0x2 - beq _08010D82 - b _08010DA6 -_08010D56: + beq @08010D82 + b @08010DA6 +@08010D56: ldrb r0, [r6, 0xD] cmp r0, 0 - beq _08010DA6 + beq @08010DA6 bl sub_800B348 ldr r1, =0x020228c4 movs r0, 0 movs r2, 0x3C bl link_0800A448 - b _08010D7A + b @08010D7A .align 2, 0 .pool -_08010D70: +@08010D70: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08010DA6 -_08010D7A: + beq @08010DA6 +@08010D7A: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _08010DA6 -_08010D82: + b @08010DA6 +@08010D82: bl sub_800A550 movs r4, 0x1 adds r1, r4, 0 ands r1, r0 cmp r1, 0 - beq _08010DA6 + beq @08010DA6 ldr r0, =0x020223c4 bl sub_8010A14 movs r0, 0 @@ -16766,7 +16766,7 @@ _08010D82: strb r4, [r0] adds r0, r5, 0 bl remove_task -_08010DA6: +@08010DA6: pop {r4-r6} pop {r0} bx r0 @@ -16775,7 +16775,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 @@ -16783,25 +16783,25 @@ sub_8010DB4: @ 8010DB4 ldrb r1, [r1] adds r3, r0, 0 cmp r1, 0x1 - bne _08010E5C + bne @08010E5C ldr r2, =0x03004140 ldrb r0, [r2, 0x2] cmp r0, 0 - bne _08010E5C + bne @08010E5C ldr r0, =0x030022c0 ldr r1, [r0, 0x4] ldr r0, =sub_8018438 + 1 cmp r1, r0 - beq _08010DDE + beq @08010DDE ldr r0, [r2, 0x3C] ldrb r0, [r0, 0x4] cmp r0, 0 - beq _08010DE4 -_08010DDE: + beq @08010DE4 +@08010DDE: ldr r1, =0x030030fc movs r0, 0x2 strb r0, [r1] -_08010DE4: +@08010DE4: ldr r4, =c2_800ACD4 + 1 adds r0, r4, 0 bl set_callback2 @@ -16828,9 +16828,9 @@ _08010DE4: lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _08010E20 + bne @08010E20 movs r3, 0x1 -_08010E20: +@08010E20: adds r0, r4, 0 adds r1, r7, 0 adds r2, r6, 0 @@ -16841,27 +16841,27 @@ _08010E20: movs r1, 0x2 strb r1, [r0] bl sub_80097E8 - b _08010E8E + b @08010E8E .align 2, 0 .pool -_08010E5C: +@08010E5C: ldr r1, =0x00000c1b adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0x1 - beq _08010E70 + beq @08010E70 ldr r1, =0x000009e7 adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _08010E8E -_08010E70: + bne @08010E8E +@08010E70: ldr r0, =0x03004140 ldrb r0, [r0, 0x2] cmp r0, 0 - beq _08010E7C + beq @08010E7C bl sub_800D630 -_08010E7C: +@08010E7C: movs r4, 0xE0 lsls r4, 7 movs r0, 0x1 @@ -16869,7 +16869,7 @@ _08010E7C: bl sub_8011A64 adds r0, r4, 0 bl sub_8011170 -_08010E8E: +@08010E8E: pop {r4-r7} pop {r0} bx r0 @@ -16878,17 +16878,17 @@ _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] cmp r0, 0x1 - bne _08010EB8 + bne @08010EB8 bl rfu_REQ_recvData bl rfu_waitREQComplete movs r0, 0 bl rfu_REQ_sendData_wrapper -_08010EB8: +@08010EB8: pop {r0} bx r0 .align 2, 0 @@ -16896,7 +16896,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 @@ -16911,31 +16911,31 @@ sub_8010EC0: @ 8010EC0 adds r0, 0xEF ldrb r0, [r0] cmp r0, 0 - bne _08010F14 + bne @08010F14 ldrb r0, [r4, 0xC] cmp r0, 0x1 - beq _08010F02 + beq @08010F02 cmp r0, 0x1 - bgt _08010EFC + bgt @08010EFC cmp r0, 0 - beq _08010F08 - b _08010F14 + beq @08010F08 + b @08010F14 .align 2, 0 .pool -_08010EFC: +@08010EFC: cmp r0, 0x2 - beq _08010F10 - b _08010F14 -_08010F02: + beq @08010F10 + b @08010F14 +@08010F02: bl sub_800F0F8 - b _08010F14 -_08010F08: + b @08010F14 +@08010F08: bl sub_800F4F0 adds r5, r0, 0 - b _08010F14 -_08010F10: + b @08010F14 +@08010F10: bl rfu_REQ_recvData_then_sendData -_08010F14: +@08010F14: adds r0, r5, 0 pop {r4,r5} pop {r1} @@ -16943,7 +16943,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 @@ -16951,15 +16951,15 @@ sub_8010F1C: @ 8010F1C adds r0, 0xEF ldrb r0, [r0] cmp r0, 0 - bne _08010F3C + bne @08010F3C ldrb r0, [r1, 0xC] cmp r0, 0x1 - bne _08010F38 + bne @08010F38 bl sub_800F1E0 adds r4, r0, 0 -_08010F38: +@08010F38: bl sub_8010DB4 -_08010F3C: +@08010F3C: adds r0, r4, 0 pop {r4} pop {r1} @@ -16969,7 +16969,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 @@ -16982,7 +16982,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 @@ -17002,7 +17002,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 @@ -17019,7 +17019,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 @@ -17045,7 +17045,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 @@ -17076,7 +17076,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 @@ -17103,32 +17103,32 @@ 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 - b _08011054 + b @08011054 .align 2, 0 .pool -_08011048: +@08011048: adds r0, r4, 0 bl sub_801100C adds r1, r5, r4 strb r0, [r1, 0x3] adds r4, 0x1 -_08011054: +@08011054: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r4, r0 - blt _08011048 + blt @08011048 pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_801103C thumb_func_start sub_8011068 -sub_8011068: @ 8011068 +sub_8011068: ; 8011068 push {lr} lsls r0, 24 ldr r2, =0x02022b14 @@ -17149,14 +17149,14 @@ 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 cmp r0, 0 - beq _0801109E + beq @0801109E bl sub_8010F84 -_0801109E: +@0801109E: ldr r2, =0x02022b14 ldr r3, =0x02022b22 movs r0, 0 @@ -17169,7 +17169,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 @@ -17181,7 +17181,7 @@ sub_80110B8: @ 80110B8 movs r0, 0x7F ands r0, r1 cmp r0, 0x45 - bne _0801114C + bne @0801114C movs r5, 0 movs r7, 0 ldr r3, =0x03005000 @@ -17203,12 +17203,12 @@ sub_80110B8: @ 80110B8 mov r10, r0 mov r3, r12 adds r3, 0x4 -_080110FC: +@080110FC: mov r0, r8 asrs r0, r4 ands r0, r6 cmp r0, 0 - beq _0801113C + beq @0801113C mov r1, r10 adds r0, r4, r1 ldrb r1, [r0] @@ -17235,17 +17235,17 @@ _080110FC: mov r0, r9 subs r0, 0x1 cmp r5, r0 - beq _08011142 -_0801113C: + beq @08011142 +@0801113C: adds r4, 0x1 cmp r4, 0x3 - ble _080110FC -_08011142: + ble @080110FC +@08011142: movs r0, 0x45 adds r1, r7, 0 movs r2, 0 bl sub_8011090 -_0801114C: +@0801114C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -17258,7 +17258,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 @@ -17266,7 +17266,7 @@ sub_8011170: @ 8011170 adds r3, 0xEE ldrb r0, [r3] cmp r0, 0 - bne _08011192 + bne @08011192 ldr r1, =0x03004140 ldrh r0, [r1, 0x14] strh r0, [r2, 0x10] @@ -17276,7 +17276,7 @@ sub_8011170: @ 8011170 ldrb r0, [r3] movs r0, 0x1 strb r0, [r3] -_08011192: +@08011192: pop {r4} pop {r0} bx r0 @@ -17285,7 +17285,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] @@ -17297,25 +17297,25 @@ 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 - bne _080111C8 + bne @080111C8 ldr r0, =0x03005000 adds r0, 0xEE ldrb r1, [r0] strb r2, [r0] - b _080111D2 + b @080111D2 .align 2, 0 .pool -_080111C8: +@080111C8: ldr r0, =0x03005000 adds r0, 0xEE ldrb r1, [r0] movs r1, 0x4 strb r1, [r0] -_080111D2: +@080111D2: pop {r0} bx r0 .align 2, 0 @@ -17323,7 +17323,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] @@ -17339,7 +17339,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 + 1 str r0, [r1] @@ -17349,7 +17349,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 @@ -17359,76 +17359,76 @@ sub_801120C: @ 801120C lsrs r4, r0, 24 movs r6, 0 cmp r4, 0x32 - bne _08011222 - b _08011360 -_08011222: + bne @08011222 + b @08011360 +@08011222: cmp r4, 0x32 - bgt _08011252 + bgt @08011252 cmp r4, 0x13 - bgt _08011240 + bgt @08011240 cmp r4, 0x12 - blt _08011230 - b _080113EE -_08011230: + blt @08011230 + b @080113EE +@08011230: cmp r4, 0x10 - bne _08011236 - b _080113EE -_08011236: + bne @08011236 + b @080113EE +@08011236: cmp r4, 0x10 - bgt _0801128C + bgt @0801128C cmp r4, 0 - beq _0801127E - b _080113EE -_08011240: + beq @0801127E + b @080113EE +@08011240: cmp r4, 0x30 - bne _08011246 - b _0801136C -_08011246: + bne @08011246 + b @0801136C +@08011246: cmp r4, 0x30 - ble _0801124C - b _08011354 -_0801124C: + ble @0801124C + b @08011354 +@0801124C: cmp r4, 0x14 - beq _08011328 - b _080113EE -_08011252: + beq @08011328 + b @080113EE +@08011252: cmp r4, 0x44 - bgt _08011264 + bgt @08011264 cmp r4, 0x42 - blt _0801125C - b _080113EE -_0801125C: + blt @0801125C + b @080113EE +@0801125C: cmp r4, 0x33 - bne _08011262 - b _0801136C -_08011262: - b _080113EE -_08011264: + bne @08011262 + b @0801136C +@08011262: + b @080113EE +@08011264: cmp r4, 0xF3 - bne _0801126A - b _080113BA -_0801126A: + bne @0801126A + b @080113BA +@0801126A: cmp r4, 0xF3 - bgt _08011276 + bgt @08011276 cmp r4, 0xF0 - bge _08011274 - b _080113EE -_08011274: - b _080113D4 -_08011276: + bge @08011274 + b @080113EE +@08011274: + b @080113D4 +@08011276: cmp r4, 0xFF - bne _0801127C - b _080113D4 -_0801127C: - b _080113EE -_0801127E: + bne @0801127C + b @080113D4 +@0801127C: + b @080113EE +@0801127E: ldr r1, =0x03005000 movs r0, 0x2 strh r0, [r1, 0x4] - b _080113EE + b @080113EE .align 2, 0 .pool -_0801128C: +@0801128C: ldr r0, =0x03004140 ldrh r0, [r0, 0x14] bl sub_80115EC @@ -17441,14 +17441,14 @@ _0801128C: add r3, r9 mov r10, r3 movs r7, 0x7F -_080112A6: +@080112A6: ldr r0, =0x03004140 ldrh r0, [r0, 0x14] asrs r0, r5 mov r1, r8 ands r0, r1 cmp r0, 0 - beq _0801130E + beq @0801130E ldr r0, =0x03007890 lsls r1, r5, 5 adds r1, 0x14 @@ -17462,7 +17462,7 @@ _080112A6: adds r0, r7, 0 ands r0, r1 cmp r4, r0 - bne _08011304 + bne @08011304 ldr r0, =0x00000cd1 add r0, r9 adds r0, r5, r0 @@ -17475,28 +17475,28 @@ _080112A6: adds r1, r5, 0 movs r3, 0x1 bl rfu_setRecvBuffer - b _0801130E + b @0801130E .align 2, 0 .pool -_08011304: +@08011304: mov r0, r8 lsls r0, r5 orrs r6, r0 lsls r0, r6, 24 lsrs r6, r0, 24 -_0801130E: +@0801130E: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _080112A6 + bls @080112A6 cmp r6, 0 - beq _080113EE + beq @080113EE adds r0, r6, 0 bl rfu_REQ_disconnect bl rfu_waitREQComplete - b _080113EE -_08011328: + b @080113EE +@08011328: ldr r4, =0x03005000 ldr r1, =0x00000ce7 adds r0, r4, r1 @@ -17504,30 +17504,30 @@ _08011328: ldrb r2, [r0] ldrb r0, [r1] cmp r2, r0 - beq _08011342 + beq @08011342 eors r0, r2 bl rfu_REQ_disconnect bl rfu_waitREQComplete -_08011342: +@08011342: movs r0, 0x11 strh r0, [r4, 0x4] - b _080113EE + b @080113EE .align 2, 0 .pool -_08011354: +@08011354: ldr r0, =0x03005000 adds r0, 0xF0 - b _080113EA + b @080113EA .align 2, 0 .pool -_08011360: +@08011360: ldr r0, =0x03005000 adds r0, 0xF0 movs r1, 0x3 - b _080113EC + b @080113EC .align 2, 0 .pool -_0801136C: +@0801136C: ldr r1, =0x03005000 adds r2, r1, 0 adds r2, 0xF0 @@ -17545,22 +17545,22 @@ _0801136C: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 - bne _080113B0 + bne @080113B0 cmp r2, 0 - bne _080113AC + bne @080113AC adds r0, r4, 0 bl sub_8011170 - b _080113B0 + b @080113B0 .align 2, 0 .pool -_080113AC: +@080113AC: bl sub_80111FC -_080113B0: +@080113B0: movs r0, 0x2 adds r1, r4, 0 bl sub_8011A64 - b _080113EE -_080113BA: + b @080113EE +@080113BA: movs r0, 0x1 movs r1, 0xF3 bl sub_8011A64 @@ -17568,10 +17568,10 @@ _080113BA: bl sub_8011170 ldr r0, =0x03005000 adds r0, 0xEF - b _080113EA + b @080113EA .align 2, 0 .pool -_080113D4: +@080113D4: adds r0, r4, 0 bl sub_8011170 movs r0, 0x1 @@ -17581,11 +17581,11 @@ _080113D4: ldr r1, =0x00000cdb adds r0, r1 ldrb r1, [r0] -_080113EA: +@080113EA: movs r1, 0x1 -_080113EC: +@080113EC: strb r1, [r0] -_080113EE: +@080113EE: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -17598,103 +17598,103 @@ _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 cmp r4, 0x31 - bne _08011410 - b _08011570 -_08011410: + bne @08011410 + b @08011570 +@08011410: cmp r4, 0x31 - bgt _0801143E + bgt @0801143E cmp r4, 0x22 - beq _08011494 + beq @08011494 cmp r4, 0x22 - bgt _0801142C + bgt @0801142C cmp r4, 0x20 - beq _0801147C + beq @0801147C cmp r4, 0x20 - ble _08011426 - b _080115DE -_08011426: + ble @08011426 + b @080115DE +@08011426: cmp r4, 0 - beq _0801146E - b _080115DE -_0801142C: + beq @0801146E + b @080115DE +@0801142C: cmp r4, 0x24 - beq _080114BA + beq @080114BA cmp r4, 0x24 - blt _080114B0 + blt @080114B0 cmp r4, 0x25 - beq _08011504 + beq @08011504 cmp r4, 0x30 - beq _0801150E - b _080115DE -_0801143E: + beq @0801150E + b @080115DE +@0801143E: cmp r4, 0x44 - bgt _08011454 + bgt @08011454 cmp r4, 0x42 - blt _08011448 - b _080115DE -_08011448: + blt @08011448 + b @080115DE +@08011448: cmp r4, 0x33 - beq _08011522 + beq @08011522 cmp r4, 0x33 - bge _08011452 - b _0801158C -_08011452: - b _080115DE -_08011454: + bge @08011452 + b @0801158C +@08011452: + b @080115DE +@08011454: cmp r4, 0xF3 - bne _0801145A - b _080115AC -_0801145A: + bne @0801145A + b @080115AC +@0801145A: cmp r4, 0xF3 - bgt _08011466 + bgt @08011466 cmp r4, 0xF0 - bge _08011464 - b _080115DE -_08011464: - b _080115C4 -_08011466: + bge @08011464 + b @080115DE +@08011464: + b @080115C4 +@08011466: cmp r4, 0xFF - bne _0801146C - b _080115C4 -_0801146C: - b _080115DE -_0801146E: + bne @0801146C + b @080115C4 +@0801146C: + b @080115DE +@0801146E: ldr r1, =0x03005000 movs r0, 0x6 strh r0, [r1, 0x4] - b _080115DE + b @080115DE .align 2, 0 .pool -_0801147C: +@0801147C: ldr r0, =0x03005000 ldr r1, =0x03004140 ldrh r1, [r1, 0x14] ldr r2, =0x00000ccd adds r0, r2 - b _080115DC + b @080115DC .align 2, 0 .pool -_08011494: +@08011494: ldr r0, =0x03005000 ldr r1, =0x03004140 ldrh r1, [r1, 0x14] ldr r2, =0x00000c3e adds r0, r2 ldrb r2, [r0] - b _080115DC + b @080115DC .align 2, 0 .pool -_080114B0: +@080114B0: movs r0, 0x2 adds r1, r4, 0 bl sub_8011A64 - b _080115DE -_080114BA: + b @080115DE +@080114BA: ldr r4, =0x03005000 movs r1, 0 movs r0, 0xB @@ -17718,15 +17718,15 @@ _080114BA: adds r2, r4, 0 movs r3, 0x46 bl rfu_setRecvBuffer - b _080115DE + b @080115DE .align 2, 0 .pool -_08011504: +@08011504: movs r0, 0x2 movs r1, 0x25 bl sub_8011A64 - b _080115DE -_0801150E: + b @080115DE +@0801150E: ldr r0, =0x03005000 adds r2, r0, 0 adds r2, 0xF0 @@ -17736,26 +17736,26 @@ _0801150E: adds r0, r1 ldrb r0, [r0] cmp r0, 0x6 - beq _080115DE -_08011522: + beq @080115DE +@08011522: ldr r2, =0x03005000 adds r1, r2, 0 adds r1, 0xF0 ldrb r0, [r1] cmp r0, 0x2 - beq _08011532 + beq @08011532 movs r0, 0x4 strb r0, [r1] -_08011532: +@08011532: ldr r1, =0x00000c86 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x9 - beq _08011544 + beq @08011544 movs r0, 0x2 adds r1, r4, 0 bl sub_8011A64 -_08011544: +@08011544: ldr r0, =0x082ed7fc movs r1, 0x5 movs r2, 0x5 @@ -17763,13 +17763,13 @@ _08011544: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 - bne _080115DE + bne @080115DE adds r0, r4, 0 bl sub_8011170 - b _080115DE + b @080115DE .align 2, 0 .pool -_08011570: +@08011570: ldr r0, =0x03005000 adds r0, 0xF0 movs r1, 0x1 @@ -17778,10 +17778,10 @@ _08011570: movs r1, 0x5 movs r2, 0x5 bl nullsub_5 - b _080115DE + b @080115DE .align 2, 0 .pool -_0801158C: +@0801158C: ldr r1, =0x03005000 adds r2, r1, 0 adds r2, 0xF0 @@ -17792,10 +17792,10 @@ _0801158C: ldrb r0, [r1] movs r0, 0x1 strb r0, [r1] - b _080115DE + b @080115DE .align 2, 0 .pool -_080115AC: +@080115AC: movs r0, 0x1 movs r1, 0xF3 bl sub_8011A64 @@ -17803,10 +17803,10 @@ _080115AC: bl sub_8011170 ldr r0, =0x03005000 adds r0, 0xEF - b _080115DA + b @080115DA .align 2, 0 .pool -_080115C4: +@080115C4: movs r0, 0x1 adds r1, r4, 0 bl sub_8011A64 @@ -17816,11 +17816,11 @@ _080115C4: ldr r1, =0x00000cdb adds r0, r1 ldrb r1, [r0] -_080115DA: +@080115DA: movs r1, 0x1 -_080115DC: +@080115DC: strb r1, [r0] -_080115DE: +@080115DE: pop {r4,r5} pop {r0} bx r0 @@ -17829,7 +17829,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 @@ -17839,21 +17839,21 @@ sub_80115EC: @ 80115EC adds r1, r0, r4 movs r5, 0 movs r4, 0xFF -_080115FE: +@080115FE: adds r0, r3, 0 asrs r0, r2 ands r0, r6 cmp r0, 0 - beq _08011610 + beq @08011610 strb r5, [r1] ldrb r0, [r1, 0x4] orrs r0, r4 strb r0, [r1, 0x4] -_08011610: +@08011610: adds r1, 0x1 adds r2, 0x1 cmp r2, 0x3 - ble _080115FE + ble @080115FE pop {r4-r6} pop {r0} bx r0 @@ -17862,7 +17862,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 @@ -17870,12 +17870,12 @@ sub_8011628: @ 8011628 movs r4, 0x1 ldr r6, =0x03007890 movs r7, 0x7F -_08011636: +@08011636: adds r0, r5, 0 asrs r0, r2 ands r0, r4 cmp r0, 0 - beq _0801165C + beq @0801165C lsls r1, r2, 5 adds r1, 0x14 ldr r0, [r6] @@ -17884,18 +17884,18 @@ _08011636: adds r0, r7, 0 ands r0, r1 cmp r0, 0x45 - bne _0801165C + bne @0801165C adds r0, r4, 0 lsls r0, r2 orrs r3, r0 lsls r0, r3, 24 lsrs r3, r0, 24 -_0801165C: +@0801165C: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls _08011636 + bls @08011636 adds r0, r3, 0 pop {r4-r7} pop {r1} @@ -17905,137 +17905,137 @@ _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 cmp r4, 0x25 - bne _08011680 - b _080118EC -_08011680: + bne @08011680 + b @080118EC +@08011680: cmp r4, 0x25 - bgt _080116C2 + bgt @080116C2 cmp r4, 0x14 - bne _0801168A - b _08011804 -_0801168A: + bne @0801168A + b @08011804 +@0801168A: cmp r4, 0x14 - bgt _080116A2 + bgt @080116A2 cmp r4, 0x11 - beq _08011722 + beq @08011722 cmp r4, 0x11 - ble _08011698 - b _08011A42 -_08011698: + ble @08011698 + b @08011A42 +@08011698: cmp r4, 0 - beq _0801170C + beq @0801170C cmp r4, 0x10 - beq _08011718 - b _08011A42 -_080116A2: + beq @08011718 + b @08011A42 +@080116A2: cmp r4, 0x22 - bne _080116A8 - b _08011868 -_080116A8: + bne @080116A8 + b @08011868 +@080116A8: cmp r4, 0x22 - bgt _080116B4 + bgt @080116B4 cmp r4, 0x20 - bne _080116B2 - b _08011850 -_080116B2: - b _08011A42 -_080116B4: + bne @080116B2 + b @08011850 +@080116B2: + b @08011A42 +@080116B4: cmp r4, 0x23 - bne _080116BA - b _08011884 -_080116BA: + bne @080116BA + b @08011884 +@080116BA: cmp r4, 0x24 - bne _080116C0 - b _080118BA -_080116C0: - b _08011A42 -_080116C2: + bne @080116C0 + b @080118BA +@080116C0: + b @08011A42 +@080116C2: cmp r4, 0x44 - bgt _080116F2 + bgt @080116F2 cmp r4, 0x42 - blt _080116CC - b _08011A42 -_080116CC: + blt @080116CC + b @08011A42 +@080116CC: cmp r4, 0x32 - bne _080116D2 - b _08011914 -_080116D2: + bne @080116D2 + b @08011914 +@080116D2: cmp r4, 0x32 - bgt _080116E4 + bgt @080116E4 cmp r4, 0x30 - bne _080116DC - b _08011940 -_080116DC: + bne @080116DC + b @08011940 +@080116DC: cmp r4, 0x31 - bne _080116E2 - b _080118F6 -_080116E2: - b _08011A42 -_080116E4: + bne @080116E2 + b @080118F6 +@080116E2: + b @08011A42 +@080116E4: cmp r4, 0x33 - bne _080116EA - b _08011948 -_080116EA: + bne @080116EA + b @08011948 +@080116EA: cmp r4, 0x40 - bne _080116F0 - b _080119FC -_080116F0: - b _08011A42 -_080116F2: + bne @080116F0 + b @080119FC +@080116F0: + b @08011A42 +@080116F2: cmp r4, 0xF3 - bne _080116F8 - b _08011A0C -_080116F8: + bne @080116F8 + b @08011A0C +@080116F8: cmp r4, 0xF3 - bgt _08011704 + bgt @08011704 cmp r4, 0xF0 - bge _08011702 - b _08011A42 -_08011702: - b _08011A28 -_08011704: + bge @08011702 + b @08011A42 +@08011702: + b @08011A28 +@08011704: cmp r4, 0xFF - bne _0801170A - b _08011A28 -_0801170A: - b _08011A42 -_0801170C: + bne @0801170A + b @08011A28 +@0801170A: + b @08011A42 +@0801170C: ldr r1, =0x03005000 movs r0, 0x11 strh r0, [r1, 0x4] - b _08011A42 + b @08011A42 .align 2, 0 .pool -_08011718: +@08011718: movs r0, 0x4 movs r1, 0 bl sub_8011A64 - b _08011A42 -_08011722: + b @08011A42 +@08011722: bl sub_800F7DC ldrb r1, [r0, 0xA] movs r0, 0x7F ands r0, r1 cmp r0, 0x45 - bne _080117DC + bne @080117DC ldr r5, =0x03005000 ldr r1, =0x00000cd9 adds r0, r5, r1 ldrb r0, [r0] cmp r0, 0 - bne _080117DC + bne @080117DC ldr r0, =0x03004140 ldrh r0, [r0, 0x14] bl sub_8011628 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq _080117A6 + beq @080117A6 adds r0, r4, 0 bl sub_800E87C movs r2, 0x1 @@ -18048,12 +18048,12 @@ _08011722: adds r6, r5, r7 ldrb r2, [r6] cmp r2, 0 - bne _08011798 + bne @08011798 ldr r0, =0x00000ce8 adds r3, r5, r0 ldrb r0, [r3] cmp r0, 0 - bne _08011798 + bne @08011798 subs r7, 0x1 adds r0, r5, r7 strb r1, [r0] @@ -18062,10 +18062,10 @@ _08011722: strb r1, [r6] mov r0, r12 strb r0, [r3] - b _080117A6 + b @080117A6 .align 2, 0 .pool -_08011798: +@08011798: ldr r0, =0x03005000 ldr r1, =0x00000ce6 adds r0, r1 @@ -18073,11 +18073,11 @@ _08011798: adds r1, r4, 0 orrs r1, r2 strb r1, [r0] -_080117A6: +@080117A6: ldr r0, =0x03004140 ldrh r1, [r0, 0x14] cmp r4, r1 - beq _080117F6 + beq @080117F6 ldr r2, =0x03005000 ldr r7, =0x00000ce3 adds r3, r2, r7 @@ -18090,38 +18090,38 @@ _080117A6: adds r2, r0 movs r0, 0x2 strb r0, [r2] - b _080117F6 + b @080117F6 .align 2, 0 .pool -_080117DC: +@080117DC: bl sub_800F7DC ldrb r1, [r0, 0xA] movs r0, 0x7F ands r0, r1 cmp r0, 0x54 - bne _080117F6 + bne @080117F6 ldr r0, =0x03004140 ldrb r0, [r0] bl rfu_REQ_disconnect bl rfu_waitREQComplete -_080117F6: +@080117F6: ldr r0, =0x03004140 ldrh r0, [r0, 0x14] bl sub_80115EC - b _08011A42 + b @08011A42 .align 2, 0 .pool -_08011804: +@08011804: bl sub_800F7DC ldrb r1, [r0, 0xA] movs r0, 0x7F ands r0, r1 cmp r0, 0x45 - beq _08011836 + beq @08011836 ldr r4, =0x03004140 ldrb r0, [r4, 0x1] cmp r0, 0x1 - bls _08011836 + bls @08011836 ldrb r0, [r4, 0x14] bl sub_800E87C movs r1, 0x80 @@ -18133,38 +18133,38 @@ _08011804: adds r0, r1, 0 bl rfu_REQ_disconnect bl rfu_waitREQComplete -_08011836: +@08011836: ldr r1, =0x03005000 ldrh r0, [r1, 0x4] cmp r0, 0xF - beq _08011840 - b _08011A42 -_08011840: + beq @08011840 + b @08011A42 +@08011840: movs r0, 0x10 strh r0, [r1, 0x4] - b _08011A42 + b @08011A42 .align 2, 0 .pool -_08011850: +@08011850: ldr r0, =0x03005000 ldr r1, =0x03004140 ldrh r1, [r1, 0x14] ldr r2, =0x00000ccd adds r0, r2 - b _08011A40 + b @08011A40 .align 2, 0 .pool -_08011868: +@08011868: ldr r0, =0x03005000 ldr r1, =0x03004140 ldrh r1, [r1, 0x14] ldr r7, =0x00000c3e adds r0, r7 ldrb r2, [r0] - b _08011A40 + b @08011A40 .align 2, 0 .pool -_08011884: +@08011884: ldr r1, =0x03005000 movs r0, 0x12 strh r0, [r1, 0x4] @@ -18172,21 +18172,21 @@ _08011884: adds r1, r0 ldrb r0, [r1] cmp r0, 0x1 - bhi _080118B0 + bhi @080118B0 adds r0, 0x1 strb r0, [r1] ldr r0, =sub_801209C + 1 movs r1, 0x2 bl AddTask - b _08011A42 + b @08011A42 .align 2, 0 .pool -_080118B0: +@080118B0: movs r0, 0x2 movs r1, 0x23 bl sub_8011A64 - b _08011A42 -_080118BA: + b @08011A42 +@080118BA: ldr r4, =0x03005000 movs r0, 0xD strh r0, [r4, 0x4] @@ -18202,30 +18202,30 @@ _080118BA: adds r2, r4, 0 movs r3, 0x46 bl rfu_setRecvBuffer - b _08011A42 + b @08011A42 .align 2, 0 .pool -_080118EC: +@080118EC: movs r0, 0x2 movs r1, 0x25 bl sub_8011A64 - b _08011A42 -_080118F6: + b @08011A42 +@080118F6: ldr r0, =0x03004140 ldrb r1, [r0] ldrh r0, [r0, 0x14] ands r1, r0 cmp r1, 0 - bne _08011904 - b _08011A42 -_08011904: + bne @08011904 + b @08011A42 +@08011904: ldr r0, =0x03005000 adds r0, 0xF0 movs r1, 0x1 - b _08011A40 + b @08011A40 .align 2, 0 .pool -_08011914: +@08011914: ldr r2, =0x03005000 adds r1, r2, 0 adds r1, 0xF0 @@ -18235,38 +18235,38 @@ _08011914: ldr r0, [r0] ldrb r0, [r0] cmp r0, 0 - beq _0801192A - b _08011A42 -_0801192A: + beq @0801192A + b @08011A42 +@0801192A: ldr r7, =0x00000c3c adds r0, r2, r7 ldrb r1, [r0] movs r1, 0x1 - b _08011A40 + b @08011A40 .align 2, 0 .pool -_08011940: +@08011940: ldr r0, =0x03005000 adds r0, 0xF0 movs r1, 0x2 strb r1, [r0] -_08011948: +@08011948: ldr r2, =0x03005000 adds r1, r2, 0 adds r1, 0xF0 ldrb r0, [r1] cmp r0, 0x2 - beq _08011958 + beq @08011958 movs r0, 0x4 strb r0, [r1] -_08011958: +@08011958: ldrb r0, [r2, 0xC] cmp r0, 0x1 - bne _08011996 + bne @08011996 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 - bne _080119B4 + bne @080119B4 ldr r0, =0x00000ce2 adds r2, r0 ldr r0, =0x03004140 @@ -18275,63 +18275,63 @@ _08011958: bics r0, r1 strb r0, [r2] cmp r0, 0 - bne _08011990 + bne @08011990 adds r0, r4, 0 bl sub_8011170 - b _080119B4 + b @080119B4 .align 2, 0 .pool -_08011990: +@08011990: bl sub_80111FC - b _080119B4 -_08011996: + b @080119B4 +@08011996: ldr r1, =0x00000ce4 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x2 - beq _080119B4 + beq @080119B4 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 - bne _080119B4 + bne @080119B4 adds r0, r4, 0 bl sub_8011170 movs r0, 0 bl sub_800C27C -_080119B4: +@080119B4: ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0xFF - bne _080119DA + bne @080119DA ldr r0, =0x03004140 ldrb r0, [r0, 0x7] cmp r0, 0 - bne _080119DA + bne @080119DA ldr r0, =sub_800EB44 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080119DA + bne @080119DA ldr r1, =0x03005000 movs r0, 0x11 strh r0, [r1, 0x4] -_080119DA: +@080119DA: movs r0, 0x2 adds r1, r4, 0 bl sub_8011A64 - b _08011A42 + b @08011A42 .align 2, 0 .pool -_080119FC: +@080119FC: ldr r0, =0x03005000 ldr r2, =0x00000ce3 adds r0, r2 - b _08011A3E + b @08011A3E .align 2, 0 .pool -_08011A0C: +@08011A0C: movs r0, 0x1 movs r1, 0xF3 bl sub_8011A64 @@ -18340,10 +18340,10 @@ _08011A0C: ldr r0, =0x03005000 adds r0, 0xEF movs r1, 0x1 - b _08011A40 + b @08011A40 .align 2, 0 .pool -_08011A28: +@08011A28: adds r0, r4, 0 bl sub_8011170 movs r0, 0x1 @@ -18353,11 +18353,11 @@ _08011A28: ldr r7, =0x00000cdb adds r0, r7 ldrb r1, [r0] -_08011A3E: +@08011A3E: movs r1, 0 -_08011A40: +@08011A40: strb r1, [r0] -_08011A42: +@08011A42: pop {r4-r7} pop {r0} bx r0 @@ -18366,7 +18366,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 @@ -18378,7 +18378,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 @@ -18390,7 +18390,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] @@ -18400,25 +18400,25 @@ 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 lsrs r0, 24 subs r0, 0x1 cmp r0, 0x1 - bls _08011A94 + bls @08011A94 movs r0, 0 - b _08011A96 -_08011A94: + b @08011A96 +@08011A94: movs r0, 0x1 -_08011A96: +@08011A96: pop {r1} bx r1 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 @@ -18429,7 +18429,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 @@ -18438,7 +18438,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} @@ -18446,7 +18446,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 @@ -18463,7 +18463,7 @@ sub_8011AC8: @ 8011AC8 thumb_func_end sub_8011AC8 thumb_func_start sub_8011AE8 -sub_8011AE8: @ 8011AE8 +sub_8011AE8: ; 8011AE8 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -18473,7 +18473,7 @@ sub_8011AE8: @ 8011AE8 thumb_func_end sub_8011AE8 thumb_func_start sub_8011AFC -sub_8011AFC: @ 8011AFC +sub_8011AFC: ; 8011AFC push {r4,lr} bl reset_all_obj_data bl gpu_pal_allocator_reset @@ -18484,7 +18484,7 @@ sub_8011AFC: @ 8011AFC bl sub_80093CC lsls r0, 24 cmp r0, 0 - beq _08011B70 + beq @08011B70 ldr r1, =0x020229c6 ldr r2, =0x00001111 adds r0, r2, 0 @@ -18495,7 +18495,7 @@ sub_8011AFC: @ 8011AFC ldrh r0, [r0, 0x24] bl SeedRng movs r4, 0 -_08011B38: +@08011B38: bl GenerateRandomNumber ldr r1, =0x03005d90 ldr r1, [r1] @@ -18504,7 +18504,7 @@ _08011B38: strb r0, [r1] adds r4, 0x1 cmp r4, 0x3 - ble _08011B38 + ble @08011B38 movs r1, 0xAA lsls r1, 5 movs r0, 0 @@ -18516,7 +18516,7 @@ _08011B38: bl sub_8011BA4 ldr r0, =sub_8011BF8 + 1 bl set_callback2 -_08011B70: +@08011B70: pop {r4} pop {r0} bx r0 @@ -18525,7 +18525,7 @@ _08011B70: thumb_func_end sub_8011AFC thumb_func_start sub_8011B90 -sub_8011B90: @ 8011B90 +sub_8011B90: ; 8011B90 push {lr} ldr r0, =sub_800EB44 + 1 bl is_function_an_active_task @@ -18538,21 +18538,21 @@ 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 + 1 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _08011BC2 + bne @08011BC2 adds r0, r4, 0 movs r1, 0 bl AddTask ldr r1, =0x03005000 adds r1, 0x66 strb r0, [r1] -_08011BC2: +@08011BC2: pop {r4} pop {r0} bx r0 @@ -18561,19 +18561,19 @@ _08011BC2: thumb_func_end sub_8011BA4 thumb_func_start sub_8011BD0 -sub_8011BD0: @ 8011BD0 +sub_8011BD0: ; 8011BD0 push {lr} ldr r0, =nullsub_89 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08011BEA + bne @08011BEA ldr r0, =0x03005000 adds r0, 0x66 ldrb r0, [r0] bl remove_task -_08011BEA: +@08011BEA: pop {r0} bx r0 .align 2, 0 @@ -18581,7 +18581,7 @@ _08011BEA: thumb_func_end sub_8011BD0 thumb_func_start sub_8011BF8 -sub_8011BF8: @ 8011BF8 +sub_8011BF8: ; 8011BF8 push {lr} bl run_active_tasks bl call_obj_callbacks @@ -18592,7 +18592,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 @@ -18623,7 +18623,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 @@ -18640,7 +18640,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 @@ -18674,7 +18674,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] @@ -18683,7 +18683,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 @@ -18699,7 +18699,7 @@ sub_8011CE4: @ 8011CE4 movs r7, 0 ldr r1, =0x03007890 mov r8, r1 -_08011D02: +@08011D02: lsls r4, r7, 5 adds r5, r4, 0 adds r5, 0x14 @@ -18716,7 +18716,7 @@ _08011D02: ldrh r0, [r0, 0x18] bl sub_8010454 cmp r0, 0 - beq _08011D4C + beq @08011D4C mov r0, r8 ldr r1, [r0] adds r1, r5 @@ -18724,23 +18724,23 @@ _08011D02: ldr r0, [sp] bl sub_8008C44 cmp r0, 0 - bne _08011D4C + bne @08011D4C cmp r10, r6 - bne _08011D4C + bne @08011D4C mov r9, r7 mov r1, r8 ldr r0, [r1] adds r0, r4 ldrb r0, [r0, 0x16] cmp r0, 0xFF - bne _08011D56 -_08011D4C: + bne @08011D56 +@08011D4C: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x3 - bls _08011D02 -_08011D56: + bls @08011D02 +@08011D56: mov r0, r9 add sp, 0x4 pop {r3-r5} @@ -18755,7 +18755,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 @@ -18790,7 +18790,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 @@ -18798,51 +18798,51 @@ sub_8011DC0: @ 8011DC0 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xFF - beq _08011DDA + beq @08011DDA movs r0, 0x1 lsls r0, r1 bl sub_8011D6C -_08011DDA: +@08011DDA: pop {r0} bx r0 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 - beq _08011E20 + beq @08011E20 movs r3, 0 movs r2, 0 ldr r5, =0x03005cde adds r6, r5, 0x4 -_08011DF0: +@08011DF0: adds r0, r2, r5 ldrb r0, [r0] cmp r0, r4 - bne _08011E0E + bne @08011E0E ldrb r0, [r6] asrs r0, r2 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08011E0E + beq @08011E0E adds r0, r1, 0 lsls r0, r2 orrs r3, r0 lsls r0, r3, 24 lsrs r3, r0, 24 -_08011E0E: +@08011E0E: adds r2, 0x1 cmp r2, 0x3 - ble _08011DF0 + ble @08011DF0 cmp r3, 0 - beq _08011E20 + beq @08011E20 adds r0, r3, 0 movs r1, 0x2 bl sub_8011E94 -_08011E20: +@08011E20: pop {r4-r6} pop {r0} bx r0 @@ -18851,20 +18851,20 @@ _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 ldr r6, =0x03003110 ldrh r0, [r6] cmp r0, 0 - bne _08011E7A + bne @08011E7A ldr r5, =0x03005000 ldr r1, =0x00000ce8 adds r0, r5, r1 ldrb r0, [r0] cmp r0, 0 - bne _08011E7A + bne @08011E7A movs r0, 0xED lsls r0, 8 bl sub_800FD14 @@ -18889,7 +18889,7 @@ sub_8011E2C: @ 8011E2C strh r0, [r6, 0x6] adds r0, r4, 0 bl remove_task -_08011E7A: +@08011E7A: pop {r4-r6} pop {r0} bx r0 @@ -18898,7 +18898,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 @@ -18908,7 +18908,7 @@ sub_8011E94: @ 8011E94 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - bne _08011ECC + bne @08011ECC adds r0, r5, 0 movs r1, 0x5 bl AddTask @@ -18920,10 +18920,10 @@ sub_8011E94: @ 8011E94 lsls r0, 3 adds r0, r1 strh r4, [r0, 0x8] - b _08011EDC + b @08011EDC .align 2, 0 .pool -_08011ECC: +@08011ECC: ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -18932,7 +18932,7 @@ _08011ECC: ldrh r0, [r1, 0x8] orrs r4, r0 strh r4, [r1, 0x8] -_08011EDC: +@08011EDC: ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 @@ -18947,7 +18947,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 @@ -18959,7 +18959,7 @@ sub_8011EF4: @ 8011EF4 bl sub_800EE94 lsls r0, 24 cmp r0, 0 - beq _08011FA4 + beq @08011FA4 adds r0, r4, 0 adds r0, 0x10 bl sub_8011CD8 @@ -18971,47 +18971,47 @@ sub_8011EF4: @ 8011EF4 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq _08011F8C + beq @08011F8C ldr r0, =0x03007890 ldr r0, [r0] lsls r1, r2, 5 adds r0, r1 ldrb r0, [r0, 0x16] cmp r0, 0xFF - beq _08011F5C + beq @08011F5C ldr r0, =0x03005000 ldr r1, =0x00000c3d adds r0, r1 strb r2, [r0] bl sub_800EEBC cmp r0, 0 - beq _08011FAA - b _08011F84 + beq @08011FAA + b @08011F84 .align 2, 0 .pool -_08011F5C: +@08011F5C: bl sub_800F7DC ldrb r1, [r0, 0xA] movs r5, 0x7F adds r0, r5, 0 ands r0, r1 cmp r0, 0x15 - beq _08011FA4 + beq @08011FA4 bl sub_800F7DC ldrb r1, [r0, 0xA] adds r0, r5, 0 ands r0, r1 cmp r0, 0x16 - beq _08011FA4 + beq @08011FA4 movs r1, 0xE0 lsls r1, 7 movs r0, 0x2 bl sub_8011A64 -_08011F84: +@08011F84: adds r0, r6, 0 bl remove_task - b _08011FAA -_08011F8C: + b @08011FAA +@08011F8C: ldrh r0, [r4, 0x1E] adds r0, 0x1 strh r0, [r4, 0x1E] @@ -19019,32 +19019,32 @@ _08011F8C: ldr r1, =0x00000c3d adds r0, r1 strb r2, [r0] - b _08011FAA + b @08011FAA .align 2, 0 .pool -_08011FA4: +@08011FA4: ldrh r0, [r4, 0x1E] adds r0, 0x1 strh r0, [r4, 0x1E] -_08011FAA: +@08011FAA: movs r1, 0x1E ldrsh r0, [r4, r1] cmp r0, 0xF0 - ble _08011FC2 + ble @08011FC2 movs r1, 0xE0 lsls r1, 7 movs r0, 0x2 bl sub_8011A64 adds r0, r6, 0 bl remove_task -_08011FC2: +@08011FC2: pop {r4-r6} pop {r0} bx r0 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 @@ -19075,7 +19075,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 @@ -19086,23 +19086,23 @@ sub_801200C: @ 801200C adds r0, r2, 0 ands r0, r1 cmp r0, 0x45 - bne _08012032 + bne @08012032 ldrb r1, [r4, 0xA] adds r0, r2, 0 ands r0, r1 cmp r0, 0x45 - beq _08012092 -_0801202E: + beq @08012092 +@0801202E: movs r0, 0x1 - b _08012094 -_08012032: + b @08012094 +@08012032: ldrb r1, [r4, 0xA] adds r0, r2, 0 ands r0, r1 cmp r0, 0x40 - bne _0801202E + bne @0801202E cmp r5, 0x44 - bne _08012092 + bne @08012092 ldr r5, =0x0300510a ldrh r0, [r5, 0x8] ldr r3, =0x000003ff @@ -19111,21 +19111,21 @@ _08012032: movs r0, 0xCE lsls r0, 1 cmp r2, r0 - bne _08012068 + bne @08012068 ldrh r1, [r4, 0x8] adds r0, r3, 0 ands r0, r1 cmp r0, r2 - beq _08012092 - b _0801202E + beq @08012092 + b @0801202E .align 2, 0 .pool -_08012068: +@08012068: ldrh r1, [r4, 0x8] adds r0, r3, 0 ands r0, r1 cmp r0, r2 - bne _0801202E + bne @0801202E ldrb r2, [r4, 0xB] movs r0, 0xFE ldrb r3, [r5, 0xB] @@ -19133,7 +19133,7 @@ _08012068: ands r1, r2 ands r0, r3 cmp r1, r0 - bne _0801202E + bne @0801202E ldrb r2, [r4, 0x9] movs r0, 0xFC ldrb r3, [r5, 0x9] @@ -19141,17 +19141,17 @@ _08012068: ands r1, r2 ands r0, r3 cmp r1, r0 - bne _0801202E -_08012092: + bne @0801202E +@08012092: movs r0, 0 -_08012094: +@08012094: pop {r4,r5} pop {r1} bx r1 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} @@ -19163,10 +19163,10 @@ sub_801209C: @ 801209C adds r0, 0xF1 ldrb r0, [r0] cmp r0, 0x4 - bne _080120BA + bne @080120BA adds r0, r5, 0 bl remove_task -_080120BA: +@080120BA: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -19179,23 +19179,23 @@ _080120BA: movs r1, 0x96 lsls r1, 17 cmp r0, r1 - ble _080120E4 + ble @080120E4 movs r1, 0xE0 lsls r1, 7 movs r0, 0x2 bl sub_8011A64 adds r0, r5, 0 bl remove_task -_080120E4: +@080120E4: ldr r1, =0x00000ccd adds r0, r6, r1 ldrb r0, [r0] cmp r0, 0 - beq _0801217C + beq @0801217C ldr r0, =0x03004140 ldrb r0, [r0, 0x6] cmp r0, 0 - bne _0801217C + bne @0801217C movs r2, 0x86 lsls r2, 1 adds r0, r6, r2 @@ -19209,7 +19209,7 @@ _080120E4: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq _0801217C + beq @0801217C movs r1, 0xA ldrsh r0, [r4, r1] ldr r7, =0x03007890 @@ -19221,33 +19221,33 @@ _080120E4: adds r1, 0x6 bl sub_801200C cmp r0, 0 - bne _0801216C + bne @0801216C ldr r0, [r7] adds r1, r0, r4 ldrb r0, [r1, 0x16] cmp r0, 0xFF - beq _0801217C + beq @0801217C ldrh r0, [r1, 0x14] movs r1, 0x5A bl mega_func_4 lsls r0, 24 cmp r0, 0 - bne _0801217C + bne @0801217C movs r0, 0xA strh r0, [r6, 0x4] adds r0, r5, 0 bl remove_task - b _0801217C + b @0801217C .align 2, 0 .pool -_0801216C: +@0801216C: movs r1, 0xE0 lsls r1, 7 movs r0, 0x2 bl sub_8011A64 mov r0, r8 bl remove_task -_0801217C: +@0801217C: pop {r3} mov r8, r3 pop {r4-r7} @@ -19256,7 +19256,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 @@ -19298,89 +19298,89 @@ sub_8012188: @ 8012188 lsrs r1, r0, 24 adds r2, r1, 0 cmp r4, 0x45 - bne _08012210 + bne @08012210 cmp r1, 0xFF - beq _0801221E + beq @0801221E lsls r0, r1, 2 adds r0, r1 lsls r0, 3 adds r0, r5 movs r1, 0x1 strh r1, [r0, 0x16] - b _0801221E + b @0801221E .align 2, 0 .pool -_08012210: +@08012210: cmp r2, 0xFF - beq _0801221E + beq @0801221E lsls r0, r2, 2 adds r0, r2 lsls r0, 3 adds r0, r5 strh r7, [r0, 0x16] -_0801221E: +@0801221E: pop {r4-r7} pop {r0} bx r0 thumb_func_end sub_8012188 thumb_func_start sub_8012224 -sub_8012224: @ 8012224 +sub_8012224: ; 8012224 push {lr} ldr r0, =0x03005000 adds r0, 0xF0 ldrb r0, [r0] cmp r0, 0x1 - beq _08012238 + beq @08012238 movs r0, 0 - b _0801223A + b @0801223A .align 2, 0 .pool -_08012238: +@08012238: movs r0, 0x1 -_0801223A: +@0801223A: pop {r1} bx r1 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 ldrb r2, [r0] ldr r4, =0x03005cd1 movs r3, 0x1 -_0801224C: +@0801224C: adds r0, r2, 0 asrs r0, r1 ands r0, r3 cmp r0, 0 - beq _0801226C + beq @0801226C adds r0, r1, r4 ldrb r0, [r0] cmp r0, 0 - bne _0801226C + bne @0801226C movs r0, 0 - b _08012274 + b @08012274 .align 2, 0 .pool -_0801226C: +@0801226C: adds r1, 0x1 cmp r1, 0x3 - ble _0801224C + ble @0801224C movs r0, 0x1 -_08012274: +@08012274: pop {r4} pop {r1} bx r1 thumb_func_end sub_8012240 thumb_func_start sub_801227C -sub_801227C: @ 801227C +sub_801227C: ; 801227C push {r4,lr} movs r4, 0 -_08012280: +@08012280: lsls r2, r4, 24 lsrs r2, 24 ldr r0, =0x082ed82c @@ -19388,7 +19388,7 @@ _08012280: bl nullsub_5 adds r4, 0x1 cmp r4, 0x13 - ble _08012280 + ble @08012280 pop {r4} pop {r0} bx r0 @@ -19397,7 +19397,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} @@ -19424,18 +19424,18 @@ sub_801229C: @ 801229C ldr r0, =0x03005000 ldrb r0, [r0, 0xC] cmp r0, 0x1 - bne _08012378 + bne @08012378 movs r6, 0 adds r7, r4, 0 movs r5, 0x14 -_080122E0: +@080122E0: ldr r2, [r7] ldrb r0, [r2, 0x7] asrs r0, r6 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0801231E + beq @0801231E lsls r0, r6, 5 adds r0, r2, r0 ldrh r0, [r0, 0x18] @@ -19457,15 +19457,15 @@ _080122E0: movs r1, 0x16 adds r2, r4, 0 bl nullsub_5 -_0801231E: +@0801231E: adds r5, 0x20 adds r6, 0x1 cmp r6, 0x3 - ble _080122E0 + ble @080122E0 movs r6, 0 ldr r0, =0x03005000 mov r8, r0 -_0801232C: +@0801232C: movs r5, 0 adds r7, r6, 0x1 lsls r0, r6, 3 @@ -19477,7 +19477,7 @@ _0801232C: adds r1, 0x14 adds r4, r0, r1 lsls r6, r2, 24 -_08012342: +@08012342: ldrb r0, [r4] lsls r1, r5, 25 lsrs r1, 24 @@ -19487,29 +19487,29 @@ _08012342: adds r4, 0x1 adds r5, 0x1 cmp r5, 0xD - ble _08012342 + ble @08012342 adds r6, r7, 0 cmp r6, 0x3 - ble _0801232C + ble @0801232C ldr r0, =0x082ed868 movs r1, 0x1 movs r2, 0xF bl nullsub_5 - b _080124AA + b @080124AA .align 2, 0 .pool -_08012378: +@08012378: ldr r1, [r4] ldrb r0, [r1, 0x2] cmp r0, 0 - beq _08012414 + beq @08012414 ldrb r0, [r1, 0x7] cmp r0, 0 - beq _08012414 + beq @08012414 movs r6, 0 movs r5, 0xC0 lsls r5, 18 -_0801238C: +@0801238C: lsrs r4, r5, 24 movs r0, 0 movs r1, 0x1 @@ -19529,7 +19529,7 @@ _0801238C: adds r5, r1 adds r6, 0x1 cmp r6, 0x3 - ble _0801238C + ble @0801238C ldr r5, =0x03007890 ldr r1, [r5] ldr r4, =0x03005000 @@ -19561,26 +19561,26 @@ _0801238C: movs r1, 0x16 movs r2, 0x3 bl nullsub_5 - b _080124AA + b @080124AA .align 2, 0 .pool -_08012414: +@08012414: movs r6, 0 ldr r1, =0x03007890 ldr r0, [r1] ldrb r0, [r0, 0x8] cmp r6, r0 - bge _08012470 + bge @08012470 adds r7, r1, 0 movs r1, 0x14 mov r8, r1 -_08012426: +@08012426: ldr r0, [r7] lsls r5, r6, 5 adds r1, r0, r5 ldrb r0, [r1, 0x16] cmp r0, 0xFF - beq _08012462 + beq @08012462 ldrh r0, [r1, 0x18] adds r4, r6, 0x3 lsls r4, 24 @@ -19602,22 +19602,22 @@ _08012426: movs r1, 0x16 adds r2, r4, 0 bl nullsub_5 -_08012462: +@08012462: movs r0, 0x20 add r8, r0 adds r6, 0x1 ldr r0, [r7] ldrb r0, [r0, 0x8] cmp r6, r0 - blt _08012426 -_08012470: + blt @08012426 +@08012470: cmp r6, 0x3 - bgt _080124AA + bgt @080124AA lsls r0, r6, 24 movs r1, 0xC0 lsls r1, 18 adds r5, r0, r1 -_0801247C: +@0801247C: lsrs r4, r5, 24 movs r0, 0 movs r1, 0x1 @@ -19637,8 +19637,8 @@ _0801247C: adds r5, r0 adds r6, 0x1 cmp r6, 0x3 - ble _0801247C -_080124AA: + ble @0801247C +@080124AA: pop {r3} mov r8, r3 pop {r4-r7} @@ -19649,7 +19649,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 @@ -19660,7 +19660,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 @@ -19671,12 +19671,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 @@ -19693,57 +19693,57 @@ sub_80124EC: @ 80124EC movs r0, 0x90 lsls r0, 6 cmp r4, r0 - beq _08012588 + beq @08012588 cmp r4, r0 - bgt _08012526 + bgt @08012526 movs r0, 0x80 lsls r0, 2 cmp r4, r0 - beq _08012538 + beq @08012538 movs r0, 0x80 lsls r0, 3 cmp r4, r0 - beq _08012544 - b _080125A6 -_08012526: + beq @08012544 + b @080125A6 +@08012526: movs r0, 0x94 lsls r0, 6 cmp r4, r0 - beq _08012554 + beq @08012554 movs r0, 0xD4 lsls r0, 6 cmp r4, r0 - beq _08012564 - b _080125A6 -_08012538: + beq @08012564 + b @080125A6 +@08012538: ldr r1, =0x082edb60 subs r0, r5, 0x1 lsls r0, 2 - b _0801256C + b @0801256C .align 2, 0 .pool -_08012544: +@08012544: ldr r1, =0x082edb60 subs r0, r5, 0x1 lsls r0, 2 adds r1, 0x14 - b _0801256C + b @0801256C .align 2, 0 .pool -_08012554: +@08012554: ldr r1, =0x082edb60 subs r0, r5, 0x1 lsls r0, 2 adds r1, 0x28 - b _0801256C + b @0801256C .align 2, 0 .pool -_08012564: +@08012564: ldr r1, =0x082edb60 subs r0, r5, 0x1 lsls r0, 2 adds r1, 0x3C -_0801256C: +@0801256C: adds r0, r1 ldr r2, [r0] movs r0, 0x1 @@ -19754,10 +19754,10 @@ _0801256C: movs r1, 0x1 movs r3, 0 bl sub_80173E0 - b _080125A6 + b @080125A6 .align 2, 0 .pool -_08012588: +@08012588: ldr r1, =0x082edb60 subs r0, r5, 0x1 lsls r0, 2 @@ -19772,7 +19772,7 @@ _08012588: movs r1, 0x1 movs r3, 0 bl sub_80173E0 -_080125A6: +@080125A6: adds r0, r6, 0 movs r1, 0x2 bl Window_CopyToVram @@ -19785,7 +19785,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} @@ -19838,55 +19838,55 @@ 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 subs r0, r1, 0x1 cmp r0, 0x1B - bhi _080126C0 + bhi @080126C0 lsls r0, 2 - ldr r1, =_08012648 + ldr r1, =@08012648 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08012648: - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126C0 - .4byte _080126C0 - .4byte _080126C0 - .4byte _080126C0 - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126C0 - .4byte _080126C0 - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126C0 - .4byte _080126C0 - .4byte _080126C0 - .4byte _080126C0 - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126B8 -_080126B8: +@08012648: + .4byte @080126B8 + .4byte @080126B8 + .4byte @080126B8 + .4byte @080126B8 + .4byte @080126C0 + .4byte @080126C0 + .4byte @080126C0 + .4byte @080126C0 + .4byte @080126B8 + .4byte @080126B8 + .4byte @080126B8 + .4byte @080126C0 + .4byte @080126C0 + .4byte @080126B8 + .4byte @080126B8 + .4byte @080126B8 + .4byte @080126C0 + .4byte @080126C0 + .4byte @080126C0 + .4byte @080126C0 + .4byte @080126B8 + .4byte @080126B8 + .4byte @080126B8 + .4byte @080126B8 + .4byte @080126B8 + .4byte @080126B8 + .4byte @080126B8 + .4byte @080126B8 +@080126B8: ldr r0, =0x02021fc4 ldr r1, =0x082ed960 bl ExpandTextCodes -_080126C0: +@080126C0: pop {r0} bx r0 .align 2, 0 @@ -19894,51 +19894,51 @@ _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 - bhi _08012734 + bhi @08012734 lsls r0, 2 - ldr r1, =_080126E4 + ldr r1, =@080126E4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080126E4: - .4byte _08012730 - .4byte _08012730 - .4byte _08012730 - .4byte _08012734 - .4byte _08012734 - .4byte _08012734 - .4byte _08012730 - .4byte _08012730 - .4byte _08012734 - .4byte _08012734 - .4byte _08012734 - .4byte _08012734 - .4byte _08012734 - .4byte _08012734 - .4byte _08012730 - .4byte _08012730 - .4byte _08012730 - .4byte _08012730 - .4byte _08012730 -_08012730: +@080126E4: + .4byte @08012730 + .4byte @08012730 + .4byte @08012730 + .4byte @08012734 + .4byte @08012734 + .4byte @08012734 + .4byte @08012730 + .4byte @08012730 + .4byte @08012734 + .4byte @08012734 + .4byte @08012734 + .4byte @08012734 + .4byte @08012734 + .4byte @08012734 + .4byte @08012730 + .4byte @08012730 + .4byte @08012730 + .4byte @08012730 + .4byte @08012730 +@08012730: movs r0, 0x1 - b _08012736 -_08012734: + b @08012736 +@08012734: movs r0, 0 -_08012736: +@08012736: pop {r1} bx r1 thumb_func_end sub_80126CC thumb_func_start sub_801273C -sub_801273C: @ 801273C +sub_801273C: ; 801273C push {lr} ldr r0, =sub_8012780 + 1 movs r1, 0 @@ -19966,7 +19966,7 @@ sub_801273C: @ 801273C thumb_func_end sub_801273C thumb_func_start sub_8012780 -sub_8012780: @ 8012780 +sub_8012780: ; 8012780 push {r4-r7,lr} mov r7, r8 push {r7} @@ -19977,55 +19977,55 @@ sub_8012780: @ 8012780 ldr r6, [r0] ldrb r0, [r6, 0xC] cmp r0, 0x1E - bls _0801279A - bl _08012F50 -_0801279A: + bls @0801279A + bl @08012F50 +@0801279A: lsls r0, 2 - ldr r1, =_080127AC + ldr r1, =@080127AC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080127AC: - .4byte _08012828 - .4byte _08012F50 - .4byte _08012F50 - .4byte _080128A0 - .4byte _080129C8 - .4byte _08012A50 - .4byte _08012A6C - .4byte _08012B8C - .4byte _08012F50 - .4byte _08012AFC - .4byte _08012B14 - .4byte _08012BA8 - .4byte _08012C5C - .4byte _08012D5A - .4byte _08012D78 - .4byte _08012D8A - .4byte _08012DA8 - .4byte _08012E62 - .4byte _08012E78 - .4byte _08012DF2 - .4byte _08012E10 - .4byte _08012ED0 - .4byte _08012EFC - .4byte _08012ED0 - .4byte _08012EE6 - .4byte _08012F50 - .4byte _08012F14 - .4byte _08012F50 - .4byte _08012F50 - .4byte _08012B54 - .4byte _08012EB6 -_08012828: +@080127AC: + .4byte @08012828 + .4byte @08012F50 + .4byte @08012F50 + .4byte @080128A0 + .4byte @080129C8 + .4byte @08012A50 + .4byte @08012A6C + .4byte @08012B8C + .4byte @08012F50 + .4byte @08012AFC + .4byte @08012B14 + .4byte @08012BA8 + .4byte @08012C5C + .4byte @08012D5A + .4byte @08012D78 + .4byte @08012D8A + .4byte @08012DA8 + .4byte @08012E62 + .4byte @08012E78 + .4byte @08012DF2 + .4byte @08012E10 + .4byte @08012ED0 + .4byte @08012EFC + .4byte @08012ED0 + .4byte @08012EE6 + .4byte @08012F50 + .4byte @08012F14 + .4byte @08012F50 + .4byte @08012F50 + .4byte @08012B54 + .4byte @08012EB6 +@08012828: ldr r0, =0x020375e0 ldrh r2, [r0] adds r3, r0, 0 cmp r2, 0x14 - bne _08012848 + bne @08012848 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000ca9 @@ -20034,10 +20034,10 @@ _08012828: movs r0, 0x3 ands r0, r1 cmp r0, 0x1 - bne _08012848 + bne @08012848 adds r0, r2, 0x1 strh r0, [r3] -_08012848: +@08012848: ldr r2, =0x02022c2c ldr r1, =0x082f00c4 ldrh r0, [r3] @@ -20064,10 +20064,10 @@ _08012848: bl sub_8011C10 movs r0, 0x3 strb r0, [r6, 0xC] - b _08012F50 + b @08012F50 .align 2, 0 .pool -_080128A0: +@080128A0: movs r0, 0x70 bl malloc_and_clear str r0, [r6, 0x4] @@ -20118,25 +20118,25 @@ _080128A0: movs r1, 0xF ands r1, r0 cmp r1, 0x2 - blt _08012938 + blt @08012938 cmp r1, 0x4 - ble _08012928 + ble @08012928 cmp r1, 0x5 - beq _08012930 - b _08012938 + beq @08012930 + b @08012938 .align 2, 0 .pool -_08012928: +@08012928: ldr r0, =0x082f011c - b _08012932 + b @08012932 .align 2, 0 .pool -_08012930: +@08012930: ldr r0, =0x082f0124 -_08012932: +@08012932: bl Window_AddFromTemplate strb r0, [r6, 0xF] -_08012938: +@08012938: ldr r0, =0x082f012c bl Window_AddFromTemplate strb r0, [r6, 0x11] @@ -20187,10 +20187,10 @@ _08012938: mov r5, r8 strb r5, [r6, 0x13] strb r4, [r6, 0xC] - b _08012F50 + b @08012F50 .align 2, 0 .pool -_080129C8: +@080129C8: ldr r0, =0x02021cc4 ldr r2, =0x082f0048 ldr r4, =0x02022c2c @@ -20203,33 +20203,33 @@ _080129C8: ldrb r2, [r0] lsrs r0, r2, 4 cmp r0, 0 - beq _08012A2C + beq @08012A2C ldrb r1, [r6, 0x13] subs r0, 0x1 cmp r1, r0 - ble _08012A18 + ble @08012A18 movs r0, 0xF ands r0, r2 cmp r0, 0 - beq _08012A18 + beq @08012A18 ldr r0, =0x02021fc4 ldr r1, =0x082ed990 bl ExpandTextCodes - b _08012A34 + b @08012A34 .align 2, 0 .pool -_08012A18: +@08012A18: ldr r0, =0x02021fc4 ldr r1, =0x082ed960 bl ExpandTextCodes - b _08012A34 + b @08012A34 .align 2, 0 .pool -_08012A2C: +@08012A2C: ldr r0, =0x02021fc4 ldrb r1, [r4] bl sub_801262C -_08012A34: +@08012A34: ldrb r0, [r6, 0x11] ldr r1, =0x02022c2d ldrb r1, [r1] @@ -20237,25 +20237,25 @@ _08012A34: bl sub_80124EC movs r0, 0x5 strb r0, [r6, 0xC] - b _08012F50 + b @08012F50 .align 2, 0 .pool -_08012A50: +@08012A50: adds r0, r6, 0 adds r0, 0xD ldr r1, =0x02021fc4 bl sub_8017064 lsls r0, 24 cmp r0, 0 - bne _08012A62 - b _08012F50 -_08012A62: + bne @08012A62 + b @08012F50 +@08012A62: movs r0, 0x6 strb r0, [r6, 0xC] - b _08012F50 + b @08012F50 .align 2, 0 .pool -_08012A6C: +@08012A6C: adds r0, r6, 0 movs r1, 0x7 movs r2, 0xA @@ -20265,91 +20265,91 @@ _08012A6C: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08012AA8 + beq @08012AA8 ldrb r0, [r6, 0x13] cmp r0, 0x1 - bne _08012A90 + bne @08012A90 movs r0, 0x17 - b _08012AA6 + b @08012AA6 .align 2, 0 .pool -_08012A90: +@08012A90: ldr r0, =0x02022c2d ldrb r1, [r0] movs r0, 0xF0 ands r0, r1 cmp r0, 0 - beq _08012AA4 + beq @08012AA4 movs r0, 0x1E - b _08012AA6 + b @08012AA6 .align 2, 0 .pool -_08012AA4: +@08012AA4: movs r0, 0x13 -_08012AA6: +@08012AA6: strb r0, [r6, 0xC] -_08012AA8: +@08012AA8: ldr r0, =0x02022c2d ldrb r2, [r0] lsrs r0, r2, 4 cmp r0, 0 - beq _08012ADE + beq @08012ADE ldrb r1, [r6, 0x13] subs r0, 0x1 cmp r1, r0 - ble _08012ADE + ble @08012ADE movs r4, 0xF adds r0, r4, 0 ands r0, r2 cmp r0, 0 - beq _08012ADE + beq @08012ADE bl sub_8012240 cmp r0, 0 - beq _08012ADE + beq @08012ADE ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _08012ADE + beq @08012ADE strb r4, [r6, 0xC] bl sub_800EF38 -_08012ADE: +@08012ADE: ldrb r0, [r6, 0xC] cmp r0, 0x6 - beq _08012AE6 - b _08012F50 -_08012AE6: + beq @08012AE6 + b @08012F50 +@08012AE6: bl sub_80105EC cmp r0, 0 - bne _08012AF0 - b _08012F50 -_08012AF0: - b _08012C56 + bne @08012AF0 + b @08012F50 +@08012AF0: + b @08012C56 .align 2, 0 .pool -_08012AFC: +@08012AFC: bl sub_80105EC cmp r0, 0 - beq _08012B06 - b _08012F50 -_08012B06: + beq @08012B06 + b @08012F50 +@08012B06: movs r0, 0x6 strb r0, [r6, 0xC] ldr r0, [r6] bl sub_8013398 strb r0, [r6, 0x13] - b _08012F50 -_08012B14: + b @08012F50 +@08012B14: movs r3, 0 ldr r0, =0x02022c2c ldrb r1, [r0] movs r0, 0xF ands r0, r1 cmp r0, 0x2 - bne _08012B24 + bne @08012B24 movs r3, 0x1 -_08012B24: +@08012B24: adds r0, r6, 0 adds r0, 0xD ldr r2, =0x082eddc4 @@ -20359,18 +20359,18 @@ _08012B24: bl sub_8017064 lsls r0, 24 cmp r0, 0 - bne _08012B3C - b _08012F50 -_08012B3C: + bne @08012B3C + b @08012F50 +@08012B3C: ldr r0, [r6] bl sub_8013398 strb r0, [r6, 0x13] ldrb r0, [r6, 0x12] bl sub_81AE70C - b _08012E5C + b @08012E5C .align 2, 0 .pool -_08012B54: +@08012B54: ldr r0, =0x02022c2d ldrb r0, [r0] movs r1, 0xF @@ -20389,30 +20389,30 @@ _08012B54: bl sub_8017064 lsls r0, 24 cmp r0, 0 - bne _08012B7E - b _08012F50 -_08012B7E: + bne @08012B7E + b @08012F50 +@08012B7E: movs r0, 0x15 strb r0, [r6, 0xC] - b _08012F50 + b @08012F50 .align 2, 0 .pool -_08012B8C: +@08012B8C: adds r0, r6, 0 adds r0, 0xD ldr r1, =0x02021fc4 bl sub_8017064 lsls r0, 24 cmp r0, 0 - bne _08012B9E - b _08012F50 -_08012B9E: + bne @08012B9E + b @08012F50 +@08012B9E: movs r0, 0xB strb r0, [r6, 0xC] - b _08012F50 + b @08012F50 .align 2, 0 .pool -_08012BA8: +@08012BA8: adds r4, r6, 0 adds r4, 0xD ldrb r1, [r6, 0x13] @@ -20437,20 +20437,20 @@ _08012BA8: movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _08012C28 + beq @08012C28 cmp r1, r0 - bgt _08012BEC + bgt @08012BEC subs r0, 0x2 cmp r1, r0 - beq _08012C56 - b _08012F50 -_08012BEC: + beq @08012C56 + b @08012F50 +@08012BEC: cmp r1, 0 - beq _08012BF6 + beq @08012BF6 cmp r1, 0x1 - beq _08012C28 - b _08012F50 -_08012BF6: + beq @08012C28 + b @08012F50 +@08012BF6: bl sub_800E0E8 movs r0, 0 movs r1, 0 @@ -20472,8 +20472,8 @@ _08012BF6: adds r2, r0 adds r2, 0x10 movs r0, 0x5 - b _08012C4C -_08012C28: + b @08012C4C +@08012C28: movs r0, 0x6 strb r0, [r6, 0x19] ldrb r1, [r6, 0x13] @@ -20491,16 +20491,16 @@ _08012C28: adds r2, r0 adds r2, 0x10 movs r0, 0x6 -_08012C4C: +@08012C4C: bl sub_8010688 movs r0, 0xC strb r0, [r6, 0xC] - b _08012F50 -_08012C56: + b @08012F50 +@08012C56: movs r0, 0x9 strb r0, [r6, 0xC] - b _08012F50 -_08012C5C: + b @08012F50 +@08012C5C: ldrb r1, [r6, 0x13] lsls r1, 5 ldr r0, [r6] @@ -20516,10 +20516,10 @@ _08012C5C: adds r1, 0x10 bl sub_8010714 cmp r0, 0x1 - bne _08012D4A + bne @08012D4A ldrb r0, [r6, 0x19] cmp r0, 0x5 - bne _08012D04 + bne @08012D04 ldr r1, [r6] ldrb r0, [r6, 0x13] lsls r0, 5 @@ -20539,19 +20539,19 @@ _08012C5C: adds r0, r3, 0 ands r0, r1 cmp r2, r0 - bne _08012D40 + bne @08012D40 movs r0, 0xF0 ands r0, r1 cmp r0, 0 - bne _08012CBC + bne @08012CBC cmp r2, 0x4 - bne _08012CC4 -_08012CBC: + bne @08012CC4 +@08012CBC: strb r3, [r6, 0xC] - b _08012CE0 + b @08012CE0 .align 2, 0 .pool -_08012CC4: +@08012CC4: ldr r0, =0x02021cc4 ldrb r2, [r6, 0x13] lsls r2, 5 @@ -20564,17 +20564,17 @@ _08012CC4: bl ExpandTextCodes movs r0, 0xD strb r0, [r6, 0xC] -_08012CE0: +@08012CE0: bl sub_800EF38 ldrb r0, [r6, 0x11] ldr r1, =0x02022c2d ldrb r1, [r1] ldrb r2, [r6, 0x13] bl sub_80124EC - b _08012D44 + b @08012D44 .align 2, 0 .pool -_08012D04: +@08012D04: ldrb r1, [r6, 0x13] lsls r1, 5 ldr r0, [r6] @@ -20601,64 +20601,64 @@ _08012D04: bl sub_8013398 ldrb r0, [r6, 0x12] bl sub_81AE70C -_08012D40: +@08012D40: movs r0, 0x4 strb r0, [r6, 0xC] -_08012D44: +@08012D44: movs r0, 0 strb r0, [r6, 0x19] - b _08012F50 -_08012D4A: + b @08012F50 +@08012D4A: cmp r0, 0x2 - beq _08012D50 - b _08012F50 -_08012D50: + beq @08012D50 + b @08012F50 +@08012D50: movs r0, 0 movs r1, 0 bl sub_8011A64 - b _08012E5C -_08012D5A: + b @08012E5C +@08012D5A: adds r0, r6, 0 adds r0, 0xD ldr r1, =0x02021fc4 bl sub_8017064 lsls r0, 24 cmp r0, 0 - bne _08012D6C - b _08012F50 -_08012D6C: + bne @08012D6C + b @08012F50 +@08012D6C: movs r0, 0xE strb r0, [r6, 0xC] - b _08012F50 + b @08012F50 .align 2, 0 .pool -_08012D78: +@08012D78: ldrb r0, [r6, 0xE] adds r0, 0x1 strb r0, [r6, 0xE] lsls r0, 24 lsrs r0, 24 cmp r0, 0x78 - bhi _08012D88 - b _08012F50 -_08012D88: - b _08012DCE -_08012D8A: + bhi @08012D88 + b @08012F50 +@08012D88: + b @08012DCE +@08012D8A: adds r0, r6, 0 adds r0, 0xD ldr r1, =0x082edc5c bl sub_8017064 lsls r0, 24 cmp r0, 0 - bne _08012D9C - b _08012F50 -_08012D9C: + bne @08012D9C + b @08012F50 +@08012D9C: movs r0, 0x10 strb r0, [r6, 0xC] - b _08012F50 + b @08012F50 .align 2, 0 .pool -_08012DA8: +@08012DA8: adds r0, r6, 0 adds r0, 0xD movs r1, 0 @@ -20666,54 +20666,54 @@ _08012DA8: lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _08012DCE + beq @08012DCE cmp r1, 0 - bgt _08012DC8 + bgt @08012DC8 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _08012DD4 - b _08012F50 -_08012DC8: + beq @08012DD4 + b @08012F50 +@08012DC8: cmp r1, 0x1 - beq _08012DD4 - b _08012F50 -_08012DCE: + beq @08012DD4 + b @08012F50 +@08012DCE: movs r0, 0x11 strb r0, [r6, 0xC] - b _08012F50 -_08012DD4: + b @08012F50 +@08012DD4: ldr r0, =0x02022c2d ldrb r1, [r0] movs r0, 0xF0 ands r0, r1 cmp r0, 0 - beq _08012DEC + beq @08012DEC movs r0, 0x1E strb r0, [r6, 0xC] - b _08012F50 + b @08012F50 .align 2, 0 .pool -_08012DEC: +@08012DEC: movs r0, 0x13 strb r0, [r6, 0xC] - b _08012F50 -_08012DF2: + b @08012F50 +@08012DF2: adds r0, r6, 0 adds r0, 0xD ldr r1, =0x082edc78 bl sub_8017064 lsls r0, 24 cmp r0, 0 - bne _08012E04 - b _08012F50 -_08012E04: + bne @08012E04 + b @08012F50 +@08012E04: movs r0, 0x14 strb r0, [r6, 0xC] - b _08012F50 + b @08012F50 .align 2, 0 .pool -_08012E10: +@08012E10: adds r0, r6, 0 adds r0, 0xD movs r1, 0 @@ -20721,68 +20721,68 @@ _08012E10: lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _08012EC6 + beq @08012EC6 cmp r1, 0 - bgt _08012E30 + bgt @08012E30 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _08012E36 - b _08012F50 -_08012E30: + beq @08012E36 + b @08012F50 +@08012E30: cmp r1, 0x1 - beq _08012E36 - b _08012F50 -_08012E36: + beq @08012E36 + b @08012F50 +@08012E36: ldr r0, =0x02022c2d ldrb r2, [r0] movs r0, 0xF0 ands r0, r2 cmp r0, 0 - beq _08012E4C + beq @08012E4C movs r0, 0xF strb r0, [r6, 0xC] - b _08012F50 + b @08012F50 .align 2, 0 .pool -_08012E4C: +@08012E4C: movs r3, 0xF ldrb r1, [r6, 0x13] adds r0, r3, 0 ands r0, r2 cmp r1, r0 - bne _08012E5C + bne @08012E5C strb r3, [r6, 0xC] - b _08012F50 -_08012E5C: + b @08012F50 +@08012E5C: movs r0, 0x4 strb r0, [r6, 0xC] - b _08012F50 -_08012E62: + b @08012F50 +@08012E62: adds r0, r6, 0 movs r1, 0x7 movs r2, 0x1D bl sub_801320C lsls r0, 24 cmp r0, 0 - bne _08012F50 + bne @08012F50 movs r0, 0x12 strb r0, [r6, 0xC] - b _08012F50 -_08012E78: + b @08012F50 +@08012E78: bl sub_800EF1C lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq _08012EAE + beq @08012EAE movs r0, 0 bl sub_800EF58 cmp r0, 0 - beq _08012E94 + beq @08012E94 movs r0, 0x1A strb r0, [r6, 0xC] - b _08012F50 -_08012E94: + b @08012F50 +@08012E94: ldrh r0, [r6, 0x1A] adds r0, 0x1 strh r0, [r6, 0x1A] @@ -20790,32 +20790,32 @@ _08012E94: movs r1, 0x96 lsls r1, 17 cmp r0, r1 - bls _08012F50 + bls @08012F50 movs r0, 0x1D strb r0, [r6, 0xC] movs r0, 0 strb r0, [r6, 0xD] - b _08012F50 -_08012EAE: + b @08012F50 +@08012EAE: movs r0, 0x1D strb r0, [r6, 0xC] strb r1, [r6, 0xD] - b _08012F50 -_08012EB6: + b @08012F50 +@08012EB6: adds r0, r6, 0 adds r0, 0xD ldr r1, =0x082edd58 bl sub_8017064 lsls r0, 24 cmp r0, 0 - beq _08012F50 -_08012EC6: + beq @08012F50 +@08012EC6: movs r0, 0x17 strb r0, [r6, 0xC] - b _08012F50 + b @08012F50 .align 2, 0 .pool -_08012ED0: +@08012ED0: bl sub_800E084 bl sub_800EDD4 adds r0, r6, 0 @@ -20823,46 +20823,46 @@ _08012ED0: ldrb r0, [r6, 0xC] adds r0, 0x1 strb r0, [r6, 0xC] - b _08012F50 -_08012EE6: + b @08012F50 +@08012EE6: bl script_env_2_enable_and_set_ctx_running adds r0, r4, 0 bl remove_task ldr r1, =0x020375f0 movs r0, 0x5 strh r0, [r1] - b _08012F50 + b @08012F50 .align 2, 0 .pool -_08012EFC: +@08012EFC: bl script_env_2_enable_and_set_ctx_running adds r0, r4, 0 bl remove_task ldr r1, =0x020375f0 movs r0, 0x8 strh r0, [r1] - b _08012F50 + b @08012F50 .align 2, 0 .pool -_08012F14: +@08012F14: bl sub_8011A80 cmp r0, 0 - beq _08012F22 + beq @08012F22 movs r0, 0x1D strb r0, [r6, 0xC] - b _08012F50 -_08012F22: + b @08012F50 +@08012F22: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _08012F50 + beq @08012F50 ldr r0, =0x02022c2c ldrb r0, [r0] bl sub_80126CC cmp r0, 0 - beq _08012F3A + beq @08012F3A bl sub_801103C -_08012F3A: +@08012F3A: movs r0, 0x1 bl sub_8011068 bl sub_80149C4 @@ -20870,7 +20870,7 @@ _08012F3A: bl sub_8012F64 adds r0, r4, 0 bl remove_task -_08012F50: +@08012F50: add sp, 0x8 pop {r3} mov r8, r3 @@ -20882,7 +20882,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] @@ -20921,69 +20921,69 @@ 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 lsrs r1, 24 subs r0, r1, 0x1 cmp r0, 0x1B - bhi _08013070 + bhi @08013070 lsls r0, 2 - ldr r1, =_08012FE0 + ldr r1, =@08012FE0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08012FE0: - .4byte _08013050 - .4byte _08013050 - .4byte _08013068 - .4byte _08013050 - .4byte _08013070 - .4byte _08013070 - .4byte _08013070 - .4byte _08013070 - .4byte _08013068 - .4byte _08013068 - .4byte _08013068 - .4byte _08013070 - .4byte _08013070 - .4byte _08013050 - .4byte _08013068 - .4byte _08013068 - .4byte _08013070 - .4byte _08013070 - .4byte _08013070 - .4byte _08013070 - .4byte _08013058 - .4byte _08013058 - .4byte _08013068 - .4byte _08013068 - .4byte _08013068 - .4byte _08013068 - .4byte _08013068 - .4byte _08013050 -_08013050: +@08012FE0: + .4byte @08013050 + .4byte @08013050 + .4byte @08013068 + .4byte @08013050 + .4byte @08013070 + .4byte @08013070 + .4byte @08013070 + .4byte @08013070 + .4byte @08013068 + .4byte @08013068 + .4byte @08013068 + .4byte @08013070 + .4byte @08013070 + .4byte @08013050 + .4byte @08013068 + .4byte @08013068 + .4byte @08013070 + .4byte @08013070 + .4byte @08013070 + .4byte @08013070 + .4byte @08013058 + .4byte @08013058 + .4byte @08013068 + .4byte @08013068 + .4byte @08013068 + .4byte @08013068 + .4byte @08013068 + .4byte @08013050 +@08013050: ldr r1, =0x082edbe8 - b _0801305A + b @0801305A .align 2, 0 .pool -_08013058: +@08013058: ldr r1, =0x082edc0c -_0801305A: +@0801305A: adds r0, r2, 0 bl ExpandTextCodes - b _08013070 + b @08013070 .align 2, 0 .pool -_08013068: +@08013068: ldr r1, =0x082edc34 adds r0, r2, 0 bl ExpandTextCodes -_08013070: +@08013070: pop {r0} bx r0 .align 2, 0 @@ -20991,34 +20991,34 @@ _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 adds r2, r1, 0 cmp r1, 0x44 - beq _08013098 + beq @08013098 cmp r1, 0x44 - bgt _0801308E + bgt @0801308E cmp r1, 0x41 - beq _08013098 - b _080130AA -_0801308E: + beq @08013098 + b @080130AA +@0801308E: cmp r2, 0x45 - beq _080130A4 + beq @080130A4 cmp r2, 0x48 - beq _080130A4 - b _080130AA -_08013098: + beq @080130A4 + b @080130AA +@08013098: ldr r1, =0x082ee560 bl ExpandTextCodes - b _080130AA + b @080130AA .align 2, 0 .pool -_080130A4: +@080130A4: ldr r1, =0x082ee57c bl ExpandTextCodes -_080130AA: +@080130AA: pop {r0} bx r0 .align 2, 0 @@ -21026,63 +21026,63 @@ _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 lsrs r1, 24 subs r0, r1, 0x1 cmp r0, 0x1B - bhi _08013158 + bhi @08013158 lsls r0, 2 - ldr r1, =_080130D0 + ldr r1, =@080130D0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080130D0: - .4byte _08013140 - .4byte _08013140 - .4byte _08013150 - .4byte _08013140 - .4byte _08013158 - .4byte _08013158 - .4byte _08013158 - .4byte _08013158 - .4byte _08013150 - .4byte _08013150 - .4byte _08013150 - .4byte _08013158 - .4byte _08013158 - .4byte _08013140 - .4byte _08013150 - .4byte _08013150 - .4byte _08013158 - .4byte _08013158 - .4byte _08013158 - .4byte _08013158 - .4byte _08013140 - .4byte _08013140 - .4byte _08013150 - .4byte _08013150 - .4byte _08013150 - .4byte _08013150 - .4byte _08013150 - .4byte _08013140 -_08013140: +@080130D0: + .4byte @08013140 + .4byte @08013140 + .4byte @08013150 + .4byte @08013140 + .4byte @08013158 + .4byte @08013158 + .4byte @08013158 + .4byte @08013158 + .4byte @08013150 + .4byte @08013150 + .4byte @08013150 + .4byte @08013158 + .4byte @08013158 + .4byte @08013140 + .4byte @08013150 + .4byte @08013150 + .4byte @08013158 + .4byte @08013158 + .4byte @08013158 + .4byte @08013158 + .4byte @08013140 + .4byte @08013140 + .4byte @08013150 + .4byte @08013150 + .4byte @08013150 + .4byte @08013150 + .4byte @08013150 + .4byte @08013140 +@08013140: ldr r1, =0x082efc3c adds r0, r2, 0 bl ExpandTextCodes - b _08013158 + b @08013158 .align 2, 0 .pool -_08013150: +@08013150: ldr r1, =0x082efc54 adds r0, r2, 0 bl ExpandTextCodes -_08013158: +@08013158: pop {r0} bx r0 .align 2, 0 @@ -21090,63 +21090,63 @@ _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 lsrs r1, 24 subs r0, r1, 0x1 cmp r0, 0x1B - bhi _08013204 + bhi @08013204 lsls r0, 2 - ldr r1, =_0801317C + ldr r1, =@0801317C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801317C: - .4byte _080131EC - .4byte _080131EC - .4byte _080131FC - .4byte _080131EC - .4byte _08013204 - .4byte _08013204 - .4byte _08013204 - .4byte _08013204 - .4byte _080131FC - .4byte _080131FC - .4byte _080131FC - .4byte _08013204 - .4byte _08013204 - .4byte _080131EC - .4byte _080131FC - .4byte _080131FC - .4byte _08013204 - .4byte _08013204 - .4byte _08013204 - .4byte _08013204 - .4byte _080131EC - .4byte _080131EC - .4byte _080131FC - .4byte _080131FC - .4byte _080131FC - .4byte _080131FC - .4byte _080131FC - .4byte _080131EC -_080131EC: +@0801317C: + .4byte @080131EC + .4byte @080131EC + .4byte @080131FC + .4byte @080131EC + .4byte @08013204 + .4byte @08013204 + .4byte @08013204 + .4byte @08013204 + .4byte @080131FC + .4byte @080131FC + .4byte @080131FC + .4byte @08013204 + .4byte @08013204 + .4byte @080131EC + .4byte @080131FC + .4byte @080131FC + .4byte @08013204 + .4byte @08013204 + .4byte @08013204 + .4byte @08013204 + .4byte @080131EC + .4byte @080131EC + .4byte @080131FC + .4byte @080131FC + .4byte @080131FC + .4byte @080131FC + .4byte @080131FC + .4byte @080131EC +@080131EC: ldr r1, =0x082eddf4 adds r0, r2, 0 bl ExpandTextCodes - b _08013204 + b @08013204 .align 2, 0 .pool -_080131FC: +@080131FC: ldr r1, =0x082ede0c adds r0, r2, 0 bl ExpandTextCodes -_08013204: +@08013204: pop {r0} bx r0 .align 2, 0 @@ -21154,7 +21154,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 @@ -21164,11 +21164,11 @@ sub_801320C: @ 801320C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08013228 + beq @08013228 cmp r0, 0x2 - beq _0801325C - b _08013270 -_08013228: + beq @0801325C + b @08013270 +@08013228: movs r0, 0x2 bl audio_play ldrb r0, [r4, 0x12] @@ -21184,10 +21184,10 @@ _08013228: ldrb r1, [r1] bl sub_8012FC4 strb r6, [r4, 0xC] - b _08013270 + b @08013270 .align 2, 0 .pool -_0801325C: +@0801325C: movs r0, 0 movs r1, 0 bl sub_8011A64 @@ -21195,17 +21195,17 @@ _0801325C: bl sub_81AE70C strb r5, [r4, 0xC] movs r0, 0x1 - b _08013272 -_08013270: + b @08013272 +@08013270: movs r0, 0 -_08013272: +@08013272: pop {r4-r6} pop {r1} bx r1 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 @@ -21223,21 +21223,21 @@ sub_8013278: @ 8013278 lsls r0, 30 lsrs r0, 30 cmp r0, 0x1 - beq _080132A8 + beq @080132A8 cmp r0, 0x2 - beq _080132B2 - b _080132B4 + beq @080132B2 + b @080132B4 .align 2, 0 .pool -_080132A8: +@080132A8: ldrb r0, [r1, 0x1B] cmp r0, 0 - beq _080132B4 + beq @080132B4 movs r2, 0x2 - b _080132B4 -_080132B2: + b @080132B4 +@080132B2: movs r2, 0x1 -_080132B4: +@080132B4: lsls r0, r4, 5 ldr r3, [r3] adds r3, r0 @@ -21256,7 +21256,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 @@ -21267,7 +21267,7 @@ sub_80132D4: @ 80132D4 movs r0, 0 mov r8, r0 movs r3, 0x1 -_080132E8: +@080132E8: ldr r0, [r5] lsls r6, r3, 5 adds r2, r0, r6 @@ -21276,7 +21276,7 @@ _080132E8: lsrs r0, 30 mov r9, r0 cmp r0, 0x1 - bne _08013348 + bne @08013348 ldr r1, [r5, 0x4] adds r0, r2, 0 str r3, [sp] @@ -21284,7 +21284,7 @@ _080132E8: adds r4, r0, 0 ldr r3, [sp] cmp r4, 0xFF - beq _08013330 + beq @08013330 ldr r1, [r5] ldr r0, [r5, 0x4] lsls r2, r4, 3 @@ -21300,10 +21300,10 @@ _080132E8: adds r0, r6 mov r1, r9 strh r1, [r0, 0x18] - b _08013348 + b @08013348 .align 2, 0 .pool -_08013330: +@08013330: ldr r2, [r5] adds r2, r6 ldrb r1, [r2, 0x1A] @@ -21316,15 +21316,15 @@ _08013330: strb r1, [r2, 0x1A] movs r7, 0x2 mov r8, r7 -_08013348: +@08013348: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x4 - bls _080132E8 + bls @080132E8 movs r6, 0 movs r4, 0x3 -_08013356: +@08013356: ldr r0, [r5] ldr r1, [r5, 0x4] adds r1, r6 @@ -21334,24 +21334,24 @@ _08013356: subs r4, 0x1 ldr r0, [r5] cmp r4, 0 - bge _08013356 + bge @08013356 mov r1, r8 cmp r1, 0x2 - beq _08013388 + beq @08013388 adds r1, r0, 0 movs r4, 0x4 -_08013376: +@08013376: ldrb r0, [r1, 0x1B] cmp r0, 0 - beq _08013380 + beq @08013380 movs r2, 0x1 mov r8, r2 -_08013380: +@08013380: adds r1, 0x20 subs r4, 0x1 cmp r4, 0 - bge _08013376 -_08013388: + bge @08013376 +@08013388: mov r0, r8 add sp, 0x4 pop {r3,r4} @@ -21363,7 +21363,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 @@ -21372,7 +21372,7 @@ sub_8013398: @ 8013398 ldr r0, =0x02022c30 ldr r4, [r0] movs r3, 0 -_080133A8: +@080133A8: ldr r0, [r4, 0x8] lsls r2, r3, 5 ldr r1, [r4] @@ -21388,18 +21388,18 @@ _080133A8: ldr r0, [r4, 0x8] ldr r1, [r4] cmp r3, 0x4 - ble _080133A8 + ble @080133A8 movs r5, 0 mov r8, r1 mov r9, r0 movs r3, 0x4 -_080133D0: +@080133D0: mov r1, r9 ldrb r0, [r1, 0x1A] lsls r0, 30 lsrs r0, 30 cmp r0, 0x1 - bne _080133F2 + bne @080133F2 lsls r0, r5, 5 add r0, r8 ldm r1!, {r2,r6,r7} @@ -21411,15 +21411,15 @@ _080133D0: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_080133F2: +@080133F2: movs r7, 0x20 add r9, r7 subs r3, 0x1 cmp r3, 0 - bge _080133D0 + bge @080133D0 mov r10, r5 cmp r5, 0x4 - bhi _08013454 + bhi @08013454 ldr r0, =0x082f045c mov r9, r0 movs r1, 0 @@ -21427,7 +21427,7 @@ _080133F2: movs r2, 0x4 negs r2, r2 mov r8, r2 -_08013410: +@08013410: ldr r1, [r4] lsls r3, r5, 5 adds r1, r3 @@ -21461,40 +21461,40 @@ _08013410: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x4 - bls _08013410 -_08013454: + bls @08013410 +@08013454: movs r3, 0 ldr r1, [r4] ldrb r0, [r1, 0x1A] lsls r0, 30 lsrs r0, 30 cmp r0, 0x1 - bne _08013474 + bne @08013474 ldrb r0, [r1, 0x1B] cmp r0, 0x40 - bne _08013474 + bne @08013474 mov r10, r3 - b _08013494 + b @08013494 .align 2, 0 .pool -_08013474: +@08013474: adds r3, 0x1 cmp r3, 0x4 - bgt _08013494 + bgt @08013494 lsls r0, r3, 5 adds r2, r1, r0 ldrb r0, [r2, 0x1A] lsls r0, 30 lsrs r0, 30 cmp r0, 0x1 - bne _08013474 + bne @08013474 ldrb r0, [r2, 0x1B] cmp r0, 0x40 - bne _08013474 + bne @08013474 lsls r0, r3, 24 lsrs r0, 24 mov r10, r0 -_08013494: +@08013494: mov r0, r10 pop {r3-r5} mov r8, r3 @@ -21506,7 +21506,7 @@ _08013494: thumb_func_end sub_8013398 thumb_func_start sub_80134A4 -sub_80134A4: @ 80134A4 +sub_80134A4: ; 80134A4 push {lr} ldr r0, =sub_80134E8 + 1 movs r1, 0 @@ -21534,7 +21534,7 @@ sub_80134A4: @ 80134A4 thumb_func_end sub_80134A4 thumb_func_start sub_80134E8 -sub_80134E8: @ 80134E8 +sub_80134E8: ; 80134E8 push {r4-r7,lr} sub sp, 0x8 lsls r0, 24 @@ -21543,48 +21543,48 @@ sub_80134E8: @ 80134E8 ldr r6, [r0] ldrb r0, [r6, 0x8] cmp r0, 0x17 - bls _080134FC - b _08013B82 -_080134FC: + bls @080134FC + b @08013B82 +@080134FC: lsls r0, 2 - ldr r1, =_08013510 + ldr r1, =@08013510 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08013510: - .4byte _08013570 - .4byte _080135E0 - .4byte _0801360C - .4byte _080136D8 - .4byte _08013B82 - .4byte _08013788 - .4byte _080137C4 - .4byte _08013A10 - .4byte _08013A2C - .4byte _08013A7A - .4byte _08013A8C - .4byte _08013B14 - .4byte _08013A8C - .4byte _08013AE4 - .4byte _08013A8C - .4byte _08013B24 - .4byte _08013B82 - .4byte _08013B82 - .4byte _08013A8C - .4byte _08013B44 - .4byte _08013A8C - .4byte _08013B78 - .4byte _08013B82 - .4byte _08013B68 -_08013570: +@08013510: + .4byte @08013570 + .4byte @080135E0 + .4byte @0801360C + .4byte @080136D8 + .4byte @08013B82 + .4byte @08013788 + .4byte @080137C4 + .4byte @08013A10 + .4byte @08013A2C + .4byte @08013A7A + .4byte @08013A8C + .4byte @08013B14 + .4byte @08013A8C + .4byte @08013AE4 + .4byte @08013A8C + .4byte @08013B24 + .4byte @08013B82 + .4byte @08013B82 + .4byte @08013A8C + .4byte @08013B44 + .4byte @08013A8C + .4byte @08013B78 + .4byte @08013B82 + .4byte @08013B68 +@08013570: ldr r0, =0x020375e0 ldrh r2, [r0] adds r3, r0, 0 cmp r2, 0x14 - bne _08013590 + bne @08013590 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000ca9 @@ -21593,10 +21593,10 @@ _08013570: movs r0, 0x3 ands r0, r1 cmp r0, 0x1 - bne _08013590 + bne @08013590 adds r0, r2, 0x1 strh r0, [r3] -_08013590: +@08013590: ldr r2, =0x02022c2c ldr r1, =0x082f0530 ldrh r0, [r3] @@ -21619,10 +21619,10 @@ _08013590: str r0, [r6] movs r0, 0x1 strb r0, [r6, 0x8] - b _08013B82 + b @08013B82 .align 2, 0 .pool -_080135E0: +@080135E0: adds r0, r6, 0 adds r0, 0x9 ldr r2, =0x082efb70 @@ -21634,15 +21634,15 @@ _080135E0: bl sub_8017064 lsls r0, 24 cmp r0, 0 - bne _080135FC - b _08013B82 -_080135FC: + bne @080135FC + b @08013B82 +@080135FC: movs r0, 0x2 strb r0, [r6, 0x8] - b _08013B82 + b @08013B82 .align 2, 0 .pool -_0801360C: +@0801360C: ldr r0, [r6, 0x4] movs r1, 0x4 bl sub_80175EC @@ -21712,23 +21712,23 @@ _0801360C: strb r4, [r6, 0xF] movs r0, 0x3 strb r0, [r6, 0x8] - b _08013B82 + b @08013B82 .align 2, 0 .pool -_080136D8: +@080136D8: bl sub_8013E44 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq _080136F2 + beq @080136F2 cmp r4, 0x1 - beq _080136EA - b _08013A72 -_080136EA: + beq @080136EA + b @08013A72 +@080136EA: movs r0, 0x2 bl audio_play - b _08013A72 -_080136F2: + b @08013A72 +@080136F2: ldrb r0, [r6, 0xE] bl sub_81AE604 adds r4, r0, 0 @@ -21737,11 +21737,11 @@ _080136F2: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08013770 + beq @08013770 movs r0, 0x1 negs r0, r0 cmp r4, r0 - beq _08013770 + beq @08013770 ldr r0, [r6] lsls r1, r4, 5 adds r0, r1 @@ -21750,24 +21750,24 @@ _080136F2: lsls r0, 30 lsrs r0, 30 cmp r0, 0x1 - bne _08013768 + bne @08013768 lsrs r0, r1, 7 cmp r0, 0 - bne _08013768 + bne @08013768 adds r0, r6, 0 adds r1, r4, 0 bl sub_8013B8C adds r1, r0, 0 cmp r1, 0 - bne _08013744 + bne @08013744 adds r0, r6, 0 adds r1, r4, 0 bl sub_8013BD8 movs r0, 0x5 - b _08013756 + b @08013756 .align 2, 0 .pool -_08013744: +@08013744: ldr r0, =0x02021fc4 ldr r2, =0x082edd50 subs r1, 0x1 @@ -21776,32 +21776,32 @@ _08013744: ldr r1, [r1] bl gf_strcpy movs r0, 0x12 -_08013756: +@08013756: strb r0, [r6, 0x8] movs r0, 0x6E bl audio_play - b _08013B82 + b @08013B82 .align 2, 0 .pool -_08013768: +@08013768: movs r0, 0x7 bl audio_play - b _08013B82 -_08013770: + b @08013B82 +@08013770: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _0801377E - b _08013B82 -_0801377E: + bne @0801377E + b @08013B82 +@0801377E: movs r0, 0xA strb r0, [r6, 0x8] - b _08013B82 + b @08013B82 .align 2, 0 .pool -_08013788: +@08013788: ldr r4, =0x02021fc4 ldr r0, =0x02022c2c ldrb r1, [r0] @@ -21813,23 +21813,23 @@ _08013788: bl sub_8017064 lsls r0, 24 cmp r0, 0 - bne _080137A6 - b _08013B82 -_080137A6: + bne @080137A6 + b @08013B82 +@080137A6: ldr r0, =0x02021cc4 ldrb r2, [r6, 0xF] lsls r2, 5 ldr r1, [r6] adds r1, r2 bl sub_8018404 - b _08013A86 + b @08013A86 .align 2, 0 .pool -_080137C4: +@080137C4: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _0801387A + beq @0801387A ldr r4, =0x02022c2c ldr r1, [r6] ldrb r0, [r6, 0xF] @@ -21845,84 +21845,84 @@ _080137C4: ldrb r0, [r4] subs r0, 0x1 cmp r0, 0x1B - bhi _0801387A + bhi @0801387A lsls r0, 2 - ldr r1, =_08013804 + ldr r1, =@08013804 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08013804: - .4byte _08013874 - .4byte _08013874 - .4byte _08013874 - .4byte _08013874 - .4byte _08013874 - .4byte _0801387A - .4byte _0801387A - .4byte _0801387A - .4byte _08013874 - .4byte _08013874 - .4byte _08013874 - .4byte _0801387A - .4byte _08013874 - .4byte _08013874 - .4byte _08013874 - .4byte _08013874 - .4byte _0801387A - .4byte _0801387A - .4byte _0801387A - .4byte _0801387A - .4byte _08013874 - .4byte _08013874 - .4byte _08013874 - .4byte _08013874 - .4byte _08013874 - .4byte _08013874 - .4byte _08013874 - .4byte _08013874 -_08013874: +@08013804: + .4byte @08013874 + .4byte @08013874 + .4byte @08013874 + .4byte @08013874 + .4byte @08013874 + .4byte @0801387A + .4byte @0801387A + .4byte @0801387A + .4byte @08013874 + .4byte @08013874 + .4byte @08013874 + .4byte @0801387A + .4byte @08013874 + .4byte @08013874 + .4byte @08013874 + .4byte @08013874 + .4byte @0801387A + .4byte @0801387A + .4byte @0801387A + .4byte @0801387A + .4byte @08013874 + .4byte @08013874 + .4byte @08013874 + .4byte @08013874 + .4byte @08013874 + .4byte @08013874 + .4byte @08013874 + .4byte @08013874 +@08013874: movs r0, 0x14 strb r0, [r6, 0x8] - b _08013B82 -_0801387A: + b @08013B82 +@0801387A: bl sub_8011A74 lsls r0, 24 lsrs r0, 24 subs r0, 0x1 cmp r0, 0x8 - bls _0801388A - b _080139EC -_0801388A: + bls @0801388A + b @080139EC +@0801388A: lsls r0, 2 - ldr r1, =_08013898 + ldr r1, =@08013898 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08013898: - .4byte _080138BC - .4byte _080138C2 - .4byte _080139EC - .4byte _080139EC - .4byte _080138C8 - .4byte _080138C2 - .4byte _08013934 - .4byte _080139EC - .4byte _080138C2 -_080138BC: +@08013898: + .4byte @080138BC + .4byte @080138C2 + .4byte @080139EC + .4byte @080139EC + .4byte @080138C8 + .4byte @080138C2 + .4byte @08013934 + .4byte @080139EC + .4byte @080138C2 +@080138BC: movs r0, 0xC strb r0, [r6, 0x8] - b _080139EC -_080138C2: + b @080139EC +@080138C2: movs r0, 0xE strb r0, [r6, 0x8] - b _080139EC -_080138C8: + b @080139EC +@080138C8: ldr r5, =0x02021fc4 ldr r4, =0x02022c2c ldrb r1, [r4] @@ -21934,22 +21934,22 @@ _080138C8: bl sub_8017064 lsls r0, 24 cmp r0, 0 - bne _080138E6 - b _080139EC -_080138E6: + bne @080138E6 + b @080139EC +@080138E6: ldrb r0, [r4] cmp r0, 0x1C - beq _080138F0 + beq @080138F0 cmp r0, 0xE - bne _08013904 -_080138F0: + bne @08013904 +@080138F0: movs r0, 0xC movs r1, 0 bl sub_8011A64 - b _080139EC + b @080139EC .align 2, 0 .pool -_08013904: +@08013904: movs r0, 0x7 movs r1, 0 bl sub_8011A64 @@ -21963,111 +21963,111 @@ _08013904: ldr r1, =0x082ede48 adds r0, r5, 0 bl ExpandTextCodes - b _080139EC + b @080139EC .align 2, 0 .pool -_08013934: +@08013934: ldrb r0, [r6, 0x15] adds r2, r0, 0 cmp r2, 0xF0 - bls _0801395C + bls @0801395C adds r0, r6, 0 adds r0, 0x9 ldr r1, =0x02021fc4 bl sub_8017064 lsls r0, 24 cmp r0, 0 - beq _080139EC + beq @080139EC movs r0, 0xC movs r1, 0 bl sub_8011A64 movs r0, 0 - b _080139EA + b @080139EA .align 2, 0 .pool -_0801395C: +@0801395C: ldr r0, =0x02022c2c ldrb r0, [r0] subs r0, 0x1 cmp r0, 0x1B - bhi _080139E8 + bhi @080139E8 lsls r0, 2 - ldr r1, =_08013978 + ldr r1, =@08013978 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08013978: - .4byte _080139EC - .4byte _080139EC - .4byte _080139E8 - .4byte _080139EC - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139EC - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139EC -_080139E8: +@08013978: + .4byte @080139EC + .4byte @080139EC + .4byte @080139E8 + .4byte @080139EC + .4byte @080139E8 + .4byte @080139E8 + .4byte @080139E8 + .4byte @080139E8 + .4byte @080139E8 + .4byte @080139E8 + .4byte @080139E8 + .4byte @080139E8 + .4byte @080139E8 + .4byte @080139EC + .4byte @080139E8 + .4byte @080139E8 + .4byte @080139E8 + .4byte @080139E8 + .4byte @080139E8 + .4byte @080139E8 + .4byte @080139E8 + .4byte @080139E8 + .4byte @080139E8 + .4byte @080139E8 + .4byte @080139E8 + .4byte @080139E8 + .4byte @080139E8 + .4byte @080139EC +@080139E8: adds r0, r2, 0x1 -_080139EA: +@080139EA: strb r0, [r6, 0x15] -_080139EC: +@080139EC: bl sub_8011A74 lsls r0, 24 cmp r0, 0 - beq _080139F8 - b _08013B82 -_080139F8: + beq @080139F8 + b @08013B82 +@080139F8: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _08013A06 - b _08013B82 -_08013A06: + bne @08013A06 + b @08013B82 +@08013A06: movs r0, 0x7 strb r0, [r6, 0x8] - b _08013B82 + b @08013B82 .align 2, 0 .pool -_08013A10: +@08013A10: adds r0, r6, 0 adds r0, 0x9 ldr r1, =0x082ede64 bl sub_8017064 lsls r0, 24 cmp r0, 0 - bne _08013A22 - b _08013B82 -_08013A22: + bne @08013A22 + b @08013B82 +@08013A22: movs r0, 0x8 strb r0, [r6, 0x8] - b _08013B82 + b @08013B82 .align 2, 0 .pool -_08013A2C: +@08013A2C: adds r4, r6, 0 adds r4, 0x9 bl sub_8011A74 @@ -22081,45 +22081,45 @@ _08013A2C: movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _08013A6A + beq @08013A6A cmp r1, r0 - bgt _08013A58 + bgt @08013A58 subs r0, 0x2 cmp r1, r0 - beq _08013A6E - b _08013B82 -_08013A58: + beq @08013A6E + b @08013B82 +@08013A58: cmp r1, 0 - beq _08013A62 + beq @08013A62 cmp r1, 0x1 - beq _08013A6A - b _08013B82 -_08013A62: + beq @08013A6A + b @08013B82 +@08013A62: bl sub_80106D4 movs r0, 0x9 - b _08013A70 -_08013A6A: + b @08013A70 +@08013A6A: movs r0, 0x5 - b _08013A70 -_08013A6E: + b @08013A70 +@08013A6E: movs r0, 0x6 -_08013A70: +@08013A70: strb r0, [r6, 0x8] -_08013A72: +@08013A72: ldrb r0, [r6, 0xE] bl sub_81AE70C - b _08013B82 -_08013A7A: + b @08013B82 +@08013A7A: bl sub_8011A74 lsls r0, 24 cmp r0, 0 - bne _08013A86 - b _08013B82 -_08013A86: + bne @08013A86 + b @08013B82 +@08013A86: movs r0, 0x6 strb r0, [r6, 0x8] - b _08013B82 -_08013A8C: + b @08013B82 +@08013A8C: ldrb r0, [r6, 0xD] bl Window_FillTileMap ldrb r0, [r6, 0xD] @@ -22151,8 +22151,8 @@ _08013A8C: ldrb r0, [r6, 0x8] adds r0, 0x1 strb r0, [r6, 0x8] - b _08013B82 -_08013AE4: + b @08013B82 +@08013AE4: bl sub_800E084 adds r5, r6, 0 adds r5, 0x9 @@ -22166,20 +22166,20 @@ _08013AE4: bl sub_8017064 lsls r0, 24 cmp r0, 0 - beq _08013B82 + beq @08013B82 ldr r0, =0x020375f0 movs r1, 0x6 - b _08013B58 + b @08013B58 .align 2, 0 .pool -_08013B14: +@08013B14: bl sub_800E084 ldr r0, =0x020375f0 movs r1, 0x5 - b _08013B58 + b @08013B58 .align 2, 0 .pool -_08013B24: +@08013B24: bl sub_800E084 adds r5, r6, 0 adds r5, 0x9 @@ -22190,38 +22190,38 @@ _08013B24: adds r0, r4 ldr r1, [r0] adds r0, r5, 0 - b _08013B4A + b @08013B4A .align 2, 0 .pool -_08013B44: +@08013B44: adds r0, r6, 0 adds r0, 0x9 ldr r1, =0x02021fc4 -_08013B4A: +@08013B4A: bl sub_8017064 lsls r0, 24 cmp r0, 0 - beq _08013B82 + beq @08013B82 ldr r0, =0x020375f0 movs r1, 0x8 -_08013B58: +@08013B58: strh r1, [r0] movs r0, 0x17 strb r0, [r6, 0x8] - b _08013B82 + b @08013B82 .align 2, 0 .pool -_08013B68: +@08013B68: adds r0, r4, 0 bl remove_task bl sub_80173D4 bl sub_800EDD4 - b _08013B82 -_08013B78: + b @08013B82 +@08013B78: bl sub_80149C4 adds r0, r4, 0 bl remove_task -_08013B82: +@08013B82: add sp, 0x8 pop {r4-r7} pop {r0} @@ -22229,7 +22229,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] @@ -22237,12 +22237,12 @@ sub_8013B8C: @ 8013B8C ldr r0, =0x02022c2c ldrb r0, [r0] cmp r0, 0x4 - bne _08013BCE + bne @08013BCE ldrb r1, [r3, 0x1] movs r0, 0x3C ands r0, r1 cmp r0, 0xC - beq _08013BCE + beq @08013BCE ldr r0, =0x03005d90 ldr r0, [r0] ldrb r1, [r0, 0x9] @@ -22250,29 +22250,29 @@ sub_8013B8C: @ 8013B8C adds r0, r2, 0 ands r0, r1 cmp r0, 0 - bne _08013BC4 + bne @08013BC4 movs r0, 0x1 - b _08013BD4 + b @08013BD4 .align 2, 0 .pool -_08013BC4: +@08013BC4: ldrb r1, [r3] adds r0, r2, 0 ands r0, r1 cmp r0, 0 - beq _08013BD2 -_08013BCE: + beq @08013BD2 +@08013BCE: movs r0, 0 - b _08013BD4 -_08013BD2: + b @08013BD4 +@08013BD2: movs r0, 0x2 -_08013BD4: +@08013BD4: pop {r1} bx r1 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] @@ -22317,7 +22317,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 + 1 movs r1, 0 @@ -22343,7 +22343,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 @@ -22351,29 +22351,29 @@ sub_8013C7C: @ 8013C7C ldr r4, [r0] ldrb r0, [r4, 0x8] cmp r0, 0xB - bhi _08013D80 + bhi @08013D80 lsls r0, 2 - ldr r1, =_08013CA0 + ldr r1, =@08013CA0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08013CA0: - .4byte _08013CD0 - .4byte _08013D80 - .4byte _08013D04 - .4byte _08013D28 - .4byte _08013D80 - .4byte _08013D80 - .4byte _08013D80 - .4byte _08013D80 - .4byte _08013D80 - .4byte _08013D80 - .4byte _08013D58 - .4byte _08013D76 -_08013CD0: +@08013CA0: + .4byte @08013CD0 + .4byte @08013D80 + .4byte @08013D04 + .4byte @08013D28 + .4byte @08013D80 + .4byte @08013D80 + .4byte @08013D80 + .4byte @08013D80 + .4byte @08013D80 + .4byte @08013D80 + .4byte @08013D58 + .4byte @08013D76 +@08013CD0: movs r0, 0 movs r1, 0 movs r2, 0 @@ -22392,8 +22392,8 @@ _08013CD0: str r0, [r4] movs r0, 0x2 strb r0, [r4, 0x8] - b _08013D80 -_08013D04: + b @08013D80 +@08013D04: ldr r0, [r4, 0x4] movs r1, 0x4 bl sub_80175EC @@ -22408,16 +22408,16 @@ _08013D04: strb r1, [r4, 0xF] movs r0, 0x3 strb r0, [r4, 0x8] - b _08013D80 -_08013D28: + b @08013D80 +@08013D28: bl sub_8013E44 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08013D3A + bne @08013D3A movs r0, 0x2 bl audio_play -_08013D3A: +@08013D3A: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -22426,13 +22426,13 @@ _08013D3A: movs r2, 0x26 ldrsh r0, [r1, r2] cmp r0, 0xFF - bne _08013D80 + bne @08013D80 movs r0, 0xA strb r0, [r4, 0x8] - b _08013D80 + b @08013D80 .align 2, 0 .pool -_08013D58: +@08013D58: ldrb r0, [r4, 0x11] bl remove_task ldr r0, [r4] @@ -22443,54 +22443,54 @@ _08013D58: ldrb r0, [r4, 0x8] adds r0, 0x1 strb r0, [r4, 0x8] - b _08013D80 -_08013D76: + b @08013D80 +@08013D76: bl sub_800EDD4 adds r0, r5, 0 bl remove_task -_08013D80: +@08013D80: pop {r4,r5} pop {r0} bx r0 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 - bne _08013D94 -_08013D90: + bne @08013D94 +@08013D90: movs r0, 0x1 - b _08013DB8 -_08013D94: + b @08013DB8 +@08013D94: cmp r1, 0x16 - bhi _08013DB6 + bhi @08013DB6 ldr r0, =0x082f04d8 lsls r1, 2 adds r1, r0 ldr r1, [r1] - b _08013DB0 + b @08013DB0 .align 2, 0 .pool -_08013DA8: +@08013DA8: ldrb r0, [r1] cmp r0, r2 - beq _08013D90 + beq @08013D90 adds r1, 0x1 -_08013DB0: +@08013DB0: ldrb r0, [r1] cmp r0, 0xFF - bne _08013DA8 -_08013DB6: + bne @08013DA8 +@08013DB6: movs r0, 0 -_08013DB8: +@08013DB8: pop {r1} bx r1 thumb_func_end sub_8013D88 thumb_func_start sub_8013DBC -sub_8013DBC: @ 8013DBC +sub_8013DBC: ; 8013DBC push {lr} ldr r0, [r0] lsls r1, 5 @@ -22499,34 +22499,34 @@ sub_8013DBC: @ 8013DBC lsls r0, r2, 30 lsrs r0, 30 cmp r0, 0x1 - bne _08013DEE + bne @08013DEE ldrb r0, [r1, 0xA] lsrs r0, 7 cmp r0, 0 - beq _08013DDA + beq @08013DDA movs r0, 0x3 - b _08013DF0 -_08013DDA: + b @08013DF0 +@08013DDA: lsls r0, r2, 29 cmp r0, 0 - bge _08013DE4 + bge @08013DE4 movs r0, 0x1 - b _08013DF0 -_08013DE4: + b @08013DF0 +@08013DE4: ldrb r0, [r1, 0x1B] cmp r0, 0 - beq _08013DEE + beq @08013DEE movs r0, 0x2 - b _08013DF0 -_08013DEE: + b @08013DF0 +@08013DEE: movs r0, 0 -_08013DF0: +@08013DF0: pop {r1} bx r1 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} @@ -22567,7 +22567,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} @@ -22576,7 +22576,7 @@ sub_8013E44: @ 8013E44 ldr r6, [r0] movs r7, 0 movs r3, 0 -_08013E54: +@08013E54: ldr r0, [r6] lsls r5, r3, 5 adds r2, r0, r5 @@ -22584,7 +22584,7 @@ _08013E54: lsls r0, 30 mov r8, r5 cmp r0, 0 - beq _08013F20 + beq @08013F20 ldr r1, [r6, 0x4] adds r0, r2, 0 str r3, [sp] @@ -22592,14 +22592,14 @@ _08013E54: adds r4, r0, 0 ldr r3, [sp] cmp r4, 0xFF - beq _08013EEE + beq @08013EEE ldr r0, [r6] adds r2, r0, r5 ldrb r1, [r2, 0x1A] lsls r0, r1, 30 lsrs r0, 30 cmp r0, 0x1 - bne _08013ECC + bne @08013ECC lsls r0, r4, 3 subs r0, r4 lsls r4, r0, 2 @@ -22609,7 +22609,7 @@ _08013E54: bl sub_8017678 ldr r3, [sp] cmp r0, 0 - beq _08013EB0 + beq @08013EB0 ldr r1, [r6] ldr r0, [r6, 0x4] adds r1, r5 @@ -22618,25 +22618,25 @@ _08013E54: stm r1!, {r2,r4,r7} ldm r0!, {r2,r4,r7} stm r1!, {r2,r4,r7} - b _08013EDA + b @08013EDA .align 2, 0 .pool -_08013EB0: +@08013EB0: ldr r0, [r6] adds r1, r0, r5 ldrb r0, [r1, 0x1B] cmp r0, 0 - beq _08013EE4 + beq @08013EE4 subs r0, 0x1 strb r0, [r1, 0x1B] ldr r0, [r6] adds r0, r5 ldrb r0, [r0, 0x1B] cmp r0, 0 - bne _08013EE4 + bne @08013EE4 movs r7, 0x2 - b _08013EE4 -_08013ECC: + b @08013EE4 +@08013ECC: movs r4, 0x4 negs r4, r4 adds r0, r4, 0 @@ -22644,26 +22644,26 @@ _08013ECC: movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x1A] -_08013EDA: +@08013EDA: ldr r0, [r6] adds r0, r5 movs r1, 0x40 strb r1, [r0, 0x1B] movs r7, 0x1 -_08013EE4: +@08013EE4: ldr r0, [r6] add r0, r8 movs r1, 0 strh r1, [r0, 0x18] - b _08013F20 -_08013EEE: + b @08013F20 +@08013EEE: ldr r0, [r6] adds r1, r0, r5 ldrb r0, [r1, 0x1A] lsls r0, 30 lsrs r0, 30 cmp r0, 0x2 - beq _08013F20 + beq @08013F20 ldrh r0, [r1, 0x18] adds r0, 0x1 strh r0, [r1, 0x18] @@ -22672,7 +22672,7 @@ _08013EEE: ldrh r1, [r2, 0x18] ldr r0, =0x0000012b cmp r1, r0 - bls _08013F20 + bls @08013F20 ldrb r0, [r2, 0x1A] movs r7, 0x4 negs r7, r7 @@ -22682,15 +22682,15 @@ _08013EEE: orrs r0, r1 strb r0, [r2, 0x1A] movs r7, 0x2 -_08013F20: +@08013F20: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0xF - bls _08013E54 + bls @08013E54 movs r5, 0 movs r4, 0x3 -_08013F2E: +@08013F2E: ldr r0, [r6] ldr r1, [r6, 0x4] adds r1, r5 @@ -22699,13 +22699,13 @@ _08013F2E: lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _08013F44 + beq @08013F44 movs r7, 0x1 -_08013F44: +@08013F44: adds r5, 0x1C subs r4, 0x1 cmp r4, 0 - bge _08013F2E + bge @08013F2E adds r0, r7, 0 add sp, 0x4 pop {r3} @@ -22718,7 +22718,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 @@ -22732,7 +22732,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 + 1 movs r1, 0 @@ -22746,7 +22746,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} @@ -22769,21 +22769,21 @@ sub_8013F90: @ 8013F90 movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _08013FFC + beq @08013FFC cmp r0, 0x1 - bgt _08013FD4 + bgt @08013FD4 cmp r0, 0 - beq _08013FDE - b _080140BC + beq @08013FDE + b @080140BC .align 2, 0 .pool -_08013FD4: +@08013FD4: cmp r0, 0x2 - beq _08014038 + beq @08014038 cmp r0, 0x3 - beq _08014070 - b _080140BC -_08013FDE: + beq @08014070 + b @080140BC +@08013FDE: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] @@ -22795,15 +22795,15 @@ _08013FDE: movs r0, 0 movs r2, 0x64 bl link_0800A448 - b _080140BC + b @080140BC .align 2, 0 .pool -_08013FFC: +@08013FFC: bl sub_800A550 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bne _080140BC + bne @080140BC bl link_get_multiplayer_id adds r1, r0, 0 ldr r0, =0x02024744 @@ -22818,10 +22818,10 @@ _08013FFC: movs r0, 0x32 bl sav12_xor_increment bl sub_800A5B4 - b _0801405A + b @0801405A .align 2, 0 .pool -_08014038: +@08014038: ldr r4, =0x020228c4 ldr r0, =0x03005d8c ldr r1, [r0] @@ -22836,20 +22836,20 @@ _08014038: bl link_0800A448 lsls r0, 24 cmp r0, 0 - beq _080140BC -_0801405A: + beq @080140BC +@0801405A: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] - b _080140BC + b @080140BC .align 2, 0 .pool -_08014070: +@08014070: bl sub_800A550 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bne _080140BC + bne @080140BC ldr r4, =0x020321c0 bl link_get_multiplayer_id adds r1, r0, 0 @@ -22876,7 +22876,7 @@ _08014070: bl sub_801807C adds r0, r6, 0 bl remove_task -_080140BC: +@080140BC: pop {r3} mov r8, r3 pop {r4-r7} @@ -22887,7 +22887,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 @@ -22899,38 +22899,38 @@ sub_80140E0: @ 80140E0 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - beq _08014104 + beq @08014104 cmp r0, 0x1 - beq _0801411C - b _0801419E + beq @0801411C + b @0801419E .align 2, 0 .pool -_08014104: +@08014104: bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - bne _08014114 + bne @08014114 movs r0, 0x2 bl sub_800A4D8 -_08014114: +@08014114: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0801419E -_0801411C: + b @0801419E +@0801411C: bl sub_800A550 adds r4, r0, 0 bl sub_800A9D8 lsls r4, 24 lsls r0, 24 cmp r4, r0 - bne _0801419E + bne @0801419E movs r4, 0 ldr r5, =0x020229e8 - b _08014152 + b @08014152 .align 2, 0 .pool -_08014138: +@08014138: lsls r1, r4, 8 ldr r0, =0x020223c4 adds r3, r1, r0 @@ -22943,17 +22943,17 @@ _08014138: bl sub_80C3120 adds r5, 0x1C adds r4, 0x1 -_08014152: +@08014152: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r4, r0 - blt _08014138 + blt @08014138 bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _08014190 + bne @08014190 bl link_get_multiplayer_id movs r1, 0x1 eors r0, r1 @@ -22965,23 +22965,23 @@ _08014152: adds r0, 0x60 ldrh r0, [r0] bl sub_801B94C - b _08014194 + b @08014194 .align 2, 0 .pool -_08014190: +@08014190: bl sub_801B940 -_08014194: +@08014194: bl sub_800A5B4 adds r0, r6, 0 bl remove_task -_0801419E: +@0801419E: pop {r4-r6} pop {r0} bx r0 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 @@ -22989,28 +22989,28 @@ sub_80141A4: @ 80141A4 adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0 - beq _080141C0 + beq @080141C0 cmp r0, 0x1 - beq _080141D4 - b _080141F2 + beq @080141D4 + b @080141F2 .align 2, 0 .pool -_080141C0: +@080141C0: ldr r0, =sub_80140E0 + 1 movs r1, 0x5 bl AddTask ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _080141F2 + b @080141F2 .align 2, 0 .pool -_080141D4: +@080141D4: ldr r0, =sub_80140E0 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _080141F2 + bne @080141F2 bl link_get_multiplayer_id movs r1, 0x1 eors r0, r1 @@ -23018,7 +23018,7 @@ _080141D4: lsrs r0, 24 ldr r1, =c2_exit_to_overworld_2_switch + 1 bl sub_80C4E74 -_080141F2: +@080141F2: bl run_active_tasks bl run_remoboxes bl call_obj_callbacks @@ -23031,7 +23031,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 @@ -23083,7 +23083,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} @@ -23139,7 +23139,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} @@ -23195,7 +23195,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 @@ -23203,31 +23203,31 @@ sub_8014384: @ 8014384 adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0 - beq _080143A0 + beq @080143A0 cmp r0, 0x1 - beq _080143B4 - b _080143C6 + beq @080143B4 + b @080143C6 .align 2, 0 .pool -_080143A0: +@080143A0: ldr r0, =sub_80140E0 + 1 movs r1, 0x5 bl AddTask ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _080143C6 + b @080143C6 .align 2, 0 .pool -_080143B4: +@080143B4: ldr r0, =sub_80140E0 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _080143C6 + bne @080143C6 ldr r0, =sub_8086074 + 1 bl set_callback2 -_080143C6: +@080143C6: bl run_active_tasks bl run_remoboxes bl call_obj_callbacks @@ -23240,30 +23240,30 @@ _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 bl sub_80C30A4 cmp r5, 0 - beq _080143FE + beq @080143FE bl sub_801B39C adds r1, r4, 0 adds r1, 0x60 strh r0, [r1] - b _08014404 -_080143FE: + b @08014404 +@080143FE: adds r0, r4, 0 adds r0, 0x60 strh r5, [r0] -_08014404: +@08014404: pop {r4,r5} pop {r0} bx r0 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 @@ -23273,142 +23273,142 @@ sub_801440C: @ 801440C ldrb r0, [r0] subs r0, 0x1 cmp r0, 0xE - bhi _08014474 + bhi @08014474 lsls r0, 2 - ldr r1, =_08014434 + ldr r1, =@08014434 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08014434: - .4byte _08014470 - .4byte _08014470 - .4byte _08014470 - .4byte _08014470 - .4byte _08014474 - .4byte _08014474 - .4byte _08014474 - .4byte _08014474 - .4byte _08014470 - .4byte _08014470 - .4byte _08014470 - .4byte _08014474 - .4byte _08014470 - .4byte _08014474 - .4byte _08014470 -_08014470: +@08014434: + .4byte @08014470 + .4byte @08014470 + .4byte @08014470 + .4byte @08014470 + .4byte @08014474 + .4byte @08014474 + .4byte @08014474 + .4byte @08014474 + .4byte @08014470 + .4byte @08014470 + .4byte @08014470 + .4byte @08014474 + .4byte @08014470 + .4byte @08014474 + .4byte @08014470 +@08014470: bl sub_800E3A8 -_08014474: +@08014474: ldr r0, =0x02022c2c ldrb r0, [r0] subs r0, 0x1 cmp r0, 0x50 - bls _08014480 - b _08014764 -_08014480: + bls @08014480 + b @08014764 +@08014480: lsls r0, 2 - ldr r1, =_08014494 + ldr r1, =@08014494 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08014494: - .4byte _080145F4 - .4byte _08014620 - .4byte _0801464C - .4byte _08014678 - .4byte _080146D8 - .4byte _08014764 - .4byte _08014764 - .4byte _080146FC - .4byte _08014714 - .4byte _08014734 - .4byte _0801474C - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014698 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _080145D8 - .4byte _08014764 - .4byte _08014764 - .4byte _080146C4 - .4byte _080146D8 - .4byte _08014764 - .4byte _08014764 - .4byte _080146FC - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _080145D8 -_080145D8: +@08014494: + .4byte @080145F4 + .4byte @08014620 + .4byte @0801464C + .4byte @08014678 + .4byte @080146D8 + .4byte @08014764 + .4byte @08014764 + .4byte @080146FC + .4byte @08014714 + .4byte @08014734 + .4byte @0801474C + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014698 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @080145D8 + .4byte @08014764 + .4byte @08014764 + .4byte @080146C4 + .4byte @080146D8 + .4byte @08014764 + .4byte @08014764 + .4byte @080146FC + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @08014764 + .4byte @080145D8 +@080145D8: bl overworld_free_bg_tilemaps ldr r1, =0x030022c0 ldr r0, =sub_801AC54 + 1 str r0, [r1, 0x8] movs r0, 0x3 bl sub_81B8518 - b _08014764 + b @08014764 .align 2, 0 .pool -_080145F4: +@080145F4: bl overworld_free_bg_tilemaps ldr r0, =0x020228c4 movs r1, 0x1 @@ -23422,10 +23422,10 @@ _080145F4: movs r1, 0x18 movs r2, 0x6 movs r3, 0x8 - b _080146B0 + b @080146B0 .align 2, 0 .pool -_08014620: +@08014620: bl overworld_free_bg_tilemaps bl sp000_heal_pokemon bl copy_player_party_to_sav1 @@ -23439,10 +23439,10 @@ _08014620: movs r1, 0x18 movs r2, 0x6 movs r3, 0x8 - b _080146B0 + b @080146B0 .align 2, 0 .pool -_0801464C: +@0801464C: bl overworld_free_bg_tilemaps bl sp000_heal_pokemon bl copy_player_party_to_sav1 @@ -23456,10 +23456,10 @@ _0801464C: movs r1, 0x1B movs r2, 0x5 movs r3, 0x8 - b _080146B0 + b @080146B0 .align 2, 0 .pool -_08014678: +@08014678: ldr r0, =0x020228c4 movs r1, 0x1 bl sub_80143E4 @@ -23470,10 +23470,10 @@ _08014678: movs r1, 0x19 movs r2, 0x5 movs r3, 0x8 - b _080146B0 + b @080146B0 .align 2, 0 .pool -_08014698: +@08014698: ldr r0, =0x020228c4 movs r1, 0x1 bl sub_80143E4 @@ -23484,47 +23484,47 @@ _08014698: movs r1, 0x1A movs r2, 0x8 movs r3, 0x9 -_080146B0: +@080146B0: bl sub_8014304 ldr r0, =sub_8014384 + 1 bl set_callback2 - b _08014764 + b @08014764 .align 2, 0 .pool -_080146C4: +@080146C4: bl overworld_free_bg_tilemaps ldr r0, =sub_8013F90 + 1 movs r1, 0 bl AddTask - b _08014764 + b @08014764 .align 2, 0 .pool -_080146D8: +@080146D8: bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - bne _080146E8 + bne @080146E8 bl sub_800ED10 - b _080146F6 -_080146E8: + b @080146F6 +@080146E8: bl sub_800ED28 movs r0, 0x45 movs r1, 0 movs r2, 0x1 bl sub_8010F84 -_080146F6: +@080146F6: bl sub_801DD98 - b _08014764 -_080146FC: + b @08014764 +@080146FC: ldr r0, =0x020228c4 movs r1, 0 bl sub_80143E4 ldr r0, =sub_80141A4 + 1 bl set_callback2 - b _08014764 + b @08014764 .align 2, 0 .pool -_08014714: +@08014714: movs r0, 0x8 movs r1, 0x5 movs r2, 0x1 @@ -23534,20 +23534,20 @@ _08014714: lsrs r0, 24 ldr r1, =c2_load_new_map + 1 bl sub_802A9A8 - b _08014764 + b @08014764 .align 2, 0 .pool -_08014734: +@08014734: movs r0, 0x7 movs r1, 0x9 movs r2, 0x1 bl sub_8014290 ldr r0, =c2_load_new_map + 1 bl sub_8020C70 - b _08014764 + b @08014764 .align 2, 0 .pool -_0801474C: +@0801474C: movs r0, 0x8 movs r1, 0x5 movs r2, 0x1 @@ -23557,7 +23557,7 @@ _0801474C: lsrs r0, 24 ldr r1, =c2_load_new_map + 1 bl sub_802493C -_08014764: +@08014764: adds r0, r4, 0 bl remove_task ldr r1, =0x020375f0 @@ -23566,9 +23566,9 @@ _08014764: ldr r0, =0x02022c2c ldrb r0, [r0] cmp r0, 0x44 - beq _0801477C + beq @0801477C bl script_env_2_disable -_0801477C: +@0801477C: add sp, 0x4 pop {r4} pop {r0} @@ -23578,7 +23578,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 @@ -23596,28 +23596,28 @@ sub_8014790: @ 8014790 ldrsh r0, [r7, r1] mov r2, r9 cmp r0, 0x8 - bls _080147B6 - b _080149B2 -_080147B6: + bls @080147B6 + b @080149B2 +@080147B6: lsls r0, 2 - ldr r1, =_080147CC + ldr r1, =@080147CC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080147CC: - .4byte _080147F0 - .4byte _080148CC - .4byte _080148E4 - .4byte _0801491E - .4byte _08014934 - .4byte _0801494A - .4byte _08014986 - .4byte _08014992 - .4byte _0801499C -_080147F0: +@080147CC: + .4byte @080147F0 + .4byte @080148CC + .4byte @080148E4 + .4byte @0801491E + .4byte @08014934 + .4byte @0801494A + .4byte @08014986 + .4byte @08014992 + .4byte @0801499C +@080147F0: ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] @@ -23625,32 +23625,32 @@ _080147F0: ldrb r0, [r0] subs r0, 0xE cmp r0, 0xE - bhi _080148C2 + bhi @080148C2 lsls r0, 2 - ldr r1, =_08014818 + ldr r1, =@08014818 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08014818: - .4byte _08014854 - .4byte _080148C2 - .4byte _080148B8 - .4byte _080148C2 - .4byte _080148C2 - .4byte _080148C2 - .4byte _080148C2 - .4byte _080148C2 - .4byte _080148C2 - .4byte _080148B8 - .4byte _080148B8 - .4byte _080148B8 - .4byte _080148B8 - .4byte _080148B8 - .4byte _08014854 -_08014854: +@08014818: + .4byte @08014854 + .4byte @080148C2 + .4byte @080148B8 + .4byte @080148C2 + .4byte @080148C2 + .4byte @080148C2 + .4byte @080148C2 + .4byte @080148C2 + .4byte @080148C2 + .4byte @080148B8 + .4byte @080148B8 + .4byte @080148B8 + .4byte @080148B8 + .4byte @080148B8 + .4byte @08014854 +@08014854: ldr r1, =0x020229e8 ldr r0, =0x00002211 str r0, [r1, 0x14] @@ -23685,78 +23685,78 @@ _08014854: strh r0, [r7] bl sub_800E3A8 bl sub_800A5B4 - b _080149B2 + b @080149B2 .align 2, 0 .pool -_080148B8: +@080148B8: bl sub_800E3A8 adds r0, r4, 0 bl remove_task -_080148C2: +@080148C2: bl script_env_2_enable_and_set_ctx_running movs r0, 0x1 strh r0, [r7] - b _080149B2 -_080148CC: + b @080149B2 +@080148CC: bl script_env_context_is_running lsls r0, 24 cmp r0, 0 - bne _080149B2 + bne @080149B2 movs r0, 0x1 movs r1, 0 bl fade_screen movs r0, 0x2 strh r0, [r7] - b _080149B2 -_080148E4: + b @080149B2 +@080148E4: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080149B2 + bne @080149B2 ldr r0, =0x02022c2c ldrb r0, [r0] cmp r0, 0x1D - bne _08014914 + bne @08014914 adds r0, r4, 0 bl remove_task ldr r0, =sub_80773AC + 1 bl set_callback2 - b _080149B2 + b @080149B2 .align 2, 0 .pool -_08014914: +@08014914: bl sub_800ADF8 movs r0, 0x3 strh r0, [r7] - b _080149B2 -_0801491E: + b @080149B2 +@0801491E: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080149B2 + beq @080149B2 adds r0, r4, 0 bl remove_task bl sub_80149D8 - b _080149B2 -_08014934: + b @080149B2 +@08014934: movs r0, 0 adds r1, r2, 0 movs r2, 0xE bl link_0800A448 lsls r0, 24 cmp r0, 0 - beq _080149B2 + beq @080149B2 movs r0, 0x5 strh r0, [r7] - b _080149B2 -_0801494A: + b @080149B2 +@0801494A: bl sub_800A550 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bne _080149B2 + bne @080149B2 bl sub_800A5B4 ldr r0, =0x020223c4 movs r2, 0x80 @@ -23764,39 +23764,39 @@ _0801494A: adds r1, r0, r2 bl sub_80B2AF4 cmp r0, 0 - beq _08014980 + beq @08014980 ldr r0, =0x020375f0 movs r1, 0xB strh r1, [r0] movs r0, 0x7 strh r0, [r7] - b _080149B2 + b @080149B2 .align 2, 0 .pool -_08014980: +@08014980: movs r0, 0x6 strh r0, [r7] - b _080149B2 -_08014986: + b @080149B2 +@08014986: bl script_env_2_enable_and_set_ctx_running adds r0, r4, 0 bl remove_task - b _080149B2 -_08014992: + b @080149B2 +@08014992: bl sub_800AC34 movs r0, 0x8 strh r0, [r7] - b _080149B2 -_0801499C: + b @080149B2 +@0801499C: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _080149B2 + bne @080149B2 bl sub_800E084 bl script_env_2_enable_and_set_ctx_running adds r0, r4, 0 bl remove_task -_080149B2: +@080149B2: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -23808,7 +23808,7 @@ _080149B2: thumb_func_end sub_8014790 thumb_func_start sub_80149C4 -sub_80149C4: @ 80149C4 +sub_80149C4: ; 80149C4 push {lr} ldr r0, =sub_8014790 + 1 movs r1, 0 @@ -23820,7 +23820,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 + 1 movs r1, 0 @@ -23841,7 +23841,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 + 1 @@ -23870,7 +23870,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 @@ -23879,37 +23879,37 @@ sub_8014A40: @ 8014A40 ldr r5, [r0] ldrb r0, [r5, 0xC] cmp r0, 0x11 - bls _08014A54 - b _08014EF2 -_08014A54: + bls @08014A54 + b @08014EF2 +@08014A54: lsls r0, 2 - ldr r1, =_08014A68 + ldr r1, =@08014A68 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08014A68: - .4byte _08014AB0 - .4byte _08014AEC - .4byte _08014BBC - .4byte _08014BEC - .4byte _08014BFC - .4byte _08014C4C - .4byte _08014C24 - .4byte _08014C52 - .4byte _08014CF2 - .4byte _08014DBC - .4byte _08014DCC - .4byte _08014DE2 - .4byte _08014DFA - .4byte _08014E16 - .4byte _08014E4E - .4byte _08014E74 - .4byte _08014EA8 - .4byte _08014EE2 -_08014AB0: +@08014A68: + .4byte @08014AB0 + .4byte @08014AEC + .4byte @08014BBC + .4byte @08014BEC + .4byte @08014BFC + .4byte @08014C4C + .4byte @08014C24 + .4byte @08014C52 + .4byte @08014CF2 + .4byte @08014DBC + .4byte @08014DCC + .4byte @08014DE2 + .4byte @08014DFA + .4byte @08014E16 + .4byte @08014E4E + .4byte @08014E74 + .4byte @08014EA8 + .4byte @08014EE2 +@08014AB0: ldr r1, =0x02022c2c ldrb r0, [r5, 0x18] strb r0, [r1] @@ -23929,10 +23929,10 @@ _08014AB0: bl sub_8011C10 movs r0, 0x1 strb r0, [r5, 0xC] - b _08014EF2 + b @08014EF2 .align 2, 0 .pool -_08014AEC: +@08014AEC: movs r0, 0x70 bl malloc_and_clear str r0, [r5, 0x4] @@ -24014,10 +24014,10 @@ _08014AEC: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x1 strb r0, [r5, 0x13] - b _08014C42 + b @08014C42 .align 2, 0 .pool -_08014BBC: +@08014BBC: ldr r0, =0x02021cc4 ldr r2, =0x082f0048 ldr r4, =0x02022c2c @@ -24031,18 +24031,18 @@ _08014BBC: bl sub_801262C movs r0, 0x3 strb r0, [r5, 0xC] - b _08014EF2 + b @08014EF2 .align 2, 0 .pool -_08014BEC: +@08014BEC: ldr r0, =0x02021fc4 bl sub_8018884 movs r0, 0x4 strb r0, [r5, 0xC] - b _08014EF2 + b @08014EF2 .align 2, 0 .pool -_08014BFC: +@08014BFC: adds r0, r5, 0 movs r1, 0x5 movs r2, 0x6 @@ -24052,40 +24052,40 @@ _08014BFC: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _08014C14 - b _08014EF2 -_08014C14: + bne @08014C14 + b @08014EF2 +@08014C14: movs r0, 0xD strb r0, [r5, 0xC] bl sub_800E084 - b _08014EF2 + b @08014EF2 .align 2, 0 .pool -_08014C24: +@08014C24: adds r0, r5, 0 adds r0, 0xD ldr r1, =0x082edf40 bl mevent_0814257C cmp r0, 0 - bne _08014C34 - b _08014EF2 -_08014C34: + bne @08014C34 + b @08014EF2 +@08014C34: ldr r0, [r5] bl sub_8013398 strb r0, [r5, 0x13] ldrb r0, [r5, 0x12] bl sub_81AE70C -_08014C42: +@08014C42: movs r0, 0x2 strb r0, [r5, 0xC] - b _08014EF2 + b @08014EF2 .align 2, 0 .pool -_08014C4C: +@08014C4C: movs r0, 0x7 strb r0, [r5, 0xC] - b _08014EF2 -_08014C52: + b @08014EF2 +@08014C52: adds r0, r5, 0 adds r0, 0xD adds r1, r5, 0 @@ -24096,21 +24096,21 @@ _08014C52: lsls r0, 24 asrs r4, r0, 24 cmp r4, 0 - beq _08014C82 + beq @08014C82 cmp r4, 0 - bgt _08014C7C + bgt @08014C7C movs r0, 0x1 negs r0, r0 cmp r4, r0 - beq _08014CC4 - b _08014EF2 + beq @08014CC4 + b @08014EF2 .align 2, 0 .pool -_08014C7C: +@08014C7C: cmp r4, 0x1 - beq _08014CC4 - b _08014EF2 -_08014C82: + beq @08014CC4 + b @08014EF2 +@08014C82: bl sub_800E0E8 movs r0, 0 movs r1, 0 @@ -24139,8 +24139,8 @@ _08014C82: adds r2, r0 adds r2, 0x10 movs r0, 0x5 - b _08014CE8 -_08014CC4: + b @08014CE8 +@08014CC4: movs r0, 0x6 strb r0, [r5, 0x19] ldrb r1, [r5, 0x13] @@ -24158,12 +24158,12 @@ _08014CC4: adds r2, r0 adds r2, 0x10 movs r0, 0x6 -_08014CE8: +@08014CE8: bl sub_8010688 movs r0, 0x8 strb r0, [r5, 0xC] - b _08014EF2 -_08014CF2: + b @08014EF2 +@08014CF2: ldrb r1, [r5, 0x13] lsls r1, 5 ldr r0, [r5] @@ -24180,10 +24180,10 @@ _08014CF2: bl sub_8010714 adds r4, r0, 0 cmp r4, 0x1 - bne _08014DAA + bne @08014DAA ldrb r0, [r5, 0x19] cmp r0, 0x5 - bne _08014D64 + bne @08014D64 ldr r1, [r5] ldrb r0, [r5, 0x13] lsls r0, 5 @@ -24208,10 +24208,10 @@ _08014CF2: movs r0, 0x9 strb r0, [r5, 0xC] bl sub_800EF38 - b _08014DA4 + b @08014DA4 .align 2, 0 .pool -_08014D64: +@08014D64: ldrb r1, [r5, 0x13] lsls r1, 5 ldr r0, [r5] @@ -24240,69 +24240,69 @@ _08014D64: bl sub_81AE70C movs r0, 0x2 strb r0, [r5, 0xC] -_08014DA4: +@08014DA4: movs r0, 0 strb r0, [r5, 0x19] - b _08014EF2 -_08014DAA: + b @08014EF2 +@08014DAA: cmp r4, 0x2 - beq _08014DB0 - b _08014EF2 -_08014DB0: + beq @08014DB0 + b @08014EF2 +@08014DB0: movs r0, 0 movs r1, 0 bl sub_8011A64 strb r4, [r5, 0xC] - b _08014EF2 -_08014DBC: + b @08014EF2 +@08014DBC: ldr r0, =0x02021fc4 bl sub_8018884 movs r0, 0xA strb r0, [r5, 0xC] - b _08014EF2 + b @08014EF2 .align 2, 0 .pool -_08014DCC: +@08014DCC: ldrb r0, [r5, 0xE] adds r0, 0x1 strb r0, [r5, 0xE] lsls r0, 24 lsrs r0, 24 cmp r0, 0x78 - bhi _08014DDC - b _08014EF2 -_08014DDC: + bhi @08014DDC + b @08014EF2 +@08014DDC: movs r0, 0xB strb r0, [r5, 0xC] - b _08014EF2 -_08014DE2: + b @08014EF2 +@08014DE2: adds r0, r5, 0 movs r1, 0x5 movs r2, 0x6 bl sub_801320C lsls r0, 24 cmp r0, 0 - beq _08014DF4 - b _08014EF2 -_08014DF4: + beq @08014DF4 + b @08014EF2 +@08014DF4: movs r0, 0xC strb r0, [r5, 0xC] - b _08014EF2 -_08014DFA: + b @08014EF2 +@08014DFA: bl sub_800EF1C lsls r0, 24 cmp r0, 0 - beq _08014E10 + beq @08014E10 movs r0, 0 bl sub_800EF58 movs r0, 0xF strb r0, [r5, 0xC] - b _08014EF2 -_08014E10: + b @08014EF2 +@08014E10: movs r0, 0x6 strb r0, [r5, 0xC] - b _08014EF2 -_08014E16: + b @08014EF2 +@08014E16: bl sub_800E084 bl sub_800EDD4 ldrb r0, [r5, 0x12] @@ -24321,48 +24321,48 @@ _08014E16: bl free ldr r0, [r5, 0x4] bl free - b _08014EDA -_08014E4E: + b @08014EDA +@08014E4E: adds r0, r5, 0 adds r0, 0xD ldr r1, =0x082ed8d0 bl mevent_0814257C cmp r0, 0 - beq _08014EF2 + beq @08014EF2 adds r0, r4, 0 bl remove_task ldr r1, =0x020375f0 movs r0, 0x5 strh r0, [r1] - b _08014EF2 + b @08014EF2 .align 2, 0 .pool -_08014E74: +@08014E74: bl sub_8011A74 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08014E8C + beq @08014E8C bl sub_8011A74 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _08014E92 -_08014E8C: + bne @08014E92 +@08014E8C: movs r0, 0xD strb r0, [r5, 0xC] - b _08014EF2 -_08014E92: + b @08014EF2 +@08014E92: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _08014EF2 + beq @08014EF2 movs r0, 0x1 bl sub_8011068 - b _08014EDA + b @08014EDA .align 2, 0 .pool -_08014EA8: +@08014EA8: ldrb r0, [r5, 0x12] movs r1, 0 movs r2, 0 @@ -24380,19 +24380,19 @@ _08014EA8: ldr r0, [r5, 0x4] bl free bl sub_800ADF8 -_08014EDA: +@08014EDA: ldrb r0, [r5, 0xC] adds r0, 0x1 strb r0, [r5, 0xC] - b _08014EF2 -_08014EE2: + b @08014EF2 +@08014EE2: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08014EF2 + beq @08014EF2 adds r0, r4, 0 bl remove_task -_08014EF2: +@08014EF2: add sp, 0x8 pop {r4-r6} pop {r0} @@ -24400,7 +24400,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 + 1 @@ -24432,7 +24432,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 @@ -24441,32 +24441,32 @@ sub_8014F48: @ 8014F48 ldr r7, [r0] ldrb r0, [r7, 0x8] cmp r0, 0xC - bls _08014F5C - b _080152A0 -_08014F5C: + bls @08014F5C + b @080152A0 +@08014F5C: lsls r0, 2 - ldr r1, =_08014F70 + ldr r1, =@08014F70 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08014F70: - .4byte _08014FA4 - .4byte _08014FD8 - .4byte _08014FE8 - .4byte _080150B8 - .4byte _08015180 - .4byte _080151A4 - .4byte _08015204 - .4byte _08015260 - .4byte _08015204 - .4byte _0801523A - .4byte _08015204 - .4byte _08015284 - .4byte _08015290 -_08014FA4: +@08014F70: + .4byte @08014FA4 + .4byte @08014FD8 + .4byte @08014FE8 + .4byte @080150B8 + .4byte @08015180 + .4byte @080151A4 + .4byte @08015204 + .4byte @08015260 + .4byte @08015204 + .4byte @0801523A + .4byte @08015204 + .4byte @08015284 + .4byte @08015290 +@08014FA4: ldrb r0, [r7, 0x12] adds r0, 0x15 lsls r0, 24 @@ -24486,16 +24486,16 @@ _08014FA4: str r0, [r7] movs r0, 0x1 strb r0, [r7, 0x8] - b _080152A0 -_08014FD8: + b @080152A0 +@08014FD8: ldr r0, =0x082ef7f8 bl sub_8018884 movs r0, 0x2 strb r0, [r7, 0x8] - b _080152A0 + b @080152A0 .align 2, 0 .pool -_08014FE8: +@08014FE8: ldr r0, [r7, 0x4] movs r1, 0x4 bl sub_80175EC @@ -24572,24 +24572,24 @@ _08014FE8: strb r6, [r7, 0xF] movs r0, 0x3 strb r0, [r7, 0x8] - b _080152A0 + b @080152A0 .align 2, 0 .pool -_080150B8: +@080150B8: bl sub_8013E44 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - beq _080150D6 + beq @080150D6 cmp r2, 0x1 - bne _080150CE + bne @080150CE movs r0, 0x2 bl audio_play -_080150CE: +@080150CE: ldrb r0, [r7, 0xE] bl sub_81AE70C - b _080152A0 -_080150D6: + b @080152A0 +@080150D6: ldrb r0, [r7, 0xE] bl sub_81AE604 adds r2, r0, 0 @@ -24598,11 +24598,11 @@ _080150D6: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08015168 + beq @08015168 movs r0, 0x1 negs r0, r0 cmp r2, r0 - beq _08015168 + beq @08015168 ldr r0, [r7] lsls r1, r2, 5 adds r0, r1 @@ -24611,10 +24611,10 @@ _080150D6: lsls r0, 30 lsrs r0, 30 cmp r0, 0x1 - bne _08015160 + bne @08015160 lsrs r0, r1, 7 cmp r0, 0 - bne _08015160 + bne @08015160 strb r2, [r7, 0xF] bl sub_800E0E8 movs r0, 0 @@ -24645,28 +24645,28 @@ _080150D6: bl audio_play movs r0, 0x4 strb r0, [r7, 0x8] - b _080152A0 + b @080152A0 .align 2, 0 .pool -_08015160: +@08015160: movs r0, 0x7 bl audio_play - b _080152A0 -_08015168: + b @080152A0 +@08015168: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _08015176 - b _080152A0 -_08015176: + bne @08015176 + b @080152A0 +@08015176: movs r0, 0x6 strb r0, [r7, 0x8] - b _080152A0 + b @080152A0 .align 2, 0 .pool -_08015180: +@08015180: ldr r0, =0x082efc3c bl sub_8018884 ldr r0, =0x02021cc4 @@ -24677,14 +24677,14 @@ _08015180: bl sub_8018404 movs r0, 0x5 strb r0, [r7, 0x8] - b _080152A0 + b @080152A0 .align 2, 0 .pool -_080151A4: +@080151A4: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _080151C2 + beq @080151C2 ldr r2, =0x02022c2c ldr r1, [r7] ldrb r0, [r7, 0xF] @@ -24696,38 +24696,38 @@ _080151A4: strb r0, [r2] movs r0, 0xA strb r0, [r7, 0x8] -_080151C2: +@080151C2: bl sub_8011A74 lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 - beq _080151EE + beq @080151EE cmp r0, 0x5 - bgt _080151E4 + bgt @080151E4 cmp r0, 0x2 - bgt _080152A0 + bgt @080152A0 cmp r0, 0x1 - blt _080152A0 - b _080151E8 + blt @080152A0 + b @080151E8 .align 2, 0 .pool -_080151E4: +@080151E4: cmp r0, 0x6 - bne _080152A0 -_080151E8: + bne @080152A0 +@080151E8: movs r0, 0x8 strb r0, [r7, 0x8] - b _080152A0 -_080151EE: + b @080152A0 +@080151EE: ldr r0, =0x082eddf4 bl sub_8018884 movs r0, 0 movs r1, 0 bl sub_8011A64 - b _080152A0 + b @080152A0 .align 2, 0 .pool -_08015204: +@08015204: ldrb r0, [r7, 0xE] movs r1, 0 movs r2, 0 @@ -24747,8 +24747,8 @@ _08015204: ldrb r0, [r7, 0x8] adds r0, 0x1 strb r0, [r7, 0x8] - b _080152A0 -_0801523A: + b @080152A0 +@0801523A: adds r5, r7, 0 adds r5, 0x9 ldr r4, =0x082edf80 @@ -24760,39 +24760,39 @@ _0801523A: adds r0, r5, 0 bl mevent_0814257C cmp r0, 0 - beq _080152A0 + beq @080152A0 bl sub_800E084 - b _0801526A + b @0801526A .align 2, 0 .pool -_08015260: +@08015260: bl sub_800E084 ldr r0, =0x082ed8d0 bl sub_8018884 -_0801526A: +@0801526A: adds r0, r6, 0 bl remove_task bl sub_800EDD4 ldr r1, =0x020375f0 movs r0, 0x5 strh r0, [r1] - b _080152A0 + b @080152A0 .align 2, 0 .pool -_08015284: +@08015284: ldrb r0, [r7, 0x8] adds r0, 0x1 strb r0, [r7, 0x8] bl sub_800ADF8 - b _080152A0 -_08015290: + b @080152A0 +@08015290: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080152A0 + beq @080152A0 adds r0, r6, 0 bl remove_task -_080152A0: +@080152A0: add sp, 0x10 pop {r4-r7} pop {r0} @@ -24800,7 +24800,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 + 1 @@ -24832,7 +24832,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 @@ -24841,34 +24841,34 @@ task00_081182DC: @ 80152F4 ldr r5, [r0] ldrb r0, [r5, 0x8] cmp r0, 0xE - bls _08015308 - b _08015604 -_08015308: + bls @08015308 + b @08015604 +@08015308: lsls r0, 2 - ldr r1, =_0801531C + ldr r1, =@0801531C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801531C: - .4byte _08015358 - .4byte _08015386 - .4byte _08015398 - .4byte _08015420 - .4byte _080154E0 - .4byte _08015504 - .4byte _08015564 - .4byte _080155A8 - .4byte _08015564 - .4byte _0801559A - .4byte _08015564 - .4byte _080155B4 - .4byte _08015564 - .4byte _080155E8 - .4byte _080155F4 -_08015358: +@0801531C: + .4byte @08015358 + .4byte @08015386 + .4byte @08015398 + .4byte @08015420 + .4byte @080154E0 + .4byte @08015504 + .4byte @08015564 + .4byte @080155A8 + .4byte @08015564 + .4byte @0801559A + .4byte @08015564 + .4byte @080155B4 + .4byte @08015564 + .4byte @080155E8 + .4byte @080155F4 +@08015358: movs r0, 0 movs r1, 0 movs r2, 0 @@ -24885,16 +24885,16 @@ _08015358: str r0, [r5] movs r0, 0x1 strb r0, [r5, 0x8] - b _08015604 -_08015386: + b @08015604 +@08015386: ldr r0, =0x082efbc8 bl sub_8018884 movs r0, 0x2 strb r0, [r5, 0x8] - b _08015604 + b @08015604 .align 2, 0 .pool -_08015398: +@08015398: ldr r0, [r5, 0x4] movs r1, 0x4 bl sub_80175EC @@ -24908,7 +24908,7 @@ _08015398: strb r0, [r5, 0x11] ldrb r0, [r5, 0x13] cmp r0, 0 - beq _08015404 + beq @08015404 ldr r0, =0x082f0174 ldr r1, [r0, 0x4] ldr r0, [r0] @@ -24941,62 +24941,62 @@ _08015398: strb r0, [r5, 0xE] movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram -_08015404: +@08015404: movs r0, 0 strb r0, [r5, 0xF] movs r0, 0x3 strb r0, [r5, 0x8] - b _08015604 + b @08015604 .align 2, 0 .pool -_08015420: +@08015420: bl sub_8013E44 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _08015446 + beq @08015446 cmp r0, 0x1 - bne _08015436 + bne @08015436 movs r0, 0x2 bl audio_play -_08015436: +@08015436: ldrb r0, [r5, 0x13] cmp r0, 0 - bne _0801543E - b _08015604 -_0801543E: + bne @0801543E + b @08015604 +@0801543E: ldrb r0, [r5, 0xE] bl sub_81AE70C - b _08015604 -_08015446: + b @08015604 +@08015446: ldrb r0, [r5, 0x13] cmp r0, 0 - beq _08015452 + beq @08015452 ldrb r0, [r5, 0xE] bl sub_81AE604 -_08015452: +@08015452: ldrb r0, [r5, 0x14] cmp r0, 0x78 - bls _080154C0 + bls @080154C0 ldr r2, [r5] ldrb r1, [r2, 0x1A] movs r0, 0x3 ands r0, r1 cmp r0, 0x1 - bne _080154D4 + bne @080154D4 ldrb r1, [r2, 0xA] movs r0, 0x80 ands r0, r1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _080154D4 + bne @080154D4 ldrb r1, [r5, 0x12] adds r1, 0x7 adds r0, r2, 0 bl sub_8016F1C cmp r0, 0 - beq _080154B4 + beq @080154B4 strb r4, [r5, 0xF] strb r4, [r5, 0x14] bl sub_800E0E8 @@ -25017,32 +25017,32 @@ _08015452: bl audio_play movs r0, 0x4 strb r0, [r5, 0x8] - b _080154D4 -_080154B4: + b @080154D4 +@080154B4: movs r0, 0x16 bl audio_play movs r0, 0xA strb r0, [r5, 0x8] - b _080154D4 -_080154C0: + b @080154D4 +@080154C0: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080154D4 + beq @080154D4 movs r1, 0 movs r0, 0x6 strb r0, [r5, 0x8] strb r1, [r5, 0x14] -_080154D4: +@080154D4: ldrb r0, [r5, 0x14] adds r0, 0x1 strb r0, [r5, 0x14] - b _08015604 + b @08015604 .align 2, 0 .pool -_080154E0: +@080154E0: ldr r0, =0x082efc90 bl sub_8018884 ldr r0, =0x02021cc4 @@ -25053,14 +25053,14 @@ _080154E0: bl sub_8018404 movs r0, 0x5 strb r0, [r5, 0x8] - b _08015604 + b @08015604 .align 2, 0 .pool -_08015504: +@08015504: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _08015522 + beq @08015522 ldr r2, =0x02022c2c ldr r1, [r5] ldrb r0, [r5, 0xF] @@ -25072,41 +25072,41 @@ _08015504: strb r0, [r2] movs r0, 0xC strb r0, [r5, 0x8] -_08015522: +@08015522: bl sub_8011A74 lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 - beq _0801554E + beq @0801554E cmp r0, 0x5 - bgt _08015544 + bgt @08015544 cmp r0, 0x2 - bgt _08015604 + bgt @08015604 cmp r0, 0x1 - blt _08015604 - b _08015548 + blt @08015604 + b @08015548 .align 2, 0 .pool -_08015544: +@08015544: cmp r0, 0x6 - bne _08015604 -_08015548: + bne @08015604 +@08015548: movs r0, 0x8 strb r0, [r5, 0x8] - b _08015604 -_0801554E: + b @08015604 +@0801554E: ldr r0, =0x082edec4 bl sub_8018884 movs r0, 0 movs r1, 0 bl sub_8011A64 - b _08015604 + b @08015604 .align 2, 0 .pool -_08015564: +@08015564: ldrb r0, [r5, 0x13] cmp r0, 0 - beq _08015580 + beq @08015580 ldrb r0, [r5, 0xE] movs r1, 0 movs r2, 0 @@ -25115,7 +25115,7 @@ _08015564: bl gpu_copy_wram_bg_tilemap_to_vram ldrb r0, [r5, 0xB] bl Window_Remove -_08015580: +@08015580: ldrb r0, [r5, 0x11] bl remove_task ldr r0, [r5] @@ -25125,22 +25125,22 @@ _08015580: ldrb r0, [r5, 0x8] adds r0, 0x1 strb r0, [r5, 0x8] - b _08015604 -_0801559A: + b @08015604 +@0801559A: adds r0, r5, 0 adds r0, 0x9 ldr r1, =0x082edf04 - b _080155C2 + b @080155C2 .align 2, 0 .pool -_080155A8: +@080155A8: adds r0, r5, 0 adds r0, 0x9 ldr r1, =0x082ed8f8 - b _080155C2 + b @080155C2 .align 2, 0 .pool -_080155B4: +@080155B4: adds r0, r5, 0 adds r0, 0x9 ldr r2, =0x082efd58 @@ -25148,10 +25148,10 @@ _080155B4: lsls r1, 2 adds r1, r2 ldr r1, [r1] -_080155C2: +@080155C2: bl mevent_0814257C cmp r0, 0 - beq _08015604 + beq @08015604 bl sub_800E084 adds r0, r4, 0 bl remove_task @@ -25159,23 +25159,23 @@ _080155C2: ldr r1, =0x020375f0 movs r0, 0x5 strh r0, [r1] - b _08015604 + b @08015604 .align 2, 0 .pool -_080155E8: +@080155E8: ldrb r0, [r5, 0x8] adds r0, 0x1 strb r0, [r5, 0x8] bl sub_800ADF8 - b _08015604 -_080155F4: + b @08015604 +@080155F4: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08015604 + beq @08015604 adds r0, r4, 0 bl remove_task -_08015604: +@08015604: add sp, 0x8 pop {r4-r6} pop {r0} @@ -25183,7 +25183,7 @@ _08015604: thumb_func_end task00_081182DC thumb_func_start sub_801560C -sub_801560C: @ 801560C +sub_801560C: ; 801560C push {r4,lr} bl sub_8010F60 ldr r0, =sub_80156E0 + 1 @@ -25214,7 +25214,7 @@ sub_801560C: @ 801560C thumb_func_end sub_801560C thumb_func_start sub_8015658 -sub_8015658: @ 8015658 +sub_8015658: ; 8015658 ldrb r1, [r0, 0x1] lsls r1, 8 ldrb r0, [r0] @@ -25223,7 +25223,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 @@ -25233,10 +25233,10 @@ sub_8015664: @ 8015664 strb r0, [r2, 0x15] ldr r0, =0x02021fc4 cmp r3, r0 - beq _0801567E + beq @0801567E adds r1, r3, 0 bl ExpandTextCodes -_0801567E: +@0801567E: pop {r0} bx r0 .align 2, 0 @@ -25244,7 +25244,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 @@ -25253,10 +25253,10 @@ sub_801568C: @ 801568C strb r0, [r1, 0x14] ldr r0, =0x02021fc4 cmp r2, r0 - beq _080156A4 + beq @080156A4 adds r1, r2, 0 bl ExpandTextCodes -_080156A4: +@080156A4: pop {r0} bx r0 .align 2, 0 @@ -25264,7 +25264,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] @@ -25279,7 +25279,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 @@ -25293,7 +25293,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 @@ -25308,76 +25308,76 @@ sub_80156E0: @ 80156E0 adds r7, r0, r1 ldrb r0, [r6, 0x14] cmp r0, 0x38 - bls _08015702 - bl _08016878 -_08015702: + bls @08015702 + bl @08016878 +@08015702: lsls r0, 2 - ldr r1, =_08015718 + ldr r1, =@08015718 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08015718: - .4byte _080157FC - .4byte _08015854 - .4byte _08015878 - .4byte _080158C8 - .4byte _080159A6 - .4byte _08015E5C - .4byte _08015C54 - .4byte _08015E5C - .4byte _08016864 - .4byte _080161C8 - .4byte _080162D4 - .4byte _080160AC - .4byte _080160C6 - .4byte _08016324 - .4byte _08016348 - .4byte _08016350 - .4byte _08016360 - .4byte _0801638E - .4byte _080163A2 - .4byte _08015F32 - .4byte _08015FB8 - .4byte _08015FD6 - .4byte _0801604A - .4byte _08015ADA - .4byte _08015B00 - .4byte _08015B78 - .4byte _08016838 - .4byte _08015D4C - .4byte _08015D34 - .4byte _08015DD0 - .4byte _08015C2A - .4byte _08015DA6 - .4byte _08015D9C - .4byte _08016158 - .4byte _08016178 - .4byte _080161B8 - .4byte _080162DC - .4byte _08016318 - .4byte _08015BF4 - .4byte _08016104 - .4byte _08015E94 - .4byte _08015EC4 - .4byte _080163CC - .4byte _0801645C - .4byte _080165A8 - .4byte _08016610 - .4byte _0801662C - .4byte _08016478 - .4byte _08016634 - .4byte _08016738 - .4byte _0801676C - .4byte _080167F4 - .4byte _0801652C - .4byte _080164E0 - .4byte _080164F4 - .4byte _0801658C - .4byte _080165DC -_080157FC: +@08015718: + .4byte @080157FC + .4byte @08015854 + .4byte @08015878 + .4byte @080158C8 + .4byte @080159A6 + .4byte @08015E5C + .4byte @08015C54 + .4byte @08015E5C + .4byte @08016864 + .4byte @080161C8 + .4byte @080162D4 + .4byte @080160AC + .4byte @080160C6 + .4byte @08016324 + .4byte @08016348 + .4byte @08016350 + .4byte @08016360 + .4byte @0801638E + .4byte @080163A2 + .4byte @08015F32 + .4byte @08015FB8 + .4byte @08015FD6 + .4byte @0801604A + .4byte @08015ADA + .4byte @08015B00 + .4byte @08015B78 + .4byte @08016838 + .4byte @08015D4C + .4byte @08015D34 + .4byte @08015DD0 + .4byte @08015C2A + .4byte @08015DA6 + .4byte @08015D9C + .4byte @08016158 + .4byte @08016178 + .4byte @080161B8 + .4byte @080162DC + .4byte @08016318 + .4byte @08015BF4 + .4byte @08016104 + .4byte @08015E94 + .4byte @08015EC4 + .4byte @080163CC + .4byte @0801645C + .4byte @080165A8 + .4byte @08016610 + .4byte @0801662C + .4byte @08016478 + .4byte @08016634 + .4byte @08016738 + .4byte @0801676C + .4byte @080167F4 + .4byte @0801652C + .4byte @080164E0 + .4byte @080164F4 + .4byte @0801658C + .4byte @080165DC +@080157FC: movs r0, 0x70 bl malloc_and_clear str r0, [r6, 0x4] @@ -25409,10 +25409,10 @@ _080157FC: bl sub_8019BA8 bl sub_8019F2C movs r0, 0x1 - bl _08016876 + bl @08016876 .align 2, 0 .pool -_08015854: +@08015854: adds r0, r6, 0 adds r0, 0x21 movs r2, 0 @@ -25424,12 +25424,12 @@ _08015854: lsls r0, 16 asrs r0, 16 cmp r0, 0x8 - beq _08015872 - bl _08016878 -_08015872: + beq @08015872 + bl @08016878 +@08015872: movs r0, 0x2 - bl _08016876 -_08015878: + bl @08016876 +@08015878: movs r0, 0x40 movs r1, 0 movs r2, 0 @@ -25455,43 +25455,43 @@ _08015878: movs r0, 0 strh r0, [r1] movs r0, 0x3 - bl _08016876 + bl @08016876 .align 2, 0 .pool -_080158C8: +@080158C8: bl sub_81B1360 lsls r0, 24 lsrs r0, 24 cmp r0, 0x8 - beq _080158E0 + beq @080158E0 bl sub_81B1360 lsls r0, 24 lsrs r0, 24 cmp r0, 0x9 - bne _080159A0 -_080158E0: + bne @080159A0 +@080158E0: ldr r4, =0x02022c40 ldrh r0, [r4] cmp r0, 0 - beq _080159A0 + beq @080159A0 bl brm_get_pokemon_selection lsls r0, 24 lsrs r5, r0, 24 ldrh r0, [r4] cmp r0, 0x1 - beq _08015900 + beq @08015900 cmp r0, 0x2 - beq _08015950 - b _0801598E + beq @08015950 + b @0801598E .align 2, 0 .pool -_08015900: +@08015900: movs r0, 0x54 movs r1, 0 movs r2, 0x1 bl sub_8011090 cmp r5, 0x5 - bls _0801592C + bls @0801592C adds r0, r4, 0 bl sub_801807C movs r0, 0 @@ -25500,39 +25500,39 @@ _08015900: bl sub_8010FCC ldr r0, =0x082ef4fc bl sub_801568C - b _0801598E + b @0801598E .align 2, 0 .pool -_0801592C: +@0801592C: bl brm_get_pokemon_selection lsls r0, 24 lsrs r0, 24 adds r1, r4, 0 bl sub_80180A0 cmp r0, 0 - bne _0801594C + bne @0801594C ldr r1, =0x082ef47c movs r0, 0x34 bl sub_8015664 - b _0801598E + b @0801598E .align 2, 0 .pool -_0801594C: +@0801594C: movs r0, 0x37 - b _0801598C -_08015950: + b @0801598C +@08015950: adds r0, r6, 0 bl sub_80156C8 ldrb r0, [r4, 0x8] strh r0, [r7, 0x2] cmp r5, 0x5 - bls _0801596C + bls @0801596C ldr r0, =0x082ef544 bl sub_801568C - b _0801598E + b @0801598E .align 2, 0 .pool -_0801596C: +@0801596C: movs r0, 0x54 movs r1, 0 movs r2, 0x1 @@ -25546,25 +25546,25 @@ _0801596C: adds r1, r4, 0 bl sub_80180E8 movs r0, 0x33 -_0801598C: +@0801598C: strb r0, [r6, 0x14] -_0801598E: +@0801598E: ldr r1, =0x02022c40 movs r0, 0 strh r0, [r1] - bl _08016878 + bl @08016878 .align 2, 0 .pool -_080159A0: +@080159A0: movs r0, 0x4 - bl _08016876 -_080159A6: + bl @08016876 +@080159A6: ldr r4, =0x020375f0 ldrh r0, [r4] cmp r0, 0 - beq _08015A0A + beq @08015A0A cmp r0, 0x9 - bne _080159E0 + bne @080159E0 movs r0, 0x54 movs r1, 0 movs r2, 0x1 @@ -25577,20 +25577,20 @@ _080159A6: bl gf_strcpy movs r1, 0 movs r0, 0x2A - b _08015A02 + b @08015A02 .align 2, 0 .pool -_080159E0: +@080159E0: cmp r0, 0xB - bne _080159F4 + bne @080159F4 movs r0, 0x54 movs r1, 0 movs r2, 0x1 bl sub_8011090 movs r1, 0 movs r0, 0x17 - b _08015A02 -_080159F4: + b @08015A02 +@080159F4: movs r0, 0 strh r0, [r7] ldrh r0, [r4] @@ -25598,24 +25598,24 @@ _080159F4: strh r0, [r7, 0x2] movs r1, 0 movs r0, 0x18 -_08015A02: +@08015A02: strb r0, [r6, 0x14] strh r1, [r4] - bl _08016878 -_08015A0A: + bl @08016878 +@08015A0A: bl script_env_2_is_enabled lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08015A1A - bl _08016878 -_08015A1A: + bne @08015A1A + bl @08016878 +@08015A1A: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08015A80 + beq @08015A80 ldr r0, [r6] adds r2, r7, 0x2 adds r3, r6, 0 @@ -25623,18 +25623,18 @@ _08015A1A: adds r1, r7, 0 bl sub_801A2A8 cmp r0, 0 - beq _08015A4C + beq @08015A4C movs r0, 0x5 bl audio_play bl sub_80181CC movs r0, 0x18 - bl _08016876 + bl @08016876 .align 2, 0 .pool -_08015A4C: +@08015A4C: bl sub_8017940 cmp r0, 0 - beq _08015A80 + beq @08015A80 movs r0, 0x54 movs r1, 0 movs r2, 0x1 @@ -25647,32 +25647,32 @@ _08015A4C: ldr r1, [r1] bl gf_strcpy movs r0, 0x2D - bl _08016876 + bl @08016876 .align 2, 0 .pool -_08015A80: +@08015A80: bl sub_8016B00 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - beq _08015AA2 + beq @08015AA2 cmp r0, 0x2 - bgt _08015A96 + bgt @08015A96 cmp r0, 0x1 - beq _08015A9C - b _08015AD0 -_08015A96: + beq @08015A9C + b @08015AD0 +@08015A96: cmp r0, 0x4 - beq _08015AAA - b _08015AD0 -_08015A9C: + beq @08015AAA + b @08015AD0 +@08015A9C: movs r0, 0x2 bl audio_play -_08015AA2: +@08015AA2: adds r0, r6, 0 bl sub_801A274 - b _08015AD0 -_08015AAA: + b @08015AD0 +@08015AAA: movs r0, 0xB strb r0, [r6, 0x14] bl sub_80181CC @@ -25688,27 +25688,27 @@ _08015AAA: movs r0, 0x53 movs r2, 0 bl sub_8011090 -_08015AD0: +@08015AD0: adds r0, r6, 0 bl sub_801A284 - bl _08016878 -_08015ADA: + bl @08016878 +@08015ADA: ldr r0, =sub_809FA34 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - beq _08015AEA - bl _08016878 -_08015AEA: + beq @08015AEA + bl @08016878 +@08015AEA: movs r0, 0x40 movs r1, 0 movs r2, 0 bl sub_8011090 movs r0, 0x4 - bl _08016876 + bl @08016876 .align 2, 0 .pool -_08015B00: +@08015B00: bl sub_801704C movs r3, 0x2 ldrsh r0, [r7, r3] @@ -25725,20 +25725,20 @@ _08015B00: adds r3, r4, 0 bl sub_80179D4 cmp r0, 0x1 - beq _08015B44 + beq @08015B44 cmp r0, 0x1 - bgt _08015B36 + bgt @08015B36 cmp r0, 0 - beq _08015B3E - bl _08016878 -_08015B36: + beq @08015B3E + bl @08016878 +@08015B36: cmp r0, 0x2 - beq _08015B68 - bl _08016878 -_08015B3E: + beq @08015B68 + bl @08016878 +@08015B3E: movs r0, 0x1A - bl _08016876 -_08015B44: + bl @08016876 +@08015B44: movs r1, 0x2 ldrsh r0, [r7, r1] lsls r0, 5 @@ -25751,55 +25751,55 @@ _08015B44: bl sub_8012188 strh r5, [r6, 0x12] movs r0, 0x19 - bl _08016876 + bl @08016876 .align 2, 0 .pool -_08015B68: +@08015B68: ldr r1, =0x02021fc4 movs r0, 0x13 bl sub_8015664 - bl _08016878 + bl @08016878 .align 2, 0 .pool -_08015B78: +@08015B78: bl sub_801704C bl sub_8011A74 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - blt _08015BBE + blt @08015BBE cmp r4, 0x2 - ble _08015B9A + ble @08015B9A cmp r4, 0x4 - bne _08015BBE + bne @08015BBE movs r0, 0x1 bl sub_801818C strb r4, [r6, 0x14] - b _08015BBE -_08015B9A: + b @08015BBE +@08015B9A: bl sub_8011B90 cmp r0, 0x1 - bne _08015BB0 + bne @08015BB0 ldr r0, =0x082ee6c8 bl sub_801568C - b _08015BB8 + b @08015BB8 .align 2, 0 .pool -_08015BB0: +@08015BB0: ldr r1, =0x082ee6c8 movs r0, 0x1E bl sub_8015664 -_08015BB8: +@08015BB8: ldr r1, =0x02022c2c movs r0, 0x40 strb r0, [r1] -_08015BBE: +@08015BBE: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _08015BCA - bl _08016878 -_08015BCA: + bne @08015BCA + bl @08016878 +@08015BCA: ldr r0, =0x020228c4 movs r1, 0x1 bl sub_80143E4 @@ -25807,37 +25807,37 @@ _08015BCA: movs r1, 0x5 bl AddTask movs r0, 0x26 - bl _08016876 + bl @08016876 .align 2, 0 .pool -_08015BF4: +@08015BF4: ldr r0, =sub_80140E0 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - beq _08015C04 - bl _08016878 -_08015C04: + beq @08015C04 + bl @08016878 +@08015C04: ldr r0, =0x02022c2c ldrb r0, [r0] cmp r0, 0x44 - bne _08015C24 + bne @08015C24 ldr r1, =0x082ee004 movs r0, 0x1F bl sub_8015664 - bl _08016878 + bl @08016878 .align 2, 0 .pool -_08015C24: +@08015C24: movs r0, 0x5 - bl _08016876 -_08015C2A: + bl @08016876 +@08015C2A: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _08015C36 - bl _08016878 -_08015C36: + beq @08015C36 + bl @08016878 +@08015C36: movs r0, 0 bl sub_801818C movs r2, 0 @@ -25847,10 +25847,10 @@ _08015C36: ldr r2, [r6] bl sub_801A3D0 movs r0, 0x2 - bl _08016876 + bl @08016876 .align 2, 0 .pool -_08015C54: +@08015C54: adds r0, r6, 0 adds r0, 0x16 adds r1, r6, 0 @@ -25865,18 +25865,18 @@ _08015C54: movs r0, 0x1 negs r0, r0 cmp r5, r0 - bne _08015C78 - bl _08016878 -_08015C78: + bne @08015C78 + bl @08016878 +@08015C78: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _08015C94 + bne @08015C94 movs r0, 0x1C - bl _08016876 + bl @08016876 .align 2, 0 .pool -_08015C94: +@08015C94: adds r1, r6, 0 adds r1, 0x98 movs r0, 0 @@ -25888,10 +25888,10 @@ _08015C94: movs r0, 0x2 negs r0, r0 cmp r5, r0 - beq _08015CB2 + beq @08015CB2 cmp r5, 0x40 - bne _08015CE4 -_08015CB2: + bne @08015CE4 +@08015CB2: adds r0, r6, 0 adds r0, 0x4C movs r1, 0x40 @@ -25906,10 +25906,10 @@ _08015CB2: ldr r1, [r1] bl gf_strcpy movs r0, 0x20 - bl _08016876 + bl @08016876 .align 2, 0 .pool -_08015CE4: +@08015CE4: ldr r0, =0x02022c2c strb r5, [r0] ldr r1, =0x02022c2d @@ -25918,17 +25918,17 @@ _08015CE4: lsls r0, r5, 24 lsrs r0, 24 cmp r0, 0x41 - bne _08015D18 + bne @08015D18 bl sub_8018024 cmp r0, 0 - bne _08015D18 + bne @08015D18 ldr r1, =0x082eebd0 movs r0, 0x5 bl sub_8015664 - bl _08016878 + bl @08016878 .align 2, 0 .pool -_08015D18: +@08015D18: ldr r0, =0x02022c2c ldrb r0, [r0] movs r1, 0x40 @@ -25938,18 +25938,18 @@ _08015D18: strh r1, [r0] bl sub_800FE50 movs r0, 0x1B - bl _08016876 + bl @08016876 .align 2, 0 .pool -_08015D34: +@08015D34: ldr r0, =0x02021fc4 ldr r1, =0x082eeb88 bl gf_strcpy movs r0, 0x24 - bl _08016876 + bl @08016876 .align 2, 0 .pool -_08015D4C: +@08015D4C: adds r0, r6, 0 bl sub_8017FD8 movs r3, 0x2 @@ -25975,20 +25975,20 @@ _08015D4C: bl sub_8017064 lsls r0, 24 cmp r0, 0 - bne _08015D8C - bl _08016878 -_08015D8C: + bne @08015D8C + bl @08016878 +@08015D8C: movs r0, 0 strh r0, [r7, 0x6] movs r0, 0x1D - bl _08016876 + bl @08016876 .align 2, 0 .pool -_08015D9C: +@08015D9C: bl sub_800AC34 movs r0, 0x24 - bl _08016876 -_08015DA6: + bl @08016876 +@08015DA6: adds r0, r6, 0 adds r0, 0x4C movs r1, 0x44 @@ -26004,49 +26004,49 @@ _08015DA6: strh r2, [r1] bl sub_800FE50 movs r0, 0x1D - bl _08016876 + bl @08016876 .align 2, 0 .pool -_08015DD0: +@08015DD0: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _08015DF4 + bne @08015DF4 ldr r0, =0x02021fc4 ldr r1, =0x082eeb88 bl gf_strcpy movs r0, 0x1C - bl _08016876 + bl @08016876 .align 2, 0 .pool -_08015DF4: +@08015DF4: adds r0, r6, 0 bl sub_8017FD8 adds r0, r6, 0 adds r0, 0x98 ldrh r0, [r0] cmp r0, 0x51 - bne _08015E2A + bne @08015E2A ldr r0, =0x02022c2c ldrb r0, [r0] cmp r0, 0x8 - bne _08015E24 + bne @08015E24 ldr r0, =0x02021fc4 adds r1, r6, 0 movs r2, 0 bl sub_8018220 movs r0, 0x28 - bl _08016876 + bl @08016876 .align 2, 0 .pool -_08015E24: +@08015E24: movs r0, 0xD - bl _08016876 -_08015E2A: + bl @08016876 +@08015E2A: cmp r0, 0x52 - beq _08015E32 - bl _08016878 -_08015E32: + beq @08015E32 + bl @08016878 +@08015E32: movs r5, 0 movs r0, 0x20 strb r0, [r6, 0x14] @@ -26059,10 +26059,10 @@ _08015E32: ldrb r2, [r2, 0x13] bl sub_8017D9C strb r5, [r4] - bl _08016878 + bl @08016878 .align 2, 0 .pool -_08015E5C: +@08015E5C: movs r0, 0x2 ldrsh r1, [r7, r0] lsls r1, 5 @@ -26083,19 +26083,19 @@ _08015E5C: ldr r1, [r0] movs r0, 0x6 bl sub_8015664 - bl _08016878 + bl @08016878 .align 2, 0 .pool -_08015E94: +@08015E94: adds r0, r6, 0 adds r0, 0x16 ldr r1, =0x02021fc4 bl sub_8017064 lsls r0, 24 cmp r0, 0 - bne _08015EA8 - bl _08016878 -_08015EA8: + bne @08015EA8 + bl @08016878 +@08015EA8: movs r4, 0 movs r0, 0x29 strb r0, [r6, 0x14] @@ -26105,20 +26105,20 @@ _08015EA8: strh r4, [r0] adds r0, 0x2 strh r4, [r0] - bl _08016878 + bl @08016878 .align 2, 0 .pool -_08015EC4: +@08015EC4: bl sub_800A520 lsls r0, 24 cmp r0, 0 - bne _08015ED2 - bl _08016878 -_08015ED2: + bne @08015ED2 + bl @08016878 +@08015ED2: bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - bne _08015F2C + bne @08015F2C ldr r5, =0x02021cc4 bl link_get_multiplayer_id movs r1, 0x1 @@ -26144,13 +26144,13 @@ _08015ED2: ldr r1, [r1] bl ExpandTextCodes movs r0, 0x21 - bl _08016876 + bl @08016876 .align 2, 0 .pool -_08015F2C: +@08015F2C: movs r0, 0x7 - bl _08016876 -_08015F32: + bl @08016876 +@08015F32: adds r0, r6, 0 adds r0, 0x16 movs r1, 0 @@ -26158,19 +26158,19 @@ _08015F32: lsls r0, 24 asrs r5, r0, 24 cmp r5, 0 - beq _08015F5C + beq @08015F5C cmp r5, 0 - bgt _08015F54 + bgt @08015F54 movs r0, 0x1 negs r0, r0 cmp r5, r0 - beq _08015F98 - bl _08016878 -_08015F54: + beq @08015F98 + bl @08016878 +@08015F54: cmp r5, 0x1 - beq _08015F98 - bl _08016878 -_08015F5C: + beq @08015F98 + bl @08016878 +@08015F5C: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram ldr r4, =0x02022c2c @@ -26194,10 +26194,10 @@ _08015F5C: movs r0, 0x14 strb r0, [r6, 0x14] strh r5, [r7, 0x6] - bl _08016878 + bl @08016878 .align 2, 0 .pool -_08015F98: +@08015F98: movs r3, 0x2 ldrsh r0, [r7, r3] ldr r1, [r6] @@ -26208,41 +26208,41 @@ _08015F98: adds r0, r1 ldr r0, [r0] bl sub_801568C - bl _08016878 + bl @08016878 .align 2, 0 .pool -_08015FB8: +@08015FB8: ldrh r0, [r7, 0x4] adds r0, 0x1 strh r0, [r7, 0x4] lsls r0, 16 asrs r0, 16 cmp r0, 0x3C - bgt _08015FCA - bl _08016878 -_08015FCA: + bgt @08015FCA + bl @08016878 +@08015FCA: movs r1, 0 movs r0, 0x15 strb r0, [r6, 0x14] strh r1, [r7, 0x4] - bl _08016878 -_08015FD6: + bl @08016878 +@08015FD6: bl sub_8011A74 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - beq _0801603C + beq @0801603C cmp r4, 0x3 - ble _08015FF4 + ble @08015FF4 cmp r4, 0x4 - bne _08016040 + bne @08016040 movs r0, 0x1 bl sub_801818C strb r4, [r6, 0x14] - b _08016040 -_08015FF4: + b @08016040 +@08015FF4: cmp r4, 0x1 - blt _08016040 + blt @08016040 movs r1, 0x2 ldrsh r0, [r7, r1] ldr r1, [r6] @@ -26254,37 +26254,37 @@ _08015FF4: bl sub_8011090 bl sub_8011B90 cmp r0, 0x1 - bne _08016028 + bne @08016028 ldr r0, =0x082eed3c lsls r1, r4, 2 adds r1, r0 ldr r0, [r1] bl sub_801568C - b _08016040 + b @08016040 .align 2, 0 .pool -_08016028: +@08016028: ldr r0, =0x082eed3c lsls r1, r4, 2 adds r1, r0 ldr r1, [r1] movs r0, 0x1E bl sub_8015664 - b _08016040 + b @08016040 .align 2, 0 .pool -_0801603C: +@0801603C: movs r0, 0x16 strb r0, [r6, 0x14] -_08016040: +@08016040: ldrh r0, [r7, 0x6] adds r0, 0x1 strh r0, [r7, 0x6] - bl _08016878 -_0801604A: + bl @08016878 +@0801604A: bl sub_8011A80 cmp r0, 0 - beq _08016092 + beq @08016092 movs r2, 0x2 ldrsh r0, [r7, r2] ldr r1, [r6] @@ -26296,34 +26296,34 @@ _0801604A: bl sub_8011090 bl sub_8011B90 cmp r0, 0x1 - bne _08016084 + bne @08016084 ldr r0, =0x082eed3c lsls r1, r4, 2 adds r1, r0 ldr r0, [r1] bl sub_801568C - b _08016092 + b @08016092 .align 2, 0 .pool -_08016084: +@08016084: ldr r0, =0x082eed3c lsls r1, r4, 2 adds r1, r0 ldr r1, [r1] movs r0, 0x1E bl sub_8015664 -_08016092: +@08016092: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _0801609E - bl _08016878 -_0801609E: + bne @0801609E + bl @08016878 +@0801609E: movs r0, 0x10 - bl _08016876 + bl @08016876 .align 2, 0 .pool -_080160AC: +@080160AC: movs r0, 0x49 bl audio_play bl sub_800EF7C @@ -26333,22 +26333,22 @@ _080160AC: adds r1, r6, 0 adds r1, 0x9A strh r0, [r1] - bl _08016878 -_080160C6: + bl @08016878 +@080160C6: bl sub_8011A80 cmp r0, 0 - beq _080160DA + beq @080160DA movs r0, 0 bl sub_801818C movs r0, 0x2 - bl _08016876 -_080160DA: + bl @08016876 +@080160DA: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _080160E4 - b _08016878 -_080160E4: + bne @080160E4 + b @08016878 +@080160E4: ldr r0, =0x020228c4 movs r1, 0x1 bl sub_80143E4 @@ -26356,19 +26356,19 @@ _080160E4: movs r1, 0x5 bl AddTask movs r0, 0x27 - b _08016876 + b @08016876 .align 2, 0 .pool -_08016104: +@08016104: adds r0, r6, 0 bl sub_801689C ldr r0, =sub_80140E0 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - beq _08016118 - b _08016878 -_08016118: + beq @08016118 + b @08016878 +@08016118: movs r0, 0x21 strb r0, [r6, 0x14] ldr r0, =0x02021cc4 @@ -26387,10 +26387,10 @@ _08016118: adds r1, r2 ldr r1, [r1] bl ExpandTextCodes - b _08016878 + b @08016878 .align 2, 0 .pool -_08016158: +@08016158: adds r0, r6, 0 bl sub_801689C adds r0, r6, 0 @@ -26399,47 +26399,47 @@ _08016158: bl sub_8017064 lsls r0, 24 cmp r0, 0 - bne _08016170 - b _08016878 -_08016170: + bne @08016170 + b @08016878 +@08016170: movs r0, 0x22 - b _08016876 + b @08016876 .align 2, 0 .pool -_08016178: +@08016178: adds r0, r6, 0 bl sub_801689C adds r0, r6, 0 bl sub_80168DC cmp r0, 0 - bne _0801618A - b _08016878 -_0801618A: + bne @0801618A + b @08016878 +@0801618A: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _08016198 - b _08016878 -_08016198: + bne @08016198 + b @08016878 +@08016198: movs r0, 0x1 bl sub_8011DE0 ldr r0, =0x02021fc4 ldr r1, =0x082ee598 bl gf_strcpy movs r0, 0x24 - b _08016876 + b @08016876 .align 2, 0 .pool -_080161B8: +@080161B8: ldr r1, =0x02021fc4 movs r0, 0x9 bl sub_8015664 - b _08016878 + b @08016878 .align 2, 0 .pool -_080161C8: +@080161C8: adds r0, r6, 0 adds r0, 0x16 movs r1, 0 @@ -26447,19 +26447,19 @@ _080161C8: lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _080161EE + beq @080161EE cmp r1, 0 - bgt _080161E8 + bgt @080161E8 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _080162AE - b _08016878 -_080161E8: + beq @080162AE + b @08016878 +@080161E8: cmp r1, 0x1 - beq _080162AE - b _08016878 -_080161EE: + beq @080162AE + b @08016878 +@080161EE: adds r0, r6, 0 adds r0, 0x4C movs r1, 0x51 @@ -26468,7 +26468,7 @@ _080161EE: ldrb r1, [r1] adds r5, r0, 0 cmp r1, 0x45 - bne _08016220 + bne @08016220 movs r4, 0x40 orrs r4, r1 movs r0, 0x1 @@ -26479,10 +26479,10 @@ _080161EE: adds r0, r4, 0 movs r2, 0 bl sub_8011090 - b _0801623E + b @0801623E .align 2, 0 .pool -_08016220: +@08016220: movs r0, 0x40 adds r4, r1, 0 orrs r4, r0 @@ -26496,7 +26496,7 @@ _08016220: adds r0, r4, 0 movs r2, 0x1 bl sub_8011090 -_0801623E: +@0801623E: ldr r1, [r6, 0x8] movs r0, 0 strb r0, [r1, 0x1B] @@ -26504,10 +26504,10 @@ _0801623E: ldr r0, =0x02022c2c ldrb r0, [r0] cmp r0, 0x41 - bne _08016286 + bne @08016286 bl sub_8018024 cmp r0, 0 - bne _0801627C + bne @0801627C movs r0, 0x52 strh r0, [r5] adds r0, r5, 0 @@ -26517,17 +26517,17 @@ _0801623E: ldr r0, =0x02021fc4 ldr r1, =0x082eec14 bl gf_strcpy - b _08016878 + b @08016878 .align 2, 0 .pool -_0801627C: +@0801627C: adds r0, r5, 0 bl sub_800FE50 movs r0, 0xD - b _08016876 -_08016286: + b @08016876 +@08016286: cmp r0, 0x48 - bne _080162A4 + bne @080162A4 adds r0, r5, 0 bl sub_800FE50 ldr r0, =0x02021fc4 @@ -26535,15 +26535,15 @@ _08016286: movs r2, 0x1 bl sub_8018220 movs r0, 0x28 - b _08016876 + b @08016876 .align 2, 0 .pool -_080162A4: +@080162A4: adds r0, r5, 0 bl sub_800FE50 movs r0, 0xD - b _08016876 -_080162AE: + b @08016876 +@080162AE: adds r0, r6, 0 adds r0, 0x4C movs r1, 0x52 @@ -26555,20 +26555,20 @@ _080162AE: ldr r1, =0x02022c2c ldrb r1, [r1] bl sub_8013078 - b _08016878 + b @08016878 .align 2, 0 .pool -_080162D4: +@080162D4: bl sub_800AC34 movs r0, 0x24 - b _08016876 -_080162DC: + b @08016876 +@080162DC: ldr r0, =0x03003124 ldrb r4, [r0] cmp r4, 0 - beq _080162E6 - b _08016878 -_080162E6: + beq @080162E6 + b @08016878 +@080162E6: ldr r1, =0x02022c2c movs r0, 0x40 strb r0, [r1] @@ -26585,16 +26585,16 @@ _080162E6: strh r4, [r0] subs r0, 0x2 strh r4, [r0] - b _08016878 + b @08016878 .align 2, 0 .pool -_08016318: +@08016318: movs r0, 0x2 strb r0, [r6, 0x14] movs r0, 0 bl sub_801818C - b _08016878 -_08016324: + b @08016878 +@08016324: ldr r4, =0x02021fc4 ldr r0, =0x02022c2c ldrb r0, [r0] @@ -26605,23 +26605,23 @@ _08016324: movs r0, 0xE adds r1, r4, 0 bl sub_8015664 - b _08016878 + b @08016878 .align 2, 0 .pool -_08016348: +@08016348: bl sub_800ADF8 movs r0, 0xF - b _08016876 -_08016350: + b @08016876 +@08016350: bl sub_800A520 lsls r0, 24 cmp r0, 0 - bne _0801635C - b _08016878 -_0801635C: + bne @0801635C + b @08016878 +@0801635C: movs r0, 0x10 - b _08016876 -_08016360: + b @08016876 +@08016360: ldr r0, [r6, 0x8] bl free ldr r0, [r6] @@ -26638,8 +26638,8 @@ _08016360: adds r0, 0x21 bl sub_8019F04 movs r0, 0x11 - b _08016876 -_0801638E: + b @08016876 +@0801638E: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -26648,14 +26648,14 @@ _0801638E: movs r3, 0x10 bl sub_80A1AD4 movs r0, 0x12 - b _08016876 -_080163A2: + b @08016876 +@080163A2: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - beq _080163AE - b _08016878 -_080163AE: + beq @080163AE + b @08016878 +@080163AE: bl sub_8019E3C adds r0, r4, 0 bl remove_task @@ -26663,22 +26663,22 @@ _080163AE: ldr r0, [r0] bl free bl sub_80149D8 - b _08016878 + b @08016878 .align 2, 0 .pool -_080163CC: +@080163CC: bl sub_800F7DC ldrh r1, [r0, 0x8] ldr r4, =0x000003ff adds r0, r4, 0 ands r0, r1 cmp r0, 0 - bne _080163E4 + bne @080163E4 movs r0, 0x2B - b _08016876 + b @08016876 .align 2, 0 .pool -_080163E4: +@080163E4: bl sub_800F7DC ldrh r1, [r0, 0x8] adds r0, r4, 0 @@ -26686,14 +26686,14 @@ _080163E4: movs r1, 0xCE lsls r1, 1 cmp r0, r1 - bne _08016408 + bne @08016408 ldr r0, =0x02021fc4 ldr r1, =0x082ef590 bl gf_strcpy - b _0801643E + b @0801643E .align 2, 0 .pool -_08016408: +@08016408: ldr r4, =0x02021cc4 bl sub_800F7DC ldrh r0, [r0, 0x8] @@ -26716,28 +26716,28 @@ _08016408: ldr r0, =0x02021fc4 ldr r1, =0x082ef564 bl ExpandTextCodes -_0801643E: +@0801643E: ldr r1, =0x02021fc4 movs r0, 0x2C bl sub_8015664 - b _08016878 + b @08016878 .align 2, 0 .pool -_0801645C: +@0801645C: adds r0, r6, 0 adds r0, 0x16 ldr r1, =0x082ef20c bl sub_8017064 lsls r0, 24 cmp r0, 0 - bne _0801646E - b _08016878 -_0801646E: + bne @0801646E + b @08016878 +@0801646E: movs r0, 0x2F - b _08016876 + b @08016876 .align 2, 0 .pool -_08016478: +@08016478: adds r0, r6, 0 adds r0, 0x16 adds r1, r6, 0 @@ -26752,43 +26752,43 @@ _08016478: movs r0, 0x1 negs r0, r0 cmp r5, r0 - bne _0801649A - b _08016878 -_0801649A: + bne @0801649A + b @08016878 +@0801649A: subs r0, 0x1 cmp r5, r0 - beq _080164A4 + beq @080164A4 cmp r5, 0x3 - bne _080164B8 -_080164A4: + bne @080164B8 +@080164A4: movs r0, 0x4 strb r0, [r6, 0x14] movs r0, 0x1 bl sub_801818C - b _08016878 + b @08016878 .align 2, 0 .pool -_080164B8: +@080164B8: cmp r5, 0x1 - beq _080164C2 + beq @080164C2 cmp r5, 0x2 - beq _080164D0 - b _08016878 -_080164C2: + beq @080164D0 + b @08016878 +@080164C2: ldr r1, =0x082ef4c4 movs r0, 0x35 bl sub_8015664 - b _08016878 + b @08016878 .align 2, 0 .pool -_080164D0: +@080164D0: ldr r1, =0x082ef298 movs r0, 0x2F bl sub_8015664 - b _08016878 + b @08016878 .align 2, 0 .pool -_080164E0: +@080164E0: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -26797,16 +26797,16 @@ _080164E0: movs r3, 0x10 bl sub_80A1AD4 movs r0, 0x36 - b _08016876 -_080164F4: + b @08016876 +@080164F4: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08016502 - b _08016878 -_08016502: + beq @08016502 + b @08016878 +@08016502: ldr r1, =0x02022c40 movs r0, 0x1 strh r0, [r1] @@ -26816,10 +26816,10 @@ _08016502: ldr r1, =c2_exit_to_overworld_2_switch + 1 movs r0, 0x8 bl sub_81B8904 - b _08016878 + b @08016878 .align 2, 0 .pool -_0801652C: +@0801652C: adds r0, r6, 0 adds r0, 0x16 adds r1, r6, 0 @@ -26834,15 +26834,15 @@ _0801652C: movs r0, 0x1 negs r0, r0 cmp r5, r0 - bne _0801654E - b _08016878 -_0801654E: + bne @0801654E + b @08016878 +@0801654E: subs r0, 0x1 cmp r5, r0 - beq _08016558 + beq @08016558 cmp r5, 0x12 - bne _08016580 -_08016558: + bne @08016580 +@08016558: ldr r0, =0x02022c40 bl sub_801807C movs r0, 0 @@ -26851,17 +26851,17 @@ _08016558: bl sub_8010FCC ldr r0, =0x082ef4fc bl sub_801568C - b _08016878 + b @08016878 .align 2, 0 .pool -_08016580: +@08016580: ldr r0, =0x02022c40 strh r5, [r0, 0x2] movs r0, 0x37 - b _08016876 + b @08016876 .align 2, 0 .pool -_0801658C: +@0801658C: ldr r2, =0x02022c40 ldrh r0, [r2, 0x2] ldrh r1, [r2, 0xA] @@ -26869,10 +26869,10 @@ _0801658C: bl sub_8010FCC ldr r0, =0x082ef520 bl sub_801568C - b _08016878 + b @08016878 .align 2, 0 .pool -_080165A8: +@080165A8: adds r0, r6, 0 adds r0, 0x16 movs r1, 0 @@ -26880,36 +26880,36 @@ _080165A8: lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _080165CE + beq @080165CE cmp r1, 0 - bgt _080165C8 + bgt @080165C8 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _080165D2 - b _08016878 -_080165C8: + beq @080165D2 + b @08016878 +@080165C8: cmp r1, 0x1 - beq _080165D2 - b _08016878 -_080165CE: + beq @080165D2 + b @08016878 +@080165CE: movs r0, 0x38 - b _08016876 -_080165D2: + b @08016876 +@080165D2: movs r0, 0x1 bl sub_801818C movs r0, 0x4 - b _08016876 -_080165DC: + b @08016876 +@080165DC: adds r0, r6, 0 adds r0, 0x16 ldr r1, =0x082ef5b8 bl sub_8017064 lsls r0, 24 cmp r0, 0 - bne _080165EE - b _08016878 -_080165EE: + bne @080165EE + b @08016878 +@080165EE: movs r0, 0 movs r1, 0 movs r2, 0 @@ -26919,28 +26919,28 @@ _080165EE: movs r0, 0x1 bl sub_801818C movs r0, 0x4 - b _08016876 + b @08016876 .align 2, 0 .pool -_08016610: +@08016610: adds r0, r6, 0 adds r0, 0x16 ldr r1, =0x082ef1ec bl sub_8017064 lsls r0, 24 cmp r0, 0 - bne _08016622 - b _08016878 -_08016622: + bne @08016622 + b @08016878 +@08016622: movs r0, 0x2E - b _08016876 + b @08016876 .align 2, 0 .pool -_0801662C: +@0801662C: bl sub_80173B0 movs r0, 0x30 - b _08016876 -_08016634: + b @08016876 +@08016634: adds r0, r6, 0 adds r0, 0x16 adds r1, r6, 0 @@ -26960,22 +26960,22 @@ _08016634: movs r0, 0x1 negs r0, r0 cmp r5, r0 - bne _08016660 - b _08016878 -_08016660: + bne @08016660 + b @08016878 +@08016660: subs r0, 0x1 cmp r5, r0 - beq _0801666A + beq @0801666A cmp r5, 0x8 - bne _0801667C -_0801666A: + bne @0801667C +@0801666A: movs r0, 0x1 bl sub_801818C movs r0, 0x4 - b _08016876 + b @08016876 .align 2, 0 .pool -_0801667C: +@0801667C: bl sub_80173B0 ldr r1, [r6] lsls r4, r5, 5 @@ -26987,17 +26987,17 @@ _0801667C: lsrs r1, 22 bl sub_8017D04 cmp r0, 0x1 - beq _080166C8 + beq @080166C8 cmp r0, 0x1 - bgt _080166A2 + bgt @080166A2 cmp r0, 0 - beq _080166A8 - b _08016878 -_080166A2: + beq @080166A8 + b @08016878 +@080166A2: cmp r0, 0x2 - beq _080166FC - b _08016878 -_080166A8: + beq @080166FC + b @08016878 +@080166A8: ldr r0, =0x02021cc4 ldr r1, [r6] adds r1, r4 @@ -27006,10 +27006,10 @@ _080166A8: movs r0, 0x31 bl sub_8015664 strh r5, [r7, 0x2] - b _08016878 + b @08016878 .align 2, 0 .pool -_080166C8: +@080166C8: ldr r0, =0x02021cc4 ldr r1, [r6] adds r1, r4 @@ -27025,10 +27025,10 @@ _080166C8: adds r1, r2 bl gf_strcpy ldr r1, =0x082ef6e4 - b _0801671E + b @0801671E .align 2, 0 .pool -_080166FC: +@080166FC: ldr r0, =0x02021cc4 ldr r1, [r6] adds r1, r4 @@ -27044,13 +27044,13 @@ _080166FC: adds r1, r2 bl gf_strcpy ldr r1, =0x082ef718 -_0801671E: +@0801671E: movs r0, 0x2E bl sub_8015664 - b _08016878 + b @08016878 .align 2, 0 .pool -_08016738: +@08016738: adds r0, r6, 0 adds r0, 0x16 movs r1, 0 @@ -27058,36 +27058,36 @@ _08016738: lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _0801675E + beq @0801675E cmp r1, 0 - bgt _08016758 + bgt @08016758 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _08016762 - b _08016878 -_08016758: + beq @08016762 + b @08016878 +@08016758: cmp r1, 0x1 - beq _08016762 - b _08016878 -_0801675E: + beq @08016762 + b @08016878 +@0801675E: movs r0, 0x32 - b _08016876 -_08016762: + b @08016876 +@08016762: movs r0, 0x1 bl sub_801818C movs r0, 0x4 - b _08016876 -_0801676C: + b @08016876 +@0801676C: adds r0, r6, 0 adds r0, 0x16 ldr r1, =0x082ef4c4 bl sub_8017064 lsls r0, 24 cmp r0, 0 - bne _0801677E - b _08016878 -_0801677E: + bne @0801677E + b @08016878 +@0801677E: ldr r4, =0x02022c40 movs r0, 0x2 strh r0, [r4] @@ -27128,10 +27128,10 @@ _0801677E: bl sub_80156B0 ldrh r0, [r7, 0x2] strb r0, [r4, 0x8] - b _08016878 + b @08016878 .align 2, 0 .pool -_080167F4: +@080167F4: ldr r1, =0x02022c2c movs r0, 0x44 strb r0, [r1] @@ -27155,17 +27155,17 @@ _080167F4: ldr r0, [r0, 0x8] bl sub_8017020 movs r0, 0x19 - b _08016876 + b @08016876 .align 2, 0 .pool -_08016838: +@08016838: adds r0, r6, 0 adds r0, 0x16 ldr r1, =0x02021fc4 bl sub_8017064 lsls r0, 24 cmp r0, 0 - beq _08016878 + beq @08016878 movs r0, 0x1 bl sub_801818C movs r1, 0 @@ -27175,21 +27175,21 @@ _08016838: ldr r2, [r6] bl sub_801A3D0 movs r0, 0x4 - b _08016876 + b @08016876 .align 2, 0 .pool -_08016864: +@08016864: adds r0, r6, 0 adds r0, 0x16 ldr r1, =0x02021fc4 bl sub_8017064 lsls r0, 24 cmp r0, 0 - beq _08016878 + beq @08016878 ldrb r0, [r6, 0x15] -_08016876: +@08016876: strb r0, [r6, 0x14] -_08016878: +@08016878: add sp, 0xC pop {r4-r7} pop {r0} @@ -27199,15 +27199,15 @@ _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 in_trade_center cmp r0, 0x1 - bne _08016894 + bne @08016894 ldr r1, =0x020375f0 movs r0, 0xB strh r0, [r1] -_08016894: +@08016894: pop {r0} bx r0 .align 2, 0 @@ -27215,14 +27215,14 @@ _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 ldrh r5, [r3, 0x12] adds r4, r5, 0 cmp r4, 0 - beq _080168D0 + beq @080168D0 ldrh r0, [r3, 0x10] movs r1, 0xFF lsls r1, 8 @@ -27230,19 +27230,19 @@ sub_801689C: @ 801689C movs r0, 0xBC lsls r0, 6 cmp r1, r0 - bne _080168D0 + bne @080168D0 adds r0, r2, 0 adds r0, 0x9A strh r5, [r0] cmp r4, 0x44 - bne _080168D0 + bne @080168D0 ldrh r1, [r3, 0x14] adds r0, 0x2 strh r1, [r0] ldrh r1, [r3, 0x16] adds r0, 0x2 strh r1, [r0] -_080168D0: +@080168D0: pop {r4,r5} pop {r0} bx r0 @@ -27251,14 +27251,14 @@ _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 adds r5, 0x9A ldrh r0, [r5] cmp r0, 0 - beq _0801692C + beq @0801692C ldr r0, =0x02021fc4 ldr r1, =0x020229e8 adds r1, 0x2F @@ -27267,36 +27267,36 @@ sub_80168DC: @ 80168DC adds r3, r4, 0 bl sub_8017EA0 cmp r0, 0 - beq _0801692C + beq @0801692C cmp r0, 0x1 - bne _0801691C + bne @0801691C movs r0, 0x23 strb r0, [r4, 0x14] ldr r1, =0x02022c2c ldrh r0, [r5] strb r0, [r1] movs r0, 0 - b _0801692E + b @0801692E .align 2, 0 .pool -_0801691C: +@0801691C: cmp r0, 0x2 - bne _0801692C + bne @0801692C movs r0, 0x24 strb r0, [r4, 0x14] bl sub_800AC34 movs r0, 0 - b _0801692E -_0801692C: + b @0801692E +@0801692C: movs r0, 0x1 -_0801692E: +@0801692E: pop {r4,r5} pop {r1} bx r1 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 @@ -27327,7 +27327,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 @@ -27336,28 +27336,28 @@ task00_081199FC: @ 801697C ldr r5, [r0] ldrb r0, [r5, 0x14] cmp r0, 0x4 - bls _08016990 - b _08016AC8 -_08016990: + bls @08016990 + b @08016AC8 +@08016990: lsls r0, 2 - ldr r1, =_080169A4 + ldr r1, =@080169A4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080169A4: - .4byte _080169B8 - .4byte _080169BE - .4byte _080169E0 - .4byte _08016A30 - .4byte _08016A94 -_080169B8: +@080169A4: + .4byte @080169B8 + .4byte @080169BE + .4byte @080169E0 + .4byte @08016A30 + .4byte @08016A94 +@080169B8: movs r0, 0x1 strb r0, [r5, 0x14] - b _08016AC8 -_080169BE: + b @08016AC8 +@080169BE: movs r0, 0xC movs r1, 0 movs r2, 0 @@ -27369,8 +27369,8 @@ _080169BE: bl sub_80111B0 movs r0, 0x2 strb r0, [r5, 0x14] - b _08016AC8 -_080169E0: + b @08016AC8 +@080169E0: movs r0, 0x70 bl malloc_and_clear str r0, [r5, 0x4] @@ -27401,21 +27401,21 @@ _080169E0: strb r0, [r1] movs r0, 0x3 strb r0, [r5, 0x14] - b _08016AC8 -_08016A30: + b @08016AC8 +@08016A30: bl sub_8016B00 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - blt _08016AC8 + blt @08016AC8 cmp r0, 0x2 - bgt _08016AC8 + bgt @08016AC8 ldr r0, =0x02022c20 ldrb r0, [r0] cmp r0, 0xFF - bne _08016AC8 + bne @08016AC8 movs r6, 0 -_08016A4A: +@08016A4A: ldr r0, [r5] lsls r4, r6, 5 adds r1, r0, r4 @@ -27423,7 +27423,7 @@ _08016A4A: lsls r0, 30 lsrs r0, 30 cmp r0, 0x1 - bne _08016A78 + bne @08016A78 mov r0, sp bl sub_8018404 ldr r0, [r5] @@ -27435,22 +27435,22 @@ _08016A4A: mov r1, sp bl sub_800E540 cmp r0, 0 - bne _08016A84 -_08016A78: + bne @08016A84 +@08016A78: adds r6, 0x1 cmp r6, 0x7 - ble _08016A4A - b _08016AC8 + ble @08016A4A + b @08016AC8 .align 2, 0 .pool -_08016A84: +@08016A84: ldr r0, =0x02022c20 mov r1, sp bl gf_strcpy - b _08016AC8 + b @08016AC8 .align 2, 0 .pool -_08016A94: +@08016A94: ldr r0, [r5, 0x8] bl free ldr r0, [r5] @@ -27469,7 +27469,7 @@ _08016A94: bl sub_800EDD4 adds r0, r4, 0 bl remove_task -_08016AC8: +@08016AC8: add sp, 0x20 pop {r4-r6} pop {r0} @@ -27479,24 +27479,24 @@ _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] cmp r0, 0xFF - bne _08016AE8 + bne @08016AE8 movs r0, 0 - b _08016AF6 + b @08016AF6 .align 2, 0 .pool -_08016AE8: +@08016AE8: ldr r0, =0x02021cc4 adds r1, r4, 0 bl gf_strcpy movs r0, 0xFF strb r0, [r4] movs r0, 0x1 -_08016AF6: +@08016AF6: pop {r4} pop {r1} bx r1 @@ -27505,7 +27505,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 @@ -27515,7 +27515,7 @@ sub_8016B00: @ 8016B00 movs r7, 0 movs r6, 0 movs r5, 0 -_08016B12: +@08016B12: ldr r0, [r4, 0xC] adds r0, r5 ldr r1, =0x082f045c @@ -27523,7 +27523,7 @@ _08016B12: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x1 - bne _08016B5C + bne @08016B5C ldr r1, [r4, 0xC] ldr r0, [r4, 0x8] adds r1, r5 @@ -27546,17 +27546,17 @@ _08016B12: ldr r0, [r4, 0x8] strb r3, [r0, 0x1B] movs r0, 0x4 - b _08016C90 + b @08016C90 .align 2, 0 .pool -_08016B5C: +@08016B5C: adds r5, 0x1C adds r6, 0x1 cmp r6, 0x3 - ble _08016B12 + ble @08016B12 movs r6, 0 mov r9, r6 -_08016B68: +@08016B68: ldr r0, [r4] mov r1, r9 lsls r5, r1, 5 @@ -27565,20 +27565,20 @@ _08016B68: lsls r0, 30 mov r8, r5 cmp r0, 0 - beq _08016C5C + beq @08016C5C ldr r1, [r4, 0x4] adds r0, r2, 0 bl sub_80176E4 adds r6, r0, 0 cmp r6, 0xFF - beq _08016C02 + beq @08016C02 ldr r0, [r4] adds r2, r0, r5 ldrb r1, [r2, 0x1A] lsls r0, r1, 30 lsrs r0, 30 cmp r0, 0x1 - bne _08016BE0 + bne @08016BE0 lsls r0, r6, 3 subs r0, r6 lsls r6, r0, 2 @@ -27587,7 +27587,7 @@ _08016B68: adds r0, r2, 0 bl sub_8017678 cmp r0, 0 - beq _08016BC6 + beq @08016BC6 ldr r1, [r4] ldr r0, [r4, 0x4] adds r1, r5 @@ -27601,22 +27601,22 @@ _08016B68: movs r1, 0x40 strb r1, [r0, 0x1B] movs r7, 0x1 - b _08016BF8 -_08016BC6: + b @08016BF8 +@08016BC6: ldr r0, [r4] adds r1, r0, r5 ldrb r0, [r1, 0x1B] cmp r0, 0 - beq _08016BF8 + beq @08016BF8 subs r0, 0x1 strb r0, [r1, 0x1B] ldr r0, [r4] adds r0, r5 ldrb r0, [r0, 0x1B] cmp r0, 0 - bne _08016BF8 - b _08016BF6 -_08016BE0: + bne @08016BF8 + b @08016BF6 +@08016BE0: movs r3, 0x4 negs r3, r3 adds r0, r3, 0 @@ -27628,22 +27628,22 @@ _08016BE0: adds r0, r5 movs r1, 0 strb r1, [r0, 0x1B] -_08016BF6: +@08016BF6: movs r7, 0x2 -_08016BF8: +@08016BF8: ldr r0, [r4] add r0, r8 movs r1, 0 strh r1, [r0, 0x18] - b _08016C5C -_08016C02: + b @08016C5C +@08016C02: ldr r0, [r4] adds r1, r0, r5 ldrb r0, [r1, 0x1A] lsls r2, r0, 30 lsrs r0, r2, 30 cmp r0, 0x2 - beq _08016C3C + beq @08016C3C ldrh r0, [r1, 0x18] adds r0, 0x1 strh r0, [r1, 0x18] @@ -27652,7 +27652,7 @@ _08016C02: ldrh r1, [r2, 0x18] ldr r0, =0x00000257 cmp r1, r0 - bls _08016C5C + bls @08016C5C ldrb r0, [r2, 0x1A] movs r5, 0x4 negs r5, r5 @@ -27662,13 +27662,13 @@ _08016C02: orrs r0, r1 strb r0, [r2, 0x1A] movs r7, 0x2 - b _08016C5C + b @08016C5C .align 2, 0 .pool -_08016C3C: +@08016C3C: lsrs r0, r2, 30 cmp r0, 0x2 - bne _08016C5C + bne @08016C5C ldrh r0, [r1, 0x18] adds r0, 0x1 strh r0, [r1, 0x18] @@ -27677,23 +27677,23 @@ _08016C3C: ldrh r1, [r2, 0x18] ldr r0, =0x00000383 cmp r1, r0 - bls _08016C5C + bls @08016C5C adds r0, r2, 0 movs r1, 0x1 bl sub_8017580 -_08016C5C: +@08016C5C: mov r0, r9 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r9, r0 cmp r0, 0x7 - bhi _08016C6C - b _08016B68 -_08016C6C: + bhi @08016C6C + b @08016B68 +@08016C6C: movs r5, 0 movs r6, 0x3 -_08016C70: +@08016C70: ldr r0, [r4] ldr r1, [r4, 0x4] adds r1, r5 @@ -27702,15 +27702,15 @@ _08016C70: lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _08016C86 + beq @08016C86 movs r7, 0x1 -_08016C86: +@08016C86: adds r5, 0x1C subs r6, 0x1 cmp r6, 0 - bge _08016C70 + bge @08016C70 adds r0, r7, 0 -_08016C90: +@08016C90: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -27722,7 +27722,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 @@ -27741,7 +27741,7 @@ sub_8016CA0: @ 8016CA0 mov r0, sp adds r0, 0x10 str r0, [sp, 0x18] -_08016CC4: +@08016CC4: lsls r2, r7, 24 lsrs r2, 24 mov r0, sp @@ -27763,39 +27763,39 @@ _08016CC4: ldrsh r1, [r1, r5] bl sub_8013D88 cmp r0, 0 - bne _08016D00 + bne @08016D00 mov r1, sp ldr r0, =0x082f045c ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} -_08016D00: +@08016D00: mov r0, sp ldrb r1, [r0] movs r0, 0xF ands r0, r1 cmp r0, 0x1 - bne _08016D18 + bne @08016D18 mov r1, sp ldr r0, =0x082f045c ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} -_08016D18: +@08016D18: cmp r4, 0 - bne _08016D9C + bne @08016D9C lsls r0, r7, 3 mov r8, r0 adds r1, r7, 0x1 mov r9, r1 cmp r7, 0 - ble _08016D58 + ble @08016D58 movs r2, 0 str r2, [sp, 0x1C] adds r4, r7, 0 -_08016D2E: +@08016D2E: ldr r0, [r6, 0x4] ldr r3, [sp, 0x1C] adds r0, r3 @@ -27803,21 +27803,21 @@ _08016D2E: bl sub_8017630 lsls r0, 24 cmp r0, 0 - bne _08016D4C + bne @08016D4C mov r1, sp ldr r0, =0x082f045c ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} -_08016D4C: +@08016D4C: ldr r5, [sp, 0x1C] adds r5, 0x1C str r5, [sp, 0x1C] subs r4, 0x1 cmp r4, 0 - bne _08016D2E -_08016D58: + bne @08016D2E +@08016D58: ldr r1, [r6, 0x4] mov r0, r8 subs r4, r0, r7 @@ -27843,10 +27843,10 @@ _08016D58: ands r0, r1 orrs r0, r2 strb r0, [r3, 0x18] - b _08016DD4 + b @08016DD4 .align 2, 0 .pool -_08016D9C: +@08016D9C: ldr r1, [r6] lsls r4, r7, 3 subs r4, r7 @@ -27874,12 +27874,12 @@ _08016D9C: strb r0, [r3, 0x18] adds r7, 0x1 mov r9, r7 -_08016DD4: +@08016DD4: mov r7, r9 cmp r7, 0x3 - bgt _08016DDC - b _08016CC4 -_08016DDC: + bgt @08016DDC + b @08016CC4 +@08016DDC: add sp, 0x20 pop {r3-r5} mov r8, r3 @@ -27893,7 +27893,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 @@ -27920,7 +27920,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 @@ -27936,7 +27936,7 @@ sub_8016E24: @ 8016E24 ldr r1, =0x03005e08 adds r6, r0, r1 movs r3, 0 -_08016E42: +@08016E42: lsls r4, r3, 3 subs r0, r4, r3 lsls r5, r0, 2 @@ -27965,7 +27965,7 @@ _08016E42: mov r8, r4 ldr r3, [sp] cmp r0, 0 - bne _08016E8E + bne @08016E8E ldr r1, [r6] adds r1, r5 ldr r0, =0x082f045c @@ -27973,16 +27973,16 @@ _08016E42: stm r1!, {r2,r4,r7} ldm r0!, {r2,r4,r7} stm r1!, {r2,r4,r7} -_08016E8E: +@08016E8E: adds r4, r3, 0x1 mov r9, r4 cmp r3, 0 - ble _08016ED2 + ble @08016ED2 str r5, [sp, 0x4] movs r5, 0 str r5, [sp, 0x8] adds r4, r3, 0 -_08016E9E: +@08016E9E: ldr r1, [r6] ldr r7, [sp, 0x8] adds r0, r1, r7 @@ -27993,7 +27993,7 @@ _08016E9E: lsls r0, 24 ldr r3, [sp] cmp r0, 0 - bne _08016EC6 + bne @08016EC6 ldr r1, [r6] ldr r5, [sp, 0x4] adds r1, r5 @@ -28002,14 +28002,14 @@ _08016E9E: stm r1!, {r2,r5,r7} ldm r0!, {r2,r5,r7} stm r1!, {r2,r5,r7} -_08016EC6: +@08016EC6: ldr r7, [sp, 0x8] adds r7, 0x1C str r7, [sp, 0x8] subs r4, 0x1 cmp r4, 0 - bne _08016E9E -_08016ED2: + bne @08016E9E +@08016ED2: mov r0, r8 subs r4, r0, r3 lsls r4, 2 @@ -28030,7 +28030,7 @@ _08016ED2: strb r0, [r3, 0x18] mov r3, r9 cmp r3, 0x3 - ble _08016E42 + ble @08016E42 add sp, 0xC pop {r3-r5} mov r8, r3 @@ -28044,35 +28044,35 @@ _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 cmp r1, 0x7 - bne _08016F2C + bne @08016F2C ldrb r1, [r0] movs r0, 0x20 - b _08016F34 -_08016F2C: + b @08016F34 +@08016F2C: cmp r1, 0x8 - bne _08016F3E + bne @08016F3E ldrb r1, [r0] movs r0, 0x10 -_08016F34: +@08016F34: ands r0, r1 cmp r0, 0 - beq _08016F3E + beq @08016F3E movs r0, 0x1 - b _08016F40 -_08016F3E: + b @08016F40 +@08016F3E: movs r0, 0 -_08016F40: +@08016F40: pop {r1} bx r1 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} @@ -28088,7 +28088,7 @@ sub_8016F44: @ 8016F44 movs r5, 0 adds r1, r0 mov r8, r1 -_08016F62: +@08016F62: ldr r0, [r4] adds r0, r5 adds r1, r0, 0 @@ -28098,14 +28098,14 @@ _08016F62: bl sub_800DF34 lsls r0, 24 cmp r0, 0 - beq _08016F86 + beq @08016F86 ldr r0, [r4] adds r0, r5 mov r2, r8 movs r3, 0xC ldrsh r1, [r2, r3] bl sub_8016F1C -_08016F86: +@08016F86: ldr r0, [r4] adds r0, r5 ldr r1, =0x082f045c @@ -28124,7 +28124,7 @@ _08016F86: adds r5, 0x1C adds r6, 0x1 cmp r6, 0x3 - ble _08016F62 + ble @08016F62 pop {r3} mov r8, r3 pop {r4-r7} @@ -28135,7 +28135,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 @@ -28160,7 +28160,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 @@ -28185,7 +28185,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 @@ -28207,33 +28207,33 @@ 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 cmp r0, 0 - beq _0801705C + beq @0801705C movs r0, 0 - b _0801705E -_0801705C: + b @0801705E +@0801705C: movs r0, 0x1 -_0801705E: +@0801705E: pop {r1} bx r1 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 ldrb r0, [r4] cmp r0, 0 - beq _08017076 + beq @08017076 cmp r0, 0x1 - beq _0801709C - b _080170AE -_08017076: + beq @0801709C + b @080170AE +@08017076: bl sub_81973A4 movs r0, 0 movs r1, 0x1 @@ -28246,59 +28246,59 @@ _08017076: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _080170AE + b @080170AE .align 2, 0 .pool -_0801709C: +@0801709C: bl sub_8197224 lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne _080170AE + bne @080170AE strb r0, [r4] movs r0, 0x1 - b _080170B0 -_080170AE: + b @080170B0 +@080170AE: movs r0, 0 -_080170B0: +@080170B0: pop {r4,r5} pop {r1} bx r1 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 ldrb r0, [r4] cmp r0, 0 - beq _080170CA + beq @080170CA cmp r0, 0x1 - beq _080170E0 - b _0801710C -_080170CA: + beq @080170E0 + b @0801710C +@080170CA: cmp r5, 0 - beq _080170D4 + beq @080170D4 movs r0, 0x3 negs r0, r0 - b _08017110 -_080170D4: + b @08017110 +@080170D4: bl sub_8197930 ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _0801710C -_080170E0: + b @0801710C +@080170E0: cmp r5, 0 - beq _080170F2 + beq @080170F2 bl sub_8198C78 movs r0, 0 strb r0, [r4] movs r0, 0x3 negs r0, r0 - b _08017110 -_080170F2: + b @08017110 +@080170F2: bl sub_8198C58 lsls r0, 24 asrs r1, r0, 24 @@ -28307,21 +28307,21 @@ _080170F2: adds r0, r2 lsrs r0, 24 cmp r0, 0x2 - bhi _0801710C + bhi @0801710C strb r5, [r4] adds r0, r1, 0 - b _08017110 -_0801710C: + b @08017110 +@0801710C: movs r0, 0x2 negs r0, r0 -_08017110: +@08017110: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_80170B8 thumb_func_start sub_8017118 -sub_8017118: @ 8017118 +sub_8017118: ; 8017118 push {r4,lr} sub sp, 0x8 bl Window_AddFromTemplate @@ -28358,7 +28358,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 @@ -28368,7 +28368,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 @@ -28379,11 +28379,11 @@ sub_8017178: @ 8017178 mov r9, r2 ldrb r4, [r7] cmp r4, 0 - beq _08017194 + beq @08017194 cmp r4, 0x1 - beq _08017228 - b _0801728E -_08017194: + beq @08017228 + b @0801728E +@08017194: ldr r0, [r3] ldr r1, [r3, 0x4] str r0, [sp] @@ -28394,13 +28394,13 @@ _08017194: ldr r2, [sp] lsrs r0, r2, 24 cmp r0, r1 - ble _080171B6 + ble @080171B6 lsls r1, 24 ldr r0, =0x00ffffff ands r0, r2 orrs r0, r1 str r0, [sp] -_080171B6: +@080171B6: ldr r2, [sp] lsrs r0, r2, 8 lsls r0, 24 @@ -28408,20 +28408,20 @@ _080171B6: lsrs r1, r2, 24 adds r0, r1 cmp r0, 0x1D - ble _080171DC + ble @080171DC movs r0, 0x1D subs r0, r1 cmp r0, 0 - bge _080171D0 + bge @080171D0 movs r0, 0 -_080171D0: +@080171D0: lsls r1, r0, 24 lsrs r1, 16 ldr r0, =0xffff00ff ands r0, r2 orrs r0, r1 str r0, [sp] -_080171DC: +@080171DC: mov r0, sp bl Window_AddFromTemplate strb r0, [r5] @@ -28448,10 +28448,10 @@ _080171DC: ldrb r0, [r7] adds r0, 0x1 strb r0, [r7] - b _0801728E + b @0801728E .align 2, 0 .pool -_08017228: +@08017228: mov r3, r9 ldrb r0, [r3] bl sub_81AE604 @@ -28460,7 +28460,7 @@ _08017228: ldrh r1, [r0, 0x2E] ands r4, r1 cmp r4, 0 - beq _08017264 + beq @08017264 mov r4, r9 ldrb r0, [r4] movs r1, 0 @@ -28474,14 +28474,14 @@ _08017228: movs r0, 0 strb r0, [r7] mov r0, r8 - b _08017292 + b @08017292 .align 2, 0 .pool -_08017264: +@08017264: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0801728E + beq @0801728E mov r6, r9 ldrb r0, [r6] movs r1, 0 @@ -28495,11 +28495,11 @@ _08017264: strb r4, [r7] movs r0, 0x2 negs r0, r0 - b _08017292 -_0801728E: + b @08017292 +@0801728E: movs r0, 0x1 negs r0, r0 -_08017292: +@08017292: add sp, 0x8 pop {r3,r4} mov r8, r3 @@ -28510,7 +28510,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 @@ -28522,17 +28522,17 @@ sub_80172A0: @ 80172A0 mov r9, r3 ldrb r4, [r5] cmp r4, 0x1 - beq _0801730C + beq @0801730C cmp r4, 0x1 - bgt _080172C2 + bgt @080172C2 cmp r4, 0 - beq _080172C8 - b _0801739C -_080172C2: + beq @080172C8 + b @0801739C +@080172C2: cmp r4, 0x2 - beq _0801731C - b _0801739C -_080172C8: + beq @0801731C + b @0801739C +@080172C8: ldr r0, =0x082f0344 bl sub_8017118 mov r1, r9 @@ -28557,19 +28557,19 @@ _080172C8: bl calls_per_item_funcs_in_list_outer mov r1, r10 strb r0, [r1] - b _08017314 + b @08017314 .align 2, 0 .pool -_0801730C: +@0801730C: ldrb r0, [r6] movs r1, 0x1 bl Window_CopyToVram -_08017314: +@08017314: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] - b _0801739C -_0801731C: + b @0801739C +@0801731C: mov r3, r10 ldrb r0, [r3] bl sub_81AE604 @@ -28579,14 +28579,14 @@ _0801731C: movs r0, 0x3 ands r0, r2 cmp r0, 0 - beq _0801739C + beq @0801739C cmp r1, 0x8 - beq _0801733E + beq @0801733E ands r4, r2 mov r8, r4 cmp r4, 0 - beq _08017368 -_0801733E: + beq @08017368 +@0801733E: mov r4, r10 ldrb r0, [r4] movs r1, 0 @@ -28601,15 +28601,15 @@ _0801733E: strb r0, [r5] movs r0, 0x2 negs r0, r0 - b _080173A0 + b @080173A0 .align 2, 0 .pool -_08017368: +@08017368: ldr r0, [sp, 0x28] bl sub_8017CB0 adds r4, r0, 0 cmp r4, 0 - blt _08017396 + blt @08017396 mov r1, r10 ldrb r0, [r1] movs r1, 0 @@ -28623,14 +28623,14 @@ _08017368: mov r7, r8 strb r7, [r5] adds r0, r4, 0 - b _080173A0 -_08017396: + b @080173A0 +@08017396: movs r0, 0x7 bl audio_play -_0801739C: +@0801739C: movs r0, 0x1 negs r0, r0 -_080173A0: +@080173A0: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -28641,7 +28641,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 @@ -28661,7 +28661,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} @@ -28669,7 +28669,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] @@ -28701,26 +28701,26 @@ sub_80173E0: @ 80173E0 ands r0, r1 strb r0, [r2] cmp r4, 0x6 - bls _08017422 - b _0801756E -_08017422: + bls @08017422 + b @0801756E +@08017422: lsls r0, r4, 2 - ldr r1, =_08017434 + ldr r1, =@08017434 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08017434: - .4byte _08017450 - .4byte _0801747C - .4byte _080174A8 - .4byte _080174D4 - .4byte _08017500 - .4byte _0801752C - .4byte _08017544 -_08017450: +@08017434: + .4byte @08017450 + .4byte @0801747C + .4byte @080174A8 + .4byte @080174D4 + .4byte @08017500 + .4byte @0801752C + .4byte @08017544 +@08017450: mov r0, sp movs r1, 0 strb r1, [r0, 0xA] @@ -28742,8 +28742,8 @@ _08017450: strb r0, [r2, 0xD] ands r0, r3 movs r1, 0x30 - b _0801756A -_0801747C: + b @0801756A +@0801747C: mov r0, sp movs r1, 0 strb r1, [r0, 0xA] @@ -28765,8 +28765,8 @@ _0801747C: strb r0, [r2, 0xD] ands r0, r3 movs r1, 0x50 - b _0801756A -_080174A8: + b @0801756A +@080174A8: mov r0, sp movs r1, 0 strb r1, [r0, 0xA] @@ -28788,8 +28788,8 @@ _080174A8: strb r0, [r2, 0xD] ands r0, r3 movs r1, 0x70 - b _0801756A -_080174D4: + b @0801756A +@080174D4: mov r0, sp movs r1, 0 strb r1, [r0, 0xA] @@ -28811,8 +28811,8 @@ _080174D4: strb r0, [r2, 0xD] ands r0, r3 movs r1, 0x30 - b _0801756A -_08017500: + b @0801756A +@08017500: mov r0, sp movs r1, 0 strb r1, [r0, 0xA] @@ -28834,8 +28834,8 @@ _08017500: strb r0, [r2, 0xD] ands r0, r3 movs r1, 0x30 - b _0801756A -_0801752C: + b @0801756A +@0801752C: mov r0, sp movs r1, 0 strb r1, [r0, 0xA] @@ -28847,8 +28847,8 @@ _0801752C: adds r0, r3, 0 ands r0, r1 movs r1, 0x70 - b _0801755A -_08017544: + b @0801755A +@08017544: mov r0, sp movs r1, 0 strb r1, [r0, 0xA] @@ -28860,7 +28860,7 @@ _08017544: adds r0, r3, 0 ands r0, r1 movs r1, 0xE0 -_0801755A: +@0801755A: orrs r0, r1 strb r0, [r2, 0xC] mov r1, sp @@ -28869,10 +28869,10 @@ _0801755A: strb r0, [r1, 0xD] ands r0, r3 movs r1, 0x90 -_0801756A: +@0801756A: orrs r0, r1 strb r0, [r2, 0xD] -_0801756E: +@0801756E: mov r0, sp movs r1, 0xFF movs r2, 0 @@ -28884,7 +28884,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 @@ -28893,7 +28893,7 @@ sub_8017580: @ 8017580 lsls r1, 24 lsrs r1, 24 cmp r1, 0 - beq _080175D8 + beq @080175D8 ldr r2, =0x082f045c mov r8, r2 movs r5, 0 @@ -28907,7 +28907,7 @@ sub_8017580: @ 8017580 movs r7, 0xFF mov r10, r7 adds r3, r1, 0 -_080175AC: +@080175AC: adds r1, r4, 0 mov r0, r8 ldm r0!, {r5-r7} @@ -28929,8 +28929,8 @@ _080175AC: adds r4, 0x20 subs r3, 0x1 cmp r3, 0 - bne _080175AC -_080175D8: + bne @080175AC +@080175D8: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -28943,7 +28943,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} @@ -28956,7 +28956,7 @@ sub_80175EC: @ 80175EC adds r2, 0x18 adds r3, r0, 0 movs r4, 0x3 -_08017604: +@08017604: adds r1, r3, 0 mov r0, r12 ldm r0!, {r5-r7} @@ -28971,7 +28971,7 @@ _08017604: adds r3, 0x1C subs r4, 0x1 cmp r4, 0 - bge _08017604 + bge @08017604 pop {r3} mov r8, r3 pop {r4-r7} @@ -28982,51 +28982,51 @@ _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 movs r2, 0 adds r4, r5, 0x2 adds r3, r6, 0x2 -_0801763C: +@0801763C: adds r0, r4, r2 adds r1, r3, r2 ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bne _08017664 + bne @08017664 adds r2, 0x1 cmp r2, 0x1 - ble _0801763C + ble @0801763C movs r2, 0 adds r4, r5, 0 adds r4, 0x10 adds r3, r6, 0 adds r3, 0x10 -_08017658: +@08017658: adds r0, r4, r2 adds r1, r3, r2 ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - beq _08017668 -_08017664: + beq @08017668 +@08017664: movs r0, 0x1 - b _08017670 -_08017668: + b @08017670 +@08017668: adds r2, 0x1 cmp r2, 0x7 - ble _08017658 + ble @08017658 movs r0, 0 -_08017670: +@08017670: pop {r4-r6} pop {r1} bx r1 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 @@ -29037,26 +29037,26 @@ sub_8017678: @ 8017678 ands r1, r3 ands r0, r2 cmp r1, r0 - bne _080176DC + bne @080176DC movs r0, 0x80 adds r1, r0, 0 ands r1, r3 ands r0, r2 cmp r1, r0 - bne _080176DC + bne @080176DC movs r2, 0 adds r4, r5, 0x4 adds r3, r6, 0x4 -_080176A0: +@080176A0: adds r0, r4, r2 adds r1, r3, r2 ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bne _080176DC + bne @080176DC adds r2, 0x1 cmp r2, 0x3 - ble _080176A0 + ble @080176A0 ldrh r2, [r5, 0x8] ldr r0, =0x000003ff ldrh r3, [r6, 0x8] @@ -29064,7 +29064,7 @@ _080176A0: ands r1, r2 ands r0, r3 cmp r1, r0 - bne _080176DC + bne @080176DC ldrb r2, [r5, 0x9] movs r0, 0xFC ldrb r3, [r6, 0x9] @@ -29072,21 +29072,21 @@ _080176A0: ands r1, r2 ands r0, r3 cmp r1, r0 - bne _080176DC + bne @080176DC movs r0, 0 - b _080176DE + b @080176DE .align 2, 0 .pool -_080176DC: +@080176DC: movs r0, 0x1 -_080176DE: +@080176DE: pop {r4-r6} pop {r1} bx r1 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} @@ -29096,18 +29096,18 @@ sub_80176E4: @ 80176E4 adds r4, r1, 0 adds r4, 0x18 adds r5, r1, 0 -_080176F6: +@080176F6: ldrb r1, [r4] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0801771E + beq @0801771E mov r0, r8 adds r1, r5, 0 bl sub_8017630 lsls r0, 24 cmp r0, 0 - bne _0801771E + bne @0801771E lsls r0, r6, 24 lsrs r7, r0, 24 ldrb r0, [r4] @@ -29116,12 +29116,12 @@ _080176F6: adds r1, r2, 0 ands r0, r1 strb r0, [r4] -_0801771E: +@0801771E: adds r4, 0x1C adds r5, 0x1C adds r6, 0x1 cmp r6, 0x3 - ble _080176F6 + ble @080176F6 adds r0, r7, 0 pop {r3} mov r8, r3 @@ -29131,7 +29131,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 @@ -29144,10 +29144,10 @@ sub_8017734: @ 8017734 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080177A8 + beq @080177A8 movs r5, 0 cmp r5, r6 - bge _080177A8 + bge @080177A8 movs r0, 0x4 negs r0, r0 mov r9, r0 @@ -29157,12 +29157,12 @@ sub_8017734: @ 8017734 adds r2, r3, 0 adds r2, 0x18 adds r1, r3, 0 -_08017766: +@08017766: ldrb r0, [r2, 0x2] movs r3, 0x3 ands r3, r0 cmp r3, 0 - bne _0801779E + bne @0801779E mov r0, r8 ldm r0!, {r4,r6,r7} stm r1!, {r4,r6,r7} @@ -29185,16 +29185,16 @@ _08017766: strb r0, [r1, 0x18] lsls r0, r5, 24 lsrs r0, 24 - b _080177AA -_0801779E: + b @080177AA +@0801779E: adds r2, 0x20 adds r1, 0x20 adds r5, 0x1 cmp r5, r6 - blt _08017766 -_080177A8: + blt @08017766 +@080177A8: movs r0, 0xFF -_080177AA: +@080177AA: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -29204,7 +29204,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 @@ -29253,11 +29253,11 @@ sub_80177B8: @ 80177B8 movs r0, 0x3 ands r0, r1 cmp r0, 0x1 - bne _08017884 + bne @08017884 movs r0, 0x40 ands r2, r0 cmp r2, 0 - bne _08017884 + bne @08017884 adds r0, r5, 0 adds r1, r6, 0 bl sub_8018404 @@ -29297,7 +29297,7 @@ sub_80177B8: @ 80177B8 movs r1, 0x1 adds r2, r5, 0 bl sub_80173E0 -_08017884: +@08017884: add sp, 0x10 pop {r3,r4} mov r8, r3 @@ -29310,7 +29310,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 @@ -29332,7 +29332,7 @@ sub_80178A0: @ 80178A0 movs r0, 0x3 ands r0, r1 cmp r0, 0x1 - bne _0801792A + bne @0801792A ldr r4, =0x02021fc4 adds r0, r4, 0 adds r1, r5, 0 @@ -29373,7 +29373,7 @@ sub_80178A0: @ 80178A0 movs r1, 0x1 adds r2, r4, 0 bl sub_80173E0 -_0801792A: +@0801792A: add sp, 0x10 pop {r3,r4} mov r8, r3 @@ -29386,7 +29386,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 @@ -29398,25 +29398,25 @@ sub_8017940: @ 8017940 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x9 - bne _08017978 + bne @08017978 movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0x8 - bne _08017978 + bne @08017978 ldr r0, =0x02037590 ldrb r0, [r0, 0x3] cmp r0, 0x2 - beq _0801796E + beq @0801796E cmp r0, 0 - bne _08017978 -_0801796E: + bne @08017978 +@0801796E: movs r0, 0x1 - b _0801797A + b @0801797A .align 2, 0 .pool -_08017978: +@08017978: movs r0, 0 -_0801797A: +@0801797A: add sp, 0x4 pop {r4} pop {r1} @@ -29424,35 +29424,35 @@ _0801797A: thumb_func_end sub_8017940 thumb_func_start sub_8017984 -sub_8017984: @ 8017984 +sub_8017984: ; 8017984 push {lr} cmp r0, 0x4 - beq _0801799C + beq @0801799C cmp r0, 0x4 - ble _080179A4 + ble @080179A4 cmp r0, 0x5 - beq _08017998 + beq @08017998 cmp r0, 0x8 - beq _080179A0 - b _080179A4 -_08017998: + beq @080179A0 + b @080179A4 +@08017998: movs r0, 0x1 - b _080179A6 -_0801799C: + b @080179A6 +@0801799C: movs r0, 0x2 - b _080179A6 -_080179A0: + b @080179A6 +@080179A0: movs r0, 0x3 - b _080179A6 -_080179A4: + b @080179A6 +@080179A4: movs r0, 0 -_080179A6: +@080179A6: pop {r1} bx r1 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 @@ -29473,7 +29473,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 @@ -29485,9 +29485,9 @@ sub_80179D4: @ 80179D4 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08017A4C + bne @08017A4C cmp r4, 0 - bne _08017A4C + bne @08017A4C ldr r4, =0x02021cc4 adds r0, r4, 0 adds r1, r5, 0 @@ -29503,7 +29503,7 @@ sub_80179D4: @ 80179D4 movs r0, 0x7F ands r0, r1 cmp r0, 0x45 - bne _08017A38 + bne @08017A38 ldr r0, =0x02021fc4 ldr r3, =0x082ee6b8 lsls r1, r6, 2 @@ -29513,52 +29513,52 @@ sub_80179D4: @ 80179D4 ldr r1, [r1] bl ExpandTextCodes movs r0, 0x2 - b _08017B2A + b @08017B2A .align 2, 0 .pool -_08017A38: +@08017A38: ldr r0, =0x082ee17c lsls r1, r2, 2 adds r1, r0 ldr r0, [r1] bl sub_8017020 movs r0, 0x1 - b _08017B2A + b @08017B2A .align 2, 0 .pool -_08017A4C: +@08017A4C: ldr r0, =0x02021cc4 adds r1, r5, 0 bl sub_8018404 cmp r4, 0 - beq _08017A62 + beq @08017A62 adds r0, r5, r4 ldrb r0, [r0, 0x3] lsrs r6, r0, 3 movs r0, 0x1 ands r6, r0 -_08017A62: +@08017A62: ldrb r0, [r5, 0xA] lsls r0, 25 lsrs r0, 25 movs r1, 0x3F ands r1, r0 cmp r1, 0x4 - beq _08017AB0 + beq @08017AB0 cmp r1, 0x4 - bgt _08017A80 + bgt @08017A80 cmp r1, 0x1 - beq _08017A8A - b _08017B20 + beq @08017A8A + b @08017B20 .align 2, 0 .pool -_08017A80: +@08017A80: cmp r1, 0x5 - beq _08017AD0 + beq @08017AD0 cmp r1, 0x8 - beq _08017AF4 - b _08017B20 -_08017A8A: + beq @08017AF4 + b @08017B20 +@08017A8A: ldr r5, =0x02021fc4 ldr r4, =0x082eeeac bl GenerateRandomNumber @@ -29571,10 +29571,10 @@ _08017A8A: adds r1, r0 adds r1, r4 ldr r1, [r1] - b _08017B0E + b @08017B0E .align 2, 0 .pool -_08017AB0: +@08017AB0: ldr r5, =0x02021fc4 ldr r4, =0x082ef1cc bl GenerateRandomNumber @@ -29584,10 +29584,10 @@ _08017AB0: ands r0, r1 lsls r0, 2 lsls r1, r6, 4 - b _08017B08 + b @08017B08 .align 2, 0 .pool -_08017AD0: +@08017AD0: ldr r5, =0x02021fc4 ldr r4, =0x082ef010 bl GenerateRandomNumber @@ -29600,10 +29600,10 @@ _08017AD0: adds r1, r0 adds r1, r4 ldr r1, [r1] - b _08017B0E + b @08017B0E .align 2, 0 .pool -_08017AF4: +@08017AF4: ldr r5, =0x02021fc4 ldr r4, =0x082ef100 bl GenerateRandomNumber @@ -29613,23 +29613,23 @@ _08017AF4: ands r0, r1 lsls r0, 2 lsls r1, r6, 3 -_08017B08: +@08017B08: adds r0, r1 adds r0, r4 ldr r1, [r0] -_08017B0E: +@08017B0E: adds r0, r5, 0 bl ExpandTextCodes - b _08017B28 + b @08017B28 .align 2, 0 .pool -_08017B20: +@08017B20: ldr r0, =0x02021fc4 ldr r1, =0x082ee6c8 bl ExpandTextCodes -_08017B28: +@08017B28: movs r0, 0 -_08017B2A: +@08017B2A: pop {r4-r6} pop {r1} bx r1 @@ -29638,12 +29638,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 @@ -29675,7 +29675,7 @@ sub_8017B3C: @ 8017B3C movs r0, 0xCE lsls r0, 1 cmp r8, r0 - bne _08017B94 + bne @08017B94 ldr r2, =0x082ef7d0 str r5, [sp] str r4, [sp, 0x4] @@ -29683,10 +29683,10 @@ sub_8017B3C: @ 8017B3C movs r1, 0x1 movs r3, 0x44 bl sub_80173E0 - b _08017BD4 + b @08017BD4 .align 2, 0 .pool -_08017B94: +@08017B94: adds r1, r7, 0x1 adds r0, r6, 0 movs r2, 0x44 @@ -29715,7 +29715,7 @@ _08017B94: add r2, sp, 0x8 movs r3, 0xC6 bl sub_80173E0 -_08017BD4: +@08017BD4: add sp, 0xC pop {r3,r4} mov r8, r3 @@ -29728,7 +29728,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 @@ -29746,20 +29746,20 @@ sub_8017BE8: @ 8017BE8 movs r0, 0x3 negs r0, r0 cmp r4, r0 - bne _08017C6C + bne @08017C6C ldr r0, =0x082f03a4 ldrb r0, [r0, 0x14] lsls r0, 28 lsrs r0, 28 cmp r7, r0 - bne _08017C6C + bne @08017C6C bl sub_800F7DC adds r2, r0, 0 ldrh r1, [r2, 0x8] ldr r0, =0x000003ff ands r0, r1 cmp r0, 0 - beq _08017CA0 + beq @08017CA0 ldr r0, =0x03005d90 ldr r3, [r0] movs r0, 0x5 @@ -29767,10 +29767,10 @@ sub_8017BE8: @ 8017BE8 mov r0, r9 adds r1, r7, 0 bl sub_8017B3C - b _08017CA0 + b @08017CA0 .align 2, 0 .pool -_08017C4C: +@08017C4C: mov r0, r12 adds r1, r0, r4 add r0, sp, 0x4 @@ -29784,8 +29784,8 @@ _08017C4C: adds r1, r7, 0 add r3, sp, 0x4 bl sub_8017B3C - b _08017CA0 -_08017C6C: + b @08017CA0 +@08017C6C: movs r5, 0 movs r1, 0 mov r2, r8 @@ -29794,27 +29794,27 @@ _08017C6C: adds r2, 0x8 movs r3, 0 adds r6, r4, 0x1 -_08017C7C: +@08017C7C: ldrb r0, [r2, 0x12] lsls r0, 30 lsrs r0, 30 adds r4, r3, 0 cmp r0, 0x1 - bne _08017C92 + bne @08017C92 ldrh r0, [r2] lsls r0, 22 cmp r0, 0 - beq _08017C92 + beq @08017C92 adds r5, 0x1 -_08017C92: +@08017C92: cmp r5, r6 - beq _08017C4C + beq @08017C4C adds r2, 0x20 adds r3, 0x20 adds r1, 0x1 cmp r1, 0x7 - ble _08017C7C -_08017CA0: + ble @08017C7C +@08017CA0: add sp, 0x10 pop {r3,r4} mov r8, r3 @@ -29825,7 +29825,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 @@ -29834,40 +29834,40 @@ sub_8017CB0: @ 8017CB0 adds r2, r0, 0 adds r2, 0x8 adds r5, r1, 0x1 -_08017CC0: +@08017CC0: ldrb r1, [r2, 0x12] adds r0, r7, 0 ands r0, r1 cmp r0, 0x1 - bne _08017CD6 + bne @08017CD6 ldrh r1, [r2] adds r0, r6, 0 ands r0, r1 cmp r0, 0 - beq _08017CD6 + beq @08017CD6 adds r4, 0x1 -_08017CD6: +@08017CD6: cmp r4, r5 - bne _08017CE4 + bne @08017CE4 adds r0, r3, 0 - b _08017CF0 + b @08017CF0 .align 2, 0 .pool -_08017CE4: +@08017CE4: adds r2, 0x20 adds r3, 0x1 cmp r3, 0x7 - ble _08017CC0 + ble @08017CC0 movs r0, 0x1 negs r0, r0 -_08017CF0: +@08017CF0: pop {r4-r7} pop {r1} bx r1 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] @@ -29877,16 +29877,16 @@ 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 lsls r0, 1 cmp r1, r0 - bne _08017D44 + bne @08017D44 movs r4, 0 - b _08017D2E -_08017D14: + b @08017D2E +@08017D14: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -29897,25 +29897,25 @@ _08017D14: movs r0, 0xCE lsls r0, 1 cmp r1, r0 - beq _08017D74 + beq @08017D74 adds r4, 0x1 -_08017D2E: +@08017D2E: ldr r0, =0x020244e9 ldrb r0, [r0] cmp r4, r0 - blt _08017D14 + blt @08017D14 movs r0, 0x2 - b _08017D90 + b @08017D90 .align 2, 0 .pool -_08017D44: +@08017D44: movs r4, 0 ldr r0, =0x020244e9 ldrb r0, [r0] cmp r4, r0 - bge _08017D8E + bge @08017D8E ldr r6, =0x083203cc -_08017D50: +@08017D50: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -29929,24 +29929,24 @@ _08017D50: adds r1, r0, r6 ldrb r0, [r1, 0x6] cmp r0, r5 - beq _08017D74 + beq @08017D74 ldrb r0, [r1, 0x7] cmp r0, r5 - bne _08017D84 -_08017D74: + bne @08017D84 +@08017D74: movs r0, 0 - b _08017D90 + b @08017D90 .align 2, 0 .pool -_08017D84: +@08017D84: adds r4, 0x1 ldr r0, =0x020244e9 ldrb r0, [r0] cmp r4, r0 - blt _08017D50 -_08017D8E: + blt @08017D50 +@08017D8E: movs r0, 0x1 -_08017D90: +@08017D90: pop {r4-r6} pop {r1} bx r1 @@ -29955,54 +29955,54 @@ _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 - beq _08017DD8 + beq @08017DD8 cmp r1, 0x44 - bgt _08017DAE + bgt @08017DAE cmp r1, 0x41 - beq _08017DB8 - b _08017DF6 -_08017DAE: + beq @08017DB8 + b @08017DF6 +@08017DAE: cmp r1, 0x45 - beq _08017DC8 + beq @08017DC8 cmp r1, 0x48 - beq _08017DE8 - b _08017DF6 -_08017DB8: + beq @08017DE8 + b @08017DF6 +@08017DB8: ldr r0, =0x082eea68 lsls r1, r2, 2 adds r1, r0 ldr r1, [r1] - b _08017DDA + b @08017DDA .align 2, 0 .pool -_08017DC8: +@08017DC8: ldr r0, =0x082eed3c lsls r1, r2, 2 adds r1, r0 ldr r1, [r1] - b _08017DDA + b @08017DDA .align 2, 0 .pool -_08017DD8: +@08017DD8: ldr r1, =0x082ef7b0 -_08017DDA: +@08017DDA: adds r0, r3, 0 bl ExpandTextCodes - b _08017DF6 + b @08017DF6 .align 2, 0 .pool -_08017DE8: +@08017DE8: ldr r0, =0x082eeb08 lsls r1, r2, 2 adds r1, r0 ldr r1, [r1] adds r0, r3, 0 bl ExpandTextCodes -_08017DF6: +@08017DF6: pop {r0} bx r0 .align 2, 0 @@ -30010,7 +30010,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 @@ -30029,19 +30029,19 @@ sub_8017E00: @ 8017E00 adds r0, r2 ldrb r0, [r0, 0x13] cmp r4, 0x44 - beq _08017E54 + beq @08017E54 cmp r4, 0x44 - bgt _08017E38 + bgt @08017E38 cmp r4, 0x41 - beq _08017E3E - b _08017E94 + beq @08017E3E + b @08017E94 .align 2, 0 .pool -_08017E38: +@08017E38: cmp r6, 0x45 - beq _08017E78 - b _08017E94 -_08017E3E: + beq @08017E78 + b @08017E94 +@08017E3E: ldr r2, =0x082ee984 lsls r1, r0, 1 adds r1, r0 @@ -30050,10 +30050,10 @@ _08017E3E: adds r0, r3 lsls r0, 3 adds r1, r0 - b _08017E66 + b @08017E66 .align 2, 0 .pool -_08017E54: +@08017E54: ldr r2, =0x082ee984 lsls r1, r0, 1 adds r1, r0 @@ -30063,15 +30063,15 @@ _08017E54: lsls r0, 3 adds r1, r0 adds r2, 0x8 -_08017E66: +@08017E66: adds r1, r2 ldr r1, [r1] adds r0, r5, 0 bl gf_strcpy - b _08017E94 + b @08017E94 .align 2, 0 .pool -_08017E78: +@08017E78: ldr r2, =0x082ee984 lsls r1, r0, 1 adds r1, r0 @@ -30085,7 +30085,7 @@ _08017E78: ldr r1, [r1] adds r0, r5, 0 bl gf_strcpy -_08017E94: +@08017E94: pop {r4-r6} pop {r0} bx r0 @@ -30094,7 +30094,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} @@ -30106,38 +30106,38 @@ sub_8017EA0: @ 8017EA0 ldrh r0, [r5] subs r0, 0x40 cmp r0, 0x8 - bls _08017EBA - b _08017FC6 -_08017EBA: + bls @08017EBA + b @08017FC6 +@08017EBA: lsls r0, 2 - ldr r1, =_08017EC8 + ldr r1, =@08017EC8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08017EC8: - .4byte _08017FBC - .4byte _08017EEC - .4byte _08017FC6 - .4byte _08017FC6 - .4byte _08017EFC - .4byte _08017EF4 - .4byte _08017FC6 - .4byte _08017FC6 - .4byte _08017FAC -_08017EEC: +@08017EC8: + .4byte @08017FBC + .4byte @08017EEC + .4byte @08017FC6 + .4byte @08017FC6 + .4byte @08017EFC + .4byte @08017EF4 + .4byte @08017FC6 + .4byte @08017FC6 + .4byte @08017FAC +@08017EEC: ldr r1, =0x082ee3dc - b _08017FAE + b @08017FAE .align 2, 0 .pool -_08017EF4: +@08017EF4: ldr r1, =0x082ee430 - b _08017FAE + b @08017FAE .align 2, 0 .pool -_08017EFC: +@08017EFC: adds r0, r6, 0 adds r0, 0x58 ldr r4, =0x02022c40 @@ -30154,21 +30154,21 @@ _08017EFC: adds r1, r2 bl gf_strcpy movs r4, 0 - b _08017F2E + b @08017F2E .align 2, 0 .pool -_08017F2C: +@08017F2C: adds r4, 0x1 -_08017F2E: +@08017F2E: cmp r4, 0x3 - bgt _08017F64 + bgt @08017F64 ldr r0, =0x03007890 ldr r0, [r0] lsls r1, r4, 5 adds r0, r1 ldrh r0, [r0, 0x18] cmp r0, 0x2 - bne _08017F2C + bne @08017F2C ldrh r1, [r5, 0x4] adds r0, r6, 0 adds r0, 0x78 @@ -30185,22 +30185,22 @@ _08017F2E: bl gf_strcpy ldrh r5, [r5, 0x2] mov r8, r5 -_08017F64: +@08017F64: movs r0, 0xCE lsls r0, 1 cmp r8, r0 - bne _08017F84 + bne @08017F84 ldr r1, =0x082ee4f0 adds r0, r7, 0 bl gf_strcpy - b _08017FB4 + b @08017FB4 .align 2, 0 .pool -_08017F84: +@08017F84: movs r4, 0 adds r5, r6, 0 adds r5, 0x58 -_08017F8A: +@08017F8A: lsls r0, r4, 24 lsrs r0, 24 adds r1, r5, 0 @@ -30208,29 +30208,29 @@ _08017F8A: adds r5, 0x10 adds r4, 0x1 cmp r4, 0x3 - ble _08017F8A + ble @08017F8A ldr r1, =0x082ee47c adds r0, r7, 0 bl sub_81AFC28 - b _08017FB4 + b @08017FB4 .align 2, 0 .pool -_08017FAC: +@08017FAC: ldr r1, =0x082ee380 -_08017FAE: +@08017FAE: adds r0, r7, 0 bl ExpandTextCodes -_08017FB4: +@08017FB4: movs r2, 0x1 - b _08017FC6 + b @08017FC6 .align 2, 0 .pool -_08017FBC: +@08017FBC: ldr r1, =0x082ee544 adds r0, r7, 0 bl ExpandTextCodes movs r2, 0x2 -_08017FC6: +@08017FC6: adds r0, r2, 0 pop {r3} mov r8, r3 @@ -30242,34 +30242,34 @@ _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 ldrh r1, [r0, 0x2] cmp r1, 0 - beq _08017FFC + beq @08017FFC cmp r1, 0x51 - beq _08017FEC + beq @08017FEC cmp r1, 0x52 - bne _08017FFC -_08017FEC: + bne @08017FFC +@08017FEC: adds r0, r2, 0 adds r0, 0x98 strh r1, [r0] movs r0, 0x1 - b _08017FFE + b @08017FFE .align 2, 0 .pool -_08017FFC: +@08017FFC: movs r0, 0 -_08017FFE: +@08017FFE: pop {r1} bx r1 thumb_func_end sub_8017FD8 thumb_func_start in_trade_center -in_trade_center: @ 8018004 +in_trade_center: ; 8018004 push {lr} movs r2, 0 ldr r0, =0x03005d8c @@ -30277,9 +30277,9 @@ in_trade_center: @ 8018004 ldrh r1, [r0, 0x4] ldr r0, =0x00003c19 cmp r1, r0 - bne _08018016 + bne @08018016 movs r2, 0x1 -_08018016: +@08018016: adds r0, r2, 0 pop {r1} bx r1 @@ -30288,15 +30288,15 @@ _08018016: thumb_func_end in_trade_center thumb_func_start sub_8018024 -sub_8018024: @ 8018024 +sub_8018024: ; 8018024 push {r4-r6,lr} movs r6, 0 movs r5, 0 ldr r0, =0x020244e9 ldrb r0, [r0] cmp r6, r0 - bge _08018064 -_08018032: + bge @08018064 +@08018032: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -30306,38 +30306,38 @@ _08018032: movs r1, 0x38 bl pokemon_getattr cmp r0, 0x1E - bhi _0801805A + bhi @0801805A adds r0, r4, 0 movs r1, 0x41 bl pokemon_getattr movs r1, 0xCE lsls r1, 1 cmp r0, r1 - beq _0801805A + beq @0801805A adds r6, 0x1 -_0801805A: +@0801805A: adds r5, 0x1 ldr r0, =0x020244e9 ldrb r0, [r0] cmp r5, r0 - blt _08018032 -_08018064: + blt @08018032 +@08018064: cmp r6, 0x1 - bgt _08018074 + bgt @08018074 movs r0, 0 - b _08018076 + b @08018076 .align 2, 0 .pool -_08018074: +@08018074: movs r0, 0x1 -_08018076: +@08018076: pop {r4-r6} pop {r1} bx r1 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] @@ -30351,7 +30351,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 @@ -30362,7 +30362,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 @@ -30386,21 +30386,21 @@ sub_80180A0: @ 80180A0 movs r0, 0xCE lsls r0, 1 cmp r1, r0 - beq _080180E0 + beq @080180E0 movs r0, 0 - b _080180E2 + b @080180E2 .align 2, 0 .pool -_080180E0: +@080180E0: movs r0, 0x1 -_080180E2: +@080180E2: pop {r4,r5} pop {r1} bx r1 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 @@ -30428,7 +30428,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} @@ -30436,22 +30436,22 @@ sub_8018120: @ 8018120 movs r2, 0 mov r8, r2 cmp r1, 0 - bne _0801813E + bne @0801813E ldrh r7, [r0, 0xA] ldr r6, [r0, 0x4] - b _08018142 -_08018136: + b @08018142 +@08018136: lsls r0, r5, 16 lsrs r0, 16 mov r8, r0 - b _08018176 -_0801813E: + b @08018176 +@0801813E: ldrh r7, [r0, 0xE] ldr r6, [r0, 0x14] -_08018142: +@08018142: movs r5, 0 - b _0801816E -_08018146: + b @0801816E +@08018146: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -30461,22 +30461,22 @@ _08018146: movs r1, 0 bl pokemon_getattr cmp r0, r6 - bne _0801816C + bne @0801816C adds r0, r4, 0 movs r1, 0x41 bl pokemon_getattr lsls r0, 16 lsrs r0, 16 cmp r0, r7 - beq _08018136 -_0801816C: + beq @08018136 +@0801816C: adds r5, 0x1 -_0801816E: +@0801816E: ldr r0, =0x020244e9 ldrb r0, [r0] cmp r5, r0 - blt _08018146 -_08018176: + blt @08018146 +@08018176: mov r0, r8 pop {r3} mov r8, r3 @@ -30488,7 +30488,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 @@ -30498,7 +30498,7 @@ sub_801818C: @ 801818C movs r0, 0 strb r0, [r1] cmp r4, 0 - beq _080181BC + beq @080181BC ldr r2, =0x02022c40 ldrh r0, [r2, 0x2] ldrh r1, [r2, 0xA] @@ -30508,7 +30508,7 @@ sub_801818C: @ 801818C movs r1, 0 movs r2, 0 bl sub_8011090 -_080181BC: +@080181BC: pop {r4} pop {r0} bx r0 @@ -30517,7 +30517,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 @@ -30526,12 +30526,12 @@ 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 ldr r4, [r0, 0xC] -_080181E4: +@080181E4: lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -30539,7 +30539,7 @@ _080181E4: ldrb r0, [r1, 0x18] lsls r0, 31 cmp r0, 0 - beq _0801820C + beq @0801820C ldrb r0, [r1, 0xB] lsls r0, 31 lsrs r0, 31 @@ -30551,14 +30551,14 @@ _080181E4: orrs r3, r0 lsls r0, r3, 24 lsrs r3, r0, 24 - b _08018216 -_0801820C: + b @08018216 +@0801820C: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls _080181E4 -_08018216: + bls @080181E4 +@08018216: adds r0, r3, 0 pop {r4} pop {r1} @@ -30566,7 +30566,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 @@ -30667,9 +30667,9 @@ sub_8018220: @ 8018220 ldrh r1, [r0, 0x14] ldr r4, =0x0000270f cmp r1, r4 - ble _0801830C + ble @0801830C adds r1, r4, 0 -_0801830C: +@0801830C: adds r0, r6, 0 movs r2, 0 movs r3, 0x4 @@ -30680,9 +30680,9 @@ _0801830C: mov r2, r8 ldrh r1, [r2, 0x16] cmp r1, r4 - ble _08018328 + ble @08018328 adds r1, r4, 0 -_08018328: +@08018328: mov r4, r9 adds r4, 0xCF adds r0, r4, 0 @@ -30707,7 +30707,7 @@ _08018328: mov r5, r8 adds r5, 0x28 mov r4, r10 -_08018360: +@08018360: ldrh r1, [r5] adds r0, r4, 0 bl sub_811EBBC @@ -30721,7 +30721,7 @@ _08018360: adds r4, 0xF adds r7, 0x1 cmp r7, 0x3 - ble _08018360 + ble @08018360 movs r4, 0xD2 lsls r4, 1 add r4, r9 @@ -30734,20 +30734,20 @@ _08018360: bl gf_strcat ldr r0, [sp] cmp r0, 0x1 - bne _080183D0 + bne @080183D0 ldr r1, =0x082f0020 adds r0, r4, 0 bl sub_81AFC28 adds r0, r5, 0 adds r1, r4, 0 bl gf_strcat - b _080183F0 + b @080183F0 .align 2, 0 .pool -_080183D0: +@080183D0: ldr r2, [sp] cmp r2, 0 - bne _080183F0 + bne @080183F0 ldr r0, =0x082f0018 mov r2, r8 ldrb r1, [r2] @@ -30759,7 +30759,7 @@ _080183D0: adds r0, r5, 0 adds r1, r4, 0 bl gf_strcat -_080183F0: +@080183F0: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -30773,7 +30773,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 @@ -30790,7 +30790,7 @@ sub_8018404: @ 8018404 thumb_func_end sub_8018404 thumb_func_start sub_8018424 -sub_8018424: @ 8018424 +sub_8018424: ; 8018424 push {lr} bl copy_queue_process bl copy_super_sprites_to_oam @@ -30800,7 +30800,7 @@ sub_8018424: @ 8018424 thumb_func_end sub_8018424 thumb_func_start sub_8018438 -sub_8018438: @ 8018438 +sub_8018438: ; 8018438 push {lr} bl run_active_tasks bl run_remoboxes @@ -30811,7 +30811,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 @@ -30821,27 +30821,27 @@ sub_8018450: @ 8018450 adds r6, r0, r1 ldrb r0, [r6] cmp r0, 0x1 - bne _08018466 - b _08018574 -_08018466: + bne @08018466 + b @08018574 +@08018466: cmp r0, 0x1 - bgt _08018474 + bgt @08018474 cmp r0, 0 - beq _08018482 - b _08018644 + beq @08018482 + b @08018644 .align 2, 0 .pool -_08018474: +@08018474: cmp r0, 0x2 - bne _0801847A - b _080185F8 -_0801847A: + bne @0801847A + b @080185F8 +@0801847A: cmp r0, 0x3 - bne _08018480 - b _08018618 -_08018480: - b _08018644 -_08018482: + bne @08018480 + b @08018618 +@08018480: + b @08018644 +@08018482: movs r0, 0 bl SetVBlankCallback bl sub_80A1A74 @@ -30927,10 +30927,10 @@ _08018482: movs r0, 0x54 movs r1, 0 bl lcd_io_set - b _08018610 + b @08018610 .align 2, 0 .pool -_08018574: +@08018574: ldr r0, =0x082f0548 movs r1, 0 movs r2, 0x20 @@ -30982,10 +30982,10 @@ _08018574: lsrs r0, 24 movs r1, 0 bl sub_80186EC - b _08018610 + b @08018610 .align 2, 0 .pool -_080185F8: +@080185F8: movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x2 @@ -30994,12 +30994,12 @@ _080185F8: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram -_08018610: +@08018610: ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] - b _08018644 -_08018618: + b @08018644 +@08018618: movs r0, 0 bl gpu_sync_bg_show movs r0, 0x3 @@ -31011,12 +31011,12 @@ _08018618: movs r0, 0xC5 bl enable_irqs movs r0, 0x1 - b _08018646 + b @08018646 .align 2, 0 .pool -_08018644: +@08018644: movs r0, 0 -_08018646: +@08018646: add sp, 0xC pop {r4-r7} pop {r1} @@ -31024,19 +31024,19 @@ _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 cmp r0, 0 - beq _0801866C + beq @0801866C ldr r0, =sub_8018438 + 1 bl set_callback2 ldr r1, =0x02022c60 movs r0, 0 strb r0, [r1] bl task_add_00_mystery_gift -_0801866C: +@0801866C: bl run_active_tasks pop {r0} bx r0 @@ -31045,19 +31045,19 @@ _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 cmp r0, 0 - beq _08018698 + beq @08018698 ldr r0, =sub_8018438 + 1 bl set_callback2 ldr r1, =0x02022c60 movs r0, 0x1 strb r0, [r1] bl sub_81D5014 -_08018698: +@08018698: pop {r0} bx r0 .align 2, 0 @@ -31065,7 +31065,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 @@ -31092,7 +31092,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 @@ -31103,19 +31103,19 @@ sub_80186EC: @ 80186EC movs r1, 0 bl Window_FastFillPixels cmp r4, 0 - bne _0801871C + bne @0801871C ldr r0, =0x085ef654 ldr r7, =0x085ef678 cmp r5, 0 - bne _08018720 + bne @08018720 ldr r7, =0x085ef664 - b _08018720 + b @08018720 .align 2, 0 .pool -_0801871C: +@0801871C: ldr r0, =0x085edfbf ldr r7, =0x085edfc9 -_08018720: +@08018720: movs r4, 0 str r4, [sp] str r4, [sp, 0x4] @@ -31160,7 +31160,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 @@ -31172,7 +31172,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 @@ -31196,7 +31196,7 @@ sub_8018798: @ 8018798 bl Bg_FillWramTileMapRectWithTileAndPalette mov r8, r4 movs r4, 0x1 -_080187C8: +@080187C8: movs r7, 0 mov r0, r9 adds r0, 0x2 @@ -31205,13 +31205,13 @@ _080187C8: mov r10, r1 lsls r5, r0, 24 movs r6, 0 -_080187D8: +@080187D8: mov r1, r9 ands r1, r4 adds r0, r7, 0 ands r0, r4 cmp r1, r0 - beq _080187FC + beq @080187FC lsrs r2, r6, 24 str r4, [sp] str r4, [sp, 0x4] @@ -31222,8 +31222,8 @@ _080187D8: movs r1, 0x1 lsrs r3, r5, 24 bl Bg_FillWramTileMapRectWithTileAndPalette - b _08018812 -_080187FC: + b @08018812 +@080187FC: lsrs r2, r6, 24 str r4, [sp] str r4, [sp, 0x4] @@ -31234,17 +31234,17 @@ _080187FC: movs r1, 0x2 lsrs r3, r5, 24 bl Bg_FillWramTileMapRectWithTileAndPalette -_08018812: +@08018812: movs r0, 0x80 lsls r0, 17 adds r6, r0 adds r7, 0x1 cmp r7, 0x1F - ble _080187D8 + ble @080187D8 mov r9, r10 mov r1, r9 cmp r1, 0x11 - ble _080187C8 + ble @080187C8 add sp, 0xC pop {r3-r5} mov r8, r3 @@ -31256,15 +31256,15 @@ _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 - beq _08018846 + beq @08018846 cmp r0, 0x1 - beq _0801885E - b _08018876 -_08018846: + beq @0801885E + b @08018876 +@08018846: movs r0, 0x20 str r0, [sp] str r0, [sp, 0x4] @@ -31275,8 +31275,8 @@ _08018846: movs r2, 0 movs r3, 0 bl Bg_FillWramTileMapRectWithTileAndPalette - b _08018876 -_0801885E: + b @08018876 +@0801885E: movs r0, 0x20 str r0, [sp] movs r0, 0x1E @@ -31288,7 +31288,7 @@ _0801885E: movs r2, 0 movs r3, 0x2 bl Bg_FillWramTileMapRectWithTileAndPalette -_08018876: +@08018876: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram add sp, 0xC @@ -31297,7 +31297,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 @@ -31337,7 +31337,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 @@ -31351,29 +31351,29 @@ 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 adds r0, r1, 0 ldrb r2, [r4] cmp r2, 0x1 - beq _08018920 + beq @08018920 cmp r2, 0x1 - bgt _08018910 + bgt @08018910 cmp r2, 0 - beq _0801891A - b _08018980 -_08018910: + beq @0801891A + b @08018980 +@08018910: cmp r2, 0x2 - beq _08018954 + beq @08018954 cmp r2, 0xFF - beq _0801897C - b _08018980 -_0801891A: + beq @0801897C + b @08018980 +@0801891A: bl sub_8018884 - b _08018944 -_08018920: + b @08018944 +@08018920: movs r0, 0 str r0, [sp] ldr r0, =0x02022c58 @@ -31390,14 +31390,14 @@ _08018920: movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _08018980 -_08018944: + beq @08018980 +@08018944: ldrb r0, [r4] adds r0, 0x1 - b _0801897E + b @0801897E .align 2, 0 .pool -_08018954: +@08018954: movs r0, 0x1 str r0, [sp] ldr r0, =0x02022c58 @@ -31413,16 +31413,16 @@ _08018954: strb r0, [r4] bl sub_80188DC movs r0, 0x1 - b _08018982 + b @08018982 .align 2, 0 .pool -_0801897C: +@0801897C: movs r0, 0x2 -_0801897E: +@0801897E: strb r0, [r4] -_08018980: +@08018980: movs r0, 0 -_08018982: +@08018982: add sp, 0xC pop {r4} pop {r1} @@ -31430,7 +31430,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 @@ -31452,7 +31452,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 @@ -31474,75 +31474,75 @@ 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] cmp r0, 0 - beq _080189EC + beq @080189EC cmp r0, 0x1 - beq _08018A08 - b _08018A14 -_080189EC: + beq @08018A08 + b @08018A14 +@080189EC: bl sub_801898C ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _08018A14 + beq @08018A14 ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _08018A14 + b @08018A14 .align 2, 0 .pool -_08018A08: +@08018A08: bl sub_80189B4 movs r0, 0 strb r0, [r4] movs r0, 0x1 - b _08018A16 -_08018A14: + b @08018A16 +@08018A14: movs r0, 0 -_08018A16: +@08018A16: pop {r4} pop {r1} bx r1 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] cmp r0, 0 - bne _08018A2C + bne @08018A2C adds r0, r1, 0 bl sub_8018884 -_08018A2C: +@08018A2C: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] lsls r0, 24 lsrs r0, 24 cmp r0, 0x78 - bhi _08018A3E + bhi @08018A3E movs r0, 0 - b _08018A48 -_08018A3E: + b @08018A48 +@08018A3E: movs r0, 0 strb r0, [r4] bl sub_80188DC movs r0, 0x1 -_08018A48: +@08018A48: pop {r4} pop {r1} bx r1 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 @@ -31558,14 +31558,14 @@ sub_8018A50: @ 8018A50 str r0, [sp, 0x1C] str r1, [sp, 0x20] cmp r2, 0 - bne _08018A80 + bne @08018A80 ldr r0, =0x082f0608 - b _08018A82 + b @08018A82 .align 2, 0 .pool -_08018A80: +@08018A80: ldr r0, =0x082f0620 -_08018A82: +@08018A82: str r0, [sp, 0x4] add r0, sp, 0x4 bl sub_81DB41C @@ -31573,9 +31573,9 @@ _08018A82: movs r0, 0x1 ands r0, r3 cmp r0, 0 - beq _08018A96 + beq @08018A96 adds r3, 0x1 -_08018A96: +@08018A96: lsls r1, r3, 24 ldr r0, =0x00ffffff ldr r2, [sp, 0x1C] @@ -31583,7 +31583,7 @@ _08018A96: orrs r2, r1 str r2, [sp, 0x1C] cmp r3, 0x1D - bgt _08018ACC + bgt @08018ACC movs r0, 0x1E subs r0, r3 lsrs r1, r0, 31 @@ -31595,14 +31595,14 @@ _08018A96: ands r1, r2 orrs r1, r0 str r1, [sp, 0x1C] - b _08018AD2 + b @08018AD2 .align 2, 0 .pool -_08018ACC: +@08018ACC: ldr r0, =0xffff00ff ands r2, r0 str r2, [sp, 0x1C] -_08018AD2: +@08018AD2: add r0, sp, 0x1C movs r1, 0xE0 str r1, [sp] @@ -31614,13 +31614,13 @@ _08018AD2: movs r0, 0x1 negs r0, r0 cmp r4, r0 - beq _08018AFA + beq @08018AFA movs r0, 0x2 bl Window_FillTileMap movs r0, 0x2 movs r1, 0x1 bl Window_CopyToVram -_08018AFA: +@08018AFA: adds r0, r4, 0 add sp, 0x24 pop {r4,r5} @@ -31631,7 +31631,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 @@ -31641,30 +31641,30 @@ sub_8018B08: @ 8018B08 lsrs r6, r2, 24 ldrb r0, [r5] cmp r0, 0x1 - beq _08018B98 + beq @08018B98 cmp r0, 0x1 - bgt _08018B26 + bgt @08018B26 cmp r0, 0 - beq _08018B30 - b _08018C3E -_08018B26: + beq @08018B30 + b @08018C3E +@08018B26: cmp r0, 0x2 - beq _08018BE4 + beq @08018BE4 cmp r0, 0xFF - beq _08018C1A - b _08018C3E -_08018B30: + beq @08018C1A + b @08018C3E +@08018B30: ldr r0, =0x02021fc4 bl ExpandTextCodes cmp r6, 0 - bne _08018B48 + bne @08018B48 ldr r0, =0x082f05c8 - b _08018B4A + b @08018B4A .align 2, 0 .pool -_08018B48: +@08018B48: ldr r0, =0x082f05d0 -_08018B4A: +@08018B4A: bl Window_AddFromTemplate strh r0, [r4] ldrb r0, [r4] @@ -31691,32 +31691,32 @@ _08018B4A: bl Window_CopyToVram ldrb r0, [r4] bl Window_WriteStandardTileMap - b _08018BD6 + b @08018BD6 .align 2, 0 .pool -_08018B98: +@08018B98: ldr r0, =0x082f05e8 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp, 0x14] str r1, [sp, 0x18] cmp r6, 0 - bne _08018BBC + bne @08018BBC ldr r0, =0xff00ffff ldr r1, [sp, 0x14] ands r1, r0 movs r0, 0x90 lsls r0, 12 - b _08018BC6 + b @08018BC6 .align 2, 0 .pool -_08018BBC: +@08018BBC: ldr r0, =0xff00ffff ldr r1, [sp, 0x14] ands r1, r0 movs r0, 0xF0 lsls r0, 12 -_08018BC6: +@08018BC6: orrs r1, r0 str r1, [sp, 0x14] add r0, sp, 0x14 @@ -31724,14 +31724,14 @@ _08018BC6: movs r2, 0xE movs r3, 0 bl sub_81996C0 -_08018BD6: +@08018BD6: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] - b _08018C3E + b @08018C3E .align 2, 0 .pool -_08018BE4: +@08018BE4: bl sub_8198C58 lsls r0, 24 asrs r6, r0, 24 @@ -31740,7 +31740,7 @@ _08018BE4: adds r0, r1 lsrs r0, 24 cmp r0, 0x2 - bhi _08018C3E + bhi @08018C3E movs r0, 0 strb r0, [r5] ldrb r0, [r4] @@ -31753,8 +31753,8 @@ _08018BE4: ldrb r0, [r4] bl Window_Remove adds r0, r6, 0 - b _08018C42 -_08018C1A: + b @08018C42 +@08018C1A: movs r0, 0 strb r0, [r5] ldrb r0, [r4] @@ -31768,11 +31768,11 @@ _08018C1A: bl Window_Remove movs r0, 0x1 negs r0, r0 - b _08018C42 -_08018C3E: + b @08018C42 +@08018C3E: movs r0, 0x2 negs r0, r0 -_08018C42: +@08018C42: add sp, 0x1C pop {r4-r6} pop {r1} @@ -31780,39 +31780,39 @@ _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 adds r5, r1, 0 ldrb r0, [r6] cmp r0, 0x1 - beq _08018CE8 + beq @08018CE8 cmp r0, 0x1 - bgt _08018C64 + bgt @08018C64 cmp r0, 0 - beq _08018C6C - b _08018D8C -_08018C64: + beq @08018C6C + b @08018D8C +@08018C64: cmp r0, 0xFF - bne _08018C6A - b _08018D68 -_08018C6A: - b _08018D8C -_08018C6C: + bne @08018C6A + b @08018D68 +@08018C6A: + b @08018D8C +@08018C6C: cmp r2, 0 - bne _08018C84 + bne @08018C84 ldr r0, =0x02021fc4 ldr r1, =0x085ef2fc bl ExpandTextCodes - b _08018C8C + b @08018C8C .align 2, 0 .pool -_08018C84: +@08018C84: ldr r0, =0x02021fc4 ldr r1, =0x085ef330 bl ExpandTextCodes -_08018C8C: +@08018C8C: ldr r0, =0x082f05d8 bl Window_AddFromTemplate strh r0, [r5] @@ -31844,37 +31844,37 @@ _08018C8C: ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] - b _08018D8C + b @08018D8C .align 2, 0 .pool -_08018CE8: +@08018CE8: cmp r3, 0 - beq _08018D10 + beq @08018D10 cmp r2, 0 - bne _08018D00 + bne @08018D00 ldr r0, =0x082f05f8 ldr r1, =0x082f06c8 - b _08018D28 + b @08018D28 .align 2, 0 .pool -_08018D00: +@08018D00: ldr r0, =0x082f0600 ldr r1, =0x082f06f8 - b _08018D28 + b @08018D28 .align 2, 0 .pool -_08018D10: +@08018D10: cmp r2, 0 - bne _08018D24 + bne @08018D24 ldr r0, =0x082f05f0 ldr r1, =0x082f06b0 - b _08018D28 + b @08018D28 .align 2, 0 .pool -_08018D24: +@08018D24: ldr r0, =0x082f05f8 ldr r1, =0x082f06e0 -_08018D28: +@08018D28: movs r2, 0xE0 str r2, [sp] movs r2, 0x1 @@ -31884,7 +31884,7 @@ _08018D28: movs r0, 0x1 negs r0, r0 cmp r4, r0 - beq _08018D8C + beq @08018D8C movs r0, 0 strb r0, [r6] ldrb r0, [r5] @@ -31897,10 +31897,10 @@ _08018D28: ldrb r0, [r5] bl Window_Remove adds r0, r4, 0 - b _08018D90 + b @08018D90 .align 2, 0 .pool -_08018D68: +@08018D68: movs r0, 0 strb r0, [r6] ldrb r0, [r5] @@ -31914,11 +31914,11 @@ _08018D68: bl Window_Remove movs r0, 0x2 negs r0, r0 - b _08018D90 -_08018D8C: + b @08018D90 +@08018D8C: movs r0, 0x1 negs r0, r0 -_08018D90: +@08018D90: add sp, 0x14 pop {r4-r6} pop {r1} @@ -31926,126 +31926,126 @@ _08018D90: thumb_func_end sub_8018C4C thumb_func_start sub_8018D98 -sub_8018D98: @ 8018D98 +sub_8018D98: ; 8018D98 push {lr} cmp r0, 0 - beq _08018DA4 + beq @08018DA4 bl sub_801B0CC - b _08018DA8 -_08018DA4: + b @08018DA8 +@08018DA4: bl sub_801B27C -_08018DA8: +@08018DA8: pop {r1} bx r1 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] cmp r0, 0 - beq _08018DBC + beq @08018DBC cmp r0, 0x1 - beq _08018DE4 - b _08018E00 -_08018DBC: + beq @08018DE4 + b @08018E00 +@08018DBC: cmp r1, 0 - bne _08018DD4 + bne @08018DD4 bl sav1_get_mevent_buffer_1 adds r4, r0, 0 bl sav1_get_mevent_buffer_2 adds r1, r0, 0 adds r0, r4, 0 bl sub_801BAAC - b _08018DDC -_08018DD4: + b @08018DDC +@08018DD4: bl sub_801B00C bl sub_801C6C8 -_08018DDC: +@08018DDC: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] - b _08018E00 -_08018DE4: + b @08018E00 +@08018DE4: cmp r1, 0 - bne _08018DF2 + bne @08018DF2 bl sub_801BB74 -_08018DEC: +@08018DEC: cmp r0, 0 - bne _08018DF8 - b _08018E00 -_08018DF2: + bne @08018DF8 + b @08018E00 +@08018DF2: bl sub_801C758 - b _08018DEC -_08018DF8: + b @08018DEC +@08018DF8: movs r0, 0 strb r0, [r5] movs r0, 0x1 - b _08018E02 -_08018E00: + b @08018E02 +@08018E00: movs r0, 0 -_08018E02: +@08018E02: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_8018DAC thumb_func_start sub_8018E08 -sub_8018E08: @ 8018E08 +sub_8018E08: ; 8018E08 push {lr} cmp r0, 0 - bne _08018E14 + bne @08018E14 bl sub_801B1E8 - b _08018E18 -_08018E14: + b @08018E18 +@08018E14: bl sub_801B06C -_08018E18: +@08018E18: movs r0, 0x1 pop {r1} bx r1 thumb_func_end sub_8018E08 thumb_func_start sub_8018E20 -sub_8018E20: @ 8018E20 +sub_8018E20: ; 8018E20 push {lr} cmp r0, 0 - bne _08018E36 + bne @08018E36 adds r0, r1, 0 bl sub_801BDA4 cmp r0, 0 - beq _08018E40 + beq @08018E40 bl sub_801BB48 - b _08018E48 -_08018E36: + b @08018E48 +@08018E36: adds r0, r1, 0 bl sub_801CA50 cmp r0, 0 - bne _08018E44 -_08018E40: + bne @08018E44 +@08018E40: movs r0, 0 - b _08018E4A -_08018E44: + b @08018E4A +@08018E44: bl sub_801C72C -_08018E48: +@08018E48: movs r0, 0x1 -_08018E4A: +@08018E4A: pop {r1} bx r1 thumb_func_end sub_8018E20 thumb_func_start sub_8018E50 -sub_8018E50: @ 8018E50 +sub_8018E50: ; 8018E50 push {lr} cmp r2, 0 - beq _08018E60 + beq @08018E60 ldr r3, =0x085ef55c - b _08018E62 + b @08018E62 .align 2, 0 .pool -_08018E60: +@08018E60: ldr r3, =0x085ef520 -_08018E62: +@08018E62: movs r2, 0x1 bl sub_8018B08 lsls r0, 24 @@ -32057,17 +32057,17 @@ _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 + beq @08018E84 ldr r1, =0x085ef630 - b _08018E86 + b @08018E86 .align 2, 0 .pool -_08018E84: +@08018E84: ldr r1, =0x085ef60c -_08018E86: +@08018E86: bl mevent_0814257C pop {r1} bx r1 @@ -32076,72 +32076,72 @@ _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] cmp r0, 0x4 - bhi _08018F04 + bhi @08018F04 lsls r0, 2 - ldr r1, =_08018EAC + ldr r1, =@08018EAC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08018EAC: - .4byte _08018EC0 - .4byte _08018ECC - .4byte _08018ED4 - .4byte _08018EE0 - .4byte _08018EF8 -_08018EC0: +@08018EAC: + .4byte @08018EC0 + .4byte @08018ECC + .4byte @08018ED4 + .4byte @08018EE0 + .4byte @08018EF8 +@08018EC0: ldr r0, =0x085ef5bc bl sub_8018884 - b _08018EEC + b @08018EEC .align 2, 0 .pool -_08018ECC: +@08018ECC: movs r0, 0 bl save_game_when_memory_present - b _08018EEC -_08018ED4: + b @08018EEC +@08018ED4: ldr r0, =0x085ef5e0 bl sub_8018884 - b _08018EEC + b @08018EEC .align 2, 0 .pool -_08018EE0: +@08018EE0: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _08018F04 -_08018EEC: + beq @08018F04 +@08018EEC: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _08018F04 + b @08018F04 .align 2, 0 .pool -_08018EF8: +@08018EF8: movs r0, 0 strb r0, [r4] bl sub_80188DC movs r0, 0x1 - b _08018F06 -_08018F04: + b @08018F06 +@08018F04: movs r0, 0 -_08018F06: +@08018F06: pop {r4} pop {r1} bx r1 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 @@ -32151,141 +32151,141 @@ mevent_message: @ 8018F0C movs r2, 0 str r2, [r4] cmp r3, 0xE - bls _08018F22 - b _08019034 -_08018F22: + bls @08018F22 + b @08019034 +@08018F22: lsls r0, r3, 2 - ldr r1, =_08018F30 + ldr r1, =@08018F30 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08018F30: - .4byte _08018F6C - .4byte _08018F78 - .4byte _08018F84 - .4byte _08018F9C - .4byte _08018FB4 - .4byte _08018FC0 - .4byte _08018FCC - .4byte _08018FD8 - .4byte _08018FE4 - .4byte _08018FF0 - .4byte _08018FFC - .4byte _08019014 - .4byte _08019020 - .4byte _0801902C - .4byte _08019030 -_08018F6C: +@08018F30: + .4byte @08018F6C + .4byte @08018F78 + .4byte @08018F84 + .4byte @08018F9C + .4byte @08018FB4 + .4byte @08018FC0 + .4byte @08018FCC + .4byte @08018FD8 + .4byte @08018FE4 + .4byte @08018FF0 + .4byte @08018FFC + .4byte @08019014 + .4byte @08019020 + .4byte @0801902C + .4byte @08019030 +@08018F6C: movs r0, 0 str r0, [r4] ldr r2, =0x085ef2e4 - b _08019034 + b @08019034 .align 2, 0 .pool -_08018F78: +@08018F78: movs r0, 0 str r0, [r4] ldr r2, =0x085ef244 - b _08019034 + b @08019034 .align 2, 0 .pool -_08018F84: +@08018F84: movs r0, 0x1 str r0, [r4] ldr r2, =0x085ef0c8 cmp r5, 0 - bne _08019034 + bne @08019034 ldr r2, =0x085ef124 - b _08019034 + b @08019034 .align 2, 0 .pool -_08018F9C: +@08018F9C: movs r0, 0x1 str r0, [r4] ldr r2, =0x085ef0f4 cmp r5, 0 - bne _08019034 + bne @08019034 ldr r2, =0x085ef14c - b _08019034 + b @08019034 .align 2, 0 .pool -_08018FB4: +@08018FB4: movs r0, 0x1 str r0, [r4] ldr r2, =0x085ef178 - b _08019034 + b @08019034 .align 2, 0 .pool -_08018FC0: +@08018FC0: movs r0, 0 str r0, [r4] ldr r2, =0x085ef1b4 - b _08019034 + b @08019034 .align 2, 0 .pool -_08018FCC: +@08018FCC: movs r0, 0 str r0, [r4] ldr r2, =0x085ef200 - b _08019034 + b @08019034 .align 2, 0 .pool -_08018FD8: +@08018FD8: movs r0, 0 str r0, [r4] ldr r2, =0x085ef1d8 - b _08019034 + b @08019034 .align 2, 0 .pool -_08018FE4: +@08018FE4: movs r0, 0 str r0, [r4] ldr r2, =0x085ef21c - b _08019034 + b @08019034 .align 2, 0 .pool -_08018FF0: +@08018FF0: movs r0, 0 str r0, [r4] ldr r2, =0x085ef02c - b _08019034 + b @08019034 .align 2, 0 .pool -_08018FFC: +@08018FFC: movs r0, 0 str r0, [r4] ldr r2, =0x085ef2b4 cmp r6, 0 - bne _08019034 + bne @08019034 ldr r2, =0x085ef280 - b _08019034 + b @08019034 .align 2, 0 .pool -_08019014: +@08019014: movs r0, 0 str r0, [r4] ldr r2, =0x085ef014 - b _08019034 + b @08019034 .align 2, 0 .pool -_08019020: +@08019020: movs r0, 0x1 str r0, [r4] ldr r2, =0x085ef198 - b _08019034 + b @08019034 .align 2, 0 .pool -_0801902C: +@0801902C: movs r0, 0x1 - b _08019032 -_08019030: + b @08019032 +@08019030: movs r0, 0 -_08019032: +@08019032: str r0, [r4] -_08019034: +@08019034: adds r0, r2, 0 pop {r4-r6} pop {r1} @@ -32293,66 +32293,66 @@ _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 adds r5, r2, 0 ldrb r4, [r6] cmp r4, 0x1 - beq _0801906E + beq @0801906E cmp r4, 0x1 - bgt _08019054 + bgt @08019054 cmp r4, 0 - beq _0801905A - b _0801909A -_08019054: + beq @0801905A + b @0801909A +@08019054: cmp r4, 0x2 - beq _08019084 - b _0801909A -_0801905A: + beq @08019084 + b @0801909A +@0801905A: cmp r0, 0 - beq _08019062 + beq @08019062 bl sub_8018884 -_08019062: +@08019062: movs r0, 0xB9 lsls r0, 1 bl fanfare_play strh r4, [r5] - b _0801907C -_0801906E: + b @0801907C +@0801906E: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] lsls r0, 16 lsrs r0, 16 cmp r0, 0xF0 - bls _0801909A -_0801907C: + bls @0801909A +@0801907C: ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] - b _0801909A -_08019084: + b @0801909A +@08019084: bl task_is_not_running_overworld_fanfare lsls r0, 24 cmp r0, 0 - beq _0801909A + beq @0801909A movs r0, 0 strb r0, [r6] bl sub_80188DC movs r0, 0x1 - b _0801909C -_0801909A: + b @0801909C +@0801909A: movs r0, 0 -_0801909C: +@0801909C: pop {r4-r6} pop {r1} bx r1 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, =0x085ef014 @@ -32360,95 +32360,95 @@ mevent_message_stamp_card_etc_send_status: @ 80190A4 str r0, [r3] adds r4, r1, 0 cmp r2, 0xE - bhi _08019166 + bhi @08019166 lsls r0, r2, 2 - ldr r1, =_080190C8 + ldr r1, =@080190C8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080190C8: - .4byte _08019104 - .4byte _0801910C - .4byte _08019114 - .4byte _0801911C - .4byte _08019128 - .4byte _08019130 - .4byte _08019138 - .4byte _08019140 - .4byte _08019148 - .4byte _08019150 - .4byte _08019164 - .4byte _08019158 - .4byte _0801915C - .4byte _0801915C - .4byte _08019164 -_08019104: +@080190C8: + .4byte @08019104 + .4byte @0801910C + .4byte @08019114 + .4byte @0801911C + .4byte @08019128 + .4byte @08019130 + .4byte @08019138 + .4byte @08019140 + .4byte @08019148 + .4byte @08019150 + .4byte @08019164 + .4byte @08019158 + .4byte @0801915C + .4byte @0801915C + .4byte @08019164 +@08019104: ldr r1, =0x085ef2e4 - b _08019166 + b @08019166 .align 2, 0 .pool -_0801910C: +@0801910C: ldr r1, =0x085ef244 - b _08019166 + b @08019166 .align 2, 0 .pool -_08019114: +@08019114: ldr r1, =0x085ef39c - b _0801911E + b @0801911E .align 2, 0 .pool -_0801911C: +@0801911C: ldr r1, =0x085ef3c4 -_0801911E: +@0801911E: movs r0, 0x1 str r0, [r3] - b _08019166 + b @08019166 .align 2, 0 .pool -_08019128: +@08019128: ldr r1, =0x085ef3f0 - b _08019166 + b @08019166 .align 2, 0 .pool -_08019130: +@08019130: ldr r1, =0x085ef42c - b _08019166 + b @08019166 .align 2, 0 .pool -_08019138: +@08019138: ldr r1, =0x085ef494 - b _08019166 + b @08019166 .align 2, 0 .pool -_08019140: +@08019140: ldr r1, =0x085ef460 - b _08019166 + b @08019166 .align 2, 0 .pool -_08019148: +@08019148: ldr r1, =0x085ef21c - b _08019166 + b @08019166 .align 2, 0 .pool -_08019150: +@08019150: ldr r1, =0x085ef4c4 - b _08019166 + b @08019166 .align 2, 0 .pool -_08019158: +@08019158: adds r1, r4, 0 - b _08019166 -_0801915C: + b @08019166 +@0801915C: ldr r1, =0x085ef410 - b _08019166 + b @08019166 .align 2, 0 .pool -_08019164: +@08019164: ldr r1, =0x085ef4f0 -_08019166: +@08019166: adds r0, r1, 0 pop {r4} pop {r1} @@ -32458,7 +32458,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 @@ -32472,15 +32472,15 @@ sub_8019174: @ 8019174 adds r1, r0, 0 ldr r0, [sp] cmp r0, 0 - bne _0801919A + bne @0801919A adds r0, r4, 0 bl mevent_0814257C - b _080191A2 -_0801919A: + b @080191A2 +@0801919A: adds r0, r4, 0 adds r2, r5, 0 bl mevent_08142CE8 -_080191A2: +@080191A2: add sp, 0x4 pop {r4,r5} pop {r1} @@ -32488,7 +32488,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 + 1 movs r1, 0 @@ -32524,7 +32524,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 @@ -32536,61 +32536,61 @@ task00_mystery_gift: @ 80191F4 adds r5, r0, r1 ldrb r0, [r5, 0x8] cmp r0, 0x25 - bls _0801920E - b _08019922 -_0801920E: + bls @0801920E + b @08019922 +@0801920E: lsls r0, 2 - ldr r1, =_08019220 + ldr r1, =@08019220 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08019220: - .4byte _080192B8 - .4byte _080192BE - .4byte _08019300 - .4byte _08019338 - .4byte _0801935C - .4byte _080193AC - .4byte _0801940C - .4byte _08019444 - .4byte _08019454 - .4byte _080194CC - .4byte _080194F0 - .4byte _08019508 - .4byte _08019538 - .4byte _08019574 - .4byte _0801958C - .4byte _080195BC - .4byte _080198EC - .4byte _0801961A - .4byte _0801962A - .4byte _08019922 - .4byte _0801963C - .4byte _08019688 - .4byte _080196FE - .4byte _0801972E - .4byte _08019764 - .4byte _0801977E - .4byte _08019792 - .4byte _0801979E - .4byte _080197B2 - .4byte _080197C6 - .4byte _080197F8 - .4byte _0801982C - .4byte _08019870 - .4byte _08019884 - .4byte _080198A0 - .4byte _080198B8 - .4byte _080198EC - .4byte _0801990C -_080192B8: +@08019220: + .4byte @080192B8 + .4byte @080192BE + .4byte @08019300 + .4byte @08019338 + .4byte @0801935C + .4byte @080193AC + .4byte @0801940C + .4byte @08019444 + .4byte @08019454 + .4byte @080194CC + .4byte @080194F0 + .4byte @08019508 + .4byte @08019538 + .4byte @08019574 + .4byte @0801958C + .4byte @080195BC + .4byte @080198EC + .4byte @0801961A + .4byte @0801962A + .4byte @08019922 + .4byte @0801963C + .4byte @08019688 + .4byte @080196FE + .4byte @0801972E + .4byte @08019764 + .4byte @0801977E + .4byte @08019792 + .4byte @0801979E + .4byte @080197B2 + .4byte @080197C6 + .4byte @080197F8 + .4byte @0801982C + .4byte @08019870 + .4byte @08019884 + .4byte @080198A0 + .4byte @080198B8 + .4byte @080198EC + .4byte @0801990C +@080192B8: movs r0, 0x1 strb r0, [r5, 0x8] - b _08019922 -_080192BE: + b @08019922 +@080192BE: adds r0, r5, 0 adds r0, 0x9 adds r1, r5, 0 @@ -32598,81 +32598,81 @@ _080192BE: bl sub_8018A50 adds r1, r0, 0 cmp r1, 0x1 - beq _080192E8 + beq @080192E8 cmp r1, 0x1 - bcc _080192DE + bcc @080192DE movs r0, 0x2 negs r0, r0 cmp r1, r0 - beq _080192FA - b _08019922 -_080192DE: + beq @080192FA + b @08019922 +@080192DE: movs r0, 0 strb r0, [r5, 0xC] bl sub_801B27C - b _080192EE -_080192E8: + b @080192EE +@080192E8: strb r1, [r5, 0xC] bl sub_801B0CC -_080192EE: +@080192EE: cmp r0, 0x1 - bne _080192F4 - b _08019820 -_080192F4: + bne @080192F4 + b @08019820 +@080192F4: movs r0, 0x2 strb r0, [r5, 0x8] - b _08019922 -_080192FA: + b @08019922 +@080192FA: movs r0, 0x25 strb r0, [r5, 0x8] - b _08019922 -_08019300: + b @08019922 +@08019300: ldrb r0, [r5, 0xC] cmp r0, 0 - bne _08019314 + bne @08019314 adds r0, r5, 0 adds r0, 0x9 ldr r1, =0x085eeef0 - b _0801931A + b @0801931A .align 2, 0 .pool -_08019314: +@08019314: adds r0, r5, 0 adds r0, 0x9 ldr r1, =0x085eef2c -_0801931A: +@0801931A: bl mevent_0814257C cmp r0, 0 - bne _08019324 - b _08019922 -_08019324: + bne @08019324 + b @08019922 +@08019324: movs r0, 0x3 strb r0, [r5, 0x8] movs r0, 0 movs r1, 0x1 bl sub_80186EC - b _08019922 + b @08019922 .align 2, 0 .pool -_08019338: +@08019338: ldrb r0, [r5, 0xC] cmp r0, 0 - bne _0801934C + bne @0801934C ldr r0, =0x085eef68 bl sub_8018884 - b _08019352 + b @08019352 .align 2, 0 .pool -_0801934C: +@0801934C: ldr r0, =0x085eef94 bl sub_8018884 -_08019352: +@08019352: movs r0, 0x4 strb r0, [r5, 0x8] - b _08019922 + b @08019922 .align 2, 0 .pool -_0801935C: +@0801935C: adds r0, r5, 0 adds r0, 0x9 adds r1, r5, 0 @@ -32680,39 +32680,39 @@ _0801935C: bl sub_8018A50 adds r4, r0, 0 cmp r4, 0x1 - beq _0801938A + beq @0801938A cmp r4, 0x1 - bcc _0801937C + bcc @0801937C movs r0, 0x2 negs r0, r0 cmp r4, r0 - beq _08019396 - b _08019922 -_0801937C: + beq @08019396 + b @08019922 +@0801937C: bl sub_80188DC movs r1, 0 movs r0, 0x5 strb r0, [r5, 0x8] strb r1, [r5, 0xD] - b _08019922 -_0801938A: + b @08019922 +@0801938A: bl sub_80188DC movs r0, 0x5 strb r0, [r5, 0x8] strb r4, [r5, 0xD] - b _08019922 -_08019396: + b @08019922 +@08019396: bl sub_80188DC ldrb r0, [r5, 0xC] bl sub_8018D98 cmp r0, 0 - beq _080193A6 - b _08019820 -_080193A6: + beq @080193A6 + b @08019820 +@080193A6: strb r0, [r5, 0x8] movs r0, 0 - b _080198FE -_080193AC: + b @080198FE +@080193AC: ldr r0, =0x02021cc4 movs r1, 0xFF strb r1, [r0] @@ -32722,105 +32722,105 @@ _080193AC: strb r1, [r0] ldrb r0, [r5, 0xC] cmp r0, 0 - beq _080193D4 + beq @080193D4 cmp r0, 0x1 - beq _080193EE - b _08019406 + beq @080193EE + b @08019406 .align 2, 0 .pool -_080193D4: +@080193D4: ldrb r0, [r5, 0xD] cmp r0, 0x1 - bne _080193E2 + bne @080193E2 movs r0, 0x15 bl sub_8014EFC - b _08019406 -_080193E2: + b @08019406 +@080193E2: cmp r0, 0 - bne _08019406 + bne @08019406 movs r0, 0x15 bl sub_80152A8 - b _08019406 -_080193EE: + b @08019406 +@080193EE: ldrb r0, [r5, 0xD] cmp r0, 0x1 - bne _080193FC + bne @080193FC movs r0, 0x16 bl sub_8014EFC - b _08019406 -_080193FC: + b @08019406 +@080193FC: cmp r0, 0 - bne _08019406 + bne @08019406 movs r0, 0x16 bl sub_80152A8 -_08019406: +@08019406: movs r0, 0x6 strb r0, [r5, 0x8] - b _08019922 -_0801940C: + b @08019922 +@0801940C: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _0801942C + beq @0801942C movs r0, 0x1 bl sub_8018838 movs r0, 0x7 strb r0, [r5, 0x8] ldrb r0, [r5, 0xC] bl sub_801D484 - b _08019922 + b @08019922 .align 2, 0 .pool -_0801942C: +@0801942C: ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x5 - beq _08019436 - b _08019922 -_08019436: + beq @08019436 + b @08019922 +@08019436: movs r0, 0x1 bl sub_8018838 - b _080197C0 + b @080197C0 .align 2, 0 .pool -_08019444: +@08019444: ldr r0, =0x085eefe8 bl sub_8018884 movs r0, 0x8 strb r0, [r5, 0x8] - b _08019922 + b @08019922 .align 2, 0 .pool -_08019454: +@08019454: adds r0, r5, 0 bl sub_801D4A8 subs r0, 0x2 cmp r0, 0x4 - bls _08019462 - b _08019922 -_08019462: + bls @08019462 + b @08019922 +@08019462: lsls r0, 2 - ldr r1, =_08019470 + ldr r1, =@08019470 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08019470: - .4byte _080194AE - .4byte _080194A8 - .4byte _080194B4 - .4byte _08019492 - .4byte _08019484 -_08019484: +@08019470: + .4byte @080194AE + .4byte @080194A8 + .4byte @080194B4 + .4byte @08019492 + .4byte @08019484 +@08019484: bl task_add_05_task_del_08FA224_when_no_RfuFunc ldrh r0, [r5] strb r0, [r5, 0xE] movs r0, 0xD strb r0, [r5, 0x8] - b _08019922 -_08019492: + b @08019922 +@08019492: ldr r4, [r5, 0x10] bl sub_801D4F4 adds r1, r0, 0 @@ -32828,25 +32828,25 @@ _08019492: movs r2, 0x40 bl memcpy bl sub_801D4E4 - b _08019922 -_080194A8: + b @08019922 +@080194A8: movs r0, 0xA strb r0, [r5, 0x8] - b _08019922 -_080194AE: + b @08019922 +@080194AE: movs r0, 0x9 strb r0, [r5, 0x8] - b _08019922 -_080194B4: + b @08019922 +@080194B4: movs r0, 0xB strb r0, [r5, 0x8] ldr r0, =0x02021cc4 ldr r1, =0x020229f0 bl gf_strcpy - b _08019922 + b @08019922 .align 2, 0 .pool -_080194CC: +@080194CC: adds r4, r5, 0 adds r4, 0x9 bl sub_801D4F4 @@ -32858,12 +32858,12 @@ _080194CC: lsls r0, 24 asrs r1, r0, 24 cmp r1, 0x1 - beq _08019564 + beq @08019564 cmp r1, 0x1 - bcs _08019552 + bcs @08019552 movs r0, 0 - b _08019566 -_080194F0: + b @08019566 +@080194F0: adds r4, r5, 0 adds r4, 0x9 bl sub_801D4F4 @@ -32871,11 +32871,11 @@ _080194F0: adds r0, r4, 0 bl mevent_0814257C cmp r0, 0 - bne _08019506 - b _08019922 -_08019506: - b _0801956A -_08019508: + bne @08019506 + b @08019922 +@08019506: + b @0801956A +@08019508: adds r0, r5, 0 adds r0, 0x9 ldr r3, =0x085ef050 @@ -32885,21 +32885,21 @@ _08019508: lsls r0, 24 asrs r1, r0, 24 cmp r1, 0x1 - beq _08019564 + beq @08019564 cmp r1, 0x1 - bcs _08019552 + bcs @08019552 bl sub_801B3F8 cmp r0, 0x1 - bne _08019534 + bne @08019534 movs r0, 0xC strb r0, [r5, 0x8] - b _08019922 + b @08019922 .align 2, 0 .pool -_08019534: +@08019534: movs r0, 0 - b _08019566 -_08019538: + b @08019566 +@08019538: adds r0, r5, 0 adds r0, 0x9 ldr r3, =0x085ef084 @@ -32909,64 +32909,64 @@ _08019538: lsls r0, 24 asrs r1, r0, 24 cmp r1, 0x1 - beq _08019564 + beq @08019564 cmp r1, 0x1 - bcc _08019560 -_08019552: + bcc @08019560 +@08019552: movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _08019564 - b _08019922 + beq @08019564 + b @08019922 .align 2, 0 .pool -_08019560: +@08019560: movs r0, 0 - b _08019566 -_08019564: + b @08019566 +@08019564: movs r0, 0x1 -_08019566: +@08019566: bl sub_801D500 -_0801956A: +@0801956A: bl sub_801D4E4 movs r0, 0x7 strb r0, [r5, 0x8] - b _08019922 -_08019574: + b @08019922 +@08019574: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _0801957E - b _08019922 -_0801957E: + beq @0801957E + b @08019922 +@0801957E: bl sub_800E084 movs r0, 0xE strb r0, [r5, 0x8] - b _08019922 + b @08019922 .align 2, 0 .pool -_0801958C: +@0801958C: adds r0, r5, 0 adds r0, 0x9 ldr r1, =0x085eeff8 bl sub_8018A1C cmp r0, 0 - bne _0801959C - b _08019922 -_0801959C: + bne @0801959C + b @08019922 +@0801959C: ldrb r0, [r5, 0xD] cmp r0, 0x1 - bne _080195AA + bne @080195AA ldr r0, =0x02021cc4 ldr r1, =0x020229f0 bl gf_strcpy -_080195AA: +@080195AA: movs r0, 0xF strb r0, [r5, 0x8] - b _08019922 + b @08019922 .align 2, 0 .pool -_080195BC: +@080195BC: ldrb r1, [r5, 0xC] ldrb r2, [r5, 0xD] ldrb r3, [r5, 0xE] @@ -32974,173 +32974,173 @@ _080195BC: bl mevent_message adds r1, r0, 0 cmp r1, 0 - bne _080195D0 + bne @080195D0 ldr r1, [r5, 0x10] -_080195D0: +@080195D0: ldr r0, [sp] cmp r0, 0 - beq _080195E2 + beq @080195E2 adds r0, r5, 0 adds r0, 0x9 adds r2, r5, 0 bl mevent_08142CE8 - b _080195EA -_080195E2: + b @080195EA +@080195E2: adds r0, r5, 0 adds r0, 0x9 bl mevent_0814257C -_080195EA: +@080195EA: adds r1, r0, 0 cmp r1, 0 - bne _080195F2 - b _08019922 -_080195F2: + bne @080195F2 + b @08019922 +@080195F2: ldrb r0, [r5, 0xE] cmp r0, 0x3 - bne _0801960C + bne @0801960C ldrb r0, [r5, 0xD] cmp r0, 0x1 - bne _08019606 + bne @08019606 movs r0, 0x1 bl sub_801DB68 - b _0801960C -_08019606: + b @0801960C +@08019606: movs r0, 0x2 bl sub_801DB68 -_0801960C: +@0801960C: ldr r0, [sp] cmp r0, 0 - beq _08019614 - b _080198DC -_08019614: + beq @08019614 + b @080198DC +@08019614: strb r0, [r5, 0x8] movs r0, 0 - b _080198FE -_0801961A: + b @080198FE +@0801961A: adds r0, r5, 0 adds r0, 0x9 bl mevent_save_game cmp r0, 0 - bne _08019628 - b _08019922 -_08019628: - b _08019820 -_0801962A: + bne @08019628 + b @08019922 +@08019628: + b @08019820 +@0801962A: adds r0, r5, 0 adds r0, 0x9 ldrb r1, [r5, 0xC] bl sub_8018DAC cmp r0, 0 - bne _0801963A - b _08019922 -_0801963A: - b _080196F8 -_0801963C: + bne @0801963A + b @08019922 +@0801963A: + b @080196F8 +@0801963C: ldrb r0, [r5, 0xC] cmp r0, 0 - bne _08019664 + bne @08019664 ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08019652 + beq @08019652 movs r0, 0x15 strb r0, [r5, 0x8] -_08019652: +@08019652: ldrh r1, [r2, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _0801965E - b _08019922 -_0801965E: - b _08019682 + bne @0801965E + b @08019922 +@0801965E: + b @08019682 .align 2, 0 .pool -_08019664: +@08019664: ldr r0, =0x030022c0 ldrh r0, [r0, 0x2E] bl sub_801CCD0 cmp r0, 0 - beq _0801967C + beq @0801967C cmp r0, 0x1 - beq _08019682 - b _08019922 + beq @08019682 + b @08019922 .align 2, 0 .pool -_0801967C: +@0801967C: bl sub_801CC38 - b _0801975E -_08019682: + b @0801975E +@08019682: movs r0, 0x1B strb r0, [r5, 0x8] - b _08019922 -_08019688: + b @08019922 +@08019688: ldrb r0, [r5, 0xC] cmp r0, 0 - bne _080196A2 + bne @080196A2 bl sub_801B308 cmp r0, 0 - beq _080196B6 + beq @080196B6 adds r0, r5, 0 adds r0, 0x9 ldrb r2, [r5, 0xC] adds r1, r5, 0 movs r3, 0 - b _080196C0 -_080196A2: + b @080196C0 +@080196A2: bl sub_801B128 cmp r0, 0 - beq _080196B6 + beq @080196B6 adds r0, r5, 0 adds r0, 0x9 ldrb r2, [r5, 0xC] adds r1, r5, 0 movs r3, 0 - b _080196C0 -_080196B6: + b @080196C0 +@080196B6: adds r0, r5, 0 adds r0, 0x9 ldrb r2, [r5, 0xC] adds r1, r5, 0 movs r3, 0x1 -_080196C0: +@080196C0: bl sub_8018C4C adds r1, r0, 0 cmp r1, 0x1 - beq _080196E2 + beq @080196E2 cmp r1, 0x1 - bcc _080196DC + bcc @080196DC cmp r1, 0x2 - beq _080196E8 + beq @080196E8 movs r0, 0x2 negs r0, r0 cmp r1, r0 - beq _080196EE - b _08019922 -_080196DC: + beq @080196EE + b @08019922 +@080196DC: movs r0, 0x1C strb r0, [r5, 0x8] - b _08019922 -_080196E2: + b @08019922 +@080196E2: movs r0, 0x1D strb r0, [r5, 0x8] - b _08019922 -_080196E8: + b @08019922 +@080196E8: movs r0, 0x16 strb r0, [r5, 0x8] - b _08019922 -_080196EE: + b @08019922 +@080196EE: ldrb r0, [r5, 0xC] cmp r0, 0x1 - bne _080196F8 + bne @080196F8 bl sub_801CC80 -_080196F8: +@080196F8: movs r0, 0x14 strb r0, [r5, 0x8] - b _08019922 -_080196FE: + b @08019922 +@080196FE: adds r0, r5, 0 adds r0, 0x9 ldrb r2, [r5, 0xC] @@ -33148,23 +33148,23 @@ _080196FE: bl sub_8018E50 adds r1, r0, 0 cmp r1, 0 - beq _0801971A + beq @0801971A cmp r1, 0 - ble _08019748 + ble @08019748 cmp r1, 0x1 - beq _0801975E - b _08019922 -_0801971A: + beq @0801975E + b @08019922 +@0801971A: ldrb r0, [r5, 0xC] cmp r0, 0 - bne _08019758 + bne @08019758 bl sub_801B3F8 cmp r0, 0x1 - bne _08019758 + bne @08019758 movs r0, 0x17 strb r0, [r5, 0x8] - b _08019922 -_0801972E: + b @08019922 +@0801972E: adds r0, r5, 0 adds r0, 0x9 ldr r3, =0x085ef584 @@ -33174,132 +33174,132 @@ _0801972E: lsls r0, 24 asrs r1, r0, 24 cmp r1, 0x1 - beq _0801975E + beq @0801975E cmp r1, 0x1 - bcc _08019758 -_08019748: + bcc @08019758 +@08019748: movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _0801975E - b _08019922 + beq @0801975E + b @08019922 .align 2, 0 .pool -_08019758: +@08019758: movs r0, 0x18 strb r0, [r5, 0x8] - b _08019922 -_0801975E: + b @08019922 +@0801975E: movs r0, 0x15 strb r0, [r5, 0x8] - b _08019922 -_08019764: + b @08019922 +@08019764: ldrb r0, [r5, 0xC] movs r1, 0x1 bl sub_8018E20 cmp r0, 0 - bne _08019772 - b _08019922 -_08019772: + bne @08019772 + b @08019922 +@08019772: ldrb r0, [r5, 0xC] bl sub_8018E08 movs r0, 0x19 strb r0, [r5, 0x8] - b _08019922 -_0801977E: + b @08019922 +@0801977E: adds r0, r5, 0 adds r0, 0x9 bl mevent_save_game cmp r0, 0 - bne _0801978C - b _08019922 -_0801978C: + bne @0801978C + b @08019922 +@0801978C: movs r0, 0x1A strb r0, [r5, 0x8] - b _08019922 -_08019792: + b @08019922 +@08019792: adds r0, r5, 0 adds r0, 0x9 ldrb r1, [r5, 0xC] bl mevent_message_was_thrown_away - b _080198F6 -_0801979E: + b @080198F6 +@0801979E: ldrb r0, [r5, 0xC] movs r1, 0 bl sub_8018E20 cmp r0, 0 - bne _080197AC - b _08019922 -_080197AC: + bne @080197AC + b @08019922 +@080197AC: movs r0, 0 strb r0, [r5, 0x8] - b _08019922 -_080197B2: + b @08019922 +@080197B2: ldrb r0, [r5, 0xC] movs r1, 0x1 bl sub_8018E20 cmp r0, 0 - bne _080197C0 - b _08019922 -_080197C0: + bne @080197C0 + b @08019922 +@080197C0: movs r0, 0x3 strb r0, [r5, 0x8] - b _08019922 -_080197C6: + b @08019922 +@080197C6: ldrb r0, [r5, 0xC] movs r1, 0x1 bl sub_8018E20 cmp r0, 0 - bne _080197D4 - b _08019922 -_080197D4: + bne @080197D4 + b @08019922 +@080197D4: ldrb r0, [r5, 0xC] cmp r0, 0 - beq _080197E0 + beq @080197E0 cmp r0, 0x1 - beq _080197E8 - b _080197EE -_080197E0: + beq @080197E8 + b @080197EE +@080197E0: movs r0, 0x15 bl sub_8014A00 - b _080197EE -_080197E8: + b @080197EE +@080197E8: movs r0, 0x16 bl sub_8014A00 -_080197EE: +@080197EE: movs r0, 0x1 strb r0, [r5, 0xD] movs r0, 0x1E strb r0, [r5, 0x8] - b _08019922 -_080197F8: + b @08019922 +@080197F8: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _08019810 + beq @08019810 movs r0, 0x1 bl sub_8018838 movs r0, 0x1F strb r0, [r5, 0x8] - b _08019922 + b @08019922 .align 2, 0 .pool -_08019810: +@08019810: ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x5 - beq _0801981A - b _08019922 -_0801981A: + beq @0801981A + b @08019922 +@0801981A: movs r0, 0x1 bl sub_8018838 -_08019820: +@08019820: movs r0, 0x12 strb r0, [r5, 0x8] - b _08019922 + b @08019922 .align 2, 0 .pool -_0801982C: +@0801982C: ldr r0, =0x02021cc4 movs r1, 0xFF strb r1, [r0] @@ -33309,55 +33309,55 @@ _0801982C: strb r1, [r0] ldrb r0, [r5, 0xC] cmp r0, 0 - bne _0801985C + bne @0801985C ldr r0, =0x085ef360 bl sub_8018884 bl sub_801D0A0 - b _08019866 + b @08019866 .align 2, 0 .pool -_0801985C: +@0801985C: ldr r0, =0x085ef37c bl sub_8018884 bl sub_801D07C -_08019866: +@08019866: movs r0, 0x20 strb r0, [r5, 0x8] - b _08019922 + b @08019922 .align 2, 0 .pool -_08019870: +@08019870: adds r0, r5, 0 bl sub_801D0C4 cmp r0, 0x3 - bne _08019922 + bne @08019922 ldrh r0, [r5] strb r0, [r5, 0xE] movs r0, 0x21 strb r0, [r5, 0x8] - b _08019922 -_08019884: + b @08019922 +@08019884: bl task_add_05_task_del_08FA224_when_no_RfuFunc ldr r0, =0x02021cc4 ldr r1, =0x02022a0c bl gf_strcpy movs r0, 0x22 strb r0, [r5, 0x8] - b _08019922 + b @08019922 .align 2, 0 .pool -_080198A0: +@080198A0: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _08019922 + bne @08019922 bl sub_800E084 movs r0, 0x23 strb r0, [r5, 0x8] - b _08019922 + b @08019922 .align 2, 0 .pool -_080198B8: +@080198B8: adds r0, r5, 0 adds r0, 0x9 ldrb r2, [r5, 0xD] @@ -33365,39 +33365,39 @@ _080198B8: adds r1, r5, 0 bl sub_8019174 cmp r0, 0 - beq _08019922 + beq @08019922 ldr r0, [r5, 0xC] ldr r1, =0x00ffff00 ands r0, r1 ldr r1, =0x00030100 cmp r0, r1 - bne _080198FA + bne @080198FA movs r0, 0x3 bl sub_801DB68 -_080198DC: +@080198DC: movs r0, 0x11 strb r0, [r5, 0x8] - b _08019922 + b @08019922 .align 2, 0 .pool -_080198EC: +@080198EC: adds r0, r5, 0 adds r0, 0x9 ldr r1, =0x085ef014 bl mevent_0814257C -_080198F6: +@080198F6: cmp r0, 0 - beq _08019922 -_080198FA: + beq @08019922 +@080198FA: movs r0, 0 strb r0, [r5, 0x8] -_080198FE: +@080198FE: movs r1, 0 bl sub_80186EC - b _08019922 + b @08019922 .align 2, 0 .pool -_0801990C: +@0801990C: bl sub_80097E8 ldr r0, [r5, 0x10] bl free @@ -33405,7 +33405,7 @@ _0801990C: bl remove_task ldr r0, =sub_80186A4 + 1 bl set_callback2 -_08019922: +@08019922: add sp, 0x4 pop {r4,r5} pop {r0} @@ -33415,7 +33415,7 @@ _08019922: thumb_func_end task00_mystery_gift thumb_func_start sub_8019930 -sub_8019930: @ 8019930 +sub_8019930: ; 8019930 ldr r0, =0x000001a9 bx lr .align 2, 0 @@ -33423,7 +33423,7 @@ sub_8019930: @ 8019930 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 @@ -33442,28 +33442,28 @@ 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] cmp r0, 0x2 - beq _08019966 + beq @08019966 cmp r0, 0 - bne _08019970 -_08019966: + bne @08019970 +@08019966: movs r0, 0x1 - b _08019972 + b @08019972 .align 2, 0 .pool -_08019970: +@08019970: movs r0, 0 -_08019972: +@08019972: pop {r1} bx r1 thumb_func_end is_walking_or_running thumb_func_start sub_8019978 -sub_8019978: @ 8019978 +sub_8019978: ; 8019978 ldr r3, =0x082f072c movs r2, 0x7 ands r2, r1 @@ -33479,7 +33479,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} @@ -33521,7 +33521,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, =0x082f0740 @@ -33538,7 +33538,7 @@ sub_80199E0: @ 80199E0 adds r3, r0 adds r3, 0x7 cmp r3, r2 - bne _08019A28 + bne @08019A28 adds r0, r7, 0x2 adds r0, r5, r0 movs r2, 0 @@ -33551,21 +33551,21 @@ sub_80199E0: @ 80199E0 adds r1, r0 adds r1, 0x7 cmp r1, r12 - bne _08019A28 + bne @08019A28 movs r0, 0x1 - b _08019A2A + b @08019A2A .align 2, 0 .pool -_08019A28: +@08019A28: movs r0, 0 -_08019A2A: +@08019A2A: pop {r4-r7} pop {r1} bx r1 thumb_func_end sub_80199E0 thumb_func_start sub_8019A30 -sub_8019A30: @ 8019A30 +sub_8019A30: ; 8019A30 push {lr} ldr r1, =0x000002bf adds r0, r1 @@ -33581,7 +33581,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 @@ -33595,7 +33595,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 @@ -33609,7 +33609,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 @@ -33625,7 +33625,7 @@ sub_8019A7C: @ 8019A7C thumb_func_end sub_8019A7C thumb_func_start sub_8019A98 -sub_8019A98: @ 8019A98 +sub_8019A98: ; 8019A98 push {lr} ldr r1, =0x082f0774 adds r0, r1 @@ -33642,7 +33642,7 @@ sub_8019A98: @ 8019A98 thumb_func_end sub_8019A98 thumb_func_start sub_8019AB8 -sub_8019AB8: @ 8019AB8 +sub_8019AB8: ; 8019AB8 push {lr} ldr r1, =0x082f0774 adds r0, r1 @@ -33659,7 +33659,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 @@ -33674,7 +33674,7 @@ sub_8019AD8: @ 8019AD8 bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _08019B30 + bne @08019B30 mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -33686,20 +33686,20 @@ sub_8019AD8: @ 8019AD8 bl npc_is_visible_or_is_x40 lsls r0, 24 cmp r0, 0 - bne _08019B30 + bne @08019B30 ldrb r1, [r5] adds r0, r4, 0 bl npc_set_state_2 lsls r0, 24 cmp r0, 0 - bne _08019B30 + bne @08019B30 movs r0, 0x1 - b _08019B32 + b @08019B32 .align 2, 0 .pool -_08019B30: +@08019B30: movs r0, 0 -_08019B32: +@08019B32: add sp, 0x4 pop {r4,r5} pop {r1} @@ -33707,7 +33707,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, =0x082f0774 @@ -33721,7 +33721,7 @@ sub_8019B3C: @ 8019B3C bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _08019B9C + bne @08019B9C mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -33733,25 +33733,25 @@ sub_8019B3C: @ 8019B3C bl sub_8093284 lsls r0, 24 cmp r0, 0 - bne _08019B84 + bne @08019B84 movs r0, 0 - b _08019B9E + b @08019B9E .align 2, 0 .pool -_08019B84: +@08019B84: bl script_env_2_is_enabled lsls r0, 24 cmp r0, 0 - bne _08019B96 + bne @08019B96 adds r0, r4, 0 bl npc_sync_anim_pause_bits - b _08019B9C -_08019B96: + b @08019B9C +@08019B96: adds r0, r4, 0 bl sub_8097404 -_08019B9C: +@08019B9C: movs r0, 0x1 -_08019B9E: +@08019B9E: add sp, 0x4 pop {r4} pop {r1} @@ -33759,7 +33759,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 @@ -33768,7 +33768,7 @@ sub_8019BA8: @ 8019BA8 str r0, [r1] movs r1, 0 movs r2, 0x7 -_08019BB8: +@08019BB8: strb r1, [r0] strb r1, [r0, 0x1] strb r1, [r0, 0x2] @@ -33776,7 +33776,7 @@ _08019BB8: adds r0, 0x4 subs r2, 0x1 cmp r2, 0 - bge _08019BB8 + bge @08019BB8 bl sub_8019DF4 lsls r0, 24 lsrs r0, 24 @@ -33787,36 +33787,36 @@ _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 movs r0, 0 ldrsb r0, [r5, r0] cmp r0, 0 - beq _08019BF0 + beq @08019BF0 cmp r0, 0x1 - beq _08019C10 - b _08019C2E -_08019BF0: + beq @08019C10 + b @08019C2E +@08019BF0: ldr r1, =0x082f078c adds r0, r4, 0 bl sub_8019AD8 cmp r0, 0x1 - bne _08019C2E + bne @08019C2E adds r0, r4, 0 bl flag_set_x63 ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] - b _08019C2E + b @08019C2E .align 2, 0 .pool -_08019C10: +@08019C10: adds r0, r4, 0 bl sub_8019B3C cmp r0, 0 - beq _08019C2E + beq @08019C2E adds r0, r4, 0 bl sub_8019AB8 adds r0, r4, 0 @@ -33824,17 +33824,17 @@ _08019C10: movs r0, 0 strb r0, [r5] movs r0, 0x1 - b _08019C30 -_08019C2E: + b @08019C30 +@08019C2E: movs r0, 0 -_08019C30: +@08019C30: pop {r4,r5} pop {r1} bx r1 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 @@ -33843,20 +33843,20 @@ sub_8019C38: @ 8019C38 movs r0, 0 ldrsb r0, [r6, r0] cmp r0, 0x2 - beq _08019CD4 + beq @08019CD4 cmp r0, 0x2 - bgt _08019C54 + bgt @08019C54 cmp r0, 0 - beq _08019C5A - b _08019CE6 -_08019C54: + beq @08019C5A + b @08019CE6 +@08019C54: cmp r0, 0x3 - beq _08019CBC - b _08019CE6 -_08019C5A: + beq @08019CBC + b @08019CE6 +@08019C5A: bl is_walking_or_running cmp r0, 0 - beq _08019CE6 + beq @08019CE6 mov r4, sp adds r4, 0x2 mov r0, sp @@ -33871,7 +33871,7 @@ _08019C5A: movs r1, 0 bl sub_80199E0 cmp r0, 0x1 - beq _08019CE6 + beq @08019CE6 mov r0, sp adds r1, r4, 0 bl plaer_get_pos_including_state_based_drift @@ -33884,7 +33884,7 @@ _08019C5A: movs r1, 0 bl sub_80199E0 cmp r0, 0x1 - beq _08019CE6 + beq @08019CE6 ldrb r1, [r7, 0x1] adds r0, r5, 0 bl sub_8019A7C @@ -33895,30 +33895,30 @@ _08019C5A: ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] -_08019CBC: +@08019CBC: ldr r1, =0x082f078e adds r0, r5, 0 bl sub_8019AD8 cmp r0, 0x1 - bne _08019CE6 + bne @08019CE6 ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] - b _08019CE6 + b @08019CE6 .align 2, 0 .pool -_08019CD4: +@08019CD4: adds r0, r5, 0 bl sub_8019B3C cmp r0, 0 - beq _08019CE6 + beq @08019CE6 movs r0, 0 strb r0, [r6] movs r0, 0x1 - b _08019CE8 -_08019CE6: + b @08019CE8 +@08019CE6: movs r0, 0 -_08019CE8: +@08019CE8: add sp, 0x4 pop {r4-r7} pop {r1} @@ -33926,7 +33926,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 @@ -33940,21 +33940,21 @@ sub_8019CF0: @ 8019CF0 strb r0, [r4, 0x1] ldrb r0, [r4] cmp r0, 0 - beq _08019D18 + beq @08019D18 movs r0, 0 - b _08019D1A + b @08019D1A .align 2, 0 .pool -_08019D18: +@08019D18: movs r0, 0x1 -_08019D1A: +@08019D1A: pop {r4} pop {r1} bx r1 thumb_func_end sub_8019CF0 thumb_func_start AGBAssert -AGBAssert: @ 8019D20 +AGBAssert: ; 8019D20 push {lr} ldr r1, =0x02022c64 lsls r0, 2 @@ -33964,88 +33964,88 @@ AGBAssert: @ 8019D20 strb r0, [r1, 0x3] ldrb r0, [r1] cmp r0, 0x1 - beq _08019D3C + beq @08019D3C movs r0, 0 - b _08019D3E + b @08019D3E .align 2, 0 .pool -_08019D3C: +@08019D3C: movs r0, 0x1 -_08019D3E: +@08019D3E: pop {r1} bx r1 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 ldrb r1, [r4] cmp r1, 0x1 - beq _08019DA6 + beq @08019DA6 cmp r1, 0x1 - bgt _08019D5A + bgt @08019D5A cmp r1, 0 - beq _08019D64 - b _08019DC6 -_08019D5A: + beq @08019D64 + b @08019DC6 +@08019D5A: cmp r1, 0x2 - beq _08019D70 + beq @08019D70 cmp r1, 0x3 - beq _08019DB4 - b _08019DC6 -_08019D64: + beq @08019DB4 + b @08019DC6 +@08019D64: ldrb r0, [r4, 0x3] cmp r0, 0x1 - bne _08019DC6 + bne @08019DC6 movs r0, 0x2 strb r0, [r4] strb r1, [r4, 0x2] -_08019D70: +@08019D70: adds r0, r5, 0 movs r1, 0 bl sub_8019F8C adds r1, r0, 0 cmp r1, 0 - bne _08019D96 + bne @08019D96 ldrb r0, [r4, 0x3] cmp r0, 0x2 - bne _08019D96 + bne @08019D96 strb r1, [r4] strb r1, [r4, 0x2] adds r0, r5, 0 bl sub_8019AB8 adds r0, r5, 0 bl flag_set_x63 - b _08019DC6 -_08019D96: + b @08019DC6 +@08019D96: adds r0, r4, 0x2 adds r1, r5, 0 adds r2, r4, 0 bl sub_8019C38 cmp r0, 0x1 - bne _08019DC6 - b _08019DC4 -_08019DA6: + bne @08019DC6 + b @08019DC4 +@08019DA6: ldrb r0, [r4, 0x3] cmp r0, 0x2 - bne _08019DC6 + bne @08019DC6 movs r1, 0 movs r0, 0x3 strb r0, [r4] strb r1, [r4, 0x2] -_08019DB4: +@08019DB4: adds r0, r4, 0x2 adds r1, r5, 0 adds r2, r4, 0 bl sub_8019BDC cmp r0, 0x1 - bne _08019DC6 + bne @08019DC6 movs r0, 0 -_08019DC4: +@08019DC4: strb r0, [r4] -_08019DC6: +@08019DC6: movs r0, 0 strb r0, [r4, 0x3] pop {r4,r5} @@ -34054,11 +34054,11 @@ _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 -_08019DD6: +@08019DD6: lsls r0, r4, 2 ldr r1, [r5] adds r1, r0 @@ -34066,7 +34066,7 @@ _08019DD6: bl sub_8019D44 adds r4, 0x1 cmp r4, 0x7 - ble _08019DD6 + ble @08019DD6 pop {r4,r5} pop {r0} bx r0 @@ -34075,7 +34075,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 + 1 adds r0, r4, 0 @@ -34083,34 +34083,34 @@ sub_8019DF4: @ 8019DF4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08019E18 + beq @08019E18 adds r0, r4, 0 movs r1, 0x5 bl AddTask lsls r0, 24 lsrs r0, 24 - b _08019E1A + b @08019E1A .align 2, 0 .pool -_08019E18: +@08019E18: movs r0, 0x10 -_08019E1A: +@08019E1A: pop {r4} pop {r1} bx r1 thumb_func_end sub_8019DF4 thumb_func_start sub_8019E20 -sub_8019E20: @ 8019E20 +sub_8019E20: ; 8019E20 push {lr} ldr r0, =sub_8019DD0 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 cmp r0, 0xF - bhi _08019E34 + bhi @08019E34 bl remove_task -_08019E34: +@08019E34: pop {r0} bx r0 .align 2, 0 @@ -34118,22 +34118,22 @@ _08019E34: thumb_func_end sub_8019E20 thumb_func_start sub_8019E3C -sub_8019E3C: @ 8019E3C +sub_8019E3C: ; 8019E3C push {r4,lr} movs r4, 0 -_08019E40: +@08019E40: adds r0, r4, 0 bl sub_8019A30 cmp r0, 0 - bne _08019E56 + bne @08019E56 adds r0, r4, 0 bl sub_8019AB8 adds r0, r4, 0 bl flag_set_x63 -_08019E56: +@08019E56: adds r4, 0x1 cmp r4, 0x7 - ble _08019E40 + ble @08019E40 ldr r1, =0x02022c64 movs r0, 0 str r0, [r1] @@ -34146,7 +34146,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 @@ -34170,7 +34170,7 @@ sub_8019E70: @ 8019E70 ldrh r0, [r0] mov r10, r0 ldr r6, =0x082f0760 -_08019E9E: +@08019E9E: mov r5, r8 add r5, r9 adds r5, r7 @@ -34206,7 +34206,7 @@ _08019E9E: adds r6, 0x2 adds r7, 0x1 cmp r7, 0x4 - ble _08019E9E + ble @08019E9E add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -34220,12 +34220,12 @@ _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 ldr r6, =0x02020630 -_08019F0C: +@08019F0C: adds r0, r5, r4 ldrb r1, [r0] lsls r0, r1, 4 @@ -34235,7 +34235,7 @@ _08019F0C: bl obj_delete_and_free_tiles adds r4, 0x1 cmp r4, 0x27 - ble _08019F0C + ble @08019F0C pop {r4-r6} pop {r0} bx r0 @@ -34244,15 +34244,15 @@ _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 add r7, sp, 0x4 -_08019F34: +@08019F34: movs r4, 0 adds r6, r5, 0x1 -_08019F38: +@08019F38: adds r0, r5, 0 adds r1, r4, 0 mov r2, sp @@ -34264,10 +34264,10 @@ _08019F38: bl sub_8088B94 adds r4, 0x1 cmp r4, 0x4 - ble _08019F38 + ble @08019F38 adds r5, r6, 0 cmp r5, 0x7 - ble _08019F34 + ble @08019F34 add sp, 0x8 pop {r4-r7} pop {r0} @@ -34275,34 +34275,34 @@ _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 - beq _08019F78 + beq @08019F78 ldr r0, =0x082f076f adds r0, r1, r0 ldrb r0, [r0] - b _08019F88 + b @08019F88 .align 2, 0 .pool -_08019F78: +@08019F78: ldrb r1, [r2, 0xA] movs r0, 0x7F ands r0, r1 cmp r0, 0x45 - beq _08019F86 + beq @08019F86 movs r0, 0x4 - b _08019F88 -_08019F86: + b @08019F88 +@08019F86: movs r0, 0x1 -_08019F88: +@08019F88: pop {r1} bx r1 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 @@ -34317,7 +34317,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 @@ -34335,7 +34335,7 @@ sub_8019FA4: @ 8019FA4 adds r0, r5, 0 bl sub_8019F8C cmp r0, 0x1 - bne _08019FE2 + bne @08019FE2 adds r4, r7, 0 subs r4, 0x38 lsls r4, 24 @@ -34346,7 +34346,7 @@ sub_8019FA4: @ 8019FA4 adds r0, r4, 0 movs r1, 0x1 bl sub_8097CC4 -_08019FE2: +@08019FE2: adds r0, r7, 0 subs r0, 0x38 lsls r0, 24 @@ -34382,7 +34382,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 @@ -34411,7 +34411,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 @@ -34441,7 +34441,7 @@ sub_801A064: @ 801A064 mov r9, r4 adds r6, r5, 0 cmp r0, 0x1 - bne _0801A0F0 + bne @0801A0F0 mov r0, sp movs r1, 0 ldrsh r2, [r0, r1] @@ -34452,7 +34452,7 @@ sub_801A064: @ 801A064 movs r1, 0 bl sub_80199E0 cmp r0, 0x1 - beq _0801A15C + beq @0801A15C movs r0, 0 ldrsh r2, [r4, r0] movs r1, 0 @@ -34461,7 +34461,7 @@ sub_801A064: @ 801A064 movs r1, 0 bl sub_80199E0 cmp r0, 0x1 - beq _0801A15C + beq @0801A15C mov r2, r8 ldrb r0, [r2, 0xB] lsls r0, 31 @@ -34475,19 +34475,19 @@ sub_801A064: @ 801A064 movs r1, 0 mov r3, r8 bl sub_8019FA4 -_0801A0F0: +@0801A0F0: movs r5, 0x1 mov r4, r8 adds r4, 0x4 -_0801A0F6: +@0801A0F6: ldrb r0, [r4] cmp r0, 0 - bne _0801A106 + bne @0801A106 adds r0, r7, 0 adds r1, r5, 0 bl sub_801A02C - b _0801A154 -_0801A106: + b @0801A154 +@0801A106: mov r0, sp movs r1, 0 ldrsh r2, [r0, r1] @@ -34498,7 +34498,7 @@ _0801A106: adds r1, r5, 0 bl sub_80199E0 cmp r0, 0 - bne _0801A154 + bne @0801A154 mov r0, r9 movs r1, 0 ldrsh r2, [r0, r1] @@ -34508,7 +34508,7 @@ _0801A106: adds r1, r5, 0 bl sub_80199E0 cmp r0, 0 - bne _0801A154 + bne @0801A154 ldrb r2, [r4] lsrs r0, r2, 3 movs r1, 0x1 @@ -34523,12 +34523,12 @@ _0801A106: adds r1, r5, 0 mov r3, r8 bl sub_8019FA4 -_0801A154: +@0801A154: adds r4, 0x1 adds r5, 0x1 cmp r5, 0x4 - ble _0801A0F6 -_0801A15C: + ble @0801A0F6 +@0801A15C: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -34540,7 +34540,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 @@ -34549,38 +34549,38 @@ sub_801A16C: @ 801A16C lsrs r0, 25 subs r0, 0x40 cmp r0, 0x14 - bhi _0801A20E + bhi @0801A20E lsls r0, 2 - ldr r1, =_0801A18C + ldr r1, =@0801A18C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801A18C: - .4byte _0801A1E0 - .4byte _0801A200 - .4byte _0801A20E - .4byte _0801A20E - .4byte _0801A200 - .4byte _0801A200 - .4byte _0801A20E - .4byte _0801A20E - .4byte _0801A200 - .4byte _0801A20E - .4byte _0801A20E - .4byte _0801A20E - .4byte _0801A20E - .4byte _0801A20E - .4byte _0801A20E - .4byte _0801A20E - .4byte _0801A20E - .4byte _0801A200 - .4byte _0801A200 - .4byte _0801A200 - .4byte _0801A1E0 -_0801A1E0: +@0801A18C: + .4byte @0801A1E0 + .4byte @0801A200 + .4byte @0801A20E + .4byte @0801A20E + .4byte @0801A200 + .4byte @0801A200 + .4byte @0801A20E + .4byte @0801A20E + .4byte @0801A200 + .4byte @0801A20E + .4byte @0801A20E + .4byte @0801A20E + .4byte @0801A20E + .4byte @0801A20E + .4byte @0801A20E + .4byte @0801A20E + .4byte @0801A20E + .4byte @0801A200 + .4byte @0801A200 + .4byte @0801A200 + .4byte @0801A1E0 +@0801A1E0: ldrb r1, [r4, 0xB] lsls r1, 31 lsrs r1, 31 @@ -34588,82 +34588,82 @@ _0801A1E0: adds r0, r5, 0 bl sub_8019CF0 movs r4, 0 -_0801A1F0: +@0801A1F0: adds r0, r5, 0 adds r1, r4, 0 bl sub_801A02C adds r4, 0x1 cmp r4, 0x4 - bls _0801A1F0 - b _0801A20E -_0801A200: + bls @0801A1F0 + b @0801A20E +@0801A200: adds r0, r5, 0 bl AGBAssert adds r0, r5, 0 adds r1, r4, 0 bl sub_801A064 -_0801A20E: +@0801A20E: pop {r4,r5} pop {r0} bx r0 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 movs r4, 0 -_0801A21E: +@0801A21E: adds r0, r5, 0 adds r1, r4, 0 bl sub_801A02C adds r4, 0x1 cmp r4, 0x4 - ble _0801A21E + ble @0801A21E pop {r4,r5} pop {r0} bx r0 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 str r1, [r2] movs r5, 0 ldr r4, [r0] -_0801A240: +@0801A240: ldrb r0, [r4, 0x1A] movs r1, 0x3 ands r1, r0 cmp r1, 0x1 - bne _0801A258 + bne @0801A258 adds r0, r5, 0 adds r1, r4, 0 bl sub_801A16C - b _0801A264 + b @0801A264 .align 2, 0 .pool -_0801A258: +@0801A258: cmp r1, 0x2 - bne _0801A264 + bne @0801A264 adds r0, r5, 0 adds r1, r4, 0 bl sub_801A214 -_0801A264: +@0801A264: adds r4, 0x20 adds r5, 0x1 cmp r5, 0x7 - ble _0801A240 + ble @0801A240 pop {r4,r5} pop {r0} bx r0 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 @@ -34674,7 +34674,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 @@ -34684,10 +34684,10 @@ sub_801A284: @ 801A284 movs r0, 0x96 lsls r0, 1 cmp r1, r0 - bls _0801A29E + bls @0801A29E adds r0, r2, 0 bl sub_801A234 -_0801A29E: +@0801A29E: pop {r0} bx r0 .align 2, 0 @@ -34695,7 +34695,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 @@ -34707,9 +34707,9 @@ sub_801A2A8: @ 801A2A8 str r2, [sp, 0x8] bl is_walking_or_running cmp r0, 0 - bne _0801A2F0 - b _0801A396 -_0801A2C4: + bne @0801A2F0 + b @0801A396 +@0801A2C4: ldr r4, =0x082f076a bl player_get_direction__sp1AA lsls r0, 24 @@ -34726,10 +34726,10 @@ _0801A2C4: ldr r1, [sp, 0x8] strh r2, [r1] movs r0, 0x1 - b _0801A398 + b @0801A398 .align 2, 0 .pool -_0801A2F0: +@0801A2F0: mov r4, sp adds r4, 0x2 mov r0, sp @@ -34744,7 +34744,7 @@ _0801A2F0: adds r2, r0, 0x2 str r2, [sp, 0x10] str r0, [sp, 0x14] -_0801A30E: +@0801A30E: movs r6, 0 ldr r4, [sp, 0x14] movs r0, 0 @@ -34753,7 +34753,7 @@ _0801A30E: ldr r1, [sp, 0x10] mov r8, r1 ldr r5, =0x082f0760 -_0801A31E: +@0801A31E: mov r2, r10 adds r3, r2, r6 mov r0, sp @@ -34764,7 +34764,7 @@ _0801A31E: add r0, r9 adds r0, 0x7 cmp r1, r0 - bne _0801A372 + bne @0801A372 mov r1, sp movs r2, 0x2 ldrsh r0, [r1, r2] @@ -34776,7 +34776,7 @@ _0801A31E: adds r1, r2 adds r1, 0x7 cmp r0, r1 - bne _0801A372 + bne @0801A372 adds r0, r3, 0 subs r0, 0x38 lsls r0, 24 @@ -34784,21 +34784,21 @@ _0801A31E: adds r0, r4, 0 bl sub_8097C8C cmp r0, 0 - bne _0801A372 + bne @0801A372 adds r0, r4, 0 bl sub_8097D9C cmp r0, 0 - bne _0801A372 + bne @0801A372 ldrb r1, [r7, 0x1A] movs r0, 0x3 ands r0, r1 cmp r0, 0x1 - beq _0801A2C4 -_0801A372: + beq @0801A2C4 +@0801A372: adds r5, 0x2 adds r6, 0x1 cmp r6, 0x4 - ble _0801A31E + ble @0801A31E adds r7, 0x20 movs r4, 0x5 add r10, r4 @@ -34812,10 +34812,10 @@ _0801A372: adds r2, 0x1 str r2, [sp, 0xC] cmp r2, 0x7 - ble _0801A30E -_0801A396: + ble @0801A30E +@0801A396: movs r0, 0 -_0801A398: +@0801A398: add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -34829,7 +34829,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 @@ -34848,7 +34848,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 @@ -34868,24 +34868,24 @@ sub_801A3D0: @ 801A3D0 thumb_func_end sub_801A3D0 thumb_func_start sub_801A3F4 -sub_801A3F4: @ 801A3F4 +sub_801A3F4: ; 801A3F4 push {lr} bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0801A414 + bne @0801A414 bl run_active_tasks bl run_remoboxes bl call_obj_callbacks bl obj_sync_something bl fade_and_return_progress_probably -_0801A414: +@0801A414: pop {r0} bx r0 thumb_func_end sub_801A3F4 thumb_func_start sub_801A418 -sub_801A418: @ 801A418 +sub_801A418: ; 801A418 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -34895,7 +34895,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 + 1 bl set_callback2 @@ -34906,7 +34906,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 @@ -35022,18 +35022,18 @@ sub_801A43C: @ 801A43C thumb_func_end sub_801A43C thumb_func_start sub_801A584 -sub_801A584: @ 801A584 +sub_801A584: ; 801A584 push {r4,lr} bl Window_FreeMemory movs r4, 0 -_0801A58C: +@0801A58C: lsls r0, r4, 24 lsrs r0, 24 bl bg_get_tilemap bl free adds r4, 0x1 cmp r4, 0x1 - ble _0801A58C + ble @0801A58C ldr r0, =0x03000dac ldr r0, [r0] bl free @@ -35047,7 +35047,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] @@ -35056,20 +35056,20 @@ sub_801A5BC: @ 801A5BC lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - ble _0801A5E4 + ble @0801A5E4 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] lsls r0, 16 asrs r0, 16 cmp r0, 0xE - bne _0801A5E0 + bne @0801A5E0 movs r0, 0 strh r0, [r1] -_0801A5E0: +@0801A5E0: movs r0, 0 strh r0, [r2] -_0801A5E4: +@0801A5E4: movs r2, 0 ldrsh r0, [r1, r2] adds r0, 0x2 @@ -35086,7 +35086,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 @@ -35116,7 +35116,7 @@ sub_801A600: @ 801A600 adds r2, r4, 0 bl sub_801A8B0 movs r1, 0 -_0801A644: +@0801A644: adds r4, r1, 0x1 lsls r0, r4, 2 adds r0, r5 @@ -35136,7 +35136,7 @@ _0801A644: bl sub_801A8B0 adds r1, r4, 0 cmp r4, 0x2 - ble _0801A644 + ble @0801A644 ldr r1, =0x082f0d5c adds r0, r4, 0x1 lsls r0, 2 @@ -35175,7 +35175,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} @@ -35191,25 +35191,25 @@ sub_801A6C0: @ 801A6C0 ldrsh r0, [r0, r2] adds r2, r1, 0 cmp r0, 0x5 - bls _0801A6E2 - b _0801A89C -_0801A6E2: + bls @0801A6E2 + b @0801A89C +@0801A6E2: lsls r0, 2 - ldr r1, =_0801A6F4 + ldr r1, =@0801A6F4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801A6F4: - .4byte _0801A70C - .4byte _0801A728 - .4byte _0801A74C - .4byte _0801A768 - .4byte _0801A85C - .4byte _0801A884 -_0801A70C: +@0801A6F4: + .4byte @0801A70C + .4byte @0801A728 + .4byte @0801A74C + .4byte @0801A768 + .4byte @0801A85C + .4byte @0801A884 +@0801A70C: bl sub_801A600 ldr r0, =0x03005e00 lsls r1, r5, 2 @@ -35219,10 +35219,10 @@ _0801A70C: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _0801A89C + b @0801A89C .align 2, 0 .pool -_0801A728: +@0801A728: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -35236,24 +35236,24 @@ _0801A728: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0 bl gpu_sync_bg_show - b _0801A86C -_0801A74C: + b @0801A86C +@0801A74C: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0801A75A - b _0801A89C -_0801A75A: + beq @0801A75A + b @0801A89C +@0801A75A: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r2 - b _0801A876 + b @0801A876 .align 2, 0 .pool -_0801A768: +@0801A768: ldr r0, =0x03000dac ldr r0, [r0] adds r1, r0, 0 @@ -35267,7 +35267,7 @@ _0801A768: lsls r1, r5, 2 mov r8, r1 cmp r0, 0 - beq _0801A7F8 + beq @0801A7F8 movs r0, 0x2 movs r1, 0 bl Window_FastFillPixels @@ -35275,7 +35275,7 @@ _0801A768: ldr r6, =0x02021fc4 movs r7, 0x80 lsls r7, 20 -_0801A796: +@0801A796: ldr r0, =0x03000dac ldr r0, [r0] lsls r1, r4, 2 @@ -35286,7 +35286,7 @@ _0801A796: movs r3, 0x2 bl decimal_int_to_string cmp r4, 0x3 - beq _0801A7CC + beq @0801A7CC lsrs r0, r7, 24 str r0, [sp] movs r0, 0x1 @@ -35296,10 +35296,10 @@ _0801A796: adds r2, r6, 0 movs r3, 0xC bl sub_801A8B0 - b _0801A7DE + b @0801A7DE .align 2, 0 .pool -_0801A7CC: +@0801A7CC: movs r0, 0x62 str r0, [sp] movs r0, 0x2 @@ -35308,30 +35308,30 @@ _0801A7CC: adds r2, r6, 0 movs r3, 0xC bl sub_801A8B0 -_0801A7DE: +@0801A7DE: movs r2, 0xF0 lsls r2, 21 adds r7, r2 adds r4, 0x1 cmp r4, 0x3 - ble _0801A796 + ble @0801A796 movs r0, 0x2 bl Window_WriteStandardTileMap movs r0, 0x2 movs r1, 0x3 bl Window_CopyToVram -_0801A7F8: +@0801A7F8: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0801A80C + bne @0801A80C movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0801A836 -_0801A80C: + beq @0801A836 +@0801A80C: movs r0, 0x5 bl audio_play ldr r2, =0x03005e00 @@ -35352,7 +35352,7 @@ _0801A80C: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_0801A836: +@0801A836: mov r2, r8 adds r1, r2, r5 lsls r1, 3 @@ -35362,10 +35362,10 @@ _0801A836: adds r0, 0xE adds r1, 0x10 bl sub_801A5BC - b _0801A89C + b @0801A89C .align 2, 0 .pool -_0801A85C: +@0801A85C: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -35373,31 +35373,31 @@ _0801A85C: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 -_0801A86C: +@0801A86C: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 -_0801A876: +@0801A876: ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b _0801A89C + b @0801A89C .align 2, 0 .pool -_0801A884: +@0801A884: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0801A89C + bne @0801A89C ldr r0, =sub_801A584 + 1 bl set_callback2 adds r0, r5, 0 bl remove_task -_0801A89C: +@0801A89C: add sp, 0x8 pop {r3} mov r8, r3 @@ -35409,7 +35409,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 @@ -35426,63 +35426,63 @@ sub_801A8B0: @ 801A8B0 lsls r4, 24 lsrs r0, r4, 24 cmp r0, 0x4 - bhi _0801A93A + bhi @0801A93A lsls r0, 2 - ldr r1, =_0801A8E0 + ldr r1, =@0801A8E0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801A8E0: - .4byte _0801A8F4 - .4byte _0801A902 - .4byte _0801A910 - .4byte _0801A91E - .4byte _0801A92C -_0801A8F4: +@0801A8E0: + .4byte @0801A8F4 + .4byte @0801A902 + .4byte @0801A910 + .4byte @0801A91E + .4byte @0801A92C +@0801A8F4: add r1, sp, 0x14 movs r0, 0 strb r0, [r1] movs r0, 0x2 strb r0, [r1, 0x1] movs r0, 0x3 - b _0801A938 -_0801A902: + b @0801A938 +@0801A902: add r1, sp, 0x14 movs r0, 0 strb r0, [r1] movs r0, 0x1 strb r0, [r1, 0x1] movs r0, 0x3 - b _0801A938 -_0801A910: + b @0801A938 +@0801A910: add r1, sp, 0x14 movs r0, 0 strb r0, [r1] movs r0, 0x4 strb r0, [r1, 0x1] movs r0, 0x5 - b _0801A938 -_0801A91E: + b @0801A938 +@0801A91E: add r1, sp, 0x14 movs r0, 0 strb r0, [r1] movs r0, 0x7 strb r0, [r1, 0x1] movs r0, 0x6 - b _0801A938 -_0801A92C: + b @0801A938 +@0801A92C: add r1, sp, 0x14 movs r0, 0 strb r0, [r1] movs r0, 0x1 strb r0, [r1, 0x1] movs r0, 0x2 -_0801A938: +@0801A938: strb r0, [r1, 0x2] -_0801A93A: +@0801A93A: movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -35504,7 +35504,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 @@ -35526,7 +35526,7 @@ sub_801A960: @ 801A960 mov r3, r12 adds r3, 0x4 str r3, [sp] -_0801A98A: +@0801A98A: lsls r0, r4, 1 adds r2, r0, r4 mov r3, r9 @@ -35535,56 +35535,56 @@ _0801A98A: adds r6, r4, 0x1 ldrb r1, [r1] cmp r8, r1 - bne _0801A9EE + bne @0801A9EE mov r0, r12 ldrb r1, [r0, 0x1A] movs r0, 0x3 ands r0, r1 cmp r0, 0x1 - bne _0801A9EE + bne @0801A9EE mov r0, r9 adds r0, 0x2 adds r3, r2, r0 ldrb r0, [r3] cmp r0, 0 - bne _0801A9DC + bne @0801A9DC movs r2, 0 movs r1, 0 ldr r3, [sp] -_0801A9BA: +@0801A9BA: adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0 - beq _0801A9C4 + beq @0801A9C4 adds r2, 0x1 -_0801A9C4: +@0801A9C4: adds r1, 0x1 cmp r1, 0x3 - ble _0801A9BA + ble @0801A9BA adds r2, 0x1 adds r0, r5, r4 add r0, r10 ldrb r1, [r0] lsls r1, 2 adds r1, r7 - b _0801A9E8 + b @0801A9E8 .align 2, 0 .pool -_0801A9DC: +@0801A9DC: mov r1, r10 adds r0, r2, r1 ldrb r1, [r0] lsls r1, 2 adds r1, r7 ldrb r2, [r3] -_0801A9E8: +@0801A9E8: ldr r0, [r1] adds r0, r2 str r0, [r1] -_0801A9EE: +@0801A9EE: adds r4, r6, 0 cmp r4, 0x1E - bls _0801A98A + bls @0801A98A mov r0, r8 add sp, 0x4 pop {r3-r5} @@ -35597,33 +35597,33 @@ _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 adds r2, r0, 0 -_0801AA10: +@0801AA10: ldr r1, [r2] ldr r0, [r3] cmp r1, r0 - beq _0801AA1C + beq @0801AA1C movs r0, 0x1 - b _0801AA28 -_0801AA1C: + b @0801AA28 +@0801AA1C: adds r3, 0x4 adds r2, 0x4 adds r4, 0x1 cmp r4, 0x3 - ble _0801AA10 + ble @0801AA10 movs r0, 0 -_0801AA28: +@0801AA28: pop {r4} pop {r1} bx r1 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 @@ -35646,7 +35646,7 @@ sub_801AA30: @ 801AA30 ldr r1, =0x03005e08 adds r7, r0, r1 movs r4, 0 -_0801AA5E: +@0801AA5E: lsls r1, r4, 5 ldr r0, [r7] adds r0, r1 @@ -35655,28 +35655,28 @@ _0801AA5E: adds r1, r0, 0 ldr r0, [r5] cmp r1, r0 - beq _0801AA78 + beq @0801AA78 str r1, [r5] movs r2, 0x1 mov r8, r2 -_0801AA78: +@0801AA78: adds r5, 0x4 adds r4, 0x1 cmp r4, 0xF - ble _0801AA5E + ble @0801AA5E mov r0, sp mov r1, r9 bl sub_801AA08 cmp r0, 0 - bne _0801AA9C + bne @0801AA9C mov r3, r8 cmp r3, 0x1 - beq _0801AAC4 + beq @0801AAC4 movs r0, 0 - b _0801AAC6 + b @0801AAC6 .align 2, 0 .pool -_0801AA9C: +@0801AA9C: adds r1, r6, 0 mov r0, sp ldm r0!, {r2-r4} @@ -35697,9 +35697,9 @@ _0801AA9C: ldr r1, [r6, 0xC] adds r0, r1 str r0, [r6, 0xC] -_0801AAC4: +@0801AAC4: movs r0, 0x1 -_0801AAC6: +@0801AAC6: add sp, 0x10 pop {r3,r4} mov r8, r3 @@ -35710,7 +35710,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 @@ -35718,7 +35718,7 @@ sub_801AAD4: @ 801AAD4 movs r7, 0x64 ldr r6, =0x020244ec ldr r5, =0x02024744 -_0801AAE4: +@0801AAE4: ldr r0, =0x0203cef8 adds r0, r4, r0 ldrb r0, [r0] @@ -35732,22 +35732,22 @@ _0801AAE4: adds r5, 0x64 adds r4, 0x1 cmp r4, 0x1 - ble _0801AAE4 + ble @0801AAE4 ldr r4, =0x020244ec movs r0, 0xFA lsls r0, 1 adds r5, r4, r0 -_0801AB0A: +@0801AB0A: adds r0, r4, 0 bl zero_pokemon_struct adds r4, 0x64 cmp r4, r5 - ble _0801AB0A + ble @0801AB0A ldr r4, =0x020244ec movs r5, 0 adds r6, r4, 0 adds r6, 0x64 -_0801AB1E: +@0801AB1E: ldr r1, =0x02024744 adds r1, r5, r1 adds r0, r4, 0 @@ -35756,7 +35756,7 @@ _0801AB1E: adds r4, 0x64 adds r5, 0x64 cmp r4, r6 - ble _0801AB1E + ble @0801AB1E movs r0, 0x32 bl sav12_xor_increment bl calc_player_party_count @@ -35775,7 +35775,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 @@ -35834,7 +35834,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 @@ -35843,11 +35843,11 @@ sub_801ABDC: @ 801ABDC movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0 - beq _0801ABF4 + beq @0801ABF4 cmp r0, 0x1 - beq _0801AC22 - b _0801AC36 -_0801ABF4: + beq @0801AC22 + b @0801AC36 +@0801ABF4: movs r0, 0 movs r1, 0x1 movs r2, 0xD @@ -35866,20 +35866,20 @@ _0801ABF4: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - b _0801AC36 -_0801AC22: + b @0801AC36 +@0801AC22: movs r0, 0 bl a_pressed_maybe lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne _0801AC36 + bne @0801AC36 strh r0, [r4] movs r0, 0x1 - b _0801AC38 -_0801AC36: + b @0801AC38 +@0801AC36: movs r0, 0 -_0801AC38: +@0801AC38: add sp, 0x4 pop {r4-r6} pop {r1} @@ -35887,7 +35887,7 @@ _0801AC38: thumb_func_end sub_801ABDC thumb_func_start sub_801AC40 -sub_801AC40: @ 801AC40 +sub_801AC40: ; 801AC40 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -35897,7 +35897,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 @@ -35907,71 +35907,71 @@ sub_801AC54: @ 801AC54 ldrb r0, [r0] adds r2, r1, 0 cmp r0, 0x33 - bls _0801AC6A - b _0801AFAE -_0801AC6A: + bls @0801AC6A + b @0801AFAE +@0801AC6A: lsls r0, 2 - ldr r1, =_0801AC7C + ldr r1, =@0801AC7C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801AC7C: - .4byte _0801AD4C - .4byte _0801ADFC - .4byte _0801AE24 - .4byte _0801AE48 - .4byte _0801AE98 - .4byte _0801AFAE - .4byte _0801AF7C - .4byte _0801AF58 - .4byte _0801AF7C - .4byte _0801AF98 - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AFAE - .4byte _0801AF24 - .4byte _0801AF40 -_0801AD4C: +@0801AC7C: + .4byte @0801AD4C + .4byte @0801ADFC + .4byte @0801AE24 + .4byte @0801AE48 + .4byte @0801AE98 + .4byte @0801AFAE + .4byte @0801AF7C + .4byte @0801AF58 + .4byte @0801AF7C + .4byte @0801AF98 + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AFAE + .4byte @0801AF24 + .4byte @0801AF40 +@0801AD4C: movs r0, 0 movs r1, 0 bl lcd_io_set @@ -35993,9 +35993,9 @@ _0801AD4C: bl Window_InitFromTemplates lsls r0, 16 cmp r0, 0 - bne _0801AD8C - b _0801AFC2 -_0801AD8C: + bne @0801AD8C + b @0801AFC2 +@0801AD8C: bl TextBox_ResetSomeField movs r0, 0 bl Window_FillTileMap @@ -36031,27 +36031,27 @@ _0801AD8C: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _0801AF8A + b @0801AF8A .align 2, 0 .pool -_0801ADFC: +@0801ADFC: ldr r0, =0x02022c6c ldr r0, [r0] ldr r1, =0x085efbd2 movs r2, 0 bl sub_801ABDC cmp r0, 0 - bne _0801AE0E - b _0801AFAE -_0801AE0E: + bne @0801AE0E + b @0801AFAE +@0801AE0E: ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _0801AF8A + b @0801AF8A .align 2, 0 .pool -_0801AE24: +@0801AE24: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -36065,16 +36065,16 @@ _0801AE24: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _0801AF8A + b @0801AF8A .align 2, 0 .pool -_0801AE48: +@0801AE48: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - beq _0801AE54 - b _0801AFAE -_0801AE54: + beq @0801AE54 + b @0801AFAE +@0801AE54: ldr r4, =0x020228c4 adds r0, r4, 0 movs r1, 0 @@ -36084,14 +36084,14 @@ _0801AE54: ldrb r1, [r0] ldrb r0, [r0, 0x1] cmn r1, r0 - bne _0801AE78 + bne @0801AE78 movs r0, 0x52 - b _0801AE7A + b @0801AE7A .align 2, 0 .pool -_0801AE78: +@0801AE78: movs r0, 0x51 -_0801AE7A: +@0801AE7A: strb r0, [r4] ldr r1, =0x020228c4 movs r0, 0 @@ -36101,27 +36101,27 @@ _0801AE7A: movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _0801AF8A + b @0801AF8A .align 2, 0 .pool -_0801AE98: +@0801AE98: bl sub_800A550 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - beq _0801AEA6 - b _0801AFAE -_0801AEA6: + beq @0801AEA6 + b @0801AFAE +@0801AEA6: ldr r1, =0x020223c4 ldrh r0, [r1] cmp r0, 0x51 - bne _0801AEE0 + bne @0801AEE0 movs r2, 0x80 lsls r2, 1 adds r0, r1, r2 ldrh r0, [r0] cmp r0, 0x51 - bne _0801AEE0 + bne @0801AEE0 movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -36134,10 +36134,10 @@ _0801AEA6: lsls r1, 3 adds r0, r1 movs r1, 0x32 - b _0801AF16 + b @0801AF16 .align 2, 0 .pool -_0801AEE0: +@0801AEE0: bl sub_800AC34 ldr r4, =0x020223c4 bl link_get_multiplayer_id @@ -36146,95 +36146,95 @@ _0801AEE0: adds r0, r4 ldrh r0, [r0] cmp r0, 0x52 - bne _0801AF0C + bne @0801AF0C ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r2 movs r1, 0x6 - b _0801AF16 + b @0801AF16 .align 2, 0 .pool -_0801AF0C: +@0801AF0C: ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 movs r1, 0x8 -_0801AF16: +@0801AF16: strb r1, [r0] bl sub_800A5B4 - b _0801AFAE + b @0801AFAE .align 2, 0 .pool -_0801AF24: +@0801AF24: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne _0801AFAE + bne @0801AFAE bl sub_800ADF8 ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _0801AF8A + b @0801AF8A .align 2, 0 .pool -_0801AF40: +@0801AF40: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _0801AFAE + beq @0801AFAE ldr r0, =sub_801AAD4 + 1 bl set_callback2 - b _0801AFAE + b @0801AFAE .align 2, 0 .pool -_0801AF58: +@0801AF58: ldr r0, =0x02022c6c ldr r0, [r0] ldr r1, =0x085efc27 movs r2, 0x1 bl sub_801ABDC cmp r0, 0 - beq _0801AFAE + beq @0801AFAE ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 - b _0801AFAE + b @0801AFAE .align 2, 0 .pool -_0801AF7C: +@0801AF7C: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _0801AFAE + bne @0801AFAE movs r0, 0x87 lsls r0, 3 adds r1, r2, r0 -_0801AF8A: +@0801AF8A: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0801AFAE + b @0801AFAE .align 2, 0 .pool -_0801AF98: +@0801AF98: ldr r0, =0x02022c6c ldr r0, [r0] ldr r1, =0x085efc0c movs r2, 0x1 bl sub_801ABDC cmp r0, 0 - beq _0801AFAE + beq @0801AFAE ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 -_0801AFAE: +@0801AFAE: bl run_active_tasks bl run_remoboxes bl call_obj_callbacks bl obj_sync_something bl fade_and_return_progress_probably -_0801AFC2: +@0801AFC2: add sp, 0xC pop {r4} pop {r0} @@ -36244,7 +36244,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 @@ -36266,7 +36266,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 @@ -36277,7 +36277,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 @@ -36288,7 +36288,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 @@ -36300,7 +36300,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 @@ -36311,7 +36311,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 @@ -36322,7 +36322,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} @@ -36330,12 +36330,12 @@ 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 cmp r0, 0 - beq _0801B0C4 + beq @0801B0C4 bl sub_801B14C ldr r4, =0x03005d8c ldr r0, [r4] @@ -36357,19 +36357,19 @@ sub_801B078: @ 801B078 lsrs r0, 16 str r0, [r1] movs r0, 0x1 - b _0801B0C6 + b @0801B0C6 .align 2, 0 .pool -_0801B0C4: +@0801B0C4: movs r0, 0 -_0801B0C6: +@0801B0C6: pop {r4-r7} pop {r1} bx r1 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] @@ -36385,41 +36385,41 @@ sub_801B0CC: @ 801B0CC adds r1, r4, r2 ldr r1, [r1] cmp r0, r1 - bne _0801B10C + bne @0801B10C ldr r1, =0x00003230 adds r0, r4, r1 bl sub_801B114 cmp r0, 0 - beq _0801B10C + beq @0801B10C movs r0, 0x1 - b _0801B10E + b @0801B10E .align 2, 0 .pool -_0801B10C: +@0801B10C: movs r0, 0 -_0801B10E: +@0801B10E: pop {r4} pop {r1} bx r1 thumb_func_end sub_801B0CC thumb_func_start sub_801B114 -sub_801B114: @ 801B114 +sub_801B114: ; 801B114 push {lr} ldrh r0, [r0] cmp r0, 0 - beq _0801B120 + beq @0801B120 movs r0, 0x1 - b _0801B122 -_0801B120: + b @0801B122 +@0801B120: movs r0, 0 -_0801B122: +@0801B122: pop {r1} bx r1 thumb_func_end sub_801B114 thumb_func_start sub_801B128 -sub_801B128: @ 801B128 +sub_801B128: ; 801B128 push {lr} ldr r0, =0x03005d8c ldr r0, [r0] @@ -36427,20 +36427,20 @@ sub_801B128: @ 801B128 adds r0, r1 ldrb r0, [r0, 0x2] cmp r0, 0 - beq _0801B144 + beq @0801B144 movs r0, 0x1 - b _0801B146 + b @0801B146 .align 2, 0 .pool -_0801B144: +@0801B144: movs r0, 0 -_0801B146: +@0801B146: pop {r1} bx r1 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 @@ -36464,7 +36464,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 @@ -36483,7 +36483,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 @@ -36492,27 +36492,27 @@ sub_801B1A4: @ 801B1A4 adds r4, r0, r1 bl sub_801B0CC cmp r0, 0 - bne _0801B1C4 -_0801B1B8: + bne @0801B1C4 +@0801B1B8: movs r0, 0 - b _0801B1DC + b @0801B1DC .align 2, 0 .pool -_0801B1C4: +@0801B1C4: movs r2, 0 ldr r3, =0x000001bb -_0801B1C8: +@0801B1C8: adds r0, r4, r2 adds r1, r5, r2 ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bne _0801B1B8 + bne @0801B1B8 adds r2, 0x1 cmp r2, r3 - bls _0801B1C8 + bls @0801B1C8 movs r0, 0x1 -_0801B1DC: +@0801B1DC: pop {r4,r5} pop {r1} bx r1 @@ -36521,7 +36521,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 @@ -36541,12 +36541,12 @@ 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 cmp r0, 0 - beq _0801B274 + beq @0801B274 bl sub_801B1E8 ldr r4, =0x03005d8c ldr r0, [r4] @@ -36574,19 +36574,19 @@ sub_801B21C: @ 801B21C ldrh r0, [r1, 0x2] strh r0, [r2, 0x6] movs r0, 0x1 - b _0801B276 + b @0801B276 .align 2, 0 .pool -_0801B274: +@0801B274: movs r0, 0 -_0801B276: +@0801B276: pop {r4-r7} pop {r1} bx r1 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] @@ -36601,67 +36601,67 @@ sub_801B27C: @ 801B27C lsrs r0, 16 ldr r1, [r4] cmp r1, r0 - bne _0801B2C4 + bne @0801B2C4 ldr r0, [r5] ldr r1, =0x000033f0 adds r0, r1 bl sub_801B2CC cmp r0, 0 - beq _0801B2C4 + beq @0801B2C4 bl sub_80991F8 cmp r0, 0 - beq _0801B2C4 + beq @0801B2C4 movs r0, 0x1 - b _0801B2C6 + b @0801B2C6 .align 2, 0 .pool -_0801B2C4: +@0801B2C4: movs r0, 0 -_0801B2C6: +@0801B2C6: pop {r4,r5} pop {r1} bx r1 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] cmp r0, 0 - beq _0801B302 + beq @0801B302 ldrb r1, [r2, 0x8] lsls r0, r1, 30 lsrs r0, 30 cmp r0, 0x2 - bhi _0801B302 + bhi @0801B302 movs r0, 0xC0 ands r0, r1 cmp r0, 0 - beq _0801B2F0 + beq @0801B2F0 cmp r0, 0x40 - beq _0801B2F0 + beq @0801B2F0 cmp r0, 0x80 - bne _0801B302 -_0801B2F0: + bne @0801B302 +@0801B2F0: lsls r0, r1, 26 lsrs r0, 28 cmp r0, 0x7 - bhi _0801B302 + bhi @0801B302 ldrb r0, [r2, 0x9] cmp r0, 0x7 - bhi _0801B302 + bhi @0801B302 movs r0, 0x1 - b _0801B304 -_0801B302: + b @0801B304 +@0801B302: movs r0, 0 -_0801B304: +@0801B304: pop {r1} bx r1 thumb_func_end sub_801B2CC thumb_func_start sub_801B308 -sub_801B308: @ 801B308 +sub_801B308: ; 801B308 push {lr} ldr r0, =0x03005d8c ldr r0, [r0] @@ -36671,20 +36671,20 @@ sub_801B308: @ 801B308 movs r0, 0xC0 ands r0, r1 cmp r0, 0 - beq _0801B328 + beq @0801B328 movs r0, 0x1 - b _0801B32A + b @0801B32A .align 2, 0 .pool -_0801B328: +@0801B328: movs r0, 0 -_0801B32A: +@0801B32A: pop {r1} bx r1 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 @@ -36709,7 +36709,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 @@ -36733,20 +36733,20 @@ 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 - bne _0801B3AA + bne @0801B3AA movs r0, 0 - b _0801B3B4 -_0801B3AA: + b @0801B3B4 +@0801B3AA: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000033f0 adds r0, r1 ldrh r0, [r0] -_0801B3B4: +@0801B3B4: pop {r1} bx r1 .align 2, 0 @@ -36754,44 +36754,44 @@ _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] movs r0, 0xC0 ands r0, r1 cmp r0, 0x40 - bne _0801B3D4 + bne @0801B3D4 movs r0, 0x3F ands r0, r1 strb r0, [r2, 0x8] -_0801B3D4: +@0801B3D4: pop {r0} bx r0 thumb_func_end sub_801B3C0 thumb_func_start sub_801B3D8 -sub_801B3D8: @ 801B3D8 +sub_801B3D8: ; 801B3D8 push {lr} lsls r0, 16 ldr r1, =0xfc180000 adds r0, r1 lsrs r0, 16 cmp r0, 0x13 - bls _0801B3F0 + bls @0801B3F0 movs r0, 0 - b _0801B3F2 + b @0801B3F2 .align 2, 0 .pool -_0801B3F0: +@0801B3F0: movs r0, 0x1 -_0801B3F2: +@0801B3F2: pop {r1} bx r1 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 @@ -36799,7 +36799,7 @@ sub_801B3F8: @ 801B3F8 adds r0, r4, 0 bl sub_801B3D8 cmp r0, 0 - beq _0801B430 + beq @0801B430 ldr r1, =0x082f0de8 ldr r2, =0xfffffc18 adds r0, r4, r2 @@ -36810,118 +36810,118 @@ sub_801B3F8: @ 801B3F8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0801B430 + beq @0801B430 movs r0, 0x1 - b _0801B432 + b @0801B432 .align 2, 0 .pool -_0801B430: +@0801B430: movs r0, 0 -_0801B432: +@0801B432: pop {r4} pop {r1} bx r1 thumb_func_end sub_801B3F8 thumb_func_start sub_801B438 -sub_801B438: @ 801B438 +sub_801B438: ; 801B438 push {lr} movs r3, 0 cmp r3, r1 - bge _0801B45A + bge @0801B45A adds r2, r0, 0 adds r2, 0x8 -_0801B444: +@0801B444: ldrh r0, [r2, 0xE] cmp r0, 0 - beq _0801B452 + beq @0801B452 ldrh r0, [r2] cmp r0, 0 - beq _0801B452 + beq @0801B452 adds r3, 0x1 -_0801B452: +@0801B452: adds r2, 0x2 subs r1, 0x1 cmp r1, 0 - bne _0801B444 -_0801B45A: + bne @0801B444 +@0801B45A: adds r0, r3, 0 pop {r1} bx r1 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 movs r1, 0 cmp r1, r2 - bge _0801B49A + bge @0801B49A ldrh r6, [r4, 0x2] movs r0, 0x16 adds r0, r5 mov r12, r0 -_0801B474: +@0801B474: lsls r3, r1, 1 mov r7, r12 ldrh r0, [r7] cmp r0, r6 - beq _0801B48C + beq @0801B48C adds r0, r5, 0 adds r0, 0x8 adds r0, r3 ldrh r0, [r0] ldrh r3, [r4] cmp r0, r3 - bne _0801B490 -_0801B48C: + bne @0801B490 +@0801B48C: movs r0, 0x1 - b _0801B49C -_0801B490: + b @0801B49C +@0801B490: movs r7, 0x2 add r12, r7 adds r1, 0x1 cmp r1, r2 - blt _0801B474 -_0801B49A: + blt @0801B474 +@0801B49A: movs r0, 0 -_0801B49C: +@0801B49C: pop {r4-r7} pop {r1} bx r1 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] cmp r0, 0 - beq _0801B4C4 + beq @0801B4C4 ldrh r1, [r1] cmp r1, 0 - beq _0801B4C4 + beq @0801B4C4 ldr r0, =0x0000019b cmp r1, r0 - bhi _0801B4C4 + bhi @0801B4C4 movs r0, 0x1 - b _0801B4C6 + b @0801B4C6 .align 2, 0 .pool -_0801B4C4: +@0801B4C4: movs r0, 0 -_0801B4C6: +@0801B4C6: pop {r1} bx r1 thumb_func_end sub_801B4A4 thumb_func_start sub_801B4CC -sub_801B4CC: @ 801B4CC +sub_801B4CC: ; 801B4CC push {lr} bl sub_801B27C cmp r0, 0 - beq _0801B500 + beq @0801B500 ldr r0, =0x03005d8c ldr r3, [r0] ldr r0, =0x000033f0 @@ -36930,24 +36930,24 @@ sub_801B4CC: @ 801B4CC movs r0, 0x3 ands r0, r1 cmp r0, 0x1 - bne _0801B500 + bne @0801B500 movs r1, 0xD5 lsls r1, 6 adds r0, r3, r1 ldrb r1, [r2, 0x9] bl sub_801B438 - b _0801B502 + b @0801B502 .align 2, 0 .pool -_0801B500: +@0801B500: movs r0, 0 -_0801B502: +@0801B502: pop {r1} bx r1 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 @@ -36958,7 +36958,7 @@ sub_801B508: @ 801B508 adds r0, r5, 0 bl sub_801B4A4 cmp r0, 0 - beq _0801B572 + beq @0801B572 ldr r0, [r6] movs r1, 0xD5 lsls r1, 6 @@ -36967,42 +36967,42 @@ sub_801B508: @ 801B508 adds r2, r4, 0 bl sub_801B460 cmp r0, 0 - beq _0801B54C - b _0801B572 + beq @0801B54C + b @0801B572 .align 2, 0 .pool -_0801B540: +@0801B540: ldrh r0, [r5, 0x2] strh r0, [r1] ldrh r0, [r5] strh r0, [r2] movs r0, 0x1 - b _0801B574 -_0801B54C: + b @0801B574 +@0801B54C: movs r3, 0 cmp r3, r4 - bge _0801B572 + bge @0801B572 ldr r0, [r6] ldr r6, =0x00003548 adds r2, r0, r6 adds r6, 0xE adds r1, r0, r6 -_0801B55C: +@0801B55C: ldrh r0, [r2, 0xE] cmp r0, 0 - bne _0801B568 + bne @0801B568 ldrh r0, [r2] cmp r0, 0 - beq _0801B540 -_0801B568: + beq @0801B540 +@0801B568: adds r2, 0x2 adds r1, 0x2 adds r3, 0x1 cmp r3, r4 - blt _0801B55C -_0801B572: + blt @0801B55C +@0801B572: movs r0, 0 -_0801B574: +@0801B574: pop {r4-r6} pop {r1} bx r1 @@ -37011,7 +37011,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 @@ -37032,23 +37032,23 @@ sub_801B580: @ 801B580 strh r0, [r5, 0x4] str r0, [r5, 0x8] cmp r4, 0 - beq _0801B5C0 + beq @0801B5C0 movs r0, 0x5 strh r0, [r5, 0xC] ldr r0, =0x00000201 - b _0801B5C8 + b @0801B5C8 .align 2, 0 .pool -_0801B5C0: +@0801B5C0: movs r0, 0x4 strh r0, [r5, 0xC] movs r0, 0x80 lsls r0, 2 -_0801B5C8: +@0801B5C8: str r0, [r5, 0x10] bl sub_801B27C cmp r0, 0 - beq _0801B5FC + beq @0801B5FC bl sav1_get_mevent_buffer_1 ldrh r0, [r0] strh r0, [r5, 0x14] @@ -37066,10 +37066,10 @@ _0801B5C8: adds r0, r5, 0 adds r0, 0x44 strb r1, [r0] - b _0801B5FE -_0801B5FC: + b @0801B5FE +@0801B5FC: strh r0, [r5, 0x14] -_0801B5FE: +@0801B5FE: adds r4, r5, 0 adds r4, 0x4C ldr r0, =0x03005d90 @@ -37091,14 +37091,14 @@ _0801B5FE: adds r1, r5, 0 adds r1, 0x16 movs r3, 0x3 -_0801B628: +@0801B628: ldrh r0, [r2] strh r0, [r1] adds r2, 0x2 adds r1, 0x2 subs r3, 0x1 cmp r3, 0 - bge _0801B628 + bge @0801B628 mov r0, r8 ldr r1, [r0] adds r1, 0xA @@ -37114,14 +37114,14 @@ _0801B628: adds r2, r0, r3 adds r1, r7, 0 movs r3, 0x5 -_0801B658: +@0801B658: ldrh r0, [r2] strh r0, [r1] adds r2, 0x2 adds r1, 0x2 subs r3, 0x1 cmp r3, 0 - bge _0801B658 + bge @0801B658 ldr r1, =RomHeaderGameCode mov r0, r9 movs r2, 0x4 @@ -37143,73 +37143,73 @@ _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 ldr r1, [r2] ldr r0, =0x00000101 cmp r1, r0 - bne _0801B6DC + bne @0801B6DC ldrh r1, [r2, 0x4] movs r3, 0x1 adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _0801B6DC + beq @0801B6DC ldr r0, [r2, 0x8] ands r0, r3 cmp r0, 0 - beq _0801B6DC + beq @0801B6DC cmp r4, 0 - bne _0801B6E4 + bne @0801B6E4 ldrh r1, [r2, 0xC] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0801B6DC + beq @0801B6DC ldr r0, [r2, 0x10] movs r1, 0xE0 lsls r1, 2 ands r0, r1 cmp r0, 0 - bne _0801B6E4 -_0801B6DC: + bne @0801B6E4 +@0801B6DC: movs r0, 0 - b _0801B6E6 + b @0801B6E6 .align 2, 0 .pool -_0801B6E4: +@0801B6E4: movs r0, 0x1 -_0801B6E6: +@0801B6E6: pop {r4} pop {r1} bx r1 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 - bne _0801B6F8 + bne @0801B6F8 movs r0, 0 - b _0801B704 -_0801B6F8: + b @0801B704 +@0801B6F8: ldrh r0, [r0] cmp r0, r1 - beq _0801B702 + beq @0801B702 movs r0, 0x2 - b _0801B704 -_0801B702: + b @0801B704 +@0801B702: movs r0, 0x1 -_0801B704: +@0801B704: pop {r1} bx r1 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 @@ -37222,58 +37222,58 @@ sub_801B708: @ 801B708 ldrb r2, [r4] subs r4, r2, r0 cmp r4, 0 - bne _0801B728 + bne @0801B728 movs r0, 0x1 - b _0801B742 -_0801B728: + b @0801B742 +@0801B728: adds r0, r5, 0 adds r1, r6, 0 bl sub_801B460 cmp r0, 0 - beq _0801B738 + beq @0801B738 movs r0, 0x3 - b _0801B742 -_0801B738: + b @0801B742 +@0801B738: cmp r4, 0x1 - beq _0801B740 + beq @0801B740 movs r0, 0x2 - b _0801B742 -_0801B740: + b @0801B742 +@0801B740: movs r0, 0x4 -_0801B742: +@0801B742: pop {r4-r6} pop {r1} bx r1 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 adds r2, 0x16 -_0801B750: +@0801B750: ldrh r0, [r2] ldrh r4, [r1] cmp r0, r4 - beq _0801B75C + beq @0801B75C movs r0, 0 - b _0801B768 -_0801B75C: + b @0801B768 +@0801B75C: adds r1, 0x2 adds r2, 0x2 adds r3, 0x1 cmp r3, 0x3 - ble _0801B750 + ble @0801B750 movs r0, 0x1 -_0801B768: +@0801B768: pop {r4} pop {r1} bx r1 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 @@ -37286,54 +37286,54 @@ 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 - bhi _0801B7D0 + bhi @0801B7D0 lsls r0, r1, 2 - ldr r1, =_0801B79C + ldr r1, =@0801B79C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801B79C: - .4byte _0801B7B0 - .4byte _0801B7B4 - .4byte _0801B7B8 - .4byte _0801B7BC - .4byte _0801B7C8 -_0801B7B0: +@0801B79C: + .4byte @0801B7B0 + .4byte @0801B7B4 + .4byte @0801B7B8 + .4byte @0801B7BC + .4byte @0801B7C8 +@0801B7B0: ldrh r0, [r2, 0x20] - b _0801B7D2 -_0801B7B4: + b @0801B7D2 +@0801B7B4: ldrh r0, [r2, 0x22] - b _0801B7D2 -_0801B7B8: + b @0801B7D2 +@0801B7B8: ldrh r0, [r2, 0x24] - b _0801B7D2 -_0801B7BC: + b @0801B7D2 +@0801B7BC: adds r0, r2, 0 bl sub_801B770 lsls r0, 16 lsrs r0, 16 - b _0801B7D2 -_0801B7C8: + b @0801B7D2 +@0801B7C8: adds r0, r2, 0 adds r0, 0x44 ldrb r0, [r0] - b _0801B7D2 -_0801B7D0: + b @0801B7D2 +@0801B7D0: movs r0, 0 -_0801B7D2: +@0801B7D2: pop {r1} bx r1 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 @@ -37345,43 +37345,43 @@ sub_801B7D8: @ 801B7D8 ands r0, r1 adds r3, r2, 0 cmp r0, 0x2 - bne _0801B850 + bne @0801B850 movs r2, 0 cmp r4, 0x4 - bhi _0801B83A + bhi @0801B83A lsls r0, r4, 2 - ldr r1, =_0801B80C + ldr r1, =@0801B80C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801B80C: - .4byte _0801B820 - .4byte _0801B828 - .4byte _0801B834 - .4byte _0801B83A - .4byte _0801B83A -_0801B820: +@0801B80C: + .4byte @0801B820 + .4byte @0801B828 + .4byte @0801B834 + .4byte @0801B83A + .4byte @0801B83A +@0801B820: ldr r0, [r3] movs r1, 0xD5 lsls r1, 6 - b _0801B838 -_0801B828: + b @0801B838 +@0801B828: ldr r0, [r3] ldr r1, =0x00003542 - b _0801B838 + b @0801B838 .align 2, 0 .pool -_0801B834: +@0801B834: ldr r0, [r3] ldr r1, =0x00003544 -_0801B838: +@0801B838: adds r2, r0, r1 -_0801B83A: +@0801B83A: cmp r2, 0 - beq _0801B850 + beq @0801B850 ldrh r0, [r2] adds r0, 0x1 strh r0, [r2] @@ -37389,9 +37389,9 @@ _0801B83A: lsrs r0, 16 ldr r1, =0x000003e7 cmp r0, r1 - bls _0801B850 + bls @0801B850 strh r1, [r2] -_0801B850: +@0801B850: pop {r4} pop {r0} bx r0 @@ -37400,25 +37400,25 @@ _0801B850: thumb_func_end sub_801B7D8 thumb_func_start mevent_081445C0 -mevent_081445C0: @ 801B860 +mevent_081445C0: ; 801B860 push {lr} cmp r0, 0x4 - bhi _0801B938 + bhi @0801B938 lsls r0, 2 - ldr r1, =_0801B874 + ldr r1, =@0801B874 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801B874: - .4byte _0801B888 - .4byte _0801B8AC - .4byte _0801B8D0 - .4byte _0801B8F4 - .4byte _0801B918 -_0801B888: +@0801B874: + .4byte @0801B888 + .4byte @0801B8AC + .4byte @0801B8D0 + .4byte @0801B8F4 + .4byte @0801B918 +@0801B888: ldr r0, =0x03005d8c ldr r2, [r0] ldr r1, =0x000033f0 @@ -37427,15 +37427,15 @@ _0801B888: movs r0, 0x3 ands r0, r1 cmp r0, 0x2 - bne _0801B938 + bne @0801B938 movs r1, 0xD5 lsls r1, 6 adds r0, r2, r1 ldrh r0, [r0] - b _0801B93A + b @0801B93A .align 2, 0 .pool -_0801B8AC: +@0801B8AC: ldr r0, =0x03005d8c ldr r2, [r0] ldr r1, =0x000033f0 @@ -37444,15 +37444,15 @@ _0801B8AC: movs r0, 0x3 ands r0, r1 cmp r0, 0x2 - bne _0801B938 + bne @0801B938 movs r1, 0xD5 lsls r1, 6 adds r0, r2, r1 ldrh r0, [r0, 0x2] - b _0801B93A + b @0801B93A .align 2, 0 .pool -_0801B8D0: +@0801B8D0: ldr r0, =0x03005d8c ldr r2, [r0] ldr r1, =0x000033f0 @@ -37461,15 +37461,15 @@ _0801B8D0: movs r0, 0x3 ands r0, r1 cmp r0, 0x2 - bne _0801B938 + bne @0801B938 movs r1, 0xD5 lsls r1, 6 adds r0, r2, r1 ldrh r0, [r0, 0x4] - b _0801B93A + b @0801B93A .align 2, 0 .pool -_0801B8F4: +@0801B8F4: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000033f0 @@ -37478,14 +37478,14 @@ _0801B8F4: movs r0, 0x3 ands r0, r1 cmp r0, 0x1 - bne _0801B938 + bne @0801B938 bl sub_801B4CC lsls r0, 16 lsrs r0, 16 - b _0801B93A + b @0801B93A .align 2, 0 .pool -_0801B918: +@0801B918: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000033f0 @@ -37494,20 +37494,20 @@ _0801B918: movs r0, 0x3 ands r0, r1 cmp r0, 0x1 - bne _0801B938 + bne @0801B938 ldrb r0, [r2, 0x9] - b _0801B93A + b @0801B93A .align 2, 0 .pool -_0801B938: +@0801B938: movs r0, 0 -_0801B93A: +@0801B93A: pop {r1} bx r1 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] @@ -37517,7 +37517,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 @@ -37526,65 +37526,65 @@ sub_801B94C: @ 801B94C movs r0, 0 str r0, [r5] cmp r4, 0 - beq _0801B98A + beq @0801B98A bl sub_801B27C cmp r0, 0 - beq _0801B988 + beq @0801B988 ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000033f0 adds r0, r1 ldrh r0, [r0] cmp r0, r4 - bne _0801B988 + bne @0801B988 movs r0, 0x1 str r0, [r5] - b _0801B98A + b @0801B98A .align 2, 0 .pool -_0801B988: +@0801B988: movs r0, 0 -_0801B98A: +@0801B98A: pop {r4,r5} pop {r1} bx r1 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 ldr r0, [r0] cmp r0, 0 - beq _0801B9EC + beq @0801B9EC cmp r2, 0x1 - beq _0801B9DC + beq @0801B9DC cmp r2, 0x1 - bcc _0801B9C0 + bcc @0801B9C0 cmp r2, 0x2 - bne _0801B9EC + bne @0801B9EC ldr r0, =0x03005d8c ldr r2, [r0] ldr r0, =0x00003584 adds r2, r0 movs r0, 0x2 - b _0801B9CA + b @0801B9CA .align 2, 0 .pool -_0801B9C0: +@0801B9C0: ldr r0, =0x03005d8c ldr r2, [r0] ldr r0, =0x00003570 adds r2, r0 movs r0, 0 -_0801B9CA: +@0801B9CA: movs r3, 0x5 bl sub_801BA8C - b _0801B9EC + b @0801B9EC .align 2, 0 .pool -_0801B9DC: +@0801B9DC: ldr r0, =0x03005d8c ldr r2, [r0] ldr r0, =0x00003570 @@ -37592,7 +37592,7 @@ _0801B9DC: movs r0, 0x1 movs r3, 0x5 bl sub_801BA8C -_0801B9EC: +@0801B9EC: pop {r0} bx r0 .align 2, 0 @@ -37600,7 +37600,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 @@ -37620,70 +37620,70 @@ 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 movs r1, 0 cmp r1, r2 - bge _0801BA46 + bge @0801BA46 ldr r0, [r4] cmp r0, r5 - beq _0801BA46 + beq @0801BA46 adds r3, r4, 0 -_0801BA38: +@0801BA38: adds r3, 0x4 adds r1, 0x1 cmp r1, r2 - bge _0801BA46 + bge @0801BA46 ldr r0, [r3] cmp r0, r5 - bne _0801BA38 -_0801BA46: + bne @0801BA38 +@0801BA46: cmp r1, r2 - bne _0801BA68 + bne @0801BA68 subs r3, r1, 0x1 cmp r3, 0 - ble _0801BA62 + ble @0801BA62 lsls r0, r3, 2 subs r0, 0x4 adds r2, r0, r4 -_0801BA56: +@0801BA56: ldr r0, [r2] str r0, [r2, 0x4] subs r2, 0x4 subs r3, 0x1 cmp r3, 0 - bgt _0801BA56 -_0801BA62: + bgt @0801BA56 +@0801BA62: str r5, [r4] movs r0, 0x1 - b _0801BA84 -_0801BA68: + b @0801BA84 +@0801BA68: adds r3, r1, 0 cmp r3, 0 - ble _0801BA80 + ble @0801BA80 lsls r0, r3, 2 subs r0, 0x4 adds r2, r0, r4 -_0801BA74: +@0801BA74: ldr r0, [r2] str r0, [r2, 0x4] subs r2, 0x4 subs r3, 0x1 cmp r3, 0 - bgt _0801BA74 -_0801BA80: + bgt @0801BA74 +@0801BA80: str r5, [r4] movs r0, 0 -_0801BA84: +@0801BA84: pop {r4,r5} pop {r1} bx r1 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 @@ -37691,36 +37691,36 @@ sub_801BA8C: @ 801BA8C adds r2, r3, 0 bl sub_801BA24 cmp r0, 0 - beq _0801BAA4 + beq @0801BAA4 adds r0, r4, 0 bl sub_801B7D8 -_0801BAA4: +@0801BAA4: pop {r4} pop {r0} bx r0 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 cmp r5, 0 - beq _0801BAC8 + beq @0801BAC8 cmp r6, 0 - beq _0801BAC8 + beq @0801BAC8 ldr r7, =0x02022c74 ldr r0, =0x0000145c bl malloc_and_clear str r0, [r7] cmp r0, 0 - bne _0801BAD4 -_0801BAC8: + bne @0801BAD4 +@0801BAC8: movs r0, 0 - b _0801BB3E + b @0801BB3E .align 2, 0 .pool -_0801BAD4: +@0801BAD4: movs r4, 0xA6 lsls r4, 1 adds r1, r5, 0 @@ -37740,30 +37740,30 @@ _0801BAD4: lsls r0, r1, 26 lsrs r0, 28 cmp r0, 0x7 - bls _0801BB06 + bls @0801BB06 movs r0, 0x3D negs r0, r0 ands r0, r1 strb r0, [r2, 0x8] -_0801BB06: +@0801BB06: ldr r2, [r7] ldrb r1, [r2, 0x8] lsls r0, r1, 30 lsrs r0, 30 cmp r0, 0x2 - bls _0801BB1A + bls @0801BB1A movs r0, 0x4 negs r0, r0 ands r0, r1 strb r0, [r2, 0x8] -_0801BB1A: +@0801BB1A: ldr r1, [r7] ldrb r0, [r1, 0x9] cmp r0, 0x7 - bls _0801BB26 + bls @0801BB26 movs r0, 0 strb r0, [r1, 0x9] -_0801BB26: +@0801BB26: ldr r0, [r7] movs r1, 0xB8 lsls r1, 1 @@ -37776,7 +37776,7 @@ _0801BB26: adds r0, r1 str r0, [r2] movs r0, 0x1 -_0801BB3E: +@0801BB3E: pop {r4-r7} pop {r1} bx r1 @@ -37785,12 +37785,12 @@ _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] cmp r0, 0 - beq _0801BB64 + beq @0801BB64 ldr r2, =0x0000145c movs r1, 0 bl memset @@ -37798,7 +37798,7 @@ sub_801BB48: @ 801BB48 bl free movs r0, 0 str r0, [r4] -_0801BB64: +@0801BB64: pop {r4} pop {r0} bx r0 @@ -37807,45 +37807,45 @@ _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 ldr r0, [r5] cmp r0, 0 - bne _0801BB8C + bne @0801BB8C movs r0, 0x1 negs r0, r0 - b _0801BD98 + b @0801BD98 .align 2, 0 .pool -_0801BB8C: +@0801BB8C: movs r4, 0xBA lsls r4, 1 adds r0, r4 ldrb r0, [r0] cmp r0, 0x7 - bls _0801BB9A - b _0801BD70 -_0801BB9A: + bls @0801BB9A + b @0801BD70 +@0801BB9A: lsls r0, 2 - ldr r1, =_0801BBA8 + ldr r1, =@0801BBA8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801BBA8: - .4byte _0801BBC8 - .4byte _0801BBDA - .4byte _0801BBE8 - .4byte _0801BC8C - .4byte _0801BD14 - .4byte _0801BD1A - .4byte _0801BD34 - .4byte _0801BD3A -_0801BBC8: +@0801BBA8: + .4byte @0801BBC8 + .4byte @0801BBDA + .4byte @0801BBE8 + .4byte @0801BC8C + .4byte @0801BD14 + .4byte @0801BD1A + .4byte @0801BD34 + .4byte @0801BD3A +@0801BBC8: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -37853,16 +37853,16 @@ _0801BBC8: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - b _0801BD86 -_0801BBDA: + b @0801BD86 +@0801BBDA: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne _0801BBE6 - b _0801BD86 -_0801BBE6: - b _0801BD96 -_0801BBE8: + bne @0801BBE6 + b @0801BD86 +@0801BBE6: + b @0801BD96 +@0801BBE8: movs r5, 0x1E str r5, [sp] movs r4, 0x14 @@ -37929,17 +37929,17 @@ _0801BBE8: lsls r2, 1 adds r1, r2 strh r0, [r1] - b _0801BD86 + b @0801BD86 .align 2, 0 .pool -_0801BC8C: +@0801BC8C: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - beq _0801BC9A - b _0801BD96 -_0801BC9A: + beq @0801BC9A + b @0801BD96 +@0801BC9A: movs r0, 0x1 bl stdpal_get movs r1, 0x20 @@ -37988,13 +37988,13 @@ _0801BC9A: bl bg_copy_tilemap_rect movs r0, 0x2 bl gpu_copy_wram_bg_tilemap_to_vram - b _0801BD86 + b @0801BD86 .align 2, 0 .pool -_0801BD14: +@0801BD14: bl sub_801BEF8 - b _0801BD86 -_0801BD1A: + b @0801BD86 +@0801BD1A: movs r0, 0 bl sub_801C178 movs r0, 0x1 @@ -38003,11 +38003,11 @@ _0801BD1A: bl sub_801C178 movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram - b _0801BD86 -_0801BD34: + b @0801BD86 +@0801BD34: bl sub_80D2F04 - b _0801BD86 -_0801BD3A: + b @0801BD86 +@0801BD3A: movs r0, 0x1 bl gpu_sync_bg_show movs r0, 0x2 @@ -38026,21 +38026,21 @@ _0801BD3A: movs r3, 0 bl sub_80A1AD4 bl fade_and_return_progress_probably - b _0801BD86 + b @0801BD86 .align 2, 0 .pool -_0801BD70: +@0801BD70: bl fade_and_return_progress_probably lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _0801BD96 + bne @0801BD96 ldr r0, [r5] adds r0, r4 strb r1, [r0] movs r0, 0x1 - b _0801BD98 -_0801BD86: + b @0801BD98 +@0801BD86: ldr r0, =0x02022c74 ldr r1, [r0] movs r0, 0xBA @@ -38049,9 +38049,9 @@ _0801BD86: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_0801BD96: +@0801BD96: movs r0, 0 -_0801BD98: +@0801BD98: add sp, 0x24 pop {r4-r6} pop {r1} @@ -38061,44 +38061,44 @@ _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 ldr r5, =0x02022c74 ldr r0, [r5] cmp r0, 0 - bne _0801BDBC + bne @0801BDBC movs r0, 0x1 negs r0, r0 - b _0801BEEC + b @0801BEEC .align 2, 0 .pool -_0801BDBC: +@0801BDBC: movs r4, 0xBA lsls r4, 1 adds r0, r4 ldrb r0, [r0] cmp r0, 0x5 - bls _0801BDCA - b _0801BEC4 -_0801BDCA: + bls @0801BDCA + b @0801BEC4 +@0801BDCA: lsls r0, 2 - ldr r1, =_0801BDD8 + ldr r1, =@0801BDD8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801BDD8: - .4byte _0801BDF0 - .4byte _0801BE02 - .4byte _0801BE0E - .4byte _0801BE56 - .4byte _0801BE94 - .4byte _0801BE9E -_0801BDF0: +@0801BDD8: + .4byte @0801BDF0 + .4byte @0801BE02 + .4byte @0801BE0E + .4byte @0801BE56 + .4byte @0801BE94 + .4byte @0801BE9E +@0801BDF0: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -38106,14 +38106,14 @@ _0801BDF0: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - b _0801BEDA -_0801BE02: + b @0801BEDA +@0801BE02: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - beq _0801BEDA - b _0801BEEA -_0801BE0E: + beq @0801BEDA + b @0801BEEA +@0801BE0E: movs r5, 0x1E str r5, [sp] movs r4, 0x14 @@ -38143,8 +38143,8 @@ _0801BE0E: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x2 bl gpu_copy_wram_bg_tilemap_to_vram - b _0801BEDA -_0801BE56: + b @0801BEDA +@0801BE56: movs r0, 0x1 bl gpu_sync_bg_hide movs r0, 0x2 @@ -38168,14 +38168,14 @@ _0801BE56: adds r0, r1 ldrb r0, [r0] bl Window_Remove - b _0801BEDA + b @0801BEDA .align 2, 0 .pool -_0801BE94: +@0801BE94: bl sub_801C61C bl sub_80D2F9C - b _0801BEDA -_0801BE9E: + b @0801BEDA +@0801BE9E: ldr r0, =0x02022c60 ldrb r0, [r0] adds r1, r2, 0 @@ -38189,21 +38189,21 @@ _0801BE9E: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - b _0801BEDA + b @0801BEDA .align 2, 0 .pool -_0801BEC4: +@0801BEC4: bl fade_and_return_progress_probably lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _0801BEEA + bne @0801BEEA ldr r0, [r5] adds r0, r4 strb r1, [r0] movs r0, 0x1 - b _0801BEEC -_0801BEDA: + b @0801BEEC +@0801BEDA: ldr r0, =0x02022c74 ldr r1, [r0] movs r0, 0xBA @@ -38212,9 +38212,9 @@ _0801BEDA: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_0801BEEA: +@0801BEEA: movs r0, 0 -_0801BEEC: +@0801BEEC: add sp, 0x8 pop {r4,r5} pop {r1} @@ -38224,7 +38224,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 @@ -38266,9 +38266,9 @@ sub_801BEF8: @ 801BEF8 ldr r0, [r1, 0x4] ldr r2, =0x000f423f cmp r0, r2 - bls _0801BF54 + bls @0801BF54 str r2, [r1, 0x4] -_0801BF54: +@0801BF54: ldr r1, [r4] ldr r2, =0x000001dd adds r0, r1, r2 @@ -38277,7 +38277,7 @@ _0801BF54: movs r3, 0x6 bl decimal_int_to_string adds r6, r4, 0 -_0801BF66: +@0801BF66: ldr r2, [r6] lsls r1, r5, 2 adds r1, r5 @@ -38305,7 +38305,7 @@ _0801BF66: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x3 - bls _0801BF66 + bls @0801BF66 ldr r6, =0x02022c74 ldr r1, [r6] movs r3, 0xA2 @@ -38328,19 +38328,19 @@ _0801BF66: lsls r0, 30 lsrs r0, 30 cmp r0, 0x1 - beq _0801C018 + beq @0801C018 cmp r0, 0x1 - bgt _0801BFF0 + bgt @0801BFF0 cmp r0, 0 - beq _0801BFF6 - b _0801C168 + beq @0801BFF6 + b @0801C168 .align 2, 0 .pool -_0801BFF0: +@0801BFF0: cmp r0, 0x2 - beq _0801C028 - b _0801C168 -_0801BFF6: + beq @0801C028 + b @0801C168 +@0801BFF6: ldr r2, =0x000002b1 adds r0, r1, r2 movs r3, 0x91 @@ -38351,20 +38351,20 @@ _0801BFF6: ldr r1, [r6] ldr r0, =0x000002d9 adds r1, r0 - b _0801C01C + b @0801C01C .align 2, 0 .pool -_0801C018: +@0801C018: ldr r2, =0x000002b1 adds r1, r2 -_0801C01C: +@0801C01C: ldrb r0, [r1] orrs r0, r4 strb r0, [r1] - b _0801C168 + b @0801C168 .align 2, 0 .pool -_0801C028: +@0801C028: ldr r3, =0x000002b1 adds r0, r1, r3 ldrb r1, [r0] @@ -38378,9 +38378,9 @@ _0801C028: ldrh r0, [r0] ldr r2, =0x000003e7 cmp r0, r2 - bls _0801C046 + bls @0801C046 adds r0, r2, 0 -_0801C046: +@0801C046: strh r0, [r3] mov r3, sp movs r4, 0xA7 @@ -38388,9 +38388,9 @@ _0801C046: adds r0, r1, r4 ldrh r0, [r0] cmp r0, r2 - bls _0801C058 + bls @0801C058 adds r0, r2, 0 -_0801C058: +@0801C058: strh r0, [r3, 0x2] mov r3, sp movs r4, 0xA8 @@ -38398,12 +38398,12 @@ _0801C058: adds r0, r1, r4 ldrh r0, [r0] cmp r0, r2 - bls _0801C06A + bls @0801C06A adds r0, r2, 0 -_0801C06A: +@0801C06A: strh r0, [r3, 0x4] movs r5, 0 -_0801C06E: +@0801C06E: lsls r4, r5, 1 adds r4, r5 lsls r4, 4 @@ -38426,7 +38426,7 @@ _0801C06E: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x7 - bls _0801C06E + bls @0801C06E movs r5, 0 movs r6, 0 ldr r1, =0x02022c74 @@ -38438,7 +38438,7 @@ _0801C06E: movs r3, 0xB7 lsls r3, 2 mov r9, r3 -_0801C0B6: +@0801C0B6: mov r4, r8 ldr r2, [r4] mov r0, r10 @@ -38446,7 +38446,7 @@ _0801C0B6: adds r0, r1, r5 ldrb r3, [r0] cmp r3, 0xF7 - beq _0801C0F8 + beq @0801C0F8 ldr r1, =0x00000175 adds r0, r2, r1 ldrb r1, [r0] @@ -38461,19 +38461,19 @@ _0801C0B6: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 - b _0801C15E + b @0801C15E .align 2, 0 .pool -_0801C0F8: +@0801C0F8: adds r0, r5, 0x1 adds r0, r1, r0 ldrb r3, [r0] cmp r3, 0x2 - bls _0801C108 + bls @0801C108 adds r0, r5, 0x2 lsls r0, 16 - b _0801C15C -_0801C108: + b @0801C15C +@0801C108: adds r0, r2, r7 ldrb r1, [r0] lsls r0, r1, 1 @@ -38512,18 +38512,18 @@ _0801C108: adds r0, r7 ldrb r0, [r0] cmp r0, 0x7 - bhi _0801C168 + bhi @0801C168 movs r6, 0 lsls r0, r4, 16 -_0801C15C: +@0801C15C: lsrs r5, r0, 16 -_0801C15E: +@0801C15E: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x27 - bls _0801C0B6 -_0801C168: + bls @0801C0B6 +@0801C168: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -38535,7 +38535,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 @@ -38563,24 +38563,24 @@ sub_801C178: @ 801C178 movs r1, 0 bl Window_FastFillPixels cmp r4, 0x1 - beq _0801C2A0 + beq @0801C2A0 cmp r4, 0x1 - bgt _0801C1C4 + bgt @0801C1C4 cmp r4, 0 - beq _0801C1D0 + beq @0801C1D0 mov r9, r6 - b _0801C498 + b @0801C498 .align 2, 0 .pool -_0801C1C4: +@0801C1C4: mov r0, r8 cmp r0, 0x2 - bne _0801C1CC - b _0801C304 -_0801C1CC: + bne @0801C1CC + b @0801C304 +@0801C1CC: mov r9, r6 - b _0801C498 -_0801C1D0: + b @0801C498 +@0801C1D0: ldr r2, [r7] movs r1, 0xB8 lsls r1, 1 @@ -38623,9 +38623,9 @@ _0801C1D0: movs r1, 0xA0 subs r1, r0 cmp r1, 0 - bge _0801C22E + bge @0801C22E movs r1, 0 -_0801C22E: +@0801C22E: lsls r2, r1, 24 lsrs r2, 24 ldr r3, [r7] @@ -38651,9 +38651,9 @@ _0801C22E: ldr r0, [r2, 0x4] mov r9, r6 cmp r0, 0 - bne _0801C266 - b _0801C498 -_0801C266: + bne @0801C266 + b @0801C498 +@0801C266: mov r1, r10 adds r0, r2, r1 ldr r0, [r0] @@ -38674,12 +38674,12 @@ _0801C266: movs r2, 0xA6 movs r3, 0x11 bl box_print - b _0801C498 + b @0801C498 .align 2, 0 .pool -_0801C2A0: +@0801C2A0: mov r9, r6 -_0801C2A2: +@0801C2A2: ldr r2, [sp, 0xC] lsls r4, r2, 24 asrs r4, 24 @@ -38722,11 +38722,11 @@ _0801C2A2: str r0, [sp, 0xC] asrs r4, 24 cmp r4, 0x3 - ble _0801C2A2 - b _0801C498 + ble @0801C2A2 + b @0801C498 .align 2, 0 .pool -_0801C304: +@0801C304: ldr r4, =0x082f0e18 ldr r2, [r7] ldrb r0, [r2, 0x8] @@ -38762,7 +38762,7 @@ _0801C304: movs r0, 0x3 ands r0, r1 cmp r0, 0x2 - beq _0801C398 + beq @0801C398 lsls r0, r1, 30 lsrs r0, 30 adds r0, r4 @@ -38791,10 +38791,10 @@ _0801C304: movs r2, 0 bl box_print mov r9, r6 - b _0801C498 + b @0801C498 .align 2, 0 .pool -_0801C398: +@0801C398: movs r2, 0 mov r8, r2 lsls r0, r1, 30 @@ -38815,13 +38815,13 @@ _0801C398: ldr r1, [sp, 0xC] ldrb r0, [r0] cmp r1, r0 - bge _0801C498 + bge @0801C498 str r5, [sp, 0x10] lsls r0, r4, 24 lsrs r0, 24 str r0, [sp, 0x14] mov r10, r2 -_0801C3CE: +@0801C3CE: mov r0, r8 lsls r2, r0, 24 lsrs r2, 24 @@ -38862,7 +38862,7 @@ _0801C3CE: adds r0, r2 ldrb r0, [r0] cmp r0, 0xFF - beq _0801C482 + beq @0801C482 adds r1, r4 adds r1, 0x1 movs r0, 0x3 @@ -38908,7 +38908,7 @@ _0801C3CE: ldrb r1, [r1] adds r0, r1 add r8, r0 -_0801C482: +@0801C482: adds r1, r6, 0x1 lsls r1, 24 lsrs r0, r1, 24 @@ -38919,8 +38919,8 @@ _0801C482: adds r0, r2 ldrb r0, [r0] cmp r1, r0 - blt _0801C3CE -_0801C498: + blt @0801C3CE +@0801C498: mov r1, r9 lsrs r0, r1, 24 movs r1, 0x3 @@ -38938,7 +38938,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 @@ -38959,7 +38959,7 @@ sub_801C4C0: @ 801C4C0 adds r1, r0, r2 ldrh r0, [r1] cmp r0, 0 - beq _0801C52C + beq @0801C52C bl sub_80D2E84 lsls r0, 16 lsrs r0, 16 @@ -38991,16 +38991,16 @@ sub_801C4C0: @ 801C4C0 movs r2, 0x8 orrs r1, r2 strb r1, [r0, 0x5] -_0801C52C: +@0801C52C: ldr r1, [r4] ldrb r0, [r1, 0x9] cmp r0, 0 - beq _0801C5EE + beq @0801C5EE ldrb r1, [r1, 0x8] movs r0, 0x3 ands r0, r1 cmp r0, 0x1 - bne _0801C5EE + bne @0801C5EE ldr r0, =0x082f1d00 bl gpu_tile_obj_decompress_and_load3 ldr r0, [r4] @@ -39017,7 +39017,7 @@ _0801C52C: ldr r0, [r4] ldrb r0, [r0, 0x9] cmp r7, r0 - bcs _0801C5EE + bcs @0801C5EE adds r6, r4, 0 ldr r0, =0x0000017d mov r10, r0 @@ -39025,7 +39025,7 @@ _0801C52C: mov r9, r1 movs r2, 0xFF mov r8, r2 -_0801C572: +@0801C572: ldr r1, [r6] lsls r4, r7, 1 add r1, r10 @@ -39061,7 +39061,7 @@ _0801C572: adds r1, r0, r4 ldrh r0, [r1] cmp r0, 0 - beq _0801C5E0 + beq @0801C5E0 bl sub_80D2E84 lsls r0, 16 lsrs r0, 16 @@ -39078,15 +39078,15 @@ _0801C572: adds r1, r2 adds r1, r4 strb r0, [r1] -_0801C5E0: +@0801C5E0: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 ldr r0, [r6] ldrb r0, [r0, 0x9] cmp r7, r0 - bcc _0801C572 -_0801C5EE: + bcc @0801C572 +@0801C5EE: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -39100,7 +39100,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 @@ -39110,7 +39110,7 @@ sub_801C61C: @ 801C61C adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xFF - beq _0801C640 + beq @0801C640 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -39118,21 +39118,21 @@ sub_801C61C: @ 801C61C ldr r1, =0x02020630 adds r0, r1 bl sub_80D2EF8 -_0801C640: +@0801C640: ldr r0, [r4] ldrb r2, [r0, 0x9] cmp r2, 0 - beq _0801C6B4 + beq @0801C6B4 ldrb r1, [r0, 0x8] movs r0, 0x3 ands r0, r1 cmp r0, 0x1 - bne _0801C6B4 + bne @0801C6B4 cmp r5, r2 - bcs _0801C6A4 + bcs @0801C6A4 adds r6, r4, 0 ldr r7, =0x02020630 -_0801C65A: +@0801C65A: ldr r0, [r6] lsls r4, r5, 1 ldr r1, =0x0000017d @@ -39140,14 +39140,14 @@ _0801C65A: adds r1, r0, r4 ldrb r0, [r1] cmp r0, 0xFF - beq _0801C678 + beq @0801C678 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r7 bl obj_delete_and_free_tiles -_0801C678: +@0801C678: ldr r0, [r6] movs r2, 0xBF lsls r2, 1 @@ -39155,29 +39155,29 @@ _0801C678: adds r1, r0, r4 ldrb r0, [r1] cmp r0, 0xFF - beq _0801C696 + beq @0801C696 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r7 bl sub_80D2EF8 -_0801C696: +@0801C696: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 ldr r0, [r6] ldrb r0, [r0, 0x9] cmp r5, r0 - bcc _0801C65A -_0801C6A4: + bcc @0801C65A +@0801C6A4: movs r4, 0x80 lsls r4, 8 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 bl gpu_pal_free_tag -_0801C6B4: +@0801C6B4: pop {r4-r7} pop {r0} bx r0 @@ -39186,23 +39186,23 @@ _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 - beq _0801C6DE + beq @0801C6DE ldr r5, =0x02022c78 ldr r0, =0x000013a4 bl malloc_and_clear str r0, [r5] cmp r0, 0 - bne _0801C6EC -_0801C6DE: + bne @0801C6EC +@0801C6DE: movs r0, 0 - b _0801C71C + b @0801C71C .align 2, 0 .pool -_0801C6EC: +@0801C6EC: movs r6, 0xDE lsls r6, 1 adds r1, r4, 0 @@ -39211,10 +39211,10 @@ _0801C6EC: ldr r1, [r5] ldrb r0, [r1, 0x3] cmp r0, 0x7 - bls _0801C704 + bls @0801C704 movs r0, 0 strb r0, [r1, 0x3] -_0801C704: +@0801C704: ldr r2, [r5] adds r3, r2, r6 ldrb r0, [r2, 0x3] @@ -39227,7 +39227,7 @@ _0801C704: movs r0, 0xFF strb r0, [r1] movs r0, 0x1 -_0801C71C: +@0801C71C: pop {r4-r6} pop {r1} bx r1 @@ -39236,12 +39236,12 @@ _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] cmp r0, 0 - beq _0801C748 + beq @0801C748 ldr r2, =0x000013a4 movs r1, 0 bl memset @@ -39249,7 +39249,7 @@ sub_801C72C: @ 801C72C bl free movs r0, 0 str r0, [r4] -_0801C748: +@0801C748: pop {r4} pop {r0} bx r0 @@ -39258,7 +39258,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 @@ -39268,39 +39268,39 @@ sub_801C758: @ 801C758 ldr r5, =0x02022c78 ldr r0, [r5] cmp r0, 0 - bne _0801C778 + bne @0801C778 movs r0, 0x1 negs r0, r0 - b _0801CA3A + b @0801CA3A .align 2, 0 .pool -_0801C778: +@0801C778: movs r4, 0xE0 lsls r4, 1 adds r0, r4 ldrb r0, [r0] lsrs r0, 1 cmp r0, 0x6 - bls _0801C788 - b _0801CA04 -_0801C788: + bls @0801C788 + b @0801CA04 +@0801C788: lsls r0, 2 - ldr r1, =_0801C798 + ldr r1, =@0801C798 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801C798: - .4byte _0801C7B4 - .4byte _0801C7C6 - .4byte _0801C82C - .4byte _0801C8D4 - .4byte _0801C990 - .4byte _0801C996 - .4byte _0801C9A8 -_0801C7B4: +@0801C798: + .4byte @0801C7B4 + .4byte @0801C7C6 + .4byte @0801C82C + .4byte @0801C8D4 + .4byte @0801C990 + .4byte @0801C996 + .4byte @0801C9A8 +@0801C7B4: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -39308,14 +39308,14 @@ _0801C7B4: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - b _0801CA1E -_0801C7C6: + b @0801CA1E +@0801C7C6: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - beq _0801C7D2 - b _0801CA38 -_0801C7D2: + beq @0801C7D2 + b @0801CA38 +@0801C7D2: movs r0, 0 movs r1, 0 movs r2, 0 @@ -39348,10 +39348,10 @@ _0801C7D2: lsls r1, 6 movs r0, 0 bl lcd_io_set_bits - b _0801CA1E + b @0801CA1E .align 2, 0 .pool -_0801C82C: +@0801C82C: movs r5, 0x1E str r5, [sp] movs r4, 0x14 @@ -39419,17 +39419,17 @@ _0801C82C: lsls r3, 1 adds r1, r3 strh r0, [r1] - b _0801CA1E + b @0801CA1E .align 2, 0 .pool -_0801C8D4: +@0801C8D4: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0 - beq _0801C8E2 - b _0801CA38 -_0801C8E2: + beq @0801C8E2 + b @0801CA38 +@0801C8E2: movs r0, 0x1 bl stdpal_get movs r1, 0x20 @@ -39504,20 +39504,20 @@ _0801C8E2: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - b _0801CA1E + b @0801CA1E .align 2, 0 .pool -_0801C990: +@0801C990: bl sub_801CDCC - b _0801CA1E -_0801C996: + b @0801CA1E +@0801C996: bl sub_801CE7C movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x2 bl gpu_copy_wram_bg_tilemap_to_vram - b _0801CA1E -_0801C9A8: + b @0801CA1E +@0801C9A8: movs r0, 0x1 bl gpu_sync_bg_show movs r0, 0x2 @@ -39550,14 +39550,14 @@ _0801C9A8: movs r3, 0 bl sub_80A1AD4 bl fade_and_return_progress_probably - b _0801CA1E + b @0801CA1E .align 2, 0 .pool -_0801CA04: +@0801CA04: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne _0801CA38 + bne @0801CA38 ldr r0, [r5] adds r0, r4 ldrb r2, [r0] @@ -39565,8 +39565,8 @@ _0801CA04: ands r1, r2 strb r1, [r0] movs r0, 0x1 - b _0801CA3A -_0801CA1E: + b @0801CA3A +@0801CA1E: ldr r0, =0x02022c78 ldr r2, [r0] movs r0, 0xE0 @@ -39580,9 +39580,9 @@ _0801CA1E: ands r0, r3 orrs r0, r1 strb r0, [r2] -_0801CA38: +@0801CA38: movs r0, 0 -_0801CA3A: +@0801CA3A: add sp, 0x24 pop {r3-r5} mov r8, r3 @@ -39596,45 +39596,45 @@ _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 ldr r5, =0x02022c78 ldr r0, [r5] cmp r0, 0 - bne _0801CA68 + bne @0801CA68 movs r0, 0x1 negs r0, r0 - b _0801CC2A + b @0801CC2A .align 2, 0 .pool -_0801CA68: +@0801CA68: movs r4, 0xE0 lsls r4, 1 adds r0, r4 ldrb r0, [r0] lsrs r0, 1 cmp r0, 0x5 - bls _0801CA78 - b _0801CBF4 -_0801CA78: + bls @0801CA78 + b @0801CBF4 +@0801CA78: lsls r0, 2 - ldr r1, =_0801CA88 + ldr r1, =@0801CA88 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801CA88: - .4byte _0801CAA0 - .4byte _0801CAB2 - .4byte _0801CAF4 - .4byte _0801CB54 - .4byte _0801CB84 - .4byte _0801CBC0 -_0801CAA0: +@0801CA88: + .4byte @0801CAA0 + .4byte @0801CAB2 + .4byte @0801CAF4 + .4byte @0801CB54 + .4byte @0801CB84 + .4byte @0801CBC0 +@0801CAA0: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -39642,14 +39642,14 @@ _0801CAA0: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - b _0801CC0E -_0801CAB2: + b @0801CC0E +@0801CAB2: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - beq _0801CABE - b _0801CC28 -_0801CABE: + beq @0801CABE + b @0801CC28 +@0801CABE: movs r0, 0x2 movs r1, 0 movs r2, 0 @@ -39670,8 +39670,8 @@ _0801CABE: lsls r1, 6 movs r0, 0 bl lcd_io_clear_bits - b _0801CC0E -_0801CAF4: + b @0801CC0E +@0801CAF4: movs r4, 0x1E str r4, [sp] movs r5, 0x14 @@ -39711,8 +39711,8 @@ _0801CAF4: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - b _0801CC0E -_0801CB54: + b @0801CC0E +@0801CB54: movs r0, 0x1 bl gpu_sync_bg_hide movs r0, 0x2 @@ -39730,10 +39730,10 @@ _0801CB54: adds r0, r2 ldrb r0, [r0] bl Window_Remove - b _0801CC0E + b @0801CC0E .align 2, 0 .pool -_0801CB84: +@0801CB84: movs r0, 0x2 movs r1, 0 movs r2, 0 @@ -39748,17 +39748,17 @@ _0801CB84: adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xFF - beq _0801CC0E + beq @0801CC0E bl sub_81AF620 ldr r0, [r4] ldr r2, =0x000001c1 adds r1, r0, r2 movs r0, 0xFF strb r0, [r1] - b _0801CC0E + b @0801CC0E .align 2, 0 .pool -_0801CBC0: +@0801CBC0: ldr r0, =0x02022c60 ldrb r0, [r0] adds r1, r2, 0 @@ -39776,14 +39776,14 @@ _0801CBC0: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - b _0801CC0E + b @0801CC0E .align 2, 0 .pool -_0801CBF4: +@0801CBF4: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne _0801CC28 + bne @0801CC28 ldr r0, [r5] adds r0, r4 ldrb r2, [r0] @@ -39791,8 +39791,8 @@ _0801CBF4: ands r1, r2 strb r1, [r0] movs r0, 0x1 - b _0801CC2A -_0801CC0E: + b @0801CC2A +@0801CC0E: ldr r0, =0x02022c78 ldr r2, [r0] movs r0, 0xE0 @@ -39806,9 +39806,9 @@ _0801CC0E: ands r0, r3 orrs r0, r1 strb r0, [r2] -_0801CC28: +@0801CC28: movs r0, 0 -_0801CC2A: +@0801CC2A: add sp, 0x8 pop {r4,r5} pop {r1} @@ -39818,7 +39818,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] @@ -39829,12 +39829,12 @@ sub_801CC38: @ 801CC38 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0801CC72 + bne @0801CC72 ldr r0, =0x000001c1 adds r1, r2, r0 ldrb r0, [r1] cmp r0, 0xFF - beq _0801CC72 + beq @0801CC72 bl sub_81AF620 ldr r0, [r4] ldr r2, =0x000001c1 @@ -39847,7 +39847,7 @@ sub_801CC38: @ 801CC38 movs r2, 0x1 orrs r0, r2 strb r0, [r1] -_0801CC72: +@0801CC72: pop {r4,r5} pop {r0} bx r0 @@ -39856,7 +39856,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] @@ -39867,7 +39867,7 @@ sub_801CC80: @ 801CC80 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0801CCC0 + beq @0801CCC0 movs r3, 0xE5 lsls r3, 2 adds r0, r2, r3 @@ -39888,7 +39888,7 @@ sub_801CC80: @ 801CC80 negs r0, r0 ands r0, r2 strb r0, [r1] -_0801CCC0: +@0801CCC0: pop {r4} pop {r0} bx r0 @@ -39897,7 +39897,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 @@ -39914,40 +39914,40 @@ sub_801CCD0: @ 801CCD0 ands r0, r1 adds r6, r2, 0 cmp r0, 0 - beq _0801CD00 + beq @0801CD00 bl sub_801CFA4 -_0801CCF6: +@0801CCF6: movs r0, 0xFF - b _0801CDC6 + b @0801CDC6 .align 2, 0 .pool -_0801CD00: +@0801CD00: cmp r4, 0x2 - beq _0801CD1C + beq @0801CD1C cmp r4, 0x2 - bgt _0801CD0E + bgt @0801CD0E cmp r4, 0x1 - beq _0801CD18 - b _0801CCF6 -_0801CD0E: + beq @0801CD18 + b @0801CCF6 +@0801CD0E: cmp r3, 0x40 - beq _0801CD20 + beq @0801CD20 cmp r3, 0x80 - beq _0801CD50 - b _0801CCF6 -_0801CD18: + beq @0801CD50 + b @0801CCF6 +@0801CD18: movs r0, 0 - b _0801CDC6 -_0801CD1C: + b @0801CDC6 +@0801CD1C: movs r0, 0x1 - b _0801CDC6 -_0801CD20: + b @0801CDC6 +@0801CD20: movs r0, 0xE3 lsls r0, 1 add r0, r12 ldrh r0, [r0] cmp r0, 0 - beq _0801CCF6 + beq @0801CCF6 movs r0, 0xE0 lsls r0, 1 add r0, r12 @@ -39955,17 +39955,17 @@ _0801CD20: adds r0, r5, 0 ands r0, r1 cmp r0, 0 - bne _0801CCF6 + bne @0801CCF6 ldr r2, =0x000001c3 add r2, r12 ldrb r1, [r2] movs r0, 0x2 negs r0, r0 ands r0, r1 - b _0801CD7E + b @0801CD7E .align 2, 0 .pool -_0801CD50: +@0801CD50: movs r0, 0xE3 lsls r0, 1 add r0, r12 @@ -39975,7 +39975,7 @@ _0801CD50: ldrh r0, [r0] ldrh r1, [r1] cmp r0, r1 - beq _0801CCF6 + beq @0801CCF6 movs r0, 0xE0 lsls r0, 1 add r0, r12 @@ -39983,13 +39983,13 @@ _0801CD50: adds r0, r5, 0 ands r0, r1 cmp r0, 0 - bne _0801CCF6 + bne @0801CCF6 ldr r2, =0x000001c3 add r2, r12 ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 -_0801CD7E: +@0801CD7E: strb r0, [r2] ldr r2, [r6] movs r4, 0xE1 @@ -40020,21 +40020,21 @@ _0801CD7E: ldrb r0, [r0] ands r2, r0 cmp r2, 0 - beq _0801CDC4 + beq @0801CDC4 movs r0, 0x3 - b _0801CDC6 + b @0801CDC6 .align 2, 0 .pool -_0801CDC4: +@0801CDC4: movs r0, 0x2 -_0801CDC6: +@0801CDC6: pop {r4-r6} pop {r1} bx r1 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 @@ -40052,7 +40052,7 @@ sub_801CDCC: @ 801CDCC movs r0, 0xFF strb r0, [r1] adds r6, r4, 0 -_0801CDF0: +@0801CDF0: ldr r2, [r6] lsls r1, r5, 2 adds r1, r5 @@ -40072,26 +40072,26 @@ _0801CDF0: movs r1, 0xFF strb r1, [r0] cmp r5, 0x7 - bls _0801CE34 + bls @0801CE34 ldr r1, [r6] ldr r2, =0x000001f7 adds r0, r1, r2 adds r0, r4 ldrb r0, [r0] cmp r0, 0xFF - beq _0801CE34 + beq @0801CE34 movs r3, 0xE2 lsls r3, 1 adds r1, r3 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_0801CE34: +@0801CE34: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x9 - bls _0801CDF0 + bls @0801CDF0 ldr r2, =0x02022c78 ldr r1, [r2] movs r4, 0xE5 @@ -40119,7 +40119,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} @@ -40168,9 +40168,9 @@ sub_801CE7C: @ 801CE7C adds r1, r0 asrs r1, 1 cmp r1, 0 - bge _0801CEEC + bge @0801CEEC movs r1, 0 -_0801CEEC: +@0801CEEC: ldr r4, [r6] adds r0, r4, r7 ldrb r0, [r0] @@ -40194,7 +40194,7 @@ _0801CEEC: movs r1, 0x3 movs r3, 0x6 bl box_print -_0801CF1C: +@0801CF1C: ldr r6, =0x02022c78 ldr r4, [r6] movs r1, 0xE5 @@ -40233,7 +40233,7 @@ _0801CF1C: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x9 - bls _0801CF1C + bls @0801CF1C ldr r0, [r6] movs r3, 0xE4 lsls r3, 1 @@ -40259,7 +40259,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] @@ -40275,7 +40275,7 @@ sub_801CFA4: @ 801CFA4 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0801CFE4 + beq @0801CFE4 movs r0, 0x2 adds r1, r4, 0 movs r2, 0x1 @@ -40284,10 +40284,10 @@ sub_801CFA4: @ 801CFA4 adds r1, r4, 0 movs r2, 0x1 bl bg_change_y_offset - b _0801CFF8 + b @0801CFF8 .align 2, 0 .pool -_0801CFE4: +@0801CFE4: movs r0, 0x2 adds r1, r4, 0 movs r2, 0x2 @@ -40296,7 +40296,7 @@ _0801CFE4: adds r1, r4, 0 movs r2, 0x2 bl bg_change_y_offset -_0801CFF8: +@0801CFF8: ldr r3, =0x02022c78 ldr r0, [r3] ldr r2, =0x000001c3 @@ -40320,26 +40320,26 @@ _0801CFF8: ldrb r2, [r2] lsrs r0, r2, 1 cmp r0, 0xF - bls _0801D070 + bls @0801D070 adds r0, r6, 0 ands r0, r2 cmp r0, 0 - beq _0801D044 + beq @0801D044 movs r0, 0xE3 lsls r0, 1 adds r1, r0 ldrh r0, [r1] adds r0, 0x1 - b _0801D04E + b @0801D04E .align 2, 0 .pool -_0801D044: +@0801D044: movs r2, 0xE3 lsls r2, 1 adds r1, r2 ldrh r0, [r1] subs r0, 0x1 -_0801D04E: +@0801D04E: strh r0, [r1] ldr r0, [r3] movs r6, 0xE1 @@ -40357,7 +40357,7 @@ _0801D04E: movs r0, 0x1 ands r0, r1 strb r0, [r2] -_0801D070: +@0801D070: pop {r4-r6} pop {r0} bx r0 @@ -40366,7 +40366,7 @@ _0801D070: thumb_func_end sub_801CFA4 thumb_func_start sub_801D07C -sub_801D07C: @ 801D07C +sub_801D07C: ; 801D07C push {r4,lr} ldr r4, =0x02022c7c movs r0, 0x60 @@ -40384,7 +40384,7 @@ sub_801D07C: @ 801D07C thumb_func_end sub_801D07C thumb_func_start sub_801D0A0 -sub_801D0A0: @ 801D0A0 +sub_801D0A0: ; 801D0A0 push {r4,lr} ldr r4, =0x02022c7c movs r0, 0x60 @@ -40402,22 +40402,22 @@ sub_801D0A0: @ 801D0A0 thumb_func_end sub_801D0A0 thumb_func_start sub_801D0C4 -sub_801D0C4: @ 801D0C4 +sub_801D0C4: ; 801D0C4 push {r4-r6,lr} adds r6, r0, 0 ldr r4, =0x02022c7c ldr r0, [r4] cmp r0, 0 - bne _0801D0D8 + bne @0801D0D8 movs r0, 0x3 - b _0801D0F8 + b @0801D0F8 .align 2, 0 .pool -_0801D0D8: +@0801D0D8: bl mevent_dispatch_08145600 adds r5, r0, 0 cmp r5, 0x3 - bne _0801D0F6 + bne @0801D0F6 ldr r0, [r4] ldr r1, [r0, 0x4] strh r1, [r6] @@ -40426,16 +40426,16 @@ _0801D0D8: bl free movs r0, 0 str r0, [r4] -_0801D0F6: +@0801D0F6: adds r0, r5, 0 -_0801D0F8: +@0801D0F8: pop {r4-r6} pop {r1} bx r1 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 @@ -40478,7 +40478,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] @@ -40495,7 +40495,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 @@ -40504,37 +40504,37 @@ 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 + bne @0801D190 adds r0, r1, 0 -_0801D190: +@0801D190: pop {r1} bx r1 thumb_func_end sub_801D188 thumb_func_start sub_801D194 -sub_801D194: @ 801D194 +sub_801D194: ; 801D194 push {lr} cmp r1, r0 - bcs _0801D19E + bcs @0801D19E movs r0, 0 - b _0801D1A8 -_0801D19E: + b @0801D1A8 +@0801D19E: cmp r1, r0 - beq _0801D1A6 + beq @0801D1A6 movs r0, 0x2 - b _0801D1A8 -_0801D1A6: + b @0801D1A8 +@0801D1A6: movs r0, 0x1 -_0801D1A8: +@0801D1A8: pop {r1} bx r1 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 @@ -40542,22 +40542,22 @@ 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 bl sub_801D8C0 cmp r0, 0 - beq _0801D1CA + beq @0801D1CA movs r0, 0x4 str r0, [r4, 0x8] -_0801D1CA: +@0801D1CA: movs r0, 0x1 pop {r4} pop {r1} @@ -40565,16 +40565,16 @@ _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 bl sub_801D8CC cmp r0, 0 - beq _0801D1E6 + beq @0801D1E6 movs r0, 0x4 str r0, [r4, 0x8] -_0801D1E6: +@0801D1E6: movs r0, 0x1 pop {r4} pop {r1} @@ -40582,7 +40582,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] @@ -40595,60 +40595,60 @@ sub_801D1F0: @ 801D1F0 str r0, [r5, 0xC] ldr r0, [r3] cmp r0, 0x1E - bls _0801D20C - b _0801D464 -_0801D20C: + bls @0801D20C + b @0801D464 +@0801D20C: lsls r0, 2 - ldr r1, =_0801D21C + ldr r1, =@0801D21C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801D21C: - .4byte _0801D298 - .4byte _0801D2A2 - .4byte _0801D2A8 - .4byte _0801D2E2 - .4byte _0801D2D8 - .4byte _0801D2BA - .4byte _0801D2C6 - .4byte _0801D2EC - .4byte _0801D300 - .4byte _0801D308 - .4byte _0801D31E - .4byte _0801D32E - .4byte _0801D33A - .4byte _0801D360 - .4byte _0801D348 - .4byte _0801D390 - .4byte _0801D378 - .4byte _0801D3DC - .4byte _0801D3A8 - .4byte _0801D3C0 - .4byte _0801D3CE - .4byte _0801D406 - .4byte _0801D3EA - .4byte _0801D3F8 - .4byte _0801D40E - .4byte _0801D418 - .4byte _0801D422 - .4byte _0801D43C - .4byte _0801D450 - .4byte _0801D458 - .4byte _0801D2CC -_0801D298: +@0801D21C: + .4byte @0801D298 + .4byte @0801D2A2 + .4byte @0801D2A8 + .4byte @0801D2E2 + .4byte @0801D2D8 + .4byte @0801D2BA + .4byte @0801D2C6 + .4byte @0801D2EC + .4byte @0801D300 + .4byte @0801D308 + .4byte @0801D31E + .4byte @0801D32E + .4byte @0801D33A + .4byte @0801D360 + .4byte @0801D348 + .4byte @0801D390 + .4byte @0801D378 + .4byte @0801D3DC + .4byte @0801D3A8 + .4byte @0801D3C0 + .4byte @0801D3CE + .4byte @0801D406 + .4byte @0801D3EA + .4byte @0801D3F8 + .4byte @0801D40E + .4byte @0801D418 + .4byte @0801D422 + .4byte @0801D43C + .4byte @0801D450 + .4byte @0801D458 + .4byte @0801D2CC +@0801D298: movs r0, 0x1 str r0, [r5, 0x8] ldr r0, [r3, 0x4] str r0, [r5, 0x4] - b _0801D464 -_0801D2A2: + b @0801D464 +@0801D2A2: movs r0, 0x3 str r0, [r5, 0x8] - b _0801D464 -_0801D2A8: + b @0801D464 +@0801D2A8: adds r0, r5, 0 adds r0, 0x38 ldr r1, [r3, 0x4] @@ -40656,37 +40656,37 @@ _0801D2A8: bl sub_801D928 movs r0, 0x2 str r0, [r5, 0x8] - b _0801D464 -_0801D2BA: + b @0801D464 +@0801D2BA: ldr r0, [r5, 0x20] ldr r1, [r5, 0x14] movs r2, 0x64 bl memcpy - b _0801D464 -_0801D2C6: + b @0801D464 +@0801D2C6: ldr r0, [r5, 0x20] movs r1, 0 - b _0801D2D0 -_0801D2CC: + b @0801D2D0 +@0801D2CC: ldr r0, [r5, 0x20] movs r1, 0x1 -_0801D2D0: +@0801D2D0: bl sub_801B6A0 str r0, [r5, 0x4] - b _0801D464 -_0801D2D8: + b @0801D464 +@0801D2D8: ldr r1, [r5, 0x4] ldr r0, [r3, 0x4] cmp r1, r0 - beq _0801D2E2 - b _0801D464 -_0801D2E2: + beq @0801D2E2 + b @0801D464 +@0801D2E2: movs r0, 0 str r0, [r5, 0xC] ldr r0, [r3, 0x8] str r0, [r5, 0x10] - b _0801D464 -_0801D2EC: + b @0801D464 +@0801D2EC: ldr r0, [r3, 0x8] ldr r1, [r5, 0x18] bl sub_801D188 @@ -40694,13 +40694,13 @@ _0801D2EC: ldr r1, [r5, 0x20] bl sub_801B6EC str r0, [r5, 0x4] - b _0801D464 -_0801D300: + b @0801D464 +@0801D300: ldr r0, [r5, 0x14] ldr r0, [r0] str r0, [r5, 0x4] - b _0801D464 -_0801D308: + b @0801D464 +@0801D308: ldr r0, [r3, 0x8] adds r1, r5, 0 adds r1, 0x34 @@ -40709,29 +40709,29 @@ _0801D308: ldr r1, [r5, 0x20] bl sub_801B708 str r0, [r5, 0x4] - b _0801D464 -_0801D31E: + b @0801D464 +@0801D31E: ldr r0, [r5, 0x20] ldr r1, [r3, 0x4] bl sub_801B784 lsls r0, 16 lsrs r0, 16 str r0, [r5, 0x4] - b _0801D464 -_0801D32E: + b @0801D464 +@0801D32E: ldr r0, [r5, 0x20] ldr r1, [r3, 0x8] bl sub_801B748 str r0, [r5, 0x4] - b _0801D464 -_0801D33A: + b @0801D464 +@0801D33A: ldr r0, [r3, 0x8] ldr r1, [r5, 0x14] ldr r1, [r1] bl sub_801D194 str r0, [r5, 0x4] - b _0801D464 -_0801D348: + b @0801D464 +@0801D348: ldr r0, [r3, 0x8] ldr r1, [r5, 0x1C] bl sub_801D188 @@ -40741,8 +40741,8 @@ _0801D348: adds r0, r5, 0 movs r1, 0x17 bl mevent_srv_814501C - b _0801D464 -_0801D360: + b @0801D464 +@0801D360: ldr r0, [r3, 0x8] ldr r1, [r5, 0x18] bl sub_801D188 @@ -40752,8 +40752,8 @@ _0801D360: adds r0, r5, 0 movs r1, 0x16 bl mevent_srv_814501C - b _0801D464 -_0801D378: + b @0801D464 +@0801D378: ldr r0, [r3, 0x8] adds r1, r5, 0 adds r1, 0x34 @@ -40763,88 +40763,88 @@ _0801D378: movs r1, 0x18 movs r3, 0x4 bl mevent_srv_814501C - b _0801D464 -_0801D390: + b @0801D464 +@0801D390: ldr r2, [r3, 0x8] cmp r2, 0 - bne _0801D39C + bne @0801D39C ldr r2, [r5, 0x24] ldr r3, [r5, 0x28] - b _0801D39E -_0801D39C: + b @0801D39E +@0801D39C: ldr r3, [r3, 0x4] -_0801D39E: +@0801D39E: adds r0, r5, 0 movs r1, 0x19 bl mevent_srv_814501C - b _0801D464 -_0801D3A8: + b @0801D464 +@0801D3A8: ldr r2, [r3, 0x8] cmp r2, 0 - bne _0801D3B4 + bne @0801D3B4 ldr r2, [r5, 0x2C] ldr r3, [r5, 0x30] - b _0801D3B6 -_0801D3B4: + b @0801D3B6 +@0801D3B4: ldr r3, [r3, 0x4] -_0801D3B6: +@0801D3B6: adds r0, r5, 0 movs r1, 0x10 bl mevent_srv_814501C - b _0801D464 -_0801D3C0: + b @0801D464 +@0801D3C0: ldr r2, [r3, 0x8] adds r0, r5, 0 movs r1, 0x1A movs r3, 0xBC bl mevent_srv_814501C - b _0801D464 -_0801D3CE: + b @0801D464 +@0801D3CE: ldr r2, [r3, 0x8] ldr r3, [r3, 0x4] adds r0, r5, 0 movs r1, 0x15 bl mevent_srv_814501C - b _0801D464 -_0801D3DC: + b @0801D464 +@0801D3DC: ldr r2, [r3, 0x8] ldr r3, [r3, 0x4] adds r0, r5, 0 movs r1, 0x1C bl mevent_srv_814501C - b _0801D464 -_0801D3EA: + b @0801D464 +@0801D3EA: ldr r0, [r5, 0x18] ldr r1, [r3, 0x8] movs r2, 0xA6 lsls r2, 1 bl memcpy - b _0801D464 -_0801D3F8: + b @0801D464 +@0801D3F8: ldr r0, [r5, 0x1C] ldr r1, [r3, 0x8] movs r2, 0xDE lsls r2, 1 bl memcpy - b _0801D464 -_0801D406: + b @0801D464 +@0801D406: ldr r0, [r3, 0x8] ldr r0, [r0] str r0, [r5, 0x34] - b _0801D464 -_0801D40E: + b @0801D464 +@0801D40E: ldr r0, [r3, 0x8] str r0, [r5, 0x24] ldr r0, [r3, 0x4] str r0, [r5, 0x28] - b _0801D464 -_0801D418: + b @0801D464 +@0801D418: ldr r0, [r3, 0x8] str r0, [r5, 0x2C] ldr r0, [r3, 0x4] str r0, [r5, 0x30] - b _0801D464 -_0801D422: + b @0801D464 +@0801D422: ldr r4, [r5, 0x18] bl sav1_get_mevent_buffer_1 adds r1, r0, 0 @@ -40854,8 +40854,8 @@ _0801D422: bl memcpy ldr r0, [r5, 0x18] bl sub_801B3C0 - b _0801D464 -_0801D43C: + b @0801D464 +@0801D43C: ldr r4, [r5, 0x1C] bl sub_801B00C adds r1, r0, 0 @@ -40863,18 +40863,18 @@ _0801D43C: lsls r2, 1 adds r0, r4, 0 bl memcpy - b _0801D464 -_0801D450: + b @0801D464 +@0801D450: bl sub_8099244 str r0, [r5, 0x24] - b _0801D464 -_0801D458: + b @0801D464 +@0801D458: ldr r2, [r3, 0x8] ldr r3, [r3, 0x4] adds r0, r5, 0 movs r1, 0x1B bl mevent_srv_814501C -_0801D464: +@0801D464: movs r0, 0x1 pop {r4,r5} pop {r1} @@ -40882,7 +40882,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, =0x082f2548 ldr r1, [r0, 0x8] @@ -40897,7 +40897,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 @@ -40917,22 +40917,22 @@ 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 ldr r0, [r4] cmp r0, 0 - bne _0801D4BC + bne @0801D4BC movs r0, 0x6 - b _0801D4DC + b @0801D4DC .align 2, 0 .pool -_0801D4BC: +@0801D4BC: bl mevent_srv_ish_exec adds r5, r0, 0 cmp r5, 0x6 - bne _0801D4DA + bne @0801D4DA ldr r0, [r4] ldr r1, [r0, 0x4] strh r1, [r6] @@ -40941,16 +40941,16 @@ _0801D4BC: bl free movs r0, 0 str r0, [r4] -_0801D4DA: +@0801D4DA: adds r0, r5, 0 -_0801D4DC: +@0801D4DC: pop {r4-r6} pop {r1} bx r1 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] @@ -40962,7 +40962,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] @@ -40972,7 +40972,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] @@ -40982,7 +40982,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} @@ -41020,7 +41020,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] @@ -41037,7 +41037,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] @@ -41053,7 +41053,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 @@ -41081,7 +41081,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] @@ -41103,24 +41103,24 @@ 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 bl sub_801D8C0 cmp r0, 0 - beq _0801D612 + beq @0801D612 movs r0, 0x4 str r0, [r4, 0x8] movs r0, 0 str r0, [r4, 0xC] -_0801D612: +@0801D612: movs r0, 0x1 pop {r4} pop {r1} @@ -41128,18 +41128,18 @@ _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 bl sub_801D8CC cmp r0, 0 - beq _0801D632 + beq @0801D632 movs r0, 0x4 str r0, [r4, 0x8] movs r0, 0 str r0, [r4, 0xC] -_0801D632: +@0801D632: movs r0, 0x1 pop {r4} pop {r1} @@ -41147,7 +41147,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] @@ -41158,57 +41158,57 @@ sub_801D63C: @ 801D63C str r0, [r4, 0x10] ldr r0, [r2] cmp r0, 0x15 - bls _0801D654 - b _0801D804 -_0801D654: + bls @0801D654 + b @0801D804 +@0801D654: lsls r0, 2 - ldr r1, =_0801D664 + ldr r1, =@0801D664 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801D664: - .4byte _0801D804 - .4byte _0801D6BC - .4byte _0801D6C4 - .4byte _0801D6D4 - .4byte _0801D70E - .4byte _0801D716 - .4byte _0801D6FE - .4byte _0801D708 - .4byte _0801D764 - .4byte _0801D790 - .4byte _0801D788 - .4byte _0801D72C - .4byte _0801D742 - .4byte _0801D758 - .4byte _0801D77C - .4byte _0801D7B8 - .4byte _0801D7BC - .4byte _0801D7C4 - .4byte _0801D7D0 - .4byte _0801D6EA - .4byte _0801D6D8 - .4byte _0801D7F0 -_0801D6BC: +@0801D664: + .4byte @0801D804 + .4byte @0801D6BC + .4byte @0801D6C4 + .4byte @0801D6D4 + .4byte @0801D70E + .4byte @0801D716 + .4byte @0801D6FE + .4byte @0801D708 + .4byte @0801D764 + .4byte @0801D790 + .4byte @0801D788 + .4byte @0801D72C + .4byte @0801D742 + .4byte @0801D758 + .4byte @0801D77C + .4byte @0801D7B8 + .4byte @0801D7BC + .4byte @0801D7C4 + .4byte @0801D7D0 + .4byte @0801D6EA + .4byte @0801D6D8 + .4byte @0801D7F0 +@0801D6BC: ldr r0, [r2, 0x4] str r0, [r4, 0x4] movs r0, 0x1 - b _0801D7FE -_0801D6C4: + b @0801D7FE +@0801D6C4: adds r0, r4, 0 adds r0, 0x24 ldr r1, [r2, 0x4] ldr r2, [r4, 0x18] bl sub_801D928 movs r0, 0x2 - b _0801D7FE -_0801D6D4: + b @0801D7FE +@0801D6D4: movs r0, 0x3 - b _0801D7FE -_0801D6D8: + b @0801D7FE +@0801D6D8: adds r0, r4, 0 adds r0, 0x24 ldr r2, [r4, 0x14] @@ -41216,8 +41216,8 @@ _0801D6D8: movs r3, 0 bl sub_801D904 movs r0, 0x3 - b _0801D7FE -_0801D6EA: + b @0801D7FE +@0801D6EA: ldrb r0, [r2, 0x4] bl sub_80847F8 adds r2, r0, 0 @@ -41225,23 +41225,23 @@ _0801D6EA: movs r1, 0x12 bl sub_801D59C movs r0, 0x3 - b _0801D7FE -_0801D6FE: + b @0801D7FE +@0801D6FE: ldr r0, [r4, 0x4] cmp r0, 0 - beq _0801D706 - b _0801D804 -_0801D706: - b _0801D70E -_0801D708: + beq @0801D706 + b @0801D804 +@0801D706: + b @0801D70E +@0801D708: ldr r0, [r4, 0x4] cmp r0, 0x1 - bne _0801D804 -_0801D70E: + bne @0801D804 +@0801D70E: adds r0, r4, 0 bl sub_801D580 - b _0801D804 -_0801D716: + b @0801D804 +@0801D716: ldr r0, [r4, 0x20] ldr r1, [r4, 0x18] movs r2, 0x40 @@ -41251,8 +41251,8 @@ _0801D716: movs r0, 0 str r0, [r4, 0xC] movs r0, 0x2 - b _0801D806 -_0801D72C: + b @0801D806 +@0801D72C: ldr r0, [r4, 0x20] ldr r1, [r4, 0x18] movs r2, 0x40 @@ -41262,8 +41262,8 @@ _0801D72C: movs r0, 0 str r0, [r4, 0xC] movs r0, 0x3 - b _0801D806 -_0801D742: + b @0801D806 +@0801D742: ldr r0, [r4, 0x20] ldr r1, [r4, 0x18] movs r2, 0x40 @@ -41273,15 +41273,15 @@ _0801D742: movs r0, 0 str r0, [r4, 0xC] movs r0, 0x5 - b _0801D806 -_0801D758: + b @0801D806 +@0801D758: movs r0, 0x5 str r0, [r4, 0x8] movs r0, 0 str r0, [r4, 0xC] movs r0, 0x4 - b _0801D806 -_0801D764: + b @0801D806 +@0801D764: ldr r0, [r4, 0x14] ldr r1, [r4, 0x4C] bl sub_801B580 @@ -41291,49 +41291,49 @@ _0801D764: movs r1, 0x11 movs r3, 0x64 bl sub_801D904 - b _0801D804 -_0801D77C: + b @0801D804 +@0801D77C: ldr r2, [r4, 0x4] adds r0, r4, 0 movs r1, 0x13 bl sub_801D59C - b _0801D804 -_0801D788: + b @0801D804 +@0801D788: ldr r0, [r4, 0x18] bl sub_801B21C - b _0801D804 -_0801D790: + b @0801D804 +@0801D790: ldr r0, [r4, 0x18] bl sub_801B1A4 cmp r0, 0 - bne _0801D7AC + bne @0801D7AC ldr r0, [r4, 0x18] bl sub_801B078 adds r0, r4, 0 movs r1, 0x13 movs r2, 0 bl sub_801D59C - b _0801D804 -_0801D7AC: + b @0801D804 +@0801D7AC: adds r0, r4, 0 movs r1, 0x13 movs r2, 0x1 bl sub_801D59C - b _0801D804 -_0801D7B8: + b @0801D804 +@0801D7B8: movs r0, 0x6 - b _0801D7FE -_0801D7BC: + b @0801D7FE +@0801D7BC: ldr r0, [r4, 0x18] bl sub_801B508 - b _0801D804 -_0801D7C4: + b @0801D804 +@0801D7C4: ldr r0, [r4, 0x18] movs r1, 0xFA lsls r1, 2 bl sub_80992A0 - b _0801D804 -_0801D7D0: + b @0801D804 +@0801D7D0: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000bec @@ -41342,23 +41342,23 @@ _0801D7D0: movs r2, 0xBC bl memcpy bl sub_81652B4 - b _0801D804 + b @0801D804 .align 2, 0 .pool -_0801D7F0: +@0801D7F0: ldr r0, =0x0201c000 ldr r1, [r4, 0x18] movs r2, 0x80 lsls r2, 3 bl memcpy movs r0, 0x7 -_0801D7FE: +@0801D7FE: str r0, [r4, 0x8] movs r0, 0 str r0, [r4, 0xC] -_0801D804: +@0801D804: movs r0, 0x1 -_0801D806: +@0801D806: pop {r4} pop {r1} bx r1 @@ -41367,49 +41367,49 @@ _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] cmp r0, 0 - beq _0801D822 + beq @0801D822 movs r0, 0x4 str r0, [r1, 0x8] movs r0, 0 str r0, [r1, 0xC] -_0801D822: +@0801D822: movs r0, 0x1 pop {r1} bx r1 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] cmp r0, 0 - beq _0801D838 + beq @0801D838 cmp r0, 0x1 - beq _0801D846 - b _0801D858 -_0801D838: + beq @0801D846 + b @0801D858 +@0801D838: ldr r0, [r4, 0x18] bl sub_8153870 ldr r0, [r4, 0xC] adds r0, 0x1 str r0, [r4, 0xC] - b _0801D858 -_0801D846: + b @0801D858 +@0801D846: adds r0, r4, 0x4 bl sub_8153884 adds r1, r0, 0 cmp r1, 0 - bne _0801D858 + bne @0801D858 movs r0, 0x4 str r0, [r4, 0x8] str r1, [r4, 0xC] -_0801D858: +@0801D858: movs r0, 0x1 pop {r4} pop {r1} @@ -41417,7 +41417,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 @@ -41428,12 +41428,12 @@ sub_801D860: @ 801D860 ldr r2, [r2] bl _call_via_r3 cmp r0, 0x1 - bne _0801D880 + bne @0801D880 movs r0, 0x4 str r0, [r4, 0x8] movs r0, 0 str r0, [r4, 0xC] -_0801D880: +@0801D880: movs r0, 0x1 pop {r4} pop {r1} @@ -41443,7 +41443,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 @@ -41468,7 +41468,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 @@ -41477,7 +41477,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 @@ -41486,7 +41486,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] @@ -41509,7 +41509,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 @@ -41518,14 +41518,14 @@ sub_801D904: @ 801D904 strh r0, [r4, 0x10] strh r0, [r4, 0x12] cmp r3, 0 - beq _0801D91A + beq @0801D91A strh r3, [r4, 0x14] - b _0801D920 -_0801D91A: + b @0801D920 +@0801D91A: movs r0, 0x80 lsls r0, 3 strh r0, [r4, 0x14] -_0801D920: +@0801D920: str r2, [r4, 0x1C] pop {r4} pop {r0} @@ -41533,7 +41533,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] @@ -41545,7 +41545,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 @@ -41561,7 +41561,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 @@ -41571,19 +41571,19 @@ sub_801D954: @ 801D954 movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _0801D96E + bne @0801D96E movs r0, 0 - b _0801D970 -_0801D96E: + b @0801D970 +@0801D96E: movs r0, 0x1 -_0801D970: +@0801D970: pop {r4} pop {r1} bx r1 thumb_func_end sub_801D954 thumb_func_start sub_801D978 -sub_801D978: @ 801D978 +sub_801D978: ; 801D978 push {lr} lsls r0, 24 lsrs r0, 24 @@ -41593,27 +41593,27 @@ 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 ldr r6, [r5] cmp r6, 0x1 - beq _0801D9EC + beq @0801D9EC cmp r6, 0x1 - bgt _0801D99E + bgt @0801D99E cmp r6, 0 - beq _0801D9A4 - b _0801DA52 -_0801D99E: + beq @0801D9A4 + b @0801DA52 +@0801D99E: cmp r6, 0x2 - beq _0801DA38 - b _0801DA52 -_0801D9A4: + beq @0801DA38 + b @0801DA52 +@0801D9A4: ldrb r0, [r5, 0x5] bl sub_801D954 cmp r0, 0 - beq _0801DA52 + beq @0801DA52 ldrb r0, [r5, 0x5] mov r4, sp mov r1, sp @@ -41627,28 +41627,28 @@ _0801D9A4: movs r0, 0x80 lsls r0, 19 cmp r1, r0 - bls _0801D9D2 -_0801D9CC: + bls @0801D9D2 +@0801D9CC: bl sub_8010198 - b _0801DA52 -_0801D9D2: + b @0801DA52 +@0801D9D2: mov r1, sp ldrh r0, [r5, 0x6] ldrh r1, [r1] cmp r0, r1 - bne _0801D9CC + bne @0801D9CC strh r6, [r5, 0x8] ldrb r0, [r5, 0x5] bl sub_801D978 ldr r0, [r5] adds r0, 0x1 str r0, [r5] - b _0801DA52 -_0801D9EC: + b @0801DA52 +@0801D9EC: ldrb r0, [r5, 0x5] bl sub_801D954 cmp r0, 0 - beq _0801DA52 + beq @0801DA52 ldrh r0, [r5, 0x8] lsls r1, r0, 6 subs r1, r0 @@ -41656,7 +41656,7 @@ _0801D9EC: ldrh r0, [r5, 0xC] subs r2, r0, r3 cmp r2, 0xFC - bhi _0801DA1E + bhi @0801DA1E ldrb r0, [r5, 0x5] ldr r1, [r5, 0x18] adds r1, r3 @@ -41667,8 +41667,8 @@ _0801D9EC: ldr r0, [r5] adds r0, 0x1 str r0, [r5] - b _0801DA30 -_0801DA1E: + b @0801DA30 +@0801DA1E: ldrb r0, [r5, 0x5] ldr r1, [r5, 0x18] adds r1, r3 @@ -41677,11 +41677,11 @@ _0801DA1E: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] -_0801DA30: +@0801DA30: ldrb r0, [r5, 0x5] bl sub_801D978 - b _0801DA52 -_0801DA38: + b @0801DA52 +@0801DA38: ldr r0, [r5, 0x18] ldrh r1, [r5, 0xC] bl sub_806F928 @@ -41689,14 +41689,14 @@ _0801DA38: lsrs r0, 16 ldrh r1, [r5, 0xA] cmp r0, r1 - bne _0801D9CC + bne @0801D9CC movs r0, 0 str r0, [r5] movs r0, 0x1 - b _0801DA54 -_0801DA52: + b @0801DA54 +@0801DA52: movs r0, 0 -_0801DA54: +@0801DA54: add sp, 0x8 pop {r4-r6} pop {r1} @@ -41704,29 +41704,29 @@ _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 ldr r5, [r4] cmp r5, 0x1 - beq _0801DAC8 + beq @0801DAC8 cmp r5, 0x1 - bgt _0801DA72 + bgt @0801DA72 cmp r5, 0 - beq _0801DA7C - b _0801DB5E -_0801DA72: + beq @0801DA7C + b @0801DB5E +@0801DA72: cmp r5, 0x2 - beq _0801DB1C + beq @0801DB1C cmp r5, 0x3 - beq _0801DB46 - b _0801DB5E -_0801DA7C: + beq @0801DB46 + b @0801DB5E +@0801DA7C: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _0801DB5E + beq @0801DB5E ldrh r1, [r4, 0xE] ldr r2, =0xffff0000 ldr r0, [sp] @@ -41753,18 +41753,18 @@ _0801DA7C: mov r1, sp movs r2, 0x8 bl link_0800A448 - b _0801DB3E + b @0801DB3E .align 2, 0 .pool -_0801DAC8: +@0801DAC8: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _0801DB5E + beq @0801DB5E ldrb r0, [r4, 0x4] bl sub_801D954 cmp r0, 0 - beq _0801DB5E + beq @0801DB5E ldrb r0, [r4, 0x4] bl sub_801D978 ldrh r1, [r4, 0x10] @@ -41774,7 +41774,7 @@ _0801DAC8: ldrh r0, [r4, 0x14] subs r0, r3 cmp r0, 0xFC - bhi _0801DB08 + bhi @0801DB08 ldr r1, [r4, 0x1C] adds r1, r3 lsls r2, r0, 16 @@ -41784,8 +41784,8 @@ _0801DAC8: ldrh r0, [r4, 0x10] adds r0, 0x1 strh r0, [r4, 0x10] - b _0801DB3E -_0801DB08: + b @0801DB3E +@0801DB08: ldr r1, [r4, 0x1C] adds r1, r3 movs r0, 0 @@ -41794,12 +41794,12 @@ _0801DB08: ldrh r0, [r4, 0x10] adds r0, 0x1 strh r0, [r4, 0x10] - b _0801DB5E -_0801DB1C: + b @0801DB5E +@0801DB1C: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _0801DB5E + beq @0801DB5E ldr r0, [r4, 0x1C] ldrh r1, [r4, 0x14] bl sub_806F928 @@ -41807,28 +41807,28 @@ _0801DB1C: lsrs r0, 16 ldrh r1, [r4, 0x12] cmp r0, r1 - beq _0801DB3E + beq @0801DB3E bl sub_8010198 - b _0801DB5E -_0801DB3E: + b @0801DB5E +@0801DB3E: ldr r0, [r4] adds r0, 0x1 str r0, [r4] - b _0801DB5E -_0801DB46: + b @0801DB5E +@0801DB46: ldrb r0, [r4, 0x4] bl sub_801D954 cmp r0, 0 - beq _0801DB5E + beq @0801DB5E ldrb r0, [r4, 0x4] bl sub_801D978 movs r0, 0 str r0, [r4] movs r0, 0x1 - b _0801DB60 -_0801DB5E: + b @0801DB60 +@0801DB5E: movs r0, 0 -_0801DB60: +@0801DB60: add sp, 0x8 pop {r4,r5} pop {r1} @@ -41836,7 +41836,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 @@ -41851,39 +41851,39 @@ sub_801DB68: @ 801DB68 orrs r0, r1 strb r0, [r5] cmp r4, 0x2 - bhi _0801DB8E + bhi @0801DB8E cmp r4, 0x1 - bcs _0801DB94 - b _0801DBB8 -_0801DB8E: + bcs @0801DB94 + b @0801DBB8 +@0801DB8E: cmp r4, 0x3 - beq _0801DBA6 - b _0801DBB8 -_0801DB94: + beq @0801DBA6 + b @0801DBB8 +@0801DB94: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 movs r1, 0xF bl __umodsi3 adds r0, 0x10 - b _0801DBB6 -_0801DBA6: + b @0801DBB6 +@0801DBA6: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 movs r1, 0xF bl __umodsi3 adds r0, 0x1 -_0801DBB6: +@0801DBB6: strb r0, [r5, 0x1] -_0801DBB8: +@0801DBB8: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_801DB68 thumb_func_start sub_801DBC0 -sub_801DBC0: @ 801DBC0 +sub_801DBC0: ; 801DBC0 push {lr} bl sub_801B044 movs r1, 0 @@ -41898,7 +41898,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 var_get_pointer @@ -41909,21 +41909,21 @@ sub_801DBDC: @ 801DBDC lsls r0, 24 lsrs r0, 29 cmp r0, 0x4 - bls _0801DC10 + bls @0801DC10 ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] lsls r0, 16 ldr r1, =0x01f30000 cmp r0, r1 - bls _0801DC10 + bls @0801DC10 ldrb r0, [r2] movs r1, 0x1F ands r1, r0 strb r1, [r2] movs r0, 0 strh r0, [r4] -_0801DC10: +@0801DC10: pop {r4} pop {r0} bx r0 @@ -41932,73 +41932,73 @@ _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 adds r4, r0, 0 bl sub_809D490 cmp r0, 0 - beq _0801DC3A + beq @0801DC3A bl sub_801B0CC cmp r0, 0 - bne _0801DC44 -_0801DC3A: + bne @0801DC44 +@0801DC3A: movs r0, 0 - b _0801DCA6 + b @0801DCA6 .align 2, 0 .pool -_0801DC44: +@0801DC44: adds r0, r4, 0 bl sub_801DD44 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x6 - bhi _0801DCA4 + bhi @0801DCA4 lsls r0, r5, 2 - ldr r1, =_0801DC60 + ldr r1, =@0801DC60 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801DC60: - .4byte _0801DCA4 - .4byte _0801DC7C - .4byte _0801DC7C - .4byte _0801DCA4 - .4byte _0801DC86 - .4byte _0801DC96 - .4byte _0801DCA4 -_0801DC7C: +@0801DC60: + .4byte @0801DCA4 + .4byte @0801DC7C + .4byte @0801DC7C + .4byte @0801DCA4 + .4byte @0801DC86 + .4byte @0801DC96 + .4byte @0801DCA4 +@0801DC7C: adds r0, r4, 0 bl sub_801DCAC strh r0, [r6] - b _0801DCA4 -_0801DC86: + b @0801DCA4 +@0801DC86: adds r0, r4, 0 bl sub_801DCAC strh r0, [r6] adds r0, r4, 0 bl sub_801DCD8 - b _0801DCA4 -_0801DC96: + b @0801DCA4 +@0801DC96: adds r0, r4, 0 bl sub_801DCAC strh r0, [r6] adds r0, r4, 0 bl sub_801DCCC -_0801DCA4: +@0801DCA4: adds r0, r5, 0 -_0801DCA6: +@0801DCA6: pop {r4-r6} pop {r1} bx r1 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 @@ -42017,7 +42017,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 @@ -42027,7 +42027,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] @@ -42048,19 +42048,19 @@ sub_801DCD8: @ 801DCD8 lsls r0, 27 lsrs r0, 29 cmp r0, 0x4 - bls _0801DD0A + bls @0801DD0A ands r2, r4 movs r0, 0x10 orrs r2, r0 strb r2, [r3] -_0801DD0A: +@0801DD0A: pop {r4} pop {r0} bx r0 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] @@ -42078,73 +42078,73 @@ sub_801DD10: @ 801DD10 lsls r0, 24 lsrs r0, 29 cmp r0, 0x5 - bls _0801DD3C + bls @0801DD3C ands r2, r4 movs r0, 0xA0 orrs r2, r0 strb r2, [r3] -_0801DD3C: +@0801DD3C: pop {r4} pop {r0} bx r0 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] movs r0, 0xE0 ands r0, r1 cmp r0, 0xA0 - bne _0801DD56 + bne @0801DD56 movs r0, 0x6 - b _0801DD92 -_0801DD56: + b @0801DD92 +@0801DD56: ldr r1, [r2] lsls r0, r1, 30 lsrs r0, 30 cmp r0, 0x1 - beq _0801DD78 + beq @0801DD78 cmp r0, 0x1 - bgt _0801DD6A + bgt @0801DD6A cmp r0, 0 - beq _0801DD74 - b _0801DD90 -_0801DD6A: + beq @0801DD74 + b @0801DD90 +@0801DD6A: cmp r0, 0x2 - beq _0801DD7C + beq @0801DD7C cmp r0, 0x3 - beq _0801DD80 - b _0801DD90 -_0801DD74: + beq @0801DD80 + b @0801DD90 +@0801DD74: movs r0, 0x3 - b _0801DD92 -_0801DD78: + b @0801DD92 +@0801DD78: movs r0, 0x1 - b _0801DD92 -_0801DD7C: + b @0801DD92 +@0801DD7C: movs r0, 0x2 - b _0801DD92 -_0801DD80: + b @0801DD92 +@0801DD80: lsls r0, r1, 27 lsrs r0, 29 cmp r0, 0x2 - bhi _0801DD8C + bhi @0801DD8C movs r0, 0x4 - b _0801DD92 -_0801DD8C: + b @0801DD92 +@0801DD8C: movs r0, 0x5 - b _0801DD92 -_0801DD90: + b @0801DD92 +@0801DD90: movs r0, 0 -_0801DD92: +@0801DD92: pop {r1} bx r1 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 @@ -42167,7 +42167,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 @@ -42196,7 +42196,7 @@ sub_801DDD0: @ 801DDD0 ldr r6, =0x00003c88 adds r4, 0xB9 movs r5, 0x9 -_0801DE0E: +@0801DE0E: ldr r1, [r7] adds r1, r6 adds r0, r4, 0 @@ -42205,7 +42205,7 @@ _0801DE0E: adds r4, 0x15 subs r5, 0x1 cmp r5, 0 - bge _0801DE0E + bge @0801DE0E pop {r4-r7} pop {r0} bx r0 @@ -42214,7 +42214,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] @@ -42233,7 +42233,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 @@ -42242,30 +42242,30 @@ c2_081284E0: @ 801DE54 adds r6, r0, r1 ldrb r0, [r6] cmp r0, 0x1 - beq _0801DE8C + beq @0801DE8C cmp r0, 0x1 - bgt _0801DE74 + bgt @0801DE74 cmp r0, 0 - beq _0801DE7A - b _0801DF04 + beq @0801DE7A + b @0801DF04 .align 2, 0 .pool -_0801DE74: +@0801DE74: cmp r0, 0x2 - beq _0801DEC8 - b _0801DF04 -_0801DE7A: + beq @0801DEC8 + b @0801DF04 +@0801DE7A: bl clear_tasks bl reset_all_obj_data bl gpu_pal_allocator_reset bl sub_801F4D0 - b _0801DEBC -_0801DE8C: + b @0801DEBC +@0801DE8C: bl sub_801F5B8 bl sub_801F534 adds r5, r0, 0 cmp r5, 0 - bne _0801DF04 + bne @0801DF04 movs r4, 0x1 negs r4, r4 adds r0, r4, 0 @@ -42280,21 +42280,21 @@ _0801DE8C: bl sub_80A1AD4 ldr r0, =sub_801DF20 + 1 bl SetVBlankCallback -_0801DEBC: +@0801DEBC: ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] - b _0801DF04 + b @0801DF04 .align 2, 0 .pool -_0801DEC8: +@0801DEC8: bl fade_and_return_progress_probably ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0801DF04 + bne @0801DF04 ldr r0, =sub_801DF38 + 1 bl set_callback2 ldr r0, =sub_801DF54 + 1 @@ -42312,7 +42312,7 @@ _0801DEC8: movs r0, 0xE8 movs r1, 0x96 bl sub_800DFB4 -_0801DF04: +@0801DF04: add sp, 0x4 pop {r4-r6} pop {r0} @@ -42322,7 +42322,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 copy_super_sprites_to_oam @@ -42333,7 +42333,7 @@ sub_801DF20: @ 801DF20 thumb_func_end sub_801DF20 thumb_func_start sub_801DF38 -sub_801DF38: @ 801DF38 +sub_801DF38: ; 801DF38 push {lr} bl run_active_tasks bl sub_801F5B8 @@ -42345,38 +42345,38 @@ 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] ldrb r0, [r0, 0x17] cmp r0, 0x2 - beq _0801DF7A + beq @0801DF7A cmp r0, 0x2 - bgt _0801DF70 + bgt @0801DF70 cmp r0, 0x1 - beq _0801DF76 - b _0801DF8A + beq @0801DF76 + b @0801DF8A .align 2, 0 .pool -_0801DF70: +@0801DF70: cmp r0, 0x3 - beq _0801DF7E - b _0801DF8A -_0801DF76: + beq @0801DF7E + b @0801DF8A +@0801DF76: movs r0, 0x6 - b _0801DF80 -_0801DF7A: + b @0801DF80 +@0801DF7A: movs r0, 0x7 - b _0801DF80 -_0801DF7E: + b @0801DF80 +@0801DF7E: movs r0, 0x8 -_0801DF80: +@0801DF80: bl sub_801EBD4 ldr r1, [r4] movs r0, 0 strb r0, [r1, 0x17] -_0801DF8A: +@0801DF8A: ldr r1, =0x082f2a7c ldr r0, =0x02022c84 ldr r0, [r0] @@ -42393,25 +42393,25 @@ _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] ldrh r1, [r0, 0x6] cmp r1, 0x1 - beq _0801DFE0 + beq @0801DFE0 cmp r1, 0x1 - bgt _0801DFC8 + bgt @0801DFC8 cmp r1, 0 - beq _0801DFCE - b _0801E028 + beq @0801DFCE + b @0801E028 .align 2, 0 .pool -_0801DFC8: +@0801DFC8: cmp r1, 0x2 - beq _0801E018 - b _0801E028 -_0801DFCE: + beq @0801E018 + b @0801E028 +@0801DFCE: movs r1, 0xC8 lsls r1, 1 adds r0, r1 @@ -42420,14 +42420,14 @@ _0801DFCE: ldrh r0, [r1, 0x6] adds r0, 0x1 strh r0, [r1, 0x6] -_0801DFE0: +@0801DFE0: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _0801E028 + beq @0801E028 bl sub_8011A9C cmp r0, 0 - bne _0801E028 + bne @0801E028 ldr r4, =0x02022c84 ldr r1, [r4] movs r0, 0xC8 @@ -42438,72 +42438,72 @@ _0801DFE0: bl link_0800A448 lsls r0, 24 cmp r0, 0 - beq _0801E028 + beq @0801E028 ldr r1, [r4] ldrh r0, [r1, 0x6] adds r0, 0x1 strh r0, [r1, 0x6] - b _0801E028 + b @0801E028 .align 2, 0 .pool -_0801E018: +@0801E018: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _0801E028 + beq @0801E028 movs r0, 0x1 bl sub_801EBD4 -_0801E028: +@0801E028: pop {r4} pop {r0} bx r0 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] ldrh r0, [r3, 0x6] cmp r0, 0 - beq _0801E048 + beq @0801E048 cmp r0, 0x1 - beq _0801E0F6 - b _0801E118 + beq @0801E0F6 + b @0801E118 .align 2, 0 .pool -_0801E048: +@0801E048: ldr r1, =0x030022c0 ldrh r2, [r1, 0x2E] movs r0, 0x8 ands r0, r2 cmp r0, 0 - beq _0801E068 + beq @0801E068 ldrb r0, [r3, 0x15] cmp r0, 0 - beq _0801E118 + beq @0801E118 movs r0, 0x4 bl sub_801EBD4 - b _0801E118 + b @0801E118 .align 2, 0 .pool -_0801E068: +@0801E068: movs r0, 0x4 ands r0, r2 cmp r0, 0 - beq _0801E078 + beq @0801E078 movs r0, 0x2 bl sub_801EBD4 - b _0801E118 -_0801E078: + b @0801E118 +@0801E078: ldrh r1, [r1, 0x30] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0801E0A4 + beq @0801E0A4 ldrb r0, [r3, 0x15] cmp r0, 0 - beq _0801E09C + beq @0801E09C bl sub_801ED68 movs r0, 0x8 movs r1, 0 @@ -42511,53 +42511,53 @@ _0801E078: ldr r1, [r5] movs r0, 0x1 strh r0, [r1, 0x6] - b _0801E118 -_0801E09C: + b @0801E118 +@0801E09C: movs r0, 0x3 bl sub_801EBD4 - b _0801E118 -_0801E0A4: + b @0801E118 +@0801E0A4: movs r4, 0x1 adds r0, r4, 0 ands r0, r2 cmp r0, 0 - beq _0801E0C0 + beq @0801E0C0 bl sub_801EC94 movs r0, 0x8 movs r1, 0 bl sub_801F5EC movs r0, 0x2 movs r1, 0x1 - b _0801E0EC -_0801E0C0: + b @0801E0EC +@0801E0C0: movs r0, 0x80 lsls r0, 1 ands r0, r2 cmp r0, 0 - beq _0801E0E0 + beq @0801E0E0 ldrb r0, [r3, 0x10] cmp r0, 0x3 - beq _0801E0D8 + beq @0801E0D8 bl sub_801ED94 movs r0, 0x8 - b _0801E0EA -_0801E0D8: + b @0801E0EA +@0801E0D8: movs r0, 0x5 bl sub_801EBD4 - b _0801E118 -_0801E0E0: + b @0801E118 +@0801E0E0: bl sub_801EBE4 cmp r0, 0 - beq _0801E118 + beq @0801E118 movs r0, 0x1 -_0801E0EA: +@0801E0EA: movs r1, 0 -_0801E0EC: +@0801E0EC: bl sub_801F5EC ldr r0, [r5] strh r4, [r0, 0x6] - b _0801E118 -_0801E0F6: + b @0801E118 +@0801E0F6: movs r0, 0 bl sub_801F644 adds r4, r0, 0 @@ -42568,62 +42568,62 @@ _0801E0F6: lsls r0, 24 lsrs r1, r0, 24 cmp r4, 0 - bne _0801E118 + bne @0801E118 cmp r1, 0 - bne _0801E118 + bne @0801E118 ldr r0, [r5] strh r1, [r0, 0x6] -_0801E118: +@0801E118: pop {r4,r5} pop {r0} bx r0 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] ldrh r0, [r0, 0x6] cmp r0, 0x4 - bls _0801E12E - b _0801E23A -_0801E12E: + bls @0801E12E + b @0801E23A +@0801E12E: lsls r0, 2 - ldr r1, =_0801E140 + ldr r1, =@0801E140 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801E140: - .4byte _0801E154 - .4byte _0801E15E - .4byte _0801E17C - .4byte _0801E208 - .4byte _0801E21C -_0801E154: +@0801E140: + .4byte @0801E154 + .4byte @0801E15E + .4byte @0801E17C + .4byte @0801E208 + .4byte @0801E21C +@0801E154: movs r0, 0x3 movs r1, 0 bl sub_801F5EC - b _0801E16A -_0801E15E: + b @0801E16A +@0801E15E: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 - bne _0801E23A -_0801E16A: + bne @0801E23A +@0801E16A: ldr r0, =0x02022c84 ldr r1, [r0] ldrh r0, [r1, 0x6] adds r0, 0x1 strh r0, [r1, 0x6] - b _0801E23A + b @0801E23A .align 2, 0 .pool -_0801E17C: +@0801E17C: bl ProcessMenuInput lsls r0, 24 asrs r0, 8 @@ -42632,10 +42632,10 @@ _0801E17C: movs r0, 0x2 negs r0, r0 cmp r4, r0 - beq _0801E1B4 + beq @0801E1B4 adds r0, 0x1 cmp r4, r0 - beq _0801E1D4 + beq @0801E1D4 movs r0, 0x4 movs r1, 0 bl sub_801F5EC @@ -42643,39 +42643,39 @@ _0801E17C: ldr r2, [r5] ldrb r0, [r2, 0x10] cmp r0, r4 - beq _0801E1DC + beq @0801E1DC cmp r4, 0x3 - ble _0801E1EC - b _0801E1DC + ble @0801E1EC + b @0801E1DC .align 2, 0 .pool -_0801E1B4: +@0801E1B4: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0801E23A + beq @0801E23A movs r0, 0x5 bl audio_play movs r0, 0x1 bl MoveMenuCursor - b _0801E23A + b @0801E23A .align 2, 0 .pool -_0801E1D4: +@0801E1D4: movs r0, 0x4 movs r1, 0 bl sub_801F5EC -_0801E1DC: +@0801E1DC: ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x3 strh r0, [r1, 0x6] - b _0801E23A + b @0801E23A .align 2, 0 .pool -_0801E1EC: +@0801E1EC: movs r1, 0 strb r1, [r2, 0x11] ldr r0, [r5] @@ -42688,67 +42688,67 @@ _0801E1EC: ldr r1, [r5] movs r0, 0x4 strh r0, [r1, 0x6] - b _0801E23A -_0801E208: + b @0801E23A +@0801E208: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 - bne _0801E23A + bne @0801E23A movs r0, 0x1 bl sub_801EBD4 - b _0801E23A -_0801E21C: + b @0801E23A +@0801E21C: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 - bne _0801E23A + bne @0801E23A movs r0, 0x1 bl sub_801F644 lsls r0, 24 cmp r0, 0 - bne _0801E23A + bne @0801E23A movs r0, 0x1 bl sub_801EBD4 -_0801E23A: +@0801E23A: pop {r4-r6} pop {r0} bx r0 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] ldrh r0, [r0, 0x6] adds r2, r1, 0 cmp r0, 0xA - bls _0801E250 - b _0801E458 -_0801E250: + bls @0801E250 + b @0801E458 +@0801E250: lsls r0, 2 - ldr r1, =_0801E264 + ldr r1, =@0801E264 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801E264: - .4byte _0801E290 - .4byte _0801E2A8 - .4byte _0801E2C4 - .4byte _0801E322 - .4byte _0801E3D4 - .4byte _0801E424 - .4byte _0801E458 - .4byte _0801E458 - .4byte _0801E378 - .4byte _0801E338 - .4byte _0801E35C -_0801E290: +@0801E264: + .4byte @0801E290 + .4byte @0801E2A8 + .4byte @0801E2C4 + .4byte @0801E322 + .4byte @0801E3D4 + .4byte @0801E424 + .4byte @0801E458 + .4byte @0801E458 + .4byte @0801E378 + .4byte @0801E338 + .4byte @0801E35C +@0801E290: movs r0, 0x6 movs r1, 0 bl sub_801F5EC @@ -42756,49 +42756,49 @@ _0801E290: ldr r1, [r0] movs r0, 0x1 strh r0, [r1, 0x6] - b _0801E458 + b @0801E458 .align 2, 0 .pool -_0801E2A8: +@0801E2A8: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 - beq _0801E2B6 - b _0801E458 -_0801E2B6: + beq @0801E2B6 + b @0801E458 +@0801E2B6: ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x2 strh r0, [r1, 0x6] - b _0801E458 + b @0801E458 .align 2, 0 .pool -_0801E2C4: +@0801E2C4: bl sub_801FF08 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _0801E2E6 + beq @0801E2E6 cmp r1, 0 - bgt _0801E2DE + bgt @0801E2DE movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _0801E396 - b _0801E458 -_0801E2DE: + beq @0801E396 + b @0801E458 +@0801E2DE: cmp r1, 0x1 - beq _0801E2E4 - b _0801E458 -_0801E2E4: - b _0801E396 -_0801E2E6: + beq @0801E2E4 + b @0801E458 +@0801E2E4: + b @0801E396 +@0801E2E6: ldr r4, =0x02022c84 ldr r1, [r4] ldrb r0, [r1, 0x13] cmp r0, 0 - bne _0801E310 + bne @0801E310 movs r2, 0xC8 lsls r2, 1 adds r0, r1, r2 @@ -42809,10 +42809,10 @@ _0801E2E6: ldr r1, [r4] movs r0, 0x9 strh r0, [r1, 0x6] - b _0801E458 + b @0801E458 .align 2, 0 .pool -_0801E310: +@0801E310: movs r2, 0xC8 lsls r2, 1 adds r0, r1, r2 @@ -42820,26 +42820,26 @@ _0801E310: ldr r1, [r4] movs r0, 0x4 strh r0, [r1, 0x6] - b _0801E458 -_0801E322: + b @0801E458 +@0801E322: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 - beq _0801E330 - b _0801E458 -_0801E330: + beq @0801E330 + b @0801E458 +@0801E330: movs r0, 0x1 bl sub_801EBD4 - b _0801E458 -_0801E338: + b @0801E458 +@0801E338: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 - beq _0801E346 - b _0801E458 -_0801E346: + beq @0801E346 + b @0801E458 +@0801E346: movs r0, 0x14 movs r1, 0 bl sub_801F5EC @@ -42847,41 +42847,41 @@ _0801E346: ldr r1, [r0] movs r0, 0xA strh r0, [r1, 0x6] - b _0801E458 + b @0801E458 .align 2, 0 .pool -_0801E35C: +@0801E35C: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 - beq _0801E36A - b _0801E458 -_0801E36A: + beq @0801E36A + b @0801E458 +@0801E36A: ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x8 strh r0, [r1, 0x6] - b _0801E458 + b @0801E458 .align 2, 0 .pool -_0801E378: +@0801E378: bl sub_801FF08 lsls r0, 24 asrs r5, r0, 24 cmp r5, 0 - beq _0801E3AC + beq @0801E3AC cmp r5, 0 - bgt _0801E392 + bgt @0801E392 movs r0, 0x1 negs r0, r0 cmp r5, r0 - beq _0801E396 - b _0801E458 -_0801E392: + beq @0801E396 + b @0801E458 +@0801E392: cmp r5, 0x1 - bne _0801E458 -_0801E396: + bne @0801E458 +@0801E396: movs r0, 0x7 movs r1, 0 bl sub_801F5EC @@ -42889,10 +42889,10 @@ _0801E396: ldr r1, [r0] movs r0, 0x3 strh r0, [r1, 0x6] - b _0801E458 + b @0801E458 .align 2, 0 .pool -_0801E3AC: +@0801E3AC: bl sub_80104B0 ldr r4, =0x02022c84 ldr r0, [r4] @@ -42907,17 +42907,17 @@ _0801E3AC: lsls r2, 1 adds r0, r2 strh r5, [r0] - b _0801E458 + b @0801E458 .align 2, 0 .pool -_0801E3D4: +@0801E3D4: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _0801E414 + beq @0801E414 bl sub_8011A9C cmp r0, 0 - bne _0801E414 + bne @0801E414 ldr r4, =0x02022c84 ldr r1, [r4] movs r0, 0xC8 @@ -42928,39 +42928,39 @@ _0801E3D4: bl link_0800A448 lsls r0, 24 cmp r0, 0 - beq _0801E414 + beq @0801E414 ldr r1, [r4] ldrb r0, [r1, 0x13] cmp r0, 0 - bne _0801E410 + bne @0801E410 movs r0, 0x6 - b _0801E412 + b @0801E412 .align 2, 0 .pool -_0801E410: +@0801E410: movs r0, 0x5 -_0801E412: +@0801E412: strh r0, [r1, 0x6] -_0801E414: +@0801E414: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _0801E458 - b _0801E42C + bne @0801E458 + b @0801E42C .align 2, 0 .pool -_0801E424: +@0801E424: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _0801E438 -_0801E42C: + bne @0801E438 +@0801E42C: movs r0, 0x9 bl sub_801EBD4 - b _0801E458 + b @0801E458 .align 2, 0 .pool -_0801E438: +@0801E438: ldr r3, [r2] movs r1, 0xDC lsls r1, 1 @@ -42972,81 +42972,81 @@ _0801E438: movs r1, 0x96 lsls r1, 17 cmp r0, r1 - bls _0801E458 + bls @0801E458 movs r0, 0 strh r0, [r2] movs r0, 0x4 strh r0, [r3, 0x6] -_0801E458: +@0801E458: pop {r4,r5} pop {r0} bx r0 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] ldrh r0, [r0, 0x6] adds r2, r1, 0 cmp r0, 0x7 - bls _0801E470 - b _0801E5BC -_0801E470: + bls @0801E470 + b @0801E5BC +@0801E470: lsls r0, 2 - ldr r1, =_0801E484 + ldr r1, =@0801E484 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801E484: - .4byte _0801E4A4 - .4byte _0801E4C8 - .4byte _0801E4E8 - .4byte _0801E50C - .4byte _0801E540 - .4byte _0801E560 - .4byte _0801E584 - .4byte _0801E5A8 -_0801E4A4: +@0801E484: + .4byte @0801E4A4 + .4byte @0801E4C8 + .4byte @0801E4E8 + .4byte @0801E50C + .4byte @0801E540 + .4byte @0801E560 + .4byte @0801E584 + .4byte @0801E5A8 +@0801E4A4: ldr r0, =sub_801F2B4 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - beq _0801E4B2 - b _0801E5BC -_0801E4B2: + beq @0801E4B2 + b @0801E5BC +@0801E4B2: movs r0, 0x7 movs r1, 0 bl sub_801F5EC ldr r0, =0x02022c84 ldr r1, [r0] - b _0801E59A + b @0801E59A .align 2, 0 .pool -_0801E4C8: +@0801E4C8: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 - bne _0801E5BC + bne @0801E5BC movs r0, 0x12 movs r1, 0 bl sub_801F5EC ldr r0, =0x02022c84 ldr r1, [r0] - b _0801E59A + b @0801E59A .align 2, 0 .pool -_0801E4E8: +@0801E4E8: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 - bne _0801E5BC + bne @0801E5BC ldr r4, =0x02022c84 ldr r0, [r4] movs r1, 0xC8 @@ -43054,17 +43054,17 @@ _0801E4E8: adds r0, r1 bl sub_801EFA8 ldr r1, [r4] - b _0801E59A + b @0801E59A .align 2, 0 .pool -_0801E50C: +@0801E50C: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _0801E5BC + beq @0801E5BC bl sub_8011A9C cmp r0, 0 - bne _0801E5BC + bne @0801E5BC ldr r4, =0x02022c84 ldr r1, [r4] movs r0, 0xC8 @@ -43075,319 +43075,319 @@ _0801E50C: bl link_0800A448 lsls r0, 24 cmp r0, 0 - beq _0801E5BC + beq @0801E5BC ldr r1, [r4] - b _0801E59A + b @0801E59A .align 2, 0 .pool -_0801E540: +@0801E540: bl sub_800A550 movs r1, 0x1 ands r1, r0 cmp r1, 0 - beq _0801E5BC + beq @0801E5BC bl sub_8011A9C cmp r0, 0 - bne _0801E5BC + bne @0801E5BC ldr r0, =0x02022c84 ldr r1, [r0] - b _0801E59A + b @0801E59A .align 2, 0 .pool -_0801E560: +@0801E560: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _0801E5BC + beq @0801E5BC bl sub_8011A9C adds r4, r0, 0 cmp r4, 0 - bne _0801E5BC + bne @0801E5BC bl sub_800AC34 ldr r0, =0x02022c84 ldr r1, [r0] strh r4, [r1, 0xA] - b _0801E59A + b @0801E59A .align 2, 0 .pool -_0801E584: +@0801E584: ldr r1, [r2] ldrh r0, [r1, 0xA] cmp r0, 0x95 - bhi _0801E590 + bhi @0801E590 adds r0, 0x1 strh r0, [r1, 0xA] -_0801E590: +@0801E590: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _0801E5BC + bne @0801E5BC ldr r1, [r2] -_0801E59A: +@0801E59A: ldrh r0, [r1, 0x6] adds r0, 0x1 strh r0, [r1, 0x6] - b _0801E5BC + b @0801E5BC .align 2, 0 .pool -_0801E5A8: +@0801E5A8: ldr r1, [r2] ldrh r0, [r1, 0xA] cmp r0, 0x95 - bls _0801E5B8 + bls @0801E5B8 movs r0, 0x9 bl sub_801EBD4 - b _0801E5BC -_0801E5B8: + b @0801E5BC +@0801E5B8: adds r0, 0x1 strh r0, [r1, 0xA] -_0801E5BC: +@0801E5BC: pop {r4} pop {r0} bx r0 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] ldrh r0, [r1, 0x6] cmp r0, 0x1 - beq _0801E604 + beq @0801E604 cmp r0, 0x1 - bgt _0801E5E0 + bgt @0801E5E0 cmp r0, 0 - beq _0801E5EA - b _0801E662 + beq @0801E5EA + b @0801E662 .align 2, 0 .pool -_0801E5E0: +@0801E5E0: cmp r0, 0x2 - beq _0801E62E + beq @0801E62E cmp r0, 0x3 - beq _0801E650 - b _0801E662 -_0801E5EA: + beq @0801E650 + b @0801E662 +@0801E5EA: ldr r0, =sub_801F2B4 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _0801E662 + bne @0801E662 movs r0, 0x7 movs r1, 0 bl sub_801F5EC - b _0801E640 + b @0801E640 .align 2, 0 .pool -_0801E604: +@0801E604: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 - bne _0801E662 + bne @0801E662 bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _0801E662 + beq @0801E662 bl sub_8011A9C adds r4, r0, 0 cmp r4, 0 - bne _0801E662 + bne @0801E662 bl sub_800AC34 ldr r1, [r5] strh r4, [r1, 0xA] - b _0801E642 -_0801E62E: + b @0801E642 +@0801E62E: ldrh r0, [r1, 0xA] cmp r0, 0x95 - bhi _0801E638 + bhi @0801E638 adds r0, 0x1 strh r0, [r1, 0xA] -_0801E638: +@0801E638: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _0801E662 -_0801E640: + bne @0801E662 +@0801E640: ldr r1, [r5] -_0801E642: +@0801E642: ldrh r0, [r1, 0x6] adds r0, 0x1 strh r0, [r1, 0x6] - b _0801E662 + b @0801E662 .align 2, 0 .pool -_0801E650: +@0801E650: ldrh r0, [r1, 0xA] cmp r0, 0x95 - bls _0801E65E + bls @0801E65E movs r0, 0x9 bl sub_801EBD4 - b _0801E662 -_0801E65E: + b @0801E662 +@0801E65E: adds r0, 0x1 strh r0, [r1, 0xA] -_0801E662: +@0801E662: pop {r4,r5} pop {r0} bx r0 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] ldrh r0, [r0, 0x6] adds r2, r1, 0 cmp r0, 0x4 - bhi _0801E75C + bhi @0801E75C lsls r0, 2 - ldr r1, =_0801E688 + ldr r1, =@0801E688 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801E688: - .4byte _0801E69C - .4byte _0801E6C8 - .4byte _0801E6F0 - .4byte _0801E724 - .4byte _0801E748 -_0801E69C: +@0801E688: + .4byte @0801E69C + .4byte @0801E6C8 + .4byte @0801E6F0 + .4byte @0801E724 + .4byte @0801E748 +@0801E69C: ldr r0, =sub_801F2B4 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _0801E75C + bne @0801E75C ldr r4, =0x02022c84 ldr r0, [r4] ldrb r0, [r0, 0x13] cmp r0, 0 - beq _0801E6BA + beq @0801E6BA movs r0, 0x7 movs r1, 0 bl sub_801F5EC -_0801E6BA: +@0801E6BA: ldr r1, [r4] - b _0801E73A + b @0801E73A .align 2, 0 .pool -_0801E6C8: +@0801E6C8: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 - bne _0801E75C + bne @0801E75C ldr r4, =0x02022c84 ldr r0, [r4] ldrb r0, [r0, 0x13] cmp r0, 0 - beq _0801E6E6 + beq @0801E6E6 movs r0, 0x13 movs r1, 0 bl sub_801F5EC -_0801E6E6: +@0801E6E6: ldr r1, [r4] - b _0801E73A + b @0801E73A .align 2, 0 .pool -_0801E6F0: +@0801E6F0: movs r0, 0 bl sub_801F644 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0801E75C + beq @0801E75C bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _0801E75C + beq @0801E75C bl sub_8011A9C adds r4, r0, 0 cmp r4, 0 - bne _0801E75C + bne @0801E75C bl sub_800AC34 ldr r0, =0x02022c84 ldr r1, [r0] strh r4, [r1, 0xA] - b _0801E73A + b @0801E73A .align 2, 0 .pool -_0801E724: +@0801E724: ldr r1, [r2] ldrh r0, [r1, 0xA] cmp r0, 0x95 - bhi _0801E730 + bhi @0801E730 adds r0, 0x1 strh r0, [r1, 0xA] -_0801E730: +@0801E730: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _0801E75C + bne @0801E75C ldr r1, [r2] -_0801E73A: +@0801E73A: ldrh r0, [r1, 0x6] adds r0, 0x1 strh r0, [r1, 0x6] - b _0801E75C + b @0801E75C .align 2, 0 .pool -_0801E748: +@0801E748: ldr r1, [r2] ldrh r0, [r1, 0xA] cmp r0, 0x95 - bls _0801E758 + bls @0801E758 movs r0, 0x9 bl sub_801EBD4 - b _0801E75C -_0801E758: + b @0801E75C +@0801E758: adds r0, 0x1 strh r0, [r1, 0xA] -_0801E75C: +@0801E75C: pop {r4} pop {r0} bx r0 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] ldrh r0, [r0, 0x6] adds r4, r1, 0 cmp r0, 0x4 - bhi _0801E830 + bhi @0801E830 lsls r0, 2 - ldr r1, =_0801E784 + ldr r1, =@0801E784 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801E784: - .4byte _0801E798 - .4byte _0801E7C0 - .4byte _0801E7F4 - .4byte _0801E802 - .4byte _0801E820 -_0801E798: +@0801E784: + .4byte @0801E798 + .4byte @0801E7C0 + .4byte @0801E7F4 + .4byte @0801E802 + .4byte @0801E820 +@0801E798: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _0801E7AC + bne @0801E7AC movs r0, 0x1 bl sub_801EBD4 - b _0801E830 + b @0801E830 .align 2, 0 .pool -_0801E7AC: +@0801E7AC: ldr r0, [r4] movs r1, 0xC8 lsls r1, 1 @@ -43397,15 +43397,15 @@ _0801E7AC: ldrh r0, [r1, 0x6] adds r0, 0x1 strh r0, [r1, 0x6] -_0801E7C0: +@0801E7C0: bl sub_800A520 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0801E830 + bne @0801E830 bl sub_8011A9C cmp r0, 0 - bne _0801E830 + bne @0801E830 ldr r4, =0x02022c84 ldr r1, [r4] movs r0, 0xC8 @@ -43416,102 +43416,102 @@ _0801E7C0: bl link_0800A448 lsls r0, 24 cmp r0, 0 - beq _0801E830 + beq @0801E830 ldr r1, [r4] - b _0801E812 + b @0801E812 .align 2, 0 .pool -_0801E7F4: +@0801E7F4: bl sub_801EE10 movs r0, 0x8 movs r1, 0 bl sub_801F5EC - b _0801E80E -_0801E802: + b @0801E80E +@0801E802: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 - bne _0801E830 -_0801E80E: + bne @0801E830 +@0801E80E: ldr r0, =0x02022c84 ldr r1, [r0] -_0801E812: +@0801E812: ldrh r0, [r1, 0x6] adds r0, 0x1 strh r0, [r1, 0x6] - b _0801E830 + b @0801E830 .align 2, 0 .pool -_0801E820: +@0801E820: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _0801E830 + beq @0801E830 movs r0, 0x1 bl sub_801EBD4 -_0801E830: +@0801E830: pop {r4} pop {r0} bx r0 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] ldrh r0, [r0, 0x6] cmp r0, 0x6 - bls _0801E846 - b _0801E968 -_0801E846: + bls @0801E846 + b @0801E968 +@0801E846: lsls r0, 2 - ldr r1, =_0801E858 + ldr r1, =@0801E858 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801E858: - .4byte _0801E874 - .4byte _0801E8A4 - .4byte _0801E8F8 - .4byte _0801E910 - .4byte _0801E920 - .4byte _0801E934 - .4byte _0801E94C -_0801E874: +@0801E858: + .4byte @0801E874 + .4byte @0801E8A4 + .4byte @0801E8F8 + .4byte @0801E910 + .4byte @0801E920 + .4byte @0801E934 + .4byte @0801E94C +@0801E874: bl sub_801EDC4 cmp r0, 0 - beq _0801E890 + beq @0801E890 movs r0, 0x9 movs r1, 0 bl sub_801F5EC ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x2 - b _0801E966 + b @0801E966 .align 2, 0 .pool -_0801E890: +@0801E890: movs r0, 0xD movs r1, 0 bl sub_801F5EC ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x5 - b _0801E966 + b @0801E966 .align 2, 0 .pool -_0801E8A4: +@0801E8A4: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0801E8CC + beq @0801E8CC bl sub_801EDE0 movs r0, 0xB movs r1, 0 @@ -43519,88 +43519,88 @@ _0801E8A4: ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x3 - b _0801E966 + b @0801E966 .align 2, 0 .pool -_0801E8CC: +@0801E8CC: movs r4, 0x2 adds r0, r4, 0 ands r0, r1 cmp r0, 0 - beq _0801E8DA + beq @0801E8DA movs r0, 0xA - b _0801E95A -_0801E8DA: + b @0801E95A +@0801E8DA: bl sub_801EBE4 cmp r0, 0 - beq _0801E968 + beq @0801E968 movs r0, 0x1 movs r1, 0 bl sub_801F5EC ldr r0, =0x02022c84 ldr r0, [r0] strh r4, [r0, 0x6] - b _0801E968 + b @0801E968 .align 2, 0 .pool -_0801E8F8: +@0801E8F8: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 - bne _0801E968 + bne @0801E968 ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x1 - b _0801E966 + b @0801E966 .align 2, 0 .pool -_0801E910: +@0801E910: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 - bne _0801E968 + bne @0801E968 movs r0, 0xA - b _0801E95A -_0801E920: + b @0801E95A +@0801E920: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 - bne _0801E968 + bne @0801E968 movs r0, 0x1 bl sub_801EBD4 - b _0801E968 -_0801E934: + b @0801E968 +@0801E934: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 - bne _0801E968 + bne @0801E968 ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x6 - b _0801E966 + b @0801E966 .align 2, 0 .pool -_0801E94C: +@0801E94C: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _0801E968 + beq @0801E968 movs r0, 0x7 -_0801E95A: +@0801E95A: movs r1, 0 bl sub_801F5EC ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x4 -_0801E966: +@0801E966: strh r0, [r1, 0x6] -_0801E968: +@0801E968: pop {r4} pop {r0} bx r0 @@ -43609,7 +43609,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 @@ -43617,54 +43617,54 @@ sub_801E978: @ 801E978 ldrh r0, [r0, 0x6] adds r4, r1, 0 cmp r0, 0xD - bls _0801E98A - b _0801EBC2 -_0801E98A: + bls @0801E98A + b @0801EBC2 +@0801E98A: lsls r0, 2 - ldr r1, =_0801E99C + ldr r1, =@0801E99C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801E99C: - .4byte _0801E9D4 - .4byte _0801E9EE - .4byte _0801EA14 - .4byte _0801EA58 - .4byte _0801EA7C - .4byte _0801EA98 - .4byte _0801EADC - .4byte _0801EB04 - .4byte _0801EB28 - .4byte _0801EB40 - .4byte _0801EB64 - .4byte _0801EB72 - .4byte _0801EB88 - .4byte _0801EBA8 -_0801E9D4: +@0801E99C: + .4byte @0801E9D4 + .4byte @0801E9EE + .4byte @0801EA14 + .4byte @0801EA58 + .4byte @0801EA7C + .4byte @0801EA98 + .4byte @0801EADC + .4byte @0801EB04 + .4byte @0801EB28 + .4byte @0801EB40 + .4byte @0801EB64 + .4byte @0801EB72 + .4byte @0801EB88 + .4byte @0801EBA8 +@0801E9D4: ldr r1, [r4] ldrb r0, [r1, 0x18] cmp r0, 0 - bne _0801E9DE - b _0801EB82 -_0801E9DE: + bne @0801E9DE + b @0801EB82 +@0801E9DE: movs r0, 0x7 movs r1, 0 bl sub_801F5EC ldr r1, [r4] movs r0, 0x1 strh r0, [r1, 0x6] - b _0801EBC2 -_0801E9EE: + b @0801EBC2 +@0801E9EE: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 - beq _0801E9FC - b _0801EBC2 -_0801E9FC: + beq @0801E9FC + b @0801EBC2 +@0801E9FC: movs r0, 0xE movs r1, 0 bl sub_801F5EC @@ -43672,33 +43672,33 @@ _0801E9FC: ldr r1, [r0] movs r0, 0x2 strh r0, [r1, 0x6] - b _0801EBC2 + b @0801EBC2 .align 2, 0 .pool -_0801EA14: +@0801EA14: bl sub_801FF08 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _0801EA40 + beq @0801EA40 cmp r1, 0 - bgt _0801EA2E + bgt @0801EA2E movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _0801EA34 - b _0801EBC2 -_0801EA2E: + beq @0801EA34 + b @0801EBC2 +@0801EA2E: cmp r1, 0x1 - beq _0801EA34 - b _0801EBC2 -_0801EA34: + beq @0801EA34 + b @0801EBC2 +@0801EA34: ldr r0, =0x02022c84 ldr r1, [r0] - b _0801EB82 + b @0801EB82 .align 2, 0 .pool -_0801EA40: +@0801EA40: movs r0, 0x7 movs r1, 0 bl sub_801F5EC @@ -43706,17 +43706,17 @@ _0801EA40: ldr r1, [r0] movs r0, 0x3 strh r0, [r1, 0x6] - b _0801EBC2 + b @0801EBC2 .align 2, 0 .pool -_0801EA58: +@0801EA58: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 - beq _0801EA66 - b _0801EBC2 -_0801EA66: + beq @0801EA66 + b @0801EBC2 +@0801EA66: movs r0, 0xF movs r1, 0 bl sub_801F5EC @@ -43724,48 +43724,48 @@ _0801EA66: ldr r1, [r0] movs r0, 0x4 strh r0, [r1, 0x6] - b _0801EBC2 + b @0801EBC2 .align 2, 0 .pool -_0801EA7C: +@0801EA7C: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 - beq _0801EA8A - b _0801EBC2 -_0801EA8A: + beq @0801EA8A + b @0801EBC2 +@0801EA8A: ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x5 strh r0, [r1, 0x6] - b _0801EBC2 + b @0801EBC2 .align 2, 0 .pool -_0801EA98: +@0801EA98: bl sub_801FF08 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _0801EAC4 + beq @0801EAC4 cmp r1, 0 - bgt _0801EAB2 + bgt @0801EAB2 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _0801EAB8 - b _0801EBC2 -_0801EAB2: + beq @0801EAB8 + b @0801EBC2 +@0801EAB2: cmp r1, 0x1 - beq _0801EAB8 - b _0801EBC2 -_0801EAB8: + beq @0801EAB8 + b @0801EBC2 +@0801EAB8: ldr r0, =0x02022c84 ldr r1, [r0] - b _0801EB82 + b @0801EB82 .align 2, 0 .pool -_0801EAC4: +@0801EAC4: movs r0, 0x7 movs r1, 0 bl sub_801F5EC @@ -43773,15 +43773,15 @@ _0801EAC4: ldr r1, [r0] movs r0, 0x6 strh r0, [r1, 0x6] - b _0801EBC2 + b @0801EBC2 .align 2, 0 .pool -_0801EADC: +@0801EADC: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 - bne _0801EBC2 + bne @0801EBC2 movs r0, 0x10 movs r1, 0 bl sub_801F5EC @@ -43790,15 +43790,15 @@ _0801EADC: ldr r1, [r0] movs r0, 0x7 strh r0, [r1, 0x6] - b _0801EBC2 + b @0801EBC2 .align 2, 0 .pool -_0801EB04: +@0801EB04: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 - bne _0801EBC2 + bne @0801EBC2 bl sub_8076D5C movs r0, 0 bl save_game_when_memory_present @@ -43806,10 +43806,10 @@ _0801EB04: ldr r1, [r0] movs r0, 0x8 strh r0, [r1, 0x6] - b _0801EBC2 + b @0801EBC2 .align 2, 0 .pool -_0801EB28: +@0801EB28: movs r0, 0x11 movs r1, 0 bl sub_801F5EC @@ -43817,15 +43817,15 @@ _0801EB28: ldr r1, [r0] movs r0, 0x9 strh r0, [r1, 0x6] - b _0801EBC2 + b @0801EBC2 .align 2, 0 .pool -_0801EB40: +@0801EB40: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 - bne _0801EBC2 + bne @0801EBC2 movs r0, 0x37 bl audio_play bl sav2_gender2_inplace_and_xFE @@ -43833,18 +43833,18 @@ _0801EB40: ldr r1, [r0] movs r0, 0xA strh r0, [r1, 0x6] - b _0801EBC2 + b @0801EBC2 .align 2, 0 .pool -_0801EB64: +@0801EB64: ldr r1, [r4] movs r0, 0 strb r0, [r1, 0x19] ldr r1, [r4] movs r0, 0xB strh r0, [r1, 0x6] - b _0801EBC2 -_0801EB72: + b @0801EBC2 +@0801EB72: ldr r0, [r4] ldrb r1, [r0, 0x19] adds r1, 0x1 @@ -43852,12 +43852,12 @@ _0801EB72: ldr r1, [r4] ldrb r0, [r1, 0x19] cmp r0, 0x78 - bls _0801EBC2 -_0801EB82: + bls @0801EBC2 +@0801EB82: movs r0, 0xC strh r0, [r1, 0x6] - b _0801EBC2 -_0801EB88: + b @0801EBC2 +@0801EB88: movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -43870,21 +43870,21 @@ _0801EB88: ldr r1, [r0] movs r0, 0xD strh r0, [r1, 0x6] - b _0801EBC2 + b @0801EBC2 .align 2, 0 .pool -_0801EBA8: +@0801EBA8: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0801EBC2 + bne @0801EBC2 bl sub_801F544 bl sub_801DE30 ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 -_0801EBC2: +@0801EBC2: add sp, 0x4 pop {r4} pop {r0} @@ -43894,7 +43894,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 @@ -43906,7 +43906,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] @@ -43915,11 +43915,11 @@ sub_801EBE4: @ 801EBE4 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0 - bne _0801EC6E + bne @0801EC6E movs r0, 0x80 ands r0, r2 cmp r0, 0 - beq _0801EC24 + beq @0801EC24 ldr r0, =0x02022c84 ldr r2, [r0] ldr r1, =0x082f2aa4 @@ -43928,75 +43928,75 @@ sub_801EBE4: @ 801EBE4 ldrb r1, [r2, 0x12] ldrb r0, [r0] cmp r1, r0 - bcs _0801EC20 + bcs @0801EC20 adds r0, r1, 0x1 - b _0801EC88 + b @0801EC88 .align 2, 0 .pool -_0801EC20: +@0801EC20: strb r3, [r2, 0x12] - b _0801EC8A -_0801EC24: + b @0801EC8A +@0801EC24: ldr r0, =0x02022c84 ldr r1, [r0] ldrb r0, [r1, 0x10] cmp r0, 0x3 - beq _0801EC6A + beq @0801EC6A movs r0, 0x20 ands r0, r2 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0 - beq _0801EC52 + beq @0801EC52 ldrb r0, [r1, 0x11] cmp r0, 0 - beq _0801EC4C + beq @0801EC4C subs r0, 0x1 strb r0, [r1, 0x11] - b _0801EC8A + b @0801EC8A .align 2, 0 .pool -_0801EC4C: +@0801EC4C: movs r0, 0x4 strb r0, [r1, 0x11] - b _0801EC8A -_0801EC52: + b @0801EC8A +@0801EC52: movs r0, 0x10 ands r0, r2 cmp r0, 0 - beq _0801EC6A + beq @0801EC6A ldrb r0, [r1, 0x11] cmp r0, 0x3 - bhi _0801EC66 + bhi @0801EC66 adds r0, 0x1 strb r0, [r1, 0x11] - b _0801EC8A -_0801EC66: + b @0801EC8A +@0801EC66: strb r3, [r1, 0x11] - b _0801EC8A -_0801EC6A: + b @0801EC8A +@0801EC6A: movs r0, 0 - b _0801EC8C -_0801EC6E: + b @0801EC8C +@0801EC6E: ldr r0, =0x02022c84 ldr r2, [r0] ldrb r0, [r2, 0x12] cmp r0, 0 - beq _0801EC80 + beq @0801EC80 subs r0, 0x1 - b _0801EC88 + b @0801EC88 .align 2, 0 .pool -_0801EC80: +@0801EC80: ldr r0, =0x082f2aa4 ldrb r1, [r2, 0x10] adds r1, r0 ldrb r0, [r1] -_0801EC88: +@0801EC88: strb r0, [r2, 0x12] -_0801EC8A: +@0801EC8A: movs r0, 0x1 -_0801EC8C: +@0801EC8C: pop {r1} bx r1 .align 2, 0 @@ -44004,14 +44004,14 @@ _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 ldr r5, [r0] ldrb r0, [r5, 0x10] cmp r0, 0x3 - beq _0801ECDC + beq @0801ECDC ldr r3, =0x082f2ba8 ldrb r1, [r5, 0x12] lsls r1, 2 @@ -44024,24 +44024,24 @@ sub_801EC94: @ 801EC94 ldr r4, [r1] ldrb r0, [r5, 0x11] cmp r0, 0 - beq _0801ECCE + beq @0801ECCE adds r1, r0, 0 -_0801ECBE: +@0801ECBE: ldrb r0, [r4] cmp r0, 0xF9 - bne _0801ECC6 + bne @0801ECC6 adds r4, 0x1 -_0801ECC6: +@0801ECC6: adds r4, 0x1 subs r1, 0x1 cmp r1, 0 - bne _0801ECBE -_0801ECCE: + bne @0801ECBE +@0801ECCE: movs r5, 0x1 - b _0801ED02 + b @0801ED02 .align 2, 0 .pool -_0801ECDC: +@0801ECDC: ldrb r0, [r5, 0x12] lsls r1, r0, 2 adds r1, r0 @@ -44059,33 +44059,33 @@ _0801ECDC: mov r0, sp bl sub_80091CC adds r5, r0, 0 -_0801ED02: +@0801ED02: ldr r6, =0x02022c84 ldr r1, [r6] ldrb r0, [r1, 0x15] strb r0, [r1, 0x14] cmp r4, 0 - beq _0801ED5A + beq @0801ED5A bl sub_801EE84 adds r2, r0, 0 subs r5, 0x1 movs r0, 0x1 negs r0, r0 cmp r5, r0 - beq _0801ED56 + beq @0801ED56 ldr r0, [r6] ldrb r0, [r0, 0x15] cmp r0, 0xE - bhi _0801ED56 + bhi @0801ED56 adds r3, r6, 0 -_0801ED28: +@0801ED28: ldrb r0, [r4] cmp r0, 0xF9 - bne _0801ED34 + bne @0801ED34 strb r0, [r2] adds r4, 0x1 adds r2, 0x1 -_0801ED34: +@0801ED34: ldrb r0, [r4] strb r0, [r2] adds r4, 0x1 @@ -44098,15 +44098,15 @@ _0801ED34: movs r0, 0x1 negs r0, r0 cmp r5, r0 - beq _0801ED56 + beq @0801ED56 ldr r0, [r3] ldrb r0, [r0, 0x15] cmp r0, 0xE - bls _0801ED28 -_0801ED56: + bls @0801ED28 +@0801ED56: movs r0, 0xFF strb r0, [r2] -_0801ED5A: +@0801ED5A: add sp, 0x18 pop {r4-r6} pop {r0} @@ -44116,7 +44116,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] @@ -44125,7 +44125,7 @@ sub_801ED68: @ 801ED68 ldr r0, [r4] ldrb r0, [r0, 0x15] cmp r0, 0 - beq _0801ED8A + beq @0801ED8A bl sub_801EEA8 movs r1, 0xFF strb r1, [r0] @@ -44133,7 +44133,7 @@ sub_801ED68: @ 801ED68 ldrb r0, [r1, 0x15] subs r0, 0x1 strb r0, [r1, 0x15] -_0801ED8A: +@0801ED8A: pop {r4} pop {r0} bx r0 @@ -44142,7 +44142,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] @@ -44153,14 +44153,14 @@ sub_801ED94: @ 801ED94 adds r2, r0, 0 ldrb r0, [r2] cmp r0, 0xF9 - beq _0801EDB8 + beq @0801EDB8 ldr r1, =0x082f2aa8 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _0801EDB8 + beq @0801EDB8 strb r0, [r2] -_0801EDB8: +@0801EDB8: pop {r0} bx r0 .align 2, 0 @@ -44168,26 +44168,26 @@ _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] ldrb r0, [r0, 0x15] cmp r0, 0 - bne _0801EDD8 + bne @0801EDD8 movs r0, 0 - b _0801EDDA + b @0801EDDA .align 2, 0 .pool -_0801EDD8: +@0801EDD8: movs r0, 0x1 -_0801EDDA: +@0801EDDA: pop {r1} bx r1 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 @@ -44212,7 +44212,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 @@ -44229,7 +44229,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} @@ -44239,7 +44239,7 @@ sub_801EE2C: @ 801EE2C movs r6, 0xB9 ldr r5, =0x00003c88 movs r4, 0x9 -_0801EE3E: +@0801EE3E: mov r1, r8 ldr r0, [r1] adds r0, r5 @@ -44250,7 +44250,7 @@ _0801EE3E: adds r5, 0x15 subs r4, 0x1 cmp r4, 0 - bge _0801EE3E + bge @0801EE3E pop {r3} mov r8, r3 pop {r4-r7} @@ -44261,7 +44261,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 @@ -44276,7 +44276,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] @@ -44284,13 +44284,13 @@ sub_801EE84: @ 801EE84 adds r1, 0x1A ldrb r0, [r0, 0x1A] cmp r0, 0xFF - beq _0801EE9C -_0801EE94: + beq @0801EE9C +@0801EE94: adds r1, 0x1 ldrb r0, [r1] cmp r0, 0xFF - bne _0801EE94 -_0801EE9C: + bne @0801EE94 +@0801EE9C: adds r0, r1, 0 pop {r1} bx r1 @@ -44299,7 +44299,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] @@ -44308,19 +44308,19 @@ sub_801EEA8: @ 801EEA8 adds r1, r2, 0 ldrb r0, [r0, 0x1A] cmp r0, 0xFF - beq _0801EECC -_0801EEBA: + beq @0801EECC +@0801EEBA: adds r2, r1, 0 ldrb r0, [r2] cmp r0, 0xF9 - bne _0801EEC4 + bne @0801EEC4 adds r1, r2, 0x1 -_0801EEC4: +@0801EEC4: adds r1, 0x1 ldrb r0, [r1] cmp r0, 0xFF - bne _0801EEBA -_0801EECC: + bne @0801EEBA +@0801EECC: adds r0, r2, 0 pop {r1} bx r1 @@ -44329,7 +44329,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] @@ -44341,23 +44341,23 @@ sub_801EED8: @ 801EED8 adds r1, 0x1A movs r4, 0 cmp r2, 0xA - bls _0801EF0C + bls @0801EF0C subs r2, 0xA movs r3, 0 cmp r4, r2 - bcs _0801EF0C -_0801EEFA: + bcs @0801EF0C +@0801EEFA: ldrb r0, [r1] cmp r0, 0xF9 - bne _0801EF02 + bne @0801EF02 adds r1, 0x1 -_0801EF02: +@0801EF02: adds r1, 0x1 adds r4, 0x1 adds r3, 0x1 cmp r3, r2 - bcc _0801EEFA -_0801EF0C: + bcc @0801EEFA +@0801EF0C: lsls r0, r4, 16 lsrs r0, 16 pop {r4} @@ -44368,14 +44368,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 @@ -44396,7 +44396,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 @@ -44419,7 +44419,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 @@ -44441,7 +44441,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 @@ -44462,7 +44462,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 @@ -44483,7 +44483,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 @@ -44493,34 +44493,34 @@ sub_801EFF8: @ 801EFF8 adds r5, r4, 0 adds r5, 0x8 cmp r0, 0x2 - beq _0801F020 + beq @0801F020 cmp r0, 0x2 - bgt _0801F016 + bgt @0801F016 cmp r0, 0x1 - beq _0801F044 - b _0801F0A8 -_0801F016: + beq @0801F044 + b @0801F0A8 +@0801F016: cmp r1, 0x3 - beq _0801F07A + beq @0801F07A cmp r1, 0x5 - beq _0801F06E - b _0801F0A8 -_0801F020: + beq @0801F06E + b @0801F0A8 +@0801F020: ldr r0, =0x02022c84 ldr r0, [r0] ldrb r0, [r0, 0x13] ldrb r1, [r4, 0x8] cmp r0, r1 - beq _0801F0A8 + beq @0801F0A8 bl sub_81AFBF0 movs r0, 0 adds r1, r4, 0 bl sub_81AFC0C ldr r1, =0x085ed2a9 - b _0801F094 + b @0801F094 .align 2, 0 .pool -_0801F044: +@0801F044: adds r0, r6, 0 adds r1, r4, 0 bl gf_strcpy @@ -44539,42 +44539,42 @@ _0801F044: adds r1, r5, 0 bl gf_strcpy movs r0, 0x1 - b _0801F0AA -_0801F06E: + b @0801F0AA +@0801F06E: ldr r0, =0x02022c84 ldr r0, [r0] adds r0, 0x79 adds r1, r4, 0 bl gf_strcpy -_0801F07A: +@0801F07A: ldr r0, =0x02022c84 ldr r0, [r0] ldrb r0, [r0, 0x13] ldrb r5, [r5] cmp r0, r5 - beq _0801F0A8 + beq @0801F0A8 bl sub_81AFBF0 movs r0, 0 adds r1, r4, 0 bl sub_81AFC0C ldr r1, =0x085ed2bd -_0801F094: +@0801F094: adds r0, r6, 0 bl sub_81AFC28 movs r0, 0x1 - b _0801F0AA + b @0801F0AA .align 2, 0 .pool -_0801F0A8: +@0801F0A8: movs r0, 0 -_0801F0AA: +@0801F0AA: pop {r4-r6} pop {r1} bx r1 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] @@ -44584,7 +44584,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] @@ -44597,7 +44597,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 @@ -44607,7 +44607,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 sub_80091CC @@ -44616,7 +44616,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 @@ -44625,15 +44625,15 @@ sub_801F0EC: @ 801F0EC ldrb r2, [r0, 0x14] subs r0, r3, r2 cmp r0, 0 - bge _0801F108 + bge @0801F108 negs r0, r0 str r3, [r4] - b _0801F10A + b @0801F10A .align 2, 0 .pool -_0801F108: +@0801F108: str r2, [r4] -_0801F10A: +@0801F10A: str r0, [r1] pop {r4} pop {r0} @@ -44641,7 +44641,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 @@ -44651,18 +44651,18 @@ sub_801F114: @ 801F114 adds r1, r0, 0 adds r1, 0x1A cmp r2, 0 - beq _0801F13A -_0801F12A: + beq @0801F13A +@0801F12A: ldrb r0, [r1] cmp r0, 0xF9 - bne _0801F132 + bne @0801F132 adds r1, 0x1 -_0801F132: +@0801F132: adds r1, 0x1 subs r2, 0x1 cmp r2, 0 - bne _0801F12A -_0801F13A: + bne @0801F12A +@0801F13A: adds r0, r1, 0 pop {r1} bx r1 @@ -44671,7 +44671,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 @@ -44683,21 +44683,21 @@ sub_801F144: @ 801F144 movs r2, 0 movs r3, 0 cmp r2, r4 - bcs _0801F174 -_0801F15E: + bcs @0801F174 +@0801F15E: ldrb r0, [r1] cmp r0, 0xF9 - bne _0801F166 + bne @0801F166 adds r1, 0x1 -_0801F166: +@0801F166: adds r1, 0x1 adds r0, r2, 0x1 lsls r0, 16 lsrs r2, r0, 16 adds r3, 0x1 cmp r3, r4 - bcc _0801F15E -_0801F174: + bcc @0801F15E +@0801F174: adds r0, r2, 0 pop {r4} pop {r1} @@ -44707,7 +44707,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 @@ -44717,7 +44717,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] @@ -44727,7 +44727,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] @@ -44737,33 +44737,33 @@ 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] cmp r1, 0xFF - bhi _0801F1BE + bhi @0801F1BE ldr r0, =0x082f2aa8 adds r0, r1, r0 ldrb r0, [r0] cmp r0, r1 - beq _0801F1BE + beq @0801F1BE cmp r0, 0 - bne _0801F1C8 -_0801F1BE: + bne @0801F1C8 +@0801F1BE: movs r0, 0x3 - b _0801F1CA + b @0801F1CA .align 2, 0 .pool -_0801F1C8: +@0801F1C8: movs r0, 0 -_0801F1CA: +@0801F1CA: pop {r1} bx r1 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 @@ -44773,7 +44773,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] @@ -44834,7 +44834,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 @@ -44846,36 +44846,36 @@ sub_801F2B4: @ 801F2B4 movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0x7 - bls _0801F2CE - b _0801F4C4 -_0801F2CE: + bls @0801F2CE + b @0801F4C4 +@0801F2CE: lsls r0, 2 - ldr r1, =_0801F2E0 + ldr r1, =@0801F2E0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801F2E0: - .4byte _0801F300 - .4byte _0801F30E - .4byte _0801F4A8 - .4byte _0801F35C - .4byte _0801F448 - .4byte _0801F480 - .4byte _0801F494 - .4byte _0801F438 -_0801F300: +@0801F2E0: + .4byte @0801F300 + .4byte @0801F30E + .4byte @0801F4A8 + .4byte @0801F35C + .4byte @0801F448 + .4byte @0801F480 + .4byte @0801F494 + .4byte @0801F438 +@0801F300: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _0801F30A - b _0801F49C -_0801F30A: + bne @0801F30A + b @0801F49C +@0801F30A: movs r0, 0x1 strh r0, [r4] -_0801F30E: +@0801F30E: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 @@ -44887,35 +44887,35 @@ _0801F30E: movs r5, 0x8 ldrsh r0, [r4, r5] cmp r1, r0 - beq _0801F33C + beq @0801F33C movs r0, 0x2 strh r0, [r4] ldr r0, [r3] strb r2, [r0, 0xD] - b _0801F4C4 + b @0801F4C4 .align 2, 0 .pool -_0801F33C: +@0801F33C: bl sub_800A550 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x6] cmp r0, 0 - bne _0801F354 + bne @0801F354 bl sub_8011A9C cmp r0, 0 - beq _0801F354 - b _0801F4C4 -_0801F354: + beq @0801F354 + b @0801F4C4 +@0801F354: movs r0, 0 strh r0, [r4, 0x2] movs r0, 0x3 strh r0, [r4] -_0801F35C: +@0801F35C: movs r1, 0x2 ldrsh r0, [r4, r1] cmp r0, 0x4 - bgt _0801F396 + bgt @0801F396 movs r2, 0x6 ldrsh r0, [r4, r2] movs r3, 0x2 @@ -44924,16 +44924,16 @@ _0801F35C: movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _0801F396 + bne @0801F396 movs r2, 0x1 -_0801F378: +@0801F378: ldrh r0, [r4, 0x2] adds r0, 0x1 strh r0, [r4, 0x2] lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bgt _0801F396 + bgt @0801F396 movs r5, 0x6 ldrsh r0, [r4, r5] movs r3, 0x2 @@ -44941,15 +44941,15 @@ _0801F378: asrs r0, r1 ands r0, r2 cmp r0, 0 - beq _0801F378 -_0801F396: + beq @0801F378 +@0801F396: ldrh r1, [r4, 0x2] movs r5, 0x2 ldrsh r0, [r4, r5] cmp r0, 0x5 - bne _0801F3A2 - b _0801F4C0 -_0801F3A2: + bne @0801F3A2 + b @0801F4C0 +@0801F3A2: strh r1, [r4, 0x4] lsls r0, r1, 24 lsrs r0, 24 @@ -44962,36 +44962,36 @@ _0801F3A2: ldrb r0, [r0] subs r0, 0x1 cmp r0, 0x4 - bhi _0801F3E4 + bhi @0801F3E4 lsls r0, 2 - ldr r1, =_0801F3D0 + ldr r1, =@0801F3D0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801F3D0: - .4byte _0801F3E4 - .4byte _0801F3E8 - .4byte _0801F3EC - .4byte _0801F3F0 - .4byte _0801F3F4 -_0801F3E4: +@0801F3D0: + .4byte @0801F3E4 + .4byte @0801F3E8 + .4byte @0801F3EC + .4byte @0801F3F0 + .4byte @0801F3F4 +@0801F3E4: movs r0, 0x3 - b _0801F3F6 -_0801F3E8: + b @0801F3F6 +@0801F3E8: movs r0, 0x3 - b _0801F3F6 -_0801F3EC: + b @0801F3F6 +@0801F3EC: movs r0, 0x4 - b _0801F3F6 -_0801F3F0: + b @0801F3F6 +@0801F3F0: movs r0, 0x5 - b _0801F3F6 -_0801F3F4: + b @0801F3F6 +@0801F3F4: movs r0, 0x6 -_0801F3F6: +@0801F3F6: strh r0, [r4, 0xA] ldr r5, =0x02022c84 ldr r0, [r5] @@ -45003,7 +45003,7 @@ _0801F3F6: adds r1, r2 bl sub_801EFF8 cmp r0, 0 - beq _0801F42C + beq @0801F42C ldr r0, [r5] ldrh r1, [r4, 0x2] strb r1, [r0, 0x16] @@ -45011,91 +45011,91 @@ _0801F3F6: movs r1, 0x2 bl sub_801F5EC movs r0, 0x7 - b _0801F42E + b @0801F42E .align 2, 0 .pool -_0801F42C: +@0801F42C: ldrh r0, [r4, 0xA] -_0801F42E: +@0801F42E: strh r0, [r4] ldrh r0, [r4, 0x2] adds r0, 0x1 strh r0, [r4, 0x2] - b _0801F4C4 -_0801F438: + b @0801F4C4 +@0801F438: movs r0, 0x2 bl sub_801F644 lsls r0, 24 cmp r0, 0 - bne _0801F4C4 + bne @0801F4C4 ldrh r0, [r4, 0xA] - b _0801F4C2 -_0801F448: + b @0801F4C2 +@0801F448: ldr r6, =0x02022c84 ldr r0, [r6] ldrb r0, [r0, 0x13] cmp r0, 0 - bne _0801F47C + bne @0801F47C movs r3, 0x4 ldrsh r0, [r4, r3] cmp r0, 0 - beq _0801F47C + beq @0801F47C bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _0801F474 + bne @0801F474 bl sub_80104B0 ldr r1, [r6] movs r0, 0x1 - b _0801F49A + b @0801F49A .align 2, 0 .pool -_0801F474: +@0801F474: movs r5, 0x4 ldrsh r0, [r4, r5] bl sub_8011DE0 -_0801F47C: +@0801F47C: movs r0, 0x3 - b _0801F4C2 -_0801F480: + b @0801F4C2 +@0801F480: ldr r0, =0x02022c84 ldr r1, [r0] ldrb r0, [r1, 0x13] cmp r0, 0 - beq _0801F49C + beq @0801F49C movs r0, 0x2 - b _0801F49A + b @0801F49A .align 2, 0 .pool -_0801F494: +@0801F494: ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x3 -_0801F49A: +@0801F49A: strb r0, [r1, 0x17] -_0801F49C: +@0801F49C: adds r0, r5, 0 bl remove_task - b _0801F4C4 + b @0801F4C4 .align 2, 0 .pool -_0801F4A8: +@0801F4A8: bl sub_8011A9C cmp r0, 0 - bne _0801F4C4 + bne @0801F4C4 ldr r0, =0x02022c84 ldr r1, [r0] ldrb r0, [r1, 0x13] cmp r0, 0 - bne _0801F4C0 + bne @0801F4C0 ldrb r0, [r1, 0xD] bl sub_80110B8 -_0801F4C0: +@0801F4C0: movs r0, 0x1 -_0801F4C2: +@0801F4C2: strh r0, [r4] -_0801F4C4: +@0801F4C4: pop {r4-r6} pop {r0} bx r0 @@ -45104,17 +45104,17 @@ _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 bl malloc str r0, [r4] cmp r0, 0 - beq _0801F52C + beq @0801F52C bl sub_8020890 cmp r0, 0 - beq _0801F52C + beq @0801F52C movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags ldr r1, =0x082f2c60 @@ -45132,19 +45132,19 @@ sub_801F4D0: @ 801F4D0 movs r1, 0 bl sub_801F5EC movs r0, 0x1 - b _0801F52E + b @0801F52E .align 2, 0 .pool -_0801F52C: +@0801F52C: movs r0, 0 -_0801F52E: +@0801F52E: pop {r4} pop {r1} bx r1 thumb_func_end sub_801F4D0 thumb_func_start sub_801F534 -sub_801F534: @ 801F534 +sub_801F534: ; 801F534 push {lr} movs r0, 0 bl sub_801F644 @@ -45155,17 +45155,17 @@ 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 ldr r0, [r4] cmp r0, 0 - beq _0801F55A + beq @0801F55A bl free movs r0, 0 str r0, [r4] -_0801F55A: +@0801F55A: bl Window_FreeMemory ldr r1, =0x02039b28 movs r0, 0x3 @@ -45178,7 +45178,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] @@ -45188,17 +45188,17 @@ 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] cmp r0, 0 - beq _0801F5A8 + beq @0801F5A8 movs r2, 0 adds r4, r1, 0 ldr r5, =sub_801FDD8 + 1 movs r3, 0 -_0801F592: +@0801F592: ldr r0, [r4] lsls r1, r2, 3 adds r0, r1 @@ -45209,8 +45209,8 @@ _0801F592: strb r3, [r0, 0x5] adds r2, 0x1 cmp r2, 0x2 - ble _0801F592 -_0801F5A8: + ble @0801F592 +@0801F5A8: pop {r4,r5} pop {r0} bx r0 @@ -45219,15 +45219,15 @@ _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] cmp r0, 0 - beq _0801F5E0 + beq @0801F5E0 movs r5, 0 adds r6, r1, 0 -_0801F5C6: +@0801F5C6: ldr r1, [r6] lsls r4, r5, 3 adds r1, r4 @@ -45239,8 +45239,8 @@ _0801F5C6: strb r0, [r1, 0x4] adds r5, 0x1 cmp r5, 0x2 - ble _0801F5C6 -_0801F5E0: + ble @0801F5C6 +@0801F5E0: pop {r4-r6} pop {r0} bx r0 @@ -45249,7 +45249,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 @@ -45267,10 +45267,10 @@ sub_801F5EC: @ 801F5EC ldr r1, =0x082f2c98 movs r7, 0x1 adds r2, r1, 0x4 -_0801F60E: +@0801F60E: ldrh r0, [r1] cmp r0, r6 - bne _0801F634 + bne @0801F634 ldr r1, [r5] adds r1, r3 ldr r0, [r2] @@ -45280,23 +45280,23 @@ _0801F60E: adds r0, r3 mov r1, r12 strb r1, [r0, 0x5] - b _0801F63E + b @0801F63E .align 2, 0 .pool -_0801F634: +@0801F634: adds r1, 0x8 adds r2, 0x8 adds r4, 0x1 cmp r4, 0x14 - bls _0801F60E -_0801F63E: + bls @0801F60E +@0801F63E: pop {r4-r7} pop {r0} bx r0 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] @@ -45309,200 +45309,200 @@ 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 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0801F6EE + beq @0801F6EE ldrb r0, [r4] cmp r0, 0x6 - bhi _0801F6E4 + bhi @0801F6E4 lsls r0, 2 - ldr r1, =_0801F67C + ldr r1, =@0801F67C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801F67C: - .4byte _0801F698 - .4byte _0801F6A2 - .4byte _0801F6A8 - .4byte _0801F6AE - .4byte _0801F6B4 - .4byte _0801F6BA - .4byte _0801F6CC -_0801F698: +@0801F67C: + .4byte @0801F698 + .4byte @0801F6A2 + .4byte @0801F6A8 + .4byte @0801F6AE + .4byte @0801F6B4 + .4byte @0801F6BA + .4byte @0801F6CC +@0801F698: bl sub_8020480 bl sub_8020538 - b _0801F6E8 -_0801F6A2: + b @0801F6E8 +@0801F6A2: bl sub_8020584 - b _0801F6E8 -_0801F6A8: + b @0801F6E8 +@0801F6A8: bl sub_80205B4 - b _0801F6E8 -_0801F6AE: + b @0801F6E8 +@0801F6AE: bl task_tutorial_story_unknown - b _0801F6E8 -_0801F6B4: + b @0801F6E8 +@0801F6B4: bl sub_8020680 - b _0801F6E8 -_0801F6BA: + b @0801F6E8 +@0801F6BA: bl sub_80206A4 bl sub_80206D0 bl sub_8020740 bl sub_80206E8 - b _0801F6E8 -_0801F6CC: + b @0801F6E8 +@0801F6CC: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0801F6E8 + bne @0801F6E8 bl sub_80208E8 bl sub_8020A68 bl sub_8020B20 - b _0801F6E8 -_0801F6E4: + b @0801F6E8 +@0801F6E4: movs r0, 0 - b _0801F6F0 -_0801F6E8: + b @0801F6F0 +@0801F6E8: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] -_0801F6EE: +@0801F6EE: movs r0, 0x1 -_0801F6F0: +@0801F6F0: pop {r4} pop {r1} bx r1 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] cmp r0, 0 - beq _0801F708 + beq @0801F708 cmp r0, 0x1 - beq _0801F716 - b _0801F720 -_0801F708: + beq @0801F716 + b @0801F720 +@0801F708: bl sub_80203B0 movs r0, 0x3 movs r1, 0x3 bl Window_CopyToVram - b _0801F720 -_0801F716: + b @0801F720 +@0801F716: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 - b _0801F728 -_0801F720: + b @0801F728 +@0801F720: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] movs r0, 0x1 -_0801F728: +@0801F728: pop {r4} pop {r1} bx r1 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] cmp r0, 0 - beq _0801F740 + beq @0801F740 cmp r0, 0x1 - beq _0801F74E - b _0801F758 -_0801F740: + beq @0801F74E + b @0801F758 +@0801F740: bl sub_802040C movs r0, 0x3 movs r1, 0x3 bl Window_CopyToVram - b _0801F758 -_0801F74E: + b @0801F758 +@0801F74E: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 - b _0801F760 -_0801F758: + b @0801F760 +@0801F758: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] movs r0, 0x1 -_0801F760: +@0801F760: pop {r4} pop {r1} bx r1 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] cmp r0, 0x1 - beq _0801F79E + beq @0801F79E cmp r0, 0x1 - bgt _0801F77C + bgt @0801F77C cmp r0, 0 - beq _0801F782 - b _0801F7C4 -_0801F77C: + beq @0801F782 + b @0801F7C4 +@0801F77C: cmp r0, 0x2 - beq _0801F7AA - b _0801F7C4 -_0801F782: + beq @0801F7AA + b @0801F7C4 +@0801F782: movs r0, 0x1 bl sub_802091C bl sub_8020320 cmp r0, 0 - bne _0801F7CA + bne @0801F7CA bl sub_80201A4 movs r0, 0x2 movs r1, 0x2 bl Window_CopyToVram - b _0801F7C4 -_0801F79E: + b @0801F7C4 +@0801F79E: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _0801F7C4 - b _0801F7CA -_0801F7AA: + beq @0801F7C4 + b @0801F7CA +@0801F7AA: bl sub_8020368 cmp r0, 0 - bne _0801F7CA + bne @0801F7CA bl sub_802093C movs r0, 0 bl sub_802091C bl sub_8020B80 movs r0, 0 - b _0801F7CC -_0801F7C4: + b @0801F7CC +@0801F7C4: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] -_0801F7CA: +@0801F7CA: movs r0, 0x1 -_0801F7CC: +@0801F7CC: pop {r4} pop {r1} bx r1 thumb_func_end sub_801F768 thumb_func_start sub_801F7D4 -sub_801F7D4: @ 801F7D4 +sub_801F7D4: ; 801F7D4 push {lr} bl sub_802093C movs r0, 0 @@ -45511,16 +45511,16 @@ 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] cmp r0, 0 - beq _0801F7F0 + beq @0801F7F0 cmp r0, 0x1 - beq _0801F814 - b _0801F81E -_0801F7F0: + beq @0801F814 + b @0801F81E +@0801F7F0: movs r0, 0 movs r1, 0 bl sub_801FF18 @@ -45533,74 +45533,74 @@ _0801F7F0: ldrb r0, [r0, 0x1E] movs r1, 0x3 bl Window_CopyToVram - b _0801F81E + b @0801F81E .align 2, 0 .pool -_0801F814: +@0801F814: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 - b _0801F826 -_0801F81E: + b @0801F826 +@0801F81E: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] movs r0, 0x1 -_0801F826: +@0801F826: pop {r4} pop {r1} bx r1 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] cmp r0, 0 - beq _0801F83C + beq @0801F83C cmp r0, 0x1 - beq _0801F84C - b _0801F862 -_0801F83C: + beq @0801F84C + b @0801F862 +@0801F83C: bl sub_8020094 bl sub_801FEBC movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram - b _0801F862 -_0801F84C: + b @0801F862 +@0801F84C: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0801F868 + bne @0801F868 bl sub_80200C8 bl sub_801FEE4 movs r0, 0 - b _0801F86A -_0801F862: + b @0801F86A +@0801F862: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] -_0801F868: +@0801F868: movs r0, 0x1 -_0801F86A: +@0801F86A: pop {r4} pop {r1} bx r1 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 ldrb r0, [r4] cmp r0, 0 - beq _0801F882 + beq @0801F882 cmp r0, 0x1 - beq _0801F8BA - b _0801F8CC -_0801F882: + beq @0801F8BA + b @0801F8CC +@0801F882: add r1, sp, 0x8 add r0, sp, 0x4 bl sub_801F0EC @@ -45623,22 +45623,22 @@ _0801F882: movs r0, 0x1 movs r1, 0x2 bl Window_CopyToVram - b _0801F8CC -_0801F8BA: + b @0801F8CC +@0801F8BA: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0801F8D2 + bne @0801F8D2 bl sub_8020B80 movs r0, 0 - b _0801F8D4 -_0801F8CC: + b @0801F8D4 +@0801F8CC: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] -_0801F8D2: +@0801F8D2: movs r0, 0x1 -_0801F8D4: +@0801F8D4: add sp, 0xC pop {r4} pop {r1} @@ -45646,25 +45646,25 @@ _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 ldrb r0, [r6] cmp r0, 0x1 - beq _0801F938 + beq @0801F938 cmp r0, 0x1 - bgt _0801F8F2 + bgt @0801F8F2 cmp r0, 0 - beq _0801F8FC - b _0801F972 -_0801F8F2: + beq @0801F8FC + b @0801F972 +@0801F8F2: cmp r0, 0x2 - beq _0801F95C + beq @0801F95C cmp r0, 0x3 - beq _0801F96E - b _0801F972 -_0801F8FC: + beq @0801F96E + b @0801F972 +@0801F8FC: bl sub_801F144 adds r4, r0, 0 lsls r4, 16 @@ -45688,12 +45688,12 @@ _0801F8FC: movs r0, 0x1 movs r1, 0x2 bl Window_CopyToVram - b _0801F972 -_0801F938: + b @0801F972 +@0801F938: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0801F978 + bne @0801F978 movs r0, 0x1 movs r1, 0x10 bl sub_801FF18 @@ -45702,27 +45702,27 @@ _0801F938: ldrb r0, [r0, 0x1E] movs r1, 0x3 bl Window_CopyToVram - b _0801F972 + b @0801F972 .align 2, 0 .pool -_0801F95C: +@0801F95C: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0801F978 + bne @0801F978 movs r0, 0x1 bl sub_80209AC - b _0801F972 -_0801F96E: + b @0801F972 +@0801F96E: movs r0, 0 - b _0801F97A -_0801F972: + b @0801F97A +@0801F972: ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] -_0801F978: +@0801F978: movs r0, 0x1 -_0801F97A: +@0801F97A: add sp, 0x4 pop {r4-r6} pop {r1} @@ -45730,25 +45730,25 @@ _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 ldrb r0, [r6] cmp r0, 0x1 - beq _0801F9E0 + beq @0801F9E0 cmp r0, 0x1 - bgt _0801F99A + bgt @0801F99A cmp r0, 0 - beq _0801F9A4 - b _0801FA1A -_0801F99A: + beq @0801F9A4 + b @0801FA1A +@0801F99A: cmp r0, 0x2 - beq _0801FA00 + beq @0801FA00 cmp r0, 0x3 - beq _0801FA16 - b _0801FA1A -_0801F9A4: + beq @0801FA16 + b @0801FA1A +@0801F9A4: bl sub_801F144 adds r4, r0, 0 lsls r4, 16 @@ -45772,40 +45772,40 @@ _0801F9A4: movs r0, 0x1 movs r1, 0x2 bl Window_CopyToVram - b _0801FA1A -_0801F9E0: + b @0801FA1A +@0801F9E0: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0801FA20 + bne @0801FA20 bl sub_8020094 ldr r0, =0x02022c88 ldr r0, [r0] ldrb r0, [r0, 0x1E] movs r1, 0x3 bl Window_CopyToVram - b _0801FA1A + b @0801FA1A .align 2, 0 .pool -_0801FA00: +@0801FA00: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0801FA20 + bne @0801FA20 movs r0, 0 bl sub_80209AC bl sub_80200C8 - b _0801FA1A -_0801FA16: + b @0801FA1A +@0801FA16: movs r0, 0 - b _0801FA22 -_0801FA1A: + b @0801FA22 +@0801FA1A: ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] -_0801FA20: +@0801FA20: movs r0, 0x1 -_0801FA22: +@0801FA22: add sp, 0x4 pop {r4-r6} pop {r1} @@ -45813,16 +45813,16 @@ _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] cmp r0, 0 - beq _0801FA3C + beq @0801FA3C cmp r0, 0x1 - beq _0801FA50 - b _0801FA5E -_0801FA3C: + beq @0801FA50 + b @0801FA5E +@0801FA3C: bl sub_80201A4 movs r0, 0x2 movs r1, 0x2 @@ -45830,44 +45830,44 @@ _0801FA3C: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _0801FA5E -_0801FA50: + b @0801FA5E +@0801FA50: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0801FA5E + bne @0801FA5E movs r0, 0 - b _0801FA60 -_0801FA5E: + b @0801FA60 +@0801FA5E: movs r0, 0x1 -_0801FA60: +@0801FA60: pop {r4} pop {r1} bx r1 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] cmp r0, 0x4 - bhi _0801FB3A + bhi @0801FB3A lsls r0, 2 - ldr r1, =_0801FA80 + ldr r1, =@0801FA80 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0801FA80: - .4byte _0801FA94 - .4byte _0801FAC0 - .4byte _0801FAF0 - .4byte _0801FB14 - .4byte _0801FADE -_0801FA94: +@0801FA80: + .4byte @0801FA94 + .4byte @0801FAC0 + .4byte @0801FAF0 + .4byte @0801FB14 + .4byte @0801FADE +@0801FA94: ldr r0, =0x02022c88 ldr r0, [r0] ldrh r5, [r0, 0x1A] @@ -45883,35 +45883,35 @@ _0801FA94: movs r0, 0 movs r1, 0x2 bl Window_CopyToVram - b _0801FB34 + b @0801FB34 .align 2, 0 .pool -_0801FAC0: +@0801FAC0: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - bne _0801FB3A + bne @0801FB3A ldr r0, =0x02022c88 ldr r1, [r0] ldrh r0, [r1, 0x1A] cmp r0, 0x8 - bhi _0801FAE8 + bhi @0801FAE8 adds r0, 0x1 strh r0, [r1, 0x1A] movs r0, 0x4 strb r0, [r6] -_0801FADE: +@0801FADE: movs r0, 0 - b _0801FB3C + b @0801FB3C .align 2, 0 .pool -_0801FAE8: +@0801FAE8: strh r2, [r1, 0x1C] ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] -_0801FAF0: +@0801FAF0: movs r0, 0 movs r1, 0 movs r2, 0x5 @@ -45928,72 +45928,72 @@ _0801FAF0: ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] -_0801FB14: +@0801FB14: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0801FB3A + bne @0801FB3A ldr r0, =0x02022c88 ldr r0, [r0] ldrh r0, [r0, 0x1C] cmp r0, 0x2 - bhi _0801FB34 + bhi @0801FB34 ldrb r0, [r6] subs r0, 0x1 - b _0801FB38 + b @0801FB38 .align 2, 0 .pool -_0801FB34: +@0801FB34: ldrb r0, [r6] adds r0, 0x1 -_0801FB38: +@0801FB38: strb r0, [r6] -_0801FB3A: +@0801FB3A: movs r0, 0x1 -_0801FB3C: +@0801FB3C: pop {r4-r6} pop {r1} bx r1 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] cmp r0, 0 - beq _0801FB54 + beq @0801FB54 cmp r0, 0x1 - beq _0801FB60 - b _0801FB66 -_0801FB54: + beq @0801FB60 + b @0801FB66 +@0801FB54: bl sub_80209E0 ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _0801FB66 -_0801FB60: + b @0801FB66 +@0801FB60: bl sub_8020A1C - b _0801FB68 -_0801FB66: + b @0801FB68 +@0801FB66: movs r0, 0x1 -_0801FB68: +@0801FB68: pop {r4} pop {r1} bx r1 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] cmp r0, 0 - beq _0801FB80 + beq @0801FB80 cmp r0, 0x1 - beq _0801FBA0 - b _0801FBAA -_0801FB80: + beq @0801FBA0 + b @0801FBAA +@0801FB80: movs r0, 0x3 movs r1, 0x10 bl sub_801FF18 @@ -46005,33 +46005,33 @@ _0801FB80: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _0801FBAA + b @0801FBAA .align 2, 0 .pool -_0801FBA0: +@0801FBA0: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 - b _0801FBAC -_0801FBAA: + b @0801FBAC +@0801FBAA: movs r0, 0x1 -_0801FBAC: +@0801FBAC: pop {r4} pop {r1} bx r1 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] cmp r0, 0 - beq _0801FBC4 + beq @0801FBC4 cmp r0, 0x1 - beq _0801FBE4 - b _0801FBEE -_0801FBC4: + beq @0801FBE4 + b @0801FBEE +@0801FBC4: movs r0, 0x4 movs r1, 0 bl sub_801FF18 @@ -46043,33 +46043,33 @@ _0801FBC4: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _0801FBEE + b @0801FBEE .align 2, 0 .pool -_0801FBE4: +@0801FBE4: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 - b _0801FBF0 -_0801FBEE: + b @0801FBF0 +@0801FBEE: movs r0, 0x1 -_0801FBF0: +@0801FBF0: pop {r4} pop {r1} bx r1 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] cmp r0, 0 - beq _0801FC08 + beq @0801FC08 cmp r0, 0x1 - beq _0801FC38 - b _0801FC42 -_0801FC08: + beq @0801FC38 + b @0801FC42 +@0801FC08: bl sub_81AFBF0 bl sub_801F1D0 adds r1, r0, 0 @@ -46086,33 +46086,33 @@ _0801FC08: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _0801FC42 + b @0801FC42 .align 2, 0 .pool -_0801FC38: +@0801FC38: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 - b _0801FC44 -_0801FC42: + b @0801FC44 +@0801FC42: movs r0, 0x1 -_0801FC44: +@0801FC44: pop {r4} pop {r1} bx r1 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] cmp r0, 0 - beq _0801FC5C + beq @0801FC5C cmp r0, 0x1 - beq _0801FC88 - b _0801FC92 -_0801FC5C: + beq @0801FC88 + b @0801FC92 +@0801FC5C: movs r0, 0x6 movs r1, 0 bl sub_801FF18 @@ -46128,33 +46128,33 @@ _0801FC5C: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _0801FC92 + b @0801FC92 .align 2, 0 .pool -_0801FC88: +@0801FC88: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 - b _0801FC94 -_0801FC92: + b @0801FC94 +@0801FC92: movs r0, 0x1 -_0801FC94: +@0801FC94: pop {r4} pop {r1} bx r1 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] cmp r0, 0 - beq _0801FCAC + beq @0801FCAC cmp r0, 0x1 - beq _0801FCD8 - b _0801FCE2 -_0801FCAC: + beq @0801FCD8 + b @0801FCE2 +@0801FCAC: movs r0, 0x7 movs r1, 0 bl sub_801FF18 @@ -46170,33 +46170,33 @@ _0801FCAC: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _0801FCE2 + b @0801FCE2 .align 2, 0 .pool -_0801FCD8: +@0801FCD8: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 - b _0801FCE4 -_0801FCE2: + b @0801FCE4 +@0801FCE2: movs r0, 0x1 -_0801FCE4: +@0801FCE4: pop {r4} pop {r1} bx r1 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] cmp r0, 0 - beq _0801FCFC + beq @0801FCFC cmp r0, 0x1 - beq _0801FD1C - b _0801FD26 -_0801FCFC: + beq @0801FD1C + b @0801FD26 +@0801FCFC: movs r0, 0x8 movs r1, 0 bl sub_801FF18 @@ -46208,33 +46208,33 @@ _0801FCFC: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _0801FD26 + b @0801FD26 .align 2, 0 .pool -_0801FD1C: +@0801FD1C: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 - b _0801FD28 -_0801FD26: + b @0801FD28 +@0801FD26: movs r0, 0x1 -_0801FD28: +@0801FD28: pop {r4} pop {r1} bx r1 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] cmp r0, 0 - beq _0801FD40 + beq @0801FD40 cmp r0, 0x1 - beq _0801FD74 - b _0801FD7E -_0801FD40: + beq @0801FD74 + b @0801FD7E +@0801FD40: bl sub_81AFBF0 ldr r0, =0x03005d90 ldr r1, [r0] @@ -46251,33 +46251,33 @@ _0801FD40: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _0801FD7E + b @0801FD7E .align 2, 0 .pool -_0801FD74: +@0801FD74: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 - b _0801FD80 -_0801FD7E: + b @0801FD80 +@0801FD7E: movs r0, 0x1 -_0801FD80: +@0801FD80: pop {r4} pop {r1} bx r1 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] cmp r0, 0 - beq _0801FD98 + beq @0801FD98 cmp r0, 0x1 - beq _0801FDC4 - b _0801FDCE -_0801FD98: + beq @0801FDC4 + b @0801FDCE +@0801FD98: movs r0, 0xA movs r1, 0 bl sub_801FF18 @@ -46293,30 +46293,30 @@ _0801FD98: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _0801FDCE + b @0801FDCE .align 2, 0 .pool -_0801FDC4: +@0801FDC4: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 - b _0801FDD0 -_0801FDCE: + b @0801FDD0 +@0801FDCE: movs r0, 0x1 -_0801FDD0: +@0801FDD0: pop {r4} pop {r1} bx r1 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 @@ -46364,7 +46364,7 @@ sub_801FDDC: @ 801FDDC lsls r0, r1, 16 lsrs r0, 16 cmp r0, 0xFF - beq _0801FE94 + beq @0801FE94 lsls r0, r1, 24 lsrs r0, 24 movs r1, 0x11 @@ -46402,7 +46402,7 @@ sub_801FDDC: @ 801FDDC movs r1, 0x2 adds r2, r7, 0 bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed -_0801FE94: +@0801FE94: add sp, 0x14 pop {r4-r7} pop {r0} @@ -46412,13 +46412,13 @@ _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] ldrh r0, [r0, 0x18] cmp r0, 0xFF - beq _0801FEDA + beq @0801FEDA lsls r0, 24 lsrs r0, 24 movs r1, 0 @@ -46426,7 +46426,7 @@ sub_801FEBC: @ 801FEBC ldr r0, [r4] ldrb r0, [r0, 0x18] bl Window_FillTileMap -_0801FEDA: +@0801FEDA: pop {r4} pop {r0} bx r0 @@ -46435,20 +46435,20 @@ _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] ldrh r0, [r0, 0x18] cmp r0, 0xFF - beq _0801FEFE + beq @0801FEFE lsls r0, 24 lsrs r0, 24 bl Window_Remove ldr r1, [r4] movs r0, 0xFF strh r0, [r1, 0x18] -_0801FEFE: +@0801FEFE: pop {r4} pop {r0} bx r0 @@ -46457,7 +46457,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 @@ -46467,7 +46467,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 @@ -46517,7 +46517,7 @@ sub_801FF18: @ 801FF18 adds r4, r0, r1 ldrb r0, [r4, 0xA] cmp r0, 0 - beq _0801FF98 + beq @0801FF98 lsls r0, r3, 16 movs r1, 0xF9 lsls r1, 24 @@ -46532,7 +46532,7 @@ sub_801FF18: @ 801FF18 ands r0, r2 orrs r0, r1 str r0, [sp, 0x14] -_0801FF98: +@0801FF98: add r0, sp, 0x14 bl Window_AddFromTemplate ldr r5, =0x02022c88 @@ -46541,10 +46541,10 @@ _0801FF98: ldrh r0, [r1, 0x1E] mov r8, r0 cmp r0, 0xFF - beq _08020082 + beq @08020082 ldrb r0, [r4, 0x9] cmp r0, 0 - beq _0801FFE0 + beq @0801FFE0 adds r0, r1, 0 adds r0, 0x22 ldr r1, [r4] @@ -46552,12 +46552,12 @@ _0801FF98: ldr r0, [r5] adds r6, r0, 0 adds r6, 0x22 - b _0801FFE2 + b @0801FFE2 .align 2, 0 .pool -_0801FFE0: +@0801FFE0: ldr r6, [r4] -_0801FFE2: +@0801FFE2: mov r0, r9 lsls r1, r0, 8 movs r0, 0 @@ -46578,7 +46578,7 @@ _0801FFE2: adds r4, r0, r1 ldrb r0, [r4, 0x4] cmp r0, 0x1 - bne _08020050 + bne @08020050 adds r0, r5, 0 movs r1, 0xA movs r2, 0x2 @@ -46604,10 +46604,10 @@ _0801FFE2: movs r1, 0x1 adds r2, r6, 0 bl sub_8199F74 - b _0802007A + b @0802007A .align 2, 0 .pool -_08020050: +@08020050: adds r0, r5, 0 movs r1, 0xA movs r2, 0x2 @@ -46627,12 +46627,12 @@ _08020050: movs r1, 0x1 adds r2, r6, 0 bl sub_8199F74 -_0802007A: +@0802007A: ldr r0, =0x02022c88 ldr r0, [r0] mov r1, r8 strh r1, [r0, 0x1E] -_08020082: +@08020082: add sp, 0x1C pop {r3,r4} mov r8, r3 @@ -46645,13 +46645,13 @@ _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] ldrh r0, [r0, 0x1E] cmp r0, 0xFF - beq _080200B2 + beq @080200B2 lsls r0, 24 lsrs r0, 24 movs r1, 0 @@ -46659,7 +46659,7 @@ sub_8020094: @ 8020094 ldr r0, [r4] ldrb r0, [r0, 0x1E] bl Window_FillTileMap -_080200B2: +@080200B2: movs r0, 0 movs r1, 0 movs r2, 0 @@ -46672,20 +46672,20 @@ _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] ldrh r0, [r0, 0x1E] cmp r0, 0xFF - beq _080200E2 + beq @080200E2 lsls r0, 24 lsrs r0, 24 bl Window_Remove ldr r1, [r4] movs r0, 0xFF strh r0, [r1, 0x1E] -_080200E2: +@080200E2: pop {r4} pop {r0} bx r0 @@ -46694,7 +46694,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 @@ -46718,7 +46718,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 @@ -46738,7 +46738,7 @@ sub_8020118: @ 8020118 lsls r1, 24 lsrs r6, r1, 24 cmp r4, 0 - beq _08020154 + beq @08020154 bl sub_801F198 adds r1, r0, 0 subs r1, r5 @@ -46747,7 +46747,7 @@ sub_8020118: @ 8020118 adds r0, r5, 0 adds r2, r4, 0 bl sub_80200EC -_08020154: +@08020154: add r0, sp, 0xC mov r1, r8 strb r1, [r0] @@ -46788,7 +46788,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 @@ -46809,7 +46809,7 @@ sub_80201A4: @ 80201A4 movs r0, 0xD strb r0, [r1, 0x2] cmp r2, 0x3 - beq _08020240 + beq @08020240 add r1, sp, 0x10 movs r0, 0xFC strb r0, [r1] @@ -46820,10 +46820,10 @@ sub_80201A4: @ 80201A4 str r0, [sp, 0x40] str r1, [sp, 0x44] cmp r2, 0x2 - bne _080201EC + bne @080201EC movs r1, 0x6 str r1, [sp, 0x40] -_080201EC: +@080201EC: movs r7, 0 movs r6, 0 lsls r0, r2, 2 @@ -46833,12 +46833,12 @@ _080201EC: adds r4, r0, r1 ldr r0, [sp, 0x40] lsls r5, r0, 24 -_080201FE: +@080201FE: ldr r1, [r4] cmp r1, 0 - bne _08020206 - b _0802030C -_08020206: + bne @08020206 + b @0802030C +@08020206: mov r0, sp adds r0, 0x13 bl gf_strcpy @@ -46862,16 +46862,16 @@ _08020206: lsls r0, 16 lsrs r6, r0, 16 cmp r7, 0x9 - ble _080201FE - b _0802030C + ble @080201FE + b @0802030C .align 2, 0 .pool -_08020240: +@08020240: movs r1, 0x4 str r1, [sp, 0x40] movs r7, 0 movs r6, 0 -_08020248: +@08020248: adds r0, r7, 0 bl sub_801EE6C adds r5, r0, 0 @@ -46880,7 +46880,7 @@ _08020248: movs r2, 0 bl font_get_width_of_string cmp r0, 0x28 - bgt _08020286 + bgt @08020286 lsls r3, r6, 24 lsrs r3, 24 add r4, sp, 0xC @@ -46899,8 +46899,8 @@ _08020248: str r0, [sp, 0x48] adds r6, 0xC mov r10, r6 - b _08020300 -_08020286: + b @08020300 +@08020286: adds r0, r5, 0 bl sub_80091CC adds r4, r0, 0 @@ -46919,7 +46919,7 @@ _08020286: ldr r7, [sp, 0x40] adds r7, 0x23 ldr r6, [sp, 0x44] -_080202AC: +@080202AC: subs r4, 0x1 adds r0, r6, 0 adds r1, r5, 0 @@ -46930,7 +46930,7 @@ _080202AC: movs r2, 0 bl font_get_width_of_string cmp r0, 0x23 - bgt _080202AC + bgt @080202AC mov r1, r8 lsrs r2, r1, 24 mov r0, r9 @@ -46958,14 +46958,14 @@ _080202AC: movs r1, 0 adds r3, r4, 0 bl box_print -_08020300: +@08020300: ldr r7, [sp, 0x48] mov r4, r10 lsls r0, r4, 16 lsrs r6, r0, 16 cmp r7, 0x9 - ble _08020248 -_0802030C: + ble @08020248 +@0802030C: add sp, 0x4C pop {r3-r5} mov r8, r3 @@ -46979,7 +46979,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] @@ -46987,39 +46987,39 @@ sub_8020320: @ 8020320 movs r4, 0x20 ldrsh r0, [r2, r4] cmp r0, 0x37 - bgt _08020354 + bgt @08020354 adds r0, r3, 0 adds r0, 0xC strh r0, [r2, 0x20] lsls r0, 16 asrs r0, 16 cmp r0, 0x37 - ble _08020348 + ble @08020348 movs r0, 0x38 strh r0, [r2, 0x20] - b _08020354 + b @08020354 .align 2, 0 .pool -_08020348: +@08020348: movs r1, 0x20 ldrsh r0, [r2, r1] bl sub_80207C0 movs r0, 0x1 - b _08020360 -_08020354: + b @08020360 +@08020354: ldr r0, [r1] movs r4, 0x20 ldrsh r0, [r0, r4] bl sub_8020818 movs r0, 0 -_08020360: +@08020360: pop {r4} pop {r1} bx r1 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] @@ -47027,38 +47027,38 @@ sub_8020368: @ 8020368 movs r4, 0x20 ldrsh r0, [r2, r4] cmp r0, 0 - ble _0802039C + ble @0802039C adds r0, r3, 0 subs r0, 0xC strh r0, [r2, 0x20] lsls r0, 16 cmp r0, 0 - bgt _08020390 + bgt @08020390 movs r0, 0 strh r0, [r2, 0x20] - b _0802039C + b @0802039C .align 2, 0 .pool -_08020390: +@08020390: movs r1, 0x20 ldrsh r0, [r2, r1] bl sub_80207C0 movs r0, 0x1 - b _080203A8 -_0802039C: + b @080203A8 +@0802039C: ldr r0, [r1] movs r4, 0x20 ldrsh r0, [r0, r4] bl sub_8020818 movs r0, 0 -_080203A8: +@080203A8: pop {r4} pop {r1} bx r1 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 @@ -47101,7 +47101,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 @@ -47113,7 +47113,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 @@ -47162,7 +47162,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 @@ -47238,7 +47238,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] @@ -47270,7 +47270,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 @@ -47295,7 +47295,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, =0x08dd4bd0 @@ -47328,7 +47328,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, =0x08dd4860 @@ -47344,7 +47344,7 @@ task_tutorial_story_unknown: @ 8020604 bl decompress_and_copy_tile_data_to_vram adds r5, r0, 0 cmp r5, 0 - beq _0802064E + beq @0802064E movs r1, 0x88 lsls r1, 2 adds r0, r5, r1 @@ -47362,7 +47362,7 @@ task_tutorial_story_unknown: @ 8020604 adds r1, r2 movs r2, 0x8 bl CpuFastSet -_0802064E: +@0802064E: ldr r1, =0x08dd4ab8 movs r0, 0x2 movs r2, 0 @@ -47379,7 +47379,7 @@ _0802064E: thumb_func_end task_tutorial_story_unknown thumb_func_start sub_8020680 -sub_8020680: @ 8020680 +sub_8020680: ; 8020680 push {lr} ldr r0, =0x082f2c20 movs r1, 0x80 @@ -47397,7 +47397,7 @@ sub_8020680: @ 8020680 thumb_func_end sub_8020680 thumb_func_start sub_80206A4 -sub_80206A4: @ 80206A4 +sub_80206A4: ; 80206A4 push {lr} ldr r0, =0x082f2c40 movs r1, 0xF0 @@ -47418,7 +47418,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 Window_WriteStandardTileMap @@ -47431,7 +47431,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 @@ -47440,7 +47440,7 @@ sub_80206E8: @ 80206E8 movs r0, 0xFF strb r0, [r1, 0x1] movs r4, 0 -_080206F8: +@080206F8: ldr r0, =0x02022c88 ldr r1, [r0] ldr r0, =0x00002128 @@ -47456,7 +47456,7 @@ _080206F8: bl Window_CopyWholePixelBlockToWindow adds r4, 0x1 cmp r4, 0xE - ble _080206F8 + ble @080206F8 movs r0, 0x1 movs r1, 0 bl Window_FastFillPixels @@ -47474,7 +47474,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 @@ -47498,7 +47498,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 @@ -47531,7 +47531,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 @@ -47571,7 +47571,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 @@ -47627,17 +47627,17 @@ 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, =0x082f3134 -_08020896: +@08020896: adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load adds r4, 0x8 adds r5, 0x1 cmp r5, 0x4 - bls _08020896 + bls @08020896 ldr r0, =0x082f315c bl gpu_pal_obj_alloc_tag_and_apply ldr r4, =0x02022c8c @@ -47645,28 +47645,28 @@ _08020896: bl malloc str r0, [r4] cmp r0, 0 - beq _080208C8 + beq @080208C8 movs r0, 0x1 - b _080208CA + b @080208CA .align 2, 0 .pool -_080208C8: +@080208C8: movs r0, 0 -_080208CA: +@080208CA: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_8020890 thumb_func_start sub_80208D0 -sub_80208D0: @ 80208D0 +sub_80208D0: ; 80208D0 push {lr} ldr r0, =0x02022c8c ldr r0, [r0] cmp r0, 0 - beq _080208DE + beq @080208DE bl free -_080208DE: +@080208DE: pop {r0} bx r0 .align 2, 0 @@ -47674,7 +47674,7 @@ _080208DE: thumb_func_end sub_80208D0 thumb_func_start sub_80208E8 -sub_80208E8: @ 80208E8 +sub_80208E8: ; 80208E8 push {lr} ldr r0, =0x082f319c movs r1, 0xA @@ -47698,7 +47698,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] @@ -47718,7 +47718,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 @@ -47731,7 +47731,7 @@ sub_802093C: @ 802093C adds r1, r5, 0 bl sub_801F0BC cmp r4, 0x3 - beq _0802097C + beq @0802097C ldr r4, =0x02022c8c ldr r0, [r4] ldr r0, [r0] @@ -47745,10 +47745,10 @@ sub_802093C: @ 802093C adds r0, 0xA strh r0, [r2, 0x20] ldr r2, [r1] - b _08020992 + b @08020992 .align 2, 0 .pool -_0802097C: +@0802097C: ldr r4, =0x02022c8c ldr r0, [r4] ldr r0, [r0] @@ -47759,7 +47759,7 @@ _0802097C: movs r0, 0x18 strh r0, [r1, 0x20] ldr r2, [r2] -_08020992: +@08020992: ldrb r1, [r5] lsls r0, r1, 1 adds r0, r1 @@ -47775,7 +47775,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 @@ -47800,28 +47800,28 @@ 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 lsrs r0, 24 cmp r0, 0x3 - beq _08020A00 + beq @08020A00 ldr r0, =0x02022c8c ldr r0, [r0] ldr r0, [r0] movs r1, 0x1 bl obj_anim_image_start - b _08020A0C + b @08020A0C .align 2, 0 .pool -_08020A00: +@08020A00: ldr r0, =0x02022c8c ldr r0, [r0] ldr r0, [r0] movs r1, 0x3 bl obj_anim_image_start -_08020A0C: +@08020A0C: ldr r0, =0x02022c8c ldr r1, [r0] movs r0, 0 @@ -47833,51 +47833,51 @@ _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] ldrh r0, [r1, 0x14] cmp r0, 0x3 - bls _08020A30 -_08020A28: + bls @08020A30 +@08020A28: movs r0, 0 - b _08020A62 + b @08020A62 .align 2, 0 .pool -_08020A30: +@08020A30: adds r0, 0x1 strh r0, [r1, 0x14] lsls r0, 16 lsrs r0, 16 cmp r0, 0x3 - bls _08020A60 + bls @08020A60 bl sub_801F0B0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - beq _08020A54 + beq @08020A54 ldr r0, [r4] ldr r0, [r0] movs r1, 0 bl obj_anim_image_start - b _08020A28 -_08020A54: + b @08020A28 +@08020A54: ldr r0, [r4] ldr r0, [r0] movs r1, 0x2 bl obj_anim_image_start - b _08020A28 -_08020A60: + b @08020A28 +@08020A60: movs r0, 0x1 -_08020A62: +@08020A62: pop {r4} pop {r1} bx r1 thumb_func_end sub_8020A1C thumb_func_start sub_8020A68 -sub_8020A68: @ 8020A68 +sub_8020A68: ; 8020A68 push {r4,r5,lr} ldr r0, =0x082f31bc movs r1, 0x4C @@ -47915,21 +47915,21 @@ 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 adds r3, r0, 0 cmp r3, 0xF - bne _08020AD8 + bne @08020AD8 adds r0, r4, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] - b _08020AEC -_08020AD8: + b @08020AEC +@08020AD8: adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -47940,14 +47940,14 @@ _08020AD8: lsls r0, r3, 3 adds r0, 0x4C strh r0, [r4, 0x20] -_08020AEC: +@08020AEC: pop {r4} pop {r0} bx r0 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] @@ -47957,7 +47957,7 @@ sub_8020AF4: @ 8020AF4 lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _08020B1A + ble @08020B1A strh r2, [r1, 0x2E] ldrh r0, [r1, 0x24] adds r0, 0x1 @@ -47965,15 +47965,15 @@ sub_8020AF4: @ 8020AF4 lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _08020B1A + ble @08020B1A strh r2, [r1, 0x24] -_08020B1A: +@08020B1A: pop {r0} bx r0 thumb_func_end sub_8020AF4 thumb_func_start sub_8020B20 -sub_8020B20: @ 8020B20 +sub_8020B20: ; 8020B20 push {r4,r5,lr} ldr r0, =0x082f322c movs r1, 0x8 @@ -48016,16 +48016,16 @@ 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 lsrs r0, 24 cmp r0, 0x3 - bne _08020BB8 + bne @08020BB8 bl sub_801F0DC cmp r0, 0 - beq _08020BC2 + beq @08020BC2 ldr r3, =0x02022c8c ldr r0, [r3] ldr r1, [r0, 0x10] @@ -48039,15 +48039,15 @@ sub_8020B80: @ 8020B80 ldr r0, [r0, 0x10] movs r1, 0x3 bl obj_anim_image_start - b _08020BF6 + b @08020BF6 .align 2, 0 .pool -_08020BB8: +@08020BB8: bl sub_801F1A4 adds r4, r0, 0 cmp r4, 0x3 - bne _08020BD8 -_08020BC2: + bne @08020BD8 +@08020BC2: ldr r0, =0x02022c8c ldr r0, [r0] ldr r1, [r0, 0x10] @@ -48056,10 +48056,10 @@ _08020BC2: movs r2, 0x4 orrs r0, r2 strb r0, [r1] - b _08020BF6 + b @08020BF6 .align 2, 0 .pool -_08020BD8: +@08020BD8: ldr r3, =0x02022c8c ldr r0, [r3] ldr r1, [r0, 0x10] @@ -48074,7 +48074,7 @@ _08020BD8: lsls r1, r4, 24 lsrs r1, 24 bl obj_anim_image_start -_08020BF6: +@08020BF6: pop {r4} pop {r0} bx r0 @@ -48083,7 +48083,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 @@ -48092,22 +48092,22 @@ 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 ldr r0, [r5] cmp r0, 0 - bne _08020C20 + bne @08020C20 movs r0, 0x2 - b _08020C5C + b @08020C5C .align 2, 0 .pool -_08020C20: +@08020C20: cmp r4, 0 - bne _08020C26 + bne @08020C26 ldr r4, [r0] -_08020C26: +@08020C26: ldrb r0, [r0, 0xA] bl remove_task ldr r0, [r5] @@ -48118,7 +48118,7 @@ _08020C26: bl set_callback2 ldr r0, =c2_exit_to_overworld_2_switch + 1 cmp r4, r0 - bne _08020C5A + bne @08020C5A ldr r2, =0x03003014 ldrb r0, [r2] movs r1, 0x4 @@ -48129,9 +48129,9 @@ _08020C26: bl current_map_music_set ldr r0, =c1_overworld + 1 bl set_callback1 -_08020C5A: +@08020C5A: movs r0, 0 -_08020C5C: +@08020C5C: pop {r4,r5} pop {r1} bx r1 @@ -48140,7 +48140,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} @@ -48151,22 +48151,22 @@ sub_8020C70: @ 8020C70 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _08020C8E + beq @08020C8E ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - bne _08020CAC -_08020C8E: + bne @08020CAC +@08020C8E: adds r0, r4, 0 bl set_callback2 ldr r0, =0x03005000 mov r1, r8 strh r1, [r0, 0x10] strh r1, [r0, 0x12] - b _08020CF8 + b @08020CF8 .align 2, 0 .pool -_08020CAC: +@08020CAC: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 @@ -48176,41 +48176,41 @@ _08020CAC: lsrs r7, r0, 24 mov r0, r8 cmp r0, 0x1 - bls _08020CC8 + bls @08020CC8 cmp r7, r8 - bcc _08020CDC -_08020CC8: + bcc @08020CDC +@08020CC8: adds r0, r4, 0 bl set_callback2 ldr r0, =0x03005000 movs r1, 0 strh r1, [r0, 0x10] strh r1, [r0, 0x12] - b _08020CF8 + b @08020CF8 .align 2, 0 .pool -_08020CDC: +@08020CDC: ldr r6, =0x02022c90 ldr r0, =0x000041c0 bl malloc_and_clear adds r5, r0, 0 str r5, [r6] cmp r5, 0 - bne _08020D10 + bne @08020D10 adds r0, r4, 0 bl set_callback2 ldr r0, =0x03005000 strh r5, [r0, 0x10] strh r5, [r0, 0x12] -_08020CF8: +@08020CF8: adds r0, 0xEE ldrb r1, [r0] movs r1, 0x1 strb r1, [r0] - b _08020D74 + b @08020D74 .align 2, 0 .pool -_08020D10: +@08020D10: str r4, [r5] movs r4, 0 strb r7, [r5, 0x8] @@ -48256,7 +48256,7 @@ _08020D10: negs r0, r0 ands r0, r1 strb r0, [r2] -_08020D74: +@08020D74: add sp, 0xC pop {r3} mov r8, r3 @@ -48268,7 +48268,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 @@ -48277,17 +48277,17 @@ sub_8020D8C: @ 8020D8C lsls r0, 16 lsrs r0, 16 cmp r0, 0x2B - bls _08020DA8 + bls @08020DA8 movs r0, 0x85 strh r0, [r1] - b _08020DB0 + b @08020DB0 .align 2, 0 .pool -_08020DA8: +@08020DA8: ldrh r0, [r1] movs r1, 0x1 bl sub_80D6AA4 -_08020DB0: +@08020DB0: ldr r4, =0x02022c90 ldr r2, [r4] ldrb r0, [r2, 0x8] @@ -48335,7 +48335,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] @@ -48350,7 +48350,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 + 1 bl SetVBlankCallback @@ -48361,7 +48361,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 @@ -48370,7 +48370,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] @@ -48396,21 +48396,21 @@ sub_8020E58: @ 8020E58 strh r3, [r2, 0x16] ldrb r0, [r2, 0x9] cmp r0, 0x3 - beq _08020EDC + beq @08020EDC cmp r0, 0x3 - bgt _08020EA4 + bgt @08020EA4 cmp r0, 0x2 - beq _08020EAE - b _08020F48 + beq @08020EAE + b @08020F48 .align 2, 0 .pool -_08020EA4: +@08020EA4: cmp r0, 0x4 - beq _08020EEC + beq @08020EEC cmp r0, 0x5 - beq _08020F20 - b _08020F48 -_08020EAE: + beq @08020F20 + b @08020F48 +@08020EAE: ldr r5, =0x03005d90 ldr r1, [r5] movs r0, 0xF6 @@ -48420,7 +48420,7 @@ _08020EAE: lsrs r0, 16 ldrh r1, [r1] cmp r0, r1 - bls _08020F48 + bls @08020F48 adds r2, 0x25 ldrb r0, [r2] movs r1, 0x2 @@ -48431,18 +48431,18 @@ _08020EAE: ldrh r1, [r1, 0x16] movs r2, 0xF6 lsls r2, 1 - b _08020F14 + b @08020F14 .align 2, 0 .pool -_08020EDC: +@08020EDC: ldr r5, =0x03005d90 ldr r0, [r5] movs r6, 0xF7 lsls r6, 1 - b _08020F28 + b @08020F28 .align 2, 0 .pool -_08020EEC: +@08020EEC: ldr r5, =0x03005d90 ldr r1, [r5] movs r0, 0xF8 @@ -48452,7 +48452,7 @@ _08020EEC: lsrs r0, 16 ldrh r1, [r1] cmp r0, r1 - bls _08020F48 + bls @08020F48 adds r2, 0x25 ldrb r0, [r2] movs r1, 0x2 @@ -48463,24 +48463,24 @@ _08020EEC: ldrh r1, [r1, 0x16] movs r2, 0xF8 lsls r2, 1 -_08020F14: +@08020F14: adds r0, r2 strh r1, [r0] - b _08020F48 + b @08020F48 .align 2, 0 .pool -_08020F20: +@08020F20: ldr r5, =0x03005d90 ldr r0, [r5] movs r6, 0xF9 lsls r6, 1 -_08020F28: +@08020F28: adds r1, r0, r6 lsls r0, r3, 16 lsrs r0, 16 ldrh r1, [r1] cmp r0, r1 - bls _08020F48 + bls @08020F48 adds r2, 0x25 ldrb r0, [r2] movs r1, 0x2 @@ -48491,7 +48491,7 @@ _08020F28: ldrh r0, [r0, 0x16] adds r1, r6 strh r0, [r1] -_08020F48: +@08020F48: ldr r4, =0x02022c90 ldr r1, [r4] ldr r0, [r1, 0x68] @@ -48499,14 +48499,14 @@ _08020F48: bl sub_8024700 lsls r0, 24 cmp r0, 0 - bne _08020F66 + bne @08020F66 ldr r0, [r4] adds r0, 0x25 ldrb r1, [r0] movs r2, 0x1 orrs r1, r2 strb r1, [r0] -_08020F66: +@08020F66: pop {r4-r6} pop {r0} bx r0 @@ -48515,7 +48515,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 copy_super_sprites_to_oam @@ -48525,7 +48525,7 @@ sub_8020F74: @ 8020F74 thumb_func_end sub_8020F74 thumb_func_start sub_8020F88 -sub_8020F88: @ 8020F88 +sub_8020F88: ; 8020F88 push {lr} bl run_active_tasks bl run_remoboxes @@ -48536,17 +48536,17 @@ 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] ldr r2, [r0, 0x4] cmp r2, 0 - beq _08020FB4 + beq @08020FB4 adds r1, r0, 0 adds r1, 0x36 bl _call_via_r2 -_08020FB4: +@08020FB4: ldr r0, [r4] bl sub_8021450 pop {r4} @@ -48557,12 +48557,12 @@ _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 - b _08020FE6 -_08020FCC: + b @08020FE6 +@08020FCC: lsls r0, r5, 5 adds r0, 0x98 adds r0, r6, r0 @@ -48575,13 +48575,13 @@ _08020FCC: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_08020FE6: +@08020FE6: ldrb r0, [r6, 0x9] cmp r5, r0 - bcc _08020FCC + bcc @08020FCC cmp r5, 0x4 - bhi _08021012 -_08020FF0: + bhi @08021012 +@08020FF0: lsls r4, r5, 5 adds r0, r4, 0 adds r0, 0x98 @@ -48597,79 +48597,79 @@ _08020FF0: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x4 - bls _08020FF0 -_08021012: + bls @08020FF0 +@08021012: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x14] lsls r0, 29 lsrs r0, 29 cmp r0, 0x1 - beq _0802103E + beq @0802103E cmp r0, 0x1 - bgt _08021034 + bgt @08021034 cmp r0, 0 - beq _0802103A - b _08021046 + beq @0802103A + b @08021046 .align 2, 0 .pool -_08021034: +@08021034: cmp r0, 0x2 - beq _08021042 - b _08021046 -_0802103A: + beq @08021042 + b @08021046 +@0802103A: movs r0, 0x8 - b _08021044 -_0802103E: + b @08021044 +@0802103E: movs r0, 0x4 - b _08021044 -_08021042: + b @08021044 +@08021042: movs r0, 0x1 -_08021044: +@08021044: strb r0, [r6, 0xB] -_08021046: +@08021046: pop {r4-r6} pop {r0} bx r0 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 adds r5, r0, 0 cmp r5, 0 - bne _08021060 + bne @08021060 movs r0, 0x1 negs r0, r0 - b _08021304 -_08021060: + b @08021304 +@08021060: ldrb r0, [r5, 0xC] cmp r0, 0x9 - bls _08021068 - b _080212FC -_08021068: + bls @08021068 + b @080212FC +@08021068: lsls r0, 2 - ldr r1, =_08021078 + ldr r1, =@08021078 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08021078: - .4byte _080210A0 - .4byte _080210BE - .4byte _080210E4 - .4byte _080210F2 - .4byte _08021178 - .4byte _080211BE - .4byte _080211EC - .4byte _0802121C - .4byte _08021278 - .4byte _080212B4 -_080210A0: +@08021078: + .4byte @080210A0 + .4byte @080210BE + .4byte @080210E4 + .4byte @080210F2 + .4byte @08021178 + .4byte @080211BE + .4byte @080211EC + .4byte @0802121C + .4byte @08021278 + .4byte @080212B4 +@080210A0: movs r0, 0 bl SetVBlankCallback movs r0, 0 @@ -48679,8 +48679,8 @@ _080210A0: bl lcd_io_set bl remove_some_task bl reset_temp_tile_data_buffers - b _080212FC -_080210BE: + b @080212FC +@080210BE: add r0, sp, 0x8 movs r4, 0 strh r4, [r0] @@ -48692,15 +48692,15 @@ _080210BE: strb r4, [r0] movs r0, 0x3 bl sub_8034C54 - b _080212FC + b @080212FC .align 2, 0 .pool -_080210E4: +@080210E4: bl sub_80A1A74 bl reset_all_obj_data bl gpu_pal_allocator_reset - b _080212FC -_080210F2: + b @080212FC +@080210F2: movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags ldr r1, =0x082f32c8 @@ -48752,10 +48752,10 @@ _080210F2: movs r0, 0x52 movs r1, 0 bl lcd_io_set - b _080212FC + b @080212FC .align 2, 0 .pool -_08021178: +@08021178: movs r4, 0x20 str r4, [sp] str r4, [sp, 0x4] @@ -48786,8 +48786,8 @@ _08021178: movs r2, 0 movs r3, 0 bl bg_fill_tilemap_rect - b _080212FC -_080211BE: + b @080212FC +@080211BE: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x1 @@ -48803,16 +48803,16 @@ _080211BE: movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - b _080212FC + b @080212FC .align 2, 0 .pool -_080211EC: +@080211EC: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - beq _080211F8 - b _08021302 -_080211F8: + beq @080211F8 + b @08021302 +@080211F8: bl sub_81971D0 bl sub_8197200 adds r0, r5, 0 @@ -48824,10 +48824,10 @@ _080211F8: movs r2, 0x80 orrs r1, r2 strb r1, [r0, 0x8] - b _080212FC + b @080212FC .align 2, 0 .pool -_0802121C: +@0802121C: ldr r0, =0x08de3398 movs r2, 0xC0 lsls r2, 1 @@ -48856,10 +48856,10 @@ _0802121C: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - b _080212FC + b @080212FC .align 2, 0 .pool -_08021278: +@08021278: bl sub_800E0E8 movs r0, 0 movs r1, 0 @@ -48881,10 +48881,10 @@ _08021278: movs r1, 0 movs r2, 0 bl bg_change_y_offset - b _080212FC + b @080212FC .align 2, 0 .pool -_080212B4: +@080212B4: ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F @@ -48911,16 +48911,16 @@ _080212B4: movs r0, 0 strb r0, [r5, 0xC] movs r0, 0x1 - b _08021304 + b @08021304 .align 2, 0 .pool -_080212FC: +@080212FC: ldrb r0, [r5, 0xC] adds r0, 0x1 strb r0, [r5, 0xC] -_08021302: +@08021302: movs r0, 0 -_08021304: +@08021304: add sp, 0xC pop {r4,r5} pop {r1} @@ -48928,48 +48928,48 @@ _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 adds r5, r0, 0 cmp r5, 0 - bne _08021320 + bne @08021320 movs r0, 0x1 negs r0, r0 - b _08021446 -_08021320: + b @08021446 +@08021320: ldrb r0, [r5, 0xC] cmp r0, 0x7 - bls _08021328 - b _0802143E -_08021328: + bls @08021328 + b @0802143E +@08021328: lsls r0, 2 - ldr r1, =_08021338 + ldr r1, =@08021338 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08021338: - .4byte _08021358 - .4byte _0802135E - .4byte _08021368 - .4byte _0802137E - .4byte _0802138A - .4byte _080213E6 - .4byte _08021426 - .4byte _08021436 -_08021358: +@08021338: + .4byte @08021358 + .4byte @0802135E + .4byte @08021368 + .4byte @0802137E + .4byte @0802138A + .4byte @080213E6 + .4byte @08021426 + .4byte @08021436 +@08021358: bl sub_8010434 - b _0802143E -_0802135E: + b @0802143E +@0802135E: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08021444 -_08021368: + beq @08021444 +@08021368: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -48978,14 +48978,14 @@ _08021368: movs r3, 0x10 bl sub_80A1AD4 bl fade_and_return_progress_probably - b _0802143E -_0802137E: + b @0802143E +@0802137E: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - beq _0802143E - b _08021444 -_0802138A: + beq @0802143E + b @08021444 +@0802138A: movs r4, 0x20 str r4, [sp] str r4, [sp, 0x4] @@ -49023,8 +49023,8 @@ _0802138A: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - b _0802143E -_080213E6: + b @0802143E +@080213E6: bl Window_FreeMemory movs r0, 0 bl gpu_sync_bg_hide @@ -49046,25 +49046,25 @@ _080213E6: lsls r1, 5 movs r0, 0 bl lcd_io_clear_bits - b _0802143E -_08021426: + b @0802143E +@08021426: bl sub_800E084 adds r0, r5, 0 bl sub_8022960 bl sub_8034CC8 - b _0802143E -_08021436: + b @0802143E +@08021436: movs r0, 0 strb r0, [r5, 0xC] movs r0, 0x1 - b _08021446 -_0802143E: + b @08021446 +@0802143E: ldrb r0, [r5, 0xC] adds r0, 0x1 strb r0, [r5, 0xC] -_08021444: +@08021444: movs r0, 0 -_08021446: +@08021446: add sp, 0x8 pop {r4,r5} pop {r1} @@ -49072,7 +49072,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 @@ -49087,13 +49087,13 @@ sub_8021450: @ 8021450 bl lcd_io_set ldrh r0, [r4, 0x12] cmp r0, 0x7 - bne _0802147C + bne @0802147C movs r1, 0x9C lsls r1, 1 adds r0, r4, r1 ldrh r1, [r4, 0x28] bl sub_8022524 -_0802147C: +@0802147C: movs r0, 0 pop {r4} pop {r1} @@ -49103,7 +49103,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] @@ -49118,7 +49118,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 @@ -49132,9 +49132,9 @@ sub_80214A8: @ 80214A8 mov r1, r10 ldrb r1, [r1, 0x9] cmp r9, r1 - bcc _080214C6 - b _080215E4 -_080214C6: + bcc @080214C6 + b @080215E4 +@080214C6: ldr r1, =0x082f41e8 mov r2, r9 lsls r0, r2, 1 @@ -49205,9 +49205,9 @@ _080214C6: asrs r1, r0, 16 adds r0, r1, 0 cmp r1, 0 - bge _08021558 + bge @08021558 adds r0, r1, 0x3 -_08021558: +@08021558: asrs r0, 2 strh r0, [r5, 0xC] lsls r0, r1, 23 @@ -49259,11 +49259,11 @@ _08021558: movs r2, 0x8 ldrsh r0, [r0, r2] cmp r0, 0 - bge _080215D0 + bge @080215D0 ldr r0, [r6] movs r1, 0x1 bl sub_8008258 -_080215D0: +@080215D0: mov r0, r9 adds r0, 0x1 lsls r0, 24 @@ -49272,9 +49272,9 @@ _080215D0: mov r0, r10 ldrb r0, [r0, 0x9] cmp r9, r0 - bcs _080215E4 - b _080214C6 -_080215E4: + bcs @080215E4 + b @080214C6 +@080215E4: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -49288,7 +49288,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 @@ -49308,7 +49308,7 @@ sub_8021608: @ 8021608 lsls r6, 8 ands r0, r6 cmp r0, 0 - beq _0802166E + beq @0802166E ldrh r0, [r4, 0x6] ldrh r2, [r5, 0x2E] adds r0, r2 @@ -49327,19 +49327,19 @@ sub_8021608: @ 8021608 ldrsh r0, [r4, r1] ands r0, r6 cmp r0, 0 - beq _0802166E + beq @0802166E ldrh r0, [r4, 0x8] lsls r0, 16 asrs r0, 23 cmp r0, 0x7E - ble _0802166E + ble @0802166E movs r0, 0 strh r0, [r5, 0x24] ldrh r1, [r4, 0xE] ldr r0, =0x00007fff ands r0, r1 strh r0, [r4, 0xE] -_0802166E: +@0802166E: ldrh r0, [r4] lsls r0, 16 asrs r0, 23 @@ -49353,14 +49353,14 @@ _0802166E: ldr r0, =0x00007fff ands r0, r2 cmp r1, r0 - blt _0802169A + blt @0802169A ldr r0, =nullsub_12 + 1 str r0, [r5, 0x1C] adds r0, r5, 0 bl obj_free_rotscale_entry adds r0, r5, 0 bl obj_delete_and_free_tiles -_0802169A: +@0802169A: pop {r4-r6} pop {r0} bx r0 @@ -49369,15 +49369,15 @@ _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 ldrb r0, [r6, 0x9] cmp r5, r0 - bcs _080216D4 + bcs @080216D4 ldr r7, =0x082f41e8 -_080216B6: +@080216B6: lsls r0, r5, 1 adds r0, r7 ldrh r4, [r0] @@ -49390,8 +49390,8 @@ _080216B6: lsrs r5, r0, 24 ldrb r0, [r6, 0x9] cmp r5, r0 - bcc _080216B6 -_080216D4: + bcc @080216B6 +@080216D4: pop {r4-r7} pop {r0} bx r0 @@ -49400,7 +49400,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 @@ -49417,9 +49417,9 @@ sub_80216E0: @ 80216E0 mov r9, r0 ldrb r2, [r6, 0x9] cmp r0, r2 - bcs _080217AE + bcs @080217AE ldr r7, =0x082f41cc -_08021704: +@08021704: mov r3, r10 ldrh r0, [r3, 0xA] mov r4, r9 @@ -49433,7 +49433,7 @@ _08021704: lsrs r1, 16 mov r8, r1 cmp r1, 0 - beq _0802179E + beq @0802179E ldr r0, [sp, 0x4] adds r0, 0x1 lsls r0, 24 @@ -49442,7 +49442,7 @@ _08021704: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08021748 + beq @08021748 lsls r4, 2 ldr r5, [sp] adds r5, 0x24 @@ -49450,10 +49450,10 @@ _08021704: ldr r0, [r0] movs r1, 0x1 bl obj_anim_image_start - b _0802175A + b @0802175A .align 2, 0 .pool -_08021748: +@08021748: mov r0, r9 lsls r4, r0, 2 ldr r5, [sp] @@ -49462,7 +49462,7 @@ _08021748: ldr r0, [r0] movs r1, 0 bl obj_anim_image_start -_0802175A: +@0802175A: adds r3, r5, r4 ldr r2, [r3] adds r2, 0x3E @@ -49497,7 +49497,7 @@ _0802175A: movs r0, 0 ldrsb r0, [r1, r0] strh r0, [r2, 0x26] -_0802179E: +@0802179E: mov r0, r9 adds r0, 0x1 lsls r0, 24 @@ -49505,18 +49505,18 @@ _0802179E: mov r9, r0 ldrb r4, [r6, 0x9] cmp r9, r4 - bcc _08021704 -_080217AE: + bcc @08021704 +@080217AE: ldr r0, [sp, 0x4] cmp r0, 0 - bne _080217C0 + bne @080217C0 adds r2, r6, 0 adds r2, 0x25 ldrb r1, [r2] - b _0802189C + b @0802189C .align 2, 0 .pool -_080217C0: +@080217C0: ldrh r0, [r6, 0x28] movs r1, 0x3 bl __umodsi3 @@ -49535,8 +49535,8 @@ _080217C0: str r6, [sp, 0xC] adds r3, r1, 0 cmp r9, r0 - bge _08021890 -_080217E8: + bge @08021890 +@080217E8: mov r4, r9 lsls r1, r4, 2 ldr r0, [sp] @@ -49549,7 +49549,7 @@ _080217E8: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0802187E + beq @0802187E ldr r0, =sub_8022B28 + 1 str r0, [r2, 0x1C] lsls r1, r4, 1 @@ -49584,18 +49584,18 @@ _080217E8: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08021860 + beq @08021860 ldr r0, [r7] movs r1, 0x1 bl obj_anim_image_start - b _08021868 + b @08021868 .align 2, 0 .pool -_08021860: +@08021860: ldr r0, [r7] movs r1, 0 bl obj_anim_image_start -_08021868: +@08021868: mov r0, r8 adds r0, 0x1 lsls r0, 16 @@ -49604,10 +49604,10 @@ _08021868: mov r4, r10 ldrh r3, [r4, 0xC] cmp r0, 0x3 - bls _0802187E + bls @0802187E movs r0, 0 mov r8, r0 -_0802187E: +@0802187E: mov r0, r9 adds r0, 0x1 lsls r0, 24 @@ -49616,37 +49616,37 @@ _0802187E: lsls r0, r3, 1 adds r0, 0x3 cmp r9, r0 - blt _080217E8 -_08021890: + blt @080217E8 +@08021890: ldr r2, [sp, 0xC] ldrb r1, [r2] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080218A6 -_0802189C: + beq @080218A6 +@0802189C: movs r0, 0x5 negs r0, r0 ands r0, r1 strb r0, [r2] - b _080218C4 -_080218A6: + b @080218C4 +@080218A6: ldr r3, [sp, 0x4] cmp r3, 0x1 - bne _080218B4 + bne @080218B4 movs r0, 0x4E bl audio_play - b _080218BA -_080218B4: + b @080218BA +@080218B4: movs r0, 0x4D bl audio_play -_080218BA: +@080218BA: ldr r4, [sp, 0xC] ldrb r0, [r4] movs r1, 0x4 orrs r0, r1 strb r0, [r4] -_080218C4: +@080218C4: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -49658,19 +49658,19 @@ _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 movs r2, 0 ldrb r0, [r5, 0x9] cmp r2, r0 - bcs _08021906 + bcs @08021906 adds r4, r6, 0 adds r4, 0x24 movs r7, 0x4 adds r3, r0, 0 -_080218EA: +@080218EA: lsls r0, r2, 2 adds r0, r4, r0 ldr r0, [r0] @@ -49679,18 +49679,18 @@ _080218EA: adds r0, r7, 0 ands r0, r1 cmp r0, 0 - beq _08021920 + beq @08021920 adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, r3 - bcc _080218EA -_08021906: + bcc @080218EA +@08021906: movs r2, 0 adds r3, r6, 0 adds r3, 0x4C movs r4, 0x4 -_0802190E: +@0802190E: lsls r0, r2, 2 adds r0, r3, r0 ldr r0, [r0] @@ -49699,32 +49699,32 @@ _0802190E: adds r0, r4, 0 ands r0, r1 cmp r0, 0 - bne _08021924 -_08021920: + bne @08021924 +@08021920: movs r0, 0 - b _0802193C -_08021924: + b @0802193C +@08021924: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xA - bls _0802190E + bls @0802190E movs r1, 0x2C ldrsh r0, [r5, r1] cmp r0, 0 - beq _0802193A + beq @0802193A movs r0, 0 strh r0, [r5, 0x2C] -_0802193A: +@0802193A: movs r0, 0x1 -_0802193C: +@0802193C: pop {r4-r7} pop {r1} bx r1 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 @@ -49758,24 +49758,24 @@ sub_8021944: @ 8021944 mov r12, r0 ldr r5, =0x082f334c movs r4, 0x1 -_08021990: +@08021990: mov r0, r12 subs r1, r0, r2 adds r0, r3, 0 asrs r0, r1 ands r0, r4 cmp r0, 0 - beq _080219A6 + beq @080219A6 lsls r0, r2, 2 adds r0, r5 ldr r0, [r0] adds r7, r0 -_080219A6: +@080219A6: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x7 - bls _08021990 + bls @08021990 ldr r1, =0x000f4240 adds r0, r7, 0 bl __udivsi3 @@ -49788,7 +49788,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} @@ -49838,7 +49838,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 @@ -49866,12 +49866,12 @@ sub_8021A28: @ 8021A28 lsrs r3, 24 ldr r0, [sp, 0x10] cmp r0, 0x2 - bne _08021A68 + bne @08021A68 adds r0, r3, 0 subs r0, 0x2A lsls r0, 24 lsrs r3, r0, 24 -_08021A68: +@08021A68: ldr r2, [sp, 0xC] ldrb r1, [r2, 0x9] lsls r0, r1, 3 @@ -49879,35 +49879,35 @@ _08021A68: lsls r0, 1 subs r6, r3, r0 cmp r6, 0 - ble _08021A84 + ble @08021A84 lsrs r0, r6, 31 adds r0, r6, r0 asrs r0, 1 adds r6, r0, 0 adds r6, 0x10 - b _08021A86 -_08021A84: + b @08021A86 +@08021A84: movs r6, 0x10 -_08021A86: +@08021A86: movs r5, 0 ldr r3, [sp, 0xC] ldrb r3, [r3, 0x9] cmp r5, r3 - bcc _08021A92 - b _08021D14 -_08021A92: + bcc @08021A92 + b @08021D14 +@08021A92: ldr r4, [sp, 0x10] lsls r4, 2 str r4, [sp, 0x24] -_08021A98: +@08021A98: bl sub_81AFBF0 ldr r0, [sp, 0x10] cmp r0, 0x1 - beq _08021B48 + beq @08021B48 cmp r0, 0x1 - bgt _08021AC0 + bgt @08021AC0 cmp r0, 0 - beq _08021ADE + beq @08021ADE ldr r4, [sp, 0x14] subs r4, 0x4 lsls r1, r6, 24 @@ -49918,13 +49918,13 @@ _08021A98: ldr r3, [sp, 0x18] lsls r3, 5 mov r8, r3 - b _08021C5A -_08021AC0: + b @08021C5A +@08021AC0: ldr r4, [sp, 0x10] cmp r4, 0x2 - bne _08021AC8 - b _08021C1C -_08021AC8: + bne @08021AC8 + b @08021C1C +@08021AC8: ldr r4, [sp, 0x14] subs r4, 0x4 lsls r0, r6, 24 @@ -49935,8 +49935,8 @@ _08021AC8: ldr r2, [sp, 0x18] lsls r2, 5 mov r8, r2 - b _08021C5A -_08021ADE: + b @08021C5A +@08021ADE: ldr r0, [sp, 0x20] adds r0, 0x20 adds r0, r5 @@ -49946,7 +49946,7 @@ _08021ADE: ldr r2, [sp, 0x20] adds r2, 0xC cmp r5, 0 - beq _08021B04 + beq @08021B04 adds r0, r2, r3 subs r1, r5, 0x1 lsls r1, 1 @@ -49954,9 +49954,9 @@ _08021ADE: ldrh r0, [r0] ldrh r1, [r1] cmp r0, r1 - beq _08021B04 + beq @08021B04 str r5, [sp, 0x1C] -_08021B04: +@08021B04: ldr r4, [sp, 0x24] ldr r1, [sp, 0x10] adds r0, r4, r1 @@ -49983,10 +49983,10 @@ _08021B04: ldr r0, [sp, 0x18] lsls r0, 5 mov r8, r0 - b _08021C5A + b @08021C5A .align 2, 0 .pool -_08021B48: +@08021B48: ldr r1, [sp, 0x20] adds r0, r1, r5 adds r0, 0x28 @@ -49996,7 +49996,7 @@ _08021B48: adds r2, r1, 0 adds r2, 0xC cmp r5, 0 - beq _08021B72 + beq @08021B72 adds r0, r3, 0 adds r0, 0xA adds r0, r2, r0 @@ -50006,9 +50006,9 @@ _08021B48: ldrh r0, [r0] ldrh r1, [r1] cmp r0, r1 - beq _08021B72 + beq @08021B72 str r5, [sp, 0x1C] -_08021B72: +@08021B72: ldr r0, [sp, 0x24] ldr r1, [sp, 0x10] adds r4, r0, r1 @@ -50043,7 +50043,7 @@ _08021B72: adds r5, 0x1 ldr r1, =0x082f334c mov r12, r1 -_08021BB8: +@08021BB8: movs r0, 0x3 subs r1, r0, r2 adds r0, r3, 0 @@ -50051,17 +50051,17 @@ _08021BB8: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08021BD0 + beq @08021BD0 lsls r0, r2, 2 add r0, r12 ldr r0, [r0] adds r7, r0 -_08021BD0: +@08021BD0: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls _08021BB8 + bls @08021BB8 adds r0, r7, 0 ldr r1, =0x000f4240 bl __udivsi3 @@ -50078,10 +50078,10 @@ _08021BD0: ldr r1, [r0] ldr r0, =0x02021fc4 bl ExpandTextCodes - b _08021C5E + b @08021C5E .align 2, 0 .pool -_08021C1C: +@08021C1C: str r5, [sp, 0x18] str r5, [sp, 0x1C] lsls r7, r5, 5 @@ -50090,9 +50090,9 @@ _08021C1C: adds r0, 0xA4 ldrb r2, [r0] cmp r2, 0x2B - bls _08021C30 + bls @08021C30 movs r2, 0 -_08021C30: +@08021C30: lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -50112,10 +50112,10 @@ _08021C30: adds r1, r5 mov r9, r1 mov r8, r7 -_08021C5A: +@08021C5A: adds r6, 0xE adds r5, 0x1 -_08021C5E: +@08021C5E: movs r0, 0x2 ldr r1, =0x02021fc4 adds r2, r4, 0 @@ -50142,18 +50142,18 @@ _08021C5E: ldr r2, [sp, 0xC] ldrb r2, [r2, 0x8] cmp r3, r2 - bne _08021CC0 + bne @08021CC0 ldr r0, =0x02021ec4 ldr r1, =0x085ed7d4 bl gf_strcpy - b _08021CC8 + b @08021CC8 .align 2, 0 .pool -_08021CC0: +@08021CC0: ldr r0, =0x02021ec4 ldr r1, =0x085ed7e0 bl gf_strcpy -_08021CC8: +@08021CC8: ldr r4, =0x02021ec4 mov r3, r9 strb r3, [r4] @@ -50187,9 +50187,9 @@ _08021CC8: ldr r3, [sp, 0xC] ldrb r3, [r3, 0x9] cmp r5, r3 - bcs _08021D14 - b _08021A98 -_08021D14: + bcs @08021D14 + b @08021A98 +@08021D14: add sp, 0x2C pop {r3-r5} mov r8, r3 @@ -50203,7 +50203,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 @@ -50405,7 +50405,7 @@ sub_8021D34: @ 8021D34 mov r9, r1 movs r5, 0x1 ldr r3, =0x082f334c -_08021EEC: +@08021EEC: mov r4, r9 mov r0, r10 subs r1, r4, r0 @@ -50413,7 +50413,7 @@ _08021EEC: asrs r0, r1 ands r0, r5 cmp r0, 0 - beq _08021F0A + beq @08021F0A mov r1, r10 lsls r0, r1, 2 adds r0, r3 @@ -50421,14 +50421,14 @@ _08021EEC: ldr r4, [sp, 0xC] adds r4, r0 str r4, [sp, 0xC] -_08021F0A: +@08021F0A: mov r0, r10 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r10, r0 cmp r0, 0x7 - bls _08021EEC + bls @08021EEC ldr r0, =0x02021cc4 mov r2, r12 lsrs r1, r2, 8 @@ -50464,7 +50464,7 @@ _08021F0A: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - beq _08021FC4 + beq @08021FC4 movs r0, 0xDD lsls r0, 1 add r0, r8 @@ -50478,10 +50478,10 @@ _08021F0A: adds r2, r6, 0 adds r3, r7, 0 bl box_print - b _08021FDE + b @08021FDE .align 2, 0 .pool -_08021FC4: +@08021FC4: movs r0, 0xDD lsls r0, 1 add r0, r8 @@ -50494,7 +50494,7 @@ _08021FC4: adds r2, r6, 0 adds r3, r7, 0 bl box_print -_08021FDE: +@08021FDE: adds r0, r7, 0 adds r0, 0xE lsls r0, 24 @@ -50557,7 +50557,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 @@ -50566,25 +50566,25 @@ sub_8022070: @ 8022070 adds r0, 0x80 ldrb r0, [r0] cmp r0, 0x5 - bls _08022084 - b _08022218 -_08022084: + bls @08022084 + b @08022218 +@08022084: lsls r0, 2 - ldr r1, =_08022094 + ldr r1, =@08022094 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08022094: - .4byte _080220AC - .4byte _080220F8 - .4byte _0802210C - .4byte _08022130 - .4byte _080221F8 - .4byte _08022200 -_080220AC: +@08022094: + .4byte @080220AC + .4byte @080220F8 + .4byte @0802210C + .4byte @08022130 + .4byte @080221F8 + .4byte @08022200 +@080220AC: ldrb r0, [r4, 0x9] subs r0, 0x2 lsls r0, 24 @@ -50600,15 +50600,15 @@ _080220AC: stm r1!, {r2,r3} ldrh r0, [r4, 0x12] cmp r0, 0xD - bne _080220DC + bne @080220DC ldr r0, =0x082f3344 adds r0, 0x4 - b _080220DE + b @080220DE .align 2, 0 .pool -_080220DC: +@080220DC: ldr r0, =0x082f3344 -_080220DE: +@080220DE: adds r0, r5, r0 ldrb r1, [r0] mov r0, sp @@ -50618,10 +50618,10 @@ _080220DE: adds r1, r6, 0 adds r1, 0x82 strb r0, [r1] - b _08022218 + b @08022218 .align 2, 0 .pool -_080220F8: +@080220F8: adds r4, r6, 0 adds r4, 0x82 ldrb r0, [r4] @@ -50629,8 +50629,8 @@ _080220F8: ldrb r0, [r4] movs r1, 0 bl Window_FastFillPixels - b _08022218 -_0802210C: + b @08022218 +@0802210C: adds r5, r6, 0 adds r5, 0x82 ldrb r0, [r5] @@ -50643,27 +50643,27 @@ _0802210C: adds r2, r4, 0 movs r3, 0xD bl SetWindowBorderStyle - b _08022218 + b @08022218 .align 2, 0 .pool -_08022130: +@08022130: ldrb r0, [r4, 0x9] subs r0, 0x2 lsls r0, 24 lsrs r5, r0, 24 ldrh r0, [r4, 0x12] cmp r0, 0xC - beq _08022184 + beq @08022184 cmp r0, 0xC - bgt _08022148 + bgt @08022148 cmp r0, 0xB - beq _0802214E - b _08022218 -_08022148: + beq @0802214E + b @08022218 +@08022148: cmp r0, 0xD - beq _080221C8 - b _08022218 -_0802214E: + beq @080221C8 + b @08022218 +@0802214E: adds r0, r6, 0 adds r0, 0x82 ldrb r0, [r0] @@ -50683,10 +50683,10 @@ _0802214E: adds r1, r6, 0 adds r1, 0x80 movs r0, 0x5 - b _08022220 + b @08022220 .align 2, 0 .pool -_08022184: +@08022184: adds r0, r6, 0 adds r0, 0x82 ldrb r0, [r0] @@ -50713,10 +50713,10 @@ _08022184: adds r1, r6, 0 adds r1, 0x80 movs r0, 0x5 - b _08022220 + b @08022220 .align 2, 0 .pool -_080221C8: +@080221C8: adds r0, r6, 0 adds r0, 0x82 ldrb r0, [r0] @@ -50734,14 +50734,14 @@ _080221C8: movs r1, 0x2 movs r2, 0xB0 bl sub_8021A28 - b _08022218 + b @08022218 .align 2, 0 .pool -_080221F8: +@080221F8: adds r0, r4, 0 bl sub_8021D34 - b _08022218 -_08022200: + b @08022218 +@08022200: adds r0, r6, 0 adds r0, 0x82 ldrb r0, [r0] @@ -50752,16 +50752,16 @@ _08022200: movs r0, 0 strb r0, [r1] movs r0, 0x1 - b _08022224 -_08022218: + b @08022224 +@08022218: adds r1, r6, 0 adds r1, 0x80 ldrb r0, [r1] adds r0, 0x1 -_08022220: +@08022220: strb r0, [r1] movs r0, 0 -_08022224: +@08022224: add sp, 0x8 pop {r4-r6} pop {r1} @@ -50769,7 +50769,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 @@ -50788,7 +50788,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 @@ -50809,25 +50809,25 @@ sub_8022250: @ 8022250 movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0x1 - beq _080222D0 + beq @080222D0 cmp r0, 0x1 - bgt _08022288 + bgt @08022288 cmp r0, 0 - beq _08022296 - b _080224BA + beq @08022296 + b @080224BA .align 2, 0 .pool -_08022288: +@08022288: cmp r0, 0x2 - bne _0802228E - b _08022480 -_0802228E: + bne @0802228E + b @08022480 +@0802228E: cmp r0, 0x3 - bne _08022294 - b _08022494 -_08022294: - b _080224BA -_08022296: + bne @08022294 + b @08022494 +@08022294: + b @080224BA +@08022296: ldr r0, =0x082f32ec bl Window_AddFromTemplate strh r0, [r6, 0x2] @@ -50847,10 +50847,10 @@ _08022296: adds r2, r4, 0 movs r3, 0xD bl SetWindowBorderStyle - b _080224BA + b @080224BA .align 2, 0 .pool -_080222D0: +@080222D0: ldr r0, =0x085ed8d0 mov r10, r0 movs r1, 0x1 @@ -50898,7 +50898,7 @@ _080222D0: bl box_print movs r0, 0x29 mov r10, r0 -_08022336: +@08022336: mov r1, r9 adds r1, 0x2 ldr r0, =0x02021cc4 @@ -50954,7 +50954,7 @@ _08022336: movs r0, 0x1 mov r8, r0 ldr r5, =0x082f334c -_080223AE: +@080223AE: mov r0, r12 subs r1, r0, r2 adds r0, r3, 0 @@ -50962,19 +50962,19 @@ _080223AE: mov r1, r8 ands r0, r1 cmp r0, 0 - beq _080223CA + beq @080223CA lsls r0, r2, 2 adds r0, r5 ldr r0, [r0] ldr r1, [sp, 0xC] adds r1, r0 str r1, [sp, 0xC] -_080223CA: +@080223CA: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x7 - bls _080223AE + bls @080223AE adds r0, r4, r6 ldrh r1, [r0, 0x4] lsrs r1, 8 @@ -51023,26 +51023,26 @@ _080223CA: lsrs r0, 24 mov r9, r0 cmp r0, 0x3 - bhi _08022444 - b _08022336 -_08022444: + bhi @08022444 + b @08022336 +@08022444: ldrb r0, [r6, 0x2] movs r1, 0x3 bl Window_CopyToVram - b _080224BA + b @080224BA .align 2, 0 .pool -_08022480: +@08022480: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne _080224BA - b _080224C0 + bne @080224BA + b @080224C0 .align 2, 0 .pool -_08022494: +@08022494: ldrb r0, [r6, 0x2] movs r1, 0x1 bl sub_8198070 @@ -51055,13 +51055,13 @@ _08022494: bl script_env_2_enable_and_set_ctx_running bl script_env_2_disable mov r0, r9 - b _080224BE -_080224BA: + b @080224BE +@080224BA: ldrh r0, [r6] adds r0, 0x1 -_080224BE: +@080224BE: strh r0, [r6] -_080224C0: +@080224C0: add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -51073,7 +51073,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 + 1 @@ -51112,7 +51112,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 @@ -51136,7 +51136,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 @@ -51163,15 +51163,15 @@ 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 ldrb r0, [r5, 0x9] cmp r6, r0 - bcs _080225E8 + bcs @080225E8 ldr r7, =0x082f417c -_08022596: +@08022596: lsls r0, r6, 2 movs r1, 0xA2 lsls r1, 1 @@ -51209,8 +51209,8 @@ _08022596: lsrs r6, r0, 24 ldrb r0, [r5, 0x9] cmp r6, r0 - bcc _08022596 -_080225E8: + bcc @08022596 +@080225E8: pop {r4-r7} pop {r0} bx r0 @@ -51219,7 +51219,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} @@ -51228,10 +51228,10 @@ sub_8022600: @ 8022600 movs r7, 0 ldrb r0, [r6, 0x9] cmp r7, r0 - bcs _080226B6 + bcs @080226B6 movs r1, 0 mov r8, r1 -_08022616: +@08022616: ldr r1, =0x000001bb adds r0, r6, r1 adds r5, r0, r7 @@ -51239,7 +51239,7 @@ _08022616: bl Window_WriteStandardTileMap ldrb r0, [r6, 0x8] cmp r7, r0 - bne _08022668 + bne @08022668 lsls r4, r7, 5 adds r4, 0x98 adds r4, r6, r4 @@ -51264,10 +51264,10 @@ _08022616: movs r1, 0x2 movs r3, 0x1 bl sub_8199EEC - b _0802269C + b @0802269C .align 2, 0 .pool -_08022668: +@08022668: lsls r4, r7, 5 adds r4, 0x98 adds r4, r6, r4 @@ -51292,7 +51292,7 @@ _08022668: movs r1, 0x2 movs r3, 0x1 bl sub_8199EEC -_0802269C: +@0802269C: ldr r1, =0x000001bb adds r0, r6, r1 adds r0, r7 @@ -51304,8 +51304,8 @@ _0802269C: lsrs r7, r0, 24 ldrb r0, [r6, 0x9] cmp r7, r0 - bcc _08022616 -_080226B6: + bcc @08022616 +@080226B6: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram add sp, 0x14 @@ -51319,7 +51319,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 @@ -51328,10 +51328,10 @@ sub_80226D0: @ 80226D0 ldr r4, =0x0201c000 adds r1, r4, 0 bl LZ77UnCompWram - b _0802271A + b @0802271A .align 2, 0 .pool -_080226EC: +@080226EC: lsls r1, r5, 2 movs r2, 0xA2 lsls r2, 1 @@ -51354,10 +51354,10 @@ _080226EC: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_0802271A: +@0802271A: ldrb r0, [r6, 0x9] cmp r5, r0 - bcc _080226EC + bcc @080226EC movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram add sp, 0x8 @@ -51367,7 +51367,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 @@ -51379,7 +51379,7 @@ sub_8022730: @ 8022730 ldr r1, =0x02021bbe strh r0, [r1] ldr r4, =0x082f41f4 -_08022746: +@08022746: lsls r0, r5, 3 adds r0, r4 bl gpu_tile_obj_decompress_and_load @@ -51387,7 +51387,7 @@ _08022746: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _08022746 + bls @08022746 ldr r0, =0x082f421c bl gpu_pal_obj_alloc_and_load_multiple ldr r0, =0x082f430c @@ -51425,9 +51425,9 @@ _08022746: movs r5, 0 ldrb r1, [r6, 0x9] cmp r5, r1 - bcs _08022822 + bcs @08022822 movs r7, 0x4 -_080227AA: +@080227AA: lsls r4, r5, 2 movs r3, 0xA2 lsls r3, 1 @@ -51486,12 +51486,12 @@ _080227AA: lsrs r5, r0, 24 ldrb r0, [r6, 0x9] cmp r5, r0 - bcc _080227AA -_08022822: + bcc @080227AA +@08022822: movs r5, 0 ldr r4, =0x082f41d2 adds r7, r4, 0x1 -_08022828: +@08022828: lsls r2, r5, 1 adds r0, r2, r4 movs r1, 0 @@ -51540,9 +51540,9 @@ _08022828: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0xA - bls _08022828 + bls @08022828 movs r5, 0 -_0802288E: +@0802288E: lsls r1, r5, 1 adds r1, r5 lsls r1, 19 @@ -51592,7 +51592,7 @@ _0802288E: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x1 - bls _0802288E + bls @0802288E ldr r4, =0x082f4384 movs r0, 0 movs r1, 0 @@ -51610,12 +51610,12 @@ _0802288E: bl sub_8034D14 ldrh r0, [r6, 0x12] cmp r0, 0x1 - bne _08022928 + bne @08022928 movs r4, 0x9C lsls r4, 1 adds r0, r6, r4 bl sub_8022554 -_08022928: +@08022928: pop {r4-r7} pop {r0} bx r0 @@ -51624,7 +51624,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 @@ -51645,7 +51645,7 @@ sub_8022960: @ 8022960 movs r0, 0xD8 lsls r0, 1 adds r6, r5, r0 -_08022996: +@08022996: lsls r0, r4, 2 adds r0, r6, r0 ldr r0, [r0] @@ -51654,7 +51654,7 @@ _08022996: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bls _08022996 + bls @08022996 movs r0, 0x2 bl sub_80353DC movs r0, 0x1 @@ -51665,7 +51665,7 @@ _08022996: movs r1, 0xC2 lsls r1, 1 adds r6, r5, r1 -_080229C4: +@080229C4: lsls r0, r4, 2 adds r0, r6, r0 ldr r0, [r0] @@ -51674,12 +51674,12 @@ _080229C4: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xA - bls _080229C4 + bls @080229C4 movs r4, 0 ldrb r2, [r5, 0x9] cmp r4, r2 - bcs _080229FC -_080229E0: + bcs @080229FC +@080229E0: lsls r1, r4, 2 movs r2, 0xAE lsls r2, 1 @@ -51692,8 +51692,8 @@ _080229E0: lsrs r4, r0, 24 ldrb r0, [r5, 0x9] cmp r4, r0 - bcc _080229E0 -_080229FC: + bcc @080229E0 +@080229FC: movs r1, 0xAC lsls r1, 1 adds r0, r5, r1 @@ -51704,17 +51704,17 @@ _080229FC: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08022A18 + beq @08022A18 adds r0, r2, 0 bl obj_delete_and_free_tiles -_08022A18: +@08022A18: pop {r4-r6} pop {r0} bx r0 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 @@ -51722,7 +51722,7 @@ sub_8022A20: @ 8022A20 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08022A46 + beq @08022A46 adds r2, r3, 0 adds r2, 0x3E ldrb r0, [r2] @@ -51734,13 +51734,13 @@ sub_8022A20: @ 8022A20 movs r1, 0x40 orrs r0, r1 strb r0, [r2] -_08022A46: +@08022A46: pop {r0} bx r0 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 @@ -51748,7 +51748,7 @@ sub_8022A4C: @ 8022A4C adds r2, r3, 0 adds r2, 0x2E movs r4, 0 -_08022A5A: +@08022A5A: lsls r0, r1, 1 adds r0, r2, r0 strh r4, [r0] @@ -51756,7 +51756,7 @@ _08022A5A: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x7 - bls _08022A5A + bls @08022A5A movs r0, 0 strh r0, [r3, 0x24] strh r0, [r3, 0x26] @@ -51780,7 +51780,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 @@ -51800,7 +51800,7 @@ sub_8022A94: @ 8022A94 lsls r6, 8 ands r0, r6 cmp r0, 0 - beq _08022AFA + beq @08022AFA ldrh r0, [r4, 0x6] ldrh r2, [r5, 0x2E] adds r0, r2 @@ -51819,19 +51819,19 @@ sub_8022A94: @ 8022A94 ldrsh r0, [r4, r1] ands r0, r6 cmp r0, 0 - beq _08022AFA + beq @08022AFA ldrh r0, [r4, 0x8] lsls r0, 16 asrs r0, 23 cmp r0, 0x7E - ble _08022AFA + ble @08022AFA movs r0, 0 strh r0, [r5, 0x24] ldrh r1, [r4, 0xE] ldr r0, =0x00007fff ands r0, r1 strh r0, [r4, 0xE] -_08022AFA: +@08022AFA: ldrh r0, [r4] lsls r0, 16 asrs r0, 23 @@ -51845,10 +51845,10 @@ _08022AFA: ldr r0, =0x00007fff ands r0, r2 cmp r1, r0 - ble _08022B1A + ble @08022B1A ldr r0, =sub_8022A4C + 1 str r0, [r5, 0x1C] -_08022B1A: +@08022B1A: pop {r4-r6} pop {r0} bx r0 @@ -51857,7 +51857,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} @@ -51915,9 +51915,9 @@ sub_8022B28: @ 8022B28 movs r2, 0x24 ldrsh r0, [r6, r2] cmp r0, 0 - bge _08022BA6 + bge @08022BA6 adds r0, 0x3 -_08022BA6: +@08022BA6: asrs r0, 2 strh r0, [r7, 0xC] ldrh r0, [r7, 0xE] @@ -51953,7 +51953,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} @@ -51966,17 +51966,17 @@ sub_8022BEC: @ 8022BEC bl sub_8020C00 adds r6, r0, 0 cmp r5, 0x19 - bls _08022C0A + bls @08022C0A movs r5, 0 -_08022C0A: +@08022C0A: cmp r4, 0 - beq _08022C14 + beq @08022C14 cmp r4, 0x1 - beq _08022C40 - b _08022C4A -_08022C14: + beq @08022C40 + b @08022C4A +@08022C14: cmp r5, 0 - beq _08022C28 + beq @08022C28 ldr r0, =0x082f43cc lsls r1, r5, 2 adds r1, r0 @@ -51984,27 +51984,27 @@ _08022C14: adds r0, r6, 0 adds r1, r7, 0 bl _call_via_r2 -_08022C28: +@08022C28: ldrb r0, [r6, 0xE] cmp r0, 0x19 - bls _08022C32 + bls @08022C32 mov r0, r8 strb r0, [r6, 0xE] -_08022C32: +@08022C32: ldr r0, =0x082f43cc ldrb r1, [r6, 0xE] lsls r1, 2 - b _08022C44 + b @08022C44 .align 2, 0 .pool -_08022C40: +@08022C40: ldr r0, =0x082f43cc lsls r1, r5, 2 -_08022C44: +@08022C44: adds r1, r0 ldr r0, [r1] str r0, [r6, 0x4] -_08022C4A: +@08022C4A: pop {r3} mov r8, r3 pop {r4-r7} @@ -52015,7 +52015,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 @@ -52061,66 +52061,66 @@ 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 ldrb r0, [r4, 0xC] cmp r0, 0x1 - beq _08022CE4 + beq @08022CE4 cmp r0, 0x1 - bgt _08022CC6 + bgt @08022CC6 cmp r0, 0 - beq _08022CD0 - b _08022D06 -_08022CC6: + beq @08022CD0 + b @08022D06 +@08022CC6: cmp r0, 0x2 - beq _08022CEA + beq @08022CEA cmp r0, 0x3 - beq _08022CF6 - b _08022D06 -_08022CD0: + beq @08022CF6 + b @08022D06 +@08022CD0: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne _08022D0C + bne @08022D0C ldrb r0, [r5] cmp r0, 0 - bne _08022D06 + bne @08022D06 movs r0, 0x3 - b _08022D0A -_08022CE4: + b @08022D0A +@08022CE4: bl sub_8010434 - b _08022D06 -_08022CEA: + b @08022D06 +@08022CEA: bl sub_800A520 lsls r0, 24 cmp r0, 0 - bne _08022D06 - b _08022D0C -_08022CF6: + bne @08022D06 + b @08022D0C +@08022CF6: ldrb r0, [r4, 0xF] movs r1, 0x1 movs r2, 0 bl sub_8022BEC movs r0, 0 strb r0, [r4, 0xC] - b _08022D0E -_08022D06: + b @08022D0E +@08022D06: ldrb r0, [r4, 0xC] adds r0, 0x1 -_08022D0A: +@08022D0A: strb r0, [r4, 0xC] -_08022D0C: +@08022D0C: movs r0, 0 -_08022D0E: +@08022D0E: pop {r4,r5} pop {r1} bx r1 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} @@ -52133,19 +52133,19 @@ sub_8022D14: @ 8022D14 orrs r4, r0 ldrb r6, [r7, 0xC] cmp r6, 0x1 - beq _08022DC0 + beq @08022DC0 cmp r6, 0x1 - bgt _08022D38 + bgt @08022D38 cmp r6, 0 - beq _08022D42 - b _08022E08 -_08022D38: + beq @08022D42 + b @08022E08 +@08022D38: cmp r6, 0x2 - beq _08022DD8 + beq @08022DD8 cmp r6, 0x3 - beq _08022DE8 - b _08022E08 -_08022D42: + beq @08022DE8 + b @08022E08 +@08022D42: movs r0, 0 movs r1, 0 bl sub_81973C4 @@ -52156,7 +52156,7 @@ _08022D42: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq _08022D90 + beq @08022D90 ldr r4, =0x02021fc4 ldr r1, =0x082f32a4 ldrb r0, [r5] @@ -52177,10 +52177,10 @@ _08022D42: movs r1, 0x1 adds r2, r4, 0 bl text_box_related_one - b _08022DB2 + b @08022DB2 .align 2, 0 .pool -_08022D90: +@08022D90: ldr r1, =0x082f32a4 ldrb r0, [r5] lsls r0, 2 @@ -52197,56 +52197,56 @@ _08022D90: movs r0, 0 movs r1, 0x1 bl text_box_related_one -_08022DB2: +@08022DB2: movs r0, 0 movs r1, 0x3 bl Window_CopyToVram - b _08022E08 + b @08022E08 .align 2, 0 .pool -_08022DC0: +@08022DC0: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _08022E0E + bne @08022E0E cmp r4, 0 - bne _08022E08 + bne @08022E08 ldrb r0, [r7, 0xC] adds r0, 0x1 strb r0, [r7, 0xC] - b _08022E08 -_08022DD8: + b @08022E08 +@08022DD8: ldr r0, =0x030022c0 ldrh r0, [r0, 0x2E] ands r4, r0 cmp r4, 0 - bne _08022E08 - b _08022E0E + bne @08022E08 + b @08022E0E .align 2, 0 .pool -_08022DE8: +@08022DE8: ldrb r1, [r5, 0x1] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08022DFA + beq @08022DFA movs r0, 0 movs r1, 0x1 bl sub_8197434 -_08022DFA: +@08022DFA: ldrb r0, [r7, 0xE] movs r1, 0x1 movs r2, 0 bl sub_8022BEC ldrb r0, [r5, 0x4] - b _08022E0C -_08022E08: + b @08022E0C +@08022E08: ldrb r0, [r7, 0xC] adds r0, 0x1 -_08022E0C: +@08022E0C: strb r0, [r7, 0xC] -_08022E0E: +@08022E0E: movs r0, 0 add sp, 0x10 pop {r3} @@ -52257,18 +52257,18 @@ _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 cmp r0, 0 - beq _08022E34 + beq @08022E34 ldrb r0, [r4, 0xE] adds r2, r4, 0 adds r2, 0x36 movs r1, 0 bl sub_8022BEC -_08022E34: +@08022E34: movs r0, 0 pop {r4} pop {r1} @@ -52276,18 +52276,18 @@ _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 cmp r0, 0 - beq _08022E54 + beq @08022E54 ldrb r0, [r4, 0xE] adds r2, r4, 0 adds r2, 0x36 movs r1, 0 bl sub_8022BEC -_08022E54: +@08022E54: movs r0, 0 pop {r4} pop {r1} @@ -52295,23 +52295,23 @@ _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] cmp r0, 0 - beq _08022E6C + beq @08022E6C cmp r0, 0x1 - beq _08022E72 - b _08022E9C -_08022E6C: + beq @08022E72 + b @08022E9C +@08022E6C: bl sub_8010434 - b _08022E9C -_08022E72: + b @08022E9C +@08022E72: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08022EA2 + beq @08022EA2 ldr r0, =0x000001e5 bl current_map_music_set movs r0, 0x7 @@ -52322,14 +52322,14 @@ _08022E72: movs r0, 0x3 strh r0, [r4, 0x12] strb r1, [r4, 0xC] - b _08022EA2 + b @08022EA2 .align 2, 0 .pool -_08022E9C: +@08022E9C: ldrb r0, [r4, 0xC] adds r0, 0x1 strb r0, [r4, 0xC] -_08022EA2: +@08022EA2: movs r0, 0 pop {r4} pop {r1} @@ -52337,19 +52337,19 @@ _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 adds r5, r1, 0 ldrb r0, [r4, 0xC] cmp r0, 0 - beq _08022EC2 + beq @08022EC2 cmp r0, 0x1 - beq _08022EE8 + beq @08022EE8 adds r0, 0x1 - b _08022EF8 -_08022EC2: + b @08022EF8 +@08022EC2: adds r0, r4, 0 bl sub_8024578 movs r0, 0x1 @@ -52365,8 +52365,8 @@ _08022EC2: movs r1, 0x1 movs r2, 0 bl sub_8022BEC - b _08022EFA -_08022EE8: + b @08022EFA +@08022EE8: movs r0, 0x8 strb r0, [r4, 0xE] movs r0, 0x5 @@ -52374,9 +52374,9 @@ _08022EE8: movs r2, 0 bl sub_8022BEC movs r0, 0x2 -_08022EF8: +@08022EF8: strb r0, [r4, 0xC] -_08022EFA: +@08022EFA: movs r0, 0 add sp, 0x4 pop {r4,r5} @@ -52385,7 +52385,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] @@ -52399,32 +52399,32 @@ 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 adds r2, r1, 0 ldrb r0, [r5, 0xC] cmp r0, 0x5 - bls _08022F2C - b _08023060 -_08022F2C: + bls @08022F2C + b @08023060 +@08022F2C: lsls r0, 2 - ldr r1, =_08022F3C + ldr r1, =@08022F3C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08022F3C: - .4byte _08022F54 - .4byte _08022F74 - .4byte _08022F7A - .4byte _08022FAA - .4byte _08022FBA - .4byte _08023044 -_08022F54: +@08022F3C: + .4byte @08022F54 + .4byte @08022F74 + .4byte @08022F7A + .4byte @08022FAA + .4byte @08022FBA + .4byte @08023044 +@08022F54: movs r0, 0x1 str r0, [sp] adds r0, r2, 0 @@ -52438,15 +52438,15 @@ _08022F54: movs r1, 0x1 movs r2, 0 bl sub_8022BEC - b _08023066 -_08022F74: + b @08023066 +@08022F74: bl sub_8010434 - b _08023060 -_08022F7A: + b @08023060 +@08022F7A: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08023066 + beq @08023066 adds r4, r5, 0 adds r4, 0x42 adds r0, r4, 0 @@ -52463,16 +52463,16 @@ _08022F7A: adds r1, r4, 0 movs r2, 0x2 bl link_0800A448 - b _08023060 -_08022FAA: + b @08023060 +@08022FAA: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08023066 + beq @08023066 movs r0, 0 strh r0, [r5, 0x10] - b _08023060 -_08022FBA: + b @08023060 +@08022FBA: bl sub_800A550 ldr r2, =0x082f4448 ldrb r4, [r5, 0x9] @@ -52482,14 +52482,14 @@ _08022FBA: lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bne _08023066 + bne @08023066 movs r3, 0 cmp r3, r4 - bcs _0802301E + bcs @0802301E ldr r7, =0x020223c4 movs r6, 0 ldr r4, =0x0858ab24 -_08022FDC: +@08022FDC: lsls r0, r3, 5 adds r0, r5, r0 lsls r1, r3, 8 @@ -52501,9 +52501,9 @@ _08022FDC: lsls r1, 16 lsrs r1, 16 cmp r1, 0xB0 - bls _08022FF6 + bls @08022FF6 strh r6, [r2] -_08022FF6: +@08022FF6: ldrh r1, [r2] lsls r1, 2 adds r1, r4 @@ -52523,8 +52523,8 @@ _08022FF6: lsrs r3, r0, 24 ldrb r0, [r5, 0x9] cmp r3, r0 - bcc _08022FDC -_0802301E: + bcc @08022FDC +@0802301E: movs r0, 0 strh r0, [r5, 0x10] bl sub_800A5B4 @@ -52535,10 +52535,10 @@ _0802301E: lsls r1, 6 bl sub_81515FC str r0, [r5, 0x20] - b _08023060 + b @08023060 .align 2, 0 .pool -_08023044: +@08023044: movs r0, 0 movs r1, 0x1 bl sub_8197434 @@ -52550,12 +52550,12 @@ _08023044: movs r0, 0x4 strh r0, [r5, 0x12] strb r1, [r5, 0xC] - b _08023066 -_08023060: + b @08023066 +@08023060: ldrb r0, [r5, 0xC] adds r0, 0x1 strb r0, [r5, 0xC] -_08023066: +@08023066: movs r0, 0 add sp, 0x4 pop {r4-r7} @@ -52564,43 +52564,43 @@ _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] cmp r0, 0x6 - bls _0802307C - b _080231A8 -_0802307C: + bls @0802307C + b @080231A8 +@0802307C: lsls r0, 2 - ldr r1, =_0802308C + ldr r1, =@0802308C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0802308C: - .4byte _080230A8 - .4byte _080230BA - .4byte _080230E8 - .4byte _08023120 - .4byte _08023150 - .4byte _08023172 - .4byte _08023184 -_080230A8: +@0802308C: + .4byte @080230A8 + .4byte @080230BA + .4byte @080230E8 + .4byte @08023120 + .4byte @08023150 + .4byte @08023172 + .4byte @08023184 +@080230A8: movs r0, 0x9C lsls r0, 1 adds r1, r4, r0 adds r0, r4, 0 bl sub_80214A8 bl sub_8010434 - b _080231A8 -_080230BA: + b @080231A8 +@080230BA: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080231AE + beq @080231AE movs r2, 0x9C lsls r2, 1 adds r1, r4, r2 @@ -52615,10 +52615,10 @@ _080230BA: adds r3, 0x2 adds r1, r4, r3 strb r0, [r1] - b _080231A8 + b @080231A8 .align 2, 0 .pool -_080230E8: +@080230E8: movs r0, 0x9C lsls r0, 1 adds r3, r4, r0 @@ -52642,10 +52642,10 @@ _080230E8: strb r0, [r1] movs r0, 0x3D bl audio_play - b _080231A8 + b @080231A8 .align 2, 0 .pool -_08023120: +@08023120: movs r3, 0x9C lsls r3, 1 adds r2, r4, r3 @@ -52658,47 +52658,47 @@ _08023120: ldr r1, [r0, 0x1C] ldr r0, =sub_8021608 + 1 cmp r1, r0 - beq _080231AE + beq @080231AE movs r0, 0 str r0, [r3] ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] bl sub_8010434 - b _080231A8 + b @080231A8 .align 2, 0 .pool -_08023150: +@08023150: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080231AE + beq @080231AE movs r0, 0x9C lsls r0, 1 adds r1, r4, r0 ldrb r0, [r1] ldrb r2, [r4, 0x9] cmp r0, r2 - bcs _0802316C + bcs @0802316C movs r0, 0x2 - b _080231AC -_0802316C: + b @080231AC +@0802316C: movs r0, 0 strb r0, [r1] - b _080231A8 -_08023172: + b @080231A8 +@08023172: movs r3, 0x9C lsls r3, 1 adds r1, r4, r3 adds r0, r4, 0 bl sub_80216A8 bl sub_8010434 - b _080231A8 -_08023184: + b @080231A8 +@08023184: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080231AE + beq @080231AE movs r0, 0x2B bl audio_play movs r0, 0xB @@ -52709,13 +52709,13 @@ _08023184: movs r0, 0x5 strh r0, [r4, 0x12] strb r1, [r4, 0xC] - b _080231AE -_080231A8: + b @080231AE +@080231A8: ldrb r0, [r4, 0xC] adds r0, 0x1 -_080231AC: +@080231AC: strb r0, [r4, 0xC] -_080231AE: +@080231AE: movs r0, 0 pop {r4} pop {r1} @@ -52723,32 +52723,32 @@ _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] cmp r1, 0x1 - beq _0802321C + beq @0802321C cmp r1, 0x1 - bgt _080231CC + bgt @080231CC cmp r1, 0 - beq _080231D6 - b _080232DC -_080231CC: + beq @080231D6 + b @080232DC +@080231CC: cmp r1, 0x2 - beq _0802329C + beq @0802329C cmp r1, 0x3 - beq _080232BE - b _080232DC -_080231D6: + beq @080232BE + b @080232DC +@080231D6: ldrh r0, [r4, 0x2A] adds r0, 0x4 strh r0, [r4, 0x2A] lsls r0, 16 cmp r0, 0 - bge _080231E4 - b _080232E2 -_080231E4: + bge @080231E4 + b @080232E2 +@080231E4: strh r1, [r4, 0x2A] ldr r0, =0x00000139 adds r3, r4, r0 @@ -52771,10 +52771,10 @@ _080231E4: strb r0, [r1] movs r0, 0xD6 bl audio_play - b _080232DC + b @080232DC .align 2, 0 .pool -_0802321C: +@0802321C: ldr r7, =0x082f326c movs r0, 0x9C lsls r0, 1 @@ -52817,10 +52817,10 @@ _0802321C: lsrs r0, 24 ldrb r1, [r2] cmp r0, r1 - bcc _080232E2 + bcc @080232E2 ldrb r0, [r5] cmp r0, 0 - beq _080232DC + beq @080232DC subs r0, 0x1 strb r0, [r5] ldrb r1, [r5] @@ -52831,10 +52831,10 @@ _0802321C: strb r0, [r2] movs r0, 0 strb r0, [r6] - b _080232E2 + b @080232E2 .align 2, 0 .pool -_0802329C: +@0802329C: movs r0, 0 strh r0, [r4, 0x2C] movs r0, 0x12 @@ -52847,12 +52847,12 @@ _0802329C: movs r1, 0 bl lcd_io_set bl sub_8010434 - b _080232DC -_080232BE: + b @080232DC +@080232BE: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080232E2 + beq @080232E2 movs r0, 0xC movs r1, 0x1 movs r2, 0 @@ -52861,12 +52861,12 @@ _080232BE: movs r0, 0x6 strh r0, [r4, 0x12] strb r1, [r4, 0xC] - b _080232E2 -_080232DC: + b @080232E2 +@080232DC: ldrb r0, [r4, 0xC] adds r0, 0x1 strb r0, [r4, 0xC] -_080232E2: +@080232E2: movs r0, 0 pop {r4-r7} pop {r1} @@ -52874,29 +52874,29 @@ _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 ldrb r0, [r4, 0xC] cmp r0, 0x1 - beq _0802330C + beq @0802330C cmp r0, 0x1 - bgt _08023302 + bgt @08023302 cmp r0, 0 - beq _08023332 - b _0802338C -_08023302: + beq @08023332 + b @0802338C +@08023302: cmp r0, 0x2 - beq _0802332A + beq @0802332A cmp r0, 0x3 - beq _08023338 - b _0802338C -_0802330C: + beq @08023338 + b @0802338C +@0802330C: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08023392 + beq @08023392 movs r1, 0x80 lsls r1, 5 movs r0, 0 @@ -52905,19 +52905,19 @@ _0802330C: movs r2, 0x78 movs r3, 0x50 bl sub_802EB24 - b _0802338C -_0802332A: + b @0802338C +@0802332A: bl sub_802EB84 cmp r0, 0 - bne _08023392 -_08023332: + bne @08023392 +@08023332: bl sub_8010434 - b _0802338C -_08023338: + b @0802338C +@08023338: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08023392 + beq @08023392 movs r0, 0x9C lsls r0, 1 adds r1, r4, r0 @@ -52935,30 +52935,30 @@ _08023338: strh r0, [r4, 0x10] ldrb r0, [r4, 0x8] cmp r0, 0 - bne _08023378 + bne @08023378 movs r0, 0xD movs r1, 0x1 movs r2, 0 bl sub_8022BEC - b _08023382 + b @08023382 .align 2, 0 .pool -_08023378: +@08023378: movs r0, 0xE movs r1, 0x1 movs r2, 0 bl sub_8022BEC -_08023382: +@08023382: movs r1, 0 movs r0, 0x7 strh r0, [r4, 0x12] strb r1, [r4, 0xC] - b _08023392 -_0802338C: + b @08023392 +@0802338C: ldrb r0, [r4, 0xC] adds r0, 0x1 strb r0, [r4, 0xC] -_08023392: +@08023392: movs r0, 0 add sp, 0x4 pop {r4} @@ -52967,7 +52967,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 @@ -52980,13 +52980,13 @@ sub_802339C: @ 802339C adds r7, r2, 0 ldrb r1, [r4, 0x9] cmp r7, r1 - bcs _080234AA + bcs @080234AA movs r2, 0x5E adds r2, r4 mov r9, r2 ldr r3, =0x082f325c mov r10, r3 -_080233C0: +@080233C0: lsls r0, r7, 4 ldr r1, =0x03003090 adds r2, r0, r1 @@ -52997,17 +52997,17 @@ _080233C0: movs r3, 0xBC lsls r3, 6 cmp r0, r3 - bne _0802349E + bne @0802349E ldrh r0, [r2, 0x2] cmp r0, 0x2 - bne _0802349E + bne @0802349E ldrb r1, [r2, 0x4] movs r0, 0x4 ands r0, r1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq _08023496 + beq @08023496 mov r0, r9 ldrb r2, [r0] lsrs r1, r2, 3 @@ -53049,10 +53049,10 @@ _080233C0: subs r0, r1, 0x1 adds r6, r2, 0 cmp r3, r0 - blt _08023468 + blt @08023468 adds r0, r1, 0x1 cmp r3, r0 - bgt _08023468 + bgt @08023468 mov r1, r12 adds r1, 0xA8 ldrh r0, [r1] @@ -53064,12 +53064,12 @@ _080233C0: ldrh r1, [r1] ldrh r2, [r0] cmp r1, r2 - bls _08023476 + bls @08023476 strh r1, [r0] - b _08023476 + b @08023476 .align 2, 0 .pool -_08023468: +@08023468: adds r0, r4, r6 adds r2, r0, 0 adds r2, 0xA8 @@ -53077,7 +53077,7 @@ _08023468: strh r1, [r2] adds r0, 0xAA strh r3, [r0] -_08023476: +@08023476: adds r1, r4, r6 ldrh r0, [r4, 0x28] adds r3, r1, 0 @@ -53091,55 +53091,55 @@ _08023476: lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bls _0802349E + bls @0802349E strb r2, [r1] - b _0802349E -_08023496: + b @0802349E +@08023496: lsls r0, r7, 5 adds r0, r4, r0 adds r0, 0xB5 strb r1, [r0] -_0802349E: +@0802349E: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 ldrb r3, [r4, 0x9] cmp r7, r3 - bcc _080233C0 -_080234AA: + bcc @080233C0 +@080234AA: mov r0, r8 cmp r0, 0x1 - bls _080234E0 + bls @080234E0 movs r7, 0 ldrb r1, [r4, 0x9] cmp r7, r1 - bcs _080234E0 + bcs @080234E0 movs r3, 0x2 -_080234BA: +@080234BA: lsls r0, r7, 5 adds r1, r4, r0 adds r2, r1, 0 adds r2, 0xB5 ldrb r0, [r2] cmp r0, 0 - beq _080234D4 + beq @080234D4 orrs r0, r3 strb r0, [r2] adds r1, 0xB0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_080234D4: +@080234D4: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 ldrb r2, [r4, 0x9] cmp r7, r2 - bcc _080234BA -_080234E0: + bcc @080234BA +@080234E0: mov r3, r8 cmp r3, 0 - beq _08023548 + beq @08023548 ldrh r0, [r4, 0x2E] add r0, r8 strh r0, [r4, 0x2E] @@ -53164,7 +53164,7 @@ _080234E0: ldrsh r2, [r4, r3] subs r0, r2 cmp r0, 0 - ble _08023534 + ble @08023534 lsls r2, 8 ldr r1, [r4, 0x20] adds r0, r2, 0 @@ -53174,10 +53174,10 @@ _080234E0: adds r0, r4, 0 adds r0, 0x24 strb r2, [r0] - b _08023548 + b @08023548 .align 2, 0 .pool -_08023534: +@08023534: adds r1, r4, 0 adds r1, 0x24 movs r0, 0x20 @@ -53188,7 +53188,7 @@ _08023534: movs r1, 0x1 orrs r0, r1 strb r0, [r2] -_08023548: +@08023548: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -53199,7 +53199,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 @@ -53207,17 +53207,17 @@ sub_8023558: @ 8023558 adds r4, r1, 0 ldrb r0, [r3, 0x9] cmp r4, r0 - bcs _080235B0 + bcs @080235B0 adds r5, r3, 0 adds r5, 0x64 -_0802356C: +@0802356C: lsls r0, r4, 5 adds r1, r3, r0 adds r0, r1, 0 adds r0, 0xB5 ldrb r2, [r0] cmp r2, 0 - beq _080235A4 + beq @080235A4 adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 @@ -53228,10 +53228,10 @@ _0802356C: movs r0, 0x2 ands r0, r2 cmp r0, 0 - beq _08023594 + beq @08023594 movs r0, 0x4 orrs r1, r0 -_08023594: +@08023594: lsls r0, r4, 1 adds r0, r4 lsls r1, r0 @@ -53240,43 +53240,43 @@ _08023594: ldrh r0, [r5] orrs r1, r0 strh r1, [r5] -_080235A4: +@080235A4: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 ldrb r1, [r3, 0x9] cmp r4, r1 - bcc _0802356C -_080235B0: + bcc @0802356C +@080235B0: adds r0, r3, 0 adds r0, 0x24 ldrb r1, [r0] adds r0, 0x3C strh r1, [r0] cmp r6, 0 - bne _080235D4 + bne @080235D4 ldr r2, =0x0000013b adds r0, r3, r2 ldrb r0, [r0] cmp r0, 0 - beq _080236A0 + beq @080236A0 movs r4, 0x9C lsls r4, 1 adds r1, r3, r4 - b _08023612 + b @08023612 .align 2, 0 .pool -_080235D4: +@080235D4: ldr r5, =0x0000013b adds r2, r3, r5 ldrb r0, [r2] cmp r0, 0 - beq _0802361A + beq @0802361A ldr r0, =0x00000139 adds r1, r3, r0 ldrb r2, [r1] cmp r6, r2 - beq _0802360C + beq @0802360C subs r0, r6, 0x1 strb r0, [r1] ldr r1, =0x082f3290 @@ -53287,19 +53287,19 @@ _080235D4: lsls r4, 1 adds r1, r3, r4 strb r0, [r1] - b _08023640 + b @08023640 .align 2, 0 .pool -_0802360C: +@0802360C: movs r5, 0x9C lsls r5, 1 adds r1, r3, r5 -_08023612: +@08023612: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08023640 -_0802361A: + b @08023640 +@0802361A: movs r0, 0x9C lsls r0, 1 adds r1, r3, r0 @@ -53319,12 +53319,12 @@ _0802361A: strb r0, [r1] movs r0, 0x1 strb r0, [r2] -_08023640: +@08023640: ldr r0, =0x0000013b adds r4, r3, r0 ldrb r0, [r4] cmp r0, 0 - beq _080236A0 + beq @080236A0 movs r2, 0x9C lsls r2, 1 adds r1, r3, r2 @@ -53334,7 +53334,7 @@ _08023640: ldrb r0, [r1] ldrb r5, [r2] cmp r0, r5 - bcc _0802367C + bcc @0802367C movs r0, 0 strb r0, [r1] ldr r5, =0x00000139 @@ -53343,10 +53343,10 @@ _08023640: strb r0, [r2] strb r0, [r4] movs r1, 0 - b _08023690 + b @08023690 .align 2, 0 .pool -_0802367C: +@0802367C: ldr r2, =0x082f3290 ldrb r1, [r1] ldr r4, =0x00000139 @@ -53357,19 +53357,19 @@ _0802367C: adds r1, r0 adds r1, r2 ldrb r1, [r1] -_08023690: +@08023690: adds r0, r3, 0 adds r0, 0x5F strb r1, [r0] - b _080236A8 + b @080236A8 .align 2, 0 .pool -_080236A0: +@080236A0: adds r1, r3, 0 adds r1, 0x5F movs r0, 0 strb r0, [r1] -_080236A8: +@080236A8: ldrh r1, [r3, 0x26] adds r0, r3, 0 adds r0, 0x62 @@ -53380,7 +53380,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} @@ -53391,19 +53391,19 @@ sub_80236B8: @ 80236B8 adds r0, r4, 0 ands r0, r1 cmp r0, 0 - beq _080236DA + beq @080236DA adds r2, r5, 0 adds r2, 0x5E ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 strb r0, [r2] -_080236DA: +@080236DA: ldrh r1, [r3, 0x2C] adds r0, r4, 0 ands r0, r1 cmp r0, 0 - beq _080236FA + beq @080236FA ldrb r0, [r5, 0x8] lsls r0, 5 adds r0, r5, r0 @@ -53412,22 +53412,22 @@ _080236DA: ldrh r0, [r1] ldrh r2, [r5, 0x28] cmp r0, r2 - bcs _080236FA + bcs @080236FA adds r0, 0x1 strh r0, [r1] -_080236FA: +@080236FA: ldrb r0, [r5, 0x8] adds r7, r5, 0 adds r7, 0x5E cmp r0, 0 - beq _08023710 + beq @08023710 ldrb r1, [r7] movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne _08023710 - b _0802384C -_08023710: + bne @08023710 + b @0802384C +@08023710: adds r4, r5, 0 adds r4, 0x5C movs r0, 0x2 @@ -53440,7 +53440,7 @@ _08023710: adds r6, r5, 0 adds r6, 0x25 cmp r0, 0 - bne _08023768 + bne @08023768 movs r0, 0x2E ldrsh r2, [r5, r0] ldr r1, =0x082f4444 @@ -53449,35 +53449,35 @@ _08023710: adds r0, r1 ldrb r0, [r0] cmp r2, r0 - ble _08023754 + ble @08023754 ldrh r0, [r5, 0x30] adds r0, 0x1 strh r0, [r5, 0x30] ldrb r0, [r6] movs r1, 0x10 orrs r0, r1 - b _0802375C + b @0802375C .align 2, 0 .pool -_08023754: +@08023754: ldrb r1, [r6] movs r0, 0x11 negs r0, r0 ands r0, r1 -_0802375C: +@0802375C: strb r0, [r6] movs r0, 0 strh r0, [r5, 0x2E] ldrh r0, [r5, 0x32] adds r0, 0x1 strh r0, [r5, 0x32] -_08023768: +@08023768: ldrh r0, [r5, 0x28] movs r1, 0xF bl __umodsi3 lsls r0, 16 cmp r0, 0 - bne _080237DE + bne @080237DE movs r0, 0x34 ldrsh r2, [r5, r0] ldr r3, =0x082f4434 @@ -53487,87 +53487,87 @@ _08023768: adds r0, r1, r3 ldrb r0, [r0] cmp r2, r0 - bge _08023798 + bge @08023798 ldrb r1, [r6] movs r0, 0x1F ands r0, r1 strb r0, [r6] - b _080237D8 + b @080237D8 .align 2, 0 .pool -_08023798: +@08023798: adds r0, r3, 0x1 adds r0, r1, r0 ldrb r0, [r0] cmp r2, r0 - bge _080237AC + bge @080237AC ldrb r0, [r6] movs r1, 0x1F ands r1, r0 movs r0, 0x20 - b _080237D4 -_080237AC: + b @080237D4 +@080237AC: adds r0, r3, 0x2 adds r0, r1, r0 ldrb r0, [r0] cmp r2, r0 - bge _080237BC + bge @080237BC movs r0, 0x2 strh r0, [r5, 0x34] - b _080237D8 -_080237BC: + b @080237D8 +@080237BC: adds r0, r3, 0x3 adds r0, r1, r0 ldrb r0, [r0] cmp r2, r0 - bge _080237CC + bge @080237CC movs r0, 0x3 strh r0, [r5, 0x34] - b _080237D8 -_080237CC: + b @080237D8 +@080237CC: ldrb r0, [r6] movs r1, 0x1F ands r1, r0 movs r0, 0x80 -_080237D4: +@080237D4: orrs r1, r0 strb r1, [r6] -_080237D8: +@080237D8: movs r0, 0 strh r0, [r5, 0x34] - b _0802380A -_080237DE: + b @0802380A +@080237DE: ldrh r0, [r5, 0x10] adds r0, 0x1 strh r0, [r5, 0x10] lsls r0, 16 lsrs r0, 16 cmp r0, 0x3C - bls _0802380A + bls @0802380A cmp r0, 0x46 - bls _080237FA + bls @080237FA bl sub_8011AC8 movs r0, 0 strh r0, [r5, 0x10] - b _0802380A -_080237FA: + b @0802380A +@080237FA: ldrb r0, [r7] movs r4, 0xF8 ands r4, r0 cmp r4, 0 - bne _0802380A + bne @0802380A bl sub_8011AC8 strh r4, [r5, 0x10] -_0802380A: +@0802380A: ldrh r1, [r5, 0x28] ldr r0, =0x00008c9f cmp r1, r0 - bls _0802381A + bls @0802381A ldrb r0, [r7] movs r1, 0x1 orrs r0, r1 strb r0, [r7] -_0802381A: +@0802381A: ldrb r1, [r6] lsls r1, 27 lsrs r1, 31 @@ -53591,7 +53591,7 @@ _0802381A: bl memcpy adds r0, r4, 0 bl sub_800FE50 -_0802384C: +@0802384C: pop {r3} mov r8, r3 pop {r4-r7} @@ -53602,16 +53602,16 @@ _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 ldr r3, =0x03003090 ldrb r0, [r5, 0x9] cmp r4, r0 - bcs _08023880 + bcs @08023880 movs r1, 0 -_0802386C: +@0802386C: lsls r0, r4, 5 adds r0, r5, r0 adds r0, 0xB5 @@ -53621,8 +53621,8 @@ _0802386C: lsrs r4, r0, 24 ldrb r0, [r5, 0x9] cmp r4, r0 - bcc _0802386C -_08023880: + bcc @0802386C +@08023880: adds r2, r3, 0 ldrh r0, [r2] movs r1, 0xFF @@ -53631,11 +53631,11 @@ _08023880: movs r0, 0xBC lsls r0, 6 cmp r1, r0 - bne _08023898 + bne @08023898 ldrh r0, [r2, 0x2] cmp r0, 0x2 - beq _080238AC -_08023898: + beq @080238AC +@08023898: adds r2, r5, 0 adds r2, 0x25 ldrb r1, [r2] @@ -53643,10 +53643,10 @@ _08023898: negs r0, r0 ands r0, r1 strb r0, [r2] - b _080238EA + b @080238EA .align 2, 0 .pool -_080238AC: +@080238AC: adds r4, r5, 0 adds r4, 0x4E adds r0, r4, 0 @@ -53669,21 +53669,21 @@ _080238AC: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080238EA + beq @080238EA adds r0, r5, 0 adds r0, 0x25 ldrb r1, [r0] movs r2, 0x8 orrs r1, r2 strb r1, [r0] -_080238EA: +@080238EA: pop {r4,r5} pop {r0} bx r0 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 @@ -53721,32 +53721,32 @@ sub_80238F0: @ 80238F0 movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _08023978 + beq @08023978 ldrh r1, [r4, 0x28] ldr r0, =0x00008c9f cmp r1, r0 - bls _08023964 + bls @08023964 adds r0, 0x1 strh r0, [r4, 0x28] movs r0, 0x10 movs r1, 0x1 movs r2, 0 bl sub_8022BEC - b _0802396E + b @0802396E .align 2, 0 .pool -_08023964: +@08023964: movs r0, 0xF movs r1, 0x1 movs r2, 0 bl sub_8022BEC -_0802396E: +@0802396E: movs r1, 0 movs r0, 0 strh r0, [r4, 0x10] strb r1, [r4, 0xC] - b _08023992 -_08023978: + b @08023992 +@08023978: ldrh r0, [r4, 0x26] adds r0, 0x1 strh r0, [r4, 0x26] @@ -53757,14 +53757,14 @@ _08023978: adds r0, r4, 0 bl sub_80236B8 movs r0, 0 -_08023992: +@08023992: pop {r4} pop {r1} bx r1 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 @@ -53802,66 +53802,66 @@ sub_8023998: @ 8023998 movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _08023A20 + beq @08023A20 ldrh r1, [r4, 0x28] ldr r0, =0x00008c9f cmp r1, r0 - bls _08023A0C + bls @08023A0C adds r0, 0x1 strh r0, [r4, 0x28] movs r0, 0x10 movs r1, 0x1 movs r2, 0 bl sub_8022BEC - b _08023A16 + b @08023A16 .align 2, 0 .pool -_08023A0C: +@08023A0C: movs r0, 0xF movs r1, 0x1 movs r2, 0 bl sub_8022BEC -_08023A16: +@08023A16: movs r1, 0 movs r0, 0 strh r0, [r4, 0x10] strb r1, [r4, 0xC] - b _08023A28 -_08023A20: + b @08023A28 +@08023A20: adds r0, r4, 0 bl sub_80236B8 movs r0, 0 -_08023A28: +@08023A28: pop {r4} pop {r1} bx r1 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] cmp r0, 0x5 - bls _08023A3C - b _08023BB2 -_08023A3C: + bls @08023A3C + b @08023BB2 +@08023A3C: lsls r0, 2 - ldr r1, =_08023A4C + ldr r1, =@08023A4C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08023A4C: - .4byte _08023A64 - .4byte _08023A8C - .4byte _08023ADC - .4byte _08023B5C - .4byte _08023B7A - .4byte _08023B94 -_08023A64: +@08023A4C: + .4byte @08023A64 + .4byte @08023A8C + .4byte @08023ADC + .4byte @08023B5C + .4byte @08023B7A + .4byte @08023B94 +@08023A64: movs r0, 0x8 strh r0, [r4, 0x12] movs r0, 0xD6 @@ -53876,10 +53876,10 @@ _08023A64: adds r1, r4, r0 movs r0, 0x2 strb r0, [r1] - b _08023BB2 + b @08023BB2 .align 2, 0 .pool -_08023A8C: +@08023A8C: movs r1, 0x9C lsls r1, 1 adds r5, r4, r1 @@ -53889,9 +53889,9 @@ _08023A8C: lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _08023AA2 - b _08023BB8 -_08023AA2: + beq @08023AA2 + b @08023BB8 +@08023AA2: movs r0, 0x1 negs r0, r0 ldr r2, =0x000003ff @@ -53913,10 +53913,10 @@ _08023AA2: lsls r2, 1 adds r1, r4, r2 strb r0, [r1] - b _08023BB2 + b @08023BB2 .align 2, 0 .pool -_08023ADC: +@08023ADC: ldr r7, =0x082f326c movs r0, 0x9C lsls r0, 1 @@ -53959,10 +53959,10 @@ _08023ADC: lsrs r0, 24 ldrb r1, [r2] cmp r0, r1 - bcc _08023BB8 + bcc @08023BB8 ldrb r0, [r5] cmp r0, 0 - beq _08023BB2 + beq @08023BB2 subs r0, 0x1 strb r0, [r5] ldrb r1, [r5] @@ -53973,10 +53973,10 @@ _08023ADC: strb r0, [r2] movs r0, 0 strb r0, [r6] - b _08023BB8 + b @08023BB8 .align 2, 0 .pool -_08023B5C: +@08023B5C: movs r0, 0 strh r0, [r4, 0x2C] movs r0, 0x12 @@ -53988,24 +53988,24 @@ _08023B5C: movs r0, 0x1E movs r1, 0 bl lcd_io_set - b _08023BB2 -_08023B7A: + b @08023BB2 +@08023B7A: movs r2, 0x9C lsls r2, 1 adds r1, r4, r2 adds r0, r4, 0 bl sub_80218D4 cmp r0, 0 - beq _08023BB8 + beq @08023BB8 bl sub_8010434 movs r0, 0 strh r0, [r4, 0x10] - b _08023BB2 -_08023B94: + b @08023BB2 +@08023B94: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08023BB8 + beq @08023BB8 movs r0, 0x11 movs r1, 0x1 movs r2, 0 @@ -54014,40 +54014,40 @@ _08023B94: movs r0, 0 strh r0, [r4, 0x10] strb r1, [r4, 0xC] - b _08023BBA -_08023BB2: + b @08023BBA +@08023BB2: ldrb r0, [r4, 0xC] adds r0, 0x1 strb r0, [r4, 0xC] -_08023BB8: +@08023BB8: movs r0, 0 -_08023BBA: +@08023BBA: pop {r4-r7} pop {r1} bx r1 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 adds r6, r1, 0 ldrb r0, [r5, 0xC] cmp r0, 0x1 - beq _08023C04 + beq @08023C04 cmp r0, 0x1 - bgt _08023BD8 + bgt @08023BD8 cmp r0, 0 - beq _08023BE2 - b _08023C9C -_08023BD8: + beq @08023BE2 + b @08023C9C +@08023BD8: cmp r0, 0x2 - beq _08023C2A + beq @08023C2A cmp r0, 0x3 - beq _08023C5C - b _08023C9C -_08023BE2: + beq @08023C5C + b @08023C9C +@08023BE2: movs r0, 0x9 strh r0, [r5, 0x12] movs r0, 0x20 @@ -54062,8 +54062,8 @@ _08023BE2: adds r1, r5, r0 movs r0, 0x4 strb r0, [r1] - b _08023C9C -_08023C04: + b @08023C9C +@08023C04: movs r0, 0x9C lsls r0, 1 adds r4, r5, r0 @@ -54073,7 +54073,7 @@ _08023C04: lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _08023CA2 + bne @08023CA2 movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -54081,15 +54081,15 @@ _08023C04: bl sub_80A2A20 movs r0, 0 strb r0, [r4] - b _08023C9C -_08023C2A: + b @08023C9C +@08023C2A: movs r0, 0x9C lsls r0, 1 adds r1, r5, r0 adds r0, r5, 0 bl sub_80218D4 cmp r0, 0 - beq _08023CA2 + beq @08023CA2 bl sub_8010434 movs r0, 0 strh r0, [r5, 0x10] @@ -54102,12 +54102,12 @@ _08023C2A: movs r0, 0x1E movs r1, 0 bl lcd_io_set - b _08023C9C -_08023C5C: + b @08023C9C +@08023C5C: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08023CA2 + beq @08023CA2 ldr r0, =0x02021cc4 ldr r1, [r5, 0x1C] movs r2, 0 @@ -54128,15 +54128,15 @@ _08023C5C: bl sub_8022BEC movs r0, 0 strh r4, [r5, 0x10] - b _08023CA0 + b @08023CA0 .align 2, 0 .pool -_08023C9C: +@08023C9C: ldrb r0, [r5, 0xC] adds r0, 0x1 -_08023CA0: +@08023CA0: strb r0, [r5, 0xC] -_08023CA2: +@08023CA2: movs r0, 0 add sp, 0x4 pop {r4-r6} @@ -54145,7 +54145,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 @@ -54155,27 +54155,27 @@ sub_8023CAC: @ 8023CAC adds r7, r0, 0 ldrb r0, [r7, 0xC] cmp r0, 0x7 - bls _08023CC2 - b _0802402E -_08023CC2: + bls @08023CC2 + b @0802402E +@08023CC2: lsls r0, 2 - ldr r1, =_08023CD0 + ldr r1, =@08023CD0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08023CD0: - .4byte _08023CF0 - .4byte _08023D2A - .4byte _08023D38 - .4byte _08023DA0 - .4byte _08023F20 - .4byte _08023FD0 - .4byte _08023FDC - .4byte _08024010 -_08023CF0: +@08023CD0: + .4byte @08023CF0 + .4byte @08023D2A + .4byte @08023D38 + .4byte @08023DA0 + .4byte @08023F20 + .4byte @08023FD0 + .4byte @08023FDC + .4byte @08024010 +@08023CF0: adds r4, r7, 0 adds r4, 0x42 adds r0, r4, 0 @@ -54190,9 +54190,9 @@ _08023CF0: ldrh r1, [r7, 0x28] ldrh r0, [r2] cmp r0, r1 - bls _08023D12 + bls @08023D12 strh r1, [r2] -_08023D12: +@08023D12: ldrb r0, [r7, 0x8] lsls r0, 5 adds r0, r7, r0 @@ -54203,16 +54203,16 @@ _08023D12: adds r1, r4, 0 movs r2, 0x2 bl link_0800A448 - b _0802402E -_08023D2A: + b @0802402E +@08023D2A: bl sub_800A520 lsls r0, 24 cmp r0, 0 - bne _08023D36 - b _08024034 -_08023D36: - b _08024004 -_08023D38: + bne @08023D36 + b @08024034 +@08023D36: + b @08024004 +@08023D38: bl sub_800A550 ldr r2, =0x082f4448 ldrb r3, [r7, 0x9] @@ -54222,17 +54222,17 @@ _08023D38: lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - beq _08023D50 - b _08024034 -_08023D50: + beq @08023D50 + b @08024034 +@08023D50: movs r0, 0 mov r8, r0 adds r4, r7, 0 adds r4, 0x42 cmp r8, r3 - bcs _08023D7E + bcs @08023D7E ldr r2, =0x020223c4 -_08023D5E: +@08023D5E: mov r3, r8 lsls r1, r3, 5 adds r1, r7, r1 @@ -54248,23 +54248,23 @@ _08023D5E: mov r8, r0 ldrb r6, [r7, 0x9] cmp r8, r6 - bcc _08023D5E -_08023D7E: + bcc @08023D5E +@08023D7E: movs r0, 0 strh r0, [r7, 0x10] strh r0, [r4] bl sub_800A5B4 ldrb r0, [r7, 0x8] cmp r0, 0 - bne _08023D9C + bne @08023D9C movs r0, 0x3 - b _08024032 + b @08024032 .align 2, 0 .pool -_08023D9C: +@08023D9C: movs r0, 0x6 - b _08024032 -_08023DA0: + b @08024032 +@08023DA0: adds r0, r7, 0 adds r0, 0x68 movs r1, 0 @@ -54336,9 +54336,9 @@ _08023DA0: mov r9, r1 ldrb r0, [r7, 0x9] cmp r8, r0 - bcc _08023E44 - b _0802402E -_08023E44: + bcc @08023E44 + b @0802402E +@08023E44: adds r0, r7, 0 adds r0, 0x88 add r0, r8 @@ -54368,20 +54368,20 @@ _08023E44: ldrb r0, [r1] adds r6, r2, 0 cmp r0, 0x1 - beq _08023EAE + beq @08023EAE cmp r0, 0x1 - bgt _08023E8A + bgt @08023E8A cmp r0, 0 - beq _08023E90 - b _08023F04 -_08023E8A: + beq @08023E90 + b @08023F04 +@08023E8A: cmp r0, 0x2 - beq _08023ECC - b _08023F04 -_08023E90: + beq @08023ECC + b @08023F04 +@08023E90: ldrh r0, [r5] cmp r0, 0 - beq _08023ED2 + beq @08023ED2 adds r0, r3, 0 adds r0, 0xAC ldrh r2, [r0] @@ -54392,11 +54392,11 @@ _08023E90: bl sub_8151574 adds r2, r0, 0 ldrh r4, [r5] - b _08023EFA -_08023EAE: + b @08023EFA +@08023EAE: ldrh r0, [r5] cmp r0, 0 - beq _08023ED2 + beq @08023ED2 adds r0, r3, 0 adds r0, 0xB0 ldrh r2, [r0] @@ -54407,25 +54407,25 @@ _08023EAE: bl sub_8151574 adds r2, r0, 0 ldrh r4, [r5] - b _08023EFA -_08023ECC: + b @08023EFA +@08023ECC: ldrh r0, [r5] cmp r0, 0 - bne _08023ED6 -_08023ED2: + bne @08023ED6 +@08023ED2: movs r4, 0 - b _08023F04 -_08023ED6: + b @08023F04 +@08023ED6: adds r1, r3, 0 adds r1, 0xB2 ldrh r0, [r1] ldrh r2, [r7, 0x28] cmp r0, r2 - bcc _08023EE8 + bcc @08023EE8 movs r4, 0xC8 lsls r4, 7 - b _08023F04 -_08023EE8: + b @08023F04 +@08023EE8: ldrh r2, [r1] lsls r2, 8 adds r0, r2, 0 @@ -54434,12 +54434,12 @@ _08023EE8: bl sub_8151574 adds r2, r0, 0 ldrh r4, [r7, 0x28] -_08023EFA: +@08023EFA: lsls r4, 8 adds r1, r4, 0 bl sub_81515FC adds r4, r0, 0 -_08023F04: +@08023F04: asrs r4, 4 adds r0, r7, 0 adds r0, 0x7E @@ -54452,9 +54452,9 @@ _08023F04: mov r8, r0 ldrb r3, [r7, 0x9] cmp r8, r3 - bcc _08023E44 - b _0802402E -_08023F20: + bcc @08023E44 + b @0802402E +@08023F20: movs r6, 0 mov r8, r6 ldrb r0, [r7, 0x9] @@ -54463,8 +54463,8 @@ _08023F20: adds r1, 0x68 str r1, [sp, 0xC] cmp r8, r0 - bge _08023FC4 -_08023F32: + bge @08023FC4 +@08023F32: ldrb r0, [r7, 0x9] subs r0, 0x1 lsls r0, 24 @@ -54473,7 +54473,7 @@ _08023F32: adds r2, 0x1 str r2, [sp, 0x8] cmp r4, r8 - bls _08023FB4 + bls @08023FB4 adds r3, r7, 0 adds r3, 0x74 str r3, [sp] @@ -54486,7 +54486,7 @@ _08023F32: movs r1, 0x7E adds r1, r7 mov r9, r1 -_08023F5C: +@08023F5C: subs r2, r4, 0x1 mov r12, r2 lsls r6, r2, 1 @@ -54497,7 +54497,7 @@ _08023F5C: ldrh r2, [r3] ldrh r0, [r1] cmp r2, r0 - bcs _08023F86 + bcs @08023F86 ldrh r0, [r1] strh r2, [r1] strh r0, [r3] @@ -54508,14 +54508,14 @@ _08023F5C: ldrb r0, [r1] strb r0, [r2] strb r3, [r1] -_08023F86: +@08023F86: mov r2, r9 adds r3, r2, r6 adds r1, r2, r5 ldrh r2, [r3] ldrh r6, [r1] cmp r2, r6 - bcs _08023FAA + bcs @08023FAA ldrh r0, [r1] strh r2, [r1] strh r0, [r3] @@ -54527,13 +54527,13 @@ _08023F86: ldrb r0, [r1] strb r0, [r2] strb r3, [r1] -_08023FAA: +@08023FAA: mov r1, r12 lsls r0, r1, 24 lsrs r4, r0, 24 cmp r4, r8 - bhi _08023F5C -_08023FB4: + bhi @08023F5C +@08023FB4: ldr r2, [sp, 0x8] lsls r0, r2, 24 lsrs r0, 24 @@ -54541,25 +54541,25 @@ _08023FB4: ldrb r0, [r7, 0x9] subs r0, 0x1 cmp r8, r0 - blt _08023F32 -_08023FC4: + blt @08023F32 +@08023FC4: movs r0, 0 ldr r1, [sp, 0xC] movs r2, 0x30 bl link_0800A448 - b _0802402E -_08023FD0: + b @0802402E +@08023FD0: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08024034 - b _08024004 -_08023FDC: + beq @08024034 + b @08024004 +@08023FDC: bl sub_800A550 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08024034 + bne @08024034 adds r4, r7, 0 adds r4, 0x68 adds r0, r4, 0 @@ -54571,13 +54571,13 @@ _08023FDC: movs r2, 0x30 bl memcpy bl sub_800A5B4 -_08024004: +@08024004: movs r0, 0 strh r0, [r7, 0x10] - b _0802402E + b @0802402E .align 2, 0 .pool -_08024010: +@08024010: bl sub_8020E58 movs r0, 0x12 movs r1, 0x1 @@ -54590,13 +54590,13 @@ _08024010: adds r1, r7, 0 adds r1, 0x24 strb r0, [r1] - b _08024034 -_0802402E: + b @08024034 +@0802402E: ldrb r0, [r7, 0xC] adds r0, 0x1 -_08024032: +@08024032: strb r0, [r7, 0xC] -_08024034: +@08024034: movs r0, 0 add sp, 0x10 pop {r3-r5} @@ -54609,38 +54609,38 @@ _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 adds r6, r1, 0 ldrb r0, [r5, 0xC] cmp r0, 0x4 - bhi _08024124 + bhi @08024124 lsls r0, 2 - ldr r1, =_08024064 + ldr r1, =@08024064 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08024064: - .4byte _08024078 - .4byte _0802408A - .4byte _0802409C - .4byte _080240CC - .4byte _080240DC -_08024078: +@08024064: + .4byte @08024078 + .4byte @0802408A + .4byte @0802409C + .4byte @080240CC + .4byte @080240DC +@08024078: movs r0, 0x9C lsls r0, 1 adds r1, r5, r0 adds r0, r5, 0 bl sub_8022070 cmp r0, 0 - bne _08024124 - b _0802412A -_0802408A: + bne @08024124 + b @0802412A +@0802408A: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x9C @@ -54648,41 +54648,41 @@ _0802408A: adds r1, r5, r0 movs r0, 0x1E strb r0, [r1] - b _08024124 -_0802409C: + b @08024124 +@0802409C: movs r0, 0x9C lsls r0, 1 adds r1, r5, r0 ldrb r0, [r1] cmp r0, 0 - beq _080240AE + beq @080240AE subs r0, 0x1 strb r0, [r1] - b _0802412A -_080240AE: + b @0802412A +@080240AE: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0802412A + beq @0802412A movs r0, 0x5 bl audio_play adds r0, r5, 0 bl sub_802222C - b _08024124 + b @08024124 .align 2, 0 .pool -_080240CC: +@080240CC: ldrh r0, [r5, 0x12] cmp r0, 0xC - bhi _08024124 + bhi @08024124 adds r0, 0x1 movs r1, 0 strh r0, [r5, 0x12] strb r1, [r5, 0xC] - b _0802412A -_080240DC: + b @0802412A +@080240DC: ldr r0, =0x02021cc4 ldr r1, [r5, 0x1C] movs r2, 0 @@ -54709,14 +54709,14 @@ _080240DC: movs r2, 0 bl sub_8022BEC strb r4, [r5, 0xC] - b _0802412A + b @0802412A .align 2, 0 .pool -_08024124: +@08024124: ldrb r0, [r5, 0xC] adds r0, 0x1 strb r0, [r5, 0xC] -_0802412A: +@0802412A: movs r0, 0 add sp, 0x4 pop {r4-r6} @@ -54725,38 +54725,38 @@ _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 adds r4, r1, 0 ldrb r0, [r5, 0xC] cmp r0, 0x4 - bhi _08024218 + bhi @08024218 lsls r0, 2 - ldr r1, =_08024150 + ldr r1, =@08024150 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08024150: - .4byte _08024164 - .4byte _080241A0 - .4byte _080241A6 - .4byte _080241F0 - .4byte _08024204 -_08024164: +@08024150: + .4byte @08024164 + .4byte @080241A0 + .4byte @080241A6 + .4byte @080241F0 + .4byte @08024204 +@08024164: ldrh r1, [r5, 0x28] ldr r0, =0x00008c9f cmp r1, r0 - bls _08024176 + bls @08024176 movs r1, 0x9C lsls r1, 1 adds r0, r5, r1 bl sub_8022554 -_08024176: +@08024176: movs r0, 0x1 str r0, [sp] adds r0, r4, 0 @@ -54772,17 +54772,17 @@ _08024176: movs r2, 0 bl sub_8022BEC strb r4, [r5, 0xC] - b _0802421E + b @0802421E .align 2, 0 .pool -_080241A0: +@080241A0: bl sub_8010434 - b _08024218 -_080241A6: + b @08024218 +@080241A6: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _0802421E + beq @0802421E movs r0, 0 movs r1, 0 bl sub_81973C4 @@ -54805,19 +54805,19 @@ _080241A6: ldr r0, =sub_8153688 + 1 movs r1, 0 bl AddTask - b _08024218 + b @08024218 .align 2, 0 .pool -_080241F0: +@080241F0: ldr r0, =sub_8153688 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - beq _08024218 - b _0802421E + beq @08024218 + b @0802421E .align 2, 0 .pool -_08024204: +@08024204: movs r0, 0x14 movs r1, 0x1 movs r2, 0 @@ -54826,12 +54826,12 @@ _08024204: movs r0, 0xF strh r0, [r5, 0x12] strb r1, [r5, 0xC] - b _0802421E -_08024218: + b @0802421E +@08024218: ldrb r0, [r5, 0xC] adds r0, 0x1 strb r0, [r5, 0xC] -_0802421E: +@0802421E: movs r0, 0 add sp, 0x10 pop {r4,r5} @@ -54840,24 +54840,24 @@ _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 adds r6, r1, 0 ldrb r0, [r5, 0xC] cmp r0, 0x1 - beq _0802426A + beq @0802426A cmp r0, 0x1 - bgt _08024240 + bgt @08024240 cmp r0, 0 - beq _08024246 - b _080242D0 -_08024240: + beq @08024246 + b @080242D0 +@08024240: cmp r0, 0x2 - beq _08024270 - b _080242D0 -_08024246: + beq @08024270 + b @080242D0 +@08024246: movs r0, 0x1 str r0, [sp] adds r0, r6, 0 @@ -54873,39 +54873,39 @@ _08024246: bl sub_8022BEC movs r0, 0 strb r0, [r5, 0xC] - b _080242D8 -_0802426A: + b @080242D8 +@0802426A: bl sub_8197930 - b _080242D0 -_08024270: + b @080242D0 +@08024270: bl sub_8198C58 lsls r0, 24 asrs r4, r0, 24 movs r0, 0x2 negs r0, r0 cmp r4, r0 - beq _080242D6 + beq @080242D6 adds r0, r5, 0 adds r0, 0x42 movs r1, 0 movs r2, 0xC bl memset cmp r4, 0 - bne _080242A2 + bne @080242A2 bl sub_80D67C4 lsls r0, 24 cmp r0, 0 - beq _0802429E + beq @0802429E strh r4, [r5, 0x14] - b _080242A6 -_0802429E: + b @080242A6 +@0802429E: movs r0, 0x3 - b _080242A4 -_080242A2: + b @080242A4 +@080242A2: movs r0, 0x1 -_080242A4: +@080242A4: strh r0, [r5, 0x14] -_080242A6: +@080242A6: movs r0, 0 movs r1, 0x1 bl sub_8197434 @@ -54923,14 +54923,14 @@ _080242A6: movs r2, 0 bl sub_8022BEC strb r4, [r5, 0xC] - b _080242D6 -_080242D0: + b @080242D6 +@080242D0: ldrb r0, [r5, 0xC] adds r0, 0x1 strb r0, [r5, 0xC] -_080242D6: +@080242D6: movs r0, 0 -_080242D8: +@080242D8: add sp, 0x4 pop {r4-r6} pop {r1} @@ -54938,32 +54938,32 @@ _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 ldrb r0, [r4, 0xC] cmp r0, 0x1 - beq _08024306 + beq @08024306 cmp r0, 0x1 - bgt _080242F6 + bgt @080242F6 cmp r0, 0 - beq _08024300 - b _080243AC -_080242F6: + beq @08024300 + b @080243AC +@080242F6: cmp r0, 0x2 - beq _08024328 + beq @08024328 cmp r0, 0x3 - beq _08024336 - b _080243AC -_08024300: + beq @08024336 + b @080243AC +@08024300: bl sub_8010434 - b _080243AC -_08024306: + b @080243AC +@08024306: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080243B2 + beq @080243B2 ldrh r0, [r4, 0x14] adds r1, r4, 0 adds r1, 0x42 @@ -54974,15 +54974,15 @@ _08024306: movs r0, 0 movs r2, 0x2 bl link_0800A448 - b _080243AC -_08024328: + b @080243AC +@08024328: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080243B2 + beq @080243B2 strh r5, [r4, 0x10] - b _080243AC -_08024336: + b @080243AC +@08024336: bl sub_800A550 ldr r2, =0x082f4448 ldrb r3, [r4, 0x9] @@ -54992,16 +54992,16 @@ _08024336: lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bne _080243B2 + bne @080243B2 adds r7, r4, 0 adds r7, 0x42 adds r6, r4, 0 adds r6, 0x4E cmp r5, r3 - bcs _08024374 + bcs @08024374 adds r1, r6, 0 ldr r2, =0x020223c4 -_0802435C: +@0802435C: lsls r0, r5, 8 adds r0, r2 ldrh r0, [r0] @@ -55013,24 +55013,24 @@ _0802435C: lsrs r5, r0, 24 ldrb r0, [r4, 0x9] cmp r5, r0 - bcc _0802435C -_08024374: + bcc @0802435C +@08024374: ldrh r0, [r6] cmp r0, 0 - beq _08024390 + beq @08024390 movs r0, 0x17 movs r1, 0x1 movs r2, 0 bl sub_8022BEC - b _0802439A + b @0802439A .align 2, 0 .pool -_08024390: +@08024390: movs r0, 0x16 movs r1, 0x1 movs r2, 0 bl sub_8022BEC -_0802439A: +@0802439A: bl sub_800A5B4 movs r1, 0 movs r0, 0 @@ -55038,53 +55038,53 @@ _0802439A: strh r0, [r6] strh r0, [r4, 0x10] strb r1, [r4, 0xC] - b _080243B4 -_080243AC: + b @080243B4 +@080243AC: ldrb r0, [r4, 0xC] adds r0, 0x1 strb r0, [r4, 0xC] -_080243B2: +@080243B2: movs r0, 0 -_080243B4: +@080243B4: pop {r4-r7} pop {r1} bx r1 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 ldrb r4, [r5, 0xC] cmp r4, 0x1 - beq _080243EA + beq @080243EA cmp r4, 0x1 - bgt _080243D2 + bgt @080243D2 cmp r4, 0 - beq _080243DC - b _08024434 -_080243D2: + beq @080243DC + b @08024434 +@080243D2: cmp r4, 0x2 - beq _080243F6 + beq @080243F6 cmp r4, 0x3 - beq _0802441A - b _08024434 -_080243DC: + beq @0802441A + b @08024434 +@080243DC: movs r0, 0x1 negs r0, r0 str r4, [sp] movs r1, 0x1 movs r2, 0 movs r3, 0x10 - b _08024410 -_080243EA: + b @08024410 +@080243EA: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - beq _08024434 - b _0802443A -_080243F6: + beq @08024434 + b @0802443A +@080243F6: movs r0, 0 movs r1, 0x1 bl sub_8197434 @@ -55096,28 +55096,28 @@ _080243F6: str r1, [sp] movs r2, 0x10 movs r3, 0 -_08024410: +@08024410: bl sub_80A1AD4 bl fade_and_return_progress_probably - b _08024434 -_0802441A: + b @08024434 +@0802441A: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne _0802443A + bne @0802443A movs r0, 0x7 movs r1, 0x1 movs r2, 0 bl sub_8022BEC movs r0, 0 strh r4, [r5, 0x12] - b _08024438 -_08024434: + b @08024438 +@08024434: ldrb r0, [r5, 0xC] adds r0, 0x1 -_08024438: +@08024438: strb r0, [r5, 0xC] -_0802443A: +@0802443A: movs r0, 0 add sp, 0x4 pop {r4,r5} @@ -55126,29 +55126,29 @@ _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 ldrb r4, [r5, 0xC] cmp r4, 0x1 - beq _080244BC + beq @080244BC cmp r4, 0x1 - bgt _0802445A + bgt @0802445A cmp r4, 0 - beq _08024460 - b _080244F6 -_0802445A: + beq @08024460 + b @080244F6 +@0802445A: cmp r4, 0x2 - beq _080244D4 - b _080244F6 -_08024460: + beq @080244D4 + b @080244F6 +@08024460: movs r0, 0 movs r1, 0 bl sub_81973C4 ldrh r1, [r5, 0x14] cmp r1, 0x3 - bne _08024490 + bne @08024490 ldr r0, =0x082f32a4 ldr r2, [r0, 0x14] ldrb r3, [r5, 0xB] @@ -55161,10 +55161,10 @@ _08024460: movs r0, 0 movs r1, 0x1 bl text_box_related_one - b _080244AC + b @080244AC .align 2, 0 .pool -_08024490: +@08024490: ldr r0, =0x082f32a4 ldr r2, [r0, 0x18] ldrb r3, [r5, 0xB] @@ -55178,48 +55178,48 @@ _08024490: movs r0, 0 movs r1, 0x1 bl text_box_related_one -_080244AC: +@080244AC: movs r0, 0 movs r1, 0x3 bl Window_CopyToVram - b _080244F6 + b @080244F6 .align 2, 0 .pool -_080244BC: +@080244BC: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _080244FC + bne @080244FC movs r0, 0x9C lsls r0, 1 adds r1, r5, r0 movs r0, 0x78 strb r0, [r1] - b _080244F6 -_080244D4: + b @080244F6 +@080244D4: movs r0, 0x9C lsls r0, 1 adds r1, r5, r0 ldrb r0, [r1] adds r4, r0, 0 cmp r4, 0 - beq _080244E8 + beq @080244E8 subs r0, 0x1 strb r0, [r1] - b _080244FC -_080244E8: + b @080244FC +@080244E8: movs r0, 0x18 movs r1, 0x1 movs r2, 0 bl sub_8022BEC strb r4, [r5, 0xC] - b _080244FC -_080244F6: + b @080244FC +@080244F6: ldrb r0, [r5, 0xC] adds r0, 0x1 strb r0, [r5, 0xC] -_080244FC: +@080244FC: movs r0, 0 add sp, 0x10 pop {r4,r5} @@ -55228,36 +55228,36 @@ _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] cmp r4, 0x1 - beq _08024528 + beq @08024528 cmp r4, 0x1 - bgt _0802451C + bgt @0802451C cmp r4, 0 - beq _08024522 - b _08024558 -_0802451C: + beq @08024522 + b @08024558 +@0802451C: cmp r4, 0x2 - beq _08024538 - b _08024558 -_08024522: + beq @08024538 + b @08024558 +@08024522: bl sub_8010434 - b _08024558 -_08024528: + b @08024558 +@08024528: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _0802455E + beq @0802455E bl sub_800AC34 - b _08024558 -_08024538: + b @08024558 +@08024538: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _0802455E + bne @0802455E movs r0, 0x19 strb r0, [r5, 0xE] movs r0, 0x5 @@ -55265,14 +55265,14 @@ _08024538: movs r2, 0 bl sub_8022BEC strb r4, [r5, 0xC] - b _0802455E + b @0802455E .align 2, 0 .pool -_08024558: +@08024558: ldrb r0, [r5, 0xC] adds r0, 0x1 strb r0, [r5, 0xC] -_0802455E: +@0802455E: movs r0, 0 pop {r4,r5} pop {r1} @@ -55280,7 +55280,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 @@ -55290,7 +55290,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 @@ -55322,7 +55322,7 @@ sub_8024578: @ 8024578 strh r5, [r4, 0x34] movs r6, 0 movs r3, 0 -_080245B8: +@080245B8: lsls r0, r5, 5 adds r2, r4, r0 adds r1, r2, 0 @@ -55354,7 +55354,7 @@ _080245B8: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x4 - bls _080245B8 + bls @080245B8 pop {r4-r6} pop {r0} bx r0 @@ -55363,7 +55363,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] @@ -55398,7 +55398,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] @@ -55420,7 +55420,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 @@ -55433,7 +55433,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 @@ -55446,7 +55446,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 @@ -55462,7 +55462,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 @@ -55472,21 +55472,21 @@ sub_80246AC: @ 80246AC adds r0, r1 bl sub_8024668 cmp r0, r4 - bcc _080246CC + bcc @080246CC movs r0, 0x1 - b _080246CE + b @080246CE .align 2, 0 .pool -_080246CC: +@080246CC: movs r0, 0 -_080246CE: +@080246CE: pop {r4} pop {r1} bx r1 thumb_func_end sub_80246AC thumb_func_start sub_80246D4 -sub_80246D4: @ 80246D4 +sub_80246D4: ; 80246D4 push {lr} ldr r0, =0x03005d90 ldr r0, [r0] @@ -55497,20 +55497,20 @@ sub_80246D4: @ 80246D4 ldr r1, =0x020375e0 ldrh r1, [r1] cmp r0, r1 - bcc _080246F8 + bcc @080246F8 movs r0, 0x1 - b _080246FA + b @080246FA .align 2, 0 .pool -_080246F8: +@080246F8: movs r0, 0 -_080246FA: +@080246FA: pop {r1} bx r1 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 @@ -55523,26 +55523,26 @@ sub_8024700: @ 8024700 adds r1, r0, r4 ldr r2, =0x0001869f cmp r1, r2 - bhi _08024730 + bhi @08024730 adds r0, r5, 0 bl sub_802467C movs r0, 0x1 - b _0802473A + b @0802473A .align 2, 0 .pool -_08024730: +@08024730: adds r0, r5, 0 adds r1, r2, 0 bl sub_802467C movs r0, 0 -_0802473A: +@0802473A: pop {r4,r5} pop {r1} bx r1 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 @@ -55554,7 +55554,7 @@ sub_8024740: @ 8024740 bl sub_80246AC lsls r0, 24 cmp r0, 0 - beq _08024774 + beq @08024774 adds r0, r4, 0 bl sub_8024668 adds r1, r0, 0 @@ -55562,19 +55562,19 @@ sub_8024740: @ 8024740 adds r0, r4, 0 bl sub_802467C movs r0, 0x1 - b _08024776 + b @08024776 .align 2, 0 .pool -_08024774: +@08024774: movs r0, 0 -_08024776: +@08024776: pop {r4,r5} pop {r1} bx r1 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] @@ -55586,7 +55586,7 @@ sub_802477C: @ 802477C bl sub_80246AC lsls r0, 24 cmp r0, 0 - beq _080247B4 + beq @080247B4 adds r0, r4, 0 bl sub_8024668 adds r1, r0, 0 @@ -55595,19 +55595,19 @@ sub_802477C: @ 802477C adds r0, r4, 0 bl sub_802467C movs r0, 0x1 - b _080247B6 + b @080247B6 .align 2, 0 .pool -_080247B4: +@080247B4: movs r0, 0 -_080247B6: +@080247B6: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_802477C thumb_func_start sub_80247BC -sub_80247BC: @ 80247BC +sub_80247BC: ; 80247BC push {lr} ldr r0, =0x03005d90 ldr r0, [r0] @@ -55622,7 +55622,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 @@ -55668,7 +55668,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} @@ -55716,7 +55716,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 @@ -55736,7 +55736,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 @@ -55782,7 +55782,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] @@ -55800,7 +55800,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 @@ -55811,13 +55811,13 @@ sub_802493C: @ 802493C ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _08024A10 + beq @08024A10 ldr r4, =0x02022c98 ldr r0, =0x00003330 bl malloc_and_clear str r0, [r4] cmp r0, 0 - beq _08024A10 + beq @08024A10 bl sub_8024A1C ldr r0, [r4] bl sub_8024A30 @@ -55871,20 +55871,20 @@ sub_802493C: @ 802493C bl sub_80A2F30 ldr r0, =0x0000021e bl current_map_music_set - b _08024A16 + b @08024A16 .align 2, 0 .pool -_08024A10: +@08024A10: adds r0, r5, 0 bl set_callback2 -_08024A16: +@08024A16: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_802493C thumb_func_start sub_8024A1C -sub_8024A1C: @ 8024A1C +sub_8024A1C: ; 8024A1C push {lr} bl clear_tasks bl reset_all_obj_data @@ -55894,7 +55894,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 @@ -55930,14 +55930,14 @@ sub_8024A30: @ 8024A30 adds r1, r2, 0 adds r1, 0x98 movs r3, 0 -_08024A76: +@08024A76: adds r0, r1, r5 strb r3, [r0] adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _08024A76 + bls @08024A76 movs r5, 0 adds r7, r2, 0 adds r7, 0xA8 @@ -55985,7 +55985,7 @@ _08024A76: movs r7, 0x98 lsls r7, 1 adds r2, r7 -_08024AE2: +@08024AE2: ldr r1, [sp] adds r0, r1, r5 strb r3, [r0] @@ -56018,12 +56018,12 @@ _08024AE2: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x4 - bls _08024AE2 + bls @08024AE2 movs r5, 0 movs r3, 0 movs r4, 0xFF ldr r6, [sp, 0x1C] -_08024B2C: +@08024B2C: adds r0, r6, r5 strb r3, [r0] ldr r1, [sp, 0x20] @@ -56047,14 +56047,14 @@ _08024B2C: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0xA - bls _08024B2C + bls @08024B2C bl link_get_multiplayer_id movs r1, 0 lsls r0, 24 cmp r0, 0 - bne _08024B6A + bne @08024B6A movs r1, 0x1 -_08024B6A: +@08024B6A: ldr r0, [sp, 0x10] strb r1, [r0] bl sub_8009FCC @@ -56067,10 +56067,10 @@ _08024B6A: mov r7, r8 ldrb r7, [r7] cmp r5, r7 - bcs _08024BB6 + bcs @08024BB6 ldr r7, [sp, 0x18] mov r6, r8 -_08024B8C: +@08024B8C: adds r4, r7, r5 subs r0, r5, 0x1 adds r0, r7, r0 @@ -56081,18 +56081,18 @@ _08024B8C: ldrb r1, [r6] subs r0, r1, 0x1 cmp r2, r0 - ble _08024BAA + ble @08024BAA adds r0, r2, 0 bl __umodsi3 strb r0, [r4] -_08024BAA: +@08024BAA: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 ldrb r0, [r6] cmp r5, r0 - bcc _08024B8C -_08024BB6: + bcc @08024B8C +@08024BB6: add sp, 0x28 pop {r3-r5} mov r8, r3 @@ -56104,7 +56104,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 @@ -56113,43 +56113,43 @@ sub_8024BC8: @ 8024BC8 ldr r0, [r0] ldrb r0, [r0, 0xC] cmp r0, 0x7 - bls _08024BDC - b _08024D34 -_08024BDC: + bls @08024BDC + b @08024D34 +@08024BDC: lsls r0, 2 - ldr r1, =_08024BF0 + ldr r1, =@08024BF0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08024BF0: - .4byte _08024C10 - .4byte _08024C24 - .4byte _08024C4C - .4byte _08024C5A - .4byte _08024C80 - .4byte _08024CD4 - .4byte _08024CE6 - .4byte _08024D10 -_08024C10: +@08024BF0: + .4byte @08024C10 + .4byte @08024C24 + .4byte @08024C4C + .4byte @08024C5A + .4byte @08024C80 + .4byte @08024CD4 + .4byte @08024CE6 + .4byte @08024D10 +@08024C10: movs r0, 0 bl SetVBlankCallback ldr r0, =sub_8025910 + 1 movs r1, 0x4 bl sub_802620C - b _08024D20 + b @08024D20 .align 2, 0 .pool -_08024C24: +@08024C24: ldr r0, =sub_8025910 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - beq _08024C32 - b _08024D40 -_08024C32: + beq @08024C32 + b @08024D40 +@08024C32: ldr r4, =0x02022c98 ldr r0, [r4] movs r1, 0xB0 @@ -56157,32 +56157,32 @@ _08024C32: adds r0, r1 bl sub_8029274 ldr r1, [r4] - b _08024D24 + b @08024D24 .align 2, 0 .pool -_08024C4C: +@08024C4C: bl sub_802A770 cmp r0, 0 - bne _08024D40 + bne @08024D40 bl sub_8010434 - b _08024D20 -_08024C5A: + b @08024D20 +@08024C5A: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08024D40 + beq @08024D40 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _08024D20 + beq @08024D20 bl sub_800E0E8 movs r0, 0 movs r1, 0 bl sub_800DFB4 - b _08024D20 + b @08024D20 .align 2, 0 .pool -_08024C80: +@08024C80: ldr r0, =0x02022c98 ldr r0, [r0] adds r0, 0x24 @@ -56190,8 +56190,8 @@ _08024C80: bl sub_80283A8 movs r4, 0 cmp r4, r5 - bcs _08024CBA -_08024C92: + bcs @08024CBA +@08024C92: ldr r0, =0x02022c98 ldr r1, [r0] adds r0, r1, 0 @@ -56210,8 +56210,8 @@ _08024C92: lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc _08024C92 -_08024CBA: + bcc @08024C92 +@08024CBA: ldr r4, =0x02022c98 ldr r0, [r4] adds r0, 0x24 @@ -56219,16 +56219,16 @@ _08024CBA: movs r0, 0 bl sub_802868C ldr r1, [r4] - b _08024D24 + b @08024D24 .align 2, 0 .pool -_08024CD4: +@08024CD4: bl sub_8028A34 bl sub_8028A88 bl sub_8028D44 bl sub_8028734 - b _08024D20 -_08024CE6: + b @08024D20 +@08024CE6: movs r4, 0x1 negs r4, r4 adds r0, r4, 0 @@ -56244,33 +56244,33 @@ _08024CE6: bl sub_80A1AD4 ldr r0, =sub_80261E4 + 1 bl SetVBlankCallback - b _08024D20 + b @08024D20 .align 2, 0 .pool -_08024D10: +@08024D10: bl fade_and_return_progress_probably ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08024D40 -_08024D20: + bne @08024D40 +@08024D20: ldr r0, =0x02022c98 ldr r1, [r0] -_08024D24: +@08024D24: ldrb r0, [r1, 0xC] adds r0, 0x1 strb r0, [r1, 0xC] - b _08024D40 + b @08024D40 .align 2, 0 .pool -_08024D34: +@08024D34: adds r0, r1, 0 bl remove_task ldr r0, =sub_802589C + 1 bl sub_802621C -_08024D40: +@08024D40: add sp, 0x4 pop {r4,r5} pop {r0} @@ -56280,7 +56280,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, =0x082f7ac4 @@ -56294,9 +56294,9 @@ sub_8024D4C: @ 8024D4C ldr r0, =0x03000db0 ldr r0, [r0] cmp r0, 0 - bne _08024D70 + bne @08024D70 bl sub_8026AF4 -_08024D70: +@08024D70: bl sub_8025D50 pop {r0} bx r0 @@ -56305,7 +56305,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, =0x082f7af4 @@ -56319,9 +56319,9 @@ sub_8024D84: @ 8024D84 ldr r0, =0x03000db0 ldr r0, [r0] cmp r0, 0 - bne _08024DA8 + bne @08024DA8 bl sub_8026B28 -_08024DA8: +@08024DA8: bl sub_8025ED8 pop {r0} bx r0 @@ -56330,19 +56330,19 @@ _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] ldrb r0, [r0, 0x10] cmp r0, 0 - beq _08024DD4 + beq @08024DD4 cmp r0, 0x1 - beq _08024DEA - b _08024DF8 + beq @08024DEA + b @08024DF8 .align 2, 0 .pool -_08024DD4: +@08024DD4: movs r0, 0x1 bl sub_8028504 movs r0, 0x1 @@ -56351,36 +56351,36 @@ _08024DD4: ldrb r0, [r1, 0x10] adds r0, 0x1 strb r0, [r1, 0x10] - b _08024DF8 -_08024DEA: + b @08024DF8 +@08024DEA: bl sub_802A770 cmp r0, 0 - bne _08024DF8 + bne @08024DF8 movs r0, 0x1 bl sub_8026240 -_08024DF8: +@08024DF8: pop {r4} pop {r0} bx r0 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] ldrb r0, [r1, 0x10] cmp r0, 0 - bne _08024E20 + bne @08024E20 bl sub_80262C0 ldr r1, [r4] ldrb r0, [r1, 0x10] adds r0, 0x1 strb r0, [r1, 0x10] - b _08024E30 + b @08024E30 .align 2, 0 .pool -_08024E20: +@08024E20: movs r0, 0x8C lsls r0, 1 adds r1, r0 @@ -56388,14 +56388,14 @@ _08024E20: str r0, [r1] movs r0, 0x2 bl sub_8026240 -_08024E30: +@08024E30: pop {r4} pop {r0} bx r0 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 @@ -56403,23 +56403,23 @@ sub_8024E38: @ 8024E38 ldrb r0, [r0, 0x10] adds r4, r1, 0 cmp r0, 0x5 - bhi _08024F08 + bhi @08024F08 lsls r0, 2 - ldr r1, =_08024E5C + ldr r1, =@08024E5C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08024E5C: - .4byte _08024E74 - .4byte _08024E90 - .4byte _08024EA0 - .4byte _08024EC4 - .4byte _08024ED8 - .4byte _08024EF8 -_08024E74: +@08024E5C: + .4byte @08024E74 + .4byte @08024E90 + .4byte @08024EA0 + .4byte @08024EC4 + .4byte @08024ED8 + .4byte @08024EF8 +@08024E74: movs r0, 0 str r0, [sp] movs r0, 0x7 @@ -56429,21 +56429,21 @@ _08024E74: bl sub_802EB24 ldr r0, =0x02022c98 ldr r1, [r0] - b _08024EF0 + b @08024EF0 .align 2, 0 .pool -_08024E90: +@08024E90: bl sub_8010434 ldr r0, =0x02022c98 ldr r1, [r0] - b _08024EF0 + b @08024EF0 .align 2, 0 .pool -_08024EA0: +@08024EA0: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08024F08 + beq @08024F08 ldr r2, =0x02022c98 ldr r1, [r2] ldrb r0, [r1, 0x10] @@ -56453,19 +56453,19 @@ _08024EA0: ldr r0, [r2] adds r0, 0x30 strb r3, [r0] - b _08024F08 + b @08024F08 .align 2, 0 .pool -_08024EC4: +@08024EC4: bl sub_802EB84 cmp r0, 0 - bne _08024F08 + bne @08024F08 ldr r0, =0x02022c98 ldr r1, [r0] - b _08024EF0 + b @08024EF0 .align 2, 0 .pool -_08024ED8: +@08024ED8: ldr r1, [r4] adds r1, 0x30 ldrb r0, [r1] @@ -56474,22 +56474,22 @@ _08024ED8: lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 - bls _08024F08 + bls @08024F08 bl sub_8010434 ldr r1, [r4] -_08024EF0: +@08024EF0: ldrb r0, [r1, 0x10] adds r0, 0x1 strb r0, [r1, 0x10] - b _08024F08 -_08024EF8: + b @08024F08 +@08024EF8: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08024F08 + beq @08024F08 movs r0, 0x3 bl sub_8026240 -_08024F08: +@08024F08: add sp, 0x4 pop {r4} pop {r0} @@ -56497,22 +56497,22 @@ _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] ldrb r0, [r1, 0x10] cmp r0, 0 - bne _08024F2E + bne @08024F2E movs r2, 0x8E lsls r2, 1 adds r0, r1, r2 ldr r0, [r0] cmp r0, 0 - beq _08024F2E + beq @08024F2E movs r0, 0x4 bl sub_8026240 -_08024F2E: +@08024F2E: pop {r0} bx r0 .align 2, 0 @@ -56520,105 +56520,105 @@ _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] ldrb r0, [r2, 0x10] cmp r0, 0 - bne _08024FF6 + bne @08024FF6 adds r0, r2, 0 adds r0, 0x40 ldrb r0, [r0] cmp r0, 0x9 - bhi _08024FE8 + bhi @08024FE8 adds r0, r2, 0 adds r0, 0xA8 ldrb r0, [r0] cmp r0, 0 - bne _08024FEE + bne @08024FEE ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _08024F88 + beq @08024F88 ldr r1, =0x000031cc adds r0, r2, r1 ldrb r1, [r0] cmp r1, 0 - bne _08024FEE + bne @08024FEE ldr r3, =0x000031d0 adds r0, r2, r3 strb r1, [r0] movs r0, 0x2 - b _08024FC2 + b @08024FC2 .align 2, 0 .pool -_08024F88: +@08024F88: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08024FA8 + beq @08024FA8 ldr r3, =0x000031cc adds r0, r2, r3 ldrb r1, [r0] cmp r1, 0 - bne _08024FEE + bne @08024FEE adds r3, 0x4 adds r0, r2, r3 strb r1, [r0] movs r0, 0x1 - b _08024FC2 + b @08024FC2 .align 2, 0 .pool -_08024FA8: +@08024FA8: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _08024FD4 + beq @08024FD4 ldr r3, =0x000031cc adds r0, r2, r3 ldrb r1, [r0] cmp r1, 0 - bne _08024FEE + bne @08024FEE adds r3, 0x4 adds r0, r2, r3 strb r1, [r0] movs r0, 0x3 -_08024FC2: +@08024FC2: bl sub_8027518 ldr r1, [r4] ldr r2, =0x000031cc adds r1, r2 strb r0, [r1] - b _08024FEE + b @08024FEE .align 2, 0 .pool -_08024FD4: +@08024FD4: movs r0, 0 bl sub_8027518 ldr r1, [r4] ldr r3, =0x000031cc adds r1, r3 strb r0, [r1] - b _08024FEE + b @08024FEE .align 2, 0 .pool -_08024FE8: +@08024FE8: movs r0, 0xB bl sub_8026240 -_08024FEE: +@08024FEE: bl sub_802671C bl sub_8025F48 -_08024FF6: +@08024FF6: pop {r4} pop {r0} bx r0 thumb_func_end sub_8024F38 thumb_func_start sub_8024FFC -sub_8024FFC: @ 8024FFC +sub_8024FFC: ; 8024FFC push {lr} ldr r0, =0x02022c98 ldr r2, [r0] @@ -56626,13 +56626,13 @@ sub_8024FFC: @ 8024FFC adds r0, 0x40 ldrb r0, [r0] cmp r0, 0x9 - bhi _080250C4 + bhi @080250C4 ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0802504C + beq @0802504C adds r0, r2, 0 adds r0, 0x28 ldrb r1, [r0] @@ -56644,19 +56644,19 @@ sub_8024FFC: @ 8024FFC adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _080250CA + bne @080250CA ldr r3, =0x000032f8 adds r1, r2, r3 movs r0, 0x2 strb r0, [r1] - b _080250CA + b @080250CA .align 2, 0 .pool -_0802504C: +@0802504C: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08025080 + beq @08025080 adds r0, r2, 0 adds r0, 0x28 ldrb r1, [r0] @@ -56668,21 +56668,21 @@ _0802504C: adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _080250CA + bne @080250CA ldr r3, =0x000032f8 adds r1, r2, r3 movs r0, 0x1 strb r0, [r1] - b _080250CA + b @080250CA .align 2, 0 .pool -_08025080: +@08025080: movs r0, 0x20 ands r0, r1 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - beq _080250B8 + beq @080250B8 adds r0, r2, 0 adds r0, 0x28 ldrb r1, [r0] @@ -56694,43 +56694,43 @@ _08025080: adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _080250CA + bne @080250CA ldr r3, =0x000032f8 adds r1, r2, r3 movs r0, 0x3 strb r0, [r1] - b _080250CA + b @080250CA .align 2, 0 .pool -_080250B8: +@080250B8: ldr r3, =0x000032f8 adds r0, r2, r3 strb r1, [r0] - b _080250CA + b @080250CA .align 2, 0 .pool -_080250C4: +@080250C4: movs r0, 0xB bl sub_8026240 -_080250CA: +@080250CA: bl sub_8026044 pop {r0} bx r0 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 bl sub_8026C50 cmp r0, 0x1 - bne _080250F2 + bne @080250F2 bl sub_80272A4 movs r0, 0x5 bl sub_8026240 - b _08025150 -_080250F2: + b @08025150 +@080250F2: ldr r0, =0x02022c98 ldr r2, [r0] movs r1, 0x96 @@ -56744,19 +56744,19 @@ _080250F2: adds r5, r0, 0 ldrb r1, [r1] cmp r3, r1 - bcs _08025150 + bcs @08025150 movs r1, 0x9A lsls r1, 1 adds r0, r2, r1 ldr r0, [r0] cmp r0, 0x1 - beq _08025124 + beq @08025124 movs r0, 0 str r0, [r4] - b _08025150 + b @08025150 .align 2, 0 .pool -_08025124: +@08025124: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 @@ -56765,7 +56765,7 @@ _08025124: adds r0, 0x24 ldrb r0, [r0] cmp r3, r0 - bcs _08025150 + bcs @08025150 lsls r0, r3, 2 movs r4, 0x98 lsls r4, 1 @@ -56773,34 +56773,34 @@ _08025124: adds r1, r0 ldr r0, [r1] cmp r0, 0x1 - beq _08025124 + beq @08025124 movs r0, 0x96 lsls r0, 1 adds r1, r2, r0 movs r0, 0 str r0, [r1] -_08025150: +@08025150: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_80250D4 thumb_func_start sub_8025158 -sub_8025158: @ 8025158 +sub_8025158: ; 8025158 push {lr} bl sub_8026044 bl sub_8026C90 cmp r0, 0x1 - bne _0802516C + bne @0802516C movs r0, 0x5 bl sub_8026240 -_0802516C: +@0802516C: pop {r0} bx r0 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 @@ -56810,92 +56810,92 @@ sub_8025170: @ 8025170 lsls r0, 24 lsrs r0, 24 cmp r4, r0 - beq _0802518C + beq @0802518C movs r0, 0 - b _08025192 -_0802518C: + b @08025192 +@0802518C: bl sub_800A5B4 movs r0, 0x1 -_08025192: +@08025192: pop {r4} pop {r1} bx r1 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] ldrb r4, [r1, 0x10] cmp r4, 0x1 - beq _080251D0 + beq @080251D0 cmp r4, 0x1 - bgt _080251B4 + bgt @080251B4 cmp r4, 0 - beq _080251BA - b _0802520C + beq @080251BA + b @0802520C .align 2, 0 .pool -_080251B4: +@080251B4: cmp r4, 0x2 - beq _080251DC - b _0802520C -_080251BA: + beq @080251DC + b @0802520C +@080251BA: adds r1, 0x4A movs r0, 0 movs r2, 0x3C bl link_0800A448 lsls r0, 24 cmp r0, 0 - beq _08025226 + beq @08025226 ldr r0, [r5] strb r4, [r0, 0x8] - b _08025202 -_080251D0: + b @08025202 +@080251D0: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08025226 - b _08025202 -_080251DC: + beq @08025226 + b @08025202 +@080251DC: bl sub_8025170 cmp r0, 0 - beq _080251EE + beq @080251EE ldr r0, [r5] adds r1, r0, 0 adds r1, 0x24 ldrb r1, [r1] strb r1, [r0, 0x8] -_080251EE: +@080251EE: ldr r2, [r5] adds r1, r2, 0 adds r1, 0x24 ldrb r0, [r2, 0x8] ldrb r1, [r1] cmp r0, r1 - bcc _08025226 + bcc @08025226 ldrb r0, [r2, 0x14] adds r0, 0x1 strb r0, [r2, 0x14] -_08025202: +@08025202: ldr r1, [r5] ldrb r0, [r1, 0x10] adds r0, 0x1 strb r0, [r1, 0x10] - b _08025226 -_0802520C: + b @08025226 +@0802520C: movs r0, 0x1 bl ducking_tick lsls r0, 24 cmp r0, 0 - beq _08025226 + beq @08025226 movs r0, 0x6 bl sub_8026240 ldr r0, =0x0000020b movs r1, 0x4 bl sub_80A2F88 -_08025226: +@08025226: pop {r4,r5} pop {r0} bx r0 @@ -56904,25 +56904,25 @@ _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] ldrb r4, [r2, 0x10] cmp r4, 0x1 - beq _08025274 + beq @08025274 cmp r4, 0x1 - bgt _0802524C + bgt @0802524C cmp r4, 0 - beq _08025252 - b _080252DC + beq @08025252 + b @080252DC .align 2, 0 .pool -_0802524C: +@0802524C: cmp r4, 0x2 - beq _08025282 - b _080252DC -_08025252: + beq @08025282 + b @080252DC +@08025252: ldrb r0, [r2, 0x14] lsls r1, r0, 1 adds r1, r0 @@ -56934,25 +56934,25 @@ _08025252: bl link_0800A448 lsls r0, 24 cmp r0, 0 - beq _08025316 + beq @08025316 ldr r0, [r5] strb r4, [r0, 0x8] ldr r1, [r5] - b _080252CC -_08025274: + b @080252CC +@08025274: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08025316 + beq @08025316 ldr r1, [r5] - b _080252CC -_08025282: + b @080252CC +@08025282: bl sub_8025170 cmp r0, 0 - beq _080252B4 + beq @080252B4 movs r4, 0 - b _080252AA -_0802528E: + b @080252AA +@0802528E: ldr r0, [r5] adds r0, 0x4A ldr r1, =0x020223c4 @@ -56966,13 +56966,13 @@ _0802528E: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_080252AA: +@080252AA: ldr r0, [r5] adds r0, 0x24 ldrb r0, [r0] cmp r4, r0 - bcc _0802528E -_080252B4: + bcc @0802528E +@080252B4: ldr r3, =0x02022c98 ldr r2, [r3] adds r1, r2, 0 @@ -56980,24 +56980,24 @@ _080252B4: ldrb r0, [r2, 0x8] ldrb r1, [r1] cmp r0, r1 - bcc _08025316 + bcc @08025316 ldrb r0, [r2, 0x14] adds r0, 0x1 strb r0, [r2, 0x14] ldr r1, [r3] -_080252CC: +@080252CC: ldrb r0, [r1, 0x10] adds r0, 0x1 strb r0, [r1, 0x10] - b _08025316 + b @08025316 .align 2, 0 .pool -_080252DC: +@080252DC: movs r0, 0x1 bl ducking_tick lsls r0, 24 cmp r0, 0 - beq _08025316 + beq @08025316 ldr r0, =0x02022c98 ldr r2, [r0] adds r0, r2, 0 @@ -57019,7 +57019,7 @@ _080252DC: ldr r0, =0x0000020b movs r1, 0x4 bl sub_80A2F88 -_08025316: +@08025316: pop {r4,r5} pop {r0} bx r0 @@ -57028,7 +57028,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 @@ -57038,24 +57038,24 @@ sub_8025324: @ 8025324 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0x4 - bls _0802533A - b _08025458 -_0802533A: + bls @0802533A + b @08025458 +@0802533A: lsls r0, 2 - ldr r1, =_0802534C + ldr r1, =@0802534C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0802534C: - .4byte _08025360 - .4byte _08025384 - .4byte _0802539C - .4byte _080253BC - .4byte _080253DC -_08025360: +@0802534C: + .4byte @08025360 + .4byte @08025384 + .4byte @0802539C + .4byte @080253BC + .4byte @080253DC +@08025360: bl sub_802749C movs r0, 0x1 bl sub_80289E8 @@ -57066,21 +57066,21 @@ _08025360: bl sub_80292E0 ldr r0, =0x02022c98 ldr r1, [r0] - b _08025448 + b @08025448 .align 2, 0 .pool -_08025384: +@08025384: bl sub_802A770 cmp r0, 0 - bne _08025466 + bne @08025466 movs r0, 0x5 bl sub_80292E0 ldr r0, =0x02022c98 ldr r1, [r0] - b _08025448 + b @08025448 .align 2, 0 .pool -_0802539C: +@0802539C: bl sub_802A794 mov r1, sp strb r0, [r1] @@ -57089,17 +57089,17 @@ _0802539C: bl link_0800A448 lsls r0, 24 cmp r0, 0 - beq _08025466 + beq @08025466 ldr r0, =0x02022c98 ldr r1, [r0] - b _08025448 + b @08025448 .align 2, 0 .pool -_080253BC: +@080253BC: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08025466 + beq @08025466 ldr r3, =0x02022c98 ldr r1, [r3] ldrb r0, [r1, 0x10] @@ -57108,25 +57108,25 @@ _080253BC: strb r0, [r1, 0x10] ldr r0, [r3] strb r2, [r0, 0x8] - b _08025466 + b @08025466 .align 2, 0 .pool -_080253DC: +@080253DC: bl sub_8025170 cmp r0, 0 - beq _08025422 + beq @08025422 movs r2, 0 ldr r1, =0x02022c98 ldr r0, [r1] adds r0, 0x24 ldrb r0, [r0] cmp r2, r0 - bcs _08025422 + bcs @08025422 adds r3, r1, 0 movs r5, 0x86 lsls r5, 1 ldr r4, =0x020223c4 -_080253FA: +@080253FA: ldr r1, [r3] adds r1, r2, r1 adds r1, r5 @@ -57146,8 +57146,8 @@ _080253FA: adds r0, 0x24 ldrb r0, [r0] cmp r2, r0 - bcc _080253FA -_08025422: + bcc @080253FA +@08025422: ldr r4, =0x02022c98 ldr r2, [r4] adds r1, r2, 0 @@ -57155,31 +57155,31 @@ _08025422: ldrb r0, [r2, 0x8] ldrb r1, [r1] cmp r0, r1 - bcc _08025466 + bcc @08025466 ldrb r0, [r2, 0x14] adds r0, 0x1 strb r0, [r2, 0x14] lsls r0, 24 lsrs r0, 24 cmp r0, 0x77 - bls _08025466 + bls @08025466 movs r0, 0x6 bl sub_80292E0 ldr r1, [r4] -_08025448: +@08025448: ldrb r0, [r1, 0x10] adds r0, 0x1 strb r0, [r1, 0x10] - b _08025466 + b @08025466 .align 2, 0 .pool -_08025458: +@08025458: bl sub_802A770 cmp r0, 0 - bne _08025466 + bne @08025466 movs r0, 0x7 bl sub_8026240 -_08025466: +@08025466: add sp, 0x4 pop {r4,r5} pop {r0} @@ -57187,96 +57187,96 @@ _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 ldr r0, [r4] ldrb r0, [r0, 0x10] cmp r0, 0x7 - bls _08025480 - b _08025606 -_08025480: + bls @08025480 + b @08025606 +@08025480: lsls r0, 2 - ldr r1, =_08025494 + ldr r1, =@08025494 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08025494: - .4byte _080254B4 - .4byte _080254D4 - .4byte _080254F0 - .4byte _08025504 - .4byte _08025520 - .4byte _0802553C - .4byte _08025564 - .4byte _08025578 -_080254B4: +@08025494: + .4byte @080254B4 + .4byte @080254D4 + .4byte @080254F0 + .4byte @08025504 + .4byte @08025520 + .4byte @0802553C + .4byte @08025564 + .4byte @08025578 +@080254B4: bl sub_8027748 ldr r1, =0x00000bb7 cmp r0, r1 - bls _080254C4 + bls @080254C4 movs r0, 0x4 bl sub_80292E0 -_080254C4: +@080254C4: ldr r0, =0x02022c98 ldr r1, [r0] - b _080255E8 + b @080255E8 .align 2, 0 .pool -_080254D4: +@080254D4: bl sub_802A770 cmp r0, 0 - beq _080254DE - b _0802563C -_080254DE: + beq @080254DE + b @0802563C +@080254DE: movs r0, 0x3 bl sub_80292E0 ldr r0, =0x02022c98 ldr r1, [r0] - b _080255E8 + b @080255E8 .align 2, 0 .pool -_080254F0: +@080254F0: bl sub_8028FCC bl sub_80272E8 ldr r0, =0x02022c98 ldr r1, [r0] - b _080255E8 + b @080255E8 .align 2, 0 .pool -_08025504: +@08025504: bl sub_802A794 lsls r0, 24 lsrs r0, 24 mov r1, sp strb r0, [r1] cmp r0, 0 - bne _08025516 - b _0802563C -_08025516: + bne @08025516 + b @0802563C +@08025516: ldr r0, =0x02022c98 ldr r1, [r0] - b _080255E8 + b @080255E8 .align 2, 0 .pool -_08025520: +@08025520: bl sub_802A770 cmp r0, 0 - beq _0802552A - b _0802563C -_0802552A: + beq @0802552A + b @0802563C +@0802552A: movs r0, 0x5 bl sub_80292E0 ldr r0, =0x02022c98 ldr r1, [r0] - b _080255E8 + b @080255E8 .align 2, 0 .pool -_0802553C: +@0802553C: bl sub_802A794 mov r1, sp strb r0, [r1] @@ -57285,41 +57285,41 @@ _0802553C: bl link_0800A448 lsls r0, 24 cmp r0, 0 - beq _0802563C + beq @0802563C ldr r2, =0x02022c98 ldr r1, [r2] movs r0, 0 strb r0, [r1, 0x8] ldr r1, [r2] - b _080255E8 + b @080255E8 .align 2, 0 .pool -_08025564: +@08025564: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _0802563C + beq @0802563C ldr r0, =0x02022c98 ldr r1, [r0] - b _080255E8 + b @080255E8 .align 2, 0 .pool -_08025578: +@08025578: bl sub_8025170 cmp r0, 0 - beq _080255BE + beq @080255BE movs r2, 0 ldr r1, =0x02022c98 ldr r0, [r1] adds r0, 0x24 ldrb r0, [r0] cmp r2, r0 - bcs _080255BE + bcs @080255BE adds r3, r1, 0 movs r5, 0x86 lsls r5, 1 ldr r4, =0x020223c4 -_08025596: +@08025596: ldr r1, [r3] adds r1, r2, r1 adds r1, r5 @@ -57339,8 +57339,8 @@ _08025596: adds r0, 0x24 ldrb r0, [r0] cmp r2, r0 - bcc _08025596 -_080255BE: + bcc @08025596 +@080255BE: ldr r4, =0x02022c98 ldr r2, [r4] adds r1, r2, 0 @@ -57348,61 +57348,61 @@ _080255BE: ldrb r0, [r2, 0x8] ldrb r1, [r1] cmp r0, r1 - bcc _080255F8 + bcc @080255F8 ldrb r0, [r2, 0x14] adds r0, 0x1 strb r0, [r2, 0x14] lsls r0, 24 lsrs r0, 24 cmp r0, 0x77 - bls _0802563C + bls @0802563C bl sub_8027608 movs r0, 0x6 bl sub_80292E0 ldr r1, [r4] -_080255E8: +@080255E8: ldrb r0, [r1, 0x10] adds r0, 0x1 strb r0, [r1, 0x10] - b _0802563C + b @0802563C .align 2, 0 .pool -_080255F8: +@080255F8: bl sub_8027554 - b _0802563C -_080255FE: + b @0802563C +@080255FE: movs r0, 0x8 bl sub_8026240 - b _0802563C -_08025606: + b @0802563C +@08025606: bl sub_802A770 cmp r0, 0 - bne _0802563C + bne @0802563C movs r2, 0 ldr r1, [r4] adds r0, r1, 0 adds r0, 0x24 ldrb r0, [r0] cmp r2, r0 - bcs _08025636 + bcs @08025636 movs r4, 0x86 lsls r4, 1 adds r3, r1, r4 adds r1, r0, 0 -_08025624: +@08025624: adds r0, r3, r2 ldrb r0, [r0] cmp r0, 0x2 - beq _080255FE + beq @080255FE adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, r1 - bcc _08025624 -_08025636: + bcc @08025624 +@08025636: movs r0, 0xA bl sub_8026240 -_0802563C: +@0802563C: add sp, 0x4 pop {r4,r5} pop {r0} @@ -57410,54 +57410,54 @@ _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] ldrb r0, [r0, 0x10] cmp r0, 0x1 - beq _08025672 + beq @08025672 cmp r0, 0x1 - bgt _08025660 + bgt @08025660 cmp r0, 0 - beq _08025666 - b _08025692 + beq @08025666 + b @08025692 .align 2, 0 .pool -_08025660: +@08025660: cmp r0, 0x2 - beq _0802567C - b _08025692 -_08025666: + beq @0802567C + b @08025692 +@08025666: bl sub_800AC34 movs r0, 0x7 bl sub_80292E0 - b _08025688 -_08025672: + b @08025688 +@08025672: bl sub_802A770 cmp r0, 0 - bne _080256A0 - b _08025688 -_0802567C: + bne @080256A0 + b @08025688 +@0802567C: bl sub_802A794 lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 - bne _080256A0 -_08025688: + bne @080256A0 +@08025688: ldr r1, [r4] ldrb r0, [r1, 0x10] adds r0, 0x1 strb r0, [r1, 0x10] - b _080256A0 -_08025692: + b @080256A0 +@08025692: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _080256A0 + bne @080256A0 movs r0, 0x9 bl sub_8026240 -_080256A0: +@080256A0: pop {r4} pop {r0} bx r0 @@ -57466,26 +57466,26 @@ _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 ldr r0, [r4] ldrb r1, [r0, 0x10] cmp r1, 0x1 - beq _080256E0 + beq @080256E0 cmp r1, 0x1 - bgt _080256C8 + bgt @080256C8 cmp r1, 0 - beq _080256CE - b _08025728 + beq @080256CE + b @08025728 .align 2, 0 .pool -_080256C8: +@080256C8: cmp r1, 0x2 - beq _080256F8 - b _08025728 -_080256CE: + beq @080256F8 + b @08025728 +@080256CE: movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -57493,19 +57493,19 @@ _080256CE: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - b _0802571A -_080256E0: + b @0802571A +@080256E0: bl fade_and_return_progress_probably ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0802574C - b _0802571A + bne @0802574C + b @0802571A .align 2, 0 .pool -_080256F8: +@080256F8: bl sub_8028B80 bl sub_80287E4 ldr r0, [r4] @@ -57518,18 +57518,18 @@ _080256F8: str r0, [r1] movs r0, 0x8 bl sub_80292E0 -_0802571A: +@0802571A: ldr r1, [r4] ldrb r0, [r1, 0x10] adds r0, 0x1 strb r0, [r1, 0x10] - b _0802574C + b @0802574C .align 2, 0 .pool -_08025728: +@08025728: bl sub_802A770 cmp r0, 0 - bne _0802574C + bne @0802574C ldr r4, =0x02022c98 ldr r0, [r4] ldr r0, [r0] @@ -57540,7 +57540,7 @@ _08025728: ldr r0, [r4] bl free bl Window_FreeMemory -_0802574C: +@0802574C: add sp, 0x4 pop {r4} pop {r0} @@ -57550,33 +57550,33 @@ _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 ldr r1, [r4] ldrb r0, [r1, 0x10] cmp r0, 0x6 - bls _08025768 - b _0802585C -_08025768: + bls @08025768 + b @0802585C +@08025768: lsls r0, 2 - ldr r1, =_0802577C + ldr r1, =@0802577C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0802577C: - .4byte _08025798 - .4byte _08025838 - .4byte _080257B0 - .4byte _08025802 - .4byte _08025808 - .4byte _08025818 - .4byte _08025838 -_08025798: +@0802577C: + .4byte @08025798 + .4byte @08025838 + .4byte @080257B0 + .4byte @08025802 + .4byte @08025808 + .4byte @08025818 + .4byte @08025838 +@08025798: movs r0, 0x9 bl sub_80292E0 movs r0, 0x1 @@ -57586,8 +57586,8 @@ _08025798: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - b _08025848 -_080257B0: + b @08025848 +@080257B0: movs r0, 0 movs r1, 0 movs r2, 0 @@ -57620,18 +57620,18 @@ _080257B0: movs r1, 0 movs r2, 0 bl bg_change_y_offset - b _08025848 -_08025802: + b @08025848 +@08025802: bl sub_80A2F30 - b _08025848 -_08025808: + b @08025848 +@08025808: ldr r0, =0x0000021e bl current_map_music_set bl sub_8028E4C - b _08025848 + b @08025848 .align 2, 0 .pool -_08025818: +@08025818: movs r4, 0x1 negs r4, r4 adds r0, r4, 0 @@ -57645,25 +57645,25 @@ _08025818: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - b _08025848 -_08025838: + b @08025848 +@08025838: bl fade_and_return_progress_probably ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0802588C -_08025848: + bne @0802588C +@08025848: ldr r0, =0x02022c98 ldr r1, [r0] ldrb r0, [r1, 0x10] adds r0, 0x1 strb r0, [r1, 0x10] - b _0802588C + b @0802588C .align 2, 0 .pool -_0802585C: +@0802585C: ldrb r0, [r1, 0x4] bl remove_task ldr r0, =sub_802589C + 1 @@ -57674,16 +57674,16 @@ _0802585C: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _08025882 + bne @08025882 ldr r0, [r4] adds r0, 0x24 movs r1, 0x1 strb r1, [r0] -_08025882: +@08025882: bl sub_80273F0 movs r0, 0 bl sub_8028EC8 -_0802588C: +@0802588C: add sp, 0x4 pop {r4} pop {r0} @@ -57693,7 +57693,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 @@ -57702,53 +57702,53 @@ sub_802589C: @ 802589C ldrb r0, [r0, 0x10] adds r4, r1, 0 cmp r0, 0x1 - beq _080258C8 + beq @080258C8 cmp r0, 0x1 - bgt _080258BC + bgt @080258BC cmp r0, 0 - beq _080258C2 - b _080258E0 + beq @080258C2 + b @080258E0 .align 2, 0 .pool -_080258BC: +@080258BC: cmp r0, 0x2 - beq _080258CE - b _080258E0 -_080258C2: + beq @080258CE + b @080258E0 +@080258C2: bl sub_8026264 - b _080258D2 -_080258C8: + b @080258D2 +@080258C8: bl sub_80286E4 - b _080258D6 -_080258CE: + b @080258D6 +@080258CE: bl sub_8028828 -_080258D2: +@080258D2: cmp r0, 0x1 - bne _08025904 -_080258D6: + bne @08025904 +@080258D6: ldr r1, [r4] ldrb r0, [r1, 0x10] adds r0, 0x1 strb r0, [r1, 0x10] - b _08025904 -_080258E0: + b @08025904 +@080258E0: ldr r0, [r4] adds r0, 0x20 ldrb r0, [r0] cmp r0, 0 - beq _080258F8 + beq @080258F8 ldr r0, =sub_8024D4C + 1 bl sub_802621C - b _080258FE + b @080258FE .align 2, 0 .pool -_080258F8: +@080258F8: ldr r0, =sub_8024D84 + 1 bl sub_802621C -_080258FE: +@080258FE: adds r0, r5, 0 bl remove_task -_08025904: +@08025904: pop {r4,r5} pop {r0} bx r0 @@ -57757,7 +57757,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 @@ -57769,19 +57769,19 @@ sub_8025910: @ 8025910 movs r0, 0 ldrsh r4, [r5, r0] cmp r4, 0x1 - beq _0802596C + beq @0802596C cmp r4, 0x1 - bgt _08025938 + bgt @08025938 cmp r4, 0 - beq _0802593E - b _080259E8 + beq @0802593E + b @080259E8 .align 2, 0 .pool -_08025938: +@08025938: cmp r4, 0x2 - beq _0802597E - b _080259E8 -_0802593E: + beq @0802597E + b @080259E8 +@0802593E: ldr r6, =0x02022c98 ldr r1, [r6] adds r0, r1, 0 @@ -57796,37 +57796,37 @@ _0802593E: bl link_0800A448 lsls r0, 24 cmp r0, 0 - beq _080259E8 + beq @080259E8 ldr r0, [r6] strb r4, [r0, 0x8] - b _08025976 + b @08025976 .align 2, 0 .pool -_0802596C: +@0802596C: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080259E8 -_08025976: + beq @080259E8 +@08025976: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] - b _080259E8 -_0802597E: + b @080259E8 +@0802597E: bl sub_8025170 cmp r0, 0 - beq _080259C4 + beq @080259C4 movs r2, 0 ldr r1, =0x02022c98 ldr r0, [r1] adds r0, 0x24 ldrb r0, [r0] cmp r2, r0 - bcs _080259C4 + bcs @080259C4 adds r3, r1, 0 ldr r5, =0x020223c4 ldr r4, =0x0000318c -_0802599A: +@0802599A: ldr r0, [r3] lsls r1, r2, 2 adds r1, r0 @@ -57847,8 +57847,8 @@ _0802599A: adds r0, 0x24 ldrb r0, [r0] cmp r2, r0 - bcc _0802599A -_080259C4: + bcc @0802599A +@080259C4: ldr r4, =0x02022c98 ldr r0, [r4] adds r1, r0, 0 @@ -57856,7 +57856,7 @@ _080259C4: ldrb r0, [r0, 0x8] ldrb r1, [r1] cmp r0, r1 - bcc _080259E8 + bcc @080259E8 adds r0, r6, 0 bl remove_task movs r0, 0x6 @@ -57865,7 +57865,7 @@ _080259C4: ldrb r0, [r1, 0x10] adds r0, 0x1 strb r0, [r1, 0x10] -_080259E8: +@080259E8: pop {r4-r6} pop {r0} bx r0 @@ -57874,7 +57874,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} @@ -57923,15 +57923,15 @@ sub_80259FC: @ 80259FC strb r0, [r1] movs r5, 0x1 cmp r5, r7 - bcs _08025AA4 -_08025A60: + bcs @08025AA4 +@08025A60: ldr r1, [r6] adds r0, r1, 0 adds r0, 0xA8 adds r0, r5 ldrb r0, [r0] cmp r0, 0 - bne _08025A9A + bne @08025A9A lsls r0, r5, 4 subs r0, r5 lsls r4, r0, 2 @@ -57942,7 +57942,7 @@ _08025A60: bl sub_8028318 adds r1, r0, 0 cmp r1, 0 - bne _08025A9A + bne @08025A9A ldr r0, [r6] adds r0, r4 ldr r3, =0x000031cc @@ -57953,13 +57953,13 @@ _08025A60: lsls r4, 1 adds r0, r4 strb r1, [r0] -_08025A9A: +@08025A9A: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, r7 - bcc _08025A60 -_08025AA4: + bcc @08025A60 +@08025AA4: ldr r5, =0x02022c98 ldr r1, [r5] movs r6, 0x92 @@ -57971,40 +57971,40 @@ _08025AA4: lsls r0, 24 lsrs r0, 24 cmp r0, 0x3B - bls _08025B02 + bls @08025B02 ldr r1, [r5] movs r2, 0x94 lsls r2, 1 adds r0, r1, r2 ldrb r4, [r0] cmp r4, 0 - beq _08025AF0 + beq @08025AF0 bl sub_8011AC8 ldr r0, [r5] adds r0, r6 movs r1, 0 strb r1, [r0] - b _08025B02 + b @08025B02 .align 2, 0 .pool -_08025AF0: +@08025AF0: adds r0, r1, r6 ldrb r0, [r0] cmp r0, 0x46 - bls _08025B02 + bls @08025B02 bl sub_8011AC8 ldr r0, [r5] adds r0, r6 strb r4, [r0] -_08025B02: +@08025B02: movs r5, 0 cmp r5, r7 - bcs _08025BF6 + bcs @08025BF6 ldr r3, =0x000031cc mov r12, r3 ldr r4, =0x02022c98 mov r8, r4 -_08025B10: +@08025B10: mov r6, r8 ldr r2, [r6] lsls r0, r5, 4 @@ -58015,16 +58015,16 @@ _08025B10: ldrb r1, [r1] adds r6, r0, 0 cmp r1, 0 - beq _08025B36 + beq @08025B36 adds r0, r2, 0 adds r0, 0xA8 adds r1, r0, r5 ldrb r0, [r1] cmp r0, 0 - bne _08025B36 + bne @08025B36 movs r0, 0x1 strb r0, [r1] -_08025B36: +@08025B36: adds r3, r4, 0 ldr r1, [r3] adds r0, r1, 0 @@ -58032,17 +58032,17 @@ _08025B36: adds r0, r5 ldrb r0, [r0] cmp r0, 0x3 - bgt _08025B54 + bgt @08025B54 cmp r0, 0x1 - bge _08025B5A - b _08025BEC + bge @08025B5A + b @08025BEC .align 2, 0 .pool -_08025B54: +@08025B54: cmp r0, 0x4 - beq _08025BA8 - b _08025BEC -_08025B5A: + beq @08025BA8 + b @08025BEC +@08025B5A: adds r1, 0xB0 adds r1, r5 ldrb r0, [r1] @@ -58052,7 +58052,7 @@ _08025B5A: lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 - bls _08025BEC + bls @08025BEC ldr r0, [r3] adds r0, 0xB0 adds r0, r5 @@ -58076,10 +58076,10 @@ _08025B5A: adds r0, r1 ldr r1, =0x000031d4 adds r0, r1 - b _08025BEA + b @08025BEA .align 2, 0 .pool -_08025BA8: +@08025BA8: adds r1, 0xB0 adds r1, r5 ldrb r0, [r1] @@ -58089,7 +58089,7 @@ _08025BA8: lsls r0, 24 lsrs r0, 24 cmp r0, 0x27 - bls _08025BEC + bls @08025BEC ldr r0, [r4] adds r0, 0xB0 adds r0, r5 @@ -58113,15 +58113,15 @@ _08025BA8: adds r0, r1 ldr r6, =0x000031d4 adds r0, r6 -_08025BEA: +@08025BEA: strb r2, [r0] -_08025BEC: +@08025BEC: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, r7 - bcc _08025B10 -_08025BF6: + bcc @08025B10 +@08025BF6: add sp, 0x18 pop {r3} mov r8, r3 @@ -58133,7 +58133,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 @@ -58180,12 +58180,12 @@ sub_8025C0C: @ 8025C0C strb r0, [r1] movs r4, 0x1 cmp r4, r6 - bcs _08025C9C -_08025C6C: + bcs @08025C9C +@08025C6C: adds r0, r4, 0 bl sub_8028374 cmp r0, 0 - beq _08025C92 + beq @08025C92 ldr r0, =0x02022c98 ldr r2, [r0] lsls r1, r4, 2 @@ -58200,13 +58200,13 @@ _08025C6C: adds r1, r2, r7 movs r0, 0 strb r0, [r1] -_08025C92: +@08025C92: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r6 - bcc _08025C6C -_08025C9C: + bcc @08025C6C +@08025C9C: ldr r5, =0x02022c98 ldr r1, [r5] movs r6, 0x92 @@ -58218,32 +58218,32 @@ _08025C9C: lsls r0, 24 lsrs r0, 24 cmp r0, 0x3B - bls _08025CFA + bls @08025CFA ldr r1, [r5] movs r2, 0x94 lsls r2, 1 adds r0, r1, r2 ldrb r4, [r0] cmp r4, 0 - beq _08025CE8 + beq @08025CE8 bl sub_8011AC8 ldr r0, [r5] adds r0, r6 movs r1, 0 strb r1, [r0] - b _08025CFA + b @08025CFA .align 2, 0 .pool -_08025CE8: +@08025CE8: adds r0, r1, r6 ldrb r0, [r0] cmp r0, 0x46 - bls _08025CFA + bls @08025CFA bl sub_8011AC8 ldr r0, [r5] adds r0, r6 strb r4, [r0] -_08025CFA: +@08025CFA: add sp, 0x18 pop {r4-r7} pop {r0} @@ -58251,62 +58251,62 @@ _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] ldrb r0, [r0, 0x18] cmp r0, 0x4 - beq _08025D40 + beq @08025D40 cmp r0, 0x4 - bgt _08025D20 + bgt @08025D20 cmp r0, 0x3 - beq _08025D26 - b _08025D4A + beq @08025D26 + b @08025D4A .align 2, 0 .pool -_08025D20: +@08025D20: cmp r0, 0xB - beq _08025D46 - b _08025D4A -_08025D26: + beq @08025D46 + b @08025D4A +@08025D26: bl sub_8026BB8 adds r4, r0, 0 cmp r4, 0x1 - bne _08025D4A + bne @08025D4A bl sub_8026C28 ldr r0, [r5] movs r1, 0x8E lsls r1, 1 adds r0, r1 str r4, [r0] - b _08025D4A -_08025D40: + b @08025D4A +@08025D40: bl sub_80259FC - b _08025D4A -_08025D46: + b @08025D4A +@08025D46: bl sub_8025C0C -_08025D4A: +@08025D4A: pop {r4,r5} pop {r0} bx r0 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 ldr r5, [r0] ldrb r0, [r5, 0x18] cmp r0, 0x4 - beq _08025D68 + beq @08025D68 cmp r0, 0xB - beq _08025DB8 - b _08025DF4 + beq @08025DB8 + b @08025DF4 .align 2, 0 .pool -_08025D68: +@08025D68: ldr r1, =0x000032cc adds r0, r5, r1 ldr r2, =0x000031cc @@ -58336,10 +58336,10 @@ _08025D68: ldr r4, [r4] str r4, [sp, 0x10] bl sub_8027E30 - b _08025DF4 + b @08025DF4 .align 2, 0 .pool -_08025DB8: +@08025DB8: ldr r1, =0x000032cc adds r0, r5, r1 ldr r2, =0x000031cc @@ -58369,7 +58369,7 @@ _08025DB8: ldr r4, [r4] str r4, [sp, 0x10] bl sub_8027E30 -_08025DF4: +@08025DF4: add sp, 0x14 pop {r4-r6} pop {r0} @@ -58379,20 +58379,20 @@ _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 ldr r5, [r0] ldrb r0, [r5, 0x18] cmp r0, 0x4 - beq _08025E24 + beq @08025E24 cmp r0, 0xB - beq _08025E7C - b _08025EC0 + beq @08025E7C + b @08025EC0 .align 2, 0 .pool -_08025E24: +@08025E24: adds r0, r5, 0 adds r0, 0x28 ldrb r0, [r0] @@ -58426,10 +58426,10 @@ _08025E24: adds r4, r5, r6 str r4, [sp, 0x14] bl sub_8028164 - b _08025EC0 + b @08025EC0 .align 2, 0 .pool -_08025E7C: +@08025E7C: adds r0, r5, 0 adds r0, 0x28 ldrb r0, [r0] @@ -58463,7 +58463,7 @@ _08025E7C: adds r4, r5, r6 str r4, [sp, 0x14] bl sub_8028164 -_08025EC0: +@08025EC0: add sp, 0x18 pop {r4-r6} pop {r0} @@ -58473,25 +58473,25 @@ _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] ldrb r0, [r1, 0x18] cmp r0, 0x4 - beq _08025F0E + beq @08025F0E cmp r0, 0x4 - bgt _08025EF4 + bgt @08025EF4 cmp r0, 0x3 - beq _08025EFA - b _08025F40 + beq @08025EFA + b @08025F40 .align 2, 0 .pool -_08025EF4: +@08025EF4: cmp r0, 0xB - beq _08025F24 - b _08025F40 -_08025EFA: + beq @08025F24 + b @08025F40 +@08025EFA: movs r0, 0x1 bl sub_8027DD0 ldr r0, [r4] @@ -58500,39 +58500,39 @@ _08025EFA: adds r0, r1 movs r1, 0x1 str r1, [r0] - b _08025F40 -_08025F0E: + b @08025F40 +@08025F0E: ldr r2, =0x000032f8 adds r1, r2 ldrb r0, [r1] cmp r0, 0 - beq _08025F40 + beq @08025F40 bl sub_80282EC - b _08025F40 + b @08025F40 .align 2, 0 .pool -_08025F24: +@08025F24: movs r2, 0x90 lsls r2, 1 adds r0, r1, r2 ldr r0, [r0] cmp r0, 0 - bne _08025F40 + bne @08025F40 adds r2, 0xC adds r0, r1, r2 ldr r0, [r0] cmp r0, 0 - bne _08025F40 + bne @08025F40 movs r0, 0x1 bl sub_8028350 -_08025F40: +@08025F40: pop {r4} pop {r0} bx r0 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] @@ -58547,32 +58547,32 @@ sub_8025F48: @ 8025F48 adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 - bne _08025F88 + bne @08025F88 bl mplay_has_finished_maybe lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _08025FEA + bne @08025FEA ldr r0, [r6] movs r2, 0xA2 lsls r2, 1 adds r0, r2 strb r1, [r0] - b _08025FEA + b @08025FEA .align 2, 0 .pool -_08025F88: +@08025F88: ldr r3, =0x000031d0 adds r0, r1, r3 ldrb r4, [r0] cmp r4, 0x1 - bne _08025FB8 + bne @08025FB8 movs r1, 0xA2 lsls r1, 1 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 - bne _08025FEA + bne @08025FEA movs r0, 0x1F bl m4aSongNumStop movs r0, 0x1F @@ -58581,34 +58581,34 @@ _08025F88: movs r2, 0xA2 lsls r2, 1 adds r0, r2 - b _08025FE8 + b @08025FE8 .align 2, 0 .pool -_08025FB8: +@08025FB8: ldr r3, =0x000031d4 adds r0, r1, r3 ldrb r4, [r0] cmp r4, 0x1 - bne _08025FEA + bne @08025FEA movs r5, 0xA2 lsls r5, 1 adds r0, r2, r5 ldrb r0, [r0] cmp r0, 0 - bne _08025FEA + bne @08025FEA bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - bne _08025FEA + bne @08025FEA movs r0, 0x16 bl audio_play movs r0, 0x1 bl sub_80284CC ldr r0, [r6] adds r0, r5 -_08025FE8: +@08025FE8: strb r4, [r0] -_08025FEA: +@08025FEA: ldr r0, =0x02022c98 ldr r2, [r0] movs r5, 0xAA @@ -58617,27 +58617,27 @@ _08025FEA: ldrb r1, [r1] adds r4, r0, 0 cmp r1, 0 - bne _0802601C + bne @0802601C adds r0, r2, 0 adds r0, 0x40 ldrb r0, [r0] cmp r0, 0x9 - bls _0802601C + bls @0802601C bl sub_80A2F30 ldr r0, [r4] adds r0, r5 movs r1, 0x1 - b _0802603A + b @0802603A .align 2, 0 .pool -_0802601C: +@0802601C: ldr r0, [r4] movs r1, 0xAA lsls r1, 1 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _0802603C + bne @0802603C movs r0, 0xB bl pause_music_for_sound_maybe ldr r0, [r4] @@ -58645,16 +58645,16 @@ _0802601C: lsls r2, 1 adds r0, r2 movs r1, 0x2 -_0802603A: +@0802603A: strb r1, [r0] -_0802603C: +@0802603C: pop {r4-r6} pop {r0} bx r0 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} @@ -58677,36 +58677,36 @@ sub_8026044: @ 8026044 adds r0, r1, r3 ldrb r3, [r0] cmp r3, 0 - bne _0802609C + bne @0802609C ldr r4, =0x000031d0 adds r0, r1, r4 ldrb r0, [r0] cmp r0, 0x1 - beq _080260FE + beq @080260FE adds r4, 0x4 adds r0, r1, r4 ldrb r0, [r0] cmp r0, 0x1 - beq _080260FE + beq @080260FE movs r1, 0xA2 lsls r1, 1 adds r0, r2, r1 strb r3, [r0] - b _080260FE + b @080260FE .align 2, 0 .pool -_0802609C: +@0802609C: ldr r3, =0x000031d0 adds r0, r1, r3 ldrb r4, [r0] cmp r4, 0x1 - bne _080260CC + bne @080260CC movs r1, 0xA2 lsls r1, 1 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 - bne _080260FE + bne @080260FE movs r0, 0x1F bl m4aSongNumStop movs r0, 0x1F @@ -58715,39 +58715,39 @@ _0802609C: movs r3, 0xA2 lsls r3, 1 adds r0, r3 - b _080260FC + b @080260FC .align 2, 0 .pool -_080260CC: +@080260CC: ldr r4, =0x000031d4 adds r0, r1, r4 ldrb r4, [r0] cmp r4, 0x1 - bne _080260FE + bne @080260FE movs r5, 0xA2 lsls r5, 1 adds r0, r2, r5 ldrb r0, [r0] cmp r0, 0 - bne _080260FE + bne @080260FE bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - bne _080260FE + bne @080260FE movs r0, 0x16 bl audio_play movs r0, 0x1 bl sub_80284CC ldr r0, [r6] adds r0, r5 -_080260FC: +@080260FC: strb r4, [r0] -_080260FE: +@080260FE: mov r4, r8 cmp r4, r7 - bcs _08026172 + bcs @08026172 ldr r5, =0x02022c98 -_08026106: +@08026106: ldr r2, [r5] adds r0, r2, 0 adds r0, 0x28 @@ -58764,14 +58764,14 @@ _08026106: adds r0, r4 ldrb r0, [r0] cmp r0, 0x9 - bls _0802615C + bls @0802615C movs r3, 0xA4 lsls r3, 1 adds r0, r2, r3 adds r0, r4 ldrb r0, [r0] cmp r0, 0 - bne _08026168 + bne @08026168 adds r0, r1, r4 ldrb r0, [r0] adds r0, 0x4A @@ -58782,24 +58782,24 @@ _08026106: adds r0, r1 adds r0, r4 movs r1, 0x1 - b _08026166 + b @08026166 .align 2, 0 .pool -_0802615C: +@0802615C: movs r3, 0xA4 lsls r3, 1 adds r0, r2, r3 adds r0, r4 movs r1, 0 -_08026166: +@08026166: strb r1, [r0] -_08026168: +@08026168: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r7 - bcc _08026106 -_08026172: + bcc @08026106 +@08026172: ldr r0, =0x02022c98 ldr r2, [r0] movs r5, 0xAA @@ -58808,27 +58808,27 @@ _08026172: ldrb r1, [r1] adds r4, r0, 0 cmp r1, 0 - bne _080261A0 + bne @080261A0 adds r0, r2, 0 adds r0, 0x40 ldrb r0, [r0] cmp r0, 0x9 - bls _080261A0 + bls @080261A0 bl sub_80A2F30 ldr r0, [r4] adds r0, r5 movs r1, 0x1 - b _080261BE + b @080261BE .align 2, 0 .pool -_080261A0: +@080261A0: ldr r0, [r4] movs r1, 0xAA lsls r1, 1 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _080261C0 + bne @080261C0 movs r0, 0xB bl pause_music_for_sound_maybe ldr r0, [r4] @@ -58836,9 +58836,9 @@ _080261A0: lsls r3, 1 adds r0, r3 movs r1, 0x2 -_080261BE: +@080261BE: strb r1, [r0] -_080261C0: +@080261C0: pop {r3} mov r8, r3 pop {r4-r7} @@ -58847,7 +58847,7 @@ _080261C0: thumb_func_end sub_8026044 thumb_func_start sub_80261CC -sub_80261CC: @ 80261CC +sub_80261CC: ; 80261CC push {lr} bl run_active_tasks bl call_obj_callbacks @@ -58858,7 +58858,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 copy_super_sprites_to_oam @@ -58868,7 +58868,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 @@ -58880,7 +58880,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 @@ -58890,7 +58890,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 @@ -58911,7 +58911,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] @@ -58932,7 +58932,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] @@ -58941,13 +58941,13 @@ sub_8026264: @ 8026264 adds r0, 0x1 strb r0, [r1, 0x14] cmp r2, 0 - beq _080262B8 + beq @080262B8 ldr r3, [r3] ldrb r0, [r3, 0x14] movs r1, 0x3 ands r0, r1 cmp r0, 0 - bne _080262B8 + bne @080262B8 ldr r1, =0x082f7a94 adds r0, r3, 0 adds r0, 0x24 @@ -58956,12 +58956,12 @@ sub_8026264: @ 8026264 adds r0, r1 ldrb r0, [r0] cmp r2, r0 - bcc _080262A0 + bcc @080262A0 movs r0, 0x1 - b _080262BA + b @080262BA .align 2, 0 .pool -_080262A0: +@080262A0: lsls r4, r2, 3 adds r1, r4, 0 movs r0, 0x14 @@ -58972,16 +58972,16 @@ _080262A0: movs r0, 0x18 adds r1, r4, 0 bl lcd_io_set -_080262B8: +@080262B8: movs r0, 0 -_080262BA: +@080262BA: pop {r4} pop {r1} bx r1 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} @@ -58993,13 +58993,13 @@ sub_80262C0: @ 80262C0 ldrb r5, [r0] ldrb r1, [r1] cmp r1, r5 - bcs _0802630C + bcs @0802630C mov r8, r2 ldr r0, =0x000032e0 mov r12, r0 movs r7, 0 movs r6, 0x1 -_080262E2: +@080262E2: mov r2, r8 ldr r0, [r2] mov r2, r12 @@ -59011,9 +59011,9 @@ _080262E2: adds r0, r1, 0 ands r0, r6 cmp r0, 0 - bne _080262FC + bne @080262FC movs r3, 0x1 -_080262FC: +@080262FC: strb r3, [r2] adds r0, r4, r1 strb r7, [r0] @@ -59021,8 +59021,8 @@ _080262FC: lsls r0, 24 lsrs r1, r0, 24 cmp r1, r5 - bcc _080262E2 -_0802630C: + bcc @080262E2 +@0802630C: pop {r3} mov r8, r3 pop {r4-r7} @@ -59033,7 +59033,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 @@ -59058,14 +59058,14 @@ sub_8026324: @ 8026324 adds r0, 0x40 ldrb r0, [r0] cmp r0, 0x9 - bls _08026358 - b _08026614 -_08026358: + bls @08026358 + b @08026614 +@08026358: movs r6, 0 ldr r0, [sp, 0x8] cmp r6, r0 - bcs _08026440 -_08026360: + bcs @08026440 +@08026360: ldr r3, =0x02022c98 lsls r0, r6, 4 subs r1, r0, r6 @@ -59080,20 +59080,20 @@ _08026360: adds r0, r6, 0x1 str r0, [sp, 0xC] cmp r1, 0 - beq _08026434 + beq @08026434 adds r0, r2, 0 adds r0, 0xA8 adds r0, r6 ldrb r0, [r0] cmp r0, 0x1 - bne _08026434 + bne @08026434 ldr r1, [sp] mov r10, r1 ldr r2, [sp, 0x4] cmp r10, r2 - bcs _08026434 + bcs @08026434 adds r7, r3, 0 -_08026396: +@08026396: ldr r0, =0x082f449c add r0, r10 ldrb r5, [r0] @@ -59104,24 +59104,24 @@ _08026396: adds r0, r4 ldrb r0, [r0] cmp r0, r6 - beq _08026434 + beq @08026434 adds r0, r1, 0 adds r0, 0xF5 adds r0, r4 ldrb r0, [r0] cmp r0, r6 - beq _08026434 + beq @08026434 mov r0, r8 ldrb r1, [r0] adds r0, r6, 0 adds r2, r5, 0 bl sub_8026634 cmp r0, 0x1 - bne _08026410 + bne @08026410 movs r2, 0 ldr r3, =0x02022c98 mov r8, r4 -_080263CE: +@080263CE: ldr r0, [r3] mov r4, r8 adds r1, r2, r4 @@ -59129,7 +59129,7 @@ _080263CE: adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0xFF - bne _08026404 + bne @08026404 strb r6, [r1] ldr r0, [r3] adds r0, 0xA8 @@ -59141,17 +59141,17 @@ _080263CE: adds r0, r5 movs r1, 0x1 strb r1, [r0] - b _08026434 + b @08026434 .align 2, 0 .pool -_08026404: +@08026404: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x1 - bls _080263CE - b _08026434 -_08026410: + bls @080263CE + b @08026434 +@08026410: ldr r0, [r7] mov r2, r9 subs r1, r2, r6 @@ -59161,7 +59161,7 @@ _08026410: adds r0, r4 ldrb r0, [r0] cmp r0, 0x1 - beq _08026434 + beq @08026434 mov r0, r10 adds r0, 0x1 lsls r0, 24 @@ -59169,25 +59169,25 @@ _08026410: mov r10, r0 ldr r0, [sp, 0x4] cmp r10, r0 - bcc _08026396 -_08026434: + bcc @08026396 +@08026434: ldr r1, [sp, 0xC] lsls r0, r1, 24 lsrs r6, r0, 24 ldr r2, [sp, 0x8] cmp r6, r2 - bcc _08026360 -_08026440: + bcc @08026360 +@08026440: ldr r4, [sp] mov r10, r4 ldr r0, [sp, 0x4] cmp r10, r0 - bcc _0802644C - b _08026614 -_0802644C: + bcc @0802644C + b @08026614 +@0802644C: ldr r1, =0x02022c98 mov r9, r1 -_08026450: +@08026450: movs r6, 0xFF ldr r0, =0x082f449c add r0, r10 @@ -59198,9 +59198,9 @@ _08026450: adds r0, r5 ldrb r0, [r0] cmp r0, 0x1 - beq _08026468 - b _08026602 -_08026468: + beq @08026468 + b @08026602 +@08026468: adds r0, r5, 0 bl sub_8026D8C mov r1, r9 @@ -59216,9 +59216,9 @@ _08026468: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x1 - bls _0802648E + bls @0802648E movs r3, 0x2 -_0802648E: +@0802648E: ldr r2, =0x082f7a88 ldr r0, =0x000031b4 adds r1, r4, r0 @@ -59235,14 +59235,14 @@ _0802648E: ldrb r0, [r0] subs r2, r1, r0 cmp r2, 0x5 - bgt _080264BC + bgt @080264BC adds r1, r4, 0 adds r1, 0x9C adds r1, r5 ldrb r0, [r1] adds r0, r2 strb r0, [r1] -_080264BC: +@080264BC: mov r2, r9 ldr r1, [r2] adds r1, 0x9C @@ -59254,9 +59254,9 @@ _080264BC: movs r4, 0xFF ands r0, r4 cmp r0, 0x5 - bhi _080264D6 - b _08026602 -_080264D6: + bhi @080264D6 + b @08026602 +@080264D6: mov r1, r9 ldr r0, [r1] adds r0, 0x9C @@ -59270,28 +59270,28 @@ _080264D6: ldrb r0, [r2] mov r8, r1 cmp r0, 0xFF - bne _08026518 + bne @08026518 adds r0, r3, 0 adds r0, 0xF5 add r0, r8 ldrb r0, [r0] cmp r0, 0xFF - bne _08026500 - b _08026602 -_08026500: - b _08026528 + bne @08026500 + b @08026602 +@08026500: + b @08026528 .align 2, 0 .pool -_08026518: +@08026518: adds r0, r3, 0 adds r0, 0xF5 add r0, r8 ldrb r0, [r0] cmp r0, 0xFF - bne _08026528 + bne @08026528 ldrb r4, [r2] - b _0802654E -_08026528: + b @0802654E +@08026528: mov r2, r9 ldr r1, [r2] adds r0, r1, 0 @@ -59305,13 +59305,13 @@ _08026528: movs r1, 0x1 ands r1, r0 cmp r1, 0 - bne _0802654A + bne @0802654A adds r4, r7, 0 - b _0802654E -_0802654A: + b @0802654E +@0802654A: adds r4, r6, 0 adds r6, r7, 0 -_0802654E: +@0802654E: mov r1, r9 ldr r0, [r1] ldr r2, =0x000032eb @@ -59399,7 +59399,7 @@ _0802654E: ldrb r0, [r1] orrs r0, r2 strb r0, [r1] -_08026602: +@08026602: mov r0, r10 adds r0, 0x1 lsls r0, 24 @@ -59407,9 +59407,9 @@ _08026602: mov r10, r0 ldr r4, [sp, 0x4] cmp r10, r4 - bcs _08026614 - b _08026450 -_08026614: + bcs @08026614 + b @08026450 +@08026614: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -59423,7 +59423,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 @@ -59444,20 +59444,20 @@ sub_8026634: @ 8026634 adds r1, r0 mov r12, r2 cmp r3, 0x2 - beq _08026670 + beq @08026670 cmp r3, 0x2 - bgt _08026676 + bgt @08026676 cmp r3, 0x1 - beq _08026674 - b _08026676 + beq @08026674 + b @08026676 .align 2, 0 .pool -_08026670: +@08026670: movs r7, 0x1 - b _08026676 -_08026674: + b @08026676 +@08026674: movs r7, 0x2 -_08026676: +@08026676: adds r0, r1, 0 adds r0, 0xB adds r0, r6 @@ -59466,7 +59466,7 @@ _08026676: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _080266D4 + bhi @080266D4 ldr r0, =0x082f45af lsls r1, r4, 1 adds r1, r4 @@ -59477,7 +59477,7 @@ _08026676: adds r1, r0 ldrb r1, [r1] cmp r6, r1 - bne _0802670A + bne @0802670A mov r0, r12 ldr r1, [r0] adds r0, r1, 0 @@ -59488,7 +59488,7 @@ _08026676: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _080266D0 + bhi @080266D0 lsls r0, r4, 4 subs r0, r4 lsls r0, 2 @@ -59497,13 +59497,13 @@ _08026676: adds r0, r1 movs r1, 0x1 strb r1, [r0] - b _0802670A + b @0802670A .align 2, 0 .pool -_080266D0: +@080266D0: movs r0, 0x1 - b _0802670C -_080266D4: + b @0802670C +@080266D4: ldr r0, =0x082f45af lsls r1, r4, 1 adds r1, r4 @@ -59514,7 +59514,7 @@ _080266D4: adds r1, r0 ldrb r1, [r1] cmp r6, r1 - bne _0802670A + bne @0802670A mov r1, r12 ldr r0, [r1] adds r0, 0xA8 @@ -59531,9 +59531,9 @@ _080266D4: adds r1, r0 movs r0, 0x1 strb r0, [r1] -_0802670A: +@0802670A: movs r0, 0 -_0802670C: +@0802670C: pop {r4-r7} pop {r1} bx r1 @@ -59542,7 +59542,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 @@ -59566,11 +59566,11 @@ sub_802671C: @ 802671C mov r0, r9 subs r0, 0x1 cmp r5, r0 - blt _0802674E - b _08026974 -_0802674E: + blt @0802674E + b @08026974 +@0802674E: mov r8, r2 -_08026750: +@08026750: mov r0, r8 ldr r4, [r0] adds r0, r4, 0 @@ -59578,9 +59578,9 @@ _08026750: adds r0, r5 ldrb r0, [r0] cmp r0, 0x1 - bls _08026762 - b _0802686C -_08026762: + bls @08026762 + b @0802686C +@08026762: movs r1, 0x90 lsls r1, 1 adds r0, r4, r1 @@ -59591,7 +59591,7 @@ _08026762: adds r6, r0, r5 ldrb r0, [r6] cmp r0, 0x9 - bls _080267FC + bls @080267FC movs r7, 0 movs r0, 0xA strb r0, [r6] @@ -59609,7 +59609,7 @@ _08026762: adds r1, r0, r5 ldrb r0, [r1] cmp r0, 0 - bne _080267AC + bne @080267AC strb r2, [r1] ldr r2, =0x000032e0 adds r0, r4, r2 @@ -59617,19 +59617,19 @@ _08026762: ldrb r0, [r0] adds r0, 0x4A bl audio_play -_080267AC: +@080267AC: mov r0, r8 ldr r1, [r0] adds r0, r1, 0 adds r0, 0x40 ldrb r0, [r0] cmp r0, 0x9 - bls _080267C2 + bls @080267C2 mov r2, r10 cmp r2, 0x1 - beq _080267C2 - b _08026964 -_080267C2: + beq @080267C2 + b @08026964 +@080267C2: movs r0, 0x1 mov r10, r0 adds r0, r1, r6 @@ -59641,20 +59641,20 @@ _080267C2: adds r1, 0x40 ldrb r0, [r1] cmp r0, 0x9 - bhi _080267DE + bhi @080267DE adds r0, 0x1 strb r0, [r1] -_080267DE: +@080267DE: movs r0, 0x3 adds r1, r5, 0 movs r2, 0 bl sub_8026F1C movs r0, 0 bl sub_8027234 - b _08026964 + b @08026964 .align 2, 0 .pool -_080267FC: +@080267FC: adds r0, r5, 0 bl sub_8026D8C mov r2, r8 @@ -59670,9 +59670,9 @@ _080267FC: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x1 - bls _08026822 + bls @08026822 movs r3, 0x2 -_08026822: +@08026822: ldr r2, =0x082f7a88 ldr r0, =0x000032e0 adds r1, r4, r0 @@ -59693,7 +59693,7 @@ _08026822: lsls r0, 24 lsrs r0, 24 cmp r0, r2 - bcc _0802685C + bcc @0802685C ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] @@ -59702,14 +59702,14 @@ _08026822: adds r0, 0xD0 adds r0, r5 strb r3, [r0] -_0802685C: +@0802685C: bl sub_8026324 - b _08026964 + b @08026964 .align 2, 0 .pool -_0802686C: +@0802686C: cmp r0, 0x2 - bne _080268F4 + bne @080268F4 movs r2, 0x90 lsls r2, 1 adds r0, r4, r2 @@ -59725,7 +59725,7 @@ _0802686C: lsls r0, 24 lsrs r0, 24 cmp r0, 0x13 - bls _08026964 + bls @08026964 mov r0, r8 ldr r2, [r0] adds r0, r2, 0 @@ -59766,12 +59766,12 @@ _0802686C: adds r1, r4, r2 adds r1, r5 strb r0, [r1] - b _08026964 + b @08026964 .align 2, 0 .pool -_080268F4: +@080268F4: cmp r0, 0x3 - bne _08026964 + bne @08026964 adds r1, r4, 0 adds r1, 0xDC adds r1, r5 @@ -59782,14 +59782,14 @@ _080268F4: lsls r0, 24 lsrs r0, 24 cmp r0, 0x13 - bls _08026964 + bls @08026964 mov r0, r8 ldr r1, [r0] adds r0, r1, 0 adds r0, 0x40 ldrb r0, [r0] cmp r0, 0x9 - bhi _08026964 + bhi @08026964 adds r0, r1, 0 adds r0, 0xDC adds r0, r5 @@ -59824,16 +59824,16 @@ _080268F4: adds r1, r5, 0 bl sub_8026DB0 strb r0, [r4] -_08026964: +@08026964: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 mov r0, r9 subs r0, 0x1 cmp r5, r0 - bge _08026974 - b _08026750 -_08026974: + bge @08026974 + b @08026750 +@08026974: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -59846,7 +59846,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 @@ -59860,10 +59860,10 @@ sub_8026988: @ 8026988 mov r8, r0 ldrb r6, [r1] cmp r6, r8 - bcs _08026A7A + bcs @08026A7A ldr r0, =0x082f449c mov r9, r0 -_080269A8: +@080269A8: ldr r0, =0x02022c98 ldr r3, [r0] adds r0, r3, 0 @@ -59894,24 +59894,24 @@ _080269A8: adds r0, r4 ldrb r0, [r0] cmp r0, 0 - beq _080269FC + beq @080269FC adds r0, r6, 0 movs r1, 0 bl sub_8028BF8 - b _08026A04 + b @08026A04 .align 2, 0 .pool -_080269FC: +@080269FC: adds r0, r6, 0 movs r1, 0x1 bl sub_8028BF8 -_08026A04: +@08026A04: adds r0, r7, 0 adds r0, 0x1F adds r5, r0, r4 ldrb r0, [r5] cmp r0, 0x9 - bls _08026A30 + bls @08026A30 adds r0, r7, 0 adds r0, 0x14 adds r0, r4 @@ -59926,14 +59926,14 @@ _08026A04: movs r0, 0xFF lsls r0, 24 adds r1, r0 - b _08026A52 -_08026A30: + b @08026A52 +@08026A30: adds r0, r7, 0 adds r0, 0x14 adds r3, r0, r4 ldrb r0, [r3] cmp r0, 0x3 - bne _08026A5C + bne @08026A5C movs r0, 0x7 strb r0, [r5] adds r0, r6, 0 @@ -59944,12 +59944,12 @@ _08026A30: movs r2, 0xFF lsls r2, 24 adds r1, r2 -_08026A52: +@08026A52: lsrs r1, 24 adds r0, r6, 0 bl sub_8028C7C - b _08026A70 -_08026A5C: + b @08026A70 +@08026A5C: ldrb r1, [r3] adds r0, r6, 0 bl sub_8028CA4 @@ -59958,13 +59958,13 @@ _08026A5C: lsrs r1, 24 adds r0, r6, 0 bl sub_8028C7C -_08026A70: +@08026A70: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, r8 - bcc _080269A8 -_08026A7A: + bcc @080269A8 +@08026A7A: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -59974,7 +59974,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] @@ -59982,9 +59982,9 @@ sub_8026A88: @ 8026A88 ldrb r5, [r0] movs r4, 0 cmp r4, r5 - bcs _08026ABA + bcs @08026ABA adds r6, r1, 0 -_08026A9A: +@08026A9A: lsls r0, r4, 4 subs r0, r4 lsls r0, 2 @@ -59999,8 +59999,8 @@ _08026A9A: lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc _08026A9A -_08026ABA: + bcc @08026A9A +@08026ABA: pop {r4-r6} pop {r0} bx r0 @@ -60009,7 +60009,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] @@ -60017,8 +60017,8 @@ sub_8026AC8: @ 8026AC8 ldrb r5, [r0] movs r4, 0 cmp r4, r5 - bcs _08026AEA -_08026AD8: + bcs @08026AEA +@08026AD8: adds r0, r4, 0 movs r1, 0x4 bl sub_80286B4 @@ -60026,8 +60026,8 @@ _08026AD8: lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc _08026AD8 -_08026AEA: + bcc @08026AD8 +@08026AEA: pop {r4,r5} pop {r0} bx r0 @@ -60036,7 +60036,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 @@ -60044,14 +60044,14 @@ sub_8026AF4: @ 8026AF4 adds r0, 0x40 ldrb r0, [r0] cmp r0, 0x9 - bls _08026B10 + bls @08026B10 bl sub_8026AC8 - b _08026B14 + b @08026B14 .align 2, 0 .pool -_08026B10: +@08026B10: bl sub_8026A88 -_08026B14: +@08026B14: ldr r0, =0x02022c98 ldr r0, [r0] adds r0, 0x40 @@ -60064,7 +60064,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 @@ -60072,14 +60072,14 @@ sub_8026B28: @ 8026B28 adds r0, 0x40 ldrb r0, [r0] cmp r0, 0x9 - bls _08026B44 + bls @08026B44 bl sub_8026AC8 - b _08026B48 + b @08026B48 .align 2, 0 .pool -_08026B44: +@08026B44: bl sub_8026A88 -_08026B48: +@08026B48: ldr r0, =0x02022c98 ldr r0, [r0] adds r0, 0x40 @@ -60092,61 +60092,61 @@ _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 lsrs r0, 24 subs r0, 0x1 cmp r0, 0x4 - bhi _08026BB4 + bhi @08026BB4 lsls r0, 2 - ldr r1, =_08026B78 + ldr r1, =@08026B78 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08026B78: - .4byte _08026B8C - .4byte _08026B94 - .4byte _08026B9C - .4byte _08026BA4 - .4byte _08026BAC -_08026B8C: +@08026B78: + .4byte @08026B8C + .4byte @08026B94 + .4byte @08026B9C + .4byte @08026BA4 + .4byte @08026BAC +@08026B8C: movs r0, 0x4 strb r0, [r3] movs r0, 0x7 - b _08026BB2 -_08026B94: + b @08026BB2 +@08026B94: movs r0, 0x3 strb r0, [r3] movs r0, 0x8 - b _08026BB2 -_08026B9C: + b @08026BB2 +@08026B9C: movs r0, 0x2 strb r0, [r3] movs r0, 0x9 - b _08026BB2 -_08026BA4: + b @08026BB2 +@08026BA4: movs r0, 0x1 strb r0, [r3] movs r0, 0xA - b _08026BB2 -_08026BAC: + b @08026BB2 +@08026BAC: movs r0, 0 strb r0, [r3] movs r0, 0xB -_08026BB2: +@08026BB2: strb r0, [r2] -_08026BB4: +@08026BB4: pop {r0} bx r0 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] @@ -60154,9 +60154,9 @@ sub_8026BB8: @ 8026BB8 ldrb r5, [r0] movs r4, 0x1 cmp r4, r5 - bcs _08026C1E + bcs @08026C1E adds r6, r1, 0 -_08026BCA: +@08026BCA: ldr r0, [r6] movs r1, 0xAC lsls r1, 1 @@ -60164,7 +60164,7 @@ _08026BCA: adds r0, r4 ldrb r0, [r0] cmp r0, 0 - bne _08026BEC + bne @08026BEC adds r0, r4, 0 bl sub_8027DFC ldr r1, [r6] @@ -60173,51 +60173,51 @@ _08026BCA: adds r1, r2 adds r1, r4 strb r0, [r1] -_08026BEC: +@08026BEC: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc _08026BCA + bcc @08026BCA cmp r4, r5 - bcs _08026C1E + bcs @08026C1E ldr r0, =0x02022c98 ldr r0, [r0] movs r2, 0xAC lsls r2, 1 adds r1, r0, r2 -_08026C04: +@08026C04: adds r0, r1, r4 ldrb r0, [r0] cmp r0, 0 - bne _08026C14 + bne @08026C14 movs r0, 0 - b _08026C20 + b @08026C20 .align 2, 0 .pool -_08026C14: +@08026C14: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc _08026C04 -_08026C1E: + bcc @08026C04 +@08026C1E: movs r0, 0x1 -_08026C20: +@08026C20: pop {r4-r6} pop {r1} bx r1 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 movs r3, 0xAC lsls r3, 1 movs r2, 0 -_08026C34: +@08026C34: ldr r0, [r4] adds r0, r3 adds r0, r1 @@ -60226,7 +60226,7 @@ _08026C34: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x4 - bls _08026C34 + bls @08026C34 pop {r4} pop {r0} bx r0 @@ -60235,7 +60235,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] @@ -60243,13 +60243,13 @@ sub_8026C50: @ 8026C50 adds r2, 0x40 ldrb r0, [r2] cmp r0, 0x9 - bls _08026C88 + bls @08026C88 movs r4, 0x90 lsls r4, 1 adds r0, r1, r4 ldr r0, [r0] cmp r0, 0 - bne _08026C88 + bne @08026C88 movs r0, 0xA strb r0, [r2] ldr r0, [r3] @@ -60258,21 +60258,21 @@ sub_8026C50: @ 8026C50 adds r0, r1 ldr r0, [r0] cmp r0, 0 - beq _08026C88 + beq @08026C88 movs r0, 0x1 - b _08026C8A + b @08026C8A .align 2, 0 .pool -_08026C88: +@08026C88: movs r0, 0 -_08026C8A: +@08026C8A: pop {r4} pop {r1} bx r1 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] @@ -60280,7 +60280,7 @@ sub_8026C90: @ 8026C90 adds r2, 0x40 ldrb r0, [r2] cmp r0, 0x9 - bls _08026D14 + bls @08026D14 adds r0, r1, 0 adds r0, 0x44 ldrb r3, [r0] @@ -60295,10 +60295,10 @@ sub_8026C90: @ 8026C90 add r0, r12 ldr r0, [r0] cmp r0, 0 - beq _08026D14 + beq @08026D14 adds r4, r3, 0 cmp r4, r5 - bcs _08026D04 + bcs @08026D04 mov r0, r12 adds r0, 0x28 ldrb r3, [r0] @@ -60318,7 +60318,7 @@ sub_8026C90: @ 8026C90 subs r2, r0, r2 ldr r0, =0x000031bf adds r1, r0 -_08026CEA: +@08026CEA: adds r0, r4, r3 adds r0, r2 adds r0, r6 @@ -60326,27 +60326,27 @@ _08026CEA: adds r0, r1, r0 ldrb r0, [r0] cmp r0, 0xA - bne _08026D14 + bne @08026D14 adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc _08026CEA -_08026D04: + bcc @08026CEA +@08026D04: movs r0, 0x1 - b _08026D16 + b @08026D16 .align 2, 0 .pool -_08026D14: +@08026D14: movs r0, 0 -_08026D16: +@08026D16: pop {r4-r6} pop {r1} bx r1 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 @@ -60386,11 +60386,11 @@ sub_8026D1C: @ 8026D1C ldrh r1, [r6] lsrs r0, 24 cmp r1, r0 - bcc _08026D76 + bcc @08026D76 adds r0, r7, 0x1 mov r1, r9 strb r0, [r1] -_08026D76: +@08026D76: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -60402,7 +60402,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, =0x082f4648 @@ -60422,7 +60422,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} @@ -60460,14 +60460,14 @@ sub_8026DB0: @ 8026DB0 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 - beq _08026E18 + beq @08026E18 adds r6, r1, 0 -_08026DFE: +@08026DFE: adds r0, r3, r2 adds r0, r6 ldrb r0, [r0] cmp r5, r0 - beq _08026E3C + beq @08026E3C adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 @@ -60475,8 +60475,8 @@ _08026DFE: adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _08026DFE -_08026E18: + bne @08026DFE +@08026E18: ldr r0, [r4] adds r0, 0x90 mov r1, r12 @@ -60485,31 +60485,31 @@ _08026E18: ldrb r0, [r2] ldrb r3, [r1] cmp r0, r3 - bls _08026E46 + bls @08026E46 adds r1, r0, 0 - b _08026E48 + b @08026E48 .align 2, 0 .pool -_08026E3C: +@08026E3C: ldr r0, [r4] adds r0, 0x90 adds r0, r7 ldrb r0, [r0] - b _08026E5A -_08026E46: + b @08026E5A +@08026E46: ldrb r1, [r1] -_08026E48: +@08026E48: ldr r0, [r4] adds r0, 0x90 mov r2, r8 adds r4, r0, r2 ldrb r0, [r4] cmp r0, r1 - bls _08026E58 + bls @08026E58 adds r1, r0, 0 -_08026E58: +@08026E58: adds r0, r1, 0 -_08026E5A: +@08026E5A: adds r1, r5, 0 bl sub_8026E70 lsls r0, 24 @@ -60522,7 +60522,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 @@ -60538,87 +60538,87 @@ sub_8026E70: @ 8026E70 lsls r0, 24 lsrs r0, 24 cmp r0, 0x6 - bhi _08026EDE + bhi @08026EDE lsls r0, 2 - ldr r1, =_08026EA4 + ldr r1, =@08026EA4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08026EA4: - .4byte _08026EDE - .4byte _08026ED6 - .4byte _08026EE2 - .4byte _08026EC0 - .4byte _08026EC6 - .4byte _08026ECC - .4byte _08026ED2 -_08026EC0: +@08026EA4: + .4byte @08026EDE + .4byte @08026ED6 + .4byte @08026EE2 + .4byte @08026EC0 + .4byte @08026EC6 + .4byte @08026ECC + .4byte @08026ED2 +@08026EC0: cmp r4, 0 - beq _08026ED6 - b _08026EDE -_08026EC6: + beq @08026ED6 + b @08026EDE +@08026EC6: cmp r4, 0 - beq _08026EE2 - b _08026EDE -_08026ECC: + beq @08026EE2 + b @08026EDE +@08026ECC: cmp r4, 0x2 - beq _08026ED6 - b _08026EE2 -_08026ED2: + beq @08026ED6 + b @08026EE2 +@08026ED2: cmp r4, 0 - bne _08026EDA -_08026ED6: + bne @08026EDA +@08026ED6: movs r0, 0x1 - b _08026EE4 -_08026EDA: + b @08026EE4 +@08026EDA: cmp r4, 0x1 - beq _08026EE2 -_08026EDE: + beq @08026EE2 +@08026EDE: movs r0, 0 - b _08026EE4 -_08026EE2: + b @08026EE4 +@08026EE2: movs r0, 0x2 -_08026EE4: +@08026EE4: pop {r4} pop {r1} bx r1 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 adds r4, r0, 0 - b _08026EFE -_08026EF6: + b @08026EFE +@08026EF6: ldrh r0, [r4, 0x6] adds r6, r0 adds r4, 0xC adds r5, 0x1 -_08026EFE: +@08026EFE: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r5, r0 - blt _08026EF6 + blt @08026EF6 cmp r6, 0xA - bgt _08026F12 + bgt @08026F12 movs r0, 0 - b _08026F14 -_08026F12: + b @08026F14 +@08026F12: movs r0, 0x1 -_08026F14: +@08026F14: pop {r4-r6} pop {r1} bx r1 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 @@ -60632,17 +60632,17 @@ sub_8026F1C: @ 8026F1C adds r0, 0x24 ldrb r5, [r0] cmp r3, 0 - bge _08026F3A - b _0802722C -_08026F3A: + bge @08026F3A + b @0802722C +@08026F3A: cmp r3, 0x2 - ble _08026F48 + ble @08026F48 cmp r3, 0x3 - beq _08026F78 - b _0802722C + beq @08026F78 + b @0802722C .align 2, 0 .pool -_08026F48: +@08026F48: ldr r3, =0x000031b4 adds r0, r1, r3 adds r0, r4 @@ -60661,61 +60661,61 @@ _08026F48: ldr r1, [r6] adds r1, 0x4A adds r1, r4 - b _0802722A + b @0802722A .align 2, 0 .pool -_08026F78: +@08026F78: adds r0, r1, 0 adds r0, 0x4A bl sub_8026EEC cmp r0, 0 - beq _08026F86 - b _0802722C -_08026F86: + beq @08026F86 + b @0802722C +@08026F86: cmp r5, 0x3 - bne _08026F8C - b _08027154 -_08026F8C: + bne @08026F8C + b @08027154 +@08026F8C: cmp r5, 0x3 - bgt _08026F98 + bgt @08026F98 cmp r5, 0x2 - bne _08026F96 - b _080271E8 -_08026F96: - b _0802722C -_08026F98: + bne @08026F96 + b @080271E8 +@08026F96: + b @0802722C +@08026F98: cmp r5, 0x4 - bne _08026F9E - b _08027090 -_08026F9E: + bne @08026F9E + b @08027090 +@08026F9E: cmp r5, 0x5 - beq _08026FA4 - b _0802722C -_08026FA4: + beq @08026FA4 + b @0802722C +@08026FA4: cmp r4, 0x9 - bls _08026FAA - b _0802722C -_08026FAA: + bls @08026FAA + b @0802722C +@08026FAA: lsls r0, r4, 2 - ldr r1, =_08026FB8 + ldr r1, =@08026FB8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08026FB8: - .4byte _08026FE0 - .4byte _08026FF8 - .4byte _08027004 - .4byte _0802701C - .4byte _08027028 - .4byte _08027040 - .4byte _0802704C - .4byte _08027060 - .4byte _0802706C - .4byte _08027084 -_08026FE0: +@08026FB8: + .4byte @08026FE0 + .4byte @08026FF8 + .4byte @08027004 + .4byte @0802701C + .4byte @08027028 + .4byte @08027040 + .4byte @0802704C + .4byte @08027060 + .4byte @0802706C + .4byte @08027084 +@08026FE0: ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 @@ -60724,17 +60724,17 @@ _08026FE0: adds r0, 0x1 strh r0, [r2] adds r1, 0x74 - b _08027226 + b @08027226 .align 2, 0 .pool -_08026FF8: +@08026FF8: ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x74 - b _08027226 + b @08027226 .align 2, 0 .pool -_08027004: +@08027004: ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 @@ -60743,17 +60743,17 @@ _08027004: adds r0, 0x1 strh r0, [r2] adds r1, 0x80 - b _08027226 + b @08027226 .align 2, 0 .pool -_0802701C: +@0802701C: ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x80 - b _08027226 + b @08027226 .align 2, 0 .pool -_08027028: +@08027028: ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 @@ -60762,17 +60762,17 @@ _08027028: adds r0, 0x1 strh r0, [r2] adds r1, 0x50 - b _08027226 + b @08027226 .align 2, 0 .pool -_08027040: +@08027040: ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x50 - b _08027226 + b @08027226 .align 2, 0 .pool -_0802704C: +@0802704C: ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 @@ -60780,16 +60780,16 @@ _0802704C: ldrh r0, [r2] adds r0, 0x1 strh r0, [r2] - b _08027224 + b @08027224 .align 2, 0 .pool -_08027060: +@08027060: ldr r0, =0x02022c98 ldr r1, [r0] - b _08027224 + b @08027224 .align 2, 0 .pool -_0802706C: +@0802706C: ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 @@ -60798,40 +60798,40 @@ _0802706C: adds r0, 0x1 strh r0, [r2] adds r1, 0x68 - b _08027226 + b @08027226 .align 2, 0 .pool -_08027084: +@08027084: ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x68 - b _08027226 + b @08027226 .align 2, 0 .pool -_08027090: +@08027090: subs r0, r4, 0x1 cmp r0, 0x7 - bls _08027098 - b _0802722C -_08027098: + bls @08027098 + b @0802722C +@08027098: lsls r0, 2 - ldr r1, =_080270A8 + ldr r1, =@080270A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080270A8: - .4byte _080270C8 - .4byte _080270E0 - .4byte _080270EC - .4byte _08027104 - .4byte _08027110 - .4byte _08027124 - .4byte _08027130 - .4byte _08027148 -_080270C8: +@080270A8: + .4byte @080270C8 + .4byte @080270E0 + .4byte @080270EC + .4byte @08027104 + .4byte @08027110 + .4byte @08027124 + .4byte @08027130 + .4byte @08027148 +@080270C8: ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 @@ -60840,17 +60840,17 @@ _080270C8: adds r0, 0x1 strh r0, [r2] adds r1, 0x74 - b _08027226 + b @08027226 .align 2, 0 .pool -_080270E0: +@080270E0: ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x74 - b _08027226 + b @08027226 .align 2, 0 .pool -_080270EC: +@080270EC: ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 @@ -60859,17 +60859,17 @@ _080270EC: adds r0, 0x1 strh r0, [r2] adds r1, 0x50 - b _08027226 + b @08027226 .align 2, 0 .pool -_08027104: +@08027104: ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x50 - b _08027226 + b @08027226 .align 2, 0 .pool -_08027110: +@08027110: ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 @@ -60877,16 +60877,16 @@ _08027110: ldrh r0, [r2] adds r0, 0x1 strh r0, [r2] - b _08027224 + b @08027224 .align 2, 0 .pool -_08027124: +@08027124: ldr r0, =0x02022c98 ldr r1, [r0] - b _08027224 + b @08027224 .align 2, 0 .pool -_08027130: +@08027130: ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 @@ -60895,36 +60895,36 @@ _08027130: adds r0, 0x1 strh r0, [r2] adds r1, 0x68 - b _08027226 + b @08027226 .align 2, 0 .pool -_08027148: +@08027148: ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x68 - b _08027226 + b @08027226 .align 2, 0 .pool -_08027154: +@08027154: subs r0, r4, 0x2 cmp r0, 0x5 - bhi _0802722C + bhi @0802722C lsls r0, 2 - ldr r1, =_08027168 + ldr r1, =@08027168 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08027168: - .4byte _08027180 - .4byte _08027198 - .4byte _080271A4 - .4byte _080271BC - .4byte _080271C8 - .4byte _080271DC -_08027180: +@08027168: + .4byte @08027180 + .4byte @08027198 + .4byte @080271A4 + .4byte @080271BC + .4byte @080271C8 + .4byte @080271DC +@08027180: ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 @@ -60933,17 +60933,17 @@ _08027180: adds r0, 0x1 strh r0, [r2] adds r1, 0x68 - b _08027226 + b @08027226 .align 2, 0 .pool -_08027198: +@08027198: ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x68 - b _08027226 + b @08027226 .align 2, 0 .pool -_080271A4: +@080271A4: ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 @@ -60952,17 +60952,17 @@ _080271A4: adds r0, 0x1 strh r0, [r2] adds r1, 0x50 - b _08027226 + b @08027226 .align 2, 0 .pool -_080271BC: +@080271BC: ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x50 - b _08027226 + b @08027226 .align 2, 0 .pool -_080271C8: +@080271C8: ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 @@ -60970,66 +60970,66 @@ _080271C8: ldrh r0, [r2] adds r0, 0x1 strh r0, [r2] - b _08027224 + b @08027224 .align 2, 0 .pool -_080271DC: +@080271DC: ldr r0, =0x02022c98 ldr r1, [r0] - b _08027224 + b @08027224 .align 2, 0 .pool -_080271E8: +@080271E8: cmp r4, 0x4 - beq _0802720E + beq @0802720E cmp r4, 0x4 - bgt _080271F6 + bgt @080271F6 cmp r4, 0x3 - beq _08027200 - b _0802722C -_080271F6: + beq @08027200 + b @0802722C +@080271F6: cmp r4, 0x5 - beq _08027214 + beq @08027214 cmp r4, 0x6 - beq _08027222 - b _0802722C -_08027200: + beq @08027222 + b @0802722C +@08027200: ldr r1, [r6] adds r2, r1, 0 adds r2, 0x50 ldrh r0, [r2] adds r0, 0x1 strh r0, [r2] - b _08027224 -_0802720E: + b @08027224 +@0802720E: ldr r1, [r6] adds r1, 0x50 - b _08027226 -_08027214: + b @08027226 +@08027214: ldr r1, [r6] adds r2, r1, 0 adds r2, 0x50 ldrh r0, [r2] adds r0, 0x1 strh r0, [r2] - b _08027224 -_08027222: + b @08027224 +@08027222: ldr r1, [r6] -_08027224: +@08027224: adds r1, 0x5C -_08027226: +@08027226: ldrh r0, [r1] adds r0, 0x1 -_0802722A: +@0802722A: strh r0, [r1] -_0802722C: +@0802722C: pop {r4-r6} pop {r0} bx r0 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 @@ -61038,9 +61038,9 @@ sub_8027234: @ 8027234 adds r0, 0x24 ldrb r0, [r0] cmp r0, 0x5 - bne _0802729E + bne @0802729E cmp r1, 0x1 - bne _08027280 + bne @08027280 movs r5, 0x89 lsls r5, 1 adds r1, r3, r5 @@ -61054,20 +61054,20 @@ sub_8027234: @ 8027234 lsrs r0, 16 ldrh r3, [r1] cmp r0, r3 - bls _08027268 + bls @08027268 strh r2, [r1] -_08027268: +@08027268: ldr r0, [r4] adds r2, r0, r5 ldrh r0, [r2] ldr r1, =0x0000270f cmp r0, r1 - bls _0802729E + bls @0802729E strh r1, [r2] - b _0802729E + b @0802729E .align 2, 0 .pool -_08027280: +@08027280: movs r2, 0x89 lsls r2, 1 adds r0, r3, r2 @@ -61077,21 +61077,21 @@ _08027280: ldrh r0, [r0] ldrh r3, [r1] cmp r0, r3 - bls _08027296 + bls @08027296 strh r0, [r1] -_08027296: +@08027296: ldr r0, [r4] adds r0, r2 movs r1, 0 strh r1, [r0] -_0802729E: +@0802729E: pop {r4,r5} pop {r0} bx r0 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 @@ -61099,11 +61099,11 @@ sub_80272A4: @ 80272A4 adds r0, 0x24 ldrb r0, [r0] cmp r3, r0 - bcs _080272DC + bcs @080272DC adds r5, r2, 0 movs r4, 0x8A lsls r4, 1 -_080272BA: +@080272BA: ldr r2, [r5] lsls r0, r3, 1 adds r0, r3 @@ -61120,8 +61120,8 @@ _080272BA: adds r2, 0x24 ldrb r2, [r2] cmp r3, r2 - bcc _080272BA -_080272DC: + bcc @080272BA +@080272DC: pop {r4,r5} pop {r0} bx r0 @@ -61130,7 +61130,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 @@ -61141,7 +61141,7 @@ sub_80272E8: @ 80272E8 movs r4, 0 ldr r0, =0x000031bf mov r10, r0 -_080272FC: +@080272FC: movs r2, 0 lsls r6, r5, 4 lsls r1, r5, 1 @@ -61152,7 +61152,7 @@ _080272FC: mov r9, r1 subs r0, r6, r5 lsls r3, r0, 2 -_08027310: +@08027310: ldr r0, [r7] adds r1, r2, r3 add r0, r10 @@ -61162,7 +61162,7 @@ _08027310: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xA - bls _08027310 + bls @08027310 ldr r0, [r7] subs r1, r6, r5 lsls r1, 2 @@ -61224,7 +61224,7 @@ _08027310: lsls r0, r1, 24 lsrs r5, r0, 24 cmp r5, 0x4 - bls _080272FC + bls @080272FC ldr r2, =0x02022c98 ldr r0, [r2] movs r1, 0xAA @@ -61255,7 +61255,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 @@ -61263,18 +61263,18 @@ sub_80273F0: @ 80273F0 adds r0, 0x24 ldrb r0, [r0] cmp r0, 0x4 - beq _0802740C + beq @0802740C cmp r0, 0x5 - beq _08027410 - b _08027412 + beq @08027410 + b @08027412 .align 2, 0 .pool -_0802740C: +@0802740C: movs r4, 0x1 - b _08027412 -_08027410: + b @08027412 +@08027410: movs r4, 0x2 -_08027412: +@08027412: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -61291,7 +61291,7 @@ _08027412: adds r0, r1 adds r0, r2 ldrb r2, [r0] -_08027436: +@08027436: ldr r1, [r5] lsls r0, r3, 1 adds r0, r3 @@ -61303,7 +61303,7 @@ _08027436: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x4 - bls _08027436 + bls @08027436 pop {r4,r5} pop {r0} bx r0 @@ -61312,7 +61312,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 @@ -61336,9 +61336,9 @@ sub_802745C: @ 802745C adds r0, r3, r2 ldr r1, =0x0000270f cmp r0, r1 - bls _0802748E + bls @0802748E adds r0, r1, 0 -_0802748E: +@0802748E: pop {r1} bx r1 .align 2, 0 @@ -61346,7 +61346,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] @@ -61370,18 +61370,18 @@ sub_802749C: @ 802749C adds r1, r0, r6 ldr r0, [r1] cmp r0, r2 - bcs _080274D6 + bcs @080274D6 str r2, [r1] -_080274D6: +@080274D6: ldr r0, [r3] movs r2, 0x84 lsls r2, 2 adds r1, r0, r2 ldrh r0, [r1] cmp r0, r4 - bcs _080274E6 + bcs @080274E6 strh r4, [r1] -_080274E6: +@080274E6: ldr r0, [r3] ldr r6, =0x00000212 adds r2, r0, r6 @@ -61392,9 +61392,9 @@ _080274E6: ldrh r1, [r0] ldrh r0, [r2] cmp r0, r1 - bcs _080274FE + bcs @080274FE strh r1, [r2] -_080274FE: +@080274FE: pop {r4-r6} pop {r0} bx r0 @@ -61403,7 +61403,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 @@ -61414,7 +61414,7 @@ sub_8027518: @ 8027518 movs r3, 0x3 adds r5, r1, 0 adds r4, r5, 0 -_0802752C: +@0802752C: ldr r0, [r4] adds r0, 0x98 adds r2, r0, r3 @@ -61425,7 +61425,7 @@ _0802752C: lsls r1, 24 lsrs r3, r1, 24 cmp r3, 0 - bne _0802752C + bne @0802752C ldr r0, [r5] adds r0, 0x98 strb r7, [r0] @@ -61438,7 +61438,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] @@ -61449,13 +61449,13 @@ sub_8027554: @ 8027554 adds r2, r0, r1 ldrb r0, [r2] cmp r0, 0 - bne _080275FC + bne @080275FC ldr r0, =0x030022c0 ldrh r2, [r0, 0x2E] movs r0, 0x40 ands r0, r2 cmp r0, 0 - beq _08027594 + beq @08027594 lsls r0, r1, 4 subs r0, r1 lsls r0, 2 @@ -61463,14 +61463,14 @@ sub_8027554: @ 8027554 ldr r1, =0x000031cc adds r0, r1 movs r1, 0x2 - b _080275CA + b @080275CA .align 2, 0 .pool -_08027594: +@08027594: movs r0, 0x20 ands r0, r2 cmp r0, 0 - beq _080275B0 + beq @080275B0 lsls r0, r1, 4 subs r0, r1 lsls r0, 2 @@ -61478,16 +61478,16 @@ _08027594: ldr r1, =0x000031cc adds r0, r1 movs r1, 0x3 - b _080275CA + b @080275CA .align 2, 0 .pool -_080275B0: +@080275B0: movs r0, 0x10 ands r0, r2 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0 - beq _080275E8 + beq @080275E8 lsls r0, r1, 4 subs r0, r1 lsls r0, 2 @@ -61495,7 +61495,7 @@ _080275B0: ldr r1, =0x000031cc adds r0, r1 movs r1, 0x1 -_080275CA: +@080275CA: strb r1, [r0] ldr r0, [r4] adds r1, r0, 0 @@ -61507,10 +61507,10 @@ _080275CA: strb r1, [r0] movs r0, 0xD4 bl audio_play - b _08027600 + b @08027600 .align 2, 0 .pool -_080275E8: +@080275E8: lsls r0, r1, 4 subs r0, r1 lsls r0, 2 @@ -61518,20 +61518,20 @@ _080275E8: ldr r1, =0x000031cc adds r0, r1 strb r2, [r0] - b _08027600 + b @08027600 .align 2, 0 .pool -_080275FC: +@080275FC: subs r0, 0x1 strb r0, [r2] -_08027600: +@08027600: pop {r4} pop {r0} bx r0 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 @@ -61551,7 +61551,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 @@ -61572,7 +61572,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 @@ -61583,14 +61583,14 @@ 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 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _0802768C + bne @0802768C ldr r0, =0x02022c98 lsls r1, r2, 4 subs r1, r2 @@ -61598,15 +61598,15 @@ sub_8027660: @ 8027660 ldr r2, =0x000031a0 adds r1, r2 ldr r0, [r0] - b _08027694 + b @08027694 .align 2, 0 .pool -_0802768C: +@0802768C: lsls r0, r2, 3 subs r0, r2 lsls r0, 2 ldr r1, =0x020229f0 -_08027694: +@08027694: adds r0, r1 pop {r1} bx r1 @@ -61615,7 +61615,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 @@ -61635,7 +61635,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 @@ -61659,7 +61659,7 @@ sub_80276C0: @ 80276C0 adds r6, 0x4A mov r12, r1 mov r8, r10 -_080276EE: +@080276EE: lsls r1, r3, 1 ldr r7, [sp] adds r0, r1, r7 @@ -61674,7 +61674,7 @@ _080276EE: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x2 - bls _080276EE + bls @080276EE mov r0, r9 ldr r1, [r0] mov r2, r12 @@ -61688,14 +61688,14 @@ _080276EE: ldrsh r0, [r3, r7] muls r0, r1 cmp r5, r0 - bls _08027734 + bls @08027734 subs r0, r5, r0 - b _08027736 + b @08027736 .align 2, 0 .pool -_08027734: +@08027734: movs r0, 0 -_08027736: +@08027736: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -61707,7 +61707,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] @@ -61718,20 +61718,20 @@ sub_8027748: @ 8027748 adds r5, r0, 0 movs r4, 0x1 cmp r4, r6 - bcs _08027776 -_08027760: + bcs @08027776 +@08027760: adds r0, r4, 0 bl sub_80276C0 cmp r0, r5 - bls _0802776C + bls @0802776C adds r5, r0, 0 -_0802776C: +@0802776C: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r6 - bcc _08027760 -_08027776: + bcc @08027760 +@08027776: ldr r1, =0x000f4236 adds r0, r5, 0 bl sub_8027A38 @@ -61743,7 +61743,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 @@ -61757,8 +61757,8 @@ sub_802778C: @ 802778C ldrh r3, [r0] movs r1, 0 cmp r1, r5 - bcs _080277C4 -_080277A8: + bcs @080277C4 +@080277A8: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 @@ -61766,15 +61766,15 @@ _080277A8: adds r0, r2, r0 ldrh r0, [r0] cmp r0, r3 - bls _080277BA + bls @080277BA adds r3, r0, 0 -_080277BA: +@080277BA: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, r5 - bcc _080277A8 -_080277C4: + bcc @080277A8 +@080277C4: adds r0, r3, 0 pop {r4,r5} pop {r1} @@ -61784,7 +61784,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 @@ -61796,8 +61796,8 @@ sub_80277D0: @ 80277D0 ldrb r5, [r0] movs r4, 0 cmp r4, r5 - bcs _080277FE -_080277E8: + bcs @080277FE +@080277E8: adds r0, r4, 0 bl sub_80276C0 lsls r1, r4, 2 @@ -61807,20 +61807,20 @@ _080277E8: lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc _080277E8 -_080277FE: + bcc @080277E8 +@080277FE: lsls r7, 2 mov r12, r7 cmp r6, 0 - beq _08027838 + beq @08027838 subs r7, r5, 0x1 -_08027808: +@08027808: movs r6, 0 movs r4, 0 cmp r6, r7 - bge _08027834 + bge @08027834 adds r5, r7, 0 -_08027812: +@08027812: lsls r0, r4, 2 mov r2, sp adds r1, r2, r0 @@ -61830,19 +61830,19 @@ _08027812: ldr r0, [r1] ldr r2, [r3] cmp r0, r2 - bcs _0802782C + bcs @0802782C str r2, [r1] str r0, [r3] movs r6, 0x1 -_0802782C: +@0802782C: lsls r0, r4, 24 lsrs r4, r0, 24 cmp r4, r5 - blt _08027812 -_08027834: + blt @08027812 +@08027834: cmp r6, 0 - bne _08027808 -_08027838: + bne @08027808 +@08027838: mov r0, sp add r0, r12 ldr r0, [r0] @@ -61855,7 +61855,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 @@ -61872,17 +61872,17 @@ sub_802784C: @ 802784C bl sub_8027748 bl sub_8027748 cmp r0, 0 - bne _080278A0 + bne @080278A0 movs r4, 0 cmp r9, r5 - bcs _080278A0 + bcs @080278A0 adds r2, r6, 0 ldr r1, =0x00003308 mov r12, r1 movs r7, 0 movs r6, 0x4 ldr r3, =0x0000330c -_08027884: +@08027884: ldr r0, [r2] lsls r1, r4, 3 adds r0, r1 @@ -61896,12 +61896,12 @@ _08027884: lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc _08027884 -_080278A0: + bcc @08027884 +@080278A0: movs r4, 0 cmp r4, r5 - bcs _080278CA -_080278A6: + bcs @080278CA +@080278A6: adds r0, r4, 0 bl sub_80276C0 ldr r1, =0x000f4236 @@ -61917,18 +61917,18 @@ _080278A6: lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc _080278A6 -_080278CA: + bcc @080278A6 +@080278CA: mov r0, r10 bl sub_80277D0 adds r6, r0, 0 mov r3, r8 movs r4, 0 cmp r4, r5 - bcs _08027916 + bcs @08027916 ldr r7, =0x02022c98 mov r10, r7 -_080278DE: +@080278DE: mov r0, r10 ldr r2, [r0] lsls r1, r4, 3 @@ -61937,7 +61937,7 @@ _080278DE: adds r0, r1 ldr r0, [r0] cmp r6, r0 - bne _0802790C + bne @0802790C adds r0, r2, r1 ldr r1, =0x00003308 adds r0, r1 @@ -61952,16 +61952,16 @@ _080278DE: lsls r0, 24 lsrs r0, 24 mov r9, r0 -_0802790C: +@0802790C: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc _080278DE -_08027916: + bcc @080278DE +@08027916: mov r10, r8 cmp r9, r5 - bcc _080278CA + bcc @080278CA movs r0, 0 pop {r3-r5} mov r8, r3 @@ -61975,7 +61975,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] @@ -61993,7 +61993,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 @@ -62009,8 +62009,8 @@ sub_802795C: @ 802795C bl memset movs r4, 0 cmp r7, r5 - bcs _08027994 -_0802797E: + bcs @08027994 +@0802797E: adds r0, r4, 0 bl sub_80276C0 lsls r1, r4, 2 @@ -62020,29 +62020,29 @@ _0802797E: lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc _0802797E -_08027994: + bcc @0802797E +@08027994: lsls r0, r6, 2 add r0, sp ldr r1, [r0] movs r4, 0 -_0802799C: +@0802799C: cmp r4, r6 - beq _080279B0 + beq @080279B0 lsls r0, r4, 2 add r0, sp ldr r0, [r0] cmp r1, r0 - bcs _080279B0 + bcs @080279B0 adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 -_080279B0: +@080279B0: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 - bls _0802799C + bls @0802799C adds r0, r7, 0 add sp, 0x14 pop {r4-r7} @@ -62053,7 +62053,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] @@ -62068,21 +62068,21 @@ sub_80279C8: @ 80279C8 adds r4, r0, 0 bl sub_8027748 cmp r4, r0 - beq _080279F4 + beq @080279F4 movs r0, 0x3 - b _08027A22 + b @08027A22 .align 2, 0 .pool -_080279F4: +@080279F4: adds r0, r5, 0 movs r1, 0x1 bl sub_80D6800 lsls r0, 24 cmp r0, 0 - bne _08027A06 + bne @08027A06 movs r0, 0x2 - b _08027A22 -_08027A06: + b @08027A22 +@08027A06: adds r0, r6, 0 movs r1, 0x1 bl bag_add_item @@ -62091,45 +62091,45 @@ _08027A06: bl sub_80D6800 lsls r0, 24 cmp r0, 0 - beq _08027A20 + beq @08027A20 movs r0, 0 - b _08027A22 -_08027A20: + b @08027A22 +@08027A20: movs r0, 0x1 -_08027A22: +@08027A22: pop {r4-r6} pop {r1} bx r1 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 cmp r2, r0 - bcs _08027A34 + bcs @08027A34 adds r0, r2, 0x1 -_08027A34: +@08027A34: pop {r1} bx r1 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 cmp r2, r0 - bcs _08027A44 + bcs @08027A44 adds r0, r2, 0 -_08027A44: +@08027A44: pop {r1} bx r1 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 @@ -62143,11 +62143,11 @@ 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 -_08027A62: +@08027A62: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -62157,25 +62157,25 @@ _08027A62: movs r1, 0x5 bl pokemon_getattr cmp r0, 0 - beq _08027A94 + beq @08027A94 adds r0, r4, 0 movs r1, 0x41 bl pokemon_getattr cmp r0, 0x55 - bne _08027A94 + bne @08027A94 movs r0, 0x1 strh r0, [r6] - b _08027AA0 + b @08027AA0 .align 2, 0 .pool -_08027A94: +@08027A94: adds r5, 0x1 cmp r5, 0x5 - ble _08027A62 + ble @08027A62 ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] -_08027AA0: +@08027AA0: pop {r4-r6} pop {r0} bx r0 @@ -62184,7 +62184,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 + 1 adds r0, r4, 0 @@ -62201,7 +62201,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 @@ -62214,21 +62214,21 @@ sub_8027ACC: @ 8027ACC movs r1, 0 ldrsh r0, [r7, r1] cmp r0, 0x1 - beq _08027B94 + beq @08027B94 cmp r0, 0x1 - bgt _08027AF4 + bgt @08027AF4 cmp r0, 0 - beq _08027AFE - b _08027BE2 + beq @08027AFE + b @08027BE2 .align 2, 0 .pool -_08027AF4: +@08027AF4: cmp r0, 0x2 - beq _08027BA0 + beq @08027BA0 cmp r0, 0x3 - beq _08027BC8 - b _08027BE2 -_08027AFE: + beq @08027BC8 + b @08027BE2 +@08027AFE: ldr r0, =0x082f7b2c ldr r1, [r0, 0x4] ldr r0, [r0] @@ -62241,32 +62241,32 @@ _08027AFE: adds r4, r0, 0 movs r6, 0 ldr r5, =0x082f7b34 -_08027B18: +@08027B18: ldr r1, [r5] movs r0, 0x1 movs r2, 0 bl font_get_width_of_string adds r0, 0x32 cmp r0, r4 - ble _08027B2A + ble @08027B2A adds r4, r0, 0 -_08027B2A: +@08027B2A: adds r5, 0x4 adds r6, 0x1 cmp r6, 0x2 - bls _08027B18 + bls @08027B18 adds r0, r4, 0x7 cmp r0, 0 - bge _08027B3A + bge @08027B3A adds r0, 0x7 -_08027B3A: +@08027B3A: asrs r4, r0, 3 movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _08027B46 + beq @08027B46 adds r4, 0x1 -_08027B46: +@08027B46: movs r1, 0x1E subs r1, r4 lsrs r0, r1, 31 @@ -62292,46 +62292,46 @@ _08027B46: bl sub_8027BEC ldrb r0, [r7, 0x2] movs r1, 0x3 - b _08027BB6 + b @08027BB6 .align 2, 0 .pool -_08027B94: +@08027B94: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _08027BE2 - b _08027BBA -_08027BA0: + bne @08027BE2 + b @08027BBA +@08027BA0: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _08027BE2 + beq @08027BE2 ldrb r0, [r7, 0x2] bl rbox_fill_rectangle ldrb r0, [r7, 0x2] movs r1, 0x1 -_08027BB6: +@08027BB6: bl Window_CopyToVram -_08027BBA: +@08027BBA: ldrh r0, [r7] adds r0, 0x1 strh r0, [r7] - b _08027BE2 + b @08027BE2 .align 2, 0 .pool -_08027BC8: +@08027BC8: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _08027BE2 + bne @08027BE2 ldrb r0, [r7, 0x2] bl Window_Remove adds r0, r4, 0 bl remove_task bl script_env_2_enable_and_set_ctx_running -_08027BE2: +@08027BE2: add sp, 0x8 pop {r4-r7} pop {r0} @@ -62339,7 +62339,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 @@ -62404,7 +62404,7 @@ sub_8027BEC: @ 8027BEC mov r2, sp adds r2, 0xC str r2, [sp, 0x1C] -_08027C76: +@08027C76: lsls r4, r6, 2 ldr r0, [sp, 0x1C] ldm r0!, {r1} @@ -62456,7 +62456,7 @@ _08027C76: bl Print adds r6, 0x1 cmp r6, 0x2 - ble _08027C76 + ble @08027C76 adds r0, r7, 0 bl Window_WriteStandardTileMap add sp, 0x20 @@ -62472,7 +62472,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 @@ -62486,16 +62486,16 @@ 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] adds r0, 0x24 ldrb r4, [r0] cmp r4, 0x4 - bhi _08027D66 + bhi @08027D66 ldr r5, =0x082f7b90 -_08027D48: +@08027D48: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 @@ -62509,8 +62509,8 @@ _08027D48: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 - bls _08027D48 -_08027D66: + bls @08027D48 +@08027D66: ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x24 @@ -62518,7 +62518,7 @@ _08027D66: strb r2, [r1] movs r1, 0 mov r12, r0 -_08027D74: +@08027D74: movs r4, 0 mov r2, r12 ldr r0, [r2] @@ -62526,11 +62526,11 @@ _08027D74: adds r5, r1, 0x1 ldrb r0, [r0] cmp r4, r0 - bcs _08027DB2 + bcs @08027DB2 ldr r7, =0x02022c98 lsls r3, r1, 1 ldr r6, =0x082f7b50 -_08027D8A: +@08027D8A: ldr r2, [r7] lsls r0, r4, 1 adds r0, r4 @@ -62550,12 +62550,12 @@ _08027D8A: adds r2, 0x24 ldrb r2, [r2] cmp r4, r2 - bcc _08027D8A -_08027DB2: + bcc @08027D8A +@08027DB2: lsls r0, r5, 24 lsrs r1, r0, 24 cmp r1, 0x3 - bls _08027D74 + bls @08027D74 pop {r4-r7} pop {r0} bx r0 @@ -62564,7 +62564,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 @@ -62589,7 +62589,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 @@ -62600,27 +62600,27 @@ sub_8027DFC: @ 8027DFC movs r0, 0xBC lsls r0, 6 cmp r1, r0 - bne _08027E1E + bne @08027E1E lsls r0, r2, 4 adds r1, r3, 0x2 adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0x1 - beq _08027E28 -_08027E1E: + beq @08027E28 +@08027E1E: movs r0, 0 - b _08027E2A + b @08027E2A .align 2, 0 .pool -_08027E28: +@08027E28: ldrb r0, [r1, 0x4] -_08027E2A: +@08027E2A: pop {r1} bx r1 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 @@ -63033,7 +63033,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 @@ -63057,17 +63057,17 @@ sub_8028164: @ 8028164 movs r0, 0xBC lsls r0, 6 cmp r1, r0 - bne _0802819C + bne @0802819C adds r3, r4, 0x2 ldrb r0, [r4, 0x2] cmp r0, 0x2 - beq _080281A4 -_0802819C: + beq @080281A4 +@0802819C: movs r0, 0 - b _080282DE + b @080282DE .align 2, 0 .pool -_080281A4: +@080281A4: ldrb r0, [r3, 0x1] lsls r0, 28 lsrs r0, 28 @@ -63225,7 +63225,7 @@ _080281A4: ldr r1, [sp, 0x30] str r0, [r1] movs r0, 0x1 -_080282DE: +@080282DE: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -63235,7 +63235,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 @@ -63260,7 +63260,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 @@ -63272,30 +63272,30 @@ sub_8028318: @ 8028318 movs r0, 0xBC lsls r0, 6 cmp r1, r0 - bne _0802833C + bne @0802833C lsls r0, r2, 4 adds r1, r3, 0x2 adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0x3 - beq _08028344 -_0802833C: + beq @08028344 +@0802833C: movs r0, 0 - b _0802834A + b @0802834A .align 2, 0 .pool -_08028344: +@08028344: ldrb r0, [r1, 0x4] strb r0, [r4] movs r0, 0x1 -_0802834A: +@0802834A: pop {r4} pop {r1} bx r1 thumb_func_end sub_8028318 thumb_func_start sub_8028350 -sub_8028350: @ 8028350 +sub_8028350: ; 8028350 push {lr} sub sp, 0x8 ldr r2, =0xffffff00 @@ -63315,7 +63315,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 @@ -63326,27 +63326,27 @@ sub_8028374: @ 8028374 movs r0, 0xBC lsls r0, 6 cmp r1, r0 - bne _08028396 + bne @08028396 lsls r0, r2, 4 adds r1, r3, 0x2 adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0x4 - beq _080283A0 -_08028396: + beq @080283A0 +@08028396: movs r0, 0 - b _080283A2 + b @080283A2 .align 2, 0 .pool -_080283A0: +@080283A0: ldr r0, [r1, 0x4] -_080283A2: +@080283A2: pop {r1} bx r1 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 @@ -63368,14 +63368,14 @@ sub_80283A8: @ 80283A8 adds r1, r4, 0 bl LZ77UnCompWram cmp r4, 0 - beq _080283E8 + beq @080283E8 str r4, [sp] str r5, [sp, 0x4] mov r0, sp bl gpu_tile_obj_alloc_tag_and_copy_to_vram adds r0, r4, 0 bl free -_080283E8: +@080283E8: add r0, sp, 0x8 bl gpu_pal_obj_alloc_tag_and_apply add r0, sp, 0x10 @@ -63389,7 +63389,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} @@ -63459,29 +63459,29 @@ 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] cmp r1, 0x1 - beq _080284BC + beq @080284BC cmp r1, 0x1 - ble _080284C6 + ble @080284C6 cmp r1, 0x2 - beq _080284C2 - b _080284C6 -_080284BC: + beq @080284C2 + b @080284C6 +@080284BC: bl sub_802853C - b _080284C6 -_080284C2: + b @080284C6 +@080284C2: bl sub_80285AC -_080284C6: +@080284C6: pop {r0} bx r0 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 @@ -63509,7 +63509,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 @@ -63537,7 +63537,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] @@ -63550,26 +63550,26 @@ sub_802853C: @ 802853C asrs r1, r0, 1 adds r0, r1, 0 cmp r1, 0 - bge _08028558 + bge @08028558 adds r0, r1, 0x3 -_08028558: +@08028558: asrs r0, 2 lsls r0, 2 subs r0, r1, r0 lsls r0, 24 lsrs r0, 24 cmp r2, 0x2 - ble _080285A2 + ble @080285A2 cmp r0, 0x2 - bgt _0802856E + bgt @0802856E cmp r0, 0x1 - bge _08028572 -_0802856E: + bge @08028572 +@0802856E: movs r0, 0x1 - b _08028574 -_08028572: + b @08028574 +@08028572: movs r0, 0xFF -_08028574: +@08028574: lsls r0, 24 asrs r0, 24 ldrh r1, [r4, 0x20] @@ -63581,7 +63581,7 @@ _08028574: lsls r0, 16 asrs r0, 16 cmp r0, 0x27 - ble _080285A2 + ble @080285A2 movs r0, 0 strh r0, [r4, 0x2E] bl sub_8027650 @@ -63591,7 +63591,7 @@ _08028574: movs r0, 0 bl sub_8028F14 strh r0, [r4, 0x20] -_080285A2: +@080285A2: movs r0, 0 pop {r4} pop {r1} @@ -63599,7 +63599,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] @@ -63613,9 +63613,9 @@ sub_80285AC: @ 80285AC asrs r1, r0, 16 adds r0, r1, 0 cmp r1, 0 - bge _080285CC + bge @080285CC adds r0, r1, 0x3 -_080285CC: +@080285CC: asrs r0, 2 lsls r0, 2 subs r0, r1, r0 @@ -63627,20 +63627,20 @@ _080285CC: bl __modsi3 lsls r0, 16 cmp r0, 0 - bne _080285F0 + bne @080285F0 cmp r4, 0 - beq _080285F0 + beq @080285F0 movs r0, 0xD4 bl audio_play -_080285F0: +@080285F0: movs r1, 0x30 ldrsh r0, [r5, r1] cmp r0, 0x67 - ble _080285FE + ble @080285FE movs r0, 0 strh r0, [r5, 0x2E] movs r4, 0 -_080285FE: +@080285FE: bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 @@ -63653,15 +63653,15 @@ _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 movs r4, 0 cmp r4, r5 - bcs _08028646 + bcs @08028646 ldr r6, =0x02022c9c -_08028622: +@08028622: lsls r0, r4, 2 adds r0, r6 ldr r0, [r0] @@ -63672,15 +63672,15 @@ _08028622: ldr r1, =0x02020630 adds r0, r1 cmp r0, 0 - beq _0802863C + beq @0802863C bl obj_delete_and_free_resources -_0802863C: +@0802863C: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc _08028622 -_08028646: + bcc @08028622 +@08028646: pop {r4-r6} pop {r0} bx r0 @@ -63689,7 +63689,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 @@ -63719,7 +63719,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 @@ -63727,8 +63727,8 @@ sub_802868C: @ 802868C lsrs r5, r1, 24 movs r4, 0 cmp r4, r5 - bcs _080286AE -_0802869C: + bcs @080286AE +@0802869C: adds r0, r6, 0 adds r1, r4, 0 bl sub_8028654 @@ -63736,15 +63736,15 @@ _0802869C: lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc _0802869C -_080286AE: + bcc @0802869C +@080286AE: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_802868C thumb_func_start sub_80286B4 -sub_80286B4: @ 80286B4 +sub_80286B4: ; 80286B4 push {lr} lsls r0, 24 lsls r1, 24 @@ -63767,19 +63767,19 @@ 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 mov r12, r0 movs r6, 0 ldr r5, =0x02022cf4 -_080286F0: +@080286F0: ldr r3, [r5] lsls r1, r4, 1 adds r0, r3, 0 @@ -63806,7 +63806,7 @@ _080286F0: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x9 - bls _080286F0 + bls @080286F0 pop {r4-r7} pop {r0} bx r0 @@ -63815,7 +63815,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 @@ -63832,7 +63832,7 @@ sub_8028734: @ 8028734 adds r1, r6, 0 bl LZ77UnCompWram cmp r6, 0 - beq _080287C4 + beq @080287C4 str r6, [sp, 0x18] add r5, sp, 0x18 movs r0, 0x80 @@ -63854,7 +63854,7 @@ sub_8028734: @ 8028734 add r0, sp, 0x20 bl gpu_pal_obj_alloc_tag_and_apply movs r4, 0 -_0802878A: +@0802878A: lsls r1, r4, 20 movs r0, 0xC0 lsls r0, 14 @@ -63882,8 +63882,8 @@ _0802878A: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x9 - bls _0802878A -_080287C4: + bls @0802878A +@080287C4: adds r0, r6, 0 bl free add sp, 0x28 @@ -63895,10 +63895,10 @@ _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: +@080287E8: ldr r5, =0x02022cf4 ldr r0, [r5] lsls r1, r4, 1 @@ -63911,14 +63911,14 @@ _080287E8: ldr r1, =0x02020630 adds r0, r1 cmp r0, 0 - beq _08028806 + beq @08028806 bl obj_delete_and_free_resources -_08028806: +@08028806: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x9 - bls _080287E8 + bls @080287E8 ldr r0, [r5] bl free movs r0, 0 @@ -63931,7 +63931,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 @@ -63941,7 +63941,7 @@ sub_8028828: @ 8028828 movs r6, 0 ldr r0, =0x02022cf4 mov r9, r0 -_0802883A: +@0802883A: mov r7, r9 ldr r2, [r7] lsls r5, r6, 1 @@ -63964,19 +63964,19 @@ _0802883A: adds r2, r0, r6 ldrb r1, [r2] cmp r1, 0 - beq _08028870 + beq @08028870 movs r7, 0x22 ldrsh r0, [r4, r7] cmp r0, 0x8 - beq _080288A6 -_08028870: + beq @080288A6 +@08028870: movs r3, 0x1 movs r7, 0x22 ldrsh r0, [r4, r7] cmp r0, 0x8 - bne _08028896 + bne @08028896 cmp r1, 0 - bne _080288A6 + bne @080288A6 strb r3, [r2] mov r1, r9 ldr r0, [r1] @@ -63988,7 +63988,7 @@ _08028870: str r3, [sp] bl audio_play ldr r3, [sp] -_08028896: +@08028896: mov r7, r9 ldr r0, [r7] adds r0, 0x16 @@ -63997,21 +63997,21 @@ _08028896: ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] -_080288A6: +@080288A6: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x9 - bls _0802883A + bls @0802883A cmp r3, 0 - bne _080288C4 + bne @080288C4 movs r0, 0x1 - b _080288C6 + b @080288C6 .align 2, 0 .pool -_080288C4: +@080288C4: movs r0, 0 -_080288C6: +@080288C6: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -64022,14 +64022,14 @@ _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 cmp r5, 0xA - bls _08028910 + bls @08028910 movs r4, 0 -_080288E0: +@080288E0: ldr r0, =0x02022cf4 ldr r0, [r0] lsls r1, r4, 1 @@ -64047,20 +64047,20 @@ _080288E0: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x9 - bls _080288E0 - b _080289DA + bls @080288E0 + b @080289DA .align 2, 0 .pool -_08028910: +@08028910: movs r4, 0 movs r0, 0xA subs r0, r5 cmp r4, r0 - bge _080289D6 + bge @080289D6 ldr r6, =0x02020630 -_0802891C: +@0802891C: cmp r5, 0x6 - bls _08028984 + bls @08028984 ldr r0, =0x02022cf4 ldr r2, [r0] ldr r1, =0x0000fffa @@ -64073,14 +64073,14 @@ _0802891C: lsls r0, 16 lsrs r0, 16 cmp r0, 0x1E - bls _0802894C + bls @0802894C strh r1, [r2, 0x3E] - b _0802899E + b @0802899E .align 2, 0 .pool -_0802894C: +@0802894C: cmp r0, 0xA - bls _0802896A + bls @0802896A lsls r1, r4, 1 adds r0, r2, 0 adds r0, 0x2A @@ -64092,8 +64092,8 @@ _0802894C: adds r0, r6 movs r1, 0x2 bl obj_anim_image_start - b _0802899E -_0802896A: + b @0802899E +@0802896A: lsls r1, r4, 1 adds r0, r2, 0 adds r0, 0x2A @@ -64105,8 +64105,8 @@ _0802896A: adds r0, r6 movs r1, 0 bl obj_anim_image_start - b _0802899E -_08028984: + b @0802899E +@08028984: ldr r0, =0x02022cf4 ldr r0, [r0] lsls r1, r4, 1 @@ -64119,18 +64119,18 @@ _08028984: adds r0, r6 movs r1, 0 bl obj_anim_image_start -_0802899E: +@0802899E: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 movs r0, 0xA subs r0, r5 cmp r4, r0 - blt _0802891C - b _080289D6 + blt @0802891C + b @080289D6 .align 2, 0 .pool -_080289B4: +@080289B4: ldr r0, =0x02022cf4 ldr r0, [r0] lsls r1, r4, 1 @@ -64147,10 +64147,10 @@ _080289B4: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_080289D6: +@080289D6: cmp r4, 0x9 - bls _080289B4 -_080289DA: + bls @080289B4 +@080289DA: pop {r4-r6} pop {r0} bx r0 @@ -64159,7 +64159,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 @@ -64171,7 +64171,7 @@ sub_80289E8: @ 80289E8 movs r6, 0x5 negs r6, r6 ldr r5, =0x02022cf4 -_080289FE: +@080289FE: ldr r0, [r5] lsls r1, r3, 1 adds r0, 0x2A @@ -64191,7 +64191,7 @@ _080289FE: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x9 - bls _080289FE + bls @080289FE pop {r4-r7} pop {r0} bx r0 @@ -64200,7 +64200,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 @@ -64217,7 +64217,7 @@ sub_8028A34: @ 8028A34 adds r1, r4, 0 bl LZ77UnCompWram cmp r4, 0 - beq _08028A6A + beq @08028A6A str r4, [sp] movs r0, 0x80 lsls r0, 10 @@ -64225,7 +64225,7 @@ sub_8028A34: @ 8028A34 str r0, [sp, 0x4] mov r0, sp bl gpu_tile_obj_alloc_tag_and_copy_to_vram -_08028A6A: +@08028A6A: add r0, sp, 0x8 bl gpu_pal_obj_alloc_tag_and_apply adds r0, r4, 0 @@ -64239,7 +64239,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 @@ -64260,7 +64260,7 @@ sub_8028A88: @ 8028A88 stm r1!, {r3-r5} movs r5, 0 mov r9, r2 -_08028AB0: +@08028AB0: movs r0, 0x4 bl malloc_and_clear ldr r1, =0x02022cb8 @@ -64285,12 +64285,12 @@ _08028AB0: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0xA - bls _08028AB0 + bls @08028AB0 movs r5, 0 ldr r7, =0x02022ce4 ldr r4, =0x082fb31c mov r8, r4 -_08028AF0: +@08028AF0: movs r0, 0x4 bl malloc_and_clear lsls r1, r5, 2 @@ -64298,7 +64298,7 @@ _08028AF0: str r0, [r4] adds r6, r1, 0 cmp r5, 0x3 - bne _08028B2C + bne @08028B2C mov r0, r8 movs r2, 0x6 ldrsh r1, [r0, r2] @@ -64307,10 +64307,10 @@ _08028AF0: movs r3, 0 bl obj_add_from_template_forward_search ldr r1, [r7, 0xC] - b _08028B40 + b @08028B40 .align 2, 0 .pool -_08028B2C: +@08028B2C: lsls r0, r5, 1 add r0, r8 movs r3, 0 @@ -64320,7 +64320,7 @@ _08028B2C: movs r3, 0 bl obj_add_from_template_forward_search ldr r1, [r4] -_08028B40: +@08028B40: lsls r0, 24 lsrs r0, 24 strh r0, [r1] @@ -64338,7 +64338,7 @@ _08028B40: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _08028AF0 + bls @08028AF0 movs r0, 0x1 bl sub_8028C30 add sp, 0x30 @@ -64353,11 +64353,11 @@ _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 -_08028B86: +@08028B86: lsls r0, r5, 2 adds r4, r0, r6 ldr r0, [r4] @@ -64368,9 +64368,9 @@ _08028B86: ldr r1, =0x02020630 adds r0, r1 cmp r0, 0 - beq _08028BA0 + beq @08028BA0 bl obj_delete_and_free_tiles -_08028BA0: +@08028BA0: ldr r0, [r4] bl free movs r0, 0 @@ -64379,10 +64379,10 @@ _08028BA0: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0xA - bls _08028B86 + bls @08028B86 movs r5, 0 ldr r6, =0x02022ce4 -_08028BB8: +@08028BB8: lsls r0, r5, 2 adds r4, r0, r6 ldr r0, [r4] @@ -64393,9 +64393,9 @@ _08028BB8: ldr r1, =0x02020630 adds r0, r1 cmp r0, 0 - beq _08028BD2 + beq @08028BD2 bl obj_delete_and_free_tiles -_08028BD2: +@08028BD2: ldr r0, [r4] bl free movs r0, 0 @@ -64404,7 +64404,7 @@ _08028BD2: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _08028BB8 + bls @08028BB8 pop {r4-r6} pop {r0} bx r0 @@ -64413,7 +64413,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 @@ -64443,7 +64443,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 @@ -64455,7 +64455,7 @@ sub_8028C30: @ 8028C30 lsls r4, r0, 2 movs r5, 0x5 negs r5, r5 -_08028C46: +@08028C46: lsls r0, r3, 2 adds r0, r6 ldr r0, [r0] @@ -64474,7 +64474,7 @@ _08028C46: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3 - bls _08028C46 + bls @08028C46 pop {r4-r7} pop {r0} bx r0 @@ -64483,7 +64483,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 @@ -64504,7 +64504,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 @@ -64527,7 +64527,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 @@ -64548,19 +64548,19 @@ 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 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x1 - beq _08028D36 + beq @08028D36 movs r3, 0 ldr r7, =0x082fb354 ldr r6, =0x02022cb0 movs r5, 0 -_08028D0A: +@08028D0A: lsls r0, r3, 2 adds r2, r0, r6 ldr r1, [r2] @@ -64572,19 +64572,19 @@ _08028D0A: lsrs r0, 16 ldrb r1, [r1] cmp r0, r1 - bls _08028D2C + bls @08028D2C ldrh r0, [r4, 0x20] subs r0, 0x1 strh r0, [r4, 0x20] ldr r0, [r2] strh r5, [r0, 0x2] -_08028D2C: +@08028D2C: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x1 - bls _08028D0A -_08028D36: + bls @08028D0A +@08028D36: pop {r4-r7} pop {r0} bx r0 @@ -64593,7 +64593,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 @@ -64613,7 +64613,7 @@ sub_8028D44: @ 8028D44 adds r1, r6, 0 bl LZ77UnCompWram cmp r6, 0 - beq _08028DD2 + beq @08028DD2 str r6, [sp, 0x18] add r0, sp, 0x18 movs r1, 0xA0 @@ -64635,7 +64635,7 @@ sub_8028D44: @ 8028D44 mov r9, r0 ldr r1, =0x02022cb0 mov r8, r1 -_08028D9E: +@08028D9E: movs r0, 0x4 bl malloc_and_clear lsls r2, r5, 2 @@ -64659,8 +64659,8 @@ _08028D9E: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x1 - bls _08028D9E -_08028DD2: + bls @08028D9E +@08028DD2: adds r0, r6, 0 bl free add sp, 0x28 @@ -64675,7 +64675,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 @@ -64684,7 +64684,7 @@ sub_8028DFC: @ 8028DFC adds r7, r4, 0x2 ldr r6, =0x02020630 movs r5, 0x1 -_08028E0C: +@08028E0C: lsls r2, r3, 2 mov r1, r12 adds r0, r2, r1 @@ -64707,7 +64707,7 @@ _08028E0C: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x1 - bls _08028E0C + bls @08028E0C pop {r4-r7} pop {r0} bx r0 @@ -64716,13 +64716,13 @@ _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 ldr r4, =0x02020630 movs r3, 0 -_08028E56: +@08028E56: lsls r0, r2, 2 adds r0, r5 ldr r0, [r0] @@ -64737,7 +64737,7 @@ _08028E56: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x1 - bls _08028E56 + bls @08028E56 pop {r4,r5} pop {r0} bx r0 @@ -64746,11 +64746,11 @@ _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 -_08028E8A: +@08028E8A: lsls r0, r5, 2 adds r4, r0, r6 ldr r0, [r4] @@ -64761,9 +64761,9 @@ _08028E8A: ldr r1, =0x02020630 adds r0, r1 cmp r0, 0 - beq _08028EA4 + beq @08028EA4 bl obj_delete_and_free_tiles -_08028EA4: +@08028EA4: ldr r0, [r4] bl free movs r0, 0 @@ -64772,7 +64772,7 @@ _08028EA4: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x1 - bls _08028E8A + bls @08028E8A pop {r4-r6} pop {r0} bx r0 @@ -64781,7 +64781,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 @@ -64793,7 +64793,7 @@ sub_8028EC8: @ 8028EC8 lsls r4, r0, 2 movs r5, 0x5 negs r5, r5 -_08028EDE: +@08028EDE: lsls r0, r3, 2 adds r0, r6 ldr r0, [r0] @@ -64812,7 +64812,7 @@ _08028EDE: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x1 - bls _08028EDE + bls @08028EDE pop {r4-r7} pop {r0} bx r0 @@ -64821,7 +64821,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 @@ -64830,107 +64830,107 @@ sub_8028F14: @ 8028F14 movs r3, 0 subs r0, r1, 0x1 cmp r0, 0x4 - bhi _08028FC6 + bhi @08028FC6 lsls r0, 2 - ldr r1, =_08028F34 + ldr r1, =@08028F34 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08028F34: - .4byte _08028FB4 - .4byte _08028F48 - .4byte _08028F52 - .4byte _08028F66 - .4byte _08028F8E -_08028F48: +@08028F34: + .4byte @08028FB4 + .4byte @08028F48 + .4byte @08028F52 + .4byte @08028F66 + .4byte @08028F8E +@08028F48: cmp r2, 0 - beq _08028F7E + beq @08028F7E cmp r2, 0x1 - bne _08028FC6 - b _08028F82 -_08028F52: + bne @08028FC6 + b @08028F82 +@08028F52: cmp r2, 0x1 - beq _08028FB8 + beq @08028FB8 cmp r2, 0x1 - bgt _08028F60 + bgt @08028F60 cmp r2, 0 - beq _08028FB4 - b _08028FC6 -_08028F60: + beq @08028FB4 + b @08028FC6 +@08028F60: cmp r2, 0x2 - bne _08028FC6 - b _08028FC4 -_08028F66: + bne @08028FC6 + b @08028FC4 +@08028F66: cmp r2, 0x1 - beq _08028F82 + beq @08028F82 cmp r2, 0x1 - bgt _08028F74 + bgt @08028F74 cmp r2, 0 - beq _08028F7E - b _08028FC6 -_08028F74: + beq @08028F7E + b @08028FC6 +@08028F74: cmp r2, 0x2 - beq _08028F86 + beq @08028F86 cmp r2, 0x3 - beq _08028F8A - b _08028FC6 -_08028F7E: + beq @08028F8A + b @08028FC6 +@08028F7E: movs r3, 0xC - b _08028FC6 -_08028F82: + b @08028FC6 +@08028F82: movs r3, 0x12 - b _08028FC6 -_08028F86: + b @08028FC6 +@08028F86: movs r3, 0x18 - b _08028FC6 -_08028F8A: + b @08028FC6 +@08028F8A: movs r3, 0x6 - b _08028FC6 -_08028F8E: + b @08028FC6 +@08028F8E: cmp r2, 0x4 - bhi _08028FC6 + bhi @08028FC6 lsls r0, r2, 2 - ldr r1, =_08028FA0 + ldr r1, =@08028FA0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08028FA0: - .4byte _08028FB4 - .4byte _08028FB8 - .4byte _08028FBC - .4byte _08028FC0 - .4byte _08028FC4 -_08028FB4: +@08028FA0: + .4byte @08028FB4 + .4byte @08028FB8 + .4byte @08028FBC + .4byte @08028FC0 + .4byte @08028FC4 +@08028FB4: movs r3, 0xF - b _08028FC6 -_08028FB8: + b @08028FC6 +@08028FB8: movs r3, 0x15 - b _08028FC6 -_08028FBC: + b @08028FC6 +@08028FBC: movs r3, 0x1B - b _08028FC6 -_08028FC0: + b @08028FC6 +@08028FC0: movs r3, 0x3 - b _08028FC6 -_08028FC4: + b @08028FC6 +@08028FC4: movs r3, 0x9 -_08028FC6: +@08028FC6: lsls r0, r3, 3 pop {r1} bx r1 thumb_func_end sub_8028F14 thumb_func_start sub_8028FCC -sub_8028FCC: @ 8028FCC +sub_8028FCC: ; 8028FCC push {r4,lr} movs r4, 0 -_08028FD0: +@08028FD0: adds r0, r4, 0 movs r1, 0x1 bl sub_8028BF8 @@ -64941,7 +64941,7 @@ _08028FD0: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xA - bls _08028FD0 + bls @08028FD0 movs r0, 0 bl sub_80289E8 pop {r4} @@ -64950,7 +64950,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 @@ -64975,7 +64975,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 @@ -64986,7 +64986,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 @@ -65015,7 +65015,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 @@ -65138,7 +65138,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 @@ -65261,7 +65261,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] @@ -65301,7 +65301,7 @@ sub_8029274: @ 8029274 thumb_func_end sub_8029274 thumb_func_start sub_80292D4 -sub_80292D4: @ 80292D4 +sub_80292D4: ; 80292D4 push {lr} bl Window_FreeMemory pop {r0} @@ -65309,28 +65309,28 @@ 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 movs r4, 0 ldr r5, =0x082fb40c adds r7, r5, 0x4 -_080292EC: +@080292EC: lsls r1, r4, 3 adds r0, r1, r5 ldrb r0, [r0] cmp r0, r6 - bne _080292FE + bne @080292FE adds r0, r1, r7 ldr r0, [r0] bl sub_802A72C -_080292FE: +@080292FE: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x9 - bls _080292EC + bls @080292EC pop {r4-r7} pop {r0} bx r0 @@ -65339,7 +65339,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] @@ -65348,10 +65348,10 @@ sub_8029314: @ 8029314 adds r0, r1 ldr r0, [r0] cmp r0, 0 - bne _0802932E + bne @0802932E bl sub_802A75C bl _call_via_r0 -_0802932E: +@0802932E: pop {r0} bx r0 .align 2, 0 @@ -65359,7 +65359,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] @@ -65367,36 +65367,36 @@ sub_8029338: @ 8029338 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x4 - bhi _08029430 + bhi @08029430 lsls r0, 2 - ldr r1, =_08029360 + ldr r1, =@08029360 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08029360: - .4byte _08029374 - .4byte _0802937A - .4byte _08029394 - .4byte _080293D8 - .4byte _08029404 -_08029374: +@08029360: + .4byte @08029374 + .4byte @0802937A + .4byte @08029394 + .4byte @080293D8 + .4byte @08029404 +@08029374: bl sub_802A7A8 - b _08029414 -_0802937A: + b @08029414 +@0802937A: bl sub_802A8E8 cmp r0, 0x1 - bne _0802943A + bne @0802943A ldr r0, =0x02022cf8 ldr r1, [r0] ldr r2, =0x00003014 adds r1, r2 - b _0802941C + b @0802941C .align 2, 0 .pool -_08029394: +@08029394: ldr r1, =0x082faad8 movs r0, 0x3 movs r2, 0 @@ -65418,10 +65418,10 @@ _08029394: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x2 bl gpu_copy_wram_bg_tilemap_to_vram - b _08029414 + b @08029414 .align 2, 0 .pool -_080293D8: +@080293D8: movs r0, 0 bl gpu_sync_bg_show movs r0, 0x3 @@ -65434,41 +65434,41 @@ _080293D8: ldr r1, [r0] ldr r2, =0x00003014 adds r1, r2 - b _0802941C + b @0802941C .align 2, 0 .pool -_08029404: +@08029404: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x14] lsrs r0, 3 bl sub_8028FF8 bl sub_802902C -_08029414: +@08029414: ldr r0, =0x02022cf8 ldr r1, [r0] ldr r0, =0x00003014 adds r1, r0 -_0802941C: +@0802941C: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0802943A + b @0802943A .align 2, 0 .pool -_08029430: +@08029430: movs r2, 0xC0 lsls r2, 6 adds r1, r2 movs r0, 0x1 str r0, [r1] -_0802943A: +@0802943A: pop {r0} bx r0 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 @@ -65481,31 +65481,31 @@ sub_8029440: @ 8029440 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0 - beq _08029488 + beq @08029488 cmp r0, 0x1 - bne _08029460 - b _080295EC -_08029460: + bne @08029460 + b @080295EC +@08029460: adds r0, 0x1 strb r0, [r1] lsls r0, 24 lsrs r0, 24 cmp r0, 0xB4 - bhi _0802946E - b _0802968E -_0802946E: + bhi @0802946E + b @0802968E +@0802946E: bl sub_8027650 lsls r0, 24 lsrs r7, r0, 24 movs r6, 0 cmp r6, r7 - bcc _0802947E - b _08029666 -_0802947E: - b _08029640 + bcc @0802947E + b @08029666 +@0802947E: + b @08029640 .align 2, 0 .pool -_08029488: +@08029488: bl sub_8027650 lsls r0, 24 lsrs r7, r0, 24 @@ -65540,14 +65540,14 @@ _08029488: str r0, [sp, 0x10] movs r6, 0 cmp r6, r7 - bcs _080295B8 + bcs @080295B8 mov r3, sp adds r3, 0xC str r3, [sp, 0x18] mov r10, r4 ldr r0, =0x00003008 mov r9, r0 -_080294DC: +@080294DC: movs r1, 0 mov r8, r1 adds r0, r6, 0 @@ -65601,10 +65601,10 @@ _080294DC: lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bne _0802955A + bne @0802955A movs r0, 0x2 mov r8, r0 -_0802955A: +@0802955A: adds r0, r4, 0 bl sub_8027660 adds r4, r0, 0 @@ -65647,27 +65647,27 @@ _0802955A: lsls r0, 24 lsrs r6, r0, 24 cmp r6, r7 - bcc _080294DC -_080295B8: + bcc @080294DC +@080295B8: ldr r0, =0x02022cf8 ldr r1, [r0] ldr r0, =0x00003014 adds r1, r0 - b _0802962A + b @0802962A .align 2, 0 .pool -_080295EC: +@080295EC: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802968E + bne @0802968E bl sub_8027650 lsls r0, 24 lsrs r7, r0, 24 movs r6, 0 cmp r6, r7 - bcs _0802961C -_08029604: + bcs @0802961C +@08029604: ldr r0, [r4] ldr r1, =0x00003008 adds r0, r1 @@ -65678,22 +65678,22 @@ _08029604: lsls r0, 24 lsrs r6, r0, 24 cmp r6, r7 - bcc _08029604 -_0802961C: + bcc @08029604 +@0802961C: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram ldr r0, =0x02022cf8 ldr r1, [r0] ldr r2, =0x00003014 adds r1, r2 -_0802962A: +@0802962A: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0802968E + b @0802968E .align 2, 0 .pool -_08029640: +@08029640: ldr r5, =0x02022cf8 ldr r0, [r5] ldr r4, =0x00003008 @@ -65710,8 +65710,8 @@ _08029640: lsls r0, 24 lsrs r6, r0, 24 cmp r6, r7 - bcc _08029640 -_08029666: + bcc @08029640 +@08029666: movs r0, 0x1E str r0, [sp] movs r0, 0x14 @@ -65730,7 +65730,7 @@ _08029666: adds r0, r3 movs r1, 0x1 str r1, [r0] -_0802968E: +@0802968E: add sp, 0x1C pop {r3-r5} mov r8, r3 @@ -65744,7 +65744,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 @@ -65763,9 +65763,9 @@ sub_80296A8: @ 80296A8 bl memcpy movs r5, 0 cmp r5, r7 - bcs _080296F8 + bcs @080296F8 add r4, sp, 0x34 -_080296D2: +@080296D2: mov r0, sp adds r0, r5 adds r0, 0x2C @@ -65783,61 +65783,61 @@ _080296D2: lsls r0, 24 lsrs r5, r0, 24 cmp r5, r7 - bcc _080296D2 -_080296F8: + bcc @080296D2 +@080296F8: bl sub_8027748 cmp r0, 0 - beq _0802972E -_08029700: + beq @0802972E +@08029700: movs r5, 0 cmp r5, r7 - bcs _08029728 + bcs @08029728 add r2, sp, 0x34 add r1, sp, 0x2C -_0802970A: +@0802970A: lsls r0, r5, 3 adds r0, r2, r0 ldrb r0, [r0] cmp r0, r8 - bne _0802971E + bne @0802971E adds r0, r1, r6 strb r5, [r0] adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_0802971E: +@0802971E: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, r7 - bcc _0802970A -_08029728: + bcc @0802970A +@08029728: mov r8, r6 cmp r6, r7 - bcc _08029700 -_0802972E: + bcc @08029700 +@0802972E: movs r5, 0 ldr r4, =0x085ede5d cmp r5, r7 - bcs _08029754 + bcs @08029754 add r1, sp, 0x34 add r6, sp, 0x38 subs r3, r7, 0x1 -_0802973C: +@0802973C: lsls r2, r5, 3 adds r0, r6, r2 ldr r0, [r0] cmp r0, 0 - bne _0802974A + bne @0802974A adds r0, r1, r2 strb r3, [r0] -_0802974A: +@0802974A: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, r7 - bcc _0802973C -_08029754: + bcc @0802973C +@08029754: movs r0, 0x1 adds r1, r4, 0 movs r2, 0 @@ -65847,13 +65847,13 @@ _08029754: str r1, [sp, 0x64] movs r5, 0 cmp r5, r7 - bcs _08029860 + bcs @08029860 mov r2, sp adds r2, 0x34 str r2, [sp, 0x68] ldr r3, =0x00003009 mov r10, r3 -_08029774: +@08029774: movs r0, 0 mov r8, r0 mov r0, sp @@ -65893,10 +65893,10 @@ _08029774: lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bne _080297CC + bne @080297CC movs r0, 0x2 mov r8, r0 -_080297CC: +@080297CC: adds r0, r4, 0 bl sub_8027660 adds r3, r0, 0 @@ -65964,8 +65964,8 @@ _080297CC: lsls r0, 24 lsrs r5, r0, 24 cmp r5, r7 - bcc _08029774 -_08029860: + bcc @08029774 +@08029860: add sp, 0x6C pop {r3-r5} mov r8, r3 @@ -65979,7 +65979,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 @@ -65996,31 +65996,31 @@ sub_802988C: @ 802988C adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0xB - bls _080298B2 - b _08029FA8 -_080298B2: + bls @080298B2 + b @08029FA8 +@080298B2: lsls r0, 2 - ldr r1, =_080298C8 + ldr r1, =@080298C8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080298C8: - .4byte _080298F8 - .4byte _08029914 - .4byte _0802996C - .4byte _08029B6C - .4byte _08029BB8 - .4byte _08029BFC - .4byte _08029C60 - .4byte _08029C9C - .4byte _08029CE0 - .4byte _08029DA0 - .4byte _08029F08 - .4byte _08029F5C -_080298F8: +@080298C8: + .4byte @080298F8 + .4byte @08029914 + .4byte @0802996C + .4byte @08029B6C + .4byte @08029BB8 + .4byte @08029BFC + .4byte @08029C60 + .4byte @08029C9C + .4byte @08029CE0 + .4byte @08029DA0 + .4byte @08029F08 + .4byte @08029F5C +@080298F8: bl sub_802784C ldr r0, =0x02022cf8 ldr r1, [r0] @@ -66028,10 +66028,10 @@ _080298F8: adds r2, r1, r0 movs r0, 0 strh r0, [r2] - b _08029F8A + b @08029F8A .align 2, 0 .pool -_08029914: +@08029914: ldr r6, =0x082f7bbc adds r0, r6, 0 bl Window_AddFromTemplate @@ -66061,10 +66061,10 @@ _08029914: bl sub_8029174 mov r0, r9 bl sub_8029174 - b _08029F88 + b @08029F88 .align 2, 0 .pool -_0802996C: +@0802996C: ldr r4, =0x02022cf8 ldr r0, [r4] ldr r5, =0x00003008 @@ -66117,17 +66117,17 @@ _0802996C: mov r9, r5 ldr r0, [sp, 0xC] cmp r9, r0 - bcc _080299E2 - b _08029B2A -_080299E2: + bcc @080299E2 + b @08029B2A +@080299E2: movs r4, 0 bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 cmp r9, r0 - bne _080299F2 + bne @080299F2 movs r4, 0x2 -_080299F2: +@080299F2: mov r0, r9 bl sub_8027660 adds r6, r0, 0 @@ -66160,7 +66160,7 @@ _080299F2: str r0, [sp, 0x10] ldr r1, =0x02021fc4 mov r10, r1 -_08029A36: +@08029A36: mov r0, r9 adds r1, r7, 0 bl sub_80276A0 @@ -66189,9 +66189,9 @@ _08029A36: bl font_get_width_of_string adds r5, r0, 0 cmp r6, r4 - bne _08029AE0 + bne @08029AE0 cmp r6, 0 - beq _08029AE0 + beq @08029AE0 ldr r0, =0x02022cf8 ldr r0, [r0] ldr r2, =0x00003009 @@ -66216,10 +66216,10 @@ _08029A36: str r1, [sp, 0x8] movs r1, 0x1 bl box_print - b _08029B10 + b @08029B10 .align 2, 0 .pool -_08029AE0: +@08029AE0: ldr r0, =0x02022cf8 ldr r0, [r0] ldr r2, =0x00003009 @@ -66243,21 +66243,21 @@ _08029AE0: movs r1, 0x1 ldr r2, =0x02021fc4 bl Print -_08029B10: +@08029B10: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x3 - bls _08029A36 + bls @08029A36 ldr r1, [sp, 0x10] lsls r0, r1, 24 lsrs r0, 24 mov r9, r0 ldr r2, [sp, 0xC] cmp r9, r2 - bcs _08029B2A - b _080299E2 -_08029B2A: + bcs @08029B2A + b @080299E2 +@08029B2A: ldr r4, =0x02022cf8 ldr r0, [r4] ldr r1, =0x00003008 @@ -66274,14 +66274,14 @@ _08029B2A: ldr r1, [r4] ldr r0, =0x00003014 adds r1, r0 - b _08029F8E + b @08029F8E .align 2, 0 .pool -_08029B6C: +@08029B6C: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _08029B90 + bne @08029B90 ldr r4, =0x02022cf8 ldr r0, [r4] ldr r1, =0x00003008 @@ -66293,7 +66293,7 @@ _08029B6C: adds r0, r2 ldrb r0, [r0] bl Window_WriteStandardTileMap -_08029B90: +@08029B90: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0 @@ -66302,10 +66302,10 @@ _08029B90: ldr r1, [r0] ldr r0, =0x00003014 adds r1, r0 - b _08029F8E + b @08029F8E .align 2, 0 .pool -_08029BB8: +@08029BB8: ldr r4, =0x02022cf8 ldr r0, [r4] ldr r1, =0x0000301c @@ -66316,27 +66316,27 @@ _08029BB8: lsls r0, 16 lsrs r0, 16 cmp r0, 0x1D - bhi _08029BD0 - b _08029FF8 -_08029BD0: + bhi @08029BD0 + b @08029FF8 +@08029BD0: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _08029BDE - b _08029FF8 -_08029BDE: + bne @08029BDE + b @08029FF8 +@08029BDE: movs r0, 0 strh r0, [r2] movs r0, 0x5 bl audio_play movs r0, 0x1 bl sub_8028C30 - b _08029F88 + b @08029F88 .align 2, 0 .pool -_08029BFC: +@08029BFC: ldr r4, =0x02022cf8 ldr r0, [r4] ldr r5, =0x00003008 @@ -66374,10 +66374,10 @@ _08029BFC: movs r1, 0x1 adds r2, r6, 0 bl Print - b _08029F88 + b @08029F88 .align 2, 0 .pool -_08029C60: +@08029C60: ldr r0, [sp, 0xC] bl sub_80296A8 ldr r4, =0x02022cf8 @@ -66396,14 +66396,14 @@ _08029C60: ldr r1, [r4] ldr r0, =0x00003014 adds r1, r0 - b _08029F8E + b @08029F8E .align 2, 0 .pool -_08029C9C: +@08029C9C: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _08029CC0 + bne @08029CC0 ldr r4, =0x02022cf8 ldr r0, [r4] ldr r1, =0x00003008 @@ -66415,17 +66415,17 @@ _08029C9C: adds r0, r2 ldrb r0, [r0] bl Window_WriteStandardTileMap -_08029CC0: +@08029CC0: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram ldr r0, =0x02022cf8 ldr r1, [r0] ldr r0, =0x00003014 adds r1, r0 - b _08029F8E + b @08029F8E .align 2, 0 .pool -_08029CE0: +@08029CE0: ldr r4, =0x02022cf8 ldr r0, [r4] ldr r1, =0x0000301c @@ -66436,17 +66436,17 @@ _08029CE0: lsls r0, 16 lsrs r0, 16 cmp r0, 0x1D - bhi _08029CF8 - b _08029FF8 -_08029CF8: + bhi @08029CF8 + b @08029FF8 +@08029CF8: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _08029D06 - b _08029FF8 -_08029D06: + bne @08029D06 + b @08029FF8 +@08029D06: movs r0, 0 strh r0, [r2] movs r0, 0x5 @@ -66454,16 +66454,16 @@ _08029D06: bl sub_8027748 ldr r1, =0x00000bb7 cmp r0, r1 - bhi _08029D3C + bhi @08029D3C ldr r0, [r4] ldr r2, =0x00003014 adds r0, r2 movs r1, 0x7F strb r1, [r0] - b _08029D4C + b @08029D4C .align 2, 0 .pool -_08029D3C: +@08029D3C: bl sub_80A2F30 ldr r1, [r4] ldr r0, =0x00003014 @@ -66471,7 +66471,7 @@ _08029D3C: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_08029D4C: +@08029D4C: movs r0, 0x1E str r0, [sp] movs r0, 0xF @@ -66499,10 +66499,10 @@ _08029D4C: bl Window_FillTileMap adds r0, r6, 0 bl sub_8029174 - b _08029FF8 + b @08029FF8 .align 2, 0 .pool -_08029DA0: +@08029DA0: ldr r0, =0x0000016f bl current_map_music_set ldr r4, =0x02022cf8 @@ -66576,9 +66576,9 @@ _08029DA0: lsrs r4, r0, 24 adds r6, r4, 0 cmp r4, 0 - beq _08029EC8 + beq @08029EC8 cmp r4, 0x3 - beq _08029EC8 + beq @08029EC8 bl sub_81AFBF0 bl sub_802762C lsls r0, 16 @@ -66589,20 +66589,20 @@ _08029DA0: adds r1, r5, 0 bl sub_81AFC0C cmp r4, 0x2 - bne _08029E9C + bne @08029E9C ldr r1, =0x085edde2 adds r0, r7, 0 bl sub_81AFC28 - b _08029EA8 + b @08029EA8 .align 2, 0 .pool -_08029E9C: +@08029E9C: cmp r6, 0x1 - bne _08029EA8 + bne @08029EA8 ldr r1, =0x085eddfb adds r0, r7, 0 bl sub_81AFC28 -_08029EA8: +@08029EA8: ldr r0, =0x02022cf8 ldr r0, [r0] ldr r2, =0x00003009 @@ -66618,7 +66618,7 @@ _08029EA8: movs r1, 0x1 movs r3, 0 bl Print -_08029EC8: +@08029EC8: ldr r4, =0x02022cf8 ldr r0, [r4] ldr r1, =0x00003008 @@ -66635,14 +66635,14 @@ _08029EC8: ldr r1, [r4] ldr r0, =0x00003014 adds r1, r0 - b _08029F8E + b @08029F8E .align 2, 0 .pool -_08029F08: +@08029F08: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _08029F2C + bne @08029F2C ldr r4, =0x02022cf8 ldr r0, [r4] ldr r1, =0x00003008 @@ -66654,7 +66654,7 @@ _08029F08: adds r0, r2 ldrb r0, [r0] bl Window_WriteStandardTileMap -_08029F2C: +@08029F2C: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram ldr r0, =0x0000020b @@ -66665,10 +66665,10 @@ _08029F2C: ldr r1, [r0] ldr r0, =0x00003014 adds r1, r0 - b _08029F8E + b @08029F8E .align 2, 0 .pool -_08029F5C: +@08029F5C: ldr r4, =0x02022cf8 ldr r0, [r4] ldr r1, =0x0000301c @@ -66679,30 +66679,30 @@ _08029F5C: lsls r0, 16 lsrs r0, 16 cmp r0, 0x1D - bls _08029FF8 + bls @08029FF8 ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08029FF8 + beq @08029FF8 movs r0, 0 strh r0, [r2] movs r0, 0x5 bl audio_play -_08029F88: +@08029F88: ldr r1, [r4] -_08029F8A: +@08029F8A: ldr r2, =0x00003014 adds r1, r2 -_08029F8E: +@08029F8E: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08029FF8 + b @08029FF8 .align 2, 0 .pool -_08029FA8: +@08029FA8: ldr r5, =0x00003008 adds r0, r1, r5 ldrb r0, [r0] @@ -66737,7 +66737,7 @@ _08029FA8: adds r0, r1 movs r1, 0x1 str r1, [r0] -_08029FF8: +@08029FF8: add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -66751,7 +66751,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 @@ -66765,25 +66765,25 @@ sub_802A010: @ 802A010 ldrb r6, [r0] adds r7, r1, 0 cmp r6, 0x1 - beq _0802A0CC + beq @0802A0CC cmp r6, 0x1 - bgt _0802A040 + bgt @0802A040 cmp r6, 0 - beq _0802A04E - b _0802A2FC + beq @0802A04E + b @0802A2FC .align 2, 0 .pool -_0802A040: +@0802A040: cmp r6, 0x2 - bne _0802A046 - b _0802A194 -_0802A046: + bne @0802A046 + b @0802A194 +@0802A046: cmp r6, 0x3 - bne _0802A04C - b _0802A1D0 -_0802A04C: - b _0802A2FC -_0802A04E: + bne @0802A04C + b @0802A1D0 +@0802A04C: + b @0802A2FC +@0802A04E: ldr r0, =0x082f7bd4 mov r9, r0 bl Window_AddFromTemplate @@ -66827,10 +66827,10 @@ _0802A04E: ldr r2, =0x00003024 adds r0, r2 strb r6, [r0] - b _0802A35E + b @0802A35E .align 2, 0 .pool -_0802A0CC: +@0802A0CC: ldr r3, =0x00003008 mov r8, r3 adds r0, r2, r3 @@ -66908,14 +66908,14 @@ _0802A0CC: ldr r1, [r7] ldr r2, =0x00003014 adds r1, r2 - b _0802A2EA + b @0802A2EA .align 2, 0 .pool -_0802A194: +@0802A194: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802A1B6 + bne @0802A1B6 ldr r0, [r7] ldr r3, =0x00003008 adds r0, r3 @@ -66926,23 +66926,23 @@ _0802A194: adds r0, r1 ldrb r0, [r0] bl Window_WriteStandardTileMap -_0802A1B6: +@0802A1B6: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram ldr r1, [r7] ldr r2, =0x00003014 adds r1, r2 - b _0802A2EA + b @0802A2EA .align 2, 0 .pool -_0802A1D0: +@0802A1D0: ldr r3, =0x00003020 adds r0, r2, r3 ldrb r5, [r0] cmp r5, 0 - bne _0802A1DC + bne @0802A1DC movs r5, 0x1 -_0802A1DC: +@0802A1DC: ldr r0, =0x00003009 mov r8, r0 adds r0, r2, r0 @@ -67005,7 +67005,7 @@ _0802A1DC: movs r2, 0x1 ands r2, r1 cmp r2, 0 - beq _0802A294 + beq @0802A294 movs r0, 0x5 bl audio_play ldr r0, [r7] @@ -67013,16 +67013,16 @@ _0802A1DC: adds r1, r0, r3 ldrb r0, [r1] cmp r0, 0 - bne _0802A2E4 + bne @0802A2E4 strb r5, [r1] - b _0802A2E4 + b @0802A2E4 .align 2, 0 .pool -_0802A294: +@0802A294: movs r0, 0xC0 ands r0, r1 cmp r0, 0 - beq _0802A2CC + beq @0802A2CC movs r0, 0x5 bl audio_play ldr r0, [r7] @@ -67030,30 +67030,30 @@ _0802A294: adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0x1 - beq _0802A2C2 + beq @0802A2C2 cmp r0, 0x1 - bgt _0802A2BC + bgt @0802A2BC cmp r0, 0 - beq _0802A2C2 - b _0802A35E + beq @0802A2C2 + b @0802A35E .align 2, 0 .pool -_0802A2BC: +@0802A2BC: cmp r0, 0x2 - beq _0802A2C8 - b _0802A35E -_0802A2C2: + beq @0802A2C8 + b @0802A35E +@0802A2C2: movs r0, 0x2 strb r0, [r1] - b _0802A35E -_0802A2C8: + b @0802A35E +@0802A2C8: strb r5, [r1] - b _0802A35E -_0802A2CC: + b @0802A35E +@0802A2CC: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0802A35E + beq @0802A35E movs r0, 0x5 bl audio_play ldr r0, [r7] @@ -67061,18 +67061,18 @@ _0802A2CC: adds r0, r3 movs r1, 0x2 strb r1, [r0] -_0802A2E4: +@0802A2E4: ldr r1, [r7] ldr r0, =0x00003014 adds r1, r0 -_0802A2EA: +@0802A2EA: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0802A35E + b @0802A35E .align 2, 0 .pool -_0802A2FC: +@0802A2FC: ldr r0, [r7] ldr r2, =0x00003020 adds r1, r0, r2 @@ -67116,7 +67116,7 @@ _0802A2FC: adds r0, r3 movs r1, 0x1 str r1, [r0] -_0802A35E: +@0802A35E: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -67130,7 +67130,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 @@ -67139,21 +67139,21 @@ sub_802A380: @ 802A380 adds r0, r6 ldrb r4, [r0] cmp r4, 0x1 - beq _0802A3D8 + beq @0802A3D8 cmp r4, 0x1 - bgt _0802A3A4 + bgt @0802A3A4 cmp r4, 0 - beq _0802A3AE - b _0802A420 + beq @0802A3AE + b @0802A420 .align 2, 0 .pool -_0802A3A4: +@0802A3A4: cmp r4, 0x2 - beq _0802A3EC + beq @0802A3EC cmp r4, 0x3 - beq _0802A404 - b _0802A420 -_0802A3AE: + beq @0802A404 + b @0802A420 +@0802A3AE: movs r0, 0 movs r1, 0 bl sub_81973C4 @@ -67169,47 +67169,47 @@ _0802A3AE: movs r1, 0x1 movs r3, 0 bl text_box_related_one - b _0802A410 + b @0802A410 .align 2, 0 .pool -_0802A3D8: +@0802A3D8: movs r0, 0 movs r1, 0x3 bl Window_CopyToVram ldr r1, [r5] ldr r0, =0x00003014 adds r1, r0 - b _0802A414 + b @0802A414 .align 2, 0 .pool -_0802A3EC: +@0802A3EC: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802A448 + bne @0802A448 ldr r0, =sub_8153688 + 1 movs r1, 0 bl AddTask - b _0802A410 + b @0802A410 .align 2, 0 .pool -_0802A404: +@0802A404: ldr r0, =sub_8153688 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _0802A448 -_0802A410: + bne @0802A448 +@0802A410: ldr r1, [r5] adds r1, r6 -_0802A414: +@0802A414: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0802A448 + b @0802A448 .align 2, 0 .pool -_0802A420: +@0802A420: movs r0, 0x1E str r0, [sp] movs r0, 0x14 @@ -67228,7 +67228,7 @@ _0802A420: adds r0, r1 movs r1, 0x1 str r1, [r0] -_0802A448: +@0802A448: add sp, 0x10 pop {r4-r6} pop {r0} @@ -67238,7 +67238,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 @@ -67248,19 +67248,19 @@ sub_802A454: @ 802A454 ldrb r0, [r0] adds r5, r1, 0 cmp r0, 0x1 - beq _0802A4AC + beq @0802A4AC cmp r0, 0x1 - bgt _0802A47C + bgt @0802A47C cmp r0, 0 - beq _0802A482 - b _0802A520 + beq @0802A482 + b @0802A520 .align 2, 0 .pool -_0802A47C: +@0802A47C: cmp r0, 0x2 - beq _0802A4F4 - b _0802A520 -_0802A482: + beq @0802A4F4 + b @0802A520 +@0802A482: ldr r4, =0x082f7bec adds r0, r4, 0 bl Window_AddFromTemplate @@ -67274,10 +67274,10 @@ _0802A482: bl Window_FillTileMap adds r0, r4, 0 bl sub_8029174 - b _0802A510 + b @0802A510 .align 2, 0 .pool -_0802A4AC: +@0802A4AC: ldr r4, =0x00003008 adds r0, r2, r4 ldrb r0, [r0] @@ -67304,40 +67304,40 @@ _0802A4AC: ldr r1, [r5] ldr r0, =0x00003014 adds r1, r0 - b _0802A514 + b @0802A514 .align 2, 0 .pool -_0802A4F4: +@0802A4F4: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802A50A + bne @0802A50A ldr r0, [r5] ldr r1, =0x00003008 adds r0, r1 ldrb r0, [r0] bl Window_WriteStandardTileMap -_0802A50A: +@0802A50A: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram -_0802A510: +@0802A510: ldr r1, [r5] adds r1, r6 -_0802A514: +@0802A514: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0802A52C + b @0802A52C .align 2, 0 .pool -_0802A520: +@0802A520: ldr r0, [r5] movs r1, 0xC0 lsls r1, 6 adds r0, r1 movs r1, 0x1 str r1, [r0] -_0802A52C: +@0802A52C: add sp, 0xC pop {r4-r6} pop {r0} @@ -67345,7 +67345,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 @@ -67384,7 +67384,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 @@ -67394,21 +67394,21 @@ sub_802A588: @ 802A588 ldrb r5, [r2] adds r6, r0, 0 cmp r5, 0x1 - beq _0802A610 + beq @0802A610 cmp r5, 0x1 - bgt _0802A5B0 + bgt @0802A5B0 cmp r5, 0 - beq _0802A5BA - b _0802A6A4 + beq @0802A5BA + b @0802A6A4 .align 2, 0 .pool -_0802A5B0: +@0802A5B0: cmp r5, 0x2 - beq _0802A658 + beq @0802A658 cmp r5, 0x3 - beq _0802A684 - b _0802A6A4 -_0802A5BA: + beq @0802A684 + b @0802A6A4 +@0802A5BA: ldr r4, =0x082f7be4 adds r0, r4, 0 bl Window_AddFromTemplate @@ -67439,10 +67439,10 @@ _0802A5BA: adds r1, 0x4 adds r0, r1 strb r2, [r0] - b _0802A6EA + b @0802A6EA .align 2, 0 .pool -_0802A610: +@0802A610: ldr r4, =0x00003008 adds r0, r1, r4 ldrb r0, [r0] @@ -67469,32 +67469,32 @@ _0802A610: ldr r1, [r6] ldr r2, =0x00003014 adds r1, r2 - b _0802A678 + b @0802A678 .align 2, 0 .pool -_0802A658: +@0802A658: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802A66E + bne @0802A66E ldr r0, [r6] ldr r1, =0x00003008 adds r0, r1 ldrb r0, [r0] bl Window_WriteStandardTileMap -_0802A66E: +@0802A66E: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram ldr r1, [r6] adds r1, r7 -_0802A678: +@0802A678: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0802A6EA + b @0802A6EA .align 2, 0 .pool -_0802A684: +@0802A684: ldr r0, =0x0000301c adds r1, r0 ldrh r0, [r1] @@ -67503,14 +67503,14 @@ _0802A684: lsls r0, 16 lsrs r0, 16 cmp r0, 0x77 - bls _0802A6EA + bls @0802A6EA ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] - b _0802A6EA + b @0802A6EA .align 2, 0 .pool -_0802A6A4: +@0802A6A4: ldr r0, [r6] ldr r1, =0x00003024 adds r0, r1 @@ -67542,7 +67542,7 @@ _0802A6A4: adds r0, r2 movs r1, 0x1 str r1, [r0] -_0802A6EA: +@0802A6EA: add sp, 0xC pop {r4-r7} pop {r0} @@ -67552,7 +67552,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] @@ -67574,12 +67574,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] @@ -67603,7 +67603,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 @@ -67615,7 +67615,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] @@ -67624,20 +67624,20 @@ sub_802A770: @ 802A770 adds r0, r1 ldr r0, [r0] cmp r0, 0x1 - beq _0802A78C + beq @0802A78C movs r0, 0x1 - b _0802A78E + b @0802A78E .align 2, 0 .pool -_0802A78C: +@0802A78C: movs r0, 0 -_0802A78E: +@0802A78E: pop {r1} bx r1 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 @@ -67649,7 +67649,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} @@ -67669,7 +67669,7 @@ sub_802A7A8: @ 802A7A8 movs r0, 0x81 lsls r0, 24 mov r12, r0 -_0802A7CE: +@0802A7CE: strh r6, [r2] mov r0, sp str r0, [r1] @@ -67679,7 +67679,7 @@ _0802A7CE: adds r3, r5 subs r4, r5 cmp r4, r5 - bhi _0802A7CE + bhi @0802A7CE strh r6, [r2] mov r2, sp str r2, [r1] @@ -67791,7 +67791,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 @@ -67800,73 +67800,73 @@ sub_802A8E8: @ 802A8E8 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0x5 - bhi _0802A982 + bhi @0802A982 lsls r0, 2 - ldr r1, =_0802A910 + ldr r1, =@0802A910 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0802A910: - .4byte _0802A928 - .4byte _0802A938 - .4byte _0802A93E - .4byte _0802A94C - .4byte _0802A964 - .4byte _0802A972 -_0802A928: +@0802A910: + .4byte @0802A928 + .4byte @0802A938 + .4byte @0802A93E + .4byte @0802A94C + .4byte @0802A964 + .4byte @0802A972 +@0802A928: ldr r0, =0x082f7df0 movs r1, 0 movs r2, 0x40 bl gpu_pal_apply - b _0802A98A + b @0802A98A .align 2, 0 .pool -_0802A938: +@0802A938: bl reset_temp_tile_data_buffers - b _0802A98A -_0802A93E: + b @0802A98A +@0802A93E: ldr r1, =0x082f8084 movs r0, 0 str r0, [sp] movs r0, 0x3 - b _0802A954 + b @0802A954 .align 2, 0 .pool -_0802A94C: +@0802A94C: ldr r1, =0x082f8914 movs r0, 0 str r0, [sp] movs r0, 0x1 -_0802A954: +@0802A954: movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - b _0802A98A + b @0802A98A .align 2, 0 .pool -_0802A964: +@0802A964: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0802A98A - b _0802A998 -_0802A972: + bne @0802A98A + b @0802A998 +@0802A972: movs r0, 0x3 bl stdpal_get movs r1, 0xD0 movs r2, 0x20 bl gpu_pal_apply - b _0802A98A -_0802A982: + b @0802A98A +@0802A982: movs r0, 0 strb r0, [r1] movs r0, 0x1 - b _0802A99A -_0802A98A: + b @0802A99A +@0802A98A: ldr r0, =0x02022cf8 ldr r1, [r0] ldr r0, =0x00003018 @@ -67874,9 +67874,9 @@ _0802A98A: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_0802A998: +@0802A998: movs r0, 0 -_0802A99A: +@0802A99A: add sp, 0x4 pop {r1} bx r1 @@ -67885,7 +67885,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 @@ -67893,13 +67893,13 @@ sub_802A9A8: @ 802A9A8 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _0802AA3C + beq @0802AA3C ldr r5, =0x02022cfc ldr r0, =0x000083b0 bl malloc str r0, [r5] cmp r0, 0 - beq _0802AA3C + beq @0802AA3C bl clear_tasks ldr r0, =sub_802ACA0 + 1 movs r1, 0x1 @@ -67936,20 +67936,20 @@ sub_802A9A8: @ 802A9A8 bl set_word_task_arg ldr r0, =sub_802AC6C + 1 bl set_callback2 - b _0802AA42 + b @0802AA42 .align 2, 0 .pool -_0802AA3C: +@0802AA3C: adds r0, r6, 0 bl set_callback2 -_0802AA42: +@0802AA42: pop {r4-r7} pop {r0} bx r0 thumb_func_end sub_802A9A8 thumb_func_start sub_802AA48 -sub_802AA48: @ 802AA48 +sub_802AA48: ; 802AA48 push {lr} bl sub_802D0AC ldr r0, =0x02022cfc @@ -67962,7 +67962,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 @@ -67980,16 +67980,16 @@ sub_802AA60: @ 802AA60 bl sub_802AA94 ldrb r0, [r4, 0x5] cmp r0, 0x5 - bne _0802AA8E + bne @0802AA8E bl sub_802E3A8 -_0802AA8E: +@0802AA8E: pop {r4} pop {r0} bx r0 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 @@ -68006,9 +68006,9 @@ sub_802AA94: @ 802AA94 movs r1, 0 lsls r0, 24 cmp r0, 0 - bne _0802AABA + bne @0802AABA movs r1, 0x1 -_0802AABA: +@0802AABA: adds r0, r4, 0 adds r0, 0x47 strb r1, [r0] @@ -68048,21 +68048,21 @@ _0802AABA: movs r3, 0 adds r1, r4, 0 adds r1, 0x9A -_0802AB0C: +@0802AB0C: adds r0, r5, r2 strb r3, [r0] strh r3, [r1] adds r1, 0x2 adds r2, 0x1 cmp r2, 0x4 - ble _0802AB0C + ble @0802AB0C pop {r4-r6} pop {r0} bx r0 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} @@ -68072,7 +68072,7 @@ sub_802AB20: @ 802AB20 ldr r0, =0x082fb464 mov r8, r0 movs r4, 0x4 -_0802AB32: +@0802AB32: ldr r0, [r7] adds r0, r5 ldr r1, =0x000082a8 @@ -68092,7 +68092,7 @@ _0802AB32: adds r5, 0xC subs r4, 0x1 cmp r4, 0 - bge _0802AB32 + bge @0802AB32 ldr r0, =0x02022cfc ldr r1, [r0] ldr r0, =0x000083ac @@ -68115,13 +68115,13 @@ _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 movs r4, 0 movs r3, 0 -_0802ABA2: +@0802ABA2: ldr r2, [r6] adds r1, r2, r3 ldr r7, =0x000082f2 @@ -68153,7 +68153,7 @@ _0802ABA2: adds r3, 0x28 adds r5, 0x1 cmp r5, 0x4 - ble _0802ABA2 + ble @0802ABA2 pop {r4-r7} pop {r0} bx r0 @@ -68162,35 +68162,35 @@ _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 movs r1, 0 ldr r2, =0x082fb464 -_0802AC0A: +@0802AC0A: ldrh r0, [r2] cmp r0, r3 - bne _0802AC1C + bne @0802AC1C lsls r0, r1, 16 asrs r0, 16 - b _0802AC28 + b @0802AC28 .align 2, 0 .pool -_0802AC1C: +@0802AC1C: adds r2, 0x4 adds r1, 0x1 cmp r1, 0x63 - bls _0802AC0A + bls @0802AC0A movs r0, 0x1 negs r0, r0 -_0802AC28: +@0802AC28: pop {r1} bx r1 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 @@ -68212,7 +68212,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 copy_super_sprites_to_oam @@ -68222,7 +68222,7 @@ sub_802AC58: @ 802AC58 thumb_func_end sub_802AC58 thumb_func_start sub_802AC6C -sub_802AC6C: @ 802AC6C +sub_802AC6C: ; 802AC6C push {lr} bl run_active_tasks bl call_obj_callbacks @@ -68233,7 +68233,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 @@ -68250,7 +68250,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 @@ -68260,25 +68260,25 @@ sub_802ACA0: @ 802ACA0 ldrh r0, [r0, 0x8] adds r2, r1, 0 cmp r0, 0x5 - bls _0802ACB6 - b _0802AE08 -_0802ACB6: + bls @0802ACB6 + b @0802AE08 +@0802ACB6: lsls r0, 2 - ldr r1, =_0802ACC8 + ldr r1, =@0802ACC8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0802ACC8: - .4byte _0802ACE0 - .4byte _0802AD0C - .4byte _0802AD3C - .4byte _0802AD68 - .4byte _0802ADA4 - .4byte _0802ADD0 -_0802ACE0: +@0802ACC8: + .4byte @0802ACE0 + .4byte @0802AD0C + .4byte @0802AD3C + .4byte @0802AD68 + .4byte @0802ADA4 + .4byte @0802ADD0 +@0802ACE0: movs r0, 0 bl SetVBlankCallback bl reset_all_obj_data @@ -68290,15 +68290,15 @@ _0802ACE0: bl sub_80A2F50 ldr r0, =0x02022cfc ldr r1, [r0] - b _0802ADC0 + b @0802ADC0 .align 2, 0 .pool -_0802AD0C: +@0802AD0C: ldr r0, =sub_802BD84 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _0802AE08 + bne @0802AE08 ldr r4, =0x02022cfc ldr r0, [r4] adds r0, 0xA4 @@ -68308,31 +68308,31 @@ _0802AD0C: movs r1, 0 bl sub_800DFB4 ldr r1, [r4] - b _0802ADC0 + b @0802ADC0 .align 2, 0 .pool -_0802AD3C: +@0802AD3C: bl sub_802D0F0 cmp r0, 0 - bne _0802AE08 + bne @0802AE08 bl sub_80A303C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0802AE08 + bne @0802AE08 ldr r0, =0x0000021a movs r1, 0x8 bl sub_80A2F88 ldr r0, =0x02022cfc ldr r1, [r0] - b _0802ADC0 + b @0802ADC0 .align 2, 0 .pool -_0802AD68: +@0802AD68: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _0802AE08 + beq @0802AE08 movs r4, 0x1 negs r4, r4 adds r0, r4, 0 @@ -68350,10 +68350,10 @@ _0802AD68: bl SetVBlankCallback ldr r0, =0x02022cfc ldr r1, [r0] - b _0802ADC0 + b @0802ADC0 .align 2, 0 .pool -_0802ADA4: +@0802ADA4: bl fade_and_return_progress_probably ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] @@ -68362,19 +68362,19 @@ _0802ADA4: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - bne _0802AE08 + bne @0802AE08 ldr r1, =0x02022cfc ldr r0, [r1] strb r2, [r0, 0x7] ldr r1, [r1] -_0802ADC0: +@0802ADC0: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _0802AE08 + b @0802AE08 .align 2, 0 .pool -_0802ADD0: +@0802ADD0: ldr r0, [r2] ldrb r1, [r0, 0x7] adds r1, 0x1 @@ -68382,25 +68382,25 @@ _0802ADD0: ldr r1, [r2] ldrb r0, [r1, 0x7] cmp r0, 0x13 - bls _0802AE08 + bls @0802AE08 adds r0, r1, 0 adds r0, 0x47 ldrb r0, [r0] cmp r0, 0 - beq _0802ADF8 + beq @0802ADF8 ldr r0, =sub_802AF80 + 1 bl sub_802AC84 - b _0802ADFE + b @0802ADFE .align 2, 0 .pool -_0802ADF8: +@0802ADF8: ldr r0, =sub_802B194 + 1 bl sub_802AC84 -_0802ADFE: +@0802ADFE: bl sub_802BE80 adds r0, r4, 0 bl remove_task -_0802AE08: +@0802AE08: add sp, 0x4 pop {r4} pop {r0} @@ -68410,21 +68410,21 @@ _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 - bne _0802AE34 + bne @0802AE34 ldr r0, =0x02022cfc ldr r1, [r0] ldr r0, =0x00001111 str r0, [r1, 0x30] movs r0, 0x1 str r0, [r1, 0x2C] - b _0802AE46 + b @0802AE46 .align 2, 0 .pool -_0802AE34: +@0802AE34: ldr r0, =0x02022cfc ldr r2, [r0] subs r1, 0x1 @@ -68434,7 +68434,7 @@ _0802AE34: str r0, [r2, 0x30] movs r0, 0 str r0, [r2, 0x2C] -_0802AE46: +@0802AE46: pop {r0} bx r0 .align 2, 0 @@ -68442,7 +68442,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] @@ -68463,12 +68463,12 @@ sub_802AE50: @ 802AE50 ldr r0, [r4] ldrb r0, [r0, 0x5] cmp r3, r0 - bge _0802AE94 + bge @0802AE94 adds r6, r4, 0 ldr r5, =0x000082fc movs r4, 0 movs r2, 0x28 -_0802AE82: +@0802AE82: ldr r1, [r6] adds r0, r1, r5 adds r0, r2 @@ -68477,8 +68477,8 @@ _0802AE82: adds r3, 0x1 ldrb r1, [r1, 0x5] cmp r3, r1 - blt _0802AE82 -_0802AE94: + blt @0802AE82 +@0802AE94: pop {r4-r6} pop {r0} bx r0 @@ -68487,7 +68487,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 @@ -68501,7 +68501,7 @@ sub_802AEA4: @ 802AEA4 ldr r0, [r7] ldrb r0, [r0, 0x5] cmp r4, r0 - bge _0802AF48 + bge @0802AF48 adds r1, r7, 0 mov r10, r1 movs r2, 0x2 @@ -68510,7 +68510,7 @@ sub_802AEA4: @ 802AEA4 ldr r3, =0x0000830c mov r9, r3 movs r6, 0x28 -_0802AED0: +@0802AED0: mov r1, r10 ldr r0, [r1] adds r1, r0, r6 @@ -68523,7 +68523,7 @@ _0802AED0: mov r3, r8 bl sub_802E264 cmp r0, 0 - beq _0802AF10 + beq @0802AF10 ldr r2, [r7] lsls r1, r4, 1 adds r0, r2, 0 @@ -68542,7 +68542,7 @@ _0802AED0: ldr r1, =0x000082f6 adds r0, r1 strh r5, [r0] -_0802AF10: +@0802AF10: mov r2, r10 ldr r1, [r2] ldr r3, =0x000082fc @@ -68550,7 +68550,7 @@ _0802AF10: adds r0, r6 ldr r0, [r0] cmp r0, 0 - beq _0802AF36 + beq @0802AF36 adds r0, r1, 0 adds r0, 0x8B adds r0, r4 @@ -68558,11 +68558,11 @@ _0802AF10: ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bne _0802AF36 + bne @0802AF36 ldr r0, [sp, 0x4] adds r0, 0x1 str r0, [sp, 0x4] -_0802AF36: +@0802AF36: movs r1, 0x28 add r9, r1 adds r6, 0x28 @@ -68571,19 +68571,19 @@ _0802AF36: ldr r0, [r7] ldrb r0, [r0, 0x5] cmp r4, r0 - blt _0802AED0 -_0802AF48: + blt @0802AED0 +@0802AF48: ldr r2, =0x02022cfc ldr r1, [r2] ldrb r0, [r1, 0x5] subs r0, 0x1 ldr r3, [sp, 0x4] cmp r3, r0 - bne _0802AF5C + bne @0802AF5C adds r1, 0x49 movs r0, 0x1 strb r0, [r1] -_0802AF5C: +@0802AF5C: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -68597,7 +68597,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 @@ -68607,26 +68607,26 @@ sub_802AF80: @ 802AF80 adds r0, 0x48 ldrb r0, [r0] cmp r0, 0 - bne _0802AFB2 + bne @0802AFB2 adds r0, r1, 0 adds r0, 0x49 ldrb r0, [r0] cmp r0, 0 - beq _0802AFB2 + beq @0802AFB2 adds r0, r1, 0 adds r0, 0x4C ldrb r0, [r0] bl sub_802AE50 movs r0, 0x3 bl sub_802AE14 -_0802AFB2: +@0802AFB2: ldr r4, =0x02022cfc ldr r2, [r4] adds r0, r2, 0 adds r0, 0x48 ldrb r5, [r0] cmp r5, 0x1 - bne _0802AFEE + bne @0802AFEE ldr r1, =0x082fb5f4 adds r0, 0x28 ldrb r0, [r0] @@ -68636,7 +68636,7 @@ _0802AFB2: bl _call_via_r0 adds r1, r0, 0 cmp r1, 0 - bne _0802AFEE + bne @0802AFEE ldr r0, [r4] adds r0, 0x48 strb r1, [r0] @@ -68649,7 +68649,7 @@ _0802AFB2: adds r1, r2 adds r1, r0 str r5, [r1] -_0802AFEE: +@0802AFEE: bl sub_802C1DC bl sub_802B008 pop {r4,r5} @@ -68660,28 +68660,28 @@ _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] ldr r0, [r1, 0x2C] cmp r0, 0 - bne _0802B01E + bne @0802B01E ldr r2, =0x000082e4 adds r0, r1, r2 adds r1, 0x70 bl sub_802E138 -_0802B01E: +@0802B01E: ldr r1, [r4] ldr r2, [r1, 0x30] ldr r0, =0x00001111 cmp r2, r0 - beq _0802B030 + beq @0802B030 ldr r0, [r1, 0x2C] adds r0, 0x1 ands r0, r2 str r0, [r1, 0x2C] -_0802B030: +@0802B030: pop {r4} pop {r0} bx r0 @@ -68690,7 +68690,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 @@ -68717,7 +68717,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} @@ -68733,7 +68733,7 @@ sub_802B078: @ 802B078 mov r1, sp bl sub_802E1BC cmp r0, 0 - beq _0802B128 + beq @0802B128 ldr r2, [r4] ldrb r0, [r2, 0x6] lsls r1, r0, 2 @@ -68744,24 +68744,24 @@ sub_802B078: @ 802B078 adds r0, r1 ldr r0, [r0] cmp r0, 0x1 - bne _0802B0C6 + bne @0802B0C6 mov r0, sp adds r1, r2, 0 adds r1, 0x70 ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - beq _0802B0C6 + beq @0802B0C6 mov r0, sp ldrb r0, [r0] bl sub_802B044 -_0802B0C6: +@0802B0C6: ldr r3, =0x02022cfc ldr r2, [r3] ldr r0, [r2, 0x78] ldr r1, [sp, 0x8] cmp r0, r1 - beq _0802B108 + beq @0802B108 str r1, [r2, 0x78] movs r4, 0x1 str r4, [r2, 0x5C] @@ -68775,16 +68775,16 @@ _0802B0C6: adds r1, 0x71 ldrb r1, [r1] cmp r1, 0 - beq _0802B104 + beq @0802B104 adds r0, 0x4D strb r4, [r0] - b _0802B108 + b @0802B108 .align 2, 0 .pool -_0802B104: +@0802B104: adds r0, 0x4D strb r1, [r0] -_0802B108: +@0802B108: ldr r0, =0x02022cfc ldr r1, [r0] mov r0, sp @@ -68801,21 +68801,21 @@ _0802B108: adds r1, r0 mov r2, r8 strh r2, [r1] -_0802B128: +@0802B128: movs r4, 0x1 ldr r2, =0x02022cfc ldr r0, [r2] ldrb r0, [r0, 0x5] cmp r4, r0 - bge _0802B176 + bge @0802B176 adds r7, r2, 0 ldr r6, =0x0000830c movs r5, 0x28 -_0802B13A: +@0802B13A: ldr r1, [r7] ldrb r3, [r1, 0x6] cmp r4, r3 - beq _0802B168 + beq @0802B168 adds r0, r1, r5 ldr r3, =0x000082f4 adds r0, r3 @@ -68827,22 +68827,22 @@ _0802B13A: bl sub_802E2D0 ldr r2, [sp, 0xC] cmp r0, 0 - beq _0802B168 + beq @0802B168 ldr r0, [r7] adds r0, r5 ldr r1, =0x000082f6 adds r0, r1 mov r3, r8 strh r3, [r0] -_0802B168: +@0802B168: adds r6, 0x28 adds r5, 0x28 adds r4, 0x1 ldr r0, [r2] ldrb r0, [r0, 0x5] cmp r4, r0 - blt _0802B13A -_0802B176: + blt @0802B13A +@0802B176: add sp, 0x10 pop {r3} mov r8, r3 @@ -68854,7 +68854,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 @@ -68863,7 +68863,7 @@ sub_802B194: @ 802B194 adds r0, 0x48 ldrb r0, [r0] cmp r0, 0 - beq _0802B1E0 + beq @0802B1E0 ldr r1, =0x082fb618 adds r0, r2, 0 adds r0, 0x70 @@ -68874,7 +68874,7 @@ sub_802B194: @ 802B194 bl _call_via_r0 adds r1, r0, 0 cmp r1, 0 - bne _0802B1E0 + bne @0802B1E0 ldr r0, [r4] adds r0, 0x48 strb r1, [r0] @@ -68890,7 +68890,7 @@ sub_802B194: @ 802B194 str r0, [r1] movs r0, 0x3 bl sub_802AE14 -_0802B1E0: +@0802B1E0: bl sub_802C1DC bl sub_802B1FC pop {r4} @@ -68901,13 +68901,13 @@ _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] ldr r0, [r2, 0x2C] cmp r0, 0 - bne _0802B224 + bne @0802B224 ldrb r1, [r2, 0x6] lsls r0, r1, 2 adds r0, r1 @@ -68921,17 +68921,17 @@ sub_802B1FC: @ 802B1FC adds r2, 0x42 ldrh r2, [r2] bl sub_802E234 -_0802B224: +@0802B224: ldr r1, [r4] ldr r2, [r1, 0x30] ldr r0, =0x00001111 cmp r2, r0 - beq _0802B236 + beq @0802B236 ldr r0, [r1, 0x2C] adds r0, 0x1 ands r0, r2 str r0, [r1, 0x2C] -_0802B236: +@0802B236: pop {r4} pop {r0} bx r0 @@ -68940,29 +68940,29 @@ _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] ldrh r0, [r0, 0x8] cmp r0, 0 - beq _0802B260 + beq @0802B260 cmp r0, 0x1 - beq _0802B26E - b _0802B294 + beq @0802B26E + b @0802B294 .align 2, 0 .pool -_0802B260: +@0802B260: movs r0, 0x3 bl sub_802AE14 ldr r1, [r4] ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_0802B26E: +@0802B26E: bl sub_802B7E0 cmp r0, 0 - bne _0802B294 + bne @0802B294 ldr r0, =0x02022cfc ldr r1, [r0] adds r0, r1, 0 @@ -68975,32 +68975,32 @@ _0802B26E: movs r0, 0x1 strb r0, [r1] movs r0, 0 - b _0802B296 + b @0802B296 .align 2, 0 .pool -_0802B294: +@0802B294: movs r0, 0x1 -_0802B296: +@0802B296: pop {r4} pop {r1} bx r1 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] ldrh r0, [r0, 0x8] cmp r0, 0 - beq _0802B2B4 + beq @0802B2B4 cmp r0, 0x1 - beq _0802B2CA + beq @0802B2CA movs r0, 0x1 - b _0802B2CE + b @0802B2CE .align 2, 0 .pool -_0802B2B4: +@0802B2B4: movs r0, 0 bl sub_802AE14 ldr r1, [r4] @@ -69011,28 +69011,28 @@ _0802B2B4: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_0802B2CA: +@0802B2CA: bl sub_802B7E0 -_0802B2CE: +@0802B2CE: pop {r4} pop {r1} bx r1 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] ldrh r0, [r1, 0x8] cmp r0, 0 - beq _0802B2EC + beq @0802B2EC cmp r0, 0x1 - beq _0802B300 - b _0802B314 + beq @0802B300 + b @0802B314 .align 2, 0 .pool -_0802B2EC: +@0802B2EC: bl sub_802C0E8 movs r0, 0x5 bl sub_802AE14 @@ -69040,40 +69040,40 @@ _0802B2EC: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _0802B314 -_0802B300: + b @0802B314 +@0802B300: adds r0, r1, 0 adds r0, 0x49 ldrb r0, [r0] cmp r0, 0 - beq _0802B314 + beq @0802B314 adds r1, 0x4C movs r0, 0x2 strb r0, [r1] movs r0, 0 - b _0802B316 -_0802B314: + b @0802B316 +@0802B314: movs r0, 0x1 -_0802B316: +@0802B316: pop {r4} pop {r1} bx r1 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] ldrh r0, [r0, 0x8] cmp r0, 0 - beq _0802B334 + beq @0802B334 cmp r0, 0x1 - beq _0802B352 - b _0802B35E + beq @0802B352 + b @0802B35E .align 2, 0 .pool -_0802B334: +@0802B334: bl sub_802C0E8 movs r0, 0 bl sub_802AE14 @@ -69087,26 +69087,26 @@ _0802B334: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_0802B352: +@0802B352: bl sub_802C70C cmp r0, 0 - beq _0802B35E + beq @0802B35E movs r0, 0 - b _0802B360 -_0802B35E: + b @0802B360 +@0802B35E: movs r0, 0x1 -_0802B360: +@0802B360: pop {r4} pop {r1} bx r1 thumb_func_end sub_802B31C thumb_func_start sub_802B368 -sub_802B368: @ 802B368 +sub_802B368: ; 802B368 push {lr} bl sub_802B8CC cmp r0, 0 - bne _0802B390 + bne @0802B390 ldr r0, =0x02022cfc ldr r1, [r0] adds r0, r1, 0 @@ -69118,25 +69118,25 @@ sub_802B368: @ 802B368 adds r1, 0x4C movs r0, 0x1 strb r0, [r1] - b _0802B3AA + b @0802B3AA .align 2, 0 .pool -_0802B390: +@0802B390: bl sub_802C538 cmp r0, 0 - beq _0802B39C + beq @0802B39C movs r0, 0x1 - b _0802B3AC -_0802B39C: + b @0802B3AC +@0802B39C: bl sub_802C0B8 ldr r0, =0x02022cfc ldr r0, [r0] adds r0, 0x4C movs r1, 0x3 strb r1, [r0] -_0802B3AA: +@0802B3AA: movs r0, 0 -_0802B3AC: +@0802B3AC: pop {r1} bx r1 .align 2, 0 @@ -69144,61 +69144,61 @@ _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 - beq _0802B3CE + beq @0802B3CE bl sub_802C538 cmp r0, 0 - beq _0802B3CA + beq @0802B3CA movs r0, 0x1 - b _0802B3D0 -_0802B3CA: + b @0802B3D0 +@0802B3CA: bl sub_802C0B8 -_0802B3CE: +@0802B3CE: movs r0, 0 -_0802B3D0: +@0802B3D0: pop {r1} bx r1 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] ldrh r0, [r0, 0x8] cmp r0, 0x1 - beq _0802B40C + beq @0802B40C cmp r0, 0x1 - bgt _0802B3F0 + bgt @0802B3F0 cmp r0, 0 - beq _0802B3F6 - b _0802B468 + beq @0802B3F6 + b @0802B468 .align 2, 0 .pool -_0802B3F0: +@0802B3F0: cmp r0, 0x2 - beq _0802B460 - b _0802B468 -_0802B3F6: + beq @0802B460 + b @0802B468 +@0802B3F6: bl sub_802C538 bl sub_802C5DC cmp r0, 0 - beq _0802B468 + beq @0802B468 ldr r1, [r4] ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _0802B468 -_0802B40C: + b @0802B468 +@0802B40C: bl sub_802B964 cmp r0, 0 - bne _0802B468 + bne @0802B468 bl sub_802C7BC cmp r0, 0 - beq _0802B42E + beq @0802B42E bl sub_802C7E0 ldr r1, [r4] adds r2, r1, 0 @@ -69206,132 +69206,132 @@ _0802B40C: strh r0, [r2] adds r1, 0x4C movs r0, 0x7 - b _0802B454 -_0802B42E: + b @0802B454 +@0802B42E: ldr r1, [r4] adds r0, r1, 0 adds r0, 0x74 ldrh r0, [r0] cmp r0, 0xC7 - bls _0802B448 + bls @0802B448 ldrh r0, [r1, 0xE] adds r2, r1, 0 adds r2, 0x72 strh r0, [r2] adds r1, 0x4C movs r0, 0x8 - b _0802B454 -_0802B448: + b @0802B454 +@0802B448: ldrh r0, [r1, 0xE] adds r2, r1, 0 adds r2, 0x72 strh r0, [r2] adds r1, 0x4C movs r0, 0x4 -_0802B454: +@0802B454: strb r0, [r1] ldr r0, =0x02022cfc ldr r1, [r0] ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_0802B460: +@0802B460: movs r0, 0 - b _0802B46A + b @0802B46A .align 2, 0 .pool -_0802B468: +@0802B468: movs r0, 0x1 -_0802B46A: +@0802B46A: pop {r4} pop {r1} bx r1 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] ldrh r0, [r0, 0x8] cmp r0, 0x1 - beq _0802B4B0 + beq @0802B4B0 cmp r0, 0x1 - bgt _0802B48C + bgt @0802B48C cmp r0, 0 - beq _0802B492 - b _0802B4C4 + beq @0802B492 + b @0802B4C4 .align 2, 0 .pool -_0802B48C: +@0802B48C: cmp r0, 0x2 - beq _0802B4C0 - b _0802B4C4 -_0802B492: + beq @0802B4C0 + b @0802B4C4 +@0802B492: bl sub_802C538 cmp r0, 0 - bne _0802B49E + bne @0802B49E bl sub_802C0B8 -_0802B49E: +@0802B49E: bl sub_802C5DC cmp r0, 0 - beq _0802B4C4 + beq @0802B4C4 ldr r1, [r4] ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _0802B4C4 -_0802B4B0: + b @0802B4C4 +@0802B4B0: bl sub_802B964 cmp r0, 0 - bne _0802B4C4 + bne @0802B4C4 ldr r1, [r4] ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_0802B4C0: +@0802B4C0: movs r0, 0 - b _0802B4C6 -_0802B4C4: + b @0802B4C6 +@0802B4C4: movs r0, 0x1 -_0802B4C6: +@0802B4C6: pop {r4} pop {r1} bx r1 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] ldrh r1, [r0, 0x8] cmp r1, 0x1 - beq _0802B500 + beq @0802B500 cmp r1, 0x1 - bgt _0802B4E8 + bgt @0802B4E8 cmp r1, 0 - beq _0802B4F2 - b _0802B560 + beq @0802B4F2 + b @0802B560 .align 2, 0 .pool -_0802B4E8: +@0802B4E8: cmp r1, 0x2 - beq _0802B52C + beq @0802B52C cmp r1, 0x3 - beq _0802B556 - b _0802B560 -_0802B4F2: + beq @0802B556 + b @0802B560 +@0802B4F2: movs r0, 0x4 bl sub_802AE14 ldr r1, [r4] ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_0802B500: +@0802B500: bl sub_802BB84 cmp r0, 0 - bne _0802B560 + bne @0802B560 ldr r4, =0x02022cfc ldr r2, [r4] ldr r0, [r2, 0x78] @@ -69345,69 +69345,69 @@ _0802B500: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _0802B560 + b @0802B560 .align 2, 0 .pool -_0802B52C: +@0802B52C: adds r0, 0x49 ldrb r0, [r0] cmp r0, 0 - beq _0802B560 + beq @0802B560 bl sub_802C650 cmp r0, 0 - beq _0802B544 + beq @0802B544 ldr r0, [r4] adds r0, 0x4C movs r1, 0x5 - b _0802B54A -_0802B544: + b @0802B54A +@0802B544: ldr r0, [r4] adds r0, 0x4C movs r1, 0x6 -_0802B54A: +@0802B54A: strb r1, [r0] ldr r0, =0x02022cfc ldr r1, [r0] ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_0802B556: +@0802B556: movs r0, 0 - b _0802B562 + b @0802B562 .align 2, 0 .pool -_0802B560: +@0802B560: movs r0, 0x1 -_0802B562: +@0802B562: pop {r4} pop {r1} bx r1 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] ldrh r0, [r0, 0x8] cmp r0, 0 - beq _0802B580 + beq @0802B580 cmp r0, 0x1 - beq _0802B58E - b _0802B5C0 + beq @0802B58E + b @0802B5C0 .align 2, 0 .pool -_0802B580: +@0802B580: movs r0, 0 bl sub_802AE14 ldr r1, [r4] ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_0802B58E: +@0802B58E: bl sub_802BB84 cmp r0, 0 - bne _0802B5C0 + bne @0802B5C0 ldr r4, =0x02022cfc ldr r2, [r4] ldr r0, [r2, 0x78] @@ -69424,45 +69424,45 @@ _0802B58E: adds r0, 0x42 strh r1, [r0] movs r0, 0 - b _0802B5C2 + b @0802B5C2 .align 2, 0 .pool -_0802B5C0: +@0802B5C0: movs r0, 0x1 -_0802B5C2: +@0802B5C2: pop {r4} pop {r1} bx r1 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] ldrh r0, [r1, 0x8] cmp r0, 0 - beq _0802B5E0 + beq @0802B5E0 cmp r0, 0x1 - beq _0802B5F2 - b _0802B61E + beq @0802B5F2 + b @0802B61E .align 2, 0 .pool -_0802B5E0: +@0802B5E0: bl sub_802BD30 cmp r0, 0 - bne _0802B61E + bne @0802B61E ldr r1, [r4] ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _0802B61E -_0802B5F2: + b @0802B61E +@0802B5F2: adds r0, r1, 0 adds r0, 0x49 ldrb r0, [r0] cmp r0, 0 - beq _0802B61E + beq @0802B61E adds r0, r1, 0 bl sub_802AA94 bl GenerateRandomNumber @@ -69477,89 +69477,89 @@ _0802B5F2: adds r1, 0x4C strb r2, [r1] movs r0, 0 - b _0802B620 -_0802B61E: + b @0802B620 +@0802B61E: movs r0, 0x1 -_0802B620: +@0802B620: pop {r4} pop {r1} bx r1 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] ldrh r0, [r0, 0x8] cmp r0, 0 - beq _0802B640 + beq @0802B640 cmp r0, 0x1 - beq _0802B656 - b _0802B65A + beq @0802B656 + b @0802B65A .align 2, 0 .pool -_0802B640: +@0802B640: bl sub_802BD30 cmp r0, 0 - bne _0802B65A + bne @0802B65A ldr r0, [r4] bl sub_802AA94 ldr r1, [r4] ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_0802B656: +@0802B656: movs r0, 0 - b _0802B65C -_0802B65A: + b @0802B65C +@0802B65A: movs r0, 0x1 -_0802B65C: +@0802B65C: pop {r4} pop {r1} bx r1 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] ldrh r0, [r1, 0x8] cmp r0, 0x1 - beq _0802B68C + beq @0802B68C cmp r0, 0x1 - bgt _0802B680 + bgt @0802B680 cmp r0, 0 - beq _0802B686 - b _0802B6B0 + beq @0802B686 + b @0802B6B0 .align 2, 0 .pool -_0802B680: +@0802B680: cmp r0, 0x2 - beq _0802B69C - b _0802B6B0 -_0802B686: + beq @0802B69C + b @0802B6B0 +@0802B686: movs r0, 0x1 strh r0, [r1, 0x8] - b _0802B6B0 -_0802B68C: + b @0802B6B0 +@0802B68C: movs r0, 0 bl sub_802AE14 ldr r1, [r4] ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _0802B6B0 -_0802B69C: + b @0802B6B0 +@0802B69C: bl sub_802BC60 cmp r0, 0 - bne _0802B6B0 + bne @0802B6B0 ldr r0, [r4] ldr r0, [r0] bl set_callback2 bl sub_802AA48 -_0802B6B0: +@0802B6B0: movs r0, 0x1 pop {r4} pop {r1} @@ -69567,30 +69567,30 @@ _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] ldrh r0, [r0, 0x8] cmp r0, 0 - beq _0802B6D0 + beq @0802B6D0 cmp r0, 0x1 - beq _0802B6E0 - b _0802B6FC + beq @0802B6E0 + b @0802B6FC .align 2, 0 .pool -_0802B6D0: +@0802B6D0: movs r0, 0x4 bl sub_802AE14 ldr r1, [r4] ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _0802B6FC -_0802B6E0: + b @0802B6FC +@0802B6E0: bl sub_802BA58 cmp r0, 0 - bne _0802B6FC + bne @0802B6FC ldr r0, [r4] ldrh r1, [r0, 0xE] adds r2, r0, 0 @@ -69600,56 +69600,56 @@ _0802B6E0: movs r1, 0x8 strb r1, [r0] movs r0, 0 - b _0802B6FE -_0802B6FC: + b @0802B6FE +@0802B6FC: movs r0, 0x1 -_0802B6FE: +@0802B6FE: pop {r4} pop {r1} bx r1 thumb_func_end sub_802B6B8 thumb_func_start sub_802B704 -sub_802B704: @ 802B704 +sub_802B704: ; 802B704 push {lr} movs r0, 0 bl sub_802AE14 bl sub_802BA58 cmp r0, 0 - beq _0802B718 + beq @0802B718 movs r0, 0x1 - b _0802B71A -_0802B718: + b @0802B71A +@0802B718: movs r0, 0 -_0802B71A: +@0802B71A: pop {r1} bx r1 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] ldrh r0, [r0, 0x8] adds r4, r1, 0 cmp r0, 0x4 - bhi _0802B7D8 + bhi @0802B7D8 lsls r0, 2 - ldr r1, =_0802B740 + ldr r1, =@0802B740 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0802B740: - .4byte _0802B754 - .4byte _0802B770 - .4byte _0802B780 - .4byte _0802B798 - .4byte _0802B7BC -_0802B754: +@0802B740: + .4byte @0802B754 + .4byte @0802B770 + .4byte @0802B780 + .4byte @0802B798 + .4byte @0802B7BC +@0802B754: ldr r2, [r4] ldr r0, [r2, 0x78] adds r1, r2, 0 @@ -69661,108 +69661,108 @@ _0802B754: movs r0, 0x5 bl sub_802D0C8 ldr r1, [r4] - b _0802B7AC -_0802B770: + b @0802B7AC +@0802B770: bl sub_802D0F0 cmp r0, 0 - bne _0802B7D8 + bne @0802B7D8 movs r0, 0 bl sub_802AE14 - b _0802B7A8 -_0802B780: + b @0802B7A8 +@0802B780: bl sub_802C70C cmp r0, 0 - beq _0802B7D8 + beq @0802B7D8 ldr r0, =sub_8153688 + 1 movs r1, 0x6 bl AddTask - b _0802B7A8 + b @0802B7A8 .align 2, 0 .pool -_0802B798: +@0802B798: ldr r0, =sub_8153688 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _0802B7D8 + bne @0802B7D8 bl sub_802DA14 -_0802B7A8: +@0802B7A8: ldr r0, =0x02022cfc ldr r1, [r0] -_0802B7AC: +@0802B7AC: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _0802B7D8 + b @0802B7D8 .align 2, 0 .pool -_0802B7BC: +@0802B7BC: bl sub_802DA44 cmp r0, 0 - bne _0802B7D8 + bne @0802B7D8 ldr r0, =0x02022cfc ldr r0, [r0] adds r0, 0x4C movs r1, 0x4 strb r1, [r0] movs r0, 0 - b _0802B7DA + b @0802B7DA .align 2, 0 .pool -_0802B7D8: +@0802B7D8: movs r0, 0x1 -_0802B7DA: +@0802B7DA: pop {r4} pop {r1} bx r1 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] ldrh r0, [r0, 0xA] adds r4, r1, 0 cmp r0, 0x7 - bhi _0802B8C4 + bhi @0802B8C4 lsls r0, 2 - ldr r1, =_0802B800 + ldr r1, =@0802B800 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0802B800: - .4byte _0802B820 - .4byte _0802B82C - .4byte _0802B84C - .4byte _0802B866 - .4byte _0802B878 - .4byte _0802B880 - .4byte _0802B8A0 - .4byte _0802B8BA -_0802B820: +@0802B800: + .4byte @0802B820 + .4byte @0802B82C + .4byte @0802B84C + .4byte @0802B866 + .4byte @0802B878 + .4byte @0802B880 + .4byte @0802B8A0 + .4byte @0802B8BA +@0802B820: movs r0, 0x2 bl sub_802D0C8 bl sub_802DDE0 - b _0802B890 -_0802B82C: + b @0802B890 +@0802B82C: bl sub_802D0F0 adds r5, r0, 0 cmp r5, 0 - bne _0802B8C4 + bne @0802B8C4 ldr r4, =0x02022cfc ldr r0, [r4] ldrb r0, [r0, 0x6] bl sub_802DDF4 ldr r1, [r4] strh r5, [r1, 0x3C] - b _0802B894 + b @0802B894 .align 2, 0 .pool -_0802B84C: +@0802B84C: ldr r1, [r4] ldrh r0, [r1, 0x3C] adds r0, 0x1 @@ -69770,43 +69770,43 @@ _0802B84C: lsls r0, 16 lsrs r0, 16 cmp r0, 0x78 - bls _0802B8C4 + bls @0802B8C4 movs r0, 0x3 bl sub_802D0C8 ldr r1, [r4] - b _0802B894 -_0802B866: + b @0802B894 +@0802B866: bl sub_802D0F0 cmp r0, 0x1 - beq _0802B8C4 + beq @0802B8C4 bl sub_802DE08 cmp r0, 0x1 - beq _0802B8C4 - b _0802B890 -_0802B878: + beq @0802B8C4 + b @0802B890 +@0802B878: movs r0, 0x9 bl sub_802D0C8 - b _0802B890 -_0802B880: + b @0802B890 +@0802B880: bl sub_802D0F0 cmp r0, 0 - bne _0802B8C4 + bne @0802B8C4 bl sub_802C260 bl sub_802D764 -_0802B890: +@0802B890: ldr r0, =0x02022cfc ldr r1, [r0] -_0802B894: +@0802B894: ldrh r0, [r1, 0xA] adds r0, 0x1 strh r0, [r1, 0xA] - b _0802B8C4 + b @0802B8C4 .align 2, 0 .pool -_0802B8A0: +@0802B8A0: bl sub_802D788 cmp r0, 0 - bne _0802B8C4 + bne @0802B8C4 bl sub_802C270 bl sub_802BEA0 ldr r0, =0x02022cfc @@ -69814,176 +69814,176 @@ _0802B8A0: ldrh r0, [r1, 0xA] adds r0, 0x1 strh r0, [r1, 0xA] -_0802B8BA: +@0802B8BA: movs r0, 0 - b _0802B8C6 + b @0802B8C6 .align 2, 0 .pool -_0802B8C4: +@0802B8C4: movs r0, 0x1 -_0802B8C6: +@0802B8C6: pop {r4,r5} pop {r1} bx r1 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 ldr r1, [r5] ldrh r4, [r1, 0x36] cmp r4, 0 - beq _0802B8E8 + beq @0802B8E8 movs r0, 0 strh r0, [r1, 0x36] - b _0802B95C + b @0802B95C .align 2, 0 .pool -_0802B8E8: +@0802B8E8: ldrh r0, [r1, 0xA] cmp r0, 0x1 - beq _0802B914 + beq @0802B914 cmp r0, 0x1 - bgt _0802B8F8 + bgt @0802B8F8 cmp r0, 0 - beq _0802B902 - b _0802B95A -_0802B8F8: + beq @0802B902 + b @0802B95A +@0802B8F8: cmp r0, 0x2 - beq _0802B938 + beq @0802B938 cmp r0, 0x3 - beq _0802B94C - b _0802B95A -_0802B902: + beq @0802B94C + b @0802B95A +@0802B902: movs r0, 0 bl sub_802C130 cmp r0, 0 - beq _0802B95A + beq @0802B95A ldr r1, [r5] ldrh r0, [r1, 0xA] adds r0, 0x1 strh r0, [r1, 0xA] -_0802B914: +@0802B914: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0802B95A + beq @0802B95A bl sub_802C164 movs r0, 0x3 bl sub_802AE14 ldr r0, =0x02022cfc ldr r1, [r0] - b _0802B944 + b @0802B944 .align 2, 0 .pool -_0802B938: +@0802B938: movs r0, 0x1 bl sub_802C130 cmp r0, 0x1 - bne _0802B95A + bne @0802B95A ldr r1, [r5] -_0802B944: +@0802B944: ldrh r0, [r1, 0xA] adds r0, 0x1 strh r0, [r1, 0xA] - b _0802B95A -_0802B94C: + b @0802B95A +@0802B94C: movs r0, 0 bl sub_802C130 cmp r0, 0x1 - bne _0802B95A + bne @0802B95A ldr r0, [r5] strh r4, [r0, 0xA] -_0802B95A: +@0802B95A: movs r0, 0x1 -_0802B95C: +@0802B95C: pop {r4,r5} pop {r1} bx r1 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] ldrh r0, [r0, 0xA] adds r5, r1, 0 cmp r0, 0x4 - bhi _0802BA50 + bhi @0802BA50 lsls r0, 2 - ldr r1, =_0802B984 + ldr r1, =@0802B984 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0802B984: - .4byte _0802B998 - .4byte _0802B9BC - .4byte _0802BA00 - .4byte _0802BA24 - .4byte _0802BA46 -_0802B998: +@0802B984: + .4byte @0802B998 + .4byte @0802B9BC + .4byte @0802BA00 + .4byte @0802BA24 + .4byte @0802BA46 +@0802B998: movs r4, 0 ldr r0, [r5] ldrb r0, [r0, 0x5] cmp r4, r0 - bge _0802B9B8 + bge @0802B9B8 adds r6, r5, 0 -_0802B9A4: +@0802B9A4: adds r0, r4, 0 bl sub_802DDB8 cmp r0, 0x1 - beq _0802BA50 + beq @0802BA50 adds r4, 0x1 ldr r0, [r6] ldrb r0, [r0, 0x5] cmp r4, r0 - blt _0802B9A4 -_0802B9B8: + blt @0802B9A4 +@0802B9B8: ldr r1, [r5] - b _0802BA1C -_0802B9BC: + b @0802BA1C +@0802B9BC: movs r4, 0 ldr r0, [r5] ldrb r0, [r0, 0x5] cmp r4, r0 - bge _0802B9EC + bge @0802B9EC adds r6, r5, 0 movs r5, 0 -_0802B9CA: +@0802B9CA: ldr r0, [r6] adds r0, r5 ldr r1, =0x000082f4 adds r0, r1 ldrh r0, [r0] cmp r0, 0x2 - bne _0802B9E0 + bne @0802B9E0 lsls r0, r4, 24 lsrs r0, 24 bl sub_802DDA0 -_0802B9E0: +@0802B9E0: adds r5, 0x28 adds r4, 0x1 ldr r0, [r6] ldrb r0, [r0, 0x5] cmp r4, r0 - blt _0802B9CA -_0802B9EC: + blt @0802B9CA +@0802B9EC: movs r0, 0x1 bl sub_802D0C8 ldr r0, =0x02022cfc ldr r1, [r0] - b _0802BA18 + b @0802BA18 .align 2, 0 .pool -_0802BA00: +@0802BA00: ldr r1, [r5] ldrh r0, [r1, 0x3C] adds r0, 0x1 @@ -69991,23 +69991,23 @@ _0802BA00: lsls r0, 16 lsrs r0, 16 cmp r0, 0x64 - bls _0802BA50 + bls @0802BA50 movs r0, 0x3 bl sub_802D0C8 ldr r1, [r5] -_0802BA18: +@0802BA18: movs r0, 0 strh r0, [r1, 0x3C] -_0802BA1C: +@0802BA1C: ldrh r0, [r1, 0xA] adds r0, 0x1 strh r0, [r1, 0xA] - b _0802BA50 -_0802BA24: + b @0802BA50 +@0802BA24: bl sub_802D0F0 adds r5, r0, 0 cmp r5, 0 - bne _0802BA50 + bne @0802BA50 bl sub_802DDCC ldr r4, =0x02022cfc ldr r0, [r4] @@ -70018,47 +70018,47 @@ _0802BA24: ldrh r0, [r1, 0xA] adds r0, 0x1 strh r0, [r1, 0xA] -_0802BA46: +@0802BA46: movs r0, 0 - b _0802BA52 + b @0802BA52 .align 2, 0 .pool -_0802BA50: +@0802BA50: movs r0, 0x1 -_0802BA52: +@0802BA52: pop {r4-r6} pop {r1} bx r1 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] ldrh r0, [r0, 0xA] adds r4, r1, 0 cmp r0, 0x6 - bls _0802BA68 - b _0802BB7C -_0802BA68: + bls @0802BA68 + b @0802BB7C +@0802BA68: lsls r0, 2 - ldr r1, =_0802BA7C + ldr r1, =@0802BA7C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0802BA7C: - .4byte _0802BA98 - .4byte _0802BAB8 - .4byte _0802BAD0 - .4byte _0802BB00 - .4byte _0802BAB8 - .4byte _0802BAD0 - .4byte _0802BB70 -_0802BA98: +@0802BA7C: + .4byte @0802BA98 + .4byte @0802BAB8 + .4byte @0802BAD0 + .4byte @0802BB00 + .4byte @0802BAB8 + .4byte @0802BAD0 + .4byte @0802BB70 +@0802BA98: ldr r2, [r4] adds r0, r2, 0 adds r0, 0x72 @@ -70072,19 +70072,19 @@ _0802BA98: adds r1, 0x40 ldrh r1, [r1] bl sub_802D7E8 - b _0802BAF0 -_0802BAB8: + b @0802BAF0 +@0802BAB8: bl sub_802D974 adds r2, r0, 0 cmp r2, 0 - bne _0802BB7C + bne @0802BB7C ldr r0, =0x02022cfc ldr r1, [r0] strh r2, [r1, 0x3C] - b _0802BAF2 + b @0802BAF2 .align 2, 0 .pool -_0802BAD0: +@0802BAD0: ldr r1, [r4] ldrh r0, [r1, 0x3C] adds r2, r0, 0x1 @@ -70094,26 +70094,26 @@ _0802BAD0: movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne _0802BAEC + bne @0802BAEC lsls r0, r2, 16 lsrs r0, 16 cmp r0, 0xB4 - bls _0802BB7C -_0802BAEC: + bls @0802BB7C +@0802BAEC: bl sub_802DA14 -_0802BAF0: +@0802BAF0: ldr r1, [r4] -_0802BAF2: +@0802BAF2: ldrh r0, [r1, 0xA] adds r0, 0x1 strh r0, [r1, 0xA] - b _0802BB7C + b @0802BB7C .align 2, 0 .pool -_0802BB00: +@0802BB00: bl sub_802DA44 cmp r0, 0 - bne _0802BB7C + bne @0802BB7C ldr r4, =0x02022cfc ldr r1, [r4] ldrh r0, [r1, 0x3E] @@ -70126,106 +70126,106 @@ _0802BB00: strh r0, [r2] lsls r0, 16 cmp r0, 0 - beq _0802BB58 + beq @0802BB58 ldrh r0, [r1, 0x3E] ldrh r1, [r2] bl bag_add_item lsls r0, 24 cmp r0, 0 - beq _0802BB58 + beq @0802BB58 ldr r0, [r4] ldrh r0, [r0, 0x3E] movs r1, 0x1 bl sub_80D6800 lsls r0, 24 cmp r0, 0 - bne _0802BB50 + bne @0802BB50 ldr r0, [r4] ldrh r0, [r0, 0x3E] bl sub_802D884 - b _0802BB62 + b @0802BB62 .align 2, 0 .pool -_0802BB50: +@0802BB50: ldr r1, [r4] movs r0, 0x6 strh r0, [r1, 0xA] - b _0802BB7C -_0802BB58: + b @0802BB7C +@0802BB58: ldr r4, =0x02022cfc ldr r0, [r4] ldrh r0, [r0, 0x3E] bl sub_802D8FC -_0802BB62: +@0802BB62: ldr r1, [r4] movs r0, 0x4 strh r0, [r1, 0xA] - b _0802BB7C + b @0802BB7C .align 2, 0 .pool -_0802BB70: +@0802BB70: bl sub_802DA44 cmp r0, 0 - bne _0802BB7C + bne @0802BB7C movs r0, 0 - b _0802BB7E -_0802BB7C: + b @0802BB7E +@0802BB7C: movs r0, 0x1 -_0802BB7E: +@0802BB7E: pop {r4} pop {r1} bx r1 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] ldrh r0, [r0, 0xA] cmp r0, 0x6 - bhi _0802BC58 + bhi @0802BC58 lsls r0, 2 - ldr r1, =_0802BBA4 + ldr r1, =@0802BBA4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0802BBA4: - .4byte _0802BBC0 - .4byte _0802BBC4 - .4byte _0802BBCE - .4byte _0802BC1C - .4byte _0802BC26 - .4byte _0802BC3C - .4byte _0802BC4E -_0802BBC0: +@0802BBA4: + .4byte @0802BBC0 + .4byte @0802BBC4 + .4byte @0802BBCE + .4byte @0802BC1C + .4byte @0802BC26 + .4byte @0802BC3C + .4byte @0802BC4E +@0802BBC0: movs r0, 0x4 - b _0802BC28 -_0802BBC4: + b @0802BC28 +@0802BBC4: bl sub_802D0F0 cmp r0, 0 - bne _0802BC58 - b _0802BC2C -_0802BBCE: + bne @0802BC58 + b @0802BC2C +@0802BBCE: bl sub_802DA8C lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _0802BC04 + beq @0802BC04 cmp r1, 0 - bgt _0802BBE8 + bgt @0802BBE8 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _0802BBEC - b _0802BC58 -_0802BBE8: + beq @0802BBEC + b @0802BC58 +@0802BBE8: cmp r1, 0x1 - bne _0802BC58 -_0802BBEC: + bne @0802BC58 +@0802BBEC: ldr r4, =0x02022cfc ldr r0, [r4] adds r0, 0x45 @@ -70234,10 +70234,10 @@ _0802BBEC: movs r0, 0x6 bl sub_802D0C8 ldr r1, [r4] - b _0802BC30 + b @0802BC30 .align 2, 0 .pool -_0802BC04: +@0802BC04: ldr r4, =0x02022cfc ldr r0, [r4] adds r0, 0x45 @@ -70246,52 +70246,52 @@ _0802BC04: movs r0, 0x6 bl sub_802D0C8 ldr r1, [r4] - b _0802BC30 + b @0802BC30 .align 2, 0 .pool -_0802BC1C: +@0802BC1C: bl sub_802D0F0 cmp r0, 0 - bne _0802BC58 - b _0802BC2C -_0802BC26: + bne @0802BC58 + b @0802BC2C +@0802BC26: movs r0, 0x8 -_0802BC28: +@0802BC28: bl sub_802D0C8 -_0802BC2C: +@0802BC2C: ldr r0, =0x02022cfc ldr r1, [r0] -_0802BC30: +@0802BC30: ldrh r0, [r1, 0xA] adds r0, 0x1 strh r0, [r1, 0xA] - b _0802BC58 + b @0802BC58 .align 2, 0 .pool -_0802BC3C: +@0802BC3C: bl sub_802D0F0 cmp r0, 0 - bne _0802BC58 + bne @0802BC58 ldr r0, =0x02022cfc ldr r1, [r0] ldrh r0, [r1, 0xA] adds r0, 0x1 strh r0, [r1, 0xA] -_0802BC4E: +@0802BC4E: movs r0, 0 - b _0802BC5A + b @0802BC5A .align 2, 0 .pool -_0802BC58: +@0802BC58: movs r0, 0x1 -_0802BC5A: +@0802BC5A: pop {r4} pop {r1} bx r1 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 @@ -70299,44 +70299,44 @@ sub_802BC60: @ 802BC60 ldrh r0, [r0, 0xA] adds r4, r1, 0 cmp r0, 0x5 - bhi _0802BD24 + bhi @0802BD24 lsls r0, 2 - ldr r1, =_0802BC84 + ldr r1, =@0802BC84 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0802BC84: - .4byte _0802BC9C - .4byte _0802BCA2 - .4byte _0802BCB2 - .4byte _0802BCC8 - .4byte _0802BCEE - .4byte _0802BD14 -_0802BC9C: +@0802BC84: + .4byte @0802BC9C + .4byte @0802BCA2 + .4byte @0802BCB2 + .4byte @0802BCC8 + .4byte @0802BCEE + .4byte @0802BD14 +@0802BC9C: bl sub_802DA14 - b _0802BCFE -_0802BCA2: + b @0802BCFE +@0802BCA2: bl sub_802DA44 cmp r0, 0 - bne _0802BD24 + bne @0802BD24 movs r0, 0x7 bl sub_802D0C8 - b _0802BCFE -_0802BCB2: + b @0802BCFE +@0802BCB2: bl sub_802D0F0 adds r2, r0, 0 cmp r2, 0 - bne _0802BD24 + bne @0802BD24 ldr r0, =0x02022cfc ldr r1, [r0] strh r2, [r1, 0x3C] - b _0802BD02 + b @0802BD02 .align 2, 0 .pool -_0802BCC8: +@0802BCC8: ldr r1, [r4] ldrh r0, [r1, 0x3C] adds r0, 0x1 @@ -70344,7 +70344,7 @@ _0802BCC8: lsls r0, 16 lsrs r0, 16 cmp r0, 0x78 - bls _0802BD24 + bls @0802BD24 movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -70354,37 +70354,37 @@ _0802BCC8: movs r3, 0x10 bl sub_80A1AD4 ldr r1, [r4] - b _0802BD02 -_0802BCEE: + b @0802BD02 +@0802BCEE: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0802BD24 + bne @0802BD24 bl sub_800AC34 -_0802BCFE: +@0802BCFE: ldr r0, =0x02022cfc ldr r1, [r0] -_0802BD02: +@0802BD02: ldrh r0, [r1, 0xA] adds r0, 0x1 strh r0, [r1, 0xA] - b _0802BD24 + b @0802BD24 .align 2, 0 .pool -_0802BD14: +@0802BD14: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _0802BD24 + bne @0802BD24 movs r0, 0 - b _0802BD26 + b @0802BD26 .align 2, 0 .pool -_0802BD24: +@0802BD24: movs r0, 0x1 -_0802BD26: +@0802BD26: add sp, 0x4 pop {r4} pop {r1} @@ -70392,25 +70392,25 @@ _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] ldrh r0, [r0, 0xA] cmp r0, 0x1 - beq _0802BD66 + beq @0802BD66 cmp r0, 0x1 - bgt _0802BD4C + bgt @0802BD4C cmp r0, 0 - beq _0802BD52 - b _0802BD7A + beq @0802BD52 + b @0802BD7A .align 2, 0 .pool -_0802BD4C: +@0802BD4C: cmp r0, 0x2 - beq _0802BD76 - b _0802BD7A -_0802BD52: + beq @0802BD76 + b @0802BD7A +@0802BD52: bl sub_802DA14 movs r0, 0 bl sub_802DD64 @@ -70418,28 +70418,28 @@ _0802BD52: ldrh r0, [r1, 0xA] adds r0, 0x1 strh r0, [r1, 0xA] - b _0802BD7A -_0802BD66: + b @0802BD7A +@0802BD66: bl sub_802DA44 cmp r0, 0 - bne _0802BD7A + bne @0802BD7A ldr r1, [r4] ldrh r0, [r1, 0xA] adds r0, 0x1 strh r0, [r1, 0xA] -_0802BD76: +@0802BD76: movs r0, 0 - b _0802BD7C -_0802BD7A: + b @0802BD7C +@0802BD7A: movs r0, 0x1 -_0802BD7C: +@0802BD7C: pop {r4} pop {r1} bx r1 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 @@ -70461,30 +70461,30 @@ sub_802BD84: @ 802BD84 movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 - beq _0802BDC8 + beq @0802BDC8 cmp r0, 0x1 - beq _0802BDDC - b _0802BE48 + beq @0802BDDC + b @0802BE48 .align 2, 0 .pool -_0802BDBC: +@0802BDBC: bl sub_802AB20 mov r0, r10 bl remove_task - b _0802BE48 -_0802BDC8: + b @0802BE48 +@0802BDC8: movs r1, 0 adds r0, r6, 0 adds r0, 0x8 -_0802BDCE: +@0802BDCE: strh r1, [r0, 0x4] subs r0, 0x2 cmp r0, r6 - bge _0802BDCE + bge @0802BDCE ldrh r0, [r6] adds r0, 0x1 strh r0, [r6] -_0802BDDC: +@0802BDDC: mov r3, r8 ldrb r1, [r3, 0x6] lsls r0, r1, 1 @@ -70501,18 +70501,18 @@ _0802BDDC: lsls r7, 8 add r7, r8 add r4, r8 -_0802BDFE: +@0802BDFE: movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0 - bne _0802BE38 + bne @0802BE38 adds r0, r2, 0 adds r1, r4, 0 str r2, [sp] bl sub_802E0D0 ldr r2, [sp] cmp r0, 0 - beq _0802BE38 + beq @0802BE38 ldr r1, =0x020229f0 add r1, r9 adds r0, r7, 0 @@ -70528,8 +70528,8 @@ _0802BDFE: mov r1, r8 ldrb r1, [r1, 0x5] cmp r0, r1 - beq _0802BDBC -_0802BE38: + beq @0802BDBC +@0802BE38: adds r5, 0x2 movs r3, 0x1C add r9, r3 @@ -70537,8 +70537,8 @@ _0802BE38: adds r4, 0xC adds r2, 0x1 cmp r2, 0x4 - ble _0802BDFE -_0802BE48: + ble @0802BDFE +@0802BE48: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -70552,7 +70552,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 @@ -70570,7 +70570,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 @@ -70589,7 +70589,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] @@ -70624,7 +70624,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] @@ -70632,7 +70632,7 @@ sub_802BEE4: @ 802BEE4 adds r0, 0x46 ldrb r0, [r0] cmp r0, 0 - beq _0802BF34 + beq @0802BF34 adds r1, 0x4A ldrh r0, [r1] adds r0, 0x1 @@ -70645,11 +70645,11 @@ sub_802BEE4: @ 802BEE4 lsls r1, r2, 16 ldr r0, =0x09fe0000 cmp r1, r0 - bls _0802BF16 + bls @0802BF16 ldr r1, =0xfffff601 adds r0, r2, r1 strh r0, [r3, 0x34] -_0802BF16: +@0802BF16: ldr r1, [r4] ldr r2, [r1, 0x14] str r2, [r1, 0x18] @@ -70657,14 +70657,14 @@ _0802BF16: lsrs r0, 8 str r0, [r1, 0x14] cmp r0, 0x6 - bls _0802BF34 + bls @0802BF34 cmp r2, 0x6 - bhi _0802BF34 + bhi @0802BF34 ldrh r0, [r1, 0x36] adds r0, 0x1 strh r0, [r1, 0x36] bl sub_802BF7C -_0802BF34: +@0802BF34: pop {r4} pop {r0} bx r0 @@ -70673,31 +70673,31 @@ _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] ldr r0, [r2, 0x10] cmp r0, 0 - beq _0802BF5C + beq @0802BF5C movs r0, 0 - b _0802BF72 + b @0802BF72 .align 2, 0 .pool -_0802BF5C: +@0802BF5C: ldr r3, [r2, 0x1C] ldrh r1, [r2, 0x34] ldr r0, =0x000005ff cmp r1, r0 - bhi _0802BF70 + bhi @0802BF70 ldr r0, [r2, 0x20] adds r0, 0x50 str r0, [r2, 0x20] lsrs r0, 8 adds r3, r0 -_0802BF70: +@0802BF70: adds r0, r3, 0 -_0802BF72: +@0802BF72: pop {r1} bx r1 .align 2, 0 @@ -70705,7 +70705,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] @@ -70715,39 +70715,39 @@ sub_802BF7C: @ 802BF7C adds r1, 0x4E ldrh r0, [r1] cmp r0, 0 - beq _0802BFC0 + beq @0802BFC0 subs r0, 0x1 strh r0, [r1] ldr r0, [r3, 0x6C] cmp r0, 0 - beq _0802C08A + beq @0802C08A bl sub_802C098 movs r1, 0x3 ands r1, r0 cmp r1, 0 - beq _0802BFB0 + beq @0802BFB0 ldr r1, [r4] - b _0802C086 + b @0802C086 .align 2, 0 .pool -_0802BFB0: +@0802BFB0: ldr r1, [r4] ldr r0, [r1, 0x28] cmp r0, 0x36 - bls _0802BFBC + bls @0802BFBC movs r0, 0x1E - b _0802C088 -_0802BFBC: + b @0802C088 +@0802BFBC: movs r0, 0x52 - b _0802C088 -_0802BFC0: + b @0802C088 +@0802BFC0: adds r2, r3, 0 adds r2, 0x50 ldrb r1, [r2] movs r0, 0x8 ands r0, r1 cmp r0, 0 - bne _0802C014 + bne @0802C014 ldr r0, =0x082fb63c ldrb r1, [r2] lsls r1, 1 @@ -70776,26 +70776,26 @@ _0802BFC0: ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] - b _0802C082 + b @0802C082 .align 2, 0 .pool -_0802C014: +@0802C014: lsls r0, r1, 24 lsrs r0, 24 cmp r0, 0x8 - bne _0802C030 + bne @0802C030 adds r1, r3, 0 adds r1, 0x51 ldrb r0, [r1] cmp r0, 0x2 - bhi _0802C02C + bhi @0802C02C adds r0, 0x1 strb r0, [r1] - b _0802C030 -_0802C02C: + b @0802C030 +@0802C02C: movs r0, 0x1 str r0, [r3, 0x6C] -_0802C030: +@0802C030: ldr r2, =0x082fb63c ldr r4, =0x02022cfc ldr r0, [r4] @@ -70822,29 +70822,29 @@ _0802C030: lsls r0, 24 lsrs r0, 24 cmp r0, 0xF - bls _0802C082 + bls @0802C082 bl sub_802C098 movs r1, 0x3 ands r1, r0 cmp r1, 0 - bne _0802C07A + bne @0802C07A ldr r1, [r4] ldr r0, [r1, 0x28] subs r0, 0x5 str r0, [r1, 0x28] -_0802C07A: +@0802C07A: ldr r0, [r4] adds r0, 0x50 movs r1, 0 strb r1, [r0] -_0802C082: +@0802C082: ldr r0, =0x02022cfc ldr r1, [r0] -_0802C086: +@0802C086: ldr r0, [r1, 0x28] -_0802C088: +@0802C088: str r0, [r1, 0x1C] -_0802C08A: +@0802C08A: pop {r4} pop {r0} bx r0 @@ -70853,7 +70853,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] @@ -70869,7 +70869,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] @@ -70887,7 +70887,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] @@ -70897,14 +70897,14 @@ 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 movs r3, 0 movs r2, 0 movs r1, 0x4 -_0802C0F4: +@0802C0F4: ldr r0, [r5] adds r0, r4 adds r0, r2 @@ -70912,7 +70912,7 @@ _0802C0F4: adds r2, 0x28 subs r1, 0x1 cmp r1, 0 - bge _0802C0F4 + bge @0802C0F4 pop {r4,r5} pop {r0} bx r0 @@ -70921,7 +70921,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 @@ -70937,7 +70937,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 @@ -70952,20 +70952,20 @@ sub_802C130: @ 802C130 adds r2, r1 ldrh r1, [r2] cmp r1, r0 - beq _0802C15C + beq @0802C15C movs r0, 0 - b _0802C15E + b @0802C15E .align 2, 0 .pool -_0802C15C: +@0802C15C: movs r0, 0x1 -_0802C15E: +@0802C15E: pop {r1} bx r1 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 @@ -70986,7 +70986,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] @@ -71012,7 +71012,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 @@ -71029,13 +71029,13 @@ 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] ldr r0, [r1, 0x5C] cmp r0, 0 - beq _0802C21C + beq @0802C21C ldr r0, [r1, 0x78] bl sub_802DD64 ldr r1, [r4] @@ -71045,7 +71045,7 @@ sub_802C1DC: @ 802C1DC adds r0, 0x4D ldrb r0, [r0] cmp r0, 0 - beq _0802C21C + beq @0802C21C adds r0, r1, 0 adds r0, 0x71 ldrb r0, [r0] @@ -71059,7 +71059,7 @@ sub_802C1DC: @ 802C1DC ldr r0, [r4] adds r0, 0x4D strb r5, [r0] -_0802C21C: +@0802C21C: ldr r0, =0x02022cfc ldr r0, [r0] adds r0, 0x74 @@ -71075,7 +71075,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] @@ -71083,10 +71083,10 @@ sub_802C240: @ 802C240 adds r0, 0x46 ldrb r0, [r0] cmp r0, 0 - beq _0802C256 + beq @0802C256 ldr r0, [r1, 0x14] bl sub_802DC9C -_0802C256: +@0802C256: pop {r0} bx r0 .align 2, 0 @@ -71094,7 +71094,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 @@ -71106,7 +71106,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 @@ -71118,7 +71118,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 @@ -71132,11 +71132,11 @@ sub_802C280: @ 802C280 mov r9, r0 movs r5, 0 cmp r6, r9 - bge _0802C360 + bge @0802C360 mov r10, r2 mov r8, r5 movs r7, 0 -_0802C2A2: +@0802C2A2: mov r0, r10 ldr r3, [r0] adds r1, r3, r7 @@ -71144,29 +71144,29 @@ _0802C2A2: adds r0, r1, r2 ldrh r2, [r0] cmp r2, 0x1 - beq _0802C2D4 + beq @0802C2D4 cmp r2, 0x1 - bgt _0802C2C4 + bgt @0802C2C4 cmp r2, 0 - beq _0802C2CA - b _0802C354 + beq @0802C2CA + b @0802C354 .align 2, 0 .pool -_0802C2C4: +@0802C2C4: cmp r2, 0x2 - beq _0802C338 - b _0802C354 -_0802C2CA: + beq @0802C338 + b @0802C354 +@0802C2CA: adds r0, r5, 0 movs r1, 0 bl sub_802DC80 - b _0802C354 -_0802C2D4: + b @0802C354 +@0802C2D4: ldr r0, =0x000082f6 adds r4, r1, r0 ldrh r0, [r4] cmp r0, 0x1 - bne _0802C2F6 + bne @0802C2F6 ldr r0, =0x000082f2 adds r0, r1 adds r1, r3, 0 @@ -71178,13 +71178,13 @@ _0802C2D4: ldr r0, [sp] ldrh r0, [r0] cmp r12, r0 - beq _0802C31E -_0802C2F6: + beq @0802C31E +@0802C2F6: ldrb r3, [r3, 0x6] cmp r5, r3 - bne _0802C2FE + bne @0802C2FE strh r2, [r4] -_0802C2FE: +@0802C2FE: orrs r6, r2 mov r1, r10 ldr r2, [r1] @@ -71201,53 +71201,53 @@ _0802C2FE: adds r2, r0 ldrh r0, [r2] strh r0, [r1] -_0802C31E: +@0802C31E: adds r0, r5, 0 bl sub_802C398 - b _0802C354 + b @0802C354 .align 2, 0 .pool -_0802C338: +@0802C338: ldr r0, =0x000082f6 adds r1, r0 ldrh r0, [r1] cmp r0, 0x2 - beq _0802C354 + beq @0802C354 ldrb r3, [r3, 0x6] cmp r5, r3 - bne _0802C34A + bne @0802C34A strh r2, [r1] -_0802C34A: +@0802C34A: orrs r6, r2 lsls r0, r5, 24 lsrs r0, 24 bl sub_802DD88 -_0802C354: +@0802C354: movs r1, 0x2 add r8, r1 adds r7, 0x28 adds r5, 0x1 cmp r5, r9 - blt _0802C2A2 -_0802C360: + blt @0802C2A2 +@0802C360: movs r0, 0x2 ands r0, r6 cmp r0, 0 - beq _0802C378 + beq @0802C378 movs r0, 0x83 lsls r0, 1 bl audio_play - b _0802C386 + b @0802C386 .align 2, 0 .pool -_0802C378: +@0802C378: movs r0, 0x1 ands r6, r0 cmp r6, 0 - beq _0802C386 + beq @0802C386 movs r0, 0xA bl audio_play -_0802C386: +@0802C386: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -71259,14 +71259,14 @@ _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 ldr r2, [r0] ldr r0, [r2, 0x68] cmp r0, 0 - bne _0802C432 + bne @0802C432 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -71276,14 +71276,14 @@ sub_802C398: @ 802C398 ldr r1, [r5, 0x4] ldr r0, =0x7fffffff cmp r1, r0 - beq _0802C3D0 + beq @0802C3D0 adds r0, r1, 0x1 str r0, [r5, 0x4] adds r3, r0, 0 - b _0802C3E8 + b @0802C3E8 .align 2, 0 .pool -_0802C3D0: +@0802C3D0: adds r0, r2, 0 adds r0, 0x4A ldrh r1, [r0] @@ -71291,18 +71291,18 @@ _0802C3D0: subs r3, r1, r0 ldr r0, =0x0000fde7 cmp r3, r0 - ble _0802C3E6 + ble @0802C3E6 ldr r0, =0xffff0218 adds r3, r0 adds r3, r1 -_0802C3E6: +@0802C3E6: str r3, [r5, 0x4] -_0802C3E8: +@0802C3E8: cmp r3, 0x3 - ble _0802C432 + ble @0802C432 subs r3, 0x4 cmp r3, 0x2F - bgt _0802C414 + bgt @0802C414 ldr r2, =0x082fb65c ldrh r1, [r5, 0xC] lsls r0, r1, 1 @@ -71312,26 +71312,26 @@ _0802C3E8: adds r0, r2 movs r4, 0 ldrsb r4, [r0, r4] - b _0802C416 + b @0802C416 .align 2, 0 .pool -_0802C414: +@0802C414: movs r4, 0 -_0802C416: +@0802C416: adds r1, r4, 0 adds r0, r6, 0 bl sub_802DC80 cmp r4, 0 - bne _0802C430 + bne @0802C430 ldr r0, =0x02022cfc ldr r0, [r0] ldrb r0, [r0, 0x6] cmp r6, r0 - bne _0802C430 + bne @0802C430 bl sub_802C1BC -_0802C430: +@0802C430: str r4, [r5] -_0802C432: +@0802C432: pop {r4-r6} pop {r0} bx r0 @@ -71340,19 +71340,19 @@ _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] ldr r0, [r1, 0x14] cmp r0, 0x8 - bne _0802C4CE + bne @0802C4CE ldr r0, [r1, 0x18] cmp r0, 0x7 - bne _0802C4CE + bne @0802C4CE ldr r4, [r1, 0x58] cmp r4, 0 - bne _0802C46C + bne @0802C46C bl sub_802C780 ldr r0, [r5] str r4, [r0, 0x54] @@ -71360,28 +71360,28 @@ sub_802C43C: @ 802C43C str r1, [r0, 0x58] adds r0, 0x71 strb r4, [r0] - b _0802C4CE + b @0802C4CE .align 2, 0 .pool -_0802C46C: +@0802C46C: ldr r0, [r1, 0x54] cmp r0, 0x5 - bne _0802C480 + bne @0802C480 ldrh r0, [r1, 0xC] adds r0, 0x1 strh r0, [r1, 0xC] ldrh r0, [r1, 0xC] bl sub_802C7A0 - b _0802C484 -_0802C480: + b @0802C484 +@0802C480: movs r0, 0 strh r0, [r1, 0xC] -_0802C484: +@0802C484: ldr r4, =0x02022cfc ldr r1, [r4] ldr r0, [r1, 0x54] cmp r0, 0x1 - ble _0802C49E + ble @0802C49E movs r0, 0x1 str r0, [r1, 0x64] adds r0, r1, 0 @@ -71389,7 +71389,7 @@ _0802C484: adds r1, 0x81 movs r2, 0x5 bl memcpy -_0802C49E: +@0802C49E: bl sub_802C780 ldr r0, [r4] movs r2, 0 @@ -71404,28 +71404,28 @@ _0802C49E: ldrh r1, [r2] ldr r0, =0x0000270e cmp r1, r0 - bhi _0802C4C2 + bhi @0802C4C2 adds r0, r1, 0x1 strh r0, [r2] -_0802C4C2: +@0802C4C2: movs r0, 0xA bl sub_802C688 movs r0, 0x3 bl sub_802AE14 -_0802C4CE: +@0802C4CE: ldr r4, =0x02022cfc ldr r0, [r4] ldr r0, [r0, 0x64] cmp r0, 0 - beq _0802C504 + beq @0802C504 bl sub_802C618 cmp r0, 0x1 - beq _0802C4E8 + beq @0802C4E8 ldr r0, [r4] ldr r0, [r0, 0x14] cmp r0, 0 - bne _0802C504 -_0802C4E8: + bne @0802C504 +@0802C4E8: ldr r0, [r4] adds r0, 0x86 bl sub_802C73C @@ -71436,25 +71436,25 @@ _0802C4E8: ldr r1, [r4] movs r0, 0 str r0, [r1, 0x64] -_0802C504: +@0802C504: ldr r4, =0x02022cfc ldr r0, [r4] ldr r0, [r0, 0x58] cmp r0, 0 - beq _0802C52A + beq @0802C52A bl sub_802C6B0 adds r2, r0, 0 ldr r1, [r4] ldr r0, [r1, 0x54] cmp r2, r0 - ble _0802C52A + ble @0802C52A str r2, [r1, 0x54] adds r0, r1, 0 adds r0, 0x81 adds r1, 0x7C movs r2, 0x5 bl memcpy -_0802C52A: +@0802C52A: pop {r4,r5} pop {r0} bx r0 @@ -71463,80 +71463,80 @@ _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] ldr r0, [r1, 0x14] cmp r0, 0x6 - bne _0802C582 + bne @0802C582 ldr r4, =0x000083ac adds r0, r1, r4 ldr r1, [r0] ldr r0, [r1] cmp r0, 0 - bne _0802C582 + bne @0802C582 ldrh r0, [r1, 0x12] cmp r0, 0x1 - bne _0802C578 + bne @0802C578 bl sub_802C0DC adds r1, r0, 0 cmp r1, 0x1 - bne _0802C578 + bne @0802C578 ldr r0, [r5] adds r0, r4 ldr r0, [r0] str r1, [r0, 0x14] - b _0802C582 + b @0802C582 .align 2, 0 .pool -_0802C574: +@0802C574: movs r0, 0 - b _0802C5CA -_0802C578: + b @0802C5CA +@0802C578: bl sub_802C18C movs r0, 0x3 bl sub_802AE14 -_0802C582: +@0802C582: ldr r0, =0x02022cfc ldr r1, [r0] ldr r0, [r1, 0x14] cmp r0, 0x7 - bne _0802C5A8 + bne @0802C5A8 ldr r0, [r1, 0x18] cmp r0, 0x6 - bne _0802C5A8 + bne @0802C5A8 ldr r2, =0x000083ac adds r0, r1, r2 ldr r1, [r0] ldrh r0, [r1, 0x10] cmp r0, 0x2 - beq _0802C5A8 + beq @0802C5A8 movs r0, 0x1 str r0, [r1, 0x14] movs r0, 0x3 bl sub_802AE14 -_0802C5A8: +@0802C5A8: movs r2, 0 ldr r0, =0x02022cfc ldr r0, [r0] ldrb r1, [r0, 0x5] cmp r2, r1 - bge _0802C5C8 + bge @0802C5C8 adds r3, r1, 0 ldr r4, =0x000082f4 adds r1, r0, r4 -_0802C5BA: +@0802C5BA: ldrh r0, [r1] cmp r0, 0x2 - beq _0802C574 + beq @0802C574 adds r1, 0x28 adds r2, 0x1 cmp r2, r3 - blt _0802C5BA -_0802C5C8: + blt @0802C5BA +@0802C5C8: movs r0, 0x1 -_0802C5CA: +@0802C5CA: pop {r4,r5} pop {r1} bx r1 @@ -71545,33 +71545,33 @@ _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] ldrb r3, [r0, 0x5] movs r4, 0 cmp r4, r3 - bge _0802C600 + bge @0802C600 ldr r1, =0x000082f8 adds r2, r0, r1 adds r1, r3, 0 -_0802C5F0: +@0802C5F0: ldr r0, [r2] cmp r0, 0 - beq _0802C5F8 + beq @0802C5F8 adds r4, 0x1 -_0802C5F8: +@0802C5F8: adds r2, 0x28 subs r1, 0x1 cmp r1, 0 - bne _0802C5F0 -_0802C600: + bne @0802C5F0 +@0802C600: movs r0, 0 cmp r4, r3 - bne _0802C608 + bne @0802C608 movs r0, 0x1 -_0802C608: +@0802C608: pop {r4} pop {r1} bx r1 @@ -71580,40 +71580,40 @@ _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 ldr r0, [r0] ldrb r1, [r0, 0x5] cmp r2, r1 - bge _0802C648 + bge @0802C648 adds r3, r1, 0 ldr r4, =0x000082f8 adds r1, r0, r4 -_0802C62C: +@0802C62C: ldr r0, [r1] cmp r0, 0x1 - beq _0802C640 + beq @0802C640 movs r0, 0 - b _0802C64A + b @0802C64A .align 2, 0 .pool -_0802C640: +@0802C640: adds r1, 0x28 adds r2, 0x1 cmp r2, r3 - blt _0802C62C -_0802C648: + blt @0802C62C +@0802C648: movs r0, 0x1 -_0802C64A: +@0802C64A: pop {r4} pop {r1} bx r1 thumb_func_end sub_802C618 thumb_func_start sub_802C650 -sub_802C650: @ 802C650 +sub_802C650: ; 802C650 push {lr} ldr r0, =0x02022cfc ldr r1, [r0] @@ -71621,36 +71621,36 @@ sub_802C650: @ 802C650 adds r0, 0x45 ldrb r0, [r0] cmp r0, 0x1 - bne _0802C668 -_0802C660: + bne @0802C668 +@0802C660: movs r0, 0 - b _0802C684 + b @0802C684 .align 2, 0 .pool -_0802C668: +@0802C668: movs r2, 0x1 ldrb r0, [r1, 0x5] cmp r2, r0 - bge _0802C682 + bge @0802C682 adds r3, r0, 0 adds r1, 0x92 -_0802C674: +@0802C674: ldrh r0, [r1] cmp r0, 0x1 - beq _0802C660 + beq @0802C660 adds r1, 0x2 adds r2, 0x1 cmp r2, r3 - blt _0802C674 -_0802C682: + blt @0802C674 +@0802C682: movs r0, 0x1 -_0802C684: +@0802C684: pop {r1} bx r1 thumb_func_end sub_802C650 thumb_func_start sub_802C688 -sub_802C688: @ 802C688 +sub_802C688: ; 802C688 push {lr} ldr r1, =0x02022cfc ldr r2, [r1] @@ -71661,10 +71661,10 @@ sub_802C688: @ 802C688 str r0, [r2, 0x5C] ldr r0, =0x00018695 cmp r1, r0 - bls _0802C6A2 + bls @0802C6A2 adds r0, 0x1 str r0, [r2, 0x78] -_0802C6A2: +@0802C6A2: pop {r0} bx r0 .align 2, 0 @@ -71672,7 +71672,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 @@ -71680,41 +71680,41 @@ sub_802C6B0: @ 802C6B0 ldrb r4, [r0, 0x5] movs r2, 0 cmp r5, r4 - bge _0802C702 + bge @0802C702 mov r12, r1 movs r3, 0 ldr r7, =0x000082e4 movs r6, 0x1E negs r6, r6 -_0802C6CA: +@0802C6CA: mov r0, r12 ldr r1, [r0] adds r0, r1, r7 adds r0, r3 ldr r0, [r0] cmp r0, r6 - bne _0802C6F0 + bne @0802C6F0 adds r0, r1, 0 adds r0, 0x7C adds r0, r2 movs r1, 0x1 strb r1, [r0] adds r5, 0x1 - b _0802C6FA + b @0802C6FA .align 2, 0 .pool -_0802C6F0: +@0802C6F0: adds r0, r1, 0 adds r0, 0x7C adds r0, r2 movs r1, 0 strb r1, [r0] -_0802C6FA: +@0802C6FA: adds r3, 0x28 adds r2, 0x1 cmp r2, r4 - blt _0802C6CA -_0802C702: + blt @0802C6CA +@0802C702: adds r0, r5, 0 pop {r4-r7} pop {r1} @@ -71722,7 +71722,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 @@ -71730,14 +71730,14 @@ sub_802C70C: @ 802C70C adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 - bne _0802C728 + bne @0802C728 ldr r3, =0x00000c1a adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 - bne _0802C728 + bne @0802C728 movs r2, 0x1 -_0802C728: +@0802C728: adds r0, r2, 0 pop {r1} bx r1 @@ -71746,7 +71746,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 @@ -71754,29 +71754,29 @@ sub_802C73C: @ 802C73C movs r3, 0 ldr r6, =0x02022cfc movs r5, 0x1 -_0802C74A: +@0802C74A: adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0 - beq _0802C75A + beq @0802C75A adds r0, r5, 0 lsls r0, r1 orrs r2, r0 adds r3, 0x1 -_0802C75A: +@0802C75A: adds r1, 0x1 cmp r1, 0x4 - ble _0802C74A + ble @0802C74A ldr r0, [r6] adds r0, 0x71 strb r2, [r0] cmp r2, 0 - beq _0802C772 + beq @0802C772 ldr r0, [r6] adds r0, 0x4D movs r1, 0x1 strb r1, [r0] -_0802C772: +@0802C772: adds r0, r3, 0 pop {r4-r6} pop {r1} @@ -71786,7 +71786,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 @@ -71798,7 +71798,7 @@ sub_802C780: @ 802C780 thumb_func_end sub_802C780 thumb_func_start sub_802C790 -sub_802C790: @ 802C790 +sub_802C790: ; 802C790 ldr r1, =0x082fb6ec lsls r0, 2 adds r0, r1 @@ -71809,7 +71809,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 @@ -71817,9 +71817,9 @@ sub_802C7A0: @ 802C7A0 ldr r0, [r0] ldrh r2, [r0, 0xE] cmp r1, r2 - bls _0802C7B2 + bls @0802C7B2 strh r1, [r0, 0xE] -_0802C7B2: +@0802C7B2: pop {r0} bx r0 .align 2, 0 @@ -71827,7 +71827,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] @@ -71835,20 +71835,20 @@ sub_802C7BC: @ 802C7BC ldr r2, [r0, 0x78] ldr r0, [r1] cmp r2, r0 - bcs _0802C7D8 + bcs @0802C7D8 movs r0, 0 - b _0802C7DA + b @0802C7DA .align 2, 0 .pool -_0802C7D8: +@0802C7D8: movs r0, 0x1 -_0802C7DA: +@0802C7DA: pop {r1} bx r1 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 @@ -71870,7 +71870,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] @@ -71881,7 +71881,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 @@ -71899,7 +71899,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 @@ -71909,26 +71909,26 @@ sub_802C838: @ 802C838 ldr r1, [r0, 0x78] ldr r0, [r2] cmp r1, r0 - bcc _0802C874 + bcc @0802C874 ldr r5, [r2, 0x4] adds r6, r3, 0 adds r3, r2, 0x4 -_0802C852: +@0802C852: adds r3, 0x8 adds r2, 0x8 adds r4, 0x1 cmp r4, 0x4 - bhi _0802C874 + bhi @0802C874 ldr r0, [r6] ldr r1, [r0, 0x78] ldr r0, [r2] cmp r1, r0 - bcc _0802C874 + bcc @0802C874 ldr r5, [r3] - b _0802C852 + b @0802C852 .align 2, 0 .pool -_0802C874: +@0802C874: lsls r0, r5, 16 lsrs r0, 16 pop {r4-r6} @@ -71937,27 +71937,27 @@ _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 lsls r1, 16 lsrs r4, r1, 16 - b _0802C892 -_0802C88C: + b @0802C892 +@0802C88C: subs r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 -_0802C892: +@0802C892: cmp r4, 0 - beq _0802C8A4 + beq @0802C8A4 adds r0, r5, 0 adds r1, r4, 0 bl sub_80D6800 lsls r0, 24 cmp r0, 0 - beq _0802C88C -_0802C8A4: + beq @0802C88C +@0802C8A4: adds r0, r4, 0 pop {r4,r5} pop {r1} @@ -71965,7 +71965,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 @@ -71975,7 +71975,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] @@ -71985,7 +71985,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 @@ -72002,7 +72002,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 @@ -72021,7 +72021,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 @@ -72035,10 +72035,10 @@ 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: +@0802C924: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -72048,7 +72048,7 @@ _0802C924: movs r1, 0x5 bl pokemon_getattr cmp r0, 0 - beq _0802C95C + beq @0802C95C adds r0, r4, 0 movs r1, 0x41 bl pokemon_getattr @@ -72056,19 +72056,19 @@ _0802C924: lsrs r0, 16 bl sub_802C908 cmp r0, 0 - beq _0802C95C + beq @0802C95C ldr r1, =0x020375f0 movs r0, 0x1 - b _0802C966 + b @0802C966 .align 2, 0 .pool -_0802C95C: +@0802C95C: adds r5, 0x1 cmp r5, 0x5 - ble _0802C924 + ble @0802C924 ldr r1, =0x020375f0 movs r0, 0 -_0802C966: +@0802C966: strh r0, [r1] pop {r4,r5} pop {r0} @@ -72078,27 +72078,27 @@ _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 ldr r5, =0x082fbe08 -_0802C97C: +@0802C97C: adds r0, r5, 0 bl gpu_tile_obj_decompress_and_load adds r5, 0x8 adds r4, 0x1 cmp r4, 0x4 - bls _0802C97C + bls @0802C97C movs r4, 0 ldr r5, =0x082fbe30 -_0802C98E: +@0802C98E: adds r0, r5, 0 bl gpu_pal_obj_alloc_tag_and_apply adds r5, 0x8 adds r4, 0x1 cmp r4, 0x1 - bls _0802C98E + bls @0802C98E movs r0, 0x5 bl gpu_pal_tags_index_of strb r0, [r6, 0xE] @@ -72113,23 +72113,23 @@ _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 adds r0, 0x3C -_0802C9C4: +@0802C9C4: strh r2, [r0] subs r0, 0x2 subs r1, 0x1 cmp r1, 0 - bge _0802C9C4 + bge @0802C9C4 pop {r0} bx r0 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 @@ -72165,23 +72165,23 @@ sub_802C9D4: @ 802C9D4 lsls r0, 16 lsrs r0, 16 cmp r6, r0 - bne _0802CA2C + bne @0802CA2C movs r0, 0x3 - b _0802CA32 + b @0802CA32 .align 2, 0 .pool -_0802CA2C: +@0802CA2C: adds r0, r6, 0x4 lsls r0, 24 lsrs r0, 24 -_0802CA32: +@0802CA32: str r0, [sp, 0x30] mov r1, r8 cmp r1, 0 - beq _0802CAF4 + beq @0802CAF4 mov r2, r10 cmp r2, 0 - beq _0802CAF4 + beq @0802CAF4 ldrh r2, [r7] lsls r0, r2, 3 ldr r1, =0x08301418 @@ -72236,7 +72236,7 @@ _0802CA32: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq _0802CAF4 + beq @0802CAF4 lsls r0, r6, 2 ldr r2, =0x000081a8 add r2, r9 @@ -72253,17 +72253,17 @@ _0802CA32: add r1, sp, 0x30 ldrb r1, [r1] strb r1, [r0] - b _0802CB00 + b @0802CB00 .align 2, 0 .pool -_0802CAF4: +@0802CAF4: lsls r0, r6, 2 ldr r1, =0x000081a8 add r1, r9 adds r1, r0 movs r0, 0 str r0, [r1] -_0802CB00: +@0802CB00: add sp, 0x34 pop {r3-r5} mov r8, r3 @@ -72277,7 +72277,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 @@ -72325,32 +72325,32 @@ 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 ldrsh r0, [r2, r1] cmp r0, 0x1 - beq _0802CBA8 + beq @0802CBA8 cmp r0, 0x1 - bgt _0802CB92 + bgt @0802CB92 cmp r0, 0 - beq _0802CB98 - b _0802CBE6 -_0802CB92: + beq @0802CB98 + b @0802CBE6 +@0802CB92: cmp r0, 0x2 - beq _0802CBC8 - b _0802CBE6 -_0802CB98: + beq @0802CBC8 + b @0802CBE6 +@0802CB98: adds r0, r2, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0802CBE6 - b _0802CBD6 -_0802CBA8: + beq @0802CBE6 + b @0802CBD6 +@0802CBA8: ldrh r1, [r2, 0x22] subs r1, 0x1 strh r1, [r2, 0x22] @@ -72360,22 +72360,22 @@ _0802CBA8: lsls r1, 16 asrs r1, 16 cmp r1, 0x48 - bgt _0802CBE6 + bgt @0802CBE6 movs r0, 0x48 strh r0, [r2, 0x22] ldrh r0, [r2, 0x2E] adds r0, 0x1 strh r0, [r2, 0x2E] - b _0802CBE6 -_0802CBC8: + b @0802CBE6 +@0802CBC8: ldrh r0, [r2, 0x30] adds r0, 0x1 strh r0, [r2, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x2F - ble _0802CBE6 -_0802CBD6: + ble @0802CBE6 +@0802CBD6: adds r3, r2, 0 adds r3, 0x3E ldrb r0, [r3] @@ -72384,7 +72384,7 @@ _0802CBD6: strb r0, [r3] ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] -_0802CBE6: +@0802CBE6: pop {r0} bx r0 .align 2, 0 @@ -72392,7 +72392,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 @@ -72412,7 +72412,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 @@ -72423,9 +72423,9 @@ sub_802CC18: @ 802CC18 ldr r1, [r0, 0x1C] ldr r0, =sub_802CC40 + 1 cmp r1, r0 - bne _0802CC30 + bne @0802CC30 movs r2, 0x1 -_0802CC30: +@0802CC30: adds r0, r2, 0 pop {r1} bx r1 @@ -72434,7 +72434,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] @@ -72443,32 +72443,32 @@ sub_802CC40: @ 802CC40 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0802CC6C + ble @0802CC6C ldrh r0, [r2, 0x32] adds r0, 0x1 strh r0, [r2, 0x32] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0802CC64 + beq @0802CC64 movs r0, 0x2 - b _0802CC66 -_0802CC64: + b @0802CC66 +@0802CC64: ldr r0, =0x0000fffe -_0802CC66: +@0802CC66: strh r0, [r2, 0x26] movs r0, 0 strh r0, [r2, 0x30] -_0802CC6C: +@0802CC6C: movs r1, 0x32 ldrsh r0, [r2, r1] cmp r0, 0xC - ble _0802CC7C + ble @0802CC7C movs r0, 0 strh r0, [r2, 0x26] ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] -_0802CC7C: +@0802CC7C: pop {r0} bx r0 .align 2, 0 @@ -72476,7 +72476,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 @@ -72496,14 +72496,14 @@ 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 lsls r0, 16 lsrs r0, 16 cmp r0, 0 - beq _0802CCF4 + beq @0802CCF4 movs r1, 0x5 negs r1, r1 mov r12, r1 @@ -72513,11 +72513,11 @@ sub_802CCB0: @ 802CCB0 ldr r6, =nullsub_12 + 1 movs r5, 0xA adds r4, r0, 0 -_0802CCD2: +@0802CCD2: ldr r2, [r3] ldr r0, [r2, 0x1C] cmp r0, r7 - bne _0802CCEC + bne @0802CCEC adds r2, 0x3E ldrb r1, [r2] mov r0, r12 @@ -72527,12 +72527,12 @@ _0802CCD2: str r6, [r0, 0x1C] adds r0, 0x43 strb r5, [r0] -_0802CCEC: +@0802CCEC: adds r3, 0x4 subs r4, 0x1 cmp r4, 0 - bne _0802CCD2 -_0802CCF4: + bne @0802CCD2 +@0802CCF4: pop {r4-r7} pop {r0} bx r0 @@ -72541,7 +72541,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] @@ -72550,7 +72550,7 @@ sub_802CD08: @ 802CD08 lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble _0802CD36 + ble @0802CD36 movs r0, 0 strh r0, [r3, 0x2E] adds r3, 0x3E @@ -72565,13 +72565,13 @@ sub_802CD08: @ 802CD08 ands r0, r2 orrs r0, r1 strb r0, [r3] -_0802CD36: +@0802CD36: pop {r0} bx r0 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 @@ -72579,12 +72579,12 @@ sub_802CD3C: @ 802CD3C lsrs r3, r0, 16 movs r2, 0 cmp r2, r3 - bge _0802CD66 + bge @0802CD66 ldr r0, =0x000081fc adds r5, r4, r0 subs r0, 0x54 adds r4, r0 -_0802CD56: +@0802CD56: ldm r4!, {r0} adds r1, r5, r2 ldrb r1, [r1] @@ -72592,8 +72592,8 @@ _0802CD56: strb r1, [r0] adds r2, 0x1 cmp r2, r3 - blt _0802CD56 -_0802CD66: + blt @0802CD56 +@0802CD66: pop {r4,r5} pop {r0} bx r0 @@ -72602,7 +72602,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 @@ -72622,7 +72622,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 @@ -72630,61 +72630,61 @@ sub_802CD98: @ 802CD98 lsrs r3, r0, 16 movs r2, 0 cmp r2, r3 - bge _0802CDCC + bge @0802CDCC ldr r5, =sub_802CDD4 + 1 ldr r0, =0x000081a8 adds r1, r4, r0 -_0802CDB0: +@0802CDB0: ldr r0, [r1] ldr r0, [r0, 0x1C] cmp r0, r5 - bne _0802CDC4 + bne @0802CDC4 movs r0, 0x1 - b _0802CDCE + b @0802CDCE .align 2, 0 .pool -_0802CDC4: +@0802CDC4: adds r1, 0x4 adds r2, 0x1 cmp r2, r3 - blt _0802CDB0 -_0802CDCC: + blt @0802CDB0 +@0802CDCC: movs r0, 0 -_0802CDCE: +@0802CDCE: pop {r4,r5} pop {r1} bx r1 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 ldrsh r4, [r5, r0] cmp r4, 0 - beq _0802CDE6 + beq @0802CDE6 cmp r4, 0x1 - beq _0802CDF4 - b _0802CE3C -_0802CDE6: + beq @0802CDF4 + b @0802CE3C +@0802CDE6: movs r0, 0x22 bl audio_play strh r4, [r5, 0x30] ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] -_0802CDF4: +@0802CDF4: ldrh r0, [r5, 0x30] adds r0, 0x4 strh r0, [r5, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x7F - ble _0802CE06 + ble @0802CE06 movs r0, 0 strh r0, [r5, 0x30] -_0802CE06: +@0802CE06: ldr r1, =0x08329f40 movs r2, 0x30 ldrsh r0, [r5, r2] @@ -72698,22 +72698,22 @@ _0802CE06: movs r0, 0x30 ldrsh r1, [r5, r0] cmp r1, 0 - bne _0802CE3C + bne @0802CE3C ldrh r0, [r5, 0x32] adds r0, 0x1 strh r0, [r5, 0x32] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - bgt _0802CE38 + bgt @0802CE38 strh r1, [r5, 0x2E] - b _0802CE3C + b @0802CE3C .align 2, 0 .pool -_0802CE38: +@0802CE38: ldr r0, =nullsub_12 + 1 str r0, [r5, 0x1C] -_0802CE3C: +@0802CE3C: pop {r4,r5} pop {r0} bx r0 @@ -72722,7 +72722,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 @@ -72737,7 +72737,7 @@ sub_802CE48: @ 802CE48 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq _0802CE88 + beq @0802CE88 ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 @@ -72754,7 +72754,7 @@ sub_802CE48: @ 802CE48 adds r0, r5, r3 adds r0, r2 str r1, [r0] -_0802CE88: +@0802CE88: pop {r4,r5} pop {r0} bx r0 @@ -72763,13 +72763,13 @@ _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 movs r4, 0 ldr r6, =0x082fbe58 -_0802CEA6: +@0802CEA6: ldr r1, =0x082fbeb8 lsls r0, r4, 2 adds r0, r1 @@ -72799,10 +72799,10 @@ _0802CEA6: adds r6, 0x14 adds r4, 0x1 cmp r4, 0x3 - ble _0802CEA6 + ble @0802CEA6 movs r4, 0x3 movs r6, 0x3C -_0802CEE8: +@0802CEE8: ldr r1, =0x082fbeb8 lsls r0, r4, 2 adds r0, r1 @@ -72839,7 +72839,7 @@ _0802CEE8: subs r6, 0x14 subs r4, 0x1 cmp r4, 0 - bge _0802CEE8 + bge @0802CEE8 pop {r4-r7} pop {r0} bx r0 @@ -72848,7 +72848,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 @@ -72857,20 +72857,20 @@ sub_802CF50: @ 802CF50 sub sp, 0xC str r0, [sp, 0x8] cmp r1, 0x5 - ble _0802CF70 + ble @0802CF70 movs r0, 0xA subs r1, r0, r1 movs r0, 0x3 str r0, [sp] ldr r2, [sp, 0x8] ldrb r0, [r2, 0xF] - b _0802CF78 -_0802CF70: + b @0802CF78 +@0802CF70: movs r3, 0x2 str r3, [sp] ldr r7, [sp, 0x8] ldrb r0, [r7, 0xE] -_0802CF78: +@0802CF78: movs r6, 0 lsls r2, r1, 1 str r2, [sp, 0x4] @@ -72884,7 +72884,7 @@ _0802CF78: lsls r3, 2 mov r10, r3 movs r5, 0x3 -_0802CF92: +@0802CF92: lsls r0, r6, 2 ldr r7, [sp, 0x8] ldr r1, =0x000081d0 @@ -72917,7 +72917,7 @@ _0802CF92: adds r4, 0x14 subs r5, 0x1 cmp r5, 0 - bge _0802CF92 + bge @0802CF92 movs r5, 0x3 ldr r0, =0x082fbe58 ldr r3, [sp, 0x4] @@ -72927,7 +72927,7 @@ _0802CF92: ldr r7, [sp] lsls r7, 2 mov r10, r7 -_0802CFE8: +@0802CFE8: lsls r0, r6, 2 ldr r1, [sp, 0x8] ldr r3, =0x000081d0 @@ -72960,7 +72960,7 @@ _0802CFE8: subs r4, 0x14 subs r5, 0x1 cmp r5, 0 - bge _0802CFE8 + bge @0802CFE8 add sp, 0xC pop {r3-r5} mov r8, r3 @@ -72974,7 +72974,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 @@ -72994,7 +72994,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} @@ -73002,7 +73002,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] @@ -73026,7 +73026,7 @@ sub_802D074: @ 802D074 thumb_func_end sub_802D074 thumb_func_start sub_802D0AC -sub_802D0AC: @ 802D0AC +sub_802D0AC: ; 802D0AC push {lr} bl Window_FreeMemory bl sub_8034CC8 @@ -73035,7 +73035,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] @@ -73045,22 +73045,22 @@ 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 ldr r4, =0x082fe18c -_0802D0D0: +@0802D0D0: ldr r0, [r4] cmp r0, r6 - bne _0802D0DC + bne @0802D0DC ldr r0, [r4, 0x4] bl sub_802D108 -_0802D0DC: +@0802D0DC: adds r4, 0x8 adds r5, 0x1 cmp r5, 0x9 - bls _0802D0D0 + bls @0802D0D0 pop {r4-r6} pop {r0} bx r0 @@ -73069,7 +73069,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] @@ -73084,7 +73084,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 @@ -73104,7 +73104,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 @@ -73112,12 +73112,12 @@ sub_802D12C: @ 802D12C ldr r0, [r0] ldr r0, [r0] cmp r0, 0 - bne _0802D148 + bne @0802D148 adds r0, r1, 0 movs r1, 0 bl get_word_task_arg bl _call_via_r0 -_0802D148: +@0802D148: pop {r0} bx r0 .align 2, 0 @@ -73125,30 +73125,30 @@ _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 ldr r1, [r6] ldrh r5, [r1, 0x4] cmp r5, 0x1 - bne _0802D160 - b _0802D298 -_0802D160: + bne @0802D160 + b @0802D298 +@0802D160: cmp r5, 0x1 - bgt _0802D170 + bgt @0802D170 cmp r5, 0 - beq _0802D178 - b _0802D2DA + beq @0802D178 + b @0802D2DA .align 2, 0 .pool -_0802D170: +@0802D170: cmp r5, 0x2 - bne _0802D176 - b _0802D2D6 -_0802D176: - b _0802D2DA -_0802D178: + bne @0802D176 + b @0802D2D6 +@0802D176: + b @0802D2DA +@0802D178: movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags ldr r1, =0x082fe164 @@ -73242,14 +73242,14 @@ _0802D178: movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram bl sub_8199D98 - b _0802D2CC + b @0802D2CC .align 2, 0 .pool -_0802D298: +@0802D298: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - bne _0802D2DA + bne @0802D2DA bl sub_802DBF8 ldr r0, [r6] bl sub_802CE9C @@ -73264,16 +73264,16 @@ _0802D298: bl gpu_sync_bg_show movs r0, 0x1 bl gpu_sync_bg_hide -_0802D2CC: +@0802D2CC: ldr r1, [r6] ldrh r0, [r1, 0x4] adds r0, 0x1 strh r0, [r1, 0x4] - b _0802D2DA -_0802D2D6: + b @0802D2DA +@0802D2D6: movs r0, 0x1 str r0, [r1] -_0802D2DA: +@0802D2DA: add sp, 0x8 pop {r4-r6} pop {r0} @@ -73281,123 +73281,123 @@ _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] ldrh r0, [r0, 0x4] cmp r0, 0x1 - beq _0802D310 + beq @0802D310 cmp r0, 0x1 - bgt _0802D300 + bgt @0802D300 cmp r0, 0 - beq _0802D30A - b _0802D34A + beq @0802D30A + b @0802D34A .align 2, 0 .pool -_0802D300: +@0802D300: cmp r0, 0x2 - beq _0802D322 + beq @0802D322 cmp r0, 0x3 - beq _0802D33A - b _0802D34A -_0802D30A: + beq @0802D33A + b @0802D34A +@0802D30A: bl sub_802DE1C - b _0802D330 -_0802D310: + b @0802D330 +@0802D310: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802D34A + bne @0802D34A movs r0, 0 bl sub_802DF70 - b _0802D330 -_0802D322: + b @0802D330 +@0802D322: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802D34A + bne @0802D34A bl sub_802DFD4 -_0802D330: +@0802D330: ldr r1, [r4] ldrh r0, [r1, 0x4] adds r0, 0x1 strh r0, [r1, 0x4] - b _0802D34A -_0802D33A: + b @0802D34A +@0802D33A: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802D34A + bne @0802D34A ldr r1, [r4] movs r0, 0x1 str r0, [r1] -_0802D34A: +@0802D34A: pop {r4} pop {r0} bx r0 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] ldrh r0, [r0, 0x4] cmp r0, 0x1 - beq _0802D37C + beq @0802D37C cmp r0, 0x1 - bgt _0802D36C + bgt @0802D36C cmp r0, 0 - beq _0802D376 - b _0802D3B6 + beq @0802D376 + b @0802D3B6 .align 2, 0 .pool -_0802D36C: +@0802D36C: cmp r0, 0x2 - beq _0802D38E + beq @0802D38E cmp r0, 0x3 - beq _0802D3A6 - b _0802D3B6 -_0802D376: + beq @0802D3A6 + b @0802D3B6 +@0802D376: bl sub_802DE1C - b _0802D39C -_0802D37C: + b @0802D39C +@0802D37C: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802D3B6 + bne @0802D3B6 movs r0, 0x1 bl sub_802DF70 - b _0802D39C -_0802D38E: + b @0802D39C +@0802D38E: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802D3B6 + bne @0802D3B6 bl sub_802DFD4 -_0802D39C: +@0802D39C: ldr r1, [r4] ldrh r0, [r1, 0x4] adds r0, 0x1 strh r0, [r1, 0x4] - b _0802D3B6 -_0802D3A6: + b @0802D3B6 +@0802D3A6: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802D3B6 + bne @0802D3B6 ldr r1, [r4] movs r0, 0x1 str r0, [r1] -_0802D3B6: +@0802D3B6: pop {r4} pop {r0} bx r0 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 @@ -73406,17 +73406,17 @@ sub_802D3BC: @ 802D3BC ldr r0, [r0] ldrh r0, [r0, 0x4] cmp r0, 0 - beq _0802D3DC + beq @0802D3DC cmp r0, 0x1 - beq _0802D410 - b _0802D43E + beq @0802D410 + b @0802D43E .align 2, 0 .pool -_0802D3DC: +@0802D3DC: movs r4, 0 cmp r4, r5 - bge _0802D3F8 -_0802D3E2: + bge @0802D3F8 +@0802D3E2: ldr r0, =0x02022d00 ldr r0, [r0] lsls r1, r4, 1 @@ -73426,8 +73426,8 @@ _0802D3E2: bl Window_FillTileMap adds r4, 0x1 cmp r4, r5 - blt _0802D3E2 -_0802D3F8: + blt @0802D3E2 +@0802D3F8: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram ldr r0, =0x02022d00 @@ -73435,18 +73435,18 @@ _0802D3F8: ldrh r0, [r1, 0x4] adds r0, 0x1 strh r0, [r1, 0x4] - b _0802D43E + b @0802D43E .align 2, 0 .pool -_0802D410: +@0802D410: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802D43E + bne @0802D43E movs r4, 0 cmp r4, r5 - bge _0802D436 -_0802D420: + bge @0802D436 +@0802D420: ldr r0, =0x02022d00 ldr r0, [r0] lsls r1, r4, 1 @@ -73456,13 +73456,13 @@ _0802D420: bl Window_Remove adds r4, 0x1 cmp r4, r5 - blt _0802D420 -_0802D436: + blt @0802D420 +@0802D436: ldr r0, =0x02022d00 ldr r1, [r0] movs r0, 0x1 str r0, [r1] -_0802D43E: +@0802D43E: pop {r4,r5} pop {r0} bx r0 @@ -73471,26 +73471,26 @@ _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 ldr r0, [r5] ldrh r4, [r0, 0x4] cmp r4, 0x1 - beq _0802D4A4 + beq @0802D4A4 cmp r4, 0x1 - bgt _0802D464 + bgt @0802D464 cmp r4, 0 - beq _0802D46A - b _0802D4EC + beq @0802D46A + b @0802D4EC .align 2, 0 .pool -_0802D464: +@0802D464: cmp r4, 0x2 - beq _0802D4DC - b _0802D4EC -_0802D46A: + beq @0802D4DC + b @0802D4EC +@0802D46A: movs r0, 0x1 movs r1, 0x8 movs r2, 0x14 @@ -73513,14 +73513,14 @@ _0802D46A: ldrb r0, [r0, 0x12] movs r1, 0x2 bl Window_CopyToVram - b _0802D4D2 + b @0802D4D2 .align 2, 0 .pool -_0802D4A4: +@0802D4A4: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802D4EC + bne @0802D4EC ldr r0, [r5] ldrb r0, [r0, 0x12] bl Window_WriteStandardTileMap @@ -73535,21 +73535,21 @@ _0802D4A4: bl sub_802DB18 movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram -_0802D4D2: +@0802D4D2: ldr r1, [r5] ldrh r0, [r1, 0x4] adds r0, 0x1 strh r0, [r1, 0x4] - b _0802D4EC -_0802D4DC: + b @0802D4EC +@0802D4DC: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802D4EC + bne @0802D4EC ldr r1, [r5] movs r0, 0x1 str r0, [r1] -_0802D4EC: +@0802D4EC: add sp, 0xC pop {r4,r5} pop {r0} @@ -73557,26 +73557,26 @@ _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 ldr r0, [r5] ldrh r4, [r0, 0x4] cmp r4, 0x1 - beq _0802D550 + beq @0802D550 cmp r4, 0x1 - bgt _0802D510 + bgt @0802D510 cmp r4, 0 - beq _0802D516 - b _0802D58E + beq @0802D516 + b @0802D58E .align 2, 0 .pool -_0802D510: +@0802D510: cmp r4, 0x2 - beq _0802D57E - b _0802D58E -_0802D516: + beq @0802D57E + b @0802D58E +@0802D516: movs r0, 0x2 movs r1, 0x7 movs r2, 0x1A @@ -73599,14 +73599,14 @@ _0802D516: ldrb r0, [r0, 0x12] movs r1, 0x2 bl Window_CopyToVram - b _0802D574 + b @0802D574 .align 2, 0 .pool -_0802D550: +@0802D550: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802D58E + bne @0802D58E ldr r0, [r5] ldrb r0, [r0, 0x12] bl Window_WriteStandardTileMap @@ -73617,21 +73617,21 @@ _0802D550: bl sub_8098858 movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram -_0802D574: +@0802D574: ldr r1, [r5] ldrh r0, [r1, 0x4] adds r0, 0x1 strh r0, [r1, 0x4] - b _0802D58E -_0802D57E: + b @0802D58E +@0802D57E: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802D58E + bne @0802D58E ldr r1, [r5] movs r0, 0x1 str r0, [r1] -_0802D58E: +@0802D58E: add sp, 0xC pop {r4,r5} pop {r0} @@ -73639,19 +73639,19 @@ _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] ldrh r4, [r0, 0x4] cmp r4, 0 - beq _0802D5B0 + beq @0802D5B0 cmp r4, 0x1 - beq _0802D5C8 - b _0802D5DE + beq @0802D5C8 + b @0802D5DE .align 2, 0 .pool -_0802D5B0: +@0802D5B0: bl sub_802DA14 bl sub_8198C78 movs r0, 0 @@ -73660,44 +73660,44 @@ _0802D5B0: ldrh r0, [r1, 0x4] adds r0, 0x1 strh r0, [r1, 0x4] - b _0802D5DE -_0802D5C8: + b @0802D5DE +@0802D5C8: bl sub_802DA44 cmp r0, 0 - bne _0802D5DE + bne @0802D5DE bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802D5DE + bne @0802D5DE ldr r0, [r5] str r4, [r0] -_0802D5DE: +@0802D5DE: pop {r4,r5} pop {r0} bx r0 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 ldr r0, [r5] ldrh r4, [r0, 0x4] cmp r4, 0x1 - beq _0802D640 + beq @0802D640 cmp r4, 0x1 - bgt _0802D600 + bgt @0802D600 cmp r4, 0 - beq _0802D606 - b _0802D67E + beq @0802D606 + b @0802D67E .align 2, 0 .pool -_0802D600: +@0802D600: cmp r4, 0x2 - beq _0802D66E - b _0802D67E -_0802D606: + beq @0802D66E + b @0802D67E +@0802D606: movs r0, 0x2 movs r1, 0x8 movs r2, 0x16 @@ -73720,14 +73720,14 @@ _0802D606: ldrb r0, [r0, 0x12] movs r1, 0x2 bl Window_CopyToVram - b _0802D664 + b @0802D664 .align 2, 0 .pool -_0802D640: +@0802D640: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802D67E + bne @0802D67E ldr r0, [r5] ldrb r0, [r0, 0x12] bl Window_WriteStandardTileMap @@ -73738,21 +73738,21 @@ _0802D640: bl sub_8098858 movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram -_0802D664: +@0802D664: ldr r1, [r5] ldrh r0, [r1, 0x4] adds r0, 0x1 strh r0, [r1, 0x4] - b _0802D67E -_0802D66E: + b @0802D67E +@0802D66E: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802D67E + bne @0802D67E ldr r1, [r5] movs r0, 0x1 str r0, [r1] -_0802D67E: +@0802D67E: add sp, 0xC pop {r4,r5} pop {r0} @@ -73760,26 +73760,26 @@ _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 ldr r0, [r5] ldrh r4, [r0, 0x4] cmp r4, 0x1 - beq _0802D6E4 + beq @0802D6E4 cmp r4, 0x1 - bgt _0802D6A4 + bgt @0802D6A4 cmp r4, 0 - beq _0802D6AA - b _0802D722 + beq @0802D6AA + b @0802D722 .align 2, 0 .pool -_0802D6A4: +@0802D6A4: cmp r4, 0x2 - beq _0802D712 - b _0802D722 -_0802D6AA: + beq @0802D712 + b @0802D722 +@0802D6AA: movs r0, 0x7 movs r1, 0xA movs r2, 0x10 @@ -73802,14 +73802,14 @@ _0802D6AA: ldrb r0, [r0, 0x12] movs r1, 0x2 bl Window_CopyToVram - b _0802D708 + b @0802D708 .align 2, 0 .pool -_0802D6E4: +@0802D6E4: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802D722 + bne @0802D722 ldr r0, [r5] ldrb r0, [r0, 0x12] bl Window_WriteStandardTileMap @@ -73820,21 +73820,21 @@ _0802D6E4: bl sub_8098858 movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram -_0802D708: +@0802D708: ldr r1, [r5] ldrh r0, [r1, 0x4] adds r0, 0x1 strh r0, [r1, 0x4] - b _0802D722 -_0802D712: + b @0802D722 +@0802D712: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802D722 + bne @0802D722 ldr r1, [r5] movs r0, 0x1 str r0, [r1] -_0802D722: +@0802D722: add sp, 0xC pop {r4,r5} pop {r0} @@ -73842,39 +73842,39 @@ _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] ldrh r4, [r0, 0x4] cmp r4, 0 - beq _0802D744 + beq @0802D744 cmp r4, 0x1 - beq _0802D752 - b _0802D75E + beq @0802D752 + b @0802D75E .align 2, 0 .pool -_0802D744: +@0802D744: bl sub_802D044 ldr r1, [r5] ldrh r0, [r1, 0x4] adds r0, 0x1 strh r0, [r1, 0x4] - b _0802D75E -_0802D752: + b @0802D75E +@0802D752: bl sub_802D068 cmp r0, 0 - bne _0802D75E + bne @0802D75E ldr r0, [r5] str r4, [r0] -_0802D75E: +@0802D75E: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_802D72C thumb_func_start sub_802D764 -sub_802D764: @ 802D764 +sub_802D764: ; 802D764 push {lr} ldr r1, =0x02022d00 ldr r0, [r1] @@ -73895,27 +73895,27 @@ 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] ldrb r3, [r2, 0xA] adds r4, r0, 0 cmp r3, 0 - beq _0802D7A0 + beq @0802D7A0 cmp r3, 0x1 - beq _0802D7DA - b _0802D7DE + beq @0802D7DA + b @0802D7DE .align 2, 0 .pool -_0802D7A0: +@0802D7A0: ldrb r0, [r2, 0xB] adds r0, 0x1 strb r0, [r2, 0xB] ldr r1, [r4] ldrb r0, [r1, 0xB] cmp r0, 0xA - bls _0802D7CA + bls @0802D7CA strb r3, [r1, 0xB] ldr r0, [r4] ldrb r1, [r0, 0xC] @@ -73924,33 +73924,33 @@ _0802D7A0: ldr r1, [r4] ldrb r0, [r1, 0xC] cmp r0, 0x9 - bls _0802D7CA + bls @0802D7CA strb r3, [r1, 0xC] ldr r1, [r4] ldrb r0, [r1, 0xA] adds r0, 0x1 strb r0, [r1, 0xA] -_0802D7CA: +@0802D7CA: ldr r0, [r4] ldrb r0, [r0, 0xC] bl sub_802DC9C ldr r0, [r4] ldrb r0, [r0, 0xC] cmp r0, 0x7 - bne _0802D7DE -_0802D7DA: + bne @0802D7DE +@0802D7DA: movs r0, 0 - b _0802D7E0 -_0802D7DE: + b @0802D7E0 +@0802D7DE: movs r0, 0x1 -_0802D7E0: +@0802D7E0: pop {r4} pop {r1} bx r1 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 @@ -74018,7 +74018,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 @@ -74072,7 +74072,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 @@ -74126,31 +74126,31 @@ 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] ldrb r0, [r0, 0xD] cmp r0, 0x1 - beq _0802D9C8 + beq @0802D9C8 cmp r0, 0x1 - bgt _0802D990 + bgt @0802D990 cmp r0, 0 - beq _0802D99A - b _0802DA0C + beq @0802D99A + b @0802DA0C .align 2, 0 .pool -_0802D990: +@0802D990: cmp r0, 0x2 - beq _0802D9EE + beq @0802D9EE cmp r0, 0x3 - beq _0802DA02 - b _0802DA0C -_0802D99A: + beq @0802DA02 + b @0802DA0C +@0802D99A: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802DA0C + bne @0802DA0C ldr r0, [r4] ldrb r0, [r0, 0x12] bl Window_WriteStandardTileMap @@ -74165,58 +74165,58 @@ _0802D99A: ldrb r0, [r1, 0xD] adds r0, 0x1 strb r0, [r1, 0xD] - b _0802DA0C -_0802D9C8: + b @0802DA0C +@0802D9C8: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802DA0C + bne @0802DA0C ldr r1, [r4] ldrh r0, [r1, 0x14] cmp r0, 0 - bne _0802D9E0 + bne @0802D9E0 ldrb r0, [r1, 0xD] adds r0, 0x2 - b _0802DA00 -_0802D9E0: + b @0802DA00 +@0802D9E0: ldrh r0, [r1, 0x14] bl fanfare_play ldr r1, [r4] ldrb r0, [r1, 0xD] adds r0, 0x1 strb r0, [r1, 0xD] -_0802D9EE: +@0802D9EE: bl task_is_not_running_overworld_fanfare lsls r0, 24 cmp r0, 0 - beq _0802DA0C + beq @0802DA0C ldr r0, =0x02022d00 ldr r1, [r0] ldrb r0, [r1, 0xD] adds r0, 0x1 -_0802DA00: +@0802DA00: strb r0, [r1, 0xD] -_0802DA02: +@0802DA02: movs r0, 0 - b _0802DA0E + b @0802DA0E .align 2, 0 .pool -_0802DA0C: +@0802DA0C: movs r0, 0x1 -_0802DA0E: +@0802DA0E: pop {r4} pop {r1} bx r1 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] ldrh r0, [r0, 0x12] cmp r0, 0xFF - beq _0802DA38 + beq @0802DA38 lsls r0, 24 lsrs r0, 24 bl rbox_fill_rectangle @@ -74227,7 +74227,7 @@ sub_802DA14: @ 802DA14 ldr r1, [r4] movs r0, 0 strb r0, [r1, 0xD] -_0802DA38: +@0802DA38: pop {r4} pop {r0} bx r0 @@ -74236,26 +74236,26 @@ _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] ldrh r0, [r1, 0x12] cmp r0, 0xFF - bne _0802DA58 -_0802DA50: + bne @0802DA58 +@0802DA50: movs r0, 0 - b _0802DA84 + b @0802DA84 .align 2, 0 .pool -_0802DA58: +@0802DA58: ldrb r0, [r1, 0xD] cmp r0, 0 - bne _0802DA7E + bne @0802DA7E bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802DA82 + bne @0802DA82 ldr r0, [r4] ldrb r0, [r0, 0x12] bl Window_Remove @@ -74265,20 +74265,20 @@ _0802DA58: ldrb r0, [r1, 0xD] adds r0, 0x1 strb r0, [r1, 0xD] - b _0802DA50 -_0802DA7E: + b @0802DA50 +@0802DA7E: cmp r0, 0x1 - beq _0802DA50 -_0802DA82: + beq @0802DA50 +@0802DA82: movs r0, 0x1 -_0802DA84: +@0802DA84: pop {r4} pop {r1} bx r1 thumb_func_end sub_802DA44 thumb_func_start sub_802DA8C -sub_802DA8C: @ 802DA8C +sub_802DA8C: ; 802DA8C push {lr} bl sub_8198C58 lsls r0, 24 @@ -74288,7 +74288,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 @@ -74343,7 +74343,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 @@ -74395,7 +74395,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, =0x082fe1dc @@ -74442,7 +74442,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 @@ -74460,12 +74460,12 @@ sub_802DBF8: @ 802DBF8 ldr r5, [r0] movs r6, 0 cmp r6, r10 - bge _0802DC62 + bge @0802DC62 ldr r0, =0x08300d38 mov r9, r0 ldr r1, =0x02022d00 mov r8, r1 -_0802DC26: +@0802DC26: lsls r4, r6, 24 lsrs r4, 24 adds r0, r4, 0 @@ -74492,8 +74492,8 @@ _0802DC26: adds r5, 0x2 adds r6, 0x1 cmp r6, r10 - blt _0802DC26 -_0802DC62: + blt @0802DC26 +@0802DC62: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -74507,7 +74507,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 @@ -74522,7 +74522,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 @@ -74546,27 +74546,27 @@ 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 movs r5, 0 movs r6, 0 -_0802DCD6: +@0802DCD6: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _0802DCEA + beq @0802DCEA ldr r0, =0x02022d00 ldr r0, [r0] adds r1, r5, 0 bl sub_802CB14 adds r6, 0x1 -_0802DCEA: +@0802DCEA: lsrs r4, 1 adds r5, 0x1 cmp r5, 0x4 - ble _0802DCD6 + ble @0802DCD6 subs r0, r6, 0x2 lsls r0, 24 lsrs r0, 24 @@ -74580,7 +74580,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 @@ -74624,7 +74624,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 @@ -74634,7 +74634,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 @@ -74646,7 +74646,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 @@ -74661,7 +74661,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 @@ -74676,7 +74676,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 @@ -74689,7 +74689,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] @@ -74701,7 +74701,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] @@ -74713,7 +74713,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 @@ -74726,7 +74726,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] @@ -74738,7 +74738,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 @@ -74775,9 +74775,9 @@ sub_802DE1C: @ 802DE1C str r0, [sp, 0x4] movs r5, 0 cmp r5, r7 - bge _0802DEAC + bge @0802DEAC mov r6, sp -_0802DE6A: +@0802DE6A: ldrb r0, [r4] lsls r0, 8 ldr r2, =0xffff00ff @@ -74808,8 +74808,8 @@ _0802DE6A: adds r4, 0x4 adds r5, 0x1 cmp r5, r7 - blt _0802DE6A -_0802DEAC: + blt @0802DE6A +@0802DEAC: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram add sp, 0x8 @@ -74821,7 +74821,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 @@ -74894,18 +74894,18 @@ 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 lsls r0, 16 lsrs r5, r0, 16 cmp r4, 0 - bne _0802DF9A + bne @0802DF9A movs r4, 0 cmp r4, r5 - bge _0802DFCC -_0802DF86: + bge @0802DFCC +@0802DF86: adds r0, r4, 0 movs r1, 0 movs r2, 0x2 @@ -74913,50 +74913,50 @@ _0802DF86: bl sub_802DED8 adds r4, 0x1 cmp r4, r5 - blt _0802DF86 - b _0802DFCC -_0802DF9A: + blt @0802DF86 + b @0802DFCC +@0802DF9A: bl sub_802C8BC lsls r0, 16 lsrs r6, r0, 16 movs r4, 0 cmp r4, r5 - bge _0802DFCC -_0802DFA8: + bge @0802DFCC +@0802DFA8: cmp r6, r4 - beq _0802DFBA + beq @0802DFBA adds r0, r4, 0 movs r1, 0 movs r2, 0x2 movs r3, 0x3 bl sub_802DED8 - b _0802DFC6 -_0802DFBA: + b @0802DFC6 +@0802DFBA: adds r0, r4, 0 movs r1, 0 movs r2, 0x4 movs r3, 0x5 bl sub_802DED8 -_0802DFC6: +@0802DFC6: adds r4, 0x1 cmp r4, r5 - blt _0802DFA8 -_0802DFCC: + blt @0802DFA8 +@0802DFCC: pop {r4-r6} pop {r0} bx r0 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 lsrs r5, r0, 16 movs r4, 0 cmp r4, r5 - bge _0802DFFA -_0802DFE4: + bge @0802DFFA +@0802DFE4: ldr r0, =0x02022d00 ldr r0, [r0] lsls r1, r4, 1 @@ -74966,8 +74966,8 @@ _0802DFE4: bl Window_WriteStandardTileMap adds r4, 0x1 cmp r4, r5 - blt _0802DFE4 -_0802DFFA: + blt @0802DFE4 +@0802DFFA: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram pop {r4,r5} @@ -74978,7 +74978,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 @@ -75013,18 +75013,18 @@ 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] ldr r0, [r0, 0x18] cmp r0, 0x1F - bls _0802E06C + bls @0802E06C movs r0, 0 - b _0802E08A + b @0802E08A .align 2, 0 .pool -_0802E06C: +@0802E06C: movs r0, 0x1 movs r1, 0x80 movs r2, 0x1 @@ -75034,35 +75034,35 @@ _0802E06C: adds r0, 0x1 str r0, [r1, 0x18] cmp r0, 0x1F - bls _0802E088 + bls @0802E088 movs r0, 0x1 bl gpu_sync_bg_hide -_0802E088: +@0802E088: movs r0, 0x1 -_0802E08A: +@0802E08A: pop {r4} pop {r1} bx r1 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 bl sub_802E058 cmp r0, 0 - bne _0802E0A4 + bne @0802E0A4 adds r0, r4, 0 bl remove_task -_0802E0A4: +@0802E0A4: pop {r4} pop {r0} bx r0 thumb_func_end sub_802E090 thumb_func_start sub_802E0AC -sub_802E0AC: @ 802E0AC +sub_802E0AC: ; 802E0AC push {lr} sub sp, 0xC mov r2, sp @@ -75082,7 +75082,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 @@ -75096,7 +75096,7 @@ sub_802E0D0: @ 802E0D0 movs r1, 0xBC lsls r1, 6 cmp r0, r1 - bne _0802E100 + bne @0802E100 adds r1, r3, 0x2 adds r1, r2, r1 mov r0, sp @@ -75105,13 +75105,13 @@ sub_802E0D0: @ 802E0D0 mov r0, sp ldrb r0, [r0] cmp r0, 0x1 - beq _0802E108 -_0802E100: + beq @0802E108 +@0802E100: movs r0, 0 - b _0802E118 + b @0802E118 .align 2, 0 .pool -_0802E108: +@0802E108: mov r0, sp ldrh r0, [r0, 0x2] strh r0, [r4] @@ -75120,7 +75120,7 @@ _0802E108: ldr r0, [sp, 0x4] str r0, [r4, 0x8] movs r0, 0x1 -_0802E118: +@0802E118: add sp, 0xC pop {r4} pop {r1} @@ -75128,7 +75128,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 @@ -75143,7 +75143,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} @@ -75210,7 +75210,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 @@ -75223,7 +75223,7 @@ sub_802E1BC: @ 802E1BC movs r0, 0xBC lsls r0, 6 cmp r1, r0 - bne _0802E228 + bne @0802E228 adds r1, r2, 0x2 mov r0, sp movs r2, 0xC @@ -75231,7 +75231,7 @@ sub_802E1BC: @ 802E1BC mov r0, sp ldrb r0, [r0] cmp r0, 0x3 - bne _0802E228 + bne @0802E228 ldr r0, [sp, 0x8] lsrs r0, 15 str r0, [r4, 0x8] @@ -75261,12 +75261,12 @@ sub_802E1BC: @ 802E1BC ldrh r0, [r0, 0x4] strh r0, [r5, 0xE] movs r0, 0x1 - b _0802E22A + b @0802E22A .align 2, 0 .pool -_0802E228: +@0802E228: movs r0, 0 -_0802E22A: +@0802E22A: add sp, 0xC pop {r4,r5} pop {r1} @@ -75274,7 +75274,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 @@ -75300,7 +75300,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 @@ -75316,7 +75316,7 @@ sub_802E264: @ 802E264 movs r1, 0xBC lsls r1, 6 cmp r0, r1 - bne _0802E2C4 + bne @0802E2C4 adds r1, r3, 0x2 adds r1, r2, r1 mov r0, sp @@ -75325,7 +75325,7 @@ sub_802E264: @ 802E264 mov r0, sp ldrb r0, [r0] cmp r0, 0x4 - bne _0802E2C4 + bne @0802E2C4 mov r0, sp ldrb r0, [r0, 0x1] strh r0, [r4, 0x10] @@ -75345,12 +75345,12 @@ sub_802E264: @ 802E264 ldrh r0, [r0, 0x8] strh r0, [r6] movs r0, 0x1 - b _0802E2C6 + b @0802E2C6 .align 2, 0 .pool -_0802E2C4: +@0802E2C4: movs r0, 0 -_0802E2C6: +@0802E2C6: add sp, 0xC pop {r4-r6} pop {r1} @@ -75358,7 +75358,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 @@ -75372,7 +75372,7 @@ sub_802E2D0: @ 802E2D0 movs r1, 0xBC lsls r1, 6 cmp r0, r1 - bne _0802E320 + bne @0802E320 adds r1, r3, 0x2 adds r1, r2, r1 mov r0, sp @@ -75381,7 +75381,7 @@ sub_802E2D0: @ 802E2D0 mov r0, sp ldrb r0, [r0] cmp r0, 0x4 - bne _0802E320 + bne @0802E320 mov r0, sp ldrb r0, [r0, 0x1] strh r0, [r4, 0x10] @@ -75395,12 +75395,12 @@ sub_802E2D0: @ 802E2D0 ldrh r0, [r0, 0x4] strh r0, [r4, 0xE] movs r0, 0x1 - b _0802E322 + b @0802E322 .align 2, 0 .pool -_0802E320: +@0802E320: movs r0, 0 -_0802E322: +@0802E322: add sp, 0xC pop {r4} pop {r1} @@ -75408,7 +75408,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 @@ -75420,7 +75420,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 @@ -75435,7 +75435,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 @@ -75447,31 +75447,31 @@ sub_802E354: @ 802E354 movs r2, 0 ldr r0, [r1, 0xC] cmp r0, r4 - bcs _0802E378 + bcs @0802E378 ldr r0, =0x00018696 cmp r4, r0 - bhi _0802E378 + bhi @0802E378 str r4, [r1, 0xC] movs r2, 0x1 -_0802E378: +@0802E378: ldrh r0, [r1] cmp r0, r5 - bcs _0802E388 + bcs @0802E388 ldr r0, =0x0000270f cmp r5, r0 - bhi _0802E388 + bhi @0802E388 strh r5, [r1] movs r2, 0x1 -_0802E388: +@0802E388: ldrh r0, [r1, 0x4] cmp r0, r6 - bcs _0802E398 + bcs @0802E398 ldr r0, =0x0000270f cmp r6, r0 - bhi _0802E398 + bhi @0802E398 strh r6, [r1, 0x4] movs r2, 0x1 -_0802E398: +@0802E398: adds r0, r2, 0 pop {r4-r6} pop {r1} @@ -75481,17 +75481,17 @@ _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 ldrh r1, [r2, 0x6] ldr r0, =0x0000270e cmp r1, r0 - bhi _0802E3BC + bhi @0802E3BC adds r0, r1, 0x1 strh r0, [r2, 0x6] -_0802E3BC: +@0802E3BC: pop {r0} bx r0 .align 2, 0 @@ -75499,7 +75499,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 + 1 adds r0, r4, 0 @@ -75516,7 +75516,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 @@ -75529,21 +75529,21 @@ sub_802E3E4: @ 802E3E4 movs r1, 0 ldrsh r0, [r7, r1] cmp r0, 0x1 - beq _0802E4A8 + beq @0802E4A8 cmp r0, 0x1 - bgt _0802E40C + bgt @0802E40C cmp r0, 0 - beq _0802E416 - b _0802E4F6 + beq @0802E416 + b @0802E4F6 .align 2, 0 .pool -_0802E40C: +@0802E40C: cmp r0, 0x2 - beq _0802E4B4 + beq @0802E4B4 cmp r0, 0x3 - beq _0802E4DC - b _0802E4F6 -_0802E416: + beq @0802E4DC + b @0802E4F6 +@0802E416: ldr r0, =0x082fe270 ldr r1, [r0, 0x4] ldr r0, [r0] @@ -75556,32 +75556,32 @@ _0802E416: adds r4, r0, 0 movs r6, 0 ldr r5, =0x082fe278 -_0802E430: +@0802E430: ldr r1, [r5] movs r0, 0x1 movs r2, 0 bl font_get_width_of_string adds r0, 0x26 cmp r0, r4 - ble _0802E442 + ble @0802E442 adds r4, r0, 0 -_0802E442: +@0802E442: adds r5, 0x4 adds r6, 0x1 cmp r6, 0x2 - bls _0802E430 + bls @0802E430 adds r0, r4, 0x7 cmp r0, 0 - bge _0802E452 + bge @0802E452 adds r0, 0x7 -_0802E452: +@0802E452: asrs r4, r0, 3 movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _0802E45E + beq @0802E45E adds r4, 0x1 -_0802E45E: +@0802E45E: movs r1, 0x1E subs r1, r4 lsrs r0, r1, 31 @@ -75606,46 +75606,46 @@ _0802E45E: bl sub_802E500 ldrb r0, [r7, 0x2] movs r1, 0x3 - b _0802E4CA + b @0802E4CA .align 2, 0 .pool -_0802E4A8: +@0802E4A8: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802E4F6 - b _0802E4CE -_0802E4B4: + bne @0802E4F6 + b @0802E4CE +@0802E4B4: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _0802E4F6 + beq @0802E4F6 ldrb r0, [r7, 0x2] bl rbox_fill_rectangle ldrb r0, [r7, 0x2] movs r1, 0x1 -_0802E4CA: +@0802E4CA: bl Window_CopyToVram -_0802E4CE: +@0802E4CE: ldrh r0, [r7] adds r0, 0x1 strh r0, [r7] - b _0802E4F6 + b @0802E4F6 .align 2, 0 .pool -_0802E4DC: +@0802E4DC: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0802E4F6 + bne @0802E4F6 ldrb r0, [r7, 0x2] bl Window_Remove adds r0, r4, 0 bl remove_task bl script_env_2_enable_and_set_ctx_running -_0802E4F6: +@0802E4F6: add sp, 0x8 pop {r4-r7} pop {r0} @@ -75653,7 +75653,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 @@ -75717,7 +75717,7 @@ sub_802E500: @ 802E500 lsls r0, 21 mov r8, r0 ldr r5, =0x02021cc4 -_0802E58A: +@0802E58A: ldr r1, =0x082fe278 lsls r0, r6, 2 adds r0, r1 @@ -75767,7 +75767,7 @@ _0802E58A: ldr r1, [sp, 0x18] lsls r0, r1, 24 cmp r6, 0x2 - bls _0802E58A + bls @0802E58A lsrs r0, 24 bl Window_WriteStandardTileMap add sp, 0x24 @@ -75783,27 +75783,27 @@ _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 -_0802E626: + b @0802E628 +@0802E626: adds r1, 0x1 -_0802E628: +@0802E628: ldrb r0, [r1] cmp r0, 0xFF - beq _0802E636 + beq @0802E636 cmp r0, 0 - bne _0802E626 + bne @0802E626 movs r0, 0xFF strb r0, [r1] -_0802E636: +@0802E636: pop {r0} bx r0 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 @@ -75838,14 +75838,14 @@ 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 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq _0802E6B4 + beq @0802E6B4 ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -75854,18 +75854,18 @@ sub_802E688: @ 802E688 movs r0, 0x2 strh r0, [r1, 0x8] movs r0, 0x1 - b _0802E6B6 + b @0802E6B6 .align 2, 0 .pool -_0802E6B4: +@0802E6B4: movs r0, 0 -_0802E6B6: +@0802E6B6: pop {r1} bx r1 thumb_func_end sub_802E688 thumb_func_start sub_802E6BC -sub_802E6BC: @ 802E6BC +sub_802E6BC: ; 802E6BC push {lr} ldr r0, =sub_802E6D0 + 1 bl is_function_an_active_task @@ -75878,7 +75878,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 @@ -75890,19 +75890,19 @@ sub_802E6D0: @ 802E6D0 movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0x3 - beq _0802E71C + beq @0802E71C cmp r0, 0x3 - bgt _0802E6F8 + bgt @0802E6F8 cmp r0, 0x2 - beq _0802E6FE - b _0802E752 + beq @0802E6FE + b @0802E752 .align 2, 0 .pool -_0802E6F8: +@0802E6F8: cmp r0, 0x4 - beq _0802E738 - b _0802E752 -_0802E6FE: + beq @0802E738 + b @0802E752 +@0802E6FE: ldr r1, =0x082fe748 movs r2, 0x2 ldrsh r0, [r4, r2] @@ -75914,10 +75914,10 @@ _0802E6FE: bl _call_via_r1 movs r0, 0x3 strh r0, [r4] - b _0802E752 + b @0802E752 .align 2, 0 .pool -_0802E71C: +@0802E71C: ldr r0, =0x082fe748 movs r2, 0x2 ldrsh r1, [r4, r2] @@ -75927,10 +75927,10 @@ _0802E71C: ldr r1, [r1] adds r0, r5, 0 bl _call_via_r1 - b _0802E752 + b @0802E752 .align 2, 0 .pool -_0802E738: +@0802E738: ldr r0, =0x082fe748 movs r2, 0x2 ldrsh r1, [r4, r2] @@ -75942,7 +75942,7 @@ _0802E738: bl _call_via_r1 adds r0, r5, 0 bl remove_task -_0802E752: +@0802E752: pop {r4,r5} pop {r0} bx r0 @@ -75951,7 +75951,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} @@ -75975,8 +75975,8 @@ sub_802E75C: @ 802E75C movs r3, 0x10 ldrsh r0, [r4, r3] cmp r5, r0 - bge _0802E7C4 -_0802E790: + bge @0802E7C4 +@0802E790: movs r0, 0x4 ldrsh r1, [r4, r0] lsls r0, r1, 1 @@ -76001,19 +76001,19 @@ _0802E790: movs r1, 0x10 ldrsh r0, [r4, r1] cmp r5, r0 - blt _0802E790 -_0802E7C4: + blt @0802E790 +@0802E7C4: movs r5, 0 movs r2, 0x10 ldrsh r0, [r4, r2] cmp r5, r0 - bge _0802E820 + bge @0802E820 movs r7, 0x3 movs r3, 0xD negs r3, r3 mov r12, r3 ldr r6, =0x02020630 -_0802E7D8: +@0802E7D8: lsls r0, r5, 1 adds r0, r4 movs r1, 0x1A @@ -76049,8 +76049,8 @@ _0802E7D8: movs r1, 0x10 ldrsh r0, [r4, r1] cmp r5, r0 - blt _0802E7D8 -_0802E820: + blt @0802E7D8 +@0802E820: pop {r3} mov r8, r3 pop {r4-r7} @@ -76061,7 +76061,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 @@ -76127,7 +76127,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 @@ -76137,10 +76137,10 @@ sub_802E8C8: @ 802E8C8 lsls r1, 3 ldr r0, =0x03005e08 adds r4, r1, r0 - b _0802E8FC + b @0802E8FC .align 2, 0 .pool -_0802E8E0: +@0802E8E0: lsls r0, r5, 1 adds r0, r4 movs r2, 0x1A @@ -76154,11 +76154,11 @@ _0802E8E0: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_0802E8FC: +@0802E8FC: movs r1, 0x10 ldrsh r0, [r4, r1] cmp r5, r0 - blt _0802E8E0 + blt @0802E8E0 ldr r1, =0x082fe6c8 movs r2, 0x6 ldrsh r0, [r4, r2] @@ -76181,7 +76181,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 @@ -76197,34 +76197,34 @@ sub_802E938: @ 802E938 ldrsh r1, [r5, r2] bl __modsi3 cmp r0, 0 - bne _0802EA4A + bne @0802EA4A ldrh r2, [r5, 0x16] movs r3, 0x16 ldrsh r1, [r5, r3] movs r3, 0x14 ldrsh r0, [r5, r3] cmp r1, r0 - beq _0802EA4A + beq @0802EA4A strh r2, [r5, 0x14] movs r1, 0x32 ldrsh r0, [r6, r1] cmp r0, 0x4 - bhi _0802EA44 + bhi @0802EA44 lsls r0, 2 - ldr r1, =_0802E984 + ldr r1, =@0802E984 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0802E984: - .4byte _0802E998 - .4byte _0802E9A6 - .4byte _0802E9A6 - .4byte _0802E9BA - .4byte _0802EA04 -_0802E998: +@0802E984: + .4byte @0802E998 + .4byte @0802E9A6 + .4byte @0802E9A6 + .4byte @0802E9BA + .4byte @0802EA04 +@0802E998: adds r2, r6, 0 adds r2, 0x3E ldrb r1, [r2] @@ -76232,7 +76232,7 @@ _0802E998: negs r0, r0 ands r0, r1 strb r0, [r2] -_0802E9A6: +@0802E9A6: movs r0, 0x38 bl audio_play ldrh r1, [r6, 0x32] @@ -76240,8 +76240,8 @@ _0802E9A6: lsrs r1, 24 adds r0, r6, 0 bl obj_anim_image_start - b _0802EA44 -_0802E9BA: + b @0802EA44 +@0802E9BA: movs r0, 0x15 bl audio_play ldrh r1, [r6, 0x32] @@ -76273,10 +76273,10 @@ _0802E9BA: ldrb r1, [r0] ands r2, r1 strb r2, [r0] - b _0802EA44 + b @0802EA44 .align 2, 0 .pool -_0802EA04: +@0802EA04: adds r1, r6, 0 adds r1, 0x3E ldrb r0, [r1] @@ -76306,21 +76306,21 @@ _0802EA04: strb r1, [r0] movs r0, 0x4 strh r0, [r5] - b _0802EA4A + b @0802EA4A .align 2, 0 .pool -_0802EA44: +@0802EA44: ldrh r0, [r6, 0x32] adds r0, 0x1 strh r0, [r6, 0x32] -_0802EA4A: +@0802EA4A: pop {r4-r6} pop {r0} bx r0 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 @@ -76366,7 +76366,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 @@ -76379,19 +76379,19 @@ sub_802EAB0: @ 802EAB0 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _0802EB14 + beq @0802EB14 ldr r1, =0x03003090 ldrh r0, [r1, 0x2] ldr r5, =0x00007fff cmp r0, r5 - bne _0802EAD8 + bne @0802EAD8 ldrh r0, [r1, 0x4] strh r0, [r4, 0x16] -_0802EAD8: +@0802EAD8: bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - bne _0802EB1A + bne @0802EB1A ldrh r0, [r4, 0x18] adds r0, 0x1 strh r0, [r4, 0x18] @@ -76406,14 +76406,14 @@ _0802EAD8: strh r0, [r1, 0x2] mov r0, sp bl sub_800FE50 - b _0802EB1A + b @0802EB1A .align 2, 0 .pool -_0802EB14: +@0802EB14: ldrh r0, [r4, 0x16] adds r0, 0x1 strh r0, [r4, 0x16] -_0802EB1A: +@0802EB1A: add sp, 0xC pop {r4,r5} pop {r0} @@ -76421,7 +76421,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} @@ -76470,7 +76470,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 + 1 bl is_function_an_active_task @@ -76483,7 +76483,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 @@ -76496,19 +76496,19 @@ sub_802EB98: @ 802EB98 movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _0802EC08 + beq @0802EC08 cmp r0, 0x1 - bgt _0802EBC0 + bgt @0802EBC0 cmp r0, 0 - beq _0802EBC6 - b _0802EC8A + beq @0802EBC6 + b @0802EC8A .align 2, 0 .pool -_0802EBC0: +@0802EBC0: cmp r0, 0x2 - beq _0802EC4C - b _0802EC8A -_0802EBC6: + beq @0802EC4C + b @0802EC8A +@0802EBC6: ldrh r0, [r5, 0x4] ldrh r1, [r5, 0x6] bl sub_802EF50 @@ -76538,12 +76538,12 @@ _0802EBC6: adds r4, 0x2 str r4, [sp, 0x8] bl sub_802EFFC - b _0802EC3E -_0802EC08: + b @0802EC3E +@0802EC08: ldrb r0, [r5, 0xE] bl sub_802EC98 cmp r0, 0 - bne _0802EC8A + bne @0802EC8A ldrb r0, [r5, 0xE] ldrb r1, [r5, 0x10] ldrb r2, [r5, 0x12] @@ -76563,18 +76563,18 @@ _0802EC08: lsls r0, 2 adds r0, r4 bl obj_delete_and_free_tiles -_0802EC3E: +@0802EC3E: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] - b _0802EC8A + b @0802EC8A .align 2, 0 .pool -_0802EC4C: +@0802EC4C: ldrb r0, [r5, 0x10] bl sub_802EE30 cmp r0, 0 - bne _0802EC8A + bne @0802EC8A movs r4, 0x10 ldrsh r1, [r5, r4] lsls r0, r1, 4 @@ -76596,7 +76596,7 @@ _0802EC4C: bl gpu_pal_free_tag adds r0, r6, 0 bl remove_task -_0802EC8A: +@0802EC8A: add sp, 0xC pop {r4-r6} pop {r0} @@ -76606,7 +76606,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 @@ -76618,27 +76618,27 @@ sub_802EC98: @ 802EC98 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0x7 - bls _0802ECB2 - b _0802EDC4 -_0802ECB2: + bls @0802ECB2 + b @0802EDC4 +@0802ECB2: lsls r0, 2 - ldr r1, =_0802ECC4 + ldr r1, =@0802ECC4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0802ECC4: - .4byte _0802ECE4 - .4byte _0802ECF6 - .4byte _0802ED1C - .4byte _0802ED2C - .4byte _0802ED4E - .4byte _0802ED86 - .4byte _0802EDAC - .4byte _0802ED82 -_0802ECE4: +@0802ECC4: + .4byte @0802ECE4 + .4byte @0802ECF6 + .4byte @0802ED1C + .4byte @0802ED2C + .4byte @0802ED4E + .4byte @0802ED86 + .4byte @0802EDAC + .4byte @0802ED82 +@0802ECE4: movs r1, 0x80 lsls r1, 4 adds r0, r4, 0 @@ -76647,43 +76647,43 @@ _0802ECE4: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] -_0802ECF6: +@0802ECF6: movs r2, 0x32 ldrsh r0, [r4, r2] cmp r0, 0 - bne _0802ED04 + bne @0802ED04 movs r0, 0x39 bl audio_play -_0802ED04: +@0802ED04: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] lsls r0, 16 asrs r0, 16 cmp r0, 0x13 - ble _0802EDC4 + ble @0802EDC4 movs r0, 0 strh r0, [r4, 0x32] adds r0, r4, 0 movs r1, 0x1 - b _0802EDA2 -_0802ED1C: + b @0802EDA2 +@0802ED1C: adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0802EDC4 - b _0802EDA6 -_0802ED2C: + beq @0802EDC4 + b @0802EDA6 +@0802ED2C: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble _0802EDC4 + ble @0802EDC4 movs r0, 0 strh r0, [r4, 0x32] ldrh r0, [r4, 0x2E] @@ -76692,8 +76692,8 @@ _0802ED2C: adds r0, r4, 0 movs r1, 0x2 bl sub_8008258 - b _0802EDC4 -_0802ED4E: + b @0802EDC4 +@0802ED4E: ldrh r0, [r4, 0x22] subs r0, 0x4 strh r0, [r4, 0x22] @@ -76703,12 +76703,12 @@ _0802ED4E: lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - ble _0802EDC4 + ble @0802EDC4 ldrh r1, [r4, 0x36] movs r2, 0x36 ldrsh r0, [r4, r2] cmp r0, 0x1 - bgt _0802ED7E + bgt @0802ED7E adds r1, 0x1 lsls r1, 24 lsrs r1, 24 @@ -76716,14 +76716,14 @@ _0802ED4E: bl obj_anim_image_start movs r0, 0 strh r0, [r4, 0x32] - b _0802EDA6 -_0802ED7E: + b @0802EDA6 +@0802ED7E: movs r0, 0x7 strh r0, [r4, 0x2E] -_0802ED82: +@0802ED82: movs r0, 0 - b _0802EDC6 -_0802ED86: + b @0802EDC6 +@0802ED86: ldrh r0, [r4, 0x22] adds r0, 0x4 strh r0, [r4, 0x22] @@ -76733,41 +76733,41 @@ _0802ED86: lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - ble _0802EDC4 + ble @0802EDC4 movs r0, 0 strh r0, [r4, 0x32] adds r0, r4, 0 movs r1, 0x3 -_0802EDA2: +@0802EDA2: bl sub_8008258 -_0802EDA6: +@0802EDA6: ldrh r0, [r4, 0x2E] adds r0, 0x1 - b _0802EDC2 -_0802EDAC: + b @0802EDC2 +@0802EDAC: adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0802EDC4 + beq @0802EDC4 ldrh r0, [r4, 0x36] adds r0, 0x1 strh r0, [r4, 0x36] movs r0, 0x1 -_0802EDC2: +@0802EDC2: strh r0, [r4, 0x2E] -_0802EDC4: +@0802EDC4: movs r0, 0x1 -_0802EDC6: +@0802EDC6: pop {r4} pop {r1} bx r1 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} @@ -76817,7 +76817,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 @@ -76831,9 +76831,9 @@ sub_802EE30: @ 802EE30 ldr r1, [r1] ldr r0, =sub_802EE5C + 1 cmp r1, r0 - bne _0802EE4E + bne @0802EE4E movs r3, 0x1 -_0802EE4E: +@0802EE4E: adds r0, r3, 0 pop {r1} bx r1 @@ -76842,7 +76842,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 @@ -76850,22 +76850,22 @@ sub_802EE5C: @ 802EE5C movs r1, 0x2E ldrsh r0, [r5, r1] cmp r0, 0x4 - bhi _0802EF46 + bhi @0802EF46 lsls r0, 2 - ldr r1, =_0802EE7C + ldr r1, =@0802EE7C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0802EE7C: - .4byte _0802EE90 - .4byte _0802EEA0 - .4byte _0802EEC8 - .4byte _0802EEFC - .4byte _0802EF34 -_0802EE90: +@0802EE7C: + .4byte @0802EE90 + .4byte @0802EEA0 + .4byte @0802EEC8 + .4byte @0802EEFC + .4byte @0802EF34 +@0802EE90: movs r0, 0x40 strh r0, [r4, 0x8] ldrh r0, [r5, 0x26] @@ -76874,7 +76874,7 @@ _0802EE90: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -_0802EEA0: +@0802EEA0: ldrh r1, [r4, 0x8] ldrh r2, [r4, 0xA] adds r0, r1, r2 @@ -76885,7 +76885,7 @@ _0802EEA0: asrs r0, 20 strh r0, [r5, 0x26] cmp r0, 0 - blt _0802EF46 + blt @0802EF46 movs r0, 0x39 bl audio_play movs r0, 0 @@ -76893,15 +76893,15 @@ _0802EEA0: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - b _0802EF46 -_0802EEC8: + b @0802EF46 +@0802EEC8: ldrh r0, [r4, 0x2] adds r0, 0xC strh r0, [r4, 0x2] lsls r0, 16 asrs r0, 16 cmp r0, 0x7F - ble _0802EEE6 + ble @0802EEE6 movs r0, 0x39 bl audio_play movs r0, 0 @@ -76909,7 +76909,7 @@ _0802EEC8: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -_0802EEE6: +@0802EEE6: ldr r0, =0x08329f40 movs r2, 0x2 ldrsh r1, [r4, r2] @@ -76918,17 +76918,17 @@ _0802EEE6: movs r2, 0 ldrsh r0, [r1, r2] asrs r0, 4 - b _0802EF2A + b @0802EF2A .align 2, 0 .pool -_0802EEFC: +@0802EEFC: ldrh r0, [r4, 0x2] adds r0, 0x10 strh r0, [r4, 0x2] lsls r0, 16 asrs r0, 16 cmp r0, 0x7F - ble _0802EF1A + ble @0802EF1A movs r0, 0x39 bl audio_play movs r0, 0 @@ -76936,7 +76936,7 @@ _0802EEFC: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -_0802EF1A: +@0802EF1A: ldr r1, =0x08329f40 movs r2, 0x2 ldrsh r0, [r4, r2] @@ -76945,23 +76945,23 @@ _0802EF1A: ldrh r0, [r0] lsls r0, 16 asrs r0, 21 -_0802EF2A: +@0802EF2A: negs r0, r0 strh r0, [r5, 0x26] - b _0802EF46 + b @0802EF46 .align 2, 0 .pool -_0802EF34: +@0802EF34: ldrh r0, [r4, 0x2] adds r0, 0x1 strh r0, [r4, 0x2] lsls r0, 16 asrs r0, 16 cmp r0, 0x28 - ble _0802EF46 + ble @0802EF46 ldr r0, =nullsub_12 + 1 str r0, [r5, 0x1C] -_0802EF46: +@0802EF46: pop {r4,r5} pop {r0} bx r0 @@ -76970,7 +76970,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 @@ -77010,7 +77010,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} @@ -77055,7 +77055,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 @@ -77156,7 +77156,7 @@ sub_802EFFC: @ 802EFFC thumb_func_end sub_802EFFC thumb_func_start sub_802F0CC -sub_802F0CC: @ 802F0CC +sub_802F0CC: ; 802F0CC ldr r2, =0x03000dce ldr r1, =0x04000208 ldrh r0, [r1] @@ -77169,7 +77169,7 @@ sub_802F0CC: @ 802F0CC thumb_func_end sub_802F0CC thumb_func_start sub_802F0E4 -sub_802F0E4: @ 802F0E4 +sub_802F0E4: ; 802F0E4 ldr r0, =0x04000208 ldr r1, =0x03000dce ldrh r1, [r1] @@ -77180,20 +77180,20 @@ sub_802F0E4: @ 802F0E4 thumb_func_end sub_802F0E4 thumb_func_start sub_802F0F8 -sub_802F0F8: @ 802F0F8 +sub_802F0F8: ; 802F0F8 push {lr} lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x9F - bhi _0802F10A + bhi @0802F10A movs r3, 0xF ands r3, r2 cmp r3, 0x9 - bls _0802F10E -_0802F10A: + bls @0802F10E +@0802F10A: movs r0, 0xFF - b _0802F11C -_0802F10E: + b @0802F11C +@0802F10E: lsrs r1, r0, 28 movs r0, 0xF ands r1, r0 @@ -77201,44 +77201,44 @@ _0802F10E: adds r0, r1 lsls r0, 1 adds r0, r3 -_0802F11C: +@0802F11C: pop {r1} bx r1 thumb_func_end sub_802F0F8 thumb_func_start sub_802F120 -sub_802F120: @ 802F120 +sub_802F120: ; 802F120 push {r4,lr} adds r4, r0, 0 movs r0, 0x3 ands r0, r4 cmp r0, 0 - bne _0802F138 + bne @0802F138 adds r0, r4, 0 movs r1, 0x64 bl __umodsi3 cmp r0, 0 - bne _0802F146 -_0802F138: + bne @0802F146 +@0802F138: movs r1, 0xC8 lsls r1, 1 adds r0, r4, 0 bl __umodsi3 cmp r0, 0 - bne _0802F14A -_0802F146: + bne @0802F14A +@0802F146: movs r0, 0x1 - b _0802F14C -_0802F14A: + b @0802F14C +@0802F14A: movs r0, 0 -_0802F14C: +@0802F14C: pop {r4} pop {r1} bx r1 thumb_func_end sub_802F120 thumb_func_start sub_802F154 -sub_802F154: @ 802F154 +sub_802F154: ; 802F154 push {r4-r7,lr} mov r7, r8 push {r7} @@ -77252,8 +77252,8 @@ sub_802F154: @ 802F154 movs r5, 0 subs r4, r7, 0x1 cmp r4, 0 - blt _0802F192 -_0802F170: + blt @0802F192 +@0802F170: ldr r1, =0x0000016d adds r0, r5, r1 lsls r0, 16 @@ -77263,41 +77263,41 @@ _0802F170: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0802F18C + bne @0802F18C adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 -_0802F18C: +@0802F18C: subs r4, 0x1 cmp r4, 0 - bge _0802F170 -_0802F192: + bge @0802F170 +@0802F192: subs r0, r6, 0x1 cmp r0, 0 - ble _0802F1AA + ble @0802F1AA ldr r1, =0x082feccc adds r4, r0, 0 -_0802F19C: +@0802F19C: ldm r1!, {r0} adds r0, r5, r0 lsls r0, 16 lsrs r5, r0, 16 subs r4, 0x1 cmp r4, 0 - bne _0802F19C -_0802F1AA: + bne @0802F19C +@0802F1AA: cmp r6, 0x2 - bls _0802F1C2 + bls @0802F1C2 adds r0, r7, 0 bl sub_802F120 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0802F1C2 + bne @0802F1C2 adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 -_0802F1C2: +@0802F1C2: mov r1, r8 adds r0, r5, r1 lsls r0, 16 @@ -77313,7 +77313,7 @@ _0802F1C2: thumb_func_end sub_802F154 thumb_func_start sub_802F1E0 -sub_802F1E0: @ 802F1E0 +sub_802F1E0: ; 802F1E0 push {r4-r6,lr} adds r6, r0, 0 ldrb r0, [r6] @@ -77342,7 +77342,7 @@ sub_802F1E0: @ 802F1E0 thumb_func_end sub_802F1E0 thumb_func_start sub_802F21C -sub_802F21C: @ 802F21C +sub_802F21C: ; 802F21C push {r4,r5,lr} ldr r5, =0x03000db8 movs r0, 0 @@ -77357,19 +77357,19 @@ sub_802F21C: @ 802F21C movs r0, 0xF ands r0, r4 cmp r0, 0x1 - beq _0802F250 + beq @0802F250 movs r0, 0x1 strh r0, [r5] - b _0802F26E + b @0802F26E .align 2, 0 .pool -_0802F250: +@0802F250: movs r0, 0xF0 ands r0, r4 cmp r0, 0 - beq _0802F25A + beq @0802F25A movs r0, 0x2 -_0802F25A: +@0802F25A: strh r0, [r5] ldr r4, =0x03000dc0 adds r0, r4, 0 @@ -77378,7 +77378,7 @@ _0802F25A: bl sub_802F2FC ldr r1, =0x03000db8 strh r0, [r1] -_0802F26E: +@0802F26E: pop {r4,r5} pop {r0} bx r0 @@ -77387,7 +77387,7 @@ _0802F26E: thumb_func_end sub_802F21C thumb_func_start sub_802F27C -sub_802F27C: @ 802F27C +sub_802F27C: ; 802F27C ldr r0, =0x03000db8 ldrh r0, [r0] bx lr @@ -77396,7 +77396,7 @@ sub_802F27C: @ 802F27C thumb_func_end sub_802F27C thumb_func_start sub_802F288 -sub_802F288: @ 802F288 +sub_802F288: ; 802F288 push {r4,lr} adds r2, r0, 0 ldr r0, =0x03000db8 @@ -77405,25 +77405,25 @@ sub_802F288: @ 802F288 lsls r0, 4 ands r0, r1 cmp r0, 0 - beq _0802F2AC + beq @0802F2AC adds r1, r2, 0 ldr r0, =0x082fecc0 ldm r0!, {r2-r4} stm r1!, {r2-r4} - b _0802F2B2 + b @0802F2B2 .align 2, 0 .pool -_0802F2AC: +@0802F2AC: adds r0, r2, 0 bl sub_802F2E8 -_0802F2B2: +@0802F2B2: pop {r4} pop {r0} bx r0 thumb_func_end sub_802F288 thumb_func_start sub_802F2B8 -sub_802F2B8: @ 802F2B8 +sub_802F2B8: ; 802F2B8 push {r4,lr} adds r4, r0, 0 bl sub_802F0CC @@ -77436,7 +77436,7 @@ sub_802F2B8: @ 802F2B8 thumb_func_end sub_802F2B8 thumb_func_start sub_802F2D0 -sub_802F2D0: @ 802F2D0 +sub_802F2D0: ; 802F2D0 push {r4,lr} adds r4, r0, 0 bl sub_802F0CC @@ -77449,7 +77449,7 @@ sub_802F2D0: @ 802F2D0 thumb_func_end sub_802F2D0 thumb_func_start sub_802F2E8 -sub_802F2E8: @ 802F2E8 +sub_802F2E8: ; 802F2E8 push {r4,lr} adds r4, r0, 0 bl sub_802F2D0 @@ -77461,7 +77461,7 @@ sub_802F2E8: @ 802F2E8 thumb_func_end sub_802F2E8 thumb_func_start sub_802F2FC -sub_802F2FC: @ 802F2FC +sub_802F2FC: ; 802F2FC push {r4-r7,lr} mov r7, r8 push {r7} @@ -77478,49 +77478,49 @@ sub_802F2FC: @ 802F2FC movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _0802F322 + bne @0802F322 movs r0, 0x10 orrs r4, r0 -_0802F322: +@0802F322: ldrb r0, [r7] bl sub_802F0F8 mov r8, r0 cmp r0, 0xFF - bne _0802F336 + bne @0802F336 movs r0, 0x40 orrs r4, r0 lsls r0, r4, 16 lsrs r4, r0, 16 -_0802F336: +@0802F336: ldrb r0, [r7, 0x1] bl sub_802F0F8 adds r6, r0, 0 cmp r6, 0xFF - beq _0802F34A + beq @0802F34A cmp r6, 0 - beq _0802F34A + beq @0802F34A cmp r6, 0xC - ble _0802F352 -_0802F34A: + ble @0802F352 +@0802F34A: movs r0, 0x80 orrs r4, r0 lsls r0, r4, 16 lsrs r4, r0, 16 -_0802F352: +@0802F352: ldrb r0, [r7, 0x2] bl sub_802F0F8 adds r5, r0, 0 cmp r5, 0xFF - bne _0802F36A + bne @0802F36A movs r1, 0x80 lsls r1, 1 adds r0, r1, 0 orrs r4, r0 lsls r0, r4, 16 lsrs r4, r0, 16 -_0802F36A: +@0802F36A: cmp r6, 0x2 - bne _0802F384 + bne @0802F384 mov r0, r8 bl sub_802F120 lsls r0, 24 @@ -77528,61 +77528,61 @@ _0802F36A: ldr r1, =0x082feccc ldr r1, [r1, 0x4] adds r0, r1 - b _0802F38E + b @0802F38E .align 2, 0 .pool -_0802F384: +@0802F384: ldr r0, =0x082feccc subs r1, r6, 0x1 lsls r1, 2 adds r1, r0 ldr r0, [r1] -_0802F38E: +@0802F38E: cmp r5, r0 - ble _0802F39E + ble @0802F39E movs r1, 0x80 lsls r1, 1 adds r0, r1, 0 orrs r4, r0 lsls r0, r4, 16 lsrs r4, r0, 16 -_0802F39E: +@0802F39E: ldrb r0, [r7, 0x4] bl sub_802F0F8 adds r5, r0, 0 cmp r5, 0x18 - ble _0802F3B6 + ble @0802F3B6 movs r1, 0x80 lsls r1, 2 adds r0, r1, 0 orrs r4, r0 lsls r0, r4, 16 lsrs r4, r0, 16 -_0802F3B6: +@0802F3B6: ldrb r0, [r7, 0x5] bl sub_802F0F8 adds r5, r0, 0 cmp r5, 0x3C - ble _0802F3CE + ble @0802F3CE movs r1, 0x80 lsls r1, 3 adds r0, r1, 0 orrs r4, r0 lsls r0, r4, 16 lsrs r4, r0, 16 -_0802F3CE: +@0802F3CE: ldrb r0, [r7, 0x6] bl sub_802F0F8 adds r5, r0, 0 cmp r5, 0x3C - ble _0802F3E6 + ble @0802F3E6 movs r1, 0x80 lsls r1, 4 adds r0, r1, 0 orrs r4, r0 lsls r0, r4, 16 lsrs r4, r0, 16 -_0802F3E6: +@0802F3E6: adds r0, r4, 0 pop {r3} mov r8, r3 @@ -77594,7 +77594,7 @@ _0802F3E6: thumb_func_end sub_802F2FC thumb_func_start sub_802F3F8 -sub_802F3F8: @ 802F3F8 +sub_802F3F8: ; 802F3F8 push {lr} bl sub_802F0CC bl sub_82E2258 @@ -77604,7 +77604,7 @@ sub_802F3F8: @ 802F3F8 thumb_func_end sub_802F3F8 thumb_func_start sub_802F40C -sub_802F40C: @ 802F40C +sub_802F40C: ; 802F40C push {r4-r6,lr} adds r5, r2, 0 adds r6, r3, 0 @@ -77632,7 +77632,7 @@ sub_802F40C: @ 802F40C thumb_func_end sub_802F40C thumb_func_start sub_802F444 -sub_802F444: @ 802F444 +sub_802F444: ; 802F444 push {r4-r6,lr} adds r5, r2, 0 adds r6, r3, 0 @@ -77660,7 +77660,7 @@ sub_802F444: @ 802F444 thumb_func_end sub_802F444 thumb_func_start sub_802F47C -sub_802F47C: @ 802F47C +sub_802F47C: ; 802F47C push {lr} ldr r3, =0x03000dc0 ldrb r1, [r3, 0x4] @@ -77674,7 +77674,7 @@ sub_802F47C: @ 802F47C thumb_func_end sub_802F47C thumb_func_start sub_802F494 -sub_802F494: @ 802F494 +sub_802F494: ; 802F494 push {r4-r6,lr} adds r5, r2, 0 adds r6, r3, 0 @@ -77702,7 +77702,7 @@ sub_802F494: @ 802F494 thumb_func_end sub_802F494 thumb_func_start sub_802F4CC -sub_802F4CC: @ 802F4CC +sub_802F4CC: ; 802F4CC push {r4-r6,lr} adds r5, r2, 0 adds r6, r3, 0 @@ -77730,7 +77730,7 @@ sub_802F4CC: @ 802F4CC thumb_func_end sub_802F4CC thumb_func_start sub_802F504 -sub_802F504: @ 802F504 +sub_802F504: ; 802F504 push {r4-r7,lr} adds r5, r0, 0 adds r7, r1, 0 @@ -77761,45 +77761,45 @@ sub_802F504: @ 802F504 movs r0, 0x4 ldrsb r0, [r7, r0] cmp r0, 0 - bge _0802F556 + bge @0802F556 adds r0, r1, 0 adds r0, 0x3C strb r0, [r7, 0x4] ldrb r0, [r7, 0x3] subs r0, 0x1 strb r0, [r7, 0x3] -_0802F556: +@0802F556: ldrb r1, [r7, 0x3] movs r0, 0x3 ldrsb r0, [r7, r0] cmp r0, 0 - bge _0802F56C + bge @0802F56C adds r0, r1, 0 adds r0, 0x3C strb r0, [r7, 0x3] ldrb r0, [r7, 0x2] subs r0, 0x1 strb r0, [r7, 0x2] -_0802F56C: +@0802F56C: ldrb r1, [r7, 0x2] movs r0, 0x2 ldrsb r0, [r7, r0] cmp r0, 0 - bge _0802F582 + bge @0802F582 adds r0, r1, 0 adds r0, 0x18 strb r0, [r7, 0x2] ldrh r0, [r7] subs r0, 0x1 strh r0, [r7] -_0802F582: +@0802F582: pop {r4-r7} pop {r0} bx r0 thumb_func_end sub_802F504 thumb_func_start sub_802F588 -sub_802F588: @ 802F588 +sub_802F588: ; 802F588 push {r4,lr} ldr r4, =0x03000dc0 adds r0, r4, 0 @@ -77818,7 +77818,7 @@ sub_802F588: @ 802F588 thumb_func_end sub_802F588 thumb_func_start sub_802F5B4 -sub_802F5B4: @ 802F5B4 +sub_802F5B4: ; 802F5B4 push {lr} adds r3, r0, 0 adds r2, r1, 0 @@ -77831,7 +77831,7 @@ sub_802F5B4: @ 802F5B4 thumb_func_end sub_802F5B4 thumb_func_start sub_802F5C8 -sub_802F5C8: @ 802F5C8 +sub_802F5C8: ; 802F5C8 push {r4,r5,lr} ldr r4, =0x03005cf8 strh r0, [r4] @@ -77855,7 +77855,7 @@ sub_802F5C8: @ 802F5C8 thumb_func_end sub_802F5C8 thumb_func_start sub_802F5FC -sub_802F5FC: @ 802F5FC +sub_802F5FC: ; 802F5FC push {r4-r6,lr} adds r4, r0, 0 ldrb r3, [r2, 0x4] @@ -77876,44 +77876,44 @@ sub_802F5FC: @ 802F5FC strh r0, [r4] lsls r0, r5, 24 cmp r0, 0 - bge _0802F630 + bge @0802F630 adds r0, r5, 0 adds r0, 0x3C strb r0, [r4, 0x4] subs r0, r6, 0x1 strb r0, [r4, 0x3] -_0802F630: +@0802F630: ldrb r1, [r4, 0x3] movs r0, 0x3 ldrsb r0, [r4, r0] cmp r0, 0 - bge _0802F646 + bge @0802F646 adds r0, r1, 0 adds r0, 0x3C strb r0, [r4, 0x3] ldrb r0, [r4, 0x2] subs r0, 0x1 strb r0, [r4, 0x2] -_0802F646: +@0802F646: ldrb r1, [r4, 0x2] movs r0, 0x2 ldrsb r0, [r4, r0] cmp r0, 0 - bge _0802F65C + bge @0802F65C adds r0, r1, 0 adds r0, 0x18 strb r0, [r4, 0x2] ldrh r0, [r4] subs r0, 0x1 strh r0, [r4] -_0802F65C: +@0802F65C: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_802F5FC thumb_func_start sub_802F664 -sub_802F664: @ 802F664 +sub_802F664: ; 802F664 push {r4,lr} ldr r4, =0x03000dc0 adds r0, r4, 0 @@ -77942,7 +77942,7 @@ sub_802F664: @ 802F664 thumb_func_end sub_802F664 thumb_func_start sub_802F69C -sub_802F69C: @ 802F69C +sub_802F69C: ; 802F69C push {lr} ldr r0, =0x03000dc0 bl sub_802F1E0 @@ -77955,7 +77955,7 @@ sub_802F69C: @ 802F69C thumb_func_end sub_802F69C thumb_func_start c2_title_menu_3 -c2_title_menu_3: @ 802F6B0 +c2_title_menu_3: ; 802F6B0 push {lr} bl run_active_tasks bl call_obj_callbacks @@ -77966,7 +77966,7 @@ c2_title_menu_3: @ 802F6B0 thumb_func_end c2_title_menu_3 thumb_func_start sub_802F6C8 -sub_802F6C8: @ 802F6C8 +sub_802F6C8: ; 802F6C8 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -77976,8 +77976,8 @@ sub_802F6C8: @ 802F6C8 thumb_func_end sub_802F6C8 thumb_func_start c2_title_menu_2 -@ void c2_title_menu_2() -c2_title_menu_2: @ 802F6DC +; void c2_title_menu_2() +c2_title_menu_2: ; 802F6DC push {lr} movs r0, 0 bl init_title_menu @@ -77986,8 +77986,8 @@ c2_title_menu_2: @ 802F6DC thumb_func_end c2_title_menu_2 thumb_func_start c2_title_menu_2_dupe -@ void c2_title_menu_2_dupe() -c2_title_menu_2_dupe: @ 802F6E8 +; void c2_title_menu_2_dupe() +c2_title_menu_2_dupe: ; 802F6E8 push {lr} movs r0, 0x1 bl init_title_menu @@ -77996,8 +77996,8 @@ c2_title_menu_2_dupe: @ 802F6E8 thumb_func_end c2_title_menu_2_dupe thumb_func_start init_title_menu -@ void init_title_menu(int useless_param) -init_title_menu: @ 802F6F4 +; void init_title_menu(int useless_param) +init_title_menu: ; 802F6F4 push {r4,r5,lr} sub sp, 0xC adds r4, r0, 0 @@ -78079,7 +78079,7 @@ init_title_menu: @ 802F6F4 bl reset_all_obj_data bl gpu_pal_allocator_reset cmp r4, 0 - beq _0802F7EC + beq @0802F7EC movs r0, 0x1 negs r0, r0 str r5, [sp] @@ -78087,10 +78087,10 @@ init_title_menu: @ 802F6F4 movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - b _0802F7FE + b @0802F7FE .align 2, 0 .pool -_0802F7EC: +@0802F7EC: movs r0, 0x1 negs r0, r0 ldr r1, =0x0000ffff @@ -78099,7 +78099,7 @@ _0802F7EC: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 -_0802F7FE: +@0802F7FE: movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags ldr r1, =0x082ff0e8 @@ -78176,8 +78176,8 @@ _0802F7FE: thumb_func_end init_title_menu thumb_func_start task_init_title_menu_graphics -@ void task_init_title_menu_graphics(int task_id) -task_init_title_menu_graphics: @ 802F8D8 +; void task_init_title_menu_graphics(int task_id) +task_init_title_menu_graphics: ; 802F8D8 push {r4-r7,lr} mov r7, r8 push {r7} @@ -78196,9 +78196,9 @@ task_init_title_menu_graphics: @ 802F8D8 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - beq _0802F900 - b _0802FA4E -_0802F900: + beq @0802F900 + b @0802FA4E +@0802F900: movs r0, 0x40 movs r1, 0 bl lcd_io_set @@ -78223,56 +78223,56 @@ _0802F900: bl sub_80093CC lsls r0, 24 cmp r0, 0 - beq _0802F946 + beq @0802F946 movs r0, 0x1 strh r0, [r4, 0x1E] -_0802F946: +@0802F946: ldr r0, =0x03006210 ldrh r0, [r0] cmp r0, 0x2 - beq _0802F990 + beq @0802F990 cmp r0, 0x2 - bgt _0802F968 + bgt @0802F968 cmp r0, 0 - beq _0802F9D0 + beq @0802F9D0 cmp r0, 0x1 - beq _0802F972 - b _0802F9D0 + beq @0802F972 + b @0802F9D0 .align 2, 0 .pool -_0802F968: +@0802F968: cmp r0, 0x4 - beq _0802F9EC + beq @0802F9EC cmp r0, 0xFF - beq _0802F9A4 - b _0802F9D0 -_0802F972: + beq @0802F9A4 + b @0802F9D0 +@0802F972: strh r0, [r4] bl sub_809D4C4 cmp r0, 0 - beq _0802F982 + beq @0802F982 ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -_0802F982: +@0802F982: mov r0, r8 subs r0, 0x8 adds r0, r7, r0 ldr r1, =task_init_title_menu_graphics_2 + 1 - b _0802F9FC + b @0802F9FC .align 2, 0 .pool -_0802F990: +@0802F990: ldr r0, =0x085e8405 bl draw_text_box strh r5, [r4] mov r0, r8 subs r0, 0x8 adds r0, r7, r0 - b _0802F9FA + b @0802F9FA .align 2, 0 .pool -_0802F9A4: +@0802F9A4: ldr r0, =0x085e83c2 bl draw_text_box mov r0, r8 @@ -78284,14 +78284,14 @@ _0802F9A4: strh r0, [r4] bl sub_809D4C4 cmp r0, 0x1 - bne _0802F9FE + bne @0802F9FE ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - b _0802F9FE + b @0802F9FE .align 2, 0 .pool -_0802F9D0: +@0802F9D0: movs r0, 0 strh r0, [r4] ldr r1, =0x03005e00 @@ -78300,53 +78300,53 @@ _0802F9D0: lsls r0, 3 adds r0, r1 ldr r1, =task_init_title_menu_graphics_2 + 1 - b _0802F9FC + b @0802F9FC .align 2, 0 .pool -_0802F9EC: +@0802F9EC: ldr r0, =0x085e8440 bl draw_text_box mov r0, r8 subs r0, 0x8 adds r0, r7, r0 strh r5, [r0, 0x8] -_0802F9FA: +@0802F9FA: ldr r1, =task_init_title_menu_save_file_corrupt + 1 -_0802F9FC: +@0802F9FC: str r1, [r0] -_0802F9FE: +@0802F9FE: ldr r2, =0x02022d06 ldrh r1, [r2] movs r0, 0x80 lsls r0, 8 ands r0, r1 cmp r0, 0 - beq _0802FA3E + beq @0802FA3E movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0x2 - beq _0802FA36 + beq @0802FA36 cmp r0, 0x2 - ble _0802FA2C + ble @0802FA2C cmp r0, 0x3 - beq _0802FA3A - b _0802FA3E + beq @0802FA3A + b @0802FA3E .align 2, 0 .pool -_0802FA2C: +@0802FA2C: cmp r0, 0 - blt _0802FA3E + blt @0802FA3E ldrh r0, [r4] adds r0, 0x1 - b _0802FA3C -_0802FA36: + b @0802FA3C +@0802FA36: movs r0, 0x3 - b _0802FA3C -_0802FA3A: + b @0802FA3C +@0802FA3A: movs r0, 0x4 -_0802FA3C: +@0802FA3C: strh r0, [r2] -_0802FA3E: +@0802FA3E: ldrh r1, [r2] ldr r0, =0x00007fff ands r0, r1 @@ -78355,7 +78355,7 @@ _0802FA3E: ldrh r0, [r4] adds r0, 0x2 strh r0, [r4, 0x18] -_0802FA4E: +@0802FA4E: pop {r3} mov r8, r3 pop {r4-r7} @@ -78366,7 +78366,7 @@ _0802FA4E: thumb_func_end task_init_title_menu_graphics thumb_func_start task_init_title_menu_save_file_corrupt -task_init_title_menu_save_file_corrupt: @ 802FA5C +task_init_title_menu_save_file_corrupt: ; 802FA5C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -78375,13 +78375,13 @@ task_init_title_menu_save_file_corrupt: @ 802FA5C bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _0802FA98 + bne @0802FA98 ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0802FA98 + beq @0802FA98 movs r0, 0x7 bl Window_FillTileMap ldr r0, =0x082ff070 @@ -78393,7 +78393,7 @@ task_init_title_menu_save_file_corrupt: @ 802FA5C adds r0, r1 ldr r1, =task_init_title_menu_graphics_2 + 1 str r1, [r0] -_0802FA98: +@0802FA98: pop {r4} pop {r0} bx r0 @@ -78402,7 +78402,7 @@ _0802FA98: thumb_func_end task_init_title_menu_save_file_corrupt thumb_func_start task_init_title_menu_graphics_2 -task_init_title_menu_graphics_2: @ 802FAB0 +task_init_title_menu_graphics_2: ; 802FAB0 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -78412,7 +78412,7 @@ task_init_title_menu_graphics_2: @ 802FAB0 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0802FB3C + bne @0802FB3C movs r0, 0x40 movs r1, 0 bl lcd_io_set @@ -78439,7 +78439,7 @@ task_init_title_menu_graphics_2: @ 802FAB0 lsls r1, 4 ands r1, r0 cmp r1, 0 - bne _0802FB28 + bne @0802FB28 ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -78447,10 +78447,10 @@ task_init_title_menu_graphics_2: @ 802FAB0 adds r1, r0 ldr r0, =task_init_title_menu_graphics_3 + 1 str r0, [r1] - b _0802FB3C + b @0802FB3C .align 2, 0 .pool -_0802FB28: +@0802FB28: ldr r0, =0x085e8453 bl draw_text_box ldr r1, =0x03005e00 @@ -78460,7 +78460,7 @@ _0802FB28: adds r0, r1 ldr r1, =task_init_title_menu_battery_dry + 1 str r1, [r0] -_0802FB3C: +@0802FB3C: pop {r4,r5} pop {r0} bx r0 @@ -78469,7 +78469,7 @@ _0802FB3C: thumb_func_end task_init_title_menu_graphics_2 thumb_func_start task_init_title_menu_battery_dry -task_init_title_menu_battery_dry: @ 802FB50 +task_init_title_menu_battery_dry: ; 802FB50 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -78478,13 +78478,13 @@ task_init_title_menu_battery_dry: @ 802FB50 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _0802FB8C + bne @0802FB8C ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0802FB8C + beq @0802FB8C movs r0, 0x7 bl Window_FillTileMap ldr r0, =0x082ff070 @@ -78496,7 +78496,7 @@ task_init_title_menu_battery_dry: @ 802FB50 adds r0, r1 ldr r1, =task_init_title_menu_graphics_3 + 1 str r1, [r0] -_0802FB8C: +@0802FB8C: pop {r4} pop {r0} bx r0 @@ -78505,8 +78505,8 @@ _0802FB8C: thumb_func_end task_init_title_menu_battery_dry thumb_func_start task_init_title_menu_graphics_3 -@ void task_init_title_menu_graphics_3(int task_id) -task_init_title_menu_graphics_3: @ 802FBA4 +; void task_init_title_menu_graphics_3(int task_id) +task_init_title_menu_graphics_3: ; 802FBA4 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -78526,9 +78526,9 @@ task_init_title_menu_graphics_3: @ 802FBA4 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq _0802FBCE - b _0803006C -_0802FBCE: + beq @0802FBCE + b @0803006C +@0802FBCE: movs r0, 0x40 movs r1, 0 bl lcd_io_set @@ -78583,7 +78583,7 @@ _0802FBCE: ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - bne _0802FC84 + bne @0802FC84 add r1, sp, 0xC ldr r2, =0x00007e04 adds r0, r2, 0 @@ -78592,10 +78592,10 @@ _0802FBCE: movs r1, 0xF1 movs r2, 0x2 bl gpu_pal_apply - b _0802FC96 + b @0802FC96 .align 2, 0 .pool -_0802FC84: +@0802FC84: add r1, sp, 0xC ldr r2, =0x0000547f adds r0, r2, 0 @@ -78604,7 +78604,7 @@ _0802FC84: movs r1, 0xF1 movs r2, 0x2 bl gpu_pal_apply -_0802FC96: +@0802FC96: ldr r0, =0x03005e00 mov r8, r0 lsls r1, r7, 2 @@ -78615,17 +78615,17 @@ _0802FC96: ldrsh r0, [r0, r2] mov r9, r1 cmp r0, 0x1 - beq _0802FD44 + beq @0802FD44 cmp r0, 0x1 - ble _0802FCBC + ble @0802FCBC cmp r0, 0x2 - bne _0802FCB6 - b _0802FE00 -_0802FCB6: + bne @0802FCB6 + b @0802FE00 +@0802FCB6: cmp r0, 0x3 - bne _0802FCBC - b _0802FEFC -_0802FCBC: + bne @0802FCBC + b @0802FEFC +@0802FCBC: movs r0, 0 movs r1, 0xAA bl Window_FastFillPixels @@ -78669,10 +78669,10 @@ _0802FCBC: adds r1, r5, 0 bl write_textbox_border_to_bg_tilemap adds r4, 0x8 - b _0802FED4 + b @0802FED4 .align 2, 0 .pool -_0802FD44: +@0802FD44: movs r0, 0x2 movs r1, 0xAA bl Window_FastFillPixels @@ -78738,10 +78738,10 @@ _0802FD44: adds r1, r5, 0 bl write_textbox_border_to_bg_tilemap adds r4, 0x10 - b _0802FED4 + b @0802FED4 .align 2, 0 .pool -_0802FE00: +@0802FE00: movs r0, 0x2 movs r1, 0xAA bl Window_FastFillPixels @@ -78828,14 +78828,14 @@ _0802FE00: adds r1, r5, 0 bl write_textbox_border_to_bg_tilemap adds r4, 0x18 -_0802FED4: +@0802FED4: adds r0, r4, 0 adds r1, r5, 0 bl write_textbox_border_to_bg_tilemap - b _0803005E + b @0803005E .align 2, 0 .pool -_0802FEFC: +@0802FEFC: movs r0, 0x2 movs r1, 0xAA bl Window_FastFillPixels @@ -78963,7 +78963,7 @@ _0802FEFC: str r1, [r0] ldrh r0, [r4] cmp r0, 0x4 - bne _0803005E + bne @0803005E movs r4, 0x80 lsls r4, 6 movs r0, 0 @@ -78984,7 +78984,7 @@ _0802FEFC: add r0, r8 movs r1, 0x1 strh r1, [r0, 0x26] -_0803005E: +@0803005E: ldr r0, =0x03005e00 mov r2, r9 adds r1, r2, r7 @@ -78992,7 +78992,7 @@ _0803005E: adds r1, r0 ldr r0, =task_title_menu_highlight_selected_menu_items + 1 str r0, [r1] -_0803006C: +@0803006C: add sp, 0x10 pop {r3,r4} mov r8, r3 @@ -79005,8 +79005,8 @@ _0803006C: thumb_func_end task_init_title_menu_graphics_3 thumb_func_start task_title_menu_highlight_selected_menu_items -@ void task_title_menu_highlight_selected_menu_items(int task_id) -task_title_menu_highlight_selected_menu_items: @ 80300B0 +; void task_title_menu_highlight_selected_menu_items(int task_id) +task_title_menu_highlight_selected_menu_items: ; 80300B0 push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -79030,7 +79030,7 @@ task_title_menu_highlight_selected_menu_items: @ 80300B0 thumb_func_end task_title_menu_highlight_selected_menu_items thumb_func_start title_menu_handle_input -title_menu_handle_input: @ 80300E0 +title_menu_handle_input: ; 80300E0 push {r4-r7,lr} sub sp, 0x4 lsls r0, 24 @@ -79045,7 +79045,7 @@ title_menu_handle_input: @ 80300E0 movs r0, 0x1 ands r0, r2 cmp r0, 0 - beq _08030130 + beq @08030130 movs r0, 0x5 bl audio_play bl sub_80093CC @@ -79061,16 +79061,16 @@ title_menu_handle_input: @ 80300E0 adds r0, r4, r0 ldr r1, =title_menu_handle_keypad_a_pressed + 1 str r1, [r0] - b _08030240 + b @08030240 .align 2, 0 .pool -_08030130: +@08030130: movs r0, 0x2 ands r0, r2 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0 - beq _08030178 + beq @08030178 movs r0, 0x5 bl audio_play movs r0, 0x1 @@ -79092,28 +79092,28 @@ _08030130: adds r0, r4, r0 ldr r1, =sub_8030544 + 1 str r1, [r0] - b _08030240 + b @08030240 .align 2, 0 .pool -_08030178: +@08030178: movs r0, 0x40 ands r0, r2 cmp r0, 0 - beq _080301CA + beq @080301CA movs r0, 0x2 ldrsh r2, [r5, r0] cmp r2, 0 - ble _080301CA + ble @080301CA movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0x3 - bne _080301C4 + bne @080301C4 movs r1, 0x1C ldrsh r0, [r5, r1] cmp r0, 0x1 - bne _080301C4 + bne @080301C4 cmp r2, 0x1 - bne _080301C4 + bne @080301C4 movs r4, 0x80 lsls r4, 6 movs r0, 0 @@ -79132,35 +79132,35 @@ _08030178: adds r0, r7, r0 strh r6, [r5, 0x1C] strh r6, [r0, 0x1E] -_080301C4: +@080301C4: ldrh r0, [r5, 0x2] subs r0, 0x1 - b _0803022C -_080301CA: + b @0803022C +@080301CA: ldrh r1, [r1, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08030240 + beq @08030240 movs r0, 0x2 ldrsh r1, [r5, r0] movs r2, 0x18 ldrsh r0, [r5, r2] subs r0, 0x1 cmp r1, r0 - bge _08030240 + bge @08030240 movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0x3 - bne _08030228 + bne @08030228 movs r2, 0x2 ldrsh r0, [r5, r2] cmp r0, 0x3 - bne _08030228 + bne @08030228 movs r1, 0x1C ldrsh r0, [r5, r1] cmp r0, 0 - bne _08030228 + bne @08030228 movs r4, 0x80 lsls r4, 6 movs r0, 0 @@ -79182,20 +79182,20 @@ _080301CA: strh r1, [r5, 0x1C] movs r1, 0x1 strh r1, [r0, 0x26] -_08030228: +@08030228: ldrh r0, [r5, 0x2] adds r0, 0x1 -_0803022C: +@0803022C: strh r0, [r5, 0x2] ldr r1, =0x02022d06 strh r0, [r1] movs r0, 0x1 - b _08030242 + b @08030242 .align 2, 0 .pool -_08030240: +@08030240: movs r0, 0 -_08030242: +@08030242: add sp, 0x4 pop {r4-r7} pop {r1} @@ -79203,7 +79203,7 @@ _08030242: thumb_func_end title_menu_handle_input thumb_func_start task_title_menu_handle_input -task_title_menu_handle_input: @ 803024C +task_title_menu_handle_input: ; 803024C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -79211,7 +79211,7 @@ task_title_menu_handle_input: @ 803024C bl title_menu_handle_input lsls r0, 24 cmp r0, 0 - beq _0803026C + beq @0803026C ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -79219,7 +79219,7 @@ task_title_menu_handle_input: @ 803024C adds r1, r0 ldr r0, =task_title_menu_highlight_selected_menu_items + 1 str r0, [r1] -_0803026C: +@0803026C: pop {r4} pop {r0} bx r0 @@ -79228,8 +79228,8 @@ _0803026C: thumb_func_end task_title_menu_handle_input thumb_func_start title_menu_handle_keypad_a_pressed -@ void title_menu_handle_keypad_a_pressed(int task_id) -title_menu_handle_keypad_a_pressed: @ 803027C +; void title_menu_handle_keypad_a_pressed(int task_id) +title_menu_handle_keypad_a_pressed: ; 803027C push {r4-r7,lr} sub sp, 0x4 lsls r0, 24 @@ -79239,9 +79239,9 @@ title_menu_handle_keypad_a_pressed: @ 803027C movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08030292 - b _08030536 -_08030292: + beq @08030292 + b @08030536 +@08030292: ldr r2, =0x03005e00 lsls r1, r6, 2 adds r0, r1, r6 @@ -79251,12 +79251,12 @@ _08030292: ldrsh r0, [r4, r2] adds r7, r1, 0 cmp r0, 0x3 - bne _080302B0 + bne @080302B0 ldrh r0, [r4, 0x22] lsls r0, 24 lsrs r0, 24 bl sub_81AF620 -_080302B0: +@080302B0: movs r0, 0 movs r1, 0x1 bl sub_819746C @@ -79287,78 +79287,78 @@ _080302B0: movs r3, 0x8 ldrsh r0, [r4, r3] cmp r0, 0x1 - beq _08030324 + beq @08030324 cmp r0, 0x1 - ble _0803030C + ble @0803030C cmp r0, 0x2 - beq _08030336 + beq @08030336 cmp r0, 0x3 - beq _08030358 -_0803030C: + beq @08030358 +@0803030C: movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0 - beq _08030388 + beq @08030388 cmp r0, 0x1 - bne _08030388 - b _080303D8 + bne @08030388 + b @080303D8 .align 2, 0 .pool -_08030324: +@08030324: movs r2, 0xA ldrsh r0, [r4, r2] cmp r0, 0x1 - beq _08030388 + beq @08030388 cmp r0, 0x1 - ble _08030384 + ble @08030384 cmp r0, 0x2 - bne _08030384 - b _080303D8 -_08030336: + bne @08030384 + b @080303D8 +@08030336: movs r3, 0xA ldrsh r0, [r4, r3] cmp r0, 0x1 - beq _08030388 + beq @08030388 cmp r0, 0x1 - ble _08030384 + ble @08030384 cmp r0, 0x2 - beq _0803034C + beq @0803034C cmp r0, 0x3 - beq _080303D8 - b _08030384 -_0803034C: + beq @080303D8 + b @08030384 +@0803034C: movs r5, 0x3 cmp r2, 0 - bne _080303DA + bne @080303DA movs r5, 0x6 strh r2, [r4, 0x8] - b _080303DA -_08030358: + b @080303DA +@08030358: movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0x4 - bhi _08030384 + bhi @08030384 lsls r0, 2 - ldr r1, =_08030370 + ldr r1, =@08030370 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08030370: - .4byte _08030384 - .4byte _08030388 - .4byte _0803038C - .4byte _080303BC - .4byte _080303D8 -_08030384: +@08030370: + .4byte @08030384 + .4byte @08030388 + .4byte @0803038C + .4byte @080303BC + .4byte @080303D8 +@08030384: movs r5, 0x1 - b _080303DA -_08030388: + b @080303DA +@08030388: movs r5, 0 - b _080303DA -_0803038C: + b @080303DA +@0803038C: ldr r0, =0x03005e00 adds r1, r7, r6 lsls r1, 3 @@ -79366,28 +79366,28 @@ _0803038C: movs r3, 0x26 ldrsh r0, [r1, r3] cmp r0, 0 - beq _080303AC + beq @080303AC movs r5, 0x3 cmp r2, 0 - bne _080303DA + bne @080303DA movs r5, 0x6 strh r2, [r1, 0x8] - b _080303DA + b @080303DA .align 2, 0 .pool -_080303AC: +@080303AC: cmp r2, 0 - beq _080303B8 + beq @080303B8 movs r5, 0x6 movs r0, 0x1 strh r0, [r1, 0x8] - b _080303DA -_080303B8: + b @080303DA +@080303B8: movs r5, 0x5 - b _080303DA -_080303BC: + b @080303DA +@080303BC: cmp r2, 0 - beq _080303D4 + beq @080303D4 movs r5, 0x6 ldr r0, =0x03005e00 adds r1, r7, r6 @@ -79395,15 +79395,15 @@ _080303BC: adds r1, r0 movs r0, 0x2 strh r0, [r1, 0x8] - b _080303DA + b @080303DA .align 2, 0 .pool -_080303D4: +@080303D4: movs r5, 0x4 - b _080303DA -_080303D8: + b @080303DA +@080303D8: movs r5, 0x2 -_080303DA: +@080303DA: movs r0, 0 movs r1, 0 movs r2, 0 @@ -79413,24 +79413,24 @@ _080303DA: movs r2, 0 bl bg_change_y_offset cmp r5, 0x6 - bhi _0803041C + bhi @0803041C lsls r0, r5, 2 - ldr r1, =_08030400 + ldr r1, =@08030400 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08030400: - .4byte _0803041C - .4byte _08030444 - .4byte _08030460 - .4byte _08030478 - .4byte _08030480 - .4byte _08030488 - .4byte _0803049C -_0803041C: +@08030400: + .4byte @0803041C + .4byte @08030444 + .4byte @08030460 + .4byte @08030478 + .4byte @08030480 + .4byte @08030488 + .4byte @0803049C +@0803041C: ldr r0, =0x02037714 movs r1, 0 strh r1, [r0] @@ -79442,47 +79442,47 @@ _0803041C: adds r0, r1 ldr r1, =task_new_game_prof_birch_speech_1 + 1 str r1, [r0] - b _08030514 + b @08030514 .align 2, 0 .pool -_08030444: +@08030444: ldr r0, =0x02037714 movs r1, 0 strh r1, [r0] ldr r0, =0x02037b14 strh r1, [r0] ldr r0, =sub_8086230 + 1 - b _0803048A + b @0803048A .align 2, 0 .pool -_08030460: +@08030460: ldr r0, =0x030022c0 ldr r1, =c2_title_menu_2_dupe + 1 str r1, [r0, 0x8] ldr r0, =c2_options_menu + 1 - b _0803048A + b @0803048A .align 2, 0 .pool -_08030478: +@08030478: ldr r0, =c2_mystery_gift + 1 - b _0803048A + b @0803048A .align 2, 0 .pool -_08030480: +@08030480: ldr r0, =sub_8178974 + 1 - b _0803048A + b @0803048A .align 2, 0 .pool -_08030488: +@08030488: ldr r0, =sub_801867C + 1 -_0803048A: +@0803048A: bl set_callback2 adds r0, r6, 0 bl remove_task - b _08030514 + b @08030514 .align 2, 0 .pool -_0803049C: +@0803049C: ldr r1, =0x03005e00 adds r0, r7, r6 lsls r0, 3 @@ -79525,20 +79525,20 @@ _0803049C: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - b _08030536 + b @08030536 .align 2, 0 .pool -_08030514: +@08030514: bl Window_FreeMemory cmp r5, 0x2 - beq _08030528 + beq @08030528 ldr r1, =0x02022d06 movs r0, 0 strh r0, [r1] - b _08030536 + b @08030536 .align 2, 0 .pool -_08030528: +@08030528: ldr r0, =0x02022d06 ldrh r1, [r0] movs r3, 0x80 @@ -79546,7 +79546,7 @@ _08030528: adds r2, r3, 0 orrs r1, r2 strh r1, [r0] -_08030536: +@08030536: add sp, 0x4 pop {r4-r7} pop {r0} @@ -79556,7 +79556,7 @@ _08030536: thumb_func_end title_menu_handle_keypad_a_pressed thumb_func_start sub_8030544 -sub_8030544: @ 8030544 +sub_8030544: ; 8030544 push {r4,r5,lr} lsls r0, 24 lsrs r2, r0, 24 @@ -79568,7 +79568,7 @@ sub_8030544: @ 8030544 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _0803058C + bne @0803058C ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -79577,12 +79577,12 @@ sub_8030544: @ 8030544 movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0x3 - bne _08030578 + bne @08030578 ldrh r0, [r1, 0x22] lsls r0, 24 lsrs r0, 24 bl sub_81AF620 -_08030578: +@08030578: ldr r0, =0x02022d06 strh r4, [r0] bl Window_FreeMemory @@ -79590,7 +79590,7 @@ _08030578: bl set_callback2 adds r0, r5, 0 bl remove_task -_0803058C: +@0803058C: pop {r4,r5} pop {r0} bx r0 @@ -79599,7 +79599,7 @@ _0803058C: thumb_func_end sub_8030544 thumb_func_start sub_80305A4 -sub_80305A4: @ 80305A4 +sub_80305A4: ; 80305A4 push {r4,r5,lr} sub sp, 0x8 lsls r0, 24 @@ -79612,21 +79612,21 @@ sub_80305A4: @ 80305A4 movs r0, 0xA ldrsh r1, [r4, r0] cmp r1, 0x1 - beq _0803063C + beq @0803063C cmp r1, 0x1 - bgt _080305CC + bgt @080305CC cmp r1, 0 - beq _080305D6 - b _08030688 + beq @080305D6 + b @08030688 .align 2, 0 .pool -_080305CC: +@080305CC: cmp r1, 0x2 - beq _0803064C + beq @0803064C cmp r1, 0x3 - beq _08030664 - b _08030688 -_080305D6: + beq @08030664 + b @08030688 +@080305D6: movs r0, 0x1E str r0, [sp] movs r0, 0x14 @@ -79639,32 +79639,32 @@ _080305D6: movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _08030610 + beq @08030610 cmp r0, 0x1 - bgt _080305FC + bgt @080305FC cmp r0, 0 - beq _08030602 - b _08030622 -_080305FC: + beq @08030602 + b @08030622 +@080305FC: cmp r0, 0x2 - beq _0803061C - b _08030622 -_08030602: + beq @0803061C + b @08030622 +@08030602: ldr r0, =0x085e82be bl draw_text_box - b _08030622 + b @08030622 .align 2, 0 .pool -_08030610: +@08030610: ldr r0, =0x085e82e5 bl draw_text_box - b _08030622 + b @08030622 .align 2, 0 .pool -_0803061C: +@0803061C: ldr r0, =0x085e8328 bl draw_text_box -_08030622: +@08030622: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -79673,35 +79673,35 @@ _08030622: ldrh r0, [r1, 0xA] adds r0, 0x1 strh r0, [r1, 0xA] - b _08030688 + b @08030688 .align 2, 0 .pool -_0803063C: +@0803063C: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 - b _08030658 + b @08030658 .align 2, 0 .pool -_0803064C: +@0803064C: bl run_remoboxes movs r0, 0x7 bl a_pressed_maybe lsls r0, 16 -_08030658: +@08030658: cmp r0, 0 - bne _08030688 + bne @08030688 ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] - b _08030688 -_08030664: + b @08030688 +@08030664: ldr r0, =0x030022c0 ldrh r0, [r0, 0x2E] ands r1, r0 cmp r1, 0 - beq _08030688 + beq @08030688 movs r0, 0x5 bl audio_play movs r0, 0x1 @@ -79713,7 +79713,7 @@ _08030664: bl sub_80A1AD4 ldr r0, =sub_8030544 + 1 str r0, [r4] -_08030688: +@08030688: add sp, 0x8 pop {r4,r5} pop {r0} @@ -79723,8 +79723,8 @@ _08030688: thumb_func_end sub_80305A4 thumb_func_start title_menu_highlight_selected_menu_items -@ void title_menu_highlight_selected_menu_items(u8 a1, u8 selected_menu_item, u16 a3) -title_menu_highlight_selected_menu_items: @ 8030698 +; void title_menu_highlight_selected_menu_items(u8 a1, u8 selected_menu_item, u16 a3) +title_menu_highlight_selected_menu_items: ; 8030698 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -79736,140 +79736,140 @@ title_menu_highlight_selected_menu_items: @ 8030698 movs r0, 0x40 bl lcd_io_set cmp r5, 0x1 - beq _080306DC + beq @080306DC cmp r5, 0x1 - ble _080306BE + ble @080306BE cmp r5, 0x2 - beq _08030700 + beq @08030700 cmp r5, 0x3 - beq _08030728 -_080306BE: + beq @08030728 +@080306BE: cmp r4, 0 - beq _080306C6 + beq @080306C6 cmp r4, 0x1 - beq _080306D4 -_080306C6: + beq @080306D4 +@080306C6: ldr r1, =0x0000011f - b _0803078E + b @0803078E .align 2, 0 .pool -_080306D4: +@080306D4: ldr r1, =0x0000213f - b _0803078E + b @0803078E .align 2, 0 .pool -_080306DC: +@080306DC: cmp r4, 0x1 - beq _080306F0 + beq @080306F0 cmp r4, 0x1 - ble _080306E8 + ble @080306E8 cmp r4, 0x2 - beq _080306F8 -_080306E8: + beq @080306F8 +@080306E8: ldr r1, =0x0000013f - b _0803078E + b @0803078E .align 2, 0 .pool -_080306F0: +@080306F0: ldr r1, =0x0000415f - b _0803078E + b @0803078E .align 2, 0 .pool -_080306F8: +@080306F8: ldr r1, =0x0000617f - b _0803078E + b @0803078E .align 2, 0 .pool -_08030700: +@08030700: cmp r4, 0x1 - beq _08030718 + beq @08030718 cmp r4, 0x1 - ble _08030710 + ble @08030710 cmp r4, 0x2 - beq _08030720 + beq @08030720 cmp r4, 0x3 - beq _0803078C -_08030710: + beq @0803078C +@08030710: ldr r1, =0x0000013f - b _0803078E + b @0803078E .align 2, 0 .pool -_08030718: +@08030718: ldr r1, =0x0000415f - b _0803078E + b @0803078E .align 2, 0 .pool -_08030720: +@08030720: ldr r1, =0x0000617f - b _0803078E + b @0803078E .align 2, 0 .pool -_08030728: +@08030728: cmp r4, 0x4 - bhi _08030750 + bhi @08030750 lsls r0, r4, 2 - ldr r1, =_0803073C + ldr r1, =@0803073C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0803073C: - .4byte _08030750 - .4byte _08030758 - .4byte _0803076C - .4byte _08030780 - .4byte _0803079C -_08030750: +@0803073C: + .4byte @08030750 + .4byte @08030758 + .4byte @0803076C + .4byte @08030780 + .4byte @0803079C +@08030750: ldr r1, =0x0000013f - b _0803078E + b @0803078E .align 2, 0 .pool -_08030758: +@08030758: cmp r6, 0 - beq _08030764 + beq @08030764 ldr r1, =0x0000213f - b _0803078E + b @0803078E .align 2, 0 .pool -_08030764: +@08030764: ldr r1, =0x0000415f - b _0803078E + b @0803078E .align 2, 0 .pool -_0803076C: +@0803076C: cmp r6, 0 - beq _08030778 + beq @08030778 ldr r1, =0x0000415f - b _0803078E + b @0803078E .align 2, 0 .pool -_08030778: +@08030778: ldr r1, =0x0000617f - b _0803078E + b @0803078E .align 2, 0 .pool -_08030780: +@08030780: cmp r6, 0 - beq _0803078C + beq @0803078C ldr r1, =0x0000617f - b _0803078E + b @0803078E .align 2, 0 .pool -_0803078C: +@0803078C: ldr r1, =0x0000819f -_0803078E: +@0803078E: movs r0, 0x44 bl lcd_io_set - b _080307A4 + b @080307A4 .align 2, 0 .pool -_0803079C: +@0803079C: ldr r1, =0x0000819f movs r0, 0x44 bl lcd_io_set -_080307A4: +@080307A4: pop {r4-r6} pop {r0} bx r0 @@ -79878,8 +79878,8 @@ _080307A4: thumb_func_end title_menu_highlight_selected_menu_items 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 @@ -79973,7 +79973,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 @@ -79986,13 +79986,13 @@ task_new_game_prof_birch_speech_2: @ 80308B0 movs r2, 0x16 ldrsh r0, [r4, r2] cmp r0, 0 - beq _080308D4 + beq @080308D4 subs r0, r1, 0x1 strh r0, [r4, 0x16] - b _0803091A + b @0803091A .align 2, 0 .pool -_080308D4: +@080308D4: ldrb r0, [r4, 0x18] ldr r2, =0x02020630 lsls r1, r0, 4 @@ -80026,7 +80026,7 @@ _080308D4: strh r0, [r4, 0x16] ldr r0, =task_new_game_prof_birch_speech_3 + 1 str r0, [r4] -_0803091A: +@0803091A: pop {r4,r5} pop {r0} bx r0 @@ -80035,8 +80035,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 @@ -80048,7 +80048,7 @@ task_new_game_prof_birch_speech_3: @ 8030928 movs r1, 0x12 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080309B6 + beq @080309B6 ldr r2, =0x02020630 movs r1, 0x18 ldrsh r0, [r4, r1] @@ -80065,13 +80065,13 @@ task_new_game_prof_birch_speech_3: @ 8030928 movs r2, 0x16 ldrsh r0, [r4, r2] cmp r0, 0 - beq _08030970 + beq @08030970 subs r0, r1, 0x1 strh r0, [r4, 0x16] - b _080309B6 + b @080309B6 .align 2, 0 .pool -_08030970: +@08030970: ldr r0, =0x082ff080 bl Window_InitFromTemplates movs r0, 0 @@ -80098,7 +80098,7 @@ _08030970: bl get_map_name ldr r0, =task_new_game_prof_birch_speech_4 + 1 str r0, [r4] -_080309B6: +@080309B6: pop {r4} pop {r0} bx r0 @@ -80107,7 +80107,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 @@ -80116,11 +80116,11 @@ task_new_game_prof_birch_speech_4: @ 80309CC movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08030A0A + bne @08030A0A bl sub_8197224 lsls r0, 16 cmp r0, 0 - bne _08030A0A + bne @08030A0A ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -80136,7 +80136,7 @@ task_new_game_prof_birch_speech_4: @ 80309CC bl sub_8197A9C ldr r0, =0x03000dd0 strb r4, [r0] -_08030A0A: +@08030A0A: pop {r4} pop {r0} bx r0 @@ -80145,14 +80145,14 @@ _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 bl sub_8197224 lsls r0, 16 cmp r0, 0 - bne _08030A58 + bne @08030A58 ldr r0, =0x02021fc4 ldr r1, =0x082c8a1f bl ExpandTextCodes @@ -80165,7 +80165,7 @@ task_new_game_prof_birch_speech_5: @ 8030A2C adds r0, r1 ldr r1, =task_new_game_prof_birch_speech_6 + 1 str r1, [r0] -_08030A58: +@08030A58: pop {r4} pop {r0} bx r0 @@ -80174,7 +80174,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} @@ -80248,7 +80248,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} @@ -80279,30 +80279,30 @@ sub_8030B14: @ 8030B14 ldrsh r0, [r5, r1] adds r7, r2, 0 cmp r0, 0 - beq _08030B64 + beq @08030B64 cmp r0, 0x1 - beq _08030B7C - b _08030B98 + beq @08030B7C + b @08030B98 .align 2, 0 .pool -_08030B64: +@08030B64: ldr r1, [r3, 0x1C] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _08030BBA + bne @08030BBA ldrb r1, [r3, 0x1] movs r0, 0x4 negs r0, r0 ands r0, r1 strb r0, [r3, 0x1] - b _08030B98 + b @08030B98 .align 2, 0 .pool -_08030B7C: +@08030B7C: movs r1, 0x16 ldrsh r0, [r6, r1] cmp r0, 0x5F - ble _08030BBA + ble @08030BBA adds r0, r4, 0 bl remove_task ldrb r1, [r7] @@ -80311,8 +80311,8 @@ _08030B7C: lsls r0, 3 mov r1, r8 adds r2, r0, r1 - b _08030BAA -_08030B98: + b @08030BAA +@08030B98: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] @@ -80322,16 +80322,16 @@ _08030B98: adds r0, r1 lsls r0, 3 adds r2, r0, r2 -_08030BAA: +@08030BAA: ldrh r3, [r2, 0x16] movs r0, 0x16 ldrsh r1, [r2, r0] ldr r0, =0x00003fff cmp r1, r0 - bgt _08030BBA + bgt @08030BBA adds r0, r3, 0x1 strh r0, [r2, 0x16] -_08030BBA: +@08030BBA: pop {r3} mov r8, r3 pop {r4-r7} @@ -80342,7 +80342,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 @@ -80350,7 +80350,7 @@ task_new_game_prof_birch_speech_6: @ 8030BCC lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - bne _08030BFE + bne @08030BFE ldr r0, =0x02022d04 strb r1, [r0] ldr r0, =0x02021fc4 @@ -80365,7 +80365,7 @@ task_new_game_prof_birch_speech_6: @ 8030BCC adds r0, r1 ldr r1, =task_new_game_prof_birch_speech_7 + 1 str r1, [r0] -_08030BFE: +@08030BFE: pop {r4} pop {r0} bx r0 @@ -80374,14 +80374,14 @@ _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 bl sub_8197224 lsls r0, 16 cmp r0, 0 - bne _08030C7C + bne @08030C7C ldr r5, =0x02020630 ldr r0, =0x03005e00 lsls r4, r6, 2 @@ -80422,7 +80422,7 @@ task_new_game_prof_birch_speech_7: @ 8030C18 strh r0, [r4, 0x16] ldr r0, =task_new_game_prof_birch_speech_8 + 1 str r0, [r4] -_08030C7C: +@08030C7C: pop {r4-r6} pop {r0} bx r0 @@ -80431,7 +80431,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 @@ -80446,21 +80446,21 @@ task_new_game_prof_birch_speech_8: @ 8030C90 movs r0, 0x3C negs r0, r0 cmp r1, r0 - beq _08030CC0 + beq @08030CC0 subs r0, r3, 0x2 strh r0, [r2, 0x10] ldrh r1, [r2, 0x10] movs r0, 0x14 bl lcd_io_set - b _08030CC8 + b @08030CC8 .align 2, 0 .pool -_08030CC0: +@08030CC0: ldr r0, =0x0000ffc4 strh r0, [r2, 0x10] ldr r0, =task_new_game_prof_birch_speech_9 + 1 str r0, [r2] -_08030CC8: +@08030CC8: pop {r0} bx r0 .align 2, 0 @@ -80468,7 +80468,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 @@ -80481,7 +80481,7 @@ task_new_game_prof_birch_speech_9: @ 8030CD4 movs r1, 0x12 ldrsh r0, [r4, r1] cmp r0, 0 - beq _08030D7A + beq @08030D7A ldr r2, =0x02020630 movs r0, 0x18 ldrsh r1, [r4, r0] @@ -80508,13 +80508,13 @@ task_new_game_prof_birch_speech_9: @ 8030CD4 movs r1, 0x16 ldrsh r6, [r4, r1] cmp r6, 0 - beq _08030D34 + beq @08030D34 subs r0, 0x1 strh r0, [r4, 0x16] - b _08030D7A + b @08030D7A .align 2, 0 .pool -_08030D34: +@08030D34: ldrb r3, [r4, 0x1C] lsls r1, r3, 4 adds r1, r3 @@ -80548,7 +80548,7 @@ _08030D34: bl sub_8031D34 ldr r0, =task_new_game_prof_birch_speech_10 + 1 str r0, [r4] -_08030D7A: +@08030D7A: pop {r4-r7} pop {r0} bx r0 @@ -80557,7 +80557,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 @@ -80569,7 +80569,7 @@ task_new_game_prof_birch_speech_10: @ 8030D84 movs r1, 0x12 ldrsh r0, [r3, r1] cmp r0, 0 - beq _08030DB8 + beq @08030DB8 ldr r2, =0x02020630 movs r1, 0xC ldrsh r0, [r3, r1] @@ -80584,7 +80584,7 @@ task_new_game_prof_birch_speech_10: @ 8030D84 strb r0, [r1, 0x1] ldr r0, =task_new_game_prof_birch_speech_11 + 1 str r0, [r3] -_08030DB8: +@08030DB8: pop {r0} bx r0 .align 2, 0 @@ -80592,7 +80592,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 @@ -80619,14 +80619,14 @@ 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 bl sub_8197224 lsls r0, 16 cmp r0, 0 - bne _08030E2A + bne @08030E2A bl sub_8031D74 ldr r0, =0x03005e00 lsls r1, r4, 2 @@ -80635,7 +80635,7 @@ task_new_game_prof_birch_speech_12: @ 8030E08 adds r1, r0 ldr r0, =task_new_game_prof_birch_speech_13 + 1 str r0, [r1] -_08030E2A: +@08030E2A: pop {r4} pop {r0} bx r0 @@ -80644,7 +80644,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 @@ -80652,12 +80652,12 @@ task_new_game_prof_birch_speech_13: @ 8030E38 lsls r0, 24 asrs r4, r0, 24 cmp r4, 0 - beq _08030E52 + beq @08030E52 cmp r4, 0x1 - beq _08030E52 + beq @08030E52 lsls r4, r5, 2 - b _08030E76 -_08030E52: + b @08030E76 +@08030E52: movs r0, 0x5 bl audio_play ldr r0, =0x03005d90 @@ -80674,7 +80674,7 @@ _08030E52: ldr r1, =task_new_game_prof_birch_speech_14 + 1 str r1, [r0] adds r4, r2, 0 -_08030E76: +@08030E76: bl GetMenuCursorPos lsls r0, 24 lsrs r3, r0, 24 @@ -80685,7 +80685,7 @@ _08030E76: movs r1, 0x14 ldrsh r0, [r4, r1] cmp r3, r0 - beq _08030EB8 + beq @08030EB8 strh r3, [r4, 0x14] ldr r2, =0x02020630 movs r0, 0xC @@ -80706,7 +80706,7 @@ _08030E76: bl sub_8031ACC ldr r0, =sub_8030ED4 + 1 str r0, [r4] -_08030EB8: +@08030EB8: pop {r4,r5} pop {r0} bx r0 @@ -80715,7 +80715,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 @@ -80729,7 +80729,7 @@ sub_8030ED4: @ 8030ED4 ldrsh r0, [r4, r2] adds r7, r1, 0 cmp r0, 0 - bne _08030F0C + bne @08030F0C ldr r0, =0x02020630 lsls r1, r5, 4 adds r1, r5 @@ -80738,10 +80738,10 @@ sub_8030ED4: @ 8030ED4 ldrh r0, [r1, 0x20] adds r0, 0x4 strh r0, [r1, 0x20] - b _08030F72 + b @08030F72 .align 2, 0 .pool -_08030F0C: +@08030F0C: ldr r3, =0x02020630 lsls r0, r5, 4 adds r0, r5 @@ -80755,14 +80755,14 @@ _08030F0C: movs r1, 0x14 ldrsh r0, [r4, r1] cmp r0, 0 - beq _08030F30 + beq @08030F30 ldrb r5, [r4, 0x1E] - b _08030F32 + b @08030F32 .align 2, 0 .pool -_08030F30: +@08030F30: ldrb r5, [r4, 0x1C] -_08030F32: +@08030F32: lsls r2, r5, 4 adds r2, r5 lsls r2, 2 @@ -80794,7 +80794,7 @@ _08030F32: bl sub_8031BAC ldr r0, =sub_8030F7C + 1 str r0, [r4] -_08030F72: +@08030F72: pop {r4-r7} pop {r0} bx r0 @@ -80803,7 +80803,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 @@ -80822,19 +80822,19 @@ sub_8030F7C: @ 8030F7C movs r4, 0x20 ldrsh r0, [r2, r4] cmp r0, 0xB4 - ble _08030FB0 + ble @08030FB0 subs r0, r1, 0x4 strh r0, [r2, 0x20] - b _08030FCA + b @08030FCA .align 2, 0 .pool -_08030FB0: +@08030FB0: movs r0, 0xB4 strh r0, [r2, 0x20] movs r1, 0x12 ldrsh r0, [r3, r1] cmp r0, 0 - beq _08030FCA + beq @08030FCA ldrb r0, [r2, 0x1] movs r1, 0xD negs r1, r1 @@ -80842,7 +80842,7 @@ _08030FB0: strb r1, [r2, 0x1] ldr r0, =task_new_game_prof_birch_speech_13 + 1 str r0, [r3] -_08030FCA: +@08030FCA: pop {r4} pop {r0} bx r0 @@ -80851,7 +80851,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 @@ -80878,14 +80878,14 @@ 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 bl sub_8197224 lsls r0, 16 cmp r0, 0 - bne _08031032 + bne @08031032 ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -80893,7 +80893,7 @@ task_new_game_prof_birch_speech_15: @ 8031014 adds r1, r0 ldr r0, =task_new_game_prof_birch_speech_16 + 1 str r0, [r1] -_08031032: +@08031032: pop {r4} pop {r0} bx r0 @@ -80902,7 +80902,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 @@ -80912,12 +80912,12 @@ task_new_game_prof_birch_speech_16: @ 8031040 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0803105C + bne @0803105C movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0803107A -_0803105C: + beq @0803107A +@0803105C: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -80932,7 +80932,7 @@ _0803105C: adds r0, r1 ldr r1, =task_new_game_prof_birch_speech_17 + 1 str r1, [r0] -_0803107A: +@0803107A: add sp, 0x4 pop {r4} pop {r0} @@ -80942,7 +80942,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 @@ -80954,7 +80954,7 @@ task_new_game_prof_birch_speech_17: @ 8031090 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _080310EC + bne @080310EC bl Window_FreeMemory ldr r1, =0x03005e00 lsls r0, r4, 2 @@ -80982,7 +80982,7 @@ task_new_game_prof_birch_speech_17: @ 8031090 movs r0, 0 movs r3, 0 bl do_choose_name_or_words_screen -_080310EC: +@080310EC: add sp, 0x8 pop {r4,r5} pop {r0} @@ -80992,7 +80992,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 @@ -81019,7 +81019,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 @@ -81027,7 +81027,7 @@ task_new_game_prof_birch_speech_part2_3: @ 8031144 bl sub_8197224 lsls r0, 16 cmp r0, 0 - bne _08031178 + bne @08031178 movs r0, 0x2 str r0, [sp] movs r0, 0xF @@ -81044,7 +81044,7 @@ task_new_game_prof_birch_speech_part2_3: @ 8031144 adds r0, r1 ldr r1, =task_new_game_prof_birch_speech_part2_4 + 1 str r1, [r0] -_08031178: +@08031178: add sp, 0x8 pop {r4} pop {r0} @@ -81054,7 +81054,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 @@ -81062,19 +81062,19 @@ task_new_game_prof_birch_speech_part2_4: @ 8031188 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _080311AE + beq @080311AE cmp r1, 0 - bgt _080311A8 + bgt @080311A8 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _080311FC - b _08031210 -_080311A8: + beq @080311FC + b @08031210 +@080311A8: cmp r1, 0x1 - beq _080311FC - b _08031210 -_080311AE: + beq @080311FC + b @08031210 +@080311AE: movs r0, 0x5 bl audio_play ldr r2, =0x02020630 @@ -81104,10 +81104,10 @@ _080311AE: bl sub_8031C88 ldr r0, =task_new_game_prof_birch_speech_part2_5 + 1 str r0, [r4] - b _08031210 + b @08031210 .align 2, 0 .pool -_080311FC: +@080311FC: movs r0, 0x5 bl audio_play ldr r0, =0x03005e00 @@ -81117,7 +81117,7 @@ _080311FC: adds r1, r0 ldr r0, =task_new_game_prof_birch_speech_11 + 1 str r0, [r1] -_08031210: +@08031210: pop {r4,r5} pop {r0} bx r0 @@ -81126,7 +81126,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 @@ -81139,19 +81139,19 @@ task_new_game_prof_birch_speech_part2_5: @ 8031220 movs r3, 0x10 ldrsh r0, [r1, r3] cmp r0, 0 - beq _0803124C + beq @0803124C adds r0, r2, 0x2 strh r0, [r1, 0x10] ldrh r1, [r1, 0x10] movs r0, 0x14 bl lcd_io_set - b _08031250 + b @08031250 .align 2, 0 .pool -_0803124C: +@0803124C: ldr r0, =task_new_game_prof_birch_speech_part2_6 + 1 str r0, [r1] -_08031250: +@08031250: pop {r0} bx r0 .align 2, 0 @@ -81159,7 +81159,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 @@ -81171,7 +81171,7 @@ task_new_game_prof_birch_speech_part2_6: @ 8031258 movs r1, 0x12 ldrsh r0, [r7, r1] cmp r0, 0 - beq _08031320 + beq @08031320 ldr r5, =0x02020630 movs r2, 0x1C ldrsh r1, [r7, r2] @@ -81255,7 +81255,7 @@ task_new_game_prof_birch_speech_part2_6: @ 8031258 bl get_map_name ldr r0, =task_new_game_prof_birch_speech_part2_7 + 1 str r0, [r7] -_08031320: +@08031320: pop {r4-r7} pop {r0} bx r0 @@ -81264,7 +81264,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 @@ -81276,7 +81276,7 @@ task_new_game_prof_birch_speech_part2_7: @ 803133C movs r1, 0x12 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080313D2 + beq @080313D2 ldr r7, =0x02020630 movs r1, 0x18 ldrsh r0, [r4, r1] @@ -81303,7 +81303,7 @@ task_new_game_prof_birch_speech_part2_7: @ 803133C bl sub_8197224 lsls r0, 16 cmp r0, 0 - bne _080313D2 + bne @080313D2 movs r0, 0x18 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -81337,7 +81337,7 @@ task_new_game_prof_birch_speech_part2_7: @ 803133C strh r0, [r4, 0x16] ldr r0, =task_new_game_prof_birch_speech_part2_8 + 1 str r0, [r4] -_080313D2: +@080313D2: pop {r4-r7} pop {r0} bx r0 @@ -81346,7 +81346,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 @@ -81359,7 +81359,7 @@ task_new_game_prof_birch_speech_part2_8: @ 80313E4 ldrsh r0, [r4, r2] adds r7, r1, 0 cmp r0, 0 - beq _080314B0 + beq @080314B0 ldr r2, =0x02020630 movs r3, 0x18 ldrsh r1, [r4, r3] @@ -81386,25 +81386,25 @@ task_new_game_prof_birch_speech_part2_8: @ 80313E4 movs r3, 0x16 ldrsh r0, [r4, r3] cmp r0, 0 - beq _08031444 + beq @08031444 subs r0, r1, 0x1 strh r0, [r4, 0x16] - b _080314B0 + b @080314B0 .align 2, 0 .pool -_08031444: +@08031444: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - beq _08031458 + beq @08031458 ldrb r5, [r4, 0x1E] - b _0803145A + b @0803145A .align 2, 0 .pool -_08031458: +@08031458: ldrb r5, [r4, 0x1C] -_0803145A: +@0803145A: lsls r1, r5, 4 adds r1, r5 lsls r1, 2 @@ -81444,7 +81444,7 @@ _0803145A: bl get_map_name ldr r0, =task_new_game_prof_birch_speech_part2_9 + 1 str r0, [r4] -_080314B0: +@080314B0: pop {r4-r7} pop {r0} bx r0 @@ -81453,7 +81453,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} @@ -81468,7 +81468,7 @@ task_new_game_prof_birch_speech_part2_9: @ 80314C4 movs r1, 0x12 ldrsh r0, [r6, r1] cmp r0, 0 - beq _0803155C + beq @0803155C ldr r7, =0x02020630 movs r1, 0xC ldrsh r0, [r6, r1] @@ -81486,7 +81486,7 @@ task_new_game_prof_birch_speech_part2_9: @ 80314C4 lsrs r0, 16 mov r8, r0 cmp r0, 0 - bne _0803155C + bne @0803155C ldrb r0, [r6, 0xC] lsls r4, r0, 4 adds r4, r0 @@ -81525,7 +81525,7 @@ task_new_game_prof_birch_speech_part2_9: @ 80314C4 bl play_sound_effect ldr r0, =task_new_game_prof_birch_speech_part2_10 + 1 str r0, [r6] -_0803155C: +@0803155C: add sp, 0x4 pop {r3} mov r8, r3 @@ -81537,7 +81537,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 @@ -81556,10 +81556,10 @@ task_new_game_prof_birch_speech_part2_10: @ 8031580 ldrb r0, [r0] lsls r0, 26 cmp r0, 0 - bge _080315AA + bge @080315AA ldr r0, =task_new_game_prof_birch_speech_part2_11 + 1 str r0, [r3] -_080315AA: +@080315AA: pop {r0} bx r0 .align 2, 0 @@ -81567,7 +81567,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 @@ -81577,7 +81577,7 @@ task_new_game_prof_birch_speech_part2_11: @ 80315BC movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0803160A + bne @0803160A ldr r0, =0x03005e00 lsls r4, r2, 2 adds r4, r2 @@ -81605,7 +81605,7 @@ task_new_game_prof_birch_speech_part2_11: @ 80315BC bl sub_80A1AD4 ldr r0, =task_new_game_prof_birch_speech_part2_12 + 1 str r0, [r4] -_0803160A: +@0803160A: add sp, 0x4 pop {r4} pop {r0} @@ -81615,7 +81615,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 @@ -81624,7 +81624,7 @@ task_new_game_prof_birch_speech_part2_12: @ 8031630 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08031666 + bne @08031666 bl Window_FreeMemory ldr r1, =0x03005e00 lsls r0, r4, 2 @@ -81638,7 +81638,7 @@ task_new_game_prof_birch_speech_part2_12: @ 8031630 bl set_callback2 adds r0, r4, 0 bl remove_task -_08031666: +@08031666: pop {r4} pop {r0} bx r0 @@ -81647,7 +81647,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 @@ -81764,17 +81764,17 @@ new_game_prof_birch_speech_part2_start: @ 8031678 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - beq _080317DC + beq @080317DC movs r0, 0x1 strh r0, [r4, 0x14] ldrb r3, [r4, 0x1E] - b _080317E0 + b @080317E0 .align 2, 0 .pool -_080317DC: +@080317DC: strh r0, [r4, 0x14] ldrb r3, [r4, 0x1C] -_080317E0: +@080317E0: ldr r0, =0x02020630 lsls r1, r3, 4 adds r1, r3 @@ -81867,12 +81867,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 @@ -81889,7 +81889,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 @@ -81918,7 +81918,7 @@ sub_80318F4: @ 80318F4 thumb_func_end sub_80318F4 thumb_func_start sub_803192C -sub_803192C: @ 803192C +sub_803192C: ; 803192C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -82062,7 +82062,7 @@ sub_803192C: @ 803192C thumb_func_end sub_803192C thumb_func_start waterfall_4_check_if_can_continue -waterfall_4_check_if_can_continue: @ 8031A5C +waterfall_4_check_if_can_continue: ; 8031A5C push {r4,r5,lr} lsls r0, 24 lsrs r3, r0, 24 @@ -82075,7 +82075,7 @@ waterfall_4_check_if_can_continue: @ 8031A5C movs r5, 0xA ldrsh r0, [r2, r5] cmp r0, 0 - bne _08031A94 + bne @08031A94 movs r1, 0x8 ldrsh r0, [r2, r1] lsls r1, r0, 2 @@ -82086,19 +82086,19 @@ waterfall_4_check_if_can_continue: @ 8031A5C strh r0, [r1, 0x12] adds r0, r3, 0 bl remove_task - b _08031AC4 + b @08031AC4 .align 2, 0 .pool -_08031A94: +@08031A94: ldrh r3, [r2, 0x10] movs r4, 0x10 ldrsh r0, [r2, r4] cmp r0, 0 - beq _08031AA4 + beq @08031AA4 subs r0, r3, 0x1 strh r0, [r2, 0x10] - b _08031AC4 -_08031AA4: + b @08031AC4 +@08031AA4: ldrh r0, [r2, 0xE] strh r0, [r2, 0x10] subs r1, 0x1 @@ -82114,14 +82114,14 @@ _08031AA4: lsrs r1, 16 movs r0, 0x52 bl lcd_io_set -_08031AC4: +@08031AC4: pop {r4,r5} pop {r0} bx r0 thumb_func_end waterfall_4_check_if_can_continue thumb_func_start sub_8031ACC -sub_8031ACC: @ 8031ACC +sub_8031ACC: ; 8031ACC push {r4-r6,lr} mov r6, r8 push {r6} @@ -82174,7 +82174,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 @@ -82187,7 +82187,7 @@ sub_8031B3C: @ 8031B3C movs r5, 0xA ldrsh r0, [r2, r5] cmp r0, 0x10 - bne _08031B74 + bne @08031B74 movs r1, 0x8 ldrsh r0, [r2, r1] lsls r1, r0, 2 @@ -82198,19 +82198,19 @@ sub_8031B3C: @ 8031B3C strh r0, [r1, 0x12] adds r0, r3, 0 bl remove_task - b _08031BA4 + b @08031BA4 .align 2, 0 .pool -_08031B74: +@08031B74: ldrh r3, [r2, 0x10] movs r4, 0x10 ldrsh r0, [r2, r4] cmp r0, 0 - beq _08031B84 + beq @08031B84 subs r0, r3, 0x1 strh r0, [r2, 0x10] - b _08031BA4 -_08031B84: + b @08031BA4 +@08031B84: ldrh r0, [r2, 0xE] strh r0, [r2, 0x10] adds r1, 0x1 @@ -82226,14 +82226,14 @@ _08031B84: lsrs r1, 16 movs r0, 0x52 bl lcd_io_set -_08031BA4: +@08031BA4: pop {r4,r5} pop {r0} bx r0 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} @@ -82287,7 +82287,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 @@ -82300,31 +82300,31 @@ sub_8031C1C: @ 8031C1C movs r4, 0xC ldrsh r0, [r1, r4] cmp r0, 0 - beq _08031C40 + beq @08031C40 subs r0, r3, 0x1 strh r0, [r1, 0xC] - b _08031C7C + b @08031C7C .align 2, 0 .pool -_08031C40: +@08031C40: ldrh r3, [r1, 0xA] movs r4, 0xA ldrsh r0, [r1, r4] cmp r0, 0x8 - bne _08031C52 + bne @08031C52 adds r0, r2, 0 bl remove_task - b _08031C7C -_08031C52: + b @08031C7C +@08031C52: ldrh r2, [r1, 0x10] movs r4, 0x10 ldrsh r0, [r1, r4] cmp r0, 0 - beq _08031C62 + beq @08031C62 subs r0, r2, 0x1 strh r0, [r1, 0x10] - b _08031C7C -_08031C62: + b @08031C7C +@08031C62: ldrh r0, [r1, 0xE] strh r0, [r1, 0x10] adds r0, r3, 0x1 @@ -82337,7 +82337,7 @@ _08031C62: movs r1, 0x1 movs r2, 0x10 bl gpu_pal_apply -_08031C7C: +@08031C7C: pop {r4} pop {r0} bx r0 @@ -82346,7 +82346,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 @@ -82379,7 +82379,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 @@ -82392,31 +82392,31 @@ sub_8031CC8: @ 8031CC8 movs r4, 0xC ldrsh r0, [r1, r4] cmp r0, 0 - beq _08031CEC + beq @08031CEC subs r0, r3, 0x1 strh r0, [r1, 0xC] - b _08031D28 + b @08031D28 .align 2, 0 .pool -_08031CEC: +@08031CEC: ldrh r3, [r1, 0xA] movs r4, 0xA ldrsh r0, [r1, r4] cmp r0, 0 - bne _08031CFE + bne @08031CFE adds r0, r2, 0 bl remove_task - b _08031D28 -_08031CFE: + b @08031D28 +@08031CFE: ldrh r2, [r1, 0x10] movs r4, 0x10 ldrsh r0, [r1, r4] cmp r0, 0 - beq _08031D0E + beq @08031D0E subs r0, r2, 0x1 strh r0, [r1, 0x10] - b _08031D28 -_08031D0E: + b @08031D28 +@08031D0E: ldrh r0, [r1, 0xE] strh r0, [r1, 0x10] subs r0, r3, 0x1 @@ -82429,7 +82429,7 @@ _08031D0E: movs r1, 0x1 movs r2, 0x10 bl gpu_pal_apply -_08031D28: +@08031D28: pop {r4} pop {r0} bx r0 @@ -82438,7 +82438,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 @@ -82470,7 +82470,7 @@ sub_8031D34: @ 8031D34 thumb_func_end sub_8031D34 thumb_func_start sub_8031D74 -sub_8031D74: @ 8031D74 +sub_8031D74: ; 8031D74 push {lr} ldr r0, =0x082ff088 movs r1, 0xF3 @@ -82498,7 +82498,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 @@ -82508,8 +82508,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 @@ -82518,20 +82518,20 @@ set_default_player_name: @ 8031DC4 ldrb r0, [r0, 0x8] adds r5, r1, 0 cmp r0, 0 - bne _08031DE4 + bne @08031DE4 ldr r1, =0x082ff128 - b _08031DE6 + b @08031DE6 .align 2, 0 .pool -_08031DE4: +@08031DE4: ldr r1, =0x082ff178 -_08031DE6: +@08031DE6: lsls r0, r2, 2 adds r0, r1 ldr r3, [r0] movs r2, 0 ldr r4, =0x03005d90 -_08031DF0: +@08031DF0: ldr r1, [r4] adds r1, r2 adds r0, r3, r2 @@ -82541,7 +82541,7 @@ _08031DF0: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x6 - bls _08031DF0 + bls @08031DF0 ldr r1, [r5] movs r0, 0xFF strb r0, [r1, 0x7] @@ -82553,8 +82553,8 @@ _08031DF0: thumb_func_end set_default_player_name thumb_func_start draw_text_box -@ void draw_text_box(void *text_ptr) -draw_text_box: @ 8031E18 +; void draw_text_box(void *text_ptr) +draw_text_box: ; 8031E18 push {r4,lr} sub sp, 0xC adds r4, r0, 0 @@ -82595,7 +82595,7 @@ draw_text_box: @ 8031E18 thumb_func_end draw_text_box thumb_func_start fmt_savegame -fmt_savegame: @ 8031E7C +fmt_savegame: ; 8031E7C push {lr} bl fmt_time bl fmt_pokedex @@ -82606,7 +82606,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 @@ -82649,7 +82649,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 @@ -82706,7 +82706,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 @@ -82714,19 +82714,19 @@ fmt_pokedex: @ 8031F7C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08031FFE + bne @08031FFE bl sub_809D42C cmp r0, 0 - beq _08031FA4 + beq @08031FA4 movs r0, 0x1 bl pokedex_count - b _08031FAA + b @08031FAA .align 2, 0 .pool -_08031FA4: +@08031FA4: movs r0, 0x1 bl sub_80C0844 -_08031FAA: +@08031FAA: lsls r0, 16 lsrs r7, r0, 16 ldr r4, =0x02021fc4 @@ -82764,7 +82764,7 @@ _08031FAA: movs r1, 0x1 movs r3, 0x21 bl box_print -_08031FFE: +@08031FFE: add sp, 0x2C pop {r4-r7} pop {r0} @@ -82774,26 +82774,26 @@ _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 ldr r4, =0x00000867 -_0803201C: +@0803201C: lsls r0, r4, 16 lsrs r0, 16 bl flag_check lsls r0, 24 cmp r0, 0 - beq _08032030 + beq @08032030 adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 -_08032030: +@08032030: adds r4, 0x1 ldr r0, =0x0000086e cmp r4, r0 - bls _0803201C + bls @0803201C ldr r4, =0x02021fc4 ldr r1, =0x085edcd7 adds r0, r4, 0 @@ -82838,7 +82838,7 @@ _08032030: thumb_func_end fmt_badges thumb_func_start unknown_title_pattern_data_to_vram -unknown_title_pattern_data_to_vram: @ 80320A4 +unknown_title_pattern_data_to_vram: ; 80320A4 push {r4-r6,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -82873,8 +82873,8 @@ unknown_title_pattern_data_to_vram: @ 80320A4 thumb_func_end unknown_title_pattern_data_to_vram thumb_func_start write_textbox_border_to_bg_tilemap -@ void write_textbox_border_to_bg_tilemap(struct rbox_template *box, int base_tile_num) -write_textbox_border_to_bg_tilemap: @ 80320EC +; void write_textbox_border_to_bg_tilemap(struct rbox_template *box, int base_tile_num) +write_textbox_border_to_bg_tilemap: ; 80320EC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -83047,7 +83047,7 @@ write_textbox_border_to_bg_tilemap: @ 80320EC thumb_func_end write_textbox_border_to_bg_tilemap thumb_func_start sub_8032250 -sub_8032250: @ 8032250 +sub_8032250: ; 8032250 push {r4-r6,lr} sub sp, 0xC adds r6, r0, 0 @@ -83085,7 +83085,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 @@ -83124,7 +83124,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 @@ -83140,11 +83140,11 @@ sub_80322E0: @ 80322E0 adds r0, r5, 0 bl Window_FillTileMap cmp r4, 0x1 - bne _0803230E + bne @0803230E adds r0, r5, 0 movs r1, 0x3 bl Window_CopyToVram -_0803230E: +@0803230E: pop {r4,r5} pop {r0} bx r0 @@ -83153,7 +83153,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 @@ -83218,23 +83218,23 @@ 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 ldrb r0, [r0] cmp r0, 0x8 - bne _080323C0 + bne @080323C0 ldr r1, =0x02022d04 ldrb r0, [r1] cmp r0, 0 - bne _080323C0 + bne @080323C0 movs r0, 0x1 strb r0, [r1] ldr r0, =sub_8030A70 + 1 movs r1, 0 bl AddTask -_080323C0: +@080323C0: pop {r0} bx r0 .align 2, 0 @@ -83242,7 +83242,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} @@ -83299,7 +83299,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 @@ -83315,11 +83315,11 @@ unknown_rbox_to_vram: @ 803243C adds r0, r5, 0 bl Window_WriteStandardTileMap cmp r4, 0x1 - bne _0803246A + bne @0803246A adds r0, r5, 0 movs r1, 0x3 bl Window_CopyToVram -_0803246A: +@0803246A: pop {r4,r5} pop {r0} bx r0 @@ -83328,7 +83328,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 @@ -83519,7 +83519,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 @@ -83533,13 +83533,13 @@ task_new_game_prof_birch_speech_part2_1: @ 803261C strh r1, [r4, 0x16] lsls r0, 16 cmp r0, 0 - bgt _08032644 + bgt @08032644 movs r0, 0 movs r1, 0x1 bl unknown_rbox_to_vram ldr r0, =task_new_game_prof_birch_speech_part2_2 + 1 str r0, [r4] -_08032644: +@08032644: pop {r4} pop {r0} bx r0 @@ -83548,31 +83548,31 @@ _08032644: thumb_func_end task_new_game_prof_birch_speech_part2_1 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] movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _08032686 + beq @08032686 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _0803266E + beq @0803266E bl sub_800B488 -_0803266E: +@0803266E: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _0803267A + bne @0803267A bl sub_8009734 -_0803267A: +@0803267A: ldr r0, =task00_08081A90 + 1 movs r1, 0 bl AddTask bl sub_8033244 -_08032686: +@08032686: pop {r0} bx r0 .align 2, 0 @@ -83580,7 +83580,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 @@ -83595,7 +83595,7 @@ sub_803269C: @ 803269C ldr r5, =0x020244b0 ldr r4, =nullsub_21 + 1 ldr r3, =0x02024076 -_080326B8: +@080326B8: lsls r0, r1, 2 adds r0, r7 str r4, [r0] @@ -83613,7 +83613,7 @@ _080326B8: str r0, [sp, 0x10] adds r1, r0, 0 cmp r1, 0x3 - ble _080326B8 + ble @080326B8 bl battle_wireless_setup_if_required_maybe ldr r0, =0x02024068 movs r5, 0 @@ -83627,7 +83627,7 @@ _080326B8: movs r1, 0x10 ands r0, r1 cmp r0, 0 - beq _08032728 + beq @08032728 bl zero_enemy_party_data ldr r4, =0x02024744 movs r1, 0x90 @@ -83645,7 +83645,7 @@ _080326B8: movs r1, 0xC add r2, sp, 0x10 bl pokemon_setattr -_08032728: +@08032728: ldr r0, =0x02022ff4 str r5, [r0] ldr r0, =0x0202428c @@ -83659,7 +83659,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] @@ -83667,51 +83667,51 @@ sub_8032768: @ 8032768 lsls r1, 17 ands r0, r1 cmp r0, 0 - bne _08032784 + bne @08032784 movs r0, 0x1 bl sub_8184DA4 - b _0803278A + b @0803278A .align 2, 0 .pool -_08032784: +@08032784: movs r0, 0x2 bl sub_8184DA4 -_0803278A: +@0803278A: ldr r4, =0x02022fec ldr r0, [r4] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 - bne _0803279C + bne @0803279C bl sub_8185EB8 -_0803279C: +@0803279C: ldr r0, [r4] movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _080327B0 + beq @080327B0 bl b_setup_bx_link - b _080327B4 + b @080327B4 .align 2, 0 .pool -_080327B0: +@080327B0: bl b_setup_bx -_080327B4: +@080327B4: bl sub_8033050 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - bne _080327E2 + bne @080327E2 movs r4, 0 ldr r0, =0x0202406c ldrb r1, [r0] cmp r4, r1 - bge _080327E2 + bge @080327E2 adds r5, r0, 0 -_080327D0: +@080327D0: lsls r0, r4, 24 lsrs r0, 24 movs r1, 0 @@ -83719,34 +83719,34 @@ _080327D0: adds r4, 0x1 ldrb r0, [r5] cmp r4, r0 - blt _080327D0 -_080327E2: + blt @080327D0 +@080327E2: movs r4, 0 ldr r3, =0x0202449c movs r2, 0xD2 lsls r2, 1 movs r1, 0 -_080327EC: +@080327EC: ldr r0, [r3] adds r0, r4, r0 adds r0, r2 strb r1, [r0] adds r4, 0x1 cmp r4, 0x5F - bls _080327EC + bls @080327EC movs r4, 0 ldr r3, =0x0202449c movs r2, 0x81 lsls r2, 2 movs r1, 0 -_08032804: +@08032804: ldr r0, [r3] adds r0, r4, r0 adds r0, r2 strb r1, [r0] adds r4, 0x1 cmp r4, 0x67 - bls _08032804 + bls @08032804 pop {r4,r5} pop {r0} bx r0 @@ -83755,7 +83755,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 @@ -83767,7 +83767,7 @@ b_setup_bx: @ 8032824 lsls r5, 15 ands r5, r3 cmp r5, 0 - beq _080328E4 + beq @080328E4 ldr r1, =0x03005d04 ldr r0, =sub_8039ECC + 1 str r0, [r1] @@ -83775,23 +83775,23 @@ b_setup_bx: @ 8032824 lsls r4, 17 ands r4, r3 cmp r4, 0 - beq _08032874 + beq @08032874 ldr r2, =0x03005d60 ldr r0, =sub_818994C + 1 str r0, [r2] ldr r1, =0x02024076 movs r0, 0 strb r0, [r1] - b _0803287E + b @0803287E .align 2, 0 .pool -_08032874: +@08032874: ldr r2, =0x03005d60 ldr r0, =sub_805745C + 1 str r0, [r2] ldr r1, =0x02024076 strb r4, [r1] -_0803287E: +@0803287E: ldr r3, =sub_805F164 + 1 str r3, [r2, 0x4] movs r0, 0x1 @@ -83823,17 +83823,17 @@ _0803287E: strh r1, [r0] strh r1, [r0, 0x2] movs r1, 0x3 - b _08032A76 + b @08032A76 .align 2, 0 .pool -_080328E4: +@080328E4: movs r7, 0x1 adds r0, r3, 0 ands r0, r7 cmp r0, 0 - beq _080328F0 - b _080329E0 -_080328F0: + beq @080328F0 + b @080329E0 +@080328F0: ldr r0, =0x03005d04 ldr r2, =sub_8039ECC + 1 str r2, [r0] @@ -83841,27 +83841,27 @@ _080328F0: ands r1, r3 mov r12, r2 cmp r1, 0 - beq _08032918 + beq @08032918 ldr r1, =0x03005d60 ldr r0, =sub_815936C + 1 - b _08032934 + b @08032934 .align 2, 0 .pool -_08032918: +@08032918: movs r0, 0x80 lsls r0, 2 ands r3, r0 cmp r3, 0 - beq _08032930 + beq @08032930 ldr r1, =0x03005d60 ldr r0, =bx_goto_buffer_A_ch0_tbl3 + 1 - b _08032934 + b @08032934 .align 2, 0 .pool -_08032930: +@08032930: ldr r1, =0x03005d60 ldr r0, =sub_805745C + 1 -_08032934: +@08032934: str r0, [r1] mov r10, r1 ldr r4, =0x02024076 @@ -83884,19 +83884,19 @@ _08032934: lsls r0, 17 ands r0, r3 cmp r0, 0 - bne _08032964 - b _08032CB2 -_08032964: + bne @08032964 + b @08032CB2 +@08032964: movs r1, 0x80 lsls r1, 18 ands r1, r3 cmp r1, 0 - beq _080329CC + beq @080329CC movs r1, 0x80 lsls r1, 24 ands r1, r3 cmp r1, 0 - beq _080329B4 + beq @080329B4 mov r1, r12 ldr r0, =0x03005d04 str r1, [r0] @@ -83908,10 +83908,10 @@ _08032964: str r0, [r5, 0x4] strb r6, [r4, 0x1] strb r7, [r2] - b _08032CB2 + b @08032CB2 .align 2, 0 .pool -_080329B4: +@080329B4: ldr r0, =sub_818994C + 1 str r0, [r5, 0x4] strb r1, [r4, 0x1] @@ -83919,10 +83919,10 @@ _080329B4: str r0, [r5] strb r6, [r4] strb r7, [r2] - b _08032CB2 + b @08032CB2 .align 2, 0 .pool -_080329CC: +@080329CC: ldr r0, =sub_818994C + 1 mov r2, r10 str r0, [r2] @@ -83930,10 +83930,10 @@ _080329CC: mov r0, r8 str r0, [r2, 0x4] strb r6, [r4, 0x1] - b _08032CB2 + b @08032CB2 .align 2, 0 .pool -_080329E0: +@080329E0: ldr r1, =sub_8039ECC + 1 ldr r2, =0x03005d04 str r1, [r2] @@ -83964,15 +83964,15 @@ _080329E0: lsls r0, 17 ands r0, r3 cmp r0, 0 - bne _08032A20 - b _08032CB2 -_08032A20: + bne @08032A20 + b @08032CB2 +@08032A20: movs r1, 0xA0 lsls r1, 1 adds r0, r3, 0 ands r0, r1 cmp r0, r1 - bne _08032AA0 + bne @08032AA0 ldr r0, =sub_8039ECC + 1 ldr r1, =0x03005d04 str r0, [r1] @@ -84006,19 +84006,19 @@ _08032A20: strh r5, [r0] strh r5, [r0, 0x2] mov r1, r8 -_08032A76: +@08032A76: strh r1, [r0, 0x4] strh r1, [r0, 0x6] - b _08032CB2 + b @08032CB2 .align 2, 0 .pool -_08032AA0: +@08032AA0: movs r5, 0x40 ands r5, r3 cmp r5, 0 - bne _08032AAA - b _08032C3C -_08032AAA: + bne @08032AAA + b @08032C3C +@08032AAA: ldr r0, =0x0203c7b4 ldrb r5, [r0] movs r0, 0 @@ -84031,39 +84031,39 @@ _08032AAA: movs r4, 0 movs r2, 0x3 mov r9, r2 -_08032AC2: +@08032AC2: mov r1, r12 adds r0, r4, r1 ldrh r0, [r0, 0x18] cmp r0, 0x2 - bgt _08032AE4 + bgt @08032AE4 cmp r0, 0x1 - bge _08032AFC + bge @08032AFC cmp r0, 0 - beq _08032AE8 - b _08032B06 + beq @08032AE8 + b @08032B06 .align 2, 0 .pool -_08032AE4: +@08032AE4: cmp r0, 0x3 - bne _08032B06 -_08032AE8: + bne @08032B06 +@08032AE8: ldr r0, =0x020229e8 adds r0, r4, r0 ldrb r0, [r0, 0x18] movs r1, 0 bl sub_81B8D64 - b _08032B06 + b @08032B06 .align 2, 0 .pool -_08032AFC: +@08032AFC: lsls r0, 24 lsrs r0, 24 movs r1, 0x1 bl sub_81B8D64 -_08032B06: +@08032B06: cmp r10, r5 - bne _08032B56 + bne @08032B56 ldr r0, =0x020229e8 adds r3, r4, r0 ldrh r1, [r3, 0x18] @@ -84075,18 +84075,18 @@ _08032B06: ldrh r1, [r3, 0x18] mov r12, r0 cmp r1, 0x2 - bgt _08032B38 + bgt @08032B38 cmp r1, 0x1 - bge _08032B4C + bge @08032B4C cmp r1, 0 - beq _08032B3C - b _08032C2C + beq @08032B3C + b @08032C2C .align 2, 0 .pool -_08032B38: +@08032B38: cmp r1, 0x3 - bne _08032C2C -_08032B3C: + bne @08032C2C +@08032B3C: mov r1, r12 adds r0, r4, r1 ldrh r1, [r0, 0x18] @@ -84094,14 +84094,14 @@ _08032B3C: mov r2, r8 strb r2, [r1] ldrh r0, [r0, 0x18] - b _08032C12 -_08032B4C: + b @08032C12 +@08032B4C: adds r1, r7 movs r0, 0x2 strb r0, [r1] ldrh r0, [r3, 0x18] - b _08032C24 -_08032B56: + b @08032C24 +@08032B56: ldr r2, =0x020229e8 adds r0, r4, r2 ldrh r1, [r0, 0x18] @@ -84110,7 +84110,7 @@ _08032B56: ands r0, r1 mov r12, r2 cmp r0, 0 - bne _08032B80 + bne @08032B80 lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -84119,11 +84119,11 @@ _08032B56: adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _08032B92 - b _08032BD8 + beq @08032B92 + b @08032BD8 .align 2, 0 .pool -_08032B80: +@08032B80: lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -84132,8 +84132,8 @@ _08032B80: adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _08032BD8 -_08032B92: + beq @08032BD8 +@08032B92: mov r0, r12 adds r2, r4, r0 ldrh r0, [r2, 0x18] @@ -84144,18 +84144,18 @@ _08032B92: str r1, [r0] ldrh r1, [r2, 0x18] cmp r1, 0x2 - bgt _08032BBC + bgt @08032BBC cmp r1, 0x1 - bge _08032BD0 + bge @08032BD0 cmp r1, 0 - beq _08032BC0 - b _08032C2C + beq @08032BC0 + b @08032C2C .align 2, 0 .pool -_08032BBC: +@08032BBC: cmp r1, 0x3 - bne _08032C2C -_08032BC0: + bne @08032C2C +@08032BC0: mov r2, r12 adds r0, r4, r2 ldrh r1, [r0, 0x18] @@ -84163,13 +84163,13 @@ _08032BC0: mov r2, r8 strb r2, [r1] ldrh r0, [r0, 0x18] - b _08032C12 -_08032BD0: + b @08032C12 +@08032BD0: adds r1, r7 movs r0, 0x2 strb r0, [r1] - b _08032C22 -_08032BD8: + b @08032C22 +@08032BD8: mov r0, r12 adds r2, r4, r0 ldrh r0, [r2, 0x18] @@ -84180,18 +84180,18 @@ _08032BD8: str r1, [r0] ldrh r0, [r2, 0x18] cmp r0, 0x2 - bgt _08032C00 + bgt @08032C00 cmp r0, 0x1 - bge _08032C1C + bge @08032C1C cmp r0, 0 - beq _08032C04 - b _08032C2C + beq @08032C04 + b @08032C2C .align 2, 0 .pool -_08032C00: +@08032C00: cmp r0, 0x3 - bne _08032C2C -_08032C04: + bne @08032C2C +@08032C04: mov r0, r12 adds r2, r4, r0 ldrh r0, [r2, 0x18] @@ -84199,38 +84199,38 @@ _08032C04: movs r1, 0x1 strb r1, [r0] ldrh r0, [r2, 0x18] -_08032C12: +@08032C12: lsls r0, 1 adds r0, r6 mov r1, r8 strh r1, [r0] - b _08032C2C -_08032C1C: + b @08032C2C +@08032C1C: adds r0, r7 mov r1, r9 strb r1, [r0] -_08032C22: +@08032C22: ldrh r0, [r2, 0x18] -_08032C24: +@08032C24: lsls r0, 1 adds r0, r6 mov r2, r9 strh r2, [r0] -_08032C2C: +@08032C2C: adds r4, 0x1C movs r0, 0x1 add r10, r0 mov r1, r10 cmp r1, 0x3 - bgt _08032C3A - b _08032AC2 -_08032C3A: - b _08032CB2 -_08032C3C: + bgt @08032C3A + b @08032AC2 +@08032C3A: + b @08032CB2 +@08032C3C: movs r1, 0x4 ands r1, r3 cmp r1, 0 - beq _08032C7C + beq @08032C7C ldr r0, =sub_818994C + 1 str r0, [r2] strb r5, [r4] @@ -84241,24 +84241,24 @@ _08032C3C: lsls r0, 18 ands r3, r0 cmp r3, 0 - beq _08032C70 + beq @08032C70 ldr r0, =sub_81864EC + 1 str r0, [r2, 0x4] strb r7, [r4, 0x1] str r0, [r2, 0xC] mov r1, r8 strb r1, [r4, 0x3] - b _08032CB2 + b @08032CB2 .align 2, 0 .pool -_08032C70: +@08032C70: str r6, [r2, 0x4] strb r7, [r4, 0x1] str r6, [r2, 0xC] mov r2, r8 strb r2, [r4, 0x3] - b _08032CB2 -_08032C7C: + b @08032CB2 +@08032C7C: ldr r0, =sub_818994C + 1 str r0, [r2, 0x4] strb r1, [r4, 0x1] @@ -84269,23 +84269,23 @@ _08032C7C: lsls r0, 18 ands r3, r0 cmp r3, 0 - beq _08032CA8 + beq @08032CA8 ldr r0, =sub_81864EC + 1 str r0, [r2] strb r7, [r4] str r0, [r2, 0x8] mov r1, r8 strb r1, [r4, 0x2] - b _08032CB2 + b @08032CB2 .align 2, 0 .pool -_08032CA8: +@08032CA8: str r6, [r2] strb r7, [r4] str r6, [r2, 0x8] mov r2, r8 strb r2, [r4, 0x2] -_08032CB2: +@08032CB2: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -84296,7 +84296,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 @@ -84308,11 +84308,11 @@ b_setup_bx_link: @ 8032CC0 adds r3, r1, 0 ands r3, r5 cmp r3, 0 - bne _08032D48 + bne @08032D48 movs r4, 0x4 ands r4, r1 cmp r4, 0 - beq _08032D1C + beq @08032D1C ldr r1, =0x03005d04 ldr r0, =sub_8039ECC + 1 str r0, [r1] @@ -84326,10 +84326,10 @@ b_setup_bx_link: @ 8032CC0 strb r5, [r1, 0x1] ldr r1, =0x0202406c movs r0, 0x2 - b _0803303A + b @0803303A .align 2, 0 .pool -_08032D1C: +@08032D1C: ldr r2, =0x03005d60 ldr r0, =sub_805745C + 1 str r0, [r2, 0x4] @@ -84340,19 +84340,19 @@ _08032D1C: strb r5, [r1] ldr r1, =0x0202406c movs r0, 0x2 - b _0803303A + b @0803303A .align 2, 0 .pool -_08032D48: +@08032D48: movs r0, 0x41 ands r0, r1 cmp r0, 0x1 - bne _08032DD0 + bne @08032DD0 movs r6, 0x4 adds r3, r6, 0 ands r3, r1 cmp r3, 0 - beq _08032D98 + beq @08032D98 ldr r1, =0x03005d04 ldr r0, =sub_8039ECC + 1 str r0, [r1] @@ -84371,10 +84371,10 @@ _08032D48: str r3, [r2, 0xC] movs r0, 0x3 strb r0, [r1, 0x3] - b _08032DB4 + b @08032DB4 .align 2, 0 .pool -_08032D98: +@08032D98: ldr r2, =0x03005d60 ldr r0, =sub_805745C + 1 str r0, [r2, 0x4] @@ -84389,23 +84389,23 @@ _08032D98: str r3, [r2, 0x8] movs r0, 0x3 strb r0, [r1, 0x2] -_08032DB4: +@08032DB4: ldr r0, =0x0202406c strb r6, [r0] - b _0803303C + b @0803303C .align 2, 0 .pool -_08032DD0: +@08032DD0: movs r0, 0x80 lsls r0, 1 ands r0, r1 cmp r0, 0 - beq _08032E8C + beq @08032E8C movs r4, 0x4 adds r3, r4, 0 ands r3, r1 cmp r3, 0 - beq _08032E1C + beq @08032E1C ldr r1, =0x03005d04 ldr r0, =sub_8039ECC + 1 str r0, [r1] @@ -84419,10 +84419,10 @@ _08032DD0: str r3, [r2, 0x4] strb r5, [r1, 0x1] ldr r0, =sub_814AEB0 + 1 - b _08032E2E + b @08032E2E .align 2, 0 .pool -_08032E1C: +@08032E1C: ldr r2, =0x03005d60 ldr r0, =sub_814AEB0 + 1 str r0, [r2] @@ -84432,7 +84432,7 @@ _08032E1C: str r3, [r2, 0x4] strb r5, [r1, 0x1] ldr r0, =sub_805745C + 1 -_08032E2E: +@08032E2E: str r0, [r2, 0x8] movs r0, 0x2 strb r0, [r1, 0x2] @@ -84460,10 +84460,10 @@ _08032E2E: movs r1, 0x3 strh r1, [r0, 0x4] strh r1, [r0, 0x6] - b _0803303C + b @0803303C .align 2, 0 .pool -_08032E8C: +@08032E8C: bl link_get_multiplayer_id lsls r0, 24 lsrs r5, r0, 24 @@ -84471,11 +84471,11 @@ _08032E8C: movs r1, 0x4 ands r0, r1 cmp r0, 0 - beq _08032EA4 + beq @08032EA4 ldr r1, =0x03005d04 ldr r0, =sub_8039ECC + 1 str r0, [r1] -_08032EA4: +@08032EA4: movs r0, 0 mov r10, r0 ldr r1, =0x020229e8 @@ -84486,39 +84486,39 @@ _08032EA4: movs r4, 0 movs r2, 0x3 mov r9, r2 -_08032EB8: +@08032EB8: mov r1, r12 adds r0, r4, r1 ldrh r0, [r0, 0x18] cmp r0, 0x2 - bgt _08032EE0 + bgt @08032EE0 cmp r0, 0x1 - bge _08032EF8 + bge @08032EF8 cmp r0, 0 - beq _08032EE4 - b _08032F02 + beq @08032EE4 + b @08032F02 .align 2, 0 .pool -_08032EE0: +@08032EE0: cmp r0, 0x3 - bne _08032F02 -_08032EE4: + bne @08032F02 +@08032EE4: ldr r0, =0x020229e8 adds r0, r4, r0 ldrb r0, [r0, 0x18] movs r1, 0 bl sub_81B8D64 - b _08032F02 + b @08032F02 .align 2, 0 .pool -_08032EF8: +@08032EF8: lsls r0, 24 lsrs r0, 24 movs r1, 0x1 bl sub_81B8D64 -_08032F02: +@08032F02: cmp r10, r5 - bne _08032F52 + bne @08032F52 ldr r0, =0x020229e8 adds r3, r4, r0 ldrh r1, [r3, 0x18] @@ -84530,18 +84530,18 @@ _08032F02: ldrh r1, [r3, 0x18] mov r12, r0 cmp r1, 0x2 - bgt _08032F34 + bgt @08032F34 cmp r1, 0x1 - bge _08032F48 + bge @08032F48 cmp r1, 0 - beq _08032F38 - b _08033028 + beq @08032F38 + b @08033028 .align 2, 0 .pool -_08032F34: +@08032F34: cmp r1, 0x3 - bne _08033028 -_08032F38: + bne @08033028 +@08032F38: mov r1, r12 adds r0, r4, r1 ldrh r1, [r0, 0x18] @@ -84549,14 +84549,14 @@ _08032F38: mov r2, r8 strb r2, [r1] ldrh r0, [r0, 0x18] - b _0803300E -_08032F48: + b @0803300E +@08032F48: adds r1, r7 movs r0, 0x2 strb r0, [r1] ldrh r0, [r3, 0x18] - b _08033020 -_08032F52: + b @08033020 +@08032F52: ldr r2, =0x020229e8 adds r0, r4, r2 ldrh r1, [r0, 0x18] @@ -84565,7 +84565,7 @@ _08032F52: ands r0, r1 mov r12, r2 cmp r0, 0 - bne _08032F7C + bne @08032F7C lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -84574,11 +84574,11 @@ _08032F52: adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _08032F8E - b _08032FD4 + beq @08032F8E + b @08032FD4 .align 2, 0 .pool -_08032F7C: +@08032F7C: lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -84587,8 +84587,8 @@ _08032F7C: adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _08032FD4 -_08032F8E: + beq @08032FD4 +@08032F8E: mov r0, r12 adds r2, r4, r0 ldrh r0, [r2, 0x18] @@ -84599,18 +84599,18 @@ _08032F8E: str r1, [r0] ldrh r1, [r2, 0x18] cmp r1, 0x2 - bgt _08032FB8 + bgt @08032FB8 cmp r1, 0x1 - bge _08032FCC + bge @08032FCC cmp r1, 0 - beq _08032FBC - b _08033028 + beq @08032FBC + b @08033028 .align 2, 0 .pool -_08032FB8: +@08032FB8: cmp r1, 0x3 - bne _08033028 -_08032FBC: + bne @08033028 +@08032FBC: mov r2, r12 adds r0, r4, r2 ldrh r1, [r0, 0x18] @@ -84618,13 +84618,13 @@ _08032FBC: mov r2, r8 strb r2, [r1] ldrh r0, [r0, 0x18] - b _0803300E -_08032FCC: + b @0803300E +@08032FCC: adds r1, r7 movs r0, 0x2 strb r0, [r1] - b _0803301E -_08032FD4: + b @0803301E +@08032FD4: mov r0, r12 adds r2, r4, r0 ldrh r0, [r2, 0x18] @@ -84635,18 +84635,18 @@ _08032FD4: str r1, [r0] ldrh r0, [r2, 0x18] cmp r0, 0x2 - bgt _08032FFC + bgt @08032FFC cmp r0, 0x1 - bge _08033018 + bge @08033018 cmp r0, 0 - beq _08033000 - b _08033028 + beq @08033000 + b @08033028 .align 2, 0 .pool -_08032FFC: +@08032FFC: cmp r0, 0x3 - bne _08033028 -_08033000: + bne @08033028 +@08033000: mov r0, r12 adds r2, r4, r0 ldrh r0, [r2, 0x18] @@ -84654,37 +84654,37 @@ _08033000: movs r1, 0x1 strb r1, [r0] ldrh r0, [r2, 0x18] -_0803300E: +@0803300E: lsls r0, 1 adds r0, r6 mov r1, r8 strh r1, [r0] - b _08033028 -_08033018: + b @08033028 +@08033018: adds r0, r7 mov r1, r9 strb r1, [r0] -_0803301E: +@0803301E: ldrh r0, [r2, 0x18] -_08033020: +@08033020: lsls r0, 1 adds r0, r6 mov r2, r9 strh r2, [r0] -_08033028: +@08033028: adds r4, 0x1C movs r0, 0x1 add r10, r0 mov r1, r10 cmp r1, 0x3 - bgt _08033036 - b _08032EB8 -_08033036: + bgt @08033036 + b @08032EB8 +@08033036: ldr r1, =0x0202406c movs r0, 0x4 -_0803303A: +@0803303A: strb r0, [r1] -_0803303C: +@0803303C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -84697,7 +84697,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 @@ -84708,15 +84708,15 @@ sub_8033050: @ 8033050 movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _08033068 - b _0803319C -_08033068: + beq @08033068 + b @0803319C +@08033068: movs r0, 0 mov r8, r0 - b _0803317A + b @0803317A .align 2, 0 .pool -_08033074: +@08033074: movs r5, 0 movs r0, 0x1 add r0, r8 @@ -84727,97 +84727,97 @@ _08033074: mov r0, r8 lsls r6, r0, 1 movs r7, 0 -_08033088: +@08033088: mov r0, r8 cmp r0, 0x1 - bgt _080330F0 + bgt @080330F0 mov r0, r9 ldrb r1, [r0] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080330A8 + bne @080330A8 ldr r0, =0x020244ec - b _080330AA + b @080330AA .align 2, 0 .pool -_080330A8: +@080330A8: ldr r0, =0x02024744 -_080330AA: +@080330AA: adds r4, r7, r0 adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _08033170 + beq @08033170 adds r0, r4, 0 movs r1, 0x41 bl pokemon_getattr cmp r0, 0 - beq _08033170 + beq @08033170 adds r0, r4, 0 movs r1, 0x41 bl pokemon_getattr movs r1, 0xCE lsls r1, 1 cmp r0, r1 - beq _08033170 + beq @08033170 adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _08033170 + bne @08033170 ldr r0, =0x0202406e adds r0, r6, r0 strh r5, [r0] - b _08033178 + b @08033178 .align 2, 0 .pool -_080330F0: +@080330F0: mov r0, r9 ldrb r1, [r0] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _08033118 + bne @08033118 ldr r0, =0x020244ec adds r4, r7, r0 adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _08033170 + beq @08033170 adds r0, r4, 0 movs r1, 0xB - b _0803312C + b @0803312C .align 2, 0 .pool -_08033118: +@08033118: ldr r0, =0x02024744 adds r4, r7, r0 adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _08033170 + beq @08033170 adds r0, r4, 0 movs r1, 0x41 -_0803312C: +@0803312C: bl pokemon_getattr cmp r0, 0 - beq _08033170 + beq @08033170 adds r0, r4, 0 movs r1, 0x41 bl pokemon_getattr movs r1, 0xCE lsls r1, 1 cmp r0, r1 - beq _08033170 + beq @08033170 adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _08033170 + bne @08033170 ldr r1, =0x0202406e mov r0, r8 subs r0, 0x2 @@ -84825,39 +84825,39 @@ _0803312C: adds r0, r1 ldrh r0, [r0] cmp r0, r5 - beq _08033170 + beq @08033170 adds r0, r6, r1 strh r5, [r0] - b _08033178 + b @08033178 .align 2, 0 .pool -_08033170: +@08033170: adds r7, 0x64 adds r5, 0x1 cmp r5, 0x5 - ble _08033088 -_08033178: + ble @08033088 +@08033178: mov r8, r10 -_0803317A: +@0803317A: ldr r0, =0x0202406c ldrb r0, [r0] cmp r8, r0 - bge _08033184 - b _08033074 -_08033184: + bge @08033184 + b @08033074 +@08033184: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 8 ands r0, r1 cmp r0, 0 - beq _0803319C + beq @0803319C ldr r0, =0x0202406e movs r1, 0 strh r1, [r0, 0x2] movs r1, 0x3 strh r1, [r0, 0x6] -_0803319C: +@0803319C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -84870,7 +84870,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 @@ -84883,27 +84883,27 @@ dp01_prepare_buffer: @ 80331B8 movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _080331E4 + beq @080331E4 adds r0, r3, 0 adds r1, r2, 0 adds r2, r4, 0 bl dp01_prepare_buffer_wireless_probably - b _08033236 + b @08033236 .align 2, 0 .pool -_080331E4: +@080331E4: cmp r5, 0 - beq _080331EE + beq @080331EE cmp r5, 0x1 - beq _08033218 - b _08033236 -_080331EE: + beq @08033218 + b @08033236 +@080331EE: movs r3, 0 cmp r3, r2 - bge _08033236 + bge @08033236 ldr r6, =0x02023064 ldr r5, =0x02024064 -_080331F8: +@080331F8: ldrb r0, [r5] lsls r0, 9 adds r0, r3, r0 @@ -84913,17 +84913,17 @@ _080331F8: adds r4, 0x1 adds r3, 0x1 cmp r3, r2 - blt _080331F8 - b _08033236 + blt @080331F8 + b @08033236 .align 2, 0 .pool -_08033218: +@08033218: movs r3, 0 cmp r3, r2 - bge _08033236 + bge @08033236 ldr r6, =0x02023864 ldr r5, =0x02024064 -_08033222: +@08033222: ldrb r0, [r5] lsls r0, 9 adds r0, r3, r0 @@ -84933,8 +84933,8 @@ _08033222: adds r4, 0x1 adds r3, 0x1 cmp r3, r2 - blt _08033222 -_08033236: + blt @08033222 +@08033236: pop {r4-r6} pop {r0} bx r0 @@ -84943,7 +84943,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 + 1 movs r1, 0 @@ -85022,7 +85022,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 @@ -85054,7 +85054,7 @@ dp01_prepare_buffer_wireless_probably: @ 80332F4 lsls r1, 5 adds r5, r2, 0 cmp r0, r1 - ble _08033346 + ble @08033346 ldrh r0, [r4, 0x24] movs r2, 0 strh r0, [r4, 0x20] @@ -85064,7 +85064,7 @@ dp01_prepare_buffer_wireless_probably: @ 80332F4 lsls r0, 3 adds r0, r5 strh r2, [r0, 0x24] -_08033346: +@08033346: ldrb r1, [r3] lsls r0, r1, 2 adds r0, r1 @@ -85164,10 +85164,10 @@ _08033346: strb r0, [r1, 0x7] movs r2, 0 cmp r2, r12 - bge _08033434 + bge @08033434 mov r10, r5 adds r6, r3, 0 -_08033412: +@08033412: ldrb r1, [r6] lsls r0, r1, 2 adds r0, r1 @@ -85184,8 +85184,8 @@ _08033412: strb r0, [r1, 0x8] adds r2, 0x1 cmp r2, r12 - blt _08033412 -_08033434: + blt @08033412 +@08033434: ldrb r0, [r3] lsls r1, r0, 2 adds r1, r0 @@ -85207,7 +85207,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 @@ -85220,33 +85220,33 @@ task00_wireless_something: @ 8033474 ldrsh r0, [r0, r2] adds r7, r1, 0 cmp r0, 0x5 - bls _08033490 - b _08033640 -_08033490: + bls @08033490 + b @08033640 +@08033490: lsls r0, 2 - ldr r1, =_080334A4 + ldr r1, =@080334A4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080334A4: - .4byte _080334BC - .4byte _080334CA - .4byte _080334E6 - .4byte _08033570 - .4byte _080335E6 - .4byte _08033624 -_080334BC: +@080334A4: + .4byte @080334BC + .4byte @080334CA + .4byte @080334E6 + .4byte @08033570 + .4byte @080335E6 + .4byte @08033624 +@080334BC: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r7 movs r1, 0x64 strh r1, [r0, 0x1C] - b _080334F6 -_080334CA: + b @080334F6 +@080334CA: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -85256,61 +85256,61 @@ _080334CA: strh r0, [r1, 0x1C] lsls r0, 16 cmp r0, 0 - beq _080334E0 - b _08033640 -_080334E0: + beq @080334E0 + b @08033640 +@080334E0: ldrh r0, [r1, 0x1E] adds r0, 0x1 - b _0803363E -_080334E6: + b @0803363E +@080334E6: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _08033504 + beq @08033504 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r7 -_080334F6: +@080334F6: ldrh r1, [r0, 0x1E] adds r1, 0x1 strh r1, [r0, 0x1E] - b _08033640 + b @08033640 .align 2, 0 .pool -_08033504: +@08033504: ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 lsls r0, 1 ands r0, r1 cmp r0, 0 - beq _0803351C + beq @0803351C movs r5, 0x2 - b _0803352A + b @0803352A .align 2, 0 .pool -_0803351C: +@0803351C: movs r0, 0x40 ands r1, r0 movs r0, 0x2 cmp r1, 0 - beq _08033528 + beq @08033528 movs r0, 0x4 -_08033528: +@08033528: adds r5, r0, 0 -_0803352A: +@0803352A: bl sub_800ABAC lsls r0, 24 lsrs r0, 24 cmp r0, r5 - bcs _08033538 - b _08033640 -_08033538: + bcs @08033538 + b @08033640 +@08033538: bl sub_800ABBC lsls r0, 24 cmp r0, 0 - beq _0803355C + beq @0803355C bl sub_800A620 ldr r0, =0x03005e00 lsls r1, r4, 2 @@ -85319,10 +85319,10 @@ _08033538: adds r1, r0 ldrh r0, [r1, 0x1E] adds r0, 0x1 - b _0803363E + b @0803363E .align 2, 0 .pool -_0803355C: +@0803355C: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -85330,10 +85330,10 @@ _0803355C: adds r1, r0 ldrh r0, [r1, 0x1E] adds r0, 0x1 - b _0803363E + b @0803363E .align 2, 0 .pool -_08033570: +@08033570: lsls r1, r4, 2 adds r0, r1, r4 lsls r0, 3 @@ -85344,21 +85344,21 @@ _08033570: ldrsh r6, [r2, r0] mov r12, r6 cmp r5, r12 - beq _08033640 + beq @08033640 ldrh r0, [r2, 0x22] movs r6, 0x22 ldrsh r3, [r2, r6] cmp r3, 0 - bne _080335E0 + bne @080335E0 cmp r5, r12 - ble _080335A0 + ble @080335A0 movs r6, 0x20 ldrsh r0, [r2, r6] cmp r5, r0 - bne _080335A0 + bne @080335A0 strh r3, [r2, 0x20] strh r3, [r2, 0x26] -_080335A0: +@080335A0: adds r4, r1, r4 lsls r4, 3 adds r4, r7 @@ -85386,18 +85386,18 @@ _080335A0: ldrh r0, [r4, 0x1E] adds r0, 0x1 strh r0, [r4, 0x1E] - b _08033640 + b @08033640 .align 2, 0 .pool -_080335E0: +@080335E0: subs r0, 0x1 strh r0, [r2, 0x22] - b _08033640 -_080335E6: + b @08033640 +@080335E6: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08033640 + beq @08033640 ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -85418,10 +85418,10 @@ _080335E6: adds r0, r6 adds r0, 0x8 strh r0, [r1, 0x26] - b _0803363C + b @0803363C .align 2, 0 .pool -_08033624: +@08033624: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -85431,21 +85431,21 @@ _08033624: strh r0, [r1, 0x22] lsls r0, 16 cmp r0, 0 - bne _08033640 + bne @08033640 movs r0, 0x1 strh r0, [r1, 0x22] -_0803363C: +@0803363C: movs r0, 0x3 -_0803363E: +@0803363E: strh r0, [r1, 0x1E] -_08033640: +@08033640: pop {r4-r7} pop {r0} bx r0 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 @@ -85454,21 +85454,21 @@ sub_8033648: @ 8033648 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _08033738 + beq @08033738 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x20 ands r0, r1 cmp r0, 0 - beq _08033738 + beq @08033738 bl sub_8011BD0 movs r4, 0 ldr r0, =0x020223c4 mov r10, r0 - b _0803372C + b @0803372C .align 2, 0 .pool -_08033680: +@08033680: bl sub_800A550 lsls r0, 24 lsrs r0, 24 @@ -85480,7 +85480,7 @@ _08033680: adds r1, r4, 0x1 mov r9, r1 cmp r0, 0 - beq _08033726 + beq @08033726 adds r0, r4, 0 bl sub_800A5EC lsls r0, r4, 8 @@ -85505,7 +85505,7 @@ _08033680: movs r0, 0x80 lsls r0, 5 cmp r1, r0 - ble _080336E0 + ble @080336E0 ldrh r0, [r2, 0x24] strh r0, [r2, 0x20] ldrb r1, [r4] @@ -85515,7 +85515,7 @@ _08033680: adds r0, r7 movs r1, 0 strh r1, [r0, 0x24] -_080336E0: +@080336E0: ldr r2, =0x020244a4 mov r4, r12 ldrb r1, [r4] @@ -85534,16 +85534,16 @@ _080336E0: mov r8, r7 mov r7, r12 cmp r2, r3 - bge _08033714 -_08033706: + bge @08033714 +@08033706: adds r0, r5, r2 adds r1, r4, r2 ldrb r1, [r1] strb r1, [r0] adds r2, 0x1 cmp r2, r3 - blt _08033706 -_08033714: + blt @08033706 +@08033714: ldrb r0, [r7] lsls r1, r0, 2 adds r1, r0 @@ -85553,17 +85553,17 @@ _08033714: adds r0, r6, r0 adds r0, 0x8 strh r0, [r1, 0x24] -_08033726: +@08033726: mov r1, r9 lsls r0, r1, 24 lsrs r4, r0, 24 -_0803372C: +@0803372C: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bcc _08033680 -_08033738: + bcc @08033680 +@08033738: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -85576,7 +85576,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 @@ -85593,19 +85593,19 @@ sub_803375C: @ 803375C movs r4, 0x24 ldrsh r0, [r3, r4] cmp r2, r0 - bne _08033780 - b _0803389C -_08033780: + bne @08033780 + b @0803389C +@08033780: cmp r2, r0 - ble _08033792 + ble @08033792 movs r4, 0x20 ldrsh r0, [r3, r4] cmp r2, r0 - bne _08033792 + bne @08033792 movs r0, 0 strh r0, [r3, 0x20] strh r0, [r3, 0x26] -_08033792: +@08033792: lsls r2, r7, 2 adds r0, r2, r7 lsls r0, 3 @@ -85624,19 +85624,19 @@ _08033792: ldrb r0, [r3] mov r9, r2 cmp r0, 0x1 - beq _0803385C + beq @0803385C cmp r0, 0x1 - bgt _080337CC + bgt @080337CC cmp r0, 0 - beq _080337D2 - b _0803388A + beq @080337D2 + b @0803388A .align 2, 0 .pool -_080337CC: +@080337CC: cmp r0, 0x2 - beq _08033874 - b _0803388A -_080337D2: + beq @08033874 + b @0803388A +@080337D2: ldr r2, =0x02024068 ldr r1, =0x0832a328 lsls r0, r4, 2 @@ -85645,7 +85645,7 @@ _080337D2: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _0803389C + bne @0803389C lsls r0, r4, 9 ldr r1, =0x02023064 adds r0, r1 @@ -85660,7 +85660,7 @@ _080337D2: movs r1, 0x4 ands r0, r1 cmp r0, 0 - bne _0803388A + bne @0803388A ldr r2, =0x0202420b movs r4, 0x26 ldrsh r0, [r5, r4] @@ -85687,10 +85687,10 @@ _080337D2: adds r0, r1 ldrb r0, [r0, 0x7] strb r0, [r2] - b _0803388A + b @0803388A .align 2, 0 .pool -_0803385C: +@0803385C: lsls r0, r4, 9 ldr r1, =0x02023864 adds r0, r1 @@ -85698,10 +85698,10 @@ _0803385C: adds r1, 0x8 adds r2, r6, 0 bl memcpy - b _0803388A + b @0803388A .align 2, 0 .pool -_08033874: +@08033874: ldrb r2, [r3, 0x8] ldr r3, =0x02024068 ldr r1, =0x0832a328 @@ -85713,7 +85713,7 @@ _08033874: ldr r0, [r3] bics r0, r1 str r0, [r3] -_0803388A: +@0803388A: ldr r0, =0x03005e00 mov r2, r9 adds r1, r2, r7 @@ -85723,7 +85723,7 @@ _0803388A: adds r0, r6, r0 adds r0, 0x8 strh r0, [r1, 0x26] -_0803389C: +@0803389C: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -85735,7 +85735,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 @@ -85756,7 +85756,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 @@ -85778,7 +85778,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 @@ -85792,18 +85792,18 @@ dp01_build_cmdbuf_x02_a_b_varargs: @ 8033900 strb r2, [r0, 0x2] adds r1, r0, 0 cmp r5, 0 - beq _0803392E + beq @0803392E adds r3, r1, 0x3 adds r2, r5, 0 -_08033920: +@08033920: ldrb r0, [r4] strb r0, [r3] adds r4, 0x1 adds r3, 0x1 subs r2, 0x1 cmp r2, 0 - bne _08033920 -_0803392E: + bne @08033920 +@0803392E: adds r2, r5, 0x3 adds r0, r6, 0 bl dp01_prepare_buffer @@ -85815,7 +85815,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 @@ -85828,18 +85828,18 @@ sub_8033940: @ 8033940 strb r4, [r0, 0x2] adds r5, r0, 0 cmp r4, 0 - beq _0803396C + beq @0803396C adds r1, r5, 0x3 adds r2, r4, 0 -_0803395E: +@0803395E: ldrb r0, [r3] strb r0, [r1] adds r3, 0x1 adds r1, 0x1 subs r2, 0x1 cmp r2, 0 - bne _0803395E -_0803396C: + bne @0803395E +@0803396C: adds r2, r4, 0x3 adds r0, r6, 0 adds r1, r5, 0 @@ -85852,7 +85852,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 @@ -85870,7 +85870,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 @@ -85891,7 +85891,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 @@ -85909,7 +85909,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 @@ -85928,7 +85928,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 @@ -85947,7 +85947,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 @@ -85966,7 +85966,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 @@ -85985,7 +85985,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 @@ -86004,7 +86004,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 @@ -86023,7 +86023,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 @@ -86041,7 +86041,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 @@ -86055,18 +86055,18 @@ sub_8033AC4: @ 8033AC4 adds r0, r4 adds r5, r1, 0 cmp r0, 0 - beq _08033AF2 + beq @08033AF2 adds r1, r5, 0x2 adds r3, r0, 0 -_08033AE4: +@08033AE4: ldrb r0, [r2] strb r0, [r1] adds r2, 0x1 adds r1, 0x1 subs r3, 0x1 cmp r3, 0 - bne _08033AE4 -_08033AF2: + bne @08033AE4 +@08033AF2: lsls r2, r4, 1 adds r2, r4 adds r2, 0x2 @@ -86081,7 +86081,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 @@ -86137,7 +86137,7 @@ dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes: @ 8033B0C lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _08033BAC + bne @08033BAC str r0, [sp] movs r0, 0xE movs r1, 0 @@ -86146,7 +86146,7 @@ dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes: @ 8033B0C bl ability_something lsls r0, 24 cmp r0, 0 - bne _08033BAC + bne @08033BAC ldr r0, =0x020243cc ldrh r0, [r0] strb r0, [r7, 0xC] @@ -86154,16 +86154,16 @@ dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes: @ 8033B0C lsrs r0, r6, 8 strb r0, [r7, 0xD] adds r4, r7, 0 - b _08033BB6 + b @08033BB6 .align 2, 0 .pool -_08033BAC: +@08033BAC: ldr r0, =0x02022d10 movs r1, 0 strb r1, [r0, 0xC] strb r1, [r0, 0xD] adds r4, r0, 0 -_08033BB6: +@08033BB6: movs r0, 0 strb r0, [r4, 0xE] strb r0, [r4, 0xF] @@ -86188,7 +86188,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 @@ -86256,14 +86256,14 @@ dp01_build_cmdbuf_x10_TODO: @ 8033BE4 ldr r0, =0x02024084 adds r4, r0, 0 adds r4, 0x20 -_08033C6A: +@08033C6A: adds r1, r2, r3 ldrb r0, [r4] strb r0, [r1] adds r4, 0x58 adds r3, 0x1 cmp r3, 0x3 - ble _08033C6A + ble @08033C6A movs r3, 0 mov r5, r12 adds r5, 0x10 @@ -86272,7 +86272,7 @@ _08033C6A: ldr r6, =0x02022f68 mov r2, r12 adds r2, 0x30 -_08033C88: +@08033C88: adds r1, r5, r3 ldr r7, =0x02022f58 adds r0, r3, r7 @@ -86289,7 +86289,7 @@ _08033C88: strb r0, [r1] adds r3, 0x1 cmp r3, 0xF - ble _08033C88 + ble @08033C88 mov r0, r10 mov r1, r9 movs r2, 0x44 @@ -86306,7 +86306,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 @@ -86356,14 +86356,14 @@ dp01_build_cmdbuf_x11_TODO: @ 8033CFC ldr r0, =0x02024084 adds r2, r0, 0 adds r2, 0x20 -_08033D5E: +@08033D5E: adds r1, r4, r3 ldrb r0, [r2] strb r0, [r1] adds r2, 0x58 adds r3, 0x1 cmp r3, 0x3 - ble _08033D5E + ble @08033D5E movs r3, 0 mov r5, r12 adds r5, 0x10 @@ -86372,7 +86372,7 @@ _08033D5E: ldr r6, =0x02022f68 mov r2, r12 adds r2, 0x30 -_08033D7C: +@08033D7C: adds r1, r5, r3 ldr r7, =0x02022f58 adds r0, r3, r7 @@ -86389,7 +86389,7 @@ _08033D7C: strb r0, [r1] adds r3, 0x1 cmp r3, 0xF - ble _08033D7C + ble @08033D7C mov r0, r10 mov r1, r9 movs r2, 0x44 @@ -86406,7 +86406,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 @@ -86430,7 +86430,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 @@ -86449,7 +86449,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 @@ -86464,14 +86464,14 @@ sub_8033E30: @ 8033E30 movs r2, 0 adds r1, r3, 0 adds r4, r1, 0x4 -_08033E4C: +@08033E4C: adds r0, r5, r2 ldrb r0, [r0] strb r0, [r4] adds r4, 0x1 adds r2, 0x1 cmp r2, 0x13 - bls _08033E4C + bls @08033E4C adds r0, r6, 0 movs r2, 0x18 bl dp01_prepare_buffer @@ -86483,7 +86483,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 @@ -86493,14 +86493,14 @@ sub_8033E6C: @ 8033E6C strb r0, [r1] movs r2, 0 adds r3, r1, 0x1 -_08033E7E: +@08033E7E: adds r0, r4, r2 ldrb r0, [r0] strb r0, [r3] adds r3, 0x1 adds r2, 0x1 cmp r2, 0x2 - ble _08033E7E + ble @08033E7E adds r0, r5, 0 movs r2, 0x4 bl dp01_prepare_buffer @@ -86512,7 +86512,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 @@ -86526,14 +86526,14 @@ dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f: @ 8033EA0 movs r2, 0 adds r1, r4, 0 adds r3, r1, 0x4 -_08033EBA: +@08033EBA: adds r0, r6, r2 ldrb r0, [r0] strb r0, [r3] adds r3, 0x1 adds r2, 0x1 cmp r2, 0x2 - ble _08033EBA + ble @08033EBA adds r0, r5, 0 movs r2, 0x8 bl dp01_prepare_buffer @@ -86545,7 +86545,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 @@ -86564,7 +86564,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 @@ -86594,7 +86594,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 @@ -86623,7 +86623,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 @@ -86667,7 +86667,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 @@ -86699,7 +86699,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 @@ -86717,7 +86717,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 @@ -86732,18 +86732,18 @@ dp01_build_cmdbuf_x1D_1D_numargs_varargs: @ 8034018 strb r0, [r1, 0x3] adds r5, r1, 0 cmp r4, 0 - beq _08034048 + beq @08034048 adds r1, r5, 0x4 adds r3, r4, 0 -_0803403A: +@0803403A: ldrb r0, [r2] strb r0, [r1] adds r2, 0x1 adds r1, 0x1 subs r3, 0x1 cmp r3, 0 - bne _0803403A -_08034048: + bne @0803403A +@08034048: adds r2, r4, 0x4 lsls r2, 16 lsrs r2, 16 @@ -86758,7 +86758,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 @@ -86789,18 +86789,18 @@ sub_8034060: @ 8034060 strb r0, [r2, 0x6] adds r1, r2, 0 cmp r5, 0 - beq _080340B0 + beq @080340B0 adds r3, r1, 0x7 adds r2, r5, 0 -_080340A2: +@080340A2: ldrb r0, [r4] strb r0, [r3] adds r4, 0x1 adds r3, 0x1 subs r2, 0x1 cmp r2, 0 - bne _080340A2 -_080340B0: + bne @080340A2 +@080340B0: adds r2, r5, 0x7 lsls r2, 16 lsrs r2, 16 @@ -86814,7 +86814,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 @@ -86828,18 +86828,18 @@ sub_80340C8: @ 80340C8 strb r0, [r1, 0x2] adds r5, r1, 0 cmp r4, 0 - beq _080340F6 + beq @080340F6 adds r1, r5, 0x3 adds r3, r4, 0 -_080340E8: +@080340E8: ldrb r0, [r2] strb r0, [r1] adds r2, 0x1 adds r1, 0x1 subs r3, 0x1 cmp r3, 0 - bne _080340E8 -_080340F6: + bne @080340E8 +@080340F6: adds r2, r4, 0x3 lsls r2, 16 lsrs r2, 16 @@ -86854,7 +86854,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 @@ -86868,18 +86868,18 @@ sub_8034110: @ 8034110 strb r0, [r1, 0x2] adds r5, r1, 0 cmp r4, 0 - beq _0803413E + beq @0803413E adds r1, r5, 0x3 adds r3, r4, 0 -_08034130: +@08034130: ldrb r0, [r2] strb r0, [r1] adds r2, 0x1 adds r1, 0x1 subs r3, 0x1 cmp r3, 0 - bne _08034130 -_0803413E: + bne @08034130 +@0803413E: adds r2, r4, 0x3 lsls r2, 16 lsrs r2, 16 @@ -86894,7 +86894,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 @@ -86918,7 +86918,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 @@ -86929,14 +86929,14 @@ dp01_build_cmdbuf_x22_a_three_bytes: @ 8034184 strb r1, [r2, 0x1] movs r3, 0 adds r1, r2, 0x2 -_08034198: +@08034198: adds r0, r4, r3 ldrb r0, [r0] strb r0, [r1] adds r1, 0x1 adds r3, 0x1 cmp r3, 0x2 - ble _08034198 + ble @08034198 adds r0, r5, 0 adds r1, r2, 0 movs r2, 0x5 @@ -86949,7 +86949,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 @@ -86974,7 +86974,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 @@ -86999,7 +86999,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 @@ -87018,7 +87018,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 @@ -87036,7 +87036,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 @@ -87055,7 +87055,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 @@ -87074,7 +87074,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 @@ -87093,7 +87093,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 @@ -87112,7 +87112,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 @@ -87137,7 +87137,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 @@ -87161,7 +87161,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 @@ -87180,7 +87180,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 @@ -87198,7 +87198,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 @@ -87217,7 +87217,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 @@ -87238,14 +87238,14 @@ dp01_build_cmdbuf_x30_TODO: @ 803438C strb r3, [r1, 0x3] movs r2, 0 adds r3, r1, 0x4 -_080343B4: +@080343B4: adds r0, r4, r2 ldrb r0, [r0] strb r0, [r3] adds r3, 0x1 adds r2, 0x1 cmp r2, 0x2F - ble _080343B4 + ble @080343B4 adds r0, r5, 0 movs r2, 0x34 bl dp01_prepare_buffer @@ -87257,7 +87257,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 @@ -87276,7 +87276,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 @@ -87295,7 +87295,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 @@ -87315,7 +87315,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 @@ -87339,7 +87339,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 @@ -87350,18 +87350,18 @@ sub_8034464: @ 8034464 strb r0, [r4] strb r1, [r4, 0x1] cmp r2, 0 - beq _0803448C + beq @0803448C adds r0, r4, 0x4 bl sub_81850DC strb r0, [r4, 0x2] strb r0, [r4, 0x3] - b _08034490 + b @08034490 .align 2, 0 .pool -_0803448C: +@0803448C: strb r2, [r4, 0x2] strb r2, [r4, 0x3] -_08034490: +@08034490: ldr r1, =0x02022d10 ldrb r2, [r1, 0x2] adds r2, 0x4 @@ -87375,7 +87375,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 @@ -87393,7 +87393,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 @@ -87431,8 +87431,8 @@ dp01_build_cmdbuf_x37_a: @ 80344C8 thumb_func_end dp01_build_cmdbuf_x37_a thumb_func_start call_LZZUnCompWram -@ void call_LZZUnCompWram(void *src, void *dest) -call_LZZUnCompWram: @ 8034518 +; void call_LZZUnCompWram(void *src, void *dest) +call_LZZUnCompWram: ; 8034518 push {lr} bl LZ77UnCompWram pop {r0} @@ -87440,8 +87440,8 @@ call_LZZUnCompWram: @ 8034518 thumb_func_end call_LZZUnCompWram thumb_func_start call_LZZUnCompVram -@ void call_LZZUnCompVram(void *src, void *dest) -call_LZZUnCompVram: @ 8034524 +; void call_LZZUnCompVram(void *src, void *dest) +call_LZZUnCompVram: ; 8034524 push {lr} bl LZ77UnCompVram pop {r0} @@ -87449,8 +87449,8 @@ call_LZZUnCompVram: @ 8034524 thumb_func_end call_LZZUnCompVram thumb_func_start gpu_tile_obj_decompress_and_load -@ u16 gpu_tile_obj_decompress_and_load(struct rom_obj_tile_data *x) -gpu_tile_obj_decompress_and_load: @ 8034530 +; u16 gpu_tile_obj_decompress_and_load(struct rom_obj_tile_data *x) +gpu_tile_obj_decompress_and_load: ; 8034530 push {r4,r5,lr} sub sp, 0x8 adds r4, r0, 0 @@ -87477,8 +87477,8 @@ gpu_tile_obj_decompress_and_load: @ 8034530 thumb_func_end gpu_tile_obj_decompress_and_load thumb_func_start gpu_tile_obj_decompress_and_load2 -@ void gpu_tile_obj_decompress_and_load2(struct rom_obj_tile_data *x, void *dest) -gpu_tile_obj_decompress_and_load2: @ 8034564 +; void gpu_tile_obj_decompress_and_load2(struct rom_obj_tile_data *x, void *dest) +gpu_tile_obj_decompress_and_load2: ; 8034564 push {r4,r5,lr} sub sp, 0x8 adds r4, r0, 0 @@ -87500,8 +87500,8 @@ gpu_tile_obj_decompress_and_load2: @ 8034564 thumb_func_end gpu_tile_obj_decompress_and_load2 thumb_func_start gpu_pal_obj_decompress_and_apply -@ void gpu_pal_obj_decompress_and_apply(struct rom_obj_pal_data *x) -gpu_pal_obj_decompress_and_apply: @ 803458C +; void gpu_pal_obj_decompress_and_apply(struct rom_obj_pal_data *x) +gpu_pal_obj_decompress_and_apply: ; 803458C push {r4,r5,lr} sub sp, 0x8 adds r5, r0, 0 @@ -87527,8 +87527,8 @@ gpu_pal_obj_decompress_and_apply: @ 803458C thumb_func_end gpu_pal_obj_decompress_and_apply thumb_func_start gpu_pal_obj_decompress_and_apply2 -@ void gpu_pal_obj_decompress_and_apply2(struct rom_obj_pal_data *x, void *dest) -gpu_pal_obj_decompress_and_apply2: @ 80345C0 +; void gpu_pal_obj_decompress_and_apply2(struct rom_obj_pal_data *x, void *dest) +gpu_pal_obj_decompress_and_apply2: ; 80345C0 push {r4,r5,lr} sub sp, 0x8 adds r5, r0, 0 @@ -87553,8 +87553,8 @@ gpu_pal_obj_decompress_and_apply2: @ 80345C0 thumb_func_end gpu_pal_obj_decompress_and_apply2 thumb_func_start sub_80345F0 -@ void sub_80345F0(void **a1, void *a2, int species_num) -sub_80345F0: @ 80345F0 +; void sub_80345F0(void **a1, void *a2, int species_num) +sub_80345F0: ; 80345F0 push {r4,r5,lr} adds r3, r0, 0 adds r4, r1, 0 @@ -87562,18 +87562,18 @@ sub_80345F0: @ 80345F0 movs r0, 0xCE lsls r0, 1 cmp r5, r0 - ble _08034610 + ble @08034610 ldr r0, =0x0830a18c ldr r0, [r0] bl LZ77UnCompWram - b _08034618 + b @08034618 .align 2, 0 .pool -_08034610: +@08034610: ldr r0, [r3] adds r1, r4, 0 bl LZ77UnCompWram -_08034618: +@08034618: adds r0, r4, 0 adds r1, r5, 0 bl duplicate_deoxys_graphics_data @@ -87583,8 +87583,8 @@ _08034618: thumb_func_end sub_80345F0 thumb_func_start sub_8034628 -@ void sub_8034628(int *a1, void *a2, int species_num, int a4) -sub_8034628: @ 8034628 +; void sub_8034628(int *a1, void *a2, int species_num, int a4) +sub_8034628: ; 8034628 push {r4,r5,lr} sub sp, 0x4 adds r4, r0, 0 @@ -87594,9 +87594,9 @@ sub_8034628: @ 8034628 adds r0, r1 movs r1, 0 cmp r4, r0 - bne _0803463E + bne @0803463E movs r1, 0x1 -_0803463E: +@0803463E: str r1, [sp] adds r0, r4, 0 adds r1, r5, 0 @@ -87610,8 +87610,8 @@ _0803463E: thumb_func_end sub_8034628 thumb_func_start sub_8034654 -@ void sub_8034654(void **a1, void *a2, int species_num, unsigned int a4, u8 a5) -sub_8034654: @ 8034654 +; void sub_8034654(void **a1, void *a2, int species_num, unsigned int a4, u8 a5) +sub_8034654: ; 8034654 push {r4-r7,lr} mov r7, r8 push {r7} @@ -87624,7 +87624,7 @@ sub_8034654: @ 8034654 lsrs r0, 24 mov r8, r0 cmp r7, 0xC9 - bne _080346D0 + bne @080346D0 movs r0, 0xC0 lsls r0, 18 ands r0, r5 @@ -87647,52 +87647,52 @@ sub_8034654: @ 8034654 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - bne _080346A2 + bne @080346A2 movs r1, 0xC9 - b _080346AC -_080346A2: + b @080346AC +@080346A2: movs r2, 0xCE lsls r2, 1 adds r0, r1, r2 lsls r0, 16 lsrs r1, r0, 16 -_080346AC: +@080346AC: mov r0, r8 cmp r0, 0 - bne _080346C0 + bne @080346C0 ldr r0, =0x083028b8 lsls r1, 3 adds r1, r0 ldr r0, [r1] - b _080346DC + b @080346DC .align 2, 0 .pool -_080346C0: +@080346C0: ldr r0, =0x0830a18c lsls r1, 3 adds r1, r0 ldr r0, [r1] - b _080346DC + b @080346DC .align 2, 0 .pool -_080346D0: +@080346D0: movs r0, 0xCE lsls r0, 1 cmp r7, r0 - ble _080346E8 + ble @080346E8 ldr r0, =0x0830a18c ldr r0, [r0] -_080346DC: +@080346DC: adds r1, r4, 0 bl LZ77UnCompWram - b _080346F0 + b @080346F0 .align 2, 0 .pool -_080346E8: +@080346E8: ldr r0, [r6] adds r1, r4, 0 bl LZ77UnCompWram -_080346F0: +@080346F0: adds r0, r4, 0 adds r1, r7, 0 bl duplicate_deoxys_graphics_data @@ -87710,7 +87710,7 @@ _080346F0: thumb_func_end sub_8034654 thumb_func_start sub_8034710 -sub_8034710: @ 8034710 +sub_8034710: ; 8034710 push {lr} ldr r0, [r0] bl LZ77UnCompWram @@ -87719,7 +87719,7 @@ sub_8034710: @ 8034710 thumb_func_end sub_8034710 thumb_func_start sub_803471C -sub_803471C: @ 803471C +sub_803471C: ; 803471C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -87734,9 +87734,9 @@ sub_803471C: @ 803471C mov r1, r9 ands r0, r1 cmp r0, 0 - bne _0803473C - b _080348D4 -_0803473C: + bne @0803473C + b @080348D4 +@0803473C: asrs r0, r1, 1 adds r0, 0x4 lsls r0, 24 @@ -87745,19 +87745,19 @@ _0803473C: movs r0, 0 ldr r2, [sp] cmp r0, r2 - blt _08034750 - b _08034964 -_08034750: + blt @08034750 + b @08034964 +@08034750: movs r4, 0x8 subs r1, r4, r1 str r1, [sp, 0x10] -_08034756: +@08034756: movs r7, 0 adds r0, 0x1 str r0, [sp, 0x14] ldr r0, [sp, 0x10] cmp r7, r0 - bge _080347D2 + bge @080347D2 ldr r1, [sp, 0x8] lsls r1, 8 str r1, [sp, 0x18] @@ -87767,7 +87767,7 @@ _08034756: movs r4, 0x8 subs r0, r4, r0 str r0, [sp, 0xC] -_08034774: +@08034774: movs r3, 0 asrs r0, r7, 1 adds r1, r7, 0 @@ -87777,7 +87777,7 @@ _08034774: lsls r0, 8 mov r8, r0 mov r12, r5 -_08034786: +@08034786: lsls r1, r3, 5 ldr r4, [sp, 0x18] adds r0, r5, r4 @@ -87787,16 +87787,16 @@ _08034786: mov r1, r12 add r1, r8 movs r6, 0xF -_08034798: +@08034798: ldr r4, [sp, 0x20] cmp r4, 0 - bne _080347A8 + bne @080347A8 strb r4, [r1] add r4, sp, 0x20 ldrb r4, [r4] strb r4, [r2, 0x10] - b _080347B6 -_080347A8: + b @080347B6 +@080347A8: mov r0, r10 strb r0, [r1, 0x10] movs r4, 0x80 @@ -87804,30 +87804,30 @@ _080347A8: adds r4, r2, r4 str r4, [sp, 0x1C] strb r0, [r4] -_080347B6: +@080347B6: adds r2, 0x1 adds r1, 0x1 subs r6, 0x1 cmp r6, 0 - bge _08034798 + bge @08034798 movs r0, 0x20 add r12, r0 adds r3, 0x1 cmp r3, 0x7 - ble _08034786 + ble @08034786 adds r7, 0x1 ldr r1, [sp, 0xC] cmp r7, r1 - blt _08034774 -_080347D2: + blt @08034774 +@080347D2: movs r7, 0 movs r2, 0 -_080347D6: +@080347D6: movs r6, 0 adds r4, r7, 0x1 mov r8, r4 lsls r4, r7, 5 -_080347DE: +@080347DE: adds r0, r6, 0x1 mov r10, r0 lsls r1, r6, 8 @@ -87838,37 +87838,37 @@ _080347DE: adds r1, r5, r1 adds r1, r4 movs r3, 0x1F -_080347F2: +@080347F2: strb r2, [r1] strb r2, [r0] adds r0, 0x1 adds r1, 0x1 subs r3, 0x1 cmp r3, 0 - bge _080347F2 + bge @080347F2 mov r6, r10 cmp r6, 0x7 - ble _080347DE + ble @080347DE mov r7, r8 cmp r7, 0x1 - ble _080347D6 + ble @080347D6 mov r1, r9 cmp r1, 0x5 - bne _08034818 + bne @08034818 movs r2, 0x90 lsls r2, 1 adds r5, r2 -_08034818: +@08034818: movs r7, 0 cmp r7, r9 - bge _080348AE -_0803481E: + bge @080348AE +@0803481E: movs r3, 0 adds r7, 0x1 mov r8, r7 cmp r3, r9 - bge _0803488E -_08034828: + bge @0803488E +@08034828: adds r3, 0x1 mov r10, r3 ldr r4, [sp, 0x4] @@ -87881,7 +87881,7 @@ _08034828: ldr r2, [sp, 0x4] adds r3, r5, 0 movs r6, 0x3 -_08034840: +@08034840: ldrb r0, [r2] mov r1, r12 strb r0, [r1] @@ -87915,96 +87915,96 @@ _08034840: adds r3, 0x4 subs r6, 0x1 cmp r6, 0 - bge _08034840 + bge @08034840 str r4, [sp, 0x4] adds r5, r7, 0 mov r3, r10 cmp r3, r9 - blt _08034828 -_0803488E: + blt @08034828 +@0803488E: mov r2, r9 cmp r2, 0x7 - bne _080348A0 + bne @080348A0 adds r5, 0x20 - b _080348A8 + b @080348A8 .align 2, 0 .pool -_080348A0: +@080348A0: mov r4, r9 cmp r4, 0x5 - bne _080348A8 + bne @080348A8 adds r5, 0x60 -_080348A8: +@080348A8: mov r7, r8 cmp r7, r9 - blt _0803481E -_080348AE: + blt @0803481E +@080348AE: mov r0, r9 cmp r0, 0x7 - bne _080348BC + bne @080348BC movs r1, 0x80 lsls r1, 1 adds r5, r1 - b _080348C8 -_080348BC: + b @080348C8 +@080348BC: mov r2, r9 cmp r2, 0x5 - bne _080348C8 + bne @080348C8 movs r4, 0xF0 lsls r4, 1 adds r5, r4 -_080348C8: +@080348C8: ldr r0, [sp, 0x14] ldr r1, [sp] cmp r0, r1 - bge _080348D2 - b _08034756 -_080348D2: - b _08034964 -_080348D4: + bge @080348D2 + b @08034756 +@080348D2: + b @08034964 +@080348D4: movs r6, 0 ldr r2, [sp] cmp r6, r2 - bge _08034964 -_080348DC: + bge @08034964 +@080348DC: adds r6, 0x1 mov r10, r6 mov r4, r9 cmp r4, 0x6 - bne _080348F4 + bne @080348F4 movs r0, 0 movs r3, 0xFF -_080348EA: +@080348EA: strb r0, [r5] adds r5, 0x1 subs r3, 0x1 cmp r3, 0 - bge _080348EA -_080348F4: + bge @080348EA +@080348F4: movs r7, 0 cmp r7, r9 - bge _08034948 -_080348FA: + bge @08034948 +@080348FA: adds r7, 0x1 mov r8, r7 mov r1, r9 lsls r0, r1, 5 cmp r1, 0x6 - bne _08034914 + bne @08034914 movs r1, 0 movs r3, 0x1F -_0803490A: +@0803490A: strb r1, [r5] adds r5, 0x1 subs r3, 0x1 cmp r3, 0 - bge _0803490A -_08034914: + bge @0803490A +@08034914: adds r1, r0, 0 cmp r1, 0 - ble _0803492E + ble @0803492E adds r3, r1, 0 -_0803491C: +@0803491C: ldr r2, [sp, 0x4] ldrb r0, [r2] strb r0, [r5] @@ -88013,41 +88013,41 @@ _0803491C: adds r5, 0x1 subs r3, 0x1 cmp r3, 0 - bne _0803491C -_0803492E: + bne @0803491C +@0803492E: mov r4, r9 cmp r4, 0x6 - bne _08034942 + bne @08034942 movs r0, 0 movs r3, 0x1F -_08034938: +@08034938: strb r0, [r5] adds r5, 0x1 subs r3, 0x1 cmp r3, 0 - bge _08034938 -_08034942: + bge @08034938 +@08034942: mov r7, r8 cmp r7, r9 - blt _080348FA -_08034948: + blt @080348FA +@08034948: mov r0, r9 cmp r0, 0x6 - bne _0803495C + bne @0803495C movs r0, 0 movs r3, 0xFF -_08034952: +@08034952: strb r0, [r5] adds r5, 0x1 subs r3, 0x1 cmp r3, 0 - bge _08034952 -_0803495C: + bge @08034952 +@0803495C: mov r6, r10 ldr r1, [sp] cmp r6, r1 - blt _080348DC -_08034964: + blt @080348DC +@08034964: add sp, 0x24 pop {r3-r5} mov r8, r3 @@ -88059,7 +88059,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 @@ -88072,8 +88072,8 @@ sub_8034974: @ 8034974 thumb_func_end sub_8034974 thumb_func_start gpu_tile_obj_decompress_and_load3 -@ u16 gpu_tile_obj_decompress_and_load3(struct rom_obj_tile_data *x) -gpu_tile_obj_decompress_and_load3: @ 8034988 +; u16 gpu_tile_obj_decompress_and_load3(struct rom_obj_tile_data *x) +gpu_tile_obj_decompress_and_load3: ; 8034988 push {r4,r5,lr} sub sp, 0x8 adds r4, r0, 0 @@ -88103,8 +88103,8 @@ gpu_tile_obj_decompress_and_load3: @ 8034988 thumb_func_end gpu_tile_obj_decompress_and_load3 thumb_func_start gpu_pal_obj_decompress_and_apply3 -@ int gpu_pal_obj_decompress_and_apply3(struct rom_obj_pal_data *x) -gpu_pal_obj_decompress_and_apply3: @ 80349C4 +; int gpu_pal_obj_decompress_and_apply3(struct rom_obj_pal_data *x) +gpu_pal_obj_decompress_and_apply3: ; 80349C4 push {r4,r5,lr} sub sp, 0x8 adds r4, r0, 0 @@ -88137,8 +88137,8 @@ gpu_pal_obj_decompress_and_apply3: @ 80349C4 thumb_func_end gpu_pal_obj_decompress_and_apply3 thumb_func_start LZ77UnCompAnyRam -@ void LZ77UnCompAnyRam(void **a1, void *a2, int species_num) -LZ77UnCompAnyRam: @ 8034A08 +; void LZ77UnCompAnyRam(void **a1, void *a2, int species_num) +LZ77UnCompAnyRam: ; 8034A08 push {r4,r5,lr} adds r3, r0, 0 adds r4, r1, 0 @@ -88146,18 +88146,18 @@ LZ77UnCompAnyRam: @ 8034A08 movs r0, 0xCE lsls r0, 1 cmp r5, r0 - ble _08034A28 + ble @08034A28 ldr r0, =0x0830a18c ldr r0, [r0] bl LZ77UnCompWram - b _08034A30 + b @08034A30 .align 2, 0 .pool -_08034A28: +@08034A28: ldr r0, [r3] adds r1, r4, 0 bl LZ77UnCompWram -_08034A30: +@08034A30: adds r0, r4, 0 adds r1, r5, 0 bl duplicate_deoxys_graphics_data @@ -88167,8 +88167,8 @@ _08034A30: thumb_func_end LZ77UnCompAnyRam thumb_func_start load_poke_gfx_probably -@ void load_poke_gfx_probably(void **a1, void *a2, int species_num, int a4, u8 a5) -load_poke_gfx_probably: @ 8034A40 +; void load_poke_gfx_probably(void **a1, void *a2, int species_num, int a4, u8 a5) +load_poke_gfx_probably: ; 8034A40 push {r4-r7,lr} mov r7, r8 push {r7} @@ -88181,7 +88181,7 @@ load_poke_gfx_probably: @ 8034A40 lsrs r0, 24 mov r8, r0 cmp r7, 0xC9 - bne _08034ABC + bne @08034ABC movs r0, 0xC0 lsls r0, 18 ands r0, r5 @@ -88204,52 +88204,52 @@ load_poke_gfx_probably: @ 8034A40 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - bne _08034A8E + bne @08034A8E movs r1, 0xC9 - b _08034A98 -_08034A8E: + b @08034A98 +@08034A8E: movs r2, 0xCE lsls r2, 1 adds r0, r1, r2 lsls r0, 16 lsrs r1, r0, 16 -_08034A98: +@08034A98: mov r0, r8 cmp r0, 0 - bne _08034AAC + bne @08034AAC ldr r0, =0x083028b8 lsls r1, 3 adds r1, r0 ldr r0, [r1] - b _08034AC8 + b @08034AC8 .align 2, 0 .pool -_08034AAC: +@08034AAC: ldr r0, =0x0830a18c lsls r1, 3 adds r1, r0 ldr r0, [r1] - b _08034AC8 + b @08034AC8 .align 2, 0 .pool -_08034ABC: +@08034ABC: movs r0, 0xCE lsls r0, 1 cmp r7, r0 - ble _08034AD4 + ble @08034AD4 ldr r0, =0x0830a18c ldr r0, [r0] -_08034AC8: +@08034AC8: adds r1, r4, 0 bl LZ77UnCompWram - b _08034ADC + b @08034ADC .align 2, 0 .pool -_08034AD4: +@08034AD4: ldr r0, [r6] adds r1, r4, 0 bl LZ77UnCompWram -_08034ADC: +@08034ADC: adds r0, r4, 0 adds r1, r7, 0 bl duplicate_deoxys_graphics_data @@ -88267,8 +88267,8 @@ _08034ADC: thumb_func_end load_poke_gfx_probably thumb_func_start help_system_enable_unless_flashback__sp199 -@ void help_system_enable_unless_flashback__sp199(int *a1, void *a2, int species_num, int a4) -help_system_enable_unless_flashback__sp199: @ 8034AFC +; void help_system_enable_unless_flashback__sp199(int *a1, void *a2, int species_num, int a4) +help_system_enable_unless_flashback__sp199: ; 8034AFC push {r4,r5,lr} sub sp, 0x4 adds r4, r0, 0 @@ -88278,9 +88278,9 @@ help_system_enable_unless_flashback__sp199: @ 8034AFC adds r0, r1 movs r1, 0 cmp r4, r0 - bne _08034B12 + bne @08034B12 movs r1, 0x1 -_08034B12: +@08034B12: str r1, [sp] adds r0, r4, 0 adds r1, r5, 0 @@ -88294,31 +88294,31 @@ _08034B12: thumb_func_end help_system_enable_unless_flashback__sp199 thumb_func_start sub_8034B28 -@ void sub_8034B28(void **a1, void *a2, int species_num) -sub_8034B28: @ 8034B28 +; void sub_8034B28(void **a1, void *a2, int species_num) +sub_8034B28: ; 8034B28 push {lr} adds r3, r0, 0 movs r0, 0xCE lsls r0, 1 cmp r2, r0 - ble _08034B44 + ble @08034B44 ldr r0, =0x0830a18c ldr r0, [r0] bl LZ77UnCompWram - b _08034B4A + b @08034B4A .align 2, 0 .pool -_08034B44: +@08034B44: ldr r0, [r3] bl LZ77UnCompWram -_08034B4A: +@08034B4A: pop {r0} bx r0 thumb_func_end sub_8034B28 thumb_func_start sub_8034B50 -@ void sub_8034B50(int a1, int a2) -sub_8034B50: @ 8034B50 +; void sub_8034B50(int a1, int a2) +sub_8034B50: ; 8034B50 push {r4,r5,lr} sub sp, 0x4 adds r4, r0, 0 @@ -88328,9 +88328,9 @@ sub_8034B50: @ 8034B50 adds r0, r1 movs r1, 0 cmp r4, r0 - bne _08034B66 + bne @08034B66 movs r1, 0x1 -_08034B66: +@08034B66: str r1, [sp] adds r0, r4, 0 adds r1, r5, 0 @@ -88344,8 +88344,8 @@ _08034B66: thumb_func_end sub_8034B50 thumb_func_start sub_8034B7C -@ void sub_8034B7C(void **a1, void *a2, int species_num, int a4, u8 a5) -sub_8034B7C: @ 8034B7C +; void sub_8034B7C(void **a1, void *a2, int species_num, int a4, u8 a5) +sub_8034B7C: ; 8034B7C push {r4-r7,lr} mov r7, r8 push {r7} @@ -88358,7 +88358,7 @@ sub_8034B7C: @ 8034B7C lsrs r0, 24 mov r8, r0 cmp r7, 0xC9 - bne _08034BF8 + bne @08034BF8 movs r0, 0xC0 lsls r0, 18 ands r0, r4 @@ -88381,52 +88381,52 @@ sub_8034B7C: @ 8034B7C lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - bne _08034BCA + bne @08034BCA movs r1, 0xC9 - b _08034BD4 -_08034BCA: + b @08034BD4 +@08034BCA: movs r2, 0xCE lsls r2, 1 adds r0, r1, r2 lsls r0, 16 lsrs r1, r0, 16 -_08034BD4: +@08034BD4: mov r0, r8 cmp r0, 0 - bne _08034BE8 + bne @08034BE8 ldr r0, =0x083028b8 lsls r1, 3 adds r1, r0 ldr r0, [r1] - b _08034C04 + b @08034C04 .align 2, 0 .pool -_08034BE8: +@08034BE8: ldr r0, =0x0830a18c lsls r1, 3 adds r1, r0 ldr r0, [r1] - b _08034C04 + b @08034C04 .align 2, 0 .pool -_08034BF8: +@08034BF8: movs r0, 0xCE lsls r0, 1 cmp r7, r0 - ble _08034C10 + ble @08034C10 ldr r0, =0x0830a18c ldr r0, [r0] -_08034C04: +@08034C04: adds r1, r5, 0 bl LZ77UnCompWram - b _08034C18 + b @08034C18 .align 2, 0 .pool -_08034C10: +@08034C10: ldr r0, [r6] adds r1, r5, 0 bl LZ77UnCompWram -_08034C18: +@08034C18: lsls r0, r7, 16 lsrs r0, 16 adds r1, r4, 0 @@ -88441,21 +88441,21 @@ _08034C18: thumb_func_end sub_8034B7C thumb_func_start duplicate_deoxys_graphics_data -@ void duplicate_deoxys_graphics_data(int a1, int species_num) -duplicate_deoxys_graphics_data: @ 8034C30 +; void duplicate_deoxys_graphics_data(int a1, int species_num) +duplicate_deoxys_graphics_data: ; 8034C30 push {lr} adds r3, r0, 0 movs r0, 0xCD lsls r0, 1 cmp r1, r0 - bne _08034C4A + bne @08034C4A movs r1, 0x80 lsls r1, 4 adds r0, r3, r1 ldr r2, =0x04000200 adds r1, r3, 0 bl CpuSet -_08034C4A: +@08034C4A: pop {r0} bx r0 .align 2, 0 @@ -88463,25 +88463,25 @@ _08034C4A: thumb_func_end duplicate_deoxys_graphics_data thumb_func_start sub_8034C54 -sub_8034C54: @ 8034C54 +sub_8034C54: ; 8034C54 push {r4-r7,lr} adds r4, r0, 0 ldr r5, =0x02022e10 ldr r0, [r5] cmp r0, 0 - beq _08034C64 + beq @08034C64 bl sub_8034CC8 -_08034C64: +@08034C64: movs r0, 0x8 bl malloc str r0, [r5] cmp r0, 0 - bne _08034C78 + bne @08034C78 movs r0, 0 - b _08034CC0 + b @08034CC0 .align 2, 0 .pool -_08034C78: +@08034C78: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 @@ -88489,20 +88489,20 @@ _08034C78: ldr r1, [r5] str r0, [r1, 0x4] cmp r0, 0 - bne _08034C94 + bne @08034C94 adds r0, r1, 0 bl free movs r0, 0 - b _08034CC0 -_08034C94: + b @08034CC0 +@08034C94: str r4, [r1] movs r3, 0 cmp r3, r4 - bcs _08034CBE + bcs @08034CBE movs r7, 0 movs r6, 0xFF movs r2, 0 -_08034CA2: +@08034CA2: ldr r0, [r5] ldr r0, [r0, 0x4] adds r0, r2, r0 @@ -88516,50 +88516,50 @@ _08034CA2: adds r2, 0x1C adds r3, 0x1 cmp r3, r4 - bcc _08034CA2 -_08034CBE: + bcc @08034CA2 +@08034CBE: movs r0, 0x1 -_08034CC0: +@08034CC0: pop {r4-r7} pop {r1} bx r1 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] cmp r1, 0 - beq _08034D08 + beq @08034D08 ldr r0, [r1, 0x4] cmp r0, 0 - beq _08034CFC + beq @08034CFC movs r4, 0 ldr r0, [r1] cmp r4, r0 - bcs _08034CF2 + bcs @08034CF2 adds r5, r2, 0 -_08034CE2: +@08034CE2: adds r0, r4, 0 bl sub_80353DC adds r4, 0x1 ldr r0, [r5] ldr r0, [r0] cmp r4, r0 - bcc _08034CE2 -_08034CF2: + bcc @08034CE2 +@08034CF2: ldr r0, =0x02022e10 ldr r0, [r0] ldr r0, [r0, 0x4] bl free -_08034CFC: +@08034CFC: ldr r4, =0x02022e10 ldr r0, [r4] bl free movs r0, 0 str r0, [r4] -_08034D08: +@08034D08: pop {r4,r5} pop {r0} bx r0 @@ -88568,7 +88568,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 @@ -88581,7 +88581,7 @@ sub_8034D14: @ 8034D14 ldr r6, =0x02022e10 ldr r0, [r6] cmp r0, 0 - beq _08034DD4 + beq @08034DD4 ldr r1, [r0, 0x4] mov r0, r8 lsls r2, r0, 3 @@ -88591,7 +88591,7 @@ sub_8034D14: @ 8034D14 ldrb r0, [r1] mov r9, r2 cmp r0, 0 - bne _08034DD4 + bne @08034DD4 ldrb r0, [r5, 0x1] bl sub_8035518 ldr r1, [r6] @@ -88603,7 +88603,7 @@ sub_8034D14: @ 8034D14 adds r0, r4, r0 ldrb r0, [r0, 0x1] cmp r0, 0xFF - beq _08034DD4 + beq @08034DD4 ldr r0, [r5, 0x8] ldrh r0, [r0, 0x6] bl gpu_tile_obj_tag_get_range_start @@ -88617,18 +88617,18 @@ sub_8034D14: @ 8034D14 ldr r7, =0xffff0000 lsrs r0, r7, 16 cmp r1, r0 - bne _08034DE0 + bne @08034DE0 ldr r2, [r5, 0x8] ldrh r0, [r2, 0x4] adds r1, r2, 0 cmp r0, 0 - beq _08034D94 + beq @08034D94 adds r0, r1, 0 bl gpu_tile_obj_alloc_tag_and_copy_to_vram - b _08034DB4 + b @08034DB4 .align 2, 0 .pool -_08034D94: +@08034D94: ldr r0, [r2] ldr r1, [r2, 0x4] str r0, [sp] @@ -88643,7 +88643,7 @@ _08034D94: str r1, [sp, 0x4] mov r0, sp bl gpu_tile_obj_decompress_and_load -_08034DB4: +@08034DB4: ldr r1, [r6] ldr r1, [r1, 0x4] adds r1, r4, r1 @@ -88659,13 +88659,13 @@ _08034DB4: ldrh r1, [r0, 0xA] ldr r0, =0x0000ffff cmp r1, r0 - bne _08034DE0 -_08034DD4: + bne @08034DE0 +@08034DD4: movs r0, 0 - b _08034EE8 + b @08034EE8 .align 2, 0 .pool -_08034DE0: +@08034DE0: ldr r0, [r5, 0xC] ldrh r0, [r0, 0x4] bl gpu_pal_tags_index_of @@ -88683,14 +88683,14 @@ _08034DE0: adds r0, r4, r0 ldrb r0, [r0, 0x4] cmp r0, 0xFF - bne _08034E14 + bne @08034E14 ldr r0, [r5, 0xC] bl gpu_pal_obj_alloc_tag_and_apply ldr r1, [r6] ldr r1, [r1, 0x4] adds r1, r4, r1 strb r0, [r1, 0x4] -_08034E14: +@08034E14: ldr r0, [r6] ldr r1, [r0, 0x4] adds r1, r4, r1 @@ -88768,8 +88768,8 @@ _08034E14: movs r3, 0x1 ldrb r0, [r5, 0x1] cmp r3, r0 - bcs _08034ECA -_08034EB2: + bcs @08034ECA +@08034EB2: ldr r0, [r6] ldr r2, [r0, 0x4] adds r2, r4, r2 @@ -88781,8 +88781,8 @@ _08034EB2: adds r3, 0x1 ldrb r2, [r5, 0x1] cmp r3, r2 - bcc _08034EB2 -_08034ECA: + bcc @08034EB2 +@08034ECA: ldr r0, =0x02022e10 ldr r0, [r0] mov r3, r9 @@ -88796,7 +88796,7 @@ _08034ECA: mov r1, r10 bl sub_8035044 movs r0, 0x1 -_08034EE8: +@08034EE8: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -88810,7 +88810,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 @@ -88841,13 +88841,13 @@ sub_8034EFC: @ 8034EFC movs r6, 0 ldrb r5, [r4, 0x1] cmp r6, r8 - bcs _08034FCE + bcs @08034FCE movs r1, 0x3F mov r10, r1 movs r2, 0xD negs r2, r2 mov r9, r2 -_08034F46: +@08034F46: lsls r0, r5, 3 ldr r1, =0x030022c0 adds r3, r0, r1 @@ -88915,8 +88915,8 @@ _08034F46: adds r6, 0x1 adds r5, 0x1 cmp r6, r8 - bcc _08034F46 -_08034FCE: + bcc @08034F46 +@08034FCE: subs r5, 0x1 ldr r0, =0x030022c0 lsls r3, r5, 3 @@ -88969,7 +88969,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 @@ -88977,7 +88977,7 @@ sub_8035044: @ 8035044 ldr r1, [r0] adds r6, r0, 0 cmp r1, 0 - beq _080350A8 + beq @080350A8 ldr r2, [r1, 0x4] lsls r1, r3, 3 subs r0, r1, r3 @@ -88986,18 +88986,18 @@ sub_8035044: @ 8035044 ldrb r0, [r2] adds r5, r1, 0 cmp r0, 0 - beq _080350A8 + beq @080350A8 str r4, [r2, 0x18] cmp r4, 0 - bge _08035078 + bge @08035078 movs r2, 0x1 negs r4, r4 - b _0803507A + b @0803507A .align 2, 0 .pool -_08035078: +@08035078: movs r2, 0 -_0803507A: +@0803507A: ldr r0, [r6] ldr r1, [r0, 0x4] subs r0, r5, r3 @@ -89005,30 +89005,30 @@ _0803507A: adds r0, r1 ldrb r3, [r0, 0x2] cmp r3, 0x1 - beq _0803509A + beq @0803509A cmp r3, 0x1 - ble _08035092 + ble @08035092 cmp r3, 0x2 - beq _080350A2 -_08035092: + beq @080350A2 +@08035092: adds r1, r4, 0 bl sub_80350B0 - b _080350A8 -_0803509A: + b @080350A8 +@0803509A: adds r1, r4, 0 bl sub_8035164 - b _080350A8 -_080350A2: + b @080350A8 +@080350A2: adds r1, r4, 0 bl sub_80352C0 -_080350A8: +@080350A8: pop {r4-r6} pop {r0} bx r0 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 @@ -89043,12 +89043,12 @@ sub_80350B0: @ 80350B0 ldr r0, =0x030022c0 mov r10, r0 cmp r5, 0 - beq _0803511A + beq @0803511A lsls r0, r7, 3 adds r0, 0x3C mov r1, r10 adds r6, r0, r1 -_080350D6: +@080350D6: mov r0, r9 adds r1, r5, 0 bl __udivsi3 @@ -89080,11 +89080,11 @@ _080350D6: adds r6, 0x8 adds r7, 0x1 cmp r5, 0 - bne _080350D6 -_0803511A: + bne @080350D6 +@0803511A: ldr r0, [sp] cmp r0, 0 - beq _08035140 + beq @08035140 lsls r0, r7, 3 add r0, r10 adds r0, 0x39 @@ -89093,10 +89093,10 @@ _0803511A: negs r1, r1 ands r1, r2 strb r1, [r0] - b _08035154 + b @08035154 .align 2, 0 .pool -_08035140: +@08035140: lsls r2, r7, 3 add r2, r10 adds r2, 0x39 @@ -89107,7 +89107,7 @@ _08035140: movs r1, 0x2 orrs r0, r1 strb r0, [r2] -_08035154: +@08035154: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -89119,7 +89119,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 @@ -89144,8 +89144,8 @@ sub_8035164: @ 8035164 ldr r0, =0x030022c0 mov r9, r0 cmp r5, 0 - beq _0803524C -_08035196: + beq @0803524C +@08035196: mov r0, r8 adds r1, r5, 0 bl __udivsi3 @@ -89160,16 +89160,16 @@ _08035196: bl __udivsi3 adds r5, r0, 0 cmp r4, 0 - bne _080351C8 + bne @080351C8 mov r2, r10 ldr r1, [r2] movs r0, 0x1 negs r0, r0 cmp r1, r0 - bne _080351C8 + bne @080351C8 cmp r5, 0 - bne _08035224 -_080351C8: + bne @08035224 +@080351C8: ldr r2, [r7] lsls r2, 3 add r2, r9 @@ -89198,14 +89198,14 @@ _080351C8: movs r0, 0x1 negs r0, r0 cmp r1, r0 - bne _0803523A + bne @0803523A ldr r4, =0x03000dd8 ldr r0, [r4] str r0, [r2] - b _0803523A + b @0803523A .align 2, 0 .pool -_08035224: +@08035224: ldr r0, [r7] lsls r0, 3 add r0, r9 @@ -89217,7 +89217,7 @@ _08035224: movs r2, 0x2 orrs r1, r2 strb r1, [r0] -_0803523A: +@0803523A: ldr r0, [r7] adds r0, 0x1 str r0, [r7] @@ -89226,11 +89226,11 @@ _0803523A: adds r0, 0x1 str r0, [r4] cmp r5, 0 - bne _08035196 -_0803524C: + bne @08035196 +@0803524C: ldr r0, [sp] cmp r0, 0 - beq _08035298 + beq @08035298 ldr r1, [r7] lsls r1, 3 add r1, r9 @@ -89259,10 +89259,10 @@ _0803524C: ands r0, r1 orrs r0, r2 strh r0, [r3, 0x3A] - b _080352AE + b @080352AE .align 2, 0 .pool -_08035298: +@08035298: ldr r0, [r7] lsls r0, 3 add r0, r9 @@ -89274,7 +89274,7 @@ _08035298: movs r2, 0x2 orrs r1, r2 strb r1, [r0] -_080352AE: +@080352AE: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -89286,7 +89286,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 @@ -89302,8 +89302,8 @@ sub_80352C0: @ 80352C0 str r0, [sp, 0x4] mov r9, r0 cmp r5, 0 - beq _0803535A -_080352E0: + beq @0803535A +@080352E0: lsls r0, r3, 3 adds r1, r0, 0 adds r1, 0x39 @@ -89311,7 +89311,7 @@ _080352E0: adds r7, r1, r2 adds r0, 0x3C adds r6, r0, r2 -_080352EE: +@080352EE: mov r0, r10 adds r1, r5, 0 str r3, [sp, 0x8] @@ -89328,13 +89328,13 @@ _080352EE: adds r5, r0, 0 ldr r3, [sp, 0x8] cmp r4, 0 - bne _0803531E + bne @0803531E ldr r2, [sp, 0x4] cmp r2, 0 - bne _0803531E + bne @0803531E cmp r5, 0 - bne _080352E0 -_0803531E: + bne @080352E0 +@0803531E: movs r0, 0x1 str r0, [sp, 0x4] mov r1, r8 @@ -89364,12 +89364,12 @@ _0803531E: movs r4, 0x1 add r9, r4 cmp r5, 0 - bne _080352EE -_0803535A: + bne @080352EE +@0803535A: mov r0, r8 ldrb r0, [r0, 0x3] cmp r9, r0 - bge _0803538A + bge @0803538A ldr r1, =0x030022c0 movs r5, 0x4 negs r5, r5 @@ -89377,7 +89377,7 @@ _0803535A: lsls r0, r3, 3 adds r0, 0x39 adds r2, r0, r1 -_08035370: +@08035370: ldrb r1, [r2] adds r0, r5, 0 ands r0, r1 @@ -89390,11 +89390,11 @@ _08035370: mov r0, r8 ldrb r0, [r0, 0x3] cmp r9, r0 - blt _08035370 -_0803538A: + blt @08035370 +@0803538A: ldr r1, [sp] cmp r1, 0 - beq _080353B0 + beq @080353B0 lsls r0, r3, 3 ldr r2, =0x030022c0 adds r0, r2 @@ -89404,10 +89404,10 @@ _0803538A: negs r1, r1 ands r1, r2 strb r1, [r0] - b _080353C6 + b @080353C6 .align 2, 0 .pool -_080353B0: +@080353B0: lsls r2, r3, 3 ldr r4, =0x030022c0 adds r2, r4 @@ -89419,7 +89419,7 @@ _080353B0: movs r1, 0x2 orrs r0, r1 strb r0, [r2] -_080353C6: +@080353C6: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -89433,13 +89433,13 @@ _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 ldr r0, [r0] cmp r0, 0 - beq _0803546E + beq @0803546E ldr r2, [r0, 0x4] lsls r1, r4, 3 subs r0, r1, r4 @@ -89448,12 +89448,12 @@ sub_80353DC: @ 80353DC ldrb r0, [r2] adds r5, r1, 0 cmp r0, 0 - beq _0803546E + beq @0803546E ldrb r3, [r2, 0x3] adds r0, r3, 0x1 ldrb r2, [r2, 0x1] cmp r0, 0 - beq _08035426 + beq @08035426 ldr r1, =0x030022c0 movs r7, 0x4 negs r7, r7 @@ -89462,7 +89462,7 @@ sub_80353DC: @ 80353DC lsls r0, r2, 3 adds r0, 0x39 adds r2, r0, r1 -_08035414: +@08035414: ldrb r1, [r2] adds r0, r7, 0 ands r0, r1 @@ -89471,12 +89471,12 @@ _08035414: subs r3, 0x1 adds r2, 0x8 cmp r3, 0 - bne _08035414 -_08035426: + bne @08035414 +@08035426: adds r0, r4, 0 bl sub_8035570 cmp r0, 0 - bne _08035442 + bne @08035442 ldr r0, =0x02022e10 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -89485,11 +89485,11 @@ _08035426: adds r0, r1 ldrh r0, [r0, 0x10] bl gpu_tile_obj_free_by_tag -_08035442: +@08035442: adds r0, r4, 0 bl sub_80355B4 cmp r0, 0 - bne _0803545E + bne @0803545E ldr r0, =0x02022e10 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -89498,7 +89498,7 @@ _08035442: adds r0, r1 ldrh r0, [r0, 0x12] bl gpu_pal_free_tag -_0803545E: +@0803545E: ldr r0, =0x02022e10 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -89507,7 +89507,7 @@ _0803545E: adds r0, r1 movs r1, 0 strb r1, [r0] -_0803546E: +@0803546E: pop {r4-r7} pop {r0} bx r0 @@ -89516,7 +89516,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 @@ -89524,7 +89524,7 @@ sub_803547C: @ 803547C ldr r1, [r0] adds r7, r0, 0 cmp r1, 0 - beq _0803550C + beq @0803550C ldr r2, [r1, 0x4] lsls r1, r4, 3 subs r0, r1, r4 @@ -89533,14 +89533,14 @@ sub_803547C: @ 803547C ldrb r0, [r2] adds r6, r1, 0 cmp r0, 0 - beq _0803550C + beq @0803550C ldrb r3, [r2, 0x3] adds r1, r3, 0x1 ldrb r0, [r2, 0x1] cmp r5, 0 - beq _080354D8 + beq @080354D8 cmp r1, 0 - beq _0803550C + beq @0803550C ldr r1, =0x030022c0 movs r5, 0x4 negs r5, r5 @@ -89549,7 +89549,7 @@ sub_803547C: @ 803547C lsls r0, 3 adds r0, 0x39 adds r2, r0, r1 -_080354BC: +@080354BC: ldrb r1, [r2] adds r0, r5, 0 ands r0, r1 @@ -89558,13 +89558,13 @@ _080354BC: subs r3, 0x1 adds r2, 0x8 cmp r3, 0 - bne _080354BC - b _0803550C + bne @080354BC + b @0803550C .align 2, 0 .pool -_080354D8: +@080354D8: cmp r1, 0 - beq _080354FA + beq @080354FA ldr r1, =0x030022c0 movs r5, 0x4 negs r5, r5 @@ -89572,7 +89572,7 @@ _080354D8: lsls r0, 3 adds r0, 0x39 adds r2, r0, r1 -_080354EA: +@080354EA: ldrb r1, [r2] adds r0, r5, 0 ands r0, r1 @@ -89580,8 +89580,8 @@ _080354EA: subs r3, 0x1 adds r2, 0x8 cmp r3, 0 - bne _080354EA -_080354FA: + bne @080354EA +@080354FA: ldr r0, [r7] ldr r1, [r0, 0x4] subs r0, r6, r4 @@ -89590,7 +89590,7 @@ _080354FA: ldr r1, [r0, 0x18] adds r0, r4, 0 bl sub_8035044 -_0803550C: +@0803550C: pop {r4-r7} pop {r0} bx r0 @@ -89599,7 +89599,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 @@ -89609,51 +89609,51 @@ sub_8035518: @ 8035518 ldr r0, [r0] ldr r2, [r0] cmp r3, r2 - bcs _0803555A + bcs @0803555A ldr r1, [r0, 0x4] -_0803552E: +@0803552E: ldrb r0, [r1] cmp r0, 0 - bne _08035548 + bne @08035548 ldrb r0, [r1, 0x1] cmp r0, 0xFF - beq _08035552 + beq @08035552 ldrb r0, [r1, 0x3] cmp r0, r4 - bhi _08035552 + bhi @08035552 ldrb r0, [r1, 0x1] - b _0803556A + b @0803556A .align 2, 0 .pool -_08035548: +@08035548: adds r0, r5, 0x1 ldrb r5, [r1, 0x3] adds r0, r5 lsls r0, 16 lsrs r5, r0, 16 -_08035552: +@08035552: adds r1, 0x1C adds r3, 0x1 cmp r3, r2 - bcc _0803552E -_0803555A: + bcc @0803552E +@0803555A: adds r0, r5, r4 adds r0, 0x1 cmp r0, 0x80 - bgt _08035568 + bgt @08035568 lsls r0, r5, 24 lsrs r0, 24 - b _0803556A -_08035568: + b @0803556A +@08035568: movs r0, 0xFF -_0803556A: +@0803556A: pop {r4,r5} pop {r1} bx r1 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 @@ -89661,41 +89661,41 @@ sub_8035570: @ 8035570 ldr r0, [r0] ldr r4, [r0] cmp r2, r4 - bcs _080355AC + bcs @080355AC ldr r1, [r0, 0x4] lsls r0, r3, 3 subs r0, r3 lsls r0, 2 adds r5, r0, r1 -_0803558A: +@0803558A: ldrb r0, [r1] cmp r0, 0 - beq _080355A4 + beq @080355A4 cmp r2, r3 - beq _080355A4 + beq @080355A4 ldrh r0, [r1, 0x10] ldrh r6, [r5, 0x10] cmp r0, r6 - bne _080355A4 + bne @080355A4 movs r0, 0x1 - b _080355AE + b @080355AE .align 2, 0 .pool -_080355A4: +@080355A4: adds r1, 0x1C adds r2, 0x1 cmp r2, r4 - bcc _0803558A -_080355AC: + bcc @0803558A +@080355AC: movs r0, 0 -_080355AE: +@080355AE: pop {r4-r6} pop {r1} bx r1 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 @@ -89703,41 +89703,41 @@ sub_80355B4: @ 80355B4 ldr r0, [r0] ldr r4, [r0] cmp r2, r4 - bcs _080355F0 + bcs @080355F0 ldr r1, [r0, 0x4] lsls r0, r3, 3 subs r0, r3 lsls r0, 2 adds r5, r0, r1 -_080355CE: +@080355CE: ldrb r0, [r1] cmp r0, 0 - beq _080355E8 + beq @080355E8 cmp r2, r3 - beq _080355E8 + beq @080355E8 ldrh r0, [r1, 0x12] ldrh r6, [r5, 0x12] cmp r0, r6 - bne _080355E8 + bne @080355E8 movs r0, 0x1 - b _080355F2 + b @080355F2 .align 2, 0 .pool -_080355E8: +@080355E8: adds r1, 0x1C adds r2, 0x1 cmp r2, r4 - bcc _080355CE -_080355F0: + bcc @080355CE +@080355F0: movs r0, 0 -_080355F2: +@080355F2: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_80355B4 thumb_func_start sub_80355F8 -sub_80355F8: @ 80355F8 +sub_80355F8: ; 80355F8 ldr r2, =0x082ff1c8 lsls r0, 2 adds r1, r0 @@ -89749,7 +89749,7 @@ sub_80355F8: @ 80355F8 thumb_func_end sub_80355F8 thumb_func_start sub_8035608 -sub_8035608: @ 8035608 +sub_8035608: ; 8035608 push {lr} bl reset_all_obj_data ldr r0, =0x0831ac88 @@ -89778,7 +89778,7 @@ sub_8035608: @ 8035608 thumb_func_end sub_8035608 thumb_func_start sub_8035648 -sub_8035648: @ 8035648 +sub_8035648: ; 8035648 push {lr} bl call_obj_callbacks bl obj_sync_something @@ -89787,7 +89787,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 gpu_reset_bgs_and_dma3_busy_flags @@ -89801,7 +89801,7 @@ trs_config: @ 8035658 lsls r0, 11 ands r1, r0 cmp r1, 0 - beq _080356A4 + beq @080356A4 ldr r0, =0x02024474 adds r0, 0x24 movs r1, 0x1 @@ -89813,14 +89813,14 @@ trs_config: @ 8035658 ldr r1, [r4] movs r0, 0x2 bl bg_set_tilemap - b _080356AA + b @080356AA .align 2, 0 .pool -_080356A4: +@080356A4: ldr r0, =0x02024474 adds r0, 0x24 strb r1, [r0] -_080356AA: +@080356AA: ldr r1, =0x0831aba0 ldr r0, =0x02024474 adds r0, 0x24 @@ -89838,7 +89838,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 disable_irqs @@ -89864,7 +89864,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 @@ -89884,7 +89884,7 @@ sub_803570C: @ 803570C lsls r1, 11 ands r0, r1 cmp r0, 0 - beq _0803575A + beq @0803575A movs r0, 0x70 bl sub_81978B0 movs r0, 0 @@ -89898,7 +89898,7 @@ sub_803570C: @ 803570C ldr r1, =0x02037c00 movs r2, 0x1 bl CpuSet -_0803575A: +@0803575A: pop {r0} bx r0 .align 2, 0 @@ -89906,14 +89906,14 @@ _0803575A: thumb_func_end sub_803570C thumb_func_start sub_8035770 -sub_8035770: @ 8035770 +sub_8035770: ; 8035770 push {r4,r5,lr} ldr r0, =0x02022fec ldr r1, [r0] ldr r0, =0x023f0902 ands r0, r1 cmp r0, 0 - beq _080357B0 + beq @080357B0 ldr r0, =0x08d7c440 ldr r1, =0x06008000 bl call_LZZUnCompVram @@ -89921,15 +89921,15 @@ sub_8035770: @ 8035770 ldr r1, =0x0600d000 bl call_LZZUnCompVram ldr r0, =0x08d7c9ec - b _08035A52 + b @08035A52 .align 2, 0 .pool -_080357B0: +@080357B0: movs r0, 0x80 lsls r0, 21 ands r0, r1 cmp r0, 0 - beq _080357E4 + beq @080357E4 ldr r0, =0x08d7bb14 ldr r1, =0x06008000 bl call_LZZUnCompVram @@ -89937,15 +89937,15 @@ _080357B0: ldr r1, =0x0600d000 bl call_LZZUnCompVram ldr r0, =0x08d7df30 - b _08035A52 + b @08035A52 .align 2, 0 .pool -_080357E4: +@080357E4: movs r0, 0x80 lsls r0, 22 ands r0, r1 cmp r0, 0 - beq _08035818 + beq @08035818 ldr r0, =0x08d7a108 ldr r1, =0x06008000 bl call_LZZUnCompVram @@ -89953,15 +89953,15 @@ _080357E4: ldr r1, =0x0600d000 bl call_LZZUnCompVram ldr r0, =0x08d7def4 - b _08035A52 + b @08035A52 .align 2, 0 .pool -_08035818: +@08035818: movs r0, 0x80 lsls r0, 23 ands r0, r1 cmp r0, 0 - beq _0803584C + beq @0803584C ldr r0, =0x08d7d590 ldr r1, =0x06008000 bl call_LZZUnCompVram @@ -89969,14 +89969,14 @@ _08035818: ldr r1, =0x0600d000 bl call_LZZUnCompVram ldr r0, =0x08d7e234 - b _08035A52 + b @08035A52 .align 2, 0 .pool -_0803584C: +@0803584C: movs r0, 0x8 ands r1, r0 cmp r1, 0 - beq _080358C4 + beq @080358C4 ldr r2, =0x08310030 ldr r0, =0x02038bca ldrh r1, [r0] @@ -89986,7 +89986,7 @@ _0803584C: adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0x20 - bne _08035898 + bne @08035898 ldr r0, =0x08d7c440 ldr r1, =0x06008000 bl call_LZZUnCompVram @@ -89994,12 +89994,12 @@ _0803584C: ldr r1, =0x0600d000 bl call_LZZUnCompVram ldr r0, =0x08d7dfc4 - b _08035A52 + b @08035A52 .align 2, 0 .pool -_08035898: +@08035898: cmp r0, 0x26 - bne _080358C4 + bne @080358C4 ldr r0, =0x08d7ccd8 ldr r1, =0x06008000 bl call_LZZUnCompVram @@ -90007,34 +90007,34 @@ _08035898: ldr r1, =0x0600d000 bl call_LZZUnCompVram ldr r0, =0x08d7e1f8 - b _08035A52 + b @08035A52 .align 2, 0 .pool -_080358C4: +@080358C4: bl sav1_map_get_battletype lsls r0, 24 lsrs r0, 24 cmp r0, 0x8 - bhi _08035904 + bhi @08035904 lsls r0, 2 - ldr r1, =_080358E0 + ldr r1, =@080358E0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080358E0: - .4byte _08035904 - .4byte _08035950 - .4byte _08035978 - .4byte _080359A0 - .4byte _080359C8 - .4byte _080359F0 - .4byte _08035A18 - .4byte _08035A40 - .4byte _08035A70 -_08035904: +@080358E0: + .4byte @08035904 + .4byte @08035950 + .4byte @08035978 + .4byte @080359A0 + .4byte @080359C8 + .4byte @080359F0 + .4byte @08035A18 + .4byte @08035A40 + .4byte @08035A70 +@08035904: ldr r4, =0x0831aba8 ldr r5, =0x02022ff0 ldrb r1, [r5] @@ -90061,10 +90061,10 @@ _08035904: adds r4, 0x10 adds r0, r4 ldr r0, [r0] - b _08035A52 + b @08035A52 .align 2, 0 .pool -_08035950: +@08035950: ldr r0, =0x08d7c440 ldr r1, =0x06008000 bl call_LZZUnCompVram @@ -90072,10 +90072,10 @@ _08035950: ldr r1, =0x0600d000 bl call_LZZUnCompVram ldr r0, =0x08d7df88 - b _08035A52 + b @08035A52 .align 2, 0 .pool -_08035978: +@08035978: ldr r0, =0x08d7ccd8 ldr r1, =0x06008000 bl call_LZZUnCompVram @@ -90083,10 +90083,10 @@ _08035978: ldr r1, =0x0600d000 bl call_LZZUnCompVram ldr r0, =0x08d7e060 - b _08035A52 + b @08035A52 .align 2, 0 .pool -_080359A0: +@080359A0: ldr r0, =0x08d7ccd8 ldr r1, =0x06008000 bl call_LZZUnCompVram @@ -90094,10 +90094,10 @@ _080359A0: ldr r1, =0x0600d000 bl call_LZZUnCompVram ldr r0, =0x08d7e000 - b _08035A52 + b @08035A52 .align 2, 0 .pool -_080359C8: +@080359C8: ldr r0, =0x08d7ccd8 ldr r1, =0x06008000 bl call_LZZUnCompVram @@ -90105,10 +90105,10 @@ _080359C8: ldr r1, =0x0600d000 bl call_LZZUnCompVram ldr r0, =0x08d7e0cc - b _08035A52 + b @08035A52 .align 2, 0 .pool -_080359F0: +@080359F0: ldr r0, =0x08d7ccd8 ldr r1, =0x06008000 bl call_LZZUnCompVram @@ -90116,10 +90116,10 @@ _080359F0: ldr r1, =0x0600d000 bl call_LZZUnCompVram ldr r0, =0x08d7e11c - b _08035A52 + b @08035A52 .align 2, 0 .pool -_08035A18: +@08035A18: ldr r0, =0x08d7ccd8 ldr r1, =0x06008000 bl call_LZZUnCompVram @@ -90127,10 +90127,10 @@ _08035A18: ldr r1, =0x0600d000 bl call_LZZUnCompVram ldr r0, =0x08d7e164 - b _08035A52 + b @08035A52 .align 2, 0 .pool -_08035A40: +@08035A40: ldr r0, =0x08d7ccd8 ldr r1, =0x06008000 bl call_LZZUnCompVram @@ -90138,14 +90138,14 @@ _08035A40: ldr r1, =0x0600d000 bl call_LZZUnCompVram ldr r0, =0x08d7e1a8 -_08035A52: +@08035A52: movs r1, 0x20 movs r2, 0x60 bl decompress_palette - b _08035A8A + b @08035A8A .align 2, 0 .pool -_08035A70: +@08035A70: ldr r0, =0x08d7c440 ldr r1, =0x06008000 bl call_LZZUnCompVram @@ -90156,7 +90156,7 @@ _08035A70: movs r1, 0x20 movs r2, 0x60 bl decompress_palette -_08035A8A: +@08035A8A: pop {r4,r5} pop {r0} bx r0 @@ -90165,7 +90165,7 @@ _08035A8A: thumb_func_end sub_8035770 thumb_func_start sub_8035AA4 -sub_8035AA4: @ 8035AA4 +sub_8035AA4: ; 8035AA4 push {lr} ldr r0, =0x08c00000 movs r1, 0xC0 @@ -90191,7 +90191,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 @@ -90218,7 +90218,7 @@ sub_8035AE4: @ 8035AE4 movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _08035BCC + beq @08035BCC ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -90227,68 +90227,68 @@ sub_8035AE4: @ 8035AE4 movs r2, 0x12 ldrsh r0, [r1, r2] cmp r0, 0 - beq _08035B56 + beq @08035B56 cmp r5, 0x1 - beq _08035B7E + beq @08035B7E cmp r5, 0x1 - bgt _08035B44 + bgt @08035B44 cmp r5, 0 - beq _08035B4E - b _08035B88 + beq @08035B4E + b @08035B88 .align 2, 0 .pool -_08035B44: +@08035B44: cmp r5, 0x2 - beq _08035B52 + beq @08035B52 cmp r5, 0x3 - beq _08035B72 - b _08035B88 -_08035B4E: + beq @08035B72 + b @08035B88 +@08035B4E: ldrh r0, [r1, 0xE] - b _08035B74 -_08035B52: + b @08035B74 +@08035B52: ldrh r1, [r1, 0xE] - b _08035B80 -_08035B56: + b @08035B80 +@08035B56: cmp r5, 0x1 - beq _08035B72 + beq @08035B72 cmp r5, 0x1 - bgt _08035B64 + bgt @08035B64 cmp r5, 0 - beq _08035B6E - b _08035B88 -_08035B64: + beq @08035B6E + b @08035B88 +@08035B64: cmp r5, 0x2 - beq _08035B7A + beq @08035B7A cmp r5, 0x3 - beq _08035B7E - b _08035B88 -_08035B6E: + beq @08035B7E + b @08035B88 +@08035B6E: ldrh r0, [r1, 0xE] - b _08035B74 -_08035B72: + b @08035B74 +@08035B72: ldrh r0, [r1, 0x10] -_08035B74: +@08035B74: movs r4, 0x3F ands r4, r0 - b _08035B88 -_08035B7A: + b @08035B88 +@08035B7A: ldrh r1, [r1, 0xE] - b _08035B80 -_08035B7E: + b @08035B80 +@08035B7E: ldrh r1, [r1, 0x10] -_08035B80: +@08035B80: movs r0, 0xFC lsls r0, 4 ands r0, r1 lsrs r4, r0, 6 -_08035B88: +@08035B88: movs r2, 0 movs r6, 0x3 ldr r0, =0x00006001 adds r5, r0, 0 add r3, sp, 0xC -_08035B92: +@08035B92: lsls r1, r2, 1 adds r0, r6, 0 lsls r0, r1 @@ -90299,7 +90299,7 @@ _08035B92: adds r3, 0x2 adds r2, 0x1 cmp r2, 0x2 - ble _08035B92 + ble @08035B92 movs r0, 0x3 str r0, [sp] movs r0, 0x1 @@ -90313,38 +90313,38 @@ _08035B92: bl bg_copy_tilemap_rect_simple mov r0, r8 bl gpu_copy_wram_bg_tilemap_to_vram - b _08035C36 + b @08035C36 .align 2, 0 .pool -_08035BCC: +@08035BCC: ldr r0, =0x02024474 adds r0, 0x25 ldrb r0, [r0] cmp r5, r0 - bne _08035BEC + bne @08035BEC ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 ldrh r4, [r0, 0xE] - b _08035BF8 + b @08035BF8 .align 2, 0 .pool -_08035BEC: +@08035BEC: ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 ldrh r4, [r0, 0x10] -_08035BF8: +@08035BF8: movs r2, 0 movs r6, 0x3 ldr r0, =0x00006001 adds r5, r0, 0 add r3, sp, 0xC -_08035C02: +@08035C02: lsls r1, r2, 1 adds r0, r6, 0 lsls r0, r1 @@ -90355,7 +90355,7 @@ _08035C02: adds r3, 0x2 adds r2, 0x1 cmp r2, 0x5 - ble _08035C02 + ble @08035C02 movs r0, 0x6 str r0, [sp] movs r0, 0x1 @@ -90369,7 +90369,7 @@ _08035C02: bl bg_copy_tilemap_rect_simple mov r0, r8 bl gpu_copy_wram_bg_tilemap_to_vram -_08035C36: +@08035C36: add sp, 0x18 pop {r3,r4} mov r8, r3 @@ -90382,27 +90382,27 @@ _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] cmp r2, 0x3 - bne _08035C68 + bne @08035C68 ldr r0, =0x085ccbad movs r1, 0x15 bl battle_show_message_maybe - b _08035D68 + b @08035D68 .align 2, 0 .pool -_08035C68: +@08035C68: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _08035CE2 + beq @08035CE2 cmp r2, 0x1 - bne _08035CAE + bne @08035CAE ldr r2, =0x020229e8 ldr r0, =0x02024474 adds r0, 0x25 @@ -90413,21 +90413,21 @@ _08035C68: adds r0, r2 ldrh r0, [r0, 0x18] cmp r0, 0x1 - beq _08035CFC + beq @08035CFC cmp r0, 0x1 - bgt _08035CA4 + bgt @08035CA4 cmp r0, 0 - beq _08035D36 - b _08035D68 + beq @08035D36 + b @08035D68 .align 2, 0 .pool -_08035CA4: +@08035CA4: cmp r0, 0x2 - beq _08035D36 + beq @08035D36 cmp r0, 0x3 - bne _08035D68 - b _08035CFC -_08035CAE: + bne @08035D68 + b @08035CFC +@08035CAE: ldr r2, =0x020229e8 ldr r0, =0x02024474 adds r0, 0x25 @@ -90438,23 +90438,23 @@ _08035CAE: adds r0, r2 ldrh r0, [r0, 0x18] cmp r0, 0x1 - beq _08035D36 + beq @08035D36 cmp r0, 0x1 - bgt _08035CD8 + bgt @08035CD8 cmp r0, 0 - beq _08035CFC - b _08035D68 + beq @08035CFC + b @08035D68 .align 2, 0 .pool -_08035CD8: +@08035CD8: cmp r0, 0x2 - beq _08035CFC + beq @08035CFC cmp r0, 0x3 - bne _08035D68 - b _08035D36 -_08035CE2: + bne @08035D68 + b @08035D36 +@08035CE2: cmp r2, 0x1 - bne _08035D20 + bne @08035D20 ldr r2, =0x020229e8 ldr r0, =0x02024474 adds r0, 0x25 @@ -90465,18 +90465,18 @@ _08035CE2: adds r0, r2 ldrh r0, [r0, 0x18] cmp r0, 0 - beq _08035D36 -_08035CFC: + beq @08035D36 +@08035CFC: ldr r0, =0x085ccb9e movs r1, 0x17 bl battle_show_message_maybe ldr r0, =0x085ccba5 movs r1, 0x16 bl battle_show_message_maybe - b _08035D68 + b @08035D68 .align 2, 0 .pool -_08035D20: +@08035D20: ldr r2, =0x020229e8 ldr r0, =0x02024474 adds r0, 0x25 @@ -90487,25 +90487,25 @@ _08035D20: adds r0, r2 ldrh r0, [r0, 0x18] cmp r0, 0 - beq _08035D58 -_08035D36: + beq @08035D58 +@08035D36: ldr r0, =0x085ccb9e movs r1, 0x16 bl battle_show_message_maybe ldr r0, =0x085ccba5 movs r1, 0x17 bl battle_show_message_maybe - b _08035D68 + b @08035D68 .align 2, 0 .pool -_08035D58: +@08035D58: ldr r0, =0x085ccb9e movs r1, 0x17 bl battle_show_message_maybe ldr r0, =0x085ccba5 movs r1, 0x16 bl battle_show_message_maybe -_08035D68: +@08035D68: pop {r0} bx r0 .align 2, 0 @@ -90513,7 +90513,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} @@ -90529,60 +90529,60 @@ task00_0800F6FC: @ 8035D74 movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0x1 - bne _08035D96 - b _08035EC4 -_08035D96: + bne @08035D96 + b @08035EC4 +@08035D96: cmp r0, 0x1 - bgt _08035DA4 + bgt @08035DA4 cmp r0, 0 - beq _08035DAC - b _08036138 + beq @08035DAC + b @08036138 .align 2, 0 .pool -_08035DA4: +@08035DA4: cmp r0, 0x2 - bne _08035DAA - b _08035F64 -_08035DAA: - b _08036138 -_08035DAC: + bne @08035DAA + b @08035F64 +@08035DAA: + b @08036138 +@08035DAC: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _08035E44 + beq @08035E44 movs r5, 0 movs r6, 0x3 -_08035DBC: +@08035DBC: ldr r0, =0x020229f0 adds r1, r5, r0 subs r0, 0x8 adds r4, r5, r0 ldrh r0, [r4, 0x18] cmp r0, 0x1 - beq _08035DF4 + beq @08035DF4 cmp r0, 0x1 - bgt _08035DDC + bgt @08035DDC cmp r0, 0 - beq _08035DE6 - b _08035E3A + beq @08035DE6 + b @08035E3A .align 2, 0 .pool -_08035DDC: +@08035DDC: cmp r0, 0x2 - beq _08035E08 + beq @08035E08 cmp r0, 0x3 - beq _08035E22 - b _08035E3A -_08035DE6: + beq @08035E22 + b @08035E3A +@08035DE6: adds r0, r1, 0 movs r1, 0x11 bl battle_show_message_maybe ldrb r1, [r4, 0x18] movs r0, 0x4 - b _08035E14 -_08035DF4: + b @08035E14 +@08035DF4: adds r0, r1, 0 movs r1, 0x12 bl battle_show_message_maybe @@ -90591,22 +90591,22 @@ _08035DF4: str r0, [sp] adds r0, r7, 0 movs r2, 0x2 - b _08035E1A -_08035E08: + b @08035E1A +@08035E08: adds r0, r1, 0 movs r1, 0x13 bl battle_show_message_maybe ldrb r1, [r4, 0x18] movs r0, 0x8 -_08035E14: +@08035E14: str r0, [sp] adds r0, r7, 0 movs r2, 0x1 -_08035E1A: +@08035E1A: movs r3, 0x2 bl sub_8035AE4 - b _08035E3A -_08035E22: + b @08035E3A +@08035E22: adds r0, r1, 0 movs r1, 0x14 bl battle_show_message_maybe @@ -90617,13 +90617,13 @@ _08035E22: movs r2, 0x2 movs r3, 0x2 bl sub_8035AE4 -_08035E3A: +@08035E3A: adds r5, 0x1C subs r6, 0x1 cmp r6, 0 - bge _08035DBC - b _08035EA6 -_08035E44: + bge @08035DBC + b @08035EA6 +@08035E44: ldr r0, =0x02024474 adds r0, 0x25 ldrb r5, [r0] @@ -90638,10 +90638,10 @@ _08035E44: adds r0, r4 ldrh r0, [r0, 0x18] cmp r0, 0 - beq _08035E66 + beq @08035E66 adds r6, r5, 0 adds r5, r1, 0 -_08035E66: +@08035E66: lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -90670,7 +90670,7 @@ _08035E66: movs r2, 0x2 movs r3, 0x2 bl sub_8035AE4 -_08035EA6: +@08035EA6: ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 @@ -90679,10 +90679,10 @@ _08035EA6: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _08036138 + b @08036138 .align 2, 0 .pool -_08035EC4: +@08035EC4: ldr r0, =0x00002710 bl gpu_pal_alloc_new lsls r0, 24 @@ -90740,23 +90740,23 @@ _08035EC4: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] - b _08036138 + b @08036138 .align 2, 0 .pool -_08035F64: +@08035F64: movs r1, 0x12 ldrsh r0, [r5, r1] cmp r0, 0 - beq _08035FCC + beq @08035FCC ldr r4, =0x02022e18 ldrh r0, [r5, 0xA] bl sine2 lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _08035F7E + bge @08035F7E adds r0, 0x1F -_08035F7E: +@08035F7E: asrs r1, r0, 5 movs r2, 0x14 negs r2, r2 @@ -90769,9 +90769,9 @@ _08035F7E: lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _08035F9C + bge @08035F9C adds r0, 0x1F -_08035F9C: +@08035F9C: asrs r1, r0, 5 movs r3, 0x8C negs r3, r3 @@ -90784,19 +90784,19 @@ _08035F9C: strh r1, [r0] ldr r0, =0x02022e1e strh r1, [r0] - b _08036038 + b @08036038 .align 2, 0 .pool -_08035FCC: +@08035FCC: ldr r4, =0x02022e18 ldrh r0, [r5, 0xA] bl sine2 lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _08035FDE + bge @08035FDE adds r0, 0x1F -_08035FDE: +@08035FDE: asrs r1, r0, 5 movs r3, 0x14 negs r3, r3 @@ -90809,9 +90809,9 @@ _08035FDE: lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _08035FFC + bge @08035FFC adds r0, 0x1F -_08035FFC: +@08035FFC: asrs r0, 5 subs r0, 0xA4 strh r0, [r4] @@ -90821,9 +90821,9 @@ _08035FFC: lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _08036014 + bge @08036014 adds r0, 0x1F -_08036014: +@08036014: asrs r1, r0, 5 movs r2, 0x8C negs r2, r2 @@ -90836,13 +90836,13 @@ _08036014: lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _08036032 + bge @08036032 adds r0, 0x1F -_08036032: +@08036032: asrs r0, 5 subs r0, 0xA4 strh r0, [r4] -_08036038: +@08036038: ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 @@ -90853,22 +90853,22 @@ _08036038: ldrsh r3, [r1, r2] mov r8, r3 cmp r3, 0 - beq _08036070 + beq @08036070 subs r0, 0x2 strh r0, [r1, 0xC] ldrh r0, [r1, 0xA] adds r0, 0x2 strh r0, [r1, 0xA] - b _08036138 + b @08036138 .align 2, 0 .pool -_08036070: +@08036070: movs r3, 0x12 ldrsh r0, [r1, r3] cmp r0, 0 - beq _0803607C + beq @0803607C bl sub_8035C4C -_0803607C: +@0803607C: movs r0, 0x78 bl audio_play adds r0, r7, 0 @@ -90961,7 +90961,7 @@ _0803607C: lsls r0, 2 adds r0, r4 strh r2, [r0, 0x32] -_08036138: +@08036138: add sp, 0x4 pop {r3} mov r8, r3 @@ -90973,14 +90973,14 @@ _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] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08036208 + beq @08036208 ldr r0, =0x08d778f0 ldr r1, =0x06004000 bl call_LZZUnCompVram @@ -91027,33 +91027,33 @@ sub_8036154: @ 8036154 strh r1, [r0] ldr r0, =0x0831aa00 bl gpu_tile_obj_decompress_and_load3 - b _080363AC + b @080363AC .align 2, 0 .pool -_08036208: +@08036208: ldr r0, =0x023f0902 ands r0, r1 cmp r0, 0 - beq _0803628C + beq @0803628C movs r0, 0x80 lsls r0, 15 ands r1, r0 cmp r1, 0 - beq _08036224 + beq @08036224 ldr r0, =0x02038bce ldrh r1, [r0] ldr r0, =0x00000c03 cmp r1, r0 - bne _08036248 -_08036224: + bne @08036248 +@08036224: ldr r0, =0x08d820d4 ldr r1, =0x06004000 bl call_LZZUnCompVram ldr r0, =0x08d824e4 - b _08036382 + b @08036382 .align 2, 0 .pool -_08036248: +@08036248: movs r0, 0x1 movs r1, 0x1 movs r2, 0x2 @@ -91076,53 +91076,53 @@ _08036248: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x2 bl gpu_copy_wram_bg_tilemap_to_vram - b _080363AC + b @080363AC .align 2, 0 .pool -_0803628C: +@0803628C: movs r0, 0x80 lsls r0, 21 ands r0, r1 cmp r0, 0 - beq _080362B0 + beq @080362B0 ldr r0, =0x08d81610 ldr r1, =0x06004000 bl call_LZZUnCompVram ldr r0, =0x08d81e2c - b _08036382 + b @08036382 .align 2, 0 .pool -_080362B0: +@080362B0: movs r0, 0x80 lsls r0, 22 ands r0, r1 cmp r0, 0 - beq _080362D4 + beq @080362D4 ldr r0, =0x08d7f9f8 ldr r1, =0x06004000 bl call_LZZUnCompVram ldr r0, =0x08d7fec4 - b _08036382 + b @08036382 .align 2, 0 .pool -_080362D4: +@080362D4: movs r0, 0x80 lsls r0, 23 ands r0, r1 cmp r0, 0 - beq _080362F8 + beq @080362F8 ldr r0, =0x08d82608 ldr r1, =0x06004000 bl call_LZZUnCompVram ldr r0, =0x08d82c70 - b _08036382 + b @08036382 .align 2, 0 .pool -_080362F8: +@080362F8: movs r0, 0x8 ands r1, r0 cmp r1, 0 - beq _08036350 + beq @08036350 ldr r2, =0x08310030 ldr r0, =0x02038bca ldrh r1, [r0] @@ -91132,29 +91132,29 @@ _080362F8: adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0x20 - bne _08036334 + bne @08036334 ldr r0, =0x08d820d4 ldr r1, =0x06004000 bl call_LZZUnCompVram ldr r0, =0x08d824e4 - b _08036382 + b @08036382 .align 2, 0 .pool -_08036334: +@08036334: cmp r0, 0x26 - bne _08036350 + bne @08036350 ldr r0, =0x08d820d4 ldr r1, =0x06004000 bl call_LZZUnCompVram ldr r0, =0x08d824e4 - b _08036382 + b @08036382 .align 2, 0 .pool -_08036350: +@08036350: bl sav1_map_get_battletype lsls r0, 24 cmp r0, 0 - bne _0803639C + bne @0803639C ldr r4, =0x0831aba8 ldr r5, =0x02022ff0 ldrb r1, [r5] @@ -91174,20 +91174,20 @@ _08036350: adds r4, 0xC adds r0, r4 ldr r0, [r0] -_08036382: +@08036382: ldr r1, =0x0600e000 bl call_LZZUnCompVram - b _080363AC + b @080363AC .align 2, 0 .pool -_0803639C: +@0803639C: ldr r0, =0x08d820d4 ldr r1, =0x06004000 bl call_LZZUnCompVram ldr r0, =0x08d824e4 ldr r1, =0x0600e000 bl call_LZZUnCompVram -_080363AC: +@080363AC: pop {r4,r5} pop {r0} bx r0 @@ -91196,40 +91196,40 @@ _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 movs r4, 0 cmp r0, 0x6 - bls _080363D2 - b _08036756 -_080363D2: + bls @080363D2 + b @08036756 +@080363D2: lsls r0, 2 - ldr r1, =_080363E0 + ldr r1, =@080363E0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080363E0: - .4byte _080363FC - .4byte _0803640C - .4byte _08036424 - .4byte _08036434 - .4byte _0803652C - .4byte _08036638 - .4byte _08036750 -_080363FC: +@080363E0: + .4byte @080363FC + .4byte @0803640C + .4byte @08036424 + .4byte @08036434 + .4byte @0803652C + .4byte @08036638 + .4byte @08036750 +@080363FC: ldr r0, =0x08c00000 movs r1, 0xC0 lsls r1, 19 bl call_LZZUnCompVram - b _08036758 + b @08036758 .align 2, 0 .pool -_0803640C: +@0803640C: ldr r1, =0x08c00524 movs r0, 0 movs r2, 0 @@ -91237,38 +91237,38 @@ _0803640C: bl gpu_copy_to_wram_bg_tile_map movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram - b _08036758 + b @08036758 .align 2, 0 .pool -_08036424: +@08036424: ldr r0, =0x08c004e0 movs r1, 0 movs r2, 0x40 bl decompress_palette - b _08036758 + b @08036758 .align 2, 0 .pool -_08036434: +@08036434: ldr r0, =0x02022fec ldr r1, [r0] ldr r0, =0x023f0902 ands r0, r1 cmp r0, 0 - bne _08036518 + bne @08036518 movs r0, 0x80 lsls r0, 21 ands r0, r1 cmp r0, 0 - beq _0803645C + beq @0803645C ldr r0, =0x08d7bb14 - b _0803651A + b @0803651A .align 2, 0 .pool -_0803645C: +@0803645C: movs r0, 0x8 ands r1, r0 cmp r1, 0 - beq _0803648C + beq @0803648C ldr r2, =0x08310030 ldr r0, =0x02038bca ldrh r1, [r0] @@ -91278,38 +91278,38 @@ _0803645C: adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0x20 - beq _08036518 + beq @08036518 cmp r0, 0x26 - bne _0803648C + bne @0803648C ldr r0, =0x08d7ccd8 - b _0803651A + b @0803651A .align 2, 0 .pool -_0803648C: +@0803648C: bl sav1_map_get_battletype lsls r0, 24 lsrs r0, 24 cmp r0, 0x8 - bhi _080364CC + bhi @080364CC lsls r0, 2 - ldr r1, =_080364A8 + ldr r1, =@080364A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080364A8: - .4byte _080364CC - .4byte _08036518 - .4byte _080364E8 - .4byte _080364F0 - .4byte _080364F8 - .4byte _08036500 - .4byte _08036508 - .4byte _08036510 - .4byte _08036518 -_080364CC: +@080364A8: + .4byte @080364CC + .4byte @08036518 + .4byte @080364E8 + .4byte @080364F0 + .4byte @080364F8 + .4byte @08036500 + .4byte @08036508 + .4byte @08036510 + .4byte @08036518 +@080364CC: ldr r2, =0x0831aba8 ldr r0, =0x02022ff0 ldrb r1, [r0] @@ -91318,79 +91318,79 @@ _080364CC: lsls r0, 2 adds r0, r2 ldr r0, [r0] - b _0803651A + b @0803651A .align 2, 0 .pool -_080364E8: +@080364E8: ldr r0, =0x08d7ccd8 - b _0803651A + b @0803651A .align 2, 0 .pool -_080364F0: +@080364F0: ldr r0, =0x08d7ccd8 - b _0803651A + b @0803651A .align 2, 0 .pool -_080364F8: +@080364F8: ldr r0, =0x08d7ccd8 - b _0803651A + b @0803651A .align 2, 0 .pool -_08036500: +@08036500: ldr r0, =0x08d7ccd8 - b _0803651A + b @0803651A .align 2, 0 .pool -_08036508: +@08036508: ldr r0, =0x08d7ccd8 - b _0803651A + b @0803651A .align 2, 0 .pool -_08036510: +@08036510: ldr r0, =0x08d7ccd8 - b _0803651A + b @0803651A .align 2, 0 .pool -_08036518: +@08036518: ldr r0, =0x08d7c440 -_0803651A: +@0803651A: ldr r1, =0x06008000 bl call_LZZUnCompVram - b _08036758 + b @08036758 .align 2, 0 .pool -_0803652C: +@0803652C: ldr r0, =0x02022fec ldr r1, [r0] ldr r0, =0x023f0902 ands r0, r1 cmp r0, 0 - beq _0803653A - b _08036624 -_0803653A: + beq @0803653A + b @08036624 +@0803653A: movs r0, 0x80 lsls r0, 5 ands r0, r1 cmp r0, 0 - beq _08036568 + beq @08036568 ldr r0, =gUnknown_82E9530 ldrb r0, [r0] cmp r0, 0x2 - bne _08036560 + bne @08036560 ldr r0, =0x08d7c154 - b _08036626 + b @08036626 .align 2, 0 .pool -_08036560: +@08036560: ldr r0, =0x08d7a720 - b _08036626 + b @08036626 .align 2, 0 .pool -_08036568: +@08036568: movs r0, 0x8 ands r1, r0 cmp r1, 0 - beq _08036598 + beq @08036598 ldr r2, =0x08310030 ldr r0, =0x02038bca ldrh r1, [r0] @@ -91400,38 +91400,38 @@ _08036568: adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0x20 - beq _08036624 + beq @08036624 cmp r0, 0x26 - bne _08036598 + bne @08036598 ldr r0, =0x08d7d2e0 - b _08036626 + b @08036626 .align 2, 0 .pool -_08036598: +@08036598: bl sav1_map_get_battletype lsls r0, 24 lsrs r0, 24 cmp r0, 0x8 - bhi _080365D8 + bhi @080365D8 lsls r0, 2 - ldr r1, =_080365B4 + ldr r1, =@080365B4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080365B4: - .4byte _080365D8 - .4byte _08036624 - .4byte _080365F4 - .4byte _080365FC - .4byte _08036604 - .4byte _0803660C - .4byte _08036614 - .4byte _0803661C - .4byte _08036624 -_080365D8: +@080365B4: + .4byte @080365D8 + .4byte @08036624 + .4byte @080365F4 + .4byte @080365FC + .4byte @08036604 + .4byte @0803660C + .4byte @08036614 + .4byte @0803661C + .4byte @08036624 +@080365D8: ldr r2, =0x0831aba8 ldr r0, =0x02022ff0 ldrb r1, [r0] @@ -91441,79 +91441,79 @@ _080365D8: adds r2, 0x4 adds r0, r2 ldr r0, [r0] - b _08036626 + b @08036626 .align 2, 0 .pool -_080365F4: +@080365F4: ldr r0, =0x08d7d2e0 - b _08036626 + b @08036626 .align 2, 0 .pool -_080365FC: +@080365FC: ldr r0, =0x08d7d2e0 - b _08036626 + b @08036626 .align 2, 0 .pool -_08036604: +@08036604: ldr r0, =0x08d7d2e0 - b _08036626 + b @08036626 .align 2, 0 .pool -_0803660C: +@0803660C: ldr r0, =0x08d7d2e0 - b _08036626 + b @08036626 .align 2, 0 .pool -_08036614: +@08036614: ldr r0, =0x08d7d2e0 - b _08036626 + b @08036626 .align 2, 0 .pool -_0803661C: +@0803661C: ldr r0, =0x08d7d2e0 - b _08036626 + b @08036626 .align 2, 0 .pool -_08036624: +@08036624: ldr r0, =0x08d7ca28 -_08036626: +@08036626: ldr r1, =0x0600d000 bl call_LZZUnCompVram - b _08036758 + b @08036758 .align 2, 0 .pool -_08036638: +@08036638: ldr r0, =0x02022fec ldr r1, [r0] ldr r0, =0x023f0902 ands r0, r1 cmp r0, 0 - beq _08036646 - b _08036740 -_08036646: + beq @08036646 + b @08036740 +@08036646: movs r0, 0x80 lsls r0, 5 ands r0, r1 cmp r0, 0 - beq _08036674 + beq @08036674 ldr r0, =gUnknown_82E9530 ldrb r0, [r0] cmp r0, 0x2 - bne _0803666C + bne @0803666C ldr r0, =0x08d7df30 - b _08036742 + b @08036742 .align 2, 0 .pool -_0803666C: +@0803666C: ldr r0, =0x08d7def4 - b _08036742 + b @08036742 .align 2, 0 .pool -_08036674: +@08036674: movs r0, 0x8 ands r1, r0 cmp r1, 0 - beq _080366AC + beq @080366AC ldr r2, =0x08310030 ldr r0, =0x02038bca ldrh r1, [r0] @@ -91523,43 +91523,43 @@ _08036674: adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0x20 - bne _080366A0 + bne @080366A0 ldr r0, =0x08d7dfc4 - b _08036742 + b @08036742 .align 2, 0 .pool -_080366A0: +@080366A0: cmp r0, 0x26 - bne _080366AC + bne @080366AC ldr r0, =0x08d7e1f8 - b _08036742 + b @08036742 .align 2, 0 .pool -_080366AC: +@080366AC: bl sav1_map_get_battletype lsls r0, 24 lsrs r0, 24 cmp r0, 0x8 - bhi _080366EC + bhi @080366EC lsls r0, 2 - ldr r1, =_080366C8 + ldr r1, =@080366C8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080366C8: - .4byte _080366EC - .4byte _08036708 - .4byte _08036710 - .4byte _08036718 - .4byte _08036720 - .4byte _08036728 - .4byte _08036730 - .4byte _08036738 - .4byte _08036740 -_080366EC: +@080366C8: + .4byte @080366EC + .4byte @08036708 + .4byte @08036710 + .4byte @08036718 + .4byte @08036720 + .4byte @08036728 + .4byte @08036730 + .4byte @08036738 + .4byte @08036740 +@080366EC: ldr r2, =0x0831aba8 ldr r0, =0x02022ff0 ldrb r1, [r0] @@ -91569,59 +91569,59 @@ _080366EC: adds r2, 0x10 adds r0, r2 ldr r0, [r0] - b _08036742 + b @08036742 .align 2, 0 .pool -_08036708: +@08036708: ldr r0, =0x08d7df88 - b _08036742 + b @08036742 .align 2, 0 .pool -_08036710: +@08036710: ldr r0, =0x08d7e060 - b _08036742 + b @08036742 .align 2, 0 .pool -_08036718: +@08036718: ldr r0, =0x08d7e000 - b _08036742 + b @08036742 .align 2, 0 .pool -_08036720: +@08036720: ldr r0, =0x08d7e0cc - b _08036742 + b @08036742 .align 2, 0 .pool -_08036728: +@08036728: ldr r0, =0x08d7e11c - b _08036742 + b @08036742 .align 2, 0 .pool -_08036730: +@08036730: ldr r0, =0x08d7e164 - b _08036742 + b @08036742 .align 2, 0 .pool -_08036738: +@08036738: ldr r0, =0x08d7e1a8 - b _08036742 + b @08036742 .align 2, 0 .pool -_08036740: +@08036740: ldr r0, =0x08d7c9ec -_08036742: +@08036742: movs r1, 0x20 movs r2, 0x60 bl decompress_palette - b _08036758 + b @08036758 .align 2, 0 .pool -_08036750: +@08036750: bl sub_803570C - b _08036758 -_08036756: + b @08036758 +@08036756: movs r4, 0x1 -_08036758: +@08036758: adds r0, r4, 0 pop {r4} pop {r1} @@ -91629,7 +91629,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 @@ -91641,47 +91641,47 @@ sub_8036760: @ 8036760 movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _080367CC + beq @080367CC movs r0, 0x80 lsls r0, 17 ands r0, r1 cmp r0, 0 - beq _08036798 + beq @08036798 bl sub_80367D4 - b _080367BA + b @080367BA .align 2, 0 .pool -_08036798: +@08036798: movs r0, 0x80 lsls r0, 15 ands r1, r0 cmp r1, 0 - bne _080367B4 + bne @080367B4 bl battle_wireless_setup_if_required_maybe ldr r0, =sub_8037ADC + 1 bl set_callback2 - b _080367BA + b @080367BA .align 2, 0 .pool -_080367B4: +@080367B4: ldr r0, =intro_end + 1 bl set_callback2 -_080367BA: +@080367BA: ldr r1, =0x02024332 movs r0, 0 strb r0, [r1] - b _080367D0 + b @080367D0 .align 2, 0 .pool -_080367CC: +@080367CC: bl sub_80367D4 -_080367D0: +@080367D0: pop {r0} bx r0 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 @@ -91719,12 +91719,12 @@ sub_80367D4: @ 80367D4 lsls r1, 15 ands r0, r1 cmp r0, 0 - beq _08036870 + beq @08036870 ldr r0, =0x02038bce ldrh r1, [r0] ldr r0, =0x00000c03 cmp r1, r0 - beq _08036870 + beq @08036870 ldr r1, =0x02022e26 movs r0, 0x9F strh r0, [r1] @@ -91733,10 +91733,10 @@ sub_80367D4: @ 80367D4 ldr r1, =0x02022e2a movs r0, 0x20 strh r0, [r1] - b _080368BE + b @080368BE .align 2, 0 .pool -_08036870: +@08036870: ldr r0, =0x02022e26 ldr r2, =0x00005051 adds r1, r2, 0 @@ -91748,14 +91748,14 @@ _08036870: lsls r5, 3 adds r2, r0, r5 movs r1, 0x4F -_08036888: +@08036888: strh r3, [r0] strh r3, [r2] adds r2, 0x2 adds r0, 0x2 subs r1, 0x1 cmp r1, 0 - bge _08036888 + bge @08036888 movs r1, 0x50 ldr r4, =0x0831ac70 ldr r0, =0x02038c28 @@ -91764,19 +91764,19 @@ _08036888: lsls r5, 4 adds r2, r0, r5 adds r0, 0xA0 -_080368A6: +@080368A6: strh r3, [r0] strh r3, [r2] adds r2, 0x2 adds r0, 0x2 adds r1, 0x1 cmp r1, 0x9F - ble _080368A6 + ble @080368A6 ldr r0, [r4] ldr r1, [r4, 0x4] ldr r2, [r4, 0x8] bl sub_80BA038 -_080368BE: +@080368BE: bl sub_80A1A74 ldr r0, =0x02022e14 movs r1, 0 @@ -91804,10 +91804,10 @@ _080368BE: lsls r1, 17 ands r0, r1 cmp r0, 0 - beq _080368FE + beq @080368FE movs r0, 0x8 strb r0, [r2] -_080368FE: +@080368FE: bl c2_berry_program_update_menu bl sub_8035AA4 bl reset_all_obj_data @@ -91826,38 +91826,38 @@ _080368FE: adds r0, r2, 0 ands r0, r1 cmp r0, r1 - beq _0803693E + beq @0803693E ldr r1, =0x00400040 adds r0, r2, 0 ands r0, r1 cmp r0, r1 - bne _08036994 -_0803693E: + bne @08036994 +@0803693E: ldr r0, =sub_8037458 + 1 bl set_callback2 - b _080369AE + b @080369AE .align 2, 0 .pool -_08036994: +@08036994: movs r0, 0x40 ands r2, r0 cmp r2, 0 - beq _080369A8 + beq @080369A8 ldr r0, =sub_8037DF4 + 1 bl set_callback2 - b _080369AE + b @080369AE .align 2, 0 .pool -_080369A8: +@080369A8: ldr r0, =sub_8036FAC + 1 bl set_callback2 -_080369AE: +@080369AE: ldr r5, =0x02022fec ldr r0, [r5] ldr r1, =0x01000002 ands r0, r1 cmp r0, 0 - bne _080369E8 + bne @080369E8 ldr r4, =0x02024744 ldr r0, =0x02038bca ldrh r1, [r0] @@ -91869,7 +91869,7 @@ _080369AE: lsls r1, 8 ands r0, r1 cmp r0, 0 - beq _080369E4 + beq @080369E4 movs r1, 0x96 lsls r1, 1 adds r0, r4, r1 @@ -91877,9 +91877,9 @@ _080369AE: ldrh r1, [r1] movs r2, 0 bl sub_80385E8 -_080369E4: +@080369E4: bl sub_806EA68 -_080369E8: +@080369E8: ldr r1, =0x030022c0 ldr r2, =0x00000439 adds r1, r2 @@ -91900,13 +91900,13 @@ _080369E8: movs r0, 0xFA lsls r0, 1 adds r5, r4, r0 -_08036A10: +@08036A10: adds r0, r4, 0 movs r1, 0x3 bl happiness_algorithm adds r4, 0x64 cmp r4, r5 - ble _08036A10 + ble @08036A10 movs r1, 0 ldr r0, =0x02024332 strb r1, [r0] @@ -91919,7 +91919,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 @@ -91931,7 +91931,7 @@ sub_8036A5C: @ 8036A5C lsls r0, 1 mov r10, r0 mov r8, r6 -_08036A72: +@08036A72: movs r0, 0x64 mov r4, r9 muls r4, r0 @@ -91952,56 +91952,56 @@ _08036A72: bl pokemon_getattr adds r1, r0, 0 cmp r5, 0 - beq _08036AEE + beq @08036AEE cmp r5, r10 - beq _08036ABA + beq @08036ABA cmp r7, 0 - beq _08036ABA + beq @08036ABA cmp r1, 0 - bne _08036ABA + bne @08036ABA movs r0, 0x1 mov r2, r8 lsls r0, r2 orrs r6, r0 lsls r0, r6, 16 lsrs r6, r0, 16 -_08036ABA: +@08036ABA: cmp r5, 0 - beq _08036AEE + beq @08036AEE cmp r7, 0 - beq _08036AD6 + beq @08036AD6 cmp r5, r10 - beq _08036ACA + beq @08036ACA cmp r1, 0 - beq _08036AD6 -_08036ACA: + beq @08036AD6 +@08036ACA: movs r0, 0x2 mov r1, r8 lsls r0, r1 orrs r6, r0 lsls r0, r6, 16 lsrs r6, r0, 16 -_08036AD6: +@08036AD6: cmp r5, 0 - beq _08036AEE + beq @08036AEE cmp r5, r10 - beq _08036AEE + beq @08036AEE cmp r7, 0 - bne _08036AEE + bne @08036AEE movs r0, 0x3 mov r2, r8 lsls r0, r2 orrs r6, r0 lsls r0, r6, 16 lsrs r6, r0, 16 -_08036AEE: +@08036AEE: movs r0, 0x2 add r8, r0 movs r1, 0x1 add r9, r1 mov r2, r9 cmp r2, 0x5 - ble _08036A72 + ble @08036A72 ldr r4, =0x0202449c ldr r0, [r4] movs r1, 0xC1 @@ -92033,7 +92033,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] @@ -92042,7 +92042,7 @@ sub_8036B44: @ 8036B44 adds r4, r5, r0 bl sub_80E162C cmp r0, 0x1 - bne _08036BC0 + bne @08036BC0 movs r2, 0 ldr r7, =0x03005d8c movs r1, 0xC6 @@ -92050,7 +92050,7 @@ sub_8036B44: @ 8036B44 adds r5, r1 adds r6, r7, 0 ldr r3, =0x000031f8 -_08036B66: +@08036B66: adds r0, r4, r2 ldr r1, [r6] adds r1, r3 @@ -92059,7 +92059,7 @@ _08036B66: strb r1, [r0] adds r2, 0x1 cmp r2, 0x5 - ble _08036B66 + ble @08036B66 adds r1, r4, r2 movs r0, 0xFF strb r0, [r1] @@ -92067,7 +92067,7 @@ _08036B66: adds r3, r5, 0 ldr r6, =0x03005d8c ldr r5, =0x00003214 -_08036B86: +@08036B86: adds r0, r3, r2 ldr r1, [r6] adds r1, r5 @@ -92076,7 +92076,7 @@ _08036B86: strb r1, [r0] adds r2, 0x1 cmp r2, 0x11 - ble _08036B86 + ble @08036B86 ldr r0, [r7] ldr r1, =0x00003226 adds r0, r1 @@ -92086,10 +92086,10 @@ _08036B86: adds r1, 0x1 adds r0, r1 ldrb r0, [r0] - b _08036C00 + b @08036C00 .align 2, 0 .pool -_08036BC0: +@08036BC0: movs r0, 0xAF bl berryid_from_itemid lsls r0, 24 @@ -92100,14 +92100,14 @@ _08036BC0: movs r0, 0xC6 lsls r0, 1 adds r5, r0 -_08036BD8: +@08036BD8: adds r0, r4, r2 adds r1, r3, r2 ldrb r1, [r1] strb r1, [r0] adds r2, 0x1 cmp r2, 0x5 - ble _08036BD8 + ble @08036BD8 adds r1, r4, r2 movs r0, 0xFF strb r0, [r1] @@ -92115,14 +92115,14 @@ _08036BD8: movs r2, 0 adds r1, r0, 0 adds r1, 0x11 -_08036BF4: +@08036BF4: strb r2, [r1] subs r1, 0x1 cmp r1, r0 - bge _08036BF4 + bge @08036BF4 movs r0, 0 strb r0, [r4, 0x7] -_08036C00: +@08036C00: strb r0, [r4, 0x1A] pop {r4-r7} pop {r0} @@ -92130,7 +92130,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 @@ -92141,12 +92141,12 @@ berry_801017C: @ 8036C08 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08036C20 - b _08036D4C -_08036C20: + beq @08036C20 + b @08036D4C +@08036C20: bl sub_80E162C cmp r0, 0x1 - bne _08036CDC + bne @08036CDC movs r5, 0 ldr r3, =0x02024404 ldr r0, =0x03005d8c @@ -92156,7 +92156,7 @@ _08036C20: ldr r2, =0x000031f8 adds r7, r3, 0 adds r7, 0x38 -_08036C3A: +@08036C3A: adds r1, r5, r6 ldr r0, [r4] adds r0, r2 @@ -92171,7 +92171,7 @@ _08036C3A: strb r0, [r1] adds r5, 0x1 cmp r5, 0x5 - ble _08036C3A + ble @08036C3A adds r1, r5, r3 movs r0, 0xFF strb r0, [r1] @@ -92188,7 +92188,7 @@ _08036C3A: ldr r2, =0x00003214 adds r6, r3, 0 adds r6, 0x40 -_08036C78: +@08036C78: adds r1, r5, r7 ldr r0, [r4] adds r0, r2 @@ -92203,7 +92203,7 @@ _08036C78: strb r0, [r1] adds r5, 0x1 cmp r5, 0x11 - ble _08036C78 + ble @08036C78 mov r1, r8 ldr r0, [r1] ldr r2, =0x00003226 @@ -92224,10 +92224,10 @@ _08036C78: adds r0, r3, 0 adds r0, 0x52 strb r1, [r0] - b _08036EA0 + b @08036EA0 .align 2, 0 .pool -_08036CDC: +@08036CDC: movs r0, 0xAF bl berryid_from_itemid lsls r0, 24 @@ -92239,7 +92239,7 @@ _08036CDC: adds r7, r4, 0 adds r7, 0x38 adds r3, r4, 0 -_08036CF6: +@08036CF6: adds r1, r5, r4 adds r2, r6, r5 ldrb r0, [r2] @@ -92249,7 +92249,7 @@ _08036CF6: strb r0, [r1] adds r5, 0x1 cmp r5, 0x5 - ble _08036CF6 + ble @08036CF6 adds r1, r5, r3 movs r0, 0xFF strb r0, [r1] @@ -92265,14 +92265,14 @@ _08036CF6: movs r1, 0 adds r2, r3, 0 adds r2, 0x40 -_08036D28: +@08036D28: adds r0, r5, r4 strb r1, [r0] adds r0, r5, r2 strb r1, [r0] adds r5, 0x1 cmp r5, 0x11 - ble _08036D28 + ble @08036D28 movs r1, 0 strb r1, [r3, 0x7] adds r0, r3, 0 @@ -92281,29 +92281,29 @@ _08036D28: strb r1, [r3, 0x1A] adds r0, 0x13 strb r1, [r0] - b _08036EA0 + b @08036EA0 .align 2, 0 .pool -_08036D4C: +@08036D4C: movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _08036DF0 + beq @08036DF0 movs r0, 0x80 lsls r0, 1 ands r1, r0 movs r2, 0x4 mov r8, r2 cmp r1, 0 - beq _08036D66 + beq @08036D66 movs r4, 0x2 mov r8, r4 -_08036D66: +@08036D66: movs r5, 0 cmp r5, r8 - blt _08036D6E - b _08036EA0 -_08036D6E: + blt @08036D6E + b @08036EA0 +@08036D6E: ldr r0, =0x020229e8 mov r12, r0 ldr r3, =0x02024404 @@ -92311,7 +92311,7 @@ _08036D6E: movs r1, 0x8 adds r1, r6 mov r9, r1 -_08036D7C: +@08036D7C: lsls r1, r5, 8 ldr r0, =0x020223c8 adds r7, r1, r0 @@ -92328,14 +92328,14 @@ _08036D7C: adds r5, r1, 0 lsls r0, 2 adds r1, r0, r6 -_08036D9C: +@08036D9C: adds r0, r7, r4 ldrb r0, [r0] strb r0, [r1] adds r1, 0x1 adds r4, 0x1 cmp r4, 0x5 - ble _08036D9C + ble @08036D9C subs r0, r5, r3 lsls r0, 2 adds r1, r4, r0 @@ -92347,14 +92347,14 @@ _08036D9C: adds r1, r0, r2 adds r2, r7, 0 adds r2, 0x8 -_08036DC0: +@08036DC0: adds r0, r2, r4 ldrb r0, [r0] strb r0, [r1] adds r1, 0x1 adds r4, 0x1 cmp r4, 0x11 - ble _08036DC0 + ble @08036DC0 subs r0, r5, r3 lsls r0, 2 adds r0, r6 @@ -92364,15 +92364,15 @@ _08036DC0: strb r1, [r0, 0x1A] mov r5, r10 cmp r5, r8 - blt _08036D7C - b _08036EA0 + blt @08036D7C + b @08036EA0 .align 2, 0 .pool -_08036DF0: +@08036DF0: movs r5, 0 ldr r4, =0x02024404 mov r9, r4 -_08036DF6: +@08036DF6: lsls r0, r5, 8 ldr r1, =0x020223c8 adds r7, r0, r1 @@ -92392,7 +92392,7 @@ _08036DF6: adds r3, r0, r2 lsls r1, 2 adds r2, r1, r2 -_08036E1C: +@08036E1C: adds r0, r7, r4 ldrb r1, [r0] strb r1, [r2] @@ -92402,7 +92402,7 @@ _08036E1C: adds r2, 0x1 adds r4, 0x1 cmp r4, 0x5 - ble _08036E1C + ble @08036E1C mov r0, r8 subs r3, r0, r5 lsls r3, 2 @@ -92429,7 +92429,7 @@ _08036E1C: adds r3, r0 adds r6, r7, 0 adds r6, 0x8 -_08036E64: +@08036E64: adds r0, r6, r4 ldrb r1, [r0] strb r1, [r3] @@ -92439,7 +92439,7 @@ _08036E64: adds r3, 0x1 adds r4, 0x1 cmp r4, 0x11 - ble _08036E64 + ble @08036E64 mov r0, r8 subs r2, r0, r5 lsls r2, 2 @@ -92459,8 +92459,8 @@ _08036E64: strb r1, [r0, 0x1A] mov r5, r10 cmp r5, 0x1 - ble _08036DF6 -_08036EA0: + ble @08036DF6 +@08036EA0: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -92473,7 +92473,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} @@ -92488,118 +92488,118 @@ sub_8036EB8: @ 8036EB8 lsls r1, 1 mov r12, r0 cmp r2, r1 - bne _08036EFC + bne @08036EFC cmp r3, 0 - bne _08036EEC + bne @08036EEC ldr r0, =0x02022fec ldr r1, [r0] movs r2, 0xC - b _08036EF2 + b @08036EF2 .align 2, 0 .pool -_08036EEC: +@08036EEC: ldr r0, =0x02022fec ldr r1, [r0] movs r2, 0x8 -_08036EF2: +@08036EF2: orrs r1, r2 str r1, [r0] adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_08036EFC: +@08036EFC: cmp r6, 0 - bne _08036FA0 + bne @08036FA0 movs r2, 0 cmp r2, r4 - bge _08036F20 + bge @08036F20 ldr r1, =0x020223c4 mov r8, r1 movs r5, 0x80 lsls r5, 1 -_08036F0E: +@08036F0E: adds r1, r5 adds r2, 0x1 cmp r2, r4 - bge _08036F20 + bge @08036F20 mov r7, r8 ldrh r0, [r7] ldrh r7, [r1] cmp r0, r7 - beq _08036F0E -_08036F20: + beq @08036F0E +@08036F20: cmp r2, r4 - bne _08036F48 + bne @08036F48 cmp r3, 0 - bne _08036F38 + bne @08036F38 ldr r0, =0x02022fec ldr r1, [r0] movs r2, 0xC - b _08036F3E + b @08036F3E .align 2, 0 .pool -_08036F38: +@08036F38: ldr r0, =0x02022fec ldr r1, [r0] movs r2, 0x8 -_08036F3E: +@08036F3E: orrs r1, r2 str r1, [r0] adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_08036F48: +@08036F48: cmp r6, 0 - bne _08036FA0 + bne @08036FA0 movs r2, 0 ldr r5, =0x02022fec cmp r2, r4 - bge _08036F8A + bge @08036F8A mov r0, r12 ldrh r1, [r0] movs r0, 0xC0 lsls r0, 2 cmp r1, r0 - beq _08036F82 -_08036F60: + beq @08036F82 +@08036F60: lsls r0, r2, 8 add r0, r12 ldrh r0, [r0] movs r1, 0xC0 lsls r1, 2 cmp r0, r1 - bls _08036F72 + bls @08036F72 cmp r2, r3 - bne _08036F8A -_08036F72: + bne @08036F8A +@08036F72: adds r2, 0x1 cmp r2, r4 - bge _08036F8A + bge @08036F8A lsls r0, r2, 8 add r0, r12 ldrh r0, [r0] cmp r0, r1 - bne _08036F60 -_08036F82: + bne @08036F60 +@08036F82: cmp r2, r3 - beq _08036F60 + beq @08036F60 cmp r2, r3 - bge _08036F60 -_08036F8A: + bge @08036F60 +@08036F8A: cmp r2, r4 - bne _08036F98 + bne @08036F98 ldr r0, [r5] movs r1, 0xC - b _08036F9C + b @08036F9C .align 2, 0 .pool -_08036F98: +@08036F98: ldr r0, [r5] movs r1, 0x8 -_08036F9C: +@08036F9C: orrs r0, r1 str r0, [r5] -_08036FA0: +@08036FA0: pop {r3} mov r8, r3 pop {r4-r7} @@ -92608,7 +92608,7 @@ _08036FA0: thumb_func_end sub_8036EB8 thumb_func_start sub_8036FAC -sub_8036FAC: @ 8036FAC +sub_8036FAC: ; 8036FAC push {r4-r6,lr} bl run_active_tasks bl call_obj_callbacks @@ -92625,42 +92625,42 @@ sub_8036FAC: @ 8036FAC ldr r0, =0x02024332 ldrb r0, [r0] cmp r0, 0x12 - bls _08036FD8 - b _0803744C -_08036FD8: + bls @08036FD8 + b @0803744C +@08036FD8: lsls r0, 2 - ldr r1, =_08036FF0 + ldr r1, =@08036FF0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08036FF0: - .4byte _0803703C - .4byte _08037080 - .4byte _08037144 - .4byte _080371D8 - .4byte _08037200 - .4byte _0803742C - .4byte _08037438 - .4byte _08037230 - .4byte _08037258 - .4byte _0803742C - .4byte _08037438 - .4byte _08037288 - .4byte _080372B0 - .4byte _0803742C - .4byte _08037438 - .4byte _08037318 - .4byte _08037378 - .4byte _080373A0 - .4byte _080373E0 -_0803703C: +@08036FF0: + .4byte @0803703C + .4byte @08037080 + .4byte @08037144 + .4byte @080371D8 + .4byte @08037200 + .4byte @0803742C + .4byte @08037438 + .4byte @08037230 + .4byte @08037258 + .4byte @0803742C + .4byte @08037438 + .4byte @08037288 + .4byte @080372B0 + .4byte @0803742C + .4byte @08037438 + .4byte @08037318 + .4byte @08037378 + .4byte @080373A0 + .4byte @080373E0 +@0803703C: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _08037068 + bne @08037068 movs r0, 0 bl gpu_sync_bg_show movs r0, 0x1 @@ -92673,35 +92673,35 @@ _0803703C: ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1] -_08037068: +@08037068: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - bne _08037072 - b _0803744C -_08037072: + bne @08037072 + b @0803744C +@08037072: bl sub_800E0E8 - b _0803744C + b @0803744C .align 2, 0 .pool -_08037080: +@08037080: ldr r2, =0x02022fec ldr r1, [r2] movs r6, 0x2 adds r0, r1, 0 ands r0, r6 cmp r0, 0 - beq _08037124 + beq @08037124 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _08037098 - b _0803744C -_08037098: + bne @08037098 + b @0803744C +@08037098: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080370EE + beq @080370EE ldr r4, =0x0202449c ldr r0, [r4] movs r5, 0xC0 @@ -92721,13 +92721,13 @@ _08037098: movs r0, 0xC0 lsls r0, 4 cmp r1, r0 - bne _080370D8 + bne @080370D8 ldr r0, =0x020229e8 movs r1, 0 strh r1, [r0, 0x18] movs r1, 0x1 strh r1, [r0, 0x34] -_080370D8: +@080370D8: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 @@ -92737,44 +92737,44 @@ _080370D8: bl link_0800A448 ldr r0, =0x02024332 strb r6, [r0] -_080370EE: +@080370EE: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - bne _080370F8 - b _0803744C -_080370F8: + bne @080370F8 + b @0803744C +@080370F8: movs r0, 0 movs r1, 0 bl sub_800DFB4 - b _0803744C + b @0803744C .align 2, 0 .pool -_08037124: +@08037124: movs r0, 0x80 lsls r0, 17 ands r0, r1 cmp r0, 0 - bne _08037134 + bne @08037134 movs r0, 0x4 orrs r1, r0 str r1, [r2] -_08037134: +@08037134: ldr r1, =0x02024332 movs r0, 0xF strb r0, [r1] bl berry_801017C - b _0803744C + b @0803744C .align 2, 0 .pool -_08037144: +@08037144: bl sub_800A550 movs r1, 0x3 ands r1, r0 cmp r1, 0x3 - beq _08037152 - b _0803744C -_08037152: + beq @08037152 + b @0803744C +@08037152: bl sub_800A5B4 movs r0, 0x2 adds r1, r6, 0 @@ -92823,16 +92823,16 @@ _08037152: bl sub_8185F90 bl sub_8068AA4 ldr r1, =0x02024332 - b _08037446 + b @08037446 .align 2, 0 .pool -_080371D8: +@080371D8: bl sub_800A520 lsls r0, 24 cmp r0, 0 - bne _080371E4 - b _0803744C -_080371E4: + bne @080371E4 + b @0803744C +@080371E4: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 @@ -92840,17 +92840,17 @@ _080371E4: movs r2, 0xC8 bl link_0800A448 ldr r1, =0x02024332 - b _08037446 + b @08037446 .align 2, 0 .pool -_08037200: +@08037200: bl sub_800A550 movs r1, 0x3 ands r1, r0 cmp r1, 0x3 - beq _0803720E - b _0803744C -_0803720E: + beq @0803720E + b @0803744C +@0803720E: bl sub_800A5B4 ldr r0, =0x02024744 lsls r1, r5, 8 @@ -92859,16 +92859,16 @@ _0803720E: movs r2, 0xC8 bl memcpy ldr r1, =0x02024332 - b _08037446 + b @08037446 .align 2, 0 .pool -_08037230: +@08037230: bl sub_800A520 lsls r0, 24 cmp r0, 0 - bne _0803723C - b _0803744C -_0803723C: + bne @0803723C + b @0803744C +@0803723C: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 @@ -92876,17 +92876,17 @@ _0803723C: movs r2, 0xC8 bl link_0800A448 ldr r1, =0x02024332 - b _08037446 + b @08037446 .align 2, 0 .pool -_08037258: +@08037258: bl sub_800A550 movs r1, 0x3 ands r1, r0 cmp r1, 0x3 - beq _08037266 - b _0803744C -_08037266: + beq @08037266 + b @0803744C +@08037266: bl sub_800A5B4 ldr r0, =0x0202480c lsls r1, r5, 8 @@ -92895,16 +92895,16 @@ _08037266: movs r2, 0xC8 bl memcpy ldr r1, =0x02024332 - b _08037446 + b @08037446 .align 2, 0 .pool -_08037288: +@08037288: bl sub_800A520 lsls r0, 24 cmp r0, 0 - bne _08037294 - b _0803744C -_08037294: + bne @08037294 + b @0803744C +@08037294: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 @@ -92912,17 +92912,17 @@ _08037294: movs r2, 0xC8 bl link_0800A448 ldr r1, =0x02024332 - b _08037446 + b @08037446 .align 2, 0 .pool -_080372B0: +@080372B0: bl sub_800A550 movs r1, 0x3 ands r1, r0 cmp r1, 0x3 - beq _080372BE - b _0803744C -_080372BE: + beq @080372BE + b @0803744C +@080372BE: bl sub_800A5B4 ldr r4, =0x020248d4 lsls r1, r5, 8 @@ -92949,10 +92949,10 @@ _080372BE: adds r0, 0x64 bl shedinja_something ldr r1, =0x02024332 - b _08037446 + b @08037446 .align 2, 0 .pool -_08037318: +@08037318: bl sub_8032768 bl sub_8184E58 ldr r2, =0x02024332 @@ -92964,46 +92964,46 @@ _08037318: movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _08037372 + beq @08037372 movs r3, 0 ldr r1, =0x020229e8 ldrb r0, [r1] adds r5, r2, 0 cmp r0, 0x3 - bne _08037356 + bne @08037356 movs r4, 0xFF adds r2, r1, 0 -_08037344: +@08037344: adds r2, 0x1C adds r3, 0x1 cmp r3, 0x1 - bgt _08037356 + bgt @08037356 ldrh r1, [r2] adds r0, r4, 0 ands r0, r1 cmp r0, 0x3 - beq _08037344 -_08037356: + beq @08037344 +@08037356: cmp r3, 0x2 - bne _0803736C + bne @0803736C movs r0, 0x10 strb r0, [r5] - b _0803744C + b @0803744C .align 2, 0 .pool -_0803736C: +@0803736C: movs r0, 0x12 strb r0, [r5] - b _0803744C -_08037372: + b @0803744C +@08037372: movs r0, 0x12 strb r0, [r2] - b _0803744C -_08037378: + b @0803744C +@08037378: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _0803744C + beq @0803744C bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 @@ -93011,40 +93011,40 @@ _08037378: movs r2, 0x4 bl link_0800A448 ldr r1, =0x02024332 - b _08037446 + b @08037446 .align 2, 0 .pool -_080373A0: +@080373A0: bl sub_800A550 movs r1, 0x3 ands r1, r0 cmp r1, 0x3 - bne _0803744C + bne @0803744C bl sub_800A5B4 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x4 ands r0, r1 cmp r0, 0 - bne _080373CA + bne @080373CA ldr r0, =0x0203bd2c lsls r1, r5, 8 ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x4 bl memcpy -_080373CA: +@080373CA: ldr r1, =0x02024332 - b _08037446 + b @08037446 .align 2, 0 .pool -_080373E0: +@080373E0: ldr r0, =0x02024333 adds r1, r0, 0x1 bl battle_load_something lsls r0, 24 cmp r0, 0 - beq _0803744C + beq @0803744C ldr r2, =0x03005d00 ldr r1, =0x030022c0 ldr r0, [r1] @@ -93058,33 +93058,33 @@ _080373E0: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0803744C + beq @0803744C movs r0, 0x20 orrs r1, r0 str r1, [r2] - b _0803744C + b @0803744C .align 2, 0 .pool -_0803742C: +@0803742C: ldr r0, =0x02024332 ldrb r1, [r0] adds r1, 0x1 strb r1, [r0] movs r1, 0x1 strb r1, [r0, 0x1] -_08037438: +@08037438: ldr r1, =0x02024332 ldrb r0, [r1, 0x1] subs r0, 0x1 strb r0, [r1, 0x1] lsls r0, 24 cmp r0, 0 - bne _0803744C -_08037446: + bne @0803744C +@08037446: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_0803744C: +@0803744C: pop {r4-r6} pop {r0} bx r0 @@ -93093,7 +93093,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 run_active_tasks @@ -93111,40 +93111,40 @@ sub_8037458: @ 8037458 ldr r0, =0x02024332 ldrb r0, [r0] cmp r0, 0x10 - bls _08037486 - b _080379D6 -_08037486: + bls @08037486 + b @080379D6 +@08037486: lsls r0, 2 - ldr r1, =_0803749C + ldr r1, =@0803749C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0803749C: - .4byte _080374E0 - .4byte _08037518 - .4byte _0803761C - .4byte _08037670 - .4byte _08037694 - .4byte _08037710 - .4byte _08037734 - .4byte _080377B0 - .4byte _080377CC - .4byte _080377FC - .4byte _08037818 - .4byte _08037848 - .4byte _08037864 - .4byte _08037908 - .4byte _0803793A - .4byte _0803795C - .4byte _080379A0 -_080374E0: +@0803749C: + .4byte @080374E0 + .4byte @08037518 + .4byte @0803761C + .4byte @08037670 + .4byte @08037694 + .4byte @08037710 + .4byte @08037734 + .4byte @080377B0 + .4byte @080377CC + .4byte @080377FC + .4byte @08037818 + .4byte @08037848 + .4byte @08037864 + .4byte @08037908 + .4byte @0803793A + .4byte @0803795C + .4byte @080379A0 +@080374E0: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0803750C + bne @0803750C movs r0, 0 bl gpu_sync_bg_show movs r0, 0x1 @@ -93157,26 +93157,26 @@ _080374E0: ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1] -_0803750C: +@0803750C: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _08037518 + beq @08037518 bl sub_800E0E8 -_08037518: +@08037518: ldr r2, =0x02022fec ldr r1, [r2] movs r3, 0x2 adds r0, r1, 0 ands r0, r3 cmp r0, 0 - beq _080375FC + beq @080375FC ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _08037530 - b _080379D6 -_08037530: + bne @08037530 + b @080379D6 +@08037530: ldr r6, =0x020229e8 movs r0, 0 strh r0, [r6, 0x18] @@ -93217,7 +93217,7 @@ _08037530: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080375C4 + beq @080375C4 ldr r4, =0x0202449c ldr r0, [r4] movs r5, 0xC0 @@ -93242,44 +93242,44 @@ _08037530: ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1] -_080375C4: +@080375C4: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - bne _080375CE - b _080379D6 -_080375CE: + bne @080375CE + b @080379D6 +@080375CE: movs r0, 0 movs r1, 0 bl sub_800DFB4 - b _080379D6 + b @080379D6 .align 2, 0 .pool -_080375FC: +@080375FC: movs r0, 0x80 lsls r0, 17 ands r0, r1 cmp r0, 0 - bne _0803760C + bne @0803760C movs r0, 0x4 orrs r1, r0 str r1, [r2] -_0803760C: +@0803760C: ldr r1, =0x02024332 movs r0, 0xD strb r0, [r1] bl berry_801017C - b _080379D6 + b @080379D6 .align 2, 0 .pool -_0803761C: +@0803761C: bl sub_800A550 movs r1, 0x3 ands r1, r0 cmp r1, 0x3 - beq _0803762A - b _080379D6 -_0803762A: + beq @0803762A + b @080379D6 +@0803762A: bl sub_800A5B4 movs r0, 0x2 adds r1, r6, 0 @@ -93305,34 +93305,34 @@ _0803762A: adds r0, 0xEB strh r0, [r1, 0xE] strh r0, [r1, 0x10] - b _08037986 + b @08037986 .align 2, 0 .pool -_08037670: +@08037670: bl sub_800A520 lsls r0, 24 cmp r0, 0 - bne _0803767C - b _080379D6 -_0803767C: + bne @0803767C + b @080379D6 +@0803767C: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 ldr r1, =0x020244ec -_08037686: +@08037686: movs r2, 0xC8 bl link_0800A448 - b _08037986 + b @08037986 .align 2, 0 .pool -_08037694: +@08037694: bl sub_800A550 movs r1, 0x3 ands r1, r0 cmp r1, 0x3 - beq _080376A2 - b _080379D6 -_080376A2: + beq @080376A2 + b @080379D6 +@080376A2: bl sub_800A5B4 ldr r0, =0x020229e8 lsls r1, r6, 3 @@ -93341,7 +93341,7 @@ _080376A2: adds r1, r0 ldrh r0, [r1, 0x18] cmp r0, 0 - beq _080376E8 + beq @080376E8 ldr r4, =0x020244ec lsls r1, r7, 8 ldr r5, =0x020223c4 @@ -93357,10 +93357,10 @@ _080376A2: adds r0, r4, 0 movs r2, 0xC8 bl memcpy - b _08037986 + b @08037986 .align 2, 0 .pool -_080376E8: +@080376E8: ldr r4, =0x020244ec lsls r1, r6, 8 ldr r5, =0x020223c4 @@ -93375,33 +93375,33 @@ _080376E8: adds r1, r5 adds r0, r4, 0 movs r2, 0xC8 - b _08037982 + b @08037982 .align 2, 0 .pool -_08037710: +@08037710: bl sub_800A520 lsls r0, 24 cmp r0, 0 - bne _0803771C - b _080379D6 -_0803771C: + bne @0803771C + b @080379D6 +@0803771C: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 ldr r1, =0x020245b4 movs r2, 0x64 bl link_0800A448 - b _08037986 + b @08037986 .align 2, 0 .pool -_08037734: +@08037734: bl sub_800A550 movs r1, 0x3 ands r1, r0 cmp r1, 0x3 - beq _08037742 - b _080379D6 -_08037742: + beq @08037742 + b @080379D6 +@08037742: bl sub_800A5B4 ldr r0, =0x020229e8 lsls r1, r6, 3 @@ -93410,7 +93410,7 @@ _08037742: adds r1, r0 ldrh r0, [r1, 0x18] cmp r0, 0 - beq _08037788 + beq @08037788 ldr r4, =0x020245b4 lsls r1, r7, 8 ldr r5, =0x020223c4 @@ -93426,10 +93426,10 @@ _08037742: adds r0, r4, 0 movs r2, 0x64 bl memcpy - b _08037986 + b @08037986 .align 2, 0 .pool -_08037788: +@08037788: ldr r4, =0x020245b4 lsls r1, r6, 8 ldr r5, =0x020223c4 @@ -93444,111 +93444,111 @@ _08037788: adds r1, r5 adds r0, r4, 0 movs r2, 0x64 - b _08037982 + b @08037982 .align 2, 0 .pool -_080377B0: +@080377B0: bl sub_800A520 lsls r0, 24 cmp r0, 0 - bne _080377BC - b _080379D6 -_080377BC: + bne @080377BC + b @080379D6 +@080377BC: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 ldr r1, =0x02024744 - b _08037686 + b @08037686 .align 2, 0 .pool -_080377CC: +@080377CC: bl sub_800A550 movs r1, 0x3 ands r1, r0 cmp r1, 0x3 - beq _080377DA - b _080379D6 -_080377DA: + beq @080377DA + b @080379D6 +@080377DA: bl sub_800A5B4 bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - bne _080377EA - b _08037986 -_080377EA: + bne @080377EA + b @08037986 +@080377EA: ldr r0, =0x02024744 ldr r1, =0x020223c4 movs r2, 0xC8 - b _08037982 + b @08037982 .align 2, 0 .pool -_080377FC: +@080377FC: bl sub_800A520 lsls r0, 24 cmp r0, 0 - bne _08037808 - b _080379D6 -_08037808: + bne @08037808 + b @080379D6 +@08037808: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 ldr r1, =0x0202480c - b _08037686 + b @08037686 .align 2, 0 .pool -_08037818: +@08037818: bl sub_800A550 movs r1, 0x3 ands r1, r0 cmp r1, 0x3 - beq _08037826 - b _080379D6 -_08037826: + beq @08037826 + b @080379D6 +@08037826: bl sub_800A5B4 bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - bne _08037836 - b _08037986 -_08037836: + bne @08037836 + b @08037986 +@08037836: ldr r0, =0x0202480c ldr r1, =0x020223c4 movs r2, 0xC8 - b _08037982 + b @08037982 .align 2, 0 .pool -_08037848: +@08037848: bl sub_800A520 lsls r0, 24 cmp r0, 0 - bne _08037854 - b _080379D6 -_08037854: + bne @08037854 + b @080379D6 +@08037854: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 ldr r1, =0x020248d4 - b _08037686 + b @08037686 .align 2, 0 .pool -_08037864: +@08037864: bl sub_800A550 movs r1, 0x3 ands r1, r0 cmp r1, 0x3 - beq _08037872 - b _080379D6 -_08037872: + beq @08037872 + b @080379D6 +@08037872: bl sub_800A5B4 bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - beq _0803788A + beq @0803788A ldr r0, =0x020248d4 ldr r1, =0x020223c4 movs r2, 0xC8 bl memcpy -_0803788A: +@0803788A: ldr r4, =0x020244ec adds r0, r4, 0 bl shedinja_something @@ -93591,10 +93591,10 @@ _0803788A: lsls r2, 1 adds r0, r4, r2 bl shedinja_something - b _08037986 + b @08037986 .align 2, 0 .pool -_08037908: +@08037908: bl sub_8032768 bl sub_8184E58 ldr r2, =0x02024332 @@ -93606,65 +93606,65 @@ _08037908: movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _08037934 + beq @08037934 movs r0, 0xE strb r0, [r2] - b _080379D6 + b @080379D6 .align 2, 0 .pool -_08037934: +@08037934: movs r0, 0x10 strb r0, [r2] - b _080379D6 -_0803793A: + b @080379D6 +@0803793A: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080379D6 + beq @080379D6 bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 ldr r1, =0x0203bd2c movs r2, 0x4 bl link_0800A448 - b _08037986 + b @08037986 .align 2, 0 .pool -_0803795C: +@0803795C: bl sub_800A550 movs r1, 0x3 ands r1, r0 cmp r1, 0x3 - bne _080379D6 + bne @080379D6 bl sub_800A5B4 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x4 ands r0, r1 cmp r0, 0 - bne _08037986 + bne @08037986 ldr r0, =0x0203bd2c lsls r1, r7, 8 ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x4 -_08037982: +@08037982: bl memcpy -_08037986: +@08037986: ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080379D6 + b @080379D6 .align 2, 0 .pool -_080379A0: +@080379A0: ldr r0, =0x02024333 adds r1, r0, 0x1 bl battle_load_something lsls r0, 24 cmp r0, 0 - beq _080379D6 + beq @080379D6 bl sub_8166188 ldr r2, =0x03005d00 ldr r1, =0x030022c0 @@ -93679,11 +93679,11 @@ _080379A0: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080379D6 + beq @080379D6 movs r0, 0x20 orrs r1, r0 str r1, [r2] -_080379D6: +@080379D6: add sp, 0x4 pop {r4-r7} pop {r0} @@ -93693,7 +93693,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 @@ -93707,7 +93707,7 @@ sub_80379F8: @ 80379F8 mov r8, r0 ldr r6, =0x02022ff8 mov r10, r6 -_08037A12: +@08037A12: ldr r1, [sp] add r1, r8 movs r0, 0x64 @@ -93765,17 +93765,17 @@ _08037A12: movs r1, 0x3 bl pokemon_getattr cmp r0, 0x1 - beq _08037AA4 + beq @08037AA4 adds r0, r7, 0 movs r1, 0 bl sub_81DB4DC -_08037AA4: +@08037AA4: adds r6, 0x20 movs r1, 0x1 add r8, r1 mov r0, r8 cmp r0, 0x2 - ble _08037A12 + ble @08037A12 ldr r0, =0x02023058 ldr r0, [r0] mov r1, r9 @@ -93795,7 +93795,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 @@ -93811,11 +93811,11 @@ sub_8037ADC: @ 8037ADC lsls r1, 1 ands r0, r1 cmp r0, 0 - beq _08037B02 + beq @08037B02 movs r1, 0x2 mov r9, r1 movs r4, 0x3 -_08037B02: +@08037B02: bl link_get_multiplayer_id lsls r0, 24 lsrs r7, r0, 24 @@ -93837,37 +93837,37 @@ _08037B02: ldr r5, =0x02024332 ldrb r0, [r5] cmp r0, 0x1 - beq _08037BA4 + beq @08037BA4 cmp r0, 0x1 - bgt _08037B50 + bgt @08037B50 cmp r0, 0 - beq _08037B5E - b _08037D0A + beq @08037B5E + b @08037D0A .align 2, 0 .pool -_08037B50: +@08037B50: cmp r0, 0x2 - bne _08037B56 - b _08037C64 -_08037B56: + bne @08037B56 + b @08037C64 +@08037B56: cmp r0, 0x3 - bne _08037B5C - b _08037C9E -_08037B5C: - b _08037D0A -_08037B5E: + bne @08037B5C + b @08037C9E +@08037B5C: + b @08037D0A +@08037B5E: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _08037B68 - b _08037D0A -_08037B68: + bne @08037B68 + b @08037D0A +@08037B68: bl sub_800A520 lsls r0, 24 cmp r0, 0 - bne _08037B74 - b _08037D0A -_08037B74: + bne @08037B74 + b @08037D0A +@08037B74: ldr r4, =0x02023058 movs r0, 0x60 bl malloc @@ -93883,32 +93883,32 @@ _08037B74: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] - b _08037D0A + b @08037D0A .align 2, 0 .pool -_08037BA4: +@08037BA4: bl sub_800A550 adds r1, r4, 0 ands r1, r0 cmp r1, r4 - beq _08037BB2 - b _08037D0A -_08037BB2: + beq @08037BB2 + b @08037D0A +@08037BB2: bl sub_800A5B4 movs r5, 0 cmp r8, r9 - bge _08037C2E + bge @08037C2E lsls r0, r7, 3 subs r0, r7 lsls r6, r0, 2 mov r8, r5 ldr r4, =0x020223c4 -_08037BC6: +@08037BC6: cmp r5, r7 - beq _08037C1E + beq @08037C1E mov r2, r9 cmp r2, 0x4 - bne _08037C14 + bne @08037C14 ldr r2, =0x020229e8 mov r1, r8 adds r0, r1, r2 @@ -93917,37 +93917,37 @@ _08037BC6: adds r0, r3, 0 ands r0, r1 cmp r0, 0 - bne _08037BF8 + bne @08037BF8 adds r0, r6, r2 ldrh r1, [r0, 0x18] adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _08037C04 - b _08037C1E + beq @08037C04 + b @08037C1E .align 2, 0 .pool -_08037BF8: +@08037BF8: adds r0, r6, r2 ldrh r1, [r0, 0x18] adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _08037C1E -_08037C04: + beq @08037C1E +@08037C04: ldr r0, =0x02022ff8 adds r1, r4, 0 movs r2, 0x60 bl memcpy - b _08037C1E + b @08037C1E .align 2, 0 .pool -_08037C14: +@08037C14: ldr r0, =0x02022ff8 adds r1, r4, 0 movs r2, 0x60 bl memcpy -_08037C1E: +@08037C1E: movs r2, 0x80 lsls r2, 1 adds r4, r2 @@ -93955,8 +93955,8 @@ _08037C1E: add r8, r0 adds r5, 0x1 cmp r5, r9 - blt _08037BC6 -_08037C2E: + blt @08037BC6 +@08037C2E: ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 @@ -93972,43 +93972,43 @@ _08037C2E: ldr r0, =sub_8037ADC + 1 str r0, [r1, 0x8] bl sub_81B9150 - b _08037D0A + b @08037D0A .align 2, 0 .pool -_08037C64: +@08037C64: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08037D0A + beq @08037D0A ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08037D0A + bne @08037D0A ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _08037C98 + beq @08037C98 bl sub_800ADF8 - b _08037D0A + b @08037D0A .align 2, 0 .pool -_08037C98: +@08037C98: bl sub_800AC34 - b _08037D0A -_08037C9E: + b @08037D0A +@08037C9E: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _08037CE4 + beq @08037CE4 bl sub_8010500 lsls r0, 24 cmp r0, 0 - beq _08037D0A + beq @08037D0A mov r1, r10 ldr r0, [r1] str r0, [r6] @@ -94023,14 +94023,14 @@ _08037C9E: bl free mov r0, r8 str r0, [r4] - b _08037D0A + b @08037D0A .align 2, 0 .pool -_08037CE4: +@08037CE4: ldr r0, =0x03003124 ldrb r5, [r0] cmp r5, 0 - bne _08037D0A + bne @08037D0A mov r1, r10 ldr r0, [r1] str r0, [r6] @@ -94044,7 +94044,7 @@ _08037CE4: ldr r0, [r4] bl free str r5, [r4] -_08037D0A: +@08037D0A: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -94058,7 +94058,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} @@ -94075,13 +94075,13 @@ intro_end: @ 8037D2C ldr r5, =0x02024332 ldrb r0, [r5] cmp r0, 0 - beq _08037D64 + beq @08037D64 cmp r0, 0x1 - beq _08037DA4 - b _08037DD6 + beq @08037DA4 + b @08037DD6 .align 2, 0 .pool -_08037D64: +@08037D64: ldr r4, =0x02023058 movs r0, 0x60 bl malloc @@ -94101,10 +94101,10 @@ _08037D64: ldr r0, =intro_end + 1 str r0, [r1, 0x8] bl sub_81B9150 - b _08037DD6 + b @08037DD6 .align 2, 0 .pool -_08037DA4: +@08037DA4: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -94112,7 +94112,7 @@ _08037DA4: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - bne _08037DD6 + bne @08037DD6 movs r0, 0x2 strb r0, [r5] ldr r1, =0x02022fec @@ -94128,7 +94128,7 @@ _08037DA4: ldr r0, [r4] bl free str r6, [r4] -_08037DD6: +@08037DD6: pop {r3} mov r8, r3 pop {r4-r7} @@ -94139,7 +94139,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} @@ -94156,34 +94156,34 @@ sub_8037DF4: @ 8037DF4 ldr r0, =0x02024332 ldrb r0, [r0] cmp r0, 0xA - bls _08037E20 - b _080383F8 -_08037E20: + bls @08037E20 + b @080383F8 +@08037E20: lsls r0, 2 - ldr r1, =_08037E38 + ldr r1, =@08037E38 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08037E38: - .4byte _08037E64 - .4byte _08037EA8 - .4byte _08037F50 - .4byte _08038026 - .4byte _0803804C - .4byte _08038140 - .4byte _08038164 - .4byte _080382CC - .4byte _0803832C - .4byte _0803836C - .4byte _080383BC -_08037E64: +@08037E38: + .4byte @08037E64 + .4byte @08037EA8 + .4byte @08037F50 + .4byte @08038026 + .4byte @0803804C + .4byte @08038140 + .4byte @08038164 + .4byte @080382CC + .4byte @0803832C + .4byte @0803836C + .4byte @080383BC +@08037E64: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _08037E90 + bne @08037E90 movs r0, 0 bl gpu_sync_bg_show movs r0, 0x1 @@ -94196,34 +94196,34 @@ _08037E64: ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1] -_08037E90: +@08037E90: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - bne _08037E9A - b _080383F8 -_08037E9A: + bne @08037E9A + b @080383F8 +@08037E9A: bl sub_800E0E8 - b _080383F8 + b @080383F8 .align 2, 0 .pool -_08037EA8: +@08037EA8: ldr r2, =0x02022fec ldr r1, [r2] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08037F30 + beq @08037F30 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _08037EBE - b _080383F8 -_08037EBE: + bne @08037EBE + b @080383F8 +@08037EBE: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08037F02 + beq @08037F02 ldr r4, =0x0202449c ldr r0, [r4] movs r5, 0xC0 @@ -94249,44 +94249,44 @@ _08037EBE: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_08037F02: +@08037F02: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - bne _08037F0C - b _080383F8 -_08037F0C: + bne @08037F0C + b @080383F8 +@08037F0C: movs r0, 0 movs r1, 0 bl sub_800DFB4 - b _080383F8 + b @080383F8 .align 2, 0 .pool -_08037F30: +@08037F30: movs r0, 0x80 lsls r0, 17 ands r0, r1 cmp r0, 0 - bne _08037F40 + bne @08037F40 movs r0, 0x4 orrs r1, r0 str r1, [r2] -_08037F40: +@08037F40: ldr r1, =0x02024332 movs r0, 0x7 strb r0, [r1] bl berry_801017C - b _080383F8 + b @080383F8 .align 2, 0 .pool -_08037F50: +@08037F50: bl sub_800A550 movs r1, 0xF ands r1, r0 cmp r1, 0xF - beq _08037F5E - b _080383F8 -_08037F5E: + beq @08037F5E + b @080383F8 +@08037F5E: bl sub_800A5B4 movs r0, 0x4 adds r1, r7, 0 @@ -94317,7 +94317,7 @@ _08037F5E: adds r5, r1, 0x2 movs r7, 0x3F movs r6, 0x3 -_08037FA4: +@08037FA4: ldrh r0, [r5] str r2, [sp] bl sub_8185F90 @@ -94326,86 +94326,86 @@ _08037FA4: adds r0, r2, r0 ldrh r0, [r0, 0x18] cmp r0, 0x1 - beq _08037FE6 + beq @08037FE6 cmp r0, 0x1 - bgt _08037FD4 + bgt @08037FD4 cmp r0, 0 - beq _08037FDE - b _0803800C + beq @08037FDE + b @0803800C .align 2, 0 .pool -_08037FD4: +@08037FD4: cmp r0, 0x2 - beq _08037FEE + beq @08037FEE cmp r0, 0x3 - beq _08037FFE - b _0803800C -_08037FDE: + beq @08037FFE + b @0803800C +@08037FDE: ldrh r0, [r5] adds r1, r7, 0 ands r1, r0 - b _08037FF6 -_08037FE6: + b @08037FF6 +@08037FE6: ldrh r0, [r5] adds r1, r7, 0 ands r1, r0 - b _08038006 -_08037FEE: + b @08038006 +@08037FEE: ldrh r0, [r5] adds r1, r7, 0 ands r1, r0 lsls r1, 6 -_08037FF6: +@08037FF6: ldrh r0, [r4, 0xE] orrs r1, r0 strh r1, [r4, 0xE] - b _0803800C -_08037FFE: + b @0803800C +@08037FFE: ldrh r0, [r5] adds r1, r7, 0 ands r1, r0 lsls r1, 6 -_08038006: +@08038006: ldrh r0, [r4, 0x10] orrs r1, r0 strh r1, [r4, 0x10] -_0803800C: +@0803800C: movs r0, 0x80 lsls r0, 1 adds r5, r0 adds r2, 0x1C subs r6, 0x1 cmp r6, 0 - bge _08037FA4 + bge @08037FA4 bl zero_enemy_party_data ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_08038026: +@08038026: bl sub_800A520 lsls r0, 24 cmp r0, 0 - bne _08038032 - b _080383F8 -_08038032: + bne @08038032 + b @080383F8 +@08038032: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 ldr r1, =0x020244ec movs r2, 0xC8 bl link_0800A448 - b _080383A6 + b @080383A6 .align 2, 0 .pool -_0803804C: +@0803804C: bl sub_800A550 movs r1, 0xF ands r1, r0 cmp r1, 0xF - beq _0803805A - b _080383F8 -_0803805A: + beq @0803805A + b @080383F8 +@0803805A: bl sub_800A5B4 movs r6, 0 lsls r0, r7, 3 @@ -94414,35 +94414,35 @@ _0803805A: mov r8, r0 ldr r4, =0x020223c4 movs r5, 0 -_0803806C: +@0803806C: cmp r6, r7 - bne _080380A0 + bne @080380A0 ldr r0, =0x020229e8 adds r0, r5, r0 ldrh r0, [r0, 0x18] cmp r0, 0x2 - bgt _0803808C + bgt @0803808C cmp r0, 0x1 - bge _08038098 + bge @08038098 cmp r0, 0 - beq _08038090 - b _0803812A + beq @08038090 + b @0803812A .align 2, 0 .pool -_0803808C: +@0803808C: cmp r0, 0x3 - bne _0803812A -_08038090: + bne @0803812A +@08038090: ldr r0, =0x020244ec - b _08038110 + b @08038110 .align 2, 0 .pool -_08038098: +@08038098: ldr r0, =0x02024618 - b _08038110 + b @08038110 .align 2, 0 .pool -_080380A0: +@080380A0: ldr r2, =0x020229e8 adds r0, r5, r2 ldrh r1, [r0, 0x18] @@ -94450,110 +94450,110 @@ _080380A0: adds r0, r3, 0 ands r0, r1 cmp r0, 0 - bne _080380C4 + bne @080380C4 mov r1, r8 adds r0, r1, r2 ldrh r1, [r0, 0x18] adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _080380D2 - b _080380F8 + beq @080380D2 + b @080380F8 .align 2, 0 .pool -_080380C4: +@080380C4: mov r1, r8 adds r0, r1, r2 ldrh r1, [r0, 0x18] adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _080380F8 -_080380D2: + beq @080380F8 +@080380D2: adds r0, r5, r2 ldrh r0, [r0, 0x18] cmp r0, 0x2 - bgt _080380E4 + bgt @080380E4 cmp r0, 0x1 - bge _080380F0 + bge @080380F0 cmp r0, 0 - beq _080380E8 - b _0803812A -_080380E4: + beq @080380E8 + b @0803812A +@080380E4: cmp r0, 0x3 - bne _0803812A -_080380E8: + bne @0803812A +@080380E8: ldr r0, =0x020244ec - b _08038110 + b @08038110 .align 2, 0 .pool -_080380F0: +@080380F0: ldr r0, =0x02024618 - b _08038110 + b @08038110 .align 2, 0 .pool -_080380F8: +@080380F8: adds r0, r5, r2 ldrh r0, [r0, 0x18] cmp r0, 0x2 - bgt _0803810A + bgt @0803810A cmp r0, 0x1 - bge _08038120 + bge @08038120 cmp r0, 0 - beq _0803810E - b _0803812A -_0803810A: + beq @0803810E + b @0803812A +@0803810A: cmp r0, 0x3 - bne _0803812A -_0803810E: + bne @0803812A +@0803810E: ldr r0, =0x02024744 -_08038110: +@08038110: adds r1, r4, 0 movs r2, 0xC8 bl memcpy - b _0803812A + b @0803812A .align 2, 0 .pool -_08038120: +@08038120: ldr r0, =0x02024870 adds r1, r4, 0 movs r2, 0xC8 bl memcpy -_0803812A: +@0803812A: movs r2, 0x80 lsls r2, 1 adds r4, r2 adds r5, 0x1C adds r6, 0x1 cmp r6, 0x3 - ble _0803806C - b _080383A6 + ble @0803806C + b @080383A6 .align 2, 0 .pool -_08038140: +@08038140: bl sub_800A520 lsls r0, 24 cmp r0, 0 - bne _0803814C - b _080383F8 -_0803814C: + bne @0803814C + b @080383F8 +@0803814C: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 ldr r1, =0x020245b4 movs r2, 0x64 bl link_0800A448 - b _080383A6 + b @080383A6 .align 2, 0 .pool -_08038164: +@08038164: bl sub_800A550 movs r1, 0xF ands r1, r0 cmp r1, 0xF - beq _08038172 - b _080383F8 -_08038172: + beq @08038172 + b @080383F8 +@08038172: bl sub_800A5B4 movs r6, 0 lsls r0, r7, 3 @@ -94562,35 +94562,35 @@ _08038172: mov r8, r0 ldr r4, =0x020223c4 movs r5, 0 -_08038184: +@08038184: cmp r6, r7 - bne _080381B8 + bne @080381B8 ldr r0, =0x020229e8 adds r0, r5, r0 ldrh r0, [r0, 0x18] cmp r0, 0x2 - bgt _080381A4 + bgt @080381A4 cmp r0, 0x1 - bge _080381B0 + bge @080381B0 cmp r0, 0 - beq _080381A8 - b _08038242 + beq @080381A8 + b @08038242 .align 2, 0 .pool -_080381A4: +@080381A4: cmp r0, 0x3 - bne _08038242 -_080381A8: + bne @08038242 +@080381A8: ldr r0, =0x020245b4 - b _08038228 + b @08038228 .align 2, 0 .pool -_080381B0: +@080381B0: ldr r0, =0x020246e0 - b _08038228 + b @08038228 .align 2, 0 .pool -_080381B8: +@080381B8: ldr r2, =0x020229e8 adds r0, r5, r2 ldrh r1, [r0, 0x18] @@ -94598,83 +94598,83 @@ _080381B8: adds r0, r3, 0 ands r0, r1 cmp r0, 0 - bne _080381DC + bne @080381DC mov r1, r8 adds r0, r1, r2 ldrh r1, [r0, 0x18] adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _080381EA - b _08038210 + beq @080381EA + b @08038210 .align 2, 0 .pool -_080381DC: +@080381DC: mov r1, r8 adds r0, r1, r2 ldrh r1, [r0, 0x18] adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _08038210 -_080381EA: + beq @08038210 +@080381EA: adds r0, r5, r2 ldrh r0, [r0, 0x18] cmp r0, 0x2 - bgt _080381FC + bgt @080381FC cmp r0, 0x1 - bge _08038208 + bge @08038208 cmp r0, 0 - beq _08038200 - b _08038242 -_080381FC: + beq @08038200 + b @08038242 +@080381FC: cmp r0, 0x3 - bne _08038242 -_08038200: + bne @08038242 +@08038200: ldr r0, =0x020245b4 - b _08038228 + b @08038228 .align 2, 0 .pool -_08038208: +@08038208: ldr r0, =0x020246e0 - b _08038228 + b @08038228 .align 2, 0 .pool -_08038210: +@08038210: adds r0, r5, r2 ldrh r0, [r0, 0x18] cmp r0, 0x2 - bgt _08038222 + bgt @08038222 cmp r0, 0x1 - bge _08038238 + bge @08038238 cmp r0, 0 - beq _08038226 - b _08038242 -_08038222: + beq @08038226 + b @08038242 +@08038222: cmp r0, 0x3 - bne _08038242 -_08038226: + bne @08038242 +@08038226: ldr r0, =0x0202480c -_08038228: +@08038228: adds r1, r4, 0 movs r2, 0x64 bl memcpy - b _08038242 + b @08038242 .align 2, 0 .pool -_08038238: +@08038238: ldr r0, =0x02024938 adds r1, r4, 0 movs r2, 0x64 bl memcpy -_08038242: +@08038242: movs r2, 0x80 lsls r2, 1 adds r4, r2 adds r5, 0x1C adds r6, 0x1 cmp r6, 0x3 - ble _08038184 + ble @08038184 ldr r4, =0x020244ec adds r0, r4, 0 bl shedinja_something @@ -94717,10 +94717,10 @@ _08038242: lsls r2, 1 adds r0, r4, r2 bl shedinja_something - b _080383A6 + b @080383A6 .align 2, 0 .pool -_080382CC: +@080382CC: bl sub_8032768 bl sub_8184E58 ldr r3, =0x02024332 @@ -94732,46 +94732,46 @@ _080382CC: movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _08038326 + beq @08038326 movs r6, 0 ldr r0, =0x020229e8 ldrb r1, [r0] adds r4, r3, 0 adds r2, r0, 0 cmp r1, 0x3 - bne _0803830A + bne @0803830A movs r3, 0xFF -_080382F8: +@080382F8: adds r2, 0x1C adds r6, 0x1 cmp r6, 0x3 - bgt _0803830A + bgt @0803830A ldrh r1, [r2] adds r0, r3, 0 ands r0, r1 cmp r0, 0x3 - beq _080382F8 -_0803830A: + beq @080382F8 +@0803830A: cmp r6, 0x4 - bne _08038320 + bne @08038320 movs r0, 0x8 strb r0, [r4] - b _080383F8 + b @080383F8 .align 2, 0 .pool -_08038320: +@08038320: movs r0, 0xA strb r0, [r4] - b _080383F8 -_08038326: + b @080383F8 +@08038326: movs r0, 0xA strb r0, [r3] - b _080383F8 -_0803832C: + b @080383F8 +@0803832C: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080383F8 + beq @080383F8 ldr r0, =0x0202449c ldr r4, [r0] movs r0, 0xC0 @@ -94789,25 +94789,25 @@ _0803832C: adds r1, r4, 0 movs r2, 0x8 bl link_0800A448 - b _080383A6 + b @080383A6 .align 2, 0 .pool -_0803836C: +@0803836C: bl sub_800A550 movs r1, 0xF ands r1, r0 cmp r1, 0xF - bne _080383F8 + bne @080383F8 bl sub_800A5B4 movs r2, 0 - b _08038386 -_08038380: + b @08038386 +@08038380: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 -_08038386: +@08038386: cmp r2, 0x3 - bhi _080383A6 + bhi @080383A6 ldr r4, =0x020223c4 lsls r3, r2, 8 adds r0, r3, r4 @@ -94815,27 +94815,27 @@ _08038386: movs r1, 0x4 ands r0, r1 cmp r0, 0 - beq _08038380 + beq @08038380 adds r1, r4, 0x4 adds r1, r3, r1 ldr r0, =0x0203bd2c movs r2, 0x4 bl memcpy -_080383A6: +@080383A6: ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080383F8 + b @080383F8 .align 2, 0 .pool -_080383BC: +@080383BC: ldr r0, =0x02024333 adds r1, r0, 0x1 bl battle_load_something lsls r0, 24 cmp r0, 0 - beq _080383F8 + beq @080383F8 ldr r2, =0x03005d00 ldr r1, =0x030022c0 ldr r0, [r1] @@ -94849,7 +94849,7 @@ _080383BC: movs r0, 0x2 ands r0, r2 cmp r0, 0 - beq _080383F8 + beq @080383F8 ldr r0, =0x02038bca movs r4, 0x80 lsls r4, 4 @@ -94858,7 +94858,7 @@ _080383BC: movs r0, 0x20 orrs r2, r0 str r2, [r3] -_080383F8: +@080383F8: add sp, 0x4 pop {r3} mov r8, r3 @@ -94870,7 +94870,7 @@ _080383F8: thumb_func_end sub_8037DF4 thumb_func_start sub_8038420 -sub_8038420: @ 8038420 +sub_8038420: ; 8038420 push {lr} sub sp, 0x4 bl call_obj_callbacks @@ -94883,18 +94883,18 @@ sub_8038420: @ 8038420 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08038482 + beq @08038482 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 - beq _08038482 + beq @08038482 bl rfu_lacks_rfufunc lsls r0, 24 cmp r0, 0 - beq _08038482 + beq @08038482 ldr r2, =0x020375f0 ldr r1, =0x0202433a movs r0, 0x5 @@ -94911,7 +94911,7 @@ sub_8038420: @ 8038420 bl sub_80A1AD4 ldr r0, =sub_80384E4 + 1 bl set_callback2 -_08038482: +@08038482: add sp, 0x4 pop {r0} bx r0 @@ -94920,7 +94920,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 @@ -94949,7 +94949,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 @@ -94957,7 +94957,7 @@ sub_80384E4: @ 80384E4 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08038512 + bne @08038512 ldr r0, =0x030075f0 bl MPlayStop_rev01 ldr r0, =0x03007630 @@ -94967,7 +94967,7 @@ sub_80384E4: @ 80384E4 ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 -_08038512: +@08038512: pop {r0} bx r0 .align 2, 0 @@ -94975,7 +94975,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 + 1 @@ -94986,26 +94986,26 @@ 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 movs r0, 0x2E ldrsh r1, [r3, r0] cmp r1, 0x1 - beq _0803856C + beq @0803856C cmp r1, 0x1 - bgt _08038554 + bgt @08038554 cmp r1, 0 - beq _0803855A - b _080385DC + beq @0803855A + b @080385DC .align 2, 0 .pool -_08038554: +@08038554: cmp r1, 0x2 - beq _080385C8 - b _080385DC -_0803855A: + beq @080385C8 + b @080385DC +@0803855A: ldrh r0, [r3, 0x2E] adds r0, 0x1 strh r0, [r3, 0x2E] @@ -95015,13 +95015,13 @@ _0803855A: strh r1, [r3, 0x34] movs r0, 0x1 strh r0, [r3, 0x36] -_0803856C: +@0803856C: ldrh r0, [r3, 0x36] subs r0, 0x1 strh r0, [r3, 0x36] lsls r0, 16 cmp r0, 0 - bne _080385DC + bne @080385DC movs r0, 0x2 strh r0, [r3, 0x36] movs r4, 0x30 @@ -95039,40 +95039,40 @@ _0803856C: lsls r2, 1 adds r2, r5 movs r1, 0x1C -_0803859A: +@0803859A: strh r4, [r2] strh r4, [r0] adds r0, 0x4 adds r2, 0x4 subs r1, 0x2 cmp r1, 0 - bge _0803859A + bge @0803859A ldrh r0, [r3, 0x34] adds r0, 0x1 strh r0, [r3, 0x34] lsls r0, 16 asrs r0, 16 cmp r0, 0x15 - bne _080385DC + bne @080385DC ldrh r0, [r3, 0x2E] adds r0, 0x1 strh r0, [r3, 0x2E] movs r0, 0x20 strh r0, [r3, 0x30] - b _080385DC + b @080385DC .align 2, 0 .pool -_080385C8: +@080385C8: ldrh r0, [r3, 0x30] subs r0, 0x1 strh r0, [r3, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - bne _080385DC + bne @080385DC ldr r0, =sub_8036760 + 1 bl set_callback2 -_080385DC: +@080385DC: pop {r4,r5} pop {r0} bx r0 @@ -95081,7 +95081,7 @@ _080385DC: thumb_func_end sub_8038538 thumb_func_start sub_80385E8 -sub_80385E8: @ 80385E8 +sub_80385E8: ; 80385E8 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -95099,10 +95099,10 @@ sub_80385E8: @ 80385E8 movs r0, 0x80 lsls r0, 3 cmp r1, r0 - bne _08038610 + bne @08038610 movs r0, 0 - b _080389E2 -_08038610: + b @080389E2 +@08038610: ldr r4, =0x02022fec ldr r0, [r4] ldr r1, =0x043f0908 @@ -95111,19 +95111,19 @@ _08038610: lsls r1, 2 str r1, [sp, 0x20] cmp r0, 0x8 - beq _08038624 - b _080389D2 -_08038624: + beq @08038624 + b @080389D2 +@08038624: cmp r2, 0x1 - bne _0803862C + bne @0803862C bl zero_enemy_party_data -_0803862C: +@0803862C: ldr r0, [r4] movs r1, 0x80 lsls r1, 8 ands r0, r1 cmp r0, 0 - beq _08038668 + beq @08038668 ldr r0, =0x08310030 ldr r2, [sp, 0x20] ldr r3, [sp, 0x14] @@ -95137,13 +95137,13 @@ _0803862C: str r4, [sp, 0x1C] adds r4, r0, 0 cmp r1, 0x3 - bhi _0803867C + bhi @0803867C adds r2, r1, 0 str r2, [sp, 0x1C] - b _0803867C + b @0803867C .align 2, 0 .pool -_08038668: +@08038668: ldr r1, =0x08310030 ldr r2, [sp, 0x20] ldr r3, [sp, 0x14] @@ -95154,13 +95154,13 @@ _08038668: ldrb r0, [r0] str r0, [sp, 0x1C] adds r4, r1, 0 -_0803867C: +@0803867C: movs r0, 0 str r0, [sp, 0x18] - b _080389B4 + b @080389B4 .align 2, 0 .pool -_08038688: +@08038688: ldr r2, [sp, 0x20] ldr r3, [sp, 0x14] adds r0, r2, r3 @@ -95168,21 +95168,21 @@ _08038688: adds r1, r0, r4 ldrb r0, [r1, 0x18] cmp r0, 0x1 - bne _0803869E + bne @0803869E movs r0, 0x80 mov r10, r0 - b _080386B0 -_0803869E: + b @080386B0 +@0803869E: ldrb r1, [r1, 0x2] movs r0, 0x80 ands r0, r1 movs r1, 0x88 mov r10, r1 cmp r0, 0 - beq _080386B0 + beq @080386B0 movs r2, 0x78 mov r10, r2 -_080386B0: +@080386B0: movs r6, 0 ldr r2, [sp, 0x20] ldr r3, [sp, 0x14] @@ -95195,9 +95195,9 @@ _080386B0: adds r3, 0x1 str r3, [sp, 0x24] cmp r0, 0xFF - beq _080386E6 + beq @080386E6 adds r3, r1, 0 -_080386CC: +@080386CC: ldr r0, [sp, 0x14] adds r1, r2, r0 lsls r1, 3 @@ -95210,8 +95210,8 @@ _080386CC: adds r1, r3 ldrb r0, [r1] cmp r0, 0xFF - bne _080386CC -_080386E6: + bne @080386CC +@080386E6: ldr r1, [sp, 0x20] ldr r2, [sp, 0x14] adds r0, r1, r2 @@ -95219,23 +95219,23 @@ _080386E6: adds r0, r1, r4 ldrb r0, [r0] cmp r0, 0x1 - beq _08038794 + beq @08038794 cmp r0, 0x1 - bgt _08038700 + bgt @08038700 cmp r0, 0 - beq _0803870E - b _080389AC -_08038700: + beq @0803870E + b @080389AC +@08038700: cmp r0, 0x2 - bne _08038706 - b _08038854 -_08038706: + bne @08038706 + b @08038854 +@08038706: cmp r0, 0x3 - bne _0803870C - b _080388E8 -_0803870C: - b _080389AC -_0803870E: + bne @0803870C + b @080388E8 +@0803870C: + b @080389AC +@0803870E: adds r0, r4, 0 adds r0, 0x24 adds r0, r1, r0 @@ -95252,10 +95252,10 @@ _0803870E: ldrb r0, [r0] adds r5, r2, 0 cmp r0, 0xFF - beq _08038750 + beq @08038750 adds r3, r1, 0 movs r7, 0xB -_08038734: +@08038734: adds r0, r2, r4 ldrh r0, [r0, 0x4] adds r1, r0, 0 @@ -95269,8 +95269,8 @@ _08038734: adds r1, r3 ldrb r0, [r1] cmp r0, 0xFF - bne _08038734 -_08038750: + bne @08038734 +@08038750: mov r2, r9 lsls r0, r2, 8 add r10, r0 @@ -95300,10 +95300,10 @@ _08038750: str r3, [sp, 0xC] adds r3, r6, 0 bl create_pokemon_set_level - b _080389AC + b @080389AC .align 2, 0 .pool -_08038794: +@08038794: adds r0, r4, 0 adds r0, 0x24 adds r0, r1, r0 @@ -95320,10 +95320,10 @@ _08038794: ldrb r0, [r0] mov r8, r2 cmp r0, 0xFF - beq _080387D6 + beq @080387D6 adds r3, r1, 0 movs r4, 0xB -_080387BA: +@080387BA: adds r0, r2, r7 ldrh r0, [r0, 0x4] adds r1, r0, 0 @@ -95337,8 +95337,8 @@ _080387BA: adds r1, r3 ldrb r0, [r1] cmp r0, 0xFF - bne _080387BA -_080387D6: + bne @080387BA +@080387D6: mov r2, r9 lsls r0, r2, 8 add r10, r0 @@ -95374,7 +95374,7 @@ _080387D6: mov r0, r8 adds r0, 0x6 adds r4, r7, r0 -_08038820: +@08038820: adds r1, r6, 0 adds r1, 0xD adds r0, r5, 0 @@ -95393,11 +95393,11 @@ _08038820: adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble _08038820 - b _080389AC + ble @08038820 + b @080389AC .align 2, 0 .pool -_08038854: +@08038854: adds r0, r4, 0 adds r0, 0x24 adds r0, r1, r0 @@ -95414,10 +95414,10 @@ _08038854: ldrb r0, [r0] adds r5, r2, 0 cmp r0, 0xFF - beq _08038896 + beq @08038896 adds r3, r1, 0 movs r7, 0xB -_0803887A: +@0803887A: adds r0, r2, r4 ldrh r0, [r0, 0x4] adds r1, r0, 0 @@ -95431,8 +95431,8 @@ _0803887A: adds r1, r3 ldrb r0, [r1] cmp r0, 0xFF - bne _0803887A -_08038896: + bne @0803887A +@08038896: mov r2, r9 lsls r0, r2, 8 add r10, r0 @@ -95468,10 +95468,10 @@ _08038896: movs r1, 0xC adds r2, r5, 0 bl pokemon_setattr - b _080389AC + b @080389AC .align 2, 0 .pool -_080388E8: +@080388E8: adds r0, r4, 0 adds r0, 0x24 adds r0, r1, r0 @@ -95488,10 +95488,10 @@ _080388E8: ldrb r0, [r0] mov r8, r2 cmp r0, 0xFF - beq _0803892A + beq @0803892A adds r3, r1, 0 movs r4, 0xB -_0803890E: +@0803890E: adds r0, r2, r7 ldrh r0, [r0, 0x4] adds r1, r0, 0 @@ -95505,8 +95505,8 @@ _0803890E: adds r1, r3 ldrb r0, [r1] cmp r0, 0xFF - bne _0803890E -_0803892A: + bne @0803890E +@0803892A: mov r2, r9 lsls r0, r2, 8 add r10, r0 @@ -95548,7 +95548,7 @@ _0803892A: mov r0, r8 adds r0, 0x8 adds r4, r7, r0 -_08038982: +@08038982: adds r1, r6, 0 adds r1, 0xD adds r0, r5, 0 @@ -95567,18 +95567,18 @@ _08038982: adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble _08038982 -_080389AC: + ble @08038982 +@080389AC: ldr r4, [sp, 0x24] str r4, [sp, 0x18] ldr r4, =0x08310030 ldr r0, [sp, 0x18] -_080389B4: +@080389B4: ldr r1, [sp, 0x1C] cmp r0, r1 - bge _080389BC - b _08038688 -_080389BC: + bge @080389BC + b @08038688 +@080389BC: ldr r2, =0x02022fec ldr r1, =0x08310030 ldr r3, [sp, 0x20] @@ -95590,7 +95590,7 @@ _080389BC: ldr r0, [r2] orrs r0, r1 str r0, [r2] -_080389D2: +@080389D2: ldr r0, =0x08310030 ldr r2, [sp, 0x20] ldr r3, [sp, 0x14] @@ -95599,7 +95599,7 @@ _080389D2: adds r1, r0 adds r1, 0x20 ldrb r0, [r1] -_080389E2: +@080389E2: add sp, 0x28 pop {r3-r5} mov r8, r3 @@ -95613,7 +95613,7 @@ _080389E2: thumb_func_end sub_80385E8 thumb_func_start sub_8038A04 -sub_8038A04: @ 8038A04 +sub_8038A04: ; 8038A04 push {lr} ldr r0, =0x04000006 ldrh r0, [r0] @@ -95621,12 +95621,12 @@ sub_8038A04: @ 8038A04 lsls r0, 16 lsrs r0, 16 cmp r0, 0x30 - bhi _08038A1E + bhi @08038A1E movs r1, 0x98 lsls r1, 8 movs r0, 0x8 bl lcd_io_set -_08038A1E: +@08038A1E: pop {r0} bx r0 .align 2, 0 @@ -95634,16 +95634,16 @@ _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] ldr r1, =0x013f0102 ands r0, r1 cmp r0, 0 - bne _08038A3A + bne @08038A3A bl GenerateRandomNumber -_08038A3A: +@08038A3A: ldr r0, =0x02022e14 ldrh r1, [r0] movs r0, 0x10 @@ -95703,18 +95703,18 @@ _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 ldrsh r0, [r5, r1] cmp r0, 0 - beq _08038B24 + beq @08038B24 movs r1, 0x32 ldrsh r0, [r5, r1] movs r1, 0xFF @@ -95724,8 +95724,8 @@ sub_8038B04: @ 8038B04 ldrh r1, [r5, 0x30] adds r0, r1 strh r0, [r5, 0x20] - b _08038B36 -_08038B24: + b @08038B36 +@08038B24: movs r1, 0x32 ldrsh r0, [r5, r1] movs r1, 0xFF @@ -95735,7 +95735,7 @@ _08038B24: ldrh r1, [r5, 0x30] subs r1, r0 strh r1, [r5, 0x20] -_08038B36: +@08038B36: movs r1, 0xC0 lsls r1, 1 adds r0, r1, 0 @@ -95748,7 +95748,7 @@ _08038B36: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _08038B6A + beq @08038B6A ldr r4, =0x00002710 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag @@ -95758,7 +95758,7 @@ _08038B36: bl obj_free_rotscale_entry adds r0, r5, 0 bl obj_delete_and_free_tiles -_08038B6A: +@08038B6A: pop {r4,r5} pop {r0} bx r0 @@ -95767,7 +95767,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 @@ -95784,7 +95784,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 @@ -95806,7 +95806,7 @@ sub_8038B94: @ 8038B94 movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _08038C04 + beq @08038C04 ldr r1, =0x020229e8 lsls r0, r2, 3 subs r0, r2 @@ -95814,33 +95814,33 @@ sub_8038B94: @ 8038B94 adds r0, r1 ldrh r0, [r0, 0x18] cmp r0, 0x1 - beq _08038BF0 + beq @08038BF0 cmp r0, 0x1 - bgt _08038BE8 + bgt @08038BE8 cmp r0, 0 - beq _08038C04 - b _08038C0C + beq @08038C04 + b @08038C0C .align 2, 0 .pool -_08038BE8: +@08038BE8: cmp r0, 0x2 - beq _08038C04 + beq @08038C04 cmp r0, 0x3 - bne _08038C0C -_08038BF0: + bne @08038C0C +@08038BF0: ldr r0, =0x02024744 str r0, [sp, 0x4] ldr r1, =0x020244ec str r1, [sp, 0x8] - b _08038C0C + b @08038C0C .align 2, 0 .pool -_08038C04: +@08038C04: ldr r2, =0x020244ec str r2, [sp, 0x4] ldr r3, =0x02024744 str r3, [sp, 0x8] -_08038C0C: +@08038C0C: movs r7, 0 movs r0, 0 mov r8, r0 @@ -95851,7 +95851,7 @@ _08038C0C: lsls r2, 1 mov r10, r2 mov r9, r0 -_08038C20: +@08038C20: movs r0, 0x64 mov r4, r8 muls r4, r0 @@ -95872,50 +95872,50 @@ _08038C20: bl pokemon_getattr adds r1, r0, 0 cmp r5, 0 - beq _08038C90 + beq @08038C90 cmp r5, r10 - beq _08038C64 + beq @08038C64 cmp r6, 0 - beq _08038C64 + beq @08038C64 cmp r1, 0 - bne _08038C64 + bne @08038C64 movs r0, 0x1 mov r2, r9 lsls r0, r2 orrs r7, r0 -_08038C64: +@08038C64: cmp r5, 0 - beq _08038C90 + beq @08038C90 cmp r6, 0 - beq _08038C7C + beq @08038C7C cmp r5, r10 - beq _08038C74 + beq @08038C74 cmp r1, 0 - beq _08038C7C -_08038C74: + beq @08038C7C +@08038C74: movs r0, 0x2 mov r3, r9 lsls r0, r3 orrs r7, r0 -_08038C7C: +@08038C7C: cmp r5, 0 - beq _08038C90 + beq @08038C90 cmp r5, r10 - beq _08038C90 + beq @08038C90 cmp r6, 0 - bne _08038C90 + bne @08038C90 movs r0, 0x3 mov r1, r9 lsls r0, r1 orrs r7, r0 -_08038C90: +@08038C90: movs r2, 0x2 add r9, r2 movs r3, 0x1 add r8, r3 mov r0, r8 cmp r0, 0x5 - ble _08038C20 + ble @08038C20 ldr r1, =0x03005e00 ldr r2, [sp, 0xC] ldr r3, [sp] @@ -95930,7 +95930,7 @@ _08038C90: lsls r1, 1 mov r10, r1 mov r9, r0 -_08038CBA: +@08038CBA: movs r0, 0x64 mov r4, r8 muls r4, r0 @@ -95951,50 +95951,50 @@ _08038CBA: bl pokemon_getattr adds r1, r0, 0 cmp r5, 0 - beq _08038D2A + beq @08038D2A cmp r5, r10 - beq _08038CFE + beq @08038CFE cmp r6, 0 - beq _08038CFE + beq @08038CFE cmp r1, 0 - bne _08038CFE + bne @08038CFE movs r0, 0x1 mov r3, r9 lsls r0, r3 orrs r7, r0 -_08038CFE: +@08038CFE: cmp r5, 0 - beq _08038D2A + beq @08038D2A cmp r6, 0 - beq _08038D16 + beq @08038D16 cmp r5, r10 - beq _08038D0E + beq @08038D0E cmp r1, 0 - beq _08038D16 -_08038D0E: + beq @08038D16 +@08038D0E: movs r0, 0x2 mov r1, r9 lsls r0, r1 orrs r7, r0 -_08038D16: +@08038D16: cmp r5, 0 - beq _08038D2A + beq @08038D2A cmp r5, r10 - beq _08038D2A + beq @08038D2A cmp r6, 0 - bne _08038D2A + bne @08038D2A movs r0, 0x3 mov r2, r9 lsls r0, r2 orrs r7, r0 -_08038D2A: +@08038D2A: movs r3, 0x2 add r9, r3 movs r0, 0x1 add r8, r0 mov r1, r8 cmp r1, 0x5 - ble _08038CBA + ble @08038CBA ldr r1, =0x03005e00 ldr r2, [sp, 0xC] ldr r3, [sp] @@ -96015,7 +96015,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 @@ -96031,17 +96031,17 @@ sub_8038D64: @ 8038D64 ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 - beq _08038DAC + beq @08038DAC ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 bl sub_8057028 bl dp11_free bl sub_805F094 - b _08038EB6 + b @08038EB6 .align 2, 0 .pool -_08038DAC: +@08038DAC: str r0, [sp] movs r1, 0xC0 lsls r1, 19 @@ -96076,14 +96076,14 @@ _08038DAC: lsls r1, 3 adds r2, r0, r1 movs r1, 0x4F -_08038DFE: +@08038DFE: strh r3, [r0] strh r3, [r2] adds r2, 0x2 adds r0, 0x2 subs r1, 0x1 cmp r1, 0 - bge _08038DFE + bge @08038DFE movs r1, 0x50 ldr r0, =0x02038c28 ldr r3, =0x0000ff10 @@ -96091,14 +96091,14 @@ _08038DFE: lsls r4, 4 adds r2, r0, r4 adds r0, 0xA0 -_08038E1A: +@08038E1A: strh r3, [r0] strh r3, [r2] adds r2, 0x2 adds r0, 0x2 adds r1, 0x1 cmp r1, 0x9F - ble _08038E1A + ble @08038E1A bl sub_80A1A74 ldr r0, =0x02022e14 movs r4, 0 @@ -96157,7 +96157,7 @@ _08038E1A: bl set_callback2 ldr r0, =0x02024332 strb r4, [r0] -_08038EB6: +@08038EB6: add sp, 0x4 pop {r4} pop {r0} @@ -96167,7 +96167,7 @@ _08038EB6: thumb_func_end sub_8038D64 thumb_func_start sub_8038F14 -sub_8038F14: @ 8038F14 +sub_8038F14: ; 8038F14 push {lr} bl sub_8038F34 bl call_obj_callbacks @@ -96180,36 +96180,36 @@ 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 ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0x9 - bls _08038F44 - b _080391C6 -_08038F44: + bls @08038F44 + b @080391C6 +@08038F44: lsls r0, r1, 2 - ldr r1, =_08038F58 + ldr r1, =@08038F58 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08038F58: - .4byte _08038F80 - .4byte _08038FA0 - .4byte _08038FC2 - .4byte _080390C8 - .4byte _08039100 - .4byte _08039118 - .4byte _0803912C - .4byte _0803914C - .4byte _08039166 - .4byte _08039184 -_08038F80: +@08038F58: + .4byte @08038F80 + .4byte @08038FA0 + .4byte @08038FC2 + .4byte @080390C8 + .4byte @08039100 + .4byte @08039118 + .4byte @0803912C + .4byte @0803914C + .4byte @08039166 + .4byte @08039184 +@08038F80: movs r0, 0 bl gpu_sync_bg_show movs r0, 0x1 @@ -96219,19 +96219,19 @@ _08038F80: ldr r1, =0x02024332 movs r0, 0xFF strb r0, [r1, 0x1] - b _08039174 + b @08039174 .align 2, 0 .pool -_08038FA0: +@08038FA0: ldrb r0, [r4, 0x1] subs r0, 0x1 strb r0, [r4, 0x1] lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq _08038FB0 - b _080391C6 -_08038FB0: + beq @08038FB0 + b @080391C6 +@08038FB0: movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -96239,16 +96239,16 @@ _08038FB0: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - b _0803910C -_08038FC2: + b @0803910C +@08038FC2: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08038FD0 - b _080391C6 -_08038FD0: + beq @08038FD0 + b @080391C6 +@08038FD0: bl sub_8185FAC ldr r2, =0x030022c0 ldr r1, =0x00000439 @@ -96268,30 +96268,30 @@ _08038FD0: ands r0, r1 movs r3, 0x2 cmp r0, 0 - beq _08038FFC + beq @08038FFC movs r3, 0x4 -_08038FFC: +@08038FFC: movs r4, 0 ldr r6, =0x03005d90 cmp r4, r3 - bge _08039022 + bge @08039022 ldr r1, =0x020229e8 ldrb r0, [r1] cmp r0, 0x3 - bne _08039022 + bne @08039022 movs r5, 0xFF adds r2, r1, 0 -_08039010: +@08039010: adds r2, 0x1C adds r4, 0x1 cmp r4, r3 - bge _08039022 + bge @08039022 ldrh r1, [r2] adds r0, r5, 0 ands r0, r1 cmp r0, 0x3 - beq _08039010 -_08039022: + beq @08039010 +@08039022: ldr r0, [r6] ldr r1, =0x00000ca9 adds r0, r1 @@ -96299,21 +96299,21 @@ _08039022: movs r0, 0x8 ands r0, r1 cmp r0, 0 - bne _080390AC + bne @080390AC cmp r4, r3 - bne _080390AC + bne @080390AC ldr r0, =0x000008d2 bl flag_check lsls r0, 24 cmp r0, 0 - beq _08039074 + beq @08039074 bl Window_FreeMemory ldr r0, =sub_80392A8 + 1 bl set_callback2 - b _080391C6 + b @080391C6 .align 2, 0 .pool -_08039074: +@08039074: ldr r2, =0x030022c0 ldr r1, =0x00000439 adds r0, r2, r1 @@ -96321,34 +96321,34 @@ _08039074: movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne _08039090 + bne @08039090 ldr r0, [r2, 0x8] - b _080390B0 + b @080390B0 .align 2, 0 .pool -_08039090: +@08039090: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _08039172 + bne @08039172 ldr r0, =sub_80B3AF8 + 1 movs r1, 0x5 bl AddTask - b _08039172 + b @08039172 .align 2, 0 .pool -_080390AC: +@080390AC: ldr r0, =0x030022c0 ldr r0, [r0, 0x8] -_080390B0: +@080390B0: bl set_callback2 bl sub_8057028 bl dp11_free bl sub_805F094 - b _080391C6 + b @080391C6 .align 2, 0 .pool -_080390C8: +@080390C8: movs r0, 0 str r0, [sp, 0x4] movs r1, 0xC0 @@ -96357,13 +96357,13 @@ _080390C8: add r0, sp, 0x4 bl CpuSet movs r4, 0 -_080390DA: +@080390DA: lsls r0, r4, 24 lsrs r0, 24 bl sub_80363C4 adds r4, 0x1 cmp r4, 0x1 - ble _080390DA + ble @080390DA movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -96371,73 +96371,73 @@ _080390DA: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - b _08039172 + b @08039172 .align 2, 0 .pool -_08039100: +@08039100: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080391C6 -_0803910C: + bne @080391C6 +@0803910C: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _080391C6 + b @080391C6 .align 2, 0 .pool -_08039118: +@08039118: ldr r0, =sub_80B3AF8 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _080391C6 - b _08039172 + bne @080391C6 + b @08039172 .align 2, 0 .pool -_0803912C: +@0803912C: bl sub_800A520 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080391C6 + bne @080391C6 bl sub_800ADF8 ldr r0, =0x0824978d movs r1, 0 bl battle_show_message_maybe - b _08039172 + b @08039172 .align 2, 0 .pool -_0803914C: +@0803914C: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _080391C6 + bne @080391C6 bl sub_800A520 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080391C6 - b _08039172 -_08039166: + bne @080391C6 + b @08039172 +@08039166: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - bne _08039172 + bne @08039172 bl sub_800AC34 -_08039172: +@08039172: ldr r1, =0x02024332 -_08039174: +@08039174: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080391C6 + b @080391C6 .align 2, 0 .pool -_08039184: +@08039184: ldr r2, =0x030022c0 ldr r1, =0x00000439 adds r0, r2, r1 @@ -96446,16 +96446,16 @@ _08039184: ands r0, r1 adds r3, r2, 0 cmp r0, 0 - beq _080391A6 + beq @080391A6 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - bne _080391A6 + bne @080391A6 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 - beq _080391C6 -_080391A6: + beq @080391C6 +@080391A6: ldr r0, =0x00000439 adds r2, r3, r0 ldrb r1, [r2] @@ -96468,7 +96468,7 @@ _080391A6: bl sub_8057028 bl dp11_free bl sub_805F094 -_080391C6: +@080391C6: add sp, 0x8 pop {r4-r6} pop {r0} @@ -96478,7 +96478,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 @@ -96486,91 +96486,91 @@ sub_80391E0: @ 80391E0 lsrs r1, 24 movs r0, 0 cmp r1, 0x6 - bhi _080392A0 + bhi @080392A0 lsls r0, r1, 2 - ldr r1, =_08039200 + ldr r1, =@08039200 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08039200: - .4byte _0803921C - .4byte _08039230 - .4byte _08039244 - .4byte _08039258 - .4byte _0803926C - .4byte _08039280 - .4byte _08039294 -_0803921C: +@08039200: + .4byte @0803921C + .4byte @08039230 + .4byte @08039244 + .4byte @08039258 + .4byte @0803926C + .4byte @08039280 + .4byte @08039294 +@0803921C: ldr r0, =0x0831aa08 lsls r1, r2, 2 adds r1, r0 ldrb r0, [r1] lsls r0, 30 lsrs r0, 30 - b _080392A0 + b @080392A0 .align 2, 0 .pool -_08039230: +@08039230: ldr r0, =0x0831aa08 lsls r1, r2, 2 adds r1, r0 ldrb r0, [r1] lsls r0, 28 lsrs r0, 30 - b _080392A0 + b @080392A0 .align 2, 0 .pool -_08039244: +@08039244: ldr r0, =0x0831aa08 lsls r1, r2, 2 adds r1, r0 ldrh r0, [r1] lsls r0, 23 lsrs r0, 27 - b _080392A0 + b @080392A0 .align 2, 0 .pool -_08039258: +@08039258: ldr r0, =0x0831aa08 lsls r1, r2, 2 adds r1, r0 ldrb r0, [r1, 0x1] lsls r0, 29 lsrs r0, 30 - b _080392A0 + b @080392A0 .align 2, 0 .pool -_0803926C: +@0803926C: ldr r0, =0x0831aa08 lsls r1, r2, 2 adds r1, r0 ldrb r0, [r1, 0x1] lsls r0, 28 lsrs r0, 31 - b _080392A0 + b @080392A0 .align 2, 0 .pool -_08039280: +@08039280: ldr r0, =0x0831aa08 lsls r1, r2, 2 adds r1, r0 ldrb r0, [r1, 0x1] lsls r0, 26 lsrs r0, 30 - b _080392A0 + b @080392A0 .align 2, 0 .pool -_08039294: +@08039294: ldr r0, =0x0831aa08 lsls r1, r2, 2 adds r1, r0 ldr r0, [r1] lsls r0, 8 lsrs r0, 22 -_080392A0: +@080392A0: pop {r1} bx r1 .align 2, 0 @@ -96578,7 +96578,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 @@ -96615,13 +96615,13 @@ sub_80392A8: @ 80392A8 movs r0, 0 bl lcd_io_set bl sub_803570C -_080392FE: +@080392FE: lsls r0, r4, 24 lsrs r0, 24 bl sub_80363C4 adds r4, 0x1 cmp r4, 0x1 - ble _080392FE + ble @080392FE bl reset_all_obj_data bl clear_tasks bl gpu_pal_allocator_reset @@ -96651,7 +96651,7 @@ _080392FE: thumb_func_end sub_80392A8 thumb_func_start sub_803937C -sub_803937C: @ 803937C +sub_803937C: ; 803937C push {lr} bl sub_803939C bl call_obj_callbacks @@ -96664,39 +96664,39 @@ 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 ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0xC - bls _080393AC - b _0803975E -_080393AC: + bls @080393AC + b @0803975E +@080393AC: lsls r0, r1, 2 - ldr r1, =_080393C0 + ldr r1, =@080393C0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080393C0: - .4byte _080393F4 - .4byte _08039414 - .4byte _08039450 - .4byte _08039470 - .4byte _0803949C - .4byte _080394D8 - .4byte _0803957C - .4byte _08039704 - .4byte _080395CC - .4byte _08039610 - .4byte _08039678 - .4byte _080396A8 - .4byte _08039704 -_080393F4: +@080393C0: + .4byte @080393F4 + .4byte @08039414 + .4byte @08039450 + .4byte @08039470 + .4byte @0803949C + .4byte @080394D8 + .4byte @0803957C + .4byte @08039704 + .4byte @080395CC + .4byte @08039610 + .4byte @08039678 + .4byte @080396A8 + .4byte @08039704 +@080393F4: movs r0, 0 bl gpu_sync_bg_show movs r0, 0x1 @@ -96706,10 +96706,10 @@ _080393F4: ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 - b _0803975C + b @0803975C .align 2, 0 .pool -_08039414: +@08039414: ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -96717,62 +96717,62 @@ _08039414: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08039434 + beq @08039434 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _08039434 + bne @08039434 ldr r0, =sub_80B3AF8 + 1 movs r1, 0x5 bl AddTask -_08039434: +@08039434: ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 - b _0803975C + b @0803975C .align 2, 0 .pool -_08039450: +@08039450: ldr r0, =sub_80B3AF8 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - beq _0803945E - b _0803975E -_0803945E: + beq @0803945E + b @0803975E +@0803945E: ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 - b _0803975C + b @0803975C .align 2, 0 .pool -_08039470: +@08039470: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0803947E - b _0803975E -_0803947E: + beq @0803947E + b @0803975E +@0803947E: ldr r0, =0x085cd28f movs r1, 0 bl battle_show_message_maybe ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 - b _0803975C + b @0803975C .align 2, 0 .pool -_0803949C: +@0803949C: movs r0, 0 bl a_pressed_maybe lsls r0, 16 lsrs r0, 16 cmp r0, 0 - beq _080394AC - b _0803975E -_080394AC: + beq @080394AC + b @0803975E +@080394AC: str r0, [sp] movs r0, 0x18 movs r1, 0x8 @@ -96786,62 +96786,62 @@ _080394AC: movs r0, 0x1 strb r0, [r4, 0x1] bl sub_8056B74 - b _080396EA + b @080396EA .align 2, 0 .pool -_080394D8: +@080394D8: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _08039500 + beq @08039500 ldrb r0, [r4, 0x1] cmp r0, 0 - bne _080394EC - b _0803975E -_080394EC: + bne @080394EC + b @0803975E +@080394EC: movs r0, 0x5 bl audio_play ldrb r0, [r4, 0x1] bl sub_8056BAC movs r0, 0 - b _0803951E + b @0803951E .align 2, 0 .pool -_08039500: +@08039500: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08039526 + beq @08039526 ldrb r0, [r4, 0x1] cmp r0, 0 - beq _08039510 - b _0803975E -_08039510: + beq @08039510 + b @0803975E +@08039510: movs r0, 0x5 bl audio_play ldrb r0, [r4, 0x1] bl sub_8056BAC movs r0, 0x1 -_0803951E: +@0803951E: strb r0, [r4, 0x1] bl sub_8056B74 - b _0803975E -_08039526: + b @0803975E +@08039526: movs r5, 0x1 adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _08039560 + beq @08039560 movs r0, 0x5 bl audio_play ldr r4, =0x02024332 ldrb r0, [r4, 0x1] cmp r0, 0 - beq _08039540 - b _080396EA -_08039540: + beq @08039540 + b @080396EA +@08039540: str r5, [sp] movs r0, 0x18 movs r1, 0x8 @@ -96852,32 +96852,32 @@ _08039540: strb r0, [r4, 0x1] movs r0, 0xA strb r0, [r4] - b _0803975E + b @0803975E .align 2, 0 .pool -_08039560: +@08039560: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _0803956A - b _0803975E -_0803956A: + bne @0803956A + b @0803975E +@0803956A: movs r0, 0x5 bl audio_play ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 - b _0803975C + b @0803975C .align 2, 0 .pool -_0803957C: +@0803957C: bl sub_800A520 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0803958A - b _0803975E -_0803958A: + beq @0803958A + b @0803975E +@0803958A: str r0, [sp] movs r0, 0x18 movs r1, 0x8 @@ -96891,27 +96891,27 @@ _0803958A: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080395B4 + beq @080395B4 bl sub_800ADF8 ldr r0, =0x0824978d movs r1, 0 bl battle_show_message_maybe -_080395B4: +@080395B4: ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 - b _0803975C + b @0803975C .align 2, 0 .pool -_080395CC: +@080395CC: ldrb r0, [r4, 0x1] subs r0, 0x1 strb r0, [r4, 0x1] lsls r0, 24 cmp r0, 0 - beq _080395DA - b _0803975E -_080395DA: + beq @080395DA + b @0803975E +@080395DA: ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -96919,20 +96919,20 @@ _080395DA: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080395F6 + beq @080395F6 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - bne _080395F6 + bne @080395F6 bl sub_800AC34 -_080395F6: +@080395F6: ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 - b _0803975C + b @0803975C .align 2, 0 .pool -_08039610: +@08039610: ldr r2, =0x030022c0 ldr r1, =0x00000439 adds r0, r2, r1 @@ -96941,17 +96941,17 @@ _08039610: ands r0, r1 adds r3, r2, 0 cmp r0, 0 - beq _08039634 + beq @08039634 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - bne _08039634 + bne @08039634 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 - bne _08039634 - b _0803975E -_08039634: + bne @08039634 + b @0803975E +@08039634: ldr r0, =0x00000439 adds r2, r3, r0 ldrb r1, [r2] @@ -96964,57 +96964,57 @@ _08039634: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08039650 - b _0803975E -_08039650: + beq @08039650 + b @0803975E +@08039650: ldr r0, [r3, 0x8] bl set_callback2 bl sub_8057028 bl dp11_free bl sub_805F094 - b _0803975E + b @0803975E .align 2, 0 .pool -_08039678: +@08039678: ldrb r0, [r4, 0x1] cmp r0, 0x1 - bne _080396A0 + bne @080396A0 movs r0, 0x37 bl audio_play ldr r0, =0x085cd2cb -_08039686: +@08039686: bl sub_814E6F0 ldr r0, =0x02022e2c movs r1, 0 bl battle_show_message_maybe movs r0, 0x80 strb r0, [r4, 0x1] - b _080396EA + b @080396EA .align 2, 0 .pool -_080396A0: +@080396A0: ldr r0, =0x08242481 - b _08039686 + b @08039686 .align 2, 0 .pool -_080396A8: +@080396A8: bl sub_800A520 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0803975E + bne @0803975E movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _0803975E + bne @0803975E ldr r4, =0x02024332 ldrb r0, [r4, 0x1] subs r0, 0x1 strb r0, [r4, 0x1] lsls r0, 24 cmp r0, 0 - bne _0803975E + bne @0803975E ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -97022,25 +97022,25 @@ _080396A8: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080396EA + beq @080396EA bl sub_800ADF8 ldr r0, =0x0824978d movs r1, 0 bl battle_show_message_maybe -_080396EA: +@080396EA: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _0803975E + b @0803975E .align 2, 0 .pool -_08039704: +@08039704: movs r0, 0 bl a_pressed_maybe lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - bne _0803975E + bne @0803975E ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -97050,23 +97050,23 @@ _08039704: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq _08039744 + beq @08039744 bl sub_800A520 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0803975E + bne @0803975E movs r0, 0x1 negs r0, r0 str r4, [sp] - b _0803974A + b @0803974A .align 2, 0 .pool -_08039744: +@08039744: movs r0, 0x1 negs r0, r0 str r1, [sp] -_0803974A: +@0803974A: movs r1, 0 movs r2, 0 movs r3, 0x10 @@ -97075,9 +97075,9 @@ _0803974A: movs r0, 0x20 strb r0, [r1, 0x1] movs r0, 0x8 -_0803975C: +@0803975C: strb r0, [r1] -_0803975E: +@0803975E: add sp, 0x4 pop {r4,r5} pop {r0} @@ -97087,7 +97087,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 @@ -97099,13 +97099,13 @@ shedinja_something: @ 803976C bl pokemon_getattr ldr r1, =0x0000012f cmp r0, r1 - bne _080397B4 + bne @080397B4 adds r0, r4, 0 movs r1, 0x3 bl pokemon_getattr ldrb r1, [r5] cmp r0, r1 - beq _080397B4 + beq @080397B4 adds r0, r4, 0 movs r1, 0x2 mov r2, sp @@ -97114,12 +97114,12 @@ shedinja_something: @ 803976C mov r0, sp bl sub_80092BC cmp r0, 0 - bne _080397B4 + bne @080397B4 adds r0, r4, 0 movs r1, 0x3 adds r2, r5, 0 bl pokemon_setattr -_080397B4: +@080397B4: add sp, 0x10 pop {r4,r5} pop {r0} @@ -97129,7 +97129,7 @@ _080397B4: thumb_func_end shedinja_something thumb_func_start sub_80397C4 -sub_80397C4: @ 80397C4 +sub_80397C4: ; 80397C4 ldr r2, =0x0831aba0 lsls r0, 2 adds r0, r2 @@ -97144,7 +97144,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 + 1 @@ -97167,7 +97167,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 @@ -97175,16 +97175,16 @@ sub_803980C: @ 803980C movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0803982C + bne @0803982C ldrh r0, [r2, 0x24] adds r0, 0x2 strh r0, [r2, 0x24] lsls r0, 16 cmp r0, 0 - bne _0803982C + bne @0803982C ldr r0, =sub_8039838 + 1 str r0, [r2, 0x1C] -_0803982C: +@0803982C: pop {r0} bx r0 .align 2, 0 @@ -97192,7 +97192,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 @@ -97201,7 +97201,7 @@ sub_8039838: @ 8039838 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08039880 + beq @08039880 ldrh r0, [r4, 0x2E] lsls r0, 24 lsrs r0, 24 @@ -97225,7 +97225,7 @@ sub_8039838: @ 8039838 movs r2, 0xA movs r3, 0 bl sub_80A1AD4 -_08039880: +@08039880: add sp, 0x4 pop {r4} pop {r0} @@ -97235,7 +97235,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 @@ -97243,13 +97243,13 @@ sub_8039894: @ 8039894 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080398B0 + bne @080398B0 ldrh r1, [r2, 0x32] adds r0, r2, 0 movs r2, 0 movs r3, 0x1 bl sub_806ECEC -_080398B0: +@080398B0: pop {r0} bx r0 .align 2, 0 @@ -97257,12 +97257,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 @@ -97275,7 +97275,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] @@ -97283,7 +97283,7 @@ sub_80398D0: @ 80398D0 strh r0, [r3, 0x36] lsls r0, 16 cmp r0, 0 - bne _08039924 + bne @08039924 movs r0, 0x8 strh r0, [r3, 0x36] movs r0, 0x3E @@ -97308,7 +97308,7 @@ sub_80398D0: @ 80398D0 lsls r0, 16 asrs r2, r0, 16 cmp r2, 0 - bne _08039924 + bne @08039924 ldrb r1, [r1] adds r0, r4, 0 ands r0, r1 @@ -97318,7 +97318,7 @@ sub_80398D0: @ 80398D0 str r0, [r3, 0x1C] ldr r0, =0x02022f88 str r2, [r0] -_08039924: +@08039924: pop {r4} pop {r0} bx r0 @@ -97327,7 +97327,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 @@ -97343,15 +97343,15 @@ sub_8039934: @ 8039934 adds r1, r0, r1 ldrh r0, [r1, 0x2] cmp r0, 0 - beq _0803995C + beq @0803995C adds r4, r0, 0 - b _08039960 + b @08039960 .align 2, 0 .pool -_0803995C: +@0803995C: mov r0, r9 ldrh r4, [r0, 0x32] -_08039960: +@08039960: ldr r1, =0x0202406e lsls r0, r6, 1 adds r5, r0, r1 @@ -97366,7 +97366,7 @@ _08039960: movs r1, 0 bl pokemon_getattr cmp r4, 0xC9 - bne _080399E4 + bne @080399E4 ldrh r0, [r5] mov r1, r8 muls r1, r0 @@ -97397,27 +97397,27 @@ _08039960: lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne _080399D0 + bne @080399D0 movs r0, 0xC9 - b _080399DA + b @080399DA .align 2, 0 .pool -_080399D0: +@080399D0: movs r1, 0xCE lsls r1, 1 adds r0, r1 lsls r0, 16 lsrs r0, 16 -_080399DA: +@080399DA: ldr r1, =0x08300d38 lsls r0, 2 - b _08039A1C + b @08039A1C .align 2, 0 .pool -_080399E4: +@080399E4: ldr r0, =0x00000181 cmp r4, r0 - bne _08039A08 + bne @08039A08 ldr r0, =0x08525f78 ldr r1, =0x020244e4 adds r1, r6, r1 @@ -97425,26 +97425,26 @@ _080399E4: lsls r1, 2 adds r1, r0 ldrb r0, [r1, 0x1] - b _08039A20 + b @08039A20 .align 2, 0 .pool -_08039A08: +@08039A08: movs r0, 0xCE lsls r0, 1 cmp r4, r0 - bls _08039A18 + bls @08039A18 ldr r0, =0x08300d38 - b _08039A1E + b @08039A1E .align 2, 0 .pool -_08039A18: +@08039A18: ldr r1, =0x08300d38 lsls r0, r4, 2 -_08039A1C: +@08039A1C: adds r0, r1 -_08039A1E: +@08039A1E: ldrb r0, [r0, 0x1] -_08039A20: +@08039A20: lsrs r1, r0, 3 movs r0, 0x8 subs r0, r1 @@ -97465,7 +97465,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] @@ -97473,7 +97473,7 @@ sub_8039A48: @ 8039A48 strh r0, [r4, 0x36] lsls r0, 16 cmp r0, 0 - bne _08039AC8 + bne @08039AC8 movs r0, 0x2 strh r0, [r4, 0x36] ldrh r0, [r4, 0x26] @@ -97484,13 +97484,13 @@ sub_8039A48: @ 8039A48 strh r0, [r4, 0x34] lsls r0, 16 cmp r0, 0 - bge _08039A7C + bge @08039A7C adds r0, r4, 0 bl obj_free_rotscale_entry adds r0, r4, 0 bl obj_delete_and_free_tiles - b _08039AC8 -_08039A7C: + b @08039AC8 +@08039A7C: ldrh r0, [r4, 0x2E] lsls r0, 24 lsrs r0, 24 @@ -97515,12 +97515,12 @@ _08039A7C: adds r1, r0 movs r2, 0 movs r0, 0xFF -_08039AAE: +@08039AAE: strb r2, [r1] adds r1, 0x1 subs r0, 0x1 cmp r0, 0 - bge _08039AAE + bge @08039AAE ldr r0, =0x020244e4 movs r3, 0x2E ldrsh r1, [r4, r3] @@ -97528,7 +97528,7 @@ _08039AAE: ldrb r1, [r1] adds r0, r4, 0 bl obj_anim_image_start -_08039AC8: +@08039AC8: pop {r4} pop {r0} bx r0 @@ -97537,7 +97537,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 @@ -97554,7 +97554,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] @@ -97562,7 +97562,7 @@ sub_8039AF4: @ 8039AF4 strh r0, [r3, 0x34] lsls r0, 16 cmp r0, 0 - bne _08039B26 + bne @08039B26 movs r0, 0x3E adds r0, r3 mov r12, r0 @@ -97580,13 +97580,13 @@ sub_8039AF4: @ 8039AF4 strb r0, [r1] movs r0, 0x8 strh r0, [r3, 0x34] -_08039B26: +@08039B26: pop {r0} bx r0 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 @@ -97612,7 +97612,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 @@ -97620,35 +97620,35 @@ sub_8039B58: @ 8039B58 movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _08039BA0 + beq @08039BA0 ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 - beq _08039B80 + beq @08039B80 ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x02000002 ands r0, r1 cmp r0, 0 - beq _08039B94 -_08039B80: + beq @08039B94 +@08039B80: ldrh r0, [r4, 0x32] bl sub_806F0D4 lsls r0, 24 cmp r0, 0 - beq _08039B94 + beq @08039B94 adds r0, r4, 0 movs r1, 0x1 bl obj_anim_image_start -_08039B94: +@08039B94: ldrh r1, [r4, 0x32] adds r0, r4, 0 movs r2, 0x1 movs r3, 0x1 bl sub_806ECEC -_08039BA0: +@08039BA0: pop {r4} pop {r0} bx r0 @@ -97657,7 +97657,7 @@ _08039BA0: thumb_func_end sub_8039B58 thumb_func_start sub_8039BB4 -sub_8039BB4: @ 8039BB4 +sub_8039BB4: ; 8039BB4 ldr r1, =oac_poke_ally_ + 1 str r1, [r0, 0x1C] bx lr @@ -97666,7 +97666,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 @@ -97674,18 +97674,18 @@ oac_poke_ally_: @ 8039BC0 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _08039BE4 + bne @08039BE4 ldrh r0, [r2, 0x24] subs r0, 0x2 strh r0, [r2, 0x24] lsls r0, 16 asrs r1, r0, 16 cmp r1, 0 - bne _08039BE4 + bne @08039BE4 ldr r0, =nullsub_19 + 1 str r0, [r2, 0x1C] strh r1, [r2, 0x30] -_08039BE4: +@08039BE4: pop {r0} bx r0 .align 2, 0 @@ -97693,7 +97693,7 @@ _08039BE4: thumb_func_end oac_poke_ally_ thumb_func_start sub_8039BF0 -sub_8039BF0: @ 8039BF0 +sub_8039BF0: ; 8039BF0 ldr r1, =nullsub_19 + 1 str r1, [r0, 0x1C] bx lr @@ -97702,12 +97702,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 @@ -97715,7 +97715,7 @@ sub_8039C00: @ 8039C00 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _08039C20 + bne @08039C20 ldrh r0, [r2, 0x30] ldrh r1, [r2, 0x24] adds r0, r1 @@ -97724,7 +97724,7 @@ sub_8039C00: @ 8039C00 ldrh r1, [r2, 0x26] adds r0, r1 strh r0, [r2, 0x26] -_08039C20: +@08039C20: pop {r0} bx r0 .align 2, 0 @@ -97732,7 +97732,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 @@ -97750,7 +97750,7 @@ dp11b_obj_instanciate: @ 8039C28 lsrs r3, 24 mov r10, r3 cmp r1, 0 - beq _08039C64 + beq @08039C64 ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -97760,10 +97760,10 @@ dp11b_obj_instanciate: @ 8039C28 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 - b _08039C76 + b @08039C76 .align 2, 0 .pool -_08039C64: +@08039C64: ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -97773,18 +97773,18 @@ _08039C64: adds r0, r1 ldrb r1, [r0] movs r0, 0x4 -_08039C76: +@08039C76: ands r0, r1 adds r6, r2, 0 cmp r0, 0 - bne _08039D2C + bne @08039D2C ldr r0, =objc_dp11b_pingpong + 1 bl object_new_hidden_with_callback lsls r0, 24 lsrs r5, r0, 24 mov r0, r8 cmp r0, 0x1 - bne _08039CD0 + bne @08039CD0 ldr r0, =0x03005d70 adds r0, r4, r0 ldrb r7, [r0] @@ -97808,10 +97808,10 @@ _08039C76: lsls r0, 2 adds r0, r2 movs r1, 0x80 - b _08039CFE + b @08039CFE .align 2, 0 .pool -_08039CD0: +@08039CD0: ldr r0, =0x020241e4 adds r0, r4, r0 ldrb r7, [r0] @@ -97835,7 +97835,7 @@ _08039CD0: lsls r0, 2 adds r0, r2 movs r1, 0xC0 -_08039CFE: +@08039CFE: strh r1, [r0, 0x2E] adds r4, r2, 0 adds r1, r3, r5 @@ -97859,7 +97859,7 @@ _08039CFE: adds r0, r4 strh r2, [r0, 0x24] strh r2, [r0, 0x26] -_08039D2C: +@08039D2C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -97872,14 +97872,14 @@ _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 lsls r1, 24 lsrs r1, 24 cmp r1, 0x1 - bne _08039D9C + bne @08039D9C ldr r6, =0x020244d0 ldr r0, [r6] ldr r1, [r0, 0x4] @@ -97891,7 +97891,7 @@ dp11b_obj_free: @ 8039D48 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08039DEA + beq @08039DEA ldr r2, =0x02020630 ldrb r1, [r3, 0x2] lsls r0, r1, 4 @@ -97908,10 +97908,10 @@ dp11b_obj_free: @ 8039D48 ldrb r2, [r1] movs r0, 0x3 negs r0, r0 - b _08039DD6 + b @08039DD6 .align 2, 0 .pool -_08039D9C: +@08039D9C: ldr r6, =0x020244d0 ldr r0, [r6] ldr r1, [r0, 0x4] @@ -97923,7 +97923,7 @@ _08039D9C: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08039DEA + beq @08039DEA ldr r2, =0x02020630 ldrb r1, [r3, 0x3] lsls r0, r1, 4 @@ -97940,7 +97940,7 @@ _08039D9C: ldrb r2, [r1] movs r0, 0x5 negs r0, r0 -_08039DD6: +@08039DD6: ands r0, r2 strb r0, [r1] ldr r0, =0x02020630 @@ -97951,7 +97951,7 @@ _08039DD6: movs r0, 0 strh r0, [r1, 0x24] strh r0, [r1, 0x26] -_08039DEA: +@08039DEA: pop {r4-r6} pop {r0} bx r0 @@ -97960,7 +97960,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] @@ -97969,14 +97969,14 @@ objc_dp11b_pingpong: @ 8039DF8 movs r1, 0x36 ldrsh r0, [r4, r1] cmp r0, 0x1 - bne _08039E10 + bne @08039E10 movs r2, 0x2E ldrsh r0, [r4, r2] - b _08039E14 -_08039E10: + b @08039E14 +@08039E10: movs r1, 0x2E ldrsh r0, [r4, r1] -_08039E14: +@08039E14: movs r2, 0x32 ldrsh r1, [r4, r2] bl sine @@ -98002,7 +98002,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 @@ -98010,17 +98010,17 @@ sub_8039E44: @ 8039E44 movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _08039E5C + beq @08039E5C ldrh r1, [r2, 0x32] adds r0, r2, 0 bl sub_806EEB4 -_08039E5C: +@08039E5C: pop {r0} bx r0 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 @@ -98030,10 +98030,10 @@ sub_8039E60: @ 8039E60 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08039E7A + beq @08039E7A ldr r0, =nullsub_19 + 1 str r0, [r4, 0x1C] -_08039E7A: +@08039E7A: pop {r4} pop {r0} bx r0 @@ -98042,7 +98042,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 @@ -98057,7 +98057,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 @@ -98065,7 +98065,7 @@ sub_8039E9C: @ 8039E9C movs r0, 0x3F ands r0, r1 cmp r0, 0 - bne _08039EBE + bne @08039EBE ldr r1, =0x0831ace0 adds r0, r2, 0 adds r0, 0x2B @@ -98075,7 +98075,7 @@ sub_8039E9C: @ 8039E9C adds r0, r2, 0 adds r0, 0x28 strb r1, [r0] -_08039EBE: +@08039EBE: pop {r0} bx r0 .align 2, 0 @@ -98083,12 +98083,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 @@ -98104,7 +98104,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] @@ -98115,10 +98115,10 @@ sub_8039EF0: @ 8039EF0 ldr r0, =0x0202406c ldrb r0, [r0] cmp r0, 0 - beq _08039F2A + beq @08039F2A ldr r5, =0x03005d60 adds r4, r1, 0 -_08039F0C: +@08039F0C: ldrb r0, [r4] lsls r0, 2 adds r0, r5 @@ -98132,8 +98132,8 @@ _08039F0C: lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bcc _08039F0C -_08039F2A: + bcc @08039F0C +@08039F2A: pop {r4,r5} pop {r0} bx r0 @@ -98142,7 +98142,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 @@ -98165,17 +98165,17 @@ sub_8039F40: @ 8039F40 movs r4, 0 ldr r7, =0x02024240 ldr r6, =0x02024268 -_08039F70: +@08039F70: ldr r0, =0x020242ac adds r0, r4, r0 str r3, [r0] movs r1, 0 -_08039F78: +@08039F78: adds r0, r5, r1 strb r3, [r0] adds r1, 0x1 cmp r1, 0x1B - bls _08039F78 + bls @08039F78 movs r0, 0x2 strb r0, [r5, 0x16] ldr r1, =0x02024284 @@ -98214,25 +98214,25 @@ _08039F78: adds r6, 0x2 adds r2, 0x1 cmp r2, 0x3 - ble _08039F70 + ble @08039F70 movs r5, 0 ldr r3, =0x02024294 ldr r4, =0x0202428e movs r2, 0x1 -_08039FD8: +@08039FD8: strh r5, [r4] movs r1, 0 -_08039FDC: +@08039FDC: adds r0, r3, r1 strb r5, [r0] adds r1, 0x1 cmp r1, 0xB - bls _08039FDC + bls @08039FDC adds r3, 0xC adds r4, 0x2 subs r2, 0x1 cmp r2, 0 - bge _08039FD8 + bge @08039FD8 movs r1, 0 ldr r2, =0x0202420b strb r1, [r2] @@ -98243,12 +98243,12 @@ _08039FDC: ldr r1, =0x020243d0 movs r2, 0 movs r3, 0 -_0803A004: +@0803A004: adds r0, r1, r2 strb r3, [r0] adds r2, 0x1 cmp r2, 0x2B - bls _0803A004 + bls @0803A004 ldr r2, =0x02024280 movs r0, 0 str r0, [r2] @@ -98258,39 +98258,39 @@ _0803A004: lsls r0, 17 ands r0, r1 cmp r0, 0 - bne _0803A090 + bne @0803A090 movs r0, 0x2 ands r1, r0 cmp r1, 0 - bne _0803A0AE + bne @0803A0AE ldr r0, =0x03005d90 ldr r0, [r0] ldrb r1, [r0, 0x15] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0803A0AE + beq @0803A0AE movs r0, 0x80 - b _0803A0AC + b @0803A0AC .align 2, 0 .pool -_0803A090: +@0803A090: ldr r0, =0x02000002 ands r1, r0 cmp r1, 0 - bne _0803A0AE + bne @0803A0AE bl sub_8185FB8 lsls r0, 24 cmp r0, 0 - beq _0803A0AE + beq @0803A0AE ldr r1, =0x02024280 ldr r0, [r1] movs r1, 0x80 orrs r0, r1 ldr r2, =0x02024280 -_0803A0AC: +@0803A0AC: str r0, [r2] -_0803A0AE: +@0803A0AE: ldr r3, =0x02024474 ldr r0, =0x03005d90 ldr r0, [r0] @@ -98329,11 +98329,11 @@ _0803A0AE: ldr r1, =0x02024332 movs r2, 0 adds r0, r1, 0x7 -_0803A0FA: +@0803A0FA: strb r2, [r0] subs r0, 0x1 cmp r0, r1 - bge _0803A0FA + bge @0803A0FA movs r4, 0 strh r4, [r5] movs r0, 0 @@ -98384,7 +98384,7 @@ _0803A0FA: movs r2, 0 movs r1, 0 adds r6, r5, 0 -_0803A16A: +@0803A16A: ldr r0, [r5] adds r0, r2, r0 adds r0, 0x98 @@ -98419,20 +98419,20 @@ _0803A16A: strb r1, [r0] adds r2, 0x1 cmp r2, 0x7 - ble _0803A16A + ble @0803A16A movs r2, 0 ldr r4, =0x0202449c movs r3, 0xA5 lsls r3, 2 movs r1, 0x6 -_0803A1BA: +@0803A1BA: ldr r0, [r4] adds r0, r2, r0 adds r0, r3 strb r1, [r0] adds r2, 0x1 cmp r2, 0x3 - ble _0803A1BA + ble @0803A1BA ldr r0, [r6] adds r0, 0xDF movs r1, 0 @@ -98446,12 +98446,12 @@ _0803A1BA: ldr r1, =0x03005d10 movs r2, 0 movs r3, 0 -_0803A1E4: +@0803A1E4: adds r0, r1, r2 strb r3, [r0] adds r2, 0x1 cmp r2, 0x43 - bls _0803A1E4 + bls @0803A1E4 ldr r0, =0x02024744 bl sub_806EBA4 ldr r3, =0x03005d10 @@ -98487,7 +98487,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 @@ -98521,14 +98521,14 @@ sub_803A284: @ 803A284 ldr r6, =0x020242ac mov r10, r6 cmp r0, 0x7F - beq _0803A35C + beq @0803A35C movs r5, 0 mov r6, r9 movs r4, 0x58 ldr r2, =0x02024084 adds r2, 0x18 movs r1, 0x6 -_0803A2D4: +@0803A2D4: ldrb r0, [r6] muls r0, r4 adds r0, r5, r0 @@ -98536,17 +98536,17 @@ _0803A2D4: strb r1, [r0] adds r5, 0x1 cmp r5, 0x7 - ble _0803A2D4 + ble @0803A2D4 movs r5, 0 ldr r7, =0x0202406c ldrb r7, [r7] cmp r5, r7 - bge _0803A348 + bge @0803A348 ldr r0, =0x020240d4 mov r8, r0 ldr r4, =0x020242bc ldr r3, =0x020242ac -_0803A2F6: +@0803A2F6: movs r0, 0x58 muls r0, r5 mov r1, r8 @@ -98556,41 +98556,41 @@ _0803A2F6: lsls r0, 19 ands r0, r1 cmp r0, 0 - beq _0803A31A + beq @0803A31A ldrb r0, [r4, 0x14] ldr r6, =0x02024064 ldrb r6, [r6] cmp r0, r6 - bne _0803A31A + bne @0803A31A ldr r0, =0xfbffffff ands r1, r0 str r1, [r2] -_0803A31A: +@0803A31A: ldr r1, [r3] movs r0, 0x18 ands r0, r1 cmp r0, 0 - beq _0803A33A + beq @0803A33A ldrb r0, [r4, 0x15] ldr r7, =0x02024064 ldrb r7, [r7] cmp r0, r7 - bne _0803A33A + bne @0803A33A movs r0, 0x19 negs r0, r0 ands r1, r0 str r1, [r3] movs r0, 0 strb r0, [r4, 0x15] -_0803A33A: +@0803A33A: adds r4, 0x1C adds r3, 0x4 adds r5, 0x1 ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 - blt _0803A2F6 -_0803A348: + blt @0803A2F6 +@0803A348: ldr r1, =0x020241ea ldrh r0, [r1] lsls r1, r0, 1 @@ -98600,8 +98600,8 @@ _0803A348: adds r1, r2 ldrb r0, [r1] cmp r0, 0x7F - bne _0803A414 -_0803A35C: + bne @0803A414 +@0803A35C: mov r3, r9 ldrb r1, [r3] movs r0, 0x58 @@ -98625,10 +98625,10 @@ _0803A35C: ldr r6, =0x0202406c ldrb r6, [r6] cmp r5, r6 - bge _0803A430 + bge @0803A430 mov r7, r9 movs r6, 0 -_0803A390: +@0803A390: ldrb r0, [r7] bl battle_side_get_owner adds r4, r0, 0 @@ -98638,7 +98638,7 @@ _0803A390: lsls r4, 24 lsls r0, 24 cmp r4, r0 - beq _0803A3D0 + beq @0803A3D0 ldr r1, =0x020242ac lsls r0, r5, 2 adds r2, r0, r1 @@ -98646,34 +98646,34 @@ _0803A390: movs r0, 0x18 ands r0, r1 cmp r0, 0 - beq _0803A3D0 + beq @0803A3D0 ldr r0, =0x020242bc adds r0, r6, r0 ldrb r0, [r0, 0x15] ldrb r3, [r7] cmp r0, r3 - bne _0803A3D0 + bne @0803A3D0 movs r0, 0x19 negs r0, r0 ands r1, r0 movs r0, 0x10 orrs r1, r0 str r1, [r2] -_0803A3D0: +@0803A3D0: adds r6, 0x1C adds r5, 0x1 ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 - blt _0803A390 + blt @0803A390 ldr r6, =0x020242bc mov r12, r6 ldr r7, =0x02024064 mov r9, r7 - b _0803A430 + b @0803A430 .align 2, 0 .pool -_0803A414: +@0803A414: mov r0, r9 ldrb r1, [r0] movs r0, 0x58 @@ -98688,7 +98688,7 @@ _0803A414: lsls r0, 2 add r0, r10 str r1, [r0] -_0803A430: +@0803A430: movs r5, 0 ldr r3, =0x0202449c mov r8, r3 @@ -98697,11 +98697,11 @@ _0803A430: ldr r7, =0x0202406c ldrb r7, [r7] cmp r5, r7 - bge _0803A490 + bge @0803A490 ldr r3, =0x020240d4 ldr r7, =0x0832a328 ldr r6, =0x02024064 -_0803A448: +@0803A448: movs r0, 0x58 muls r0, r5 adds r4, r0, r3 @@ -98714,33 +98714,33 @@ _0803A448: adds r0, r1, 0 ands r0, r2 cmp r0, 0 - beq _0803A466 + beq @0803A466 bics r1, r2 str r1, [r4] -_0803A466: +@0803A466: ldr r1, [r4] movs r0, 0xE0 lsls r0, 8 ands r0, r1 cmp r0, 0 - beq _0803A486 + beq @0803A486 mov r2, r8 ldr r0, [r2] adds r0, r5, r0 ldrb r0, [r0, 0x14] ldrb r2, [r6] cmp r0, r2 - bne _0803A486 + bne @0803A486 ldr r0, =0xffff1fff ands r1, r0 str r1, [r4] -_0803A486: +@0803A486: adds r5, 0x1 ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 - blt _0803A448 -_0803A490: + blt @0803A448 +@0803A490: mov r1, r9 ldrb r0, [r1] add r0, r10 @@ -98759,12 +98759,12 @@ _0803A490: adds r1, r0, r6 movs r5, 0 movs r2, 0 -_0803A4B4: +@0803A4B4: adds r0, r1, r5 strb r2, [r0] adds r5, 0x1 cmp r5, 0x1B - bls _0803A4B4 + bls @0803A4B4 ldr r7, =0x020241ea ldrh r0, [r7] lsls r1, r0, 1 @@ -98774,7 +98774,7 @@ _0803A4B4: adds r1, r0 ldrb r0, [r1] cmp r0, 0x7F - bne _0803A540 + bne @0803A540 mov r2, r9 ldrb r1, [r2] lsls r0, r1, 3 @@ -98830,7 +98830,7 @@ _0803A4B4: mov r1, sp ldrb r1, [r1, 0x14] strb r1, [r0, 0x14] -_0803A540: +@0803A540: movs r0, 0 ldr r6, =0x0202427c strb r0, [r6] @@ -98966,14 +98966,14 @@ _0803A540: ldr r7, =0x0202406c ldrb r7, [r7] cmp r5, r7 - bge _0803A6B4 + bge @0803A6B4 mov r3, r9 mov r7, r8 movs r6, 0 -_0803A656: +@0803A656: ldrb r0, [r3] cmp r5, r0 - beq _0803A68C + beq @0803A68C lsls r0, r5, 24 lsrs r0, 24 str r3, [sp, 0x1C] @@ -98986,7 +98986,7 @@ _0803A656: lsls r0, 24 ldr r3, [sp, 0x1C] cmp r4, r0 - beq _0803A68C + beq @0803A68C ldr r0, [r7] lsls r1, r5, 1 adds r0, r1, r0 @@ -98996,7 +98996,7 @@ _0803A656: adds r1, r0 adds r1, 0x99 strb r6, [r1] -_0803A68C: +@0803A68C: ldrb r0, [r3] ldr r1, [r7] lsls r0, 1 @@ -99016,8 +99016,8 @@ _0803A68C: ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 - blt _0803A656 -_0803A6B4: + blt @0803A656 +@0803A6B4: mov r1, r9 ldrb r0, [r1] mov r2, r8 @@ -99067,7 +99067,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 @@ -99090,7 +99090,7 @@ sub_803A75C: @ 803A75C adds r2, r6, 0 adds r2, 0x18 movs r1, 0x6 -_0803A788: +@0803A788: ldrb r0, [r4] muls r0, r3 adds r0, r5, r0 @@ -99098,7 +99098,7 @@ _0803A788: strb r1, [r0] adds r5, 0x1 cmp r5, 0x7 - ble _0803A788 + ble @0803A788 ldr r0, =0x02024064 ldrb r1, [r0] movs r0, 0x58 @@ -99117,29 +99117,29 @@ _0803A788: ldr r6, =0x0202406c ldrb r6, [r6] cmp r5, r6 - bge _0803A830 + bge @0803A830 adds r3, r2, 0 movs r4, 0 ldr r0, =0x0832a328 mov r8, r0 -_0803A7C6: +@0803A7C6: ldr r1, [r3] movs r0, 0x80 lsls r0, 19 ands r0, r1 cmp r0, 0 - beq _0803A7E6 + beq @0803A7E6 ldr r2, =0x020242bc adds r0, r4, r2 ldrb r0, [r0, 0x14] ldr r6, =0x02024064 ldrb r6, [r6] cmp r0, r6 - bne _0803A7E6 + bne @0803A7E6 ldr r0, =0xfbffffff ands r1, r0 str r1, [r3] -_0803A7E6: +@0803A7E6: ldr r1, =0x02024064 ldrb r0, [r1] lsls r0, 2 @@ -99150,16 +99150,16 @@ _0803A7E6: adds r0, r1, 0 ands r0, r2 cmp r0, 0 - beq _0803A800 + beq @0803A800 bics r1, r2 str r1, [r3] -_0803A800: +@0803A800: ldr r1, [r3] movs r0, 0xE0 lsls r0, 8 ands r0, r1 cmp r0, 0 - beq _0803A822 + beq @0803A822 mov r2, r12 ldr r0, [r2] adds r0, r5, r0 @@ -99167,19 +99167,19 @@ _0803A800: ldr r6, =0x02024064 ldrb r6, [r6] cmp r0, r6 - bne _0803A822 + bne @0803A822 ldr r0, =0xffff1fff ands r1, r0 str r1, [r3] -_0803A822: +@0803A822: adds r3, 0x58 adds r4, 0x1C adds r5, 0x1 ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 - blt _0803A7C6 -_0803A830: + blt @0803A7C6 +@0803A830: ldr r1, =0x02024064 ldrb r0, [r1] add r0, r9 @@ -99197,12 +99197,12 @@ _0803A830: adds r1, r0, r3 movs r5, 0 movs r2, 0 -_0803A852: +@0803A852: adds r0, r1, r5 strb r2, [r0] adds r5, 0x1 cmp r5, 0x1B - bls _0803A852 + bls @0803A852 ldr r6, =0x02024064 ldrb r1, [r6] lsls r1, 4 @@ -99491,14 +99491,14 @@ _0803A852: ldr r3, =0x0202406c ldrb r3, [r3] cmp r5, r3 - bge _0803AB02 + bge @0803AB02 adds r3, r6, 0 mov r7, r12 movs r6, 0 -_0803AAA4: +@0803AAA4: ldrb r0, [r3] cmp r5, r0 - beq _0803AADA + beq @0803AADA lsls r0, r5, 24 lsrs r0, 24 str r3, [sp] @@ -99511,7 +99511,7 @@ _0803AAA4: lsls r0, 24 ldr r3, [sp] cmp r4, r0 - beq _0803AADA + beq @0803AADA ldr r0, [r7] lsls r1, r5, 1 adds r0, r1, r0 @@ -99521,7 +99521,7 @@ _0803AAA4: adds r1, r0 adds r1, 0x99 strb r6, [r1] -_0803AADA: +@0803AADA: ldrb r0, [r3] ldr r1, [r7] lsls r0, 1 @@ -99541,8 +99541,8 @@ _0803AADA: ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 - blt _0803AAA4 -_0803AB02: + blt @0803AAA4 +@0803AB02: ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -99557,10 +99557,10 @@ _0803AB02: movs r3, 0x58 adds r2, r0, 0 muls r2, r3 - b _0803AB6C + b @0803AB6C .align 2, 0 .pool -_0803AB6C: +@0803AB6C: adds r2, r4 ldr r5, =0x083203cc ldrh r1, [r2] @@ -99601,18 +99601,18 @@ _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] cmp r0, 0 - beq _0803ABD4 + beq @0803ABD4 cmp r0, 0x1 - beq _0803ABF8 - b _0803AC2E + beq @0803ABF8 + b @0803AC2E .align 2, 0 .pool -_0803ABD4: +@0803ABD4: ldr r4, =0x02024064 ldrb r0, [r5, 0x1] strb r0, [r4] @@ -99625,14 +99625,14 @@ _0803ABD4: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] - b _0803AC2E + b @0803AC2E .align 2, 0 .pool -_0803ABF8: +@0803ABF8: ldr r0, =0x02024068 ldr r2, [r0] cmp r2, 0 - bne _0803AC2E + bne @0803AC2E ldrb r0, [r5, 0x1] adds r0, 0x1 strb r0, [r5, 0x1] @@ -99641,28 +99641,28 @@ _0803ABF8: lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bne _0803AC2C + bne @0803AC2C ldr r1, =0x03005d04 ldr r0, =bc_load_battlefield + 1 str r0, [r1] - b _0803AC2E + b @0803AC2E .align 2, 0 .pool -_0803AC2C: +@0803AC2C: strb r2, [r5] -_0803AC2E: +@0803AC2E: pop {r4,r5} pop {r0} bx r0 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] cmp r5, 0 - bne _0803AC64 + bne @0803AC64 movs r0, 0 bl battle_get_side_with_given_state ldr r4, =0x02024064 @@ -99679,7 +99679,7 @@ bc_load_battlefield: @ 803AC34 ldr r0, =0x02024332 strb r5, [r0] strb r5, [r0, 0x1] -_0803AC64: +@0803AC64: pop {r4,r5} pop {r0} bx r0 @@ -99688,7 +99688,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 @@ -99697,17 +99697,17 @@ sub_803AC84: @ 803AC84 ldr r0, =0x02024068 ldr r1, [r0] cmp r1, 0 - beq _0803AC98 - b _0803AF4E -_0803AC98: + beq @0803AC98 + b @0803AF4E +@0803AC98: ldr r2, =0x02024064 strb r1, [r2] ldr r0, =0x0202406c ldrb r0, [r0] cmp r1, r0 - bcc _0803ACA6 - b _0803AF48 -_0803ACA6: + bcc @0803ACA6 + b @0803AF48 +@0803ACA6: movs r7, 0x58 ldr r0, =0x02024084 mov r8, r0 @@ -99715,35 +99715,35 @@ _0803ACA6: movs r1, 0x48 add r1, r8 mov r10, r1 -_0803ACB4: +@0803ACB4: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 - beq _0803ACFC + beq @0803ACFC ldr r4, =0x02024064 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0803ACFC + bne @0803ACFC ldrb r0, [r4] muls r0, r7 mov r2, r8 adds r3, r0, r2 movs r2, 0 movs r1, 0 -_0803ACDA: +@0803ACDA: adds r0, r3, r2 strb r1, [r0] adds r2, 0x1 cmp r2, 0x57 - bls _0803ACDA - b _0803ADCA + bls @0803ACDA + b @0803ADCA .align 2, 0 .pool -_0803ACFC: +@0803ACFC: mov r1, r9 ldrb r0, [r1] muls r0, r7 @@ -99753,7 +99753,7 @@ _0803ACFC: ldr r6, =0x083203cc ldr r5, =0x02023864 ldr r4, =0x02024064 -_0803AD0E: +@0803AD0E: adds r0, r3, r2 ldrb r1, [r4] lsls r1, 9 @@ -99764,7 +99764,7 @@ _0803AD0E: strb r1, [r0] adds r2, 0x1 cmp r2, 0x57 - bls _0803AD0E + bls @0803AD0E mov r1, r9 ldrb r0, [r1] adds r2, r0, 0 @@ -99830,7 +99830,7 @@ _0803AD0E: adds r0, r1 mov r12, r0 movs r3, 0x6 -_0803ADAA: +@0803ADAA: ldrb r0, [r4] muls r0, r5 adds r0, r2, r0 @@ -99838,7 +99838,7 @@ _0803ADAA: strb r3, [r0] adds r2, 0x1 cmp r2, 0x7 - ble _0803ADAA + ble @0803ADAA ldrb r0, [r6] adds r1, r0, 0 muls r1, r7 @@ -99847,46 +99847,46 @@ _0803ADAA: adds r1, r0 movs r0, 0 str r0, [r1] -_0803ADCA: +@0803ADCA: ldr r4, =0x02024064 ldrb r0, [r4] bl battle_get_per_side_status lsls r0, 24 cmp r0, 0 - bne _0803ADE4 + bne @0803ADE4 movs r0, 0 bl dp01_build_cmdbuf_x07_7_7_7 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_0803ADE4: +@0803ADE4: ldr r5, =0x02022fec ldr r0, [r5] movs r1, 0x8 ands r0, r1 cmp r0, 0 - beq _0803AE60 + beq @0803AE60 ldrb r0, [r4] bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0803AE0A + bne @0803AE0A movs r0, 0 bl dp01_build_cmdbuf_x07_7_7_7 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_0803AE0A: +@0803AE0A: ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0803AEC0 + bne @0803AEC0 ldr r0, [r5] ldr r1, =0x063f0902 ands r0, r1 cmp r0, 0 - bne _0803AEC0 + bne @0803AEC0 ldrb r0, [r4] muls r0, r7 add r0, r8 @@ -99900,21 +99900,21 @@ _0803AE0A: ldr r2, [r1] movs r1, 0x2 bl sub_806F01C - b _0803AEC0 + b @0803AEC0 .align 2, 0 .pool -_0803AE60: +@0803AE60: ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0803AEC0 + bne @0803AEC0 ldr r0, [r5] ldr r1, =0x063f0902 ands r0, r1 cmp r0, 0 - bne _0803AE96 + bne @0803AE96 ldrb r0, [r4] muls r0, r7 add r0, r8 @@ -99928,7 +99928,7 @@ _0803AE60: ldr r2, [r1] movs r1, 0x2 bl sub_806F01C -_0803AE96: +@0803AE96: movs r0, 0 bl dp01_build_cmdbuf_x04_4_4_4 ldrb r0, [r4] @@ -99947,60 +99947,60 @@ _0803AE96: bl pokemon_getattr ldr r1, =0x03005d10 strh r0, [r1, 0x20] -_0803AEC0: +@0803AEC0: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _0803AEF6 + beq @0803AEF6 ldr r4, =0x02024064 ldrb r0, [r4] bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - beq _0803AEEA + beq @0803AEEA ldrb r0, [r4] bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bne _0803AEF6 -_0803AEEA: + bne @0803AEF6 +@0803AEEA: movs r0, 0 bl dp01_build_cmdbuf_x07_7_7_7 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_0803AEF6: +@0803AEF6: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 8 ands r0, r1 cmp r0, 0 - beq _0803AF20 + beq @0803AF20 ldr r4, =0x02024064 ldrb r0, [r4] bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bne _0803AF20 + bne @0803AF20 movs r0, 0 bl dp01_build_cmdbuf_x07_7_7_7 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_0803AF20: +@0803AF20: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 11 ands r0, r1 cmp r0, 0 - beq _0803AF32 + beq @0803AF32 bl sub_81A56B4 -_0803AF32: +@0803AF32: mov r1, r9 ldrb r0, [r1] adds r0, 0x1 @@ -100010,13 +100010,13 @@ _0803AF32: lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bcs _0803AF48 - b _0803ACB4 -_0803AF48: + bcs @0803AF48 + b @0803ACB4 +@0803AF48: ldr r1, =0x03005d04 ldr r0, =bc_801333C + 1 str r0, [r1] -_0803AF4E: +@0803AF4E: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -100029,7 +100029,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} @@ -100037,23 +100037,23 @@ bc_801333C: @ 803AF80 ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - beq _0803AF92 - b _0803B10C -_0803AF92: + beq @0803AF92 + b @0803B10C +@0803AF92: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x8 ands r0, r1 cmp r0, 0 - bne _0803AFA0 - b _0803B0AC -_0803AFA0: + bne @0803AFA0 + b @0803B0AC +@0803AFA0: movs r7, 0 add r0, sp, 0x4 mov r8, r0 mov r6, r8 mov r5, sp -_0803AFAA: +@0803AFAA: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 @@ -100063,22 +100063,22 @@ _0803AFAA: movs r1, 0x41 bl pokemon_getattr cmp r0, 0 - beq _0803AFD0 + beq @0803AFD0 adds r0, r4, 0 movs r1, 0x41 bl pokemon_getattr movs r1, 0xCE lsls r1, 1 cmp r0, r1 - bne _0803AFE8 -_0803AFD0: + bne @0803AFE8 +@0803AFD0: ldr r0, =0x0000ffff strh r0, [r5] movs r0, 0 - b _0803AFFA + b @0803AFFA .align 2, 0 .pool -_0803AFE8: +@0803AFE8: adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr @@ -100086,13 +100086,13 @@ _0803AFE8: adds r0, r4, 0 movs r1, 0x37 bl pokemon_getattr -_0803AFFA: +@0803AFFA: str r0, [r6] adds r6, 0x8 adds r5, 0x8 adds r7, 0x1 cmp r7, 0x5 - ble _0803AFAA + ble @0803AFAA movs r0, 0x1 bl battle_get_side_with_given_state ldr r4, =0x02024064 @@ -100106,7 +100106,7 @@ _0803AFFA: movs r7, 0 mov r6, r8 mov r5, sp -_0803B026: +@0803B026: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 @@ -100116,22 +100116,22 @@ _0803B026: movs r1, 0x41 bl pokemon_getattr cmp r0, 0 - beq _0803B04C + beq @0803B04C adds r0, r4, 0 movs r1, 0x41 bl pokemon_getattr movs r1, 0xCE lsls r1, 1 cmp r0, r1 - bne _0803B060 -_0803B04C: + bne @0803B060 +@0803B04C: ldr r0, =0x0000ffff strh r0, [r5] movs r0, 0 - b _0803B072 + b @0803B072 .align 2, 0 .pool -_0803B060: +@0803B060: adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr @@ -100139,13 +100139,13 @@ _0803B060: adds r0, r4, 0 movs r1, 0x37 bl pokemon_getattr -_0803B072: +@0803B072: str r0, [r6] adds r6, 0x8 adds r5, 0x8 adds r7, 0x1 cmp r7, 0x5 - ble _0803B026 + ble @0803B026 movs r0, 0 bl battle_get_side_with_given_state ldr r4, =0x02024064 @@ -100158,14 +100158,14 @@ _0803B072: bl dp01_battle_side_mark_buffer_for_execution ldr r1, =0x03005d04 ldr r0, =bc_battle_begin_message + 1 - b _0803B10A + b @0803B10A .align 2, 0 .pool -_0803B0AC: +@0803B0AC: movs r7, 0 add r6, sp, 0x4 mov r5, sp -_0803B0B2: +@0803B0B2: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 @@ -100175,22 +100175,22 @@ _0803B0B2: movs r1, 0x41 bl pokemon_getattr cmp r0, 0 - beq _0803B0D8 + beq @0803B0D8 adds r0, r4, 0 movs r1, 0x41 bl pokemon_getattr movs r1, 0xCE lsls r1, 1 cmp r0, r1 - bne _0803B0E8 -_0803B0D8: + bne @0803B0E8 +@0803B0D8: ldr r0, =0x0000ffff strh r0, [r5] movs r0, 0 - b _0803B0FA + b @0803B0FA .align 2, 0 .pool -_0803B0E8: +@0803B0E8: adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr @@ -100198,18 +100198,18 @@ _0803B0E8: adds r0, r4, 0 movs r1, 0x37 bl pokemon_getattr -_0803B0FA: +@0803B0FA: str r0, [r6] adds r6, 0x8 adds r5, 0x8 adds r7, 0x1 cmp r7, 0x5 - ble _0803B0B2 + ble @0803B0B2 ldr r1, =0x03005d04 ldr r0, =bc_8013568 + 1 -_0803B10A: +@0803B10A: str r0, [r1] -_0803B10C: +@0803B10C: add sp, 0x30 pop {r3} mov r8, r3 @@ -100221,12 +100221,12 @@ _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] cmp r0, 0 - bne _0803B142 + bne @0803B142 movs r0, 0x1 bl battle_get_side_with_given_state ldr r1, =0x02024064 @@ -100237,7 +100237,7 @@ bc_battle_begin_message: @ 803B120 ldr r1, =0x03005d04 ldr r0, =sub_803B180 + 1 str r0, [r1] -_0803B142: +@0803B142: pop {r0} bx r0 .align 2, 0 @@ -100245,19 +100245,19 @@ _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] cmp r0, 0 - bne _0803B170 + bne @0803B170 ldr r1, =0x03005d04 ldr r0, =sub_803B3CC + 1 str r0, [r1] movs r0, 0 movs r1, 0 bl b_std_message -_0803B170: +@0803B170: pop {r0} bx r0 .align 2, 0 @@ -100265,36 +100265,36 @@ _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] cmp r0, 0 - bne _0803B1D0 + bne @0803B1D0 ldr r0, =0x02022fec ldr r2, [r0] movs r0, 0x80 lsls r0, 17 ands r0, r2 cmp r0, 0 - beq _0803B1B8 + beq @0803B1B8 movs r0, 0x80 lsls r0, 18 ands r0, r2 cmp r0, 0 - beq _0803B1B8 + beq @0803B1B8 movs r1, 0x80 lsls r1, 24 ands r1, r2 negs r0, r1 orrs r0, r1 lsrs r0, 31 - b _0803B1BA + b @0803B1BA .align 2, 0 .pool -_0803B1B8: +@0803B1B8: movs r0, 0x1 -_0803B1BA: +@0803B1BA: bl battle_get_side_with_given_state adds r1, r0, 0 lsls r1, 24 @@ -100304,7 +100304,7 @@ _0803B1BA: ldr r1, =0x03005d04 ldr r0, =sub_803B25C + 1 str r0, [r1] -_0803B1D0: +@0803B1D0: pop {r0} bx r0 .align 2, 0 @@ -100312,7 +100312,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] @@ -100320,38 +100320,38 @@ sub_803B1DC: @ 803B1DC lsls r0, 17 ands r0, r1 cmp r0, 0 - beq _0803B1FC + beq @0803B1FC movs r0, 0x80 lsls r0, 18 ands r0, r1 cmp r0, 0 - beq _0803B1FC + beq @0803B1FC movs r5, 0x2 cmp r1, 0 - bge _0803B1FE -_0803B1FC: + bge @0803B1FE +@0803B1FC: movs r5, 0x3 -_0803B1FE: +@0803B1FE: ldr r1, =0x02024064 movs r0, 0 strb r0, [r1] ldr r0, =0x0202406c ldrb r0, [r0] cmp r0, 0 - beq _0803B23A + beq @0803B23A adds r4, r1, 0 -_0803B20E: +@0803B20E: ldrb r0, [r4] bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, r5 - bne _0803B228 + bne @0803B228 movs r0, 0 bl dp01_build_cmdbuf_x2F_2F_2F_2F ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_0803B228: +@0803B228: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] @@ -100360,8 +100360,8 @@ _0803B228: lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bcc _0803B20E -_0803B23A: + bcc @0803B20E +@0803B23A: ldr r1, =0x03005d04 ldr r0, =bc_801362C + 1 str r0, [r1] @@ -100373,7 +100373,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] @@ -100381,49 +100381,49 @@ sub_803B25C: @ 803B25C lsls r0, 17 ands r0, r2 cmp r0, 0 - beq _0803B298 + beq @0803B298 movs r0, 0x80 lsls r0, 18 ands r0, r2 cmp r0, 0 - beq _0803B298 + beq @0803B298 movs r1, 0x80 lsls r1, 24 ands r1, r2 negs r0, r1 orrs r0, r1 lsrs r5, r0, 31 - b _0803B29A + b @0803B29A .align 2, 0 .pool -_0803B288: +@0803B288: ldr r1, =0x03005d04 ldr r0, =sub_803B1DC + 1 - b _0803B2F0 + b @0803B2F0 .align 2, 0 .pool -_0803B298: +@0803B298: movs r5, 0x1 -_0803B29A: +@0803B29A: ldr r0, =0x02024068 ldr r2, [r0] cmp r2, 0 - bne _0803B2F2 + bne @0803B2F2 ldr r0, =0x02024064 strb r2, [r0] ldr r1, =0x0202406c adds r4, r0, 0 ldrb r1, [r1] cmp r2, r1 - bcs _0803B2EC + bcs @0803B2EC adds r6, r4, 0 -_0803B2B2: +@0803B2B2: ldrb r0, [r4] bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, r5 - bne _0803B2D8 + bne @0803B2D8 movs r0, 0 bl dp01_build_cmdbuf_x2F_2F_2F_2F ldrb r0, [r4] @@ -100433,8 +100433,8 @@ _0803B2B2: ldr r1, =0x00008040 ands r0, r1 cmp r0, 0 - bne _0803B288 -_0803B2D8: + bne @0803B288 +@0803B2D8: ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] @@ -100444,13 +100444,13 @@ _0803B2D8: ldr r4, =0x02024064 ldrb r1, [r1] cmp r0, r1 - bcc _0803B2B2 -_0803B2EC: + bcc @0803B2B2 +@0803B2EC: ldr r1, =0x03005d04 ldr r0, =bc_801362C + 1 -_0803B2F0: +@0803B2F0: str r0, [r1] -_0803B2F2: +@0803B2F2: pop {r4-r6} pop {r0} bx r0 @@ -100459,36 +100459,36 @@ _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] cmp r1, 0 - bne _0803B384 + bne @0803B384 ldr r2, =0x02024064 strb r1, [r2] ldr r0, =0x0202406c ldrb r0, [r0] cmp r1, r0 - bcs _0803B37E + bcs @0803B37E adds r4, r2, 0 ldr r6, =0x02024084 movs r5, 0x58 adds r7, r6, 0 adds r7, 0x48 -_0803B334: +@0803B334: ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0803B36C + bne @0803B36C ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x063f0902 ands r0, r1 cmp r0, 0 - bne _0803B36C + bne @0803B36C ldrb r0, [r4] muls r0, r5 adds r0, r6 @@ -100502,7 +100502,7 @@ _0803B334: ldr r2, [r1] movs r1, 0x2 bl sub_806F01C -_0803B36C: +@0803B36C: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] @@ -100511,12 +100511,12 @@ _0803B36C: lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bcc _0803B334 -_0803B37E: + bcc @0803B334 +@0803B37E: ldr r1, =0x03005d04 ldr r0, =sub_803B3CC + 1 str r0, [r1] -_0803B384: +@0803B384: pop {r4-r7} pop {r0} bx r0 @@ -100525,16 +100525,16 @@ _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] cmp r0, 0 - bne _0803B3BC + bne @0803B3BC ldr r1, =0x03005d04 ldr r0, =sub_803B3CC + 1 str r0, [r1] -_0803B3BC: +@0803B3BC: pop {r0} bx r0 .align 2, 0 @@ -100542,35 +100542,35 @@ _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] cmp r0, 0 - bne _0803B418 + bne @0803B418 ldr r1, =0x02022fec ldr r2, [r1] movs r0, 0x80 lsls r0, 17 ands r0, r2 cmp r0, 0 - beq _0803B3F4 + beq @0803B3F4 movs r0, 0x80 lsls r0, 18 ands r0, r2 cmp r0, 0 - beq _0803B3F4 + beq @0803B3F4 movs r3, 0x1 cmp r2, 0 - bge _0803B3F6 -_0803B3F4: + bge @0803B3F6 +@0803B3F4: movs r3, 0 -_0803B3F6: +@0803B3F6: ldr r0, [r1] movs r1, 0x80 ands r0, r1 cmp r0, 0 - bne _0803B412 + bne @0803B412 adds r0, r3, 0 bl battle_get_side_with_given_state adds r1, r0, 0 @@ -100578,11 +100578,11 @@ _0803B3F6: lsrs r1, 24 movs r0, 0x1 bl b_std_message -_0803B412: +@0803B412: ldr r1, =0x03005d04 ldr r0, =sub_803B4C8 + 1 str r0, [r1] -_0803B418: +@0803B418: pop {r0} bx r0 .align 2, 0 @@ -100590,7 +100590,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] @@ -100598,38 +100598,38 @@ sub_803B42C: @ 803B42C lsls r0, 17 ands r0, r1 cmp r0, 0 - beq _0803B44C + beq @0803B44C movs r0, 0x80 lsls r0, 18 ands r0, r1 cmp r0, 0 - beq _0803B44C + beq @0803B44C movs r5, 0x3 cmp r1, 0 - bge _0803B44E -_0803B44C: + bge @0803B44E +@0803B44C: movs r5, 0x2 -_0803B44E: +@0803B44E: ldr r1, =0x02024064 movs r0, 0 strb r0, [r1] ldr r0, =0x0202406c ldrb r0, [r0] cmp r0, 0 - beq _0803B48A + beq @0803B48A adds r4, r1, 0 -_0803B45E: +@0803B45E: ldrb r0, [r4] bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, r5 - bne _0803B478 + bne @0803B478 movs r0, 0 bl dp01_build_cmdbuf_x2F_2F_2F_2F ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_0803B478: +@0803B478: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] @@ -100638,8 +100638,8 @@ _0803B478: lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bcc _0803B45E -_0803B48A: + bcc @0803B45E +@0803B48A: ldr r2, =0x0202449c ldr r0, [r2] adds r0, 0x4C @@ -100664,7 +100664,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] @@ -100672,46 +100672,46 @@ sub_803B4C8: @ 803B4C8 lsls r0, 17 ands r0, r1 cmp r0, 0 - beq _0803B500 + beq @0803B500 movs r0, 0x80 lsls r0, 18 ands r0, r1 cmp r0, 0 - beq _0803B500 + beq @0803B500 movs r6, 0x1 cmp r1, 0 - bge _0803B502 - b _0803B500 + bge @0803B502 + b @0803B500 .align 2, 0 .pool -_0803B4F0: +@0803B4F0: ldr r1, =0x03005d04 ldr r0, =sub_803B42C + 1 - b _0803B572 + b @0803B572 .align 2, 0 .pool -_0803B500: +@0803B500: movs r6, 0 -_0803B502: +@0803B502: ldr r0, =0x02024068 ldr r2, [r0] cmp r2, 0 - bne _0803B574 + bne @0803B574 ldr r0, =0x02024064 strb r2, [r0] ldr r1, =0x0202406c adds r4, r0, 0 ldrb r1, [r1] cmp r2, r1 - bcs _0803B554 + bcs @0803B554 adds r5, r4, 0 -_0803B51A: +@0803B51A: ldrb r0, [r4] bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, r6 - bne _0803B540 + bne @0803B540 movs r0, 0 bl dp01_build_cmdbuf_x2F_2F_2F_2F ldrb r0, [r4] @@ -100721,8 +100721,8 @@ _0803B51A: movs r1, 0x40 ands r0, r1 cmp r0, 0 - bne _0803B4F0 -_0803B540: + bne @0803B4F0 +@0803B540: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] @@ -100732,8 +100732,8 @@ _0803B540: ldr r4, =0x02024064 ldrb r1, [r1] cmp r0, r1 - bcc _0803B51A -_0803B554: + bcc @0803B51A +@0803B554: ldr r2, =0x0202449c ldr r0, [r2] adds r0, 0x4C @@ -100749,9 +100749,9 @@ _0803B554: strb r1, [r0] ldr r1, =0x03005d04 ldr r0, =sub_803B628 + 1 -_0803B572: +@0803B572: str r0, [r1] -_0803B574: +@0803B574: pop {r4-r6} pop {r0} bx r0 @@ -100760,26 +100760,26 @@ _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] cmp r1, 0 - bne _0803B606 + bne @0803B606 ldr r2, =0x02024064 strb r1, [r2] ldr r0, =0x0202406c ldrb r0, [r0] cmp r1, r0 - bcs _0803B5E6 + bcs @0803B5E6 adds r4, r2, 0 ldr r5, =0x0202406e -_0803B5B2: +@0803B5B2: ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0803B5D4 + bne @0803B5D4 ldrb r0, [r4] lsls r0, 1 adds r0, r5 @@ -100789,7 +100789,7 @@ _0803B5B2: bl dp01_build_cmdbuf_x05_a_b_c ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_0803B5D4: +@0803B5D4: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] @@ -100798,8 +100798,8 @@ _0803B5D4: lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bcc _0803B5B2 -_0803B5E6: + bcc @0803B5B2 +@0803B5E6: ldr r2, =0x0202449c ldr r0, [r2] adds r0, 0x4C @@ -100816,7 +100816,7 @@ _0803B5E6: ldr r1, =0x03005d04 ldr r0, =sub_803B628 + 1 str r0, [r1] -_0803B606: +@0803B606: pop {r4,r5} pop {r0} bx r0 @@ -100825,7 +100825,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 @@ -100837,45 +100837,45 @@ sub_803B628: @ 803B628 ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - beq _0803B642 - b _0803B8B2 -_0803B642: + beq @0803B642 + b @0803B8B2 +@0803B642: ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x4C ldrb r0, [r0] cmp r0, 0 - bne _0803B6C2 + bne @0803B6C2 movs r5, 0 ldr r1, =0x0202406c mov r10, r1 ldrb r3, [r1] cmp r5, r3 - bge _0803B668 + bge @0803B668 ldr r2, =0x0202407e -_0803B65C: +@0803B65C: adds r0, r5, r2 strb r5, [r0] adds r5, 0x1 ldrb r0, [r1] cmp r5, r0 - blt _0803B65C -_0803B668: + blt @0803B65C +@0803B668: movs r5, 0 - b _0803B6B8 + b @0803B6B8 .align 2, 0 .pool -_0803B67C: +@0803B67C: adds r4, r5, 0x1 mov r8, r4 ldrb r1, [r1] cmp r8, r1 - bge _0803B6B6 + bge @0803B6B6 ldr r6, =0x0202407e ldr r1, =0x0202406c mov r10, r1 lsls r7, r5, 24 -_0803B68E: +@0803B68E: adds r0, r5, r6 ldrb r0, [r0] adds r1, r4, r6 @@ -100884,26 +100884,26 @@ _0803B68E: bl b_first_side lsls r0, 24 cmp r0, 0 - beq _0803B6AC + beq @0803B6AC lsls r1, r4, 24 lsrs r1, 24 lsrs r0, r7, 24 bl sub_803CEDC -_0803B6AC: +@0803B6AC: adds r4, 0x1 ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - blt _0803B68E -_0803B6B6: + blt @0803B68E +@0803B6B6: mov r5, r8 -_0803B6B8: +@0803B6B8: mov r1, r10 ldrb r0, [r1] subs r0, 0x1 cmp r5, r0 - blt _0803B67C -_0803B6C2: + blt @0803B67C +@0803B6C2: ldr r5, =0x0202449c ldr r0, [r5] movs r4, 0xD1 @@ -100911,7 +100911,7 @@ _0803B6C2: adds r0, r4 ldrb r0, [r0] cmp r0, 0 - bne _0803B6FC + bne @0803B6FC str r0, [sp] movs r0, 0 movs r1, 0 @@ -100920,15 +100920,15 @@ _0803B6C2: bl ability_something lsls r0, 24 cmp r0, 0 - beq _0803B6FC + beq @0803B6FC ldr r0, [r5] adds r0, r4 movs r1, 0x1 strb r1, [r0] - b _0803B8B2 + b @0803B8B2 .align 2, 0 .pool -_0803B6FC: +@0803B6FC: ldr r2, =0x0202449c ldr r0, [r2] adds r0, 0x4C @@ -100936,10 +100936,10 @@ _0803B6FC: ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bcs _0803B756 + bcs @0803B756 ldr r5, =0x0202407e adds r4, r2, 0 -_0803B710: +@0803B710: ldr r0, [r4] adds r0, 0x4C ldrb r0, [r0] @@ -100952,13 +100952,13 @@ _0803B710: bl ability_something lsls r0, 24 cmp r0, 0 - beq _0803B736 + beq @0803B736 mov r0, r9 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r9, r0 -_0803B736: +@0803B736: ldr r1, [r4] adds r1, 0x4C ldrb r0, [r1] @@ -100966,17 +100966,17 @@ _0803B736: strb r0, [r1] mov r3, r9 cmp r3, 0 - beq _0803B748 - b _0803B8B2 -_0803B748: + beq @0803B748 + b @0803B8B2 +@0803B748: ldr r0, [r4] adds r0, 0x4C ldr r1, =0x0202406c ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bcc _0803B710 -_0803B756: + bcc @0803B710 +@0803B756: movs r0, 0 str r0, [sp] movs r0, 0x9 @@ -100987,9 +100987,9 @@ _0803B756: lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _0803B770 - b _0803B8B2 -_0803B770: + beq @0803B770 + b @0803B8B2 +@0803B770: str r0, [sp] movs r0, 0xB movs r1, 0 @@ -100998,9 +100998,9 @@ _0803B770: bl ability_something lsls r0, 24 cmp r0, 0 - beq _0803B786 - b _0803B8B2 -_0803B786: + beq @0803B786 + b @0803B8B2 +@0803B786: ldr r2, =0x0202449c ldr r0, [r2] adds r0, 0xD9 @@ -101008,10 +101008,10 @@ _0803B786: ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bcs _0803B7DA + bcs @0803B7DA ldr r5, =0x0202407e adds r4, r2, 0 -_0803B79A: +@0803B79A: ldr r0, [r4] adds r0, 0xD9 ldrb r0, [r0] @@ -101022,13 +101022,13 @@ _0803B79A: bl berry_effects_maybe lsls r0, 24 cmp r0, 0 - beq _0803B7BC + beq @0803B7BC mov r0, r9 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r9, r0 -_0803B7BC: +@0803B7BC: ldr r1, [r4] adds r1, 0xD9 ldrb r0, [r1] @@ -101036,15 +101036,15 @@ _0803B7BC: strb r0, [r1] mov r0, r9 cmp r0, 0 - bne _0803B8B2 + bne @0803B8B2 ldr r0, [r4] adds r0, 0xD9 ldr r1, =0x0202406c ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bcc _0803B79A -_0803B7DA: + bcc @0803B79A +@0803B7DA: movs r5, 0 ldr r1, =0x0202449c mov r8, r1 @@ -101053,7 +101053,7 @@ _0803B7DA: ldr r2, =0x02024274 movs r4, 0xFF movs r3, 0 -_0803B7EA: +@0803B7EA: mov r1, r8 ldr r0, [r1] adds r0, r5, r0 @@ -101067,7 +101067,7 @@ _0803B7EA: adds r2, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble _0803B7EA + ble @0803B7EA movs r0, 0 bl sub_803D580 bl sub_803D6A0 @@ -101087,11 +101087,11 @@ _0803B7EA: ldr r1, =0x02024332 movs r2, 0 adds r0, r1, 0x7 -_0803B834: +@0803B834: strb r2, [r0] subs r0, 0x1 cmp r0, r1 - bge _0803B834 + bge @0803B834 movs r5, 0 ldr r3, =0x0202406c ldr r2, =0x0202449c @@ -101099,13 +101099,13 @@ _0803B834: ldr r7, =0x0202427c ldrb r0, [r3] cmp r5, r0 - bge _0803B866 + bge @0803B866 ldr r0, =0x02024084 movs r4, 0x9 negs r4, r4 adds r1, r0, 0 adds r1, 0x50 -_0803B856: +@0803B856: ldr r0, [r1] ands r0, r4 str r0, [r1] @@ -101113,8 +101113,8 @@ _0803B856: adds r5, 0x1 ldrb r0, [r3] cmp r5, r0 - blt _0803B856 -_0803B866: + blt @0803B856 +@0803B866: ldr r0, [r2] movs r1, 0 strb r1, [r0] @@ -101146,11 +101146,11 @@ _0803B866: lsls r1, 11 ands r0, r1 cmp r0, 0 - beq _0803B8B2 + beq @0803B8B2 bl sub_80A369C ldr r0, =0x082db8be bl b_call_bc_move_exec -_0803B8B2: +@0803B8B2: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -101164,12 +101164,12 @@ _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] cmp r0, 0 - bne _0803B994 + bne @0803B994 ldr r1, =0x03005d04 ldr r0, =sub_803B9BC + 1 str r0, [r1] @@ -101177,19 +101177,19 @@ bc_8013B1C: @ 803B904 ldr r1, =0x02024332 movs r2, 0 adds r0, r1, 0x7 -_0803B91C: +@0803B91C: strb r2, [r0] subs r0, 0x1 cmp r0, r1 - bge _0803B91C + bge @0803B91C movs r4, 0 ldrb r3, [r3] cmp r4, r3 - bge _0803B96E + bge @0803B96E ldr r5, =0x02024084 adds r6, r5, 0 adds r6, 0x4C -_0803B932: +@0803B932: movs r0, 0x58 adds r2, r4, 0 muls r2, r0 @@ -101205,22 +101205,22 @@ _0803B932: movs r1, 0x7 ands r0, r1 cmp r0, 0 - beq _0803B964 + beq @0803B964 movs r0, 0x80 lsls r0, 5 ands r3, r0 cmp r3, 0 - beq _0803B964 + beq @0803B964 lsls r0, r4, 24 lsrs r0, 24 bl b_cancel_multi_turn_move_maybe -_0803B964: +@0803B964: adds r4, 0x1 ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - blt _0803B932 -_0803B96E: + blt @0803B932 +@0803B96E: ldr r2, =0x0202449c ldr r0, [r2] movs r1, 0 @@ -101240,7 +101240,7 @@ _0803B96E: strb r1, [r0, 0x3] ldr r0, =0x0202427c strb r1, [r0] -_0803B994: +@0803B994: pop {r4-r6} pop {r0} bx r0 @@ -101249,7 +101249,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 @@ -101259,26 +101259,26 @@ sub_803B9BC: @ 803B9BC ldr r0, =0x0202433a ldrb r0, [r0] cmp r0, 0 - bne _0803B9EA + bne @0803B9EA bl sub_80401D0 lsls r0, 24 cmp r0, 0 - beq _0803B9DE - b _0803BB78 -_0803B9DE: + beq @0803B9DE + b @0803BB78 +@0803B9DE: bl sub_8040924 lsls r0, 24 cmp r0, 0 - beq _0803B9EA - b _0803BB78 -_0803B9EA: + beq @0803B9EA + b @0803BB78 +@0803B9EA: bl sub_8041728 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq _0803B9F8 - b _0803BB78 -_0803B9F8: + beq @0803B9F8 + b @0803BB78 +@0803B9F8: ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x4D @@ -101287,9 +101287,9 @@ _0803B9F8: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq _0803BA0E - b _0803BB78 -_0803BA0E: + beq @0803BA0E + b @0803BB78 +@0803BA0E: movs r0, 0 bl sub_803D580 ldr r2, =0x02024280 @@ -101314,31 +101314,31 @@ _0803BA0E: ldr r1, =0x02024332 movs r2, 0 adds r0, r1, 0x4 -_0803BA40: +@0803BA40: strb r2, [r0] subs r0, 0x1 cmp r0, r1 - bge _0803BA40 + bge @0803BA40 ldr r0, =0x0202433a ldrb r0, [r0] cmp r0, 0 - beq _0803BA98 + beq @0803BA98 ldr r1, =0x02024083 movs r0, 0xC strb r0, [r1] ldr r1, =0x03005d04 ldr r0, =bc_bs_exec + 1 str r0, [r1] - b _0803BB78 + b @0803BB78 .align 2, 0 .pool -_0803BA98: +@0803BA98: ldr r1, =0x03005d10 ldrb r0, [r1, 0x13] ldr r2, =0x0202449c mov r8, r2 cmp r0, 0xFE - bhi _0803BAB2 + bhi @0803BAB2 adds r0, 0x1 strb r0, [r1, 0x13] ldr r1, [r2] @@ -101346,7 +101346,7 @@ _0803BA98: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_0803BAB2: +@0803BAB2: movs r2, 0 ldr r4, =0x0202406c ldr r0, =0x02024210 @@ -101355,12 +101355,12 @@ _0803BAB2: mov r9, r1 ldrb r0, [r4] cmp r2, r0 - bge _0803BAE0 + bge @0803BAE0 ldr r7, =0x0202421c movs r6, 0xFF movs r5, 0 ldr r3, =0x02024274 -_0803BACC: +@0803BACC: adds r1, r2, r7 ldrb r0, [r1] orrs r0, r6 @@ -101370,19 +101370,19 @@ _0803BACC: adds r2, 0x1 ldrb r1, [r4] cmp r2, r1 - blt _0803BACC -_0803BAE0: + blt @0803BACC +@0803BAE0: movs r2, 0 ldr r3, =0x0202449c movs r1, 0x6 -_0803BAE6: +@0803BAE6: ldr r0, [r3] adds r0, r2, r0 adds r0, 0x5C strb r1, [r0] adds r2, 0x1 cmp r2, 0x3 - ble _0803BAE6 + ble @0803BAE6 mov r2, r8 ldr r0, [r2] adds r0, 0x91 @@ -101404,27 +101404,27 @@ _0803BAE6: lsls r0, 10 ands r0, r1 cmp r0, 0 - beq _0803BB5C + beq @0803BB5C ldr r0, =0x082db881 bl b_call_bc_move_exec - b _0803BB78 + b @0803BB78 .align 2, 0 .pool -_0803BB5C: +@0803BB5C: movs r0, 0x80 lsls r0, 11 ands r1, r0 cmp r1, 0 - beq _0803BB78 + beq @0803BB78 mov r1, r8 ldr r0, [r1] adds r0, 0xDA ldrb r0, [r0] cmp r0, 0 - bne _0803BB78 + bne @0803BB78 ldr r0, =0x082db8be bl b_call_bc_move_exec -_0803BB78: +@0803BB78: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -101436,7 +101436,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 @@ -101447,38 +101447,38 @@ sub_803BB88: @ 803BB88 adds r1, r0, r1 ldrh r0, [r1, 0x2E] cmp r0, 0xAF - bne _0803BBB8 + bne @0803BBB8 ldr r1, =0x02024404 lsls r0, r2, 3 subs r0, r2 lsls r0, 2 adds r0, r1 ldrb r2, [r0, 0x7] - b _0803BBC2 + b @0803BBC2 .align 2, 0 .pool -_0803BBB8: +@0803BBB8: ldrh r0, [r1, 0x2E] bl itemid_get_x12 lsls r0, 24 lsrs r2, r0, 24 -_0803BBC2: +@0803BBC2: ldr r1, =0x0202420f ldr r3, =0x02024064 ldrb r0, [r3] strb r0, [r1] cmp r2, 0x25 - bne _0803BBD0 - b _0803BD4C -_0803BBD0: + bne @0803BBD0 + b @0803BD4C +@0803BBD0: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _0803BBDE - b _0803BD4C -_0803BBDE: + beq @0803BBDE + b @0803BD4C +@0803BBDE: ldr r1, =0x02024084 ldrb r2, [r3] movs r0, 0x58 @@ -101487,9 +101487,9 @@ _0803BBDE: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x32 - bne _0803BBF2 - b _0803BD4C -_0803BBF2: + bne @0803BBF2 + b @0803BD4C +@0803BBF2: adds r0, r2, 0 bl battle_side_get_owner lsls r0, 24 @@ -101498,16 +101498,16 @@ _0803BBF2: ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 - bge _0803BC86 + bge @0803BC86 movs r7, 0 -_0803BC08: +@0803BC08: lsrs r4, r7, 24 adds r0, r4, 0 bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r6, r0 - beq _0803BC2C + beq @0803BC2C ldr r1, =0x02024084 movs r0, 0x58 muls r0, r5 @@ -101516,15 +101516,15 @@ _0803BC08: adds r2, 0x20 ldrb r0, [r2] cmp r0, 0x17 - bne _0803BC2C - b _0803BD54 -_0803BC2C: + bne @0803BC2C + b @0803BD54 +@0803BC2C: adds r0, r4, 0 bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r6, r0 - beq _0803BC76 + beq @0803BC76 ldr r3, =0x02024084 ldr r0, =0x02024064 ldrb r0, [r0] @@ -101535,17 +101535,17 @@ _0803BC2C: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x1A - beq _0803BC76 + beq @0803BC76 adds r0, r1, 0 adds r0, 0x21 ldrb r0, [r0] cmp r0, 0x2 - beq _0803BC76 + beq @0803BC76 adds r0, r1, 0 adds r0, 0x22 ldrb r0, [r0] cmp r0, 0x2 - beq _0803BC76 + beq @0803BC76 adds r0, r5, 0 muls r0, r2 adds r0, r3 @@ -101553,9 +101553,9 @@ _0803BC2C: adds r2, 0x20 ldrb r0, [r2] cmp r0, 0x47 - bne _0803BC76 - b _0803BD70 -_0803BC76: + bne @0803BC76 + b @0803BD70 +@0803BC76: movs r0, 0x80 lsls r0, 17 adds r7, r0 @@ -101563,8 +101563,8 @@ _0803BC76: ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 - blt _0803BC08 -_0803BC86: + blt @0803BC08 +@0803BC86: ldr r4, =0x02024064 ldrb r1, [r4] movs r0, 0 @@ -101576,7 +101576,7 @@ _0803BC86: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - beq _0803BCF8 + beq @0803BCF8 ldr r6, =0x02024084 ldrb r0, [r4] movs r3, 0x58 @@ -101586,13 +101586,13 @@ _0803BC86: adds r0, 0x21 ldrb r0, [r0] cmp r0, 0x8 - beq _0803BCBE + beq @0803BCBE adds r0, r1, 0 adds r0, 0x22 ldrb r0, [r0] cmp r0, 0x8 - bne _0803BCF8 -_0803BCBE: + bne @0803BCF8 +@0803BCBE: ldr r0, =0x02024474 subs r1, r5, 0x1 strb r1, [r0, 0x17] @@ -101605,10 +101605,10 @@ _0803BCBE: strb r0, [r2] ldr r1, =0x02024332 movs r0, 0x2 - b _0803BD90 + b @0803BD90 .align 2, 0 .pool -_0803BCF8: +@0803BCF8: ldr r1, =0x02024084 ldr r0, =0x02024064 ldrb r2, [r0] @@ -101620,7 +101620,7 @@ _0803BCF8: ldr r1, =0x0400e000 ands r0, r1 cmp r0, 0 - bne _0803BD22 + bne @0803BD22 ldr r1, =0x020242ac lsls r0, r2, 2 adds r0, r1 @@ -101629,28 +101629,28 @@ _0803BCF8: lsls r1, 3 ands r0, r1 cmp r0, 0 - beq _0803BD40 -_0803BD22: + beq @0803BD40 +@0803BD22: ldr r1, =0x02024332 movs r0, 0 strb r0, [r1, 0x5] movs r0, 0x1 - b _0803BD92 + b @0803BD92 .align 2, 0 .pool -_0803BD40: +@0803BD40: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x10 ands r0, r1 cmp r0, 0 - bne _0803BD8C -_0803BD4C: + bne @0803BD8C +@0803BD4C: movs r0, 0 - b _0803BD92 + b @0803BD92 .align 2, 0 .pool -_0803BD54: +@0803BD54: ldr r0, =0x02024474 strb r5, [r0, 0x17] ldr r1, =0x0202420a @@ -101658,10 +101658,10 @@ _0803BD54: strb r0, [r1] ldr r1, =0x02024332 movs r0, 0x2 - b _0803BD90 + b @0803BD90 .align 2, 0 .pool -_0803BD70: +@0803BD70: ldr r0, =0x02024474 strb r5, [r0, 0x17] ldr r1, =0x0202420a @@ -101669,15 +101669,15 @@ _0803BD70: strb r0, [r1] ldr r1, =0x02024332 movs r0, 0x2 - b _0803BD90 + b @0803BD90 .align 2, 0 .pool -_0803BD8C: +@0803BD8C: ldr r1, =0x02024332 movs r0, 0x1 -_0803BD90: +@0803BD90: strb r0, [r1, 0x5] -_0803BD92: +@0803BD92: add sp, 0x4 pop {r4-r7} pop {r1} @@ -101687,7 +101687,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} @@ -101702,7 +101702,7 @@ sub_803BDA0: @ 803BDA0 lsls r0, r5, 1 adds r4, r0, r5 adds r6, r0, 0 -_0803BDBC: +@0803BDBC: mov r0, r12 adds r2, r3, r0 ldr r1, [r7] @@ -101713,7 +101713,7 @@ _0803BDBC: strb r0, [r2] adds r3, 0x1 cmp r3, 0x2 - ble _0803BDBC + ble @0803BDBC mov r1, r8 adds r0, r6, r1 ldrb r0, [r0] @@ -101737,7 +101737,7 @@ _0803BDBC: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0803BE4C + beq @0803BE4C movs r3, 0 adds r4, r7, 0 adds r6, r5 @@ -101747,7 +101747,7 @@ _0803BDBC: ldr r7, =0x0203cf00 lsls r0, r1, 1 adds r5, r0, r1 -_0803BE1A: +@0803BE1A: ldr r0, [r4] adds r1, r6, r3 adds r1, r0 @@ -101763,15 +101763,15 @@ _0803BE1A: strb r1, [r0] adds r3, 0x1 cmp r3, 0x2 - ble _0803BE1A - b _0803BE66 + ble @0803BE1A + b @0803BE66 .align 2, 0 .pool -_0803BE4C: +@0803BE4C: movs r3, 0 adds r2, r6, r5 ldr r4, =0x0203cf00 -_0803BE52: +@0803BE52: ldr r0, [r7] adds r1, r2, r3 adds r1, r0 @@ -101781,8 +101781,8 @@ _0803BE52: strb r0, [r1] adds r3, 0x1 cmp r3, 0x2 - ble _0803BE52 -_0803BE66: + ble @0803BE52 +@0803BE66: pop {r3} mov r8, r3 pop {r4-r7} @@ -101793,7 +101793,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 @@ -101806,10 +101806,10 @@ sub_803BE74: @ 803BE74 ldr r0, =0x02024064 strb r1, [r0] ldr r0, =0x0202406c - bl _0803CD12 + bl @0803CD12 .align 2, 0 .pool -_0803BE9C: +@0803BE9C: ldr r4, =0x02024064 ldrb r0, [r4] bl battle_get_per_side_status @@ -101820,37 +101820,37 @@ _0803BE9C: adds r0, r1 ldrb r0, [r0] cmp r0, 0x8 - bls _0803BEB8 - bl _0803CD04 -_0803BEB8: + bls @0803BEB8 + bl @0803CD04 +@0803BEB8: lsls r0, 2 - ldr r1, =_0803BED0 + ldr r1, =@0803BED0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0803BED0: - .4byte _0803BEF4 - .4byte _0803BF0C - .4byte _0803C02C - .4byte _0803C7D8 - .4byte _0803CAD0 - .4byte _0803CB84 - .4byte _0803CBC8 - .4byte _0803CBF4 - .4byte _0803CC38 -_0803BEF4: +@0803BED0: + .4byte @0803BEF4 + .4byte @0803BF0C + .4byte @0803C02C + .4byte @0803C7D8 + .4byte @0803CAD0 + .4byte @0803CB84 + .4byte @0803CBC8 + .4byte @0803CBF4 + .4byte @0803CC38 +@0803BEF4: bl sub_8185FD0 ldr r1, =0x02024332 ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 - bl _0803CC20 + bl @0803CC20 .align 2, 0 .pool -_0803BF0C: +@0803BF0C: ldr r0, =0x02024064 ldrb r1, [r0] ldr r4, =0x0202449c @@ -101864,12 +101864,12 @@ _0803BF0C: movs r1, 0x40 ands r0, r1 cmp r0, 0 - bne _0803BF68 + bne @0803BF68 movs r1, 0x2 movs r0, 0x2 ands r0, r5 cmp r0, 0 - beq _0803BF68 + beq @0803BF68 eors r5, r1 adds r0, r5, 0 bl battle_get_side_with_given_state @@ -101883,7 +101883,7 @@ _0803BF0C: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _0803BF68 + bne @0803BF68 ldr r4, =0x02024332 adds r0, r5, 0 bl battle_get_side_with_given_state @@ -101892,9 +101892,9 @@ _0803BF0C: adds r0, r4 ldrb r0, [r0] cmp r0, 0x5 - beq _0803BF68 - bl _0803CD04 -_0803BF68: + beq @0803BF68 + bl @0803CD04 +@0803BF68: ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x91 @@ -101907,7 +101907,7 @@ _0803BF68: ldr r0, [r0] ands r3, r0 cmp r3, 0 - beq _0803BFD0 + beq @0803BFD0 ldr r0, =0x0202421c adds r0, r2, r0 movs r1, 0xD @@ -101917,25 +101917,25 @@ _0803BF68: movs r1, 0x40 ands r0, r1 cmp r0, 0 - bne _0803BFBC + bne @0803BFBC ldr r0, =0x02024332 ldrb r1, [r4] adds r1, r0 movs r0, 0x5 strb r0, [r1] - bl _0803CD04 + bl @0803CD04 .align 2, 0 .pool -_0803BFBC: +@0803BFBC: ldr r0, =0x02024332 ldrb r1, [r4] adds r1, r0 movs r0, 0x4 strb r0, [r1] - bl _0803CD04 + bl @0803CD04 .align 2, 0 .pool -_0803BFD0: +@0803BFD0: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r2 @@ -101946,22 +101946,22 @@ _0803BFD0: lsls r0, 5 ands r0, r1 cmp r0, 0 - bne _0803BFF0 + bne @0803BFF0 movs r0, 0x80 lsls r0, 15 ands r1, r0 cmp r1, 0 - beq _0803C00C -_0803BFF0: + beq @0803C00C +@0803BFF0: ldr r0, =0x0202421c adds r0, r2, r0 strb r3, [r0] ldr r1, =0x02024332 ldrb r0, [r4] - bl _0803CC72 + bl @0803CC72 .align 2, 0 .pool -_0803C00C: +@0803C00C: ldr r0, =0x0202421c ldrb r1, [r0] ldr r0, =0x02023864 @@ -101971,10 +101971,10 @@ _0803C00C: orrs r2, r0 movs r0, 0 bl dp01_build_cmdbuf_x12_a_bb - bl _0803CB68 + bl @0803CB68 .align 2, 0 .pool -_0803C02C: +@0803C02C: ldr r3, =0x02024068 ldr r1, =0x0832a328 ldr r6, =0x02024064 @@ -101994,9 +101994,9 @@ _0803C02C: ldr r0, [r3] ands r0, r1 cmp r0, 0 - beq _0803C058 - bl _0803CD04 -_0803C058: + beq @0803C058 + bl @0803CD04 +@0803C058: ldr r4, =0x02023864 lsls r0, r5, 9 adds r4, 0x1 @@ -102016,36 +102016,36 @@ _0803C058: adds r0, r4 ldrb r0, [r0] cmp r0, 0xC - bls _0803C084 - b _0803C6C4 -_0803C084: + bls @0803C084 + b @0803C6C4 +@0803C084: lsls r0, 2 - ldr r1, =_0803C0A8 + ldr r1, =@0803C0A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0803C0A8: - .4byte _0803C0DC - .4byte _0803C230 - .4byte _0803C268 - .4byte _0803C6C4 - .4byte _0803C6C4 - .4byte _0803C440 - .4byte _0803C48C - .4byte _0803C6C4 - .4byte _0803C6C4 - .4byte _0803C6C4 - .4byte _0803C6C4 - .4byte _0803C6C4 - .4byte _0803C4B4 -_0803C0DC: +@0803C0A8: + .4byte @0803C0DC + .4byte @0803C230 + .4byte @0803C268 + .4byte @0803C6C4 + .4byte @0803C6C4 + .4byte @0803C440 + .4byte @0803C48C + .4byte @0803C6C4 + .4byte @0803C6C4 + .4byte @0803C6C4 + .4byte @0803C6C4 + .4byte @0803C6C4 + .4byte @0803C4B4 +@0803C0DC: bl sub_80400C8 lsls r0, 24 cmp r0, 0 - beq _0803C134 + beq @0803C134 ldr r0, =0x02024332 ldr r3, =0x02024064 ldrb r1, [r3] @@ -102074,10 +102074,10 @@ _0803C0DC: adds r1, r0 ldrb r0, [r1] strb r0, [r2, 0xC] - bl _0803CD70 + bl @0803CD70 .align 2, 0 .pool -_0803C134: +@0803C134: ldr r3, =0x020242bc ldr r5, =0x02024064 ldrb r4, [r5] @@ -102087,7 +102087,7 @@ _0803C134: adds r0, r3 ldrh r2, [r0, 0x6] cmp r2, 0 - beq _0803C188 + beq @0803C188 ldr r1, =0x02024274 lsls r0, r4, 1 adds r0, r1 @@ -102108,10 +102108,10 @@ _0803C134: adds r0, r1 movs r1, 0x4 strb r1, [r0] - bl _0803CD70 + bl @0803CD70 .align 2, 0 .pool -_0803C188: +@0803C188: add r2, sp, 0x4 ldr r3, =0x02024084 movs r1, 0x58 @@ -102145,7 +102145,7 @@ _0803C188: add r0, r8 mov r9, r0 add r5, sp, 0x4 -_0803C1CA: +@0803C1CA: lsls r2, r4, 1 ldrb r0, [r7] muls r0, r6 @@ -102181,7 +102181,7 @@ _0803C1CA: adds r5, 0x2 adds r4, 0x1 cmp r4, 0x3 - ble _0803C1CA + ble @0803C1CA ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x1 @@ -102190,18 +102190,18 @@ _0803C1CA: movs r2, 0 add r3, sp, 0x4 bl sub_8033E30 - b _0803C42E + b @0803C42E .align 2, 0 .pool -_0803C230: +@0803C230: ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x021f0902 ands r0, r1 cmp r0, 0 - bne _0803C23E - b _0803C48C -_0803C23E: + bne @0803C23E + b @0803C48C +@0803C23E: ldr r4, =0x02024064 ldrb r0, [r4] movs r1, 0x1 @@ -102211,10 +102211,10 @@ _0803C23E: lsls r0, 2 adds r0, r1 ldr r1, =0x082db879 - b _0803C784 + b @0803C784 .align 2, 0 .pool -_0803C268: +@0803C268: ldr r5, =0x02024064 ldrb r0, [r5] ldr r3, =0x0202449c @@ -102238,14 +102238,14 @@ _0803C268: ldr r0, =0x0400e000 ands r1, r0 cmp r1, 0 - bne _0803C2B8 + bne @0803C2B8 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 11 ands r0, r1 cmp r0, 0 - bne _0803C2B8 + bne @0803C2B8 ldr r0, =0x020242ac lsls r1, r2, 2 adds r1, r0 @@ -102254,8 +102254,8 @@ _0803C268: lsls r0, 3 ands r1, r0 cmp r1, 0 - beq _0803C2EC -_0803C2B8: + beq @0803C2EC +@0803C2B8: ldr r0, =0x02024064 ldrb r0, [r0] lsls r1, r0, 1 @@ -102267,10 +102267,10 @@ _0803C2B8: movs r0, 0 movs r1, 0x2 movs r2, 0x6 - b _0803C400 + b @0803C400 .align 2, 0 .pool -_0803C2EC: +@0803C2EC: str r1, [sp] movs r0, 0xC adds r1, r2, 0 @@ -102280,7 +102280,7 @@ _0803C2EC: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _0803C374 + bne @0803C374 ldrb r1, [r5] str r4, [sp] movs r0, 0xC @@ -102290,7 +102290,7 @@ _0803C2EC: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq _0803C33C + beq @0803C33C ldrb r0, [r5] muls r0, r6 adds r1, r0, r7 @@ -102298,18 +102298,18 @@ _0803C2EC: adds r0, 0x21 ldrb r0, [r0] cmp r0, 0x2 - beq _0803C33C + beq @0803C33C adds r0, r1, 0 adds r0, 0x22 ldrb r0, [r0] cmp r0, 0x2 - beq _0803C33C + beq @0803C33C adds r0, r1, 0 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x1A - bne _0803C374 -_0803C33C: + bne @0803C374 +@0803C33C: ldr r5, =0x02024064 ldrb r1, [r5] movs r0, 0 @@ -102321,7 +102321,7 @@ _0803C33C: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq _0803C3B0 + beq @0803C3B0 ldr r2, =0x02024084 ldrb r1, [r5] movs r0, 0x58 @@ -102331,13 +102331,13 @@ _0803C33C: adds r0, 0x21 ldrb r0, [r0] cmp r0, 0x8 - beq _0803C374 + beq @0803C374 adds r0, r1, 0 adds r0, 0x22 ldrb r0, [r0] cmp r0, 0x8 - bne _0803C3B0 -_0803C374: + bne @0803C3B0 +@0803C374: subs r1, r4, 0x1 lsls r1, 4 movs r0, 0x4 @@ -102358,39 +102358,39 @@ _0803C374: movs r0, 0 movs r2, 0x6 bl dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f - b _0803C42E + b @0803C42E .align 2, 0 .pool -_0803C3B0: +@0803C3B0: ldr r0, =0x02024064 ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0x2 - bne _0803C3D8 + bne @0803C3D8 ldr r0, =0x0202421c ldrb r0, [r0] cmp r0, 0x2 - bne _0803C3D8 + bne @0803C3D8 ldr r0, =0x0202449c ldr r3, [r0] adds r0, r3, 0 adds r0, 0x5C - b _0803C3EE + b @0803C3EE .align 2, 0 .pool -_0803C3D8: +@0803C3D8: ldrb r0, [r4] cmp r0, 0x3 - bne _0803C410 + bne @0803C410 ldr r0, =0x0202421c ldrb r0, [r0, 0x1] cmp r0, 0x2 - bne _0803C410 + bne @0803C410 ldr r0, =0x0202449c ldr r3, [r0] adds r0, r3, 0 adds r0, 0x5D -_0803C3EE: +@0803C3EE: ldrb r2, [r0] ldrb r1, [r4] lsls r0, r1, 1 @@ -102400,13 +102400,13 @@ _0803C3EE: str r3, [sp] movs r0, 0 movs r1, 0 -_0803C400: +@0803C400: movs r3, 0 bl dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f - b _0803C42E + b @0803C42E .align 2, 0 .pool -_0803C410: +@0803C410: ldr r2, =0x0202449c ldr r0, =0x02024064 ldrb r0, [r0] @@ -102421,20 +102421,20 @@ _0803C410: movs r2, 0x6 movs r3, 0 bl dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f -_0803C42E: +@0803C42E: ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution - b _0803C6C4 + b @0803C6C4 .align 2, 0 .pool -_0803C440: +@0803C440: bl sub_806B8B0 lsls r0, 24 cmp r0, 0 - bne _0803C44C - b _0803C6C4 -_0803C44C: + bne @0803C44C + b @0803C6C4 +@0803C44C: ldr r1, =0x02024220 ldr r3, =0x02024064 ldrb r0, [r3] @@ -102455,10 +102455,10 @@ _0803C44C: adds r1, 0x54 strb r4, [r1] ldrb r1, [r3] - b _0803C7A0 + b @0803C7A0 .align 2, 0 .pool -_0803C48C: +@0803C48C: ldr r2, =0x0202449c ldr r4, =0x02024064 ldrb r1, [r4] @@ -102471,10 +102471,10 @@ _0803C48C: bl sub_8033E6C ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - b _0803C6C4 + b @0803C6C4 .align 2, 0 .pool -_0803C4B4: +@0803C4B4: ldr r4, =0x02024332 ldr r5, =0x02024064 ldrb r0, [r5] @@ -102514,7 +102514,7 @@ _0803C4B4: lsls r1, 5 ands r0, r1 cmp r0, 0 - bne _0803C532 + bne @0803C532 ldrb r0, [r5] bl battle_get_per_side_status eors r0, r6 @@ -102530,16 +102530,16 @@ _0803C4B4: lsls r1, 15 ands r0, r1 cmp r0, 0 - beq _0803C550 -_0803C532: + beq @0803C550 +@0803C532: movs r0, 0 bl dp01_build_cmdbuf_x32_32_32_32 ldrb r0, [r5] bl dp01_battle_side_mark_buffer_for_execution - bl _0803CD70 + bl @0803CD70 .align 2, 0 .pool -_0803C550: +@0803C550: ldr r4, =0x0202421c ldrb r0, [r5] bl battle_get_per_side_status @@ -102552,7 +102552,7 @@ _0803C550: adds r0, r4 ldrb r0, [r0] cmp r0, 0x2 - bne _0803C590 + bne @0803C590 ldrb r0, [r5] bl battle_get_per_side_status eors r0, r6 @@ -102563,10 +102563,10 @@ _0803C550: lsrs r0, 24 movs r1, 0x2 bl sub_8185008 - b _0803C6AE + b @0803C6AE .align 2, 0 .pool -_0803C590: +@0803C590: ldrb r0, [r5] bl battle_get_per_side_status eors r0, r6 @@ -102578,12 +102578,12 @@ _0803C590: adds r0, r4 ldrb r0, [r0] cmp r0, 0x3 - bne _0803C5B6 + bne @0803C5B6 ldrb r0, [r5] bl battle_get_per_side_status eors r0, r6 - b _0803C668 -_0803C5B6: + b @0803C668 +@0803C5B6: ldrb r0, [r5] bl battle_get_per_side_status eors r0, r6 @@ -102595,7 +102595,7 @@ _0803C5B6: adds r0, r4 ldrb r0, [r0] cmp r0, 0 - bne _0803C628 + bne @0803C628 ldr r4, =0x0202433c ldrb r0, [r5] bl battle_get_per_side_status @@ -102609,7 +102609,7 @@ _0803C5B6: ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt _0803C616 + blt @0803C616 ldr r4, =0x020242bc ldrb r0, [r5] bl battle_get_per_side_status @@ -102625,22 +102625,22 @@ _0803C5B6: adds r1, r4 ldrh r0, [r1, 0x6] cmp r0, 0 - beq _0803C628 -_0803C616: + beq @0803C628 +@0803C616: ldrb r0, [r5] bl battle_get_per_side_status eors r0, r6 - b _0803C668 + b @0803C668 .align 2, 0 .pool -_0803C628: +@0803C628: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 10 ands r0, r1 cmp r0, 0 - beq _0803C690 + beq @0803C690 ldr r4, =0x0202421c ldr r6, =0x02024064 ldrb r0, [r6] @@ -102655,7 +102655,7 @@ _0803C628: adds r0, r4 ldrb r0, [r0] cmp r0, 0 - bne _0803C690 + bne @0803C690 ldr r1, =0x03005d80 ldr r0, =0x0203bd30 ldr r0, [r0] @@ -102663,7 +102663,7 @@ _0803C628: ldrb r0, [r6] bl battle_get_per_side_status eors r0, r5 -_0803C668: +@0803C668: lsls r0, 24 lsrs r0, 24 bl battle_get_side_with_given_state @@ -102671,10 +102671,10 @@ _0803C668: lsrs r0, 24 movs r1, 0x1 bl sub_8185008 - b _0803C6AE + b @0803C6AE .align 2, 0 .pool -_0803C690: +@0803C690: ldr r0, =0x02024064 ldrb r0, [r0] bl battle_get_per_side_status @@ -102687,16 +102687,16 @@ _0803C690: lsrs r0, 24 movs r1, 0x3 bl sub_8185008 -_0803C6AE: +@0803C6AE: movs r0, 0 bl dp01_build_cmdbuf_x32_32_32_32 ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution - b _0803CD70 + b @0803CD70 .align 2, 0 .pool -_0803C6C4: +@0803C6C4: ldr r1, =0x02022fec ldr r2, [r1] movs r5, 0x8 @@ -102704,11 +102704,11 @@ _0803C6C4: ands r0, r5 adds r3, r1, 0 cmp r0, 0 - beq _0803C720 + beq @0803C720 ldr r0, =0x043f0100 ands r2, r0 cmp r2, 0 - beq _0803C720 + beq @0803C720 ldr r0, =0x02023864 ldr r4, =0x02024064 ldrb r2, [r4] @@ -102717,7 +102717,7 @@ _0803C6C4: adds r1, r0 ldrb r0, [r1] cmp r0, 0x3 - bne _0803C720 + bne @0803C720 ldr r1, =0x02024220 lsls r0, r2, 2 adds r0, r1 @@ -102728,15 +102728,15 @@ _0803C6C4: adds r0, r1 movs r3, 0 strb r5, [r0] - b _0803C792 + b @0803C792 .align 2, 0 .pool -_0803C720: +@0803C720: ldr r0, [r3] ldr r1, =0x0200000a ands r0, r1 cmp r0, 0x8 - bne _0803C760 + bne @0803C760 ldr r0, =0x02023864 ldr r4, =0x02024064 ldrb r1, [r4] @@ -102745,20 +102745,20 @@ _0803C720: adds r1, r0 ldrb r0, [r1] cmp r0, 0x3 - bne _0803C760 + bne @0803C760 ldr r0, =0x082daafe bl b_call_bc_move_exec ldr r1, =0x02024332 ldrb r0, [r4] adds r0, r1 - b _0803CC20 + b @0803CC20 .align 2, 0 .pool -_0803C760: +@0803C760: bl sub_803BB88 lsls r0, 24 cmp r0, 0 - beq _0803C7C4 + beq @0803C7C4 ldr r0, =0x02023864 ldr r4, =0x02024064 ldrb r2, [r4] @@ -102767,12 +102767,12 @@ _0803C760: adds r1, r0 ldrb r0, [r1] cmp r0, 0x3 - bne _0803C7C4 + bne @0803C7C4 ldr r1, =0x02024220 lsls r0, r2, 2 adds r0, r1 ldr r1, =0x082dab0b -_0803C784: +@0803C784: str r1, [r0] ldr r0, =0x02024332 ldrb r1, [r4] @@ -102780,7 +102780,7 @@ _0803C784: movs r3, 0 movs r0, 0x6 strb r0, [r1] -_0803C792: +@0803C792: ldrb r1, [r4] ldr r2, =0x0202449c ldr r0, [r2] @@ -102788,24 +102788,24 @@ _0803C792: adds r1, 0x54 strb r3, [r1] ldrb r1, [r4] -_0803C7A0: +@0803C7A0: ldr r0, [r2] adds r1, r0 adds r1, 0x84 movs r0, 0x1 strb r0, [r1] - b _0803CD70 + b @0803CD70 .align 2, 0 .pool -_0803C7C4: +@0803C7C4: ldr r2, =0x02024332 ldr r0, =0x02024064 ldrb r1, [r0] adds r1, r2 - b _0803CB74 + b @0803CB74 .align 2, 0 .pool -_0803C7D8: +@0803C7D8: ldr r4, =0x02024068 ldr r1, =0x0832a328 ldr r3, =0x02024064 @@ -102826,37 +102826,37 @@ _0803C7D8: ands r1, r0 adds r4, r3, 0 cmp r1, 0 - beq _0803C804 - b _0803CD04 -_0803C804: + beq @0803C804 + b @0803CD04 +@0803C804: ldr r1, =0x0202421c adds r0, r5, r1 ldrb r0, [r0] adds r2, r1, 0 cmp r0, 0x9 - bls _0803C812 - b _0803CD04 -_0803C812: + bls @0803C812 + b @0803CD04 +@0803C812: lsls r0, 2 - ldr r1, =_0803C830 + ldr r1, =@0803C830 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0803C830: - .4byte _0803C858 - .4byte _0803C99C - .4byte _0803C9D4 - .4byte _0803CA0A - .4byte _0803CA2C - .4byte _0803CA40 - .4byte _0803CA54 - .4byte _0803CA84 - .4byte _0803CA98 - .4byte _0803CABC -_0803C858: +@0803C830: + .4byte @0803C858 + .4byte @0803C99C + .4byte @0803C9D4 + .4byte @0803CA0A + .4byte @0803CA2C + .4byte @0803CA40 + .4byte @0803CA54 + .4byte @0803CA84 + .4byte @0803CA98 + .4byte @0803CABC +@0803C858: ldr r1, =0x02023864 ldrb r3, [r4] lsls r0, r3, 9 @@ -102864,25 +102864,25 @@ _0803C858: adds r0, r1 ldrb r1, [r0] cmp r1, 0x3 - blt _0803C88A + blt @0803C88A cmp r1, 0x9 - ble _0803C878 + ble @0803C878 cmp r1, 0xF - beq _0803C87E - b _0803C88A + beq @0803C87E + b @0803C88A .align 2, 0 .pool -_0803C878: +@0803C878: adds r0, r3, r2 strb r1, [r0] - b _0803CD70 -_0803C87E: + b @0803CD70 +@0803C87E: adds r1, r3, r2 movs r0, 0x2 strb r0, [r1] bl sub_803CDF8 - b _0803CD70 -_0803C88A: + b @0803CD70 +@0803C88A: movs r0, 0x2 bl sub_818603C ldr r4, =0x02023864 @@ -102899,21 +102899,21 @@ _0803C88A: orrs r2, r0 ldr r0, =0x0000ffff cmp r2, r0 - bne _0803C8D0 + bne @0803C8D0 ldr r0, =0x02024332 adds r0, r3, r0 movs r1, 0x1 strb r1, [r0] ldrb r0, [r6] bl sub_8185008 - b _0803CD04 + b @0803CD04 .align 2, 0 .pool -_0803C8D0: +@0803C8D0: bl sub_803FB4C lsls r0, 24 cmp r0, 0 - beq _0803C91C + beq @0803C91C ldrb r0, [r6] movs r1, 0x1 bl sub_8185008 @@ -102940,17 +102940,17 @@ _0803C8D0: adds r1, 0x84 movs r0, 0x2 strb r0, [r1] - b _0803CD70 + b @0803CD70 .align 2, 0 .pool -_0803C91C: +@0803C91C: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 10 ands r0, r1 cmp r0, 0 - bne _0803C942 + bne @0803C942 ldrb r0, [r6] lsls r1, r0, 9 adds r1, r5 @@ -102961,7 +102961,7 @@ _0803C91C: adds r1, r7 ldrb r1, [r1] bl sub_8184FBC -_0803C942: +@0803C942: ldrb r0, [r6] ldr r4, =0x0202449c ldr r1, [r4] @@ -102996,10 +102996,10 @@ _0803C942: strb r0, [r4, 0xC] ldr r0, =0x02024332 ldrb r1, [r6] - b _0803CB72 + b @0803CB72 .align 2, 0 .pool -_0803C99C: +@0803C99C: ldr r2, =0x02023864 ldr r5, =0x02024064 ldrb r4, [r5] @@ -103013,17 +103013,17 @@ _0803C99C: lsls r0, 8 orrs r3, r0 cmp r3, 0 - bne _0803C9BA - b _0803CC1C -_0803C9BA: + bne @0803C9BA + b @0803CC1C +@0803C9BA: ldr r0, =0x02024208 strh r3, [r0] ldr r0, =0x02024332 ldrb r1, [r5] - b _0803CB72 + b @0803CB72 .align 2, 0 .pool -_0803C9D4: +@0803C9D4: ldr r0, =0x02023864 ldr r4, =0x02024064 ldrb r2, [r4] @@ -103032,20 +103032,20 @@ _0803C9D4: adds r1, r0 ldrb r0, [r1] cmp r0, 0x6 - bne _0803CA04 + bne @0803CA04 ldr r0, =0x02024332 adds r0, r2, r0 movs r1, 0x1 strb r1, [r0] ldrb r0, [r4] bl sub_8185008 - b _0803CD04 + b @0803CD04 .align 2, 0 .pool -_0803CA04: +@0803CA04: bl sub_803CDF8 - b _0803CB6E -_0803CA0A: + b @0803CB6E +@0803CA0A: ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 @@ -103056,26 +103056,26 @@ _0803CA0A: ldr r0, =0x02024064 ldrb r1, [r0] adds r1, r2 - b _0803CB74 + b @0803CB74 .align 2, 0 .pool -_0803CA2C: +@0803CA2C: ldr r2, =0x02024332 ldr r0, =0x02024064 ldrb r1, [r0] adds r1, r2 - b _0803CB74 + b @0803CB74 .align 2, 0 .pool -_0803CA40: +@0803CA40: ldr r2, =0x02024332 ldr r0, =0x02024064 ldrb r1, [r0] adds r1, r2 - b _0803CB74 + b @0803CB74 .align 2, 0 .pool -_0803CA54: +@0803CA54: ldr r3, =0x02023864 ldr r0, =0x02024064 ldrb r4, [r0] @@ -103089,23 +103089,23 @@ _0803CA54: lsls r0, 8 orrs r2, r0 cmp r2, 0 - bne _0803CA72 - b _0803CC1C -_0803CA72: + bne @0803CA72 + b @0803CC1C +@0803CA72: ldr r1, =0x02024332 adds r1, r4, r1 - b _0803CB74 + b @0803CB74 .align 2, 0 .pool -_0803CA84: +@0803CA84: ldr r2, =0x02024332 ldr r0, =0x02024064 ldrb r1, [r0] adds r1, r2 - b _0803CB74 + b @0803CB74 .align 2, 0 .pool -_0803CA98: +@0803CA98: ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 @@ -103116,18 +103116,18 @@ _0803CA98: ldr r0, =0x02024064 ldrb r1, [r0] adds r1, r2 - b _0803CB74 + b @0803CB74 .align 2, 0 .pool -_0803CABC: +@0803CABC: ldr r2, =0x02024332 ldr r0, =0x02024064 ldrb r1, [r0] adds r1, r2 - b _0803CB74 + b @0803CB74 .align 2, 0 .pool -_0803CAD0: +@0803CAD0: ldr r3, =0x02024068 ldr r6, =0x0832a328 ldr r0, =0x02024064 @@ -103147,9 +103147,9 @@ _0803CAD0: ldr r0, [r3] ands r0, r1 cmp r0, 0 - beq _0803CAFA - b _0803CD04 -_0803CAFA: + beq @0803CAFA + b @0803CD04 +@0803CAFA: bl sub_803CDB8 lsls r0, 24 lsrs r0, 24 @@ -103161,12 +103161,12 @@ _0803CAFA: movs r1, 0x41 ands r0, r1 cmp r0, 0x1 - bne _0803CB3C + bne @0803CB3C movs r1, 0x2 movs r0, 0x2 ands r0, r5 cmp r0, 0 - bne _0803CB3C + bne @0803CB3C adds r0, r5, 0 eors r0, r1 bl battle_get_side_with_given_state @@ -103180,38 +103180,38 @@ _0803CAFA: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _0803CB5C -_0803CB3C: + beq @0803CB5C +@0803CB3C: movs r0, 0 movs r1, 0 adds r2, r4, 0 bl sub_8034464 - b _0803CB66 + b @0803CB66 .align 2, 0 .pool -_0803CB5C: +@0803CB5C: movs r0, 0 movs r1, 0x1 adds r2, r4, 0 bl sub_8034464 -_0803CB66: +@0803CB66: ldr r4, =0x02024064 -_0803CB68: +@0803CB68: ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_0803CB6E: +@0803CB6E: ldr r0, =0x02024332 ldrb r1, [r4] -_0803CB72: +@0803CB72: adds r1, r0 -_0803CB74: +@0803CB74: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0803CD04 + b @0803CD04 .align 2, 0 .pool -_0803CB84: +@0803CB84: ldr r3, =0x02024068 ldr r1, =0x0832a328 ldr r0, =0x02024064 @@ -103231,17 +103231,17 @@ _0803CB84: ldr r0, [r3] ands r0, r1 cmp r0, 0 - beq _0803CBAE - b _0803CD04 -_0803CBAE: + beq @0803CBAE + b @0803CD04 +@0803CBAE: ldr r1, =0x02024332 ldrb r0, [r1, 0x4] adds r0, 0x1 strb r0, [r1, 0x4] - b _0803CD04 + b @0803CD04 .align 2, 0 .pool -_0803CBC8: +@0803CBC8: ldr r5, =0x02024064 ldrb r2, [r5] ldr r0, =0x0202449c @@ -103251,16 +103251,16 @@ _0803CBC8: adds r0, 0x54 ldrb r0, [r0] cmp r0, 0 - beq _0803CCB4 + beq @0803CCB4 ldr r0, =0x02024332 adds r0, r2, r0 adds r1, 0x84 ldrb r1, [r1] strb r1, [r0] - b _0803CD04 + b @0803CD04 .align 2, 0 .pool -_0803CBF4: +@0803CBF4: ldr r3, =0x02024068 ldr r1, =0x0832a328 ldr r0, =0x02024064 @@ -103280,17 +103280,17 @@ _0803CBF4: ldr r0, [r3] ands r0, r1 cmp r0, 0 - bne _0803CD04 -_0803CC1C: + bne @0803CD04 +@0803CC1C: ldr r0, =0x02024332 adds r0, r4, r0 -_0803CC20: +@0803CC20: movs r1, 0x1 strb r1, [r0] - b _0803CD04 + b @0803CD04 .align 2, 0 .pool -_0803CC38: +@0803CC38: ldr r5, =0x02024064 ldrb r2, [r5] ldr r4, =0x0202449c @@ -103299,14 +103299,14 @@ _0803CC38: adds r0, 0x54 ldrb r0, [r0] cmp r0, 0 - beq _0803CCB4 + beq @0803CCB4 ldr r0, =0x02023864 lsls r1, r2, 9 adds r0, 0x1 adds r1, r0 ldrb r0, [r1] cmp r0, 0xD - bne _0803CC94 + bne @0803CC94 ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 @@ -103320,14 +103320,14 @@ _0803CC38: strb r1, [r0] ldr r1, =0x02024332 ldrb r0, [r5] -_0803CC72: +@0803CC72: adds r0, r1 movs r1, 0x4 strb r1, [r0] - b _0803CD04 + b @0803CD04 .align 2, 0 .pool -_0803CC94: +@0803CC94: adds r0, r2, 0 movs r1, 0x1 bl sub_8185008 @@ -103339,10 +103339,10 @@ _0803CC94: adds r0, 0x84 ldrb r0, [r0] strb r0, [r2] - b _0803CD04 + b @0803CD04 .align 2, 0 .pool -_0803CCB4: +@0803CCB4: ldr r0, =0x0202420b strb r2, [r0] ldr r7, =0x02024214 @@ -103370,20 +103370,20 @@ _0803CCB4: ldr r0, [r3] ands r0, r1 cmp r0, 0 - bne _0803CCFA + bne @0803CCFA ldr r0, =0x0831bd10 ldrb r1, [r4] lsls r1, 2 adds r1, r0 ldr r0, [r1] bl _call_via_r0 -_0803CCFA: +@0803CCFA: ldrb r0, [r5] lsls r0, 2 adds r0, r6 ldr r1, [r7] str r1, [r0] -_0803CD04: +@0803CD04: ldr r0, =0x02024064 ldrb r1, [r0] adds r1, 0x1 @@ -103391,18 +103391,18 @@ _0803CD04: ldr r0, =0x0202406c lsls r1, 24 lsrs r1, 24 -_0803CD12: +@0803CD12: adds r5, r0, 0 ldrb r0, [r5] cmp r1, r0 - bcs _0803CD1E - bl _0803BE9C -_0803CD1E: + bcs @0803CD1E + bl @0803BE9C +@0803CD1E: ldr r0, =0x02024332 ldrb r0, [r0, 0x4] ldrb r1, [r5] cmp r0, r1 - bne _0803CD70 + bne @0803CD70 movs r0, 0x1 bl sub_818603C ldr r1, =0x03005d04 @@ -103414,17 +103414,17 @@ _0803CD1E: lsls r1, 15 ands r0, r1 cmp r0, 0 - beq _0803CD70 + beq @0803CD70 movs r4, 0 ldrb r5, [r5] cmp r4, r5 - bge _0803CD70 -_0803CD4A: + bge @0803CD70 +@0803CD4A: ldr r0, =0x0202421c adds r0, r4, r0 ldrb r0, [r0] cmp r0, 0x2 - bne _0803CD66 + bne @0803CD66 lsls r0, r4, 24 lsrs r0, 24 ldr r1, =0x0202449c @@ -103433,13 +103433,13 @@ _0803CD4A: adds r1, 0x5C ldrb r1, [r1] bl sub_80571DC -_0803CD66: +@0803CD66: adds r4, 0x1 ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - blt _0803CD4A -_0803CD70: + blt @0803CD4A +@0803CD70: add sp, 0x1C pop {r3-r5} mov r8, r3 @@ -103453,7 +103453,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 @@ -103461,37 +103461,37 @@ sub_803CDB8: @ 803CDB8 ldrb r2, [r0] adds r5, r0, 0 cmp r3, r2 - bge _0803CDDA + bge @0803CDDA ldr r4, =0x02024332 -_0803CDCA: +@0803CDCA: adds r0, r1, r4 ldrb r0, [r0] cmp r0, 0x5 - bne _0803CDD4 + bne @0803CDD4 adds r3, 0x1 -_0803CDD4: +@0803CDD4: adds r1, 0x1 cmp r1, r2 - blt _0803CDCA -_0803CDDA: + blt @0803CDCA +@0803CDDA: adds r0, r3, 0x1 ldrb r5, [r5] cmp r0, r5 - beq _0803CDF0 + beq @0803CDF0 movs r0, 0 - b _0803CDF2 + b @0803CDF2 .align 2, 0 .pool -_0803CDF0: +@0803CDF0: movs r0, 0x1 -_0803CDF2: +@0803CDF2: pop {r4,r5} pop {r1} bx r1 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] @@ -103515,7 +103515,7 @@ sub_803CDF8: @ 803CDF8 movs r1, 0x42 ands r0, r1 cmp r0, 0x42 - bne _0803CEC6 + bne @0803CEC6 ldrb r0, [r7] ldr r2, [r6] lsls r1, r0, 1 @@ -103594,7 +103594,7 @@ sub_803CDF8: @ 803CDF8 add r0, r12 ldrb r0, [r0] strb r0, [r1] -_0803CEC6: +@0803CEC6: pop {r4-r7} pop {r0} bx r0 @@ -103603,7 +103603,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 @@ -103631,7 +103631,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 @@ -103657,7 +103657,7 @@ b_first_side: @ 803CF10 bl ability_something lsls r0, 24 cmp r0, 0 - bne _0803CFD8 + bne @0803CFD8 ldr r1, [sp, 0x8] str r1, [sp] movs r0, 0x13 @@ -103667,7 +103667,7 @@ b_first_side: @ 803CF10 bl ability_something lsls r0, 24 cmp r0, 0 - bne _0803CFD8 + bne @0803CFD8 ldr r1, =0x02024084 movs r0, 0x58 mov r2, r9 @@ -103677,30 +103677,30 @@ b_first_side: @ 803CF10 adds r0, 0x20 ldrb r3, [r0] cmp r3, 0x21 - bne _0803CF7C + bne @0803CF7C ldr r0, =0x020243cc ldrh r1, [r0] movs r0, 0x7 ands r0, r1 cmp r0, 0 - bne _0803CF8C -_0803CF7C: + bne @0803CF8C +@0803CF7C: cmp r3, 0x22 - bne _0803CF98 + bne @0803CF98 ldr r0, =0x020243cc ldrh r1, [r0] movs r0, 0x60 ands r0, r1 cmp r0, 0 - beq _0803CF98 -_0803CF8C: + beq @0803CF98 +@0803CF8C: movs r3, 0x2 - b _0803CF9A + b @0803CF9A .align 2, 0 .pool -_0803CF98: +@0803CF98: movs r3, 0x1 -_0803CF9A: +@0803CF9A: movs r0, 0x58 mov r1, r10 muls r1, r0 @@ -103710,32 +103710,32 @@ _0803CF9A: adds r0, 0x20 ldrb r2, [r0] cmp r2, 0x21 - bne _0803CFBA + bne @0803CFBA ldr r0, =0x020243cc ldrh r1, [r0] movs r0, 0x7 ands r0, r1 cmp r0, 0 - bne _0803CFCA -_0803CFBA: + bne @0803CFCA +@0803CFBA: cmp r2, 0x22 - bne _0803CFDA + bne @0803CFDA ldr r0, =0x020243cc ldrh r1, [r0] movs r0, 0x60 ands r0, r1 cmp r0, 0 - beq _0803CFDA -_0803CFCA: + beq @0803CFDA +@0803CFCA: movs r7, 0x2 - b _0803CFDC + b @0803CFDC .align 2, 0 .pool -_0803CFD8: +@0803CFD8: movs r3, 0x1 -_0803CFDA: +@0803CFDA: movs r7, 0x1 -_0803CFDC: +@0803CFDC: ldr r1, =0x02024084 movs r0, 0x58 mov r2, r9 @@ -103758,7 +103758,7 @@ _0803CFDC: mov r8, r0 ldrh r0, [r4, 0x2E] cmp r0, 0xAF - bne _0803D02C + bne @0803D02C ldr r1, =0x02024404 mov r3, r9 lsls r0, r3, 3 @@ -103767,10 +103767,10 @@ _0803CFDC: adds r0, r1 ldrb r6, [r0, 0x7] ldrb r5, [r0, 0x1A] - b _0803D040 + b @0803D040 .align 2, 0 .pool -_0803D02C: +@0803D02C: ldrh r0, [r4, 0x2E] bl itemid_get_x12 lsls r0, 24 @@ -103779,23 +103779,23 @@ _0803D02C: bl itemid_get_quality lsls r0, 24 lsrs r5, r0, 24 -_0803D040: +@0803D040: ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x023f0102 ands r0, r1 cmp r0, 0 - bne _0803D074 + bne @0803D074 ldr r0, =0x00000869 bl flag_check lsls r0, 24 cmp r0, 0 - beq _0803D074 + beq @0803D074 mov r0, r9 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0803D074 + bne @0803D074 movs r0, 0x6E mov r1, r8 muls r1, r0 @@ -103803,13 +103803,13 @@ _0803D040: movs r1, 0x64 bl __udivsi3 mov r8, r0 -_0803D074: +@0803D074: cmp r6, 0x18 - bne _0803D07E + bne @0803D07E mov r2, r8 lsrs r2, 1 mov r8, r2 -_0803D07E: +@0803D07E: ldr r1, =0x02024084 movs r0, 0x58 mov r3, r9 @@ -103821,13 +103821,13 @@ _0803D07E: movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _0803D09C + beq @0803D09C mov r0, r8 lsrs r0, 2 mov r8, r0 -_0803D09C: +@0803D09C: cmp r6, 0x1A - bne _0803D0B8 + bne @0803D0B8 ldr r0, =0x02024330 ldrh r4, [r0] lsls r0, r5, 16 @@ -103835,11 +103835,11 @@ _0803D09C: movs r1, 0x64 bl __divsi3 cmp r4, r0 - bge _0803D0B8 + bge @0803D0B8 movs r1, 0x1 negs r1, r1 mov r8, r1 -_0803D0B8: +@0803D0B8: ldr r1, =0x02024084 movs r0, 0x58 mov r2, r10 @@ -103863,7 +103863,7 @@ _0803D0B8: adds r7, r0, 0 ldrh r0, [r4, 0x2E] cmp r0, 0xAF - bne _0803D118 + bne @0803D118 ldr r1, =0x02024404 mov r3, r10 lsls r0, r3, 3 @@ -103872,10 +103872,10 @@ _0803D0B8: adds r0, r1 ldrb r6, [r0, 0x7] ldrb r5, [r0, 0x1A] - b _0803D12C + b @0803D12C .align 2, 0 .pool -_0803D118: +@0803D118: ldrh r0, [r4, 0x2E] bl itemid_get_x12 lsls r0, 24 @@ -103884,33 +103884,33 @@ _0803D118: bl itemid_get_quality lsls r0, 24 lsrs r5, r0, 24 -_0803D12C: +@0803D12C: ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x023f0102 ands r0, r1 cmp r0, 0 - bne _0803D15C + bne @0803D15C ldr r0, =0x00000869 bl flag_check lsls r0, 24 cmp r0, 0 - beq _0803D15C + beq @0803D15C mov r0, r10 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0803D15C + bne @0803D15C movs r0, 0x6E muls r0, r7 movs r1, 0x64 bl __udivsi3 adds r7, r0, 0 -_0803D15C: +@0803D15C: cmp r6, 0x18 - bne _0803D162 + bne @0803D162 lsrs r7, 1 -_0803D162: +@0803D162: ldr r2, =0x02024084 movs r0, 0x58 mov r1, r10 @@ -103923,11 +103923,11 @@ _0803D162: movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _0803D17E + beq @0803D17E lsrs r7, 2 -_0803D17E: +@0803D17E: cmp r6, 0x1A - bne _0803D198 + bne @0803D198 ldr r0, =0x02024330 ldrh r4, [r0] lsls r0, r5, 16 @@ -103935,37 +103935,37 @@ _0803D17E: movs r1, 0x64 bl __divsi3 cmp r4, r0 - bge _0803D198 + bge @0803D198 movs r7, 0x1 negs r7, r7 -_0803D198: +@0803D198: ldr r2, [sp, 0x4] cmp r2, 0 - beq _0803D1B8 + beq @0803D1B8 movs r3, 0 - b _0803D254 + b @0803D254 .align 2, 0 .pool -_0803D1B8: +@0803D1B8: ldr r0, =0x0202421c mov r3, r9 adds r1, r3, r0 ldrb r1, [r1] adds r2, r0, 0 cmp r1, 0 - bne _0803D208 + bne @0803D208 ldr r0, =0x0202433c lsls r1, r3, 4 adds r1, r0 ldrb r0, [r1] lsls r0, 29 cmp r0, 0 - bge _0803D1E0 + bge @0803D1E0 movs r3, 0xA5 - b _0803D20A + b @0803D20A .align 2, 0 .pool -_0803D1E0: +@0803D1E0: ldr r0, =0x0202449c ldr r0, [r0] add r0, r9 @@ -103981,29 +103981,29 @@ _0803D1E0: adds r1, 0xC adds r0, r1 ldrh r3, [r0] - b _0803D20A + b @0803D20A .align 2, 0 .pool -_0803D208: +@0803D208: movs r3, 0 -_0803D20A: +@0803D20A: mov r1, r10 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - bne _0803D254 + bne @0803D254 ldr r0, =0x0202433c lsls r1, 4 adds r1, r0 ldrb r0, [r1] lsls r0, 29 cmp r0, 0 - bge _0803D22C + bge @0803D22C movs r2, 0xA5 - b _0803D256 + b @0803D256 .align 2, 0 .pool -_0803D22C: +@0803D22C: ldr r0, =0x0202449c ldr r0, [r0] add r0, r10 @@ -104019,12 +104019,12 @@ _0803D22C: adds r1, 0xC adds r0, r1 ldrh r2, [r0] - b _0803D256 + b @0803D256 .align 2, 0 .pool -_0803D254: +@0803D254: movs r2, 0 -_0803D256: +@0803D256: ldr r4, =0x0831c898 lsls r0, r3, 1 adds r0, r3 @@ -104034,7 +104034,7 @@ _0803D256: ldrsb r1, [r0, r1] lsls r3, r2, 1 cmp r1, 0 - bne _0803D27A + bne @0803D27A adds r0, r3, r2 lsls r0, 2 adds r0, r4 @@ -104042,8 +104042,8 @@ _0803D256: lsls r0, 24 asrs r0, 24 cmp r0, 0 - beq _0803D2B8 -_0803D27A: + beq @0803D2B8 +@0803D27A: adds r0, r3, r2 lsls r0, 2 adds r0, r4 @@ -104051,48 +104051,48 @@ _0803D27A: lsls r0, 24 asrs r0, 24 cmp r1, r0 - bne _0803D2AE + bne @0803D2AE cmp r8, r7 - bne _0803D2A4 + bne @0803D2A4 bl GenerateRandomNumber movs r1, 0x1 ands r1, r0 cmp r1, 0 - beq _0803D2A4 + beq @0803D2A4 movs r3, 0x2 - b _0803D2D4 + b @0803D2D4 .align 2, 0 .pool -_0803D2A4: +@0803D2A4: cmp r8, r7 - bcs _0803D2D6 + bcs @0803D2D6 movs r0, 0x1 str r0, [sp, 0x8] - b _0803D2D6 -_0803D2AE: + b @0803D2D6 +@0803D2AE: cmp r1, r0 - bge _0803D2D6 + bge @0803D2D6 movs r1, 0x1 str r1, [sp, 0x8] - b _0803D2D6 -_0803D2B8: + b @0803D2D6 +@0803D2B8: cmp r8, r7 - bne _0803D2CE + bne @0803D2CE bl GenerateRandomNumber movs r1, 0x1 ands r1, r0 cmp r1, 0 - beq _0803D2CE + beq @0803D2CE movs r2, 0x2 str r2, [sp, 0x8] - b _0803D2D6 -_0803D2CE: + b @0803D2D6 +@0803D2CE: cmp r8, r7 - bcs _0803D2D6 + bcs @0803D2D6 movs r3, 0x1 -_0803D2D4: +@0803D2D4: str r3, [sp, 0x8] -_0803D2D6: +@0803D2D6: ldr r0, [sp, 0x8] add sp, 0xC pop {r3-r5} @@ -104105,7 +104105,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 @@ -104117,21 +104117,21 @@ sub_803D2E8: @ 803D2E8 movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0803D354 + beq @0803D354 ldr r0, =0x02024064 strb r3, [r0] ldr r4, =0x0202406c mov r8, r0 ldrb r0, [r4] cmp r3, r0 - bcc _0803D310 - b _0803D54A -_0803D310: + bcc @0803D310 + b @0803D54A +@0803D310: ldr r7, =0x0202407a ldr r6, =0x0202421c mov r2, r8 ldr r5, =0x0202407e -_0803D318: +@0803D318: adds r1, r3, r7 ldrb r0, [r2] adds r0, r6 @@ -104148,15 +104148,15 @@ _0803D318: lsrs r0, 24 ldrb r1, [r4] cmp r0, r1 - bcc _0803D318 - b _0803D54A + bcc @0803D318 + b @0803D54A .align 2, 0 .pool -_0803D354: +@0803D354: movs r2, 0x2 ands r1, r2 cmp r1, 0 - beq _0803D3A4 + beq @0803D3A4 ldr r0, =0x02024064 strb r3, [r0] ldr r1, =0x0202406c @@ -104164,13 +104164,13 @@ _0803D354: adds r2, r1, 0 ldrb r2, [r2] cmp r3, r2 - bcs _0803D3C0 + bcs @0803D3C0 ldr r0, =0x0202421c ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0x3 - beq _0803D3BE -_0803D376: + beq @0803D3BE +@0803D376: mov r7, r8 ldrb r0, [r7] adds r0, 0x1 @@ -104180,35 +104180,35 @@ _0803D376: ldr r1, =0x0202406c ldrb r1, [r1] cmp r0, r1 - bcs _0803D3C0 + bcs @0803D3C0 ldrb r0, [r7] adds r0, r4 ldrb r0, [r0] cmp r0, 0x3 - bne _0803D376 - b _0803D3BE + bne @0803D376 + b @0803D3BE .align 2, 0 .pool -_0803D3A4: +@0803D3A4: ldr r1, =0x0202421c ldrb r0, [r1] ldr r4, =0x02024064 mov r8, r4 cmp r0, 0x3 - bne _0803D3B4 + bne @0803D3B4 strb r3, [r4] movs r3, 0x5 -_0803D3B4: +@0803D3B4: ldrb r0, [r1, 0x2] cmp r0, 0x3 - bne _0803D3C0 + bne @0803D3C0 mov r7, r8 strb r2, [r7] -_0803D3BE: +@0803D3BE: movs r3, 0x5 -_0803D3C0: +@0803D3C0: cmp r3, 0x5 - bne _0803D448 + bne @0803D448 ldr r6, =0x0202407a ldr r1, =0x0202421c mov r2, r8 @@ -104232,16 +104232,16 @@ _0803D3C0: ldr r7, =0x0202406c ldrb r7, [r7] cmp r5, r7 - bge _0803D41A + bge @0803D41A adds r7, r6, 0 adds r6, r4, 0 adds r4, r2, 0 ldr r2, =0x0202406c -_0803D3FC: +@0803D3FC: mov r0, r8 ldrb r0, [r0] cmp r5, r0 - beq _0803D412 + beq @0803D412 adds r1, r3, r7 adds r0, r5, r6 ldrb r0, [r0] @@ -104249,33 +104249,33 @@ _0803D3FC: adds r0, r3, r4 strb r5, [r0] adds r3, 0x1 -_0803D412: +@0803D412: adds r5, 0x1 ldrb r1, [r2] cmp r5, r1 - blt _0803D3FC -_0803D41A: + blt @0803D3FC +@0803D41A: mov r2, r12 mov r3, r10 str r2, [r3] mov r4, r9 ldr r0, [r4] - b _0803D554 + b @0803D554 .align 2, 0 .pool -_0803D448: +@0803D448: movs r0, 0 mov r7, r8 strb r0, [r7] ldr r1, =0x0202406c ldrb r0, [r1] cmp r0, 0 - beq _0803D48E + beq @0803D48E ldr r6, =0x0202421c mov r2, r8 ldr r5, =0x0202407a ldr r4, =0x0202407e -_0803D45E: +@0803D45E: ldrb r0, [r2] adds r0, r6 ldrb r1, [r0] @@ -104283,7 +104283,7 @@ _0803D45E: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _0803D47C + bhi @0803D47C adds r0, r3, r5 strb r1, [r0] adds r1, r3, r4 @@ -104291,7 +104291,7 @@ _0803D45E: ldrb r0, [r7] strb r0, [r1] adds r3, 0x1 -_0803D47C: +@0803D47C: ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] @@ -104300,19 +104300,19 @@ _0803D47C: ldr r1, =0x0202406c ldrb r1, [r1] cmp r0, r1 - bcc _0803D45E -_0803D48E: + bcc @0803D45E +@0803D48E: movs r0, 0 mov r2, r8 strb r0, [r2] ldr r4, =0x0202406c ldrb r0, [r4] cmp r0, 0 - beq _0803D4D2 + beq @0803D4D2 ldr r6, =0x0202421c ldr r5, =0x0202407a ldr r4, =0x0202407e -_0803D4A2: +@0803D4A2: ldrb r0, [r2] adds r0, r6 ldrb r1, [r0] @@ -104320,7 +104320,7 @@ _0803D4A2: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bls _0803D4C0 + bls @0803D4C0 adds r0, r3, r5 strb r1, [r0] adds r1, r3, r4 @@ -104328,7 +104328,7 @@ _0803D4A2: ldrb r0, [r7] strb r0, [r1] adds r3, 0x1 -_0803D4C0: +@0803D4C0: ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] @@ -104337,22 +104337,22 @@ _0803D4C0: ldr r1, =0x0202406c ldrb r1, [r1] cmp r0, r1 - bcc _0803D4A2 -_0803D4D2: + bcc @0803D4A2 +@0803D4D2: movs r5, 0 - b _0803D540 + b @0803D540 .align 2, 0 .pool -_0803D4E8: +@0803D4E8: adds r4, r5, 0x1 adds r7, r4, 0 ldrb r1, [r1] cmp r7, r1 - bge _0803D53E + bge @0803D53E ldr r6, =0x0202407a lsls r2, r5, 24 mov r8, r2 -_0803D4F8: +@0803D4F8: ldr r0, =0x0202407e adds r1, r5, r0 ldrb r3, [r1] @@ -104361,47 +104361,47 @@ _0803D4F8: adds r0, r5, r6 ldrb r2, [r0] cmp r2, 0x1 - beq _0803D534 + beq @0803D534 adds r0, r4, r6 ldrb r0, [r0] cmp r0, 0x1 - beq _0803D534 + beq @0803D534 cmp r2, 0x2 - beq _0803D534 + beq @0803D534 cmp r0, 0x2 - beq _0803D534 + beq @0803D534 adds r0, r3, 0 movs r2, 0 bl b_first_side lsls r0, 24 cmp r0, 0 - beq _0803D534 + beq @0803D534 lsls r1, r4, 24 lsrs r1, 24 mov r3, r8 lsrs r0, r3, 24 bl sub_803CEDC -_0803D534: +@0803D534: adds r4, 0x1 ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - blt _0803D4F8 -_0803D53E: + blt @0803D4F8 +@0803D53E: adds r5, r7, 0 -_0803D540: +@0803D540: ldr r1, =0x0202406c ldrb r0, [r1] subs r0, 0x1 cmp r5, r0 - blt _0803D4E8 -_0803D54A: + blt @0803D4E8 +@0803D54A: ldr r1, =0x03005d04 ldr r0, =bc_80154A0 + 1 str r0, [r1] ldr r0, =0x0202449c ldr r0, [r0] -_0803D554: +@0803D554: adds r0, 0x48 movs r1, 0 strb r1, [r0] @@ -104417,7 +104417,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 @@ -104433,7 +104433,7 @@ sub_803D580: @ 803D580 ldrb r2, [r0] adds r5, r1, 0 cmp r2, 0 - beq _0803D678 + beq @0803D678 ldr r7, =0x0202433c adds r6, r5, 0 ldr r0, =0x020240d4 @@ -104441,10 +104441,10 @@ sub_803D580: @ 803D580 ldr r1, =0x020242bc mov r8, r1 mov r10, r8 -_0803D5AE: +@0803D5AE: mov r2, r9 cmp r2, 0 - beq _0803D5EC + beq @0803D5EC ldrb r1, [r6] lsls r1, 4 adds r1, r7 @@ -104461,22 +104461,22 @@ _0803D5AE: negs r0, r0 ands r0, r2 strb r0, [r1] - b _0803D648 + b @0803D648 .align 2, 0 .pool -_0803D5EC: +@0803D5EC: ldrb r0, [r6] lsls r0, 4 adds r2, r0, r7 movs r1, 0 mov r4, r10 movs r3, 0 -_0803D5F8: +@0803D5F8: adds r0, r2, r1 strb r3, [r0] adds r1, 0x1 cmp r1, 0xF - bls _0803D5F8 + bls @0803D5F8 ldrb r1, [r5] lsls r0, r1, 3 subs r0, r1 @@ -104484,10 +104484,10 @@ _0803D5F8: adds r1, r0, r4 ldrb r0, [r1, 0x16] cmp r0, 0 - beq _0803D616 + beq @0803D616 subs r0, 0x1 strb r0, [r1, 0x16] -_0803D616: +@0803D616: ldrb r1, [r5] lsls r0, r1, 3 subs r0, r1 @@ -104495,7 +104495,7 @@ _0803D616: adds r1, r0, r4 ldrb r0, [r1, 0x19] cmp r0, 0 - beq _0803D648 + beq @0803D648 subs r0, 0x1 strb r0, [r1, 0x19] ldrb r2, [r5] @@ -104505,7 +104505,7 @@ _0803D616: adds r0, r4 ldrb r0, [r0, 0x19] cmp r0, 0 - bne _0803D648 + bne @0803D648 movs r0, 0x58 muls r2, r0 add r2, r12 @@ -104513,7 +104513,7 @@ _0803D616: ldr r1, =0xffbfffff ands r0, r1 str r0, [r2] -_0803D648: +@0803D648: ldrb r2, [r5] lsls r0, r2, 3 subs r0, r2 @@ -104521,7 +104521,7 @@ _0803D648: add r0, r8 ldrb r0, [r0, 0xA] cmp r0, 0 - bne _0803D666 + bne @0803D666 movs r0, 0x58 muls r2, r0 add r2, r12 @@ -104529,7 +104529,7 @@ _0803D648: ldr r1, =0xfeffffff ands r0, r1 str r0, [r2] -_0803D666: +@0803D666: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] @@ -104538,8 +104538,8 @@ _0803D666: ldr r1, =0x0202406c ldrb r1, [r1] cmp r0, r1 - bcc _0803D5AE -_0803D678: + bcc @0803D5AE +@0803D678: movs r0, 0 ldr r2, =0x02024294 strb r0, [r2, 0x8] @@ -104556,7 +104556,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 @@ -104565,23 +104565,23 @@ sub_803D6A0: @ 803D6A0 ldrb r1, [r0] adds r6, r0, 0 cmp r1, 0 - beq _0803D6DE + beq @0803D6DE adds r3, r2, 0 movs r4, 0 ldr r5, =0x0202437c -_0803D6B8: +@0803D6B8: ldrb r1, [r3] lsls r0, r1, 2 adds r0, r1 lsls r0, 2 adds r2, r0, r5 movs r1, 0 -_0803D6C4: +@0803D6C4: adds r0, r2, r1 strb r4, [r0] adds r1, 0x1 cmp r1, 0x13 - bls _0803D6C4 + bls @0803D6C4 ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] @@ -104589,8 +104589,8 @@ _0803D6C4: lsrs r0, 24 ldrb r1, [r6] cmp r0, r1 - bcc _0803D6B8 -_0803D6DE: + bcc @0803D6B8 +@0803D6DE: pop {r4-r6} pop {r0} bx r0 @@ -104599,7 +104599,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] @@ -104607,7 +104607,7 @@ bc_80154A0: @ 803D6F0 lsls r1, 8 ands r0, r1 cmp r0, 0 - bne _0803D7AE + bne @0803D7AE ldr r2, =0x0202449c ldr r0, [r2] adds r0, 0x48 @@ -104617,12 +104617,12 @@ bc_80154A0: @ 803D6F0 adds r6, r1, 0 ldrb r1, [r6] cmp r0, r1 - bcs _0803D7AE + bcs @0803D7AE ldr r5, =0x02024064 ldr r4, =0x0202420b movs r7, 0x84 lsls r7, 1 -_0803D71C: +@0803D71C: ldr r1, [r2] adds r1, 0x48 ldrb r0, [r1] @@ -104637,7 +104637,7 @@ _0803D71C: adds r0, r1 ldrh r0, [r0] cmp r0, r7 - bne _0803D7A0 + bne @0803D7A0 ldr r1, =0x02024084 movs r0, 0x58 muls r0, r3 @@ -104647,7 +104647,7 @@ _0803D71C: movs r1, 0x7 ands r0, r1 cmp r0, 0 - bne _0803D7A0 + bne @0803D7A0 ldr r2, =0x020242bc ldrb r1, [r4] lsls r0, r1, 3 @@ -104657,28 +104657,28 @@ _0803D71C: ldrb r0, [r0, 0x18] lsls r0, 31 cmp r0, 0 - bne _0803D7A0 + bne @0803D7A0 ldr r0, =0x0202433c lsls r1, r3, 4 adds r1, r0 ldrb r0, [r1] lsls r0, 29 cmp r0, 0 - blt _0803D7A0 + blt @0803D7A0 ldr r0, =0x082db1ff bl b_call_bc_move_exec - b _0803D7E8 + b @0803D7E8 .align 2, 0 .pool -_0803D7A0: +@0803D7A0: mov r2, r12 ldr r0, [r2] adds r0, 0x48 ldrb r0, [r0] ldrb r1, [r6] cmp r0, r1 - bcc _0803D71C -_0803D7AE: + bcc @0803D71C +@0803D7AE: bl b_clear_atk_up_if_hit_flag_unless_enraged ldr r1, =0x02024082 movs r0, 0 @@ -104707,7 +104707,7 @@ _0803D7AE: ldr r0, [r0, 0x8] adds r0, 0x20 strb r2, [r0] -_0803D7E8: +@0803D7E8: pop {r4-r7} pop {r0} bx r0 @@ -104716,16 +104716,16 @@ _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] ldr r2, =0x02024083 cmp r0, 0 - beq _0803D828 + beq @0803D828 movs r0, 0xC strb r0, [r2] -_0803D828: +@0803D828: ldr r5, =0x0202449c ldr r0, [r5] adds r0, 0x4B @@ -104742,7 +104742,7 @@ _0803D828: ldrb r1, [r4] ldrb r0, [r0] cmp r1, r0 - bcc _0803D894 + bcc @0803D894 ldr r2, =0x02024280 ldr r0, [r2] ldr r1, =0xffefffff @@ -104757,15 +104757,15 @@ _0803D828: adds r0, r2 ldr r0, [r0] str r0, [r3] - b _0803D8AC + b @0803D8AC .align 2, 0 .pool -_0803D894: +@0803D894: ldr r0, [r5] adds r0, 0x4B ldrb r0, [r0] cmp r0, r1 - beq _0803D8AC + beq @0803D8AC ldr r2, =0x02024280 ldr r0, [r2] ldr r1, =0xfffffdff @@ -104773,7 +104773,7 @@ _0803D894: ldr r1, =0xfff7ffff ands r0, r1 str r0, [r2] -_0803D8AC: +@0803D8AC: pop {r4-r6} pop {r0} bx r0 @@ -104782,7 +104782,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 @@ -104792,7 +104792,7 @@ sub_803D8C0: @ 803D8C0 ldr r0, =0x02000002 ands r0, r2 cmp r0, 0 - beq _0803D920 + beq @0803D920 ldr r1, =0x020375f0 ldr r4, =0x0202433a ldrb r0, [r4] @@ -104811,18 +104811,18 @@ sub_803D8C0: @ 803D8C0 movs r0, 0x7F ands r0, r1 strb r0, [r4] - b _0803DAA4 + b @0803DAA4 .align 2, 0 .pool -_0803D920: +@0803D920: movs r0, 0x8 ands r0, r2 cmp r0, 0 - beq _0803D95C + beq @0803D95C ldr r0, =0x043f0900 ands r2, r0 cmp r2, 0 - beq _0803D95C + beq @0803D95C bl sub_805EA60 ldr r1, =0x02024214 ldr r0, =0x082daa87 @@ -104831,20 +104831,20 @@ _0803D920: ldrh r1, [r0] ldr r0, =0x000003fe cmp r1, r0 - bne _0803D946 - b _0803DA8A -_0803D946: - b _0803DA94 + bne @0803D946 + b @0803DA8A +@0803D946: + b @0803DA94 .align 2, 0 .pool -_0803D95C: +@0803D95C: ldr r0, [r1] movs r1, 0xA ands r0, r1 cmp r0, 0x8 - beq _0803D968 - b _0803DA9E -_0803D968: + beq @0803D968 + b @0803DA9E +@0803D968: bl sub_805EA60 ldr r1, =0x02024214 ldr r0, =0x082da92d @@ -104859,95 +104859,95 @@ _0803D968: ldrb r0, [r0, 0x1] subs r0, 0x3 cmp r0, 0x32 - bls _0803D98A - b _0803DA94 -_0803D98A: + bls @0803D98A + b @0803DA94 +@0803D98A: lsls r0, 2 - ldr r1, =_0803D9A8 + ldr r1, =@0803D9A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0803D9A8: - .4byte _0803DA80 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA80 - .4byte _0803DA94 - .4byte _0803DA80 - .4byte _0803DA94 - .4byte _0803DA80 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA74 - .4byte _0803DA8A - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA74 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA80 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA94 - .4byte _0803DA80 -_0803DA74: +@0803D9A8: + .4byte @0803DA80 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA80 + .4byte @0803DA94 + .4byte @0803DA80 + .4byte @0803DA94 + .4byte @0803DA80 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA74 + .4byte @0803DA8A + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA74 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA80 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA94 + .4byte @0803DA80 +@0803DA74: ldr r0, =0x00000163 bl song_play_for_text - b _0803DAA4 + b @0803DAA4 .align 2, 0 .pool -_0803DA80: +@0803DA80: movs r0, 0xD4 lsls r0, 1 bl song_play_for_text - b _0803DAA4 -_0803DA8A: + b @0803DAA4 +@0803DA8A: movs r0, 0xB1 lsls r0, 1 bl song_play_for_text - b _0803DAA4 -_0803DA94: + b @0803DAA4 +@0803DA94: movs r0, 0xCE lsls r0, 1 bl song_play_for_text - b _0803DAA4 -_0803DA9E: + b @0803DAA4 +@0803DA9E: ldr r1, =0x02024214 ldr r0, =0x082da96a str r0, [r1] -_0803DAA4: +@0803DAA4: ldr r1, =0x03005d04 ldr r0, =sub_803DCD8 + 1 str r0, [r1] @@ -104959,7 +104959,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 @@ -104969,17 +104969,17 @@ sub_803DAC0: @ 803DAC0 ldr r0, =0x02000002 ands r0, r1 cmp r0, 0 - beq _0803DB7C + beq @0803DB7C ldr r0, =0x003f0100 ands r1, r0 cmp r1, 0 - beq _0803DB44 + beq @0803DB44 ldr r3, =0x0202433a ldrb r2, [r3] movs r0, 0x80 ands r0, r2 cmp r0, 0 - beq _0803DB2C + beq @0803DB2C ldr r1, =0x02024214 ldr r0, =0x082db9c8 str r0, [r1] @@ -104994,20 +104994,20 @@ sub_803DAC0: @ 803DAC0 movs r2, 0x8 orrs r0, r2 strb r0, [r1] - b _0803DB82 + b @0803DB82 .align 2, 0 .pool -_0803DB2C: +@0803DB2C: ldr r1, =0x02024214 ldr r0, =0x082daa0b str r0, [r1] movs r0, 0x7F ands r0, r2 strb r0, [r3] - b _0803DB82 + b @0803DB82 .align 2, 0 .pool -_0803DB44: +@0803DB44: ldr r1, =0x02022f58 ldr r4, =0x0202433a ldrb r0, [r4] @@ -105023,14 +105023,14 @@ _0803DB44: movs r0, 0x7F ands r0, r1 strb r0, [r4] - b _0803DB82 + b @0803DB82 .align 2, 0 .pool -_0803DB7C: +@0803DB7C: ldr r1, =0x02024214 ldr r0, =0x082da96d str r0, [r1] -_0803DB82: +@0803DB82: ldr r1, =0x03005d04 ldr r0, =sub_803DCD8 + 1 str r0, [r1] @@ -105042,7 +105042,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 @@ -105052,11 +105052,11 @@ sub_803DBA0: @ 803DBA0 ldr r0, =0x003f0100 ands r0, r2 cmp r0, 0 - beq _0803DBFC + beq @0803DBFC movs r0, 0x8 ands r2, r0 cmp r2, 0 - beq _0803DBFC + beq @0803DBFC ldr r1, =0x02024214 ldr r0, =0x082db9c1 str r0, [r1] @@ -105071,26 +105071,26 @@ sub_803DBA0: @ 803DBA0 movs r2, 0x8 orrs r0, r2 strb r0, [r1] - b _0803DC6A + b @0803DC6A .align 2, 0 .pool -_0803DBFC: +@0803DBFC: ldr r0, [r1] movs r1, 0x80 lsls r1, 19 ands r0, r1 cmp r0, 0 - beq _0803DC24 + beq @0803DC24 ldr r1, =0x02024214 ldr r0, =0x082db9c1 str r0, [r1] ldr r1, =0x0202433a movs r0, 0x9 strb r0, [r1] - b _0803DC6A + b @0803DC6A .align 2, 0 .pool -_0803DC24: +@0803DC24: ldr r1, =0x0202433c ldr r0, =0x0202420b ldrb r0, [r0] @@ -105100,26 +105100,26 @@ _0803DC24: lsls r0, 27 lsrs r0, 30 cmp r0, 0x1 - beq _0803DC54 + beq @0803DC54 cmp r0, 0x2 - beq _0803DC64 + beq @0803DC64 ldr r1, =0x02024214 ldr r0, =0x082daaf0 - b _0803DC68 + b @0803DC68 .align 2, 0 .pool -_0803DC54: +@0803DC54: ldr r1, =0x02024214 ldr r0, =0x082daadb - b _0803DC68 + b @0803DC68 .align 2, 0 .pool -_0803DC64: +@0803DC64: ldr r1, =0x02024214 ldr r0, =0x082daae9 -_0803DC68: +@0803DC68: str r0, [r1] -_0803DC6A: +@0803DC6A: ldr r1, =0x03005d04 ldr r0, =sub_803DCD8 + 1 str r0, [r1] @@ -105130,7 +105130,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] @@ -105162,7 +105162,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} @@ -105172,36 +105172,36 @@ sub_803DCD8: @ 803DCD8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bls _0803DCEE - b _0803DE10 -_0803DCEE: + bls @0803DCEE + b @0803DE10 +@0803DCEE: ldr r0, =0x02022fec ldr r1, [r0] ldr r0, =0x023f0b92 ands r1, r0 cmp r1, 0 - bne _0803DDB6 + bne @0803DDB6 ldr r2, =0x02024064 strb r1, [r2] ldr r0, =0x0202406c ldrb r0, [r0] cmp r1, r0 - bcs _0803DDB2 + bcs @0803DDB2 adds r5, r2, 0 ldr r0, =0x0202406e mov r8, r0 movs r7, 0x64 ldr r6, =0x020244ec -_0803DD10: +@0803DD10: ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0803DDA0 + bne @0803DDA0 ldr r4, =0x03005d10 ldrh r0, [r4, 0x6] cmp r0, 0 - bne _0803DD74 + bne @0803DD74 ldrb r0, [r5] lsls r0, 1 add r0, r8 @@ -105222,10 +105222,10 @@ _0803DD10: adds r2, r4, 0 adds r2, 0x8 bl pokemon_getattr - b _0803DDA0 + b @0803DDA0 .align 2, 0 .pool -_0803DD74: +@0803DD74: ldrb r0, [r5] lsls r0, 1 add r0, r8 @@ -105246,7 +105246,7 @@ _0803DD74: adds r2, r4, 0 adds r2, 0x14 bl pokemon_getattr -_0803DDA0: +@0803DDA0: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] @@ -105255,24 +105255,24 @@ _0803DDA0: lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bcc _0803DD10 -_0803DDB2: + bcc @0803DD10 +@0803DDB2: bl sub_80EC728 -_0803DDB6: +@0803DDB6: ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x023f0b9a ands r0, r1 cmp r0, 0 - bne _0803DDD2 + bne @0803DDD2 ldr r0, =0x03005d10 ldrb r1, [r0, 0x5] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0803DDD2 + beq @0803DDD2 bl sub_80EE184 -_0803DDD2: +@0803DDD2: bl sub_8186444 movs r0, 0x3 bl sub_80A2390 @@ -105284,14 +105284,14 @@ _0803DDD2: ldr r1, =0x030061e8 ldr r0, =sub_8038420 + 1 str r0, [r1] - b _0803DE2A + b @0803DE2A .align 2, 0 .pool -_0803DE10: +@0803DE10: ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - bne _0803DE2A + bne @0803DE2A ldr r1, =0x0831bd10 ldr r0, =0x02024214 ldr r0, [r0] @@ -105300,7 +105300,7 @@ _0803DE10: adds r0, r1 ldr r0, [r0] bl _call_via_r0 -_0803DE2A: +@0803DE2A: pop {r3} mov r8, r3 pop {r4-r7} @@ -105311,46 +105311,46 @@ _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] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0803DE86 + bne @0803DE86 bl reset_all_obj_data ldr r0, =0x03005d54 ldrb r0, [r0] cmp r0, 0 - beq _0803DE62 + beq @0803DE62 ldr r0, =0x0202433a ldrb r0, [r0] cmp r0, 0x1 - beq _0803DE80 -_0803DE62: + beq @0803DE80 +@0803DE62: ldr r1, =0x03005d04 ldr r0, =c4_overworld + 1 str r0, [r1] - b _0803DEA2 + b @0803DEA2 .align 2, 0 .pool -_0803DE80: +@0803DE80: ldr r1, =0x03005d04 ldr r0, =bc_evolution_cutscene + 1 str r0, [r1] -_0803DE86: +@0803DE86: bl Window_FreeMemory ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 cmp r0, 0 - bne _0803DEA2 + bne @0803DEA2 bl sub_805F094 bl sub_8057028 bl dp11_free -_0803DEA2: +@0803DEA2: pop {r0} bx r0 .align 2, 0 @@ -105358,16 +105358,16 @@ _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] adds r3, r0, 0 cmp r1, 0 - beq _0803DF2E -_0803DEC0: + beq @0803DF2E +@0803DEC0: movs r6, 0 -_0803DEC2: +@0803DEC2: ldrb r2, [r3] ldr r0, =0x0832a328 lsls r1, r6, 2 @@ -105376,7 +105376,7 @@ _0803DEC2: adds r0, r2, 0 ands r0, r1 cmp r0, 0 - beq _0803DF20 + beq @0803DF20 bics r2, r1 strb r2, [r3] movs r0, 0x64 @@ -105390,7 +105390,7 @@ _0803DEC2: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq _0803DF20 + beq @0803DF20 bl Window_FreeMemory ldr r0, =0x03005d04 ldr r1, =sub_803DF48 + 1 @@ -105401,22 +105401,22 @@ _0803DEC2: adds r1, r4, 0 movs r2, 0x1 bl evolution_cutscene - b _0803DF34 + b @0803DF34 .align 2, 0 .pool -_0803DF20: +@0803DF20: adds r6, 0x1 ldr r3, =0x03005d54 cmp r6, 0x5 - ble _0803DEC2 + ble @0803DEC2 ldrb r0, [r3] cmp r0, 0 - bne _0803DEC0 -_0803DF2E: + bne @0803DEC0 +@0803DF2E: ldr r1, =0x03005d04 ldr r0, =c4_overworld + 1 str r0, [r1] -_0803DF34: +@0803DF34: pop {r4-r6} pop {r0} bx r0 @@ -105425,17 +105425,17 @@ _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] ldr r0, =sub_8038420 + 1 cmp r1, r0 - bne _0803DF5A + bne @0803DF5A ldr r1, =0x03005d04 ldr r0, =bc_evolution_cutscene + 1 str r0, [r1] -_0803DF5A: +@0803DF5A: pop {r0} bx r0 .align 2, 0 @@ -105443,30 +105443,30 @@ _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] movs r5, 0x2 ands r0, r5 cmp r0, 0 - bne _0803DF8C + bne @0803DF8C ldr r4, =0x020244ec adds r0, r4, 0 bl sub_806DCB4 adds r0, r4, 0 bl atkE5_pickupitemcalculation -_0803DF8C: +@0803DF8C: ldr r4, [r6] adds r0, r4, 0 ands r0, r5 cmp r0, 0 - beq _0803DF9E + beq @0803DF9E ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _0803DFEC -_0803DF9E: + bne @0803DFEC +@0803DF9E: ldr r1, =0x020375f0 ldr r5, =0x0202433a ldrb r0, [r5] @@ -105486,25 +105486,25 @@ _0803DF9E: lsls r0, 3 ands r4, r0 cmp r4, 0 - beq _0803DFDE + beq @0803DFDE ldr r0, =0x02024744 bl sub_8161F18 ldrb r1, [r5] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0803DFDA + bne @0803DFDA cmp r1, 0x7 - bne _0803DFDE -_0803DFDA: + bne @0803DFDE +@0803DFDA: bl sub_8161F4C -_0803DFDE: +@0803DFDE: movs r0, 0x5A bl m4aSongNumStop ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 -_0803DFEC: +@0803DFEC: pop {r4-r6} pop {r0} bx r0 @@ -105513,7 +105513,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] @@ -105521,7 +105521,7 @@ bc_move_exec_returning: @ 803E018 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _0803E060 + bhi @0803E060 ldr r3, =0x020244a8 ldr r0, [r3] ldr r0, [r0, 0xC] @@ -105529,10 +105529,10 @@ bc_move_exec_returning: @ 803E018 adds r1, 0x20 ldrb r0, [r1] cmp r0, 0 - beq _0803E03C + beq @0803E03C subs r0, 0x1 strb r0, [r1] -_0803E03C: +@0803E03C: ldr r2, =0x03005d04 ldr r0, [r3] ldr r1, [r0, 0xC] @@ -105543,14 +105543,14 @@ _0803E03C: adds r1, r0 ldr r0, [r1] str r0, [r2] - b _0803E07A + b @0803E07A .align 2, 0 .pool -_0803E060: +@0803E060: ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - bne _0803E07A + bne @0803E07A ldr r1, =0x0831bd10 ldr r0, =0x02024214 ldr r0, [r0] @@ -105559,7 +105559,7 @@ _0803E060: adds r0, r1 ldr r0, [r0] bl _call_via_r0 -_0803E07A: +@0803E07A: pop {r0} bx r0 .align 2, 0 @@ -105567,12 +105567,12 @@ _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] cmp r0, 0 - bne _0803E0A8 + bne @0803E0A8 ldr r1, =0x0831bd10 ldr r0, =0x02024214 ldr r0, [r0] @@ -105581,7 +105581,7 @@ sub_803E08C: @ 803E08C adds r0, r1 ldr r0, [r0] bl _call_via_r0 -_0803E0A8: +@0803E0A8: pop {r0} bx r0 .align 2, 0 @@ -105589,7 +105589,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 @@ -105617,13 +105617,13 @@ sub_803E0B8: @ 803E0B8 ldr r0, [r0] ands r2, r0 cmp r2, 0 - beq _0803E110 + beq @0803E110 ldr r1, =0x02024083 movs r0, 0xC - b _0803E83C + b @0803E83C .align 2, 0 .pool -_0803E110: +@0803E110: ldr r1, =0x02024211 movs r0, 0x1 strb r0, [r1] @@ -105659,7 +105659,7 @@ _0803E110: lsls r0, r1, 29 mov r8, r2 cmp r0, 0 - bge _0803E1BC + bge @0803E1BC movs r0, 0x5 negs r0, r0 ands r0, r1 @@ -105681,10 +105681,10 @@ _0803E110: ldrb r1, [r6] ldr r3, =0x0202449c ldr r2, [r3] - b _0803E316 + b @0803E316 .align 2, 0 .pool -_0803E1BC: +@0803E1BC: ldr r5, =0x02024084 mov r10, r5 movs r0, 0x58 @@ -105698,13 +105698,13 @@ _0803E1BC: lsls r0, 5 ands r0, r1 cmp r0, 0 - bne _0803E1E2 + bne @0803E1E2 movs r7, 0x80 lsls r7, 15 ands r7, r1 cmp r7, 0 - beq _0803E204 -_0803E1E2: + beq @0803E204 +@0803E1E2: ldr r3, =0x020241ea ldr r2, =0x020241ec ldr r1, =0x02024268 @@ -105713,10 +105713,10 @@ _0803E1E2: ldrh r0, [r0] strh r0, [r2] strh r0, [r3] - b _0803E33C + b @0803E33C .align 2, 0 .pool -_0803E204: +@0803E204: ldr r1, =0x020242bc mov r12, r1 lsls r0, r4, 3 @@ -105726,7 +105726,7 @@ _0803E204: ldrh r3, [r0, 0x6] adds r1, r3, 0 cmp r1, 0 - beq _0803E2DC + beq @0803E2DC ldrb r2, [r0, 0xC] lsls r0, r2, 1 adds r0, r5 @@ -105735,7 +105735,7 @@ _0803E204: adds r0, r4 ldrh r0, [r0] cmp r1, r0 - bne _0803E268 + bne @0803E268 ldr r2, =0x020241ea ldr r0, =0x020241ec strh r3, [r0] @@ -105756,14 +105756,14 @@ _0803E204: ldrb r1, [r6] ldr r3, =0x0202449c ldr r2, [r3] - b _0803E316 + b @0803E316 .align 2, 0 .pool -_0803E268: +@0803E268: cmp r1, 0 - beq _0803E2DC + beq @0803E2DC cmp r1, r0 - beq _0803E2DC + beq @0803E2DC mov r5, r9 strb r2, [r5] mov r0, r8 @@ -105809,10 +105809,10 @@ _0803E268: ldrb r1, [r6] ldr r3, =0x0202449c ldr r2, [r3] - b _0803E316 + b @0803E316 .align 2, 0 .pool -_0803E2DC: +@0803E2DC: ldr r3, =0x02024084 mov r5, r8 ldrb r0, [r5] @@ -105830,7 +105830,7 @@ _0803E2DC: ldrh r3, [r0] ldrh r2, [r2] cmp r3, r2 - beq _0803E334 + beq @0803E334 ldr r1, =0x020241ea ldr r0, =0x020241ec strh r3, [r0] @@ -105841,18 +105841,18 @@ _0803E2DC: ldrb r1, [r4] ldr r2, =0x0202449c ldr r2, [r2] -_0803E316: +@0803E316: adds r1, r2 strb r0, [r1, 0xC] - b _0803E33C + b @0803E33C .align 2, 0 .pool -_0803E334: +@0803E334: ldr r1, =0x020241ea ldr r0, =0x020241ec strh r3, [r0] strh r3, [r1] -_0803E33C: +@0803E33C: ldr r2, =0x02024084 ldr r1, =0x0202420b ldrb r3, [r1] @@ -105862,25 +105862,25 @@ _0803E33C: ldrh r0, [r0, 0x28] mov r8, r1 cmp r0, 0 - beq _0803E384 + beq @0803E384 adds r0, r3, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0803E37C + bne @0803E37C ldr r0, =0x03005d10 ldr r1, =0x020241ea ldrh r1, [r1] strh r1, [r0, 0x22] - b _0803E384 + b @0803E384 .align 2, 0 .pool -_0803E37C: +@0803E37C: ldr r0, =0x03005d10 ldr r1, =0x020241ea ldrh r1, [r1] strh r1, [r0, 0x24] -_0803E384: +@0803E384: mov r1, r8 ldrb r0, [r1] bl battle_side_get_owner @@ -105895,7 +105895,7 @@ _0803E384: adds r5, r0, r1 ldrb r0, [r5, 0x8] cmp r0, 0 - beq _0803E400 + beq @0803E400 ldr r2, =0x0831c898 ldr r0, =0x020241ea ldrh r1, [r0] @@ -105905,7 +105905,7 @@ _0803E384: adds r0, r2 ldrb r0, [r0, 0x6] cmp r0, 0 - bne _0803E400 + bne @0803E400 mov r3, r8 ldrb r0, [r3] bl battle_side_get_owner @@ -105915,7 +105915,7 @@ _0803E384: lsls r4, 24 lsls r0, 24 cmp r4, r0 - beq _0803E400 + beq @0803E400 ldr r1, =0x02024084 ldrb r2, [r5, 0x9] movs r0, 0x58 @@ -105923,13 +105923,13 @@ _0803E384: adds r0, r1 ldrh r0, [r0, 0x28] cmp r0, 0 - beq _0803E400 + beq @0803E400 ldr r0, =0x0202420c strb r2, [r0] - b _0803E76A + b @0803E76A .align 2, 0 .pool -_0803E400: +@0803E400: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 @@ -105937,9 +105937,9 @@ _0803E400: ldr r5, =0x0202420b mov r8, r5 cmp r0, 0 - bne _0803E412 - b _0803E6E0 -_0803E412: + bne @0803E412 + b @0803E6E0 +@0803E412: ldr r1, =0x02024294 lsls r0, r6, 1 adds r0, r6 @@ -105947,9 +105947,9 @@ _0803E412: adds r0, r1 ldrb r5, [r0, 0x8] cmp r5, 0 - beq _0803E424 - b _0803E630 -_0803E424: + beq @0803E424 + b @0803E630 +@0803E424: ldr r2, =0x0831c898 ldr r0, =0x020241ea ldrh r1, [r0] @@ -105959,12 +105959,12 @@ _0803E424: adds r4, r0, r2 ldrb r0, [r4, 0x1] cmp r0, 0 - bne _0803E440 + bne @0803E440 ldrb r0, [r4, 0x6] cmp r0, 0x10 - bne _0803E440 - b _0803E630 -_0803E440: + bne @0803E440 + b @0803E630 +@0803E440: ldr r3, =0x02024084 ldr r2, =0x0202420b ldrb r6, [r2] @@ -105979,14 +105979,14 @@ _0803E440: ldrb r0, [r0] mov r8, r2 cmp r0, 0x1F - bne _0803E460 - b _0803E630 -_0803E460: + bne @0803E460 + b @0803E630 +@0803E460: ldrb r0, [r4, 0x2] cmp r0, 0xD - beq _0803E468 - b _0803E630 -_0803E468: + beq @0803E468 + b @0803E630 +@0803E468: adds r0, r6, 0 bl battle_side_get_owner lsls r0, 24 @@ -105996,15 +105996,15 @@ _0803E468: ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 - bcs _0803E4E0 + bcs @0803E4E0 adds r4, r1, 0 -_0803E480: +@0803E480: ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r6, r0 - beq _0803E4CE + beq @0803E4CE ldr r0, =0x0202420b ldrb r1, [r0] ldr r0, =0x0202449c @@ -106013,7 +106013,7 @@ _0803E480: ldrb r0, [r1, 0xC] ldrb r1, [r4] cmp r0, r1 - beq _0803E4CE + beq @0803E4CE ldr r1, =0x02024084 ldrb r2, [r4] movs r0, 0x58 @@ -106022,20 +106022,20 @@ _0803E480: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x1F - bne _0803E4CE + bne @0803E4CE adds r0, r2, 0 bl sub_8048728 lsls r0, 24 lsrs r0, 24 ldr r3, [sp] cmp r0, r3 - bcs _0803E4CE + bcs @0803E4CE ldrb r0, [r4] bl sub_8048728 lsls r0, 24 lsrs r0, 24 str r0, [sp] -_0803E4CE: +@0803E4CE: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] @@ -106044,13 +106044,13 @@ _0803E4CE: lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bcc _0803E480 -_0803E4E0: + bcc @0803E480 +@0803E4E0: ldr r5, [sp] cmp r5, 0x4 - beq _0803E4E8 - b _0803E5E2 -_0803E4E8: + beq @0803E4E8 + b @0803E5E2 +@0803E4E8: ldr r2, =0x0831c898 ldr r0, =0x020241ec ldrh r1, [r0] @@ -106061,43 +106061,43 @@ _0803E4E8: ldrb r0, [r0, 0x6] ands r5, r0 cmp r5, 0 - beq _0803E568 + beq @0803E568 ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0803E548 + bne @0803E548 bl GenerateRandomNumber movs r1, 0x1 ands r1, r0 cmp r1, 0 - beq _0803E544 + beq @0803E544 movs r0, 0x1 - b _0803E55A + b @0803E55A .align 2, 0 .pool -_0803E544: +@0803E544: movs r0, 0x3 - b _0803E55A -_0803E548: + b @0803E55A +@0803E548: bl GenerateRandomNumber movs r1, 0x1 ands r1, r0 cmp r1, 0 - beq _0803E558 + beq @0803E558 movs r0, 0 - b _0803E55A -_0803E558: + b @0803E55A +@0803E558: movs r0, 0x2 -_0803E55A: +@0803E55A: bl battle_get_side_with_given_state ldr r1, =0x0202420c strb r0, [r1] - b _0803E578 + b @0803E578 .align 2, 0 .pool -_0803E568: +@0803E568: ldr r2, =0x0202420c ldr r0, =0x0202420b ldrb r0, [r0] @@ -106106,7 +106106,7 @@ _0803E568: adds r0, r1 ldrb r0, [r0, 0xC] strb r0, [r2] -_0803E578: +@0803E578: ldr r7, =0x02024210 ldrb r0, [r7] ldr r1, =0x0832a328 @@ -106118,9 +106118,9 @@ _0803E578: ldr r1, [r1] ands r0, r1 cmp r0, 0 - bne _0803E592 - b _0803E76A -_0803E592: + bne @0803E592 + b @0803E76A +@0803E592: ldr r6, =0x0202420b ldrb r0, [r6] bl battle_side_get_owner @@ -106130,12 +106130,12 @@ _0803E592: lsls r4, 24 lsls r0, 24 cmp r4, r0 - beq _0803E5C4 + beq @0803E5C4 ldrb r0, [r5] - b _0803E758 + b @0803E758 .align 2, 0 .pool -_0803E5C4: +@0803E5C4: ldrb r0, [r6] bl battle_get_per_side_status movs r1, 0x1 @@ -106148,8 +106148,8 @@ _0803E5C4: ldrb r2, [r5] lsls r0, r2, 2 add r0, r8 - b _0803E74E -_0803E5E2: + b @0803E74E +@0803E5E2: ldr r4, =0x02024064 ldr r0, =0x0202407e ldr r3, [sp] @@ -106177,16 +106177,16 @@ _0803E5E2: ldr r1, =0x0202420c ldrb r0, [r4] strb r0, [r1] - b _0803E76A + b @0803E76A .align 2, 0 .pool -_0803E630: +@0803E630: ldr r0, =0x02022fec ldr r0, [r0] movs r4, 0x1 ands r0, r4 cmp r0, 0 - beq _0803E6E0 + beq @0803E6E0 ldr r2, =0x0831c898 ldr r0, =0x020241ec ldrh r1, [r0] @@ -106198,36 +106198,36 @@ _0803E630: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0803E6E0 + beq @0803E6E0 mov r5, r8 ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0803E684 + bne @0803E684 bl GenerateRandomNumber adds r1, r4, 0 ands r1, r0 cmp r1, 0 - beq _0803E680 + beq @0803E680 movs r0, 0x1 - b _0803E696 + b @0803E696 .align 2, 0 .pool -_0803E680: +@0803E680: movs r0, 0x3 - b _0803E696 -_0803E684: + b @0803E696 +@0803E684: bl GenerateRandomNumber adds r1, r4, 0 ands r1, r0 cmp r1, 0 - beq _0803E694 + beq @0803E694 movs r0, 0 - b _0803E696 -_0803E694: + b @0803E696 +@0803E694: movs r0, 0x2 -_0803E696: +@0803E696: bl battle_get_side_with_given_state ldr r1, =0x0202420c strb r0, [r1] @@ -106241,7 +106241,7 @@ _0803E696: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _0803E76A + beq @0803E76A ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner @@ -106251,12 +106251,12 @@ _0803E696: lsls r4, 24 lsls r0, 24 cmp r4, r0 - beq _0803E76A + beq @0803E76A ldrb r0, [r5] - b _0803E758 + b @0803E758 .align 2, 0 .pool -_0803E6E0: +@0803E6E0: ldr r5, =0x0202420c mov r2, r8 ldrb r0, [r2] @@ -106274,7 +106274,7 @@ _0803E6E0: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _0803E76A + beq @0803E76A ldrb r0, [r2] bl battle_side_get_owner adds r4, r0, 0 @@ -106283,12 +106283,12 @@ _0803E6E0: lsls r4, 24 lsls r0, 24 cmp r4, r0 - beq _0803E730 + beq @0803E730 ldrb r0, [r5] - b _0803E758 + b @0803E758 .align 2, 0 .pool -_0803E730: +@0803E730: mov r1, r8 ldrb r0, [r1] bl battle_get_per_side_status @@ -106302,13 +106302,13 @@ _0803E730: ldrb r2, [r5] lsls r0, r2, 2 adds r0, r7 -_0803E74E: +@0803E74E: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _0803E76A + beq @0803E76A adds r0, r2, 0 -_0803E758: +@0803E758: bl battle_get_per_side_status movs r1, 0x2 eors r0, r1 @@ -106316,7 +106316,7 @@ _0803E758: lsrs r0, 24 bl battle_get_side_with_given_state strb r0, [r5] -_0803E76A: +@0803E76A: ldr r0, =0x02022fec ldr r1, [r0] movs r2, 0x80 @@ -106324,7 +106324,7 @@ _0803E76A: ands r1, r2 adds r5, r0, 0 cmp r1, 0 - beq _0803E808 + beq @0803E808 ldr r0, =0x0202433c ldr r4, =0x0202420b ldrb r2, [r4] @@ -106333,26 +106333,26 @@ _0803E76A: ldrb r0, [r1, 0x2] lsls r0, 27 cmp r0, 0 - bge _0803E808 + bge @0803E808 ldr r1, =0x02024084 movs r0, 0x58 muls r0, r2 adds r0, r1 ldrh r0, [r0, 0x28] cmp r0, 0 - bne _0803E7B4 + bne @0803E7B4 ldr r1, =0x02024083 movs r0, 0xC - b _0803E83C + b @0803E83C .align 2, 0 .pool -_0803E7B4: +@0803E7B4: ldr r3, =0x02024230 lsls r0, r2, 2 adds r0, r3 ldr r0, [r0] cmp r0, 0 - beq _0803E7EC + beq @0803E7EC ldr r1, =0x02024332 movs r2, 0 movs r0, 0x4 @@ -106367,20 +106367,20 @@ _0803E7B4: lsls r0, 2 adds r0, r3 str r2, [r0] - b _0803E824 + b @0803E824 .align 2, 0 .pool -_0803E7EC: +@0803E7EC: ldr r1, =0x02024332 movs r0, 0x4 strb r0, [r1, 0x5] ldr r1, =0x02024214 ldr r0, =0x082db6ad str r0, [r1] - b _0803E824 + b @0803E824 .align 2, 0 .pool -_0803E808: +@0803E808: ldr r4, =0x02024214 ldr r3, =0x082d86a8 ldr r2, =0x0831c898 @@ -106395,20 +106395,20 @@ _0803E808: adds r0, r3 ldr r0, [r0] str r0, [r4] -_0803E824: +@0803E824: ldr r0, [r5] movs r1, 0x80 lsls r1, 11 ands r0, r1 cmp r0, 0 - beq _0803E838 + beq @0803E838 ldr r0, =0x0202420b ldrb r0, [r0] bl sub_81A56E8 -_0803E838: +@0803E838: ldr r1, =0x02024083 movs r0, 0xA -_0803E83C: +@0803E83C: strb r0, [r1] add sp, 0x4 pop {r3-r5} @@ -106423,7 +106423,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 @@ -106472,10 +106472,10 @@ bs2_8016374: @ 803E868 ldr r1, =0x03005d10 ldrb r0, [r1, 0x2] cmp r0, 0xFE - bhi _0803E8CE + bhi @0803E8CE adds r0, 0x1 strb r0, [r1, 0x2] -_0803E8CE: +@0803E8CE: pop {r4} pop {r0} bx r0 @@ -106484,7 +106484,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 @@ -106520,7 +106520,7 @@ sub_803E90C: @ 803E90C orrs r3, r0 strh r3, [r5] cmp r3, 0xC - bhi _0803E998 + bhi @0803E998 ldr r2, =0x02024214 ldr r1, =0x082dbd08 ldrh r0, [r5] @@ -106530,41 +106530,41 @@ sub_803E90C: @ 803E90C str r0, [r2] ldr r0, =0x02024083 mov r10, r0 - b _0803EBF6 + b @0803EBF6 .align 2, 0 .pool -_0803E998: +@0803E998: adds r0, r3, 0 subs r0, 0x50 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bhi _0803E9C0 + bhi @0803E9C0 ldr r0, =0x02024214 ldr r1, =0x082dbd54 ldr r1, [r1] str r1, [r0] ldr r1, =0x02024083 mov r10, r1 - b _0803EBF6 + b @0803EBF6 .align 2, 0 .pool -_0803E9C0: +@0803E9C0: ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0803E9E8 + bne @0803E9E8 ldr r0, =0x02024214 ldr r1, =0x082dbd3c ldr r1, [r1] str r1, [r0] ldr r2, =0x02024083 mov r10, r2 - b _0803EBF6 + b @0803EBF6 .align 2, 0 .pool -_0803E9E8: +@0803E9E8: ldr r3, =0x02024474 ldrb r0, [r4] strb r0, [r3, 0x17] @@ -106585,24 +106585,24 @@ _0803E9E8: ldr r2, =0x02024083 mov r10, r2 cmp r0, 0x4 - bls _0803EA14 - b _0803EBDE -_0803EA14: + bls @0803EA14 + b @0803EBDE +@0803EA14: lsls r0, 2 - ldr r1, =_0803EA38 + ldr r1, =@0803EA38 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0803EA38: - .4byte _0803EBDE - .4byte _0803EBDE - .4byte _0803EA4C - .4byte _0803EAE0 - .4byte _0803EBB0 -_0803EA4C: +@0803EA38: + .4byte @0803EBDE + .4byte @0803EBDE + .4byte @0803EA4C + .4byte @0803EAE0 + .4byte @0803EBB0 +@0803EA4C: ldr r5, =0x02024332 movs r0, 0 strb r0, [r5, 0x5] @@ -106617,7 +106617,7 @@ _0803EA4C: ands r0, r1 mov r8, r2 cmp r0, 0 - beq _0803EA98 + beq @0803EA98 movs r0, 0x3E ands r0, r1 ldr r1, =0x02024214 @@ -106626,15 +106626,15 @@ _0803EA4C: ldr r2, =0x02024083 mov r10, r2 cmp r0, 0 - bne _0803EA7E - b _0803EBDE -_0803EA7E: + bne @0803EA7E + b @0803EBDE +@0803EA7E: movs r0, 0x5 strb r0, [r5, 0x5] - b _0803EBDE + b @0803EBDE .align 2, 0 .pool -_0803EA98: +@0803EA98: ldr r0, =0x02024214 mov r9, r0 ldr r6, =0x082dbd3c @@ -106643,7 +106643,7 @@ _0803EA98: mov r4, r8 adds r3, r7, 0 adds r2, r5, 0 -_0803EAA8: +@0803EAA8: ldrb r1, [r4] lsrs r1, 1 ldr r0, [r3] @@ -106664,11 +106664,11 @@ _0803EAA8: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0803EAA8 - b _0803EBDE + beq @0803EAA8 + b @0803EBDE .align 2, 0 .pool -_0803EAE0: +@0803EAE0: ldr r3, =0x02024332 movs r0, 0x4 strb r0, [r3, 0x5] @@ -106686,7 +106686,7 @@ _0803EAE0: lsrs r5, r0, 24 mov r8, r2 cmp r5, 0 - beq _0803EB28 + beq @0803EB28 movs r0, 0x5 strb r0, [r3, 0x5] ldr r2, =0x02024214 @@ -106694,10 +106694,10 @@ _0803EAE0: ldr r6, =0x082dbd3c ldr r0, =0x02024083 mov r10, r0 - b _0803EBDE + b @0803EBDE .align 2, 0 .pool -_0803EB28: +@0803EB28: ldr r3, =0x02022f58 movs r4, 0xFD strb r4, [r3] @@ -106723,11 +106723,11 @@ _0803EB28: ldr r0, =0x02024083 mov r10, r0 cmp r2, 0 - bne _0803EB8C + bne @0803EB8C mov r5, r8 adds r4, r7, 0 adds r2, r3, 0 -_0803EB62: +@0803EB62: ldrb r1, [r5] lsrs r1, 1 ldr r0, [r4] @@ -106748,34 +106748,34 @@ _0803EB62: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0803EB62 -_0803EB8C: + beq @0803EB62 +@0803EB8C: ldrb r0, [r3, 0x2] adds r0, 0xE movs r1, 0 mov r2, r12 strb r0, [r2, 0x10] strb r1, [r2, 0x11] - b _0803EBDE + b @0803EBDE .align 2, 0 .pool -_0803EBB0: +@0803EBB0: ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x1 ands r1, r0 cmp r1, 0 - beq _0803EBCC + beq @0803EBCC ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] - b _0803EBD0 + b @0803EBD0 .align 2, 0 .pool -_0803EBCC: +@0803EBCC: ldr r0, =0x02024332 strb r1, [r0, 0x5] -_0803EBD0: +@0803EBD0: ldr r0, =0x0202420b mov r8, r0 ldr r1, =0x02024214 @@ -106783,7 +106783,7 @@ _0803EBD0: ldr r6, =0x082dbd3c ldr r2, =0x02024083 mov r10, r2 -_0803EBDE: +@0803EBDE: mov r1, r8 ldrb r0, [r1] lsrs r0, 1 @@ -106796,7 +106796,7 @@ _0803EBDE: ldr r0, [r0] mov r2, r9 str r0, [r2] -_0803EBF6: +@0803EBF6: movs r0, 0xA mov r1, r10 strb r0, [r1] @@ -106812,7 +106812,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 @@ -106827,26 +106827,26 @@ sub_803EC20: @ 803EC20 adds r1, r0, r1 ldrh r0, [r1, 0x2E] cmp r0, 0xAF - bne _0803EC54 + bne @0803EC54 ldr r1, =0x02024404 lsls r0, r5, 3 subs r0, r5 lsls r0, 2 adds r0, r1 ldrb r1, [r0, 0x7] - b _0803EC5E + b @0803EC5E .align 2, 0 .pool -_0803EC54: +@0803EC54: ldrh r0, [r1, 0x2E] bl itemid_get_x12 lsls r0, 24 lsrs r1, r0, 24 -_0803EC5E: +@0803EC5E: ldr r0, =0x0202420f strb r5, [r0] cmp r1, 0x25 - bne _0803EC9C + bne @0803EC9C ldr r2, =0x02024208 ldr r1, =0x02024084 movs r0, 0x58 @@ -106864,10 +106864,10 @@ _0803EC5E: movs r1, 0x8 orrs r0, r1 strb r0, [r2, 0x1] - b _0803ED70 + b @0803ED70 .align 2, 0 .pool -_0803EC9C: +@0803EC9C: ldr r0, =0x02024084 mov r10, r0 movs r2, 0x58 @@ -106879,11 +106879,11 @@ _0803EC9C: adds r0, 0x20 ldrb r6, [r0] cmp r6, 0x32 - bne _0803ED5C + bne @0803ED5C bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - beq _0803ED38 + beq @0803ED38 ldr r4, =0x0202449c ldr r1, [r4] adds r1, 0x6C @@ -106918,9 +106918,9 @@ _0803EC9C: movs r1, 0xFF ands r1, r0 cmp r4, r1 - bhi _0803ED0C - b _0803EE12 -_0803ED0C: + bhi @0803ED0C + b @0803EE12 +@0803ED0C: ldr r0, =0x0202420a strb r6, [r0] ldr r0, =0x0202433c @@ -106933,10 +106933,10 @@ _0803ED0C: movs r1, 0x10 orrs r0, r1 strb r0, [r2, 0x1] - b _0803ED70 + b @0803ED70 .align 2, 0 .pool -_0803ED38: +@0803ED38: ldr r0, =0x0202420a strb r6, [r0] ldr r0, =0x0202433c @@ -106949,37 +106949,37 @@ _0803ED38: movs r1, 0x10 orrs r0, r1 strb r0, [r2, 0x1] - b _0803ED70 + b @0803ED70 .align 2, 0 .pool -_0803ED5C: +@0803ED5C: ldr r1, =0x02022fec ldr r2, [r1] ldr r0, =0x043f0100 ands r0, r2 cmp r0, 0 - beq _0803ED80 + beq @0803ED80 movs r0, 0x8 ands r2, r0 cmp r2, 0 - beq _0803ED80 -_0803ED70: + beq @0803ED80 +@0803ED70: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 - b _0803EE12 + b @0803EE12 .align 2, 0 .pool -_0803ED80: +@0803ED80: ldr r0, [r1] movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _0803EE06 + bne @0803EE06 bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - beq _0803EDBC + beq @0803EDBC bl sub_81A9E28 lsls r0, 24 lsrs r1, r0, 24 @@ -106995,10 +106995,10 @@ _0803ED80: eors r1, r2 muls r1, r3 adds r1, r4 - b _0803EDDA + b @0803EDDA .align 2, 0 .pool -_0803EDBC: +@0803EDBC: ldr r3, =0x02024084 movs r2, 0x58 adds r0, r5, 0 @@ -107012,9 +107012,9 @@ _0803EDBC: ldrh r0, [r4, 0x6] ldrh r2, [r1, 0x6] cmp r0, r2 - bcs _0803EE00 + bcs @0803EE00 lsls r0, 7 -_0803EDDA: +@0803EDDA: ldrh r1, [r1, 0x6] bl __divsi3 ldr r1, =0x0202449c @@ -107031,21 +107031,21 @@ _0803EDDA: movs r1, 0xFF ands r1, r0 cmp r4, r1 - bls _0803EE06 -_0803EE00: + bls @0803EE06 +@0803EE00: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 -_0803EE06: +@0803EE06: ldr r0, =0x0202449c ldr r1, [r0] adds r1, 0x6C ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_0803EE12: +@0803EE12: cmp r7, 0 - beq _0803EE24 + beq @0803EE24 ldr r1, =0x02024082 ldr r0, =0x0202406c ldrb r0, [r0] @@ -107053,7 +107053,7 @@ _0803EE12: ldr r1, =0x0202433a movs r0, 0x4 strb r0, [r1] -_0803EE24: +@0803EE24: adds r0, r7, 0 pop {r3-r5} mov r8, r3 @@ -107067,7 +107067,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 @@ -107081,7 +107081,7 @@ sub_803EE48: @ 803EE48 ldr r1, =0x02000002 ands r0, r1 cmp r0, 0 - beq _0803EF0C + beq @0803EF0C ldr r0, =0x0202406c ldrb r1, [r0] strb r1, [r5] @@ -107090,38 +107090,38 @@ sub_803EE48: @ 803EE48 strb r0, [r2] lsls r1, 24 cmp r1, 0 - beq _0803EEE0 + beq @0803EEE0 adds r4, r2, 0 ldr r6, =0x0202421c ldr r5, =0x0202433a -_0803EE7C: +@0803EE7C: ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0803EEBC + bne @0803EEBC ldrb r0, [r4] adds r0, r6 ldrb r0, [r0] cmp r0, 0x3 - bne _0803EECE + bne @0803EECE ldrb r0, [r5] movs r1, 0x2 - b _0803EECA + b @0803EECA .align 2, 0 .pool -_0803EEBC: +@0803EEBC: ldrb r0, [r4] adds r0, r6 ldrb r0, [r0] cmp r0, 0x3 - bne _0803EECE + bne @0803EECE ldrb r0, [r5] movs r1, 0x1 -_0803EECA: +@0803EECA: orrs r0, r1 strb r0, [r5] -_0803EECE: +@0803EECE: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] @@ -107130,8 +107130,8 @@ _0803EECE: lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bcc _0803EE7C -_0803EEE0: + bcc @0803EE7C +@0803EEE0: ldr r2, =0x0202433a ldrb r0, [r2] movs r1, 0x80 @@ -107144,20 +107144,20 @@ _0803EEE0: ldrb r0, [r1] movs r2, 0x8 orrs r0, r2 - b _0803EF96 + b @0803EF96 .align 2, 0 .pool -_0803EF0C: +@0803EF0C: ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0803EF4C + bne @0803EF4C ldrb r0, [r4] bl sub_803EC20 lsls r0, 24 cmp r0, 0 - bne _0803EF98 + bne @0803EF98 ldrb r0, [r4] bl sub_8045868 ldr r1, =0x02024332 @@ -107168,10 +107168,10 @@ _0803EF0C: str r0, [r1] ldr r1, =0x02024083 movs r0, 0xA - b _0803EF96 + b @0803EF96 .align 2, 0 .pool -_0803EF4C: +@0803EF4C: ldr r1, =0x02024084 ldrb r2, [r4] movs r0, 0x58 @@ -107182,7 +107182,7 @@ _0803EF4C: ldr r1, =0x0400e000 ands r0, r1 cmp r0, 0 - beq _0803EF8C + beq @0803EF8C ldr r1, =0x02024332 movs r0, 0x4 strb r0, [r1, 0x5] @@ -107191,18 +107191,18 @@ _0803EF4C: str r0, [r1] ldr r1, =0x02024083 movs r0, 0xA - b _0803EF96 + b @0803EF96 .align 2, 0 .pool -_0803EF8C: +@0803EF8C: ldr r0, =0x0202406c ldrb r0, [r0] strb r0, [r5] ldr r1, =0x0202433a movs r0, 0x6 -_0803EF96: +@0803EF96: strb r0, [r1] -_0803EF98: +@0803EF98: pop {r4-r6} pop {r0} bx r0 @@ -107211,7 +107211,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 @@ -107237,7 +107237,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 @@ -107270,7 +107270,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 @@ -107303,27 +107303,27 @@ sub_803F050: @ 803F050 ldr r1, =0x03005d10 ldrb r0, [r1, 0x1F] cmp r0, 0xFE - bhi _0803F096 + bhi @0803F096 adds r0, 0x1 strb r0, [r1, 0x1F] -_0803F096: +@0803F096: ldr r2, =0x0202449c ldr r0, [r2] adds r1, r0, 0 adds r1, 0x7A ldrb r0, [r1] cmp r0, 0x2 - bhi _0803F0A8 + bhi @0803F0A8 adds r0, 0x1 strb r0, [r1] -_0803F0A8: +@0803F0A8: ldr r0, [r2] adds r3, r0, 0 adds r3, 0x7B ldrb r5, [r3] adds r4, r5, 0 cmp r4, 0x1 - bls _0803F100 + bls @0803F100 ldr r2, =0x0831bce0 adds r0, 0x7A ldrb r1, [r0] @@ -107334,16 +107334,16 @@ _0803F0A8: adds r0, r2 ldrb r0, [r0] cmp r4, r0 - bcs _0803F0FC + bcs @0803F0FC movs r0, 0x1 - b _0803F0FE + b @0803F0FE .align 2, 0 .pool -_0803F0FC: +@0803F0FC: subs r0, r5, r0 -_0803F0FE: +@0803F0FE: strb r0, [r3] -_0803F100: +@0803F100: ldr r1, =0x02024214 ldr r0, =0x082dbd58 ldr r0, [r0, 0x8] @@ -107359,7 +107359,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 @@ -107390,10 +107390,10 @@ sub_803F120: @ 803F120 adds r1, 0x7C ldrb r0, [r1] cmp r0, 0x14 - bls _0803F162 + bls @0803F162 movs r0, 0x14 strb r0, [r1] -_0803F162: +@0803F162: ldr r0, [r3] adds r2, r0, 0 adds r2, 0x7B @@ -107410,28 +107410,28 @@ _0803F162: adds r1, 0x7B ldrb r0, [r1] cmp r0, 0x14 - bls _0803F188 + bls @0803F188 movs r0, 0x14 strb r0, [r1] -_0803F188: +@0803F188: ldr r0, [r3] adds r1, r0, 0 adds r1, 0x79 ldrb r0, [r1] cmp r0, 0x2 - bhi _0803F1C4 + bhi @0803F1C4 adds r0, 0x1 strb r0, [r1] ldr r0, =0x02024332 strb r4, [r0, 0x5] - b _0803F1CA + b @0803F1CA .align 2, 0 .pool -_0803F1C4: +@0803F1C4: ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] -_0803F1CA: +@0803F1CA: ldr r1, =0x02024214 ldr r0, =0x082dbd58 ldr r0, [r0, 0x4] @@ -107447,7 +107447,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 @@ -107472,7 +107472,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 @@ -107515,13 +107515,13 @@ 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 lsrs r1, r0, 24 cmp r1, 0 - bne _0803F2C0 + bne @0803F2C0 ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x4D @@ -107529,7 +107529,7 @@ bsB_exit_by_move: @ 803F2A4 ldr r1, =0x02024083 movs r0, 0xC strb r0, [r1] -_0803F2C0: +@0803F2C0: pop {r0} bx r0 .align 2, 0 @@ -107537,7 +107537,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 @@ -107559,7 +107559,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 @@ -107631,92 +107631,92 @@ 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 movs r0, 0 cmp r1, 0xE - bhi _0803F47A + bhi @0803F47A lsls r0, r1, 2 - ldr r1, =_0803F3E8 + ldr r1, =@0803F3E8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0803F3E8: - .4byte _0803F424 - .4byte _0803F430 - .4byte _0803F43C - .4byte _0803F458 - .4byte _0803F464 - .4byte _0803F458 - .4byte _0803F464 - .4byte _0803F448 - .4byte _0803F464 - .4byte _0803F464 - .4byte _0803F44C - .4byte _0803F464 - .4byte _0803F468 - .4byte _0803F46C - .4byte _0803F470 -_0803F424: +@0803F3E8: + .4byte @0803F424 + .4byte @0803F430 + .4byte @0803F43C + .4byte @0803F458 + .4byte @0803F464 + .4byte @0803F458 + .4byte @0803F464 + .4byte @0803F448 + .4byte @0803F464 + .4byte @0803F464 + .4byte @0803F44C + .4byte @0803F464 + .4byte @0803F468 + .4byte @0803F46C + .4byte @0803F470 +@0803F424: ldr r0, =0x0202420c ldrb r0, [r0] - b _0803F47A + b @0803F47A .align 2, 0 .pool -_0803F430: +@0803F430: ldr r0, =0x0202420b ldrb r0, [r0] - b _0803F47A + b @0803F47A .align 2, 0 .pool -_0803F43C: +@0803F43C: ldr r0, =0x0202420e ldrb r0, [r0] - b _0803F47A + b @0803F47A .align 2, 0 .pool -_0803F448: +@0803F448: movs r0, 0 - b _0803F47A -_0803F44C: + b @0803F47A +@0803F44C: ldr r0, =0x02024474 ldrb r0, [r0, 0x17] - b _0803F47A + b @0803F47A .align 2, 0 .pool -_0803F458: +@0803F458: ldr r0, =0x0202420d ldrb r0, [r0] - b _0803F47A + b @0803F47A .align 2, 0 .pool -_0803F464: +@0803F464: movs r0, 0 - b _0803F472 -_0803F468: + b @0803F472 +@0803F468: movs r0, 0x1 - b _0803F472 -_0803F46C: + b @0803F472 +@0803F46C: movs r0, 0x2 - b _0803F472 -_0803F470: + b @0803F472 +@0803F470: movs r0, 0x3 -_0803F472: +@0803F472: bl battle_get_side_with_given_state lsls r0, 24 lsrs r0, 24 -_0803F47A: +@0803F47A: pop {r1} bx r1 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 @@ -107733,27 +107733,27 @@ sub_803F480: @ 803F480 ldrb r0, [r0] mov r12, r1 cmp r0, 0x2E - bne _0803F532 + bne @0803F532 movs r3, 0 adds r0, r5, 0 muls r0, r4 adds r1, 0xC adds r1, r0, r1 - b _0803F4BC + b @0803F4BC .align 2, 0 .pool -_0803F4B4: +@0803F4B4: adds r1, 0x2 adds r3, 0x1 cmp r3, 0x3 - bgt _0803F4C2 -_0803F4BC: + bgt @0803F4C2 +@0803F4BC: ldrh r0, [r1] cmp r0, r2 - bne _0803F4B4 -_0803F4C2: + bne @0803F4B4 +@0803F4C2: cmp r3, 0x4 - beq _0803F532 + beq @0803F532 movs r7, 0x58 adds r2, r5, 0 muls r2, r7 @@ -107763,10 +107763,10 @@ _0803F4C2: adds r1, r0, r6 ldrb r0, [r1] cmp r0, 0 - beq _0803F4DE + beq @0803F4DE subs r0, 0x1 strb r0, [r1] -_0803F4DE: +@0803F4DE: mov r0, r12 adds r0, 0x50 adds r0, r2, r0 @@ -107775,7 +107775,7 @@ _0803F4DE: lsls r1, 14 ands r0, r1 cmp r0, 0 - bne _0803F532 + bne @0803F532 ldr r1, =0x020242bc lsls r0, r5, 3 subs r0, r5 @@ -107789,7 +107789,7 @@ _0803F4DE: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _0803F532 + bne @0803F532 ldr r4, =0x02024064 strb r5, [r4] adds r1, r3, 0 @@ -107807,7 +107807,7 @@ _0803F4DE: bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_0803F532: +@0803F532: add sp, 0x4 pop {r4-r7} pop {r0} @@ -107817,7 +107817,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 @@ -107837,14 +107837,14 @@ sub_803F548: @ 803F548 ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - bge _0803F5F0 + bge @0803F5F0 ldr r1, =0x02024084 movs r0, 0x58 adds r7, r5, 0 muls r7, r0 adds r1, 0xC mov r10, r1 -_0803F57E: +@0803F57E: lsls r0, r4, 24 lsrs r0, 24 bl battle_side_get_owner @@ -107852,7 +107852,7 @@ _0803F57E: lsrs r0, 24 adds r6, r4, 0x1 cmp r9, r0 - beq _0803F5E6 + beq @0803F5E6 ldr r0, =0x02024084 movs r3, 0x58 adds r1, r4, 0 @@ -107862,7 +107862,7 @@ _0803F57E: ldrb r1, [r1] adds r4, r0, 0 cmp r1, 0x2E - bne _0803F5E6 + bne @0803F5E6 movs r2, 0 adds r0, r5, 0 muls r0, r3 @@ -107873,21 +107873,21 @@ _0803F57E: movs r1, 0x8F lsls r1, 1 cmp r0, r1 - beq _0803F5CE + beq @0803F5CE adds r3, r1, 0 mov r0, r10 adds r1, r7, r0 -_0803F5C0: +@0803F5C0: adds r1, 0x2 adds r2, 0x1 cmp r2, 0x3 - bgt _0803F5CE + bgt @0803F5CE ldrh r0, [r1] cmp r0, r3 - bne _0803F5C0 -_0803F5CE: + bne @0803F5C0 +@0803F5CE: cmp r2, 0x4 - beq _0803F5E6 + beq @0803F5E6 mov r8, r2 adds r1, r2, r7 adds r0, r4, 0 @@ -107895,19 +107895,19 @@ _0803F5CE: adds r1, r0 ldrb r0, [r1] cmp r0, 0 - beq _0803F5E6 + beq @0803F5E6 subs r0, 0x1 strb r0, [r1] -_0803F5E6: +@0803F5E6: adds r4, r6, 0 ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - blt _0803F57E -_0803F5F0: + blt @0803F57E +@0803F5F0: mov r1, r8 cmp r1, 0x4 - beq _0803F658 + beq @0803F658 ldr r6, =0x02024084 movs r3, 0x58 adds r0, r5, 0 @@ -107920,7 +107920,7 @@ _0803F5F0: lsls r1, 14 ands r0, r1 cmp r0, 0 - bne _0803F658 + bne @0803F658 ldr r1, =0x020242bc lsls r0, r5, 3 subs r0, r5 @@ -107935,7 +107935,7 @@ _0803F5F0: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _0803F658 + bne @0803F658 ldr r4, =0x02024064 strb r5, [r4] mov r1, r8 @@ -107955,7 +107955,7 @@ _0803F5F0: bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_0803F658: +@0803F658: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -107969,7 +107969,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 @@ -107984,7 +107984,7 @@ sub_803F67C: @ 803F67C mov r8, r0 ldrb r0, [r0] cmp r1, r0 - bge _0803F6FE + bge @0803F6FE ldr r7, =0x02024084 movs r2, 0x58 mov r12, r2 @@ -107995,7 +107995,7 @@ sub_803F67C: @ 803F67C adds r2, r5, r0 mov r10, r2 mov r9, r5 -_0803F6AE: +@0803F6AE: mov r0, r12 muls r0, r1 adds r0, r7 @@ -108003,45 +108003,45 @@ _0803F6AE: ldrb r0, [r0] adds r4, r1, 0x1 cmp r0, 0x2E - bne _0803F6F4 + bne @0803F6F4 cmp r1, r3 - beq _0803F6F4 + beq @0803F6F4 movs r2, 0 mov r1, r10 ldrh r0, [r1] cmp r0, 0xC3 - beq _0803F6DE + beq @0803F6DE ldr r1, =0x02024090 add r1, r9 -_0803F6D0: +@0803F6D0: adds r1, 0x2 adds r2, 0x1 cmp r2, 0x3 - bgt _0803F6DE + bgt @0803F6DE ldrh r0, [r1] cmp r0, 0xC3 - bne _0803F6D0 -_0803F6DE: + bne @0803F6D0 +@0803F6DE: cmp r2, 0x4 - beq _0803F6F4 + beq @0803F6F4 adds r6, r2, 0 adds r0, r6, r5 ldr r2, =0x020240a8 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0 - beq _0803F6F4 + beq @0803F6F4 subs r0, 0x1 strb r0, [r1] -_0803F6F4: +@0803F6F4: adds r1, r4, 0 mov r0, r8 ldrb r0, [r0] cmp r1, r0 - blt _0803F6AE -_0803F6FE: + blt @0803F6AE +@0803F6FE: cmp r6, 0x4 - beq _0803F762 + beq @0803F762 ldr r7, =0x02024084 movs r5, 0x58 adds r0, r3, 0 @@ -108054,7 +108054,7 @@ _0803F6FE: lsls r1, 14 ands r0, r1 cmp r0, 0 - bne _0803F762 + bne @0803F762 ldr r1, =0x020242bc lsls r0, r3, 3 subs r0, r3 @@ -108068,7 +108068,7 @@ _0803F6FE: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _0803F762 + bne @0803F762 ldr r4, =0x02024064 strb r3, [r4] adds r1, r6, 0 @@ -108088,7 +108088,7 @@ _0803F6FE: bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_0803F762: +@0803F762: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -108102,22 +108102,22 @@ _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] movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _0803F7D0 + beq @0803F7D0 movs r2, 0 ldr r4, =0x0202406c ldrb r0, [r4] cmp r2, r0 - bge _0803F7EE + bge @0803F7EE ldr r3, =0x02024068 ldr r5, =0x0832a328 -_0803F7AC: +@0803F7AC: ldm r5!, {r1} lsls r1, 28 ldr r0, [r3] @@ -108126,19 +108126,19 @@ _0803F7AC: adds r2, 0x1 ldrb r0, [r4] cmp r2, r0 - blt _0803F7AC - b _0803F7EE + blt @0803F7AC + b @0803F7EE .align 2, 0 .pool -_0803F7D0: +@0803F7D0: movs r2, 0 ldr r4, =0x0202406c ldrb r0, [r4] cmp r2, r0 - bge _0803F7EE + bge @0803F7EE ldr r3, =0x02024068 ldr r5, =0x0832a328 -_0803F7DE: +@0803F7DE: ldr r0, [r3] ldm r5!, {r1} orrs r0, r1 @@ -108146,8 +108146,8 @@ _0803F7DE: adds r2, 0x1 ldrb r0, [r4] cmp r2, r0 - blt _0803F7DE -_0803F7EE: + blt @0803F7DE +@0803F7EE: pop {r4,r5} pop {r0} bx r0 @@ -108156,7 +108156,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 @@ -108165,7 +108165,7 @@ dp01_battle_side_mark_buffer_for_execution: @ 803F800 movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _0803F834 + beq @0803F834 ldr r2, =0x02024068 ldr r1, =0x0832a328 lsls r0, r3, 2 @@ -108175,10 +108175,10 @@ dp01_battle_side_mark_buffer_for_execution: @ 803F800 ldr r0, [r2] orrs r0, r1 str r0, [r2] - b _0803F844 + b @0803F844 .align 2, 0 .pool -_0803F834: +@0803F834: ldr r2, =0x02024068 ldr r1, =0x0832a328 lsls r0, r3, 2 @@ -108187,7 +108187,7 @@ _0803F834: ldr r0, [r0] orrs r1, r0 str r1, [r2] -_0803F844: +@0803F844: pop {r0} bx r0 .align 2, 0 @@ -108195,7 +108195,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 @@ -108204,10 +108204,10 @@ sub_803F850: @ 803F850 ldr r1, =0x0832a328 lsls r0, r7, 2 adds r6, r0, r1 - b _0803F87A + b @0803F87A .align 2, 0 .pool -_0803F86C: +@0803F86C: lsls r0, r4, 2 ldr r1, [r6] lsls r1, r0 @@ -108215,12 +108215,12 @@ _0803F86C: orrs r0, r1 str r0, [r5] adds r4, 0x1 -_0803F87A: +@0803F87A: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r4, r0 - blt _0803F86C + blt @0803F86C ldr r2, =0x02024068 movs r1, 0x80 lsls r1, 21 @@ -108236,7 +108236,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 @@ -108281,7 +108281,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 @@ -108290,47 +108290,47 @@ sub_803F90C: @ 803F90C ldrb r0, [r1] lsrs r0, 7 cmp r0, 0 - bne _0803F952 + bne @0803F952 ldrb r2, [r1, 0x1] lsls r0, r2, 30 cmp r0, 0 - blt _0803F952 + blt @0803F952 lsls r0, r2, 26 cmp r0, 0 - blt _0803F952 + blt @0803F952 lsls r0, r2, 25 cmp r0, 0 - blt _0803F952 + blt @0803F952 lsrs r0, r2, 7 cmp r0, 0 - bne _0803F952 + bne @0803F952 ldrb r1, [r1, 0x2] lsls r0, r1, 31 cmp r0, 0 - bne _0803F952 + bne @0803F952 lsls r0, r1, 30 cmp r0, 0 - blt _0803F952 + blt @0803F952 lsls r0, r1, 29 cmp r0, 0 - blt _0803F952 + blt @0803F952 lsls r0, r2, 31 cmp r0, 0 - beq _0803F95C -_0803F952: + beq @0803F95C +@0803F952: movs r0, 0x1 - b _0803F95E + b @0803F95E .align 2, 0 .pool -_0803F95C: +@0803F95C: movs r0, 0 -_0803F95E: +@0803F95E: pop {r1} bx r1 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 @@ -108350,7 +108350,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 @@ -108361,11 +108361,11 @@ sub_803F988: @ 803F988 ldrb r2, [r0] adds r6, r0, 0 cmp r1, r2 - bge _0803F9B6 + bge @0803F9B6 ldr r5, =0x0832a328 adds r4, r2, 0 ldr r2, =0x0202406e -_0803F9A4: +@0803F9A4: ldrh r0, [r2] lsls r0, 2 adds r0, r5 @@ -108374,16 +108374,16 @@ _0803F9A4: adds r2, 0x4 adds r1, 0x2 cmp r1, r4 - blt _0803F9A4 -_0803F9B6: + blt @0803F9A4 +@0803F9B6: movs r1, 0x1 adds r2, r6, 0 ldrb r0, [r2] cmp r1, r0 - bge _0803F9D6 + bge @0803F9D6 ldr r5, =0x020243fe movs r4, 0x2 -_0803F9C4: +@0803F9C4: adds r0, r1, 0 ands r0, r4 asrs r0, 1 @@ -108392,8 +108392,8 @@ _0803F9C4: adds r1, 0x2 ldrb r0, [r2] cmp r1, r0 - blt _0803F9C4 -_0803F9D6: + blt @0803F9C4 +@0803F9D6: pop {r4-r6} pop {r0} bx r0 @@ -108402,7 +108402,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} @@ -108414,7 +108414,7 @@ sub_803F9EC: @ 803F9EC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0803FA50 + bne @0803FA50 movs r0, 0x2 ands r0, r5 lsls r0, 24 @@ -108428,34 +108428,34 @@ sub_803F9EC: @ 803F9EC ldrb r2, [r0] mov r8, r1 cmp r4, r2 - bge _0803FA4A + bge @0803FA4A ldr r0, =0x02024210 ldrb r7, [r0] ldr r1, =0x0832a328 adds r6, r2, 0 ldr r3, =0x0202406e adds r2, r1, 0 -_0803FA2E: +@0803FA2E: ldr r0, [r2] ands r0, r7 cmp r0, 0 - bne _0803FA40 + bne @0803FA40 ldrh r0, [r3] lsls r0, 2 adds r0, r1 ldr r0, [r0] orrs r4, r0 -_0803FA40: +@0803FA40: adds r3, 0x4 adds r2, 0x8 adds r5, 0x2 cmp r5, r6 - blt _0803FA2E -_0803FA4A: + blt @0803FA2E +@0803FA4A: mov r0, r12 add r0, r8 strb r4, [r0] -_0803FA50: +@0803FA50: pop {r3} mov r8, r3 pop {r4-r7} @@ -108466,7 +108466,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 @@ -108475,16 +108475,16 @@ sub_803FA70: @ 803FA70 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0803FA8C + bne @0803FA8C adds r0, r4, 0 bl sub_803F9EC - b _0803FAC2 -_0803FA8C: + b @0803FAC2 +@0803FA8C: movs r3, 0x1 ldr r5, =0x0202406c ldrb r0, [r5] cmp r3, r0 - bge _0803FAC2 + bge @0803FAC2 ldr r0, =0x020243fe mov r12, r0 movs r7, 0x2 @@ -108492,7 +108492,7 @@ _0803FA8C: ldr r1, =0x0202406e lsls r0, r4, 1 adds r4, r0, r1 -_0803FAA4: +@0803FAA4: adds r2, r3, 0 ands r2, r7 asrs r2, 1 @@ -108507,8 +108507,8 @@ _0803FAA4: adds r3, 0x1 ldrb r0, [r5] cmp r3, r0 - blt _0803FAA4 -_0803FAC2: + blt @0803FAA4 +@0803FAC2: pop {r4-r7} pop {r0} bx r0 @@ -108517,7 +108517,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] @@ -108539,7 +108539,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] @@ -108560,7 +108560,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] @@ -108581,7 +108581,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} @@ -108616,9 +108616,9 @@ sub_803FB4C: @ 803FB4C adds r7, r3, 0 adds r3, r1, 0 cmp r0, r5 - bne _0803FC06 + bne @0803FC06 cmp r5, 0 - beq _0803FC06 + beq @0803FC06 ldr r0, =0x02024474 strb r4, [r0, 0x17] ldr r0, =0x020241ea @@ -108629,7 +108629,7 @@ sub_803FB4C: @ 803FB4C lsls r1, 10 ands r0, r1 cmp r0, 0 - beq _0803FBF8 + beq @0803FBF8 ldr r1, =0x02024230 ldrb r0, [r7] lsls r0, 2 @@ -108644,10 +108644,10 @@ sub_803FB4C: @ 803FB4C movs r2, 0x10 orrs r0, r2 strb r0, [r1, 0x2] - b _0803FC06 + b @0803FC06 .align 2, 0 .pool -_0803FBF8: +@0803FBF8: ldr r0, =0x02024220 ldrb r1, [r7] lsls r1, 2 @@ -108655,16 +108655,16 @@ _0803FBF8: ldr r0, =0x082dae1f str r0, [r1] movs r6, 0x1 -_0803FC06: +@0803FC06: ldr r1, =0x02024248 ldrb r2, [r7] lsls r0, r2, 1 adds r0, r1 ldrh r0, [r0] cmp r5, r0 - bne _0803FC90 + bne @0803FC90 cmp r5, 0xA5 - beq _0803FC90 + beq @0803FC90 ldr r1, =0x02024084 movs r0, 0x58 muls r0, r2 @@ -108672,7 +108672,7 @@ _0803FC06: adds r0, r1 ldr r0, [r0] cmp r0, 0 - bge _0803FC90 + bge @0803FC90 adds r0, r2, 0 bl b_cancel_multi_turn_move_maybe ldr r0, =0x02022fec @@ -108681,7 +108681,7 @@ _0803FC06: lsls r1, 10 ands r0, r1 cmp r0, 0 - beq _0803FC7C + beq @0803FC7C ldr r1, =0x02024230 ldrb r0, [r7] lsls r0, 2 @@ -108696,10 +108696,10 @@ _0803FC06: movs r2, 0x10 orrs r0, r2 strb r0, [r1, 0x2] - b _0803FC8E + b @0803FC8E .align 2, 0 .pool -_0803FC7C: +@0803FC7C: ldr r1, =0x02024220 ldrb r0, [r7] lsls r0, 2 @@ -108709,9 +108709,9 @@ _0803FC7C: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_0803FC8E: +@0803FC8E: ldr r3, =0x020242bc -_0803FC90: +@0803FC90: ldrb r0, [r7] lsls r1, r0, 3 subs r1, r0 @@ -108720,7 +108720,7 @@ _0803FC90: ldrb r0, [r1, 0x13] lsls r0, 28 cmp r0, 0 - beq _0803FD1A + beq @0803FD1A ldr r0, =0x0831c898 lsls r1, r5, 1 adds r1, r5 @@ -108728,7 +108728,7 @@ _0803FC90: adds r1, r0 ldrb r0, [r1, 0x1] cmp r0, 0 - bne _0803FD1A + bne @0803FD1A ldr r0, =0x020241ea strh r5, [r0] ldr r0, =0x02022fec @@ -108737,7 +108737,7 @@ _0803FC90: lsls r1, 10 ands r0, r1 cmp r0, 0 - beq _0803FD08 + beq @0803FD08 ldr r1, =0x02024230 ldrb r0, [r7] lsls r0, 2 @@ -108752,10 +108752,10 @@ _0803FC90: movs r2, 0x10 orrs r0, r2 strb r0, [r1, 0x2] - b _0803FD1A + b @0803FD1A .align 2, 0 .pool -_0803FD08: +@0803FD08: ldr r1, =0x02024220 ldrb r0, [r7] lsls r0, 2 @@ -108765,14 +108765,14 @@ _0803FD08: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_0803FD1A: +@0803FD1A: ldr r4, =0x02024064 ldrb r0, [r4] adds r1, r5, 0 bl sub_8040130 lsls r0, 24 cmp r0, 0 - beq _0803FD8E + beq @0803FD8E ldr r0, =0x020241ea strh r5, [r0] ldr r0, =0x02022fec @@ -108781,7 +108781,7 @@ _0803FD1A: lsls r1, 10 ands r0, r1 cmp r0, 0 - beq _0803FD7C + beq @0803FD7C ldr r1, =0x02024230 ldrb r0, [r4] lsls r0, 2 @@ -108796,10 +108796,10 @@ _0803FD1A: movs r2, 0x10 orrs r0, r2 strb r0, [r1, 0x2] - b _0803FD8E + b @0803FD8E .align 2, 0 .pool -_0803FD7C: +@0803FD7C: ldr r1, =0x02024220 ldrb r0, [r4] lsls r0, 2 @@ -108809,7 +108809,7 @@ _0803FD7C: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_0803FD8E: +@0803FD8E: ldr r1, =0x02024084 ldr r0, =0x02024064 ldrb r2, [r0] @@ -108818,22 +108818,22 @@ _0803FD8E: adds r1, r0, r1 ldrh r0, [r1, 0x2E] cmp r0, 0xAF - bne _0803FDC4 + bne @0803FDC4 ldr r1, =0x02024404 lsls r0, r2, 3 subs r0, r2 lsls r0, 2 adds r0, r1 ldrb r4, [r0, 0x7] - b _0803FDCE + b @0803FDCE .align 2, 0 .pool -_0803FDC4: +@0803FDC4: ldrh r0, [r1, 0x2E] bl itemid_get_x12 lsls r0, 24 lsrs r4, r0, 24 -_0803FDCE: +@0803FDCE: ldr r2, =0x0202420f ldr r1, =0x02024064 ldrb r0, [r1] @@ -108842,17 +108842,17 @@ _0803FDCE: mov r12, r0 adds r7, r1, 0 cmp r4, 0x1D - bne _0803FE58 + bne @0803FE58 mov r0, r8 ldrh r1, [r0] adds r2, r1, 0 cmp r2, 0 - beq _0803FE58 + beq @0803FE58 ldr r0, =0x0000ffff cmp r2, r0 - beq _0803FE58 + beq @0803FE58 cmp r2, r5 - beq _0803FE58 + beq @0803FE58 ldr r0, =0x020241ea strh r1, [r0] ldr r2, =0x02024208 @@ -108869,7 +108869,7 @@ _0803FDCE: ands r1, r0 ldrb r2, [r7] cmp r1, 0 - beq _0803FE48 + beq @0803FE48 ldr r0, =0x0202433c lsls r1, r2, 4 adds r1, r0 @@ -108877,10 +108877,10 @@ _0803FDCE: movs r2, 0x10 orrs r0, r2 strb r0, [r1, 0x2] - b _0803FE58 + b @0803FE58 .align 2, 0 .pool -_0803FE48: +@0803FE48: ldr r1, =0x02024220 lsls r0, r2, 2 adds r0, r1 @@ -108889,7 +108889,7 @@ _0803FE48: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_0803FE58: +@0803FE58: ldr r0, =0x02023864 ldrb r3, [r7] lsls r1, r3, 9 @@ -108904,14 +108904,14 @@ _0803FE58: adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _0803FEB8 + bne @0803FEB8 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 10 ands r0, r1 cmp r0, 0 - beq _0803FEA8 + beq @0803FEA8 ldr r0, =0x0202433c lsls r1, r3, 4 adds r1, r0 @@ -108919,10 +108919,10 @@ _0803FE58: movs r2, 0x10 orrs r0, r2 strb r0, [r1, 0x2] - b _0803FEB8 + b @0803FEB8 .align 2, 0 .pool -_0803FEA8: +@0803FEA8: ldr r1, =0x02024220 lsls r0, r3, 2 adds r0, r1 @@ -108931,7 +108931,7 @@ _0803FEA8: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_0803FEB8: +@0803FEB8: adds r0, r6, 0 pop {r3} mov r8, r3 @@ -108943,7 +108943,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 @@ -108968,7 +108968,7 @@ sub_803FECC: @ 803FECC adds r1, r0, r1 ldrh r0, [r1, 0x2E] cmp r0, 0xAF - bne _0803FF1C + bne @0803FF1C ldr r2, =0x02024404 lsls r1, r7, 3 subs r0, r1, r7 @@ -108976,10 +108976,10 @@ sub_803FECC: @ 803FECC adds r0, r2 ldrb r0, [r0, 0x7] str r0, [sp] - b _0803FF2E + b @0803FF2E .align 2, 0 .pool -_0803FF1C: +@0803FF1C: ldrh r0, [r1, 0x2E] str r3, [sp, 0x14] bl itemid_get_x12 @@ -108988,7 +108988,7 @@ _0803FF1C: str r0, [sp] lsls r1, r7, 3 ldr r3, [sp, 0x14] -_0803FF2E: +@0803FF2E: ldr r0, =0x0202420f strb r7, [r0] movs r0, 0 @@ -109011,19 +109011,19 @@ _0803FF2E: lsls r0, 2 mov r8, r0 ldr r6, =0x0832a328 -_0803FF5A: +@0803FF5A: ldrh r0, [r5] cmp r0, 0 - bne _0803FF70 + bne @0803FF70 movs r0, 0x1 ands r0, r3 cmp r0, 0 - beq _0803FF70 + beq @0803FF70 ldr r0, [r6] orrs r4, r0 lsls r0, r4, 24 lsrs r4, r0, 24 -_0803FF70: +@0803FF70: ldr r0, [sp, 0x8] add r0, r9 mov r1, r10 @@ -109031,31 +109031,31 @@ _0803FF70: adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _0803FF90 + bne @0803FF90 movs r0, 0x2 ands r0, r3 cmp r0, 0 - beq _0803FF90 + beq @0803FF90 ldr r0, [r6] orrs r4, r0 lsls r0, r4, 24 lsrs r4, r0, 24 -_0803FF90: +@0803FF90: mov r1, r8 add r1, r12 ldrh r0, [r5] ldrh r1, [r1, 0x4] cmp r0, r1 - bne _0803FFAC + bne @0803FFAC movs r0, 0x4 ands r0, r3 cmp r0, 0 - beq _0803FFAC + beq @0803FFAC ldr r0, [r6] orrs r4, r0 lsls r0, r4, 24 lsrs r4, r0, 24 -_0803FFAC: +@0803FFAC: movs r0, 0x58 adds r2, r7, 0 muls r2, r0 @@ -109074,32 +109074,32 @@ _0803FFAC: ldr r0, [sp, 0x18] ldrh r0, [r0] cmp r12, r0 - bne _0803FFEE + bne @0803FFEE movs r0, 0x8 ands r0, r3 cmp r0, 0 - beq _0803FFEE + beq @0803FFEE mov r0, r10 adds r0, 0x50 adds r0, r2, r0 ldr r0, [r0] cmp r0, 0 - bge _0803FFEE + bge @0803FFEE ldr r0, [r6] orrs r4, r0 lsls r0, r4, 24 lsrs r4, r0, 24 -_0803FFEE: +@0803FFEE: ldr r0, =0x020242bc add r0, r8 ldrb r0, [r0, 0x13] lsls r0, 28 cmp r0, 0 - beq _0804001C + beq @0804001C movs r0, 0x10 ands r0, r3 cmp r0, 0 - beq _0804001C + beq @0804001C ldr r2, =0x0831c898 ldrh r1, [r5] lsls r0, r1, 1 @@ -109108,12 +109108,12 @@ _0803FFEE: adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0 - bne _0804001C + bne @0804001C ldr r0, [r6] orrs r4, r0 lsls r0, r4, 24 lsrs r4, r0, 24 -_0804001C: +@0804001C: ldrh r1, [r5] adds r0, r7, 0 str r3, [sp, 0x14] @@ -109121,16 +109121,16 @@ _0804001C: lsls r0, 24 ldr r3, [sp, 0x14] cmp r0, 0 - beq _0804003E + beq @0804003E movs r0, 0x20 ands r0, r3 cmp r0, 0 - beq _0804003E + beq @0804003E ldr r0, [r6] orrs r4, r0 lsls r0, r4, 24 lsrs r4, r0, 24 -_0804003E: +@0804003E: ldr r1, =0x020242bc mov r0, r8 adds r2, r0, r1 @@ -109138,34 +109138,34 @@ _0804003E: lsls r0, 28 mov r12, r1 cmp r0, 0 - beq _0804005E + beq @0804005E ldrh r0, [r2, 0x6] ldrh r1, [r5] cmp r0, r1 - beq _0804005E + beq @0804005E ldr r0, [r6] orrs r4, r0 lsls r0, r4, 24 lsrs r4, r0, 24 -_0804005E: +@0804005E: ldr r2, [sp] cmp r2, 0x1D - bne _08040080 + bne @08040080 ldr r0, [sp, 0x4] ldrh r1, [r0] cmp r1, 0 - beq _08040080 + beq @08040080 ldr r0, =0x0000ffff cmp r1, r0 - beq _08040080 + beq @08040080 ldrh r2, [r5] cmp r1, r2 - beq _08040080 + beq @08040080 ldr r0, [r6] orrs r4, r0 lsls r0, r4, 24 lsrs r4, r0, 24 -_08040080: +@08040080: adds r6, 0x4 adds r5, 0x2 ldr r0, [sp, 0x10] @@ -109175,9 +109175,9 @@ _08040080: add r9, r1 mov r2, r9 cmp r2, 0x3 - bgt _08040096 - b _0803FF5A -_08040096: + bgt @08040096 + b @0803FF5A +@08040096: adds r0, r4, 0 add sp, 0x1C pop {r3-r5} @@ -109192,7 +109192,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] @@ -109202,7 +109202,7 @@ sub_80400C8: @ 80400C8 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0xF - bne _0804010C + bne @0804010C ldr r0, =0x0202433c ldrb r1, [r4] lsls r1, 4 @@ -109217,10 +109217,10 @@ sub_80400C8: @ 80400C8 adds r0, r1 ldr r1, =0x082db072 str r1, [r0] - b _0804011E + b @0804011E .align 2, 0 .pool -_0804010C: +@0804010C: ldr r0, =0x0202433c ldrb r1, [r4] lsls r1, 4 @@ -109230,12 +109230,12 @@ _0804010C: negs r0, r0 ands r0, r2 strb r0, [r1] -_0804011E: +@0804011E: movs r0, 0 cmp r3, 0xF - bne _08040126 + bne @08040126 movs r0, 0x1 -_08040126: +@08040126: pop {r4} pop {r1} bx r1 @@ -109244,7 +109244,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 @@ -109262,10 +109262,10 @@ sub_8040130: @ 8040130 ldr r0, =0x0202406c ldrb r0, [r0] cmp r6, r0 - bge _080401B4 + bge @080401B4 ldr r7, =0x02024090 mov r8, r7 -_0804015A: +@0804015A: lsls r0, r4, 24 lsrs r0, 24 bl battle_side_get_owner @@ -109273,7 +109273,7 @@ _0804015A: lsrs r0, 24 adds r3, r4, 0x1 cmp r9, r0 - beq _080401AA + beq @080401AA ldr r1, =0x020242ac lsls r0, r4, 2 adds r0, r1 @@ -109282,7 +109282,7 @@ _0804015A: lsls r1, 6 ands r0, r1 cmp r0, 0 - beq _080401AA + beq @080401AA movs r2, 0 movs r0, 0x58 adds r1, r4, 0 @@ -109290,30 +109290,30 @@ _0804015A: adds r0, r1, r7 ldrh r0, [r0] cmp r5, r0 - beq _080401A0 + beq @080401A0 mov r4, r8 adds r0, r1, r4 -_08040192: +@08040192: adds r0, 0x2 adds r2, 0x1 cmp r2, 0x3 - bgt _080401AA + bgt @080401AA ldrh r1, [r0] cmp r5, r1 - bne _08040192 -_080401A0: + bne @08040192 +@080401A0: cmp r2, 0x3 - bgt _080401AA + bgt @080401AA adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_080401AA: +@080401AA: adds r4, r3, 0 ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - blt _0804015A -_080401B4: + blt @0804015A +@080401B4: adds r0, r6, 0 pop {r3,r4} mov r8, r3 @@ -109326,7 +109326,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 @@ -109345,23 +109345,23 @@ sub_80401D0: @ 80401D0 ldr r3, =0x0202449c mov r12, r3 cmp r9, r4 - bcs _08040224 + bcs @08040224 ldr r2, =0x02024210 ldrb r1, [r2] ldr r5, =0x0832a328 ldr r0, [r5] ands r1, r0 cmp r1, 0 - beq _08040224 + beq @08040224 adds r3, r6, 0 -_08040206: +@08040206: ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] lsls r0, 24 lsrs r0, 24 cmp r0, r4 - bcs _08040224 + bcs @08040224 ldrb r0, [r2] ldrb r1, [r6] lsls r1, 2 @@ -109369,30 +109369,30 @@ _08040206: ldr r1, [r1] ands r0, r1 cmp r0, 0 - bne _08040206 -_08040224: + bne @08040206 +@08040224: movs r0, 0 strb r0, [r7] mov r0, r10 ldrb r4, [r0] cmp r4, 0 - beq _0804025E + beq @0804025E ldr r2, =0x02024210 ldrb r1, [r2] ldr r5, =0x0832a328 ldr r0, [r5] ands r1, r0 cmp r1, 0 - beq _0804025E + beq @0804025E adds r3, r7, 0 -_08040240: +@08040240: ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] lsls r0, 24 lsrs r0, 24 cmp r0, r4 - bcs _0804025E + bcs @0804025E ldrb r0, [r2] ldrb r1, [r7] lsls r1, 2 @@ -109400,67 +109400,67 @@ _08040240: ldr r1, [r1] ands r0, r1 cmp r0, 0 - bne _08040240 -_0804025E: + bne @08040240 +@0804025E: mov r1, r12 ldr r0, [r1] ldrb r0, [r0, 0x3] cmp r0, 0xA - bls _0804026A - b _080408F6 -_0804026A: + bls @0804026A + b @080408F6 +@0804026A: lsls r0, 2 - ldr r1, =_08040290 + ldr r1, =@08040290 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08040290: - .4byte _080402BC - .4byte _08040342 - .4byte _08040408 - .4byte _080404D4 - .4byte _080405B0 - .4byte _08040668 - .4byte _0804071C - .4byte _080407A0 - .4byte _08040810 - .4byte _08040868 - .4byte _080408EC -_080402BC: +@08040290: + .4byte @080402BC + .4byte @08040342 + .4byte @08040408 + .4byte @080404D4 + .4byte @080405B0 + .4byte @08040668 + .4byte @0804071C + .4byte @080407A0 + .4byte @08040810 + .4byte @08040868 + .4byte @080408EC +@080402BC: movs r5, 0 ldr r1, =0x0202406c mov r10, r1 ldrb r2, [r1] cmp r5, r2 - bge _080402D6 + bge @080402D6 ldr r2, =0x0202407e -_080402CA: +@080402CA: adds r0, r5, r2 strb r5, [r0] adds r5, 0x1 ldrb r3, [r1] cmp r5, r3 - blt _080402CA -_080402D6: + blt @080402CA +@080402D6: movs r5, 0 - b _08040324 + b @08040324 .align 2, 0 .pool -_080402E4: +@080402E4: adds r4, r5, 0x1 adds r6, r4, 0 ldrb r1, [r1] cmp r6, r1 - bge _08040322 + bge @08040322 ldr r7, =0x0202407e ldr r0, =0x0202406c mov r10, r0 lsls r1, r5, 24 mov r8, r1 -_080402F8: +@080402F8: adds r0, r5, r7 ldrb r0, [r0] adds r1, r4, r7 @@ -109469,26 +109469,26 @@ _080402F8: bl b_first_side lsls r0, 24 cmp r0, 0 - beq _08040318 + beq @08040318 lsls r1, r4, 24 lsrs r1, 24 mov r2, r8 lsrs r0, r2, 24 bl sub_803CEDC -_08040318: +@08040318: adds r4, 0x1 ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - blt _080402F8 -_08040322: + blt @080402F8 +@08040322: adds r5, r6, 0 -_08040324: +@08040324: mov r1, r10 ldrb r0, [r1] subs r0, 0x1 cmp r5, r0 - blt _080402E4 + blt @080402E4 ldr r2, =0x0202449c ldr r1, [r2] ldrb r0, [r1, 0x3] @@ -109499,21 +109499,21 @@ _08040324: movs r1, 0 strb r1, [r0] mov r12, r2 -_08040342: +@08040342: mov r1, r12 ldr r0, [r1] adds r0, 0xDB ldrb r0, [r0] cmp r0, 0x1 - bls _08040350 - b _0804062C -_08040350: + bls @08040350 + b @0804062C +@08040350: ldr r3, =0x02024064 mov r8, r3 movs r7, 0 ldr r6, =0x0202420b ldr r5, =0x02022f58 -_0804035A: +@0804035A: ldr r0, [r1] adds r0, 0xDB ldrb r4, [r0] @@ -109532,14 +109532,14 @@ _0804035A: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080403BC + beq @080403BC ldrb r0, [r2] subs r0, 0x1 strb r0, [r2] movs r4, 0xFF lsls r0, 24 cmp r0, 0 - bne _080403BC + bne @080403BC ldrh r0, [r3] ldr r2, =0x0000fffe adds r1, r2, 0 @@ -109562,7 +109562,7 @@ _0804035A: lsls r0, 24 lsrs r0, 24 mov r9, r0 -_080403BC: +@080403BC: ldr r2, =0x0202449c ldr r1, [r2] adds r1, 0xDB @@ -109572,34 +109572,34 @@ _080403BC: mov r12, r2 mov r3, r9 cmp r3, 0 - beq _080403D2 - b _080408FE -_080403D2: + beq @080403D2 + b @080408FE +@080403D2: mov r1, r12 ldr r0, [r1] adds r0, 0xDB ldrb r0, [r0] cmp r0, 0x1 - bls _0804035A - b _0804062C + bls @0804035A + b @0804062C .align 2, 0 .pool -_08040408: +@08040408: mov r1, r12 ldr r0, [r1] adds r0, 0xDB ldrb r0, [r0] cmp r0, 0x1 - bls _08040416 - b _08040570 -_08040416: + bls @08040416 + b @08040570 +@08040416: movs r0, 0x2 mov r10, r0 movs r2, 0 mov r8, r2 ldr r7, =0x0202420b ldr r5, =0x02022f58 -_08040422: +@08040422: ldr r0, [r1] adds r0, 0xDB ldrb r4, [r0] @@ -109618,14 +109618,14 @@ _08040422: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0804048A + beq @0804048A ldrb r0, [r2, 0x2] subs r0, 0x1 strb r0, [r2, 0x2] movs r6, 0xFF lsls r0, 24 cmp r0, 0 - bne _0804048A + bne @0804048A ldrh r0, [r3] ldr r2, =0x0000fffd adds r1, r2, 0 @@ -109651,7 +109651,7 @@ _08040422: lsls r0, 24 lsrs r0, 24 mov r9, r0 -_0804048A: +@0804048A: ldr r2, =0x0202449c ldr r1, [r2] adds r1, 0xDB @@ -109661,32 +109661,32 @@ _0804048A: mov r12, r2 mov r1, r9 cmp r1, 0 - beq _080404A0 - b _080408FE -_080404A0: + beq @080404A0 + b @080408FE +@080404A0: mov r1, r12 ldr r0, [r1] adds r0, 0xDB ldrb r0, [r0] cmp r0, 0x1 - bls _08040422 - b _08040570 + bls @08040422 + b @08040570 .align 2, 0 .pool -_080404D4: +@080404D4: mov r1, r12 ldr r0, [r1] adds r0, 0xDB ldrb r0, [r0] cmp r0, 0x1 - bhi _08040570 + bhi @08040570 ldr r0, =0x02024064 mov r10, r0 movs r2, 0 mov r8, r2 ldr r7, =0x0202420b ldr r5, =0x02022f58 -_080404EC: +@080404EC: ldr r0, [r1] adds r0, 0xDB ldrb r4, [r0] @@ -109701,13 +109701,13 @@ _080404EC: strb r0, [r2] ldrb r0, [r1, 0x4] cmp r0, 0 - beq _0804054E + beq @0804054E subs r0, 0x1 strb r0, [r1, 0x4] movs r6, 0xFF lsls r0, 24 cmp r0, 0 - bne _0804054E + bne @0804054E ldr r2, =0x0202428e adds r2, r3, r2 ldrh r0, [r2] @@ -109735,7 +109735,7 @@ _080404EC: lsls r0, 24 lsrs r0, 24 mov r9, r0 -_0804054E: +@0804054E: ldr r2, =0x0202449c ldr r1, [r2] adds r1, 0xDB @@ -109745,21 +109745,21 @@ _0804054E: mov r12, r2 mov r1, r9 cmp r1, 0 - beq _08040564 - b _080408FE -_08040564: + beq @08040564 + b @080408FE +@08040564: mov r1, r12 ldr r0, [r1] adds r0, 0xDB ldrb r0, [r0] cmp r0, 0x1 - bls _080404EC -_08040570: + bls @080404EC +@08040570: mov r2, r9 cmp r2, 0 - beq _08040578 - b _080408FE -_08040578: + beq @08040578 + b @080408FE +@08040578: mov r3, r12 ldr r0, [r3] ldrb r1, [r0, 0x3] @@ -109768,19 +109768,19 @@ _08040578: ldr r0, [r3] adds r0, 0xDB strb r2, [r0] - b _080408F6 + b @080408F6 .align 2, 0 .pool -_080405B0: +@080405B0: mov r1, r12 ldr r0, [r1] adds r0, 0xDB ldrb r0, [r0] cmp r0, 0x1 - bhi _0804062C + bhi @0804062C ldr r6, =0x02024064 ldr r5, =0x0202420b -_080405C0: +@080405C0: ldr r0, [r1] adds r0, 0xDB ldrb r4, [r0] @@ -109798,13 +109798,13 @@ _080405C0: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0804060A + beq @0804060A ldrb r0, [r2, 0x6] subs r0, 0x1 strb r0, [r2, 0x6] lsls r0, 24 cmp r0, 0 - bne _0804060A + bne @0804060A ldrh r0, [r3] ldr r2, =0x0000ffdf adds r1, r2, 0 @@ -109817,7 +109817,7 @@ _080405C0: lsls r0, 24 lsrs r0, 24 mov r9, r0 -_0804060A: +@0804060A: ldr r2, =0x0202449c ldr r1, [r2] adds r1, 0xDB @@ -109827,21 +109827,21 @@ _0804060A: mov r12, r2 mov r3, r9 cmp r3, 0 - beq _08040620 - b _080408FE -_08040620: + beq @08040620 + b @080408FE +@08040620: mov r1, r12 ldr r0, [r1] adds r0, 0xDB ldrb r0, [r0] cmp r0, 0x1 - bls _080405C0 -_0804062C: + bls @080405C0 +@0804062C: mov r0, r9 cmp r0, 0 - beq _08040634 - b _080408FE -_08040634: + beq @08040634 + b @080408FE +@08040634: mov r1, r12 ldr r0, [r1] ldrb r1, [r0, 0x3] @@ -109852,10 +109852,10 @@ _08040634: adds r0, 0xDB mov r3, r9 strb r3, [r0] - b _080408F6 + b @080408F6 .align 2, 0 .pool -_08040668: +@08040668: mov r2, r12 ldr r0, [r2] adds r0, 0xDB @@ -109863,10 +109863,10 @@ _08040668: ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bcs _080406E8 + bcs @080406E8 ldr r4, =0x02024064 ldr r5, =0x0202407e -_0804067C: +@0804067C: ldr r0, [r2] adds r0, 0xDB ldrb r0, [r0] @@ -109879,12 +109879,12 @@ _0804067C: adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0 - beq _080406C4 + beq @080406C4 subs r0, 0x1 strb r0, [r1] lsls r0, 24 cmp r0, 0 - bne _080406C4 + bne @080406C4 ldr r1, =0x02024084 ldrb r2, [r4] movs r0, 0x58 @@ -109892,7 +109892,7 @@ _0804067C: adds r0, r1 ldrh r0, [r0, 0x28] cmp r0, 0 - beq _080406C4 + beq @080406C4 ldr r0, =0x0202420c strb r2, [r0] ldr r0, =0x082db0b7 @@ -109902,7 +109902,7 @@ _0804067C: lsls r0, 24 lsrs r0, 24 mov r9, r0 -_080406C4: +@080406C4: ldr r2, =0x0202449c ldr r1, [r2] adds r1, 0xDB @@ -109912,43 +109912,43 @@ _080406C4: mov r12, r2 mov r3, r9 cmp r3, 0 - beq _080406DA - b _080408FE -_080406DA: + beq @080406DA + b @080408FE +@080406DA: ldr r0, [r2] adds r0, 0xDB ldr r1, =0x0202406c ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bcc _0804067C -_080406E8: + bcc @0804067C +@080406E8: mov r0, r9 cmp r0, 0 - beq _080406F0 - b _080408FE -_080406F0: + beq @080406F0 + b @080408FE +@080406F0: mov r2, r12 ldr r1, [r2] ldrb r0, [r1, 0x3] adds r0, 0x1 strb r0, [r1, 0x3] - b _080408F6 + b @080408F6 .align 2, 0 .pool -_0804071C: +@0804071C: ldr r3, =0x020243cc ldrh r2, [r3] movs r0, 0x7 ands r0, r2 cmp r0, 0 - bne _0804072A - b _080408C8 -_0804072A: + bne @0804072A + b @080408C8 +@0804072A: movs r0, 0x4 ands r0, r2 cmp r0, 0 - bne _08040776 + bne @08040776 ldr r1, =0x020243d0 adds r1, 0x28 ldrb r0, [r1] @@ -109956,7 +109956,7 @@ _0804072A: strb r0, [r1] lsls r0, 24 cmp r0, 0 - bne _08040768 + bne @08040768 ldr r0, =0x0000fffe ands r0, r2 ldr r1, =0x0000fffd @@ -109965,52 +109965,52 @@ _0804072A: ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] - b _08040794 + b @08040794 .align 2, 0 .pool -_08040768: +@08040768: movs r0, 0x2 ands r0, r2 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - bne _08040782 - b _08040790 -_08040776: + bne @08040782 + b @08040790 +@08040776: movs r0, 0x2 ands r0, r2 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - beq _08040790 -_08040782: + beq @08040790 +@08040782: ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] - b _08040794 + b @08040794 .align 2, 0 .pool -_08040790: +@08040790: ldr r0, =0x02024332 strb r1, [r0, 0x5] -_08040794: +@08040794: ldr r0, =0x082dac2c - b _080408BA + b @080408BA .align 2, 0 .pool -_080407A0: +@080407A0: ldr r3, =0x020243cc ldrh r2, [r3] movs r0, 0x18 ands r0, r2 cmp r0, 0 - bne _080407AE - b _080408C8 -_080407AE: + bne @080407AE + b @080408C8 +@080407AE: movs r0, 0x10 ands r0, r2 cmp r0, 0 - bne _080407E8 + bne @080407E8 ldr r1, =0x020243d0 adds r1, 0x28 ldrb r0, [r1] @@ -110018,19 +110018,19 @@ _080407AE: strb r0, [r1] lsls r0, 24 cmp r0, 0 - bne _080407E8 + bne @080407E8 ldr r0, =0x0000fff7 ands r0, r2 strh r0, [r3] ldr r1, =0x02024214 ldr r0, =0x082dacc9 - b _080407EC + b @080407EC .align 2, 0 .pool -_080407E8: +@080407E8: ldr r1, =0x02024214 ldr r0, =0x082dac47 -_080407EC: +@080407EC: str r0, [r1] adds r3, r1, 0 ldr r1, =0x02024474 @@ -110039,20 +110039,20 @@ _080407EC: strb r0, [r1, 0x10] ldr r0, =0x02024332 strb r2, [r0, 0x5] - b _080408B8 + b @080408B8 .align 2, 0 .pool -_08040810: +@08040810: ldr r3, =0x020243cc ldrh r2, [r3] movs r0, 0x60 ands r0, r2 cmp r0, 0 - beq _080408C8 + beq @080408C8 movs r0, 0x40 ands r0, r2 cmp r0, 0 - bne _08040854 + bne @08040854 ldr r1, =0x020243d0 adds r1, 0x28 ldrb r0, [r1] @@ -110060,31 +110060,31 @@ _08040810: strb r0, [r1] lsls r0, 24 cmp r0, 0 - bne _08040854 + bne @08040854 ldr r0, =0x0000ffdf ands r0, r2 strh r0, [r3] ldr r1, =0x02024214 ldr r0, =0x082dace0 - b _08040858 + b @08040858 .align 2, 0 .pool -_08040854: +@08040854: ldr r1, =0x02024214 ldr r0, =0x082dacd2 -_08040858: +@08040858: str r0, [r1] adds r3, r1, 0 - b _080408B8 + b @080408B8 .align 2, 0 .pool -_08040868: +@08040868: ldr r3, =0x020243cc ldrh r2, [r3] movs r0, 0x80 ands r0, r2 cmp r0, 0 - beq _080408C8 + beq @080408C8 ldr r1, =0x020243d0 adds r1, 0x28 ldrb r0, [r1] @@ -110092,19 +110092,19 @@ _08040868: strb r0, [r1] lsls r0, 24 cmp r0, 0 - bne _080408A4 + bne @080408A4 ldr r0, =0x0000ff7f ands r0, r2 strh r0, [r3] ldr r1, =0x02024214 ldr r0, =0x082dacc9 - b _080408A8 + b @080408A8 .align 2, 0 .pool -_080408A4: +@080408A4: ldr r1, =0x02024214 ldr r0, =0x082dac47 -_080408A8: +@080408A8: str r0, [r1] adds r3, r1, 0 ldr r1, =0x02024474 @@ -110113,37 +110113,37 @@ _080408A8: ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] -_080408B8: +@080408B8: ldr r0, [r3] -_080408BA: +@080408BA: bl b_call_bc_move_exec mov r0, r9 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r9, r0 -_080408C8: +@080408C8: ldr r2, =0x0202449c ldr r1, [r2] ldrb r0, [r1, 0x3] adds r0, 0x1 strb r0, [r1, 0x3] mov r12, r2 - b _080408F6 + b @080408F6 .align 2, 0 .pool -_080408EC: +@080408EC: mov r0, r9 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r9, r0 -_080408F6: +@080408F6: mov r3, r9 cmp r3, 0 - bne _080408FE - b _0804025E -_080408FE: + bne @080408FE + b @0804025E +@080408FE: ldr r0, =0x03005d04 ldr r1, [r0] ldr r0, =sub_803B9BC + 1 @@ -110163,7 +110163,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 @@ -110185,13 +110185,13 @@ sub_8040924: @ 8040924 mov r8, r0 ldrb r3, [r0] cmp r1, r3 - bcc _08040954 - bl _08041338 -_08040954: - bl _0804132E + bcc @08040954 + bl @08041338 +@08040954: + bl @0804132E .align 2, 0 .pool -_08040968: +@08040968: ldr r3, =0x02024064 ldr r4, =0x0202420b ldr r1, =0x0202407e @@ -110211,49 +110211,49 @@ _08040968: ands r1, r0 adds r6, r3, 0 cmp r1, 0 - beq _080409B0 + beq @080409B0 ldrb r0, [r5, 0x1] adds r0, 0x1 strb r0, [r5, 0x1] - bl _0804131C + bl @0804131C .align 2, 0 .pool -_080409B0: +@080409B0: ldrb r0, [r5] cmp r0, 0x13 - bls _080409BA - bl _08041312 -_080409BA: + bls @080409BA + bl @08041312 +@080409BA: lsls r0, 2 - ldr r1, =_080409C8 + ldr r1, =@080409C8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080409C8: - .4byte _08040A18 - .4byte _08040A78 - .4byte _08040A96 - .4byte _08040AC6 - .4byte _08040B44 - .4byte _08040B8C - .4byte _08040C0C - .4byte _08040C54 - .4byte _08040CB8 - .4byte _08040D00 - .4byte _08040E60 - .4byte _08040F7C - .4byte _08041024 - .4byte _080410E8 - .4byte _0804119C - .4byte _080411BC - .4byte _08041208 - .4byte _08041238 - .4byte _08040AAE - .4byte _08041304 -_08040A18: +@080409C8: + .4byte @08040A18 + .4byte @08040A78 + .4byte @08040A96 + .4byte @08040AC6 + .4byte @08040B44 + .4byte @08040B8C + .4byte @08040C0C + .4byte @08040C54 + .4byte @08040CB8 + .4byte @08040D00 + .4byte @08040E60 + .4byte @08040F7C + .4byte @08041024 + .4byte @080410E8 + .4byte @0804119C + .4byte @080411BC + .4byte @08041208 + .4byte @08041238 + .4byte @08040AAE + .4byte @08041304 +@08040A18: ldr r1, =0x020242ac ldrb r3, [r6] lsls r0, r3, 2 @@ -110263,9 +110263,9 @@ _08040A18: lsls r1, 3 ands r0, r1 cmp r0, 0 - bne _08040A30 - bl _080412DE -_08040A30: + bne @08040A30 + bl @080412DE +@08040A30: ldr r0, =0x02024084 movs r1, 0x58 muls r1, r3 @@ -110273,30 +110273,30 @@ _08040A30: ldrh r2, [r0, 0x28] ldrh r5, [r0, 0x2C] cmp r2, r5 - bne _08040A44 - bl _080412DE -_08040A44: + bne @08040A44 + bl @080412DE +@08040A44: cmp r2, 0 - bne _08040A4C - bl _080412DE -_08040A4C: + bne @08040A4C + bl @080412DE +@08040A4C: ldr r1, =0x020241f0 ldrh r0, [r0, 0x2C] lsrs r0, 4 str r0, [r1] cmp r0, 0 - bne _08040A5C + bne @08040A5C movs r0, 0x1 str r0, [r1] -_08040A5C: +@08040A5C: ldr r0, [r1] negs r0, r0 str r0, [r1] ldr r0, =0x082db0ee - bl _080412D0 + bl @080412D0 .align 2, 0 .pool -_08040A78: +@08040A78: ldrb r1, [r6] movs r0, 0 str r0, [sp] @@ -110306,33 +110306,33 @@ _08040A78: bl ability_something lsls r0, 24 cmp r0, 0 - bne _08040A92 - bl _080412DE -_08040A92: - bl _080412D4 -_08040A96: + bne @08040A92 + bl @080412DE +@08040A92: + bl @080412D4 +@08040A96: ldrb r1, [r6] movs r0, 0x1 movs r2, 0 bl berry_effects_maybe lsls r0, 24 cmp r0, 0 - bne _08040AAA - bl _080412DE -_08040AAA: - bl _080412D4 -_08040AAE: + bne @08040AAA + bl @080412DE +@08040AAA: + bl @080412D4 +@08040AAE: ldrb r1, [r6] movs r0, 0x1 movs r2, 0x1 bl berry_effects_maybe lsls r0, 24 cmp r0, 0 - bne _08040AC2 - bl _080412DE -_08040AC2: - bl _080412D4 -_08040AC6: + bne @08040AC2 + bl @080412DE +@08040AC2: + bl @080412D4 +@08040AC6: ldr r0, =0x020242ac ldrb r2, [r6] lsls r1, r2, 2 @@ -110341,9 +110341,9 @@ _08040AC6: movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne _08040ADC - bl _080412DE -_08040ADC: + bne @08040ADC + bl @080412DE +@08040ADC: ldr r3, =0x02024084 movs r5, 0x3 ands r5, r1 @@ -110353,17 +110353,17 @@ _08040ADC: adds r0, r3 ldrh r0, [r0, 0x28] cmp r0, 0 - bne _08040AF4 - bl _080412DE -_08040AF4: + bne @08040AF4 + bl @080412DE +@08040AF4: adds r0, r2, 0 muls r0, r1 adds r0, r3 ldrh r0, [r0, 0x28] cmp r0, 0 - bne _08040B04 - bl _080412DE -_08040B04: + bne @08040B04 + bl @080412DE +@08040B04: ldr r0, =0x0202420c strb r5, [r0] ldr r2, =0x020241f0 @@ -110374,19 +110374,19 @@ _08040B04: lsrs r0, 3 str r0, [r2] cmp r0, 0 - bne _08040B1E + bne @08040B1E movs r0, 0x1 str r0, [r2] -_08040B1E: +@08040B1E: ldr r1, =0x02024474 strb r5, [r1, 0x10] ldrb r0, [r4] strb r0, [r1, 0x11] ldr r0, =0x082dad15 - b _080412D0 + b @080412D0 .align 2, 0 .pool -_08040B44: +@08040B44: ldr r2, =0x02024084 ldrb r1, [r6] movs r0, 0x58 @@ -110399,29 +110399,29 @@ _08040B44: movs r1, 0x8 ands r0, r1 cmp r0, 0 - bne _08040B60 - b _080412DE -_08040B60: + bne @08040B60 + b @080412DE +@08040B60: adds r1, r3, r2 ldrh r0, [r1, 0x28] cmp r0, 0 - bne _08040B6A - b _080412DE -_08040B6A: + bne @08040B6A + b @080412DE +@08040B6A: ldr r2, =0x020241f0 ldrh r0, [r1, 0x2C] lsrs r0, 3 str r0, [r2] cmp r0, 0 - bne _08040B7A + bne @08040B7A movs r0, 0x1 str r0, [r2] -_08040B7A: +@08040B7A: ldr r0, =0x082db23d - b _080412D0 + b @080412D0 .align 2, 0 .pool -_08040B8C: +@08040B8C: ldr r4, =0x02024084 ldrb r0, [r6] movs r7, 0x58 @@ -110435,24 +110435,24 @@ _08040B8C: movs r1, 0x80 ands r0, r1 cmp r0, 0 - bne _08040BAA - b _080412DE -_08040BAA: + bne @08040BAA + b @080412DE +@08040BAA: adds r1, r2, r4 ldrh r0, [r1, 0x28] cmp r0, 0 - bne _08040BB4 - b _080412DE -_08040BB4: + bne @08040BB4 + b @080412DE +@08040BB4: ldr r5, =0x020241f0 ldrh r0, [r1, 0x2C] lsrs r0, 4 str r0, [r5] cmp r0, 0 - bne _08040BC4 + bne @08040BC4 movs r0, 0x1 str r0, [r5] -_08040BC4: +@08040BC4: ldrb r0, [r6] mov r1, r8 muls r1, r0 @@ -110464,12 +110464,12 @@ _08040BC4: adds r0, r1, 0 ands r0, r4 cmp r0, r4 - beq _08040BE4 + beq @08040BE4 movs r7, 0x80 lsls r7, 1 adds r0, r1, r7 str r0, [r2] -_08040BE4: +@08040BE4: ldrb r0, [r6] mov r1, r8 muls r1, r0 @@ -110482,10 +110482,10 @@ _08040BE4: muls r0, r1 str r0, [r5] ldr r0, =0x082db23d - b _080412D0 + b @080412D0 .align 2, 0 .pool -_08040C0C: +@08040C0C: ldr r2, =0x02024084 ldrb r1, [r6] movs r0, 0x58 @@ -110498,29 +110498,29 @@ _08040C0C: movs r1, 0x10 ands r0, r1 cmp r0, 0 - bne _08040C28 - b _080412DE -_08040C28: + bne @08040C28 + b @080412DE +@08040C28: adds r1, r3, r2 ldrh r0, [r1, 0x28] cmp r0, 0 - bne _08040C32 - b _080412DE -_08040C32: + bne @08040C32 + b @080412DE +@08040C32: ldr r2, =0x020241f0 ldrh r0, [r1, 0x2C] lsrs r0, 3 str r0, [r2] cmp r0, 0 - bne _08040C42 + bne @08040C42 movs r0, 0x1 str r0, [r2] -_08040C42: +@08040C42: ldr r0, =0x082db25f - b _080412D0 + b @080412D0 .align 2, 0 .pool -_08040C54: +@08040C54: ldr r4, =0x02024084 ldrb r1, [r6] movs r0, 0x58 @@ -110533,15 +110533,15 @@ _08040C54: lsls r0, 20 ands r0, r2 cmp r0, 0 - bne _08040C70 - b _080412DE -_08040C70: + bne @08040C70 + b @080412DE +@08040C70: adds r3, r1, r4 ldrh r0, [r3, 0x28] cmp r0, 0 - bne _08040C7A - b _080412DE -_08040C7A: + bne @08040C7A + b @080412DE +@08040C7A: adds r0, r4, 0 adds r0, 0x4C adds r0, r1, r0 @@ -110549,28 +110549,28 @@ _08040C7A: movs r1, 0x7 ands r0, r1 cmp r0, 0 - beq _08040CAC + beq @08040CAC ldr r1, =0x020241f0 ldrh r0, [r3, 0x2C] lsrs r0, 2 str r0, [r1] cmp r0, 0 - bne _08040C9A + bne @08040C9A movs r0, 0x1 str r0, [r1] -_08040C9A: +@08040C9A: ldr r0, =0x082db33f - b _080412D0 + b @080412D0 .align 2, 0 .pool -_08040CAC: +@08040CAC: ldr r0, =0xf7ffffff ands r2, r0 str r2, [r5] - b _080412DE + b @080412DE .align 2, 0 .pool -_08040CB8: +@08040CB8: ldr r2, =0x02024084 ldrb r1, [r6] movs r0, 0x58 @@ -110584,29 +110584,29 @@ _08040CB8: lsls r1, 21 ands r0, r1 cmp r0, 0 - bne _08040CD6 - b _080412DE -_08040CD6: + bne @08040CD6 + b @080412DE +@08040CD6: adds r1, r3, r2 ldrh r0, [r1, 0x28] cmp r0, 0 - bne _08040CE0 - b _080412DE -_08040CE0: + bne @08040CE0 + b @080412DE +@08040CE0: ldr r2, =0x020241f0 ldrh r0, [r1, 0x2C] lsrs r0, 2 str r0, [r2] cmp r0, 0 - bne _08040CF0 + bne @08040CF0 movs r0, 0x1 str r0, [r2] -_08040CF0: +@08040CF0: ldr r0, =0x082db350 - b _080412D0 + b @080412D0 .align 2, 0 .pool -_08040D00: +@08040D00: ldr r3, =0x02024084 mov r8, r3 ldrb r0, [r6] @@ -110623,16 +110623,16 @@ _08040D00: adds r0, r2, 0 ands r0, r5 cmp r0, 0 - bne _08040D24 - b _080412DE -_08040D24: + bne @08040D24 + b @080412DE +@08040D24: mov r7, r8 adds r0, r1, r7 ldrh r0, [r0, 0x28] cmp r0, 0 - bne _08040D30 - b _080412DE -_08040D30: + bne @08040D30 + b @080412DE +@08040D30: ldr r1, =0xffffe000 adds r0, r2, r1 str r0, [r4] @@ -110643,7 +110643,7 @@ _08040D30: ldr r0, [r0] ands r0, r5 cmp r0, 0 - beq _08040DC0 + beq @08040DC0 ldr r1, =0x02024474 ldr r0, =0x0202449c ldr r2, [r0] @@ -110684,13 +110684,13 @@ _08040D30: lsrs r0, 4 str r0, [r2] cmp r0, 0 - bne _08040DEC + bne @08040DEC movs r0, 0x1 str r0, [r2] - b _08040DEC + b @08040DEC .align 2, 0 .pool -_08040DC0: +@08040DC0: ldr r2, =0x02022f58 movs r0, 0xFD strb r0, [r2] @@ -110713,12 +110713,12 @@ _08040DC0: ldr r1, =0x02024214 ldr r0, =0x082db320 str r0, [r1] -_08040DEC: +@08040DEC: ldr r0, [r1] - b _080412D0 + b @080412D0 .align 2, 0 .pool -_08040E00: +@08040E00: movs r0, 0x8 negs r0, r0 ands r3, r0 @@ -110754,10 +110754,10 @@ _08040E00: bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - b _08040EC8 + b @08040EC8 .align 2, 0 .pool -_08040E60: +@08040E60: ldr r2, =0x02024084 ldrb r1, [r6] movs r0, 0x58 @@ -110770,13 +110770,13 @@ _08040E60: ands r1, r0 adds r7, r2, 0 cmp r1, 0 - beq _08040F6A + beq @08040F6A movs r0, 0 strb r0, [r4] mov r5, r8 ldrb r0, [r5] cmp r0, 0 - beq _08040EC8 + beq @08040EC8 mov r10, r7 adds r6, r4, 0 movs r1, 0x58 @@ -110787,7 +110787,7 @@ _08040E60: str r0, [sp, 0x4] movs r5, 0x7 mov r12, r5 -_08040E9A: +@08040E9A: ldrb r4, [r6] mov r1, r8 muls r1, r4 @@ -110798,33 +110798,33 @@ _08040E9A: mov r5, r12 ands r0, r5 cmp r0, 0 - beq _08040EBA + beq @08040EBA adds r0, r1, r7 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x2B - bne _08040E00 -_08040EBA: + bne @08040E00 +@08040EBA: adds r0, r4, 0x1 strb r0, [r6] lsls r0, 24 lsrs r0, 24 ldr r1, [sp, 0x4] cmp r0, r1 - bcc _08040E9A -_08040EC8: + bcc @08040E9A +@08040EC8: ldr r2, =0x0202420b ldr r1, =0x0202406c ldrb r0, [r2] ldrb r1, [r1] cmp r0, r1 - beq _08040EE8 + beq @08040EE8 movs r3, 0x2 mov r9, r3 - b _08041318 + b @08041318 .align 2, 0 .pool -_08040EE8: +@08040EE8: ldr r5, =0x02024064 ldrb r0, [r5] strb r0, [r2] @@ -110844,16 +110844,16 @@ _08040EE8: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq _08040F2C + beq @08040F2C ldrb r0, [r5] bl b_cancel_multi_turn_move_maybe ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] - b _08040F60 + b @08040F60 .align 2, 0 .pool -_08040F2C: +@08040F2C: ldrb r3, [r5] adds r0, r3, 0 muls r0, r7 @@ -110862,7 +110862,7 @@ _08040F2C: movs r1, 0x70 ands r0, r1 cmp r0, 0 - beq _08040F54 + beq @08040F54 ldr r0, =0x02024332 strb r4, [r0, 0x5] ldr r0, [r2] @@ -110870,30 +110870,30 @@ _08040F2C: lsls r1, 5 orrs r0, r1 str r0, [r2] - b _08040F60 + b @08040F60 .align 2, 0 .pool -_08040F54: +@08040F54: ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] adds r0, r3, 0 bl b_cancel_multi_turn_move_maybe -_08040F60: +@08040F60: ldr r0, =0x082db2a6 bl b_call_bc_move_exec movs r5, 0x1 mov r9, r5 -_08040F6A: +@08040F6A: mov r7, r9 cmp r7, 0x2 - bne _08040F72 - b _08041312 -_08040F72: - b _080412DE + bne @08040F72 + b @08041312 +@08040F72: + b @080412DE .align 2, 0 .pool -_08040F7C: +@08040F7C: ldr r1, =0x02024084 ldrb r0, [r6] movs r7, 0x58 @@ -110907,9 +110907,9 @@ _08040F7C: adds r0, r1, 0 ands r0, r4 cmp r0, 0 - bne _08040F9A - b _080412DE -_08040F9A: + bne @08040F9A + b @080412DE +@08040F9A: ldr r3, =0xfffffc00 adds r0, r1, r3 str r0, [r2] @@ -110917,13 +110917,13 @@ _08040F9A: bl sub_803F90C lsls r0, 24 cmp r0, 0 - beq _08040FBC + beq @08040FBC ldrb r0, [r6] bl b_cancel_multi_turn_move_maybe - b _080412DE + b @080412DE .align 2, 0 .pool -_08040FBC: +@08040FBC: ldrb r0, [r6] muls r0, r7 adds r2, r0, r5 @@ -110931,16 +110931,16 @@ _08040FBC: adds r0, r1, 0 ands r0, r4 cmp r0, 0 - beq _08040FCE - b _080412DE -_08040FCE: + beq @08040FCE + b @080412DE +@08040FCE: movs r0, 0x80 lsls r0, 5 ands r0, r1 cmp r0, 0 - bne _08040FDA - b _080412DE -_08040FDA: + bne @08040FDA + b @080412DE +@08040FDA: ldr r0, =0xffffefff ands r1, r0 str r1, [r2] @@ -110951,9 +110951,9 @@ _08040FDA: movs r4, 0x7 ands r0, r4 cmp r0, 0 - beq _08040FF2 - b _080412DE -_08040FF2: + beq @08040FF2 + b @080412DE +@08040FF2: ldr r1, =0x02024332 movs r0, 0x47 strb r0, [r1, 0x3] @@ -110966,15 +110966,15 @@ _08040FF2: ldr r0, [r0] ands r0, r4 cmp r0, 0 - bne _08041010 - b _080412D4 -_08041010: + bne @08041010 + b @080412D4 +@08041010: ldr r0, =0x082db2af bl b_call_bc_move_exec - b _080412D4 + b @080412D4 .align 2, 0 .pool -_08041024: +@08041024: ldr r0, =0x020242bc ldrb r3, [r6] lsls r1, r3, 3 @@ -110985,9 +110985,9 @@ _08041024: lsls r1, 28 adds r7, r0, 0 cmp r1, 0 - bne _0804103C - b _080412DE -_0804103C: + bne @0804103C + b @080412DE +@0804103C: movs r4, 0 ldr r2, =0x02024084 movs r0, 0x58 @@ -110998,15 +110998,15 @@ _0804103C: ldrh r0, [r5, 0x4] ldrh r1, [r1] cmp r0, r1 - beq _0804107A + beq @0804107A mov r12, r7 mov r8, r2 adds r5, r6, 0 movs r3, 0x58 -_0804105A: +@0804105A: adds r4, 0x1 cmp r4, 0x3 - bgt _0804107A + bgt @0804107A ldrb r2, [r5] lsls r1, r2, 3 subs r1, r2 @@ -111019,10 +111019,10 @@ _0804105A: ldrh r1, [r1, 0x4] ldrh r0, [r0] cmp r1, r0 - bne _0804105A -_0804107A: + bne @0804105A +@0804107A: cmp r4, 0x4 - bne _080410AC + bne @080410AC ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -111040,10 +111040,10 @@ _0804107A: negs r0, r0 ands r0, r2 strb r0, [r1, 0xB] - b _080412DE + b @080412DE .align 2, 0 .pool -_080410AC: +@080410AC: ldrb r0, [r6] lsls r2, r0, 3 subs r2, r0 @@ -111062,9 +111062,9 @@ _080410AC: strb r0, [r2, 0xB] adds r2, r1, 0 cmp r2, 0 - beq _080410D4 - b _080412DE -_080410D4: + beq @080410D4 + b @080412DE +@080410D4: ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -111072,10 +111072,10 @@ _080410D4: adds r0, r7 strh r2, [r0, 0x4] ldr r0, =0x082dae23 - b _080412D0 + b @080412D0 .align 2, 0 .pool -_080410E8: +@080410E8: ldr r3, =0x020242bc ldrb r1, [r6] lsls r0, r1, 3 @@ -111085,9 +111085,9 @@ _080410E8: ldrb r5, [r2, 0xE] lsls r4, r5, 28 cmp r4, 0 - bne _080410FE - b _080412DE -_080410FE: + bne @080410FE + b @080412DE +@080410FE: ldr r7, =0x02024084 mov r8, r7 ldrb r0, [r2, 0xC] @@ -111101,7 +111101,7 @@ _080410FE: ldrh r0, [r0] ldrh r1, [r2, 0x6] cmp r0, r1 - beq _0804113C + beq @0804113C movs r0, 0 strh r0, [r2, 0x6] ldrb r0, [r6] @@ -111114,10 +111114,10 @@ _080410FE: negs r0, r0 ands r0, r2 strb r0, [r1, 0xE] - b _080412DE + b @080412DE .align 2, 0 .pool -_0804113C: +@0804113C: lsrs r1, r4, 28 subs r1, 0x1 movs r0, 0xF @@ -111129,7 +111129,7 @@ _0804113C: orrs r0, r1 strb r0, [r2, 0xE] cmp r1, 0 - beq _08041172 + beq @08041172 ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -111143,9 +111143,9 @@ _0804113C: adds r1, r0 ldrb r0, [r1] cmp r0, 0 - beq _08041172 - b _080412DE -_08041172: + beq @08041172 + b @080412DE +@08041172: ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -111163,10 +111163,10 @@ _08041172: ands r0, r2 strb r0, [r1, 0xE] ldr r0, =0x082dae37 - b _080412D0 + b @080412D0 .align 2, 0 .pool -_0804119C: +@0804119C: ldr r0, =0x020242ac ldrb r1, [r6] lsls r1, 2 @@ -111175,16 +111175,16 @@ _0804119C: movs r0, 0x18 ands r0, r2 cmp r0, 0 - beq _080411B4 + beq @080411B4 adds r0, r2, 0 subs r0, 0x8 str r0, [r1] -_080411B4: +@080411B4: ldr r1, [r7] - b _080412E2 + b @080412E2 .align 2, 0 .pool -_080411BC: +@080411BC: ldr r2, =0x020242bc ldrb r1, [r6] lsls r0, r1, 3 @@ -111194,7 +111194,7 @@ _080411BC: ldrb r2, [r3, 0x12] lsls r1, r2, 28 cmp r1, 0 - beq _080411F6 + beq @080411F6 lsrs r1, 28 subs r1, 0x1 movs r0, 0xF @@ -111205,7 +111205,7 @@ _080411BC: orrs r0, r1 strb r0, [r3, 0x12] cmp r1, 0 - bne _080411F6 + bne @080411F6 ldr r0, =0x020242ac ldrb r2, [r6] lsls r2, 2 @@ -111214,12 +111214,12 @@ _080411BC: ldr r1, =0xfffffdff ands r0, r1 str r0, [r2] -_080411F6: +@080411F6: ldr r1, [r7] - b _080412E2 + b @080412E2 .align 2, 0 .pool -_08041208: +@08041208: ldr r2, =0x020242bc ldrb r1, [r6] lsls r0, r1, 3 @@ -111229,7 +111229,7 @@ _08041208: ldrb r2, [r3, 0x13] lsls r1, r2, 28 cmp r1, 0 - beq _0804122E + beq @0804122E lsrs r1, 28 subs r1, 0x1 movs r0, 0xF @@ -111239,12 +111239,12 @@ _08041208: ands r0, r2 orrs r0, r1 strb r0, [r3, 0x13] -_0804122E: +@0804122E: ldr r1, [r7] - b _080412E2 + b @080412E2 .align 2, 0 .pool -_08041238: +@08041238: ldr r4, =0x020242ac ldrb r0, [r6] lsls r0, 2 @@ -111255,7 +111255,7 @@ _08041238: adds r0, r1, 0 ands r0, r3 cmp r0, 0 - beq _080412DE + beq @080412DE ldr r5, =0xfffff800 adds r0, r1, r5 str r0, [r2] @@ -111265,7 +111265,7 @@ _08041238: ldr r0, [r0] ands r0, r3 cmp r0, 0 - bne _080412DE + bne @080412DE ldr r3, =0x02024084 movs r5, 0x58 adds r1, r2, 0 @@ -111275,19 +111275,19 @@ _08041238: adds r0, r1, r4 ldrb r0, [r0] cmp r0, 0 - bne _080412DE + bne @080412DE adds r0, r1, r3 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x48 - beq _080412DE + beq @080412DE cmp r0, 0xF - beq _080412DE + beq @080412DE adds r0, r2, 0 bl sub_8050650 lsls r0, 24 cmp r0, 0 - bne _080412DE + bne @080412DE ldrb r0, [r6] bl b_cancel_multi_turn_move_maybe bl GenerateRandomNumber @@ -111316,25 +111316,25 @@ _08041238: ldrb r0, [r6] strb r0, [r1] ldr r0, =0x082db378 -_080412D0: +@080412D0: bl b_call_bc_move_exec -_080412D4: +@080412D4: mov r0, r9 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r9, r0 -_080412DE: +@080412DE: ldr r0, =0x0202449c ldr r1, [r0] -_080412E2: +@080412E2: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08041312 + b @08041312 .align 2, 0 .pool -_08041304: +@08041304: ldr r1, [r7] movs r0, 0 strb r0, [r1] @@ -111342,14 +111342,14 @@ _08041304: ldrb r0, [r1, 0x1] adds r0, 0x1 strb r0, [r1, 0x1] -_08041312: +@08041312: mov r7, r9 cmp r7, 0 - beq _0804131C -_08041318: + beq @0804131C +@08041318: mov r0, r9 - b _08041344 -_0804131C: + b @08041344 +@0804131C: ldr r5, =0x0202449c ldr r2, [r5] ldr r0, =0x0202406c @@ -111358,20 +111358,20 @@ _0804131C: mov r8, r0 ldrb r0, [r0] cmp r1, r0 - bcs _08041338 -_0804132E: + bcs @08041338 +@0804132E: ldrb r0, [r2] cmp r0, 0x13 - bhi _08041338 - bl _08040968 -_08041338: + bhi @08041338 + bl @08040968 +@08041338: ldr r0, =0x02024280 ldr r1, [r0] ldr r2, =0xfeffffdf ands r1, r2 str r1, [r0] movs r0, 0 -_08041344: +@08041344: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -111385,7 +111385,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 @@ -111405,23 +111405,23 @@ sub_8041364: @ 8041364 mov r10, r2 adds r6, r1, 0 cmp r0, 0x1 - bne _0804138E - b _08041548 -_0804138E: + bne @0804138E + b @08041548 +@0804138E: cmp r0, 0x1 - bgt _080413A4 + bgt @080413A4 cmp r0, 0 - beq _080413AC - b _08041708 + beq @080413AC + b @08041708 .align 2, 0 .pool -_080413A4: +@080413A4: cmp r0, 0x2 - bne _080413AA - b _0804169A -_080413AA: - b _08041708 -_080413AC: + bne @080413AA + b @0804169A +@080413AA: + b @08041708 +@080413AC: ldr r2, =0x000001a1 adds r0, r3, r2 ldr r1, =0x0202406c @@ -111429,16 +111429,16 @@ _080413AC: mov r8, r1 ldrb r7, [r1] cmp r0, r7 - bcc _080413BE - b _08041532 -_080413BE: + bcc @080413BE + b @08041532 +@080413BE: ldr r4, =0x02024064 ldr r5, =0x02022f58 ldr r7, =0x020243d0 movs r0, 0x18 adds r0, r7 mov r12, r0 -_080413CA: +@080413CA: ldr r0, [r6] adds r3, r0, r2 ldrb r0, [r3] @@ -111452,14 +111452,14 @@ _080413CA: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _0804140C + beq @0804140C ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] - b _08041520 + b @08041520 .align 2, 0 .pool -_0804140C: +@0804140C: ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] @@ -111469,15 +111469,15 @@ _0804140C: ldrb r0, [r2] mov r9, r1 cmp r0, 0 - bne _08041422 - b _08041520 -_08041422: + bne @08041422 + b @08041520 +@08041422: subs r0, 0x1 strb r0, [r2] lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - bne _08041520 + bne @08041520 ldr r1, =0x02024084 ldrb r2, [r4] movs r0, 0x58 @@ -111485,22 +111485,22 @@ _08041422: adds r0, r1 ldrh r0, [r0, 0x28] cmp r0, 0 - beq _08041520 + beq @08041520 lsls r0, r2, 1 add r0, r12 ldrh r0, [r0] cmp r0, 0xF8 - bne _0804145C + bne @0804145C ldr r0, =0x02024332 strb r3, [r0, 0x5] - b _08041462 + b @08041462 .align 2, 0 .pool -_0804145C: +@0804145C: ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] -_08041462: +@08041462: movs r0, 0xFD strb r0, [r5] movs r6, 0x2 @@ -111551,17 +111551,17 @@ _08041462: adds r0, r1, r7 ldrb r0, [r0] cmp r0, 0 - beq _080414CC - b _08041664 -_080414CC: + beq @080414CC + b @08041664 +@080414CC: eors r1, r6 mov r3, r9 adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 - beq _080414DA - b _08041664 -_080414DA: + beq @080414DA + b @08041664 +@080414DA: ldrb r0, [r5] bl battle_get_per_side_status ldr r2, =0x0202428e @@ -111576,10 +111576,10 @@ _080414DA: adds r2, r4, 0 ands r1, r2 strh r1, [r0] - b _08041664 + b @08041664 .align 2, 0 .pool -_08041520: +@08041520: ldr r0, [r6] ldr r2, =0x000001a1 adds r0, r2 @@ -111587,9 +111587,9 @@ _08041520: mov r1, r8 ldrb r1, [r1] cmp r0, r1 - bcs _08041532 - b _080413CA -_08041532: + bcs @08041532 + b @080413CA +@08041532: ldr r0, [r6] movs r2, 0xD0 lsls r2, 1 @@ -111601,7 +111601,7 @@ _08041532: adds r1, r0, r3 movs r0, 0 strb r0, [r1] -_08041548: +@08041548: adds r3, r6, 0 ldr r0, [r6] ldr r2, =0x000001a1 @@ -111611,16 +111611,16 @@ _08041548: mov r8, r1 ldrb r4, [r1] cmp r0, r4 - bcc _0804155E - b _08041684 -_0804155E: + bcc @0804155E + b @08041684 +@0804155E: ldr r5, =0x02024064 ldr r4, =0x02022f58 ldr r7, =0x020242bc mov r12, r7 ldr r0, =0x0202420b mov r9, r0 -_0804156A: +@0804156A: ldr r1, =0x0202407e ldr r0, [r3] adds r3, r0, r2 @@ -111639,14 +111639,14 @@ _0804156A: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _080415BC + beq @080415BC ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] - b _08041670 + b @08041670 .align 2, 0 .pool -_080415BC: +@080415BC: ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] @@ -111658,7 +111658,7 @@ _080415BC: movs r1, 0x20 ands r0, r1 cmp r0, 0 - beq _08041670 + beq @08041670 movs r0, 0xFD strb r0, [r4] movs r0, 0x1 @@ -111685,7 +111685,7 @@ _080415BC: ldrb r3, [r4, 0xF] lsls r1, r3, 28 cmp r1, 0 - bne _08041644 + bne @08041644 lsls r2, 2 adds r2, r7 ldr r0, [r2] @@ -111703,10 +111703,10 @@ _080415BC: str r0, [r3] ldr r1, =0x02024214 ldr r0, =0x082daf05 - b _0804165C + b @0804165C .align 2, 0 .pool -_08041644: +@08041644: lsrs r1, 28 subs r1, 0x1 movs r0, 0xF @@ -111719,16 +111719,16 @@ _08041644: strb r0, [r4, 0xF] ldr r1, =0x02024214 ldr r0, =0x082daf20 -_0804165C: +@0804165C: str r0, [r1] ldr r0, [r1] bl b_call_bc_move_exec -_08041664: +@08041664: movs r0, 0x1 - b _08041714 + b @08041714 .align 2, 0 .pool -_08041670: +@08041670: adds r3, r6, 0 ldr r0, [r6] ldr r2, =0x000001a1 @@ -111737,9 +111737,9 @@ _08041670: mov r1, r8 ldrb r1, [r1] cmp r0, r1 - bcs _08041684 - b _0804156A -_08041684: + bcs @08041684 + b @0804156A +@08041684: ldr r0, [r6] movs r2, 0xD0 lsls r2, 1 @@ -111751,36 +111751,36 @@ _08041684: adds r1, r0, r3 movs r0, 0 strb r0, [r1] -_0804169A: +@0804169A: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 11 ands r0, r1 cmp r0, 0 - beq _08041708 + beq @08041708 ldr r0, [r6] adds r0, 0xDA ldrb r0, [r0] cmp r0, 0x2 - bne _08041708 + bne @08041708 ldr r1, =0x02024084 ldrh r0, [r1, 0x28] cmp r0, 0 - beq _08041708 + beq @08041708 adds r0, r1, 0 adds r0, 0x80 ldrh r0, [r0] cmp r0, 0 - beq _08041708 + beq @08041708 movs r4, 0 -_080416C6: +@080416C6: lsls r0, r4, 24 lsrs r0, 24 bl b_cancel_multi_turn_move_maybe adds r4, 0x1 cmp r4, 0x1 - ble _080416C6 + ble @080416C6 ldr r1, =0x02024214 ldr r0, =0x082db8f3 str r0, [r1] @@ -111793,17 +111793,17 @@ _080416C6: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08041664 + b @08041664 .align 2, 0 .pool -_08041708: +@08041708: mov r7, r10 ldr r0, [r7] ldr r1, =0xfeffffdf ands r0, r1 str r0, [r7] movs r0, 0 -_08041714: +@08041714: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -111816,7 +111816,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} @@ -111826,62 +111826,62 @@ sub_8041728: @ 8041728 movs r1, 0x80 ands r0, r1 cmp r0, 0 - beq _08041770 - b _08041A0A + beq @08041770 + b @08041A0A .align 2, 0 .pool -_08041744: +@08041744: ldr r0, =0x082da7c4 bl b_call_bc_move_exec ldr r0, [r5] adds r0, 0x4D movs r1, 0x2 - b _08041764 + b @08041764 .align 2, 0 .pool -_08041758: +@08041758: ldr r0, =0x082da7cd bl b_call_bc_move_exec ldr r0, [r5] adds r0, 0x4D movs r1, 0x5 -_08041764: +@08041764: strb r1, [r0] -_08041766: +@08041766: movs r0, 0x1 - b _08041A0C + b @08041A0C .align 2, 0 .pool -_08041770: +@08041770: ldr r0, =0x0202449c mov r8, r0 -_08041774: +@08041774: mov r1, r8 ldr r0, [r1] adds r0, 0x4D ldrb r0, [r0] cmp r0, 0x7 - bls _08041782 - b _080419FC -_08041782: + bls @08041782 + b @080419FC +@08041782: lsls r0, 2 - ldr r1, =_08041794 + ldr r1, =@08041794 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08041794: - .4byte _080417B4 - .4byte _08041806 - .4byte _080418A0 - .4byte _080418E2 - .4byte _080418F6 - .4byte _08041960 - .4byte _08041994 - .4byte _080419FC -_080417B4: +@08041794: + .4byte @080417B4 + .4byte @08041806 + .4byte @080418A0 + .4byte @080418E2 + .4byte @080418F6 + .4byte @08041960 + .4byte @08041994 + .4byte @080419FC +@080417B4: mov r4, r8 ldr r0, [r4] adds r0, 0x4E @@ -111896,9 +111896,9 @@ _080417B4: ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 - bge _08041806 + bge @08041806 ldr r6, =0x02024210 -_080417D4: +@080417D4: ldrb r0, [r6] ldr r2, =0x0832a328 lsls r1, r5, 2 @@ -111906,7 +111906,7 @@ _080417D4: ldr r4, [r1] ands r0, r4 cmp r0, 0 - beq _080417FC + beq @080417FC lsls r0, r5, 24 lsrs r0, 24 movs r1, 0x6 @@ -111914,17 +111914,17 @@ _080417D4: bl sub_80423F4 lsls r0, 24 cmp r0, 0 - bne _080417FC + bne @080417FC ldrb r0, [r6] bics r0, r4 strb r0, [r6] -_080417FC: +@080417FC: adds r5, 0x1 ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 - blt _080417D4 -_08041806: + blt @080417D4 +@08041806: ldr r0, =0x0202449c mov r8, r0 ldr r1, =0x0202420d @@ -111933,7 +111933,7 @@ _08041806: mov r5, r8 ldr r7, =0x02024084 ldr r6, =0x0202406e -_08041816: +@08041816: ldr r3, [r5] adds r1, r3, 0 adds r1, 0x4E @@ -111947,7 +111947,7 @@ _08041816: adds r0, r7 ldrh r0, [r0, 0x28] cmp r0, 0 - bne _0804185E + bne @0804185E adds r0, r3, 0 adds r0, 0xDF ldrb r1, [r0] @@ -111960,7 +111960,7 @@ _08041816: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _0804185E + bne @0804185E ldr r0, =0x02024210 ldrb r1, [r0] lsls r0, r4, 2 @@ -111968,9 +111968,9 @@ _08041816: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _0804185E - b _08041744 -_0804185E: + bne @0804185E + b @08041744 +@0804185E: ldr r0, [r5] adds r0, 0x4E ldrb r1, [r0] @@ -111981,16 +111981,16 @@ _0804185E: lsrs r1, 24 ldrb r0, [r0] cmp r1, r0 - bne _08041816 + bne @08041816 mov r1, r8 ldr r0, [r1] adds r0, 0x4D movs r1, 0x3 strb r1, [r0] - b _080419FC + b @080419FC .align 2, 0 .pool -_080418A0: +@080418A0: ldr r0, =0x0202420d ldrb r0, [r0] bl sub_803F9EC @@ -112005,21 +112005,21 @@ _080418A0: lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bne _080418D8 + bne @080418D8 ldr r0, [r2] adds r0, 0x4D movs r1, 0x3 strb r1, [r0] - b _080419FA + b @080419FA .align 2, 0 .pool -_080418D8: +@080418D8: ldr r0, [r2] adds r0, 0x4D movs r1, 0x1 strb r1, [r0] - b _080419FA -_080418E2: + b @080419FA +@080418E2: mov r4, r8 ldr r0, [r4] adds r0, 0x4E @@ -112030,14 +112030,14 @@ _080418E2: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_080418F6: +@080418F6: ldr r0, =0x0202420d mov r12, r0 ldr r7, =0x0202420c ldr r5, =0x0202449c ldr r2, =0x02024084 ldr r6, =0x0832a328 -_08041902: +@08041902: ldr r0, [r5] adds r4, r0, 0 adds r4, 0x4E @@ -112051,7 +112051,7 @@ _08041902: adds r0, r2 ldrh r0, [r0, 0x28] cmp r0, 0 - bne _08041930 + bne @08041930 ldr r0, =0x02024210 ldrb r1, [r0] lsls r0, r3, 2 @@ -112059,9 +112059,9 @@ _08041902: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _08041930 - b _08041758 -_08041930: + bne @08041930 + b @08041758 +@08041930: adds r0, r3, 0x1 strb r0, [r4] ldr r1, =0x0202406c @@ -112069,11 +112069,11 @@ _08041930: lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bne _08041902 - b _08041978 + bne @08041902 + b @08041978 .align 2, 0 .pool -_08041960: +@08041960: mov r1, r8 ldr r0, [r1] adds r0, 0x4E @@ -112085,24 +112085,24 @@ _08041960: lsrs r1, 24 ldrb r0, [r0] cmp r1, r0 - bne _08041988 -_08041978: + bne @08041988 +@08041978: mov r4, r8 ldr r0, [r4] adds r0, 0x4D movs r1, 0x6 strb r1, [r0] - b _080419FC + b @080419FC .align 2, 0 .pool -_08041988: +@08041988: mov r1, r8 ldr r0, [r1] adds r0, 0x4D movs r1, 0x4 strb r1, [r0] - b _080419FC -_08041994: + b @080419FC +@08041994: movs r0, 0 str r0, [sp] movs r0, 0x9 @@ -112113,9 +112113,9 @@ _08041994: lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _080419AE - b _08041766 -_080419AE: + beq @080419AE + b @08041766 +@080419AE: str r0, [sp] movs r0, 0xB movs r1, 0 @@ -112124,9 +112124,9 @@ _080419AE: bl ability_something lsls r0, 24 cmp r0, 0 - beq _080419C4 - b _08041766 -_080419C4: + beq @080419C4 + b @08041766 +@080419C4: movs r0, 0x1 movs r1, 0 movs r2, 0x1 @@ -112134,9 +112134,9 @@ _080419C4: lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _080419D8 - b _08041766 -_080419D8: + beq @080419D8 + b @08041766 +@080419D8: str r0, [sp] movs r0, 0x6 movs r1, 0 @@ -112145,28 +112145,28 @@ _080419D8: bl ability_something lsls r0, 24 cmp r0, 0 - beq _080419EE - b _08041766 -_080419EE: + beq @080419EE + b @08041766 +@080419EE: ldr r2, =0x0202449c ldr r1, [r2] adds r1, 0x4D ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_080419FA: +@080419FA: mov r8, r2 -_080419FC: +@080419FC: mov r4, r8 ldr r0, [r4] adds r0, 0x4D ldrb r0, [r0] cmp r0, 0x7 - beq _08041A0A - b _08041774 -_08041A0A: + beq @08041A0A + b @08041774 +@08041A0A: movs r0, 0 -_08041A0C: +@08041A0C: add sp, 0x4 pop {r3} mov r8, r3 @@ -112178,38 +112178,38 @@ _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 adds r5, r0, 0 ldrb r0, [r5] cmp r3, r0 - bge _08041A54 + bge @08041A54 ldr r4, =0x02024274 movs r6, 0x80 lsls r6, 16 ldr r2, =0x020240d4 -_08041A32: +@08041A32: ldr r1, [r2] adds r0, r1, 0 ands r0, r6 cmp r0, 0 - beq _08041A48 + beq @08041A48 ldrh r0, [r4] cmp r0, 0x63 - beq _08041A48 + beq @08041A48 ldr r0, =0xff7fffff ands r1, r0 str r1, [r2] -_08041A48: +@08041A48: adds r4, 0x2 adds r2, 0x58 adds r3, 0x1 ldrb r0, [r5] cmp r3, r0 - blt _08041A32 -_08041A54: + blt @08041A32 +@08041A54: pop {r4-r6} pop {r0} bx r0 @@ -112218,7 +112218,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 @@ -112231,49 +112231,49 @@ sub_8041A6C: @ 8041A6C mov r10, r1 ldr r2, =0x0202449c mov r8, r2 - b _08041A9A + b @08041A9A .align 2, 0 .pool -_08041A90: +@08041A90: mov r3, r9 cmp r3, 0 - beq _08041A9A - bl _08042388 -_08041A9A: + beq @08041A9A + bl @08042388 +@08041A9A: mov r4, r8 ldr r0, [r4] ldr r7, =0x000001a3 adds r0, r7 ldrb r0, [r0] cmp r0, 0xE - bls _08041AAC - bl _08042376 -_08041AAC: + bls @08041AAC + bl @08042376 +@08041AAC: lsls r0, 2 - ldr r1, =_08041AC0 + ldr r1, =@08041AC0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08041AC0: - .4byte _08041AFC - .4byte _08041B48 - .4byte _08041C90 - .4byte _08041D50 - .4byte _08041DC4 - .4byte _08041E40 - .4byte _08041EB8 - .4byte _08041F38 - .4byte _08041FC0 - .4byte _08042028 - .4byte _08042114 - .4byte _08042194 - .4byte _08042234 - .4byte _0804231C - .4byte _08042376 -_08041AFC: +@08041AC0: + .4byte @08041AFC + .4byte @08041B48 + .4byte @08041C90 + .4byte @08041D50 + .4byte @08041DC4 + .4byte @08041E40 + .4byte @08041EB8 + .4byte @08041F38 + .4byte @08041FC0 + .4byte @08042028 + .4byte @08042114 + .4byte @08042194 + .4byte @08042234 + .4byte @0804231C + .4byte @08042376 +@08041AFC: ldr r1, =0x02024084 ldr r3, =0x0202420b ldrb r2, [r3] @@ -112297,10 +112297,10 @@ _08041AFC: ldr r0, [r1] ldr r2, =0x000001a3 adds r1, r0, r2 - bl _08042370 + bl @08042370 .align 2, 0 .pool -_08041B48: +@08041B48: ldr r7, =0x02024084 ldr r4, =0x0202420b ldrb r1, [r4] @@ -112315,14 +112315,14 @@ _08041B48: mov r8, r3 ands r0, r3 cmp r0, 0 - bne _08041B68 - b _08041C6E -_08041B68: + bne @08041B68 + b @08041C6E +@08041B68: adds r0, r1, 0 bl sub_8050650 lsls r0, 24 cmp r0, 0 - beq _08041BC8 + beq @08041BC8 ldrb r0, [r4] adds r2, r0, 0 muls r2, r5 @@ -112351,10 +112351,10 @@ _08041B68: str r0, [r1] movs r4, 0x2 mov r9, r4 - b _08041C6E + b @08041C6E .align 2, 0 .pool -_08041BC8: +@08041BC8: ldrb r0, [r4] adds r1, r0, 0 muls r1, r5 @@ -112363,25 +112363,25 @@ _08041BC8: ldrb r0, [r0] movs r3, 0x1 cmp r0, 0x30 - bne _08041BDC + bne @08041BDC movs r3, 0x2 -_08041BDC: +@08041BDC: adds r2, r1, r6 ldr r1, [r2] adds r0, r1, 0 mov r7, r8 ands r0, r7 cmp r0, r3 - bcs _08041BF4 + bcs @08041BF4 movs r0, 0x8 negs r0, r0 ands r1, r0 str r1, [r2] - b _08041BF8 -_08041BF4: + b @08041BF8 +@08041BF4: subs r0, r1, r3 str r0, [r2] -_08041BF8: +@08041BF8: ldr r2, =0x02024084 ldr r0, =0x0202420b ldrb r1, [r0] @@ -112394,13 +112394,13 @@ _08041BF8: movs r0, 0x7 ands r4, r0 cmp r4, 0 - beq _08041C50 + beq @08041C50 ldr r0, =0x020241ea ldrh r0, [r0] cmp r0, 0xAD - beq _08041C6E + beq @08041C6E cmp r0, 0xD6 - beq _08041C6E + beq @08041C6E ldr r1, =0x02024214 ldr r0, =0x082db213 str r0, [r1] @@ -112412,10 +112412,10 @@ _08041BF8: str r0, [r2] movs r0, 0x2 mov r9, r0 - b _08041C6E + b @08041C6E .align 2, 0 .pool -_08041C50: +@08041C50: adds r2, 0x50 adds r2, r1, r2 ldr r0, [r2] @@ -112430,15 +112430,15 @@ _08041C50: str r0, [r1] movs r1, 0x2 mov r9, r1 -_08041C6E: +@08041C6E: ldr r1, =0x0202449c ldr r0, [r1] ldr r3, =0x000001a3 adds r2, r0, r3 - b _0804216A + b @0804216A .align 2, 0 .pool -_08041C90: +@08041C90: ldr r1, =0x02024084 ldr r7, =0x0202420b ldrb r0, [r7] @@ -112451,7 +112451,7 @@ _08041C90: movs r1, 0x20 ands r0, r1 cmp r0, 0 - beq _08041D30 + beq @08041D30 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -112460,7 +112460,7 @@ _08041C90: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq _08041D08 + beq @08041D08 ldr r2, =0x0831c898 ldr r0, =0x020241ea ldrh r1, [r0] @@ -112470,9 +112470,9 @@ _08041C90: adds r0, r2 ldrb r0, [r0] cmp r0, 0x7D - bne _08041CD6 - b _08042162 -_08041CD6: + bne @08041CD6 + b @08042162 +@08041CD6: ldr r1, =0x02024214 ldr r0, =0x082db26a str r0, [r1] @@ -112482,10 +112482,10 @@ _08041CD6: lsls r1, 2 orrs r0, r1 str r0, [r2] - b _08041D28 + b @08041D28 .align 2, 0 .pool -_08041D08: +@08041D08: ldrb r0, [r7] adds r2, r0, 0 muls r2, r6 @@ -112501,20 +112501,20 @@ _08041D08: str r0, [r1] ldr r0, =0x02024332 strb r4, [r0, 0x5] -_08041D28: +@08041D28: movs r7, 0x2 mov r9, r7 ldr r0, =0x0202449c mov r8, r0 -_08041D30: +@08041D30: mov r1, r8 ldr r0, [r1] ldr r2, =0x000001a3 adds r1, r0, r2 - b _08042370 + b @08042370 .align 2, 0 .pool -_08041D50: +@08041D50: ldr r1, =0x02024084 ldr r0, =0x0202420b ldrb r2, [r0] @@ -112524,9 +112524,9 @@ _08041D50: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x36 - beq _08041D66 - b _08042162 -_08041D66: + beq @08041D66 + b @08042162 +@08041D66: ldr r0, =0x020242bc lsls r1, r2, 3 subs r1, r2 @@ -112535,9 +112535,9 @@ _08041D66: ldrb r0, [r1, 0x18] lsls r0, 31 cmp r0, 0 - bne _08041D7A - b _08042162 -_08041D7A: + bne @08041D7A + b @08042162 +@08041D7A: adds r0, r2, 0 bl b_cancel_multi_turn_move_maybe ldr r2, =0x02024280 @@ -112557,10 +112557,10 @@ _08041D7A: movs r1, 0x1 orrs r0, r1 strb r0, [r2] - b _0804215E + b @0804215E .align 2, 0 .pool -_08041DC4: +@08041DC4: ldr r1, =0x02024084 ldr r3, =0x0202420b ldrb r2, [r3] @@ -112573,7 +112573,7 @@ _08041DC4: lsls r0, 15 ands r0, r1 cmp r0, 0 - beq _08041E10 + beq @08041E10 ldr r0, =0xffbfffff ands r1, r0 str r1, [r2] @@ -112598,15 +112598,15 @@ _08041DC4: str r0, [r2] movs r7, 0x1 mov r9, r7 -_08041E10: +@08041E10: ldr r1, =0x0202449c ldr r0, [r1] ldr r3, =0x000001a3 adds r2, r0, r3 - b _0804216A + b @0804216A .align 2, 0 .pool -_08041E40: +@08041E40: ldr r1, =0x02024084 ldr r3, =0x0202420b ldrb r2, [r3] @@ -112618,7 +112618,7 @@ _08041E40: movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _08041E8C + beq @08041E8C movs r0, 0x9 negs r0, r0 ands r1, r0 @@ -112644,15 +112644,15 @@ _08041E40: str r0, [r2] movs r4, 0x1 mov r9, r4 -_08041E8C: +@08041E8C: ldr r1, =0x0202449c ldr r0, [r1] ldr r7, =0x000001a3 adds r2, r0, r7 - b _0804216A + b @0804216A .align 2, 0 .pool -_08041EB8: +@08041EB8: ldr r0, =0x020242bc ldr r3, =0x0202420b ldrb r2, [r3] @@ -112664,9 +112664,9 @@ _08041EB8: ldrh r1, [r1, 0x4] ldrh r0, [r0] cmp r1, r0 - bne _08041F04 + bne @08041F04 cmp r1, 0 - beq _08041F04 + beq @08041F04 ldr r0, =0x0202433c lsls r2, 4 adds r2, r0 @@ -112690,15 +112690,15 @@ _08041EB8: str r0, [r2] movs r0, 0x1 mov r9, r0 -_08041F04: +@08041F04: ldr r1, =0x0202449c ldr r0, [r1] ldr r3, =0x000001a3 adds r2, r0, r3 - b _0804216A + b @0804216A .align 2, 0 .pool -_08041F38: +@08041F38: ldr r0, =0x020242bc ldr r4, =0x0202420b ldrb r3, [r4] @@ -112709,7 +112709,7 @@ _08041F38: ldrb r0, [r1, 0x13] lsls r0, 28 cmp r0, 0 - beq _08041F8C + beq @08041F8C ldr r2, =0x0831c898 ldr r0, =0x020241ea ldrh r1, [r0] @@ -112719,7 +112719,7 @@ _08041F38: adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0 - bne _08041F8C + bne @08041F8C ldr r0, =0x0202433c lsls r2, r3, 4 adds r2, r0 @@ -112740,15 +112740,15 @@ _08041F38: str r0, [r2] movs r4, 0x1 mov r9, r4 -_08041F8C: +@08041F8C: ldr r1, =0x0202449c ldr r0, [r1] ldr r7, =0x000001a3 adds r2, r0, r7 - b _0804216A + b @0804216A .align 2, 0 .pool -_08041FC0: +@08041FC0: ldr r4, =0x0202420b ldrb r0, [r4] ldr r1, =0x020241ea @@ -112756,7 +112756,7 @@ _08041FC0: bl sub_8040130 lsls r0, 24 cmp r0, 0 - beq _08041FFE + beq @08041FFE ldr r0, =0x0202433c ldrb r2, [r4] lsls r2, 4 @@ -112778,15 +112778,15 @@ _08041FC0: str r0, [r2] movs r0, 0x1 mov r9, r0 -_08041FFE: +@08041FFE: ldr r1, =0x0202449c ldr r0, [r1] ldr r3, =0x000001a3 adds r2, r0, r3 - b _0804216A + b @0804216A .align 2, 0 .pool -_08042028: +@08042028: ldr r7, =0x02024084 ldr r5, =0x0202420b ldrb r0, [r5] @@ -112800,7 +112800,7 @@ _08042028: adds r0, r1, 0 ands r0, r3 cmp r0, 0 - beq _080420FA + beq @080420FA subs r0, r1, 0x1 str r0, [r2] ldrb r0, [r5] @@ -112809,21 +112809,21 @@ _08042028: ldr r0, [r0] ands r0, r3 cmp r0, 0 - beq _080420E8 + beq @080420E8 bl GenerateRandomNumber movs r1, 0x1 movs r2, 0x1 ands r2, r0 cmp r2, 0 - beq _0804207C + beq @0804207C ldr r1, =0x02024332 movs r0, 0 strb r0, [r1, 0x5] bl b_movescr_stack_push_cursor - b _080420C6 + b @080420C6 .align 2, 0 .pool -_0804207C: +@0804207C: ldr r0, =0x02024332 movs r4, 0x1 strb r1, [r0, 0x5] @@ -112860,31 +112860,31 @@ _0804207C: lsls r1, 12 orrs r0, r1 str r0, [r2] -_080420C6: +@080420C6: ldr r1, =0x02024214 ldr r0, =0x082db2bd - b _080420F0 + b @080420F0 .align 2, 0 .pool -_080420E8: +@080420E8: bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =0x082db300 -_080420F0: +@080420F0: str r0, [r1] movs r4, 0x1 mov r9, r4 ldr r7, =0x0202449c mov r8, r7 -_080420FA: +@080420FA: mov r1, r8 ldr r0, [r1] ldr r2, =0x000001a3 adds r1, r0, r2 - b _08042370 + b @08042370 .align 2, 0 .pool -_08042114: +@08042114: ldr r1, =0x02024084 ldr r4, =0x0202420b ldrb r2, [r4] @@ -112896,14 +112896,14 @@ _08042114: movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _08042162 + beq @08042162 bl GenerateRandomNumber lsls r0, 16 movs r1, 0xC0 lsls r1, 10 ands r1, r0 cmp r1, 0 - bne _08042162 + bne @08042162 ldr r0, =0x0202433c ldrb r2, [r4] lsls r2, 4 @@ -112921,23 +112921,23 @@ _08042114: lsls r1, 12 orrs r0, r1 str r0, [r2] -_0804215E: +@0804215E: movs r3, 0x1 mov r9, r3 -_08042162: +@08042162: ldr r1, =0x0202449c ldr r0, [r1] ldr r4, =0x000001a3 adds r2, r0, r4 -_0804216A: +@0804216A: ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] mov r8, r1 - b _08042376 + b @08042376 .align 2, 0 .pool -_08042194: +@08042194: ldr r1, =0x02024084 ldr r4, =0x0202420b ldrb r2, [r4] @@ -112950,7 +112950,7 @@ _08042194: lsls r0, 12 ands r1, r0 cmp r1, 0 - beq _0804220E + beq @0804220E lsrs r0, r1, 16 bl sub_806F8A8 ldr r1, =0x02024474 @@ -112959,12 +112959,12 @@ _08042194: movs r1, 0x1 ands r1, r0 cmp r1, 0 - beq _080421D8 + beq @080421D8 bl b_movescr_stack_push_cursor - b _08042200 + b @08042200 .align 2, 0 .pool -_080421D8: +@080421D8: ldr r0, =0x082db334 bl b_movescr_stack_push ldr r2, =0x02024280 @@ -112983,7 +112983,7 @@ _080421D8: strb r0, [r2, 0x1] ldrb r0, [r4] bl b_cancel_multi_turn_move_maybe -_08042200: +@08042200: ldr r1, =0x02024214 ldr r0, =0x082db327 str r0, [r1] @@ -112991,15 +112991,15 @@ _08042200: mov r9, r7 ldr r0, =0x0202449c mov r8, r0 -_0804220E: +@0804220E: mov r1, r8 ldr r0, [r1] ldr r2, =0x000001a3 adds r1, r0, r2 - b _08042370 + b @08042370 .align 2, 0 .pool -_08042234: +@08042234: ldr r1, =0x02024084 ldr r6, =0x0202420b ldrb r0, [r6] @@ -113013,7 +113013,7 @@ _08042234: adds r0, r2, 0 ands r0, r4 cmp r0, 0 - beq _08042306 + beq @08042306 ldr r7, =0xffffff00 adds r0, r2, r7 str r0, [r3] @@ -113024,19 +113024,19 @@ _08042234: ldr r0, [r0] ands r0, r4 cmp r0, 0 - beq _08042280 + beq @08042280 ldr r1, =0x02024214 ldr r0, =0x082dad71 - b _08042300 + b @08042300 .align 2, 0 .pool -_08042280: +@08042280: ldr r3, =0x020241f8 lsls r0, r2, 2 adds r0, r3 ldr r0, [r0] cmp r0, 0 - beq _080422FC + beq @080422FC ldr r1, =0x020241ea movs r0, 0x75 strh r0, [r1] @@ -113062,37 +113062,37 @@ _08042280: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _080422CA + beq @080422CA movs r0, 0x75 movs r1, 0x1 bl sub_80458E0 strb r0, [r4] -_080422CA: +@080422CA: ldr r1, =0x02024214 ldr r0, =0x082dad7c str r0, [r1] ldr r2, =0x0202449c mov r8, r2 - b _08042302 + b @08042302 .align 2, 0 .pool -_080422FC: +@080422FC: ldr r1, =0x02024214 ldr r0, =0x082dadc4 -_08042300: +@08042300: str r0, [r1] -_08042302: +@08042302: movs r3, 0x1 mov r9, r3 -_08042306: +@08042306: mov r4, r8 ldr r0, [r4] ldr r7, =0x000001a3 adds r1, r0, r7 - b _08042370 + b @08042370 .align 2, 0 .pool -_0804231C: +@0804231C: ldr r1, =0x02024084 ldr r0, =0x0202420b ldrb r2, [r0] @@ -113104,7 +113104,7 @@ _0804231C: movs r0, 0x20 ands r0, r3 cmp r0, 0 - beq _08042368 + beq @08042368 ldr r2, =0x0831c898 ldr r0, =0x020241ea ldrh r1, [r0] @@ -113114,7 +113114,7 @@ _0804231C: adds r0, r2 ldrb r0, [r0] cmp r0, 0x7D - bne _08042360 + bne @08042360 movs r0, 0x21 negs r0, r0 ands r3, r0 @@ -113126,33 +113126,33 @@ _0804231C: ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] -_08042360: +@08042360: movs r0, 0x2 mov r9, r0 ldr r1, =0x0202449c mov r8, r1 -_08042368: +@08042368: mov r2, r8 ldr r0, [r2] ldr r3, =0x000001a3 adds r1, r0, r3 -_08042370: +@08042370: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_08042376: +@08042376: mov r4, r8 ldr r0, [r4] ldr r7, =0x000001a3 adds r0, r7 ldrb r0, [r0] cmp r0, 0xE - beq _08042388 - bl _08041A90 -_08042388: + beq @08042388 + bl @08041A90 +@08042388: mov r0, r9 cmp r0, 0x2 - bne _080423B4 + bne @080423B4 ldr r4, =0x02024064 ldr r0, =0x0202420b ldrb r0, [r0] @@ -113170,7 +113170,7 @@ _08042388: bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_080423B4: +@080423B4: mov r0, r9 add sp, 0x10 pop {r3-r5} @@ -113185,7 +113185,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 @@ -113204,27 +113204,27 @@ sub_80423F4: @ 80423F4 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _08042424 + bne @08042424 movs r0, 0 - b _080426A0 + b @080426A0 .align 2, 0 .pool -_08042424: +@08042424: movs r0, 0x80 lsls r0, 15 ands r0, r1 cmp r0, 0 - beq _0804249C + beq @0804249C adds r0, r4, 0 bl battle_side_get_owner lsls r0, 24 ldr r1, =0x02024744 mov r8, r1 cmp r0, 0 - bne _08042442 + bne @08042442 ldr r2, =0x020244ec mov r8, r2 -_08042442: +@08042442: movs r0, 0x2 ands r0, r4 lsls r0, 24 @@ -113233,9 +113233,9 @@ _08042442: adds r4, r0, r6 adds r0, r4, 0x3 cmp r4, r0 - bge _0804248C + bge @0804248C adds r7, r0, 0 -_08042456: +@08042456: movs r0, 0x64 muls r0, r4 mov r1, r8 @@ -113244,55 +113244,55 @@ _08042456: movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _08042486 + beq @08042486 adds r0, r5, 0 movs r1, 0x41 bl pokemon_getattr cmp r0, 0 - beq _08042486 + beq @08042486 adds r0, r5, 0 movs r1, 0x41 bl pokemon_getattr movs r1, 0xCE lsls r1, 1 cmp r0, r1 - bne _0804248C -_08042486: + bne @0804248C +@08042486: adds r4, 0x1 cmp r4, r7 - blt _08042456 -_0804248C: + blt @08042456 +@0804248C: movs r1, 0 lsls r0, r6, 1 adds r0, r6 - b _08042556 + b @08042556 .align 2, 0 .pool -_0804249C: +@0804249C: movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0804256C + beq @0804256C movs r0, 0x80 lsls r0, 16 ands r1, r0 cmp r1, 0 - beq _080424E4 + beq @080424E4 adds r0, r4, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _080424D0 + bne @080424D0 ldr r2, =0x020244ec mov r8, r2 adds r0, r4, 0 bl sub_806D864 lsls r0, 24 lsrs r7, r0, 24 - b _08042502 + b @08042502 .align 2, 0 .pool -_080424D0: +@080424D0: ldr r0, =0x02024744 mov r8, r0 movs r1, 0x1 @@ -113300,10 +113300,10 @@ _080424D0: negs r0, r1 orrs r0, r1 lsrs r6, r0, 31 - b _0804250C + b @0804250C .align 2, 0 .pool -_080424E4: +@080424E4: adds r0, r4, 0 bl sub_806D864 lsls r0, 24 @@ -113314,23 +113314,23 @@ _080424E4: ldr r1, =0x02024744 mov r8, r1 cmp r0, 0 - bne _08042502 + bne @08042502 ldr r2, =0x020244ec mov r8, r2 -_08042502: +@08042502: adds r0, r7, 0 bl sub_806D82C lsls r0, 24 lsrs r6, r0, 24 -_0804250C: +@0804250C: lsls r0, r6, 1 adds r4, r0, r6 adds r1, r4, 0x3 mov r9, r0 cmp r4, r1 - bge _08042550 + bge @08042550 adds r7, r1, 0 -_0804251A: +@0804251A: movs r0, 0x64 muls r0, r4 mov r1, r8 @@ -113339,66 +113339,66 @@ _0804251A: movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _0804254A + beq @0804254A adds r0, r5, 0 movs r1, 0x41 bl pokemon_getattr cmp r0, 0 - beq _0804254A + beq @0804254A adds r0, r5, 0 movs r1, 0x41 bl pokemon_getattr movs r1, 0xCE lsls r1, 1 cmp r0, r1 - bne _08042550 -_0804254A: + bne @08042550 +@0804254A: adds r4, 0x1 cmp r4, r7 - blt _0804251A -_08042550: + blt @0804251A +@08042550: movs r1, 0 mov r2, r9 adds r0, r2, r6 -_08042556: +@08042556: adds r0, 0x3 cmp r4, r0 - bne _0804255E + bne @0804255E movs r1, 0x1 -_0804255E: +@0804255E: adds r0, r1, 0 - b _080426A0 + b @080426A0 .align 2, 0 .pool -_0804256C: +@0804256C: movs r0, 0x80 lsls r0, 8 ands r1, r0 cmp r1, 0 - beq _080425DA + beq @080425DA adds r0, r4, 0 bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080425DA + bne @080425DA ldr r0, =0x02024744 mov r8, r0 movs r6, 0x3 cmp r4, 0x1 - bne _08042590 + bne @08042590 movs r6, 0 -_08042590: +@08042590: adds r4, r6, 0 adds r6, r4, 0x3 - b _0804259E + b @0804259E .align 2, 0 .pool -_0804259C: +@0804259C: adds r4, 0x1 -_0804259E: +@0804259E: cmp r4, r6 - bge _080425D2 + bge @080425D2 movs r0, 0x64 muls r0, r4 mov r1, r8 @@ -113407,31 +113407,31 @@ _0804259E: movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _0804259C + beq @0804259C adds r0, r5, 0 movs r1, 0x41 bl pokemon_getattr cmp r0, 0 - beq _0804259C + beq @0804259C adds r0, r5, 0 movs r1, 0x41 bl pokemon_getattr movs r1, 0xCE lsls r1, 1 cmp r0, r1 - beq _0804259C -_080425D2: + beq @0804259C +@080425D2: movs r0, 0 cmp r4, r6 - bne _080426A0 - b _0804269E -_080425DA: + bne @080426A0 + b @0804269E +@080425DA: adds r0, r4, 0 bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08042608 + bne @08042608 movs r0, 0x1 bl battle_get_side_with_given_state lsls r0, 24 @@ -113442,10 +113442,10 @@ _080425DA: lsrs r6, r0, 24 ldr r2, =0x02024744 mov r8, r2 - b _08042620 + b @08042620 .align 2, 0 .pool -_08042608: +@08042608: movs r0, 0 bl battle_get_side_with_given_state lsls r0, 24 @@ -113456,27 +113456,27 @@ _08042608: lsrs r6, r0, 24 ldr r0, =0x020244ec mov r8, r0 -_08042620: +@08042620: mov r1, r10 cmp r1, 0x6 - bne _08042630 + bne @08042630 ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 ldrb r0, [r0] mov r10, r0 -_08042630: +@08042630: mov r2, r9 cmp r2, 0x6 - bne _08042640 + bne @08042640 ldr r1, =0x0202406e lsls r0, r6, 1 adds r0, r1 ldrb r0, [r0] mov r9, r0 -_08042640: +@08042640: movs r4, 0 -_08042642: +@08042642: movs r0, 0x64 muls r0, r4 mov r1, r8 @@ -113485,46 +113485,46 @@ _08042642: movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _08042692 + beq @08042692 adds r0, r5, 0 movs r1, 0x41 bl pokemon_getattr cmp r0, 0 - beq _08042692 + beq @08042692 adds r0, r5, 0 movs r1, 0x41 bl pokemon_getattr movs r1, 0xCE lsls r1, 1 cmp r0, r1 - beq _08042692 + beq @08042692 cmp r4, r10 - beq _08042692 + beq @08042692 cmp r4, r9 - beq _08042692 + beq @08042692 ldr r0, =0x0202449c ldr r1, [r0] adds r0, r7, r1 adds r0, 0x5C ldrb r0, [r0] cmp r4, r0 - beq _08042692 + beq @08042692 adds r0, r6, r1 adds r0, 0x5C ldrb r0, [r0] cmp r4, r0 - bne _08042698 -_08042692: + bne @08042698 +@08042692: adds r4, 0x1 cmp r4, 0x5 - ble _08042642 -_08042698: + ble @08042642 +@08042698: movs r0, 0 cmp r4, 0x6 - bne _080426A0 -_0804269E: + bne @080426A0 +@0804269E: movs r0, 0x1 -_080426A0: +@080426A0: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -113537,7 +113537,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 @@ -113550,15 +113550,15 @@ castform_switch: @ 80426BC ldrh r1, [r4] ldr r0, =0x00000181 cmp r1, r0 - bne _08042760 + bne @08042760 adds r0, r4, 0 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x3B - bne _08042760 + bne @08042760 ldrh r0, [r4, 0x28] cmp r0, 0 - beq _08042760 + beq @08042760 str r5, [sp] movs r0, 0x13 movs r1, 0 @@ -113567,7 +113567,7 @@ castform_switch: @ 80426BC bl ability_something lsls r0, 24 cmp r0, 0 - bne _0804270E + bne @0804270E str r5, [sp] movs r0, 0x13 movs r1, 0 @@ -113576,25 +113576,25 @@ castform_switch: @ 80426BC bl ability_something lsls r0, 24 cmp r0, 0 - beq _08042734 -_0804270E: + beq @08042734 +@0804270E: adds r2, r4, 0 adds r2, 0x21 ldrb r0, [r2] cmp r0, 0 - beq _08042734 + beq @08042734 adds r1, r4, 0 adds r1, 0x22 ldrb r0, [r1] cmp r0, 0 - beq _08042734 + beq @08042734 strb r5, [r2] strb r5, [r1] movs r0, 0x1 - b _08042818 + b @08042818 .align 2, 0 .pool -_08042734: +@08042734: movs r0, 0 str r0, [sp] movs r0, 0x13 @@ -113605,7 +113605,7 @@ _08042734: lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _08042760 + bne @08042760 str r0, [sp] movs r0, 0x13 movs r1, 0 @@ -113614,18 +113614,18 @@ _08042734: bl ability_something lsls r0, 24 cmp r0, 0 - beq _08042764 -_08042760: + beq @08042764 +@08042760: movs r0, 0 - b _08042818 -_08042764: + b @08042818 +@08042764: ldr r1, =0x020243cc ldrh r0, [r1] movs r2, 0xE7 ands r2, r0 adds r4, r1, 0 cmp r2, 0 - bne _08042792 + bne @08042792 ldr r1, =0x02024084 movs r0, 0x58 muls r0, r6 @@ -113634,20 +113634,20 @@ _08042764: adds r3, 0x21 ldrb r0, [r3] cmp r0, 0 - beq _08042792 + beq @08042792 adds r1, 0x22 ldrb r0, [r1] cmp r0, 0 - beq _08042792 + beq @08042792 strb r2, [r3] strb r2, [r1] movs r5, 0x1 -_08042792: +@08042792: ldrh r1, [r4] movs r0, 0x60 ands r0, r1 cmp r0, 0 - beq _080427BE + beq @080427BE ldr r1, =0x02024084 movs r0, 0x58 muls r0, r6 @@ -113656,21 +113656,21 @@ _08042792: adds r2, 0x21 ldrb r0, [r2] cmp r0, 0xA - beq _080427BE + beq @080427BE adds r1, 0x22 ldrb r0, [r1] cmp r0, 0xA - beq _080427BE + beq @080427BE movs r0, 0xA strb r0, [r2] strb r0, [r1] movs r5, 0x2 -_080427BE: +@080427BE: ldrh r1, [r4] movs r0, 0x7 ands r0, r1 cmp r0, 0 - beq _080427EA + beq @080427EA ldr r1, =0x02024084 movs r0, 0x58 muls r0, r6 @@ -113679,21 +113679,21 @@ _080427BE: adds r2, 0x21 ldrb r0, [r2] cmp r0, 0xB - beq _080427EA + beq @080427EA adds r1, 0x22 ldrb r0, [r1] cmp r0, 0xB - beq _080427EA + beq @080427EA movs r0, 0xB strb r0, [r2] strb r0, [r1] movs r5, 0x3 -_080427EA: +@080427EA: ldrh r1, [r4] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08042816 + beq @08042816 ldr r1, =0x02024084 movs r0, 0x58 muls r0, r6 @@ -113702,18 +113702,18 @@ _080427EA: adds r2, 0x21 ldrb r0, [r2] cmp r0, 0xF - beq _08042816 + beq @08042816 adds r1, 0x22 ldrb r0, [r1] cmp r0, 0xF - beq _08042816 + beq @08042816 movs r0, 0xF strb r0, [r2] strb r0, [r1] movs r5, 0x4 -_08042816: +@08042816: adds r0, r5, 0 -_08042818: +@08042818: add sp, 0x4 pop {r4-r6} pop {r1} @@ -113723,7 +113723,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 @@ -113751,15 +113751,15 @@ ability_something: @ 8042828 ldrb r0, [r5] ldrb r1, [r1] cmp r0, r1 - bcc _08042864 + bcc @08042864 mov r1, r10 strb r1, [r5] -_08042864: +@08042864: ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08042894 + bne @08042894 ldr r1, =0x0202406e ldrb r0, [r5] lsls r0, 1 @@ -113768,10 +113768,10 @@ _08042864: movs r0, 0x64 muls r1, r0 ldr r0, =0x020244ec - b _080428A4 + b @080428A4 .align 2, 0 .pool -_08042894: +@08042894: ldr r1, =0x0202406e ldrb r0, [r5] lsls r0, 1 @@ -113780,22 +113780,22 @@ _08042894: movs r0, 0x64 muls r1, r0 ldr r0, =0x02024744 -_080428A4: +@080428A4: adds r7, r1, r0 ldr r5, =0x0202420c ldr r1, =0x0202406c ldrb r0, [r5] ldrb r1, [r1] cmp r0, r1 - bcc _080428B6 + bcc @080428B6 mov r2, r10 strb r2, [r5] -_080428B6: +@080428B6: ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _080428E8 + bne @080428E8 ldr r1, =0x0202406e ldrb r0, [r5] lsls r0, 1 @@ -113804,10 +113804,10 @@ _080428B6: movs r0, 0x64 muls r1, r0 ldr r0, =0x020244ec - b _080428F8 + b @080428F8 .align 2, 0 .pool -_080428E8: +@080428E8: ldr r1, =0x0202406e ldrb r0, [r5] lsls r0, 1 @@ -113816,7 +113816,7 @@ _080428E8: movs r0, 0x64 muls r1, r0 ldr r0, =0x02024744 -_080428F8: +@080428F8: adds r5, r1, r0 adds r0, r7, 0 movs r1, 0xB @@ -113843,19 +113843,19 @@ _080428F8: movs r1, 0x80 ands r0, r1 cmp r0, 0 - beq _0804293A - bl _0804443A -_0804293A: + beq @0804293A + bl @0804443A +@0804293A: mov r3, r8 cmp r3, 0 - beq _08042958 + beq @08042958 ldr r0, =0x0202420a strb r3, [r0] adds r7, r0, 0 - b _0804296E + b @0804296E .align 2, 0 .pool -_08042958: +@08042958: ldr r2, =0x0202420a ldr r1, =0x02024084 movs r0, 0x58 @@ -113867,172 +113867,172 @@ _08042958: ldrb r0, [r0] strb r0, [r2] adds r7, r2, 0 -_0804296E: +@0804296E: cmp r4, 0 - beq _08042980 + beq @08042980 adds r5, r4, 0 - b _08042984 + b @08042984 .align 2, 0 .pool -_08042980: +@08042980: ldr r0, =0x020241ea ldrh r5, [r0] -_08042984: +@08042984: ldr r1, =0x0202449c ldr r0, [r1] ldrb r0, [r0, 0x13] mov r8, r1 cmp r0, 0 - beq _080429A0 + beq @080429A0 movs r3, 0x3F ands r3, r0 - b _080429AC + b @080429AC .align 2, 0 .pool -_080429A0: +@080429A0: ldr r1, =0x0831c898 lsls r0, r5, 1 adds r0, r5 lsls r0, 2 adds r0, r1 ldrb r3, [r0, 0x2] -_080429AC: +@080429AC: ldr r0, [sp, 0x4] cmp r0, 0x13 - bls _080429B6 - bl _0804441E -_080429B6: + bls @080429B6 + bl @0804441E +@080429B6: lsls r0, 2 - ldr r1, =_080429C8 + ldr r1, =@080429C8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080429C8: - .4byte _08042A18 - .4byte _08042CDC - .4byte _08042EF8 - .4byte _08042F8C - .4byte _080431AC - .4byte _08043908 - .4byte _08043C6C - .4byte _08043CBC - .4byte _08043D40 - .4byte _08043DC4 - .4byte _08043FE4 - .4byte _08043E08 - .4byte _08044028 - .4byte _08044084 - .4byte _080440E0 - .4byte _080441DC - .4byte _08044220 - .4byte _0804427C - .4byte _080443EC - .4byte _08044196 -_08042A18: +@080429C8: + .4byte @08042A18 + .4byte @08042CDC + .4byte @08042EF8 + .4byte @08042F8C + .4byte @080431AC + .4byte @08043908 + .4byte @08043C6C + .4byte @08043CBC + .4byte @08043D40 + .4byte @08043DC4 + .4byte @08043FE4 + .4byte @08043E08 + .4byte @08044028 + .4byte @08044084 + .4byte @080440E0 + .4byte @080441DC + .4byte @08044220 + .4byte @0804427C + .4byte @080443EC + .4byte @08044196 +@08042A18: ldr r2, =0x0202420b ldr r0, =0x0202406c ldrb r1, [r2] adds r5, r0, 0 ldrb r3, [r5] cmp r1, r3 - bcc _08042A2A + bcc @08042A2A mov r0, r10 strb r0, [r2] -_08042A2A: +@08042A2A: ldrb r0, [r7] cmp r0, 0x2D - bne _08042A32 - b _08042BA8 -_08042A32: + bne @08042A32 + b @08042BA8 +@08042A32: cmp r0, 0x2D - bgt _08042A64 + bgt @08042A64 cmp r0, 0xD - bne _08042A3C - b _08042CA4 -_08042A3C: + bne @08042A3C + b @08042CA4 +@08042A3C: cmp r0, 0xD - bgt _08042A54 + bgt @08042A54 cmp r0, 0x2 - bne _08042A46 - b _08042B78 -_08042A46: - bl _0804441E + bne @08042A46 + b @08042B78 +@08042A46: + bl @0804441E .align 2, 0 .pool -_08042A54: +@08042A54: cmp r0, 0x16 - bne _08042A5A - b _08042C08 -_08042A5A: + bne @08042A5A + b @08042C08 +@08042A5A: cmp r0, 0x24 - bne _08042A60 - b _08042C68 -_08042A60: - bl _0804441E -_08042A64: + bne @08042A60 + b @08042C68 +@08042A60: + bl @0804441E +@08042A64: cmp r0, 0x46 - bne _08042A6A - b _08042BD8 -_08042A6A: + bne @08042A6A + b @08042BD8 +@08042A6A: cmp r0, 0x46 - bgt _08042A78 + bgt @08042A78 cmp r0, 0x3B - bne _08042A74 - b _08042C3C -_08042A74: - bl _0804441E -_08042A78: + bne @08042A74 + b @08042C3C +@08042A74: + bl @0804441E +@08042A78: cmp r0, 0x4D - bne _08042A7E - b _08042CA4 -_08042A7E: + bne @08042A7E + b @08042CA4 +@08042A7E: cmp r0, 0xFF - beq _08042A86 - bl _0804441E -_08042A86: + beq @08042A86 + bl @0804441E +@08042A86: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 - bne _08042B4C + bne @08042B4C bl weather_get_current lsls r0, 24 lsrs r0, 24 subs r0, 0x3 cmp r0, 0xA - bhi _08042B4C + bhi @08042B4C lsls r0, 2 - ldr r1, =_08042AB4 + ldr r1, =@08042AB4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08042AB4: - .4byte _08042AE0 - .4byte _08042B4C - .4byte _08042AE0 - .4byte _08042B4C - .4byte _08042B4C - .4byte _08042B04 - .4byte _08042B4C - .4byte _08042B4C - .4byte _08042B4C - .4byte _08042B28 - .4byte _08042AE0 -_08042AE0: +@08042AB4: + .4byte @08042AE0 + .4byte @08042B4C + .4byte @08042AE0 + .4byte @08042B4C + .4byte @08042B4C + .4byte @08042B04 + .4byte @08042B4C + .4byte @08042B4C + .4byte @08042B4C + .4byte @08042B28 + .4byte @08042AE0 +@08042AE0: ldr r2, =0x020243cc ldrh r1, [r2] movs r0, 0x7 ands r0, r1 cmp r0, 0 - bne _08042B4C + bne @08042B4C movs r0, 0x5 strh r0, [r2] ldr r1, =0x02024474 @@ -114040,69 +114040,69 @@ _08042AE0: strb r0, [r1, 0x10] mov r2, r10 strb r2, [r1, 0x17] - b _08042B42 + b @08042B42 .align 2, 0 .pool -_08042B04: +@08042B04: ldr r3, =0x020243cc ldrh r1, [r3] movs r2, 0x18 adds r0, r2, 0 ands r0, r1 cmp r0, 0 - bne _08042B4C + bne @08042B4C strh r2, [r3] ldr r1, =0x02024474 movs r0, 0xC strb r0, [r1, 0x10] mov r3, r10 strb r3, [r1, 0x17] - b _08042B42 + b @08042B42 .align 2, 0 .pool -_08042B28: +@08042B28: ldr r3, =0x020243cc ldrh r1, [r3] movs r2, 0x60 adds r0, r2, 0 ands r0, r1 cmp r0, 0 - bne _08042B4C + bne @08042B4C strh r2, [r3] ldr r1, =0x02024474 movs r0, 0xB strb r0, [r1, 0x10] mov r5, r10 strb r5, [r1, 0x17] -_08042B42: +@08042B42: mov r0, r9 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r9, r0 -_08042B4C: +@08042B4C: mov r0, r9 cmp r0, 0 - bne _08042B56 - bl _0804443A -_08042B56: + bne @08042B56 + bl @0804443A +@08042B56: bl weather_get_current ldr r1, =0x02024332 strb r0, [r1, 0x5] ldr r0, =0x082dace7 bl b_push_move_exec - bl _0804441E + bl @0804441E .align 2, 0 .pool -_08042B78: +@08042B78: ldr r2, =0x020243cc ldrh r1, [r2] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08042B88 - bl _0804441E -_08042B88: + beq @08042B88 + bl @0804441E +@08042B88: movs r0, 0x5 strh r0, [r2] ldr r0, =0x082db430 @@ -114110,18 +114110,18 @@ _08042B88: ldr r0, =0x02024474 mov r1, r10 strb r1, [r0, 0x17] - bl _080443D0 + bl @080443D0 .align 2, 0 .pool -_08042BA8: +@08042BA8: ldr r2, =0x020243cc ldrh r1, [r2] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08042BB8 - bl _0804441E -_08042BB8: + beq @08042BB8 + bl @0804441E +@08042BB8: movs r0, 0x18 strh r0, [r2] ldr r0, =0x082db470 @@ -114129,18 +114129,18 @@ _08042BB8: ldr r0, =0x02024474 mov r2, r10 strb r2, [r0, 0x17] - bl _080443D0 + bl @080443D0 .align 2, 0 .pool -_08042BD8: +@08042BD8: ldr r2, =0x020243cc ldrh r1, [r2] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _08042BE8 - bl _0804441E -_08042BE8: + beq @08042BE8 + bl @0804441E +@08042BE8: movs r0, 0x60 strh r0, [r2] ldr r0, =0x082db52a @@ -114148,10 +114148,10 @@ _08042BE8: ldr r0, =0x02024474 mov r3, r10 strb r3, [r0, 0x17] - bl _080443D0 + bl @080443D0 .align 2, 0 .pool -_08042C08: +@08042C08: ldr r0, =0x0202437c mov r5, r10 lsls r2, r5, 2 @@ -114161,9 +114161,9 @@ _08042C08: ldrb r0, [r3] lsls r0, 28 cmp r0, 0 - bge _08042C20 - bl _0804441E -_08042C20: + bge @08042C20 + bl @0804441E +@08042C20: ldr r1, =0x020242ac adds r1, r2, r1 ldr r0, [r1] @@ -114173,28 +114173,28 @@ _08042C20: str r0, [r1] ldrb r0, [r3] movs r1, 0x8 - b _08042C92 + b @08042C92 .align 2, 0 .pool -_08042C3C: +@08042C3C: mov r0, r10 bl castform_switch lsls r0, 24 lsrs r0, 24 mov r9, r0 cmp r0, 0 - bne _08042C50 - bl _0804443A -_08042C50: + bne @08042C50 + bl @0804443A +@08042C50: ldr r0, =0x082db4a9 bl b_push_move_exec ldr r0, =0x02024474 mov r1, r10 strb r1, [r0, 0x17] - bl _080442E2 + bl @080442E2 .align 2, 0 .pool -_08042C68: +@08042C68: ldr r0, =0x0202437c mov r3, r10 lsls r2, r3, 2 @@ -114204,9 +114204,9 @@ _08042C68: ldrb r0, [r3] lsls r0, 27 cmp r0, 0 - bge _08042C80 - bl _0804441E -_08042C80: + bge @08042C80 + bl @0804441E +@08042C80: ldr r1, =0x020242ac adds r1, r2, r1 ldr r0, [r1] @@ -114216,39 +114216,39 @@ _08042C80: str r0, [r1] ldrb r0, [r3] movs r1, 0x10 -_08042C92: +@08042C92: orrs r0, r1 strb r0, [r3] - bl _0804441E + bl @0804441E .align 2, 0 .pool -_08042CA4: +@08042CA4: movs r6, 0 ldrb r5, [r5] cmp r6, r5 - bcc _08042CB0 - bl _0804441E -_08042CB0: + bcc @08042CB0 + bl @0804441E +@08042CB0: adds r0, r6, 0 bl castform_switch lsls r0, 24 lsrs r0, 24 mov r9, r0 cmp r0, 0 - beq _08042CC4 - bl _080442D8 -_08042CC4: + beq @08042CC4 + bl @080442D8 +@08042CC4: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 ldr r0, =0x0202406c ldrb r0, [r0] cmp r6, r0 - bcc _08042CB0 - bl _0804441E + bcc @08042CB0 + bl @0804441E .align 2, 0 .pool -_08042CDC: +@08042CDC: ldr r5, =0x02024084 mov r8, r5 movs r0, 0x58 @@ -114257,33 +114257,33 @@ _08042CDC: adds r4, r6, r5 ldrh r0, [r4, 0x28] cmp r0, 0 - bne _08042CF2 - bl _0804441E -_08042CF2: + bne @08042CF2 + bl @0804441E +@08042CF2: ldr r0, =0x0202420b mov r1, r10 strb r1, [r0] ldrb r5, [r7] cmp r5, 0x2C - beq _08042D22 + beq @08042D22 cmp r5, 0x2C - bgt _08042D14 + bgt @08042D14 cmp r5, 0x3 - bne _08042D08 - b _08042E84 -_08042D08: - bl _0804441E + bne @08042D08 + b @08042E84 +@08042D08: + bl @0804441E .align 2, 0 .pool -_08042D14: +@08042D14: cmp r5, 0x36 - bne _08042D1A - b _08042ED0 -_08042D1A: + bne @08042D1A + b @08042ED0 +@08042D1A: cmp r5, 0x3D - beq _08042DA0 - bl _0804441E -_08042D22: + beq @08042DA0 + bl @0804441E +@08042D22: movs r0, 0 str r0, [sp] movs r0, 0x13 @@ -114294,9 +114294,9 @@ _08042D22: lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _08042D3E - bl _0804441E -_08042D3E: + beq @08042D3E + bl @0804441E +@08042D3E: str r0, [sp] movs r0, 0x13 movs r1, 0 @@ -114305,23 +114305,23 @@ _08042D3E: bl ability_something lsls r0, 24 cmp r0, 0 - beq _08042D56 - bl _0804441E -_08042D56: + beq @08042D56 + bl @0804441E +@08042D56: ldr r0, =0x020243cc ldrh r1, [r0] movs r0, 0x7 ands r0, r1 cmp r0, 0 - bne _08042D66 - bl _0804441E -_08042D66: + bne @08042D66 + bl @0804441E +@08042D66: ldrh r0, [r4, 0x2C] ldrh r2, [r4, 0x28] cmp r0, r2 - bhi _08042D72 - bl _0804441E -_08042D72: + bhi @08042D72 + bl @0804441E +@08042D72: strb r5, [r7] ldr r0, =0x082db45c bl b_push_move_exec @@ -114330,25 +114330,25 @@ _08042D72: lsrs r0, 4 str r0, [r1] cmp r0, 0 - bne _08042D8A + bne @08042D8A movs r0, 0x1 str r0, [r1] -_08042D8A: +@08042D8A: ldr r0, [r1] negs r0, r0 str r0, [r1] - bl _080443D0 + bl @080443D0 .align 2, 0 .pool -_08042DA0: +@08042DA0: mov r0, r8 adds r0, 0x4C adds r5, r6, r0 ldrb r0, [r5] cmp r0, 0 - bne _08042DB0 - bl _0804441E -_08042DB0: + bne @08042DB0 + bl @0804441E +@08042DB0: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -114357,54 +114357,54 @@ _08042DB0: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq _08042DCA - bl _0804441E -_08042DCA: + beq @08042DCA + bl @0804441E +@08042DCA: ldr r0, [r5] movs r1, 0x88 ands r0, r1 cmp r0, 0 - beq _08042DDC + beq @08042DDC ldr r0, =0x02022f58 ldr r1, =0x0831bc70 bl gf_strcpy -_08042DDC: +@08042DDC: ldr r0, [r5] movs r1, 0x7 ands r0, r1 cmp r0, 0 - beq _08042DEE + beq @08042DEE ldr r0, =0x02022f58 ldr r1, =0x0831bc78 bl gf_strcpy -_08042DEE: +@08042DEE: ldr r0, [r5] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _08042E00 + beq @08042E00 ldr r0, =0x02022f58 ldr r1, =0x0831bc80 bl gf_strcpy -_08042E00: +@08042E00: ldr r0, [r5] movs r1, 0x10 ands r0, r1 cmp r0, 0 - beq _08042E12 + beq @08042E12 ldr r0, =0x02022f58 ldr r1, =0x0831bc88 bl gf_strcpy -_08042E12: +@08042E12: ldr r0, [r5] movs r1, 0x20 ands r0, r1 cmp r0, 0 - beq _08042E24 + beq @08042E24 ldr r0, =0x02022f58 ldr r1, =0x0831bc90 bl gf_strcpy -_08042E24: +@08042E24: str r4, [r5] mov r1, r8 adds r1, 0x50 @@ -114428,17 +114428,17 @@ _08042E24: bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - bl _080443D0 + bl @080443D0 .align 2, 0 .pool -_08042E84: +@08042E84: ldrb r2, [r4, 0x1B] movs r0, 0x1B ldrsb r0, [r4, r0] cmp r0, 0xB - ble _08042E92 - bl _0804441E -_08042E92: + ble @08042E92 + bl @0804441E +@08042E92: ldr r0, =0x020242bc mov r5, r10 lsls r1, r5, 3 @@ -114447,9 +114447,9 @@ _08042E92: adds r1, r0 ldrb r0, [r1, 0x16] cmp r0, 0x2 - bne _08042EA8 - bl _0804441E -_08042EA8: + bne @08042EA8 + bl @0804441E +@08042EA8: adds r0, r2, 0x1 movs r1, 0 strb r0, [r4, 0x1B] @@ -114460,10 +114460,10 @@ _08042EA8: ldr r0, =0x082db444 bl b_push_move_exec strb r5, [r4, 0x17] - bl _080443D0 + bl @080443D0 .align 2, 0 .pool -_08042ED0: +@08042ED0: ldr r2, =0x020242bc ldrb r0, [r0] lsls r1, r0, 3 @@ -114480,46 +114480,46 @@ _08042ED0: ands r0, r3 orrs r0, r2 strb r0, [r1, 0x18] - bl _0804441E + bl @0804441E .align 2, 0 .pool -_08042EF8: +@08042EF8: ldrb r0, [r7] cmp r0, 0x2B - beq _08042F02 - bl _0804441E -_08042F02: + beq @08042F02 + bl @0804441E +@08042F02: movs r4, 0 ldr r0, =0x0831bcf8 ldrh r2, [r0] ldr r3, =0x0000ffff adds r1, r0, 0 cmp r2, r3 - bne _08042F14 - bl _0804441E -_08042F14: + bne @08042F14 + bl @0804441E +@08042F14: cmp r2, r5 - beq _08042F2C + beq @08042F2C adds r2, r1, 0 -_08042F1A: +@08042F1A: adds r2, 0x2 adds r4, 0x1 ldrh r0, [r2] cmp r0, r3 - bne _08042F28 - bl _0804441E -_08042F28: + bne @08042F28 + bl @0804441E +@08042F28: cmp r0, r5 - bne _08042F1A -_08042F2C: + bne @08042F1A +@08042F2C: lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] ldr r0, =0x0000ffff cmp r1, r0 - bne _08042F3C - bl _0804441E -_08042F3C: + bne @08042F3C + bl @0804441E +@08042F3C: ldr r1, =0x02024084 ldr r0, =0x0202420b ldrb r2, [r0] @@ -114532,44 +114532,44 @@ _08042F3C: lsls r1, 5 ands r0, r1 cmp r0, 0 - beq _08042F62 + beq @08042F62 ldr r0, =0x02024280 ldr r1, [r0] movs r2, 0x80 lsls r2, 4 orrs r1, r2 str r1, [r0] -_08042F62: +@08042F62: ldr r1, =0x02024214 ldr r0, =0x082db61f str r0, [r1] movs r0, 0x1 mov r9, r0 - bl _08044424 + bl @08044424 .align 2, 0 .pool -_08042F8C: +@08042F8C: cmp r5, 0 - bne _08042F94 - bl _0804441E -_08042F94: + bne @08042F94 + bl @0804441E +@08042F94: ldrb r0, [r7] cmp r0, 0xB - beq _08043004 + beq @08043004 cmp r0, 0xB - bgt _08042FA4 + bgt @08042FA4 cmp r0, 0xA - beq _08042FAA - b _08043126 -_08042FA4: + beq @08042FAA + b @08043126 +@08042FA4: cmp r0, 0x12 - beq _0804305C - b _08043126 -_08042FAA: + beq @0804305C + b @08043126 +@08042FAA: cmp r3, 0xD - beq _08042FB0 - b _08043126 -_08042FB0: + beq @08042FB0 + b @08043126 +@08042FB0: ldr r0, =0x0831c898 lsls r1, r5, 1 adds r1, r5 @@ -114577,9 +114577,9 @@ _08042FB0: adds r1, r0 ldrb r0, [r1, 0x1] cmp r0, 0 - bne _08042FC2 - b _08043126 -_08042FC2: + bne @08042FC2 + b @08043126 +@08042FC2: ldr r1, =0x0202433c ldr r0, =0x0202420b ldrb r0, [r0] @@ -114588,26 +114588,26 @@ _08042FC2: ldrb r0, [r0, 0x2] lsls r0, 28 cmp r0, 0 - bge _08042FF0 + bge @08042FF0 ldr r1, =0x02024214 ldr r0, =0x082db56f - b _08042FF4 + b @08042FF4 .align 2, 0 .pool -_08042FF0: +@08042FF0: ldr r1, =0x02024214 ldr r0, =0x082db56e -_08042FF4: +@08042FF4: str r0, [r1] movs r1, 0x1 - b _08043124 + b @08043124 .align 2, 0 .pool -_08043004: +@08043004: cmp r3, 0xB - beq _0804300A - b _08043126 -_0804300A: + beq @0804300A + b @08043126 +@0804300A: ldr r0, =0x0831c898 lsls r1, r5, 1 adds r1, r5 @@ -114615,9 +114615,9 @@ _0804300A: adds r1, r0 ldrb r0, [r1, 0x1] cmp r0, 0 - bne _0804301C - b _08043126 -_0804301C: + bne @0804301C + b @08043126 +@0804301C: ldr r1, =0x0202433c ldr r0, =0x0202420b ldrb r0, [r0] @@ -114626,25 +114626,25 @@ _0804301C: ldrb r0, [r0, 0x2] lsls r0, 28 cmp r0, 0 - bge _08043048 + bge @08043048 ldr r1, =0x02024214 ldr r0, =0x082db56f - b _0804304C + b @0804304C .align 2, 0 .pool -_08043048: +@08043048: ldr r1, =0x02024214 ldr r0, =0x082db56e -_0804304C: +@0804304C: str r0, [r1] movs r2, 0x1 mov r9, r2 - b _08043126 + b @08043126 .align 2, 0 .pool -_0804305C: +@0804305C: cmp r3, 0xA - bne _08043126 + bne @08043126 ldr r1, =0x02024084 movs r0, 0x58 mov r3, r10 @@ -114656,7 +114656,7 @@ _0804305C: movs r1, 0x20 ands r0, r1 cmp r0, 0 - bne _08043126 + bne @08043126 ldr r2, =0x020244a8 ldr r0, [r2] ldr r0, [r0, 0x4] @@ -114668,7 +114668,7 @@ _0804305C: ands r3, r4 adds r5, r1, 0 cmp r3, 0 - bne _080430EC + bne @080430EC ldr r0, =0x02024332 strb r3, [r0, 0x5] ldr r1, =0x0202433c @@ -114679,16 +114679,16 @@ _0804305C: ldrb r0, [r0, 0x2] lsls r0, 28 cmp r0, 0 - bge _080430C8 + bge @080430C8 ldr r1, =0x02024214 ldr r0, =0x082db5a8 - b _080430CC + b @080430CC .align 2, 0 .pool -_080430C8: +@080430C8: ldr r1, =0x02024214 ldr r0, =0x082db5a7 -_080430CC: +@080430CC: str r0, [r1] ldr r0, [r2] ldr r1, [r0, 0x4] @@ -114699,10 +114699,10 @@ _080430CC: str r0, [r1] movs r0, 0x2 mov r9, r0 - b _08043126 + b @08043126 .align 2, 0 .pool -_080430EC: +@080430EC: ldr r0, =0x02024332 strb r4, [r0, 0x5] ldr r1, =0x0202433c @@ -114713,26 +114713,26 @@ _080430EC: ldrb r0, [r0, 0x2] lsls r0, 28 cmp r0, 0 - bge _0804311C + bge @0804311C ldr r1, =0x02024214 ldr r0, =0x082db5a8 - b _08043120 + b @08043120 .align 2, 0 .pool -_0804311C: +@0804311C: ldr r1, =0x02024214 ldr r0, =0x082db5a7 -_08043120: +@08043120: str r0, [r1] movs r1, 0x2 -_08043124: +@08043124: mov r9, r1 -_08043126: +@08043126: mov r2, r9 cmp r2, 0x1 - beq _08043130 - bl _0804441E -_08043130: + beq @08043130 + bl @0804441E +@08043130: ldr r1, =0x02024084 movs r0, 0x58 mov r3, r10 @@ -114742,7 +114742,7 @@ _08043130: ldrh r0, [r1, 0x2C] ldrh r5, [r1, 0x28] cmp r0, r5 - bne _0804318C + bne @0804318C ldr r1, =0x0202433c ldr r0, =0x0202420b ldrb r0, [r0] @@ -114751,113 +114751,113 @@ _08043130: ldrb r0, [r0, 0x2] lsls r0, 28 cmp r0, 0 - bge _08043178 + bge @08043178 ldr r1, =0x02024214 ldr r0, =0x082db592 str r0, [r1] - bl _0804441E + bl @0804441E .align 2, 0 .pool -_08043178: +@08043178: ldr r1, =0x02024214 ldr r0, =0x082db591 str r0, [r1] - bl _0804441E + bl @0804441E .align 2, 0 .pool -_0804318C: +@0804318C: ldr r2, =0x020241f0 ldrh r0, [r1, 0x2C] lsrs r0, 2 str r0, [r2] cmp r0, 0 - bne _0804319C + bne @0804319C mov r0, r9 str r0, [r2] -_0804319C: +@0804319C: ldr r0, [r2] negs r0, r0 str r0, [r2] - bl _0804441E + bl @0804441E .align 2, 0 .pool -_080431AC: +@080431AC: ldrb r0, [r7] subs r0, 0x9 cmp r0, 0x2F - bls _080431B8 - bl _0804441E -_080431B8: + bls @080431B8 + bl @0804441E +@080431B8: lsls r0, 2 - ldr r1, =_080431C8 + ldr r1, =@080431C8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080431C8: - .4byte _080435E4 - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _08043288 - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _08043350 - .4byte _0804441E - .4byte _0804441E - .4byte _08043410 - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _08043508 - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _080436C0 - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804441E - .4byte _0804379C -_08043288: +@080431C8: + .4byte @080435E4 + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @08043288 + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @08043350 + .4byte @0804441E + .4byte @0804441E + .4byte @08043410 + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @08043508 + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @080436C0 + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804441E + .4byte @0804379C +@08043288: ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 - beq _08043298 - bl _0804441E -_08043298: + beq @08043298 + bl @0804441E +@08043298: cmp r5, 0xA5 - bne _080432A0 - bl _0804441E -_080432A0: + bne @080432A0 + bl @0804441E +@080432A0: ldr r0, =0x0831c898 lsls r1, r5, 1 adds r1, r5 @@ -114865,9 +114865,9 @@ _080432A0: adds r1, r0 ldrb r0, [r1, 0x1] cmp r0, 0 - bne _080432B4 - bl _0804441E -_080432B4: + bne @080432B4 + bl @0804441E +@080432B4: ldr r2, =0x0202437c ldr r0, =0x0202420c ldrb r1, [r0] @@ -114879,15 +114879,15 @@ _080432B4: adds r0, r1, r0 ldr r0, [r0] cmp r0, 0 - bne _080432DC + bne @080432DC adds r0, r2, 0 adds r0, 0xC adds r0, r1, r0 ldr r0, [r0] cmp r0, 0 - bne _080432DC - bl _0804441E -_080432DC: + bne @080432DC + bl @0804441E +@080432DC: ldr r1, =0x02024084 movs r0, 0x58 mov r2, r10 @@ -114898,21 +114898,21 @@ _080432DC: adds r4, 0x21 ldrb r0, [r4] cmp r0, r3 - bne _080432F6 - bl _0804441E -_080432F6: + bne @080432F6 + bl @0804441E +@080432F6: adds r2, r1, 0 adds r2, 0x22 ldrb r0, [r2] cmp r0, r3 - bne _08043304 - bl _0804441E -_08043304: + bne @08043304 + bl @0804441E +@08043304: ldrh r0, [r1, 0x28] cmp r0, 0 - bne _0804330E - bl _0804441E -_0804330E: + bne @0804330E + bl @0804441E +@0804330E: strb r3, [r4] strb r3, [r2] ldr r1, =0x02022f58 @@ -114927,18 +114927,18 @@ _0804330E: ldr r1, =0x02024214 ldr r0, =0x082db64d str r0, [r1] - bl _080443D0 + bl @080443D0 .align 2, 0 .pool -_08043350: +@08043350: ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 - beq _08043360 - bl _0804441E -_08043360: + beq @08043360 + bl @0804441E +@08043360: ldr r1, =0x02024084 ldr r0, =0x0202420b ldrb r2, [r0] @@ -114947,18 +114947,18 @@ _08043360: adds r3, r0, r1 ldrh r0, [r3, 0x28] cmp r0, 0 - bne _08043376 - bl _0804441E -_08043376: + bne @08043376 + bl @0804441E +@08043376: ldr r0, =0x0202433c lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] lsls r0, 31 cmp r0, 0 - beq _08043388 - bl _0804441E -_08043388: + beq @08043388 + bl @0804441E +@08043388: ldr r2, =0x0202437c ldr r0, =0x0202420c ldrb r1, [r0] @@ -114970,15 +114970,15 @@ _08043388: adds r0, r1, r0 ldr r0, [r0] cmp r0, 0 - bne _080433B0 + bne @080433B0 adds r0, r2, 0 adds r0, 0xC adds r0, r1, r0 ldr r0, [r0] cmp r0, 0 - bne _080433B0 - bl _0804441E -_080433B0: + bne @080433B0 + bl @0804441E +@080433B0: ldr r1, =0x0831c898 lsls r0, r5, 1 adds r0, r5 @@ -114989,33 +114989,33 @@ _080433B0: adds r0, r2, 0 ands r0, r1 cmp r0, 0 - bne _080433CA - bl _0804441E -_080433CA: + bne @080433CA + bl @0804441E +@080433CA: ldr r1, =0x020241f0 ldrh r0, [r3, 0x2C] lsrs r0, 4 str r0, [r1] cmp r0, 0 - bne _080433D8 + bne @080433D8 str r2, [r1] -_080433D8: +@080433D8: bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =0x082db654 str r0, [r1] - bl _080443D0 + bl @080443D0 .align 2, 0 .pool -_08043410: +@08043410: ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 - beq _08043420 - bl _0804441E -_08043420: + beq @08043420 + bl @0804441E +@08043420: ldr r1, =0x02024084 ldr r0, =0x0202420b ldrb r2, [r0] @@ -115024,18 +115024,18 @@ _08043420: adds r0, r1 ldrh r0, [r0, 0x28] cmp r0, 0 - bne _08043436 - bl _0804441E -_08043436: + bne @08043436 + bl @0804441E +@08043436: ldr r0, =0x0202433c lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] lsls r0, 31 cmp r0, 0 - beq _08043448 - bl _0804441E -_08043448: + beq @08043448 + bl @0804441E +@08043448: ldr r2, =0x0202437c ldr r0, =0x0202420c ldrb r1, [r0] @@ -115047,15 +115047,15 @@ _08043448: adds r0, r1, r0 ldr r0, [r0] cmp r0, 0 - bne _08043470 + bne @08043470 adds r0, r2, 0 adds r0, 0xC adds r0, r1, r0 ldr r0, [r0] cmp r0, 0 - bne _08043470 - bl _0804441E -_08043470: + bne @08043470 + bl @0804441E +@08043470: ldr r1, =0x0831c898 lsls r0, r5, 1 adds r0, r5 @@ -115065,9 +115065,9 @@ _08043470: movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _08043488 - bl _0804441E -_08043488: + bne @08043488 + bl @0804441E +@08043488: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -115075,24 +115075,24 @@ _08043488: bl __umodsi3 lsls r0, 16 cmp r0, 0 - beq _080434A0 - bl _0804441E -_080434A0: + beq @080434A0 + bl @0804441E +@080434A0: ldr r5, =0x02024332 movs r4, 0x3 -_080434A4: +@080434A4: bl GenerateRandomNumber ands r0, r4 strb r0, [r5, 0x3] cmp r0, 0 - beq _080434A4 + beq @080434A4 ldr r1, =0x02024332 ldrb r0, [r1, 0x3] cmp r0, 0x3 - bne _080434BC + bne @080434BC adds r0, 0x2 strb r0, [r1, 0x3] -_080434BC: +@080434BC: ldrb r0, [r1, 0x3] adds r0, 0x40 strb r0, [r1, 0x3] @@ -115106,18 +115106,18 @@ _080434BC: lsls r1, 6 orrs r0, r1 str r0, [r2] - bl _080443D0 + bl @080443D0 .align 2, 0 .pool -_08043508: +@08043508: ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 - beq _08043518 - bl _0804441E -_08043518: + beq @08043518 + bl @0804441E +@08043518: ldr r1, =0x02024084 ldr r0, =0x0202420b ldrb r2, [r0] @@ -115126,18 +115126,18 @@ _08043518: adds r0, r1 ldrh r0, [r0, 0x28] cmp r0, 0 - bne _0804352E - bl _0804441E -_0804352E: + bne @0804352E + bl @0804441E +@0804352E: ldr r0, =0x0202433c lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] lsls r0, 31 cmp r0, 0 - beq _08043540 - bl _0804441E -_08043540: + beq @08043540 + bl @0804441E +@08043540: ldr r2, =0x0202437c ldr r0, =0x0202420c ldrb r1, [r0] @@ -115149,15 +115149,15 @@ _08043540: adds r0, r1, r0 ldr r0, [r0] cmp r0, 0 - bne _08043568 + bne @08043568 adds r0, r2, 0 adds r0, 0xC adds r0, r1, r0 ldr r0, [r0] cmp r0, 0 - bne _08043568 - bl _0804441E -_08043568: + bne @08043568 + bl @0804441E +@08043568: ldr r1, =0x0831c898 lsls r0, r5, 1 adds r0, r5 @@ -115167,9 +115167,9 @@ _08043568: movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _08043580 - bl _0804441E -_08043580: + bne @08043580 + bl @0804441E +@08043580: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -115177,9 +115177,9 @@ _08043580: bl __umodsi3 lsls r0, 16 cmp r0, 0 - beq _08043598 - bl _0804441E -_08043598: + beq @08043598 + bl @0804441E +@08043598: ldr r1, =0x02024332 movs r0, 0x42 strb r0, [r1, 0x3] @@ -115193,18 +115193,18 @@ _08043598: lsls r1, 6 orrs r0, r1 str r0, [r2] - bl _080443D0 + bl @080443D0 .align 2, 0 .pool -_080435E4: +@080435E4: ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 - beq _080435F4 - bl _0804441E -_080435F4: + beq @080435F4 + bl @0804441E +@080435F4: ldr r1, =0x02024084 ldr r0, =0x0202420b ldrb r2, [r0] @@ -115213,18 +115213,18 @@ _080435F4: adds r0, r1 ldrh r0, [r0, 0x28] cmp r0, 0 - bne _0804360A - bl _0804441E -_0804360A: + bne @0804360A + bl @0804441E +@0804360A: ldr r0, =0x0202433c lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] lsls r0, 31 cmp r0, 0 - beq _0804361C - bl _0804441E -_0804361C: + beq @0804361C + bl @0804441E +@0804361C: ldr r2, =0x0202437c ldr r0, =0x0202420c ldrb r1, [r0] @@ -115236,15 +115236,15 @@ _0804361C: adds r0, r1, r0 ldr r0, [r0] cmp r0, 0 - bne _08043644 + bne @08043644 adds r0, r2, 0 adds r0, 0xC adds r0, r1, r0 ldr r0, [r0] cmp r0, 0 - bne _08043644 - bl _0804441E -_08043644: + bne @08043644 + bl @0804441E +@08043644: ldr r1, =0x0831c898 lsls r0, r5, 1 adds r0, r5 @@ -115254,9 +115254,9 @@ _08043644: movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0804365C - bl _0804441E -_0804365C: + bne @0804365C + bl @0804441E +@0804365C: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -115264,9 +115264,9 @@ _0804365C: bl __umodsi3 lsls r0, 16 cmp r0, 0 - beq _08043674 - bl _0804441E -_08043674: + beq @08043674 + bl @0804441E +@08043674: ldr r1, =0x02024332 movs r0, 0x45 strb r0, [r1, 0x3] @@ -115280,18 +115280,18 @@ _08043674: lsls r1, 6 orrs r0, r1 str r0, [r2] - bl _080443D0 + bl @080443D0 .align 2, 0 .pool -_080436C0: +@080436C0: ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 - beq _080436D0 - bl _0804441E -_080436D0: + beq @080436D0 + bl @0804441E +@080436D0: ldr r1, =0x02024084 ldr r0, =0x0202420b ldrb r2, [r0] @@ -115300,18 +115300,18 @@ _080436D0: adds r0, r1 ldrh r0, [r0, 0x28] cmp r0, 0 - bne _080436E6 - bl _0804441E -_080436E6: + bne @080436E6 + bl @0804441E +@080436E6: ldr r0, =0x0202433c lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] lsls r0, 31 cmp r0, 0 - beq _080436F8 - bl _0804441E -_080436F8: + beq @080436F8 + bl @0804441E +@080436F8: ldr r1, =0x0831c898 lsls r0, r5, 1 adds r0, r5 @@ -115321,9 +115321,9 @@ _080436F8: movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _08043710 - bl _0804441E -_08043710: + bne @08043710 + bl @0804441E +@08043710: ldr r2, =0x0202437c ldr r0, =0x0202420c ldrb r1, [r0] @@ -115335,15 +115335,15 @@ _08043710: adds r0, r1, r0 ldr r0, [r0] cmp r0, 0 - bne _08043738 + bne @08043738 adds r0, r2, 0 adds r0, 0xC adds r0, r1, r0 ldr r0, [r0] cmp r0, 0 - bne _08043738 - bl _0804441E -_08043738: + bne @08043738 + bl @0804441E +@08043738: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -115351,9 +115351,9 @@ _08043738: bl __umodsi3 lsls r0, 16 cmp r0, 0 - beq _08043750 - bl _0804441E -_08043750: + beq @08043750 + bl @0804441E +@08043750: ldr r1, =0x02024332 movs r0, 0x43 strb r0, [r1, 0x3] @@ -115367,18 +115367,18 @@ _08043750: lsls r1, 6 orrs r0, r1 str r0, [r2] - bl _080443D0 + bl @080443D0 .align 2, 0 .pool -_0804379C: +@0804379C: ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 - beq _080437AC - bl _0804441E -_080437AC: + beq @080437AC + bl @0804441E +@080437AC: ldr r6, =0x02024084 ldr r3, =0x0202420b mov r8, r3 @@ -115389,18 +115389,18 @@ _080437AC: adds r0, r6 ldrh r0, [r0, 0x28] cmp r0, 0 - bne _080437C6 - bl _0804441E -_080437C6: + bne @080437C6 + bl @0804441E +@080437C6: ldr r0, =0x0202433c lsls r1, 4 adds r1, r0 ldrb r0, [r1, 0x1] lsls r0, 31 cmp r0, 0 - beq _080437D8 - bl _0804441E -_080437D8: + beq @080437D8 + bl @0804441E +@080437D8: ldr r1, =0x0831c898 lsls r0, r5, 1 adds r0, r5 @@ -115410,9 +115410,9 @@ _080437D8: movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080437F0 - bl _0804441E -_080437F0: + bne @080437F0 + bl @0804441E +@080437F0: ldr r3, =0x0202437c ldr r5, =0x0202420c ldrb r1, [r5] @@ -115424,23 +115424,23 @@ _080437F0: adds r0, r2, r0 ldr r0, [r0] cmp r0, 0 - bne _08043818 + bne @08043818 adds r0, r3, 0 adds r0, 0xC adds r0, r2, r0 ldr r0, [r0] cmp r0, 0 - bne _08043818 - bl _0804441E -_08043818: + bne @08043818 + bl @0804441E +@08043818: adds r0, r1, 0 muls r0, r7 adds r0, r6 ldrh r0, [r0, 0x28] cmp r0, 0 - bne _08043828 - bl _0804441E -_08043828: + bne @08043828 + bl @0804441E +@08043828: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -115448,9 +115448,9 @@ _08043828: bl __umodsi3 lsls r0, 16 cmp r0, 0 - beq _08043840 - bl _0804441E -_08043840: + beq @08043840 + bl @0804441E +@08043840: mov r1, r8 ldrb r0, [r1] muls r0, r7 @@ -115458,9 +115458,9 @@ _08043840: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0xC - bne _08043854 - bl _0804441E -_08043854: + bne @08043854 + bl @0804441E +@08043854: ldr r0, [sp, 0x8] ldr r1, [sp, 0x10] bl pokemon_species_get_gender_info @@ -115471,9 +115471,9 @@ _08043854: lsls r4, 24 lsls r0, 24 cmp r4, r0 - bne _08043872 - bl _0804441E -_08043872: + bne @08043872 + bl @0804441E +@08043872: mov r2, r8 ldrb r0, [r2] muls r0, r7 @@ -115485,27 +115485,27 @@ _08043872: lsls r1, 12 ands r0, r1 cmp r0, 0 - beq _0804388E - bl _0804441E -_0804388E: + beq @0804388E + bl @0804441E +@0804388E: ldr r0, [sp, 0x8] ldr r1, [sp, 0x10] bl pokemon_species_get_gender_info lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _080438A2 - bl _0804441E -_080438A2: + bne @080438A2 + bl @0804441E +@080438A2: ldr r0, [sp, 0xC] ldr r1, [sp, 0x14] bl pokemon_species_get_gender_info lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _080438B6 - bl _0804441E -_080438B6: + bne @080438B6 + bl @0804441E +@080438B6: mov r3, r8 ldrb r0, [r3] adds r2, r0, 0 @@ -115524,18 +115524,18 @@ _080438B6: ldr r1, =0x02024214 ldr r0, =0x082db66f str r0, [r1] - bl _080443D0 + bl @080443D0 .align 2, 0 .pool -_08043908: +@08043908: movs r5, 0 mov r10, r5 ldr r0, =0x0202406c ldrb r0, [r0] cmp r10, r0 - bcc _08043918 - bl _0804441E -_08043918: + bcc @08043918 + bl @0804441E +@08043918: ldr r1, =0x02024084 movs r0, 0x58 mov r2, r10 @@ -115547,85 +115547,85 @@ _08043918: subs r0, 0x7 adds r2, r1, 0 cmp r0, 0x41 - bls _08043932 - b _08043B96 -_08043932: + bls @08043932 + b @08043B96 +@08043932: lsls r0, 2 - ldr r1, =_08043948 + ldr r1, =@08043948 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08043948: - .4byte _08043AAC - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B70 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043AD4 - .4byte _08043B96 - .4byte _08043A50 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043A7C - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B40 - .4byte _08043B10 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043B96 - .4byte _08043AD4 -_08043A50: +@08043948: + .4byte @08043AAC + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B70 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043AD4 + .4byte @08043B96 + .4byte @08043A50 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043A7C + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B40 + .4byte @08043B10 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043B96 + .4byte @08043AD4 +@08043A50: movs r0, 0x58 mov r3, r10 muls r3, r0 @@ -115637,15 +115637,15 @@ _08043A50: ldr r1, =0x00000f88 ands r0, r1 cmp r0, 0 - bne _08043A6A - b _08043B96 -_08043A6A: + bne @08043A6A + b @08043B96 +@08043A6A: ldr r0, =0x02022f58 ldr r1, =0x0831bc70 - b _08043B5C + b @08043B5C .align 2, 0 .pool -_08043A7C: +@08043A7C: movs r0, 0x58 mov r1, r10 muls r1, r0 @@ -115657,18 +115657,18 @@ _08043A7C: movs r1, 0x7 ands r0, r1 cmp r0, 0 - bne _08043A96 - b _08043B96 -_08043A96: + bne @08043A96 + b @08043B96 +@08043A96: ldr r0, =0x02022f58 ldr r1, =0x0831bc98 bl gf_strcpy movs r2, 0x2 mov r9, r2 - b _08043B9C + b @08043B9C .align 2, 0 .pool -_08043AAC: +@08043AAC: movs r0, 0x58 mov r3, r10 muls r3, r0 @@ -115680,13 +115680,13 @@ _08043AAC: movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _08043B96 + beq @08043B96 ldr r0, =0x02022f58 ldr r1, =0x0831bc80 - b _08043B5C + b @08043B5C .align 2, 0 .pool -_08043AD4: +@08043AD4: movs r0, 0x58 mov r3, r10 muls r3, r0 @@ -115697,7 +115697,7 @@ _08043AD4: movs r1, 0x7 ands r0, r1 cmp r0, 0 - beq _08043B96 + beq @08043B96 adds r2, 0x50 adds r2, r3, r2 ldr r0, [r2] @@ -115709,10 +115709,10 @@ _08043AD4: bl gf_strcpy movs r0, 0x1 mov r9, r0 - b _08043B9C + b @08043B9C .align 2, 0 .pool -_08043B10: +@08043B10: movs r0, 0x58 mov r1, r10 muls r1, r0 @@ -115724,16 +115724,16 @@ _08043B10: movs r1, 0x10 ands r0, r1 cmp r0, 0 - beq _08043B96 + beq @08043B96 ldr r0, =0x02022f58 ldr r1, =0x0831bc88 bl gf_strcpy movs r2, 0x1 mov r9, r2 - b _08043B9C + b @08043B9C .align 2, 0 .pool -_08043B40: +@08043B40: movs r0, 0x58 mov r3, r10 muls r3, r0 @@ -115745,17 +115745,17 @@ _08043B40: movs r1, 0x20 ands r0, r1 cmp r0, 0 - beq _08043B96 + beq @08043B96 ldr r0, =0x02022f58 ldr r1, =0x0831bc90 -_08043B5C: +@08043B5C: bl gf_strcpy movs r5, 0x1 mov r9, r5 - b _08043B9C + b @08043B9C .align 2, 0 .pool -_08043B70: +@08043B70: movs r0, 0x58 mov r1, r10 muls r1, r0 @@ -115768,33 +115768,33 @@ _08043B70: lsls r1, 12 ands r0, r1 cmp r0, 0 - beq _08043B96 + beq @08043B96 ldr r0, =0x02022f58 ldr r1, =0x0831bca0 bl gf_strcpy movs r2, 0x3 mov r9, r2 -_08043B96: +@08043B96: mov r3, r9 cmp r3, 0 - beq _08043C50 -_08043B9C: + beq @08043C50 +@08043B9C: mov r5, r9 cmp r5, 0x2 - beq _08043BD0 + beq @08043BD0 cmp r5, 0x2 - bgt _08043BB4 + bgt @08043BB4 cmp r5, 0x1 - beq _08043BBC - b _08043BFC + beq @08043BBC + b @08043BFC .align 2, 0 .pool -_08043BB4: +@08043BB4: mov r0, r9 cmp r0, 0x3 - beq _08043BE8 - b _08043BFC -_08043BBC: + beq @08043BE8 + b @08043BFC +@08043BBC: ldr r1, =0x02024084 movs r0, 0x58 mov r2, r10 @@ -115802,10 +115802,10 @@ _08043BBC: adds r1, 0x4C adds r2, r1 movs r0, 0 - b _08043BFA + b @08043BFA .align 2, 0 .pool -_08043BD0: +@08043BD0: ldr r1, =0x02024084 movs r0, 0x58 mov r2, r10 @@ -115815,10 +115815,10 @@ _08043BD0: ldr r0, [r2] movs r1, 0x8 negs r1, r1 - b _08043BF8 + b @08043BF8 .align 2, 0 .pool -_08043BE8: +@08043BE8: ldr r1, =0x02024084 movs r0, 0x58 mov r2, r10 @@ -115827,11 +115827,11 @@ _08043BE8: adds r2, r1 ldr r0, [r2] ldr r1, =0xfff0ffff -_08043BF8: +@08043BF8: ands r0, r1 -_08043BFA: +@08043BFA: str r0, [r2] -_08043BFC: +@08043BFC: bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =0x082db68c @@ -115854,10 +115854,10 @@ _08043BFC: bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - bl _0804443A + bl @0804443A .align 2, 0 .pool -_08043C50: +@08043C50: mov r0, r10 adds r0, 0x1 lsls r0, 24 @@ -115866,23 +115866,23 @@ _08043C50: ldr r0, =0x0202406c ldrb r0, [r0] cmp r10, r0 - bcs _08043C64 - b _08043918 -_08043C64: - bl _0804441E + bcs @08043C64 + b @08043918 +@08043C64: + bl @0804441E .align 2, 0 .pool -_08043C6C: +@08043C6C: movs r2, 0 mov r10, r2 ldr r0, =0x0202406c ldrb r0, [r0] cmp r10, r0 - bcc _08043C7A - b _0804441E -_08043C7A: + bcc @08043C7A + b @0804441E +@08043C7A: ldr r4, =0x02024084 -_08043C7C: +@08043C7C: movs r0, 0x58 mov r3, r10 muls r3, r0 @@ -115891,16 +115891,16 @@ _08043C7C: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x3B - bne _08043CA0 + bne @08043CA0 mov r0, r10 bl castform_switch lsls r0, 24 lsrs r0, 24 mov r9, r0 cmp r0, 0 - beq _08043CA0 - b _080442FC -_08043CA0: + beq @08043CA0 + b @080442FC +@08043CA0: mov r0, r10 adds r0, 0x1 lsls r0, 24 @@ -115909,25 +115909,25 @@ _08043CA0: ldr r0, =0x0202406c ldrb r0, [r0] cmp r10, r0 - bcc _08043C7C - b _0804441E + bcc @08043C7C + b @0804441E .align 2, 0 .pool -_08043CBC: +@08043CBC: ldrb r0, [r7] cmp r0, 0x1C - beq _08043CC4 - b _0804441E -_08043CC4: + beq @08043CC4 + b @0804441E +@08043CC4: ldr r4, =0x02024280 ldr r1, [r4] movs r0, 0x80 lsls r0, 7 ands r0, r1 cmp r0, 0 - bne _08043CD4 - b _0804441E -_08043CD4: + bne @08043CD4 + b @0804441E +@08043CD4: ldr r0, =0xffffbfff ands r1, r0 str r1, [r4] @@ -115943,10 +115943,10 @@ _08043CD4: adds r1, 0xB2 ldrb r0, [r1] cmp r0, 0x6 - bne _08043CF8 + bne @08043CF8 movs r0, 0x2 strb r0, [r1] -_08043CF8: +@08043CF8: ldr r1, =0x02024332 mov r2, r8 ldr r0, [r2] @@ -115967,24 +115967,24 @@ _08043CF8: lsls r1, 6 orrs r0, r1 str r0, [r4] - b _080443D0 + b @080443D0 .align 2, 0 .pool -_08043D40: +@08043D40: ldrb r0, [r7] cmp r0, 0x1C - beq _08043D48 - b _0804441E -_08043D48: + beq @08043D48 + b @0804441E +@08043D48: ldr r4, =0x02024280 ldr r1, [r4] movs r0, 0x80 lsls r0, 7 ands r0, r1 cmp r0, 0 - bne _08043D58 - b _0804441E -_08043D58: + bne @08043D58 + b @0804441E +@08043D58: ldr r0, =0xffffbfff ands r1, r0 str r1, [r4] @@ -116000,10 +116000,10 @@ _08043D58: adds r1, 0xB2 ldrb r0, [r1] cmp r0, 0x6 - bne _08043D7C + bne @08043D7C movs r0, 0x2 strb r0, [r1] -_08043D7C: +@08043D7C: ldr r1, =0x02024332 mov r3, r8 ldr r0, [r3] @@ -116023,17 +116023,17 @@ _08043D7C: lsls r1, 6 orrs r0, r1 str r0, [r4] - b _080443D0 + b @080443D0 .align 2, 0 .pool -_08043DC4: +@08043DC4: movs r4, 0 ldr r0, =0x0202406c ldrb r1, [r0] cmp r4, r1 - blt _08043DD0 - b _0804441E -_08043DD0: + blt @08043DD0 + b @0804441E +@08043DD0: ldr r0, =0x02024084 adds r5, r1, 0 ldr r2, =0x020242ac @@ -116041,32 +116041,32 @@ _08043DD0: adds r3, 0x20 movs r6, 0x80 lsls r6, 12 -_08043DDE: +@08043DDE: ldrb r1, [r3] cmp r1, 0x16 - bne _08043DEE + bne @08043DEE ldr r0, [r2] ands r0, r6 cmp r0, 0 - beq _08043DEE - b _08044324 -_08043DEE: + beq @08043DEE + b @08044324 +@08043DEE: adds r2, 0x4 adds r3, 0x58 adds r4, 0x1 cmp r4, r5 - blt _08043DDE - b _0804441E + blt @08043DDE + b @0804441E .align 2, 0 .pool -_08043E08: +@08043E08: movs r4, 0 ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - blt _08043E14 - b _0804441E -_08043E14: + blt @08043E14 + b @0804441E +@08043E14: ldr r5, =0x02024064 mov r8, r5 ldr r0, =0x02024084 @@ -116074,13 +116074,13 @@ _08043E14: str r0, [sp, 0x1C] movs r1, 0 str r1, [sp, 0x20] -_08043E22: +@08043E22: ldr r2, [sp, 0x1C] ldrb r0, [r2] cmp r0, 0x24 - beq _08043E2C - b _08043FBE -_08043E2C: + beq @08043E2C + b @08043FBE +@08043E2C: ldr r0, =0x020242ac ldr r3, [sp, 0x20] adds r0, r3, r0 @@ -116090,9 +116090,9 @@ _08043E2C: ands r1, r0 str r3, [sp, 0x18] cmp r1, 0 - bne _08043E42 - b _08043FBE -_08043E42: + bne @08043E42 + b @08043FBE +@08043E42: lsls r0, r4, 24 lsrs r0, 24 bl battle_get_per_side_status @@ -116113,9 +116113,9 @@ _08043E42: movs r2, 0x1 ands r0, r2 cmp r0, 0 - bne _08043E74 - b _08043F84 -_08043E74: + bne @08043E74 + b @08043F84 +@08043E74: movs r1, 0x58 adds r0, r6, 0 muls r0, r1 @@ -116125,10 +116125,10 @@ _08043E74: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0 - beq _08043F40 + beq @08043F40 ldrh r0, [r1, 0x28] cmp r0, 0 - beq _08043EFC + beq @08043EFC movs r1, 0x58 adds r0, r7, 0 muls r0, r1 @@ -116137,10 +116137,10 @@ _08043E74: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0 - beq _08043EFC + beq @08043EFC ldrh r0, [r1, 0x28] cmp r0, 0 - beq _08043EFC + beq @08043EFC str r2, [sp, 0x24] bl GenerateRandomNumber ldr r2, [sp, 0x24] @@ -116168,10 +116168,10 @@ _08043E74: ldrb r0, [r0] ldr r2, =0x0202420a strb r0, [r2] - b _08043FAC + b @08043FAC .align 2, 0 .pool -_08043EFC: +@08043EFC: ldr r3, =0x02024084 movs r2, 0x58 adds r0, r6, 0 @@ -116181,10 +116181,10 @@ _08043EFC: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0 - beq _08043F40 + beq @08043F40 ldrh r0, [r1, 0x28] cmp r0, 0 - beq _08043F40 + beq @08043F40 mov r5, r8 strb r6, [r5] adds r1, r4, 0 @@ -116202,10 +116202,10 @@ _08043EFC: adds r0, r3 adds r0, 0x20 ldrb r0, [r0] - b _08043FA8 + b @08043FA8 .align 2, 0 .pool -_08043F40: +@08043F40: ldr r3, =0x02024084 movs r2, 0x58 adds r0, r7, 0 @@ -116215,10 +116215,10 @@ _08043F40: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0 - beq _08043FB6 + beq @08043FB6 ldrh r0, [r1, 0x28] cmp r0, 0 - beq _08043FB6 + beq @08043FB6 mov r5, r8 strb r7, [r5] adds r1, r4, 0 @@ -116236,10 +116236,10 @@ _08043F40: adds r0, r3 adds r0, 0x20 ldrb r0, [r0] - b _08043FA8 + b @08043FA8 .align 2, 0 .pool -_08043F84: +@08043F84: mov r2, r8 strb r6, [r2] movs r3, 0x58 @@ -116251,28 +116251,28 @@ _08043F84: adds r2, 0x20 ldrb r1, [r2] cmp r1, 0 - beq _08043FB6 + beq @08043FB6 ldrh r0, [r0, 0x28] cmp r0, 0 - beq _08043FB6 + beq @08043FB6 ldr r0, [sp, 0x1C] strb r1, [r0] ldrb r0, [r2] -_08043FA8: +@08043FA8: ldr r1, =0x0202420a strb r0, [r1] -_08043FAC: +@08043FAC: mov r0, r9 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r9, r0 -_08043FB6: +@08043FB6: mov r2, r9 cmp r2, 0 - beq _08043FBE - b _08044340 -_08043FBE: + beq @08043FBE + b @08044340 +@08043FBE: ldr r3, [sp, 0x1C] adds r3, 0x58 str r3, [sp, 0x1C] @@ -116283,20 +116283,20 @@ _08043FBE: ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - bge _08043FD6 - b _08043E22 -_08043FD6: - b _0804441E + bge @08043FD6 + b @08043E22 +@08043FD6: + b @0804441E .align 2, 0 .pool -_08043FE4: +@08043FE4: movs r4, 0 ldr r0, =0x0202406c ldrb r1, [r0] cmp r4, r1 - blt _08043FF0 - b _0804441E -_08043FF0: + blt @08043FF0 + b @0804441E +@08043FF0: ldr r0, =0x02024084 adds r5, r1, 0 ldr r2, =0x020242ac @@ -116304,25 +116304,25 @@ _08043FF0: adds r3, 0x20 movs r6, 0x80 lsls r6, 12 -_08043FFE: +@08043FFE: ldrb r1, [r3] cmp r1, 0x16 - bne _0804400E + bne @0804400E ldr r0, [r2] ands r0, r6 cmp r0, 0 - beq _0804400E - b _080443B4 -_0804400E: + beq @0804400E + b @080443B4 +@0804400E: adds r2, 0x4 adds r3, 0x58 adds r4, 0x1 cmp r4, r5 - blt _08043FFE - b _0804441E + blt @08043FFE + b @0804441E .align 2, 0 .pool -_08044028: +@08044028: mov r0, r10 bl battle_side_get_owner lsls r0, 24 @@ -116331,11 +116331,11 @@ _08044028: ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - blt _0804403E - b _0804441E -_0804403E: + blt @0804403E + b @0804441E +@0804403E: ldr r7, =0x02024084 -_08044040: +@08044040: lsls r0, r4, 24 lsrs r0, 24 bl battle_side_get_owner @@ -116343,29 +116343,29 @@ _08044040: lsrs r0, 24 adds r3, r4, 0x1 cmp r0, r5 - beq _0804406A + beq @0804406A movs r0, 0x58 muls r0, r4 adds r0, r7 adds r0, 0x20 ldrb r0, [r0] cmp r0, r6 - bne _0804406A + bne @0804406A ldr r0, =0x0202420a strb r6, [r0] lsls r0, r3, 24 lsrs r0, 24 mov r9, r0 -_0804406A: +@0804406A: adds r4, r3, 0 ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - blt _08044040 - b _0804441E + blt @08044040 + b @0804441E .align 2, 0 .pool -_08044084: +@08044084: mov r0, r10 bl battle_side_get_owner lsls r0, 24 @@ -116374,11 +116374,11 @@ _08044084: ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - blt _0804409A - b _0804441E -_0804409A: + blt @0804409A + b @0804441E +@0804409A: ldr r7, =0x02024084 -_0804409C: +@0804409C: lsls r0, r4, 24 lsrs r0, 24 bl battle_side_get_owner @@ -116386,107 +116386,107 @@ _0804409C: lsrs r0, 24 adds r3, r4, 0x1 cmp r0, r5 - bne _080440C6 + bne @080440C6 movs r0, 0x58 muls r0, r4 adds r0, r7 adds r0, 0x20 ldrb r0, [r0] cmp r0, r6 - bne _080440C6 + bne @080440C6 ldr r0, =0x0202420a strb r6, [r0] lsls r0, r3, 24 lsrs r0, 24 mov r9, r0 -_080440C6: +@080440C6: adds r4, r3, 0 ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - blt _0804409C - b _0804441E + blt @0804409C + b @0804441E .align 2, 0 .pool -_080440E0: +@080440E0: ldrb r0, [r7] cmp r0, 0xFD - beq _08044104 + beq @08044104 cmp r0, 0xFE - beq _0804413C + beq @0804413C movs r4, 0 ldr r0, =0x0202406c adds r5, r0, 0 ldrb r0, [r5] cmp r4, r0 - blt _080440F8 - b _0804441E -_080440F8: + blt @080440F8 + b @0804441E +@080440F8: ldr r2, =0x02024084 - b _08044174 + b @08044174 .align 2, 0 .pool -_08044104: +@08044104: movs r4, 0 ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - blt _08044110 - b _0804441E -_08044110: + blt @08044110 + b @0804441E +@08044110: ldr r5, =0x020242ac movs r2, 0x80 lsls r2, 9 adds r1, r0, 0 -_08044118: +@08044118: lsls r0, r4, 2 adds r0, r5 ldr r0, [r0] ands r0, r2 adds r3, r4, 0x1 cmp r0, 0 - beq _0804412C + beq @0804412C lsls r0, r3, 24 lsrs r0, 24 mov r9, r0 -_0804412C: +@0804412C: adds r4, r3, 0 cmp r4, r1 - blt _08044118 - b _0804441E + blt @08044118 + b @0804441E .align 2, 0 .pool -_0804413C: +@0804413C: movs r4, 0 ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - blt _08044148 - b _0804441E -_08044148: + blt @08044148 + b @0804441E +@08044148: ldr r5, =0x020242ac movs r2, 0x80 lsls r2, 10 adds r1, r0, 0 -_08044150: +@08044150: lsls r0, r4, 2 adds r0, r5 ldr r0, [r0] ands r0, r2 adds r3, r4, 0x1 cmp r0, 0 - beq _08044164 + beq @08044164 lsls r0, r3, 24 lsrs r0, 24 mov r9, r0 -_08044164: +@08044164: adds r4, r3, 0 cmp r4, r1 - blt _08044150 - b _0804441E + blt @08044150 + b @0804441E .align 2, 0 .pool -_08044174: +@08044174: movs r0, 0x58 muls r0, r4 adds r0, r2 @@ -116494,30 +116494,30 @@ _08044174: ldrb r0, [r0] adds r3, r4, 0x1 cmp r0, r6 - bne _0804418C + bne @0804418C strb r6, [r7] lsls r0, r3, 24 lsrs r0, 24 mov r9, r0 -_0804418C: +@0804418C: adds r4, r3, 0 ldrb r1, [r5] cmp r4, r1 - blt _08044174 - b _0804441E -_08044196: + blt @08044174 + b @0804441E +@08044196: movs r4, 0 ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - blt _080441A2 - b _0804441E -_080441A2: + blt @080441A2 + b @0804441E +@080441A2: ldr r2, =0x02024084 mov r8, r2 adds r2, r0, 0 movs r5, 0x58 -_080441AA: +@080441AA: adds r0, r4, 0 muls r0, r5 mov r3, r8 @@ -116527,34 +116527,34 @@ _080441AA: ldrb r0, [r0] adds r3, r4, 0x1 cmp r0, r6 - bne _080441CC + bne @080441CC ldrh r0, [r1, 0x28] cmp r0, 0 - beq _080441CC + beq @080441CC strb r6, [r7] lsls r0, r3, 24 lsrs r0, 24 mov r9, r0 -_080441CC: +@080441CC: adds r4, r3, 0 cmp r4, r2 - blt _080441AA - b _0804441E + blt @080441AA + b @0804441E .align 2, 0 .pool -_080441DC: +@080441DC: movs r4, 0 ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - blt _080441E8 - b _0804441E -_080441E8: + blt @080441E8 + b @0804441E +@080441E8: ldr r7, =0x02024084 adds r1, r0, 0 movs r5, 0x58 ldr r2, =0x0202420a -_080441F0: +@080441F0: adds r0, r4, 0 muls r0, r5 adds r0, r7 @@ -116562,21 +116562,21 @@ _080441F0: ldrb r0, [r0] adds r3, r4, 0x1 cmp r0, r6 - bne _0804420C + bne @0804420C cmp r4, r10 - beq _0804420C + beq @0804420C strb r6, [r2] lsls r0, r3, 24 lsrs r0, 24 mov r9, r0 -_0804420C: +@0804420C: adds r4, r3, 0 cmp r4, r1 - blt _080441F0 - b _0804441E + blt @080441F0 + b @0804441E .align 2, 0 .pool -_08044220: +@08044220: mov r0, r10 bl battle_side_get_owner lsls r0, 24 @@ -116585,25 +116585,25 @@ _08044220: ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - blt _08044236 - b _0804441E -_08044236: + blt @08044236 + b @0804441E +@08044236: ldr r7, =0x02024084 -_08044238: +@08044238: lsls r0, r4, 24 lsrs r0, 24 bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, r5 - beq _08044264 + beq @08044264 movs r0, 0x58 muls r0, r4 adds r0, r7 adds r0, 0x20 ldrb r0, [r0] cmp r0, r6 - bne _08044264 + bne @08044264 ldr r0, =0x0202420a strb r6, [r0] mov r0, r9 @@ -116611,16 +116611,16 @@ _08044238: lsls r0, 24 lsrs r0, 24 mov r9, r0 -_08044264: +@08044264: adds r4, 0x1 ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - blt _08044238 - b _0804441E + blt @08044238 + b @0804441E .align 2, 0 .pool -_0804427C: +@0804427C: mov r0, r10 bl battle_side_get_owner lsls r0, 24 @@ -116629,25 +116629,25 @@ _0804427C: ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - blt _08044292 - b _0804441E -_08044292: + blt @08044292 + b @0804441E +@08044292: ldr r7, =0x02024084 -_08044294: +@08044294: lsls r0, r4, 24 lsrs r0, 24 bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, r5 - bne _080442C0 + bne @080442C0 movs r0, 0x58 muls r0, r4 adds r0, r7 adds r0, 0x20 ldrb r0, [r0] cmp r0, r6 - bne _080442C0 + bne @080442C0 ldr r0, =0x0202420a strb r6, [r0] mov r0, r9 @@ -116655,31 +116655,31 @@ _08044294: lsls r0, 24 lsrs r0, 24 mov r9, r0 -_080442C0: +@080442C0: adds r4, 0x1 ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - blt _08044294 - b _0804441E + blt @08044294 + b @0804441E .align 2, 0 .pool -_080442D8: +@080442D8: ldr r0, =0x082db4a9 bl b_push_move_exec ldr r0, =0x02024474 strb r6, [r0, 0x17] -_080442E2: +@080442E2: ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x7F mov r1, r9 subs r1, 0x1 strb r1, [r0] - b _0804441E + b @0804441E .align 2, 0 .pool -_080442FC: +@080442FC: ldr r0, =0x082db4a9 bl b_push_move_exec ldr r0, =0x02024474 @@ -116691,10 +116691,10 @@ _080442FC: mov r1, r9 subs r1, 0x1 strb r1, [r0] - b _0804443A + b @0804443A .align 2, 0 .pool -_08044324: +@08044324: strb r1, [r7] ldr r0, [r2] ldr r1, =0xfff7ffff @@ -116702,10 +116702,10 @@ _08044324: str r0, [r2] ldr r0, =0x082db4b8 bl b_push_move_exec - b _080443C8 + b @080443C8 .align 2, 0 .pool -_08044340: +@08044340: ldr r0, =0x082db452 bl b_push_move_exec ldr r1, =0x020242ac @@ -116743,10 +116743,10 @@ _08044340: movs r0, 0x1 negs r0, r0 strb r0, [r1, 0x3] - b _0804441E + b @0804441E .align 2, 0 .pool -_080443B4: +@080443B4: strb r1, [r7] ldr r0, [r2] ldr r1, =0xfff7ffff @@ -116756,64 +116756,64 @@ _080443B4: ldr r1, =0x02024214 ldr r0, =0x082db4c1 str r0, [r1] -_080443C8: +@080443C8: ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0xD8 strb r4, [r0] -_080443D0: +@080443D0: mov r0, r9 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r9, r0 - b _0804441E + b @0804441E .align 2, 0 .pool -_080443EC: +@080443EC: movs r4, 0 ldr r0, =0x0202406c ldrb r1, [r0] cmp r4, r1 - bge _0804441E + bge @0804441E ldr r0, =0x02024084 adds r2, r1, 0 adds r1, r0, 0 adds r1, 0x20 ldr r3, =0x0202420a -_08044400: +@08044400: ldrb r0, [r1] cmp r0, r6 - bne _08044416 + bne @08044416 cmp r4, r10 - beq _08044416 + beq @08044416 strb r6, [r3] mov r0, r9 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r9, r0 -_08044416: +@08044416: adds r1, 0x58 adds r4, 0x1 cmp r4, r2 - blt _08044400 -_0804441E: + blt @08044400 +@0804441E: mov r1, r9 cmp r1, 0 - beq _0804443A -_08044424: + beq @0804443A +@08044424: ldr r2, [sp, 0x4] cmp r2, 0xB - bhi _0804443A + bhi @0804443A ldr r1, =0x0202420a ldrb r0, [r1] cmp r0, 0xFF - beq _0804443A + beq @0804443A adds r1, r0, 0 mov r0, r10 bl b_history__record_ability_usage_of_player -_0804443A: +@0804443A: mov r0, r9 add sp, 0x28 pop {r3-r5} @@ -116828,7 +116828,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 @@ -116856,7 +116856,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 @@ -116886,7 +116886,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 @@ -116916,7 +116916,7 @@ berry_effects_maybe: @ 80444DC lsls r0, 16 lsrs r0, 16 cmp r0, 0xAF - bne _08044534 + bne @08044534 ldr r1, =0x02024404 lsls r0, r7, 3 subs r0, r7 @@ -116924,10 +116924,10 @@ berry_effects_maybe: @ 80444DC adds r0, r1 ldrb r5, [r0, 0x7] ldrb r0, [r0, 0x1A] - b _08044548 + b @08044548 .align 2, 0 .pool -_08044534: +@08044534: ldrh r0, [r4] bl itemid_get_x12 lsls r0, 24 @@ -116936,7 +116936,7 @@ _08044534: bl itemid_get_quality lsls r0, 24 lsrs r0, 24 -_08044548: +@08044548: mov r9, r0 ldr r1, =0x02024084 ldr r0, =0x0202420b @@ -116947,7 +116947,7 @@ _08044548: ldrh r0, [r0, 0x2E] str r0, [sp, 0x14] cmp r0, 0xAF - bne _0804457C + bne @0804457C ldr r1, =0x02024404 lsls r0, r2, 3 subs r0, r2 @@ -116956,10 +116956,10 @@ _08044548: ldrb r3, [r0, 0x7] mov r8, r3 ldrb r0, [r0, 0x1A] - b _08044592 + b @08044592 .align 2, 0 .pool -_0804457C: +@0804457C: ldr r0, [sp, 0x14] bl itemid_get_x12 lsls r0, 24 @@ -116969,7 +116969,7 @@ _0804457C: bl itemid_get_quality lsls r0, 24 lsrs r0, 24 -_08044592: +@08044592: str r0, [sp, 0x10] ldr r2, =0x02024084 ldr r0, =0x0202420c @@ -116979,54 +116979,54 @@ _08044592: adds r0, r2 ldrh r4, [r0, 0x2E] cmp r4, 0xAF - beq _080445B2 + beq @080445B2 adds r0, r4, 0 bl itemid_get_x12 adds r0, r4, 0 bl itemid_get_quality -_080445B2: +@080445B2: ldr r0, [sp, 0x8] cmp r0, 0x4 - bls _080445BC - bl _0804582A -_080445BC: + bls @080445BC + bl @0804582A +@080445BC: lsls r0, 2 - ldr r1, =_080445D4 + ldr r1, =@080445D4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080445D4: - .4byte _080445E8 - .4byte _08044688 - .4byte _0804582A - .4byte _08045280 - .4byte _080456D0 -_080445E8: +@080445D4: + .4byte @080445E8 + .4byte @08044688 + .4byte @0804582A + .4byte @08045280 + .4byte @080456D0 +@080445E8: cmp r5, 0x17 - beq _08044618 + beq @08044618 cmp r5, 0x20 - beq _080445F4 - bl _0804582A -_080445F4: + beq @080445F4 + bl @0804582A +@080445F4: adds r0, r7, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08044604 - bl _0804582A -_08044604: + beq @08044604 + bl @0804582A +@08044604: ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x4A movs r1, 0x2 strb r1, [r0] - bl _0804582A + bl @0804582A .align 2, 0 .pool -_08044618: +@08044618: ldr r1, =0x02024084 mov r8, r1 movs r0, 0x58 @@ -117038,27 +117038,27 @@ _08044618: movs r2, 0x6 movs r3, 0x7 mov r10, r3 -_0804462E: +@0804462E: movs r0, 0 ldrsb r0, [r1, r0] cmp r0, 0x5 - bgt _0804463C + bgt @0804463C strb r2, [r1] movs r5, 0x5 str r5, [sp, 0xC] -_0804463C: +@0804463C: adds r1, 0x1 movs r0, 0x1 negs r0, r0 add r10, r0 mov r3, r10 cmp r3, 0 - bge _0804462E + bge @0804462E ldr r5, [sp, 0xC] cmp r5, 0 - bne _08044654 - bl _0804582A -_08044654: + bne @08044654 + bl @0804582A +@08044654: ldr r0, =0x02024474 strb r7, [r0, 0x17] ldr r0, =0x0202420f @@ -117069,10 +117069,10 @@ _08044654: strb r7, [r1] ldr r0, =0x082db7ae bl b_call_bc_move_exec - bl _0804582A + bl @0804582A .align 2, 0 .pool -_08044688: +@08044688: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r7 @@ -117080,67 +117080,67 @@ _08044688: ldrh r0, [r0, 0x28] mov r8, r1 cmp r0, 0 - bne _0804469C - bl _0804582A -_0804469C: + bne @0804469C + bl @0804582A +@0804469C: subs r0, r5, 0x1 cmp r0, 0x2A - bls _080446A6 - bl _080451D6 -_080446A6: + bls @080446A6 + bl @080451D6 +@080446A6: lsls r0, 2 - ldr r1, =_080446B8 + ldr r1, =@080446B8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080446B8: - .4byte _08044764 - .4byte _08044F44 - .4byte _08045008 - .4byte _08044F74 - .4byte _08044FA8 - .4byte _08044FD8 - .4byte _080447B0 - .4byte _08045044 - .4byte _08045074 - .4byte _0804497C - .4byte _080449FC - .4byte _08044A78 - .4byte _08044B0C - .4byte _08044BA0 - .4byte _08044C34 - .4byte _08044C9C - .4byte _08044CF0 - .4byte _08044D44 - .4byte _08044DAC - .4byte _08044E10 - .4byte _08044E5C - .4byte _080451D6 - .4byte _080448B0 - .4byte _080451D6 - .4byte _080451D6 - .4byte _080451D6 - .4byte _080451D6 - .4byte _080451A0 - .4byte _080451D6 - .4byte _080451D6 - .4byte _080451D6 - .4byte _080451D6 - .4byte _080451D6 - .4byte _080451D6 - .4byte _080451D6 - .4byte _080451D6 - .4byte _080451D6 - .4byte _080451D6 - .4byte _080451D6 - .4byte _080451D6 - .4byte _080451D6 - .4byte _080451D6 - .4byte _0804491C -_08044764: +@080446B8: + .4byte @08044764 + .4byte @08044F44 + .4byte @08045008 + .4byte @08044F74 + .4byte @08044FA8 + .4byte @08044FD8 + .4byte @080447B0 + .4byte @08045044 + .4byte @08045074 + .4byte @0804497C + .4byte @080449FC + .4byte @08044A78 + .4byte @08044B0C + .4byte @08044BA0 + .4byte @08044C34 + .4byte @08044C9C + .4byte @08044CF0 + .4byte @08044D44 + .4byte @08044DAC + .4byte @08044E10 + .4byte @08044E5C + .4byte @080451D6 + .4byte @080448B0 + .4byte @080451D6 + .4byte @080451D6 + .4byte @080451D6 + .4byte @080451D6 + .4byte @080451A0 + .4byte @080451D6 + .4byte @080451D6 + .4byte @080451D6 + .4byte @080451D6 + .4byte @080451D6 + .4byte @080451D6 + .4byte @080451D6 + .4byte @080451D6 + .4byte @080451D6 + .4byte @080451D6 + .4byte @080451D6 + .4byte @080451D6 + .4byte @080451D6 + .4byte @080451D6 + .4byte @0804491C +@08044764: movs r0, 0x58 muls r0, r7 mov r1, r8 @@ -117149,13 +117149,13 @@ _08044764: ldrh r1, [r2, 0x28] lsrs r0, 1 cmp r1, r0 - bls _0804477A - bl _080451D6 -_0804477A: + bls @0804477A + bl @080451D6 +@0804477A: cmp r6, 0 - beq _08044782 - bl _080451D6 -_08044782: + beq @08044782 + bl @080451D6 +@08044782: ldr r4, =0x020241f0 mov r3, r9 str r3, [r4] @@ -117164,28 +117164,28 @@ _08044782: adds r0, r3, r5 ldrh r1, [r2, 0x2C] cmp r0, r1 - ble _08044798 + ble @08044798 subs r0, r1, r3 str r0, [r4] -_08044798: +@08044798: ldr r0, [r4] negs r0, r0 str r0, [r4] ldr r0, =0x082db7c4 bl b_call_bc_move_exec - b _08044B02 + b @08044B02 .align 2, 0 .pool -_080447B0: +@080447B0: cmp r6, 0 - beq _080447B8 - bl _080451D6 -_080447B8: + beq @080447B8 + bl @080451D6 +@080447B8: adds r0, r7, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _080447DC + bne @080447DC ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 @@ -117193,10 +117193,10 @@ _080447B8: movs r0, 0x64 muls r1, r0 ldr r0, =0x020244ec - b _080447EA + b @080447EA .align 2, 0 .pool -_080447DC: +@080447DC: ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 @@ -117204,12 +117204,12 @@ _080447DC: movs r0, 0x64 muls r1, r0 ldr r0, =0x02024744 -_080447EA: +@080447EA: adds r4, r1, r0 movs r1, 0 mov r10, r1 add r5, sp, 0x4 -_080447F2: +@080447F2: mov r1, r10 adds r1, 0xD adds r0, r4, 0 @@ -117227,22 +117227,22 @@ _080447F2: lsls r0, 24 lsrs r1, r0, 24 cmp r6, 0 - beq _08044822 + beq @08044822 ldrb r0, [r5] cmp r0, 0 - beq _0804482C -_08044822: + beq @0804482C +@08044822: movs r2, 0x1 add r10, r2 mov r3, r10 cmp r3, 0x3 - ble _080447F2 -_0804482C: + ble @080447F2 +@0804482C: mov r5, r10 cmp r5, 0x4 - bne _08044836 - bl _080451D6 -_08044836: + bne @08044836 + bl @080451D6 +@08044836: lsls r2, r5, 24 lsrs r2, 24 adds r0, r6, 0 @@ -117254,16 +117254,16 @@ _08044836: mov r3, r9 adds r1, r0, r3 cmp r1, r2 - ble _08044860 + ble @08044860 add r0, sp, 0x4 strb r2, [r0] - b _08044864 + b @08044864 .align 2, 0 .pool -_08044860: +@08044860: add r0, sp, 0x4 strb r1, [r0] -_08044864: +@08044864: ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] @@ -117291,10 +117291,10 @@ _08044864: bl dp01_battle_side_mark_buffer_for_execution movs r0, 0x3 str r0, [sp, 0xC] - bl _080451DE + bl @080451DE .align 2, 0 .pool -_080448B0: +@080448B0: ldr r0, =0x02024084 movs r1, 0x58 muls r1, r7 @@ -117303,29 +117303,29 @@ _080448B0: movs r2, 0x6 movs r3, 0x7 mov r10, r3 -_080448C0: +@080448C0: movs r0, 0 ldrsb r0, [r1, r0] cmp r0, 0x5 - bgt _080448CE + bgt @080448CE strb r2, [r1] movs r5, 0x5 str r5, [sp, 0xC] -_080448CE: +@080448CE: adds r1, 0x1 movs r0, 0x1 negs r0, r0 add r10, r0 mov r3, r10 cmp r3, 0 - bge _080448C0 + bge @080448C0 movs r5, 0x8 mov r10, r5 ldr r0, [sp, 0xC] cmp r0, 0 - bne _080448EA - bl _0804582A -_080448EA: + bne @080448EA + bl @0804582A +@080448EA: ldr r0, =0x02024474 strb r7, [r0, 0x17] ldr r0, =0x0202420f @@ -117336,10 +117336,10 @@ _080448EA: strb r7, [r1] ldr r0, =0x082db7ae bl b_call_bc_move_exec - bl _080451D6 + bl @080451D6 .align 2, 0 .pool -_0804491C: +@0804491C: movs r0, 0x58 muls r0, r7 mov r2, r8 @@ -117347,31 +117347,31 @@ _0804491C: ldrh r0, [r1, 0x28] ldrh r3, [r1, 0x2C] cmp r0, r3 - bcc _08044930 - bl _080451D6 -_08044930: + bcc @08044930 + bl @080451D6 +@08044930: cmp r6, 0 - beq _08044938 - bl _080451D6 -_08044938: + beq @08044938 + bl @080451D6 +@08044938: ldr r3, =0x020241f0 ldrh r0, [r1, 0x2C] lsrs r0, 4 str r0, [r3] cmp r0, 0 - bne _08044948 + bne @08044948 movs r0, 0x1 str r0, [r3] -_08044948: +@08044948: ldrh r2, [r1, 0x28] ldr r0, [r3] adds r0, r2, r0 ldrh r1, [r1, 0x2C] cmp r0, r1 - ble _08044958 + ble @08044958 subs r0, r1, r2 str r0, [r3] -_08044958: +@08044958: ldr r0, [r3] negs r0, r0 str r0, [r3] @@ -117382,10 +117382,10 @@ _08044958: adds r0, r7, 0 adds r1, r5, 0 bl b_history__record_item_x12_of_player - bl _080451D6 + bl @080451D6 .align 2, 0 .pool -_0804497C: +@0804497C: movs r0, 0x58 adds r1, r7, 0 muls r1, r0 @@ -117396,13 +117396,13 @@ _0804497C: ldrh r1, [r4, 0x28] lsrs r0, 1 cmp r1, r0 - bls _08044996 - bl _080451D6 -_08044996: + bls @08044996 + bl @080451D6 +@08044996: cmp r6, 0 - beq _0804499E - bl _080451D6 -_0804499E: + beq @0804499E + bl @080451D6 +@0804499E: ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] @@ -117417,19 +117417,19 @@ _0804499E: bl __divsi3 str r0, [r5] cmp r0, 0 - bne _080449C2 + bne @080449C2 movs r0, 0x1 str r0, [r5] -_080449C2: +@080449C2: ldrh r2, [r4, 0x28] ldr r0, [r5] adds r0, r2, r0 ldrh r1, [r4, 0x2C] cmp r0, r1 - ble _080449D2 + ble @080449D2 subs r0, r1, r2 str r0, [r5] -_080449D2: +@080449D2: ldr r0, [r5] negs r0, r0 str r0, [r5] @@ -117442,13 +117442,13 @@ _080449D2: bl sub_806E880 lsls r0, 24 cmp r0, 0 - bge _080449F0 - b _08044B7C -_080449F0: - b _08044B90 + bge @080449F0 + b @08044B7C +@080449F0: + b @08044B90 .align 2, 0 .pool -_080449FC: +@080449FC: movs r0, 0x58 adds r5, r7, 0 muls r5, r0 @@ -117458,13 +117458,13 @@ _080449FC: ldrh r1, [r5, 0x28] lsrs r0, 1 cmp r1, r0 - bls _08044A14 - bl _080451D6 -_08044A14: + bls @08044A14 + bl @080451D6 +@08044A14: cmp r6, 0 - beq _08044A1C - bl _080451D6 -_08044A1C: + beq @08044A1C + bl @080451D6 +@08044A1C: ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] @@ -117480,18 +117480,18 @@ _08044A1C: bl __divsi3 str r0, [r4] cmp r0, 0 - bne _08044A40 + bne @08044A40 str r6, [r4] -_08044A40: +@08044A40: ldrh r2, [r5, 0x28] ldr r0, [r4] adds r0, r2, r0 ldrh r1, [r5, 0x2C] cmp r0, r1 - ble _08044A50 + ble @08044A50 subs r0, r1, r2 str r0, [r4] -_08044A50: +@08044A50: ldr r0, [r4] negs r0, r0 str r0, [r4] @@ -117504,13 +117504,13 @@ _08044A50: bl sub_806E880 lsls r0, 24 cmp r0, 0 - bge _08044A6E - b _08044C0E -_08044A6E: - b _08044C24 + bge @08044A6E + b @08044C0E +@08044A6E: + b @08044C24 .align 2, 0 .pool -_08044A78: +@08044A78: movs r0, 0x58 adds r3, r7, 0 muls r3, r0 @@ -117521,13 +117521,13 @@ _08044A78: ldrh r1, [r5, 0x28] lsrs r0, 1 cmp r1, r0 - bls _08044A90 - b _080451D6 -_08044A90: + bls @08044A90 + b @080451D6 +@08044A90: cmp r6, 0 - beq _08044A96 - b _080451D6 -_08044A96: + beq @08044A96 + b @080451D6 +@08044A96: ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] @@ -117543,19 +117543,19 @@ _08044A96: bl __divsi3 str r0, [r4] cmp r0, 0 - bne _08044ABC + bne @08044ABC movs r0, 0x1 str r0, [r4] -_08044ABC: +@08044ABC: ldrh r2, [r5, 0x28] ldr r0, [r4] adds r0, r2, r0 ldrh r1, [r5, 0x2C] cmp r0, r1 - ble _08044ACC + ble @08044ACC subs r0, r1, r2 str r0, [r4] -_08044ACC: +@08044ACC: ldr r0, [r4] negs r0, r0 str r0, [r4] @@ -117568,22 +117568,22 @@ _08044ACC: bl sub_806E880 lsls r0, 24 cmp r0, 0 - bge _08044AFC + bge @08044AFC ldr r0, =0x082db824 bl b_call_bc_move_exec - b _08044B02 + b @08044B02 .align 2, 0 .pool -_08044AFC: +@08044AFC: ldr r0, =0x082db7c4 bl b_call_bc_move_exec -_08044B02: +@08044B02: movs r0, 0x4 str r0, [sp, 0xC] - b _080451DE + b @080451DE .align 2, 0 .pool -_08044B0C: +@08044B0C: movs r0, 0x58 adds r1, r7, 0 muls r1, r0 @@ -117594,13 +117594,13 @@ _08044B0C: ldrh r1, [r5, 0x28] lsrs r0, 1 cmp r1, r0 - bls _08044B24 - b _080451D6 -_08044B24: + bls @08044B24 + b @080451D6 +@08044B24: cmp r6, 0 - beq _08044B2A - b _080451D6 -_08044B2A: + beq @08044B2A + b @080451D6 +@08044B2A: ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] @@ -117616,19 +117616,19 @@ _08044B2A: bl __divsi3 str r0, [r4] cmp r0, 0 - bne _08044B50 + bne @08044B50 movs r0, 0x1 str r0, [r4] -_08044B50: +@08044B50: ldrh r2, [r5, 0x28] ldr r0, [r4] adds r0, r2, r0 ldrh r1, [r5, 0x2C] cmp r0, r1 - ble _08044B60 + ble @08044B60 subs r0, r1, r2 str r0, [r4] -_08044B60: +@08044B60: ldr r0, [r4] negs r0, r0 str r0, [r4] @@ -117641,23 +117641,23 @@ _08044B60: bl sub_806E880 lsls r0, 24 cmp r0, 0 - bge _08044B90 -_08044B7C: + bge @08044B90 +@08044B7C: ldr r0, =0x082db824 bl b_call_bc_move_exec - b _08044B96 + b @08044B96 .align 2, 0 .pool -_08044B90: +@08044B90: ldr r0, =0x082db7c4 bl b_call_bc_move_exec -_08044B96: +@08044B96: movs r3, 0x4 str r3, [sp, 0xC] - b _080451DE + b @080451DE .align 2, 0 .pool -_08044BA0: +@08044BA0: movs r0, 0x58 adds r5, r7, 0 muls r5, r0 @@ -117667,13 +117667,13 @@ _08044BA0: ldrh r1, [r5, 0x28] lsrs r0, 1 cmp r1, r0 - bls _08044BB6 - b _080451D6 -_08044BB6: + bls @08044BB6 + b @080451D6 +@08044BB6: cmp r6, 0 - beq _08044BBC - b _080451D6 -_08044BBC: + beq @08044BBC + b @080451D6 +@08044BBC: ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] @@ -117689,19 +117689,19 @@ _08044BBC: bl __divsi3 str r0, [r4] cmp r0, 0 - bne _08044BE2 + bne @08044BE2 movs r0, 0x1 str r0, [r4] -_08044BE2: +@08044BE2: ldrh r2, [r5, 0x28] ldr r0, [r4] adds r0, r2, r0 ldrh r1, [r5, 0x2C] cmp r0, r1 - ble _08044BF2 + ble @08044BF2 subs r0, r1, r2 str r0, [r4] -_08044BF2: +@08044BF2: ldr r0, [r4] negs r0, r0 str r0, [r4] @@ -117714,23 +117714,23 @@ _08044BF2: bl sub_806E880 lsls r0, 24 cmp r0, 0 - bge _08044C24 -_08044C0E: + bge @08044C24 +@08044C0E: ldr r0, =0x082db824 bl b_call_bc_move_exec - b _08044C2A + b @08044C2A .align 2, 0 .pool -_08044C24: +@08044C24: ldr r0, =0x082db7c4 bl b_call_bc_move_exec -_08044C2A: +@08044C2A: movs r2, 0x4 str r2, [sp, 0xC] - b _080451DE + b @080451DE .align 2, 0 .pool -_08044C34: +@08044C34: movs r0, 0x58 muls r0, r7 mov r3, r8 @@ -117740,19 +117740,19 @@ _08044C34: mov r1, r9 bl __divsi3 cmp r4, r0 - ble _08044C4C - b _080451D6 -_08044C4C: + ble @08044C4C + b @080451D6 +@08044C4C: cmp r6, 0 - beq _08044C52 - b _080451D6 -_08044C52: + beq @08044C52 + b @080451D6 +@08044C52: movs r0, 0x19 ldrsb r0, [r5, r0] cmp r0, 0xB - ble _08044C5C - b _080451D6 -_08044C5C: + ble @08044C5C + b @080451D6 +@08044C5C: ldr r1, =0x02022f58 movs r2, 0xFD strb r2, [r1] @@ -117776,10 +117776,10 @@ _08044C5C: movs r0, 0x11 strb r0, [r1, 0x1A] movs r0, 0xF - b _08044DF0 + b @08044DF0 .align 2, 0 .pool -_08044C9C: +@08044C9C: movs r0, 0x58 muls r0, r7 mov r1, r8 @@ -117789,19 +117789,19 @@ _08044C9C: mov r1, r9 bl __divsi3 cmp r4, r0 - ble _08044CB4 - b _080451D6 -_08044CB4: + ble @08044CB4 + b @080451D6 +@08044CB4: cmp r6, 0 - beq _08044CBA - b _080451D6 -_08044CBA: + beq @08044CBA + b @080451D6 +@08044CBA: movs r0, 0x1A ldrsb r0, [r5, r0] cmp r0, 0xB - ble _08044CC4 - b _080451D6 -_08044CC4: + ble @08044CC4 + b @080451D6 +@08044CC4: ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] @@ -117817,10 +117817,10 @@ _08044CC4: movs r0, 0x12 strb r0, [r1, 0x1A] movs r0, 0x10 - b _08044D8A + b @08044D8A .align 2, 0 .pool -_08044CF0: +@08044CF0: movs r0, 0x58 muls r0, r7 mov r3, r8 @@ -117830,19 +117830,19 @@ _08044CF0: mov r1, r9 bl __divsi3 cmp r4, r0 - ble _08044D08 - b _080451D6 -_08044D08: + ble @08044D08 + b @080451D6 +@08044D08: cmp r6, 0 - beq _08044D0E - b _080451D6 -_08044D0E: + beq @08044D0E + b @080451D6 +@08044D0E: movs r0, 0x1B ldrsb r0, [r5, r0] cmp r0, 0xB - ble _08044D18 - b _080451D6 -_08044D18: + ble @08044D18 + b @080451D6 +@08044D18: ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] @@ -117858,10 +117858,10 @@ _08044D18: movs r0, 0x13 strb r0, [r1, 0x1A] movs r0, 0x11 - b _08044DF0 + b @08044DF0 .align 2, 0 .pool -_08044D44: +@08044D44: movs r0, 0x58 muls r0, r7 mov r1, r8 @@ -117871,19 +117871,19 @@ _08044D44: mov r1, r9 bl __divsi3 cmp r4, r0 - ble _08044D5C - b _080451D6 -_08044D5C: + ble @08044D5C + b @080451D6 +@08044D5C: cmp r6, 0 - beq _08044D62 - b _080451D6 -_08044D62: + beq @08044D62 + b @080451D6 +@08044D62: movs r0, 0x1C ldrsb r0, [r5, r0] cmp r0, 0xB - ble _08044D6C - b _080451D6 -_08044D6C: + ble @08044D6C + b @080451D6 +@08044D6C: ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] @@ -117899,17 +117899,17 @@ _08044D6C: movs r0, 0x14 strb r0, [r1, 0x1A] movs r0, 0x12 -_08044D8A: +@08044D8A: strb r0, [r1, 0x10] strb r6, [r1, 0x11] ldr r0, =0x082db84e bl b_call_bc_move_exec movs r2, 0x5 str r2, [sp, 0xC] - b _080451DE + b @080451DE .align 2, 0 .pool -_08044DAC: +@08044DAC: movs r0, 0x58 muls r0, r7 mov r3, r8 @@ -117919,19 +117919,19 @@ _08044DAC: mov r1, r9 bl __divsi3 cmp r4, r0 - ble _08044DC4 - b _080451D6 -_08044DC4: + ble @08044DC4 + b @080451D6 +@08044DC4: cmp r6, 0 - beq _08044DCA - b _080451D6 -_08044DCA: + beq @08044DCA + b @080451D6 +@08044DCA: movs r0, 0x1D ldrsb r0, [r5, r0] cmp r0, 0xB - ble _08044DD4 - b _080451D6 -_08044DD4: + ble @08044DD4 + b @080451D6 +@08044DD4: ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] @@ -117946,17 +117946,17 @@ _08044DD4: movs r0, 0x15 strb r0, [r1, 0x1A] movs r0, 0x13 -_08044DF0: +@08044DF0: strb r0, [r1, 0x10] strb r6, [r1, 0x11] ldr r0, =0x082db84e bl b_call_bc_move_exec movs r5, 0x5 str r5, [sp, 0xC] - b _080451DE + b @080451DE .align 2, 0 .pool -_08044E10: +@08044E10: movs r0, 0x58 adds r5, r7, 0 muls r5, r0 @@ -117967,13 +117967,13 @@ _08044E10: mov r1, r9 bl __divsi3 cmp r4, r0 - ble _08044E2A - b _080451D6 -_08044E2A: + ble @08044E2A + b @080451D6 +@08044E2A: cmp r6, 0 - beq _08044E30 - b _080451D6 -_08044E30: + beq @08044E30 + b @080451D6 +@08044E30: mov r0, r8 adds r0, 0x50 adds r1, r5, r0 @@ -117983,23 +117983,23 @@ _08044E30: adds r0, r2, 0 ands r0, r3 cmp r0, 0 - beq _08044E46 - b _080451D6 -_08044E46: + beq @08044E46 + b @080451D6 +@08044E46: orrs r2, r3 str r2, [r1] ldr r0, =0x082db869 bl b_call_bc_move_exec movs r2, 0x2 str r2, [sp, 0xC] - b _080451DE + b @080451DE .align 2, 0 .pool -_08044E5C: +@08044E5C: cmp r6, 0 - beq _08044E62 - b _080451D6 -_08044E62: + beq @08044E62 + b @080451D6 +@08044E62: movs r0, 0x58 adds r5, r7, 0 muls r5, r0 @@ -118010,9 +118010,9 @@ _08044E62: mov r1, r9 bl __divsi3 cmp r4, r0 - ble _08044E7C - b _080451D6 -_08044E7C: + ble @08044E7C + b @080451D6 +@08044E7C: movs r0, 0 mov r10, r0 adds r0, r5, 0x1 @@ -118023,32 +118023,32 @@ _08044E7C: lsls r0, 24 asrs r0, 24 cmp r0, 0xB - ble _08044EAC + ble @08044EAC mov r0, r8 adds r0, 0x19 adds r1, r5, r0 -_08044E98: +@08044E98: adds r1, 0x1 movs r2, 0x1 add r10, r2 mov r3, r10 cmp r3, 0x4 - bgt _08044EAC + bgt @08044EAC movs r0, 0 ldrsb r0, [r1, r0] cmp r0, 0xB - bgt _08044E98 -_08044EAC: + bgt @08044E98 +@08044EAC: mov r5, r10 cmp r5, 0x5 - bne _08044EB4 - b _080451D6 -_08044EB4: + bne @08044EB4 + b @080451D6 +@08044EB4: movs r0, 0x58 muls r0, r7 adds r4, r0, 0x1 ldr r5, =0x0202409c -_08044EBC: +@08044EBC: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -118063,7 +118063,7 @@ _08044EBC: lsls r0, 24 asrs r0, 24 cmp r0, 0xC - beq _08044EBC + beq @08044EBC ldr r1, =0x02022f58 movs r2, 0 movs r3, 0xFD @@ -118100,10 +118100,10 @@ _08044EBC: bl b_call_bc_move_exec movs r0, 0x5 str r0, [sp, 0xC] - b _080451DE + b @080451DE .align 2, 0 .pool -_08044F44: +@08044F44: movs r0, 0x58 adds r1, r7, 0 muls r1, r0 @@ -118114,9 +118114,9 @@ _08044F44: movs r0, 0x40 ands r0, r2 cmp r0, 0 - bne _08044F5C - b _080451D6 -_08044F5C: + bne @08044F5C + b @080451D6 +@08044F5C: movs r0, 0x41 negs r0, r0 ands r2, r0 @@ -118125,10 +118125,10 @@ _08044F5C: bl b_call_bc_move_exec movs r1, 0x1 str r1, [sp, 0xC] - b _080451DE + b @080451DE .align 2, 0 .pool -_08044F74: +@08044F74: movs r0, 0x58 adds r1, r7, 0 muls r1, r0 @@ -118139,9 +118139,9 @@ _08044F74: movs r0, 0x88 ands r0, r2 cmp r0, 0 - bne _08044F8C - b _080451D6 -_08044F8C: + bne @08044F8C + b @080451D6 +@08044F8C: ldr r0, =0xfffff077 ands r2, r0 str r2, [r1] @@ -118149,10 +118149,10 @@ _08044F8C: bl b_call_bc_move_exec movs r2, 0x1 str r2, [sp, 0xC] - b _080451DE + b @080451DE .align 2, 0 .pool -_08044FA8: +@08044FA8: movs r0, 0x58 adds r1, r7, 0 muls r1, r0 @@ -118163,9 +118163,9 @@ _08044FA8: movs r0, 0x10 ands r0, r2 cmp r0, 0 - bne _08044FC0 - b _080451D6 -_08044FC0: + bne @08044FC0 + b @080451D6 +@08044FC0: movs r0, 0x11 negs r0, r0 ands r2, r0 @@ -118174,10 +118174,10 @@ _08044FC0: bl b_call_bc_move_exec movs r3, 0x1 str r3, [sp, 0xC] - b _080451DE + b @080451DE .align 2, 0 .pool -_08044FD8: +@08044FD8: movs r0, 0x58 adds r1, r7, 0 muls r1, r0 @@ -118188,9 +118188,9 @@ _08044FD8: movs r0, 0x20 ands r0, r2 cmp r0, 0 - bne _08044FF0 - b _080451D6 -_08044FF0: + bne @08044FF0 + b @080451D6 +@08044FF0: movs r0, 0x21 negs r0, r0 ands r2, r0 @@ -118199,10 +118199,10 @@ _08044FF0: bl b_call_bc_move_exec movs r5, 0x1 str r5, [sp, 0xC] - b _080451DE + b @080451DE .align 2, 0 .pool -_08045008: +@08045008: movs r0, 0x58 adds r3, r7, 0 muls r3, r0 @@ -118213,9 +118213,9 @@ _08045008: movs r0, 0x7 ands r0, r1 cmp r0, 0 - bne _08045020 - b _080451D6 -_08045020: + bne @08045020 + b @080451D6 +@08045020: movs r0, 0x8 negs r0, r0 ands r1, r0 @@ -118228,10 +118228,10 @@ _08045020: ands r0, r2 str r0, [r1] ldr r0, =0x082db766 - b _0804518A + b @0804518A .align 2, 0 .pool -_08045044: +@08045044: movs r0, 0x58 adds r1, r7, 0 muls r1, r0 @@ -118242,9 +118242,9 @@ _08045044: movs r0, 0x7 ands r0, r2 cmp r0, 0 - bne _0804505C - b _080451D6 -_0804505C: + bne @0804505C + b @080451D6 +@0804505C: movs r0, 0x8 negs r0, r0 ands r2, r0 @@ -118253,10 +118253,10 @@ _0804505C: bl b_call_bc_move_exec movs r1, 0x2 str r1, [sp, 0xC] - b _080451DE + b @080451DE .align 2, 0 .pool -_08045074: +@08045074: movs r0, 0x58 adds r5, r7, 0 muls r5, r0 @@ -118266,7 +118266,7 @@ _08045074: ldr r2, [r4] ldrb r0, [r4] cmp r0, 0 - bne _0804509A + bne @0804509A mov r0, r8 adds r0, 0x50 adds r0, r5, r0 @@ -118274,21 +118274,21 @@ _08045074: movs r1, 0x7 ands r0, r1 cmp r0, 0 - bne _0804509A - b _080451D6 -_0804509A: + bne @0804509A + b @080451D6 +@0804509A: movs r3, 0 mov r10, r3 movs r0, 0x88 ands r2, r0 cmp r2, 0 - beq _080450B2 + beq @080450B2 ldr r0, =0x02022f58 ldr r1, =0x0831bc70 bl gf_strcpy movs r0, 0x1 mov r10, r0 -_080450B2: +@080450B2: ldr r0, [r4] movs r1, 0x7 mov r9, r1 @@ -118296,7 +118296,7 @@ _080450B2: mov r6, r8 adds r6, 0x50 cmp r0, 0 - beq _080450D8 + beq @080450D8 adds r2, r5, r6 ldr r0, [r2] ldr r1, =0xf7ffffff @@ -118307,64 +118307,64 @@ _080450B2: bl gf_strcpy movs r2, 0x1 add r10, r2 -_080450D8: +@080450D8: ldr r0, [r4] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _080450EE + beq @080450EE ldr r0, =0x02022f58 ldr r1, =0x0831bc80 bl gf_strcpy movs r3, 0x1 add r10, r3 -_080450EE: +@080450EE: ldr r0, [r4] movs r1, 0x10 ands r0, r1 cmp r0, 0 - beq _08045104 + beq @08045104 ldr r0, =0x02022f58 ldr r1, =0x0831bc88 bl gf_strcpy movs r0, 0x1 add r10, r0 -_08045104: +@08045104: ldr r0, [r4] movs r1, 0x20 ands r0, r1 cmp r0, 0 - beq _0804511A + beq @0804511A ldr r0, =0x02022f58 ldr r1, =0x0831bc90 bl gf_strcpy movs r1, 0x1 add r10, r1 -_0804511A: +@0804511A: adds r0, r5, r6 ldr r0, [r0] mov r2, r9 ands r0, r2 cmp r0, 0 - beq _08045132 + beq @08045132 ldr r0, =0x02022f58 ldr r1, =0x0831bc98 bl gf_strcpy movs r3, 0x1 add r10, r3 -_08045132: +@08045132: mov r5, r10 cmp r5, 0x1 - bgt _08045164 + bgt @08045164 ldr r1, =0x02024332 movs r0, 0 - b _08045168 + b @08045168 .align 2, 0 .pool -_08045164: +@08045164: ldr r1, =0x02024332 movs r0, 0x1 -_08045168: +@08045168: strb r0, [r1, 0x5] ldr r2, =0x02024084 movs r0, 0x58 @@ -118382,14 +118382,14 @@ _08045168: ands r0, r1 str r0, [r3] ldr r0, =0x082db794 -_0804518A: +@0804518A: bl b_call_bc_move_exec movs r0, 0x1 str r0, [sp, 0xC] - b _080451DE + b @080451DE .align 2, 0 .pool -_080451A0: +@080451A0: movs r0, 0x58 adds r1, r7, 0 muls r1, r0 @@ -118401,7 +118401,7 @@ _080451A0: lsls r0, 12 ands r0, r2 cmp r0, 0 - beq _080451D6 + beq @080451D6 ldr r0, =0xfff0ffff ands r2, r0 str r2, [r1] @@ -118415,12 +118415,12 @@ _080451A0: strb r0, [r1, 0x5] movs r1, 0x2 str r1, [sp, 0xC] -_080451D6: +@080451D6: ldr r2, [sp, 0xC] cmp r2, 0 - bne _080451DE - b _0804582A -_080451DE: + bne @080451DE + b @0804582A +@080451DE: ldr r0, =0x02024474 strb r7, [r0, 0x17] ldr r0, =0x0202420f @@ -118431,17 +118431,17 @@ _080451DE: strb r7, [r4] ldr r3, [sp, 0xC] cmp r3, 0x1 - beq _08045220 + beq @08045220 cmp r3, 0x3 - beq _08045226 - b _0804582A + beq @08045226 + b @0804582A .align 2, 0 .pool -_08045220: +@08045220: movs r0, 0x58 muls r0, r7 - b _0804568C -_08045226: + b @0804568C +@08045226: ldr r4, =0x02024084 movs r0, 0x58 adds r3, r7, 0 @@ -118454,9 +118454,9 @@ _08045226: lsls r1, 14 ands r0, r1 cmp r0, 0 - beq _08045242 - b _0804582A -_08045242: + beq @08045242 + b @0804582A +@08045242: ldr r1, =0x020242bc lsls r0, r7, 3 subs r0, r7 @@ -118471,9 +118471,9 @@ _08045242: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _08045262 - b _0804582A -_08045262: + beq @08045262 + b @0804582A +@08045262: adds r1, r5, r3 adds r0, r4, 0 adds r0, 0x24 @@ -118481,17 +118481,17 @@ _08045262: add r0, sp, 0x4 ldrb r0, [r0] strb r0, [r1] - b _0804582A + b @0804582A .align 2, 0 .pool -_08045280: +@08045280: movs r7, 0 ldr r0, =0x0202406c ldrb r0, [r0] cmp r7, r0 - bcc _0804528C - b _0804582A -_0804528C: + bcc @0804528C + b @0804582A +@0804528C: ldr r4, =0x02024208 ldr r1, =0x02024084 movs r0, 0x58 @@ -118502,66 +118502,66 @@ _0804528C: lsls r0, 16 lsrs r0, 16 cmp r0, 0xAF - bne _080452C0 + bne @080452C0 ldr r1, =0x02024404 lsls r0, r7, 3 subs r0, r7 lsls r0, 2 adds r0, r1 ldrb r5, [r0, 0x7] - b _080452D0 + b @080452D0 .align 2, 0 .pool -_080452C0: +@080452C0: ldrh r0, [r4] bl itemid_get_x12 lsls r0, 24 lsrs r5, r0, 24 ldrh r0, [r4] bl itemid_get_quality -_080452D0: +@080452D0: subs r0, r5, 0x2 cmp r0, 0x1A - bls _080452D8 - b _08045674 -_080452D8: + bls @080452D8 + b @08045674 +@080452D8: lsls r0, 2 - ldr r1, =_080452E8 + ldr r1, =@080452E8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080452E8: - .4byte _08045354 - .4byte _08045444 - .4byte _08045390 - .4byte _080453CC - .4byte _08045408 - .4byte _08045674 - .4byte _0804548C - .4byte _08045520 - .4byte _08045674 - .4byte _08045674 - .4byte _08045674 - .4byte _08045674 - .4byte _08045674 - .4byte _08045674 - .4byte _08045674 - .4byte _08045674 - .4byte _08045674 - .4byte _08045674 - .4byte _08045674 - .4byte _08045674 - .4byte _08045674 - .4byte _08045614 - .4byte _08045674 - .4byte _08045674 - .4byte _08045674 - .4byte _08045674 - .4byte _080454C8 -_08045354: +@080452E8: + .4byte @08045354 + .4byte @08045444 + .4byte @08045390 + .4byte @080453CC + .4byte @08045408 + .4byte @08045674 + .4byte @0804548C + .4byte @08045520 + .4byte @08045674 + .4byte @08045674 + .4byte @08045674 + .4byte @08045674 + .4byte @08045674 + .4byte @08045674 + .4byte @08045674 + .4byte @08045674 + .4byte @08045674 + .4byte @08045674 + .4byte @08045674 + .4byte @08045674 + .4byte @08045674 + .4byte @08045614 + .4byte @08045674 + .4byte @08045674 + .4byte @08045674 + .4byte @08045674 + .4byte @080454C8 +@08045354: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r7 @@ -118571,9 +118571,9 @@ _08045354: movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _0804536A - b _08045674 -_0804536A: + bne @0804536A + b @08045674 +@0804536A: movs r0, 0x41 negs r0, r0 ands r1, r0 @@ -118584,10 +118584,10 @@ _0804536A: str r0, [r1] movs r0, 0x1 str r0, [sp, 0xC] - b _0804567A + b @0804567A .align 2, 0 .pool -_08045390: +@08045390: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r7 @@ -118597,9 +118597,9 @@ _08045390: movs r0, 0x88 ands r0, r1 cmp r0, 0 - bne _080453A6 - b _08045674 -_080453A6: + bne @080453A6 + b @08045674 +@080453A6: ldr r0, =0xfffff077 ands r1, r0 str r1, [r2] @@ -118609,10 +118609,10 @@ _080453A6: str r0, [r1] movs r1, 0x1 str r1, [sp, 0xC] - b _0804567A + b @0804567A .align 2, 0 .pool -_080453CC: +@080453CC: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r7 @@ -118622,9 +118622,9 @@ _080453CC: movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _080453E2 - b _08045674 -_080453E2: + bne @080453E2 + b @08045674 +@080453E2: movs r0, 0x11 negs r0, r0 ands r1, r0 @@ -118635,10 +118635,10 @@ _080453E2: str r0, [r1] movs r2, 0x1 str r2, [sp, 0xC] - b _0804567A + b @0804567A .align 2, 0 .pool -_08045408: +@08045408: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r7 @@ -118648,9 +118648,9 @@ _08045408: movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _0804541E - b _08045674 -_0804541E: + bne @0804541E + b @08045674 +@0804541E: movs r0, 0x21 negs r0, r0 ands r1, r0 @@ -118661,10 +118661,10 @@ _0804541E: str r0, [r1] movs r3, 0x1 str r3, [sp, 0xC] - b _0804567A + b @0804567A .align 2, 0 .pool -_08045444: +@08045444: ldr r2, =0x02024084 movs r0, 0x58 adds r4, r7, 0 @@ -118676,9 +118676,9 @@ _08045444: movs r0, 0x7 ands r0, r1 cmp r0, 0 - bne _0804545E - b _08045674 -_0804545E: + bne @0804545E + b @08045674 +@0804545E: movs r0, 0x8 negs r0, r0 ands r1, r0 @@ -118692,10 +118692,10 @@ _0804545E: bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =0x082db76c - b _080455DC + b @080455DC .align 2, 0 .pool -_0804548C: +@0804548C: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r7 @@ -118705,9 +118705,9 @@ _0804548C: movs r0, 0x7 ands r0, r1 cmp r0, 0 - bne _080454A2 - b _08045674 -_080454A2: + bne @080454A2 + b @08045674 +@080454A2: movs r0, 0x8 negs r0, r0 ands r1, r0 @@ -118718,10 +118718,10 @@ _080454A2: str r0, [r1] movs r0, 0x2 str r0, [sp, 0xC] - b _0804567A + b @0804567A .align 2, 0 .pool -_080454C8: +@080454C8: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r7 @@ -118732,9 +118732,9 @@ _080454C8: lsls r0, 12 ands r0, r1 cmp r0, 0 - bne _080454E0 - b _08045674 -_080454E0: + bne @080454E0 + b @08045674 +@080454E0: ldr r0, =0xfff0ffff ands r1, r0 str r1, [r2] @@ -118750,10 +118750,10 @@ _080454E0: str r0, [r1] movs r1, 0x2 str r1, [sp, 0xC] - b _0804567A + b @0804567A .align 2, 0 .pool -_08045520: +@08045520: ldr r4, =0x02024084 movs r0, 0x58 adds r5, r7, 0 @@ -118764,7 +118764,7 @@ _08045520: ldr r2, [r6] ldrb r0, [r6] cmp r0, 0 - bne _08045548 + bne @08045548 adds r0, r4, 0 adds r0, 0x50 adds r0, r5, r0 @@ -118772,24 +118772,24 @@ _08045520: movs r1, 0x7 ands r0, r1 cmp r0, 0 - bne _08045548 - b _08045674 -_08045548: + bne @08045548 + b @08045674 +@08045548: movs r0, 0x88 ands r2, r0 cmp r2, 0 - beq _08045558 + beq @08045558 ldr r0, =0x02022f58 ldr r1, =0x0831bc70 bl gf_strcpy -_08045558: +@08045558: ldr r0, [r6] movs r2, 0x7 mov r8, r2 ands r0, r2 adds r4, 0x50 cmp r0, 0 - beq _08045578 + beq @08045578 adds r2, r5, r4 ldr r0, [r2] ldr r1, =0xf7ffffff @@ -118798,44 +118798,44 @@ _08045558: ldr r0, =0x02022f58 ldr r1, =0x0831bc78 bl gf_strcpy -_08045578: +@08045578: ldr r0, [r6] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _0804558A + beq @0804558A ldr r0, =0x02022f58 ldr r1, =0x0831bc80 bl gf_strcpy -_0804558A: +@0804558A: ldr r0, [r6] movs r1, 0x10 ands r0, r1 cmp r0, 0 - beq _0804559C + beq @0804559C ldr r0, =0x02022f58 ldr r1, =0x0831bc88 bl gf_strcpy -_0804559C: +@0804559C: ldr r0, [r6] movs r1, 0x20 ands r0, r1 cmp r0, 0 - beq _080455AE + beq @080455AE ldr r0, =0x02022f58 ldr r1, =0x0831bc90 bl gf_strcpy -_080455AE: +@080455AE: adds r5, r4 ldr r0, [r5] mov r3, r8 ands r0, r3 cmp r0, 0 - beq _080455C2 + beq @080455C2 ldr r0, =0x02022f58 ldr r1, =0x0831bc98 bl gf_strcpy -_080455C2: +@080455C2: movs r4, 0 str r4, [r6] ldr r0, [r5] @@ -118848,14 +118848,14 @@ _080455C2: strb r4, [r0, 0x5] ldr r1, =0x02024214 ldr r0, =0x082db79a -_080455DC: +@080455DC: str r0, [r1] movs r5, 0x1 str r5, [sp, 0xC] - b _0804567A + b @0804567A .align 2, 0 .pool -_08045614: +@08045614: ldr r0, =0x02024084 mov r8, r0 movs r0, 0x58 @@ -118867,25 +118867,25 @@ _08045614: movs r2, 0x6 movs r3, 0x7 mov r10, r3 -_0804562A: +@0804562A: movs r0, 0 ldrsb r0, [r1, r0] cmp r0, 0x5 - bgt _08045638 + bgt @08045638 strb r2, [r1] movs r5, 0x5 str r5, [sp, 0xC] -_08045638: +@08045638: adds r1, 0x1 movs r0, 0x1 negs r0, r0 add r10, r0 mov r3, r10 cmp r3, 0 - bge _0804562A + bge @0804562A ldr r5, [sp, 0xC] cmp r5, 0 - beq _080456B8 + beq @080456B8 ldr r0, =0x02024474 strb r7, [r0, 0x17] ldr r0, =0x0202420f @@ -118894,14 +118894,14 @@ _08045638: ldr r1, =0x02024214 ldr r0, =0x082db7b4 str r0, [r1] - b _0804582A + b @0804582A .align 2, 0 .pool -_08045674: +@08045674: ldr r0, [sp, 0xC] cmp r0, 0 - beq _080456B8 -_0804567A: + beq @080456B8 +@0804567A: ldr r0, =0x02024474 strb r7, [r0, 0x17] ldr r0, =0x0202420f @@ -118911,7 +118911,7 @@ _0804567A: ldrb r1, [r4] movs r0, 0x58 muls r0, r1 -_0804568C: +@0804568C: ldr r1, =0x020240d0 adds r0, r1 str r0, [sp] @@ -118922,46 +118922,46 @@ _0804568C: bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - b _0804582A + b @0804582A .align 2, 0 .pool -_080456B8: +@080456B8: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 ldr r0, =0x0202406c ldrb r0, [r0] cmp r7, r0 - bcs _080456C8 - b _0804528C -_080456C8: - b _0804582A + bcs @080456C8 + b @0804528C +@080456C8: + b @0804582A .align 2, 0 .pool -_080456D0: +@080456D0: ldr r7, =0x020241f0 ldr r0, [r7] cmp r0, 0 - bne _080456DA - b _0804582A -_080456DA: + bne @080456DA + b @0804582A +@080456DA: mov r1, r8 cmp r1, 0x1E - beq _080456EC + beq @080456EC cmp r1, 0x3E - beq _08045794 - b _0804582A + beq @08045794 + b @0804582A .align 2, 0 .pool -_080456EC: +@080456EC: ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 - beq _080456FA - b _0804582A -_080456FA: + beq @080456FA + b @0804582A +@080456FA: ldr r2, =0x0202437c ldr r4, =0x0202420c ldrb r1, [r4] @@ -118973,15 +118973,15 @@ _080456FA: adds r0, r1, r0 ldr r0, [r0] cmp r0, 0 - bne _08045720 + bne @08045720 adds r0, r2, 0 adds r0, 0xC adds r0, r1, r0 ldr r0, [r0] cmp r0, 0 - bne _08045720 - b _0804582A -_08045720: + bne @08045720 + b @0804582A +@08045720: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -118991,7 +118991,7 @@ _08045720: lsrs r0, 16 ldr r2, [sp, 0x10] cmp r0, r2 - bcs _0804582A + bcs @0804582A ldr r2, =0x0831c898 ldr r0, =0x020241ea ldrh r1, [r0] @@ -119003,7 +119003,7 @@ _08045720: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0804582A + beq @0804582A ldr r2, =0x02024084 ldrb r1, [r4] movs r0, 0x58 @@ -119011,7 +119011,7 @@ _08045720: adds r0, r2 ldrh r0, [r0, 0x28] cmp r0, 0 - beq _0804582A + beq @0804582A ldr r1, =0x02024332 movs r0, 0x8 strb r0, [r1, 0x3] @@ -119020,16 +119020,16 @@ _08045720: movs r1, 0 bl sub_8048760 bl b_movescr_stack_pop_cursor - b _0804582A + b @0804582A .align 2, 0 .pool -_08045794: +@08045794: ldr r0, =0x0202427c ldrb r0, [r0] movs r5, 0x29 ands r5, r0 cmp r5, 0 - bne _0804582A + bne @0804582A ldr r1, =0x0202437c ldr r4, =0x0202420c ldrb r2, [r4] @@ -119040,14 +119040,14 @@ _08045794: adds r0, r6 ldr r1, [r0] cmp r1, 0 - beq _0804582A + beq @0804582A ldr r0, =0x0000ffff cmp r1, r0 - beq _0804582A + beq @0804582A ldr r0, =0x0202420b ldrb r3, [r0] cmp r3, r2 - beq _0804582A + beq @0804582A ldr r2, =0x02024084 ldrb r1, [r0] movs r0, 0x58 @@ -119056,9 +119056,9 @@ _08045794: ldrh r1, [r0, 0x28] ldrh r0, [r0, 0x2C] cmp r1, r0 - beq _0804582A + beq @0804582A cmp r1, 0 - beq _0804582A + beq @0804582A ldr r0, =0x02024208 mov r1, sp ldrh r1, [r1, 0x14] @@ -119079,11 +119079,11 @@ _08045794: str r0, [r7] ldrb r1, [r4] cmp r0, 0 - bne _0804580C + bne @0804580C movs r0, 0x1 negs r0, r0 str r0, [r7] -_0804580C: +@0804580C: lsls r0, r1, 2 adds r0, r1 lsls r0, 2 @@ -119098,7 +119098,7 @@ _0804580C: lsls r0, 24 lsrs r0, 24 str r0, [sp, 0xC] -_0804582A: +@0804582A: ldr r0, [sp, 0xC] add sp, 0x2C pop {r3-r5} @@ -119113,7 +119113,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 @@ -119146,12 +119146,12 @@ 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] cmp r0, 0 - bne _080458D0 + bne @080458D0 ldr r1, =0x0831bd10 ldr r0, =0x02024214 ldr r0, [r0] @@ -119160,7 +119160,7 @@ sub_80458B4: @ 80458B4 adds r0, r1 ldr r0, [r0] bl _call_via_r0 -_080458D0: +@080458D0: pop {r0} bx r0 .align 2, 0 @@ -119168,7 +119168,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} @@ -119179,98 +119179,98 @@ sub_80458E0: @ 80458E0 lsrs r0, r1, 24 movs r5, 0 cmp r0, 0 - beq _080458FE + beq @080458FE subs r0, 0x1 lsls r0, 24 lsrs r6, r0, 24 - b _0804590A -_080458FE: + b @0804590A +@080458FE: ldr r1, =0x0831c898 lsls r0, r7, 1 adds r0, r7 lsls r0, 2 adds r0, r1 ldrb r6, [r0, 0x6] -_0804590A: +@0804590A: cmp r6, 0x40 - bls _08045910 - b _08045C20 -_08045910: + bls @08045910 + b @08045C20 +@08045910: lsls r0, r6, 2 - ldr r1, =_08045924 + ldr r1, =@08045924 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08045924: - .4byte _08045A28 - .4byte _08045B28 - .4byte _08045C1C - .4byte _08045C20 - .4byte _08045B40 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045B28 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C1C - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045B28 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045C20 - .4byte _08045B28 -_08045A28: +@08045924: + .4byte @08045A28 + .4byte @08045B28 + .4byte @08045C1C + .4byte @08045C20 + .4byte @08045B40 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045B28 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C1C + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045B28 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045C20 + .4byte @08045B28 +@08045A28: ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner @@ -119285,7 +119285,7 @@ _08045A28: adds r2, r0, r1 ldrb r0, [r2, 0x8] cmp r0, 0 - beq _08045A5A + beq @08045A5A ldr r1, =0x02024084 ldrb r4, [r2, 0x9] movs r0, 0x58 @@ -119293,9 +119293,9 @@ _08045A28: adds r0, r1 ldrh r0, [r0, 0x28] cmp r0, 0 - beq _08045A5A - b _08045B70 -_08045A5A: + beq @08045A5A + b @08045B70 +@08045A5A: ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner @@ -119303,7 +119303,7 @@ _08045A5A: lsrs r4, r0, 24 lsls r0, r7, 1 mov r8, r0 -_08045A6A: +@08045A6A: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -119315,13 +119315,13 @@ _08045A6A: ldr r6, =0x0202420b ldrb r3, [r6] cmp r5, r3 - beq _08045A6A + beq @08045A6A adds r0, r5, 0 bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r4, r0 - beq _08045A6A + beq @08045A6A ldr r0, =0x02024210 ldrb r2, [r0] ldr r1, =0x0832a328 @@ -119330,7 +119330,7 @@ _08045A6A: ldr r0, [r0] ands r2, r0 cmp r2, 0 - bne _08045A6A + bne @08045A6A ldr r0, =0x0831c898 mov r3, r8 adds r1, r3, r7 @@ -119338,9 +119338,9 @@ _08045A6A: adds r1, r0 ldrb r0, [r1, 0x2] cmp r0, 0xD - beq _08045AB8 - b _08045C20 -_08045AB8: + beq @08045AB8 + b @08045C20 +@08045AB8: ldrb r1, [r6] str r2, [sp] movs r0, 0x10 @@ -119349,9 +119349,9 @@ _08045AB8: bl ability_something lsls r0, 24 cmp r0, 0 - bne _08045ACE - b _08045C20 -_08045ACE: + bne @08045ACE + b @08045C20 +@08045ACE: ldr r2, =0x02024084 movs r1, 0x58 adds r0, r5, 0 @@ -119360,9 +119360,9 @@ _08045ACE: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x1F - bne _08045AE2 - b _08045C20 -_08045AE2: + bne @08045AE2 + b @08045C20 +@08045AE2: movs r4, 0x2 eors r5, r4 adds r0, r5, 0 @@ -119380,10 +119380,10 @@ _08045AE2: ldrb r1, [r0] orrs r1, r4 strb r1, [r0] - b _08045C20 + b @08045C20 .align 2, 0 .pool -_08045B28: +@08045B28: ldr r0, =0x0202420b ldrb r0, [r0] bl battle_get_per_side_status @@ -119392,10 +119392,10 @@ _08045B28: movs r0, 0x1 ands r0, r1 eors r0, r2 - b _08045BD2 + b @08045BD2 .align 2, 0 .pool -_08045B40: +@08045B40: ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner @@ -119410,7 +119410,7 @@ _08045B40: adds r2, r0, r1 ldrb r0, [r2, 0x8] cmp r0, 0 - beq _08045B80 + beq @08045B80 ldr r1, =0x02024084 ldrb r4, [r2, 0x9] movs r0, 0x58 @@ -119418,52 +119418,52 @@ _08045B40: adds r0, r1 ldrh r0, [r0, 0x28] cmp r0, 0 - beq _08045B80 -_08045B70: + beq @08045B80 +@08045B70: adds r5, r4, 0 - b _08045C20 + b @08045C20 .align 2, 0 .pool -_08045B80: +@08045B80: ldr r0, =0x02022fec ldr r0, [r0] movs r4, 0x1 ands r0, r4 cmp r0, 0 - beq _08045BFC + beq @08045BFC movs r0, 0x4 ands r6, r0 cmp r6, 0 - beq _08045BFC + beq @08045BFC ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08045BC0 + bne @08045BC0 bl GenerateRandomNumber adds r1, r4, 0 ands r1, r0 cmp r1, 0 - beq _08045BBC + beq @08045BBC movs r0, 0x1 - b _08045BD2 + b @08045BD2 .align 2, 0 .pool -_08045BBC: +@08045BBC: movs r0, 0x3 - b _08045BD2 -_08045BC0: + b @08045BD2 +@08045BC0: bl GenerateRandomNumber adds r1, r4, 0 ands r1, r0 cmp r1, 0 - beq _08045BD0 + beq @08045BD0 movs r0, 0 - b _08045BD2 -_08045BD0: + b @08045BD2 +@08045BD0: movs r0, 0x2 -_08045BD2: +@08045BD2: bl battle_get_side_with_given_state lsls r0, 24 lsrs r5, r0, 24 @@ -119475,13 +119475,13 @@ _08045BD2: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _08045C20 + beq @08045C20 movs r0, 0x2 eors r5, r0 - b _08045C20 + b @08045C20 .align 2, 0 .pool -_08045BFC: +@08045BFC: ldr r0, =0x0202420b ldrb r0, [r0] bl battle_get_per_side_status @@ -119493,13 +119493,13 @@ _08045BFC: bl battle_get_side_with_given_state lsls r0, 24 lsrs r5, r0, 24 - b _08045C20 + b @08045C20 .align 2, 0 .pool -_08045C1C: +@08045C1C: ldr r0, =0x0202420b ldrb r5, [r0] -_08045C20: +@08045C20: ldr r0, =0x0202420b ldrb r0, [r0] ldr r1, =0x0202449c @@ -119518,7 +119518,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 @@ -119527,7 +119527,7 @@ sub_8045C44: @ 8045C44 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08045C8A + beq @08045C8A ldr r0, =0x0202406e lsls r4, 1 adds r5, r4, r0 @@ -119542,7 +119542,7 @@ sub_8045C44: @ 8045C44 movs r1, 0xCD lsls r1, 1 cmp r0, r1 - beq _08045C98 + beq @08045C98 ldrh r0, [r5] muls r0, r7 adds r0, r6 @@ -119550,13 +119550,13 @@ sub_8045C44: @ 8045C44 movs r2, 0 bl pokemon_getattr cmp r0, 0x97 - beq _08045C98 -_08045C8A: + beq @08045C98 +@08045C8A: movs r0, 0x1 - b _08045CAE + b @08045CAE .align 2, 0 .pool -_08045C98: +@08045C98: ldr r0, =0x0202406e adds r0, r4, r0 ldrh r1, [r0] @@ -119567,7 +119567,7 @@ _08045C98: movs r1, 0x50 movs r2, 0 bl pokemon_getattr -_08045CAE: +@08045CAE: pop {r4-r7} pop {r1} bx r1 @@ -119576,7 +119576,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 @@ -119588,42 +119588,42 @@ sub_8045CBC: @ 8045CBC ldr r1, =0x02000002 ands r0, r1 cmp r0, 0 - bne _08045DAC + bne @08045DAC ldr r4, =0x0202420b ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08045DAC + beq @08045DAC ldrb r0, [r4] bl sub_8045C44 cmp r0, 0 - beq _08045D76 + beq @08045D76 ldr r0, [r5] movs r1, 0x80 lsls r1, 15 ands r0, r1 cmp r0, 0 - beq _08045D08 + beq @08045D08 ldrb r0, [r4] bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - beq _08045DAC -_08045D08: + beq @08045DAC +@08045D08: ldr r0, =0x02022fec ldr r1, [r0] ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 - bne _08045DAC + bne @08045DAC movs r0, 0x80 lsls r0, 17 ands r1, r0 cmp r1, 0 - bne _08045DAC + bne @08045DAC ldr r2, =0x02024084 ldr r0, =0x0202420b ldrb r1, [r0] @@ -119638,34 +119638,34 @@ _08045D08: bl sub_806E8D4 lsls r0, 24 cmp r0, 0 - beq _08045DAC + beq @08045DAC ldr r0, =0x0000086e bl flag_check lsls r0, 24 cmp r0, 0 - bne _08045DAC + bne @08045DAC movs r6, 0xA ldr r0, =0x00000868 bl flag_check lsls r0, 24 cmp r0, 0 - beq _08045D5A + beq @08045D5A movs r6, 0x1E -_08045D5A: +@08045D5A: ldr r0, =0x0000086a bl flag_check lsls r0, 24 cmp r0, 0 - beq _08045D68 + beq @08045D68 movs r6, 0x32 -_08045D68: +@08045D68: ldr r0, =0x0000086c bl flag_check lsls r0, 24 cmp r0, 0 - beq _08045D76 + beq @08045D76 movs r6, 0x46 -_08045D76: +@08045D76: ldr r5, =0x02024084 ldr r0, =0x0202420b mov r8, r0 @@ -119676,7 +119676,7 @@ _08045D76: adds r0, 0x2A ldrb r0, [r0] cmp r0, r6 - bls _08045DAC + bls @08045DAC bl GenerateRandomNumber movs r1, 0xFF ands r1, r0 @@ -119691,17 +119691,17 @@ _08045D76: muls r0, r1 asrs r4, r0, 8 cmp r4, r6 - bge _08045DD4 -_08045DAC: + bge @08045DD4 +@08045DAC: movs r0, 0 - b _08045FD0 + b @08045FD0 .align 2, 0 .pool -_08045DD4: +@08045DD4: ldr r3, =0x020241ea ldrh r0, [r3] cmp r0, 0x63 - bne _08045DEA + bne @08045DEA adds r0, r5, 0 adds r0, 0x50 adds r0, r2, r0 @@ -119709,7 +119709,7 @@ _08045DD4: ldr r2, =0xff7fffff ands r1, r2 str r1, [r0] -_08045DEA: +@08045DEA: mov r1, r8 ldrb r0, [r1] muls r0, r7 @@ -119720,19 +119720,19 @@ _08045DEA: movs r1, 0x7 ands r0, r1 cmp r0, 0 - beq _08045E20 + beq @08045E20 ldrh r0, [r3] cmp r0, 0xAD - beq _08045E0A + beq @08045E0A cmp r0, 0xD6 - bne _08045E20 -_08045E0A: + bne @08045E20 +@08045E0A: ldr r1, =0x02024214 ldr r0, =0x082db695 - b _08045F7A + b @08045F7A .align 2, 0 .pool -_08045E20: +@08045E20: bl GenerateRandomNumber movs r5, 0xFF adds r1, r5, 0 @@ -119752,7 +119752,7 @@ _08045E20: muls r0, r1 asrs r4, r0, 8 cmp r4, r6 - bge _08045EE8 + bge @08045EE8 ldr r6, =0x0832a328 ldr r5, =0x020241e8 ldrb r0, [r5] @@ -119765,13 +119765,13 @@ _08045E20: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bne _08045E68 - b _08045F6A -_08045E68: + bne @08045E68 + b @08045F6A +@08045E68: ldr r1, =0x020241e9 mov r8, r1 movs r7, 0x3 -_08045E6E: +@08045E6E: bl GenerateRandomNumber ands r0, r7 mov r2, r8 @@ -119783,7 +119783,7 @@ _08045E6E: ldr r0, [r0] ands r0, r4 cmp r0, 0 - bne _08045E6E + bne @08045E6E ldr r4, =0x020241ee ldr r3, =0x02024084 ldr r0, =0x020241e8 @@ -119810,10 +119810,10 @@ _08045E6E: ldr r0, [r2] movs r1, 0x80 lsls r1, 14 - b _08045FCA + b @08045FCA .align 2, 0 .pool -_08045EE8: +@08045EE8: subs r0, r2, r6 lsls r0, 24 lsrs r6, r0, 24 @@ -119821,7 +119821,7 @@ _08045EE8: adds r4, r5, 0 ands r4, r0 cmp r4, r6 - bge _08045F64 + bge @08045F64 mov r1, r9 ldrb r0, [r1] mov r1, r8 @@ -119832,52 +119832,52 @@ _08045EE8: ldr r0, [r0] ands r0, r5 cmp r0, 0 - bne _08045F64 + bne @08045F64 adds r0, r1, r7 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x48 - beq _08045F64 + beq @08045F64 cmp r0, 0xF - beq _08045F64 + beq @08045F64 movs r2, 0 ldr r0, =0x0202406c ldrb r3, [r0] mov r8, r0 cmp r2, r3 - bge _08045F4A + bge @08045F4A ldr r0, [r7, 0x50] movs r1, 0x70 ands r0, r1 cmp r0, 0 - bne _08045F4A + bne @08045F4A adds r1, r7, 0 adds r1, 0x50 movs r5, 0x70 -_08045F3A: +@08045F3A: adds r1, 0x58 adds r2, 0x1 cmp r2, r3 - bge _08045F4A + bge @08045F4A ldr r0, [r1] ands r0, r5 cmp r0, 0 - beq _08045F3A -_08045F4A: + beq @08045F3A +@08045F4A: mov r0, r8 ldrb r0, [r0] cmp r2, r0 - bne _08045F64 + bne @08045F64 ldr r1, =0x02024214 ldr r0, =0x082db6d9 - b _08045F7A + b @08045F7A .align 2, 0 .pool -_08045F64: +@08045F64: subs r4, r6 cmp r4, r6 - blt _08045F8C -_08045F6A: + blt @08045F8C +@08045F6A: bl GenerateRandomNumber ldr r2, =0x02024332 movs r1, 0x3 @@ -119885,13 +119885,13 @@ _08045F6A: strb r1, [r2, 0x5] ldr r1, =0x02024214 ldr r0, =0x082db6ad -_08045F7A: +@08045F7A: str r0, [r1] movs r0, 0x1 - b _08045FD0 + b @08045FD0 .align 2, 0 .pool -_08045F8C: +@08045F8C: ldr r4, =0x0202420b ldrb r1, [r4] movs r0, 0x58 @@ -119922,11 +119922,11 @@ _08045F8C: ldr r0, [r2] movs r1, 0x80 lsls r1, 12 -_08045FCA: +@08045FCA: orrs r0, r1 str r0, [r2] movs r0, 0x2 -_08045FD0: +@08045FD0: add sp, 0x10 pop {r3,r4} mov r8, r3 @@ -119939,7 +119939,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 @@ -119948,14 +119948,14 @@ atk00_attackcanceler: @ 8045FFC ldr r0, =0x0202433a ldrb r0, [r0] cmp r0, 0 - beq _08046020 + beq @08046020 ldr r1, =0x02024083 movs r0, 0xC strb r0, [r1] - b _08046398 + b @08046398 .align 2, 0 .pool -_08046020: +@08046020: ldr r2, =0x02024084 ldr r0, =0x0202420b ldrb r1, [r0] @@ -119964,31 +119964,31 @@ _08046020: adds r0, r2 ldrh r0, [r0, 0x28] cmp r0, 0 - bne _08046064 + bne @08046064 ldr r2, =0x02024280 ldr r1, [r2] movs r0, 0x80 lsls r0, 2 ands r0, r1 cmp r0, 0 - bne _08046064 + bne @08046064 movs r0, 0x80 lsls r0, 12 orrs r1, r0 str r1, [r2] ldr r1, =0x02024214 ldr r0, =0x082d8a4e - b _08046396 + b @08046396 .align 2, 0 .pool -_08046064: +@08046064: bl sub_8041A6C lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - beq _08046072 - b _08046398 -_08046072: + beq @08046072 + b @08046398 +@08046072: ldr r0, =0x0202420c ldrb r1, [r0] str r2, [sp] @@ -119998,9 +119998,9 @@ _08046072: bl ability_something lsls r0, 24 cmp r0, 0 - beq _0804608A - b _08046398 -_0804608A: + beq @0804608A + b @08046398 +@0804608A: ldr r4, =0x02024084 ldr r0, =0x020241e8 ldrb r1, [r0] @@ -120015,16 +120015,16 @@ _0804608A: ldrb r0, [r1] ldr r5, =0x02024280 cmp r0, 0 - bne _08046108 + bne @08046108 ldr r0, =0x020241ea ldrh r0, [r0] cmp r0, 0xA5 - beq _08046108 + beq @08046108 ldr r0, [r5] ldr r1, =0x00800200 ands r0, r1 cmp r0, 0 - bne _08046108 + bne @08046108 adds r0, r4, 0 adds r0, 0x50 adds r0, r2, r0 @@ -120033,7 +120033,7 @@ _0804608A: lsls r1, 5 ands r0, r1 cmp r0, 0 - bne _08046108 + bne @08046108 ldr r1, =0x02024214 ldr r0, =0x082db07a str r0, [r1] @@ -120042,10 +120042,10 @@ _0804608A: movs r1, 0x1 orrs r0, r1 strb r0, [r2] - b _08046398 + b @08046398 .align 2, 0 .pool -_08046108: +@08046108: ldr r0, [r5] ldr r1, =0xff7fffff ands r0, r1 @@ -120054,7 +120054,7 @@ _08046108: lsls r6, 18 ands r0, r6 cmp r0, 0 - bne _08046160 + bne @08046160 ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -120066,30 +120066,30 @@ _08046108: lsls r1, 5 ands r0, r1 cmp r0, 0 - bne _08046160 + bne @08046160 bl sub_8045CBC lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - beq _08046160 + beq @08046160 cmp r2, 0x2 - bne _08046150 + bne @08046150 ldr r0, [r5] orrs r0, r6 str r0, [r5] - b _08046398 + b @08046398 .align 2, 0 .pool -_08046150: +@08046150: ldr r0, =0x0202427c ldrb r1, [r0] movs r2, 0x1 orrs r1, r2 strb r1, [r0] - b _08046398 + b @08046398 .align 2, 0 .pool -_08046160: +@08046160: ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 @@ -120106,7 +120106,7 @@ _08046160: mov r8, r1 mov r9, r2 cmp r0, 0 - bge _080461E8 + bge @080461E8 ldr r2, =0x0831c898 ldr r0, =0x020241ea ldrh r1, [r0] @@ -120118,7 +120118,7 @@ _08046160: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080461E8 + beq @080461E8 ldr r0, =0x0202420b ldrb r0, [r0] ldr r2, =0x00000115 @@ -120136,21 +120136,21 @@ _08046160: bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =0x082db194 - b _08046396 + b @08046396 .align 2, 0 .pool -_080461E8: +@080461E8: movs r2, 0 ldr r0, =0x0202406c ldrb r0, [r0] cmp r2, r0 - bge _0804622A + bge @0804622A ldr r6, =0x0202433c ldr r1, =0x0831c898 mov r12, r1 adds r5, r0, 0 ldr r7, =0x0202407e -_080461FC: +@080461FC: adds r4, r2, r7 ldrb r3, [r4] lsls r0, r3, 4 @@ -120158,7 +120158,7 @@ _080461FC: ldrb r0, [r0] lsls r0, 26 cmp r0, 0 - bge _08046224 + bge @08046224 ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 @@ -120169,13 +120169,13 @@ _080461FC: movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _08046224 - b _08046350 -_08046224: + beq @08046224 + b @08046350 +@08046224: adds r2, 0x1 cmp r2, r5 - blt _080461FC -_0804622A: + blt @080461FC +@0804622A: ldr r0, =0x0202437c mov r1, r8 ldrb r2, [r1] @@ -120186,7 +120186,7 @@ _0804622A: ldrb r3, [r1] lsls r0, r3, 30 cmp r0, 0 - bge _08046288 + bge @08046288 movs r0, 0x3 negs r0, r0 ands r0, r3 @@ -120202,18 +120202,18 @@ _0804622A: ldrb r0, [r1] ldrb r1, [r4] bl b_history__record_ability_usage_of_player - b _08046398 + b @08046398 .align 2, 0 .pool -_08046288: +@08046288: lsls r0, r2, 4 add r0, r9 ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - bne _08046296 - b _08046390 -_08046296: + bne @08046296 + b @08046390 +@08046296: ldr r1, =0x0831c898 ldr r2, =0x020241ea ldrh r3, [r2] @@ -120226,9 +120226,9 @@ _08046296: ands r0, r1 adds r4, r2, 0 cmp r0, 0 - beq _08046390 + beq @08046390 cmp r3, 0xAE - bne _080462D4 + bne @080462D4 ldr r2, =0x02024084 ldr r0, =0x0202420b ldrb r1, [r0] @@ -120239,18 +120239,18 @@ _08046296: adds r0, 0x21 ldrb r0, [r0] cmp r0, 0x7 - beq _080462D4 + beq @080462D4 adds r0, r1, 0 adds r0, 0x22 ldrb r0, [r0] cmp r0, 0x7 - bne _08046390 -_080462D4: + bne @08046390 +@080462D4: ldrh r0, [r4] bl sub_8052F48 lsls r0, 24 cmp r0, 0 - beq _080462FA + beq @080462FA ldr r1, =0x02024084 ldr r0, =0x0202420b ldrb r2, [r0] @@ -120263,8 +120263,8 @@ _080462D4: lsls r1, 5 ands r0, r1 cmp r0, 0 - beq _08046390 -_080462FA: + beq @08046390 +@080462FA: ldr r0, =0x0202420b ldrb r0, [r0] bl b_cancel_multi_turn_move_maybe @@ -120288,10 +120288,10 @@ _080462FA: ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x6] - b _08046390 + b @08046390 .align 2, 0 .pool -_08046350: +@08046350: ldr r0, =0x0202420b ldrb r0, [r0] ldr r2, =0x00000121 @@ -120311,16 +120311,16 @@ _08046350: bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =0x082db1ac - b _08046396 + b @08046396 .align 2, 0 .pool -_08046390: +@08046390: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 -_08046396: +@08046396: str r0, [r1] -_08046398: +@08046398: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -120333,7 +120333,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 @@ -120348,7 +120348,7 @@ mcmd_jump_if_move_not_executed: @ 80463AC movs r0, 0x29 ands r0, r1 cmp r0, 0 - beq _0804640C + beq @0804640C ldr r1, =0x02024250 ldr r3, =0x0202420c ldrb r0, [r3] @@ -120371,10 +120371,10 @@ mcmd_jump_if_move_not_executed: @ 80463AC ldrb r0, [r5, 0x4] lsls r0, 24 orrs r4, r0 - b _08046426 + b @08046426 .align 2, 0 .pool -_0804640C: +@0804640C: bl b_feature_update_destiny_bond ldr r0, =0x0202420c ldrb r1, [r0] @@ -120385,11 +120385,11 @@ _0804640C: bl ability_something lsls r0, 24 cmp r0, 0 - bne _0804642A -_08046426: + bne @0804642A +@08046426: ldr r0, =0x02024214 str r4, [r0] -_0804642A: +@0804642A: add sp, 0x4 pop {r4-r6} pop {r0} @@ -120399,7 +120399,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 @@ -120409,7 +120409,7 @@ atk40_801DBA0: @ 804643C ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - beq _0804649C + beq @0804649C ldr r2, =0x0831c898 ldr r0, =0x020241ea ldrh r1, [r0] @@ -120421,7 +120421,7 @@ atk40_801DBA0: @ 804643C movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0804649C + beq @0804649C ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 @@ -120433,15 +120433,15 @@ atk40_801DBA0: @ 804643C ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x6] - b _080464A4 + b @080464A4 .align 2, 0 .pool -_0804649C: +@0804649C: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_080464A4: +@080464A4: pop {r0} bx r0 .align 2, 0 @@ -120449,7 +120449,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 @@ -120462,7 +120462,7 @@ sub_80464AC: @ 80464AC ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - beq _080464F8 + beq @080464F8 ldr r2, =0x0831c898 ldr r0, =0x020241ea ldrh r1, [r0] @@ -120474,7 +120474,7 @@ sub_80464AC: @ 80464AC movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080464F8 + beq @080464F8 ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 @@ -120487,7 +120487,7 @@ sub_80464AC: @ 80464AC movs r0, 0x1 strb r0, [r1, 0x6] movs r4, 0x1 -_080464F8: +@080464F8: adds r0, r4, 0 pop {r4} pop {r1} @@ -120497,7 +120497,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 @@ -120512,7 +120512,7 @@ sub_8046518: @ 8046518 ands r1, r0 adds r6, r2, 0 cmp r1, 0 - beq _0804654A + beq @0804654A ldr r1, =0x020242bc lsls r0, r4, 3 subs r0, r4 @@ -120522,8 +120522,8 @@ sub_8046518: @ 8046518 ldrb r0, [r0, 0x15] ldrb r1, [r1] cmp r0, r1 - beq _08046634 -_0804654A: + beq @08046634 +@0804654A: ldr r0, =0x02024280 ldr r1, [r0] movs r2, 0x80 @@ -120531,7 +120531,7 @@ _0804654A: ands r1, r2 adds r2, r0, 0 cmp r1, 0 - bne _08046590 + bne @08046590 ldrb r0, [r3] lsls r0, 2 adds r0, r6 @@ -120539,17 +120539,17 @@ _0804654A: movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _08046590 -_0804656A: + beq @08046590 +@0804656A: ldr r0, =0x0202427c ldrb r1, [r0] movs r2, 0x1 orrs r1, r2 strb r1, [r0] - b _08046634 + b @08046634 .align 2, 0 .pool -_08046590: +@08046590: ldr r0, [r2] ldr r1, =0xfffeffff ands r0, r1 @@ -120558,7 +120558,7 @@ _08046590: lsls r1, 10 ands r0, r1 cmp r0, 0 - bne _080465B2 + bne @080465B2 ldrb r0, [r3] lsls r0, 2 adds r0, r6 @@ -120566,8 +120566,8 @@ _08046590: movs r1, 0x80 ands r0, r1 cmp r0, 0 - bne _0804656A -_080465B2: + bne @0804656A +@080465B2: ldr r0, [r2] ldr r1, =0xfffdffff ands r0, r1 @@ -120576,15 +120576,15 @@ _080465B2: lsls r1, 11 ands r0, r1 cmp r0, 0 - bne _080465D2 + bne @080465D2 ldrb r0, [r3] lsls r0, 2 adds r0, r6 ldr r0, [r0] ands r0, r1 cmp r0, 0 - bne _0804656A -_080465D2: + bne @0804656A +@080465D2: ldr r0, [r2] ldr r1, =0xfffbffff ands r0, r1 @@ -120600,7 +120600,7 @@ _080465D2: lsrs r0, 24 lsls r4, r5, 1 cmp r0, 0 - bne _08046622 + bne @08046622 str r0, [sp] movs r0, 0x13 movs r1, 0 @@ -120609,41 +120609,41 @@ _080465D2: bl ability_something lsls r0, 24 cmp r0, 0 - bne _08046622 + bne @08046622 ldr r0, =0x020243cc ldrh r1, [r0] movs r0, 0x7 ands r0, r1 cmp r0, 0 - beq _08046622 + beq @08046622 ldr r0, =0x0831c898 adds r1, r4, r5 lsls r1, 2 adds r1, r0 ldrb r0, [r1] cmp r0, 0x98 - beq _08046634 -_08046622: + beq @08046634 +@08046622: ldr r1, =0x0831c898 adds r0, r4, r5 lsls r0, 2 adds r0, r1 ldrb r0, [r0] cmp r0, 0x11 - beq _08046634 + beq @08046634 cmp r0, 0x4E - bne _08046654 -_08046634: + bne @08046654 +@08046634: movs r0, 0x7 adds r1, r5, 0 bl mcmd_jump_if_move_not_executed movs r0, 0x1 - b _08046656 + b @08046656 .align 2, 0 .pool -_08046654: +@08046654: movs r0, 0 -_08046656: +@08046656: add sp, 0x4 pop {r4-r6} pop {r1} @@ -120651,7 +120651,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 @@ -120669,7 +120669,7 @@ atk01_accuracycheck: @ 8046660 lsrs r1, 16 adds r7, r0, 0 cmp r1, 0x1 - bhi _0804671C + bhi @0804671C ldr r2, =0x020242ac ldr r3, =0x0202420c ldrb r4, [r3] @@ -120679,10 +120679,10 @@ atk01_accuracycheck: @ 8046660 movs r0, 0x18 ands r1, r0 cmp r1, 0 - beq _080466D0 + beq @080466D0 ldr r0, =0x0000ffff cmp r6, r0 - bne _080466D0 + bne @080466D0 ldr r1, =0x020242bc lsls r0, r4, 3 subs r0, r4 @@ -120692,13 +120692,13 @@ atk01_accuracycheck: @ 8046660 ldrb r0, [r0, 0x15] ldrb r1, [r1] cmp r0, r1 - bne _080466D0 + bne @080466D0 adds r0, r5, 0x7 str r0, [r7] - b _080469D2 + b @080469D2 .align 2, 0 .pool -_080466D0: +@080466D0: ldrb r0, [r3] lsls r0, 2 adds r0, r2 @@ -120706,7 +120706,7 @@ _080466D0: ldr r1, =0x000400c0 ands r0, r1 cmp r0, 0 - beq _08046700 + beq @08046700 ldr r2, [r7] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -120719,44 +120719,44 @@ _080466D0: lsls r0, 24 orrs r1, r0 str r1, [r7] - b _080469D2 + b @080469D2 .align 2, 0 .pool -_08046700: +@08046700: movs r0, 0 bl sub_80464AC lsls r0, 24 cmp r0, 0 - beq _0804670E - b _080469D2 -_0804670E: + beq @0804670E + b @080469D2 +@0804670E: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x7 str r0, [r1] - b _080469D2 + b @080469D2 .align 2, 0 .pool -_0804671C: +@0804671C: cmp r6, 0 - bne _08046724 + bne @08046724 ldr r0, =0x020241ea ldrh r6, [r0] -_08046724: +@08046724: ldr r0, =0x0202449c ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0 - beq _08046744 + beq @08046744 movs r1, 0x3F mov r10, r1 mov r2, r10 ands r2, r0 mov r10, r2 - b _08046752 + b @08046752 .align 2, 0 .pool -_08046744: +@08046744: ldr r1, =0x0831c898 lsls r0, r6, 1 adds r0, r6 @@ -120764,21 +120764,21 @@ _08046744: adds r0, r1 ldrb r0, [r0, 0x2] mov r10, r0 -_08046752: +@08046752: adds r0, r6, 0 bl sub_80464AC lsls r0, 24 cmp r0, 0 - beq _08046760 - b _080469D2 -_08046760: + beq @08046760 + b @080469D2 +@08046760: adds r0, r6, 0 bl sub_8046518 lsls r0, 24 cmp r0, 0 - beq _0804676E - b _080469D2 -_0804676E: + beq @0804676E + b @080469D2 +@0804676E: ldr r3, =0x02024084 ldr r0, =0x0202420c ldrb r0, [r0] @@ -120793,16 +120793,16 @@ _0804676E: lsls r1, 22 ands r0, r1 cmp r0, 0 - beq _080467A8 + beq @080467A8 ldr r0, =0x0202420b ldrb r0, [r0] muls r0, r2 adds r0, r3 ldrb r5, [r0, 0x1E] - b _080467BE + b @080467BE .align 2, 0 .pool -_080467A8: +@080467A8: ldr r0, =0x0202420b ldrb r0, [r0] muls r0, r2 @@ -120814,18 +120814,18 @@ _080467A8: subs r0, r1 lsls r0, 24 lsrs r5, r0, 24 -_080467BE: +@080467BE: lsls r0, r5, 24 cmp r0, 0 - bge _080467C6 + bge @080467C6 movs r5, 0 -_080467C6: +@080467C6: lsls r0, r5, 24 asrs r0, 24 cmp r0, 0xC - ble _080467D0 + ble @080467D0 movs r5, 0xC -_080467D0: +@080467D0: ldr r1, =0x0831c898 lsls r4, r6, 1 adds r0, r4, r6 @@ -120844,7 +120844,7 @@ _080467D0: lsrs r0, 24 str r4, [sp, 0x4] cmp r0, 0 - bne _08046822 + bne @08046822 str r0, [sp] movs r0, 0x13 movs r1, 0 @@ -120853,19 +120853,19 @@ _080467D0: bl ability_something lsls r0, 24 cmp r0, 0 - bne _08046822 + bne @08046822 ldr r0, =0x020243cc ldrh r1, [r0] movs r0, 0x60 ands r0, r1 cmp r0, 0 - beq _08046822 + beq @08046822 ldrb r0, [r7] cmp r0, 0x98 - bne _08046822 + bne @08046822 movs r0, 0x32 mov r8, r0 -_08046822: +@08046822: ldr r1, =0x0831c0f4 lsls r0, r5, 24 asrs r0, 22 @@ -120887,7 +120887,7 @@ _08046822: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0xE - bne _08046860 + bne @08046860 lsls r0, r4, 6 adds r0, r4 lsls r0, 1 @@ -120895,7 +120895,7 @@ _08046822: bl __divsi3 lsls r0, 16 lsrs r4, r0, 16 -_08046860: +@08046860: movs r0, 0 str r0, [sp] movs r0, 0x13 @@ -120906,7 +120906,7 @@ _08046860: lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _080468B8 + bne @080468B8 str r0, [sp] movs r0, 0x13 movs r1, 0 @@ -120915,7 +120915,7 @@ _08046860: bl ability_something lsls r0, 24 cmp r0, 0 - bne _080468B8 + bne @080468B8 ldr r0, =0x0202420c ldrb r0, [r0] muls r0, r5 @@ -120923,13 +120923,13 @@ _08046860: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x8 - bne _080468B8 + bne @080468B8 ldr r0, =0x020243cc ldrh r1, [r0] movs r0, 0x18 ands r0, r1 cmp r0, 0 - beq _080468B8 + beq @080468B8 lsls r0, r4, 2 adds r0, r4 lsls r0, 4 @@ -120937,7 +120937,7 @@ _08046860: bl __divsi3 lsls r0, 16 lsrs r4, r0, 16 -_080468B8: +@080468B8: ldr r2, =0x02024084 ldr r0, =0x0202420b ldrb r1, [r0] @@ -120948,10 +120948,10 @@ _080468B8: ldrb r0, [r0] mov r9, r2 cmp r0, 0x37 - bne _080468E4 + bne @080468E4 mov r1, r10 cmp r1, 0x8 - bhi _080468E4 + bhi @080468E4 lsls r0, r4, 2 adds r0, r4 lsls r0, 4 @@ -120959,7 +120959,7 @@ _080468B8: bl __divsi3 lsls r0, 16 lsrs r4, r0, 16 -_080468E4: +@080468E4: ldr r2, =0x0202420c mov r8, r2 ldrb r2, [r2] @@ -120970,7 +120970,7 @@ _080468E4: adds r1, r0, r3 ldrh r0, [r1, 0x2E] cmp r0, 0xAF - bne _08046928 + bne @08046928 ldr r1, =0x02024404 lsls r0, r2, 3 subs r0, r2 @@ -120978,10 +120978,10 @@ _080468E4: adds r0, r1 ldrb r5, [r0, 0x7] ldrb r2, [r0, 0x1A] - b _08046944 + b @08046944 .align 2, 0 .pool -_08046928: +@08046928: ldrh r0, [r1, 0x2E] bl itemid_get_x12 lsls r0, 24 @@ -120994,13 +120994,13 @@ _08046928: bl itemid_get_quality lsls r0, 24 lsrs r2, r0, 24 -_08046944: +@08046944: ldr r0, =0x0202420f ldr r1, =0x0202420c ldrb r1, [r1] strb r1, [r0] cmp r5, 0x16 - bne _08046960 + bne @08046960 movs r0, 0x64 subs r0, r2 muls r0, r4 @@ -121008,7 +121008,7 @@ _08046944: bl __divsi3 lsls r0, 16 lsrs r4, r0, 16 -_08046960: +@08046960: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -121018,7 +121018,7 @@ _08046960: lsrs r0, 16 adds r0, 0x1 cmp r0, r4 - ble _080469CA + ble @080469CA ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 @@ -121029,7 +121029,7 @@ _08046960: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _080469C0 + beq @080469C0 ldr r1, =0x0831c898 ldr r2, [sp, 0x4] adds r0, r2, r6 @@ -121037,26 +121037,26 @@ _08046960: adds r0, r1 ldrb r0, [r0, 0x6] cmp r0, 0x8 - beq _080469A2 + beq @080469A2 cmp r0, 0x20 - bne _080469C0 -_080469A2: + bne @080469C0 +@080469A2: ldr r1, =0x02024332 movs r0, 0x2 - b _080469C4 + b @080469C4 .align 2, 0 .pool -_080469C0: +@080469C0: ldr r1, =0x02024332 movs r0, 0 -_080469C4: +@080469C4: strb r0, [r1, 0x6] bl b_wonderguard_and_levitate -_080469CA: +@080469CA: movs r0, 0x7 adds r1, r6, 0 bl mcmd_jump_if_move_not_executed -_080469D2: +@080469D2: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -121070,19 +121070,19 @@ _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] cmp r5, 0 - bne _08046A20 + bne @08046A20 ldr r4, =0x02024280 ldr r0, [r4] movs r1, 0xC0 lsls r1, 3 ands r0, r1 cmp r0, 0 - bne _08046A14 + bne @08046A14 ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0x4 @@ -121092,14 +121092,14 @@ atk02_attackstring: @ 80469E8 lsls r1, 3 orrs r0, r1 str r0, [r4] -_08046A14: +@08046A14: ldr r0, =0x02024214 ldr r1, [r0] adds r1, 0x1 str r1, [r0] ldr r0, =0x02024332 strb r5, [r0, 0x7] -_08046A20: +@08046A20: pop {r4,r5} pop {r0} bx r0 @@ -121108,7 +121108,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 @@ -121119,9 +121119,9 @@ atk03_ppreduce: @ 8046A3C ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - beq _08046A54 - b _08046BEE -_08046A54: + beq @08046A54 + b @08046BEE +@08046A54: ldr r1, =0x0202437c ldr r2, =0x0202420b ldrb r3, [r2] @@ -121134,7 +121134,7 @@ _08046A54: lsrs r4, r0, 31 mov r9, r2 cmp r4, 0 - bne _08046AF6 + bne @08046AF6 ldr r2, =0x0831c898 ldr r0, =0x020241ea ldrh r1, [r0] @@ -121144,19 +121144,19 @@ _08046A54: adds r0, r2 ldrb r0, [r0, 0x6] cmp r0, 0x20 - beq _08046AA6 + beq @08046AA6 cmp r0, 0x20 - bgt _08046AA0 + bgt @08046AA0 cmp r0, 0x8 - beq _08046ABC - b _08046AD6 + beq @08046ABC + b @08046AD6 .align 2, 0 .pool -_08046AA0: +@08046AA0: cmp r0, 0x40 - beq _08046ABC - b _08046AD6 -_08046AA6: + beq @08046ABC + b @08046AD6 +@08046AA6: str r4, [sp] movs r0, 0x12 adds r1, r3, 0 @@ -121166,8 +121166,8 @@ _08046AA6: lsls r0, 24 lsrs r0, 24 adds r6, r0, 0x1 - b _08046AF6 -_08046ABC: + b @08046AF6 +@08046ABC: mov r0, r9 ldrb r1, [r0] movs r0, 0 @@ -121179,14 +121179,14 @@ _08046ABC: lsls r0, 24 lsrs r0, 24 adds r6, r0 - b _08046AF6 -_08046AD6: + b @08046AF6 +@08046AD6: ldr r1, =0x0202420c mov r2, r9 ldrb r0, [r2] ldrb r7, [r1] cmp r0, r7 - beq _08046AF6 + beq @08046AF6 ldr r2, =0x02024084 ldrb r1, [r1] movs r0, 0x58 @@ -121195,16 +121195,16 @@ _08046AD6: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x2E - bne _08046AF6 + bne @08046AF6 adds r6, 0x1 -_08046AF6: +@08046AF6: ldr r0, =0x02024280 ldr r4, [r0] movs r0, 0xA0 lsls r0, 4 ands r4, r0 cmp r4, 0 - bne _08046BDC + bne @08046BDC ldr r2, =0x02024084 ldr r3, =0x020241e8 ldr r1, =0x0202420b @@ -121224,7 +121224,7 @@ _08046AF6: mov r10, r2 adds r7, r3, 0 cmp r0, 0 - beq _08046BDC + beq @08046BDC ldr r0, =0x0202433c lsls r1, r5, 4 adds r1, r0 @@ -121243,15 +121243,15 @@ _08046AF6: adds r2, r0, r1 ldrb r0, [r2] cmp r0, r6 - ble _08046B70 + ble @08046B70 subs r0, r6 strb r0, [r2] - b _08046B72 + b @08046B72 .align 2, 0 .pool -_08046B70: +@08046B70: strb r4, [r2] -_08046B72: +@08046B72: mov r2, r9 ldrb r3, [r2] movs r4, 0x58 @@ -121265,7 +121265,7 @@ _08046B72: lsls r1, 14 ands r0, r1 cmp r0, 0 - bne _08046BDC + bne @08046BDC ldr r1, =0x020242bc lsls r0, r3, 3 subs r0, r3 @@ -121280,7 +121280,7 @@ _08046B72: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _08046BDC + bne @08046BDC ldr r0, =0x02024064 strb r3, [r0] ldrb r1, [r7] @@ -121303,7 +121303,7 @@ _08046B72: mov r7, r9 ldrb r0, [r7] bl dp01_battle_side_mark_buffer_for_execution -_08046BDC: +@08046BDC: ldr r2, =0x02024280 ldr r0, [r2] ldr r1, =0xfffff7ff @@ -121313,7 +121313,7 @@ _08046BDC: ldr r0, [r1] adds r0, 0x1 str r0, [r1] -_08046BEE: +@08046BEE: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -121327,7 +121327,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 @@ -121337,21 +121337,21 @@ atk04_critcalc: @ 8046C18 adds r0, r1 ldrh r0, [r0, 0x2E] cmp r0, 0xAF - bne _08046C48 + bne @08046C48 ldr r1, =0x02024404 lsls r0, r2, 3 subs r0, r2 lsls r0, 2 adds r0, r1 ldrb r6, [r0, 0x7] - b _08046C50 + b @08046C50 .align 2, 0 .pool -_08046C48: +@08046C48: bl itemid_get_x12 lsls r0, 24 lsrs r6, r0, 24 -_08046C50: +@08046C50: ldr r1, =0x0202420f ldr r3, =0x0202420b ldrb r0, [r3] @@ -121382,36 +121382,36 @@ _08046C50: ldrb r1, [r0] mov r12, r3 cmp r1, 0x2B - bne _08046C90 + bne @08046C90 adds r5, 0x1 -_08046C90: +@08046C90: adds r0, r5, 0 cmp r1, 0x4B - bne _08046C98 + bne @08046C98 adds r0, 0x1 -_08046C98: +@08046C98: cmp r1, 0xC8 - bne _08046C9E + bne @08046C9E adds r0, 0x1 -_08046C9E: +@08046C9E: adds r2, r0, 0 cmp r1, 0xD1 - bne _08046CA6 + bne @08046CA6 adds r2, 0x1 -_08046CA6: +@08046CA6: movs r1, 0 cmp r6, 0x3F - bne _08046CB6 + bne @08046CB6 adds r0, r7, r4 ldrh r0, [r0] cmp r0, 0x71 - bne _08046CB6 + bne @08046CB6 movs r1, 0x1 -_08046CB6: +@08046CB6: lsls r5, r1, 1 movs r3, 0 cmp r6, 0x42 - bne _08046CD0 + bne @08046CD0 mov r0, r12 ldrb r1, [r0] movs r0, 0x58 @@ -121419,28 +121419,28 @@ _08046CB6: adds r0, r4 ldrh r0, [r0] cmp r0, 0x53 - bne _08046CD0 + bne @08046CD0 movs r3, 0x1 -_08046CD0: +@08046CD0: lsls r1, r3, 1 cmp r6, 0x29 - bne _08046CF0 + bne @08046CF0 adds r0, r5, 0x1 adds r0, r2, r0 - b _08046CF2 + b @08046CF2 .align 2, 0 .pool -_08046CF0: +@08046CF0: adds r0, r2, r5 -_08046CF2: +@08046CF2: adds r0, r1 lsls r0, 16 lsrs r0, 16 adds r5, r0, 0 cmp r5, 0x4 - bls _08046D00 + bls @08046D00 movs r5, 0x4 -_08046D00: +@08046D00: ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0x58 @@ -121449,9 +121449,9 @@ _08046D00: adds r0, 0x20 ldrb r4, [r0] cmp r4, 0x4 - beq _08046D70 + beq @08046D70 cmp r4, 0x4B - beq _08046D70 + beq @08046D70 ldr r1, =0x020242ac mov r2, r12 ldrb r0, [r2] @@ -121462,14 +121462,14 @@ _08046D00: lsls r1, 8 ands r0, r1 cmp r0, 0 - bne _08046D70 + bne @08046D70 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x84 lsls r1, 2 ands r0, r1 cmp r0, 0 - bne _08046D70 + bne @08046D70 bl GenerateRandomNumber ldr r2, =0x0831c128 lsls r1, r5, 1 @@ -121480,16 +121480,16 @@ _08046D00: bl __umodsi3 lsls r0, 16 cmp r0, 0 - bne _08046D70 + bne @08046D70 ldr r1, =0x02024211 movs r0, 0x2 - b _08046D74 + b @08046D74 .align 2, 0 .pool -_08046D70: +@08046D70: ldr r1, =0x02024211 movs r0, 0x1 -_08046D74: +@08046D74: strb r0, [r1] ldr r1, =0x02024214 ldr r0, [r1] @@ -121503,7 +121503,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 @@ -121556,7 +121556,7 @@ atk05_cmd5: @ 8046D8C lsls r1, 2 ands r0, r1 cmp r0, 0 - beq _08046E10 + beq @08046E10 ldr r2, =0x0831c898 ldrh r1, [r7] lsls r0, r1, 1 @@ -121565,10 +121565,10 @@ atk05_cmd5: @ 8046D8C adds r0, r2 ldrb r0, [r0, 0x2] cmp r0, 0xD - bne _08046E10 + bne @08046E10 lsls r0, r3, 1 str r0, [r4] -_08046E10: +@08046E10: ldr r1, =0x0202433c ldr r0, =0x0202420b ldrb r0, [r0] @@ -121577,7 +121577,7 @@ _08046E10: ldrb r0, [r0] lsls r0, 28 cmp r0, 0 - bge _08046E32 + bge @08046E32 ldr r4, =0x020241f0 ldr r1, [r4] lsls r0, r1, 4 @@ -121585,7 +121585,7 @@ _08046E10: movs r1, 0xA bl __divsi3 str r0, [r4] -_08046E32: +@08046E32: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -121599,7 +121599,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} @@ -121656,7 +121656,7 @@ sub_8046E7C: @ 8046E7C lsls r1, 2 ands r0, r1 cmp r0, 0 - beq _08046F0A + beq @08046F0A ldr r2, =0x0831c898 mov r0, r8 ldrh r1, [r0] @@ -121666,17 +121666,17 @@ sub_8046E7C: @ 8046E7C adds r0, r2 ldrb r0, [r0, 0x2] cmp r0, 0xD - bne _08046F0A + bne @08046F0A lsls r0, r3, 1 str r0, [r4] -_08046F0A: +@08046F0A: ldr r0, =0x0202433c lsls r1, r7, 4 adds r1, r0 ldrb r0, [r1] lsls r0, 28 cmp r0, 0 - bge _08046F28 + bge @08046F28 ldr r4, =0x020241f0 ldr r1, [r4] lsls r0, r1, 4 @@ -121684,7 +121684,7 @@ _08046F0A: movs r1, 0xA bl __divsi3 str r0, [r4] -_08046F28: +@08046F28: add sp, 0x10 pop {r3} mov r8, r3 @@ -121696,7 +121696,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 @@ -121707,26 +121707,26 @@ battle_attack_damage_modulate_by_effectivity: @ 8046F60 bl __divsi3 str r0, [r5] cmp r0, 0 - bne _08046F80 + bne @08046F80 cmp r4, 0 - beq _08046F80 + beq @08046F80 movs r0, 0x1 str r0, [r5] -_08046F80: +@08046F80: cmp r4, 0x5 - beq _08046FB0 + beq @08046FB0 cmp r4, 0x5 - bgt _08046F94 + bgt @08046F94 cmp r4, 0 - beq _08046F9A - b _08047032 + beq @08046F9A + b @08047032 .align 2, 0 .pool -_08046F94: +@08046F94: cmp r4, 0x14 - beq _08046FF0 - b _08047032 -_08046F9A: + beq @08046FF0 + b @08047032 +@08046F9A: ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x8 @@ -121735,10 +121735,10 @@ _08046F9A: ands r0, r1 movs r1, 0xFD ands r0, r1 - b _08047030 + b @08047030 .align 2, 0 .pool -_08046FB0: +@08046FB0: ldr r2, =0x0831c898 ldr r0, =0x020241ea ldrh r1, [r0] @@ -121748,26 +121748,26 @@ _08046FB0: adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0 - beq _08047032 + beq @08047032 ldr r2, =0x0202427c ldrb r1, [r2] movs r0, 0x29 ands r0, r1 cmp r0, 0 - bne _08047032 + bne @08047032 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08046FEC + beq @08046FEC movs r0, 0xFD ands r0, r1 - b _08047030 + b @08047030 .align 2, 0 .pool -_08046FEC: +@08046FEC: movs r0, 0x4 - b _0804702E -_08046FF0: + b @0804702E +@08046FF0: ldr r2, =0x0831c898 ldr r0, =0x020241ea ldrh r1, [r0] @@ -121777,36 +121777,36 @@ _08046FF0: adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0 - beq _08047032 + beq @08047032 ldr r2, =0x0202427c ldrb r1, [r2] movs r0, 0x29 ands r0, r1 cmp r0, 0 - bne _08047032 + bne @08047032 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0804702C + beq @0804702C movs r0, 0xFB ands r0, r1 - b _08047030 + b @08047030 .align 2, 0 .pool -_0804702C: +@0804702C: movs r0, 0x2 -_0804702E: +@0804702E: orrs r0, r1 -_08047030: +@08047030: strb r0, [r2] -_08047032: +@08047032: pop {r4,r5} pop {r0} bx r0 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} @@ -121815,22 +121815,22 @@ sub_8047038: @ 8047038 ldr r1, =0x020241ea ldrh r0, [r1] cmp r0, 0xA5 - bne _0804704C - b _08047260 -_0804704C: + bne @0804704C + b @08047260 +@0804704C: ldr r0, =0x0202449c ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0 - beq _08047068 + beq @08047068 movs r1, 0x3F mov r8, r1 ands r1, r0 mov r8, r1 - b _08047078 + b @08047078 .align 2, 0 .pool -_08047068: +@08047068: ldr r2, =0x0831c898 ldrh r1, [r1] lsls r0, r1, 1 @@ -121839,7 +121839,7 @@ _08047068: adds r0, r2 ldrb r0, [r0, 0x2] mov r8, r0 -_08047078: +@08047078: ldr r2, =0x02024084 ldr r0, =0x0202420b ldrb r1, [r0] @@ -121851,13 +121851,13 @@ _08047078: ldrb r0, [r0] adds r5, r2, 0 cmp r0, r8 - beq _0804709A + beq @0804709A adds r0, r1, 0 adds r0, 0x22 ldrb r0, [r0] cmp r0, r8 - bne _080470B0 -_0804709A: + bne @080470B0 +@0804709A: ldr r4, =0x020241f0 ldr r1, [r4] lsls r0, r1, 4 @@ -121868,7 +121868,7 @@ _0804709A: bl __divsi3 str r0, [r4] ldr r3, [sp, 0x4] -_080470B0: +@080470B0: ldr r2, =0x0202420c ldrb r1, [r2] movs r0, 0x58 @@ -121878,10 +121878,10 @@ _080470B0: ldrb r0, [r0] adds r4, r2, 0 cmp r0, 0x1A - bne _08047128 + bne @08047128 mov r1, r8 cmp r1, 0x4 - bne _08047128 + bne @08047128 ldr r3, =0x0202420a strb r0, [r3] ldr r2, =0x0202427c @@ -121906,26 +121906,26 @@ _080470B0: ldrb r0, [r4] ldrb r1, [r3] bl b_history__record_ability_usage_of_player - b _080471C4 + b @080471C4 .align 2, 0 .pool -_08047128: +@08047128: ldr r1, =0x0831ace8 adds r0, r3, r1 ldrb r0, [r0] adds r2, r1, 0 - b _080471A4 + b @080471A4 .align 2, 0 .pool -_08047138: +@08047138: adds r3, 0x3 - b _080471A0 -_0804713C: + b @080471A0 +@0804713C: ldr r5, =0x0831ace8 adds r0, r3, r5 ldrb r0, [r0] cmp r0, r8 - bne _08047198 + bne @08047198 adds r1, r3, 0x1 adds r1, r5 ldr r2, =0x02024084 @@ -121938,7 +121938,7 @@ _0804713C: ldrb r4, [r1] ldrb r0, [r0] cmp r4, r0 - bne _08047172 + bne @08047172 adds r0, r3, 0x2 adds r0, r5 ldrb r0, [r0] @@ -121947,7 +121947,7 @@ _0804713C: bl battle_attack_damage_modulate_by_effectivity ldr r3, [sp, 0x4] ldr r2, [sp] -_08047172: +@08047172: ldrb r0, [r7] muls r0, r6 adds r0, r2 @@ -121955,30 +121955,30 @@ _08047172: adds r1, 0x22 ldrb r1, [r1] cmp r4, r1 - bne _08047198 + bne @08047198 adds r0, 0x21 ldrb r0, [r0] cmp r0, r4 - beq _08047198 + beq @08047198 adds r0, r3, 0x2 adds r0, r5 ldrb r0, [r0] str r3, [sp, 0x4] bl battle_attack_damage_modulate_by_effectivity ldr r3, [sp, 0x4] -_08047198: +@08047198: adds r3, 0x3 ldr r5, =0x02024084 ldr r4, =0x0202420c ldr r2, =0x0831ace8 -_080471A0: +@080471A0: adds r0, r3, r2 ldrb r0, [r0] -_080471A4: +@080471A4: cmp r0, 0xFF - beq _080471C4 + beq @080471C4 cmp r0, 0xFE - bne _0804713C + bne @0804713C ldrb r1, [r4] movs r0, 0x58 muls r0, r1 @@ -121990,8 +121990,8 @@ _080471A4: lsls r1, 22 ands r0, r1 cmp r0, 0 - beq _08047138 -_080471C4: + beq @08047138 +@080471C4: ldr r2, =0x02024084 ldr r5, =0x0202420c ldrb r1, [r5] @@ -122001,7 +122001,7 @@ _080471C4: adds r0, 0x20 ldrb r6, [r0] cmp r6, 0x19 - bne _08047242 + bne @08047242 ldr r0, =0x0202420b ldrb r0, [r0] ldr r7, =0x020241ea @@ -122010,18 +122010,18 @@ _080471C4: lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _08047242 + bne @08047242 ldr r1, =0x0202427c mov r8, r1 ldrb r4, [r1] ands r0, r4 cmp r0, 0 - beq _08047200 + beq @08047200 movs r0, 0x6 ands r0, r4 cmp r0, 0x6 - bne _08047242 -_08047200: + bne @08047242 +@08047200: ldr r2, =0x0831c898 ldrh r1, [r7] lsls r0, r1, 1 @@ -122030,7 +122030,7 @@ _08047200: adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0 - beq _08047242 + beq @08047242 ldr r3, =0x0202420a strb r6, [r3] movs r0, 0x1 @@ -122054,13 +122054,13 @@ _08047200: ldrb r0, [r5] ldrb r1, [r3] bl b_history__record_ability_usage_of_player -_08047242: +@08047242: ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _08047260 + beq @08047260 ldr r2, =0x0202433c ldr r0, =0x0202420b ldrb r1, [r0] @@ -122070,7 +122070,7 @@ _08047242: movs r2, 0x2 orrs r0, r2 strb r0, [r1, 0x1] -_08047260: +@08047260: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -122086,7 +122086,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 @@ -122097,9 +122097,9 @@ b_wonderguard_and_levitate: @ 80472A8 ldrh r1, [r0] mov r9, r0 cmp r1, 0xA5 - bne _080472C0 - b _08047508 -_080472C0: + bne @080472C0 + b @08047508 +@080472C0: ldr r2, =0x0831c898 lsls r0, r1, 1 adds r0, r1 @@ -122107,26 +122107,26 @@ _080472C0: adds r1, r0, r2 ldrb r0, [r1, 0x1] cmp r0, 0 - bne _080472D2 - b _08047508 -_080472D2: + bne @080472D2 + b @08047508 +@080472D2: ldr r0, =0x0202449c ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0 - beq _080472F4 + beq @080472F4 movs r1, 0x3F mov r12, r1 mov r2, r12 ands r2, r0 mov r12, r2 - b _080472F8 + b @080472F8 .align 2, 0 .pool -_080472F4: +@080472F4: ldrb r1, [r1, 0x2] mov r12, r1 -_080472F8: +@080472F8: ldr r2, =0x02024084 ldr r3, =0x0202420c ldrb r1, [r3] @@ -122138,10 +122138,10 @@ _080472F8: adds r7, r2, 0 mov r8, r3 cmp r1, 0x1A - bne _0804733C + bne @0804733C mov r0, r12 cmp r0, 0x4 - bne _0804733C + bne @0804733C ldr r0, =0x0202420a strb r1, [r0] ldr r0, =0x02024332 @@ -122150,24 +122150,24 @@ _080472F8: ldrb r0, [r3] movs r1, 0x1A bl b_history__record_ability_usage_of_player - b _08047508 + b @08047508 .align 2, 0 .pool -_0804733C: +@0804733C: ldr r1, =0x0831ace8 adds r0, r5, r1 ldrb r0, [r0] adds r4, r1, 0 - b _0804748E + b @0804748E .align 2, 0 .pool -_0804734C: +@0804734C: adds r0, r5, r4 ldrb r0, [r0] cmp r0, r12 - beq _08047356 - b _08047488 -_08047356: + beq @08047356 + b @08047488 +@08047356: adds r2, r5, 0x1 adds r3, r2, r4 mov r0, r8 @@ -122180,12 +122180,12 @@ _08047356: adds r3, r2, 0 ldrb r0, [r0] cmp r1, r0 - bne _08047396 + bne @08047396 adds r0, r5, 0x2 adds r0, r4 ldrb r0, [r0] cmp r0, 0 - bne _08047396 + bne @08047396 ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x8 @@ -122200,7 +122200,7 @@ _08047356: movs r1, 0x2 orrs r0, r1 strb r0, [r2, 0x1] -_08047396: +@08047396: adds r2, r3, r4 mov r0, r8 ldrb r1, [r0] @@ -122212,16 +122212,16 @@ _08047396: ldrb r2, [r2] ldrb r1, [r1] cmp r2, r1 - bne _080473DC + bne @080473DC adds r0, 0x21 ldrb r0, [r0] cmp r0, r2 - beq _080473DC + beq @080473DC adds r0, r5, 0x2 adds r0, r4 ldrb r0, [r0] cmp r0, 0 - bne _080473DC + bne @080473DC ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x8 @@ -122236,7 +122236,7 @@ _08047396: movs r1, 0x2 orrs r0, r1 strb r0, [r2, 0x1] -_080473DC: +@080473DC: adds r2, r3, r4 mov r0, r8 ldrb r1, [r0] @@ -122247,15 +122247,15 @@ _080473DC: ldrb r1, [r2] ldrb r0, [r0] cmp r1, r0 - bne _08047400 + bne @08047400 adds r0, r5, 0x2 adds r0, r4 ldrb r0, [r0] cmp r0, 0x14 - bne _08047400 + bne @08047400 movs r0, 0x1 orrs r6, r0 -_08047400: +@08047400: adds r2, r3, r4 mov r0, r8 ldrb r1, [r0] @@ -122267,19 +122267,19 @@ _08047400: ldrb r2, [r2] ldrb r1, [r1] cmp r2, r1 - bne _0804742E + bne @0804742E adds r0, 0x21 ldrb r0, [r0] cmp r0, r2 - beq _0804742E + beq @0804742E adds r0, r5, 0x2 adds r0, r4 ldrb r0, [r0] cmp r0, 0x14 - bne _0804742E + bne @0804742E movs r0, 0x1 orrs r6, r0 -_0804742E: +@0804742E: adds r2, r3, r4 mov r0, r8 ldrb r1, [r0] @@ -122290,17 +122290,17 @@ _0804742E: ldrb r1, [r2] ldrb r0, [r0] cmp r1, r0 - bne _08047456 + bne @08047456 adds r0, r5, 0x2 adds r0, r4 ldrb r0, [r0] cmp r0, 0x5 - bne _08047456 + bne @08047456 movs r0, 0x2 orrs r6, r0 lsls r0, r6, 24 lsrs r6, r0, 24 -_08047456: +@08047456: adds r2, r3, r4 mov r0, r8 ldrb r1, [r0] @@ -122312,31 +122312,31 @@ _08047456: ldrb r2, [r2] ldrb r1, [r1] cmp r2, r1 - bne _08047488 + bne @08047488 adds r0, 0x21 ldrb r0, [r0] cmp r0, r2 - beq _08047488 + beq @08047488 adds r0, r5, 0x2 adds r0, r4 ldrb r0, [r0] cmp r0, 0x5 - bne _08047488 + bne @08047488 movs r0, 0x2 orrs r6, r0 lsls r0, r6, 24 lsrs r6, r0, 24 -_08047488: +@08047488: adds r5, 0x3 adds r0, r5, r4 ldrb r0, [r0] -_0804748E: +@0804748E: cmp r0, 0xFF - beq _080474B2 + beq @080474B2 cmp r0, 0xFE - beq _08047498 - b _0804734C -_08047498: + beq @08047498 + b @0804734C +@08047498: mov r2, r8 ldrb r1, [r2] movs r0, 0x58 @@ -122349,8 +122349,8 @@ _08047498: lsls r1, 22 ands r0, r1 cmp r0, 0 - beq _08047488 -_080474B2: + beq @08047488 +@080474B2: mov r0, r8 ldrb r1, [r0] movs r0, 0x58 @@ -122359,7 +122359,7 @@ _080474B2: adds r0, 0x20 ldrb r4, [r0] cmp r4, 0x19 - bne _08047508 + bne @08047508 ldr r0, =0x0202420b ldrb r0, [r0] mov r2, r9 @@ -122368,11 +122368,11 @@ _080474B2: lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _08047508 + bne @08047508 movs r0, 0x3 ands r6, r0 cmp r6, 0x1 - beq _08047508 + beq @08047508 ldr r2, =0x0831c898 mov r0, r9 ldrh r1, [r0] @@ -122382,7 +122382,7 @@ _080474B2: adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0 - beq _08047508 + beq @08047508 ldr r0, =0x0202420a strb r4, [r0] ldr r1, =0x02024332 @@ -122392,7 +122392,7 @@ _080474B2: ldrb r0, [r1] movs r1, 0x19 bl b_history__record_ability_usage_of_player -_08047508: +@08047508: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -122404,7 +122404,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 @@ -122418,26 +122418,26 @@ b_attack_effectivity_adapt: @ 804752C bl __divsi3 str r0, [r7] cmp r0, 0 - bne _08047552 + bne @08047552 cmp r4, 0 - beq _08047552 + beq @08047552 movs r0, 0x1 str r0, [r7] -_08047552: +@08047552: cmp r4, 0x5 - beq _0804757A + beq @0804757A cmp r4, 0x5 - bgt _08047564 + bgt @08047564 cmp r4, 0 - beq _0804756A - b _080475DE + beq @0804756A + b @080475DE .align 2, 0 .pool -_08047564: +@08047564: cmp r4, 0x14 - beq _080475AC - b _080475DE -_0804756A: + beq @080475AC + b @080475DE +@0804756A: ldrb r0, [r6] movs r1, 0x8 orrs r0, r1 @@ -122445,8 +122445,8 @@ _0804756A: ands r0, r1 movs r1, 0xFD ands r0, r1 - b _080475DC -_0804757A: + b @080475DC +@0804757A: ldr r0, =0x0831c898 lsls r1, r5, 1 adds r1, r5 @@ -122454,25 +122454,25 @@ _0804757A: adds r1, r0 ldrb r0, [r1, 0x1] cmp r0, 0 - beq _080475DE + beq @080475DE ldrb r1, [r6] movs r0, 0x29 ands r0, r1 cmp r0, 0 - bne _080475DE + bne @080475DE movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080475A8 + beq @080475A8 movs r0, 0xFD ands r0, r1 - b _080475DC + b @080475DC .align 2, 0 .pool -_080475A8: +@080475A8: movs r0, 0x4 - b _080475DA -_080475AC: + b @080475DA +@080475AC: ldr r0, =0x0831c898 lsls r1, r5, 1 adds r1, r5 @@ -122480,35 +122480,35 @@ _080475AC: adds r1, r0 ldrb r0, [r1, 0x1] cmp r0, 0 - beq _080475DE + beq @080475DE ldrb r1, [r6] movs r0, 0x29 ands r0, r1 cmp r0, 0 - bne _080475DE + bne @080475DE movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080475D8 + beq @080475D8 movs r0, 0xFB ands r0, r1 - b _080475DC + b @080475DC .align 2, 0 .pool -_080475D8: +@080475D8: movs r0, 0x2 -_080475DA: +@080475DA: orrs r0, r1 -_080475DC: +@080475DC: strb r0, [r6] -_080475DE: +@080475DE: pop {r4-r7} pop {r0} bx r0 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 @@ -122531,10 +122531,10 @@ move_effectiveness_something: @ 80475E4 strb r1, [r0] mov r2, r10 cmp r2, 0xA5 - bne _08047616 + bne @08047616 movs r0, 0 - b _0804779E -_08047616: + b @0804779E +@08047616: ldr r1, =0x0831c898 mov r3, r10 lsls r2, r3, 1 @@ -122555,13 +122555,13 @@ _08047616: adds r5, r1, 0 ldr r1, [sp, 0x8] cmp r0, r1 - beq _0804764A + beq @0804764A adds r0, r3, 0 adds r0, 0x22 ldrb r0, [r0] cmp r0, r1 - bne _0804765C -_0804764A: + bne @0804765C +@0804764A: ldr r4, =0x020241f0 ldr r1, [r4] lsls r0, r1, 4 @@ -122570,7 +122570,7 @@ _0804764A: movs r1, 0xA bl __divsi3 str r0, [r4] -_0804765C: +@0804765C: movs r0, 0x58 mov r2, r9 muls r2, r0 @@ -122579,48 +122579,48 @@ _0804765C: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x1A - bne _08047690 + bne @08047690 ldr r3, [sp, 0x8] cmp r3, 0x4 - bne _08047690 + bne @08047690 movs r1, 0x9 mov r0, sp ldrb r0, [r0] orrs r0, r1 mov r1, sp strb r0, [r1] - b _08047740 + b @08047740 .align 2, 0 .pool -_08047690: +@08047690: ldr r1, =0x0831ace8 mov r2, r8 adds r0, r2, r1 ldrb r0, [r0] adds r2, r1, 0 cmp r0, 0xFF - beq _08047740 + beq @08047740 cmp r0, 0xFE - bne _080476B6 + bne @080476B6 movs r0, 0x58 mov r3, r9 muls r3, r0 adds r0, r3, 0 - b _0804772E + b @0804772E .align 2, 0 .pool -_080476B0: +@080476B0: movs r0, 0x3 add r8, r0 - b _08047718 -_080476B6: + b @08047718 +@080476B6: ldr r7, =0x0831ace8 mov r1, r8 adds r0, r1, r7 ldrb r0, [r0] ldr r2, [sp, 0x8] cmp r0, r2 - bne _08047710 + bne @08047710 adds r1, 0x1 adds r1, r7 ldr r2, =0x02024084 @@ -122634,7 +122634,7 @@ _080476B6: ldrb r4, [r1] ldrb r0, [r6] cmp r4, r0 - bne _080476F0 + bne @080476F0 mov r0, r8 adds r0, 0x2 adds r0, r7 @@ -122642,15 +122642,15 @@ _080476B6: mov r1, r10 mov r2, sp bl b_attack_effectivity_adapt -_080476F0: +@080476F0: adds r0, r5, 0 adds r0, 0x22 ldrb r0, [r0] cmp r4, r0 - bne _08047710 + bne @08047710 ldrb r0, [r6] cmp r0, r4 - beq _08047710 + beq @08047710 mov r0, r8 adds r0, 0x2 adds r0, r7 @@ -122658,24 +122658,24 @@ _080476F0: mov r1, r10 mov r2, sp bl b_attack_effectivity_adapt -_08047710: +@08047710: movs r1, 0x3 add r8, r1 ldr r5, =0x02024084 ldr r2, =0x0831ace8 -_08047718: +@08047718: mov r3, r8 adds r0, r3, r2 ldrb r0, [r0] cmp r0, 0xFF - beq _08047740 + beq @08047740 cmp r0, 0xFE - bne _080476B6 + bne @080476B6 movs r0, 0x58 mov r1, r9 muls r1, r0 adds r0, r1, 0 -_0804772E: +@0804772E: adds r1, r5, 0 adds r1, 0x50 adds r0, r1 @@ -122684,8 +122684,8 @@ _0804772E: lsls r1, 22 ands r0, r1 cmp r0, 0 - beq _080476B0 -_08047740: + beq @080476B0 +@08047740: movs r0, 0x58 mov r2, r9 muls r2, r0 @@ -122694,31 +122694,31 @@ _08047740: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x19 - bne _0804779A + bne @0804779A mov r0, sp ldrb r1, [r0] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0804779A + bne @0804779A ldr r0, [sp, 0x4] mov r1, r10 bl move_weather_interaction lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x2 - bne _0804779A + bne @0804779A mov r0, sp ldrb r3, [r0] adds r0, r1, 0 ands r0, r3 cmp r0, 0 - beq _08047782 + beq @08047782 movs r0, 0x6 ands r0, r3 cmp r0, 0x6 - bne _0804779A -_08047782: + bne @0804779A +@08047782: ldr r0, =0x0831c898 ldr r1, [sp, 0xC] add r1, r10 @@ -122726,15 +122726,15 @@ _08047782: adds r1, r0 ldrb r0, [r1, 0x1] cmp r0, 0 - beq _0804779A + beq @0804779A mov r0, sp movs r1, 0x1 orrs r1, r3 strb r1, [r0] -_0804779A: +@0804779A: mov r0, sp ldrb r0, [r0] -_0804779E: +@0804779E: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -122748,7 +122748,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 @@ -122775,12 +122775,12 @@ ai_rate_move: @ 80477BC ldrb r0, [r0, 0x7] mov r8, r0 cmp r6, 0xA5 - bne _080477FC + bne @080477FC movs r0, 0 - b _080478A0 + b @080478A0 .align 2, 0 .pool -_080477FC: +@080477FC: ldr r2, =0x0831c898 lsls r1, r6, 1 adds r0, r1, r6 @@ -122791,67 +122791,67 @@ _080477FC: str r1, [sp, 0x8] ldr r3, [sp, 0x4] cmp r3, 0x1A - bne _08047824 + bne @08047824 cmp r0, 0x4 - bne _08047824 + bne @08047824 movs r1, 0x9 mov r0, sp strb r1, [r0] - b _0804786A + b @0804786A .align 2, 0 .pool -_08047824: +@08047824: ldr r0, =0x0831ace8 adds r1, r7, r0 ldrb r0, [r1] cmp r0, 0xFF - beq _0804786A + beq @0804786A adds r4, r1, 0 -_08047830: +@08047830: ldrb r0, [r4] cmp r0, 0xFE - beq _0804785C + beq @0804785C cmp r0, r10 - bne _0804785C + bne @0804785C ldrb r5, [r4, 0x1] cmp r5, r9 - bne _0804784A + bne @0804784A ldrb r0, [r4, 0x2] adds r1, r6, 0 mov r2, sp bl b_attack_effectivity_adapt -_0804784A: +@0804784A: cmp r5, r8 - bne _0804785C + bne @0804785C cmp r9, r8 - beq _0804785C + beq @0804785C ldrb r0, [r4, 0x2] adds r1, r6, 0 mov r2, sp bl b_attack_effectivity_adapt -_0804785C: +@0804785C: adds r4, 0x3 adds r7, 0x3 ldr r1, =0x0831ace8 adds r0, r7, r1 ldrb r0, [r0] cmp r0, 0xFF - bne _08047830 -_0804786A: + bne @08047830 +@0804786A: ldr r3, [sp, 0x4] cmp r3, 0x19 - bne _0804789C + bne @0804789C mov r0, sp ldrb r2, [r0] movs r0, 0x2 ands r0, r2 cmp r0, 0 - beq _08047884 + beq @08047884 movs r0, 0x6 ands r0, r2 cmp r0, 0x6 - bne _0804789C -_08047884: + bne @0804789C +@08047884: ldr r0, =0x0831c898 ldr r3, [sp, 0x8] adds r1, r3, r6 @@ -122859,15 +122859,15 @@ _08047884: adds r1, r0 ldrb r0, [r1, 0x1] cmp r0, 0 - beq _0804789C + beq @0804789C mov r0, sp movs r1, 0x8 orrs r1, r2 strb r1, [r0] -_0804789C: +@0804789C: mov r0, sp ldrb r0, [r0] -_080478A0: +@080478A0: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -122881,7 +122881,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 @@ -122895,17 +122895,17 @@ sub_80478B8: @ 80478B8 ldr r4, =0x020241f0 ldr r0, [r4] cmp r0, 0 - beq _080478EA + beq @080478EA muls r0, r1 str r0, [r4] movs r1, 0x64 bl __divsi3 str r0, [r4] cmp r0, 0 - bne _080478EA + bne @080478EA movs r0, 0x1 str r0, [r4] -_080478EA: +@080478EA: pop {r4} pop {r0} bx r0 @@ -122914,7 +122914,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 @@ -122928,17 +122928,17 @@ atk07_cmd7: @ 80478F4 ldr r4, =0x020241f0 ldr r0, [r4] cmp r0, 0 - beq _08047926 + beq @08047926 muls r0, r1 str r0, [r4] movs r1, 0x64 bl __divsi3 str r0, [r4] cmp r0, 0 - bne _08047926 + bne @08047926 movs r0, 0x1 str r0, [r4] -_08047926: +@08047926: ldr r7, =0x02024084 ldr r6, =0x0202420c ldrb r2, [r6] @@ -122948,7 +122948,7 @@ _08047926: adds r1, r0, r7 ldrh r0, [r1, 0x2E] cmp r0, 0xAF - bne _0804795C + bne @0804795C ldr r1, =0x02024404 lsls r0, r2, 3 subs r0, r2 @@ -122956,10 +122956,10 @@ _08047926: adds r0, r1 ldrb r4, [r0, 0x7] ldrb r6, [r0, 0x1A] - b _08047976 + b @08047976 .align 2, 0 .pool -_0804795C: +@0804795C: ldrh r0, [r1, 0x2E] bl itemid_get_x12 lsls r0, 24 @@ -122971,13 +122971,13 @@ _0804795C: bl itemid_get_quality lsls r0, 24 lsrs r6, r0, 24 -_08047976: +@08047976: ldr r1, =0x0202420f ldr r5, =0x0202420c ldrb r0, [r5] strb r0, [r1] cmp r4, 0x27 - bne _080479B4 + bne @080479B4 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -122986,7 +122986,7 @@ _08047976: lsls r0, 16 lsrs r0, 16 cmp r0, r6 - bcs _080479B4 + bcs @080479B4 ldrb r0, [r5] movs r1, 0x27 bl b_history__record_item_x12_of_player @@ -123000,7 +123000,7 @@ _08047976: movs r2, 0x80 orrs r1, r2 strb r1, [r0] -_080479B4: +@080479B4: ldr r2, =0x02024084 ldr r3, =0x0202420c ldrb r4, [r3] @@ -123015,7 +123015,7 @@ _080479B4: ands r1, r0 adds r5, r2, 0 cmp r1, 0 - bne _08047A84 + bne @08047A84 ldr r2, =0x0831c898 ldr r0, =0x020241ea ldrh r1, [r0] @@ -123025,14 +123025,14 @@ _080479B4: adds r0, r2 ldrb r0, [r0] cmp r0, 0x65 - beq _08047A06 + beq @08047A06 ldr r0, =0x0202433c lsls r1, r4, 4 adds r1, r0 ldrb r0, [r1] lsls r0, 30 cmp r0, 0 - blt _08047A06 + blt @08047A06 ldr r0, =0x0202437c lsls r1, r4, 2 adds r1, r4 @@ -123041,8 +123041,8 @@ _080479B4: ldrb r0, [r1] lsrs r0, 7 cmp r0, 0 - beq _08047A84 -_08047A06: + beq @08047A84 +@08047A06: ldrb r0, [r3] movs r4, 0x58 muls r0, r4 @@ -123051,7 +123051,7 @@ _08047A06: ldr r2, =0x020241f0 ldr r0, [r2] cmp r1, r0 - bgt _08047A84 + bgt @08047A84 subs r0, r1, 0x1 str r0, [r2] ldr r1, =0x0202433c @@ -123061,16 +123061,16 @@ _08047A06: ldrb r0, [r0] lsls r0, 30 cmp r0, 0 - bge _08047A5C + bge @08047A5C ldr r0, =0x0202427c ldrb r1, [r0] movs r2, 0x40 orrs r1, r2 strb r1, [r0] - b _08047A84 + b @08047A84 .align 2, 0 .pool -_08047A5C: +@08047A5C: ldr r0, =0x0202437c lsls r1, r3, 2 adds r1, r3 @@ -123079,7 +123079,7 @@ _08047A5C: ldrb r0, [r1] lsrs r0, 7 cmp r0, 0 - beq _08047A84 + beq @08047A84 ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x80 @@ -123091,7 +123091,7 @@ _08047A5C: adds r0, r5 ldrh r0, [r0, 0x2E] strh r0, [r1] -_08047A84: +@08047A84: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -123104,7 +123104,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 @@ -123118,17 +123118,17 @@ atk08_cmd8: @ 8047AA4 ldr r4, =0x020241f0 ldr r0, [r4] cmp r0, 0 - beq _08047AD6 + beq @08047AD6 muls r0, r1 str r0, [r4] movs r1, 0x64 bl __divsi3 str r0, [r4] cmp r0, 0 - bne _08047AD6 + bne @08047AD6 movs r0, 0x1 str r0, [r4] -_08047AD6: +@08047AD6: ldr r7, =0x02024084 ldr r6, =0x0202420c ldrb r2, [r6] @@ -123138,7 +123138,7 @@ _08047AD6: adds r1, r0, r7 ldrh r0, [r1, 0x2E] cmp r0, 0xAF - bne _08047B0C + bne @08047B0C ldr r1, =0x02024404 lsls r0, r2, 3 subs r0, r2 @@ -123146,10 +123146,10 @@ _08047AD6: adds r0, r1 ldrb r4, [r0, 0x7] ldrb r6, [r0, 0x1A] - b _08047B26 + b @08047B26 .align 2, 0 .pool -_08047B0C: +@08047B0C: ldrh r0, [r1, 0x2E] bl itemid_get_x12 lsls r0, 24 @@ -123161,13 +123161,13 @@ _08047B0C: bl itemid_get_quality lsls r0, 24 lsrs r6, r0, 24 -_08047B26: +@08047B26: ldr r1, =0x0202420f ldr r5, =0x0202420c ldrb r0, [r5] strb r0, [r1] cmp r4, 0x27 - bne _08047B64 + bne @08047B64 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -123176,7 +123176,7 @@ _08047B26: lsls r0, 16 lsrs r0, 16 cmp r0, r6 - bcs _08047B64 + bcs @08047B64 ldrb r0, [r5] movs r1, 0x27 bl b_history__record_item_x12_of_player @@ -123190,7 +123190,7 @@ _08047B26: movs r2, 0x80 orrs r1, r2 strb r1, [r0] -_08047B64: +@08047B64: ldr r4, =0x02024084 ldr r6, =0x0202420c ldrb r2, [r6] @@ -123205,14 +123205,14 @@ _08047B64: lsls r1, 17 ands r0, r1 cmp r0, 0 - bne _08047C10 + bne @08047C10 ldr r5, =0x0202433c lsls r0, r2, 4 adds r0, r5 ldrb r0, [r0] lsls r0, 30 cmp r0, 0 - blt _08047BA2 + blt @08047BA2 ldr r0, =0x0202437c lsls r1, r2, 2 adds r1, r2 @@ -123221,14 +123221,14 @@ _08047B64: ldrb r0, [r1] lsrs r0, 7 cmp r0, 0 - beq _08047C10 -_08047BA2: + beq @08047C10 +@08047BA2: adds r0, r3, r4 ldrh r1, [r0, 0x28] ldr r2, =0x020241f0 ldr r0, [r2] cmp r1, r0 - bgt _08047C10 + bgt @08047C10 subs r0, r1, 0x1 str r0, [r2] ldrb r3, [r6] @@ -123237,16 +123237,16 @@ _08047BA2: ldrb r0, [r0] lsls r0, 30 cmp r0, 0 - bge _08047BE8 + bge @08047BE8 ldr r0, =0x0202427c ldrb r1, [r0] movs r2, 0x40 orrs r1, r2 strb r1, [r0] - b _08047C10 + b @08047C10 .align 2, 0 .pool -_08047BE8: +@08047BE8: ldr r0, =0x0202437c lsls r1, r3, 2 adds r1, r3 @@ -123255,7 +123255,7 @@ _08047BE8: ldrb r0, [r1] lsrs r0, 7 cmp r0, 0 - beq _08047C10 + beq @08047C10 ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x80 @@ -123267,7 +123267,7 @@ _08047BE8: adds r0, r4 ldrh r0, [r0, 0x2E] strh r0, [r1] -_08047C10: +@08047C10: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -123280,27 +123280,27 @@ _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 ldr r0, [r0] cmp r0, 0 - beq _08047C3E - b _08047DB6 -_08047C3E: + beq @08047C3E + b @08047DB6 +@08047C3E: ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 ands r0, r1 ldr r5, =0x020241ea cmp r0, 0 - beq _08047C8C + beq @08047C8C ldrh r0, [r5] cmp r0, 0x90 - beq _08047C8C + beq @08047C8C cmp r0, 0xA4 - beq _08047C8C + beq @08047C8C ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 @@ -123314,10 +123314,10 @@ _08047C3E: ldrb r0, [r1, 0x19] adds r0, 0x1 strb r0, [r1, 0x19] - b _08047DB6 + b @08047DB6 .align 2, 0 .pool -_08047C8C: +@08047C8C: ldr r2, =0x0831c898 ldrh r1, [r5] lsls r0, r1, 1 @@ -123328,27 +123328,27 @@ _08047C8C: movs r0, 0x8 ands r0, r1 cmp r0, 0 - bne _08047CB2 + bne @08047CB2 movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _08047CB2 + bne @08047CB2 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08047CBA -_08047CB2: + beq @08047CBA +@08047CB2: ldr r0, =0x02024474 ldrb r0, [r0, 0x19] cmp r0, 0 - bne _08047D88 -_08047CBA: + bne @08047D88 +@08047CBA: ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 - bne _08047DA8 + bne @08047DA8 ldr r1, =0x02024064 ldr r3, =0x0202420b ldrb r0, [r3] @@ -123369,17 +123369,17 @@ _08047CBA: adds r7, r3, 0 mov r12, r2 cmp r1, 0 - beq _08047D18 + beq @08047D18 ldr r0, =0x02024212 ldrb r6, [r0] - b _08047D42 + b @08047D42 .align 2, 0 .pool -_08047D18: +@08047D18: ldr r3, =0x02024212 ldrb r0, [r3] cmp r0, 0x1 - bls _08047D40 + bls @08047D40 mov r1, r12 adds r0, r4, r1 ldrh r2, [r0, 0x28] @@ -123388,16 +123388,16 @@ _08047D18: movs r6, 0x1 adds r4, r0, 0 cmp r2, r1 - ble _08047D44 + ble @08047D44 ldrb r6, [r3] - b _08047D44 + b @08047D44 .align 2, 0 .pool -_08047D40: +@08047D40: ldrb r6, [r3] -_08047D42: +@08047D42: ldr r4, =0x020241f0 -_08047D44: +@08047D44: ldrh r1, [r5] ldr r5, =0x02024474 ldrb r2, [r5, 0x18] @@ -123430,22 +123430,22 @@ _08047D44: strb r0, [r5, 0x19] ldrb r0, [r7] bl dp01_battle_side_mark_buffer_for_execution -_08047D88: +@08047D88: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] - b _08047DB6 + b @08047DB6 .align 2, 0 .pool -_08047DA8: +@08047DA8: ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r0, =0x082dabb9 str r0, [r4] -_08047DB6: +@08047DB6: add sp, 0x10 pop {r4-r7} pop {r0} @@ -123455,17 +123455,17 @@ _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] cmp r0, 0 - bne _08047DDA + bne @08047DDA ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] -_08047DDA: +@08047DDA: pop {r0} bx r0 .align 2, 0 @@ -123473,18 +123473,18 @@ _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] cmp r0, 0 - bne _08047EAA + bne @08047EAA ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 - bne _08047EA2 + bne @08047EA2 ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] @@ -123502,7 +123502,7 @@ atk0B_graphicalhpupdate: @ 8047DE8 lsls r1, 17 ands r0, r1 cmp r0, 0 - beq _08047E68 + beq @08047E68 ldr r0, =0x020242bc lsls r1, r2, 3 subs r1, r2 @@ -123510,29 +123510,29 @@ atk0B_graphicalhpupdate: @ 8047DE8 adds r1, r0 ldrb r0, [r1, 0xA] cmp r0, 0 - beq _08047E68 + beq @08047E68 ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 lsls r1, 1 ands r0, r1 cmp r0, 0 - bne _08047E68 + bne @08047E68 movs r0, 0x80 adds r1, r2, 0 bl b_std_message - b _08047EA2 + b @08047EA2 .align 2, 0 .pool -_08047E68: +@08047E68: ldr r0, =0x020241f0 ldr r0, [r0] ldr r1, =0x00002710 cmp r0, r1 - bgt _08047E76 + bgt @08047E76 lsls r0, 16 lsrs r1, r0, 16 -_08047E76: +@08047E76: movs r0, 0 bl dp01_build_cmdbuf_x18_0_aa_health_bar_update ldr r4, =0x02024064 @@ -123542,22 +123542,22 @@ _08047E76: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08047EA2 + bne @08047EA2 ldr r0, =0x020241f0 ldr r0, [r0] cmp r0, 0 - ble _08047EA2 + ble @08047EA2 ldr r0, =0x03005d10 ldrb r1, [r0, 0x5] movs r2, 0x1 orrs r1, r2 strb r1, [r0, 0x5] -_08047EA2: +@08047EA2: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x2 str r0, [r1] -_08047EAA: +@08047EAA: pop {r4} pop {r0} bx r0 @@ -123566,30 +123566,30 @@ _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 ldr r0, [r0] cmp r0, 0 - beq _08047ED2 - b _080482A2 -_08047ED2: + beq @08047ED2 + b @080482A2 +@08047ED2: ldr r0, =0x0202449c ldr r0, [r0] ldrb r1, [r0, 0x13] cmp r1, 0 - beq _08047EF4 + beq @08047EF4 movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _08047EF4 + bne @08047EF4 movs r6, 0x3F ands r6, r1 - b _08047F04 + b @08047F04 .align 2, 0 .pool -_08047EF4: +@08047EF4: ldr r2, =0x0831c898 ldr r0, =0x020241ea ldrh r1, [r0] @@ -123598,15 +123598,15 @@ _08047EF4: lsls r0, 2 adds r0, r2 ldrb r6, [r0, 0x2] -_08047F04: +@08047F04: ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 - beq _08047F12 - b _08048274 -_08047F12: + beq @08047F12 + b @08048274 +@08047F12: ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] @@ -123624,7 +123624,7 @@ _08047F12: lsls r1, 17 ands r0, r1 cmp r0, 0 - beq _08048028 + beq @08048028 ldr r0, =0x020242bc lsls r1, r2, 3 subs r1, r2 @@ -123633,19 +123633,19 @@ _08047F12: ldrb r1, [r4, 0xA] mov r12, r0 cmp r1, 0 - beq _08048028 + beq @08048028 ldr r0, =0x02024280 ldr r3, [r0] movs r0, 0x80 lsls r0, 1 ands r3, r0 cmp r3, 0 - bne _08048028 + bne @08048028 adds r5, r1, 0 ldr r6, =0x020241f0 ldr r4, [r6] cmp r5, r4 - blt _08047FBC + blt @08047FBC ldr r0, =0x0202437c lsls r1, r2, 2 adds r1, r2 @@ -123654,9 +123654,9 @@ _08047F12: adds r1, r0 ldr r0, [r1] cmp r0, 0 - bne _08047F76 + bne @08047F76 str r4, [r1] -_08047F76: +@08047F76: ldrb r0, [r7] lsls r1, r0, 3 subs r1, r0 @@ -123669,10 +123669,10 @@ _08047F76: ldr r1, =0x020241f4 ldr r0, [r6] str r0, [r1] - b _08047FEC + b @08047FEC .align 2, 0 .pool -_08047FBC: +@08047FBC: ldr r0, =0x0202437c lsls r1, r2, 2 adds r1, r2 @@ -123681,9 +123681,9 @@ _08047FBC: adds r1, r0 ldr r0, [r1] cmp r0, 0 - bne _08047FD0 + bne @08047FD0 str r5, [r1] -_08047FD0: +@08047FD0: ldr r2, =0x020241f4 ldrb r1, [r7] lsls r0, r1, 3 @@ -123698,7 +123698,7 @@ _08047FD0: lsls r0, 2 add r0, r12 strb r3, [r0, 0xA] -_08047FEC: +@08047FEC: ldr r0, =0x02024064 ldrb r1, [r0] lsls r0, r1, 3 @@ -123707,9 +123707,9 @@ _08047FEC: add r0, r12 ldrb r0, [r0, 0xA] cmp r0, 0 - beq _08048000 - b _0804829A -_08048000: + beq @08048000 + b @0804829A +@08048000: ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x2 @@ -123717,10 +123717,10 @@ _08048000: bl b_movescr_stack_push_cursor ldr r0, =0x082db6fb str r0, [r4] - b _080482A2 + b @080482A2 .align 2, 0 .pool -_08048028: +@08048028: ldr r0, =0x02024280 ldr r2, [r0] ldr r1, =0xfffffeff @@ -123731,7 +123731,7 @@ _08048028: mov r12, r0 adds r7, r1, 0 cmp r5, 0 - bge _0804807C + bge @0804807C ldr r4, =0x02024084 ldr r2, =0x02024064 ldrb r0, [r2] @@ -123749,28 +123749,28 @@ _08048028: ldrh r0, [r1, 0x28] adds r5, r2, 0 cmp r0, r3 - bhi _08048064 - b _0804823A -_08048064: + bhi @08048064 + b @0804823A +@08048064: strh r3, [r1, 0x28] - b _0804823A + b @0804823A .align 2, 0 .pool -_0804807C: +@0804807C: movs r0, 0x20 ands r0, r2 cmp r0, 0 - beq _08048098 + beq @08048098 movs r0, 0x21 negs r0, r0 ands r2, r0 mov r0, r12 str r2, [r0] ldr r5, =0x02024064 - b _080480E0 + b @080480E0 .align 2, 0 .pool -_08048098: +@08048098: ldr r0, =0x020241f8 ldr r2, =0x02024064 ldrb r1, [r2] @@ -123784,23 +123784,23 @@ _08048098: ldrb r0, [r0, 0x1] adds r5, r2, 0 cmp r0, 0 - bne _080480D4 + bne @080480D4 ldr r1, =0x02024288 ldrb r0, [r5] adds r0, r1 ldr r1, =0x0202420b - b _080480DC + b @080480DC .align 2, 0 .pool -_080480D4: +@080480D4: ldr r1, =0x02024288 ldrb r0, [r5] adds r0, r1 ldr r1, =0x0202420c -_080480DC: +@080480DC: ldrb r1, [r1] strb r1, [r0] -_080480E0: +@080480E0: ldr r4, =0x02024084 ldrb r0, [r5] movs r3, 0x58 @@ -123809,16 +123809,16 @@ _080480E0: ldrh r0, [r2, 0x28] ldr r1, [r7] cmp r0, r1 - ble _08048110 + ble @08048110 subs r0, r1 strh r0, [r2, 0x28] ldr r0, =0x020241f4 str r1, [r0] adds r7, r0, 0 - b _08048120 + b @08048120 .align 2, 0 .pool -_08048110: +@08048110: ldr r2, =0x020241f4 str r0, [r2] ldrb r0, [r5] @@ -123827,7 +123827,7 @@ _08048110: movs r1, 0 strh r1, [r0, 0x28] adds r7, r2, 0 -_08048120: +@08048120: ldr r2, =0x0202437c ldrb r1, [r5] lsls r0, r1, 2 @@ -123838,30 +123838,30 @@ _08048120: ldr r0, [r3] adds r4, r2, 0 cmp r0, 0 - bne _08048148 + bne @08048148 mov r1, r12 ldr r0, [r1] movs r1, 0x80 lsls r1, 13 ands r0, r1 cmp r0, 0 - bne _08048148 + bne @08048148 ldr r0, [r7] str r0, [r3] -_08048148: +@08048148: cmp r6, 0x8 - bhi _080481D0 + bhi @080481D0 mov r1, r12 ldr r0, [r1] movs r1, 0x80 lsls r1, 13 ands r0, r1 cmp r0, 0 - bne _080481CC + bne @080481CC ldr r0, =0x020241ea ldrh r0, [r0] cmp r0, 0xDC - beq _080481CC + beq @080481CC ldr r3, =0x0202433c ldrb r0, [r5] lsls r0, 4 @@ -123881,20 +123881,20 @@ _08048148: ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0 - bne _080481AC + bne @080481AC ldrb r0, [r5] lsls r0, 4 adds r0, r3 ldr r2, =0x0202420b - b _080481B4 + b @080481B4 .align 2, 0 .pool -_080481AC: +@080481AC: ldrb r0, [r5] lsls r0, 4 adds r0, r3 ldr r2, =0x0202420c -_080481B4: +@080481B4: ldrb r1, [r2] strb r1, [r0, 0xC] ldrb r1, [r5] @@ -123904,20 +123904,20 @@ _080481B4: adds r0, r4 ldrb r1, [r2] strb r1, [r0, 0x10] - b _0804823A + b @0804823A .align 2, 0 .pool -_080481CC: +@080481CC: cmp r6, 0x8 - bls _0804823A -_080481D0: + bls @0804823A +@080481D0: mov r1, r12 ldr r0, [r1] movs r1, 0x80 lsls r1, 13 ands r0, r1 cmp r0, 0 - bne _0804823A + bne @0804823A ldr r3, =0x0202433c ldrb r0, [r5] lsls r0, 4 @@ -123938,20 +123938,20 @@ _080481D0: ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0 - bne _08048220 + bne @08048220 ldrb r0, [r5] lsls r0, 4 adds r0, r3 ldr r2, =0x0202420b - b _08048228 + b @08048228 .align 2, 0 .pool -_08048220: +@08048220: ldrb r0, [r5] lsls r0, 4 adds r0, r3 ldr r2, =0x0202420c -_08048228: +@08048228: ldrb r1, [r2] strb r1, [r0, 0xD] ldrb r1, [r5] @@ -123961,7 +123961,7 @@ _08048228: adds r0, r4 ldrb r1, [r2] strb r1, [r0, 0x11] -_0804823A: +@0804823A: mov r1, r12 ldr r0, [r1] ldr r1, =0xffefffff @@ -123981,10 +123981,10 @@ _0804823A: bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r5] bl dp01_battle_side_mark_buffer_for_execution - b _0804829A + b @0804829A .align 2, 0 .pool -_08048274: +@08048274: ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] @@ -124000,15 +124000,15 @@ _08048274: adds r1, r0, r2 ldr r0, [r1] cmp r0, 0 - bne _0804829A + bne @0804829A ldr r0, =0x0000ffff str r0, [r1] -_0804829A: +@0804829A: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x2 str r0, [r1] -_080482A2: +@080482A2: add sp, 0x4 pop {r4-r7} pop {r0} @@ -124018,22 +124018,22 @@ _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] cmp r0, 0 - bne _080482F2 + bne @080482F2 ldr r0, =0x02024211 ldrb r0, [r0] cmp r0, 0x2 - bne _080482EA + bne @080482EA ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 - bne _080482EA + bne @080482EA ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0xD9 @@ -124041,12 +124041,12 @@ atk0D_critmessage: @ 80482BC ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x7] -_080482EA: +@080482EA: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] -_080482F2: +@080482F2: pop {r0} bx r0 .align 2, 0 @@ -124054,12 +124054,12 @@ _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] cmp r0, 0 - bne _080483D0 + bne @080483D0 ldr r4, =0x02024064 ldr r0, =0x0202420c ldrb r0, [r0] @@ -124069,87 +124069,87 @@ atk0E_missmessage: @ 8048310 movs r0, 0x1 ands r0, r2 cmp r0, 0 - bne _080483C8 + bne @080483C8 movs r0, 0xFE ands r0, r2 cmp r0, 0x10 - beq _08048382 + beq @08048382 cmp r0, 0x10 - bgt _0804835E + bgt @0804835E cmp r0, 0x4 - beq _08048372 + beq @08048372 cmp r0, 0x4 - bgt _08048358 + bgt @08048358 cmp r0, 0x2 - beq _0804836C - b _08048382 + beq @0804836C + b @08048382 .align 2, 0 .pool -_08048358: +@08048358: cmp r0, 0x8 - beq _080483C8 - b _08048382 -_0804835E: + beq @080483C8 + b @08048382 +@0804835E: cmp r0, 0x40 - beq _08048382 + beq @08048382 cmp r0, 0x40 - bgt _08048382 + bgt @08048382 cmp r0, 0x20 - beq _080483C8 - b _08048382 -_0804836C: + beq @080483C8 + b @08048382 +@0804836C: movs r0, 0 movs r1, 0xE - b _08048376 -_08048372: + b @08048376 +@08048372: movs r0, 0 movs r1, 0xC -_08048376: +@08048376: bl dp01_build_cmdbuf_x2B_aa_0 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - b _080483C8 -_08048382: + b @080483C8 +@08048382: ldrb r1, [r1] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08048392 + beq @08048392 movs r0, 0 movs r1, 0xE - b _0804839E -_08048392: + b @0804839E +@08048392: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080483B0 + beq @080483B0 movs r0, 0 movs r1, 0xC -_0804839E: +@0804839E: bl dp01_build_cmdbuf_x2B_aa_0 ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution - b _080483C8 + b @080483C8 .align 2, 0 .pool -_080483B0: +@080483B0: movs r0, 0x28 ands r0, r1 cmp r0, 0 - bne _080483C8 + bne @080483C8 movs r0, 0 movs r1, 0xD bl dp01_build_cmdbuf_x2B_aa_0 ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution -_080483C8: +@080483C8: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] -_080483D0: +@080483D0: pop {r4} pop {r0} bx r0 @@ -124158,15 +124158,15 @@ _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 ldr r0, [r0] cmp r0, 0 - beq _080483EE - b _08048580 -_080483EE: + beq @080483EE + b @08048580 +@080483EE: ldr r1, =0x0202427c ldrb r2, [r1] movs r4, 0x1 @@ -124175,72 +124175,72 @@ _080483EE: adds r6, r1, 0 ldr r7, =0x02024332 cmp r0, 0 - beq _0804842C + beq @0804842C movs r0, 0x8 ands r0, r2 cmp r0, 0 - beq _0804840E + beq @0804840E ldrb r0, [r7, 0x6] cmp r0, 0x2 - bls _0804842C -_0804840E: + bls @0804842C +@0804840E: ldr r1, =0x085cc834 ldrb r0, [r7, 0x6] lsls r0, 1 adds r0, r1 ldrh r3, [r0] strb r4, [r7, 0x7] - b _0804856A + b @0804856A .align 2, 0 .pool -_0804842C: +@0804842C: movs r0, 0x1 strb r0, [r7, 0x7] ldrb r5, [r6] movs r0, 0xFE ands r0, r5 cmp r0, 0x10 - beq _08048470 + beq @08048470 cmp r0, 0x10 - bgt _08048452 + bgt @08048452 cmp r0, 0x4 - beq _0804846C + beq @0804846C cmp r0, 0x4 - bgt _0804844C + bgt @0804844C cmp r0, 0x2 - beq _08048468 - b _080484B8 -_0804844C: + beq @08048468 + b @080484B8 +@0804844C: cmp r0, 0x8 - beq _080484C4 - b _080484B8 -_08048452: + beq @080484C4 + b @080484B8 +@08048452: cmp r0, 0x40 - beq _08048474 + beq @08048474 cmp r0, 0x40 - bgt _08048462 + bgt @08048462 cmp r0, 0x20 - bne _08048460 - b _08048564 -_08048460: - b _080484B8 -_08048462: + bne @08048460 + b @08048564 +@08048460: + b @080484B8 +@08048462: cmp r0, 0x80 - beq _08048478 - b _080484B8 -_08048468: + beq @08048478 + b @080484B8 +@08048468: movs r3, 0xDE - b _0804856E -_0804846C: + b @0804856E +@0804846C: movs r3, 0xDD - b _0804856E -_08048470: + b @0804856E +@08048470: movs r3, 0xDA - b _0804856E -_08048474: + b @0804856E +@08048474: movs r3, 0x99 - b _0804856E -_08048478: + b @0804856E +@08048478: ldr r4, =0x02024208 ldr r2, =0x02024084 ldr r3, =0x0202420c @@ -124259,24 +124259,24 @@ _08048478: bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =0x082db816 - b _0804857E + b @0804857E .align 2, 0 .pool -_080484B8: +@080484B8: adds r2, r6, 0 ldrb r5, [r2] movs r0, 0x8 ands r0, r5 cmp r0, 0 - beq _080484C8 -_080484C4: + beq @080484C8 +@080484C4: movs r3, 0x1B - b _0804856E -_080484C8: + b @0804856E +@080484C8: movs r0, 0x10 ands r0, r5 cmp r0, 0 - beq _080484F0 + beq @080484F0 movs r0, 0xEF ands r0, r5 movs r1, 0xFD @@ -124287,28 +124287,28 @@ _080484C8: bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =0x082db1ce - b _0804857E + b @0804857E .align 2, 0 .pool -_080484F0: +@080484F0: movs r0, 0x40 ands r0, r5 cmp r0, 0 - beq _08048510 + beq @08048510 movs r0, 0x3F ands r0, r5 strb r0, [r2] bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =0x082db1c7 - b _0804857E + b @0804857E .align 2, 0 .pool -_08048510: +@08048510: movs r0, 0x80 ands r0, r5 cmp r0, 0 - beq _08048558 + beq @08048558 ldr r4, =0x02024208 ldr r2, =0x02024084 ldr r3, =0x0202420c @@ -124327,36 +124327,36 @@ _08048510: bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =0x082db816 - b _0804857E + b @0804857E .align 2, 0 .pool -_08048558: +@08048558: movs r0, 0x20 ands r0, r5 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _08048568 -_08048564: + beq @08048568 +@08048564: movs r3, 0xE5 - b _0804856E -_08048568: + b @0804856E +@08048568: strb r0, [r7, 0x7] -_0804856A: +@0804856A: cmp r3, 0 - beq _08048578 -_0804856E: + beq @08048578 +@0804856E: adds r0, r3, 0 ldr r1, =0x0202420b ldrb r1, [r1] bl b_std_message -_08048578: +@08048578: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 -_0804857E: +@0804857E: str r0, [r1] -_08048580: +@08048580: pop {r4-r7} pop {r0} bx r0 @@ -124365,12 +124365,12 @@ _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] cmp r0, 0 - bne _080485BA + bne @080485BA ldr r4, =0x02024214 ldr r1, [r4] ldrb r0, [r1, 0x1] @@ -124386,7 +124386,7 @@ atk10_printstring: @ 8048590 ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x7] -_080485BA: +@080485BA: pop {r4} pop {r0} bx r0 @@ -124395,7 +124395,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 @@ -124425,24 +124425,24 @@ 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] cmp r4, 0 - bne _08048662 + bne @08048662 ldr r6, =0x02024332 ldrb r0, [r6, 0x7] cmp r0, 0 - bne _0804863C + bne @0804863C ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x3 str r0, [r1] - b _08048662 + b @08048662 .align 2, 0 .pool -_0804863C: +@0804863C: ldr r5, =0x02024214 ldr r2, [r5] ldrb r1, [r2, 0x1] @@ -124456,13 +124456,13 @@ _0804863C: lsls r0, 16 lsrs r0, 16 cmp r0, r1 - bcc _08048662 + bcc @08048662 movs r1, 0 strh r4, [r3] adds r0, r2, 0x3 str r0, [r5] strb r1, [r6, 0x7] -_08048662: +@08048662: pop {r4-r6} pop {r0} bx r0 @@ -124471,12 +124471,12 @@ _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] cmp r0, 0 - bne _080486AE + bne @080486AE ldr r4, =0x02024214 ldr r2, [r4] ldrb r1, [r2, 0x1] @@ -124502,7 +124502,7 @@ atk13_printfromtable: @ 8048670 str r0, [r4] movs r0, 0x1 strb r0, [r5, 0x7] -_080486AE: +@080486AE: pop {r4,r5} pop {r0} bx r0 @@ -124511,12 +124511,12 @@ _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] cmp r0, 0 - bne _0804870E + bne @0804870E ldr r5, =0x02024214 ldr r2, [r5] ldrb r1, [r2, 0x1] @@ -124547,7 +124547,7 @@ atk14_printfromtable2: @ 80486C4 str r0, [r5] movs r0, 0x1 strb r0, [r6, 0x7] -_0804870E: +@0804870E: pop {r4-r6} pop {r0} bx r0 @@ -124556,7 +124556,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 @@ -124564,20 +124564,20 @@ sub_8048728: @ 8048728 ldr r0, =0x0202406c ldrb r3, [r0] cmp r1, r3 - bge _0804874E + bge @0804874E ldr r4, =0x0202407e ldrb r0, [r4] cmp r0, r2 - beq _0804874E -_08048740: + beq @0804874E +@08048740: adds r1, 0x1 cmp r1, r3 - bge _0804874E + bge @0804874E adds r0, r1, r4 ldrb r0, [r0] cmp r0, r2 - bne _08048740 -_0804874E: + bne @08048740 +@0804874E: lsls r0, r1, 24 lsrs r0, 24 pop {r4} @@ -124588,7 +124588,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 @@ -124609,7 +124609,7 @@ sub_8048760: @ 8048760 movs r0, 0x40 ands r0, r3 cmp r0, 0 - beq _080487B8 + beq @080487B8 ldr r2, =0x0202420e ldr r0, =0x0202420b ldrb r0, [r0] @@ -124621,17 +124621,17 @@ sub_8048760: @ 8048760 movs r7, 0x40 ldr r1, =0x02024474 ldr r0, =0x0202420c - b _080487C4 + b @080487C4 .align 2, 0 .pool -_080487B8: +@080487B8: ldr r2, =0x0202420e ldr r0, =0x0202420c ldrb r0, [r0] strb r0, [r2] ldr r1, =0x02024474 ldr r0, =0x0202420b -_080487C4: +@080487C4: ldrb r0, [r0] strb r0, [r1, 0x17] mov r9, r2 @@ -124644,30 +124644,30 @@ _080487C4: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x13 - bne _08048828 + bne @08048828 ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 lsls r1, 6 ands r0, r1 cmp r0, 0 - bne _08048828 + bne @08048828 cmp r5, 0 - bne _08048828 + bne @08048828 ldr r1, =0x02024332 ldrb r0, [r1, 0x3] cmp r0, 0x9 - bhi _08048828 + bhi @08048828 ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] ldr r2, =0x02024332 strb r5, [r2, 0x3] - bl _080499B8 + bl @080499B8 .align 2, 0 .pool -_08048828: +@08048828: mov r3, r9 ldrb r0, [r3] bl battle_get_per_side_status @@ -124680,30 +124680,30 @@ _08048828: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _08048880 + beq @08048880 ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 lsls r1, 6 ands r0, r1 cmp r0, 0 - bne _08048880 + bne @08048880 cmp r5, 0 - bne _08048880 + bne @08048880 ldr r0, =0x02024332 ldrb r1, [r0, 0x3] cmp r1, 0x7 - bhi _08048880 + bhi @08048880 ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] ldr r4, =0x02024332 strb r5, [r4, 0x3] - bl _080499B8 + bl @080499B8 .align 2, 0 .pool -_08048880: +@08048880: ldr r3, =0x02024084 ldr r2, =0x0202420e ldrb r1, [r2] @@ -124714,23 +124714,23 @@ _08048880: mov r9, r2 mov r8, r3 cmp r4, 0 - bne _080488C4 + bne @080488C4 ldr r1, =0x02024332 ldrb r0, [r1, 0x3] cmp r0, 0xB - beq _080488C4 + beq @080488C4 cmp r0, 0x1F - beq _080488C4 + beq @080488C4 ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] ldr r2, =0x02024332 strb r4, [r2, 0x3] - bl _080499B8 + bl @080499B8 .align 2, 0 .pool -_080488C4: +@080488C4: mov r3, r9 ldrb r1, [r3] movs r0, 0x58 @@ -124743,9 +124743,9 @@ _080488C4: lsls r1, 17 ands r0, r1 cmp r0, 0 - beq _080488FC + beq @080488FC cmp r7, 0x40 - beq _080488FC + beq @080488FC ldr r0, =0x02024214 ldr r1, [r0] adds r1, 0x1 @@ -124753,16 +124753,16 @@ _080488C4: movs r0, 0 ldr r4, =0x02024332 strb r0, [r4, 0x3] - bl _080499B8 + bl @080499B8 .align 2, 0 .pool -_080488FC: +@080488FC: ldr r1, =0x02024332 ldrb r0, [r1, 0x3] cmp r0, 0x6 - bls _08048906 - b _08048F40 -_08048906: + bls @08048906 + b @08048F40 +@08048906: ldr r1, =0x0831c134 ldr r2, =0x02024332 ldrb r0, [r2, 0x3] @@ -124770,37 +124770,37 @@ _08048906: adds r0, r1 ldr r0, [r0] cmp r0, 0x10 - bne _08048918 - b _08048AFC -_08048918: + bne @08048918 + b @08048AFC +@08048918: cmp r0, 0x10 - bhi _08048930 + bhi @08048930 cmp r0, 0x7 - beq _0804894A + beq @0804894A cmp r0, 0x8 - beq _08048A00 - b _08048DF4 + beq @08048A00 + b @08048DF4 .align 2, 0 .pool -_08048930: +@08048930: cmp r0, 0x40 - bne _08048936 - b _08048C84 -_08048936: + bne @08048936 + b @08048C84 +@08048936: cmp r0, 0x40 - bhi _08048942 + bhi @08048942 cmp r0, 0x20 - bne _08048940 - b _08048BEA -_08048940: - b _08048DF4 -_08048942: + bne @08048940 + b @08048BEA +@08048940: + b @08048DF4 +@08048942: cmp r0, 0x80 - bne _08048948 - b _08048D02 -_08048948: - b _08048DF4 -_0804894A: + bne @08048948 + b @08048D02 +@08048948: + b @08048DF4 +@0804894A: mov r3, r9 ldrb r1, [r3] movs r0, 0x58 @@ -124809,7 +124809,7 @@ _0804894A: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x2B - beq _080489AC + beq @080489AC ldr r0, =0x02024064 movs r1, 0 strb r1, [r0] @@ -124818,44 +124818,44 @@ _0804894A: adds r7, r0, 0 mov r12, r1 cmp r3, 0 - beq _080489B8 + beq @080489B8 mov r4, r8 ldr r0, [r4, 0x50] movs r1, 0x70 ands r0, r1 cmp r0, 0 - bne _080489B8 + bne @080489B8 adds r1, r7, 0 mov r6, r8 adds r6, 0x50 movs r5, 0x58 movs r4, 0x70 -_08048984: +@08048984: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] lsls r0, 24 lsrs r0, 24 cmp r0, r3 - bcs _080489B8 + bcs @080489B8 ldrb r0, [r7] muls r0, r5 adds r0, r6 ldr r0, [r0] ands r0, r4 cmp r0, 0 - beq _08048984 - b _080489B8 + beq @08048984 + b @080489B8 .align 2, 0 .pool -_080489AC: +@080489AC: ldr r0, =0x02024064 ldr r2, =0x0202406c ldrb r1, [r2] strb r1, [r0] adds r7, r0, 0 mov r12, r2 -_080489B8: +@080489B8: mov r0, r9 ldrb r2, [r0] movs r0, 0x58 @@ -124866,34 +124866,34 @@ _080489B8: adds r0, r1, r0 ldr r0, [r0] cmp r0, 0 - beq _080489D0 - b _08048DF4 -_080489D0: + beq @080489D0 + b @08048DF4 +@080489D0: ldrb r0, [r7] mov r3, r12 ldrb r3, [r3] cmp r0, r3 - beq _080489DC - b _08048DF4 -_080489DC: + beq @080489DC + b @08048DF4 +@080489DC: mov r4, r8 adds r0, r1, r4 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x48 - bne _080489EA - b _08048DF4 -_080489EA: + bne @080489EA + b @08048DF4 +@080489EA: cmp r0, 0xF - bne _080489F0 - b _08048DF4 -_080489F0: + bne @080489F0 + b @08048DF4 +@080489F0: adds r0, r2, 0 bl b_cancel_multi_turn_move_maybe - b _08048DE4 + b @08048DE4 .align 2, 0 .pool -_08048A00: +@08048A00: mov r2, r9 ldrb r1, [r2] movs r0, 0x58 @@ -124902,12 +124902,12 @@ _08048A00: adds r0, 0x20 ldrb r1, [r0] cmp r1, 0x11 - bne _08048A70 + bne @08048A70 cmp r5, 0x1 - beq _08048A1A + beq @08048A1A cmp r6, 0x80 - bne _08048A70 -_08048A1A: + bne @08048A70 +@08048A1A: ldr r0, =0x0202420a strb r1, [r0] mov r3, r9 @@ -124926,20 +124926,20 @@ _08048A1A: lsls r0, 6 ands r0, r1 cmp r0, 0 - bne _08048A46 - b _08048D20 -_08048A46: + bne @08048A46 + b @08048D20 +@08048A46: movs r0, 0x1 ldr r4, =0x02024332 strb r0, [r4, 0x5] -_08048A4C: +@08048A4C: ldr r0, =0xffffdfff ands r1, r0 str r1, [r2] - bl _080499B2 + bl @080499B2 .align 2, 0 .pool -_08048A70: +@08048A70: mov r2, r9 ldrb r0, [r2] movs r1, 0x58 @@ -124949,31 +124949,31 @@ _08048A70: adds r1, 0x21 ldrb r1, [r1] cmp r1, 0x3 - beq _08048A94 + beq @08048A94 adds r0, 0x22 ldrb r0, [r0] cmp r0, 0x3 - beq _08048A94 + beq @08048A94 cmp r1, 0x8 - beq _08048A94 + beq @08048A94 cmp r0, 0x8 - bne _08048AAE -_08048A94: + bne @08048AAE +@08048A94: ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 lsls r1, 6 ands r0, r1 cmp r0, 0 - beq _08048AAE + beq @08048AAE cmp r5, 0x1 - bne _08048AA8 - b _08048D66 -_08048AA8: + bne @08048AA8 + b @08048D66 +@08048AA8: cmp r6, 0x80 - bne _08048AAE - b _08048D66 -_08048AAE: + bne @08048AAE + b @08048D66 +@08048AAE: mov r3, r9 ldrb r1, [r3] movs r0, 0x58 @@ -124984,42 +124984,42 @@ _08048AAE: adds r0, 0x21 ldrb r4, [r0] cmp r4, 0x3 - bne _08048AC6 - b _08048DF4 -_08048AC6: + bne @08048AC6 + b @08048DF4 +@08048AC6: adds r0, 0x1 ldrb r0, [r0] cmp r0, 0x3 - bne _08048AD0 - b _08048DF4 -_08048AD0: + bne @08048AD0 + b @08048DF4 +@08048AD0: cmp r4, 0x8 - bne _08048AD6 - b _08048DF4 -_08048AD6: + bne @08048AD6 + b @08048DF4 +@08048AD6: cmp r0, 0x8 - bne _08048ADC - b _08048DF4 -_08048ADC: + bne @08048ADC + b @08048DF4 +@08048ADC: mov r0, r8 adds r0, 0x4C adds r0, r1, r0 ldr r0, [r0] cmp r0, 0 - beq _08048AEA - b _08048DF4 -_08048AEA: + beq @08048AEA + b @08048DF4 +@08048AEA: adds r0, r3, 0 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x11 - bne _08048AF6 - b _08048DF4 -_08048AF6: - b _08048DE4 + bne @08048AF6 + b @08048DF4 +@08048AF6: + b @08048DE4 .align 2, 0 .pool -_08048AFC: +@08048AFC: mov r2, r9 ldrb r1, [r2] movs r0, 0x58 @@ -125028,12 +125028,12 @@ _08048AFC: adds r0, 0x20 ldrb r1, [r0] cmp r1, 0x29 - bne _08048B54 + bne @08048B54 cmp r5, 0x1 - beq _08048B16 + beq @08048B16 cmp r6, 0x80 - bne _08048B54 -_08048B16: + bne @08048B54 +@08048B16: ldr r0, =0x0202420a strb r1, [r0] mov r3, r9 @@ -125052,13 +125052,13 @@ _08048B16: lsls r0, 6 ands r0, r1 cmp r0, 0 - beq _08048B42 - b _08048A46 -_08048B42: - b _08048D20 + beq @08048B42 + b @08048A46 +@08048B42: + b @08048D20 .align 2, 0 .pool -_08048B54: +@08048B54: mov r2, r9 ldrb r1, [r2] movs r0, 0x58 @@ -125069,34 +125069,34 @@ _08048B54: adds r0, 0x21 ldrb r0, [r0] cmp r0, 0xA - beq _08048B74 + beq @08048B74 adds r0, r1, 0 adds r0, 0x22 ldrb r0, [r0] cmp r0, 0xA - bne _08048BA4 -_08048B74: + bne @08048BA4 +@08048B74: ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 lsls r1, 6 ands r0, r1 cmp r0, 0 - beq _08048BA4 + beq @08048BA4 cmp r5, 0x1 - beq _08048B8A + beq @08048B8A cmp r6, 0x80 - bne _08048BA4 -_08048B8A: + bne @08048BA4 +@08048B8A: ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r0, =0x082db5d1 - b _08048D72 + b @08048D72 .align 2, 0 .pool -_08048BA4: +@08048BA4: mov r4, r9 ldrb r0, [r4] movs r1, 0x58 @@ -125108,35 +125108,35 @@ _08048BA4: adds r0, 0x21 ldrb r0, [r0] cmp r0, 0xA - bne _08048BBE - b _08048DF4 -_08048BBE: + bne @08048BBE + b @08048DF4 +@08048BBE: adds r0, r1, 0 adds r0, 0x22 ldrb r0, [r0] cmp r0, 0xA - bne _08048BCA - b _08048DF4 -_08048BCA: + bne @08048BCA + b @08048DF4 +@08048BCA: adds r0, r1, 0 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x29 - bne _08048BD6 - b _08048DF4 -_08048BD6: + bne @08048BD6 + b @08048DF4 +@08048BD6: mov r0, r8 adds r0, 0x4C adds r0, r2, r0 ldr r0, [r0] cmp r0, 0 - beq _08048BE4 - b _08048DF4 -_08048BE4: + beq @08048BE4 + b @08048DF4 +@08048BE4: movs r1, 0x1 mov r10, r1 - b _08048DF4 -_08048BEA: + b @08048DF4 +@08048BEA: movs r0, 0 str r0, [sp] movs r0, 0x13 @@ -125147,7 +125147,7 @@ _08048BEA: lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _08048C26 + bne @08048C26 str r0, [sp] movs r0, 0x13 movs r1, 0 @@ -125156,16 +125156,16 @@ _08048BEA: bl ability_something lsls r0, 24 cmp r0, 0 - bne _08048C26 + bne @08048C26 ldr r0, =0x020243cc ldrh r1, [r0] movs r0, 0x60 ands r0, r1 cmp r0, 0 - beq _08048C26 + beq @08048C26 movs r2, 0 str r2, [sp, 0x4] -_08048C26: +@08048C26: ldr r4, =0x02024084 ldr r0, =0x0202420e ldrb r3, [r0] @@ -125177,42 +125177,42 @@ _08048C26: adds r0, 0x21 ldrb r0, [r0] cmp r0, 0xF - bne _08048C40 - b _08048DF4 -_08048C40: + bne @08048C40 + b @08048DF4 +@08048C40: adds r0, r1, 0 adds r0, 0x22 ldrb r0, [r0] cmp r0, 0xF - bne _08048C4C - b _08048DF4 -_08048C4C: + bne @08048C4C + b @08048DF4 +@08048C4C: adds r0, r4, 0 adds r0, 0x4C adds r0, r2, r0 ldr r0, [r0] cmp r0, 0 - beq _08048C5A - b _08048DF4 -_08048C5A: + beq @08048C5A + b @08048DF4 +@08048C5A: ldr r4, [sp, 0x4] cmp r4, 0 - bne _08048C62 - b _08048DF4 -_08048C62: + bne @08048C62 + b @08048DF4 +@08048C62: adds r0, r1, 0 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x28 - bne _08048C6E - b _08048DF4 -_08048C6E: + bne @08048C6E + b @08048DF4 +@08048C6E: adds r0, r3, 0 bl b_cancel_multi_turn_move_maybe - b _08048DE4 + b @08048DE4 .align 2, 0 .pool -_08048C84: +@08048C84: mov r2, r9 ldrb r1, [r2] movs r0, 0x58 @@ -125222,13 +125222,13 @@ _08048C84: adds r0, 0x20 ldrb r2, [r0] cmp r2, 0x7 - bne _08048CF4 + bne @08048CF4 cmp r5, 0x1 - beq _08048CA2 + beq @08048CA2 cmp r6, 0x80 - beq _08048CA2 - b _08048DF4 -_08048CA2: + beq @08048CA2 + b @08048DF4 +@08048CA2: ldr r0, =0x0202420a strb r2, [r0] mov r4, r9 @@ -125247,28 +125247,28 @@ _08048CA2: lsls r0, 6 ands r0, r1 cmp r0, 0 - beq _08048CE8 + beq @08048CE8 movs r0, 0x1 ldr r3, =0x02024332 strb r0, [r3, 0x5] - b _08048A4C + b @08048A4C .align 2, 0 .pool -_08048CE8: +@08048CE8: ldr r4, =0x02024332 strb r0, [r4, 0x5] - bl _080499B2 + bl @080499B2 .align 2, 0 .pool -_08048CF4: +@08048CF4: mov r0, r8 adds r0, 0x4C adds r0, r1, r0 ldr r0, [r0] cmp r0, 0 - bne _08048DF4 - b _08048DE4 -_08048D02: + bne @08048DF4 + b @08048DE4 +@08048D02: mov r2, r9 ldrb r1, [r2] movs r0, 0x58 @@ -125277,21 +125277,21 @@ _08048D02: adds r0, 0x20 ldrb r1, [r0] cmp r1, 0x11 - bne _08048D2C + bne @08048D2C cmp r5, 0x1 - bne _08048D1A - b _08048A1A -_08048D1A: + bne @08048D1A + b @08048A1A +@08048D1A: cmp r6, 0x80 - bne _08048D2C - b _08048A1A -_08048D20: + bne @08048D2C + b @08048A1A +@08048D20: ldr r1, =0x02024332 strb r0, [r1, 0x5] - bl _080499B2 + bl @080499B2 .align 2, 0 .pool -_08048D2C: +@08048D2C: mov r2, r9 ldrb r0, [r2] movs r1, 0x58 @@ -125301,44 +125301,44 @@ _08048D2C: adds r1, 0x21 ldrb r1, [r1] cmp r1, 0x3 - beq _08048D50 + beq @08048D50 adds r0, 0x22 ldrb r0, [r0] cmp r0, 0x3 - beq _08048D50 + beq @08048D50 cmp r1, 0x8 - beq _08048D50 + beq @08048D50 cmp r0, 0x8 - bne _08048D94 -_08048D50: + bne @08048D94 +@08048D50: ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 lsls r1, 6 ands r0, r1 cmp r0, 0 - beq _08048D94 + beq @08048D94 cmp r5, 0x1 - beq _08048D66 + beq @08048D66 cmp r6, 0x80 - bne _08048D94 -_08048D66: + bne @08048D94 +@08048D66: ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r0, =0x082db5e9 -_08048D72: +@08048D72: str r0, [r4] ldr r1, =0x02024332 movs r2, 0 movs r0, 0x2 strb r0, [r1, 0x5] strb r2, [r1, 0x3] - bl _080499B8 + bl @080499B8 .align 2, 0 .pool -_08048D94: +@08048D94: mov r3, r9 ldrb r0, [r3] movs r6, 0x58 @@ -125348,27 +125348,27 @@ _08048D94: adds r5, r0, r2 ldr r4, [r5] cmp r4, 0 - bne _08048DF4 + bne @08048DF4 mov r3, r8 adds r1, r0, r3 adds r0, r1, 0 adds r0, 0x21 ldrb r3, [r0] cmp r3, 0x3 - beq _08048DEA + beq @08048DEA adds r0, 0x1 ldrb r0, [r0] cmp r0, 0x3 - beq _08048DEA + beq @08048DEA cmp r3, 0x8 - beq _08048DEA + beq @08048DEA cmp r0, 0x8 - beq _08048DEA + beq @08048DEA adds r0, r1, 0 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x11 - beq _08048DF4 + beq @08048DF4 mov r4, r9 ldrb r0, [r4] adds r1, r0, 0 @@ -125379,22 +125379,22 @@ _08048D94: negs r2, r2 ands r0, r2 str r0, [r1] -_08048DE4: +@08048DE4: movs r0, 0x1 mov r10, r0 - b _08048DF4 -_08048DEA: + b @08048DF4 +@08048DEA: ldr r0, =0x0202427c ldrb r1, [r0] movs r2, 0x8 orrs r1, r2 strb r1, [r0] -_08048DF4: +@08048DF4: mov r1, r10 cmp r1, 0x1 - beq _08048DFC - b _08048F1C -_08048DFC: + beq @08048DFC + b @08048F1C +@08048DFC: ldr r0, =0x02024214 ldr r0, [r0] adds r0, 0x1 @@ -125406,7 +125406,7 @@ _08048DFC: adds r0, r1 ldr r3, [r0] cmp r3, 0x7 - bne _08048E50 + bne @08048E50 bl GenerateRandomNumber ldr r2, =0x02024084 ldr r1, =0x0202420e @@ -125421,10 +125421,10 @@ _08048DFC: ldr r0, [r3] orrs r0, r1 str r0, [r3] - b _08048E64 + b @08048E64 .align 2, 0 .pool -_08048E50: +@08048E50: ldr r2, =0x02024084 ldr r0, =0x0202420e ldrb r1, [r0] @@ -125435,7 +125435,7 @@ _08048E50: ldr r0, [r1] orrs r0, r3 str r0, [r1] -_08048E64: +@08048E64: ldr r2, =0x02024214 ldr r1, =0x0831c224 ldr r5, =0x02024332 @@ -125467,30 +125467,30 @@ _08048E64: lsls r0, 6 ands r0, r1 cmp r0, 0 - beq _08048ED8 + beq @08048ED8 movs r0, 0x1 strb r0, [r5, 0x5] ldr r0, =0xffffdfff ands r1, r0 str r1, [r2] - b _08048EDA + b @08048EDA .align 2, 0 .pool -_08048ED8: +@08048ED8: strb r0, [r5, 0x5] -_08048EDA: +@08048EDA: ldr r0, =0x02024332 ldrb r2, [r0, 0x3] cmp r2, 0x2 - beq _08048EF2 + beq @08048EF2 cmp r2, 0x6 - beq _08048EF2 + beq @08048EF2 cmp r2, 0x5 - beq _08048EF2 + beq @08048EF2 cmp r2, 0x3 - beq _08048EF2 - bl _080499B8 -_08048EF2: + beq @08048EF2 + bl @080499B8 +@08048EF2: ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0xB2 @@ -125503,25 +125503,25 @@ _08048EF2: lsls r1, 7 orrs r0, r1 str r0, [r2] - bl _080499B8 + bl @080499B8 .align 2, 0 .pool -_08048F1C: +@08048F1C: mov r3, r10 cmp r3, 0 - beq _08048F26 - bl _080499B8 -_08048F26: + beq @08048F26 + bl @080499B8 +@08048F26: ldr r0, =0x02024332 strb r3, [r0, 0x3] ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] - bl _080499B8 + bl @080499B8 .align 2, 0 .pool -_08048F40: +@08048F40: mov r4, r9 ldrb r1, [r4] movs r0, 0x58 @@ -125538,77 +125538,77 @@ _08048F40: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _08048F66 - bl _08049994 -_08048F66: + beq @08048F66 + bl @08049994 +@08048F66: subs r0, r3, 0x7 cmp r0, 0x34 - bls _08048F70 - bl _080499B2 -_08048F70: + bls @08048F70 + bl @080499B2 +@08048F70: lsls r0, 2 - ldr r1, =_08048F88 + ldr r1, =@08048F88 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08048F88: - .4byte _0804905C - .4byte _080490D0 - .4byte _08049244 - .4byte _0804915C - .4byte _080491D8 - .4byte _0804927C - .4byte _080492C4 - .4byte _08049390 - .4byte _080493D4 - .4byte _080493D4 - .4byte _080493D4 - .4byte _080493D4 - .4byte _080493D4 - .4byte _080493D4 - .4byte _080493D4 - .4byte _0804941C - .4byte _0804941C - .4byte _0804941C - .4byte _0804941C - .4byte _0804941C - .4byte _0804941C - .4byte _0804941C - .4byte _080494FC - .4byte _08049544 - .4byte _08049564 - .4byte _08049720 - .4byte _0804975C - .4byte _08049778 - .4byte _08049790 - .4byte _080497A8 - .4byte _08049808 - .4byte _08049820 - .4byte _08049468 - .4byte _08049468 - .4byte _08049468 - .4byte _08049468 - .4byte _08049468 - .4byte _08049468 - .4byte _08049468 - .4byte _080494B0 - .4byte _080494B0 - .4byte _080494B0 - .4byte _080494B0 - .4byte _080494B0 - .4byte _080494B0 - .4byte _080494B0 - .4byte _08049864 - .4byte _080498C0 - .4byte _080499B2 - .4byte _080499B2 - .4byte _080499B2 - .4byte _080499B2 - .4byte _080499A4 -_0804905C: +@08048F88: + .4byte @0804905C + .4byte @080490D0 + .4byte @08049244 + .4byte @0804915C + .4byte @080491D8 + .4byte @0804927C + .4byte @080492C4 + .4byte @08049390 + .4byte @080493D4 + .4byte @080493D4 + .4byte @080493D4 + .4byte @080493D4 + .4byte @080493D4 + .4byte @080493D4 + .4byte @080493D4 + .4byte @0804941C + .4byte @0804941C + .4byte @0804941C + .4byte @0804941C + .4byte @0804941C + .4byte @0804941C + .4byte @0804941C + .4byte @080494FC + .4byte @08049544 + .4byte @08049564 + .4byte @08049720 + .4byte @0804975C + .4byte @08049778 + .4byte @08049790 + .4byte @080497A8 + .4byte @08049808 + .4byte @08049820 + .4byte @08049468 + .4byte @08049468 + .4byte @08049468 + .4byte @08049468 + .4byte @08049468 + .4byte @08049468 + .4byte @08049468 + .4byte @080494B0 + .4byte @080494B0 + .4byte @080494B0 + .4byte @080494B0 + .4byte @080494B0 + .4byte @080494B0 + .4byte @080494B0 + .4byte @08049864 + .4byte @080498C0 + .4byte @080499B2 + .4byte @080499B2 + .4byte @080499B2 + .4byte @080499B2 + .4byte @080499A4 +@0804905C: mov r1, r9 ldrb r0, [r1] movs r5, 0x58 @@ -125619,9 +125619,9 @@ _0804905C: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x14 - bne _08049076 - bl _08049994 -_08049076: + bne @08049076 + bl @08049994 +@08049076: mov r4, r8 adds r4, 0x50 adds r0, r1, r4 @@ -125629,9 +125629,9 @@ _08049076: movs r1, 0x7 ands r0, r1 cmp r0, 0 - beq _0804908A - bl _08049994 -_0804908A: + beq @0804908A + bl @08049994 +@0804908A: bl GenerateRandomNumber mov r3, r9 ldrb r1, [r3] @@ -125657,10 +125657,10 @@ _0804908A: lsls r0, 2 adds r0, r1 ldr r0, [r0] - bl _080499B0 + bl @080499B0 .align 2, 0 .pool -_080490D0: +@080490D0: mov r4, r9 ldrb r2, [r4] movs r4, 0x58 @@ -125670,13 +125670,13 @@ _080490D0: adds r0, 0x20 ldrb r1, [r0] cmp r1, 0x27 - bne _08049114 + bne @08049114 cmp r5, 0x1 - beq _080490F0 + beq @080490F0 cmp r6, 0x80 - beq _080490F0 - bl _08049994 -_080490F0: + beq @080490F0 + bl @08049994 +@080490F0: ldr r0, =0x0202420a strb r1, [r0] mov r1, r9 @@ -125686,10 +125686,10 @@ _080490F0: ldr r1, =0x02024214 ldr r0, =0x082db603 str r0, [r1] - bl _080499B2 + bl @080499B2 .align 2, 0 .pool -_08049114: +@08049114: adds r0, r2, 0 bl sub_8048728 ldr r1, =0x02024082 @@ -125697,9 +125697,9 @@ _08049114: lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bhi _0804912A - bl _08049994 -_0804912A: + bhi @0804912A + bl @08049994 +@0804912A: mov r2, r9 ldrb r0, [r2] adds r2, r0, 0 @@ -125716,10 +125716,10 @@ _0804912A: ldr r0, [r0] orrs r1, r0 str r1, [r2] - bl _08049994 + bl @08049994 .align 2, 0 .pool -_0804915C: +@0804915C: mov r3, r9 ldrb r0, [r3] movs r5, 0x58 @@ -125731,9 +125731,9 @@ _0804915C: movs r0, 0x70 ands r0, r1 cmp r0, 0 - beq _08049178 - bl _08049994 -_08049178: + beq @08049178 + bl @08049994 +@08049178: movs r0, 0x80 lsls r0, 5 orrs r1, r0 @@ -125768,17 +125768,17 @@ _08049178: lsls r0, 2 adds r0, r1 ldr r0, [r0] - bl _080499B0 + bl @080499B0 .align 2, 0 .pool -_080491D8: +@080491D8: ldr r5, =0x0202420b ldrb r0, [r5] bl battle_get_per_side_status movs r1, 0x1 ands r1, r0 cmp r1, 0 - bne _08049210 + bne @08049210 ldr r4, =0x0202432e ldrh r3, [r4] ldr r2, =0x02024084 @@ -125795,11 +125795,11 @@ _080491D8: lsls r0, 16 lsrs r0, 16 cmp r3, r0 - bls _08049210 + bls @08049210 ldr r3, =0x0000ffff adds r0, r3, 0 strh r0, [r4] -_08049210: +@08049210: ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 @@ -125810,10 +125810,10 @@ _08049210: lsls r0, 2 adds r0, r1 ldr r0, [r0] - b _080499B0 + b @080499B0 .align 2, 0 .pool -_08049244: +@08049244: mov r4, r9 ldrb r1, [r4] movs r0, 0x58 @@ -125823,9 +125823,9 @@ _08049244: adds r0, r1 ldr r0, [r0] cmp r0, 0 - beq _0804925A - b _08049994 -_0804925A: + beq @0804925A + b @08049994 +@0804925A: bl GenerateRandomNumber ldr r4, =0x02024332 lsls r0, 16 @@ -125837,10 +125837,10 @@ _0804925A: movs r0, 0 movs r1, 0 bl sub_8048760 - b _080499B2 + b @080499B2 .align 2, 0 .pool -_0804927C: +@0804927C: mov r0, r9 ldrb r1, [r0] movs r0, 0x58 @@ -125870,10 +125870,10 @@ _0804927C: movs r2, 0x4 orrs r0, r2 strb r0, [r1, 0x1] - b _08049994 + b @08049994 .align 2, 0 .pool -_080492C4: +@080492C4: mov r3, r9 ldrb r0, [r3] movs r6, 0x58 @@ -125886,9 +125886,9 @@ _080492C4: lsls r0, 8 ands r5, r0 cmp r5, 0 - beq _080492E0 - b _08049994 -_080492E0: + beq @080492E0 + b @08049994 +@080492E0: bl GenerateRandomNumber mov r2, r9 ldrb r1, [r2] @@ -125940,46 +125940,46 @@ _080492E0: ldrh r0, [r3] ldrh r4, [r6] cmp r0, r4 - bne _0804934E - b _080499B2 -_0804934E: + bne @0804934E + b @080499B2 +@0804934E: adds r1, r2, 0 adds r2, r6, 0 -_08049352: +@08049352: ldrb r0, [r1, 0x5] adds r0, 0x1 strb r0, [r1, 0x5] lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bls _08049362 - b _080499B2 -_08049362: + bls @08049362 + b @080499B2 +@08049362: ldrb r0, [r1, 0x5] lsls r0, 1 adds r0, r3 ldrh r0, [r0] ldrh r4, [r2] cmp r0, r4 - bne _08049352 - b _080499B2 + bne @08049352 + b @080499B2 .align 2, 0 .pool -_08049390: +@08049390: ldr r1, =0x020241f0 ldr r0, =0x020241f4 ldr r0, [r0] cmp r0, 0 - bge _0804939C + bge @0804939C adds r0, 0x3 -_0804939C: +@0804939C: asrs r0, 2 str r0, [r1] cmp r0, 0 - bne _080493A8 + bne @080493A8 movs r0, 0x1 str r0, [r1] -_080493A8: +@080493A8: ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 @@ -125990,10 +125990,10 @@ _080493A8: lsls r0, 2 adds r0, r1 ldr r0, [r0] - b _080499B0 + b @080499B0 .align 2, 0 .pool -_080493D4: +@080493D4: ldr r4, =0x02024332 ldrb r1, [r4, 0x3] adds r1, 0xF2 @@ -126006,9 +126006,9 @@ _080493D4: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq _080493F2 - b _08049994 -_080493F2: + beq @080493F2 + b @08049994 +@080493F2: ldr r2, =0x02024474 ldrb r1, [r4, 0x3] movs r0, 0x3F @@ -126020,10 +126020,10 @@ _080493F2: adds r0, 0x1 bl b_movescr_stack_push ldr r0, =0x082d8cd4 - b _080499B0 + b @080499B0 .align 2, 0 .pool -_0804941C: +@0804941C: movs r0, 0x70 negs r0, r0 ldr r4, =0x02024332 @@ -126037,9 +126037,9 @@ _0804941C: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq _0804943C - b _08049994 -_0804943C: + beq @0804943C + b @08049994 +@0804943C: ldr r2, =0x02024474 ldrb r1, [r4, 0x3] movs r0, 0x3F @@ -126051,10 +126051,10 @@ _0804943C: adds r0, 0x1 bl b_movescr_stack_push ldr r0, =0x082d8d65 - b _080499B0 + b @080499B0 .align 2, 0 .pool -_08049468: +@08049468: ldr r4, =0x02024332 ldrb r1, [r4, 0x3] adds r1, 0xDA @@ -126067,9 +126067,9 @@ _08049468: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq _08049486 - b _08049994 -_08049486: + beq @08049486 + b @08049994 +@08049486: ldr r2, =0x02024474 ldrb r1, [r4, 0x3] movs r0, 0x3F @@ -126081,10 +126081,10 @@ _08049486: adds r0, 0x1 bl b_movescr_stack_push ldr r0, =0x082d8cd4 - b _080499B0 + b @080499B0 .align 2, 0 .pool -_080494B0: +@080494B0: movs r0, 0x60 negs r0, r0 ldr r4, =0x02024332 @@ -126098,9 +126098,9 @@ _080494B0: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq _080494D0 - b _08049994 -_080494D0: + beq @080494D0 + b @08049994 +@080494D0: ldr r2, =0x02024474 ldrb r1, [r4, 0x3] movs r0, 0x3F @@ -126112,10 +126112,10 @@ _080494D0: adds r0, 0x1 bl b_movescr_stack_push ldr r0, =0x082d8d65 - b _080499B0 + b @080499B0 .align 2, 0 .pool -_080494FC: +@080494FC: mov r0, r9 ldrb r1, [r0] movs r0, 0x58 @@ -126145,10 +126145,10 @@ _080494FC: ldr r1, =0x020241ea ldrh r1, [r1] strh r1, [r0] - b _08049994 + b @08049994 .align 2, 0 .pool -_08049544: +@08049544: ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0x58 @@ -126160,22 +126160,22 @@ _08049544: ldr r0, [r2] movs r1, 0x80 lsls r1, 16 -_0804955A: +@0804955A: orrs r0, r1 str r0, [r2] - b _08049994 + b @08049994 .align 2, 0 .pool -_08049564: +@08049564: ldr r5, =0x02022fec ldr r0, [r5] movs r1, 0x80 lsls r1, 19 ands r0, r1 cmp r0, 0 - beq _08049574 - b _08049994 -_08049574: + beq @08049574 + b @08049994 +@08049574: ldr r6, =0x0202420b ldrb r0, [r6] bl battle_side_get_owner @@ -126186,21 +126186,21 @@ _08049574: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080495A8 + bne @080495A8 ldr r0, [r5] ldr r1, =0x0a3f0902 ands r0, r1 cmp r0, 0 - bne _080495D4 - b _08049994 + bne @080495D4 + b @08049994 .align 2, 0 .pool -_080495A8: +@080495A8: ldr r0, [r5] ldr r1, =0x0a3f0902 ands r0, r1 cmp r0, 0 - bne _080495D4 + bne @080495D4 ldr r0, =0x020243d0 adds r0, 0x29 adds r0, r4, r0 @@ -126216,9 +126216,9 @@ _080495A8: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _080495D4 - b _08049994 -_080495D4: + beq @080495D4 + b @08049994 +@080495D4: ldr r2, =0x02024084 ldr r1, =0x0202420c ldrb r0, [r1] @@ -126229,12 +126229,12 @@ _080495D4: adds r7, r1, 0 mov r8, r2 cmp r0, 0 - beq _0804963C + beq @0804963C adds r0, r4, 0 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x3C - bne _0804963C + bne @0804963C bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =0x082db682 @@ -126249,10 +126249,10 @@ _080495D4: ldrb r0, [r7] ldrb r1, [r1] bl b_history__record_ability_usage_of_player - b _080499B2 + b @080499B2 .align 2, 0 .pool -_0804963C: +@0804963C: ldr r4, =0x0202420b mov r10, r4 ldrb r2, [r4] @@ -126263,9 +126263,9 @@ _0804963C: add r0, r8 ldrh r4, [r0, 0x2E] cmp r4, 0 - beq _08049654 - b _08049994 -_08049654: + beq @08049654 + b @08049994 +@08049654: ldrb r0, [r7] mov r1, r9 muls r1, r0 @@ -126274,21 +126274,21 @@ _08049654: ldrh r3, [r0, 0x2E] adds r1, r3, 0 cmp r1, 0xAF - bne _08049668 - b _08049994 -_08049668: + bne @08049668 + b @08049994 +@08049668: adds r0, r3, 0 subs r0, 0x79 lsls r0, 16 lsrs r0, 16 cmp r0, 0xB - bhi _08049676 - b _08049994 -_08049676: + bhi @08049676 + b @08049994 +@08049676: cmp r1, 0 - bne _0804967C - b _08049994 -_0804967C: + bne @0804967C + b @08049994 +@0804967C: ldr r5, =0x0202449c lsls r0, r2, 1 adds r0, 0xD0 @@ -126352,10 +126352,10 @@ _0804967C: adds r0, r1 adds r0, 0xC9 strb r6, [r0] - b _080499B2 + b @080499B2 .align 2, 0 .pool -_08049720: +@08049720: ldr r3, =0x0202420c ldrb r1, [r3] movs r0, 0x58 @@ -126378,10 +126378,10 @@ _08049720: ldr r1, =0x0202420b ldrb r1, [r1] strb r1, [r0, 0x14] - b _08049994 + b @08049994 .align 2, 0 .pool -_0804975C: +@0804975C: ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0x58 @@ -126393,28 +126393,28 @@ _0804975C: ldr r0, [r2] movs r1, 0x80 lsls r1, 20 - b _0804955A + b @0804955A .align 2, 0 .pool -_08049778: +@08049778: ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r0, =0x082daf27 - b _080499B0 + b @080499B0 .align 2, 0 .pool -_08049790: +@08049790: ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r0, =0x082dafc3 - b _080499B0 + b @080499B0 .align 2, 0 .pool -_080497A8: +@080497A8: ldr r6, =0x0202420c ldrb r0, [r6] movs r2, 0x58 @@ -126426,9 +126426,9 @@ _080497A8: movs r0, 0x40 ands r0, r4 cmp r0, 0 - bne _080497C2 - b _08049994 -_080497C2: + bne @080497C2 + b @08049994 +@080497C2: movs r0, 0x41 negs r0, r0 ands r4, r0 @@ -126452,19 +126452,19 @@ _080497C2: adds r0, 0x1 bl b_movescr_stack_push ldr r0, =0x082db361 - b _080499B0 + b @080499B0 .align 2, 0 .pool -_08049808: +@08049808: ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r0, =0x082db117 - b _080499B0 + b @080499B0 .align 2, 0 .pool -_08049820: +@08049820: ldr r4, =0x020241f0 ldr r0, =0x020241f4 ldr r0, [r0] @@ -126472,10 +126472,10 @@ _08049820: bl __divsi3 str r0, [r4] cmp r0, 0 - bne _08049836 + bne @08049836 movs r0, 0x1 str r0, [r4] -_08049836: +@08049836: ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 @@ -126486,10 +126486,10 @@ _08049836: lsls r0, 2 adds r0, r1 ldr r0, [r0] - b _080499B0 + b @080499B0 .align 2, 0 .pool -_08049864: +@08049864: mov r4, r9 ldrb r0, [r4] movs r5, 0x58 @@ -126502,9 +126502,9 @@ _08049864: lsls r0, 4 ands r0, r1 cmp r0, 0 - beq _08049880 - b _08049994 -_08049880: + beq @08049880 + b @08049994 +@08049880: movs r0, 0x80 lsls r0, 5 orrs r1, r0 @@ -126530,10 +126530,10 @@ _08049880: ldr r0, [r2] orrs r0, r1 str r0, [r2] - b _080499B2 + b @080499B2 .align 2, 0 .pool -_080498C0: +@080498C0: mov r4, r9 ldrb r3, [r4] movs r5, 0x58 @@ -126545,10 +126545,10 @@ _080498C0: adds r0, 0x20 ldrb r2, [r0] cmp r2, 0x3C - bne _08049900 + bne @08049900 ldrh r0, [r1, 0x2E] cmp r0, 0 - beq _08049994 + beq @08049994 ldr r0, =0x0202420a strb r2, [r0] ldr r1, =0x02024214 @@ -126557,13 +126557,13 @@ _080498C0: ldrb r0, [r4] movs r1, 0x3C bl b_history__record_ability_usage_of_player - b _080499B2 + b @080499B2 .align 2, 0 .pool -_08049900: +@08049900: ldrh r0, [r1, 0x2E] cmp r0, 0 - beq _08049994 + beq @08049994 adds r0, r3, 0 bl battle_side_get_owner lsls r0, 24 @@ -126618,30 +126618,30 @@ _08049900: adds r0, r1 adds r0, 0xC9 strb r5, [r0] - b _080499B2 + b @080499B2 .align 2, 0 .pool -_08049994: +@08049994: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] - b _080499B2 + b @080499B2 .align 2, 0 .pool -_080499A4: +@080499A4: ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r0, =0x082db1d5 -_080499B0: +@080499B0: str r0, [r4] -_080499B2: +@080499B2: ldr r1, =0x02024332 movs r0, 0 strb r0, [r1, 0x3] -_080499B8: +@080499B8: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -126655,7 +126655,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 @@ -126666,7 +126666,7 @@ atk15_seteffectwithchancetarget: @ 80499D4 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x20 - bne _08049A10 + bne @08049A10 ldr r2, =0x0831c898 ldr r0, =0x020241ea ldrh r1, [r0] @@ -126676,10 +126676,10 @@ atk15_seteffectwithchancetarget: @ 80499D4 adds r0, r2 ldrb r0, [r0, 0x5] lsls r4, r0, 1 - b _08049A20 + b @08049A20 .align 2, 0 .pool -_08049A10: +@08049A10: ldr r2, =0x0831c898 ldr r0, =0x020241ea ldrh r1, [r0] @@ -126688,26 +126688,26 @@ _08049A10: lsls r0, 2 adds r0, r2 ldrb r4, [r0, 0x5] -_08049A20: +@08049A20: ldr r3, =0x02024332 ldrb r2, [r3, 0x3] movs r0, 0x80 ands r0, r2 cmp r0, 0 - beq _08049A50 + beq @08049A50 ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 - bne _08049A50 + bne @08049A50 movs r0, 0x7F ands r0, r2 strb r0, [r3, 0x3] - b _08049A7E + b @08049A7E .align 2, 0 .pool -_08049A50: +@08049A50: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -126716,37 +126716,37 @@ _08049A50: lsls r0, 16 lsrs r0, 16 cmp r0, r4 - bcs _08049A9A + bcs @08049A9A ldr r0, =0x02024332 ldrb r0, [r0, 0x3] cmp r0, 0 - beq _08049A9A + beq @08049A9A ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 - bne _08049A9A + bne @08049A9A cmp r4, 0x63 - bls _08049A90 -_08049A7E: + bls @08049A90 +@08049A7E: movs r0, 0 movs r1, 0x80 bl sub_8048760 - b _08049AA2 + b @08049AA2 .align 2, 0 .pool -_08049A90: +@08049A90: movs r0, 0 movs r1, 0 bl sub_8048760 - b _08049AA2 -_08049A9A: + b @08049AA2 +@08049A9A: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] -_08049AA2: +@08049AA2: ldr r0, =0x02024332 movs r1, 0 strb r1, [r0, 0x3] @@ -126760,7 +126760,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 @@ -126770,7 +126770,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 @@ -126780,7 +126780,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] @@ -126791,22 +126791,22 @@ sub_8049AE0: @ 8049AE0 ldr r3, =0x02024332 ldrb r0, [r3, 0x3] cmp r0, 0x6 - bhi _08049B14 + bhi @08049B14 ldr r1, =0x02024084 ldrb r2, [r2] movs r0, 0x58 muls r2, r0 adds r1, 0x4C - b _08049B1E + b @08049B1E .align 2, 0 .pool -_08049B14: +@08049B14: ldr r1, =0x02024084 ldrb r2, [r2] movs r0, 0x58 muls r2, r0 adds r1, 0x50 -_08049B1E: +@08049B1E: adds r2, r1 ldr r1, =0x0831c134 ldrb r0, [r3, 0x3] @@ -126832,7 +126832,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 @@ -126843,7 +126843,7 @@ atk19_faintpokemon: @ 8049B5C ldrb r1, [r2, 0x2] adds r6, r0, 0 cmp r1, 0 - beq _08049BE0 + beq @08049BE0 ldrb r0, [r2, 0x1] bl get_battle_side_of_something ldr r5, =0x02024064 @@ -126858,9 +126858,9 @@ atk19_faintpokemon: @ 8049B5C ldr r0, [r2] ands r0, r1 cmp r0, 0 - bne _08049B94 - b _08049E2C -_08049B94: + bne @08049B94 + b @08049E2C +@08049B94: ldr r1, [r6] ldrb r4, [r1, 0x3] ldrb r0, [r1, 0x4] @@ -126884,13 +126884,13 @@ _08049B94: ldr r1, =0x0000fdff ands r1, r2 strh r1, [r0] - b _08049E32 + b @08049E32 .align 2, 0 .pool -_08049BE0: +@08049BE0: ldrb r0, [r2, 0x1] cmp r0, 0x1 - bne _08049C08 + bne @08049C08 ldr r1, =0x02024064 ldr r0, =0x0202420b ldrb r0, [r0] @@ -126899,10 +126899,10 @@ _08049BE0: ldrb r0, [r0] mov r9, r0 ldr r4, =0x082da7aa - b _08049C18 + b @08049C18 .align 2, 0 .pool -_08049C08: +@08049C08: ldr r1, =0x02024064 ldr r0, =0x0202420c ldrb r0, [r0] @@ -126911,7 +126911,7 @@ _08049C08: ldrb r0, [r0] mov r9, r0 ldr r4, =0x082da7b7 -_08049C18: +@08049C18: mov r8, r1 ldr r0, =0x02024210 ldrb r1, [r0] @@ -126923,18 +126923,18 @@ _08049C18: ldr r2, [r0] ands r1, r2 cmp r1, 0 - beq _08049C32 - b _08049E2C -_08049C32: + beq @08049C32 + b @08049E2C +@08049C32: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r3 adds r0, r1 ldrh r0, [r0, 0x28] cmp r0, 0 - beq _08049C42 - b _08049E2C -_08049C42: + beq @08049C42 + b @08049E2C +@08049C42: ldr r5, =0x02024280 lsls r1, r2, 28 ldr r0, [r5] @@ -126948,7 +126948,7 @@ _08049C42: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08049CA4 + bne @08049CA4 ldr r0, [r5] movs r1, 0x80 lsls r1, 15 @@ -126957,23 +126957,23 @@ _08049C42: ldr r1, =0x03005d10 ldrb r0, [r1] cmp r0, 0xFE - bhi _08049C78 + bhi @08049C78 adds r0, 0x1 strb r0, [r1] -_08049C78: +@08049C78: ldrb r0, [r7] bl sub_80570F4 - b _08049CCE + b @08049CCE .align 2, 0 .pool -_08049CA4: +@08049CA4: ldr r4, =0x03005d10 ldrb r0, [r4, 0x1] cmp r0, 0xFE - bhi _08049CB0 + bhi @08049CB0 adds r0, 0x1 strb r0, [r4, 0x1] -_08049CB0: +@08049CB0: ldr r1, =0x0202406e mov r2, r8 ldrb r0, [r2] @@ -126988,13 +126988,13 @@ _08049CB0: movs r2, 0 bl pokemon_getattr strh r0, [r4, 0x20] -_08049CCE: +@08049CCE: ldr r2, =0x02024280 ldr r1, [r2] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _08049D0C + beq @08049D0C ldr r6, =0x02024084 ldr r0, =0x0202420b ldrb r0, [r0] @@ -127003,7 +127003,7 @@ _08049CCE: adds r0, r6 ldrh r0, [r0, 0x28] cmp r0, 0 - beq _08049D0C + beq @08049D0C movs r0, 0x41 negs r0, r0 ands r1, r0 @@ -127019,7 +127019,7 @@ _08049CCE: str r0, [r1] ldr r0, =0x082dae3e str r0, [r4] -_08049D0C: +@08049D0C: ldr r1, =0x020242ac ldr r6, =0x0202420c ldrb r0, [r6] @@ -127030,18 +127030,18 @@ _08049D0C: lsls r1, 7 ands r0, r1 cmp r0, 0 - bne _08049D24 - b _08049E32 -_08049D24: + bne @08049D24 + b @08049E32 +@08049D24: ldr r0, =0x02024280 ldr r5, [r0] movs r0, 0x80 lsls r0, 17 ands r5, r0 cmp r5, 0 - beq _08049D34 - b _08049E32 -_08049D34: + beq @08049D34 + b @08049E32 +@08049D34: ldr r3, =0x0202420b mov r8, r3 ldrb r0, [r3] @@ -127052,7 +127052,7 @@ _08049D34: lsls r4, 24 lsls r0, 24 cmp r4, r0 - beq _08049E32 + beq @08049E32 ldr r0, =0x02024084 mov r9, r0 mov r2, r8 @@ -127063,11 +127063,11 @@ _08049D34: adds r0, r2, r0 ldrh r0, [r0, 0x28] cmp r0, 0 - beq _08049E32 + beq @08049E32 ldr r0, =0x020241ea ldrh r0, [r0] cmp r0, 0xA5 - beq _08049E32 + beq @08049E32 ldr r0, =0x0202449c ldr r0, [r0] adds r0, r1, r0 @@ -127127,14 +127127,14 @@ _08049D34: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - b _08049E32 + b @08049E32 .align 2, 0 .pool -_08049E2C: +@08049E2C: ldr r0, [r6] adds r0, 0x7 str r0, [r6] -_08049E32: +@08049E32: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -127145,12 +127145,12 @@ _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] cmp r0, 0 - bne _08049E6A + bne @08049E6A ldr r5, =0x02024214 ldr r0, [r5] ldrb r0, [r0, 0x1] @@ -127164,7 +127164,7 @@ sub_8049E40: @ 8049E40 ldr r0, [r5] adds r0, 0x2 str r0, [r5] -_08049E6A: +@08049E6A: pop {r4,r5} pop {r0} bx r0 @@ -127173,13 +127173,13 @@ _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 ldr r5, [r0] cmp r5, 0 - bne _08049EE8 + bne @08049EE8 ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] @@ -127192,7 +127192,7 @@ sub_8049E7C: @ 8049E7C lsls r1, 11 ands r0, r1 cmp r0, 0 - beq _08049EB4 + beq @08049EB4 ldr r2, =0x02024084 ldrb r1, [r4] movs r0, 0x58 @@ -127200,8 +127200,8 @@ sub_8049E7C: @ 8049E7C adds r0, r2 ldrh r0, [r0, 0x28] cmp r0, 0 - bne _08049EDC -_08049EB4: + bne @08049EDC +@08049EB4: ldr r1, =0x02024084 ldrb r0, [r4] movs r2, 0x58 @@ -127220,13 +127220,13 @@ _08049EB4: bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_08049EDC: +@08049EDC: bl sub_803A75C ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x2 str r0, [r1] -_08049EE8: +@08049EE8: add sp, 0x4 pop {r4,r5} pop {r0} @@ -127236,7 +127236,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] @@ -127274,21 +127274,21 @@ atk1C_jumpifstatus: @ 8049F04 ldr r0, [r0] ands r0, r4 cmp r0, 0 - beq _08049F68 + beq @08049F68 adds r0, r1, r2 ldrh r0, [r0, 0x28] cmp r0, 0 - beq _08049F68 + beq @08049F68 str r3, [r5] - b _08049F70 + b @08049F70 .align 2, 0 .pool -_08049F68: +@08049F68: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0xA str r0, [r1] -_08049F70: +@08049F70: pop {r4,r5} pop {r0} bx r0 @@ -127297,7 +127297,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] @@ -127335,21 +127335,21 @@ atk1D_jumpifsecondarystatus: @ 8049F7C ldr r0, [r0] ands r0, r4 cmp r0, 0 - beq _08049FE0 + beq @08049FE0 adds r0, r1, r2 ldrh r0, [r0, 0x28] cmp r0, 0 - beq _08049FE0 + beq @08049FE0 str r3, [r5] - b _08049FE8 + b @08049FE8 .align 2, 0 .pool -_08049FE0: +@08049FE0: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0xA str r0, [r1] -_08049FE8: +@08049FE8: pop {r4,r5} pop {r0} bx r0 @@ -127358,7 +127358,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} @@ -127379,7 +127379,7 @@ atk1E_jumpifability: @ 8049FF4 adds r7, r1, r0 ldrb r0, [r2, 0x1] cmp r0, 0x8 - bne _0804A054 + bne @0804A054 ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0 @@ -127391,7 +127391,7 @@ atk1E_jumpifability: @ 8049FF4 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq _0804A0C8 + beq @0804A0C8 ldr r1, =0x0202420a strb r5, [r1] str r7, [r6] @@ -127399,12 +127399,12 @@ atk1E_jumpifability: @ 8049FF4 lsls r0, r4, 24 lsrs r0, 24 ldrb r1, [r1] - b _0804A0B0 + b @0804A0B0 .align 2, 0 .pool -_0804A054: +@0804A054: cmp r0, 0x9 - bne _0804A08C + bne @0804A08C ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0 @@ -127416,7 +127416,7 @@ _0804A054: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq _0804A0C8 + beq @0804A0C8 ldr r1, =0x0202420a strb r5, [r1] str r7, [r6] @@ -127424,10 +127424,10 @@ _0804A054: lsls r0, r4, 24 lsrs r0, 24 ldrb r1, [r1] - b _0804A0B0 + b @0804A0B0 .align 2, 0 .pool -_0804A08C: +@0804A08C: ldrb r0, [r2, 0x1] bl get_battle_side_of_something lsls r0, 24 @@ -127439,24 +127439,24 @@ _0804A08C: adds r0, 0x20 ldrb r1, [r0] cmp r1, r8 - bne _0804A0C8 + bne @0804A0C8 ldr r0, =0x0202420a strb r1, [r0] str r7, [r6] ldrb r1, [r0] adds r0, r4, 0 -_0804A0B0: +@0804A0B0: bl b_history__record_ability_usage_of_player ldr r0, =0x02024474 strb r4, [r0, 0x15] - b _0804A0CE + b @0804A0CE .align 2, 0 .pool -_0804A0C8: +@0804A0C8: ldr r0, [r6] adds r0, 0x7 str r0, [r6] -_0804A0CE: +@0804A0CE: add sp, 0x4 pop {r3} mov r8, r3 @@ -127466,25 +127466,25 @@ _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] ldrb r4, [r0, 0x1] cmp r4, 0x1 - bne _0804A0FC + bne @0804A0FC ldr r0, =0x0202420b ldrb r0, [r0] bl battle_get_per_side_status - b _0804A106 + b @0804A106 .align 2, 0 .pool -_0804A0FC: +@0804A0FC: ldr r0, =0x0202420c ldrb r0, [r0] bl battle_get_per_side_status movs r4, 0x1 -_0804A106: +@0804A106: ands r4, r0 ldr r6, =0x02024214 ldr r3, [r6] @@ -127508,23 +127508,23 @@ _0804A106: ldrh r0, [r0] ands r2, r0 cmp r2, 0 - beq _0804A148 + beq @0804A148 str r5, [r6] - b _0804A14E + b @0804A14E .align 2, 0 .pool -_0804A148: +@0804A148: adds r0, r3, 0 adds r0, 0x8 str r0, [r6] -_0804A14E: +@0804A14E: pop {r4-r6} pop {r0} bx r0 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 @@ -127544,82 +127544,82 @@ sub_804A154: @ 804A154 ldrb r2, [r0] ldrb r0, [r3, 0x2] cmp r0, 0x5 - bhi _0804A212 + bhi @0804A212 lsls r0, 2 - ldr r1, =_0804A194 + ldr r1, =@0804A194 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0804A194: - .4byte _0804A1AC - .4byte _0804A1BC - .4byte _0804A1CC - .4byte _0804A1DC - .4byte _0804A1EC - .4byte _0804A200 -_0804A1AC: +@0804A194: + .4byte @0804A1AC + .4byte @0804A1BC + .4byte @0804A1CC + .4byte @0804A1DC + .4byte @0804A1EC + .4byte @0804A200 +@0804A1AC: ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r2, r0 - bne _0804A212 - b _0804A20C + bne @0804A212 + b @0804A20C .align 2, 0 .pool -_0804A1BC: +@0804A1BC: ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r2, r0 - beq _0804A212 - b _0804A20C + beq @0804A212 + b @0804A20C .align 2, 0 .pool -_0804A1CC: +@0804A1CC: ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r2, r0 - bls _0804A212 - b _0804A20C + bls @0804A212 + b @0804A20C .align 2, 0 .pool -_0804A1DC: +@0804A1DC: ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r2, r0 - bcs _0804A212 - b _0804A20C + bcs @0804A212 + b @0804A20C .align 2, 0 .pool -_0804A1EC: +@0804A1EC: ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x4] ands r2, r0 cmp r2, 0 - beq _0804A212 - b _0804A20C + beq @0804A212 + b @0804A20C .align 2, 0 .pool -_0804A200: +@0804A200: ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x4] ands r2, r0 cmp r2, 0 - bne _0804A212 -_0804A20C: + bne @0804A212 +@0804A20C: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_0804A212: +@0804A212: cmp r5, 0 - beq _0804A238 + beq @0804A238 ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x5] @@ -127633,15 +127633,15 @@ _0804A212: lsls r0, 24 adds r1, r0 str r1, [r3] - b _0804A240 + b @0804A240 .align 2, 0 .pool -_0804A238: +@0804A238: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x9 str r0, [r1] -_0804A240: +@0804A240: pop {r4,r5} pop {r0} bx r0 @@ -127650,7 +127650,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] @@ -127681,7 +127681,7 @@ atk21_jumpifspecialstatusflag: @ 804A24C adds r3, r1, r0 ldrb r0, [r2, 0x6] cmp r0, 0 - beq _0804A2AC + beq @0804A2AC ldr r0, =0x020242ac ldrb r1, [r5] lsls r1, 2 @@ -127689,11 +127689,11 @@ atk21_jumpifspecialstatusflag: @ 804A24C ldr r0, [r1] ands r0, r6 cmp r0, 0 - bne _0804A2C4 - b _0804A2BC + bne @0804A2C4 + b @0804A2BC .align 2, 0 .pool -_0804A2AC: +@0804A2AC: ldr r0, =0x020242ac ldrb r1, [r5] lsls r1, 2 @@ -127701,24 +127701,24 @@ _0804A2AC: ldr r0, [r1] ands r0, r6 cmp r0, 0 - beq _0804A2C4 -_0804A2BC: + beq @0804A2C4 +@0804A2BC: str r3, [r4] - b _0804A2CA + b @0804A2CA .align 2, 0 .pool -_0804A2C4: +@0804A2C4: adds r0, r2, 0 adds r0, 0xB str r0, [r4] -_0804A2CA: +@0804A2CA: pop {r4-r6} pop {r0} bx r0 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] @@ -127746,28 +127746,28 @@ sub_804A2D0: @ 804A2D0 adds r0, 0x21 ldrb r0, [r0] cmp r0, r5 - beq _0804A314 + beq @0804A314 adds r0, r1, 0 adds r0, 0x22 ldrb r0, [r0] cmp r0, r5 - bne _0804A320 -_0804A314: + bne @0804A320 +@0804A314: str r6, [r4] - b _0804A324 + b @0804A324 .align 2, 0 .pool -_0804A320: +@0804A320: adds r0, r3, 0x7 str r0, [r4] -_0804A324: +@0804A324: pop {r4-r6} pop {r0} bx r0 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 @@ -127794,43 +127794,43 @@ sub_804A32C: @ 804A32C ldr r0, =0x02024474 ldrb r0, [r0, 0x1C] cmp r0, 0x6 - bls _0804A368 - bl _0804ACB2 -_0804A368: + bls @0804A368 + bl @0804ACB2 +@0804A368: lsls r0, 2 - ldr r1, =_0804A38C + ldr r1, =@0804A38C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0804A38C: - .4byte _0804A3A8 - .4byte _0804A414 - .4byte _0804A52E - .4byte _0804A850 - .4byte _0804A954 - .4byte _0804AC40 - .4byte _0804AC88 -_0804A3A8: +@0804A38C: + .4byte @0804A3A8 + .4byte @0804A414 + .4byte @0804A52E + .4byte @0804A850 + .4byte @0804A954 + .4byte @0804AC40 + .4byte @0804AC88 +@0804A3A8: ldr r4, =0x0202420d ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0804A3BC - bl _0804AC7C -_0804A3BC: + beq @0804A3BC + bl @0804AC7C +@0804A3BC: ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x063f0982 ands r0, r1 cmp r0, 0 - beq _0804A3CC - bl _0804AC7C -_0804A3CC: + beq @0804A3CC + bl @0804AC7C +@0804A3CC: ldr r1, =0x02024474 ldrb r0, [r1, 0x1C] adds r0, 0x1 @@ -127850,13 +127850,13 @@ _0804A3CC: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - bl _0804ACB2 + bl @0804ACB2 .align 2, 0 .pool -_0804A414: +@0804A414: movs r5, 0 movs r7, 0 -_0804A418: +@0804A418: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 @@ -127866,12 +127866,12 @@ _0804A418: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _0804A486 + beq @0804A486 adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _0804A486 + beq @0804A486 ldr r0, =0x0832a328 lsls r1, r7, 2 adds r1, r0 @@ -127879,36 +127879,36 @@ _0804A418: mov r1, r8 ands r0, r1 cmp r0, 0 - beq _0804A44C + beq @0804A44C adds r5, 0x1 -_0804A44C: +@0804A44C: adds r0, r4, 0 movs r1, 0xC bl pokemon_getattr lsls r0, 16 lsrs r0, 16 cmp r0, 0xAF - bne _0804A478 + bne @0804A478 ldr r0, =0x03005d8c ldr r0, [r0] ldr r2, =0x00003226 adds r0, r2 ldrb r4, [r0] - b _0804A480 + b @0804A480 .align 2, 0 .pool -_0804A478: +@0804A478: bl itemid_get_x12 lsls r0, 24 lsrs r4, r0, 24 -_0804A480: +@0804A480: cmp r4, 0x19 - bne _0804A486 + bne @0804A486 adds r6, 0x1 -_0804A486: +@0804A486: adds r7, 0x1 cmp r7, 0x5 - ble _0804A418 + ble @0804A418 ldr r3, =0x083203cc ldr r2, =0x02024084 ldr r0, =0x0202420d @@ -127930,7 +127930,7 @@ _0804A486: lsls r0, 16 lsrs r1, r0, 16 cmp r6, 0 - beq _0804A4FC + beq @0804A4FC lsrs r4, r0, 17 adds r0, r4, 0 adds r1, r5, 0 @@ -127939,10 +127939,10 @@ _0804A486: strh r0, [r1] lsls r0, 16 cmp r0, 0 - bne _0804A4D2 + bne @0804A4D2 movs r0, 0x1 strh r0, [r1] -_0804A4D2: +@0804A4D2: ldr r5, =0x02024402 adds r0, r4, 0 adds r1, r6, 0 @@ -127950,13 +127950,13 @@ _0804A4D2: strh r0, [r5] lsls r0, 16 cmp r0, 0 - bne _0804A516 + bne @0804A516 movs r0, 0x1 strh r0, [r5] - b _0804A516 + b @0804A516 .align 2, 0 .pool -_0804A4FC: +@0804A4FC: adds r0, r1, 0 adds r1, r5, 0 bl __divsi3 @@ -127964,13 +127964,13 @@ _0804A4FC: strh r0, [r2] lsls r0, 16 cmp r0, 0 - bne _0804A512 + bne @0804A512 movs r0, 0x1 strh r0, [r2] -_0804A512: +@0804A512: ldr r0, =0x02024402 strh r6, [r0] -_0804A516: +@0804A516: ldr r1, =0x02024474 ldrb r0, [r1, 0x1C] adds r0, 0x1 @@ -127983,13 +127983,13 @@ _0804A516: adds r0, 0x53 mov r4, r8 strb r4, [r0] -_0804A52E: +@0804A52E: ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - beq _0804A538 - b _0804ACB2 -_0804A538: + beq @0804A538 + b @0804ACB2 +@0804A538: ldr r0, =0x0202449c ldr r0, [r0] ldrb r1, [r0, 0x10] @@ -128002,23 +128002,23 @@ _0804A538: lsls r0, 16 lsrs r0, 16 cmp r0, 0xAF - bne _0804A57C + bne @0804A57C ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00003226 adds r0, r1 ldrb r4, [r0] - b _0804A584 + b @0804A584 .align 2, 0 .pool -_0804A57C: +@0804A57C: bl itemid_get_x12 lsls r0, 24 lsrs r4, r0, 24 -_0804A584: +@0804A584: ldr r5, =0x0202449c cmp r4, 0x19 - beq _0804A5AC + beq @0804A5AC ldr r0, [r5] adds r1, r0, 0 adds r1, 0x53 @@ -128026,14 +128026,14 @@ _0804A584: movs r2, 0x1 ands r2, r0 cmp r2, 0 - bne _0804A5AC + bne @0804A5AC lsrs r0, 1 strb r0, [r1] ldr r1, =0x02024474 - b _0804A5D0 + b @0804A5D0 .align 2, 0 .pool -_0804A5AC: +@0804A5AC: ldr r0, [r5] ldrb r1, [r0, 0x10] movs r0, 0x64 @@ -128043,7 +128043,7 @@ _0804A5AC: movs r1, 0x38 bl pokemon_getattr cmp r0, 0x64 - bne _0804A5E8 + bne @0804A5E8 ldr r1, [r5] adds r1, 0x53 ldrb r0, [r1] @@ -128051,29 +128051,29 @@ _0804A5AC: strb r0, [r1] ldr r1, =0x02024474 movs r2, 0 -_0804A5D0: +@0804A5D0: movs r0, 0x5 strb r0, [r1, 0x1C] ldr r0, =0x020241f0 str r2, [r0] - b _0804ACB2 + b @0804ACB2 .align 2, 0 .pool -_0804A5E8: +@0804A5E8: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x8 ands r0, r1 cmp r0, 0 - bne _0804A616 + bne @0804A616 ldr r0, =0x02024084 ldrh r0, [r0, 0x28] cmp r0, 0 - beq _0804A616 + beq @0804A616 ldr r0, [r5] ldrb r0, [r0, 0x12] cmp r0, 0 - bne _0804A616 + bne @0804A616 bl sub_805EA60 ldr r0, =0x00000161 bl song_play_for_text @@ -128081,7 +128081,7 @@ _0804A5E8: ldrb r0, [r1, 0x12] adds r0, 0x1 strb r0, [r1, 0x12] -_0804A616: +@0804A616: ldr r5, =0x0202449c ldr r0, [r5] ldrb r1, [r0, 0x10] @@ -128092,40 +128092,40 @@ _0804A616: movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - bne _0804A630 - b _0804A824 -_0804A630: + bne @0804A630 + b @0804A824 +@0804A630: ldr r0, [r5] adds r0, 0x53 ldrb r0, [r0] movs r3, 0x1 ands r3, r0 cmp r3, 0 - beq _0804A664 + beq @0804A664 ldr r1, =0x020241f0 mov r2, r9 ldrh r0, [r2] str r0, [r1] mov r9, r1 - b _0804A66A + b @0804A66A .align 2, 0 .pool -_0804A664: +@0804A664: ldr r0, =0x020241f0 str r3, [r0] mov r9, r0 -_0804A66A: +@0804A66A: cmp r4, 0x19 - bne _0804A67A + bne @0804A67A ldr r0, =0x02024402 ldrh r1, [r0] mov r2, r9 ldr r0, [r2] adds r0, r1 str r0, [r2] -_0804A67A: +@0804A67A: cmp r4, 0x28 - bne _0804A68E + bne @0804A68E mov r4, r9 ldr r1, [r4] movs r0, 0x96 @@ -128133,13 +128133,13 @@ _0804A67A: movs r1, 0x64 bl __divsi3 str r0, [r4] -_0804A68E: +@0804A68E: ldr r5, =0x02022fec ldr r0, [r5] movs r1, 0x8 ands r0, r1 cmp r0, 0 - beq _0804A6AA + beq @0804A6AA ldr r4, =0x020241f0 ldr r1, [r4] movs r0, 0x96 @@ -128147,7 +128147,7 @@ _0804A68E: movs r1, 0x64 bl __divsi3 str r0, [r4] -_0804A6AA: +@0804A6AA: ldr r4, =0x0202449c ldr r0, [r4] ldrb r1, [r0, 0x10] @@ -128158,24 +128158,24 @@ _0804A6AA: bl sub_806E8A8 lsls r0, 24 cmp r0, 0 - beq _0804A714 + beq @0804A714 ldr r0, [r5] movs r1, 0x80 lsls r1, 15 ands r0, r1 cmp r0, 0 - beq _0804A6F8 + beq @0804A6F8 ldr r0, [r4] ldrb r0, [r0, 0x10] cmp r0, 0x2 - bls _0804A6F8 + bls @0804A6F8 ldr r7, =0x00000149 ldr r0, =0x020241f0 mov r9, r0 - b _0804A71A + b @0804A71A .align 2, 0 .pool -_0804A6F8: +@0804A6F8: ldr r4, =0x020241f0 ldr r1, [r4] movs r0, 0x96 @@ -128186,20 +128186,20 @@ _0804A6F8: movs r7, 0xA5 lsls r7, 1 mov r9, r4 - b _0804A71A + b @0804A71A .align 2, 0 .pool -_0804A714: +@0804A714: ldr r7, =0x00000149 ldr r1, =0x020241f0 mov r9, r1 -_0804A71A: +@0804A71A: ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x1 ands r1, r0 cmp r1, 0 - beq _0804A786 + beq @0804A786 ldr r0, =0x0202406e ldr r1, =0x0202449c ldr r4, [r1] @@ -128209,41 +128209,41 @@ _0804A71A: ldr r2, =0x02024210 ldrb r1, [r4, 0x10] cmp r0, r1 - bne _0804A76C + bne @0804A76C ldrb r1, [r2] ldr r0, [r3, 0x8] ands r1, r0 cmp r1, 0 - bne _0804A76C + bne @0804A76C adds r1, r4, 0 adds r1, 0x8F movs r0, 0x2 strb r0, [r1] - b _0804A78E + b @0804A78E .align 2, 0 .pool -_0804A76C: +@0804A76C: ldrb r2, [r2] ldr r0, [r3] ands r2, r0 cmp r2, 0 - bne _0804A77E + bne @0804A77E ldr r0, [r5] adds r0, 0x8F strb r2, [r0] - b _0804A78E -_0804A77E: + b @0804A78E +@0804A77E: ldr r0, [r5] adds r0, 0x8F movs r1, 0x2 - b _0804A78C -_0804A786: + b @0804A78C +@0804A786: ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x8F -_0804A78C: +@0804A78C: strb r1, [r0] -_0804A78E: +@0804A78E: ldr r1, =0x02022f58 movs r2, 0 mov r12, r2 @@ -128317,23 +128317,23 @@ _0804A78E: adds r1, r3 ldrh r1, [r1] bl sub_806DADC -_0804A824: +@0804A824: ldr r0, =0x0202449c ldr r1, [r0] adds r1, 0x53 ldrb r0, [r1] lsrs r0, 1 strb r0, [r1] - b _0804A92A + b @0804A92A .align 2, 0 .pool -_0804A850: +@0804A850: ldr r0, =0x02024068 ldr r2, [r0] cmp r2, 0 - beq _0804A85A - b _0804ACB2 -_0804A85A: + beq @0804A85A + b @0804ACB2 +@0804A85A: ldr r1, =0x02023864 ldr r7, =0x0202449c ldr r0, [r7] @@ -128351,7 +128351,7 @@ _0804A85A: movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _0804A92A + beq @0804A92A ldr r0, [r7] ldrb r0, [r0, 0x10] muls r0, r6 @@ -128359,7 +128359,7 @@ _0804A85A: movs r1, 0x38 bl pokemon_getattr cmp r0, 0x64 - beq _0804A92A + beq @0804A92A ldr r0, [r7] ldrb r0, [r0, 0x10] muls r0, r6 @@ -128428,21 +128428,21 @@ _0804A85A: bl dp01_build_cmdbuf_x19_a_bb ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_0804A92A: +@0804A92A: ldr r1, =0x02024474 ldrb r0, [r1, 0x1C] adds r0, 0x1 strb r0, [r1, 0x1C] - b _0804ACB2 + b @0804ACB2 .align 2, 0 .pool -_0804A954: +@0804A954: ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - beq _0804A95E - b _0804ACB2 -_0804A95E: + beq @0804A95E + b @0804ACB2 +@0804A95E: ldr r1, =0x02024064 ldr r0, =0x0202449c ldr r4, [r0] @@ -128456,29 +128456,29 @@ _0804A95E: adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0x21 - beq _0804A97C - b _0804AC28 -_0804A97C: + beq @0804A97C + b @0804AC28 +@0804A97C: adds r0, r3, 0x1 adds r0, r1, r0 ldrb r0, [r0] cmp r0, 0xB - beq _0804A988 - b _0804AC28 -_0804A988: + beq @0804A988 + b @0804AC28 +@0804A988: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x8 ands r0, r1 cmp r0, 0 - beq _0804A9B2 + beq @0804A9B2 ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrh r0, [r1] ldrb r4, [r4, 0x10] cmp r0, r4 - bne _0804A9B2 + bne @0804A9B2 adds r1, r0, 0 movs r0, 0x64 muls r0, r1 @@ -128486,7 +128486,7 @@ _0804A988: adds r0, r1 adds r1, r2, 0 bl sub_805E990 -_0804A9B2: +@0804A9B2: ldr r1, =0x02022f58 movs r3, 0xFD strb r3, [r1] @@ -128564,11 +128564,11 @@ _0804A9B2: ldrb r2, [r0, 0x10] ldrh r0, [r1] cmp r0, r2 - bne _0804AB1E + bne @0804AB1E ldr r4, =0x02024084 ldrh r0, [r4, 0x28] cmp r0, 0 - beq _0804AB1E + beq @0804AB1E mov r0, r8 muls r0, r2 adds r0, r7 @@ -128657,29 +128657,29 @@ _0804A9B2: movs r1, 0x3F bl pokemon_getattr strh r0, [r4, 0xA] -_0804AB1E: +@0804AB1E: ldr r0, =0x0202406e ldr r7, =0x0202449c ldr r1, [r7] ldrb r2, [r1, 0x10] ldrh r0, [r0, 0x4] cmp r0, r2 - beq _0804AB2E - b _0804AC2E -_0804AB2E: + beq @0804AB2E + b @0804AC2E +@0804AB2E: ldr r6, =0x02024084 movs r4, 0xD8 adds r4, r6 mov r8, r4 ldrh r0, [r4] cmp r0, 0 - beq _0804AC2E + beq @0804AC2E ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0804AC2E + beq @0804AC2E movs r5, 0x64 adds r0, r2, 0 muls r0, r5 @@ -128752,32 +128752,32 @@ _0804AB2E: adds r1, r6, 0 adds r1, 0xB8 strh r0, [r1] - b _0804AC2E + b @0804AC2E .align 2, 0 .pool -_0804AC28: +@0804AC28: ldr r1, =0x020241f0 movs r0, 0 str r0, [r1] -_0804AC2E: +@0804AC2E: ldr r1, =0x02024474 movs r0, 0x5 strb r0, [r1, 0x1C] - b _0804ACB2 + b @0804ACB2 .align 2, 0 .pool -_0804AC40: +@0804AC40: ldr r0, =0x020241f0 ldr r0, [r0] cmp r0, 0 - beq _0804AC58 + beq @0804AC58 ldr r1, =0x02024474 movs r0, 0x3 strb r0, [r1, 0x1C] - b _0804ACB2 + b @0804ACB2 .align 2, 0 .pool -_0804AC58: +@0804AC58: ldr r2, =0x0202449c ldr r1, [r2] ldrb r0, [r1, 0x10] @@ -128786,25 +128786,25 @@ _0804AC58: ldr r0, [r2] ldrb r0, [r0, 0x10] cmp r0, 0x5 - bhi _0804AC7C + bhi @0804AC7C ldr r1, =0x02024474 movs r0, 0x2 strb r0, [r1, 0x1C] - b _0804ACB2 + b @0804ACB2 .align 2, 0 .pool -_0804AC7C: +@0804AC7C: ldr r1, =0x02024474 movs r0, 0x6 strb r0, [r1, 0x1C] - b _0804ACB2 + b @0804ACB2 .align 2, 0 .pool -_0804AC88: +@0804AC88: ldr r0, =0x02024068 ldr r5, [r0] cmp r5, 0 - bne _0804ACB2 + bne @0804ACB2 ldr r4, =0x02024084 ldr r2, =0x0202420d ldrb r0, [r2] @@ -128822,7 +128822,7 @@ _0804AC88: ldr r0, [r1] adds r0, 0x2 str r0, [r1] -_0804ACB2: +@0804ACB2: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -128834,7 +128834,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} @@ -128842,23 +128842,23 @@ sub_804ACD0: @ 804ACD0 ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - beq _0804ACE2 - b _0804AF22 -_0804ACE2: + beq @0804ACE2 + b @0804AF22 +@0804ACE2: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 15 ands r0, r1 cmp r0, 0 - beq _0804AD48 + beq @0804AD48 ldr r0, =0x02038bce ldrh r1, [r0] ldr r0, =0x00000c03 cmp r1, r0 - bne _0804AD48 + bne @0804AD48 movs r5, 0 -_0804ACFC: +@0804ACFC: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -128868,28 +128868,28 @@ _0804ACFC: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _0804AD2C + beq @0804AD2C adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _0804AD2C + bne @0804AD2C adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr adds r0, r6, r0 lsls r0, 16 lsrs r6, r0, 16 -_0804AD2C: +@0804AD2C: adds r5, 0x1 cmp r5, 0x2 - ble _0804ACFC - b _0804ADA8 + ble @0804ACFC + b @0804ADA8 .align 2, 0 .pool -_0804AD48: +@0804AD48: movs r5, 0 -_0804AD4A: +@0804AD4A: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -128899,19 +128899,19 @@ _0804AD4A: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _0804ADA2 + beq @0804ADA2 adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _0804ADA2 + bne @0804ADA2 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 11 ands r0, r1 cmp r0, 0 - beq _0804AD94 + beq @0804AD94 ldr r0, =0x0202449c ldr r0, [r0] movs r1, 0xA8 @@ -128924,30 +128924,30 @@ _0804AD4A: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _0804ADA2 -_0804AD94: + bne @0804ADA2 +@0804AD94: adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr adds r0, r6, r0 lsls r0, 16 lsrs r6, r0, 16 -_0804ADA2: +@0804ADA2: adds r5, 0x1 cmp r5, 0x5 - ble _0804AD4A -_0804ADA8: + ble @0804AD4A +@0804ADA8: cmp r6, 0 - bne _0804ADB6 + bne @0804ADB6 ldr r0, =0x0202433a ldrb r1, [r0] movs r2, 0x2 orrs r1, r2 strb r1, [r0] -_0804ADB6: +@0804ADB6: movs r6, 0 movs r5, 0 -_0804ADBA: +@0804ADBA: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -128957,19 +128957,19 @@ _0804ADBA: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _0804AE10 + beq @0804AE10 adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _0804AE10 + bne @0804AE10 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 11 ands r0, r1 cmp r0, 0 - beq _0804AE02 + beq @0804AE02 ldr r0, =0x0202449c ldr r0, [r0] ldr r1, =0x000002a1 @@ -128981,36 +128981,36 @@ _0804ADBA: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _0804AE10 -_0804AE02: + bne @0804AE10 +@0804AE02: adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr adds r0, r6, r0 lsls r0, 16 lsrs r6, r0, 16 -_0804AE10: +@0804AE10: adds r5, 0x1 cmp r5, 0x5 - ble _0804ADBA + ble @0804ADBA ldr r2, =0x0202433a cmp r6, 0 - bne _0804AE24 + bne @0804AE24 ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] -_0804AE24: +@0804AE24: ldrb r0, [r2] cmp r0, 0 - bne _0804AF1A + bne @0804AF1A ldr r0, =0x02022fec ldr r1, [r0] ldr r2, =0x02000002 ands r1, r2 mov r8, r0 cmp r1, 0 - beq _0804AF1A + beq @0804AF1A movs r3, 0 movs r5, 0 ldr r0, =0x0202406c @@ -129018,36 +129018,36 @@ _0804AE24: mov r12, r0 ldr r7, =0x02024214 cmp r3, r1 - bge _0804AE70 + bge @0804AE70 ldr r0, =0x02024280 movs r6, 0x80 lsls r6, 21 ldr r4, [r0] adds r2, r1, 0 ldr r1, =0x0202437c -_0804AE54: +@0804AE54: adds r0, r6, 0 lsls r0, r5 ands r0, r4 cmp r0, 0 - beq _0804AE68 + beq @0804AE68 ldrb r0, [r1] lsls r0, 25 cmp r0, 0 - blt _0804AE68 + blt @0804AE68 adds r3, 0x1 -_0804AE68: +@0804AE68: adds r1, 0x28 adds r5, 0x2 cmp r5, r2 - blt _0804AE54 -_0804AE70: + blt @0804AE54 +@0804AE70: movs r2, 0 movs r5, 0x1 mov r4, r12 ldrb r1, [r4] cmp r5, r1 - bge _0804AEAA + bge @0804AEAA ldr r0, =0x02024280 movs r4, 0x80 lsls r4, 21 @@ -129057,41 +129057,41 @@ _0804AE70: adds r4, r1, 0 adds r1, r0, 0 adds r1, 0x14 -_0804AE8E: +@0804AE8E: mov r0, r12 lsls r0, r5 ands r0, r6 cmp r0, 0 - beq _0804AEA2 + beq @0804AEA2 ldrb r0, [r1] lsls r0, 25 cmp r0, 0 - blt _0804AEA2 + blt @0804AEA2 adds r2, 0x1 -_0804AEA2: +@0804AEA2: adds r1, 0x28 adds r5, 0x2 cmp r5, r4 - blt _0804AE8E -_0804AEAA: + blt @0804AE8E +@0804AEAA: mov r1, r8 ldr r0, [r1] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _0804AEF0 + beq @0804AEF0 adds r0, r2, r3 cmp r0, 0x1 - bgt _0804AEF8 - b _0804AF12 + bgt @0804AEF8 + b @0804AF12 .align 2, 0 .pool -_0804AEF0: +@0804AEF0: cmp r2, 0 - beq _0804AF12 + beq @0804AF12 cmp r3, 0 - beq _0804AF12 -_0804AEF8: + beq @0804AF12 +@0804AEF8: ldr r2, [r7] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -129104,18 +129104,18 @@ _0804AEF8: lsls r0, 24 adds r1, r0 str r1, [r7] - b _0804AF22 -_0804AF12: + b @0804AF22 +@0804AF12: ldr r0, [r7] adds r0, 0x5 str r0, [r7] - b _0804AF22 -_0804AF1A: + b @0804AF22 +@0804AF1A: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_0804AF22: +@0804AF22: pop {r3} mov r8, r3 pop {r4-r7} @@ -129126,7 +129126,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] @@ -129152,7 +129152,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 @@ -129166,7 +129166,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] @@ -129180,7 +129180,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] @@ -129188,15 +129188,15 @@ atk27_cmd27: @ 804AFA0 strb r0, [r1] lsls r0, 24 cmp r0, 0 - bne _0804AFC4 + bne @0804AFC4 ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b _0804AFDE + b @0804AFDE .align 2, 0 .pool -_0804AFC4: +@0804AFC4: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -129210,7 +129210,7 @@ _0804AFC4: lsls r0, 24 adds r1, r0 str r1, [r3] -_0804AFDE: +@0804AFDE: pop {r0} bx r0 .align 2, 0 @@ -129218,7 +129218,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] @@ -129238,7 +129238,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] @@ -129267,63 +129267,63 @@ atk29_jumpifbyte: @ 804B008 adds r1, 0xB str r1, [r3] cmp r6, 0x5 - bhi _0804B0A0 + bhi @0804B0A0 lsls r0, r6, 2 - ldr r1, =_0804B054 + ldr r1, =@0804B054 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0804B054: - .4byte _0804B06C - .4byte _0804B074 - .4byte _0804B07C - .4byte _0804B084 - .4byte _0804B08C - .4byte _0804B096 -_0804B06C: +@0804B054: + .4byte @0804B06C + .4byte @0804B074 + .4byte @0804B07C + .4byte @0804B084 + .4byte @0804B08C + .4byte @0804B096 +@0804B06C: ldrb r0, [r5] cmp r0, r4 - bne _0804B0A0 - b _0804B09E -_0804B074: + bne @0804B0A0 + b @0804B09E +@0804B074: ldrb r0, [r5] cmp r0, r4 - beq _0804B0A0 - b _0804B09E -_0804B07C: + beq @0804B0A0 + b @0804B09E +@0804B07C: ldrb r0, [r5] cmp r0, r4 - bls _0804B0A0 - b _0804B09E -_0804B084: + bls @0804B0A0 + b @0804B09E +@0804B084: ldrb r0, [r5] cmp r0, r4 - bcs _0804B0A0 - b _0804B09E -_0804B08C: + bcs @0804B0A0 + b @0804B09E +@0804B08C: ldrb r0, [r5] ands r4, r0 cmp r4, 0 - beq _0804B0A0 - b _0804B09E -_0804B096: + beq @0804B0A0 + b @0804B09E +@0804B096: ldrb r0, [r5] ands r4, r0 cmp r4, 0 - bne _0804B0A0 -_0804B09E: + bne @0804B0A0 +@0804B09E: str r2, [r3] -_0804B0A0: +@0804B0A0: pop {r4-r6} pop {r0} bx r0 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] @@ -129355,63 +129355,63 @@ sub_804B0A8: @ 804B0A8 adds r1, 0xC str r1, [r3] cmp r6, 0x5 - bhi _0804B148 + bhi @0804B148 lsls r0, r6, 2 - ldr r1, =_0804B0FC + ldr r1, =@0804B0FC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0804B0FC: - .4byte _0804B114 - .4byte _0804B11C - .4byte _0804B124 - .4byte _0804B12C - .4byte _0804B134 - .4byte _0804B13E -_0804B114: +@0804B0FC: + .4byte @0804B114 + .4byte @0804B11C + .4byte @0804B124 + .4byte @0804B12C + .4byte @0804B134 + .4byte @0804B13E +@0804B114: ldrh r0, [r5] cmp r0, r4 - bne _0804B148 - b _0804B146 -_0804B11C: + bne @0804B148 + b @0804B146 +@0804B11C: ldrh r0, [r5] cmp r0, r4 - beq _0804B148 - b _0804B146 -_0804B124: + beq @0804B148 + b @0804B146 +@0804B124: ldrh r0, [r5] cmp r0, r4 - bls _0804B148 - b _0804B146 -_0804B12C: + bls @0804B148 + b @0804B146 +@0804B12C: ldrh r0, [r5] cmp r0, r4 - bcs _0804B148 - b _0804B146 -_0804B134: + bcs @0804B148 + b @0804B146 +@0804B134: ldrh r0, [r5] ands r4, r0 cmp r4, 0 - beq _0804B148 - b _0804B146 -_0804B13E: + beq @0804B148 + b @0804B146 +@0804B13E: ldrh r0, [r5] ands r4, r0 cmp r4, 0 - bne _0804B148 -_0804B146: + bne @0804B148 +@0804B146: str r2, [r3] -_0804B148: +@0804B148: pop {r4-r6} pop {r0} bx r0 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] @@ -129449,63 +129449,63 @@ sub_804B150: @ 804B150 adds r1, 0xE str r1, [r3] cmp r6, 0x5 - bhi _0804B1FC + bhi @0804B1FC lsls r0, r6, 2 - ldr r1, =_0804B1B0 + ldr r1, =@0804B1B0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0804B1B0: - .4byte _0804B1C8 - .4byte _0804B1D0 - .4byte _0804B1D8 - .4byte _0804B1E0 - .4byte _0804B1E8 - .4byte _0804B1F2 -_0804B1C8: +@0804B1B0: + .4byte @0804B1C8 + .4byte @0804B1D0 + .4byte @0804B1D8 + .4byte @0804B1E0 + .4byte @0804B1E8 + .4byte @0804B1F2 +@0804B1C8: ldr r0, [r5] cmp r0, r4 - bne _0804B1FC - b _0804B1FA -_0804B1D0: + bne @0804B1FC + b @0804B1FA +@0804B1D0: ldr r0, [r5] cmp r0, r4 - beq _0804B1FC - b _0804B1FA -_0804B1D8: + beq @0804B1FC + b @0804B1FA +@0804B1D8: ldr r0, [r5] cmp r0, r4 - bls _0804B1FC - b _0804B1FA -_0804B1E0: + bls @0804B1FC + b @0804B1FA +@0804B1E0: ldr r0, [r5] cmp r0, r4 - bcs _0804B1FC - b _0804B1FA -_0804B1E8: + bcs @0804B1FC + b @0804B1FA +@0804B1E8: ldr r0, [r5] ands r0, r4 cmp r0, 0 - beq _0804B1FC - b _0804B1FA -_0804B1F2: + beq @0804B1FC + b @0804B1FA +@0804B1F2: ldr r0, [r5] ands r0, r4 cmp r0, 0 - bne _0804B1FC -_0804B1FA: + bne @0804B1FC +@0804B1FA: str r2, [r3] -_0804B1FC: +@0804B1FC: pop {r4-r6} pop {r0} bx r0 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] @@ -129543,44 +129543,44 @@ sub_804B204: @ 804B204 mov r12, r1 movs r1, 0 cmp r1, r6 - bcs _0804B27C + bcs @0804B27C ldrb r0, [r5] ldrb r7, [r4] cmp r0, r7 - beq _0804B260 + beq @0804B260 adds r0, r3, 0 - b _0804B278 + b @0804B278 .align 2, 0 .pool -_0804B260: +@0804B260: adds r5, 0x1 adds r4, 0x1 adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, r6 - bcs _0804B27C + bcs @0804B27C ldrb r0, [r5] ldrb r3, [r4] cmp r0, r3 - beq _0804B260 + beq @0804B260 ldr r0, [r2] -_0804B278: +@0804B278: adds r0, 0xE str r0, [r2] -_0804B27C: +@0804B27C: cmp r1, r6 - bne _0804B284 + bne @0804B284 mov r7, r12 str r7, [r2] -_0804B284: +@0804B284: pop {r4-r7} pop {r0} bx r0 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 @@ -129619,34 +129619,34 @@ sub_804B28C: @ 804B28C mov r12, r2 movs r1, 0 cmp r7, r6 - bcs _0804B2F6 -_0804B2DA: + bcs @0804B2F6 +@0804B2DA: ldrb r0, [r5] ldrb r2, [r4] cmp r0, r2 - bne _0804B2E8 + bne @0804B2E8 adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 -_0804B2E8: +@0804B2E8: adds r5, 0x1 adds r4, 0x1 adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, r6 - bcc _0804B2DA -_0804B2F6: + bcc @0804B2DA +@0804B2F6: cmp r7, r6 - beq _0804B304 + beq @0804B304 mov r0, r12 - b _0804B308 + b @0804B308 .align 2, 0 .pool -_0804B304: +@0804B304: ldr r0, [r3] adds r0, 0xE -_0804B308: +@0804B308: str r0, [r3] pop {r4-r7} pop {r0} @@ -129654,7 +129654,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] @@ -129678,7 +129678,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] @@ -129704,7 +129704,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] @@ -129730,7 +129730,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] @@ -129757,16 +129757,16 @@ atk31_copyarray: @ 804B390 ldrb r4, [r1, 0x9] movs r2, 0 cmp r2, r4 - bge _0804B3D4 -_0804B3C6: + bge @0804B3D4 +@0804B3C6: adds r0, r6, r2 adds r1, r5, r2 ldrb r1, [r1] strb r1, [r0] adds r2, 0x1 cmp r2, r4 - blt _0804B3C6 -_0804B3D4: + blt @0804B3C6 +@0804B3D4: ldr r0, [r3] adds r0, 0xA str r0, [r3] @@ -129778,7 +129778,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] @@ -129815,8 +129815,8 @@ atk32_memcpy_with_offset: @ 804B3E4 ldrb r4, [r1, 0xD] movs r2, 0 cmp r2, r4 - bge _0804B440 -_0804B42E: + bge @0804B440 +@0804B42E: adds r0, r7, r2 ldrb r1, [r5] adds r1, r2, r1 @@ -129825,8 +129825,8 @@ _0804B42E: strb r1, [r0] adds r2, 0x1 cmp r2, r4 - blt _0804B42E -_0804B440: + blt @0804B42E +@0804B440: ldr r0, [r3] adds r0, 0xE str r0, [r3] @@ -129838,7 +129838,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] @@ -129864,7 +129864,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] @@ -129896,7 +129896,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] @@ -129934,7 +129934,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] @@ -129960,7 +129960,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] @@ -129992,7 +129992,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] @@ -130030,12 +130030,12 @@ 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] cmp r4, 0 - bne _0804B5CC + bne @0804B5CC ldr r5, =0x02024214 ldr r2, [r5] ldrb r1, [r2, 0x1] @@ -130049,11 +130049,11 @@ atk39_pause: @ 804B5A0 lsls r0, 16 lsrs r0, 16 cmp r0, r1 - bcc _0804B5CC + bcc @0804B5CC strh r4, [r3] adds r0, r2, 0x3 str r0, [r5] -_0804B5CC: +@0804B5CC: pop {r4,r5} pop {r0} bx r0 @@ -130062,17 +130062,17 @@ _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] cmp r0, 0 - bne _0804B5F2 + bne @0804B5F2 ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] -_0804B5F2: +@0804B5F2: pop {r0} bx r0 .align 2, 0 @@ -130080,22 +130080,22 @@ _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] ldrb r0, [r0, 0x1] cmp r0, 0 - bne _0804B620 + bne @0804B620 ldr r0, =0x02024064 ldr r1, =0x0202420c - b _0804B624 + b @0804B624 .align 2, 0 .pool -_0804B620: +@0804B620: ldr r0, =0x02024064 ldr r1, =0x0202420b -_0804B624: +@0804B624: ldrb r1, [r1] strb r1, [r0] ldr r0, =0x020241f0 @@ -130116,7 +130116,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} @@ -130124,7 +130124,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] @@ -130132,11 +130132,11 @@ sub_804B664: @ 804B664 lsls r1, 11 ands r0, r1 cmp r0, 0 - beq _0804B67C + beq @0804B67C ldr r0, =0x0202420b ldrb r0, [r0] bl sub_81A5718 -_0804B67C: +@0804B67C: ldr r0, =0x0202427c movs r1, 0 strb r1, [r0] @@ -130152,7 +130152,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] @@ -130165,7 +130165,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 @@ -130175,10 +130175,10 @@ atk3F_end3: @ 804B6BC adds r1, 0x20 ldrb r0, [r1] cmp r0, 0 - beq _0804B6D6 + beq @0804B6D6 subs r0, 0x1 strb r0, [r1] -_0804B6D6: +@0804B6D6: ldr r2, =0x03005d04 ldr r0, [r3] ldr r1, [r0, 0xC] @@ -130196,7 +130196,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] @@ -130222,7 +130222,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] @@ -130240,12 +130240,12 @@ atk42_jumpiftype2: @ 804B728 ldrb r2, [r3, 0x2] ldrb r1, [r1] cmp r2, r1 - beq _0804B756 + beq @0804B756 adds r0, 0x22 ldrb r0, [r0] cmp r2, r0 - bne _0804B778 -_0804B756: + bne @0804B778 +@0804B756: ldrb r1, [r3, 0x3] ldrb r0, [r3, 0x4] lsls r0, 8 @@ -130257,20 +130257,20 @@ _0804B756: lsls r0, 24 orrs r1, r0 str r1, [r4] - b _0804B77C + b @0804B77C .align 2, 0 .pool -_0804B778: +@0804B778: adds r0, r3, 0x7 str r0, [r4] -_0804B77C: +@0804B77C: pop {r4} pop {r0} bx r0 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 @@ -130284,7 +130284,7 @@ sub_804B784: @ 804B784 bl ability_something lsls r0, 24 cmp r0, 0 - beq _0804B7C0 + beq @0804B7C0 ldr r2, [r4] ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] @@ -130297,14 +130297,14 @@ sub_804B784: @ 804B784 lsls r0, 24 orrs r1, r0 str r1, [r4] - b _0804B7C6 + b @0804B7C6 .align 2, 0 .pool -_0804B7C0: +@0804B7C0: ldr r0, [r4] adds r0, 0x6 str r0, [r4] -_0804B7C6: +@0804B7C6: add sp, 0x4 pop {r4} pop {r0} @@ -130312,7 +130312,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 @@ -130327,7 +130327,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] @@ -130349,12 +130349,12 @@ atk46_cmd46: @ 804B7EC ldrb r4, [r2, 0x2] adds r0, r4, 0 cmp r0, 0x1 - beq _0804B822 + beq @0804B822 cmp r0, 0x11 - beq _0804B822 + beq @0804B822 cmp r0, 0x2 - bne _0804B848 -_0804B822: + bne @0804B848 +@0804B822: ldr r4, =0x02024214 ldr r0, [r4] ldrb r1, [r0, 0x2] @@ -130367,29 +130367,29 @@ _0804B822: ldr r0, [r4] adds r0, 0x7 str r0, [r4] - b _0804B8AA + b @0804B8AA .align 2, 0 .pool -_0804B848: +@0804B848: ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 - beq _0804B868 + beq @0804B868 adds r0, r2, 0x7 bl b_movescr_stack_push ldr r0, =0x082dabb9 - b _0804B8A8 + b @0804B8A8 .align 2, 0 .pool -_0804B868: +@0804B868: adds r0, r4, 0 subs r0, 0xA lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bls _0804B894 + bls @0804B894 ldr r1, =0x020242ac ldrb r0, [r6] lsls r0, 2 @@ -130398,12 +130398,12 @@ _0804B868: ldr r1, =0x000400c0 ands r0, r1 cmp r0, 0 - beq _0804B894 + beq @0804B894 adds r0, r2, 0x7 - b _0804B8A8 + b @0804B8A8 .align 2, 0 .pool -_0804B894: +@0804B894: ldrb r1, [r2, 0x2] ldrh r2, [r3] movs r0, 0 @@ -130412,16 +130412,16 @@ _0804B894: bl dp01_battle_side_mark_buffer_for_execution ldr r0, [r5] adds r0, 0x7 -_0804B8A8: +@0804B8A8: str r0, [r5] -_0804B8AA: +@0804B8AA: pop {r4-r6} pop {r0} bx r0 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] @@ -130453,12 +130453,12 @@ sub_804B8B0: @ 804B8B0 ldrb r5, [r3] adds r0, r5, 0 cmp r0, 0x1 - beq _0804B8FA + beq @0804B8FA cmp r0, 0x11 - beq _0804B8FA + beq @0804B8FA cmp r0, 0x2 - bne _0804B920 -_0804B8FA: + bne @0804B920 +@0804B8FA: ldrb r1, [r3] ldrh r2, [r4] movs r0, 0 @@ -130470,27 +130470,27 @@ _0804B8FA: ldr r0, [r1] adds r0, 0xA str r0, [r1] - b _0804B976 + b @0804B976 .align 2, 0 .pool -_0804B920: +@0804B920: ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 - beq _0804B934 + beq @0804B934 adds r0, r2, 0 - b _0804B972 + b @0804B972 .align 2, 0 .pool -_0804B934: +@0804B934: adds r0, r5, 0 subs r0, 0xA lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bls _0804B960 + bls @0804B960 ldr r1, =0x020242ac ldrb r0, [r7] lsls r0, 2 @@ -130499,12 +130499,12 @@ _0804B934: ldr r1, =0x000400c0 ands r0, r1 cmp r0, 0 - beq _0804B960 + beq @0804B960 adds r0, r2, 0 - b _0804B972 + b @0804B972 .align 2, 0 .pool -_0804B960: +@0804B960: ldrb r1, [r3] ldrh r2, [r4] movs r0, 0 @@ -130512,17 +130512,17 @@ _0804B960: ldrb r0, [r7] bl dp01_battle_side_mark_buffer_for_execution ldr r0, [r6] -_0804B972: +@0804B972: adds r0, 0xA str r0, [r6] -_0804B976: +@0804B976: pop {r4-r7} pop {r0} bx r0 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 @@ -130531,32 +130531,32 @@ sub_804B97C: @ 804B97C ands r2, r0 adds r4, r1, 0 cmp r2, 0x20 - beq _0804B9AA + beq @0804B9AA cmp r2, 0x20 - bgt _0804B99C + bgt @0804B99C cmp r2, 0x10 - beq _0804B9A6 - b _0804B9B4 + beq @0804B9A6 + b @0804B9B4 .align 2, 0 .pool -_0804B99C: +@0804B99C: cmp r2, 0x90 - beq _0804B9AE + beq @0804B9AE cmp r2, 0xA0 - beq _0804B9B2 - b _0804B9B4 -_0804B9A6: + beq @0804B9B2 + b @0804B9B4 +@0804B9A6: movs r3, 0xF - b _0804B9B4 -_0804B9AA: + b @0804B9B4 +@0804B9AA: movs r3, 0x27 - b _0804B9B4 -_0804B9AE: + b @0804B9B4 +@0804B9AE: movs r3, 0x16 - b _0804B9B4 -_0804B9B2: + b @0804B9B4 +@0804B9B2: movs r3, 0x2E -_0804B9B4: +@0804B9B4: ldrb r1, [r4, 0x1A] movs r0, 0xF ands r0, r1 @@ -130577,7 +130577,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 @@ -130602,43 +130602,43 @@ atk48_playstatchangeanimation: @ 804B9D8 ands r0, r1 ldr r3, [sp] cmp r0, 0 - beq _0804BAEC + beq @0804BAEC movs r0, 0x2 ands r0, r1 movs r1, 0x15 cmp r0, 0 - beq _0804BA18 + beq @0804BA18 movs r1, 0x2D -_0804BA18: +@0804BA18: cmp r4, 0 - beq _0804BAC0 + beq @0804BAC0 movs r0, 0x1 mov r10, r0 ldr r0, =0x0202409c mov r9, r0 lsls r5, r1, 16 -_0804BA26: +@0804BA26: adds r0, r4, 0 mov r1, r10 ands r0, r1 cmp r0, 0 - beq _0804BAB2 + beq @0804BAB2 ldr r0, =0x02024214 ldr r0, [r0] ldrb r1, [r0, 0x3] movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _0804BA58 + beq @0804BA58 ldr r0, =0x02024064 ldrb r1, [r0] movs r0, 0x58 muls r0, r1 adds r0, r7, r0 - b _0804BAA0 + b @0804BAA0 .align 2, 0 .pool -_0804BA58: +@0804BA58: ldr r6, =0x02024064 ldrb r0, [r6] str r3, [sp] @@ -130653,7 +130653,7 @@ _0804BA58: ldrb r0, [r0, 0x4] ldr r3, [sp] cmp r0, 0 - bne _0804BAB2 + bne @0804BAB2 ldr r0, =0x02024084 ldrb r2, [r6] movs r1, 0x58 @@ -130662,43 +130662,43 @@ _0804BA58: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x1D - beq _0804BAB2 + beq @0804BAB2 cmp r0, 0x49 - beq _0804BAB2 + beq @0804BAB2 cmp r0, 0x33 - bne _0804BA96 + bne @0804BA96 cmp r7, 0x6 - beq _0804BAB2 -_0804BA96: + beq @0804BAB2 +@0804BA96: cmp r0, 0x34 - bne _0804BA9E + bne @0804BA9E cmp r7, 0x1 - beq _0804BAB2 -_0804BA9E: + beq @0804BAB2 +@0804BA9E: adds r0, r7, r2 -_0804BAA0: +@0804BAA0: add r0, r9 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0 - ble _0804BAB2 + ble @0804BAB2 lsrs r0, r5, 16 mov r8, r0 adds r3, 0x1 -_0804BAB2: +@0804BAB2: lsrs r4, 1 movs r1, 0x80 lsls r1, 9 adds r5, r1 adds r7, 0x1 cmp r4, 0 - bne _0804BA26 -_0804BAC0: + bne @0804BA26 +@0804BAC0: ldr r0, =0x02024214 mov r9, r0 cmp r3, 0x1 - ble _0804BB4E + ble @0804BB4E ldr r0, [r0] ldrb r1, [r0, 0x3] movs r0, 0x2 @@ -130706,30 +130706,30 @@ _0804BAC0: movs r1, 0x39 mov r8, r1 cmp r0, 0 - beq _0804BB4E + beq @0804BB4E movs r0, 0x3A - b _0804BB4C + b @0804BB4C .align 2, 0 .pool -_0804BAEC: +@0804BAEC: movs r0, 0x2 ands r0, r1 movs r1, 0xE cmp r0, 0 - beq _0804BAF8 + beq @0804BAF8 movs r1, 0x26 -_0804BAF8: +@0804BAF8: mov r9, r5 cmp r4, 0 - beq _0804BB34 + beq @0804BB34 ldr r6, =0x0202409c adds r5, r2, 0 lsls r2, r1, 16 -_0804BB04: +@0804BB04: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _0804BB26 + beq @0804BB26 ldrb r1, [r5] movs r0, 0x58 muls r0, r1 @@ -130739,21 +130739,21 @@ _0804BB04: lsls r0, 24 asrs r0, 24 cmp r0, 0xB - bgt _0804BB26 + bgt @0804BB26 lsrs r1, r2, 16 mov r8, r1 adds r3, 0x1 -_0804BB26: +@0804BB26: lsrs r4, 1 movs r0, 0x80 lsls r0, 9 adds r2, r0 adds r7, 0x1 cmp r4, 0 - bne _0804BB04 -_0804BB34: + bne @0804BB04 +@0804BB34: cmp r3, 0x1 - ble _0804BB4E + ble @0804BB4E mov r1, r9 ldr r0, [r1] ldrb r1, [r0, 0x3] @@ -130762,32 +130762,32 @@ _0804BB34: movs r1, 0x37 mov r8, r1 cmp r0, 0 - beq _0804BB4E + beq @0804BB4E movs r0, 0x38 -_0804BB4C: +@0804BB4C: mov r8, r0 -_0804BB4E: +@0804BB4E: mov r1, r9 ldr r2, [r1] ldrb r1, [r2, 0x3] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0804BB6C + beq @0804BB6C cmp r3, 0x1 - bgt _0804BB6C + bgt @0804BB6C adds r0, r2, 0x4 mov r1, r9 - b _0804BBBA + b @0804BBBA .align 2, 0 .pool -_0804BB6C: +@0804BB6C: cmp r3, 0 - beq _0804BBB4 + beq @0804BBB4 ldr r4, =0x02024474 ldrb r0, [r4, 0x1B] cmp r0, 0 - bne _0804BBB4 + bne @0804BBB4 movs r0, 0 movs r1, 0x1 mov r2, r8 @@ -130803,22 +130803,22 @@ _0804BB6C: ands r0, r1 ldr r3, [sp] cmp r0, 0 - beq _0804BBA4 + beq @0804BBA4 cmp r3, 0x1 - ble _0804BBA4 + ble @0804BBA4 movs r0, 0x1 strb r0, [r4, 0x1B] -_0804BBA4: +@0804BBA4: ldr r1, =0x02024214 - b _0804BBB6 + b @0804BBB6 .align 2, 0 .pool -_0804BBB4: +@0804BBB4: mov r1, r9 -_0804BBB6: +@0804BBB6: ldr r0, [r1] adds r0, 0x4 -_0804BBBA: +@0804BBBA: str r0, [r1] add sp, 0x4 pop {r3-r5} @@ -130831,7 +130831,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 @@ -130846,10 +130846,10 @@ sub_804BBCC: @ 804BBCC movs r3, 0 str r3, [sp, 0x18] cmp r1, r0 - beq _0804BBEE + beq @0804BBEE ldrh r2, [r2] str r2, [sp, 0x18] -_0804BBEE: +@0804BBEE: ldr r0, =0x02024214 ldr r0, [r0] ldrb r4, [r0, 0x1] @@ -130864,22 +130864,22 @@ _0804BBEE: adds r1, r0, r1 ldrh r0, [r1, 0x2E] cmp r0, 0xAF - bne _0804BC34 + bne @0804BC34 ldr r1, =0x02024404 lsls r0, r2, 3 subs r0, r2 lsls r0, 2 adds r0, r1 ldrb r0, [r0, 0x7] - b _0804BC3E + b @0804BC3E .align 2, 0 .pool -_0804BC34: +@0804BC34: ldrh r0, [r1, 0x2E] bl itemid_get_x12 lsls r0, 24 lsrs r0, 24 -_0804BC3E: +@0804BC3E: str r0, [sp, 0x8] ldr r1, =0x0202449c ldr r0, =0x0202420b @@ -130891,14 +130891,14 @@ _0804BC3E: str r0, [sp, 0xC] ldrb r0, [r1, 0x13] cmp r0, 0 - beq _0804BCF0 + beq @0804BCF0 movs r5, 0x3F ands r5, r0 str r5, [sp, 0x4] - b _0804BD02 + b @0804BD02 .align 2, 0 .pool -_0804BC68: +@0804BC68: ldr r4, =0x02024064 strb r2, [r4] movs r0, 0 @@ -130906,10 +130906,10 @@ _0804BC68: bl dp01_build_cmdbuf_x33_a_33_33 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - b _0804C15A + b @0804C15A .align 2, 0 .pool -_0804BC80: +@0804BC80: ldr r4, =0x02024064 strb r2, [r4] movs r0, 0 @@ -130924,10 +130924,10 @@ _0804BC80: ldr r2, =0xfffbff3f ands r0, r2 str r0, [r1] - b _0804C15A + b @0804C15A .align 2, 0 .pool -_0804BCAC: +@0804BCAC: strb r2, [r7] ldr r0, [r5] orrs r0, r6 @@ -130949,10 +130949,10 @@ _0804BCAC: bl b_movescr_stack_push ldr r1, =0x02024214 ldr r0, =0x082db87d - bl _0804C5B8 + bl @0804C5B8 .align 2, 0 .pool -_0804BCF0: +@0804BCF0: ldr r2, =0x0831c898 ldr r0, =0x020241ea ldrh r1, [r0] @@ -130962,52 +130962,52 @@ _0804BCF0: adds r0, r2 ldrb r0, [r0, 0x2] str r0, [sp, 0x4] -_0804BD02: +@0804BD02: ldr r1, =0x02024474 mov r12, r1 - b _0804BD1E + b @0804BD1E .align 2, 0 .pool -_0804BD14: +@0804BD14: mov r2, r10 cmp r2, 0 - beq _0804BD1E - bl _0804C5A4 -_0804BD1E: + beq @0804BD1E + bl @0804C5A4 +@0804BD1E: mov r3, r12 ldrb r0, [r3, 0x14] cmp r0, 0x11 - bls _0804BD2A - bl _0804C570 -_0804BD2A: + bls @0804BD2A + bl @0804C570 +@0804BD2A: lsls r0, 2 - ldr r1, =_0804BD38 + ldr r1, =@0804BD38 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0804BD38: - .4byte _0804BD80 - .4byte _0804BE5C - .4byte _0804BF18 - .4byte _0804BF3C - .4byte _0804BF54 - .4byte _0804BF7C - .4byte _0804BFA0 - .4byte _0804C048 - .4byte _0804C0BE - .4byte _0804C0F4 - .4byte _0804C194 - .4byte _0804C088 - .4byte _0804C0A8 - .4byte _0804C1D8 - .4byte _0804C21C - .4byte _0804C3FC - .4byte _0804C4E4 - .4byte _0804C570 -_0804BD80: +@0804BD38: + .4byte @0804BD80 + .4byte @0804BE5C + .4byte @0804BF18 + .4byte @0804BF3C + .4byte @0804BF54 + .4byte @0804BF7C + .4byte @0804BFA0 + .4byte @0804C048 + .4byte @0804C0BE + .4byte @0804C0F4 + .4byte @0804C194 + .4byte @0804C088 + .4byte @0804C0A8 + .4byte @0804C1D8 + .4byte @0804C21C + .4byte @0804C3FC + .4byte @0804C4E4 + .4byte @0804C570 +@0804BD80: ldr r6, =0x02024084 ldr r5, =0x0202420c ldrb r3, [r5] @@ -131022,21 +131022,21 @@ _0804BD80: lsls r1, 16 ands r0, r1 cmp r0, 0 - bne _0804BDA0 - b _0804C184 -_0804BDA0: + bne @0804BDA0 + b @0804C184 +@0804BDA0: adds r0, r2, r6 ldrh r0, [r0, 0x28] cmp r0, 0 - bne _0804BDAA - b _0804C184 -_0804BDAA: + bne @0804BDAA + b @0804C184 +@0804BDAA: ldr r0, =0x0202420b ldrb r1, [r0] cmp r1, r3 - bne _0804BDB4 - b _0804C184 -_0804BDB4: + bne @0804BDB4 + b @0804C184 +@0804BDB4: adds r0, r1, 0 bl battle_side_get_owner adds r4, r0, 0 @@ -131045,17 +131045,17 @@ _0804BDB4: lsls r4, 24 lsls r0, 24 cmp r4, r0 - bne _0804BDCC - b _0804C184 -_0804BDCC: + bne @0804BDCC + b @0804C184 +@0804BDCC: ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 - beq _0804BDDA - b _0804C184 -_0804BDDA: + beq @0804BDDA + b @0804C184 +@0804BDDA: ldr r2, =0x0202437c ldrb r3, [r5] lsls r0, r3, 2 @@ -131066,15 +131066,15 @@ _0804BDDA: adds r0, r1, r0 ldr r0, [r0] cmp r0, 0 - bne _0804BDFE + bne @0804BDFE adds r0, r2, 0 adds r0, 0xC adds r0, r1, r0 ldr r0, [r0] cmp r0, 0 - bne _0804BDFE - b _0804C184 -_0804BDFE: + bne @0804BDFE + b @0804C184 +@0804BDFE: ldr r2, =0x0831c898 ldr r0, =0x020241ea ldrh r1, [r0] @@ -131084,9 +131084,9 @@ _0804BDFE: adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0 - bne _0804BE14 - b _0804C184 -_0804BE14: + bne @0804BE14 + b @0804C184 +@0804BE14: adds r0, r3, 0 muls r0, r7 adds r1, r0, r6 @@ -131094,19 +131094,19 @@ _0804BE14: movs r0, 0x19 ldrsb r0, [r1, r0] cmp r0, 0xB - ble _0804BE26 - b _0804C184 -_0804BE26: + ble @0804BE26 + b @0804C184 +@0804BE26: adds r0, r2, 0x1 strb r0, [r1, 0x19] bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =0x082dae0d str r0, [r1] - b _0804C0B8 + b @0804C0B8 .align 2, 0 .pool -_0804BE5C: +@0804BE5C: ldr r4, =0x02024084 ldr r6, =0x0202420c ldrb r2, [r6] @@ -131121,21 +131121,21 @@ _0804BE5C: movs r0, 0x20 ands r0, r3 cmp r0, 0 - bne _0804BE7C - b _0804C184 -_0804BE7C: + bne @0804BE7C + b @0804C184 +@0804BE7C: adds r0, r1, r4 ldrh r0, [r0, 0x28] cmp r0, 0 - bne _0804BE86 - b _0804C184 -_0804BE86: + bne @0804BE86 + b @0804C184 +@0804BE86: ldr r0, =0x0202420b ldrb r0, [r0] cmp r0, r2 - bne _0804BE90 - b _0804C184 -_0804BE90: + bne @0804BE90 + b @0804C184 +@0804BE90: ldr r0, =0x0202437c lsls r1, r2, 2 adds r1, r2 @@ -131144,22 +131144,22 @@ _0804BE90: adds r1, r0 ldr r0, [r1] cmp r0, 0 - bne _0804BEA4 - b _0804C184 -_0804BEA4: + bne @0804BEA4 + b @0804C184 +@0804BEA4: ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 - beq _0804BEB2 - b _0804C184 -_0804BEB2: + beq @0804BEB2 + b @0804C184 +@0804BEB2: ldr r0, [sp, 0x4] cmp r0, 0xA - beq _0804BEBA - b _0804C184 -_0804BEBA: + beq @0804BEBA + b @0804C184 +@0804BEBA: movs r0, 0x21 negs r0, r0 ands r3, r0 @@ -131186,10 +131186,10 @@ _0804BEBA: str r0, [r1] movs r2, 0x1 mov r10, r2 - b _0804C184 + b @0804C184 .align 2, 0 .pool -_0804BF18: +@0804BF18: ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0 @@ -131200,15 +131200,15 @@ _0804BF18: bl ability_something lsls r0, 24 cmp r0, 0 - bne _0804BF32 - b _0804C184 -_0804BF32: + bne @0804BF32 + b @0804C184 +@0804BF32: movs r3, 0x1 mov r10, r3 - b _0804C184 + b @0804C184 .align 2, 0 .pool -_0804BF3C: +@0804BF3C: ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0 @@ -131217,10 +131217,10 @@ _0804BF3C: movs r2, 0 movs r3, 0 bl ability_something - b _0804C0B2 + b @0804C0B2 .align 2, 0 .pool -_0804BF54: +@0804BF54: movs r0, 0 str r0, [sp] movs r0, 0x5 @@ -131230,17 +131230,17 @@ _0804BF54: bl ability_something lsls r0, 24 cmp r0, 0 - bne _0804BF6C - b _0804C184 -_0804BF6C: + bne @0804BF6C + b @0804C184 +@0804BF6C: movs r5, 0x1 mov r10, r5 ldr r0, =0x02024474 mov r12, r0 - b _0804C570 + b @0804C570 .align 2, 0 .pool -_0804BF7C: +@0804BF7C: ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0 @@ -131251,52 +131251,52 @@ _0804BF7C: bl ability_something lsls r0, 24 cmp r0, 0 - bne _0804BF96 - b _0804C184 -_0804BF96: + bne @0804BF96 + b @0804C184 +@0804BF96: movs r1, 0x1 mov r10, r1 - b _0804C184 + b @0804C184 .align 2, 0 .pool -_0804BFA0: +@0804BFA0: ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 lsls r1, 18 ands r0, r1 cmp r0, 0 - beq _0804BFE4 + beq @0804BFE4 ldr r2, [sp, 0x8] cmp r2, 0x1D - bne _0804BFE4 + bne @0804BFE4 ldr r0, =0x020241ec ldrh r2, [r0] adds r3, r0, 0 cmp r2, 0xA5 - beq _0804BFE4 + beq @0804BFE4 ldr r4, [sp, 0xC] ldrh r1, [r4] cmp r1, 0 - beq _0804BFCC + beq @0804BFCC ldr r0, =0x0000ffff cmp r1, r0 - bne _0804BFE4 -_0804BFCC: + bne @0804BFE4 +@0804BFCC: cmp r2, 0xE2 - bne _0804BFDE + bne @0804BFDE ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _0804BFDE - b _0804C4B6 -_0804BFDE: + bne @0804BFDE + b @0804C4B6 +@0804BFDE: ldrh r0, [r3] ldr r1, [sp, 0xC] strh r0, [r1] -_0804BFE4: +@0804BFE4: movs r4, 0 ldr r2, =0x02024084 ldr r3, =0x0202420b @@ -131310,14 +131310,14 @@ _0804BFE4: ldrh r1, [r5] mov r9, r3 cmp r0, r1 - beq _0804C01C + beq @0804C01C mov r6, r9 movs r3, 0x58 adds r5, r1, 0 -_0804C006: +@0804C006: adds r4, 0x1 cmp r4, 0x3 - bgt _0804C01C + bgt @0804C01C lsls r0, r4, 1 ldrb r1, [r6] muls r1, r3 @@ -131325,81 +131325,81 @@ _0804C006: adds r0, r2 ldrh r0, [r0] cmp r0, r5 - bne _0804C006 -_0804C01C: + bne @0804C006 +@0804C01C: cmp r4, 0x4 - bne _0804C026 + bne @0804C026 movs r0, 0 ldr r1, [sp, 0xC] strh r0, [r1] -_0804C026: +@0804C026: mov r2, r12 ldrb r0, [r2, 0x14] adds r0, 0x1 strb r0, [r2, 0x14] - b _0804C570 + b @0804C570 .align 2, 0 .pool -_0804C048: +@0804C048: movs r4, 0 ldr r0, =0x0202406c ldrb r3, [r0] cmp r4, r3 - blt _0804C054 - b _0804C202 -_0804C054: + blt @0804C054 + b @0804C202 +@0804C054: ldr r7, =0x0202449c movs r6, 0 movs r3, 0xD0 adds r5, r0, 0 ldr r2, =0x02024084 -_0804C05E: +@0804C05E: ldr r0, [r7] adds r0, r3 ldrh r1, [r0] cmp r1, 0 - beq _0804C06C + beq @0804C06C strh r1, [r2, 0x2E] strh r6, [r0] -_0804C06C: +@0804C06C: adds r3, 0x2 adds r2, 0x58 adds r4, 0x1 ldrb r0, [r5] cmp r4, r0 - blt _0804C05E - b _0804C202 + blt @0804C05E + b @0804C202 .align 2, 0 .pool -_0804C088: +@0804C088: movs r0, 0x3 movs r1, 0 movs r2, 0 bl berry_effects_maybe lsls r0, 24 cmp r0, 0 - beq _0804C184 + beq @0804C184 movs r2, 0x1 mov r10, r2 ldr r3, =0x02024474 mov r12, r3 - b _0804C570 + b @0804C570 .align 2, 0 .pool -_0804C0A8: +@0804C0A8: movs r0, 0x4 movs r1, 0 movs r2, 0 bl berry_effects_maybe -_0804C0B2: +@0804C0B2: lsls r0, 24 cmp r0, 0 - beq _0804C184 -_0804C0B8: + beq @0804C184 +@0804C0B8: movs r4, 0x1 mov r10, r4 - b _0804C184 -_0804C0BE: + b @0804C184 +@0804C0BE: ldr r1, =0x020242ac ldr r0, =0x0202420b ldrb r2, [r0] @@ -131409,27 +131409,27 @@ _0804C0BE: ldr r1, =0x000400c0 ands r0, r1 cmp r0, 0 - bne _0804C0D4 - b _0804C4B6 -_0804C0D4: + bne @0804C0D4 + b @0804C4B6 +@0804C0D4: ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 - beq _0804C0E2 - b _0804BC68 -_0804C0E2: - b _0804C4B6 + beq @0804C0E2 + b @0804BC68 +@0804C0E2: + b @0804C4B6 .align 2, 0 .pool -_0804C0F4: +@0804C0F4: ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 - bne _0804C120 + bne @0804C120 ldr r1, =0x020242ac ldr r0, =0x0202420b ldrb r2, [r0] @@ -131439,13 +131439,13 @@ _0804C0F4: ldr r1, =0x000400c0 ands r0, r1 cmp r0, 0 - beq _0804C120 + beq @0804C120 adds r0, r2, 0 bl sub_803F90C lsls r0, 24 cmp r0, 0 - beq _0804C184 -_0804C120: + beq @0804C184 +@0804C120: ldr r4, =0x02024064 ldr r5, =0x0202420b ldrb r0, [r5] @@ -131473,24 +131473,24 @@ _0804C120: movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_0804C15A: +@0804C15A: ldr r1, =0x02024474 ldrb r0, [r1, 0x14] adds r0, 0x1 strb r0, [r1, 0x14] - b _0804C5BA + b @0804C5BA .align 2, 0 .pool -_0804C184: +@0804C184: ldr r1, =0x02024474 ldrb r0, [r1, 0x14] adds r0, 0x1 strb r0, [r1, 0x14] mov r12, r1 - b _0804C570 + b @0804C570 .align 2, 0 .pool -_0804C194: +@0804C194: ldr r0, =0x0202437c ldr r6, =0x0202420c ldrb r2, [r6] @@ -131501,56 +131501,56 @@ _0804C194: ldrb r0, [r1] lsls r0, 29 cmp r0, 0 - blt _0804C202 + blt @0804C202 ldr r0, =0x0202406c ldrb r0, [r0] cmp r2, r0 - bcs _0804C202 + bcs @0804C202 ldr r5, =0x020242ac adds r0, r3, r5 ldr r0, [r0] ldr r1, =0x000400c0 ands r0, r1 cmp r0, 0 - bne _0804C1C2 - b _0804BC80 -_0804C1C2: - b _0804C202 + bne @0804C1C2 + b @0804BC80 +@0804C1C2: + b @0804C202 .align 2, 0 .pool -_0804C1D8: +@0804C1D8: movs r4, 0 ldr r0, =0x0202406c ldrb r2, [r0] cmp r4, r2 - bge _0804C202 + bge @0804C202 ldr r2, =0x020242bc ldr r5, =0xfeffffff adds r3, r0, 0 ldr r1, =0x020240d4 -_0804C1EA: +@0804C1EA: ldrb r0, [r2, 0xA] cmp r0, 0 - bne _0804C1F6 + bne @0804C1F6 ldr r0, [r1] ands r0, r5 str r0, [r1] -_0804C1F6: +@0804C1F6: adds r2, 0x1C adds r1, 0x58 adds r4, 0x1 ldrb r0, [r3] cmp r4, r0 - blt _0804C1EA -_0804C202: + blt @0804C1EA +@0804C202: mov r1, r12 ldrb r0, [r1, 0x14] adds r0, 0x1 strb r0, [r1, 0x14] - b _0804C570 + b @0804C570 .align 2, 0 .pool -_0804C21C: +@0804C21C: ldr r1, =0x02024280 ldr r3, [r1] movs r0, 0x80 @@ -131560,7 +131560,7 @@ _0804C21C: mov r9, r2 adds r5, r1, 0 cmp r0, 0 - beq _0804C246 + beq @0804C246 ldr r0, =0x02024064 ldrb r2, [r2] strb r2, [r0] @@ -131572,13 +131572,13 @@ _0804C21C: ldr r0, =0xffffefff ands r3, r0 str r3, [r5] -_0804C246: +@0804C246: ldr r0, [r5] movs r1, 0x80 lsls r1, 3 ands r0, r1 cmp r0, 0 - beq _0804C262 + beq @0804C262 ldr r0, =0x02024240 mov r2, r9 ldrb r1, [r2] @@ -131587,7 +131587,7 @@ _0804C246: ldr r0, =0x020241ec ldrh r0, [r0] strh r0, [r1] -_0804C262: +@0804C262: ldr r0, =0x02024210 ldrb r1, [r0] ldr r2, =0x0832a328 @@ -131599,9 +131599,9 @@ _0804C262: ands r1, r3 adds r6, r2, 0 cmp r1, 0 - beq _0804C27C - b _0804C3E8 -_0804C27C: + beq @0804C27C + b @0804C3E8 +@0804C27C: ldr r0, =0x0202449c ldr r1, [r0] adds r1, 0x91 @@ -131609,9 +131609,9 @@ _0804C27C: ands r1, r3 adds r7, r0, 0 cmp r1, 0 - beq _0804C28E - b _0804C3E8 -_0804C28E: + beq @0804C28E + b @0804C3E8 +@0804C28E: ldr r0, =0x0831c898 ldr r2, [sp, 0x18] lsls r1, r2, 1 @@ -131621,15 +131621,15 @@ _0804C28E: ldrb r1, [r1] mov r8, r0 cmp r1, 0x7F - bne _0804C2A4 - b _0804C3E8 -_0804C2A4: + bne @0804C2A4 + b @0804C3E8 +@0804C2A4: ldr r0, [r5] movs r1, 0x80 lsls r1, 18 ands r0, r1 cmp r0, 0 - beq _0804C308 + beq @0804C308 ldr r0, =0x02024248 lsls r1, r4, 1 adds r1, r0 @@ -131644,10 +131644,10 @@ _0804C2A4: ldr r0, =0x020241ea ldrh r0, [r0] strh r0, [r1] - b _0804C322 + b @0804C322 .align 2, 0 .pool -_0804C308: +@0804C308: ldr r1, =0x02024248 lsls r0, r4, 1 adds r0, r1 @@ -131661,7 +131661,7 @@ _0804C308: movs r1, 0x1 negs r1, r1 strh r1, [r0] -_0804C322: +@0804C322: ldr r2, =0x0202420c ldrb r3, [r2] lsls r0, r3, 2 @@ -131671,39 +131671,39 @@ _0804C322: ldr r1, [r5] ands r1, r0 cmp r1, 0 - bne _0804C340 + bne @0804C340 ldr r0, =0x02024270 adds r0, r3, r0 mov r3, r9 ldrb r1, [r3] strb r1, [r0] -_0804C340: +@0804C340: ldr r0, [r5] movs r1, 0x80 lsls r1, 18 ands r0, r1 cmp r0, 0 - beq _0804C3DC + beq @0804C3DC ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 - bne _0804C3DC + bne @0804C3DC ldr r0, =0x020241ec ldrh r3, [r0] ldr r0, =0x0000ffff cmp r3, r0 - bne _0804C390 + bne @0804C390 ldr r1, =0x02024250 ldrb r0, [r2] lsls r0, 1 adds r0, r1 strh r3, [r0] - b _0804C3E8 + b @0804C3E8 .align 2, 0 .pool -_0804C390: +@0804C390: ldr r0, =0x02024250 ldrb r1, [r2] lsls r1, 1 @@ -131714,17 +131714,17 @@ _0804C390: ldr r0, [r7] ldrb r3, [r0, 0x13] cmp r3, 0 - beq _0804C3C0 + beq @0804C3C0 ldr r0, =0x02024258 ldrb r1, [r2] lsls r1, 1 adds r1, r0 movs r0, 0x3F ands r0, r3 - b _0804C3E6 + b @0804C3E6 .align 2, 0 .pool -_0804C3C0: +@0804C3C0: ldr r0, =0x02024258 ldrb r2, [r2] lsls r2, 1 @@ -131736,26 +131736,26 @@ _0804C3C0: add r0, r8 ldrb r0, [r0, 0x2] strh r0, [r2] - b _0804C3E8 + b @0804C3E8 .align 2, 0 .pool -_0804C3DC: +@0804C3DC: ldr r0, =0x02024250 ldrb r1, [r2] lsls r1, 1 adds r1, r0 ldr r0, =0x0000ffff -_0804C3E6: +@0804C3E6: strh r0, [r1] -_0804C3E8: +@0804C3E8: mov r4, r12 ldrb r0, [r4, 0x14] adds r0, 0x1 strb r0, [r4, 0x14] - b _0804C570 + b @0804C570 .align 2, 0 .pool -_0804C3FC: +@0804C3FC: ldr r0, =0x02024210 ldrb r1, [r0] ldr r7, =0x0832a328 @@ -131767,7 +131767,7 @@ _0804C3FC: ands r1, r4 mov r9, r2 cmp r1, 0 - bne _0804C4B6 + bne @0804C4B6 ldr r6, =0x0202449c ldr r5, [r6] adds r0, r5, 0 @@ -131775,7 +131775,7 @@ _0804C3FC: ldrb r0, [r0] ands r0, r4 cmp r0, 0 - bne _0804C4B6 + bne @0804C4B6 ldr r1, =0x0831c898 ldr r2, [sp, 0x18] lsls r0, r2, 1 @@ -131786,18 +131786,18 @@ _0804C3FC: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0804C4B6 + beq @0804C4B6 ldr r0, =0x02024280 ldr r1, [r0] movs r0, 0x80 lsls r0, 18 ands r0, r1 cmp r0, 0 - beq _0804C4B6 + beq @0804C4B6 ldr r4, =0x0202420c ldrb r0, [r4] cmp r3, r0 - beq _0804C4B6 + beq @0804C4B6 ldrb r2, [r4] lsls r0, r2, 2 adds r0, r7 @@ -131805,13 +131805,13 @@ _0804C3FC: lsls r0, 28 ands r1, r0 cmp r1, 0 - bne _0804C4B6 + bne @0804C4B6 ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 - bne _0804C4B6 + bne @0804C4B6 lsls r1, r2, 1 adds r1, r5 adds r1, 0x98 @@ -131849,28 +131849,28 @@ _0804C3FC: ldrh r0, [r3] lsrs r0, 8 strb r0, [r1] -_0804C4B6: +@0804C4B6: mov r5, r12 ldrb r0, [r5, 0x14] adds r0, 0x1 strb r0, [r5, 0x14] - b _0804C570 + b @0804C570 .align 2, 0 .pool -_0804C4E4: +@0804C4E4: ldr r5, =0x02024280 ldr r2, [r5] movs r0, 0x80 lsls r0, 12 ands r0, r2 cmp r0, 0 - bne _0804C568 + bne @0804C568 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0804C568 + beq @0804C568 ldr r1, =0x0202433c ldr r0, =0x0202420b ldrb r0, [r0] @@ -131879,7 +131879,7 @@ _0804C4E4: ldrb r0, [r0, 0x1] lsls r0, 29 cmp r0, 0 - blt _0804C568 + blt @0804C568 ldr r0, =0x0831c898 mov r9, r0 ldr r1, =0x020241ea @@ -131891,13 +131891,13 @@ _0804C4E4: add r1, r9 ldrb r0, [r1, 0x6] cmp r0, 0x8 - bne _0804C568 + bne @0804C568 movs r6, 0x80 lsls r6, 2 adds r4, r6, 0 ands r4, r2 cmp r4, 0 - bne _0804C568 + bne @0804C568 ldr r7, =0x0202420c ldrb r0, [r7] bl battle_get_per_side_status @@ -131914,61 +131914,61 @@ _0804C4E4: adds r0, r1 ldrh r0, [r0, 0x28] cmp r0, 0 - beq _0804C55E - bl _0804BCAC -_0804C55E: + beq @0804C55E + bl @0804BCAC +@0804C55E: ldr r0, [r5] orrs r0, r6 str r0, [r5] ldr r2, =0x02024474 mov r12, r2 -_0804C568: +@0804C568: mov r3, r12 ldrb r0, [r3, 0x14] adds r0, 0x1 strb r0, [r3, 0x14] -_0804C570: +@0804C570: ldr r4, [sp, 0x10] cmp r4, 0x1 - bne _0804C582 + bne @0804C582 mov r5, r10 cmp r5, 0 - bne _0804C582 + bne @0804C582 movs r0, 0x11 mov r1, r12 strb r0, [r1, 0x14] -_0804C582: +@0804C582: ldr r2, [sp, 0x10] cmp r2, 0x2 - bne _0804C598 + bne @0804C598 ldr r4, [sp, 0x14] mov r3, r12 ldrb r3, [r3, 0x14] cmp r4, r3 - bne _0804C598 + bne @0804C598 movs r0, 0x11 mov r4, r12 strb r0, [r4, 0x14] -_0804C598: +@0804C598: mov r5, r12 ldrb r0, [r5, 0x14] cmp r0, 0x11 - beq _0804C5A4 - bl _0804BD14 -_0804C5A4: + beq @0804C5A4 + bl @0804BD14 +@0804C5A4: mov r1, r12 ldrb r0, [r1, 0x14] cmp r0, 0x11 - bne _0804C5BA + bne @0804C5BA mov r2, r10 cmp r2, 0 - bne _0804C5BA + bne @0804C5BA ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x3 -_0804C5B8: +@0804C5B8: str r0, [r1] -_0804C5BA: +@0804C5BA: add sp, 0x1C pop {r3-r5} mov r8, r3 @@ -131982,7 +131982,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} @@ -132008,10 +132008,10 @@ atk4A_damagecalc2: @ 804C5F4 mov r12, r2 adds r7, r3, 0 cmp r0, 0x1A - bne _0804C688 + bne @0804C688 mov r1, r8 cmp r1, 0x4 - bne _0804C688 + bne @0804C688 ldr r3, =0x0202420a strb r0, [r3] ldr r2, =0x0202427c @@ -132030,31 +132030,31 @@ atk4A_damagecalc2: @ 804C5F4 ldrb r0, [r7] ldrb r1, [r3] bl b_history__record_ability_usage_of_player - b _0804C76A + b @0804C76A .align 2, 0 .pool -_0804C678: +@0804C678: ldr r0, =0x0202427c ldrb r1, [r0] movs r2, 0x8 orrs r1, r2 strb r1, [r0] - b _0804C76A + b @0804C76A .align 2, 0 .pool -_0804C688: +@0804C688: ldr r1, =0x0831ace8 adds r0, r5, r1 ldrb r0, [r0] adds r6, r1, 0 - b _0804C74A + b @0804C74A .align 2, 0 .pool -_0804C698: +@0804C698: adds r0, r5, r6 ldrb r0, [r0] cmp r0, r8 - bne _0804C744 + bne @0804C744 adds r2, r5, 0x1 adds r3, r2, r6 ldrb r1, [r7] @@ -132066,24 +132066,24 @@ _0804C698: adds r3, r2, 0 ldrb r0, [r0] cmp r1, r0 - bne _0804C6D6 + bne @0804C6D6 adds r0, r5, 0x2 adds r0, r6 ldrb r1, [r0] cmp r1, 0 - beq _0804C678 + beq @0804C678 cmp r1, 0x5 - bne _0804C6CA + bne @0804C6CA movs r0, 0x4 orrs r4, r0 -_0804C6CA: +@0804C6CA: cmp r1, 0x14 - bne _0804C6D6 + bne @0804C6D6 movs r0, 0x2 orrs r4, r0 lsls r0, r4, 24 lsrs r4, r0, 24 -_0804C6D6: +@0804C6D6: adds r2, r3, r6 ldrb r1, [r7] movs r0, 0x58 @@ -132094,29 +132094,29 @@ _0804C6D6: ldrb r2, [r2] ldrb r1, [r1] cmp r2, r1 - bne _0804C744 + bne @0804C744 adds r0, 0x21 ldrb r1, [r0] cmp r1, r2 - beq _0804C6FE + beq @0804C6FE adds r0, r5, 0x2 adds r0, r6 ldrb r0, [r0] cmp r0, 0 - beq _0804C678 -_0804C6FE: + beq @0804C678 +@0804C6FE: cmp r1, r2 - beq _0804C714 + beq @0804C714 adds r0, r5, 0x2 adds r0, r6 ldrb r0, [r0] cmp r0, 0x5 - bne _0804C714 + bne @0804C714 movs r0, 0x4 orrs r4, r0 lsls r0, r4, 24 lsrs r4, r0, 24 -_0804C714: +@0804C714: adds r2, r3, r6 ldrb r1, [r7] movs r0, 0x58 @@ -132127,29 +132127,29 @@ _0804C714: ldrb r2, [r2] ldrb r1, [r1] cmp r2, r1 - bne _0804C744 + bne @0804C744 adds r0, 0x21 ldrb r0, [r0] cmp r0, r2 - beq _0804C744 + beq @0804C744 adds r0, r5, 0x2 adds r0, r6 ldrb r0, [r0] cmp r0, 0x14 - bne _0804C744 + bne @0804C744 movs r0, 0x2 orrs r4, r0 lsls r0, r4, 24 lsrs r4, r0, 24 -_0804C744: +@0804C744: adds r5, 0x3 adds r0, r5, r6 ldrb r0, [r0] -_0804C74A: +@0804C74A: cmp r0, 0xFF - beq _0804C76A + beq @0804C76A cmp r0, 0xFE - bne _0804C698 + bne @0804C698 ldrb r1, [r7] movs r0, 0x58 muls r0, r1 @@ -132161,8 +132161,8 @@ _0804C74A: lsls r1, 22 ands r0, r1 cmp r0, 0 - beq _0804C744 -_0804C76A: + beq @0804C744 +@0804C76A: ldr r2, =0x02024084 ldr r0, =0x0202420c mov r8, r0 @@ -132173,11 +132173,11 @@ _0804C76A: adds r0, 0x20 ldrb r6, [r0] cmp r6, 0x19 - bne _0804C7E6 + bne @0804C7E6 movs r5, 0x29 ands r5, r4 cmp r5, 0 - bne _0804C7E6 + bne @0804C7E6 ldr r0, =0x0202420b ldrb r0, [r0] ldr r7, =0x020241ea @@ -132186,16 +132186,16 @@ _0804C76A: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x2 - bne _0804C7E6 + bne @0804C7E6 adds r0, r4, 0 ands r0, r1 cmp r0, 0 - beq _0804C7AC + beq @0804C7AC movs r0, 0x6 ands r4, r0 cmp r4, 0x6 - bne _0804C7E6 -_0804C7AC: + bne @0804C7E6 +@0804C7AC: ldr r2, =0x0831c898 ldrh r1, [r7] lsls r0, r1, 1 @@ -132204,7 +132204,7 @@ _0804C7AC: adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0 - beq _0804C7E6 + beq @0804C7E6 ldr r3, =0x0202420a strb r6, [r3] ldr r2, =0x0202427c @@ -132224,13 +132224,13 @@ _0804C7AC: ldrb r0, [r2] ldrb r1, [r3] bl b_history__record_ability_usage_of_player -_0804C7E6: +@0804C7E6: ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _0804C804 + beq @0804C804 ldr r2, =0x0202433c ldr r0, =0x0202420b ldrb r1, [r0] @@ -132240,7 +132240,7 @@ _0804C7E6: movs r2, 0x2 orrs r0, r2 strb r0, [r1, 0x1] -_0804C804: +@0804C804: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -132255,7 +132255,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 @@ -132271,13 +132271,13 @@ atk4B_cmd4b: @ 804C844 ldr r0, [r2] ands r0, r1 cmp r0, 0 - bne _0804C872 + bne @0804C872 movs r0, 0 movs r1, 0 bl dp01_build_cmdbuf_x06_a ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_0804C872: +@0804C872: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -132290,12 +132290,12 @@ _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] cmp r0, 0 - bne _0804C8E4 + bne @0804C8E4 ldr r5, =0x02024214 ldr r0, [r5] ldrb r0, [r0, 0x1] @@ -132328,7 +132328,7 @@ atk4C_switch1: @ 804C894 ldr r0, [r5] adds r0, 0x2 str r0, [r5] -_0804C8E4: +@0804C8E4: pop {r4,r5} pop {r0} bx r0 @@ -132337,15 +132337,15 @@ _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 ldr r0, [r0] cmp r0, 0 - beq _0804C912 - b _0804CAA4 -_0804C912: + beq @0804C912 + b @0804CAA4 +@0804C912: ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] @@ -132366,7 +132366,7 @@ _0804C912: adds r3, r0, r6 movs r2, 0 ldr r5, =0x02023864 -_0804C93E: +@0804C93E: adds r0, r3, r2 ldrb r1, [r4] lsls r1, 9 @@ -132377,7 +132377,7 @@ _0804C93E: strb r1, [r0] adds r2, 0x1 cmp r2, 0x57 - bls _0804C93E + bls @0804C93E ldr r4, =0x02024084 ldr r6, =0x02024064 ldrb r0, [r6] @@ -132439,13 +132439,13 @@ _0804C93E: ands r1, r0 mov r12, r4 cmp r1, 0 - beq _0804C9DE + beq @0804C9DE adds r0, r5, 0 muls r0, r7 add r0, r12 movs r1, 0 strh r1, [r0, 0x2E] -_0804C9DE: +@0804C9DE: ldr r2, =0x0831c898 ldr r0, =0x020241ea ldrh r1, [r0] @@ -132455,14 +132455,14 @@ _0804C9DE: adds r0, r2 ldrb r0, [r0] cmp r0, 0x7F - bne _0804CA26 + bne @0804CA26 movs r2, 0 adds r4, r6, 0 movs r6, 0x58 mov r5, r12 adds r5, 0x18 add r3, sp, 0x18 -_0804C9FE: +@0804C9FE: ldrb r0, [r4] adds r1, r0, 0 muls r1, r6 @@ -132473,7 +132473,7 @@ _0804C9FE: strb r0, [r1] adds r2, 0x1 cmp r2, 0x7 - ble _0804C9FE + ble @0804C9FE ldr r0, =0x02024064 ldrb r1, [r0] movs r0, 0x58 @@ -132483,7 +132483,7 @@ _0804C9FE: adds r0, r1 ldr r1, [sp, 0x50] str r1, [r0] -_0804CA26: +@0804CA26: bl sub_803A284 ldr r0, =0x02022fec ldr r0, [r0] @@ -132491,7 +132491,7 @@ _0804CA26: lsls r1, 10 ands r0, r1 cmp r0, 0 - beq _0804CA78 + beq @0804CA78 ldr r4, =0x02024084 ldr r0, =0x02024064 ldrb r3, [r0] @@ -132503,9 +132503,9 @@ _0804CA26: lsrs r0, 1 ldrh r1, [r1, 0x28] cmp r0, r1 - bcc _0804CA78 + bcc @0804CA78 cmp r1, 0 - beq _0804CA78 + beq @0804CA78 adds r0, r4, 0 adds r0, 0x4C adds r0, r2, r0 @@ -132513,7 +132513,7 @@ _0804CA26: movs r1, 0x7 ands r0, r1 cmp r0, 0 - bne _0804CA78 + bne @0804CA78 ldr r0, =0x0202449c ldr r2, [r0] adds r2, 0x92 @@ -132524,7 +132524,7 @@ _0804CA26: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] -_0804CA78: +@0804CA78: ldr r0, =0x02024474 ldr r3, =0x02024064 ldrb r2, [r3] @@ -132547,7 +132547,7 @@ _0804CA78: ldr r0, [r1] adds r0, 0x2 str r0, [r1] -_0804CAA4: +@0804CAA4: add sp, 0x58 pop {r4-r7} pop {r0} @@ -132557,12 +132557,12 @@ _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] cmp r0, 0 - bne _0804CB86 + bne @0804CB86 ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] @@ -132574,13 +132574,13 @@ atk4E_switch3: @ 804CAE8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0804CB3E + bne @0804CB3E ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x063f0902 ands r0, r1 cmp r0, 0 - bne _0804CB3E + bne @0804CB3E ldr r4, =0x02024084 ldrb r0, [r6] movs r5, 0x58 @@ -132597,7 +132597,7 @@ atk4E_switch3: @ 804CAE8 ldr r2, [r1] movs r1, 0x2 bl sub_806F01C -_0804CB3E: +@0804CB3E: ldr r2, =0x02024210 ldr r1, =0x0832a328 ldr r5, =0x02024064 @@ -132629,9 +132629,9 @@ _0804CB3E: lsls r1, 11 ands r0, r1 cmp r0, 0 - beq _0804CB86 + beq @0804CB86 bl sub_81A56B4 -_0804CB86: +@0804CB86: pop {r4-r6} pop {r0} bx r0 @@ -132640,7 +132640,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} @@ -132657,7 +132657,7 @@ atk4F_jumpifcannotswitch: @ 804CBB0 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0804CC28 + bne @0804CC28 ldr r1, =0x02024084 ldrb r3, [r3] movs r0, 0x58 @@ -132668,7 +132668,7 @@ atk4F_jumpifcannotswitch: @ 804CBB0 ldr r1, =0x0400e000 ands r0, r1 cmp r0, 0 - bne _0804CBFC + bne @0804CBFC ldr r1, =0x020242ac lsls r0, r3, 2 adds r0, r1 @@ -132677,8 +132677,8 @@ atk4F_jumpifcannotswitch: @ 804CBB0 lsls r1, 3 ands r0, r1 cmp r0, 0 - beq _0804CC28 -_0804CBFC: + beq @0804CC28 +@0804CBFC: ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] lsls r0, 8 @@ -132690,17 +132690,17 @@ _0804CBFC: lsls r0, 24 orrs r1, r0 str r1, [r4] - b _0804CF00 + b @0804CF00 .align 2, 0 .pool -_0804CC28: +@0804CC28: ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 lsls r0, 15 ands r0, r1 cmp r0, 0 - beq _0804CCC0 + beq @0804CCC0 ldr r5, =0x02024064 ldrb r0, [r5] bl battle_side_get_owner @@ -132709,23 +132709,23 @@ _0804CC28: ldr r1, =0x020244ec mov r8, r1 cmp r0, 0x1 - bne _0804CC4E + bne @0804CC4E ldr r0, =0x02024744 mov r8, r0 -_0804CC4E: +@0804CC4E: movs r4, 0 ldrb r1, [r5] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0804CC5C + beq @0804CC5C movs r4, 0x3 -_0804CC5C: +@0804CC5C: adds r6, r4, 0x3 cmp r4, r6 - bge _0804CCA4 + bge @0804CCA4 ldr r7, =0x0202406e -_0804CC64: +@0804CC64: movs r0, 0x64 muls r0, r4 mov r1, r8 @@ -132734,68 +132734,68 @@ _0804CC64: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _0804CC9E + beq @0804CC9E adds r0, r5, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _0804CC9E + bne @0804CC9E adds r0, r5, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _0804CC9E + beq @0804CC9E ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 1 adds r0, r7 ldrh r0, [r0] cmp r0, r4 - bne _0804CCA4 -_0804CC9E: + bne @0804CCA4 +@0804CC9E: adds r4, 0x1 cmp r4, r6 - blt _0804CC64 -_0804CCA4: + blt @0804CC64 +@0804CCA4: cmp r4, r6 - bne _0804CCAA - b _0804CED0 -_0804CCAA: - b _0804CEF8 + bne @0804CCAA + b @0804CED0 +@0804CCAA: + b @0804CEF8 .align 2, 0 .pool -_0804CCC0: +@0804CCC0: movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0804CD8C + beq @0804CD8C movs r0, 0x80 lsls r0, 16 ands r1, r0 cmp r1, 0 - beq _0804CD00 + beq @0804CD00 ldr r5, =0x02024064 ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0804CCEC + bne @0804CCEC ldr r0, =0x020244ec - b _0804CD16 + b @0804CD16 .align 2, 0 .pool -_0804CCEC: +@0804CCEC: ldr r1, =0x02024744 mov r8, r1 ldrb r0, [r5] movs r4, 0x3 cmp r0, 0x1 - bne _0804CD32 + bne @0804CD32 movs r4, 0 - b _0804CD32 + b @0804CD32 .align 2, 0 .pool -_0804CD00: +@0804CD00: ldr r5, =0x02024064 ldrb r0, [r5] bl battle_side_get_owner @@ -132804,11 +132804,11 @@ _0804CD00: ldr r1, =0x020244ec mov r8, r1 cmp r0, 0x1 - bne _0804CD18 + bne @0804CD18 ldr r0, =0x02024744 -_0804CD16: +@0804CD16: mov r8, r0 -_0804CD18: +@0804CD18: movs r4, 0 ldrb r0, [r5] bl sub_806D864 @@ -132818,14 +132818,14 @@ _0804CD18: lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bne _0804CD32 + bne @0804CD32 movs r4, 0x3 -_0804CD32: +@0804CD32: adds r6, r4, 0x3 cmp r4, r6 - bge _0804CCA4 + bge @0804CCA4 ldr r7, =0x0202406e -_0804CD3A: +@0804CD3A: movs r0, 0x64 muls r0, r4 mov r1, r8 @@ -132834,59 +132834,59 @@ _0804CD3A: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _0804CD74 + beq @0804CD74 adds r0, r5, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _0804CD74 + bne @0804CD74 adds r0, r5, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _0804CD74 + beq @0804CD74 ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 1 adds r0, r7 ldrh r0, [r0] cmp r0, r4 - bne _0804CCA4 -_0804CD74: + bne @0804CCA4 +@0804CD74: adds r4, 0x1 cmp r4, r6 - blt _0804CD3A - b _0804CCA4 + blt @0804CD3A + b @0804CCA4 .align 2, 0 .pool -_0804CD8C: +@0804CD8C: movs r0, 0x80 lsls r0, 8 ands r1, r0 cmp r1, 0 - beq _0804CE10 + beq @0804CE10 ldr r5, =0x02024064 ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0804CE10 + bne @0804CE10 ldr r0, =0x02024744 mov r8, r0 movs r4, 0 ldrb r0, [r5] cmp r0, 0x3 - bne _0804CDB4 + bne @0804CDB4 movs r4, 0x3 -_0804CDB4: +@0804CDB4: adds r6, r4, 0x3 cmp r4, r6 - blt _0804CDBC - b _0804CCA4 -_0804CDBC: + blt @0804CDBC + b @0804CCA4 +@0804CDBC: ldr r7, =0x0202406e -_0804CDBE: +@0804CDBE: movs r0, 0x64 muls r0, r4 mov r1, r8 @@ -132895,40 +132895,40 @@ _0804CDBE: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _0804CDFA + beq @0804CDFA adds r0, r5, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _0804CDFA + bne @0804CDFA adds r0, r5, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _0804CDFA + beq @0804CDFA ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 1 adds r0, r7 ldrh r0, [r0] cmp r0, r4 - beq _0804CDFA - b _0804CCA4 -_0804CDFA: + beq @0804CDFA + b @0804CCA4 +@0804CDFA: adds r4, 0x1 cmp r4, r6 - blt _0804CDBE - b _0804CCA4 + blt @0804CDBE + b @0804CCA4 .align 2, 0 .pool -_0804CE10: +@0804CE10: ldr r0, =0x02024064 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bne _0804CE54 + bne @0804CE54 movs r0, 0x1 bl battle_get_side_with_given_state lsls r0, 24 @@ -132937,23 +132937,23 @@ _0804CE10: ldr r0, [r0] ands r0, r4 cmp r0, 0 - beq _0804CE48 + beq @0804CE48 movs r0, 0x3 bl battle_get_side_with_given_state lsls r0, 24 lsrs r6, r0, 24 - b _0804CE4A + b @0804CE4A .align 2, 0 .pool -_0804CE48: +@0804CE48: adds r6, r7, 0 -_0804CE4A: +@0804CE4A: ldr r0, =0x02024744 mov r8, r0 - b _0804CE82 + b @0804CE82 .align 2, 0 .pool -_0804CE54: +@0804CE54: movs r0, 0 bl battle_get_side_with_given_state lsls r0, 24 @@ -132963,22 +132963,22 @@ _0804CE54: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0804CE7C + beq @0804CE7C movs r0, 0x2 bl battle_get_side_with_given_state lsls r0, 24 lsrs r6, r0, 24 - b _0804CE7E + b @0804CE7E .align 2, 0 .pool -_0804CE7C: +@0804CE7C: adds r6, r7, 0 -_0804CE7E: +@0804CE7E: ldr r1, =0x020244ec mov r8, r1 -_0804CE82: +@0804CE82: movs r4, 0 -_0804CE84: +@0804CE84: movs r0, 0x64 muls r0, r4 mov r1, r8 @@ -132987,36 +132987,36 @@ _0804CE84: movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _0804CEC6 + beq @0804CEC6 adds r0, r5, 0 movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _0804CEC6 + beq @0804CEC6 adds r0, r5, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _0804CEC6 + bne @0804CEC6 ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] cmp r4, r0 - beq _0804CEC6 + beq @0804CEC6 lsls r0, r6, 1 adds r0, r1 ldrh r0, [r0] cmp r4, r0 - bne _0804CECC -_0804CEC6: + bne @0804CECC +@0804CEC6: adds r4, 0x1 cmp r4, 0x5 - ble _0804CE84 -_0804CECC: + ble @0804CE84 +@0804CECC: cmp r4, 0x6 - bne _0804CEF8 -_0804CED0: + bne @0804CEF8 +@0804CED0: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x2] @@ -133030,15 +133030,15 @@ _0804CED0: lsls r0, 24 orrs r1, r0 str r1, [r3] - b _0804CF00 + b @0804CF00 .align 2, 0 .pool -_0804CEF8: +@0804CEF8: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x6 str r0, [r1] -_0804CF00: +@0804CF00: pop {r3} mov r8, r3 pop {r4-r7} @@ -133049,7 +133049,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 @@ -133104,7 +133104,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 @@ -133130,29 +133130,29 @@ atk50_openpartyscreen: @ 804CF88 adds r0, r1, 0 mov r12, r6 cmp r0, 0x5 - beq _0804CFBE - b _0804D464 -_0804CFBE: + beq @0804CFBE + b @0804D464 +@0804CFBE: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x41 ands r1, r0 cmp r1, 0x1 - beq _0804D0B0 + beq @0804D0B0 ldr r1, =0x02024064 strb r7, [r1] ldr r0, =0x0202406c ldrb r0, [r0] cmp r7, r0 - bcc _0804CFD8 - b _0804D450 -_0804CFD8: + bcc @0804CFD8 + b @0804D450 +@0804CFD8: ldr r7, =0x02024280 ldr r6, =0x0832a328 adds r4, r1, 0 ldr r2, =0x02024210 mov r8, r2 -_0804CFE2: +@0804CFE2: ldrb r2, [r4] lsls r0, r2, 2 adds r0, r6 @@ -133161,14 +133161,14 @@ _0804CFE2: ldr r0, [r7] ands r0, r1 cmp r0, 0 - beq _0804D088 + beq @0804D088 adds r0, r2, 0 movs r1, 0x6 movs r2, 0x6 bl sub_80423F4 lsls r0, 24 cmp r0, 0 - beq _0804D054 + beq @0804D054 ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -133191,10 +133191,10 @@ _0804CFE2: bl sub_8034464 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - b _0804D098 + b @0804D098 .align 2, 0 .pool -_0804D054: +@0804D054: ldr r5, =0x0202437c ldrb r0, [r4] lsls r1, r0, 2 @@ -133204,7 +133204,7 @@ _0804D054: ldrb r0, [r1] lsls r0, 25 cmp r0, 0 - blt _0804D098 + blt @0804D098 movs r0, 0x6 bl sub_804CF10 ldrb r1, [r4] @@ -133216,17 +133216,17 @@ _0804D054: movs r2, 0x40 orrs r1, r2 strb r1, [r0] - b _0804D098 + b @0804D098 .align 2, 0 .pool -_0804D088: +@0804D088: movs r0, 0 movs r1, 0x2 movs r2, 0 bl sub_8034464 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_0804D098: +@0804D098: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] @@ -133235,16 +133235,16 @@ _0804D098: lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bcc _0804CFE2 - b _0804D450 + bcc @0804CFE2 + b @0804D450 .align 2, 0 .pool -_0804D0B0: +@0804D0B0: ands r0, r1 cmp r0, 0 - bne _0804D0B8 - b _0804D450 -_0804D0B8: + bne @0804D0B8 + b @0804D450 +@0804D0B8: ldr r0, =0x02024280 mov r8, r0 ldr r0, [r0] @@ -133253,7 +133253,7 @@ _0804D0B8: ldr r0, [r6] ands r0, r5 cmp r0, 0 - beq _0804D170 + beq @0804D170 ldr r4, =0x02024064 strb r7, [r4] movs r0, 0 @@ -133262,7 +133262,7 @@ _0804D0B8: bl sub_80423F4 lsls r0, 24 cmp r0, 0 - beq _0804D120 + beq @0804D120 ldr r2, =0x02024210 ldrb r0, [r4] lsls r0, 2 @@ -133284,10 +133284,10 @@ _0804D0B8: bl dp01_build_cmdbuf_x2A_2A_2A_2A ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - b _0804D170 + b @0804D170 .align 2, 0 .pool -_0804D120: +@0804D120: ldr r6, =0x0202437c ldrb r0, [r4] lsls r1, r0, 2 @@ -133297,7 +133297,7 @@ _0804D120: ldrb r0, [r1] lsls r0, 25 cmp r0, 0 - blt _0804D15C + blt @0804D15C ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x5E @@ -133312,10 +133312,10 @@ _0804D120: movs r2, 0x40 orrs r1, r2 strb r1, [r0] - b _0804D170 + b @0804D170 .align 2, 0 .pool -_0804D15C: +@0804D15C: movs r0, 0 movs r1, 0x2 movs r2, 0 @@ -133324,16 +133324,16 @@ _0804D15C: bl dp01_battle_side_mark_buffer_for_execution movs r0, 0x1 mov r9, r0 -_0804D170: +@0804D170: ldr r6, =0x0832a328 ldr r0, [r6, 0x8] ands r0, r5 cmp r0, 0 - beq _0804D22E + beq @0804D22E ldr r0, [r6] ands r0, r5 cmp r0, 0 - bne _0804D22E + bne @0804D22E ldr r4, =0x02024064 movs r0, 0x2 strb r0, [r4] @@ -133343,7 +133343,7 @@ _0804D170: bl sub_80423F4 lsls r0, 24 cmp r0, 0 - beq _0804D1D8 + beq @0804D1D8 ldr r2, =0x02024210 ldrb r0, [r4] lsls r0, 2 @@ -133365,10 +133365,10 @@ _0804D170: bl dp01_build_cmdbuf_x2A_2A_2A_2A ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - b _0804D22E + b @0804D22E .align 2, 0 .pool -_0804D1D8: +@0804D1D8: ldr r6, =0x0202437c ldrb r0, [r4] lsls r1, r0, 2 @@ -133378,7 +133378,7 @@ _0804D1D8: ldrb r0, [r1] lsls r0, 25 cmp r0, 0 - blt _0804D214 + blt @0804D214 ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x5C @@ -133393,27 +133393,27 @@ _0804D1D8: movs r2, 0x40 orrs r1, r2 strb r1, [r0] - b _0804D22E + b @0804D22E .align 2, 0 .pool -_0804D214: +@0804D214: movs r0, 0x1 mov r1, r9 ands r0, r1 cmp r0, 0 - bne _0804D22E + bne @0804D22E movs r0, 0 movs r1, 0x2 movs r2, 0 bl sub_8034464 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_0804D22E: +@0804D22E: ldr r6, =0x0832a328 ldr r0, [r6, 0x4] ands r0, r5 cmp r0, 0 - beq _0804D2E4 + beq @0804D2E4 ldr r4, =0x02024064 movs r0, 0x1 strb r0, [r4] @@ -133423,7 +133423,7 @@ _0804D22E: bl sub_80423F4 lsls r0, 24 cmp r0, 0 - beq _0804D290 + beq @0804D290 ldr r2, =0x02024210 ldrb r0, [r4] lsls r0, 2 @@ -133445,10 +133445,10 @@ _0804D22E: bl dp01_build_cmdbuf_x2A_2A_2A_2A ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - b _0804D2E4 + b @0804D2E4 .align 2, 0 .pool -_0804D290: +@0804D290: ldr r6, =0x0202437c ldrb r0, [r4] lsls r1, r0, 2 @@ -133458,7 +133458,7 @@ _0804D290: ldrb r0, [r1] lsls r0, 25 cmp r0, 0 - blt _0804D2CC + blt @0804D2CC ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x5F @@ -133473,10 +133473,10 @@ _0804D290: movs r2, 0x40 orrs r1, r2 strb r1, [r0] - b _0804D2E4 + b @0804D2E4 .align 2, 0 .pool -_0804D2CC: +@0804D2CC: movs r0, 0 movs r1, 0x2 movs r2, 0 @@ -133487,16 +133487,16 @@ _0804D2CC: mov r2, r9 orrs r2, r0 mov r9, r2 -_0804D2E4: +@0804D2E4: ldr r6, =0x0832a328 ldr r0, [r6, 0xC] ands r0, r5 cmp r0, 0 - beq _0804D3A2 + beq @0804D3A2 ldr r0, [r6, 0x4] ands r0, r5 cmp r0, 0 - bne _0804D3A2 + bne @0804D3A2 ldr r4, =0x02024064 movs r0, 0x3 strb r0, [r4] @@ -133506,7 +133506,7 @@ _0804D2E4: bl sub_80423F4 lsls r0, 24 cmp r0, 0 - beq _0804D34C + beq @0804D34C ldr r2, =0x02024210 ldrb r0, [r4] lsls r0, 2 @@ -133528,10 +133528,10 @@ _0804D2E4: bl dp01_build_cmdbuf_x2A_2A_2A_2A ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - b _0804D3A2 + b @0804D3A2 .align 2, 0 .pool -_0804D34C: +@0804D34C: ldr r6, =0x0202437c ldrb r0, [r4] lsls r1, r0, 2 @@ -133541,7 +133541,7 @@ _0804D34C: ldrb r0, [r1] lsls r0, 25 cmp r0, 0 - blt _0804D388 + blt @0804D388 ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x5D @@ -133556,52 +133556,52 @@ _0804D34C: movs r2, 0x40 orrs r1, r2 strb r1, [r0] - b _0804D3A2 + b @0804D3A2 .align 2, 0 .pool -_0804D388: +@0804D388: movs r0, 0x2 mov r1, r9 ands r1, r0 cmp r1, 0 - bne _0804D3A2 + bne @0804D3A2 movs r0, 0 movs r1, 0x2 movs r2, 0 bl sub_8034464 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_0804D3A2: +@0804D3A2: ldr r1, =0x0202437c ldrb r0, [r1] lsls r0, 25 cmp r0, 0 - blt _0804D3FA + blt @0804D3FA adds r0, r1, 0 adds r0, 0x28 ldrb r0, [r0] lsls r0, 25 cmp r0, 0 - blt _0804D3FA + blt @0804D3FA cmp r5, 0 - beq _0804D3FA + beq @0804D3FA ldr r0, =0x02024210 ldrb r1, [r0] ldr r0, =0x0832a328 ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _0804D3E4 + beq @0804D3E4 ldr r1, =0x02024064 movs r0, 0x2 strb r0, [r1] - b _0804D3E8 + b @0804D3E8 .align 2, 0 .pool -_0804D3E4: +@0804D3E4: ldr r0, =0x02024064 strb r1, [r0] -_0804D3E8: +@0804D3E8: movs r0, 0 movs r1, 0x2 movs r2, 0 @@ -133609,36 +133609,36 @@ _0804D3E8: ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution -_0804D3FA: +@0804D3FA: ldr r1, =0x0202437c ldrb r0, [r1, 0x14] lsls r0, 25 cmp r0, 0 - blt _0804D450 + blt @0804D450 adds r0, r1, 0 adds r0, 0x3C ldrb r0, [r0] lsls r0, 25 cmp r0, 0 - blt _0804D450 + blt @0804D450 cmp r5, 0 - beq _0804D450 + beq @0804D450 ldr r0, =0x02024210 ldrb r0, [r0] ldr r1, =0x0832a328 ldr r1, [r1, 0x4] ands r0, r1 cmp r0, 0 - beq _0804D438 + beq @0804D438 ldr r1, =0x02024064 movs r0, 0x3 - b _0804D43C + b @0804D43C .align 2, 0 .pool -_0804D438: +@0804D438: ldr r1, =0x02024064 movs r0, 0x1 -_0804D43C: +@0804D43C: strb r0, [r1] movs r0, 0 movs r1, 0x2 @@ -133647,33 +133647,33 @@ _0804D43C: ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution -_0804D450: +@0804D450: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x6 str r0, [r1] - b _0804D804 + b @0804D804 .align 2, 0 .pool -_0804D464: +@0804D464: cmp r0, 0x6 - beq _0804D46A - b _0804D658 -_0804D46A: + beq @0804D46A + b @0804D658 +@0804D46A: ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0804D478 - b _0804D5F4 -_0804D478: + beq @0804D478 + b @0804D5F4 +@0804D478: movs r0, 0x1 ands r1, r0 cmp r1, 0 - bne _0804D482 - b _0804D5F4 -_0804D482: + bne @0804D482 + b @0804D5F4 +@0804D482: ldr r7, =0x02024280 ldr r0, [r7] lsrs r5, r0, 28 @@ -133681,11 +133681,11 @@ _0804D482: ldr r0, [r4, 0x8] ands r0, r5 cmp r0, 0 - beq _0804D52A + beq @0804D52A ldr r0, [r4] ands r0, r5 cmp r0, 0 - beq _0804D52A + beq @0804D52A ldr r6, =0x02024064 movs r0, 0x2 strb r0, [r6] @@ -133696,7 +133696,7 @@ _0804D482: bl sub_80423F4 lsls r0, 24 cmp r0, 0 - beq _0804D4F8 + beq @0804D4F8 ldr r2, =0x02024210 ldrb r0, [r6] lsls r0, 2 @@ -133717,10 +133717,10 @@ _0804D482: bl dp01_build_cmdbuf_x2A_2A_2A_2A ldrb r0, [r6] bl dp01_battle_side_mark_buffer_for_execution - b _0804D52A + b @0804D52A .align 2, 0 .pool -_0804D4F8: +@0804D4F8: ldr r4, =0x0202437c ldrb r0, [r6] lsls r1, r0, 2 @@ -133730,7 +133730,7 @@ _0804D4F8: ldrb r0, [r1] lsls r0, 25 cmp r0, 0 - blt _0804D52A + blt @0804D52A ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x5C @@ -133745,16 +133745,16 @@ _0804D4F8: movs r2, 0x40 orrs r1, r2 strb r1, [r0] -_0804D52A: +@0804D52A: ldr r4, =0x0832a328 ldr r0, [r4, 0xC] ands r0, r5 cmp r0, 0 - beq _0804D5DA + beq @0804D5DA ldr r0, [r4, 0x4] ands r5, r0 cmp r5, 0 - beq _0804D5DA + beq @0804D5DA ldr r5, =0x02024064 movs r0, 0x3 strb r0, [r5] @@ -133767,7 +133767,7 @@ _0804D52A: bl sub_80423F4 lsls r0, 24 cmp r0, 0 - beq _0804D5A8 + beq @0804D5A8 ldr r2, =0x02024210 ldrb r0, [r5] lsls r0, 2 @@ -133789,10 +133789,10 @@ _0804D52A: bl dp01_build_cmdbuf_x2A_2A_2A_2A ldrb r0, [r5] bl dp01_battle_side_mark_buffer_for_execution - b _0804D5DA + b @0804D5DA .align 2, 0 .pool -_0804D5A8: +@0804D5A8: ldr r4, =0x0202437c ldrb r0, [r5] lsls r1, r0, 2 @@ -133802,7 +133802,7 @@ _0804D5A8: ldrb r0, [r1] lsls r0, 25 cmp r0, 0 - blt _0804D5DA + blt @0804D5DA ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x5D @@ -133817,19 +133817,19 @@ _0804D5A8: movs r2, 0x40 orrs r1, r2 strb r1, [r0] -_0804D5DA: +@0804D5DA: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x6 str r0, [r1] mov r12, r1 - b _0804D5F8 + b @0804D5F8 .align 2, 0 .pool -_0804D5F4: +@0804D5F4: adds r0, r2, 0x6 str r0, [r6] -_0804D5F8: +@0804D5F8: ldr r0, =0x02024280 ldr r0, [r0] lsrs r5, r0, 28 @@ -133841,13 +133841,13 @@ _0804D5F8: ands r2, r5 ldr r6, =0x0202406c cmp r2, 0 - bne _0804D634 + bne @0804D634 adds r7, r6, 0 ldrb r0, [r6] cmp r2, r0 - bcs _0804D634 + bcs @0804D634 adds r3, r1, 0 -_0804D61A: +@0804D61A: ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] @@ -133857,31 +133857,31 @@ _0804D61A: ldr r0, [r0] ands r0, r5 cmp r0, 0 - bne _0804D634 + bne @0804D634 ldrb r0, [r7] cmp r2, r0 - bcc _0804D61A -_0804D634: + bcc @0804D61A +@0804D634: ldrb r0, [r1] ldrb r6, [r6] cmp r0, r6 - beq _0804D63E - b _0804D804 -_0804D63E: + beq @0804D63E + b @0804D804 +@0804D63E: mov r1, r8 mov r2, r12 str r1, [r2] - b _0804D804 + b @0804D804 .align 2, 0 .pool -_0804D658: +@0804D658: movs r0, 0x80 ands r0, r1 movs r5, 0x1 cmp r0, 0 - beq _0804D664 + beq @0804D664 movs r5, 0 -_0804D664: +@0804D664: movs r0, 0x7F ands r0, r1 bl get_battle_side_of_something @@ -133895,21 +133895,21 @@ _0804D664: ldrb r0, [r0] lsls r0, 25 cmp r0, 0 - bge _0804D690 + bge @0804D690 ldr r0, [r6] adds r0, 0x6 str r0, [r6] - b _0804D804 + b @0804D804 .align 2, 0 .pool -_0804D690: +@0804D690: adds r0, r7, 0 movs r1, 0x6 movs r2, 0x6 bl sub_80423F4 lsls r0, 24 cmp r0, 0 - beq _0804D6E0 + beq @0804D6E0 ldr r2, =0x02024064 strb r7, [r2] ldr r3, =0x02024210 @@ -133932,10 +133932,10 @@ _0804D690: str r0, [r3] mov r0, r8 str r0, [r6] - b _0804D804 + b @0804D804 .align 2, 0 .pool -_0804D6E0: +@0804D6E0: ldr r4, =0x02024064 strb r7, [r4] ldrb r0, [r4] @@ -133990,39 +133990,39 @@ _0804D6E0: bl battle_get_per_side_status lsls r0, 24 cmp r0, 0 - bne _0804D760 + bne @0804D760 ldr r1, =0x03005d10 ldrb r0, [r1, 0x2] cmp r0, 0xFE - bhi _0804D760 + bhi @0804D760 adds r0, 0x1 strb r0, [r1, 0x2] -_0804D760: +@0804D760: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _0804D7C4 + beq @0804D7C4 ldr r1, =0x02024064 movs r0, 0 strb r0, [r1] ldr r0, =0x0202406c ldrb r0, [r0] cmp r0, 0 - beq _0804D804 + beq @0804D804 adds r4, r1, 0 -_0804D77C: +@0804D77C: ldrb r0, [r4] cmp r0, r7 - beq _0804D792 + beq @0804D792 movs r0, 0 movs r1, 0x2 movs r2, 0 bl sub_8034464 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_0804D792: +@0804D792: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] @@ -134031,11 +134031,11 @@ _0804D792: lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bcc _0804D77C - b _0804D804 + bcc @0804D77C + b @0804D804 .align 2, 0 .pool -_0804D7C4: +@0804D7C4: adds r0, r7, 0 bl battle_get_per_side_status movs r1, 0x1 @@ -134054,18 +134054,18 @@ _0804D7C4: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _0804D7F4 + beq @0804D7F4 movs r0, 0x2 eors r3, r0 strb r3, [r4] -_0804D7F4: +@0804D7F4: movs r0, 0 movs r1, 0x2 movs r2, 0 bl sub_8034464 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_0804D804: +@0804D804: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -134078,14 +134078,14 @@ _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] cmp r0, 0 - beq _0804D82C - b _0804DA8A -_0804D82C: + beq @0804D82C + b @0804DA8A +@0804D82C: ldr r4, =0x02024214 ldr r0, [r4] ldrb r0, [r0, 0x1] @@ -134095,33 +134095,33 @@ _0804D82C: ldr r0, [r4] ldrb r0, [r0, 0x2] cmp r0, 0x1 - beq _0804D8CC + beq @0804D8CC cmp r0, 0x1 - bgt _0804D858 + bgt @0804D858 cmp r0, 0 - beq _0804D862 - b _0804DA82 + beq @0804D862 + b @0804DA82 .align 2, 0 .pool -_0804D858: +@0804D858: cmp r0, 0x2 - beq _0804D8E8 + beq @0804D8E8 cmp r0, 0x3 - beq _0804D922 - b _0804DA82 -_0804D862: + beq @0804D922 + b @0804DA82 +@0804D862: movs r6, 0 ldr r0, =0x0202406c ldrb r0, [r0] cmp r6, r0 - blt _0804D86E - b _0804DA82 -_0804D86E: + blt @0804D86E + b @0804DA82 +@0804D86E: ldr r7, =0x02023864 -_0804D870: +@0804D870: ldrb r0, [r7] cmp r0, 0x22 - bne _0804D8AA + bne @0804D8AA ldr r5, =0x0202449c ldr r0, [r5] adds r0, r6, r0 @@ -134137,7 +134137,7 @@ _0804D870: ldr r4, [r0] ands r1, r4 cmp r1, 0 - bne _0804D8AA + bne @0804D8AA lsls r0, r6, 24 lsrs r0, 24 ldrb r1, [r7, 0x1] @@ -134147,7 +134147,7 @@ _0804D870: ldrb r0, [r1] orrs r4, r0 strb r4, [r1] -_0804D8AA: +@0804D8AA: movs r0, 0x80 lsls r0, 2 adds r7, r0 @@ -134155,25 +134155,25 @@ _0804D8AA: ldr r0, =0x0202406c ldrb r0, [r0] cmp r6, r0 - blt _0804D870 - b _0804DA82 + blt @0804D870 + b @0804DA82 .align 2, 0 .pool -_0804D8CC: +@0804D8CC: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _0804D8DA - b _0804DA82 -_0804D8DA: + beq @0804D8DA + b @0804DA82 +@0804D8DA: ldrb r0, [r5] bl sub_803BDA0 - b _0804DA82 + b @0804DA82 .align 2, 0 .pool -_0804D8E8: +@0804D8E8: ldr r4, =0x0202449c ldr r0, [r4] adds r0, 0x93 @@ -134185,7 +134185,7 @@ _0804D8E8: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _0804D922 + bne @0804D922 ldr r0, =0x02023864 lsls r1, r2, 9 adds r0, 0x1 @@ -134202,7 +134202,7 @@ _0804D8E8: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] -_0804D922: +@0804D922: ldr r1, =0x02024332 ldr r6, =0x02023864 ldr r7, =0x02024064 @@ -134227,7 +134227,7 @@ _0804D922: movs r0, 0x42 ands r0, r1 cmp r0, 0x42 - bne _0804DA14 + bne @0804DA14 ldrb r0, [r7] mov r3, r12 ldr r2, [r3] @@ -134310,15 +134310,15 @@ _0804D922: adds r0, r6 ldrb r0, [r0] strb r0, [r1] - b _0804DA36 + b @0804DA36 .align 2, 0 .pool -_0804DA14: +@0804DA14: movs r0, 0x80 lsls r0, 15 ands r1, r0 cmp r1, 0 - beq _0804DA30 + beq @0804DA30 ldrb r0, [r7] mov r3, r12 ldr r1, [r3] @@ -134326,11 +134326,11 @@ _0804DA14: adds r1, 0x5C ldrb r1, [r1] bl sub_80571DC - b _0804DA36 -_0804DA30: + b @0804DA36 +@0804DA30: ldrb r0, [r7] bl sub_803BDA0 -_0804DA36: +@0804DA36: ldr r1, =0x02022f58 movs r5, 0xFD strb r5, [r1] @@ -134369,12 +134369,12 @@ _0804DA36: movs r0, 0x1 negs r0, r0 strb r0, [r2, 0x4] -_0804DA82: +@0804DA82: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x3 str r0, [r1] -_0804DA8A: +@0804DA8A: pop {r4-r7} pop {r0} bx r0 @@ -134383,7 +134383,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 @@ -134435,9 +134435,9 @@ atk52_cmd52: @ 804DAAC mov r0, r10 ands r0, r1 cmp r0, 0 - beq _0804DB1C - b _0804DC30 -_0804DB1C: + beq @0804DB1C + b @0804DC30 +@0804DB1C: ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 @@ -134447,9 +134447,9 @@ _0804DB1C: movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _0804DB34 - b _0804DC30 -_0804DB34: + bne @0804DB34 + b @0804DC30 +@0804DB34: ldr r7, =0x02024084 ldrb r2, [r4] movs r6, 0x58 @@ -134460,17 +134460,17 @@ _0804DB34: adds r0, 0x21 ldrb r0, [r0] cmp r0, 0x2 - beq _0804DC30 + beq @0804DC30 adds r0, r1, 0 adds r0, 0x22 ldrb r0, [r0] cmp r0, 0x2 - beq _0804DC30 + beq @0804DC30 adds r0, r1, 0 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x1A - beq _0804DC30 + beq @0804DC30 adds r0, r2, 0 bl battle_side_get_owner lsls r0, 24 @@ -134518,10 +134518,10 @@ _0804DB34: bl __divsi3 str r0, [r5] cmp r0, 0 - bne _0804DBC8 + bne @0804DBC8 movs r0, 0x1 str r0, [r5] -_0804DBC8: +@0804DBC8: ldr r0, =0x02024474 ldrb r1, [r4] strb r1, [r0, 0x17] @@ -134530,29 +134530,29 @@ _0804DBC8: ldr r0, [r7] ldrb r0, [r0, 0x1] cmp r0, 0 - bne _0804DC14 + bne @0804DC14 ldr r0, =0x082dae90 str r0, [r7] - b _0804DD8E + b @0804DD8E .align 2, 0 .pool -_0804DC14: +@0804DC14: cmp r0, 0x1 - bne _0804DC24 + bne @0804DC24 ldr r0, =0x082dae59 mov r1, r9 str r0, [r1] - b _0804DD8E + b @0804DD8E .align 2, 0 .pool -_0804DC24: +@0804DC24: ldr r0, =0x082daec7 mov r2, r9 str r0, [r2] - b _0804DD8E + b @0804DD8E .align 2, 0 .pool -_0804DC30: +@0804DC30: ldr r2, =0x02024084 ldr r1, =0x02024064 ldrb r3, [r1] @@ -134564,7 +134564,7 @@ _0804DC30: adds r5, r1, 0 ldr r4, =0x020242bc cmp r0, 0x36 - bne _0804DC5E + bne @0804DC5E lsls r0, r3, 3 subs r0, r3 lsls r0, 2 @@ -134572,11 +134572,11 @@ _0804DC30: ldrb r1, [r2, 0x18] lsls r0, r1, 30 cmp r0, 0 - blt _0804DC5E + blt @0804DC5E movs r0, 0x1 orrs r0, r1 strb r0, [r2, 0x18] -_0804DC5E: +@0804DC5E: ldrb r0, [r5] lsls r1, r0, 3 subs r1, r0 @@ -134595,16 +134595,16 @@ _0804DC5E: bl ability_something lsls r0, 24 cmp r0, 0 - beq _0804DC88 - b _0804DD8E -_0804DC88: + beq @0804DC88 + b @0804DD8E +@0804DC88: ldrb r1, [r5] movs r0, 0 movs r2, 0 bl berry_effects_maybe lsls r0, 24 cmp r0, 0 - bne _0804DD8E + bne @0804DD8E ldrb r0, [r5] bl battle_side_get_owner ldr r1, =0x0202428e @@ -134619,34 +134619,34 @@ _0804DC88: ldr r0, =0x0202406c ldrb r7, [r0] cmp r4, r7 - bge _0804DCD8 + bge @0804DCD8 ldr r6, =0x0202407e adds r1, r5, 0 ldr r5, =0x0202407a movs r3, 0xC adds r2, r0, 0 -_0804DCC2: +@0804DCC2: adds r0, r4, r6 ldrb r0, [r0] ldrb r7, [r1] cmp r0, r7 - bne _0804DCD0 + bne @0804DCD0 adds r0, r4, r5 strb r3, [r0] -_0804DCD0: +@0804DCD0: adds r4, 0x1 ldrb r0, [r2] cmp r4, r0 - blt _0804DCC2 -_0804DCD8: + blt @0804DCC2 +@0804DCD8: movs r4, 0 ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - bge _0804DD0C + bge @0804DD0C ldr r6, =0x0202449c ldr r5, =0x02024084 -_0804DCE6: +@0804DCE6: lsls r0, r4, 24 lsrs r0, 24 bl battle_side_get_owner @@ -134664,14 +134664,14 @@ _0804DCE6: ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - blt _0804DCE6 -_0804DD0C: + blt @0804DCE6 +@0804DD0C: ldr r0, =0x02024214 ldr r1, [r0] ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x5 - bne _0804DD88 + bne @0804DD88 ldr r0, =0x02024280 ldr r0, [r0] lsrs r4, r0, 28 @@ -134680,18 +134680,18 @@ _0804DD0C: adds r0, 0x1 strb r0, [r1] ldr r2, =0x0832a328 - b _0804DD6E + b @0804DD6E .align 2, 0 .pool -_0804DD60: +@0804DD60: ldr r0, =0x0202406c ldrb r3, [r1] ldrb r0, [r0] cmp r3, r0 - bcs _0804DD88 + bcs @0804DD88 adds r0, r3, 0x1 strb r0, [r1] -_0804DD6E: +@0804DD6E: ldrb r0, [r1] lsls r0, 2 adds r0, r2 @@ -134699,17 +134699,17 @@ _0804DD6E: adds r0, r4, 0 ands r0, r3 cmp r0, 0 - beq _0804DD60 + beq @0804DD60 ldr r0, =0x02024210 ldrb r0, [r0] ands r0, r3 cmp r0, 0 - bne _0804DD60 -_0804DD88: + bne @0804DD60 +@0804DD88: ldr r0, [r5] adds r0, 0x2 str r0, [r5] -_0804DD8E: +@0804DD8E: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -134723,7 +134723,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] @@ -134746,7 +134746,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 @@ -134773,7 +134773,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 @@ -134801,7 +134801,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] @@ -134824,7 +134824,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 @@ -134848,7 +134848,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] @@ -134872,7 +134872,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] @@ -134909,9 +134909,9 @@ atk59_8025230: @ 804DEEC lsrs r5, r0, 16 ldr r0, =0x0000fffe cmp r5, r0 - bne _0804DF56 + bne @0804DF56 adds r7, r5, 0 -_0804DF3A: +@0804DF3A: ldr r0, =0x0202449c ldr r0, [r0] ldrb r1, [r0, 0x10] @@ -134924,27 +134924,27 @@ _0804DF3A: lsls r0, 16 lsrs r5, r0, 16 cmp r5, r7 - beq _0804DF3A -_0804DF56: + beq @0804DF3A +@0804DF56: cmp r5, 0 - bne _0804DF70 + bne @0804DF70 ldr r0, =0x02024214 str r4, [r0] - b _0804E018 + b @0804E018 .align 2, 0 .pool -_0804DF70: +@0804DF70: ldr r0, =0x0000ffff cmp r5, r0 - bne _0804DF88 + bne @0804DF88 ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0xA str r0, [r1] - b _0804E018 + b @0804E018 .align 2, 0 .pool -_0804DF88: +@0804DF88: movs r0, 0 bl battle_get_side_with_given_state ldr r1, =0x02024064 @@ -134958,7 +134958,7 @@ _0804DF88: ldrh r0, [r0] ldrb r1, [r1, 0x10] cmp r0, r1 - bne _0804DFC8 + bne @0804DFC8 ldr r4, =0x02024084 movs r0, 0x58 adds r2, r3, 0 @@ -134971,17 +134971,17 @@ _0804DF88: lsls r1, 14 ands r0, r1 cmp r0, 0 - bne _0804DFC8 + bne @0804DFC8 adds r0, r2, r4 adds r1, r5, 0 bl sub_80691B0 -_0804DFC8: +@0804DFC8: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0804E014 + beq @0804E014 movs r0, 0x2 bl battle_get_side_with_given_state ldr r1, =0x02024064 @@ -134995,7 +134995,7 @@ _0804DFC8: ldrh r0, [r0] ldrb r1, [r1, 0x10] cmp r0, r1 - bne _0804E014 + bne @0804E014 ldr r4, =0x02024084 movs r0, 0x58 adds r2, r3, 0 @@ -135008,14 +135008,14 @@ _0804DFC8: lsls r1, 14 ands r0, r1 cmp r0, 0 - bne _0804E014 + bne @0804E014 adds r0, r2, r4 adds r1, r5, 0 bl sub_80691B0 -_0804E014: +@0804E014: ldr r0, =0x02024214 str r6, [r0] -_0804E018: +@0804E018: pop {r4-r7} pop {r0} bx r0 @@ -135024,7 +135024,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} @@ -135036,26 +135036,26 @@ sub_804E038: @ 804E038 ldrb r1, [r0, 0x1F] adds r2, r0, 0 cmp r1, 0x6 - bls _0804E052 - b _0804E3B8 -_0804E052: + bls @0804E052 + b @0804E3B8 +@0804E052: lsls r0, r1, 2 - ldr r1, =_0804E068 + ldr r1, =@0804E068 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0804E068: - .4byte _0804E084 - .4byte _0804E0BC - .4byte _0804E162 - .4byte _0804E1B8 - .4byte _0804E1E4 - .4byte _0804E38C - .4byte _0804E3AC -_0804E084: +@0804E068: + .4byte @0804E084 + .4byte @0804E0BC + .4byte @0804E162 + .4byte @0804E1B8 + .4byte @0804E1E4 + .4byte @0804E38C + .4byte @0804E3AC +@0804E084: movs r4, 0 str r4, [sp] movs r0, 0x18 @@ -135074,20 +135074,20 @@ _0804E084: strb r4, [r0, 0x1] movs r0, 0 bl sub_8056B74 - b _0804E3B8 + b @0804E3B8 .align 2, 0 .pool -_0804E0BC: +@0804E0BC: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0804E0E4 + beq @0804E0E4 ldr r4, =0x02024332 ldrb r0, [r4, 0x1] cmp r0, 0 - beq _0804E0E4 + beq @0804E0E4 movs r0, 0x5 bl audio_play ldrb r0, [r4, 0x1] @@ -135095,17 +135095,17 @@ _0804E0BC: movs r0, 0 strb r0, [r4, 0x1] bl sub_8056B74 -_0804E0E4: +@0804E0E4: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0804E10C + beq @0804E10C ldr r4, =0x02024332 ldrb r0, [r4, 0x1] cmp r0, 0 - bne _0804E10C + bne @0804E10C movs r0, 0x5 bl audio_play ldrb r0, [r4, 0x1] @@ -135113,20 +135113,20 @@ _0804E0E4: movs r0, 0x1 strb r0, [r4, 0x1] bl sub_8056B74 -_0804E10C: +@0804E10C: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r5, 0x1 adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _0804E150 + beq @0804E150 movs r0, 0x5 bl audio_play ldr r0, =0x02024332 ldrb r4, [r0, 0x1] cmp r4, 0 - bne _0804E20A + bne @0804E20A str r5, [sp] movs r0, 0x18 movs r1, 0x8 @@ -135140,28 +135140,28 @@ _0804E10C: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - b _0804E192 + b @0804E192 .align 2, 0 .pool -_0804E150: +@0804E150: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _0804E15A - b _0804E3B8 -_0804E15A: + bne @0804E15A + b @0804E3B8 +@0804E15A: movs r0, 0x5 bl audio_play - b _0804E20A -_0804E162: + b @0804E20A +@0804E162: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0804E170 - b _0804E3B8 -_0804E170: + beq @0804E170 + b @0804E3B8 +@0804E170: bl Window_FreeMemory ldr r0, =0x020244ec ldr r1, =0x0202449c @@ -135177,64 +135177,64 @@ _0804E170: ldrh r4, [r4] str r4, [sp] bl sub_81BFA38 -_0804E192: +@0804E192: ldr r1, =0x02024474 ldrb r0, [r1, 0x1F] adds r0, 0x1 strb r0, [r1, 0x1F] - b _0804E3B8 + b @0804E3B8 .align 2, 0 .pool -_0804E1B8: +@0804E1B8: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0804E1C6 - b _0804E3B8 -_0804E1C6: + beq @0804E1C6 + b @0804E3B8 +@0804E1C6: ldr r0, =0x030022c0 ldr r1, [r0, 0x4] ldr r0, =sub_8038420 + 1 cmp r1, r0 - beq _0804E1D2 - b _0804E3B8 -_0804E1D2: + beq @0804E1D2 + b @0804E3B8 +@0804E1D2: ldrb r0, [r2, 0x1F] adds r0, 0x1 - b _0804E3B6 + b @0804E3B6 .align 2, 0 .pool -_0804E1E4: +@0804E1E4: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0804E1F2 - b _0804E3B8 -_0804E1F2: + beq @0804E1F2 + b @0804E3B8 +@0804E1F2: ldr r0, =0x030022c0 ldr r1, [r0, 0x4] ldr r0, =sub_8038420 + 1 cmp r1, r0 - beq _0804E1FE - b _0804E3B8 -_0804E1FE: + beq @0804E1FE + b @0804E3B8 +@0804E1FE: bl sub_81C1B94 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x4 - bne _0804E224 -_0804E20A: + bne @0804E224 +@0804E20A: ldr r1, =0x02024474 movs r0, 0x5 strb r0, [r1, 0x1F] - b _0804E3B8 + b @0804E3B8 .align 2, 0 .pool -_0804E224: +@0804E224: ldr r6, =0x0202449c ldr r0, [r6] ldrb r0, [r0, 0x10] @@ -135253,7 +135253,7 @@ _0804E224: adds r0, r4, 0 bl sub_806E804 cmp r0, 0 - beq _0804E274 + beq @0804E274 ldr r0, =0x0000013f ldr r1, =0x02024064 ldrb r1, [r1] @@ -135261,10 +135261,10 @@ _0804E224: ldr r1, =0x02024474 movs r0, 0x6 strb r0, [r1, 0x1F] - b _0804E3B8 + b @0804E3B8 .align 2, 0 .pool -_0804E274: +@0804E274: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -135311,14 +135311,14 @@ _0804E274: ldrh r0, [r0] ldrb r1, [r1, 0x10] cmp r0, r1 - bne _0804E30A + bne @0804E30A ldr r4, =0x02024084 ldr r0, [r4, 0x50] movs r1, 0x80 lsls r1, 14 ands r0, r1 cmp r0, 0 - bne _0804E30A + bne @0804E30A ldr r0, =0x020242bc ldrb r1, [r0, 0x18] lsrs r1, 4 @@ -135328,7 +135328,7 @@ _0804E274: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _0804E30A + bne @0804E30A adds r0, r4, 0 adds r1, r5, 0 bl sub_806B9E4 @@ -135336,20 +135336,20 @@ _0804E274: adds r0, r4, 0 adds r2, r5, 0 bl sub_8069234 -_0804E30A: +@0804E30A: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0804E3B8 + beq @0804E3B8 ldr r2, =0x0202406e ldr r0, =0x0202449c ldr r1, [r0] ldrh r0, [r2, 0x4] ldrb r1, [r1, 0x10] cmp r0, r1 - bne _0804E3B8 + bne @0804E3B8 ldr r4, =0x02024084 movs r1, 0x80 lsls r1, 1 @@ -135359,7 +135359,7 @@ _0804E30A: lsls r1, 14 ands r0, r1 cmp r0, 0 - bne _0804E3B8 + bne @0804E3B8 ldr r0, =0x020242bc adds r0, 0x50 ldrb r1, [r0] @@ -135370,7 +135370,7 @@ _0804E30A: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _0804E3B8 + bne @0804E3B8 adds r4, 0xB0 adds r0, r4, 0 adds r1, r5, 0 @@ -135380,10 +135380,10 @@ _0804E30A: adds r0, r4, 0 adds r2, r5, 0 bl sub_8069234 - b _0804E3B8 + b @0804E3B8 .align 2, 0 .pool -_0804E38C: +@0804E38C: movs r0, 0x1 str r0, [sp] movs r0, 0x18 @@ -135395,18 +135395,18 @@ _0804E38C: ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b _0804E3B8 + b @0804E3B8 .align 2, 0 .pool -_0804E3AC: +@0804E3AC: ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - bne _0804E3B8 + bne @0804E3B8 movs r0, 0x2 -_0804E3B6: +@0804E3B6: strb r0, [r2, 0x1F] -_0804E3B8: +@0804E3B8: add sp, 0x4 pop {r3} mov r8, r3 @@ -135418,19 +135418,19 @@ _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 ldrb r4, [r5, 0x1F] cmp r4, 0 - beq _0804E3E0 + beq @0804E3E0 cmp r4, 0x1 - beq _0804E410 - b _0804E4FA + beq @0804E410 + b @0804E4FA .align 2, 0 .pool -_0804E3E0: +@0804E3E0: str r4, [sp] movs r0, 0x18 movs r1, 0x8 @@ -135447,20 +135447,20 @@ _0804E3E0: strb r4, [r0, 0x1] movs r0, 0 bl sub_8056B74 - b _0804E4FA + b @0804E4FA .align 2, 0 .pool -_0804E410: +@0804E410: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0804E438 + beq @0804E438 ldr r4, =0x02024332 ldrb r0, [r4, 0x1] cmp r0, 0 - beq _0804E438 + beq @0804E438 movs r0, 0x5 bl audio_play ldrb r0, [r4, 0x1] @@ -135468,17 +135468,17 @@ _0804E410: movs r0, 0 strb r0, [r4, 0x1] bl sub_8056B74 -_0804E438: +@0804E438: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0804E460 + beq @0804E460 ldr r4, =0x02024332 ldrb r0, [r4, 0x1] cmp r0, 0 - bne _0804E460 + bne @0804E460 movs r0, 0x5 bl audio_play ldrb r0, [r4, 0x1] @@ -135486,20 +135486,20 @@ _0804E438: movs r0, 0x1 strb r0, [r4, 0x1] bl sub_8056B74 -_0804E460: +@0804E460: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r4, 0x1 adds r0, r4, 0 ands r0, r1 cmp r0, 0 - beq _0804E4C4 + beq @0804E4C4 movs r0, 0x5 bl audio_play ldr r0, =0x02024332 ldrb r0, [r0, 0x1] cmp r0, 0 - beq _0804E4A4 + beq @0804E4A4 ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -135513,15 +135513,15 @@ _0804E460: lsls r0, 24 orrs r1, r0 str r1, [r3] - b _0804E4AC + b @0804E4AC .align 2, 0 .pool -_0804E4A4: +@0804E4A4: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_0804E4AC: +@0804E4AC: movs r0, 0x1 str r0, [sp] movs r0, 0x18 @@ -135529,14 +135529,14 @@ _0804E4AC: movs r2, 0x1D movs r3, 0xD bl sub_8056A3C - b _0804E4FA + b @0804E4FA .align 2, 0 .pool -_0804E4C4: +@0804E4C4: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0804E4FA + beq @0804E4FA movs r0, 0x5 bl audio_play ldr r3, =0x02024214 @@ -135558,7 +135558,7 @@ _0804E4C4: movs r2, 0x1D movs r3, 0xD bl sub_8056A3C -_0804E4FA: +@0804E4FA: add sp, 0x4 pop {r4,r5} pop {r0} @@ -135568,7 +135568,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] @@ -135581,14 +135581,14 @@ atk5C_cmd5c: @ 804E508 movs r0, 0x29 ands r0, r1 cmp r0, 0 - bne _0804E58C + bne @0804E58C ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 lsls r1, 1 ands r0, r1 cmp r0, 0 - beq _0804E55A + beq @0804E55A ldr r1, =0x02024084 ldrb r2, [r2] movs r0, 0x58 @@ -135600,7 +135600,7 @@ atk5C_cmd5c: @ 804E508 lsls r1, 17 ands r0, r1 cmp r0, 0 - beq _0804E55A + beq @0804E55A ldr r0, =0x020242bc lsls r1, r2, 3 subs r1, r2 @@ -135608,8 +135608,8 @@ atk5C_cmd5c: @ 804E508 adds r1, r0 ldrb r0, [r1, 0xA] cmp r0, 0 - bne _0804E58C -_0804E55A: + bne @0804E58C +@0804E55A: movs r0, 0 bl dp01_build_cmdbuf_x29_29_29_29 ldr r0, =0x02024064 @@ -135619,21 +135619,21 @@ _0804E55A: ldr r0, [r1] adds r0, 0x2 str r0, [r1] - b _0804E592 + b @0804E592 .align 2, 0 .pool -_0804E58C: +@0804E58C: ldr r0, [r4] adds r0, 0x2 str r0, [r4] -_0804E592: +@0804E592: pop {r4} pop {r0} bx r0 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 @@ -135646,7 +135646,7 @@ sub_804E598: @ 804E598 movs r0, 0x80 lsls r0, 3 cmp r6, r0 - bne _0804E5D8 + bne @0804E5D8 ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0] @@ -135660,10 +135660,10 @@ sub_804E598: @ 804E598 adds r0, r1 lsls r0, 2 muls r0, r2 - b _0804E6CA + b @0804E6CA .align 2, 0 .pool -_0804E5D8: +@0804E5D8: ldr r0, =0x08310030 lsls r2, r6, 2 adds r1, r2, r6 @@ -135672,21 +135672,21 @@ _0804E5D8: ldrb r3, [r4] mov r12, r0 cmp r3, 0x1 - beq _0804E62E + beq @0804E62E cmp r3, 0x1 - bgt _0804E5F8 + bgt @0804E5F8 cmp r3, 0 - beq _0804E602 - b _0804E644 + beq @0804E602 + b @0804E644 .align 2, 0 .pool -_0804E5F8: +@0804E5F8: cmp r3, 0x2 - beq _0804E618 + beq @0804E618 cmp r3, 0x3 - beq _0804E62E - b _0804E644 -_0804E602: + beq @0804E62E + b @0804E644 +@0804E602: mov r0, r12 adds r0, 0x24 adds r0, r1, r0 @@ -135697,8 +135697,8 @@ _0804E602: lsls r0, 3 adds r0, r1 subs r0, 0x8 - b _0804E642 -_0804E618: + b @0804E642 +@0804E618: mov r0, r12 adds r0, 0x24 adds r0, r1, r0 @@ -135709,8 +135709,8 @@ _0804E618: lsls r0, 3 adds r0, r1 subs r0, 0x8 - b _0804E642 -_0804E62E: + b @0804E642 +@0804E62E: mov r0, r12 adds r0, 0x24 adds r0, r1, r0 @@ -135721,9 +135721,9 @@ _0804E62E: lsls r0, 4 adds r0, r1 subs r0, 0x10 -_0804E642: +@0804E642: ldrb r5, [r0, 0x2] -_0804E644: +@0804E644: ldr r1, =0x0831aeb8 lsls r0, r7, 2 adds r4, r0, r1 @@ -135734,36 +135734,36 @@ _0804E644: ldr r1, =0x02022fec mov r10, r1 cmp r3, 0xFF - beq _0804E67A + beq @0804E67A adds r0, r2, r6 lsls r0, 3 add r0, r12 ldrb r1, [r0, 0x1] cmp r3, r1 - beq _0804E67A + beq @0804E67A adds r2, r0, 0 adds r0, r4, 0 -_0804E66A: +@0804E66A: adds r0, 0x4 adds r7, 0x1 ldrb r1, [r0] cmp r1, 0xFF - beq _0804E67A + beq @0804E67A ldrb r3, [r2, 0x1] cmp r1, r3 - bne _0804E66A -_0804E67A: + bne @0804E66A +@0804E67A: mov r0, r10 ldr r1, [r0] movs r0, 0x80 lsls r0, 8 ands r0, r1 cmp r0, 0 - bne _0804E6B4 + bne @0804E6B4 movs r0, 0x1 ands r1, r0 cmp r1, 0 - beq _0804E6B4 + beq @0804E6B4 mov r3, r8 ldr r0, [r3] adds r0, 0x4A @@ -135775,10 +135775,10 @@ _0804E67A: add r0, r9 ldrb r0, [r0, 0x1] lsls r0, 1 - b _0804E6C8 + b @0804E6C8 .align 2, 0 .pool -_0804E6B4: +@0804E6B4: mov r1, r8 ldr r0, [r1] adds r0, 0x4A @@ -135789,9 +135789,9 @@ _0804E6B4: lsls r0, r7, 2 add r0, r9 ldrb r0, [r0, 0x1] -_0804E6C8: +@0804E6C8: muls r0, r1 -_0804E6CA: +@0804E6CA: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -135802,7 +135802,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] @@ -135814,12 +135814,12 @@ sub_804E6D8: @ 804E6D8 lsls r1, 8 ands r0, r1 cmp r0, 0 - beq _0804E6FC + beq @0804E6FC ldr r0, =0x02038bcc ldrh r0, [r0] bl sub_804E598 adds r4, r0 -_0804E6FC: +@0804E6FC: ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x92 @@ -135863,7 +135863,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} @@ -135877,13 +135877,13 @@ atk5E_8025A70: @ 804E764 ldrb r0, [r5] mov r8, r4 cmp r0, 0 - beq _0804E794 + beq @0804E794 cmp r0, 0x1 - beq _0804E7AC - b _0804E800 + beq @0804E7AC + b @0804E800 .align 2, 0 .pool -_0804E794: +@0804E794: movs r0, 0 movs r1, 0 movs r2, 0 @@ -135893,12 +135893,12 @@ _0804E794: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] - b _0804E800 -_0804E7AC: + b @0804E800 +@0804E7AC: ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - bne _0804E800 + bne @0804E800 ldrb r0, [r6] lsls r0, 9 ldr r1, =0x02023868 @@ -135912,7 +135912,7 @@ _0804E7AC: subs r7, 0x18 mov r3, r12 adds r3, 0xC -_0804E7CE: +@0804E7CE: lsls r1, r2, 1 ldrb r0, [r4] muls r0, r5 @@ -135933,12 +135933,12 @@ _0804E7CE: adds r3, 0x2 adds r2, 0x1 cmp r2, 0x3 - ble _0804E7CE + ble @0804E7CE mov r1, r8 ldr r0, [r1] adds r0, 0x2 str r0, [r1] -_0804E800: +@0804E800: pop {r3} mov r8, r3 pop {r4-r7} @@ -135949,7 +135949,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 @@ -135966,15 +135966,15 @@ atk5F_8025B24: @ 804E818 adds r0, r1, 0 ands r0, r3 cmp r0, 0 - beq _0804E854 + beq @0804E854 ldr r0, =0xffffefff ands r1, r0 - b _0804E856 + b @0804E856 .align 2, 0 .pool -_0804E854: +@0804E854: orrs r1, r3 -_0804E856: +@0804E856: str r1, [r2] ldr r1, =0x02024214 ldr r0, [r1] @@ -135987,19 +135987,19 @@ _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] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0804E882 + bne @0804E882 ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] bl sav12_xor_increment -_0804E882: +@0804E882: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x2 @@ -136011,7 +136011,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} @@ -136019,7 +136019,7 @@ atk61_8025BA4: @ 804E898 ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - bne _0804E94C + bne @0804E94C ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] @@ -136032,14 +136032,14 @@ atk61_8025BA4: @ 804E898 ldr r1, =0x02024744 mov r8, r1 cmp r0, 0 - bne _0804E8CA + bne @0804E8CA ldr r0, =0x020244ec mov r8, r0 -_0804E8CA: +@0804E8CA: movs r7, 0 add r6, sp, 0x4 mov r5, sp -_0804E8D0: +@0804E8D0: movs r0, 0x64 muls r0, r7 mov r1, r8 @@ -136048,22 +136048,22 @@ _0804E8D0: movs r1, 0x41 bl pokemon_getattr cmp r0, 0 - beq _0804E8F4 + beq @0804E8F4 adds r0, r4, 0 movs r1, 0x41 bl pokemon_getattr movs r1, 0xCE lsls r1, 1 cmp r0, r1 - bne _0804E914 -_0804E8F4: + bne @0804E914 +@0804E8F4: ldr r0, =0x0000ffff strh r0, [r5] movs r0, 0 - b _0804E926 + b @0804E926 .align 2, 0 .pool -_0804E914: +@0804E914: adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr @@ -136071,13 +136071,13 @@ _0804E914: adds r0, r4, 0 movs r1, 0x37 bl pokemon_getattr -_0804E926: +@0804E926: str r0, [r6] adds r6, 0x8 adds r5, 0x8 adds r7, 0x1 cmp r7, 0x5 - ble _0804E8D0 + ble @0804E8D0 movs r0, 0 mov r1, sp movs r2, 0x1 @@ -136089,7 +136089,7 @@ _0804E926: ldr r0, [r1] adds r0, 0x2 str r0, [r1] -_0804E94C: +@0804E94C: add sp, 0x30 pop {r3} mov r8, r3 @@ -136101,7 +136101,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] @@ -136124,22 +136124,22 @@ 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] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0 - beq _0804E9B4 + beq @0804E9B4 ldr r0, =0x020241ea ldr r1, =0x020241ee ldrh r1, [r1] strh r1, [r0] - b _0804E9C2 + b @0804E9C2 .align 2, 0 .pool -_0804E9B4: +@0804E9B4: ldr r2, =0x020241ec ldr r1, =0x020241ea ldr r0, =0x020241ee @@ -136147,7 +136147,7 @@ _0804E9B4: strh r0, [r1] strh r0, [r2] adds r0, r1, 0 -_0804E9C2: +@0804E9C2: ldr r3, =0x082d86a8 ldr r2, =0x0831c898 ldrh r1, [r0] @@ -136168,12 +136168,12 @@ _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] cmp r0, 0 - bne _0804EA5C + bne @0804EA5C ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] @@ -136188,7 +136188,7 @@ atk64_statusanimation: @ 804E9F4 ldr r1, =0x000400c0 ands r0, r1 cmp r0, 0 - bne _0804EA54 + bne @0804EA54 ldr r0, =0x020242bc lsls r1, r2, 3 subs r1, r2 @@ -136196,13 +136196,13 @@ atk64_statusanimation: @ 804E9F4 adds r1, r0 ldrb r0, [r1, 0xA] cmp r0, 0 - bne _0804EA54 + bne @0804EA54 ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 - bne _0804EA54 + bne @0804EA54 ldr r1, =0x02024084 movs r0, 0x58 muls r0, r2 @@ -136214,12 +136214,12 @@ atk64_statusanimation: @ 804E9F4 bl dp01_build_cmdbuf_x1B_aaaa_b ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_0804EA54: +@0804EA54: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x2 str r0, [r1] -_0804EA5C: +@0804EA5C: pop {r4} pop {r0} bx r0 @@ -136228,12 +136228,12 @@ _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] cmp r0, 0 - bne _0804EB04 + bne @0804EB04 ldr r4, =0x02024214 ldr r0, [r4] ldrb r0, [r0, 0x1] @@ -136259,7 +136259,7 @@ atk65_8025D90: @ 804EA84 ldr r1, =0x000400c0 ands r0, r1 cmp r0, 0 - bne _0804EAFC + bne @0804EAFC ldr r0, =0x020242bc lsls r1, r2, 3 subs r1, r2 @@ -136267,13 +136267,13 @@ atk65_8025D90: @ 804EA84 adds r1, r0 ldrb r0, [r1, 0xA] cmp r0, 0 - bne _0804EAFC + bne @0804EAFC ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 - bne _0804EAFC + bne @0804EAFC ldr r1, =0x02024084 movs r0, 0x58 muls r0, r2 @@ -136286,12 +136286,12 @@ atk65_8025D90: @ 804EA84 bl dp01_build_cmdbuf_x1B_aaaa_b ldrb r0, [r5] bl dp01_battle_side_mark_buffer_for_execution -_0804EAFC: +@0804EAFC: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x6 str r0, [r1] -_0804EB04: +@0804EB04: pop {r4,r5} pop {r0} bx r0 @@ -136300,12 +136300,12 @@ _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] cmp r0, 0 - bne _0804EB9E + bne @0804EB9E ldr r4, =0x02024214 ldr r0, [r4] ldrb r0, [r0, 0x1] @@ -136331,7 +136331,7 @@ atk66_8025E38: @ 804EB2C ldr r1, =0x000400c0 ands r0, r1 cmp r0, 0 - bne _0804EB96 + bne @0804EB96 ldr r0, =0x020242bc lsls r1, r3, 3 subs r1, r3 @@ -136339,24 +136339,24 @@ atk66_8025E38: @ 804EB2C adds r1, r0 ldrb r0, [r1, 0xA] cmp r0, 0 - bne _0804EB96 + bne @0804EB96 ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 - bne _0804EB96 + bne @0804EB96 ldrb r1, [r4, 0x2] movs r0, 0 bl dp01_build_cmdbuf_x1B_aaaa_b ldrb r0, [r5] bl dp01_battle_side_mark_buffer_for_execution -_0804EB96: +@0804EB96: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x7 str r0, [r1] -_0804EB9E: +@0804EB9E: pop {r4,r5} pop {r0} bx r0 @@ -136365,19 +136365,19 @@ _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 ldrb r4, [r5] cmp r4, 0 - beq _0804EBD8 + beq @0804EBD8 cmp r4, 0x1 - beq _0804EC04 - b _0804EC96 + beq @0804EC04 + b @0804EC96 .align 2, 0 .pool -_0804EBD8: +@0804EBD8: str r4, [sp] movs r0, 0x18 movs r1, 0x8 @@ -136393,19 +136393,19 @@ _0804EBD8: strb r4, [r5, 0x1] movs r0, 0 bl sub_8056B74 - b _0804EC96 + b @0804EC96 .align 2, 0 .pool -_0804EC04: +@0804EC04: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0804EC2A + beq @0804EC2A ldrb r0, [r5, 0x1] cmp r0, 0 - beq _0804EC2A + beq @0804EC2A movs r0, 0x5 bl audio_play ldrb r0, [r5, 0x1] @@ -136413,17 +136413,17 @@ _0804EC04: movs r0, 0 strb r0, [r5, 0x1] bl sub_8056B74 -_0804EC2A: +@0804EC2A: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0804EC52 + beq @0804EC52 ldr r4, =0x02024332 ldrb r0, [r4, 0x1] cmp r0, 0 - bne _0804EC52 + bne @0804EC52 movs r0, 0x5 bl audio_play ldrb r0, [r4, 0x1] @@ -136431,26 +136431,26 @@ _0804EC2A: movs r0, 0x1 strb r0, [r4, 0x1] bl sub_8056B74 -_0804EC52: +@0804EC52: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0804EC70 + beq @0804EC70 ldr r0, =0x02024332 movs r4, 0x1 strb r4, [r0, 0x1] - b _0804EC7A + b @0804EC7A .align 2, 0 .pool -_0804EC70: +@0804EC70: movs r4, 0x1 adds r0, r4, 0 ands r0, r1 cmp r0, 0 - beq _0804EC96 -_0804EC7A: + beq @0804EC96 +@0804EC7A: movs r0, 0x5 bl audio_play str r4, [sp] @@ -136463,7 +136463,7 @@ _0804EC7A: ldr r0, [r1] adds r0, 0x1 str r0, [r1] -_0804EC96: +@0804EC96: add sp, 0x4 pop {r4,r5} pop {r0} @@ -136473,24 +136473,24 @@ _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 ldr r5, =0x02024214 ldrb r0, [r2] cmp r1, r0 - bge _0804ECC2 + bge @0804ECC2 ldr r4, =0x0202407a movs r3, 0xC -_0804ECB6: +@0804ECB6: adds r0, r1, r4 strb r3, [r0] adds r1, 0x1 ldrb r0, [r2] cmp r1, r0 - blt _0804ECB6 -_0804ECC2: + blt @0804ECB6 +@0804ECC2: ldr r0, [r5] adds r0, 0x1 str r0, [r5] @@ -136502,7 +136502,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 @@ -136513,7 +136513,7 @@ atk69_8025FE0: @ 804ECDC adds r1, r0, r7 ldrh r0, [r1, 0x2E] cmp r0, 0xAF - bne _0804ED10 + bne @0804ED10 ldr r1, =0x02024404 lsls r0, r2, 3 subs r0, r2 @@ -136521,10 +136521,10 @@ atk69_8025FE0: @ 804ECDC adds r0, r1 ldrb r4, [r0, 0x7] ldrb r6, [r0, 0x1A] - b _0804ED2A + b @0804ED2A .align 2, 0 .pool -_0804ED10: +@0804ED10: ldrh r0, [r1, 0x2E] bl itemid_get_x12 lsls r0, 24 @@ -136536,13 +136536,13 @@ _0804ED10: bl itemid_get_quality lsls r0, 24 lsrs r6, r0, 24 -_0804ED2A: +@0804ED2A: ldr r1, =0x0202420f ldr r5, =0x0202420c ldrb r0, [r5] strb r0, [r1] cmp r4, 0x27 - bne _0804ED68 + bne @0804ED68 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -136551,7 +136551,7 @@ _0804ED2A: lsls r0, 16 lsrs r0, 16 cmp r0, r6 - bcs _0804ED68 + bcs @0804ED68 ldrb r0, [r5] movs r1, 0x27 bl b_history__record_item_x12_of_player @@ -136565,7 +136565,7 @@ _0804ED2A: movs r2, 0x80 orrs r1, r2 strb r1, [r0] -_0804ED68: +@0804ED68: ldr r2, =0x02024084 ldr r3, =0x0202420c ldrb r4, [r3] @@ -136580,7 +136580,7 @@ _0804ED68: ands r1, r0 adds r5, r2, 0 cmp r1, 0 - bne _0804EE38 + bne @0804EE38 ldr r2, =0x0831c898 ldr r0, =0x020241ea ldrh r1, [r0] @@ -136590,14 +136590,14 @@ _0804ED68: adds r0, r2 ldrb r0, [r0] cmp r0, 0x65 - beq _0804EDBA + beq @0804EDBA ldr r0, =0x0202433c lsls r1, r4, 4 adds r1, r0 ldrb r0, [r1] lsls r0, 30 cmp r0, 0 - blt _0804EDBA + blt @0804EDBA ldr r0, =0x0202437c lsls r1, r4, 2 adds r1, r4 @@ -136606,8 +136606,8 @@ _0804ED68: ldrb r0, [r1] lsrs r0, 7 cmp r0, 0 - beq _0804EE38 -_0804EDBA: + beq @0804EE38 +@0804EDBA: ldrb r0, [r3] movs r4, 0x58 muls r0, r4 @@ -136616,7 +136616,7 @@ _0804EDBA: ldr r2, =0x020241f0 ldr r0, [r2] cmp r1, r0 - bgt _0804EE38 + bgt @0804EE38 subs r0, r1, 0x1 str r0, [r2] ldr r1, =0x0202433c @@ -136626,16 +136626,16 @@ _0804EDBA: ldrb r0, [r0] lsls r0, 30 cmp r0, 0 - bge _0804EE10 + bge @0804EE10 ldr r0, =0x0202427c ldrb r1, [r0] movs r2, 0x40 orrs r1, r2 strb r1, [r0] - b _0804EE38 + b @0804EE38 .align 2, 0 .pool -_0804EE10: +@0804EE10: ldr r0, =0x0202437c lsls r1, r3, 2 adds r1, r3 @@ -136644,7 +136644,7 @@ _0804EE10: ldrb r0, [r1] lsrs r0, 7 cmp r0, 0 - beq _0804EE38 + beq @0804EE38 ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x80 @@ -136656,7 +136656,7 @@ _0804EE10: adds r0, r5 ldrh r0, [r0, 0x2E] strh r0, [r1] -_0804EE38: +@0804EE38: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -136669,7 +136669,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 @@ -136720,7 +136720,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] @@ -136747,52 +136747,52 @@ 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 ldrb r1, [r0, 0x1E] adds r4, r0, 0 cmp r1, 0 - bne _0804EF28 + bne @0804EF28 bl sub_804F498 cmp r0, 0 - beq _0804EF24 + beq @0804EF24 movs r0, 0x3 - b _0804EF26 + b @0804EF26 .align 2, 0 .pool -_0804EF24: +@0804EF24: movs r0, 0x1 -_0804EF26: +@0804EF26: strb r0, [r4, 0x1E] -_0804EF28: +@0804EF28: ldrb r0, [r4, 0x1E] subs r0, 0x1 cmp r0, 0x9 - bls _0804EF32 - b _0804F0F2 -_0804EF32: + bls @0804EF32 + b @0804F0F2 +@0804EF32: lsls r0, 2 - ldr r1, =_0804EF40 + ldr r1, =@0804EF40 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0804EF40: - .4byte _0804EF68 - .4byte _0804EF94 - .4byte _0804EFAC - .4byte _0804F000 - .4byte _0804F014 - .4byte _0804F02C - .4byte _0804F014 - .4byte _0804F04C - .4byte _0804F07C - .4byte _0804F0C0 -_0804EF68: +@0804EF40: + .4byte @0804EF68 + .4byte @0804EF94 + .4byte @0804EFAC + .4byte @0804F000 + .4byte @0804F014 + .4byte @0804F02C + .4byte @0804F014 + .4byte @0804F04C + .4byte @0804F07C + .4byte @0804F0C0 +@0804EF68: ldr r1, =0x02022e1e movs r0, 0x60 strh r0, [r1] @@ -136806,23 +136806,23 @@ _0804EF68: ldr r1, =0x02024474 movs r0, 0x2 strb r0, [r1, 0x1E] - b _0804F0F2 + b @0804F0F2 .align 2, 0 .pool -_0804EF94: +@0804EF94: bl sub_804F1CC lsls r0, 24 cmp r0, 0 - beq _0804EFA0 - b _0804F0F2 -_0804EFA0: + beq @0804EFA0 + b @0804F0F2 +@0804EFA0: ldr r1, =0x02024474 movs r0, 0x3 strb r0, [r1, 0x1E] - b _0804F0F2 + b @0804F0F2 .align 2, 0 .pool -_0804EFAC: +@0804EFAC: ldr r1, =0x02022e18 movs r0, 0 strh r0, [r1] @@ -136853,47 +136853,47 @@ _0804EFAC: ldr r1, =0x02024474 movs r0, 0x4 strb r0, [r1, 0x1E] - b _0804F0F2 + b @0804F0F2 .align 2, 0 .pool -_0804F000: +@0804F000: bl sub_804F100 movs r0, 0xD bl Window_WriteStandardTileMap movs r0, 0xD movs r1, 0x3 bl Window_CopyToVram - b _0804F06A -_0804F014: + b @0804F06A +@0804F014: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _0804F0F2 + bne @0804F0F2 ldr r0, =0x02022e1a strh r1, [r0] - b _0804F06A + b @0804F06A .align 2, 0 .pool -_0804F02C: +@0804F02C: ldr r0, =0x030022c0 ldrh r0, [r0, 0x2E] cmp r0, 0 - beq _0804F0F2 + beq @0804F0F2 movs r0, 0x5 bl audio_play bl sub_804F144 movs r0, 0xD movs r1, 0x2 bl Window_CopyToVram - b _0804F06A + b @0804F06A .align 2, 0 .pool -_0804F04C: +@0804F04C: ldr r0, =0x030022c0 ldrh r0, [r0, 0x2E] cmp r0, 0 - beq _0804F0F2 + beq @0804F0F2 movs r0, 0x5 bl audio_play movs r0, 0x81 @@ -136903,19 +136903,19 @@ _0804F04C: movs r2, 0x1D movs r3, 0x13 bl sub_8056A3C -_0804F06A: +@0804F06A: ldr r1, =0x02024474 ldrb r0, [r1, 0x1E] adds r0, 0x1 strb r0, [r1, 0x1E] - b _0804F0F2 + b @0804F0F2 .align 2, 0 .pool -_0804F07C: +@0804F07C: bl sub_804F344 lsls r0, 24 cmp r0, 0 - bne _0804F0F2 + bne @0804F0F2 movs r0, 0xE bl Window_FillTileMap movs r0, 0xE @@ -136935,14 +136935,14 @@ _0804F07C: ldr r1, =0x02024474 movs r0, 0xA strb r0, [r1, 0x1E] - b _0804F0F2 + b @0804F0F2 .align 2, 0 .pool -_0804F0C0: +@0804F0C0: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0804F0F2 + bne @0804F0F2 movs r0, 0 movs r1, 0x7 movs r2, 0 @@ -136959,7 +136959,7 @@ _0804F0C0: ldr r0, [r1] adds r0, 0x1 str r0, [r1] -_0804F0F2: +@0804F0F2: add sp, 0x4 pop {r4} pop {r0} @@ -136969,7 +136969,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 @@ -137000,7 +137000,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 @@ -137027,7 +137027,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 @@ -137059,47 +137059,47 @@ sub_804F17C: @ 804F17C thumb_func_end sub_804F17C thumb_func_start sub_804F1CC -sub_804F1CC: @ 804F1CC +sub_804F1CC: ; 804F1CC push {r4,r5,lr} bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _0804F1DC + beq @0804F1DC movs r0, 0x1 - b _0804F216 -_0804F1DC: + b @0804F216 +@0804F1DC: ldr r4, =0x02022e1c ldrh r1, [r4] movs r5, 0x80 lsls r5, 2 cmp r1, r5 - bne _0804F1F0 + bne @0804F1F0 movs r0, 0 - b _0804F216 + b @0804F216 .align 2, 0 .pool -_0804F1F0: +@0804F1F0: movs r0, 0xD0 lsls r0, 1 cmp r1, r0 - bne _0804F1FC + bne @0804F1FC bl sub_804F220 -_0804F1FC: +@0804F1FC: ldrh r0, [r4] adds r0, 0x8 strh r0, [r4] lsls r0, 16 ldr r1, =0x01ff0000 cmp r0, r1 - bls _0804F20C + bls @0804F20C strh r5, [r4] -_0804F20C: +@0804F20C: ldrh r1, [r4] eors r1, r5 negs r0, r1 orrs r0, r1 lsrs r0, 31 -_0804F216: +@0804F216: pop {r4,r5} pop {r1} bx r1 @@ -137108,7 +137108,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} @@ -137193,9 +137193,9 @@ sub_804F220: @ 804F220 bl RepeatChar adds r5, r0, 0 cmp r7, 0xFF - beq _0804F320 + beq @0804F320 cmp r7, 0 - bne _0804F300 + bne @0804F300 movs r1, 0 movs r2, 0xC bl sub_80091EC @@ -137205,10 +137205,10 @@ sub_804F220: @ 804F220 bl sub_80091EC adds r5, r0, 0 movs r0, 0xB5 - b _0804F318 + b @0804F318 .align 2, 0 .pool -_0804F300: +@0804F300: adds r0, r5, 0 movs r1, 0 movs r2, 0xE @@ -137219,12 +137219,12 @@ _0804F300: bl sub_80091EC adds r5, r0, 0 movs r0, 0xB6 -_0804F318: +@0804F318: strb r0, [r5] adds r5, 0x1 movs r0, 0xFF strb r0, [r5] -_0804F320: +@0804F320: mov r0, sp movs r1, 0xA strb r1, [r0, 0x7] @@ -137244,7 +137244,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] @@ -137252,25 +137252,25 @@ sub_804F344: @ 804F344 lsls r3, 1 adds r2, r0, 0 cmp r1, r3 - bne _0804F35C + bne @0804F35C movs r0, 0 - b _0804F380 + b @0804F380 .align 2, 0 .pool -_0804F35C: +@0804F35C: ldrh r0, [r2] adds r1, r0, 0 subs r1, 0x10 ldr r0, =0x0000019f cmp r1, r0 - bgt _0804F370 + bgt @0804F370 strh r3, [r2] - b _0804F372 + b @0804F372 .align 2, 0 .pool -_0804F370: +@0804F370: strh r1, [r2] -_0804F372: +@0804F372: ldrh r1, [r2] movs r0, 0xD0 lsls r0, 1 @@ -137278,13 +137278,13 @@ _0804F372: negs r0, r1 orrs r0, r1 lsrs r0, 31 -_0804F380: +@0804F380: pop {r1} bx r1 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} @@ -137367,7 +137367,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 @@ -137377,17 +137377,17 @@ sub_804F450: @ 804F450 strh r1, [r2, 0x24] lsls r1, 16 cmp r1, 0 - beq _0804F470 + beq @0804F470 movs r0, 0x1 strh r0, [r2, 0x2E] - b _0804F48C + b @0804F48C .align 2, 0 .pool -_0804F470: +@0804F470: movs r1, 0x2E ldrsh r0, [r2, r1] cmp r0, 0 - beq _0804F48C + beq @0804F48C adds r0, r2, 0 bl obj_delete_and_free_tiles ldr r4, =0x0000d75a @@ -137395,7 +137395,7 @@ _0804F470: bl gpu_tile_obj_free_by_tag adds r0, r4, 0 bl gpu_pal_free_tag -_0804F48C: +@0804F48C: pop {r4} pop {r0} bx r0 @@ -137404,7 +137404,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 @@ -137412,30 +137412,30 @@ sub_804F498: @ 804F498 ldrh r1, [r3] ldrb r2, [r0, 0x10] cmp r1, r2 - beq _0804F4BA + beq @0804F4BA ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0804F4CC + beq @0804F4CC ldrh r0, [r3, 0x4] cmp r0, r2 - bne _0804F4CC -_0804F4BA: + bne @0804F4CC +@0804F4BA: movs r0, 0x1 - b _0804F4CE + b @0804F4CE .align 2, 0 .pool -_0804F4CC: +@0804F4CC: movs r0, 0 -_0804F4CE: +@0804F4CE: pop {r1} bx r1 thumb_func_end sub_804F498 thumb_func_start sub_804F4D4 -sub_804F4D4: @ 804F4D4 +sub_804F4D4: ; 804F4D4 push {lr} bl sub_803F988 ldr r1, =0x02024214 @@ -137449,7 +137449,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 @@ -137466,7 +137466,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] @@ -137490,7 +137490,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] @@ -137513,7 +137513,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] @@ -137535,7 +137535,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 @@ -137549,14 +137549,14 @@ 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] bl sub_803EC20 lsls r0, 24 cmp r0, 0 - beq _0804F5E8 + beq @0804F5E8 ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -137570,15 +137570,15 @@ atk72_flee: @ 804F5B4 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _0804F5F0 + b @0804F5F0 .align 2, 0 .pool -_0804F5E8: +@0804F5E8: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_0804F5F0: +@0804F5F0: pop {r0} bx r0 .align 2, 0 @@ -137586,14 +137586,14 @@ _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] movs r6, 0x1 ands r4, r6 cmp r4, 0 - bne _0804F68E + bne @0804F68E ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] @@ -137614,49 +137614,49 @@ atk73_cmd73: @ 804F5F8 ldrh r1, [r1, 0x2C] bl __divsi3 cmp r0, 0 - bne _0804F636 + bne @0804F636 movs r0, 0x1 -_0804F636: +@0804F636: cmp r0, 0x45 - bgt _0804F63E + bgt @0804F63E cmp r5, 0 - bne _0804F65C -_0804F63E: + bne @0804F65C +@0804F63E: ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0xB1 strb r4, [r0] - b _0804F68E + b @0804F68E .align 2, 0 .pool -_0804F65C: +@0804F65C: cmp r0, 0x27 - ble _0804F670 + ble @0804F670 ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0xB1 strb r6, [r0] - b _0804F68E + b @0804F68E .align 2, 0 .pool -_0804F670: +@0804F670: cmp r0, 0x9 - ble _0804F684 + ble @0804F684 ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0xB1 movs r1, 0x2 - b _0804F68C + b @0804F68C .align 2, 0 .pool -_0804F684: +@0804F684: ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0xB1 movs r1, 0x3 -_0804F68C: +@0804F68C: strb r1, [r0] -_0804F68E: +@0804F68E: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x2 @@ -137669,7 +137669,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} @@ -137679,7 +137679,7 @@ atk74_hp_tresholds_2: @ 804F6A4 mov r8, r0 ands r7, r0 cmp r7, 0 - bne _0804F73E + bne @0804F73E ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] @@ -137712,35 +137712,35 @@ atk74_hp_tresholds_2: @ 804F6A4 bl __divsi3 adds r1, r0, 0 cmp r4, r5 - bcc _0804F71C + bcc @0804F71C adds r0, r6, 0 adds r0, 0xB1 strb r7, [r0] - b _0804F73E + b @0804F73E .align 2, 0 .pool -_0804F71C: +@0804F71C: cmp r0, 0x1D - bgt _0804F72A + bgt @0804F72A adds r0, r6, 0 adds r0, 0xB1 mov r1, r8 strb r1, [r0] - b _0804F73E -_0804F72A: + b @0804F73E +@0804F72A: cmp r1, 0x45 - bgt _0804F736 + bgt @0804F736 adds r1, r6, 0 adds r1, 0xB1 movs r0, 0x2 - b _0804F73C -_0804F736: + b @0804F73C +@0804F736: adds r1, r6, 0 adds r1, 0xB1 movs r0, 0x3 -_0804F73C: +@0804F73C: strb r0, [r1] -_0804F73E: +@0804F73E: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x2 @@ -137755,7 +137755,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 @@ -137791,7 +137791,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} @@ -137804,53 +137804,53 @@ sub_804F7AC: @ 804F7AC ldr r0, [r4] ldrb r0, [r0, 0x2] cmp r0, 0x1A - bls _0804F7CA - b _0804FD70 -_0804F7CA: + bls @0804F7CA + b @0804FD70 +@0804F7CA: lsls r0, 2 - ldr r1, =_0804F7E0 + ldr r1, =@0804F7E0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0804F7E0: - .4byte _0804F84C - .4byte _0804F85C - .4byte _0804F8BC - .4byte _0804F8CC - .4byte _0804F8E4 - .4byte _0804F920 - .4byte _0804F958 - .4byte _0804F9E0 - .4byte _0804FA20 - .4byte _0804FACC - .4byte _0804FAE8 - .4byte _0804FB3C - .4byte _0804FB94 - .4byte _0804FC18 - .4byte _0804FC2C - .4byte _0804FC32 - .4byte _0804FC38 - .4byte _0804FC60 - .4byte _0804FC6A - .4byte _0804FC78 - .4byte _0804FC8C - .4byte _0804FCC4 - .4byte _0804FCD8 - .4byte _0804FCF0 - .4byte _0804FD1C - .4byte _0804FD30 - .4byte _0804FD5C -_0804F84C: +@0804F7E0: + .4byte @0804F84C + .4byte @0804F85C + .4byte @0804F8BC + .4byte @0804F8CC + .4byte @0804F8E4 + .4byte @0804F920 + .4byte @0804F958 + .4byte @0804F9E0 + .4byte @0804FA20 + .4byte @0804FACC + .4byte @0804FAE8 + .4byte @0804FB3C + .4byte @0804FB94 + .4byte @0804FC18 + .4byte @0804FC2C + .4byte @0804FC32 + .4byte @0804FC38 + .4byte @0804FC60 + .4byte @0804FC6A + .4byte @0804FC78 + .4byte @0804FC8C + .4byte @0804FCC4 + .4byte @0804FCD8 + .4byte @0804FCF0 + .4byte @0804FD1C + .4byte @0804FD30 + .4byte @0804FD5C +@0804F84C: ldr r0, =0x02024064 ldrb r0, [r0] bl b_cancel_multi_turn_move_maybe - b _0804FD70 + b @0804FD70 .align 2, 0 .pool -_0804F85C: +@0804F85C: ldr r1, =0x0202420b ldr r4, =0x0202420c ldrb r0, [r4] @@ -137868,7 +137868,7 @@ _0804F85C: adds r2, r1, r2 ldrb r0, [r2, 0x8] cmp r0, 0 - beq _0804F8A8 + beq @0804F8A8 ldr r1, =0x02024084 ldrb r2, [r2, 0x9] movs r0, 0x58 @@ -137876,37 +137876,37 @@ _0804F85C: adds r0, r1 ldrh r0, [r0, 0x28] cmp r0, 0 - beq _0804F8A8 + beq @0804F8A8 strb r2, [r4] - b _0804FD70 + b @0804FD70 .align 2, 0 .pool -_0804F8A8: +@0804F8A8: ldr r0, =0x0202420c ldr r1, =0x02024064 ldrb r1, [r1] strb r1, [r0] - b _0804FD70 + b @0804FD70 .align 2, 0 .pool -_0804F8BC: +@0804F8BC: bl sub_803BB88 ldr r1, =0x02024332 strb r0, [r1] - b _0804FD70 + b @0804FD70 .align 2, 0 .pool -_0804F8CC: +@0804F8CC: ldr r0, =0x020241ea ldrh r0, [r0] movs r1, 0 bl sub_80458E0 ldr r1, =0x0202420c strb r0, [r1] - b _0804FD70 + b @0804FD70 .align 2, 0 .pool -_0804F8E4: +@0804F8E4: ldr r2, =0x02024280 ldr r1, =0x0832a328 ldr r0, =0x02024064 @@ -137918,20 +137918,20 @@ _0804F8E4: ldr r2, [r2] ands r2, r0 cmp r2, 0 - beq _0804F914 + beq @0804F914 ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1] - b _0804FD70 + b @0804FD70 .align 2, 0 .pool -_0804F914: +@0804F914: ldr r0, =0x02024332 strb r2, [r0] - b _0804FD70 + b @0804FD70 .align 2, 0 .pool -_0804F920: +@0804F920: ldr r4, =0x0202437c ldr r3, =0x02024064 ldrb r0, [r3] @@ -137954,10 +137954,10 @@ _0804F920: negs r0, r0 ands r0, r2 strb r0, [r1] - b _0804FD70 + b @0804FD70 .align 2, 0 .pool -_0804F958: +@0804F958: ldr r4, =0x0202406e ldr r1, =0x0202449c ldr r0, [r1] @@ -137965,24 +137965,24 @@ _0804F958: ldrb r2, [r0, 0x10] adds r6, r1, 0 cmp r3, r2 - beq _0804F974 + beq @0804F974 ldrh r0, [r4, 0x4] cmp r0, r2 - beq _0804F970 - b _0804FD70 -_0804F970: + beq @0804F970 + b @0804FD70 +@0804F970: cmp r3, r0 - bne _0804F988 -_0804F974: + bne @0804F988 +@0804F974: ldr r1, =0x02024064 movs r0, 0 - b _0804F98C + b @0804F98C .align 2, 0 .pool -_0804F988: +@0804F988: ldr r1, =0x02024064 movs r0, 0x2 -_0804F98C: +@0804F98C: strb r0, [r1] adds r5, r1, 0 ldrb r2, [r5] @@ -137999,14 +137999,14 @@ _0804F98C: ldrh r0, [r0] ldrh r2, [r4] cmp r0, r2 - beq _0804F9CC + beq @0804F9CC adds r6, r5, 0 movs r5, 0x58 adds r2, r1, 0 -_0804F9B4: +@0804F9B4: adds r3, 0x1 cmp r3, 0x3 - bgt _0804F9CC + bgt @0804F9CC lsls r1, r3, 1 ldrb r0, [r6] muls r0, r5 @@ -138015,48 +138015,48 @@ _0804F9B4: ldrh r0, [r1] ldrh r1, [r4] cmp r0, r1 - bne _0804F9B4 -_0804F9CC: + bne @0804F9B4 +@0804F9CC: cmp r3, 0x4 - beq _0804F9D2 - b _0804FD70 -_0804F9D2: + beq @0804F9D2 + b @0804FD70 +@0804F9D2: movs r0, 0 strh r0, [r4] - b _0804FD70 + b @0804FD70 .align 2, 0 .pool -_0804F9E0: +@0804F9E0: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0xB ands r0, r1 cmp r0, 0x8 - beq _0804F9EE - b _0804FD70 -_0804F9EE: + beq @0804F9EE + b @0804FD70 +@0804F9EE: ldr r1, =0x02024084 ldrh r0, [r1, 0x28] cmp r0, 0 - bne _0804F9F8 - b _0804FD70 -_0804F9F8: + bne @0804F9F8 + b @0804FD70 +@0804F9F8: adds r0, r1, 0 adds r0, 0x80 ldrh r0, [r0] cmp r0, 0 - bne _0804FA04 - b _0804FD70 -_0804FA04: + bne @0804FA04 + b @0804FD70 +@0804FA04: ldr r0, =0x02024280 ldr r1, [r0] ldr r2, =0xffbfffff ands r1, r2 str r1, [r0] - b _0804FD70 + b @0804FD70 .align 2, 0 .pool -_0804FA20: +@0804FA20: ldr r2, =0x02024332 mov r8, r2 movs r0, 0 @@ -138079,9 +138079,9 @@ _0804FA20: adds r0, r3, 0 ands r0, r5 cmp r0, 0 - beq _0804FA50 - b _0804FD70 -_0804FA50: + beq @0804FA50 + b @0804FD70 +@0804FA50: ldr r4, =0x02024084 movs r0, 0x58 mov r12, r0 @@ -138093,13 +138093,13 @@ _0804FA50: lsrs r0, 1 ldrh r1, [r1, 0x28] cmp r0, r1 - bcs _0804FA6A - b _0804FD70 -_0804FA6A: + bcs @0804FA6A + b @0804FD70 +@0804FA6A: cmp r1, 0 - bne _0804FA70 - b _0804FD70 -_0804FA70: + bne @0804FA70 + b @0804FD70 +@0804FA70: adds r0, r4, 0 adds r0, 0x4C adds r0, r2, r0 @@ -138107,9 +138107,9 @@ _0804FA70: movs r1, 0x7 ands r0, r1 cmp r0, 0 - beq _0804FA82 - b _0804FD70 -_0804FA82: + beq @0804FA82 + b @0804FD70 +@0804FA82: orrs r3, r5 strb r3, [r7] movs r0, 0x1 @@ -138131,24 +138131,24 @@ _0804FA82: ldrb r0, [r0] mov r2, r8 strb r0, [r2, 0x5] - b _0804FD70 + b @0804FD70 .align 2, 0 .pool -_0804FACC: +@0804FACC: ldr r4, =0x02024332 adds r0, r4, 0 bl sub_81A5258 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - bne _0804FADE - b _0804FD78 -_0804FADE: + bne @0804FADE + b @0804FD78 +@0804FADE: strb r3, [r4, 0x1] - b _0804FD70 + b @0804FD70 .align 2, 0 .pool -_0804FAE8: +@0804FAE8: ldr r0, =0x02024084 adds r0, 0x80 movs r1, 0 @@ -138176,10 +138176,10 @@ _0804FAE8: adds r1, 0x34 ldrb r0, [r1] movs r2, 0x2 - b _0804FBF4 + b @0804FBF4 .align 2, 0 .pool -_0804FB3C: +@0804FB3C: ldr r1, =0x02024084 movs r0, 0 strh r0, [r1, 0x28] @@ -138211,10 +138211,10 @@ _0804FB3C: movs r1, 0x2 orrs r0, r1 strb r0, [r2, 0x18] - b _0804FD70 + b @0804FD70 .align 2, 0 .pool -_0804FB94: +@0804FB94: ldr r0, =0x02024084 movs r1, 0 strh r1, [r0, 0x28] @@ -138263,28 +138263,28 @@ _0804FB94: strb r0, [r1, 0x18] adds r1, 0x34 ldrb r0, [r1] -_0804FBF4: +@0804FBF4: orrs r0, r2 strb r0, [r1] - b _0804FD70 + b @0804FD70 .align 2, 0 .pool -_0804FC18: +@0804FC18: movs r0, 0 bl sub_8033E10 ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution - b _0804FD70 + b @0804FD70 .align 2, 0 .pool -_0804FC2C: +@0804FC2C: bl sub_81A5BF8 - b _0804FD70 -_0804FC32: + b @0804FD70 +@0804FC32: bl sub_81A5D44 - b _0804FD70 -_0804FC38: + b @0804FD70 +@0804FC38: ldr r1, =0x085cd1c8 ldr r0, =0x02024214 ldr r0, [r0] @@ -138296,36 +138296,36 @@ _0804FC38: ldr r0, =0x02022e2c movs r1, 0x16 bl battle_show_message_maybe - b _0804FD70 + b @0804FD70 .align 2, 0 .pool -_0804FC60: +@0804FC60: movs r0, 0x16 bl a_pressed_maybe lsls r0, 16 - b _0804FD24 -_0804FC6A: + b @0804FD24 +@0804FC6A: bl sub_80A3678 lsls r0, 24 cmp r0, 0 - bne _0804FC76 - b _0804FD78 -_0804FC76: - b _0804FD70 -_0804FC78: + bne @0804FC76 + b @0804FD78 +@0804FC76: + b @0804FD70 +@0804FC78: ldr r4, =0x02024064 movs r0, 0x1 strb r0, [r4] ldr r0, =0x02024084 adds r0, 0x58 - b _0804FCA2 + b @0804FCA2 .align 2, 0 .pool -_0804FC8C: +@0804FC8C: ldr r0, =0x0202406c ldrb r0, [r0] cmp r0, 0x3 - bls _0804FD70 + bls @0804FD70 ldr r4, =0x02024064 movs r0, 0x3 strb r0, [r4] @@ -138333,36 +138333,36 @@ _0804FC8C: movs r2, 0x84 lsls r2, 1 adds r0, r2 -_0804FCA2: +@0804FCA2: ldrh r0, [r0, 0x28] cmp r0, 0 - beq _0804FD70 + beq @0804FD70 movs r0, 0 movs r1, 0 bl dp01_build_cmdbuf_x06_a ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - b _0804FD70 + b @0804FD70 .align 2, 0 .pool -_0804FCC4: +@0804FCC4: ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x55 bl MPlayVolumeControl - b _0804FD70 + b @0804FD70 .align 2, 0 .pool -_0804FCD8: +@0804FCD8: ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl - b _0804FD70 + b @0804FD70 .align 2, 0 .pool -_0804FCF0: +@0804FCF0: ldr r0, =0x0202449c ldr r2, [r0] ldr r0, =0x000002a2 @@ -138376,40 +138376,40 @@ _0804FCF0: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - b _0804FD70 + b @0804FD70 .align 2, 0 .pool -_0804FD1C: +@0804FD1C: ldr r0, =0x02024064 ldrb r0, [r0] bl sub_805725C -_0804FD24: +@0804FD24: cmp r0, 0 - bne _0804FD78 - b _0804FD70 + bne @0804FD78 + b @0804FD70 .align 2, 0 .pool -_0804FD30: +@0804FD30: ldr r0, =0x02024064 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0804FD50 + bne @0804FD50 ldr r1, =0x0202433a movs r0, 0x5 strb r0, [r1] - b _0804FD70 + b @0804FD70 .align 2, 0 .pool -_0804FD50: +@0804FD50: ldr r1, =0x0202433a movs r0, 0xA strb r0, [r1] - b _0804FD70 + b @0804FD70 .align 2, 0 .pool -_0804FD5C: +@0804FD5C: movs r1, 0xCE lsls r1, 1 movs r0, 0 @@ -138418,12 +138418,12 @@ _0804FD5C: ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution -_0804FD70: +@0804FD70: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x3 str r0, [r1] -_0804FD78: +@0804FD78: pop {r3} mov r8, r3 pop {r4-r7} @@ -138434,7 +138434,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} @@ -138448,27 +138448,27 @@ atk77_setprotect: @ 804FD8C mov r8, r1 ldr r7, =0x020242bc cmp r0, 0xB6 - beq _0804FDBC + beq @0804FDBC cmp r0, 0xC5 - beq _0804FDBC + beq @0804FDBC cmp r0, 0xCB - beq _0804FDBC + beq @0804FDBC lsls r0, r3, 3 subs r0, r3 lsls r0, 2 adds r0, r7 movs r1, 0 strb r1, [r0, 0x8] -_0804FDBC: +@0804FDBC: ldr r0, =0x02024082 ldrb r1, [r0] ldr r0, =0x0202406c ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 - bne _0804FDCC + bne @0804FDCC movs r6, 0 -_0804FDCC: +@0804FDCC: ldr r2, =0x0831c3d8 mov r5, r8 ldrb r1, [r5] @@ -138484,9 +138484,9 @@ _0804FDCC: lsls r0, 16 lsrs r0, 16 cmp r1, r0 - bcc _0804FE80 + bcc @0804FE80 cmp r6, 0 - beq _0804FE80 + beq @0804FE80 ldr r4, =0x0831c898 ldr r3, =0x020241ea ldrh r0, [r3] @@ -138496,7 +138496,7 @@ _0804FDCC: adds r1, r4 ldrb r0, [r1] cmp r0, 0x6F - bne _0804FE1C + bne @0804FE1C ldr r0, =0x0202433c ldrb r1, [r5] lsls r1, 4 @@ -138508,7 +138508,7 @@ _0804FDCC: ldr r1, =0x02024332 movs r0, 0 strb r0, [r1, 0x5] -_0804FE1C: +@0804FE1C: ldrh r0, [r3] lsls r1, r0, 1 adds r1, r0 @@ -138516,7 +138516,7 @@ _0804FE1C: adds r1, r4 ldrb r0, [r1] cmp r0, 0x74 - bne _0804FE42 + bne @0804FE42 ldr r0, =0x0202433c ldrb r1, [r5] lsls r1, 4 @@ -138528,7 +138528,7 @@ _0804FE1C: ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] -_0804FE42: +@0804FE42: mov r1, r8 ldrb r0, [r1] lsls r1, r0, 3 @@ -138538,10 +138538,10 @@ _0804FE42: ldrb r0, [r1, 0x8] adds r0, 0x1 strb r0, [r1, 0x8] - b _0804FEA2 + b @0804FEA2 .align 2, 0 .pool -_0804FE80: +@0804FE80: ldr r2, =0x020242bc ldr r0, =0x0202420b ldrb r1, [r0] @@ -138559,7 +138559,7 @@ _0804FE80: movs r1, 0x1 orrs r0, r1 strb r0, [r2] -_0804FEA2: +@0804FEA2: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -138574,14 +138574,14 @@ _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} ldr r0, =0x02024068 ldr r2, [r0] cmp r2, 0 - bne _0804FFCC + bne @0804FFCC ldr r1, =0x0202420c strb r2, [r1] ldr r0, =0x0202406c @@ -138590,36 +138590,36 @@ atk78_faintifabilitynotdamp: @ 804FEC8 mov r8, r0 ldr r6, =0x02024084 cmp r2, r3 - bcs _0804FF14 + bcs @0804FF14 adds r0, r6, 0 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x6 - beq _0804FF14 + beq @0804FF14 adds r2, r3, 0 adds r4, r6, 0 movs r3, 0x58 -_0804FEF8: +@0804FEF8: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] lsls r0, 24 lsrs r0, 24 cmp r0, r2 - bcs _0804FF14 + bcs @0804FF14 ldrb r0, [r5] muls r0, r3 adds r0, r4 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x6 - bne _0804FEF8 -_0804FF14: + bne @0804FEF8 +@0804FF14: ldrb r0, [r5] mov r1, r8 ldrb r1, [r1] cmp r0, r1 - bne _0804FFB0 + bne @0804FFB0 ldr r4, =0x02024064 ldr r7, =0x0202420b ldrb r0, [r7] @@ -138645,16 +138645,16 @@ _0804FF14: mov r2, r8 ldrb r0, [r2] cmp r0, 0 - beq _0804FFCC + beq @0804FFCC adds r3, r5, 0 ldrb r5, [r7] ldr r7, =0x0832a328 adds r4, r0, 0 ldr r6, =0x02024210 -_0804FF60: +@0804FF60: ldrb r2, [r3] cmp r2, r5 - beq _0804FF76 + beq @0804FF76 ldrb r0, [r6] ldrb r1, [r3] lsls r1, 2 @@ -138662,18 +138662,18 @@ _0804FF60: ldr r1, [r1] ands r0, r1 cmp r0, 0 - beq _0804FFCC -_0804FF76: + beq @0804FFCC +@0804FF76: adds r0, r2, 0x1 strb r0, [r3] lsls r0, 24 lsrs r0, 24 cmp r0, r4 - bcc _0804FF60 - b _0804FFCC + bcc @0804FF60 + b @0804FFCC .align 2, 0 .pool -_0804FFB0: +@0804FFB0: ldr r1, =0x0202420a movs r0, 0x6 strb r0, [r1] @@ -138687,7 +138687,7 @@ _0804FFB0: ldr r1, =0x02024214 ldr r0, =0x082db560 str r0, [r1] -_0804FFCC: +@0804FFCC: pop {r3} mov r8, r3 pop {r4-r7} @@ -138698,13 +138698,13 @@ _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 ldr r3, [r0] cmp r3, 0 - bne _08050028 + bne @08050028 ldr r4, =0x02024064 ldr r0, =0x0202420b ldrb r0, [r0] @@ -138731,7 +138731,7 @@ atk79_setuserhptozero: @ 804FFE4 ldr r0, [r1] adds r0, 0x1 str r0, [r1] -_08050028: +@08050028: add sp, 0x4 pop {r4} pop {r0} @@ -138741,7 +138741,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] @@ -138761,7 +138761,7 @@ sub_8050044: @ 8050044 ands r0, r1 adds r7, r3, 0 cmp r0, 0 - beq _080500DC + beq @080500DC ldr r0, =0x0202420c ldrb r1, [r0] adds r1, 0x1 @@ -138776,8 +138776,8 @@ sub_8050044: @ 8050044 mov r12, r0 ldrb r0, [r2] cmp r1, r0 - bne _0805009A -_0805008A: + bne @0805009A +@0805008A: ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] @@ -138785,8 +138785,8 @@ _0805008A: lsrs r0, 24 ldrb r1, [r2] cmp r0, r1 - beq _0805008A -_0805009A: + beq @0805008A +@0805009A: ldrb r0, [r6] ldrb r1, [r3] lsls r1, 2 @@ -138794,32 +138794,32 @@ _0805009A: ldr r1, [r1] ands r0, r1 cmp r0, 0 - bne _0805008A + bne @0805008A ldrb r0, [r3] mov r2, r12 ldrb r2, [r2] cmp r0, r2 - bcc _080500D8 + bcc @080500D8 ldr r0, [r7] adds r0, 0x5 str r0, [r7] - b _080500E0 + b @080500E0 .align 2, 0 .pool -_080500D8: +@080500D8: str r4, [r7] - b _080500E0 -_080500DC: + b @080500E0 +@080500DC: adds r0, r2, 0x5 str r0, [r3] -_080500E0: +@080500E0: pop {r4-r7} pop {r0} bx r0 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] @@ -138836,11 +138836,11 @@ sub_80500E8: @ 80500E8 ldrb r0, [r1, 0x5] ldr r3, =0x0202420c cmp r0, 0x1 - bne _08050110 + bne @08050110 ldr r0, =0x0202420b ldrb r0, [r0] strb r0, [r3] -_08050110: +@08050110: ldr r1, =0x020241f0 ldr r6, =0x02024084 ldrb r0, [r3] @@ -138851,10 +138851,10 @@ _08050110: lsrs r0, 1 str r0, [r1] cmp r0, 0 - bne _0805012A + bne @0805012A movs r0, 0x1 str r0, [r1] -_0805012A: +@0805012A: ldr r0, [r1] negs r0, r0 str r0, [r1] @@ -138864,23 +138864,23 @@ _0805012A: ldrh r1, [r0, 0x28] ldrh r0, [r0, 0x2C] cmp r1, r0 - bne _08050158 + bne @08050158 str r2, [r4] - b _0805015E + b @0805015E .align 2, 0 .pool -_08050158: +@08050158: ldr r0, [r4] adds r0, 0x6 str r0, [r4] -_0805015E: +@0805015E: pop {r4-r6} pop {r0} bx r0 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 @@ -138892,17 +138892,17 @@ sub_8050164: @ 8050164 mov r10, r0 movs r1, 0 add r0, sp, 0x4 -_0805017A: +@0805017A: strh r1, [r0] subs r0, 0x2 cmp r0, sp - bge _0805017A + bge @0805017A movs r1, 0 mov r8, r1 movs r5, 0 ldrb r1, [r2] cmp r5, r1 - bge _080501D0 + bge @080501D0 ldr r0, =0x0202420b ldrb r6, [r0] ldr r2, =0x0000ffff @@ -138912,9 +138912,9 @@ _0805017A: ldr r0, =0x0202449c mov r12, r0 adds r7, r1, 0 -_080501A0: +@080501A0: cmp r5, r6 - beq _080501C8 + beq @080501C8 mov r1, r12 ldr r0, [r1] adds r0, r4, r0 @@ -138926,19 +138926,19 @@ _080501A0: lsls r0, 8 orrs r3, r0 cmp r3, 0 - beq _080501C8 + beq @080501C8 cmp r3, r9 - beq _080501C8 + beq @080501C8 strh r3, [r2] adds r2, 0x2 movs r0, 0x1 add r8, r0 -_080501C8: +@080501C8: adds r4, 0x2 adds r5, 0x1 cmp r5, r7 - blt _080501A0 -_080501D0: + blt @080501A0 +@080501D0: mov r1, r10 ldrb r0, [r1] ldr r2, =0x0202449c @@ -138953,10 +138953,10 @@ _080501D0: lsls r0, 8 orrs r3, r0 cmp r3, 0 - beq _08050220 + beq @08050220 ldr r0, =0x0000ffff cmp r3, r0 - beq _08050220 + beq @08050220 ldr r2, =0x02024280 ldr r0, [r2] ldr r1, =0xfffffbff @@ -138964,13 +138964,13 @@ _080501D0: str r0, [r2] ldr r4, =0x020241ea strh r3, [r4] - b _0805024A + b @0805024A .align 2, 0 .pool -_08050220: +@08050220: mov r0, r8 cmp r0, 0 - beq _08050290 + beq @08050290 ldr r2, =0x02024280 ldr r0, [r2] ldr r1, =0xfffffbff @@ -138987,7 +138987,7 @@ _08050220: add r0, sp ldrh r0, [r0] strh r0, [r4] -_0805024A: +@0805024A: ldrh r0, [r4] movs r1, 0 bl sub_80458E0 @@ -139006,10 +139006,10 @@ _0805024A: adds r0, r3 ldr r0, [r0] str r0, [r5] - b _080502AE + b @080502AE .align 2, 0 .pool -_08050290: +@08050290: ldr r2, =0x0202437c mov r0, r10 ldrb r1, [r0] @@ -139025,7 +139025,7 @@ _08050290: ldr r0, [r1] adds r0, 0x1 str r0, [r1] -_080502AE: +@080502AE: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -139039,14 +139039,14 @@ _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] movs r1, 0x7 ands r1, r0 cmp r1, 0 - beq _080502F4 + beq @080502F4 ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 @@ -139055,10 +139055,10 @@ sub_80502C8: @ 80502C8 ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] - b _08050304 + b @08050304 .align 2, 0 .pool -_080502F4: +@080502F4: movs r0, 0x1 strh r0, [r2] ldr r0, =0x02024332 @@ -139067,7 +139067,7 @@ _080502F4: adds r0, 0x28 movs r1, 0x5 strb r1, [r0] -_08050304: +@08050304: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -139079,7 +139079,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] @@ -139094,7 +139094,7 @@ atk7E_setreflect: @ 805031C adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _0805035C + beq @0805035C ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 @@ -139102,10 +139102,10 @@ atk7E_setreflect: @ 805031C strb r0, [r2] ldr r1, =0x02024332 movs r0, 0 - b _080503D0 + b @080503D0 .align 2, 0 .pool -_0805035C: +@0805035C: ldrb r0, [r6] bl battle_get_per_side_status adds r1, r5, 0 @@ -139141,24 +139141,24 @@ _0805035C: ldr r0, [r0] ands r0, r5 cmp r0, 0 - beq _080503CC + beq @080503CC movs r0, 0x1 bl sub_8069DEC lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x2 - bne _080503CC + bne @080503CC ldr r0, =0x02024332 strb r1, [r0, 0x5] - b _080503D2 + b @080503D2 .align 2, 0 .pool -_080503CC: +@080503CC: ldr r1, =0x02024332 movs r0, 0x1 -_080503D0: +@080503D0: strb r0, [r1, 0x5] -_080503D2: +@080503D2: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -139171,7 +139171,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 @@ -139181,7 +139181,7 @@ sub_80503E8: @ 80503E8 movs r0, 0x29 ands r0, r5 cmp r0, 0 - bne _0805041A + bne @0805041A ldr r0, =0x020242ac mov r9, r0 ldr r1, =0x0202420c @@ -139196,18 +139196,18 @@ sub_80503E8: @ 80503E8 adds r3, r2, 0 ands r3, r0 cmp r3, 0 - beq _08050438 -_0805041A: + beq @08050438 +@0805041A: movs r0, 0x1 orrs r0, r5 strb r0, [r7] ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] - b _08050488 + b @08050488 .align 2, 0 .pool -_08050438: +@08050438: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r4 @@ -139216,23 +139216,23 @@ _08050438: adds r0, 0x21 ldrb r0, [r0] cmp r0, 0xC - beq _08050454 + beq @08050454 adds r0, r1, 0 adds r0, 0x22 ldrb r0, [r0] cmp r0, 0xC - bne _0805046C -_08050454: + bne @0805046C +@08050454: movs r0, 0x1 orrs r0, r5 strb r0, [r7] ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] - b _08050488 + b @08050488 .align 2, 0 .pool -_0805046C: +@0805046C: ldr r0, =0x0202420b ldrb r0, [r0] orrs r2, r0 @@ -139247,7 +139247,7 @@ _0805046C: str r0, [r1] ldr r0, =0x02024332 strb r3, [r0, 0x5] -_08050488: +@08050488: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -139263,33 +139263,33 @@ _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] ldrb r2, [r0, 0x1] adds r4, r1, 0 cmp r2, 0x1 - beq _080504D8 + beq @080504D8 cmp r2, 0x1 - bgt _080504C4 + bgt @080504C4 cmp r2, 0 - beq _080504CA - b _08050518 + beq @080504CA + b @08050518 .align 2, 0 .pool -_080504C4: +@080504C4: cmp r2, 0x2 - beq _08050510 - b _08050518 -_080504CA: + beq @08050510 + b @08050518 +@080504CA: ldr r1, =0x020241f0 ldr r0, [r1] negs r0, r0 - b _08050516 + b @08050516 .align 2, 0 .pool -_080504D8: +@080504D8: ldr r3, =0x020241f0 ldr r0, [r3] lsrs r1, r0, 31 @@ -139297,9 +139297,9 @@ _080504D8: asrs r0, 1 str r0, [r3] cmp r0, 0 - bne _080504EA + bne @080504EA str r2, [r3] -_080504EA: +@080504EA: ldr r2, =0x02024084 ldr r0, =0x0202420c ldrb r1, [r0] @@ -139310,18 +139310,18 @@ _080504EA: lsrs r1, r0, 1 ldr r0, [r3] cmp r1, r0 - bge _08050518 + bge @08050518 str r1, [r3] - b _08050518 + b @08050518 .align 2, 0 .pool -_08050510: +@08050510: ldr r1, =0x020241f0 ldr r0, [r1] lsls r0, 1 -_08050516: +@08050516: str r0, [r1] -_08050518: +@08050518: ldr r0, [r4] adds r0, 0x2 str r0, [r4] @@ -139333,7 +139333,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 @@ -139374,13 +139374,13 @@ atk81_setrest: @ 8050528 adds r2, r1, 0 ldrh r0, [r0, 0x2C] cmp r3, r0 - bne _08050598 + bne @08050598 mov r0, r12 str r6, [r0] - b _080505E8 + b @080505E8 .align 2, 0 .pool -_08050598: +@08050598: adds r0, r2, 0 adds r0, 0x4C adds r0, r4, r0 @@ -139388,17 +139388,17 @@ _08050598: movs r0, 0xF8 ands r1, r0 cmp r1, 0 - beq _080505B4 + beq @080505B4 ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] - b _080505B8 + b @080505B8 .align 2, 0 .pool -_080505B4: +@080505B4: ldr r0, =0x02024332 strb r1, [r0, 0x5] -_080505B8: +@080505B8: ldrb r0, [r5] movs r3, 0x58 muls r0, r3 @@ -139421,7 +139421,7 @@ _080505B8: ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_080505E8: +@080505E8: add sp, 0x4 pop {r4-r7} pop {r0} @@ -139431,7 +139431,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] @@ -139454,22 +139454,22 @@ atk82_jumpifnotfirstturn: @ 80505F8 adds r0, r2 ldrb r0, [r0, 0x16] cmp r0, 0 - beq _08050638 + beq @08050638 adds r0, r4, 0x5 str r0, [r5] - b _0805063A + b @0805063A .align 2, 0 .pool -_08050638: +@08050638: str r3, [r5] -_0805063A: +@0805063A: pop {r4,r5} pop {r0} bx r0 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 @@ -139480,7 +139480,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} @@ -139491,7 +139491,7 @@ sub_8050650: @ 8050650 ldrb r1, [r0] mov r8, r0 cmp r2, r1 - bge _080506C4 + bge @080506C4 ldr r0, =0x02024084 mov r12, r0 movs r0, 0x58 @@ -139503,7 +139503,7 @@ sub_8050650: @ 8050650 movs r3, 0 ldr r6, =0x02024474 ldr r7, =0x02024332 -_0805067C: +@0805067C: mov r0, r12 adds r0, 0x50 adds r0, r3, r0 @@ -139511,47 +139511,47 @@ _0805067C: movs r1, 0x70 ands r0, r1 cmp r0, 0 - beq _080506BC + beq @080506BC ldrb r0, [r5] cmp r0, 0x2B - beq _080506BC + beq @080506BC movs r3, 0 strb r2, [r6, 0x17] ldr r1, =0x0202420c ldrb r0, [r1] cmp r0, 0xFF - beq _080506DC + beq @080506DC cmp r0, r2 - beq _080506D0 + beq @080506D0 movs r0, 0x1 strb r0, [r7, 0x5] - b _080506C4 + b @080506C4 .align 2, 0 .pool -_080506BC: +@080506BC: adds r3, 0x58 adds r2, 0x1 cmp r2, r4 - blt _0805067C -_080506C4: + blt @0805067C +@080506C4: mov r1, r8 ldrb r1, [r1] cmp r2, r1 - beq _080506E0 + beq @080506E0 movs r0, 0x1 - b _080506E2 -_080506D0: + b @080506E2 +@080506D0: ldr r0, =0x02024332 strb r3, [r0, 0x5] - b _080506C4 + b @080506C4 .align 2, 0 .pool -_080506DC: +@080506DC: strb r2, [r1] - b _080506C4 -_080506E0: + b @080506C4 +@080506E0: movs r0, 0 -_080506E2: +@080506E2: pop {r3} mov r8, r3 pop {r4-r7} @@ -139560,7 +139560,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] @@ -139579,12 +139579,12 @@ sub_80506EC: @ 80506EC bl sub_8050650 lsls r0, 24 cmp r0, 0 - beq _08050720 + beq @08050720 str r4, [r5] - b _08050762 + b @08050762 .align 2, 0 .pool -_08050720: +@08050720: ldr r1, =0x02024084 ldrb r3, [r6] movs r0, 0x58 @@ -139594,10 +139594,10 @@ _08050720: ldrb r0, [r0] adds r1, r0, 0 cmp r1, 0xF - beq _08050738 + beq @08050738 cmp r1, 0x48 - bne _0805075C -_08050738: + bne @0805075C +@08050738: ldr r2, =0x0202420a strb r0, [r2] ldr r1, =0x02024332 @@ -139607,21 +139607,21 @@ _08050738: ldrb r1, [r2] adds r0, r3, 0 bl b_history__record_ability_usage_of_player - b _08050762 + b @08050762 .align 2, 0 .pool -_0805075C: +@0805075C: ldr r0, [r5] adds r0, 0x5 str r0, [r5] -_08050762: +@08050762: pop {r4-r6} pop {r0} bx r0 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 @@ -139632,7 +139632,7 @@ sub_8050768: @ 8050768 adds r1, r0, r5 ldrb r0, [r1, 0x9] cmp r0, 0x3 - bne _080507A0 + bne @080507A0 ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 @@ -139641,10 +139641,10 @@ sub_8050768: @ 8050768 ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] - b _080507CA + b @080507CA .align 2, 0 .pool -_080507A0: +@080507A0: adds r0, 0x1 movs r3, 0 strb r0, [r1, 0x9] @@ -139666,7 +139666,7 @@ _080507A0: strb r0, [r2, 0x5] ldr r0, =0x02024332 strb r3, [r0, 0x5] -_080507CA: +@080507CA: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -139679,7 +139679,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} @@ -139705,16 +139705,16 @@ atk86_stockpiletobasedamage: @ 80507E4 adds r0, r7 ldrb r0, [r0, 0x9] cmp r0, 0 - bne _08050828 + bne @08050828 str r2, [r3] - b _080508CA + b @080508CA .align 2, 0 .pool -_08050828: +@08050828: ldr r0, =0x02024332 ldrb r0, [r0, 0x6] cmp r0, 0x1 - beq _080508B0 + beq @080508B0 ldr r0, =0x020241f0 mov r8, r0 ldr r4, =0x0202428e @@ -139769,14 +139769,14 @@ _08050828: ldrb r0, [r0] lsls r0, 28 cmp r0, 0 - bge _080508B0 + bge @080508B0 lsls r0, r3, 4 subs r0, r3 movs r1, 0xA bl __divsi3 mov r1, r8 str r0, [r1] -_080508B0: +@080508B0: ldr r2, =0x020242bc ldr r0, =0x0202420b ldrb r1, [r0] @@ -139790,7 +139790,7 @@ _080508B0: ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_080508CA: +@080508CA: add sp, 0x10 pop {r3} mov r8, r3 @@ -139802,7 +139802,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} @@ -139829,14 +139829,14 @@ atk87_stockpiletohprecovery: @ 8050904 adds r4, r0, r1 ldrb r1, [r4, 0x9] cmp r1, 0 - bne _08050954 + bne @08050954 str r2, [r7] ldr r0, =0x02024332 strb r1, [r0, 0x5] - b _080509D0 + b @080509D0 .align 2, 0 .pool -_08050954: +@08050954: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r3 @@ -139844,7 +139844,7 @@ _08050954: ldrh r0, [r1, 0x2C] ldrh r3, [r1, 0x28] cmp r0, r3 - bne _08050984 + bne @08050984 movs r0, 0 strb r0, [r4, 0x9] str r2, [r7] @@ -139854,10 +139854,10 @@ _08050954: ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] - b _080509D0 + b @080509D0 .align 2, 0 .pool -_08050984: +@08050984: ldr r5, =0x020241f0 ldrh r0, [r1, 0x2C] ldrb r1, [r4, 0x9] @@ -139869,9 +139869,9 @@ _08050984: bl __divsi3 str r0, [r5] cmp r0, 0 - bne _080509A0 + bne @080509A0 str r4, [r5] -_080509A0: +@080509A0: ldr r0, [r5] negs r0, r0 str r0, [r5] @@ -139896,7 +139896,7 @@ _080509A0: ldr r1, =0x0202420c ldrb r0, [r6] strb r0, [r1] -_080509D0: +@080509D0: pop {r3} mov r8, r3 pop {r4-r7} @@ -139907,7 +139907,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 @@ -139918,11 +139918,11 @@ atk88_negativedamage: @ 80509E8 negs r0, r0 str r0, [r2] cmp r0, 0 - bne _08050A04 + bne @08050A04 movs r0, 0x1 negs r0, r0 str r0, [r2] -_08050A04: +@08050A04: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -139934,7 +139934,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 @@ -139953,16 +139953,16 @@ sub_8050A1C: @ 8050A1C movs r0, 0x40 ands r0, r5 cmp r0, 0 - beq _08050A50 + beq @08050A50 ldr r0, =0x02024064 ldr r1, =0x0202420b - b _08050A54 + b @08050A54 .align 2, 0 .pool -_08050A50: +@08050A50: ldr r0, =0x02024064 ldr r1, =0x0202420c -_08050A54: +@08050A54: ldrb r1, [r1] strb r1, [r0] movs r0, 0xBF @@ -139970,25 +139970,25 @@ _08050A54: movs r0, 0x80 ands r0, r5 cmp r0, 0 - beq _08050A6E + beq @08050A6E mov r0, r9 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r9, r0 -_08050A6E: +@08050A6E: movs r0, 0x7F ands r5, r0 movs r0, 0x20 ands r0, r5 cmp r0, 0 - beq _08050A84 + beq @08050A84 mov r0, r10 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r10, r0 -_08050A84: +@08050A84: movs r0, 0xDF ands r5, r0 ldr r1, =0x02022f58 @@ -140005,9 +140005,9 @@ _08050A84: strb r0, [r1, 0x3] lsls r0, r6, 24 cmp r0, 0 - blt _08050AA8 - b _08050D8C -_08050AA8: + blt @08050AA8 + b @08050D8C +@08050AA8: ldr r4, =0x02024294 ldr r1, =0x02024064 ldrb r0, [r1] @@ -140020,16 +140020,16 @@ _08050AA8: adds r0, r4 ldrb r0, [r0, 0x4] cmp r0, 0 - beq _08050B48 + beq @08050B48 mov r2, r9 cmp r2, 0 - bne _08050B48 + bne @08050B48 ldr r0, =0x020241ea ldrh r0, [r0] cmp r0, 0xAE - beq _08050B78 + beq @08050B78 cmp r5, 0x1 - bne _08050B68 + bne @08050B68 ldr r4, =0x0202437c ldr r3, =0x02024064 ldrb r0, [r3] @@ -140040,14 +140040,14 @@ _08050AA8: ldrb r0, [r1] lsls r0, 31 cmp r0, 0 - beq _08050B10 + beq @08050B10 ldr r0, =0x02024214 mov r4, r8 str r4, [r0] - b _08050B68 + b @08050B68 .align 2, 0 .pool -_08050B10: +@08050B10: mov r0, r8 bl b_movescr_stack_push ldr r1, =0x02024474 @@ -140066,31 +140066,31 @@ _08050B10: movs r2, 0x1 orrs r1, r2 strb r1, [r0] - b _08050B68 + b @08050B68 .align 2, 0 .pool -_08050B48: +@08050B48: ldr r0, =0x020241ea ldrh r0, [r0] cmp r0, 0xAE - beq _08050B78 + beq @08050B78 mov r0, r10 cmp r0, 0x1 - beq _08050B78 + beq @08050B78 movs r0, 0 bl sub_80464AC lsls r0, 24 cmp r0, 0 - beq _08050B78 + beq @08050B78 ldr r1, =0x02024214 ldr r0, =0x082d9f1c str r0, [r1] -_08050B68: +@08050B68: movs r0, 0x1 - b _08050E80 + b @08050E80 .align 2, 0 .pool -_08050B78: +@08050B78: ldr r2, =0x02024084 ldr r1, =0x02024064 ldrb r3, [r1] @@ -140102,19 +140102,19 @@ _08050B78: ldrb r0, [r0] mov r10, r2 cmp r0, 0x1D - beq _08050B94 + beq @08050B94 cmp r0, 0x49 - bne _08050C2C -_08050B94: + bne @08050C2C +@08050B94: mov r0, r9 cmp r0, 0 - bne _08050C2C + bne @08050C2C ldr r0, =0x020241ea ldrh r0, [r0] cmp r0, 0xAE - beq _08050C2C + beq @08050C2C cmp r5, 0x1 - bne _08050B68 + bne @08050B68 ldr r4, =0x0202437c lsls r0, r3, 2 adds r0, r3 @@ -140123,14 +140123,14 @@ _08050B94: ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - beq _08050BD4 + beq @08050BD4 ldr r0, =0x02024214 mov r1, r8 str r1, [r0] - b _08050B68 + b @08050B68 .align 2, 0 .pool -_08050BD4: +@08050BD4: mov r0, r8 bl b_movescr_stack_push ldr r1, =0x02024474 @@ -140161,10 +140161,10 @@ _08050BD4: movs r2, 0x1 orrs r1, r2 strb r1, [r0] - b _08050B68 + b @08050B68 .align 2, 0 .pool -_08050C2C: +@08050C2C: ldr r1, =0x02024064 ldrb r0, [r1] movs r4, 0x58 @@ -140173,14 +140173,14 @@ _08050C2C: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x33 - bne _08050C8C + bne @08050C8C mov r2, r9 cmp r2, 0 - bne _08050C8C + bne @08050C8C cmp r7, 0x6 - bne _08050C8C + bne @08050C8C cmp r5, 0x1 - bne _08050B68 + bne @08050B68 mov r0, r8 bl b_movescr_stack_push ldr r1, =0x02024474 @@ -140200,10 +140200,10 @@ _08050C2C: ldrb r0, [r3] ldrb r1, [r1] bl b_history__record_ability_usage_of_player - b _08050B68 + b @08050B68 .align 2, 0 .pool -_08050C8C: +@08050C8C: ldr r4, =0x02024064 ldrb r0, [r4] movs r4, 0x58 @@ -140212,16 +140212,16 @@ _08050C8C: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x34 - bne _08050CF0 + bne @08050CF0 mov r0, r9 cmp r0, 0 - bne _08050CF0 + bne @08050CF0 cmp r7, 0x1 - bne _08050CF0 + bne @08050CF0 cmp r5, 0x1 - beq _08050CAE - b _08050B68 -_08050CAE: + beq @08050CAE + b @08050B68 +@08050CAE: mov r0, r8 bl b_movescr_stack_push ldr r1, =0x02024474 @@ -140241,10 +140241,10 @@ _08050CAE: ldrb r0, [r2] ldrb r1, [r1] bl b_history__record_ability_usage_of_player - b _08050B68 + b @08050B68 .align 2, 0 .pool -_08050CF0: +@08050CF0: ldr r3, =0x02024064 ldrb r1, [r3] movs r0, 0x58 @@ -140253,11 +140253,11 @@ _08050CF0: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x13 - bne _08050D08 + bne @08050D08 cmp r5, 0 - bne _08050D08 - b _08050B68 -_08050D08: + bne @08050D08 + b @08050B68 +@08050D08: lsls r0, r6, 24 asrs r0, 28 movs r1, 0x7 @@ -140273,13 +140273,13 @@ _08050D08: asrs r0, 24 subs r1, 0xFF cmp r0, r1 - bne _08050D32 + bne @08050D32 strb r4, [r3, 0x1] movs r0, 0xD3 strb r0, [r3, 0x2] strb r4, [r3, 0x3] movs r2, 0x4 -_08050D32: +@08050D32: adds r0, r2, r3 strb r4, [r0] adds r2, 0x1 @@ -140305,22 +140305,22 @@ _08050D32: lsls r0, 24 asrs r0, 24 cmp r0, 0 - beq _08050DE2 + beq @08050DE2 movs r1, 0 ldr r0, =0x0202420c ldrb r0, [r0] ldr r3, =0x02024332 mov r8, r3 cmp r0, r2 - bne _08050D76 + bne @08050D76 movs r1, 0x1 -_08050D76: +@08050D76: mov r4, r8 strb r1, [r4, 0x5] - b _08050E10 + b @08050E10 .align 2, 0 .pool -_08050D8C: +@08050D8C: asrs r6, r0, 28 movs r0, 0x7 ands r6, r0 @@ -140328,13 +140328,13 @@ _08050D8C: strb r2, [r3] movs r2, 0x1 cmp r6, 0x2 - bne _08050DA6 + bne @08050DA6 strb r4, [r3, 0x1] movs r0, 0xD1 strb r0, [r3, 0x2] strb r4, [r3, 0x3] movs r2, 0x4 -_08050DA6: +@08050DA6: adds r0, r2, r3 strb r4, [r0] adds r2, 0x1 @@ -140364,28 +140364,28 @@ _08050DA6: asrs r0, 24 mov r10, r2 cmp r0, 0xC - bne _08050DFC -_08050DE2: + bne @08050DFC +@08050DE2: ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] mov r8, r1 - b _08050E10 + b @08050E10 .align 2, 0 .pool -_08050DFC: +@08050DFC: movs r1, 0 ldr r0, =0x0202420c ldrb r0, [r0] ldr r2, =0x02024332 mov r8, r2 cmp r0, r3 - bne _08050E0C + bne @08050E0C movs r1, 0x1 -_08050E0C: +@08050E0C: mov r3, r8 strb r1, [r3, 0x5] -_08050E10: +@08050E10: ldr r2, =0x02024064 ldrb r0, [r2] movs r4, 0x58 @@ -140407,10 +140407,10 @@ _08050E10: movs r0, 0 ldrsb r0, [r1, r0] cmp r0, 0 - bge _08050E40 + bge @08050E40 movs r0, 0 strb r0, [r1] -_08050E40: +@08050E40: ldr r1, =0x02024064 ldrb r0, [r1] muls r0, r4 @@ -140419,34 +140419,34 @@ _08050E40: movs r0, 0 ldrsb r0, [r1, r0] cmp r0, 0xC - ble _08050E56 + ble @08050E56 movs r0, 0xC strb r0, [r1] -_08050E56: +@08050E56: mov r2, r8 ldrb r0, [r2, 0x5] cmp r0, 0x2 - bne _08050E7E + bne @08050E7E movs r3, 0x1 ands r3, r5 cmp r3, 0 - beq _08050E70 + beq @08050E70 ldr r0, =0x0202427c ldrb r1, [r0] movs r2, 0x1 orrs r1, r2 strb r1, [r0] -_08050E70: +@08050E70: mov r4, r8 ldrb r0, [r4, 0x5] cmp r0, 0x2 - bne _08050E7E + bne @08050E7E cmp r3, 0 - bne _08050E7E - b _08050B68 -_08050E7E: + bne @08050E7E + b @08050B68 +@08050E7E: movs r0, 0 -_08050E80: +@08050E80: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -140459,7 +140459,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] @@ -140485,11 +140485,11 @@ atk89_statbuffchange: @ 8050EA0 bl sub_8050A1C lsls r0, 24 cmp r0, 0 - bne _08050EDC + bne @08050EDC ldr r0, [r5] adds r0, 0x6 str r0, [r5] -_08050EDC: +@08050EDC: pop {r4,r5} pop {r0} bx r0 @@ -140498,7 +140498,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 @@ -140506,30 +140506,30 @@ atk8A_normalisebuffs: @ 8050EEC ldr r0, =0x02024214 mov r12, r0 cmp r2, r1 - bge _08050F24 + bge @08050F24 ldr r0, =0x02024084 movs r4, 0x6 adds r5, r1, 0 movs r7, 0x58 adds r6, r0, 0 adds r6, 0x18 -_08050F08: +@08050F08: adds r3, r2, 0x1 movs r1, 0x7 adds r0, r2, 0 muls r0, r7 adds r0, r6 adds r0, 0x7 -_08050F14: +@08050F14: strb r4, [r0] subs r0, 0x1 subs r1, 0x1 cmp r1, 0 - bge _08050F14 + bge @08050F14 adds r2, r3, 0 cmp r2, r5 - blt _08050F08 -_08050F24: + blt @08050F08 +@08050F24: mov r1, r12 ldr r0, [r1] adds r0, 0x1 @@ -140542,7 +140542,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 @@ -140591,7 +140591,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 @@ -140605,11 +140605,11 @@ atk8C_confuseifrepeatingattackends: @ 8050FB0 lsls r1, 4 ands r0, r1 cmp r0, 0 - bne _08050FD2 + bne @08050FD2 ldr r1, =0x02024332 movs r0, 0x75 strb r0, [r1, 0x3] -_08050FD2: +@08050FD2: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -140621,32 +140621,32 @@ _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] ldrb r1, [r0, 0x1] cmp r1, 0 - beq _0805100C + beq @0805100C ldr r0, =0x02024212 strb r1, [r0] - b _08051026 + b @08051026 .align 2, 0 .pool -_0805100C: +@0805100C: ldr r4, =0x02024212 bl GenerateRandomNumber movs r5, 0x3 ands r0, r5 strb r0, [r4] cmp r0, 0x1 - bls _08051022 + bls @08051022 bl GenerateRandomNumber ands r0, r5 -_08051022: +@08051022: adds r0, 0x2 strb r0, [r4] -_08051026: +@08051026: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x2 @@ -140659,7 +140659,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 @@ -140681,7 +140681,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 @@ -140700,17 +140700,17 @@ sub_8051064: @ 8051064 ldrb r1, [r1] ldrb r0, [r0] cmp r1, r0 - bcc _080510AC + bcc @080510AC ldr r0, =0x0202449c ldr r1, [r0] adds r1, r3, r1 adds r1, 0x58 ldr r2, =0x0202406e lsls r0, r3, 1 - b _08051108 + b @08051108 .align 2, 0 .pool -_080510AC: +@080510AC: bl GenerateRandomNumber movs r3, 0xFF ands r3, r0 @@ -140732,7 +140732,7 @@ _080510AC: adds r0, 0x1 lsrs r1, 2 cmp r0, r1 - bhi _080510FC + bhi @080510FC ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -140747,17 +140747,17 @@ _080510AC: orrs r1, r0 str r1, [r3] movs r0, 0 - b _08051116 + b @08051116 .align 2, 0 .pool -_080510FC: +@080510FC: ldr r0, =0x0202449c ldr r1, [r0] adds r1, r4, r1 adds r1, 0x58 ldr r2, =0x0202406e lsls r0, r4, 1 -_08051108: +@08051108: adds r0, r2 ldrh r0, [r0] strb r0, [r1] @@ -140765,7 +140765,7 @@ _08051108: ldr r0, =0x082dadd8 str r0, [r1] movs r0, 0x1 -_08051116: +@08051116: pop {r4-r7} pop {r1} bx r1 @@ -140774,7 +140774,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 @@ -140788,9 +140788,9 @@ sub_805112C: @ 805112C movs r1, 0x8 ands r0, r1 cmp r0, 0 - bne _0805114A - b _08051410 -_0805114A: + bne @0805114A + b @08051410 +@0805114A: ldr r4, =0x0202420c ldrb r0, [r4] bl battle_side_get_owner @@ -140798,46 +140798,46 @@ _0805114A: ldr r1, =0x02024744 str r1, [sp] cmp r0, 0 - bne _08051160 + bne @08051160 ldr r0, =0x020244ec str r0, [sp] -_08051160: +@08051160: ldr r2, [r5] movs r1, 0x81 lsls r1, 1 adds r0, r2, 0 ands r0, r1 cmp r0, r1 - beq _08051182 + beq @08051182 ldr r1, =0x02000100 adds r0, r2, 0 ands r0, r1 cmp r0, r1 - beq _08051182 + beq @08051182 movs r0, 0x80 lsls r0, 15 ands r0, r2 cmp r0, 0 - beq _080511C8 -_08051182: + beq @080511C8 +@08051182: ldr r2, =0x0202420c ldrb r1, [r2] movs r0, 0x2 ands r0, r1 adds r1, r2, 0 cmp r0, 0 - beq _080511AC + beq @080511AC movs r0, 0x3 mov r9, r0 movs r0, 0x6 - b _080511B2 + b @080511B2 .align 2, 0 .pool -_080511AC: +@080511AC: movs r0, 0 mov r9, r0 movs r0, 0x3 -_080511B2: +@080511B2: mov r8, r0 movs r0, 0x3 mov r10, r0 @@ -140845,20 +140845,20 @@ _080511B2: str r0, [sp, 0x8] ldr r2, =0x0202406e ldrb r1, [r1] - b _0805128E + b @0805128E .align 2, 0 .pool -_080511C8: +@080511C8: movs r0, 0x42 ands r0, r2 cmp r0, 0x42 - beq _080511DA + beq @080511DA ldr r1, =0x02000040 adds r0, r2, 0 ands r0, r1 cmp r0, r1 - bne _0805121C -_080511DA: + bne @0805121C +@080511DA: ldrb r0, [r4] bl sub_806D864 lsls r0, 24 @@ -140867,18 +140867,18 @@ _080511DA: lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bne _080511FC + bne @080511FC movs r1, 0x3 mov r9, r1 movs r0, 0x6 - b _08051202 + b @08051202 .align 2, 0 .pool -_080511FC: +@080511FC: movs r1, 0 mov r9, r1 movs r0, 0x3 -_08051202: +@08051202: mov r8, r0 movs r1, 0x3 mov r10, r1 @@ -140887,59 +140887,59 @@ _08051202: ldr r2, =0x0202406e ldr r0, =0x0202420c ldrb r1, [r0] - b _0805128E + b @0805128E .align 2, 0 .pool -_0805121C: +@0805121C: movs r0, 0x80 lsls r0, 8 ands r0, r2 cmp r0, 0 - beq _08051274 + beq @08051274 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08051240 + bne @08051240 movs r1, 0 mov r9, r1 movs r0, 0x6 mov r8, r0 mov r10, r0 movs r1, 0x2 - b _08051260 -_08051240: + b @08051260 +@08051240: ldrb r1, [r4] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08051252 + beq @08051252 movs r0, 0x3 mov r9, r0 movs r1, 0x6 - b _08051258 -_08051252: + b @08051258 +@08051252: movs r0, 0 mov r9, r0 movs r1, 0x3 -_08051258: +@08051258: mov r8, r1 movs r0, 0x3 mov r10, r0 movs r1, 0x1 -_08051260: +@08051260: str r1, [sp, 0x8] ldr r2, =0x0202406e ldr r0, =0x0202420c ldrb r1, [r0] - b _0805128E + b @0805128E .align 2, 0 .pool -_08051274: +@08051274: movs r0, 0x1 ands r2, r0 cmp r2, 0 - beq _080512A4 + beq @080512A4 movs r0, 0 mov r9, r0 movs r1, 0x6 @@ -140949,7 +140949,7 @@ _08051274: str r0, [sp, 0x8] ldr r2, =0x0202406e ldrb r1, [r4] -_0805128E: +@0805128E: lsls r0, r1, 1 adds r0, r2 ldrh r7, [r0] @@ -140958,10 +140958,10 @@ _0805128E: lsls r1, 1 adds r1, r2 ldrh r5, [r1] - b _080512BE + b @080512BE .align 2, 0 .pool -_080512A4: +@080512A4: movs r1, 0 mov r9, r1 movs r0, 0x6 @@ -140975,11 +140975,11 @@ _080512A4: adds r0, r1 ldrh r5, [r0] adds r7, r5, 0 -_080512BE: +@080512BE: mov r6, r9 cmp r6, r8 - bge _080512FC -_080512C4: + bge @080512FC +@080512C4: movs r0, 0x64 muls r0, r6 ldr r1, [sp] @@ -140988,29 +140988,29 @@ _080512C4: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _080512F6 + beq @080512F6 adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _080512F6 + bne @080512F6 adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _080512F6 + beq @080512F6 ldr r0, [sp, 0x4] adds r0, 0x1 str r0, [sp, 0x4] -_080512F6: +@080512F6: adds r6, 0x1 cmp r6, r8 - blt _080512C4 -_080512FC: + blt @080512C4 +@080512FC: ldr r1, [sp, 0x4] ldr r0, [sp, 0x8] cmp r1, r0 - bgt _08051328 + bgt @08051328 ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -141024,15 +141024,15 @@ _080512FC: lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08051414 + b @08051414 .align 2, 0 .pool -_08051328: +@08051328: bl sub_8051064 lsls r0, 24 cmp r0, 0 - beq _08051378 -_08051332: + beq @08051378 +@08051332: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -141041,9 +141041,9 @@ _08051332: adds r6, r0, 0 add r6, r9 cmp r6, r7 - beq _08051332 + beq @08051332 cmp r6, r5 - beq _08051332 + beq @08051332 movs r0, 0x64 muls r0, r6 ldr r1, [sp] @@ -141052,18 +141052,18 @@ _08051332: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _08051332 + beq @08051332 adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0x1 - beq _08051332 + beq @08051332 adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _08051332 -_08051378: + beq @08051332 +@08051378: ldr r4, =0x0202420c ldrb r0, [r4] ldr r1, =0x0202449c @@ -141074,10 +141074,10 @@ _08051378: bl sub_81B1250 lsls r0, 24 cmp r0, 0 - bne _08051396 + bne @08051396 ldrb r0, [r4] bl sub_803BDA0 -_08051396: +@08051396: ldr r0, =0x02022fec ldr r2, [r0] movs r1, 0x81 @@ -141085,21 +141085,21 @@ _08051396: adds r0, r2, 0 ands r0, r1 cmp r0, r1 - beq _080513C0 + beq @080513C0 movs r0, 0x42 ands r0, r2 cmp r0, 0x42 - beq _080513C0 + beq @080513C0 ldr r1, =0x02000100 adds r0, r2, 0 ands r0, r1 cmp r0, r1 - beq _080513C0 + beq @080513C0 ldr r0, =0x02000040 ands r2, r0 cmp r2, r0 - bne _080513DE -_080513C0: + bne @080513DE +@080513C0: ldr r5, =0x0202420c ldrb r0, [r5] lsls r4, r6, 24 @@ -141113,25 +141113,25 @@ _080513C0: adds r1, r4, 0 movs r2, 0x1 bl sub_81B8E80 -_080513DE: +@080513DE: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 15 ands r0, r1 cmp r0, 0 - beq _08051414 + beq @08051414 ldr r0, =0x0202420c ldrb r0, [r0] lsls r1, r6, 24 lsrs r1, 24 bl sub_80571DC - b _08051414 + b @08051414 .align 2, 0 .pool -_08051410: +@08051410: bl sub_8051064 -_08051414: +@08051414: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -141143,7 +141143,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 @@ -141161,15 +141161,15 @@ sub_8051424: @ 8051424 ldrh r0, [r0] mov r8, r2 cmp r0, 0 - beq _08051466 + beq @08051466 movs r5, 0x58 adds r2, r1, 0 -_0805144C: +@0805144C: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x3 - bhi _08051466 + bhi @08051466 lsls r1, r6, 1 ldrb r0, [r3] muls r0, r5 @@ -141177,11 +141177,11 @@ _0805144C: adds r1, r2 ldrh r0, [r1] cmp r0, 0 - bne _0805144C -_08051466: + bne @0805144C +@08051466: movs r3, 0 cmp r3, r6 - bcs _080514E8 + bcs @080514E8 ldr r0, =0x0831c898 mov r10, r0 ldr r5, =0x02024084 @@ -141194,7 +141194,7 @@ _08051466: movs r0, 0xC add r0, r12 mov r9, r0 -_08051484: +@08051484: lsls r0, r3, 1 adds r0, r5 add r0, r9 @@ -141205,27 +141205,27 @@ _08051484: add r0, r10 ldrb r2, [r0, 0x2] cmp r2, 0x9 - bne _080514C6 + bne @080514C6 mov r0, r8 adds r1, r5, r0 adds r0, r1, 0 adds r0, 0x21 ldrb r0, [r0] cmp r0, 0x7 - beq _080514B2 + beq @080514B2 adds r0, r1, 0 adds r0, 0x22 ldrb r0, [r0] cmp r0, 0x7 - bne _080514C4 -_080514B2: + bne @080514C4 +@080514B2: movs r2, 0x7 - b _080514C6 + b @080514C6 .align 2, 0 .pool -_080514C4: +@080514C4: movs r2, 0 -_080514C6: +@080514C6: ldrb r0, [r7] muls r0, r4 add r0, r12 @@ -141233,20 +141233,20 @@ _080514C6: adds r1, 0x21 ldrb r1, [r1] cmp r2, r1 - beq _080514DE + beq @080514DE adds r0, 0x22 ldrb r0, [r0] cmp r2, r0 - bne _080514E8 -_080514DE: + bne @080514E8 +@080514DE: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, r6 - bcc _08051484 -_080514E8: + bcc @08051484 +@080514E8: cmp r3, r6 - bne _0805150C + bne @0805150C ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -141260,19 +141260,19 @@ _080514E8: lsls r0, 24 orrs r1, r0 str r1, [r3] - b _080515B0 + b @080515B0 .align 2, 0 .pool -_0805150C: +@0805150C: movs r7, 0x3 ldr r5, =0x0831c898 mov r9, r5 -_08051512: +@08051512: bl GenerateRandomNumber adds r3, r0, 0 ands r3, r7 cmp r3, r6 - bcs _08051512 + bcs @08051512 ldr r4, =0x02024084 lsls r1, r3, 1 ldr r3, =0x0202420b @@ -141293,27 +141293,27 @@ _08051512: mov r8, r4 adds r4, r3, 0 cmp r2, 0x9 - bne _08051572 + bne @08051572 mov r0, r8 adds r2, r5, r0 adds r0, r2, 0 adds r0, 0x21 ldrb r0, [r0] cmp r0, 0x7 - beq _08051560 + beq @08051560 adds r0, r2, 0 adds r0, 0x22 ldrb r0, [r0] cmp r0, 0x7 - bne _08051570 -_08051560: + bne @08051570 +@08051560: movs r2, 0x7 - b _08051572 + b @08051572 .align 2, 0 .pool -_08051570: +@08051570: movs r2, 0 -_08051572: +@08051572: ldrb r0, [r4] movs r3, 0x58 muls r0, r3 @@ -141322,11 +141322,11 @@ _08051572: adds r1, 0x21 ldrb r5, [r1] cmp r2, r5 - beq _08051512 + beq @08051512 adds r0, 0x22 ldrb r0, [r0] cmp r2, r0 - beq _08051512 + beq @08051512 strb r2, [r1] ldrb r0, [r4] muls r0, r3 @@ -141345,7 +141345,7 @@ _08051572: ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_080515B0: +@080515B0: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -141358,18 +141358,18 @@ _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] ldr r1, =0x02000002 ands r0, r1 cmp r0, 0 - bne _08051650 + bne @08051650 ldr r1, =0x0202432e ldrh r0, [r1] cmp r0, 0 - beq _08051650 + beq @08051650 adds r1, r0, 0 ldr r0, =0x0202449c ldr r0, [r0] @@ -141407,15 +141407,15 @@ atk91_givemoney: @ 80515C8 bl b_movescr_stack_push ldr r0, =0x082db307 str r0, [r4] - b _08051658 + b @08051658 .align 2, 0 .pool -_08051650: +@08051650: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] -_08051658: +@08051658: pop {r4} pop {r0} bx r0 @@ -141424,7 +141424,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] @@ -141439,7 +141439,7 @@ atk92_setlightscreen: @ 8051664 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080516A4 + beq @080516A4 ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 @@ -141447,10 +141447,10 @@ atk92_setlightscreen: @ 8051664 strb r0, [r2] ldr r1, =0x02024332 movs r0, 0 - b _08051718 + b @08051718 .align 2, 0 .pool -_080516A4: +@080516A4: ldrb r0, [r5] bl battle_get_per_side_status adds r1, r6, 0 @@ -141486,22 +141486,22 @@ _080516A4: ldr r0, [r0] ands r0, r6 cmp r0, 0 - beq _08051714 + beq @08051714 movs r0, 0x1 bl sub_8069DEC lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _08051714 + bne @08051714 ldr r1, =0x02024332 movs r0, 0x4 - b _08051718 + b @08051718 .align 2, 0 .pool -_08051714: +@08051714: ldr r1, =0x02024332 movs r0, 0x3 -_08051718: +@08051718: strb r0, [r1, 0x5] ldr r1, =0x02024214 ldr r0, [r1] @@ -141515,7 +141515,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 @@ -141529,7 +141529,7 @@ atk93_ko_move: @ 8051730 adds r1, r0, r7 ldrh r0, [r1, 0x2E] cmp r0, 0xAF - bne _08051768 + bne @08051768 ldr r1, =0x02024404 lsls r0, r2, 3 subs r0, r2 @@ -141537,10 +141537,10 @@ atk93_ko_move: @ 8051730 adds r0, r1 ldrb r4, [r0, 0x7] ldrb r6, [r0, 0x1A] - b _08051782 + b @08051782 .align 2, 0 .pool -_08051768: +@08051768: ldrh r0, [r1, 0x2E] bl itemid_get_x12 lsls r0, 24 @@ -141552,13 +141552,13 @@ _08051768: bl itemid_get_quality lsls r0, 24 lsrs r6, r0, 24 -_08051782: +@08051782: ldr r1, =0x0202420f ldr r5, =0x0202420c ldrb r0, [r5] strb r0, [r1] cmp r4, 0x27 - bne _080517C0 + bne @080517C0 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -141567,7 +141567,7 @@ _08051782: lsls r0, 16 lsrs r0, 16 cmp r0, r6 - bcs _080517C0 + bcs @080517C0 ldrb r0, [r5] movs r1, 0x27 bl b_history__record_item_x12_of_player @@ -141581,7 +141581,7 @@ _08051782: movs r2, 0x80 orrs r1, r2 strb r1, [r0] -_080517C0: +@080517C0: ldr r1, =0x02024084 ldr r2, =0x0202420c ldrb r3, [r2] @@ -141595,7 +141595,7 @@ _080517C0: mov r8, r1 mov r9, r2 cmp r4, 0x5 - bne _0805181C + bne @0805181C ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 @@ -141610,10 +141610,10 @@ _080517C0: ldrb r0, [r1] movs r1, 0x5 bl b_history__record_ability_usage_of_player - b _08051A70 + b @08051A70 .align 2, 0 .pool -_0805181C: +@0805181C: ldr r1, =0x020242ac lsls r0, r3, 2 adds r0, r1 @@ -141621,7 +141621,7 @@ _0805181C: movs r1, 0x18 ands r0, r1 cmp r0, 0 - bne _080518A0 + bne @080518A0 ldr r1, =0x0831c898 ldr r0, =0x020241ea ldrh r0, [r0] @@ -141652,9 +141652,9 @@ _0805181C: lsrs r0, 16 adds r0, 0x1 cmp r0, r4 - blt _08051870 - b _08051A08 -_08051870: + blt @08051870 + b @08051A08 +@08051870: ldrb r0, [r7] adds r1, r0, 0 muls r1, r6 @@ -141669,11 +141669,11 @@ _08051870: movs r4, 0x1 ldrb r0, [r0] cmp r1, r0 - bcs _08051936 - b _08051A08 + bcs @08051936 + b @08051A08 .align 2, 0 .pool -_080518A0: +@080518A0: ldr r1, =0x020242bc lsls r0, r3, 3 subs r0, r3 @@ -141684,7 +141684,7 @@ _080518A0: adds r7, r1, 0 ldrb r3, [r7] cmp r0, r3 - bne _080518CA + bne @080518CA ldrb r0, [r7] muls r0, r6 add r0, r8 @@ -141694,8 +141694,8 @@ _080518A0: ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bcs _08051942 -_080518CA: + bcs @08051942 +@080518CA: ldr r1, =0x0831c898 ldr r0, =0x020241ea ldrh r0, [r0] @@ -141731,7 +141731,7 @@ _080518CA: lsrs r0, 16 adds r0, 0x1 cmp r0, r4 - bge _08051934 + bge @08051934 ldrb r0, [r7] adds r1, r0, 0 muls r1, r5 @@ -141746,17 +141746,17 @@ _080518CA: movs r4, 0x1 ldrb r0, [r0] cmp r1, r0 - bcs _08051936 -_08051934: + bcs @08051936 +@08051934: movs r4, 0 -_08051936: +@08051936: ldr r3, =0x02024084 mov r8, r3 ldr r0, =0x0202420c mov r9, r0 cmp r4, 0 - beq _08051A08 -_08051942: + beq @08051A08 +@08051942: ldr r0, =0x0202433c mov r1, r9 ldrb r2, [r1] @@ -141765,7 +141765,7 @@ _08051942: ldrb r0, [r1] lsls r0, 30 cmp r0, 0 - bge _08051990 + bge @08051990 ldr r1, =0x020241f0 movs r0, 0x58 muls r0, r2 @@ -141776,10 +141776,10 @@ _08051942: ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x40 - b _080519EE + b @080519EE .align 2, 0 .pool -_08051990: +@08051990: ldr r0, =0x0202437c lsls r1, r2, 2 adds r1, r2 @@ -141788,7 +141788,7 @@ _08051990: ldrb r0, [r1] lsrs r0, 7 cmp r0, 0 - beq _080519DC + beq @080519DC ldr r1, =0x020241f0 movs r3, 0x58 adds r0, r2, 0 @@ -141809,10 +141809,10 @@ _08051990: add r0, r8 ldrh r0, [r0, 0x2E] strh r0, [r1] - b _080519F2 + b @080519F2 .align 2, 0 .pool -_080519DC: +@080519DC: ldr r1, =0x020241f0 movs r0, 0x58 muls r0, r2 @@ -141822,18 +141822,18 @@ _080519DC: ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x10 -_080519EE: +@080519EE: orrs r0, r1 strb r0, [r2] -_080519F2: +@080519F2: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b _08051A70 + b @08051A70 .align 2, 0 .pool -_08051A08: +@08051A08: ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 @@ -141855,16 +141855,16 @@ _08051A08: ldrb r1, [r1] ldrb r0, [r0] cmp r1, r0 - bcc _08051A50 + bcc @08051A50 ldr r1, =0x02024332 movs r0, 0 - b _08051A54 + b @08051A54 .align 2, 0 .pool -_08051A50: +@08051A50: ldr r1, =0x02024332 movs r0, 0x1 -_08051A54: +@08051A54: strb r0, [r1, 0x5] ldr r3, =0x02024214 ldr r2, [r3] @@ -141879,7 +141879,7 @@ _08051A54: lsls r0, 24 orrs r1, r0 str r1, [r3] -_08051A70: +@08051A70: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -141891,7 +141891,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 @@ -141904,10 +141904,10 @@ atk94_gethalfcurrentenemyhp: @ 8051A84 lsrs r0, 1 str r0, [r3] cmp r0, 0 - bne _08051AA2 + bne @08051AA2 movs r0, 0x1 str r0, [r3] -_08051AA2: +@08051AA2: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -141919,14 +141919,14 @@ _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] movs r0, 0x18 ands r0, r1 cmp r0, 0 - beq _08051AEC + beq @08051AEC ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 @@ -141935,10 +141935,10 @@ sub_8051AC0: @ 8051AC0 ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] - b _08051AFE + b @08051AFE .align 2, 0 .pool -_08051AEC: +@08051AEC: movs r0, 0x8 strh r0, [r2] ldr r1, =0x02024332 @@ -141948,7 +141948,7 @@ _08051AEC: adds r0, 0x28 movs r1, 0x5 strb r1, [r0] -_08051AFE: +@08051AFE: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -141960,7 +141960,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 @@ -141973,9 +141973,9 @@ sub_8051B18: @ 8051B18 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _08051B36 - b _08051C48 -_08051B36: + beq @08051B36 + b @08051C48 +@08051B36: str r0, [sp] movs r0, 0x13 movs r1, 0 @@ -141984,9 +141984,9 @@ _08051B36: bl ability_something lsls r0, 24 cmp r0, 0 - beq _08051B4C - b _08051C48 -_08051B4C: + beq @08051B4C + b @08051C48 +@08051B4C: ldr r2, =0x020243cc ldrh r1, [r2] movs r0, 0x18 @@ -141994,7 +141994,7 @@ _08051B4C: adds r4, r2, 0 ldr r5, =0x0202420b cmp r0, 0 - beq _08051BDA + beq @08051BDA ldr r0, =0x02024084 ldrb r2, [r5] movs r1, 0x58 @@ -142004,25 +142004,25 @@ _08051B4C: adds r0, 0x21 ldrb r0, [r0] cmp r0, 0x5 - beq _08051BD4 + beq @08051BD4 cmp r0, 0x8 - beq _08051BD4 + beq @08051BD4 cmp r0, 0x4 - beq _08051BD4 + beq @08051BD4 adds r0, r3, 0 adds r0, 0x22 ldrb r0, [r0] cmp r0, 0x5 - beq _08051BD4 + beq @08051BD4 cmp r0, 0x8 - beq _08051BD4 + beq @08051BD4 cmp r0, 0x4 - beq _08051BD4 + beq @08051BD4 adds r0, r3, 0 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x8 - beq _08051BD4 + beq @08051BD4 ldr r0, =0x020242ac lsls r1, r2, 2 adds r1, r0 @@ -142030,34 +142030,34 @@ _08051B4C: movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08051BD4 + bne @08051BD4 movs r0, 0x80 lsls r0, 11 ands r1, r0 cmp r1, 0 - bne _08051BD4 + bne @08051BD4 ldr r1, =0x020241f0 ldrh r0, [r3, 0x2C] lsrs r0, 4 str r0, [r1] cmp r0, 0 - bne _08051BDA + bne @08051BDA movs r0, 0x1 - b _08051BD8 + b @08051BD8 .align 2, 0 .pool -_08051BD4: +@08051BD4: ldr r1, =0x020241f0 movs r0, 0 -_08051BD8: +@08051BD8: str r0, [r1] -_08051BDA: +@08051BDA: ldrh r1, [r4] movs r4, 0x80 adds r0, r4, 0 ands r0, r1 cmp r0, 0 - beq _08051C50 + beq @08051C50 ldr r1, =0x02024084 ldrb r3, [r5] movs r0, 0x58 @@ -142067,12 +142067,12 @@ _08051BDA: adds r0, 0x21 ldrb r0, [r0] cmp r0, 0xF - beq _08051C3C + beq @08051C3C adds r0, r2, 0 adds r0, 0x22 ldrb r0, [r0] cmp r0, 0xF - beq _08051C3C + beq @08051C3C ldr r0, =0x020242ac lsls r1, r3, 2 adds r1, r0 @@ -142080,36 +142080,36 @@ _08051BDA: adds r0, r1, 0 ands r0, r4 cmp r0, 0 - bne _08051C3C + bne @08051C3C movs r0, 0x80 lsls r0, 11 ands r1, r0 cmp r1, 0 - bne _08051C3C + bne @08051C3C ldr r1, =0x020241f0 ldrh r0, [r2, 0x2C] lsrs r0, 4 str r0, [r1] cmp r0, 0 - bne _08051C50 + bne @08051C50 movs r0, 0x1 str r0, [r1] - b _08051C50 + b @08051C50 .align 2, 0 .pool -_08051C3C: +@08051C3C: ldr r1, =0x020241f0 movs r0, 0 str r0, [r1] - b _08051C50 + b @08051C50 .align 2, 0 .pool -_08051C48: +@08051C48: ldr r1, =0x020241f0 movs r0, 0 str r0, [r1] ldr r5, =0x0202420b -_08051C50: +@08051C50: ldr r0, =0x02024210 ldrb r1, [r0] ldr r2, =0x0832a328 @@ -142119,11 +142119,11 @@ _08051C50: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _08051C6A + beq @08051C6A ldr r1, =0x020241f0 movs r0, 0 str r0, [r1] -_08051C6A: +@08051C6A: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -142137,7 +142137,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 @@ -142148,7 +142148,7 @@ atk97_tryinfatuatetarget: @ 8051C90 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08051CC8 + bne @08051CC8 ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 @@ -142157,10 +142157,10 @@ atk97_tryinfatuatetarget: @ 8051C90 movs r0, 0x64 muls r1, r0 ldr r0, =0x020244ec - b _08051CD8 + b @08051CD8 .align 2, 0 .pool -_08051CC8: +@08051CC8: ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 @@ -142169,14 +142169,14 @@ _08051CC8: movs r0, 0x64 muls r1, r0 ldr r0, =0x02024744 -_08051CD8: +@08051CD8: adds r5, r1, r0 ldr r4, =0x0202420c ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08051D0C + bne @08051D0C ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 @@ -142185,10 +142185,10 @@ _08051CD8: movs r0, 0x64 muls r1, r0 ldr r0, =0x020244ec - b _08051D1C + b @08051D1C .align 2, 0 .pool -_08051D0C: +@08051D0C: ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 @@ -142197,7 +142197,7 @@ _08051D0C: movs r0, 0x64 muls r1, r0 ldr r0, =0x02024744 -_08051D1C: +@08051D1C: adds r4, r1, r0 adds r0, r5, 0 movs r1, 0xB @@ -142228,7 +142228,7 @@ _08051D1C: adds r0, 0x20 ldrb r2, [r0] cmp r2, 0xC - bne _08051D94 + bne @08051D94 ldr r1, =0x02024214 ldr r0, =0x082db5f5 str r0, [r1] @@ -142237,10 +142237,10 @@ _08051D1C: ldrb r0, [r5] movs r1, 0xC bl b_history__record_ability_usage_of_player - b _08051E2C + b @08051E2C .align 2, 0 .pool -_08051D94: +@08051D94: mov r0, r10 mov r1, r9 bl pokemon_species_get_gender_info @@ -142251,7 +142251,7 @@ _08051D94: lsls r4, 24 lsls r0, 24 cmp r4, r0 - beq _08051DE4 + beq @08051DE4 ldrb r0, [r5] muls r0, r6 ldr r4, =0x02024084 @@ -142262,22 +142262,22 @@ _08051D94: lsls r1, 12 ands r0, r1 cmp r0, 0 - bne _08051DE4 + bne @08051DE4 mov r0, r10 mov r1, r9 bl pokemon_species_get_gender_info lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _08051DE4 + beq @08051DE4 mov r0, r8 adds r1, r7, 0 bl pokemon_species_get_gender_info lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _08051E08 -_08051DE4: + bne @08051E08 +@08051DE4: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -142291,10 +142291,10 @@ _08051DE4: lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08051E2C + b @08051E2C .align 2, 0 .pool -_08051E08: +@08051E08: ldrb r0, [r5] adds r2, r0, 0 muls r2, r6 @@ -142313,7 +142313,7 @@ _08051E08: ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_08051E2C: +@08051E2C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -142326,17 +142326,17 @@ _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] cmp r0, 0 - bne _08051F34 + bne @08051F34 ldr r5, =0x02024214 ldr r1, [r5] ldrb r0, [r1, 0x1] cmp r0, 0x4 - beq _08051EA0 + beq @08051EA0 bl get_battle_side_of_something ldr r4, =0x02024064 strb r0, [r4] @@ -142359,10 +142359,10 @@ sub_8051E48: @ 8051E48 ldr r0, [r5] adds r0, 0x2 str r0, [r5] - b _08051F34 + b @08051F34 .align 2, 0 .pool -_08051EA0: +@08051EA0: ldr r4, =0x02024064 ldr r5, =0x0202420b ldrb r0, [r5] @@ -142376,7 +142376,7 @@ _08051EA0: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _08051EDC + bne @08051EDC ldr r3, =0x02024084 movs r0, 0x58 muls r2, r0 @@ -142391,13 +142391,13 @@ _08051EA0: bl dp01_build_cmdbuf_x1A_aaaa_bbbb ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_08051EDC: +@08051EDC: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08051F2C + beq @08051F2C ldrb r0, [r5] bl battle_get_per_side_status movs r1, 0x2 @@ -142413,7 +142413,7 @@ _08051EDC: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _08051F2C + bne @08051F2C ldr r3, =0x02024084 movs r0, 0x58 muls r2, r0 @@ -142428,12 +142428,12 @@ _08051EDC: bl dp01_build_cmdbuf_x1A_aaaa_bbbb ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_08051F2C: +@08051F2C: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x2 str r0, [r1] -_08051F34: +@08051F34: pop {r4-r7} pop {r0} bx r0 @@ -142442,7 +142442,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 @@ -142457,7 +142457,7 @@ atk99_setmisteffect: @ 8051F58 adds r0, r6 ldrb r0, [r0, 0x4] cmp r0, 0 - beq _08051F98 + beq @08051F98 ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x20 @@ -142465,10 +142465,10 @@ atk99_setmisteffect: @ 8051F58 strb r0, [r2] ldr r0, =0x02024332 strb r5, [r0, 0x5] - b _08051FE6 + b @08051FE6 .align 2, 0 .pool -_08051F98: +@08051F98: ldrb r0, [r4] bl battle_get_per_side_status adds r1, r5, 0 @@ -142505,7 +142505,7 @@ _08051F98: strh r0, [r1] ldr r0, =0x02024332 strb r3, [r0, 0x5] -_08051FE6: +@08051FE6: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -142518,7 +142518,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 @@ -142533,7 +142533,7 @@ atk9A_setincreasedcriticalchance: @ 8052000 adds r2, r1, 0 ands r2, r3 cmp r2, 0 - beq _08052040 + beq @08052040 ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x20 @@ -142542,15 +142542,15 @@ atk9A_setincreasedcriticalchance: @ 8052000 ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] - b _08052048 + b @08052048 .align 2, 0 .pool -_08052040: +@08052040: orrs r1, r3 str r1, [r0] ldr r0, =0x02024332 strb r2, [r0, 0x5] -_08052048: +@08052048: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -142562,7 +142562,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} @@ -142589,7 +142589,7 @@ atk9B_transformdataexecution: @ 805205C lsls r4, 14 ands r0, r4 cmp r0, 0 - bne _080520A2 + bne @080520A2 ldr r0, =0x020242ac lsls r1, 2 adds r1, r0 @@ -142597,8 +142597,8 @@ atk9B_transformdataexecution: @ 805205C ldr r0, =0x000400c0 ands r2, r0 cmp r2, 0 - beq _080520D8 -_080520A2: + beq @080520D8 +@080520A2: ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x20 @@ -142606,10 +142606,10 @@ _080520A2: strb r0, [r2] ldr r1, =0x02024332 movs r0, 0x1 - b _080521EC + b @080521EC .align 2, 0 .pool -_080520D8: +@080520D8: ldr r3, =0x0202420b ldrb r0, [r3] adds r1, r0, 0 @@ -142686,20 +142686,20 @@ _080520D8: adds r6, r3, 0 ldr r0, =0x02024064 mov r8, r0 -_08052170: +@08052170: adds r0, r5, r4 adds r1, r2, r4 ldrb r1, [r1] strb r1, [r0] adds r4, 0x1 cmp r4, 0x23 - bls _08052170 + bls @08052170 movs r4, 0 ldr r7, =0x0831c898 ldr r3, =0x02024090 adds r5, r3, 0 adds r5, 0x18 -_08052188: +@08052188: lsls r1, r4, 1 ldrb r2, [r6] movs r0, 0x58 @@ -142713,21 +142713,21 @@ _08052188: adds r0, r7 ldrb r1, [r0, 0x4] cmp r1, 0x4 - bhi _080521C4 + bhi @080521C4 adds r0, r4, r2 adds r0, r5 - b _080521CA + b @080521CA .align 2, 0 .pool -_080521C4: +@080521C4: adds r0, r4, r2 adds r0, r5 movs r1, 0x5 -_080521CA: +@080521CA: strb r1, [r0] adds r4, 0x1 cmp r4, 0x3 - ble _08052188 + ble @08052188 ldrb r0, [r6] mov r1, r8 strb r0, [r1] @@ -142739,7 +142739,7 @@ _080521CA: bl dp01_battle_side_mark_buffer_for_execution ldr r1, =0x02024332 movs r0, 0 -_080521EC: +@080521EC: strb r0, [r1, 0x5] pop {r3} mov r8, r3 @@ -142751,7 +142751,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 @@ -142763,29 +142763,29 @@ sub_80521FC: @ 80521FC lsrs r1, r0, 2 adds r2, r1, 0 cmp r1, 0 - bne _08052216 + bne @08052216 movs r2, 0x1 -_08052216: +@08052216: ldrh r0, [r3, 0x28] cmp r0, r2 - bhi _0805223C + bhi @0805223C ldr r1, =0x020241f0 movs r0, 0 str r0, [r1] ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] - b _08052290 + b @08052290 .align 2, 0 .pool -_0805223C: +@0805223C: ldr r4, =0x020241f0 str r1, [r4] cmp r1, 0 - bne _08052248 + bne @08052248 movs r0, 0x1 str r0, [r4] -_08052248: +@08052248: ldrb r0, [r6] adds r2, r0, 0 muls r2, r5 @@ -142822,7 +142822,7 @@ _08052248: lsls r1, 1 orrs r0, r1 str r0, [r2] -_08052290: +@08052290: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -142835,7 +142835,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 @@ -142845,19 +142845,19 @@ sub_80522B8: @ 80522B8 ldr r4, =0x0000fffe adds r5, r0, 0 cmp r1, r4 - beq _080522E0 + beq @080522E0 cmp r1, r2 - beq _080522E0 + beq @080522E0 adds r1, r5, 0 -_080522D2: +@080522D2: adds r1, 0x2 adds r3, 0x1 ldrh r0, [r1] cmp r0, r4 - beq _080522E0 + beq @080522E0 cmp r0, r2 - bne _080522D2 -_080522E0: + bne @080522D2 +@080522E0: lsls r0, r3, 1 adds r0, r5 ldrh r1, [r0] @@ -142874,7 +142874,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 @@ -142893,7 +142893,7 @@ atk9D_copyattack: @ 8052300 bl sub_80522B8 lsls r0, 24 cmp r0, 0 - bne _0805235A + bne @0805235A ldr r3, =0x02024084 ldr r2, =0x0202420b ldrb r1, [r2] @@ -142910,16 +142910,16 @@ atk9D_copyattack: @ 8052300 mov r12, r3 mov r9, r2 cmp r1, 0 - bne _0805235A + bne @0805235A ldrb r0, [r6] lsls r0, 1 adds r0, r5 ldrh r1, [r0] cmp r1, 0 - beq _0805235A + beq @0805235A cmp r1, r7 - bne _08052394 -_0805235A: + bne @08052394 +@0805235A: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -142933,10 +142933,10 @@ _0805235A: lsls r0, 24 orrs r1, r0 str r1, [r3] - b _080524CC + b @080524CC .align 2, 0 .pool -_08052394: +@08052394: movs r2, 0 mov r3, r12 adds r3, 0xC @@ -142945,16 +142945,16 @@ _08052394: ldr r4, =0x02024214 mov r10, r4 cmp r0, r1 - beq _080523CE + beq @080523CE mov r8, r3 adds r7, r5, 0 adds r5, r6, 0 mov r4, r9 movs r3, 0x58 -_080523B0: +@080523B0: adds r2, 0x1 cmp r2, 0x3 - bgt _080523CE + bgt @080523CE lsls r1, r2, 1 ldrb r0, [r4] muls r0, r3 @@ -142966,10 +142966,10 @@ _080523B0: ldrh r1, [r1] ldrh r0, [r0] cmp r1, r0 - bne _080523B0 -_080523CE: + bne @080523B0 +@080523CE: cmp r2, 0x4 - bne _080524B0 + bne @080524B0 ldr r5, =0x020241e8 ldrb r1, [r5] lsls r1, 1 @@ -142999,7 +142999,7 @@ _080523CE: adds r0, r4 ldrb r4, [r0, 0x4] cmp r4, 0x4 - bhi _08052438 + bhi @08052438 mov r1, r9 ldrb r0, [r1] muls r0, r6 @@ -143009,10 +143009,10 @@ _080523CE: adds r1, 0x24 adds r0, r1 strb r4, [r0] - b _0805244C + b @0805244C .align 2, 0 .pool -_08052438: +@08052438: mov r4, r9 ldrb r0, [r4] muls r0, r6 @@ -143023,7 +143023,7 @@ _08052438: adds r0, r1 movs r1, 0x5 strb r1, [r0] -_0805244C: +@0805244C: ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] @@ -143066,10 +143066,10 @@ _0805244C: ldr r0, [r4] adds r0, 0x5 str r0, [r4] - b _080524CC + b @080524CC .align 2, 0 .pool -_080524B0: +@080524B0: mov r0, r10 ldr r2, [r0] ldrb r1, [r2, 0x1] @@ -143084,7 +143084,7 @@ _080524B0: orrs r1, r0 mov r2, r10 str r1, [r2] -_080524CC: +@080524CC: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -143095,7 +143095,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} @@ -143105,7 +143105,7 @@ sub_80524DC: @ 80524DC ldr r5, =0x0831c3e0 ldr r0, =0x02024214 mov r8, r0 -_080524EE: +@080524EE: bl GenerateRandomNumber ldr r2, =0x000001ff adds r1, r2, 0 @@ -143113,27 +143113,27 @@ _080524EE: adds r0, 0x1 strh r0, [r7] cmp r0, r6 - bhi _080524EE + bhi @080524EE movs r0, 0x3 -_08052502: +@08052502: subs r0, 0x1 cmp r0, 0 - bge _08052502 + bge @08052502 ldr r4, =0x020241ea ldrh r2, [r4] ldr r3, =0x0000ffff subs r0, r5, 0x2 -_08052510: +@08052510: adds r0, 0x2 ldrh r1, [r0] cmp r1, r2 - beq _0805251C + beq @0805251C cmp r1, r3 - bne _08052510 -_0805251C: + bne @08052510 +@0805251C: ldr r0, =0x0000ffff cmp r1, r0 - bne _080524EE + bne @080524EE ldr r2, =0x02024280 ldr r0, [r2] ldr r1, =0xfffffbff @@ -143167,7 +143167,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 @@ -143188,15 +143188,15 @@ 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: +@080525B8: bl GenerateRandomNumber adds r3, r4, 0 ands r3, r0 cmp r3, 0xA - bgt _080525B8 + bgt @080525B8 lsls r0, r3, 2 adds r0, r3 lsls r3, r0, 1 @@ -143227,7 +143227,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] @@ -143248,9 +143248,9 @@ atkA1_counterdamagecalculator: @ 8052608 adds r0, r1, r0 ldr r3, [r0] cmp r3, 0 - beq _080526BC + beq @080526BC cmp r6, r2 - beq _080526BC + beq @080526BC ldr r6, =0x02024084 adds r0, r1, r5 ldrb r0, [r0, 0xC] @@ -143259,7 +143259,7 @@ atkA1_counterdamagecalculator: @ 8052608 adds r0, r6 ldrh r0, [r0, 0x28] cmp r0, 0 - beq _080526BC + beq @080526BC ldr r1, =0x020241f0 lsls r0, r3, 1 str r0, [r1] @@ -143270,20 +143270,20 @@ atkA1_counterdamagecalculator: @ 8052608 adds r1, r0, r1 ldrb r0, [r1, 0x8] cmp r0, 0 - beq _08052690 + beq @08052690 ldrb r1, [r1, 0x9] adds r0, r1, 0 muls r0, r4 adds r0, r6 ldrh r0, [r0, 0x28] cmp r0, 0 - beq _08052690 + beq @08052690 ldr r0, =0x0202420c strb r1, [r0] - b _080526A0 + b @080526A0 .align 2, 0 .pool -_08052690: +@08052690: ldr r2, =0x0202420c ldr r1, =0x0202433c ldr r0, =0x0202420b @@ -143292,15 +143292,15 @@ _08052690: adds r0, r1 ldrb r0, [r0, 0xC] strb r0, [r2] -_080526A0: +@080526A0: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b _080526EC + b @080526EC .align 2, 0 .pool -_080526BC: +@080526BC: ldr r2, =0x0202437c ldr r0, =0x0202420b ldrb r1, [r0] @@ -143325,7 +143325,7 @@ _080526BC: lsls r0, 24 orrs r1, r0 str r1, [r3] -_080526EC: +@080526EC: pop {r4-r6} pop {r0} bx r0 @@ -143334,7 +143334,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] @@ -143356,9 +143356,9 @@ atkA2_mirrorcoatdamagecalculator: @ 8052700 adds r0, r1, r0 ldr r3, [r0] cmp r3, 0 - beq _080527B4 + beq @080527B4 cmp r6, r2 - beq _080527B4 + beq @080527B4 ldr r6, =0x02024084 adds r0, r1, r5 ldrb r0, [r0, 0xD] @@ -143367,7 +143367,7 @@ atkA2_mirrorcoatdamagecalculator: @ 8052700 adds r0, r6 ldrh r0, [r0, 0x28] cmp r0, 0 - beq _080527B4 + beq @080527B4 ldr r1, =0x020241f0 lsls r0, r3, 1 str r0, [r1] @@ -143378,20 +143378,20 @@ atkA2_mirrorcoatdamagecalculator: @ 8052700 adds r1, r0, r1 ldrb r0, [r1, 0x8] cmp r0, 0 - beq _08052788 + beq @08052788 ldrb r1, [r1, 0x9] adds r0, r1, 0 muls r0, r4 adds r0, r6 ldrh r0, [r0, 0x28] cmp r0, 0 - beq _08052788 + beq @08052788 ldr r0, =0x0202420c strb r1, [r0] - b _08052798 + b @08052798 .align 2, 0 .pool -_08052788: +@08052788: ldr r2, =0x0202420c ldr r1, =0x0202433c ldr r0, =0x0202420b @@ -143400,15 +143400,15 @@ _08052788: adds r0, r1 ldrb r0, [r0, 0xD] strb r0, [r2] -_08052798: +@08052798: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b _080527E4 + b @080527E4 .align 2, 0 .pool -_080527B4: +@080527B4: ldr r2, =0x0202437c ldr r0, =0x0202420b ldrb r1, [r0] @@ -143433,7 +143433,7 @@ _080527B4: lsls r0, 24 orrs r1, r0 str r1, [r3] -_080527E4: +@080527E4: pop {r4-r6} pop {r0} bx r0 @@ -143442,7 +143442,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 @@ -143466,13 +143466,13 @@ atkA3_disablelastusedattack: @ 80527F8 mov r8, r2 ldrh r1, [r1] cmp r0, r1 - beq _0805284C + beq @0805284C mov r12, r6 movs r3, 0x58 -_0805282C: +@0805282C: adds r4, 0x1 cmp r4, 0x3 - bgt _0805284C + bgt @0805284C lsls r2, r4, 1 mov r0, r12 ldrb r1, [r0] @@ -143485,8 +143485,8 @@ _0805282C: ldrh r0, [r2] ldrh r1, [r1] cmp r0, r1 - bne _0805282C -_0805284C: + bne @0805282C +@0805284C: ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -143494,9 +143494,9 @@ _0805284C: add r0, r8 ldrh r0, [r0, 0x4] cmp r0, 0 - bne _08052910 + bne @08052910 cmp r4, 0x4 - beq _08052910 + beq @08052910 movs r5, 0x58 adds r0, r1, 0 muls r0, r5 @@ -143506,7 +143506,7 @@ _0805284C: adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _08052910 + beq @08052910 ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] @@ -143571,10 +143571,10 @@ _0805284C: ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b _0805292A + b @0805292A .align 2, 0 .pool -_08052910: +@08052910: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -143588,7 +143588,7 @@ _08052910: lsls r0, 24 orrs r1, r0 str r1, [r3] -_0805292A: +@0805292A: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -143600,7 +143600,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 @@ -143625,15 +143625,15 @@ atkA4_setencore: @ 805293C mov r9, r2 ldrh r1, [r1] cmp r0, r1 - beq _08052996 + beq @08052996 mov r12, r4 adds r7, r6, 0 mov r6, r8 movs r3, 0x58 -_08052976: +@08052976: adds r5, 0x1 cmp r5, 0x3 - bgt _08052996 + bgt @08052996 lsls r2, r5, 1 mov r0, r12 ldrb r1, [r0] @@ -143646,21 +143646,21 @@ _08052976: ldrh r0, [r2] ldrh r1, [r1] cmp r0, r1 - bne _08052976 -_08052996: + bne @08052976 +@08052996: ldrb r0, [r4] lsls r0, 1 add r0, r8 ldrh r2, [r0] cmp r2, 0xA5 - beq _080529AA + beq @080529AA cmp r2, 0xE3 - beq _080529AA + beq @080529AA cmp r2, 0x77 - bne _080529AC -_080529AA: + bne @080529AC +@080529AA: movs r5, 0x4 -_080529AC: +@080529AC: ldrb r1, [r4] lsls r0, r1, 3 subs r0, r1 @@ -143669,9 +143669,9 @@ _080529AC: adds r3, r0, r2 ldrh r0, [r3, 0x6] cmp r0, 0 - bne _08052A44 + bne @08052A44 cmp r5, 0x4 - beq _08052A44 + beq @08052A44 movs r0, 0x58 adds r2, r1, 0 muls r2, r0 @@ -143681,7 +143681,7 @@ _080529AC: adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _08052A44 + beq @08052A44 lsls r0, r5, 1 adds r0, r2 subs r1, 0x18 @@ -143725,10 +143725,10 @@ _080529AC: ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b _08052A5E + b @08052A5E .align 2, 0 .pool -_08052A44: +@08052A44: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -143742,7 +143742,7 @@ _08052A44: lsls r0, 24 orrs r1, r0 str r1, [r3] -_08052A5E: +@08052A5E: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -143755,7 +143755,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 @@ -143772,7 +143772,7 @@ sub_8052A70: @ 8052A70 lsls r1, 17 ands r0, r1 cmp r0, 0 - bne _08052B10 + bne @08052B10 ldr r5, =0x0202420b ldrb r0, [r5] muls r0, r7 @@ -143819,10 +143819,10 @@ sub_8052A70: @ 8052A70 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b _08052B2A + b @08052B2A .align 2, 0 .pool -_08052B10: +@08052B10: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -143836,7 +143836,7 @@ _08052B10: lsls r0, 24 orrs r1, r0 str r1, [r3] -_08052B2A: +@08052B2A: pop {r4-r7} pop {r0} bx r0 @@ -143845,7 +143845,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 @@ -143858,15 +143858,15 @@ atkA6_settypetorandomresistance: @ 8052B34 adds r2, r0, r1 ldrh r1, [r2] cmp r1, 0 - beq _08052B7E + beq @08052B7E ldr r0, =0x0000ffff cmp r1, r0 - beq _08052B7E + beq @08052B7E ldrh r0, [r2] bl sub_8052F48 lsls r0, 24 cmp r0, 0 - beq _08052C1C + beq @08052C1C ldr r1, =0x02024084 ldr r2, =0x02024270 ldrb r0, [r4] @@ -143881,8 +143881,8 @@ atkA6_settypetorandomresistance: @ 8052B34 lsls r1, 5 ands r0, r1 cmp r0, 0 - beq _08052C1C -_08052B7E: + beq @08052C1C +@08052B7E: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -143896,10 +143896,10 @@ _08052B7E: lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08052D08 + b @08052D08 .align 2, 0 .pool -_08052BB4: +@08052BB4: mov r0, r12 strb r5, [r0] mov r1, r10 @@ -143917,10 +143917,10 @@ _08052BB4: movs r0, 0xFF strb r0, [r1, 0x3] ldr r1, =0x02024214 - b _08052C0A + b @08052C0A .align 2, 0 .pool -_08052BE0: +@08052BE0: mov r0, r8 adds r0, 0x1 adds r0, r3 @@ -143942,24 +143942,24 @@ _08052BE0: movs r0, 0xFF strb r0, [r1, 0x3] mov r1, r12 -_08052C0A: +@08052C0A: ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b _08052D08 + b @08052D08 .align 2, 0 .pool -_08052C1C: +@08052C1C: movs r4, 0 mov r8, r4 movs r7, 0x7F mov r9, r7 -_08052C24: +@08052C24: bl GenerateRandomNumber mov r4, r9 ands r4, r0 cmp r4, 0x70 - bhi _08052C24 + bhi @08052C24 lsls r0, r4, 1 adds r4, r0, r4 ldr r6, =0x0831ace8 @@ -143973,12 +143973,12 @@ _08052C24: mov r10, r2 ldrh r0, [r0] cmp r1, r0 - bne _08052C80 + bne @08052C80 adds r0, r4, 0x2 adds r0, r6 ldrb r0, [r0] cmp r0, 0x5 - bhi _08052C80 + bhi @08052C80 ldr r7, =0x02024084 movs r2, 0x58 adds r0, r5, 0 @@ -143994,18 +143994,18 @@ _08052C24: ldrb r0, [r1] adds r1, r5, 0 cmp r0, r1 - beq _08052C80 + beq @08052C80 adds r0, r3, 0 adds r0, 0x22 ldrb r0, [r0] cmp r0, r1 - bne _08052BB4 -_08052C80: + bne @08052BB4 +@08052C80: movs r7, 0x1 add r8, r7 ldr r0, =0x000003e7 cmp r8, r0 - ble _08052C24 + ble @08052C24 movs r0, 0 mov r8, r0 ldr r1, =0x02024214 @@ -144015,13 +144015,13 @@ _08052C80: adds r0, r3 mov r9, r0 adds r5, r3, 0 -_08052C9C: +@08052C9C: ldrb r1, [r5] cmp r1, 0xFF - bgt _08052CA6 + bgt @08052CA6 cmp r1, 0xFE - bge _08052CE0 -_08052CA6: + bge @08052CE0 +@08052CA6: mov r4, r10 ldrb r2, [r4] lsls r0, r2, 1 @@ -144029,10 +144029,10 @@ _08052CA6: adds r0, r7 ldrh r0, [r0] cmp r1, r0 - bne _08052CE0 + bne @08052CE0 ldrb r0, [r5, 0x2] cmp r0, 0x5 - bhi _08052CE0 + bhi @08052CE0 movs r6, 0x58 adds r0, r2, 0 muls r0, r6 @@ -144044,20 +144044,20 @@ _08052CA6: mov r7, r9 ldrb r1, [r7] cmp r0, r1 - beq _08052CE0 + beq @08052CE0 adds r0, r2, 0 adds r0, 0x22 ldrb r0, [r0] cmp r0, r1 - beq _08052CE0 - b _08052BE0 -_08052CE0: + beq @08052CE0 + b @08052BE0 +@08052CE0: adds r5, 0x3 movs r0, 0x3 add r8, r0 ldr r0, =0x0000014f cmp r8, r0 - bls _08052C9C + bls @08052C9C mov r1, r12 ldr r2, [r1] ldrb r1, [r2, 0x1] @@ -144072,7 +144072,7 @@ _08052CE0: orrs r1, r0 mov r4, r12 str r1, [r4] -_08052D08: +@08052D08: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -144085,7 +144085,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 @@ -144125,7 +144125,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 @@ -144152,9 +144152,9 @@ atkA8_copymovepermanently: @ 8052D8C mov r12, r3 mov r10, r2 cmp r1, 0 - beq _08052DC4 - b _08052F18 -_08052DC4: + beq @08052DC4 + b @08052F18 +@08052DC4: ldr r0, =0x02024240 ldr r2, =0x0202420c ldrb r1, [r2] @@ -144164,47 +144164,47 @@ _08052DC4: mov r9, r0 mov r8, r2 cmp r1, 0xA5 - bne _08052DDA - b _08052F18 -_08052DDA: + bne @08052DDA + b @08052F18 +@08052DDA: cmp r1, 0 - bne _08052DE0 - b _08052F18 -_08052DE0: + bne @08052DE0 + b @08052F18 +@08052DE0: cmp r1, r5 - bne _08052DE6 - b _08052F18 -_08052DE6: + bne @08052DE6 + b @08052F18 +@08052DE6: cmp r1, 0xA6 - bne _08052DEC - b _08052F18 -_08052DEC: + bne @08052DEC + b @08052F18 +@08052DEC: movs r7, 0 mov r5, r9 mov r0, r12 adds r0, 0xC adds r1, r4, r0 mov r3, r8 -_08052DF8: +@08052DF8: ldrh r2, [r1] cmp r2, 0xA6 - beq _08052E0A + beq @08052E0A ldrb r0, [r3] lsls r0, 1 adds r0, r5 ldrh r0, [r0] cmp r2, r0 - beq _08052E12 -_08052E0A: + beq @08052E12 +@08052E0A: adds r1, 0x2 adds r7, 0x1 cmp r7, 0x3 - ble _08052DF8 -_08052E12: + ble @08052DF8 +@08052E12: cmp r7, 0x4 - beq _08052E18 - b _08052F18 -_08052E18: + beq @08052E18 + b @08052F18 +@08052E18: ldr r4, =0x020241e8 ldrb r1, [r4] lsls r1, 1 @@ -144254,7 +144254,7 @@ _08052E18: adds r3, r0, 0 add r2, sp, 0x4 add r5, sp, 0xC -_08052E7A: +@08052E7A: adds r0, r3, r6 ldrh r0, [r0] strh r0, [r2] @@ -144266,7 +144266,7 @@ _08052E7A: adds r2, 0x2 adds r7, 0x1 cmp r7, 0x3 - ble _08052E7A + ble @08052E7A add r2, sp, 0x4 mov r0, r10 ldrb r1, [r0] @@ -144309,10 +144309,10 @@ _08052E7A: ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b _08052F32 + b @08052F32 .align 2, 0 .pool -_08052F18: +@08052F18: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -144326,7 +144326,7 @@ _08052F18: lsls r0, 24 orrs r1, r0 str r1, [r3] -_08052F32: +@08052F32: add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -144340,7 +144340,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 @@ -144351,58 +144351,58 @@ sub_8052F48: @ 8052F48 adds r1, r2 ldrb r0, [r1] cmp r0, 0x91 - beq _08052F72 + beq @08052F72 cmp r0, 0x27 - beq _08052F72 + beq @08052F72 cmp r0, 0x4B - beq _08052F72 + beq @08052F72 cmp r0, 0x97 - beq _08052F72 + beq @08052F72 cmp r0, 0x9B - beq _08052F72 + beq @08052F72 cmp r0, 0x1A - bne _08052F7C -_08052F72: + bne @08052F7C +@08052F72: movs r0, 0x1 - b _08052F7E + b @08052F7E .align 2, 0 .pool -_08052F7C: +@08052F7C: movs r0, 0 -_08052F7E: +@08052F7E: pop {r1} bx r1 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 cmp r1, 0 - beq _08052FA2 + beq @08052FA2 cmp r1, 0xD6 - beq _08052FA2 + beq @08052FA2 movs r0, 0x89 lsls r0, 1 cmp r1, r0 - beq _08052FA2 + beq @08052FA2 cmp r1, 0x77 - beq _08052FA2 + beq @08052FA2 cmp r1, 0x76 - bne _08052FA6 -_08052FA2: + bne @08052FA6 +@08052FA2: movs r0, 0x1 - b _08052FA8 -_08052FA6: + b @08052FA8 +@08052FA6: movs r0, 0 -_08052FA8: +@08052FA8: pop {r1} bx r1 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 @@ -144414,52 +144414,52 @@ move_weather_interaction: @ 8052FAC ldrb r0, [r0] adds r3, r1, 0 cmp r0, 0x97 - bne _08052FD0 + bne @08052FD0 ldr r0, =0x020243cc ldrh r1, [r0] movs r0, 0x60 ands r0, r1 cmp r0, 0 - bne _08053010 -_08052FD0: + bne @08053010 +@08052FD0: lsls r0, r2, 1 adds r0, r2 lsls r0, 2 adds r0, r3 ldrb r0, [r0] cmp r0, 0x91 - beq _08052FF2 + beq @08052FF2 cmp r0, 0x27 - beq _08052FF2 + beq @08052FF2 cmp r0, 0x4B - beq _08052FF2 + beq @08052FF2 cmp r0, 0x97 - beq _08052FF2 + beq @08052FF2 cmp r0, 0x9B - beq _08052FF2 + beq @08052FF2 cmp r0, 0x1A - bne _08053010 -_08052FF2: + bne @08053010 +@08052FF2: ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 lsls r1, 20 ands r0, r1 cmp r0, 0 - beq _08053010 + beq @08053010 movs r0, 0x1 - b _08053012 + b @08053012 .align 2, 0 .pool -_08053010: +@08053010: movs r0, 0x2 -_08053012: +@08053012: pop {r1} bx r1 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 @@ -144475,7 +144475,7 @@ sub_8053018: @ 8053018 movs r0, 0x84 lsls r0, 1 mov r10, r0 -_08053036: +@08053036: lsls r4, r5, 1 mov r1, r9 ldrb r0, [r1] @@ -144488,7 +144488,7 @@ _08053036: bl sub_8052F84 lsls r0, 24 cmp r0, 0 - bne _08053076 + bne @08053076 mov r1, r9 ldrb r0, [r1] mov r1, r8 @@ -144498,15 +144498,15 @@ _08053036: adds r0, r7 ldrh r1, [r0] cmp r1, r10 - beq _08053076 + beq @08053076 cmp r1, 0xFD - beq _08053076 + beq @08053076 adds r0, r1, 0 bl sub_8052F48 lsls r0, 24 cmp r0, 0 - beq _08053084 -_08053076: + beq @08053084 +@08053076: ldr r1, =0x0832a328 lsls r0, r5, 2 adds r0, r1 @@ -144514,10 +144514,10 @@ _08053076: orrs r6, r0 lsls r0, r6, 24 lsrs r6, r0, 24 -_08053084: +@08053084: adds r5, 0x1 cmp r5, 0x3 - ble _08053036 + ble @08053036 ldr r0, =0x0202420b ldrb r0, [r0] adds r1, r6, 0 @@ -144526,18 +144526,18 @@ _08053084: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0xF - bne _080530B8 + bne @080530B8 ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b _0805311C + b @0805311C .align 2, 0 .pool -_080530B8: +@080530B8: movs r7, 0x3 ldr r4, =0x0832a328 -_080530BC: +@080530BC: bl GenerateRandomNumber adds r5, r7, 0 ands r5, r0 @@ -144546,7 +144546,7 @@ _080530BC: ldr r0, [r0] ands r0, r6 cmp r0, 0 - bne _080530BC + bne @080530BC ldr r4, =0x020241ee ldr r2, =0x02024084 lsls r1, r5, 1 @@ -144584,7 +144584,7 @@ _080530BC: lsls r0, 24 orrs r1, r0 str r1, [r3] -_0805311C: +@0805311C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -144597,7 +144597,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] @@ -144620,7 +144620,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] @@ -144643,20 +144643,20 @@ b_feature_update_destiny_bond: @ 8053180 lsls r1, 18 ands r0, r1 cmp r0, 0 - beq _080531CA + beq @080531CA cmp r5, r3 - beq _080531CA + beq @080531CA ldr r2, =0x02024280 ldr r1, [r2] movs r0, 0x80 lsls r0, 17 ands r0, r1 cmp r0, 0 - bne _080531CA + bne @080531CA movs r0, 0x40 orrs r1, r0 str r1, [r2] -_080531CA: +@080531CA: pop {r4,r5} pop {r0} bx r0 @@ -144665,7 +144665,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 @@ -144679,7 +144679,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 @@ -144699,17 +144699,17 @@ atkAC_remaininghptopower: @ 80531F8 ldr r0, =0x0831c408 ldrb r2, [r0] cmp r1, r2 - ble _08053232 + ble @08053232 adds r2, r0, 0 -_08053224: +@08053224: adds r3, 0x2 cmp r3, 0xB - bgt _08053232 + bgt @08053232 adds r0, r3, r2 ldrb r0, [r0] cmp r1, r0 - bgt _08053224 -_08053232: + bgt @08053224 +@08053232: ldr r2, =0x02024400 ldr r1, =0x0831c408 adds r0, r3, 0x1 @@ -144727,7 +144727,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 @@ -144742,14 +144742,14 @@ atkAD_reducepprandom: @ 8053260 ldrh r2, [r0] mov r8, r1 cmp r2, 0 - bne _08053280 - b _08053408 -_08053280: + bne @08053280 + b @08053408 +@08053280: ldr r0, =0x0000ffff cmp r2, r0 - bne _08053288 - b _08053408 -_08053288: + bne @08053288 + b @08053408 +@08053288: movs r7, 0 ldr r0, =0x02024084 movs r1, 0x58 @@ -144759,15 +144759,15 @@ _08053288: adds r1, r3 ldrh r1, [r1] cmp r2, r1 - beq _080532C0 + beq @080532C0 adds r6, r4, 0 mov r5, r8 adds r4, r3, 0 movs r3, 0x58 -_080532A4: +@080532A4: adds r7, 0x1 cmp r7, 0x3 - bgt _080532C0 + bgt @080532C0 ldrb r0, [r5] lsls r2, r0, 1 adds r2, r6 @@ -144778,12 +144778,12 @@ _080532A4: ldrh r0, [r2] ldrh r1, [r1] cmp r0, r1 - bne _080532A4 -_080532C0: + bne @080532A4 +@080532C0: cmp r7, 0x4 - bne _080532C6 - b _08053408 -_080532C6: + bne @080532C6 + b @08053408 +@080532C6: mov r4, r8 ldrb r0, [r4] movs r1, 0x58 @@ -144798,9 +144798,9 @@ _080532C6: add r0, r10 ldrb r0, [r0] cmp r0, 0x1 - bhi _080532E6 - b _08053408 -_080532E6: + bhi @080532E6 + b @08053408 +@080532E6: bl GenerateRandomNumber movs r1, 0x3 ands r1, r0 @@ -144813,9 +144813,9 @@ _080532E6: add r0, r10 ldrb r0, [r0] cmp r0, r6 - bge _08053304 + bge @08053304 adds r6, r0, 0 -_08053304: +@08053304: ldr r1, =0x02022f58 movs r5, 0xFD strb r5, [r1] @@ -144877,7 +144877,7 @@ _08053304: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _080533B8 + bne @080533B8 mov r2, r9 muls r2, r3 ldr r0, =0x02024084 @@ -144888,7 +144888,7 @@ _08053304: lsls r1, 14 ands r0, r1 cmp r0, 0 - bne _080533B8 + bne @080533B8 adds r1, r7, 0 adds r1, 0x9 lsls r1, 24 @@ -144903,7 +144903,7 @@ _08053304: bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_080533B8: +@080533B8: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 @@ -144918,13 +144918,13 @@ _080533B8: adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _08053422 + bne @08053422 adds r0, r2, 0 bl b_cancel_multi_turn_move_maybe - b _08053422 + b @08053422 .align 2, 0 .pool -_08053408: +@08053408: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -144938,7 +144938,7 @@ _08053408: lsls r0, 24 orrs r1, r0 str r1, [r3] -_08053422: +@08053422: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -144952,7 +144952,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 @@ -144965,9 +144965,9 @@ atkAE_clearstatusifnotsoundproofed: @ 8053438 ldr r0, =0x020241ea ldrh r0, [r0] cmp r0, 0xD7 - beq _08053454 - b _0805363E -_08053454: + beq @08053454 + b @0805363E +@08053454: ldr r6, =0x02024332 mov r0, r8 strb r0, [r6, 0x5] @@ -144978,10 +144978,10 @@ _08053454: ldr r1, =0x02024744 mov r10, r1 cmp r0, 0 - bne _08053470 + bne @08053470 ldr r2, =0x020244ec mov r10, r2 -_08053470: +@08053470: ldr r4, =0x02024084 ldrb r3, [r5] movs r7, 0x58 @@ -144992,7 +144992,7 @@ _08053470: adds r1, 0x20 ldrb r0, [r1] cmp r0, 0x2B - beq _080534C4 + beq @080534C4 adds r0, r4, 0 adds r0, 0x4C adds r0, r2, r0 @@ -145008,10 +145008,10 @@ _08053470: ldr r1, =0xf7ffffff ands r0, r1 str r0, [r2] - b _080534D4 + b @080534D4 .align 2, 0 .pool -_080534C4: +@080534C4: ldrb r1, [r1] adds r0, r3, 0 bl b_history__record_ability_usage_of_player @@ -145019,7 +145019,7 @@ _080534C4: movs r1, 0x1 orrs r0, r1 strb r0, [r6, 0x5] -_080534D4: +@080534D4: ldr r7, =0x02024064 ldr r0, =0x0202420b ldrb r0, [r0] @@ -145039,7 +145039,7 @@ _080534D4: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0805357A + beq @0805357A ldr r0, =0x02024210 ldrb r2, [r0] ldr r1, =0x0832a328 @@ -145049,7 +145049,7 @@ _080534D4: ldr r0, [r0] ands r2, r0 cmp r2, 0 - bne _0805357A + bne @0805357A ldr r5, =0x02024084 movs r6, 0x58 adds r4, r3, 0 @@ -145059,7 +145059,7 @@ _080534D4: adds r1, 0x20 ldrb r0, [r1] cmp r0, 0x2B - beq _08053568 + beq @08053568 adds r0, r5, 0 adds r0, 0x4C adds r0, r4, r0 @@ -145074,10 +145074,10 @@ _080534D4: ldr r1, =0xf7ffffff ands r0, r1 str r0, [r2] - b _0805357A + b @0805357A .align 2, 0 .pool -_08053568: +@08053568: ldrb r1, [r1] adds r0, r3, 0 bl b_history__record_ability_usage_of_player @@ -145086,10 +145086,10 @@ _08053568: mov r2, r9 orrs r0, r2 strb r0, [r1, 0x5] -_0805357A: +@0805357A: movs r6, 0 ldr r7, =0x02024084 -_0805357E: +@0805357E: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 @@ -145105,11 +145105,11 @@ _0805357E: lsls r0, 24 lsrs r4, r0, 24 cmp r5, 0 - beq _08053636 + beq @08053636 movs r0, 0xCE lsls r0, 1 cmp r5, r0 - beq _08053636 + beq @08053636 ldr r2, =0x0202406e ldr r0, =0x0202420b ldrb r1, [r0] @@ -145117,26 +145117,26 @@ _0805357E: adds r0, r2 ldrh r0, [r0] cmp r0, r6 - bne _080535D0 + bne @080535D0 movs r0, 0x58 muls r0, r1 - b _08053600 + b @08053600 .align 2, 0 .pool -_080535D0: +@080535D0: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08053618 + beq @08053618 ldr r0, =0x02024064 ldrb r3, [r0] lsls r0, r3, 1 adds r0, r2 ldrh r0, [r0] cmp r0, r6 - bne _08053618 + bne @08053618 ldr r0, =0x02024210 ldrb r1, [r0] ldr r2, =0x0832a328 @@ -145145,25 +145145,25 @@ _080535D0: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _08053618 + bne @08053618 movs r0, 0x58 muls r0, r3 -_08053600: +@08053600: adds r0, r7 adds r0, 0x20 ldrb r0, [r0] - b _08053624 + b @08053624 .align 2, 0 .pool -_08053618: +@08053618: adds r0, r5, 0 adds r1, r4, 0 bl sub_806B694 lsls r0, 24 lsrs r0, 24 -_08053624: +@08053624: cmp r0, 0x2B - beq _08053636 + beq @08053636 movs r0, 0x1 lsls r0, r6 mov r1, r8 @@ -145171,12 +145171,12 @@ _08053624: lsls r0, r1, 24 lsrs r0, 24 mov r8, r0 -_08053636: +@08053636: adds r6, 0x1 cmp r6, 0x5 - ble _0805357E - b _080536BC -_0805363E: + ble @0805357E + b @080536BC +@0805363E: ldr r1, =0x02024332 movs r0, 0x4 strb r0, [r1, 0x5] @@ -145216,7 +145216,7 @@ _0805363E: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _080536BC + beq @080536BC ldr r0, =0x02024210 ldrb r2, [r0] ldr r1, =0x0832a328 @@ -145226,7 +145226,7 @@ _0805363E: ldr r0, [r0] ands r2, r0 cmp r2, 0 - bne _080536BC + bne @080536BC adds r0, r3, 0 muls r0, r5 add r0, r9 @@ -145238,10 +145238,10 @@ _0805363E: ldr r0, [r1] ands r0, r6 str r0, [r1] -_080536BC: +@080536BC: mov r2, r8 cmp r2, 0 - beq _080536DE + beq @080536DE ldr r4, =0x02024064 ldr r0, =0x0202420b ldrb r0, [r0] @@ -145254,7 +145254,7 @@ _080536BC: bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_080536DE: +@080536DE: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -145272,7 +145272,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 @@ -145289,7 +145289,7 @@ atkAF_cursetarget: @ 805371C adds r0, r2, 0 ands r0, r3 cmp r0, 0 - beq _08053768 + beq @08053768 ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -145303,10 +145303,10 @@ atkAF_cursetarget: @ 805371C lsls r0, 24 orrs r1, r0 str r1, [r3] - b _0805378C + b @0805378C .align 2, 0 .pool -_08053768: +@08053768: orrs r2, r3 str r2, [r1] ldr r1, =0x020241f0 @@ -145318,15 +145318,15 @@ _08053768: lsrs r0, 1 str r0, [r1] cmp r0, 0 - bne _08053784 + bne @08053784 movs r0, 0x1 str r0, [r1] -_08053784: +@08053784: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_0805378C: +@0805378C: pop {r4,r5} pop {r0} bx r0 @@ -145335,7 +145335,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] @@ -145351,7 +145351,7 @@ atkB0_setspikes: @ 80537A0 adds r3, r0, r1 ldrb r0, [r3, 0xA] cmp r0, 0x3 - bne _08053804 + bne @08053804 ldr r2, =0x0202437c ldrb r1, [r4] lsls r0, r1, 2 @@ -145375,10 +145375,10 @@ atkB0_setspikes: @ 80537A0 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _0805381E + b @0805381E .align 2, 0 .pool -_08053804: +@08053804: ldr r1, =0x0202428e adds r1, r2, r1 ldrh r2, [r1] @@ -145392,7 +145392,7 @@ _08053804: ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_0805381E: +@0805381E: pop {r4} pop {r0} bx r0 @@ -145401,7 +145401,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] @@ -145424,7 +145424,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 @@ -145437,7 +145437,7 @@ atkB2_setperishsong: @ 805385C mov r8, r0 ldrb r1, [r7] cmp r6, r1 - bge _080538C8 + bge @080538C8 movs r5, 0x20 ldr r0, =0x02024084 mov r12, r0 @@ -145445,44 +145445,44 @@ atkB2_setperishsong: @ 805385C adds r4, r0, 0 adds r4, 0xF ldr r2, =0x020242ac -_08053884: +@08053884: ldr r1, [r2] adds r0, r1, 0 ands r0, r5 cmp r0, 0 - bne _0805389C + bne @0805389C movs r0, 0x58 muls r0, r3 add r0, r12 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x2B - bne _080538B4 -_0805389C: + bne @080538B4 +@0805389C: adds r6, 0x1 - b _080538BC + b @080538BC .align 2, 0 .pool -_080538B4: +@080538B4: orrs r1, r5 str r1, [r2] movs r0, 0x33 strb r0, [r4] -_080538BC: +@080538BC: adds r4, 0x1C adds r2, 0x4 adds r3, 0x1 ldrb r0, [r7] cmp r3, r0 - blt _08053884 -_080538C8: + blt @08053884 +@080538C8: mov r1, r8 ldrb r0, [r1] bl sub_803F67C ldr r0, =0x0202406c ldrb r0, [r0] cmp r6, r0 - bne _080538FC + bne @080538FC ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -145496,15 +145496,15 @@ _080538C8: lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08053904 + b @08053904 .align 2, 0 .pool -_080538FC: +@080538FC: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_08053904: +@08053904: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -145516,7 +145516,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 @@ -145526,17 +145526,17 @@ atkB3_rolloutdamagecalculation: @ 8053914 movs r0, 0x29 ands r0, r1 cmp r0, 0 - beq _08053948 + beq @08053948 ldr r0, =0x0202420b ldrb r0, [r0] bl b_cancel_multi_turn_move_maybe ldr r1, =0x02024214 ldr r0, =0x082d8a60 str r0, [r1] - b _08053A60 + b @08053A60 .align 2, 0 .pool -_08053948: +@08053948: ldr r2, =0x02024084 ldr r1, =0x0202420b ldrb r3, [r1] @@ -145557,7 +145557,7 @@ _08053948: ldr r2, =0x020241ea mov r8, r2 cmp r0, 0 - bne _080539BA + bne @080539BA lsls r0, r3, 3 subs r0, r3 lsls r0, 2 @@ -145594,7 +145594,7 @@ _08053948: mov r2, r8 ldrh r1, [r2] strh r1, [r0] -_080539BA: +@080539BA: ldrb r0, [r6] lsls r2, r0, 3 subs r2, r0 @@ -145612,7 +145612,7 @@ _080539BA: orrs r0, r1 strb r0, [r2, 0x11] cmp r1, 0 - bne _080539EE + bne @080539EE ldrb r0, [r6] adds r1, r0, 0 muls r1, r5 @@ -145621,7 +145621,7 @@ _080539BA: ldr r2, =0xffffefff ands r0, r2 str r0, [r1] -_080539EE: +@080539EE: ldr r3, =0x02024400 ldr r2, =0x0831c898 mov r0, r8 @@ -145647,11 +145647,11 @@ _080539EE: ldr r7, =0x02024214 adds r5, r3, 0 cmp r2, r1 - bge _08053A3C + bge @08053A3C adds r1, r5, 0 adds r3, r4, 0 movs r4, 0x5 -_08053A28: +@08053A28: ldrh r0, [r1] lsls r0, 1 strh r0, [r1] @@ -145661,8 +145661,8 @@ _08053A28: lsrs r0, 28 subs r0, r4, r0 cmp r2, r0 - blt _08053A28 -_08053A3C: + blt @08053A28 +@08053A3C: ldrb r1, [r6] movs r0, 0x58 muls r0, r1 @@ -145674,15 +145674,15 @@ _08053A3C: lsls r1, 23 ands r0, r1 cmp r0, 0 - beq _08053A5A + beq @08053A5A ldrh r0, [r5] lsls r0, 1 strh r0, [r5] -_08053A5A: +@08053A5A: ldr r0, [r7] adds r0, 0x1 str r0, [r7] -_08053A60: +@08053A60: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -145694,7 +145694,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 @@ -145710,7 +145710,7 @@ atkB4_jumpifconfusedandattackmaxed: @ 8053A90 ands r0, r1 ldr r4, =0x02024214 cmp r0, 0 - beq _08053AEC + beq @08053AEC ldr r2, [r4] ldrb r0, [r2, 0x1] adds r0, r3 @@ -145721,7 +145721,7 @@ atkB4_jumpifconfusedandattackmaxed: @ 8053A90 lsls r0, 24 asrs r0, 24 cmp r0, 0xC - bne _08053AEC + bne @08053AEC ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] lsls r0, 8 @@ -145733,28 +145733,28 @@ atkB4_jumpifconfusedandattackmaxed: @ 8053A90 lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08053AF2 + b @08053AF2 .align 2, 0 .pool -_08053AEC: +@08053AEC: ldr r0, [r4] adds r0, 0x6 str r0, [r4] -_08053AF2: +@08053AF2: pop {r4,r5} pop {r0} bx r0 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] movs r0, 0x29 ands r0, r1 cmp r0, 0 - beq _08053B34 + beq @08053B34 ldr r2, =0x020242bc ldr r0, =0x0202420b ldrb r1, [r0] @@ -145767,10 +145767,10 @@ sub_8053AF8: @ 8053AF8 ldr r1, =0x02024214 ldr r0, =0x082d8a60 str r0, [r1] - b _08053B8C + b @08053B8C .align 2, 0 .pool -_08053B34: +@08053B34: ldr r5, =0x020242bc ldr r4, =0x0202420b ldrb r1, [r4] @@ -145780,10 +145780,10 @@ _08053B34: adds r1, r0, r5 ldrb r0, [r1, 0x10] cmp r0, 0x5 - beq _08053B4C + beq @08053B4C adds r0, 0x1 strb r0, [r1, 0x10] -_08053B4C: +@08053B4C: ldr r3, =0x02024400 ldr r2, =0x0831c898 ldr r0, =0x020241ea @@ -145803,22 +145803,22 @@ _08053B4C: ldr r4, =0x02024214 ldrb r1, [r0, 0x10] cmp r2, r1 - bge _08053B86 + bge @08053B86 adds r1, r3, 0 adds r3, r0, 0 -_08053B78: +@08053B78: ldrh r0, [r1] lsls r0, 1 strh r0, [r1] adds r2, 0x1 ldrb r0, [r3, 0x10] cmp r2, r0 - blt _08053B78 -_08053B86: + blt @08053B78 +@08053B86: ldr r0, [r4] adds r0, 0x1 str r0, [r4] -_08053B8C: +@08053B8C: pop {r4,r5} pop {r0} bx r0 @@ -145827,7 +145827,7 @@ _08053B8C: thumb_func_end sub_8053AF8 thumb_func_start atkB6_happinesstodamagecalculation -atkB6_happinesstodamagecalculation: @ 8053BAC +atkB6_happinesstodamagecalculation: ; 8053BAC push {r4,lr} ldr r2, =0x0831c898 ldr r0, =0x020241ea @@ -145838,7 +145838,7 @@ atkB6_happinesstodamagecalculation: @ 8053BAC adds r0, r2 ldrb r0, [r0] cmp r0, 0x79 - bne _08053BEC + bne @08053BEC ldr r4, =0x02024400 ldr r2, =0x02024084 ldr r0, =0x0202420b @@ -145848,10 +145848,10 @@ atkB6_happinesstodamagecalculation: @ 8053BAC adds r0, r2 adds r0, 0x2B ldrb r1, [r0] - b _08053C02 + b @08053C02 .align 2, 0 .pool -_08053BEC: +@08053BEC: ldr r4, =0x02024400 ldr r2, =0x02024084 ldr r0, =0x0202420b @@ -145863,7 +145863,7 @@ _08053BEC: ldrb r0, [r0] movs r1, 0xFF subs r1, r0 -_08053C02: +@08053C02: lsls r0, r1, 2 adds r0, r1 lsls r0, 1 @@ -145882,38 +145882,38 @@ _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 ands r4, r0 cmp r4, 0x65 - bgt _08053C4C + bgt @08053C4C ldr r1, =0x02024400 movs r0, 0x28 strh r0, [r1] - b _08053C8E + b @08053C8E .align 2, 0 .pool -_08053C4C: +@08053C4C: cmp r4, 0xB1 - bgt _08053C5C + bgt @08053C5C ldr r1, =0x02024400 movs r0, 0x50 strh r0, [r1] - b _08053C8E + b @08053C8E .align 2, 0 .pool -_08053C5C: +@08053C5C: cmp r4, 0xCB - bgt _08053C6C + bgt @08053C6C ldr r1, =0x02024400 movs r0, 0x78 strh r0, [r1] - b _08053C8E + b @08053C8E .align 2, 0 .pool -_08053C6C: +@08053C6C: ldr r3, =0x020241f0 ldr r2, =0x02024084 ldr r0, =0x0202420c @@ -145925,22 +145925,22 @@ _08053C6C: lsrs r0, 2 str r0, [r3] cmp r0, 0 - bne _08053C88 + bne @08053C88 movs r0, 0x1 str r0, [r3] -_08053C88: +@08053C88: ldr r0, [r3] negs r0, r0 str r0, [r3] -_08053C8E: +@08053C8E: cmp r4, 0xCB - bgt _08053CAC + bgt @08053CAC ldr r1, =0x02024214 ldr r0, =0x082d8a30 - b _08053CE6 + b @08053CE6 .align 2, 0 .pool -_08053CAC: +@08053CAC: ldr r2, =0x02024084 ldr r0, =0x0202420c ldrb r1, [r0] @@ -145950,13 +145950,13 @@ _08053CAC: ldrh r1, [r0, 0x2C] ldrh r0, [r0, 0x28] cmp r1, r0 - bne _08053CD8 + bne @08053CD8 ldr r1, =0x02024214 ldr r0, =0x082d9efb - b _08053CE6 + b @08053CE6 .align 2, 0 .pool -_08053CD8: +@08053CD8: ldr r2, =0x0202427c ldrb r1, [r2] movs r0, 0xF7 @@ -145964,7 +145964,7 @@ _08053CD8: strb r0, [r2] ldr r1, =0x02024214 ldr r0, =0x082d9ee1 -_08053CE6: +@08053CE6: str r0, [r1] pop {r4} pop {r0} @@ -145974,7 +145974,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] @@ -145989,7 +145989,7 @@ atkB8_setsafeguard: @ 8053CFC movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _08053D40 + beq @08053D40 ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 @@ -145998,10 +145998,10 @@ atkB8_setsafeguard: @ 8053CFC ldr r1, =0x02024332 movs r0, 0 strb r0, [r1, 0x5] - b _08053D88 + b @08053D88 .align 2, 0 .pool -_08053D40: +@08053D40: ldrb r0, [r7] bl battle_get_per_side_status adds r1, r6, 0 @@ -146035,7 +146035,7 @@ _08053D40: strb r1, [r0, 0x7] ldr r0, =0x02024332 strb r4, [r0, 0x5] -_08053D88: +@08053D88: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -146048,7 +146048,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} @@ -146060,70 +146060,70 @@ atkB9_magnitudedamagecalculation: @ 8053DA4 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x4 - bgt _08053DD0 + bgt @08053DD0 ldr r1, =0x02024400 movs r0, 0xA strh r0, [r1] movs r3, 0x4 - b _08053E3C + b @08053E3C .align 2, 0 .pool -_08053DD0: +@08053DD0: cmp r3, 0xE - bgt _08053DE4 + bgt @08053DE4 ldr r1, =0x02024400 movs r0, 0x1E strh r0, [r1] movs r3, 0x5 - b _08053E3C + b @08053E3C .align 2, 0 .pool -_08053DE4: +@08053DE4: cmp r3, 0x22 - bgt _08053DF8 + bgt @08053DF8 ldr r1, =0x02024400 movs r0, 0x32 strh r0, [r1] movs r3, 0x6 - b _08053E3C + b @08053E3C .align 2, 0 .pool -_08053DF8: +@08053DF8: cmp r3, 0x40 - bgt _08053E0C + bgt @08053E0C ldr r1, =0x02024400 movs r0, 0x46 strh r0, [r1] movs r3, 0x7 - b _08053E3C + b @08053E3C .align 2, 0 .pool -_08053E0C: +@08053E0C: cmp r3, 0x54 - bgt _08053E20 + bgt @08053E20 ldr r1, =0x02024400 movs r0, 0x5A strh r0, [r1] movs r3, 0x8 - b _08053E3C + b @08053E3C .align 2, 0 .pool -_08053E20: +@08053E20: cmp r3, 0x5E - bgt _08053E34 + bgt @08053E34 ldr r1, =0x02024400 movs r0, 0x6E strh r0, [r1] movs r3, 0x9 - b _08053E3C + b @08053E3C .align 2, 0 .pool -_08053E34: +@08053E34: ldr r1, =0x02024400 movs r0, 0x96 strh r0, [r1] movs r3, 0xA -_08053E3C: +@08053E3C: ldr r1, =0x02022f58 movs r2, 0 movs r0, 0xFD @@ -146144,17 +146144,17 @@ _08053E3C: ldr r0, =0x02024214 mov r8, r0 cmp r2, r3 - bcs _08053E94 + bcs @08053E94 adds r4, r6, 0 ldr r0, =0x0202420b ldrb r5, [r0] ldr r1, =0x0832a328 mov r12, r1 ldr r7, =0x02024210 -_08053E72: +@08053E72: ldrb r2, [r4] cmp r2, r5 - beq _08053E88 + beq @08053E88 ldrb r0, [r7] ldrb r1, [r6] lsls r1, 2 @@ -146162,15 +146162,15 @@ _08053E72: ldr r1, [r1] ands r0, r1 cmp r0, 0 - beq _08053E94 -_08053E88: + beq @08053E94 +@08053E88: adds r0, r2, 0x1 strb r0, [r4] lsls r0, 24 lsrs r0, 24 cmp r0, r3 - bcc _08053E72 -_08053E94: + bcc @08053E72 +@08053E94: mov r1, r8 ldr r0, [r1] adds r0, 0x1 @@ -146185,7 +146185,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 @@ -146194,34 +146194,34 @@ atkBA_802B140: @ 8053EC8 ldr r0, =0x02024212 ldrb r0, [r0] cmp r0, 0x1 - bne _08053EF8 + bne @08053EF8 ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08053EF4 + bne @08053EF4 movs r0, 0x1 - b _08053F12 + b @08053F12 .align 2, 0 .pool -_08053EF4: +@08053EF4: movs r0, 0 - b _08053F12 -_08053EF8: + b @08053F12 +@08053EF8: ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08053F10 + bne @08053F10 movs r0, 0x3 - b _08053F12 + b @08053F12 .align 2, 0 .pool -_08053F10: +@08053F10: movs r0, 0x2 -_08053F12: +@08053F12: bl battle_get_side_with_given_state ldr r1, =0x0202420c strb r0, [r1] @@ -146231,9 +146231,9 @@ _08053F12: adds r0, r3, r0 ldrb r0, [r0] cmp r0, 0 - beq _08053F2A - b _08054030 -_08053F2A: + beq @08053F2A + b @08054030 +@08053F2A: ldr r5, =0x0202420b ldr r0, =0x0202449c ldr r1, [r0] @@ -146241,7 +146241,7 @@ _08053F2A: ldrb r2, [r5] ldrb r1, [r1, 0xC] cmp r2, r1 - bne _08054030 + bne @08054030 ldr r4, =0x02024084 movs r2, 0x58 adds r0, r3, 0 @@ -146253,13 +146253,13 @@ _08053F2A: movs r1, 0x27 ands r0, r1 cmp r0, 0 - bne _08054030 + bne @08054030 ldrb r0, [r5] muls r0, r2 adds r0, r4 ldrh r0, [r0, 0x28] cmp r0, 0 - beq _08054030 + beq @08054030 ldr r0, =0x020242bc lsls r1, r3, 3 subs r1, r3 @@ -146268,13 +146268,13 @@ _08053F2A: ldrb r0, [r1, 0x18] lsls r0, 31 cmp r0, 0 - bne _08054030 + bne @08054030 ldr r0, =0x02024274 lsls r1, r3, 1 adds r1, r0 ldrh r0, [r1] cmp r0, 0xE4 - bne _08054030 + bne @08054030 movs r1, 0 ldr r0, =0x0202406c ldr r2, =0x020241ea @@ -146287,26 +146287,26 @@ _08053F2A: mov r12, r7 ldrb r2, [r0] cmp r1, r2 - bge _08053FB6 + bge @08053FB6 ldr r6, =0x0202407e ldr r5, =0x0202420c ldr r4, =0x0202407a movs r3, 0xB adds r2, r0, 0 -_08053FA0: +@08053FA0: adds r0, r1, r6 ldrb r0, [r0] ldrb r7, [r5] cmp r0, r7 - bne _08053FAE + bne @08053FAE adds r0, r1, r4 strb r3, [r0] -_08053FAE: +@08053FAE: adds r1, 0x1 ldrb r0, [r2] cmp r1, r0 - blt _08053FA0 -_08053FB6: + blt @08053FA0 +@08053FB6: movs r0, 0xE4 mov r1, r8 strh r0, [r1] @@ -146333,10 +146333,10 @@ _08053FB6: ldr r1, =0xfffffbff ands r0, r1 str r0, [r2] - b _0805404A + b @0805404A .align 2, 0 .pool -_08054030: +@08054030: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -146350,7 +146350,7 @@ _08054030: lsls r0, 24 orrs r1, r0 str r1, [r3] -_0805404A: +@0805404A: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -146363,14 +146363,14 @@ _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] movs r0, 0x60 ands r0, r1 cmp r0, 0 - beq _08054088 + beq @08054088 ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 @@ -146379,10 +146379,10 @@ sub_805405C: @ 805405C ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] - b _0805409A + b @0805409A .align 2, 0 .pool -_08054088: +@08054088: movs r0, 0x20 strh r0, [r2] ldr r1, =0x02024332 @@ -146392,7 +146392,7 @@ _08054088: adds r0, 0x28 movs r1, 0x5 strb r1, [r0] -_0805409A: +@0805409A: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -146404,7 +146404,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 @@ -146415,16 +146415,16 @@ atkBC_maxattackhalvehp: @ 80540B4 ldrh r0, [r2, 0x2C] lsrs r1, r0, 1 cmp r1, 0 - bne _080540CC + bne @080540CC movs r1, 0x1 -_080540CC: +@080540CC: movs r0, 0x19 ldrsb r0, [r2, r0] cmp r0, 0xB - bgt _08054110 + bgt @08054110 ldrh r0, [r2, 0x28] cmp r0, r1 - bls _08054110 + bls @08054110 movs r0, 0xC strb r0, [r2, 0x19] ldr r1, =0x020241f0 @@ -146435,18 +146435,18 @@ _080540CC: lsrs r0, 1 str r0, [r1] cmp r0, 0 - bne _080540F4 + bne @080540F4 movs r0, 0x1 str r0, [r1] -_080540F4: +@080540F4: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b _0805412A + b @0805412A .align 2, 0 .pool -_08054110: +@08054110: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -146460,7 +146460,7 @@ _08054110: lsls r0, 24 orrs r1, r0 str r1, [r3] -_0805412A: +@0805412A: pop {r4,r5} pop {r0} bx r0 @@ -146469,7 +146469,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 @@ -146477,7 +146477,7 @@ atkBD_copyfoestats: @ 8054134 movs r4, 0x58 ldr r3, =0x0202409c ldr r5, =0x0202420c -_08054142: +@08054142: ldrb r0, [r6] adds r1, r0, 0 muls r1, r4 @@ -146491,7 +146491,7 @@ _08054142: strb r0, [r1] adds r2, 0x1 cmp r2, 0x7 - ble _08054142 + ble @08054142 ldr r0, [r7] adds r0, 0x5 str r0, [r7] @@ -146503,7 +146503,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 @@ -146519,7 +146519,7 @@ atkBE_breakfree: @ 805417C lsls r1, 8 ands r0, r1 cmp r0, 0 - beq _08054210 + beq @08054210 ldr r1, =0x02024474 ldr r3, =0x0202420c ldrb r0, [r3] @@ -146558,10 +146558,10 @@ atkBE_breakfree: @ 805417C bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =0x082dafc5 - b _080542BA + b @080542BA .align 2, 0 .pool -_08054210: +@08054210: ldr r4, =0x020242ac lsls r0, r2, 2 adds r3, r0, r4 @@ -146569,7 +146569,7 @@ _08054210: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08054250 + beq @08054250 movs r0, 0x5 negs r0, r0 ands r1, r0 @@ -146585,10 +146585,10 @@ _08054210: bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =0x082dafd6 - b _080542BA + b @080542BA .align 2, 0 .pool -_08054250: +@08054250: adds r0, r2, 0 bl battle_side_get_owner ldr r4, =0x0202428e @@ -146599,7 +146599,7 @@ _08054250: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080542B4 + beq @080542B4 ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 @@ -146623,14 +146623,14 @@ _08054250: bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =0x082dafdd - b _080542BA + b @080542BA .align 2, 0 .pool -_080542B4: +@080542B4: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 -_080542BA: +@080542BA: str r0, [r1] pop {r4-r6} pop {r0} @@ -146640,7 +146640,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] @@ -146663,7 +146663,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 @@ -146678,11 +146678,11 @@ atkC0_recoverbasedonsunlight: @ 80542F8 ldrh r1, [r0, 0x28] ldrh r0, [r0, 0x2C] cmp r1, r0 - beq _080543D8 + beq @080543D8 ldr r4, =0x020243cc ldrh r0, [r4] cmp r0, 0 - beq _0805434A + beq @0805434A movs r0, 0 str r0, [sp] movs r0, 0x13 @@ -146693,7 +146693,7 @@ atkC0_recoverbasedonsunlight: @ 80542F8 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _0805434A + bne @0805434A str r0, [sp] movs r0, 0x13 movs r1, 0 @@ -146702,8 +146702,8 @@ atkC0_recoverbasedonsunlight: @ 80542F8 bl ability_something lsls r0, 24 cmp r0, 0 - beq _08054378 -_0805434A: + beq @08054378 +@0805434A: ldr r3, =0x020241f0 ldr r2, =0x02024084 ldr r0, =0x0202420b @@ -146715,15 +146715,15 @@ _0805434A: lsrs r0, 1 str r0, [r3] adds r1, r3, 0 - b _080543B2 + b @080543B2 .align 2, 0 .pool -_08054378: +@08054378: ldrh r1, [r4] movs r0, 0x60 ands r0, r1 cmp r0, 0 - beq _080543A4 + beq @080543A4 ldr r4, =0x020241f0 ldrb r0, [r5] muls r0, r6 @@ -146736,10 +146736,10 @@ _08054378: bl __divsi3 str r0, [r4] adds r1, r4, 0 - b _080543B2 + b @080543B2 .align 2, 0 .pool -_080543A4: +@080543A4: ldr r1, =0x020241f0 ldrb r0, [r5] muls r0, r6 @@ -146747,14 +146747,14 @@ _080543A4: ldrh r0, [r0, 0x2C] lsrs r0, 2 str r0, [r1] -_080543B2: +@080543B2: adds r2, r1, 0 ldr r0, [r2] cmp r0, 0 - bne _080543BE + bne @080543BE movs r0, 0x1 str r0, [r2] -_080543BE: +@080543BE: ldr r0, [r1] negs r0, r0 str r0, [r1] @@ -146762,10 +146762,10 @@ _080543BE: ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b _080543F2 + b @080543F2 .align 2, 0 .pool -_080543D8: +@080543D8: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -146779,7 +146779,7 @@ _080543D8: lsls r0, 24 orrs r1, r0 str r1, [r3] -_080543F2: +@080543F2: add sp, 0x4 pop {r4-r7} pop {r0} @@ -146789,7 +146789,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 @@ -146905,10 +146905,10 @@ sub_8054400: @ 8054400 ldr r1, [r6] ldrb r0, [r1, 0x13] cmp r0, 0x8 - bls _080544F0 + bls @080544F0 adds r0, 0x1 strb r0, [r1, 0x13] -_080544F0: +@080544F0: ldr r2, [r6] ldrb r0, [r2, 0x13] movs r1, 0xC0 @@ -146930,7 +146930,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} @@ -146943,7 +146943,7 @@ atkC2_selectnexttarget: @ 8054524 ldr r0, =0x02024214 mov r8, r0 cmp r1, 0 - beq _0805456E + beq @0805456E adds r3, r6, 0 ldr r0, =0x0202420b ldrb r5, [r0] @@ -146951,10 +146951,10 @@ atkC2_selectnexttarget: @ 8054524 mov r12, r0 adds r4, r1, 0 ldr r7, =0x02024210 -_0805454C: +@0805454C: ldrb r2, [r3] cmp r2, r5 - beq _08054562 + beq @08054562 ldrb r0, [r7] ldrb r1, [r6] lsls r1, 2 @@ -146962,15 +146962,15 @@ _0805454C: ldr r1, [r1] ands r0, r1 cmp r0, 0 - beq _0805456E -_08054562: + beq @0805456E +@08054562: adds r0, r2, 0x1 strb r0, [r3] lsls r0, 24 lsrs r0, 24 cmp r0, r4 - bcc _0805454C -_0805456E: + bcc @0805454C +@0805456E: mov r1, r8 ldr r0, [r1] adds r0, 0x1 @@ -146985,7 +146985,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 @@ -146999,7 +146999,7 @@ atkC3_setfutureattack: @ 8054598 adds r0, r1, r0 ldrb r7, [r0] cmp r7, 0 - beq _080545DC + beq @080545DC ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -147013,10 +147013,10 @@ atkC3_setfutureattack: @ 8054598 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _080546CC + b @080546CC .align 2, 0 .pool -_080545DC: +@080545DC: adds r0, r1, 0 bl battle_get_per_side_status ldr r4, =0x0202428e @@ -147091,7 +147091,7 @@ _080545DC: ldrb r0, [r0] lsls r0, 28 cmp r0, 0 - bge _0805468C + bge @0805468C ldrb r4, [r6] lsls r4, 2 adds r4, r2 @@ -147101,29 +147101,29 @@ _080545DC: movs r1, 0xA bl __divsi3 str r0, [r4] -_0805468C: +@0805468C: mov r5, r9 ldrh r1, [r5] ldr r0, =0x00000161 cmp r1, r0 - bne _080546BC + bne @080546BC ldr r0, =0x02024332 mov r1, r10 strb r1, [r0, 0x5] - b _080546C4 + b @080546C4 .align 2, 0 .pool -_080546BC: +@080546BC: ldr r0, =0x02024332 mov r2, sp ldrb r2, [r2, 0x10] strb r2, [r0, 0x5] -_080546C4: +@080546C4: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_080546CC: +@080546CC: add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -147137,7 +147137,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 @@ -147148,9 +147148,9 @@ atkC4_802B910: @ 80546E4 lsls r0, 24 ldr r7, =0x02024744 cmp r0, 0 - bne _080546FE + bne @080546FE ldr r7, =0x020244ec -_080546FE: +@080546FE: ldr r2, =0x02024084 ldr r0, =0x0202420c ldrb r1, [r0] @@ -147159,7 +147159,7 @@ _080546FE: adds r0, r2 ldrh r0, [r0, 0x28] cmp r0, 0 - bne _08054740 + bne @08054740 ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -147170,34 +147170,34 @@ _080546FE: lsls r0, 16 orrs r1, r0 ldrb r0, [r2, 0x4] - b _080548DC + b @080548DC .align 2, 0 .pool -_08054740: +@08054740: ldr r6, =0x02024332 ldrb r0, [r6] mov r8, r0 cmp r0, 0x5 - bls _0805474C - b _080548A8 -_0805474C: + bls @0805474C + b @080548A8 +@0805474C: adds r4, r6, 0 movs r5, 0x64 -_08054750: +@08054750: ldrb r0, [r4] muls r0, r5 adds r0, r7, r0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _08054794 + beq @08054794 ldrb r0, [r6] muls r0, r5 adds r0, r7, r0 movs r1, 0x41 bl pokemon_getattr cmp r0, 0 - beq _08054794 + beq @08054794 ldrb r0, [r4] muls r0, r5 adds r0, r7, r0 @@ -147206,15 +147206,15 @@ _08054750: movs r1, 0xCE lsls r1, 1 cmp r0, r1 - beq _08054794 + beq @08054794 ldrb r0, [r4] muls r0, r5 adds r0, r7, r0 movs r1, 0x37 bl pokemon_getattr cmp r0, 0 - beq _080547A4 -_08054794: + beq @080547A4 +@08054794: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] @@ -147222,13 +147222,13 @@ _08054794: lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 - bls _08054750 -_080547A4: + bls @08054750 +@080547A4: ldr r1, =0x02024332 mov r9, r1 ldrb r2, [r1] cmp r2, 0x5 - bhi _080548A8 + bhi @080548A8 ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] @@ -147313,25 +147313,25 @@ _080547A4: ldrb r0, [r0] lsls r0, 28 cmp r0, 0 - bge _08054870 + bge @08054870 lsls r0, r2, 4 subs r0, r2 movs r1, 0xA bl __divsi3 mov r1, r8 str r0, [r1] -_08054870: +@08054870: mov r2, r9 ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] - b _080548E2 + b @080548E2 .align 2, 0 .pool -_080548A8: +@080548A8: mov r0, r8 cmp r0, 0 - beq _080548C8 + beq @080548C8 ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -147342,10 +147342,10 @@ _080548A8: lsls r0, 16 orrs r1, r0 ldrb r0, [r2, 0x4] - b _080548DC + b @080548DC .align 2, 0 .pool -_080548C8: +@080548C8: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x5] @@ -147356,11 +147356,11 @@ _080548C8: lsls r0, 16 orrs r1, r0 ldrb r0, [r2, 0x8] -_080548DC: +@080548DC: lsls r0, 24 orrs r1, r0 str r1, [r3] -_080548E2: +@080548E2: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -147372,27 +147372,27 @@ _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] cmp r1, 0x5B - beq _08054934 + beq @08054934 cmp r1, 0x5B - bgt _0805490C + bgt @0805490C cmp r1, 0x13 - beq _08054918 - b _08054960 + beq @08054918 + b @08054960 .align 2, 0 .pool -_0805490C: +@0805490C: ldr r0, =0x00000123 cmp r1, r0 - beq _0805494C + beq @0805494C adds r0, 0x31 cmp r1, r0 - bne _08054960 -_08054918: + bne @08054960 +@08054918: ldr r2, =0x020242ac ldr r0, =0x0202420b ldrb r1, [r0] @@ -147400,10 +147400,10 @@ _08054918: adds r1, r2 ldr r0, [r1] movs r2, 0x40 - b _0805495C + b @0805495C .align 2, 0 .pool -_08054934: +@08054934: ldr r2, =0x020242ac ldr r0, =0x0202420b ldrb r1, [r0] @@ -147411,10 +147411,10 @@ _08054934: adds r1, r2 ldr r0, [r1] movs r2, 0x80 - b _0805495C + b @0805495C .align 2, 0 .pool -_0805494C: +@0805494C: ldr r2, =0x020242ac ldr r0, =0x0202420b ldrb r1, [r0] @@ -147423,10 +147423,10 @@ _0805494C: ldr r0, [r1] movs r2, 0x80 lsls r2, 11 -_0805495C: +@0805495C: orrs r0, r2 str r0, [r1] -_08054960: +@08054960: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -147438,27 +147438,27 @@ _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] cmp r1, 0x5B - beq _080549BC + beq @080549BC cmp r1, 0x5B - bgt _08054990 + bgt @08054990 cmp r1, 0x13 - beq _0805499C - b _080549EA + beq @0805499C + b @080549EA .align 2, 0 .pool -_08054990: +@08054990: ldr r0, =0x00000123 cmp r1, r0 - beq _080549D8 + beq @080549D8 adds r0, 0x31 cmp r1, r0 - bne _080549EA -_0805499C: + bne @080549EA +@0805499C: ldr r2, =0x020242ac ldr r0, =0x0202420b ldrb r1, [r0] @@ -147467,10 +147467,10 @@ _0805499C: ldr r0, [r1] movs r2, 0x41 negs r2, r2 - b _080549E6 + b @080549E6 .align 2, 0 .pool -_080549BC: +@080549BC: ldr r2, =0x020242ac ldr r0, =0x0202420b ldrb r1, [r0] @@ -147479,10 +147479,10 @@ _080549BC: ldr r0, [r1] movs r2, 0x81 negs r2, r2 - b _080549E6 + b @080549E6 .align 2, 0 .pool -_080549D8: +@080549D8: ldr r2, =0x020242ac ldr r0, =0x0202420b ldrb r1, [r0] @@ -147490,10 +147490,10 @@ _080549D8: adds r1, r2 ldr r0, [r1] ldr r2, =0xfffbffff -_080549E6: +@080549E6: ands r0, r2 str r0, [r1] -_080549EA: +@080549EA: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -147505,7 +147505,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] @@ -147513,7 +147513,7 @@ atkC7_setminimize: @ 8054A08 lsls r1, 18 ands r0, r1 cmp r0, 0 - beq _08054A2C + beq @08054A2C ldr r2, =0x020242ac ldr r0, =0x0202420b ldrb r1, [r0] @@ -147524,7 +147524,7 @@ atkC7_setminimize: @ 8054A08 lsls r2, 1 orrs r0, r2 str r0, [r1] -_08054A2C: +@08054A2C: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -147536,7 +147536,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] @@ -147544,7 +147544,7 @@ sub_8054A48: @ 8054A48 adds r0, r2, 0 ands r0, r1 cmp r0, 0 - beq _08054A78 + beq @08054A78 ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 @@ -147553,10 +147553,10 @@ sub_8054A48: @ 8054A48 ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] - b _08054A86 + b @08054A86 .align 2, 0 .pool -_08054A78: +@08054A78: strh r2, [r3] ldr r0, =0x02024332 movs r1, 0x5 @@ -147564,7 +147564,7 @@ _08054A78: ldr r0, =0x020243d0 adds r0, 0x28 strb r1, [r0] -_08054A86: +@08054A86: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -147576,7 +147576,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 @@ -147588,15 +147588,15 @@ atkC9_jumpifattackandspecialattackcannotfall: @ 8054AA0 ldrsb r0, [r1, r0] adds r3, r2, 0 cmp r0, 0 - bne _08054AF4 + bne @08054AF4 movs r0, 0x1C ldrsb r0, [r1, r0] cmp r0, 0 - bne _08054AF4 + bne @08054AF4 ldr r0, =0x02024332 ldrb r0, [r0, 0x6] cmp r0, 0x1 - beq _08054AF4 + beq @08054AF4 ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -147610,10 +147610,10 @@ atkC9_jumpifattackandspecialattackcannotfall: @ 8054AA0 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08054B20 + b @08054B20 .align 2, 0 .pool -_08054AF4: +@08054AF4: ldr r4, =0x02024064 ldr r0, =0x0202420b ldrb r0, [r0] @@ -147634,7 +147634,7 @@ _08054AF4: ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_08054B20: +@08054B20: pop {r4} pop {r0} bx r0 @@ -147643,7 +147643,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] @@ -147679,7 +147679,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 @@ -147727,7 +147727,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] @@ -147771,7 +147771,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 @@ -147786,7 +147786,7 @@ atkCD_cureifburnedparalysedorpoisoned: @ 8054C60 movs r1, 0xD8 ands r0, r1 cmp r0, 0 - beq _08054CBC + beq @08054CBC movs r0, 0 str r0, [r2] ldr r1, =0x02024214 @@ -147807,10 +147807,10 @@ atkCD_cureifburnedparalysedorpoisoned: @ 8054C60 bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - b _08054CD6 + b @08054CD6 .align 2, 0 .pool -_08054CBC: +@08054CBC: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -147824,7 +147824,7 @@ _08054CBC: lsls r0, 24 orrs r1, r0 str r1, [r3] -_08054CD6: +@08054CD6: add sp, 0x4 pop {r4-r6} pop {r0} @@ -147834,7 +147834,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 @@ -147847,7 +147847,7 @@ atkCE_settorment: @ 8054CE4 movs r2, 0x80 lsls r2, 24 cmp r1, 0 - bge _08054D28 + bge @08054D28 ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -147861,17 +147861,17 @@ atkCE_settorment: @ 8054CE4 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08054D34 + b @08054D34 .align 2, 0 .pool -_08054D28: +@08054D28: orrs r1, r2 str r1, [r0] ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_08054D34: +@08054D34: pop {r0} bx r0 .align 2, 0 @@ -147879,7 +147879,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 @@ -147889,22 +147889,22 @@ atkCF_jumpifnodamage: @ 8054D3C adds r0, r1, r0 ldr r0, [r0] cmp r0, 0 - bne _08054D5C + bne @08054D5C adds r0, r2, 0 adds r0, 0x8 adds r0, r1, r0 ldr r0, [r0] cmp r0, 0 - beq _08054D74 -_08054D5C: + beq @08054D74 +@08054D5C: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b _08054D8E + b @08054D8E .align 2, 0 .pool -_08054D74: +@08054D74: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -147918,7 +147918,7 @@ _08054D74: lsls r0, 24 orrs r1, r0 str r1, [r3] -_08054D8E: +@08054D8E: pop {r0} bx r0 .align 2, 0 @@ -147926,7 +147926,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 @@ -147938,7 +147938,7 @@ atkD0_settaunt: @ 8054D98 ldrb r1, [r2, 0x13] lsls r0, r1, 28 cmp r0, 0 - bne _08054DE8 + bne @08054DE8 movs r0, 0x10 negs r0, r0 ands r0, r1 @@ -147960,10 +147960,10 @@ atkD0_settaunt: @ 8054D98 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b _08054E02 + b @08054E02 .align 2, 0 .pool -_08054DE8: +@08054DE8: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -147977,7 +147977,7 @@ _08054DE8: lsls r0, 24 orrs r1, r0 str r1, [r3] -_08054E02: +@08054E02: pop {r4} pop {r0} bx r0 @@ -147986,7 +147986,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] @@ -148003,7 +148003,7 @@ atkD1_sethelpinghand: @ 8054E0C movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08054E90 + beq @08054E90 ldr r0, =0x02024210 ldrb r1, [r0] ldr r2, =0x0832a328 @@ -148013,7 +148013,7 @@ atkD1_sethelpinghand: @ 8054E0C ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _08054E90 + bne @08054E90 ldr r1, =0x0202433c ldrb r0, [r4] lsls r0, 4 @@ -148021,13 +148021,13 @@ atkD1_sethelpinghand: @ 8054E0C ldrb r0, [r0] lsls r0, 28 cmp r0, 0 - blt _08054E90 + blt @08054E90 lsls r0, r3, 4 adds r2, r0, r1 ldrb r1, [r2] lsls r0, r1, 28 cmp r0, 0 - blt _08054E90 + blt @08054E90 movs r0, 0x8 orrs r0, r1 strb r0, [r2] @@ -148035,10 +148035,10 @@ atkD1_sethelpinghand: @ 8054E0C ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b _08054EAA + b @08054EAA .align 2, 0 .pool -_08054E90: +@08054E90: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -148052,7 +148052,7 @@ _08054E90: lsls r0, 24 orrs r1, r0 str r1, [r3] -_08054EAA: +@08054EAA: pop {r4} pop {r0} bx r0 @@ -148061,7 +148061,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 @@ -148074,20 +148074,20 @@ sub_8054EB4: @ 8054EB4 lsls r1, 19 ands r0, r1 cmp r0, 0 - bne _08054F9A + bne @08054F9A ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08054EE8 + bne @08054EE8 ldr r0, [r4] ldr r1, =0x0a3f0902 ands r0, r1 cmp r0, 0 - beq _08054F9A -_08054EE8: + beq @08054F9A +@08054EE8: ldr r6, =0x0202420b ldrb r0, [r6] bl battle_side_get_owner @@ -148103,7 +148103,7 @@ _08054EE8: ldr r1, =0x0a3f0902 ands r0, r1 cmp r0, 0 - bne _08054F46 + bne @08054F46 ldr r0, =0x020243d0 adds r2, r0, 0 adds r2, 0x29 @@ -148120,7 +148120,7 @@ _08054EE8: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _08054F9A + bne @08054F9A adds r0, r5, r2 ldrb r1, [r0] ldrb r0, [r7] @@ -148132,8 +148132,8 @@ _08054EE8: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _08054F9A -_08054F46: + bne @08054F9A +@08054F46: ldr r0, =0x02024084 mov r8, r0 ldr r1, =0x0202420b @@ -148146,17 +148146,17 @@ _08054F46: ldrh r3, [r0, 0x2E] adds r1, r3, 0 cmp r1, 0 - bne _08054F6E + bne @08054F6E ldr r0, =0x0202420c ldrb r0, [r0] muls r0, r5 add r0, r8 ldrh r0, [r0, 0x2E] cmp r0, 0 - beq _08054F9A -_08054F6E: + beq @08054F9A +@08054F6E: cmp r1, 0xAF - beq _08054F9A + beq @08054F9A ldr r7, =0x0202420c ldrb r0, [r7] muls r0, r5 @@ -148164,20 +148164,20 @@ _08054F6E: adds r1, r0, r2 ldrh r2, [r1, 0x2E] cmp r2, 0xAF - beq _08054F9A + beq @08054F9A adds r0, r3, 0 subs r0, 0x79 lsls r0, 16 lsrs r0, 16 cmp r0, 0xB - bls _08054F9A + bls @08054F9A adds r0, r2, 0 subs r0, 0x79 lsls r0, 16 lsrs r0, 16 cmp r0, 0xB - bhi _08054FDC -_08054F9A: + bhi @08054FDC +@08054F9A: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -148191,15 +148191,15 @@ _08054F9A: lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08055132 + b @08055132 .align 2, 0 .pool -_08054FDC: +@08054FDC: adds r0, r1, 0 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x3C - bne _08055010 + bne @08055010 ldr r1, =0x02024214 ldr r0, =0x082db63f str r0, [r1] @@ -148213,10 +148213,10 @@ _08054FDC: ldrb r0, [r7] ldrb r1, [r1] bl b_history__record_ability_usage_of_player - b _08055132 + b @08055132 .align 2, 0 .pool -_08055010: +@08055010: ldr r3, =0x0202449c mov r10, r3 lsls r0, r4, 1 @@ -148324,31 +148324,31 @@ _08055010: negs r0, r0 strb r0, [r1, 0x4] cmp r3, 0 - beq _08055118 + beq @08055118 ldrh r0, [r6] cmp r0, 0 - beq _0805512C + beq @0805512C ldr r1, =0x02024332 movs r0, 0x2 - b _08055130 + b @08055130 .align 2, 0 .pool -_08055118: +@08055118: ldrh r0, [r6] cmp r0, 0 - beq _0805512C + beq @0805512C ldr r0, =0x02024332 movs r1, 0 strb r1, [r0, 0x5] - b _08055132 + b @08055132 .align 2, 0 .pool -_0805512C: +@0805512C: ldr r1, =0x02024332 movs r0, 0x1 -_08055130: +@08055130: strb r0, [r1, 0x5] -_08055132: +@08055132: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -148362,7 +148362,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 @@ -148374,9 +148374,9 @@ sub_8055148: @ 8055148 ldrb r1, [r0] adds r0, r1, 0 cmp r0, 0 - beq _0805519C + beq @0805519C cmp r0, 0x19 - beq _0805519C + beq @0805519C ldr r0, =0x0202420b ldrb r0, [r0] muls r0, r2 @@ -148394,10 +148394,10 @@ sub_8055148: @ 8055148 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b _080551B6 + b @080551B6 .align 2, 0 .pool -_0805519C: +@0805519C: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -148411,7 +148411,7 @@ _0805519C: lsls r0, 24 orrs r1, r0 str r1, [r3] -_080551B6: +@080551B6: pop {r4} pop {r0} bx r0 @@ -148420,19 +148420,19 @@ _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] ldrb r3, [r2, 0x1] cmp r3, 0 - beq _080551D8 + beq @080551D8 cmp r3, 0x1 - beq _08055210 - b _0805528C + beq @08055210 + b @0805528C .align 2, 0 .pool -_080551D8: +@080551D8: ldr r1, =0x020243d0 ldr r4, =0x0202420b adds r0, r1, 0 @@ -148441,7 +148441,7 @@ _080551D8: adds r3, r0, r5 ldrb r0, [r3] cmp r0, 0 - bne _0805525C + bne @0805525C movs r0, 0x2 strb r0, [r3] ldrb r0, [r4] @@ -148454,10 +148454,10 @@ _080551D8: strb r0, [r1] ldr r0, [r7] adds r0, 0x6 - b _0805528A + b @0805528A .align 2, 0 .pool -_08055210: +@08055210: ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] @@ -148484,9 +148484,9 @@ _08055210: lsrs r0, 1 str r0, [r1] cmp r0, 0 - bne _08055248 + bne @08055248 str r3, [r1] -_08055248: +@08055248: ldr r0, [r1] negs r0, r0 str r0, [r1] @@ -148496,8 +148496,8 @@ _08055248: ldrh r1, [r0, 0x28] ldrh r0, [r0, 0x2C] cmp r1, r0 - bne _08055288 -_0805525C: + bne @08055288 +@0805525C: ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] lsls r0, 8 @@ -148509,21 +148509,21 @@ _0805525C: lsls r0, 24 orrs r1, r0 str r1, [r7] - b _0805528C + b @0805528C .align 2, 0 .pool -_08055288: +@08055288: adds r0, r2, 0x6 -_0805528A: +@0805528A: str r0, [r7] -_0805528C: +@0805528C: pop {r4-r7} pop {r0} bx r0 thumb_func_end atkD4_802C408 thumb_func_start sub_8055294 -sub_8055294: @ 8055294 +sub_8055294: ; 8055294 push {lr} ldr r1, =0x020242ac ldr r0, =0x0202420b @@ -148536,7 +148536,7 @@ sub_8055294: @ 8055294 adds r0, r1, 0 ands r0, r3 cmp r0, 0 - beq _080552D8 + beq @080552D8 ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -148550,17 +148550,17 @@ sub_8055294: @ 8055294 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _080552E4 + b @080552E4 .align 2, 0 .pool -_080552D8: +@080552D8: orrs r1, r3 str r1, [r2] ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_080552E4: +@080552E4: pop {r0} bx r0 .align 2, 0 @@ -148568,7 +148568,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 @@ -148578,31 +148578,31 @@ atkD6_doubledamagedealtifdamaged: @ 80552EC adds r0, r2, r0 ldr r0, [r0] cmp r0, 0 - beq _0805530C + beq @0805530C adds r0, r2, r3 ldr r1, =0x0202420c ldrb r0, [r0, 0xC] ldrb r1, [r1] cmp r0, r1 - beq _08055324 -_0805530C: + beq @08055324 +@0805530C: adds r0, r3, 0 adds r0, 0x8 adds r0, r2, r0 ldr r0, [r0] cmp r0, 0 - beq _0805532A + beq @0805532A adds r0, r2, r3 ldr r1, =0x0202420c ldrb r0, [r0, 0xD] ldrb r1, [r1] cmp r0, r1 - bne _0805532A -_08055324: + bne @0805532A +@08055324: ldr r1, =0x02024474 movs r0, 0x2 strb r0, [r1, 0xE] -_0805532A: +@0805532A: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -148614,7 +148614,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 @@ -148626,7 +148626,7 @@ sub_805534C: @ 805534C lsls r0, 5 ands r0, r2 cmp r0, 0 - bne _08055374 + bne @08055374 ldr r1, =0x02024084 movs r0, 0x58 muls r0, r3 @@ -148634,8 +148634,8 @@ sub_805534C: @ 805534C adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _080553A0 -_08055374: + beq @080553A0 +@08055374: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -148649,10 +148649,10 @@ _08055374: lsls r0, 24 orrs r1, r0 str r1, [r3] - b _080553B0 + b @080553B0 .align 2, 0 .pool -_080553A0: +@080553A0: movs r0, 0x80 lsls r0, 5 orrs r2, r0 @@ -148661,7 +148661,7 @@ _080553A0: ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_080553B0: +@080553B0: pop {r4} pop {r0} bx r0 @@ -148670,7 +148670,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 @@ -148685,7 +148685,7 @@ atkD8_setdamagetohealthdifference: @ 80553BC ldrh r0, [r3, 0x28] ldrh r2, [r1, 0x28] cmp r0, r2 - bhi _08055408 + bhi @08055408 ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -148699,10 +148699,10 @@ atkD8_setdamagetohealthdifference: @ 80553BC lsls r0, 24 orrs r1, r0 str r1, [r3] - b _0805541A + b @0805541A .align 2, 0 .pool -_08055408: +@08055408: ldr r2, =0x020241f0 ldrh r0, [r3, 0x28] ldrh r1, [r1, 0x28] @@ -148712,7 +148712,7 @@ _08055408: ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_0805541A: +@0805541A: pop {r0} bx r0 .align 2, 0 @@ -148720,12 +148720,12 @@ _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] cmp r0, 0 - bne _08055464 + bne @08055464 ldr r2, =0x0831c898 ldr r0, =0x020241ea ldrh r1, [r0] @@ -148747,10 +148747,10 @@ atkD9_scaledamagebyhealthratio: @ 8055428 strh r0, [r4] lsls r0, 16 cmp r0, 0 - bne _08055464 + bne @08055464 movs r0, 0x1 strh r0, [r4] -_08055464: +@08055464: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -148763,7 +148763,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 @@ -148775,7 +148775,7 @@ atkDA_abilityswap: @ 805548C adds r2, 0x20 ldrb r1, [r2] cmp r1, 0 - bne _080554B4 + bne @080554B4 ldr r0, =0x0202420c ldrb r0, [r0] muls r0, r4 @@ -148783,10 +148783,10 @@ atkDA_abilityswap: @ 805548C adds r0, 0x20 ldrb r0, [r0] cmp r0, 0 - beq _080554D4 -_080554B4: + beq @080554D4 +@080554B4: cmp r1, 0x19 - beq _080554D4 + beq @080554D4 ldr r6, =0x0202420c ldrb r0, [r6] muls r0, r4 @@ -148794,14 +148794,14 @@ _080554B4: adds r0, 0x20 ldrb r3, [r0] cmp r3, 0x19 - beq _080554D4 + beq @080554D4 ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 - beq _08055504 -_080554D4: + beq @08055504 +@080554D4: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -148815,10 +148815,10 @@ _080554D4: lsls r0, 24 orrs r1, r0 str r1, [r3] - b _0805551A + b @0805551A .align 2, 0 .pool -_08055504: +@08055504: ldrb r1, [r2] strb r3, [r2] ldrb r0, [r6] @@ -148830,7 +148830,7 @@ _08055504: ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_0805551A: +@0805551A: pop {r4-r6} pop {r0} bx r0 @@ -148839,7 +148839,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 @@ -148854,11 +148854,11 @@ atkDB_imprisoneffect: @ 8055524 lsls r1, 6 ands r0, r1 cmp r0, 0 - beq _08055574 - b _080555F6 + beq @08055574 + b @080555F6 .align 2, 0 .pool -_0805554C: +@0805554C: ldr r0, =0x020242ac mov r2, r9 ldrb r1, [r2] @@ -148873,10 +148873,10 @@ _0805554C: ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b _080555EE + b @080555EE .align 2, 0 .pool -_08055574: +@08055574: adds r0, r2, 0 bl battle_side_get_owner lsls r0, 24 @@ -148885,14 +148885,14 @@ _08055574: ldrb r0, [r4] bl sub_803F548 movs r6, 0 - b _080555E6 -_0805558A: + b @080555E6 +@0805558A: adds r0, r6, 0 bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r8, r0 - beq _080555E0 + beq @080555E0 movs r4, 0 ldr r7, =0x0202420b mov r9, r7 @@ -148907,48 +148907,48 @@ _0805558A: adds r3, r0, r2 adds r5, r6, 0 muls r5, r1 -_080555B4: +@080555B4: movs r2, 0 ldrh r1, [r3] mov r0, r12 adds r0, 0xC adds r0, r5, r0 -_080555BE: +@080555BE: ldrh r7, [r0] cmp r1, r7 - bne _080555C8 + bne @080555C8 cmp r1, 0 - bne _080555D0 -_080555C8: + bne @080555D0 +@080555C8: adds r0, 0x2 adds r2, 0x1 cmp r2, 0x3 - ble _080555BE -_080555D0: + ble @080555BE +@080555D0: cmp r2, 0x4 - bne _080555DC + bne @080555DC adds r3, 0x2 adds r4, 0x1 cmp r4, 0x3 - ble _080555B4 -_080555DC: + ble @080555B4 +@080555DC: cmp r4, 0x4 - bne _0805554C -_080555E0: + bne @0805554C +@080555E0: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_080555E6: +@080555E6: ldr r0, =0x0202406c ldrb r0, [r0] cmp r6, r0 - bcc _0805558A -_080555EE: + bcc @0805558A +@080555EE: ldr r0, =0x0202406c ldrb r0, [r0] cmp r6, r0 - bne _08055610 -_080555F6: + bne @08055610 +@080555F6: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -148962,7 +148962,7 @@ _080555F6: lsls r0, 24 orrs r1, r0 str r1, [r3] -_08055610: +@08055610: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -148974,7 +148974,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 @@ -148987,7 +148987,7 @@ atkDC_setgrudge: @ 805562C adds r0, r1, 0 ands r0, r3 cmp r0, 0 - beq _08055670 + beq @08055670 ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -149001,17 +149001,17 @@ atkDC_setgrudge: @ 805562C lsls r0, 24 orrs r1, r0 str r1, [r3] - b _0805567C + b @0805567C .align 2, 0 .pool -_08055670: +@08055670: orrs r1, r3 str r1, [r2] ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_0805567C: +@0805567C: pop {r0} bx r0 .align 2, 0 @@ -149019,7 +149019,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} @@ -149028,13 +149028,13 @@ atkDD_weightdamagecalculation: @ 8055684 ldrh r0, [r2] ldr r1, =0x0000ffff cmp r0, r1 - beq _080556FC + beq @080556FC adds r6, r2, 0 ldr r0, =0x02024084 mov r8, r0 adds r7, r1, 0 adds r4, r6, 0 -_080556A0: +@080556A0: ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0x58 @@ -149050,33 +149050,33 @@ _080556A0: lsls r0, 16 lsrs r0, 16 cmp r1, r0 - bhi _080556CE + bhi @080556CE adds r4, 0x4 adds r5, 0x2 ldrh r0, [r4] cmp r0, r7 - bne _080556A0 -_080556CE: + bne @080556A0 +@080556CE: lsls r0, r5, 1 adds r0, r6 ldrh r1, [r0] ldr r0, =0x0000ffff cmp r1, r0 - beq _080556FC + beq @080556FC ldr r0, =0x02024400 adds r1, r5, 0x1 lsls r1, 1 adds r1, r6 ldrh r1, [r1] strh r1, [r0] - b _08055702 + b @08055702 .align 2, 0 .pool -_080556FC: +@080556FC: ldr r1, =0x02024400 movs r0, 0x78 strh r0, [r1] -_08055702: +@08055702: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -149091,7 +149091,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 @@ -149112,12 +149112,12 @@ atkDE_asistattackselect: @ 805571C ldr r0, =0x020244ec str r0, [sp] cmp r1, 0 - beq _0805574C + beq @0805574C ldr r1, =0x02024744 str r1, [sp] -_0805574C: +@0805574C: movs r2, 0 -_0805574E: +@0805574E: ldr r1, =0x0202406e ldr r0, =0x0202420b ldrb r0, [r0] @@ -149127,7 +149127,7 @@ _0805574E: str r1, [sp, 0x8] ldrh r0, [r0] cmp r2, r0 - beq _080557F4 + beq @080557F4 movs r0, 0x64 adds r6, r2, 0 muls r6, r0 @@ -149137,14 +149137,14 @@ _0805574E: movs r1, 0x41 bl pokemon_getattr cmp r0, 0 - beq _080557F4 + beq @080557F4 adds r0, r4, 0 movs r1, 0x41 bl pokemon_getattr movs r1, 0xCE lsls r1, 1 cmp r0, r1 - beq _080557F4 + beq @080557F4 movs r5, 0 ldr r1, =0x0000ffff mov r8, r1 @@ -149153,7 +149153,7 @@ _0805574E: lsls r0, r1, 1 ldr r1, [sp, 0x4] adds r6, r0, r1 -_08055798: +@08055798: movs r7, 0 adds r1, r5, 0 adds r1, 0xD @@ -149167,48 +149167,48 @@ _08055798: lsls r0, 24 adds r1, r5, 0x1 cmp r0, 0 - bne _080557EE + bne @080557EE ldr r0, =0x0831c3e0 ldrh r2, [r0] adds r3, r0, 0 cmp r2, r8 - beq _080557E2 + beq @080557E2 cmp r4, r2 - beq _080557D8 + beq @080557D8 ldr r5, =0x0000ffff adds r2, r3, 0 -_080557CA: +@080557CA: adds r2, 0x2 adds r7, 0x1 ldrh r0, [r2] cmp r0, r5 - beq _080557E2 + beq @080557E2 cmp r4, r0 - bne _080557CA -_080557D8: + bne @080557CA +@080557D8: lsls r0, r7, 1 adds r0, r3 ldrh r0, [r0] cmp r0, r8 - bne _080557EE -_080557E2: + bne @080557EE +@080557E2: cmp r4, 0 - beq _080557EE + beq @080557EE strh r4, [r6] adds r6, 0x2 movs r0, 0x1 add r10, r0 -_080557EE: +@080557EE: adds r5, r1, 0 cmp r5, 0x3 - ble _08055798 -_080557F4: + ble @08055798 +@080557F4: ldr r2, [sp, 0x8] cmp r2, 0x5 - ble _0805574E + ble @0805574E mov r1, r10 cmp r1, 0 - beq _0805586C + beq @0805586C ldr r2, =0x02024280 ldr r0, [r2] ldr r1, =0xfffffbff @@ -149235,10 +149235,10 @@ _080557F4: ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b _08055886 + b @08055886 .align 2, 0 .pool -_0805586C: +@0805586C: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -149252,7 +149252,7 @@ _0805586C: lsls r0, 24 orrs r1, r0 str r1, [r3] -_08055886: +@08055886: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -149266,7 +149266,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 @@ -149288,7 +149288,7 @@ atkDF_setmagiccoat: @ 805589C ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 - bne _080558FC + bne @080558FC ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -149302,10 +149302,10 @@ atkDF_setmagiccoat: @ 805589C lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08055914 + b @08055914 .align 2, 0 .pool -_080558FC: +@080558FC: ldr r0, =0x0202433c ldrb r1, [r3] lsls r1, 4 @@ -149318,7 +149318,7 @@ _080558FC: ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_08055914: +@08055914: pop {r0} bx r0 .align 2, 0 @@ -149326,7 +149326,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 @@ -149345,7 +149345,7 @@ atkE0_setstealstatchange: @ 8055920 ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 - bne _08055978 + bne @08055978 ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -149359,10 +149359,10 @@ atkE0_setstealstatchange: @ 8055920 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _0805598E + b @0805598E .align 2, 0 .pool -_08055978: +@08055978: ldr r0, =0x0202433c ldrb r1, [r3] lsls r1, 4 @@ -149374,7 +149374,7 @@ _08055978: ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_0805598E: +@0805598E: pop {r0} bx r0 .align 2, 0 @@ -149382,7 +149382,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 @@ -149414,16 +149414,16 @@ atkE1_802CBE4: @ 805599C ldrb r0, [r2] ldrb r1, [r1] cmp r0, r1 - bcs _08055A22 + bcs @08055A22 adds r4, r2, 0 ldr r6, =0x0832a328 -_080559E2: +@080559E2: ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, r5 - beq _08055A04 + beq @08055A04 ldr r0, =0x02024210 ldrb r1, [r0] ldrb r0, [r4] @@ -149433,8 +149433,8 @@ _080559E2: ands r1, r0 ldr r2, =0x0202406c cmp r1, 0 - beq _08055A18 -_08055A04: + beq @08055A18 +@08055A04: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] @@ -149444,14 +149444,14 @@ _08055A04: adds r2, r1, 0 ldrb r1, [r2] cmp r0, r1 - bcc _080559E2 -_08055A18: + bcc @080559E2 +@08055A18: ldr r0, =0x0202420c ldrb r0, [r0] ldrb r2, [r2] cmp r0, r2 - bcc _08055A64 -_08055A22: + bcc @08055A64 +@08055A22: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -149465,15 +149465,15 @@ _08055A22: lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08055A6C + b @08055A6C .align 2, 0 .pool -_08055A64: +@08055A64: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_08055A6C: +@08055A6C: pop {r4-r6} pop {r0} bx r0 @@ -149482,7 +149482,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 @@ -149500,7 +149500,7 @@ atkE2_cmde2: @ 8055A78 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x1E - bne _08055AD2 + bne @08055AD2 adds r3, 0x4C adds r1, r3 movs r0, 0 @@ -149525,7 +149525,7 @@ atkE2_cmde2: @ 8055A78 bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_08055AD2: +@08055AD2: ldr r0, [r5] adds r0, 0x2 str r0, [r5] @@ -149538,7 +149538,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] @@ -149553,7 +149553,7 @@ atkE3_jumpiffainted: @ 8055AF4 adds r0, r2 ldrh r0, [r0, 0x28] cmp r0, 0 - bne _08055B3C + bne @08055B3C ldr r2, [r4] ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] @@ -149566,95 +149566,95 @@ atkE3_jumpiffainted: @ 8055AF4 lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08055B42 + b @08055B42 .align 2, 0 .pool -_08055B3C: +@08055B3C: ldr r0, [r4] adds r0, 0x6 str r0, [r4] -_08055B42: +@08055B42: pop {r4} pop {r0} bx r0 thumb_func_end atkE3_jumpiffainted thumb_func_start sub_8055B48 -sub_8055B48: @ 8055B48 +sub_8055B48: ; 8055B48 push {lr} ldr r0, =0x02022ff0 ldrb r0, [r0] cmp r0, 0x7 - bhi _08055BE4 + bhi @08055BE4 lsls r0, 2 - ldr r1, =_08055B64 + ldr r1, =@08055B64 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08055B64: - .4byte _08055B84 - .4byte _08055B90 - .4byte _08055B9C - .4byte _08055BA8 - .4byte _08055BB4 - .4byte _08055BC0 - .4byte _08055BCC - .4byte _08055BD8 -_08055B84: +@08055B64: + .4byte @08055B84 + .4byte @08055B90 + .4byte @08055B9C + .4byte @08055BA8 + .4byte @08055BB4 + .4byte @08055BC0 + .4byte @08055BCC + .4byte @08055BD8 +@08055B84: ldr r1, =0x02024332 movs r0, 0x2 - b _08055BE8 + b @08055BE8 .align 2, 0 .pool -_08055B90: +@08055B90: ldr r1, =0x02024332 movs r0, 0x1 - b _08055BE8 + b @08055BE8 .align 2, 0 .pool -_08055B9C: +@08055B9C: ldr r1, =0x02024332 movs r0, 0x1B - b _08055BE8 + b @08055BE8 .align 2, 0 .pool -_08055BA8: +@08055BA8: ldr r1, =0x02024332 movs r0, 0x17 - b _08055BE8 + b @08055BE8 .align 2, 0 .pool -_08055BB4: +@08055BB4: ldr r1, =0x02024332 movs r0, 0x16 - b _08055BE8 + b @08055BE8 .align 2, 0 .pool -_08055BC0: +@08055BC0: ldr r1, =0x02024332 movs r0, 0x18 - b _08055BE8 + b @08055BE8 .align 2, 0 .pool -_08055BCC: +@08055BCC: ldr r1, =0x02024332 movs r0, 0x7 - b _08055BE8 + b @08055BE8 .align 2, 0 .pool -_08055BD8: +@08055BD8: ldr r1, =0x02024332 movs r0, 0x8 - b _08055BE8 + b @08055BE8 .align 2, 0 .pool -_08055BE4: +@08055BE4: ldr r1, =0x02024332 movs r0, 0x5 -_08055BE8: +@08055BE8: strb r0, [r1, 0x3] ldr r1, =0x02024214 ldr r0, [r1] @@ -149667,7 +149667,7 @@ _08055BE8: thumb_func_end sub_8055B48 thumb_func_start sub_8055C00 -sub_8055C00: @ 8055C00 +sub_8055C00: ; 8055C00 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -149677,18 +149677,18 @@ sub_8055C00: @ 8055C00 bl sub_81A80A8 lsls r0, 24 cmp r0, 0 - beq _08055C18 - b _08055DD8 -_08055C18: + beq @08055C18 + b @08055DD8 +@08055C18: bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - beq _08055CC4 + beq @08055CC4 movs r6, 0 mov r7, sp ldr r0, =0x083203cc mov r8, r0 -_08055C2A: +@08055C2A: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 @@ -149707,33 +149707,33 @@ _08055C2A: movs r1, 0x2E bl pokemon_getattr cmp r0, 0 - beq _08055C6C + beq @08055C6C lsls r0, r5, 3 subs r0, r5 lsls r0, 2 add r0, r8 ldrb r0, [r0, 0x17] - b _08055C76 + b @08055C76 .align 2, 0 .pool -_08055C6C: +@08055C6C: lsls r0, r5, 3 subs r0, r5 lsls r0, 2 add r0, r8 ldrb r0, [r0, 0x16] -_08055C76: +@08055C76: cmp r0, 0x35 - bne _08055CB6 + bne @08055CB6 cmp r5, 0 - beq _08055CB6 + beq @08055CB6 movs r0, 0xCE lsls r0, 1 cmp r5, r0 - beq _08055CB6 + beq @08055CB6 ldrh r0, [r7] cmp r0, 0 - bne _08055CB6 + bne @08055CB6 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -149741,7 +149741,7 @@ _08055C76: bl __umodsi3 lsls r0, 16 cmp r0, 0 - bne _08055CB6 + bne @08055CB6 bl sub_81AAAE0 strh r0, [r7] movs r0, 0x64 @@ -149751,20 +149751,20 @@ _08055C76: movs r1, 0xC mov r2, sp bl pokemon_setattr -_08055CB6: +@08055CB6: adds r6, 0x1 cmp r6, 0x5 - ble _08055C2A - b _08055DD8 + ble @08055C2A + b @08055DD8 .align 2, 0 .pool -_08055CC4: +@08055CC4: movs r6, 0 movs r1, 0x64 mov r8, r1 ldr r7, =0x020244ec mov r10, sp -_08055CCE: +@08055CCE: mov r4, r8 muls r4, r6 adds r4, r7 @@ -149782,17 +149782,17 @@ _08055CCE: movs r1, 0x2E bl pokemon_getattr cmp r0, 0 - beq _08055D30 + beq @08055D30 lsls r0, r5, 3 subs r0, r5 lsls r0, 2 ldr r1, =0x083203cc adds r0, r1 ldrb r0, [r0, 0x17] - b _08055D3C + b @08055D3C .align 2, 0 .pool -_08055D10: +@08055D10: mov r0, r8 muls r0, r6 adds r0, r7 @@ -149804,31 +149804,31 @@ _08055D10: adds r2, r1 movs r1, 0xC bl pokemon_setattr - b _08055DD0 + b @08055DD0 .align 2, 0 .pool -_08055D30: +@08055D30: lsls r0, r5, 3 subs r0, r5 lsls r0, 2 ldr r1, =0x083203cc adds r0, r1 ldrb r0, [r0, 0x16] -_08055D3C: +@08055D3C: adds r1, r6, 0x1 mov r9, r1 cmp r0, 0x35 - bne _08055DD0 + bne @08055DD0 cmp r5, 0 - beq _08055DD0 + beq @08055DD0 movs r0, 0xCE lsls r0, 1 cmp r5, r0 - beq _08055DD0 + beq @08055DD0 mov r1, r10 ldrh r0, [r1] cmp r0, 0 - bne _08055DD0 + bne @08055DD0 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -149836,7 +149836,7 @@ _08055D3C: bl __umodsi3 lsls r0, 16 cmp r0, 0 - bne _08055DD0 + bne @08055DD0 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -149855,27 +149855,27 @@ _08055D3C: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x9 - bls _08055D9C + bls @08055D9C movs r1, 0x9 -_08055D9C: +@08055D9C: movs r2, 0 - b _08055DAE + b @08055DAE .align 2, 0 .pool -_08055DA4: +@08055DA4: adds r0, r4, 0 subs r0, 0x62 cmp r0, 0x1 - bls _08055D10 + bls @08055D10 adds r2, 0x1 -_08055DAE: +@08055DAE: cmp r2, 0x8 - bgt _08055DD0 + bgt @08055DD0 ldr r0, =0x0831c47a adds r0, r2, r0 ldrb r0, [r0] cmp r0, r4 - ble _08055DA4 + ble @08055DA4 mov r0, r8 muls r0, r6 adds r0, r7 @@ -149885,12 +149885,12 @@ _08055DAE: adds r2, r1 movs r1, 0xC bl pokemon_setattr -_08055DD0: +@08055DD0: mov r6, r9 cmp r6, 0x5 - bgt _08055DD8 - b _08055CCE -_08055DD8: + bgt @08055DD8 + b @08055CCE +@08055DD8: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -149908,7 +149908,7 @@ _08055DD8: thumb_func_end sub_8055C00 thumb_func_start atkE6_castform_transform -atkE6_castform_transform: @ 8055DFC +atkE6_castform_transform: ; 8055DFC push {r4,lr} ldr r4, =0x02024064 ldr r0, =0x02024474 @@ -149926,14 +149926,14 @@ atkE6_castform_transform: @ 8055DFC ands r0, r1 ldr r3, =0x0202449c cmp r0, 0 - beq _08055E2C + beq @08055E2C ldr r0, [r3] adds r0, 0x7F ldrb r1, [r0] movs r2, 0x80 orrs r1, r2 strb r1, [r0] -_08055E2C: +@08055E2C: ldr r0, [r3] adds r0, 0x7F ldrb r2, [r0] @@ -149954,7 +149954,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] @@ -149966,7 +149966,7 @@ atkE7_castform_switch: @ 8055E64 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq _08055E8E + beq @08055E8E ldr r0, =0x082db4a9 bl b_push_move_exec ldr r0, =0x0202449c @@ -149974,7 +149974,7 @@ atkE7_castform_switch: @ 8055E64 adds r0, 0x7F subs r1, r4, 0x1 strb r1, [r0] -_08055E8E: +@08055E8E: pop {r4} pop {r0} bx r0 @@ -149983,7 +149983,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, =0x0831c898 @@ -149995,7 +149995,7 @@ atkE8_settypebasedhalvers: @ 8055EA4 adds r0, r2 ldrb r0, [r0] cmp r0, 0xC9 - bne _08055EF4 + bne @08055EF4 ldr r1, =0x020242ac ldr r0, =0x0202420b ldrb r0, [r0] @@ -150007,15 +150007,15 @@ atkE8_settypebasedhalvers: @ 8055EA4 adds r0, r1, 0 ands r0, r3 cmp r0, 0 - bne _08055F18 + bne @08055F18 orrs r1, r3 str r1, [r2] ldr r0, =0x02024332 strb r4, [r0, 0x5] - b _08055F1C + b @08055F1C .align 2, 0 .pool -_08055EF4: +@08055EF4: ldr r1, =0x020242ac ldr r0, =0x0202420b ldrb r0, [r0] @@ -150027,25 +150027,25 @@ _08055EF4: adds r0, r1, 0 ands r0, r3 cmp r0, 0 - bne _08055F18 + bne @08055F18 orrs r1, r3 str r1, [r2] ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] movs r4, 0x1 -_08055F18: +@08055F18: cmp r4, 0 - beq _08055F38 -_08055F1C: + beq @08055F38 +@08055F1C: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b _08055F52 + b @08055F52 .align 2, 0 .pool -_08055F38: +@08055F38: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -150059,7 +150059,7 @@ _08055F38: lsls r0, 24 orrs r1, r0 str r1, [r3] -_08055F52: +@08055F52: pop {r4} pop {r0} bx r0 @@ -150068,7 +150068,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 @@ -150081,7 +150081,7 @@ atkE9_seteffectbyweather: @ 8055F5C lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _08055FFC + bne @08055FFC str r0, [sp] movs r0, 0x13 movs r1, 0 @@ -150090,66 +150090,66 @@ atkE9_seteffectbyweather: @ 8055F5C bl ability_something lsls r0, 24 cmp r0, 0 - bne _08055FFC + bne @08055FFC ldr r2, =0x020243cc ldrb r0, [r2] cmp r0, 0 - beq _08055F9A + beq @08055F9A ldr r1, =0x02024474 movs r0, 0x2 strb r0, [r1, 0xE] -_08055F9A: +@08055F9A: ldrh r1, [r2] movs r0, 0x7 ands r0, r1 cmp r0, 0 - beq _08055FB8 + beq @08055FB8 ldr r0, =0x0202449c ldr r1, [r0] movs r0, 0x8B - b _08055FFA + b @08055FFA .align 2, 0 .pool -_08055FB8: +@08055FB8: movs r0, 0x18 ands r0, r1 cmp r0, 0 - beq _08055FCC + beq @08055FCC ldr r0, =0x0202449c ldr r1, [r0] movs r0, 0x85 - b _08055FFA + b @08055FFA .align 2, 0 .pool -_08055FCC: +@08055FCC: movs r0, 0x60 ands r0, r1 cmp r0, 0 - beq _08055FE0 + beq @08055FE0 ldr r0, =0x0202449c ldr r1, [r0] movs r0, 0x8A - b _08055FFA + b @08055FFA .align 2, 0 .pool -_08055FE0: +@08055FE0: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08055FF4 + beq @08055FF4 ldr r0, =0x0202449c ldr r1, [r0] movs r0, 0x8F - b _08055FFA + b @08055FFA .align 2, 0 .pool -_08055FF4: +@08055FF4: ldr r0, =0x0202449c ldr r1, [r0] movs r0, 0x80 -_08055FFA: +@08055FFA: strb r0, [r1, 0x13] -_08055FFC: +@08055FFC: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -150162,7 +150162,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 @@ -150177,7 +150177,7 @@ atkEA_recycleitem: @ 8056014 adds r6, r1, r0 ldrh r5, [r6] cmp r5, 0 - beq _08056094 + beq @08056094 ldr r4, =0x02024084 movs r3, 0x58 adds r0, r2, 0 @@ -150185,7 +150185,7 @@ atkEA_recycleitem: @ 8056014 adds r0, r4 ldrh r0, [r0, 0x2E] cmp r0, 0 - bne _08056094 + bne @08056094 ldr r1, =0x02024208 strh r5, [r1] strh r0, [r6] @@ -150211,10 +150211,10 @@ atkEA_recycleitem: @ 8056014 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b _080560AE + b @080560AE .align 2, 0 .pool -_08056094: +@08056094: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -150228,7 +150228,7 @@ _08056094: lsls r0, 24 orrs r1, r0 str r1, [r3] -_080560AE: +@080560AE: add sp, 0x4 pop {r4-r7} pop {r0} @@ -150238,7 +150238,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} @@ -150262,12 +150262,12 @@ atkEB_settypetoterrain: @ 80560BC ldrb r0, [r1] adds r1, r2, 0 cmp r0, r1 - beq _08056144 + beq @08056144 adds r0, r3, 0 adds r0, 0x22 ldrb r0, [r0] cmp r0, r1 - beq _08056144 + beq @08056144 mov r0, r12 strb r2, [r0] ldrb r0, [r7] @@ -150294,10 +150294,10 @@ atkEB_settypetoterrain: @ 80560BC ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b _0805615E + b @0805615E .align 2, 0 .pool -_08056144: +@08056144: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -150311,7 +150311,7 @@ _08056144: lsls r0, 24 orrs r1, r0 str r1, [r3] -_0805615E: +@0805615E: pop {r3} mov r8, r3 pop {r4-r7} @@ -150322,7 +150322,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] @@ -150339,7 +150339,7 @@ atkEC_802D2A0: @ 805616C movs r6, 0x1 ands r0, r6 cmp r0, 0 - beq _0805620C + beq @0805620C ldr r0, =0x02024210 ldrb r1, [r0] ldr r2, =0x0832a328 @@ -150349,18 +150349,18 @@ atkEC_802D2A0: @ 805616C ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _0805620C + bne @0805620C ldr r0, =0x0202421c adds r0, r3, r0 ldrb r0, [r0] cmp r0, 0 - bne _0805620C + bne @0805620C ldr r1, =0x02024274 lsls r0, r3, 1 adds r0, r1 ldrh r2, [r0] cmp r2, 0xE4 - bne _0805620C + bne @0805620C ldr r0, =0x0202407a adds r0, r3, r0 movs r1, 0xB @@ -150378,10 +150378,10 @@ atkEC_802D2A0: @ 805616C strb r1, [r0] ldrb r0, [r4] strb r0, [r5] - b _08056226 + b @08056226 .align 2, 0 .pool -_0805620C: +@0805620C: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -150395,7 +150395,7 @@ _0805620C: lsls r0, 24 orrs r1, r0 str r1, [r3] -_08056226: +@08056226: pop {r4-r6} pop {r0} bx r0 @@ -150404,7 +150404,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 @@ -150416,19 +150416,19 @@ atkED_802D364: @ 8056230 adds r4, r1, 0 ldrb r1, [r2] cmp r0, r1 - bne _08056264 + bne @08056264 ldr r1, =0x02024474 ldrb r0, [r1, 0x17] strb r0, [r2] strb r0, [r3] - b _0805626A + b @0805626A .align 2, 0 .pool -_08056264: +@08056264: ldr r1, =0x02024474 ldrb r0, [r1, 0x17] strb r0, [r2] -_0805626A: +@0805626A: ldrb r0, [r4] strb r0, [r1, 0x17] ldr r1, =0x02024214 @@ -150443,7 +150443,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] @@ -150459,11 +150459,11 @@ atkEE_removereflectlightscreen: @ 8056284 adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0 - bne _080562AC + bne @080562AC ldrb r1, [r4, 0x2] cmp r1, 0 - beq _080562E4 -_080562AC: + beq @080562E4 +@080562AC: ldr r2, =0x0202428e adds r2, r3, r2 ldrh r1, [r2] @@ -150479,14 +150479,14 @@ _080562AC: movs r0, 0x1 strb r0, [r1, 0x18] strb r0, [r1, 0x19] - b _080562EA + b @080562EA .align 2, 0 .pool -_080562E4: +@080562E4: ldr r0, =0x02024474 strb r1, [r0, 0x18] strb r1, [r0, 0x19] -_080562EA: +@080562EA: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -150499,15 +150499,15 @@ _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 ldr r0, [r0] cmp r0, 0 - beq _0805630E - b _08056696 -_0805630E: + beq @0805630E + b @08056696 +@0805630E: ldr r5, =0x02024064 ldr r0, =0x0202420b ldrb r0, [r0] @@ -150521,7 +150521,7 @@ _0805630E: movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _0805635C + beq @0805635C movs r0, 0 movs r1, 0x5 bl dp01_build_cmdbuf_x0D_a @@ -150529,15 +150529,15 @@ _0805630E: bl dp01_battle_side_mark_buffer_for_execution ldr r1, =0x02024214 ldr r0, =0x082dbe02 - b _08056694 + b @08056694 .align 2, 0 .pool -_0805635C: +@0805635C: movs r0, 0x80 lsls r0, 2 ands r1, r0 cmp r1, 0 - beq _08056384 + beq @08056384 movs r0, 0 movs r1, 0x4 bl dp01_build_cmdbuf_x0D_a @@ -150545,14 +150545,14 @@ _0805635C: bl dp01_battle_side_mark_buffer_for_execution ldr r1, =0x02024214 ldr r0, =0x082dbdca - b _08056694 + b @08056694 .align 2, 0 .pool -_08056384: +@08056384: ldr r0, =0x02024208 ldrh r0, [r0] cmp r0, 0x5 - bne _080563B0 + bne @080563B0 ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x7C @@ -150565,10 +150565,10 @@ _08056384: bl __divsi3 lsls r0, 24 lsrs r5, r0, 24 - b _080563C8 + b @080563C8 .align 2, 0 .pool -_080563B0: +@080563B0: ldr r3, =0x083203cc ldr r2, =0x02024084 ldrb r1, [r6] @@ -150581,35 +150581,35 @@ _080563B0: lsls r0, 2 adds r0, r3 ldrb r5, [r0, 0x8] -_080563C8: +@080563C8: ldr r2, =0x02024208 ldrh r0, [r2] cmp r0, 0x5 - bhi _080563D2 - b _080564C8 -_080563D2: + bhi @080563D2 + b @080564C8 +@080563D2: subs r0, 0x6 cmp r0, 0x6 - bls _080563DA - b _080564D2 -_080563DA: + bls @080563DA + b @080564D2 +@080563DA: lsls r0, 2 - ldr r1, =_080563F4 + ldr r1, =@080563F4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080563F4: - .4byte _08056410 - .4byte _08056440 - .4byte _08056452 - .4byte _08056480 - .4byte _080564B0 - .4byte _08056472 - .4byte _08056472 -_08056410: +@080563F4: + .4byte @08056410 + .4byte @08056440 + .4byte @08056452 + .4byte @08056480 + .4byte @080564B0 + .4byte @08056472 + .4byte @08056472 +@08056410: ldr r2, =0x02024084 ldr r0, =0x0202420c ldrb r1, [r0] @@ -150620,28 +150620,28 @@ _08056410: adds r1, 0x21 ldrb r1, [r1] cmp r1, 0xB - beq _080564A4 + beq @080564A4 adds r0, 0x22 ldrb r0, [r0] cmp r0, 0xB - beq _080564A4 + beq @080564A4 cmp r1, 0x6 - beq _080564A4 + beq @080564A4 cmp r0, 0x6 - beq _080564A4 - b _08056472 + beq @080564A4 + b @08056472 .align 2, 0 .pool -_08056440: +@08056440: bl sav1_map_get_light_level lsls r0, 24 lsrs r0, 24 movs r4, 0xA cmp r0, 0x5 - bne _080564D2 + bne @080564D2 movs r4, 0x23 - b _080564D2 -_08056452: + b @080564D2 +@08056452: ldr r2, =0x02024084 ldr r0, =0x0202420c ldrb r1, [r0] @@ -150651,19 +150651,19 @@ _08056452: adds r0, 0x2A ldrb r1, [r0] cmp r1, 0x27 - bhi _08056472 + bhi @08056472 movs r0, 0x28 subs r0, r1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x9 - bhi _080564D2 -_08056472: + bhi @080564D2 +@08056472: movs r4, 0xA - b _080564D2 + b @080564D2 .align 2, 0 .pool -_08056480: +@08056480: ldr r2, =0x02024084 ldr r0, =0x0202420c ldrb r1, [r0] @@ -150679,31 +150679,31 @@ _08056480: lsls r0, 24 movs r4, 0xA cmp r0, 0 - beq _080564D2 -_080564A4: + beq @080564D2 +@080564A4: movs r4, 0x1E - b _080564D2 + b @080564D2 .align 2, 0 .pool -_080564B0: +@080564B0: ldr r0, =0x03005d10 ldrb r0, [r0, 0x13] adds r0, 0xA lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x28 - bls _080564D2 + bls @080564D2 movs r4, 0x28 - b _080564D2 + b @080564D2 .align 2, 0 .pool -_080564C8: +@080564C8: ldr r1, =0x0831c48d ldrh r0, [r2] subs r0, 0x2 adds r0, r1 ldrb r4, [r0] -_080564D2: +@080564D2: adds r0, r5, 0 muls r0, r4 movs r1, 0xA @@ -150730,34 +150730,34 @@ _080564D2: movs r0, 0x27 ands r0, r4 cmp r0, 0 - beq _0805650E + beq @0805650E lsls r6, 1 -_0805650E: +@0805650E: movs r0, 0xD8 ands r4, r0 cmp r4, 0 - beq _08056522 + beq @08056522 lsls r0, r6, 4 subs r0, r6 movs r1, 0xA bl __udivsi3 adds r6, r0, 0 -_08056522: +@08056522: ldr r1, =0x02024208 ldrh r0, [r1] cmp r0, 0x5 - beq _08056564 + beq @08056564 cmp r0, 0x1 - bne _08056550 + bne @08056550 ldr r0, =0x03005d10 ldrb r1, [r0, 0x5] movs r2, 0x2 orrs r1, r2 strb r1, [r0, 0x5] - b _08056564 + b @08056564 .align 2, 0 .pool -_08056550: +@08056550: ldr r0, =0x03005d10 ldrh r1, [r1] adds r0, r1 @@ -150765,12 +150765,12 @@ _08056550: adds r1, 0x34 ldrb r0, [r1] cmp r0, 0xFE - bhi _08056564 + bhi @08056564 adds r0, 0x1 strb r0, [r1] -_08056564: +@08056564: cmp r6, 0xFE - bls _080565C8 + bls @080565C8 movs r0, 0 movs r1, 0x4 bl dp01_build_cmdbuf_x0D_a @@ -150797,11 +150797,11 @@ _08056564: lsls r0, 24 lsrs r0, 24 cmp r0, 0x6 - beq _08056656 - b _08056680 + beq @08056656 + b @08056680 .align 2, 0 .pool -_080565C8: +@080565C8: movs r0, 0xFF lsls r0, 16 adds r1, r6, 0 @@ -150817,28 +150817,28 @@ _080565C8: bl __udivsi3 adds r6, r0, 0 movs r4, 0 - b _080565FA + b @080565FA .align 2, 0 .pool -_080565F4: +@080565F4: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_080565FA: +@080565FA: cmp r4, 0x3 - bhi _0805660A + bhi @0805660A bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 cmp r0, r6 - bcc _080565F4 -_0805660A: + bcc @080565F4 +@0805660A: ldr r5, =0x02024208 ldrh r0, [r5] cmp r0, 0x1 - bne _08056614 + bne @08056614 movs r4, 0x4 -_08056614: +@08056614: movs r0, 0 adds r1, r4, 0 bl dp01_build_cmdbuf_x0D_a @@ -150846,7 +150846,7 @@ _08056614: ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution cmp r4, 0x4 - bne _0805668C + bne @0805668C ldr r1, =0x02024214 ldr r0, =0x082dbd84 str r0, [r1] @@ -150867,29 +150867,29 @@ _08056614: lsls r0, 24 lsrs r0, 24 cmp r0, 0x6 - bne _08056680 -_08056656: + bne @08056680 +@08056656: ldr r1, =0x02024332 movs r0, 0 strb r0, [r1, 0x5] - b _08056696 + b @08056696 .align 2, 0 .pool -_08056680: +@08056680: ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] - b _08056696 + b @08056696 .align 2, 0 .pool -_0805668C: +@0805668C: ldr r0, =0x02024332 strb r4, [r0, 0x5] ldr r1, =0x02024214 ldr r0, =0x082dbdd4 -_08056694: +@08056694: str r0, [r1] -_08056696: +@08056696: pop {r4-r6} pop {r0} bx r0 @@ -150898,7 +150898,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 @@ -150921,12 +150921,12 @@ atkF0_catch_pokemon: @ 80566A8 bl pokemon_catch lsls r0, 24 cmp r0, 0 - beq _08056792 + beq @08056792 bl sub_813B21C lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _08056734 + bne @08056734 ldr r0, =0x02024332 strb r1, [r0, 0x5] ldr r4, =0x02021cc4 @@ -150948,10 +150948,10 @@ atkF0_catch_pokemon: @ 80566A8 ldr r2, =0x02021dc4 movs r1, 0x2 bl pokemon_getattr - b _0805677E + b @0805677E .align 2, 0 .pool -_08056734: +@08056734: ldr r4, =0x02021cc4 ldr r0, =0x00004036 bl var_get @@ -150982,17 +150982,17 @@ _08056734: ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] -_0805677E: +@0805677E: ldr r0, =0x000008ab bl flag_check lsls r0, 24 cmp r0, 0 - beq _08056792 + beq @08056792 ldr r1, =0x02024332 ldrb r0, [r1, 0x5] adds r0, 0x1 strb r0, [r1, 0x5] -_08056792: +@08056792: ldr r0, =0x0202406e mov r10, r0 ldr r1, =0x0202420b @@ -151067,7 +151067,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 @@ -151089,7 +151089,7 @@ atkF1_802D95C: @ 8056850 bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - beq _080568A8 + beq @080568A8 ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -151103,10 +151103,10 @@ atkF1_802D95C: @ 8056850 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _080568C2 + b @080568C2 .align 2, 0 .pool -_080568A8: +@080568A8: adds r0, r5, 0 bl SpeciesToNationalPokedexNum lsls r0, 16 @@ -151118,7 +151118,7 @@ _080568A8: ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_080568C2: +@080568C2: pop {r4,r5} pop {r0} bx r0 @@ -151127,7 +151127,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 @@ -151139,25 +151139,25 @@ sub_80568CC: @ 80568CC ldr r0, =0x02024332 ldrb r0, [r0] cmp r0, 0x5 - bls _080568E8 - b _08056A2C -_080568E8: + bls @080568E8 + b @08056A2C +@080568E8: lsls r0, 2 - ldr r1, =_08056900 + ldr r1, =@08056900 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08056900: - .4byte _08056918 - .4byte _0805692A - .4byte _08056978 - .4byte _080569C8 - .4byte _080569E0 - .4byte _08056A18 -_08056918: +@08056900: + .4byte @08056918 + .4byte @0805692A + .4byte @08056978 + .4byte @080569C8 + .4byte @080569E0 + .4byte @08056A18 +@08056918: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -151165,16 +151165,16 @@ _08056918: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - b _08056A06 -_0805692A: + b @08056A06 +@0805692A: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08056938 - b _08056A2C -_08056938: + beq @08056938 + b @08056A2C +@08056938: bl Window_FreeMemory adds r0, r4, 0 bl SpeciesToNationalPokedexNum @@ -151195,21 +151195,21 @@ _08056938: bl sub_80BFDF4 ldr r1, =0x02024332 strb r0, [r1, 0x1] - b _08056A08 + b @08056A08 .align 2, 0 .pool -_08056978: +@08056978: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08056A2C + bne @08056A2C ldr r0, =0x030022c0 ldr r1, [r0, 0x4] ldr r0, =sub_8038420 + 1 cmp r1, r0 - bne _08056A2C + bne @08056A2C ldr r2, =0x03005e00 ldr r4, =0x02024332 ldrb r1, [r4, 0x1] @@ -151219,16 +151219,16 @@ _08056978: adds r0, r2 ldrb r0, [r0, 0x4] cmp r0, 0 - bne _08056A2C + bne @08056A2C ldr r0, =vblank_cb_08078BB4 + 1 bl SetVBlankCallback ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _08056A2C + b @08056A2C .align 2, 0 .pool -_080569C8: +@080569C8: bl c2_berry_program_update_menu bl sub_8035AA4 ldr r1, =0x02022e20 @@ -151236,15 +151236,15 @@ _080569C8: lsls r2, 1 adds r0, r2, 0 strh r0, [r1] - b _08056A06 + b @08056A06 .align 2, 0 .pool -_080569E0: +@080569E0: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _08056A2C + bne @08056A2C ldr r0, =0x0000ffff str r1, [sp] movs r1, 0 @@ -151255,27 +151255,27 @@ _080569E0: bl gpu_sync_bg_show movs r0, 0x3 bl gpu_sync_bg_show -_08056A06: +@08056A06: ldr r1, =0x02024332 -_08056A08: +@08056A08: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08056A2C + b @08056A2C .align 2, 0 .pool -_08056A18: +@08056A18: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08056A2C + bne @08056A2C ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] -_08056A2C: +@08056A2C: add sp, 0x4 pop {r4} pop {r0} @@ -151285,7 +151285,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 @@ -151313,96 +151313,96 @@ sub_8056A3C: @ 8056A3C strh r1, [r0] ldr r6, [sp, 0x10] cmp r6, r3 - ble _08056A76 - b _08056B62 -_08056A76: + ble @08056A76 + b @08056B62 +@08056A76: mov r4, r8 adds r0, r6, 0x1 str r0, [sp, 0x18] ldr r2, [sp, 0x1C] cmp r4, r2 - bgt _08056B58 + bgt @08056B58 add r5, sp, 0xC lsls r7, r6, 24 mov r9, r7 -_08056A88: +@08056A88: ldr r0, [sp, 0x10] cmp r6, r0 - bne _08056AB4 + bne @08056AB4 cmp r4, r8 - bne _08056A9C + bne @08056A9C ldr r0, =0x00001022 - b _08056AFE + b @08056AFE .align 2, 0 .pool -_08056A9C: +@08056A9C: ldr r2, [sp, 0x1C] cmp r4, r2 - bne _08056AAC + bne @08056AAC ldr r0, =0x00001024 - b _08056AFE + b @08056AFE .align 2, 0 .pool -_08056AAC: +@08056AAC: ldr r0, =0x00001023 - b _08056AFE + b @08056AFE .align 2, 0 .pool -_08056AB4: +@08056AB4: ldr r7, [sp, 0x14] cmp r6, r7 - bne _08056AE0 + bne @08056AE0 cmp r4, r8 - bne _08056AC8 + bne @08056AC8 ldr r0, =0x00001028 - b _08056AFE + b @08056AFE .align 2, 0 .pool -_08056AC8: +@08056AC8: ldr r0, [sp, 0x1C] cmp r4, r0 - bne _08056AD8 + bne @08056AD8 ldr r0, =0x0000102a - b _08056AFE + b @08056AFE .align 2, 0 .pool -_08056AD8: +@08056AD8: ldr r0, =0x00001029 - b _08056AFE + b @08056AFE .align 2, 0 .pool -_08056AE0: +@08056AE0: cmp r4, r8 - bne _08056AEC + bne @08056AEC ldr r0, =0x00001025 - b _08056AFE + b @08056AFE .align 2, 0 .pool -_08056AEC: +@08056AEC: ldr r2, [sp, 0x1C] cmp r4, r2 - bne _08056AFC + bne @08056AFC ldr r0, =0x00001027 - b _08056AFE + b @08056AFE .align 2, 0 .pool -_08056AFC: +@08056AFC: ldr r0, =0x00001026 -_08056AFE: +@08056AFE: strh r0, [r5] movs r1, 0x1 mov r0, r10 ands r0, r1 cmp r0, 0 - beq _08056B0E + beq @08056B0E movs r0, 0 strh r0, [r5] -_08056B0E: +@08056B0E: movs r0, 0x80 mov r7, r10 ands r0, r7 cmp r0, 0 - beq _08056B38 + beq @08056B38 lsls r2, r4, 24 lsrs r2, 24 str r1, [sp] @@ -151414,10 +151414,10 @@ _08056B0E: mov r7, r9 lsrs r3, r7, 24 bl bg_copy_tilemap_rect_simple - b _08056B50 + b @08056B50 .align 2, 0 .pool -_08056B38: +@08056B38: lsls r2, r4, 24 lsrs r2, 24 str r1, [sp] @@ -151429,18 +151429,18 @@ _08056B38: mov r7, r9 lsrs r3, r7, 24 bl bg_copy_tilemap_rect_simple -_08056B50: +@08056B50: adds r4, 0x1 ldr r0, [sp, 0x1C] cmp r4, r0 - ble _08056A88 -_08056B58: + ble @08056A88 +@08056B58: ldr r6, [sp, 0x18] ldr r2, [sp, 0x14] cmp r6, r2 - bgt _08056B62 - b _08056A76 -_08056B62: + bgt @08056B62 + b @08056A76 +@08056B62: add sp, 0x20 pop {r3-r5} mov r8, r3 @@ -151452,7 +151452,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 @@ -151482,7 +151482,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 @@ -151515,7 +151515,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 @@ -151526,24 +151526,24 @@ atkF3_receive_new_pokemon_maybe: @ 8056BEC ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0x4 - bls _08056C04 - b _08056E62 -_08056C04: + bls @08056C04 + b @08056E62 +@08056C04: lsls r0, r1, 2 - ldr r1, =_08056C18 + ldr r1, =@08056C18 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08056C18: - .4byte _08056C2C - .4byte _08056C60 - .4byte _08056CFC - .4byte _08056DD4 - .4byte _08056E2C -_08056C2C: +@08056C18: + .4byte @08056C2C + .4byte @08056C60 + .4byte @08056CFC + .4byte @08056DD4 + .4byte @08056E2C +@08056C2C: movs r4, 0 str r4, [sp] movs r0, 0x18 @@ -151561,19 +151561,19 @@ _08056C2C: strb r4, [r1, 0x1] movs r0, 0 bl sub_8056B74 - b _08056E62 + b @08056E62 .align 2, 0 .pool -_08056C60: +@08056C60: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _08056C86 + beq @08056C86 ldrb r0, [r4, 0x1] cmp r0, 0 - beq _08056C86 + beq @08056C86 movs r0, 0x5 bl audio_play ldrb r0, [r4, 0x1] @@ -151581,17 +151581,17 @@ _08056C60: movs r0, 0 strb r0, [r4, 0x1] bl sub_8056B74 -_08056C86: +@08056C86: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08056CAE + beq @08056CAE ldr r4, =0x02024332 ldrb r0, [r4, 0x1] cmp r0, 0 - bne _08056CAE + bne @08056CAE movs r0, 0x5 bl audio_play ldrb r0, [r4, 0x1] @@ -151599,52 +151599,52 @@ _08056C86: movs r0, 0x1 strb r0, [r4, 0x1] bl sub_8056B74 -_08056CAE: +@08056CAE: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08056CE0 + beq @08056CE0 movs r0, 0x5 bl audio_play ldr r1, =0x02024332 ldrb r0, [r1, 0x1] cmp r0, 0 - bne _08056CF2 + bne @08056CF2 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] movs r0, 0x3 bl sub_80A2390 - b _08056E62 + b @08056E62 .align 2, 0 .pool -_08056CE0: +@08056CE0: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _08056CEA - b _08056E62 -_08056CEA: + bne @08056CEA + b @08056E62 +@08056CEA: movs r0, 0x5 bl audio_play ldr r1, =0x02024332 -_08056CF2: +@08056CF2: movs r0, 0x4 strb r0, [r1] - b _08056E62 + b @08056E62 .align 2, 0 .pool -_08056CFC: +@08056CFC: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08056D0A - b _08056E62 -_08056D0A: + beq @08056D0A + b @08056E62 +@08056D0A: ldr r7, =0x0202406e ldr r0, =0x0202420b mov r10, r0 @@ -151724,21 +151724,21 @@ _08056D0A: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08056E62 + b @08056E62 .align 2, 0 .pool -_08056DD4: +@08056DD4: ldr r0, =0x030022c0 ldr r1, [r0, 0x4] ldr r0, =sub_8038420 + 1 cmp r1, r0 - bne _08056E62 + bne @08056E62 ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08056E62 + bne @08056E62 ldr r2, =0x0202406e ldr r0, =0x0202420b ldrb r1, [r0] @@ -151756,23 +151756,23 @@ _08056DD4: adds r2, 0x6D movs r1, 0x2 bl pokemon_setattr - b _08056E48 + b @08056E48 .align 2, 0 .pool -_08056E2C: +@08056E2C: bl calc_player_party_count lsls r0, 24 lsrs r0, 24 cmp r0, 0x6 - bne _08056E48 + bne @08056E48 ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b _08056E62 + b @08056E62 .align 2, 0 .pool -_08056E48: +@08056E48: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -151786,7 +151786,7 @@ _08056E48: lsls r0, 24 orrs r1, r0 str r1, [r3] -_08056E62: +@08056E62: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -151800,7 +151800,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] @@ -151822,7 +151822,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] @@ -151842,7 +151842,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] @@ -151852,7 +151852,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] @@ -151866,7 +151866,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] @@ -151889,7 +151889,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 @@ -151898,9 +151898,9 @@ sub_8056F28: @ 8056F28 lsls r1, 19 ands r0, r1 cmp r0, 0 - beq _08056F3E + beq @08056F3E bl sub_81D55D0 -_08056F3E: +@08056F3E: ldr r4, =0x0202449c movs r0, 0xA9 lsls r0, 2 @@ -151965,7 +151965,7 @@ _08056F3E: lsls r1, 20 ands r0, r1 cmp r0, 0 - beq _08056FFA + beq @08056FFA ldr r0, =0x00004054 bl var_get lsls r0, 16 @@ -151979,7 +151979,7 @@ _08056F3E: ldr r0, [r2] adds r0, r1 bl create_enemy_party -_08056FFA: +@08056FFA: pop {r4-r6} pop {r0} bx r0 @@ -151988,7 +151988,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] @@ -151996,13 +151996,13 @@ sub_8057028: @ 8057028 lsls r1, 19 ands r0, r1 cmp r0, 0 - beq _0805703C + beq @0805703C bl sub_81D5694 -_0805703C: +@0805703C: ldr r6, =0x020244a8 ldr r0, [r6] cmp r0, 0 - beq _080570D0 + beq @080570D0 ldr r4, =0x0202449c ldr r0, [r4] bl free @@ -152059,7 +152059,7 @@ _0805703C: ldr r0, [r4] bl free str r5, [r4] -_080570D0: +@080570D0: pop {r4-r6} pop {r0} bx r0 @@ -152068,7 +152068,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 @@ -152077,7 +152077,7 @@ sub_80570F4: @ 80570F4 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08057140 + beq @08057140 movs r0, 0x1 bl battle_get_side_with_given_state lsls r0, 24 @@ -152098,17 +152098,17 @@ sub_80570F4: @ 80570F4 ldrb r1, [r1] ldrb r0, [r0] cmp r1, r0 - bls _0805714A + bls @0805714A adds r4, r3, 0 - b _0805714A + b @0805714A .align 2, 0 .pool -_08057140: +@08057140: movs r0, 0x1 bl battle_get_side_with_given_state lsls r0, 24 lsrs r4, r0, 24 -_0805714A: +@0805714A: ldr r2, =0x02024084 movs r1, 0x58 adds r0, r4, 0 @@ -152124,11 +152124,11 @@ _0805714A: ldrb r0, [r3] ldrb r2, [r1] cmp r0, r2 - bls _080571B8 + bls @080571B8 ldrb r1, [r1] subs r0, r1 cmp r0, 0x1D - ble _08057198 + ble @08057198 ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 @@ -152139,10 +152139,10 @@ _0805714A: adds r0, r1 movs r1, 0x8 bl happiness_algorithm - b _080571CE + b @080571CE .align 2, 0 .pool -_08057198: +@08057198: ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 @@ -152153,10 +152153,10 @@ _08057198: adds r0, r1 movs r1, 0x6 bl happiness_algorithm - b _080571CE + b @080571CE .align 2, 0 .pool -_080571B8: +@080571B8: ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 @@ -152167,7 +152167,7 @@ _080571B8: adds r0, r1 movs r1, 0x6 bl happiness_algorithm -_080571CE: +@080571CE: pop {r4,r5} pop {r0} bx r0 @@ -152176,7 +152176,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 @@ -152187,13 +152187,13 @@ sub_80571DC: @ 80571DC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08057248 + beq @08057248 movs r2, 0 ldr r6, =0x0202406e lsls r3, r4, 1 ldr r5, =0x0203cf00 ldr r4, =0x0202449c -_080571FE: +@080571FE: adds r0, r2, r5 ldr r1, [r4] adds r1, r2, r1 @@ -152202,7 +152202,7 @@ _080571FE: strb r1, [r0] adds r2, 0x1 cmp r2, 0x2 - ble _080571FE + ble @080571FE adds r0, r3, r6 ldrb r0, [r0] bl pokemon_order_func @@ -152219,7 +152219,7 @@ _080571FE: movs r2, 0 ldr r4, =0x0202449c ldr r3, =0x0203cf00 -_08057236: +@08057236: ldr r0, [r4] adds r0, r2, r0 adds r0, 0x60 @@ -152228,8 +152228,8 @@ _08057236: strb r1, [r0] adds r2, 0x1 cmp r2, 0x2 - ble _08057236 -_08057248: + ble @08057236 +@08057248: pop {r4-r7} pop {r0} bx r0 @@ -152238,7 +152238,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 @@ -152252,29 +152252,29 @@ sub_805725C: @ 805725C mov r8, r0 ldr r1, =0x02024332 mov r10, r1 - b _08057284 + b @08057284 .align 2, 0 .pool -_0805727C: +@0805727C: mov r2, r8 cmp r2, 0 - beq _08057284 - b _08057406 -_08057284: + beq @08057284 + b @08057406 +@08057284: mov r1, r10 ldrb r0, [r1] cmp r0, 0x1 - bne _0805728E - b _08057390 -_0805728E: + bne @0805728E + b @08057390 +@0805728E: cmp r0, 0x1 - ble _08057294 - b _080573FC -_08057294: + ble @08057294 + b @080573FC +@08057294: cmp r0, 0 - beq _0805729A - b _080573FC -_0805729A: + beq @0805729A + b @080573FC +@0805729A: ldr r6, =0x02024084 movs r0, 0x58 mov r5, r9 @@ -152286,12 +152286,12 @@ _0805729A: movs r7, 0x7 ands r0, r7 cmp r0, 0 - beq _08057372 + beq @08057372 mov r0, r9 bl sub_8050650 lsls r0, 24 cmp r0, 0 - beq _080572FC + beq @080572FC ldr r0, [r4] movs r1, 0x8 negs r1, r1 @@ -152313,32 +152313,32 @@ _0805729A: str r0, [r1] movs r0, 0x2 mov r8, r0 - b _08057372 + b @08057372 .align 2, 0 .pool -_080572FC: +@080572FC: adds r0, r5, r6 adds r0, 0x20 ldrb r0, [r0] movs r2, 0x1 cmp r0, 0x30 - bne _0805730A + bne @0805730A movs r2, 0x2 -_0805730A: +@0805730A: ldr r1, [r4] adds r0, r1, 0 ands r0, r7 cmp r0, r2 - bcs _0805731E + bcs @0805731E movs r0, 0x8 negs r0, r0 ands r1, r0 str r1, [r4] - b _08057322 -_0805731E: + b @08057322 +@0805731E: subs r0, r1, r2 str r0, [r4] -_08057322: +@08057322: ldr r2, =0x02024084 movs r0, 0x58 mov r1, r9 @@ -152350,16 +152350,16 @@ _08057322: movs r0, 0x7 ands r4, r0 cmp r4, 0 - beq _08057354 + beq @08057354 ldr r1, =0x02024214 ldr r0, =0x082db213 str r0, [r1] movs r1, 0x2 mov r8, r1 - b _08057372 + b @08057372 .align 2, 0 .pool -_08057354: +@08057354: adds r2, 0x50 adds r2, r1, r2 ldr r0, [r2] @@ -152374,16 +152374,16 @@ _08057354: str r0, [r1] movs r2, 0x2 mov r8, r2 -_08057372: +@08057372: ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] mov r10, r1 - b _080573FC + b @080573FC .align 2, 0 .pool -_08057390: +@08057390: ldr r1, =0x02024084 movs r0, 0x58 mov r2, r9 @@ -152395,7 +152395,7 @@ _08057390: movs r1, 0x20 ands r0, r1 cmp r0, 0 - beq _080573F4 + beq @080573F4 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -152404,14 +152404,14 @@ _08057390: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - beq _080573D4 + beq @080573D4 ldr r1, =0x02024214 ldr r0, =0x082db26a str r0, [r1] - b _080573EC + b @080573EC .align 2, 0 .pool -_080573D4: +@080573D4: ldr r0, [r4] movs r1, 0x21 negs r1, r1 @@ -152423,26 +152423,26 @@ _080573D4: str r0, [r1] mov r0, r10 strb r5, [r0, 0x5] -_080573EC: +@080573EC: movs r1, 0x2 mov r8, r1 ldr r2, =0x02024332 mov r10, r2 -_080573F4: +@080573F4: mov r1, r10 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_080573FC: +@080573FC: mov r2, r10 ldrb r0, [r2] cmp r0, 0x2 - beq _08057406 - b _0805727C -_08057406: + beq @08057406 + b @0805727C +@08057406: mov r0, r8 cmp r0, 0x2 - bne _08057430 + bne @08057430 ldr r4, =0x02024064 mov r1, r9 strb r1, [r4] @@ -152459,7 +152459,7 @@ _08057406: bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution -_08057430: +@08057430: mov r0, r8 add sp, 0x4 pop {r3-r5} @@ -152474,12 +152474,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] @@ -152498,7 +152498,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 @@ -152513,7 +152513,7 @@ dp01_tbl1_exec_completed: @ 805748C movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _080574E0 + beq @080574E0 bl link_get_multiplayer_id mov r1, sp strb r0, [r1] @@ -152527,10 +152527,10 @@ dp01_tbl1_exec_completed: @ 805748C adds r0, r1 movs r1, 0x38 strb r1, [r0] - b _080574F2 + b @080574F2 .align 2, 0 .pool -_080574E0: +@080574E0: ldr r2, =0x02024068 ldr r1, =0x0832a328 ldrb r0, [r4] @@ -152540,7 +152540,7 @@ _080574E0: ldr r0, [r2] bics r0, r1 str r0, [r2] -_080574F2: +@080574F2: add sp, 0x4 pop {r4} pop {r0} @@ -152550,7 +152550,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, =0x0832a328 @@ -152562,31 +152562,31 @@ bx_exec_buffer_A_ch0_tbl1: @ 8057504 ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _08057550 + beq @08057550 ldr r0, =0x02023064 lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] cmp r0, 0x38 - bhi _0805754C + bhi @0805754C ldr r0, =0x0831c514 ldrb r1, [r1] lsls r1, 2 adds r1, r0 ldr r0, [r1] bl _call_via_r0 - b _08057550 + b @08057550 .align 2, 0 .pool -_0805754C: +@0805754C: bl dp01_tbl1_exec_completed -_08057550: +@08057550: pop {r0} bx r0 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 @@ -152601,9 +152601,9 @@ bx_0802E404: @ 8057554 movs r1, 0x24 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08057576 + bne @08057576 bl dp01_tbl1_exec_completed -_08057576: +@08057576: pop {r0} bx r0 .align 2, 0 @@ -152611,7 +152611,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 @@ -152639,22 +152639,22 @@ sub_8057588: @ 8057588 movs r0, 0xF0 ands r0, r1 cmp r0, 0 - beq _080575EC + beq @080575EC ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x2 - bne _080575EC + bne @080575EC ldr r1, =0x020244cc ldrb r0, [r1] adds r0, 0x1 - b _080575F0 + b @080575F0 .align 2, 0 .pool -_080575EC: +@080575EC: ldr r1, =0x020244cc movs r0, 0 -_080575F0: +@080575F0: strb r0, [r1] ldr r0, =0x030022c0 ldrh r2, [r0, 0x2E] @@ -152662,7 +152662,7 @@ _080575F0: adds r0, r3, 0 ands r0, r2 cmp r0, 0 - beq _08057658 + beq @08057658 movs r0, 0x5 bl audio_play ldr r1, =0x020244ac @@ -152671,43 +152671,43 @@ _080575F0: adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - beq _08057640 + beq @08057640 cmp r0, 0x1 - bgt _08057630 + bgt @08057630 cmp r0, 0 - beq _0805763A - b _080577C2 + beq @0805763A + b @080577C2 .align 2, 0 .pool -_08057630: +@08057630: cmp r0, 0x2 - beq _08057646 + beq @08057646 cmp r0, 0x3 - beq _0805764C - b _080577C2 -_0805763A: + beq @0805764C + b @080577C2 +@0805763A: movs r0, 0x1 movs r1, 0 - b _080577BC -_08057640: + b @080577BC +@08057640: movs r0, 0x1 movs r1, 0x1 - b _080577BC -_08057646: + b @080577BC +@08057646: movs r0, 0x1 movs r1, 0x2 - b _080577BC -_0805764C: + b @080577BC +@0805764C: movs r0, 0x1 movs r1, 0x3 movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb - b _080577C2 -_08057658: + b @080577C2 +@08057658: movs r0, 0x20 ands r0, r2 cmp r0, 0 - beq _08057698 + beq @08057698 ldr r5, =0x020244ac ldr r4, =0x02024064 ldrb r0, [r4] @@ -152716,9 +152716,9 @@ _08057658: adds r0, r3, 0 ands r0, r1 cmp r0, 0 - bne _08057674 - b _080577E8 -_08057674: + bne @08057674 + b @080577E8 +@08057674: movs r0, 0x5 bl audio_play ldrb r0, [r4] @@ -152729,14 +152729,14 @@ _08057674: adds r1, r5 ldrb r0, [r1] movs r2, 0x1 - b _08057732 + b @08057732 .align 2, 0 .pool -_08057698: +@08057698: movs r0, 0x10 ands r0, r2 cmp r0, 0 - beq _080576D8 + beq @080576D8 ldr r5, =0x020244ac ldr r4, =0x02024064 ldrb r0, [r4] @@ -152745,9 +152745,9 @@ _08057698: adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _080576B4 - b _080577E8 -_080576B4: + beq @080576B4 + b @080577E8 +@080576B4: movs r0, 0x5 bl audio_play ldrb r0, [r4] @@ -152758,15 +152758,15 @@ _080576B4: adds r1, r5 ldrb r0, [r1] movs r2, 0x1 - b _08057732 + b @08057732 .align 2, 0 .pool -_080576D8: +@080576D8: movs r7, 0x40 adds r0, r7, 0 ands r0, r2 cmp r0, 0 - beq _08057700 + beq @08057700 ldr r5, =0x020244ac ldr r4, =0x02024064 ldrb r0, [r4] @@ -152775,15 +152775,15 @@ _080576D8: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080577E8 - b _0805771A + beq @080577E8 + b @0805771A .align 2, 0 .pool -_08057700: +@08057700: movs r0, 0x80 ands r0, r2 cmp r0, 0 - beq _0805774C + beq @0805774C ldr r5, =0x020244ac ldr r4, =0x02024064 ldrb r0, [r4] @@ -152792,8 +152792,8 @@ _08057700: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _080577E8 -_0805771A: + bne @080577E8 +@0805771A: movs r0, 0x5 bl audio_play ldrb r0, [r4] @@ -152804,7 +152804,7 @@ _0805771A: adds r1, r5 ldrb r0, [r1] movs r2, 0x2 -_08057732: +@08057732: eors r0, r2 strb r0, [r1] ldrb r0, [r4] @@ -152812,30 +152812,30 @@ _08057732: ldrb r0, [r0] movs r1, 0 bl sub_8059CB4 - b _080577E8 + b @080577E8 .align 2, 0 .pool -_0805774C: +@0805774C: movs r0, 0x2 ands r0, r2 cmp r0, 0 - bne _0805775A + bne @0805775A ldrb r0, [r1] cmp r0, 0x3B - bls _080577DC -_0805775A: + bls @080577DC +@0805775A: ldr r4, =0x02022fec ldr r0, [r4] ands r0, r3 cmp r0, 0 - beq _080577E8 + beq @080577E8 ldr r6, =0x02024064 ldrb r0, [r6] bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _080577E8 + bne @080577E8 movs r0, 0 bl battle_get_side_with_given_state ldr r1, =0x02024210 @@ -152847,11 +152847,11 @@ _0805775A: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _080577E8 + bne @080577E8 ldr r0, [r4] ands r0, r7 cmp r0, 0 - bne _080577E8 + bne @080577E8 ldr r0, =0x02023064 ldrb r1, [r6] lsls r1, 9 @@ -152859,39 +152859,39 @@ _0805775A: adds r1, r0 ldrb r0, [r1] cmp r0, 0x1 - bne _080577B2 + bne @080577B2 cmp r5, 0xC - bhi _080577E8 + bhi @080577E8 adds r0, r5, 0 movs r1, 0x1 bl bag_add_item -_080577B2: +@080577B2: movs r0, 0x5 bl audio_play movs r0, 0x1 movs r1, 0xC -_080577BC: +@080577BC: movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb -_080577C2: +@080577C2: bl dp01_tbl1_exec_completed - b _080577E8 + b @080577E8 .align 2, 0 .pool -_080577DC: +@080577DC: movs r0, 0x8 ands r0, r2 cmp r0, 0 - beq _080577E8 + beq @080577E8 bl sub_8073314 -_080577E8: +@080577E8: pop {r4-r7} pop {r0} bx r0 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] @@ -152914,7 +152914,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, =0x0831c5f8 @@ -152931,50 +152931,50 @@ sub_8057824: @ 8057824 ldr r0, =0x0202406c ldrb r0, [r0] cmp r0, 0 - beq _08057866 -_0805784A: + beq @08057866 +@0805784A: ldr r0, =0x03005d74 ldrb r0, [r0] cmp r4, r0 - beq _0805785C + beq @0805785C lsls r0, r4, 24 lsrs r0, 24 movs r1, 0x1 bl dp11b_obj_free -_0805785C: +@0805785C: adds r4, 0x1 ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - blt _0805784A -_08057866: + blt @0805784A +@08057866: ldr r2, =0x030022c0 ldrh r1, [r2, 0x2C] movs r0, 0xF0 ands r0, r1 cmp r0, 0 - beq _0805789C + beq @0805789C ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x2 - bne _0805789C + bne @0805789C ldr r1, =0x020244cc ldrb r0, [r1] adds r0, 0x1 - b _080578A0 + b @080578A0 .align 2, 0 .pool -_0805789C: +@0805789C: ldr r1, =0x020244cc movs r0, 0 -_080578A0: +@080578A0: strb r0, [r1] ldrh r2, [r2, 0x2E] movs r0, 0x1 ands r0, r2 cmp r0, 0 - beq _08057910 + beq @08057910 movs r0, 0x5 bl audio_play ldr r2, =0x02020630 @@ -153005,18 +153005,18 @@ _080578A0: movs r1, 0x1 bl dp11b_obj_free bl dp01_tbl1_exec_completed - b _08057BC8 + b @08057BC8 .align 2, 0 .pool -_08057910: +@08057910: movs r0, 0x2 ands r0, r2 cmp r0, 0 - bne _0805791E + bne @0805791E ldrb r0, [r1] cmp r0, 0x3B - bls _0805798C -_0805791E: + bls @0805798C +@0805791E: movs r0, 0x5 bl audio_play ldr r2, =0x02020630 @@ -153052,16 +153052,16 @@ _0805791E: ldrb r0, [r5] movs r1, 0x1 bl dp11b_obj_free - b _08057BC8 + b @08057BC8 .align 2, 0 .pool -_0805798C: +@0805798C: movs r0, 0x60 ands r0, r2 cmp r0, 0 - bne _08057996 - b _08057AB0 -_08057996: + bne @08057996 + b @08057AB0 +@08057996: movs r0, 0x5 bl audio_play ldr r2, =0x02020630 @@ -153078,32 +153078,32 @@ _08057996: ldr r1, =sub_8039B2C + 1 str r1, [r0] adds r5, r3, 0 -_080579B8: +@080579B8: ldrb r0, [r5] bl battle_get_per_side_status lsls r0, 24 lsrs r1, r0, 24 movs r4, 0 mov r0, sp - b _080579E2 + b @080579E2 .align 2, 0 .pool -_080579D8: +@080579D8: adds r4, 0x1 cmp r4, 0x3 - bgt _080579E8 + bgt @080579E8 mov r2, sp adds r0, r2, r4 -_080579E2: +@080579E2: ldrb r0, [r0] cmp r1, r0 - bne _080579D8 -_080579E8: + bne @080579D8 +@080579E8: subs r4, 0x1 cmp r4, 0 - bge _080579F0 + bge @080579F0 movs r4, 0x4 -_080579F0: +@080579F0: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -153114,33 +153114,33 @@ _080579F0: lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - beq _080579E8 + beq @080579E8 movs r4, 0 ldrb r0, [r5] bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08057A6E + beq @08057A6E cmp r0, 0x1 - bgt _08057A28 + bgt @08057A28 cmp r0, 0 - beq _08057A32 - b _08057A70 + beq @08057A32 + b @08057A70 .align 2, 0 .pool -_08057A28: +@08057A28: cmp r0, 0x2 - beq _08057A32 + beq @08057A32 cmp r0, 0x3 - beq _08057A6E - b _08057A70 -_08057A32: + beq @08057A6E + b @08057A70 +@08057A32: ldr r2, =0x02024064 ldrb r0, [r2] ldrb r1, [r5] cmp r0, r1 - bne _08057A6E + bne @08057A6E ldr r1, =0x0202406e ldrb r2, [r2] lsls r0, r2, 1 @@ -153164,10 +153164,10 @@ _08057A32: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08057A70 -_08057A6E: + beq @08057A70 +@08057A6E: adds r4, 0x1 -_08057A70: +@08057A70: ldr r0, =0x02024210 ldrb r1, [r0] ldr r2, =0x0832a328 @@ -153178,21 +153178,21 @@ _08057A70: ands r1, r0 ldr r0, =0x03005d74 cmp r1, 0 - beq _08057A88 + beq @08057A88 movs r4, 0 -_08057A88: +@08057A88: cmp r4, 0 - beq _080579B8 - b _08057BB0 + beq @080579B8 + b @08057BB0 .align 2, 0 .pool -_08057AB0: +@08057AB0: movs r0, 0x90 ands r0, r2 cmp r0, 0 - bne _08057ABA - b _08057BC8 -_08057ABA: + bne @08057ABA + b @08057BC8 +@08057ABA: movs r0, 0x5 bl audio_play ldr r2, =0x02020630 @@ -153209,32 +153209,32 @@ _08057ABA: ldr r1, =sub_8039B2C + 1 str r1, [r0] adds r5, r3, 0 -_08057ADC: +@08057ADC: ldrb r0, [r5] bl battle_get_per_side_status lsls r0, 24 lsrs r1, r0, 24 movs r4, 0 mov r0, sp - b _08057B06 + b @08057B06 .align 2, 0 .pool -_08057AFC: +@08057AFC: adds r4, 0x1 cmp r4, 0x3 - bgt _08057B0C + bgt @08057B0C mov r2, sp adds r0, r2, r4 -_08057B06: +@08057B06: ldrb r0, [r0] cmp r1, r0 - bne _08057AFC -_08057B0C: + bne @08057AFC +@08057B0C: adds r4, 0x1 cmp r4, 0x3 - ble _08057B14 + ble @08057B14 movs r4, 0 -_08057B14: +@08057B14: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -153245,33 +153245,33 @@ _08057B14: lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - beq _08057B0C + beq @08057B0C movs r4, 0 ldrb r0, [r5] bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08057B92 + beq @08057B92 cmp r0, 0x1 - bgt _08057B4C + bgt @08057B4C cmp r0, 0 - beq _08057B56 - b _08057B94 + beq @08057B56 + b @08057B94 .align 2, 0 .pool -_08057B4C: +@08057B4C: cmp r0, 0x2 - beq _08057B56 + beq @08057B56 cmp r0, 0x3 - beq _08057B92 - b _08057B94 -_08057B56: + beq @08057B92 + b @08057B94 +@08057B56: ldr r2, =0x02024064 ldrb r0, [r2] ldrb r1, [r5] cmp r0, r1 - bne _08057B92 + bne @08057B92 ldr r1, =0x0202406e ldrb r2, [r2] lsls r0, r2, 1 @@ -153295,10 +153295,10 @@ _08057B56: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08057B94 -_08057B92: + beq @08057B94 +@08057B92: adds r4, 0x1 -_08057B94: +@08057B94: ldr r0, =0x02024210 ldrb r1, [r0] ldr r2, =0x0832a328 @@ -153309,12 +153309,12 @@ _08057B94: ands r1, r0 ldr r0, =0x03005d74 cmp r1, 0 - beq _08057BAC + beq @08057BAC movs r4, 0 -_08057BAC: +@08057BAC: cmp r4, 0 - beq _08057ADC -_08057BB0: + beq @08057ADC +@08057BB0: ldr r2, =0x02020630 ldr r1, =0x020241e4 ldrb r0, [r0] @@ -153327,7 +153327,7 @@ _08057BB0: adds r0, r2 ldr r1, =sub_8039AD8 + 1 str r1, [r0] -_08057BC8: +@08057BC8: add sp, 0x4 pop {r4,r5} pop {r0} @@ -153337,7 +153337,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} @@ -153354,31 +153354,31 @@ sub_8057BFC: @ 8057BFC ands r0, r1 adds r7, r3, 0 cmp r0, 0 - beq _08057C44 + beq @08057C44 ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x2 - bne _08057C44 + bne @08057C44 ldr r1, =0x020244cc ldrb r0, [r1] adds r0, 0x1 - b _08057C48 + b @08057C48 .align 2, 0 .pool -_08057C44: +@08057C44: ldr r1, =0x020244cc movs r0, 0 -_08057C48: +@08057C48: strb r0, [r1] ldrh r2, [r2, 0x2E] movs r5, 0x1 adds r0, r5, 0 ands r0, r2 cmp r0, 0 - bne _08057C58 - b _08057E04 -_08057C58: + bne @08057C58 + b @08057E04 +@08057C58: movs r0, 0x5 bl audio_play ldr r1, =0x020244b0 @@ -153390,11 +153390,11 @@ _08057C58: adds r1, r6, r0 ldrh r0, [r1] cmp r0, 0xAE - bne _08057C98 + bne @08057C98 ldrb r0, [r6, 0x12] movs r4, 0 cmp r0, 0x7 - beq _08057CA6 + beq @08057CA6 ldrb r1, [r6, 0x13] movs r0, 0x7 eors r1, r0 @@ -153403,10 +153403,10 @@ _08057C58: asrs r4, r0, 31 movs r0, 0x10 ands r4, r0 - b _08057CA6 + b @08057CA6 .align 2, 0 .pool -_08057C98: +@08057C98: ldr r2, =0x0831c898 ldrh r1, [r1] lsls r0, r1, 1 @@ -153414,19 +153414,19 @@ _08057C98: lsls r0, 2 adds r0, r2 ldrb r4, [r0, 0x6] -_08057CA6: +@08057CA6: movs r0, 0x10 ands r0, r4 cmp r0, 0 - beq _08057CC4 + beq @08057CC4 ldr r0, =0x03005d74 ldr r1, =0x02024064 ldrb r1, [r1] strb r1, [r0] - b _08057CDE + b @08057CDE .align 2, 0 .pool -_08057CC4: +@08057CC4: ldr r0, =0x02024064 ldrb r0, [r0] bl battle_get_per_side_status @@ -153438,7 +153438,7 @@ _08057CC4: bl battle_get_side_with_given_state ldr r1, =0x03005d74 strb r0, [r1] -_08057CDE: +@08057CDE: ldr r5, =0x02023064 ldr r0, =0x02024064 ldrb r3, [r0] @@ -153448,29 +153448,29 @@ _08057CDE: ldrb r1, [r1] adds r7, r0, 0 cmp r1, 0 - bne _08057D18 + bne @08057D18 movs r0, 0x2 ands r0, r4 cmp r0, 0 - beq _08057D5A + beq @08057D5A adds r0, r5, 0x2 adds r0, r2, r0 ldrb r0, [r0] cmp r0, 0 - bne _08057D5A + bne @08057D5A movs r0, 0x1 add r8, r0 - b _08057D5A + b @08057D5A .align 2, 0 .pool -_08057D18: +@08057D18: movs r0, 0x7D ands r0, r4 cmp r0, 0 - bne _08057D24 + bne @08057D24 movs r0, 0x1 add r8, r0 -_08057D24: +@08057D24: ldr r0, =0x020244b0 adds r0, r3, r0 adds r1, r6, 0 @@ -153479,29 +153479,29 @@ _08057D24: adds r1, r0 ldrb r0, [r1] cmp r0, 0 - beq _08057D62 + beq @08057D62 movs r0, 0x12 ands r0, r4 cmp r0, 0 - bne _08057D5A + bne @08057D5A movs r0, 0 bl sub_8069DEC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _08057D5A + bhi @08057D5A ldrb r0, [r7] bl sub_8069F34 ldr r1, =0x03005d74 strb r0, [r1] movs r0, 0 mov r8, r0 -_08057D5A: +@08057D5A: ldr r7, =0x02024064 mov r0, r8 cmp r0, 0 - bne _08057D80 -_08057D62: + bne @08057D80 +@08057D62: ldr r1, =0x020244b0 ldrb r0, [r7] adds r0, r1 @@ -153510,10 +153510,10 @@ _08057D62: ldrb r0, [r0] lsls r0, 8 orrs r2, r0 - b _08057E1C + b @08057E1C .align 2, 0 .pool -_08057D80: +@08057D80: ldr r1, =0x03005d60 ldrb r0, [r7] lsls r0, 2 @@ -153523,13 +153523,13 @@ _08057D80: movs r0, 0x12 ands r4, r0 cmp r4, 0 - beq _08057DA8 + beq @08057DA8 ldr r1, =0x03005d74 ldrb r0, [r7] - b _08057DD8 + b @08057DD8 .align 2, 0 .pool -_08057DA8: +@08057DA8: movs r0, 0x1 bl battle_get_side_with_given_state ldr r1, =0x02024210 @@ -153541,17 +153541,17 @@ _08057DA8: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _08057DD0 + beq @08057DD0 movs r0, 0x3 - b _08057DD2 + b @08057DD2 .align 2, 0 .pool -_08057DD0: +@08057DD0: movs r0, 0x1 -_08057DD2: +@08057DD2: bl battle_get_side_with_given_state ldr r1, =0x03005d74 -_08057DD8: +@08057DD8: strb r0, [r1] ldr r2, =0x02020630 ldr r1, =0x020241e4 @@ -153565,35 +153565,35 @@ _08057DD8: adds r2, 0x1C adds r0, r2 ldr r1, =sub_8039AD8 + 1 - b _08057F9C + b @08057F9C .align 2, 0 .pool -_08057E04: +@08057E04: movs r6, 0x2 adds r0, r6, 0 ands r0, r2 cmp r0, 0 - bne _08057E14 + bne @08057E14 ldrb r0, [r1] cmp r0, 0x3B - bls _08057E30 -_08057E14: + bls @08057E30 +@08057E14: movs r0, 0x5 bl audio_play ldr r2, =0x0000ffff -_08057E1C: +@08057E1C: movs r0, 0x1 movs r1, 0xA bl dp01_build_cmdbuf_x21_a_bb bl dp01_tbl1_exec_completed - b _08057F9E + b @08057F9E .align 2, 0 .pool -_08057E30: +@08057E30: movs r0, 0x20 ands r0, r2 cmp r0, 0 - beq _08057E60 + beq @08057E60 ldr r4, =0x020244b0 ldrb r0, [r7] adds r2, r0, r4 @@ -153601,9 +153601,9 @@ _08057E30: adds r0, r5, 0 ands r0, r1 cmp r0, 0 - bne _08057E4A - b _08057F9E -_08057E4A: + bne @08057E4A + b @08057F9E +@08057E4A: ldrb r0, [r2] bl battle_menu_cursor_related ldrb r1, [r7] @@ -153611,14 +153611,14 @@ _08057E4A: ldrb r0, [r1] movs r2, 0x1 eors r0, r2 - b _08057F08 + b @08057F08 .align 2, 0 .pool -_08057E60: +@08057E60: movs r0, 0x10 ands r0, r2 cmp r0, 0 - beq _08057EA4 + beq @08057EA4 ldr r4, =0x020244b0 ldrb r0, [r7] adds r3, r0, r4 @@ -153627,31 +153627,31 @@ _08057E60: adds r0, r5, 0 ands r0, r2 cmp r0, 0 - beq _08057E7C - b _08057F9E -_08057E7C: + beq @08057E7C + b @08057F9E +@08057E7C: ldr r1, =0x03005d78 adds r0, r6, 0 eors r0, r2 ldrb r1, [r1] cmp r0, r1 - bcc _08057E8A - b _08057F9E -_08057E8A: + bcc @08057E8A + b @08057F9E +@08057E8A: ldrb r0, [r3] bl battle_menu_cursor_related ldrb r1, [r7] adds r1, r4 ldrb r0, [r1] eors r0, r6 - b _08057F08 + b @08057F08 .align 2, 0 .pool -_08057EA4: +@08057EA4: movs r0, 0x40 ands r0, r2 cmp r0, 0 - beq _08057ED4 + beq @08057ED4 ldr r4, =0x020244b0 ldrb r0, [r7] adds r2, r0, r4 @@ -153659,7 +153659,7 @@ _08057EA4: adds r0, r6, 0 ands r0, r1 cmp r0, 0 - beq _08057F9E + beq @08057F9E ldrb r0, [r2] bl battle_menu_cursor_related ldrb r1, [r7] @@ -153667,14 +153667,14 @@ _08057EA4: ldrb r0, [r1] movs r2, 0x2 eors r0, r2 - b _08057F08 + b @08057F08 .align 2, 0 .pool -_08057ED4: +@08057ED4: movs r0, 0x80 ands r0, r2 cmp r0, 0 - beq _08057F30 + beq @08057F30 ldr r4, =0x020244b0 ldrb r0, [r7] adds r3, r0, r4 @@ -153683,20 +153683,20 @@ _08057ED4: adds r0, r6, 0 ands r0, r2 cmp r0, 0 - bne _08057F9E + bne @08057F9E ldr r1, =0x03005d78 adds r0, r5, 0 eors r0, r2 ldrb r1, [r1] cmp r0, r1 - bcs _08057F9E + bcs @08057F9E ldrb r0, [r3] bl battle_menu_cursor_related ldrb r1, [r7] adds r1, r4 ldrb r0, [r1] eors r0, r5 -_08057F08: +@08057F08: strb r0, [r1] movs r0, 0x5 bl audio_play @@ -153707,23 +153707,23 @@ _08057F08: bl battle_menu_cursor_related_2 bl sub_8059B3C bl sub_8059BB0 - b _08057F9E + b @08057F9E .align 2, 0 .pool -_08057F30: +@08057F30: movs r0, 0x4 ands r0, r2 cmp r0, 0 - beq _08057F9E + beq @08057F9E ldr r0, =0x03005d78 ldrb r0, [r0] cmp r0, 0x1 - bls _08057F9E + bls @08057F9E ldr r0, =0x02022fec ldr r5, [r0] ands r5, r6 cmp r5, 0 - bne _08057F9E + bne @08057F9E ldr r4, =0x020244b0 ldrb r0, [r7] adds r0, r4 @@ -153734,18 +153734,18 @@ _08057F30: adds r0, r4 ldrb r0, [r0] cmp r0, 0 - beq _08057F78 + beq @08057F78 ldr r0, =0x03005d74 strb r5, [r0] - b _08057F80 + b @08057F80 .align 2, 0 .pool -_08057F78: +@08057F78: ldr r1, =0x03005d74 adds r0, 0x1 strb r0, [r1] adds r0, r1, 0 -_08057F80: +@08057F80: ldrb r0, [r0] movs r1, 0x1B bl battle_menu_cursor_related_2 @@ -153758,9 +153758,9 @@ _08057F80: lsls r0, 2 adds r0, r1 ldr r1, =sub_8058138 + 1 -_08057F9C: +@08057F9C: str r1, [r0] -_08057F9E: +@08057F9E: pop {r3} mov r8, r3 pop {r4-r7} @@ -153771,7 +153771,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 @@ -153780,16 +153780,16 @@ sub_8057FBC: @ 8057FBC adds r0, r6, 0 ands r0, r1 cmp r0, 0 - beq _08057FD6 + beq @08057FD6 movs r0, 0x5 bl audio_play movs r7, 0x1 -_08057FD6: +@08057FD6: ldrh r1, [r4, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08057FF8 + beq @08057FF8 movs r0, 0x5 bl audio_play ldr r1, =0x02022e14 @@ -153801,12 +153801,12 @@ _08057FD6: adds r0, r2, 0 strh r0, [r1] movs r7, 0xFF -_08057FF8: +@08057FF8: ldrh r1, [r4, 0x2E] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _08058038 + beq @08058038 ldr r5, =0x020244b0 ldr r4, =0x02024064 ldrb r0, [r4] @@ -153815,7 +153815,7 @@ _08057FF8: adds r0, r6, 0 ands r0, r1 cmp r0, 0 - beq _08058038 + beq @08058038 ldrb r0, [r2] bl battle_menu_cursor_related ldrb r1, [r4] @@ -153831,13 +153831,13 @@ _08057FF8: ldrb r0, [r0] movs r1, 0 bl battle_menu_cursor_related_2 -_08058038: +@08058038: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08058086 + beq @08058086 ldr r5, =0x020244b0 ldr r4, =0x02024064 ldrb r0, [r4] @@ -153847,13 +153847,13 @@ _08058038: movs r0, 0x1 ands r0, r2 cmp r0, 0 - bne _08058086 + bne @08058086 ldr r1, =0x03005d78 adds r0, r6, 0 eors r0, r2 ldrb r1, [r1] cmp r0, r1 - bcs _08058086 + bcs @08058086 ldrb r0, [r3] bl battle_menu_cursor_related ldrb r1, [r4] @@ -153868,13 +153868,13 @@ _08058038: ldrb r0, [r0] movs r1, 0 bl battle_menu_cursor_related_2 -_08058086: +@08058086: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _080580C8 + beq @080580C8 ldr r5, =0x020244b0 ldr r4, =0x02024064 ldrb r0, [r4] @@ -153883,7 +153883,7 @@ _08058086: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080580C8 + beq @080580C8 ldrb r0, [r2] bl battle_menu_cursor_related ldrb r1, [r4] @@ -153899,13 +153899,13 @@ _08058086: ldrb r0, [r0] movs r1, 0 bl battle_menu_cursor_related_2 -_080580C8: +@080580C8: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08058116 + beq @08058116 ldr r5, =0x020244b0 ldr r4, =0x02024064 ldrb r0, [r4] @@ -153915,13 +153915,13 @@ _080580C8: movs r0, 0x2 ands r0, r2 cmp r0, 0 - bne _08058116 + bne @08058116 ldr r1, =0x03005d78 adds r0, r6, 0 eors r0, r2 ldrb r1, [r1] cmp r0, r1 - bcs _08058116 + bcs @08058116 ldrb r0, [r3] bl battle_menu_cursor_related ldrb r1, [r4] @@ -153936,7 +153936,7 @@ _080580C8: ldrb r0, [r0] movs r1, 0 bl battle_menu_cursor_related_2 -_08058116: +@08058116: adds r0, r7, 0 pop {r4-r7} pop {r1} @@ -153946,7 +153946,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 @@ -153958,9 +153958,9 @@ sub_8058138: @ 8058138 movs r0, 0x5 ands r0, r1 cmp r0, 0 - bne _08058152 - b _08058500 -_08058152: + bne @08058152 + b @08058500 +@08058152: movs r0, 0x5 bl audio_play ldr r0, =0x020244b0 @@ -153973,9 +153973,9 @@ _08058152: ldrb r0, [r2] ldrb r3, [r5] cmp r0, r3 - bne _08058170 - b _080584A8 -_08058170: + bne @08058170 + b @080584A8 +@08058170: lsls r1, 9 ldr r0, =0x02023068 adds r1, r0 @@ -154042,7 +154042,7 @@ _08058170: ldr r0, [r0] ands r2, r0 cmp r2, 0 - beq _0805822A + beq @0805822A lsrs r1, r3, 28 bics r1, r0 lsls r1, 4 @@ -154069,7 +154069,7 @@ _08058170: ands r2, r4 orrs r2, r0 strb r2, [r1, 0x18] -_0805822A: +@0805822A: bl sub_8059AAC movs r6, 0 mov r12, r7 @@ -154087,7 +154087,7 @@ _0805822A: mov r7, r8 mov r10, r2 movs r5, 0x3 -_0805824E: +@0805824E: mov r1, sp adds r3, r1, r6 ldrb r1, [r4] @@ -154099,7 +154099,7 @@ _0805824E: strb r1, [r3] adds r6, 0x1 cmp r6, 0x3 - ble _0805824E + ble @0805824E ldr r1, =0x020244b0 ldrb r0, [r7] adds r0, r1 @@ -154128,7 +154128,7 @@ _0805824E: strb r3, [r2] movs r6, 0 ldr r2, [sp, 0x1C] -_0805829E: +@0805829E: mov r3, sp adds r0, r3, r6 ldrb r1, [r0] @@ -154139,7 +154139,7 @@ _0805829E: strb r0, [r2] adds r6, 0x1 cmp r6, 0x3 - ble _0805829E + ble @0805829E ldrb r1, [r7] movs r0, 0x58 muls r0, r1 @@ -154158,7 +154158,7 @@ _0805829E: mov r7, r10 adds r7, 0xC mov r5, r12 -_080582D8: +@080582D8: lsls r1, r6, 1 ldrb r0, [r4] muls r0, r3 @@ -154177,7 +154177,7 @@ _080582D8: adds r2, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble _080582D8 + ble @080582D8 ldr r2, =0x02024064 ldrb r1, [r2] movs r0, 0x58 @@ -154190,9 +154190,9 @@ _080582D8: lsls r1, 14 ands r0, r1 cmp r0, 0 - beq _0805831A - b _080584A8 -_0805831A: + beq @0805831A + b @080584A8 +@0805831A: movs r6, 0 mov r1, sp adds r1, 0x4 @@ -154205,7 +154205,7 @@ _0805831A: movs r7, 0x64 ldr r5, =0x020244ec adds r4, r1, 0 -_08058332: +@08058332: mov r1, r8 ldrb r0, [r1] lsls r0, 1 @@ -154233,7 +154233,7 @@ _08058332: adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble _08058332 + ble @08058332 ldr r1, =0x0202406e ldr r0, =0x02024064 ldrb r0, [r0] @@ -154251,7 +154251,7 @@ _08058332: movs r6, 0 movs r5, 0x3 ldr r4, [sp, 0x1C] -_08058392: +@08058392: mov r0, sp adds r3, r0, r6 lsls r2, r6, 1 @@ -154263,7 +154263,7 @@ _08058392: strb r0, [r3] adds r6, 0x1 cmp r6, 0x3 - ble _08058392 + ble @08058392 ldr r4, =0x020244b0 ldr r3, =0x02024064 ldrb r0, [r3] @@ -154322,7 +154322,7 @@ _08058392: strb r5, [r2] movs r6, 0 ldr r2, [sp, 0x1C] -_0805841E: +@0805841E: mov r3, sp adds r0, r3, r6 ldrb r1, [r0] @@ -154333,7 +154333,7 @@ _0805841E: strb r0, [r2] adds r6, 0x1 cmp r6, 0x3 - ble _0805841E + ble @0805841E movs r6, 0 ldr r5, =0x0202406e mov r10, r5 @@ -154345,7 +154345,7 @@ _0805841E: ldr r5, [sp, 0x20] adds r5, 0x8 ldr r4, [sp, 0x20] -_0805844A: +@0805844A: mov r2, r9 ldrb r0, [r2] lsls r0, 1 @@ -154376,7 +154376,7 @@ _0805844A: adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble _0805844A + ble @0805844A ldr r1, =0x0202406e ldr r0, =0x02024064 ldrb r0, [r0] @@ -154390,7 +154390,7 @@ _0805844A: movs r1, 0x15 ldr r2, [sp, 0x1C] bl pokemon_setattr -_080584A8: +@080584A8: ldr r1, =0x03005d60 ldr r2, =0x02024064 ldrb r0, [r2] @@ -154409,14 +154409,14 @@ _080584A8: ldrb r0, [r0] movs r1, 0 bl battle_menu_cursor_related_2 - b _08058532 + b @08058532 .align 2, 0 .pool -_08058500: +@08058500: movs r0, 0x6 ands r0, r1 cmp r0, 0 - beq _08058554 + beq @08058554 movs r0, 0x5 bl audio_play ldr r0, =0x03005d74 @@ -154435,113 +154435,113 @@ _08058500: adds r0, r1 ldr r1, =sub_8057BFC + 1 str r1, [r0] -_08058532: +@08058532: bl sub_8059B18 bl sub_8059B3C bl sub_8059BB0 - b _080586E8 + b @080586E8 .align 2, 0 .pool -_08058554: +@08058554: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080585A4 + beq @080585A4 ldr r3, =0x03005d74 ldrb r2, [r3] movs r0, 0x1 ands r0, r2 cmp r0, 0 - bne _0805856A - b _080586E8 -_0805856A: + bne @0805856A + b @080586E8 +@0805856A: ldr r0, =0x020244b0 ldr r1, =0x02024064 ldrb r1, [r1] adds r1, r0 ldrb r5, [r1] cmp r2, r5 - bne _08058590 -_08058578: + bne @08058590 +@08058578: ldrb r0, [r1] movs r1, 0x1D bl battle_menu_cursor_related_2 - b _08058596 + b @08058596 .align 2, 0 .pool -_08058590: +@08058590: ldrb r0, [r3] bl battle_menu_cursor_related -_08058596: +@08058596: ldr r4, =0x03005d74 ldrb r0, [r4] movs r1, 0x1 - b _0805862C + b @0805862C .align 2, 0 .pool -_080585A4: +@080585A4: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080585E8 + beq @080585E8 ldr r3, =0x03005d74 ldrb r2, [r3] movs r0, 0x1 ands r0, r2 cmp r0, 0 - beq _080585BA - b _080586E8 -_080585BA: + beq @080585BA + b @080586E8 +@080585BA: ldr r1, =0x03005d78 movs r0, 0x1 eors r0, r2 ldrb r1, [r1] cmp r0, r1 - bcc _080585C8 - b _080586E8 -_080585C8: + bcc @080585C8 + b @080586E8 +@080585C8: ldr r0, =0x020244b0 ldr r1, =0x02024064 ldrb r1, [r1] adds r1, r0 ldrb r0, [r1] cmp r2, r0 - beq _08058578 - b _08058590 + beq @08058578 + b @08058590 .align 2, 0 .pool -_080585E8: +@080585E8: movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0805865C + beq @0805865C ldr r3, =0x03005d74 ldrb r2, [r3] movs r0, 0x2 ands r0, r2 cmp r0, 0 - beq _080586E8 + beq @080586E8 ldr r0, =0x020244b0 ldr r1, =0x02024064 ldrb r1, [r1] adds r1, r0 ldrb r5, [r1] cmp r2, r5 - bne _08058620 + bne @08058620 ldrb r0, [r1] movs r1, 0x1D bl battle_menu_cursor_related_2 - b _08058626 + b @08058626 .align 2, 0 .pool -_08058620: +@08058620: ldrb r0, [r3] bl battle_menu_cursor_related -_08058626: +@08058626: ldr r4, =0x03005d74 ldrb r0, [r4] movs r1, 0x2 -_0805862C: +@0805862C: eors r0, r1 strb r0, [r4] movs r0, 0x5 @@ -154553,47 +154553,47 @@ _0805862C: ldrb r1, [r4] ldrb r0, [r0] cmp r1, r0 - beq _080586CA + beq @080586CA ldrb r0, [r4] movs r1, 0x1B bl battle_menu_cursor_related_2 - b _080586E8 + b @080586E8 .align 2, 0 .pool -_0805865C: +@0805865C: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080586E8 + beq @080586E8 ldr r3, =0x03005d74 ldrb r2, [r3] movs r0, 0x2 ands r0, r2 cmp r0, 0 - bne _080586E8 + bne @080586E8 ldr r1, =0x03005d78 movs r0, 0x2 eors r0, r2 ldrb r1, [r1] cmp r0, r1 - bcs _080586E8 + bcs @080586E8 ldr r0, =0x020244b0 ldr r1, =0x02024064 ldrb r1, [r1] adds r1, r0 ldrb r0, [r1] cmp r2, r0 - bne _080586A4 + bne @080586A4 ldrb r0, [r1] movs r1, 0x1D bl battle_menu_cursor_related_2 - b _080586AA + b @080586AA .align 2, 0 .pool -_080586A4: +@080586A4: ldrb r0, [r3] bl battle_menu_cursor_related -_080586AA: +@080586AA: ldr r4, =0x03005d74 ldrb r0, [r4] movs r1, 0x2 @@ -154608,19 +154608,19 @@ _080586AA: ldrb r1, [r4] ldrb r0, [r0] cmp r1, r0 - bne _080586E0 -_080586CA: + bne @080586E0 +@080586CA: adds r0, r1, 0 movs r1, 0 bl battle_menu_cursor_related_2 - b _080586E8 + b @080586E8 .align 2, 0 .pool -_080586E0: +@080586E0: ldrb r0, [r4] movs r1, 0x1B bl battle_menu_cursor_related_2 -_080586E8: +@080586E8: add sp, 0x24 pop {r3-r5} mov r8, r3 @@ -154632,16 +154632,16 @@ _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] cmp r0, 0 - bne _0805875C + bne @0805875C ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _08058798 + bne @08058798 movs r0, 0x5A bl m4aSongNumStop ldr r3, =0x030022c0 @@ -154660,18 +154660,18 @@ sub_80586F8: @ 80586F8 ldr r0, =0x0202433a ldrb r0, [r0] cmp r0, 0x1 - bne _08058738 + bne @08058738 bl sub_817E3F4 -_08058738: +@08058738: bl Window_FreeMemory - b _08058798 + b @08058798 .align 2, 0 .pool -_0805875C: +@0805875C: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08058798 + beq @08058798 movs r0, 0x5A bl m4aSongNumStop ldr r3, =0x030022c0 @@ -154690,11 +154690,11 @@ _0805875C: ldr r0, =0x0202433a ldrb r0, [r0] cmp r0, 0x1 - bne _08058794 + bne @08058794 bl sub_817E3F4 -_08058794: +@08058794: bl Window_FreeMemory -_08058798: +@08058798: pop {r0} bx r0 .align 2, 0 @@ -154702,35 +154702,35 @@ _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] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08058832 + bne @08058832 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _08058810 + beq @08058810 bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08058832 + beq @08058832 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - bne _080587F0 + bne @080587F0 bl sub_800AC34 - b _080587F4 + b @080587F4 .align 2, 0 .pool -_080587F0: +@080587F0: bl sub_800ADF8 -_080587F4: +@080587F4: ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -154738,10 +154738,10 @@ _080587F4: adds r0, r1 ldr r1, =sub_80586F8 + 1 str r1, [r0] - b _08058832 + b @08058832 .align 2, 0 .pool -_08058810: +@08058810: movs r0, 0x5A bl m4aSongNumStop ldr r2, =0x030022c0 @@ -154757,7 +154757,7 @@ _08058810: str r0, [r2] ldr r0, [r2, 0x8] bl set_callback2 -_08058832: +@08058832: pop {r0} bx r0 .align 2, 0 @@ -154765,7 +154765,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 @@ -154781,9 +154781,9 @@ sub_8058844: @ 8058844 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _08058868 + bne @08058868 bl dp01_tbl1_exec_completed -_08058868: +@08058868: pop {r0} bx r0 .align 2, 0 @@ -154791,7 +154791,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 @@ -154807,9 +154807,9 @@ sub_805887C: @ 805887C ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _080588A0 + bne @080588A0 bl dp01_tbl1_exec_completed -_080588A0: +@080588A0: pop {r0} bx r0 .align 2, 0 @@ -154817,7 +154817,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 @@ -154834,7 +154834,7 @@ bx_802F7A0: @ 80588B4 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _08058908 + bne @08058908 ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] @@ -154856,7 +154856,7 @@ bx_802F7A0: @ 80588B4 adds r0, r6 bl obj_delete_and_free_tiles bl dp01_tbl1_exec_completed -_08058908: +@08058908: pop {r4-r6} pop {r0} bx r0 @@ -154865,7 +154865,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] @@ -154882,7 +154882,7 @@ sub_8058924: @ 8058924 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _0805895C + bne @0805895C ldr r0, [r4] ldrb r1, [r3] ldr r2, [r0, 0x4] @@ -154893,7 +154893,7 @@ sub_8058924: @ 8058924 movs r1, 0 strb r1, [r0, 0x9] bl dp01_tbl1_exec_completed -_0805895C: +@0805895C: pop {r4} pop {r0} bx r0 @@ -154902,7 +154902,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 @@ -154912,18 +154912,18 @@ sub_805896C: @ 805896C bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _08058998 + beq @08058998 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _080589D0 + beq @080589D0 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _080589D0 -_08058998: + beq @080589D0 +@08058998: ldr r2, =0x02020630 ldr r1, =0x03005d70 ldr r3, =0x02024064 @@ -154939,11 +154939,11 @@ _08058998: ldr r0, =nullsub_12 + 1 mov r10, r3 cmp r1, r0 - bne _08058A0A - b _08058A0E + bne @08058A0A + b @08058A0E .align 2, 0 .pool -_080589D0: +@080589D0: ldr r3, =0x02020630 ldr r6, =0x03005d70 ldr r2, =0x02024064 @@ -154960,7 +154960,7 @@ _080589D0: ldr r0, =nullsub_12 + 1 mov r10, r2 cmp r3, r0 - bne _08058A0A + bne @08058A0A movs r0, 0x2 eors r4, r0 adds r0, r4, r6 @@ -154971,12 +154971,12 @@ _080589D0: adds r0, r5 ldr r0, [r0] cmp r0, r3 - bne _08058A0A + bne @08058A0A movs r7, 0x1 -_08058A0A: +@08058A0A: cmp r7, 0 - beq _08058B08 -_08058A0E: + beq @08058B08 +@08058A0E: ldr r0, =0x020244d0 mov r9, r0 ldr r0, [r0] @@ -154992,7 +154992,7 @@ _08058A0E: adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _08058B08 + beq @08058B08 movs r1, 0x2 mov r8, r1 mov r1, r8 @@ -155005,7 +155005,7 @@ _08058A0E: adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _08058B08 + beq @08058B08 ldrb r1, [r4] movs r3, 0x7F adds r0, r3, 0 @@ -155069,7 +155069,7 @@ _08058A0E: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _08058AE4 + beq @08058AE4 ldrb r0, [r6] mov r1, r8 eors r1, r0 @@ -155079,7 +155079,7 @@ _08058A0E: muls r0, r5 adds r0, r4 bl sub_805E990 -_08058AE4: +@08058AE4: mov r2, r9 ldr r0, [r2] mov r2, r10 @@ -155098,7 +155098,7 @@ _08058AE4: adds r0, r1 ldr r1, =sub_8058924 + 1 str r1, [r0] -_08058B08: +@08058B08: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -155111,7 +155111,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 @@ -155133,7 +155133,7 @@ sub_8058B40: @ 8058B40 adds r0, r5, 0 ands r0, r1 cmp r0, 0 - bne _08058B80 + bne @08058B80 ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] @@ -155143,7 +155143,7 @@ sub_8058B40: @ 8058B40 adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 -_08058B80: +@08058B80: ldr r1, [r4] ldrb r0, [r7] movs r6, 0x2 @@ -155158,7 +155158,7 @@ _08058B80: adds r0, r5, 0 ands r0, r1 cmp r0, 0 - bne _08058BB2 + bne @08058BB2 ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] @@ -155168,7 +155168,7 @@ _08058B80: adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 -_08058BB2: +@08058BB2: ldr r0, [r4] ldrb r2, [r7] ldr r3, [r0, 0x4] @@ -155181,7 +155181,7 @@ _08058BB2: adds r0, r5, 0 ands r0, r1 cmp r0, 0 - bne _08058C82 + bne @08058C82 adds r1, r6, 0 eors r1, r2 lsls r0, r1, 1 @@ -155192,22 +155192,22 @@ _08058BB2: adds r0, r5, 0 ands r0, r1 cmp r0, 0 - bne _08058C82 + bne @08058C82 ldrb r1, [r4, 0x1] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08058C68 + bne @08058C68 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _08058C38 + beq @08058C38 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - bne _08058C38 + bne @08058C38 ldr r4, =0x03005d70 ldrb r0, [r7] adds r1, r6, 0 @@ -155232,7 +155232,7 @@ _08058BB2: adds r0, r4 ldrb r0, [r0] bl sub_80729D0 -_08058C38: +@08058C38: ldr r5, =0x03005d70 ldr r4, =0x02024064 ldrb r1, [r4] @@ -155254,7 +155254,7 @@ _08058C38: adds r0, r5 ldrb r0, [r0] bl sub_80729D0 -_08058C68: +@08058C68: ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -155268,7 +155268,7 @@ _08058C68: movs r2, 0x80 orrs r1, r2 strb r1, [r0, 0x1] -_08058C82: +@08058C82: ldr r5, =0x020244d0 ldr r0, [r5] ldr r4, =0x02024064 @@ -155282,7 +155282,7 @@ _08058C82: movs r0, 0xC0 ands r0, r1 cmp r0, 0x80 - bne _08058D32 + bne @08058D32 movs r1, 0x2 eors r1, r2 lsls r0, r1, 1 @@ -155293,11 +155293,11 @@ _08058C82: movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _08058D32 + bne @08058D32 bl sub_80A36C8 lsls r0, 24 cmp r0, 0 - bne _08058D32 + bne @08058D32 ldr r0, [r5] ldrb r1, [r4] ldr r2, [r0, 0x4] @@ -155309,25 +155309,25 @@ _08058C82: movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _08058D14 + bne @08058D14 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x42 ands r0, r1 cmp r0, 0x42 - bne _08058D08 + bne @08058D08 ldr r0, =0x03007420 bl m4aMPlayContinue - b _08058D14 + b @08058D14 .align 2, 0 .pool -_08058D08: +@08058D08: ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl -_08058D14: +@08058D14: ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -155343,22 +155343,22 @@ _08058D14: strb r1, [r0, 0x1] movs r0, 0x1 mov r9, r0 -_08058D32: +@08058D32: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _08058D52 + beq @08058D52 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _08058DAC + beq @08058DAC ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _08058DAC -_08058D52: + beq @08058DAC +@08058D52: ldr r2, =0x02020630 ldr r0, =0x03005d7c ldr r1, =0x02024064 @@ -155373,7 +155373,7 @@ _08058D52: ldr r3, [r0] ldr r0, =nullsub_12 + 1 cmp r3, r0 - bne _08058E0A + bne @08058E0A ldr r0, =0x020241e4 adds r0, r4, r0 ldrb r1, [r0] @@ -155383,11 +155383,11 @@ _08058D52: adds r0, r2 ldr r0, [r0] cmp r0, r3 - bne _08058E0A - b _08058E06 + bne @08058E0A + b @08058E06 .align 2, 0 .pool -_08058DAC: +@08058DAC: ldr r2, =0x02020630 ldr r7, =0x03005d7c ldr r0, =0x02024064 @@ -155402,7 +155402,7 @@ _08058DAC: ldr r4, [r0] ldr r0, =nullsub_12 + 1 cmp r4, r0 - bne _08058E0A + bne @08058E0A ldr r6, =0x020241e4 adds r0, r3, r6 ldrb r1, [r0] @@ -155412,7 +155412,7 @@ _08058DAC: adds r0, r2 ldr r5, [r0] cmp r5, r4 - bne _08058E0A + bne @08058E0A movs r0, 0x2 eors r3, r0 adds r0, r3, r7 @@ -155423,7 +155423,7 @@ _08058DAC: adds r0, r2 ldr r4, [r0] cmp r4, r5 - bne _08058E0A + bne @08058E0A adds r0, r3, r6 ldrb r1, [r0] lsls r0, r1, 4 @@ -155432,27 +155432,27 @@ _08058DAC: adds r0, r2 ldr r0, [r0] cmp r0, r4 - bne _08058E0A -_08058E06: + bne @08058E0A +@08058E06: movs r0, 0x1 mov r8, r0 -_08058E0A: +@08058E0A: mov r0, r9 cmp r0, 0 - beq _08058EAA + beq @08058EAA mov r0, r8 cmp r0, 0 - beq _08058EAA + beq @08058EAA bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _08058E48 + beq @08058E48 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - bne _08058E48 + bne @08058E48 ldr r2, =0x03005d7c ldr r0, =0x02024064 ldrb r1, [r0] @@ -155466,7 +155466,7 @@ _08058E0A: ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles -_08058E48: +@08058E48: ldr r1, =0x03005d7c ldr r4, =0x02024064 ldrb r0, [r4] @@ -155515,7 +155515,7 @@ _08058E48: adds r0, r1 ldr r1, =sub_805896C + 1 str r1, [r0] -_08058EAA: +@08058EAA: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -155527,7 +155527,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 @@ -155543,7 +155543,7 @@ sub_8058EDC: @ 8058EDC ldr r4, [r0] ldr r0, =nullsub_12 + 1 cmp r4, r0 - bne _08058F94 + bne @08058F94 ldr r5, =0x020244d0 ldr r0, [r5] ldr r1, [r0, 0x4] @@ -155555,7 +155555,7 @@ sub_8058EDC: @ 8058EDC movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08058F94 + beq @08058F94 ldr r0, =0x020241e4 adds r0, r3, r0 ldrb r1, [r0] @@ -155565,7 +155565,7 @@ sub_8058EDC: @ 8058EDC adds r0, r2 ldr r0, [r0] cmp r0, r4 - bne _08058F94 + bne @08058F94 adds r0, r3, 0 bl sub_805E408 ldr r0, [r5] @@ -155605,19 +155605,19 @@ sub_8058EDC: @ 8058EDC movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08058F88 + beq @08058F88 adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x6 bl move_anim_start_t4 -_08058F88: +@08058F88: ldr r0, =0x03005d60 ldrb r1, [r6] lsls r1, 2 adds r1, r0 ldr r0, =sub_8058FC0 + 1 str r0, [r1] -_08058F94: +@08058F94: pop {r4-r6} pop {r0} bx r0 @@ -155626,7 +155626,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] @@ -155641,11 +155641,11 @@ sub_8058FC0: @ 8058FC0 movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _0805900E + bne @0805900E bl sub_80A36C8 lsls r0, 24 cmp r0, 0 - bne _0805900E + bne @0805900E ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x80 @@ -155662,7 +155662,7 @@ sub_8058FC0: @ 8058FC0 adds r0, r2 bl sub_805E990 bl dp01_tbl1_exec_completed -_0805900E: +@0805900E: pop {r4} pop {r0} bx r0 @@ -155671,7 +155671,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] @@ -155686,7 +155686,7 @@ sub_805902C: @ 805902C movs r0, 0x88 ands r0, r1 cmp r0, 0 - bne _0805905E + bne @0805905E ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] @@ -155696,7 +155696,7 @@ sub_805902C: @ 805902C adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 -_0805905E: +@0805905E: ldr r4, =0x02020630 ldr r0, =0x03005d7c ldrb r2, [r5] @@ -155711,7 +155711,7 @@ _0805905E: ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _080590D2 + bne @080590D2 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -155722,7 +155722,7 @@ _0805905E: movs r0, 0x8 ands r0, r1 cmp r0, 0 - bne _080590D2 + bne @080590D2 adds r0, r3, r4 bl obj_delete_and_free_tiles ldr r4, =0x03005d70 @@ -155751,7 +155751,7 @@ _0805905E: adds r0, r1 ldr r1, =sub_8058EDC + 1 str r1, [r0] -_080590D2: +@080590D2: pop {r4-r6} pop {r0} bx r0 @@ -155760,14 +155760,14 @@ _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 bl sub_80A36C8 lsls r0, 24 cmp r0, 0 - bne _08059122 + bne @08059122 ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x80 @@ -155775,7 +155775,7 @@ c3_0802FDF4: @ 8059100 bl MPlayVolumeControl adds r0, r4, 0 bl remove_task -_08059122: +@08059122: pop {r4} pop {r0} bx r0 @@ -155784,7 +155784,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] @@ -155806,16 +155806,16 @@ bx_t1_healthbar_update: @ 8059130 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _08059178 + beq @08059178 ldrb r0, [r5] adds r0, r6 ldrb r0, [r0] movs r2, 0 bl heathbar_draw_hp - b _08059192 + b @08059192 .align 2, 0 .pool -_08059178: +@08059178: ldr r2, =0x0202406e ldrb r1, [r5] lsls r0, r1, 1 @@ -155827,7 +155827,7 @@ _08059178: adds r0, r2 bl sub_805E990 bl dp01_tbl1_exec_completed -_08059192: +@08059192: pop {r4-r6} pop {r0} bx r0 @@ -155836,21 +155836,21 @@ _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 a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _080591B2 + bne @080591B2 bl dp01_tbl1_exec_completed -_080591B2: +@080591B2: pop {r0} bx r0 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 @@ -155877,15 +155877,15 @@ sub_80591B8: @ 80591B8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080591FE + beq @080591FE ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] cmp r10, r0 - bne _080591FE - b _08059314 -_080591FE: + bne @080591FE + b @08059314 +@080591FE: movs r0, 0x64 mov r1, r10 muls r1, r0 @@ -155928,7 +155928,7 @@ _080591FE: asrs r1, 16 adds r0, r1 cmp r0, r2 - bcc _080592EC + bcc @080592EC adds r0, r6, 0 movs r1, 0x19 mov r2, sp @@ -155954,27 +155954,27 @@ _080591FE: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080592D4 + bne @080592D4 ldr r2, =0x0202406e lsls r0, r7, 1 adds r0, r2 mov r1, r10 ldrh r0, [r0] cmp r1, r0 - beq _080592B2 + beq @080592B2 movs r0, 0x2 eors r7, r0 lsls r0, r7, 1 adds r0, r2 ldrh r0, [r0] cmp r1, r0 - bne _080592D4 -_080592B2: + bne @080592D4 +@080592B2: ldr r0, =sub_8059544 + 1 - b _08059316 + b @08059316 .align 2, 0 .pool -_080592D4: +@080592D4: ldr r0, =0x03005e00 mov r2, r9 lsls r1, r2, 2 @@ -155982,10 +155982,10 @@ _080592D4: lsls r1, 3 adds r1, r0 ldr r0, =sub_805965C + 1 - b _08059318 + b @08059318 .align 2, 0 .pool -_080592EC: +@080592EC: str r0, [sp, 0x4] add r2, sp, 0x4 adds r0, r6, 0 @@ -155999,16 +155999,16 @@ _080592EC: str r1, [r0] mov r0, r9 bl remove_task - b _0805931A + b @0805931A .align 2, 0 .pool -_08059314: +@08059314: ldr r0, =sub_8059330 + 1 -_08059316: +@08059316: mov r1, r8 -_08059318: +@08059318: str r0, [r1] -_0805931A: +@0805931A: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -156022,7 +156022,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 @@ -156115,7 +156115,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 @@ -156134,13 +156134,13 @@ sub_8059400: @ 8059400 movs r2, 0x1C ldrsh r0, [r6, r2] cmp r0, 0xC - bgt _08059430 + bgt @08059430 adds r0, r1, 0x1 strh r0, [r6, 0x1C] - b _0805952C + b @0805952C .align 2, 0 .pool -_08059430: +@08059430: ldrb r0, [r6, 0x8] mov r9, r0 ldrh r2, [r6, 0xA] @@ -156163,7 +156163,7 @@ _08059430: movs r0, 0x1 negs r0, r0 cmp r4, r0 - bne _0805952C + bne @0805952C movs r0, 0x21 bl m4aSongNumStop movs r0, 0x64 @@ -156208,7 +156208,7 @@ _08059430: ldr r0, [sp, 0x4] adds r0, r4 cmp r0, r1 - blt _08059510 + blt @08059510 adds r0, r5, 0 movs r1, 0x19 mov r2, sp @@ -156231,10 +156231,10 @@ _08059430: strb r5, [r4] ldr r0, =sub_8059544 + 1 str r0, [r6] - b _0805952C + b @0805952C .align 2, 0 .pool -_08059510: +@08059510: str r0, [sp, 0x4] add r2, sp, 0x4 adds r0, r5, 0 @@ -156247,7 +156247,7 @@ _08059510: str r1, [r0] mov r0, r8 bl remove_task -_0805952C: +@0805952C: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -156261,7 +156261,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 @@ -156276,7 +156276,7 @@ sub_8059544: @ 8059544 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08059578 + bne @08059578 ldr r1, =0x0202406e movs r0, 0x2 adds r2, r4, 0 @@ -156285,9 +156285,9 @@ sub_8059544: @ 8059544 adds r0, r1 ldrh r0, [r0] cmp r6, r0 - bne _08059578 + bne @08059578 adds r4, r2, 0 -_08059578: +@08059578: adds r0, r4, 0 adds r1, r4, 0 adds r2, r4, 0 @@ -156308,7 +156308,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 @@ -156329,7 +156329,7 @@ sub_80595A4: @ 80595A4 movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _08059646 + bne @08059646 ldrb r4, [r2, 0x8] movs r0, 0x64 adds r1, r4, 0 @@ -156343,7 +156343,7 @@ sub_80595A4: @ 80595A4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08059624 + bne @08059624 ldr r1, =0x0202406e movs r0, 0x2 adds r2, r5, 0 @@ -156352,17 +156352,17 @@ sub_80595A4: @ 80595A4 adds r0, r1 ldrh r0, [r0] cmp r4, r0 - bne _08059624 + bne @08059624 ldr r0, =0x03005d70 adds r0, r2, r0 ldrb r0, [r0] adds r1, r7, 0 movs r2, 0 bl healthbar_draw_field_maybe - b _08059638 + b @08059638 .align 2, 0 .pool -_08059624: +@08059624: ldr r0, =0x03005d70 adds r0, r5, r0 ldrb r0, [r0] @@ -156372,7 +156372,7 @@ _08059624: adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe -_08059638: +@08059638: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -156380,7 +156380,7 @@ _08059638: adds r1, r0 ldr r0, =sub_805965C + 1 str r0, [r1] -_08059646: +@08059646: pop {r4-r7} pop {r0} bx r0 @@ -156389,7 +156389,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 @@ -156422,7 +156422,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 @@ -156440,7 +156440,7 @@ sub_80596A8: @ 80596A8 ldrsh r0, [r0, r3] adds r1, r0 cmp r1, 0xA0 - ble _08059724 + ble @08059724 ldr r1, =0x0202406e lsls r0, r2, 1 adds r0, r1 @@ -156479,7 +156479,7 @@ sub_80596A8: @ 80596A8 ldrb r0, [r0] bl sub_8072984 bl dp01_tbl1_exec_completed -_08059724: +@08059724: pop {r4-r6} pop {r0} bx r0 @@ -156488,7 +156488,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] @@ -156503,7 +156503,7 @@ sub_8059744: @ 8059744 movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _08059798 + bne @08059798 ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] @@ -156527,7 +156527,7 @@ sub_8059744: @ 8059744 ldrb r0, [r0] bl sub_8072984 bl dp01_tbl1_exec_completed -_08059798: +@08059798: pop {r4-r6} pop {r0} bx r0 @@ -156536,28 +156536,28 @@ _08059798: thumb_func_end sub_8059744 thumb_func_start sub_80597B4 -sub_80597B4: @ 80597B4 +sub_80597B4: ; 80597B4 push {lr} movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _080597C6 + bne @080597C6 bl dp01_tbl1_exec_completed -_080597C6: +@080597C6: pop {r0} bx r0 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] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0805980A + bne @0805980A ldr r1, =0x03005d60 ldr r2, =0x02024064 ldrb r0, [r2] @@ -156579,7 +156579,7 @@ sub_80597CC: @ 80597CC bl Window_FreeMemory adds r0, r4, 0 bl sub_81B89AC -_0805980A: +@0805980A: pop {r4} pop {r0} bx r0 @@ -156588,37 +156588,37 @@ _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] ldr r0, =sub_8038420 + 1 cmp r1, r0 - bne _08059898 + bne @08059898 ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08059898 + bne @08059898 ldr r0, =0x0203cee8 ldrb r0, [r0] cmp r0, 0x1 - bne _08059870 + bne @08059870 ldr r0, =0x0203cee9 ldrb r1, [r0] ldr r2, =0x0203cf00 movs r0, 0x1 bl dp01_build_cmdbuf_x22_a_three_bytes - b _0805987A + b @0805987A .align 2, 0 .pool -_08059870: +@08059870: movs r0, 0x1 movs r1, 0x6 movs r2, 0 bl dp01_build_cmdbuf_x22_a_three_bytes -_0805987A: +@0805987A: ldr r1, =0x02023064 ldr r0, =0x02024064 ldrb r0, [r0] @@ -156629,11 +156629,11 @@ _0805987A: movs r0, 0xF ands r0, r1 cmp r0, 0x1 - bne _08059894 + bne @08059894 bl b_link_standby_message -_08059894: +@08059894: bl dp01_tbl1_exec_completed -_08059898: +@08059898: pop {r0} bx r0 .align 2, 0 @@ -156641,14 +156641,14 @@ _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] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080598CC + bne @080598CC ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -156659,7 +156659,7 @@ sub_80598A4: @ 80598A4 bl nullsub_35 bl Window_FreeMemory bl sub_81AABB0 -_080598CC: +@080598CC: pop {r0} bx r0 .align 2, 0 @@ -156667,25 +156667,25 @@ _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] ldr r0, =sub_8038420 + 1 cmp r1, r0 - bne _08059906 + bne @08059906 ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08059906 + bne @08059906 ldr r0, =0x0203ce7c ldrh r1, [r0] movs r0, 0x1 bl dp01_build_cmdbuf_x23_aa_0 bl dp01_tbl1_exec_completed -_08059906: +@08059906: pop {r0} bx r0 .align 2, 0 @@ -156693,12 +156693,12 @@ _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] cmp r0, 0 - beq _08059942 + beq @08059942 ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -156712,10 +156712,10 @@ bx_wait_t1: @ 805991C movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _08059946 -_08059942: + bne @08059946 +@08059942: bl dp01_tbl1_exec_completed -_08059946: +@08059946: pop {r0} bx r0 .align 2, 0 @@ -156723,7 +156723,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 @@ -156738,7 +156738,7 @@ bx_blink_t1: @ 8059958 movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0x20 - bne _080599A4 + bne @080599A4 movs r3, 0 movs r0, 0 strh r0, [r4, 0x30] @@ -156751,15 +156751,15 @@ bx_blink_t1: @ 8059958 ldr r0, =0x020244b9 strb r3, [r0] bl dp01_tbl1_exec_completed - b _080599CE + b @080599CE .align 2, 0 .pool -_080599A4: +@080599A4: ldrh r0, [r4, 0x30] movs r1, 0x3 ands r0, r1 cmp r0, 0 - bne _080599C8 + bne @080599C8 adds r3, r4, 0 adds r3, 0x3E ldrb r2, [r3] @@ -156773,18 +156773,18 @@ _080599A4: ands r0, r2 orrs r0, r1 strb r0, [r3] -_080599C8: +@080599C8: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] -_080599CE: +@080599CE: pop {r4} pop {r0} bx r0 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 @@ -156792,11 +156792,11 @@ sub_80599D4: @ 80599D4 movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _08059A02 + beq @08059A02 ldr r4, =0x03005d74 ldrb r0, [r4] cmp r0, 0 - beq _08059A02 + beq @08059A02 movs r0, 0x5 bl audio_play ldrb r0, [r4] @@ -156805,17 +156805,17 @@ sub_80599D4: @ 80599D4 strb r0, [r4] movs r0, 0 bl sub_8056B74 -_08059A02: +@08059A02: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08059A2C + beq @08059A2C ldr r4, =0x03005d74 ldrb r0, [r4] cmp r0, 0 - bne _08059A2C + bne @08059A2C movs r0, 0x5 bl audio_play ldrb r0, [r4] @@ -156824,14 +156824,14 @@ _08059A02: strb r0, [r4] movs r0, 0x1 bl sub_8056B74 -_08059A2C: +@08059A2C: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r2, 0x1 adds r0, r2, 0 ands r0, r1 cmp r0, 0 - beq _08059A7A + beq @08059A7A str r2, [sp] movs r0, 0x18 movs r1, 0x8 @@ -156843,28 +156843,28 @@ _08059A2C: ldr r0, =0x03005d74 ldrb r0, [r0] cmp r0, 0 - beq _08059A6C + beq @08059A6C movs r0, 0x1 movs r1, 0xE movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb - b _08059A76 + b @08059A76 .align 2, 0 .pool -_08059A6C: +@08059A6C: movs r0, 0x1 movs r1, 0xD movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb -_08059A76: +@08059A76: bl dp01_tbl1_exec_completed -_08059A7A: +@08059A7A: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08059AA0 + beq @08059AA0 movs r0, 0x1 str r0, [sp] movs r0, 0x18 @@ -156875,7 +156875,7 @@ _08059A7A: movs r0, 0x5 bl audio_play bl dp01_tbl1_exec_completed -_08059AA0: +@08059AA0: add sp, 0x4 pop {r4} pop {r0} @@ -156885,7 +156885,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] @@ -156898,7 +156898,7 @@ sub_8059AAC: @ 8059AAC ldr r7, =0x02022e2c adds r4, r1, r3 adds r6, r2, 0 -_08059AC4: +@08059AC4: lsls r0, r5, 24 lsrs r0, 24 bl battle_menu_cursor_related @@ -156916,15 +156916,15 @@ _08059AC4: bl battle_show_message_maybe ldrh r0, [r4] cmp r0, 0 - beq _08059AF4 + beq @08059AF4 ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] -_08059AF4: +@08059AF4: adds r4, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble _08059AC4 + ble @08059AC4 pop {r4-r7} pop {r0} bx r0 @@ -156933,7 +156933,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, =0x085cca6f @@ -156950,7 +156950,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 @@ -156960,7 +156960,7 @@ sub_8059B3C: @ 8059B3C adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - beq _08059B98 + beq @08059B98 bl sub_814FBAC ldrb r1, [r7] lsls r4, r1, 9 @@ -156993,7 +156993,7 @@ sub_8059B3C: @ 8059B3C adds r0, r6, 0 movs r1, 0x9 bl battle_show_message_maybe -_08059B98: +@08059B98: pop {r4-r7} pop {r0} bx r0 @@ -157002,7 +157002,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] @@ -157051,7 +157051,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 @@ -157089,7 +157089,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 @@ -157125,7 +157125,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 @@ -157161,7 +157161,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 @@ -157199,7 +157199,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 + 1 bl set_callback2 @@ -157210,7 +157210,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 + 1 bl set_callback2 @@ -157221,7 +157221,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] @@ -157236,9 +157236,9 @@ sub_8059D60: @ 8059D60 movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _08059D82 + bne @08059D82 bl dp01_tbl1_exec_completed -_08059D82: +@08059D82: pop {r0} bx r0 .align 2, 0 @@ -157246,7 +157246,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] @@ -157261,9 +157261,9 @@ bx_8030B2C: @ 8059D90 movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _08059DB2 + bne @08059DB2 bl dp01_tbl1_exec_completed -_08059DB2: +@08059DB2: pop {r0} bx r0 .align 2, 0 @@ -157271,14 +157271,14 @@ _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] movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _08059DE0 + beq @08059DE0 ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] @@ -157287,7 +157287,7 @@ b_link_standby_message: @ 8059DC0 ldr r0, =0x085cca29 movs r1, 0 bl battle_show_message_maybe -_08059DE0: +@08059DE0: pop {r0} bx r0 .align 2, 0 @@ -157295,7 +157295,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 @@ -157307,7 +157307,7 @@ dp01t_00_1_getattr: @ 8059DF4 adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0 - bne _08059E2C + bne @08059E2C ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 @@ -157315,29 +157315,29 @@ dp01t_00_1_getattr: @ 8059DF4 mov r1, sp bl dp01_getattr_by_ch1_for_player_pokemon_ adds r6, r0, 0 - b _08059E4E + b @08059E4E .align 2, 0 .pool -_08059E2C: +@08059E2C: ldrb r4, [r1] movs r5, 0 -_08059E30: +@08059E30: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _08059E46 + beq @08059E46 lsls r0, r5, 24 lsrs r0, 24 mov r2, sp adds r1, r2, r6 bl dp01_getattr_by_ch1_for_player_pokemon_ adds r6, r0 -_08059E46: +@08059E46: lsrs r4, 1 adds r5, 0x1 cmp r5, 0x5 - ble _08059E30 -_08059E4E: + ble @08059E30 +@08059E4E: lsls r1, r6, 16 lsrs r1, 16 movs r0, 0x1 @@ -157351,7 +157351,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 @@ -157370,79 +157370,79 @@ dp01_getattr_by_ch1_for_player_pokemon_: @ 8059E68 adds r0, r1 ldrb r0, [r0] cmp r0, 0x3B - bls _08059E92 - bl _0805A5FE -_08059E92: + bls @08059E92 + bl @0805A5FE +@08059E92: lsls r0, 2 - ldr r1, =_08059EA8 + ldr r1, =@08059EA8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08059EA8: - .4byte _08059F98 - .4byte _0805A1BC - .4byte _0805A1CC - .4byte _0805A1DC - .4byte _0805A244 - .4byte _0805A244 - .4byte _0805A244 - .4byte _0805A244 - .4byte _0805A260 - .4byte _0805A29C - .4byte _0805A29C - .4byte _0805A29C - .4byte _0805A29C - .4byte _0805A5FE - .4byte _0805A5FE - .4byte _0805A5FE - .4byte _0805A5FE - .4byte _0805A2B8 - .4byte _0805A2C8 - .4byte _0805A2F8 - .4byte _0805A308 - .4byte _0805A318 - .4byte _0805A328 - .4byte _0805A338 - .4byte _0805A348 - .4byte _0805A358 - .4byte _0805A368 - .4byte _0805A378 - .4byte _0805A388 - .4byte _0805A398 - .4byte _0805A3A8 - .4byte _0805A3B8 - .4byte _0805A408 - .4byte _0805A418 - .4byte _0805A428 - .4byte _0805A438 - .4byte _0805A448 - .4byte _0805A458 - .4byte _0805A468 - .4byte _0805A478 - .4byte _0805A488 - .4byte _0805A4BC - .4byte _0805A4CC - .4byte _0805A4DC - .4byte _0805A4EC - .4byte _0805A4FC - .4byte _0805A50C - .4byte _0805A51C - .4byte _0805A52C - .4byte _0805A54C - .4byte _0805A55C - .4byte _0805A56C - .4byte _0805A57C - .4byte _0805A58C - .4byte _0805A59C - .4byte _0805A5AC - .4byte _0805A5BC - .4byte _0805A5CC - .4byte _0805A5DC - .4byte _0805A5EC -_08059F98: +@08059EA8: + .4byte @08059F98 + .4byte @0805A1BC + .4byte @0805A1CC + .4byte @0805A1DC + .4byte @0805A244 + .4byte @0805A244 + .4byte @0805A244 + .4byte @0805A244 + .4byte @0805A260 + .4byte @0805A29C + .4byte @0805A29C + .4byte @0805A29C + .4byte @0805A29C + .4byte @0805A5FE + .4byte @0805A5FE + .4byte @0805A5FE + .4byte @0805A5FE + .4byte @0805A2B8 + .4byte @0805A2C8 + .4byte @0805A2F8 + .4byte @0805A308 + .4byte @0805A318 + .4byte @0805A328 + .4byte @0805A338 + .4byte @0805A348 + .4byte @0805A358 + .4byte @0805A368 + .4byte @0805A378 + .4byte @0805A388 + .4byte @0805A398 + .4byte @0805A3A8 + .4byte @0805A3B8 + .4byte @0805A408 + .4byte @0805A418 + .4byte @0805A428 + .4byte @0805A438 + .4byte @0805A448 + .4byte @0805A458 + .4byte @0805A468 + .4byte @0805A478 + .4byte @0805A488 + .4byte @0805A4BC + .4byte @0805A4CC + .4byte @0805A4DC + .4byte @0805A4EC + .4byte @0805A4FC + .4byte @0805A50C + .4byte @0805A51C + .4byte @0805A52C + .4byte @0805A54C + .4byte @0805A55C + .4byte @0805A56C + .4byte @0805A57C + .4byte @0805A58C + .4byte @0805A59C + .4byte @0805A5AC + .4byte @0805A5BC + .4byte @0805A5CC + .4byte @0805A5DC + .4byte @0805A5EC +@08059F98: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -157479,7 +157479,7 @@ _08059F98: str r0, [sp, 0x88] mov r8, r4 add r4, sp, 0xC -_08059FE4: +@08059FE4: adds r1, r6, 0 adds r1, 0xD mov r0, r8 @@ -157495,7 +157495,7 @@ _08059FE4: adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble _08059FE4 + ble @08059FE4 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -157673,36 +157673,36 @@ _08059FE4: bl pokemon_getattr mov r2, sp movs r6, 0 -_0805A19C: +@0805A19C: adds r0, r7, r6 adds r1, r2, r6 ldrb r1, [r1] strb r1, [r0] adds r6, 0x1 cmp r6, 0x57 - bls _0805A19C - b _0805A5FE + bls @0805A19C + b @0805A5FE .align 2, 0 .pool -_0805A1BC: +@0805A1BC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB - b _0805A536 + b @0805A536 .align 2, 0 .pool -_0805A1CC: +@0805A1CC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC - b _0805A536 + b @0805A536 .align 2, 0 .pool -_0805A1DC: +@0805A1DC: movs r6, 0 add r2, sp, 0x58 mov r9, r2 @@ -157714,7 +157714,7 @@ _0805A1DC: ldr r0, =0x020244ec adds r4, r1, r0 mov r8, r9 -_0805A1F2: +@0805A1F2: adds r1, r6, 0 adds r1, 0xD adds r0, r4, 0 @@ -157732,7 +157732,7 @@ _0805A1F2: add r8, r0 adds r6, 0x1 cmp r6, 0x3 - ble _0805A1F2 + ble @0805A1F2 movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -157743,18 +157743,18 @@ _0805A1F2: strb r0, [r1, 0xC] mov r2, r9 movs r6, 0 -_0805A230: +@0805A230: adds r0, r7, r6 adds r1, r2, r6 ldrb r1, [r1] strb r1, [r0] adds r6, 0x1 cmp r6, 0xF - bls _0805A230 - b _0805A5FE + bls @0805A230 + b @0805A5FE .align 2, 0 .pool -_0805A244: +@0805A244: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -157765,17 +157765,17 @@ _0805A244: adds r1, r2 ldrb r1, [r1] adds r1, 0x9 - b _0805A536 + b @0805A536 .align 2, 0 .pool -_0805A260: +@0805A260: movs r6, 0 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 ldr r2, =0x020244ec mov r8, r2 -_0805A26C: +@0805A26C: adds r1, r6, 0 adds r1, 0x11 mov r2, r8 @@ -157785,7 +157785,7 @@ _0805A26C: strb r0, [r1] adds r6, 0x1 cmp r6, 0x3 - ble _0805A26C + ble @0805A26C movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -157795,10 +157795,10 @@ _0805A26C: adds r1, r7, r6 strb r0, [r1] adds r6, 0x1 - b _0805A5FE + b @0805A5FE .align 2, 0 .pool -_0805A29C: +@0805A29C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -157809,25 +157809,25 @@ _0805A29C: adds r1, r2 ldrb r1, [r1] adds r1, 0x8 - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A2B8: +@0805A2B8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1 - b _0805A2D2 + b @0805A2D2 .align 2, 0 .pool -_0805A2C8: +@0805A2C8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x19 -_0805A2D2: +@0805A2D2: bl pokemon_getattr adds r1, r0, 0 strb r1, [r7] @@ -157842,118 +157842,118 @@ _0805A2D2: lsrs r0, 16 strb r0, [r7, 0x2] movs r6, 0x3 - b _0805A5FE + b @0805A5FE .align 2, 0 .pool -_0805A2F8: +@0805A2F8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1A - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A308: +@0805A308: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1B - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A318: +@0805A318: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1C - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A328: +@0805A328: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1D - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A338: +@0805A338: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1E - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A348: +@0805A348: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1F - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A358: +@0805A358: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x20 - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A368: +@0805A368: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x22 - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A378: +@0805A378: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x23 - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A388: +@0805A388: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x24 - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A398: +@0805A398: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x25 - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A3A8: +@0805A3A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x26 - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A3B8: +@0805A3B8: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -157984,88 +157984,88 @@ _0805A3B8: bl pokemon_getattr strb r0, [r7, 0x5] movs r6, 0x6 - b _0805A5FE + b @0805A5FE .align 2, 0 .pool -_0805A408: +@0805A408: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x27 - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A418: +@0805A418: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x28 - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A428: +@0805A428: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x29 - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A438: +@0805A438: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2A - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A448: +@0805A448: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2B - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A458: +@0805A458: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2C - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A468: +@0805A468: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0 - b _0805A492 + b @0805A492 .align 2, 0 .pool -_0805A478: +@0805A478: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x9 - b _0805A536 + b @0805A536 .align 2, 0 .pool -_0805A488: +@0805A488: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x37 -_0805A492: +@0805A492: bl pokemon_getattr adds r1, r0, 0 strb r1, [r7] @@ -158082,79 +158082,79 @@ _0805A492: lsrs r0, r1, 24 strb r0, [r7, 0x3] movs r6, 0x4 - b _0805A5FE + b @0805A5FE .align 2, 0 .pool -_0805A4BC: +@0805A4BC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x38 - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A4CC: +@0805A4CC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x39 - b _0805A536 + b @0805A536 .align 2, 0 .pool -_0805A4DC: +@0805A4DC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3A - b _0805A536 + b @0805A536 .align 2, 0 .pool -_0805A4EC: +@0805A4EC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3B - b _0805A536 + b @0805A536 .align 2, 0 .pool -_0805A4FC: +@0805A4FC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3C - b _0805A536 + b @0805A536 .align 2, 0 .pool -_0805A50C: +@0805A50C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3D - b _0805A536 + b @0805A536 .align 2, 0 .pool -_0805A51C: +@0805A51C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3E - b _0805A536 + b @0805A536 .align 2, 0 .pool -_0805A52C: +@0805A52C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3F -_0805A536: +@0805A536: bl pokemon_getattr lsls r0, 16 lsrs r0, 16 @@ -158162,110 +158162,110 @@ _0805A536: lsrs r0, 8 strb r0, [r7, 0x1] movs r6, 0x2 - b _0805A5FE + b @0805A5FE .align 2, 0 .pool -_0805A54C: +@0805A54C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x16 - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A55C: +@0805A55C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x17 - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A56C: +@0805A56C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x18 - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A57C: +@0805A57C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x21 - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A58C: +@0805A58C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2F - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A59C: +@0805A59C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x30 - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A5AC: +@0805A5AC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x32 - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A5BC: +@0805A5BC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x33 - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A5CC: +@0805A5CC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x34 - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A5DC: +@0805A5DC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x35 - b _0805A5F6 + b @0805A5F6 .align 2, 0 .pool -_0805A5EC: +@0805A5EC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x36 -_0805A5F6: +@0805A5F6: bl pokemon_getattr strb r0, [r7] movs r6, 0x1 -_0805A5FE: +@0805A5FE: adds r0, r6, 0 add sp, 0x90 pop {r3-r5} @@ -158280,7 +158280,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 @@ -158309,9 +158309,9 @@ sub_805A614: @ 805A614 mov r12, r3 ldrb r1, [r1] cmp r2, r1 - bcs _0805A66A + bcs @0805A66A adds r3, r0, 0 -_0805A650: +@0805A650: adds r1, r4, r2 adds r0, r6, r2 ldrb r0, [r0] @@ -158324,8 +158324,8 @@ _0805A650: adds r0, r3 ldrb r0, [r0] cmp r2, r0 - bcc _0805A650 -_0805A66A: + bcc @0805A650 +@0805A66A: ldrb r0, [r7] lsls r0, 9 mov r1, r12 @@ -158345,7 +158345,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 @@ -158355,33 +158355,33 @@ dp01t_02_1_setattr: @ 805A69C adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0 - bne _0805A6CC + bne @0805A6CC ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] bl dp01_setattr_by_ch1_for_player_pokemon - b _0805A6EA + b @0805A6EA .align 2, 0 .pool -_0805A6CC: +@0805A6CC: ldrb r4, [r1] movs r5, 0 -_0805A6D0: +@0805A6D0: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _0805A6DE + beq @0805A6DE adds r0, r5, 0 bl dp01_setattr_by_ch1_for_player_pokemon -_0805A6DE: +@0805A6DE: lsrs r4, 1 adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls _0805A6D0 -_0805A6EA: + bls @0805A6D0 +@0805A6EA: bl dp01_tbl1_exec_completed pop {r4,r5} pop {r0} @@ -158389,7 +158389,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 @@ -158409,79 +158409,79 @@ dp01_setattr_by_ch1_for_player_pokemon: @ 805A6F4 ldrb r0, [r0] adds r7, r2, 0 cmp r0, 0x3B - bls _0805A720 - bl _0805B0BA -_0805A720: + bls @0805A720 + bl @0805B0BA +@0805A720: lsls r0, 2 - ldr r1, =_0805A738 + ldr r1, =@0805A738 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0805A738: - .4byte _0805A828 - .4byte _0805A9C0 - .4byte _0805A9E0 - .4byte _0805AA00 - .4byte _0805AA58 - .4byte _0805AA58 - .4byte _0805AA58 - .4byte _0805AA58 - .4byte _0805AA80 - .4byte _0805AAE4 - .4byte _0805AAE4 - .4byte _0805AAE4 - .4byte _0805AAE4 - .4byte _0805B0BA - .4byte _0805B0BA - .4byte _0805B0BA - .4byte _0805B0BA - .4byte _0805AB14 - .4byte _0805AB34 - .4byte _0805AB54 - .4byte _0805AB74 - .4byte _0805AB94 - .4byte _0805ABB4 - .4byte _0805ABD4 - .4byte _0805ABF4 - .4byte _0805AC14 - .4byte _0805AC34 - .4byte _0805AC54 - .4byte _0805AC74 - .4byte _0805AC94 - .4byte _0805ACB4 - .4byte _0805ACD4 - .4byte _0805AD44 - .4byte _0805AD64 - .4byte _0805AD84 - .4byte _0805ADA4 - .4byte _0805ADC4 - .4byte _0805ADE4 - .4byte _0805AE04 - .4byte _0805AE24 - .4byte _0805AE44 - .4byte _0805AE64 - .4byte _0805AE84 - .4byte _0805AEA4 - .4byte _0805AEC4 - .4byte _0805AEE4 - .4byte _0805AF04 - .4byte _0805AF24 - .4byte _0805AF44 - .4byte _0805AF64 - .4byte _0805AF84 - .4byte _0805AFA4 - .4byte _0805AFC4 - .4byte _0805AFE4 - .4byte _0805B004 - .4byte _0805B024 - .4byte _0805B044 - .4byte _0805B064 - .4byte _0805B084 - .4byte _0805B0A4 -_0805A828: +@0805A738: + .4byte @0805A828 + .4byte @0805A9C0 + .4byte @0805A9E0 + .4byte @0805AA00 + .4byte @0805AA58 + .4byte @0805AA58 + .4byte @0805AA58 + .4byte @0805AA58 + .4byte @0805AA80 + .4byte @0805AAE4 + .4byte @0805AAE4 + .4byte @0805AAE4 + .4byte @0805AAE4 + .4byte @0805B0BA + .4byte @0805B0BA + .4byte @0805B0BA + .4byte @0805B0BA + .4byte @0805AB14 + .4byte @0805AB34 + .4byte @0805AB54 + .4byte @0805AB74 + .4byte @0805AB94 + .4byte @0805ABB4 + .4byte @0805ABD4 + .4byte @0805ABF4 + .4byte @0805AC14 + .4byte @0805AC34 + .4byte @0805AC54 + .4byte @0805AC74 + .4byte @0805AC94 + .4byte @0805ACB4 + .4byte @0805ACD4 + .4byte @0805AD44 + .4byte @0805AD64 + .4byte @0805AD84 + .4byte @0805ADA4 + .4byte @0805ADC4 + .4byte @0805ADE4 + .4byte @0805AE04 + .4byte @0805AE24 + .4byte @0805AE44 + .4byte @0805AE64 + .4byte @0805AE84 + .4byte @0805AEA4 + .4byte @0805AEC4 + .4byte @0805AEE4 + .4byte @0805AF04 + .4byte @0805AF24 + .4byte @0805AF44 + .4byte @0805AF64 + .4byte @0805AF84 + .4byte @0805AFA4 + .4byte @0805AFC4 + .4byte @0805AFE4 + .4byte @0805B004 + .4byte @0805B024 + .4byte @0805B044 + .4byte @0805B064 + .4byte @0805B084 + .4byte @0805B0A4 +@0805A828: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -158531,7 +158531,7 @@ _0805A828: adds r7, 0x24 adds r4, r6, 0 adds r4, 0xC -_0805A88E: +@0805A88E: mov r1, r8 adds r1, 0xD mov r0, r9 @@ -158548,7 +158548,7 @@ _0805A88E: add r8, r0 mov r0, r8 cmp r0, 0x3 - ble _0805A88E + ble @0805A88E movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -158660,10 +158660,10 @@ _0805A88E: movs r1, 0x3F ldr r2, [sp, 0x14] bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805A9C0: +@0805A9C0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -158674,10 +158674,10 @@ _0805A9C0: adds r2, r7 movs r1, 0xB bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805A9E0: +@0805A9E0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -158688,10 +158688,10 @@ _0805A9E0: adds r2, r7 movs r1, 0xC bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AA00: +@0805AA00: movs r0, 0 mov r8, r0 movs r0, 0xC @@ -158705,7 +158705,7 @@ _0805AA00: adds r6, r3, 0 adds r6, 0x8 adds r4, r3, 0 -_0805AA1A: +@0805AA1A: mov r1, r8 adds r1, 0xD adds r0, r7, 0 @@ -158722,7 +158722,7 @@ _0805AA1A: add r8, r0 mov r0, r8 cmp r0, 0x3 - ble _0805AA1A + ble @0805AA1A movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -158730,10 +158730,10 @@ _0805AA1A: movs r1, 0x15 mov r2, r9 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AA58: +@0805AA58: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -158746,10 +158746,10 @@ _0805AA58: adds r1, r2, r1 ldrb r1, [r1] adds r1, 0x9 - b _0805AAFC + b @0805AAFC .align 2, 0 .pool -_0805AA80: +@0805AA80: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -158790,10 +158790,10 @@ _0805AA80: adds r0, r4, 0 movs r1, 0x15 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AAE4: +@0805AAE4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -158806,14 +158806,14 @@ _0805AAE4: adds r1, r2, r1 ldrb r1, [r1] adds r1, 0x8 -_0805AAFC: +@0805AAFC: adds r3, 0x3 adds r2, r3 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AB14: +@0805AB14: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -158824,10 +158824,10 @@ _0805AB14: adds r2, r7 movs r1, 0x1 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AB34: +@0805AB34: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -158838,10 +158838,10 @@ _0805AB34: adds r2, r7 movs r1, 0x19 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AB54: +@0805AB54: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -158852,10 +158852,10 @@ _0805AB54: adds r2, r7 movs r1, 0x1A bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AB74: +@0805AB74: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -158866,10 +158866,10 @@ _0805AB74: adds r2, r7 movs r1, 0x1B bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AB94: +@0805AB94: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -158880,10 +158880,10 @@ _0805AB94: adds r2, r7 movs r1, 0x1C bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805ABB4: +@0805ABB4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -158894,10 +158894,10 @@ _0805ABB4: adds r2, r7 movs r1, 0x1D bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805ABD4: +@0805ABD4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -158908,10 +158908,10 @@ _0805ABD4: adds r2, r7 movs r1, 0x1E bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805ABF4: +@0805ABF4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -158922,10 +158922,10 @@ _0805ABF4: adds r2, r7 movs r1, 0x1F bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AC14: +@0805AC14: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -158936,10 +158936,10 @@ _0805AC14: adds r2, r7 movs r1, 0x20 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AC34: +@0805AC34: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -158950,10 +158950,10 @@ _0805AC34: adds r2, r7 movs r1, 0x22 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AC54: +@0805AC54: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -158964,10 +158964,10 @@ _0805AC54: adds r2, r7 movs r1, 0x23 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AC74: +@0805AC74: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -158978,10 +158978,10 @@ _0805AC74: adds r2, r7 movs r1, 0x24 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AC94: +@0805AC94: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -158992,10 +158992,10 @@ _0805AC94: adds r2, r7 movs r1, 0x25 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805ACB4: +@0805ACB4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159006,10 +159006,10 @@ _0805ACB4: adds r2, r7 movs r1, 0x26 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805ACD4: +@0805ACD4: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -159055,10 +159055,10 @@ _0805ACD4: adds r0, r7, 0x5 adds r2, r0 adds r0, r4, 0 - b _0805ADF4 + b @0805ADF4 .align 2, 0 .pool -_0805AD44: +@0805AD44: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159069,10 +159069,10 @@ _0805AD44: adds r2, r7 movs r1, 0x27 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AD64: +@0805AD64: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159083,10 +159083,10 @@ _0805AD64: adds r2, r7 movs r1, 0x28 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AD84: +@0805AD84: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159097,10 +159097,10 @@ _0805AD84: adds r2, r7 movs r1, 0x29 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805ADA4: +@0805ADA4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159111,10 +159111,10 @@ _0805ADA4: adds r2, r7 movs r1, 0x2A bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805ADC4: +@0805ADC4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159125,10 +159125,10 @@ _0805ADC4: adds r2, r7 movs r1, 0x2B bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805ADE4: +@0805ADE4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159137,13 +159137,13 @@ _0805ADE4: ldrb r2, [r1] lsls r2, 9 adds r2, r7 -_0805ADF4: +@0805ADF4: movs r1, 0x2C bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AE04: +@0805AE04: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159154,10 +159154,10 @@ _0805AE04: adds r2, r7 movs r1, 0 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AE24: +@0805AE24: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159168,10 +159168,10 @@ _0805AE24: adds r2, r7 movs r1, 0x9 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AE44: +@0805AE44: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159182,10 +159182,10 @@ _0805AE44: adds r2, r7 movs r1, 0x37 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AE64: +@0805AE64: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159196,10 +159196,10 @@ _0805AE64: adds r2, r7 movs r1, 0x38 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AE84: +@0805AE84: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159210,10 +159210,10 @@ _0805AE84: adds r2, r7 movs r1, 0x39 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AEA4: +@0805AEA4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159224,10 +159224,10 @@ _0805AEA4: adds r2, r7 movs r1, 0x3A bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AEC4: +@0805AEC4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159238,10 +159238,10 @@ _0805AEC4: adds r2, r7 movs r1, 0x3B bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AEE4: +@0805AEE4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159252,10 +159252,10 @@ _0805AEE4: adds r2, r7 movs r1, 0x3C bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AF04: +@0805AF04: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159266,10 +159266,10 @@ _0805AF04: adds r2, r7 movs r1, 0x3D bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AF24: +@0805AF24: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159280,10 +159280,10 @@ _0805AF24: adds r2, r7 movs r1, 0x3E bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AF44: +@0805AF44: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159294,10 +159294,10 @@ _0805AF44: adds r2, r7 movs r1, 0x3F bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AF64: +@0805AF64: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159308,10 +159308,10 @@ _0805AF64: adds r2, r7 movs r1, 0x16 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AF84: +@0805AF84: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159322,10 +159322,10 @@ _0805AF84: adds r2, r7 movs r1, 0x17 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AFA4: +@0805AFA4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159336,10 +159336,10 @@ _0805AFA4: adds r2, r7 movs r1, 0x18 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AFC4: +@0805AFC4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159350,10 +159350,10 @@ _0805AFC4: adds r2, r7 movs r1, 0x21 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805AFE4: +@0805AFE4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159364,10 +159364,10 @@ _0805AFE4: adds r2, r7 movs r1, 0x2F bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805B004: +@0805B004: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159378,10 +159378,10 @@ _0805B004: adds r2, r7 movs r1, 0x30 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805B024: +@0805B024: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159392,10 +159392,10 @@ _0805B024: adds r2, r7 movs r1, 0x32 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805B044: +@0805B044: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159406,10 +159406,10 @@ _0805B044: adds r2, r7 movs r1, 0x33 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805B064: +@0805B064: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159420,10 +159420,10 @@ _0805B064: adds r2, r7 movs r1, 0x34 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805B084: +@0805B084: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159434,10 +159434,10 @@ _0805B084: adds r2, r7 movs r1, 0x35 bl pokemon_setattr - b _0805B0BA + b @0805B0BA .align 2, 0 .pool -_0805B0A4: +@0805B0A4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -159448,7 +159448,7 @@ _0805B0A4: adds r2, r7 movs r1, 0x36 bl pokemon_setattr -_0805B0BA: +@0805B0BA: ldr r2, =0x0202406e ldr r0, =0x02024064 ldrb r1, [r0] @@ -159473,7 +159473,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 @@ -159497,11 +159497,11 @@ sub_805B0F0: @ 805B0F0 adds r2, r0 ldrb r2, [r2] cmp r3, r2 - bcs _0805B148 + bcs @0805B148 adds r6, r4, 0 adds r2, r7, 0 adds r4, r0, 0 -_0805B126: +@0805B126: adds r1, r5, r3 ldrb r0, [r2] lsls r0, 9 @@ -159518,8 +159518,8 @@ _0805B126: adds r0, r4 ldrb r0, [r0] cmp r3, r0 - bcc _0805B126 -_0805B148: + bcc @0805B126 +@0805B148: bl dp01_tbl1_exec_completed pop {r4-r7} pop {r0} @@ -159529,7 +159529,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 @@ -159571,7 +159571,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] @@ -159627,7 +159627,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 @@ -159791,7 +159791,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 @@ -159801,7 +159801,7 @@ sub_805B3D4: @ 805B3D4 adds r0, r1 ldrb r3, [r0] cmp r3, 0 - bne _0805B41C + bne @0805B41C ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -159816,10 +159816,10 @@ sub_805B3D4: @ 805B3D4 adds r0, r1 ldr r1, =sub_805B464 + 1 str r1, [r0] - b _0805B452 + b @0805B452 .align 2, 0 .pool -_0805B41C: +@0805B41C: ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] @@ -159843,7 +159843,7 @@ _0805B41C: ldrb r0, [r0] bl sub_8072984 bl dp01_tbl1_exec_completed -_0805B452: +@0805B452: pop {r4-r6} pop {r0} bx r0 @@ -159852,7 +159852,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] @@ -159865,13 +159865,13 @@ sub_805B464: @ 805B464 adds r3, r0, r1 ldrb r0, [r3, 0x4] cmp r0, 0 - beq _0805B48C + beq @0805B48C cmp r0, 0x1 - beq _0805B4BA - b _0805B4E2 + beq @0805B4BA + b @0805B4E2 .align 2, 0 .pool -_0805B48C: +@0805B48C: ldr r1, [r4] lsls r0, r2, 2 adds r0, r1 @@ -159879,12 +159879,12 @@ _0805B48C: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0805B4A6 + beq @0805B4A6 adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -_0805B4A6: +@0805B4A6: ldr r0, [r6] ldrb r1, [r5] ldr r2, [r0, 0x4] @@ -159894,15 +159894,15 @@ _0805B4A6: adds r0, r2 movs r1, 0x1 strb r1, [r0, 0x4] - b _0805B4E2 -_0805B4BA: + b @0805B4E2 +@0805B4BA: ldrb r1, [r3] movs r0, 0x40 ands r0, r1 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _0805B4E2 + bne @0805B4E2 strb r0, [r3, 0x4] ldrb r2, [r5] adds r0, r2, 0 @@ -159915,7 +159915,7 @@ _0805B4BA: adds r0, r1 ldr r1, =sub_8059744 + 1 str r1, [r0] -_0805B4E2: +@0805B4E2: pop {r4-r6} pop {r0} bx r0 @@ -159924,7 +159924,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 @@ -159934,7 +159934,7 @@ sub_805B4F0: @ 805B4F0 movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _0805B5B4 + beq @0805B5B4 bl link_get_multiplayer_id ldr r5, =0x020229e8 lsls r0, 24 @@ -159946,7 +159946,7 @@ sub_805B4F0: @ 805B4F0 movs r4, 0xFF ldrb r0, [r1] cmp r0, 0x4 - beq _0805B538 + beq @0805B538 bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 @@ -159958,8 +159958,8 @@ sub_805B4F0: @ 805B4F0 adds r0, r4, 0 ands r0, r1 cmp r0, 0x5 - bne _0805B558 -_0805B538: + bne @0805B558 +@0805B538: bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 @@ -159969,10 +159969,10 @@ _0805B538: adds r1, r5 ldrb r0, [r1, 0x13] adds r4, r0, 0x2 - b _0805B5BA + b @0805B5BA .align 2, 0 .pool -_0805B558: +@0805B558: bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 @@ -159984,7 +159984,7 @@ _0805B558: adds r0, r4, 0 ands r0, r1 cmp r0, 0x2 - beq _0805B58A + beq @0805B58A bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 @@ -159995,8 +159995,8 @@ _0805B558: ldrh r0, [r1] ands r4, r0 cmp r4, 0x1 - bne _0805B5A0 -_0805B58A: + bne @0805B5A0 +@0805B58A: bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 @@ -160006,8 +160006,8 @@ _0805B58A: adds r1, r5 ldrb r0, [r1, 0x13] adds r4, r0, 0x4 - b _0805B5BA -_0805B5A0: + b @0805B5BA +@0805B5A0: bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 @@ -160016,19 +160016,19 @@ _0805B5A0: lsls r1, 2 adds r1, r5 ldrb r4, [r1, 0x13] - b _0805B5BA -_0805B5B4: + b @0805B5BA +@0805B5B4: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r4, [r0, 0x8] -_0805B5BA: +@0805B5BA: ldr r0, =0x02022fec ldr r1, [r0] movs r2, 0x40 ands r1, r2 adds r5, r0, 0 cmp r1, 0 - beq _0805B63C + beq @0805B63C ldr r0, =0x02024064 ldrb r0, [r0] bl battle_get_per_side_status @@ -160037,28 +160037,28 @@ _0805B5BA: movs r0, 0x20 mov r9, r0 cmp r1, 0 - beq _0805B5E0 + beq @0805B5E0 movs r1, 0x5A mov r9, r1 -_0805B5E0: +@0805B5E0: ldr r0, [r5] movs r1, 0x80 lsls r1, 15 ands r0, r1 cmp r0, 0 - beq _0805B618 + beq @0805B618 ldr r0, =0x02038bce ldrh r1, [r0] ldr r0, =0x00000c03 cmp r1, r0 - beq _0805B618 + beq @0805B618 movs r0, 0x5A mov r9, r0 ldr r1, =0x083054e0 - b _0805B642 + b @0805B642 .align 2, 0 .pool -_0805B618: +@0805B618: ldr r1, =0x08305d2c lsls r0, r4, 2 adds r0, r1 @@ -160071,14 +160071,14 @@ _0805B618: adds r0, r1 lsrs r7, r0, 16 ldr r5, =0x02022fec - b _0805B656 + b @0805B656 .align 2, 0 .pool -_0805B63C: +@0805B63C: movs r0, 0x50 mov r9, r0 ldr r1, =0x08305d2c -_0805B642: +@0805B642: lsls r0, r4, 2 adds r0, r1 ldrb r1, [r0] @@ -160089,22 +160089,22 @@ _0805B642: lsls r1, 15 adds r0, r1 lsrs r7, r0, 16 -_0805B656: +@0805B656: ldr r0, [r5] movs r1, 0x80 lsls r1, 15 ands r0, r1 cmp r0, 0 - bne _0805B664 - b _0805B794 -_0805B664: + bne @0805B664 + b @0805B794 +@0805B664: ldr r0, =0x02038bce ldrh r1, [r0] ldr r0, =0x00000c03 cmp r1, r0 - bne _0805B670 - b _0805B794 -_0805B670: + bne @0805B670 + b @0805B794 +@0805B670: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] @@ -160221,10 +160221,10 @@ _0805B670: movs r2, 0x1 orrs r1, r2 strb r1, [r0] - b _0805B82A + b @0805B82A .align 2, 0 .pool -_0805B794: +@0805B794: ldr r5, =0x02024064 ldrb r1, [r5] adds r0, r4, 0 @@ -160295,7 +160295,7 @@ _0805B794: adds r0, r4 ldr r1, =sub_805D7AC + 1 str r1, [r0] -_0805B82A: +@0805B82A: ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -160314,14 +160314,14 @@ _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] movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _0805B920 + beq @0805B920 bl link_get_multiplayer_id ldr r5, =0x020229e8 lsls r0, 24 @@ -160333,7 +160333,7 @@ dp01t_08_1_8032428: @ 805B864 movs r4, 0xFF ldrb r0, [r1] cmp r0, 0x4 - beq _0805B8A6 + beq @0805B8A6 bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 @@ -160345,8 +160345,8 @@ dp01t_08_1_8032428: @ 805B864 adds r0, r4, 0 ands r0, r1 cmp r0, 0x5 - bne _0805B8C4 -_0805B8A6: + bne @0805B8C4 +@0805B8A6: bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 @@ -160356,10 +160356,10 @@ _0805B8A6: adds r1, r5 ldrb r0, [r1, 0x13] adds r4, r0, 0x2 - b _0805B926 + b @0805B926 .align 2, 0 .pool -_0805B8C4: +@0805B8C4: bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 @@ -160371,7 +160371,7 @@ _0805B8C4: adds r0, r4, 0 ands r0, r1 cmp r0, 0x2 - beq _0805B8F6 + beq @0805B8F6 bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 @@ -160382,8 +160382,8 @@ _0805B8C4: ldrh r0, [r1] ands r4, r0 cmp r4, 0x1 - bne _0805B90C -_0805B8F6: + bne @0805B90C +@0805B8F6: bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 @@ -160393,8 +160393,8 @@ _0805B8F6: adds r1, r5 ldrb r0, [r1, 0x13] adds r4, r0, 0x4 - b _0805B926 -_0805B90C: + b @0805B926 +@0805B90C: bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 @@ -160403,12 +160403,12 @@ _0805B90C: lsls r1, 2 adds r1, r5 ldrb r4, [r1, 0x13] - b _0805B926 -_0805B920: + b @0805B926 +@0805B920: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r4, [r0, 0x8] -_0805B926: +@0805B926: ldr r5, =0x02024064 ldrb r1, [r5] adds r0, r4, 0 @@ -160495,7 +160495,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 @@ -160578,7 +160578,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] @@ -160591,7 +160591,7 @@ sub_805BAB8: @ 805BAB8 adds r3, r1, r0 ldrb r0, [r3, 0x4] cmp r0, 0 - bne _0805BB0C + bne @0805BB0C ldr r1, [r4] lsls r0, r2, 2 adds r0, r1 @@ -160599,12 +160599,12 @@ sub_805BAB8: @ 805BAB8 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0805BAEC + beq @0805BAEC adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -_0805BAEC: +@0805BAEC: ldr r0, [r6] ldrb r1, [r5] ldr r2, [r0, 0x4] @@ -160615,17 +160615,17 @@ _0805BAEC: ldrb r1, [r0, 0x4] adds r1, 0x1 strb r1, [r0, 0x4] - b _0805BB82 + b @0805BB82 .align 2, 0 .pool -_0805BB0C: +@0805BB0C: ldrb r1, [r3] movs r0, 0x40 ands r0, r1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _0805BB82 + bne @0805BB82 strb r4, [r3, 0x4] ldr r2, =0x0202406e ldrb r1, [r5] @@ -160676,7 +160676,7 @@ _0805BB0C: adds r0, r1 ldr r1, =sub_80596A8 + 1 str r1, [r0] -_0805BB82: +@0805BB82: pop {r4-r6} pop {r0} bx r0 @@ -160685,7 +160685,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 @@ -160703,7 +160703,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] @@ -160738,7 +160738,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 @@ -160778,7 +160778,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 @@ -160788,14 +160788,14 @@ sub_805BC78: @ 805BC78 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _0805BC96 -_0805BC8C: + beq @0805BC96 +@0805BC8C: subs r0, 0x1 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _0805BC8C -_0805BC96: + bne @0805BC8C +@0805BC96: bl dp01_tbl1_exec_completed pop {r0} bx r0 @@ -160804,7 +160804,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} @@ -160813,9 +160813,9 @@ dp01t_0F_1_move_anim: @ 805BCA8 bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - beq _0805BCBE - b _0805BDE4 -_0805BCBE: + beq @0805BCBE + b @0805BDE4 +@0805BCBE: ldr r0, =0x02023064 mov r12, r0 ldrb r1, [r5] @@ -160919,12 +160919,12 @@ _0805BCBE: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq _0805BDBC + beq @0805BDBC bl dp01_tbl1_exec_completed - b _0805BDE4 + b @0805BDE4 .align 2, 0 .pool -_0805BDBC: +@0805BDBC: ldr r0, =0x020244d0 ldr r0, [r0] ldrb r1, [r5] @@ -160944,7 +160944,7 @@ _0805BDBC: ldr r2, [r7] adds r0, r6, 0 bl sub_817E0FC -_0805BDE4: +@0805BDE4: pop {r3} mov r8, r3 pop {r4-r7} @@ -160955,7 +160955,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 @@ -160988,21 +160988,21 @@ bx_move_anim_1: @ 805BDFC adds r0, r1 ldrb r2, [r0, 0x4] cmp r2, 0x1 - beq _0805BE94 + beq @0805BE94 cmp r2, 0x1 - bgt _0805BE54 + bgt @0805BE54 cmp r2, 0 - beq _0805BE5E - b _0805BF70 + beq @0805BE5E + b @0805BF70 .align 2, 0 .pool -_0805BE54: +@0805BE54: cmp r2, 0x2 - beq _0805BEBE + beq @0805BEBE cmp r2, 0x3 - beq _0805BF34 - b _0805BF70 -_0805BE5E: + beq @0805BF34 + b @0805BF70 +@0805BE5E: ldr r1, [r5] lsls r0, r3, 2 adds r1, r0, r1 @@ -161010,7 +161010,7 @@ _0805BE5E: movs r0, 0xC ands r0, r2 cmp r0, 0x4 - bne _0805BE80 + bne @0805BE80 movs r0, 0x8 orrs r0, r2 strb r0, [r1] @@ -161019,7 +161019,7 @@ _0805BE5E: adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -_0805BE80: +@0805BE80: ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -161029,13 +161029,13 @@ _0805BE80: adds r0, r2 movs r1, 0x1 strb r1, [r0, 0x4] - b _0805BF70 -_0805BE94: + b @0805BF70 +@0805BE94: ldrb r1, [r0] movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _0805BF70 + bne @0805BF70 movs r0, 0 bl sub_805EB9C adds r0, r4, 0 @@ -161049,15 +161049,15 @@ _0805BE94: adds r0, r2 movs r1, 0x2 strb r1, [r0, 0x4] - b _0805BF70 -_0805BEBE: + b @0805BF70 +@0805BEBE: ldr r0, =0x020383f8 ldr r0, [r0] bl _call_via_r0 ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 - bne _0805BF70 + bne @0805BF70 movs r0, 0x1 bl sub_805EB9C ldr r0, [r7] @@ -161069,10 +161069,10 @@ _0805BEBE: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0805BF0C + beq @0805BF0C mov r0, r8 cmp r0, 0x1 - bhi _0805BF0C + bhi @0805BF0C adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x6 @@ -161087,7 +161087,7 @@ _0805BEBE: negs r0, r0 ands r0, r2 strb r0, [r1] -_0805BF0C: +@0805BF0C: ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -161099,17 +161099,17 @@ _0805BF0C: adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x4] - b _0805BF70 + b @0805BF70 .align 2, 0 .pool -_0805BF34: +@0805BF34: ldrb r1, [r0] movs r0, 0x40 ands r0, r1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _0805BF70 + bne @0805BF70 bl sub_805E394 ldrb r0, [r6] lsls r2, r0, 9 @@ -161130,7 +161130,7 @@ _0805BF34: adds r0, r2 strb r4, [r0, 0x4] bl dp01_tbl1_exec_completed -_0805BF70: +@0805BF70: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -161141,7 +161141,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 @@ -161177,33 +161177,33 @@ 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] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0805BFFC + bne @0805BFFC bl sub_805BF80 - b _0805C000 + b @0805C000 .align 2, 0 .pool -_0805BFFC: +@0805BFFC: bl dp01_tbl1_exec_completed -_0805C000: +@0805C000: pop {r0} bx r0 thumb_func_end dp01t_11_1_message_for_player_only thumb_func_start sub_805C004 -sub_805C004: @ 805C004 +sub_805C004: ; 805C004 push {lr} bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _0805C02A + bne @0805C02A ldr r0, =0x02022e14 strh r1, [r0] ldr r1, =0x02022e16 @@ -161216,7 +161216,7 @@ sub_805C004: @ 805C004 adds r0, r1 ldr r1, =sub_8057588 + 1 str r1, [r0] -_0805C02A: +@0805C02A: pop {r0} bx r0 .align 2, 0 @@ -161224,7 +161224,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 @@ -161238,13 +161238,13 @@ dp01t_12_6_battle_menu: @ 805C044 movs r1, 0x2 bl battle_show_message_maybe movs r4, 0 -_0805C062: +@0805C062: lsls r0, r4, 24 lsrs r0, 24 bl sub_8059CF8 adds r4, 0x1 cmp r4, 0x3 - ble _0805C062 + ble @0805C062 ldr r1, =0x020244ac ldr r0, =0x02024064 ldrb r0, [r0] @@ -161265,7 +161265,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 @@ -161274,7 +161274,7 @@ sub_805C0B0: @ 805C0B0 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _0805C108 + bne @0805C108 str r0, [sp] movs r0, 0x18 movs r1, 0x8 @@ -161295,12 +161295,12 @@ sub_805C0B0: @ 805C0B0 adds r0, r1 ldr r1, =sub_80599D4 + 1 str r1, [r0] - b _0805C10C + b @0805C10C .align 2, 0 .pool -_0805C108: +@0805C108: bl dp01_tbl1_exec_completed -_0805C10C: +@0805C10C: add sp, 0x4 pop {r4} pop {r0} @@ -161308,13 +161308,13 @@ _0805C10C: thumb_func_end sub_805C0B0 thumb_func_start sub_805C114 -sub_805C114: @ 805C114 +sub_805C114: ; 805C114 push {lr} bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _0805C13E + bne @0805C13E ldr r0, =0x02022e14 strh r1, [r0] ldr r1, =0x02022e16 @@ -161329,7 +161329,7 @@ sub_805C114: @ 805C114 adds r0, r1 ldr r1, =sub_8057BFC + 1 str r1, [r0] -_0805C13E: +@0805C13E: pop {r0} bx r0 .align 2, 0 @@ -161337,7 +161337,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] @@ -161352,7 +161352,7 @@ sub_805C158: @ 805C158 strb r0, [r1] lsls r0, 24 cmp r0, 0 - bne _0805C194 + bne @0805C194 ldr r1, =0x0203bd30 ldr r0, =0x03005d80 ldr r0, [r0] @@ -161365,7 +161365,7 @@ sub_805C158: @ 805C158 movs r1, 0xA bl dp01_build_cmdbuf_x21_a_bb bl dp01_tbl1_exec_completed -_0805C194: +@0805C194: pop {r0} bx r0 .align 2, 0 @@ -161373,7 +161373,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] @@ -161381,7 +161381,7 @@ dp01t_14_5_move_menu_pokedude: @ 805C1A8 lsls r1, 10 ands r0, r1 cmp r0, 0 - beq _0805C1EC + beq @0805C1EC ldr r2, =0x02024064 ldrb r0, [r2] ldr r1, =0x0202449c @@ -161397,10 +161397,10 @@ dp01t_14_5_move_menu_pokedude: @ 805C1A8 lsls r0, 2 adds r0, r1 ldr r1, =sub_805C158 + 1 - b _0805C1FC + b @0805C1FC .align 2, 0 .pool -_0805C1EC: +@0805C1EC: bl sub_805C210 ldr r1, =0x03005d60 ldr r0, =0x02024064 @@ -161408,7 +161408,7 @@ _0805C1EC: lsls r0, 2 adds r0, r1 ldr r1, =sub_805C114 + 1 -_0805C1FC: +@0805C1FC: str r1, [r0] pop {r0} bx r0 @@ -161417,7 +161417,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 @@ -161440,7 +161440,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 @@ -161463,7 +161463,7 @@ sub_805C248: @ 805C248 movs r3, 0 ldr r5, =0x0203cf00 ldr r4, =0x02023064 -_0805C276: +@0805C276: adds r0, r3, r5 ldrb r1, [r2] lsls r1, 9 @@ -161474,7 +161474,7 @@ _0805C276: strb r1, [r0] adds r3, 0x1 cmp r3, 0x2 - ble _0805C276 + ble @0805C276 add sp, 0x4 pop {r4,r5} pop {r0} @@ -161484,7 +161484,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} @@ -161499,7 +161499,7 @@ sub_805C2AC: @ 805C2AC mov r6, r12 mov r5, r8 adds r4, r2, 0 -_0805C2C8: +@0805C2C8: adds r0, r3, r6 ldrb r1, [r4] lsls r1, 9 @@ -161510,13 +161510,13 @@ _0805C2C8: strb r1, [r0] adds r3, 0x1 cmp r3, 0x2 - ble _0805C2C8 + ble @0805C2C8 ldr r0, [r7] movs r1, 0x80 lsls r1, 11 ands r0, r1 cmp r0, 0 - beq _0805C330 + beq @0805C330 ldrb r3, [r2] lsls r0, r3, 9 mov r1, r8 @@ -161526,7 +161526,7 @@ _0805C2C8: movs r0, 0xF ands r0, r1 cmp r0, 0x2 - beq _0805C330 + beq @0805C330 ldr r1, =0x0202406e lsls r0, r3, 1 adds r0, r1 @@ -161538,10 +161538,10 @@ _0805C2C8: mov r2, r12 bl dp01_build_cmdbuf_x22_a_three_bytes bl dp01_tbl1_exec_completed - b _0805C3BC + b @0805C3BC .align 2, 0 .pool -_0805C330: +@0805C330: ldr r0, =nullsub_4 + 1 movs r1, 0xFF bl AddTask @@ -161610,7 +161610,7 @@ _0805C330: ldr r1, =0x020244b8 ldrb r0, [r4] strb r0, [r1] -_0805C3BC: +@0805C3BC: add sp, 0x4 pop {r3} mov r8, r3 @@ -161622,7 +161622,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 @@ -161641,7 +161641,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 @@ -161665,15 +161665,15 @@ sub_805C410: @ 805C410 lsls r2, 16 asrs r7, r2, 16 cmp r7, 0 - ble _0805C44A + ble @0805C44A ldr r1, =0x0203cd70 ldr r0, [r1] adds r0, r7 str r0, [r1] -_0805C44A: +@0805C44A: ldr r0, =0x00007fff cmp r7, r0 - beq _0805C4B4 + beq @0805C4B4 ldr r6, =0x0202406e mov r1, r9 ldrb r0, [r1] @@ -161705,10 +161705,10 @@ _0805C44A: str r7, [sp] mov r2, r8 bl sub_807294C - b _0805C4F2 + b @0805C4F2 .align 2, 0 .pool -_0805C4B4: +@0805C4B4: ldr r1, =0x0202406e mov r2, r9 ldrb r0, [r2] @@ -161737,7 +161737,7 @@ _0805C4B4: movs r1, 0 movs r2, 0 bl heathbar_draw_hp -_0805C4F2: +@0805C4F2: ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -161757,7 +161757,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 @@ -161775,12 +161775,12 @@ sub_805C528: @ 805C528 movs r1, 0x38 bl pokemon_getattr cmp r0, 0x63 - bls _0805C560 + bls @0805C560 bl dp01_tbl1_exec_completed - b _0805C5AC + b @0805C5AC .align 2, 0 .pool -_0805C560: +@0805C560: movs r0, 0x1 bl load_gfxc_health_bar adds r0, r4, 0 @@ -161816,7 +161816,7 @@ _0805C560: adds r0, r1 ldr r1, =nullsub_21 + 1 str r1, [r0] -_0805C5AC: +@0805C5AC: pop {r4-r7} pop {r0} bx r0 @@ -161825,14 +161825,14 @@ _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] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne _0805C618 + bne @0805C618 ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 @@ -161866,7 +161866,7 @@ sub_805C5C4: @ 805C5C4 adds r0, r1 ldr r1, =sub_8059D60 + 1 str r1, [r0] -_0805C618: +@0805C618: pop {r4} pop {r0} bx r0 @@ -161875,14 +161875,14 @@ _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] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne _0805C68C + bne @0805C68C ldr r4, =0x02023064 ldrb r3, [r5] lsls r3, 9 @@ -161914,7 +161914,7 @@ sub_805C63C: @ 805C63C adds r0, r1 ldr r1, =sub_8059D60 + 1 str r1, [r0] -_0805C68C: +@0805C68C: pop {r4,r5} pop {r0} bx r0 @@ -161923,7 +161923,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} @@ -161971,7 +161971,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} @@ -161979,7 +161979,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 @@ -162018,7 +162018,7 @@ sub_805C71C: @ 805C71C movs r0, 0x80 lsls r0, 5 cmp r4, r0 - bhi _0805C78C + bhi @0805C78C ldr r0, =0x040000d4 str r2, [r0] str r5, [r0, 0x4] @@ -162028,10 +162028,10 @@ sub_805C71C: @ 805C71C orrs r1, r2 str r1, [r0, 0x8] ldr r0, [r0, 0x8] - b _0805C7B8 + b @0805C7B8 .align 2, 0 .pool -_0805C78C: +@0805C78C: ldr r3, =0x040000d4 str r2, [r3] str r5, [r3, 0x4] @@ -162045,7 +162045,7 @@ _0805C78C: ldr r1, =0xfffff000 adds r4, r1 cmp r4, r0 - bhi _0805C78C + bhi @0805C78C str r2, [r3] str r5, [r3, 0x4] lsrs r0, r4, 1 @@ -162054,7 +162054,7 @@ _0805C78C: orrs r0, r1 str r0, [r3, 0x8] ldr r0, [r3, 0x8] -_0805C7B8: +@0805C7B8: bl dp01_tbl1_exec_completed pop {r4,r5} pop {r0} @@ -162064,7 +162064,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 @@ -162087,7 +162087,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} @@ -162095,7 +162095,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 @@ -162107,7 +162107,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 @@ -162119,7 +162119,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 @@ -162130,7 +162130,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 @@ -162141,7 +162141,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] @@ -162157,7 +162157,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 @@ -162183,7 +162183,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] @@ -162198,7 +162198,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] @@ -162220,7 +162220,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 @@ -162236,12 +162236,12 @@ dp01t_29_1_blink: @ 805C8F0 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - bge _0805C924 + bge @0805C924 bl dp01_tbl1_exec_completed - b _0805C94E + b @0805C94E .align 2, 0 .pool -_0805C924: +@0805C924: ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] @@ -162262,7 +162262,7 @@ _0805C924: adds r0, r1 ldr r1, =bx_blink_t1 + 1 str r1, [r0] -_0805C94E: +@0805C94E: pop {r4} pop {r0} bx r0 @@ -162271,7 +162271,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} @@ -162279,7 +162279,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] @@ -162287,9 +162287,9 @@ sub_805C96C: @ 805C96C lsls r0, 24 movs r3, 0x3F cmp r0, 0 - bne _0805C980 + bne @0805C980 movs r3, 0xC0 -_0805C980: +@0805C980: ldr r2, =0x02023064 ldrb r1, [r4] lsls r1, 9 @@ -162313,7 +162313,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 @@ -162323,7 +162323,7 @@ sub_805C9B0: @ 805C9B0 adds r0, r3, r0 ldrb r0, [r0] cmp r0, 0 - beq _0805C9EC + beq @0805C9EC bl sub_805EA60 ldrb r1, [r5] lsls r1, 9 @@ -162336,10 +162336,10 @@ sub_805C9B0: @ 805C9B0 lsls r1, 8 orrs r0, r1 bl song_play_for_text - b _0805CA00 + b @0805CA00 .align 2, 0 .pool -_0805C9EC: +@0805C9EC: adds r0, r4, 0x1 adds r0, r3, r0 ldrb r0, [r0] @@ -162349,7 +162349,7 @@ _0805C9EC: lsls r1, 8 orrs r0, r1 bl fanfare_play -_0805CA00: +@0805CA00: bl dp01_tbl1_exec_completed pop {r4,r5} pop {r0} @@ -162357,7 +162357,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 @@ -162385,7 +162385,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 @@ -162408,7 +162408,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 @@ -162538,7 +162538,7 @@ dp01t_2F_1_pokemon_enter: @ 805CA80 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0805CBA2 + beq @0805CBA2 ldr r0, =0x020244b4 adds r0, r2, r0 ldrb r1, [r0] @@ -162548,7 +162548,7 @@ dp01t_2F_1_pokemon_enter: @ 805CA80 adds r0, r4 ldr r1, =sub_8073C30 + 1 str r1, [r0] -_0805CBA2: +@0805CBA2: ldr r0, [r3] ldr r2, [r0, 0x8] ldrb r0, [r2, 0x9] @@ -162569,7 +162569,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] @@ -162612,7 +162612,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 @@ -162629,13 +162629,13 @@ task05_08033660: @ 805CC68 movs r3, 0xA ldrsh r0, [r1, r3] cmp r0, 0x1E - bgt _0805CC94 + bgt @0805CC94 adds r0, r2, 0x1 strh r0, [r1, 0xA] - b _0805CD50 + b @0805CD50 .align 2, 0 .pool -_0805CC94: +@0805CC94: ldr r7, =0x02024064 ldrb r0, [r7] mov r9, r0 @@ -162644,14 +162644,14 @@ _0805CC94: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _0805CCB4 + beq @0805CCB4 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _0805CCE4 -_0805CCB4: + beq @0805CCE4 +@0805CCB4: ldr r0, =0x02023064 ldrb r1, [r7] lsls r2, r1, 9 @@ -162665,10 +162665,10 @@ _0805CCB4: ldrb r0, [r7] movs r1, 0 bl sub_805B258 - b _0805CD38 + b @0805CD38 .align 2, 0 .pool -_0805CCE4: +@0805CCE4: ldr r4, =0x02023064 ldrb r0, [r7] lsls r1, r0, 9 @@ -162708,7 +162708,7 @@ _0805CCE4: ldrb r0, [r7] eors r0, r6 strb r0, [r7] -_0805CD38: +@0805CD38: ldr r1, =0x03005d60 ldr r2, =0x02024064 ldrb r0, [r2] @@ -162720,7 +162720,7 @@ _0805CD38: strb r3, [r2] mov r0, r8 bl remove_task -_0805CD50: +@0805CD50: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -162732,7 +162732,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 @@ -162742,17 +162742,17 @@ sub_805CD74: @ 805CD74 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _0805CDA4 + beq @0805CDA4 adds r0, r2, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0805CDA4 + bne @0805CDA4 bl dp01_tbl1_exec_completed - b _0805CE18 + b @0805CE18 .align 2, 0 .pool -_0805CDA4: +@0805CDA4: ldr r6, =0x020244d0 ldr r0, [r6] ldr r5, =0x02024064 @@ -162795,7 +162795,7 @@ _0805CDA4: adds r0, r4 ldrb r0, [r0] cmp r0, 0 - beq _0805CE0C + beq @0805CE0C ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -162804,14 +162804,14 @@ _0805CDA4: adds r0, r1 movs r1, 0x5D strb r1, [r0, 0x5] -_0805CE0C: +@0805CE0C: ldr r0, =0x03005d60 ldrb r1, [r5] lsls r1, 2 adds r1, r0 ldr r0, =sub_805CE38 + 1 str r0, [r1] -_0805CE18: +@0805CE18: pop {r4-r6} pop {r0} bx r0 @@ -162820,7 +162820,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] @@ -162837,7 +162837,7 @@ sub_805CE38: @ 805CE38 lsls r1, 24 lsrs r1, 24 cmp r1, 0x5C - bls _0805CE70 + bls @0805CE70 ldr r0, [r4] ldrb r1, [r3] ldr r2, [r0, 0x4] @@ -162848,7 +162848,7 @@ sub_805CE38: @ 805CE38 movs r1, 0 strb r1, [r0, 0x5] bl dp01_tbl1_exec_completed -_0805CE70: +@0805CE70: pop {r4} pop {r0} bx r0 @@ -162857,7 +162857,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] @@ -162872,7 +162872,7 @@ sub_805CE80: @ 805CE80 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0805CEB2 + beq @0805CEB2 ldr r2, =0x03005e00 ldr r0, =0x020244b4 adds r0, r3, r0 @@ -162883,7 +162883,7 @@ sub_805CE80: @ 805CE80 adds r0, r2 ldr r1, =sub_8073C30 + 1 str r1, [r0] -_0805CEB2: +@0805CEB2: bl dp01_tbl1_exec_completed pop {r0} bx r0 @@ -162892,7 +162892,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] @@ -162910,14 +162910,14 @@ 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] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 - beq _0805CF3A + beq @0805CF3A ldr r3, =0x02020630 ldr r0, =0x020241e4 ldrb r1, [r4] @@ -162944,7 +162944,7 @@ dp01t_33_1_enemy_move: @ 805CEF4 strb r0, [r2] ldrb r0, [r4] bl sub_805E408 -_0805CF3A: +@0805CF3A: bl dp01_tbl1_exec_completed pop {r4} pop {r0} @@ -162954,7 +162954,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 @@ -162962,7 +162962,7 @@ sub_805CF54: @ 805CF54 bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne _0805CFB6 + bne @0805CFB6 ldr r4, =0x02023064 ldrb r2, [r5] lsls r1, r2, 9 @@ -162984,22 +162984,22 @@ sub_805CF54: @ 805CF54 bl move_anim_start_t3 lsls r0, 24 cmp r0, 0 - beq _0805CFA4 + beq @0805CFA4 bl dp01_tbl1_exec_completed - b _0805CFB0 + b @0805CFB0 .align 2, 0 .pool -_0805CFA4: +@0805CFA4: ldr r0, =0x03005d60 ldrb r1, [r5] lsls r1, 2 adds r1, r0 ldr r0, =bx_8030B2C + 1 str r0, [r1] -_0805CFB0: +@0805CFB0: adds r0, r6, 0 bl sub_817E32C -_0805CFB6: +@0805CFB6: add sp, 0x4 pop {r4-r6} pop {r0} @@ -163009,7 +163009,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] @@ -163023,21 +163023,21 @@ dp01t_35_1_link_standby_message_and_free_vram: @ 805CFC8 adds r0, r4 ldrb r0, [r0] cmp r0, 0x1 - beq _0805D002 + beq @0805D002 cmp r0, 0x1 - bgt _0805CFF8 + bgt @0805CFF8 cmp r0, 0 - beq _0805CFFE - b _0805D020 + beq @0805CFFE + b @0805D020 .align 2, 0 .pool -_0805CFF8: +@0805CFF8: cmp r0, 0x2 - beq _0805D01C - b _0805D020 -_0805CFFE: + beq @0805D01C + b @0805D020 +@0805CFFE: bl b_link_standby_message -_0805D002: +@0805D002: ldr r4, =0x02024064 ldrb r0, [r4] movs r1, 0x1 @@ -163045,12 +163045,12 @@ _0805D002: ldrb r0, [r4] movs r1, 0 bl dp11b_obj_free - b _0805D020 + b @0805D020 .align 2, 0 .pool -_0805D01C: +@0805D01C: bl b_link_standby_message -_0805D020: +@0805D020: bl dp01_tbl1_exec_completed pop {r4,r5} pop {r0} @@ -163058,7 +163058,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 @@ -163068,19 +163068,19 @@ sub_805D02C: @ 805D02C adds r0, r1 ldrb r2, [r0] cmp r2, 0x1 - beq _0805D074 + beq @0805D074 cmp r2, 0x1 - bgt _0805D054 + bgt @0805D054 cmp r2, 0 - beq _0805D05A - b _0805D084 + beq @0805D05A + b @0805D084 .align 2, 0 .pool -_0805D054: +@0805D054: cmp r2, 0x2 - beq _0805D07C - b _0805D084 -_0805D05A: + beq @0805D07C + b @0805D084 +@0805D05A: ldr r0, =0x020244ac adds r0, r3, r0 strb r2, [r0] @@ -163088,21 +163088,21 @@ _0805D05A: ldrb r0, [r4] adds r0, r1 strb r2, [r0] - b _0805D084 + b @0805D084 .align 2, 0 .pool -_0805D074: +@0805D074: ldr r0, =0x020244ac - b _0805D07E + b @0805D07E .align 2, 0 .pool -_0805D07C: +@0805D07C: ldr r0, =0x020244b0 -_0805D07E: +@0805D07E: adds r0, r3, r0 movs r1, 0 strb r1, [r0] -_0805D084: +@0805D084: bl dp01_tbl1_exec_completed pop {r4} pop {r0} @@ -163112,7 +163112,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] @@ -163164,12 +163164,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 @@ -163199,12 +163199,12 @@ 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] cmp r0, 0 - beq _0805D192 + beq @0805D192 ldr r0, [r0, 0xC] bl free ldr r0, [r5] @@ -163224,7 +163224,7 @@ dp11_free: @ 805D158 str r4, [r0] bl free str r4, [r5] -_0805D192: +@0805D192: pop {r4,r5} pop {r0} bx r0 @@ -163233,7 +163233,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 @@ -163278,14 +163278,14 @@ sub_805D19C: @ 805D19C ands r4, r0 adds r6, r4, 0 adds r5, r4, 0x2 - b _0805D20E + b @0805D20E .align 2, 0 .pool -_0805D20C: +@0805D20C: adds r4, 0x1 -_0805D20E: +@0805D20E: cmp r4, r5 - bge _0805D234 + bge @0805D234 ldr r0, =0x02024064 ldrb r1, [r0] movs r0, 0x58 @@ -163301,49 +163301,49 @@ _0805D20E: adds r0, r2 ldrb r0, [r0] cmp r0, r7 - ble _0805D20C -_0805D234: + ble @0805D20C +@0805D234: subs r7, r4, r6 cmp r4, r5 - bne _0805D23C + bne @0805D23C movs r7, 0x2 -_0805D23C: +@0805D23C: movs r6, 0 movs r4, 0 mov r1, r10 ldrh r0, [r1] cmp r0, 0 - beq _0805D27C + beq @0805D27C mov r5, r10 -_0805D24A: +@0805D24A: ldrh r0, [r5] bl sub_805D4A8 lsls r0, 24 lsrs r0, 24 cmp r7, r0 - bne _0805D26E + bne @0805D26E mov r0, r10 adds r0, 0x8 adds r0, r4 ldrb r0, [r0] cmp r0, 0 - beq _0805D26E + beq @0805D26E ldr r0, =0x0832a328 lsls r1, r4, 2 adds r1, r0 ldr r0, [r1] orrs r6, r0 -_0805D26E: +@0805D26E: adds r5, 0x2 adds r4, 0x1 cmp r4, 0x3 - bgt _0805D27C + bgt @0805D27C ldrh r0, [r5] cmp r0, 0 - bne _0805D24A -_0805D27C: + bne @0805D24A +@0805D27C: cmp r6, 0 - beq _0805D2AC + beq @0805D2AC ldr r3, =0x0202449c ldr r1, [r3] adds r1, 0x92 @@ -163364,93 +163364,93 @@ _0805D27C: lsls r0, 24 lsrs r0, 24 mov r9, r0 -_0805D2AC: +@0805D2AC: movs r0, 0x1 negs r0, r0 cmp r9, r0 - beq _0805D2B6 - b _0805D40C -_0805D2B6: + beq @0805D2B6 + b @0805D40C +@0805D2B6: mov r2, r8 cmp r2, 0xF - bne _0805D2BE - b _0805D3EA -_0805D2BE: + bne @0805D2BE + b @0805D3EA +@0805D2BE: movs r5, 0 movs r6, 0 ldr r7, =0x0832a328 mov r4, r10 -_0805D2C6: +@0805D2C6: ldrh r0, [r4] bl sub_805D4A8 lsls r0, 24 cmp r0, 0 - bne _0805D2DE + bne @0805D2DE ldr r0, [r7] mov r1, r8 ands r0, r1 cmp r0, 0 - bne _0805D2DE + bne @0805D2DE adds r5, 0x1 -_0805D2DE: +@0805D2DE: ldrh r0, [r4] bl sub_805D4A8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0805D2F8 + bne @0805D2F8 ldr r0, [r7] mov r2, r8 ands r0, r2 cmp r0, 0 - bne _0805D2F8 + bne @0805D2F8 adds r5, 0x10 -_0805D2F8: +@0805D2F8: ldrh r0, [r4] bl sub_805D4A8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _0805D316 + bne @0805D316 ldr r0, [r7] mov r1, r8 ands r0, r1 cmp r0, 0 - bne _0805D316 + bne @0805D316 movs r2, 0x80 lsls r2, 1 adds r5, r2 -_0805D316: +@0805D316: adds r7, 0x4 adds r4, 0x2 ldr r0, =0x0832a328 adds r0, 0xC cmp r7, r0 - ble _0805D2C6 + ble @0805D2C6 movs r1, 0xF ands r1, r5 cmp r1, 0x1 - ble _0805D32C + ble @0805D32C adds r6, 0x1 -_0805D32C: +@0805D32C: movs r0, 0xF0 ands r0, r5 cmp r0, 0x1F - ble _0805D336 + ble @0805D336 adds r6, 0x1 -_0805D336: +@0805D336: ldr r2, =0x000001ff cmp r0, r2 - ble _0805D33E + ble @0805D33E adds r6, 0x1 -_0805D33E: +@0805D33E: cmp r6, 0x1 - bgt _0805D346 + bgt @0805D346 cmp r6, 0 - bne _0805D388 -_0805D346: + bne @0805D388 +@0805D346: ldr r5, =0x0832a328 -_0805D348: +@0805D348: bl GenerateRandomNumber lsls r0, 16 movs r1, 0xC0 @@ -163463,29 +163463,29 @@ _0805D348: mov r1, r8 ands r0, r1 cmp r0, 0 - bne _0805D366 + bne @0805D366 mov r9, r4 -_0805D366: +@0805D366: movs r0, 0x1 negs r0, r0 cmp r9, r0 - beq _0805D348 - b _0805D3D4 + beq @0805D348 + b @0805D3D4 .align 2, 0 .pool -_0805D388: +@0805D388: cmp r1, 0x1 - ble _0805D38E + ble @0805D38E movs r6, 0 -_0805D38E: +@0805D38E: cmp r0, 0x1F - ble _0805D394 + ble @0805D394 movs r6, 0x1 -_0805D394: +@0805D394: cmp r0, r2 - ble _0805D39A + ble @0805D39A movs r6, 0x2 -_0805D39A: +@0805D39A: bl GenerateRandomNumber lsls r0, 16 movs r1, 0xC0 @@ -163499,7 +163499,7 @@ _0805D39A: mov r2, r8 ands r0, r2 cmp r0, 0 - bne _0805D3CC + bne @0805D3CC lsls r0, r4, 1 add r0, r10 ldrh r0, [r0] @@ -163507,14 +163507,14 @@ _0805D39A: lsls r0, 24 lsrs r0, 24 cmp r6, r0 - bne _0805D3CC + bne @0805D3CC mov r9, r4 -_0805D3CC: +@0805D3CC: movs r0, 0x1 negs r0, r0 cmp r9, r0 - beq _0805D39A -_0805D3D4: + beq @0805D39A +@0805D3D4: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -163523,8 +163523,8 @@ _0805D3D4: lsls r0, 16 lsrs r0, 16 cmp r0, 0x31 - bls _0805D40C -_0805D3EA: + bls @0805D40C +@0805D3EA: ldr r2, =0x0202433c ldr r0, =0x02024064 ldrb r1, [r0] @@ -163535,21 +163535,21 @@ _0805D3EA: orrs r0, r2 strb r0, [r1, 0x2] movs r0, 0 - b _0805D496 + b @0805D496 .align 2, 0 .pool -_0805D40C: +@0805D40C: mov r1, r9 lsls r0, r1, 1 mov r2, r10 adds r1, r2, r0 ldrh r0, [r1] cmp r0, 0xAE - bne _0805D434 + bne @0805D434 ldrb r0, [r2, 0x12] movs r5, 0 cmp r0, 0x7 - beq _0805D442 + beq @0805D442 ldrb r1, [r2, 0x13] movs r0, 0x7 eors r1, r0 @@ -163558,8 +163558,8 @@ _0805D40C: asrs r5, r0, 31 movs r0, 0x10 ands r5, r0 - b _0805D442 -_0805D434: + b @0805D442 +@0805D434: ldr r2, =0x0831c898 ldrh r1, [r1] lsls r0, r1, 1 @@ -163567,28 +163567,28 @@ _0805D434: lsls r0, 2 adds r0, r2 ldrb r5, [r0, 0x6] -_0805D442: +@0805D442: movs r0, 0x10 ands r0, r5 cmp r0, 0 - beq _0805D45C + beq @0805D45C ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 8 - b _0805D48A + b @0805D48A .align 2, 0 .pool -_0805D45C: +@0805D45C: cmp r5, 0 - bne _0805D470 + bne @0805D470 bl sub_805D5F4 lsls r0, 16 lsrs r0, 16 mov r2, r9 orrs r2, r0 mov r9, r2 - b _0805D490 -_0805D470: + b @0805D490 +@0805D470: ldr r0, =0x02024064 ldrb r0, [r0] bl battle_get_per_side_status @@ -163600,15 +163600,15 @@ _0805D470: bl battle_get_side_with_given_state lsls r0, 24 lsrs r0, 16 -_0805D48A: +@0805D48A: mov r1, r9 orrs r1, r0 mov r9, r1 -_0805D490: +@0805D490: mov r2, r9 lsls r0, r2, 16 lsrs r0, 16 -_0805D496: +@0805D496: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -163621,7 +163621,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 @@ -163633,106 +163633,106 @@ sub_805D4A8: @ 805D4A8 ldrb r0, [r0, 0x6] adds r3, r1, 0 cmp r0, 0x40 - bls _0805D4C2 - b _0805D5EE -_0805D4C2: + bls @0805D4C2 + b @0805D5EE +@0805D4C2: lsls r0, 2 - ldr r1, =_0805D4D4 + ldr r1, =@0805D4D4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0805D4D4: - .4byte _0805D5D8 - .4byte _0805D5E6 - .4byte _0805D5D8 - .4byte _0805D5EE - .4byte _0805D5D8 - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5D8 - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EA - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5D8 - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5EE - .4byte _0805D5E6 -_0805D5D8: +@0805D4D4: + .4byte @0805D5D8 + .4byte @0805D5E6 + .4byte @0805D5D8 + .4byte @0805D5EE + .4byte @0805D5D8 + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5D8 + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EA + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5D8 + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5EE + .4byte @0805D5E6 +@0805D5D8: lsls r0, r2, 1 adds r0, r2 lsls r0, 2 adds r0, r3 ldrb r0, [r0, 0x1] cmp r0, 0 - bne _0805D5EE -_0805D5E6: + bne @0805D5EE +@0805D5E6: movs r0, 0x2 - b _0805D5F0 -_0805D5EA: + b @0805D5F0 +@0805D5EA: movs r0, 0x1 - b _0805D5F0 -_0805D5EE: + b @0805D5F0 +@0805D5EE: movs r0, 0 -_0805D5F0: +@0805D5F0: pop {r1} bx r1 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 @@ -163742,30 +163742,30 @@ sub_805D5F4: @ 805D5F4 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0805D6FA + beq @0805D6FA ldr r0, =0x02024064 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0805D630 + bne @0805D630 movs r0, 0x1 bl battle_get_side_with_given_state lsls r0, 24 lsrs r0, 24 mov r8, r0 movs r0, 0x3 - b _0805D63E + b @0805D63E .align 2, 0 .pool -_0805D630: +@0805D630: movs r0, 0 bl battle_get_side_with_given_state lsls r0, 24 lsrs r0, 24 mov r8, r0 movs r0, 0x2 -_0805D63E: +@0805D63E: bl battle_get_side_with_given_state lsls r0, 24 lsrs r7, r0, 24 @@ -163780,7 +163780,7 @@ _0805D63E: ldrh r0, [r5, 0x28] ldrh r3, [r6, 0x28] cmp r0, r3 - bne _0805D680 + bne @0805D680 bl GenerateRandomNumber adds r3, r0, 0 ldr r0, =0x02024064 @@ -163792,10 +163792,10 @@ _0805D63E: movs r1, 0x2 ands r1, r3 adds r0, r1 - b _0805D702 + b @0805D702 .align 2, 0 .pool -_0805D680: +@0805D680: ldr r4, =0x0831c604 ldr r0, =0x02024064 mov r9, r0 @@ -163810,41 +163810,41 @@ _0805D680: adds r0, r4 ldrb r4, [r0] cmp r4, 0x1 - beq _0805D6CC + beq @0805D6CC cmp r4, 0x1 - bgt _0805D6B4 + bgt @0805D6B4 cmp r4, 0 - beq _0805D6BA - b _0805D6FA + beq @0805D6BA + b @0805D6FA .align 2, 0 .pool -_0805D6B4: +@0805D6B4: cmp r4, 0x2 - beq _0805D6DE - b _0805D6FA -_0805D6BA: + beq @0805D6DE + b @0805D6FA +@0805D6BA: ldrh r0, [r5, 0x28] ldrh r6, [r6, 0x28] cmp r0, r6 - bls _0805D6C8 + bls @0805D6C8 mov r1, r8 lsls r0, r1, 8 - b _0805D704 -_0805D6C8: + b @0805D704 +@0805D6C8: lsls r0, r7, 8 - b _0805D704 -_0805D6CC: + b @0805D704 +@0805D6CC: ldrh r0, [r5, 0x28] ldrh r6, [r6, 0x28] cmp r0, r6 - bcs _0805D6DA + bcs @0805D6DA mov r3, r8 lsls r0, r3, 8 - b _0805D704 -_0805D6DA: + b @0805D704 +@0805D6DA: lsls r0, r7, 8 - b _0805D704 -_0805D6DE: + b @0805D704 +@0805D6DE: bl GenerateRandomNumber adds r3, r0, 0 mov r0, r9 @@ -163857,15 +163857,15 @@ _0805D6DE: adds r0, r4 lsls r0, 24 lsrs r0, 16 - b _0805D704 -_0805D6FA: + b @0805D704 +@0805D6FA: ldr r0, =0x02024064 ldrb r1, [r0] movs r0, 0x1 eors r0, r1 -_0805D702: +@0805D702: lsls r0, 8 -_0805D704: +@0805D704: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -163877,7 +163877,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] @@ -163893,33 +163893,33 @@ sub_805D714: @ 805D714 ldrb r3, [r0] lsls r0, r3, 26 cmp r0, 0 - bge _0805D766 + bge @0805D766 adds r0, r1, 0 adds r0, 0x3E ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt _0805D766 + blt @0805D766 adds r2, r1, 0 adds r2, 0x2C ldrb r1, [r2] lsls r0, r1, 25 cmp r0, 0 - bge _0805D75C + bge @0805D75C movs r0, 0x41 negs r0, r0 ands r0, r1 strb r0, [r2] - b _0805D766 + b @0805D766 .align 2, 0 .pool -_0805D75C: +@0805D75C: lsls r0, r3, 27 cmp r0, 0 - bge _0805D766 + bge @0805D766 ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] -_0805D766: +@0805D766: pop {r4} pop {r0} bx r0 @@ -163928,7 +163928,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 @@ -163941,18 +163941,18 @@ sub_805D770: @ 805D770 ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] cmp r1, 0 - bne _0805D798 + bne @0805D798 adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 - b _0805D7A0 + b @0805D7A0 .align 2, 0 .pool -_0805D798: +@0805D798: adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 -_0805D7A0: +@0805D7A0: adds r0, r4, 0 bl obj_anim_step pop {r4} @@ -163961,7 +163961,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 @@ -163969,27 +163969,27 @@ sub_805D7AC: @ 805D7AC movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0805D7E4 + bne @0805D7E4 ldrh r0, [r2, 0x2E] ldrh r1, [r2, 0x24] adds r0, r1 strh r0, [r2, 0x24] lsls r0, 16 cmp r0, 0 - bne _0805D7E4 + bne @0805D7E4 movs r1, 0x26 ldrsh r0, [r2, r1] cmp r0, 0 - beq _0805D7E0 + beq @0805D7E0 ldr r0, =sub_805D7EC + 1 - b _0805D7E2 + b @0805D7E2 .align 2, 0 .pool -_0805D7E0: +@0805D7E0: ldr r0, =nullsub_12 + 1 -_0805D7E2: +@0805D7E2: str r0, [r2, 0x1C] -_0805D7E4: +@0805D7E4: pop {r0} bx r0 .align 2, 0 @@ -163997,7 +163997,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] @@ -164005,10 +164005,10 @@ sub_805D7EC: @ 805D7EC strh r0, [r1, 0x26] lsls r0, 16 cmp r0, 0 - bne _0805D800 + bne @0805D800 ldr r0, =nullsub_12 + 1 str r0, [r1, 0x1C] -_0805D800: +@0805D800: pop {r0} bx r0 .align 2, 0 @@ -164016,7 +164016,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 @@ -164034,100 +164034,100 @@ move_anim_start_t2_for_situation: @ 805D808 orrs r2, r3 strb r2, [r1] cmp r0, 0 - bne _0805D888 + bne @0805D888 cmp r4, 0x20 - bne _0805D844 + bne @0805D844 ldrb r0, [r5] movs r1, 0x6 bl move_anim_start_t2 - b _0805D902 + b @0805D902 .align 2, 0 .pool -_0805D844: +@0805D844: cmp r4, 0x8 - beq _0805D850 + beq @0805D850 movs r0, 0x80 ands r0, r4 cmp r0, 0 - beq _0805D85A -_0805D850: + beq @0805D85A +@0805D850: ldrb r0, [r5] movs r1, 0 bl move_anim_start_t2 - b _0805D902 -_0805D85A: + b @0805D902 +@0805D85A: cmp r4, 0x10 - bne _0805D868 + bne @0805D868 ldrb r0, [r5] movs r1, 0x2 bl move_anim_start_t2 - b _0805D902 -_0805D868: + b @0805D902 +@0805D868: movs r0, 0x7 ands r0, r4 cmp r0, 0 - beq _0805D87A + beq @0805D87A ldrb r0, [r5] movs r1, 0x4 bl move_anim_start_t2 - b _0805D902 -_0805D87A: + b @0805D902 +@0805D87A: cmp r4, 0x40 - bne _0805D8EA + bne @0805D8EA ldrb r0, [r5] movs r1, 0x5 bl move_anim_start_t2 - b _0805D902 -_0805D888: + b @0805D902 +@0805D888: movs r0, 0xF0 lsls r0, 12 ands r0, r4 cmp r0, 0 - beq _0805D89C + beq @0805D89C ldrb r0, [r5] movs r1, 0x3 bl move_anim_start_t2 - b _0805D902 -_0805D89C: + b @0805D902 +@0805D89C: movs r0, 0x7 ands r0, r4 cmp r0, 0 - beq _0805D8AE + beq @0805D8AE ldrb r0, [r5] movs r1, 0x1 bl move_anim_start_t2 - b _0805D902 -_0805D8AE: + b @0805D902 +@0805D8AE: movs r0, 0x80 lsls r0, 21 ands r0, r4 cmp r0, 0 - beq _0805D8C2 + beq @0805D8C2 ldrb r0, [r5] movs r1, 0x7 bl move_anim_start_t2 - b _0805D902 -_0805D8C2: + b @0805D902 +@0805D8C2: movs r0, 0x80 lsls r0, 20 ands r0, r4 cmp r0, 0 - beq _0805D8D6 + beq @0805D8D6 ldrb r0, [r5] movs r1, 0x8 bl move_anim_start_t2 - b _0805D902 -_0805D8D6: + b @0805D902 +@0805D8D6: movs r0, 0xE0 lsls r0, 8 ands r0, r4 cmp r0, 0 - beq _0805D8EA + beq @0805D8EA ldrb r0, [r5] movs r1, 0x9 bl move_anim_start_t2 - b _0805D902 -_0805D8EA: + b @0805D902 +@0805D8EA: ldr r0, [r6] ldrb r2, [r5] ldr r0, [r0, 0x4] @@ -164140,14 +164140,14 @@ _0805D8EA: negs r0, r0 ands r0, r2 strb r0, [r1] -_0805D902: +@0805D902: pop {r4-r6} pop {r0} bx r0 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 @@ -164168,11 +164168,11 @@ move_anim_start_t3: @ 805D908 lsls r4, 16 lsrs r7, r4, 16 cmp r5, 0 - bne _0805D950 + bne @0805D950 movs r0, 0x80 ands r0, r7 cmp r0, 0 - beq _0805D950 + beq @0805D950 ldr r0, =0x020244e4 adds r0, r6, r0 movs r2, 0x7F @@ -164180,10 +164180,10 @@ move_anim_start_t3: @ 805D908 ands r1, r2 strb r1, [r0] movs r0, 0x1 - b _0805DA1E + b @0805DA1E .align 2, 0 .pool -_0805D950: +@0805D950: ldr r0, =0x020244d0 mov r9, r0 ldr r0, [r0] @@ -164196,17 +164196,17 @@ _0805D950: mov r0, r8 ands r0, r1 cmp r0, 0 - beq _0805D9CC + beq @0805D9CC adds r0, r5, 0 bl sub_805DAA0 lsls r0, 24 cmp r0, 0 - bne _0805D980 + bne @0805D980 movs r0, 0x1 - b _0805DA1E + b @0805DA1E .align 2, 0 .pool -_0805D980: +@0805D980: mov r1, r9 ldr r0, [r1] ldr r0, [r0] @@ -164215,9 +164215,9 @@ _0805D980: mov r0, r8 ands r0, r1 cmp r0, 0 - beq _0805D9CC + beq @0805D9CC cmp r5, 0x2 - bne _0805D9CC + bne @0805D9CC ldr r1, =0x02020630 ldr r0, =0x020241e4 adds r0, r6, r0 @@ -164230,17 +164230,17 @@ _0805D980: ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - bge _0805D9CC + bge @0805D9CC adds r0, r6, 0 movs r1, 0x1 bl refresh_graphics_maybe adds r0, r6, 0 bl sub_805E974 movs r0, 0x1 - b _0805DA1E + b @0805DA1E .align 2, 0 .pool -_0805D9CC: +@0805D9CC: ldr r0, =0x02038436 mov r2, r10 strb r2, [r0] @@ -164280,7 +164280,7 @@ _0805D9CC: orrs r1, r2 strb r1, [r0] movs r0, 0 -_0805DA1E: +@0805DA1E: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -164294,7 +164294,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 @@ -164304,7 +164304,7 @@ task0A_0803415C: @ 805DA48 ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 - bne _0805DA8A + bne @0805DA8A ldr r0, =0x020244d0 ldr r2, [r0] ldr r1, =0x03005e00 @@ -164326,7 +164326,7 @@ task0A_0803415C: @ 805DA48 strb r0, [r1] adds r0, r4, 0 bl remove_task -_0805DA8A: +@0805DA8A: pop {r4} pop {r0} bx r0 @@ -164335,32 +164335,32 @@ _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 cmp r0, 0xD - bgt _0805DAB4 + bgt @0805DAB4 cmp r0, 0xA - bge _0805DAB8 + bge @0805DAB8 cmp r0, 0x2 - beq _0805DAB8 - b _0805DABC -_0805DAB4: + beq @0805DAB8 + b @0805DABC +@0805DAB4: cmp r0, 0x11 - bne _0805DABC -_0805DAB8: + bne @0805DABC +@0805DAB8: movs r0, 0x1 - b _0805DABE -_0805DABC: + b @0805DABE +@0805DABC: movs r0, 0 -_0805DABE: +@0805DABE: pop {r1} bx r1 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 @@ -164407,7 +164407,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 @@ -164417,7 +164417,7 @@ task0A_08034248: @ 805DB34 ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 - bne _0805DB76 + bne @0805DB76 ldr r0, =0x020244d0 ldr r2, [r0] ldr r1, =0x03005e00 @@ -164439,7 +164439,7 @@ task0A_08034248: @ 805DB34 strb r0, [r1] adds r0, r4, 0 bl remove_task -_0805DB76: +@0805DB76: pop {r4} pop {r0} bx r0 @@ -164448,13 +164448,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 @@ -164462,7 +164462,7 @@ mplay_80342A4: @ 805DB90 bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - beq _0805DBD8 + beq @0805DBD8 ldr r2, =0x020244d0 ldr r0, [r2] ldr r1, [r0, 0x4] @@ -164483,20 +164483,20 @@ mplay_80342A4: @ 805DB90 adds r0, r2 ldrb r0, [r0, 0x8] cmp r0, 0x1D - bls _0805DBDC + bls @0805DBDC ldr r0, =0x030075f0 bl MPlayStop_rev01 ldr r0, =0x03007630 bl MPlayStop_rev01 -_0805DBD8: +@0805DBD8: cmp r5, 0 - beq _0805DBF0 -_0805DBDC: + beq @0805DBF0 +@0805DBDC: movs r0, 0x1 - b _0805DC02 + b @0805DC02 .align 2, 0 .pool -_0805DBF0: +@0805DBF0: ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -164506,7 +164506,7 @@ _0805DBF0: adds r0, r1 strb r5, [r0, 0x8] movs r0, 0 -_0805DC02: +@0805DC02: pop {r4,r5} pop {r1} bx r1 @@ -164515,7 +164515,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 @@ -164537,22 +164537,22 @@ sub_805DC0C: @ 805DC0C adds r2, r1, r0 ldrh r0, [r2, 0x2] cmp r0, 0 - bne _0805DC50 + bne @0805DC50 adds r0, r4, 0 movs r1, 0xB bl pokemon_getattr lsls r0, 16 lsrs r5, r0, 16 ldr r6, [sp] - b _0805DC58 + b @0805DC58 .align 2, 0 .pool -_0805DC50: +@0805DC50: ldrh r5, [r2, 0x2] ldr r0, =0x020244bc adds r0, r1, r0 ldr r6, [r0] -_0805DC58: +@0805DC58: adds r0, r4, 0 movs r1, 0x1 bl pokemon_getattr @@ -164587,18 +164587,18 @@ _0805DC58: str r1, [sp, 0x4] mov r9, r2 cmp r0, 0 - bne _0805DCBC + bne @0805DCBC adds r0, r4, 0 bl pokemon_get_pal - b _0805DCC6 + b @0805DCC6 .align 2, 0 .pool -_0805DCBC: +@0805DCBC: adds r0, r5, 0 mov r1, r10 ldr r2, [sp] bl species_and_otid_get_pal -_0805DCC6: +@0805DCC6: adds r6, r0, 0 ldr r4, =0x0201c000 adds r0, r6, 0 @@ -164615,7 +164615,7 @@ _0805DCC6: bl gpu_pal_apply ldr r0, =0x00000181 cmp r5, r0 - bne _0805DD1A + bne @0805DD1A movs r7, 0x80 lsls r7, 1 add r7, r9 @@ -164636,7 +164636,7 @@ _0805DCC6: adds r1, r7, 0 movs r2, 0x20 bl gpu_pal_apply -_0805DD1A: +@0805DD1A: ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] @@ -164644,7 +164644,7 @@ _0805DD1A: adds r0, r1, r0 ldrh r0, [r0, 0x2] cmp r0, 0 - beq _0805DD46 + beq @0805DD46 ldr r3, =0x00007fff adds r0, r7, 0 movs r1, 0x10 @@ -164657,7 +164657,7 @@ _0805DD1A: adds r1, r2 ldr r2, =0x04000008 bl CpuSet -_0805DD46: +@0805DD46: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -164671,7 +164671,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 @@ -164693,22 +164693,22 @@ sub_805DD7C: @ 805DD7C adds r2, r1, r0 ldrh r0, [r2, 0x2] cmp r0, 0 - bne _0805DDC0 + bne @0805DDC0 adds r0, r6, 0 movs r1, 0xB bl pokemon_getattr lsls r0, 16 lsrs r5, r0, 16 ldr r4, [sp] - b _0805DDC8 + b @0805DDC8 .align 2, 0 .pool -_0805DDC0: +@0805DDC0: ldrh r5, [r2, 0x2] ldr r0, =0x020244bc adds r0, r1, r0 ldr r4, [r0] -_0805DDC8: +@0805DDC8: adds r0, r6, 0 movs r1, 0x1 bl pokemon_getattr @@ -164726,15 +164726,15 @@ _0805DDC8: lsls r1, 2 mov r10, r1 cmp r0, 0x1 - beq _0805DE00 + beq @0805DE00 ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] add r0, r10 ldrh r0, [r0, 0x2] cmp r0, 0 - beq _0805DE2C -_0805DE00: + beq @0805DE2C +@0805DE00: lsls r0, r5, 3 ldr r1, =0x083028b8 adds r0, r1 @@ -164747,10 +164747,10 @@ _0805DE00: adds r2, r5, 0 adds r3, r4, 0 bl sub_8034B50 - b _0805DE46 + b @0805DE46 .align 2, 0 .pool -_0805DE2C: +@0805DE2C: lsls r0, r5, 3 ldr r1, =0x083028b8 adds r0, r1 @@ -164763,7 +164763,7 @@ _0805DE2C: adds r2, r5, 0 adds r3, r4, 0 bl sub_8034628 -_0805DE46: +@0805DE46: mov r2, r8 lsls r1, r2, 4 movs r0, 0x80 @@ -164776,18 +164776,18 @@ _0805DE46: ldrh r0, [r0, 0x2] mov r9, r1 cmp r0, 0 - bne _0805DE74 + bne @0805DE74 adds r0, r6, 0 bl pokemon_get_pal - b _0805DE7E + b @0805DE7E .align 2, 0 .pool -_0805DE74: +@0805DE74: adds r0, r5, 0 ldr r1, [sp, 0x4] ldr r2, [sp] bl species_and_otid_get_pal -_0805DE7E: +@0805DE7E: adds r6, r0, 0 ldr r4, =0x0201c000 adds r0, r6, 0 @@ -164804,7 +164804,7 @@ _0805DE7E: bl gpu_pal_apply ldr r0, =0x00000181 cmp r5, r0 - bne _0805DED2 + bne @0805DED2 movs r7, 0x80 lsls r7, 1 add r7, r9 @@ -164825,14 +164825,14 @@ _0805DE7E: adds r1, r7, 0 movs r2, 0x20 bl gpu_pal_apply -_0805DED2: +@0805DED2: ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] add r0, r10 ldrh r0, [r0, 0x2] cmp r0, 0 - beq _0805DEFC + beq @0805DEFC ldr r3, =0x00007fff adds r0, r7, 0 movs r1, 0x10 @@ -164845,7 +164845,7 @@ _0805DED2: adds r1, r2 ldr r2, =0x04000008 bl CpuSet -_0805DEFC: +@0805DEFC: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -164859,17 +164859,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 @@ -164903,7 +164903,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 @@ -164945,12 +164945,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, =0x0830593c @@ -164965,7 +164965,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, =0x0832c128 adds r0, r4, 0 @@ -164976,16 +164976,16 @@ sub_805DFFC: @ 805DFFC bl battle_type_is_double lsls r0, 24 cmp r0, 0 - bne _0805E034 + bne @0805E034 ldr r0, =0x0832c0d0 bl gpu_tile_obj_decompress_and_load ldr r0, =0x0832c0d8 bl gpu_tile_obj_decompress_and_load movs r5, 0x2 - b _0805E056 + b @0805E056 .align 2, 0 .pool -_0805E034: +@0805E034: ldr r4, =0x0832c0e0 adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load @@ -164999,13 +164999,13 @@ _0805E034: adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load movs r5, 0x4 -_0805E056: +@0805E056: movs r4, 0 cmp r4, r5 - bcs _0805E076 + bcs @0805E076 ldr r7, =0x02024076 ldr r6, =0x0832c108 -_0805E060: +@0805E060: adds r0, r4, r7 ldrb r0, [r0] lsls r0, 3 @@ -165015,8 +165015,8 @@ _0805E060: lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc _0805E060 -_0805E076: + bcc @0805E060 +@0805E076: pop {r4-r7} pop {r0} bx r0 @@ -165025,147 +165025,147 @@ _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 adds r5, r4, 0 movs r6, 0 cmp r4, 0 - bne _0805E09C - b _0805E1AE -_0805E09C: + bne @0805E09C + b @0805E1AE +@0805E09C: cmp r4, 0x1 - bne _0805E0B8 + bne @0805E0B8 ldr r4, =0x0832c128 adds r0, r4, 0 bl gpu_pal_obj_alloc_tag_and_apply adds r4, 0x8 adds r0, r4, 0 bl gpu_pal_obj_alloc_tag_and_apply - b _0805E1AE + b @0805E1AE .align 2, 0 .pool -_0805E0B8: +@0805E0B8: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - bne _0805E120 + bne @0805E120 cmp r4, 0x2 - bne _0805E0F0 + bne @0805E0F0 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 - beq _0805E0E4 + beq @0805E0E4 ldr r0, =0x0832c100 bl gpu_tile_obj_decompress_and_load - b _0805E1AE + b @0805E1AE .align 2, 0 .pool -_0805E0E4: +@0805E0E4: ldr r0, =0x0832c0d0 bl gpu_tile_obj_decompress_and_load - b _0805E1AE + b @0805E1AE .align 2, 0 .pool -_0805E0F0: +@0805E0F0: cmp r4, 0x3 - bne _0805E100 + bne @0805E100 ldr r0, =0x0832c0d8 bl gpu_tile_obj_decompress_and_load - b _0805E1AE + b @0805E1AE .align 2, 0 .pool -_0805E100: +@0805E100: cmp r4, 0x4 - bne _0805E110 + bne @0805E110 ldr r0, =0x02024076 ldrb r0, [r0] - b _0805E198 + b @0805E198 .align 2, 0 .pool -_0805E110: +@0805E110: cmp r4, 0x5 - bne _0805E1AC + bne @0805E1AC ldr r0, =0x02024076 ldrb r0, [r0, 0x1] - b _0805E198 + b @0805E198 .align 2, 0 .pool -_0805E120: +@0805E120: cmp r4, 0x2 - bne _0805E130 + bne @0805E130 ldr r0, =0x0832c0e0 bl gpu_tile_obj_decompress_and_load - b _0805E1AE + b @0805E1AE .align 2, 0 .pool -_0805E130: +@0805E130: cmp r4, 0x3 - bne _0805E140 + bne @0805E140 ldr r0, =0x0832c0e8 bl gpu_tile_obj_decompress_and_load - b _0805E1AE + b @0805E1AE .align 2, 0 .pool -_0805E140: +@0805E140: cmp r4, 0x4 - bne _0805E150 + bne @0805E150 ldr r0, =0x0832c0f0 bl gpu_tile_obj_decompress_and_load - b _0805E1AE + b @0805E1AE .align 2, 0 .pool -_0805E150: +@0805E150: cmp r4, 0x5 - bne _0805E160 + bne @0805E160 ldr r0, =0x0832c0f8 bl gpu_tile_obj_decompress_and_load - b _0805E1AE + b @0805E1AE .align 2, 0 .pool -_0805E160: +@0805E160: cmp r4, 0x6 - bne _0805E170 + bne @0805E170 ldr r0, =0x02024076 ldrb r0, [r0] - b _0805E198 + b @0805E198 .align 2, 0 .pool -_0805E170: +@0805E170: cmp r4, 0x7 - bne _0805E180 + bne @0805E180 ldr r0, =0x02024076 ldrb r0, [r0, 0x1] - b _0805E198 + b @0805E198 .align 2, 0 .pool -_0805E180: +@0805E180: cmp r4, 0x8 - bne _0805E190 + bne @0805E190 ldr r0, =0x02024076 ldrb r0, [r0, 0x2] - b _0805E198 + b @0805E198 .align 2, 0 .pool -_0805E190: +@0805E190: cmp r5, 0x9 - bne _0805E1AC + bne @0805E1AC ldr r0, =0x02024076 ldrb r0, [r0, 0x3] -_0805E198: +@0805E198: lsls r0, 3 ldr r1, =0x0832c108 adds r0, r1 bl gpu_tile_obj_decompress_and_load - b _0805E1AE + b @0805E1AE .align 2, 0 .pool -_0805E1AC: +@0805E1AC: movs r6, 0x1 -_0805E1AE: +@0805E1AE: adds r0, r6, 0 pop {r4-r6} pop {r1} @@ -165173,7 +165173,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, =0x08c093f0 ldr r1, =0x020244d4 @@ -165190,73 +165190,73 @@ 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 movs r6, 0 ldrb r0, [r5] cmp r0, 0x6 - bls _0805E1E8 - b _0805E346 -_0805E1E8: + bls @0805E1E8 + b @0805E346 +@0805E1E8: lsls r0, 2 - ldr r1, =_0805E1F8 + ldr r1, =@0805E1F8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0805E1F8: - .4byte _0805E214 - .4byte _0805E21A - .4byte _0805E324 - .4byte _0805E230 - .4byte _0805E260 - .4byte _0805E29C - .4byte _0805E33C -_0805E214: +@0805E1F8: + .4byte @0805E214 + .4byte @0805E21A + .4byte @0805E324 + .4byte @0805E230 + .4byte @0805E260 + .4byte @0805E29C + .4byte @0805E33C +@0805E214: bl sub_805E378 - b _0805E324 -_0805E21A: + b @0805E324 +@0805E21A: ldrb r0, [r4] bl sub_805E08C lsls r0, 24 cmp r0, 0 - beq _0805E228 - b _0805E320 -_0805E228: + beq @0805E228 + b @0805E320 +@0805E228: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _0805E346 -_0805E230: + b @0805E346 +@0805E230: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 - beq _0805E24C + beq @0805E24C ldrb r0, [r4] cmp r0, 0 - bne _0805E24C + bne @0805E24C bl battle_make_oam_safari_battle - b _0805E252 + b @0805E252 .align 2, 0 .pool -_0805E24C: +@0805E24C: ldrb r0, [r4] bl battle_make_oam_normal_battle -_0805E252: +@0805E252: ldr r2, =0x03005d70 ldrb r1, [r4] adds r1, r2 strb r0, [r1] - b _0805E30E + b @0805E30E .align 2, 0 .pool -_0805E260: +@0805E260: ldrb r0, [r4] bl sub_8072B18 ldr r0, =0x02024076 @@ -165264,36 +165264,36 @@ _0805E260: adds r0, r1, r0 ldrb r0, [r0] cmp r0, 0x1 - bhi _0805E288 + bhi @0805E288 ldr r0, =0x03005d70 adds r0, r1, r0 ldrb r0, [r0] movs r1, 0 bl nullsub_30 - b _0805E30E + b @0805E30E .align 2, 0 .pool -_0805E288: +@0805E288: ldr r0, =0x03005d70 adds r0, r1, r0 ldrb r0, [r0] movs r1, 0x1 bl nullsub_30 - b _0805E30E + b @0805E30E .align 2, 0 .pool -_0805E29C: +@0805E29C: ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0805E2E4 + bne @0805E2E4 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 - bne _0805E302 + bne @0805E302 ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 @@ -165308,10 +165308,10 @@ _0805E29C: adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe - b _0805E302 + b @0805E302 .align 2, 0 .pool -_0805E2E4: +@0805E2E4: ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 @@ -165326,13 +165326,13 @@ _0805E2E4: adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe -_0805E302: +@0805E302: ldr r1, =0x03005d70 ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] bl sub_8072984 -_0805E30E: +@0805E30E: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] @@ -165341,22 +165341,22 @@ _0805E30E: lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bne _0805E346 -_0805E320: + bne @0805E346 +@0805E320: movs r0, 0 strb r0, [r4] -_0805E324: +@0805E324: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] - b _0805E346 + b @0805E346 .align 2, 0 .pool -_0805E33C: +@0805E33C: bl sub_805EC84 bl sub_81B8C68 movs r6, 0x1 -_0805E346: +@0805E346: adds r0, r6, 0 pop {r4-r6} pop {r1} @@ -165364,7 +165364,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] @@ -165385,7 +165385,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 @@ -165401,7 +165401,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 @@ -165410,7 +165410,7 @@ sub_805E394: @ 805E394 ldr r5, =0x0202406c ldrb r0, [r5] cmp r4, r0 - bge _0805E3EA + bge @0805E3EA ldr r0, =0x02020630 mov r9, r0 movs r0, 0x1 @@ -165420,7 +165420,7 @@ sub_805E394: @ 805E394 mov r8, r0 ldr r7, =0x020244d0 ldr r6, =0x020241e4 -_0805E3B8: +@0805E3B8: ldr r0, [r7] ldr r0, [r0] lsls r3, r4, 2 @@ -165445,8 +165445,8 @@ _0805E3B8: adds r4, 0x1 ldrb r0, [r5] cmp r4, r0 - blt _0805E3B8 -_0805E3EA: + blt @0805E3B8 +@0805E3EA: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -165458,7 +165458,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 @@ -165490,7 +165490,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 @@ -165504,7 +165504,7 @@ sub_805E448: @ 805E448 str r1, [sp] lsls r2, 24 cmp r2, 0 - beq _0805E51C + beq @0805E51C ldr r0, =0x020241e4 adds r5, r7, r0 ldrb r1, [r5] @@ -165549,7 +165549,7 @@ sub_805E448: @ 805E448 adds r0, r1 ldrh r0, [r0, 0x2] cmp r0, 0 - beq _0805E4DE + beq @0805E4DE ldr r3, =0x00007fff adds r0, r6, 0 movs r1, 0x10 @@ -165562,7 +165562,7 @@ sub_805E448: @ 805E448 adds r1, r2 ldr r2, =0x04000008 bl CpuSet -_0805E4DE: +@0805E4DE: adds r0, r7, 0 bl sub_80A6138 ldrb r2, [r5] @@ -165573,14 +165573,14 @@ _0805E4DE: lsls r0, 24 lsrs r0, 24 strh r0, [r1, 0x22] - b _0805E77A + b @0805E77A .align 2, 0 .pool -_0805E51C: +@0805E51C: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _0805E558 + beq @0805E558 movs r0, 0 mov r10, r0 ldr r0, =0x02039f34 @@ -165598,10 +165598,10 @@ _0805E51C: ldr r1, [r1] ldr r1, [r1, 0x4] ldr r3, [r2, 0x10] - b _0805E5FA + b @0805E5FA .align 2, 0 .pool -_0805E558: +@0805E558: adds r0, r7, 0 bl battle_get_per_side_status lsls r0, 24 @@ -165612,7 +165612,7 @@ _0805E558: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0805E58C + bne @0805E58C ldr r1, =0x0202406e ldr r2, [sp] lsls r0, r2, 1 @@ -165621,10 +165621,10 @@ _0805E558: movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 - b _0805E59C + b @0805E59C .align 2, 0 .pool -_0805E58C: +@0805E58C: ldr r1, =0x0202406e ldr r3, [sp] lsls r0, r3, 1 @@ -165633,7 +165633,7 @@ _0805E58C: movs r0, 0x64 muls r0, r1 ldr r1, =0x020244ec -_0805E59C: +@0805E59C: adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -165644,7 +165644,7 @@ _0805E59C: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0805E618 + bne @0805E618 ldr r0, =0x0202406e lsls r4, r7, 1 adds r4, r0 @@ -165677,13 +165677,13 @@ _0805E59C: lsls r2, r7, 2 adds r2, r3 ldr r3, [r2] -_0805E5FA: +@0805E5FA: mov r2, r8 bl sub_8034B50 - b _0805E662 + b @0805E662 .align 2, 0 .pool -_0805E618: +@0805E618: ldr r0, =0x0202406e lsls r4, r7, 1 adds r4, r0 @@ -165718,7 +165718,7 @@ _0805E618: ldr r3, [r2] mov r2, r8 bl sub_8034B50 -_0805E662: +@0805E662: ldr r0, =0x020244d4 ldr r0, [r0] mov r2, r10 @@ -165765,7 +165765,7 @@ _0805E662: bl gpu_pal_apply ldr r0, =0x00000181 cmp r8, r0 - bne _0805E70A + bne @0805E70A mov r2, r10 ldrb r1, [r2] lsls r0, r1, 4 @@ -165798,7 +165798,7 @@ _0805E662: adds r1, r6, 0 movs r2, 0x20 bl gpu_pal_apply -_0805E70A: +@0805E70A: ldr r3, =0x00007fff adds r0, r6, 0 movs r1, 0x10 @@ -165814,7 +165814,7 @@ _0805E70A: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0805E74A + bne @0805E74A ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -165828,7 +165828,7 @@ _0805E70A: adds r0, r3, r0 ldrb r0, [r0] strb r0, [r1] -_0805E74A: +@0805E74A: adds r0, r7, 0 bl sub_80A6138 mov r1, r10 @@ -165851,7 +165851,7 @@ _0805E74A: adds r1, r7, r1 ldrb r1, [r1] bl obj_anim_image_start -_0805E77A: +@0805E77A: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -165865,42 +165865,42 @@ _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 adds r5, r4, 0 lsls r1, 24 cmp r1, 0 - bne _0805E898 + bne @0805E898 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _0805E7F8 + beq @0805E7F8 movs r4, 0 - b _0805E802 -_0805E7F8: + b @0805E802 +@0805E7F8: adds r0, r4, 0 bl battle_get_per_side_status lsls r0, 24 lsrs r4, r0, 24 -_0805E802: +@0805E802: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _0805E814 + beq @0805E814 ldr r0, =0x08c2d120 - b _0805E822 + b @0805E822 .align 2, 0 .pool -_0805E814: +@0805E814: adds r0, r5, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0805E83C + beq @0805E83C ldr r0, =0x08c2cee0 -_0805E822: +@0805E822: ldr r1, =0x020244d4 ldr r1, [r1] lsls r4, 2 @@ -165908,10 +165908,10 @@ _0805E822: adds r1, r4 ldr r1, [r1] bl call_LZZUnCompVram - b _0805E84E + b @0805E84E .align 2, 0 .pool -_0805E83C: +@0805E83C: ldr r0, =0x08c2d120 ldr r1, =0x020244d4 ldr r1, [r1] @@ -165920,7 +165920,7 @@ _0805E83C: adds r1, r4 ldr r1, [r1] bl call_LZZUnCompVram -_0805E84E: +@0805E84E: movs r3, 0x1 lsls r6, r5, 4 ldr r7, =0x08c2cebc @@ -165930,7 +165930,7 @@ _0805E84E: adds r4, r0, r4 ldr r2, =0x040000d4 ldr r5, =0x84000200 -_0805E860: +@0805E860: ldr r0, [r4] lsls r1, r3, 11 adds r1, r0, r1 @@ -165940,26 +165940,26 @@ _0805E860: ldr r0, [r2, 0x8] adds r3, 0x1 cmp r3, 0x3 - ble _0805E860 + ble @0805E860 movs r0, 0x80 lsls r0, 1 adds r1, r6, r0 adds r0, r7, 0 movs r2, 0x20 bl decompress_palette - b _0805E8E6 + b @0805E8E6 .align 2, 0 .pool -_0805E898: +@0805E898: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0805E8E6 + bne @0805E8E6 adds r0, r4, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0805E8D0 + beq @0805E8D0 ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -165970,10 +165970,10 @@ _0805E898: adds r0, r1 adds r1, r4, 0 bl sub_805DC0C - b _0805E8E6 + b @0805E8E6 .align 2, 0 .pool -_0805E8D0: +@0805E8D0: ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 @@ -165984,7 +165984,7 @@ _0805E8D0: adds r0, r1 adds r1, r5, 0 bl sub_805DD7C -_0805E8E6: +@0805E8E6: pop {r4-r7} pop {r0} bx r0 @@ -165993,7 +165993,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 @@ -166017,16 +166017,16 @@ refresh_graphics_maybe: @ 805E8F4 adds r0, r4, 0 bl obj_anim_image_start cmp r5, 0 - bne _0805E938 + bne @0805E938 adds r0, r6, 0 bl sub_80A614C - b _0805E93E + b @0805E93E .align 2, 0 .pool -_0805E938: +@0805E938: adds r0, r6, 0 bl sub_80A6138 -_0805E93E: +@0805E93E: lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] @@ -166036,14 +166036,14 @@ _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 lsls r1, 16 lsrs r1, 16 cmp r1, 0xA4 - bne _0805E96C + bne @0805E96C ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] @@ -166053,7 +166053,7 @@ sub_805E94C: @ 805E94C movs r2, 0x4 orrs r0, r2 strb r0, [r1] -_0805E96C: +@0805E96C: pop {r0} bx r0 .align 2, 0 @@ -166061,7 +166061,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] @@ -166079,7 +166079,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 @@ -166103,7 +166103,7 @@ sub_805E990: @ 805E990 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0805EA08 + bne @0805EA08 ldr r7, =0x020244d0 ldr r0, [r7] ldr r2, [r0] @@ -166115,7 +166115,7 @@ sub_805E990: @ 805E990 adds r0, r3, 0 ands r0, r1 cmp r0, 0 - bne _0805EA5A + bne @0805EA5A adds r0, r6, 0 eors r0, r5 lsls r0, 2 @@ -166124,20 +166124,20 @@ sub_805E990: @ 805E990 adds r0, r3, 0 ands r0, r1 cmp r0, 0 - bne _0805E9F6 + bne @0805E9F6 movs r0, 0x5A bl audio_play -_0805E9F6: +@0805E9F6: ldr r0, [r7] ldr r1, [r0] adds r1, r4, r1 ldrb r0, [r1] orrs r0, r5 strb r0, [r1] - b _0805EA5A + b @0805EA5A .align 2, 0 .pool -_0805EA08: +@0805EA08: ldr r4, =0x020244d0 ldr r0, [r4] ldr r0, [r0] @@ -166151,17 +166151,17 @@ _0805EA08: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - bne _0805EA34 + bne @0805EA34 movs r0, 0x5A bl m4aSongNumStop - b _0805EA5A + b @0805EA5A .align 2, 0 .pool -_0805EA34: +@0805EA34: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _0805EA5A + beq @0805EA5A ldr r1, [r4] movs r0, 0x2 eors r7, r0 @@ -166172,17 +166172,17 @@ _0805EA34: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _0805EA5A + bne @0805EA5A movs r0, 0x5A bl m4aSongNumStop -_0805EA5A: +@0805EA5A: pop {r4-r7} pop {r0} bx r0 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 @@ -166202,7 +166202,7 @@ sub_805EA60: @ 805EA60 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _0805EAA2 + beq @0805EAA2 ldr r2, [r5] movs r0, 0x2 adds r1, r4, 0 @@ -166214,7 +166214,7 @@ sub_805EA60: @ 805EA60 adds r0, r6, 0 ands r0, r2 strb r0, [r1] -_0805EAA2: +@0805EAA2: movs r0, 0x5A bl m4aSongNumStop pop {r4-r6} @@ -166225,7 +166225,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 @@ -166251,7 +166251,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 @@ -166263,7 +166263,7 @@ sub_805EAE8: @ 805EAE8 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0805EB7E + beq @0805EB7E movs r0, 0 bl battle_get_side_with_given_state lsls r0, 24 @@ -166299,15 +166299,15 @@ sub_805EAE8: @ 805EAE8 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _0805EB5A + beq @0805EB5A adds r0, r4, 0 mov r1, r8 bl sub_805E990 -_0805EB5A: +@0805EB5A: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _0805EB7E + beq @0805EB7E adds r0, r5, 0 muls r0, r7 adds r4, r0, r6 @@ -166315,11 +166315,11 @@ _0805EB5A: movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _0805EB7E + beq @0805EB7E adds r0, r4, 0 mov r1, r9 bl sub_805E990 -_0805EB7E: +@0805EB7E: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -166331,7 +166331,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 @@ -166344,7 +166344,7 @@ sub_805EB9C: @ 805EB9C ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 - bge _0805EC6C + bge @0805EC6C movs r0, 0x3 mov r10, r8 mov r1, r10 @@ -166354,13 +166354,13 @@ sub_805EB9C: @ 805EB9C movs r2, 0x3F negs r2, r2 mov r9, r2 -_0805EBC8: +@0805EBC8: lsls r0, r5, 24 lsrs r0, 24 bl sub_80A6A90 lsls r0, 24 cmp r0, 0 - beq _0805EC60 + beq @0805EC60 ldr r4, =0x02020630 ldr r0, =0x020241e4 adds r3, r5, r0 @@ -166379,7 +166379,7 @@ _0805EBC8: strb r1, [r0, 0x1] mov r7, r8 cmp r7, 0 - bne _0805EC3C + bne @0805EC3C ldr r0, =0x020244d0 ldr r0, [r0] ldr r2, [r0, 0x4] @@ -166402,10 +166402,10 @@ _0805EBC8: mov r2, r9 ands r1, r2 strb r1, [r0, 0x3] - b _0805EC60 + b @0805EC60 .align 2, 0 .pool -_0805EC3C: +@0805EC3C: ldrb r0, [r3] lsls r2, r0, 4 adds r2, r0 @@ -166424,14 +166424,14 @@ _0805EC3C: ands r0, r3 orrs r0, r1 strb r0, [r2, 0x3] -_0805EC60: +@0805EC60: adds r6, 0xC adds r5, 0x1 ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 - blt _0805EBC8 -_0805EC6C: + blt @0805EBC8 +@0805EC6C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -166444,7 +166444,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} @@ -166498,7 +166498,7 @@ sub_805EC84: @ 805EC84 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _0805ED56 + beq @0805ED56 movs r0, 0x3 bl battle_get_side_with_given_state adds r5, r0, 0 @@ -166540,7 +166540,7 @@ sub_805EC84: @ 805EC84 lsls r0, 2 adds r0, r7 strh r5, [r0, 0x2E] -_0805ED56: +@0805ED56: pop {r3} mov r8, r3 pop {r4-r7} @@ -166551,8 +166551,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} @@ -166576,37 +166576,37 @@ sub_805ED70: @ 805ED70 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0805EDAC + beq @0805EDAC adds r0, r4, 0 bl sub_80A6A90 lsls r0, 24 cmp r0, 0 - bne _0805EDC0 -_0805EDAC: + bne @0805EDC0 +@0805EDAC: ldr r0, =sub_805EE48 + 1 str r0, [r5, 0x1C] - b _0805EE36 + b @0805EE36 .align 2, 0 .pool -_0805EDC0: +@0805EDC0: ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 - bne _0805EDD2 + bne @0805EDD2 ldrb r1, [r6] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0805EDE4 -_0805EDD2: + beq @0805EDE4 +@0805EDD2: movs r0, 0x1 mov r8, r0 ldr r2, =0x020244d0 lsls r4, 2 - b _0805EE06 + b @0805EE06 .align 2, 0 .pool -_0805EDE4: +@0805EDE4: ldr r2, =0x020244d0 ldr r0, [r2] ldr r0, [r0] @@ -166615,16 +166615,16 @@ _0805EDE4: ldrh r0, [r3, 0x2] adds r4, r1, 0 cmp r0, 0 - beq _0805EE06 + beq @0805EE06 ldr r0, =0x08305dcc ldrh r1, [r3, 0x2] adds r1, r0 ldrb r0, [r1] cmp r0, 0 - bne _0805EE06 + bne @0805EE06 movs r0, 0x1 mov r8, r0 -_0805EE06: +@0805EE06: ldr r0, [r2] ldr r0, [r0] adds r0, r4, r0 @@ -166632,10 +166632,10 @@ _0805EE06: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0805EE1A + beq @0805EE1A movs r0, 0x1 mov r8, r0 -_0805EE1A: +@0805EE1A: ldrh r0, [r7, 0x20] strh r0, [r5, 0x20] ldrh r0, [r7, 0x24] @@ -166650,7 +166650,7 @@ _0805EE1A: ands r0, r1 orrs r0, r3 strb r0, [r2] -_0805EE36: +@0805EE36: pop {r3} mov r8, r3 pop {r4-r7} @@ -166661,7 +166661,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 @@ -166671,7 +166671,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 @@ -166682,7 +166682,7 @@ sub_805EE54: @ 805EE54 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0805EED0 + beq @0805EED0 ldr r0, =0x020244d0 ldr r3, [r0] ldr r1, [r3] @@ -166690,14 +166690,14 @@ sub_805EE54: @ 805EE54 adds r1, r0, r1 ldrh r0, [r1, 0x2] cmp r0, 0 - beq _0805EE7E + beq @0805EE7E adds r5, r0, 0 -_0805EE7E: +@0805EE7E: ldr r0, =0x08305dcc adds r0, r5, r0 ldrb r0, [r0] cmp r0, 0 - beq _0805EEB4 + beq @0805EEB4 ldr r2, =0x02020630 ldr r1, [r3, 0x4] lsls r0, r4, 1 @@ -166711,10 +166711,10 @@ _0805EE7E: adds r2, 0x1C adds r0, r2 ldr r1, =sub_805ED70 + 1 - b _0805EECE + b @0805EECE .align 2, 0 .pool -_0805EEB4: +@0805EEB4: ldr r2, =0x02020630 ldr r1, [r3, 0x4] lsls r0, r6, 1 @@ -166728,9 +166728,9 @@ _0805EEB4: adds r2, 0x1C adds r0, r2 ldr r1, =sub_805EE48 + 1 -_0805EECE: +@0805EECE: str r1, [r0] -_0805EED0: +@0805EED0: pop {r4-r6} pop {r0} bx r0 @@ -166739,7 +166739,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 @@ -166764,63 +166764,63 @@ 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 movs r6, 0xF0 lsls r6, 8 -_0805EF1E: +@0805EF1E: adds r5, r0, 0x1 movs r4, 0xF -_0805EF22: +@0805EF22: ldrh r1, [r3] adds r0, r6, 0 ands r0, r1 cmp r0, 0 - bne _0805EF32 + bne @0805EF32 adds r0, r6, 0 orrs r0, r1 strh r0, [r3] -_0805EF32: +@0805EF32: ldrh r1, [r3] movs r2, 0xF0 lsls r2, 4 adds r0, r2, 0 ands r0, r1 cmp r0, 0 - bne _0805EF46 + bne @0805EF46 adds r0, r2, 0 orrs r0, r1 strh r0, [r3] -_0805EF46: +@0805EF46: ldrh r1, [r3] movs r2, 0xF0 movs r0, 0xF0 ands r0, r1 cmp r0, 0 - bne _0805EF58 + bne @0805EF58 adds r0, r1, 0 orrs r0, r2 strh r0, [r3] -_0805EF58: +@0805EF58: ldrh r1, [r3] movs r2, 0xF movs r0, 0xF ands r0, r1 cmp r0, 0 - bne _0805EF6A + bne @0805EF6A adds r0, r1, 0 orrs r0, r2 strh r0, [r3] -_0805EF6A: +@0805EF6A: adds r3, 0x2 subs r4, 0x1 cmp r4, 0 - bge _0805EF22 + bge @0805EF22 adds r0, r5, 0 cmp r0, 0x8 - ble _0805EF1E + ble @0805EF1E pop {r4-r6} pop {r0} bx r0 @@ -166829,7 +166829,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 @@ -166846,10 +166846,10 @@ sub_805EF84: @ 805EF84 adds r0, r4, r0 strb r3, [r0] cmp r1, 0 - bne _0805EFAC + bne @0805EFAC adds r0, r4, 0 bl sub_805E974 -_0805EFAC: +@0805EFAC: pop {r4} pop {r0} bx r0 @@ -166858,7 +166858,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 @@ -166876,7 +166876,7 @@ init_uns_table_pokemon_copy: @ 805EFBC bl malloc_and_clear ldr r1, [r4] str r0, [r1] -_0805EFE2: +@0805EFE2: ldr r0, =0x020244d4 ldr r1, [r0] lsls r4, r6, 2 @@ -166905,7 +166905,7 @@ _0805EFE2: mov r10, r1 mov r12, r8 adds r7, r4, 0 -_0805F01A: +@0805F01A: ldr r2, =0x020244d4 ldr r1, [r2] lsls r4, r5, 3 @@ -166928,7 +166928,7 @@ _0805F01A: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _0805F01A + bls @0805F01A ldr r1, =0x020244d4 ldr r2, [r1] mov r5, r9 @@ -166945,7 +166945,7 @@ _0805F01A: lsls r0, r7, 24 lsrs r6, r0, 24 cmp r6, 0x3 - bls _0805EFE2 + bls @0805EFE2 movs r0, 0x80 lsls r0, 5 bl malloc_and_clear @@ -166967,18 +166967,18 @@ _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] cmp r0, 0 - beq _0805F106 + beq @0805F106 movs r1, 0xBE lsls r1, 1 adds r0, r1 ldr r0, [r0] cmp r0, 0 - beq _0805F0BA + beq @0805F0BA bl free ldr r0, [r6] movs r1, 0xBE @@ -166986,14 +166986,14 @@ sub_805F094: @ 805F094 adds r0, r1 movs r1, 0 str r1, [r0] -_0805F0BA: +@0805F0BA: ldr r0, [r6] movs r1, 0xBC lsls r1, 1 adds r0, r1 ldr r0, [r0] cmp r0, 0 - beq _0805F0D8 + beq @0805F0D8 bl free ldr r0, [r6] movs r1, 0xBC @@ -167001,7 +167001,7 @@ _0805F0BA: adds r0, r1 movs r1, 0 str r1, [r0] -_0805F0D8: +@0805F0D8: ldr r0, [r6] movs r5, 0xBA lsls r5, 1 @@ -167022,7 +167022,7 @@ _0805F0D8: str r4, [r0, 0x10] bl free str r4, [r6] -_0805F106: +@0805F106: pop {r4-r6} pop {r0} bx r0 @@ -167031,7 +167031,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 @@ -167039,7 +167039,7 @@ sub_805F110: @ 805F110 ldr r1, =0x00000fff ands r1, r0 cmp r1, 0 - bne _0805F158 + bne @0805F158 adds r0, r5, 0 movs r1, 0x39 bl pokemon_getattr @@ -167059,26 +167059,26 @@ sub_805F110: @ 805F110 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - ble _0805F158 + ble @0805F158 movs r0, 0x1 - b _0805F15A + b @0805F15A .align 2, 0 .pool -_0805F158: +@0805F158: movs r0, 0 -_0805F15A: +@0805F15A: pop {r4,r5} pop {r1} bx r1 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] @@ -167092,7 +167092,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, =0x0832a328 @@ -167104,31 +167104,31 @@ bx_exec_buffer_A_ch0_tbl7: @ 805F180 ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _0805F1CC + beq @0805F1CC ldr r0, =0x02023064 lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] cmp r0, 0x38 - bhi _0805F1C8 + bhi @0805F1C8 ldr r0, =0x0831c6c8 ldrb r1, [r1] lsls r1, 2 adds r1, r0 ldr r0, [r1] bl _call_via_r0 - b _0805F1CC + b @0805F1CC .align 2, 0 .pool -_0805F1C8: +@0805F1C8: bl dp01_tbl7_exec_completed -_0805F1CC: +@0805F1CC: pop {r0} bx r0 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 @@ -167144,9 +167144,9 @@ sub_805F1D0: @ 805F1D0 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _0805F1F4 + bne @0805F1F4 bl dp01_tbl7_exec_completed -_0805F1F4: +@0805F1F4: pop {r0} bx r0 .align 2, 0 @@ -167154,7 +167154,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 @@ -167170,9 +167170,9 @@ sub_805F208: @ 805F208 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _0805F22C + bne @0805F22C bl dp01_tbl7_exec_completed -_0805F22C: +@0805F22C: pop {r0} bx r0 .align 2, 0 @@ -167180,7 +167180,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 @@ -167197,7 +167197,7 @@ sub_805F240: @ 805F240 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _0805F292 + bne @0805F292 adds r0, r2, r5 ldrh r0, [r0, 0x6] bl sub_805DFE4 @@ -167218,7 +167218,7 @@ sub_805F240: @ 805F240 adds r0, r5 bl obj_delete_and_free_tiles bl dp01_tbl7_exec_completed -_0805F292: +@0805F292: pop {r4-r6} pop {r0} bx r0 @@ -167227,7 +167227,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] @@ -167244,7 +167244,7 @@ sub_805F2A8: @ 805F2A8 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _0805F2E0 + bne @0805F2E0 ldr r0, [r4] ldrb r1, [r3] ldr r2, [r0, 0x4] @@ -167255,7 +167255,7 @@ sub_805F2A8: @ 805F2A8 movs r1, 0 strb r1, [r0, 0x9] bl dp01_tbl7_exec_completed -_0805F2E0: +@0805F2E0: pop {r4} pop {r0} bx r0 @@ -167264,7 +167264,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 @@ -167275,26 +167275,26 @@ sub_805F2F0: @ 805F2F0 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _0805F32C + beq @0805F32C bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _0805F31E + beq @0805F31E ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - bne _0805F32C -_0805F31E: + bne @0805F32C +@0805F31E: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 8 ands r0, r1 cmp r0, 0 - beq _0805F368 -_0805F32C: + beq @0805F368 +@0805F32C: ldr r2, =0x02020630 ldr r1, =0x03005d70 ldr r3, =0x02024064 @@ -167309,15 +167309,15 @@ _0805F32C: ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _0805F34E + bne @0805F34E movs r1, 0x1 mov r10, r1 -_0805F34E: +@0805F34E: movs r6, 0 - b _0805F3A2 + b @0805F3A2 .align 2, 0 .pool -_0805F368: +@0805F368: ldr r3, =0x02020630 ldr r6, =0x03005d70 ldr r2, =0x02024064 @@ -167332,7 +167332,7 @@ _0805F368: ldr r5, [r0] ldr r0, =nullsub_12 + 1 cmp r5, r0 - bne _0805F3A0 + bne @0805F3A0 movs r0, 0x2 eors r4, r0 adds r0, r4, r6 @@ -167343,12 +167343,12 @@ _0805F368: adds r0, r3 ldr r0, [r0] cmp r0, r5 - bne _0805F3A0 + bne @0805F3A0 movs r0, 0x1 mov r10, r0 -_0805F3A0: +@0805F3A0: movs r6, 0x1 -_0805F3A2: +@0805F3A2: ldr r3, =0x020244d8 ldr r1, =0x020244d0 mov r8, r1 @@ -167374,11 +167374,11 @@ _0805F3A2: str r0, [r2] mov r0, r10 cmp r0, 0 - bne _0805F3D8 - b _0805F53C -_0805F3D8: + bne @0805F3D8 + b @0805F53C +@0805F3D8: cmp r6, 0x1 - bne _0805F494 + bne @0805F494 ldrb r2, [r7] lsls r0, r2, 1 adds r0, r2 @@ -167388,9 +167388,9 @@ _0805F3D8: adds r0, r6, 0 ands r0, r1 cmp r0, 0 - bne _0805F3F2 - b _0805F53C -_0805F3F2: + bne @0805F3F2 + b @0805F53C +@0805F3F2: mov r0, r9 eors r0, r2 lsls r1, r0, 1 @@ -167400,9 +167400,9 @@ _0805F3F2: ldrb r0, [r1, 0x1] ands r6, r0 cmp r6, 0 - bne _0805F408 - b _0805F53C -_0805F408: + bne @0805F408 + b @0805F53C +@0805F408: ldrb r1, [r4] movs r3, 0x7F adds r0, r3, 0 @@ -167453,10 +167453,10 @@ _0805F408: bl gpu_tile_obj_free_by_tag adds r0, r4, 0 bl gpu_pal_free_tag - b _0805F51A + b @0805F51A .align 2, 0 .pool -_0805F494: +@0805F494: ldrb r2, [r7] lsls r0, r2, 1 adds r0, r2 @@ -167466,13 +167466,13 @@ _0805F494: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0805F53C + beq @0805F53C adds r0, r2, 0 bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bne _0805F4E4 + bne @0805F4E4 mov r0, r8 ldr r2, [r0] ldrb r0, [r7] @@ -167488,13 +167488,13 @@ _0805F494: lsls r0, 1 ands r0, r1 cmp r0, 0 - bne _0805F53C + bne @0805F53C ldr r4, =0x000027f9 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 bl gpu_pal_free_tag -_0805F4E4: +@0805F4E4: mov r1, r8 ldr r0, [r1] ldr r1, =0x02024064 @@ -167522,7 +167522,7 @@ _0805F4E4: negs r0, r0 ands r0, r2 strb r0, [r1, 0x1] -_0805F51A: +@0805F51A: ldr r0, =0x020244d0 ldr r0, [r0] ldr r3, =0x02024064 @@ -167540,7 +167540,7 @@ _0805F51A: adds r0, r1 ldr r1, =sub_805F2A8 + 1 str r1, [r0] -_0805F53C: +@0805F53C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -167553,7 +167553,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 @@ -167578,7 +167578,7 @@ sub_805F560: @ 805F560 adds r0, r6, 0 ands r0, r1 cmp r0, 0 - bne _0805F5A6 + bne @0805F5A6 ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] @@ -167588,17 +167588,17 @@ sub_805F560: @ 805F560 adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 -_0805F5A6: +@0805F5A6: ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x00008040 ands r0, r1 cmp r0, 0 - bne _0805F5EE + bne @0805F5EE bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _0805F5EE + beq @0805F5EE ldr r2, [r5] ldrb r1, [r4] movs r0, 0x2 @@ -167613,7 +167613,7 @@ _0805F5A6: adds r0, r6, 0 ands r0, r1 cmp r0, 0 - bne _0805F5EE + bne @0805F5EE ldr r0, =0x0202406e adds r0, r2, r0 ldrh r1, [r0] @@ -167623,7 +167623,7 @@ _0805F5A6: adds r1, r0 adds r0, r3, 0 bl sub_8172EF0 -_0805F5EE: +@0805F5EE: ldr r2, =0x020244d0 ldr r0, [r2] ldr r1, =0x02024064 @@ -167640,7 +167640,7 @@ _0805F5EE: ands r0, r1 mov r9, r2 cmp r0, 0 - bne _0805F6D0 + bne @0805F6D0 movs r7, 0x2 adds r1, r7, 0 eors r1, r4 @@ -167652,22 +167652,22 @@ _0805F5EE: adds r0, r6, 0 ands r0, r1 cmp r0, 0 - bne _0805F6D0 + bne @0805F6D0 ldrb r1, [r3, 0x1] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0805F6B4 + bne @0805F6B4 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _0805F684 + beq @0805F684 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - bne _0805F684 + bne @0805F684 ldr r4, =0x03005d70 mov r1, r8 ldrb r0, [r1] @@ -167695,7 +167695,7 @@ _0805F5EE: adds r0, r4 ldrb r0, [r0] bl sub_80729D0 -_0805F684: +@0805F684: ldr r5, =0x03005d70 ldr r4, =0x02024064 ldrb r1, [r4] @@ -167717,7 +167717,7 @@ _0805F684: adds r0, r5 ldrb r0, [r0] bl sub_80729D0 -_0805F6B4: +@0805F6B4: ldr r3, =0x020244d0 ldr r2, [r3] ldr r0, =0x02024064 @@ -167732,7 +167732,7 @@ _0805F6B4: orrs r1, r2 strb r1, [r0, 0x1] mov r9, r3 -_0805F6D0: +@0805F6D0: mov r1, r9 ldr r0, [r1] ldr r4, =0x02024064 @@ -167746,7 +167746,7 @@ _0805F6D0: movs r0, 0xC0 ands r0, r1 cmp r0, 0x80 - bne _0805F792 + bne @0805F792 movs r1, 0x2 eors r1, r2 lsls r0, r1, 1 @@ -167757,11 +167757,11 @@ _0805F6D0: movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _0805F792 + bne @0805F792 bl sub_80A36C8 lsls r0, 24 cmp r0, 0 - bne _0805F792 + bne @0805F792 mov r1, r9 ldr r0, [r1] ldrb r4, [r4] @@ -167774,31 +167774,31 @@ _0805F6D0: movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _0805F774 + bne @0805F774 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x42 ands r0, r1 cmp r0, 0x42 - bne _0805F768 + bne @0805F768 adds r0, r4, 0 bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0805F774 + bne @0805F774 ldr r0, =0x03007420 bl m4aMPlayContinue - b _0805F774 + b @0805F774 .align 2, 0 .pool -_0805F768: +@0805F768: ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl -_0805F774: +@0805F774: ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -167814,22 +167814,22 @@ _0805F774: strb r1, [r0, 0x1] movs r0, 0x1 str r0, [sp] -_0805F792: +@0805F792: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _0805F7B2 + beq @0805F7B2 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _0805F810 + beq @0805F810 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _0805F810 -_0805F7B2: + beq @0805F810 +@0805F7B2: ldr r2, =0x02020630 ldr r0, =0x03005d7c ldr r1, =0x02024064 @@ -167844,7 +167844,7 @@ _0805F7B2: ldr r3, [r0] ldr r0, =nullsub_12 + 1 cmp r3, r0 - bne _0805F86E + bne @0805F86E ldr r0, =0x020241e4 adds r0, r4, r0 ldrb r1, [r0] @@ -167854,13 +167854,13 @@ _0805F7B2: adds r0, r2 ldr r0, [r0] cmp r0, r3 - bne _0805F86E + bne @0805F86E movs r1, 0x1 mov r10, r1 - b _0805F86E + b @0805F86E .align 2, 0 .pool -_0805F810: +@0805F810: ldr r2, =0x02020630 ldr r7, =0x03005d7c ldr r0, =0x02024064 @@ -167875,7 +167875,7 @@ _0805F810: ldr r4, [r0] ldr r0, =nullsub_12 + 1 cmp r4, r0 - bne _0805F86E + bne @0805F86E ldr r6, =0x020241e4 adds r0, r3, r6 ldrb r1, [r0] @@ -167885,7 +167885,7 @@ _0805F810: adds r0, r2 ldr r5, [r0] cmp r5, r4 - bne _0805F86E + bne @0805F86E movs r0, 0x2 eors r3, r0 adds r0, r3, r7 @@ -167896,7 +167896,7 @@ _0805F810: adds r0, r2 ldr r4, [r0] cmp r4, r5 - bne _0805F86E + bne @0805F86E adds r0, r3, r6 ldrb r1, [r0] lsls r0, r1, 4 @@ -167905,26 +167905,26 @@ _0805F810: adds r0, r2 ldr r0, [r0] cmp r0, r4 - bne _0805F86E + bne @0805F86E movs r0, 0x1 mov r10, r0 -_0805F86E: +@0805F86E: ldr r1, [sp] cmp r1, 0 - beq _0805F958 + beq @0805F958 mov r0, r10 cmp r0, 0 - beq _0805F958 + beq @0805F958 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _0805F8D2 + beq @0805F8D2 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - bne _0805F8D2 + bne @0805F8D2 ldr r1, =0x03005d7c ldr r5, =0x02024064 ldrb r0, [r5] @@ -167955,7 +167955,7 @@ _0805F86E: lsrs r1, 16 adds r0, r4, 0 bl sub_805EE54 -_0805F8D2: +@0805F8D2: ldr r1, =0x03005d7c ldr r4, =0x02024064 ldrb r0, [r4] @@ -168020,7 +168020,7 @@ _0805F8D2: adds r0, r1 ldr r1, =sub_805F2F0 + 1 str r1, [r0] -_0805F958: +@0805F958: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -168034,7 +168034,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 @@ -168049,7 +168049,7 @@ sub_805F994: @ 805F994 movs r1, 0x24 ldrsh r0, [r0, r1] cmp r0, 0 - bne _0805F9E0 + bne @0805F9E0 ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -168062,7 +168062,7 @@ sub_805F994: @ 805F994 lsls r0, 1 ands r0, r1 cmp r0, 0 - bne _0805F9E0 + bne @0805F9E0 ldr r0, =0x0202406e adds r0, r2, r0 ldrh r1, [r0] @@ -168072,7 +168072,7 @@ sub_805F994: @ 805F994 adds r1, r0 adds r0, r3, 0 bl sub_8172EF0 -_0805F9E0: +@0805F9E0: ldr r2, =0x02020630 ldr r0, =0x020241e4 ldr r5, =0x02024064 @@ -168087,7 +168087,7 @@ _0805F9E0: ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _0805FA48 + bne @0805FA48 ldr r4, =0x020244d0 ldr r0, [r4] ldr r1, [r0, 0x4] @@ -168099,7 +168099,7 @@ _0805F9E0: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0805FA48 + beq @0805FA48 ldrb r1, [r2] movs r0, 0x7F ands r0, r1 @@ -168122,7 +168122,7 @@ _0805F9E0: adds r0, r4, 0 bl gpu_pal_free_tag bl dp01_tbl7_exec_completed -_0805FA48: +@0805FA48: pop {r4,r5} pop {r0} bx r0 @@ -168131,7 +168131,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] @@ -168153,25 +168153,25 @@ sub_805FA70: @ 805FA70 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _0805FAB8 + beq @0805FAB8 ldrb r0, [r6] adds r0, r5 ldrb r0, [r0] movs r2, 0 bl heathbar_draw_hp - b _0805FABC + b @0805FABC .align 2, 0 .pool -_0805FAB8: +@0805FAB8: bl dp01_tbl7_exec_completed -_0805FABC: +@0805FABC: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_805FA70 thumb_func_start sub_805FAC4 -sub_805FAC4: @ 805FAC4 +sub_805FAC4: ; 805FAC4 push {lr} ldr r2, =0x02020630 ldr r0, =0x020241e4 @@ -168187,13 +168187,13 @@ sub_805FAC4: @ 805FAC4 ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - bne _0805FAF2 + bne @0805FAF2 ldr r0, =0x03005d70 adds r0, r3, r0 ldrb r0, [r0] bl sub_8072984 bl dp01_tbl7_exec_completed -_0805FAF2: +@0805FAF2: pop {r0} bx r0 .align 2, 0 @@ -168201,7 +168201,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] @@ -168216,7 +168216,7 @@ sub_805FB08: @ 805FB08 movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _0805FB62 + bne @0805FB62 ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] @@ -168242,7 +168242,7 @@ sub_805FB08: @ 805FB08 ldrb r0, [r0] bl sub_8072984 bl dp01_tbl7_exec_completed -_0805FB62: +@0805FB62: pop {r4-r6} pop {r0} bx r0 @@ -168251,21 +168251,21 @@ _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 a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _0805FB8E + bne @0805FB8E bl dp01_tbl7_exec_completed -_0805FB8E: +@0805FB8E: pop {r0} bx r0 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 @@ -168280,7 +168280,7 @@ bx_blink_t7: @ 805FB94 movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0x20 - bne _0805FBE0 + bne @0805FBE0 movs r3, 0 movs r0, 0 strh r0, [r4, 0x30] @@ -168293,15 +168293,15 @@ bx_blink_t7: @ 805FB94 ldr r0, =0x020244b9 strb r3, [r0] bl dp01_tbl7_exec_completed - b _0805FC0A + b @0805FC0A .align 2, 0 .pool -_0805FBE0: +@0805FBE0: ldrh r0, [r4, 0x30] movs r1, 0x3 ands r0, r1 cmp r0, 0 - bne _0805FC04 + bne @0805FC04 adds r3, r4, 0 adds r3, 0x3E ldrb r2, [r3] @@ -168315,18 +168315,18 @@ _0805FBE0: ands r0, r2 orrs r0, r1 strb r0, [r3] -_0805FC04: +@0805FC04: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] -_0805FC0A: +@0805FC0A: pop {r4} pop {r0} bx r0 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 @@ -168342,7 +168342,7 @@ sub_805FC10: @ 805FC10 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _0805FC5C + bne @0805FC5C ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -168352,20 +168352,20 @@ sub_805FC10: @ 805FC10 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0805FC50 + beq @0805FC50 adds r0, r3, 0 adds r1, r3, 0 adds r2, r3, 0 movs r3, 0x6 bl move_anim_start_t4 -_0805FC50: +@0805FC50: ldr r0, =0x03005d60 ldrb r1, [r4] lsls r1, 2 adds r1, r0 ldr r0, =bx_803AEDC + 1 str r0, [r1] -_0805FC5C: +@0805FC5C: pop {r4} pop {r0} bx r0 @@ -168374,7 +168374,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] @@ -168389,11 +168389,11 @@ bx_803AEDC: @ 805FC80 movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _0805FCDA + bne @0805FCDA bl sub_80A36C8 lsls r0, 24 cmp r0, 0 - bne _0805FCDA + bne @0805FCDA ldr r2, =0x02020630 ldr r1, =0x020241e4 ldrb r0, [r4] @@ -168407,18 +168407,18 @@ bx_803AEDC: @ 805FC80 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - beq _0805FCCA + beq @0805FCCA ldr r0, =nullsub_18 + 1 cmp r1, r0 - bne _0805FCDA -_0805FCCA: + bne @0805FCDA +@0805FCCA: ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl bl dp01_tbl7_exec_completed -_0805FCDA: +@0805FCDA: pop {r4} pop {r0} bx r0 @@ -168427,7 +168427,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] @@ -168442,7 +168442,7 @@ sub_805FD00: @ 805FD00 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0805FDBC + beq @0805FDBC ldr r7, =0x02020630 ldr r6, =0x020241e4 adds r0, r2, r6 @@ -168456,7 +168456,7 @@ sub_805FD00: @ 805FD00 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _0805FDBC + bne @0805FDBC ldrb r1, [r3] movs r0, 0x7F ands r0, r1 @@ -168515,7 +168515,7 @@ sub_805FD00: @ 805FD00 adds r0, r1 ldr r1, =sub_805FC10 + 1 str r1, [r0] -_0805FDBC: +@0805FDBC: pop {r4-r7} pop {r0} bx r0 @@ -168524,7 +168524,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] @@ -168539,7 +168539,7 @@ sub_805FDF0: @ 805FDF0 movs r0, 0x88 ands r0, r1 cmp r0, 0 - bne _0805FE22 + bne @0805FE22 ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] @@ -168549,7 +168549,7 @@ sub_805FDF0: @ 805FDF0 adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 -_0805FE22: +@0805FE22: ldr r4, =0x02020630 ldr r0, =0x03005d7c ldrb r2, [r5] @@ -168564,7 +168564,7 @@ _0805FE22: ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _0805FE8C + bne @0805FE8C ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -168575,7 +168575,7 @@ _0805FE22: movs r0, 0x8 ands r0, r1 cmp r0, 0 - bne _0805FE8C + bne @0805FE8C adds r0, r3, r4 bl obj_delete_and_free_tiles ldrb r4, [r5] @@ -168600,7 +168600,7 @@ _0805FE22: adds r0, r1 ldr r1, =sub_805FD00 + 1 str r1, [r0] -_0805FE8C: +@0805FE8C: pop {r4-r6} pop {r0} bx r0 @@ -168609,7 +168609,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] @@ -168624,9 +168624,9 @@ sub_805FEB8: @ 805FEB8 movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _0805FEDA + bne @0805FEDA bl dp01_tbl7_exec_completed -_0805FEDA: +@0805FEDA: pop {r0} bx r0 .align 2, 0 @@ -168634,7 +168634,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] @@ -168649,9 +168649,9 @@ bx_803B0F4: @ 805FEE8 movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _0805FF0A + bne @0805FF0A bl dp01_tbl7_exec_completed -_0805FF0A: +@0805FF0A: pop {r0} bx r0 .align 2, 0 @@ -168659,7 +168659,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 @@ -168674,7 +168674,7 @@ dp01_tbl7_exec_completed: @ 805FF18 movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _0805FF6C + beq @0805FF6C bl link_get_multiplayer_id mov r1, sp strb r0, [r1] @@ -168688,10 +168688,10 @@ dp01_tbl7_exec_completed: @ 805FF18 adds r0, r1 movs r1, 0x38 strb r1, [r0] - b _0805FF7E + b @0805FF7E .align 2, 0 .pool -_0805FF6C: +@0805FF6C: ldr r2, =0x02024068 ldr r1, =0x0832a328 ldrb r0, [r4] @@ -168701,7 +168701,7 @@ _0805FF6C: ldr r0, [r2] bics r0, r1 str r0, [r2] -_0805FF7E: +@0805FF7E: add sp, 0x4 pop {r4} pop {r0} @@ -168711,7 +168711,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 @@ -168723,7 +168723,7 @@ dp01t_00_7_getattr: @ 805FF90 adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0 - bne _0805FFC8 + bne @0805FFC8 ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 @@ -168731,29 +168731,29 @@ dp01t_00_7_getattr: @ 805FF90 mov r1, sp bl sub_8060004 adds r6, r0, 0 - b _0805FFEA + b @0805FFEA .align 2, 0 .pool -_0805FFC8: +@0805FFC8: ldrb r4, [r1] movs r5, 0 -_0805FFCC: +@0805FFCC: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _0805FFE2 + beq @0805FFE2 lsls r0, r5, 24 lsrs r0, 24 mov r2, sp adds r1, r2, r6 bl sub_8060004 adds r6, r0 -_0805FFE2: +@0805FFE2: lsrs r4, 1 adds r5, 0x1 cmp r5, 0x5 - ble _0805FFCC -_0805FFEA: + ble @0805FFCC +@0805FFEA: lsls r1, r6, 16 lsrs r1, 16 movs r0, 0x1 @@ -168767,7 +168767,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 @@ -168786,79 +168786,79 @@ sub_8060004: @ 8060004 adds r0, r1 ldrb r0, [r0] cmp r0, 0x3B - bls _0806002E - bl _0806079A -_0806002E: + bls @0806002E + bl @0806079A +@0806002E: lsls r0, 2 - ldr r1, =_08060044 + ldr r1, =@08060044 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08060044: - .4byte _08060134 - .4byte _08060358 - .4byte _08060368 - .4byte _08060378 - .4byte _080603E0 - .4byte _080603E0 - .4byte _080603E0 - .4byte _080603E0 - .4byte _080603FC - .4byte _08060438 - .4byte _08060438 - .4byte _08060438 - .4byte _08060438 - .4byte _0806079A - .4byte _0806079A - .4byte _0806079A - .4byte _0806079A - .4byte _08060454 - .4byte _08060464 - .4byte _08060494 - .4byte _080604A4 - .4byte _080604B4 - .4byte _080604C4 - .4byte _080604D4 - .4byte _080604E4 - .4byte _080604F4 - .4byte _08060504 - .4byte _08060514 - .4byte _08060524 - .4byte _08060534 - .4byte _08060544 - .4byte _08060554 - .4byte _080605A4 - .4byte _080605B4 - .4byte _080605C4 - .4byte _080605D4 - .4byte _080605E4 - .4byte _080605F4 - .4byte _08060604 - .4byte _08060614 - .4byte _08060624 - .4byte _08060658 - .4byte _08060668 - .4byte _08060678 - .4byte _08060688 - .4byte _08060698 - .4byte _080606A8 - .4byte _080606B8 - .4byte _080606C8 - .4byte _080606E8 - .4byte _080606F8 - .4byte _08060708 - .4byte _08060718 - .4byte _08060728 - .4byte _08060738 - .4byte _08060748 - .4byte _08060758 - .4byte _08060768 - .4byte _08060778 - .4byte _08060788 -_08060134: +@08060044: + .4byte @08060134 + .4byte @08060358 + .4byte @08060368 + .4byte @08060378 + .4byte @080603E0 + .4byte @080603E0 + .4byte @080603E0 + .4byte @080603E0 + .4byte @080603FC + .4byte @08060438 + .4byte @08060438 + .4byte @08060438 + .4byte @08060438 + .4byte @0806079A + .4byte @0806079A + .4byte @0806079A + .4byte @0806079A + .4byte @08060454 + .4byte @08060464 + .4byte @08060494 + .4byte @080604A4 + .4byte @080604B4 + .4byte @080604C4 + .4byte @080604D4 + .4byte @080604E4 + .4byte @080604F4 + .4byte @08060504 + .4byte @08060514 + .4byte @08060524 + .4byte @08060534 + .4byte @08060544 + .4byte @08060554 + .4byte @080605A4 + .4byte @080605B4 + .4byte @080605C4 + .4byte @080605D4 + .4byte @080605E4 + .4byte @080605F4 + .4byte @08060604 + .4byte @08060614 + .4byte @08060624 + .4byte @08060658 + .4byte @08060668 + .4byte @08060678 + .4byte @08060688 + .4byte @08060698 + .4byte @080606A8 + .4byte @080606B8 + .4byte @080606C8 + .4byte @080606E8 + .4byte @080606F8 + .4byte @08060708 + .4byte @08060718 + .4byte @08060728 + .4byte @08060738 + .4byte @08060748 + .4byte @08060758 + .4byte @08060768 + .4byte @08060778 + .4byte @08060788 +@08060134: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -168895,7 +168895,7 @@ _08060134: str r0, [sp, 0x88] mov r8, r4 add r4, sp, 0xC -_08060180: +@08060180: adds r1, r6, 0 adds r1, 0xD mov r0, r8 @@ -168911,7 +168911,7 @@ _08060180: adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble _08060180 + ble @08060180 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -169089,36 +169089,36 @@ _08060180: bl pokemon_getattr mov r2, sp movs r6, 0 -_08060338: +@08060338: adds r0, r7, r6 adds r1, r2, r6 ldrb r1, [r1] strb r1, [r0] adds r6, 0x1 cmp r6, 0x57 - bls _08060338 - b _0806079A + bls @08060338 + b @0806079A .align 2, 0 .pool -_08060358: +@08060358: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB - b _080606D2 + b @080606D2 .align 2, 0 .pool -_08060368: +@08060368: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0xC - b _080606D2 + b @080606D2 .align 2, 0 .pool -_08060378: +@08060378: movs r6, 0 add r2, sp, 0x58 mov r9, r2 @@ -169130,7 +169130,7 @@ _08060378: ldr r0, =0x02024744 adds r4, r1, r0 mov r8, r9 -_0806038E: +@0806038E: adds r1, r6, 0 adds r1, 0xD adds r0, r4, 0 @@ -169148,7 +169148,7 @@ _0806038E: add r8, r0 adds r6, 0x1 cmp r6, 0x3 - ble _0806038E + ble @0806038E movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -169159,18 +169159,18 @@ _0806038E: strb r0, [r1, 0xC] mov r2, r9 movs r6, 0 -_080603CC: +@080603CC: adds r0, r7, r6 adds r1, r2, r6 ldrb r1, [r1] strb r1, [r0] adds r6, 0x1 cmp r6, 0xF - bls _080603CC - b _0806079A + bls @080603CC + b @0806079A .align 2, 0 .pool -_080603E0: +@080603E0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -169181,17 +169181,17 @@ _080603E0: adds r1, r2 ldrb r1, [r1] adds r1, 0x9 - b _080606D2 + b @080606D2 .align 2, 0 .pool -_080603FC: +@080603FC: movs r6, 0 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 ldr r2, =0x02024744 mov r8, r2 -_08060408: +@08060408: adds r1, r6, 0 adds r1, 0x11 mov r2, r8 @@ -169201,7 +169201,7 @@ _08060408: strb r0, [r1] adds r6, 0x1 cmp r6, 0x3 - ble _08060408 + ble @08060408 movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -169211,10 +169211,10 @@ _08060408: adds r1, r7, r6 strb r0, [r1] adds r6, 0x1 - b _0806079A + b @0806079A .align 2, 0 .pool -_08060438: +@08060438: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -169225,25 +169225,25 @@ _08060438: adds r1, r2 ldrb r1, [r1] adds r1, 0x8 - b _08060792 + b @08060792 .align 2, 0 .pool -_08060454: +@08060454: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1 - b _0806046E + b @0806046E .align 2, 0 .pool -_08060464: +@08060464: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x19 -_0806046E: +@0806046E: bl pokemon_getattr adds r1, r0, 0 strb r1, [r7] @@ -169258,118 +169258,118 @@ _0806046E: lsrs r0, 16 strb r0, [r7, 0x2] movs r6, 0x3 - b _0806079A + b @0806079A .align 2, 0 .pool -_08060494: +@08060494: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1A - b _08060792 + b @08060792 .align 2, 0 .pool -_080604A4: +@080604A4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1B - b _08060792 + b @08060792 .align 2, 0 .pool -_080604B4: +@080604B4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1C - b _08060792 + b @08060792 .align 2, 0 .pool -_080604C4: +@080604C4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1D - b _08060792 + b @08060792 .align 2, 0 .pool -_080604D4: +@080604D4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1E - b _08060792 + b @08060792 .align 2, 0 .pool -_080604E4: +@080604E4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1F - b _08060792 + b @08060792 .align 2, 0 .pool -_080604F4: +@080604F4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x20 - b _08060792 + b @08060792 .align 2, 0 .pool -_08060504: +@08060504: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x22 - b _08060792 + b @08060792 .align 2, 0 .pool -_08060514: +@08060514: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x23 - b _08060792 + b @08060792 .align 2, 0 .pool -_08060524: +@08060524: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x24 - b _08060792 + b @08060792 .align 2, 0 .pool -_08060534: +@08060534: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x25 - b _08060792 + b @08060792 .align 2, 0 .pool -_08060544: +@08060544: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x26 - b _08060792 + b @08060792 .align 2, 0 .pool -_08060554: +@08060554: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -169400,88 +169400,88 @@ _08060554: bl pokemon_getattr strb r0, [r7, 0x5] movs r6, 0x6 - b _0806079A + b @0806079A .align 2, 0 .pool -_080605A4: +@080605A4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x27 - b _08060792 + b @08060792 .align 2, 0 .pool -_080605B4: +@080605B4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x28 - b _08060792 + b @08060792 .align 2, 0 .pool -_080605C4: +@080605C4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x29 - b _08060792 + b @08060792 .align 2, 0 .pool -_080605D4: +@080605D4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2A - b _08060792 + b @08060792 .align 2, 0 .pool -_080605E4: +@080605E4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2B - b _08060792 + b @08060792 .align 2, 0 .pool -_080605F4: +@080605F4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2C - b _08060792 + b @08060792 .align 2, 0 .pool -_08060604: +@08060604: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0 - b _0806062E + b @0806062E .align 2, 0 .pool -_08060614: +@08060614: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x9 - b _080606D2 + b @080606D2 .align 2, 0 .pool -_08060624: +@08060624: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x37 -_0806062E: +@0806062E: bl pokemon_getattr adds r1, r0, 0 strb r1, [r7] @@ -169498,79 +169498,79 @@ _0806062E: lsrs r0, r1, 24 strb r0, [r7, 0x3] movs r6, 0x4 - b _0806079A + b @0806079A .align 2, 0 .pool -_08060658: +@08060658: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x38 - b _08060792 + b @08060792 .align 2, 0 .pool -_08060668: +@08060668: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x39 - b _080606D2 + b @080606D2 .align 2, 0 .pool -_08060678: +@08060678: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3A - b _080606D2 + b @080606D2 .align 2, 0 .pool -_08060688: +@08060688: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3B - b _080606D2 + b @080606D2 .align 2, 0 .pool -_08060698: +@08060698: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3C - b _080606D2 + b @080606D2 .align 2, 0 .pool -_080606A8: +@080606A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3D - b _080606D2 + b @080606D2 .align 2, 0 .pool -_080606B8: +@080606B8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3E - b _080606D2 + b @080606D2 .align 2, 0 .pool -_080606C8: +@080606C8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3F -_080606D2: +@080606D2: bl pokemon_getattr lsls r0, 16 lsrs r0, 16 @@ -169578,110 +169578,110 @@ _080606D2: lsrs r0, 8 strb r0, [r7, 0x1] movs r6, 0x2 - b _0806079A + b @0806079A .align 2, 0 .pool -_080606E8: +@080606E8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x16 - b _08060792 + b @08060792 .align 2, 0 .pool -_080606F8: +@080606F8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x17 - b _08060792 + b @08060792 .align 2, 0 .pool -_08060708: +@08060708: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x18 - b _08060792 + b @08060792 .align 2, 0 .pool -_08060718: +@08060718: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x21 - b _08060792 + b @08060792 .align 2, 0 .pool -_08060728: +@08060728: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2F - b _08060792 + b @08060792 .align 2, 0 .pool -_08060738: +@08060738: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x30 - b _08060792 + b @08060792 .align 2, 0 .pool -_08060748: +@08060748: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x32 - b _08060792 + b @08060792 .align 2, 0 .pool -_08060758: +@08060758: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x33 - b _08060792 + b @08060792 .align 2, 0 .pool -_08060768: +@08060768: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x34 - b _08060792 + b @08060792 .align 2, 0 .pool -_08060778: +@08060778: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x35 - b _08060792 + b @08060792 .align 2, 0 .pool -_08060788: +@08060788: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x36 -_08060792: +@08060792: bl pokemon_getattr strb r0, [r7] movs r6, 0x1 -_0806079A: +@0806079A: adds r0, r6, 0 add sp, 0x90 pop {r3-r5} @@ -169696,7 +169696,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 @@ -169725,9 +169725,9 @@ dp01t_01_2_read_pokmon_data_slice: @ 80607B0 mov r12, r3 ldrb r1, [r1] cmp r2, r1 - bcs _08060806 + bcs @08060806 adds r3, r0, 0 -_080607EC: +@080607EC: adds r1, r4, r2 adds r0, r6, r2 ldrb r0, [r0] @@ -169740,8 +169740,8 @@ _080607EC: adds r0, r3 ldrb r0, [r0] cmp r2, r0 - bcc _080607EC -_08060806: + bcc @080607EC +@08060806: ldrb r0, [r7] lsls r0, 9 mov r1, r12 @@ -169761,7 +169761,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 @@ -169771,33 +169771,33 @@ dp01t_02_7_setattr: @ 8060838 adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0 - bne _08060868 + bne @08060868 ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] bl sub_8060890 - b _08060886 + b @08060886 .align 2, 0 .pool -_08060868: +@08060868: ldrb r4, [r1] movs r5, 0 -_0806086C: +@0806086C: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _0806087A + beq @0806087A adds r0, r5, 0 bl sub_8060890 -_0806087A: +@0806087A: lsrs r4, 1 adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls _0806086C -_08060886: + bls @0806086C +@08060886: bl dp01_tbl7_exec_completed pop {r4,r5} pop {r0} @@ -169805,7 +169805,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 @@ -169826,79 +169826,79 @@ sub_8060890: @ 8060890 adds r6, r3, 0 adds r3, r2, 0 cmp r0, 0x3B - bls _080608BE - bl _0806119C -_080608BE: + bls @080608BE + bl @0806119C +@080608BE: lsls r0, 2 - ldr r1, =_080608D4 + ldr r1, =@080608D4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080608D4: - .4byte _080609C4 - .4byte _08060B5C - .4byte _08060B78 - .4byte _08060B94 - .4byte _08060BE8 - .4byte _08060BE8 - .4byte _08060BE8 - .4byte _08060BE8 - .4byte _08060C08 - .4byte _08060C70 - .4byte _08060C70 - .4byte _08060C70 - .4byte _08060C70 - .4byte _0806119C - .4byte _0806119C - .4byte _0806119C - .4byte _0806119C - .4byte _08060C98 - .4byte _08060CB4 - .4byte _08060CD0 - .4byte _08060CEC - .4byte _08060D08 - .4byte _08060D24 - .4byte _08060D40 - .4byte _08060D5C - .4byte _08060D78 - .4byte _08060D94 - .4byte _08060DB0 - .4byte _08060DCC - .4byte _08060DE8 - .4byte _08060E04 - .4byte _08060E20 - .4byte _08060E94 - .4byte _08060EB0 - .4byte _08060ECC - .4byte _08060EE8 - .4byte _08060F04 - .4byte _08060F20 - .4byte _08060F3C - .4byte _08060F58 - .4byte _08060F74 - .4byte _08060F90 - .4byte _08060FAC - .4byte _08060FC8 - .4byte _08060FE4 - .4byte _08061000 - .4byte _0806101C - .4byte _08061038 - .4byte _08061054 - .4byte _08061070 - .4byte _0806108C - .4byte _080610A8 - .4byte _080610C4 - .4byte _080610E0 - .4byte _080610FC - .4byte _08061118 - .4byte _08061134 - .4byte _08061150 - .4byte _0806116C - .4byte _08061188 -_080609C4: +@080608D4: + .4byte @080609C4 + .4byte @08060B5C + .4byte @08060B78 + .4byte @08060B94 + .4byte @08060BE8 + .4byte @08060BE8 + .4byte @08060BE8 + .4byte @08060BE8 + .4byte @08060C08 + .4byte @08060C70 + .4byte @08060C70 + .4byte @08060C70 + .4byte @08060C70 + .4byte @0806119C + .4byte @0806119C + .4byte @0806119C + .4byte @0806119C + .4byte @08060C98 + .4byte @08060CB4 + .4byte @08060CD0 + .4byte @08060CEC + .4byte @08060D08 + .4byte @08060D24 + .4byte @08060D40 + .4byte @08060D5C + .4byte @08060D78 + .4byte @08060D94 + .4byte @08060DB0 + .4byte @08060DCC + .4byte @08060DE8 + .4byte @08060E04 + .4byte @08060E20 + .4byte @08060E94 + .4byte @08060EB0 + .4byte @08060ECC + .4byte @08060EE8 + .4byte @08060F04 + .4byte @08060F20 + .4byte @08060F3C + .4byte @08060F58 + .4byte @08060F74 + .4byte @08060F90 + .4byte @08060FAC + .4byte @08060FC8 + .4byte @08060FE4 + .4byte @08061000 + .4byte @0806101C + .4byte @08061038 + .4byte @08061054 + .4byte @08061070 + .4byte @0806108C + .4byte @080610A8 + .4byte @080610C4 + .4byte @080610E0 + .4byte @080610FC + .4byte @08061118 + .4byte @08061134 + .4byte @08061150 + .4byte @0806116C + .4byte @08061188 +@080609C4: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -169948,7 +169948,7 @@ _080609C4: adds r6, 0x24 adds r4, r7, 0 adds r4, 0xC -_08060A2A: +@08060A2A: mov r1, r8 adds r1, 0xD mov r0, r9 @@ -169965,7 +169965,7 @@ _08060A2A: add r8, r0 mov r0, r8 cmp r0, 0x3 - ble _08060A2A + ble @08060A2A movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -170077,10 +170077,10 @@ _08060A2A: movs r1, 0x3F ldr r2, [sp, 0x14] bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060B5C: +@08060B5C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170090,10 +170090,10 @@ _08060B5C: adds r2, r3 movs r1, 0xB bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060B78: +@08060B78: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170103,10 +170103,10 @@ _08060B78: adds r2, r3 movs r1, 0xC bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060B94: +@08060B94: movs r0, 0 mov r8, r0 movs r0, 0xC @@ -170119,7 +170119,7 @@ _08060B94: adds r7, r1, r0 adds r6, r4, 0 adds r6, 0x8 -_08060BAC: +@08060BAC: mov r1, r8 adds r1, 0xD adds r0, r7, 0 @@ -170136,7 +170136,7 @@ _08060BAC: add r8, r0 mov r0, r8 cmp r0, 0x3 - ble _08060BAC + ble @08060BAC movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170144,10 +170144,10 @@ _08060BAC: movs r1, 0x15 mov r2, r9 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060BE8: +@08060BE8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170159,10 +170159,10 @@ _08060BE8: adds r1, r2, r1 ldrb r1, [r1] adds r1, 0x9 - b _08060C86 + b @08060C86 .align 2, 0 .pool -_08060C08: +@08060C08: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -170207,10 +170207,10 @@ _08060C08: adds r0, r4, 0 movs r1, 0x15 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060C70: +@08060C70: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170222,14 +170222,14 @@ _08060C70: adds r1, r2, r1 ldrb r1, [r1] adds r1, 0x8 -_08060C86: +@08060C86: adds r3, 0x3 adds r2, r3 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060C98: +@08060C98: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170239,10 +170239,10 @@ _08060C98: adds r2, r3 movs r1, 0x1 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060CB4: +@08060CB4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170252,10 +170252,10 @@ _08060CB4: adds r2, r3 movs r1, 0x19 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060CD0: +@08060CD0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170265,10 +170265,10 @@ _08060CD0: adds r2, r3 movs r1, 0x1A bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060CEC: +@08060CEC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170278,10 +170278,10 @@ _08060CEC: adds r2, r3 movs r1, 0x1B bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060D08: +@08060D08: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170291,10 +170291,10 @@ _08060D08: adds r2, r3 movs r1, 0x1C bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060D24: +@08060D24: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170304,10 +170304,10 @@ _08060D24: adds r2, r3 movs r1, 0x1D bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060D40: +@08060D40: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170317,10 +170317,10 @@ _08060D40: adds r2, r3 movs r1, 0x1E bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060D5C: +@08060D5C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170330,10 +170330,10 @@ _08060D5C: adds r2, r3 movs r1, 0x1F bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060D78: +@08060D78: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170343,10 +170343,10 @@ _08060D78: adds r2, r3 movs r1, 0x20 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060D94: +@08060D94: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170356,10 +170356,10 @@ _08060D94: adds r2, r3 movs r1, 0x22 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060DB0: +@08060DB0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170369,10 +170369,10 @@ _08060DB0: adds r2, r3 movs r1, 0x23 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060DCC: +@08060DCC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170382,10 +170382,10 @@ _08060DCC: adds r2, r3 movs r1, 0x24 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060DE8: +@08060DE8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170395,10 +170395,10 @@ _08060DE8: adds r2, r3 movs r1, 0x25 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060E04: +@08060E04: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170408,10 +170408,10 @@ _08060E04: adds r2, r3 movs r1, 0x26 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060E20: +@08060E20: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -170462,10 +170462,10 @@ _08060E20: adds r0, r3, 0x5 adds r2, r0 adds r0, r4, 0 - b _08060F2E + b @08060F2E .align 2, 0 .pool -_08060E94: +@08060E94: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170475,10 +170475,10 @@ _08060E94: adds r2, r3 movs r1, 0x27 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060EB0: +@08060EB0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170488,10 +170488,10 @@ _08060EB0: adds r2, r3 movs r1, 0x28 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060ECC: +@08060ECC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170501,10 +170501,10 @@ _08060ECC: adds r2, r3 movs r1, 0x29 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060EE8: +@08060EE8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170514,10 +170514,10 @@ _08060EE8: adds r2, r3 movs r1, 0x2A bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060F04: +@08060F04: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170527,10 +170527,10 @@ _08060F04: adds r2, r3 movs r1, 0x2B bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060F20: +@08060F20: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170538,13 +170538,13 @@ _08060F20: ldrb r2, [r6] lsls r2, 9 adds r2, r3 -_08060F2E: +@08060F2E: movs r1, 0x2C bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060F3C: +@08060F3C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170554,10 +170554,10 @@ _08060F3C: adds r2, r3 movs r1, 0 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060F58: +@08060F58: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170567,10 +170567,10 @@ _08060F58: adds r2, r3 movs r1, 0x9 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060F74: +@08060F74: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170580,10 +170580,10 @@ _08060F74: adds r2, r3 movs r1, 0x37 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060F90: +@08060F90: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170593,10 +170593,10 @@ _08060F90: adds r2, r3 movs r1, 0x38 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060FAC: +@08060FAC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170606,10 +170606,10 @@ _08060FAC: adds r2, r3 movs r1, 0x39 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060FC8: +@08060FC8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170619,10 +170619,10 @@ _08060FC8: adds r2, r3 movs r1, 0x3A bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08060FE4: +@08060FE4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170632,10 +170632,10 @@ _08060FE4: adds r2, r3 movs r1, 0x3B bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08061000: +@08061000: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170645,10 +170645,10 @@ _08061000: adds r2, r3 movs r1, 0x3C bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_0806101C: +@0806101C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170658,10 +170658,10 @@ _0806101C: adds r2, r3 movs r1, 0x3D bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08061038: +@08061038: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170671,10 +170671,10 @@ _08061038: adds r2, r3 movs r1, 0x3E bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08061054: +@08061054: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170684,10 +170684,10 @@ _08061054: adds r2, r3 movs r1, 0x3F bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08061070: +@08061070: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170697,10 +170697,10 @@ _08061070: adds r2, r3 movs r1, 0x16 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_0806108C: +@0806108C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170710,10 +170710,10 @@ _0806108C: adds r2, r3 movs r1, 0x17 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_080610A8: +@080610A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170723,10 +170723,10 @@ _080610A8: adds r2, r3 movs r1, 0x18 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_080610C4: +@080610C4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170736,10 +170736,10 @@ _080610C4: adds r2, r3 movs r1, 0x21 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_080610E0: +@080610E0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170749,10 +170749,10 @@ _080610E0: adds r2, r3 movs r1, 0x2F bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_080610FC: +@080610FC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170762,10 +170762,10 @@ _080610FC: adds r2, r3 movs r1, 0x30 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08061118: +@08061118: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170775,10 +170775,10 @@ _08061118: adds r2, r3 movs r1, 0x32 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08061134: +@08061134: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170788,10 +170788,10 @@ _08061134: adds r2, r3 movs r1, 0x33 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08061150: +@08061150: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170801,10 +170801,10 @@ _08061150: adds r2, r3 movs r1, 0x34 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_0806116C: +@0806116C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170814,10 +170814,10 @@ _0806116C: adds r2, r3 movs r1, 0x35 bl pokemon_setattr - b _0806119C + b @0806119C .align 2, 0 .pool -_08061188: +@08061188: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -170827,7 +170827,7 @@ _08061188: adds r2, r3 movs r1, 0x36 bl pokemon_setattr -_0806119C: +@0806119C: add sp, 0x38 pop {r3-r5} mov r8, r3 @@ -170841,7 +170841,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 @@ -170865,11 +170865,11 @@ sub_80611B0: @ 80611B0 adds r2, r0 ldrb r2, [r2] cmp r3, r2 - bcs _08061208 + bcs @08061208 adds r6, r4, 0 adds r2, r7, 0 adds r4, r0, 0 -_080611E6: +@080611E6: adds r1, r5, r3 ldrb r0, [r2] lsls r0, 9 @@ -170886,8 +170886,8 @@ _080611E6: adds r0, r4 ldrb r0, [r0] cmp r3, r0 - bcc _080611E6 -_08061208: + bcc @080611E6 +@08061208: bl dp01_tbl7_exec_completed pop {r4-r7} pop {r0} @@ -170897,7 +170897,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 @@ -171044,7 +171044,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] @@ -171084,7 +171084,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 @@ -171258,7 +171258,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 @@ -171268,7 +171268,7 @@ sub_806156C: @ 806156C adds r0, r1 ldrb r3, [r0] cmp r3, 0 - bne _080615B4 + bne @080615B4 ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -171283,10 +171283,10 @@ sub_806156C: @ 806156C adds r0, r1 ldr r1, =sub_8061604 + 1 str r1, [r0] - b _080615F0 + b @080615F0 .align 2, 0 .pool -_080615B4: +@080615B4: ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] @@ -171312,7 +171312,7 @@ _080615B4: ldrb r0, [r0] bl sub_8072984 bl dp01_tbl7_exec_completed -_080615F0: +@080615F0: pop {r4-r6} pop {r0} bx r0 @@ -171321,7 +171321,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] @@ -171334,13 +171334,13 @@ sub_8061604: @ 8061604 adds r3, r0, r1 ldrb r0, [r3, 0x4] cmp r0, 0 - beq _0806162C + beq @0806162C cmp r0, 0x1 - beq _0806165A - b _08061682 + beq @0806165A + b @08061682 .align 2, 0 .pool -_0806162C: +@0806162C: ldr r1, [r4] lsls r0, r2, 2 adds r0, r1 @@ -171348,12 +171348,12 @@ _0806162C: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08061646 + beq @08061646 adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -_08061646: +@08061646: ldr r0, [r6] ldrb r1, [r5] ldr r2, [r0, 0x4] @@ -171363,15 +171363,15 @@ _08061646: adds r0, r2 movs r1, 0x1 strb r1, [r0, 0x4] - b _08061682 -_0806165A: + b @08061682 +@0806165A: ldrb r1, [r3] movs r0, 0x40 ands r0, r1 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _08061682 + bne @08061682 strb r0, [r3, 0x4] ldrb r2, [r5] adds r0, r2, 0 @@ -171384,7 +171384,7 @@ _0806165A: adds r0, r1 ldr r1, =sub_805FB08 + 1 str r1, [r0] -_08061682: +@08061682: pop {r4-r6} pop {r0} bx r0 @@ -171393,7 +171393,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 @@ -171404,124 +171404,124 @@ sub_8061690: @ 8061690 lsls r0, 20 ands r0, r2 cmp r0, 0 - beq _080616B0 + beq @080616B0 bl sub_806B830 - b _0806175A + b @0806175A .align 2, 0 .pool -_080616B0: +@080616B0: ldr r3, =0x02038bca ldrh r1, [r3] ldr r0, =0x000003fe cmp r1, r0 - bne _080616C8 + bne @080616C8 bl sub_81A4CB0 - b _0806175A + b @0806175A .align 2, 0 .pool -_080616C8: +@080616C8: movs r0, 0x80 lsls r0, 19 ands r0, r2 cmp r0, 0 - beq _08061708 + beq @08061708 movs r0, 0x80 lsls r0, 8 ands r2, r0 cmp r2, 0 - beq _08061700 + beq @08061700 ldr r0, =0x02024064 ldrb r0, [r0] cmp r0, 0x1 - bne _080616F0 + bne @080616F0 ldrh r0, [r3] bl sub_81D5588 - b _0806175A + b @0806175A .align 2, 0 .pool -_080616F0: +@080616F0: ldr r0, =0x02038bcc ldrh r0, [r0] bl sub_81D5588 - b _0806175A + b @0806175A .align 2, 0 .pool -_08061700: +@08061700: ldrh r0, [r3] bl sub_81D5588 - b _0806175A -_08061708: + b @0806175A +@08061708: ldr r0, =0x003f0100 ands r0, r2 cmp r0, 0 - beq _0806174C + beq @0806174C ldr r0, =0x00808000 ands r2, r0 cmp r2, 0 - beq _08061744 + beq @08061744 ldr r0, =0x02024064 ldrb r0, [r0] cmp r0, 0x1 - bne _08061734 + bne @08061734 ldrh r0, [r3] bl sub_8162AA0 - b _0806175A + b @0806175A .align 2, 0 .pool -_08061734: +@08061734: ldr r0, =0x02038bcc ldrh r0, [r0] bl sub_8162AA0 - b _0806175A + b @0806175A .align 2, 0 .pool -_08061744: +@08061744: ldrh r0, [r3] bl sub_8162AA0 - b _0806175A -_0806174C: + b @0806175A +@0806174C: movs r0, 0x80 lsls r0, 4 ands r0, r2 cmp r0, 0 - beq _08061760 + beq @08061760 bl sub_8165244 -_0806175A: +@0806175A: lsls r0, 24 lsrs r4, r0, 24 - b _08061796 -_08061760: + b @08061796 +@08061760: movs r0, 0x80 lsls r0, 8 ands r2, r0 cmp r2, 0 - beq _08061788 + beq @08061788 ldr r0, =0x02024064 ldrb r0, [r0] cmp r0, 0x1 - beq _08061788 + beq @08061788 ldr r2, =0x08310030 ldr r0, =0x02038bcc ldrh r1, [r0] - b _0806178C + b @0806178C .align 2, 0 .pool -_08061788: +@08061788: ldr r2, =0x08310030 ldrh r1, [r3] -_0806178C: +@0806178C: lsls r0, r1, 2 adds r0, r1 lsls r0, 3 adds r0, r2 ldrb r4, [r0, 0x3] -_08061796: +@08061796: ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x00008040 ands r0, r1 cmp r0, 0 - beq _080617C8 + beq @080617C8 ldr r0, =0x02024064 ldrb r0, [r0] bl battle_get_per_side_status @@ -171529,14 +171529,14 @@ _08061796: ands r1, r0 movs r7, 0xC8 cmp r1, 0 - beq _080617CA + beq @080617CA movs r7, 0x98 - b _080617CA + b @080617CA .align 2, 0 .pool -_080617C8: +@080617C8: movs r7, 0xB0 -_080617CA: +@080617CA: mov r8, r4 ldr r5, =0x02024064 ldrb r1, [r5] @@ -171650,7 +171650,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} @@ -171660,118 +171660,118 @@ sub_80618D8: @ 80618D8 lsls r0, 20 ands r0, r2 cmp r0, 0 - beq _080618F8 + beq @080618F8 bl sub_806B830 - b _080619A2 + b @080619A2 .align 2, 0 .pool -_080618F8: +@080618F8: ldr r3, =0x02038bca ldrh r1, [r3] ldr r0, =0x000003fe cmp r1, r0 - bne _08061910 + bne @08061910 bl sub_81A4CB0 - b _080619A2 + b @080619A2 .align 2, 0 .pool -_08061910: +@08061910: movs r0, 0x80 lsls r0, 19 ands r0, r2 cmp r0, 0 - beq _08061950 + beq @08061950 movs r0, 0x80 lsls r0, 8 ands r2, r0 cmp r2, 0 - beq _08061948 + beq @08061948 ldr r0, =0x02024064 ldrb r0, [r0] cmp r0, 0x1 - bne _08061938 + bne @08061938 ldrh r0, [r3] bl sub_81D5588 - b _080619A2 + b @080619A2 .align 2, 0 .pool -_08061938: +@08061938: ldr r0, =0x02038bcc ldrh r0, [r0] bl sub_81D5588 - b _080619A2 + b @080619A2 .align 2, 0 .pool -_08061948: +@08061948: ldrh r0, [r3] bl sub_81D5588 - b _080619A2 -_08061950: + b @080619A2 +@08061950: ldr r0, =0x003f0100 ands r0, r2 cmp r0, 0 - beq _08061994 + beq @08061994 ldr r0, =0x00808000 ands r2, r0 cmp r2, 0 - beq _0806198C + beq @0806198C ldr r0, =0x02024064 ldrb r0, [r0] cmp r0, 0x1 - bne _0806197C + bne @0806197C ldrh r0, [r3] bl sub_8162AA0 - b _080619A2 + b @080619A2 .align 2, 0 .pool -_0806197C: +@0806197C: ldr r0, =0x02038bcc ldrh r0, [r0] bl sub_8162AA0 - b _080619A2 + b @080619A2 .align 2, 0 .pool -_0806198C: +@0806198C: ldrh r0, [r3] bl sub_8162AA0 - b _080619A2 -_08061994: + b @080619A2 +@08061994: movs r0, 0x80 lsls r0, 4 ands r0, r2 cmp r0, 0 - beq _080619A8 + beq @080619A8 bl sub_8165244 -_080619A2: +@080619A2: lsls r0, 24 lsrs r0, 24 - b _080619DE -_080619A8: + b @080619DE +@080619A8: movs r0, 0x80 lsls r0, 8 ands r2, r0 cmp r2, 0 - beq _080619D0 + beq @080619D0 ldr r0, =0x02024064 ldrb r0, [r0] cmp r0, 0x1 - beq _080619D0 + beq @080619D0 ldr r2, =0x08310030 ldr r0, =0x02038bcc ldrh r1, [r0] - b _080619D4 + b @080619D4 .align 2, 0 .pool -_080619D0: +@080619D0: ldr r2, =0x08310030 ldrh r1, [r3] -_080619D4: +@080619D4: lsls r0, r1, 2 adds r0, r1 lsls r0, 3 adds r0, r2 ldrb r0, [r0, 0x3] -_080619DE: +@080619DE: mov r8, r0 ldr r6, =0x02024064 ldrb r1, [r6] @@ -171886,7 +171886,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 @@ -171961,7 +171961,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] @@ -171974,7 +171974,7 @@ sub_8061B9C: @ 8061B9C adds r3, r1, r0 ldrb r0, [r3, 0x4] cmp r0, 0 - bne _08061BF0 + bne @08061BF0 ldr r1, [r4] lsls r0, r2, 2 adds r0, r1 @@ -171982,12 +171982,12 @@ sub_8061B9C: @ 8061B9C movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08061BD0 + beq @08061BD0 adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -_08061BD0: +@08061BD0: ldr r0, [r6] ldrb r1, [r5] ldr r2, [r0, 0x4] @@ -171998,17 +171998,17 @@ _08061BD0: ldrb r1, [r0, 0x4] adds r1, 0x1 strb r1, [r0, 0x4] - b _08061C2C + b @08061C2C .align 2, 0 .pool -_08061BF0: +@08061BF0: ldrb r1, [r3] movs r0, 0x40 ands r0, r1 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _08061C2C + bne @08061C2C strb r0, [r3, 0x4] movs r0, 0x10 movs r1, 0x3F @@ -172031,7 +172031,7 @@ _08061BF0: adds r0, r1 ldr r1, =sub_805FAC4 + 1 str r1, [r0] -_08061C2C: +@08061C2C: pop {r4-r6} pop {r0} bx r0 @@ -172040,7 +172040,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} @@ -172048,7 +172048,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} @@ -172056,7 +172056,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} @@ -172064,7 +172064,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} @@ -172072,16 +172072,16 @@ 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] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - beq _08061C8A - b _08061D9E -_08061C8A: + beq @08061C8A + b @08061D9E +@08061C8A: ldr r0, =0x02023064 mov r12, r0 ldrb r2, [r6] @@ -172181,12 +172181,12 @@ _08061C8A: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq _08061D80 + beq @08061D80 bl dp01_tbl7_exec_completed - b _08061D9E + b @08061D9E .align 2, 0 .pool -_08061D80: +@08061D80: ldr r0, =0x020244d0 ldr r0, [r0] ldrb r1, [r6] @@ -172202,7 +172202,7 @@ _08061D80: adds r0, r1 ldr r1, =bx_move_anim_7 + 1 str r1, [r0] -_08061D9E: +@08061D9E: pop {r4-r6} pop {r0} bx r0 @@ -172211,7 +172211,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 @@ -172244,21 +172244,21 @@ bx_move_anim_7: @ 8061DB0 adds r0, r1 ldrb r2, [r0, 0x4] cmp r2, 0x1 - beq _08061E48 + beq @08061E48 cmp r2, 0x1 - bgt _08061E08 + bgt @08061E08 cmp r2, 0 - beq _08061E12 - b _08061F24 + beq @08061E12 + b @08061F24 .align 2, 0 .pool -_08061E08: +@08061E08: cmp r2, 0x2 - beq _08061E72 + beq @08061E72 cmp r2, 0x3 - beq _08061EE8 - b _08061F24 -_08061E12: + beq @08061EE8 + b @08061F24 +@08061E12: ldr r1, [r5] lsls r0, r3, 2 adds r1, r0, r1 @@ -172266,7 +172266,7 @@ _08061E12: movs r0, 0xC ands r0, r2 cmp r0, 0x4 - bne _08061E34 + bne @08061E34 movs r0, 0x8 orrs r0, r2 strb r0, [r1] @@ -172275,7 +172275,7 @@ _08061E12: adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -_08061E34: +@08061E34: ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -172285,13 +172285,13 @@ _08061E34: adds r0, r2 movs r1, 0x1 strb r1, [r0, 0x4] - b _08061F24 -_08061E48: + b @08061F24 +@08061E48: ldrb r1, [r0] movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _08061F24 + bne @08061F24 movs r0, 0 bl sub_805EB9C adds r0, r4, 0 @@ -172305,15 +172305,15 @@ _08061E48: adds r0, r2 movs r1, 0x2 strb r1, [r0, 0x4] - b _08061F24 -_08061E72: + b @08061F24 +@08061E72: ldr r0, =0x020383f8 ldr r0, [r0] bl _call_via_r0 ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 - bne _08061F24 + bne @08061F24 movs r0, 0x1 bl sub_805EB9C ldr r0, [r7] @@ -172325,10 +172325,10 @@ _08061E72: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08061EC0 + beq @08061EC0 mov r0, r8 cmp r0, 0x1 - bhi _08061EC0 + bhi @08061EC0 adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x6 @@ -172343,7 +172343,7 @@ _08061E72: negs r0, r0 ands r0, r2 strb r0, [r1] -_08061EC0: +@08061EC0: ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -172355,17 +172355,17 @@ _08061EC0: adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x4] - b _08061F24 + b @08061F24 .align 2, 0 .pool -_08061EE8: +@08061EE8: ldrb r1, [r0] movs r0, 0x40 ands r0, r1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _08061F24 + bne @08061F24 bl sub_805E394 ldrb r0, [r6] lsls r2, r0, 9 @@ -172386,7 +172386,7 @@ _08061EE8: adds r0, r2 strb r4, [r0, 0x4] bl dp01_tbl7_exec_completed -_08061F24: +@08061F24: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -172397,7 +172397,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 @@ -172431,7 +172431,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} @@ -172439,7 +172439,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 @@ -172448,7 +172448,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} @@ -172456,7 +172456,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] @@ -172464,21 +172464,21 @@ sub_8061FB8: @ 8061FB8 lsls r0, 10 ands r0, r2 cmp r0, 0 - beq _08061FE4 + beq @08061FE4 bl sub_805D19C adds r2, r0, 0 lsls r2, 16 lsrs r2, 16 movs r0, 0x1 movs r1, 0xA -_08061FD6: +@08061FD6: bl dp01_build_cmdbuf_x21_a_bb -_08061FDA: +@08061FDA: bl dp01_tbl7_exec_completed - b _08062156 + b @08062156 .align 2, 0 .pool -_08061FE4: +@08061FE4: ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 @@ -172488,44 +172488,44 @@ _08061FE4: lsls r0, 3 ands r2, r0 cmp r2, 0 - beq _080620C4 + beq @080620C4 movs r0, 0xF bl sub_8130950 bl sub_8130BA4 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - beq _08062022 + beq @08062022 cmp r4, 0x5 - bgt _0806201C + bgt @0806201C cmp r4, 0x4 - beq _08062028 - b _08062040 + beq @08062028 + b @08062040 .align 2, 0 .pool -_0806201C: +@0806201C: cmp r4, 0x6 - beq _08062030 - b _08062040 -_08062022: + beq @08062030 + b @08062040 +@08062022: movs r0, 0x1 movs r1, 0x4 - b _0806202C -_08062028: + b @0806202C +@08062028: movs r0, 0x1 movs r1, 0x3 -_0806202C: +@0806202C: movs r2, 0 - b _08061FD6 -_08062030: + b @08061FD6 +@08062030: ldr r0, =0x0202420c ldrb r2, [r0] movs r0, 0x1 movs r1, 0xF - b _08061FD6 + b @08061FD6 .align 2, 0 .pool -_08062040: +@08062040: ldr r3, =0x0831c898 lsls r0, r4, 1 adds r2, r5, r0 @@ -172538,12 +172538,12 @@ _08062040: movs r0, 0x12 ands r0, r1 cmp r0, 0 - beq _08062062 + beq @08062062 ldr r0, =0x0202420c ldr r1, =0x02024064 ldrb r1, [r1] strb r1, [r0] -_08062062: +@08062062: ldrh r1, [r2] lsls r0, r1, 1 adds r0, r1 @@ -172553,7 +172553,7 @@ _08062062: movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _0806209C + beq @0806209C movs r0, 0 bl battle_get_side_with_given_state ldr r5, =0x0202420c @@ -172567,11 +172567,11 @@ _08062062: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _0806209C + beq @0806209C movs r0, 0x2 bl battle_get_side_with_given_state strb r0, [r5] -_0806209C: +@0806209C: ldr r0, =0x0202420c ldrb r0, [r0] lsls r0, 8 @@ -172580,12 +172580,12 @@ _0806209C: movs r1, 0xA adds r2, r4, 0 bl dp01_build_cmdbuf_x21_a_bb - b _08061FDA + b @08061FDA .align 2, 0 .pool -_080620C4: +@080620C4: movs r6, 0x3 -_080620C6: +@080620C6: bl GenerateRandomNumber adds r4, r0, 0 ands r4, r6 @@ -172593,7 +172593,7 @@ _080620C6: adds r0, r5, r0 ldrh r2, [r0] cmp r2, 0 - beq _080620C6 + beq @080620C6 ldr r1, =0x0831c898 lsls r0, r2, 1 adds r0, r2 @@ -172603,7 +172603,7 @@ _080620C6: movs r0, 0x12 ands r0, r1 cmp r0, 0 - beq _08062108 + beq @08062108 ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 8 @@ -172612,16 +172612,16 @@ _080620C6: movs r1, 0xA adds r2, r4, 0 bl dp01_build_cmdbuf_x21_a_bb - b _08062152 + b @08062152 .align 2, 0 .pool -_08062108: +@08062108: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0806213C + beq @0806213C bl GenerateRandomNumber movs r1, 0x2 ands r1, r0 @@ -172636,10 +172636,10 @@ _08062108: movs r0, 0x1 movs r1, 0xA bl dp01_build_cmdbuf_x21_a_bb - b _08062152 + b @08062152 .align 2, 0 .pool -_0806213C: +@0806213C: movs r0, 0 bl battle_get_side_with_given_state adds r2, r0, 0 @@ -172649,16 +172649,16 @@ _0806213C: movs r0, 0x1 movs r1, 0xA bl dp01_build_cmdbuf_x21_a_bb -_08062152: +@08062152: bl dp01_tbl7_exec_completed -_08062156: +@08062156: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_8061FB8 thumb_func_start sub_806215C -sub_806215C: @ 806215C +sub_806215C: ; 806215C push {lr} ldr r0, =0x02024064 ldrb r0, [r0] @@ -172679,7 +172679,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] @@ -172691,27 +172691,27 @@ sub_8062188: @ 8062188 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0x6 - bne _08062254 + bne @08062254 bl sub_8063A90 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x6 - bne _0806225A + bne @0806225A ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _080621D4 + bne @080621D4 movs r0, 0x1 bl battle_get_side_with_given_state lsls r0, 24 lsrs r5, r0, 24 adds r7, r5, 0 - b _080621E8 + b @080621E8 .align 2, 0 .pool -_080621D4: +@080621D4: movs r0, 0x1 bl battle_get_side_with_given_state lsls r0, 24 @@ -172720,37 +172720,37 @@ _080621D4: bl battle_get_side_with_given_state lsls r0, 24 lsrs r5, r0, 24 -_080621E8: +@080621E8: ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x00808000 ands r0, r1 cmp r0, 0 - beq _08062214 + beq @08062214 ldr r0, =0x02024064 ldrb r0, [r0] cmp r0, 0x1 - bne _08062210 + bne @08062210 movs r0, 0 movs r6, 0x3 - b _08062218 + b @08062218 .align 2, 0 .pool -_08062210: +@08062210: movs r0, 0x3 - b _08062216 -_08062214: + b @08062216 +@08062214: movs r0, 0 -_08062216: +@08062216: movs r6, 0x6 -_08062218: +@08062218: adds r4, r0, 0 - b _0806221E -_0806221C: + b @0806221E +@0806221C: adds r4, 0x1 -_0806221E: +@0806221E: cmp r4, r6 - bge _0806225A + bge @0806225A movs r0, 0x64 muls r0, r4 ldr r1, =0x02024744 @@ -172758,26 +172758,26 @@ _0806221E: movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _0806221C + beq @0806221C ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] cmp r4, r0 - beq _0806221C + beq @0806221C lsls r0, r5, 1 adds r0, r1 ldrh r0, [r0] cmp r4, r0 - beq _0806221C - b _0806225A + beq @0806221C + b @0806225A .align 2, 0 .pool -_08062254: +@08062254: ldrb r4, [r1] movs r0, 0x6 strb r0, [r1] -_0806225A: +@0806225A: ldr r0, =0x02024064 ldrb r0, [r0] ldr r1, =0x0202449c @@ -172799,7 +172799,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} @@ -172807,7 +172807,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 @@ -172832,7 +172832,7 @@ sub_8062294: @ 8062294 asrs r7, r0, 16 ldr r0, =0x00007fff cmp r7, r0 - beq _08062324 + beq @08062324 ldr r6, =0x0202406e lsls r0, r4, 1 adds r0, r6 @@ -172862,10 +172862,10 @@ sub_8062294: @ 8062294 str r7, [sp] mov r2, r8 bl sub_807294C - b _0806234E + b @0806234E .align 2, 0 .pool -_08062324: +@08062324: ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -172885,7 +172885,7 @@ _08062324: str r7, [sp] movs r3, 0 bl sub_807294C -_0806234E: +@0806234E: ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -172905,7 +172905,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} @@ -172913,14 +172913,14 @@ 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] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne _080623E4 + bne @080623E4 ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 @@ -172954,7 +172954,7 @@ sub_8062390: @ 8062390 adds r0, r1 ldr r1, =sub_805FEB8 + 1 str r1, [r0] -_080623E4: +@080623E4: pop {r4} pop {r0} bx r0 @@ -172963,14 +172963,14 @@ _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] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne _08062458 + bne @08062458 ldr r4, =0x02023064 ldrb r3, [r5] lsls r3, 9 @@ -173002,7 +173002,7 @@ sub_8062408: @ 8062408 adds r0, r1 ldr r1, =sub_805FEB8 + 1 str r1, [r0] -_08062458: +@08062458: pop {r4,r5} pop {r0} bx r0 @@ -173011,7 +173011,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} @@ -173019,7 +173019,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} @@ -173027,7 +173027,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} @@ -173035,7 +173035,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} @@ -173043,7 +173043,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} @@ -173051,7 +173051,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} @@ -173059,7 +173059,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} @@ -173067,7 +173067,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} @@ -173075,7 +173075,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} @@ -173083,7 +173083,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] @@ -173099,7 +173099,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 @@ -173125,7 +173125,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] @@ -173140,7 +173140,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] @@ -173162,7 +173162,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 @@ -173178,12 +173178,12 @@ dp01t_29_7_blink: @ 8062570 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - bge _080625A4 + bge @080625A4 bl dp01_tbl7_exec_completed - b _080625CE + b @080625CE .align 2, 0 .pool -_080625A4: +@080625A4: ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] @@ -173204,7 +173204,7 @@ _080625A4: adds r0, r1 ldr r1, =bx_blink_t7 + 1 str r1, [r0] -_080625CE: +@080625CE: pop {r4} pop {r0} bx r0 @@ -173213,7 +173213,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} @@ -173221,7 +173221,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] @@ -173229,9 +173229,9 @@ sub_80625EC: @ 80625EC lsls r0, 24 movs r3, 0x3F cmp r0, 0 - bne _08062600 + bne @08062600 movs r3, 0xC0 -_08062600: +@08062600: ldr r2, =0x02023064 ldrb r1, [r4] lsls r1, 9 @@ -173255,7 +173255,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 @@ -173265,7 +173265,7 @@ sub_8062630: @ 8062630 adds r0, r3, r0 ldrb r0, [r0] cmp r0, 0 - beq _0806266C + beq @0806266C bl sub_805EA60 ldrb r1, [r5] lsls r1, 9 @@ -173278,10 +173278,10 @@ sub_8062630: @ 8062630 lsls r1, 8 orrs r0, r1 bl song_play_for_text - b _08062680 + b @08062680 .align 2, 0 .pool -_0806266C: +@0806266C: adds r0, r4, 0x1 adds r0, r3, r0 ldrb r0, [r0] @@ -173291,7 +173291,7 @@ _0806266C: lsls r1, 8 orrs r0, r1 bl fanfare_play -_08062680: +@08062680: bl dp01_tbl7_exec_completed pop {r4,r5} pop {r0} @@ -173299,7 +173299,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 @@ -173326,7 +173326,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 @@ -173349,7 +173349,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 @@ -173434,7 +173434,7 @@ sub_80626FC: @ 80626FC movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080627BE + beq @080627BE ldr r0, =0x020244b4 adds r0, r2, r0 ldrb r1, [r0] @@ -173444,7 +173444,7 @@ sub_80626FC: @ 80626FC adds r0, r4 ldr r1, =sub_8073C30 + 1 str r1, [r0] -_080627BE: +@080627BE: ldr r0, [r3] ldr r2, [r0, 0x8] ldrb r0, [r2, 0x9] @@ -173465,7 +173465,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] @@ -173480,7 +173480,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 @@ -173502,19 +173502,19 @@ sub_8062828: @ 8062828 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _0806286C + beq @0806286C ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _0806286C + bne @0806286C movs r0, 0x80 lsls r0, 8 ands r1, r0 cmp r1, 0 - beq _080628A0 -_0806286C: + beq @080628A0 +@0806286C: ldr r0, =0x02023064 ldrb r1, [r7] lsls r2, r1, 9 @@ -173528,10 +173528,10 @@ _0806286C: ldrb r0, [r7] movs r1, 0 bl sub_80613DC - b _080628E0 + b @080628E0 .align 2, 0 .pool -_080628A0: +@080628A0: ldr r4, =0x02023064 ldrb r0, [r7] lsls r1, r0, 9 @@ -173562,7 +173562,7 @@ _080628A0: ldrb r0, [r7] eors r0, r5 strb r0, [r7] -_080628E0: +@080628E0: ldr r1, =0x03005d60 ldr r2, =0x02024064 ldrb r0, [r2] @@ -173585,7 +173585,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 @@ -173595,17 +173595,17 @@ dp01t_30_7_0803D67C: @ 8062918 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _08062948 + beq @08062948 adds r0, r2, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08062948 + bne @08062948 bl dp01_tbl7_exec_completed - b _08062A12 + b @08062A12 .align 2, 0 .pool -_08062948: +@08062948: ldr r4, =0x020244d0 ldr r0, [r4] ldr r3, =0x02024064 @@ -173627,7 +173627,7 @@ _08062948: ldrb r0, [r0] adds r7, r3, 0 cmp r0, 0 - beq _080629B4 + beq @080629B4 ldr r0, [r4] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -173638,7 +173638,7 @@ _08062948: lsls r1, r2, 27 lsrs r0, r1, 28 cmp r0, 0x1 - bhi _080629AC + bhi @080629AC adds r0, 0x1 movs r1, 0xF ands r0, r1 @@ -173648,15 +173648,15 @@ _08062948: ands r1, r2 orrs r1, r0 strb r1, [r3, 0x1] - b _08062A12 + b @08062A12 .align 2, 0 .pool -_080629AC: +@080629AC: movs r0, 0x1F negs r0, r0 ands r0, r2 strb r0, [r3, 0x1] -_080629B4: +@080629B4: adds r5, r7, 0 ldrb r0, [r5] lsls r3, r0, 9 @@ -173688,7 +173688,7 @@ _080629B4: adds r0, r4 ldrb r0, [r0] cmp r0, 0 - beq _08062A06 + beq @08062A06 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -173697,14 +173697,14 @@ _080629B4: adds r0, r1 movs r1, 0x5D strb r1, [r0, 0x5] -_08062A06: +@08062A06: ldr r0, =0x03005d60 ldrb r1, [r7] lsls r1, 2 adds r1, r0 ldr r0, =bx_0803D790_t7 + 1 str r0, [r1] -_08062A12: +@08062A12: pop {r4-r7} pop {r0} bx r0 @@ -173713,7 +173713,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] @@ -173730,7 +173730,7 @@ bx_0803D790_t7: @ 8062A2C lsls r1, 24 lsrs r1, 24 cmp r1, 0x5C - bls _08062A64 + bls @08062A64 ldr r0, [r4] ldrb r1, [r3] ldr r2, [r0, 0x4] @@ -173741,7 +173741,7 @@ bx_0803D790_t7: @ 8062A2C movs r1, 0 strb r1, [r0, 0x5] bl dp01_tbl7_exec_completed -_08062A64: +@08062A64: pop {r4} pop {r0} bx r0 @@ -173750,7 +173750,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] @@ -173765,7 +173765,7 @@ sub_8062A74: @ 8062A74 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08062AA6 + beq @08062AA6 ldr r2, =0x03005e00 ldr r0, =0x020244b4 adds r0, r3, r0 @@ -173776,7 +173776,7 @@ sub_8062A74: @ 8062A74 adds r0, r2 ldr r1, =sub_8073C30 + 1 str r1, [r0] -_08062AA6: +@08062AA6: bl dp01_tbl7_exec_completed pop {r0} bx r0 @@ -173785,7 +173785,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} @@ -173793,14 +173793,14 @@ 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] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 - beq _08062B16 + beq @08062B16 ldr r3, =0x02020630 ldr r0, =0x020241e4 ldrb r1, [r4] @@ -173827,7 +173827,7 @@ sub_8062AD0: @ 8062AD0 strb r0, [r2] ldrb r0, [r4] bl sub_805E408 -_08062B16: +@08062B16: bl dp01_tbl7_exec_completed pop {r4} pop {r0} @@ -173837,7 +173837,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 @@ -173845,7 +173845,7 @@ dp01t_34_7_move_anim_start_t3: @ 8062B30 bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne _08062B88 + bne @08062B88 ldr r5, =0x02023064 ldrb r2, [r6] lsls r1, r2, 9 @@ -173866,19 +173866,19 @@ dp01t_34_7_move_anim_start_t3: @ 8062B30 bl move_anim_start_t3 lsls r0, 24 cmp r0, 0 - beq _08062B7C + beq @08062B7C bl dp01_tbl7_exec_completed - b _08062B88 + b @08062B88 .align 2, 0 .pool -_08062B7C: +@08062B7C: ldr r0, =0x03005d60 ldrb r1, [r6] lsls r1, 2 adds r1, r0 ldr r0, =bx_803B0F4 + 1 str r0, [r1] -_08062B88: +@08062B88: add sp, 0x4 pop {r4-r6} pop {r0} @@ -173888,7 +173888,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} @@ -173896,7 +173896,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} @@ -173904,14 +173904,14 @@ 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] movs r1, 0x6 ands r0, r1 cmp r0, 0x2 - bne _08062BDA + bne @08062BDA ldr r2, =0x030022c0 ldr r0, =0x00000439 adds r3, r2, r0 @@ -173925,7 +173925,7 @@ sub_8062BB0: @ 8062BB0 str r0, [r2] ldr r0, [r2, 0x8] bl set_callback2 -_08062BDA: +@08062BDA: bl dp01_tbl7_exec_completed pop {r0} bx r0 @@ -173934,12 +173934,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 @@ -173950,7 +173950,7 @@ ai_switch_perish_song: @ 8062BF8 movs r1, 0x20 ands r0, r1 cmp r0, 0 - beq _08062C50 + beq @08062C50 ldr r0, =0x020242bc lsls r1, r2, 3 subs r1, r2 @@ -173959,7 +173959,7 @@ ai_switch_perish_song: @ 8062BF8 ldrb r0, [r1, 0xF] lsls r0, 28 cmp r0, 0 - bne _08062C50 + bne @08062C50 ldr r0, =0x0202449c ldr r0, [r0] adds r0, r2, r0 @@ -173973,18 +173973,18 @@ ai_switch_perish_song: @ 8062BF8 movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb movs r0, 0x1 - b _08062C52 + b @08062C52 .align 2, 0 .pool -_08062C50: +@08062C50: movs r0, 0 -_08062C52: +@08062C52: pop {r1} bx r1 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 @@ -173996,9 +173996,9 @@ sub_8062C58: @ 8062C58 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08062C72 - b _08062E2C -_08062C72: + beq @08062C72 + b @08062E2C +@08062C72: ldr r0, =0x02024064 ldrb r0, [r0] bl battle_get_per_side_status @@ -174017,9 +174017,9 @@ _08062C72: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x19 - beq _08062C9E - b _08062E2C -_08062C9E: + beq @08062C9E + b @08062E2C +@08062C9E: mov r0, r10 bl battle_get_side_with_given_state lsls r0, 24 @@ -174033,7 +174033,7 @@ _08062C9E: movs r0, 0x20 adds r0, r4 mov r9, r0 -_08062CBA: +@08062CBA: lsls r1, r6, 1 ldr r5, =0x02024064 ldrb r0, [r5] @@ -174044,7 +174044,7 @@ _08062CBA: adds r1, r0 ldrh r0, [r1] cmp r0, 0 - beq _08062CE8 + beq @08062CE8 ldrh r1, [r4] mov r3, r9 ldrb r2, [r3] @@ -174054,36 +174054,36 @@ _08062CBA: movs r0, 0x2 ands r1, r0 cmp r1, 0 - beq _08062CE8 - b _08062E2C -_08062CE8: + beq @08062CE8 + b @08062E2C +@08062CE8: adds r6, 0x1 cmp r6, 0x3 - ble _08062CBA + ble @08062CBA ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x00808000 ands r0, r1 cmp r0, 0 - beq _08062D50 + beq @08062D50 ldrb r1, [r5] movs r0, 0x2 ands r0, r1 adds r1, r5, 0 cmp r0, 0 - bne _08062D20 + bne @08062D20 movs r4, 0 movs r0, 0x3 str r0, [sp] - b _08062D58 + b @08062D58 .align 2, 0 .pool -_08062D20: +@08062D20: movs r4, 0x3 movs r3, 0x6 str r3, [sp] - b _08062D58 -_08062D28: + b @08062D58 +@08062D28: ldr r0, =0x02024064 ldrb r0, [r0] ldr r1, =0x0202449c @@ -174098,30 +174098,30 @@ _08062D28: movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb movs r0, 0x1 - b _08062E2E + b @08062E2E .align 2, 0 .pool -_08062D50: +@08062D50: movs r4, 0 movs r3, 0x6 str r3, [sp] adds r1, r5, 0 -_08062D58: +@08062D58: ldrb r0, [r1] bl battle_side_get_owner lsls r0, 24 ldr r1, =0x02024744 mov r9, r1 cmp r0, 0 - bne _08062D6C + bne @08062D6C ldr r3, =0x020244ec mov r9, r3 -_08062D6C: +@08062D6C: adds r6, r4, 0 ldr r0, [sp] cmp r6, r0 - bge _08062E2C -_08062D74: + bge @08062E2C +@08062D74: movs r0, 0x64 adds r5, r6, 0 muls r5, r0 @@ -174131,19 +174131,19 @@ _08062D74: movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _08062E24 + beq @08062E24 adds r0, r4, 0 movs r1, 0x41 bl pokemon_getattr cmp r0, 0 - beq _08062E24 + beq @08062E24 adds r0, r4, 0 movs r1, 0x41 bl pokemon_getattr movs r1, 0xCE lsls r1, 1 cmp r0, r1 - beq _08062E24 + beq @08062E24 ldr r1, =0x0202406e ldr r0, =0x02024064 ldrb r0, [r0] @@ -174151,7 +174151,7 @@ _08062D74: adds r0, r1 ldrh r0, [r0] cmp r6, r0 - beq _08062E24 + beq @08062E24 adds r0, r4, 0 movs r1, 0xB bl pokemon_getattr @@ -174170,7 +174170,7 @@ _08062D74: adds r5, r0, r1 adds r7, r5, 0 adds r7, 0x20 -_08062DE0: +@08062DE0: adds r1, r4, 0 adds r1, 0xD mov r0, r9 @@ -174179,7 +174179,7 @@ _08062DE0: lsls r0, 16 lsrs r0, 16 cmp r0, 0 - beq _08062E1E + beq @08062E1E ldrh r1, [r5] ldrb r2, [r7] bl ai_rate_move @@ -174188,7 +174188,7 @@ _08062DE0: movs r0, 0x2 ands r1, r0 cmp r1, 0 - beq _08062E1E + beq @08062E1E bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -174197,19 +174197,19 @@ _08062DE0: lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bls _08062D28 -_08062E1E: + bls @08062D28 +@08062E1E: adds r4, 0x1 cmp r4, 0x3 - ble _08062DE0 -_08062E24: + ble @08062DE0 +@08062E24: adds r6, 0x1 ldr r3, [sp] cmp r6, r3 - blt _08062D74 -_08062E2C: + blt @08062D74 +@08062E2C: movs r0, 0 -_08062E2E: +@08062E2E: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -174223,7 +174223,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 @@ -174234,7 +174234,7 @@ sub_8062E54: @ 8062E54 bl ai_has_super_effective_move_on_field lsls r0, 24 cmp r0, 0 - beq _08062E82 + beq @08062E82 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -174242,9 +174242,9 @@ sub_8062E54: @ 8062E54 bl __umodsi3 lsls r0, 16 cmp r0, 0 - beq _08062E82 - b _080630AC -_08062E82: + beq @08062E82 + b @080630AC +@08062E82: ldr r1, =0x02024250 ldr r5, =0x02024064 ldrb r3, [r5] @@ -174252,14 +174252,14 @@ _08062E82: adds r4, r0, r1 ldrh r1, [r4] cmp r1, 0 - bne _08062E94 - b _080630AC -_08062E94: + bne @08062E94 + b @080630AC +@08062E94: ldr r0, =0x0000ffff cmp r1, r0 - bne _08062E9C - b _080630AC -_08062E9C: + bne @08062E9C + b @080630AC +@08062E9C: ldr r2, =0x0831c898 ldrh r1, [r4] lsls r0, r1, 1 @@ -174268,15 +174268,15 @@ _08062E9C: adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0 - bne _08062EB0 - b _080630AC -_08062EB0: + bne @08062EB0 + b @080630AC +@08062EB0: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08062F1A + beq @08062F1A mov r8, r3 mov r0, r8 bl battle_get_per_side_status @@ -174294,12 +174294,12 @@ _08062EB0: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _08062F04 + beq @08062F04 ldrb r7, [r5] - b _08062F1E + b @08062F1E .align 2, 0 .pool -_08062F04: +@08062F04: ldrb r0, [r5] bl battle_get_per_side_status eors r0, r4 @@ -174308,11 +174308,11 @@ _08062F04: bl battle_get_side_with_given_state lsls r0, 24 lsrs r7, r0, 24 - b _08062F1E -_08062F1A: + b @08062F1E +@08062F1A: adds r7, r3, 0 mov r8, r7 -_08062F1E: +@08062F1E: ldr r3, =0x0831c898 ldr r1, =0x02024250 ldr r2, =0x02024064 @@ -174326,26 +174326,26 @@ _08062F1E: adds r0, r3 ldrb r0, [r0, 0x2] cmp r0, 0xA - bne _08062F4C + bne @08062F4C movs r0, 0x12 - b _08062F5E + b @08062F5E .align 2, 0 .pool -_08062F4C: +@08062F4C: cmp r0, 0xB - bne _08062F56 + bne @08062F56 movs r1, 0xB str r1, [sp] - b _08062F60 -_08062F56: + b @08062F60 +@08062F56: cmp r0, 0xD - beq _08062F5C - b _080630AC -_08062F5C: + beq @08062F5C + b @080630AC +@08062F5C: movs r0, 0xA -_08062F5E: +@08062F5E: str r0, [sp] -_08062F60: +@08062F60: ldr r1, =0x02024084 ldrb r3, [r2] movs r0, 0x58 @@ -174355,30 +174355,30 @@ _08062F60: ldrb r0, [r0] ldr r1, [sp] cmp r0, r1 - bne _08062F76 - b _080630AC -_08062F76: + bne @08062F76 + b @080630AC +@08062F76: ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x00808000 ands r0, r1 cmp r0, 0 - beq _08062FCC + beq @08062FCC movs r0, 0x2 ands r3, r0 cmp r3, 0 - bne _08062F9C + bne @08062F9C movs r4, 0 movs r0, 0x3 - b _08062FD0 + b @08062FD0 .align 2, 0 .pool -_08062F9C: +@08062F9C: movs r4, 0x3 movs r1, 0x6 mov r10, r1 - b _08062FD2 -_08062FA4: + b @08062FD2 +@08062FA4: ldr r0, =0x02024064 ldrb r0, [r0] ldr r1, =0x0202449c @@ -174393,31 +174393,31 @@ _08062FA4: movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb movs r0, 0x1 - b _080630AE + b @080630AE .align 2, 0 .pool -_08062FCC: +@08062FCC: movs r4, 0 movs r0, 0x6 -_08062FD0: +@08062FD0: mov r10, r0 -_08062FD2: +@08062FD2: ldrb r0, [r2] bl battle_side_get_owner lsls r0, 24 ldr r1, =0x02024744 str r1, [sp, 0x4] cmp r0, 0 - bne _08062FE6 + bne @08062FE6 ldr r2, =0x020244ec str r2, [sp, 0x4] -_08062FE6: +@08062FE6: adds r5, r4, 0 cmp r5, r10 - bge _080630AC + bge @080630AC ldr r0, =0x083203cc mov r9, r0 -_08062FF0: +@08062FF0: movs r0, 0x64 muls r0, r5 ldr r1, [sp, 0x4] @@ -174426,43 +174426,43 @@ _08062FF0: movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _080630A6 + beq @080630A6 adds r0, r6, 0 movs r1, 0x41 bl pokemon_getattr cmp r0, 0 - beq _080630A6 + beq @080630A6 adds r0, r6, 0 movs r1, 0x41 bl pokemon_getattr movs r1, 0xCE lsls r1, 1 cmp r0, r1 - beq _080630A6 + beq @080630A6 ldr r1, =0x0202406e mov r2, r8 lsls r0, r2, 1 adds r0, r1 ldrh r0, [r0] cmp r5, r0 - beq _080630A6 + beq @080630A6 lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] cmp r5, r0 - beq _080630A6 + beq @080630A6 ldr r0, =0x0202449c ldr r1, [r0] adds r0, r2, r1 adds r0, 0x5C ldrb r0, [r0] cmp r5, r0 - beq _080630A6 + beq @080630A6 adds r0, r7, r1 adds r0, 0x5C ldrb r0, [r0] cmp r5, r0 - beq _080630A6 + beq @080630A6 adds r0, r6, 0 movs r1, 0xB bl pokemon_getattr @@ -174472,38 +174472,38 @@ _08062FF0: movs r1, 0x2E bl pokemon_getattr cmp r0, 0 - beq _08063088 + beq @08063088 lsls r0, r4, 3 subs r0, r4 lsls r0, 2 add r0, r9 ldrb r0, [r0, 0x17] - b _08063092 + b @08063092 .align 2, 0 .pool -_08063088: +@08063088: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 add r0, r9 ldrb r0, [r0, 0x16] -_08063092: +@08063092: ldr r1, [sp] cmp r1, r0 - bne _080630A6 + bne @080630A6 bl GenerateRandomNumber movs r1, 0x1 ands r1, r0 cmp r1, 0 - beq _080630A6 - b _08062FA4 -_080630A6: + beq @080630A6 + b @08062FA4 +@080630A6: adds r5, 0x1 cmp r5, r10 - blt _08062FF0 -_080630AC: + blt @08062FF0 +@080630AC: movs r0, 0 -_080630AE: +@080630AE: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -174515,7 +174515,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 @@ -174530,38 +174530,38 @@ ai_switchout_natural_cure: @ 80630C0 movs r1, 0x7 ands r0, r1 cmp r0, 0 - beq _08063188 + beq @08063188 adds r1, r2, r3 adds r0, r1, 0 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x1E - bne _08063188 + bne @08063188 ldrh r0, [r1, 0x2C] ldrh r1, [r1, 0x28] lsrs r0, 1 cmp r1, r0 - bcc _08063188 + bcc @08063188 ldr r1, =0x02024250 lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] cmp r1, 0 - beq _08063106 + beq @08063106 ldr r0, =0x0000ffff cmp r1, r0 - bne _08063128 -_08063106: + bne @08063128 +@08063106: bl GenerateRandomNumber movs r1, 0x1 ands r1, r0 cmp r1, 0 - beq _08063128 + beq @08063128 ldrb r0, [r5] - b _08063190 + b @08063190 .align 2, 0 .pool -_08063128: +@08063128: ldr r2, =0x0831c898 ldr r1, =0x02024250 ldr r4, =0x02024064 @@ -174575,41 +174575,41 @@ _08063128: adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0 - bne _08063160 + bne @08063160 bl GenerateRandomNumber movs r1, 0x1 ands r1, r0 cmp r1, 0 - beq _08063160 + beq @08063160 ldrb r0, [r4] - b _08063190 + b @08063190 .align 2, 0 .pool -_08063160: +@08063160: movs r0, 0x8 movs r1, 0x1 bl ai_switchout_something lsls r0, 24 cmp r0, 0 - bne _080631AA + bne @080631AA movs r0, 0x4 movs r1, 0x1 bl ai_switchout_something lsls r0, 24 cmp r0, 0 - bne _080631AA + bne @080631AA bl GenerateRandomNumber movs r1, 0x1 ands r1, r0 cmp r1, 0 - bne _0806318C -_08063188: + bne @0806318C +@08063188: movs r0, 0 - b _080631AC -_0806318C: + b @080631AC +@0806318C: ldr r0, =0x02024064 ldrb r0, [r0] -_08063190: +@08063190: ldr r1, =0x0202449c ldr r1, [r1] adds r0, r1 @@ -174622,9 +174622,9 @@ _08063190: movs r1, 0x2 movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb -_080631AA: +@080631AA: movs r0, 0x1 -_080631AC: +@080631AC: pop {r4,r5} pop {r1} bx r1 @@ -174633,7 +174633,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 @@ -174661,7 +174661,7 @@ ai_has_super_effective_move_on_field: @ 80631BC ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _08063256 + bne @08063256 movs r4, 0 ldr r6, =0x02024084 movs r7, 0x58 @@ -174671,7 +174671,7 @@ ai_has_super_effective_move_on_field: @ 80631BC movs r0, 0x20 adds r0, r5 mov r8, r0 -_0806320A: +@0806320A: lsls r1, r4, 1 ldr r0, =0x02024064 ldrb r0, [r0] @@ -174682,7 +174682,7 @@ _0806320A: adds r1, r0 ldrh r0, [r1] cmp r0, 0 - beq _08063250 + beq @08063250 ldrh r1, [r5] mov r3, r8 ldrb r2, [r3] @@ -174692,10 +174692,10 @@ _0806320A: movs r0, 0x2 ands r1, r0 cmp r1, 0 - beq _08063250 + beq @08063250 mov r0, r9 cmp r0, 0 - bne _08063278 + bne @08063278 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -174703,25 +174703,25 @@ _0806320A: bl __umodsi3 lsls r0, 16 cmp r0, 0 - bne _08063278 -_08063250: + bne @08063278 +@08063250: adds r4, 0x1 cmp r4, 0x3 - ble _0806320A -_08063256: + ble @0806320A +@08063256: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _0806327C - b _080632FA + bne @0806327C + b @080632FA .align 2, 0 .pool -_08063278: +@08063278: movs r0, 0x1 - b _080632FC -_0806327C: + b @080632FC +@0806327C: movs r1, 0x2 mov r0, r10 eors r0, r1 @@ -174736,7 +174736,7 @@ _0806327C: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _080632FA + bne @080632FA movs r4, 0 ldr r6, =0x02024084 movs r7, 0x58 @@ -174746,7 +174746,7 @@ _0806327C: movs r3, 0x20 adds r3, r5 mov r8, r3 -_080632AE: +@080632AE: lsls r1, r4, 1 ldr r0, =0x02024064 ldrb r0, [r0] @@ -174757,7 +174757,7 @@ _080632AE: adds r1, r0 ldrh r0, [r1] cmp r0, 0 - beq _080632F4 + beq @080632F4 ldrh r1, [r5] mov r3, r8 ldrb r2, [r3] @@ -174767,10 +174767,10 @@ _080632AE: movs r0, 0x2 ands r1, r0 cmp r1, 0 - beq _080632F4 + beq @080632F4 mov r0, r9 cmp r0, 0 - bne _08063278 + bne @08063278 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -174778,14 +174778,14 @@ _080632AE: bl __umodsi3 lsls r0, 16 cmp r0, 0 - bne _08063278 -_080632F4: + bne @08063278 +@080632F4: adds r4, 0x1 cmp r4, 0x3 - ble _080632AE -_080632FA: + ble @080632AE +@080632FA: movs r0, 0 -_080632FC: +@080632FC: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -174798,7 +174798,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 @@ -174809,28 +174809,28 @@ ai_is_too_invested_in_stat_buffs: @ 806331C adds r1, 0x18 adds r2, r0, r1 movs r3, 0x7 -_08063330: +@08063330: ldrb r1, [r2] movs r0, 0 ldrsb r0, [r2, r0] cmp r0, 0x6 - ble _08063346 + ble @08063346 subs r1, 0x6 lsls r0, r4, 24 asrs r0, 24 adds r0, r1 lsls r0, 24 lsrs r4, r0, 24 -_08063346: +@08063346: adds r2, 0x1 subs r3, 0x1 cmp r3, 0 - bge _08063330 + bge @08063330 movs r0, 0 cmp r4, 0x3 - bls _08063356 + bls @08063356 movs r0, 0x1 -_08063356: +@08063356: pop {r4} pop {r1} bx r1 @@ -174839,7 +174839,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 @@ -174860,21 +174860,21 @@ ai_switchout_something: @ 8063364 ldrh r2, [r4] adds r5, r1, 0 cmp r2, 0 - bne _08063390 - b _080635EE -_08063390: + bne @08063390 + b @080635EE +@08063390: ldr r0, =0x0000ffff cmp r2, r0 - bne _08063398 - b _080635EE -_08063398: + bne @08063398 + b @080635EE +@08063398: ldr r0, =0x02024270 adds r0, r3, r0 ldrb r0, [r0] cmp r0, 0xFF - bne _080633A4 - b _080635EE -_080633A4: + bne @080633A4 + b @080635EE +@080633A4: ldr r2, =0x0831c898 ldrh r1, [r4] lsls r0, r1, 1 @@ -174883,15 +174883,15 @@ _080633A4: adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0 - bne _080633B8 - b _080635EE -_080633B8: + bne @080633B8 + b @080635EE +@080633B8: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0806342C + beq @0806342C mov r9, r3 mov r0, r9 bl battle_get_per_side_status @@ -174909,13 +174909,13 @@ _080633B8: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _08063414 + beq @08063414 ldrb r5, [r5] mov r10, r5 - b _08063430 + b @08063430 .align 2, 0 .pool -_08063414: +@08063414: ldrb r0, [r5] bl battle_get_per_side_status eors r0, r4 @@ -174925,36 +174925,36 @@ _08063414: lsls r0, 24 lsrs r0, 24 mov r10, r0 - b _08063430 -_0806342C: + b @08063430 +@0806342C: mov r9, r3 mov r10, r9 -_08063430: +@08063430: ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x00808000 ands r0, r1 cmp r0, 0 - beq _08063490 + beq @08063490 ldr r2, =0x02024064 ldrb r1, [r2] movs r0, 0x2 ands r0, r1 adds r5, r2, 0 cmp r0, 0 - bne _08063460 + bne @08063460 movs r4, 0 movs r0, 0x3 str r0, [sp, 0x8] - b _08063498 + b @08063498 .align 2, 0 .pool -_08063460: +@08063460: movs r4, 0x3 movs r1, 0x6 str r1, [sp, 0x8] - b _08063498 -_08063468: + b @08063498 +@08063468: ldr r0, =0x02024064 ldrb r0, [r0] ldr r1, =0x0202449c @@ -174969,30 +174969,30 @@ _08063468: movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb movs r0, 0x1 - b _080635F0 + b @080635F0 .align 2, 0 .pool -_08063490: +@08063490: movs r4, 0 movs r0, 0x6 str r0, [sp, 0x8] ldr r5, =0x02024064 -_08063498: +@08063498: ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 ldr r1, =0x02024744 str r1, [sp, 0xC] cmp r0, 0 - bne _080634AC + bne @080634AC ldr r2, =0x020244ec str r2, [sp, 0xC] -_080634AC: +@080634AC: adds r6, r4, 0 - b _080635E6 + b @080635E6 .align 2, 0 .pool -_080634BC: +@080634BC: movs r0, 0x64 muls r0, r6 ldr r1, [sp, 0xC] @@ -175001,36 +175001,36 @@ _080634BC: movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - bne _080634D2 - b _080635E4 -_080634D2: + bne @080634D2 + b @080635E4 +@080634D2: adds r0, r5, 0 movs r1, 0x41 bl pokemon_getattr cmp r0, 0 - bne _080634E0 - b _080635E4 -_080634E0: + bne @080634E0 + b @080635E4 +@080634E0: adds r0, r5, 0 movs r1, 0x41 bl pokemon_getattr movs r1, 0xCE lsls r1, 1 cmp r0, r1 - beq _080635E4 + beq @080635E4 ldr r1, =0x0202406e mov r2, r9 lsls r0, r2, 1 adds r0, r1 ldrh r0, [r0] cmp r6, r0 - beq _080635E4 + beq @080635E4 mov r2, r10 lsls r0, r2, 1 adds r0, r1 ldrh r0, [r0] cmp r6, r0 - beq _080635E4 + beq @080635E4 ldr r0, =0x0202449c ldr r1, [r0] mov r2, r9 @@ -175038,13 +175038,13 @@ _080634E0: adds r0, 0x5C ldrb r0, [r0] cmp r6, r0 - beq _080635E4 + beq @080635E4 mov r2, r10 adds r0, r2, r1 adds r0, 0x5C ldrb r0, [r0] cmp r6, r0 - beq _080635E4 + beq @080635E4 adds r0, r5, 0 movs r1, 0xB bl pokemon_getattr @@ -175054,24 +175054,24 @@ _080634E0: movs r1, 0x2E bl pokemon_getattr cmp r0, 0 - beq _08063558 + beq @08063558 lsls r0, r4, 3 subs r0, r4 lsls r0, 2 ldr r1, =0x083203cc adds r0, r1 ldrb r2, [r0, 0x17] - b _08063564 + b @08063564 .align 2, 0 .pool -_08063558: +@08063558: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 ldr r2, =0x083203cc adds r0, r2 ldrb r2, [r0, 0x16] -_08063564: +@08063564: ldr r1, =0x02024250 ldr r5, =0x02024064 ldrb r0, [r5] @@ -175083,7 +175083,7 @@ _08063564: ldr r1, [sp] ands r1, r0 cmp r1, 0 - beq _080635E4 + beq @080635E4 ldr r1, =0x02024270 ldrb r0, [r5] adds r0, r1 @@ -175102,7 +175102,7 @@ _08063564: adds r5, r0, r1 adds r7, r5, 0 adds r7, 0x20 -_080635A2: +@080635A2: adds r1, r4, 0 adds r1, 0xD ldr r0, [sp, 0xC] @@ -175111,7 +175111,7 @@ _080635A2: lsls r0, 16 lsrs r0, 16 cmp r0, 0 - beq _080635DE + beq @080635DE ldrh r1, [r5] ldrb r2, [r7] bl ai_rate_move @@ -175120,29 +175120,29 @@ _080635A2: movs r0, 0x2 ands r1, r0 cmp r1, 0 - beq _080635DE + beq @080635DE bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 ldr r1, [sp, 0x4] bl __modsi3 cmp r0, 0 - bne _080635DE - b _08063468 -_080635DE: + bne @080635DE + b @08063468 +@080635DE: adds r4, 0x1 cmp r4, 0x3 - ble _080635A2 -_080635E4: + ble @080635A2 +@080635E4: adds r6, 0x1 -_080635E6: +@080635E6: ldr r0, [sp, 0x8] cmp r6, r0 - bge _080635EE - b _080634BC -_080635EE: + bge @080635EE + b @080634BC +@080635EE: movs r0, 0 -_080635F0: +@080635F0: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -175156,7 +175156,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 @@ -175176,9 +175176,9 @@ sub_8063614: @ 8063614 ldr r1, =0x0400e000 ands r0, r1 cmp r0, 0 - beq _0806363E - b _0806386C -_0806363E: + beq @0806363E + b @0806386C +@0806363E: ldr r0, =0x020242ac lsls r1, r2, 2 adds r1, r0 @@ -175187,9 +175187,9 @@ _0806363E: lsls r0, 3 ands r1, r0 cmp r1, 0 - beq _08063652 - b _0806386C -_08063652: + beq @08063652 + b @0806386C +@08063652: str r1, [sp] movs r0, 0xC adds r1, r2, 0 @@ -175199,9 +175199,9 @@ _08063652: lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _0806366A - b _0806386C -_0806366A: + beq @0806366A + b @0806386C +@0806366A: ldrb r1, [r4] str r0, [sp] movs r0, 0xC @@ -175211,9 +175211,9 @@ _0806366A: lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _08063682 - b _0806386C -_08063682: + beq @08063682 + b @0806386C +@08063682: str r0, [sp] movs r0, 0xE movs r1, 0 @@ -175222,7 +175222,7 @@ _08063682: bl ability_something lsls r0, 24 cmp r0, 0 - beq _080636B4 + beq @080636B4 ldrb r0, [r4] muls r0, r5 adds r1, r0, r6 @@ -175230,31 +175230,31 @@ _08063682: adds r0, 0x21 ldrb r0, [r0] cmp r0, 0x8 - bne _080636A8 - b _0806386C -_080636A8: + bne @080636A8 + b @0806386C +@080636A8: adds r0, r1, 0 adds r0, 0x22 ldrb r0, [r0] cmp r0, 0x8 - bne _080636B4 - b _0806386C -_080636B4: + bne @080636B4 + b @0806386C +@080636B4: ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 lsls r0, 11 ands r0, r1 cmp r0, 0 - beq _080636C4 - b _0806386C -_080636C4: + beq @080636C4 + b @0806386C +@080636C4: movs r0, 0 mov r10, r0 movs r0, 0x1 ands r1, r0 cmp r1, 0 - beq _0806372E + beq @0806372E ldrb r7, [r4] adds r0, r7, 0 bl battle_get_per_side_status @@ -175272,12 +175272,12 @@ _080636C4: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _08063718 + beq @08063718 ldrb r6, [r4] - b _08063732 + b @08063732 .align 2, 0 .pool -_08063718: +@08063718: ldrb r0, [r4] bl battle_get_per_side_status eors r0, r5 @@ -175286,54 +175286,54 @@ _08063718: bl battle_get_side_with_given_state lsls r0, 24 lsrs r6, r0, 24 - b _08063732 -_0806372E: + b @08063732 +@0806372E: ldrb r6, [r4] adds r7, r6, 0 -_08063732: +@08063732: ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x00808000 ands r0, r1 cmp r0, 0 - beq _08063768 + beq @08063768 ldr r2, =0x02024064 ldrb r1, [r2] movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _08063760 + bne @08063760 movs r4, 0 movs r1, 0x3 mov r8, r1 - b _08063770 + b @08063770 .align 2, 0 .pool -_08063760: +@08063760: movs r4, 0x3 movs r0, 0x6 mov r8, r0 - b _08063770 -_08063768: + b @08063770 +@08063768: movs r4, 0 movs r1, 0x6 mov r8, r1 ldr r2, =0x02024064 -_08063770: +@08063770: ldrb r0, [r2] bl battle_side_get_owner lsls r0, 24 ldr r1, =0x02024744 mov r9, r1 cmp r0, 0 - bne _08063784 + bne @08063784 ldr r0, =0x020244ec mov r9, r0 -_08063784: +@08063784: adds r5, r4, 0 cmp r5, r8 - bge _080637F2 -_0806378A: + bge @080637F2 +@0806378A: movs r0, 0x64 muls r0, r5 mov r1, r9 @@ -175342,97 +175342,97 @@ _0806378A: movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _080637EC + beq @080637EC adds r0, r4, 0 movs r1, 0x41 bl pokemon_getattr cmp r0, 0 - beq _080637EC + beq @080637EC adds r0, r4, 0 movs r1, 0x41 bl pokemon_getattr movs r1, 0xCE lsls r1, 1 cmp r0, r1 - beq _080637EC + beq @080637EC ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] cmp r5, r0 - beq _080637EC + beq @080637EC lsls r0, r6, 1 adds r0, r1 ldrh r0, [r0] cmp r5, r0 - beq _080637EC + beq @080637EC ldr r0, =0x0202449c ldr r1, [r0] adds r0, r7, r1 adds r0, 0x5C ldrb r0, [r0] cmp r5, r0 - beq _080637EC + beq @080637EC adds r0, r6, r1 adds r0, 0x5C ldrb r0, [r0] cmp r5, r0 - beq _080637EC + beq @080637EC movs r0, 0x1 add r10, r0 -_080637EC: +@080637EC: adds r5, 0x1 cmp r5, r8 - blt _0806378A -_080637F2: + blt @0806378A +@080637F2: mov r1, r10 cmp r1, 0 - beq _0806386C + beq @0806386C bl ai_switch_perish_song lsls r0, 24 cmp r0, 0 - bne _08063852 + bne @08063852 bl sub_8062C58 lsls r0, 24 cmp r0, 0 - bne _08063852 + bne @08063852 bl sub_8062E54 lsls r0, 24 cmp r0, 0 - bne _08063852 + bne @08063852 bl ai_switchout_natural_cure lsls r0, 24 cmp r0, 0 - bne _08063852 + bne @08063852 movs r0, 0 bl ai_has_super_effective_move_on_field lsls r0, 24 cmp r0, 0 - bne _0806386C + bne @0806386C bl ai_is_too_invested_in_stat_buffs lsls r0, 24 cmp r0, 0 - bne _0806386C + bne @0806386C movs r0, 0x8 movs r1, 0x2 bl ai_switchout_something lsls r0, 24 cmp r0, 0 - bne _08063852 + bne @08063852 movs r0, 0x4 movs r1, 0x3 bl ai_switchout_something lsls r0, 24 cmp r0, 0 - beq _0806386C -_08063852: + beq @0806386C +@08063852: movs r0, 0x1 - b _0806386E + b @0806386E .align 2, 0 .pool -_0806386C: +@0806386C: movs r0, 0 -_0806386E: +@0806386E: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -175444,7 +175444,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} @@ -175460,24 +175460,24 @@ sub_8063880: @ 8063880 ldr r1, =0x02024744 mov r8, r1 cmp r0, 0 - bne _080638A8 + bne @080638A8 ldr r2, =0x020244ec mov r8, r2 -_080638A8: +@080638A8: ldr r7, =0x02022fec ldr r0, [r7] movs r1, 0x8 ands r0, r1 cmp r0, 0 - bne _080638B6 - b _080639E6 -_080638B6: + bne @080638B6 + b @080639E6 +@080638B6: bl sub_8063614 lsls r0, 24 cmp r0, 0 - bne _080638C2 - b _080639DC -_080638C2: + bne @080638C2 + b @080639DC +@080638C2: ldrb r0, [r4] ldr r2, =0x0202449c ldr r1, [r2] @@ -175487,26 +175487,26 @@ _080638C2: adds r0, r1 ldrb r0, [r0] cmp r0, 0x6 - bne _080639B8 + bne @080639B8 bl sub_8063A90 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x6 - bne _080639A6 + bne @080639A6 ldr r0, [r7] movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _08063910 + bne @08063910 adds r0, r6, 0 bl battle_get_side_with_given_state lsls r0, 24 lsrs r5, r0, 24 adds r6, r5, 0 - b _08063928 + b @08063928 .align 2, 0 .pool -_08063910: +@08063910: adds r0, r5, 0 bl battle_get_side_with_given_state lsls r0, 24 @@ -175517,71 +175517,71 @@ _08063910: bl battle_get_side_with_given_state lsls r0, 24 lsrs r5, r0, 24 -_08063928: +@08063928: ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x00808000 ands r0, r1 cmp r0, 0 - beq _08063958 + beq @08063958 ldr r0, =0x02024064 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _08063954 + bne @08063954 movs r0, 0 movs r7, 0x3 - b _0806395C + b @0806395C .align 2, 0 .pool -_08063954: +@08063954: movs r0, 0x3 - b _0806395A -_08063958: + b @0806395A +@08063958: movs r0, 0 -_0806395A: +@0806395A: movs r7, 0x6 -_0806395C: +@0806395C: adds r4, r0, 0 cmp r4, r7 - bge _080639A6 -_08063962: + bge @080639A6 +@08063962: movs r0, 0x64 muls r0, r4 add r0, r8 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _080639A0 + beq @080639A0 ldr r1, =0x0202406e lsls r0, r6, 1 adds r0, r1 ldrh r0, [r0] cmp r4, r0 - beq _080639A0 + beq @080639A0 lsls r0, r5, 1 adds r0, r1 ldrh r0, [r0] cmp r4, r0 - beq _080639A0 + beq @080639A0 ldr r0, =0x0202449c ldr r1, [r0] adds r0, r6, r1 adds r0, 0x5C ldrb r0, [r0] cmp r4, r0 - beq _080639A0 + beq @080639A0 adds r0, r5, r1 adds r0, 0x5C ldrb r0, [r0] cmp r4, r0 - bne _080639A6 -_080639A0: + bne @080639A6 +@080639A0: adds r4, 0x1 cmp r4, r7 - blt _08063962 -_080639A6: + blt @08063962 +@080639A6: ldr r0, =0x02024064 ldrb r0, [r0] ldr r2, =0x0202449c @@ -175591,7 +175591,7 @@ _080639A6: lsls r1, 2 adds r0, r1 strb r4, [r0] -_080639B8: +@080639B8: ldr r0, =0x02024064 ldrb r1, [r0] ldr r0, [r2] @@ -175603,15 +175603,15 @@ _080639B8: adds r0, r2 ldrb r0, [r0] strb r0, [r1] - b _080639F8 + b @080639F8 .align 2, 0 .pool -_080639DC: +@080639DC: bl sub_8063EE0 lsls r0, 24 cmp r0, 0 - bne _080639F8 -_080639E6: + bne @080639F8 +@080639E6: ldr r0, =0x02024064 ldrb r0, [r0] movs r2, 0x1 @@ -175620,7 +175620,7 @@ _080639E6: movs r0, 0x1 movs r1, 0 bl dp01_build_cmdbuf_x21_a_bb -_080639F8: +@080639F8: pop {r3} mov r8, r3 pop {r4-r7} @@ -175631,7 +175631,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 @@ -175653,44 +175653,44 @@ sub_8063A08: @ 8063A08 mov r10, r0 ldrb r0, [r0] cmp r0, 0xFF - beq _08063A7A + beq @08063A7A mov r5, r10 -_08063A36: +@08063A36: ldrb r0, [r5] cmp r0, 0xFE - beq _08063A6C + beq @08063A6C ldr r1, [sp] cmp r0, r1 - bne _08063A6C + bne @08063A6C ldrb r4, [r5, 0x1] cmp r4, r9 - bne _08063A56 + bne @08063A56 ldrb r1, [r6] ldrb r0, [r5, 0x2] muls r0, r1 movs r1, 0xA bl __divsi3 strb r0, [r6] -_08063A56: +@08063A56: cmp r4, r8 - bne _08063A6C + bne @08063A6C cmp r9, r8 - beq _08063A6C + beq @08063A6C ldrb r1, [r6] ldrb r0, [r5, 0x2] muls r0, r1 movs r1, 0xA bl __divsi3 strb r0, [r6] -_08063A6C: +@08063A6C: adds r5, 0x3 adds r7, 0x3 mov r1, r10 adds r0, r7, r1 ldrb r0, [r0] cmp r0, 0xFF - bne _08063A36 -_08063A7A: + bne @08063A36 +@08063A7A: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -175704,7 +175704,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 @@ -175720,16 +175720,16 @@ sub_8063A90: @ 8063A90 adds r1, 0x5C ldrb r0, [r1] cmp r0, 0x6 - beq _08063AB2 - b _08063E50 -_08063AB2: + beq @08063AB2 + b @08063E50 +@08063AB2: ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 lsls r0, 11 ands r0, r1 cmp r0, 0 - beq _08063AE0 + beq @08063AE0 ldr r1, =0x0202406e lsls r0, r2, 1 adds r0, r1 @@ -175737,14 +175737,14 @@ _08063AB2: adds r0, 0x1 lsls r0, 24 lsrs r0, 24 - b _08063E50 + b @08063E50 .align 2, 0 .pool -_08063AE0: +@08063AE0: movs r0, 0x1 ands r1, r0 cmp r1, 0 - beq _08063B6C + beq @08063B6C str r2, [sp, 0x10] adds r0, r2, 0 bl battle_get_per_side_status @@ -175762,13 +175762,13 @@ _08063AE0: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _08063B20 + beq @08063B20 ldrb r4, [r4] str r4, [sp, 0x14] - b _08063B36 + b @08063B36 .align 2, 0 .pool -_08063B20: +@08063B20: ldrb r0, [r4] bl battle_get_per_side_status eors r0, r5 @@ -175778,7 +175778,7 @@ _08063B20: lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x14] -_08063B36: +@08063B36: bl GenerateRandomNumber movs r3, 0x2 ands r0, r3 @@ -175794,15 +175794,15 @@ _08063B36: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _08063B8A + beq @08063B8A eors r4, r3 lsls r0, r4, 24 lsrs r0, 24 str r0, [sp, 0x4] - b _08063B8A + b @08063B8A .align 2, 0 .pool -_08063B6C: +@08063B6C: adds r0, r2, 0 bl battle_get_per_side_status movs r1, 0x1 @@ -175816,52 +175816,52 @@ _08063B6C: ldrb r4, [r4] str r4, [sp, 0x14] str r4, [sp, 0x10] -_08063B8A: +@08063B8A: ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x00808000 ands r0, r1 cmp r0, 0 - beq _08063BC2 + beq @08063BC2 ldr r2, =0x02024064 ldrb r1, [r2] movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _08063BB8 + bne @08063BB8 movs r0, 0 str r0, [sp, 0x18] movs r1, 0x3 str r1, [sp, 0x1C] - b _08063BCC + b @08063BCC .align 2, 0 .pool -_08063BB8: +@08063BB8: movs r4, 0x3 str r4, [sp, 0x18] movs r0, 0x6 str r0, [sp, 0x1C] - b _08063BCC -_08063BC2: + b @08063BCC +@08063BC2: movs r1, 0 str r1, [sp, 0x18] movs r2, 0x6 str r2, [sp, 0x1C] ldr r2, =0x02024064 -_08063BCC: +@08063BCC: ldrb r0, [r2] bl battle_side_get_owner lsls r0, 24 ldr r4, =0x02024744 str r4, [sp, 0x20] cmp r0, 0 - bne _08063BE0 + bne @08063BE0 ldr r0, =0x020244ec str r0, [sp, 0x20] -_08063BE0: +@08063BE0: movs r1, 0 mov r9, r1 -_08063BE4: +@08063BE4: movs r2, 0 str r2, [sp, 0x8] movs r4, 0x6 @@ -175869,15 +175869,15 @@ _08063BE4: ldr r7, [sp, 0x18] ldr r0, [sp, 0x1C] cmp r7, r0 - blt _08063BF6 - b _08063CF2 -_08063BF6: + blt @08063BF6 + b @08063CF2 +@08063BF6: lsls r0, r7, 2 ldr r1, =0x0832a328 adds r0, r1 mov r8, r0 mov r10, sp -_08063C00: +@08063C00: movs r0, 0x64 muls r0, r7 ldr r2, [sp, 0x20] @@ -175888,43 +175888,43 @@ _08063C00: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - beq _08063CD8 + beq @08063CD8 adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _08063CD8 + beq @08063CD8 mov r4, r8 ldr r0, [r4] mov r1, r9 ands r0, r1 cmp r0, 0 - bne _08063CD8 + bne @08063CD8 ldr r1, =0x0202406e ldr r2, [sp, 0x10] lsls r0, r2, 1 adds r0, r1 ldrh r0, [r0] cmp r0, r7 - beq _08063CD8 + beq @08063CD8 ldr r4, [sp, 0x14] lsls r0, r4, 1 adds r0, r1 ldrh r0, [r0] cmp r0, r7 - beq _08063CD8 + beq @08063CD8 ldr r0, =0x0202449c ldr r1, [r0] adds r0, r2, r1 adds r0, 0x5C ldrb r0, [r0] cmp r7, r0 - beq _08063CD8 + beq @08063CD8 adds r0, r4, r1 adds r0, 0x5C ldrb r0, [r0] cmp r7, r0 - beq _08063CD8 + beq @08063CD8 ldr r1, =0x083203cc lsls r0, r5, 3 subs r0, r5 @@ -175958,17 +175958,17 @@ _08063C00: mov r1, r10 ldrb r1, [r1] cmp r2, r1 - bcs _08063CE6 + bcs @08063CE6 mov r2, r10 ldrb r2, [r2] str r2, [sp, 0x8] lsls r0, r7, 24 lsrs r0, 24 str r0, [sp, 0xC] - b _08063CE6 + b @08063CE6 .align 2, 0 .pool -_08063CD8: +@08063CD8: mov r4, r8 ldr r0, [r4] mov r1, r9 @@ -175976,23 +175976,23 @@ _08063CD8: lsls r0, r1, 24 lsrs r0, 24 mov r9, r0 -_08063CE6: +@08063CE6: movs r2, 0x4 add r8, r2 adds r7, 0x1 ldr r4, [sp, 0x1C] cmp r7, r4 - blt _08063C00 -_08063CF2: + blt @08063C00 +@08063CF2: ldr r0, [sp, 0xC] cmp r0, 0x6 - beq _08063D54 + beq @08063D54 movs r7, 0 movs r0, 0x64 ldr r1, [sp, 0xC] adds r5, r1, 0 muls r5, r0 -_08063D02: +@08063D02: adds r1, r7, 0 adds r1, 0xD ldr r2, [sp, 0x20] @@ -176001,7 +176001,7 @@ _08063D02: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq _08063D2A + beq @08063D2A ldr r0, =0x02024064 ldrb r1, [r0] adds r0, r4, 0 @@ -176010,16 +176010,16 @@ _08063D02: movs r1, 0x2 ands r1, r0 cmp r1, 0 - bne _08063D30 -_08063D2A: + bne @08063D30 +@08063D2A: adds r7, 0x1 cmp r7, 0x3 - ble _08063D02 -_08063D30: + ble @08063D02 +@08063D30: cmp r7, 0x4 - beq _08063D36 - b _08063E4E -_08063D36: + beq @08063D36 + b @08063E4E +@08063D36: ldr r4, [sp, 0xC] lsls r0, r4, 2 ldr r1, =0x0832a328 @@ -176030,18 +176030,18 @@ _08063D36: lsls r0, r2, 24 lsrs r0, 24 mov r9, r0 - b _08063D58 + b @08063D58 .align 2, 0 .pool -_08063D54: +@08063D54: movs r4, 0x3F mov r9, r4 -_08063D58: +@08063D58: mov r0, r9 cmp r0, 0x3F - beq _08063D60 - b _08063BE4 -_08063D60: + beq @08063D60 + b @08063BE4 +@08063D60: ldr r0, =0x02024400 movs r1, 0 strh r1, [r0] @@ -176062,8 +176062,8 @@ _08063D60: ldr r7, [sp, 0x18] ldr r4, [sp, 0x1C] cmp r7, r4 - bge _08063E4E -_08063D8A: + bge @08063E4E +@08063D8A: movs r0, 0x64 adds r6, r7, 0 muls r6, r0 @@ -176076,43 +176076,43 @@ _08063D8A: adds r1, r7, 0x1 mov r10, r1 cmp r0, 0 - beq _08063E46 + beq @08063E46 adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _08063E46 + beq @08063E46 ldr r1, =0x0202406e ldr r2, [sp, 0x10] lsls r0, r2, 1 adds r0, r1 ldrh r0, [r0] cmp r0, r7 - beq _08063E46 + beq @08063E46 ldr r4, [sp, 0x14] lsls r0, r4, 1 adds r0, r1 ldrh r0, [r0] cmp r0, r7 - beq _08063E46 + beq @08063E46 ldr r0, =0x0202449c ldr r1, [r0] adds r0, r2, r1 adds r0, 0x5C ldrb r0, [r0] cmp r7, r0 - beq _08063E46 + beq @08063E46 adds r0, r4, r1 adds r0, 0x5C ldrb r0, [r0] cmp r7, r0 - beq _08063E46 + beq @08063E46 movs r5, 0 mov r9, r6 ldr r0, =0x020241f0 mov r8, r0 ldr r6, =0x02024064 -_08063DEE: +@08063DEE: adds r1, r5, 0 adds r1, 0xD ldr r0, [sp, 0x20] @@ -176124,7 +176124,7 @@ _08063DEE: mov r1, r8 str r0, [r1] cmp r4, 0 - beq _08063E2A + beq @08063E2A ldr r0, =0x0831c898 lsls r1, r4, 1 adds r1, r4 @@ -176132,7 +176132,7 @@ _08063DEE: adds r1, r0 ldrb r0, [r1, 0x1] cmp r0, 0x1 - beq _08063E2A + beq @08063E2A ldrb r0, [r6] ldr r1, [sp, 0x4] bl sub_8046E7C @@ -176140,30 +176140,30 @@ _08063DEE: adds r0, r4, 0 ldr r2, [sp, 0x4] bl move_effectiveness_something -_08063E2A: +@08063E2A: mov r2, r8 ldr r0, [r2] ldr r4, [sp, 0x8] cmp r4, r0 - bge _08063E40 + bge @08063E40 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x8] lsls r0, r7, 24 lsrs r0, 24 str r0, [sp, 0xC] -_08063E40: +@08063E40: adds r5, 0x1 cmp r5, 0x3 - ble _08063DEE -_08063E46: + ble @08063DEE +@08063E46: mov r7, r10 ldr r0, [sp, 0x1C] cmp r7, r0 - blt _08063D8A -_08063E4E: + blt @08063D8A +@08063E4E: ldr r0, [sp, 0xC] -_08063E50: +@08063E50: add sp, 0x24 pop {r3-r5} mov r8, r3 @@ -176177,64 +176177,64 @@ _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 lsrs r0, 24 cmp r0, 0x13 - bne _08063E94 + bne @08063E94 movs r0, 0x1 - b _08063EDA -_08063E94: + b @08063EDA +@08063E94: ldrb r1, [r2, 0x4] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08063EA2 + beq @08063EA2 movs r0, 0x2 - b _08063EDA -_08063EA2: + b @08063EDA +@08063EA2: ldrb r4, [r2, 0x3] movs r3, 0x3F adds r0, r3, 0 ands r0, r4 cmp r0, 0 - beq _08063EB2 + beq @08063EB2 movs r0, 0x3 - b _08063EDA -_08063EB2: + b @08063EDA +@08063EB2: ldrb r1, [r2] adds r0, r3, 0 ands r0, r1 cmp r0, 0 - bne _08063EC8 + bne @08063EC8 ldrb r0, [r2, 0x1] cmp r0, 0 - bne _08063EC8 + bne @08063EC8 ldrb r0, [r2, 0x2] cmp r0, 0 - beq _08063ECC -_08063EC8: + beq @08063ECC +@08063EC8: movs r0, 0x4 - b _08063EDA -_08063ECC: + b @08063EDA +@08063ECC: movs r0, 0x80 ands r0, r4 cmp r0, 0 - bne _08063ED8 + bne @08063ED8 movs r0, 0x6 - b _08063EDA -_08063ED8: + b @08063EDA +@08063ED8: movs r0, 0x5 -_08063EDA: +@08063EDA: pop {r4} pop {r1} bx r1 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 @@ -176250,28 +176250,28 @@ sub_8063EE0: @ 8063EE0 lsls r1, 15 ands r0, r1 cmp r0, 0 - beq _08063F12 + beq @08063F12 ldr r0, =0x02024064 ldrb r0, [r0] bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _08063F12 - b _0806437C -_08063F12: + bne @08063F12 + b @0806437C +@08063F12: ldr r0, =0x02024064 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 ldr r5, =0x02024744 cmp r0, 0 - bne _08063F24 + bne @08063F24 ldr r5, =0x020244ec -_08063F24: +@08063F24: movs r1, 0 mov r8, r1 -_08063F28: +@08063F28: movs r0, 0x64 mov r2, r8 muls r2, r0 @@ -176281,37 +176281,37 @@ _08063F28: movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _08063F64 + beq @08063F64 adds r0, r4, 0 movs r1, 0x41 bl pokemon_getattr cmp r0, 0 - beq _08063F64 + beq @08063F64 adds r0, r4, 0 movs r1, 0x41 bl pokemon_getattr movs r1, 0xCE lsls r1, 1 cmp r0, r1 - beq _08063F64 + beq @08063F64 mov r0, r10 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r10, r0 -_08063F64: +@08063F64: movs r0, 0x1 add r8, r0 mov r1, r8 cmp r1, 0x5 - ble _08063F28 + ble @08063F28 movs r2, 0 mov r8, r2 -_08063F72: +@08063F72: ldr r1, =0x020244a8 mov r0, r8 cmp r0, 0 - beq _08063F8E + beq @08063F8E ldr r0, [r1] ldr r0, [r0, 0x18] adds r0, 0x50 @@ -176320,9 +176320,9 @@ _08063F72: subs r0, r2 adds r0, 0x1 cmp r10, r0 - ble _08063F8E - b _08064370 -_08063F8E: + ble @08063F8E + b @08064370 +@08063F8E: ldr r0, [r1] ldr r0, [r0, 0x18] mov r2, r8 @@ -176333,31 +176333,31 @@ _08063F8E: mov r9, r0 str r1, [sp] cmp r0, 0 - bne _08063FA6 - b _08064370 -_08063FA6: + bne @08063FA6 + b @08064370 +@08063FA6: ldr r1, =0x0831e58c subs r0, 0xD lsls r0, 2 adds r0, r1 ldr r1, [r0] cmp r1, 0 - bne _08063FB6 - b _08064370 -_08063FB6: + bne @08063FB6 + b @08064370 +@08063FB6: mov r0, r9 cmp r0, 0xAF - bne _08063FE8 + bne @08063FE8 ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00003214 adds r5, r0, r1 - b _08063FEA + b @08063FEA .align 2, 0 .pool -_08063FE8: +@08063FE8: adds r5, r1, 0 -_08063FEA: +@08063FEA: mov r2, r9 lsls r0, r2, 24 lsrs r0, 24 @@ -176379,25 +176379,25 @@ _08063FEA: ldrb r0, [r0] subs r0, 0x1 cmp r0, 0x5 - bls _0806401A - b _08064324 -_0806401A: + bls @0806401A + b @08064324 +@0806401A: lsls r0, 2 - ldr r1, =_08064030 + ldr r1, =@08064030 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08064030: - .4byte _08064048 - .4byte _08064074 - .4byte _080640BC - .4byte _08064214 - .4byte _080642F4 - .4byte _0806437C -_08064048: +@08064030: + .4byte @08064048 + .4byte @08064074 + .4byte @080640BC + .4byte @08064214 + .4byte @080642F4 + .4byte @0806437C +@08064048: ldr r2, =0x02024084 ldr r0, =0x02024064 ldrb r1, [r0] @@ -176408,28 +176408,28 @@ _08064048: ldrh r0, [r0, 0x28] lsrs r1, 2 cmp r0, r1 - bcc _08064060 - b _08064324 -_08064060: + bcc @08064060 + b @08064324 +@08064060: cmp r0, 0 - bne _08064066 - b _08064324 -_08064066: + bne @08064066 + b @08064324 +@08064066: movs r7, 0x1 - b _08064328 + b @08064328 .align 2, 0 .pool -_08064074: +@08064074: mov r0, r9 movs r1, 0x4 movs r2, 0x4 - bl _0806CDDC + bl sub_806CDDC lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _08064088 - b _08064324 -_08064088: + bne @08064088 + b @08064324 +@08064088: ldr r2, =0x02024084 ldr r0, =0x02024064 ldrb r1, [r0] @@ -176438,25 +176438,25 @@ _08064088: adds r1, r0, r2 ldrh r2, [r1, 0x28] cmp r2, 0 - bne _0806409C - b _08064324 -_0806409C: + bne @0806409C + b @08064324 +@0806409C: ldrh r3, [r1, 0x2C] lsrs r0, r3, 2 cmp r2, r0 - bcc _08064066 + bcc @08064066 adds r0, r2, 0 subs r0, r3, r0 adds r1, r5, r4 ldrb r1, [r1] cmp r0, r1 - bgt _080640B2 - b _08064324 -_080640B2: - b _08064066 + bgt @080640B2 + b @08064324 +@080640B2: + b @08064066 .align 2, 0 .pool -_080640BC: +@080640BC: ldr r3, =0x02024064 ldrb r0, [r3] lsrs r0, 1 @@ -176471,7 +176471,7 @@ _080640BC: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _08064100 + beq @08064100 ldr r1, =0x02024084 ldrb r4, [r3] movs r0, 0x58 @@ -176482,7 +176482,7 @@ _080640BC: movs r1, 0x7 ands r0, r1 cmp r0, 0 - beq _08064100 + beq @08064100 lsrs r1, r4, 1 ldr r0, [r2] adds r1, r0 @@ -176491,13 +176491,13 @@ _080640BC: orrs r0, r6 strb r0, [r1] movs r7, 0x1 -_08064100: +@08064100: ldrb r1, [r5, 0x3] movs r6, 0x10 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0806413A + beq @0806413A ldr r1, =0x02024084 ldrb r4, [r3] movs r0, 0x58 @@ -176508,12 +176508,12 @@ _08064100: movs r0, 0x8 ands r0, r1 cmp r0, 0 - bne _0806412A + bne @0806412A movs r0, 0x80 ands r1, r0 cmp r1, 0 - beq _0806413A -_0806412A: + beq @0806413A +@0806412A: lsrs r1, r4, 1 ldr r0, [r2] adds r1, r0 @@ -176522,13 +176522,13 @@ _0806412A: orrs r0, r6 strb r0, [r1] movs r7, 0x1 -_0806413A: +@0806413A: ldrb r1, [r5, 0x3] movs r6, 0x8 movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _0806416C + beq @0806416C ldr r1, =0x02024084 ldrb r4, [r3] movs r0, 0x58 @@ -176539,7 +176539,7 @@ _0806413A: movs r1, 0x10 ands r0, r1 cmp r0, 0 - beq _0806416C + beq @0806416C lsrs r1, r4, 1 ldr r0, [r2] adds r1, r0 @@ -176548,13 +176548,13 @@ _0806413A: orrs r0, r6 strb r0, [r1] movs r7, 0x1 -_0806416C: +@0806416C: ldrb r1, [r5, 0x3] movs r6, 0x4 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0806419E + beq @0806419E ldr r1, =0x02024084 ldrb r4, [r3] movs r0, 0x58 @@ -176565,7 +176565,7 @@ _0806416C: movs r1, 0x20 ands r0, r1 cmp r0, 0 - beq _0806419E + beq @0806419E lsrs r1, r4, 1 ldr r0, [r2] adds r1, r0 @@ -176574,13 +176574,13 @@ _0806416C: orrs r0, r6 strb r0, [r1] movs r7, 0x1 -_0806419E: +@0806419E: ldrb r1, [r5, 0x3] movs r6, 0x2 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080641D0 + beq @080641D0 ldr r1, =0x02024084 ldrb r4, [r3] movs r0, 0x58 @@ -176591,7 +176591,7 @@ _0806419E: movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _080641D0 + beq @080641D0 lsrs r1, r4, 1 ldr r0, [r2] adds r1, r0 @@ -176600,15 +176600,15 @@ _0806419E: orrs r0, r6 strb r0, [r1] movs r7, 0x1 -_080641D0: +@080641D0: ldrb r1, [r5, 0x3] movs r4, 0x1 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080641DE - b _08064324 -_080641DE: + bne @080641DE + b @08064324 +@080641DE: ldr r1, =0x02024084 ldrb r3, [r3] movs r0, 0x58 @@ -176619,9 +176619,9 @@ _080641DE: movs r1, 0x7 ands r0, r1 cmp r0, 0 - bne _080641F6 - b _08064324 -_080641F6: + bne @080641F6 + b @08064324 +@080641F6: lsrs r1, r3, 1 ldr r0, [r2] adds r1, r0 @@ -176629,10 +176629,10 @@ _080641F6: ldrb r0, [r1] orrs r0, r4 strb r0, [r1] - b _08064066 + b @08064066 .align 2, 0 .pool -_08064214: +@08064214: ldr r4, =0x02024064 ldrb r0, [r4] lsrs r0, 1 @@ -176650,13 +176650,13 @@ _08064214: adds r0, r1 ldrb r0, [r0, 0x16] cmp r0, 0 - beq _08064324 + beq @08064324 ldrb r1, [r5] movs r6, 0xF adds r0, r6, 0 ands r0, r1 cmp r0, 0 - beq _08064254 + beq @08064254 lsrs r2, 1 ldr r0, [r3] adds r2, r0 @@ -176665,13 +176665,13 @@ _08064214: movs r1, 0x1 orrs r0, r1 strb r0, [r2] -_08064254: +@08064254: ldrb r1, [r5, 0x1] movs r7, 0xF0 adds r0, r7, 0 ands r0, r1 cmp r0, 0 - beq _08064272 + beq @08064272 ldrb r0, [r4] lsrs r0, 1 ldr r1, [r3] @@ -176681,12 +176681,12 @@ _08064254: movs r2, 0x2 orrs r1, r2 strb r1, [r0] -_08064272: +@08064272: ldrb r1, [r5, 0x1] adds r0, r6, 0 ands r0, r1 cmp r0, 0 - beq _0806428E + beq @0806428E ldrb r0, [r4] lsrs r0, 1 ldr r1, [r3] @@ -176696,12 +176696,12 @@ _08064272: movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_0806428E: +@0806428E: ldrb r1, [r5, 0x2] adds r0, r6, 0 ands r0, r1 cmp r0, 0 - beq _080642AA + beq @080642AA ldrb r0, [r4] lsrs r0, 1 ldr r1, [r3] @@ -176711,12 +176711,12 @@ _0806428E: movs r2, 0x8 orrs r1, r2 strb r1, [r0] -_080642AA: +@080642AA: ldrb r1, [r5, 0x2] adds r0, r7, 0 ands r0, r1 cmp r0, 0 - beq _080642C6 + beq @080642C6 ldrb r0, [r4] lsrs r0, 1 ldr r1, [r3] @@ -176726,14 +176726,14 @@ _080642AA: movs r2, 0x20 orrs r1, r2 strb r1, [r0] -_080642C6: +@080642C6: ldrb r1, [r5] movs r0, 0x30 ands r0, r1 cmp r0, 0 - bne _080642D2 - b _08064066 -_080642D2: + bne @080642D2 + b @08064066 +@080642D2: ldrb r0, [r4] lsrs r0, 1 ldr r1, [r3] @@ -176743,10 +176743,10 @@ _080642D2: movs r2, 0x80 orrs r1, r2 strb r1, [r0] - b _08064066 + b @08064066 .align 2, 0 .pool -_080642F4: +@080642F4: ldr r4, =0x02024064 ldrb r0, [r4] bl battle_side_get_owner @@ -176760,7 +176760,7 @@ _080642F4: adds r0, r2 ldrb r0, [r0, 0x16] cmp r0, 0 - beq _08064324 + beq @08064324 ldr r0, =0x02024294 lsls r1, r3, 1 adds r1, r3 @@ -176768,12 +176768,12 @@ _080642F4: adds r1, r0 ldrb r0, [r1, 0x4] cmp r0, 0 - bne _08064324 - b _08064066 -_08064324: + bne @08064324 + b @08064066 +@08064324: cmp r7, 0 - beq _08064370 -_08064328: + beq @08064370 +@08064328: movs r0, 0x1 movs r1, 0x1 movs r2, 0 @@ -176797,19 +176797,19 @@ _08064328: movs r1, 0 strh r1, [r0] adds r0, r7, 0 - b _0806437E + b @0806437E .align 2, 0 .pool -_08064370: +@08064370: movs r0, 0x1 add r8, r0 mov r1, r8 cmp r1, 0x3 - bgt _0806437C - b _08063F72 -_0806437C: + bgt @0806437C + b @08063F72 +@0806437C: movs r0, 0 -_0806437E: +@0806437E: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -176821,12 +176821,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] @@ -176840,7 +176840,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, =0x0832a328 @@ -176852,31 +176852,31 @@ sub_80643B0: @ 80643B0 ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _080643FC + beq @080643FC ldr r0, =0x02023064 lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] cmp r0, 0x38 - bhi _080643F8 + bhi @080643F8 ldr r0, =0x0831c7b4 ldrb r1, [r1] lsls r1, 2 adds r1, r0 ldr r0, [r1] bl _call_via_r0 - b _080643FC + b @080643FC .align 2, 0 .pool -_080643F8: +@080643F8: bl sub_8065068 -_080643FC: +@080643FC: pop {r0} bx r0 thumb_func_end sub_80643B0 thumb_func_start sub_8064400 -sub_8064400: @ 8064400 +sub_8064400: ; 8064400 push {lr} ldr r2, =0x02020630 ldr r1, =0x020241e4 @@ -176892,9 +176892,9 @@ sub_8064400: @ 8064400 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _08064424 + bne @08064424 bl sub_8065068 -_08064424: +@08064424: pop {r0} bx r0 .align 2, 0 @@ -176902,7 +176902,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 @@ -176918,9 +176918,9 @@ sub_8064438: @ 8064438 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _0806445C + bne @0806445C bl sub_8065068 -_0806445C: +@0806445C: pop {r0} bx r0 .align 2, 0 @@ -176928,7 +176928,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 @@ -176945,7 +176945,7 @@ sub_8064470: @ 8064470 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _080644C2 + bne @080644C2 adds r0, r2, r5 ldrh r0, [r0, 0x6] bl sub_805DFE4 @@ -176966,7 +176966,7 @@ sub_8064470: @ 8064470 adds r0, r5 bl obj_delete_and_free_tiles bl sub_8065068 -_080644C2: +@080644C2: pop {r4-r6} pop {r0} bx r0 @@ -176975,7 +176975,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] @@ -176992,7 +176992,7 @@ sub_80644D8: @ 80644D8 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _08064510 + bne @08064510 ldr r0, [r4] ldrb r1, [r3] ldr r2, [r0, 0x4] @@ -177003,7 +177003,7 @@ sub_80644D8: @ 80644D8 movs r1, 0 strb r1, [r0, 0x9] bl sub_8065068 -_08064510: +@08064510: pop {r4} pop {r0} bx r0 @@ -177012,7 +177012,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} @@ -177022,18 +177022,18 @@ sub_8064520: @ 8064520 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _0806454C + beq @0806454C bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _08064584 + beq @08064584 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _08064584 -_0806454C: + beq @08064584 +@0806454C: ldr r2, =0x02020630 ldr r1, =0x03005d70 ldr r3, =0x02024064 @@ -177049,11 +177049,11 @@ _0806454C: ldr r0, =nullsub_12 + 1 adds r7, r3, 0 cmp r1, r0 - bne _080645C2 - b _080645CA + bne @080645C2 + b @080645CA .align 2, 0 .pool -_08064584: +@08064584: ldr r3, =0x02020630 ldr r6, =0x03005d70 ldr r2, =0x02024064 @@ -177070,7 +177070,7 @@ _08064584: ldr r0, =nullsub_12 + 1 adds r7, r2, 0 cmp r3, r0 - bne _080645C0 + bne @080645C0 movs r0, 0x2 eors r4, r0 adds r0, r4, r6 @@ -177081,27 +177081,27 @@ _08064584: adds r0, r5 ldr r0, [r0] cmp r0, r3 - bne _080645C0 + bne @080645C0 movs r1, 0x1 mov r8, r1 -_080645C0: +@080645C0: movs r4, 0x1 -_080645C2: +@080645C2: mov r0, r8 cmp r0, 0 - bne _080645CA - b _08064714 -_080645CA: + bne @080645CA + b @08064714 +@080645CA: cmp r4, 0 - bne _080645DE + bne @080645DE ldrb r1, [r7] movs r0, 0x2 eors r0, r1 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - bne _0806469C -_080645DE: + bne @0806469C +@080645DE: ldr r1, =0x020244d0 mov r12, r1 ldr r0, [r1] @@ -177117,9 +177117,9 @@ _080645DE: adds r0, r5, 0 ands r0, r1 cmp r0, 0 - bne _08064600 - b _08064714 -_08064600: + bne @08064600 + b @08064714 +@08064600: movs r6, 0x2 adds r1, r6, 0 eors r1, r2 @@ -177131,7 +177131,7 @@ _08064600: adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _08064714 + beq @08064714 ldrb r1, [r4] movs r3, 0x7F adds r0, r3, 0 @@ -177182,10 +177182,10 @@ _08064600: bl gpu_tile_obj_free_by_tag adds r0, r4, 0 bl gpu_pal_free_tag - b _080646F2 + b @080646F2 .align 2, 0 .pool -_0806469C: +@0806469C: ldr r3, =0x020244d0 ldr r0, [r3] ldrb r1, [r7] @@ -177198,7 +177198,7 @@ _0806469C: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08064714 + beq @08064714 ldrb r1, [r2] movs r0, 0x7F ands r0, r1 @@ -177220,13 +177220,13 @@ _0806469C: lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bne _080646F2 + bne @080646F2 ldr r4, =0x000027f9 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 bl gpu_pal_free_tag -_080646F2: +@080646F2: ldr r0, =0x020244d0 ldr r0, [r0] ldr r3, =0x02024064 @@ -177244,7 +177244,7 @@ _080646F2: adds r0, r1 ldr r1, =sub_80644D8 + 1 str r1, [r0] -_08064714: +@08064714: pop {r3} mov r8, r3 pop {r4-r7} @@ -177255,7 +177255,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 @@ -177278,7 +177278,7 @@ sub_8064734: @ 8064734 adds r0, r6, 0 ands r0, r1 cmp r0, 0 - bne _08064776 + bne @08064776 ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] @@ -177288,13 +177288,13 @@ sub_8064734: @ 8064734 adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 -_08064776: +@08064776: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - bne _080647B4 + bne @080647B4 ldr r2, [r5] ldrb r1, [r4] movs r0, 0x2 @@ -177309,7 +177309,7 @@ _08064776: adds r0, r6, 0 ands r0, r1 cmp r0, 0 - bne _080647B4 + bne @080647B4 ldr r0, =0x0202406e adds r0, r2, r0 ldrh r1, [r0] @@ -177319,7 +177319,7 @@ _08064776: adds r1, r0 adds r0, r3, 0 bl sub_8172EF0 -_080647B4: +@080647B4: ldr r3, =0x020244d0 ldr r0, [r3] ldr r2, =0x02024064 @@ -177336,7 +177336,7 @@ _080647B4: mov r8, r3 mov r9, r2 cmp r0, 0 - bne _08064898 + bne @08064898 movs r7, 0x2 adds r1, r7, 0 eors r1, r5 @@ -177348,22 +177348,22 @@ _080647B4: mov r0, r12 ands r0, r1 cmp r0, 0 - bne _08064898 + bne @08064898 ldrb r1, [r6, 0x1] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0806487A + bne @0806487A bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _0806484A + beq @0806484A ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - bne _0806484A + bne @0806484A ldr r4, =0x03005d70 mov r1, r9 ldrb r0, [r1] @@ -177391,7 +177391,7 @@ _080647B4: adds r0, r4 ldrb r0, [r0] bl sub_80729D0 -_0806484A: +@0806484A: ldr r5, =0x03005d70 ldr r4, =0x02024064 ldrb r1, [r4] @@ -177413,7 +177413,7 @@ _0806484A: adds r0, r5 ldrb r0, [r0] bl sub_80729D0 -_0806487A: +@0806487A: ldr r4, =0x020244d0 ldr r0, [r4] ldr r3, =0x02024064 @@ -177429,7 +177429,7 @@ _0806487A: strb r1, [r0, 0x1] mov r8, r4 mov r9, r3 -_08064898: +@08064898: mov r1, r8 ldr r0, [r1] mov r1, r9 @@ -177443,7 +177443,7 @@ _08064898: movs r0, 0xC0 ands r0, r1 cmp r0, 0x80 - bne _0806495A + bne @0806495A movs r1, 0x2 eors r1, r2 lsls r0, r1, 1 @@ -177454,11 +177454,11 @@ _08064898: movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _0806495A + bne @0806495A bl sub_80A36C8 lsls r0, 24 cmp r0, 0 - bne _0806495A + bne @0806495A mov r1, r8 ldr r0, [r1] mov r1, r9 @@ -177472,31 +177472,31 @@ _08064898: movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _0806493C + bne @0806493C ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x42 ands r0, r1 cmp r0, 0x42 - bne _08064930 + bne @08064930 adds r0, r2, 0 bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0806493C + bne @0806493C ldr r0, =0x03007420 bl m4aMPlayContinue - b _0806493C + b @0806493C .align 2, 0 .pool -_08064930: +@08064930: ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl -_0806493C: +@0806493C: ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -177512,12 +177512,12 @@ _0806493C: strb r1, [r0, 0x1] movs r0, 0x1 mov r10, r0 -_0806495A: +@0806495A: mov r1, r10 cmp r1, 0 - bne _08064962 - b _08064AC0 -_08064962: + bne @08064962 + b @08064AC0 +@08064962: ldr r2, =0x02020630 ldr r0, =0x03005d7c ldr r5, =0x02024064 @@ -177532,9 +177532,9 @@ _08064962: ldr r4, [r0] ldr r0, =nullsub_12 + 1 cmp r4, r0 - beq _08064982 - b _08064AC0 -_08064982: + beq @08064982 + b @08064AC0 +@08064982: ldr r0, =0x020241e4 adds r0, r3, r0 ldrb r1, [r0] @@ -177544,21 +177544,21 @@ _08064982: adds r0, r2 ldr r0, [r0] cmp r0, r4 - beq _08064998 - b _08064AC0 -_08064998: + beq @08064998 + b @08064AC0 +@08064998: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _080649E2 + beq @080649E2 adds r0, r3, 0 bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bne _080649E2 + bne @080649E2 ldr r3, =0x020244d0 ldr r0, [r3] ldrb r2, [r5] @@ -177573,7 +177573,7 @@ _08064998: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08064AC0 + beq @08064AC0 ldr r0, [r3] ldrb r1, [r5] ldr r2, [r0, 0x4] @@ -177583,17 +177583,17 @@ _08064998: adds r0, r2 movs r1, 0 strb r1, [r0, 0x9] -_080649E2: +@080649E2: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _08064A3A + beq @08064A3A ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - bne _08064A3A + bne @08064A3A ldr r1, =0x03005d7c ldr r5, =0x02024064 ldrb r0, [r5] @@ -177624,7 +177624,7 @@ _080649E2: lsrs r1, 16 adds r0, r4, 0 bl sub_805EE54 -_08064A3A: +@08064A3A: ldr r1, =0x03005d7c ldr r4, =0x02024064 ldrb r0, [r4] @@ -177689,7 +177689,7 @@ _08064A3A: adds r0, r1 ldr r1, =sub_8064520 + 1 str r1, [r0] -_08064AC0: +@08064AC0: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -177702,7 +177702,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 @@ -177719,12 +177719,12 @@ sub_8064B04: @ 8064B04 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _08064BB6 + bne @08064BB6 adds r0, r2, r4 movs r1, 0x24 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08064BB6 + bne @08064BB6 ldr r6, =0x020244d0 ldr r0, [r6] ldr r1, [r0, 0x4] @@ -177736,7 +177736,7 @@ sub_8064B04: @ 8064B04 movs r0, 0x80 ands r0, r5 cmp r0, 0 - bne _08064B7C + bne @08064B7C ldr r0, =0x0202406e adds r0, r4, r0 ldrh r1, [r0] @@ -177746,15 +177746,15 @@ sub_8064B04: @ 8064B04 adds r1, r0 adds r0, r3, 0 bl sub_8172EF0 - b _08064BB6 + b @08064BB6 .align 2, 0 .pool -_08064B7C: +@08064B7C: ldrb r1, [r2, 0x1] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08064BB6 + beq @08064BB6 movs r0, 0x7F ands r0, r5 strb r0, [r2] @@ -177776,7 +177776,7 @@ _08064B7C: adds r0, r4, 0 bl gpu_pal_free_tag bl sub_8065068 -_08064BB6: +@08064BB6: pop {r4-r7} pop {r0} bx r0 @@ -177785,7 +177785,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] @@ -177807,25 +177807,25 @@ sub_8064BC0: @ 8064BC0 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _08064C08 + beq @08064C08 ldrb r0, [r6] adds r0, r5 ldrb r0, [r0] movs r2, 0 bl heathbar_draw_hp - b _08064C0C + b @08064C0C .align 2, 0 .pool -_08064C08: +@08064C08: bl sub_8065068 -_08064C0C: +@08064C0C: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_8064BC0 thumb_func_start sub_8064C14 -sub_8064C14: @ 8064C14 +sub_8064C14: ; 8064C14 push {lr} ldr r2, =0x02020630 ldr r0, =0x020241e4 @@ -177841,13 +177841,13 @@ sub_8064C14: @ 8064C14 ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - bne _08064C42 + bne @08064C42 ldr r0, =0x03005d70 adds r0, r3, r0 ldrb r0, [r0] bl sub_8072984 bl sub_8065068 -_08064C42: +@08064C42: pop {r0} bx r0 .align 2, 0 @@ -177855,7 +177855,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] @@ -177870,7 +177870,7 @@ sub_8064C58: @ 8064C58 movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _08064CB2 + bne @08064CB2 ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] @@ -177896,7 +177896,7 @@ sub_8064C58: @ 8064C58 ldrb r0, [r0] bl sub_8072984 bl sub_8065068 -_08064CB2: +@08064CB2: pop {r4-r6} pop {r0} bx r0 @@ -177905,21 +177905,21 @@ _08064CB2: thumb_func_end sub_8064C58 thumb_func_start sub_8064CCC -sub_8064CCC: @ 8064CCC +sub_8064CCC: ; 8064CCC push {lr} movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _08064CDE + bne @08064CDE bl sub_8065068 -_08064CDE: +@08064CDE: pop {r0} bx r0 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 @@ -177934,7 +177934,7 @@ sub_8064CE4: @ 8064CE4 movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0x20 - bne _08064D30 + bne @08064D30 movs r3, 0 movs r0, 0 strh r0, [r4, 0x30] @@ -177947,15 +177947,15 @@ sub_8064CE4: @ 8064CE4 ldr r0, =0x020244b9 strb r3, [r0] bl sub_8065068 - b _08064D5A + b @08064D5A .align 2, 0 .pool -_08064D30: +@08064D30: ldrh r0, [r4, 0x30] movs r1, 0x3 ands r0, r1 cmp r0, 0 - bne _08064D54 + bne @08064D54 adds r3, r4, 0 adds r3, 0x3E ldrb r2, [r3] @@ -177969,18 +177969,18 @@ _08064D30: ands r0, r2 orrs r0, r1 strb r0, [r3] -_08064D54: +@08064D54: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] -_08064D5A: +@08064D5A: pop {r4} pop {r0} bx r0 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 @@ -177996,7 +177996,7 @@ sub_8064D60: @ 8064D60 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _08064DAC + bne @08064DAC ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -178006,20 +178006,20 @@ sub_8064D60: @ 8064D60 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08064DA0 + beq @08064DA0 adds r0, r3, 0 adds r1, r3, 0 adds r2, r3, 0 movs r3, 0x6 bl move_anim_start_t4 -_08064DA0: +@08064DA0: ldr r0, =0x03005d60 ldrb r1, [r4] lsls r1, 2 adds r1, r0 ldr r0, =sub_8064DD0 + 1 str r0, [r1] -_08064DAC: +@08064DAC: pop {r4} pop {r0} bx r0 @@ -178028,7 +178028,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] @@ -178043,11 +178043,11 @@ sub_8064DD0: @ 8064DD0 movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _08064E2A + bne @08064E2A bl sub_80A36C8 lsls r0, 24 cmp r0, 0 - bne _08064E2A + bne @08064E2A ldr r2, =0x02020630 ldr r1, =0x020241e4 ldrb r0, [r4] @@ -178061,18 +178061,18 @@ sub_8064DD0: @ 8064DD0 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - beq _08064E1A + beq @08064E1A ldr r0, =nullsub_18 + 1 cmp r1, r0 - bne _08064E2A -_08064E1A: + bne @08064E2A +@08064E1A: ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl bl sub_8065068 -_08064E2A: +@08064E2A: pop {r4} pop {r0} bx r0 @@ -178081,7 +178081,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] @@ -178096,7 +178096,7 @@ sub_8064E50: @ 8064E50 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08064F0C + beq @08064F0C ldr r7, =0x02020630 ldr r6, =0x020241e4 adds r0, r2, r6 @@ -178110,7 +178110,7 @@ sub_8064E50: @ 8064E50 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _08064F0C + bne @08064F0C ldrb r1, [r3] movs r0, 0x7F ands r0, r1 @@ -178169,7 +178169,7 @@ sub_8064E50: @ 8064E50 adds r0, r1 ldr r1, =sub_8064D60 + 1 str r1, [r0] -_08064F0C: +@08064F0C: pop {r4-r7} pop {r0} bx r0 @@ -178178,7 +178178,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] @@ -178193,7 +178193,7 @@ sub_8064F40: @ 8064F40 movs r0, 0x88 ands r0, r1 cmp r0, 0 - bne _08064F72 + bne @08064F72 ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] @@ -178203,7 +178203,7 @@ sub_8064F40: @ 8064F40 adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 -_08064F72: +@08064F72: ldr r4, =0x02020630 ldr r0, =0x03005d7c ldrb r2, [r5] @@ -178218,7 +178218,7 @@ _08064F72: ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _08064FDC + bne @08064FDC ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -178229,7 +178229,7 @@ _08064F72: movs r0, 0x8 ands r0, r1 cmp r0, 0 - bne _08064FDC + bne @08064FDC adds r0, r3, r4 bl obj_delete_and_free_tiles ldrb r4, [r5] @@ -178254,7 +178254,7 @@ _08064F72: adds r0, r1 ldr r1, =sub_8064E50 + 1 str r1, [r0] -_08064FDC: +@08064FDC: pop {r4-r6} pop {r0} bx r0 @@ -178263,7 +178263,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] @@ -178278,9 +178278,9 @@ sub_8065008: @ 8065008 movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _0806502A + bne @0806502A bl sub_8065068 -_0806502A: +@0806502A: pop {r0} bx r0 .align 2, 0 @@ -178288,7 +178288,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] @@ -178303,9 +178303,9 @@ sub_8065038: @ 8065038 movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _0806505A + bne @0806505A bl sub_8065068 -_0806505A: +@0806505A: pop {r0} bx r0 .align 2, 0 @@ -178313,7 +178313,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 @@ -178328,7 +178328,7 @@ sub_8065068: @ 8065068 movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _080650BC + beq @080650BC bl link_get_multiplayer_id mov r1, sp strb r0, [r1] @@ -178342,10 +178342,10 @@ sub_8065068: @ 8065068 adds r0, r1 movs r1, 0x38 strb r1, [r0] - b _080650CE + b @080650CE .align 2, 0 .pool -_080650BC: +@080650BC: ldr r2, =0x02024068 ldr r1, =0x0832a328 ldrb r0, [r4] @@ -178355,7 +178355,7 @@ _080650BC: ldr r0, [r2] bics r0, r1 str r0, [r2] -_080650CE: +@080650CE: add sp, 0x4 pop {r4} pop {r0} @@ -178365,7 +178365,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 @@ -178377,7 +178377,7 @@ dp01t_00_2_getattr: @ 80650E0 adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0 - bne _08065118 + bne @08065118 ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 @@ -178385,29 +178385,29 @@ dp01t_00_2_getattr: @ 80650E0 mov r1, sp bl dp01_getattr_by_ch1_for_opponent_pokemon adds r6, r0, 0 - b _0806513A + b @0806513A .align 2, 0 .pool -_08065118: +@08065118: ldrb r4, [r1] movs r5, 0 -_0806511C: +@0806511C: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _08065132 + beq @08065132 lsls r0, r5, 24 lsrs r0, 24 mov r2, sp adds r1, r2, r6 bl dp01_getattr_by_ch1_for_opponent_pokemon adds r6, r0 -_08065132: +@08065132: lsrs r4, 1 adds r5, 0x1 cmp r5, 0x5 - ble _0806511C -_0806513A: + ble @0806511C +@0806513A: lsls r1, r6, 16 lsrs r1, 16 movs r0, 0x1 @@ -178421,7 +178421,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 @@ -178440,79 +178440,79 @@ dp01_getattr_by_ch1_for_opponent_pokemon: @ 8065154 adds r0, r1 ldrb r0, [r0] cmp r0, 0x3B - bls _0806517E - bl _080658EA -_0806517E: + bls @0806517E + bl @080658EA +@0806517E: lsls r0, 2 - ldr r1, =_08065194 + ldr r1, =@08065194 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08065194: - .4byte _08065284 - .4byte _080654A8 - .4byte _080654B8 - .4byte _080654C8 - .4byte _08065530 - .4byte _08065530 - .4byte _08065530 - .4byte _08065530 - .4byte _0806554C - .4byte _08065588 - .4byte _08065588 - .4byte _08065588 - .4byte _08065588 - .4byte _080658EA - .4byte _080658EA - .4byte _080658EA - .4byte _080658EA - .4byte _080655A4 - .4byte _080655B4 - .4byte _080655E4 - .4byte _080655F4 - .4byte _08065604 - .4byte _08065614 - .4byte _08065624 - .4byte _08065634 - .4byte _08065644 - .4byte _08065654 - .4byte _08065664 - .4byte _08065674 - .4byte _08065684 - .4byte _08065694 - .4byte _080656A4 - .4byte _080656F4 - .4byte _08065704 - .4byte _08065714 - .4byte _08065724 - .4byte _08065734 - .4byte _08065744 - .4byte _08065754 - .4byte _08065764 - .4byte _08065774 - .4byte _080657A8 - .4byte _080657B8 - .4byte _080657C8 - .4byte _080657D8 - .4byte _080657E8 - .4byte _080657F8 - .4byte _08065808 - .4byte _08065818 - .4byte _08065838 - .4byte _08065848 - .4byte _08065858 - .4byte _08065868 - .4byte _08065878 - .4byte _08065888 - .4byte _08065898 - .4byte _080658A8 - .4byte _080658B8 - .4byte _080658C8 - .4byte _080658D8 -_08065284: +@08065194: + .4byte @08065284 + .4byte @080654A8 + .4byte @080654B8 + .4byte @080654C8 + .4byte @08065530 + .4byte @08065530 + .4byte @08065530 + .4byte @08065530 + .4byte @0806554C + .4byte @08065588 + .4byte @08065588 + .4byte @08065588 + .4byte @08065588 + .4byte @080658EA + .4byte @080658EA + .4byte @080658EA + .4byte @080658EA + .4byte @080655A4 + .4byte @080655B4 + .4byte @080655E4 + .4byte @080655F4 + .4byte @08065604 + .4byte @08065614 + .4byte @08065624 + .4byte @08065634 + .4byte @08065644 + .4byte @08065654 + .4byte @08065664 + .4byte @08065674 + .4byte @08065684 + .4byte @08065694 + .4byte @080656A4 + .4byte @080656F4 + .4byte @08065704 + .4byte @08065714 + .4byte @08065724 + .4byte @08065734 + .4byte @08065744 + .4byte @08065754 + .4byte @08065764 + .4byte @08065774 + .4byte @080657A8 + .4byte @080657B8 + .4byte @080657C8 + .4byte @080657D8 + .4byte @080657E8 + .4byte @080657F8 + .4byte @08065808 + .4byte @08065818 + .4byte @08065838 + .4byte @08065848 + .4byte @08065858 + .4byte @08065868 + .4byte @08065878 + .4byte @08065888 + .4byte @08065898 + .4byte @080658A8 + .4byte @080658B8 + .4byte @080658C8 + .4byte @080658D8 +@08065284: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -178549,7 +178549,7 @@ _08065284: str r0, [sp, 0x88] mov r8, r4 add r4, sp, 0xC -_080652D0: +@080652D0: adds r1, r6, 0 adds r1, 0xD mov r0, r8 @@ -178565,7 +178565,7 @@ _080652D0: adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble _080652D0 + ble @080652D0 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -178743,36 +178743,36 @@ _080652D0: bl pokemon_getattr mov r2, sp movs r6, 0 -_08065488: +@08065488: adds r0, r7, r6 adds r1, r2, r6 ldrb r1, [r1] strb r1, [r0] adds r6, 0x1 cmp r6, 0x57 - bls _08065488 - b _080658EA + bls @08065488 + b @080658EA .align 2, 0 .pool -_080654A8: +@080654A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB - b _08065822 + b @08065822 .align 2, 0 .pool -_080654B8: +@080654B8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0xC - b _08065822 + b @08065822 .align 2, 0 .pool -_080654C8: +@080654C8: movs r6, 0 add r2, sp, 0x58 mov r9, r2 @@ -178784,7 +178784,7 @@ _080654C8: ldr r0, =0x02024744 adds r4, r1, r0 mov r8, r9 -_080654DE: +@080654DE: adds r1, r6, 0 adds r1, 0xD adds r0, r4, 0 @@ -178802,7 +178802,7 @@ _080654DE: add r8, r0 adds r6, 0x1 cmp r6, 0x3 - ble _080654DE + ble @080654DE movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -178813,18 +178813,18 @@ _080654DE: strb r0, [r1, 0xC] mov r2, r9 movs r6, 0 -_0806551C: +@0806551C: adds r0, r7, r6 adds r1, r2, r6 ldrb r1, [r1] strb r1, [r0] adds r6, 0x1 cmp r6, 0xF - bls _0806551C - b _080658EA + bls @0806551C + b @080658EA .align 2, 0 .pool -_08065530: +@08065530: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -178835,17 +178835,17 @@ _08065530: adds r1, r2 ldrb r1, [r1] adds r1, 0x9 - b _08065822 + b @08065822 .align 2, 0 .pool -_0806554C: +@0806554C: movs r6, 0 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 ldr r2, =0x02024744 mov r8, r2 -_08065558: +@08065558: adds r1, r6, 0 adds r1, 0x11 mov r2, r8 @@ -178855,7 +178855,7 @@ _08065558: strb r0, [r1] adds r6, 0x1 cmp r6, 0x3 - ble _08065558 + ble @08065558 movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -178865,10 +178865,10 @@ _08065558: adds r1, r7, r6 strb r0, [r1] adds r6, 0x1 - b _080658EA + b @080658EA .align 2, 0 .pool -_08065588: +@08065588: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -178879,25 +178879,25 @@ _08065588: adds r1, r2 ldrb r1, [r1] adds r1, 0x8 - b _080658E2 + b @080658E2 .align 2, 0 .pool -_080655A4: +@080655A4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1 - b _080655BE + b @080655BE .align 2, 0 .pool -_080655B4: +@080655B4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x19 -_080655BE: +@080655BE: bl pokemon_getattr adds r1, r0, 0 strb r1, [r7] @@ -178912,118 +178912,118 @@ _080655BE: lsrs r0, 16 strb r0, [r7, 0x2] movs r6, 0x3 - b _080658EA + b @080658EA .align 2, 0 .pool -_080655E4: +@080655E4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1A - b _080658E2 + b @080658E2 .align 2, 0 .pool -_080655F4: +@080655F4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1B - b _080658E2 + b @080658E2 .align 2, 0 .pool -_08065604: +@08065604: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1C - b _080658E2 + b @080658E2 .align 2, 0 .pool -_08065614: +@08065614: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1D - b _080658E2 + b @080658E2 .align 2, 0 .pool -_08065624: +@08065624: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1E - b _080658E2 + b @080658E2 .align 2, 0 .pool -_08065634: +@08065634: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1F - b _080658E2 + b @080658E2 .align 2, 0 .pool -_08065644: +@08065644: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x20 - b _080658E2 + b @080658E2 .align 2, 0 .pool -_08065654: +@08065654: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x22 - b _080658E2 + b @080658E2 .align 2, 0 .pool -_08065664: +@08065664: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x23 - b _080658E2 + b @080658E2 .align 2, 0 .pool -_08065674: +@08065674: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x24 - b _080658E2 + b @080658E2 .align 2, 0 .pool -_08065684: +@08065684: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x25 - b _080658E2 + b @080658E2 .align 2, 0 .pool -_08065694: +@08065694: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x26 - b _080658E2 + b @080658E2 .align 2, 0 .pool -_080656A4: +@080656A4: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -179054,88 +179054,88 @@ _080656A4: bl pokemon_getattr strb r0, [r7, 0x5] movs r6, 0x6 - b _080658EA + b @080658EA .align 2, 0 .pool -_080656F4: +@080656F4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x27 - b _080658E2 + b @080658E2 .align 2, 0 .pool -_08065704: +@08065704: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x28 - b _080658E2 + b @080658E2 .align 2, 0 .pool -_08065714: +@08065714: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x29 - b _080658E2 + b @080658E2 .align 2, 0 .pool -_08065724: +@08065724: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2A - b _080658E2 + b @080658E2 .align 2, 0 .pool -_08065734: +@08065734: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2B - b _080658E2 + b @080658E2 .align 2, 0 .pool -_08065744: +@08065744: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2C - b _080658E2 + b @080658E2 .align 2, 0 .pool -_08065754: +@08065754: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0 - b _0806577E + b @0806577E .align 2, 0 .pool -_08065764: +@08065764: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x9 - b _08065822 + b @08065822 .align 2, 0 .pool -_08065774: +@08065774: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x37 -_0806577E: +@0806577E: bl pokemon_getattr adds r1, r0, 0 strb r1, [r7] @@ -179152,79 +179152,79 @@ _0806577E: lsrs r0, r1, 24 strb r0, [r7, 0x3] movs r6, 0x4 - b _080658EA + b @080658EA .align 2, 0 .pool -_080657A8: +@080657A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x38 - b _080658E2 + b @080658E2 .align 2, 0 .pool -_080657B8: +@080657B8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x39 - b _08065822 + b @08065822 .align 2, 0 .pool -_080657C8: +@080657C8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3A - b _08065822 + b @08065822 .align 2, 0 .pool -_080657D8: +@080657D8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3B - b _08065822 + b @08065822 .align 2, 0 .pool -_080657E8: +@080657E8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3C - b _08065822 + b @08065822 .align 2, 0 .pool -_080657F8: +@080657F8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3D - b _08065822 + b @08065822 .align 2, 0 .pool -_08065808: +@08065808: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3E - b _08065822 + b @08065822 .align 2, 0 .pool -_08065818: +@08065818: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3F -_08065822: +@08065822: bl pokemon_getattr lsls r0, 16 lsrs r0, 16 @@ -179232,110 +179232,110 @@ _08065822: lsrs r0, 8 strb r0, [r7, 0x1] movs r6, 0x2 - b _080658EA + b @080658EA .align 2, 0 .pool -_08065838: +@08065838: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x16 - b _080658E2 + b @080658E2 .align 2, 0 .pool -_08065848: +@08065848: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x17 - b _080658E2 + b @080658E2 .align 2, 0 .pool -_08065858: +@08065858: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x18 - b _080658E2 + b @080658E2 .align 2, 0 .pool -_08065868: +@08065868: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x21 - b _080658E2 + b @080658E2 .align 2, 0 .pool -_08065878: +@08065878: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2F - b _080658E2 + b @080658E2 .align 2, 0 .pool -_08065888: +@08065888: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x30 - b _080658E2 + b @080658E2 .align 2, 0 .pool -_08065898: +@08065898: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x32 - b _080658E2 + b @080658E2 .align 2, 0 .pool -_080658A8: +@080658A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x33 - b _080658E2 + b @080658E2 .align 2, 0 .pool -_080658B8: +@080658B8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x34 - b _080658E2 + b @080658E2 .align 2, 0 .pool -_080658C8: +@080658C8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x35 - b _080658E2 + b @080658E2 .align 2, 0 .pool -_080658D8: +@080658D8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x36 -_080658E2: +@080658E2: bl pokemon_getattr strb r0, [r7] movs r6, 0x1 -_080658EA: +@080658EA: adds r0, r6, 0 add sp, 0x90 pop {r3-r5} @@ -179350,7 +179350,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} @@ -179358,7 +179358,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 @@ -179368,33 +179368,33 @@ sub_806590C: @ 806590C adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0 - bne _0806593C + bne @0806593C ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] bl sub_8065964 - b _0806595A + b @0806595A .align 2, 0 .pool -_0806593C: +@0806593C: ldrb r4, [r1] movs r5, 0 -_08065940: +@08065940: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _0806594E + beq @0806594E adds r0, r5, 0 bl sub_8065964 -_0806594E: +@0806594E: lsrs r4, 1 adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls _08065940 -_0806595A: + bls @08065940 +@0806595A: bl sub_8065068 pop {r4,r5} pop {r0} @@ -179402,7 +179402,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 @@ -179423,79 +179423,79 @@ sub_8065964: @ 8065964 adds r6, r3, 0 adds r3, r2, 0 cmp r0, 0x3B - bls _08065992 - bl _08066270 -_08065992: + bls @08065992 + bl @08066270 +@08065992: lsls r0, 2 - ldr r1, =_080659A8 + ldr r1, =@080659A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080659A8: - .4byte _08065A98 - .4byte _08065C30 - .4byte _08065C4C - .4byte _08065C68 - .4byte _08065CBC - .4byte _08065CBC - .4byte _08065CBC - .4byte _08065CBC - .4byte _08065CDC - .4byte _08065D44 - .4byte _08065D44 - .4byte _08065D44 - .4byte _08065D44 - .4byte _08066270 - .4byte _08066270 - .4byte _08066270 - .4byte _08066270 - .4byte _08065D6C - .4byte _08065D88 - .4byte _08065DA4 - .4byte _08065DC0 - .4byte _08065DDC - .4byte _08065DF8 - .4byte _08065E14 - .4byte _08065E30 - .4byte _08065E4C - .4byte _08065E68 - .4byte _08065E84 - .4byte _08065EA0 - .4byte _08065EBC - .4byte _08065ED8 - .4byte _08065EF4 - .4byte _08065F68 - .4byte _08065F84 - .4byte _08065FA0 - .4byte _08065FBC - .4byte _08065FD8 - .4byte _08065FF4 - .4byte _08066010 - .4byte _0806602C - .4byte _08066048 - .4byte _08066064 - .4byte _08066080 - .4byte _0806609C - .4byte _080660B8 - .4byte _080660D4 - .4byte _080660F0 - .4byte _0806610C - .4byte _08066128 - .4byte _08066144 - .4byte _08066160 - .4byte _0806617C - .4byte _08066198 - .4byte _080661B4 - .4byte _080661D0 - .4byte _080661EC - .4byte _08066208 - .4byte _08066224 - .4byte _08066240 - .4byte _0806625C -_08065A98: +@080659A8: + .4byte @08065A98 + .4byte @08065C30 + .4byte @08065C4C + .4byte @08065C68 + .4byte @08065CBC + .4byte @08065CBC + .4byte @08065CBC + .4byte @08065CBC + .4byte @08065CDC + .4byte @08065D44 + .4byte @08065D44 + .4byte @08065D44 + .4byte @08065D44 + .4byte @08066270 + .4byte @08066270 + .4byte @08066270 + .4byte @08066270 + .4byte @08065D6C + .4byte @08065D88 + .4byte @08065DA4 + .4byte @08065DC0 + .4byte @08065DDC + .4byte @08065DF8 + .4byte @08065E14 + .4byte @08065E30 + .4byte @08065E4C + .4byte @08065E68 + .4byte @08065E84 + .4byte @08065EA0 + .4byte @08065EBC + .4byte @08065ED8 + .4byte @08065EF4 + .4byte @08065F68 + .4byte @08065F84 + .4byte @08065FA0 + .4byte @08065FBC + .4byte @08065FD8 + .4byte @08065FF4 + .4byte @08066010 + .4byte @0806602C + .4byte @08066048 + .4byte @08066064 + .4byte @08066080 + .4byte @0806609C + .4byte @080660B8 + .4byte @080660D4 + .4byte @080660F0 + .4byte @0806610C + .4byte @08066128 + .4byte @08066144 + .4byte @08066160 + .4byte @0806617C + .4byte @08066198 + .4byte @080661B4 + .4byte @080661D0 + .4byte @080661EC + .4byte @08066208 + .4byte @08066224 + .4byte @08066240 + .4byte @0806625C +@08065A98: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -179545,7 +179545,7 @@ _08065A98: adds r6, 0x24 adds r4, r7, 0 adds r4, 0xC -_08065AFE: +@08065AFE: mov r1, r8 adds r1, 0xD mov r0, r9 @@ -179562,7 +179562,7 @@ _08065AFE: add r8, r0 mov r0, r8 cmp r0, 0x3 - ble _08065AFE + ble @08065AFE movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -179674,10 +179674,10 @@ _08065AFE: movs r1, 0x3F ldr r2, [sp, 0x14] bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065C30: +@08065C30: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -179687,10 +179687,10 @@ _08065C30: adds r2, r3 movs r1, 0xB bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065C4C: +@08065C4C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -179700,10 +179700,10 @@ _08065C4C: adds r2, r3 movs r1, 0xC bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065C68: +@08065C68: movs r0, 0 mov r8, r0 movs r0, 0xC @@ -179716,7 +179716,7 @@ _08065C68: adds r7, r1, r0 adds r6, r4, 0 adds r6, 0x8 -_08065C80: +@08065C80: mov r1, r8 adds r1, 0xD adds r0, r7, 0 @@ -179733,7 +179733,7 @@ _08065C80: add r8, r0 mov r0, r8 cmp r0, 0x3 - ble _08065C80 + ble @08065C80 movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -179741,10 +179741,10 @@ _08065C80: movs r1, 0x15 mov r2, r9 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065CBC: +@08065CBC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -179756,10 +179756,10 @@ _08065CBC: adds r1, r2, r1 ldrb r1, [r1] adds r1, 0x9 - b _08065D5A + b @08065D5A .align 2, 0 .pool -_08065CDC: +@08065CDC: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -179804,10 +179804,10 @@ _08065CDC: adds r0, r4, 0 movs r1, 0x15 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065D44: +@08065D44: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -179819,14 +179819,14 @@ _08065D44: adds r1, r2, r1 ldrb r1, [r1] adds r1, 0x8 -_08065D5A: +@08065D5A: adds r3, 0x3 adds r2, r3 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065D6C: +@08065D6C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -179836,10 +179836,10 @@ _08065D6C: adds r2, r3 movs r1, 0x1 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065D88: +@08065D88: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -179849,10 +179849,10 @@ _08065D88: adds r2, r3 movs r1, 0x19 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065DA4: +@08065DA4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -179862,10 +179862,10 @@ _08065DA4: adds r2, r3 movs r1, 0x1A bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065DC0: +@08065DC0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -179875,10 +179875,10 @@ _08065DC0: adds r2, r3 movs r1, 0x1B bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065DDC: +@08065DDC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -179888,10 +179888,10 @@ _08065DDC: adds r2, r3 movs r1, 0x1C bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065DF8: +@08065DF8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -179901,10 +179901,10 @@ _08065DF8: adds r2, r3 movs r1, 0x1D bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065E14: +@08065E14: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -179914,10 +179914,10 @@ _08065E14: adds r2, r3 movs r1, 0x1E bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065E30: +@08065E30: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -179927,10 +179927,10 @@ _08065E30: adds r2, r3 movs r1, 0x1F bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065E4C: +@08065E4C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -179940,10 +179940,10 @@ _08065E4C: adds r2, r3 movs r1, 0x20 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065E68: +@08065E68: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -179953,10 +179953,10 @@ _08065E68: adds r2, r3 movs r1, 0x22 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065E84: +@08065E84: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -179966,10 +179966,10 @@ _08065E84: adds r2, r3 movs r1, 0x23 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065EA0: +@08065EA0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -179979,10 +179979,10 @@ _08065EA0: adds r2, r3 movs r1, 0x24 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065EBC: +@08065EBC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -179992,10 +179992,10 @@ _08065EBC: adds r2, r3 movs r1, 0x25 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065ED8: +@08065ED8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180005,10 +180005,10 @@ _08065ED8: adds r2, r3 movs r1, 0x26 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065EF4: +@08065EF4: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -180059,10 +180059,10 @@ _08065EF4: adds r0, r3, 0x5 adds r2, r0 adds r0, r4, 0 - b _08066002 + b @08066002 .align 2, 0 .pool -_08065F68: +@08065F68: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180072,10 +180072,10 @@ _08065F68: adds r2, r3 movs r1, 0x27 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065F84: +@08065F84: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180085,10 +180085,10 @@ _08065F84: adds r2, r3 movs r1, 0x28 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065FA0: +@08065FA0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180098,10 +180098,10 @@ _08065FA0: adds r2, r3 movs r1, 0x29 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065FBC: +@08065FBC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180111,10 +180111,10 @@ _08065FBC: adds r2, r3 movs r1, 0x2A bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065FD8: +@08065FD8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180124,10 +180124,10 @@ _08065FD8: adds r2, r3 movs r1, 0x2B bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08065FF4: +@08065FF4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180135,13 +180135,13 @@ _08065FF4: ldrb r2, [r6] lsls r2, 9 adds r2, r3 -_08066002: +@08066002: movs r1, 0x2C bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08066010: +@08066010: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180151,10 +180151,10 @@ _08066010: adds r2, r3 movs r1, 0 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_0806602C: +@0806602C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180164,10 +180164,10 @@ _0806602C: adds r2, r3 movs r1, 0x9 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08066048: +@08066048: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180177,10 +180177,10 @@ _08066048: adds r2, r3 movs r1, 0x37 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08066064: +@08066064: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180190,10 +180190,10 @@ _08066064: adds r2, r3 movs r1, 0x38 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08066080: +@08066080: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180203,10 +180203,10 @@ _08066080: adds r2, r3 movs r1, 0x39 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_0806609C: +@0806609C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180216,10 +180216,10 @@ _0806609C: adds r2, r3 movs r1, 0x3A bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_080660B8: +@080660B8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180229,10 +180229,10 @@ _080660B8: adds r2, r3 movs r1, 0x3B bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_080660D4: +@080660D4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180242,10 +180242,10 @@ _080660D4: adds r2, r3 movs r1, 0x3C bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_080660F0: +@080660F0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180255,10 +180255,10 @@ _080660F0: adds r2, r3 movs r1, 0x3D bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_0806610C: +@0806610C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180268,10 +180268,10 @@ _0806610C: adds r2, r3 movs r1, 0x3E bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08066128: +@08066128: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180281,10 +180281,10 @@ _08066128: adds r2, r3 movs r1, 0x3F bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08066144: +@08066144: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180294,10 +180294,10 @@ _08066144: adds r2, r3 movs r1, 0x16 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08066160: +@08066160: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180307,10 +180307,10 @@ _08066160: adds r2, r3 movs r1, 0x17 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_0806617C: +@0806617C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180320,10 +180320,10 @@ _0806617C: adds r2, r3 movs r1, 0x18 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08066198: +@08066198: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180333,10 +180333,10 @@ _08066198: adds r2, r3 movs r1, 0x21 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_080661B4: +@080661B4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180346,10 +180346,10 @@ _080661B4: adds r2, r3 movs r1, 0x2F bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_080661D0: +@080661D0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180359,10 +180359,10 @@ _080661D0: adds r2, r3 movs r1, 0x30 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_080661EC: +@080661EC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180372,10 +180372,10 @@ _080661EC: adds r2, r3 movs r1, 0x32 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08066208: +@08066208: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180385,10 +180385,10 @@ _08066208: adds r2, r3 movs r1, 0x33 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08066224: +@08066224: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180398,10 +180398,10 @@ _08066224: adds r2, r3 movs r1, 0x34 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_08066240: +@08066240: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180411,10 +180411,10 @@ _08066240: adds r2, r3 movs r1, 0x35 bl pokemon_setattr - b _08066270 + b @08066270 .align 2, 0 .pool -_0806625C: +@0806625C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -180424,7 +180424,7 @@ _0806625C: adds r2, r3 movs r1, 0x36 bl pokemon_setattr -_08066270: +@08066270: add sp, 0x38 pop {r3-r5} mov r8, r3 @@ -180438,7 +180438,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 @@ -180462,11 +180462,11 @@ sub_8066284: @ 8066284 adds r2, r0 ldrb r2, [r2] cmp r3, r2 - bcs _080662DC + bcs @080662DC adds r6, r4, 0 adds r2, r7, 0 adds r4, r0, 0 -_080662BA: +@080662BA: adds r1, r5, r3 ldrb r0, [r2] lsls r0, 9 @@ -180483,8 +180483,8 @@ _080662BA: adds r0, r4 ldrb r0, [r0] cmp r3, r0 - bcc _080662BA -_080662DC: + bcc @080662BA +@080662DC: bl sub_8065068 pop {r4-r7} pop {r0} @@ -180494,7 +180494,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 @@ -180636,7 +180636,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 @@ -180669,7 +180669,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 @@ -180843,7 +180843,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 @@ -180853,7 +180853,7 @@ sub_8066624: @ 8066624 adds r0, r1 ldrb r3, [r0] cmp r3, 0 - bne _0806666C + bne @0806666C ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -180868,10 +180868,10 @@ sub_8066624: @ 8066624 adds r0, r1 ldr r1, =sub_80666BC + 1 str r1, [r0] - b _080666A8 + b @080666A8 .align 2, 0 .pool -_0806666C: +@0806666C: ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] @@ -180897,7 +180897,7 @@ _0806666C: ldrb r0, [r0] bl sub_8072984 bl sub_8065068 -_080666A8: +@080666A8: pop {r4-r6} pop {r0} bx r0 @@ -180906,7 +180906,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] @@ -180919,13 +180919,13 @@ sub_80666BC: @ 80666BC adds r3, r0, r1 ldrb r0, [r3, 0x4] cmp r0, 0 - beq _080666E4 + beq @080666E4 cmp r0, 0x1 - beq _08066712 - b _0806673A + beq @08066712 + b @0806673A .align 2, 0 .pool -_080666E4: +@080666E4: ldr r1, [r4] lsls r0, r2, 2 adds r0, r1 @@ -180933,12 +180933,12 @@ _080666E4: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080666FE + beq @080666FE adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -_080666FE: +@080666FE: ldr r0, [r6] ldrb r1, [r5] ldr r2, [r0, 0x4] @@ -180948,15 +180948,15 @@ _080666FE: adds r0, r2 movs r1, 0x1 strb r1, [r0, 0x4] - b _0806673A -_08066712: + b @0806673A +@08066712: ldrb r1, [r3] movs r0, 0x40 ands r0, r1 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _0806673A + bne @0806673A strb r0, [r3, 0x4] ldrb r2, [r5] adds r0, r2, 0 @@ -180969,7 +180969,7 @@ _08066712: adds r0, r1 ldr r1, =sub_8064C58 + 1 str r1, [r0] -_0806673A: +@0806673A: pop {r4-r6} pop {r0} bx r0 @@ -180978,7 +180978,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 @@ -180988,7 +180988,7 @@ sub_8066748: @ 8066748 movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _08066840 + beq @08066840 ldr r5, =0x02024064 ldrb r0, [r5] bl battle_get_per_side_status @@ -180996,33 +180996,33 @@ sub_8066748: @ 8066748 ands r1, r0 movs r7, 0xC8 cmp r1, 0 - beq _08066770 + beq @08066770 movs r7, 0x98 -_08066770: +@08066770: ldr r0, [r4] movs r1, 0x80 lsls r1, 1 ands r0, r1 cmp r0, 0 - beq _080667A8 + beq @080667A8 ldrb r0, [r5] cmp r0, 0x1 - bne _08066794 + bne @08066794 ldr r0, =0x02038bca - b _08066796 + b @08066796 .align 2, 0 .pool -_08066794: +@08066794: ldr r0, =0x02038bcc -_08066796: +@08066796: ldrh r0, [r0] bl sub_8162AA0 lsls r0, 24 lsrs r0, 24 - b _0806694C + b @0806694C .align 2, 0 .pool -_080667A8: +@080667A8: ldrb r0, [r5] bl sub_806D864 ldr r6, =0x020229e8 @@ -181033,7 +181033,7 @@ _080667A8: movs r4, 0xFF ldrb r0, [r1] cmp r0, 0x4 - beq _080667D8 + beq @080667D8 ldrb r0, [r5] bl sub_806D864 lsls r1, r0, 3 @@ -181044,8 +181044,8 @@ _080667A8: adds r0, r4, 0 ands r0, r1 cmp r0, 0x5 - bne _080667F4 -_080667D8: + bne @080667F4 +@080667D8: ldrb r0, [r5] bl sub_806D864 lsls r1, r0, 3 @@ -181054,11 +181054,11 @@ _080667D8: adds r1, r6 ldrb r0, [r1, 0x13] cmp r0, 0 - bne _080668AA - b _080668BC + bne @080668AA + b @080668BC .align 2, 0 .pool -_080667F4: +@080667F4: ldrb r0, [r5] bl sub_806D864 lsls r1, r0, 3 @@ -181069,7 +181069,7 @@ _080667F4: adds r0, r4, 0 ands r0, r1 cmp r0, 0x2 - beq _08066822 + beq @08066822 ldrb r0, [r5] bl sub_806D864 lsls r1, r0, 3 @@ -181079,8 +181079,8 @@ _080667F4: ldrh r0, [r1] ands r4, r0 cmp r4, 0x1 - bne _08066838 -_08066822: + bne @08066838 +@08066822: ldrb r0, [r5] bl sub_806D864 lsls r1, r0, 3 @@ -181089,25 +181089,25 @@ _08066822: adds r1, r6 ldrb r0, [r1, 0x13] cmp r0, 0 - bne _08066916 - b _08066924 -_08066838: + bne @08066916 + b @08066924 +@08066838: ldrb r0, [r5] bl sub_806D864 - b _0806693A -_08066840: + b @0806693A +@08066840: movs r7, 0xB0 ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0xC0 lsls r0, 4 cmp r1, r0 - bne _08066858 + bne @08066858 bl sub_8068B48 - b _08066948 + b @08066948 .align 2, 0 .pool -_08066858: +@08066858: bl link_get_multiplayer_id ldr r6, =0x020229e8 movs r5, 0x1 @@ -181121,7 +181121,7 @@ _08066858: movs r4, 0xFF ldrb r0, [r1] cmp r0, 0x4 - beq _08066892 + beq @08066892 bl link_get_multiplayer_id eors r0, r5 lsls r0, 24 @@ -181134,8 +181134,8 @@ _08066858: adds r0, r4, 0 ands r0, r1 cmp r0, 0x5 - bne _080668C8 -_08066892: + bne @080668C8 +@08066892: bl link_get_multiplayer_id eors r0, r5 lsls r0, 24 @@ -181146,22 +181146,22 @@ _08066892: adds r1, r6 ldrb r0, [r1, 0x13] cmp r0, 0 - beq _080668BC -_080668AA: + beq @080668BC +@080668AA: ldr r0, =0x0831f578 adds r0, 0x4F ldrb r0, [r0] - b _0806694C + b @0806694C .align 2, 0 .pool -_080668BC: +@080668BC: ldr r0, =0x0831f578 adds r0, 0x4E ldrb r0, [r0] - b _0806694C + b @0806694C .align 2, 0 .pool -_080668C8: +@080668C8: bl link_get_multiplayer_id eors r0, r5 lsls r0, 24 @@ -181174,7 +181174,7 @@ _080668C8: adds r0, r4, 0 ands r0, r1 cmp r0, 0x2 - beq _080668FE + beq @080668FE bl link_get_multiplayer_id eors r0, r5 lsls r0, 24 @@ -181186,8 +181186,8 @@ _080668C8: ldrh r0, [r1] ands r4, r0 cmp r4, 0x1 - bne _08066930 -_080668FE: + bne @08066930 +@080668FE: bl link_get_multiplayer_id eors r0, r5 lsls r0, 24 @@ -181198,37 +181198,37 @@ _080668FE: adds r1, r6 ldrb r0, [r1, 0x13] cmp r0, 0 - beq _08066924 -_08066916: + beq @08066924 +@08066916: ldr r0, =0x0831f578 adds r0, 0x51 ldrb r0, [r0] - b _0806694C + b @0806694C .align 2, 0 .pool -_08066924: +@08066924: ldr r0, =0x0831f578 adds r0, 0x50 ldrb r0, [r0] - b _0806694C + b @0806694C .align 2, 0 .pool -_08066930: +@08066930: bl link_get_multiplayer_id eors r0, r5 lsls r0, 24 lsrs r0, 24 -_0806693A: +@0806693A: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 adds r1, r6 ldrb r0, [r1, 0x13] bl sub_806F000 -_08066948: +@08066948: lsls r0, 16 lsrs r0, 16 -_0806694C: +@0806694C: mov r8, r0 ldr r5, =0x02024064 ldrb r1, [r5] @@ -181341,21 +181341,21 @@ _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} ldr r0, =0x02024064 ldrb r0, [r0] cmp r0, 0x1 - bne _08066A74 + bne @08066A74 ldr r0, =0x02038bca - b _08066A76 + b @08066A76 .align 2, 0 .pool -_08066A74: +@08066A74: ldr r0, =0x02038bcc -_08066A76: +@08066A76: ldrh r0, [r0] bl sub_8162AA0 lsls r0, 24 @@ -181475,7 +181475,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 @@ -181550,7 +181550,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] @@ -181563,7 +181563,7 @@ sub_8066C40: @ 8066C40 adds r3, r1, r0 ldrb r0, [r3, 0x4] cmp r0, 0 - bne _08066C94 + bne @08066C94 ldr r1, [r4] lsls r0, r2, 2 adds r0, r1 @@ -181571,12 +181571,12 @@ sub_8066C40: @ 8066C40 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08066C74 + beq @08066C74 adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -_08066C74: +@08066C74: ldr r0, [r6] ldrb r1, [r5] ldr r2, [r0, 0x4] @@ -181587,17 +181587,17 @@ _08066C74: ldrb r1, [r0, 0x4] adds r1, 0x1 strb r1, [r0, 0x4] - b _08066CD0 + b @08066CD0 .align 2, 0 .pool -_08066C94: +@08066C94: ldrb r1, [r3] movs r0, 0x40 ands r0, r1 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _08066CD0 + bne @08066CD0 strb r0, [r3, 0x4] movs r0, 0x10 movs r1, 0x3F @@ -181620,7 +181620,7 @@ _08066C94: adds r0, r1 ldr r1, =sub_8064C14 + 1 str r1, [r0] -_08066CD0: +@08066CD0: pop {r4-r6} pop {r0} bx r0 @@ -181629,7 +181629,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} @@ -181637,7 +181637,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} @@ -181645,7 +181645,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} @@ -181653,7 +181653,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} @@ -181661,7 +181661,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} @@ -181670,9 +181670,9 @@ sub_8066D1C: @ 8066D1C bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - beq _08066D32 - b _08066E58 -_08066D32: + beq @08066D32 + b @08066E58 +@08066D32: ldr r0, =0x02023064 mov r12, r0 ldrb r1, [r5] @@ -181776,12 +181776,12 @@ _08066D32: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq _08066E30 + beq @08066E30 bl sub_8065068 - b _08066E58 + b @08066E58 .align 2, 0 .pool -_08066E30: +@08066E30: ldr r0, =0x020244d0 ldr r0, [r0] ldrb r1, [r5] @@ -181801,7 +181801,7 @@ _08066E30: ldr r2, [r7] adds r0, r6, 0 bl sub_817E0FC -_08066E58: +@08066E58: pop {r3} mov r8, r3 pop {r4-r7} @@ -181812,7 +181812,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 @@ -181845,21 +181845,21 @@ sub_8066E70: @ 8066E70 adds r0, r1 ldrb r2, [r0, 0x4] cmp r2, 0x1 - beq _08066F08 + beq @08066F08 cmp r2, 0x1 - bgt _08066EC8 + bgt @08066EC8 cmp r2, 0 - beq _08066ED2 - b _08066FE4 + beq @08066ED2 + b @08066FE4 .align 2, 0 .pool -_08066EC8: +@08066EC8: cmp r2, 0x2 - beq _08066F32 + beq @08066F32 cmp r2, 0x3 - beq _08066FA8 - b _08066FE4 -_08066ED2: + beq @08066FA8 + b @08066FE4 +@08066ED2: ldr r1, [r5] lsls r0, r3, 2 adds r1, r0, r1 @@ -181867,7 +181867,7 @@ _08066ED2: movs r0, 0xC ands r0, r2 cmp r0, 0x4 - bne _08066EF4 + bne @08066EF4 movs r0, 0x8 orrs r0, r2 strb r0, [r1] @@ -181876,7 +181876,7 @@ _08066ED2: adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -_08066EF4: +@08066EF4: ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -181886,13 +181886,13 @@ _08066EF4: adds r0, r2 movs r1, 0x1 strb r1, [r0, 0x4] - b _08066FE4 -_08066F08: + b @08066FE4 +@08066F08: ldrb r1, [r0] movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _08066FE4 + bne @08066FE4 movs r0, 0 bl sub_805EB9C adds r0, r4, 0 @@ -181906,15 +181906,15 @@ _08066F08: adds r0, r2 movs r1, 0x2 strb r1, [r0, 0x4] - b _08066FE4 -_08066F32: + b @08066FE4 +@08066F32: ldr r0, =0x020383f8 ldr r0, [r0] bl _call_via_r0 ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 - bne _08066FE4 + bne @08066FE4 movs r0, 0x1 bl sub_805EB9C ldr r0, [r7] @@ -181926,10 +181926,10 @@ _08066F32: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08066F80 + beq @08066F80 mov r0, r8 cmp r0, 0x1 - bhi _08066F80 + bhi @08066F80 adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x6 @@ -181944,7 +181944,7 @@ _08066F32: negs r0, r0 ands r0, r2 strb r0, [r1] -_08066F80: +@08066F80: ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -181956,17 +181956,17 @@ _08066F80: adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x4] - b _08066FE4 + b @08066FE4 .align 2, 0 .pool -_08066FA8: +@08066FA8: ldrb r1, [r0] movs r0, 0x40 ands r0, r1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _08066FE4 + bne @08066FE4 bl sub_805E394 ldrb r0, [r6] lsls r2, r0, 9 @@ -181987,7 +181987,7 @@ _08066FA8: adds r0, r2 strb r4, [r0, 0x4] bl sub_8065068 -_08066FE4: +@08066FE4: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -181998,7 +181998,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 @@ -182031,7 +182031,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} @@ -182039,7 +182039,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} @@ -182047,7 +182047,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} @@ -182055,7 +182055,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} @@ -182063,7 +182063,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} @@ -182071,7 +182071,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} @@ -182079,7 +182079,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} @@ -182087,7 +182087,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 @@ -182112,7 +182112,7 @@ sub_80670A0: @ 80670A0 asrs r7, r1, 16 ldr r0, =0x00007fff cmp r7, r0 - beq _08067130 + beq @08067130 ldr r6, =0x0202406e lsls r0, r4, 1 adds r0, r6 @@ -182142,10 +182142,10 @@ sub_80670A0: @ 80670A0 str r7, [sp] mov r2, r8 bl sub_807294C - b _0806715A + b @0806715A .align 2, 0 .pool -_08067130: +@08067130: ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -182165,7 +182165,7 @@ _08067130: str r7, [sp] movs r3, 0 bl sub_807294C -_0806715A: +@0806715A: ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -182185,7 +182185,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} @@ -182193,14 +182193,14 @@ 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] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne _080671F0 + bne @080671F0 ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 @@ -182234,7 +182234,7 @@ sub_806719C: @ 806719C adds r0, r1 ldr r1, =sub_8065008 + 1 str r1, [r0] -_080671F0: +@080671F0: pop {r4} pop {r0} bx r0 @@ -182243,14 +182243,14 @@ _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] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne _08067264 + bne @08067264 ldr r4, =0x02023064 ldrb r3, [r5] lsls r3, 9 @@ -182282,7 +182282,7 @@ sub_8067214: @ 8067214 adds r0, r1 ldr r1, =sub_8065008 + 1 str r1, [r0] -_08067264: +@08067264: pop {r4,r5} pop {r0} bx r0 @@ -182291,7 +182291,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} @@ -182299,7 +182299,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} @@ -182307,7 +182307,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} @@ -182315,7 +182315,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} @@ -182323,7 +182323,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} @@ -182331,7 +182331,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} @@ -182339,7 +182339,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} @@ -182347,7 +182347,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} @@ -182355,7 +182355,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} @@ -182363,7 +182363,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] @@ -182379,7 +182379,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 @@ -182405,7 +182405,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] @@ -182420,7 +182420,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] @@ -182442,7 +182442,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 @@ -182458,12 +182458,12 @@ sub_806737C: @ 806737C ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - bge _080673B0 + bge @080673B0 bl sub_8065068 - b _080673DA + b @080673DA .align 2, 0 .pool -_080673B0: +@080673B0: ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] @@ -182484,7 +182484,7 @@ _080673B0: adds r0, r1 ldr r1, =sub_8064CE4 + 1 str r1, [r0] -_080673DA: +@080673DA: pop {r4} pop {r0} bx r0 @@ -182493,7 +182493,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} @@ -182501,7 +182501,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] @@ -182509,9 +182509,9 @@ sub_80673F8: @ 80673F8 lsls r0, 24 movs r3, 0x3F cmp r0, 0 - bne _0806740C + bne @0806740C movs r3, 0xC0 -_0806740C: +@0806740C: ldr r2, =0x02023064 ldrb r1, [r4] lsls r1, 9 @@ -182535,7 +182535,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 @@ -182545,7 +182545,7 @@ sub_806743C: @ 806743C adds r0, r3, r0 ldrb r0, [r0] cmp r0, 0 - beq _08067478 + beq @08067478 bl sub_805EA60 ldrb r1, [r5] lsls r1, 9 @@ -182558,10 +182558,10 @@ sub_806743C: @ 806743C lsls r1, 8 orrs r0, r1 bl song_play_for_text - b _0806748C + b @0806748C .align 2, 0 .pool -_08067478: +@08067478: adds r0, r4, 0x1 adds r0, r3, r0 ldrb r0, [r0] @@ -182571,7 +182571,7 @@ _08067478: lsls r1, 8 orrs r0, r1 bl fanfare_play -_0806748C: +@0806748C: bl sub_8065068 pop {r4,r5} pop {r0} @@ -182579,7 +182579,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 @@ -182606,7 +182606,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 @@ -182629,7 +182629,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 @@ -182714,7 +182714,7 @@ sub_8067508: @ 8067508 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080675CA + beq @080675CA ldr r0, =0x020244b4 adds r0, r2, r0 ldrb r1, [r0] @@ -182724,7 +182724,7 @@ sub_8067508: @ 8067508 adds r0, r4 ldr r1, =sub_8073C30 + 1 str r1, [r0] -_080675CA: +@080675CA: ldr r0, [r3] ldr r2, [r0, 0x8] ldrb r0, [r2, 0x9] @@ -182745,7 +182745,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 @@ -182767,14 +182767,14 @@ c3_08038DC4: @ 8067618 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _08067652 + beq @08067652 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _08067684 -_08067652: + beq @08067684 +@08067652: ldr r0, =0x02023064 ldrb r1, [r7] lsls r2, r1, 9 @@ -182788,10 +182788,10 @@ _08067652: ldrb r0, [r7] movs r1, 0 bl sub_8066494 - b _080676C4 + b @080676C4 .align 2, 0 .pool -_08067684: +@08067684: ldr r4, =0x02023064 ldrb r0, [r7] lsls r1, r0, 9 @@ -182822,7 +182822,7 @@ _08067684: ldrb r0, [r7] eors r0, r5 strb r0, [r7] -_080676C4: +@080676C4: ldr r1, =0x03005d60 ldr r2, =0x02024064 ldrb r0, [r2] @@ -182845,7 +182845,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] @@ -182860,7 +182860,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 @@ -182870,17 +182870,17 @@ sub_8067718: @ 8067718 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _08067748 + beq @08067748 adds r0, r2, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08067748 + bne @08067748 bl sub_8065068 - b _08067812 + b @08067812 .align 2, 0 .pool -_08067748: +@08067748: ldr r4, =0x020244d0 ldr r0, [r4] ldr r3, =0x02024064 @@ -182902,7 +182902,7 @@ _08067748: ldrb r0, [r0] adds r7, r3, 0 cmp r0, 0 - beq _080677B4 + beq @080677B4 ldr r0, [r4] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -182913,7 +182913,7 @@ _08067748: lsls r1, r2, 27 lsrs r0, r1, 28 cmp r0, 0x1 - bhi _080677AC + bhi @080677AC adds r0, 0x1 movs r1, 0xF ands r0, r1 @@ -182923,15 +182923,15 @@ _08067748: ands r1, r2 orrs r1, r0 strb r1, [r3, 0x1] - b _08067812 + b @08067812 .align 2, 0 .pool -_080677AC: +@080677AC: movs r0, 0x1F negs r0, r0 ands r0, r2 strb r0, [r3, 0x1] -_080677B4: +@080677B4: adds r5, r7, 0 ldrb r0, [r5] lsls r3, r0, 9 @@ -182963,7 +182963,7 @@ _080677B4: adds r0, r4 ldrb r0, [r0] cmp r0, 0 - beq _08067806 + beq @08067806 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -182972,14 +182972,14 @@ _080677B4: adds r0, r1 movs r1, 0x5D strb r1, [r0, 0x5] -_08067806: +@08067806: ldr r0, =0x03005d60 ldrb r1, [r7] lsls r1, 2 adds r1, r0 ldr r0, =sub_806782C + 1 str r0, [r1] -_08067812: +@08067812: pop {r4-r7} pop {r0} bx r0 @@ -182988,7 +182988,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] @@ -183005,7 +183005,7 @@ sub_806782C: @ 806782C lsls r1, 24 lsrs r1, 24 cmp r1, 0x5C - bls _08067864 + bls @08067864 ldr r0, [r4] ldrb r1, [r3] ldr r2, [r0, 0x4] @@ -183016,7 +183016,7 @@ sub_806782C: @ 806782C movs r1, 0 strb r1, [r0, 0x5] bl sub_8065068 -_08067864: +@08067864: pop {r4} pop {r0} bx r0 @@ -183025,7 +183025,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] @@ -183040,7 +183040,7 @@ sub_8067874: @ 8067874 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080678A6 + beq @080678A6 ldr r2, =0x03005e00 ldr r0, =0x020244b4 adds r0, r3, r0 @@ -183051,7 +183051,7 @@ sub_8067874: @ 8067874 adds r0, r2 ldr r1, =sub_8073C30 + 1 str r1, [r0] -_080678A6: +@080678A6: bl sub_8065068 pop {r0} bx r0 @@ -183060,7 +183060,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} @@ -183068,14 +183068,14 @@ 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] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 - beq _08067916 + beq @08067916 ldr r3, =0x02020630 ldr r0, =0x020241e4 ldrb r1, [r4] @@ -183102,7 +183102,7 @@ sub_80678D0: @ 80678D0 strb r0, [r2] ldrb r0, [r4] bl sub_805E408 -_08067916: +@08067916: bl sub_8065068 pop {r4} pop {r0} @@ -183112,7 +183112,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 @@ -183120,7 +183120,7 @@ sub_8067930: @ 8067930 bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne _08067992 + bne @08067992 ldr r4, =0x02023064 ldrb r2, [r5] lsls r1, r2, 9 @@ -183142,22 +183142,22 @@ sub_8067930: @ 8067930 bl move_anim_start_t3 lsls r0, 24 cmp r0, 0 - beq _08067980 + beq @08067980 bl sub_8065068 - b _0806798C + b @0806798C .align 2, 0 .pool -_08067980: +@08067980: ldr r0, =0x03005d60 ldrb r1, [r5] lsls r1, 2 adds r1, r0 ldr r0, =sub_8065038 + 1 str r0, [r1] -_0806798C: +@0806798C: adds r0, r6, 0 bl sub_817E32C -_08067992: +@08067992: add sp, 0x4 pop {r4-r6} pop {r0} @@ -183167,7 +183167,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] @@ -183183,7 +183183,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} @@ -183191,7 +183191,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] @@ -183205,18 +183205,18 @@ sub_80679D0: @ 80679D0 adds r0, r4 ldrb r2, [r0] cmp r2, 0x3 - bne _08067A00 + bne @08067A00 ldr r0, =0x0202433a strb r2, [r0] - b _08067A08 + b @08067A08 .align 2, 0 .pool -_08067A00: +@08067A00: ldr r0, =0x0202433a movs r1, 0x3 eors r1, r2 strb r1, [r0] -_08067A08: +@08067A08: ldr r0, =0x03005d90 ldr r3, [r0] ldr r1, =0x02023064 @@ -183256,30 +183256,30 @@ _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 movs r3, 0 -_08067A7C: +@08067A7C: adds r0, r2, r1 strb r3, [r0] adds r1, 0x1 cmp r1, 0x4F - bls _08067A7C + bls @08067A7C pop {r0} bx r0 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 @@ -183335,19 +183335,19 @@ 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 lsls r0, 1 adds r5, r4, r0 -_08067B16: +@08067B16: adds r0, r4, 0 bl zero_pokemon_struct adds r4, 0x64 cmp r4, r5 - ble _08067B16 + ble @08067B16 pop {r4,r5} pop {r0} bx r0 @@ -183356,18 +183356,18 @@ _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 lsls r0, 1 adds r5, r4, r0 -_08067B36: +@08067B36: adds r0, r4, 0 bl zero_pokemon_struct adds r4, 0x64 cmp r4, r5 - ble _08067B36 + ble @08067B36 pop {r4,r5} pop {r0} bx r0 @@ -183376,8 +183376,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} @@ -183432,8 +183432,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 @@ -183459,11 +183459,11 @@ create_pokemon: @ 8067BBC adds r0, r7, 0 bl zero_pokemon_boxed_data cmp r4, 0 - beq _08067BF8 + beq @08067BF8 ldr r0, [sp, 0x44] str r0, [sp, 0x14] - b _08067C0C -_08067BF8: + b @08067C0C +@08067BF8: bl GenerateRandomNumber adds r4, r0, 0 bl GenerateRandomNumber @@ -183472,7 +183472,7 @@ _08067BF8: lsls r0, 16 orrs r4, r0 str r4, [sp, 0x14] -_08067C0C: +@08067C0C: add r2, sp, 0x14 adds r0, r7, 0 movs r1, 0 @@ -183482,11 +183482,11 @@ _08067C0C: add r5, sp, 0xC mov r1, r10 cmp r1, 0x2 - bne _08067C64 + bne @08067C64 ldr r2, =0xffff0000 mov r8, r2 ldr r6, =0x0000ffff -_08067C28: +@08067C28: bl GenerateRandomNumber adds r4, r0, 0 bl GenerateRandomNumber @@ -183509,18 +183509,18 @@ _08067C28: ands r2, r6 eors r1, r2 cmp r1, 0x7 - bls _08067C28 - b _08067C8A + bls @08067C28 + b @08067C8A .align 2, 0 .pool -_08067C64: +@08067C64: mov r0, r10 cmp r0, 0x1 - bne _08067C70 + bne @08067C70 ldr r0, [sp, 0x4C] str r0, [sp, 0x18] - b _08067C8A -_08067C70: + b @08067C8A +@08067C70: ldr r0, =0x03005d90 ldr r2, [r0] ldrb r1, [r2, 0xA] @@ -183534,7 +183534,7 @@ _08067C70: lsls r0, 24 orrs r1, r0 str r1, [sp, 0x18] -_08067C8A: +@08067C8A: adds r0, r7, 0 movs r1, 0x1 mov r2, r9 @@ -183630,7 +183630,7 @@ _08067C8A: mov r2, sp ldrb r0, [r2, 0x11] cmp r0, 0x1F - bhi _08067DC8 + bhi @08067DC8 adds r0, r7, 0 movs r1, 0x27 adds r2, 0x11 @@ -183660,10 +183660,10 @@ _08067C8A: mov r2, sp adds r2, 0x11 bl pokemon_setattr_encrypted - b _08067E50 + b @08067E50 .align 2, 0 .pool -_08067DC8: +@08067DC8: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -183724,7 +183724,7 @@ _08067DC8: movs r1, 0x2C adds r2, r4, 0 bl pokemon_setattr_encrypted -_08067E50: +@08067E50: ldr r2, =0x083203cc mov r3, sp ldrh r1, [r3, 0xE] @@ -183734,7 +183734,7 @@ _08067E50: adds r0, r2 ldrb r0, [r0, 0x17] cmp r0, 0 - beq _08067E76 + beq @08067E76 ldr r0, [sp, 0x14] movs r1, 0x1 ands r0, r1 @@ -183743,7 +183743,7 @@ _08067E50: movs r1, 0x2E mov r2, r9 bl pokemon_setattr_encrypted -_08067E76: +@08067E76: adds r0, r7, 0 bl sub_8069270 add sp, 0x20 @@ -183759,7 +183759,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 @@ -183776,7 +183776,7 @@ pokemon_make_with_nature: @ 8067E90 lsrs r6, r3, 24 lsls r0, 24 lsrs r5, r0, 24 -_08067EB0: +@08067EB0: bl GenerateRandomNumber adds r4, r0, 0 bl GenerateRandomNumber @@ -183789,7 +183789,7 @@ _08067EB0: lsls r0, 24 lsrs r0, 24 cmp r5, r0 - bne _08067EB0 + bne @08067EB0 movs r0, 0x1 str r0, [sp] str r4, [sp, 0x4] @@ -183811,7 +183811,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 @@ -183843,8 +183843,8 @@ sub_8067EF8: @ 8067EF8 adds r0, r1 lsrs r0, 24 cmp r0, 0x1B - bhi _08067F9E -_08067F38: + bhi @08067F9E +@08067F38: bl GenerateRandomNumber adds r4, r0, 0 bl GenerateRandomNumber @@ -183878,20 +183878,20 @@ _08067F38: lsls r0, 24 lsrs r0, 24 cmp r6, r0 - bne _08067F38 + bne @08067F38 adds r0, r7, 0 adds r1, r4, 0 bl pokemon_species_get_gender_info lsls r0, 24 lsrs r0, 24 cmp r8, r0 - bne _08067F38 + bne @08067F38 mov r0, r9 subs r0, 0x1 cmp r5, r0 - bne _08067F38 - b _08067FCE -_08067F9E: + bne @08067F38 + b @08067FCE +@08067F9E: bl GenerateRandomNumber adds r4, r0, 0 bl GenerateRandomNumber @@ -183904,15 +183904,15 @@ _08067F9E: lsls r0, 24 lsrs r0, 24 cmp r6, r0 - bne _08067F9E + bne @08067F9E adds r0, r7, 0 adds r1, r4, 0 bl pokemon_species_get_gender_info lsls r0, 24 lsrs r0, 24 cmp r8, r0 - bne _08067F9E -_08067FCE: + bne @08067F9E +@08067FCE: movs r0, 0x1 str r0, [sp] str r4, [sp, 0x4] @@ -183935,7 +183935,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} @@ -183945,7 +183945,7 @@ sub_8067FF8: @ 8067FF8 lsrs r6, r1, 16 lsls r2, 24 lsrs r7, r2, 24 -_0806800A: +@0806800A: bl GenerateRandomNumber adds r4, r0, 0 bl GenerateRandomNumber @@ -183965,7 +183965,7 @@ _0806800A: bl pokemon_species_get_gender_info lsls r0, 24 cmp r0, 0 - bne _0806800A + bne @0806800A movs r0, 0x1 str r0, [sp] str r4, [sp, 0x4] @@ -183985,7 +183985,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 @@ -184017,7 +184017,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 @@ -184070,7 +184070,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} @@ -184096,17 +184096,17 @@ pokemon_make_ev_something: @ 8068114 mov r4, r8 movs r1, 0x1 movs r5, 0x5 -_08068148: +@08068148: adds r0, r4, 0 ands r0, r1 cmp r0, 0 - beq _08068152 + beq @08068152 adds r6, 0x1 -_08068152: +@08068152: lsrs r4, 1 subs r5, 0x1 cmp r5, 0 - bge _08068148 + bge @08068148 movs r0, 0xFF lsls r0, 1 adds r1, r6, 0 @@ -184115,22 +184115,22 @@ _08068152: strh r0, [r1] movs r4, 0x1 movs r5, 0 -_0806816C: +@0806816C: mov r0, r8 ands r0, r4 cmp r0, 0 - beq _08068180 + beq @08068180 adds r1, r5, 0 adds r1, 0x1A adds r0, r7, 0 add r2, sp, 0x10 bl pokemon_setattr -_08068180: +@08068180: lsls r0, r4, 25 lsrs r4, r0, 24 adds r5, 0x1 cmp r5, 0x5 - ble _0806816C + ble @0806816C adds r0, r7, 0 bl pokemon_calc_effective_stats add sp, 0x14 @@ -184142,7 +184142,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 @@ -184169,7 +184169,7 @@ sub_806819C: @ 806819C add r1, sp mov r8, r1 adds r4, r6, 0x4 -_080681D2: +@080681D2: ldrh r1, [r4] lsls r2, r5, 24 lsrs r2, 24 @@ -184178,7 +184178,7 @@ _080681D2: adds r4, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble _080681D2 + ble @080681D2 adds r2, r6, 0 adds r2, 0xD adds r0, r7, 0 @@ -184200,22 +184200,22 @@ _080681D2: add r0, sp, 0x10 ldrb r0, [r0] cmp r0, 0xFC - bne _08068230 + bne @08068230 add r0, sp, 0x10 ldrb r0, [r0, 0x1] cmp r0, 0x15 - bne _08068230 + bne @08068230 movs r0, 0x1 mov r1, r9 strb r0, [r1] add r0, sp, 0x10 bl sub_8009370 - b _08068236 -_08068230: + b @08068236 +@08068230: movs r0, 0x2 mov r1, r9 strb r0, [r1] -_08068236: +@08068236: adds r0, r7, 0 movs r1, 0x3 mov r2, r9 @@ -184330,7 +184330,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 @@ -184349,21 +184349,21 @@ sub_8068338: @ 8068338 movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _08068374 + beq @08068374 lsls r0, r1, 30 lsrs r0, 30 bl sub_8165C90 lsls r0, 24 lsrs r3, r0, 24 - b _0806837C + b @0806837C .align 2, 0 .pool -_08068374: +@08068374: movs r3, 0x32 cmp r2, 0 - bne _0806837C + bne @0806837C ldrb r3, [r6, 0xC] -_0806837C: +@0806837C: ldrh r1, [r6] movs r2, 0x1 str r2, [sp] @@ -184406,7 +184406,7 @@ _0806837C: add r1, sp mov r8, r1 adds r4, r6, 0x4 -_080683D2: +@080683D2: ldrh r1, [r4] lsls r2, r5, 24 lsrs r2, 24 @@ -184415,7 +184415,7 @@ _080683D2: adds r4, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble _080683D2 + ble @080683D2 adds r0, r7, 0 movs r1, 0x15 mov r2, r10 @@ -184434,22 +184434,22 @@ _080683D2: add r0, sp, 0x10 ldrb r0, [r0] cmp r0, 0xFC - bne _0806842A + bne @0806842A add r0, sp, 0x10 ldrb r0, [r0, 0x1] cmp r0, 0x15 - bne _0806842A + bne @0806842A movs r0, 0x1 mov r1, r9 strb r0, [r1] add r0, sp, 0x10 bl sub_8009370 - b _08068430 -_0806842A: + b @08068430 +@0806842A: movs r0, 0x2 mov r1, r9 strb r0, [r1] -_08068430: +@08068430: adds r0, r7, 0 movs r1, 0x3 mov r2, r9 @@ -184559,7 +184559,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 @@ -184632,7 +184632,7 @@ sub_8068528: @ 8068528 mov r8, r2 mov r6, r9 adds r6, 0x6 -_080685BE: +@080685BE: adds r0, r6, r5 ldrh r1, [r0] lsls r2, r4, 24 @@ -184642,14 +184642,14 @@ _080685BE: adds r5, 0x2 adds r4, 0x1 cmp r4, 0x3 - ble _080685BE + ble @080685BE movs r1, 0x55 add r0, sp, 0x10 strh r1, [r0] movs r4, 0 mov r5, r9 adds r5, 0x3F -_080685E0: +@080685E0: adds r1, r4, 0 adds r1, 0x1A adds r0, r7, 0 @@ -184657,7 +184657,7 @@ _080685E0: bl pokemon_setattr adds r4, 0x1 cmp r4, 0x5 - ble _080685E0 + ble @080685E0 ldrb r0, [r5] mov r1, r8 strb r0, [r1] @@ -184690,7 +184690,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 @@ -184715,7 +184715,7 @@ sub_8068634: @ 8068634 lsrs r4, 24 mov r8, r4 movs r6, 0 -_08068664: +@08068664: bl GenerateRandomNumber adds r4, r0, 0 bl GenerateRandomNumber @@ -184728,7 +184728,7 @@ _08068664: lsls r0, 24 lsrs r0, 24 cmp r5, r0 - bne _08068664 + bne @08068664 movs r0, 0x1 str r0, [sp] str r4, [sp, 0x4] @@ -184743,17 +184743,17 @@ _08068664: mov r5, r8 movs r1, 0x1 movs r4, 0x5 -_080686A2: +@080686A2: adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _080686AC + beq @080686AC adds r6, 0x1 -_080686AC: +@080686AC: lsrs r5, 1 subs r4, 0x1 cmp r4, 0 - bge _080686A2 + bge @080686A2 movs r0, 0xFF lsls r0, 1 adds r1, r6, 0 @@ -184762,22 +184762,22 @@ _080686AC: strh r0, [r1] movs r5, 0x1 movs r4, 0 -_080686C6: +@080686C6: mov r0, r8 ands r0, r5 cmp r0, 0 - beq _080686DA + beq @080686DA adds r1, r4, 0 adds r1, 0x1A adds r0, r7, 0 add r2, sp, 0x10 bl pokemon_setattr -_080686DA: +@080686DA: lsls r0, r5, 25 lsrs r5, r0, 24 adds r4, 0x1 cmp r4, 0x5 - ble _080686C6 + ble @080686C6 adds r0, r7, 0 bl pokemon_calc_effective_stats add sp, 0x18 @@ -184791,7 +184791,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 @@ -184809,9 +184809,9 @@ sub_80686FC: @ 80686FC lsls r0, 16 lsrs r0, 16 cmp r0, 0xAF - bne _08068726 + bne @08068726 movs r0, 0 -_08068726: +@08068726: strh r0, [r6, 0x2] movs r5, 0 movs r0, 0x2B @@ -184821,7 +184821,7 @@ _08068726: adds r1, r6 mov r9, r1 adds r4, r6, 0x4 -_08068738: +@08068738: adds r1, r5, 0 adds r1, 0xD adds r0, r7, 0 @@ -184831,7 +184831,7 @@ _08068738: adds r4, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble _08068738 + ble @08068738 adds r0, r7, 0 movs r1, 0x38 movs r2, 0 @@ -184984,7 +184984,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} @@ -185025,36 +185025,36 @@ 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 lsls r1, 24 lsrs r5, r1, 24 cmp r0, 0x5 - bhi _080689CE + bhi @080689CE lsls r0, 2 - ldr r1, =_08068914 + ldr r1, =@08068914 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08068914: - .4byte _080689CE - .4byte _0806892C - .4byte _08068A00 - .4byte _08068958 - .4byte _08068A00 - .4byte _08068990 -_0806892C: +@08068914: + .4byte @080689CE + .4byte @0806892C + .4byte @08068A00 + .4byte @08068958 + .4byte @08068A00 + .4byte @08068990 +@0806892C: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _080689CE + beq @080689CE ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -185062,17 +185062,17 @@ _0806892C: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080689CE - b _080689B6 + beq @080689CE + b @080689B6 .align 2, 0 .pool -_08068958: +@08068958: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _080689CE + beq @080689CE ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -185080,24 +185080,24 @@ _08068958: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080689CE + beq @080689CE cmp r5, 0x1 - beq _08068A00 + beq @08068A00 cmp r5, 0x4 - beq _08068A00 + beq @08068A00 cmp r5, 0x5 - beq _08068A00 - b _080689CE + beq @08068A00 + b @080689CE .align 2, 0 .pool -_08068990: +@08068990: ldr r0, =0x02022fec ldr r2, [r0] movs r3, 0x2 adds r0, r2, 0 ands r0, r3 cmp r0, 0 - beq _080689E4 + beq @080689E4 ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -185105,12 +185105,12 @@ _08068990: adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _080689CE + beq @080689CE movs r0, 0x40 ands r2, r0 cmp r2, 0 - beq _080689F4 -_080689B6: + beq @080689F4 +@080689B6: ldr r4, =0x020229e8 bl link_get_multiplayer_id lsls r0, 24 @@ -185121,13 +185121,13 @@ _080689B6: adds r1, r4 ldrh r0, [r1, 0x18] cmp r0, r5 - bne _08068A00 -_080689CE: + bne @08068A00 +@080689CE: movs r0, 0 - b _08068A02 + b @08068A02 .align 2, 0 .pool -_080689E4: +@080689E4: ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -185135,16 +185135,16 @@ _080689E4: adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _080689CE -_080689F4: + beq @080689CE +@080689F4: adds r0, r5, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080689CE -_08068A00: + beq @080689CE +@08068A00: movs r0, 0x1 -_08068A02: +@08068A02: pop {r4,r5} pop {r1} bx r1 @@ -185153,7 +185153,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 @@ -185162,7 +185162,7 @@ get_pokemon_data_3: @ 8068A10 movs r1, 0x20 ands r0, r1 cmp r0, 0 - bne _08068A34 + bne @08068A34 adds r0, r5, 0 movs r1, 0xB movs r2, 0 @@ -185170,13 +185170,13 @@ get_pokemon_data_3: @ 8068A10 movs r1, 0xCD lsls r1, 1 cmp r0, r1 - beq _08068A3C -_08068A34: + beq @08068A3C +@08068A34: movs r0, 0 - b _08068A9A + b @08068A9A .align 2, 0 .pool -_08068A3C: +@08068A3C: adds r1, r6, 0 adds r1, 0x27 adds r0, r5, 0 @@ -185195,9 +185195,9 @@ _08068A3C: lsls r1, 1 adds r1, r4 cmp r0, 0 - bge _08068A68 + bge @08068A68 adds r0, 0x3 -_08068A68: +@08068A68: asrs r0, 2 adds r0, r1, r0 adds r1, r5, 0 @@ -185220,7 +185220,7 @@ _08068A68: lsls r0, 16 lsrs r4, r0, 16 adds r0, r4, 0 -_08068A9A: +@08068A9A: pop {r4-r6} pop {r1} bx r1 @@ -185229,11 +185229,11 @@ _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 -_08068AAA: +@08068AAA: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -185246,7 +185246,7 @@ _08068AAA: movs r1, 0xCD lsls r1, 1 cmp r0, r1 - bne _08068B34 + bne @08068B34 adds r0, r4, 0 movs r1, 0x3B movs r2, 0 @@ -185292,10 +185292,10 @@ _08068AAA: movs r1, 0x3F mov r2, sp bl pokemon_setattr -_08068B34: +@08068B34: adds r5, 0x1 cmp r5, 0x5 - ble _08068AAA + ble @08068AAA add sp, 0x4 pop {r4,r5} pop {r0} @@ -185305,7 +185305,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] @@ -185313,21 +185313,21 @@ sub_8068B48: @ 8068B48 lsls r1, 18 ands r0, r1 cmp r0, 0 - beq _08068B6C + beq @08068B6C ldr r0, =0x0203c7b4 ldrb r1, [r0] movs r0, 0x1 eors r0, r1 - b _08068B78 + b @08068B78 .align 2, 0 .pool -_08068B6C: +@08068B6C: bl link_get_multiplayer_id movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 -_08068B78: +@08068B78: ldr r3, =0x020229e8 lsls r1, r0, 3 subs r1, r0 @@ -185355,7 +185355,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] @@ -185363,21 +185363,21 @@ sub_8068BB0: @ 8068BB0 lsls r1, 18 ands r0, r1 cmp r0, 0 - beq _08068BD4 + beq @08068BD4 ldr r0, =0x0203c7b4 ldrb r1, [r0] movs r0, 0x1 eors r0, r1 - b _08068BE0 + b @08068BE0 .align 2, 0 .pool -_08068BD4: +@08068BD4: bl link_get_multiplayer_id movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 -_08068BE0: +@08068BE0: ldr r3, =0x020229e8 lsls r1, r0, 3 subs r1, r0 @@ -185405,7 +185405,7 @@ _08068BE0: thumb_func_end sub_8068BB0 thumb_func_start sub_8068C18 -sub_8068C18: @ 8068C18 +sub_8068C18: ; 8068C18 push {r4-r7,lr} sub sp, 0x14 ldr r0, =0x020375e0 @@ -185429,7 +185429,7 @@ sub_8068C18: @ 8068C18 movs r3, 0x20 bl sub_80688A8 cmp r6, 0 - beq _08068C60 + beq @08068C60 add r0, sp, 0x10 strb r6, [r0] adds r1, r0, 0 @@ -185439,7 +185439,7 @@ sub_8068C18: @ 8068C18 movs r1, 0xC add r2, sp, 0x10 bl pokemon_setattr -_08068C60: +@08068C60: add sp, 0x14 pop {r4-r7} pop {r0} @@ -185449,8 +185449,8 @@ _08068C60: thumb_func_end sub_8068C18 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} @@ -185476,7 +185476,7 @@ pokemon_calc_checksum: @ 8068C78 bl pokemon_data_permutator adds r3, r0, 0 movs r1, 0x5 -_08068CB2: +@08068CB2: ldrh r0, [r5] adds r0, r6, r0 lsls r0, 16 @@ -185484,10 +185484,10 @@ _08068CB2: adds r5, 0x2 subs r1, 0x1 cmp r1, 0 - bge _08068CB2 + bge @08068CB2 adds r2, r7, 0 movs r1, 0x5 -_08068CC6: +@08068CC6: ldrh r0, [r2] adds r0, r6, r0 lsls r0, 16 @@ -185495,10 +185495,10 @@ _08068CC6: adds r2, 0x2 subs r1, 0x1 cmp r1, 0 - bge _08068CC6 + bge @08068CC6 mov r2, r8 movs r1, 0x5 -_08068CDA: +@08068CDA: ldrh r0, [r2] adds r0, r6, r0 lsls r0, 16 @@ -185506,10 +185506,10 @@ _08068CDA: adds r2, 0x2 subs r1, 0x1 cmp r1, 0 - bge _08068CDA + bge @08068CDA adds r2, r3, 0 movs r1, 0x5 -_08068CEE: +@08068CEE: ldrh r0, [r2] adds r0, r6, r0 lsls r0, 16 @@ -185517,7 +185517,7 @@ _08068CEE: adds r2, 0x2 subs r1, 0x1 cmp r1, 0 - bge _08068CEE + bge @08068CEE adds r0, r6, 0 pop {r3} mov r8, r3 @@ -185527,7 +185527,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 @@ -185621,14 +185621,14 @@ pokemon_calc_effective_stats: @ 8068D0C bl pokemon_setattr ldr r0, =0x0000012f cmp r7, r0 - bne _08068DF8 + bne @08068DF8 movs r0, 0x1 str r0, [sp, 0x4] lsls r6, r7, 3 - b _08068E26 + b @08068E26 .align 2, 0 .pool -_08068DF8: +@08068DF8: ldr r1, =0x083203cc lsls r2, r7, 3 subs r0, r2, r7 @@ -185640,9 +185640,9 @@ _08068DF8: adds r0, r4, 0 adds r6, r2, 0 cmp r0, 0 - bge _08068E12 + bge @08068E12 adds r0, 0x3 -_08068E12: +@08068E12: asrs r0, 2 adds r0, r1, r0 ldr r4, [sp] @@ -185652,7 +185652,7 @@ _08068E12: adds r0, r4 adds r0, 0xA str r0, [sp, 0x4] -_08068E26: +@08068E26: ldr r1, =0x02024474 add r2, sp, 0x4 ldrb r0, [r2] @@ -185662,10 +185662,10 @@ _08068E26: strb r0, [r1] lsls r0, 24 cmp r0, 0 - bne _08068E3E + bne @08068E3E movs r0, 0x1 strb r0, [r1] -_08068E3E: +@08068E3E: adds r0, r5, 0 movs r1, 0x3A bl pokemon_setattr @@ -185679,9 +185679,9 @@ _08068E3E: adds r1, r0, r2 mov r0, r9 cmp r0, 0 - bge _08068E5E + bge @08068E5E adds r0, 0x3 -_08068E5E: +@08068E5E: asrs r0, 2 adds r0, r1, r0 ldr r1, [sp] @@ -185711,9 +185711,9 @@ _08068E5E: adds r1, r0, r3 ldr r0, [sp, 0x24] cmp r0, 0 - bge _08068EA4 + bge @08068EA4 adds r0, 0x3 -_08068EA4: +@08068EA4: asrs r0, 2 adds r0, r1, r0 ldr r1, [sp] @@ -185743,9 +185743,9 @@ _08068EA4: adds r1, r0, r2 ldr r0, [sp, 0x2C] cmp r0, 0 - bge _08068EEA + bge @08068EEA adds r0, 0x3 -_08068EEA: +@08068EEA: asrs r0, 2 adds r0, r1, r0 ldr r1, [sp] @@ -185775,9 +185775,9 @@ _08068EEA: adds r1, r0, r3 ldr r0, [sp, 0x34] cmp r0, 0 - bge _08068F30 + bge @08068F30 adds r0, 0x3 -_08068F30: +@08068F30: asrs r0, 2 adds r0, r1, r0 ldr r1, [sp] @@ -185807,9 +185807,9 @@ _08068F30: adds r1, r0, r2 ldr r0, [sp, 0x3C] cmp r0, 0 - bge _08068F76 + bge @08068F76 adds r0, 0x3 -_08068F76: +@08068F76: asrs r0, 2 adds r0, r1, r0 ldr r1, [sp] @@ -185835,39 +185835,39 @@ _08068F76: bl pokemon_setattr ldr r0, =0x0000012f cmp r7, r0 - bne _08068FD0 + bne @08068FD0 ldr r0, [sp, 0x1C] cmp r0, 0 - bne _08068FBE + bne @08068FBE mov r3, r8 cmp r3, 0 - bne _08068FF4 -_08068FBE: + bne @08068FF4 +@08068FBE: movs r0, 0x1 - b _08068FE8 + b @08068FE8 .align 2, 0 .pool -_08068FD0: +@08068FD0: ldr r1, [sp, 0x1C] cmp r1, 0 - bne _08068FE0 + bne @08068FE0 mov r0, r8 cmp r0, 0 - bne _08068FF4 + bne @08068FF4 ldr r0, [sp, 0x4] - b _08068FE8 -_08068FE0: + b @08068FE8 +@08068FE0: ldr r0, [sp, 0x4] mov r2, r8 subs r0, r2 adds r0, r1, r0 -_08068FE8: +@08068FE8: str r0, [sp, 0x1C] add r2, sp, 0x1C adds r0, r5, 0 movs r1, 0x39 bl pokemon_setattr -_08068FF4: +@08068FF4: add sp, 0x40 pop {r3-r5} mov r8, r3 @@ -185879,7 +185879,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 @@ -185917,7 +185917,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 @@ -185946,12 +185946,12 @@ level_by_exp: @ 8069054 adds r0, r6 ldr r0, [r0] cmp r0, r3 - bhi _080690AA + bhi @080690AA adds r4, r1, 0 -_08069094: +@08069094: adds r2, 0x1 cmp r2, 0x64 - bgt _080690AA + bgt @080690AA lsls r1, r2, 2 ldrb r0, [r4, 0x13] muls r0, r5 @@ -185959,8 +185959,8 @@ _08069094: adds r1, r6 ldr r0, [r1] cmp r0, r3 - bls _08069094 -_080690AA: + bls @08069094 +@080690AA: subs r0, r2, 0x1 lsls r0, 24 lsrs r0, 24 @@ -185972,7 +185972,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 @@ -186001,12 +186001,12 @@ sub_80690C0: @ 80690C0 adds r0, r6 ldr r0, [r0] cmp r0, r3 - bhi _08069116 + bhi @08069116 adds r4, r1, 0 -_08069100: +@08069100: adds r2, 0x1 cmp r2, 0x64 - bgt _08069116 + bgt @08069116 lsls r1, r2, 2 ldrb r0, [r4, 0x13] muls r0, r5 @@ -186014,8 +186014,8 @@ _08069100: adds r1, r6 ldr r0, [r1] cmp r0, r3 - bls _08069100 -_08069116: + bls @08069100 +@08069116: subs r0, r2, 0x1 lsls r0, 24 lsrs r0, 24 @@ -186027,7 +186027,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 @@ -186039,7 +186039,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 @@ -186047,7 +186047,7 @@ pokemon_moveset_pad: @ 8069140 strh r1, [r0] movs r5, 0 mov r6, sp -_0806914E: +@0806914E: adds r4, r5, 0 adds r4, 0xD adds r0, r7, 0 @@ -186057,7 +186057,7 @@ _0806914E: lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne _0806918C + bne @0806918C adds r0, r7, 0 adds r1, r4, 0 mov r2, sp @@ -186073,23 +186073,23 @@ _0806914E: adds r0, r7, 0 bl pokemon_setattr_encrypted ldrh r0, [r6] - b _080691A4 + b @080691A4 .align 2, 0 .pool -_0806918C: +@0806918C: ldrh r1, [r6] cmp r0, r1 - bne _0806919C + bne @0806919C ldr r0, =0x0000fffe - b _080691A4 + b @080691A4 .align 2, 0 .pool -_0806919C: +@0806919C: adds r5, 0x1 cmp r5, 0x3 - ble _0806914E + ble @0806914E ldr r0, =0x0000ffff -_080691A4: +@080691A4: add sp, 0x4 pop {r4-r7} pop {r1} @@ -186099,7 +186099,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 @@ -186113,25 +186113,25 @@ sub_80691B0: @ 80691B0 adds r2, r1, r2 adds r1, r0, 0 adds r1, 0xC -_080691CA: +@080691CA: ldrh r0, [r1] cmp r0, 0 - bne _080691E0 + bne @080691E0 strh r4, [r1] adds r1, r5, r3 ldrb r0, [r2, 0x4] strb r0, [r1] adds r0, r4, 0 - b _080691EA + b @080691EA .align 2, 0 .pool -_080691E0: +@080691E0: adds r1, 0x2 adds r3, 0x1 cmp r3, 0x3 - ble _080691CA + ble @080691CA ldr r0, =0x0000ffff -_080691EA: +@080691EA: pop {r4,r5} pop {r1} bx r1 @@ -186140,7 +186140,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 @@ -186174,7 +186174,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 @@ -186202,7 +186202,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} @@ -186210,7 +186210,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 @@ -186237,10 +186237,10 @@ sub_8069270: @ 8069270 ldr r2, =0xffff0000 lsrs r0, r2, 16 cmp r1, r0 - beq _080692FC + beq @080692FC mov r9, r2 movs r3, 0 -_080692AE: +@080692AE: ldr r0, =0x0832937c adds r7, r6, r0 ldr r0, [r7] @@ -186253,7 +186253,7 @@ _080692AE: mov r4, r10 lsls r1, r4, 9 cmp r0, r1 - bgt _080692FC + bgt @080692FC ldr r1, =0x000001ff adds r0, r1, 0 adds r4, r0, 0 @@ -186267,19 +186267,19 @@ _080692AE: lsrs r5, r1, 16 ldr r3, [sp] cmp r0, r9 - bne _080692F0 + bne @080692F0 mov r0, r8 adds r1, r4, 0 bl sub_80694D0 ldr r3, [sp] -_080692F0: +@080692F0: adds r3, 0x2 ldr r0, [r7] adds r0, r3, r0 ldrh r0, [r0] cmp r0, r5 - bne _080692AE -_080692FC: + bne @080692AE +@080692FC: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -186293,7 +186293,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 @@ -186320,7 +186320,7 @@ sub_8069318: @ 8069318 lsrs r0, 24 mov r10, r0 cmp r4, 0 - beq _080693B0 + beq @080693B0 ldr r4, =0x020244e8 mov r1, sp ldrb r1, [r1] @@ -186340,13 +186340,13 @@ sub_8069318: @ 8069318 mov r1, r10 lsls r4, r1, 9 cmp r0, r4 - beq _080693D8 + beq @080693D8 adds r2, r6, 0 ldr r0, =0x0000ffff mov r12, r0 adds r6, r7, 0 adds r3, r5, 0 -_08069384: +@08069384: ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] @@ -186356,17 +186356,17 @@ _08069384: adds r0, r1 ldrh r1, [r0] cmp r1, r12 - bne _080693A8 + bne @080693A8 movs r0, 0 - b _08069404 + b @08069404 .align 2, 0 .pool -_080693A8: +@080693A8: adds r0, r6, 0 ands r0, r1 cmp r0, r4 - bne _08069384 -_080693B0: + bne @08069384 +@080693B0: ldr r3, =0x0832937c mov r1, r9 lsls r4, r1, 2 @@ -186386,8 +186386,8 @@ _080693B0: mov r12, r3 adds r3, r4, 0 cmp r0, r1 - bne _08069402 -_080693D8: + bne @08069402 +@080693D8: ldr r2, =0x020244e2 mov r0, r12 adds r1, r3, r0 @@ -186408,9 +186408,9 @@ _080693D8: lsls r0, 16 lsrs r0, 16 str r0, [sp] -_08069402: +@08069402: ldr r0, [sp] -_08069404: +@08069404: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -186424,7 +186424,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 @@ -186439,7 +186439,7 @@ sub_8069424: @ 8069424 add r0, sp, 0xC mov r9, r0 mov r5, sp -_08069440: +@08069440: adds r1, r4, 0 adds r1, 0xE adds r0, r6, 0 @@ -186456,7 +186456,7 @@ _08069440: adds r5, 0x2 adds r4, 0x1 cmp r4, 0x2 - ble _08069440 + ble @08069440 adds r0, r6, 0 movs r1, 0x15 movs r2, 0 @@ -186479,7 +186479,7 @@ _08069440: strb r0, [r7, 0x3] movs r4, 0 mov r5, sp -_08069494: +@08069494: adds r1, r4, 0 adds r1, 0xD adds r0, r6, 0 @@ -186493,7 +186493,7 @@ _08069494: adds r5, 0x2 adds r4, 0x1 cmp r4, 0x3 - ble _08069494 + ble @08069494 adds r0, r6, 0 movs r1, 0x15 mov r2, r9 @@ -186510,7 +186510,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 @@ -186525,7 +186525,7 @@ sub_80694D0: @ 80694D0 add r0, sp, 0xC mov r9, r0 mov r5, sp -_080694EC: +@080694EC: adds r1, r4, 0 adds r1, 0xE adds r0, r6, 0 @@ -186542,7 +186542,7 @@ _080694EC: adds r5, 0x2 adds r4, 0x1 cmp r4, 0x2 - ble _080694EC + ble @080694EC adds r0, r6, 0 movs r1, 0x15 movs r2, 0 @@ -186565,7 +186565,7 @@ _080694EC: strb r0, [r7, 0x3] movs r4, 0 mov r5, sp -_08069540: +@08069540: adds r1, r4, 0 adds r1, 0xD adds r0, r6, 0 @@ -186579,7 +186579,7 @@ _08069540: adds r5, 0x2 adds r4, 0x1 cmp r4, 0x3 - ble _08069540 + ble @08069540 adds r0, r6, 0 movs r1, 0x15 mov r2, r9 @@ -186596,7 +186596,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 @@ -186625,7 +186625,7 @@ sub_806957C: @ 806957C str r4, [sp, 0x14] movs r5, 0 cmp r3, 0 - bne _080695D4 + bne @080695D4 ldr r2, =0x020244e0 ldr r1, =0x0831c898 ldr r3, [sp, 0x8] @@ -186635,15 +186635,15 @@ sub_806957C: @ 806957C adds r0, r1 ldrb r0, [r0, 0x1] strh r0, [r2] - b _080695D8 + b @080695D8 .align 2, 0 .pool -_080695D4: +@080695D4: ldr r0, =0x020244e0 strh r3, [r0] -_080695D8: +@080695D8: cmp r7, 0 - bne _080695F8 + bne @080695F8 ldr r1, =0x0831c898 ldr r7, [sp, 0x8] lsls r0, r7, 1 @@ -186652,16 +186652,16 @@ _080695D8: adds r0, r1 ldrb r0, [r0, 0x2] mov r10, r0 - b _08069602 + b @08069602 .align 2, 0 .pool -_080695F8: +@080695F8: movs r0, 0x3F mov r10, r0 mov r1, r10 ands r1, r7 mov r10, r1 -_08069602: +@08069602: ldrh r7, [r6, 0x2] ldr r2, [sp, 0x4] ldrh r2, [r2, 0x4] @@ -186673,7 +186673,7 @@ _08069602: str r0, [sp, 0x1C] ldrh r0, [r6, 0x2E] cmp r0, 0xAF - bne _08069634 + bne @08069634 ldr r1, =0x02024404 ldr r2, [sp, 0x10] lsls r0, r2, 3 @@ -186683,10 +186683,10 @@ _08069602: ldrb r3, [r0, 0x7] mov r9, r3 ldrb r0, [r0, 0x1A] - b _0806964A + b @0806964A .align 2, 0 .pool -_08069634: +@08069634: ldrh r0, [r6, 0x2E] bl itemid_get_x12 lsls r0, 24 @@ -186696,12 +186696,12 @@ _08069634: bl itemid_get_quality lsls r0, 24 lsrs r0, 24 -_0806964A: +@0806964A: str r0, [sp, 0x24] ldr r1, [sp, 0x4] ldrh r0, [r1, 0x2E] cmp r0, 0xAF - bne _0806967E + bne @0806967E ldr r1, =0x02024404 ldr r2, [sp, 0x14] lsls r0, r2, 3 @@ -186710,10 +186710,10 @@ _0806964A: adds r0, r1 ldrb r0, [r0, 0x7] str r0, [sp, 0x20] - b _08069694 + b @08069694 .align 2, 0 .pool -_0806966C: +@0806966C: ldr r0, [sp, 0x24] adds r0, 0x64 muls r0, r7 @@ -186721,8 +186721,8 @@ _0806966C: bl __divsi3 lsls r0, 16 lsrs r7, r0, 16 - b _0806977C -_0806967E: + b @0806977C +@0806967E: ldr r3, [sp, 0x4] ldrh r0, [r3, 0x2E] bl itemid_get_x12 @@ -186732,38 +186732,38 @@ _0806967E: ldr r1, [sp, 0x4] ldrh r0, [r1, 0x2E] bl itemid_get_quality -_08069694: +@08069694: adds r0, r6, 0 adds r0, 0x20 ldrb r1, [r0] str r0, [sp, 0x28] cmp r1, 0x25 - beq _080696A4 + beq @080696A4 cmp r1, 0x4A - bne _080696A8 -_080696A4: + bne @080696A8 +@080696A4: lsls r0, r7, 17 lsrs r7, r0, 16 -_080696A8: +@080696A8: ldr r0, =0x00000867 ldr r1, [sp, 0x10] bl sub_8069ED8 lsls r0, 24 cmp r0, 0 - beq _080696C4 + beq @080696C4 movs r0, 0x6E muls r0, r7 movs r1, 0x64 bl __divsi3 lsls r0, 16 lsrs r7, r0, 16 -_080696C4: +@080696C4: ldr r0, =0x0000086b ldr r1, [sp, 0x14] bl sub_8069ED8 lsls r0, 24 cmp r0, 0 - beq _080696E4 + beq @080696E4 movs r0, 0x6E ldr r2, [sp, 0x18] muls r0, r2 @@ -186772,14 +186772,14 @@ _080696C4: lsls r0, 16 lsrs r0, 16 str r0, [sp, 0x18] -_080696E4: +@080696E4: ldr r4, =0x0000086d adds r0, r4, 0 ldr r1, [sp, 0x10] bl sub_8069ED8 lsls r0, 24 cmp r0, 0 - beq _08069708 + beq @08069708 movs r0, 0x6E mov r3, r8 muls r3, r0 @@ -186789,13 +186789,13 @@ _080696E4: lsls r0, 16 lsrs r0, 16 mov r8, r0 -_08069708: +@08069708: adds r0, r4, 0 ldr r1, [sp, 0x14] bl sub_8069ED8 lsls r0, 24 cmp r0, 0 - beq _08069728 + beq @08069728 movs r0, 0x6E ldr r1, [sp, 0x1C] muls r0, r1 @@ -186804,26 +186804,26 @@ _08069708: lsls r0, 16 lsrs r0, 16 str r0, [sp, 0x1C] -_08069728: +@08069728: movs r2, 0 ldr r4, =0x08329d74 ldr r3, [sp, 0x4] adds r3, 0x20 str r3, [sp, 0x2C] adds r3, r4, 0 -_08069734: +@08069734: lsls r1, r2, 1 ldrb r0, [r3] cmp r9, r0 - bne _08069774 + bne @08069774 adds r0, r4, 0x1 adds r0, r1, r0 ldrb r0, [r0] cmp r10, r0 - bne _08069774 + bne @08069774 mov r1, r10 cmp r1, 0x8 - bls _0806966C + bls @0806966C ldr r0, [sp, 0x24] adds r0, 0x64 mov r2, r8 @@ -186834,34 +186834,34 @@ _08069734: lsls r0, 16 lsrs r0, 16 mov r8, r0 - b _0806977C + b @0806977C .align 2, 0 .pool -_08069774: +@08069774: adds r3, 0x2 adds r2, 0x1 cmp r2, 0x10 - bls _08069734 -_0806977C: + bls @08069734 +@0806977C: mov r3, r9 cmp r3, 0x1D - bne _08069790 + bne @08069790 movs r0, 0x96 muls r0, r7 movs r1, 0x64 bl __divsi3 lsls r0, 16 lsrs r7, r0, 16 -_08069790: +@08069790: mov r0, r9 cmp r0, 0x22 - bne _080697C6 + bne @080697C6 ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x003f0100 ands r0, r1 cmp r0, 0 - bne _080697C6 + bne @080697C6 ldr r1, =0xfffffe69 adds r0, r1, 0 ldrh r2, [r6] @@ -186869,7 +186869,7 @@ _08069790: lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bhi _080697C6 + bhi @080697C6 movs r0, 0x96 mov r3, r8 muls r3, r0 @@ -186879,16 +186879,16 @@ _08069790: lsls r0, 16 lsrs r0, 16 mov r8, r0 -_080697C6: +@080697C6: ldr r0, [sp, 0x20] cmp r0, 0x22 - bne _080697FC + bne @080697FC ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x003f0100 ands r0, r1 cmp r0, 0 - bne _080697FC + bne @080697FC ldr r1, =0xfffffe69 adds r0, r1, 0 ldr r2, [sp, 0x4] @@ -186897,7 +186897,7 @@ _080697C6: lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bhi _080697FC + bhi @080697FC movs r0, 0x96 ldr r3, [sp, 0x1C] muls r0, r3 @@ -186906,94 +186906,94 @@ _080697C6: lsls r0, 16 lsrs r0, 16 str r0, [sp, 0x1C] -_080697FC: +@080697FC: mov r0, r9 cmp r0, 0x23 - bne _08069812 + bne @08069812 ldrh r1, [r6] ldr r0, =0x00000175 cmp r1, r0 - bne _08069812 + bne @08069812 mov r1, r8 lsls r0, r1, 17 lsrs r0, 16 mov r8, r0 -_08069812: +@08069812: ldr r2, [sp, 0x20] cmp r2, 0x24 - bne _0806982A + bne @0806982A ldr r3, [sp, 0x4] ldrh r1, [r3] ldr r0, =0x00000175 cmp r1, r0 - bne _0806982A + bne @0806982A ldr r1, [sp, 0x1C] lsls r0, r1, 17 lsrs r0, 16 str r0, [sp, 0x1C] -_0806982A: +@0806982A: mov r2, r9 cmp r2, 0x2D - bne _0806983E + bne @0806983E ldrh r0, [r6] cmp r0, 0x19 - bne _0806983E + bne @0806983E mov r3, r8 lsls r0, r3, 17 lsrs r0, 16 mov r8, r0 -_0806983E: +@0806983E: ldr r0, [sp, 0x20] cmp r0, 0x40 - bne _08069854 + bne @08069854 ldr r1, [sp, 0x4] ldrh r0, [r1] cmp r0, 0x84 - bne _08069854 + bne @08069854 ldr r2, [sp, 0x18] lsls r0, r2, 17 lsrs r0, 16 str r0, [sp, 0x18] -_08069854: +@08069854: mov r3, r9 cmp r3, 0x41 - bne _0806986A + bne @0806986A ldrh r0, [r6] subs r0, 0x68 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bhi _0806986A + bhi @0806986A lsls r0, r7, 17 lsrs r7, r0, 16 -_0806986A: +@0806986A: ldr r1, [sp, 0x2C] ldrb r0, [r1] cmp r0, 0x2F - bne _08069882 + bne @08069882 mov r2, r10 cmp r2, 0xA - beq _0806987C + beq @0806987C cmp r2, 0xF - bne _08069882 -_0806987C: + bne @08069882 +@0806987C: mov r3, r8 lsrs r3, 1 mov r8, r3 -_08069882: +@08069882: ldr r0, [sp, 0x28] ldrb r4, [r0] cmp r4, 0x37 - bne _08069898 + bne @08069898 movs r0, 0x96 muls r0, r7 movs r1, 0x64 bl __divsi3 lsls r0, 16 lsrs r7, r0, 16 -_08069898: +@08069898: cmp r4, 0x39 - bne _080698C6 + bne @080698C6 movs r0, 0 str r0, [sp] movs r0, 0xE @@ -187003,7 +187003,7 @@ _08069898: bl ability_something lsls r0, 24 cmp r0, 0 - beq _080698C6 + beq @080698C6 movs r0, 0x96 mov r1, r8 muls r1, r0 @@ -187013,11 +187013,11 @@ _08069898: lsls r0, 16 lsrs r0, 16 mov r8, r0 -_080698C6: +@080698C6: ldr r2, [sp, 0x28] ldrb r0, [r2] cmp r0, 0x3A - bne _080698F8 + bne @080698F8 movs r0, 0 str r0, [sp] movs r0, 0xE @@ -187027,7 +187027,7 @@ _080698C6: bl ability_something lsls r0, 24 cmp r0, 0 - beq _080698F8 + beq @080698F8 movs r0, 0x96 mov r3, r8 muls r3, r0 @@ -187037,29 +187037,29 @@ _080698C6: lsls r0, 16 lsrs r0, 16 mov r8, r0 -_080698F8: +@080698F8: ldr r1, [sp, 0x28] ldrb r0, [r1] cmp r0, 0x3E - bne _08069914 + bne @08069914 ldr r0, [r6, 0x4C] cmp r0, 0 - beq _08069914 + beq @08069914 movs r0, 0x96 muls r0, r7 movs r1, 0x64 bl __divsi3 lsls r0, 16 lsrs r7, r0, 16 -_08069914: +@08069914: ldr r2, [sp, 0x2C] ldrb r0, [r2] cmp r0, 0x3F - bne _08069936 + bne @08069936 ldr r3, [sp, 0x4] ldr r0, [r3, 0x4C] cmp r0, 0 - beq _08069936 + beq @08069936 movs r0, 0x96 ldr r1, [sp, 0x18] muls r0, r1 @@ -187068,10 +187068,10 @@ _08069914: lsls r0, 16 lsrs r0, 16 str r0, [sp, 0x18] -_08069936: +@08069936: mov r2, r10 cmp r2, 0xD - bne _0806995A + bne @0806995A movs r0, 0 str r0, [sp] movs r0, 0xE @@ -187081,15 +187081,15 @@ _08069936: bl ability_something lsls r0, 24 cmp r0, 0 - beq _0806995A + beq @0806995A ldr r1, =0x020244e0 ldrh r0, [r1] lsrs r0, 1 strh r0, [r1] -_0806995A: +@0806995A: mov r3, r10 cmp r3, 0xA - bne _0806997E + bne @0806997E movs r0, 0 str r0, [sp] movs r0, 0xE @@ -187099,19 +187099,19 @@ _0806995A: bl ability_something lsls r0, 24 cmp r0, 0 - beq _0806997E + beq @0806997E ldr r1, =0x020244e0 ldrh r0, [r1] lsrs r0, 1 strh r0, [r1] -_0806997E: +@0806997E: mov r0, r10 cmp r0, 0xC - bne _080699AE + bne @080699AE ldr r1, [sp, 0x28] ldrb r0, [r1] cmp r0, 0x41 - bne _080699AE + bne @080699AE ldrh r0, [r6, 0x2C] movs r1, 0x3 bl __udivsi3 @@ -187119,7 +187119,7 @@ _0806997E: lsls r0, 16 lsrs r0, 16 cmp r1, r0 - bhi _080699AE + bhi @080699AE ldr r4, =0x020244e0 ldrh r1, [r4] movs r0, 0x96 @@ -187127,14 +187127,14 @@ _0806997E: movs r1, 0x64 bl __divsi3 strh r0, [r4] -_080699AE: +@080699AE: mov r2, r10 cmp r2, 0xA - bne _080699DE + bne @080699DE ldr r3, [sp, 0x28] ldrb r0, [r3] cmp r0, 0x42 - bne _080699DE + bne @080699DE ldrh r0, [r6, 0x2C] movs r1, 0x3 bl __udivsi3 @@ -187142,7 +187142,7 @@ _080699AE: lsls r0, 16 lsrs r0, 16 cmp r1, r0 - bhi _080699DE + bhi @080699DE ldr r4, =0x020244e0 ldrh r1, [r4] movs r0, 0x96 @@ -187150,14 +187150,14 @@ _080699AE: movs r1, 0x64 bl __divsi3 strh r0, [r4] -_080699DE: +@080699DE: mov r0, r10 cmp r0, 0xB - bne _08069A0E + bne @08069A0E ldr r1, [sp, 0x28] ldrb r0, [r1] cmp r0, 0x43 - bne _08069A0E + bne @08069A0E ldrh r0, [r6, 0x2C] movs r1, 0x3 bl __udivsi3 @@ -187165,7 +187165,7 @@ _080699DE: lsls r0, 16 lsrs r0, 16 cmp r1, r0 - bhi _08069A0E + bhi @08069A0E ldr r4, =0x020244e0 ldrh r1, [r4] movs r0, 0x96 @@ -187173,14 +187173,14 @@ _080699DE: movs r1, 0x64 bl __divsi3 strh r0, [r4] -_08069A0E: +@08069A0E: mov r2, r10 cmp r2, 0x6 - bne _08069A3E + bne @08069A3E ldr r3, [sp, 0x28] ldrb r0, [r3] cmp r0, 0x44 - bne _08069A3E + bne @08069A3E ldrh r0, [r6, 0x2C] movs r1, 0x3 bl __udivsi3 @@ -187188,7 +187188,7 @@ _08069A0E: lsls r0, 16 lsrs r0, 16 cmp r1, r0 - bhi _08069A3E + bhi @08069A3E ldr r4, =0x020244e0 ldrh r1, [r4] movs r0, 0x96 @@ -187196,7 +187196,7 @@ _08069A0E: movs r1, 0x64 bl __divsi3 strh r0, [r4] -_08069A3E: +@08069A3E: ldr r2, =0x0831c898 ldr r0, =0x020241ea ldrh r1, [r0] @@ -187206,37 +187206,37 @@ _08069A3E: adds r0, r2 ldrb r0, [r0] cmp r0, 0x7 - bne _08069A58 + bne @08069A58 ldr r0, [sp, 0x18] lsrs r0, 1 str r0, [sp, 0x18] -_08069A58: +@08069A58: mov r1, r10 cmp r1, 0x8 - bls _08069A60 - b _08069BC2 -_08069A60: + bls @08069A60 + b @08069BC2 +@08069A60: ldr r0, =0x02024211 ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0x2 - bne _08069AA0 + bne @08069AA0 movs r0, 0x19 ldrsb r0, [r6, r0] cmp r0, 0x6 - ble _08069A9C + ble @08069A9C ldr r2, =0x08329d2e - b _08069AA6 + b @08069AA6 .align 2, 0 .pool -_08069A9C: +@08069A9C: adds r5, r7, 0 - b _08069ABE -_08069AA0: + b @08069ABE +@08069AA0: ldr r2, =0x08329d2e movs r0, 0x19 ldrsb r0, [r6, r0] -_08069AA6: +@08069AA6: lsls r0, 1 adds r1, r0, r2 ldrb r1, [r1] @@ -187248,7 +187248,7 @@ _08069AA6: adds r0, r5, 0 bl __divsi3 adds r5, r0, 0 -_08069ABE: +@08069ABE: ldr r0, =0x020244e0 ldrh r0, [r0] muls r5, r0 @@ -187262,28 +187262,28 @@ _08069ABE: muls r5, r0 ldrb r0, [r4] cmp r0, 0x2 - bne _08069AFC + bne @08069AFC ldr r2, [sp, 0x4] movs r0, 0x1A ldrsb r0, [r2, r0] cmp r0, 0x5 - bgt _08069AF8 + bgt @08069AF8 ldr r2, =0x08329d2e ldr r3, [sp, 0x4] movs r0, 0x1A ldrsb r0, [r3, r0] - b _08069B04 + b @08069B04 .align 2, 0 .pool -_08069AF8: +@08069AF8: ldr r3, [sp, 0x18] - b _08069B1E -_08069AFC: + b @08069B1E +@08069AFC: ldr r2, =0x08329d2e ldr r1, [sp, 0x4] movs r0, 0x1A ldrsb r0, [r1, r0] -_08069B04: +@08069B04: lsls r0, 1 adds r1, r0, r2 ldrb r1, [r1] @@ -187296,7 +187296,7 @@ _08069B04: adds r0, r3, 0 bl __divsi3 adds r3, r0, 0 -_08069B1E: +@08069B1E: adds r0, r5, 0 adds r1, r3, 0 bl __divsi3 @@ -187308,52 +187308,52 @@ _08069B1E: movs r1, 0x10 ands r0, r1 cmp r0, 0 - beq _08069B48 + beq @08069B48 ldr r1, [sp, 0x28] ldrb r0, [r1] cmp r0, 0x3E - beq _08069B48 + beq @08069B48 lsrs r0, r5, 31 adds r0, r5, r0 asrs r5, r0, 1 -_08069B48: +@08069B48: movs r0, 0x1 ldr r2, [sp, 0xC] ands r0, r2 cmp r0, 0 - beq _08069B8A + beq @08069B8A ldrb r1, [r4] cmp r1, 0x1 - bne _08069B8A + bne @08069B8A ldr r0, =0x02022fec ldr r0, [r0] ands r0, r1 cmp r0, 0 - beq _08069B84 + beq @08069B84 movs r0, 0x2 bl sub_8069DEC lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _08069B84 + bne @08069B84 adds r0, r5, 0 movs r1, 0x3 bl __divsi3 lsls r5, r0, 1 - b _08069B8A + b @08069B8A .align 2, 0 .pool -_08069B84: +@08069B84: lsrs r0, r5, 31 adds r0, r5, r0 asrs r5, r0, 1 -_08069B8A: +@08069B8A: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08069BBC + beq @08069BBC ldr r0, =0x0831c898 ldr r3, [sp, 0x8] lsls r1, r3, 1 @@ -187362,52 +187362,52 @@ _08069B8A: adds r1, r0 ldrb r0, [r1, 0x6] cmp r0, 0x8 - bne _08069BBC + bne @08069BBC movs r0, 0x2 bl sub_8069DEC lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _08069BBC + bne @08069BBC lsrs r0, r5, 31 adds r0, r5, r0 asrs r5, r0, 1 -_08069BBC: +@08069BBC: cmp r5, 0 - bne _08069BC2 + bne @08069BC2 movs r5, 0x1 -_08069BC2: +@08069BC2: mov r7, r10 cmp r7, 0x9 - bne _08069BCA + bne @08069BCA movs r5, 0 -_08069BCA: +@08069BCA: mov r0, r10 cmp r0, 0x9 - bhi _08069BD2 - b _08069DD4 -_08069BD2: + bhi @08069BD2 + b @08069DD4 +@08069BD2: ldr r0, =0x02024211 ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0x2 - bne _08069BFC + bne @08069BFC movs r0, 0x1C ldrsb r0, [r6, r0] cmp r0, 0x6 - ble _08069BF8 + ble @08069BF8 ldr r2, =0x08329d2e - b _08069C02 + b @08069C02 .align 2, 0 .pool -_08069BF8: +@08069BF8: mov r5, r8 - b _08069C1A -_08069BFC: + b @08069C1A +@08069BFC: ldr r2, =0x08329d2e movs r0, 0x1C ldrsb r0, [r6, r0] -_08069C02: +@08069C02: lsls r0, 1 adds r1, r0, r2 ldrb r1, [r1] @@ -187419,7 +187419,7 @@ _08069C02: adds r0, r5, 0 bl __divsi3 adds r5, r0, 0 -_08069C1A: +@08069C1A: ldr r0, =0x020244e0 ldrh r0, [r0] muls r5, r0 @@ -187433,25 +187433,25 @@ _08069C1A: muls r5, r0 ldrb r0, [r4] cmp r0, 0x2 - bne _08069C54 + bne @08069C54 ldr r1, [sp, 0x4] movs r0, 0x1D ldrsb r0, [r1, r0] cmp r0, 0x5 - bgt _08069C50 + bgt @08069C50 ldr r2, =0x08329d2e - b _08069C5C + b @08069C5C .align 2, 0 .pool -_08069C50: +@08069C50: ldr r3, [sp, 0x1C] - b _08069C76 -_08069C54: + b @08069C76 +@08069C54: ldr r2, =0x08329d2e ldr r7, [sp, 0x4] movs r0, 0x1D ldrsb r0, [r7, r0] -_08069C5C: +@08069C5C: lsls r0, 1 adds r1, r0, r2 ldrb r1, [r1] @@ -187464,7 +187464,7 @@ _08069C5C: adds r0, r3, 0 bl __divsi3 adds r3, r0, 0 -_08069C76: +@08069C76: adds r0, r5, 0 adds r1, r3, 0 bl __divsi3 @@ -187476,39 +187476,39 @@ _08069C76: ldr r7, [sp, 0xC] ands r0, r7 cmp r0, 0 - beq _08069CCA + beq @08069CCA ldrb r1, [r4] cmp r1, 0x1 - bne _08069CCA + bne @08069CCA ldr r0, =0x02022fec ldr r0, [r0] ands r0, r1 cmp r0, 0 - beq _08069CC4 + beq @08069CC4 movs r0, 0x2 bl sub_8069DEC lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _08069CC4 + bne @08069CC4 adds r0, r5, 0 movs r1, 0x3 bl __divsi3 lsls r5, r0, 1 - b _08069CCA + b @08069CCA .align 2, 0 .pool -_08069CC4: +@08069CC4: lsrs r0, r5, 31 adds r0, r5, r0 asrs r5, r0, 1 -_08069CCA: +@08069CCA: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08069CFC + beq @08069CFC ldr r0, =0x0831c898 ldr r2, [sp, 0x8] lsls r1, r2, 1 @@ -187517,17 +187517,17 @@ _08069CCA: adds r1, r0 ldrb r0, [r1, 0x6] cmp r0, 0x8 - bne _08069CFC + bne @08069CFC movs r0, 0x2 bl sub_8069DEC lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _08069CFC + bne @08069CFC lsrs r0, r5, 31 adds r0, r5, r0 asrs r5, r0, 1 -_08069CFC: +@08069CFC: movs r0, 0 str r0, [sp] movs r0, 0xE @@ -187538,7 +187538,7 @@ _08069CFC: lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _08069DAC + bne @08069DAC str r0, [sp] movs r0, 0xE movs r1, 0 @@ -187547,72 +187547,72 @@ _08069CFC: bl ability_something lsls r0, 24 cmp r0, 0 - bne _08069DAC + bne @08069DAC ldr r2, =0x020243cc ldrh r1, [r2] movs r0, 0x1 ands r0, r1 adds r4, r2, 0 cmp r0, 0 - beq _08069D64 + beq @08069D64 mov r3, r10 cmp r3, 0xA - beq _08069D50 + beq @08069D50 cmp r3, 0xB - beq _08069D58 - b _08069D64 + beq @08069D58 + b @08069D64 .align 2, 0 .pool -_08069D50: +@08069D50: lsrs r0, r5, 31 adds r0, r5, r0 asrs r5, r0, 1 - b _08069D64 -_08069D58: + b @08069D64 +@08069D58: lsls r0, r5, 4 subs r0, r5 movs r1, 0xA bl __divsi3 adds r5, r0, 0 -_08069D64: +@08069D64: ldrh r1, [r4] movs r0, 0x9F ands r0, r1 cmp r0, 0 - beq _08069D7C + beq @08069D7C ldr r0, =0x020241ea ldrh r0, [r0] cmp r0, 0x4C - bne _08069D7C + bne @08069D7C lsrs r0, r5, 31 adds r0, r5, r0 asrs r5, r0, 1 -_08069D7C: +@08069D7C: ldrh r1, [r4] movs r0, 0x60 ands r0, r1 cmp r0, 0 - beq _08069DAC + beq @08069DAC mov r6, r10 cmp r6, 0xA - beq _08069D98 + beq @08069D98 cmp r6, 0xB - beq _08069DA6 - b _08069DAC + beq @08069DA6 + b @08069DAC .align 2, 0 .pool -_08069D98: +@08069D98: lsls r0, r5, 4 subs r0, r5 movs r1, 0xA bl __divsi3 adds r5, r0, 0 - b _08069DAC -_08069DA6: + b @08069DAC +@08069DA6: lsrs r0, r5, 31 adds r0, r5, r0 asrs r5, r0, 1 -_08069DAC: +@08069DAC: ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x4] @@ -187623,16 +187623,16 @@ _08069DAC: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08069DD4 + beq @08069DD4 mov r0, r10 cmp r0, 0xA - bne _08069DD4 + bne @08069DD4 lsls r0, r5, 4 subs r0, r5 movs r1, 0xA bl __divsi3 adds r5, r0, 0 -_08069DD4: +@08069DD4: adds r0, r5, 0x2 add sp, 0x30 pop {r3-r5} @@ -187647,51 +187647,51 @@ _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 adds r1, r0, 0 movs r6, 0 cmp r0, 0x1 - beq _08069E40 + beq @08069E40 cmp r0, 0x1 - bgt _08069E04 + bgt @08069E04 cmp r0, 0 - beq _08069E0A - b _08069EC2 -_08069E04: + beq @08069E0A + b @08069EC2 +@08069E04: cmp r1, 0x2 - beq _08069E88 - b _08069EC2 -_08069E0A: + beq @08069E88 + b @08069EC2 +@08069E0A: movs r5, 0 ldr r0, =0x02024064 ldrb r3, [r0] ldr r4, =0x02024210 ldr r2, =0x0832a328 -_08069E14: +@08069E14: cmp r5, r3 - beq _08069E28 + beq @08069E28 ldrb r0, [r4] ldr r1, [r2] ands r0, r1 cmp r0, 0 - bne _08069E28 + bne @08069E28 adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_08069E28: +@08069E28: adds r2, 0x4 adds r5, 0x1 cmp r5, 0x3 - ble _08069E14 - b _08069EC2 + ble @08069E14 + b @08069EC2 .align 2, 0 .pool -_08069E40: +@08069E40: movs r5, 0 -_08069E42: +@08069E42: lsls r0, r5, 24 lsrs r0, 24 bl battle_side_get_owner @@ -187702,7 +187702,7 @@ _08069E42: lsls r4, 24 lsls r0, 24 cmp r4, r0 - bne _08069E74 + bne @08069E74 ldr r0, =0x02024210 ldrb r1, [r0] ldr r2, =0x0832a328 @@ -187711,20 +187711,20 @@ _08069E42: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _08069E74 + bne @08069E74 adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_08069E74: +@08069E74: adds r5, 0x1 cmp r5, 0x3 - ble _08069E42 - b _08069EC2 + ble @08069E42 + b @08069EC2 .align 2, 0 .pool -_08069E88: +@08069E88: movs r5, 0 -_08069E8A: +@08069E8A: lsls r0, r5, 24 lsrs r0, 24 bl battle_side_get_owner @@ -187735,7 +187735,7 @@ _08069E8A: lsls r4, 24 lsls r0, 24 cmp r4, r0 - bne _08069EBC + bne @08069EBC ldr r0, =0x02024210 ldrb r1, [r0] ldr r2, =0x0832a328 @@ -187744,15 +187744,15 @@ _08069E8A: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _08069EBC + bne @08069EBC adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_08069EBC: +@08069EBC: adds r5, 0x1 cmp r5, 0x3 - ble _08069E8A -_08069EC2: + ble @08069E8A +@08069EC2: adds r0, r6, 0 pop {r4-r6} pop {r1} @@ -187762,7 +187762,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 @@ -187773,44 +187773,44 @@ sub_8069ED8: @ 8069ED8 ldr r1, =0x023f0902 ands r0, r1 cmp r0, 0 - bne _08069F1C + bne @08069F1C adds r0, r2, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08069F1C + bne @08069F1C ldr r0, [r4] movs r1, 0x8 ands r0, r1 cmp r0, 0 - beq _08069F10 + beq @08069F10 ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0x80 lsls r0, 3 cmp r1, r0 - beq _08069F1C -_08069F10: + beq @08069F1C +@08069F10: adds r0, r5, 0 bl flag_check lsls r0, 24 cmp r0, 0 - bne _08069F2C -_08069F1C: + bne @08069F2C +@08069F1C: movs r0, 0 - b _08069F2E + b @08069F2E .align 2, 0 .pool -_08069F2C: +@08069F2C: movs r0, 0x1 -_08069F2E: +@08069F2E: pop {r4,r5} pop {r1} bx r1 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 @@ -187825,30 +187825,30 @@ sub_8069F34: @ 8069F34 ldr r0, [r0] ands r0, r6 cmp r0, 0 - bne _08069F5C + bne @08069F5C adds r0, r4, 0 - b _08069FA6 + b @08069FA6 .align 2, 0 .pool -_08069F5C: +@08069F5C: movs r0, 0 bl sub_8069DEC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bls _08069F80 + bls @08069F80 bl GenerateRandomNumber adds r1, r6, 0 ands r1, r0 cmp r1, 0 - bne _08069F7C + bne @08069F7C movs r0, 0x2 eors r0, r4 - b _08069FA6 -_08069F7C: + b @08069FA6 +@08069F7C: adds r0, r4, 0 - b _08069FA6 -_08069F80: + b @08069FA6 +@08069F80: ldr r0, =0x02024210 ldrb r1, [r0] ldr r2, =0x0832a328 @@ -187857,16 +187857,16 @@ _08069F80: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _08069FA0 + bne @08069FA0 adds r0, r4, 0 - b _08069FA6 + b @08069FA6 .align 2, 0 .pool -_08069FA0: +@08069FA0: movs r0, 0x2 eors r5, r0 adds r0, r5, 0 -_08069FA6: +@08069FA6: bl battle_get_side_with_given_state lsls r0, 24 lsrs r0, 24 @@ -187876,7 +187876,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 @@ -187886,7 +187886,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 @@ -187906,14 +187906,14 @@ pokemon_roll_gender: @ 8069FC4 adds r0, r1 ldrb r0, [r0, 0x10] cmp r0, 0 - beq _0806A01A + beq @0806A01A cmp r0, 0 - blt _08069FFC + blt @08069FFC cmp r0, 0xFF - bgt _08069FFC + bgt @08069FFC cmp r0, 0xFE - bge _0806A01A -_08069FFC: + bge @0806A01A +@08069FFC: ldr r1, =0x083203cc lsls r0, r5, 3 subs r0, r5 @@ -187923,21 +187923,21 @@ _08069FFC: movs r0, 0xFF ands r0, r2 cmp r1, r0 - bhi _0806A018 + bhi @0806A018 movs r0, 0 - b _0806A01A + b @0806A01A .align 2, 0 .pool -_0806A018: +@0806A018: movs r0, 0xFE -_0806A01A: +@0806A01A: pop {r4,r5} pop {r1} bx r1 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 @@ -187949,14 +187949,14 @@ pokemon_species_get_gender_info: @ 806A020 adds r0, r1 ldrb r0, [r0, 0x10] cmp r0, 0 - beq _0806A062 + beq @0806A062 cmp r0, 0 - blt _0806A044 + blt @0806A044 cmp r0, 0xFF - bgt _0806A044 + bgt @0806A044 cmp r0, 0xFE - bge _0806A062 -_0806A044: + bge @0806A062 +@0806A044: lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -187965,20 +187965,20 @@ _0806A044: movs r0, 0xFF ands r0, r3 cmp r1, r0 - bhi _0806A060 + bhi @0806A060 movs r0, 0 - b _0806A062 + b @0806A062 .align 2, 0 .pool -_0806A060: +@0806A060: movs r0, 0xFE -_0806A062: +@0806A062: pop {r1} bx r1 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 @@ -187987,7 +187987,7 @@ sub_806A068: @ 806A068 ldr r0, =0x020244d4 ldr r2, [r0] cmp r2, 0 - beq _0806A09C + beq @0806A09C ldr r0, =0x0202499c lsls r1, r4, 1 adds r1, r4 @@ -188000,32 +188000,32 @@ sub_806A068: @ 806A068 ldm r1!, {r3,r6,r7} stm r2!, {r3,r6,r7} adds r3, r0, 0 - b _0806A0DA + b @0806A0DA .align 2, 0 .pool -_0806A09C: +@0806A09C: ldr r1, =0x020249b4 ldr r0, [r1] cmp r0, 0 - beq _0806A0B4 + beq @0806A0B4 ldr r3, =0x0202499c ldr r2, [r0, 0xC] - b _0806A0C8 + b @0806A0C8 .align 2, 0 .pool -_0806A0B4: +@0806A0B4: ldr r0, [r1, 0x4] cmp r0, 0 - beq _0806A0C4 + beq @0806A0C4 ldr r3, =0x0202499c ldr r2, [r0, 0xC] - b _0806A0C8 + b @0806A0C8 .align 2, 0 .pool -_0806A0C4: +@0806A0C4: ldr r3, =0x0202499c ldr r2, =0x08329d98 -_0806A0C8: +@0806A0C8: lsls r0, r4, 1 adds r0, r4 lsls r0, 3 @@ -188035,24 +188035,24 @@ _0806A0C8: stm r1!, {r2,r6,r7} ldm r0!, {r2,r6,r7} stm r1!, {r2,r6,r7} -_0806A0DA: +@0806A0DA: adds r2, r3, 0 strh r5, [r2, 0x2] cmp r4, 0 - beq _0806A0E6 + beq @0806A0E6 cmp r4, 0x2 - bne _0806A0F8 -_0806A0E6: + bne @0806A0F8 +@0806A0E6: ldr r0, =0x082ff70c str r0, [r2, 0x8] - b _0806A122 + b @0806A122 .align 2, 0 .pool -_0806A0F8: +@0806A0F8: movs r0, 0xFA lsls r0, 1 cmp r5, r0 - bls _0806A118 + bls @0806A118 ldr r0, =0x08309aac ldr r3, =0xfffffe0c adds r1, r5, r3 @@ -188060,16 +188060,16 @@ _0806A0F8: adds r1, r0 ldr r0, [r1] str r0, [r2, 0x8] - b _0806A122 + b @0806A122 .align 2, 0 .pool -_0806A118: +@0806A118: ldr r0, =0x08309aac lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] str r0, [r3, 0x8] -_0806A122: +@0806A122: pop {r4-r7} pop {r0} bx r0 @@ -188078,7 +188078,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 @@ -188088,10 +188088,10 @@ template_build_for_pokemon_or_trainer: @ 806A12C strh r4, [r0, 0x2] adds r5, r0, 0 cmp r3, 0 - beq _0806A144 + beq @0806A144 cmp r3, 0x2 - bne _0806A170 -_0806A144: + bne @0806A170 +@0806A144: ldr r2, =0x08329df8 lsls r0, r4, 1 adds r0, r4 @@ -188106,14 +188106,14 @@ _0806A144: lsls r0, r4, 2 adds r0, r1 ldr r0, [r0] - b _0806A1B0 + b @0806A1B0 .align 2, 0 .pool -_0806A170: +@0806A170: ldr r0, =0x020244d4 ldr r1, [r0] cmp r1, 0 - beq _0806A194 + beq @0806A194 lsls r0, r3, 1 adds r0, r3 lsls r0, 3 @@ -188124,10 +188124,10 @@ _0806A170: stm r1!, {r2,r3,r6} ldm r0!, {r2,r3,r6} stm r1!, {r2,r3,r6} - b _0806A1A8 + b @0806A1A8 .align 2, 0 .pool -_0806A194: +@0806A194: ldr r0, =0x08329d98 lsls r1, r3, 1 adds r1, r3 @@ -188138,12 +188138,12 @@ _0806A194: stm r2!, {r0,r3,r6} ldm r1!, {r0,r3,r6} stm r2!, {r0,r3,r6} -_0806A1A8: +@0806A1A8: ldr r0, =0x0830536c lsls r1, r4, 2 adds r1, r0 ldr r0, [r1] -_0806A1B0: +@0806A1B0: str r0, [r5, 0x8] pop {r4-r6} pop {r0} @@ -188153,7 +188153,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 @@ -188162,7 +188162,7 @@ sub_806A1C0: @ 806A1C0 ldr r0, =0x020244d4 ldr r2, [r0] cmp r2, 0 - beq _0806A1F4 + beq @0806A1F4 ldr r0, =0x0202499c lsls r1, r4, 1 adds r1, r4 @@ -188175,10 +188175,10 @@ sub_806A1C0: @ 806A1C0 ldm r1!, {r3,r4,r6} stm r2!, {r3,r4,r6} adds r3, r0, 0 - b _0806A20A + b @0806A20A .align 2, 0 .pool -_0806A1F4: +@0806A1F4: ldr r3, =0x0202499c ldr r2, =0x08329d98 lsls r0, r4, 1 @@ -188190,7 +188190,7 @@ _0806A1F4: stm r1!, {r2,r4,r6} ldm r0!, {r2,r4,r6} stm r1!, {r2,r4,r6} -_0806A20A: +@0806A20A: strh r5, [r3, 0x2] ldr r0, =0x0830536c lsls r1, r5, 2 @@ -188205,14 +188205,14 @@ _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 adds r2, r3, 0 adds r2, 0x20 -_0806A232: +@0806A232: ldr r0, [r2] ldr r1, [r3] eors r0, r1 @@ -188222,21 +188222,21 @@ _0806A232: stm r2!, {r0} adds r4, 0x1 cmp r4, 0xB - bls _0806A232 + bls @0806A232 pop {r4} pop {r0} bx r0 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 adds r2, r3, 0 adds r2, 0x20 -_0806A256: +@0806A256: ldr r0, [r2] ldr r1, [r3, 0x4] eors r0, r1 @@ -188246,15 +188246,15 @@ _0806A256: stm r2!, {r0} adds r4, 0x1 cmp r4, 0xB - bls _0806A256 + bls @0806A256 pop {r4} pop {r0} bx r0 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 @@ -188264,379 +188264,379 @@ pokemon_data_permutator: @ 806A270 movs r1, 0x18 bl __umodsi3 cmp r0, 0x17 - bls _0806A288 - b _0806A510 -_0806A288: + bls @0806A288 + b @0806A510 +@0806A288: lsls r0, 2 - ldr r1, =_0806A298 + ldr r1, =@0806A298 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0806A298: - .4byte _0806A2F8 - .4byte _0806A31C - .4byte _0806A338 - .4byte _0806A34E - .4byte _0806A364 - .4byte _0806A380 - .4byte _0806A396 - .4byte _0806A3AC - .4byte _0806A3BC - .4byte _0806A3DA - .4byte _0806A3F2 - .4byte _0806A402 - .4byte _0806A416 - .4byte _0806A428 - .4byte _0806A43A - .4byte _0806A44C - .4byte _0806A45E - .4byte _0806A470 - .4byte _0806A482 - .4byte _0806A498 - .4byte _0806A4AC - .4byte _0806A4BA - .4byte _0806A4CC - .4byte _0806A4E0 -_0806A2F8: +@0806A298: + .4byte @0806A2F8 + .4byte @0806A31C + .4byte @0806A338 + .4byte @0806A34E + .4byte @0806A364 + .4byte @0806A380 + .4byte @0806A396 + .4byte @0806A3AC + .4byte @0806A3BC + .4byte @0806A3DA + .4byte @0806A3F2 + .4byte @0806A402 + .4byte @0806A416 + .4byte @0806A428 + .4byte @0806A43A + .4byte @0806A44C + .4byte @0806A45E + .4byte @0806A470 + .4byte @0806A482 + .4byte @0806A498 + .4byte @0806A4AC + .4byte @0806A4BA + .4byte @0806A4CC + .4byte @0806A4E0 +@0806A2F8: adds r0, r5, 0 adds r0, 0x20 cmp r4, 0x1 - bne _0806A302 - b _0806A508 -_0806A302: + bne @0806A302 + b @0806A508 +@0806A302: cmp r4, 0x1 - bgt _0806A30E -_0806A306: + bgt @0806A30E +@0806A306: cmp r4, 0 - bne _0806A30C - b _0806A50E -_0806A30C: - b _0806A510 -_0806A30E: + bne @0806A30C + b @0806A50E +@0806A30C: + b @0806A510 +@0806A30E: cmp r4, 0x2 - bne _0806A314 - b _0806A502 -_0806A314: + bne @0806A314 + b @0806A502 +@0806A314: cmp r4, 0x3 - beq _0806A31A - b _0806A510 -_0806A31A: - b _0806A4FC -_0806A31C: + beq @0806A31A + b @0806A510 +@0806A31A: + b @0806A4FC +@0806A31C: adds r0, r5, 0 adds r0, 0x20 cmp r4, 0x1 - bne _0806A326 - b _0806A508 -_0806A326: + bne @0806A326 + b @0806A508 +@0806A326: cmp r4, 0x1 - ble _0806A306 -_0806A32A: + ble @0806A306 +@0806A32A: cmp r4, 0x2 - bne _0806A330 - b _0806A4FC -_0806A330: + bne @0806A330 + b @0806A4FC +@0806A330: cmp r4, 0x3 - beq _0806A336 - b _0806A510 -_0806A336: - b _0806A502 -_0806A338: + beq @0806A336 + b @0806A510 +@0806A336: + b @0806A502 +@0806A338: adds r0, r5, 0 adds r0, 0x20 cmp r4, 0x1 - bne _0806A342 - b _0806A502 -_0806A342: + bne @0806A342 + b @0806A502 +@0806A342: cmp r4, 0x1 - ble _0806A306 + ble @0806A306 cmp r4, 0x2 - bne _0806A34C - b _0806A508 -_0806A34C: - b _0806A314 -_0806A34E: + bne @0806A34C + b @0806A508 +@0806A34C: + b @0806A314 +@0806A34E: adds r0, r5, 0 adds r0, 0x20 cmp r4, 0x1 - bne _0806A358 - b _0806A4FC -_0806A358: + bne @0806A358 + b @0806A4FC +@0806A358: cmp r4, 0x1 - ble _0806A306 + ble @0806A306 cmp r4, 0x2 - bne _0806A362 - b _0806A508 -_0806A362: - b _0806A330 -_0806A364: + bne @0806A362 + b @0806A508 +@0806A362: + b @0806A330 +@0806A364: adds r0, r5, 0 adds r0, 0x20 cmp r4, 0x1 - bne _0806A36E - b _0806A502 -_0806A36E: + bne @0806A36E + b @0806A502 +@0806A36E: cmp r4, 0x1 - ble _0806A306 -_0806A372: + ble @0806A306 +@0806A372: cmp r4, 0x2 - bne _0806A378 - b _0806A4FC -_0806A378: + bne @0806A378 + b @0806A4FC +@0806A378: cmp r4, 0x3 - beq _0806A37E - b _0806A510 -_0806A37E: - b _0806A508 -_0806A380: + beq @0806A37E + b @0806A510 +@0806A37E: + b @0806A508 +@0806A380: adds r0, r5, 0 adds r0, 0x20 cmp r4, 0x1 - bne _0806A38A - b _0806A4FC -_0806A38A: + bne @0806A38A + b @0806A4FC +@0806A38A: cmp r4, 0x1 - ble _0806A306 + ble @0806A306 cmp r4, 0x2 - bne _0806A394 - b _0806A502 -_0806A394: - b _0806A378 -_0806A396: + bne @0806A394 + b @0806A502 +@0806A394: + b @0806A378 +@0806A396: adds r0, r5, 0 adds r0, 0x20 cmp r4, 0x1 - bne _0806A3A0 - b _0806A50E -_0806A3A0: + bne @0806A3A0 + b @0806A50E +@0806A3A0: cmp r4, 0x1 - bgt _0806A30E -_0806A3A4: + bgt @0806A30E +@0806A3A4: cmp r4, 0 - bne _0806A3AA - b _0806A508 -_0806A3AA: - b _0806A510 -_0806A3AC: + bne @0806A3AA + b @0806A508 +@0806A3AA: + b @0806A510 +@0806A3AC: adds r0, r5, 0 adds r0, 0x20 cmp r4, 0x1 - bne _0806A3B6 - b _0806A50E -_0806A3B6: + bne @0806A3B6 + b @0806A50E +@0806A3B6: cmp r4, 0x1 - ble _0806A3A4 - b _0806A32A -_0806A3BC: + ble @0806A3A4 + b @0806A32A +@0806A3BC: adds r0, r5, 0 adds r0, 0x20 cmp r4, 0x1 - bne _0806A3C6 - b _0806A50E -_0806A3C6: + bne @0806A3C6 + b @0806A50E +@0806A3C6: cmp r4, 0x1 - bgt _0806A3D2 -_0806A3CA: + bgt @0806A3D2 +@0806A3CA: cmp r4, 0 - bne _0806A3D0 - b _0806A502 -_0806A3D0: - b _0806A510 -_0806A3D2: + bne @0806A3D0 + b @0806A502 +@0806A3D0: + b @0806A510 +@0806A3D2: cmp r4, 0x2 - bne _0806A3D8 - b _0806A508 -_0806A3D8: - b _0806A314 -_0806A3DA: + bne @0806A3D8 + b @0806A508 +@0806A3D8: + b @0806A314 +@0806A3DA: adds r0, r5, 0 adds r0, 0x20 cmp r4, 0x1 - bne _0806A3E4 - b _0806A50E -_0806A3E4: + bne @0806A3E4 + b @0806A50E +@0806A3E4: cmp r4, 0x1 - bgt _0806A3EA - b _0806A4EC -_0806A3EA: + bgt @0806A3EA + b @0806A4EC +@0806A3EA: cmp r4, 0x2 - bne _0806A3F0 - b _0806A508 -_0806A3F0: - b _0806A330 -_0806A3F2: + bne @0806A3F0 + b @0806A508 +@0806A3F0: + b @0806A330 +@0806A3F2: adds r0, r5, 0 adds r0, 0x20 cmp r4, 0x1 - bne _0806A3FC - b _0806A50E -_0806A3FC: + bne @0806A3FC + b @0806A50E +@0806A3FC: cmp r4, 0x1 - ble _0806A3CA - b _0806A372 -_0806A402: + ble @0806A3CA + b @0806A372 +@0806A402: adds r0, r5, 0 adds r0, 0x20 cmp r4, 0x1 - bne _0806A40C - b _0806A50E -_0806A40C: + bne @0806A40C + b @0806A50E +@0806A40C: cmp r4, 0x1 - ble _0806A4EC + ble @0806A4EC cmp r4, 0x2 - beq _0806A502 - b _0806A378 -_0806A416: + beq @0806A502 + b @0806A378 +@0806A416: adds r0, r5, 0 adds r0, 0x20 cmp r4, 0x1 - beq _0806A502 + beq @0806A502 cmp r4, 0x1 - ble _0806A3A4 + ble @0806A3A4 cmp r4, 0x2 - beq _0806A50E - b _0806A314 -_0806A428: + beq @0806A50E + b @0806A314 +@0806A428: adds r0, r5, 0 adds r0, 0x20 cmp r4, 0x1 - beq _0806A4FC + beq @0806A4FC cmp r4, 0x1 - ble _0806A3A4 + ble @0806A3A4 cmp r4, 0x2 - beq _0806A50E - b _0806A330 -_0806A43A: + beq @0806A50E + b @0806A330 +@0806A43A: adds r0, r5, 0 adds r0, 0x20 cmp r4, 0x1 - beq _0806A508 + beq @0806A508 cmp r4, 0x1 - ble _0806A3CA + ble @0806A3CA cmp r4, 0x2 - beq _0806A50E - b _0806A314 -_0806A44C: + beq @0806A50E + b @0806A314 +@0806A44C: adds r0, r5, 0 adds r0, 0x20 cmp r4, 0x1 - beq _0806A508 + beq @0806A508 cmp r4, 0x1 - ble _0806A4EC + ble @0806A4EC cmp r4, 0x2 - beq _0806A50E - b _0806A330 -_0806A45E: + beq @0806A50E + b @0806A330 +@0806A45E: adds r0, r5, 0 adds r0, 0x20 cmp r4, 0x1 - beq _0806A4FC + beq @0806A4FC cmp r4, 0x1 - ble _0806A3CA + ble @0806A3CA cmp r4, 0x2 - beq _0806A50E - b _0806A378 -_0806A470: + beq @0806A50E + b @0806A378 +@0806A470: adds r0, r5, 0 adds r0, 0x20 cmp r4, 0x1 - beq _0806A502 + beq @0806A502 cmp r4, 0x1 - ble _0806A4EC + ble @0806A4EC cmp r4, 0x2 - beq _0806A50E - b _0806A378 -_0806A482: + beq @0806A50E + b @0806A378 +@0806A482: adds r0, r5, 0 adds r0, 0x20 cmp r4, 0x1 - beq _0806A502 + beq @0806A502 cmp r4, 0x1 - ble _0806A3A4 -_0806A48E: + ble @0806A3A4 +@0806A48E: cmp r4, 0x2 - beq _0806A4FC -_0806A492: + beq @0806A4FC +@0806A492: cmp r4, 0x3 - bne _0806A510 - b _0806A50E -_0806A498: + bne @0806A510 + b @0806A50E +@0806A498: adds r0, r5, 0 adds r0, 0x20 cmp r4, 0x1 - beq _0806A4FC + beq @0806A4FC cmp r4, 0x1 - bgt _0806A4A6 - b _0806A3A4 -_0806A4A6: + bgt @0806A4A6 + b @0806A3A4 +@0806A4A6: cmp r4, 0x2 - beq _0806A502 - b _0806A492 -_0806A4AC: + beq @0806A502 + b @0806A492 +@0806A4AC: adds r0, r5, 0 adds r0, 0x20 cmp r4, 0x1 - beq _0806A508 + beq @0806A508 cmp r4, 0x1 - ble _0806A3CA - b _0806A48E -_0806A4BA: + ble @0806A3CA + b @0806A48E +@0806A4BA: adds r0, r5, 0 adds r0, 0x20 cmp r4, 0x1 - beq _0806A508 + beq @0806A508 cmp r4, 0x1 - ble _0806A4EC + ble @0806A4EC cmp r4, 0x2 - beq _0806A502 - b _0806A492 -_0806A4CC: + beq @0806A502 + b @0806A492 +@0806A4CC: adds r0, r5, 0 adds r0, 0x20 cmp r4, 0x1 - beq _0806A4FC + beq @0806A4FC cmp r4, 0x1 - bgt _0806A4DA - b _0806A3CA -_0806A4DA: + bgt @0806A4DA + b @0806A3CA +@0806A4DA: cmp r4, 0x2 - beq _0806A508 - b _0806A492 -_0806A4E0: + beq @0806A508 + b @0806A492 +@0806A4E0: adds r0, r5, 0 adds r0, 0x20 cmp r4, 0x1 - beq _0806A502 + beq @0806A502 cmp r4, 0x1 - bgt _0806A4F2 -_0806A4EC: + bgt @0806A4F2 +@0806A4EC: cmp r4, 0 - beq _0806A4FC - b _0806A510 -_0806A4F2: + beq @0806A4FC + b @0806A510 +@0806A4F2: cmp r4, 0x2 - beq _0806A508 + beq @0806A508 cmp r4, 0x3 - beq _0806A50E - b _0806A510 -_0806A4FC: + beq @0806A50E + b @0806A510 +@0806A4FC: adds r6, r5, 0 adds r6, 0x44 - b _0806A510 -_0806A502: + b @0806A510 +@0806A502: adds r6, r5, 0 adds r6, 0x38 - b _0806A510 -_0806A508: + b @0806A510 +@0806A508: adds r6, r5, 0 adds r6, 0x2C - b _0806A510 -_0806A50E: + b @0806A510 +@0806A50E: adds r6, r0, 0 -_0806A510: +@0806A510: adds r0, r6, 0 pop {r4-r6} pop {r1} @@ -188644,166 +188644,166 @@ _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 adds r0, r3, 0 subs r0, 0x37 cmp r0, 0x21 - bls _0806A528 - b _0806A666 -_0806A528: + bls @0806A528 + b @0806A666 +@0806A528: lsls r0, 2 - ldr r1, =_0806A538 + ldr r1, =@0806A538 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0806A538: - .4byte _0806A5C0 - .4byte _0806A5C4 - .4byte _0806A5CC - .4byte _0806A5D4 - .4byte _0806A5DC - .4byte _0806A5EE - .4byte _0806A600 - .4byte _0806A612 - .4byte _0806A624 - .4byte _0806A65E - .4byte _0806A666 - .4byte _0806A666 - .4byte _0806A666 - .4byte _0806A666 - .4byte _0806A666 - .4byte _0806A666 - .4byte _0806A666 - .4byte _0806A666 - .4byte _0806A666 - .4byte _0806A666 - .4byte _0806A666 - .4byte _0806A666 - .4byte _0806A666 - .4byte _0806A666 - .4byte _0806A666 - .4byte _0806A666 - .4byte _0806A666 - .4byte _0806A666 - .4byte _0806A666 - .4byte _0806A636 - .4byte _0806A63E - .4byte _0806A646 - .4byte _0806A64E - .4byte _0806A656 -_0806A5C0: +@0806A538: + .4byte @0806A5C0 + .4byte @0806A5C4 + .4byte @0806A5CC + .4byte @0806A5D4 + .4byte @0806A5DC + .4byte @0806A5EE + .4byte @0806A600 + .4byte @0806A612 + .4byte @0806A624 + .4byte @0806A65E + .4byte @0806A666 + .4byte @0806A666 + .4byte @0806A666 + .4byte @0806A666 + .4byte @0806A666 + .4byte @0806A666 + .4byte @0806A666 + .4byte @0806A666 + .4byte @0806A666 + .4byte @0806A666 + .4byte @0806A666 + .4byte @0806A666 + .4byte @0806A666 + .4byte @0806A666 + .4byte @0806A666 + .4byte @0806A666 + .4byte @0806A666 + .4byte @0806A666 + .4byte @0806A666 + .4byte @0806A636 + .4byte @0806A63E + .4byte @0806A646 + .4byte @0806A64E + .4byte @0806A656 +@0806A5C0: ldr r0, [r4, 0x50] - b _0806A66E -_0806A5C4: + b @0806A66E +@0806A5C4: adds r0, r4, 0 adds r0, 0x54 ldrb r0, [r0] - b _0806A66E -_0806A5CC: + b @0806A66E +@0806A5CC: adds r0, r4, 0 adds r0, 0x56 ldrh r0, [r0] - b _0806A66E -_0806A5D4: + b @0806A66E +@0806A5D4: adds r0, r4, 0 adds r0, 0x58 ldrh r0, [r0] - b _0806A66E -_0806A5DC: + b @0806A66E +@0806A5DC: adds r0, r4, 0 movs r1, 0x1 bl get_pokemon_data_3 lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne _0806A66E - b _0806A636 -_0806A5EE: + bne @0806A66E + b @0806A636 +@0806A5EE: adds r0, r4, 0 movs r1, 0x2 bl get_pokemon_data_3 lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne _0806A66E - b _0806A63E -_0806A600: + bne @0806A66E + b @0806A63E +@0806A600: adds r0, r4, 0 movs r1, 0x3 bl get_pokemon_data_3 lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne _0806A66E - b _0806A646 -_0806A612: + bne @0806A66E + b @0806A646 +@0806A612: adds r0, r4, 0 movs r1, 0x4 bl get_pokemon_data_3 lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne _0806A66E - b _0806A64E -_0806A624: + bne @0806A66E + b @0806A64E +@0806A624: adds r0, r4, 0 movs r1, 0x5 bl get_pokemon_data_3 lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne _0806A66E - b _0806A656 -_0806A636: + bne @0806A66E + b @0806A656 +@0806A636: adds r0, r4, 0 adds r0, 0x5A ldrh r0, [r0] - b _0806A66E -_0806A63E: + b @0806A66E +@0806A63E: adds r0, r4, 0 adds r0, 0x5C ldrh r0, [r0] - b _0806A66E -_0806A646: + b @0806A66E +@0806A646: adds r0, r4, 0 adds r0, 0x5E ldrh r0, [r0] - b _0806A66E -_0806A64E: + b @0806A66E +@0806A64E: adds r0, r4, 0 adds r0, 0x60 ldrh r0, [r0] - b _0806A66E -_0806A656: + b @0806A66E +@0806A656: adds r0, r4, 0 adds r0, 0x62 ldrh r0, [r0] - b _0806A66E -_0806A65E: + b @0806A66E +@0806A65E: adds r0, r4, 0 adds r0, 0x55 ldrb r0, [r0] - b _0806A66E -_0806A666: + b @0806A66E +@0806A666: adds r0, r4, 0 adds r1, r3, 0 bl pokemon_getattr_encrypted -_0806A66E: +@0806A66E: pop {r4} pop {r1} bx r1 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 @@ -188819,7 +188819,7 @@ pokemon_getattr_encrypted: @ 806A674 movs r7, 0 movs r5, 0 cmp r1, 0xA - ble _0806A6F2 + ble @0806A6F2 ldr r1, [r0] movs r2, 0 bl pokemon_data_permutator @@ -188849,7 +188849,7 @@ pokemon_getattr_encrypted: @ 806A674 mov r1, r8 ldrh r1, [r1, 0x1C] cmp r0, r1 - beq _0806A6F2 + beq @0806A6F2 mov r2, r8 ldrb r0, [r2, 0x13] movs r1, 0x1 @@ -188861,147 +188861,147 @@ pokemon_getattr_encrypted: @ 806A674 movs r1, 0x40 orrs r0, r1 strb r0, [r5, 0x7] -_0806A6F2: +@0806A6F2: ldr r0, [sp] cmp r0, 0x53 - bls _0806A6FA - b _0806AC8C -_0806A6FA: + bls @0806A6FA + b @0806AC8C +@0806A6FA: lsls r0, 2 - ldr r1, =_0806A708 + ldr r1, =@0806A708 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0806A708: - .4byte _0806A858 - .4byte _0806A85E - .4byte _0806A864 - .4byte _0806A918 - .4byte _0806A91E - .4byte _0806A924 - .4byte _0806A92A - .4byte _0806A930 - .4byte _0806A94C - .4byte _0806A952 - .4byte _0806A958 - .4byte _0806A95E - .4byte _0806A976 - .4byte _0806A98E - .4byte _0806A98E - .4byte _0806A98E - .4byte _0806A98E - .4byte _0806A99A - .4byte _0806A99A - .4byte _0806A99A - .4byte _0806A99A - .4byte _0806A982 - .4byte _0806A9BC - .4byte _0806A9C0 - .4byte _0806A9C4 - .4byte _0806A97C - .4byte _0806A9A4 - .4byte _0806A9A8 - .4byte _0806A9AC - .4byte _0806A9B0 - .4byte _0806A9B4 - .4byte _0806A9B8 - .4byte _0806A988 - .4byte _0806A9C8 - .4byte _0806A9D4 - .4byte _0806A9D8 - .4byte _0806A9DC - .4byte _0806A9E4 - .4byte _0806A9EC - .4byte _0806A9F6 - .4byte _0806A9FE - .4byte _0806AA06 - .4byte _0806AA0E - .4byte _0806AA16 - .4byte _0806AA1E - .4byte _0806AA26 - .4byte _0806AA2A - .4byte _0806A9CC - .4byte _0806A9D0 - .4byte _0806A9F0 - .4byte _0806AA30 - .4byte _0806AA38 - .4byte _0806AA40 - .4byte _0806AA48 - .4byte _0806AA50 - .4byte _0806AC8C - .4byte _0806AC8C - .4byte _0806AC8C - .4byte _0806AC8C - .4byte _0806AC8C - .4byte _0806AC8C - .4byte _0806AC8C - .4byte _0806AC8C - .4byte _0806AC8C - .4byte _0806AC8C - .4byte _0806AAB6 - .4byte _0806AADC - .4byte _0806AA58 - .4byte _0806AA5E - .4byte _0806AA62 - .4byte _0806AA66 - .4byte _0806AA6A - .4byte _0806AA72 - .4byte _0806AA7A - .4byte _0806AA82 - .4byte _0806AA8A - .4byte _0806AA90 - .4byte _0806AA98 - .4byte _0806AAA0 - .4byte _0806AAA8 - .4byte _0806AAB0 - .4byte _0806AB16 - .4byte _0806AB70 - .4byte _0806ABF2 -_0806A858: +@0806A708: + .4byte @0806A858 + .4byte @0806A85E + .4byte @0806A864 + .4byte @0806A918 + .4byte @0806A91E + .4byte @0806A924 + .4byte @0806A92A + .4byte @0806A930 + .4byte @0806A94C + .4byte @0806A952 + .4byte @0806A958 + .4byte @0806A95E + .4byte @0806A976 + .4byte @0806A98E + .4byte @0806A98E + .4byte @0806A98E + .4byte @0806A98E + .4byte @0806A99A + .4byte @0806A99A + .4byte @0806A99A + .4byte @0806A99A + .4byte @0806A982 + .4byte @0806A9BC + .4byte @0806A9C0 + .4byte @0806A9C4 + .4byte @0806A97C + .4byte @0806A9A4 + .4byte @0806A9A8 + .4byte @0806A9AC + .4byte @0806A9B0 + .4byte @0806A9B4 + .4byte @0806A9B8 + .4byte @0806A988 + .4byte @0806A9C8 + .4byte @0806A9D4 + .4byte @0806A9D8 + .4byte @0806A9DC + .4byte @0806A9E4 + .4byte @0806A9EC + .4byte @0806A9F6 + .4byte @0806A9FE + .4byte @0806AA06 + .4byte @0806AA0E + .4byte @0806AA16 + .4byte @0806AA1E + .4byte @0806AA26 + .4byte @0806AA2A + .4byte @0806A9CC + .4byte @0806A9D0 + .4byte @0806A9F0 + .4byte @0806AA30 + .4byte @0806AA38 + .4byte @0806AA40 + .4byte @0806AA48 + .4byte @0806AA50 + .4byte @0806AC8C + .4byte @0806AC8C + .4byte @0806AC8C + .4byte @0806AC8C + .4byte @0806AC8C + .4byte @0806AC8C + .4byte @0806AC8C + .4byte @0806AC8C + .4byte @0806AC8C + .4byte @0806AC8C + .4byte @0806AAB6 + .4byte @0806AADC + .4byte @0806AA58 + .4byte @0806AA5E + .4byte @0806AA62 + .4byte @0806AA66 + .4byte @0806AA6A + .4byte @0806AA72 + .4byte @0806AA7A + .4byte @0806AA82 + .4byte @0806AA8A + .4byte @0806AA90 + .4byte @0806AA98 + .4byte @0806AAA0 + .4byte @0806AAA8 + .4byte @0806AAB0 + .4byte @0806AB16 + .4byte @0806AB70 + .4byte @0806ABF2 +@0806A858: mov r1, r8 ldr r4, [r1] - b _0806AC8C -_0806A85E: + b @0806AC8C +@0806A85E: mov r2, r8 ldr r4, [r2, 0x4] - b _0806AC8C -_0806A864: + b @0806AC8C +@0806A864: mov r0, r8 ldrb r1, [r0, 0x13] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0806A89C + beq @0806A89C movs r4, 0 ldr r0, =0x085ccb90 ldrb r1, [r0] adds r2, r0, 0 cmp r1, 0xFF - beq _0806A944 + beq @0806A944 adds r3, r2, 0 -_0806A87E: +@0806A87E: adds r0, r6, r4 adds r1, r4, r3 ldrb r1, [r1] strb r1, [r0] adds r4, 0x1 cmp r4, 0x9 - bhi _0806A944 + bhi @0806A944 adds r0, r4, r2 ldrb r0, [r0] cmp r0, 0xFF - bne _0806A87E - b _0806A944 + bne @0806A87E + b @0806A944 .align 2, 0 .pool -_0806A89C: +@0806A89C: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0806A8BC + beq @0806A8BC ldr r1, =0x085e8264 adds r0, r6, 0 bl gf_strcpy @@ -189009,14 +189009,14 @@ _0806A89C: bl sub_8008C24 lsls r0, 16 lsrs r4, r0, 16 - b _0806AC8C + b @0806AC8C .align 2, 0 .pool -_0806A8BC: +@0806A8BC: mov r1, r8 ldrb r0, [r1, 0x12] cmp r0, 0x1 - bne _0806A902 + bne @0806A902 movs r0, 0xFC strb r0, [r6] movs r0, 0x15 @@ -189025,10 +189025,10 @@ _0806A8BC: movs r3, 0 ldrb r0, [r1, 0x8] cmp r0, 0xFF - beq _0806A8F0 + beq @0806A8F0 mov r2, r8 adds r2, 0x8 -_0806A8DA: +@0806A8DA: adds r1, r6, r4 ldrb r0, [r2] strb r0, [r1] @@ -189036,11 +189036,11 @@ _0806A8DA: adds r2, 0x1 adds r3, 0x1 cmp r3, 0x4 - bgt _0806A8F0 + bgt @0806A8F0 ldrb r0, [r2] cmp r0, 0xFF - bne _0806A8DA -_0806A8F0: + bne @0806A8DA +@0806A8F0: adds r1, r6, r4 movs r0, 0xFC strb r0, [r1] @@ -189049,66 +189049,66 @@ _0806A8F0: movs r0, 0x16 strb r0, [r1] adds r4, 0x1 - b _0806A944 -_0806A902: + b @0806A944 +@0806A902: movs r4, 0 mov r2, r8 adds r2, 0x8 -_0806A908: +@0806A908: adds r0, r6, r4 adds r1, r2, r4 ldrb r1, [r1] strb r1, [r0] adds r4, 0x1 cmp r4, 0x9 - bls _0806A908 - b _0806A944 -_0806A918: + bls @0806A908 + b @0806A944 +@0806A918: mov r2, r8 ldrb r4, [r2, 0x12] - b _0806AC8C -_0806A91E: + b @0806AC8C +@0806A91E: mov r6, r8 ldrb r0, [r6, 0x13] - b _0806AA92 -_0806A924: + b @0806AA92 +@0806A924: mov r1, r8 ldrb r0, [r1, 0x13] - b _0806AA9A -_0806A92A: + b @0806AA9A +@0806A92A: mov r2, r8 ldrb r0, [r2, 0x13] - b _0806AAA2 -_0806A930: + b @0806AAA2 +@0806A930: movs r4, 0 mov r2, r8 adds r2, 0x14 -_0806A936: +@0806A936: adds r0, r6, r4 adds r1, r2, r4 ldrb r1, [r1] strb r1, [r0] adds r4, 0x1 cmp r4, 0x6 - bls _0806A936 -_0806A944: + bls @0806A936 +@0806A944: adds r1, r6, r4 movs r0, 0xFF strb r0, [r1] - b _0806AC8C -_0806A94C: + b @0806AC8C +@0806A94C: mov r6, r8 ldrb r4, [r6, 0x1B] - b _0806AC8C -_0806A952: + b @0806AC8C +@0806A952: mov r0, r8 ldrh r4, [r0, 0x1C] - b _0806AC8C -_0806A958: + b @0806AC8C +@0806A958: mov r1, r8 ldrh r4, [r1, 0x1E] - b _0806AC8C -_0806A95E: + b @0806AC8C +@0806A95E: mov r2, r8 ldrb r1, [r2, 0x13] movs r0, 0x1 @@ -189116,251 +189116,251 @@ _0806A95E: movs r4, 0xCE lsls r4, 1 cmp r0, 0 - beq _0806A970 - b _0806AC8C -_0806A970: + beq @0806A970 + b @0806AC8C +@0806A970: mov r6, r9 ldrh r4, [r6] - b _0806AC8C -_0806A976: + b @0806AC8C +@0806A976: mov r0, r9 ldrh r4, [r0, 0x2] - b _0806AC8C -_0806A97C: + b @0806AC8C +@0806A97C: mov r1, r9 ldr r4, [r1, 0x4] - b _0806AC8C -_0806A982: + b @0806AC8C +@0806A982: mov r2, r9 ldrb r4, [r2, 0x8] - b _0806AC8C -_0806A988: + b @0806AC8C +@0806A988: mov r6, r9 ldrb r4, [r6, 0x9] - b _0806AC8C -_0806A98E: + b @0806AC8C +@0806A98E: ldr r0, [sp] subs r0, 0xD lsls r0, 1 add r0, r10 ldrh r4, [r0] - b _0806AC8C -_0806A99A: + b @0806AC8C +@0806A99A: ldr r0, [sp] add r0, r10 subs r0, 0x9 ldrb r4, [r0] - b _0806AC8C -_0806A9A4: + b @0806AC8C +@0806A9A4: ldrb r4, [r7] - b _0806AC8C -_0806A9A8: + b @0806AC8C +@0806A9A8: ldrb r4, [r7, 0x1] - b _0806AC8C -_0806A9AC: + b @0806AC8C +@0806A9AC: ldrb r4, [r7, 0x2] - b _0806AC8C -_0806A9B0: + b @0806AC8C +@0806A9B0: ldrb r4, [r7, 0x3] - b _0806AC8C -_0806A9B4: + b @0806AC8C +@0806A9B4: ldrb r4, [r7, 0x4] - b _0806AC8C -_0806A9B8: + b @0806AC8C +@0806A9B8: ldrb r4, [r7, 0x5] - b _0806AC8C -_0806A9BC: + b @0806AC8C +@0806A9BC: ldrb r4, [r7, 0x6] - b _0806AC8C -_0806A9C0: + b @0806AC8C +@0806A9C0: ldrb r4, [r7, 0x7] - b _0806AC8C -_0806A9C4: + b @0806AC8C +@0806A9C4: ldrb r4, [r7, 0x8] - b _0806AC8C -_0806A9C8: + b @0806AC8C +@0806A9C8: ldrb r4, [r7, 0x9] - b _0806AC8C -_0806A9CC: + b @0806AC8C +@0806A9CC: ldrb r4, [r7, 0xA] - b _0806AC8C -_0806A9D0: + b @0806AC8C +@0806A9D0: ldrb r4, [r7, 0xB] - b _0806AC8C -_0806A9D4: + b @0806AC8C +@0806A9D4: ldrb r4, [r5] - b _0806AC8C -_0806A9D8: + b @0806AC8C +@0806A9D8: ldrb r4, [r5, 0x1] - b _0806AC8C -_0806A9DC: + b @0806AC8C +@0806A9DC: ldrb r0, [r5, 0x2] lsls r0, 25 lsrs r4, r0, 25 - b _0806AC8C -_0806A9E4: + b @0806AC8C +@0806A9E4: ldrh r0, [r5, 0x2] lsls r0, 21 lsrs r4, r0, 28 - b _0806AC8C -_0806A9EC: + b @0806AC8C +@0806A9EC: ldrb r0, [r5, 0x3] - b _0806AAAA -_0806A9F0: + b @0806AAAA +@0806A9F0: ldrb r0, [r5, 0x3] lsrs r4, r0, 7 - b _0806AC8C -_0806A9F6: + b @0806AC8C +@0806A9F6: ldrb r0, [r5, 0x4] lsls r0, 27 lsrs r4, r0, 27 - b _0806AC8C -_0806A9FE: + b @0806AC8C +@0806A9FE: ldrh r0, [r5, 0x4] lsls r0, 22 lsrs r4, r0, 27 - b _0806AC8C -_0806AA06: + b @0806AC8C +@0806AA06: ldrb r0, [r5, 0x5] lsls r0, 25 lsrs r4, r0, 27 - b _0806AC8C -_0806AA0E: + b @0806AC8C +@0806AA0E: ldr r0, [r5, 0x4] lsls r0, 12 lsrs r4, r0, 27 - b _0806AC8C -_0806AA16: + b @0806AC8C +@0806AA16: ldrh r0, [r5, 0x6] lsls r0, 23 lsrs r4, r0, 27 - b _0806AC8C -_0806AA1E: + b @0806AC8C +@0806AA1E: ldrb r0, [r5, 0x7] lsls r0, 26 lsrs r4, r0, 27 - b _0806AC8C -_0806AA26: + b @0806AC8C +@0806AA26: ldrb r0, [r5, 0x7] - b _0806AA84 -_0806AA2A: + b @0806AA84 +@0806AA2A: ldrb r0, [r5, 0x7] lsrs r4, r0, 7 - b _0806AC8C -_0806AA30: + b @0806AC8C +@0806AA30: ldrb r0, [r5, 0x8] lsls r0, 29 lsrs r4, r0, 29 - b _0806AC8C -_0806AA38: + b @0806AC8C +@0806AA38: ldrb r0, [r5, 0x8] lsls r0, 26 lsrs r4, r0, 29 - b _0806AC8C -_0806AA40: + b @0806AC8C +@0806AA40: ldrh r0, [r5, 0x8] lsls r0, 23 lsrs r4, r0, 29 - b _0806AC8C -_0806AA48: + b @0806AC8C +@0806AA48: ldrb r0, [r5, 0x9] lsls r0, 28 lsrs r4, r0, 29 - b _0806AC8C -_0806AA50: + b @0806AC8C +@0806AA50: ldrb r0, [r5, 0x9] lsls r0, 25 lsrs r4, r0, 29 - b _0806AC8C -_0806AA58: + b @0806AC8C +@0806AA58: ldrb r0, [r5, 0x9] lsrs r4, r0, 7 - b _0806AC8C -_0806AA5E: + b @0806AC8C +@0806AA5E: ldrb r0, [r5, 0xA] - b _0806AA92 -_0806AA62: + b @0806AA92 +@0806AA62: ldrb r0, [r5, 0xA] - b _0806AA9A -_0806AA66: + b @0806AA9A +@0806AA66: ldrb r0, [r5, 0xA] - b _0806AAA2 -_0806AA6A: + b @0806AAA2 +@0806AA6A: ldrb r0, [r5, 0xA] lsls r0, 28 lsrs r4, r0, 31 - b _0806AC8C -_0806AA72: + b @0806AC8C +@0806AA72: ldrb r0, [r5, 0xA] lsls r0, 27 lsrs r4, r0, 31 - b _0806AC8C -_0806AA7A: + b @0806AC8C +@0806AA7A: ldrb r0, [r5, 0xA] lsls r0, 26 lsrs r4, r0, 31 - b _0806AC8C -_0806AA82: + b @0806AC8C +@0806AA82: ldrb r0, [r5, 0xA] -_0806AA84: +@0806AA84: lsls r0, 25 lsrs r4, r0, 31 - b _0806AC8C -_0806AA8A: + b @0806AC8C +@0806AA8A: ldrb r0, [r5, 0xA] lsrs r4, r0, 7 - b _0806AC8C -_0806AA90: + b @0806AC8C +@0806AA90: ldrb r0, [r5, 0xB] -_0806AA92: +@0806AA92: lsls r0, 31 lsrs r4, r0, 31 - b _0806AC8C -_0806AA98: + b @0806AC8C +@0806AA98: ldrb r0, [r5, 0xB] -_0806AA9A: +@0806AA9A: lsls r0, 30 lsrs r4, r0, 31 - b _0806AC8C -_0806AAA0: + b @0806AC8C +@0806AAA0: ldrb r0, [r5, 0xB] -_0806AAA2: +@0806AAA2: lsls r0, 29 lsrs r4, r0, 31 - b _0806AC8C -_0806AAA8: + b @0806AC8C +@0806AAA8: ldrb r0, [r5, 0xB] -_0806AAAA: +@0806AAAA: lsls r0, 25 lsrs r4, r0, 28 - b _0806AC8C -_0806AAB0: + b @0806AC8C +@0806AAB0: ldrb r0, [r5, 0xB] lsrs r4, r0, 7 - b _0806AC8C -_0806AAB6: + b @0806AC8C +@0806AAB6: mov r0, r9 ldrh r4, [r0] cmp r4, 0 - bne _0806AAC0 - b _0806AC8C -_0806AAC0: + bne @0806AAC0 + b @0806AC8C +@0806AAC0: ldrb r0, [r5, 0x7] lsls r0, 25 cmp r0, 0 - blt _0806AAD6 + blt @0806AAD6 mov r2, r8 ldrb r1, [r2, 0x13] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0806AAD6 - b _0806AC8C -_0806AAD6: + bne @0806AAD6 + b @0806AC8C +@0806AAD6: movs r4, 0xCE lsls r4, 1 - b _0806AC8C -_0806AADC: + b @0806AC8C +@0806AADC: ldrb r0, [r5, 0x4] lsls r0, 27 lsrs r4, r0, 27 @@ -189389,71 +189389,71 @@ _0806AADC: lsrs r0, 27 lsls r0, 25 orrs r4, r0 - b _0806AC8C -_0806AB16: + b @0806AC8C +@0806AB16: mov r1, r9 ldrh r0, [r1] cmp r0, 0 - bne _0806AB20 - b _0806AC8C -_0806AB20: + bne @0806AB20 + b @0806AC8C +@0806AB20: ldrb r0, [r5, 0x7] lsls r0, 25 cmp r0, 0 - bge _0806AB2A - b _0806AC8C -_0806AB2A: + bge @0806AB2A + b @0806AC8C +@0806AB2A: ldrh r0, [r6] ldr r1, =0x00000163 cmp r0, r1 - bne _0806AB34 - b _0806AC8C -_0806AB34: + bne @0806AB34 + b @0806AC8C +@0806AB34: mov r2, r10 ldrh r5, [r2] adds r7, r1, 0 adds r2, r6, 0 ldr r1, =0x0832a328 -_0806AB3E: +@0806AB3E: ldrh r3, [r2] cmp r5, r3 - beq _0806AB58 + beq @0806AB58 mov r6, r10 ldrh r0, [r6, 0x2] cmp r0, r3 - beq _0806AB58 + beq @0806AB58 ldrh r0, [r6, 0x4] cmp r0, r3 - beq _0806AB58 + beq @0806AB58 ldrh r0, [r6, 0x6] cmp r0, r3 - bne _0806AB5C -_0806AB58: + bne @0806AB5C +@0806AB58: ldr r0, [r1] orrs r4, r0 -_0806AB5C: +@0806AB5C: adds r2, 0x2 adds r1, 0x4 ldrh r0, [r2] cmp r0, r7 - bne _0806AB3E - b _0806AC8C + bne @0806AB3E + b @0806AC8C .align 2, 0 .pool -_0806AB70: +@0806AB70: movs r4, 0 mov r1, r9 ldrh r0, [r1] cmp r0, 0 - bne _0806AB7C - b _0806AC8C -_0806AB7C: + bne @0806AB7C + b @0806AC8C +@0806AB7C: ldrb r0, [r5, 0x7] lsls r0, 25 cmp r0, 0 - bge _0806AB86 - b _0806AC8C -_0806AB86: + bge @0806AB86 + b @0806AC8C +@0806AB86: ldrb r0, [r5, 0x8] lsls r1, r0, 29 lsrs r4, r1, 29 @@ -189507,17 +189507,17 @@ _0806AB86: lsls r1, 29 lsrs r1, 31 adds r4, r1 - b _0806AC8C -_0806ABF2: + b @0806AC8C +@0806ABF2: movs r4, 0 mov r2, r9 ldrh r0, [r2] cmp r0, 0 - beq _0806AC8C + beq @0806AC8C ldrb r0, [r5, 0x7] lsls r0, 25 cmp r0, 0 - blt _0806AC8C + blt @0806AC8C ldrb r2, [r5, 0x9] lsrs r4, r2, 7 ldrb r1, [r5, 0x8] @@ -189586,13 +189586,13 @@ _0806ABF2: lsrs r1, 31 lsls r1, 26 orrs r4, r1 -_0806AC8C: +@0806AC8C: ldr r6, [sp] cmp r6, 0xA - ble _0806AC98 + ble @0806AC98 mov r0, r8 bl pokemon_encrypt -_0806AC98: +@0806AC98: adds r0, r4, 0 add sp, 0x4 pop {r3-r5} @@ -189605,35 +189605,35 @@ _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 subs r0, 0x37 cmp r0, 0xA - bhi _0806AD90 + bhi @0806AD90 lsls r0, 2 - ldr r1, =_0806ACC8 + ldr r1, =@0806ACC8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0806ACC8: - .4byte _0806ACF4 - .4byte _0806AD0C - .4byte _0806AD16 - .4byte _0806AD26 - .4byte _0806AD36 - .4byte _0806AD46 - .4byte _0806AD56 - .4byte _0806AD66 - .4byte _0806AD76 - .4byte _0806AD86 - .4byte _0806AD96 -_0806ACF4: +@0806ACC8: + .4byte @0806ACF4 + .4byte @0806AD0C + .4byte @0806AD16 + .4byte @0806AD26 + .4byte @0806AD36 + .4byte @0806AD46 + .4byte @0806AD56 + .4byte @0806AD66 + .4byte @0806AD76 + .4byte @0806AD86 + .4byte @0806AD96 +@0806ACF4: ldrb r1, [r2] ldrb r0, [r2, 0x1] lsls r0, 8 @@ -189645,14 +189645,14 @@ _0806ACF4: lsls r0, 24 adds r1, r0 str r1, [r3, 0x50] - b _0806AD96 -_0806AD0C: + b @0806AD96 +@0806AD0C: ldrb r1, [r2] adds r0, r3, 0 adds r0, 0x54 strb r1, [r0] - b _0806AD96 -_0806AD16: + b @0806AD96 +@0806AD16: ldrb r0, [r2] ldrb r1, [r2, 0x1] lsls r1, 8 @@ -189660,8 +189660,8 @@ _0806AD16: adds r1, r3, 0 adds r1, 0x56 strh r0, [r1] - b _0806AD96 -_0806AD26: + b @0806AD96 +@0806AD26: ldrb r0, [r2] ldrb r1, [r2, 0x1] lsls r1, 8 @@ -189669,8 +189669,8 @@ _0806AD26: adds r1, r3, 0 adds r1, 0x58 strh r0, [r1] - b _0806AD96 -_0806AD36: + b @0806AD96 +@0806AD36: ldrb r0, [r2] ldrb r1, [r2, 0x1] lsls r1, 8 @@ -189678,8 +189678,8 @@ _0806AD36: adds r1, r3, 0 adds r1, 0x5A strh r0, [r1] - b _0806AD96 -_0806AD46: + b @0806AD96 +@0806AD46: ldrb r0, [r2] ldrb r1, [r2, 0x1] lsls r1, 8 @@ -189687,8 +189687,8 @@ _0806AD46: adds r1, r3, 0 adds r1, 0x5C strh r0, [r1] - b _0806AD96 -_0806AD56: + b @0806AD96 +@0806AD56: ldrb r0, [r2] ldrb r1, [r2, 0x1] lsls r1, 8 @@ -189696,8 +189696,8 @@ _0806AD56: adds r1, r3, 0 adds r1, 0x5E strh r0, [r1] - b _0806AD96 -_0806AD66: + b @0806AD96 +@0806AD66: ldrb r0, [r2] ldrb r1, [r2, 0x1] lsls r1, 8 @@ -189705,8 +189705,8 @@ _0806AD66: adds r1, r3, 0 adds r1, 0x60 strh r0, [r1] - b _0806AD96 -_0806AD76: + b @0806AD96 +@0806AD76: ldrb r0, [r2] ldrb r1, [r2, 0x1] lsls r1, 8 @@ -189714,24 +189714,24 @@ _0806AD76: adds r1, r3, 0 adds r1, 0x62 strh r0, [r1] - b _0806AD96 -_0806AD86: + b @0806AD96 +@0806AD86: ldrb r1, [r2] adds r0, r3, 0 adds r0, 0x55 strb r1, [r0] - b _0806AD96 -_0806AD90: + b @0806AD96 +@0806AD90: adds r0, r3, 0 bl pokemon_setattr_encrypted -_0806AD96: +@0806AD96: pop {r0} bx r0 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 @@ -189746,7 +189746,7 @@ pokemon_setattr_encrypted: @ 806AD9C movs r6, 0 movs r5, 0 cmp r1, 0xA - ble _0806AE1C + ble @0806AE1C ldr r1, [r7] adds r0, r7, 0 movs r2, 0 @@ -189775,7 +189775,7 @@ pokemon_setattr_encrypted: @ 806AD9C lsrs r0, 16 ldrh r1, [r7, 0x1C] cmp r0, r1 - beq _0806AE1C + beq @0806AE1C ldrb r0, [r7, 0x13] movs r1, 0x1 orrs r0, r1 @@ -189788,104 +189788,104 @@ pokemon_setattr_encrypted: @ 806AD9C strb r0, [r5, 0x7] adds r0, r7, 0 bl pokemon_encrypt - b _0806B3EC -_0806AE1C: + b @0806B3EC +@0806AE1C: mov r0, r10 cmp r0, 0x50 - bls _0806AE24 - b _0806B3D8 -_0806AE24: + bls @0806AE24 + b @0806B3D8 +@0806AE24: lsls r0, 2 - ldr r1, =_0806AE34 + ldr r1, =@0806AE34 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0806AE34: - .4byte _0806AF78 - .4byte _0806AF90 - .4byte _0806AFA8 - .4byte _0806AFBE - .4byte _0806AFC4 - .4byte _0806AFD4 - .4byte _0806AFE6 - .4byte _0806AFF8 - .4byte _0806B00E - .4byte _0806B014 - .4byte _0806B020 - .4byte _0806B02C - .4byte _0806B04C - .4byte _0806B084 - .4byte _0806B084 - .4byte _0806B084 - .4byte _0806B084 - .4byte _0806B098 - .4byte _0806B098 - .4byte _0806B098 - .4byte _0806B098 - .4byte _0806B074 - .4byte _0806B0C8 - .4byte _0806B0CE - .4byte _0806B0D4 - .4byte _0806B05A - .4byte _0806B0A4 - .4byte _0806B0AA - .4byte _0806B0B0 - .4byte _0806B0B6 - .4byte _0806B0BC - .4byte _0806B0C2 - .4byte _0806B07C - .4byte _0806B0DA - .4byte _0806B0EC - .4byte _0806B0F2 - .4byte _0806B0F8 - .4byte _0806B10C - .4byte _0806B124 - .4byte _0806B14A - .4byte _0806B15E - .4byte _0806B178 - .4byte _0806B18E - .4byte _0806B1A8 - .4byte _0806B1C0 - .4byte _0806B1D4 - .4byte _0806B204 - .4byte _0806B0E0 - .4byte _0806B0E6 - .4byte _0806B13A - .4byte _0806B214 - .4byte _0806B222 - .4byte _0806B238 - .4byte _0806B250 - .4byte _0806B260 - .4byte _0806B3D8 - .4byte _0806B3D8 - .4byte _0806B3D8 - .4byte _0806B3D8 - .4byte _0806B3D8 - .4byte _0806B3D8 - .4byte _0806B3D8 - .4byte _0806B3D8 - .4byte _0806B3D8 - .4byte _0806B3D8 - .4byte _0806B3D8 - .4byte _0806B35E - .4byte _0806B276 - .4byte _0806B286 - .4byte _0806B294 - .4byte _0806B2A4 - .4byte _0806B2B4 - .4byte _0806B2C4 - .4byte _0806B2D4 - .4byte _0806B2E4 - .4byte _0806B2FA - .4byte _0806B30A - .4byte _0806B318 - .4byte _0806B328 - .4byte _0806B338 - .4byte _0806B34E -_0806AF78: +@0806AE34: + .4byte @0806AF78 + .4byte @0806AF90 + .4byte @0806AFA8 + .4byte @0806AFBE + .4byte @0806AFC4 + .4byte @0806AFD4 + .4byte @0806AFE6 + .4byte @0806AFF8 + .4byte @0806B00E + .4byte @0806B014 + .4byte @0806B020 + .4byte @0806B02C + .4byte @0806B04C + .4byte @0806B084 + .4byte @0806B084 + .4byte @0806B084 + .4byte @0806B084 + .4byte @0806B098 + .4byte @0806B098 + .4byte @0806B098 + .4byte @0806B098 + .4byte @0806B074 + .4byte @0806B0C8 + .4byte @0806B0CE + .4byte @0806B0D4 + .4byte @0806B05A + .4byte @0806B0A4 + .4byte @0806B0AA + .4byte @0806B0B0 + .4byte @0806B0B6 + .4byte @0806B0BC + .4byte @0806B0C2 + .4byte @0806B07C + .4byte @0806B0DA + .4byte @0806B0EC + .4byte @0806B0F2 + .4byte @0806B0F8 + .4byte @0806B10C + .4byte @0806B124 + .4byte @0806B14A + .4byte @0806B15E + .4byte @0806B178 + .4byte @0806B18E + .4byte @0806B1A8 + .4byte @0806B1C0 + .4byte @0806B1D4 + .4byte @0806B204 + .4byte @0806B0E0 + .4byte @0806B0E6 + .4byte @0806B13A + .4byte @0806B214 + .4byte @0806B222 + .4byte @0806B238 + .4byte @0806B250 + .4byte @0806B260 + .4byte @0806B3D8 + .4byte @0806B3D8 + .4byte @0806B3D8 + .4byte @0806B3D8 + .4byte @0806B3D8 + .4byte @0806B3D8 + .4byte @0806B3D8 + .4byte @0806B3D8 + .4byte @0806B3D8 + .4byte @0806B3D8 + .4byte @0806B3D8 + .4byte @0806B35E + .4byte @0806B276 + .4byte @0806B286 + .4byte @0806B294 + .4byte @0806B2A4 + .4byte @0806B2B4 + .4byte @0806B2C4 + .4byte @0806B2D4 + .4byte @0806B2E4 + .4byte @0806B2FA + .4byte @0806B30A + .4byte @0806B318 + .4byte @0806B328 + .4byte @0806B338 + .4byte @0806B34E +@0806AF78: ldrb r1, [r4] ldrb r0, [r4, 0x1] lsls r0, 8 @@ -189897,8 +189897,8 @@ _0806AF78: lsls r0, 24 adds r1, r0 str r1, [r7] - b _0806B3D8 -_0806AF90: + b @0806B3D8 +@0806AF90: ldrb r1, [r4] ldrb r0, [r4, 0x1] lsls r0, 8 @@ -189910,25 +189910,25 @@ _0806AF90: lsls r0, 24 adds r1, r0 str r1, [r7, 0x4] - b _0806B3D8 -_0806AFA8: + b @0806B3D8 +@0806AFA8: movs r2, 0 adds r3, r7, 0 adds r3, 0x8 -_0806AFAE: +@0806AFAE: adds r0, r3, r2 adds r1, r4, r2 ldrb r1, [r1] strb r1, [r0] adds r2, 0x1 cmp r2, 0x9 - ble _0806AFAE - b _0806B3D8 -_0806AFBE: + ble @0806AFAE + b @0806B3D8 +@0806AFBE: ldrb r0, [r4] strb r0, [r7, 0x12] - b _0806B3D8 -_0806AFC4: + b @0806B3D8 +@0806AFC4: ldrb r0, [r4] movs r1, 0x1 ands r1, r0 @@ -189936,8 +189936,8 @@ _0806AFC4: movs r0, 0x2 negs r0, r0 ands r0, r2 - b _0806B1F2 -_0806AFD4: + b @0806B1F2 +@0806AFD4: ldrb r0, [r4] movs r1, 0x1 ands r1, r0 @@ -189946,8 +189946,8 @@ _0806AFD4: movs r0, 0x3 negs r0, r0 ands r0, r2 - b _0806B1F2 -_0806AFE6: + b @0806B1F2 +@0806AFE6: ldrb r0, [r4] movs r1, 0x1 ands r1, r0 @@ -189956,39 +189956,39 @@ _0806AFE6: movs r0, 0x5 negs r0, r0 ands r0, r2 - b _0806B1F2 -_0806AFF8: + b @0806B1F2 +@0806AFF8: movs r2, 0 adds r3, r7, 0 adds r3, 0x14 -_0806AFFE: +@0806AFFE: adds r0, r3, r2 adds r1, r4, r2 ldrb r1, [r1] strb r1, [r0] adds r2, 0x1 cmp r2, 0x6 - ble _0806AFFE - b _0806B3D8 -_0806B00E: + ble @0806AFFE + b @0806B3D8 +@0806B00E: ldrb r0, [r4] strb r0, [r7, 0x1B] - b _0806B3D8 -_0806B014: + b @0806B3D8 +@0806B014: ldrb r1, [r4] ldrb r0, [r4, 0x1] lsls r0, 8 adds r1, r0 strh r1, [r7, 0x1C] - b _0806B3D8 -_0806B020: + b @0806B3D8 +@0806B020: ldrb r1, [r4] ldrb r0, [r4, 0x1] lsls r0, 8 adds r1, r0 strh r1, [r7, 0x1E] - b _0806B3D8 -_0806B02C: + b @0806B3D8 +@0806B02C: ldrb r1, [r4] ldrb r0, [r4, 0x1] lsls r0, 8 @@ -189997,24 +189997,24 @@ _0806B02C: strh r1, [r0] lsls r1, 16 cmp r1, 0 - beq _0806B044 + beq @0806B044 ldrb r0, [r7, 0x13] movs r1, 0x2 - b _0806B1F2 -_0806B044: + b @0806B1F2 +@0806B044: ldrb r1, [r7, 0x13] movs r0, 0x3 negs r0, r0 - b _0806B1FE -_0806B04C: + b @0806B1FE +@0806B04C: ldrb r1, [r4] ldrb r0, [r4, 0x1] lsls r0, 8 adds r1, r0 mov r0, r8 strh r1, [r0, 0x2] - b _0806B3D8 -_0806B05A: + b @0806B3D8 +@0806B05A: ldrb r1, [r4] ldrb r0, [r4, 0x1] lsls r0, 8 @@ -190027,18 +190027,18 @@ _0806B05A: adds r1, r0 mov r0, r8 str r1, [r0, 0x4] - b _0806B3D8 -_0806B074: + b @0806B3D8 +@0806B074: ldrb r0, [r4] mov r1, r8 strb r0, [r1, 0x8] - b _0806B3D8 -_0806B07C: + b @0806B3D8 +@0806B07C: ldrb r0, [r4] mov r1, r8 strb r0, [r1, 0x9] - b _0806B3D8 -_0806B084: + b @0806B3D8 +@0806B084: mov r2, r10 subs r2, 0xD lsls r2, 1 @@ -190048,71 +190048,71 @@ _0806B084: lsls r0, 8 adds r1, r0 strh r1, [r2] - b _0806B3D8 -_0806B098: + b @0806B3D8 +@0806B098: mov r0, r9 add r0, r10 subs r0, 0x9 ldrb r1, [r4] strb r1, [r0] - b _0806B3D8 -_0806B0A4: + b @0806B3D8 +@0806B0A4: ldrb r0, [r4] strb r0, [r6] - b _0806B3D8 -_0806B0AA: + b @0806B3D8 +@0806B0AA: ldrb r0, [r4] strb r0, [r6, 0x1] - b _0806B3D8 -_0806B0B0: + b @0806B3D8 +@0806B0B0: ldrb r0, [r4] strb r0, [r6, 0x2] - b _0806B3D8 -_0806B0B6: + b @0806B3D8 +@0806B0B6: ldrb r0, [r4] strb r0, [r6, 0x3] - b _0806B3D8 -_0806B0BC: + b @0806B3D8 +@0806B0BC: ldrb r0, [r4] strb r0, [r6, 0x4] - b _0806B3D8 -_0806B0C2: + b @0806B3D8 +@0806B0C2: ldrb r0, [r4] strb r0, [r6, 0x5] - b _0806B3D8 -_0806B0C8: + b @0806B3D8 +@0806B0C8: ldrb r0, [r4] strb r0, [r6, 0x6] - b _0806B3D8 -_0806B0CE: + b @0806B3D8 +@0806B0CE: ldrb r0, [r4] strb r0, [r6, 0x7] - b _0806B3D8 -_0806B0D4: + b @0806B3D8 +@0806B0D4: ldrb r0, [r4] strb r0, [r6, 0x8] - b _0806B3D8 -_0806B0DA: + b @0806B3D8 +@0806B0DA: ldrb r0, [r4] strb r0, [r6, 0x9] - b _0806B3D8 -_0806B0E0: + b @0806B3D8 +@0806B0E0: ldrb r0, [r4] strb r0, [r6, 0xA] - b _0806B3D8 -_0806B0E6: + b @0806B3D8 +@0806B0E6: ldrb r0, [r4] strb r0, [r6, 0xB] - b _0806B3D8 -_0806B0EC: + b @0806B3D8 +@0806B0EC: ldrb r0, [r4] strb r0, [r5] - b _0806B3D8 -_0806B0F2: + b @0806B3D8 +@0806B0F2: ldrb r0, [r4] strb r0, [r5, 0x1] - b _0806B3D8 -_0806B0F8: + b @0806B3D8 +@0806B0F8: ldrb r1, [r4] movs r0, 0x7F ands r1, r0 @@ -190122,8 +190122,8 @@ _0806B0F8: ands r0, r2 orrs r0, r1 strb r0, [r5, 0x2] - b _0806B3D8 -_0806B10C: + b @0806B3D8 +@0806B10C: ldrb r1, [r4] movs r0, 0xF ands r1, r0 @@ -190133,10 +190133,10 @@ _0806B10C: ands r0, r2 orrs r0, r1 strh r0, [r5, 0x2] - b _0806B3D8 + b @0806B3D8 .align 2, 0 .pool -_0806B124: +@0806B124: ldrb r1, [r4] movs r0, 0xF ands r1, r0 @@ -190147,8 +190147,8 @@ _0806B124: ands r0, r2 orrs r0, r1 strb r0, [r5, 0x3] - b _0806B3D8 -_0806B13A: + b @0806B3D8 +@0806B13A: ldrb r0, [r4] lsls r0, 7 ldrb r2, [r5, 0x3] @@ -190156,8 +190156,8 @@ _0806B13A: ands r1, r2 orrs r1, r0 strb r1, [r5, 0x3] - b _0806B3D8 -_0806B14A: + b @0806B3D8 +@0806B14A: ldrb r1, [r4] movs r0, 0x1F ands r1, r0 @@ -190167,8 +190167,8 @@ _0806B14A: ands r0, r2 orrs r0, r1 strb r0, [r5, 0x4] - b _0806B3D8 -_0806B15E: + b @0806B3D8 +@0806B15E: ldrb r1, [r4] movs r0, 0x1F ands r1, r0 @@ -190178,10 +190178,10 @@ _0806B15E: ands r0, r2 orrs r0, r1 strh r0, [r5, 0x4] - b _0806B3D8 + b @0806B3D8 .align 2, 0 .pool -_0806B178: +@0806B178: ldrb r1, [r4] movs r0, 0x1F ands r1, r0 @@ -190192,8 +190192,8 @@ _0806B178: ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] - b _0806B3D8 -_0806B18E: + b @0806B3D8 +@0806B18E: ldrb r2, [r4] movs r0, 0x1F ands r2, r0 @@ -190203,10 +190203,10 @@ _0806B18E: ands r0, r1 orrs r0, r2 str r0, [r5, 0x4] - b _0806B3D8 + b @0806B3D8 .align 2, 0 .pool -_0806B1A8: +@0806B1A8: ldrb r1, [r4] movs r0, 0x1F ands r1, r0 @@ -190216,10 +190216,10 @@ _0806B1A8: ands r0, r2 orrs r0, r1 strh r0, [r5, 0x6] - b _0806B3D8 + b @0806B3D8 .align 2, 0 .pool -_0806B1C0: +@0806B1C0: ldrb r1, [r4] movs r0, 0x1F ands r1, r0 @@ -190229,8 +190229,8 @@ _0806B1C0: negs r0, r0 ands r0, r2 orrs r0, r1 - b _0806B3D6 -_0806B1D4: + b @0806B3D6 +@0806B1D4: ldrb r1, [r4] movs r0, 0x1 ands r1, r0 @@ -190243,22 +190243,22 @@ _0806B1D4: strb r0, [r5, 0x7] lsls r0, 25 cmp r0, 0 - bge _0806B1F8 + bge @0806B1F8 ldrb r0, [r7, 0x13] movs r1, 0x4 -_0806B1F2: +@0806B1F2: orrs r0, r1 strb r0, [r7, 0x13] - b _0806B3D8 -_0806B1F8: + b @0806B3D8 +@0806B1F8: ldrb r1, [r7, 0x13] movs r0, 0x5 negs r0, r0 -_0806B1FE: +@0806B1FE: ands r0, r1 strb r0, [r7, 0x13] - b _0806B3D8 -_0806B204: + b @0806B3D8 +@0806B204: ldrb r0, [r4] lsls r0, 7 ldrb r2, [r5, 0x7] @@ -190266,16 +190266,16 @@ _0806B204: ands r1, r2 orrs r1, r0 strb r1, [r5, 0x7] - b _0806B3D8 -_0806B214: + b @0806B3D8 +@0806B214: ldrb r1, [r4] movs r0, 0x7 ands r1, r0 ldrb r2, [r5, 0x8] movs r0, 0x8 negs r0, r0 - b _0806B230 -_0806B222: + b @0806B230 +@0806B222: ldrb r1, [r4] movs r0, 0x7 ands r1, r0 @@ -190283,12 +190283,12 @@ _0806B222: ldrb r2, [r5, 0x8] movs r0, 0x39 negs r0, r0 -_0806B230: +@0806B230: ands r0, r2 orrs r0, r1 strb r0, [r5, 0x8] - b _0806B3D8 -_0806B238: + b @0806B3D8 +@0806B238: ldrb r1, [r4] movs r0, 0x7 ands r1, r0 @@ -190298,10 +190298,10 @@ _0806B238: ands r0, r2 orrs r0, r1 strh r0, [r5, 0x8] - b _0806B3D8 + b @0806B3D8 .align 2, 0 .pool -_0806B250: +@0806B250: ldrb r1, [r4] movs r0, 0x7 ands r1, r0 @@ -190309,8 +190309,8 @@ _0806B250: ldrb r2, [r5, 0x9] movs r0, 0xF negs r0, r0 - b _0806B26E -_0806B260: + b @0806B26E +@0806B260: ldrb r1, [r4] movs r0, 0x7 ands r1, r0 @@ -190318,12 +190318,12 @@ _0806B260: ldrb r2, [r5, 0x9] movs r0, 0x71 negs r0, r0 -_0806B26E: +@0806B26E: ands r0, r2 orrs r0, r1 strb r0, [r5, 0x9] - b _0806B3D8 -_0806B276: + b @0806B3D8 +@0806B276: ldrb r0, [r4] lsls r0, 7 ldrb r2, [r5, 0x9] @@ -190331,16 +190331,16 @@ _0806B276: ands r1, r2 orrs r1, r0 strb r1, [r5, 0x9] - b _0806B3D8 -_0806B286: + b @0806B3D8 +@0806B286: ldrb r1, [r4] movs r0, 0x1 ands r1, r0 ldrb r2, [r5, 0xA] movs r0, 0x2 negs r0, r0 - b _0806B2F2 -_0806B294: + b @0806B2F2 +@0806B294: ldrb r1, [r4] movs r0, 0x1 ands r1, r0 @@ -190348,8 +190348,8 @@ _0806B294: ldrb r2, [r5, 0xA] movs r0, 0x3 negs r0, r0 - b _0806B2F2 -_0806B2A4: + b @0806B2F2 +@0806B2A4: ldrb r1, [r4] movs r0, 0x1 ands r1, r0 @@ -190357,8 +190357,8 @@ _0806B2A4: ldrb r2, [r5, 0xA] movs r0, 0x5 negs r0, r0 - b _0806B2F2 -_0806B2B4: + b @0806B2F2 +@0806B2B4: ldrb r1, [r4] movs r0, 0x1 ands r1, r0 @@ -190366,8 +190366,8 @@ _0806B2B4: ldrb r2, [r5, 0xA] movs r0, 0x9 negs r0, r0 - b _0806B2F2 -_0806B2C4: + b @0806B2F2 +@0806B2C4: ldrb r1, [r4] movs r0, 0x1 ands r1, r0 @@ -190375,8 +190375,8 @@ _0806B2C4: ldrb r2, [r5, 0xA] movs r0, 0x11 negs r0, r0 - b _0806B2F2 -_0806B2D4: + b @0806B2F2 +@0806B2D4: ldrb r1, [r4] movs r0, 0x1 ands r1, r0 @@ -190384,8 +190384,8 @@ _0806B2D4: ldrb r2, [r5, 0xA] movs r0, 0x21 negs r0, r0 - b _0806B2F2 -_0806B2E4: + b @0806B2F2 +@0806B2E4: ldrb r1, [r4] movs r0, 0x1 ands r1, r0 @@ -190393,12 +190393,12 @@ _0806B2E4: ldrb r2, [r5, 0xA] movs r0, 0x41 negs r0, r0 -_0806B2F2: +@0806B2F2: ands r0, r2 orrs r0, r1 strb r0, [r5, 0xA] - b _0806B3D8 -_0806B2FA: + b @0806B3D8 +@0806B2FA: ldrb r0, [r4] lsls r0, 7 ldrb r2, [r5, 0xA] @@ -190406,16 +190406,16 @@ _0806B2FA: ands r1, r2 orrs r1, r0 strb r1, [r5, 0xA] - b _0806B3D8 -_0806B30A: + b @0806B3D8 +@0806B30A: ldrb r1, [r4] movs r0, 0x1 ands r1, r0 ldrb r2, [r5, 0xB] movs r0, 0x2 negs r0, r0 - b _0806B346 -_0806B318: + b @0806B346 +@0806B318: ldrb r1, [r4] movs r0, 0x1 ands r1, r0 @@ -190423,8 +190423,8 @@ _0806B318: ldrb r2, [r5, 0xB] movs r0, 0x3 negs r0, r0 - b _0806B346 -_0806B328: + b @0806B346 +@0806B328: ldrb r1, [r4] movs r0, 0x1 ands r1, r0 @@ -190432,8 +190432,8 @@ _0806B328: ldrb r2, [r5, 0xB] movs r0, 0x5 negs r0, r0 - b _0806B346 -_0806B338: + b @0806B346 +@0806B338: ldrb r1, [r4] movs r0, 0xF ands r1, r0 @@ -190441,12 +190441,12 @@ _0806B338: ldrb r2, [r5, 0xB] movs r0, 0x79 negs r0, r0 -_0806B346: +@0806B346: ands r0, r2 orrs r0, r1 strb r0, [r5, 0xB] - b _0806B3D8 -_0806B34E: + b @0806B3D8 +@0806B34E: ldrb r0, [r4] lsls r0, 7 ldrb r2, [r5, 0xB] @@ -190454,8 +190454,8 @@ _0806B34E: ands r1, r2 orrs r1, r0 strb r1, [r5, 0xB] - b _0806B3D8 -_0806B35E: + b @0806B3D8 +@0806B35E: ldrb r3, [r4] ldrb r0, [r4, 0x1] lsls r0, 8 @@ -190516,18 +190516,18 @@ _0806B35E: negs r0, r0 ands r0, r1 orrs r0, r3 -_0806B3D6: +@0806B3D6: strb r0, [r5, 0x7] -_0806B3D8: +@0806B3D8: mov r0, r10 cmp r0, 0xA - ble _0806B3EC + ble @0806B3EC adds r0, r7, 0 bl pokemon_calc_checksum strh r0, [r7, 0x1C] adds r0, r7, 0 bl pokemon_encrypt -_0806B3EC: +@0806B3EC: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -190540,8 +190540,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} @@ -190549,8 +190549,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 @@ -190568,14 +190568,14 @@ pokemon_catch: @ 806B414 movs r1, 0x1 bl pokemon_setattr movs r5, 0 - b _0806B446 + b @0806B446 .align 2, 0 .pool -_0806B444: +@0806B444: adds r5, 0x1 -_0806B446: +@0806B446: cmp r5, 0x5 - bgt _0806B480 + bgt @0806B480 movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -190586,7 +190586,7 @@ _0806B446: movs r2, 0 bl pokemon_getattr cmp r0, 0 - bne _0806B444 + bne @0806B444 adds r0, r4, 0 adds r1, r6, 0 movs r2, 0x64 @@ -190595,23 +190595,23 @@ _0806B446: adds r0, r5, 0x1 strb r0, [r1] movs r0, 0 - b _0806B48A + b @0806B48A .align 2, 0 .pool -_0806B480: +@0806B480: adds r0, r6, 0 bl pokemon_add_to_pc lsls r0, 24 lsrs r0, 24 -_0806B48A: +@0806B48A: pop {r4-r6} pop {r1} bx r1 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} @@ -190624,10 +190624,10 @@ pokemon_add_to_pc: @ 806B490 bl get_preferred_box lsls r0, 24 lsrs r5, r0, 24 -_0806B4AE: +@0806B4AE: movs r6, 0 lsls r7, r5, 24 -_0806B4B2: +@0806B4B2: lsls r1, r6, 24 lsrs r1, 24 lsrs r0, r7, 24 @@ -190637,7 +190637,7 @@ _0806B4B2: movs r2, 0 bl pokemon_getattr_encrypted cmp r0, 0 - bne _0806B514 + bne @0806B514 mov r0, r8 bl sub_806E924 adds r0, r4, 0 @@ -190652,34 +190652,34 @@ _0806B4B2: lsls r0, 16 lsrs r0, 16 cmp r0, r5 - beq _0806B4F4 + beq @0806B4F4 ldr r0, =0x000008d7 bl flag_clear -_0806B4F4: +@0806B4F4: lsls r1, r5, 16 ldr r0, =0x00004036 lsrs r1, 16 bl var_set movs r0, 0x1 - b _0806B530 + b @0806B530 .align 2, 0 .pool -_0806B514: +@0806B514: adds r6, 0x1 cmp r6, 0x1D - ble _0806B4B2 + ble @0806B4B2 adds r5, 0x1 cmp r5, 0xE - bne _0806B522 + bne @0806B522 movs r5, 0 -_0806B522: +@0806B522: bl get_preferred_box lsls r0, 24 lsrs r0, 24 cmp r5, r0 - bne _0806B4AE + bne @0806B4AE movs r0, 0x2 -_0806B530: +@0806B530: pop {r3} mov r8, r3 pop {r4-r7} @@ -190688,25 +190688,25 @@ _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 strb r1, [r0] - b _0806B554 + b @0806B554 .align 2, 0 .pool -_0806B54C: +@0806B54C: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] adds r0, r4, 0 -_0806B554: +@0806B554: adds r4, r0, 0 ldrb r0, [r4] cmp r0, 0x5 - bhi _0806B572 + bhi @0806B572 adds r1, r0, 0 movs r0, 0x64 muls r0, r1 @@ -190716,8 +190716,8 @@ _0806B554: movs r2, 0 bl pokemon_getattr cmp r0, 0 - bne _0806B54C -_0806B572: + bne @0806B54C +@0806B572: ldrb r0, [r4] pop {r4} pop {r1} @@ -190727,25 +190727,25 @@ _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 strb r1, [r0] - b _0806B598 + b @0806B598 .align 2, 0 .pool -_0806B590: +@0806B590: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] adds r0, r4, 0 -_0806B598: +@0806B598: adds r4, r0, 0 ldrb r0, [r4] cmp r0, 0x5 - bhi _0806B5B6 + bhi @0806B5B6 adds r1, r0, 0 movs r0, 0x64 muls r0, r1 @@ -190755,8 +190755,8 @@ _0806B598: movs r2, 0 bl pokemon_getattr cmp r0, 0 - bne _0806B590 -_0806B5B6: + bne @0806B590 +@0806B5B6: ldrb r0, [r4] pop {r4} pop {r1} @@ -190766,19 +190766,19 @@ _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 ldr r1, =0x020244e9 ldrb r0, [r1] cmp r0, 0x1 - beq _0806B628 + beq @0806B628 movs r5, 0 ldrb r1, [r1] cmp r6, r1 - bge _0806B620 -_0806B5DC: + bge @0806B620 +@0806B5DC: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -190791,32 +190791,32 @@ _0806B5DC: movs r1, 0xCE lsls r1, 1 cmp r0, r1 - beq _0806B616 + beq @0806B616 adds r0, r4, 0 movs r1, 0x39 movs r2, 0 bl pokemon_getattr cmp r0, 0 - beq _0806B616 + beq @0806B616 adds r0, r4, 0 movs r1, 0x41 movs r2, 0 bl pokemon_getattr cmp r0, 0 - beq _0806B616 + beq @0806B616 adds r6, 0x1 -_0806B616: +@0806B616: adds r5, 0x1 ldr r0, =0x020244e9 ldrb r0, [r0] cmp r5, r0 - blt _0806B5DC -_0806B620: + blt @0806B5DC +@0806B620: movs r0, 0 cmp r6, 0x1 - bgt _0806B628 + bgt @0806B628 movs r0, 0x2 -_0806B628: +@0806B628: pop {r4-r6} pop {r1} bx r1 @@ -190825,11 +190825,11 @@ _0806B628: thumb_func_end sub_806B5C4 thumb_func_start sub_806B638 -sub_806B638: @ 806B638 +sub_806B638: ; 806B638 push {r4-r6,lr} movs r6, 0 movs r5, 0 -_0806B63E: +@0806B63E: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -190843,46 +190843,46 @@ _0806B63E: movs r0, 0xCE lsls r0, 1 cmp r1, r0 - beq _0806B670 + beq @0806B670 cmp r1, 0 - beq _0806B670 + beq @0806B670 adds r0, r4, 0 movs r1, 0x39 movs r2, 0 bl pokemon_getattr cmp r0, 0 - beq _0806B670 + beq @0806B670 adds r6, 0x1 -_0806B670: +@0806B670: adds r5, 0x1 cmp r5, 0x5 - ble _0806B63E + ble @0806B63E cmp r6, 0x1 - bne _0806B684 + bne @0806B684 movs r0, 0x1 - b _0806B68C + b @0806B68C .align 2, 0 .pool -_0806B684: +@0806B684: movs r0, 0 cmp r6, 0x1 - bgt _0806B68C + bgt @0806B68C movs r0, 0x2 -_0806B68C: +@0806B68C: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_806B638 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 lsls r1, 24 cmp r1, 0 - beq _0806B6B8 + beq @0806B6B8 ldr r2, =0x0202420a ldr r1, =0x083203cc lsls r0, r3, 3 @@ -190890,10 +190890,10 @@ sub_806B694: @ 806B694 lsls r0, 2 adds r0, r1 ldrb r0, [r0, 0x17] - b _0806B6C6 + b @0806B6C6 .align 2, 0 .pool -_0806B6B8: +@0806B6B8: ldr r2, =0x0202420a ldr r1, =0x083203cc lsls r0, r3, 3 @@ -190901,7 +190901,7 @@ _0806B6B8: lsls r0, 2 adds r0, r1 ldrb r0, [r0, 0x16] -_0806B6C6: +@0806B6C6: strb r0, [r2] ldrb r0, [r2] pop {r1} @@ -190911,7 +190911,7 @@ _0806B6C6: thumb_func_end sub_806B694 thumb_func_start sub_806B6D8 -sub_806B6D8: @ 806B6D8 +sub_806B6D8: ; 806B6D8 push {r4,r5,lr} adds r5, r0, 0 movs r1, 0xB @@ -190937,7 +190937,7 @@ sub_806B6D8: @ 806B6D8 thumb_func_end sub_806B6D8 thumb_func_start create_enemy_party -create_enemy_party: @ 806B70C +create_enemy_party: ; 806B70C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -190954,7 +190954,7 @@ create_enemy_party: @ 806B70C bl memcpy movs r0, 0 mov r9, r0 -_0806B730: +@0806B730: ldr r1, =0x020244a8 ldr r3, [r1] ldr r2, [r3] @@ -190967,7 +190967,7 @@ _0806B730: adds r4, 0x1 str r4, [sp, 0x10] cmp r0, 0 - beq _0806B80A + beq @0806B80A movs r0, 0x64 mov r6, r9 muls r6, r0 @@ -191009,7 +191009,7 @@ _0806B730: mov r7, r9 adds r7, 0x9A mov r4, r8 -_0806B7A0: +@0806B7A0: adds r1, r5, 0 adds r1, 0x1A ldr r2, =0x020244a8 @@ -191020,7 +191020,7 @@ _0806B7A0: bl pokemon_setattr adds r5, 0x1 cmp r5, 0x5 - ble _0806B7A0 + ble @0806B7A0 movs r5, 0 movs r3, 0x64 mov r0, r9 @@ -191032,7 +191032,7 @@ _0806B7A0: adds r6, r0, 0 adds r6, 0x4C adds r4, r0, 0 -_0806B7CE: +@0806B7CE: adds r1, r5, 0 adds r1, 0xD ldr r2, =0x020244a8 @@ -191060,12 +191060,12 @@ _0806B7CE: adds r4, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble _0806B7CE -_0806B80A: + ble @0806B7CE +@0806B80A: ldr r4, [sp, 0x10] mov r9, r4 cmp r4, 0x5 - ble _0806B730 + ble @0806B730 add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -191079,7 +191079,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, =0x08329eb8 ldr r0, =0x020244a8 @@ -191109,7 +191109,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, =0x08329eb8 ldr r0, =0x020244a8 @@ -191139,10 +191139,10 @@ 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: +@0806B8B4: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -191151,58 +191151,58 @@ _0806B8B4: movs r2, 0 bl pokemon_getattr cmp r0, 0 - bne _0806B8D0 + bne @0806B8D0 movs r0, 0 - b _0806B8DE + b @0806B8DE .align 2, 0 .pool -_0806B8D0: +@0806B8D0: adds r4, 0x1 cmp r4, 0x5 - ble _0806B8B4 + ble @0806B8B4 bl sub_806B8E4 lsls r0, 24 lsrs r0, 24 -_0806B8DE: +@0806B8DE: pop {r4} pop {r1} bx r1 thumb_func_end sub_806B8B0 thumb_func_start sub_806B8E4 -sub_806B8E4: @ 806B8E4 +sub_806B8E4: ; 806B8E4 push {r4-r6,lr} movs r6, 0 -_0806B8E8: +@0806B8E8: movs r4, 0 lsls r5, r6, 24 -_0806B8EC: +@0806B8EC: lsls r1, r4, 24 lsrs r1, 24 lsrs r0, r5, 24 movs r2, 0xB bl get_pokemon_data_from_any_box cmp r0, 0 - bne _0806B900 + bne @0806B900 movs r0, 0 - b _0806B90E -_0806B900: + b @0806B90E +@0806B900: adds r4, 0x1 cmp r4, 0x1D - ble _0806B8EC + ble @0806B8EC adds r6, 0x1 cmp r6, 0xD - ble _0806B8E8 + ble @0806B8E8 movs r0, 0x1 -_0806B90E: +@0806B90E: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_806B8E4 thumb_func_start get_pokemon_name -@ void get_pokemon_name(char *dest, u16 species_num) -get_pokemon_name: @ 806B914 +; void get_pokemon_name(char *dest, u16 species_num) +get_pokemon_name: ; 806B914 push {r4-r7,lr} adds r6, r0, 0 lsls r1, 16 @@ -191216,30 +191216,30 @@ get_pokemon_name: @ 806B914 muls r0, r5 adds r3, r0, r7 adds r2, r6, 0 - b _0806B93A + b @0806B93A .align 2, 0 .pool -_0806B934: +@0806B934: adds r3, 0x1 adds r2, 0x1 adds r1, 0x1 -_0806B93A: +@0806B93A: adds r4, r6, r1 cmp r1, 0xA - bgt _0806B954 + bgt @0806B954 cmp r5, r12 - bls _0806B94A + bls @0806B94A adds r0, r1, r7 ldrb r0, [r0] - b _0806B94C -_0806B94A: + b @0806B94C +@0806B94A: ldrb r0, [r3] -_0806B94C: +@0806B94C: strb r0, [r2] ldrb r0, [r4] cmp r0, 0xFF - bne _0806B934 -_0806B954: + bne @0806B934 +@0806B954: movs r0, 0xFF strb r0, [r4] pop {r4-r7} @@ -191248,7 +191248,7 @@ _0806B954: thumb_func_end get_pokemon_name thumb_func_start move_get_pp_info -move_get_pp_info: @ 806B960 +move_get_pp_info: ; 806B960 push {r4,lr} lsls r0, 16 lsrs r0, 16 @@ -191284,7 +191284,7 @@ move_get_pp_info: @ 806B960 thumb_func_end move_get_pp_info thumb_func_start sub_806B9A8 -sub_806B9A8: @ 806B9A8 +sub_806B9A8: ; 806B9A8 push {r4,r5,lr} sub sp, 0x4 adds r5, r0, 0 @@ -191316,7 +191316,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 @@ -191332,7 +191332,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 @@ -191372,7 +191372,7 @@ battle_data_fill: @ 806B9FC mov r0, r8 adds r0, 0x24 adds r7, r4, r0 -_0806BA4E: +@0806BA4E: adds r1, r6, 0 adds r1, 0xD adds r0, r5, 0 @@ -191393,7 +191393,7 @@ _0806BA4E: adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble _0806BA4E + ble @0806BA4E movs r0, 0x64 mov r4, r9 muls r4, r0 @@ -191650,12 +191650,12 @@ _0806BA4E: add r5, r10 adds r0, r5, 0 adds r0, 0x13 -_0806BCB2: +@0806BCB2: strb r2, [r0] subs r0, 0x1 subs r6, 0x1 cmp r6, 0 - bge _0806BCB2 + bge @0806BCB2 movs r2, 0 movs r0, 0x58 ldr r3, [sp, 0x14] @@ -191681,7 +191681,7 @@ _0806BCB2: thumb_func_end battle_data_fill thumb_func_start sub_806BD04 -sub_806BD04: @ 806BD04 +sub_806BD04: ; 806BD04 push {r4,lr} sub sp, 0x4 lsls r1, 16 @@ -191702,7 +191702,7 @@ sub_806BD04: @ 806BD04 thumb_func_end sub_806BD04 thumb_func_start sub_806BD28 -sub_806BD28: @ 806BD28 +sub_806BD28: ; 806BD28 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -191739,7 +191739,7 @@ sub_806BD28: @ 806BD28 lsls r0, 16 lsrs r0, 16 cmp r0, 0xAF - bne _0806BDBC + bne @0806BDBC ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -191747,7 +191747,7 @@ sub_806BD28: @ 806BD28 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0806BDA8 + beq @0806BDA8 ldr r2, =0x02024404 ldr r0, =0x020244b8 ldrb r1, [r0] @@ -191756,23 +191756,23 @@ sub_806BD28: @ 806BD28 lsls r0, 2 adds r0, r2 ldrb r0, [r0, 0x7] - b _0806BDC4 + b @0806BDC4 .align 2, 0 .pool -_0806BDA8: +@0806BDA8: ldr r0, =0x03005d8c ldr r0, [r0] ldr r2, =0x00003226 adds r0, r2 ldrb r0, [r0] - b _0806BDC4 + b @0806BDC4 .align 2, 0 .pool -_0806BDBC: +@0806BDBC: bl itemid_get_x12 lsls r0, 24 lsrs r0, 24 -_0806BDC4: +@0806BDC4: str r0, [sp, 0x34] ldr r1, =0x0202420f ldr r0, =0x020244b8 @@ -191787,7 +191787,7 @@ _0806BDC4: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq _0806BE64 + beq @0806BE64 ldr r0, =0x02024064 strb r2, [r0] ldrb r0, [r0] @@ -191803,7 +191803,7 @@ _0806BDC4: subs r4, 0xD ldrb r0, [r0] cmp r1, r0 - bge _0806BE70 + bge @0806BE70 ldr r2, =0x0202406e lsls r0, r1, 1 adds r0, r2 @@ -191813,62 +191813,62 @@ _0806BDC4: lsrs r1, r0, 16 adds r5, r0, 0 cmp r3, r1 - bne _0806BE3C + bne @0806BE3C ldr r0, [sp, 0x1C] str r0, [sp, 0x38] - b _0806BE70 + b @0806BE70 .align 2, 0 .pool -_0806BE3C: +@0806BE3C: ldr r1, [sp, 0x1C] adds r1, 0x2 str r1, [sp, 0x1C] ldr r0, =0x0202406c ldrb r0, [r0] cmp r1, r0 - bge _0806BE70 + bge @0806BE70 lsls r0, r1, 1 adds r0, r2 ldrh r1, [r0] lsrs r0, r5, 16 cmp r1, r0 - bne _0806BE3C + bne @0806BE3C ldr r2, [sp, 0x1C] lsls r0, r2, 24 lsrs r0, 24 str r0, [sp, 0x38] - b _0806BE70 + b @0806BE70 .align 2, 0 .pool -_0806BE64: +@0806BE64: ldr r0, =0x02024064 strb r1, [r0] movs r3, 0x4 str r3, [sp, 0x38] ldr r4, [sp, 0xC] subs r4, 0xD -_0806BE70: +@0806BE70: lsls r0, r4, 16 lsrs r0, 16 cmp r0, 0xA5 - bhi _0806BEF0 + bhi @0806BEF0 ldr r1, =0x0831e58c lsls r0, r4, 2 adds r0, r1 ldr r0, [r0] cmp r0, 0 - bne _0806BE94 + bne @0806BE94 ldr r5, [sp, 0xC] cmp r5, 0xAF - beq _0806BE9A - b _0806BEF0 + beq @0806BE9A + b @0806BEF0 .align 2, 0 .pool -_0806BE94: +@0806BE94: ldr r1, [sp, 0xC] cmp r1, 0xAF - bne _0806BEF6 -_0806BE9A: + bne @0806BEF6 +@0806BE9A: ldr r0, =0x030022c0 ldr r2, =0x00000439 adds r0, r2 @@ -191876,7 +191876,7 @@ _0806BE9A: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0806BECC + beq @0806BECC ldr r0, =0x02024064 ldrb r1, [r0] lsls r0, r1, 3 @@ -191884,55 +191884,55 @@ _0806BE9A: lsls r0, 2 ldr r1, =0x0202440c adds r0, r1 - b _0806BEF6 + b @0806BEF6 .align 2, 0 .pool -_0806BECC: +@0806BECC: ldr r0, =0x03005d8c ldr r0, [r0] ldr r3, =0x00003214 adds r3, r0, r3 str r3, [sp, 0x24] - b _0806BEF8 + b @0806BEF8 .align 2, 0 .pool -_0806BEE0: +@0806BEE0: mov r0, r8 movs r2, 0 ldr r3, [sp, 0x10] bl sub_813DA40 movs r0, 0 - bl _0806CD5C -_0806BEF0: + bl @0806CD5C +@0806BEF0: movs r0, 0x1 - bl _0806CD5C -_0806BEF6: + bl @0806CD5C +@0806BEF6: str r0, [sp, 0x24] -_0806BEF8: +@0806BEF8: movs r5, 0 str r5, [sp, 0x1C] -_0806BEFC: +@0806BEFC: ldr r0, [sp, 0x1C] cmp r0, 0x5 - bls _0806BF06 - bl _0806CD4C -_0806BF06: + bls @0806BF06 + bl @0806CD4C +@0806BF06: lsls r0, 2 - ldr r1, =_0806BF14 + ldr r1, =@0806BF14 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0806BF14: - .4byte _0806BF2C - .4byte _0806BFFC - .4byte _0806C08C - .4byte _0806C120 - .4byte _0806C300 - .4byte _0806C9BE -_0806BF2C: +@0806BF14: + .4byte @0806BF2C + .4byte @0806BFFC + .4byte @0806C08C + .4byte @0806C120 + .4byte @0806C300 + .4byte @0806C9BE +@0806BF2C: ldr r1, [sp, 0x24] ldr r3, [sp, 0x1C] adds r2, r1, r3 @@ -191941,7 +191941,7 @@ _0806BF2C: ands r0, r1 adds r6, r2, 0 cmp r0, 0 - beq _0806BF76 + beq @0806BF76 ldr r0, =0x030022c0 ldr r5, =0x00000439 adds r0, r5 @@ -191949,10 +191949,10 @@ _0806BF2C: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0806BF76 + beq @0806BF76 ldr r0, [sp, 0x38] cmp r0, 0x4 - beq _0806BF76 + beq @0806BF76 ldr r1, =0x02024084 movs r0, 0x58 ldr r2, [sp, 0x38] @@ -191964,18 +191964,18 @@ _0806BF2C: lsls r0, 12 ands r0, r1 cmp r0, 0 - beq _0806BF76 + beq @0806BF76 ldr r0, =0xfff0ffff ands r1, r0 str r1, [r2] movs r3, 0 str r3, [sp, 0x20] -_0806BF76: +@0806BF76: ldrb r1, [r6] movs r0, 0x30 ands r0, r1 cmp r0, 0 - beq _0806BFA4 + beq @0806BFA4 ldr r1, =0x02024084 ldr r0, =0x02024064 ldrb r2, [r0] @@ -191989,19 +191989,19 @@ _0806BF76: adds r0, r1, 0 ands r0, r3 cmp r0, 0 - bne _0806BFA4 + bne @0806BFA4 orrs r1, r3 str r1, [r2] movs r5, 0 str r5, [sp, 0x20] -_0806BFA4: +@0806BFA4: ldrb r0, [r6] movs r3, 0xF ands r3, r0 cmp r3, 0 - bne _0806BFB2 - bl _0806CD4C -_0806BFB2: + bne @0806BFB2 + bl @0806CD4C +@0806BFB2: ldr r6, =0x02024084 ldr r5, =0x02024064 ldrb r0, [r5] @@ -192012,9 +192012,9 @@ _0806BFB2: movs r0, 0x19 ldrsb r0, [r1, r0] cmp r0, 0xB - ble _0806BFCC - bl _0806CD4C -_0806BFCC: + ble @0806BFCC + bl @0806CD4C +@0806BFCC: adds r0, r2, r3 strb r0, [r1, 0x19] ldrb r0, [r5] @@ -192023,15 +192023,15 @@ _0806BFCC: movs r0, 0x19 ldrsb r0, [r1, r0] cmp r0, 0xC - bgt _0806BFE0 - b _0806C110 -_0806BFE0: + bgt @0806BFE0 + b @0806C110 +@0806BFE0: movs r0, 0xC strb r0, [r1, 0x19] - b _0806C110 + b @0806C110 .align 2, 0 .pool -_0806BFFC: +@0806BFFC: ldr r1, [sp, 0x24] ldr r3, [sp, 0x1C] adds r2, r1, r3 @@ -192041,7 +192041,7 @@ _0806BFFC: lsls r3, r0, 24 adds r6, r2, 0 cmp r3, 0 - beq _0806C042 + beq @0806C042 ldr r7, =0x02024084 ldr r5, =0x02024064 ldrb r0, [r5] @@ -192052,7 +192052,7 @@ _0806BFFC: movs r0, 0x1A ldrsb r0, [r1, r0] cmp r0, 0xB - bgt _0806C042 + bgt @0806C042 lsrs r0, r3, 28 adds r0, r2, r0 strb r0, [r1, 0x1A] @@ -192062,20 +192062,20 @@ _0806BFFC: movs r0, 0x1A ldrsb r0, [r1, r0] cmp r0, 0xC - ble _0806C03E + ble @0806C03E movs r0, 0xC strb r0, [r1, 0x1A] -_0806C03E: +@0806C03E: movs r5, 0 str r5, [sp, 0x20] -_0806C042: +@0806C042: ldrb r0, [r6] movs r3, 0xF ands r3, r0 cmp r3, 0 - bne _0806C050 - bl _0806CD4C -_0806C050: + bne @0806C050 + bl @0806CD4C +@0806C050: ldr r6, =0x02024084 ldr r5, =0x02024064 ldrb r0, [r5] @@ -192086,9 +192086,9 @@ _0806C050: movs r0, 0x1B ldrsb r0, [r1, r0] cmp r0, 0xB - ble _0806C06A - bl _0806CD4C -_0806C06A: + ble @0806C06A + bl @0806CD4C +@0806C06A: adds r0, r2, r3 strb r0, [r1, 0x1B] ldrb r0, [r5] @@ -192097,13 +192097,13 @@ _0806C06A: movs r0, 0x1B ldrsb r0, [r1, r0] cmp r0, 0xC - ble _0806C110 + ble @0806C110 movs r0, 0xC strb r0, [r1, 0x1B] - b _0806C110 + b @0806C110 .align 2, 0 .pool -_0806C08C: +@0806C08C: ldr r1, [sp, 0x24] ldr r3, [sp, 0x1C] adds r2, r1, r3 @@ -192113,7 +192113,7 @@ _0806C08C: lsls r3, r0, 24 adds r6, r2, 0 cmp r3, 0 - beq _0806C0D2 + beq @0806C0D2 ldr r7, =0x02024084 ldr r5, =0x02024064 ldrb r0, [r5] @@ -192124,7 +192124,7 @@ _0806C08C: movs r0, 0x1E ldrsb r0, [r1, r0] cmp r0, 0xB - bgt _0806C0D2 + bgt @0806C0D2 lsrs r0, r3, 28 adds r0, r2, r0 strb r0, [r1, 0x1E] @@ -192134,20 +192134,20 @@ _0806C08C: movs r0, 0x1E ldrsb r0, [r1, r0] cmp r0, 0xC - ble _0806C0CE + ble @0806C0CE movs r0, 0xC strb r0, [r1, 0x1E] -_0806C0CE: +@0806C0CE: movs r5, 0 str r5, [sp, 0x20] -_0806C0D2: +@0806C0D2: ldrb r0, [r6] movs r3, 0xF ands r3, r0 cmp r3, 0 - bne _0806C0E0 - bl _0806CD4C -_0806C0E0: + bne @0806C0E0 + bl @0806CD4C +@0806C0E0: ldr r6, =0x02024084 ldr r5, =0x02024064 ldrb r0, [r5] @@ -192158,9 +192158,9 @@ _0806C0E0: movs r0, 0x1C ldrsb r0, [r1, r0] cmp r0, 0xB - ble _0806C0FA - bl _0806CD4C -_0806C0FA: + ble @0806C0FA + bl @0806CD4C +@0806C0FA: adds r0, r2, r3 strb r0, [r1, 0x1C] ldrb r0, [r5] @@ -192169,16 +192169,16 @@ _0806C0FA: movs r0, 0x1C ldrsb r0, [r1, r0] cmp r0, 0xC - ble _0806C110 + ble @0806C110 movs r0, 0xC strb r0, [r1, 0x1C] -_0806C110: +@0806C110: movs r0, 0 str r0, [sp, 0x20] - bl _0806CD4C + bl @0806CD4C .align 2, 0 .pool -_0806C120: +@0806C120: ldr r1, [sp, 0x24] ldr r3, [sp, 0x1C] adds r2, r1, r3 @@ -192187,7 +192187,7 @@ _0806C120: ands r0, r1 adds r6, r2, 0 cmp r0, 0 - beq _0806C168 + beq @0806C168 ldr r5, =0x02024294 ldr r4, =0x02024064 ldrb r0, [r4] @@ -192200,7 +192200,7 @@ _0806C120: adds r1, r5 ldrb r0, [r1, 0x4] cmp r0, 0 - bne _0806C168 + bne @0806C168 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 @@ -192213,18 +192213,18 @@ _0806C120: strb r0, [r1, 0x4] movs r5, 0 str r5, [sp, 0x20] -_0806C168: +@0806C168: ldrb r1, [r6] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0806C1CA + beq @0806C1CA mov r0, r8 movs r1, 0x38 movs r2, 0 bl pokemon_getattr cmp r0, 0x64 - beq _0806C1CA + beq @0806C1CA ldr r5, =0x0831f72c mov r0, r8 movs r1, 0x38 @@ -192258,12 +192258,12 @@ _0806C168: bl pokemon_calc_effective_stats movs r0, 0 str r0, [sp, 0x20] -_0806C1CA: +@0806C1CA: ldrb r1, [r6] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0806C206 + beq @0806C206 mov r0, r8 ldr r1, [sp, 0x10] movs r2, 0x7 @@ -192271,10 +192271,10 @@ _0806C1CA: bl pokemon_clear_ailments lsls r0, 24 cmp r0, 0 - bne _0806C206 + bne @0806C206 ldr r1, [sp, 0x38] cmp r1, 0x4 - beq _0806C202 + beq @0806C202 ldr r1, =0x02024084 movs r0, 0x58 ldr r3, [sp, 0x38] @@ -192286,15 +192286,15 @@ _0806C1CA: ldr r1, =0xf7ffffff ands r0, r1 str r0, [r2] -_0806C202: +@0806C202: movs r5, 0 str r5, [sp, 0x20] -_0806C206: +@0806C206: ldrb r1, [r6] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0806C226 + beq @0806C226 ldr r2, =0x00000f88 mov r0, r8 ldr r1, [sp, 0x10] @@ -192302,15 +192302,15 @@ _0806C206: bl pokemon_clear_ailments lsls r0, 24 cmp r0, 0 - bne _0806C226 + bne @0806C226 movs r0, 0 str r0, [sp, 0x20] -_0806C226: +@0806C226: ldrb r1, [r6] movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _0806C246 + beq @0806C246 mov r0, r8 ldr r1, [sp, 0x10] movs r2, 0x10 @@ -192318,15 +192318,15 @@ _0806C226: bl pokemon_clear_ailments lsls r0, 24 cmp r0, 0 - bne _0806C246 + bne @0806C246 movs r1, 0 str r1, [sp, 0x20] -_0806C246: +@0806C246: ldrb r1, [r6] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0806C266 + beq @0806C266 mov r0, r8 ldr r1, [sp, 0x10] movs r2, 0x20 @@ -192334,15 +192334,15 @@ _0806C246: bl pokemon_clear_ailments lsls r0, 24 cmp r0, 0 - bne _0806C266 + bne @0806C266 movs r2, 0 str r2, [sp, 0x20] -_0806C266: +@0806C266: ldrb r1, [r6] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0806C286 + beq @0806C286 mov r0, r8 ldr r1, [sp, 0x10] movs r2, 0x40 @@ -192350,17 +192350,17 @@ _0806C266: bl pokemon_clear_ailments lsls r0, 24 cmp r0, 0 - bne _0806C286 + bne @0806C286 movs r3, 0 str r3, [sp, 0x20] -_0806C286: +@0806C286: ldrb r1, [r6] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0806C294 - bl _0806CD4C -_0806C294: + bne @0806C294 + bl @0806CD4C +@0806C294: ldr r0, =0x030022c0 ldr r5, =0x00000439 adds r0, r5 @@ -192368,14 +192368,14 @@ _0806C294: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _0806C2A8 - bl _0806CD4C -_0806C2A8: + bne @0806C2A8 + bl @0806CD4C +@0806C2A8: ldr r0, [sp, 0x38] cmp r0, 0x4 - bne _0806C2B2 - bl _0806CD4C -_0806C2B2: + bne @0806C2B2 + bl @0806CD4C +@0806C2B2: ldr r1, =0x02024084 movs r0, 0x58 ldr r2, [sp, 0x38] @@ -192386,19 +192386,19 @@ _0806C2B2: movs r0, 0x7 ands r0, r1 cmp r0, 0 - bne _0806C2CC - bl _0806CD4C -_0806C2CC: + bne @0806C2CC + bl @0806CD4C +@0806C2CC: movs r0, 0x8 negs r0, r0 ands r1, r0 str r1, [r2] movs r3, 0 str r3, [sp, 0x20] - bl _0806CD4C + bl @0806CD4C .align 2, 0 .pool -_0806C300: +@0806C300: ldr r5, [sp, 0x24] ldr r1, [sp, 0x1C] adds r0, r5, r1 @@ -192408,7 +192408,7 @@ _0806C300: mov r2, r10 ands r0, r2 cmp r0, 0 - beq _0806C3D8 + beq @0806C3D8 movs r0, 0xDF ands r2, r0 mov r10, r2 @@ -192448,10 +192448,10 @@ _0806C300: str r0, [sp, 0x2C] ldr r0, [sp] cmp r0, 0x2 - bhi _0806C3D8 + bhi @0806C3D8 ldr r0, [sp, 0x2C] cmp r0, 0x4 - bls _0806C3D8 + bls @0806C3D8 mov r0, r8 movs r1, 0x15 movs r2, 0 @@ -192497,44 +192497,44 @@ _0806C300: bl pokemon_setattr movs r5, 0 str r5, [sp, 0x20] -_0806C3D8: +@0806C3D8: movs r0, 0 str r0, [sp, 0x2C] mov r1, r10 cmp r1, 0 - bne _0806C3E6 - bl _0806CD4C -_0806C3E6: + bne @0806C3E6 + bl @0806CD4C +@0806C3E6: movs r0, 0x1 mov r2, r10 ands r0, r2 cmp r0, 0 - bne _0806C3F2 - b _0806C9AA -_0806C3F2: + bne @0806C3F2 + b @0806C9AA +@0806C3F2: ldr r3, [sp, 0x2C] cmp r3, 0x7 - bls _0806C3FA - b _0806C9AA -_0806C3FA: + bls @0806C3FA + b @0806C9AA +@0806C3FA: lsls r0, r3, 2 - ldr r1, =_0806C410 + ldr r1, =@0806C410 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0806C410: - .4byte _0806C430 - .4byte _0806C430 - .4byte _0806C4DC - .4byte _0806C700 - .4byte _0806C9AA - .4byte _0806C9AA - .4byte _0806C9AA - .4byte _0806C994 -_0806C430: +@0806C410: + .4byte @0806C430 + .4byte @0806C430 + .4byte @0806C4DC + .4byte @0806C700 + .4byte @0806C9AA + .4byte @0806C9AA + .4byte @0806C9AA + .4byte @0806C994 +@0806C430: mov r0, r8 bl sub_806DC8C lsls r0, 16 @@ -192555,57 +192555,57 @@ _0806C430: lsls r0, r5, 24 asrs r2, r0, 24 cmp r2, 0 - ble _0806C498 + ble @0806C498 ldr r0, =0x000001fd cmp r6, r0 - bls _0806C466 - b _0806BEF0 -_0806C466: + bls @0806C466 + b @0806BEF0 +@0806C466: adds r3, r1, 0 cmp r3, 0x63 - ble _0806C46E - b _0806C9AA -_0806C46E: + ble @0806C46E + b @0806C9AA +@0806C46E: adds r1, r3, r2 cmp r1, 0x64 - ble _0806C484 + ble @0806C484 adds r0, r2, 0 adds r0, 0x64 subs r5, r0, r1 - b _0806C486 + b @0806C486 .align 2, 0 .pool -_0806C484: +@0806C484: adds r5, r2, 0 -_0806C486: +@0806C486: adds r1, r6, r5 movs r0, 0xFF lsls r0, 1 cmp r1, r0 - bls _0806C494 + bls @0806C494 adds r0, r5, r0 subs r5, r0, r1 -_0806C494: +@0806C494: adds r0, r3, r5 - b _0806C4B2 -_0806C498: + b @0806C4B2 +@0806C498: cmp r1, 0 - bne _0806C4A8 + bne @0806C4A8 movs r3, 0x1 str r3, [sp, 0x3C] ldr r0, [sp, 0x28] adds r0, 0x1 lsls r0, 24 - b _0806C83E -_0806C4A8: + b @0806C83E +@0806C4A8: adds r0, r1, r2 str r0, [sp, 0x4] cmp r0, 0 - bge _0806C4B4 + bge @0806C4B4 movs r0, 0 -_0806C4B2: +@0806C4B2: str r0, [sp, 0x4] -_0806C4B4: +@0806C4B4: ldr r0, =0x08329ec2 ldr r5, [sp, 0x2C] adds r0, r5, r0 @@ -192620,26 +192620,26 @@ _0806C4B4: lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x28] - b _0806C978 + b @0806C978 .align 2, 0 .pool -_0806C4DC: +@0806C4DC: movs r0, 0x10 mov r1, r10 ands r0, r1 cmp r0, 0 - beq _0806C59C + beq @0806C59C mov r0, r8 movs r1, 0x39 movs r2, 0 bl pokemon_getattr cmp r0, 0 - beq _0806C4FC + beq @0806C4FC ldr r0, [sp, 0x28] adds r0, 0x1 lsls r0, 24 - b _0806C83E -_0806C4FC: + b @0806C83E +@0806C4FC: ldr r0, =0x030022c0 ldr r2, =0x00000439 adds r0, r2 @@ -192648,10 +192648,10 @@ _0806C4FC: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0806C5B2 + beq @0806C5B2 ldr r3, [sp, 0x38] cmp r3, 0x4 - beq _0806C55C + beq @0806C55C ldr r2, =0x02024210 ldr r1, =0x0832a328 lsls r0, r3, 2 @@ -192672,10 +192672,10 @@ _0806C4FC: bl battle_data_fill ldr r0, =0x02024064 ldrb r0, [r0] - b _0806C574 + b @0806C574 .align 2, 0 .pool -_0806C55C: +@0806C55C: ldr r3, =0x02024210 ldr r1, =0x0832a328 ldr r2, =0x02024064 @@ -192688,32 +192688,32 @@ _0806C55C: bics r0, r1 strb r0, [r3] ldrb r0, [r2] -_0806C574: +@0806C574: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0806C5B2 + bne @0806C5B2 ldr r1, =0x03005d10 ldrb r0, [r1, 0x4] cmp r0, 0xFE - bhi _0806C5B2 + bhi @0806C5B2 adds r0, 0x1 strb r0, [r1, 0x4] - b _0806C5B2 + b @0806C5B2 .align 2, 0 .pool -_0806C59C: +@0806C59C: mov r0, r8 movs r1, 0x39 movs r2, 0 bl pokemon_getattr cmp r0, 0 - bne _0806C5B2 + bne @0806C5B2 ldr r0, [sp, 0x28] adds r0, 0x1 lsls r0, 24 - b _0806C83E -_0806C5B2: + b @0806C83E +@0806C5B2: ldr r1, [sp, 0x28] adds r0, r1, 0x1 lsls r0, 24 @@ -192725,15 +192725,15 @@ _0806C5B2: str r1, [sp] adds r0, r1, 0 cmp r0, 0xFE - beq _0806C5F4 + beq @0806C5F4 cmp r0, 0xFE - bhi _0806C5D4 + bhi @0806C5D4 cmp r0, 0xFD - beq _0806C60A - b _0806C612 -_0806C5D4: + beq @0806C60A + b @0806C612 +@0806C5D4: cmp r1, 0xFF - bne _0806C612 + bne @0806C612 mov r0, r8 movs r1, 0x3A movs r2, 0 @@ -192745,8 +192745,8 @@ _0806C5D4: bl pokemon_getattr subs r4, r0 str r4, [sp] - b _0806C612 -_0806C5F4: + b @0806C612 +@0806C5F4: mov r0, r8 movs r1, 0x3A movs r2, 0 @@ -192754,16 +192754,16 @@ _0806C5F4: lsrs r0, 1 str r0, [sp] cmp r0, 0 - bne _0806C612 + bne @0806C612 movs r0, 0x1 - b _0806C610 -_0806C60A: + b @0806C610 +@0806C60A: ldr r0, =0x02024474 adds r0, 0x23 ldrb r0, [r0] -_0806C610: +@0806C610: str r0, [sp] -_0806C612: +@0806C612: mov r0, r8 movs r1, 0x3A movs r2, 0 @@ -192774,10 +192774,10 @@ _0806C612: movs r2, 0 bl pokemon_getattr cmp r4, r0 - beq _0806C6F0 + beq @0806C6F0 ldr r0, [sp, 0x18] cmp r0, 0 - bne _0806C6E4 + bne @0806C6E4 mov r0, r8 movs r1, 0x39 movs r2, 0 @@ -192791,13 +192791,13 @@ _0806C612: bl pokemon_getattr ldr r1, [sp] cmp r1, r0 - bls _0806C65E + bls @0806C65E mov r0, r8 movs r1, 0x3A movs r2, 0 bl pokemon_getattr str r0, [sp] -_0806C65E: +@0806C65E: mov r0, r8 movs r1, 0x39 mov r2, sp @@ -192809,10 +192809,10 @@ _0806C65E: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0806C6EC + beq @0806C6EC ldr r2, [sp, 0x38] cmp r2, 0x4 - beq _0806C6EC + beq @0806C6EC ldr r1, =0x02024084 movs r0, 0x58 muls r0, r2 @@ -192823,20 +192823,20 @@ _0806C65E: mov r3, r10 ands r0, r3 cmp r0, 0 - bne _0806C6EC + bne @0806C6EC ldr r4, =0x02024064 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0806C6EC + bne @0806C6EC ldr r1, =0x03005d10 ldrb r0, [r1, 0x3] cmp r0, 0xFE - bhi _0806C6AE + bhi @0806C6AE adds r0, 0x1 strb r0, [r1, 0x3] -_0806C6AE: +@0806C6AE: ldrb r5, [r4] add r0, sp, 0x38 ldrb r0, [r0] @@ -192848,38 +192848,38 @@ _0806C6AE: ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution strb r5, [r4] - b _0806C6EC + b @0806C6EC .align 2, 0 .pool -_0806C6E4: +@0806C6E4: ldr r1, =0x020241f0 ldr r0, [sp] negs r0, r0 str r0, [r1] -_0806C6EC: +@0806C6EC: movs r1, 0 str r1, [sp, 0x20] -_0806C6F0: +@0806C6F0: movs r0, 0xEF mov r2, r10 ands r2, r0 mov r10, r2 - b _0806C9AA + b @0806C9AA .align 2, 0 .pool -_0806C700: +@0806C700: movs r7, 0x2 mov r0, r10 ands r0, r7 cmp r0, 0 - beq _0806C70C - b _0806C858 -_0806C70C: + beq @0806C70C + b @0806C858 +@0806C70C: movs r5, 0 ldr r3, [sp, 0x28] adds r3, 0x1 str r3, [sp, 0x40] -_0806C714: +@0806C714: movs r0, 0x11 adds r0, r5 mov r9, r0 @@ -192913,7 +192913,7 @@ _0806C714: lsrs r0, 24 ldr r1, [sp] cmp r1, r0 - beq _0806C832 + beq @0806C832 ldr r2, [sp, 0x24] ldr r3, [sp, 0x28] adds r0, r2, r3 @@ -192941,7 +192941,7 @@ _0806C714: lsrs r0, 24 ldr r1, [sp] cmp r1, r0 - bls _0806C7CC + bls @0806C7CC mov r0, r8 adds r1, r7, 0 movs r2, 0 @@ -192962,7 +192962,7 @@ _0806C714: lsls r0, 24 lsrs r0, 24 str r0, [sp] -_0806C7CC: +@0806C7CC: mov r0, r8 mov r1, r9 mov r2, sp @@ -192974,10 +192974,10 @@ _0806C7CC: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0806C82E + beq @0806C82E ldr r2, [sp, 0x38] cmp r2, 0x4 - beq _0806C82E + beq @0806C82E ldr r4, =0x02024084 movs r0, 0x58 adds r3, r2, 0 @@ -192990,7 +192990,7 @@ _0806C7CC: lsls r0, 14 ands r1, r0 cmp r1, 0 - bne _0806C82E + bne @0806C82E ldr r1, =0x020242bc lsls r0, r2, 3 subs r0, r2 @@ -193004,31 +193004,31 @@ _0806C7CC: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _0806C82E + bne @0806C82E adds r0, r5, r3 adds r1, r4, 0 adds r1, 0x24 adds r0, r1 ldr r1, [sp] strb r1, [r0] -_0806C82E: +@0806C82E: movs r3, 0 str r3, [sp, 0x20] -_0806C832: +@0806C832: adds r5, 0x1 cmp r5, 0x3 - bgt _0806C83A - b _0806C714 -_0806C83A: + bgt @0806C83A + b @0806C714 +@0806C83A: ldr r5, [sp, 0x40] lsls r0, r5, 24 -_0806C83E: +@0806C83E: lsrs r0, 24 str r0, [sp, 0x28] - b _0806C9AA + b @0806C9AA .align 2, 0 .pool -_0806C858: +@0806C858: ldr r6, [sp, 0x14] adds r6, 0x11 mov r0, r8 @@ -193059,9 +193059,9 @@ _0806C858: lsrs r0, 24 ldr r2, [sp] cmp r2, r0 - bne _0806C8A0 - b _0806C9AA -_0806C8A0: + bne @0806C8A0 + b @0806C9AA +@0806C8A0: ldr r1, [sp, 0x28] adds r0, r1, 0x1 lsls r0, 24 @@ -193093,7 +193093,7 @@ _0806C8A0: lsrs r0, 24 ldr r1, [sp] cmp r1, r0 - bls _0806C914 + bls @0806C914 mov r0, r8 adds r1, r5, 0 movs r2, 0 @@ -193114,7 +193114,7 @@ _0806C8A0: lsls r0, 24 lsrs r0, 24 str r0, [sp] -_0806C914: +@0806C914: mov r0, r8 adds r1, r6, 0 mov r2, sp @@ -193126,10 +193126,10 @@ _0806C914: adds r0, r7, 0 ands r0, r1 cmp r0, 0 - beq _0806C978 + beq @0806C978 ldr r2, [sp, 0x38] cmp r2, 0x4 - beq _0806C978 + beq @0806C978 ldr r4, =0x02024084 movs r0, 0x58 adds r3, r2, 0 @@ -193142,7 +193142,7 @@ _0806C914: lsls r1, 14 ands r0, r1 cmp r0, 0 - bne _0806C978 + bne @0806C978 ldr r1, =0x020242bc lsls r0, r2, 3 subs r0, r2 @@ -193157,20 +193157,20 @@ _0806C914: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _0806C978 + bne @0806C978 adds r0, r5, r3 adds r1, r4, 0 adds r1, 0x24 adds r0, r1 ldr r1, [sp] strb r1, [r0] -_0806C978: +@0806C978: movs r0, 0 str r0, [sp, 0x20] - b _0806C9AA + b @0806C9AA .align 2, 0 .pool -_0806C994: +@0806C994: mov r0, r8 movs r1, 0x2 ldr r2, [sp, 0xC] @@ -193178,9 +193178,9 @@ _0806C994: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - beq _0806C9AA - bl _0806BEE0 -_0806C9AA: + beq @0806C9AA + bl @0806BEE0 +@0806C9AA: ldr r1, [sp, 0x2C] adds r1, 0x1 str r1, [sp, 0x2C] @@ -193188,11 +193188,11 @@ _0806C9AA: lsrs r2, 1 mov r10, r2 cmp r2, 0 - beq _0806C9BC - b _0806C3E6 -_0806C9BC: - b _0806CD4C -_0806C9BE: + beq @0806C9BC + b @0806C3E6 +@0806C9BC: + b @0806CD4C +@0806C9BE: ldr r3, [sp, 0x24] ldr r5, [sp, 0x1C] adds r0, r3, r5 @@ -193202,39 +193202,39 @@ _0806C9BE: str r0, [sp, 0x2C] mov r1, r10 cmp r1, 0 - bne _0806C9D4 - b _0806CD4C -_0806C9D4: + bne @0806C9D4 + b @0806CD4C +@0806C9D4: movs r0, 0x1 mov r2, r10 ands r0, r2 cmp r0, 0 - bne _0806C9E0 - b _0806CD3A -_0806C9E0: + bne @0806C9E0 + b @0806CD3A +@0806C9E0: ldr r3, [sp, 0x2C] cmp r3, 0x7 - bls _0806C9E8 - b _0806CD3A -_0806C9E8: + bls @0806C9E8 + b @0806CD3A +@0806C9E8: lsls r0, r3, 2 - ldr r1, =_0806C9F8 + ldr r1, =@0806C9F8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0806C9F8: - .4byte _0806CA18 - .4byte _0806CA18 - .4byte _0806CA18 - .4byte _0806CA18 - .4byte _0806CAB8 - .4byte _0806CB94 - .4byte _0806CC00 - .4byte _0806CC68 -_0806CA18: +@0806C9F8: + .4byte @0806CA18 + .4byte @0806CA18 + .4byte @0806CA18 + .4byte @0806CA18 + .4byte @0806CAB8 + .4byte @0806CB94 + .4byte @0806CC00 + .4byte @0806CC68 +@0806CA18: mov r0, r8 bl sub_806DC8C lsls r0, 16 @@ -193256,54 +193256,54 @@ _0806CA18: lsls r0, r5, 24 asrs r2, r0, 24 cmp r2, 0 - ble _0806CA84 + ble @0806CA84 ldr r0, =0x000001fd cmp r6, r0 - bls _0806CA52 - bl _0806BEF0 -_0806CA52: + bls @0806CA52 + bl @0806BEF0 +@0806CA52: adds r3, r1, 0 cmp r3, 0x63 - ble _0806CA5A - b _0806CD3A -_0806CA5A: + ble @0806CA5A + b @0806CD3A +@0806CA5A: adds r1, r3, r2 cmp r1, 0x64 - ble _0806CA70 + ble @0806CA70 adds r0, r2, 0 adds r0, 0x64 subs r5, r0, r1 - b _0806CA72 + b @0806CA72 .align 2, 0 .pool -_0806CA70: +@0806CA70: adds r5, r2, 0 -_0806CA72: +@0806CA72: adds r1, r6, r5 movs r0, 0xFF lsls r0, 1 cmp r1, r0 - bls _0806CA80 + bls @0806CA80 adds r0, r5, r0 subs r5, r0, r1 -_0806CA80: +@0806CA80: adds r0, r3, r5 - b _0806CA98 -_0806CA84: + b @0806CA98 +@0806CA84: cmp r1, 0 - bne _0806CA8E + bne @0806CA8E movs r2, 0x1 str r2, [sp, 0x3C] - b _0806CD30 -_0806CA8E: + b @0806CD30 +@0806CA8E: adds r0, r1, r2 str r0, [sp, 0x4] cmp r0, 0 - bge _0806CA9A + bge @0806CA9A movs r0, 0 -_0806CA98: +@0806CA98: str r0, [sp, 0x4] -_0806CA9A: +@0806CA9A: ldr r0, =0x08329ec2 adds r0, r4, r0 ldrb r1, [r0] @@ -193314,10 +193314,10 @@ _0806CA9A: bl pokemon_calc_effective_stats movs r3, 0 str r3, [sp, 0x20] - b _0806CD30 + b @0806CD30 .align 2, 0 .pool -_0806CAB8: +@0806CAB8: mov r0, r8 movs r1, 0x15 movs r2, 0 @@ -193353,13 +193353,13 @@ _0806CAB8: lsrs r5, r0, 24 ldr r0, [sp] cmp r0, 0x2 - bls _0806CB0A - b _0806CD3A -_0806CB0A: + bls @0806CB0A + b @0806CD3A +@0806CB0A: cmp r5, 0x4 - bhi _0806CB10 - b _0806CD3A -_0806CB10: + bhi @0806CB10 + b @0806CD3A +@0806CB10: mov r0, r8 movs r1, 0x15 movs r2, 0 @@ -193413,37 +193413,37 @@ _0806CB10: bl pokemon_setattr movs r5, 0 str r5, [sp, 0x20] - b _0806CD3A + b @0806CD3A .align 2, 0 .pool -_0806CB94: +@0806CB94: mov r0, r8 movs r1, 0x20 movs r2, 0 bl pokemon_getattr cmp r0, 0x63 - bls _0806CBA4 - b _0806CD30 -_0806CBA4: + bls @0806CBA4 + b @0806CD30 +@0806CBA4: ldr r0, [sp, 0x20] cmp r0, 0 - beq _0806CBB2 + beq @0806CBB2 ldr r1, [sp, 0x3C] cmp r1, 0 - bne _0806CBB2 - b _0806CD30 -_0806CBB2: + bne @0806CBB2 + b @0806CD30 +@0806CBB2: bl sub_806F104 lsls r0, 24 cmp r0, 0 - beq _0806CBBE - b _0806CD30 -_0806CBBE: + beq @0806CBBE + b @0806CD30 +@0806CBBE: ldr r2, [sp, 0x30] cmp r2, 0 - beq _0806CBC6 - b _0806CD30 -_0806CBC6: + beq @0806CBC6 + b @0806CD30 +@0806CBC6: ldr r3, [sp, 0x24] ldr r5, [sp, 0x28] adds r0, r3, r5 @@ -193459,10 +193459,10 @@ _0806CBC6: lsls r4, r0, 24 asrs r1, r4, 24 cmp r1, 0 - ble _0806CCCC + ble @0806CCCC ldr r2, [sp, 0x34] cmp r2, 0x1B - bne _0806CCCC + bne @0806CCCC movs r0, 0x96 muls r0, r1 movs r1, 0x64 @@ -193470,39 +193470,39 @@ _0806CBC6: adds r0, r5, r0 str r0, [sp, 0x8] adds r2, r4, 0 - b _0806CCD8 -_0806CC00: + b @0806CCD8 +@0806CC00: mov r0, r8 movs r1, 0x20 movs r2, 0 bl pokemon_getattr cmp r0, 0x63 - bhi _0806CC10 - b _0806CD30 -_0806CC10: + bhi @0806CC10 + b @0806CD30 +@0806CC10: mov r0, r8 movs r1, 0x20 movs r2, 0 bl pokemon_getattr cmp r0, 0xC7 - bls _0806CC20 - b _0806CD30 -_0806CC20: + bls @0806CC20 + b @0806CD30 +@0806CC20: ldr r0, [sp, 0x20] cmp r0, 0 - beq _0806CC2E + beq @0806CC2E ldr r1, [sp, 0x3C] cmp r1, 0 - bne _0806CC2E - b _0806CD30 -_0806CC2E: + bne @0806CC2E + b @0806CD30 +@0806CC2E: bl sub_806F104 lsls r0, 24 cmp r0, 0 - bne _0806CD30 + bne @0806CD30 ldr r2, [sp, 0x30] cmp r2, 0 - bne _0806CD30 + bne @0806CD30 ldr r3, [sp, 0x24] ldr r5, [sp, 0x28] adds r0, r3, r5 @@ -193518,32 +193518,32 @@ _0806CC2E: lsls r5, r0, 24 asrs r1, r5, 24 cmp r1, 0 - ble _0806CCCC + ble @0806CCCC ldr r2, [sp, 0x34] cmp r2, 0x1B - beq _0806CCBA - b _0806CCCC -_0806CC68: + beq @0806CCBA + b @0806CCCC +@0806CC68: mov r0, r8 movs r1, 0x20 movs r2, 0 bl pokemon_getattr cmp r0, 0xC7 - bls _0806CD30 + bls @0806CD30 ldr r0, [sp, 0x20] cmp r0, 0 - beq _0806CC82 + beq @0806CC82 ldr r1, [sp, 0x3C] cmp r1, 0 - beq _0806CD30 -_0806CC82: + beq @0806CD30 +@0806CC82: bl sub_806F104 lsls r0, 24 cmp r0, 0 - bne _0806CD30 + bne @0806CD30 ldr r2, [sp, 0x30] cmp r2, 0 - bne _0806CD30 + bne @0806CD30 ldr r3, [sp, 0x24] ldr r5, [sp, 0x28] adds r0, r3, r5 @@ -193559,11 +193559,11 @@ _0806CC82: lsls r5, r0, 24 asrs r1, r5, 24 cmp r1, 0 - ble _0806CCCC + ble @0806CCCC ldr r2, [sp, 0x34] cmp r2, 0x1B - bne _0806CCCC -_0806CCBA: + bne @0806CCCC +@0806CCBA: movs r0, 0x96 muls r0, r1 movs r1, 0x64 @@ -193571,27 +193571,27 @@ _0806CCBA: adds r0, r4, r0 str r0, [sp, 0x8] adds r2, r5, 0 - b _0806CCD8 -_0806CCCC: + b @0806CCD8 +@0806CCCC: ldr r3, [sp, 0x30] lsls r2, r3, 24 asrs r1, r2, 24 ldr r0, [sp, 0x8] adds r0, r1 str r0, [sp, 0x8] -_0806CCD8: +@0806CCD8: cmp r2, 0 - ble _0806CD0E + ble @0806CD0E mov r0, r8 movs r1, 0x26 movs r2, 0 bl pokemon_getattr cmp r0, 0xB - bne _0806CCF0 + bne @0806CCF0 ldr r0, [sp, 0x8] adds r0, 0x1 str r0, [sp, 0x8] -_0806CCF0: +@0806CCF0: mov r0, r8 movs r1, 0x23 movs r2, 0 @@ -193601,36 +193601,36 @@ _0806CCF0: lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bne _0806CD0E + bne @0806CD0E ldr r0, [sp, 0x8] adds r0, 0x1 str r0, [sp, 0x8] -_0806CD0E: +@0806CD0E: ldr r0, [sp, 0x8] cmp r0, 0 - bge _0806CD18 + bge @0806CD18 movs r0, 0 str r0, [sp, 0x8] -_0806CD18: +@0806CD18: ldr r0, [sp, 0x8] cmp r0, 0xFF - ble _0806CD22 + ble @0806CD22 movs r0, 0xFF str r0, [sp, 0x8] -_0806CD22: +@0806CD22: add r2, sp, 0x8 mov r0, r8 movs r1, 0x20 bl pokemon_setattr movs r5, 0 str r5, [sp, 0x20] -_0806CD30: +@0806CD30: ldr r0, [sp, 0x28] adds r0, 0x1 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x28] -_0806CD3A: +@0806CD3A: ldr r0, [sp, 0x2C] adds r0, 0x1 str r0, [sp, 0x2C] @@ -193638,18 +193638,18 @@ _0806CD3A: lsrs r1, 1 mov r10, r1 cmp r1, 0 - beq _0806CD4C - b _0806C9D4 -_0806CD4C: + beq @0806CD4C + b @0806C9D4 +@0806CD4C: ldr r2, [sp, 0x1C] adds r2, 0x1 str r2, [sp, 0x1C] cmp r2, 0x5 - bgt _0806CD5A - bl _0806BEFC -_0806CD5A: + bgt @0806CD5A + bl @0806BEFC +@0806CD5A: ldr r0, [sp, 0x20] -_0806CD5C: +@0806CD5C: add sp, 0x44 pop {r3-r5} mov r8, r3 @@ -193661,7 +193661,7 @@ _0806CD5C: thumb_func_end sub_806BD28 thumb_func_start pokemon_clear_ailments -pokemon_clear_ailments: @ 806CD6C +pokemon_clear_ailments: ; 806CD6C push {r4-r6,lr} sub sp, 0x4 adds r5, r0, 0 @@ -193675,7 +193675,7 @@ pokemon_clear_ailments: @ 806CD6C str r1, [sp] ands r0, r4 cmp r0, 0 - beq _0806CDD0 + beq @0806CDD0 mvns r4, r4 ands r1, r4 str r1, [sp] @@ -193690,9 +193690,9 @@ pokemon_clear_ailments: @ 806CD6C movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0806CDBE + beq @0806CDBE cmp r6, 0x4 - beq _0806CDBE + beq @0806CDBE ldr r0, =0x02024084 movs r1, 0x58 muls r1, r6 @@ -193701,23 +193701,22 @@ pokemon_clear_ailments: @ 806CD6C ldr r0, [r1] ands r0, r4 str r0, [r1] -_0806CDBE: +@0806CDBE: movs r0, 0 - b _0806CDD2 + b @0806CDD2 .align 2, 0 .pool -_0806CDD0: +@0806CDD0: movs r0, 0x1 -_0806CDD2: +@0806CDD2: add sp, 0x4 pop {r4-r6} pop {r1} bx r1 thumb_func_end pokemon_clear_ailments - thumb_func_start sub_806CDDA -sub_806CDDA: @ 806CDDA -_0806CDDC: + thumb_func_start sub_806CDDC +sub_806CDDC: ; 806CDDC push {r4-r7,lr} lsls r0, 16 lsrs r3, r0, 16 @@ -193733,18 +193732,18 @@ _0806CDDC: adds r0, r1 ldr r0, [r0] cmp r0, 0 - bne _0806CE08 + bne @0806CE08 cmp r3, 0xAF - beq _0806CE0C -_0806CE00: + beq @0806CE0C +@0806CE00: movs r0, 0 - b _0806CF1C + b @0806CF1C .align 2, 0 .pool -_0806CE08: +@0806CE08: cmp r3, 0xAF - bne _0806CE1A -_0806CE0C: + bne @0806CE1A +@0806CE0C: ldr r0, =0x02024064 ldrb r1, [r0] lsls r0, r1, 3 @@ -193752,154 +193751,154 @@ _0806CE0C: lsls r0, 2 ldr r1, =0x0202440c adds r0, r1 -_0806CE1A: +@0806CE1A: mov r12, r0 movs r2, 0 -_0806CE1E: +@0806CE1E: cmp r2, 0x4 - beq _0806CE3E + beq @0806CE3E cmp r2, 0x4 - ble _0806CE34 + ble @0806CE34 cmp r2, 0x5 - beq _0806CEC8 - b _0806CF12 + beq @0806CEC8 + b @0806CF12 .align 2, 0 .pool -_0806CE34: +@0806CE34: cmp r2, 0 - blt _0806CF12 + blt @0806CF12 cmp r2, r4 - bne _0806CF12 - b _0806CE00 -_0806CE3E: + bne @0806CF12 + b @0806CE00 +@0806CE3E: mov r0, r12 ldrb r3, [r0, 0x4] movs r0, 0x20 ands r0, r3 cmp r0, 0 - beq _0806CE4E + beq @0806CE4E movs r0, 0xDF ands r3, r0 -_0806CE4E: +@0806CE4E: movs r6, 0 cmp r3, 0 - beq _0806CF12 -_0806CE54: + beq @0806CF12 +@0806CE54: movs r0, 0x1 ands r0, r3 cmp r0, 0 - beq _0806CEB4 + beq @0806CEB4 cmp r6, 0x7 - bhi _0806CEB4 + bhi @0806CEB4 lsls r0, r6, 2 - ldr r1, =_0806CE70 + ldr r1, =@0806CE70 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0806CE70: - .4byte _0806CE9C - .4byte _0806CE9C - .4byte _0806CE90 - .4byte _0806CE9C - .4byte _0806CEB4 - .4byte _0806CEB4 - .4byte _0806CEB4 - .4byte _0806CEB0 -_0806CE90: +@0806CE70: + .4byte @0806CE9C + .4byte @0806CE9C + .4byte @0806CE90 + .4byte @0806CE9C + .4byte @0806CEB4 + .4byte @0806CEB4 + .4byte @0806CEB4 + .4byte @0806CEB0 +@0806CE90: movs r0, 0x10 ands r0, r3 cmp r0, 0 - beq _0806CE9C + beq @0806CE9C movs r0, 0xEF ands r3, r0 -_0806CE9C: +@0806CE9C: cmp r2, r4 - bne _0806CEA8 + bne @0806CEA8 adds r0, r3, 0 ands r0, r5 cmp r0, 0 - bne _0806CF1A -_0806CEA8: + bne @0806CF1A +@0806CEA8: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 - b _0806CEB4 -_0806CEB0: + b @0806CEB4 +@0806CEB0: cmp r2, r4 - beq _0806CE00 -_0806CEB4: + beq @0806CE00 +@0806CEB4: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 lsrs r3, 1 cmp r2, r4 - bne _0806CEC2 + bne @0806CEC2 lsrs r5, 1 -_0806CEC2: +@0806CEC2: cmp r3, 0 - bne _0806CE54 - b _0806CF12 -_0806CEC8: + bne @0806CE54 + b @0806CF12 +@0806CEC8: mov r0, r12 ldrb r3, [r0, 0x5] movs r6, 0 -_0806CECE: +@0806CECE: cmp r3, 0 - beq _0806CF12 + beq @0806CF12 movs r0, 0x1 ands r0, r3 cmp r0, 0 - beq _0806CF02 + beq @0806CF02 cmp r6, 0 - blt _0806CF02 + blt @0806CF02 cmp r6, 0x6 - ble _0806CEE8 + ble @0806CEE8 cmp r6, 0x7 - beq _0806CEFC - b _0806CF02 -_0806CEE8: + beq @0806CEFC + b @0806CF02 +@0806CEE8: cmp r2, r4 - bne _0806CEF4 + bne @0806CEF4 adds r0, r3, 0 ands r0, r5 cmp r0, 0 - bne _0806CF1A -_0806CEF4: + bne @0806CF1A +@0806CEF4: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 - b _0806CF02 -_0806CEFC: + b @0806CF02 +@0806CEFC: cmp r2, r4 - bne _0806CF02 - b _0806CE00 -_0806CF02: + bne @0806CF02 + b @0806CE00 +@0806CF02: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 lsrs r3, 1 cmp r2, r4 - bne _0806CECE + bne @0806CECE lsrs r5, 1 - b _0806CECE -_0806CF12: + b @0806CECE +@0806CF12: adds r2, 0x1 cmp r2, 0x5 - bgt _0806CF1A - b _0806CE1E -_0806CF1A: + bgt @0806CF1A + b @0806CE1E +@0806CF1A: adds r0, r7, 0 -_0806CF1C: +@0806CF1C: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_806CDDA + thumb_func_end sub_806CDDC thumb_func_start sub_806CF24 -sub_806CF24: @ 806CF24 +sub_806CF24: ; 806CF24 push {lr} ldr r2, =0x0202420c ldr r1, =0x020244b8 @@ -193927,14 +193926,14 @@ 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} lsls r0, 16 lsrs r0, 16 cmp r0, 0xAF - bne _0806CFCC + bne @0806CFCC ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -193942,7 +193941,7 @@ sub_806CF78: @ 806CF78 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0806CFB8 + beq @0806CFB8 ldr r2, =0x020244b8 ldrb r1, [r2] lsls r0, r1, 3 @@ -193950,26 +193949,26 @@ sub_806CF78: @ 806CF78 lsls r0, 2 ldr r1, =0x0202440c adds r7, r0, r1 - b _0806CFD8 + b @0806CFD8 .align 2, 0 .pool -_0806CFB8: +@0806CFB8: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00003214 adds r7, r0, r1 - b _0806CFD6 + b @0806CFD6 .align 2, 0 .pool -_0806CFCC: +@0806CFCC: ldr r1, =0x0831e58c subs r0, 0xD lsls r0, 2 adds r0, r1 ldr r7, [r0] -_0806CFD6: +@0806CFD6: ldr r2, =0x020244b8 -_0806CFD8: +@0806CFD8: ldr r1, =0x0202420f ldrb r0, [r2] strb r0, [r1] @@ -193977,52 +193976,52 @@ _0806CFD8: ldr r0, =0x0202420b mov r8, r0 movs r6, 0 -_0806CFE6: +@0806CFE6: adds r4, r7, r5 ldrb r1, [r4] movs r0, 0xF ands r0, r1 cmp r0, 0 - beq _0806CFF8 + beq @0806CFF8 adds r0, r6, 0 bl sub_806CF24 -_0806CFF8: +@0806CFF8: ldrb r1, [r4] movs r0, 0xF0 ands r0, r1 cmp r0, 0 - beq _0806D02E + beq @0806D02E cmp r5, 0 - beq _0806D020 + beq @0806D020 adds r0, r6, 0x1 bl sub_806CF24 - b _0806D02E + b @0806D02E .align 2, 0 .pool -_0806D020: +@0806D020: ldr r0, =0x020244b8 ldrb r0, [r0] mov r1, r8 strb r0, [r1] ldr r0, =0x085ca459 bl sub_814E6F0 -_0806D02E: +@0806D02E: adds r6, 0x2 adds r5, 0x1 cmp r5, 0x2 - ble _0806CFE6 + ble @0806CFE6 ldrb r1, [r7, 0x3] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0806D04E + beq @0806D04E ldr r1, =0x0202420b ldr r0, =0x020244b8 ldrb r0, [r0] strb r0, [r1] ldr r0, =0x085ca424 bl sub_814E6F0 -_0806D04E: +@0806D04E: ldr r0, =0x02022e2c pop {r3} mov r8, r3 @@ -194034,8 +194033,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 @@ -194049,7 +194048,8 @@ GetNature: @ 806D070 thumb_func_end GetNature thumb_func_start GetNatureFromPersonality -GetNatureFromPersonality: @ 806D088 +; u8 GetNatureFromPersonality(u32 personality) +GetNatureFromPersonality: ; 806D088 push {lr} movs r1, 0x19 bl __umodsi3 @@ -194060,7 +194060,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 @@ -194104,49 +194104,49 @@ GetEvolutionTargetSpecies: @ 806D098 mov r0, sp ldrh r0, [r0] cmp r0, 0xAF - bne _0806D10C + bne @0806D10C ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00003226 adds r0, r1 ldrb r0, [r0] - b _0806D114 + b @0806D114 .align 2, 0 .pool -_0806D10C: +@0806D10C: bl itemid_get_x12 lsls r0, 24 lsrs r0, 24 -_0806D114: +@0806D114: cmp r0, 0x26 - bne _0806D120 + bne @0806D120 cmp r5, 0x3 - beq _0806D120 + beq @0806D120 movs r0, 0 - b _0806D3B0 -_0806D120: + b @0806D3B0 +@0806D120: cmp r5, 0x1 - bne _0806D126 - b _0806D340 -_0806D126: + bne @0806D126 + b @0806D340 +@0806D126: cmp r5, 0x1 - bgt _0806D130 + bgt @0806D130 cmp r5, 0 - beq _0806D144 - b _0806D3AE -_0806D130: + beq @0806D144 + b @0806D3AE +@0806D130: cmp r5, 0x3 - ble _0806D136 - b _0806D3AE -_0806D136: + ble @0806D136 + b @0806D3AE +@0806D136: movs r2, 0 str r2, [sp, 0x4] ldr r3, =0x0832531c lsls r6, r7, 2 - b _0806D38E + b @0806D38E .align 2, 0 .pool -_0806D144: +@0806D144: mov r0, r8 movs r1, 0x38 movs r2, 0 @@ -194164,7 +194164,7 @@ _0806D144: movs r0, 0 str r0, [sp, 0x4] lsls r6, r7, 2 -_0806D16A: +@0806D16A: ldr r1, =0x0832531c ldr r0, [sp, 0x4] lsls r2, r0, 3 @@ -194177,45 +194177,45 @@ _0806D16A: adds r3, r1, 0 adds r4, r2, 0 cmp r0, 0xE - bls _0806D186 - b _0806D332 -_0806D186: + bls @0806D186 + b @0806D332 +@0806D186: lsls r0, 2 - ldr r1, =_0806D198 + ldr r1, =@0806D198 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0806D198: - .4byte _0806D1D4 - .4byte _0806D1E6 - .4byte _0806D208 - .4byte _0806D238 - .4byte _0806D332 - .4byte _0806D332 - .4byte _0806D332 - .4byte _0806D248 - .4byte _0806D272 - .4byte _0806D29C - .4byte _0806D2CA - .4byte _0806D2EA - .4byte _0806D30E - .4byte _0806D332 - .4byte _0806D31E -_0806D1D4: +@0806D198: + .4byte @0806D1D4 + .4byte @0806D1E6 + .4byte @0806D208 + .4byte @0806D238 + .4byte @0806D332 + .4byte @0806D332 + .4byte @0806D332 + .4byte @0806D248 + .4byte @0806D272 + .4byte @0806D29C + .4byte @0806D2CA + .4byte @0806D2EA + .4byte @0806D30E + .4byte @0806D332 + .4byte @0806D31E +@0806D1D4: ldr r1, [sp, 0x8] cmp r1, 0xDB - bhi _0806D1DC - b _0806D332 -_0806D1DC: + bhi @0806D1DC + b @0806D332 +@0806D1DC: adds r0, r6, r7 lsls r0, 3 adds r0, r4, r0 adds r0, r3 - b _0806D228 -_0806D1E6: + b @0806D228 +@0806D1E6: bl sub_802F588 ldr r0, =0x03005cf8 ldrb r0, [r0, 0x2] @@ -194223,58 +194223,58 @@ _0806D1E6: lsls r0, 24 lsrs r0, 24 cmp r0, 0xB - bls _0806D1FA - b _0806D332 -_0806D1FA: + bls @0806D1FA + b @0806D332 +@0806D1FA: ldr r2, [sp, 0x8] cmp r2, 0xDB - bhi _0806D202 - b _0806D332 -_0806D202: - b _0806D21E + bhi @0806D202 + b @0806D332 +@0806D202: + b @0806D21E .align 2, 0 .pool -_0806D208: +@0806D208: bl sub_802F588 ldr r0, =0x03005cf8 ldrb r0, [r0, 0x2] cmp r0, 0xB - bls _0806D216 - b _0806D332 -_0806D216: + bls @0806D216 + b @0806D332 +@0806D216: ldr r0, [sp, 0x8] cmp r0, 0xDB - bhi _0806D21E - b _0806D332 -_0806D21E: + bhi @0806D21E + b @0806D332 +@0806D21E: ldr r1, =0x0832531c adds r0, r6, r7 lsls r0, 3 adds r0, r4, r0 adds r0, r1 -_0806D228: +@0806D228: ldrh r0, [r0, 0x4] mov r10, r0 - b _0806D332 + b @0806D332 .align 2, 0 .pool -_0806D238: +@0806D238: adds r0, r6, r7 lsls r0, 3 adds r0, r4, r0 adds r1, r0, r3 ldrh r0, [r1, 0x2] cmp r0, r9 - bhi _0806D332 - b _0806D32E -_0806D248: + bhi @0806D332 + b @0806D32E +@0806D248: adds r0, r6, r7 lsls r0, 3 adds r0, r4, r0 adds r5, r0, r3 ldrh r0, [r5, 0x2] cmp r0, r9 - bhi _0806D332 + bhi @0806D332 mov r0, r8 movs r1, 0x3B movs r2, 0 @@ -194285,16 +194285,16 @@ _0806D248: movs r2, 0 bl pokemon_getattr cmp r4, r0 - bls _0806D332 - b _0806D2C4 -_0806D272: + bls @0806D332 + b @0806D2C4 +@0806D272: adds r0, r6, r7 lsls r0, 3 adds r0, r4, r0 adds r5, r0, r3 ldrh r0, [r5, 0x2] cmp r0, r9 - bhi _0806D332 + bhi @0806D332 mov r0, r8 movs r1, 0x3B movs r2, 0 @@ -194305,16 +194305,16 @@ _0806D272: movs r2, 0 bl pokemon_getattr cmp r4, r0 - bne _0806D332 - b _0806D2C4 -_0806D29C: + bne @0806D332 + b @0806D2C4 +@0806D29C: adds r0, r6, r7 lsls r0, 3 adds r0, r4, r0 adds r5, r0, r3 ldrh r0, [r5, 0x2] cmp r0, r9 - bhi _0806D332 + bhi @0806D332 mov r0, r8 movs r1, 0x3B movs r2, 0 @@ -194325,56 +194325,56 @@ _0806D29C: movs r2, 0 bl pokemon_getattr cmp r4, r0 - bcs _0806D332 -_0806D2C4: + bcs @0806D332 +@0806D2C4: ldrh r5, [r5, 0x4] mov r10, r5 - b _0806D332 -_0806D2CA: + b @0806D332 +@0806D2CA: adds r0, r6, r7 lsls r0, 3 adds r0, r4, r0 adds r4, r0, r3 ldrh r0, [r4, 0x2] cmp r0, r9 - bhi _0806D332 + bhi @0806D332 ldr r0, [sp, 0x10] movs r1, 0xA bl __umodsi3 lsls r0, 16 lsrs r0, 16 cmp r0, 0x4 - bhi _0806D332 - b _0806D308 -_0806D2EA: + bhi @0806D332 + b @0806D308 +@0806D2EA: adds r0, r6, r7 lsls r0, 3 adds r0, r4, r0 adds r4, r0, r3 ldrh r0, [r4, 0x2] cmp r0, r9 - bhi _0806D332 + bhi @0806D332 ldr r0, [sp, 0x10] movs r1, 0xA bl __umodsi3 lsls r0, 16 lsrs r0, 16 cmp r0, 0x4 - bls _0806D332 -_0806D308: + bls @0806D332 +@0806D308: ldrh r4, [r4, 0x4] mov r10, r4 - b _0806D332 -_0806D30E: + b @0806D332 +@0806D30E: adds r0, r6, r7 lsls r0, 3 adds r0, r4, r0 adds r1, r0, r3 ldrh r0, [r1, 0x2] cmp r0, r9 - bhi _0806D332 - b _0806D32E -_0806D31E: + bhi @0806D332 + b @0806D32E +@0806D31E: adds r0, r6, r7 lsls r0, 3 adds r0, r4, r0 @@ -194382,20 +194382,20 @@ _0806D31E: ldrh r0, [r1, 0x2] ldr r2, [sp, 0xC] cmp r0, r2 - bhi _0806D332 -_0806D32E: + bhi @0806D332 +@0806D32E: ldrh r1, [r1, 0x4] mov r10, r1 -_0806D332: +@0806D332: ldr r0, [sp, 0x4] adds r0, 0x1 str r0, [sp, 0x4] cmp r0, 0x4 - bgt _0806D33E - b _0806D16A -_0806D33E: - b _0806D3AE -_0806D340: + bgt @0806D33E + b @0806D16A +@0806D33E: + b @0806D3AE +@0806D340: lsls r6, r7, 2 ldr r1, =0x0832531c adds r0, r6, r7 @@ -194404,40 +194404,40 @@ _0806D340: mov r5, sp movs r1, 0x4 str r1, [sp, 0x4] -_0806D350: +@0806D350: ldrh r0, [r4] cmp r0, 0x5 - beq _0806D370 + beq @0806D370 cmp r0, 0x6 - bne _0806D374 + bne @0806D374 ldrh r0, [r4, 0x2] ldrh r1, [r5] cmp r0, r1 - bne _0806D374 + bne @0806D374 movs r0, 0 strh r0, [r5] mov r0, r8 movs r1, 0xC mov r2, sp bl pokemon_setattr -_0806D370: +@0806D370: ldrh r2, [r4, 0x4] mov r10, r2 -_0806D374: +@0806D374: adds r4, 0x8 ldr r0, [sp, 0x4] subs r0, 0x1 str r0, [sp, 0x4] cmp r0, 0 - bge _0806D350 - b _0806D3AE + bge @0806D350 + b @0806D3AE .align 2, 0 .pool -_0806D388: +@0806D388: ldrh r1, [r1, 0x4] mov r10, r1 - b _0806D3AE -_0806D38E: + b @0806D3AE +@0806D38E: adds r0, r6, r7 ldr r1, [sp, 0x4] adds r0, r1 @@ -194445,19 +194445,19 @@ _0806D38E: adds r1, r0, r3 ldrh r0, [r1] cmp r0, 0x7 - bne _0806D3A4 + bne @0806D3A4 ldrh r0, [r1, 0x2] cmp r0, r9 - beq _0806D388 -_0806D3A4: + beq @0806D388 +@0806D3A4: ldr r2, [sp, 0x4] adds r2, 0x1 str r2, [sp, 0x4] cmp r2, 0x4 - ble _0806D38E -_0806D3AE: + ble @0806D38E +@0806D3AE: mov r0, r10 -_0806D3B0: +@0806D3B0: add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -194469,229 +194469,229 @@ _0806D3B0: thumb_func_end GetEvolutionTargetSpecies thumb_func_start HoennPokedexNumToSpecies -HoennPokedexNumToSpecies: @ 806D3C0 +HoennPokedexNumToSpecies: ; 806D3C0 push {r4,lr} lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0 - beq _0806D404 + beq @0806D404 movs r1, 0 ldr r3, =gSpeciesToHoennPokedexNum ldrh r0, [r3] cmp r0, r2 - beq _0806D3EC + beq @0806D3EC movs r4, 0xCD lsls r4, 1 -_0806D3D8: +@0806D3D8: adds r0, r1, 0x1 lsls r0, 16 lsrs r1, r0, 16 cmp r1, r4 - bhi _0806D3EC + bhi @0806D3EC lsls r0, r1, 1 adds r0, r3 ldrh r0, [r0] cmp r0, r2 - bne _0806D3D8 -_0806D3EC: + bne @0806D3D8 +@0806D3EC: ldr r0, =0x0000019b cmp r1, r0 - beq _0806D404 + beq @0806D404 adds r0, r1, 0x1 lsls r0, 16 lsrs r0, 16 - b _0806D406 + b @0806D406 .align 2, 0 .pool -_0806D404: +@0806D404: movs r0, 0 -_0806D406: +@0806D406: pop {r4} pop {r1} bx r1 thumb_func_end HoennPokedexNumToSpecies thumb_func_start NationalPokedexNumToSpecies -NationalPokedexNumToSpecies: @ 806D40C +NationalPokedexNumToSpecies: ; 806D40C push {r4,lr} lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0 - beq _0806D450 + beq @0806D450 movs r1, 0 ldr r3, =gSpeciesToNationalPokedexNum ldrh r0, [r3] cmp r0, r2 - beq _0806D438 + beq @0806D438 movs r4, 0xCD lsls r4, 1 -_0806D424: +@0806D424: adds r0, r1, 0x1 lsls r0, 16 lsrs r1, r0, 16 cmp r1, r4 - bhi _0806D438 + bhi @0806D438 lsls r0, r1, 1 adds r0, r3 ldrh r0, [r0] cmp r0, r2 - bne _0806D424 -_0806D438: + bne @0806D424 +@0806D438: ldr r0, =0x0000019b cmp r1, r0 - beq _0806D450 + beq @0806D450 adds r0, r1, 0x1 lsls r0, 16 lsrs r0, 16 - b _0806D452 + b @0806D452 .align 2, 0 .pool -_0806D450: +@0806D450: movs r0, 0 -_0806D452: +@0806D452: pop {r4} pop {r1} bx r1 thumb_func_end NationalPokedexNumToSpecies thumb_func_start NationalToHoennOrder -NationalToHoennOrder: @ 806D458 +NationalToHoennOrder: ; 806D458 push {r4,lr} lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0 - beq _0806D49C + beq @0806D49C movs r1, 0 ldr r3, =gHoennToNationalOrder ldrh r0, [r3] cmp r0, r2 - beq _0806D484 + beq @0806D484 movs r4, 0xCD lsls r4, 1 -_0806D470: +@0806D470: adds r0, r1, 0x1 lsls r0, 16 lsrs r1, r0, 16 cmp r1, r4 - bhi _0806D484 + bhi @0806D484 lsls r0, r1, 1 adds r0, r3 ldrh r0, [r0] cmp r0, r2 - bne _0806D470 -_0806D484: + bne @0806D470 +@0806D484: ldr r0, =0x0000019b cmp r1, r0 - beq _0806D49C + beq @0806D49C adds r0, r1, 0x1 lsls r0, 16 lsrs r0, 16 - b _0806D49E + b @0806D49E .align 2, 0 .pool -_0806D49C: +@0806D49C: movs r0, 0 -_0806D49E: +@0806D49E: pop {r4} pop {r1} bx r1 thumb_func_end NationalToHoennOrder thumb_func_start SpeciesToNationalPokedexNum -SpeciesToNationalPokedexNum: @ 806D4A4 +SpeciesToNationalPokedexNum: ; 806D4A4 push {lr} lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - beq _0806D4C0 + beq @0806D4C0 ldr r0, =gSpeciesToNationalPokedexNum subs r1, 0x1 lsls r1, 1 adds r1, r0 ldrh r0, [r1] - b _0806D4C2 + b @0806D4C2 .align 2, 0 .pool -_0806D4C0: +@0806D4C0: movs r0, 0 -_0806D4C2: +@0806D4C2: pop {r1} bx r1 thumb_func_end SpeciesToNationalPokedexNum thumb_func_start SpeciesToHoennPokedexNum -SpeciesToHoennPokedexNum: @ 806D4C8 +SpeciesToHoennPokedexNum: ; 806D4C8 push {lr} lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - beq _0806D4E4 + beq @0806D4E4 ldr r0, =gSpeciesToHoennPokedexNum subs r1, 0x1 lsls r1, 1 adds r1, r0 ldrh r0, [r1] - b _0806D4E6 + b @0806D4E6 .align 2, 0 .pool -_0806D4E4: +@0806D4E4: movs r0, 0 -_0806D4E6: +@0806D4E6: pop {r1} bx r1 thumb_func_end SpeciesToHoennPokedexNum thumb_func_start HoennToNationalOrder -HoennToNationalOrder: @ 806D4EC +HoennToNationalOrder: ; 806D4EC push {lr} lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - beq _0806D508 + beq @0806D508 ldr r0, =gHoennToNationalOrder subs r1, 0x1 lsls r1, 1 adds r1, r0 ldrh r0, [r1] - b _0806D50A + b @0806D50A .align 2, 0 .pool -_0806D508: +@0806D508: movs r0, 0 -_0806D50A: +@0806D50A: pop {r1} bx r1 thumb_func_end HoennToNationalOrder thumb_func_start speciesid_conv -speciesid_conv: @ 806D510 +speciesid_conv: ; 806D510 push {lr} lsls r0, 16 lsrs r0, 16 adds r1, r0, 0 cmp r0, 0xFA - bls _0806D53E + bls @0806D53E ldr r0, =0x00000113 cmp r1, r0 - bls _0806D53C + bls @0806D53C ldr r0, =0x0831f61c ldr r2, =0xfffffeec adds r1, r2 lsls r1, 1 adds r1, r0 ldrh r0, [r1] - b _0806D53E + b @0806D53E .align 2, 0 .pool -_0806D53C: +@0806D53C: movs r0, 0xC8 -_0806D53E: +@0806D53E: pop {r1} bx r1 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 @@ -194704,17 +194704,17 @@ sub_806D544: @ 806D544 movs r1, 0x9A lsls r1, 17 cmp r0, r1 - bne _0806D652 + bne @0806D652 ldr r0, =0x020244d4 ldr r1, [r0] ldr r0, [r1, 0x4] cmp r10, r0 - beq _0806D652 + beq @0806D652 ldr r0, [r1, 0xC] cmp r10, r0 - beq _0806D652 + beq @0806D652 movs r5, 0 -_0806D570: +@0806D570: lsls r3, r5, 3 adds r3, r5 lsls r3, 2 @@ -194743,7 +194743,7 @@ _0806D570: adds r5, 0x1 str r5, [sp] mov r9, r3 -_0806D5A8: +@0806D5A8: lsls r0, r2, 1 add r0, r9 ldr r3, =0x0831e2f2 @@ -194756,18 +194756,18 @@ _0806D5A8: adds r2, 0x1 mov r8, r2 cmp r4, r0 - bge _0806D640 + bge @0806D640 lsrs r0, r1, 3 lsls r6, r0, 8 movs r0, 0x7 ands r1, r0 lsls r5, r1, 2 -_0806D5CC: +@0806D5CC: adds r0, r4, 0 cmp r4, 0 - bge _0806D5D4 + bge @0806D5D4 adds r0, r4, 0x7 -_0806D5D4: +@0806D5D4: asrs r0, 3 lsls r2, r0, 5 add r2, r10 @@ -194783,11 +194783,11 @@ _0806D5D4: adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _0806D634 + beq @0806D634 adds r0, r4, 0 ands r0, r1 cmp r0, 0 - beq _0806D620 + beq @0806D620 ldrb r1, [r2] movs r0, 0xF0 ands r0, r1 @@ -194795,13 +194795,13 @@ _0806D5D4: lsls r0, 24 lsrs r0, 24 cmp r0, 0x20 - bhi _0806D634 + bhi @0806D634 adds r0, r1, 0 adds r0, 0x40 - b _0806D632 + b @0806D632 .align 2, 0 .pool -_0806D620: +@0806D620: ldrb r1, [r2] movs r0, 0xF ands r0, r1 @@ -194809,28 +194809,28 @@ _0806D620: lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bhi _0806D634 + bhi @0806D634 adds r0, r1, 0x4 -_0806D632: +@0806D632: strb r0, [r2] -_0806D634: +@0806D634: asrs r3, 1 adds r4, 0x1 mov r0, r12 adds r0, 0x10 cmp r4, r0 - blt _0806D5CC -_0806D640: + blt @0806D5CC +@0806D640: lsls r0, r7, 24 lsrs r1, r0, 24 mov r2, r8 cmp r2, 0xF - ble _0806D5A8 + ble @0806D5A8 ldr r6, [sp, 0x4] ldr r5, [sp] cmp r5, 0x3 - ble _0806D570 -_0806D652: + ble @0806D570 +@0806D652: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -194842,7 +194842,7 @@ _0806D652: thumb_func_end sub_806D544 thumb_func_start sub_806D664 -sub_806D664: @ 806D664 +sub_806D664: ; 806D664 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -194857,11 +194857,11 @@ sub_806D664: @ 806D664 movs r1, 0x9A lsls r1, 17 cmp r0, r1 - bne _0806D766 + bne @0806D766 cmp r3, 0 - beq _0806D766 + beq @0806D766 movs r6, 0 -_0806D688: +@0806D688: lsls r3, r6, 3 adds r3, r6 lsls r3, 2 @@ -194890,7 +194890,7 @@ _0806D688: adds r6, 0x1 mov r10, r6 mov r9, r3 -_0806D6C0: +@0806D6C0: lsls r0, r2, 1 add r0, r9 ldr r3, =0x0831e2f2 @@ -194903,18 +194903,18 @@ _0806D6C0: adds r2, 0x1 mov r8, r2 cmp r4, r0 - bge _0806D754 + bge @0806D754 lsrs r0, r1, 3 lsls r6, r0, 8 movs r0, 0x7 ands r1, r0 lsls r5, r1, 2 -_0806D6E4: +@0806D6E4: adds r0, r4, 0 cmp r4, 0 - bge _0806D6EC + bge @0806D6EC adds r0, r4, 0x7 -_0806D6EC: +@0806D6EC: asrs r0, 3 lsls r2, r0, 5 ldr r1, [sp] @@ -194931,11 +194931,11 @@ _0806D6EC: adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _0806D748 + beq @0806D748 adds r0, r4, 0 ands r0, r1 cmp r0, 0 - beq _0806D734 + beq @0806D734 ldrb r1, [r2] movs r0, 0xF0 ands r0, r1 @@ -194943,13 +194943,13 @@ _0806D6EC: lsls r0, 24 lsrs r0, 24 cmp r0, 0x20 - bhi _0806D748 + bhi @0806D748 adds r0, r1, 0 adds r0, 0x40 - b _0806D746 + b @0806D746 .align 2, 0 .pool -_0806D734: +@0806D734: ldrb r1, [r2] movs r0, 0xF ands r0, r1 @@ -194957,28 +194957,28 @@ _0806D734: lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bhi _0806D748 + bhi @0806D748 adds r0, r1, 0x4 -_0806D746: +@0806D746: strb r0, [r2] -_0806D748: +@0806D748: asrs r3, 1 adds r4, 0x1 mov r0, r12 adds r0, 0x10 cmp r4, r0 - blt _0806D6E4 -_0806D754: + blt @0806D6E4 +@0806D754: lsls r0, r7, 24 lsrs r1, r0, 24 mov r2, r8 cmp r2, 0xF - ble _0806D6C0 + ble @0806D6C0 ldr r5, [sp, 0x4] mov r6, r10 cmp r6, 0x3 - ble _0806D688 -_0806D766: + ble @0806D688 +@0806D766: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -194990,7 +194990,7 @@ _0806D766: thumb_func_end sub_806D664 thumb_func_start sub_806D778 -sub_806D778: @ 806D778 +sub_806D778: ; 806D778 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -195017,7 +195017,7 @@ sub_806D778: @ 806D778 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _0806D7D4 + bne @0806D7D4 movs r6, 0xB adds r0, r7, 0 muls r0, r6 @@ -195026,14 +195026,14 @@ sub_806D778: @ 806D778 mov r1, r9 bl sub_8008C44 cmp r0, 0 - bne _0806D7D4 + bne @0806D7D4 mov r2, r8 muls r2, r6 adds r2, r4 adds r0, r5, 0 movs r1, 0x2 bl pokemon_setattr -_0806D7D4: +@0806D7D4: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -195046,7 +195046,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 @@ -195059,23 +195059,23 @@ sub_806D7EC: @ 806D7EC adds r1, r4 ldrh r0, [r1, 0x18] cmp r0, 0x2 - bgt _0806D818 + bgt @0806D818 cmp r0, 0x1 - bge _0806D820 + bge @0806D820 cmp r0, 0 - beq _0806D81C - b _0806D822 + beq @0806D81C + b @0806D822 .align 2, 0 .pool -_0806D818: +@0806D818: cmp r0, 0x3 - bne _0806D822 -_0806D81C: + bne @0806D822 +@0806D81C: movs r5, 0 - b _0806D822 -_0806D820: + b @0806D822 +@0806D820: movs r5, 0x1 -_0806D822: +@0806D822: adds r0, r5, 0 pop {r4,r5} pop {r1} @@ -195083,7 +195083,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 @@ -195095,55 +195095,55 @@ sub_806D82C: @ 806D82C adds r1, r2 ldrh r0, [r1, 0x18] cmp r0, 0x2 - bgt _0806D854 + bgt @0806D854 cmp r0, 0x1 - bge _0806D85C + bge @0806D85C cmp r0, 0 - beq _0806D858 - b _0806D85E + beq @0806D858 + b @0806D85E .align 2, 0 .pool -_0806D854: +@0806D854: cmp r0, 0x3 - bne _0806D85E -_0806D858: + bne @0806D85E +@0806D858: movs r3, 0 - b _0806D85E -_0806D85C: + b @0806D85E +@0806D85C: movs r3, 0x1 -_0806D85E: +@0806D85E: adds r0, r3, 0 pop {r1} bx r1 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 movs r2, 0 ldr r1, =0x020229e8 - b _0806D87C + b @0806D87C .align 2, 0 .pool -_0806D874: +@0806D874: adds r1, 0x1C adds r2, 0x1 cmp r2, 0x3 - bgt _0806D882 -_0806D87C: + bgt @0806D882 +@0806D87C: ldrh r0, [r1, 0x18] cmp r0, r3 - bne _0806D874 -_0806D882: + bne @0806D874 +@0806D882: adds r0, r2, 0 pop {r1} bx r1 thumb_func_end sub_806D864 thumb_func_start sub_806D888 -sub_806D888: @ 806D888 +sub_806D888: ; 806D888 push {r4,r5,lr} lsls r0, 16 lsrs r4, r0, 16 @@ -195151,15 +195151,15 @@ sub_806D888: @ 806D888 bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - beq _0806D8A2 + beq @0806D8A2 adds r0, r4, 0 bl sub_81A9F3C - b _0806D8CA -_0806D8A2: + b @0806D8CA +@0806D8A2: bl sub_81D5C18 lsls r0, 24 cmp r0, 0 - bne _0806D8C4 + bne @0806D8C4 ldr r1, =0x08310030 lsls r0, r4, 2 adds r0, r4 @@ -195168,23 +195168,23 @@ _0806D8A2: ldrb r1, [r0, 0x2] movs r0, 0x7F ands r0, r1 - b _0806D8CE + b @0806D8CE .align 2, 0 .pool -_0806D8C4: +@0806D8C4: adds r0, r5, 0 bl sub_81D63C8 -_0806D8CA: +@0806D8CA: lsls r0, 24 lsrs r0, 24 -_0806D8CE: +@0806D8CE: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_806D888 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 @@ -195197,10 +195197,10 @@ nature_stat_mod: @ 806D8D4 adds r2, r0 lsrs r2, 24 cmp r2, 0x4 - bls _0806D8F2 + bls @0806D8F2 adds r0, r3, 0 - b _0806D92E -_0806D8F2: + b @0806D92E +@0806D8F2: ldr r0, =0x0831e818 lsls r1, r4, 2 adds r1, r4 @@ -195213,16 +195213,16 @@ _0806D8F2: movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _0806D918 + beq @0806D918 cmp r1, 0x1 - bne _0806D92C + bne @0806D92C movs r0, 0x6E - b _0806D91A + b @0806D91A .align 2, 0 .pool -_0806D918: +@0806D918: movs r0, 0x5A -_0806D91A: +@0806D91A: muls r0, r3 lsls r0, 16 lsrs r0, 16 @@ -195230,17 +195230,17 @@ _0806D91A: bl __udivsi3 lsls r0, 16 lsrs r0, 16 - b _0806D92E -_0806D92C: + b @0806D92E +@0806D92C: adds r0, r3, 0 -_0806D92E: +@0806D92E: pop {r4,r5} pop {r1} bx r1 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 @@ -195249,9 +195249,9 @@ happiness_algorithm: @ 806D934 bl sub_806F104 lsls r0, 24 cmp r0, 0 - beq _0806D94A - b _0806DAC2 -_0806D94A: + beq @0806D94A + b @0806DAC2 +@0806D94A: adds r0, r7, 0 movs r1, 0x41 movs r2, 0 @@ -195265,7 +195265,7 @@ _0806D94A: lsls r0, 16 lsrs r0, 16 cmp r0, 0xAF - bne _0806D9A0 + bne @0806D9A0 ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -195273,36 +195273,36 @@ _0806D94A: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0806D98C + beq @0806D98C ldr r0, =0x02024404 ldrb r4, [r0, 0x7] - b _0806D9A8 + b @0806D9A8 .align 2, 0 .pool -_0806D98C: +@0806D98C: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00003226 adds r0, r1 ldrb r4, [r0] - b _0806D9A8 + b @0806D9A8 .align 2, 0 .pool -_0806D9A0: +@0806D9A0: bl itemid_get_x12 lsls r0, 24 lsrs r4, r0, 24 -_0806D9A8: +@0806D9A8: cmp r6, 0 - bne _0806D9AE - b _0806DAC2 -_0806D9AE: + bne @0806D9AE + b @0806DAC2 +@0806D9AE: movs r0, 0xCE lsls r0, 1 cmp r6, r0 - bne _0806D9B8 - b _0806DAC2 -_0806D9B8: + bne @0806D9B8 + b @0806DAC2 +@0806D9B8: movs r6, 0 adds r0, r7, 0 movs r1, 0x20 @@ -195315,31 +195315,31 @@ _0806D9B8: lsls r0, 16 asrs r0, 16 cmp r0, 0x63 - ble _0806D9D6 + ble @0806D9D6 movs r6, 0x1 -_0806D9D6: +@0806D9D6: cmp r0, 0xC7 - ble _0806D9E0 + ble @0806D9E0 adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_0806D9E0: +@0806D9E0: cmp r5, 0x5 - bne _0806D9F0 + bne @0806D9F0 bl GenerateRandomNumber movs r1, 0x1 ands r1, r0 cmp r1, 0 - bne _0806DAC2 -_0806D9F0: + bne @0806DAC2 +@0806D9F0: cmp r5, 0x3 - bne _0806DA20 + bne @0806DA20 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x8 ands r0, r1 cmp r0, 0 - beq _0806DAC2 + beq @0806DAC2 ldr r2, =0x08310030 ldr r0, =0x02038bca ldrh r1, [r0] @@ -195353,10 +195353,10 @@ _0806D9F0: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bls _0806DA20 + bls @0806DA20 cmp r1, 0x26 - bne _0806DAC2 -_0806DA20: + bne @0806DAC2 +@0806DA20: ldr r1, =0x08329ece lsls r0, r5, 1 adds r0, r5 @@ -195366,16 +195366,16 @@ _0806DA20: movs r1, 0 ldrsb r1, [r0, r1] cmp r1, 0 - ble _0806DA46 + ble @0806DA46 cmp r4, 0x1B - bne _0806DA46 + bne @0806DA46 movs r0, 0x96 muls r0, r1 movs r1, 0x64 bl __divsi3 lsls r0, 24 lsrs r2, r0, 24 -_0806DA46: +@0806DA46: lsls r2, 24 asrs r2, 24 mov r0, sp @@ -195385,20 +195385,20 @@ _0806DA46: mov r1, sp strh r0, [r1] cmp r2, 0 - ble _0806DA98 + ble @0806DA98 adds r0, r7, 0 movs r1, 0x26 movs r2, 0 bl pokemon_getattr cmp r0, 0xB - bne _0806DA74 + bne @0806DA74 mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] adds r0, 0x1 mov r1, sp strh r0, [r1] -_0806DA74: +@0806DA74: adds r0, r7, 0 movs r1, 0x23 movs r2, 0 @@ -195408,37 +195408,37 @@ _0806DA74: lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bne _0806DA98 + bne @0806DA98 mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] adds r0, 0x1 mov r1, sp strh r0, [r1] -_0806DA98: +@0806DA98: mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bge _0806DAA8 + bge @0806DAA8 movs r1, 0 mov r0, sp strh r1, [r0] -_0806DAA8: +@0806DAA8: mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0xFF - ble _0806DAB8 + ble @0806DAB8 movs r1, 0xFF mov r0, sp strh r1, [r0] -_0806DAB8: +@0806DAB8: adds r0, r7, 0 movs r1, 0x20 mov r2, sp bl pokemon_setattr -_0806DAC2: +@0806DAC2: add sp, 0x4 pop {r4-r7} pop {r0} @@ -195448,7 +195448,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} @@ -195459,7 +195459,7 @@ sub_806DADC: @ 806DADC movs r4, 0 movs r7, 0 movs r6, 0 -_0806DAF0: +@0806DAF0: adds r1, r6, 0 adds r1, 0x1A mov r0, r8 @@ -195474,37 +195474,37 @@ _0806DAF0: lsrs r7, r0, 16 adds r6, 0x1 cmp r6, 0x5 - ble _0806DAF0 + ble @0806DAF0 movs r6, 0 - b _0806DC72 -_0806DB14: + b @0806DC72 +@0806DB14: mov r0, r8 movs r1, 0 bl sub_806DDE4 lsls r0, 24 movs r2, 0x1 cmp r0, 0 - beq _0806DB26 + beq @0806DB26 movs r2, 0x2 -_0806DB26: +@0806DB26: cmp r6, 0x5 - bhi _0806DBC8 + bhi @0806DBC8 lsls r0, r6, 2 - ldr r1, =_0806DB38 + ldr r1, =@0806DB38 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0806DB38: - .4byte _0806DB50 - .4byte _0806DB64 - .4byte _0806DB78 - .4byte _0806DB8C - .4byte _0806DBA0 - .4byte _0806DBB4 -_0806DB50: +@0806DB38: + .4byte @0806DB50 + .4byte @0806DB64 + .4byte @0806DB78 + .4byte @0806DB8C + .4byte @0806DBA0 + .4byte @0806DBB4 +@0806DB50: ldr r0, =0x083203cc lsls r1, r5, 3 subs r1, r5 @@ -195512,20 +195512,20 @@ _0806DB50: adds r1, r0 ldrb r0, [r1, 0xA] lsls r0, 30 - b _0806DBC2 + b @0806DBC2 .align 2, 0 .pool -_0806DB64: +@0806DB64: ldr r0, =0x083203cc lsls r1, r5, 3 subs r1, r5 lsls r1, 2 adds r1, r0 ldrb r0, [r1, 0xA] - b _0806DBC0 + b @0806DBC0 .align 2, 0 .pool -_0806DB78: +@0806DB78: ldr r0, =0x083203cc lsls r1, r5, 3 subs r1, r5 @@ -195533,10 +195533,10 @@ _0806DB78: adds r1, r0 ldrb r0, [r1, 0xA] lsls r0, 26 - b _0806DBC2 + b @0806DBC2 .align 2, 0 .pool -_0806DB8C: +@0806DB8C: ldr r0, =0x083203cc lsls r1, r5, 3 subs r1, r5 @@ -195544,10 +195544,10 @@ _0806DB8C: adds r1, r0 ldrb r0, [r1, 0xA] lsrs r0, 6 - b _0806DBC4 + b @0806DBC4 .align 2, 0 .pool -_0806DBA0: +@0806DBA0: ldr r0, =0x083203cc lsls r1, r5, 3 subs r1, r5 @@ -195555,24 +195555,24 @@ _0806DBA0: adds r1, r0 ldrb r0, [r1, 0xB] lsls r0, 30 - b _0806DBC2 + b @0806DBC2 .align 2, 0 .pool -_0806DBB4: +@0806DBB4: ldr r0, =0x083203cc lsls r1, r5, 3 subs r1, r5 lsls r1, 2 adds r1, r0 ldrb r0, [r1, 0xB] -_0806DBC0: +@0806DBC0: lsls r0, 28 -_0806DBC2: +@0806DBC2: lsrs r0, 30 -_0806DBC4: +@0806DBC4: adds r4, r0, 0 muls r4, r2 -_0806DBC8: +@0806DBC8: mov r0, r8 movs r1, 0xC movs r2, 0 @@ -195580,7 +195580,7 @@ _0806DBC8: lsls r0, 16 lsrs r0, 16 cmp r0, 0xAF - bne _0806DC14 + bne @0806DC14 ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -195588,44 +195588,44 @@ _0806DBC8: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0806DC00 + beq @0806DC00 ldr r0, =0x02024404 ldrb r0, [r0, 0x7] - b _0806DC1C + b @0806DC1C .align 2, 0 .pool -_0806DC00: +@0806DC00: ldr r0, =0x03005d8c ldr r0, [r0] ldr r2, =0x00003226 adds r0, r2 ldrb r0, [r0] - b _0806DC1C + b @0806DC1C .align 2, 0 .pool -_0806DC14: +@0806DC14: bl itemid_get_x12 lsls r0, 24 lsrs r0, 24 -_0806DC1C: +@0806DC1C: cmp r0, 0x18 - bne _0806DC24 + bne @0806DC24 lsls r0, r4, 17 lsrs r4, r0, 16 -_0806DC24: +@0806DC24: lsls r0, r4, 16 asrs r2, r0, 16 adds r1, r7, r2 movs r0, 0xFF lsls r0, 1 cmp r1, r0 - ble _0806DC3C + ble @0806DC3C adds r0, r2, r0 adds r1, r7, r4 subs r0, r1 lsls r0, 16 lsrs r4, r0, 16 -_0806DC3C: +@0806DC3C: mov r0, sp adds r2, r0, r6 ldrb r3, [r2] @@ -195633,14 +195633,14 @@ _0806DC3C: asrs r1, r0, 16 adds r0, r3, r1 cmp r0, 0xFF - ble _0806DC58 + ble @0806DC58 adds r0, r1, 0 adds r0, 0xFF adds r1, r3, r4 subs r0, r1 lsls r0, 16 lsrs r4, r0, 16 -_0806DC58: +@0806DC58: adds r0, r3, r4 strb r0, [r2] adds r0, r7, r4 @@ -195652,13 +195652,13 @@ _0806DC58: bl pokemon_setattr adds r6, 0x1 cmp r6, 0x5 - bgt _0806DC7A -_0806DC72: + bgt @0806DC7A +@0806DC72: ldr r0, =0x000001fd cmp r7, r0 - bhi _0806DC7A - b _0806DB14 -_0806DC7A: + bhi @0806DC7A + b @0806DB14 +@0806DC7A: add sp, 0x8 pop {r3} mov r8, r3 @@ -195670,12 +195670,12 @@ _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 movs r4, 0 -_0806DC94: +@0806DC94: adds r1, r4, 0 adds r1, 0x1A adds r0, r6, 0 @@ -195686,7 +195686,7 @@ _0806DC94: lsrs r5, r0, 16 adds r4, 0x1 cmp r4, 0x5 - ble _0806DC94 + ble @0806DC94 adds r0, r5, 0 pop {r4-r6} pop {r1} @@ -195694,7 +195694,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 @@ -195704,16 +195704,16 @@ sub_806DCB4: @ 806DCB4 movs r0, 0x80 lsls r0, 7 cmp r5, r0 - beq _0806DCDA + beq @0806DCDA movs r0, 0x80 lsls r0, 8 cmp r5, r0 - beq _0806DCDA + beq @0806DCDA movs r0, 0xC0 lsls r0, 8 cmp r5, r0 - bne _0806DD70 -_0806DCDA: + bne @0806DD70 +@0806DCDA: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -195729,13 +195729,13 @@ _0806DCDA: movs r2, 0 bl pokemon_getattr cmp r0, 0 - beq _0806DCDA + beq @0806DCDA adds r0, r4, 0 movs r1, 0x2D movs r2, 0 bl pokemon_getattr cmp r0, 0 - bne _0806DCDA + bne @0806DCDA ldr r1, =0x0832a328 lsls r0, r5, 2 adds r0, r1 @@ -195744,9 +195744,9 @@ _0806DCDA: bl sub_806DDE4 lsls r0, 24 cmp r0, 0 - bne _0806DD70 + bne @0806DD70 movs r4, 0x7 -_0806DD24: +@0806DD24: bl GenerateRandomNumber lsls r0, 24 lsrs r0, 24 @@ -195756,14 +195756,14 @@ _0806DD24: adds r1, r2, 0 ands r1, r4 cmp r1, 0 - beq _0806DD24 + beq @0806DD24 movs r0, 0xF0 ands r0, r2 cmp r0, 0 - beq _0806DD46 + beq @0806DD46 mov r0, sp strb r1, [r0] -_0806DD46: +@0806DD46: mov r0, sp ldrb r0, [r0] lsls r1, r0, 4 @@ -195784,7 +195784,7 @@ _0806DD46: movs r1, 0x22 mov r2, sp bl pokemon_setattr -_0806DD70: +@0806DD70: add sp, 0x4 pop {r4-r6} pop {r0} @@ -195794,7 +195794,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 @@ -195804,12 +195804,12 @@ sub_806DD7C: @ 806DD7C movs r6, 0x1 movs r5, 0 cmp r4, 0 - beq _0806DDC4 -_0806DD90: + beq @0806DDC4 +@0806DD90: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _0806DDB8 + beq @0806DDB8 movs r0, 0x64 muls r0, r3 adds r0, r7, r0 @@ -195821,18 +195821,18 @@ _0806DD90: ands r1, r0 ldr r3, [sp] cmp r1, 0 - beq _0806DDB8 + beq @0806DDB8 orrs r5, r6 lsls r0, r5, 24 lsrs r5, r0, 24 -_0806DDB8: +@0806DDB8: adds r3, 0x1 lsls r6, 1 lsrs r4, 1 cmp r4, 0 - bne _0806DD90 - b _0806DDD8 -_0806DDC4: + bne @0806DD90 + b @0806DDD8 +@0806DDC4: adds r0, r7, 0 movs r1, 0x22 movs r2, 0 @@ -195840,9 +195840,9 @@ _0806DDC4: movs r1, 0xF ands r1, r0 cmp r1, 0 - beq _0806DDD8 + beq @0806DDD8 movs r5, 0x1 -_0806DDD8: +@0806DDD8: adds r0, r5, 0 add sp, 0x4 pop {r4-r7} @@ -195851,7 +195851,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 @@ -195861,12 +195861,12 @@ sub_806DDE4: @ 806DDE4 movs r6, 0x1 movs r5, 0 cmp r4, 0 - beq _0806DE28 -_0806DDF8: + beq @0806DE28 +@0806DDF8: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _0806DE1C + beq @0806DE1C movs r0, 0x64 muls r0, r3 adds r0, r7, r0 @@ -195876,26 +195876,26 @@ _0806DDF8: bl pokemon_getattr ldr r3, [sp] cmp r0, 0 - beq _0806DE1C + beq @0806DE1C orrs r5, r6 lsls r0, r5, 24 lsrs r5, r0, 24 -_0806DE1C: +@0806DE1C: adds r3, 0x1 lsls r6, 1 lsrs r4, 1 cmp r4, 0 - bne _0806DDF8 - b _0806DE38 -_0806DE28: + bne @0806DDF8 + b @0806DE38 +@0806DE28: adds r0, r7, 0 movs r1, 0x22 movs r2, 0 bl pokemon_getattr cmp r0, 0 - beq _0806DE38 + beq @0806DE38 movs r5, 0x1 -_0806DE38: +@0806DE38: adds r0, r5, 0 add sp, 0x4 pop {r4-r7} @@ -195904,14 +195904,14 @@ _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 lsrs r7, r0, 16 movs r6, 0 mov r5, sp -_0806DE50: +@0806DE50: movs r0, 0x64 adds r1, r6, 0 muls r1, r0 @@ -195922,7 +195922,7 @@ _0806DE50: movs r2, 0 bl pokemon_getattr cmp r0, 0 - beq _0806DEB2 + beq @0806DEB2 adds r0, r4, 0 movs r1, 0x22 movs r2, 0 @@ -195934,27 +195934,27 @@ _0806DE50: adds r2, r0, 0 ands r1, r2 cmp r1, 0 - beq _0806DEB2 + beq @0806DEB2 cmp r1, r7 - bcc _0806DE8A + bcc @0806DE8A cmp r7, 0x4 - bls _0806DE94 -_0806DE8A: + bls @0806DE94 +@0806DE8A: movs r0, 0xF0 ands r0, r2 - b _0806DE96 + b @0806DE96 .align 2, 0 .pool -_0806DE94: +@0806DE94: subs r0, r2, r7 -_0806DE96: +@0806DE96: strb r0, [r5] ldrb r0, [r5] cmp r0, 0 - bne _0806DEA2 + bne @0806DEA2 movs r0, 0x10 strb r0, [r5] -_0806DEA2: +@0806DEA2: movs r0, 0x64 muls r0, r6 ldr r1, =0x020244ec @@ -195962,10 +195962,10 @@ _0806DEA2: movs r1, 0x22 mov r2, sp bl pokemon_setattr -_0806DEB2: +@0806DEB2: adds r6, 0x1 cmp r6, 0x5 - ble _0806DE50 + ble @0806DE50 add sp, 0x4 pop {r4-r7} pop {r0} @@ -195975,7 +195975,7 @@ _0806DEB2: thumb_func_end sub_806DE44 thumb_func_start atkE5_pickupitemcalculation -atkE5_pickupitemcalculation: @ 806DEC4 +atkE5_pickupitemcalculation: ; 806DEC4 push {r4-r7,lr} sub sp, 0x4 adds r7, r0, 0 @@ -195986,9 +195986,9 @@ atkE5_pickupitemcalculation: @ 806DEC4 bl __umodsi3 lsls r0, 16 cmp r0, 0 - bne _0806DF6A + bne @0806DF6A movs r5, 0 -_0806DEE0: +@0806DEE0: movs r0, 0x64 adds r6, r5, 0 muls r6, r0 @@ -195998,7 +195998,7 @@ _0806DEE0: movs r2, 0 bl pokemon_getattr cmp r0, 0 - beq _0806DF64 + beq @0806DF64 adds r0, r4, 0 movs r1, 0x22 movs r2, 0 @@ -196008,13 +196008,13 @@ _0806DEE0: mov r0, sp strb r1, [r0] cmp r1, 0 - beq _0806DF64 + beq @0806DF64 movs r0, 0xF ands r0, r1 cmp r0, 0 - beq _0806DF64 + beq @0806DF64 cmp r5, 0 - beq _0806DF3A + beq @0806DF3A adds r0, r6, 0 subs r0, 0x64 adds r4, r7, r0 @@ -196025,14 +196025,14 @@ _0806DEE0: movs r1, 0xF0 ands r1, r0 cmp r1, 0 - bne _0806DF3A + bne @0806DF3A adds r0, r4, 0 movs r1, 0x22 mov r2, sp bl pokemon_setattr -_0806DF3A: +@0806DF3A: cmp r5, 0x5 - beq _0806DF64 + beq @0806DF64 movs r0, 0x64 muls r0, r5 adds r0, 0x64 @@ -196044,17 +196044,17 @@ _0806DF3A: movs r1, 0xF0 ands r1, r0 cmp r1, 0 - bne _0806DF64 + bne @0806DF64 adds r0, r4, 0 movs r1, 0x22 mov r2, sp bl pokemon_setattr adds r5, 0x1 -_0806DF64: +@0806DF64: adds r5, 0x1 cmp r5, 0x5 - ble _0806DEE0 -_0806DF6A: + ble @0806DEE0 +@0806DF6A: add sp, 0x4 pop {r4-r7} pop {r0} @@ -196062,7 +196062,7 @@ _0806DF6A: thumb_func_end atkE5_pickupitemcalculation thumb_func_start sub_806DF74 -sub_806DF74: @ 806DF74 +sub_806DF74: ; 806DF74 push {r4-r6,lr} sub sp, 0x8 adds r5, r0, 0 @@ -196101,36 +196101,36 @@ sub_806DF74: @ 806DF74 adds r1, r4, r1 ldr r1, [r1] cmp r0, r1 - bls _0806DFD4 + bls @0806DFD4 str r1, [sp, 0x4] add r2, sp, 0x4 adds r0, r5, 0 movs r1, 0x19 bl pokemon_setattr -_0806DFD4: +@0806DFD4: mov r0, sp ldrb r0, [r0] cmp r0, 0x64 - bhi _0806DFEA + bhi @0806DFEA lsls r0, 2 adds r0, r4 adds r0, r6 ldr r1, [sp, 0x4] ldr r0, [r0] cmp r1, r0 - bcs _0806DFF8 -_0806DFEA: + bcs @0806DFF8 +@0806DFEA: movs r0, 0 - b _0806E004 + b @0806E004 .align 2, 0 .pool -_0806DFF8: +@0806DFF8: adds r0, r5, 0 movs r1, 0x38 mov r2, sp bl pokemon_setattr movs r0, 0x1 -_0806E004: +@0806E004: add sp, 0x8 pop {r4-r6} pop {r1} @@ -196138,7 +196138,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 @@ -196152,12 +196152,12 @@ sub_806E00C: @ 806E00C movs r0, 0xCE lsls r0, 1 cmp r1, r0 - bne _0806E02E + bne @0806E02E movs r0, 0 - b _0806E05A -_0806E02E: + b @0806E05A +@0806E02E: cmp r4, 0x1F - bls _0806E04C + bls @0806E04C adds r0, r4, 0 subs r0, 0x20 movs r2, 0x1 @@ -196168,10 +196168,10 @@ _0806E02E: adds r1, r0 ldr r0, [r1] ands r0, r2 - b _0806E05A + b @0806E05A .align 2, 0 .pool -_0806E04C: +@0806E04C: movs r1, 0x1 lsls r1, r5 ldr r2, =0x0831e898 @@ -196179,7 +196179,7 @@ _0806E04C: adds r0, r2 ldr r0, [r0] ands r0, r1 -_0806E05A: +@0806E05A: pop {r4,r5} pop {r1} bx r1 @@ -196188,7 +196188,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 @@ -196199,12 +196199,12 @@ sub_806E064: @ 806E064 movs r0, 0xCE lsls r0, 1 cmp r3, r0 - bne _0806E07E + bne @0806E07E movs r0, 0 - b _0806E0AA -_0806E07E: + b @0806E0AA +@0806E07E: cmp r1, 0x1F - bls _0806E09C + bls @0806E09C adds r0, r1, 0 subs r0, 0x20 movs r2, 0x1 @@ -196215,10 +196215,10 @@ _0806E07E: adds r1, r0 ldr r0, [r1] ands r0, r2 - b _0806E0AA + b @0806E0AA .align 2, 0 .pool -_0806E09C: +@0806E09C: movs r1, 0x1 lsls r1, r2 ldr r2, =0x0831e898 @@ -196226,7 +196226,7 @@ _0806E09C: adds r0, r2 ldr r0, [r0] ands r0, r1 -_0806E0AA: +@0806E0AA: pop {r4} pop {r1} bx r1 @@ -196235,7 +196235,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 @@ -196261,7 +196261,7 @@ sub_806E0B4: @ 806E0B4 str r0, [sp, 0xC] movs r5, 0 mov r4, sp -_0806E0EA: +@0806E0EA: adds r1, r5, 0 adds r1, 0xD adds r0, r6, 0 @@ -196271,7 +196271,7 @@ _0806E0EA: adds r4, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble _0806E0EA + ble @0806E0EA movs r5, 0 ldr r6, =0x0832937c lsls r1, r7, 2 @@ -196281,10 +196281,10 @@ _0806E0EA: ldr r4, =0x0000ffff str r1, [sp, 0x14] cmp r0, r4 - beq _0806E1E4 + beq @0806E1E4 mov r9, r2 str r3, [sp, 0x10] -_0806E118: +@0806E118: lsls r2, r5, 1 ldr r1, [sp, 0x10] adds r0, r2, r1 @@ -196298,14 +196298,14 @@ _0806E118: adds r5, 0x1 mov r12, r5 cmp r0, r1 - bgt _0806E1CE + bgt @0806E1CE movs r4, 0 mov r0, sp ldrh r1, [r0] ldr r0, =0x000001ff ands r0, r3 cmp r1, r0 - beq _0806E168 + beq @0806E168 ldr r0, [sp, 0x14] ldr r1, =0x0832937c adds r6, r0, r1 @@ -196313,11 +196313,11 @@ _0806E118: mov r8, r2 mov r3, sp adds r5, r7, 0 -_0806E150: +@0806E150: adds r3, 0x2 adds r4, 0x1 cmp r4, 0x3 - bgt _0806E168 + bgt @0806E168 ldr r0, [r6] adds r0, r5, r0 ldrh r1, [r0] @@ -196325,13 +196325,13 @@ _0806E150: mov r0, r8 ands r0, r1 cmp r2, r0 - bne _0806E150 -_0806E168: + bne @0806E150 +@0806E168: cmp r4, 0x4 - bne _0806E1CE + bne @0806E1CE movs r4, 0 cmp r4, r10 - bge _0806E1AC + bge @0806E1AC mov r1, r9 ldr r0, [r1] adds r0, r7, r0 @@ -196341,7 +196341,7 @@ _0806E168: ldr r0, =0x000001ff ands r0, r1 cmp r2, r0 - beq _0806E1AC + beq @0806E1AC ldr r1, [sp, 0x14] ldr r2, =0x0832937c adds r6, r1, r2 @@ -196349,11 +196349,11 @@ _0806E168: mov r8, r0 ldr r3, [sp, 0x8] adds r5, r7, 0 -_0806E194: +@0806E194: adds r3, 0x2 adds r4, 0x1 cmp r4, r10 - bge _0806E1AC + bge @0806E1AC ldr r0, [r6] adds r0, r5, r0 ldrh r1, [r0] @@ -196361,10 +196361,10 @@ _0806E194: mov r0, r8 ands r0, r1 cmp r2, r0 - bne _0806E194 -_0806E1AC: + bne @0806E194 +@0806E1AC: cmp r4, r10 - bne _0806E1CE + bne @0806E1CE mov r0, r10 adds r0, 0x1 lsls r0, 24 @@ -196380,10 +196380,10 @@ _0806E1AC: ldr r0, =0x000001ff ands r0, r1 strh r0, [r2] -_0806E1CE: +@0806E1CE: mov r5, r12 cmp r5, 0x13 - bgt _0806E1E4 + bgt @0806E1E4 mov r1, r9 ldr r0, [r1] lsls r1, r5, 1 @@ -196391,8 +196391,8 @@ _0806E1CE: ldrh r0, [r1] ldr r2, =0x0000ffff cmp r0, r2 - bne _0806E118 -_0806E1E4: + bne @0806E118 +@0806E1E4: mov r0, r10 add sp, 0x18 pop {r3-r5} @@ -196407,7 +196407,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 @@ -196420,12 +196420,12 @@ sub_806E204: @ 806E204 ldrh r0, [r2] ldr r1, =0x0000ffff cmp r0, r1 - beq _0806E248 + beq @0806E248 ldr r0, =0x000001ff mov r12, r0 adds r7, r1, 0 adds r3, r2, 0 -_0806E226: +@0806E226: adds r1, r5, 0 adds r0, r1, 0x1 lsls r0, 24 @@ -196439,11 +196439,11 @@ _0806E226: adds r3, 0x2 adds r4, 0x1 cmp r4, 0x13 - bgt _0806E248 + bgt @0806E248 ldrh r0, [r3] cmp r0, r7 - bne _0806E226 -_0806E248: + bne @0806E226 +@0806E248: adds r0, r5, 0 pop {r4-r7} pop {r1} @@ -196453,7 +196453,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 @@ -196479,15 +196479,15 @@ sub_806E25C: @ 806E25C movs r0, 0xCE lsls r0, 1 cmp r4, r0 - bne _0806E298 + bne @0806E298 movs r0, 0 - b _0806E3A2 -_0806E298: + b @0806E3A2 +@0806E298: movs r5, 0 lsls r4, 2 str r4, [sp, 0x38] mov r4, sp -_0806E2A0: +@0806E2A0: adds r1, r5, 0 adds r1, 0xD adds r0, r6, 0 @@ -196497,7 +196497,7 @@ _0806E2A0: adds r4, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble _0806E2A0 + ble @0806E2A0 movs r5, 0 ldr r3, =0x0832937c ldr r2, [sp, 0x38] @@ -196506,12 +196506,12 @@ _0806E2A0: ldrh r0, [r0] ldr r2, =0x0000ffff cmp r0, r2 - beq _0806E3A0 + beq @0806E3A0 mov r9, r1 mov r4, sp adds r4, 0x8 str r4, [sp, 0x34] -_0806E2D0: +@0806E2D0: mov r1, r9 ldr r0, [r1] lsls r2, r5, 1 @@ -196526,14 +196526,14 @@ _0806E2D0: adds r5, 0x1 mov r12, r5 cmp r0, r1 - bgt _0806E38A + bgt @0806E38A movs r4, 0 mov r0, sp ldrh r1, [r0] ldr r0, =0x000001ff ands r0, r3 cmp r1, r0 - beq _0806E322 + beq @0806E322 ldr r0, [sp, 0x38] ldr r1, =0x0832937c adds r6, r0, r1 @@ -196541,11 +196541,11 @@ _0806E2D0: mov r8, r2 mov r3, sp adds r5, r7, 0 -_0806E30A: +@0806E30A: adds r3, 0x2 adds r4, 0x1 cmp r4, 0x3 - bgt _0806E322 + bgt @0806E322 ldr r0, [r6] adds r0, r5, r0 ldrh r1, [r0] @@ -196553,13 +196553,13 @@ _0806E30A: mov r0, r8 ands r0, r1 cmp r2, r0 - bne _0806E30A -_0806E322: + bne @0806E30A +@0806E322: cmp r4, 0x4 - bne _0806E38A + bne @0806E38A movs r4, 0 cmp r4, r10 - bge _0806E368 + bge @0806E368 mov r1, r9 ldr r0, [r1] adds r0, r7, r0 @@ -196570,7 +196570,7 @@ _0806E322: ands r0, r1 add r1, sp, 0x8 cmp r2, r0 - beq _0806E368 + beq @0806E368 ldr r2, [sp, 0x38] ldr r0, =0x0832937c adds r6, r2, r0 @@ -196578,11 +196578,11 @@ _0806E322: mov r8, r2 adds r3, r1, 0 adds r5, r7, 0 -_0806E350: +@0806E350: adds r3, 0x2 adds r4, 0x1 cmp r4, r10 - bge _0806E368 + bge @0806E368 ldr r0, [r6] adds r0, r5, r0 ldrh r1, [r0] @@ -196590,10 +196590,10 @@ _0806E350: mov r0, r8 ands r0, r1 cmp r2, r0 - bne _0806E350 -_0806E368: + bne @0806E350 +@0806E368: cmp r4, r10 - bne _0806E38A + bne @0806E38A mov r0, r10 adds r0, 0x1 lsls r0, 24 @@ -196609,10 +196609,10 @@ _0806E368: ldr r0, =0x000001ff ands r0, r1 strh r0, [r2] -_0806E38A: +@0806E38A: mov r5, r12 cmp r5, 0x13 - bgt _0806E3A0 + bgt @0806E3A0 mov r2, r9 ldr r0, [r2] lsls r1, r5, 1 @@ -196620,10 +196620,10 @@ _0806E38A: ldrh r0, [r1] ldr r4, =0x0000ffff cmp r0, r4 - bne _0806E2D0 -_0806E3A0: + bne @0806E2D0 +@0806E3A0: mov r0, r10 -_0806E3A2: +@0806E3A2: add sp, 0x3C pop {r3-r5} mov r8, r3 @@ -196637,38 +196637,38 @@ _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 bl sub_809D42C cmp r0, 0 - beq _0806E3DA + beq @0806E3DA adds r0, r4, 0 bl SpeciesToNationalPokedexNum lsls r0, 16 lsrs r0, 16 - b _0806E3F2 -_0806E3DA: + b @0806E3F2 +@0806E3DA: adds r0, r4, 0 bl SpeciesToHoennPokedexNum adds r4, r0, 0 cmp r4, 0xCA - bls _0806E3F0 + bls @0806E3F0 ldr r0, =0x0000ffff - b _0806E3F2 + b @0806E3F2 .align 2, 0 .pool -_0806E3F0: +@0806E3F0: adds r0, r4, 0 -_0806E3F2: +@0806E3F2: pop {r4} pop {r1} bx r1 thumb_func_end sub_806E3C0 thumb_func_start sub_806E3F8 -sub_806E3F8: @ 806E3F8 +sub_806E3F8: ; 806E3F8 push {lr} lsls r0, 16 lsrs r0, 16 @@ -196676,27 +196676,27 @@ sub_806E3F8: @ 806E3F8 lsls r0, 16 lsrs r0, 16 cmp r0, 0xCA - bhi _0806E40E + bhi @0806E40E movs r0, 0x1 - b _0806E410 -_0806E40E: + b @0806E410 +@0806E40E: movs r0, 0 -_0806E410: +@0806E410: pop {r1} bx r1 thumb_func_end sub_806E3F8 thumb_func_start sub_806E414 -sub_806E414: @ 806E414 +sub_806E414: ; 806E414 push {lr} ldr r1, =0x020244e4 movs r2, 0 adds r0, r1, 0x3 -_0806E41C: +@0806E41C: strb r2, [r0] subs r0, 0x1 cmp r0, r1 - bge _0806E41C + bge @0806E41C pop {r0} bx r0 .align 2, 0 @@ -196704,7 +196704,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] @@ -196712,56 +196712,56 @@ song_id_for_battle: @ 806E42C lsls r0, 5 ands r0, r1 cmp r0, 0 - beq _0806E448 + beq @0806E448 movs r0, 0xF0 lsls r0, 1 - b _0806E646 + b @0806E646 .align 2, 0 .pool -_0806E448: +@0806E448: movs r0, 0x80 lsls r0, 7 ands r0, r1 cmp r0, 0 - beq _0806E45C + beq @0806E45C ldr r0, =0x000001df - b _0806E646 + b @0806E646 .align 2, 0 .pool -_0806E45C: +@0806E45C: ldr r0, =0x02000002 ands r0, r1 cmp r0, 0 - beq _0806E466 - b _0806E63C -_0806E466: + beq @0806E466 + b @0806E63C +@0806E466: movs r0, 0x8 ands r0, r1 cmp r0, 0 - bne _0806E470 - b _0806E642 -_0806E470: + bne @0806E470 + b @0806E642 +@0806E470: ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 - beq _0806E494 + beq @0806E494 ldr r0, =0x02038bca ldrh r0, [r0] bl sub_8162BD8 lsls r0, 24 lsrs r0, 24 - b _0806E4B2 + b @0806E4B2 .align 2, 0 .pool -_0806E494: +@0806E494: movs r0, 0x80 lsls r0, 19 ands r1, r0 cmp r1, 0 - beq _0806E4A2 + beq @0806E4A2 movs r0, 0xA - b _0806E4B2 -_0806E4A2: + b @0806E4B2 +@0806E4A2: ldr r2, =0x08310030 ldr r0, =0x02038bca ldrh r1, [r0] @@ -196770,115 +196770,115 @@ _0806E4A2: lsls r0, 3 adds r0, r2 ldrb r0, [r0, 0x1] -_0806E4B2: +@0806E4B2: subs r0, 0x3 cmp r0, 0x3D - bls _0806E4BA - b _0806E63C -_0806E4BA: + bls @0806E4BA + b @0806E63C +@0806E4BA: lsls r0, 2 - ldr r1, =_0806E4D0 + ldr r1, =@0806E4D0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0806E4D0: - .4byte _0806E5D0 - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E5D0 - .4byte _0806E63C - .4byte _0806E5D0 - .4byte _0806E63C - .4byte _0806E5C8 - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E62C - .4byte _0806E5D8 - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E5E0 - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E5D0 - .4byte _0806E5E6 - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E5C8 - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E63C - .4byte _0806E632 - .4byte _0806E632 - .4byte _0806E632 - .4byte _0806E632 - .4byte _0806E632 - .4byte _0806E632 - .4byte _0806E632 -_0806E5C8: +@0806E4D0: + .4byte @0806E5D0 + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E5D0 + .4byte @0806E63C + .4byte @0806E5D0 + .4byte @0806E63C + .4byte @0806E5C8 + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E62C + .4byte @0806E5D8 + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E5E0 + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E5D0 + .4byte @0806E5E6 + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E5C8 + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E63C + .4byte @0806E632 + .4byte @0806E632 + .4byte @0806E632 + .4byte @0806E632 + .4byte @0806E632 + .4byte @0806E632 + .4byte @0806E632 +@0806E5C8: ldr r0, =0x000001e3 - b _0806E646 + b @0806E646 .align 2, 0 .pool -_0806E5D0: +@0806E5D0: ldr r0, =0x000001db - b _0806E646 + b @0806E646 .align 2, 0 .pool -_0806E5D8: +@0806E5D8: ldr r0, =0x000001dd - b _0806E646 + b @0806E646 .align 2, 0 .pool -_0806E5E0: +@0806E5E0: movs r0, 0xEF lsls r0, 1 - b _0806E646 -_0806E5E6: + b @0806E646 +@0806E5E6: ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x003f0100 ands r0, r1 cmp r0, 0 - beq _0806E604 -_0806E5F2: + beq @0806E604 +@0806E5F2: ldr r0, =0x000001e1 - b _0806E646 + b @0806E646 .align 2, 0 .pool -_0806E604: +@0806E604: ldr r0, =0x02038bca ldrh r1, [r0] lsls r0, r1, 2 @@ -196889,33 +196889,33 @@ _0806E604: ldr r1, =0x085ccb98 bl sub_8008C44 cmp r0, 0 - beq _0806E63C - b _0806E5F2 + beq @0806E63C + b @0806E5F2 .align 2, 0 .pool -_0806E62C: +@0806E62C: movs r0, 0xF1 lsls r0, 1 - b _0806E646 -_0806E632: + b @0806E646 +@0806E632: ldr r0, =0x000001d7 - b _0806E646 + b @0806E646 .align 2, 0 .pool -_0806E63C: +@0806E63C: movs r0, 0xEE lsls r0, 1 - b _0806E646 -_0806E642: + b @0806E646 +@0806E642: movs r0, 0xED lsls r0, 1 -_0806E646: +@0806E646: pop {r1} bx r1 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 @@ -196928,30 +196928,30 @@ 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 bl map_music_set_to_zero bl m4aMPlayAllStop cmp r4, 0 - beq _0806E682 + beq @0806E682 adds r0, r4, 0 bl current_map_music_set - b _0806E68E -_0806E682: + b @0806E68E +@0806E682: bl song_id_for_battle lsls r0, 16 lsrs r0, 16 bl current_map_music_set -_0806E68E: +@0806E68E: pop {r4} pop {r0} bx r0 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 @@ -196977,7 +196977,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 @@ -196989,18 +196989,18 @@ sub_806E6CC: @ 806E6CC movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0 - beq _0806E6F0 + beq @0806E6F0 ldrh r0, [r1, 0x8] bl current_map_music_set - b _0806E6FC + b @0806E6FC .align 2, 0 .pool -_0806E6F0: +@0806E6F0: bl song_id_for_battle lsls r0, 16 lsrs r0, 16 bl current_map_music_set -_0806E6FC: +@0806E6FC: adds r0, r4, 0 bl remove_task pop {r4} @@ -197009,7 +197009,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 @@ -197037,7 +197037,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 @@ -197046,13 +197046,13 @@ species_and_otid_get_pal: @ 806E740 movs r0, 0xCE lsls r0, 1 cmp r4, r0 - bls _0806E75C + bls @0806E75C ldr r0, =0x08303678 ldr r0, [r0] - b _0806E788 + b @0806E788 .align 2, 0 .pool -_0806E75C: +@0806E75C: lsrs r0, r1, 16 ldr r2, =0x0000ffff ands r1, r2 @@ -197062,19 +197062,19 @@ _0806E75C: ands r3, r2 eors r0, r3 cmp r0, 0x7 - bls _0806E780 + bls @0806E780 ldr r0, =0x08303678 lsls r1, r4, 3 - b _0806E784 + b @0806E784 .align 2, 0 .pool -_0806E780: +@0806E780: ldr r0, =0x08304438 lsls r1, r5, 3 -_0806E784: +@0806E784: adds r1, r0 ldr r0, [r1] -_0806E788: +@0806E788: pop {r4,r5} pop {r1} bx r1 @@ -197083,7 +197083,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 @@ -197111,7 +197111,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 @@ -197124,16 +197124,16 @@ sub_806E7CC: @ 806E7CC ands r2, r3 eors r0, r2 cmp r0, 0x7 - bls _0806E7F4 + bls @0806E7F4 lsls r0, r4, 3 ldr r1, =0x08303678 - b _0806E7F8 + b @0806E7F8 .align 2, 0 .pool -_0806E7F4: +@0806E7F4: lsls r0, r4, 3 ldr r1, =0x08304438 -_0806E7F8: +@0806E7F8: adds r0, r1 pop {r4} pop {r1} @@ -197143,7 +197143,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 @@ -197151,33 +197151,33 @@ sub_806E804: @ 806E804 ldrh r0, [r2] ldr r1, =0x0000ffff cmp r0, r1 - beq _0806E836 + beq @0806E836 adds r4, r1, 0 adds r1, r2, 0 -_0806E818: +@0806E818: ldrh r0, [r2] adds r1, 0x2 adds r2, 0x2 cmp r0, r3 - bne _0806E830 + bne @0806E830 movs r0, 0x1 - b _0806E838 + b @0806E838 .align 2, 0 .pool -_0806E830: +@0806E830: ldrh r0, [r1] cmp r0, r4 - bne _0806E818 -_0806E836: + bne @0806E818 +@0806E836: movs r0, 0 -_0806E838: +@0806E838: pop {r4} pop {r1} bx r1 thumb_func_end sub_806E804 thumb_func_start sub_806E840 -sub_806E840: @ 806E840 +sub_806E840: ; 806E840 lsls r0, 16 lsrs r0, 16 ldr r2, =0x083203cc @@ -197193,7 +197193,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 @@ -197215,7 +197215,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 @@ -197237,7 +197237,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 @@ -197259,7 +197259,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 @@ -197275,38 +197275,38 @@ sub_806E8D4: @ 806E8D4 lsls r1, 24 orrs r2, r1 cmp r0, r2 - bne _0806E91C + bne @0806E91C movs r4, 0 ldrb r0, [r5] cmp r0, 0xFF - beq _0806E912 + beq @0806E912 adds r2, r5, 0 -_0806E8FE: +@0806E8FE: adds r1, r3, r4 ldrb r0, [r2] ldrb r1, [r1] cmp r0, r1 - bne _0806E91C + bne @0806E91C adds r2, 0x1 adds r4, 0x1 ldrb r0, [r2] cmp r0, 0xFF - bne _0806E8FE -_0806E912: + bne @0806E8FE +@0806E912: movs r0, 0 - b _0806E91E + b @0806E91E .align 2, 0 .pool -_0806E91C: +@0806E91C: movs r0, 0x1 -_0806E91E: +@0806E91E: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_806E8D4 thumb_func_start sub_806E924 -sub_806E924: @ 806E924 +sub_806E924: ; 806E924 push {lr} bl pokemon_restore_pp pop {r0} @@ -197314,12 +197314,12 @@ 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 movs r6, 0 -_0806E938: +@0806E938: adds r4, r6, 0 adds r4, 0xD adds r0, r5, 0 @@ -197327,7 +197327,7 @@ _0806E938: movs r2, 0 bl pokemon_getattr_encrypted cmp r0, 0 - beq _0806E984 + beq @0806E984 adds r0, r5, 0 adds r1, r4, 0 movs r2, 0 @@ -197353,10 +197353,10 @@ _0806E938: adds r0, r5, 0 mov r2, sp bl pokemon_setattr_encrypted -_0806E984: +@0806E984: adds r6, 0x1 cmp r6, 0x3 - ble _0806E938 + ble @0806E938 add sp, 0x4 pop {r4-r6} pop {r0} @@ -197364,7 +197364,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 @@ -197387,7 +197387,7 @@ sub_806E994: @ 806E994 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0806E9E8 + bne @0806E9E8 ldr r1, =0x0202406e ldr r0, [r5] adds r0, 0x49 @@ -197396,10 +197396,10 @@ sub_806E994: @ 806E994 adds r0, r1 ldrb r0, [r0] bl pokemon_order_func - b _0806E9F6 + b @0806E9F6 .align 2, 0 .pool -_0806E9E8: +@0806E9E8: ldr r1, =0x0202406e ldr r0, [r5] adds r0, 0x49 @@ -197407,7 +197407,7 @@ _0806E9E8: lsls r0, 1 adds r0, r1 ldrh r0, [r0] -_0806E9F6: +@0806E9F6: strb r0, [r4, 0x3] ldr r4, =0x02022f68 movs r0, 0xFD @@ -197437,33 +197437,33 @@ _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 movs r1, 0 ldr r2, =0x08329efc -_0806EA4A: +@0806EA4A: ldrh r0, [r2] cmp r0, r3 - bne _0806EA58 + bne @0806EA58 adds r0, r1, 0 - b _0806EA62 + b @0806EA62 .align 2, 0 .pool -_0806EA58: +@0806EA58: adds r2, 0x4 adds r1, 0x1 cmp r1, 0x8 - ble _0806EA4A + ble @0806EA4A movs r0, 0 -_0806EA62: +@0806EA62: pop {r1} bx r1 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} @@ -197472,9 +197472,9 @@ sub_806EA68: @ 806EA68 ldr r1, =0x00302008 ands r0, r1 cmp r0, 0 - beq _0806EA7C - b _0806EB90 -_0806EA7C: + beq @0806EA7C + b @0806EB90 +@0806EA7C: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -197497,56 +197497,56 @@ _0806EA7C: movs r2, 0 bl pokemon_getattr cmp r0, 0 - bne _0806EAC6 + bne @0806EAC6 adds r0, r5, 0 bl sub_806B6D8 lsls r0, 24 lsrs r0, 24 cmp r0, 0xE - bne _0806EAC6 + bne @0806EAC6 movs r2, 0x14 mov r8, r2 movs r7, 0x50 -_0806EAC6: +@0806EAC6: ldr r0, =0x02037318 ldrh r1, [r0, 0x12] movs r0, 0xD2 lsls r0, 1 cmp r1, r0 - bne _0806EB2C + bne @0806EB2C adds r0, r4, 0 bl sub_806EA40 adds r2, r0, 0 cmp r2, 0 - beq _0806EB04 + beq @0806EB04 cmp r6, r7 - bcc _0806EB90 + bcc @0806EB90 ldr r0, =0x02024744 lsls r2, 2 ldr r1, =0x08329efe - b _0806EB6C + b @0806EB6C .align 2, 0 .pool -_0806EB04: +@0806EB04: cmp r6, r8 - bcc _0806EB90 + bcc @0806EB90 cmp r6, r7 - bcs _0806EB18 + bcs @0806EB18 ldr r0, =0x02024744 lsls r2, r4, 3 - b _0806EB66 + b @0806EB66 .align 2, 0 .pool -_0806EB18: +@0806EB18: ldr r0, =0x02024744 lsls r2, r4, 3 subs r2, r4 lsls r2, 2 ldr r1, =0x083203da - b _0806EB6C + b @0806EB6C .align 2, 0 .pool -_0806EB2C: +@0806EB2C: ldr r0, =0x083203cc mov r12, r0 lsls r0, r4, 3 @@ -197558,35 +197558,35 @@ _0806EB2C: adds r2, r0, 0 ldrh r1, [r1, 0xE] cmp r3, r1 - bne _0806EB5C + bne @0806EB5C cmp r3, 0 - beq _0806EB5C + beq @0806EB5C ldr r0, =0x02024744 mov r2, r12 adds r2, 0xC adds r2, r5, r2 - b _0806EB6E + b @0806EB6E .align 2, 0 .pool -_0806EB5C: +@0806EB5C: cmp r6, r8 - bcc _0806EB90 + bcc @0806EB90 cmp r6, r7 - bcs _0806EB80 + bcs @0806EB80 ldr r0, =0x02024744 -_0806EB66: +@0806EB66: subs r2, r4 lsls r2, 2 ldr r1, =0x083203d8 -_0806EB6C: +@0806EB6C: adds r2, r1 -_0806EB6E: +@0806EB6E: movs r1, 0xC bl pokemon_setattr - b _0806EB90 + b @0806EB90 .align 2, 0 .pool -_0806EB80: +@0806EB80: ldr r0, =0x02024744 subs r2, r4 lsls r2, 2 @@ -197594,7 +197594,7 @@ _0806EB80: adds r2, r1 movs r1, 0xC bl pokemon_setattr -_0806EB90: +@0806EB90: pop {r3} mov r8, r3 pop {r4-r7} @@ -197605,7 +197605,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 @@ -197627,7 +197627,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 @@ -197639,9 +197639,9 @@ sub_806EBD0: @ 806EBD0 ands r1, r3 eors r2, r1 cmp r2, 0x7 - bhi _0806EBEA + bhi @0806EBEA movs r4, 0x1 -_0806EBEA: +@0806EBEA: adds r0, r4, 0 pop {r4} pop {r1} @@ -197651,7 +197651,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] @@ -197659,26 +197659,26 @@ sub_806EBF8: @ 806EBF8 lsls r1, 15 ands r0, r1 cmp r0, 0 - beq _0806EC3C + beq @0806EC3C ldr r2, =0x02038bce ldrh r1, [r2] ldr r0, =0x00000c03 cmp r1, r0 - bne _0806EC28 + bne @0806EC28 ldr r0, =0x08317dd4 - b _0806EC64 + b @0806EC64 .align 2, 0 .pool -_0806EC28: +@0806EC28: ldr r4, =0x02021cc4 ldrh r1, [r2] adds r0, r4, 0 bl sub_8162E20 adds r0, r4, 0 - b _0806EC64 + b @0806EC64 .align 2, 0 .pool -_0806EC3C: +@0806EC3C: bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 @@ -197697,7 +197697,7 @@ _0806EC3C: lsls r0, 2 adds r4, 0x8 adds r0, r4 -_0806EC64: +@0806EC64: pop {r4} pop {r1} bx r1 @@ -197706,7 +197706,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 @@ -197720,7 +197720,7 @@ sub_806EC70: @ 806EC70 strh r0, [r2, 0xE] lsls r0, 16 cmp r0, 0 - bne _0806ECA0 + bne @0806ECA0 ldrh r0, [r2, 0x8] ldrh r1, [r2, 0xA] lsls r1, 16 @@ -197729,7 +197729,7 @@ sub_806EC70: @ 806EC70 bl sub_817F544 adds r0, r4, 0 bl remove_task -_0806ECA0: +@0806ECA0: pop {r4} pop {r0} bx r0 @@ -197738,7 +197738,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 @@ -197752,7 +197752,7 @@ sub_806ECAC: @ 806ECAC strh r0, [r2, 0xE] lsls r0, 16 cmp r0, 0 - bne _0806ECE2 + bne @0806ECE2 ldrh r0, [r2, 0x8] ldrh r1, [r2, 0xA] lsls r1, 16 @@ -197763,7 +197763,7 @@ sub_806ECAC: @ 806ECAC bl sub_81C488C adds r0, r4, 0 bl remove_task -_0806ECE2: +@0806ECE2: pop {r4} pop {r0} bx r0 @@ -197772,7 +197772,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 @@ -197786,33 +197786,33 @@ sub_806ECEC: @ 806ECEC movs r1, 0x80 ands r0, r1 cmp r0, 0 - beq _0806ED30 + beq @0806ED30 ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x02000002 ands r0, r1 cmp r0, 0 - bne _0806ED30 + bne @0806ED30 movs r0, 0x80 orrs r3, r0 adds r0, r5, 0 adds r1, r4, 0 bl sub_806ED40 - b _0806ED38 + b @0806ED38 .align 2, 0 .pool -_0806ED30: +@0806ED30: adds r0, r5, 0 adds r1, r4, 0 bl sub_806ED40 -_0806ED38: +@0806ED38: pop {r4,r5} pop {r0} bx r0 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 @@ -197824,35 +197824,35 @@ sub_806ED40: @ 806ED40 movs r0, 0x7F ands r0, r3 cmp r0, 0 - beq _0806ED60 + beq @0806ED60 cmp r0, 0x1 - beq _0806ED64 + beq @0806ED64 movs r1, 0 - b _0806ED66 -_0806ED60: + b @0806ED66 +@0806ED60: movs r1, 0xE7 - b _0806ED66 -_0806ED64: + b @0806ED66 +@0806ED64: movs r1, 0x19 -_0806ED66: +@0806ED66: movs r0, 0x80 ands r0, r3 cmp r0, 0 - beq _0806ED84 + beq @0806ED84 cmp r2, 0 - bne _0806ED7C + bne @0806ED7C lsls r1, 24 asrs r1, 24 adds r0, r4, 0 bl cry_related -_0806ED7C: +@0806ED7C: ldr r0, =nullsub_12 + 1 - b _0806EDFA + b @0806EDFA .align 2, 0 .pool -_0806ED84: +@0806ED84: cmp r2, 0 - bne _0806EDA6 + bne @0806EDA6 lsls r1, 24 asrs r1, 24 adds r0, r4, 0 @@ -197861,17 +197861,17 @@ _0806ED84: bl sub_806F0D4 lsls r0, 24 cmp r0, 0 - beq _0806EDA6 + beq @0806EDA6 adds r0, r5, 0 movs r1, 0x1 bl obj_anim_image_start -_0806EDA6: +@0806EDA6: ldr r0, =0x08329b87 subs r4, 0x1 adds r6, r4, r0 ldrb r0, [r6] cmp r0, 0 - beq _0806EDEC + beq @0806EDEC ldr r0, =sub_806EC70 + 1 movs r1, 0 bl AddTask @@ -197891,18 +197891,18 @@ _0806EDA6: strh r0, [r1, 0xC] ldrb r0, [r6] strh r0, [r1, 0xE] - b _0806EDF8 + b @0806EDF8 .align 2, 0 .pool -_0806EDEC: +@0806EDEC: ldr r0, =0x083299ec adds r0, r4, r0 ldrb r1, [r0] adds r0, r5, 0 bl sub_817F544 -_0806EDF8: +@0806EDF8: ldr r0, =nullsub_18 + 1 -_0806EDFA: +@0806EDFA: str r0, [r5, 0x1C] pop {r4-r6} pop {r0} @@ -197912,29 +197912,29 @@ _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 lsrs r4, r1, 16 lsls r2, 24 cmp r2, 0 - bne _0806EE2E + bne @0806EE2E adds r0, r4, 0 bl sub_806F0D4 lsls r0, 24 cmp r0, 0 - beq _0806EE2E + beq @0806EE2E adds r0, r5, 0 movs r1, 0x1 bl obj_anim_image_start -_0806EE2E: +@0806EE2E: ldr r0, =0x08329b87 subs r4, 0x1 adds r6, r4, r0 ldrb r0, [r6] cmp r0, 0 - beq _0806EE80 + beq @0806EE80 ldr r0, =sub_806ECAC + 1 movs r1, 0 bl AddTask @@ -197957,16 +197957,16 @@ _0806EE2E: bl sub_81C488C adds r0, r5, 0 bl sub_817F60C - b _0806EE8C + b @0806EE8C .align 2, 0 .pool -_0806EE80: +@0806EE80: ldr r0, =0x083299ec adds r0, r4, r0 ldrb r1, [r0] adds r0, r5, 0 bl sub_817F578 -_0806EE8C: +@0806EE8C: pop {r4-r6} pop {r0} bx r0 @@ -197975,16 +197975,16 @@ _0806EE8C: thumb_func_end sub_806EE0C thumb_func_start sub_806EE98 -sub_806EE98: @ 806EE98 +sub_806EE98: ; 806EE98 push {lr} ldr r0, =sub_806ECAC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _0806EEAC + beq @0806EEAC bl remove_task -_0806EEAC: +@0806EEAC: pop {r0} bx r0 .align 2, 0 @@ -197992,7 +197992,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 @@ -198002,18 +198002,18 @@ sub_806EEB4: @ 806EEB4 movs r1, 0x80 ands r0, r1 cmp r0, 0 - beq _0806EEE8 + beq @0806EEE8 ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x02000002 ands r0, r1 cmp r0, 0 - bne _0806EEE8 + bne @0806EEE8 ldr r0, =nullsub_12 + 1 - b _0806EEFC + b @0806EEFC .align 2, 0 .pool -_0806EEE8: +@0806EEE8: adds r0, r2, 0 bl sub_817F474 adds r1, r0, 0 @@ -198022,7 +198022,7 @@ _0806EEE8: adds r0, r4, 0 bl sub_817F594 ldr r0, =nullsub_18 + 1 -_0806EEFC: +@0806EEFC: str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -198032,7 +198032,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 @@ -198047,50 +198047,50 @@ sub_806EF08: @ 806EF08 adds r1, r2 ldrh r0, [r1, 0x18] cmp r0, 0x1 - beq _0806EF4C + beq @0806EF4C cmp r0, 0x1 - bgt _0806EF38 + bgt @0806EF38 cmp r0, 0 - beq _0806EF42 - b _0806EF56 + beq @0806EF42 + b @0806EF56 .align 2, 0 .pool -_0806EF38: +@0806EF38: cmp r0, 0x2 - beq _0806EF42 + beq @0806EF42 cmp r0, 0x3 - beq _0806EF4C - b _0806EF56 -_0806EF42: + beq @0806EF4C + b @0806EF56 +@0806EF42: movs r5, 0x3 cmp r4, 0 - beq _0806EF56 + beq @0806EF56 movs r5, 0x1 - b _0806EF56 -_0806EF4C: + b @0806EF56 +@0806EF4C: negs r0, r4 orrs r0, r4 asrs r5, r0, 31 movs r0, 0x2 ands r5, r0 -_0806EF56: +@0806EF56: movs r2, 0 ldr r4, =0x020229e8 ldrh r0, [r4, 0x18] adds r1, r5, 0 cmp r0, r1 - beq _0806EF74 + beq @0806EF74 adds r3, r1, 0 adds r1, r4, 0 -_0806EF66: +@0806EF66: adds r1, 0x1C adds r2, 0x1 cmp r2, 0x3 - bgt _0806EF74 + bgt @0806EF74 ldrh r0, [r1, 0x18] cmp r0, r3 - bne _0806EF66 -_0806EF74: + bne @0806EF66 +@0806EF74: lsls r0, r2, 24 lsrs r0, 24 pop {r4,r5} @@ -198101,7 +198101,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 @@ -198115,47 +198115,47 @@ sub_806EF84: @ 806EF84 adds r0, r2 ldrh r0, [r0, 0x18] cmp r0, 0x1 - beq _0806EFC4 + beq @0806EFC4 cmp r0, 0x1 - bgt _0806EFB0 + bgt @0806EFB0 cmp r0, 0 - beq _0806EFBA - b _0806EFCE + beq @0806EFBA + b @0806EFCE .align 2, 0 .pool -_0806EFB0: +@0806EFB0: cmp r0, 0x2 - beq _0806EFBA + beq @0806EFBA cmp r0, 0x3 - beq _0806EFC4 - b _0806EFCE -_0806EFBA: + beq @0806EFC4 + b @0806EFCE +@0806EFBA: movs r4, 0x3 cmp r3, 0 - beq _0806EFCE + beq @0806EFCE movs r4, 0x1 - b _0806EFCE -_0806EFC4: + b @0806EFCE +@0806EFC4: negs r0, r3 orrs r0, r3 asrs r4, r0, 31 movs r0, 0x2 ands r4, r0 -_0806EFCE: +@0806EFCE: movs r3, 0 ldrh r0, [r2, 0x18] adds r1, r4, 0 cmp r0, r1 - beq _0806EFE6 -_0806EFD8: + beq @0806EFE6 +@0806EFD8: adds r2, 0x1C adds r3, 0x1 cmp r3, 0x3 - bgt _0806EFE6 + bgt @0806EFE6 ldrh r0, [r2, 0x18] cmp r0, r1 - bne _0806EFD8 -_0806EFE6: + bne @0806EFD8 +@0806EFE6: lsls r0, r3, 24 lsrs r0, 24 pop {r4} @@ -198164,7 +198164,7 @@ _0806EFE6: thumb_func_end sub_806EF84 thumb_func_start sub_806EFF0 -sub_806EFF0: @ 806EFF0 +sub_806EFF0: ; 806EFF0 lsls r0, 16 lsrs r0, 16 ldr r1, =0x0831f578 @@ -198176,16 +198176,16 @@ sub_806EFF0: @ 806EFF0 thumb_func_end sub_806EFF0 thumb_func_start sub_806F000 -sub_806F000: @ 806F000 +sub_806F000: ; 806F000 push {lr} lsls r0, 24 cmp r0, 0 - bne _0806F00C + bne @0806F00C movs r0, 0x3C - b _0806F00E -_0806F00C: + b @0806F00E +@0806F00C: movs r0, 0x3F -_0806F00E: +@0806F00E: bl sub_806EFF0 lsls r0, 16 lsrs r0, 16 @@ -198194,7 +198194,7 @@ _0806F00E: thumb_func_end sub_806F000 thumb_func_start sub_806F01C -sub_806F01C: @ 806F01C +sub_806F01C: ; 806F01C push {r4-r7,lr} adds r7, r2, 0 lsls r0, 16 @@ -198211,7 +198211,7 @@ sub_806F01C: @ 806F01C bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - bne _0806F072 + bne @0806F072 adds r0, r4, 0 adds r1, r5, 0 bl pokedex_flag_operation @@ -198220,22 +198220,22 @@ sub_806F01C: @ 806F01C lsls r0, 16 lsrs r0, 16 cmp r0, 0xC9 - bne _0806F05C + bne @0806F05C ldr r0, =0x03005d90 ldr r0, [r0] str r7, [r0, 0x1C] -_0806F05C: +@0806F05C: adds r0, r6, 0 bl NationalPokedexNumToSpecies lsls r0, 16 movs r1, 0x9A lsls r1, 17 cmp r0, r1 - bne _0806F072 + bne @0806F072 ldr r0, =0x03005d90 ldr r0, [r0] str r7, [r0, 0x20] -_0806F072: +@0806F072: pop {r4-r7} pop {r0} bx r0 @@ -198244,15 +198244,15 @@ _0806F072: thumb_func_end sub_806F01C thumb_func_start sub_806F07C -sub_806F07C: @ 806F07C +sub_806F07C: ; 806F07C push {lr} lsls r0, 16 lsrs r2, r0, 16 ldr r0, =0x00000356 cmp r2, r0 - bls _0806F08A + bls @0806F08A movs r2, 0 -_0806F08A: +@0806F08A: ldr r1, =0x08310030 lsls r0, r2, 2 adds r0, r2 @@ -198270,15 +198270,15 @@ _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 ldr r0, =0x00000356 cmp r1, r0 - bls _0806F0BE + bls @0806F0BE movs r1, 0 -_0806F0BE: +@0806F0BE: lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -198291,26 +198291,26 @@ _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 movs r1, 0 ldr r0, =0x00000181 cmp r2, r0 - beq _0806F0F8 + beq @0806F0F8 adds r0, 0x19 cmp r2, r0 - beq _0806F0F8 + beq @0806F0F8 subs r0, 0x66 cmp r2, r0 - beq _0806F0F8 + beq @0806F0F8 movs r1, 0xC9 eors r1, r2 negs r0, r1 orrs r0, r1 lsrs r1, r0, 31 -_0806F0F8: +@0806F0F8: adds r0, r1, 0 pop {r1} bx r1 @@ -198319,7 +198319,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 @@ -198328,43 +198328,43 @@ sub_806F104: @ 806F104 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0806F122 + beq @0806F122 ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x003f0100 ands r0, r1 cmp r0, 0 - bne _0806F144 -_0806F122: + bne @0806F144 +@0806F122: ldr r1, =0x00000439 adds r0, r2, r1 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _0806F158 + bne @0806F158 bl sub_81A80A8 lsls r0, 24 cmp r0, 0 - bne _0806F144 + bne @0806F144 bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - beq _0806F158 -_0806F144: + beq @0806F158 +@0806F144: movs r0, 0x1 - b _0806F15A + b @0806F15A .align 2, 0 .pool -_0806F158: +@0806F158: movs r0, 0 -_0806F15A: +@0806F15A: pop {r1} bx r1 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 @@ -198375,8 +198375,8 @@ sub_806F160: @ 806F160 lsls r0, 28 movs r4, 0 cmp r0, 0 - beq _0806F1EA -_0806F176: + beq @0806F1EA +@0806F176: ldr r0, [r6, 0xC] lsls r2, r4, 1 adds r1, r2, r4 @@ -198398,13 +198398,13 @@ _0806F176: adds r1, r4, 0x1 mov r10, r1 cmp r5, r3 - bcs _0806F1C8 + bcs @0806F1C8 mov r7, r12 ldr r1, [r6, 0x8] lsls r0, r4, 2 adds r0, r1 ldr r2, [r0] -_0806F1AC: +@0806F1AC: adds r0, r4, 0 muls r0, r3 adds r0, r5 @@ -198418,8 +198418,8 @@ _0806F1AC: lsrs r5, r0, 16 ldrb r3, [r6, 0x1] cmp r5, r3 - bcc _0806F1AC -_0806F1C8: + bcc @0806F1AC +@0806F1C8: mov r3, r8 adds r1, r3, r4 lsls r1, 3 @@ -198436,8 +198436,8 @@ _0806F1C8: lsls r0, 28 lsrs r0, 28 cmp r4, r0 - blt _0806F176 -_0806F1EA: + blt @0806F176 +@0806F1EA: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -198450,7 +198450,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 @@ -198461,10 +198461,10 @@ sub_806F1FC: @ 806F1FC lsls r0, 28 movs r3, 0 cmp r0, 0 - beq _0806F296 + beq @0806F296 ldr r0, =0x08329f28 mov r10, r0 -_0806F216: +@0806F216: ldr r0, [r4, 0xC] lsls r2, r3, 1 adds r1, r2, r3 @@ -198484,13 +198484,13 @@ _0806F216: mov r9, r1 ldrb r6, [r4, 0x1] cmp r5, r6 - bcs _0806F26A + bcs @0806F26A adds r6, r7, 0 ldr r1, [r4, 0x8] lsls r0, r3, 2 adds r0, r1 ldr r2, [r0] -_0806F248: +@0806F248: ldrb r0, [r4] lsls r0, 28 lsrs r0, 28 @@ -198507,8 +198507,8 @@ _0806F248: lsrs r5, r0, 16 ldrb r0, [r4, 0x1] cmp r5, r0 - bcc _0806F248 -_0806F26A: + bcc @0806F248 +@0806F26A: mov r5, r12 adds r1, r5, r3 lsls r1, 3 @@ -198530,8 +198530,8 @@ _0806F26A: lsls r0, 28 lsrs r0, 28 cmp r3, r0 - blt _0806F216 -_0806F296: + blt @0806F216 +@0806F296: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -198544,7 +198544,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} @@ -198559,22 +198559,22 @@ sub_806F2AC: @ 806F2AC bl malloc_and_clear adds r4, r0, 0 cmp r4, 0 - bne _0806F2D0 + bne @0806F2D0 movs r0, 0 - b _0806F46E -_0806F2D0: + b @0806F46E +@0806F2D0: cmp r5, 0 - beq _0806F2E6 + beq @0806F2E6 cmp r5, 0x2 - bne _0806F2E6 + bne @0806F2E6 movs r0, 0x77 strb r0, [r4] movs r0, 0x4 strb r0, [r4, 0x1] movs r0, 0x21 strb r0, [r4, 0x3] - b _0806F30E -_0806F2E6: + b @0806F30E +@0806F2E6: ldrb r1, [r4] movs r2, 0x10 negs r2, r2 @@ -198595,7 +198595,7 @@ _0806F2E6: orrs r2, r0 ands r2, r3 strb r2, [r4, 0x3] -_0806F30E: +@0806F30E: ldrb r1, [r4, 0x3] lsls r1, 28 lsrs r1, 28 @@ -198613,26 +198613,26 @@ _0806F30E: str r1, [r4, 0x8] ldr r2, [r4, 0x4] cmp r2, 0 - beq _0806F33A + beq @0806F33A cmp r1, 0 - bne _0806F344 -_0806F33A: + bne @0806F344 +@0806F33A: movs r0, 0x1 orrs r7, r0 lsls r6, 2 mov r8, r6 - b _0806F378 -_0806F344: + b @0806F378 +@0806F344: ldrb r0, [r4] lsls r0, 28 movs r3, 0 lsls r6, 2 mov r8, r6 cmp r0, 0 - beq _0806F378 + beq @0806F378 adds r6, r1, 0 adds r5, r2, 0 -_0806F356: +@0806F356: lsls r2, r3, 2 adds r2, r6 ldrb r0, [r4, 0x3] @@ -198649,8 +198649,8 @@ _0806F356: lsls r0, 28 lsrs r0, 28 cmp r3, r0 - blt _0806F356 -_0806F378: + blt @0806F356 +@0806F378: ldrb r1, [r4] lsls r1, 28 lsrs r1, 28 @@ -198670,16 +198670,16 @@ _0806F378: str r1, [r4, 0x10] ldr r0, [r4, 0xC] cmp r0, 0 - beq _0806F3A8 + beq @0806F3A8 cmp r1, 0 - bne _0806F3B2 -_0806F3A8: + bne @0806F3B2 +@0806F3A8: movs r0, 0x2 orrs r7, r0 lsls r0, r7, 24 lsrs r7, r0, 24 - b _0806F400 -_0806F3B2: + b @0806F400 +@0806F3B2: movs r3, 0 ldrb r0, [r4, 0x1] ldrb r1, [r4] @@ -198687,10 +198687,10 @@ _0806F3B2: lsrs r1, 28 muls r0, r1 cmp r3, r0 - bge _0806F3E2 + bge @0806F3E2 movs r2, 0x80 lsls r2, 4 -_0806F3C6: +@0806F3C6: ldr r1, [r4, 0x10] lsls r0, r3, 3 adds r0, r1 @@ -198704,79 +198704,79 @@ _0806F3C6: lsrs r0, 28 muls r0, r1 cmp r3, r0 - blt _0806F3C6 -_0806F3E2: + blt @0806F3C6 +@0806F3E2: ldrb r0, [r4, 0x3] lsrs r0, 4 cmp r0, 0 - blt _0806F3FA + blt @0806F3FA cmp r0, 0x1 - ble _0806F3FA + ble @0806F3FA cmp r0, 0x2 - bne _0806F3FA + bne @0806F3FA adds r0, r4, 0 bl sub_806F1FC - b _0806F400 -_0806F3FA: + b @0806F400 +@0806F3FA: adds r0, r4, 0 bl sub_806F160 -_0806F400: +@0806F400: movs r0, 0x2 ands r0, r7 cmp r0, 0 - beq _0806F424 + beq @0806F424 ldr r0, [r4, 0x10] cmp r0, 0 - beq _0806F416 + beq @0806F416 bl free movs r0, 0 str r0, [r4, 0x10] -_0806F416: +@0806F416: ldr r0, [r4, 0xC] cmp r0, 0 - beq _0806F424 + beq @0806F424 bl free movs r0, 0 str r0, [r4, 0xC] -_0806F424: +@0806F424: movs r0, 0x1 ands r0, r7 cmp r0, 0 - beq _0806F448 + beq @0806F448 ldr r0, [r4, 0x8] cmp r0, 0 - beq _0806F43A + beq @0806F43A bl free movs r0, 0 str r0, [r4, 0x8] -_0806F43A: +@0806F43A: ldr r0, [r4, 0x4] cmp r0, 0 - beq _0806F448 + beq @0806F448 bl free movs r0, 0 str r0, [r4, 0x4] -_0806F448: +@0806F448: cmp r7, 0 - beq _0806F45E + beq @0806F45E adds r0, r4, 0 movs r1, 0 movs r2, 0x14 bl memset adds r0, r4, 0 bl free - b _0806F468 -_0806F45E: + b @0806F468 +@0806F45E: movs r0, 0xA3 strb r0, [r4, 0x2] ldr r0, =0x020249b4 add r0, r8 str r4, [r0] -_0806F468: +@0806F468: ldr r0, =0x020249b4 add r0, r8 ldr r0, [r0] -_0806F46E: +@0806F46E: pop {r3} mov r8, r3 pop {r4-r7} @@ -198787,7 +198787,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 @@ -198798,60 +198798,60 @@ sub_806F47C: @ 806F47C adds r0, r1 ldr r4, [r0] cmp r4, 0 - beq _0806F4F0 + beq @0806F4F0 ldrb r0, [r4, 0x2] cmp r0, 0xA3 - beq _0806F4A8 + beq @0806F4A8 adds r0, r4, 0 movs r1, 0 movs r2, 0x14 bl memset - b _0806F4F0 + b @0806F4F0 .align 2, 0 .pool -_0806F4A8: +@0806F4A8: ldr r0, [r4, 0x10] cmp r0, 0 - beq _0806F4B6 + beq @0806F4B6 bl free movs r0, 0 str r0, [r4, 0x10] -_0806F4B6: +@0806F4B6: ldr r0, [r4, 0xC] cmp r0, 0 - beq _0806F4C4 + beq @0806F4C4 bl free movs r0, 0 str r0, [r4, 0xC] -_0806F4C4: +@0806F4C4: ldr r0, [r4, 0x8] cmp r0, 0 - beq _0806F4D2 + beq @0806F4D2 bl free movs r0, 0 str r0, [r4, 0x8] -_0806F4D2: +@0806F4D2: ldr r0, [r4, 0x4] cmp r0, 0 - beq _0806F4E0 + beq @0806F4E0 bl free movs r0, 0 str r0, [r4, 0x4] -_0806F4E0: +@0806F4E0: adds r0, r4, 0 movs r1, 0 movs r2, 0x14 bl memset adds r0, r4, 0 bl free -_0806F4F0: +@0806F4F0: pop {r4} pop {r0} bx r0 thumb_func_end sub_806F47C thumb_func_start sub_806F4F8 -sub_806F4F8: @ 806F4F8 +sub_806F4F8: ; 806F4F8 push {lr} lsls r0, 24 lsrs r0, 24 @@ -198865,31 +198865,31 @@ sub_806F4F8: @ 806F4F8 ldr r1, [r0] ldrb r0, [r1, 0x2] cmp r0, 0xA3 - beq _0806F51C + beq @0806F51C movs r0, 0 - b _0806F530 + b @0806F530 .align 2, 0 .pool -_0806F51C: +@0806F51C: ldrb r0, [r1] lsls r0, 28 lsrs r0, 28 cmp r3, r0 - blt _0806F528 + blt @0806F528 movs r3, 0 -_0806F528: +@0806F528: ldr r0, [r1, 0x8] lsls r1, r3, 2 adds r1, r0 ldr r0, [r1] -_0806F530: +@0806F530: pop {r1} bx r1 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, =0x08329f40 @@ -198907,8 +198907,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, =0x08329f40 @@ -198927,8 +198927,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 @@ -198949,15 +198949,15 @@ sine2: @ 806F570 adds r4, r1 ldrh r1, [r4] cmp r0, 0 - bne _0806F5A8 + bne @0806F5A8 lsls r0, r1, 16 - b _0806F5AC + b @0806F5AC .align 2, 0 .pool -_0806F5A8: +@0806F5A8: lsls r0, r1, 16 negs r0, r0 -_0806F5AC: +@0806F5AC: asrs r0, 16 pop {r4,r5} pop {r1} @@ -198965,8 +198965,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 @@ -198981,8 +198981,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 @@ -199001,8 +199001,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 @@ -199016,7 +199016,7 @@ SeedRng: @ 806F5F8 thumb_func_end SeedRng thumb_func_start SeedRng2 -SeedRng2: @ 806F610 +SeedRng2: ; 806F610 lsls r0, 16 lsrs r0, 16 ldr r1, =0x03005d84 @@ -199027,7 +199027,7 @@ SeedRng2: @ 806F610 thumb_func_end SeedRng2 thumb_func_start GenerateRandomNumber2 -GenerateRandomNumber2: @ 806F620 +GenerateRandomNumber2: ; 806F620 ldr r2, =0x03005d84 ldr r1, [r2] ldr r0, =0x41c64e6d @@ -199042,7 +199042,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, =0x0832a3a8 @@ -199073,7 +199073,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] @@ -199081,7 +199081,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] @@ -199092,7 +199092,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} @@ -199117,7 +199117,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} @@ -199156,7 +199156,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 @@ -199180,15 +199180,15 @@ rfu_MBOOT_CHILD_inheritanceLinkStatus: @ 806F70C ldrb r1, [r1] str r1, [sp, 0x28] movs r0, 0 - b _0806F88C + b @0806F88C .align 2, 0 .pool -_0806F740: +@0806F740: movs r5, 0 adds r0, 0x1 str r0, [sp, 0x30] - b _0806F874 -_0806F748: + b @0806F874 +@0806F748: ldrh r0, [r4] ldr r2, =0x000003ff adds r1, r2, 0 @@ -199202,7 +199202,7 @@ _0806F748: mov r2, sp strh r0, [r2, 0x34] cmp r1, 0 - bne _0806F788 + bne @0806F788 ldr r0, [sp, 0x20] add r0, r8 adds r1, r7, 0 @@ -199214,14 +199214,14 @@ _0806F748: mov r10, r7 adds r5, 0x1 mov r9, r5 - b _0806F86A + b @0806F86A .align 2, 0 .pool -_0806F788: +@0806F788: movs r0, 0x80 lsls r0, 4 cmp r1, r0 - bne _0806F7CC + bne @0806F7CC movs r1, 0 adds r4, 0x2 str r4, [sp, 0x2C] @@ -199230,7 +199230,7 @@ _0806F788: mov r10, r2 adds r5, 0x1 mov r9, r5 -_0806F7A0: +@0806F7A0: lsls r4, r1, 24 asrs r4, 24 movs r0, 0x7 @@ -199248,11 +199248,11 @@ _0806F7A0: lsrs r1, r4, 24 asrs r4, 24 cmp r4, 0x7 - ble _0806F7A0 - b _0806F86A + ble @0806F7A0 + b @0806F86A .align 2, 0 .pool -_0806F7CC: +@0806F7CC: movs r1, 0 adds r4, 0x2 str r4, [sp, 0x2C] @@ -199263,7 +199263,7 @@ _0806F7CC: mov r9, r5 movs r0, 0xF mov r12, r0 -_0806F7E0: +@0806F7E0: movs r2, 0 lsls r4, r1, 24 lsls r0, r4, 2 @@ -199271,7 +199271,7 @@ _0806F7E0: adds r6, r0, 0x3 mov r1, r8 adds r5, r1, r0 -_0806F7EE: +@0806F7EE: lsls r1, r2, 24 asrs r1, 24 subs r0, r6, r1 @@ -199292,23 +199292,23 @@ _0806F7EE: lsrs r2, r1, 24 asrs r1, 24 cmp r1, 0x3 - ble _0806F7EE + ble @0806F7EE movs r1, 0x80 lsls r1, 17 adds r0, r4, r1 lsrs r1, r0, 24 asrs r0, 24 cmp r0, 0x7 - ble _0806F7E0 + ble @0806F7E0 mov r2, sp ldrh r0, [r2, 0x34] movs r2, 0x80 lsls r2, 4 ands r0, r2 cmp r0, 0 - beq _0806F860 + beq @0806F860 movs r1, 0 -_0806F836: +@0806F836: lsls r4, r1, 24 asrs r4, 24 movs r0, 0x7 @@ -199324,27 +199324,27 @@ _0806F836: lsrs r1, r4, 24 asrs r4, 24 cmp r4, 0x7 - ble _0806F836 - b _0806F86A + ble @0806F836 + b @0806F86A .align 2, 0 .pool -_0806F860: +@0806F860: mov r0, sp adds r1, r7, 0 ldr r2, =0x04000008 bl CpuSet -_0806F86A: +@0806F86A: ldr r4, [sp, 0x2C] mov r7, r10 mov r1, r9 lsls r0, r1, 24 lsrs r5, r0, 24 -_0806F874: +@0806F874: ldr r2, [sp, 0x28] cmp r5, r2 - bcs _0806F87C - b _0806F748 -_0806F87C: + bcs @0806F87C + b @0806F748 +@0806F87C: movs r0, 0x20 ldr r1, [sp, 0x28] subs r0, r1 @@ -199353,12 +199353,12 @@ _0806F87C: ldr r2, [sp, 0x30] lsls r0, r2, 24 lsrs r0, 24 -_0806F88C: +@0806F88C: ldr r1, [sp, 0x24] cmp r0, r1 - bcs _0806F894 - b _0806F740 -_0806F894: + bcs @0806F894 + b @0806F740 +@0806F894: add sp, 0x38 pop {r3-r5} mov r8, r3 @@ -199372,74 +199372,74 @@ _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 movs r3, 0x1 -_0806F8B0: +@0806F8B0: adds r0, r2, 0 ands r0, r3 cmp r0, 0 - beq _0806F8BC + beq @0806F8BC adds r0, r1, 0 - b _0806F8CA -_0806F8BC: + b @0806F8CA +@0806F8BC: lsrs r2, 1 adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x1F - bls _0806F8B0 + bls @0806F8B0 movs r0, 0 -_0806F8CA: +@0806F8CA: pop {r1} bx r1 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 ldr r2, =0x00001121 movs r3, 0 cmp r3, r4 - bge _0806F91C + bge @0806F91C movs r6, 0x1 ldr r0, =0x00008408 adds r5, r0, 0 -_0806F8E4: +@0806F8E4: adds r0, r7, r3 ldrb r0, [r0] eors r2, r0 movs r1, 0 adds r3, 0x1 -_0806F8EE: +@0806F8EE: adds r0, r2, 0 ands r0, r6 cmp r0, 0 - beq _0806F908 + beq @0806F908 lsrs r0, r2, 1 eors r0, r5 lsls r0, 16 lsrs r2, r0, 16 - b _0806F90A + b @0806F90A .align 2, 0 .pool -_0806F908: +@0806F908: lsrs r2, 1 -_0806F90A: +@0806F90A: adds r0, r1, 0x1 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x7 - bls _0806F8EE + bls @0806F8EE lsls r0, r3, 16 lsrs r3, r0, 16 cmp r3, r4 - blt _0806F8E4 -_0806F91C: + blt @0806F8E4 +@0806F91C: mvns r0, r2 lsls r0, 16 lsrs r0, 16 @@ -199449,16 +199449,16 @@ _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 ldr r2, =0x00001121 movs r3, 0 cmp r3, r4 - bcs _0806F956 + bcs @0806F956 ldr r6, =0x0832a3d8 -_0806F938: +@0806F938: lsrs r1, r2, 8 adds r0, r5, r3 ldrb r0, [r0] @@ -199473,8 +199473,8 @@ _0806F938: lsls r0, 16 lsrs r3, r0, 16 cmp r3, r4 - bcc _0806F938 -_0806F956: + bcc @0806F938 +@0806F956: mvns r0, r2 lsls r0, 16 lsrs r0, 16 @@ -199486,21 +199486,21 @@ _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 movs r2, 0 cmp r3, r1 - bcs _0806F984 -_0806F978: + bcs @0806F984 +@0806F978: adds r0, r4, r2 ldrb r0, [r0] adds r3, r0 adds r2, 0x1 cmp r2, r1 - bcc _0806F978 -_0806F984: + bcc @0806F978 +@0806F984: adds r0, r3, 0 pop {r4} pop {r1} @@ -199508,7 +199508,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 @@ -199527,12 +199527,12 @@ pal_fade_1: @ 806F98C strh r3, [r0] movs r6, 0 cmp r6, r12 - bcs _0806FA12 + bcs @0806FA12 ldr r0, =0x02037714 mov r10, r0 ldr r1, =0x02037b14 mov r9, r1 -_0806F9BA: +@0806F9BA: mov r0, r8 adds r5, r6, r0 lsls r5, 16 @@ -199576,8 +199576,8 @@ _0806F9BA: lsls r0, 16 lsrs r6, r0, 16 cmp r6, r12 - bcc _0806F9BA -_0806FA12: + bcc @0806F9BA +@0806FA12: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -199591,7 +199591,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 @@ -199608,7 +199608,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 @@ -199625,28 +199625,28 @@ 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 movs r4, 0 -_0806FA74: +@0806FA74: movs r0, 0x8C muls r0, r4 adds r0, r6, r0 movs r1, 0xB bl pokemon_getattr_encrypted cmp r0, 0 - beq _0806FA8A + beq @0806FA8A adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_0806FA8A: +@0806FA8A: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bls _0806FA74 + bls @0806FA74 adds r0, r5, 0 pop {r4-r6} pop {r1} @@ -199654,7 +199654,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 @@ -199668,7 +199668,7 @@ sub_806FA9C: @ 806FA9C adds r6, 0x74 movs r0, 0x1 mov r8, r0 -_0806FAB6: +@0806FAB6: movs r0, 0x8C muls r0, r5 mov r1, r9 @@ -199677,7 +199677,7 @@ _0806FAB6: movs r1, 0xB bl pokemon_getattr_encrypted cmp r0, 0 - beq _0806FAE4 + beq @0806FAE4 adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 @@ -199686,21 +199686,21 @@ _0806FAB6: bl pokemon_getattr_encrypted adds r1, r0, 0 cmp r1, 0 - bne _0806FAE4 + bne @0806FAE4 lsls r0, r5, 1 adds r0, r6, r0 - b _0806FAEA -_0806FAE4: + b @0806FAEA +@0806FAE4: lsls r0, r5, 1 adds r0, r6, r0 mov r1, r8 -_0806FAEA: +@0806FAEA: strh r1, [r0] adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x1 - bls _0806FAB6 + bls @0806FAB6 mov r0, r10 str r7, [r0, 0x70] pop {r3-r5} @@ -199713,44 +199713,44 @@ _0806FAEA: thumb_func_end sub_806FA9C thumb_func_start daycare_empty_slot -daycare_empty_slot: @ 806FB08 +daycare_empty_slot: ; 806FB08 push {r4,r5,lr} adds r5, r0, 0 movs r4, 0 -_0806FB0E: +@0806FB0E: movs r0, 0x8C muls r0, r4 adds r0, r5, r0 movs r1, 0xB bl pokemon_getattr_encrypted cmp r0, 0 - bne _0806FB24 + bne @0806FB24 lsls r0, r4, 24 asrs r0, 24 - b _0806FB32 -_0806FB24: + b @0806FB32 +@0806FB24: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bls _0806FB0E + bls @0806FB0E movs r0, 0x1 negs r0, r0 -_0806FB32: +@0806FB32: pop {r4,r5} pop {r1} bx r1 thumb_func_end daycare_empty_slot thumb_func_start sub_806FB38 -sub_806FB38: @ 806FB38 +sub_806FB38: ; 806FB38 push {r4-r6,lr} adds r6, r0, 0 adds r5, r1, 0 bl sub_80D43F0 lsls r0, 24 cmp r0, 0 - beq _0806FBBC + beq @0806FBBC adds r0, r5, 0 adds r0, 0x74 ldr r1, =0x03005d90 @@ -199803,7 +199803,7 @@ sub_806FB38: @ 806FB38 stm r0!, {r2-r4} adds r0, r6, 0 bl sub_80D4680 -_0806FBBC: +@0806FBBC: adds r0, r5, 0 adds r1, r6, 0 movs r2, 0x50 @@ -199826,7 +199826,7 @@ _0806FBBC: thumb_func_end sub_806FB38 thumb_func_start daycare_send -daycare_send: @ 806FBF4 +daycare_send: ; 806FBF4 push {r4,r5,lr} adds r5, r0, 0 adds r4, r1, 0 @@ -199846,7 +199846,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 @@ -199867,7 +199867,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 @@ -199876,13 +199876,13 @@ sub_806FC48: @ 806FC48 movs r1, 0xB bl pokemon_getattr_encrypted cmp r0, 0 - beq _0806FC9E + beq @0806FC9E adds r0, r5, 0 movs r1, 0xB bl pokemon_getattr_encrypted adds r6, r0, 0 cmp r6, 0 - bne _0806FC9E + bne @0806FC9E adds r0, r5, 0 adds r1, r4, 0 movs r2, 0x50 @@ -199905,48 +199905,48 @@ sub_806FC48: @ 806FC48 str r6, [r1] adds r0, r4, 0 bl sub_806FF80 -_0806FC9E: +@0806FC9E: pop {r4-r6} pop {r0} bx r0 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 ldr r7, =0x0000ffff -_0806FCAC: +@0806FCAC: adds r0, r4, 0 bl sub_806DF74 lsls r0, 24 cmp r0, 0 - beq _0806FCE8 + beq @0806FCE8 movs r6, 0x1 adds r5, 0x1 - b _0806FCD4 + b @0806FCD4 .align 2, 0 .pool -_0806FCC4: +@0806FCC4: movs r6, 0 cmp r0, r7 - bne _0806FCD4 + bne @0806FCD4 ldr r0, =0x020244e2 ldrh r1, [r0] adds r0, r4, 0 bl sub_8069424 -_0806FCD4: +@0806FCD4: adds r0, r4, 0 adds r1, r6, 0 bl sub_8069318 lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne _0806FCC4 + bne @0806FCC4 cmp r5, 0x63 - ble _0806FCAC -_0806FCE8: + ble @0806FCAC +@0806FCE8: adds r0, r4, 0 bl pokemon_calc_effective_stats pop {r4-r7} @@ -199957,7 +199957,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 @@ -199975,7 +199975,7 @@ sub_806FCF8: @ 806FCF8 movs r1, 0x38 bl pokemon_getattr cmp r0, 0x64 - beq _0806FD46 + beq @0806FD46 mov r0, sp movs r1, 0x19 bl pokemon_getattr @@ -199990,7 +199990,7 @@ sub_806FCF8: @ 806FCF8 bl pokemon_setattr mov r0, sp bl sub_806FCA4 -_0806FD46: +@0806FD46: ldr r0, =0x020244ec movs r1, 0xFA lsls r1, 1 @@ -200003,7 +200003,7 @@ _0806FD46: adds r0, 0x70 ldrh r0, [r0] cmp r0, 0 - beq _0806FD74 + beq @0806FD74 adds r4, r5, 0 adds r4, 0x50 adds r0, r6, 0 @@ -200011,7 +200011,7 @@ _0806FD46: bl sub_80D460C adds r0, r4, 0 bl sub_806FF80 -_0806FD74: +@0806FD74: adds r0, r5, 0 bl zero_pokemon_boxed_data adds r1, r5, 0 @@ -200030,7 +200030,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 @@ -200051,7 +200051,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] @@ -200069,7 +200069,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 @@ -200098,7 +200098,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 @@ -200121,7 +200121,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 @@ -200145,7 +200145,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 @@ -200172,7 +200172,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 @@ -200187,7 +200187,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] @@ -200205,7 +200205,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 @@ -200226,7 +200226,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 @@ -200241,12 +200241,12 @@ sub_806FF30: @ 806FF30 movs r1, 0xB bl pokemon_getattr_encrypted cmp r0, 0 - bne _0806FF60 + bne @0806FF60 movs r0, 0 - b _0806FF76 + b @0806FF76 .align 2, 0 .pool -_0806FF60: +@0806FF60: ldrh r0, [r5] adds r1, r0, 0 muls r1, r4 @@ -200257,7 +200257,7 @@ _0806FF60: bl sub_806FE54 lsls r0, 24 lsrs r0, 24 -_0806FF76: +@0806FF76: pop {r4-r6} pop {r1} bx r1 @@ -200266,35 +200266,35 @@ _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 adds r1, r0, 0 adds r1, 0x2B -_0806FF8A: +@0806FF8A: strb r3, [r1] subs r1, 0x1 subs r2, 0x1 cmp r2, 0 - bge _0806FF8A + bge @0806FF8A adds r2, r0, 0 adds r2, 0x2C movs r3, 0 adds r1, r0, 0 adds r1, 0x36 -_0806FF9E: +@0806FF9E: strb r3, [r1] subs r1, 0x1 cmp r1, r2 - bge _0806FF9E + bge @0806FF9E bl sub_80D439C pop {r0} bx r0 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 @@ -200311,12 +200311,12 @@ 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 movs r6, 0x8C -_0806FFD8: +@0806FFD8: adds r0, r4, 0 muls r0, r6 adds r0, r5, r0 @@ -200325,7 +200325,7 @@ _0806FFD8: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bls _0806FFD8 + bls @0806FFD8 movs r1, 0x8C lsls r1, 1 adds r0, r5, r1 @@ -200341,7 +200341,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} @@ -200351,7 +200351,7 @@ sub_8070004: @ 8070004 mov r8, r0 ldr r0, =0x0832531c mov r12, r0 -_08070016: +@08070016: movs r7, 0 movs r6, 0x1 movs r4, 0x80 @@ -200359,30 +200359,30 @@ _08070016: movs r5, 0x28 mov r3, r12 adds r3, 0x28 -_08070024: +@08070024: movs r1, 0 ldrh r0, [r3, 0x4] cmp r0, r2 - bne _08070034 + bne @08070034 lsrs r2, r4, 16 - b _08070060 + b @08070060 .align 2, 0 .pool -_08070034: +@08070034: adds r1, 0x1 cmp r1, 0x4 - bgt _0807004A + bgt @0807004A lsls r0, r1, 3 adds r0, r5 add r0, r12 ldrh r0, [r0, 0x4] cmp r0, r2 - bne _08070034 + bne @08070034 lsrs r2, r4, 16 movs r7, 0x1 -_0807004A: +@0807004A: cmp r7, 0 - bne _08070060 + bne @08070060 movs r0, 0x80 lsls r0, 9 adds r4, r0 @@ -200391,18 +200391,18 @@ _0807004A: adds r6, 0x1 ldr r0, =0x0000019b cmp r6, r0 - ble _08070024 -_08070060: + ble @08070024 +@08070060: movs r0, 0xCE lsls r0, 1 cmp r6, r0 - beq _08070072 + beq @08070072 movs r0, 0x1 add r8, r0 mov r0, r8 cmp r0, 0x4 - ble _08070016 -_08070072: + ble @08070016 +@08070072: adds r0, r2, 0 pop {r3} mov r8, r3 @@ -200414,14 +200414,14 @@ _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 movs r7, 0x1 negs r7, r7 movs r4, 0 -_08070090: +@08070090: movs r0, 0x8C muls r0, r4 adds r0, r6, r0 @@ -200429,15 +200429,15 @@ _08070090: lsls r0, 24 lsrs r0, 24 cmp r0, 0xFE - bne _080700A4 + bne @080700A4 adds r7, r4, 0 -_080700A4: +@080700A4: adds r4, 0x1 cmp r4, 0x1 - ble _08070090 + ble @08070090 movs r5, 0 movs r4, 0 -_080700AE: +@080700AE: movs r0, 0x8C muls r0, r4 adds r0, r6, r0 @@ -200447,44 +200447,44 @@ _080700AE: add r1, sp str r0, [r1] cmp r0, 0x84 - bne _080700C8 + bne @080700C8 adds r5, 0x1 adds r7, r4, 0 -_080700C8: +@080700C8: adds r4, 0x1 cmp r4, 0x1 - ble _080700AE + ble @080700AE cmp r5, 0x2 - bne _080700E2 + bne @080700E2 bl GenerateRandomNumber lsls r0, 16 ldr r1, =0x7ffe0000 movs r7, 0x1 cmp r0, r1 - bls _080700E2 + bls @080700E2 movs r7, 0 -_080700E2: +@080700E2: movs r0, 0x8C muls r0, r7 adds r0, r6, r0 movs r1, 0xC bl pokemon_getattr_encrypted cmp r0, 0xC3 - bne _080700FE + bne @080700FE bl GenerateRandomNumber lsls r0, 16 ldr r1, =0x7ffe0000 cmp r0, r1 - bls _08070108 -_080700FE: + bls @08070108 +@080700FE: movs r0, 0x1 negs r0, r0 - b _0807010A + b @0807010A .align 2, 0 .pool -_08070108: +@08070108: adds r0, r7, 0 -_0807010A: +@0807010A: add sp, 0x8 pop {r4-r7} pop {r1} @@ -200492,7 +200492,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 @@ -200503,7 +200503,7 @@ sub_8070114: @ 8070114 bl sub_8070084 adds r1, r0, 0 cmp r1, 0 - bge _08070160 + bge @08070160 bl GenerateRandomNumber2 adds r4, r0, 0 bl GenerateRandomNumber @@ -200520,10 +200520,10 @@ sub_8070114: @ 8070114 adds r0, 0x1 orrs r4, r0 str r4, [r5] - b _080701AC + b @080701AC .align 2, 0 .pool -_08070160: +@08070160: movs r0, 0x8C muls r0, r1 adds r0, r5, r0 @@ -200533,7 +200533,7 @@ _08070160: bl GetNatureFromPersonality lsls r0, 24 lsrs r7, r0, 24 -_08070176: +@08070176: bl GenerateRandomNumber2 adds r4, r0, 0 bl GenerateRandomNumber @@ -200546,21 +200546,21 @@ _08070176: lsls r0, 24 lsrs r0, 24 cmp r7, r0 - bne _0807019A + bne @0807019A cmp r4, 0 - bne _080701A4 -_0807019A: + bne @080701A4 +@0807019A: adds r6, 0x1 movs r0, 0x96 lsls r0, 4 cmp r6, r0 - ble _08070176 -_080701A4: + ble @08070176 +@080701A4: movs r1, 0x8C lsls r1, 1 adds r0, r5, r1 str r4, [r0] -_080701AC: +@080701AC: movs r0, 0x86 bl flag_set pop {r4-r7} @@ -200569,7 +200569,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 @@ -200591,7 +200591,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] @@ -200605,7 +200605,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] @@ -200619,7 +200619,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 @@ -200629,7 +200629,7 @@ sub_8070218: @ 8070218 movs r0, 0xFF strb r0, [r1] movs r2, 0 -_0807022A: +@0807022A: mov r1, sp adds r0, r1, r2 adds r1, r4, r2 @@ -200637,23 +200637,23 @@ _0807022A: strb r1, [r0] adds r2, 0x1 cmp r2, 0x5 - ble _0807022A + ble @0807022A movs r3, 0 movs r2, 0 -_0807023E: +@0807023E: mov r1, sp adds r0, r1, r2 ldrb r1, [r0] adds r0, r1, 0 cmp r0, 0xFF - beq _08070250 + beq @08070250 adds r0, r4, r3 strb r1, [r0] adds r3, 0x1 -_08070250: +@08070250: adds r2, 0x1 cmp r2, 0x5 - ble _0807023E + ble @0807023E add sp, 0x8 pop {r4} pop {r0} @@ -200661,7 +200661,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 @@ -200673,17 +200673,17 @@ sub_8070260: @ 8070260 add r1, sp, 0x4 add r7, sp, 0xC adds r2, r1, 0 -_08070276: +@08070276: adds r0, r2, r5 strb r5, [r0] adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls _08070276 + bls @08070276 movs r5, 0 adds r6, r1, 0 -_08070288: +@08070288: bl GenerateRandomNumber mov r1, sp adds r4, r1, r5 @@ -200702,10 +200702,10 @@ _08070288: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x2 - bls _08070288 + bls @08070288 movs r5, 0 movs r4, 0x1 -_080702B8: +@080702B8: bl GenerateRandomNumber adds r1, r7, r5 lsls r0, 16 @@ -200716,30 +200716,30 @@ _080702B8: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x2 - bls _080702B8 + bls @080702B8 movs r5, 0 -_080702D2: +@080702D2: mov r1, sp adds r0, r1, r5 ldrb r0, [r0] cmp r0, 0x5 - bhi _080703AE + bhi @080703AE lsls r0, 2 - ldr r1, =_080702EC + ldr r1, =@080702EC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080702EC: - .4byte _08070304 - .4byte _08070322 - .4byte _0807033C - .4byte _08070356 - .4byte _08070370 - .4byte _08070390 -_08070304: +@080702EC: + .4byte @08070304 + .4byte @08070322 + .4byte @0807033C + .4byte @08070356 + .4byte @08070370 + .4byte @08070390 +@08070304: adds r0, r7, r5 ldrb r1, [r0] movs r0, 0x8C @@ -200752,8 +200752,8 @@ _08070304: mov r0, r9 movs r1, 0x27 bl pokemon_setattr - b _080703AE -_08070322: + b @080703AE +@08070322: add r4, sp, 0x10 adds r0, r7, r5 ldrb r1, [r0] @@ -200765,8 +200765,8 @@ _08070322: strb r0, [r4] mov r0, r9 movs r1, 0x28 - b _08070388 -_0807033C: + b @08070388 +@0807033C: add r4, sp, 0x10 adds r0, r7, r5 ldrb r1, [r0] @@ -200778,8 +200778,8 @@ _0807033C: strb r0, [r4] mov r0, r9 movs r1, 0x29 - b _08070388 -_08070356: + b @08070388 +@08070356: add r4, sp, 0x10 adds r0, r7, r5 ldrb r1, [r0] @@ -200791,8 +200791,8 @@ _08070356: strb r0, [r4] mov r0, r9 movs r1, 0x2A - b _08070388 -_08070370: + b @08070388 +@08070370: add r4, sp, 0x10 adds r0, r7, r5 ldrb r1, [r0] @@ -200804,11 +200804,11 @@ _08070370: strb r0, [r4] mov r0, r9 movs r1, 0x2B -_08070388: +@08070388: adds r2, r4, 0 bl pokemon_setattr - b _080703AE -_08070390: + b @080703AE +@08070390: add r4, sp, 0x10 adds r0, r7, r5 ldrb r1, [r0] @@ -200822,12 +200822,12 @@ _08070390: movs r1, 0x2C adds r2, r4, 0 bl pokemon_setattr -_080703AE: +@080703AE: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x2 - bls _080702D2 + bls @080702D2 add sp, 0x14 pop {r3,r4} mov r8, r3 @@ -200838,7 +200838,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} @@ -200855,40 +200855,40 @@ pokemon_get_eggmoves: @ 80703C8 ldr r7, =0x00004e20 adds r0, r3, r7 cmp r1, r0 - bne _080703F8 + bne @080703F8 movs r4, 0x1 - b _0807041A + b @0807041A .align 2, 0 .pool -_080703F8: +@080703F8: adds r0, r2, 0x1 lsls r0, 16 lsrs r2, r0, 16 ldr r0, =0x00000471 ldr r5, =0x0832add8 cmp r2, r0 - bhi _0807041A + bhi @0807041A lsls r0, r2, 1 adds r0, r5 ldrh r1, [r0] ldr r7, =0x00004e20 adds r0, r3, r7 cmp r1, r0 - bne _080703F8 + bne @080703F8 adds r0, r2, 0x1 lsls r0, 16 lsrs r4, r0, 16 -_0807041A: +@0807041A: movs r2, 0 lsls r0, r4, 1 adds r0, r5 ldrh r0, [r0] ldr r1, =0x00004e20 cmp r0, r1 - bhi _08070456 + bhi @08070456 adds r7, r5, 0 adds r3, r1, 0 -_0807042C: +@0807042C: lsls r1, r2, 1 add r1, r8 adds r0, r4, r2 @@ -200903,14 +200903,14 @@ _0807042C: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x9 - bhi _08070456 + bhi @08070456 adds r0, r4, r2 lsls r0, 1 adds r0, r5 ldrh r0, [r0] cmp r0, r3 - bls _0807042C -_08070456: + bls @0807042C +@08070456: lsls r0, r6, 24 lsrs r0, 24 pop {r3} @@ -200923,7 +200923,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 @@ -200940,7 +200940,7 @@ daycare_build_child_moveset: @ 8070470 movs r2, 0 ldr r4, =0x02024a28 ldr r3, =0x02024a30 -_08070490: +@08070490: lsls r1, r6, 1 adds r0, r1, r5 strh r2, [r0] @@ -200952,11 +200952,11 @@ _08070490: lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x3 - bls _08070490 + bls @08070490 movs r6, 0 ldr r2, =0x02024a38 movs r1, 0 -_080704AE: +@080704AE: lsls r0, r6, 1 adds r0, r2 strh r1, [r0] @@ -200964,11 +200964,11 @@ _080704AE: lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x9 - bls _080704AE + bls @080704AE movs r6, 0 ldr r2, =0x020249c4 movs r1, 0 -_080704C4: +@080704C4: lsls r0, r6, 1 adds r0, r2 strh r1, [r0] @@ -200976,7 +200976,7 @@ _080704C4: lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x31 - bls _080704C4 + bls @080704C4 adds r0, r7, 0 movs r1, 0xB bl pokemon_getattr @@ -200990,7 +200990,7 @@ _080704C4: movs r6, 0 ldr r1, =0x02024a28 mov r8, r1 -_080704F2: +@080704F2: adds r5, r6, 0 adds r5, 0xD mov r0, r10 @@ -201010,7 +201010,7 @@ _080704F2: lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x3 - bls _080704F2 + bls @080704F2 ldr r1, =0x02024a38 adds r0, r7, 0 bl pokemon_get_eggmoves @@ -201018,27 +201018,27 @@ _080704F2: lsrs r0, 24 mov r8, r0 movs r6, 0 -_0807052E: +@0807052E: ldr r0, =0x02024a28 lsls r1, r6, 1 adds r2, r1, r0 ldrh r1, [r2] mov r9, r0 cmp r1, 0 - beq _080705A4 + beq @080705A4 movs r5, 0 cmp r5, r8 - bcs _08070596 + bcs @08070596 adds r4, r2, 0 ldr r2, =0x0000ffff -_08070546: +@08070546: ldr r0, =0x02024a38 lsls r1, r5, 1 adds r1, r0 ldrh r0, [r4] ldrh r1, [r1] cmp r0, r1 - bne _0807058C + bne @0807058C adds r1, r0, 0 adds r0, r7, 0 str r2, [sp, 0x8] @@ -201047,30 +201047,30 @@ _08070546: lsrs r0, 16 ldr r2, [sp, 0x8] cmp r0, r2 - bne _08070596 + bne @08070596 ldrh r1, [r4] adds r0, r7, 0 bl sub_8069424 - b _08070596 + b @08070596 .align 2, 0 .pool -_0807058C: +@0807058C: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, r8 - bcc _08070546 -_08070596: + bcc @08070546 +@08070596: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 ldr r3, =0x02024a28 mov r9, r3 cmp r6, 0x3 - bls _0807052E -_080705A4: + bls @0807052E +@080705A4: movs r6, 0 -_080705A6: +@080705A6: lsls r0, r6, 1 mov r2, r9 adds r1, r0, r2 @@ -201079,13 +201079,13 @@ _080705A6: adds r6, 0x1 mov r8, r6 cmp r1, 0 - beq _08070608 + beq @08070608 movs r5, 0 ldr r0, =0x02024a28 adds r4, r2, r0 ldr r6, =0x0000ffff mov r9, r0 -_080705C2: +@080705C2: ldr r3, =0x00000121 adds r0, r5, r3 lsls r0, 16 @@ -201095,62 +201095,62 @@ _080705C2: lsls r0, 16 lsrs r0, 16 cmp r1, r0 - bne _080705FE + bne @080705FE lsls r1, r5, 24 lsrs r1, 24 adds r0, r7, 0 bl sub_806E00C cmp r0, 0 - beq _080705FE + beq @080705FE ldrh r1, [r4] adds r0, r7, 0 bl pokemon_moveset_pad_ lsls r0, 16 lsrs r0, 16 cmp r0, r6 - bne _080705FE + bne @080705FE ldrh r1, [r4] adds r0, r7, 0 bl sub_8069424 -_080705FE: +@080705FE: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x39 - bls _080705C2 -_08070608: + bls @080705C2 +@08070608: mov r1, r8 lsls r0, r1, 16 lsrs r6, r0, 16 cmp r6, 0x3 - bls _080705A6 + bls @080705A6 movs r6, 0 mov r2, r9 ldrh r0, [r2] ldr r3, =0x02024a30 mov r10, r3 cmp r0, 0 - beq _08070672 + beq @08070672 mov r4, r9 ldr r0, =0x02024a4c mov r9, r0 mov r12, r10 -_08070628: +@08070628: movs r5, 0 lsls r2, r6, 1 adds r6, 0x1 mov r8, r6 adds r3, r2, r4 -_08070632: +@08070632: lsls r0, r5, 1 add r0, r9 ldrh r2, [r3] adds r1, r2, 0 ldrh r0, [r0] cmp r1, r0 - bne _08070654 + bne @08070654 cmp r1, 0 - beq _08070654 + beq @08070654 ldr r1, [sp] adds r0, r1, 0x1 lsls r0, 16 @@ -201159,49 +201159,49 @@ _08070632: lsls r1, 1 add r1, r12 strh r2, [r1] -_08070654: +@08070654: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x3 - bls _08070632 + bls @08070632 mov r1, r8 lsls r0, r1, 16 lsrs r6, r0, 16 cmp r6, 0x3 - bhi _08070672 + bhi @08070672 lsls r0, r6, 1 adds r0, r4 ldrh r0, [r0] cmp r0, 0 - bne _08070628 -_08070672: + bne @08070628 +@08070672: movs r6, 0 mov r2, r10 ldrh r0, [r2] cmp r0, 0 - beq _080706FC -_0807067C: + beq @080706FC +@0807067C: movs r5, 0 adds r3, r6, 0x1 mov r8, r3 ldr r0, [sp, 0x4] cmp r5, r0 - bcs _080706E4 + bcs @080706E4 ldr r2, =0x0000ffff -_0807068A: +@0807068A: ldr r1, =0x020249c4 lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] cmp r1, 0 - beq _080706D8 + beq @080706D8 lsls r0, r6, 1 mov r3, r10 adds r4, r0, r3 ldrh r0, [r4] cmp r0, r1 - bne _080706D8 + bne @080706D8 adds r1, r0, 0 adds r0, r7, 0 str r2, [sp, 0x8] @@ -201210,34 +201210,34 @@ _0807068A: lsrs r0, 16 ldr r2, [sp, 0x8] cmp r0, r2 - bne _080706E4 + bne @080706E4 ldrh r1, [r4] adds r0, r7, 0 bl sub_8069424 - b _080706E4 + b @080706E4 .align 2, 0 .pool -_080706D8: +@080706D8: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 ldr r0, [sp, 0x4] cmp r5, r0 - bcc _0807068A -_080706E4: + bcc @0807068A +@080706E4: mov r1, r8 lsls r0, r1, 16 lsrs r6, r0, 16 cmp r6, 0x3 - bhi _080706FC + bhi @080706FC ldr r0, =0x02024a30 lsls r1, r6, 1 adds r1, r0 ldrh r1, [r1] mov r10, r0 cmp r1, 0 - bne _0807067C -_080706FC: + bne @0807067C +@080706FC: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -201251,7 +201251,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 @@ -201266,7 +201266,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] @@ -201280,7 +201280,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 @@ -201288,12 +201288,12 @@ incense_effects: @ 8070744 movs r7, 0xB4 lsls r7, 1 cmp r1, r7 - beq _0807075C + beq @0807075C movs r0, 0xAF lsls r0, 1 cmp r1, r0 - bne _0807079E -_0807075C: + bne @0807079E +@0807075C: adds r0, r5, 0 movs r1, 0xC bl pokemon_getattr_encrypted @@ -201307,33 +201307,33 @@ _0807075C: lsrs r2, r0, 16 ldrh r0, [r4] cmp r0, r7 - bne _08070788 + bne @08070788 cmp r6, 0xDD - beq _08070788 + beq @08070788 cmp r2, 0xDD - beq _08070788 + beq @08070788 movs r0, 0xCA strh r0, [r4] -_08070788: +@08070788: ldrh r1, [r4] movs r0, 0xAF lsls r0, 1 cmp r1, r0 - bne _0807079E + bne @0807079E cmp r6, 0xDC - beq _0807079E + beq @0807079E cmp r2, 0xDC - beq _0807079E + beq @0807079E movs r0, 0xB7 strh r0, [r4] -_0807079E: +@0807079E: pop {r4-r7} pop {r0} bx r0 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 @@ -201346,10 +201346,10 @@ sub_80707A4: @ 80707A4 movs r1, 0xC bl pokemon_getattr_encrypted cmp r5, 0xCA - beq _080707C6 + beq @080707C6 cmp r0, 0xCA - bne _080707E2 -_080707C6: + bne @080707E2 +@080707C6: movs r4, 0xAC lsls r4, 1 adds r0, r6, 0 @@ -201358,11 +201358,11 @@ _080707C6: lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 - bne _080707E2 + bne @080707E2 adds r0, r6, 0 adds r1, r4, 0 bl sub_8069424 -_080707E2: +@080707E2: pop {r4-r6} pop {r0} bx r0 @@ -201371,7 +201371,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} @@ -201381,7 +201381,7 @@ sub_80707EC: @ 80707EC movs r4, 0 movs r0, 0x1 mov r8, r0 -_080707FE: +@080707FE: movs r0, 0x8C muls r0, r4 adds r5, r7, r0 @@ -201394,31 +201394,31 @@ _080707FE: lsls r0, 16 lsrs r0, 16 cmp r0, 0x84 - bne _08070826 + bne @08070826 adds r0, r4, 0 mov r1, r8 eors r0, r1 strb r0, [r6] strb r4, [r6, 0x1] - b _0807083E -_08070826: + b @0807083E +@08070826: adds r0, r5, 0 bl pokemon_roll_gender lsls r0, 24 lsrs r0, 24 cmp r0, 0xFE - bne _0807083E + bne @0807083E strb r4, [r6] adds r0, r4, 0 mov r1, r8 eors r0, r1 strb r0, [r6, 0x1] -_0807083E: +@0807083E: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x1 - bls _080707FE + bls @080707FE ldrb r0, [r6] lsls r0, 1 add r0, sp @@ -201427,7 +201427,7 @@ _0807083E: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x1D - bne _08070870 + bne @08070870 movs r1, 0x8C lsls r1, 1 adds r0, r7, r1 @@ -201436,12 +201436,12 @@ _0807083E: lsls r1, 8 ands r0, r1 cmp r0, 0 - beq _08070870 + beq @08070870 movs r4, 0x20 -_08070870: +@08070870: ldr r0, =0x00000183 cmp r4, r0 - bne _0807088C + bne @0807088C movs r1, 0x8C lsls r1, 1 adds r0, r7, r1 @@ -201450,16 +201450,16 @@ _08070870: lsls r1, 8 ands r0, r1 cmp r0, 0 - beq _0807088C + beq @0807088C movs r4, 0xC1 lsls r4, 1 -_0807088C: +@0807088C: ldrb r0, [r6, 0x1] lsls r0, 1 add r0, sp ldrh r0, [r0] cmp r0, 0x84 - bne _080708B4 + bne @080708B4 ldrb r1, [r6] movs r0, 0x8C muls r0, r1 @@ -201468,12 +201468,12 @@ _0807088C: lsls r0, 24 lsrs r0, 24 cmp r0, 0xFE - beq _080708B4 + beq @080708B4 ldrb r1, [r6, 0x1] ldrb r0, [r6] strb r0, [r6, 0x1] strb r1, [r6] -_080708B4: +@080708B4: adds r0, r4, 0 add sp, 0x4 pop {r3} @@ -201486,7 +201486,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 @@ -201517,11 +201517,11 @@ sub_80708C8: @ 80708C8 bl daycare_build_child_moveset ldrh r0, [r4] cmp r0, 0xAC - bne _08070918 + bne @08070918 mov r0, sp adds r1, r6, 0 bl sub_80707A4 -_08070918: +@08070918: mov r2, sp adds r2, 0x6A movs r0, 0x1 @@ -201549,7 +201549,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 @@ -201609,14 +201609,14 @@ sub_8070954: @ 8070954 adds r2, r4, 0 bl pokemon_setattr cmp r6, 0 - beq _080709E6 + beq @080709E6 add r2, sp, 0x14 movs r0, 0xFD strb r0, [r2] adds r0, r7, 0 movs r1, 0x23 bl pokemon_setattr -_080709E6: +@080709E6: mov r2, sp adds r2, 0x15 mov r0, r9 @@ -201636,7 +201636,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 @@ -201709,7 +201709,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] @@ -201723,13 +201723,13 @@ 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 movs r7, 0 movs r5, 0 -_08070ACE: +@08070ACE: movs r0, 0x8C adds r4, r5, 0 muls r4, r0 @@ -201737,7 +201737,7 @@ _08070ACE: movs r1, 0x5 bl pokemon_getattr_encrypted cmp r0, 0 - beq _08070AEE + beq @08070AEE adds r1, r6, 0 adds r1, 0x88 adds r1, r4 @@ -201745,23 +201745,23 @@ _08070ACE: adds r0, 0x1 str r0, [r1] adds r7, 0x1 -_08070AEE: +@08070AEE: adds r5, 0x1 cmp r5, 0x1 - bls _08070ACE + bls @08070ACE movs r1, 0x8C lsls r1, 1 adds r0, r6, r1 ldr r0, [r0] cmp r0, 0 - bne _08070B34 + bne @08070B34 cmp r7, 0x2 - bne _08070B34 + bne @08070B34 subs r1, 0x4 adds r0, r6, r1 ldrb r0, [r0] cmp r0, 0xFF - bne _08070B34 + bne @08070B34 adds r0, r6, 0 bl daycare_relationship_score adds r4, r0, 0 @@ -201775,9 +201775,9 @@ _08070AEE: ldr r1, =0x0000ffff bl __udivsi3 cmp r4, r0 - bls _08070B34 + bls @08070B34 bl sub_80701E0 -_08070B34: +@08070B34: movs r0, 0x8E lsls r0, 1 adds r1, r6, r0 @@ -201787,7 +201787,7 @@ _08070B34: lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _08070BC0 + bne @08070BC0 bl sub_807228C lsls r0, 24 lsrs r6, r0, 24 @@ -201795,58 +201795,58 @@ _08070B34: ldr r0, =0x020244e9 ldrb r0, [r0] cmp r5, r0 - bcs _08070BC0 + bcs @08070BC0 ldr r4, =0x020244ec -_08070B5C: +@08070B5C: adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - beq _08070BB4 + beq @08070BB4 adds r0, r4, 0 movs r1, 0x4 bl pokemon_getattr cmp r0, 0 - bne _08070BB4 + bne @08070BB4 adds r0, r4, 0 movs r1, 0x20 bl pokemon_getattr adds r1, r0, 0 str r1, [sp] cmp r0, 0 - beq _08070BA8 + beq @08070BA8 cmp r0, r6 - bcc _08070B98 + bcc @08070B98 subs r0, r6 - b _08070B9A + b @08070B9A .align 2, 0 .pool -_08070B98: +@08070B98: subs r0, r1, 0x1 -_08070B9A: +@08070B9A: str r0, [sp] adds r0, r4, 0 movs r1, 0x20 mov r2, sp bl pokemon_setattr - b _08070BB4 -_08070BA8: + b @08070BB4 +@08070BA8: ldr r0, =0x020375e0 strh r5, [r0] movs r0, 0x1 - b _08070BC2 + b @08070BC2 .align 2, 0 .pool -_08070BB4: +@08070BB4: adds r4, 0x64 adds r5, 0x1 ldr r0, =0x020244e9 ldrb r0, [r0] cmp r5, r0 - bcc _08070B5C -_08070BC0: + bcc @08070B5C +@08070BC0: movs r0, 0 -_08070BC2: +@08070BC2: add sp, 0x4 pop {r4-r7} pop {r1} @@ -201856,7 +201856,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] @@ -201872,29 +201872,29 @@ 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 adds r0, r1 ldr r0, [r0] cmp r0, 0 - beq _08070C00 + beq @08070C00 movs r0, 0x1 -_08070C00: +@08070C00: pop {r1} bx r1 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 movs r1, 0xB bl pokemon_getattr_encrypted cmp r0, 0 - beq _08070C2E + beq @08070C2E ldr r1, =0x02021cc4 adds r0, r4, 0 bl pokemon_get_nick_ @@ -201905,17 +201905,17 @@ sub_8070C04: @ 8070C04 ldr r0, =0x02021ec4 mov r1, sp bl gf_strcpy -_08070C2E: +@08070C2E: adds r4, 0x8C adds r0, r4, 0 movs r1, 0xB bl pokemon_getattr_encrypted cmp r0, 0 - beq _08070C44 + beq @08070C44 ldr r1, =0x02021dc4 adds r0, r4, 0 bl pokemon_get_nick_ -_08070C44: +@08070C44: add sp, 0xC pop {r4} pop {r0} @@ -201925,7 +201925,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 @@ -201953,7 +201953,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] @@ -201967,7 +201967,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] @@ -201976,12 +201976,12 @@ sp0B6_daycare: @ 8070CB0 bl sub_8070BF0 lsls r0, 24 cmp r0, 0 - beq _08070CD0 + beq @08070CD0 movs r0, 0x1 - b _08070CF2 + b @08070CF2 .align 2, 0 .pool -_08070CD0: +@08070CD0: ldr r0, [r4] ldr r1, =0x00003030 adds r0, r1 @@ -201989,23 +201989,23 @@ _08070CD0: lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _08070CEC + bne @08070CEC movs r0, 0 - b _08070CF2 + b @08070CF2 .align 2, 0 .pool -_08070CEC: +@08070CEC: adds r0, 0x1 lsls r0, 24 lsrs r0, 24 -_08070CF2: +@08070CF2: pop {r4} pop {r1} bx r1 thumb_func_end sp0B6_daycare thumb_func_start sub_8070CF8 -sub_8070CF8: @ 8070CF8 +sub_8070CF8: ; 8070CF8 push {lr} ldr r0, =0x03005d8c ldr r0, [r0] @@ -202015,9 +202015,9 @@ sub_8070CF8: @ 8070CF8 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _08070D10 + bne @08070D10 movs r0, 0 -_08070D10: +@08070D10: pop {r1} bx r1 .align 2, 0 @@ -202025,39 +202025,39 @@ _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 adds r1, r0, 0 -_08070D24: +@08070D24: movs r3, 0 ldrh r0, [r1] adds r2, r5, 0 -_08070D2A: +@08070D2A: ldrh r6, [r2] cmp r0, r6 - bne _08070D34 + bne @08070D34 movs r0, 0x1 - b _08070D46 -_08070D34: + b @08070D46 +@08070D34: adds r2, 0x2 adds r3, 0x1 cmp r3, 0x1 - ble _08070D2A + ble @08070D2A adds r1, 0x2 adds r4, 0x1 cmp r4, 0x1 - ble _08070D24 + ble @08070D24 movs r0, 0 -_08070D46: +@08070D46: pop {r4-r6} pop {r1} bx r1 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 @@ -202083,7 +202083,7 @@ daycare_relationship_score: @ 8070D4C str r2, [sp, 0x28] mov r2, r9 str r2, [sp, 0x2C] -_08070D7E: +@08070D7E: movs r0, 0x8C adds r4, r7, 0 muls r4, r0 @@ -202131,73 +202131,73 @@ _08070D7E: adds r6, 0x4 adds r7, 0x1 cmp r7, 0x1 - bls _08070D7E + bls @08070D7E mov r0, sp ldrh r1, [r0] cmp r1, 0xF - beq _08070DFC + beq @08070DFC ldrh r0, [r0, 0x4] cmp r0, 0xF - beq _08070DFC + beq @08070DFC cmp r1, 0xD - bne _08070E04 + bne @08070E04 cmp r0, 0xD - bne _08070E08 -_08070DFC: + bne @08070E08 +@08070DFC: movs r0, 0 - b _08070E5C + b @08070E5C .align 2, 0 .pool -_08070E04: +@08070E04: cmp r0, 0xD - bne _08070E14 -_08070E08: + bne @08070E14 +@08070E08: ldr r1, [sp, 0xC] mov r2, r9 ldr r0, [r2, 0x4] cmp r1, r0 - beq _08070E56 - b _08070E5A -_08070E14: + beq @08070E56 + b @08070E5A +@08070E14: ldr r0, [sp, 0x14] ldr r2, [sp, 0x24] ldr r1, [r2, 0x4] cmp r0, r1 - beq _08070DFC + beq @08070DFC cmp r0, 0xFF - beq _08070DFC + beq @08070DFC cmp r1, 0xFF - beq _08070DFC + beq @08070DFC add r1, sp, 0x4 mov r0, sp bl sub_8070D1C lsls r0, 24 cmp r0, 0 - beq _08070DFC + beq @08070DFC ldr r0, [sp, 0x20] ldrh r1, [r0, 0x2] ldrh r0, [r0] cmp r0, r1 - bne _08070E4C + bne @08070E4C ldr r1, [sp, 0xC] mov r2, r9 ldr r0, [r2, 0x4] cmp r1, r0 - beq _08070E5A + beq @08070E5A movs r0, 0x46 - b _08070E5C -_08070E4C: + b @08070E5C +@08070E4C: ldr r1, [sp, 0xC] mov r2, r9 ldr r0, [r2, 0x4] cmp r1, r0 - bne _08070E5A -_08070E56: + bne @08070E5A +@08070E56: movs r0, 0x14 - b _08070E5C -_08070E5A: + b @08070E5C +@08070E5A: movs r0, 0x32 -_08070E5C: +@08070E5C: add sp, 0x30 pop {r3-r5} mov r8, r3 @@ -202209,7 +202209,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] @@ -202225,7 +202225,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 @@ -202233,21 +202233,21 @@ sp0B9_daycare_relationship_comment: @ 8070E8C adds r2, r0, 0 movs r1, 0 cmp r0, 0 - bne _08070EA0 + bne @08070EA0 movs r1, 0x3 -_08070EA0: +@08070EA0: cmp r0, 0x14 - bne _08070EA6 + bne @08070EA6 movs r1, 0x2 -_08070EA6: +@08070EA6: cmp r0, 0x32 - bne _08070EAC + bne @08070EAC movs r1, 0x1 -_08070EAC: +@08070EAC: cmp r2, 0x46 - bne _08070EB2 + bne @08070EB2 movs r1, 0 -_08070EB2: +@08070EB2: ldr r0, =0x02021fc4 ldr r2, =0x0832b6f8 lsls r1, 2 @@ -202261,7 +202261,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 @@ -202275,58 +202275,58 @@ sub_8070ECC: @ 8070ECC movs r3, 0 ldrb r0, [r4] cmp r0, 0xFF - beq _08070F10 -_08070EE8: + beq @08070F10 +@08070EE8: adds r1, r4, r3 ldrb r0, [r1] cmp r0, 0xB5 - bne _08070EF6 + bne @08070EF6 ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] -_08070EF6: +@08070EF6: ldrb r0, [r1] cmp r0, 0xB6 - bne _08070F02 + bne @08070F02 ldrb r0, [r2, 0x1] adds r0, 0x1 strb r0, [r2, 0x1] -_08070F02: +@08070F02: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 adds r0, r4, r3 ldrb r0, [r0] cmp r0, 0xFF - bne _08070EE8 -_08070F10: + bne @08070EE8 +@08070F10: cmp r5, 0 - bne _08070F24 + bne @08070F24 mov r0, sp ldrb r0, [r0] cmp r0, 0 - beq _08070F24 + beq @08070F24 mov r0, sp ldrb r0, [r0, 0x1] cmp r0, 0 - beq _08070F38 -_08070F24: + beq @08070F38 +@08070F24: cmp r5, 0xFE - bne _08070F3C + bne @08070F3C mov r0, sp ldrb r0, [r0, 0x1] cmp r0, 0 - beq _08070F3C + beq @08070F3C mov r0, sp ldrb r0, [r0] cmp r0, 0 - bne _08070F3C -_08070F38: + bne @08070F3C +@08070F38: movs r0, 0x1 - b _08070F3E -_08070F3C: + b @08070F3E +@08070F3C: movs r0, 0 -_08070F3E: +@08070F3E: add sp, 0x4 pop {r4,r5} pop {r1} @@ -202334,38 +202334,38 @@ _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 lsrs r1, 24 cmp r1, 0 - bne _08070F68 + bne @08070F68 movs r1, 0 bl sub_8070ECC lsls r0, 24 cmp r0, 0 - bne _08070F84 + bne @08070F84 ldr r1, =0x0832dac7 - b _08070F86 + b @08070F86 .align 2, 0 .pool -_08070F68: +@08070F68: cmp r1, 0xFE - bne _08070F84 + bne @08070F84 adds r0, r4, 0 movs r1, 0xFE bl sub_8070ECC lsls r0, 24 cmp r0, 0 - bne _08070F84 + bne @08070F84 ldr r1, =0x0832dac9 - b _08070F86 + b @08070F86 .align 2, 0 .pool -_08070F84: +@08070F84: ldr r1, =0x0832dacb -_08070F86: +@08070F86: adds r0, r4, 0 bl gf_strcat pop {r4} @@ -202376,7 +202376,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 @@ -202392,7 +202392,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 @@ -202405,7 +202405,7 @@ sub_8070FB4: @ 8070FB4 movs r6, 0 add r0, sp, 0x14 mov r9, r0 -_08070FCC: +@08070FCC: movs r0, 0x8C adds r4, r6, 0 muls r4, r0 @@ -202425,7 +202425,7 @@ _08070FCC: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x1 - bls _08070FCC + bls @08070FCC adds r0, r7, 0 mov r1, sp bl gf_strcpy @@ -202454,7 +202454,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 @@ -202462,7 +202462,7 @@ sub_8071038: @ 8071038 movs r0, 0xFF strb r0, [r4] movs r5, 0 -_08071046: +@08071046: adds r0, r4, 0 ldr r1, =0x085ef888 bl gf_strcat @@ -202492,7 +202492,7 @@ _08071046: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x1 - bls _08071046 + bls @08071046 add sp, 0x14 pop {r4-r6} pop {r0} @@ -202502,7 +202502,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] @@ -202563,7 +202563,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 @@ -202592,7 +202592,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} @@ -202645,7 +202645,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} @@ -202655,7 +202655,7 @@ sub_80711B8: @ 80711B8 lsls r2, 24 lsrs r5, r2, 24 cmp r6, 0x1 - bhi _080711F0 + bhi @080711F0 ldr r0, =0x03005d8c mov r8, r0 ldr r0, [r0] @@ -202672,7 +202672,7 @@ sub_80711B8: @ 80711B8 adds r2, r6, 0 adds r3, r5, 0 bl sub_8071148 -_080711F0: +@080711F0: pop {r3} mov r8, r3 pop {r4-r7} @@ -202683,7 +202683,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 @@ -202701,25 +202701,25 @@ c3_080469FC: @ 8071204 movs r0, 0x1 ands r0, r2 cmp r0, 0 - beq _08071284 + beq @08071284 cmp r1, 0x1 - bls _0807123C + bls @0807123C cmp r1, 0x5 - beq _08071248 - b _0807124E + beq @08071248 + b @0807124E .align 2, 0 .pool -_0807123C: +@0807123C: ldr r0, =0x020375f0 strh r1, [r0] - b _0807124E + b @0807124E .align 2, 0 .pool -_08071248: +@08071248: ldr r1, =0x020375f0 movs r0, 0x2 strh r0, [r1] -_0807124E: +@0807124E: ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 @@ -202737,15 +202737,15 @@ _0807124E: adds r0, r5, 0 bl remove_task bl script_env_2_enable_and_set_ctx_running - b _080712B4 + b @080712B4 .align 2, 0 .pool -_08071284: +@08071284: movs r1, 0x2 adds r0, r1, 0 ands r0, r2 cmp r0, 0 - beq _080712B4 + beq @080712B4 ldr r0, =0x020375f0 strh r1, [r0] ldrb r0, [r4, 0x8] @@ -202760,7 +202760,7 @@ _08071284: adds r0, r5, 0 bl remove_task bl script_env_2_enable_and_set_ctx_running -_080712B4: +@080712B4: pop {r4,r5} pop {r0} bx r0 @@ -202769,7 +202769,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, =0x0832b6c0 @@ -202818,7 +202818,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 @@ -202831,7 +202831,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 @@ -202862,7 +202862,7 @@ sub_8071348: @ 8071348 str r0, [sp, 0x44] adds r1, 0x4 str r1, [sp, 0x4C] -_08071386: +@08071386: adds r1, r4, 0 adds r1, 0xD adds r0, r5, 0 @@ -202875,13 +202875,13 @@ _08071386: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _08071386 + bls @08071386 adds r0, r5, 0 movs r1, 0 bl pokemon_getattr mov r9, r0 movs r4, 0 -_080713AE: +@080713AE: adds r1, r4, 0 adds r1, 0x27 adds r0, r5, 0 @@ -202893,7 +202893,7 @@ _080713AE: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls _080713AE + bls @080713AE adds r0, r5, 0 movs r1, 0x3 bl pokemon_getattr @@ -202931,7 +202931,7 @@ _080713AE: movs r3, 0x20 bl create_pokemon_set_level movs r4, 0 -_0807141E: +@0807141E: adds r1, r4, 0 adds r1, 0xD lsls r0, r4, 1 @@ -202944,9 +202944,9 @@ _0807141E: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _0807141E + bls @0807141E movs r4, 0 -_0807143C: +@0807143C: adds r1, r4, 0 adds r1, 0x27 lsls r2, r4, 2 @@ -202957,7 +202957,7 @@ _0807143C: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls _0807143C + bls @0807143C movs r0, 0x2 mov r1, r8 strb r0, [r1] @@ -203003,7 +203003,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 @@ -203083,7 +203083,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] @@ -203095,7 +203095,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 @@ -203110,7 +203110,7 @@ sub_807158C: @ 807158C adds r0, 0x70 ldrh r0, [r0] cmp r0, 0 - beq _08071608 + beq @08071608 adds r6, r4, 0 adds r6, 0x7C mov r0, sp @@ -203119,14 +203119,14 @@ sub_807158C: @ 807158C adds r5, r4, 0 adds r5, 0x74 cmp r0, 0 - bne _080715CE + bne @080715CE ldr r0, =0x03005d90 ldr r0, [r0] adds r1, r5, 0 bl sub_80092BC cmp r0, 0 - beq _08071608 -_080715CE: + beq @08071608 +@080715CE: ldr r0, =0x02021cc4 mov r1, sp bl gf_strcpy @@ -203143,12 +203143,12 @@ _080715CE: adds r1, r6, 0 bl sub_81DB5E8 movs r0, 0x1 - b _0807160A + b @0807160A .align 2, 0 .pool -_08071608: +@08071608: movs r0, 0 -_0807160A: +@0807160A: add sp, 0x20 pop {r4-r6} pop {r1} @@ -203156,7 +203156,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] @@ -203174,7 +203174,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 @@ -203192,30 +203192,30 @@ sub_807163C: @ 807163C movs r7, 0 movs r5, 0 cmp r3, 0 - bne _0807166A + bne @0807166A movs r0, 0x64 muls r1, r0 ldr r0, =0x020244ec adds r5, r1, r0 movs r4, 0x1 -_0807166A: +@0807166A: cmp r3, 0x1 - bne _0807167A + bne @0807167A movs r0, 0x64 adds r1, r2, 0 muls r1, r0 ldr r0, =0x020244ec adds r5, r1, r0 movs r4, 0x3 -_0807167A: +@0807167A: cmp r6, 0 - beq _08071688 + beq @08071688 cmp r6, 0x1 - beq _080716D8 - b _08071712 + beq @080716D8 + b @08071712 .align 2, 0 .pool -_08071688: +@08071688: adds r0, r5, 0 movs r1, 0xB bl pokemon_getattr @@ -203245,10 +203245,10 @@ _08071688: bl gpu_pal_obj_decompress_and_apply mov r0, r9 strh r4, [r0] - b _08071712 + b @08071712 .align 2, 0 .pool -_080716D8: +@080716D8: adds r0, r5, 0 bl sub_806E794 ldrh r0, [r0, 0x4] @@ -203275,7 +203275,7 @@ _080716D8: adds r1, r4 ldr r0, =nullsub_12 + 1 str r0, [r1] -_08071712: +@08071712: adds r0, r7, 0 pop {r3,r4} mov r8, r3 @@ -203288,7 +203288,7 @@ _08071712: thumb_func_end sub_807163C thumb_func_start sub_807172C -sub_807172C: @ 807172C +sub_807172C: ; 807172C push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -203298,7 +203298,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 + 1 @@ -203314,7 +203314,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 @@ -203323,7 +203323,7 @@ sub_8071760: @ 8071760 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08071788 + bne @08071788 bl overworld_free_bg_tilemaps ldr r0, =c1_hatching_egg + 1 bl set_callback2 @@ -203332,7 +203332,7 @@ sub_8071760: @ 8071760 str r0, [r1] adds r0, r4, 0 bl remove_task -_08071788: +@08071788: pop {r4} pop {r0} bx r0 @@ -203341,7 +203341,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 @@ -203350,28 +203350,28 @@ c1_hatching_egg: @ 80717A0 adds r0, r1 ldrb r0, [r0] cmp r0, 0x8 - bls _080717B4 - b _080719D6 -_080717B4: + bls @080717B4 + b @080719D6 +@080717B4: lsls r0, 2 - ldr r1, =_080717C8 + ldr r1, =@080717C8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080717C8: - .4byte _080717EC - .4byte _080718B8 - .4byte _080718D0 - .4byte _08071904 - .4byte _08071924 - .4byte _0807193C - .4byte _08071954 - .4byte _08071970 - .4byte _080719C8 -_080717EC: +@080717C8: + .4byte @080717EC + .4byte @080718B8 + .4byte @080718D0 + .4byte @08071904 + .4byte @08071924 + .4byte @0807193C + .4byte @08071954 + .4byte @08071970 + .4byte @080719C8 +@080717EC: movs r0, 0 movs r1, 0 bl lcd_io_set @@ -203438,20 +203438,20 @@ _080717EC: bl clear_tasks bl remove_some_task bl SoundVSyncOn_rev01 - b _080719A6 + b @080719A6 .align 2, 0 .pool -_080718B8: +@080718B8: ldr r0, =0x0832c06c bl Window_InitFromTemplates ldr r0, =0x03000de0 ldr r1, [r0] movs r0, 0 strb r0, [r1, 0x8] - b _080719A6 + b @080719A6 .align 2, 0 .pool -_080718D0: +@080718D0: ldr r1, =0x08c00000 movs r0, 0 str r0, [sp] @@ -203467,30 +203467,30 @@ _080718D0: movs r1, 0 movs r2, 0x20 bl decompress_palette - b _080719A6 + b @080719A6 .align 2, 0 .pool -_08071904: +@08071904: ldr r0, =0x0832bfe4 bl gpu_tile_obj_alloc_tag_and_copy_to_vram ldr r0, =0x0832bfec bl gpu_tile_obj_alloc_tag_and_copy_to_vram ldr r0, =0x0832bff4 bl gpu_pal_obj_alloc_tag_and_apply - b _080719A6 + b @080719A6 .align 2, 0 .pool -_08071924: +@08071924: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram ldr r0, =0x03000de0 ldr r0, [r0] ldrb r0, [r0, 0x4] bl sub_80714B8 - b _080719A6 + b @080719A6 .align 2, 0 .pool -_0807193C: +@0807193C: ldr r0, =0x03000de0 ldr r3, [r0] ldrb r2, [r3, 0x4] @@ -203498,10 +203498,10 @@ _0807193C: movs r0, 0 movs r1, 0 bl sub_807163C - b _080719A6 + b @080719A6 .align 2, 0 .pool -_08071954: +@08071954: ldr r4, =0x03000de0 ldr r3, [r4] ldrb r2, [r3, 0x4] @@ -203511,10 +203511,10 @@ _08071954: bl sub_807163C ldr r1, [r4] strb r0, [r1, 0x1] - b _080719A6 + b @080719A6 .align 2, 0 .pool -_08071970: +@08071970: movs r1, 0x82 lsls r1, 5 movs r0, 0 @@ -203537,7 +203537,7 @@ _08071970: bl gpu_copy_to_wram_bg_tile_map movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram -_080719A6: +@080719A6: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -203545,17 +203545,17 @@ _080719A6: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080719D6 + b @080719D6 .align 2, 0 .pool -_080719C8: +@080719C8: ldr r0, =sub_8071A94 + 1 bl set_callback2 ldr r0, =0x03000de0 ldr r1, [r0] movs r0, 0 strb r0, [r1, 0x2] -_080719D6: +@080719D6: bl run_active_tasks bl run_remoboxes bl call_obj_callbacks @@ -203570,7 +203570,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] @@ -203594,7 +203594,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 @@ -203606,27 +203606,27 @@ c3_080472E4: @ 8071A3C movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08071A5C + bne @08071A5C bl sub_80A2F30 bl play_some_sound -_08071A5C: +@08071A5C: movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - bne _08071A6C + bne @08071A6C movs r0, 0xBC lsls r0, 1 bl song_play_for_text -_08071A6C: +@08071A6C: movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x3C - ble _08071A80 + ble @08071A80 ldr r0, =0x00000179 bl song_play_for_text adds r0, r5, 0 bl remove_task -_08071A80: +@08071A80: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -203638,7 +203638,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 @@ -203649,32 +203649,32 @@ sub_8071A94: @ 8071A94 ldrb r0, [r0, 0x2] adds r5, r1, 0 cmp r0, 0xC - bls _08071AAC - b _08071E06 -_08071AAC: + bls @08071AAC + b @08071E06 +@08071AAC: lsls r0, 2 - ldr r1, =_08071AC0 + ldr r1, =@08071AC0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08071AC0: - .4byte _08071AF4 - .4byte _08071B40 - .4byte _08071B68 - .4byte _08071BA0 - .4byte _08071BF8 - .4byte _08071C24 - .4byte _08071C88 - .4byte _08071C96 - .4byte _08071CA4 - .4byte _08071CE8 - .4byte _08071D1C - .4byte _08071DB4 - .4byte _08071DD4 -_08071AF4: +@08071AC0: + .4byte @08071AF4 + .4byte @08071B40 + .4byte @08071B68 + .4byte @08071BA0 + .4byte @08071BF8 + .4byte @08071C24 + .4byte @08071C88 + .4byte @08071C96 + .4byte @08071CA4 + .4byte @08071CE8 + .4byte @08071D1C + .4byte @08071DB4 + .4byte @08071DD4 +@08071AF4: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -203701,10 +203701,10 @@ _08071AF4: ldr r0, =c3_080472E4 + 1 movs r1, 0x5 bl AddTask - b _08071E06 + b @08071E06 .align 2, 0 .pool -_08071B40: +@08071B40: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -203712,9 +203712,9 @@ _08071B40: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq _08071B52 - b _08071E06 -_08071B52: + beq @08071B52 + b @08071E06 +@08071B52: ldr r0, [r5] ldrb r0, [r0, 0x8] movs r1, 0 @@ -203722,10 +203722,10 @@ _08071B52: ldr r0, [r5] strb r4, [r0, 0x3] ldr r1, [r5] - b _08071DC8 + b @08071DC8 .align 2, 0 .pool -_08071B68: +@08071B68: ldr r1, [r5] ldrb r0, [r1, 0x3] adds r0, 0x1 @@ -203733,9 +203733,9 @@ _08071B68: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1E - bhi _08071B7A - b _08071E06 -_08071B7A: + bhi @08071B7A + b @08071E06 +@08071B7A: ldr r1, [r5] ldrb r0, [r1, 0x2] adds r0, 0x1 @@ -203750,10 +203750,10 @@ _08071B7A: adds r0, r2 ldr r1, =sub_8071E34 + 1 str r1, [r0] - b _08071E06 + b @08071E06 .align 2, 0 .pool -_08071BA0: +@08071BA0: ldr r4, =0x02020630 ldr r2, [r5] ldrb r1, [r2] @@ -203766,9 +203766,9 @@ _08071BA0: ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - beq _08071BBC - b _08071E06 -_08071BBC: + beq @08071BBC + b @08071E06 +@08071BBC: ldrb r1, [r2, 0x4] movs r0, 0x64 muls r0, r1 @@ -203789,10 +203789,10 @@ _08071BBC: movs r3, 0x1 bl sub_806ED40 ldr r1, [r5] - b _08071DC8 + b @08071DC8 .align 2, 0 .pool -_08071BF8: +@08071BF8: ldr r2, =0x02020630 ldr r3, [r5] ldrb r1, [r3, 0x1] @@ -203804,16 +203804,16 @@ _08071BF8: ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - beq _08071C12 - b _08071E06 -_08071C12: + beq @08071C12 + b @08071E06 +@08071C12: ldrb r0, [r3, 0x2] adds r0, 0x1 strb r0, [r3, 0x2] - b _08071E06 + b @08071E06 .align 2, 0 .pool -_08071C24: +@08071C24: ldr r0, [r5] ldrb r1, [r0, 0x4] movs r0, 0x64 @@ -203847,26 +203847,26 @@ _08071C24: ldrb r0, [r0, 0x8] movs r1, 0x3 bl Window_CopyToVram - b _08071E06 + b @08071E06 .align 2, 0 .pool -_08071C88: +@08071C88: bl task_is_not_running_overworld_fanfare lsls r0, 24 cmp r0, 0 - bne _08071C94 - b _08071E06 -_08071C94: - b _08071DC4 -_08071C96: + bne @08071C94 + b @08071E06 +@08071C94: + b @08071DC4 +@08071C96: bl task_is_not_running_overworld_fanfare lsls r0, 24 cmp r0, 0 - bne _08071CA2 - b _08071E06 -_08071CA2: - b _08071DC4 -_08071CA4: + bne @08071CA2 + b @08071E06 +@08071CA2: + b @08071DC4 +@08071CA4: ldr r0, [r5] ldrb r1, [r0, 0x4] movs r0, 0x64 @@ -203888,18 +203888,18 @@ _08071CA4: movs r3, 0x2 bl sub_8072214 ldr r1, [r5] - b _08071DC8 + b @08071DC8 .align 2, 0 .pool -_08071CE8: +@08071CE8: ldr r0, [r5] ldrb r0, [r0, 0x8] bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - beq _08071CF8 - b _08071E06 -_08071CF8: + beq @08071CF8 + b @08071E06 +@08071CF8: ldr r0, [r5] ldrb r0, [r0, 0x8] movs r4, 0xA0 @@ -203913,27 +203913,27 @@ _08071CF8: movs r3, 0 bl sub_81996C0 ldr r1, [r5] - b _08071DC8 + b @08071DC8 .align 2, 0 .pool -_08071D1C: +@08071D1C: bl sub_8198C58 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _08071D3C + beq @08071D3C cmp r1, 0 - bgt _08071D36 + bgt @08071D36 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _08071DC4 - b _08071E06 -_08071D36: + beq @08071DC4 + b @08071E06 +@08071D36: cmp r1, 0x1 - beq _08071DC4 - b _08071E06 -_08071D3C: + beq @08071DC4 + b @08071E06 +@08071D3C: ldr r0, =0x03000de0 mov r8, r0 ldr r0, [r0] @@ -203979,10 +203979,10 @@ _08071D3C: adds r2, r7, 0 adds r3, r4, 0 bl do_choose_name_or_words_screen - b _08071E06 + b @08071E06 .align 2, 0 .pool -_08071DB4: +@08071DB4: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -203990,23 +203990,23 @@ _08071DB4: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 -_08071DC4: +@08071DC4: ldr r0, =0x03000de0 ldr r1, [r0] -_08071DC8: +@08071DC8: ldrb r0, [r1, 0x2] adds r0, 0x1 strb r0, [r1, 0x2] - b _08071E06 + b @08071E06 .align 2, 0 .pool -_08071DD4: +@08071DD4: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08071E06 + bne @08071E06 bl sub_805F094 ldr r4, =0x03000de0 ldr r0, [r4] @@ -204020,7 +204020,7 @@ _08071DD4: bl free ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 -_08071E06: +@08071E06: bl run_active_tasks bl run_remoboxes bl call_obj_callbacks @@ -204038,7 +204038,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] @@ -204047,15 +204047,15 @@ sub_8071E34: @ 8071E34 lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - ble _08071E54 + ble @08071E54 ldr r0, =sub_8071E8C + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x2E] - b _08071E84 + b @08071E84 .align 2, 0 .pool -_08071E54: +@08071E54: ldrh r0, [r4, 0x30] adds r0, 0x14 movs r1, 0xFF @@ -204069,21 +204069,21 @@ _08071E54: movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0xF - bne _08071E84 + bne @08071E84 movs r0, 0x17 bl audio_play adds r0, r4, 0 movs r1, 0x1 bl obj_anim_image_start bl sub_8072140 -_08071E84: +@08071E84: pop {r4} pop {r0} bx r0 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] @@ -204093,22 +204093,22 @@ sub_8071E8C: @ 8071E8C lsls r0, 16 asrs r0, 16 cmp r0, 0x1E - ble _08071EE8 + ble @08071EE8 ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - ble _08071EBC + ble @08071EBC ldr r0, =sub_8071EF0 + 1 str r0, [r4, 0x1C] strh r1, [r4, 0x2E] strh r1, [r4, 0x32] - b _08071EE8 + b @08071EE8 .align 2, 0 .pool -_08071EBC: +@08071EBC: ldrh r0, [r4, 0x30] adds r0, 0x14 movs r1, 0xFF @@ -204122,20 +204122,20 @@ _08071EBC: movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0xF - bne _08071EE8 + bne @08071EE8 movs r0, 0x17 bl audio_play adds r0, r4, 0 movs r1, 0x2 bl obj_anim_image_start -_08071EE8: +@08071EE8: pop {r4} pop {r0} bx r0 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] @@ -204145,14 +204145,14 @@ sub_8071EF0: @ 8071EF0 lsls r0, 16 asrs r0, 16 cmp r0, 0x1E - ble _08071F9E + ble @08071F9E ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] lsls r0, 16 asrs r0, 16 cmp r0, 0x26 - ble _08071F5C + ble @08071F5C ldr r0, =sub_8071FA4 + 1 str r0, [r4, 0x1C] strh r5, [r4, 0x2E] @@ -204179,10 +204179,10 @@ sub_8071EF0: @ 8071EF0 lsls r0, 2 adds r0, r3 strh r5, [r0, 0x26] - b _08071F9E + b @08071F9E .align 2, 0 .pool -_08071F5C: +@08071F5C: ldrh r0, [r4, 0x30] adds r0, 0x14 movs r1, 0xFF @@ -204196,7 +204196,7 @@ _08071F5C: movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0xF - bne _08071F90 + bne @08071F90 movs r0, 0x17 bl audio_play adds r0, r4, 0 @@ -204204,21 +204204,21 @@ _08071F5C: bl obj_anim_image_start bl sub_8072140 bl sub_8072140 -_08071F90: +@08071F90: movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0x1E - bne _08071F9E + bne @08071F9E movs r0, 0x17 bl audio_play -_08071F9E: +@08071F9E: pop {r4,r5} pop {r0} bx r0 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] @@ -204227,12 +204227,12 @@ sub_8071FA4: @ 8071FA4 lsls r0, 16 asrs r0, 16 cmp r0, 0x32 - ble _08071FBE + ble @08071FBE ldr r0, =sub_8071FC8 + 1 str r0, [r1, 0x1C] movs r0, 0 strh r0, [r1, 0x2E] -_08071FBE: +@08071FBE: pop {r0} bx r0 .align 2, 0 @@ -204240,14 +204240,14 @@ _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 movs r1, 0x2E ldrsh r0, [r5, r1] cmp r0, 0 - bne _08071FE8 + bne @08071FE8 movs r1, 0x1 negs r1, r1 ldr r0, =0x0000ffff @@ -204256,12 +204256,12 @@ sub_8071FC8: @ 8071FC8 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 -_08071FE8: +@08071FE8: ldrh r0, [r5, 0x2E] cmp r0, 0x3 - bhi _08072004 + bhi @08072004 movs r4, 0 -_08071FF0: +@08071FF0: bl sub_8072140 lsls r0, r4, 16 movs r1, 0x80 @@ -204270,8 +204270,8 @@ _08071FF0: lsrs r4, r0, 16 asrs r0, 16 cmp r0, 0x3 - ble _08071FF0 -_08072004: + ble @08071FF0 +@08072004: ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] @@ -204282,7 +204282,7 @@ _08072004: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _08072032 + bne @08072032 movs r0, 0x71 bl audio_play adds r2, r5, 0 @@ -204294,7 +204294,7 @@ _08072004: ldr r0, =sub_8072048 + 1 str r0, [r5, 0x1C] strh r4, [r5, 0x2E] -_08072032: +@08072032: add sp, 0x4 pop {r4,r5} pop {r0} @@ -204304,14 +204304,14 @@ _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 movs r1, 0x2E ldrsh r0, [r5, r1] cmp r0, 0 - bne _08072084 + bne @08072084 ldr r4, =0x02020630 ldr r3, =0x03000de0 ldr r0, [r3] @@ -204334,11 +204334,11 @@ sub_8072048: @ 8072048 adds r0, r4 movs r1, 0x1 bl sub_8008258 -_08072084: +@08072084: movs r2, 0x2E ldrsh r0, [r5, r2] cmp r0, 0x8 - bne _0807209E + bne @0807209E movs r1, 0x1 negs r1, r1 ldr r0, =0x0000ffff @@ -204347,11 +204347,11 @@ _08072084: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 -_0807209E: +@0807209E: movs r1, 0x2E ldrsh r0, [r5, r1] cmp r0, 0x9 - bgt _080720BC + bgt @080720BC ldr r2, =0x02020630 ldr r0, =0x03000de0 ldr r0, [r0] @@ -204363,15 +204363,15 @@ _0807209E: ldrh r1, [r0, 0x22] subs r1, 0x1 strh r1, [r0, 0x22] -_080720BC: +@080720BC: ldrh r1, [r5, 0x2E] movs r2, 0x2E ldrsh r0, [r5, r2] cmp r0, 0x28 - ble _080720CA + ble @080720CA ldr r0, =nullsub_12 + 1 str r0, [r5, 0x1C] -_080720CA: +@080720CA: adds r0, r1, 0x1 strh r0, [r5, 0x2E] add sp, 0x4 @@ -204383,7 +204383,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] @@ -204397,17 +204397,17 @@ sub_80720E8: @ 80720E8 movs r4, 0x36 ldrsh r0, [r2, r4] cmp r0, 0 - bge _08072106 + bge @08072106 adds r0, 0xFF -_08072106: +@08072106: asrs r0, 8 strh r0, [r2, 0x24] movs r3, 0x38 ldrsh r0, [r2, r3] cmp r0, 0 - bge _08072114 + bge @08072114 adds r0, 0xFF -_08072114: +@08072114: asrs r0, 8 strh r0, [r2, 0x26] ldrh r0, [r2, 0x34] @@ -204420,20 +204420,20 @@ _08072114: adds r0, r1, r0 adds r1, 0x14 cmp r0, r1 - ble _0807213A + ble @0807213A lsls r0, r3, 16 cmp r0, 0 - ble _0807213A + ble @0807213A adds r0, r2, 0 bl obj_delete_and_free_tiles -_0807213A: +@0807213A: pop {r4} pop {r0} bx r0 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, =0x0832c084 @@ -204475,7 +204475,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 @@ -204539,7 +204539,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 @@ -204600,15 +204600,15 @@ 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 lsrs r6, r0, 24 movs r5, 0 cmp r5, r6 - bcs _080722D6 -_0807229C: + bcs @080722D6 +@0807229C: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -204618,36 +204618,36 @@ _0807229C: movs r1, 0x6 bl pokemon_getattr cmp r0, 0 - bne _080722CC + bne @080722CC adds r0, r4, 0 bl sub_806B6D8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x28 - beq _080722C4 + beq @080722C4 cmp r0, 0x31 - bne _080722CC -_080722C4: + bne @080722CC +@080722C4: movs r0, 0x2 - b _080722D8 + b @080722D8 .align 2, 0 .pool -_080722CC: +@080722CC: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, r6 - bcc _0807229C -_080722D6: + bcc @0807229C +@080722D6: movs r0, 0x1 -_080722D8: +@080722D8: pop {r4-r6} pop {r1} bx r1 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 @@ -204667,13 +204667,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 @@ -204688,7 +204688,7 @@ sub_8072308: @ 8072308 mov r10, r2 movs r3, 0 movs r2, 0 -_08072324: +@08072324: lsls r0, r3, 24 asrs r0, 24 mov r3, sp @@ -204699,17 +204699,17 @@ _08072324: lsrs r3, r0, 24 asrs r0, 24 cmp r0, 0x3 - ble _08072324 + ble @08072324 movs r3, 0x3 movs r0, 0x1 negs r0, r0 mov r9, r0 mov r8, sp -_08072344: +@08072344: lsls r0, r5, 16 asrs r6, r0, 16 cmp r6, 0 - ble _08072372 + ble @08072372 lsls r4, r3, 24 asrs r4, 24 mov r1, sp @@ -204726,16 +204726,16 @@ _08072344: subs r4, 0x1 lsls r4, 24 lsrs r3, r4, 24 - b _08072344 -_08072372: + b @08072344 +@08072372: lsls r1, r3, 24 asrs r0, r1, 24 cmp r0, r9 - ble _08072396 + ble @08072396 movs r4, 0xFF movs r3, 0x1 negs r3, r3 -_08072380: +@08072380: asrs r2, r1, 24 mov r5, sp adds r1, r5, r2 @@ -204746,25 +204746,25 @@ _08072380: lsls r1, r2, 24 asrs r0, r1, 24 cmp r0, r3 - bgt _08072380 -_08072396: + bgt @08072380 +@08072396: mov r1, r8 ldrb r0, [r1, 0x3] cmp r0, 0xFF - bne _080723A2 + bne @080723A2 movs r0, 0 strb r0, [r1, 0x3] -_080723A2: +@080723A2: mov r2, r10 cmp r2, 0 - bne _08072432 + bne @08072432 movs r3, 0 movs r1, 0 movs r6, 0xFC lsls r6, 8 movs r5, 0x1E mov r12, r5 -_080723B4: +@080723B4: lsls r1, 24 asrs r2, r1, 24 mov r0, sp @@ -204772,7 +204772,7 @@ _080723B4: ldrb r0, [r5] mov r8, r1 cmp r0, 0xFF - bne _080723EA + bne @080723EA lsls r1, r2, 1 adds r1, r7 ldrh r2, [r1] @@ -204791,8 +204791,8 @@ _080723B4: mov r5, r12 orrs r0, r5 strh r0, [r1] - b _0807241A -_080723EA: + b @0807241A +@080723EA: lsls r2, 1 adds r2, r7 ldrh r0, [r2] @@ -204817,7 +204817,7 @@ _080723EA: orrs r1, r0 strh r1, [r2] adds r3, r4, 0 -_0807241A: +@0807241A: movs r0, 0x80 lsls r0, 17 add r0, r8 @@ -204828,14 +204828,14 @@ _0807241A: lsrs r3, r0, 24 asrs r0, 24 cmp r0, 0x3 - ble _080723B4 - b _08072496 -_08072432: + ble @080723B4 + b @08072496 +@08072432: movs r3, 0 movs r4, 0xFC lsls r4, 8 movs r6, 0x1E -_0807243A: +@0807243A: lsls r1, r3, 24 asrs r2, r1, 24 mov r3, sp @@ -204843,7 +204843,7 @@ _0807243A: ldrb r0, [r5] adds r3, r1, 0 cmp r0, 0xFF - bne _08072466 + bne @08072466 lsls r1, r2, 1 adds r1, r7 ldrh r2, [r1] @@ -204857,8 +204857,8 @@ _0807243A: ands r0, r2 orrs r0, r6 strh r0, [r1] - b _08072488 -_08072466: + b @08072488 +@08072466: lsls r2, 1 adds r2, r7 ldrh r0, [r2] @@ -204876,15 +204876,15 @@ _08072466: adds r0, 0x34 orrs r1, r0 strh r1, [r2] -_08072488: +@08072488: movs r5, 0x80 lsls r5, 17 adds r0, r3, r5 lsrs r3, r0, 24 asrs r0, 24 cmp r0, 0x3 - ble _0807243A -_08072496: + ble @0807243A +@08072496: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -204896,7 +204896,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 @@ -204923,7 +204923,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 @@ -204938,12 +204938,12 @@ battle_make_oam_normal_battle: @ 80724DC bl battle_type_is_double lsls r0, 24 cmp r0, 0 - bne _080725F0 + bne @080725F0 mov r0, r10 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08072574 + bne @08072574 ldr r4, =0x0832c140 adds r0, r4, 0 movs r1, 0xF0 @@ -204987,10 +204987,10 @@ battle_make_oam_normal_battle: @ 80724DC ands r0, r3 orrs r0, r1 strh r0, [r2, 0x4] - b _080725BA + b @080725BA .align 2, 0 .pool -_08072574: +@08072574: ldr r4, =0x0832c170 adds r0, r4, 0 movs r1, 0xF0 @@ -205024,7 +205024,7 @@ _08072574: strh r0, [r2, 0x4] movs r0, 0x2 str r0, [sp] -_080725BA: +@080725BA: ldr r2, =0x02020630 lsls r0, r6, 4 adds r0, r6 @@ -205040,15 +205040,15 @@ _080725BA: adds r0, r2 ldr r1, =sub_8072924 + 1 str r1, [r0] - b _08072718 + b @08072718 .align 2, 0 .pool -_080725F0: +@080725F0: mov r0, r10 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08072694 + bne @08072694 mov r0, r10 bl battle_get_per_side_status adds r1, r0, 0 @@ -205110,10 +205110,10 @@ _080725F0: ldr r0, =sub_8072924 + 1 str r0, [r2] movs r0, 0x1 - b _08072716 + b @08072716 .align 2, 0 .pool -_08072694: +@08072694: mov r0, r10 bl battle_get_per_side_status adds r1, r0, 0 @@ -205175,9 +205175,9 @@ _08072694: ldr r0, =sub_8072924 + 1 str r0, [r2] movs r0, 0x2 -_08072716: +@08072716: str r0, [sp] -_08072718: +@08072718: ldr r0, =0x02024076 add r0, r10 ldrb r1, [r0] @@ -205276,7 +205276,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 @@ -205349,7 +205349,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, =0x08c11bdc @@ -205360,7 +205360,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] @@ -205369,11 +205369,11 @@ sub_80728B4: @ 80728B4 movs r1, 0x3A ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080728E4 + beq @080728E4 cmp r0, 0x1 - bgt _080728F8 + bgt @080728F8 cmp r0, 0 - bne _080728F8 + bne @080728F8 ldr r2, =0x02020630 lsls r3, r5, 4 adds r1, r3, r5 @@ -205381,10 +205381,10 @@ sub_80728B4: @ 80728B4 adds r1, r2 ldrh r0, [r1, 0x20] adds r0, 0x10 - b _08072906 + b @08072906 .align 2, 0 .pool -_080728E4: +@080728E4: ldr r2, =0x02020630 lsls r3, r5, 4 adds r1, r3, r5 @@ -205392,10 +205392,10 @@ _080728E4: adds r1, r2 ldrh r0, [r1, 0x20] adds r0, 0x10 - b _08072906 + b @08072906 .align 2, 0 .pool -_080728F8: +@080728F8: ldr r2, =0x02020630 lsls r3, r5, 4 adds r1, r3, r5 @@ -205403,7 +205403,7 @@ _080728F8: adds r1, r2 ldrh r0, [r1, 0x20] adds r0, 0x8 -_08072906: +@08072906: strh r0, [r4, 0x20] ldrh r0, [r1, 0x22] strh r0, [r4, 0x22] @@ -205422,7 +205422,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 @@ -205446,7 +205446,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 @@ -205475,7 +205475,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 @@ -205517,7 +205517,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 @@ -205562,7 +205562,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 @@ -205581,7 +205581,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 @@ -205613,12 +205613,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 @@ -205630,7 +205630,7 @@ sub_8072A88: @ 8072A88 mov r8, r1 ldrb r2, [r1] cmp r6, r2 - bge _08072B00 + bge @08072B00 ldr r1, =0x02020630 mov r12, r1 movs r1, 0x3 @@ -205640,7 +205640,7 @@ sub_8072A88: @ 8072A88 negs r7, r7 ldr r2, =0x03005d70 mov r9, r2 -_08072AB2: +@08072AB2: mov r1, r9 adds r0, r6, r1 ldrb r0, [r0] @@ -205679,8 +205679,8 @@ _08072AB2: mov r2, r8 ldrb r2, [r2] cmp r6, r2 - blt _08072AB2 -_08072B00: + blt @08072AB2 +@08072B00: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -205692,7 +205692,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 @@ -205701,53 +205701,53 @@ sub_8072B18: @ 8072B18 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - bne _08072B44 + bne @08072B44 adds r0, r6, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08072B3E + beq @08072B3E movs r5, 0x2C movs r4, 0x1E - b _08072B7C -_08072B3E: + b @08072B7C +@08072B3E: movs r5, 0x9E movs r4, 0x58 - b _08072B7C -_08072B44: + b @08072B7C +@08072B44: adds r0, r6, 0 bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08072B72 + beq @08072B72 cmp r0, 0x1 - bgt _08072B5C + bgt @08072B5C cmp r0, 0 - beq _08072B66 - b _08072B7C -_08072B5C: + beq @08072B66 + b @08072B7C +@08072B5C: cmp r0, 0x2 - beq _08072B6C + beq @08072B6C cmp r0, 0x3 - beq _08072B78 - b _08072B7C -_08072B66: + beq @08072B78 + b @08072B7C +@08072B66: movs r5, 0x9F movs r4, 0x4C - b _08072B7C -_08072B6C: + b @08072B7C +@08072B6C: movs r5, 0xAB movs r4, 0x65 - b _08072B7C -_08072B72: + b @08072B7C +@08072B72: movs r5, 0x2C movs r4, 0x13 - b _08072B7C -_08072B78: + b @08072B7C +@08072B78: movs r5, 0x20 movs r4, 0x2C -_08072B7C: +@08072B7C: ldr r0, =0x03005d70 adds r0, r6, r0 ldrb r0, [r0] @@ -205762,7 +205762,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 @@ -205809,22 +205809,22 @@ healthbar_draw_level: @ 8072B94 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08072C18 + bne @08072C18 bl battle_type_is_double lsls r0, 24 ldr r2, =0x06010420 adds r1, r4, r2 cmp r0, 0 - bne _08072C1C + bne @08072C1C ldr r0, =0x06010820 adds r1, r4, r0 - b _08072C1C + b @08072C1C .align 2, 0 .pool -_08072C18: +@08072C18: ldr r2, =0x06010400 adds r1, r4, r2 -_08072C1C: +@08072C1C: adds r0, r1, 0 adds r1, r5, 0 movs r2, 0x3 @@ -205840,7 +205840,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 @@ -205866,17 +205866,17 @@ heathbar_draw_hp: @ 8072C38 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08072D10 + bne @08072D10 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - bne _08072D10 + bne @08072D10 ldrh r0, [r4, 0x4] lsls r0, 22 lsrs r5, r0, 17 mov r0, r8 cmp r0, 0 - beq _08072CB8 + beq @08072CB8 mov r2, r9 lsls r1, r2, 16 asrs r1, 16 @@ -205895,10 +205895,10 @@ heathbar_draw_hp: @ 8072C38 ldr r1, =0x06010b40 adds r0, r5, r1 adds r1, r4, 0 - b _08072CF8 + b @08072CF8 .align 2, 0 .pool -_08072CB8: +@08072CB8: mov r2, r9 lsls r1, r2, 16 asrs r1, 16 @@ -205928,15 +205928,15 @@ _08072CB8: adds r0, r5, r2 adds r1, r4, 0 adds r1, 0x20 -_08072CF8: +@08072CF8: movs r2, 0x2 bl sub_8075170 ldr r0, [sp, 0x24] bl sub_807512C - b _08072DEA + b @08072DEA .align 2, 0 .pool -_08072D10: +@08072D10: ldr r1, =0x0832c3c4 add r0, sp, 0x4 movs r2, 0x14 @@ -205954,44 +205954,44 @@ _08072D10: lsrs r0, 24 mov r10, r4 cmp r0, 0x1 - beq _08072D46 + beq @08072D46 adds r0, r5, 0 bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08072D60 -_08072D46: + bne @08072D60 +@08072D46: mov r0, r9 lsls r1, r0, 16 asrs r1, 16 adds r0, r7, 0 mov r2, r8 bl sub_8072E0C - b _08072DEA + b @08072DEA .align 2, 0 .pool -_08072D60: +@08072D60: ldrh r0, [r6, 0x3A] lsls r0, 24 lsrs r0, 24 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08072D7C + bne @08072D7C movs r6, 0x59 mov r1, r8 cmp r1, 0 - bne _08072D86 + bne @08072D86 movs r6, 0x1D - b _08072D86 -_08072D7C: + b @08072D86 +@08072D7C: movs r6, 0x30 mov r2, r8 cmp r2, 0 - bne _08072D86 + bne @08072D86 movs r6, 0x14 -_08072D86: +@08072D86: mov r0, sp adds r0, 0xA mov r2, r9 @@ -206015,7 +206015,7 @@ _08072D86: adds r0, r2, r7 lsls r0, 2 adds r5, r0, r1 -_08072DB8: +@08072DB8: ldr r0, =0x020244d4 ldr r0, [r0] movs r1, 0xBA @@ -206039,8 +206039,8 @@ _08072DB8: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _08072DB8 -_08072DEA: + bls @08072DB8 +@08072DEA: add sp, 0x28 pop {r3-r5} mov r8, r3 @@ -206054,7 +206054,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 @@ -206081,7 +206081,7 @@ sub_8072E0C: @ 8072E0C bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08072F28 + bne @08072F28 ldr r0, =0x020244d0 ldr r1, [r0] movs r2, 0x3A @@ -206093,9 +206093,9 @@ sub_8072E0C: @ 8072E0C movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _08072E5E - b _080730B8 -_08072E5E: + bne @08072E5E + b @080730B8 +@08072E5E: movs r3, 0x38 ldrsh r1, [r7, r3] lsls r0, r1, 4 @@ -206109,7 +206109,7 @@ _08072E5E: adds r6, r5, r0 mov r0, r8 cmp r0, 0 - beq _08072EDC + beq @08072EDC lsls r1, r4, 16 asrs r1, 16 add r0, sp, 0x4 @@ -206140,10 +206140,10 @@ _08072E5E: adds r1, r2 ldr r2, =0x04000008 bl CpuSet - b _080730B8 + b @080730B8 .align 2, 0 .pool -_08072EDC: +@08072EDC: lsls r1, r4, 16 asrs r1, 16 add r0, sp, 0x4 @@ -206174,10 +206174,10 @@ _08072EDC: bl sub_8075170 ldr r0, [sp, 0x28] bl sub_807512C - b _080730B8 + b @080730B8 .align 2, 0 .pool -_08072F28: +@08072F28: ldr r1, =0x0832c3d8 add r0, sp, 0x4 movs r2, 0x14 @@ -206196,9 +206196,9 @@ _08072F28: movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _08072F52 - b _080730B8 -_08072F52: + bne @08072F52 + b @080730B8 +@08072F52: movs r6, 0x4 mov r3, r8 negs r0, r3 @@ -206218,10 +206218,10 @@ _08072F52: bl decimal_int_to_string mov r3, r8 cmp r3, 0 - bne _08072F82 + bne @08072F82 ldr r1, =0x085e8d3e bl gf_strcpy -_08072F82: +@08072F82: ldr r0, =0x020244d4 ldr r0, [r0] movs r1, 0xBA @@ -206234,14 +206234,14 @@ _08072F82: adds r4, r6, 0 adds r0, r4, 0x3 cmp r4, r0 - bge _08073024 + bge @08073024 lsls r0, r7, 4 adds r0, r7 lsls r0, 2 adds r5, r0, r5 -_08072FA6: +@08072FA6: cmp r4, 0x2 - bhi _08072FF0 + bhi @08072FF0 ldr r0, =0x020244d4 ldr r0, [r0] movs r2, 0xBA @@ -206262,10 +206262,10 @@ _08072FA6: adds r1, r3 ldr r2, =0x04000008 bl CpuSet - b _0807301A + b @0807301A .align 2, 0 .pool -_08072FF0: +@08072FF0: ldr r0, =0x020244d4 ldr r0, [r0] movs r1, 0xBA @@ -206286,16 +206286,16 @@ _08072FF0: ldr r2, =0x04000008 bl CpuSet adds r4, 0x1 -_0807301A: +@0807301A: lsls r0, r4, 24 lsrs r4, r0, 24 adds r0, r6, 0x3 cmp r4, r0 - blt _08072FA6 -_08073024: + blt @08072FA6 +@08073024: mov r3, r8 cmp r3, 0 - bne _08073084 + bne @08073084 ldr r0, =0x020244d4 ldr r0, [r0] movs r1, 0xBA @@ -206325,15 +206325,15 @@ _08073024: adds r1, r5 ldr r2, =0x05000008 bl CpuSet - b _080730B8 + b @080730B8 .align 2, 0 .pool -_08073084: +@08073084: ldr r0, [sp, 0x2C] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _080730B8 + bne @080730B8 movs r0, 0x74 bl sub_80728A4 ldr r2, =0x02020630 @@ -206352,7 +206352,7 @@ _08073084: adds r1, r2 ldr r2, =0x04000008 bl CpuSet -_080730B8: +@080730B8: add sp, 0x30 pop {r3-r5} mov r8, r3 @@ -206366,7 +206366,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 @@ -206428,7 +206428,7 @@ sub_80730D4: @ 80730D4 mov r2, sp adds r2, 0x9 str r2, [sp, 0x1C] -_08073158: +@08073158: mov r3, sp adds r0, r3, r7 ldrb r1, [r0] @@ -206437,37 +206437,37 @@ _08073158: lsls r0, 24 lsrs r0, 24 cmp r0, 0x13 - bls _08073176 + bls @08073176 adds r0, r1, 0 adds r0, 0x79 lsls r0, 24 lsrs r0, 24 cmp r0, 0x13 - bhi _0807318C -_08073176: + bhi @0807318C +@08073176: movs r0, 0x2C - b _080731AA + b @080731AA .align 2, 0 .pool -_0807318C: +@0807318C: adds r0, r1, 0 subs r0, 0x4B lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bls _080731A4 + bls @080731A4 adds r0, r1, 0 adds r0, 0x65 lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bhi _080731A8 -_080731A4: + bhi @080731A8 +@080731A4: movs r0, 0x2D - b _080731AA -_080731A8: + b @080731AA +@080731A8: movs r0, 0x2B -_080731AA: +@080731AA: bl sub_80728A4 lsls r1, r5, 6 adds r1, r6, r1 @@ -206478,7 +206478,7 @@ _080731AA: lsrs r5, r0, 24 adds r7, 0x1 cmp r5, r8 - bcc _08073158 + bcc @08073158 movs r7, 0x1 ldr r0, [sp, 0x14] lsls r0, 4 @@ -206487,7 +206487,7 @@ _080731AA: add r1, r8 mov r9, r1 cmp r7, r9 - bge _08073236 + bge @08073236 ldr r1, =0x02020630 ldr r2, =0x04000008 mov r10, r2 @@ -206496,16 +206496,16 @@ _080731AA: lsls r0, 2 adds r0, r1 mov r8, r0 -_080731E6: +@080731E6: mov r1, r8 ldrh r0, [r1, 0x4] lsls r0, 22 lsrs r0, 22 adds r5, r7, 0 cmp r7, 0 - bge _080731F6 + bge @080731F6 adds r5, r7, 0x7 -_080731F6: +@080731F6: asrs r5, 3 lsls r4, r5, 3 subs r4, r7, r4 @@ -206535,8 +206535,8 @@ _080731F6: adds r6, 0x20 adds r7, 0x1 cmp r7, r9 - blt _080731E6 -_08073236: + blt @080731E6 +@08073236: ldr r6, =0x02020630 ldr r3, [sp, 0x18] ldr r1, [sp, 0x14] @@ -206582,9 +206582,9 @@ _08073236: lsls r0, 2 adds r6, r0, r6 movs r4, 0x20 -_08073296: +@08073296: cmp r7, 0x1 - bgt _080732D4 + bgt @080732D4 ldr r0, [r5] movs r3, 0xBA lsls r3, 1 @@ -206601,10 +206601,10 @@ _08073296: adds r1, r2 ldr r2, =0x04000008 bl CpuSet - b _080732F4 + b @080732F4 .align 2, 0 .pool -_080732D4: +@080732D4: ldr r0, [r5] movs r3, 0xBA lsls r3, 1 @@ -206620,11 +206620,11 @@ _080732D4: adds r1, r2 ldr r2, =0x04000008 bl CpuSet -_080732F4: +@080732F4: adds r4, 0x40 adds r7, 0x1 cmp r7, 0x4 - ble _08073296 + ble @08073296 add sp, 0x20 pop {r3-r5} mov r8, r3 @@ -206638,7 +206638,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 @@ -206650,14 +206650,14 @@ sub_8073314: @ 8073314 ldr r0, =0x0202406c ldrb r0, [r0] cmp r9, r0 - blt _0807332E - b _080735BA -_0807332E: + blt @0807332E + b @080735BA +@0807332E: ldr r1, =0x02020630 mov r10, r1 ldr r2, =0x0202406e mov r8, r2 -_08073336: +@08073336: ldr r0, =0x03005d70 mov r1, r9 adds r6, r1, r0 @@ -206671,9 +206671,9 @@ _08073336: ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - beq _08073354 - b _080735A8 -_08073354: + beq @08073354 + b @080735A8 +@08073354: mov r2, r9 lsls r0, r2, 24 lsrs r7, r0, 24 @@ -206682,20 +206682,20 @@ _08073354: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0807336A - b _080735A8 -_0807336A: + bne @0807336A + b @080735A8 +@0807336A: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - bne _08073382 + bne @08073382 adds r0, r7, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08073382 - b _080735A8 -_08073382: + bne @08073382 + b @080735A8 +@08073382: ldr r5, =0x020244d0 ldr r0, [r5] ldr r3, [r0] @@ -206727,23 +206727,23 @@ _08073382: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _080734B0 + bne @080734B0 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - bne _080733D0 - b _080735A8 -_080733D0: + bne @080733D0 + b @080735A8 +@080733D0: ldr r0, =0x02022fec ldr r2, [r0] movs r0, 0x80 ands r2, r0 cmp r2, 0 - beq _080733DE - b _080735A8 -_080733DE: + beq @080733DE + b @080735A8 +@080733DE: cmp r4, 0x1 - bne _08073468 + bne @08073468 ldrb r1, [r6] lsls r0, r1, 4 adds r0, r1 @@ -206786,10 +206786,10 @@ _080733DE: movs r1, 0x64 muls r0, r1 ldr r2, =0x020244ec - b _08073536 + b @08073536 .align 2, 0 .pool -_08073468: +@08073468: ldrb r0, [r6] bl draw_status_ailment_maybe ldrb r0, [r6] @@ -206815,18 +206815,18 @@ _08073468: adds r1, r2 ldr r2, =0x04000008 bl CpuSet - b _08073592 + b @08073592 .align 2, 0 .pool -_080734B0: +@080734B0: cmp r4, 0x1 - bne _0807355C + bne @0807355C ldr r0, =0x02022fec ldr r2, [r0] movs r0, 0x80 ands r2, r0 cmp r2, 0 - beq _080734DC + beq @080734DC ldrb r0, [r6] mov r2, r8 ldrh r1, [r2] @@ -206835,10 +206835,10 @@ _080734B0: ldr r2, =0x02024744 adds r1, r2 bl sub_80730D4 - b _08073592 + b @08073592 .align 2, 0 .pool -_080734DC: +@080734DC: ldrb r1, [r6] lsls r0, r1, 4 adds r0, r1 @@ -206881,7 +206881,7 @@ _080734DC: movs r1, 0x64 muls r0, r1 ldr r2, =0x02024744 -_08073536: +@08073536: adds r0, r2 movs r1, 0x3A bl pokemon_getattr @@ -206891,10 +206891,10 @@ _08073536: adds r0, r4, 0 movs r2, 0x1 bl sub_8072E0C - b _08073592 + b @08073592 .align 2, 0 .pool -_0807355C: +@0807355C: ldrb r0, [r6] bl draw_status_ailment_maybe ldrb r0, [r6] @@ -206911,7 +206911,7 @@ _0807355C: movs r1, 0x80 ands r0, r1 cmp r0, 0 - beq _08073592 + beq @08073592 ldrb r0, [r6] mov r2, r8 ldrh r1, [r2] @@ -206919,7 +206919,7 @@ _0807355C: adds r1, r4 movs r2, 0x4 bl healthbar_draw_field_maybe -_08073592: +@08073592: ldr r0, =0x03005d70 add r0, r9 ldrb r1, [r0] @@ -206931,7 +206931,7 @@ _08073592: movs r2, 0x1 eors r1, r2 strh r1, [r0, 0x3C] -_080735A8: +@080735A8: movs r0, 0x2 add r8, r0 movs r1, 0x1 @@ -206939,9 +206939,9 @@ _080735A8: ldr r0, =0x0202406c ldrb r0, [r0] cmp r9, r0 - bge _080735BA - b _08073336 -_080735BA: + bge @080735BA + b @08073336 +@080735BA: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -206955,7 +206955,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 @@ -206973,18 +206973,18 @@ sub_80735DC: @ 80735DC lsrs r3, 24 str r3, [sp, 0x10] cmp r4, 0 - beq _0807360C + beq @0807360C bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - beq _0807365C -_0807360C: + beq @0807365C +@0807360C: ldr r0, [sp, 0x8] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08073630 + bne @08073630 movs r0, 0 mov r9, r0 movs r5, 0x88 @@ -206993,34 +206993,34 @@ _0807360C: mov r10, r1 ldr r2, =0x0000fffb mov r8, r2 - b _0807366C + b @0807366C .align 2, 0 .pool -_08073630: +@08073630: movs r3, 0x1 mov r9, r3 cmp r4, 0 - beq _08073642 + beq @08073642 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - bne _08073648 -_08073642: + bne @08073648 +@08073642: movs r5, 0x68 movs r4, 0x28 - b _0807364C -_08073648: + b @0807364C +@08073648: movs r5, 0x68 movs r4, 0x10 -_0807364C: +@0807364C: ldr r6, =0x0000ff9c mov r10, r6 movs r0, 0x5 mov r8, r0 - b _0807366C + b @0807366C .align 2, 0 .pool -_0807365C: +@0807365C: movs r1, 0x1 mov r9, r1 movs r5, 0x68 @@ -207029,7 +207029,7 @@ _0807365C: mov r10, r2 movs r3, 0x5 mov r8, r3 -_0807366C: +@0807366C: ldr r0, =0x0832c334 bl gpu_tile_obj_decompress_and_load3 ldr r0, =0x0832c34c @@ -207070,7 +207070,7 @@ _0807366C: str r4, [sp, 0x20] mov r5, r9 cmp r5, 0 - beq _08073700 + beq @08073700 ldrh r0, [r7, 0x20] subs r0, 0x60 strh r0, [r7, 0x20] @@ -207081,14 +207081,14 @@ _0807366C: movs r1, 0x10 orrs r0, r1 strb r0, [r7, 0x3] - b _08073706 + b @08073706 .align 2, 0 .pool -_08073700: +@08073700: ldrh r0, [r7, 0x20] adds r0, 0x60 strh r0, [r7, 0x20] -_08073706: +@08073706: movs r0, 0 mov r8, r0 ldr r1, =0x02020630 @@ -207100,7 +207100,7 @@ _08073706: str r0, [sp, 0x18] movs r6, 0xA movs r5, 0 -_0807371C: +@0807371C: ldr r0, =0x0832c394 ldr r3, [sp, 0x20] ldr r1, =0xfffc0000 @@ -207115,7 +207115,7 @@ _0807371C: strb r0, [r7] ldr r0, [sp, 0x10] cmp r0, 0 - bne _0807374C + bne @0807374C ldrb r0, [r7] lsls r1, r0, 4 adds r1, r0 @@ -207124,11 +207124,11 @@ _0807371C: adds r1, r2 ldr r0, =sub_80741C8 + 1 str r0, [r1] -_0807374C: +@0807374C: ldr r4, =0x02020630 mov r3, r9 cmp r3, 0 - bne _0807376E + bne @0807376E ldrb r1, [r7] lsls r0, r1, 4 adds r0, r1 @@ -207142,7 +207142,7 @@ _0807374C: add r0, r10 mov r1, r9 strh r1, [r0, 0x26] -_0807376E: +@0807376E: ldrb r1, [r7] lsls r0, r1, 4 adds r0, r1 @@ -207154,7 +207154,7 @@ _0807376E: strh r2, [r0, 0x2E] mov r3, r9 cmp r3, 0 - bne _080737C8 + bne @080737C8 ldrb r0, [r7] lsls r1, r0, 4 adds r1, r0 @@ -207176,10 +207176,10 @@ _0807376E: lsls r0, 2 adds r0, r4 movs r1, 0x78 - b _0807380A + b @0807380A .align 2, 0 .pool -_080737C8: +@080737C8: ldrb r0, [r7] lsls r2, r0, 4 adds r2, r0 @@ -207213,7 +207213,7 @@ _080737C8: lsls r0, 2 adds r0, r4 ldr r1, =0x0000ff88 -_0807380A: +@0807380A: strh r1, [r0, 0x24] ldrb r1, [r7] lsls r0, r1, 4 @@ -207229,22 +207229,22 @@ _0807380A: add r8, r2 mov r3, r8 cmp r3, 0x5 - bgt _0807382C - b _0807371C -_0807382C: + bgt @0807382C + b @0807371C +@0807382C: ldr r0, [sp, 0x8] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0807383A - b _080739E8 -_0807383A: + beq @0807383A + b @080739E8 +@0807383A: ldr r0, =0x02022fec ldr r1, [r0] movs r2, 0x40 ands r1, r2 cmp r1, 0 - beq _080738F4 + beq @080738F4 ldr r5, =0x0000ffff mov r10, r5 ldr r6, =0x02020630 @@ -207256,10 +207256,10 @@ _0807383A: ldr r5, [sp, 0xC] movs r2, 0x5 mov r8, r2 -_0807385C: +@0807385C: ldrh r0, [r5] cmp r0, r10 - bne _080738A8 + bne @080738A8 ldrb r0, [r4] lsls r2, r0, 4 adds r2, r0 @@ -207281,12 +207281,12 @@ _0807385C: adds r0, r6 movs r1, 0x1 strh r1, [r0, 0x3C] - b _080738E2 + b @080738E2 .align 2, 0 .pool -_080738A8: +@080738A8: cmp r0, 0 - bne _080738C0 + bne @080738C0 ldrb r0, [r4] lsls r2, r0, 4 adds r2, r0 @@ -207296,11 +207296,11 @@ _080738A8: lsls r1, r3, 22 lsrs r1, 22 adds r1, 0x3 - b _080738D8 -_080738C0: + b @080738D8 +@080738C0: ldr r0, [r5, 0x4] cmp r0, 0 - beq _080738E2 + beq @080738E2 ldrb r0, [r4] lsls r2, r0, 4 adds r2, r0 @@ -207310,13 +207310,13 @@ _080738C0: lsls r1, r3, 22 lsrs r1, 22 adds r1, 0x2 -_080738D8: +@080738D8: ands r1, r7 mov r0, r9 ands r0, r3 orrs r0, r1 strh r0, [r2, 0x4] -_080738E2: +@080738E2: adds r4, 0x1 adds r5, 0x8 movs r3, 0x1 @@ -207324,9 +207324,9 @@ _080738E2: add r8, r3 mov r0, r8 cmp r0, 0 - bge _0807385C - b _08073B9A -_080738F4: + bge @0807385C + b @08073B9A +@080738F4: movs r1, 0x5 mov r10, r1 movs r7, 0 @@ -207338,11 +207338,11 @@ _080738F4: mov r12, r5 ldr r6, [sp, 0xC] mov r5, sp -_0807390A: +@0807390A: ldrh r0, [r6] ldr r1, =0x0000ffff cmp r0, r1 - bne _08073958 + bne @08073958 mov r4, sp add r4, r10 ldrb r0, [r4] @@ -207369,12 +207369,12 @@ _0807390A: strh r1, [r0, 0x3C] subs r1, 0x2 add r10, r1 - b _080739DE + b @080739DE .align 2, 0 .pool -_08073958: +@08073958: cmp r0, 0 - bne _08073970 + bne @08073970 ldrb r0, [r5] lsls r2, r0, 4 adds r2, r0 @@ -207384,15 +207384,15 @@ _08073958: lsls r1, r3, 22 lsrs r1, 22 adds r1, 0x3 - b _080739D0 -_08073970: + b @080739D0 +@08073970: ldr r1, =0x02022fec ldr r0, [r1] movs r1, 0x80 lsls r1, 11 ands r0, r1 cmp r0, 0 - beq _080739B8 + beq @080739B8 ldr r0, =0x0202449c ldr r0, [r0] movs r2, 0xA8 @@ -207405,7 +207405,7 @@ _08073970: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _080739B8 + beq @080739B8 ldrb r0, [r5] lsls r2, r0, 4 adds r2, r0 @@ -207415,13 +207415,13 @@ _08073970: lsls r1, r3, 22 lsrs r1, 22 adds r1, 0x3 - b _080739D0 + b @080739D0 .align 2, 0 .pool -_080739B8: +@080739B8: ldr r0, [r6, 0x4] cmp r0, 0 - beq _080739DC + beq @080739DC ldrb r0, [r5] lsls r2, r0, 4 adds r2, r0 @@ -207431,28 +207431,28 @@ _080739B8: lsls r1, r3, 22 lsrs r1, 22 adds r1, 0x2 -_080739D0: +@080739D0: mov r0, r9 ands r1, r0 mov r0, r12 ands r0, r3 orrs r0, r1 strh r0, [r2, 0x4] -_080739DC: +@080739DC: adds r5, 0x1 -_080739DE: +@080739DE: adds r6, 0x8 adds r7, 0x1 cmp r7, 0x5 - ble _0807390A - b _08073B9A -_080739E8: + ble @0807390A + b @08073B9A +@080739E8: ldr r0, =0x02022fec ldr r1, [r0] ldr r2, =0x00008040 ands r1, r2 cmp r1, 0 - beq _08073AA4 + beq @08073AA4 ldr r1, =0x0000ffff mov r10, r1 ldr r6, =0x02020630 @@ -207465,10 +207465,10 @@ _080739E8: adds r4, 0x5 movs r0, 0x5 mov r8, r0 -_08073A0C: +@08073A0C: ldrh r0, [r5] cmp r0, r10 - bne _08073A58 + bne @08073A58 ldrb r0, [r4] lsls r2, r0, 4 adds r2, r0 @@ -207490,12 +207490,12 @@ _08073A0C: adds r0, r6 movs r1, 0x1 strh r1, [r0, 0x3C] - b _08073A92 + b @08073A92 .align 2, 0 .pool -_08073A58: +@08073A58: cmp r0, 0 - bne _08073A70 + bne @08073A70 ldrb r0, [r4] lsls r2, r0, 4 adds r2, r0 @@ -207505,11 +207505,11 @@ _08073A58: lsls r1, r3, 22 lsrs r1, 22 adds r1, 0x3 - b _08073A88 -_08073A70: + b @08073A88 +@08073A70: ldr r0, [r5, 0x4] cmp r0, 0 - beq _08073A92 + beq @08073A92 ldrb r0, [r4] lsls r2, r0, 4 adds r2, r0 @@ -207519,13 +207519,13 @@ _08073A70: lsls r1, r3, 22 lsrs r1, 22 adds r1, 0x2 -_08073A88: +@08073A88: ands r1, r7 mov r0, r9 ands r0, r3 orrs r0, r1 strh r0, [r2, 0x4] -_08073A92: +@08073A92: subs r4, 0x1 adds r5, 0x8 movs r1, 0x1 @@ -207533,9 +207533,9 @@ _08073A92: add r8, r1 mov r2, r8 cmp r2, 0 - bge _08073A0C - b _08073B9A -_08073AA4: + bge @08073A0C + b @08073B9A +@08073AA4: movs r3, 0 mov r8, r3 movs r7, 0 @@ -207548,11 +207548,11 @@ _08073AA4: ldr r6, [sp, 0xC] mov r5, sp adds r5, 0x5 -_08073ABC: +@08073ABC: ldrh r0, [r6] ldr r1, =0x0000ffff cmp r0, r1 - bne _08073B08 + bne @08073B08 mov r4, sp add r4, r8 ldrb r0, [r4] @@ -207578,12 +207578,12 @@ _08073ABC: movs r1, 0x1 strh r1, [r0, 0x3C] add r8, r1 - b _08073B92 + b @08073B92 .align 2, 0 .pool -_08073B08: +@08073B08: cmp r0, 0 - bne _08073B20 + bne @08073B20 ldrb r0, [r5] lsls r2, r0, 4 adds r2, r0 @@ -207593,15 +207593,15 @@ _08073B08: lsls r1, r3, 22 lsrs r1, 22 adds r1, 0x3 - b _08073B84 -_08073B20: + b @08073B84 +@08073B20: ldr r1, =0x02022fec ldr r0, [r1] movs r1, 0x80 lsls r1, 11 ands r0, r1 cmp r0, 0 - beq _08073B6C + beq @08073B6C ldr r2, =0x0202449c ldr r0, [r2] ldr r3, =0x000002a1 @@ -207613,7 +207613,7 @@ _08073B20: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _08073B6C + beq @08073B6C ldrb r0, [r5] lsls r2, r0, 4 adds r2, r0 @@ -207623,13 +207623,13 @@ _08073B20: lsls r1, r3, 22 lsrs r1, 22 adds r1, 0x3 - b _08073B84 + b @08073B84 .align 2, 0 .pool -_08073B6C: +@08073B6C: ldr r0, [r6, 0x4] cmp r0, 0 - beq _08073B90 + beq @08073B90 ldrb r0, [r5] lsls r2, r0, 4 adds r2, r0 @@ -207639,21 +207639,21 @@ _08073B6C: lsls r1, r3, 22 lsrs r1, 22 adds r1, 0x2 -_08073B84: +@08073B84: mov r0, r12 ands r1, r0 mov r0, r10 ands r0, r3 orrs r0, r1 strh r0, [r2, 0x4] -_08073B90: +@08073B90: subs r5, 0x1 -_08073B92: +@08073B92: adds r6, 0x8 adds r7, 0x1 cmp r7, 0x5 - ble _08073ABC -_08073B9A: + ble @08073ABC +@08073B9A: ldr r0, =nullsub_4 + 1 movs r1, 0x5 bl AddTask @@ -207675,7 +207675,7 @@ _08073B9A: adds r0, r2, 0 adds r0, 0xE adds r1, r0 -_08073BC6: +@08073BC6: mov r0, sp add r0, r8 ldrb r0, [r0] @@ -207685,7 +207685,7 @@ _08073BC6: add r8, r5 mov r6, r8 cmp r6, 0x5 - ble _08073BC6 + ble @08073BC6 adds r0, r3, r4 lsls r0, 3 adds r0, r2 @@ -207694,7 +207694,7 @@ _08073BC6: strh r1, [r0, 0x1C] ldr r2, [sp, 0x10] cmp r2, 0 - beq _08073C0A + beq @08073C0A ldr r0, =0x020244d0 ldr r0, [r0] ldr r3, [r0, 0x8] @@ -207710,7 +207710,7 @@ _08073BC6: ands r0, r2 orrs r0, r1 strb r0, [r3, 0x9] -_08073C0A: +@08073C0A: movs r0, 0x72 movs r1, 0 bl audio_play_and_stuff @@ -207728,7 +207728,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 @@ -207752,7 +207752,7 @@ sub_8073C30: @ 8073C30 str r3, [sp, 0xC] adds r2, 0xE adds r2, r1, r2 -_08073C5E: +@08073C5E: mov r0, sp adds r1, r0, r5 ldrh r0, [r2] @@ -207760,7 +207760,7 @@ _08073C5E: adds r2, 0x2 adds r5, 0x1 cmp r5, 0x5 - ble _08073C5E + ble @08073C5E movs r1, 0xFD lsls r1, 6 movs r0, 0x50 @@ -207784,7 +207784,7 @@ _08073C5E: negs r6, r6 mov r12, r3 movs r4, 0x4 -_08073CA0: +@08073CA0: mov r2, sp adds r0, r2, r5 ldrb r0, [r0] @@ -207799,7 +207799,7 @@ _08073CA0: strb r0, [r1, 0x1] adds r5, 0x1 cmp r5, 0x5 - ble _08073CA0 + ble @08073CA0 ldr r2, [sp, 0x10] add r2, r10 lsls r2, 2 @@ -207812,9 +207812,9 @@ _08073CA0: orrs r0, r1 strb r0, [r2, 0x1] cmp r7, 0 - bne _08073CDA - b _08073DE0 -_08073CDA: + bne @08073CDA + b @08073DE0 +@08073CDA: movs r5, 0 mov r6, r12 mov r9, r5 @@ -207822,7 +207822,7 @@ _08073CDA: adds r3, 0x1C mov r4, sp movs r7, 0 -_08073CE8: +@08073CE8: ldr r0, [sp, 0x8] str r3, [sp, 0x14] bl battle_side_get_owner @@ -207830,7 +207830,7 @@ _08073CE8: lsrs r2, r0, 24 ldr r3, [sp, 0x14] cmp r2, 0 - beq _08073D4C + beq @08073D4C movs r0, 0x5 subs r0, r5 mov r1, sp @@ -207864,10 +207864,10 @@ _08073CE8: str r1, [r0] ldr r2, =0x02020630 mov r12, r2 - b _08073D82 + b @08073D82 .align 2, 0 .pool -_08073D4C: +@08073D4C: ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -207895,12 +207895,12 @@ _08073D4C: str r1, [r0] ldr r0, =0x02020630 mov r12, r0 -_08073D82: +@08073D82: adds r4, 0x1 adds r7, 0x7 adds r5, 0x1 cmp r5, 0x5 - ble _08073CE8 + ble @08073CE8 ldr r3, [sp, 0x10] add r3, r10 lsls r3, 2 @@ -207928,10 +207928,10 @@ _08073D82: adds r0, r1 ldr r1, =task_battle_throw_own_ball + 1 str r1, [r0] - b _08073DEE + b @08073DEE .align 2, 0 .pool -_08073DE0: +@08073DE0: ldr r0, =0x03005e00 ldr r1, [sp, 0xC] add r1, r8 @@ -207939,7 +207939,7 @@ _08073DE0: adds r1, r0 ldr r0, =sub_8073F98 + 1 str r0, [r1] -_08073DEE: +@08073DEE: add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -207953,7 +207953,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 @@ -207970,13 +207970,13 @@ task_battle_throw_own_ball: @ 8073E08 movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _08073E48 + bne @08073E48 ldrh r0, [r4, 0x26] subs r1, r0, 0x1 strh r1, [r4, 0x26] lsls r0, r1, 16 cmp r0, 0 - blt _08073E54 + blt @08073E54 movs r0, 0x10 subs r0, r1 lsls r0, 8 @@ -207985,14 +207985,14 @@ task_battle_throw_own_ball: @ 8073E08 lsrs r1, 16 movs r0, 0x52 bl lcd_io_set -_08073E48: +@08073E48: movs r1, 0x26 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08073E54 + bne @08073E54 ldr r0, =sub_8073E64 + 1 str r0, [r4] -_08073E54: +@08073E54: pop {r4} pop {r0} bx r0 @@ -208001,7 +208001,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 @@ -208020,14 +208020,14 @@ sub_8073E64: @ 8073E64 movs r0, 0x1 negs r0, r0 cmp r1, r0 - bne _08073F54 + bne @08073F54 ldrb r5, [r4, 0xA] movs r4, 0 ldr r6, =0x020244d0 adds r0, r7, 0 adds r0, 0xE adds r2, r3, r0 -_08073E96: +@08073E96: mov r0, sp adds r1, r0, r4 ldrh r0, [r2] @@ -208035,7 +208035,7 @@ _08073E96: adds r2, 0x2 adds r4, 0x1 cmp r4, 0x5 - ble _08073E96 + ble @08073E96 ldr r0, [r6] ldr r3, [r0, 0x8] ldrb r2, [r3, 0x9] @@ -208056,7 +208056,7 @@ _08073E96: movs r0, 0x1C ands r0, r1 cmp r0, 0 - bne _08073EFC + bne @08073EFC lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -208070,10 +208070,10 @@ _08073E96: lsls r0, 2 adds r0, r4 bl obj_delete_and_free_resources - b _08073F32 + b @08073F32 .align 2, 0 .pool -_08073EFC: +@08073EFC: lsls r4, r5, 4 adds r4, r5 lsls r4, 2 @@ -208097,10 +208097,10 @@ _08073EFC: lsls r0, 2 adds r0, r5 bl obj_delete_and_free_tiles -_08073F32: +@08073F32: movs r4, 0x1 ldr r5, =0x02020630 -_08073F36: +@08073F36: mov r1, sp adds r0, r1, r4 ldrb r1, [r0] @@ -208111,15 +208111,15 @@ _08073F36: bl obj_delete_and_free_tiles adds r4, 0x1 cmp r4, 0x5 - ble _08073F36 - b _08073F8A + ble @08073F36 + b @08073F8A .align 2, 0 .pool -_08073F54: +@08073F54: movs r0, 0x3 negs r0, r0 cmp r1, r0 - bne _08073F8A + bne @08073F8A ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x4] @@ -208140,7 +208140,7 @@ _08073F54: bl lcd_io_set adds r0, r5, 0 bl remove_task -_08073F8A: +@08073F8A: add sp, 0x8 pop {r4-r7} pop {r0} @@ -208150,7 +208150,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 @@ -208168,7 +208168,7 @@ sub_8073F98: @ 8073F98 lsls r0, r1, 16 asrs r2, r0, 16 cmp r2, 0 - blt _08073FD4 + blt @08073FD4 movs r0, 0x10 subs r0, r1 lsls r0, 8 @@ -208177,20 +208177,20 @@ sub_8073F98: @ 8073F98 lsrs r1, 16 movs r0, 0x52 bl lcd_io_set - b _0807406A + b @0807406A .align 2, 0 .pool -_08073FD4: +@08073FD4: movs r0, 0x1 negs r0, r0 cmp r2, r0 - bne _08074034 + bne @08074034 ldrb r3, [r3, 0xA] movs r5, 0 adds r0, r7, 0 adds r0, 0xE adds r2, r6, r0 -_08073FE6: +@08073FE6: mov r0, sp adds r1, r0, r5 ldrh r0, [r2] @@ -208198,7 +208198,7 @@ _08073FE6: adds r2, 0x2 adds r5, 0x1 cmp r5, 0x5 - ble _08073FE6 + ble @08073FE6 lsls r0, r3, 4 adds r0, r3 lsls r0, 2 @@ -208213,7 +208213,7 @@ _08073FE6: adds r0, r4 bl obj_delete_and_free_resources movs r5, 0x1 -_08074016: +@08074016: mov r1, sp adds r0, r1, r5 ldrb r1, [r0] @@ -208224,15 +208224,15 @@ _08074016: bl obj_delete_and_free_tiles adds r5, 0x1 cmp r5, 0x5 - ble _08074016 - b _0807406A + ble @08074016 + b @0807406A .align 2, 0 .pool -_08074034: +@08074034: movs r0, 0x3 negs r0, r0 cmp r2, r0 - bne _0807406A + bne @0807406A ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x4] @@ -208253,7 +208253,7 @@ _08074034: bl lcd_io_set adds r0, r4, 0 bl remove_task -_0807406A: +@0807406A: add sp, 0x8 pop {r4-r7} pop {r0} @@ -208263,24 +208263,24 @@ _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] movs r3, 0x24 ldrsh r0, [r1, r3] cmp r0, 0 - beq _0807408C + beq @0807408C ldrh r0, [r1, 0x2E] adds r0, r2, r0 strh r0, [r1, 0x24] -_0807408C: +@0807408C: pop {r0} bx r0 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] @@ -208290,18 +208290,18 @@ sub_8074090: @ 8074090 movs r3, 0x2E ldrsh r0, [r2, r3] cmp r0, 0 - ble _080740AE + ble @080740AE lsls r0, r1, 16 asrs r0, 20 ldrh r1, [r2, 0x24] adds r0, r1 - b _080740B6 -_080740AE: + b @080740B6 +@080740AE: lsls r1, 16 asrs r1, 20 ldrh r0, [r2, 0x24] subs r0, r1 -_080740B6: +@080740B6: strh r0, [r2, 0x24] ldrh r1, [r2, 0x30] movs r0, 0xF @@ -208312,18 +208312,18 @@ _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] movs r2, 0x30 ldrsh r0, [r4, r2] cmp r0, 0 - ble _080740D8 + ble @080740D8 subs r0, r1, 0x1 strh r0, [r4, 0x30] - b _0807414E -_080740D8: + b @0807414E +@080740D8: ldrh r0, [r4, 0x32] lsls r0, 24 lsrs r3, r0, 24 @@ -208336,56 +208336,56 @@ _080740D8: ands r2, r0 strh r2, [r4, 0x34] cmp r3, 0 - beq _0807410C + beq @0807410C lsrs r0, r1, 20 ldrh r1, [r4, 0x24] adds r0, r1 strh r0, [r4, 0x24] lsls r0, 16 cmp r0, 0 - ble _0807411C + ble @0807411C movs r0, 0 strh r0, [r4, 0x24] - b _0807411C + b @0807411C .align 2, 0 .pool -_0807410C: +@0807410C: lsrs r1, 20 ldrh r0, [r4, 0x24] subs r0, r1 strh r0, [r4, 0x24] lsls r0, 16 cmp r0, 0 - bge _0807411C + bge @0807411C strh r3, [r4, 0x24] -_0807411C: +@0807411C: movs r2, 0x24 ldrsh r0, [r4, r2] cmp r0, 0 - bne _0807414E + bne @0807414E movs r1, 0x3F cmp r3, 0 - beq _0807412C + beq @0807412C movs r1, 0xC0 -_0807412C: +@0807412C: movs r2, 0x3C ldrsh r0, [r4, r2] cmp r0, 0 - beq _08074140 + beq @08074140 lsls r1, 24 asrs r1, 24 movs r0, 0x74 bl sub_80A383C - b _0807414A -_08074140: + b @0807414A +@08074140: lsls r1, 24 asrs r1, 24 movs r0, 0x73 bl sub_80A3808 -_0807414A: +@0807414A: ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] -_0807414E: +@0807414E: pop {r4} pop {r0} bx r0 @@ -208394,18 +208394,18 @@ _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] movs r2, 0x30 ldrsh r0, [r3, r2] cmp r0, 0 - ble _0807416C + ble @0807416C subs r0, r1, 0x1 strh r0, [r3, 0x30] - b _080741BC -_0807416C: + b @080741BC +@0807416C: ldrh r0, [r3, 0x32] lsls r0, 24 ldrh r2, [r3, 0x34] @@ -208417,18 +208417,18 @@ _0807416C: ands r2, r1 strh r2, [r3, 0x34] cmp r0, 0 - beq _08074190 + beq @08074190 lsrs r0, r4, 20 ldrh r1, [r3, 0x24] adds r0, r1 - b _08074196 + b @08074196 .align 2, 0 .pool -_08074190: +@08074190: lsrs r1, r4, 20 ldrh r0, [r3, 0x24] subs r0, r1 -_08074196: +@08074196: strh r0, [r3, 0x24] movs r2, 0x24 ldrsh r0, [r3, r2] @@ -208439,7 +208439,7 @@ _08074196: movs r1, 0x80 lsls r1, 1 cmp r0, r1 - bls _080741BC + bls @080741BC adds r2, r3, 0 adds r2, 0x3E ldrb r0, [r2] @@ -208448,7 +208448,7 @@ _08074196: strb r0, [r2] ldr r0, =nullsub_12 + 1 str r0, [r3, 0x1C] -_080741BC: +@080741BC: pop {r4} pop {r0} bx r0 @@ -208457,7 +208457,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 @@ -208476,7 +208476,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 @@ -208507,10 +208507,10 @@ sub_80741E8: @ 80741E8 lsrs r0, 16 adds r1, r0, 0 cmp r0, 0x1D - beq _08074236 + beq @08074236 cmp r0, 0x20 - bne _0807424A -_08074236: + bne @0807424A +@08074236: movs r0, 0xB muls r1, r0 ldr r0, =0x083185c8 @@ -208518,25 +208518,25 @@ _08074236: add r0, sp, 0x4 bl sub_8008C44 cmp r0, 0 - bne _0807424A + bne @0807424A movs r6, 0x64 -_0807424A: +@0807424A: cmp r6, 0 - beq _08074268 + beq @08074268 cmp r6, 0xFE - beq _08074270 + beq @08074270 ldr r1, =0x085ed238 - b _08074272 + b @08074272 .align 2, 0 .pool -_08074268: +@08074268: ldr r1, =0x085ed22e - b _08074272 + b @08074272 .align 2, 0 .pool -_08074270: +@08074270: ldr r1, =0x085ed233 -_08074272: +@08074272: adds r0, r5, 0 bl gf_strcpy ldr r0, =0x02022e2c @@ -208561,7 +208561,7 @@ _08074272: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _080742F0 + bne @080742F0 ldr r1, =0x06010040 adds r0, r4, r1 adds r1, r6, 0 @@ -208572,25 +208572,25 @@ _08074272: ldr r1, =0x06010400 adds r5, r4, r1 cmp r0, 0 - bne _080742C8 + bne @080742C8 ldr r0, =0x06010800 adds r5, r4, r0 -_080742C8: +@080742C8: adds r1, r6, 0 adds r1, 0xC0 adds r0, r5, 0 movs r2, 0x1 bl sub_8075198 - b _080742FC + b @080742FC .align 2, 0 .pool -_080742F0: +@080742F0: ldr r1, =0x06010020 adds r0, r4, r1 adds r1, r6, 0 movs r2, 0x7 bl sub_8075198 -_080742FC: +@080742FC: ldr r0, [sp, 0x10] bl sub_807512C add sp, 0x14 @@ -208602,7 +208602,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 @@ -208615,11 +208615,11 @@ sub_8074310: @ 8074310 lsls r0, 2 ands r0, r1 cmp r0, 0 - bne _080743E6 + bne @080743E6 movs r0, 0x8 ands r1, r0 cmp r1, 0 - bne _080743E6 + bne @080743E6 ldr r6, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -208632,7 +208632,7 @@ sub_8074310: @ 8074310 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080743E6 + beq @080743E6 ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -208652,12 +208652,12 @@ sub_8074310: @ 8074310 bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - beq _080743E6 + beq @080743E6 ldrh r0, [r5, 0x38] lsls r0, 24 lsrs r4, r0, 24 cmp r7, 0 - beq _080743C4 + beq @080743C4 movs r0, 0x46 bl sub_80728A4 lsls r1, r4, 4 @@ -208674,10 +208674,10 @@ sub_8074310: @ 8074310 adds r1, r2 ldr r2, =0x04000008 bl CpuSet - b _080743E6 + b @080743E6 .align 2, 0 .pool -_080743C4: +@080743C4: str r7, [sp] lsls r0, r4, 4 adds r0, r4 @@ -208694,7 +208694,7 @@ _080743C4: ldr r2, =0x05000008 mov r0, sp bl CpuSet -_080743E6: +@080743E6: add sp, 0x4 pop {r4-r7} pop {r0} @@ -208704,7 +208704,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 @@ -208730,7 +208730,7 @@ draw_status_ailment_maybe: @ 80743F8 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08074468 + bne @08074468 ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 @@ -208747,13 +208747,13 @@ draw_status_ailment_maybe: @ 80743F8 movs r3, 0x12 mov r8, r3 cmp r0, 0 - bne _08074484 + bne @08074484 movs r0, 0x1A mov r8, r0 - b _08074484 + b @08074484 .align 2, 0 .pool -_08074468: +@08074468: ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 @@ -208767,11 +208767,11 @@ _08074468: adds r4, r0, 0 movs r1, 0x11 mov r8, r1 -_08074484: +@08074484: movs r0, 0x7 ands r0, r4 cmp r0, 0 - beq _080744AC + beq @080744AC movs r0, 0x1B adds r1, r7, 0 bl sub_80746A8 @@ -208780,14 +208780,14 @@ _08074484: bl sub_80728A4 adds r6, r0, 0 movs r0, 0x2 - b _080745B8 + b @080745B8 .align 2, 0 .pool -_080744AC: +@080744AC: movs r0, 0x88 ands r0, r4 cmp r0, 0 - beq _080744CA + beq @080744CA movs r0, 0x15 adds r1, r7, 0 bl sub_80746A8 @@ -208796,12 +208796,12 @@ _080744AC: bl sub_80728A4 adds r6, r0, 0 movs r0, 0 - b _080745B8 -_080744CA: + b @080745B8 +@080744CA: movs r0, 0x10 ands r0, r4 cmp r0, 0 - beq _080744E8 + beq @080744E8 movs r0, 0x21 adds r1, r7, 0 bl sub_80746A8 @@ -208810,12 +208810,12 @@ _080744CA: bl sub_80728A4 adds r6, r0, 0 movs r0, 0x4 - b _080745B8 -_080744E8: + b @080745B8 +@080744E8: movs r0, 0x20 ands r0, r4 cmp r0, 0 - beq _08074506 + beq @08074506 movs r0, 0x1E adds r1, r7, 0 bl sub_80746A8 @@ -208824,12 +208824,12 @@ _080744E8: bl sub_80728A4 adds r6, r0, 0 movs r0, 0x3 - b _080745B8 -_08074506: + b @080745B8 +@08074506: movs r0, 0x40 ands r0, r4 cmp r0, 0 - beq _08074524 + beq @08074524 movs r0, 0x18 adds r1, r7, 0 bl sub_80746A8 @@ -208838,8 +208838,8 @@ _08074506: bl sub_80728A4 adds r6, r0, 0 movs r0, 0x1 - b _080745B8 -_08074524: + b @080745B8 +@08074524: movs r0, 0x27 bl sub_80728A4 adds r6, r0, 0 @@ -208854,7 +208854,7 @@ _08074524: add r0, r9 lsls r0, 2 adds r5, r0, r1 -_08074542: +@08074542: ldrh r1, [r5, 0x4] lsls r1, 22 lsrs r1, 22 @@ -208870,7 +208870,7 @@ _08074542: bl CpuSet adds r4, 0x1 cmp r4, 0x2 - ble _08074542 + ble @08074542 ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] @@ -208879,7 +208879,7 @@ _08074542: movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _08074598 + bne @08074598 movs r0, 0x1 bl sub_80728A4 ldr r2, =0x02020630 @@ -208895,14 +208895,14 @@ _08074542: adds r1, r2 ldr r2, =0x04000010 bl CpuSet -_08074598: +@08074598: mov r0, r9 movs r1, 0x1 bl sub_8074310 - b _0807467A + b @0807467A .align 2, 0 .pool -_080745B8: +@080745B8: mov r1, r9 lsls r5, r1, 4 add r5, r9 @@ -208946,14 +208946,14 @@ _080745B8: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08074626 + beq @08074626 adds r0, r7, 0 bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08074672 -_08074626: + bne @08074672 +@08074626: ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -208963,7 +208963,7 @@ _08074626: movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _08074672 + bne @08074672 movs r0, 0 bl sub_80728A4 mov r3, r10 @@ -208988,11 +208988,11 @@ _08074626: add r1, r8 adds r2, r5, 0 bl CpuSet -_08074672: +@08074672: mov r0, r9 movs r1, 0 bl sub_8074310 -_0807467A: +@0807467A: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -209005,7 +209005,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 @@ -209014,96 +209014,96 @@ sub_80746A8: @ 80746A8 adds r0, r2, 0 subs r0, 0x15 cmp r0, 0xC - bhi _08074768 + bhi @08074768 lsls r0, 2 - ldr r1, =_080746C8 + ldr r1, =@080746C8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080746C8: - .4byte _080746FC - .4byte _08074768 - .4byte _08074768 - .4byte _08074712 - .4byte _08074768 - .4byte _08074768 - .4byte _08074728 - .4byte _08074768 - .4byte _08074768 - .4byte _0807473E - .4byte _08074768 - .4byte _08074768 - .4byte _08074754 -_080746FC: +@080746C8: + .4byte @080746FC + .4byte @08074768 + .4byte @08074768 + .4byte @08074712 + .4byte @08074768 + .4byte @08074768 + .4byte @08074728 + .4byte @08074768 + .4byte @08074768 + .4byte @0807473E + .4byte @08074768 + .4byte @08074768 + .4byte @08074754 +@080746FC: movs r2, 0x15 cmp r3, 0 - beq _08074768 + beq @08074768 movs r2, 0x47 cmp r3, 0x1 - beq _08074768 + beq @08074768 movs r2, 0x65 cmp r3, 0x2 - bne _08074768 + bne @08074768 movs r2, 0x56 - b _08074768 -_08074712: + b @08074768 +@08074712: movs r2, 0x18 cmp r3, 0 - beq _08074768 + beq @08074768 movs r2, 0x4A cmp r3, 0x1 - beq _08074768 + beq @08074768 movs r2, 0x68 cmp r3, 0x2 - bne _08074768 + bne @08074768 movs r2, 0x59 - b _08074768 -_08074728: + b @08074768 +@08074728: movs r2, 0x1B cmp r3, 0 - beq _08074768 + beq @08074768 movs r2, 0x4D cmp r3, 0x1 - beq _08074768 + beq @08074768 movs r2, 0x6B cmp r3, 0x2 - bne _08074768 + bne @08074768 movs r2, 0x5C - b _08074768 -_0807473E: + b @08074768 +@0807473E: movs r2, 0x1E cmp r3, 0 - beq _08074768 + beq @08074768 movs r2, 0x50 cmp r3, 0x1 - beq _08074768 + beq @08074768 movs r2, 0x6E cmp r3, 0x2 - bne _08074768 + bne @08074768 movs r2, 0x5F - b _08074768 -_08074754: + b @08074768 +@08074754: movs r2, 0x21 cmp r3, 0 - beq _08074768 + beq @08074768 movs r2, 0x53 cmp r3, 0x1 - beq _08074768 + beq @08074768 movs r2, 0x71 cmp r3, 0x2 - bne _08074768 + bne @08074768 movs r2, 0x62 -_08074768: +@08074768: adds r0, r2, 0 pop {r1} bx r1 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 @@ -209148,7 +209148,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 @@ -209205,7 +209205,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 @@ -209227,14 +209227,14 @@ healthbar_draw_field_maybe: @ 8074860 lsrs r0, 24 mov r9, r0 cmp r7, 0 - bne _0807489C + bne @0807489C bl battle_type_is_double lsls r0, 24 cmp r0, 0 - bne _0807489C + bne @0807489C mov r0, r9 bl battle_side_get_owner -_0807489C: +@0807489C: ldr r1, =0x02020630 lsls r0, r6, 4 adds r0, r6 @@ -209246,14 +209246,14 @@ _0807489C: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080748B8 - b _08074A18 -_080748B8: + beq @080748B8 + b @08074A18 +@080748B8: cmp r7, 0x3 - beq _080748C0 + beq @080748C0 cmp r7, 0 - bne _080748D4 -_080748C0: + bne @080748D4 +@080748C0: mov r0, r8 movs r1, 0x38 bl pokemon_getattr @@ -209262,9 +209262,9 @@ _080748C0: lsrs r1, 24 adds r0, r6, 0 bl healthbar_draw_level -_080748D4: +@080748D4: cmp r7, 0x1 - bhi _080748EE + bhi @080748EE mov r0, r8 movs r1, 0x39 bl pokemon_getattr @@ -209274,12 +209274,12 @@ _080748D4: adds r0, r6, 0 movs r2, 0 bl heathbar_draw_hp -_080748EE: +@080748EE: cmp r7, 0x2 - beq _080748F6 + beq @080748F6 cmp r7, 0 - bne _0807490C -_080748F6: + bne @0807490C +@080748F6: mov r0, r8 movs r1, 0x3A bl pokemon_getattr @@ -209289,12 +209289,12 @@ _080748F6: adds r0, r6, 0 movs r2, 0x1 bl heathbar_draw_hp -_0807490C: +@0807490C: cmp r7, 0x5 - beq _08074914 + beq @08074914 cmp r7, 0 - bne _08074948 -_08074914: + bne @08074948 +@08074914: movs r0, 0 bl load_gfxc_health_bar mov r0, r8 @@ -209316,18 +209316,18 @@ _08074914: movs r2, 0 movs r3, 0 bl sub_8074AA0 -_08074948: +@08074948: bl battle_type_is_double lsls r0, 24 lsrs r0, 24 mov r10, r0 cmp r0, 0 - bne _080749CE + bne @080749CE cmp r7, 0x6 - beq _0807495E + beq @0807495E cmp r7, 0 - bne _080749CE -_0807495E: + bne @080749CE +@0807495E: movs r0, 0x3 bl load_gfxc_health_bar mov r0, r8 @@ -209378,46 +209378,46 @@ _0807495E: movs r2, 0x1 movs r3, 0 bl sub_8074AA0 -_080749CE: +@080749CE: cmp r7, 0x4 - beq _080749D6 + beq @080749D6 cmp r7, 0 - bne _080749DE -_080749D6: + bne @080749DE +@080749D6: adds r0, r6, 0 mov r1, r8 bl sub_80741E8 -_080749DE: +@080749DE: cmp r7, 0x9 - beq _080749E6 + beq @080749E6 cmp r7, 0 - bne _080749EC -_080749E6: + bne @080749EC +@080749E6: adds r0, r6, 0 bl draw_status_ailment_maybe -_080749EC: +@080749EC: cmp r7, 0xA - bne _080749F6 + bne @080749F6 adds r0, r6, 0 bl sub_8074770 -_080749F6: +@080749F6: adds r0, r7, 0 subs r0, 0xA lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _08074A8E + bhi @08074A8E adds r0, r6, 0 bl sub_80747D8 - b _08074A8E + b @08074A8E .align 2, 0 .pool -_08074A18: +@08074A18: cmp r7, 0x3 - beq _08074A20 + beq @08074A20 cmp r7, 0 - bne _08074A34 -_08074A20: + bne @08074A34 +@08074A20: mov r0, r8 movs r1, 0x38 bl pokemon_getattr @@ -209426,12 +209426,12 @@ _08074A20: lsrs r1, 24 adds r0, r6, 0 bl healthbar_draw_level -_08074A34: +@08074A34: cmp r7, 0x5 - beq _08074A3C + beq @08074A3C cmp r7, 0 - bne _08074A70 -_08074A3C: + bne @08074A70 +@08074A3C: movs r0, 0 bl load_gfxc_health_bar mov r0, r8 @@ -209453,24 +209453,24 @@ _08074A3C: movs r2, 0 movs r3, 0 bl sub_8074AA0 -_08074A70: +@08074A70: cmp r7, 0x4 - beq _08074A78 + beq @08074A78 cmp r7, 0 - bne _08074A80 -_08074A78: + bne @08074A80 +@08074A78: adds r0, r6, 0 mov r1, r8 bl sub_80741E8 -_08074A80: +@08074A80: cmp r7, 0x9 - beq _08074A88 + beq @08074A88 cmp r7, 0 - bne _08074A8E -_08074A88: + bne @08074A8E +@08074A88: adds r0, r6, 0 bl draw_status_ailment_maybe -_08074A8E: +@08074A8E: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -209482,7 +209482,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 @@ -209496,7 +209496,7 @@ sub_8074AA0: @ 8074AA0 lsrs r2, 24 mov r9, r2 cmp r2, 0 - bne _08074AEC + bne @08074AEC ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0xC] @@ -209516,10 +209516,10 @@ sub_8074AA0: @ 8074AA0 bl sub_8074DB8 adds r4, r0, 0 adds r7, r5, 0 - b _08074B48 + b @08074B48 .align 2, 0 .pool -_08074AEC: +@08074AEC: ldr r2, =0x020244d0 mov r10, r2 ldr r0, [r2] @@ -209538,9 +209538,9 @@ _08074AEC: lsrs r5, r0, 24 adds r7, r4, 0 cmp r5, 0 - bne _08074B16 + bne @08074B16 movs r5, 0x1 -_08074B16: +@08074B16: mov r1, r10 ldr r0, [r1] ldr r0, [r0, 0xC] @@ -209550,9 +209550,9 @@ _08074B16: adds r1, r5, 0 bl __divsi3 cmp r0, 0 - bge _08074B2E + bge @08074B2E negs r0, r0 -_08074B2E: +@08074B2E: lsls r0, 16 lsrs r5, r0, 16 ldr r0, [r4, 0x4] @@ -209565,12 +209565,12 @@ _08074B2E: adds r2, r6, 0 bl sub_8074DB8 adds r4, r0, 0 -_08074B48: +@08074B48: mov r2, r9 cmp r2, 0x1 - beq _08074B64 + beq @08074B64 cmp r2, 0 - bne _08074B6C + bne @08074B6C ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] @@ -209579,16 +209579,16 @@ _08074B48: movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _08074B6C -_08074B64: + bne @08074B6C +@08074B64: mov r0, r8 mov r1, r9 bl sub_8074B9C -_08074B6C: +@08074B6C: movs r0, 0x1 negs r0, r0 cmp r4, r0 - bne _08074B86 + bne @08074B86 ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0xC] @@ -209598,7 +209598,7 @@ _08074B6C: adds r0, r1 movs r1, 0 str r1, [r0, 0x10] -_08074B86: +@08074B86: adds r0, r4, 0 add sp, 0x8 pop {r3-r5} @@ -209613,7 +209613,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 @@ -209624,11 +209624,11 @@ sub_8074B9C: @ 8074B9C lsls r1, 24 lsrs r1, 24 cmp r1, 0 - beq _08074BB8 + beq @08074BB8 cmp r1, 0x1 - beq _08074CA0 - b _08074D9E -_08074BB8: + beq @08074CA0 + b @08074D9E +@08074BB8: ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0xC] @@ -209651,18 +209651,18 @@ _08074BB8: mov r9, r1 adds r7, r5, 0 cmp r0, 0x18 - bhi _08074BF4 + bhi @08074BF4 movs r2, 0x38 mov r9, r2 cmp r0, 0x9 - bls _08074BF4 + bls @08074BF4 movs r4, 0x2F mov r9, r4 -_08074BF4: +@08074BF4: movs r5, 0 ldr r0, =0x02020630 mov r8, r0 -_08074BFA: +@08074BFA: ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0xC] @@ -209678,7 +209678,7 @@ _08074BFA: lsls r0, 24 lsrs r4, r0, 24 cmp r5, 0x1 - bhi _08074C5C + bhi @08074C5C mov r0, r9 bl sub_80728A4 mov r1, sp @@ -209701,10 +209701,10 @@ _08074BFA: adds r1, r2 ldr r2, =0x04000008 bl CpuSet - b _08074C8A + b @08074C8A .align 2, 0 .pool -_08074C5C: +@08074C5C: mov r0, r9 bl sub_80728A4 mov r1, sp @@ -209726,16 +209726,16 @@ _08074C5C: adds r1, r4 ldr r2, =0x04000008 bl CpuSet -_08074C8A: +@08074C8A: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls _08074BFA - b _08074D9E + bls @08074BFA + b @08074D9E .align 2, 0 .pool -_08074CA0: +@08074CA0: ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0xC] @@ -209766,10 +209766,10 @@ _08074CA0: lsrs r0, 24 adds r7, r5, 0 cmp r0, 0x64 - bne _08074CF8 + bne @08074CF8 movs r5, 0 movs r1, 0 -_08074CE6: +@08074CE6: mov r0, sp adds r0, r5 adds r0, 0x8 @@ -209778,16 +209778,16 @@ _08074CE6: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x7 - bls _08074CE6 -_08074CF8: + bls @08074CE6 +@08074CF8: movs r5, 0 ldr r0, =0x02020630 mov r8, r0 adds r0, r7, r6 lsls r4, r0, 2 -_08074D02: +@08074D02: cmp r5, 0x3 - bhi _08074D5C + bhi @08074D5C movs r0, 0xC bl sub_80728A4 mov r1, sp @@ -209816,10 +209816,10 @@ _08074D02: adds r1, r2 ldr r2, =0x04000008 bl CpuSet - b _08074D94 + b @08074D94 .align 2, 0 .pool -_08074D5C: +@08074D5C: movs r0, 0xC bl sub_80728A4 mov r1, sp @@ -209846,13 +209846,13 @@ _08074D5C: adds r1, r2 ldr r2, =0x04000008 bl CpuSet -_08074D94: +@08074D94: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x7 - bls _08074D02 -_08074D9E: + bls @08074D02 +@08074D9E: add sp, 0x10 pop {r3,r4} mov r8, r3 @@ -209865,7 +209865,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} @@ -209882,104 +209882,104 @@ sub_8074DB8: @ 8074DB8 ldr r1, [r5] ldr r0, =0xffff8000 cmp r1, r0 - bne _08074DEA + bne @08074DEA cmp r7, r2 - bge _08074DE8 + bge @08074DE8 lsls r0, r4, 8 str r0, [r5] - b _08074DEA + b @08074DEA .align 2, 0 .pool -_08074DE8: +@08074DE8: str r4, [r5] -_08074DEA: +@08074DEA: mov r0, r8 subs r4, r0 cmp r4, 0 - bge _08074DF6 + bge @08074DF6 movs r4, 0 - b _08074DFC -_08074DF6: + b @08074DFC +@08074DF6: cmp r4, r7 - ble _08074DFC + ble @08074DFC adds r4, r7, 0 -_08074DFC: +@08074DFC: cmp r7, r2 - bge _08074E18 + bge @08074E18 ldr r0, [r5] asrs r1, r0, 8 adds r6, r0, 0 cmp r4, r1 - bne _08074E24 + bne @08074E24 movs r0, 0xFF ands r0, r6 cmp r0, 0 - bne _08074E24 + bne @08074E24 movs r0, 0x1 negs r0, r0 - b _08074E80 -_08074E18: + b @08074E80 +@08074E18: ldr r6, [r5] cmp r4, r6 - bne _08074E24 + bne @08074E24 movs r0, 0x1 negs r0, r0 - b _08074E80 -_08074E24: + b @08074E80 +@08074E24: cmp r7, r2 - bge _08074E5E + bge @08074E5E lsls r0, r7, 8 adds r1, r2, 0 bl __divsi3 mov r1, r8 cmp r1, 0 - bge _08074E42 + bge @08074E42 adds r0, r6, r0 str r0, [r5] asrs r2, r0, 8 cmp r2, r4 - blt _08074E7E - b _08074E56 -_08074E42: + blt @08074E7E + b @08074E56 +@08074E42: subs r0, r6, r0 str r0, [r5] asrs r2, r0, 8 movs r1, 0xFF ands r0, r1 cmp r0, 0 - ble _08074E52 + ble @08074E52 adds r2, 0x1 -_08074E52: +@08074E52: cmp r2, r4 - bgt _08074E7E -_08074E56: + bgt @08074E7E +@08074E56: lsls r0, r4, 8 str r0, [r5] adds r2, r4, 0 - b _08074E7E -_08074E5E: + b @08074E7E +@08074E5E: mov r0, r8 cmp r0, 0 - bge _08074E70 + bge @08074E70 ldr r0, [r5] adds r0, r3 str r0, [r5] cmp r0, r4 - ble _08074E7C - b _08074E7A -_08074E70: + ble @08074E7C + b @08074E7A +@08074E70: ldr r0, [r5] subs r0, r3 str r0, [r5] cmp r0, r4 - bge _08074E7C -_08074E7A: + bge @08074E7C +@08074E7A: str r4, [r5] -_08074E7C: +@08074E7C: ldr r2, [r5] -_08074E7E: +@08074E7E: adds r0, r2, 0 -_08074E80: +@08074E80: pop {r3} mov r8, r3 pop {r4-r7} @@ -209988,7 +209988,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 @@ -209998,64 +209998,64 @@ sub_8074E8C: @ 8074E8C lsrs r6, r0, 24 subs r5, r1, r2 cmp r5, 0 - bge _08074EA4 + bge @08074EA4 movs r5, 0 - b _08074EAA -_08074EA4: + b @08074EAA +@08074EA4: cmp r5, r4 - ble _08074EAA + ble @08074EAA adds r5, r4, 0 -_08074EAA: +@08074EAA: lsls r0, r6, 27 lsrs r3, r0, 24 movs r1, 0 cmp r1, r6 - bcs _08074EC4 + bcs @08074EC4 movs r2, 0 -_08074EB6: +@08074EB6: adds r0, r7, r1 strb r2, [r0] adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, r6 - bcc _08074EB6 -_08074EC4: + bcc @08074EB6 +@08074EC4: cmp r4, r3 - bge _08074ED8 + bge @08074ED8 mov r1, r12 ldr r0, [r1] muls r0, r3 adds r1, r4, 0 bl __divsi3 asrs r0, 8 - b _08074EE4 -_08074ED8: + b @08074EE4 +@08074ED8: mov r1, r12 ldr r0, [r1] muls r0, r3 adds r1, r4, 0 bl __divsi3 -_08074EE4: +@08074EE4: lsls r0, 24 lsrs r2, r0, 24 adds r3, r2, 0 cmp r3, 0 - bne _08074EFA + bne @08074EFA cmp r5, 0 - ble _08074EFA + ble @08074EFA movs r0, 0x1 strb r0, [r7] movs r3, 0x1 - b _08074F1E -_08074EFA: + b @08074F1E +@08074EFA: movs r1, 0 movs r4, 0x8 -_08074EFE: +@08074EFE: cmp r1, r6 - bcs _08074F1E + bcs @08074F1E cmp r2, 0x7 - bls _08074F1A + bls @08074F1A adds r0, r7, r1 strb r4, [r0] adds r0, r2, 0 @@ -210065,11 +210065,11 @@ _08074EFE: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 - b _08074EFE -_08074F1A: + b @08074EFE +@08074F1A: adds r0, r7, r1 strb r2, [r0] -_08074F1E: +@08074F1E: adds r0, r3, 0 pop {r4-r7} pop {r1} @@ -210077,7 +210077,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} @@ -210103,14 +210103,14 @@ sub_8074F28: @ 8074F28 bl sub_8074F88 ldr r0, [r5] cmp r0, 0x2F - bgt _08074F68 + bgt @08074F68 ldr r0, [r6] lsls r0, 8 lsrs r1, r0, 16 - b _08074F6A -_08074F68: + b @08074F6A +@08074F68: ldrh r1, [r6] -_08074F6A: +@08074F6A: movs r2, 0 ldrsh r0, [r5, r2] lsls r1, 16 @@ -210128,7 +210128,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} @@ -210150,7 +210150,7 @@ sub_8074F88: @ 8074F88 ldrb r0, [r5, 0xC] lsls r6, r0, 27 ldr r4, [r5, 0x10] -_08074FB4: +@08074FB4: lsls r2, r3, 1 add r2, r12 lsrs r1, r6, 15 @@ -210165,7 +210165,7 @@ _08074FB4: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x5 - bls _08074FB4 + bls @08074FB4 adds r0, r7, 0 mov r1, r8 movs r2, 0x6 @@ -210179,21 +210179,21 @@ _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 lsrs r7, r3, 24 subs r5, r0, r1 cmp r5, 0 - bge _08074FFA + bge @08074FFA movs r5, 0 - b _08075000 -_08074FFA: + b @08075000 +@08074FFA: cmp r5, r6 - ble _08075000 + ble @08075000 adds r5, r6, 0 -_08075000: +@08075000: muls r0, r7 adds r1, r6, 0 bl __divsi3 @@ -210210,9 +210210,9 @@ _08075000: asrs r0, 24 subs r0, r4, r0 cmp r0, 0 - bge _08075028 + bge @08075028 negs r0, r0 -_08075028: +@08075028: lsls r0, 24 lsrs r0, 24 pop {r4-r7} @@ -210221,7 +210221,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 @@ -210235,48 +210235,48 @@ sub_8075034: @ 8075034 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _08075058 + bne @08075058 cmp r4, 0 - ble _08075058 + ble @08075058 movs r0, 0x1 -_08075058: +@08075058: pop {r4} pop {r1} bx r1 thumb_func_end sub_8075034 thumb_func_start sub_8075060 -sub_8075060: @ 8075060 +sub_8075060: ; 8075060 push {lr} lsls r0, 16 asrs r0, 16 lsls r1, 16 asrs r1, 16 cmp r0, r1 - bne _08075072 + bne @08075072 movs r0, 0x4 - b _0807508E -_08075072: + b @0807508E +@08075072: movs r2, 0x30 bl sub_8075034 lsls r0, 24 lsrs r1, r0, 24 movs r0, 0x3 cmp r1, 0x18 - bhi _0807508E + bhi @0807508E movs r0, 0x2 cmp r1, 0x9 - bhi _0807508E + bhi @0807508E negs r0, r1 orrs r0, r1 lsrs r0, 31 -_0807508E: +@0807508E: pop {r1} bx r1 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 @@ -210352,7 +210352,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 @@ -210362,7 +210362,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 @@ -210390,7 +210390,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 @@ -210412,7 +210412,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 @@ -210429,8 +210429,8 @@ sub_8075198: @ 8075198 orrs r2, r3 bl CpuSet cmp r4, 0 - ble _080751D4 -_080751BC: + ble @080751D4 +@080751BC: adds r0, r5, 0 adds r0, 0x14 adds r1, r6, 0 @@ -210441,8 +210441,8 @@ _080751BC: adds r5, 0x20 subs r4, 0x1 cmp r4, 0 - bne _080751BC -_080751D4: + bne @080751BC +@080751D4: pop {r4-r6} pop {r0} bx r0 @@ -210451,7 +210451,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 @@ -210481,7 +210481,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 @@ -210499,12 +210499,12 @@ sub_807521C: @ 807521C lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 - bne _0807524E + bne @0807524E adds r0, r5, 0 bl gpu_tile_obj_decompress_and_load3 ldr r0, =0x0831c628 bl gpu_pal_obj_decompress_and_apply3 -_0807524E: +@0807524E: ldr r0, =sub_8075370 + 1 bl object_new_hidden_with_callback mov r8, r0 @@ -210628,13 +210628,13 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _080753A8 + bne @080753A8 ldr r0, =0x0831c620 ldrh r0, [r0, 0x6] bl gpu_tile_obj_free_by_tag @@ -210644,16 +210644,16 @@ sub_8075370: @ 8075370 movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0 - bne _080753A4 + bne @080753A4 adds r0, r4, 0 bl obj_delete_and_free_tiles - b _080753A8 + b @080753A8 .align 2, 0 .pool -_080753A4: +@080753A4: ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] -_080753A8: +@080753A8: pop {r4} pop {r0} bx r0 @@ -210662,7 +210662,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 @@ -210670,7 +210670,7 @@ sub_80753B4: @ 80753B4 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080753DE + beq @080753DE ldr r2, =0x02020630 movs r0, 0x2E ldrsh r1, [r3, r0] @@ -210683,7 +210683,7 @@ sub_80753B4: @ 80753B4 strh r1, [r0, 0x2E] adds r0, r3, 0 bl obj_delete_and_free_tiles -_080753DE: +@080753DE: pop {r0} bx r0 .align 2, 0 @@ -210691,7 +210691,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 @@ -210738,7 +210738,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 @@ -210760,13 +210760,13 @@ sub_8075450: @ 8075450 movs r3, 0x8 ldrsh r0, [r1, r3] cmp r0, 0 - bne _08075488 + bne @08075488 adds r0, r2, 0x1 strh r0, [r1, 0x8] - b _08075602 + b @08075602 .align 2, 0 .pool -_08075488: +@08075488: ldrh r0, [r1, 0xC] mov r8, r0 ldrb r5, [r1, 0xE] @@ -210774,7 +210774,7 @@ _08075488: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080754B4 + beq @080754B4 ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 @@ -210782,10 +210782,10 @@ _08075488: movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 - b _080754C2 + b @080754C2 .align 2, 0 .pool -_080754B4: +@080754B4: ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 @@ -210793,7 +210793,7 @@ _080754B4: movs r0, 0x64 muls r0, r1 ldr r1, =0x020244ec -_080754C2: +@080754C2: adds r0, r1 movs r1, 0x26 bl pokemon_getattr @@ -210830,9 +210830,9 @@ _080754C2: strh r0, [r4, 0x3C] mov r2, r8 cmp r2, 0xFE - beq _08075548 + beq @08075548 cmp r2, 0xFF - bne _08075584 + bne @08075584 ldr r0, =0x0202420c strb r5, [r0] movs r0, 0x18 @@ -210844,10 +210844,10 @@ _080754C2: adds r0, r6, r0 ldr r1, =sub_80761B4 + 1 str r1, [r0] - b _08075592 + b @08075592 .align 2, 0 .pool -_08075548: +@08075548: adds r0, r5, 0 movs r1, 0 bl sub_80A5C6C @@ -210870,17 +210870,17 @@ _08075548: adds r0, r6, r0 ldr r1, =sub_8076398 + 1 str r1, [r0] - b _08075592 + b @08075592 .align 2, 0 .pool -_08075584: +@08075584: movs r0, 0x1 bl battle_get_side_with_given_state ldr r1, =0x0202420c strb r0, [r1] movs r0, 0x1 str r0, [sp] -_08075592: +@08075592: ldr r0, =0x02020630 lsls r1, r7, 4 adds r1, r7 @@ -210891,13 +210891,13 @@ _08075592: strh r0, [r4, 0x3A] ldr r2, [sp] cmp r2, 0 - bne _080755B8 + bne @080755B8 mov r0, r10 bl remove_task - b _08075602 + b @08075602 .align 2, 0 .pool -_080755B8: +@080755B8: movs r0, 0x22 strh r0, [r4, 0x2E] ldrb r0, [r5] @@ -210931,7 +210931,7 @@ _080755B8: str r1, [r0] movs r0, 0x3D bl audio_play -_08075602: +@08075602: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -210945,7 +210945,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} @@ -210954,7 +210954,7 @@ objc_0804ABD4: @ 8075620 bl sub_80A6900 lsls r0, 24 cmp r0, 0 - beq _080756C0 + beq @080756C0 ldrb r6, [r7, 0x6] ldr r1, =0x03005e00 lsls r0, r6, 2 @@ -211019,7 +211019,7 @@ objc_0804ABD4: @ 8075620 bl remove_task ldr r0, =sub_80756D4 + 1 str r0, [r7, 0x1C] -_080756C0: +@080756C0: add sp, 0x4 pop {r3} mov r8, r3 @@ -211031,7 +211031,7 @@ _080756C0: thumb_func_end objc_0804ABD4 thumb_func_start sub_80756D4 -sub_80756D4: @ 80756D4 +sub_80756D4: ; 80756D4 ldr r1, =sub_80756E0 + 1 str r1, [r0, 0x1C] bx lr @@ -211040,7 +211040,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] @@ -211050,7 +211050,7 @@ sub_80756E0: @ 80756E0 lsls r0, 16 asrs r0, 16 cmp r0, 0xA - bne _0807573A + bne @0807573A strh r7, [r6, 0x38] ldr r0, =sub_807574C + 1 str r0, [r6, 0x1C] @@ -211084,7 +211084,7 @@ sub_80756E0: @ 80756E0 lsls r0, 2 adds r0, r4 strh r7, [r0, 0x30] -_0807573A: +@0807573A: pop {r4-r7} pop {r0} bx r0 @@ -211093,7 +211093,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] @@ -211102,10 +211102,10 @@ sub_807574C: @ 807574C lsls r0, 16 asrs r0, 16 cmp r0, 0xB - bne _08075764 + bne @08075764 movs r0, 0x3C bl audio_play -_08075764: +@08075764: ldr r6, =0x02020630 ldr r5, =0x020241e4 movs r1, 0x3A @@ -211121,7 +211121,7 @@ _08075764: ldrb r0, [r0] lsls r0, 26 cmp r0, 0 - bge _080757BC + bge @080757BC adds r0, r4, 0 movs r1, 0x2 bl obj_anim_image_start @@ -211142,10 +211142,10 @@ _08075764: strh r0, [r4, 0x38] ldr r0, =sub_80757E4 + 1 str r0, [r4, 0x1C] - b _080757DC + b @080757DC .align 2, 0 .pool -_080757BC: +@080757BC: ldrh r0, [r1, 0x30] adds r0, 0x60 strh r0, [r1, 0x30] @@ -211162,14 +211162,14 @@ _080757BC: negs r0, r0 asrs r0, 8 strh r0, [r1, 0x26] -_080757DC: +@080757DC: pop {r4-r6} pop {r0} bx r0 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 @@ -211177,7 +211177,7 @@ sub_80757E4: @ 80757E4 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0807582C + beq @0807582C ldrh r0, [r4, 0x38] adds r0, 0x1 movs r1, 0 @@ -211185,7 +211185,7 @@ sub_80757E4: @ 80757E4 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - bne _0807582C + bne @0807582C strh r1, [r4, 0x34] movs r0, 0x20 strh r0, [r4, 0x36] @@ -211204,7 +211204,7 @@ sub_80757E4: @ 80757E4 strh r0, [r4, 0x26] ldr r0, =sub_8075838 + 1 str r0, [r4, 0x1C] -_0807582C: +@0807582C: pop {r4} pop {r0} bx r0 @@ -211213,7 +211213,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 @@ -211221,11 +211221,11 @@ sub_8075838: @ 8075838 movs r1, 0xFF ands r1, r0 cmp r1, 0 - beq _0807584E + beq @0807584E cmp r1, 0x1 - beq _080758C2 - b _080758EE -_0807584E: + beq @080758C2 + b @080758EE +@0807584E: movs r1, 0x38 ldrsh r0, [r4, r1] movs r2, 0x36 @@ -211243,7 +211243,7 @@ _0807584E: lsls r1, 16 asrs r1, 16 cmp r1, 0x3F - ble _080758EE + ble @080758EE ldrh r0, [r4, 0x36] subs r0, 0xA strh r0, [r4, 0x36] @@ -211253,39 +211253,39 @@ _0807584E: lsls r0, 16 asrs r0, 24 cmp r0, 0x4 - bne _0807588A + bne @0807588A movs r5, 0x1 -_0807588A: +@0807588A: cmp r0, 0x2 - beq _080758AA + beq @080758AA cmp r0, 0x2 - bgt _0807589C + bgt @0807589C cmp r0, 0x1 - beq _080758A2 - b _080758BA + beq @080758A2 + b @080758BA .align 2, 0 .pool -_0807589C: +@0807589C: cmp r0, 0x3 - beq _080758B2 - b _080758BA -_080758A2: + beq @080758B2 + b @080758BA +@080758A2: movs r0, 0x38 bl audio_play - b _080758EE -_080758AA: + b @080758EE +@080758AA: movs r0, 0x39 bl audio_play - b _080758EE -_080758B2: + b @080758EE +@080758B2: movs r0, 0x3A bl audio_play - b _080758EE -_080758BA: + b @080758EE +@080758BA: movs r0, 0x3B bl audio_play - b _080758EE -_080758C2: + b @080758EE +@080758C2: movs r2, 0x38 ldrsh r0, [r4, r2] movs r2, 0x36 @@ -211302,14 +211302,14 @@ _080758C2: strh r1, [r4, 0x38] lsls r1, 16 cmp r1, 0 - bgt _080758EE + bgt @080758EE strh r5, [r4, 0x38] ldr r0, =0xffffff00 ands r0, r2 strh r0, [r4, 0x34] -_080758EE: +@080758EE: cmp r5, 0 - beq _08075926 + beq @08075926 movs r5, 0 strh r5, [r4, 0x34] movs r0, 0x40 @@ -211322,19 +211322,19 @@ _080758EE: movs r2, 0x3C ldrsh r0, [r4, r2] cmp r0, 0 - bne _0807591C + bne @0807591C ldr r0, =sub_8075D14 + 1 str r0, [r4, 0x1C] - b _08075926 + b @08075926 .align 2, 0 .pool -_0807591C: +@0807591C: ldr r0, =sub_8075930 + 1 str r0, [r4, 0x1C] movs r0, 0x1 strh r0, [r4, 0x36] strh r5, [r4, 0x38] -_08075926: +@08075926: pop {r4,r5} pop {r0} bx r0 @@ -211343,7 +211343,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] @@ -211352,7 +211352,7 @@ sub_8075930: @ 8075930 lsls r0, 16 asrs r0, 16 cmp r0, 0x1F - bne _08075964 + bne @08075964 movs r0, 0 strh r0, [r4, 0x34] adds r2, r4, 0 @@ -211368,7 +211368,7 @@ sub_8075930: @ 8075930 str r0, [r4, 0x1C] movs r0, 0x17 bl audio_play -_08075964: +@08075964: pop {r4} pop {r0} bx r0 @@ -211377,29 +211377,29 @@ _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] movs r1, 0xFF ands r1, r0 cmp r1, 0x4 - bhi _08075A70 + bhi @08075A70 lsls r0, r1, 2 - ldr r1, =_0807598C + ldr r1, =@0807598C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0807598C: - .4byte _080759A0 - .4byte _080759D2 - .4byte _080759A0 - .4byte _08075A26 - .4byte _08075A70 -_080759A0: +@0807598C: + .4byte @080759A0 + .4byte @080759D2 + .4byte @080759A0 + .4byte @08075A26 + .4byte @08075A70 +@080759A0: ldrh r0, [r4, 0x36] ldrh r2, [r4, 0x24] adds r1, r0, r2 @@ -211418,21 +211418,21 @@ _080759A0: lsls r0, 16 lsrs r0, 16 cmp r0, 0x6 - bls _08075AB6 + bls @08075AB6 ldrh r0, [r4, 0x34] adds r0, 0x1 strh r0, [r4, 0x34] movs r0, 0 strh r0, [r4, 0x38] - b _08075AB6 -_080759D2: + b @08075AB6 +@080759D2: ldrh r0, [r4, 0x38] adds r0, 0x1 strh r0, [r4, 0x38] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - bne _08075A18 + bne @08075A18 movs r0, 0 strh r0, [r4, 0x38] ldrh r0, [r4, 0x36] @@ -211450,25 +211450,25 @@ _080759D2: movs r2, 0x36 ldrsh r0, [r4, r2] cmp r0, 0 - bge _08075A0E + bge @08075A0E adds r0, r4, 0 movs r1, 0x2 bl sub_80082B8 - b _08075AB6 -_08075A0E: + b @08075AB6 +@08075A0E: adds r0, r4, 0 movs r1, 0x1 bl sub_80082B8 - b _08075AB6 -_08075A18: + b @08075AB6 +@08075A18: adds r0, r4, 0 adds r0, 0x2C ldrb r1, [r0] movs r2, 0x80 orrs r1, r2 strb r1, [r0] - b _08075AB6 -_08075A26: + b @08075AB6 +@08075A26: movs r1, 0x80 lsls r1, 1 adds r0, r1, 0 @@ -211480,42 +211480,42 @@ _08075A26: movs r2, 0x3C ldrsh r1, [r4, r2] cmp r0, r1 - bne _08075A48 + bne @08075A48 ldr r0, =sub_8075D14 + 1 str r0, [r4, 0x1C] - b _08075AB6 + b @08075AB6 .align 2, 0 .pool -_08075A48: +@08075A48: cmp r1, 0x4 - bne _08075A5C + bne @08075A5C cmp r0, 0x3 - bne _08075A5C + bne @08075A5C ldr r0, =sub_8075FB4 + 1 str r0, [r4, 0x1C] - b _08075A62 + b @08075A62 .align 2, 0 .pool -_08075A5C: +@08075A5C: ldrh r0, [r4, 0x34] adds r0, 0x1 strh r0, [r4, 0x34] -_08075A62: +@08075A62: adds r2, r4, 0 adds r2, 0x2C ldrb r0, [r2] movs r1, 0x80 orrs r0, r1 strb r0, [r2] - b _08075AB6 -_08075A70: + b @08075AB6 +@08075A70: ldrh r0, [r4, 0x38] adds r0, 0x1 strh r0, [r4, 0x38] lsls r0, 16 asrs r0, 16 cmp r0, 0x1F - bne _08075AB6 + bne @08075AB6 movs r0, 0 strh r0, [r4, 0x38] ldrh r1, [r4, 0x34] @@ -211528,28 +211528,28 @@ _08075A70: movs r1, 0x36 ldrsh r0, [r4, r1] cmp r0, 0 - bge _08075AA8 + bge @08075AA8 adds r0, r4, 0 movs r1, 0x2 bl sub_8008258 - b _08075AB0 + b @08075AB0 .align 2, 0 .pool -_08075AA8: +@08075AA8: adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 -_08075AB0: +@08075AB0: movs r0, 0x17 bl audio_play -_08075AB6: +@08075AB6: pop {r4} pop {r0} bx r0 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} @@ -211575,50 +211575,50 @@ c3_0804B070: @ 8075ABC movs r1, 0x26 ldrsh r0, [r0, r1] cmp r0, 0x20 - bhi _08075B88 + bhi @08075B88 lsls r0, 2 - ldr r1, =_08075B04 + ldr r1, =@08075B04 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08075B04: - .4byte _08075B88 - .4byte _08075BB4 - .4byte _08075BDA - .4byte _08075C54 - .4byte _08075B88 - .4byte _08075B88 - .4byte _08075B88 - .4byte _08075B88 - .4byte _08075B88 - .4byte _08075B88 - .4byte _08075B88 - .4byte _08075B88 - .4byte _08075B88 - .4byte _08075B88 - .4byte _08075B88 - .4byte _08075B88 - .4byte _08075B88 - .4byte _08075B88 - .4byte _08075B88 - .4byte _08075B88 - .4byte _08075BF8 - .4byte _08075B88 - .4byte _08075B88 - .4byte _08075B88 - .4byte _08075B88 - .4byte _08075B88 - .4byte _08075B88 - .4byte _08075B88 - .4byte _08075B88 - .4byte _08075B88 - .4byte _08075C66 - .4byte _08075C7E - .4byte _08075CA8 -_08075B88: +@08075B04: + .4byte @08075B88 + .4byte @08075BB4 + .4byte @08075BDA + .4byte @08075C54 + .4byte @08075B88 + .4byte @08075B88 + .4byte @08075B88 + .4byte @08075B88 + .4byte @08075B88 + .4byte @08075B88 + .4byte @08075B88 + .4byte @08075B88 + .4byte @08075B88 + .4byte @08075B88 + .4byte @08075B88 + .4byte @08075B88 + .4byte @08075B88 + .4byte @08075B88 + .4byte @08075B88 + .4byte @08075B88 + .4byte @08075BF8 + .4byte @08075B88 + .4byte @08075B88 + .4byte @08075B88 + .4byte @08075B88 + .4byte @08075B88 + .4byte @08075B88 + .4byte @08075B88 + .4byte @08075B88 + .4byte @08075B88 + .4byte @08075C66 + .4byte @08075C7E + .4byte @08075CA8 +@08075B88: ldr r0, =0x02020630 lsls r1, r7, 4 adds r1, r7 @@ -211628,9 +211628,9 @@ _08075B88: ldrb r0, [r1] lsls r0, 26 cmp r0, 0 - blt _08075B9E - b _08075D04 -_08075B9E: + blt @08075B9E + b @08075D04 +@08075B9E: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -211638,28 +211638,28 @@ _08075B9E: mov r1, r12 adds r1, 0x1 strh r1, [r0, 0x26] - b _08075D04 + b @08075D04 .align 2, 0 .pool -_08075BB4: +@08075BB4: adds r0, r3, 0 bl sub_805F110 cmp r0, 0x1 - bne _08075BCC + bne @08075BCC lsls r1, r5, 24 asrs r1, 24 adds r0, r6, 0 movs r2, 0 bl sub_80A32E4 - b _08075C2E -_08075BCC: + b @08075C2E +@08075BCC: lsls r1, r5, 24 asrs r1, 24 adds r0, r6, 0 movs r2, 0xB bl sub_80A32E4 - b _08075C2E -_08075BDA: + b @08075C2E +@08075BDA: bl sub_80A369C ldr r1, =0x03005e00 lsls r0, r4, 2 @@ -211670,10 +211670,10 @@ _08075BDA: strh r1, [r0, 0x1C] movs r1, 0x14 strh r1, [r0, 0x26] - b _08075D04 + b @08075D04 .align 2, 0 .pool -_08075BF8: +@08075BF8: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -211682,24 +211682,24 @@ _08075BF8: movs r7, 0x1C ldrsh r0, [r1, r7] cmp r0, 0 - bne _08075CBA + bne @08075CBA adds r0, r3, 0 bl sub_805F110 cmp r0, 0x1 - bne _08075C22 + bne @08075C22 lsls r1, r5, 24 asrs r1, 24 adds r0, r6, 0 movs r2, 0x1 bl sub_80A3344 - b _08075C2E -_08075C22: + b @08075C2E +@08075C22: lsls r1, r5, 24 asrs r1, 24 adds r0, r6, 0 movs r2, 0xC bl sub_80A3344 -_08075C2E: +@08075C2E: ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x4] @@ -211715,10 +211715,10 @@ _08075C2E: strb r0, [r1, 0x1] adds r0, r4, 0 bl remove_task - b _08075D04 + b @08075D04 .align 2, 0 .pool -_08075C54: +@08075C54: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -211727,8 +211727,8 @@ _08075C54: strh r1, [r0, 0x1C] movs r1, 0x1E strh r1, [r0, 0x26] - b _08075D04 -_08075C66: + b @08075D04 +@08075C66: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -211737,15 +211737,15 @@ _08075C66: movs r3, 0x1C ldrsh r0, [r1, r3] cmp r0, 0 - bne _08075CBA + bne @08075CBA ldrh r0, [r1, 0x26] adds r0, 0x1 strh r0, [r1, 0x26] -_08075C7E: +@08075C7E: bl sub_80A36C8 lsls r0, 24 cmp r0, 0 - bne _08075D04 + bne @08075D04 bl sub_80A369C ldr r0, =0x03005e00 lsls r1, r4, 2 @@ -211757,10 +211757,10 @@ _08075C7E: ldrh r0, [r1, 0x26] adds r0, 0x1 strh r0, [r1, 0x26] - b _08075D04 + b @08075D04 .align 2, 0 .pool -_08075CA8: +@08075CA8: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -211769,29 +211769,29 @@ _08075CA8: movs r7, 0x1C ldrsh r0, [r1, r7] cmp r0, 0 - beq _08075CC0 -_08075CBA: + beq @08075CC0 +@08075CBA: subs r0, r2, 0x1 strh r0, [r1, 0x1C] - b _08075D04 -_08075CC0: + b @08075D04 +@08075CC0: adds r0, r3, 0 bl sub_805F110 cmp r0, 0x1 - bne _08075CD8 + bne @08075CD8 lsls r1, r5, 24 asrs r1, 24 adds r0, r6, 0 movs r2, 0 bl sub_80A3344 - b _08075CE4 -_08075CD8: + b @08075CE4 +@08075CD8: lsls r1, r5, 24 asrs r1, 24 adds r0, r6, 0 movs r2, 0xB bl sub_80A3344 -_08075CE4: +@08075CE4: ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x4] @@ -211807,7 +211807,7 @@ _08075CE4: strb r0, [r1, 0x1] adds r0, r4, 0 bl remove_task -_08075D04: +@08075D04: pop {r3} mov r8, r3 pop {r4-r7} @@ -211818,7 +211818,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 @@ -211870,14 +211870,14 @@ sub_8075D14: @ 8075D14 movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _08075D88 - b _08075EF4 -_08075D88: + bne @08075D88 + b @08075EF4 +@08075D88: adds r0, r5, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08075DC0 + beq @08075DC0 ldr r0, =0x0202406e lsls r2, r5, 1 adds r0, r2, r0 @@ -211888,10 +211888,10 @@ _08075D88: adds r7, r1, r0 movs r4, 0x19 mov r10, r4 - b _08075DD4 + b @08075DD4 .align 2, 0 .pool -_08075DC0: +@08075DC0: ldr r0, =0x0202406e lsls r2, r5, 1 adds r0, r2, r0 @@ -211902,7 +211902,7 @@ _08075DC0: adds r7, r1, r0 movs r0, 0xE7 mov r10, r0 -_08075DD4: +@08075DD4: mov r8, r2 adds r0, r7, 0 movs r1, 0xB @@ -211915,18 +211915,18 @@ _08075DD4: lsls r0, 24 lsrs r0, 24 cmp r5, r0 - beq _08075E00 + beq @08075E00 movs r0, 0x1 bl battle_get_side_with_given_state lsls r0, 24 lsrs r0, 24 cmp r5, r0 - bne _08075E56 -_08075E00: + bne @08075E56 +@08075E00: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _08075E56 + beq @08075E56 ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x8] @@ -211934,32 +211934,32 @@ _08075E00: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08075E56 + beq @08075E56 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x42 ands r0, r1 cmp r0, 0x42 - bne _08075E4C + bne @08075E4C bl sub_80A38E4 lsls r0, 24 cmp r0, 0 - beq _08075E56 + beq @08075E56 ldr r0, =0x03007420 bl MPlayStop_rev01 - b _08075E56 + b @08075E56 .align 2, 0 .pool -_08075E4C: +@08075E4C: ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x80 bl MPlayVolumeControl -_08075E56: +@08075E56: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _08075E70 + beq @08075E70 ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x8] @@ -211967,31 +211967,31 @@ _08075E56: movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _08075E80 -_08075E70: + bne @08075E80 +@08075E70: movs r4, 0 - b _08075EA2 + b @08075EA2 .align 2, 0 .pool -_08075E80: +@08075E80: movs r0, 0 bl battle_get_side_with_given_state lsls r0, 24 lsrs r0, 24 cmp r5, r0 - beq _08075E9C + beq @08075E9C movs r0, 0x1 bl battle_get_side_with_given_state lsls r0, 24 lsrs r0, 24 cmp r5, r0 - bne _08075EA0 -_08075E9C: + bne @08075EA0 +@08075E9C: movs r4, 0x1 - b _08075EA2 -_08075EA0: + b @08075EA2 +@08075EA0: movs r4, 0x2 -_08075EA2: +@08075EA2: ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x4] @@ -212032,7 +212032,7 @@ _08075EA2: strh r0, [r1, 0x12] strh r7, [r1, 0x14] strh r3, [r1, 0x26] -_08075EF4: +@08075EF4: ldr r4, =0x020241e4 movs r1, 0x3A ldrsh r0, [r6, r1] @@ -212052,7 +212052,7 @@ _08075EF4: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08075F50 + bne @08075F50 movs r2, 0x3A ldrsh r0, [r6, r2] adds r0, r4 @@ -212064,10 +212064,10 @@ _08075EF4: adds r1, 0x1C adds r0, r1 ldr r1, =sub_8039B58 + 1 - b _08075F66 + b @08075F66 .align 2, 0 .pool -_08075F50: +@08075F50: movs r1, 0x3A ldrsh r0, [r6, r1] adds r0, r4 @@ -212079,7 +212079,7 @@ _08075F50: adds r1, 0x1C adds r0, r1 ldr r1, =sub_8039E44 + 1 -_08075F66: +@08075F66: str r1, [r0] ldr r5, =0x020241e4 movs r2, 0x3A @@ -212116,7 +212116,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] @@ -212135,7 +212135,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 @@ -212162,14 +212162,14 @@ sub_8075FD4: @ 8075FD4 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08076016 + beq @08076016 adds r2, r5, 0 adds r2, 0x3E ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 strb r0, [r2] -_08076016: +@08076016: ldrb r0, [r3] lsls r1, r0, 4 adds r1, r0 @@ -212180,15 +212180,15 @@ _08076016: ldrb r0, [r0] lsls r0, 26 cmp r0, 0 - bge _08076040 + bge @08076040 adds r0, r1, 0 movs r1, 0 bl sub_8008258 movs r7, 0x1 - b _0807605C + b @0807605C .align 2, 0 .pool -_08076040: +@08076040: ldr r2, =0xfffffee0 adds r0, r2, 0 ldrh r2, [r1, 0x30] @@ -212203,16 +212203,16 @@ _08076040: lsls r0, 16 asrs r0, 24 strh r0, [r1, 0x26] -_0807605C: +@0807605C: adds r0, r5, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080760DE + beq @080760DE cmp r7, 0 - beq _080760DE + beq @080760DE ldr r2, =0x02020630 ldr r0, =0x020241e4 adds r0, r6, r0 @@ -212247,29 +212247,29 @@ _0807605C: ldr r2, [r0, 0x4] movs r5, 0x8 movs r4, 0x3 -_080760B6: +@080760B6: ldrb r1, [r2] adds r0, r5, 0 ands r0, r1 cmp r0, 0 - bne _080760C2 + bne @080760C2 adds r3, 0x1 -_080760C2: +@080760C2: adds r2, 0xC subs r4, 0x1 cmp r4, 0 - bge _080760B6 + bge @080760B6 cmp r3, 0x4 - bne _080760DE + bne @080760DE movs r4, 0 -_080760D0: +@080760D0: lsls r0, r4, 24 lsrs r0, 24 bl sub_8076AE8 adds r4, 0x1 cmp r4, 0xB - ble _080760D0 -_080760DE: + ble @080760D0 +@080760DE: pop {r4-r7} pop {r0} bx r0 @@ -212278,7 +212278,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] @@ -212290,22 +212290,22 @@ sub_80760F8: @ 80760F8 lsls r0, 16 asrs r1, r0, 16 cmp r1, 0x28 - beq _08076196 + beq @08076196 cmp r1, 0x5F - bne _08076130 + bne @08076130 ldr r0, =0x020244b9 movs r1, 0 strb r1, [r0] bl m4aMPlayAllStop ldr r0, =0x00000173 bl audio_play - b _08076196 + b @08076196 .align 2, 0 .pool -_08076130: +@08076130: ldr r0, =0x0000013b cmp r1, r0 - bne _08076196 + bne @08076196 ldr r5, =0x02020630 ldr r4, =0x020241e4 movs r1, 0x3A @@ -212338,7 +212338,7 @@ _08076130: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08076196 + beq @08076196 ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x4] @@ -212351,7 +212351,7 @@ _08076130: negs r0, r0 ands r0, r2 strb r0, [r1] -_08076196: +@08076196: pop {r4-r7} pop {r0} bx r0 @@ -212360,7 +212360,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 @@ -212398,7 +212398,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} @@ -212411,13 +212411,13 @@ sub_8076204: @ 8076204 lsls r0, 16 lsrs r0, 16 cmp r0, 0x2C - bhi _080762F8 + bhi @080762F8 ldrh r1, [r5, 0x6] movs r0, 0xFF lsls r0, 8 ands r0, r1 cmp r0, 0 - bne _08076266 + bne @08076266 ldrh r0, [r5, 0x30] movs r1, 0x1 adds r6, r1, 0 @@ -212445,7 +212445,7 @@ sub_8076204: @ 8076204 adds r0, r5, 0 movs r1, 0x4 bl sub_8008258 -_08076266: +@08076266: ldrh r4, [r5, 0x2E] adds r0, r5, 0 bl sub_80A6F3C @@ -212479,19 +212479,19 @@ _08076266: bl __umodsi3 lsls r0, 16 cmp r0, 0 - beq _080762B6 + beq @080762B6 strh r4, [r5, 0x2E] - b _080762BE -_080762B6: + b @080762BE +@080762B6: lsls r0, r4, 16 asrs r0, 16 subs r0, 0x1 strh r0, [r5, 0x2E] -_080762BE: +@080762BE: ldrh r0, [r5, 0x3C] lsrs r0, 8 cmp r0, 0x4F - ble _08076364 + ble @08076364 ldrh r0, [r5, 0x30] movs r1, 0x1 adds r6, r1, 0 @@ -212516,13 +212516,13 @@ _080762BE: ands r0, r2 orrs r0, r7 strh r0, [r5, 0x32] - b _08076364 -_080762F8: + b @08076364 +@080762F8: adds r0, r5, 0 bl sub_80A6900 lsls r0, 24 cmp r0, 0 - beq _08076364 + beq @08076364 ldrh r0, [r5, 0x24] ldrh r1, [r5, 0x20] adds r0, r1 @@ -212540,7 +212540,7 @@ _080762F8: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _08076358 + beq @08076358 ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x8] @@ -212548,7 +212548,7 @@ _080762F8: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08076358 + beq @08076358 movs r0, 0x3A ldrsh r4, [r5, r0] movs r0, 0x2 @@ -212556,19 +212556,19 @@ _080762F8: lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bne _08076358 + bne @08076358 ldr r0, =sub_8076374 + 1 - b _0807635A + b @0807635A .align 2, 0 .pool -_08076358: +@08076358: ldr r0, =sub_8075D14 + 1 -_0807635A: +@0807635A: str r0, [r5, 0x1C] adds r0, r5, 0 movs r1, 0 bl sub_8008258 -_08076364: +@08076364: pop {r3} mov r8, r3 pop {r4-r7} @@ -212579,7 +212579,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] @@ -212588,12 +212588,12 @@ sub_8076374: @ 8076374 lsls r0, 16 asrs r0, 16 cmp r0, 0x18 - ble _0807638E + ble @0807638E movs r0, 0 strh r0, [r2, 0x2E] ldr r0, =sub_8075D14 + 1 str r0, [r2, 0x1C] -_0807638E: +@0807638E: pop {r0} bx r0 .align 2, 0 @@ -212601,7 +212601,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] @@ -212610,13 +212610,13 @@ sub_8076398: @ 8076398 lsls r0, 16 asrs r0, 16 cmp r0, 0xF - ble _080763EC + ble @080763EC movs r0, 0 strh r0, [r5, 0x2E] bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _080763E8 + beq @080763E8 ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x8] @@ -212624,7 +212624,7 @@ sub_8076398: @ 8076398 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080763E8 + beq @080763E8 movs r0, 0x3A ldrsh r4, [r5, r0] movs r0, 0x3 @@ -212632,16 +212632,16 @@ sub_8076398: @ 8076398 lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bne _080763E8 + bne @080763E8 ldr r0, =sub_8076374 + 1 - b _080763EA + b @080763EA .align 2, 0 .pool -_080763E8: +@080763E8: ldr r0, =sub_8075D14 + 1 -_080763EA: +@080763EA: str r0, [r5, 0x1C] -_080763EC: +@080763EC: pop {r4,r5} pop {r0} bx r0 @@ -212650,7 +212650,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 @@ -212673,7 +212673,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 @@ -212688,7 +212688,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 @@ -212798,7 +212798,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} @@ -212807,7 +212807,7 @@ sub_8076524: @ 8076524 movs r2, 0x30 ldrsh r0, [r6, r2] cmp r0, 0 - bne _080765D0 + bne @080765D0 ldrh r0, [r6, 0x2E] lsls r0, 24 lsrs r7, r0, 24 @@ -212823,14 +212823,14 @@ sub_8076524: @ 8076524 adds r0, 0x43 ldrb r0, [r0] cmp r0, 0 - beq _0807655E + beq @0807655E subs r0, 0x1 lsls r0, 24 lsrs r5, r0, 24 - b _08076560 -_0807655E: + b @08076560 +@0807655E: movs r5, 0 -_08076560: +@08076560: adds r0, r6, 0 movs r1, 0x1 bl obj_anim_image_start @@ -212877,13 +212877,13 @@ _08076560: lsls r0, 5 strh r0, [r4, 0x30] strh r5, [r6, 0x3C] - b _080765D4 + b @080765D4 .align 2, 0 .pool -_080765D0: +@080765D0: subs r0, r1, 0x1 strh r0, [r6, 0x30] -_080765D4: +@080765D4: pop {r3} mov r8, r3 pop {r4-r7} @@ -212892,7 +212892,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 @@ -212910,14 +212910,14 @@ sub_80765E0: @ 80765E0 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08076610 + beq @08076610 adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 strb r0, [r2] -_08076610: +@08076610: ldr r1, =0x02020630 lsls r2, r6, 4 adds r0, r2, r6 @@ -212929,13 +212929,13 @@ _08076610: lsls r0, 26 mov r8, r2 cmp r0, 0 - bge _08076634 + bge @08076634 adds r0, r5, 0 movs r1, 0 bl sub_8008258 movs r1, 0x1 mov r12, r1 -_08076634: +@08076634: movs r2, 0x38 ldrsh r0, [r4, r2] movs r3, 0x20 @@ -212945,9 +212945,9 @@ _08076634: ldrsh r2, [r4, r1] muls r0, r2 cmp r0, 0 - bge _0807664A + bge @0807664A adds r0, 0x7F -_0807664A: +@0807664A: asrs r0, 7 ldrh r3, [r4, 0x20] adds r0, r3 @@ -212961,9 +212961,9 @@ _0807664A: subs r0, r1 muls r0, r2 cmp r0, 0 - bge _08076668 + bge @08076668 adds r0, 0x7F -_08076668: +@08076668: asrs r0, 7 ldrh r1, [r4, 0x22] adds r0, r1 @@ -212974,7 +212974,7 @@ _08076668: movs r3, 0x3C ldrsh r0, [r4, r3] cmp r0, 0x7F - bgt _080766AC + bgt @080766AC ldr r1, =0x08329f40 lsls r0, r2, 24 lsrs r0, 23 @@ -212982,9 +212982,9 @@ _08076668: movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bge _08076690 + bge @08076690 adds r0, 0x7 -_08076690: +@08076690: asrs r0, 3 negs r0, r0 lsls r0, 16 @@ -212993,10 +212993,10 @@ _08076690: strh r1, [r4, 0x3C] strh r0, [r5, 0x24] strh r0, [r5, 0x26] - b _080766BA + b @080766BA .align 2, 0 .pool -_080766AC: +@080766AC: ldrh r0, [r4, 0x38] strh r0, [r5, 0x20] ldrh r0, [r4, 0x3A] @@ -213004,19 +213004,19 @@ _080766AC: strh r7, [r5, 0x24] strh r7, [r5, 0x26] movs r7, 0x1 -_080766BA: +@080766BA: adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0807670E + beq @0807670E mov r2, r12 cmp r2, 0 - beq _0807670E + beq @0807670E cmp r7, 0 - beq _0807670E + beq @0807670E ldr r1, =0x02020630 mov r3, r8 adds r0, r3, r6 @@ -213027,25 +213027,25 @@ _080766BA: movs r0, 0xCE lsls r0, 1 cmp r1, r0 - bne _080766FC + bne @080766FC ldrh r1, [r2, 0x3C] adds r0, r2, 0 movs r2, 0x1 movs r3, 0 bl sub_806ED40 - b _08076708 + b @08076708 .align 2, 0 .pool -_080766FC: +@080766FC: ldrh r1, [r2, 0x3C] adds r0, r2, 0 movs r2, 0 movs r3, 0 bl sub_806ED40 -_08076708: +@08076708: adds r0, r4, 0 bl obj_delete_and_free_resources -_0807670E: +@0807670E: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -213055,7 +213055,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 @@ -213140,7 +213140,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} @@ -213149,7 +213149,7 @@ sub_80767D4: @ 80767D4 movs r2, 0x30 ldrsh r0, [r4, r2] cmp r0, 0 - bne _0807686C + bne @0807686C ldrh r0, [r4, 0x2E] lsls r0, 24 lsrs r7, r0, 24 @@ -213165,14 +213165,14 @@ sub_80767D4: @ 80767D4 adds r0, 0x43 ldrb r0, [r0] cmp r0, 0 - beq _0807680E + beq @0807680E subs r0, 0x1 lsls r0, 24 lsrs r6, r0, 24 - b _08076810 -_0807680E: + b @08076810 +@0807680E: movs r6, 0 -_08076810: +@08076810: adds r0, r4, 0 movs r1, 0x1 bl obj_anim_image_start @@ -213209,13 +213209,13 @@ _08076810: adds r0, r4, 0 bl obj_anim_step strh r5, [r4, 0x30] - b _08076870 + b @08076870 .align 2, 0 .pool -_0807686C: +@0807686C: subs r0, r1, 0x1 strh r0, [r4, 0x30] -_08076870: +@08076870: pop {r3} mov r8, r3 pop {r4-r7} @@ -213224,7 +213224,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] @@ -213233,10 +213233,10 @@ sub_807687C: @ 807687C lsls r0, 16 asrs r0, 16 cmp r0, 0xB - bne _08076894 + bne @08076894 movs r0, 0x3C bl audio_play -_08076894: +@08076894: ldrh r1, [r5, 0x2E] lsls r1, 24 lsrs r1, 24 @@ -213250,7 +213250,7 @@ _08076894: ldrb r0, [r0] lsls r0, 26 cmp r0, 0 - bge _080768D8 + bge @080768D8 adds r0, r5, 0 movs r1, 0x2 bl obj_anim_image_start @@ -213264,10 +213264,10 @@ _08076894: strh r0, [r5, 0x38] ldr r0, =sub_80768F0 + 1 str r0, [r5, 0x1C] - b _080768E8 + b @080768E8 .align 2, 0 .pool -_080768D8: +@080768D8: ldrh r0, [r4, 0x30] adds r0, 0x60 strh r0, [r4, 0x30] @@ -213276,14 +213276,14 @@ _080768D8: negs r0, r0 asrs r0, 8 strh r0, [r4, 0x26] -_080768E8: +@080768E8: pop {r4,r5} pop {r0} bx r0 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 @@ -213291,10 +213291,10 @@ sub_80768F0: @ 80768F0 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08076904 + beq @08076904 ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] -_08076904: +@08076904: pop {r0} bx r0 .align 2, 0 @@ -213302,7 +213302,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 obj_delete_and_free_resources pop {r0} @@ -213310,7 +213310,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 @@ -213336,7 +213336,7 @@ sub_8076918: @ 8076918 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08076966 + beq @08076966 ldrh r0, [r4, 0x2E] negs r0, r0 strh r0, [r4, 0x2E] @@ -213349,7 +213349,7 @@ sub_8076918: @ 8076918 ldrh r0, [r4, 0x26] negs r0, r0 strh r0, [r4, 0x26] -_08076966: +@08076966: movs r0, 0x38 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -213366,10 +213366,10 @@ _08076966: lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _08076990 + bne @08076990 ldr r0, =sub_80769A8 + 1 str r0, [r4, 0x1C] -_08076990: +@08076990: pop {r4-r6} pop {r0} bx r0 @@ -213378,7 +213378,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] @@ -213387,12 +213387,12 @@ sub_80769A8: @ 80769A8 lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - bne _080769C2 + bne @080769C2 movs r0, 0 strh r0, [r1, 0x30] ldr r0, =sub_80769CC + 1 str r0, [r1, 0x1C] -_080769C2: +@080769C2: pop {r0} bx r0 .align 2, 0 @@ -213400,7 +213400,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] @@ -213413,10 +213413,10 @@ sub_80769CC: @ 80769CC strh r0, [r2, 0x26] ldr r0, [r2, 0x24] cmp r0, 0 - bne _080769EA + bne @080769EA ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] -_080769EA: +@080769EA: pop {r0} bx r0 .align 2, 0 @@ -213424,7 +213424,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 @@ -213456,7 +213456,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] @@ -213479,12 +213479,12 @@ oamc_804BEB4: @ 8076A38 lsls r0, 16 asrs r0, 16 cmp r0, 0x15 - bne _08076A70 + bne @08076A70 strh r2, [r1, 0x24] strh r2, [r1, 0x26] adds r0, r3, 0 bl obj_delete_and_free_tiles -_08076A70: +@08076A70: pop {r0} bx r0 .align 2, 0 @@ -213492,7 +213492,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 @@ -213504,22 +213504,22 @@ sub_8076A78: @ 8076A78 lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 - bne _08076AA0 + bne @08076AA0 adds r0, r5, 0 bl gpu_tile_obj_decompress_and_load3 ldr r0, =0x0832c460 adds r0, r6, r0 bl gpu_pal_obj_decompress_and_apply3 -_08076AA0: +@08076AA0: cmp r4, 0x6 - beq _08076ACC + beq @08076ACC cmp r4, 0x6 - blt _08076AB0 + blt @08076AB0 cmp r4, 0xB - bgt _08076AB0 + bgt @08076AB0 cmp r4, 0xA - bge _08076ACC -_08076AB0: + bge @08076ACC +@08076AB0: ldr r1, =0x0832c400 lsls r0, r4, 3 adds r0, r1 @@ -213532,7 +213532,7 @@ _08076AB0: ldr r2, =0x06010100 adds r1, r2 bl call_LZZUnCompVram -_08076ACC: +@08076ACC: pop {r4-r6} pop {r0} bx r0 @@ -213541,7 +213541,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 @@ -213562,7 +213562,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 @@ -213570,7 +213570,7 @@ sub_8076B14: @ 8076B14 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08076B40 + beq @08076B40 ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -213578,10 +213578,10 @@ sub_8076B14: @ 8076B14 movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 - b _08076B4E + b @08076B4E .align 2, 0 .pool -_08076B40: +@08076B40: ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -213589,7 +213589,7 @@ _08076B40: movs r0, 0x64 muls r0, r1 ldr r1, =0x020244ec -_08076B4E: +@08076B4E: adds r0, r1 movs r1, 0x26 bl pokemon_getattr @@ -213603,25 +213603,25 @@ _08076B4E: thumb_func_end sub_8076B14 thumb_func_start flash_timeout_start_on_timer_2_when_flash_present -@ void flash_timeout_start_on_timer_2_when_flash_present() -flash_timeout_start_on_timer_2_when_flash_present: @ 8076B68 +; void flash_timeout_start_on_timer_2_when_flash_present() +flash_timeout_start_on_timer_2_when_flash_present: ; 8076B68 push {lr} bl IdentifyFlash lsls r0, 16 cmp r0, 0 - bne _08076B84 + bne @08076B84 ldr r1, =0x03005d88 movs r0, 0x1 str r0, [r1] bl flash_timeout_start_on_timer_2 - b _08076B8A + b @08076B8A .align 2, 0 .pool -_08076B84: +@08076B84: ldr r1, =0x03005d88 movs r0, 0 str r0, [r1] -_08076B8A: +@08076B8A: pop {r0} bx r0 .align 2, 0 @@ -213629,7 +213629,7 @@ _08076B8A: thumb_func_end flash_timeout_start_on_timer_2_when_flash_present thumb_func_start memclr_stdsav2 -memclr_stdsav2: @ 8076B94 +memclr_stdsav2: ; 8076B94 push {lr} sub sp, 0x4 mov r1, sp @@ -213647,7 +213647,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 @@ -213665,7 +213665,7 @@ clear_sav1: @ 8076BB8 thumb_func_end clear_sav1 thumb_func_start sub_8076BDC -sub_8076BDC: @ 8076BDC +sub_8076BDC: ; 8076BDC push {r4,r5,lr} adds r4, r0, 0 lsls r4, 16 @@ -213696,7 +213696,7 @@ sub_8076BDC: @ 8076BDC thumb_func_end sub_8076BDC 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 @@ -213792,7 +213792,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] @@ -213804,7 +213804,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] @@ -213817,7 +213817,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] @@ -213830,7 +213830,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 @@ -213847,7 +213847,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] @@ -213860,8 +213860,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] @@ -213872,7 +213872,7 @@ copy_player_party_to_sav1: @ 8076D8C adds r0, r2 strb r1, [r0] movs r4, 0 -_08076DA0: +@08076DA0: ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x64 @@ -213887,7 +213887,7 @@ _08076DA0: bl memcpy adds r4, 0x1 cmp r4, 0x5 - ble _08076DA0 + ble @08076DA0 pop {r4} pop {r0} bx r0 @@ -213896,7 +213896,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 @@ -213908,7 +213908,7 @@ copy_player_party_from_sav1: @ 8076DD4 strb r0, [r1] movs r4, 0 ldr r5, =0x020244ec -_08076DEA: +@08076DEA: movs r0, 0x64 adds r2, r4, 0 muls r2, r0 @@ -213923,7 +213923,7 @@ _08076DEA: bl memcpy adds r4, 0x1 cmp r4, 0x5 - ble _08076DEA + ble @08076DEA pop {r4,r5} pop {r0} bx r0 @@ -213932,7 +213932,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} @@ -213944,7 +213944,7 @@ save_serialize_npcs: @ 8076E1C ldr r4, =0x02037350 movs r3, 0 movs r2, 0xF -_08076E32: +@08076E32: mov r6, r12 ldr r1, [r6] adds r1, r3 @@ -213960,7 +213960,7 @@ _08076E32: adds r3, 0x24 subs r2, 0x1 cmp r2, 0 - bge _08076E32 + bge @08076E32 pop {r3} mov r8, r3 pop {r4-r7} @@ -213971,7 +213971,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} @@ -213983,7 +213983,7 @@ save_deserialize_npcs: @ 8076E64 ldr r4, =0x02037350 movs r3, 0 movs r2, 0xF -_08076E7A: +@08076E7A: mov r6, r12 ldr r1, [r6] adds r1, r3 @@ -213999,7 +213999,7 @@ _08076E7A: adds r3, 0x24 subs r2, 0x1 cmp r2, 0 - bge _08076E7A + bge @08076E7A pop {r3} mov r8, r3 pop {r4-r7} @@ -214010,7 +214010,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 @@ -214019,7 +214019,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 @@ -214028,7 +214028,7 @@ save_deserialize_game: @ 8076EBC thumb_func_end save_deserialize_game thumb_func_start sub_8076ECC -sub_8076ECC: @ 8076ECC +sub_8076ECC: ; 8076ECC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -214043,7 +214043,7 @@ sub_8076ECC: @ 8076ECC movs r3, 0xAC lsls r3, 3 ldr r4, =0x02031c58 -_08076EE8: +@08076EE8: lsls r0, r2, 2 ldr r1, [r5] adds r1, r3 @@ -214052,7 +214052,7 @@ _08076EE8: stm r4!, {r0} adds r2, 0x1 cmp r2, 0x1D - ble _08076EE8 + ble @08076EE8 movs r2, 0 ldr r0, =0x02031c58 ldr r5, =0x03005d8c @@ -214060,7 +214060,7 @@ _08076EE8: lsls r3, 3 adds r4, r0, 0 adds r4, 0x78 -_08076F08: +@08076F08: lsls r0, r2, 2 ldr r1, [r5] adds r1, r3 @@ -214069,7 +214069,7 @@ _08076F08: stm r4!, {r0} adds r2, 0x1 cmp r2, 0x1D - ble _08076F08 + ble @08076F08 movs r2, 0 ldr r0, =0x02031c58 ldr r5, =0x03005d8c @@ -214077,7 +214077,7 @@ _08076F08: lsls r3, 3 adds r4, r0, 0 adds r4, 0xF0 -_08076F28: +@08076F28: lsls r0, r2, 2 ldr r1, [r5] adds r1, r3 @@ -214086,7 +214086,7 @@ _08076F28: stm r4!, {r0} adds r2, 0x1 cmp r2, 0xF - ble _08076F28 + ble @08076F28 movs r2, 0 ldr r0, =0x02031c58 ldr r5, =0x03005d8c @@ -214095,7 +214095,7 @@ _08076F28: adds r4, r0, r6 movs r3, 0xD2 lsls r3, 3 -_08076F4A: +@08076F4A: lsls r0, r2, 2 ldr r1, [r5] adds r1, r3 @@ -214104,7 +214104,7 @@ _08076F4A: stm r4!, {r0} adds r2, 0x1 cmp r2, 0x3F - ble _08076F4A + ble @08076F4A movs r2, 0 ldr r0, =0x02031c58 ldr r5, =0x03005d8c @@ -214113,7 +214113,7 @@ _08076F4A: adds r4, r0, r7 movs r3, 0xF2 lsls r3, 3 -_08076F6C: +@08076F6C: lsls r0, r2, 2 ldr r1, [r5] adds r1, r3 @@ -214122,7 +214122,7 @@ _08076F6C: stm r4!, {r0} adds r2, 0x1 cmp r2, 0x2D - ble _08076F6C + ble @08076F6C ldr r0, =0x02031c58 ldr r1, =0x03005d8c mov r8, r1 @@ -214133,7 +214133,7 @@ _08076F6C: ldr r6, =0x00002be0 mov r9, r6 movs r2, 0xF -_08076F92: +@08076F92: mov r7, r8 ldr r1, [r7] adds r1, r3 @@ -214149,7 +214149,7 @@ _08076F92: adds r3, 0x24 subs r2, 0x1 cmp r2, 0 - bge _08076F92 + bge @08076F92 mov r1, r10 ldr r0, [r1] adds r0, 0xAC @@ -214168,7 +214168,7 @@ _08076F92: thumb_func_end sub_8076ECC thumb_func_start sub_8076FE0 -sub_8076FE0: @ 8076FE0 +sub_8076FE0: ; 8076FE0 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -214183,7 +214183,7 @@ sub_8076FE0: @ 8076FE0 movs r3, 0xAC lsls r3, 3 ldr r4, =0x02031c58 -_08076FFC: +@08076FFC: ldr r0, [r5] lsls r1, r2, 2 adds r0, r3 @@ -214192,7 +214192,7 @@ _08076FFC: str r1, [r0] adds r2, 0x1 cmp r2, 0x1D - ble _08076FFC + ble @08076FFC movs r2, 0 ldr r5, =0x03005d8c movs r4, 0xBB @@ -214200,7 +214200,7 @@ _08076FFC: ldr r0, =0x02031c58 adds r3, r0, 0 adds r3, 0x78 -_0807701C: +@0807701C: ldr r0, [r5] lsls r1, r2, 2 adds r0, r4 @@ -214209,7 +214209,7 @@ _0807701C: str r1, [r0] adds r2, 0x1 cmp r2, 0x1D - ble _0807701C + ble @0807701C movs r2, 0 ldr r5, =0x03005d8c movs r4, 0xCA @@ -214217,7 +214217,7 @@ _0807701C: ldr r0, =0x02031c58 adds r3, r0, 0 adds r3, 0xF0 -_0807703C: +@0807703C: ldr r0, [r5] lsls r1, r2, 2 adds r0, r4 @@ -214226,7 +214226,7 @@ _0807703C: str r1, [r0] adds r2, 0x1 cmp r2, 0xF - ble _0807703C + ble @0807703C movs r2, 0 ldr r5, =0x03005d8c movs r4, 0xD2 @@ -214235,7 +214235,7 @@ _0807703C: movs r6, 0x98 lsls r6, 1 adds r3, r0, r6 -_0807705E: +@0807705E: ldr r0, [r5] lsls r1, r2, 2 adds r0, r4 @@ -214244,7 +214244,7 @@ _0807705E: str r1, [r0] adds r2, 0x1 cmp r2, 0x3F - ble _0807705E + ble @0807705E movs r2, 0 ldr r5, =0x03005d8c movs r4, 0xF2 @@ -214253,7 +214253,7 @@ _0807705E: movs r7, 0x8C lsls r7, 2 adds r3, r0, r7 -_08077080: +@08077080: ldr r0, [r5] lsls r1, r2, 2 adds r0, r4 @@ -214262,7 +214262,7 @@ _08077080: str r1, [r0] adds r2, 0x1 cmp r2, 0x2D - ble _08077080 + ble @08077080 ldr r0, =0x03005d8c mov r9, r0 ldr r1, =0x00002be0 @@ -214270,7 +214270,7 @@ _08077080: ldr r4, =0x02031c58 movs r3, 0 movs r2, 0xF -_080770A0: +@080770A0: mov r5, r9 ldr r1, [r5] adds r1, r3 @@ -214288,7 +214288,7 @@ _080770A0: adds r3, 0x24 subs r2, 0x1 cmp r2, 0 - bge _080770A0 + bge @080770A0 mov r7, r8 ldr r0, [r7] adds r0, 0xAC @@ -214313,7 +214313,7 @@ _080770A0: thumb_func_end sub_8076FE0 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 @@ -214328,7 +214328,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 @@ -214343,7 +214343,7 @@ apply_u32_xor_crypto: @ 8077118 thumb_func_end apply_u32_xor_crypto thumb_func_start saveblock_randomize_position -saveblock_randomize_position: @ 8077130 +saveblock_randomize_position: ; 8077130 push {r4,r5,lr} adds r4, r0, 0 bl sub_8084864 @@ -214371,14 +214371,14 @@ saveblock_randomize_position: @ 8077130 thumb_func_end saveblock_randomize_position thumb_func_start sub_8077170 -sub_8077170: @ 8077170 +sub_8077170: ; 8077170 push {r4,lr} adds r4, r0, 0 adds r3, r1, 0 ldr r0, =0x02022c2c ldrb r0, [r0] cmp r0, 0x1D - beq _08077194 + beq @08077194 lsls r2, r3, 16 lsrs r2, 16 movs r0, 0 @@ -214386,17 +214386,17 @@ sub_8077170: @ 8077170 bl link_0800A448 lsls r0, 24 lsrs r0, 24 - b _080771A2 + b @080771A2 .align 2, 0 .pool -_08077194: +@08077194: ldr r0, =0x03004140 ldrb r0, [r0] movs r1, 0x54 adds r2, r4, 0 bl rfu_NI_setSendData movs r0, 0x1 -_080771A2: +@080771A2: pop {r4} pop {r1} bx r1 @@ -214405,7 +214405,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 @@ -214415,12 +214415,12 @@ 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] cmp r0, 0x1D - bne _080771F0 + bne @080771F0 ldr r4, =0x03007880 ldr r0, =0x03004140 ldrb r0, [r0] @@ -214430,26 +214430,26 @@ sub_80771BC: @ 80771BC ldr r0, [r0] ldrh r0, [r0] cmp r0, 0 - bne _080771EC + bne @080771EC movs r0, 0x1 - b _080771F8 + b @080771F8 .align 2, 0 .pool -_080771EC: +@080771EC: movs r0, 0 - b _080771F8 -_080771F0: + b @080771F8 +@080771F0: bl sub_800A520 lsls r0, 24 lsrs r0, 24 -_080771F8: +@080771F8: pop {r4} pop {r1} bx r1 thumb_func_end sub_80771BC thumb_func_start sub_8077200 -sub_8077200: @ 8077200 +sub_8077200: ; 8077200 push {lr} bl sub_800A550 lsls r0, 24 @@ -214459,73 +214459,73 @@ 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 - beq _0807722C + beq @0807722C ldr r0, =0x03004140 ldrb r1, [r0] movs r0, 0xC bl rfu_clearSlot - b _08077230 + b @08077230 .align 2, 0 .pool -_0807722C: +@0807722C: bl sub_800A5B4 -_08077230: +@08077230: pop {r0} bx r0 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 cmp r0, 0 - beq _08077250 + beq @08077250 ldr r0, =0x03004140 ldrb r1, [r0] movs r0, 0xC bl rfu_clearSlot - b _08077258 + b @08077258 .align 2, 0 .pool -_08077250: +@08077250: lsls r0, r4, 24 lsrs r0, 24 bl sub_800A5EC -_08077258: +@08077258: pop {r4} pop {r0} bx r0 thumb_func_end sub_8077234 thumb_func_start sub_8077260 -sub_8077260: @ 8077260 +sub_8077260: ; 8077260 push {lr} ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _08077280 + beq @08077280 ldr r0, =0x02022c2c ldrb r0, [r0] cmp r0, 0x1D - bne _08077280 + bne @08077280 movs r0, 0x1 - b _08077282 + b @08077282 .align 2, 0 .pool -_08077280: +@08077280: movs r0, 0 -_08077282: +@08077282: pop {r1} bx r1 thumb_func_end sub_8077260 thumb_func_start sub_8077288 -sub_8077288: @ 8077288 +sub_8077288: ; 8077288 push {lr} bl sub_800ADF8 pop {r0} @@ -214533,7 +214533,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 @@ -214543,7 +214543,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 reset_all_obj_data @@ -214583,10 +214583,10 @@ sub_80772A4: @ 80772A4 bl Window_InitFromTemplates lsls r0, 16 cmp r0, 0 - beq _0807738C + beq @0807738C bl TextBox_ResetSomeField movs r5, 0 -_08077310: +@08077310: lsls r4, r5, 24 lsrs r4, 24 adds r0, r4, 0 @@ -214596,7 +214596,7 @@ _08077310: bl Window_FastFillPixels adds r5, 0x1 cmp r5, 0x11 - bls _08077310 + bls @08077310 movs r0, 0x1E str r0, [sp] movs r0, 0x14 @@ -214643,7 +214643,7 @@ _08077310: ldr r0, [r2] adds r0, 0xA8 strb r1, [r0] -_0807738C: +@0807738C: add sp, 0xC pop {r4,r5} pop {r0} @@ -214653,7 +214653,7 @@ _0807738C: thumb_func_end sub_80772A4 thumb_func_start sub_80773AC -sub_80773AC: @ 80773AC +sub_80773AC: ; 80773AC push {lr} ldr r0, =sub_80773D0 + 1 bl set_callback2 @@ -214669,7 +214669,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} @@ -214681,42 +214681,42 @@ sub_80773D0: @ 80773D0 ldrb r0, [r0] adds r3, r1, 0 cmp r0, 0x16 - bls _080773EA - b _08077B46 -_080773EA: + bls @080773EA + b @08077B46 +@080773EA: lsls r0, 2 - ldr r1, =_080773FC + ldr r1, =@080773FC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080773FC: - .4byte _08077458 - .4byte _080774A4 - .4byte _08077560 - .4byte _0807758C - .4byte _080775E8 - .4byte _08077648 - .4byte _08077688 - .4byte _080776A8 - .4byte _080777E8 - .4byte _08077810 - .4byte _08077834 - .4byte _080778BC - .4byte _080778CA - .4byte _08077970 - .4byte _08077A40 - .4byte _08077A80 - .4byte _08077A9A - .4byte _08077AA8 - .4byte _08077ABC - .4byte _08077ADC - .4byte _08077AFC - .4byte _08077B10 - .4byte _08077B30 -_08077458: +@080773FC: + .4byte @08077458 + .4byte @080774A4 + .4byte @08077560 + .4byte @0807758C + .4byte @080775E8 + .4byte @08077648 + .4byte @08077688 + .4byte @080776A8 + .4byte @080777E8 + .4byte @08077810 + .4byte @08077834 + .4byte @080778BC + .4byte @080778CA + .4byte @08077970 + .4byte @08077A40 + .4byte @08077A80 + .4byte @08077A9A + .4byte @08077AA8 + .4byte @08077ABC + .4byte @08077ADC + .4byte @08077AFC + .4byte @08077B10 + .4byte @08077B30 +@08077458: ldr r4, =0x0203229c ldr r0, =0x000010f0 bl malloc_and_clear @@ -214729,22 +214729,22 @@ _08077458: str r0, [r4] movs r6, 0 ldr r2, =0x02032188 -_08077476: +@08077476: lsls r1, r6, 8 ldr r0, [r4] adds r0, r1 stm r2!, {r0} adds r6, 0x1 cmp r6, 0xD - ble _08077476 + ble @08077476 ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 - b _08077B22 + b @08077B22 .align 2, 0 .pool -_080774A4: +@080774A4: ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F @@ -214752,7 +214752,7 @@ _080774A4: strb r0, [r2, 0x8] movs r6, 0 movs r4, 0 -_080774B2: +@080774B2: movs r0, 0x64 muls r0, r6 ldr r1, =0x02024744 @@ -214767,7 +214767,7 @@ _080774B2: bl create_pokemon_set_level adds r6, 0x1 cmp r6, 0x5 - ble _080774B2 + ble @080774B2 movs r0, 0 bl sub_807A19C movs r0, 0 @@ -214775,7 +214775,7 @@ _080774B2: ldr r0, =0x03003124 ldrb r2, [r0] cmp r2, 0 - bne _0807754C + bne @0807754C ldr r1, =0x020229c6 ldr r5, =0x00001122 adds r0, r5, 0 @@ -214787,14 +214787,14 @@ _080774B2: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _08077528 + beq @08077528 bl sub_800B488 bl sub_8009734 bl sub_8011BA4 - b _08077B46 + b @08077B46 .align 2, 0 .pool -_08077528: +@08077528: bl sub_8009734 ldr r0, =0x030022c0 movs r7, 0x87 @@ -214806,20 +214806,20 @@ _08077528: ldr r0, =task00_08081A90 + 1 movs r1, 0x1 bl AddTask - b _08077B46 + b @08077B46 .align 2, 0 .pool -_0807754C: +@0807754C: ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 movs r1, 0x4 strb r1, [r0] - b _08077B46 + b @08077B46 .align 2, 0 .pool -_08077560: +@08077560: ldr r2, =0x0203229c ldr r1, [r2] adds r1, 0xA8 @@ -214831,31 +214831,31 @@ _08077560: adds r1, 0xA8 ldrb r0, [r1] cmp r0, 0xB - bhi _0807757A - b _08077B46 -_0807757A: + bhi @0807757A + b @08077B46 +@0807757A: movs r0, 0 strb r0, [r1] movs r2, 0x87 lsls r2, 3 adds r1, r3, r2 - b _08077B22 + b @08077B22 .align 2, 0 .pool -_0807758C: +@0807758C: bl sub_800ABAC adds r4, r0, 0 bl sub_800AA48 lsls r4, 24 lsls r0, 24 cmp r4, r0 - bcs _080775A0 - b _08077B46 -_080775A0: + bcs @080775A0 + b @08077B46 +@080775A0: bl sub_800ABBC lsls r0, 24 cmp r0, 0 - beq _080775D8 + beq @080775D8 ldr r0, =0x0203229c ldr r1, [r0] adds r1, 0xA8 @@ -214865,39 +214865,39 @@ _080775A0: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1E - bhi _080775C0 - b _08077B46 -_080775C0: + bhi @080775C0 + b @08077B46 +@080775C0: bl sub_800A620 ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 - b _08077B22 + b @08077B22 .align 2, 0 .pool -_080775D8: +@080775D8: ldr r1, =0x030022c0 movs r5, 0x87 lsls r5, 3 adds r1, r5 - b _08077B22 + b @08077B22 .align 2, 0 .pool -_080775E8: +@080775E8: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 - beq _080775F2 - b _08077B46 -_080775F2: + beq @080775F2 + b @08077B46 +@080775F2: bl sub_800A23C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08077600 - b _08077B46 -_08077600: + beq @08077600 + b @08077B46 +@08077600: bl sub_8011BD0 bl calc_player_party_count ldr r1, =0x030022c0 @@ -214915,26 +214915,26 @@ _08077600: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - bne _0807762A - b _08077B46 -_0807762A: + bne @0807762A + b @08077B46 +@0807762A: movs r0, 0x1 bl sub_801048C bl sub_800ADF8 - b _08077B46 + b @08077B46 .align 2, 0 .pool -_08077648: +@08077648: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _08077680 + beq @08077680 bl sub_8010500 lsls r0, 24 cmp r0, 0 - bne _0807765C - b _08077B46 -_0807765C: + bne @0807765C + b @08077B46 +@0807765C: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -214946,30 +214946,30 @@ _0807765C: movs r0, 0 movs r1, 0 bl sub_800DFB4 - b _08077B46 + b @08077B46 .align 2, 0 .pool -_08077680: +@08077680: movs r2, 0x87 lsls r2, 3 adds r1, r3, r2 - b _08077B22 -_08077688: + b @08077B22 +@08077688: bl shedinja_maker_maybe lsls r0, 24 cmp r0, 0 - bne _08077694 - b _08077B46 -_08077694: + bne @08077694 + b @08077B46 +@08077694: bl sub_807A5B0 ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 - b _08077B22 + b @08077B22 .align 2, 0 .pool -_080776A8: +@080776A8: bl calc_enemy_party_count movs r0, 0 movs r1, 0 @@ -214993,10 +214993,10 @@ _080776A8: adds r0, 0x36 ldrb r0, [r0] cmp r6, r0 - bge _08077740 + bge @08077740 mov r8, r2 ldr r7, =0x0832de24 -_080776E2: +@080776E2: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 @@ -215040,20 +215040,20 @@ _080776E2: adds r0, 0x36 ldrb r0, [r0] cmp r6, r0 - blt _080776E2 -_08077740: + blt @080776E2 +@08077740: movs r6, 0 ldr r1, =0x0203229c ldr r0, [r1] adds r0, 0x37 ldrb r0, [r0] cmp r6, r0 - bge _080777B8 + bge @080777B8 ldr r0, =0x0832de24 mov r8, r1 adds r7, r0, 0 adds r7, 0xC -_08077756: +@08077756: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 @@ -215099,16 +215099,16 @@ _08077756: adds r0, 0x37 ldrb r0, [r0] cmp r6, r0 - blt _08077756 -_080777B8: + blt @08077756 +@080777B8: ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 - b _08077B22 + b @08077B22 .align 2, 0 .pool -_080777E8: +@080777E8: bl sub_81B5D30 ldr r0, =0x0203229c ldr r1, [r0] @@ -215121,10 +215121,10 @@ _080777E8: movs r5, 0x87 lsls r5, 3 adds r1, r5 - b _08077B22 + b @08077B22 .align 2, 0 .pool -_08077810: +@08077810: ldr r0, =0x0203229c ldr r1, [r0] adds r0, r1, 0 @@ -215136,10 +215136,10 @@ _08077810: movs r7, 0x87 lsls r7, 3 adds r1, r7 - b _08077B22 + b @08077B22 .align 2, 0 .pool -_08077834: +@08077834: ldr r0, =0x03005d90 ldr r0, [r0] ldr r5, =0x02032188 @@ -215189,18 +215189,18 @@ _08077834: ldr r0, [r0] adds r0, 0xA8 strb r2, [r0] - b _08077B46 + b @08077B46 .align 2, 0 .pool -_080778BC: +@080778BC: bl sub_807A1F0 lsls r0, 24 cmp r0, 0 - bne _080778C8 - b _08077B46 -_080778C8: - b _08077B1A -_080778CA: + bne @080778C8 + b @08077B46 +@080778C8: + b @08077B1A +@080778CA: ldr r0, =0x03005d90 ldr r1, [r0] movs r0, 0x1 @@ -215210,7 +215210,7 @@ _080778CA: add r5, sp, 0x10 adds r4, r0, 0 adds r4, 0x10 -_080778DE: +@080778DE: add r1, sp, 0x10 ldr r0, =0x0832dcac ldm r0!, {r2,r3,r7} @@ -215229,7 +215229,7 @@ _080778DE: adds r4, 0x20 adds r6, 0x1 cmp r6, 0x2 - ble _080778DE + ble @080778DE bl link_get_multiplayer_id movs r1, 0x1 eors r0, r1 @@ -215247,7 +215247,7 @@ _080778DE: add r5, sp, 0x10 adds r4, r0, 0 adds r4, 0x88 -_0807792C: +@0807792C: add r1, sp, 0x10 ldr r0, =0x0832dcac ldm r0!, {r2,r3,r7} @@ -215267,15 +215267,15 @@ _0807792C: adds r4, 0x20 adds r6, 0x1 cmp r6, 0x2 - ble _0807792C + ble @0807792C ldr r1, =0x030022c0 movs r5, 0x87 lsls r5, 3 adds r1, r5 - b _08077B22 + b @08077B22 .align 2, 0 .pool -_08077970: +@08077970: ldr r4, =0x0832dcac add r1, sp, 0x10 adds r0, r4, 0 @@ -215312,7 +215312,7 @@ _08077970: add r4, sp, 0x10 movs r5, 0xC0 lsls r5, 13 -_080779BC: +@080779BC: add r1, sp, 0x10 ldr r0, =0x0832dcac ldm r0!, {r2,r3,r7} @@ -215334,7 +215334,7 @@ _080779BC: adds r5, r0 adds r6, 0x1 cmp r6, 0x5 - ble _080779BC + ble @080779BC ldr r0, =0x0832dc94 ldr r2, =0x0832de24 ldrb r1, [r2] @@ -215364,10 +215364,10 @@ _080779BC: strb r0, [r1] movs r0, 0 bl rbox_fill_rectangle - b _08077B46 + b @08077B46 .align 2, 0 .pool -_08077A40: +@08077A40: movs r0, 0 bl sub_807A320 movs r0, 0 @@ -215388,10 +215388,10 @@ _08077A40: strb r0, [r1] ldr r0, =0x000001b3 bl song_play_for_text - b _08077B46 + b @08077B46 .align 2, 0 .pool -_08077A80: +@08077A80: movs r0, 0x1 bl sub_807A320 movs r0, 0x1 @@ -215403,23 +215403,23 @@ _08077A80: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_08077A9A: +@08077A9A: movs r0, 0 bl sub_80782B8 - b _08077B1A + b @08077B1A .align 2, 0 .pool -_08077AA8: +@08077AA8: movs r0, 0x1 bl sub_80782B8 ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 - b _08077B22 + b @08077B22 .align 2, 0 .pool -_08077ABC: +@08077ABC: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -215431,10 +215431,10 @@ _08077ABC: movs r5, 0x87 lsls r5, 3 adds r1, r5 - b _08077B22 + b @08077B22 .align 2, 0 .pool -_08077ADC: +@08077ADC: movs r1, 0x82 lsls r1, 5 movs r0, 0 @@ -215445,47 +215445,47 @@ _08077ADC: movs r7, 0x87 lsls r7, 3 adds r1, r7 - b _08077B22 + b @08077B22 .align 2, 0 .pool -_08077AFC: +@08077AFC: movs r0, 0 bl sub_807A468 ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _08077B22 + b @08077B22 .align 2, 0 .pool -_08077B10: +@08077B10: movs r0, 0x1 bl sub_807A468 bl sub_807A53C -_08077B1A: +@08077B1A: ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 -_08077B22: +@08077B22: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08077B46 + b @08077B46 .align 2, 0 .pool -_08077B30: +@08077B30: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08077B46 + bne @08077B46 ldr r0, =sub_8078C34 + 1 str r0, [r3] ldr r0, =sub_807825C + 1 bl set_callback2 -_08077B46: +@08077B46: bl run_remoboxes bl run_active_tasks bl call_obj_callbacks @@ -215502,7 +215502,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} @@ -215514,97 +215514,97 @@ sub_8077B74: @ 8077B74 ldrb r0, [r0] adds r2, r1, 0 cmp r0, 0x16 - bls _08077B8E - b _080780F6 -_08077B8E: + bls @08077B8E + b @080780F6 +@08077B8E: lsls r0, 2 - ldr r1, =_08077BA0 + ldr r1, =@08077BA0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08077BA0: - .4byte _08077BFC - .4byte _08077C10 - .4byte _08077C18 - .4byte _08077C20 - .4byte _08077C28 - .4byte _08077C3C - .4byte _08077C64 - .4byte _08077C6C - .4byte _08077DB0 - .4byte _08077DD8 - .4byte _08077DFC - .4byte _08077E84 - .4byte _08077EA0 - .4byte _08077F48 - .4byte _080780F6 - .4byte _080780F6 - .4byte _08078038 - .4byte _08078040 - .4byte _08078068 - .4byte _080780A4 - .4byte _080780C4 - .4byte _080780CC - .4byte _080780E4 -_08077BFC: +@08077BA0: + .4byte @08077BFC + .4byte @08077C10 + .4byte @08077C18 + .4byte @08077C20 + .4byte @08077C28 + .4byte @08077C3C + .4byte @08077C64 + .4byte @08077C6C + .4byte @08077DB0 + .4byte @08077DD8 + .4byte @08077DFC + .4byte @08077E84 + .4byte @08077EA0 + .4byte @08077F48 + .4byte @080780F6 + .4byte @080780F6 + .4byte @08078038 + .4byte @08078040 + .4byte @08078068 + .4byte @080780A4 + .4byte @080780C4 + .4byte @080780CC + .4byte @080780E4 +@08077BFC: bl sub_80772A4 ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 - b _080780D8 + b @080780D8 .align 2, 0 .pool -_08077C10: +@08077C10: movs r5, 0x87 lsls r5, 3 adds r1, r2, r5 - b _08077E58 -_08077C18: + b @08077E58 +@08077C18: movs r7, 0x87 lsls r7, 3 adds r1, r2, r7 - b _080780D8 -_08077C20: + b @080780D8 +@08077C20: movs r0, 0x87 lsls r0, 3 adds r1, r2, r0 - b _080780D8 -_08077C28: + b @080780D8 +@08077C28: bl calc_player_party_count ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _080780D8 + b @080780D8 .align 2, 0 .pool -_08077C3C: +@08077C3C: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _08077C50 + beq @08077C50 bl sub_800E0E8 movs r0, 0 movs r1, 0 bl sub_800DFB4 -_08077C50: +@08077C50: ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 - b _080780D8 + b @080780D8 .align 2, 0 .pool -_08077C64: +@08077C64: movs r5, 0x87 lsls r5, 3 adds r1, r2, r5 - b _080780D8 -_08077C6C: + b @080780D8 +@08077C6C: bl calc_enemy_party_count ldr r4, =0x0203229c ldr r0, [r4] @@ -215628,10 +215628,10 @@ _08077C6C: adds r0, 0x36 ldrb r0, [r0] cmp r6, r0 - bge _08077D08 + bge @08077D08 mov r8, r4 ldr r7, =0x0832de24 -_08077CA8: +@08077CA8: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 @@ -215676,20 +215676,20 @@ _08077CA8: adds r0, 0x36 ldrb r0, [r0] cmp r6, r0 - blt _08077CA8 -_08077D08: + blt @08077CA8 +@08077D08: movs r6, 0 ldr r1, =0x0203229c ldr r0, [r1] adds r0, 0x37 ldrb r0, [r0] cmp r6, r0 - bge _08077D80 + bge @08077D80 ldr r0, =0x0832de24 mov r8, r1 adds r7, r0, 0 adds r7, 0xC -_08077D1E: +@08077D1E: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 @@ -215735,16 +215735,16 @@ _08077D1E: adds r0, 0x37 ldrb r0, [r0] cmp r6, r0 - blt _08077D1E -_08077D80: + blt @08077D1E +@08077D80: ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 - b _080780D8 + b @080780D8 .align 2, 0 .pool -_08077DB0: +@08077DB0: bl sub_81B5D30 ldr r0, =0x0203229c ldr r1, [r0] @@ -215757,10 +215757,10 @@ _08077DB0: movs r5, 0x87 lsls r5, 3 adds r1, r5 - b _080780D8 + b @080780D8 .align 2, 0 .pool -_08077DD8: +@08077DD8: ldr r0, =0x0203229c ldr r1, [r0] adds r0, r1, 0 @@ -215772,10 +215772,10 @@ _08077DD8: movs r7, 0x87 lsls r7, 3 adds r1, r7 - b _080780D8 + b @080780D8 .align 2, 0 .pool -_08077DFC: +@08077DFC: ldr r0, =0x03005d90 ldr r0, [r0] ldr r5, =0x02032188 @@ -215817,7 +215817,7 @@ _08077DFC: movs r0, 0x87 lsls r0, 3 adds r1, r0 -_08077E58: +@08077E58: ldrb r0, [r1] adds r0, 0x1 movs r2, 0 @@ -215826,24 +215826,24 @@ _08077E58: ldr r0, [r0] adds r0, 0xA8 strb r2, [r0] - b _080780F6 + b @080780F6 .align 2, 0 .pool -_08077E84: +@08077E84: bl sub_807A1F0 lsls r0, 24 cmp r0, 0 - bne _08077E90 - b _080780F6 -_08077E90: + bne @08077E90 + b @080780F6 +@08077E90: ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _080780D8 + b @080780D8 .align 2, 0 .pool -_08077EA0: +@08077EA0: ldr r0, =0x03005d90 ldr r1, [r0] movs r0, 0x1 @@ -215853,7 +215853,7 @@ _08077EA0: add r5, sp, 0xC adds r4, r0, 0 adds r4, 0x10 -_08077EB4: +@08077EB4: add r1, sp, 0xC ldr r0, =0x0832dcac ldm r0!, {r2,r3,r7} @@ -215872,7 +215872,7 @@ _08077EB4: adds r4, 0x20 adds r6, 0x1 cmp r6, 0x2 - ble _08077EB4 + ble @08077EB4 bl link_get_multiplayer_id movs r1, 0x1 eors r0, r1 @@ -215890,7 +215890,7 @@ _08077EB4: add r5, sp, 0xC adds r4, r0, 0 adds r4, 0x88 -_08077F02: +@08077F02: add r1, sp, 0xC ldr r0, =0x0832dcac ldm r0!, {r2,r3,r7} @@ -215910,15 +215910,15 @@ _08077F02: adds r4, 0x20 adds r6, 0x1 cmp r6, 0x2 - ble _08077F02 + ble @08077F02 ldr r1, =0x030022c0 movs r5, 0x87 lsls r5, 3 adds r1, r5 - b _080780D8 + b @080780D8 .align 2, 0 .pool -_08077F48: +@08077F48: ldr r4, =0x0832dcac add r1, sp, 0xC adds r0, r4, 0 @@ -215955,7 +215955,7 @@ _08077F48: add r4, sp, 0xC movs r5, 0xC0 lsls r5, 13 -_08077F94: +@08077F94: add r1, sp, 0xC ldr r0, =0x0832dcac ldm r0!, {r2,r3,r7} @@ -215977,7 +215977,7 @@ _08077F94: adds r5, r0 adds r6, 0x1 cmp r6, 0x5 - ble _08077F94 + ble @08077F94 ldr r0, =0x0203229c ldr r1, [r0] adds r2, r1, 0 @@ -215985,17 +215985,17 @@ _08077F94: ldrb r1, [r2] adds r4, r0, 0 cmp r1, 0x5 - bhi _08077FE4 + bhi @08077FE4 ldr r0, =0x0203cf20 ldrb r0, [r0] - b _08077FEA + b @08077FEA .align 2, 0 .pool -_08077FE4: +@08077FE4: ldr r0, =0x0203cf20 ldrb r0, [r0] adds r0, 0x6 -_08077FEA: +@08077FEA: strb r0, [r2] ldr r0, =0x0832dc94 ldr r3, =0x0832de24 @@ -216025,14 +216025,14 @@ _08077FEA: adds r0, r7 movs r1, 0x10 strb r1, [r0] - b _080780F6 + b @080780F6 .align 2, 0 .pool -_08078038: +@08078038: movs r0, 0 bl sub_80782B8 - b _080780D0 -_08078040: + b @080780D0 +@08078040: movs r0, 0x1 bl sub_80782B8 ldr r2, =0x0203229c @@ -216046,10 +216046,10 @@ _08078040: movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _080780D8 + b @080780D8 .align 2, 0 .pool -_08078068: +@08078068: ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F @@ -216072,10 +216072,10 @@ _08078068: movs r3, 0x87 lsls r3, 3 adds r1, r3 - b _080780D8 + b @080780D8 .align 2, 0 .pool -_080780A4: +@080780A4: movs r1, 0x82 lsls r1, 5 movs r0, 0 @@ -216086,38 +216086,38 @@ _080780A4: movs r5, 0x87 lsls r5, 3 adds r1, r5 - b _080780D8 + b @080780D8 .align 2, 0 .pool -_080780C4: +@080780C4: movs r7, 0x87 lsls r7, 3 adds r1, r2, r7 - b _080780D8 -_080780CC: + b @080780D8 +@080780CC: bl sub_807A53C -_080780D0: +@080780D0: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 -_080780D8: +@080780D8: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080780F6 + b @080780F6 .align 2, 0 .pool -_080780E4: +@080780E4: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080780F6 + bne @080780F6 ldr r0, =sub_807825C + 1 bl set_callback2 -_080780F6: +@080780F6: bl run_active_tasks bl call_obj_callbacks bl obj_sync_something @@ -216133,7 +216133,7 @@ _080780F6: thumb_func_end sub_8077B74 thumb_func_start sub_807811C -sub_807811C: @ 807811C +sub_807811C: ; 807811C push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -216143,7 +216143,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 @@ -216155,7 +216155,7 @@ sub_8078130: @ 8078130 lsls r0, 24 lsrs r0, 24 cmp r0, 0xF - bls _08078160 + bls @08078160 movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -216167,7 +216167,7 @@ sub_8078130: @ 8078130 adds r0, 0x6F movs r1, 0xA strb r1, [r0] -_08078160: +@08078160: add sp, 0x4 pop {r4} pop {r0} @@ -216177,14 +216177,14 @@ _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] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080781C2 + bne @080781C2 ldr r1, =0x02032298 ldr r4, =0x0203229c ldr r2, [r4] @@ -216199,29 +216199,29 @@ sub_807816C: @ 807816C ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _080781B4 + beq @080781B4 adds r1, r2, 0 adds r1, 0x6F movs r0, 0x10 strb r0, [r1] - b _080781C2 + b @080781C2 .align 2, 0 .pool -_080781B4: +@080781B4: movs r0, 0x20 bl sub_800ABF4 ldr r0, [r4] adds r0, 0x6F movs r1, 0xD strb r1, [r0] -_080781C2: +@080781C2: pop {r4} pop {r0} bx r0 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 + 1 @@ -216229,11 +216229,11 @@ sub_80781C8: @ 80781C8 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _08078220 + beq @08078220 bl sub_8010500 lsls r0, 24 cmp r0, 0 - beq _08078244 + beq @08078244 ldr r0, =0x02032184 ldr r0, [r0] bl free @@ -216246,14 +216246,14 @@ sub_80781C8: @ 80781C8 bl sub_800E084 ldr r0, =sub_807AE50 + 1 bl set_callback2 - b _08078244 + b @08078244 .align 2, 0 .pool -_08078220: +@08078220: ldr r0, =0x03003124 ldrb r4, [r0] cmp r4, 0 - bne _08078244 + bne @08078244 ldr r0, =0x02032184 ldr r0, [r0] bl free @@ -216264,7 +216264,7 @@ _08078220: str r4, [r5] ldr r0, =sub_807AE50 + 1 bl set_callback2 -_08078244: +@08078244: pop {r4,r5} pop {r0} bx r0 @@ -216273,7 +216273,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 @@ -216312,23 +216312,23 @@ 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 lsrs r4, r0, 24 cmp r4, 0x1 - beq _08078324 + beq @08078324 cmp r4, 0x1 - bgt _080782CE + bgt @080782CE cmp r4, 0 - beq _080782D4 - b _0807837E -_080782CE: + beq @080782D4 + b @0807837E +@080782CE: cmp r4, 0x2 - beq _0807834C - b _0807837E -_080782D4: + beq @0807834C + b @0807837E +@080782D4: ldr r0, =0x08ddb3e4 movs r1, 0 movs r2, 0x60 @@ -216355,10 +216355,10 @@ _080782D4: movs r0, 0x2 movs r3, 0 bl gpu_copy_bg_tile_map_to_vram - b _0807837E + b @0807837E .align 2, 0 .pool -_08078324: +@08078324: ldr r1, =0x0832d2bc movs r2, 0x80 lsls r2, 4 @@ -216371,14 +216371,14 @@ _08078324: bl sub_8079E44 movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram - b _0807837E + b @0807837E .align 2, 0 .pool -_0807834C: +@0807834C: movs r5, 0x80 lsls r5, 21 movs r4, 0x3 -_08078352: +@08078352: lsrs r0, r5, 24 movs r1, 0 bl lcd_io_set @@ -216387,7 +216387,7 @@ _08078352: adds r5, r0 subs r4, 0x1 cmp r4, 0 - bge _08078352 + bge @08078352 movs r0, 0 bl gpu_sync_bg_show movs r0, 0x1 @@ -216396,7 +216396,7 @@ _08078352: bl gpu_sync_bg_show movs r0, 0x3 bl gpu_sync_bg_show -_0807837E: +@0807837E: add sp, 0xC pop {r4,r5} pop {r0} @@ -216404,7 +216404,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 @@ -216420,14 +216420,14 @@ sub_8078388: @ 8078388 movs r4, 0x6 movs r7, 0x1 movs r6, 0 -_080783A6: +@080783A6: mov r1, r8 ldr r0, [r1] adds r1, r0, 0 adds r1, 0x36 ldrb r1, [r1] cmp r3, r1 - bge _080783E0 + bge @080783E0 adds r0, 0x28 adds r0, r3 ldrb r0, [r0] @@ -216444,21 +216444,21 @@ _080783A6: adds r0, 0x38 adds r0, r3 strb r7, [r0] - b _080783E6 + b @080783E6 .align 2, 0 .pool -_080783E0: +@080783E0: adds r0, 0x38 adds r0, r3 strb r6, [r0] -_080783E6: +@080783E6: mov r1, r8 ldr r0, [r1] adds r1, r0, 0 adds r1, 0x37 ldrb r1, [r1] cmp r3, r1 - bge _08078416 + bge @08078416 adds r0, 0x2E adds r0, r3 ldrb r0, [r0] @@ -216475,16 +216475,16 @@ _080783E6: adds r0, 0x38 adds r0, r4 strb r7, [r0] - b _0807841C -_08078416: + b @0807841C +@08078416: adds r0, 0x38 adds r0, r4 strb r6, [r0] -_0807841C: +@0807841C: adds r4, 0x1 adds r3, 0x1 cmp r3, 0x5 - ble _080783A6 + ble @080783A6 ldr r0, [r5] adds r0, 0x44 movs r1, 0x1 @@ -216498,29 +216498,29 @@ _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 movs r3, 0 cmp r3, r2 - bcs _08078452 -_08078444: + bcs @08078452 +@08078444: adds r0, r5, r3 adds r1, r4, r3 ldrb r1, [r1] strb r1, [r0] adds r3, 0x1 cmp r3, r2 - bcc _08078444 -_08078452: + bcc @08078444 +@08078452: pop {r4,r5} pop {r0} bx r0 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 @@ -216531,41 +216531,41 @@ shedinja_maker_maybe: @ 8078458 adds r0, 0x69 ldrb r0, [r0] cmp r0, 0x15 - bls _08078472 - b _080787AA -_08078472: + bls @08078472 + b @080787AA +@08078472: lsls r0, 2 - ldr r1, =_08078484 + ldr r1, =@08078484 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08078484: - .4byte _080784DC - .4byte _08078508 - .4byte _08078784 - .4byte _08078534 - .4byte _08078548 - .4byte _0807857C - .4byte _08078784 - .4byte _08078598 - .4byte _080785AC - .4byte _080785E0 - .4byte _08078784 - .4byte _080785FC - .4byte _08078610 - .4byte _08078644 - .4byte _08078784 - .4byte _0807866C - .4byte _08078680 - .4byte _080786B4 - .4byte _08078784 - .4byte _080786DC - .4byte _080786F0 - .4byte _08078720 -_080784DC: +@08078484: + .4byte @080784DC + .4byte @08078508 + .4byte @08078784 + .4byte @08078534 + .4byte @08078548 + .4byte @0807857C + .4byte @08078784 + .4byte @08078598 + .4byte @080785AC + .4byte @080785E0 + .4byte @08078784 + .4byte @080785FC + .4byte @08078610 + .4byte @08078644 + .4byte @08078784 + .4byte @0807866C + .4byte @08078680 + .4byte @080786B4 + .4byte @08078784 + .4byte @080786DC + .4byte @080786F0 + .4byte @08078720 +@080784DC: ldr r0, =0x020228c4 ldr r1, =0x020244ec movs r2, 0xC8 @@ -216580,47 +216580,47 @@ _080784DC: ldr r0, [r3] adds r0, 0xA8 strb r2, [r0] - b _080787AA + b @080787AA .align 2, 0 .pool -_08078508: +@08078508: bl sub_80771BC cmp r0, 0 - bne _08078512 - b _080787AA -_08078512: + bne @08078512 + b @080787AA +@08078512: bl sub_8077200 cmp r0, 0 - bne _08078524 + bne @08078524 ldr r0, =0x0203229c ldr r1, [r0] - b _080787A2 + b @080787A2 .align 2, 0 .pool -_08078524: +@08078524: bl sub_8077210 ldr r0, =0x0203229c ldr r1, [r0] - b _080787A2 + b @080787A2 .align 2, 0 .pool -_08078534: +@08078534: cmp r5, 0 - bne _0807853E + bne @0807853E movs r0, 0x1 bl sub_80771AC -_0807853E: +@0807853E: ldr r0, =0x0203229c ldr r1, [r0] - b _080787A2 + b @080787A2 .align 2, 0 .pool -_08078548: +@08078548: bl sub_8077200 cmp r0, 0x3 - beq _08078552 - b _080787AA -_08078552: + beq @08078552 + b @080787AA +@08078552: ldr r0, =0x02024744 movs r2, 0x1 adds r1, r5, 0 @@ -216633,36 +216633,36 @@ _08078552: bl sub_8077210 ldr r0, =0x0203229c ldr r1, [r0] - b _080787A2 + b @080787A2 .align 2, 0 .pool -_0807857C: +@0807857C: ldr r0, =0x020228c4 ldr r1, =0x020245b4 movs r2, 0xC8 bl sub_8078438 ldr r0, =0x0203229c ldr r1, [r0] - b _080787A2 + b @080787A2 .align 2, 0 .pool -_08078598: +@08078598: cmp r5, 0 - bne _080785A2 + bne @080785A2 movs r0, 0x1 bl sub_80771AC -_080785A2: +@080785A2: ldr r0, =0x0203229c ldr r1, [r0] - b _080787A2 + b @080787A2 .align 2, 0 .pool -_080785AC: +@080785AC: bl sub_8077200 cmp r0, 0x3 - beq _080785B6 - b _080787AA -_080785B6: + beq @080785B6 + b @080787AA +@080785B6: ldr r0, =0x0202480c movs r2, 0x1 adds r1, r5, 0 @@ -216675,36 +216675,36 @@ _080785B6: bl sub_8077210 ldr r0, =0x0203229c ldr r1, [r0] - b _080787A2 + b @080787A2 .align 2, 0 .pool -_080785E0: +@080785E0: ldr r0, =0x020228c4 ldr r1, =0x0202467c movs r2, 0xC8 bl sub_8078438 ldr r0, =0x0203229c ldr r1, [r0] - b _080787A2 + b @080787A2 .align 2, 0 .pool -_080785FC: +@080785FC: cmp r5, 0 - bne _08078606 + bne @08078606 movs r0, 0x1 bl sub_80771AC -_08078606: +@08078606: ldr r0, =0x0203229c ldr r1, [r0] - b _080787A2 + b @080787A2 .align 2, 0 .pool -_08078610: +@08078610: bl sub_8077200 cmp r0, 0x3 - beq _0807861A - b _080787AA -_0807861A: + beq @0807861A + b @080787AA +@0807861A: ldr r0, =0x020248d4 movs r2, 0x1 adds r1, r5, 0 @@ -216717,10 +216717,10 @@ _0807861A: bl sub_8077210 ldr r0, =0x0203229c ldr r1, [r0] - b _080787A2 + b @080787A2 .align 2, 0 .pool -_08078644: +@08078644: ldr r0, =0x020228c4 ldr r1, =0x03005d8c ldr r1, [r1] @@ -216730,26 +216730,26 @@ _08078644: bl sub_8078438 ldr r0, =0x0203229c ldr r1, [r0] - b _080787A2 + b @080787A2 .align 2, 0 .pool -_0807866C: +@0807866C: cmp r5, 0 - bne _08078676 + bne @08078676 movs r0, 0x3 bl sub_80771AC -_08078676: +@08078676: ldr r0, =0x0203229c ldr r1, [r0] - b _080787A2 + b @080787A2 .align 2, 0 .pool -_08078680: +@08078680: bl sub_8077200 cmp r0, 0x3 - beq _0807868A - b _080787AA -_0807868A: + beq @0807868A + b @080787AA +@0807868A: ldr r0, =0x020321c0 movs r2, 0x1 adds r1, r5, 0 @@ -216762,10 +216762,10 @@ _0807868A: bl sub_8077210 ldr r0, =0x0203229c ldr r1, [r0] - b _080787A2 + b @080787A2 .align 2, 0 .pool -_080786B4: +@080786B4: ldr r0, =0x020228c4 ldr r1, =0x03005d8c ldr r1, [r1] @@ -216775,24 +216775,24 @@ _080786B4: bl sub_8078438 ldr r0, =0x0203229c ldr r1, [r0] - b _080787A2 + b @080787A2 .align 2, 0 .pool -_080786DC: +@080786DC: cmp r5, 0 - bne _080786E6 + bne @080786E6 movs r0, 0x4 bl sub_80771AC -_080786E6: +@080786E6: ldr r0, =0x0203229c ldr r1, [r0] - b _080787A2 + b @080787A2 .align 2, 0 .pool -_080786F0: +@080786F0: bl sub_8077200 cmp r0, 0x3 - bne _080787AA + bne @080787AA ldr r4, =0x0203229c ldr r0, [r4] adds r0, 0xA9 @@ -216806,28 +216806,28 @@ _080786F0: bl sub_8078438 bl sub_8077210 ldr r1, [r4] - b _080787A2 + b @080787A2 .align 2, 0 .pool -_08078720: +@08078720: ldr r4, =0x02024744 ldr r6, =0x0000012f movs r5, 0x5 -_08078726: +@08078726: adds r0, r4, 0 movs r1, 0xB bl pokemon_getattr lsls r0, 16 lsrs r0, 16 cmp r0, 0 - beq _08078766 + beq @08078766 cmp r0, r6 - bne _08078766 + bne @08078766 adds r0, r4, 0 movs r1, 0x3 bl pokemon_getattr cmp r0, 0x1 - beq _08078766 + beq @08078766 adds r0, r4, 0 movs r1, 0x2 mov r2, sp @@ -216836,21 +216836,21 @@ _08078726: ldr r1, =0x0832df94 bl sub_80092BC cmp r0, 0 - bne _08078766 + bne @08078766 adds r0, r4, 0 movs r1, 0x2 ldr r2, =0x083192cd bl pokemon_setattr -_08078766: +@08078766: adds r4, 0x64 subs r5, 0x1 cmp r5, 0 - bge _08078726 + bge @08078726 movs r0, 0x1 - b _080787AC + b @080787AC .align 2, 0 .pool -_08078784: +@08078784: ldr r2, =0x0203229c ldr r1, [r2] adds r1, 0xA8 @@ -216862,18 +216862,18 @@ _08078784: adds r1, 0xA8 ldrb r0, [r1] cmp r0, 0xA - bls _080787AA + bls @080787AA movs r0, 0 strb r0, [r1] ldr r1, [r2] -_080787A2: +@080787A2: adds r1, 0x69 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_080787AA: +@080787AA: movs r0, 0 -_080787AC: +@080787AC: add sp, 0xC pop {r4-r6} pop {r1} @@ -216883,7 +216883,7 @@ _080787AC: thumb_func_end shedinja_maker_maybe thumb_func_start sub_80787B8 -sub_80787B8: @ 80787B8 +sub_80787B8: ; 80787B8 push {lr} ldr r0, =0x0832dae5 ldr r1, =0x0203229c @@ -216902,7 +216902,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 @@ -216910,65 +216910,65 @@ sub_80787E0: @ 80787E0 adds r0, r4, 0 ands r0, r2 cmp r0, 0 - beq _08078864 + beq @08078864 ldr r0, =0x020223c4 ldrh r1, [r0] ldr r0, =0x0000bbbb cmp r1, r0 - beq _08078844 + beq @08078844 cmp r1, r0 - bgt _08078814 + bgt @08078814 ldr r0, =0x0000aabb cmp r1, r0 - beq _08078834 - b _0807885E + beq @08078834 + b @0807885E .align 2, 0 .pool -_08078814: +@08078814: ldr r0, =0x0000bbcc cmp r1, r0 - beq _08078854 + beq @08078854 ldr r0, =0x0000eeaa cmp r1, r0 - bne _0807885E + bne @0807885E ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x78 - b _0807885A + b @0807885A .align 2, 0 .pool -_08078834: +@08078834: ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x78 strb r2, [r0] - b _0807885E + b @0807885E .align 2, 0 .pool -_08078844: +@08078844: ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x7A strb r2, [r0] - b _0807885E + b @0807885E .align 2, 0 .pool -_08078854: +@08078854: ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x7A -_0807885A: +@0807885A: movs r1, 0x2 strb r1, [r0] -_0807885E: +@0807885E: movs r0, 0 bl sub_8077234 -_08078864: +@08078864: movs r2, 0x2 adds r0, r4, 0 ands r0, r2 cmp r0, 0 - beq _080788F6 + beq @080788F6 ldr r3, =0x020223c4 movs r1, 0x80 lsls r1, 1 @@ -216976,29 +216976,29 @@ _08078864: ldrh r1, [r0] ldr r0, =0x0000bbbb cmp r1, r0 - beq _080788D8 + beq @080788D8 cmp r1, r0 - bgt _0807889C + bgt @0807889C ldr r0, =0x0000aabb cmp r1, r0 - beq _080788BC - b _080788F0 + beq @080788BC + b @080788F0 .align 2, 0 .pool -_0807889C: +@0807889C: ldr r0, =0x0000bbcc cmp r1, r0 - beq _080788E8 + beq @080788E8 ldr r0, =0x0000eeaa cmp r1, r0 - bne _080788F0 + bne @080788F0 ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x79 - b _080788EE + b @080788EE .align 2, 0 .pool -_080788BC: +@080788BC: ldr r2, =0x0203229c ldr r1, [r2] movs r4, 0x81 @@ -217010,29 +217010,29 @@ _080788BC: strb r0, [r1] ldr r0, [r2] adds r0, 0x79 - b _080788DE + b @080788DE .align 2, 0 .pool -_080788D8: +@080788D8: ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x7B -_080788DE: +@080788DE: movs r1, 0x1 strb r1, [r0] - b _080788F0 + b @080788F0 .align 2, 0 .pool -_080788E8: +@080788E8: ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x7B -_080788EE: +@080788EE: strb r2, [r0] -_080788F0: +@080788F0: movs r0, 0x1 bl sub_8077234 -_080788F6: +@080788F6: pop {r4} pop {r0} bx r0 @@ -217041,7 +217041,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 @@ -217049,34 +217049,34 @@ sub_8078900: @ 8078900 movs r0, 0x1 ands r0, r5 cmp r0, 0 - beq _080789E2 + beq @080789E2 ldr r2, =0x020223c4 ldrh r1, [r2] ldr r0, =0x0000ddee cmp r1, r0 - beq _080789CC + beq @080789CC cmp r1, r0 - bgt _0807893C + bgt @0807893C ldr r0, =0x0000ccdd cmp r1, r0 - beq _080789AC + beq @080789AC ldr r0, =0x0000dddd cmp r1, r0 - beq _08078978 - b _080789DC + beq @08078978 + b @080789DC .align 2, 0 .pool -_0807893C: +@0807893C: ldr r0, =0x0000eebb cmp r1, r0 - beq _08078950 + beq @08078950 adds r0, 0x11 cmp r1, r0 - beq _08078974 - b _080789DC + beq @08078974 + b @080789DC .align 2, 0 .pool -_08078950: +@08078950: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -217090,13 +217090,13 @@ _08078950: ldr r0, [r0] adds r0, 0x6F movs r1, 0xB - b _080789DA + b @080789DA .align 2, 0 .pool -_08078974: +@08078974: movs r0, 0x5 - b _080789CE -_08078978: + b @080789CE +@08078978: ldr r4, =0x0203229c ldr r1, [r4] ldrb r0, [r2, 0x2] @@ -217116,10 +217116,10 @@ _08078978: ldr r0, [r4] adds r0, 0x6F movs r1, 0x7 - b _080789DA + b @080789DA .align 2, 0 .pool -_080789AC: +@080789AC: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -217131,30 +217131,30 @@ _080789AC: ldr r0, [r0] adds r0, 0x6F movs r1, 0xA - b _080789DA + b @080789DA .align 2, 0 .pool -_080789CC: +@080789CC: movs r0, 0x1 -_080789CE: +@080789CE: bl sub_807A19C ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x6F movs r1, 0x8 -_080789DA: +@080789DA: strb r1, [r0] -_080789DC: +@080789DC: movs r0, 0 bl sub_8077234 -_080789E2: +@080789E2: movs r0, 0x2 ands r0, r5 cmp r0, 0 - beq _080789F0 + beq @080789F0 movs r0, 0x1 bl sub_8077234 -_080789F0: +@080789F0: add sp, 0x4 pop {r4,r5} pop {r0} @@ -217164,7 +217164,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 @@ -217173,20 +217173,20 @@ sub_80789FC: @ 80789FC adds r1, 0x78 ldrb r0, [r1] cmp r0, 0 - bne _08078A10 - b _08078B44 -_08078A10: + bne @08078A10 + b @08078B44 +@08078A10: adds r0, r2, 0 adds r0, 0x79 ldrb r0, [r0] cmp r0, 0 - bne _08078A1C - b _08078B44 -_08078A1C: + bne @08078A1C + b @08078B44 +@08078A1C: ldrh r1, [r1] ldr r0, =0x00000101 cmp r1, r0 - bne _08078A64 + bne @08078A64 adds r1, r2, 0 adds r1, 0x6F movs r0, 0x6 @@ -217211,13 +217211,13 @@ _08078A1C: strb r4, [r2] adds r0, 0x78 strb r4, [r0] - b _08078B44 + b @08078B44 .align 2, 0 .pool -_08078A64: +@08078A64: ldr r0, =0x00000201 cmp r1, r0 - bne _08078AB4 + bne @08078AB4 movs r0, 0x1 bl sub_807A19C ldr r1, [r6] @@ -217247,14 +217247,14 @@ _08078A64: ldr r0, [r6] adds r0, 0x6F movs r1, 0x8 - b _08078B42 + b @08078B42 .align 2, 0 .pool -_08078AB4: +@08078AB4: movs r0, 0x81 lsls r0, 1 cmp r1, r0 - bne _08078B00 + bne @08078B00 movs r0, 0x5 bl sub_807A19C ldr r1, [r6] @@ -217284,13 +217284,13 @@ _08078AB4: ldr r0, [r6] adds r0, 0x6F movs r1, 0x8 - b _08078B42 + b @08078B42 .align 2, 0 .pool -_08078B00: +@08078B00: ldr r0, =0x00000202 cmp r1, r0 - bne _08078B44 + bne @08078B44 adds r1, r2, 0 adds r1, 0x80 movs r5, 0 @@ -217319,25 +217319,25 @@ _08078B00: ldr r0, [r6] adds r0, 0x6F movs r1, 0xB -_08078B42: +@08078B42: strb r1, [r0] -_08078B44: +@08078B44: ldr r5, =0x0203229c ldr r3, [r5] adds r1, r3, 0 adds r1, 0x7A ldrb r0, [r1] cmp r0, 0 - beq _08078BDC + beq @08078BDC adds r0, r3, 0 adds r0, 0x7B ldrb r0, [r0] cmp r0, 0 - beq _08078BDC + beq @08078BDC ldrh r1, [r1] ldr r0, =0x00000101 cmp r1, r0 - bne _08078B92 + bne @08078B92 adds r1, r3, 0 adds r1, 0x80 movs r4, 0 @@ -217360,19 +217360,19 @@ _08078B44: adds r0, 0x6F movs r1, 0x9 strb r1, [r0] -_08078B92: +@08078B92: ldr r1, [r5] adds r0, r1, 0 adds r0, 0x7A ldrb r0, [r0] cmp r0, 0x2 - beq _08078BA8 + beq @08078BA8 adds r0, r1, 0 adds r0, 0x7B ldrb r0, [r0] cmp r0, 0x2 - bne _08078BDC -_08078BA8: + bne @08078BDC +@08078BA8: movs r0, 0x1 bl sub_807A19C ldr r1, [r5] @@ -217397,7 +217397,7 @@ _08078BA8: adds r0, 0x6F movs r1, 0x8 strb r1, [r0] -_08078BDC: +@08078BDC: add sp, 0x4 pop {r4-r6} pop {r0} @@ -217407,7 +217407,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] @@ -217419,7 +217419,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 @@ -217439,7 +217439,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 @@ -217448,27 +217448,27 @@ sub_8078C34: @ 8078C34 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq _08078C5C + beq @08078C5C cmp r4, 0 - bne _08078C56 + bne @08078C56 movs r0, 0 bl sub_80787E0 - b _08078C5C -_08078C56: + b @08078C5C +@08078C56: adds r0, r4, 0 bl sub_8078900 -_08078C5C: +@08078C5C: cmp r4, 0 - bne _08078C64 + bne @08078C64 bl sub_80789FC -_08078C64: +@08078C64: pop {r4} pop {r0} bx r0 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 @@ -217488,22 +217488,22 @@ sub_8078C6C: @ 8078C6C adds r3, 0x38 adds r2, r1 adds r2, r4 -_08078C92: +@08078C92: ldrb r1, [r2] adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _08078CA8 + bne @08078CA8 adds r6, r1, 0 - b _08078CB0 + b @08078CB0 .align 2, 0 .pool -_08078CA8: +@08078CA8: adds r2, 0x1 adds r5, 0x1 cmp r5, 0x5 - ble _08078C92 -_08078CB0: + ble @08078C92 +@08078CB0: adds r0, r6, 0 pop {r4-r6} pop {r1} @@ -217511,7 +217511,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 @@ -217521,7 +217521,7 @@ sub_8078CB8: @ 8078CB8 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0xC - bne _08078D10 + bne @08078D10 ldr r5, =0x0203229c ldr r0, [r5] adds r0, 0x34 @@ -217549,10 +217549,10 @@ sub_8078CB8: @ 8078CB8 adds r0, r4 movs r1, 0xA0 strh r1, [r0, 0x22] - b _08078D58 + b @08078D58 .align 2, 0 .pool -_08078D10: +@08078D10: ldr r4, =0x0203229c ldr r0, [r4] adds r0, 0x34 @@ -217588,13 +217588,13 @@ _08078D10: ldrb r0, [r3] lsls r0, 3 strh r0, [r1, 0x22] -_08078D58: +@08078D58: ldrb r0, [r7] cmp r0, r6 - beq _08078D64 + beq @08078D64 movs r0, 0x5 bl audio_play -_08078D64: +@08078D64: strb r6, [r7] pop {r4-r7} pop {r0} @@ -217604,7 +217604,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 @@ -217617,28 +217617,28 @@ sub_8078D78: @ 8078D78 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08078DAC + bne @08078DAC ldr r0, =0x0000aabb ldr r1, [r4] adds r1, 0x35 ldrb r1, [r1] bl sub_8078C10 - b _08078DB4 + b @08078DB4 .align 2, 0 .pool -_08078DAC: +@08078DAC: ldr r0, [r4] adds r0, 0x78 movs r1, 0x1 strb r1, [r0] -_08078DB4: +@08078DB4: pop {r4} pop {r0} bx r0 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 @@ -217646,58 +217646,58 @@ sub_8078DBC: @ 8078DBC movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _08078DE4 + beq @08078DE4 ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x35 movs r1, 0 bl sub_8078CB8 - b _08078E30 + b @08078E30 .align 2, 0 .pool -_08078DE4: +@08078DE4: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08078E00 + beq @08078E00 ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x35 movs r1, 0x1 bl sub_8078CB8 - b _08078E30 + b @08078E30 .align 2, 0 .pool -_08078E00: +@08078E00: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _08078E1C + beq @08078E1C ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x35 movs r1, 0x2 bl sub_8078CB8 - b _08078E30 + b @08078E30 .align 2, 0 .pool -_08078E1C: +@08078E1C: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08078E30 + beq @08078E30 ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x35 movs r1, 0x3 bl sub_8078CB8 -_08078E30: +@08078E30: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08078EE4 + beq @08078EE4 movs r0, 0x5 bl audio_play ldr r4, =0x0203229c @@ -217705,7 +217705,7 @@ _08078E30: adds r0, 0x35 ldrb r0, [r0] cmp r0, 0x5 - bhi _08078E98 + bhi @08078E98 movs r0, 0x1 movs r1, 0x1 movs r2, 0xE @@ -217730,12 +217730,12 @@ _08078E30: adds r0, 0x6F movs r1, 0x1 strb r1, [r0] - b _08078EE4 + b @08078EE4 .align 2, 0 .pool -_08078E98: +@08078E98: cmp r0, 0xB - bhi _08078EB6 + bhi @08078EB6 movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -217747,10 +217747,10 @@ _08078E98: adds r0, 0x6F movs r1, 0x2 strb r1, [r0] - b _08078EE4 -_08078EB6: + b @08078EE4 +@08078EB6: cmp r0, 0xC - bne _08078EE4 + bne @08078EE4 ldr r0, =0x0832df8c movs r1, 0x1 movs r2, 0xE @@ -217770,7 +217770,7 @@ _08078EB6: adds r1, r2 movs r2, 0x18 bl sub_807A308 -_08078EE4: +@08078EE4: add sp, 0x4 pop {r4} pop {r0} @@ -217780,7 +217780,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 @@ -217819,7 +217819,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 @@ -217828,20 +217828,20 @@ sub_8078F50: @ 8078F50 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _08078F72 + beq @08078F72 cmp r0, r1 - ble _0807902A + ble @0807902A cmp r0, 0 - beq _08078F7E + beq @08078F7E cmp r0, 0x1 - beq _08078F9C - b _0807902A -_08078F72: + beq @08078F9C + b @0807902A +@08078F72: movs r0, 0x5 bl audio_play bl sub_8078EF8 - b _0807902A -_08078F7E: + b @0807902A +@08078F7E: str r0, [sp] adds r0, r1, 0 movs r1, 0 @@ -217852,10 +217852,10 @@ _08078F7E: ldr r0, [r0] adds r0, 0x6F movs r1, 0x2 - b _08079028 + b @08079028 .align 2, 0 .pool -_08078F9C: +@08078F9C: ldr r0, =0x020244ec ldr r1, =0x020244e9 ldrb r1, [r1] @@ -217865,23 +217865,23 @@ _08078F9C: ldrb r2, [r2] bl sub_807A5F4 cmp r0, 0x5 - bhi _0807902A + bhi @0807902A lsls r0, 2 - ldr r1, =_08078FCC + ldr r1, =@08078FCC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08078FCC: - .4byte _08078FE4 - .4byte _0807900C - .4byte _08079012 - .4byte _08079018 - .4byte _08079012 - .4byte _08079018 -_08078FE4: +@08078FCC: + .4byte @08078FE4 + .4byte @0807900C + .4byte @08079012 + .4byte @08079018 + .4byte @08079012 + .4byte @08079018 +@08078FE4: bl sub_8078D78 ldr r2, =0x02020630 ldr r0, =0x0203229c @@ -217896,29 +217896,29 @@ _08078FE4: ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 - b _08079028 + b @08079028 .align 2, 0 .pool -_0807900C: +@0807900C: movs r0, 0x3 movs r1, 0x3 - b _0807901C -_08079012: + b @0807901C +@08079012: movs r0, 0x3 movs r1, 0x6 - b _0807901C -_08079018: + b @0807901C +@08079018: movs r0, 0x3 movs r1, 0x7 -_0807901C: +@0807901C: bl sub_807A048 ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x6F movs r1, 0x8 -_08079028: +@08079028: strb r1, [r0] -_0807902A: +@0807902A: add sp, 0x4 pop {r0} bx r0 @@ -217927,23 +217927,23 @@ _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] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0807904A + bne @0807904A movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08079054 -_0807904A: + beq @08079054 +@0807904A: movs r0, 0x5 bl audio_play bl sub_8078EF8 -_08079054: +@08079054: pop {r0} bx r0 .align 2, 0 @@ -217951,7 +217951,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 @@ -217959,14 +217959,14 @@ sub_807905C: @ 807905C movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080790C4 + bne @080790C4 ldr r0, =0x0203229c ldr r0, [r0] adds r3, r0, 0 adds r3, 0x35 ldrb r2, [r3] cmp r2, 0x5 - bhi _080790A4 + bhi @080790A4 ldr r1, =0x020244ec ldrb r2, [r3] adds r0, 0x36 @@ -217978,10 +217978,10 @@ sub_807905C: @ 807905C str r0, [sp] movs r0, 0x1 bl sub_81BF8EC - b _080790C0 + b @080790C0 .align 2, 0 .pool -_080790A4: +@080790A4: ldr r1, =0x02024744 subs r2, 0x6 lsls r2, 24 @@ -217995,9 +217995,9 @@ _080790A4: str r0, [sp] movs r0, 0x1 bl sub_81BF8EC -_080790C0: +@080790C0: bl Window_FreeMemory -_080790C4: +@080790C4: add sp, 0x4 pop {r0} bx r0 @@ -218006,7 +218006,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 @@ -218019,20 +218019,20 @@ sub_80790D4: @ 80790D4 movs r3, 0 ldr r7, =0x02024744 cmp r5, r1 - bge _08079102 -_080790EE: + bge @08079102 +@080790EE: cmp r2, r3 - beq _080790FC + beq @080790FC adds r0, r4, r3 ldrb r0, [r0] adds r0, r5, r0 lsls r0, 24 lsrs r5, r0, 24 -_080790FC: +@080790FC: adds r3, 0x1 cmp r3, r1 - blt _080790EE -_08079102: + blt @080790EE +@08079102: adds r0, r6, 0 movs r1, 0x6 bl __umodsi3 @@ -218049,49 +218049,49 @@ _08079102: movs r0, 0xCD lsls r0, 1 cmp r4, r0 - beq _0807912C + beq @0807912C cmp r4, 0x97 - bne _08079138 -_0807912C: + bne @08079138 +@0807912C: adds r0, r7, 0 movs r1, 0x50 bl pokemon_getattr cmp r0, 0 - beq _08079158 -_08079138: + beq @08079158 +@08079138: bl sub_809D42C cmp r0, 0 - bne _08079164 + bne @08079164 ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x57 adds r0, r6 ldrb r0, [r0] cmp r0, 0 - bne _08079158 + bne @08079158 adds r0, r4, 0 bl sub_806E3F8 cmp r0, 0 - bne _08079164 -_08079158: + bne @08079164 +@08079158: movs r0, 0x2 - b _0807916C + b @0807916C .align 2, 0 .pool -_08079164: +@08079164: cmp r5, 0 - beq _0807916A + beq @0807916A movs r5, 0x1 -_0807916A: +@0807916A: adds r0, r5, 0 -_0807916C: +@0807916C: pop {r4-r7} pop {r1} bx r1 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 @@ -218102,10 +218102,10 @@ sub_8079174: @ 8079174 adds r5, r0, 0 ldrb r0, [r3] cmp r2, r0 - bge _080791A0 + bge @080791A0 adds r4, r1, 0 adds r4, 0x45 -_0807918E: +@0807918E: mov r1, sp adds r0, r1, r2 adds r1, r4, r2 @@ -218114,8 +218114,8 @@ _0807918E: adds r2, 0x1 ldrb r0, [r3] cmp r2, r0 - blt _0807918E -_080791A0: + blt @0807918E +@080791A0: ldr r0, [r5] adds r1, r0, 0 adds r1, 0x36 @@ -218130,46 +218130,46 @@ _080791A0: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080791E8 + beq @080791E8 cmp r0, 0x1 - bgt _080791D0 + bgt @080791D0 cmp r0, 0 - beq _080791D6 - b _0807920C + beq @080791D6 + b @0807920C .align 2, 0 .pool -_080791D0: +@080791D0: cmp r0, 0x2 - beq _08079200 - b _0807920C -_080791D6: + beq @08079200 + b @0807920C +@080791D6: movs r0, 0x3 movs r1, 0x3 bl sub_807A048 ldr r0, =0x0000bbcc - b _080791F2 + b @080791F2 .align 2, 0 .pool -_080791E8: +@080791E8: movs r0, 0x3 movs r1, 0x1 bl sub_807A048 ldr r0, =0x0000bbbb -_080791F2: +@080791F2: movs r1, 0 bl sub_8078C10 - b _0807920C + b @0807920C .align 2, 0 .pool -_08079200: +@08079200: movs r0, 0x3 movs r1, 0x8 bl sub_807A048 movs r0, 0x1 - b _0807920E -_0807920C: + b @0807920E +@0807920C: movs r0, 0 -_0807920E: +@0807920E: add sp, 0xC pop {r4,r5} pop {r1} @@ -218177,58 +218177,58 @@ _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 asrs r1, r0, 24 cmp r1, 0 - beq _0807923A + beq @0807923A cmp r1, 0 - bgt _08079234 + bgt @08079234 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _08079268 - b _08079290 -_08079234: + beq @08079268 + b @08079290 +@08079234: cmp r1, 0x1 - beq _08079268 - b _08079290 -_0807923A: + beq @08079268 + b @08079290 +@0807923A: bl sub_8079174 cmp r0, 0 - bne _08079250 + bne @08079250 ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x6F movs r1, 0x64 - b _08079258 + b @08079258 .align 2, 0 .pool -_08079250: +@08079250: ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x6F movs r1, 0x11 -_08079258: +@08079258: strb r1, [r0] movs r0, 0x11 bl Window_WriteStandardTileMap - b _08079290 + b @08079290 .align 2, 0 .pool -_08079268: +@08079268: movs r0, 0x3 movs r1, 0x1 bl sub_807A048 bl sub_80771BC cmp r0, 0 - beq _08079280 + beq @08079280 ldr r0, =0x0000bbcc movs r1, 0 bl sub_8078C10 -_08079280: +@08079280: ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x6F @@ -218236,7 +218236,7 @@ _08079280: strb r1, [r0] movs r0, 0x11 bl Window_WriteStandardTileMap -_08079290: +@08079290: pop {r0} bx r0 .align 2, 0 @@ -218244,7 +218244,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 @@ -218253,10 +218253,10 @@ sub_807929C: @ 807929C ldrb r0, [r0] subs r0, 0x4 cmp r5, r0 - bge _080792D8 + bge @080792D8 movs r6, 0xC0 lsls r6, 20 -_080792B2: +@080792B2: lsrs r4, r6, 24 adds r0, r4, 0 bl Window_WriteStandardTileMap @@ -218273,8 +218273,8 @@ _080792B2: ldrb r0, [r0] subs r0, 0x4 cmp r5, r0 - blt _080792B2 -_080792D8: + blt @080792B2 +@080792D8: pop {r4-r6} pop {r0} bx r0 @@ -218283,25 +218283,25 @@ _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 asrs r1, r0, 24 cmp r1, 0 - beq _08079306 + beq @08079306 cmp r1, 0 - bgt _08079300 + bgt @08079300 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _0807934C - b _08079356 -_08079300: + beq @0807934C + b @08079356 +@08079300: cmp r1, 0x1 - beq _0807934C - b _08079356 -_08079306: + beq @0807934C + b @08079356 +@08079306: movs r0, 0x4 bl sub_807A19C ldr r0, =0x0000eeaa @@ -218326,25 +218326,25 @@ _08079306: movs r1, 0x64 strb r1, [r0] bl sub_807929C - b _08079356 + b @08079356 .align 2, 0 .pool -_0807934C: +@0807934C: movs r0, 0x5 bl audio_play bl sub_8078EF8 -_08079356: +@08079356: pop {r0} bx r0 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 cmp r0, 0 - bne _08079384 + bne @08079384 movs r0, 0 bl rbox_fill_rectangle ldr r4, =0x0203229c @@ -218356,7 +218356,7 @@ sub_807935C: @ 807935C adds r0, 0x7E ldrb r0, [r0] bl sub_807967C -_08079384: +@08079384: ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x6F @@ -218370,7 +218370,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] @@ -218378,13 +218378,13 @@ sub_8079398: @ 8079398 ldrh r1, [r0] ldr r0, =0x00000505 cmp r1, r0 - bne _080793B4 + bne @080793B4 bl sub_80787B8 ldr r0, [r4] adds r0, 0x6F movs r1, 0xE strb r1, [r0] -_080793B4: +@080793B4: pop {r4} pop {r0} bx r0 @@ -218393,7 +218393,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] @@ -218405,7 +218405,7 @@ sub_80793C4: @ 80793C4 adds r0, 0xA8 ldrb r0, [r0] cmp r0, 0x78 - bls _080793F8 + bls @080793F8 ldr r0, =0x0832df8c movs r1, 0x1 movs r2, 0xE @@ -218419,7 +218419,7 @@ sub_80793C4: @ 80793C4 adds r0, 0x6F movs r1, 0x3 strb r1, [r0] -_080793F8: +@080793F8: pop {r4} pop {r0} bx r0 @@ -218428,14 +218428,14 @@ _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] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0807947C + beq @0807947C movs r0, 0x5 bl audio_play movs r0, 0 @@ -218445,7 +218445,7 @@ sub_8079408: @ 8079408 movs r6, 0 movs r5, 0xE0 lsls r5, 20 -_0807942E: +@0807942E: lsrs r4, r5, 24 adds r0, r4, 0 movs r1, 0 @@ -218457,7 +218457,7 @@ _0807942E: adds r5, r0 adds r6, 0x1 cmp r6, 0x3 - ble _0807942E + ble @0807942E movs r0, 0 bl sub_8079F88 movs r0, 0x1 @@ -218481,7 +218481,7 @@ _0807942E: negs r1, r1 ands r1, r2 strb r1, [r0] -_0807947C: +@0807947C: pop {r4-r6} pop {r0} bx r0 @@ -218490,32 +218490,32 @@ _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] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080794C4 + bne @080794C4 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _080794B4 + beq @080794B4 bl sub_800ADF8 - b _080794BA + b @080794BA .align 2, 0 .pool -_080794B4: +@080794B4: movs r0, 0xC bl sub_800ABF4 -_080794BA: +@080794BA: ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x6F movs r1, 0xC strb r1, [r0] -_080794C4: +@080794C4: pop {r0} bx r0 .align 2, 0 @@ -218523,18 +218523,18 @@ _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] cmp r0, 0 - beq _08079518 + beq @08079518 bl sub_80771BC cmp r0, 0 - beq _0807953A + beq @0807953A bl sub_807A09C cmp r0, 0 - bne _0807953A + bne @0807953A ldr r0, =0x02032184 ldr r0, [r0] bl free @@ -218545,14 +218545,14 @@ sub_80794CC: @ 80794CC bl sub_800E084 ldr r0, =c2_8056854 + 1 bl set_callback2 - b _0807953A + b @0807953A .align 2, 0 .pool -_08079518: +@08079518: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _0807953A + bne @0807953A ldr r0, =0x02032184 ldr r0, [r0] bl free @@ -218562,7 +218562,7 @@ _08079518: bl Window_FreeMemory ldr r0, =c2_8056854 + 1 bl set_callback2 -_0807953A: +@0807953A: pop {r0} bx r0 .align 2, 0 @@ -218570,23 +218570,23 @@ _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 lsls r0, 24 cmp r0, 0 - bne _08079574 + bne @08079574 bl sub_807A09C cmp r0, 0 - bne _08079574 + bne @08079574 bl sub_800ADF8 ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x6F movs r1, 0xD strb r1, [r0] -_08079574: +@08079574: pop {r0} bx r0 .align 2, 0 @@ -218594,14 +218594,14 @@ _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] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0807959C + beq @0807959C ldr r0, =0x0000bbcc movs r1, 0 bl sub_8078C10 @@ -218610,7 +218610,7 @@ sub_807957C: @ 807957C adds r0, 0x6F movs r1, 0x64 strb r1, [r0] -_0807959C: +@0807959C: pop {r0} bx r0 .align 2, 0 @@ -218618,98 +218618,98 @@ _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] adds r0, 0x6F ldrb r0, [r0] cmp r0, 0x11 - bhi _08079678 + bhi @08079678 lsls r0, 2 - ldr r1, =_080795CC + ldr r1, =@080795CC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080795CC: - .4byte _08079614 - .4byte _0807961A - .4byte _08079620 - .4byte _08079626 - .4byte _0807962C - .4byte _08079678 - .4byte _08079632 - .4byte _08079638 - .4byte _0807963E - .4byte _08079644 - .4byte _0807964A - .4byte _08079650 - .4byte _08079656 - .4byte _0807965C - .4byte _08079662 - .4byte _08079668 - .4byte _0807966E - .4byte _08079674 -_08079614: +@080795CC: + .4byte @08079614 + .4byte @0807961A + .4byte @08079620 + .4byte @08079626 + .4byte @0807962C + .4byte @08079678 + .4byte @08079632 + .4byte @08079638 + .4byte @0807963E + .4byte @08079644 + .4byte @0807964A + .4byte @08079650 + .4byte @08079656 + .4byte @0807965C + .4byte @08079662 + .4byte @08079668 + .4byte @0807966E + .4byte @08079674 +@08079614: bl sub_8078DBC - b _08079678 -_0807961A: + b @08079678 +@0807961A: bl sub_8078F50 - b _08079678 -_08079620: + b @08079678 +@08079620: bl sub_807905C - b _08079678 -_08079626: + b @08079678 +@08079626: bl sub_8079218 - b _08079678 -_0807962C: + b @08079678 +@0807962C: bl sub_80792E4 - b _08079678 -_08079632: + b @08079678 +@08079632: bl sub_807935C - b _08079678 -_08079638: + b @08079678 +@08079638: bl sub_8079398 - b _08079678 -_0807963E: + b @08079678 +@0807963E: bl sub_8079408 - b _08079678 -_08079644: + b @08079678 +@08079644: bl sub_8078130 - b _08079678 -_0807964A: + b @08079678 +@0807964A: bl sub_807816C - b _08079678 -_08079650: + b @08079678 +@08079650: bl sub_8079490 - b _08079678 -_08079656: + b @08079678 +@08079656: bl sub_80794CC - b _08079678 -_0807965C: + b @08079678 +@0807965C: bl sub_80781C8 - b _08079678 -_08079662: + b @08079678 +@08079662: bl sub_80793C4 - b _08079678 -_08079668: + b @08079678 +@08079668: bl sub_8079034 - b _08079678 -_0807966E: + b @08079678 +@0807966E: bl sub_8079550 - b _08079678 -_08079674: + b @08079678 +@08079674: bl sub_807957C -_08079678: +@08079678: pop {r0} bx r0 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 @@ -218724,14 +218724,14 @@ sub_807967C: @ 807967C adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0 - bne _080796A8 + bne @080796A8 movs r0, 0x1 strb r0, [r1] ldr r0, [r3] adds r0, 0x76 adds r0, r2 strb r4, [r0] -_080796A8: +@080796A8: pop {r4} pop {r0} bx r0 @@ -218740,7 +218740,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 @@ -218758,10 +218758,10 @@ sub_80796B4: @ 80796B4 movs r1, 0x1 str r1, [sp, 0x60] cmp r0, 0x5 - bhi _080796DC + bhi @080796DC movs r2, 0 str r2, [sp, 0x60] -_080796DC: +@080796DC: movs r1, 0x6 bl __umodsi3 lsls r0, 24 @@ -218774,27 +218774,27 @@ _080796DC: adds r3, r0, r7 ldrb r0, [r3] cmp r0, 0x2 - bne _080796FA - b _08079884 -_080796FA: + bne @080796FA + b @08079884 +@080796FA: cmp r0, 0x2 - bgt _08079708 + bgt @08079708 cmp r0, 0x1 - beq _08079716 - b _08079A24 + beq @08079716 + b @08079A24 .align 2, 0 .pool -_08079708: +@08079708: cmp r0, 0x3 - bne _0807970E - b _080798BC -_0807970E: + bne @0807970E + b @080798BC +@0807970E: cmp r0, 0x4 - bne _08079714 - b _080799EC -_08079714: - b _08079A24 -_08079716: + bne @08079714 + b @080799EC +@08079714: + b @08079A24 +@08079716: movs r5, 0 adds r0, r4, 0 adds r0, 0x36 @@ -218807,7 +218807,7 @@ _08079716: str r2, [sp, 0x64] ldrb r0, [r0] cmp r8, r0 - bcs _0807976A + bcs @0807976A ldr r0, =0x02020630 mov r8, r0 ldr r4, =0x0203229c @@ -218815,7 +218815,7 @@ _08079716: add r0, r9 lsls r2, r0, 1 movs r3, 0x4 -_0807973E: +@0807973E: ldr r0, [r4] adds r1, r5, r2 adds r0, 0x28 @@ -218837,13 +218837,13 @@ _0807973E: adds r0, r7 ldrb r0, [r0] cmp r5, r0 - bcc _0807973E -_0807976A: + bcc @0807973E +@0807976A: movs r5, 0 adds r0, r6, r7 lsls r0, 1 adds r4, r0, 0x2 -_08079772: +@08079772: lsls r0, r5, 24 asrs r0, 24 adds r0, r4 @@ -218854,7 +218854,7 @@ _08079772: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls _08079772 + bls @08079772 ldr r1, =0x02020630 mov r8, r1 ldr r2, =0x0203229c @@ -218959,14 +218959,14 @@ _08079772: bl gpu_copy_wram_bg_tilemap_to_vram ldr r1, [sp, 0x60] cmp r1, 0 - beq _08079868 - b _08079A24 -_08079868: + beq @08079868 + b @08079A24 +@08079868: bl sub_8079F74 - b _08079A24 + b @08079A24 .align 2, 0 .pool -_08079884: +@08079884: ldr r2, =0x02020630 ldr r1, [sp, 0x60] lsls r0, r1, 1 @@ -218985,15 +218985,15 @@ _08079884: ldr r1, [r0] ldr r0, =sub_80D3014 + 1 cmp r1, r0 - beq _080798AC - b _08079A24 -_080798AC: + beq @080798AC + b @08079A24 +@080798AC: movs r0, 0x3 strb r0, [r3] - b _08079A24 + b @08079A24 .align 2, 0 .pool -_080798BC: +@080798BC: ldr r1, =0x0832c6c0 ldr r0, [sp, 0x60] lsls r2, r0, 4 @@ -219125,10 +219125,10 @@ _080798BC: bl Window_CopyToVram ldr r0, =0x0203229c ldr r1, [r0] - b _08079A1A + b @08079A1A .align 2, 0 .pool -_080799EC: +@080799EC: ldr r0, =0x0832df99 lsls r1, r7, 1 adds r4, r1, r0 @@ -219151,13 +219151,13 @@ _080799EC: bl sub_8079C4C ldr r2, =0x0203229c ldr r1, [r2] -_08079A1A: +@08079A1A: adds r1, 0x74 adds r1, r7 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_08079A24: +@08079A24: add sp, 0x68 pop {r3-r5} mov r8, r3 @@ -219171,7 +219171,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 @@ -219179,7 +219179,7 @@ sub_8079A3C: @ 8079A3C lsls r2, 24 lsrs r2, 24 cmp r1, 0 - bne _08079A64 + bne @08079A64 movs r0, 0x64 muls r0, r2 ldr r1, =0x020244ec @@ -219187,10 +219187,10 @@ sub_8079A3C: @ 8079A3C movs r1, 0x2 mov r2, sp bl pokemon_getattr - b _08079A74 + b @08079A74 .align 2, 0 .pool -_08079A64: +@08079A64: movs r0, 0x64 muls r0, r2 ldr r1, =0x02024744 @@ -219198,7 +219198,7 @@ _08079A64: movs r1, 0x2 mov r2, sp bl pokemon_getattr -_08079A74: +@08079A74: adds r0, r4, 0 mov r1, sp bl strcpy_limit_10_chars @@ -219222,7 +219222,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 @@ -219243,7 +219243,7 @@ sub_8079AA4: @ 8079AA4 adds r1, r0 ldrb r0, [r1] cmp r0, 0 - bne _08079B5C + bne @08079B5C movs r4, 0 movs r0, 0x64 adds r5, r2, 0 @@ -219252,20 +219252,20 @@ sub_8079AA4: @ 8079AA4 mov r9, r0 ldr r2, =0x02024744 mov r8, r2 -_08079ADE: +@08079ADE: cmp r7, 0 - bne _08079AF8 + bne @08079AF8 adds r1, r4, 0 adds r1, 0xD mov r2, r9 - b _08079AFE + b @08079AFE .align 2, 0 .pool -_08079AF8: +@08079AF8: adds r1, r4, 0 adds r1, 0xD mov r2, r8 -_08079AFE: +@08079AFE: adds r0, r5, r2 movs r2, 0 bl pokemon_getattr @@ -219276,18 +219276,18 @@ _08079AFE: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x3 - bls _08079ADE + bls @08079ADE ldr r1, =0x0832dabc adds r0, r6, 0 bl gf_strcpy movs r4, 0 -_08079B20: +@08079B20: lsls r0, r4, 1 mov r2, sp adds r1, r2, r0 ldrh r0, [r1] cmp r0, 0 - beq _08079B3C + beq @08079B3C adds r1, r0, 0 movs r0, 0xD muls r1, r0 @@ -219295,7 +219295,7 @@ _08079B20: adds r1, r0 adds r0, r6, 0 bl gf_strcat -_08079B3C: +@08079B3C: adds r0, r6, 0 ldr r1, =0x0832dad2 bl gf_strcat @@ -219303,18 +219303,18 @@ _08079B3C: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x3 - bls _08079B20 - b _08079B6C + bls @08079B20 + b @08079B6C .align 2, 0 .pool -_08079B5C: +@08079B5C: ldr r1, =0x0832dabc adds r0, r6, 0 bl gf_strcpy ldr r1, =0x0832dadf adds r0, r6, 0 bl gf_strcat -_08079B6C: +@08079B6C: add sp, 0x8 pop {r3,r4} mov r8, r3 @@ -219327,7 +219327,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 @@ -219373,16 +219373,16 @@ 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 lsrs r6, r0, 24 ldr r7, =0x02024744 cmp r6, 0 - bne _08079BF0 + bne @08079BF0 ldr r7, =0x020244ec -_08079BF0: +@08079BF0: movs r4, 0 ldr r0, =0x0203229c ldr r0, [r0] @@ -219390,9 +219390,9 @@ _08079BF0: adds r0, r6 ldrb r0, [r0] cmp r4, r0 - bcs _08079C36 + bcs @08079C36 add r5, sp, 0x14 -_08079C02: +@08079C02: movs r0, 0x64 muls r0, r4 adds r0, r7, r0 @@ -219415,8 +219415,8 @@ _08079C02: adds r0, r6 ldrb r0, [r0] cmp r4, r0 - bcc _08079C02 -_08079C36: + bcc @08079C02 +@08079C36: add sp, 0x34 pop {r4-r7} pop {r0} @@ -219426,7 +219426,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 @@ -219465,18 +219465,18 @@ sub_8079C4C: @ 8079C4C bl gpu_copy_wram_bg_tilemap_to_vram mov r0, r8 cmp r0, 0 - bne _08079CB0 + bne @08079CB0 movs r0, 0x64 muls r0, r7 ldr r1, =0x020244ec - b _08079CB6 + b @08079CB6 .align 2, 0 .pool -_08079CB0: +@08079CB0: movs r0, 0x64 muls r0, r7 ldr r1, =0x02024744 -_08079CB6: +@08079CB6: adds r0, r1 movs r1, 0x38 movs r2, 0 @@ -219496,7 +219496,7 @@ _08079CB6: ldrb r0, [r0] str r2, [sp, 0x18] cmp r0, 0 - bne _08079D34 + bne @08079D34 adds r0, r6, 0 movs r1, 0xA bl __udivsi3 @@ -219505,7 +219505,7 @@ _08079CB6: mov r0, r10 lsls r3, r0, 5 cmp r2, 0 - beq _08079D08 + beq @08079D08 mov r1, r9 adds r0, r1, r3 lsls r0, 1 @@ -219516,7 +219516,7 @@ _08079CB6: adds r0, r2, 0 adds r0, 0x60 strh r0, [r1] -_08079D08: +@08079D08: ldr r4, [r4] mov r1, r9 adds r0, r1, r3 @@ -219533,10 +219533,10 @@ _08079D08: lsrs r0, 24 adds r0, 0x70 strh r0, [r4] - b _08079D72 + b @08079D72 .align 2, 0 .pool -_08079D34: +@08079D34: mov r1, r10 lsls r0, r1, 5 mov r1, r9 @@ -219568,7 +219568,7 @@ _08079D34: adds r0, r3, 0 orrs r0, r2 strh r0, [r1] -_08079D72: +@08079D72: ldr r0, =0x0203229c ldr r1, [r0] ldr r0, [sp, 0x18] @@ -219579,16 +219579,16 @@ _08079D72: adds r1, r0 ldrb r0, [r1] cmp r0, 0 - beq _08079D94 + beq @08079D94 movs r2, 0x90 lsls r2, 3 - b _08079E16 + b @08079E16 .align 2, 0 .pool -_08079D94: +@08079D94: mov r0, r8 cmp r0, 0 - bne _08079DC0 + bne @08079DC0 movs r0, 0x64 adds r4, r7, 0 muls r4, r0 @@ -219602,10 +219602,10 @@ _08079D94: movs r1, 0x2 add r2, sp, 0xC bl pokemon_getattr - b _08079DDE + b @08079DDE .align 2, 0 .pool -_08079DC0: +@08079DC0: movs r0, 0x64 adds r4, r7, 0 muls r4, r0 @@ -219619,35 +219619,35 @@ _08079DC0: movs r1, 0x2 add r2, sp, 0xC bl pokemon_getattr -_08079DDE: +@08079DDE: cmp r5, 0 - beq _08079DF0 + beq @08079DF0 cmp r5, 0xFE - beq _08079E04 + beq @08079E04 movs r2, 0x83 - b _08079E16 + b @08079E16 .align 2, 0 .pool -_08079DF0: +@08079DF0: add r0, sp, 0xC movs r1, 0 bl sub_8070ECC lsls r0, 24 movs r2, 0x83 cmp r0, 0 - bne _08079E16 + bne @08079E16 movs r2, 0x84 - b _08079E16 -_08079E04: + b @08079E16 +@08079E04: add r0, sp, 0xC movs r1, 0xFE bl sub_8070ECC lsls r0, 24 movs r2, 0x83 cmp r0, 0 - bne _08079E16 + bne @08079E16 movs r2, 0x85 -_08079E16: +@08079E16: ldr r0, =0x0203229c ldr r1, [r0] mov r0, r10 @@ -219674,7 +219674,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 @@ -219686,7 +219686,7 @@ sub_8079E44: @ 8079E44 adds r0, r6 ldrb r0, [r0] cmp r7, r0 - bge _08079E94 + bge @08079E94 lsls r0, r6, 1 adds r0, r6 ldr r1, =0x0832de3e @@ -219694,7 +219694,7 @@ sub_8079E44: @ 8079E44 adds r5, r0, r1 ldr r1, =0x0832de56 adds r4, r0, r1 -_08079E6A: +@08079E6A: lsls r1, r7, 24 lsrs r1, 24 ldrb r2, [r5] @@ -219714,8 +219714,8 @@ _08079E6A: adds r0, r6 ldrb r0, [r0] cmp r7, r0 - blt _08079E6A -_08079E94: + blt @08079E6A +@08079E94: add sp, 0x8 pop {r4-r7} pop {r0} @@ -219725,7 +219725,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 @@ -219741,7 +219741,7 @@ sub_8079EA8: @ 8079EA8 add r0, r12 ldrb r0, [r0] cmp r7, r0 - bge _08079F5A + bge @08079F5A ldr r6, =0x02020630 mov r9, r3 mov r1, r12 @@ -219754,7 +219754,7 @@ sub_8079EA8: @ 8079EA8 mov r8, r2 lsls r0, 2 adds r5, r0, r1 -_08079EE0: +@08079EE0: mov r1, r9 ldr r0, [r1] mov r2, r10 @@ -219815,8 +219815,8 @@ _08079EE0: add r3, r12 ldrb r3, [r3] cmp r7, r3 - blt _08079EE0 -_08079F5A: + blt @08079EE0 +@08079F5A: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -219829,7 +219829,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 @@ -219840,7 +219840,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 @@ -219892,7 +219892,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 @@ -219912,7 +219912,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 @@ -219932,7 +219932,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 @@ -219943,7 +219943,7 @@ sub_807A048: @ 807A048 mov r12, r4 movs r7, 0x8D lsls r7, 4 -_0807A05C: +@0807A05C: mov r1, r12 ldr r0, [r1] lsls r1, r3, 3 @@ -219951,7 +219951,7 @@ _0807A05C: adds r0, r2, r7 ldrb r0, [r0] cmp r0, 0 - bne _0807A090 + bne @0807A090 ldr r3, =0x000008d2 adds r0, r2, r3 strh r5, [r0] @@ -219965,21 +219965,21 @@ _0807A05C: adds r0, r1 movs r1, 0x1 strb r1, [r0] - b _0807A096 + b @0807A096 .align 2, 0 .pool -_0807A090: +@0807A090: adds r3, 0x1 cmp r3, 0x3 - ble _0807A05C -_0807A096: + ble @0807A05C +@0807A096: pop {r4-r7} pop {r0} bx r0 thumb_func_end sub_807A048 thumb_func_start sub_807A09C -sub_807A09C: @ 807A09C +sub_807A09C: ; 807A09C push {lr} movs r3, 0 ldr r0, =0x0203229c @@ -219988,13 +219988,13 @@ sub_807A09C: @ 807A09C lsls r2, 4 adds r1, r0, r2 movs r2, 0x3 -_0807A0AC: +@0807A0AC: ldrb r0, [r1] adds r3, r0 adds r1, 0x8 subs r2, 0x1 cmp r2, 0 - bge _0807A0AC + bge @0807A0AC adds r0, r3, 0 pop {r1} bx r1 @@ -220003,11 +220003,11 @@ _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 -_0807A0CA: +@0807A0CA: ldr r0, [r3] lsls r1, r4, 3 adds r2, r0, r1 @@ -220017,74 +220017,74 @@ _0807A0CA: ldrb r0, [r0] adds r5, r1, 0 cmp r0, 0 - beq _0807A18C + beq @0807A18C ldr r0, =0x000008d2 adds r1, r2, r0 ldrh r0, [r1] cmp r0, 0 - beq _0807A0F8 + beq @0807A0F8 subs r0, 0x1 strh r0, [r1] - b _0807A18C + b @0807A18C .align 2, 0 .pool -_0807A0F8: +@0807A0F8: ldr r1, =0x000008d4 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x8 - bhi _0807A17A + bhi @0807A17A lsls r0, 2 - ldr r1, =_0807A114 + ldr r1, =@0807A114 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0807A114: - .4byte _0807A138 - .4byte _0807A14C - .4byte _0807A154 - .4byte _0807A15C - .4byte _0807A15C - .4byte _0807A15C - .4byte _0807A164 - .4byte _0807A16C - .4byte _0807A174 -_0807A138: +@0807A114: + .4byte @0807A138 + .4byte @0807A14C + .4byte @0807A154 + .4byte @0807A15C + .4byte @0807A15C + .4byte @0807A15C + .4byte @0807A164 + .4byte @0807A16C + .4byte @0807A174 +@0807A138: ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x80 movs r1, 0x14 bl sub_8077170 - b _0807A17A + b @0807A17A .align 2, 0 .pool -_0807A14C: +@0807A14C: movs r0, 0 bl sub_807A19C - b _0807A17A -_0807A154: + b @0807A17A +@0807A154: movs r0, 0x2 bl sub_807A19C - b _0807A17A -_0807A15C: + b @0807A17A +@0807A15C: movs r0, 0x3 bl sub_807A19C - b _0807A17A -_0807A164: + b @0807A17A +@0807A164: movs r0, 0x6 bl sub_807A19C - b _0807A17A -_0807A16C: + b @0807A17A +@0807A16C: movs r0, 0x7 bl sub_807A19C - b _0807A17A -_0807A174: + b @0807A17A +@0807A174: movs r0, 0x8 bl sub_807A19C -_0807A17A: +@0807A17A: ldr r0, =0x0203229c ldr r1, [r0] adds r1, r5 @@ -220094,10 +220094,10 @@ _0807A17A: movs r2, 0 strb r2, [r1] adds r3, r0, 0 -_0807A18C: +@0807A18C: adds r4, 0x1 cmp r4, 0x3 - ble _0807A0CA + ble @0807A0CA pop {r4,r5} pop {r0} bx r0 @@ -220106,7 +220106,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 @@ -220146,7 +220146,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 @@ -220156,7 +220156,7 @@ sub_807A1F0: @ 807A1F0 ldrb r1, [r3] adds r4, r0, 0 cmp r1, 0xD - bhi _0807A22C + bhi @0807A22C ldr r1, =0x02032188 ldrb r0, [r3] lsls r0, 2 @@ -220177,43 +220177,43 @@ sub_807A1F0: @ 807A1F0 ands r0, r2 orrs r0, r1 str r0, [sp, 0x4] -_0807A22C: +@0807A22C: ldr r0, [r4] adds r0, 0xA8 ldrb r0, [r0] cmp r0, 0x11 - bhi _0807A2FC + bhi @0807A2FC lsls r0, 2 - ldr r1, =_0807A254 + ldr r1, =@0807A254 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0807A254: - .4byte _0807A29C - .4byte _0807A29C - .4byte _0807A29C - .4byte _0807A29C - .4byte _0807A29C - .4byte _0807A29C - .4byte _0807A29C - .4byte _0807A29C - .4byte _0807A2A0 - .4byte _0807A2B8 - .4byte _0807A2B8 - .4byte _0807A2B8 - .4byte _0807A2B8 - .4byte _0807A2B8 - .4byte _0807A2BC - .4byte _0807A2C8 - .4byte _0807A2D4 - .4byte _0807A2F0 -_0807A29C: +@0807A254: + .4byte @0807A29C + .4byte @0807A29C + .4byte @0807A29C + .4byte @0807A29C + .4byte @0807A29C + .4byte @0807A29C + .4byte @0807A29C + .4byte @0807A29C + .4byte @0807A2A0 + .4byte @0807A2B8 + .4byte @0807A2B8 + .4byte @0807A2B8 + .4byte @0807A2B8 + .4byte @0807A2B8 + .4byte @0807A2BC + .4byte @0807A2C8 + .4byte @0807A2D4 + .4byte @0807A2F0 +@0807A29C: mov r0, sp - b _0807A2D6 -_0807A2A0: + b @0807A2D6 +@0807A2A0: mov r0, sp bl gpu_tile_obj_alloc_tag_and_copy_to_vram ldr r1, =0x0203229c @@ -220221,49 +220221,49 @@ _0807A2A0: adds r2, r1, 0 adds r2, 0x72 strh r0, [r2] - b _0807A2DE + b @0807A2DE .align 2, 0 .pool -_0807A2B8: +@0807A2B8: mov r0, sp - b _0807A2D6 -_0807A2BC: + b @0807A2D6 +@0807A2BC: ldr r0, =0x0832dce4 bl gpu_pal_obj_alloc_tag_and_apply - b _0807A2DA + b @0807A2DA .align 2, 0 .pool -_0807A2C8: +@0807A2C8: ldr r0, =0x0832dc44 bl gpu_pal_obj_alloc_tag_and_apply - b _0807A2DA + b @0807A2DA .align 2, 0 .pool -_0807A2D4: +@0807A2D4: ldr r0, =0x0832dc3c -_0807A2D6: +@0807A2D6: bl gpu_tile_obj_alloc_tag_and_copy_to_vram -_0807A2DA: +@0807A2DA: ldr r0, =0x0203229c ldr r1, [r0] -_0807A2DE: +@0807A2DE: adds r1, 0xA8 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0807A2FC + b @0807A2FC .align 2, 0 .pool -_0807A2F0: +@0807A2F0: ldr r0, [r4] adds r0, 0xA8 movs r1, 0 strb r1, [r0] movs r0, 0x1 - b _0807A2FE -_0807A2FC: + b @0807A2FE +@0807A2FC: movs r0, 0 -_0807A2FE: +@0807A2FE: add sp, 0x8 pop {r4} pop {r1} @@ -220271,7 +220271,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 @@ -220285,7 +220285,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 @@ -220294,24 +220294,24 @@ sub_807A320: @ 807A320 lsrs r0, 24 mov r8, r0 cmp r0, 0 - beq _0807A338 + beq @0807A338 cmp r0, 0x1 - beq _0807A3CC - b _0807A458 -_0807A338: + beq @0807A3CC + b @0807A458 +@0807A338: movs r7, 0 ldr r1, =0x0203229c ldr r0, [r1] adds r0, 0x36 ldrb r0, [r0] cmp r7, r0 - blt _0807A348 - b _0807A458 -_0807A348: + blt @0807A348 + b @0807A458 +@0807A348: adds r6, r1, 0 movs r5, 0 mov r9, r5 -_0807A34E: +@0807A34E: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 @@ -220322,7 +220322,7 @@ _0807A34E: bl pokemon_getattr adds r1, r0, 0 cmp r1, 0x1 - bne _0807A380 + bne @0807A380 ldr r0, [r6] adds r0, 0x45 adds r0, r5 @@ -220331,16 +220331,16 @@ _0807A34E: ldr r0, [r6] adds r0, 0x51 adds r0, r5 - b _0807A3B0 + b @0807A3B0 .align 2, 0 .pool -_0807A380: +@0807A380: adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr adds r1, r0, 0 cmp r1, 0 - bne _0807A39E + bne @0807A39E ldr r0, [r6] adds r0, 0x45 adds r0, r5 @@ -220348,8 +220348,8 @@ _0807A380: ldr r0, [r6] adds r0, 0x51 adds r0, r5 - b _0807A3B0 -_0807A39E: + b @0807A3B0 +@0807A39E: ldr r0, [r6] adds r0, 0x45 adds r0, r5 @@ -220359,7 +220359,7 @@ _0807A39E: adds r0, 0x51 adds r0, r5 mov r1, r9 -_0807A3B0: +@0807A3B0: strb r1, [r0] ldr r0, =0x0203229c adds r5, 0x1 @@ -220369,23 +220369,23 @@ _0807A3B0: add r0, r8 ldrb r0, [r0] cmp r7, r0 - blt _0807A34E - b _0807A458 + blt @0807A34E + b @0807A458 .align 2, 0 .pool -_0807A3CC: +@0807A3CC: movs r7, 0 ldr r1, =0x0203229c ldr r0, [r1] adds r0, 0x37 ldrb r0, [r0] cmp r7, r0 - bge _0807A458 + bge @0807A458 adds r6, r1, 0 movs r5, 0x6 movs r2, 0 mov r9, r2 -_0807A3E2: +@0807A3E2: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 @@ -220396,7 +220396,7 @@ _0807A3E2: bl pokemon_getattr adds r1, r0, 0 cmp r1, 0x1 - bne _0807A414 + bne @0807A414 ldr r0, [r6] adds r0, 0x45 adds r0, r5 @@ -220405,16 +220405,16 @@ _0807A3E2: ldr r0, [r6] adds r0, 0x51 adds r0, r5 - b _0807A444 + b @0807A444 .align 2, 0 .pool -_0807A414: +@0807A414: adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr adds r1, r0, 0 cmp r1, 0 - bne _0807A432 + bne @0807A432 ldr r0, [r6] adds r0, 0x45 adds r0, r5 @@ -220422,8 +220422,8 @@ _0807A414: ldr r0, [r6] adds r0, 0x51 adds r0, r5 - b _0807A444 -_0807A432: + b @0807A444 +@0807A432: ldr r0, [r6] adds r0, 0x45 adds r0, r5 @@ -220433,7 +220433,7 @@ _0807A432: adds r0, 0x51 adds r0, r5 mov r1, r9 -_0807A444: +@0807A444: strb r1, [r0] ldr r0, =0x0203229c adds r5, 0x1 @@ -220443,8 +220443,8 @@ _0807A444: add r0, r8 ldrb r0, [r0] cmp r7, r0 - blt _0807A3E2 -_0807A458: + blt @0807A3E2 +@0807A458: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -220456,25 +220456,25 @@ _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 cmp r0, 0 - beq _0807A478 + beq @0807A478 cmp r0, 0x1 - beq _0807A4D8 - b _0807A52C -_0807A478: + beq @0807A4D8 + b @0807A52C +@0807A478: movs r6, 0 ldr r1, =0x0203229c ldr r0, [r1] adds r0, 0x36 ldrb r0, [r0] cmp r6, r0 - bcs _0807A52C + bcs @0807A52C adds r7, r1, 0 -_0807A488: +@0807A488: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 @@ -220505,20 +220505,20 @@ _0807A488: adds r0, 0x36 ldrb r0, [r0] cmp r6, r0 - bcc _0807A488 - b _0807A52C + bcc @0807A488 + b @0807A52C .align 2, 0 .pool -_0807A4D8: +@0807A4D8: movs r6, 0 ldr r1, =0x0203229c ldr r0, [r1] adds r0, 0x37 ldrb r0, [r0] cmp r6, r0 - bcs _0807A52C + bcs @0807A52C adds r7, r1, 0 -_0807A4E8: +@0807A4E8: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 @@ -220549,8 +220549,8 @@ _0807A4E8: adds r0, 0x37 ldrb r0, [r0] cmp r6, r0 - bcc _0807A4E8 -_0807A52C: + bcc @0807A4E8 +@0807A52C: pop {r4-r7} pop {r0} bx r0 @@ -220559,12 +220559,12 @@ _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} movs r5, 0 -_0807A544: +@0807A544: movs r4, 0 ldr r2, =0x0203229c ldr r0, [r2] @@ -220574,12 +220574,12 @@ _0807A544: mov r8, r1 ldrb r0, [r0] cmp r4, r0 - bge _0807A596 + bge @0807A596 adds r6, r2, 0 lsls r0, r5, 1 adds r0, r5 lsls r7, r0, 1 -_0807A560: +@0807A560: ldr r2, [r6] adds r3, r4, r7 adds r0, r2, 0 @@ -220605,11 +220605,11 @@ _0807A560: adds r0, r5 ldrb r0, [r0] cmp r4, r0 - blt _0807A560 -_0807A596: + blt @0807A560 +@0807A596: mov r5, r8 cmp r5, 0x1 - ble _0807A544 + ble @0807A544 pop {r3} mov r8, r3 pop {r4-r7} @@ -220620,18 +220620,18 @@ _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 ldr r4, =0x000031a8 -_0807A5B8: +@0807A5B8: ldr r0, [r5] adds r0, r4 adds r2, r0, r3 ldrb r0, [r2] cmp r0, 0 - bne _0807A5DA + bne @0807A5DA ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0xA9 @@ -220639,14 +220639,14 @@ _0807A5B8: ldrb r0, [r0] adds r1, r0, 0 cmp r1, 0 - beq _0807A5DA + beq @0807A5DA cmp r1, 0x3F - bhi _0807A5DA + bhi @0807A5DA strb r0, [r2] -_0807A5DA: +@0807A5DA: adds r3, 0x1 cmp r3, 0xA - ble _0807A5B8 + ble @0807A5B8 pop {r4,r5} pop {r0} bx r0 @@ -220655,7 +220655,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 @@ -220666,9 +220666,9 @@ sub_807A5F4: @ 807A5F4 mov r9, r2 movs r5, 0 cmp r5, r7 - bge _0807A62E + bge @0807A62E mov r6, sp -_0807A60C: +@0807A60C: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -220683,31 +220683,31 @@ _0807A60C: stm r6!, {r0} adds r5, 0x1 cmp r5, r7 - blt _0807A60C -_0807A62E: + blt @0807A60C +@0807A62E: bl sub_809D42C mov r1, r9 lsls r4, r1, 2 cmp r0, 0 - bne _0807A65C + bne @0807A65C add r0, sp, 0x18 adds r0, r4 ldr r1, [r0] movs r0, 0xCE lsls r0, 1 cmp r1, r0 - bne _0807A64C + bne @0807A64C movs r0, 0x3 - b _0807A718 -_0807A64C: + b @0807A718 +@0807A64C: lsls r0, r1, 16 lsrs r0, 16 bl sub_806E3F8 cmp r0, 0 - bne _0807A65C + bne @0807A65C movs r0, 0x2 - b _0807A718 -_0807A65C: + b @0807A718 +@0807A65C: bl link_get_multiplayer_id movs r1, 0x1 eors r0, r1 @@ -220723,40 +220723,40 @@ _0807A65C: lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bls _0807A6AC + bls @0807A6AC ldrb r1, [r1, 0x12] movs r0, 0xF ands r0, r1 cmp r0, 0 - bne _0807A6AC + bne @0807A6AC add r0, sp, 0x18 adds r0, r4 ldr r1, [r0] movs r0, 0xCE lsls r0, 1 cmp r1, r0 - bne _0807A6A0 + bne @0807A6A0 movs r0, 0x5 - b _0807A718 + b @0807A718 .align 2, 0 .pool -_0807A6A0: +@0807A6A0: lsls r0, r1, 16 lsrs r0, 16 bl sub_806E3F8 cmp r0, 0 - beq _0807A6D2 -_0807A6AC: + beq @0807A6D2 +@0807A6AC: mov r1, sp adds r0, r1, r4 ldr r1, [r0] movs r0, 0xCD lsls r0, 1 cmp r1, r0 - beq _0807A6BE + beq @0807A6BE cmp r1, 0x97 - bne _0807A6D6 -_0807A6BE: + bne @0807A6D6 +@0807A6BE: movs r0, 0x64 mov r1, r9 muls r1, r0 @@ -220765,52 +220765,52 @@ _0807A6BE: movs r1, 0x50 bl pokemon_getattr cmp r0, 0 - bne _0807A6D6 -_0807A6D2: + bne @0807A6D6 +@0807A6D2: movs r0, 0x4 - b _0807A718 -_0807A6D6: + b @0807A718 +@0807A6D6: cmp r7, 0 - ble _0807A6F4 + ble @0807A6F4 movs r3, 0xCE lsls r3, 1 movs r2, 0 add r1, sp, 0x18 adds r5, r7, 0 -_0807A6E4: +@0807A6E4: ldr r0, [r1] cmp r0, r3 - bne _0807A6EC + bne @0807A6EC str r2, [r1] -_0807A6EC: +@0807A6EC: adds r1, 0x4 subs r5, 0x1 cmp r5, 0 - bne _0807A6E4 -_0807A6F4: + bne @0807A6E4 +@0807A6F4: movs r2, 0 movs r5, 0 cmp r2, r7 - bge _0807A70E + bge @0807A70E add r1, sp, 0x18 -_0807A6FE: +@0807A6FE: cmp r5, r9 - beq _0807A706 + beq @0807A706 ldr r0, [r1] adds r2, r0 -_0807A706: +@0807A706: adds r1, 0x4 adds r5, 0x1 cmp r5, r7 - blt _0807A6FE -_0807A70E: + blt @0807A6FE +@0807A70E: cmp r2, 0 - bne _0807A716 + bne @0807A716 movs r0, 0x1 - b _0807A718 -_0807A716: + b @0807A718 +@0807A716: movs r0, 0 -_0807A718: +@0807A718: add sp, 0x30 pop {r3,r4} mov r8, r3 @@ -220821,12 +220821,12 @@ _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] cmp r0, 0 - beq _0807A7B4 + beq @0807A7B4 movs r4, 0 bl link_get_multiplayer_id ldr r5, =0x020229e8 @@ -220843,16 +220843,16 @@ sub_807A728: @ 807A728 lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - bls _0807A7B4 + bls @0807A7B4 subs r0, r1, 0x4 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bhi _0807A762 + bhi @0807A762 movs r4, 0x2 -_0807A762: +@0807A762: cmp r4, 0 - ble _0807A7B4 + ble @0807A7B4 bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 @@ -220865,9 +220865,9 @@ _0807A762: adds r0, r6, 0 ands r0, r1 cmp r0, 0 - beq _0807A7B0 + beq @0807A7B0 cmp r4, 0x2 - bne _0807A7B4 + bne @0807A7B4 bl link_get_multiplayer_id eors r0, r7 lsls r0, 24 @@ -220880,24 +220880,24 @@ _0807A762: adds r0, r6, 0 ands r0, r1 cmp r0, 0 - bne _0807A7B4 + bne @0807A7B4 movs r0, 0x2 - b _0807A7B6 + b @0807A7B6 .align 2, 0 .pool -_0807A7B0: +@0807A7B0: movs r0, 0x1 - b _0807A7B6 -_0807A7B4: + b @0807A7B6 +@0807A7B4: movs r0, 0 -_0807A7B6: +@0807A7B6: pop {r4-r7} pop {r1} bx r1 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 @@ -220906,23 +220906,23 @@ sub_807A7BC: @ 807A7BC movs r0, 0xCD lsls r0, 1 cmp r2, r0 - beq _0807A7D2 + beq @0807A7D2 cmp r2, 0x97 - bne _0807A7DA -_0807A7D2: + bne @0807A7DA +@0807A7D2: cmp r1, 0 - bne _0807A7DA + bne @0807A7DA movs r0, 0x1 - b _0807A7DC -_0807A7DA: + b @0807A7DC +@0807A7DA: movs r0, 0 -_0807A7DC: +@0807A7DC: pop {r1} bx r1 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 @@ -220955,31 +220955,31 @@ sub_807A7E0: @ 807A7E0 lsls r1, 18 lsrs r1, 28 cmp r1, 0x3 - beq _0807A832 + beq @0807A832 cmp r2, 0 - bne _0807A82A + bne @0807A82A movs r0, 0x8 - b _0807A8C0 -_0807A82A: + b @0807A8C0 +@0807A82A: cmp r0, 0 - bne _0807A832 + bne @0807A832 movs r0, 0x9 - b _0807A8C0 -_0807A832: + b @0807A8C0 +@0807A832: adds r0, r5, 0 adds r1, r6, 0 bl sub_807A7BC cmp r0, 0 - bne _0807A898 + bne @0807A898 movs r0, 0xCE lsls r0, 1 cmp r8, r0 - bne _0807A84E + bne @0807A84E cmp r7, r8 - beq _0807A86C + beq @0807A86C movs r0, 0x2 - b _0807A8C0 -_0807A84E: + b @0807A8C0 +@0807A84E: ldr r0, =0x083203cc lsls r1, r7, 3 subs r1, r7 @@ -220987,61 +220987,61 @@ _0807A84E: adds r1, r0 ldrb r0, [r1, 0x6] cmp r0, r4 - beq _0807A86C + beq @0807A86C ldrb r0, [r1, 0x7] cmp r0, r4 - beq _0807A86C + beq @0807A86C movs r0, 0x1 - b _0807A8C0 + b @0807A8C0 .align 2, 0 .pool -_0807A86C: +@0807A86C: movs r0, 0xCE lsls r0, 1 cmp r7, r0 - bne _0807A87C + bne @0807A87C cmp r7, r8 - beq _0807A87C + beq @0807A87C movs r0, 0x3 - b _0807A8C0 -_0807A87C: + b @0807A8C0 +@0807A87C: mov r0, r9 cmp r0, 0 - bne _0807A8AA + bne @0807A8AA movs r0, 0xCE lsls r0, 1 cmp r7, r0 - bne _0807A88E + bne @0807A88E movs r0, 0x6 - b _0807A8C0 -_0807A88E: + b @0807A8C0 +@0807A88E: adds r0, r7, 0 bl sub_806E3F8 cmp r0, 0 - bne _0807A89C -_0807A898: + bne @0807A89C +@0807A898: movs r0, 0x4 - b _0807A8C0 -_0807A89C: + b @0807A8C0 +@0807A89C: mov r0, r8 bl sub_806E3F8 cmp r0, 0 - bne _0807A8AA + bne @0807A8AA movs r0, 0x5 - b _0807A8C0 -_0807A8AA: + b @0807A8C0 +@0807A8AA: mov r0, r10 cmp r0, 0 - bne _0807A8BE + bne @0807A8BE adds r0, r7, 0 bl sub_806E3F8 cmp r0, 0 - bne _0807A8BE + bne @0807A8BE movs r0, 0x7 - b _0807A8C0 -_0807A8BE: + b @0807A8C0 +@0807A8BE: movs r0, 0 -_0807A8C0: +@0807A8C0: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -221052,7 +221052,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 @@ -221067,33 +221067,33 @@ sub_807A8D0: @ 807A8D0 adds r1, r3, 0 bl sub_807A7BC cmp r0, 0 - bne _0807A90A + bne @0807A90A cmp r4, 0 - bne _0807A90E + bne @0807A90E movs r0, 0xCE lsls r0, 1 cmp r5, r0 - bne _0807A900 + bne @0807A900 movs r0, 0x2 - b _0807A910 -_0807A900: + b @0807A910 +@0807A900: adds r0, r6, 0 bl sub_806E3F8 cmp r0, 0 - bne _0807A90E -_0807A90A: + bne @0807A90E +@0807A90A: movs r0, 0x1 - b _0807A910 -_0807A90E: + b @0807A910 +@0807A90E: movs r0, 0 -_0807A910: +@0807A910: pop {r4-r6} pop {r1} bx r1 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} @@ -221106,9 +221106,9 @@ sub_807A918: @ 807A918 ldr r0, =0x020244e9 ldrb r0, [r0] cmp r5, r0 - bge _0807A95A + bge @0807A95A mov r4, sp -_0807A934: +@0807A934: movs r0, 0x64 muls r0, r5 adds r0, r6, r0 @@ -221118,74 +221118,74 @@ _0807A934: movs r1, 0xCE lsls r1, 1 cmp r0, r1 - bne _0807A94E + bne @0807A94E movs r0, 0 str r0, [r4] -_0807A94E: +@0807A94E: adds r4, 0x4 adds r5, 0x1 ldr r0, =0x020244e9 ldrb r0, [r0] cmp r5, r0 - blt _0807A934 -_0807A95A: + blt @0807A934 +@0807A95A: movs r7, 0 movs r6, 0x1 movs r5, 0 ldr r4, =0x020229e8 - b _0807A980 + b @0807A980 .align 2, 0 .pool -_0807A96C: +@0807A96C: ldrb r0, [r4] subs r0, 0x4 cmp r0, 0x1 - bhi _0807A978 + bhi @0807A978 movs r7, 0 - b _0807A97C -_0807A978: + b @0807A97C +@0807A978: movs r0, 0x1 orrs r7, r0 -_0807A97C: +@0807A97C: adds r4, 0x1C adds r5, 0x1 -_0807A980: +@0807A980: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r5, r0 - blt _0807A96C + blt @0807A96C movs r5, 0 movs r4, 0 - b _0807A9B4 -_0807A992: + b @0807A9B4 +@0807A992: ldr r0, =0x020229e8 adds r2, r4, r0 ldrb r1, [r2, 0x10] movs r0, 0xF ands r0, r1 cmp r0, 0 - bne _0807A9A2 + bne @0807A9A2 movs r6, 0 -_0807A9A2: +@0807A9A2: cmp r7, 0 - beq _0807A9B0 + beq @0807A9B0 ldrb r0, [r2, 0x10] lsrs r0, 4 cmp r0, 0 - beq _0807A9B0 + beq @0807A9B0 movs r6, 0 -_0807A9B0: +@0807A9B0: adds r4, 0x1C adds r5, 0x1 -_0807A9B4: +@0807A9B4: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r5, r0 - blt _0807A992 + blt @0807A992 cmp r6, 0 - bne _0807A9EA + bne @0807A9EA mov r1, r8 lsls r0, r1, 2 mov r1, sp @@ -221193,46 +221193,46 @@ _0807A9B4: ldrh r0, [r4] bl sub_806E3F8 cmp r0, 0 - bne _0807A9E0 + bne @0807A9E0 movs r0, 0x2 - b _0807AA1A + b @0807AA1A .align 2, 0 .pool -_0807A9E0: +@0807A9E0: ldr r0, [r4] cmp r0, 0 - bne _0807A9EA + bne @0807A9EA movs r0, 0x3 - b _0807AA1A -_0807A9EA: + b @0807AA1A +@0807A9EA: movs r2, 0 movs r5, 0 ldr r0, =0x020244e9 ldrb r0, [r0] cmp r2, r0 - bge _0807AA0A + bge @0807AA0A adds r3, r0, 0 mov r1, sp -_0807A9FA: +@0807A9FA: cmp r8, r5 - beq _0807AA02 + beq @0807AA02 ldr r0, [r1] adds r2, r0 -_0807AA02: +@0807AA02: adds r1, 0x4 adds r5, 0x1 cmp r5, r3 - blt _0807A9FA -_0807AA0A: + blt @0807A9FA +@0807AA0A: cmp r2, 0 - beq _0807AA18 + beq @0807AA18 movs r0, 0 - b _0807AA1A + b @0807AA1A .align 2, 0 .pool -_0807AA18: +@0807AA18: movs r0, 0x1 -_0807AA1A: +@0807AA1A: add sp, 0x18 pop {r3} mov r8, r3 @@ -221242,7 +221242,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] @@ -221251,19 +221251,19 @@ sub_807AA28: @ 807AA28 lsls r0, 16 asrs r0, 16 cmp r0, 0xA - bne _0807AA44 + bne @0807AA44 movs r0, 0x17 bl audio_play movs r0, 0 strh r0, [r4, 0x2E] -_0807AA44: +@0807AA44: pop {r4} pop {r0} bx r0 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 @@ -221273,40 +221273,40 @@ sub_807AA4C: @ 807AA4C lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _0807AA76 + bne @0807AA76 ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] lsls r0, 16 asrs r0, 16 cmp r0, 0xA - bne _0807AA76 + bne @0807AA76 movs r0, 0xC2 bl audio_play strh r5, [r4, 0x2E] -_0807AA76: +@0807AA76: pop {r4,r5} pop {r0} bx r0 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 ldrsh r1, [r2, r0] cmp r1, 0 - bne _0807AAB2 + bne @0807AAB2 ldrh r0, [r2, 0x2E] adds r0, 0x1 strh r0, [r2, 0x2E] lsls r0, 16 asrs r0, 16 cmp r0, 0xC - bne _0807AA98 + bne @0807AA98 strh r1, [r2, 0x2E] -_0807AA98: +@0807AA98: movs r1, 0x2E ldrsh r0, [r2, r1] lsls r0, 1 @@ -221319,7 +221319,7 @@ _0807AA98: adds r1, 0x4 movs r2, 0x2 bl gpu_pal_apply -_0807AAB2: +@0807AAB2: pop {r0} bx r0 .align 2, 0 @@ -221327,7 +221327,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] @@ -221339,16 +221339,16 @@ sub_807AABC: @ 807AABC lsls r1, 16 asrs r1, 16 cmp r1, 0xA - bne _0807AADA + bne @0807AADA adds r0, r2, 0 bl obj_delete_and_free_tiles -_0807AADA: +@0807AADA: pop {r0} bx r0 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] @@ -221360,16 +221360,16 @@ sub_807AAE0: @ 807AAE0 lsls r1, 16 asrs r1, 16 cmp r1, 0xA - bne _0807AAFE + bne @0807AAFE adds r0, r2, 0 bl obj_delete_and_free_tiles -_0807AAFE: +@0807AAFE: pop {r0} bx r0 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] @@ -221378,19 +221378,19 @@ sub_807AB04: @ 807AB04 lsls r0, 16 asrs r0, 16 cmp r0, 0xF - bne _0807AB20 + bne @0807AB20 movs r0, 0xCC bl audio_play movs r0, 0 strh r0, [r4, 0x2E] -_0807AB20: +@0807AB20: pop {r4} pop {r0} bx r0 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 @@ -221466,7 +221466,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] @@ -221486,7 +221486,7 @@ sub_807ABCC: @ 807ABCC lsls r1, 11 ands r1, r0 cmp r1, 0 - bne _0807AC18 + bne @0807AC18 ldr r0, [r4] adds r0, 0xE4 ldrh r1, [r0] @@ -221497,19 +221497,19 @@ sub_807ABCC: @ 807ABCC ldrh r1, [r0] movs r0, 0x18 bl lcd_io_set - b _0807AC1C + b @0807AC1C .align 2, 0 .pool -_0807AC18: +@0807AC18: bl sub_807AB28 -_0807AC1C: +@0807AC1C: pop {r4} pop {r0} bx r0 thumb_func_end sub_807ABCC thumb_func_start sub_807AC24 -sub_807AC24: @ 807AC24 +sub_807AC24: ; 807AC24 push {lr} bl sub_807ABCC bl copy_super_sprites_to_oam @@ -221520,7 +221520,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] @@ -221544,7 +221544,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] @@ -221556,19 +221556,19 @@ sub_807AC64: @ 807AC64 adds r5, r0, 0 ldrb r3, [r3] cmp r1, r3 - bne _0807AC8C + bne @0807AC8C adds r1, r2, 0 adds r1, 0x8A ldrh r0, [r1] adds r0, 0x1 - b _0807AC92 + b @0807AC92 .align 2, 0 .pool -_0807AC8C: +@0807AC8C: adds r1, r2, 0 adds r1, 0x8A movs r0, 0 -_0807AC92: +@0807AC92: strh r0, [r1] adds r4, r5, 0 ldr r0, [r4] @@ -221577,7 +221577,7 @@ _0807AC92: movs r0, 0x96 lsls r0, 1 cmp r1, r0 - bls _0807ACC4 + bls @0807ACC4 bl sub_80097E8 ldr r0, =c2_800ACD4 + 1 bl set_callback2 @@ -221592,7 +221592,7 @@ _0807AC92: ldr r0, [r4] adds r0, 0x88 strb r2, [r0] -_0807ACC4: +@0807ACC4: ldr r0, [r5] adds r1, r0, 0 adds r1, 0x88 @@ -221607,27 +221607,27 @@ _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] cmp r0, 0 - bne _0807ACF0 + bne @0807ACF0 movs r0, 0 - b _0807ACF8 + b @0807ACF8 .align 2, 0 .pool -_0807ACF0: +@0807ACF0: bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 -_0807ACF8: +@0807ACF8: pop {r1} bx r1 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} @@ -221638,7 +221638,7 @@ sub_807ACFC: @ 807ACFC movs r4, 0 mov r8, r4 cmp r6, 0 - bne _0807AD22 + bne @0807AD22 ldr r0, =0x02032298 ldrb r1, [r0] movs r0, 0x64 @@ -221647,9 +221647,9 @@ sub_807ACFC: @ 807ACFC adds r1, r0 mov r8, r1 movs r4, 0x1 -_0807AD22: +@0807AD22: cmp r6, 0x1 - bne _0807AD40 + bne @0807AD40 ldr r0, =0x02032298 ldrb r0, [r0, 0x1] movs r1, 0x6 @@ -221662,15 +221662,15 @@ _0807AD22: adds r1, r0 mov r8, r1 movs r4, 0x3 -_0807AD40: +@0807AD40: cmp r5, 0 - beq _0807AD58 + beq @0807AD58 cmp r5, 0x1 - beq _0807ADE0 - b _0807AE36 + beq @0807ADE0 + b @0807AE36 .align 2, 0 .pool -_0807AD58: +@0807AD58: mov r0, r8 movs r1, 0x41 bl pokemon_getattr @@ -221681,7 +221681,7 @@ _0807AD58: bl pokemon_getattr adds r7, r0, 0 cmp r6, 0 - bne _0807AD94 + bne @0807AD94 lsls r0, r5, 3 ldr r1, =0x0830a18c adds r0, r1 @@ -221692,10 +221692,10 @@ _0807AD58: adds r3, r7, 0 bl help_system_enable_unless_flashback__sp199 movs r4, 0 - b _0807ADB2 + b @0807ADB2 .align 2, 0 .pool -_0807AD94: +@0807AD94: lsls r0, r5, 3 ldr r1, =0x0830a18c adds r0, r1 @@ -221710,7 +221710,7 @@ _0807AD94: adds r2, r5, 0 adds r3, r7, 0 bl sub_8034B50 -_0807ADB2: +@0807ADB2: mov r0, r8 bl sub_806E794 bl gpu_pal_obj_decompress_and_apply @@ -221724,10 +221724,10 @@ _0807ADB2: adds r1, 0x68 adds r1, r0 str r7, [r1] - b _0807AE36 + b @0807AE36 .align 2, 0 .pool -_0807ADE0: +@0807ADE0: mov r0, r8 bl sub_806E794 ldrh r0, [r0, 0x4] @@ -221768,7 +221768,7 @@ _0807ADE0: adds r0, r3 ldr r1, =nullsub_12 + 1 str r1, [r0] -_0807AE36: +@0807AE36: pop {r3} mov r8, r3 pop {r4-r7} @@ -221779,7 +221779,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 @@ -221789,42 +221789,42 @@ sub_807AE50: @ 807AE50 ldrb r0, [r0] adds r2, r1, 0 cmp r0, 0xC - bls _0807AE66 - b _0807B116 -_0807AE66: + bls @0807AE66 + b @0807B116 +@0807AE66: lsls r0, 2 - ldr r1, =_0807AE78 + ldr r1, =@0807AE78 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0807AE78: - .4byte _0807AEAC - .4byte _0807AF58 - .4byte _0807AF9C - .4byte _0807AFBC - .4byte _0807B006 - .4byte _0807B034 - .4byte _0807B058 - .4byte _0807B070 - .4byte _0807B07A - .4byte _0807B094 - .4byte _0807B0B0 - .4byte _0807B0D4 - .4byte _0807B0F0 -_0807AEAC: +@0807AE78: + .4byte @0807AEAC + .4byte @0807AF58 + .4byte @0807AF9C + .4byte @0807AFBC + .4byte @0807B006 + .4byte @0807B034 + .4byte @0807B058 + .4byte @0807B070 + .4byte @0807B07A + .4byte @0807B094 + .4byte @0807B0B0 + .4byte @0807B0D4 + .4byte @0807B0F0 +@0807AEAC: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _0807AEC0 + bne @0807AEC0 ldr r1, =0x020229c6 ldr r2, =0x00001144 adds r0, r2, 0 strh r0, [r1] bl sub_80097E8 -_0807AEC0: +@0807AEC0: ldr r4, =0x020322a0 movs r5, 0x80 lsls r5, 1 @@ -221879,14 +221879,14 @@ _0807AEC0: strh r5, [r0] adds r0, 0x4 strh r2, [r0] - b _0807B116 + b @0807B116 .align 2, 0 .pool -_0807AF58: +@0807AF58: ldr r0, =0x03003124 ldrb r5, [r0] cmp r5, 0 - bne _0807AF90 + bne @0807AF90 ldr r4, =0x020322a0 ldr r0, [r4] adds r0, 0xFA @@ -221902,91 +221902,91 @@ _0807AF58: strb r0, [r1] ldr r0, [r4] str r5, [r0, 0x64] - b _0807B116 + b @0807B116 .align 2, 0 .pool -_0807AF90: +@0807AF90: movs r0, 0x87 lsls r0, 3 adds r1, r2, r0 movs r0, 0x4 strb r0, [r1] - b _0807B116 -_0807AF9C: + b @0807B116 +@0807AF9C: ldr r0, =0x020322a0 ldr r1, [r0] ldr r0, [r1, 0x64] adds r0, 0x1 str r0, [r1, 0x64] cmp r0, 0x3C - bhi _0807AFAC - b _0807B116 -_0807AFAC: + bhi @0807AFAC + b @0807B116 +@0807AFAC: movs r0, 0 str r0, [r1, 0x64] movs r0, 0x87 lsls r0, 3 adds r1, r2, r0 - b _0807B0E4 + b @0807B0E4 .align 2, 0 .pool -_0807AFBC: +@0807AFBC: bl sub_800ABBC lsls r0, 24 cmp r0, 0 - bne _0807AFC8 - b _0807B0DC -_0807AFC8: + bne @0807AFC8 + b @0807B0DC +@0807AFC8: bl sub_800ABAC adds r4, r0, 0 bl sub_800AA48 lsls r4, 24 lsls r0, 24 cmp r4, r0 - bcc _0807B000 + bcc @0807B000 ldr r0, =0x020322a0 ldr r1, [r0] ldr r0, [r1, 0x64] adds r0, 0x1 str r0, [r1, 0x64] cmp r0, 0x1E - bhi _0807AFEA - b _0807B116 -_0807AFEA: + bhi @0807AFEA + b @0807B116 +@0807AFEA: bl sub_800A620 ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _0807B0E4 + b @0807B0E4 .align 2, 0 .pool -_0807B000: +@0807B000: bl sub_807AC64 - b _0807B116 -_0807B006: + b @0807B116 +@0807B006: bl sub_807AC64 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 - beq _0807B014 - b _0807B116 -_0807B014: + beq @0807B014 + b @0807B116 +@0807B014: bl sub_800A23C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0807B022 - b _0807B116 -_0807B022: + beq @0807B022 + b @0807B116 +@0807B022: ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _0807B0E4 + b @0807B0E4 .align 2, 0 .pool -_0807B034: +@0807B034: ldr r2, =0x020322a0 ldr r0, [r2] adds r0, 0x72 @@ -222000,10 +222000,10 @@ _0807B034: strb r1, [r0] movs r0, 0 bl sub_807ACFC - b _0807B0DC + b @0807B0DC .align 2, 0 .pool -_0807B058: +@0807B058: movs r0, 0 movs r1, 0x1 bl sub_807ACFC @@ -222011,15 +222011,15 @@ _0807B058: movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _0807B0E4 + b @0807B0E4 .align 2, 0 .pool -_0807B070: +@0807B070: movs r0, 0x1 movs r1, 0 bl sub_807ACFC - b _0807B0DC -_0807B07A: + b @0807B0DC +@0807B07A: movs r0, 0x1 movs r1, 0x1 bl sub_807ACFC @@ -222028,19 +222028,19 @@ _0807B07A: movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _0807B0E4 + b @0807B0E4 .align 2, 0 .pool -_0807B094: +@0807B094: bl sub_807BA94 ldr r0, =0x08338d18 bl gpu_tile_obj_alloc_tag_and_copy_to_vram ldr r0, =0x08338d20 bl gpu_pal_obj_alloc_tag_and_apply - b _0807B0DC + b @0807B0DC .align 2, 0 .pool -_0807B0B0: +@0807B0B0: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -222054,43 +222054,43 @@ _0807B0B0: movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _0807B0E4 + b @0807B0E4 .align 2, 0 .pool -_0807B0D4: +@0807B0D4: bl sub_807B140 bl sub_807BAD8 -_0807B0DC: +@0807B0DC: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 -_0807B0E4: +@0807B0E4: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0807B116 + b @0807B116 .align 2, 0 .pool -_0807B0F0: +@0807B0F0: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0807B116 + bne @0807B116 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _0807B110 + beq @0807B110 bl sub_800E0E8 movs r0, 0 movs r1, 0 bl sub_800DFB4 -_0807B110: +@0807B110: ldr r0, =sub_807EA2C + 1 bl set_callback2 -_0807B116: +@0807B116: bl run_active_tasks bl run_remoboxes bl call_obj_callbacks @@ -222105,7 +222105,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 @@ -222116,7 +222116,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 @@ -222131,7 +222131,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 @@ -222231,7 +222231,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} @@ -222242,32 +222242,32 @@ sub_807B270: @ 807B270 adds r0, r1 ldrb r0, [r0] cmp r0, 0xC - bls _0807B288 - b _0807B43E -_0807B288: + bls @0807B288 + b @0807B43E +@0807B288: lsls r0, 2 - ldr r1, =_0807B29C + ldr r1, =@0807B29C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0807B29C: - .4byte _0807B2D0 - .4byte _0807B43E - .4byte _0807B43E - .4byte _0807B43E - .4byte _0807B43E - .4byte _0807B3AC - .4byte _0807B3B6 - .4byte _0807B3C0 - .4byte _0807B3D0 - .4byte _0807B3F0 - .4byte _0807B40C - .4byte _0807B414 - .4byte _0807B438 -_0807B2D0: +@0807B29C: + .4byte @0807B2D0 + .4byte @0807B43E + .4byte @0807B43E + .4byte @0807B43E + .4byte @0807B43E + .4byte @0807B3AC + .4byte @0807B3B6 + .4byte @0807B3C0 + .4byte @0807B3D0 + .4byte @0807B3F0 + .4byte @0807B40C + .4byte @0807B414 + .4byte @0807B438 +@0807B2D0: ldr r1, =0x02032298 ldr r0, =0x020375e2 ldrh r0, [r0] @@ -222349,27 +222349,27 @@ _0807B2D0: adds r0, r1 movs r1, 0x5 strb r1, [r0] - b _0807B43E + b @0807B43E .align 2, 0 .pool -_0807B3AC: +@0807B3AC: movs r0, 0 movs r1, 0 bl sub_807ACFC - b _0807B424 -_0807B3B6: + b @0807B424 +@0807B3B6: movs r0, 0 movs r1, 0x1 bl sub_807ACFC - b _0807B424 -_0807B3C0: + b @0807B424 +@0807B3C0: movs r0, 0x1 movs r1, 0 bl sub_807ACFC movs r0, 0 bl gpu_sync_bg_show - b _0807B424 -_0807B3D0: + b @0807B424 +@0807B3D0: movs r0, 0x1 movs r1, 0x1 bl sub_807ACFC @@ -222381,27 +222381,27 @@ _0807B3D0: movs r0, 0 movs r1, 0x3 bl Window_CopyToVram - b _0807B424 -_0807B3F0: + b @0807B424 +@0807B3F0: bl sub_807BA94 ldr r0, =0x08338d18 bl gpu_tile_obj_alloc_tag_and_copy_to_vram ldr r0, =0x08338d20 bl gpu_pal_obj_alloc_tag_and_apply - b _0807B424 + b @0807B424 .align 2, 0 .pool -_0807B40C: +@0807B40C: movs r0, 0 bl gpu_sync_bg_show - b _0807B424 -_0807B414: + b @0807B424 +@0807B414: movs r0, 0x5 bl sub_807B62C movs r0, 0 bl sub_807B62C bl sub_807BAD8 -_0807B424: +@0807B424: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -222409,13 +222409,13 @@ _0807B424: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0807B43E + b @0807B43E .align 2, 0 .pool -_0807B438: +@0807B438: ldr r0, =sub_807B60C + 1 bl set_callback2 -_0807B43E: +@0807B43E: bl run_active_tasks bl run_remoboxes bl call_obj_callbacks @@ -222432,7 +222432,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 @@ -222444,7 +222444,7 @@ sub_807B464: @ 807B464 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _0807B4B8 + bne @0807B4B8 adds r0, r5, 0 movs r1, 0xB movs r2, 0 @@ -222469,7 +222469,7 @@ sub_807B464: @ 807B464 movs r1, 0x3 adds r2, r5, 0 bl sub_806F01C -_0807B4B8: +@0807B4B8: pop {r4,r5} pop {r0} bx r0 @@ -222478,7 +222478,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} @@ -222486,7 +222486,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 @@ -222519,7 +222519,7 @@ sub_807B4D0: @ 807B4D0 lsrs r0, 16 mov r8, r0 cmp r6, 0xFF - beq _0807B52A + beq @0807B52A ldr r0, =0x03005d8c lsls r1, r6, 3 adds r1, r6 @@ -222529,7 +222529,7 @@ sub_807B4D0: @ 807B4D0 ldr r0, [r0] adds r0, r1 bl sub_80D439C -_0807B52A: +@0807B52A: ldr r4, =0x020322a0 ldr r0, [r4] adds r1, r7, 0 @@ -222550,15 +222550,15 @@ _0807B52A: movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _0807B566 + bne @0807B566 adds r0, r7, 0 movs r1, 0x20 mov r2, sp bl pokemon_setattr -_0807B566: +@0807B566: mov r0, r8 cmp r0, 0xFF - beq _0807B57C + beq @0807B57C lsls r1, r0, 3 add r1, r8 lsls r1, 2 @@ -222566,15 +222566,15 @@ _0807B566: adds r1, r0 adds r0, r7, 0 bl sub_80D460C -_0807B57C: +@0807B57C: mov r0, r9 bl sub_807B464 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _0807B58E + beq @0807B58E bl sub_807B4C4 -_0807B58E: +@0807B58E: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -222587,24 +222587,24 @@ _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] adds r0, 0x93 ldrb r0, [r0] cmp r0, 0x1 - beq _0807B5D0 + beq @0807B5D0 cmp r0, 0x2 - beq _0807B5F6 - b _0807B600 + beq @0807B5F6 + b @0807B600 .align 2, 0 .pool -_0807B5D0: +@0807B5D0: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _0807B5F6 + beq @0807B5F6 bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 @@ -222617,13 +222617,13 @@ _0807B5D0: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_0807B5F6: +@0807B5F6: ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0x93 movs r1, 0 strb r1, [r0] -_0807B600: +@0807B600: pop {r4} pop {r0} bx r0 @@ -222632,7 +222632,7 @@ _0807B600: thumb_func_end sub_807B5B8 thumb_func_start sub_807B60C -sub_807B60C: @ 807B60C +sub_807B60C: ; 807B60C push {lr} bl sub_807BBC8 bl run_active_tasks @@ -222645,32 +222645,32 @@ 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 cmp r0, 0x7 - bls _0807B638 - b _0807BA68 -_0807B638: + bls @0807B638 + b @0807BA68 +@0807B638: lsls r0, 2 - ldr r1, =_0807B648 + ldr r1, =@0807B648 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0807B648: - .4byte _0807B668 - .4byte _0807B6DC - .4byte _0807B784 - .4byte _0807B7F8 - .4byte _0807B840 - .4byte _0807B90C - .4byte _0807B924 - .4byte _0807B9FC -_0807B668: +@0807B648: + .4byte @0807B668 + .4byte @0807B6DC + .4byte @0807B784 + .4byte @0807B7F8 + .4byte @0807B840 + .4byte @0807B90C + .4byte @0807B924 + .4byte @0807B9FC +@0807B668: ldr r0, =0x020322a0 ldr r1, [r0] adds r2, r1, 0 @@ -222701,7 +222701,7 @@ _0807B668: lsls r2, 5 movs r7, 0x80 lsls r7, 24 -_0807B6AA: +@0807B6AA: str r3, [r1] str r4, [r1, 0x4] str r6, [r1, 0x8] @@ -222710,11 +222710,11 @@ _0807B6AA: adds r4, r2 subs r5, r2 cmp r5, r2 - bhi _0807B6AA - b _0807BA4C + bhi @0807B6AA + b @0807BA4C .align 2, 0 .pool -_0807B6DC: +@0807B6DC: ldr r4, =0x020322a0 ldr r2, [r4] adds r1, r2, 0 @@ -222737,14 +222737,14 @@ _0807B6DC: adds r0, 0xFA ldrb r0, [r0] cmp r0, 0 - beq _0807B724 + beq @0807B724 ldr r1, =0x083369a0 - b _0807B726 + b @0807B726 .align 2, 0 .pool -_0807B724: +@0807B724: ldr r1, =0x083359a0 -_0807B726: +@0807B726: ldr r2, =0x06002800 ldr r0, =0x040000d4 str r1, [r0] @@ -222763,7 +222763,7 @@ _0807B726: lsls r2, 5 movs r7, 0x80 lsls r7, 24 -_0807B74A: +@0807B74A: str r3, [r1] str r4, [r1, 0x4] str r6, [r1, 0x8] @@ -222772,7 +222772,7 @@ _0807B74A: adds r4, r2 subs r5, r2 cmp r5, r2 - bhi _0807B74A + bhi @0807B74A str r3, [r1] str r4, [r1, 0x4] lsrs r0, r5, 1 @@ -222781,10 +222781,10 @@ _0807B74A: ldr r0, [r1, 0x8] movs r1, 0x92 lsls r1, 5 - b _0807B820 + b @0807B820 .align 2, 0 .pool -_0807B784: +@0807B784: ldr r0, =0x020322a0 ldr r2, [r0] adds r0, r2, 0 @@ -222796,7 +222796,7 @@ _0807B784: adds r0, 0x18 ldrb r0, [r0] cmp r0, 0 - bne _0807B7C0 + bne @0807B7C0 ldr r1, =0x00001241 movs r0, 0 bl lcd_io_set @@ -222804,10 +222804,10 @@ _0807B784: ldr r1, =0x06002800 bl LZ77UnCompVram movs r0, 0x8 - b _0807B7DA + b @0807B7DA .align 2, 0 .pool -_0807B7C0: +@0807B7C0: ldr r1, =0x00001241 movs r0, 0 bl lcd_io_set @@ -222820,14 +222820,14 @@ _0807B7C0: str r1, [r0, 0x8] ldr r0, [r0, 0x8] movs r0, 0x1 -_0807B7DA: +@0807B7DA: movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - b _0807BA68 + b @0807BA68 .align 2, 0 .pool -_0807B7F8: +@0807B7F8: ldr r0, =0x08337ea0 movs r1, 0x30 movs r2, 0x20 @@ -222845,13 +222845,13 @@ _0807B7F8: strh r1, [r0] movs r1, 0xB2 lsls r1, 5 -_0807B820: +@0807B820: movs r0, 0 bl lcd_io_set - b _0807BA68 + b @0807BA68 .align 2, 0 .pool -_0807B840: +@0807B840: ldr r1, =0x00001441 movs r0, 0 bl lcd_io_set @@ -222888,7 +222888,7 @@ _0807B840: lsls r2, 5 movs r7, 0x80 lsls r7, 24 -_0807B88C: +@0807B88C: str r3, [r1] str r4, [r1, 0x4] str r6, [r1, 0x8] @@ -222897,7 +222897,7 @@ _0807B88C: adds r4, r2 subs r5, r2 cmp r5, r2 - bhi _0807B88C + bhi @0807B88C str r3, [r1] str r4, [r1, 0x4] lsrs r0, r5, 1 @@ -222909,27 +222909,27 @@ _0807B88C: adds r0, 0xFA ldrb r0, [r0] cmp r0, 0 - beq _0807B8EC + beq @0807B8EC ldr r1, =0x083357a0 ldr r2, =0x06009000 ldr r0, =0x040000d4 str r1, [r0] str r2, [r0, 0x4] ldr r1, =0x80000080 - b _0807BA64 + b @0807BA64 .align 2, 0 .pool -_0807B8EC: +@0807B8EC: ldr r1, =0x083358a0 ldr r2, =0x06009000 ldr r0, =0x040000d4 str r1, [r0] str r2, [r0, 0x4] ldr r1, =0x80000080 - b _0807BA64 + b @0807BA64 .align 2, 0 .pool -_0807B90C: +@0807B90C: ldr r0, =0x020322a0 ldr r0, [r0] adds r1, r0, 0 @@ -222938,10 +222938,10 @@ _0807B90C: strh r2, [r1] adds r0, 0xE2 strh r2, [r0] - b _0807BA68 + b @0807BA68 .align 2, 0 .pool -_0807B924: +@0807B924: ldr r1, =0x00001441 movs r0, 0 bl lcd_io_set @@ -222983,7 +222983,7 @@ _0807B924: lsls r2, 5 movs r7, 0x80 lsls r7, 24 -_0807B97A: +@0807B97A: str r3, [r1] str r4, [r1, 0x4] str r6, [r1, 0x8] @@ -222992,7 +222992,7 @@ _0807B97A: adds r4, r2 subs r5, r2 cmp r5, r2 - bhi _0807B97A + bhi @0807B97A str r3, [r1] str r4, [r1, 0x4] lsrs r0, r5, 1 @@ -223004,27 +223004,27 @@ _0807B97A: adds r0, 0xFA ldrb r0, [r0] cmp r0, 0 - beq _0807B9DC + beq @0807B9DC ldr r1, =0x083357a0 ldr r2, =0x06009000 ldr r0, =0x040000d4 str r1, [r0] str r2, [r0, 0x4] ldr r1, =0x80000080 - b _0807BA64 + b @0807BA64 .align 2, 0 .pool -_0807B9DC: +@0807B9DC: ldr r1, =0x083358a0 ldr r2, =0x06009000 ldr r0, =0x040000d4 str r1, [r0] str r2, [r0, 0x4] ldr r1, =0x80000080 - b _0807BA64 + b @0807BA64 .align 2, 0 .pool -_0807B9FC: +@0807B9FC: ldr r0, =0x020322a0 ldr r0, [r0] adds r1, r0, 0 @@ -223053,7 +223053,7 @@ _0807B9FC: lsls r2, 5 movs r7, 0x80 lsls r7, 24 -_0807BA3A: +@0807BA3A: str r3, [r1] str r4, [r1, 0x4] str r6, [r1, 0x8] @@ -223062,8 +223062,8 @@ _0807BA3A: adds r4, r2 subs r5, r2 cmp r5, r2 - bhi _0807BA3A -_0807BA4C: + bhi @0807BA3A +@0807BA4C: str r3, [r1] str r4, [r1, 0x4] lsrs r0, r5, 1 @@ -223076,10 +223076,10 @@ _0807BA4C: str r1, [r0] str r2, [r0, 0x4] ldr r1, =0x80000800 -_0807BA64: +@0807BA64: str r1, [r0, 0x8] ldr r0, [r0, 0x8] -_0807BA68: +@0807BA68: pop {r4-r7} pop {r0} bx r0 @@ -223088,7 +223088,7 @@ _0807BA68: thumb_func_end sub_807B62C thumb_func_start sub_807BA94 -sub_807BA94: @ 807BA94 +sub_807BA94: ; 807BA94 push {lr} ldr r0, =0x08338d70 bl gpu_tile_obj_alloc_tag_and_copy_to_vram @@ -223109,7 +223109,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 @@ -223117,7 +223117,7 @@ sub_807BAD8: @ 807BAD8 adds r0, 0xEE ldrb r0, [r0] cmp r0, 0 - beq _0807BB68 + beq @0807BB68 bl link_get_multiplayer_id lsls r0, 24 ldr r3, =0x02021cc4 @@ -223158,10 +223158,10 @@ sub_807BAD8: @ 807BAD8 ldr r0, =0x02021dc4 mov r1, sp bl strcpy_limit_10_chars - b _0807BBA4 + b @0807BBA4 .align 2, 0 .pool -_0807BB68: +@0807BB68: ldr r0, =0x020375e0 ldrh r0, [r0] lsls r4, r0, 4 @@ -223188,7 +223188,7 @@ _0807BB68: ldr r0, =0x02021dc4 mov r1, sp bl strcpy_limit_10_chars -_0807BBA4: +@0807BBA4: add sp, 0x14 pop {r4,r5} pop {r0} @@ -223198,21 +223198,21 @@ _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] adds r0, 0xFA ldrb r0, [r0] cmp r0, 0 - bne _0807BBE0 + bne @0807BBE0 bl sub_807CFC8 - b _0807BBE4 + b @0807BBE4 .align 2, 0 .pool -_0807BBE0: +@0807BBE0: bl sub_807BBEC -_0807BBE4: +@0807BBE4: lsls r0, 24 lsrs r0, 24 pop {r1} @@ -223220,7 +223220,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 @@ -223230,287 +223230,287 @@ sub_807BBEC: @ 807BBEC ldr r1, =0x0000010b adds r7, r0, 0 cmp r5, r1 - bls _0807BC04 - bl _0807CFB4 -_0807BC04: + bls @0807BC04 + bl @0807CFB4 +@0807BC04: lsls r0, r5, 2 - ldr r1, =_0807BC1C + ldr r1, =@0807BC1C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0807BC1C: - .4byte _0807C04C - .4byte _0807C0C4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807C120 - .4byte _0807C168 - .4byte _0807C1DC - .4byte _0807CFB4 - .4byte _0807C248 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807C26C - .4byte _0807C29C - .4byte _0807C2AE - .4byte _0807C2D0 - .4byte _0807C318 - .4byte _0807C348 - .4byte _0807C390 - .4byte _0807C3E0 - .4byte _0807C434 - .4byte _0807C4B8 - .4byte _0807C4DC - .4byte _0807C528 - .4byte _0807C574 - .4byte _0807C5D0 - .4byte _0807C630 - .4byte _0807C644 - .4byte _0807C658 - .4byte _0807C66C - .4byte _0807C794 - .4byte _0807C864 - .4byte _0807C8EC - .4byte _0807C964 - .4byte _0807C974 - .4byte _0807C994 - .4byte _0807C9E4 - .4byte _0807CA02 - .4byte _0807CA40 - .4byte _0807CA50 - .4byte _0807CAC8 - .4byte _0807CFB4 - .4byte _0807CAF0 - .4byte _0807CB30 - .4byte _0807CB70 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CB90 - .4byte _0807CBB8 - .4byte _0807CBD4 - .4byte _0807CBF4 - .4byte _0807CC9C - .4byte _0807CCD0 - .4byte _0807CD1C - .4byte _0807CDDC - .4byte _0807CE54 - .4byte _0807CEA0 - .4byte _0807CEB0 - .4byte _0807CEB6 - .4byte _0807CEDC - .4byte _0807CF38 - .4byte _0807CF5C - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CE18 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807C460 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CFB4 - .4byte _0807CE38 -_0807C04C: +@0807BC1C: + .4byte @0807C04C + .4byte @0807C0C4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807C120 + .4byte @0807C168 + .4byte @0807C1DC + .4byte @0807CFB4 + .4byte @0807C248 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807C26C + .4byte @0807C29C + .4byte @0807C2AE + .4byte @0807C2D0 + .4byte @0807C318 + .4byte @0807C348 + .4byte @0807C390 + .4byte @0807C3E0 + .4byte @0807C434 + .4byte @0807C4B8 + .4byte @0807C4DC + .4byte @0807C528 + .4byte @0807C574 + .4byte @0807C5D0 + .4byte @0807C630 + .4byte @0807C644 + .4byte @0807C658 + .4byte @0807C66C + .4byte @0807C794 + .4byte @0807C864 + .4byte @0807C8EC + .4byte @0807C964 + .4byte @0807C974 + .4byte @0807C994 + .4byte @0807C9E4 + .4byte @0807CA02 + .4byte @0807CA40 + .4byte @0807CA50 + .4byte @0807CAC8 + .4byte @0807CFB4 + .4byte @0807CAF0 + .4byte @0807CB30 + .4byte @0807CB70 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CB90 + .4byte @0807CBB8 + .4byte @0807CBD4 + .4byte @0807CBF4 + .4byte @0807CC9C + .4byte @0807CCD0 + .4byte @0807CD1C + .4byte @0807CDDC + .4byte @0807CE54 + .4byte @0807CEA0 + .4byte @0807CEB0 + .4byte @0807CEB6 + .4byte @0807CEDC + .4byte @0807CF38 + .4byte @0807CF5C + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CE18 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807C460 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CFB4 + .4byte @0807CE38 +@0807C04C: ldr r3, =0x02020630 ldr r0, [r7] adds r0, 0x8E @@ -223559,17 +223559,17 @@ _0807C04C: strh r0, [r1] ldr r0, =0x00000179 bl current_map_music_set - bl _0807CFB4 + bl @0807CFB4 .align 2, 0 .pool -_0807C0C4: +@0807C0C4: ldr r5, [r7] adds r6, r5, 0 adds r6, 0xE6 movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 - ble _0807C0F8 + ble @0807C0F8 ldr r2, =0x02020630 adds r0, r5, 0 adds r0, 0x8E @@ -223584,10 +223584,10 @@ _0807C0C4: ldrh r0, [r6] subs r0, 0x3 strh r0, [r6] - bl _0807CFB4 + bl @0807CFB4 .align 2, 0 .pool -_0807C0F8: +@0807C0F8: ldr r2, =0x02020630 adds r0, r5, 0 adds r0, 0x8E @@ -223603,10 +223603,10 @@ _0807C0F8: adds r1, 0x94 movs r0, 0xA strh r0, [r1] - bl _0807CFB4 + bl @0807CFB4 .align 2, 0 .pool -_0807C120: +@0807C120: ldr r4, =0x02021fc4 ldr r1, =0x085ee942 adds r0, r4, 0 @@ -223623,28 +223623,28 @@ _0807C120: movs r0, 0xCE lsls r0, 1 cmp r1, r0 - beq _0807C14E + beq @0807C14E adds r0, r1, 0 movs r1, 0 bl cry_related -_0807C14E: +@0807C14E: ldr r3, [r4] adds r1, r3, 0 adds r1, 0x94 movs r2, 0 movs r0, 0xB - bl _0807CE06 + bl @0807CE06 .align 2, 0 .pool -_0807C168: +@0807C168: ldr r1, [r7] ldr r0, [r1, 0x64] adds r0, 0x1 str r0, [r1, 0x64] cmp r0, 0x50 - beq _0807C178 - bl _0807CFB4 -_0807C178: + beq @0807C178 + bl @0807CFB4 +@0807C178: adds r0, r1, 0 adds r0, 0x8E ldrb r0, [r0] @@ -223682,10 +223682,10 @@ _0807C178: adds r1, r4, 0 movs r2, 0 bl sub_807F1A8 - bl _0807CFB4 + bl @0807CFB4 .align 2, 0 .pool -_0807C1DC: +@0807C1DC: ldr r5, =0x02020630 ldr r0, [r7] adds r0, 0xD2 @@ -223699,9 +223699,9 @@ _0807C1DC: ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - beq _0807C1FC - bl _0807CFB4 -_0807C1FC: + beq @0807C1FC + bl @0807CFB4 +@0807C1FC: ldr r0, =0x08338d28 movs r1, 0x78 movs r2, 0x20 @@ -223728,10 +223728,10 @@ _0807C1FC: adds r0, r5 bl obj_delete_and_free_tiles ldr r1, [r7] - bl _0807CF4C + bl @0807CF4C .align 2, 0 .pool -_0807C248: +@0807C248: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -223744,18 +223744,18 @@ _0807C248: adds r0, 0x94 movs r1, 0x14 strh r1, [r0] - bl _0807CFB4 + bl @0807CFB4 .align 2, 0 .pool -_0807C26C: +@0807C26C: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0807C27C - bl _0807CFB4 -_0807C27C: + beq @0807C27C + bl @0807CFB4 +@0807C27C: movs r0, 0x4 bl sub_807B62C movs r0, 0 @@ -223764,10 +223764,10 @@ _0807C27C: movs r0, 0 movs r1, 0x3 bl Window_CopyToVram - bl _0807CF48 + bl @0807CF48 .align 2, 0 .pool -_0807C29C: +@0807C29C: movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -223775,24 +223775,24 @@ _0807C29C: adds r0, r1, 0 movs r2, 0x10 movs r3, 0 - bl _0807CF44 -_0807C2AE: + bl @0807CF44 +@0807C2AE: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0807C2BE - bl _0807CFB4 -_0807C2BE: + beq @0807C2BE + bl @0807CFB4 +@0807C2BE: ldr r0, [r7] adds r0, 0x94 movs r1, 0x17 strh r1, [r0] - bl _0807CFB4 + bl @0807CFB4 .align 2, 0 .pool -_0807C2D0: +@0807C2D0: ldr r4, =0x020322a0 ldr r0, [r4] adds r2, r0, 0 @@ -223801,14 +223801,14 @@ _0807C2D0: movs r0, 0x80 lsls r0, 1 cmp r1, r0 - bls _0807C2F0 + bls @0807C2F0 adds r0, r1, 0 subs r0, 0x34 strh r0, [r2] - b _0807C30C + b @0807C30C .align 2, 0 .pool -_0807C2F0: +@0807C2F0: movs r0, 0x1 bl sub_807B62C ldr r3, [r4] @@ -223822,21 +223822,21 @@ _0807C2F0: adds r0, 0x1 strh r0, [r1] str r2, [r3, 0x64] -_0807C30C: +@0807C30C: ldr r0, =0x020322a0 ldr r4, [r0] - bl _0807CB5C + bl @0807CB5C .align 2, 0 .pool -_0807C318: +@0807C318: ldr r1, [r7] ldr r0, [r1, 0x64] adds r0, 0x1 str r0, [r1, 0x64] cmp r0, 0x14 - bhi _0807C328 - bl _0807CFB4 -_0807C328: + bhi @0807C328 + bl @0807CFB4 +@0807C328: bl sub_807AB28 ldr r0, =0x08338e74 movs r1, 0x78 @@ -223847,10 +223847,10 @@ _0807C328: adds r1, 0x91 strb r0, [r1] ldr r1, [r7] - bl _0807CF4C + bl @0807CF4C .align 2, 0 .pool -_0807C348: +@0807C348: ldr r2, =0x02020630 ldr r0, [r7] adds r0, 0x91 @@ -223864,9 +223864,9 @@ _0807C348: ldrb r0, [r0] lsls r0, 27 cmp r0, 0 - blt _0807C368 - bl _0807CFB4 -_0807C368: + blt @0807C368 + bl @0807CFB4 +@0807C368: adds r0, r1, 0 bl obj_delete_and_free_tiles movs r1, 0xC8 @@ -223877,10 +223877,10 @@ _0807C368: movs r0, 0x52 bl lcd_io_set ldr r1, [r7] - bl _0807CF4C + bl @0807CF4C .align 2, 0 .pool -_0807C390: +@0807C390: ldr r2, [r7] adds r0, r2, 0 adds r0, 0xE0 @@ -223891,13 +223891,13 @@ _0807C390: movs r0, 0x9E lsls r0, 17 cmp r1, r0 - bne _0807C3B0 + bne @0807C3B0 adds r1, r2, 0 adds r1, 0x94 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_0807C3B0: +@0807C3B0: ldr r0, [r7] adds r0, 0xE0 movs r2, 0 @@ -223905,9 +223905,9 @@ _0807C3B0: movs r0, 0xA4 lsls r0, 1 cmp r1, r0 - beq _0807C3C4 - bl _0807CFB4 -_0807C3C4: + beq @0807C3C4 + bl @0807CFB4 +@0807C3C4: ldr r0, =0x08338dfc movs r1, 0x80 movs r2, 0x41 @@ -223916,10 +223916,10 @@ _0807C3C4: ldr r1, [r7] adds r1, 0x92 strb r0, [r1] - bl _0807CFB4 + bl @0807CFB4 .align 2, 0 .pool -_0807C3E0: +@0807C3E0: ldr r0, =0x08338d88 movs r1, 0x80 movs r2, 0x50 @@ -223948,10 +223948,10 @@ _0807C3E0: movs r1, 0x1 bl obj_anim_image_start ldr r1, [r4] - bl _0807CF4C + bl @0807CF4C .align 2, 0 .pool -_0807C434: +@0807C434: ldr r2, [r7] adds r1, r2, 0 adds r1, 0xE0 @@ -223961,18 +223961,18 @@ _0807C434: lsls r0, 16 asrs r0, 16 cmp r0, 0xA6 - bne _0807C44E + bne @0807C44E subs r1, 0x4C movs r0, 0xC8 strh r0, [r1] -_0807C44E: +@0807C44E: ldr r1, =0x00001241 movs r0, 0 bl lcd_io_set - bl _0807CFB4 + bl @0807CFB4 .align 2, 0 .pool -_0807C460: +@0807C460: ldr r2, =0x02020630 ldr r4, [r7] adds r3, r4, 0 @@ -224005,17 +224005,17 @@ _0807C460: movs r0, 0x8 negs r0, r0 cmp r1, r0 - blt _0807C4A6 - bl _0807CFB4 -_0807C4A6: + blt @0807C4A6 + bl @0807CFB4 +@0807C4A6: adds r1, r4, 0 adds r1, 0x94 movs r0, 0x1D strh r0, [r1] - bl _0807CFB4 + bl @0807CFB4 .align 2, 0 .pool -_0807C4B8: +@0807C4B8: movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -224029,18 +224029,18 @@ _0807C4B8: adds r0, 0x94 movs r1, 0x1E strh r1, [r0] - bl _0807CFB4 + bl @0807CFB4 .align 2, 0 .pool -_0807C4DC: +@0807C4DC: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0807C4EC - bl _0807CFB4 -_0807C4EC: + beq @0807C4EC + bl @0807CFB4 +@0807C4EC: ldr r0, [r7] adds r0, 0x90 ldrb r1, [r0] @@ -224061,10 +224061,10 @@ _0807C4EC: movs r0, 0x2 bl sub_807B62C ldr r1, [r7] - bl _0807CF4C + bl @0807CF4C .align 2, 0 .pool -_0807C528: +@0807C528: movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -224093,16 +224093,16 @@ _0807C528: adds r1, 0x91 strb r0, [r1] ldr r1, [r4] - bl _0807CF4C + bl @0807CF4C .align 2, 0 .pool -_0807C574: +@0807C574: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0807C592 + bne @0807C592 movs r0, 0x2E bl audio_play ldr r0, =0x020322a0 @@ -224111,7 +224111,7 @@ _0807C574: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_0807C592: +@0807C592: ldr r3, =0x02020630 ldr r0, =0x020322a0 ldr r2, [r0] @@ -224134,10 +224134,10 @@ _0807C592: ldrh r1, [r0, 0x26] adds r1, 0x3 strh r1, [r0, 0x26] - bl _0807CFB4 + bl @0807CFB4 .align 2, 0 .pool -_0807C5D0: +@0807C5D0: ldr r5, =0x02020630 ldr r4, [r7] adds r2, r4, 0 @@ -224170,9 +224170,9 @@ _0807C5D0: movs r0, 0x5A negs r0, r0 cmp r1, r0 - ble _0807C616 - bl _0807CFB4 -_0807C616: + ble @0807C616 + bl @0807CFB4 +@0807C616: movs r2, 0x1 strh r2, [r3, 0x30] ldrb r1, [r6] @@ -224182,34 +224182,34 @@ _0807C616: adds r0, r5 strh r2, [r0, 0x30] adds r1, r4, 0 - bl _0807CF4C + bl @0807CF4C .align 2, 0 .pool -_0807C630: +@0807C630: ldr r2, =0x0000ffff movs r0, 0x1 movs r1, 0x10 bl sub_80A2A20 - bl _0807CF48 + bl @0807CF48 .align 2, 0 .pool -_0807C644: +@0807C644: ldr r2, =0x0000ffff movs r0, 0x1 movs r1, 0 bl sub_80A2A20 - bl _0807CF48 + bl @0807CF48 .align 2, 0 .pool -_0807C658: +@0807C658: ldr r2, =0x0000ffff movs r0, 0x1 movs r1, 0x10 bl sub_80A2A20 - bl _0807CF48 + bl @0807CF48 .align 2, 0 .pool -_0807C66C: +@0807C66C: ldr r5, =0x020322a0 ldr r0, [r5] adds r0, 0xF0 @@ -224217,7 +224217,7 @@ _0807C66C: bl sub_806E840 lsls r0, 24 cmp r0, 0 - bne _0807C6E4 + bne @0807C6E4 ldr r4, =0x02020630 ldr r2, [r5] adds r2, 0x8E @@ -224259,10 +224259,10 @@ _0807C66C: adds r0, r4 movs r1, 0 bl sub_8008258 - b _0807C6FA + b @0807C6FA .align 2, 0 .pool -_0807C6E4: +@0807C6E4: ldr r0, [r5] adds r0, 0x8E ldrb r1, [r0] @@ -224273,7 +224273,7 @@ _0807C6E4: adds r0, r1 movs r1, 0 bl sub_8008258 -_0807C6FA: +@0807C6FA: ldr r5, =0x020322a0 ldr r0, [r5] adds r0, 0x8F @@ -224341,10 +224341,10 @@ _0807C6FA: ands r2, r1 strb r2, [r0] ldr r1, [r5] - bl _0807CF4C + bl @0807CF4C .align 2, 0 .pool -_0807C794: +@0807C794: ldr r4, =0x02020630 ldr r2, [r7] adds r3, r2, 0 @@ -224377,10 +224377,10 @@ _0807C794: lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - bhi _0807C7DC + bhi @0807C7DC movs r0, 0x2D bl audio_play -_0807C7DC: +@0807C7DC: ldr r2, [r7] adds r3, r2, 0 adds r3, 0x8E @@ -224394,9 +224394,9 @@ _0807C7DC: movs r0, 0xDE negs r0, r0 cmp r1, r0 - blt _0807C7FC - bl _0807CFB4 -_0807C7FC: + blt @0807C7FC + bl @0807CFB4 +@0807C7FC: adds r0, r2, 0 adds r0, 0x90 ldrb r1, [r0] @@ -224443,10 +224443,10 @@ _0807C7FC: movs r0, 0x1 movs r1, 0 bl sub_80A2A20 - b _0807CFB4 + b @0807CFB4 .align 2, 0 .pool -_0807C864: +@0807C864: ldr r4, =0x02020630 ldr r2, [r7] adds r3, r2, 0 @@ -224478,9 +224478,9 @@ _0807C864: movs r0, 0xDE negs r0, r0 cmp r1, r0 - ble _0807C8A6 - b _0807CFB4 -_0807C8A6: + ble @0807C8A6 + b @0807CFB4 +@0807C8A6: movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -224510,18 +224510,18 @@ _0807C8A6: lsls r0, 2 adds r0, r4 bl obj_delete_and_free_tiles - b _0807CFB4 + b @0807CFB4 .align 2, 0 .pool -_0807C8EC: +@0807C8EC: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0807C8FA - b _0807CFB4 -_0807C8FA: + beq @0807C8FA + b @0807CFB4 +@0807C8FA: ldr r1, [r7] adds r1, 0x94 ldrh r0, [r1] @@ -224561,10 +224561,10 @@ _0807C8FA: adds r0, r1 movs r1, 0x1 bl obj_anim_image_start - b _0807CFB4 + b @0807CFB4 .align 2, 0 .pool -_0807C964: +@0807C964: movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -224572,8 +224572,8 @@ _0807C964: adds r0, r1, 0 movs r2, 0x10 movs r3, 0 - b _0807CF44 -_0807C974: + b @0807CF44 +@0807C974: movs r1, 0x92 lsls r1, 5 movs r0, 0 @@ -224583,13 +224583,13 @@ _0807C974: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0807C98C - b _0807CFB4 -_0807C98C: - b _0807CF48 + beq @0807C98C + b @0807CFB4 +@0807C98C: + b @0807CF48 .align 2, 0 .pool -_0807C994: +@0807C994: ldr r2, =0x02020630 ldr r4, [r7] adds r3, r4, 0 @@ -224623,14 +224623,14 @@ _0807C994: ldrsh r0, [r0, r6] adds r1, r0 cmp r1, 0x40 - beq _0807C9DA - b _0807CFB4 -_0807C9DA: + beq @0807C9DA + b @0807CFB4 +@0807C9DA: adds r1, r4, 0 - b _0807CF4C + b @0807CF4C .align 2, 0 .pool -_0807C9E4: +@0807C9E4: ldr r1, [r7] adds r5, r1, 0 adds r5, 0xE0 @@ -224642,12 +224642,12 @@ _0807C9E4: movs r6, 0x9E lsls r6, 1 cmp r0, r6 - bgt _0807C9FE - b _0807CFB4 -_0807C9FE: + bgt @0807C9FE + b @0807CFB4 +@0807C9FE: strh r6, [r5] - b _0807CF4C -_0807CA02: + b @0807CF4C +@0807CA02: ldr r0, [r7] adds r0, 0x90 ldrb r1, [r0] @@ -224673,20 +224673,20 @@ _0807CA02: movs r1, 0 strh r0, [r2] str r1, [r3, 0x64] - b _0807CFB4 + b @0807CFB4 .align 2, 0 .pool -_0807CA40: +@0807CA40: ldr r1, [r7] ldr r0, [r1, 0x64] adds r0, 0x1 str r0, [r1, 0x64] cmp r0, 0xA - beq _0807CA4E - b _0807CFB4 -_0807CA4E: - b _0807CF4C -_0807CA50: + beq @0807CA4E + b @0807CFB4 +@0807CA4E: + b @0807CF4C +@0807CA50: ldr r1, [r7] adds r2, r1, 0 adds r2, 0xE0 @@ -224698,13 +224698,13 @@ _0807CA50: movs r3, 0xAE lsls r3, 1 cmp r0, r3 - ble _0807CA72 + ble @0807CA72 strh r3, [r2] adds r1, 0x94 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_0807CA72: +@0807CA72: ldr r2, [r7] adds r0, r2, 0 adds r0, 0xE0 @@ -224713,16 +224713,16 @@ _0807CA72: movs r0, 0xA4 lsls r0, 1 cmp r1, r0 - beq _0807CA86 - b _0807CFB4 -_0807CA86: + beq @0807CA86 + b @0807CFB4 +@0807CA86: adds r0, r2, 0 adds r0, 0xFA ldrb r0, [r0] cmp r0, 0 - bne _0807CA92 - b _0807CFB4 -_0807CA92: + bne @0807CA92 + b @0807CFB4 +@0807CA92: ldr r0, =0x08338dfc movs r1, 0x80 movs r2, 0x41 @@ -224742,10 +224742,10 @@ _0807CA92: adds r0, r2 ldr r1, =sub_807AAE0 + 1 str r1, [r0] - b _0807CFB4 + b @0807CFB4 .align 2, 0 .pool -_0807CAC8: +@0807CAC8: ldr r0, =0x08338e74 movs r1, 0x78 movs r2, 0x50 @@ -224759,10 +224759,10 @@ _0807CAC8: adds r0, 0x94 movs r1, 0x32 strh r1, [r0] - b _0807CFB4 + b @0807CFB4 .align 2, 0 .pool -_0807CAF0: +@0807CAF0: ldr r2, =0x02020630 ldr r0, [r7] adds r0, 0x91 @@ -224776,9 +224776,9 @@ _0807CAF0: ldrb r0, [r0] lsls r0, 27 cmp r0, 0 - blt _0807CB0E - b _0807CFB4 -_0807CB0E: + blt @0807CB0E + b @0807CFB4 +@0807CB0E: adds r0, r1, 0 bl obj_delete_and_free_tiles movs r0, 0x6 @@ -224790,24 +224790,24 @@ _0807CB0E: strh r0, [r1] movs r0, 0x9F bl audio_play - b _0807CFB4 + b @0807CFB4 .align 2, 0 .pool -_0807CB30: +@0807CB30: ldr r1, [r7] adds r2, r1, 0 adds r2, 0xEA ldrh r3, [r2] ldr r0, =0x000003ff cmp r3, r0 - bhi _0807CB4C + bhi @0807CB4C adds r0, r3, 0 adds r0, 0x34 strh r0, [r2] - b _0807CB5A + b @0807CB5A .align 2, 0 .pool -_0807CB4C: +@0807CB4C: movs r0, 0x80 lsls r0, 3 strh r0, [r2] @@ -224815,9 +224815,9 @@ _0807CB4C: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_0807CB5A: +@0807CB5A: ldr r4, [r7] -_0807CB5C: +@0807CB5C: adds r0, r4, 0 adds r0, 0xEA ldrh r1, [r0] @@ -224826,8 +224826,8 @@ _0807CB5C: bl __divsi3 adds r4, 0xE8 strh r0, [r4] - b _0807CFB4 -_0807CB70: + b @0807CFB4 +@0807CB70: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -224840,18 +224840,18 @@ _0807CB70: adds r0, 0x94 movs r1, 0x3C strh r1, [r0] - b _0807CFB4 + b @0807CFB4 .align 2, 0 .pool -_0807CB90: +@0807CB90: ldr r4, =0x02037fd4 ldrb r1, [r4, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0807CB9E - b _0807CFB4 -_0807CB9E: + beq @0807CB9E + b @0807CFB4 +@0807CB9E: movs r0, 0x5 bl sub_807B62C movs r0, 0x7 @@ -224860,10 +224860,10 @@ _0807CB9E: movs r1, 0x80 orrs r0, r1 strb r0, [r4, 0x8] - b _0807CF48 + b @0807CF48 .align 2, 0 .pool -_0807CBB8: +@0807CBB8: ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F @@ -224875,10 +224875,10 @@ _0807CBB8: str r1, [sp] movs r2, 0x10 movs r3, 0 - b _0807CF44 + b @0807CF44 .align 2, 0 .pool -_0807CBD4: +@0807CBD4: movs r1, 0xA2 lsls r1, 5 movs r0, 0 @@ -224888,13 +224888,13 @@ _0807CBD4: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0807CBEC - b _0807CFB4 -_0807CBEC: - b _0807CF48 + beq @0807CBEC + b @0807CFB4 +@0807CBEC: + b @0807CF48 .align 2, 0 .pool -_0807CBF4: +@0807CBF4: ldr r0, =0x08338d28 movs r2, 0x8 negs r2, r2 @@ -224963,10 +224963,10 @@ _0807CBF4: adds r0, 0x1 strh r0, [r1] str r6, [r2, 0x64] - b _0807CFB4 + b @0807CFB4 .align 2, 0 .pool -_0807CC9C: +@0807CC9C: ldr r2, =0x02020630 ldr r0, [r7] adds r0, 0xD3 @@ -224987,10 +224987,10 @@ _0807CC9C: movs r3, 0 bl sub_80A1AD4 ldr r1, [r7] - b _0807CF4C + b @0807CF4C .align 2, 0 .pool -_0807CCD0: +@0807CCD0: ldr r2, =0x02020630 ldr r3, [r7] adds r0, r3, 0 @@ -225004,9 +225004,9 @@ _0807CCD0: ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - beq _0807CCEE - b _0807CFB4 -_0807CCEE: + beq @0807CCEE + b @0807CFB4 +@0807CCEE: adds r0, r3, 0 adds r0, 0xF2 ldrh r2, [r0] @@ -225019,10 +225019,10 @@ _0807CCEE: ldr r3, [r3, 0x6C] bl help_system_enable_unless_flashback__sp199 ldr r1, [r7] - b _0807CF4C + b @0807CF4C .align 2, 0 .pool -_0807CD1C: +@0807CD1C: ldr r4, =0x02020630 ldr r2, [r7] adds r6, r2, 0 @@ -225108,10 +225108,10 @@ _0807CD1C: adds r0, r4 bl obj_delete_and_free_tiles ldr r1, [r7] - b _0807CF4C + b @0807CF4C .align 2, 0 .pool -_0807CDDC: +@0807CDDC: movs r1, 0xAA lsls r1, 5 movs r0, 0 @@ -225130,61 +225130,61 @@ _0807CDDC: adds r1, 0x94 movs r2, 0 movs r0, 0xA7 -_0807CE06: +@0807CE06: strh r0, [r1] str r2, [r3, 0x64] - b _0807CFB4 + b @0807CFB4 .align 2, 0 .pool -_0807CE18: +@0807CE18: ldr r3, [r7] ldr r0, [r3, 0x64] adds r0, 0x1 str r0, [r3, 0x64] cmp r0, 0x3C - bhi _0807CE26 - b _0807CFB4 -_0807CE26: + bhi @0807CE26 + b @0807CFB4 +@0807CE26: adds r0, r3, 0 adds r0, 0x94 movs r2, 0 ldr r1, =0x0000010b strh r1, [r0] str r2, [r3, 0x64] - b _0807CFB4 + b @0807CFB4 .align 2, 0 .pool -_0807CE38: +@0807CE38: bl sub_80A3678 lsls r0, 24 cmp r0, 0 - bne _0807CE44 - b _0807CFB4 -_0807CE44: + bne @0807CE44 + b @0807CFB4 +@0807CE44: ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0x94 movs r1, 0x44 strh r1, [r0] - b _0807CFB4 + b @0807CFB4 .align 2, 0 .pool -_0807CE54: +@0807CE54: ldr r1, [r7] ldr r0, [r1, 0x64] adds r0, 0x1 str r0, [r1, 0x64] cmp r0, 0xA - bne _0807CE66 + bne @0807CE66 ldr r0, =0x00000173 bl fanfare_play -_0807CE66: +@0807CE66: ldr r1, [r7] ldr r0, [r1, 0x64] cmp r0, 0xFA - beq _0807CE70 - b _0807CFB4 -_0807CE70: + beq @0807CE70 + b @0807CFB4 +@0807CE70: adds r1, 0x94 ldrh r0, [r1] adds r0, 0x1 @@ -225200,43 +225200,43 @@ _0807CE70: bl sub_807F1A8 ldr r0, [r7] str r5, [r0, 0x64] - b _0807CFB4 + b @0807CFB4 .align 2, 0 .pool -_0807CEA0: +@0807CEA0: ldr r1, [r7] ldr r0, [r1, 0x64] adds r0, 0x1 str r0, [r1, 0x64] cmp r0, 0x3C - beq _0807CEAE - b _0807CFB4 -_0807CEAE: - b _0807CF4C -_0807CEB0: + beq @0807CEAE + b @0807CFB4 +@0807CEAE: + b @0807CF4C +@0807CEB0: bl sub_807F14C - b _0807CF48 -_0807CEB6: + b @0807CF48 +@0807CEB6: ldr r2, [r7] adds r0, r2, 0 adds r0, 0xEE ldrb r0, [r0] cmp r0, 0 - beq _0807CEC6 + beq @0807CEC6 movs r0, 0x1 - b _0807CFB6 -_0807CEC6: + b @0807CFB6 +@0807CEC6: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0807CFB4 + beq @0807CFB4 adds r1, r2, 0 - b _0807CF4C + b @0807CF4C .align 2, 0 .pool -_0807CEDC: +@0807CEDC: ldr r0, =0x020375e2 ldrb r0, [r0] movs r1, 0 @@ -225256,7 +225256,7 @@ _0807CEDC: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq _0807CF48 + beq @0807CF48 ldrb r3, [r7] adds r0, r3, 0 muls r0, r6 @@ -225267,30 +225267,30 @@ _0807CEDC: ldrb r2, [r1] adds r1, r4, 0 bl sub_813E1D4 - b _0807CF48 + b @0807CF48 .align 2, 0 .pool -_0807CF38: +@0807CF38: movs r0, 0x1 negs r0, r0 movs r1, 0 str r1, [sp] movs r2, 0 movs r3, 0x10 -_0807CF44: +@0807CF44: bl sub_80A1AD4 -_0807CF48: +@0807CF48: ldr r0, =0x020322a0 ldr r1, [r0] -_0807CF4C: +@0807CF4C: adds r1, 0x94 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0807CFB4 + b @0807CFB4 .align 2, 0 .pool -_0807CF5C: +@0807CF5C: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -225298,14 +225298,14 @@ _0807CF5C: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _0807CFB4 + bne @0807CFB4 ldr r0, [r7] adds r0, 0xF4 ldrh r0, [r0] bl current_map_music_set ldr r0, [r7] cmp r0, 0 - beq _0807CFAA + beq @0807CFAA bl Window_FreeMemory movs r0, 0x3 bl bg_get_tilemap @@ -225320,13 +225320,13 @@ _0807CF5C: ldr r0, [r7] bl free str r4, [r7] -_0807CFAA: +@0807CFAA: ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 bl sub_807E784 -_0807CFB4: +@0807CFB4: movs r0, 0 -_0807CFB6: +@0807CFB6: add sp, 0x14 pop {r4-r7} pop {r1} @@ -225336,7 +225336,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 @@ -225346,287 +225346,287 @@ sub_807CFC8: @ 807CFC8 ldr r1, =0x0000010b adds r7, r0, 0 cmp r5, r1 - bls _0807CFE0 - bl _0807E400 -_0807CFE0: + bls @0807CFE0 + bl @0807E400 +@0807CFE0: lsls r0, r5, 2 - ldr r1, =_0807CFF8 + ldr r1, =@0807CFF8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0807CFF8: - .4byte _0807D428 - .4byte _0807D4A0 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807D4FC - .4byte _0807D544 - .4byte _0807D5B8 - .4byte _0807E400 - .4byte _0807D624 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807D648 - .4byte _0807D678 - .4byte _0807D68A - .4byte _0807D6AC - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807D7A4 - .4byte _0807D7C4 - .4byte _0807D830 - .4byte _0807D8B4 - .4byte _0807D8D8 - .4byte _0807D924 - .4byte _0807D970 - .4byte _0807D9CC - .4byte _0807DA38 - .4byte _0807DA4C - .4byte _0807DA60 - .4byte _0807DA74 - .4byte _0807DB9C - .4byte _0807DC6C - .4byte _0807DCF4 - .4byte _0807DD94 - .4byte _0807DDA4 - .4byte _0807DDC4 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807DEE8 - .4byte _0807DEF8 - .4byte _0807DF16 - .4byte _0807E400 - .4byte _0807DF3C - .4byte _0807DF7C - .4byte _0807DFBC - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807DFDC - .4byte _0807E004 - .4byte _0807E020 - .4byte _0807E040 - .4byte _0807E0E8 - .4byte _0807E11C - .4byte _0807E168 - .4byte _0807E228 - .4byte _0807E2A0 - .4byte _0807E2EC - .4byte _0807E2FC - .4byte _0807E302 - .4byte _0807E328 - .4byte _0807E384 - .4byte _0807E3A8 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807D6F4 - .4byte _0807D728 - .4byte _0807D77C - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807DE1C - .4byte _0807DE84 - .4byte _0807DEC0 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E264 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807D85C - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E400 - .4byte _0807E284 -_0807D428: +@0807CFF8: + .4byte @0807D428 + .4byte @0807D4A0 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807D4FC + .4byte @0807D544 + .4byte @0807D5B8 + .4byte @0807E400 + .4byte @0807D624 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807D648 + .4byte @0807D678 + .4byte @0807D68A + .4byte @0807D6AC + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807D7A4 + .4byte @0807D7C4 + .4byte @0807D830 + .4byte @0807D8B4 + .4byte @0807D8D8 + .4byte @0807D924 + .4byte @0807D970 + .4byte @0807D9CC + .4byte @0807DA38 + .4byte @0807DA4C + .4byte @0807DA60 + .4byte @0807DA74 + .4byte @0807DB9C + .4byte @0807DC6C + .4byte @0807DCF4 + .4byte @0807DD94 + .4byte @0807DDA4 + .4byte @0807DDC4 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807DEE8 + .4byte @0807DEF8 + .4byte @0807DF16 + .4byte @0807E400 + .4byte @0807DF3C + .4byte @0807DF7C + .4byte @0807DFBC + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807DFDC + .4byte @0807E004 + .4byte @0807E020 + .4byte @0807E040 + .4byte @0807E0E8 + .4byte @0807E11C + .4byte @0807E168 + .4byte @0807E228 + .4byte @0807E2A0 + .4byte @0807E2EC + .4byte @0807E2FC + .4byte @0807E302 + .4byte @0807E328 + .4byte @0807E384 + .4byte @0807E3A8 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807D6F4 + .4byte @0807D728 + .4byte @0807D77C + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807DE1C + .4byte @0807DE84 + .4byte @0807DEC0 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E264 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807D85C + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E400 + .4byte @0807E284 +@0807D428: ldr r3, =0x02020630 ldr r0, [r7] adds r0, 0x8E @@ -225675,17 +225675,17 @@ _0807D428: strh r0, [r1] ldr r0, =0x00000179 bl current_map_music_set - bl _0807E400 + bl @0807E400 .align 2, 0 .pool -_0807D4A0: +@0807D4A0: ldr r5, [r7] adds r6, r5, 0 adds r6, 0xE6 movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 - ble _0807D4D4 + ble @0807D4D4 ldr r2, =0x02020630 adds r0, r5, 0 adds r0, 0x8E @@ -225700,10 +225700,10 @@ _0807D4A0: ldrh r0, [r6] subs r0, 0x3 strh r0, [r6] - bl _0807E400 + bl @0807E400 .align 2, 0 .pool -_0807D4D4: +@0807D4D4: ldr r2, =0x02020630 adds r0, r5, 0 adds r0, 0x8E @@ -225719,10 +225719,10 @@ _0807D4D4: adds r1, 0x94 movs r0, 0xA strh r0, [r1] - bl _0807E400 + bl @0807E400 .align 2, 0 .pool -_0807D4FC: +@0807D4FC: ldr r4, =0x02021fc4 ldr r1, =0x085ee942 adds r0, r4, 0 @@ -225739,28 +225739,28 @@ _0807D4FC: movs r0, 0xCE lsls r0, 1 cmp r1, r0 - beq _0807D52A + beq @0807D52A adds r0, r1, 0 movs r1, 0 bl cry_related -_0807D52A: +@0807D52A: ldr r3, [r4] adds r1, r3, 0 adds r1, 0x94 movs r2, 0 movs r0, 0xB - bl _0807E252 + bl @0807E252 .align 2, 0 .pool -_0807D544: +@0807D544: ldr r1, [r7] ldr r0, [r1, 0x64] adds r0, 0x1 str r0, [r1, 0x64] cmp r0, 0x50 - beq _0807D554 - bl _0807E400 -_0807D554: + beq @0807D554 + bl @0807E400 +@0807D554: adds r0, r1, 0 adds r0, 0x8E ldrb r0, [r0] @@ -225798,10 +225798,10 @@ _0807D554: adds r1, r4, 0 movs r2, 0 bl sub_807F1A8 - bl _0807E400 + bl @0807E400 .align 2, 0 .pool -_0807D5B8: +@0807D5B8: ldr r5, =0x02020630 ldr r0, [r7] adds r0, 0xD2 @@ -225815,9 +225815,9 @@ _0807D5B8: ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - beq _0807D5D8 - bl _0807E400 -_0807D5D8: + beq @0807D5D8 + bl @0807E400 +@0807D5D8: ldr r0, =0x08338d28 movs r1, 0x78 movs r2, 0x20 @@ -225844,10 +225844,10 @@ _0807D5D8: adds r0, r5 bl obj_delete_and_free_tiles ldr r1, [r7] - bl _0807E398 + bl @0807E398 .align 2, 0 .pool -_0807D624: +@0807D624: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -225860,18 +225860,18 @@ _0807D624: adds r0, 0x94 movs r1, 0x14 strh r1, [r0] - bl _0807E400 + bl @0807E400 .align 2, 0 .pool -_0807D648: +@0807D648: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0807D658 - bl _0807E400 -_0807D658: + beq @0807D658 + bl @0807E400 +@0807D658: movs r0, 0x4 bl sub_807B62C movs r0, 0 @@ -225880,10 +225880,10 @@ _0807D658: movs r0, 0 movs r1, 0x3 bl Window_CopyToVram - bl _0807E394 + bl @0807E394 .align 2, 0 .pool -_0807D678: +@0807D678: movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -225891,24 +225891,24 @@ _0807D678: adds r0, r1, 0 movs r2, 0x10 movs r3, 0 - bl _0807E390 -_0807D68A: + bl @0807E390 +@0807D68A: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0807D69A - bl _0807E400 -_0807D69A: + beq @0807D69A + bl @0807E400 +@0807D69A: ldr r0, [r7] adds r0, 0x94 movs r1, 0x17 strh r1, [r0] - bl _0807E400 + bl @0807E400 .align 2, 0 .pool -_0807D6AC: +@0807D6AC: ldr r4, =0x020322a0 ldr r0, [r4] adds r2, r0, 0 @@ -225917,14 +225917,14 @@ _0807D6AC: movs r0, 0x80 lsls r0, 1 cmp r1, r0 - bls _0807D6CC + bls @0807D6CC adds r0, r1, 0 subs r0, 0x34 strh r0, [r2] - b _0807D6E6 + b @0807D6E6 .align 2, 0 .pool -_0807D6CC: +@0807D6CC: movs r0, 0x1 bl sub_807B62C ldr r3, [r4] @@ -225937,21 +225937,21 @@ _0807D6CC: movs r0, 0x7C strh r0, [r1] str r2, [r3, 0x64] -_0807D6E6: +@0807D6E6: ldr r0, =0x020322a0 ldr r4, [r0] - bl _0807DFA8 + bl @0807DFA8 .align 2, 0 .pool -_0807D6F4: +@0807D6F4: ldr r1, [r7] ldr r0, [r1, 0x64] adds r0, 0x1 str r0, [r1, 0x64] cmp r0, 0x14 - bhi _0807D704 - bl _0807E400 -_0807D704: + bhi @0807D704 + bl @0807E400 +@0807D704: movs r0, 0x3 bl sub_807B62C ldr r0, =0x08338e8c @@ -225963,10 +225963,10 @@ _0807D704: adds r1, 0x91 strb r0, [r1] ldr r1, [r7] - bl _0807E398 + bl @0807E398 .align 2, 0 .pool -_0807D728: +@0807D728: ldr r2, =0x02020630 ldr r0, [r7] adds r0, 0x91 @@ -225980,9 +225980,9 @@ _0807D728: ldrb r0, [r0] lsls r0, 27 cmp r0, 0 - blt _0807D748 - bl _0807E400 -_0807D748: + blt @0807D748 + bl @0807E400 +@0807D748: adds r0, r1, 0 bl obj_delete_and_free_tiles ldr r1, =0x00000452 @@ -225996,26 +225996,26 @@ _0807D748: movs r1, 0x5 bl AddTask ldr r1, [r7] - bl _0807E398 + bl @0807E398 .align 2, 0 .pool -_0807D77C: +@0807D77C: ldr r0, =c3_08054588 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - beq _0807D78C - bl _0807E400 -_0807D78C: + beq @0807D78C + bl @0807E400 +@0807D78C: ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0x94 movs r1, 0x1A strh r1, [r0] - bl _0807E400 + bl @0807E400 .align 2, 0 .pool -_0807D7A4: +@0807D7A4: ldr r2, [r7] adds r0, r2, 0 adds r0, 0xE0 @@ -226026,12 +226026,12 @@ _0807D7A4: movs r0, 0x9E lsls r0, 17 cmp r1, r0 - beq _0807D7BE - bl _0807E400 -_0807D7BE: + beq @0807D7BE + bl @0807E400 +@0807D7BE: adds r1, r2, 0 - bl _0807E398 -_0807D7C4: + bl @0807E398 +@0807D7C4: ldr r0, =0x08338d88 movs r1, 0x78 movs r2, 0x50 @@ -226071,10 +226071,10 @@ _0807D7C4: movs r1, 0x1 bl obj_anim_image_start ldr r1, [r4] - bl _0807E398 + bl @0807E398 .align 2, 0 .pool -_0807D830: +@0807D830: ldr r2, [r7] adds r1, r2, 0 adds r1, 0xE0 @@ -226084,18 +226084,18 @@ _0807D830: lsls r0, 16 asrs r0, 16 cmp r0, 0xA6 - bne _0807D84A + bne @0807D84A subs r1, 0x4C movs r0, 0xC8 strh r0, [r1] -_0807D84A: +@0807D84A: ldr r1, =0x00001241 movs r0, 0 bl lcd_io_set - bl _0807E400 + bl @0807E400 .align 2, 0 .pool -_0807D85C: +@0807D85C: ldr r2, =0x02020630 ldr r4, [r7] adds r3, r4, 0 @@ -226128,17 +226128,17 @@ _0807D85C: movs r0, 0x8 negs r0, r0 cmp r1, r0 - blt _0807D8A2 - bl _0807E400 -_0807D8A2: + blt @0807D8A2 + bl @0807E400 +@0807D8A2: adds r1, r4, 0 adds r1, 0x94 movs r0, 0x1D strh r0, [r1] - bl _0807E400 + bl @0807E400 .align 2, 0 .pool -_0807D8B4: +@0807D8B4: movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -226152,18 +226152,18 @@ _0807D8B4: adds r0, 0x94 movs r1, 0x1E strh r1, [r0] - bl _0807E400 + bl @0807E400 .align 2, 0 .pool -_0807D8D8: +@0807D8D8: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0807D8E8 - bl _0807E400 -_0807D8E8: + beq @0807D8E8 + bl @0807E400 +@0807D8E8: ldr r0, [r7] adds r0, 0x90 ldrb r1, [r0] @@ -226184,10 +226184,10 @@ _0807D8E8: movs r0, 0x2 bl sub_807B62C ldr r1, [r7] - bl _0807E398 + bl @0807E398 .align 2, 0 .pool -_0807D924: +@0807D924: movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -226216,16 +226216,16 @@ _0807D924: adds r1, 0x91 strb r0, [r1] ldr r1, [r4] - bl _0807E398 + bl @0807E398 .align 2, 0 .pool -_0807D970: +@0807D970: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0807D98E + bne @0807D98E movs r0, 0x2E bl audio_play ldr r0, =0x020322a0 @@ -226234,7 +226234,7 @@ _0807D970: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_0807D98E: +@0807D98E: ldr r3, =0x02020630 ldr r0, =0x020322a0 ldr r2, [r0] @@ -226257,10 +226257,10 @@ _0807D98E: ldrh r1, [r0, 0x26] adds r1, 0x3 strh r1, [r0, 0x26] - bl _0807E400 + bl @0807E400 .align 2, 0 .pool -_0807D9CC: +@0807D9CC: ldr r5, =0x02020630 ldr r4, [r7] adds r2, r4, 0 @@ -226293,9 +226293,9 @@ _0807D9CC: movs r0, 0x5A negs r0, r0 cmp r1, r0 - ble _0807DA12 - bl _0807E400 -_0807DA12: + ble @0807DA12 + bl @0807E400 +@0807DA12: movs r2, 0x1 strh r2, [r3, 0x30] ldrb r1, [r6] @@ -226310,34 +226310,34 @@ _0807DA12: adds r0, 0x1 strh r0, [r1] ldr r0, =c3_0805465C + 1 - b _0807DC5A + b @0807DC5A .align 2, 0 .pool -_0807DA38: +@0807DA38: ldr r2, =0x0000ffff movs r0, 0x8 movs r1, 0x10 bl sub_80A2A20 - bl _0807E394 + bl @0807E394 .align 2, 0 .pool -_0807DA4C: +@0807DA4C: ldr r2, =0x0000ffff movs r0, 0x8 movs r1, 0x10 bl sub_80A2A20 - bl _0807E394 + bl @0807E394 .align 2, 0 .pool -_0807DA60: +@0807DA60: ldr r2, =0x0000ffff movs r0, 0x8 movs r1, 0x10 bl sub_80A2A20 - bl _0807E394 + bl @0807E394 .align 2, 0 .pool -_0807DA74: +@0807DA74: ldr r5, =0x020322a0 ldr r0, [r5] adds r0, 0xF0 @@ -226345,7 +226345,7 @@ _0807DA74: bl sub_806E840 lsls r0, 24 cmp r0, 0 - bne _0807DAEC + bne @0807DAEC ldr r4, =0x02020630 ldr r2, [r5] adds r2, 0x8E @@ -226387,10 +226387,10 @@ _0807DA74: adds r0, r4 movs r1, 0 bl sub_8008258 - b _0807DB02 + b @0807DB02 .align 2, 0 .pool -_0807DAEC: +@0807DAEC: ldr r0, [r5] adds r0, 0x8E ldrb r1, [r0] @@ -226401,7 +226401,7 @@ _0807DAEC: adds r0, r1 movs r1, 0 bl sub_8008258 -_0807DB02: +@0807DB02: ldr r5, =0x020322a0 ldr r0, [r5] adds r0, 0x8F @@ -226469,10 +226469,10 @@ _0807DB02: ands r2, r1 strb r2, [r0] ldr r1, [r5] - bl _0807E398 + bl @0807E398 .align 2, 0 .pool -_0807DB9C: +@0807DB9C: ldr r4, =0x02020630 ldr r2, [r7] adds r3, r2, 0 @@ -226505,10 +226505,10 @@ _0807DB9C: lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - bhi _0807DBE4 + bhi @0807DBE4 movs r0, 0x2D bl audio_play -_0807DBE4: +@0807DBE4: ldr r2, [r7] adds r3, r2, 0 adds r3, 0x8E @@ -226522,9 +226522,9 @@ _0807DBE4: movs r0, 0xDE negs r0, r0 cmp r1, r0 - blt _0807DC04 - bl _0807E400 -_0807DC04: + blt @0807DC04 + bl @0807E400 +@0807DC04: adds r0, r2, 0 adds r0, 0x90 ldrb r1, [r0] @@ -226568,13 +226568,13 @@ _0807DC04: orrs r1, r2 strb r1, [r0] ldr r0, =sub_807F39C + 1 -_0807DC5A: +@0807DC5A: movs r1, 0x5 bl AddTask - b _0807E400 + b @0807E400 .align 2, 0 .pool -_0807DC6C: +@0807DC6C: ldr r4, =0x02020630 ldr r2, [r7] adds r3, r2, 0 @@ -226606,9 +226606,9 @@ _0807DC6C: movs r0, 0xDE negs r0, r0 cmp r1, r0 - ble _0807DCAE - b _0807E400 -_0807DCAE: + ble @0807DCAE + b @0807E400 +@0807DCAE: movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -226638,18 +226638,18 @@ _0807DCAE: lsls r0, 2 adds r0, r4 bl obj_delete_and_free_tiles - b _0807E400 + b @0807E400 .align 2, 0 .pool -_0807DCF4: +@0807DCF4: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0807DD02 - b _0807E400 -_0807DD02: + beq @0807DD02 + b @0807E400 +@0807DD02: ldr r1, [r7] adds r1, 0x94 ldrh r0, [r1] @@ -226707,10 +226707,10 @@ _0807DD02: adds r0, r5 movs r1, 0x1 bl obj_anim_image_start - b _0807E400 + b @0807E400 .align 2, 0 .pool -_0807DD94: +@0807DD94: movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -226718,8 +226718,8 @@ _0807DD94: adds r0, r1, 0 movs r2, 0x10 movs r3, 0 - b _0807E390 -_0807DDA4: + b @0807E390 +@0807DDA4: movs r1, 0x92 lsls r1, 5 movs r0, 0 @@ -226729,13 +226729,13 @@ _0807DDA4: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0807DDBC - b _0807E400 -_0807DDBC: - b _0807E394 + beq @0807DDBC + b @0807E400 +@0807DDBC: + b @0807E394 .align 2, 0 .pool -_0807DDC4: +@0807DDC4: ldr r2, =0x02020630 ldr r4, [r7] adds r3, r4, 0 @@ -226769,19 +226769,19 @@ _0807DDC4: ldrsh r0, [r0, r2] adds r1, r0 cmp r1, 0x40 - beq _0807DE0A - b _0807E400 -_0807DE0A: + beq @0807DE0A + b @0807E400 +@0807DE0A: adds r0, r4, 0 adds r0, 0x94 movs r1, 0x90 strh r1, [r0] movs r0, 0 str r0, [r4, 0x64] - b _0807E400 + b @0807E400 .align 2, 0 .pool -_0807DE1C: +@0807DE1C: movs r1, 0xB2 lsls r1, 5 movs r0, 0 @@ -226801,7 +226801,7 @@ _0807DE1C: adds r0, 0x1 str r0, [r2, 0x64] cmp r0, 0xA - bne _0807DE60 + bne @0807DE60 ldr r0, =c3_08054588 + 1 movs r1, 0x5 bl AddTask @@ -226814,7 +226814,7 @@ _0807DE1C: adds r1, r2 movs r0, 0x1 strh r0, [r1, 0xC] -_0807DE60: +@0807DE60: ldr r1, [r4] adds r3, r1, 0 adds r3, 0xE0 @@ -226823,14 +226823,14 @@ _0807DE60: movs r2, 0x9E lsls r2, 1 cmp r0, r2 - bgt _0807DE74 - b _0807E400 -_0807DE74: + bgt @0807DE74 + b @0807E400 +@0807DE74: strh r2, [r3] - b _0807E398 + b @0807E398 .align 2, 0 .pool -_0807DE84: +@0807DE84: ldr r0, [r7] adds r0, 0x90 ldrb r1, [r0] @@ -226856,18 +226856,18 @@ _0807DE84: movs r1, 0 strh r0, [r2] str r1, [r3, 0x64] - b _0807E400 + b @0807E400 .align 2, 0 .pool -_0807DEC0: +@0807DEC0: ldr r0, =c3_08054588 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq _0807DED0 - b _0807E400 -_0807DED0: + beq @0807DED0 + b @0807E400 +@0807DED0: ldr r0, =0x020322a0 ldr r2, [r0] adds r1, r2, 0 @@ -226875,20 +226875,20 @@ _0807DED0: movs r0, 0x2E strh r0, [r1] str r3, [r2, 0x64] - b _0807E400 + b @0807E400 .align 2, 0 .pool -_0807DEE8: +@0807DEE8: ldr r1, [r7] ldr r0, [r1, 0x64] adds r0, 0x1 str r0, [r1, 0x64] cmp r0, 0xA - beq _0807DEF6 - b _0807E400 -_0807DEF6: - b _0807E398 -_0807DEF8: + beq @0807DEF6 + b @0807E400 +@0807DEF6: + b @0807E398 +@0807DEF8: ldr r1, [r7] adds r5, r1, 0 adds r5, 0xE0 @@ -226900,12 +226900,12 @@ _0807DEF8: movs r6, 0xAE lsls r6, 1 cmp r0, r6 - bgt _0807DF12 - b _0807E400 -_0807DF12: + bgt @0807DF12 + b @0807E400 +@0807DF12: strh r6, [r5] - b _0807E398 -_0807DF16: + b @0807E398 +@0807DF16: ldr r0, =0x08338e74 movs r1, 0x78 movs r2, 0x50 @@ -226919,10 +226919,10 @@ _0807DF16: adds r0, 0x94 movs r1, 0x32 strh r1, [r0] - b _0807E400 + b @0807E400 .align 2, 0 .pool -_0807DF3C: +@0807DF3C: ldr r2, =0x02020630 ldr r0, [r7] adds r0, 0x91 @@ -226936,9 +226936,9 @@ _0807DF3C: ldrb r0, [r0] lsls r0, 27 cmp r0, 0 - blt _0807DF5A - b _0807E400 -_0807DF5A: + blt @0807DF5A + b @0807E400 +@0807DF5A: adds r0, r1, 0 bl obj_delete_and_free_tiles movs r0, 0x6 @@ -226950,24 +226950,24 @@ _0807DF5A: strh r0, [r1] movs r0, 0x9F bl audio_play - b _0807E400 + b @0807E400 .align 2, 0 .pool -_0807DF7C: +@0807DF7C: ldr r1, [r7] adds r2, r1, 0 adds r2, 0xEA ldrh r3, [r2] ldr r0, =0x000003ff cmp r3, r0 - bhi _0807DF98 + bhi @0807DF98 adds r0, r3, 0 adds r0, 0x34 strh r0, [r2] - b _0807DFA6 + b @0807DFA6 .align 2, 0 .pool -_0807DF98: +@0807DF98: movs r0, 0x80 lsls r0, 3 strh r0, [r2] @@ -226975,9 +226975,9 @@ _0807DF98: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_0807DFA6: +@0807DFA6: ldr r4, [r7] -_0807DFA8: +@0807DFA8: adds r0, r4, 0 adds r0, 0xEA ldrh r1, [r0] @@ -226986,8 +226986,8 @@ _0807DFA8: bl __divsi3 adds r4, 0xE8 strh r0, [r4] - b _0807E400 -_0807DFBC: + b @0807E400 +@0807DFBC: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -227000,18 +227000,18 @@ _0807DFBC: adds r0, 0x94 movs r1, 0x3C strh r1, [r0] - b _0807E400 + b @0807E400 .align 2, 0 .pool -_0807DFDC: +@0807DFDC: ldr r4, =0x02037fd4 ldrb r1, [r4, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0807DFEA - b _0807E400 -_0807DFEA: + beq @0807DFEA + b @0807E400 +@0807DFEA: movs r0, 0x5 bl sub_807B62C movs r0, 0x7 @@ -227020,10 +227020,10 @@ _0807DFEA: movs r1, 0x80 orrs r0, r1 strb r0, [r4, 0x8] - b _0807E394 + b @0807E394 .align 2, 0 .pool -_0807E004: +@0807E004: ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F @@ -227035,10 +227035,10 @@ _0807E004: str r1, [sp] movs r2, 0x10 movs r3, 0 - b _0807E390 + b @0807E390 .align 2, 0 .pool -_0807E020: +@0807E020: movs r1, 0xA2 lsls r1, 5 movs r0, 0 @@ -227048,13 +227048,13 @@ _0807E020: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0807E038 - b _0807E400 -_0807E038: - b _0807E394 + beq @0807E038 + b @0807E400 +@0807E038: + b @0807E394 .align 2, 0 .pool -_0807E040: +@0807E040: ldr r0, =0x08338d28 movs r2, 0x8 negs r2, r2 @@ -227123,10 +227123,10 @@ _0807E040: adds r0, 0x1 strh r0, [r1] str r6, [r2, 0x64] - b _0807E400 + b @0807E400 .align 2, 0 .pool -_0807E0E8: +@0807E0E8: ldr r2, =0x02020630 ldr r0, [r7] adds r0, 0xD3 @@ -227147,10 +227147,10 @@ _0807E0E8: movs r3, 0 bl sub_80A1AD4 ldr r1, [r7] - b _0807E398 + b @0807E398 .align 2, 0 .pool -_0807E11C: +@0807E11C: ldr r2, =0x02020630 ldr r3, [r7] adds r0, r3, 0 @@ -227164,9 +227164,9 @@ _0807E11C: ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - beq _0807E13A - b _0807E400 -_0807E13A: + beq @0807E13A + b @0807E400 +@0807E13A: adds r0, r3, 0 adds r0, 0xF2 ldrh r2, [r0] @@ -227179,10 +227179,10 @@ _0807E13A: ldr r3, [r3, 0x6C] bl help_system_enable_unless_flashback__sp199 ldr r1, [r7] - b _0807E398 + b @0807E398 .align 2, 0 .pool -_0807E168: +@0807E168: ldr r4, =0x02020630 ldr r2, [r7] adds r6, r2, 0 @@ -227268,10 +227268,10 @@ _0807E168: adds r0, r4 bl obj_delete_and_free_tiles ldr r1, [r7] - b _0807E398 + b @0807E398 .align 2, 0 .pool -_0807E228: +@0807E228: movs r1, 0xAA lsls r1, 5 movs r0, 0 @@ -227290,61 +227290,61 @@ _0807E228: adds r1, 0x94 movs r2, 0 movs r0, 0xA7 -_0807E252: +@0807E252: strh r0, [r1] str r2, [r3, 0x64] - b _0807E400 + b @0807E400 .align 2, 0 .pool -_0807E264: +@0807E264: ldr r3, [r7] ldr r0, [r3, 0x64] adds r0, 0x1 str r0, [r3, 0x64] cmp r0, 0x3C - bhi _0807E272 - b _0807E400 -_0807E272: + bhi @0807E272 + b @0807E400 +@0807E272: adds r0, r3, 0 adds r0, 0x94 movs r2, 0 ldr r1, =0x0000010b strh r1, [r0] str r2, [r3, 0x64] - b _0807E400 + b @0807E400 .align 2, 0 .pool -_0807E284: +@0807E284: bl sub_80A3678 lsls r0, 24 cmp r0, 0 - bne _0807E290 - b _0807E400 -_0807E290: + bne @0807E290 + b @0807E400 +@0807E290: ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0x94 movs r1, 0x44 strh r1, [r0] - b _0807E400 + b @0807E400 .align 2, 0 .pool -_0807E2A0: +@0807E2A0: ldr r1, [r7] ldr r0, [r1, 0x64] adds r0, 0x1 str r0, [r1, 0x64] cmp r0, 0xA - bne _0807E2B2 + bne @0807E2B2 ldr r0, =0x00000173 bl fanfare_play -_0807E2B2: +@0807E2B2: ldr r1, [r7] ldr r0, [r1, 0x64] cmp r0, 0xFA - beq _0807E2BC - b _0807E400 -_0807E2BC: + beq @0807E2BC + b @0807E400 +@0807E2BC: adds r1, 0x94 ldrh r0, [r1] adds r0, 0x1 @@ -227360,43 +227360,43 @@ _0807E2BC: bl sub_807F1A8 ldr r0, [r7] str r5, [r0, 0x64] - b _0807E400 + b @0807E400 .align 2, 0 .pool -_0807E2EC: +@0807E2EC: ldr r1, [r7] ldr r0, [r1, 0x64] adds r0, 0x1 str r0, [r1, 0x64] cmp r0, 0x3C - beq _0807E2FA - b _0807E400 -_0807E2FA: - b _0807E398 -_0807E2FC: + beq @0807E2FA + b @0807E400 +@0807E2FA: + b @0807E398 +@0807E2FC: bl sub_807F14C - b _0807E394 -_0807E302: + b @0807E394 +@0807E302: ldr r2, [r7] adds r0, r2, 0 adds r0, 0xEE ldrb r0, [r0] cmp r0, 0 - beq _0807E312 + beq @0807E312 movs r0, 0x1 - b _0807E402 -_0807E312: + b @0807E402 +@0807E312: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0807E400 + beq @0807E400 adds r1, r2, 0 - b _0807E398 + b @0807E398 .align 2, 0 .pool -_0807E328: +@0807E328: ldr r0, =0x020375e2 ldrb r0, [r0] movs r1, 0 @@ -227416,7 +227416,7 @@ _0807E328: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq _0807E394 + beq @0807E394 ldrb r3, [r7] adds r0, r3, 0 muls r0, r6 @@ -227427,30 +227427,30 @@ _0807E328: ldrb r2, [r1] adds r1, r4, 0 bl sub_813E1D4 - b _0807E394 + b @0807E394 .align 2, 0 .pool -_0807E384: +@0807E384: movs r0, 0x1 negs r0, r0 movs r1, 0 str r1, [sp] movs r2, 0 movs r3, 0x10 -_0807E390: +@0807E390: bl sub_80A1AD4 -_0807E394: +@0807E394: ldr r0, =0x020322a0 ldr r1, [r0] -_0807E398: +@0807E398: adds r1, 0x94 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0807E400 + b @0807E400 .align 2, 0 .pool -_0807E3A8: +@0807E3A8: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -227458,14 +227458,14 @@ _0807E3A8: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _0807E400 + bne @0807E400 ldr r0, [r7] adds r0, 0xF4 ldrh r0, [r0] bl current_map_music_set ldr r0, [r7] cmp r0, 0 - beq _0807E3F6 + beq @0807E3F6 bl Window_FreeMemory movs r0, 0x3 bl bg_get_tilemap @@ -227480,13 +227480,13 @@ _0807E3A8: ldr r0, [r7] bl free str r4, [r7] -_0807E3F6: +@0807E3F6: ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 bl sub_807E784 -_0807E400: +@0807E400: movs r0, 0 -_0807E402: +@0807E402: add sp, 0x14 pop {r4-r7} pop {r1} @@ -227496,7 +227496,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} @@ -227506,21 +227506,21 @@ c2_08053788: @ 807E414 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0 - beq _0807E434 + beq @0807E434 cmp r0, 0x4 - beq _0807E444 - b _0807E4B4 + beq @0807E444 + b @0807E4B4 .align 2, 0 .pool -_0807E434: +@0807E434: movs r0, 0x4 strb r0, [r1] ldr r1, =0x03002700 movs r0, 0x1 - b _0807E4B2 + b @0807E4B2 .align 2, 0 .pool -_0807E444: +@0807E444: ldr r0, =0x030061e8 ldr r1, =sub_807EB50 + 1 mov r8, r1 @@ -227537,7 +227537,7 @@ _0807E444: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq _0807E494 + beq @0807E494 ldrb r3, [r7] adds r0, r3, 0 muls r0, r6 @@ -227548,33 +227548,33 @@ _0807E444: ldrb r2, [r1] adds r1, r4, 0 bl sub_813E1D4 - b _0807E4AE + b @0807E4AE .align 2, 0 .pool -_0807E494: +@0807E494: bl sub_8077260 cmp r0, 0 - beq _0807E4A8 + beq @0807E4A8 ldr r0, =sub_807F464 + 1 bl set_callback2 - b _0807E4AE + b @0807E4AE .align 2, 0 .pool -_0807E4A8: +@0807E4A8: mov r0, r8 bl set_callback2 -_0807E4AE: +@0807E4AE: ldr r1, =0x02032298 movs r0, 0xFF -_0807E4B2: +@0807E4B2: strb r0, [r1] -_0807E4B4: +@0807E4B4: bl sub_800B33C lsls r0, 24 cmp r0, 0 - bne _0807E4C2 + bne @0807E4C2 bl run_active_tasks -_0807E4C2: +@0807E4C2: bl call_obj_callbacks bl obj_sync_something bl fade_and_return_progress_probably @@ -227588,7 +227588,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 @@ -227598,31 +227598,31 @@ sub_807E4DC: @ 807E4DC adds r0, r5, 0 ands r0, r6 cmp r0, 0 - beq _0807E51A + beq @0807E51A ldr r4, =0x020223c4 ldrh r1, [r4] ldr r0, =0x0000dcba cmp r1, r0 - bne _0807E504 + bne @0807E504 ldr r0, =c2_08053788 + 1 bl set_callback2 -_0807E504: +@0807E504: ldrh r1, [r4] ldr r0, =0x0000abcd cmp r1, r0 - bne _0807E514 + bne @0807E514 ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0x72 strb r6, [r0] -_0807E514: +@0807E514: movs r0, 0 bl sub_800A5EC -_0807E51A: +@0807E51A: movs r0, 0x2 ands r0, r5 cmp r0, 0 - beq _0807E542 + beq @0807E542 ldr r0, =0x020223c4 movs r1, 0x80 lsls r1, 1 @@ -227630,16 +227630,16 @@ _0807E51A: ldrh r1, [r0] ldr r0, =0x0000abcd cmp r1, r0 - bne _0807E53C + bne @0807E53C ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0x73 movs r1, 0x1 strb r1, [r0] -_0807E53C: +@0807E53C: movs r0, 0x1 bl sub_800A5EC -_0807E542: +@0807E542: pop {r4-r6} pop {r0} bx r0 @@ -227648,7 +227648,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 @@ -227670,7 +227670,7 @@ sub_807E55C: @ 807E55C lsls r4, 16 asrs r4, 16 cmp r4, 0x4C - ble _0807E5AA + ble @0807E5AA movs r0, 0x4C strh r0, [r5, 0x22] movs r2, 0x2E @@ -227685,14 +227685,14 @@ sub_807E55C: @ 807E55C ldrh r0, [r5, 0x34] adds r0, 0x1 strh r0, [r5, 0x34] -_0807E5AA: +@0807E5AA: movs r1, 0x20 ldrsh r0, [r5, r1] cmp r0, 0x78 - bne _0807E5B6 + bne @0807E5B6 movs r0, 0 strh r0, [r5, 0x30] -_0807E5B6: +@0807E5B6: ldrh r0, [r5, 0x36] ldrh r2, [r5, 0x2E] adds r0, r2 @@ -227700,12 +227700,12 @@ _0807E5B6: movs r1, 0x34 ldrsh r0, [r5, r1] cmp r0, 0x4 - bne _0807E5CE + bne @0807E5CE movs r0, 0x1 strh r0, [r5, 0x3C] ldr r0, =nullsub_12 + 1 str r0, [r5, 0x1C] -_0807E5CE: +@0807E5CE: pop {r4,r5} pop {r0} bx r0 @@ -227714,7 +227714,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 @@ -227731,17 +227731,17 @@ sub_807E5D8: @ 807E5D8 movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0x16 - bne _0807E600 + bne @0807E600 movs r0, 0x38 bl audio_play -_0807E600: +@0807E600: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] lsls r0, 16 asrs r0, 16 cmp r0, 0x2C - bne _0807E636 + bne @0807E636 movs r0, 0x8C bl audio_play ldr r0, =sub_807E64C + 1 @@ -227760,7 +227760,7 @@ _0807E600: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 -_0807E636: +@0807E636: add sp, 0x4 pop {r4} pop {r0} @@ -227770,24 +227770,24 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0x14 - bne _0807E660 + bne @0807E660 adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 -_0807E660: +@0807E660: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - ble _0807E69E + ble @0807E69E ldr r1, =0x08339024 movs r2, 0x2E ldrsh r0, [r4, r2] @@ -227803,7 +227803,7 @@ _0807E660: lsls r0, 16 asrs r0, 16 cmp r0, 0x17 - bne _0807E69E + bne @0807E69E adds r0, r4, 0 bl obj_delete_and_free_tiles ldr r0, =0x020322a0 @@ -227811,7 +227811,7 @@ _0807E660: adds r0, 0x94 movs r1, 0xE strh r1, [r0] -_0807E69E: +@0807E69E: pop {r4} pop {r0} bx r0 @@ -227820,14 +227820,14 @@ _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] movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0807E6DC + bne @0807E6DC ldrh r0, [r4, 0x22] adds r0, 0x4 strh r0, [r4, 0x22] @@ -227836,36 +227836,36 @@ sub_807E6AC: @ 807E6AC movs r3, 0x34 ldrsh r1, [r4, r3] cmp r0, r1 - ble _0807E72C + ble @0807E72C adds r0, r2, 0x1 strh r0, [r4, 0x32] movs r0, 0x16 strh r0, [r4, 0x2E] movs r0, 0x38 bl audio_play - b _0807E72C -_0807E6DC: + b @0807E72C +@0807E6DC: movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0x42 - bne _0807E6EA + bne @0807E6EA movs r0, 0x39 bl audio_play -_0807E6EA: +@0807E6EA: movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0x5C - bne _0807E6F8 + bne @0807E6F8 movs r0, 0x3A bl audio_play -_0807E6F8: +@0807E6F8: movs r3, 0x2E ldrsh r0, [r4, r3] cmp r0, 0x6B - bne _0807E706 + bne @0807E706 movs r0, 0x3B bl audio_play -_0807E706: +@0807E706: ldr r1, =0x08339024 movs r2, 0x2E ldrsh r0, [r4, r2] @@ -227882,10 +227882,10 @@ _0807E706: lsls r0, 16 asrs r0, 16 cmp r0, 0x6C - bne _0807E72C + bne @0807E72C ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] -_0807E72C: +@0807E72C: pop {r4} pop {r0} bx r0 @@ -227894,7 +227894,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] @@ -227924,7 +227924,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 @@ -227962,7 +227962,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 @@ -228087,11 +228087,11 @@ sub_807E7E8: @ 807E7E8 strb r0, [r4] ldrh r0, [r5, 0x28] cmp r0, 0 - beq _0807E960 + beq @0807E960 bl itemid_is_mail lsls r0, 24 cmp r0, 0 - beq _0807E954 + beq @0807E954 add r0, sp, 0x10 adds r1, r5, 0 bl sub_807E974 @@ -228112,16 +228112,16 @@ sub_807E7E8: @ 807E7E8 adds r0, r6, 0 movs r1, 0xC bl pokemon_setattr - b _0807E960 + b @0807E960 .align 2, 0 .pool -_0807E954: +@0807E954: adds r2, r5, 0 adds r2, 0x28 adds r0, r6, 0 movs r1, 0xC bl pokemon_setattr -_0807E960: +@0807E960: ldr r0, =0x02024744 bl pokemon_calc_effective_stats add sp, 0x38 @@ -228133,7 +228133,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 @@ -228147,14 +228147,14 @@ sub_807E974: @ 807E974 adds r2, r0, r2 adds r1, r5, 0 movs r3, 0x8 -_0807E98E: +@0807E98E: ldrh r0, [r2] strh r0, [r1] adds r2, 0x2 adds r1, 0x2 subs r3, 0x1 cmp r3, 0 - bge _0807E98E + bge @0807E98E adds r4, r5, 0 adds r4, 0x12 adds r1, r6, 0 @@ -228184,7 +228184,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] @@ -228195,7 +228195,7 @@ sub_807E9D4: @ 807E9D4 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _0807EA08 + bne @0807EA08 ldrh r0, [r6] muls r0, r5 adds r0, r4 @@ -228203,19 +228203,19 @@ sub_807E9D4: @ 807E9D4 bl pokemon_getattr lsls r0, 16 lsrs r0, 16 - b _0807EA0A + b @0807EA0A .align 2, 0 .pool -_0807EA08: +@0807EA08: movs r0, 0 -_0807EA0A: +@0807EA0A: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_807E9D4 thumb_func_start sub_807EA10 -sub_807EA10: @ 807EA10 +sub_807EA10: ; 807EA10 push {lr} ldr r0, =0x020375e2 ldrb r0, [r0] @@ -228229,13 +228229,13 @@ 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 lsrs r6, r0, 24 cmp r6, 0x1 - bne _0807EA96 + bne @0807EA96 ldr r5, =0x020322a0 ldr r0, [r5] adds r0, 0x8E @@ -228266,7 +228266,7 @@ sub_807EA2C: @ 807EA2C bl sub_807B4D0 bl sub_8077260 cmp r0, 0 - bne _0807EA90 + bne @0807EA90 ldr r0, [r5] adds r2, r0, 0 adds r2, 0x74 @@ -228274,10 +228274,10 @@ sub_807EA2C: @ 807EA2C strh r1, [r2] adds r0, 0x93 strb r6, [r0] -_0807EA90: +@0807EA90: ldr r0, =sub_807EACC + 1 bl set_callback2 -_0807EA96: +@0807EA96: bl sub_807B5B8 bl sub_807E4DC bl run_active_tasks @@ -228293,23 +228293,23 @@ _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 lsrs r4, r0, 24 bl sub_8077260 cmp r0, 0 - beq _0807EAEC + beq @0807EAEC ldr r0, =c2_08053788 + 1 bl set_callback2 - b _0807EB2C + b @0807EB2C .align 2, 0 .pool -_0807EAEC: +@0807EAEC: bl sub_807E4DC cmp r4, 0 - bne _0807EB2C + bne @0807EB2C ldr r4, =0x020322a0 ldr r2, [r4] adds r0, r2, 0 @@ -228317,7 +228317,7 @@ _0807EAEC: ldrh r1, [r0] ldr r0, =0x00000101 cmp r1, r0 - bne _0807EB2C + bne @0807EB2C adds r1, r2, 0 adds r1, 0x74 ldr r0, =0x0000dcba @@ -228336,7 +228336,7 @@ _0807EAEC: ldr r0, [r4] adds r0, 0x73 strb r1, [r0] -_0807EB2C: +@0807EB2C: bl run_active_tasks bl call_obj_callbacks bl obj_sync_something @@ -228349,7 +228349,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 @@ -228359,121 +228359,121 @@ sub_807EB50: @ 807EB50 ldrb r0, [r0] adds r2, r1, 0 cmp r0, 0x65 - bls _0807EB66 - b _0807F03A -_0807EB66: + bls @0807EB66 + b @0807F03A +@0807EB66: lsls r0, 2 - ldr r1, =_0807EB78 + ldr r1, =@0807EB78 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0807EB78: - .4byte _0807ED10 - .4byte _0807ED2C - .4byte _0807ED98 - .4byte _0807F03A - .4byte _0807EE78 - .4byte _0807EF3C - .4byte _0807EF64 - .4byte _0807EF7E - .4byte _0807EFA4 - .4byte _0807EFF0 - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807EE9C - .4byte _0807EEEC - .4byte _0807EF1A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807EDC0 - .4byte _0807EE1C - .4byte _0807EE38 - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807F03A - .4byte _0807ED44 - .4byte _0807ED7C -_0807ED10: +@0807EB78: + .4byte @0807ED10 + .4byte @0807ED2C + .4byte @0807ED98 + .4byte @0807F03A + .4byte @0807EE78 + .4byte @0807EF3C + .4byte @0807EF64 + .4byte @0807EF7E + .4byte @0807EFA4 + .4byte @0807EFF0 + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807EE9C + .4byte @0807EEEC + .4byte @0807EF1A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807EDC0 + .4byte @0807EE1C + .4byte @0807EE38 + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807F03A + .4byte @0807ED44 + .4byte @0807ED7C +@0807ED10: movs r0, 0x87 lsls r0, 3 adds r1, r2, r0 @@ -228482,10 +228482,10 @@ _0807ED10: strb r0, [r1] ldr r4, =0x02021fc4 ldr r1, =0x085ef6d2 - b _0807EDA6 + b @0807EDA6 .align 2, 0 .pool -_0807ED2C: +@0807ED2C: movs r0, 0 bl sub_8077288 ldr r0, =0x030022c0 @@ -228494,17 +228494,17 @@ _0807ED2C: adds r0, r1 movs r2, 0 movs r1, 0x64 - b _0807EE88 + b @0807EE88 .align 2, 0 .pool -_0807ED44: +@0807ED44: ldr r0, =0x020322a0 ldr r3, [r0] ldr r0, [r3, 0x64] adds r0, 0x1 str r0, [r3, 0x64] cmp r0, 0xB4 - bls _0807ED60 + bls @0807ED60 movs r1, 0x87 lsls r1, 3 adds r0, r2, r1 @@ -228512,36 +228512,36 @@ _0807ED44: movs r1, 0x65 strb r1, [r0] str r2, [r3, 0x64] -_0807ED60: +@0807ED60: bl sub_8077294 cmp r0, 0 - bne _0807ED6A - b _0807F03A -_0807ED6A: + bne @0807ED6A + b @0807F03A +@0807ED6A: ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r2 - b _0807ED8E + b @0807ED8E .align 2, 0 .pool -_0807ED7C: +@0807ED7C: bl sub_8077294 cmp r0, 0 - bne _0807ED86 - b _0807F03A -_0807ED86: + bne @0807ED86 + b @0807F03A +@0807ED86: ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 -_0807ED8E: +@0807ED8E: movs r1, 0x2 strb r1, [r0] - b _0807F03A + b @0807F03A .align 2, 0 .pool -_0807ED98: +@0807ED98: movs r0, 0x87 lsls r0, 3 adds r1, r2, r0 @@ -228549,27 +228549,27 @@ _0807ED98: strb r0, [r1] ldr r4, =0x02021fc4 ldr r1, =0x082c8959 -_0807EDA6: +@0807EDA6: adds r0, r4, 0 bl ExpandTextCodes movs r0, 0 adds r1, r4, 0 movs r2, 0 bl sub_807F1A8 - b _0807F03A + b @0807F03A .align 2, 0 .pool -_0807EDC0: +@0807EDC0: bl in_trade_center cmp r0, 0 - bne _0807EDCE + bne @0807EDCE movs r0, 0x15 bl sav12_xor_increment -_0807EDCE: +@0807EDCE: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _0807EDF6 + beq @0807EDF6 ldr r4, =0x020229e8 bl link_get_multiplayer_id movs r1, 0x1 @@ -228584,7 +228584,7 @@ _0807EDCE: ldr r1, [r1] movs r0, 0x2 bl sub_801B990 -_0807EDF6: +@0807EDF6: bl sub_8076D5C bl sub_8153380 ldr r1, =0x030022c0 @@ -228595,31 +228595,31 @@ _0807EDF6: adds r0, 0x1 movs r2, 0 strb r0, [r1] - b _0807EE8A + b @0807EE8A .align 2, 0 .pool -_0807EE1C: +@0807EE1C: ldr r0, =0x020322a0 ldr r1, [r0] ldr r0, [r1, 0x64] adds r0, 0x1 str r0, [r1, 0x64] cmp r0, 0x5 - beq _0807EE2C - b _0807F03A -_0807EE2C: + beq @0807EE2C + b @0807F03A +@0807EE2C: movs r0, 0x87 lsls r0, 3 adds r1, r2, r0 - b _0807EFE4 + b @0807EFE4 .align 2, 0 .pool -_0807EE38: +@0807EE38: bl sub_81533AC lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq _0807EE5C + beq @0807EE5C bl sav2_gender2_inplace_and_xFE ldr r0, =0x030022c0 movs r1, 0x87 @@ -228627,10 +228627,10 @@ _0807EE38: adds r0, r1 movs r1, 0x4 strb r1, [r0] - b _0807F03A + b @0807F03A .align 2, 0 .pool -_0807EE5C: +@0807EE5C: ldr r0, =0x020322a0 ldr r0, [r0] str r1, [r0, 0x64] @@ -228640,10 +228640,10 @@ _0807EE5C: adds r0, r2 movs r1, 0x33 strb r1, [r0] - b _0807F03A + b @0807F03A .align 2, 0 .pool -_0807EE78: +@0807EE78: bl sub_81533E0 ldr r0, =0x030022c0 movs r1, 0x87 @@ -228651,29 +228651,29 @@ _0807EE78: adds r0, r1 movs r2, 0 movs r1, 0x28 -_0807EE88: +@0807EE88: strb r1, [r0] -_0807EE8A: +@0807EE8A: ldr r0, =0x020322a0 ldr r0, [r0] str r2, [r0, 0x64] - b _0807F03A + b @0807F03A .align 2, 0 .pool -_0807EE9C: +@0807EE9C: ldr r4, =0x020322a0 ldr r1, [r4] ldr r0, [r1, 0x64] adds r0, 0x1 str r0, [r1, 0x64] cmp r0, 0x32 - bhi _0807EEAC - b _0807F03A -_0807EEAC: + bhi @0807EEAC + b @0807F03A +@0807EEAC: bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - bne _0807EED4 + bne @0807EED4 bl GenerateRandomNumber ldr r4, [r4] lsls r0, 16 @@ -228683,29 +228683,29 @@ _0807EEAC: lsls r0, 16 lsrs r0, 16 str r0, [r4, 0x64] - b _0807EEDA + b @0807EEDA .align 2, 0 .pool -_0807EED4: +@0807EED4: ldr r1, [r4] movs r0, 0 str r0, [r1, 0x64] -_0807EEDA: +@0807EEDA: ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r2 movs r1, 0x29 strb r1, [r0] - b _0807F03A + b @0807F03A .align 2, 0 .pool -_0807EEEC: +@0807EEEC: ldr r0, =0x020322a0 ldr r1, [r0] ldr r0, [r1, 0x64] cmp r0, 0 - bne _0807EF14 + bne @0807EF14 movs r0, 0x1 bl sub_8077288 ldr r0, =0x030022c0 @@ -228714,19 +228714,19 @@ _0807EEEC: adds r0, r1 movs r1, 0x2A strb r1, [r0] - b _0807F03A + b @0807F03A .align 2, 0 .pool -_0807EF14: +@0807EF14: subs r0, 0x1 str r0, [r1, 0x64] - b _0807F03A -_0807EF1A: + b @0807F03A +@0807EF1A: bl sub_8077294 cmp r0, 0 - bne _0807EF24 - b _0807F03A -_0807EF24: + bne @0807EF24 + b @0807F03A +@0807EF24: bl sub_8153408 ldr r0, =0x030022c0 movs r2, 0x87 @@ -228734,17 +228734,17 @@ _0807EF24: adds r0, r2 movs r1, 0x5 strb r1, [r0] - b _0807F03A + b @0807F03A .align 2, 0 .pool -_0807EF3C: +@0807EF3C: ldr r0, =0x020322a0 ldr r1, [r0] ldr r0, [r1, 0x64] adds r0, 0x1 str r0, [r1, 0x64] cmp r0, 0x3C - bls _0807F03A + bls @0807F03A movs r0, 0x87 lsls r0, 3 adds r1, r2, r0 @@ -228753,13 +228753,13 @@ _0807EF3C: strb r0, [r1] movs r0, 0x2 bl sub_8077288 - b _0807F03A + b @0807F03A .align 2, 0 .pool -_0807EF64: +@0807EF64: bl sub_8077294 cmp r0, 0 - beq _0807F03A + beq @0807F03A movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -228767,93 +228767,93 @@ _0807EF64: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - b _0807EFDC -_0807EF7E: + b @0807EFDC +@0807EF7E: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0807F03A + bne @0807F03A movs r0, 0x3 bl play_sound_effect ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _0807EFE4 + b @0807EFE4 .align 2, 0 .pool -_0807EFA4: +@0807EFA4: bl sub_80A3258 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0807F03A + bne @0807F03A ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _0807EFD8 + beq @0807EFD8 ldr r0, =0x030022c0 ldr r1, [r0, 0x8] ldr r0, =sub_80773AC + 1 cmp r1, r0 - bne _0807EFD8 + bne @0807EFD8 movs r0, 0x3 bl sub_8077288 - b _0807EFDC + b @0807EFDC .align 2, 0 .pool -_0807EFD8: +@0807EFD8: bl sub_800AC34 -_0807EFDC: +@0807EFDC: ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 -_0807EFE4: +@0807EFE4: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0807F03A + b @0807F03A .align 2, 0 .pool -_0807EFF0: +@0807EFF0: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _0807F028 + beq @0807F028 ldr r1, [r2, 0x8] ldr r0, =sub_80773AC + 1 cmp r1, r0 - bne _0807F028 + bne @0807F028 bl sub_8077294 cmp r0, 0 - beq _0807F03A + beq @0807F03A ldr r0, =0x03002700 movs r1, 0 strb r1, [r0] ldr r0, =c2_080543C4 + 1 bl set_callback2 - b _0807F03A + b @0807F03A .align 2, 0 .pool -_0807F028: +@0807F028: ldr r0, =0x03003124 ldrb r1, [r0] cmp r1, 0 - bne _0807F03A + bne @0807F03A ldr r0, =0x03002700 strb r1, [r0] ldr r0, =c2_080543C4 + 1 bl set_callback2 -_0807F03A: +@0807F03A: bl sub_800B33C lsls r0, 24 cmp r0, 0 - bne _0807F048 + bne @0807F048 bl run_active_tasks -_0807F048: +@0807F048: bl call_obj_callbacks bl obj_sync_something bl fade_and_return_progress_probably @@ -228866,7 +228866,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] @@ -228875,7 +228875,7 @@ c2_080543C4: @ 807F068 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _0807F0BE + bne @0807F0BE bl Window_FreeMemory movs r0, 0x3 bl bg_get_tilemap @@ -228894,13 +228894,13 @@ c2_080543C4: @ 807F068 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _0807F0B6 + beq @0807F0B6 bl sub_800E084 -_0807F0B6: +@0807F0B6: ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 -_0807F0BE: +@0807F0BE: bl run_active_tasks bl call_obj_callbacks bl obj_sync_something @@ -228913,7 +228913,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 @@ -228935,7 +228935,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 @@ -228944,7 +228944,7 @@ sub_807F110: @ 807F110 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0807F134 + bne @0807F134 ldr r0, =sub_807B270 + 1 bl set_callback2 ldr r1, =0x03005dac @@ -228952,7 +228952,7 @@ sub_807F110: @ 807F110 str r0, [r1] adds r0, r4, 0 bl remove_task -_0807F134: +@0807F134: pop {r4} pop {r0} bx r0 @@ -228961,11 +228961,11 @@ _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 -_0807F152: +@0807F152: ldr r0, =0x02032298 ldrb r0, [r0, 0x1] movs r1, 0x6 @@ -228986,12 +228986,12 @@ _0807F152: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xB - bls _0807F152 + bls @0807F152 cmp r5, 0 - beq _0807F18A + beq @0807F18A ldr r0, =0x0000089b bl flag_set -_0807F18A: +@0807F18A: pop {r4,r5} pop {r0} bx r0 @@ -229000,7 +229000,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} @@ -229008,7 +229008,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 @@ -229061,7 +229061,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 @@ -229081,39 +229081,39 @@ c3_08054588: @ 807F210 movs r3, 0x4 ldrsh r0, [r4, r3] cmp r0, 0 - bne _0807F254 + bne @0807F254 movs r0, 0x80 lsls r0, 1 cmp r1, r0 - beq _0807F25C + beq @0807F25C lsls r0, r1, 1 ldr r1, =0x08337aa0 adds r0, r1 - b _0807F25E + b @0807F25E .align 2, 0 .pool -_0807F254: +@0807F254: movs r0, 0x80 lsls r0, 1 cmp r1, r0 - bne _0807F26C -_0807F25C: + bne @0807F26C +@0807F25C: ldr r0, =0x08337ea0 -_0807F25E: +@0807F25E: movs r1, 0x30 movs r2, 0x20 bl gpu_pal_apply - b _0807F27A + b @0807F27A .align 2, 0 .pool -_0807F26C: +@0807F26C: lsls r0, r2, 1 ldr r1, =0x08337ca0 adds r0, r1 movs r1, 0x30 movs r2, 0x20 bl gpu_pal_apply -_0807F27A: +@0807F27A: ldr r0, =0x08339090 movs r2, 0 ldrsh r1, [r4, r2] @@ -229121,14 +229121,14 @@ _0807F27A: adds r1, r0 ldrb r0, [r1] cmp r0, 0 - bne _0807F298 + bne @0807F298 movs r3, 0x2 ldrsh r0, [r4, r3] cmp r0, 0 - bne _0807F298 + bne @0807F298 movs r0, 0xC3 bl audio_play -_0807F298: +@0807F298: movs r0, 0x2 ldrsh r2, [r4, r0] ldr r1, =0x08339090 @@ -229139,7 +229139,7 @@ _0807F298: adds r0, r1 ldrb r0, [r0] cmp r2, r0 - bne _0807F2D8 + bne @0807F2D8 ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] @@ -229151,24 +229151,24 @@ _0807F298: adds r0, r1 ldrb r0, [r0] cmp r0, 0xFF - bne _0807F2DE + bne @0807F2DE adds r0, r5, 0 bl remove_task - b _0807F2DE + b @0807F2DE .align 2, 0 .pool -_0807F2D8: +@0807F2D8: ldrh r0, [r4, 0x2] adds r0, 0x1 strh r0, [r4, 0x2] -_0807F2DE: +@0807F2DE: pop {r4,r5} pop {r0} bx r0 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 @@ -229181,7 +229181,7 @@ c3_0805465C: @ 807F2E4 movs r0, 0 ldrsh r4, [r5, r0] cmp r4, 0 - bne _0807F336 + bne @0807F336 ldr r2, =0x020322a0 ldr r0, [r2] adds r3, r0, 0 @@ -229207,7 +229207,7 @@ c3_0805465C: @ 807F2E4 movs r0, 0x48 movs r1, 0x13 bl lcd_io_set -_0807F336: +@0807F336: ldr r4, =0x020322a0 ldr r0, [r4] adds r1, r0, 0 @@ -229246,10 +229246,10 @@ _0807F336: adds r0, 0xFB ldrb r0, [r0] cmp r0, 0x4F - bhi _0807F38E + bhi @0807F38E adds r0, r6, 0 bl remove_task -_0807F38E: +@0807F38E: pop {r4-r6} pop {r0} bx r0 @@ -229258,7 +229258,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 @@ -229271,7 +229271,7 @@ sub_807F39C: @ 807F39C movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0 - bne _0807F3D8 + bne @0807F3D8 ldr r2, =0x020322a0 ldr r0, [r2] adds r0, 0xFB @@ -229287,7 +229287,7 @@ sub_807F39C: @ 807F39C movs r0, 0x48 movs r1, 0x13 bl lcd_io_set -_0807F3D8: +@0807F3D8: ldr r4, =0x020322a0 ldr r0, [r4] adds r1, r0, 0 @@ -229313,7 +229313,7 @@ _0807F3D8: adds r0, 0xFB ldrb r0, [r0] cmp r0, 0x78 - beq _0807F44C + beq @0807F44C ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] @@ -229331,29 +229331,29 @@ _0807F3D8: adds r0, 0xFB ldrb r0, [r0] cmp r0, 0x73 - bls _0807F45C + bls @0807F45C ldr r2, =0x0000ffff movs r0, 0x8 movs r1, 0 bl sub_80A2A20 - b _0807F45C + b @0807F45C .align 2, 0 .pool -_0807F44C: +@0807F44C: movs r1, 0x80 lsls r1, 6 movs r0, 0 bl lcd_io_clear_bits adds r0, r6, 0 bl remove_task -_0807F45C: +@0807F45C: pop {r4-r6} pop {r0} bx r0 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 @@ -229363,32 +229363,32 @@ sub_807F464: @ 807F464 ldrb r0, [r0] adds r2, r1, 0 cmp r0, 0xC - bls _0807F47A - b _0807F70C -_0807F47A: + bls @0807F47A + b @0807F70C +@0807F47A: lsls r0, 2 - ldr r1, =_0807F48C + ldr r1, =@0807F48C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0807F48C: - .4byte _0807F4C0 - .4byte _0807F4E8 - .4byte _0807F500 - .4byte _0807F550 - .4byte _0807F570 - .4byte _0807F5AC - .4byte _0807F5D0 - .4byte _0807F620 - .4byte _0807F64E - .4byte _0807F66C - .4byte _0807F694 - .4byte _0807F6C4 - .4byte _0807F6F8 -_0807F4C0: +@0807F48C: + .4byte @0807F4C0 + .4byte @0807F4E8 + .4byte @0807F500 + .4byte @0807F550 + .4byte @0807F570 + .4byte @0807F5AC + .4byte @0807F5D0 + .4byte @0807F620 + .4byte @0807F64E + .4byte @0807F66C + .4byte @0807F694 + .4byte @0807F6C4 + .4byte @0807F6F8 +@0807F4C0: movs r0, 0x87 lsls r0, 3 adds r1, r2, r0 @@ -229402,10 +229402,10 @@ _0807F4C0: adds r1, r4, 0 movs r2, 0 bl sub_807F1A8 - b _0807F70C + b @0807F70C .align 2, 0 .pool -_0807F4E8: +@0807F4E8: movs r0, 0 bl sub_8077288 ldr r0, =0x030022c0 @@ -229414,15 +229414,15 @@ _0807F4E8: adds r0, r1 movs r2, 0 movs r1, 0x2 - b _0807F5BC + b @0807F5BC .align 2, 0 .pool -_0807F500: +@0807F500: bl sub_8077294 cmp r0, 0 - bne _0807F50A - b _0807F70C -_0807F50A: + bne @0807F50A + b @0807F70C +@0807F50A: ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 @@ -229444,43 +229444,43 @@ _0807F50A: ldr r0, =0x020322a0 ldr r0, [r0] str r5, [r0, 0x64] - b _0807F70C + b @0807F70C .align 2, 0 .pool -_0807F550: +@0807F550: ldr r0, =0x020322a0 ldr r1, [r0] ldr r0, [r1, 0x64] adds r0, 0x1 str r0, [r1, 0x64] cmp r0, 0x5 - beq _0807F560 - b _0807F70C -_0807F560: + beq @0807F560 + b @0807F70C +@0807F560: movs r0, 0x87 lsls r0, 3 adds r1, r2, r0 movs r0, 0x4 strb r0, [r1] - b _0807F70C + b @0807F70C .align 2, 0 .pool -_0807F570: +@0807F570: bl sub_81533AC lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq _0807F590 + beq @0807F590 ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 movs r1, 0x5 strb r1, [r0] - b _0807F70C + b @0807F70C .align 2, 0 .pool -_0807F590: +@0807F590: ldr r0, =0x020322a0 ldr r0, [r0] str r1, [r0, 0x64] @@ -229490,10 +229490,10 @@ _0807F590: adds r0, r2 movs r1, 0x3 strb r1, [r0] - b _0807F70C + b @0807F70C .align 2, 0 .pool -_0807F5AC: +@0807F5AC: bl sub_81533E0 ldr r0, =0x030022c0 movs r1, 0x87 @@ -229501,28 +229501,28 @@ _0807F5AC: adds r0, r1 movs r2, 0 movs r1, 0x6 -_0807F5BC: +@0807F5BC: strb r1, [r0] ldr r0, =0x020322a0 ldr r0, [r0] str r2, [r0, 0x64] - b _0807F70C + b @0807F70C .align 2, 0 .pool -_0807F5D0: +@0807F5D0: ldr r4, =0x020322a0 ldr r1, [r4] ldr r0, [r1, 0x64] adds r0, 0x1 str r0, [r1, 0x64] cmp r0, 0xA - bhi _0807F5E0 - b _0807F70C -_0807F5E0: + bhi @0807F5E0 + b @0807F70C +@0807F5E0: bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - bne _0807F608 + bne @0807F608 bl GenerateRandomNumber ldr r4, [r4] lsls r0, 16 @@ -229532,29 +229532,29 @@ _0807F5E0: lsls r0, 16 lsrs r0, 16 str r0, [r4, 0x64] - b _0807F60E + b @0807F60E .align 2, 0 .pool -_0807F608: +@0807F608: ldr r1, [r4] movs r0, 0 str r0, [r1, 0x64] -_0807F60E: +@0807F60E: ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r2 movs r1, 0x7 strb r1, [r0] - b _0807F70C + b @0807F70C .align 2, 0 .pool -_0807F620: +@0807F620: ldr r0, =0x020322a0 ldr r1, [r0] ldr r0, [r1, 0x64] cmp r0, 0 - bne _0807F648 + bne @0807F648 movs r0, 0x1 bl sub_8077288 ldr r0, =0x030022c0 @@ -229563,17 +229563,17 @@ _0807F620: adds r0, r1 movs r1, 0x8 strb r1, [r0] - b _0807F70C + b @0807F70C .align 2, 0 .pool -_0807F648: +@0807F648: subs r0, 0x1 str r0, [r1, 0x64] - b _0807F70C -_0807F64E: + b @0807F70C +@0807F64E: bl sub_8077294 cmp r0, 0 - beq _0807F70C + beq @0807F70C bl sub_8153408 ldr r0, =0x030022c0 movs r2, 0x87 @@ -229581,17 +229581,17 @@ _0807F64E: adds r0, r2 movs r1, 0x9 strb r1, [r0] - b _0807F70C + b @0807F70C .align 2, 0 .pool -_0807F66C: +@0807F66C: ldr r0, =0x020322a0 ldr r1, [r0] ldr r0, [r1, 0x64] adds r0, 0x1 str r0, [r1, 0x64] cmp r0, 0x3C - bls _0807F70C + bls @0807F70C movs r0, 0x87 lsls r0, 3 adds r1, r2, r0 @@ -229600,13 +229600,13 @@ _0807F66C: strb r0, [r1] movs r0, 0x2 bl sub_8077288 - b _0807F70C + b @0807F70C .align 2, 0 .pool -_0807F694: +@0807F694: bl sub_8077294 cmp r0, 0 - beq _0807F70C + beq @0807F70C movs r0, 0x3 bl play_sound_effect movs r0, 0x1 @@ -229622,21 +229622,21 @@ _0807F694: adds r0, r1 movs r1, 0xB strb r1, [r0] - b _0807F70C + b @0807F70C .align 2, 0 .pool -_0807F6C4: +@0807F6C4: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0807F70C + bne @0807F70C bl sub_80A3258 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0807F70C + bne @0807F70C movs r0, 0x3 bl sub_8077288 ldr r0, =0x030022c0 @@ -229645,25 +229645,25 @@ _0807F6C4: adds r0, r2 movs r1, 0xC strb r1, [r0] - b _0807F70C + b @0807F70C .align 2, 0 .pool -_0807F6F8: +@0807F6F8: bl sub_8077294 cmp r0, 0 - beq _0807F70C + beq @0807F70C ldr r0, =0x03002700 movs r1, 0 strb r1, [r0] ldr r0, =c2_080543C4 + 1 bl set_callback2 -_0807F70C: +@0807F70C: bl sub_800B33C lsls r0, 24 cmp r0, 0 - bne _0807F71A + bne @0807F71A bl run_active_tasks -_0807F71A: +@0807F71A: bl call_obj_callbacks bl obj_sync_something bl fade_and_return_progress_probably @@ -229676,7 +229676,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 @@ -229696,7 +229696,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 @@ -229753,36 +229753,36 @@ 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] ldrb r0, [r0, 0x1] adds r5, r1, 0 cmp r0, 0x9 - bls _0807F7E8 - b _0807F9C8 -_0807F7E8: + bls @0807F7E8 + b @0807F9C8 +@0807F7E8: lsls r0, 2 - ldr r1, =_0807F7FC + ldr r1, =@0807F7FC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0807F7FC: - .4byte _0807F824 - .4byte _0807F854 - .4byte _0807F880 - .4byte _0807F8AC - .4byte _0807F8C8 - .4byte _0807F8F4 - .4byte _0807F910 - .4byte _0807F940 - .4byte _0807F950 - .4byte _0807F980 -_0807F824: +@0807F7FC: + .4byte @0807F824 + .4byte @0807F854 + .4byte @0807F880 + .4byte @0807F8AC + .4byte @0807F8C8 + .4byte @0807F8F4 + .4byte @0807F910 + .4byte @0807F940 + .4byte @0807F950 + .4byte @0807F980 +@0807F824: ldr r5, =0x08d91598 adds r0, r5, 0 bl sub_8034974 @@ -229797,10 +229797,10 @@ _0807F824: adds r0, r5, 0 bl call_LZZUnCompWram ldr r1, [r4] - b _0807F966 + b @0807F966 .align 2, 0 .pool -_0807F854: +@0807F854: ldr r1, =0x083390f4 movs r2, 0x80 lsls r2, 3 @@ -229814,10 +229814,10 @@ _0807F854: lsls r2, 1 movs r1, 0 bl gpu_pal_apply - b _0807F962 + b @0807F962 .align 2, 0 .pool -_0807F880: +@0807F880: ldr r0, [r5] ldr r1, =0x000011bc adds r0, r1 @@ -229832,10 +229832,10 @@ _0807F880: movs r3, 0 bl gpu_copy_bg_tile_pattern_data_to_vram ldr r1, [r5] - b _0807F966 + b @0807F966 .align 2, 0 .pool -_0807F8AC: +@0807F8AC: ldr r0, =0x08d91db8 ldr r1, [r5] ldr r2, =0x000011bc @@ -229843,10 +229843,10 @@ _0807F8AC: ldr r1, [r1] bl call_LZZUnCompWram ldr r1, [r5] - b _0807F966 + b @0807F966 .align 2, 0 .pool -_0807F8C8: +@0807F8C8: ldr r0, [r5] ldr r1, =0x000011bc adds r0, r1 @@ -229861,10 +229861,10 @@ _0807F8C8: movs r3, 0 bl gpu_copy_bg_tile_pattern_data_to_vram ldr r1, [r5] - b _0807F966 + b @0807F966 .align 2, 0 .pool -_0807F8F4: +@0807F8F4: ldr r0, =0x08d927ec ldr r1, [r5] ldr r2, =0x000011bc @@ -229872,10 +229872,10 @@ _0807F8F4: ldr r1, [r1] bl call_LZZUnCompWram ldr r1, [r5] - b _0807F966 + b @0807F966 .align 2, 0 .pool -_0807F910: +@0807F910: ldr r0, [r5] ldr r1, =0x000011bc adds r0, r1 @@ -229892,35 +229892,35 @@ _0807F910: movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram ldr r1, [r5] - b _0807F966 + b @0807F966 .align 2, 0 .pool -_0807F940: +@0807F940: ldr r0, =0x083394f4 movs r1, 0x80 movs r2, 0x20 bl gpu_pal_apply - b _0807F962 + b @0807F962 .align 2, 0 .pool -_0807F950: +@0807F950: ldr r0, =0x08339ac0 bl gpu_tile_obj_alloc_tag_and_copy_to_vram ldr r0, =0x08339bd8 bl gpu_tile_obj_alloc_tag_and_copy_to_vram ldr r0, =0x08339b38 bl gpu_tile_obj_alloc_tag_and_copy_to_vram -_0807F962: +@0807F962: ldr r0, =0x020322a4 ldr r1, [r0] -_0807F966: +@0807F966: ldrb r0, [r1, 0x1] adds r0, 0x1 strb r0, [r1, 0x1] - b _0807F9C8 + b @0807F9C8 .align 2, 0 .pool -_0807F980: +@0807F980: ldr r0, =0x08339c24 bl gpu_tile_obj_alloc_tag_and_copy_to_vram ldr r0, =0x08339c58 @@ -229939,19 +229939,19 @@ _0807F980: movs r0, 0 strb r0, [r1, 0x1] movs r0, 0x1 - b _0807F9CA + b @0807F9CA .align 2, 0 .pool -_0807F9C8: +@0807F9C8: movs r0, 0 -_0807F9CA: +@0807F9CA: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_807F7D8 thumb_func_start sub_807F9D0 -sub_807F9D0: @ 807F9D0 +sub_807F9D0: ; 807F9D0 push {lr} sub sp, 0x8 movs r0, 0x1E @@ -229995,24 +229995,24 @@ 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, =0x08339980 bl Window_InitFromTemplates lsls r0, 16 cmp r0, 0 - beq _0807FA74 + beq @0807FA74 bl TextBox_ResetSomeField movs r4, 0 -_0807FA4A: +@0807FA4A: lsls r0, r4, 24 lsrs r0, 24 movs r1, 0 bl Window_FastFillPixels adds r4, 0x1 cmp r4, 0x4 - ble _0807FA4A + ble @0807FA4A movs r0, 0x1E str r0, [sp] movs r0, 0x14 @@ -230024,7 +230024,7 @@ _0807FA4A: bl bg_fill_tilemap_rect movs r0, 0xE0 bl sub_81978B0 -_0807FA74: +@0807FA74: add sp, 0x8 pop {r4} pop {r0} @@ -230034,17 +230034,17 @@ _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] cmp r0, 0 - bne _0807FA94 + bne @0807FA94 movs r0, 0x8F lsls r0, 5 bl malloc_and_clear str r0, [r4] -_0807FA94: +@0807FA94: ldr r0, [r4] adds r0, 0x63 movs r1, 0 @@ -230067,7 +230067,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 @@ -230075,26 +230075,26 @@ sub_807FAC8: @ 807FAC8 ldrb r0, [r0] adds r6, r1, 0 cmp r0, 0x6 - bls _0807FADA - b _0807FCE2 -_0807FADA: + bls @0807FADA + b @0807FCE2 +@0807FADA: lsls r0, 2 - ldr r1, =_0807FAEC + ldr r1, =@0807FAEC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0807FAEC: - .4byte _0807FB08 - .4byte _0807FBAC - .4byte _0807FC38 - .4byte _0807FC4E - .4byte _0807FC64 - .4byte _0807FC90 - .4byte _0807FCB0 -_0807FB08: +@0807FAEC: + .4byte @0807FB08 + .4byte @0807FBAC + .4byte @0807FC38 + .4byte @0807FC4E + .4byte @0807FC64 + .4byte @0807FC90 + .4byte @0807FCB0 +@0807FB08: movs r0, 0 movs r1, 0 bl lcd_io_set @@ -230158,20 +230158,20 @@ _0807FB08: strh r2, [r0] strb r1, [r3, 0x1] bl sub_8082D28 - b _0807FCE2 + b @0807FCE2 .align 2, 0 .pool -_0807FBAC: +@0807FBAC: bl sub_807F7D8 lsls r0, 24 cmp r0, 0 - bne _0807FBB8 - b _0807FCE2 -_0807FBB8: + bne @0807FBB8 + b @0807FCE2 +@0807FBB8: movs r4, 0 ldr r5, =0x083399c8 ldr r6, =0x020322a4 -_0807FBBE: +@0807FBBE: ldrb r1, [r5] ldrb r2, [r5, 0x1] ldr r0, =0x08339ad8 @@ -230198,26 +230198,26 @@ _0807FBBE: adds r5, 0x2 adds r4, 0x1 cmp r4, 0x3 - ble _0807FBBE + ble @0807FBBE ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _0807FC14 + beq @0807FC14 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _0807FC14 + beq @0807FC14 bl sub_800E0E8 movs r0, 0 movs r1, 0 bl sub_800DFB4 -_0807FC14: +@0807FC14: ldr r0, =sub_807F764 + 1 bl SetVBlankCallback - b _0807FCA0 + b @0807FCA0 .align 2, 0 .pool -_0807FC38: +@0807FC38: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -230226,19 +230226,19 @@ _0807FC38: movs r3, 0 bl sub_80A1AD4 bl sub_8082D28 - b _0807FCA0 -_0807FC4E: + b @0807FCA0 +@0807FC4E: bl sub_807F9D0 ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0807FCE2 - b _0807FCA0 + bne @0807FCE2 + b @0807FCA0 .align 2, 0 .pool -_0807FC64: +@0807FC64: ldr r4, [r6] ldr r0, =0x000011b8 adds r4, r0 @@ -230251,12 +230251,12 @@ _0807FC64: adds r1, r5, 0 bl sub_808417C cmp r0, 0 - beq _0807FCE2 + beq @0807FCE2 ldr r1, [r6] - b _0807FCA4 + b @0807FCA4 .align 2, 0 .pool -_0807FC90: +@0807FC90: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -230264,17 +230264,17 @@ _0807FC90: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 -_0807FCA0: +@0807FCA0: ldr r0, =0x020322a4 ldr r1, [r0] -_0807FCA4: +@0807FCA4: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0807FCE2 + b @0807FCE2 .align 2, 0 .pool -_0807FCB0: +@0807FCB0: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -230282,7 +230282,7 @@ _0807FCB0: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _0807FCE2 + bne @0807FCE2 bl Window_FreeMemory movs r0, 0x2 bl bg_unset_tilemap @@ -230295,7 +230295,7 @@ _0807FCB0: ldr r0, =0x020322a4 ldr r0, [r0] strb r4, [r0] -_0807FCE2: +@0807FCE2: bl call_obj_callbacks bl obj_sync_something bl run_remoboxes @@ -230309,7 +230309,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] @@ -230330,7 +230330,7 @@ sub_807FD08: @ 807FD08 lsls r0, 16 lsls r1, 16 cmp r0, r1 - bge _0807FD56 + bge @0807FD56 ldrh r0, [r4, 0x34] subs r0, 0x1 strh r0, [r4, 0x36] @@ -230341,14 +230341,14 @@ sub_807FD08: @ 807FD08 lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble _0807FD50 + ble @0807FD50 adds r0, r4, 0 bl obj_delete_and_free_tiles - b _0807FD56 -_0807FD50: + b @0807FD56 +@0807FD50: movs r0, 0x74 bl audio_play -_0807FD56: +@0807FD56: ldrh r0, [r4, 0x30] strh r0, [r4, 0x20] ldrh r0, [r4, 0x32] @@ -230359,7 +230359,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] @@ -230385,7 +230385,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} @@ -230451,7 +230451,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 @@ -230484,30 +230484,30 @@ 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 cmp r5, 0x1 - beq _0807FE7C + beq @0807FE7C cmp r5, 0x1 - bgt _0807FE68 + bgt @0807FE68 cmp r5, 0 - beq _0807FE72 - b _0807FF88 -_0807FE68: + beq @0807FE72 + b @0807FF88 +@0807FE68: cmp r5, 0x2 - beq _0807FEE8 + beq @0807FEE8 cmp r5, 0x3 - beq _0807FF3C - b _0807FF88 -_0807FE72: + beq @0807FF3C + b @0807FF88 +@0807FE72: ldr r0, =0x03005d98 strb r5, [r0] - b _0807FF88 + b @0807FF88 .align 2, 0 .pool -_0807FE7C: +@0807FE7C: ldr r0, =0x03005d98 strb r5, [r0] ldr r0, =0x020322a4 @@ -230525,30 +230525,30 @@ _0807FE7C: bl flag_check lsls r0, 24 cmp r0, 0 - bne _0807FEC8 + bne @0807FEC8 adds r0, r4, 0 adds r0, 0x1C ldr r1, =0x083397d0 ldr r1, [r1, 0xC] bl gf_strcpy - b _0807FED4 + b @0807FED4 .align 2, 0 .pool -_0807FEC8: +@0807FEC8: adds r0, r4, 0 adds r0, 0x1C ldr r1, =0x083397d0 ldr r1, [r1] bl gf_strcpy -_0807FED4: +@0807FED4: ldr r1, =0x020229e8 movs r0, 0x2 strh r0, [r1, 0x1A] strh r0, [r1, 0x36] - b _0807FF88 + b @0807FF88 .align 2, 0 .pool -_0807FEE8: +@0807FEE8: ldr r0, =0x03005d98 strb r5, [r0] ldr r0, =0x020322a4 @@ -230576,10 +230576,10 @@ _0807FEE8: strh r5, [r0, 0x36] adds r0, 0x52 strh r5, [r0] - b _0807FF88 + b @0807FF88 .align 2, 0 .pool -_0807FF3C: +@0807FF3C: ldr r0, =0x03005d98 strb r5, [r0] ldr r0, =0x020322a4 @@ -230614,7 +230614,7 @@ _0807FF3C: strh r1, [r0] adds r0, 0x1C strh r1, [r0] -_0807FF88: +@0807FF88: pop {r4-r6} pop {r0} bx r0 @@ -230623,7 +230623,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 @@ -230631,12 +230631,12 @@ sub_807FFA4: @ 807FFA4 ldr r4, =0x020322a4 ldr r0, [r4] cmp r0, 0 - bne _0807FFC0 + bne @0807FFC0 movs r0, 0x8F lsls r0, 5 bl malloc_and_clear str r0, [r4] -_0807FFC0: +@0807FFC0: ldr r0, [r4] movs r1, 0 strb r1, [r0] @@ -230648,7 +230648,7 @@ _0807FFC0: movs r2, 0 ldr r5, =0x020375e0 movs r3, 0 -_0807FFD6: +@0807FFD6: ldr r0, [r4] lsls r1, r2, 1 adds r0, 0x74 @@ -230656,21 +230656,21 @@ _0807FFD6: strh r3, [r0] adds r2, 0x1 cmp r2, 0x3 - ble _0807FFD6 + ble @0807FFD6 ldrb r0, [r5] bl sub_807FE54 ldrh r0, [r5] cmp r0, 0 - bne _08080008 + bne @08080008 ldr r0, =sub_8080018 + 1 bl set_callback2 - b _0808000E + b @0808000E .align 2, 0 .pool -_08080008: +@08080008: ldr r0, =sub_80808D4 + 1 bl set_callback2 -_0808000E: +@0808000E: pop {r4,r5} pop {r0} bx r0 @@ -230679,7 +230679,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 @@ -230687,41 +230687,41 @@ sub_8080018: @ 8080018 ldrb r0, [r0] adds r2, r1, 0 cmp r0, 0x15 - bls _0808002A - b _08080546 -_0808002A: + bls @0808002A + b @08080546 +@0808002A: lsls r0, 2 - ldr r1, =_0808003C + ldr r1, =@0808003C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0808003C: - .4byte _08080094 - .4byte _08080100 - .4byte _08080120 - .4byte _0808019C - .4byte _080801AE - .4byte _080801C8 - .4byte _08080546 - .4byte _08080546 - .4byte _080801F8 - .4byte _08080248 - .4byte _0808026C - .4byte _08080302 - .4byte _0808035C - .4byte _080803D4 - .4byte _08080408 - .4byte _0808049C - .4byte _080804D0 - .4byte _08080546 - .4byte _080804F8 - .4byte _080804E4 - .4byte _080804EA - .4byte _08080508 -_08080094: +@0808003C: + .4byte @08080094 + .4byte @08080100 + .4byte @08080120 + .4byte @0808019C + .4byte @080801AE + .4byte @080801C8 + .4byte @08080546 + .4byte @08080546 + .4byte @080801F8 + .4byte @08080248 + .4byte @0808026C + .4byte @08080302 + .4byte @0808035C + .4byte @080803D4 + .4byte @08080408 + .4byte @0808049C + .4byte @080804D0 + .4byte @08080546 + .4byte @080804F8 + .4byte @080804E4 + .4byte @080804EA + .4byte @08080508 +@08080094: bl sub_8080588 ldr r1, =0x020229c6 ldr r2, =0x00004422 @@ -230736,7 +230736,7 @@ _08080094: movs r6, 0 movs r7, 0x92 lsls r7, 1 -_080800B2: +@080800B2: ldr r0, [r2] lsls r1, r5, 1 adds r0, 0x64 @@ -230746,7 +230746,7 @@ _080800B2: adds r1, r5 lsls r1, 1 movs r3, 0x2 -_080800C4: +@080800C4: ldr r0, [r2] adds r0, r7 adds r0, r1 @@ -230754,10 +230754,10 @@ _080800C4: adds r1, 0x2 subs r3, 0x1 cmp r3, 0 - bge _080800C4 + bge @080800C4 adds r5, r4, 0 cmp r5, 0x3 - ble _080800B2 + ble @080800B2 ldr r3, =0x020322a4 ldr r4, [r3] adds r1, r4, 0 @@ -230769,30 +230769,30 @@ _080800C4: strh r0, [r1] strb r2, [r4, 0x1] ldr r1, [r3] - b _080804FC + b @080804FC .align 2, 0 .pool -_08080100: +@08080100: bl sub_807F7D8 lsls r0, 24 cmp r0, 0 - bne _0808010C - b _08080546 -_0808010C: + bne @0808010C + b @08080546 +@0808010C: ldr r0, =0x020322a4 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] bl sub_8082D28 - b _08080546 + b @08080546 .align 2, 0 .pool -_08080120: +@08080120: movs r5, 0 ldr r4, =0x083399c8 ldr r6, =0x020322a4 -_08080126: +@08080126: ldrb r1, [r4] ldrb r2, [r4, 0x1] ldr r0, =0x08339ad8 @@ -230819,27 +230819,27 @@ _08080126: adds r4, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble _08080126 + ble @08080126 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _0808016A - b _080804F8 -_0808016A: + bne @0808016A + b @080804F8 +@0808016A: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - bne _08080174 - b _080804F8 -_08080174: + bne @08080174 + b @080804F8 +@08080174: bl sub_800E0E8 movs r0, 0 movs r1, 0 bl sub_800DFB4 - b _080804F8 + b @080804F8 .align 2, 0 .pool -_0808019C: +@0808019C: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -230847,21 +230847,21 @@ _0808019C: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - b _080804F8 -_080801AE: + b @080804F8 +@080801AE: bl sub_807F9D0 ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080801C0 - b _08080546 -_080801C0: - b _080804F8 + beq @080801C0 + b @08080546 +@080801C0: + b @080804F8 .align 2, 0 .pool -_080801C8: +@080801C8: ldr r4, =0x020322a4 ldr r0, [r4] ldr r3, =0x000011b8 @@ -230878,10 +230878,10 @@ _080801C8: lsls r1, 1 adds r0, r1 str r2, [r0] - b _08080546 + b @08080546 .align 2, 0 .pool -_080801F8: +@080801F8: ldr r4, =0x020322a4 ldr r1, [r4] ldrb r0, [r1] @@ -230911,27 +230911,27 @@ _080801F8: lsls r3, 1 adds r0, r3 str r6, [r0] - b _08080546 + b @08080546 .align 2, 0 .pool -_08080248: +@08080248: bl sub_800A520 lsls r0, 24 cmp r0, 0 - bne _08080254 - b _08080546 -_08080254: + bne @08080254 + b @08080546 +@08080254: bl sub_800A5B4 bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - beq _08080264 - b _080804F8 -_08080264: + beq @08080264 + b @080804F8 +@08080264: movs r0, 0x4 bl sub_800A4D8 - b _080804F8 -_0808026C: + b @080804F8 +@0808026C: ldr r6, =0x020322a4 ldr r1, [r6] movs r0, 0x84 @@ -230941,9 +230941,9 @@ _0808026C: adds r0, 0x1 str r0, [r1] cmp r0, 0x14 - bgt _08080282 - b _08080546 -_08080282: + bgt @08080282 + b @08080546 +@08080282: movs r0, 0x4 movs r1, 0x1 bl sub_8197DF8 @@ -230953,17 +230953,17 @@ _08080282: lsls r4, 24 lsls r0, 24 cmp r4, r0 - beq _0808029E - b _08080546 -_0808029E: + beq @0808029E + b @08080546 +@0808029E: movs r5, 0 adds r7, r6, 0 movs r6, 0xAC lsls r6, 1 - b _080802D4 + b @080802D4 .align 2, 0 .pool -_080802AC: +@080802AC: ldr r0, [r7] lsls r4, r5, 4 adds r0, r4, r0 @@ -230983,17 +230983,17 @@ _080802AC: ldrh r0, [r0] strh r0, [r1] adds r5, 0x1 -_080802D4: +@080802D4: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r5, r0 - blt _080802AC + blt @080802AC bl sub_800A5B4 - b _080804F8 + b @080804F8 .align 2, 0 .pool -_080802EC: +@080802EC: ldrb r1, [r4] lsls r1, 1 adds r0, r2, 0 @@ -231003,8 +231003,8 @@ _080802EC: lsls r1, r5, 24 lsrs r1, 24 bl sub_807FD90 - b _08080336 -_08080302: + b @08080336 +@08080302: bl sub_8009FCC ldr r2, =0x020322a4 ldr r1, [r2] @@ -231023,15 +231023,15 @@ _08080302: lsls r0, 2 ldrb r3, [r4] adds r0, r1 -_08080328: +@08080328: ldrb r1, [r0] cmp r3, r1 - beq _080802EC + beq @080802EC adds r0, 0x1 adds r5, 0x1 cmp r5, 0x3 - ble _08080328 -_08080336: + ble @08080328 +@08080336: ldr r3, =0x020322a4 ldr r1, [r3] movs r0, 0x84 @@ -231046,10 +231046,10 @@ _08080336: movs r2, 0x8A lsls r2, 1 adds r1, r2 - b _080804FC + b @080804FC .align 2, 0 .pool -_0808035C: +@0808035C: ldr r3, [r2] movs r0, 0x84 lsls r0, 1 @@ -231058,9 +231058,9 @@ _0808035C: adds r0, 0x1 str r0, [r1] cmp r0, 0x3C - bgt _08080370 - b _08080546 -_08080370: + bgt @08080370 + b @08080546 +@08080370: movs r1, 0x8A lsls r1, 1 adds r0, r3, r1 @@ -231069,7 +231069,7 @@ _08080370: ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bcc _080803B8 + bcc @080803B8 ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] @@ -231090,14 +231090,14 @@ _08080370: adds r1, r0 adds r2, 0x4A strh r1, [r2] - b _080803BE + b @080803BE .align 2, 0 .pool -_080803B8: +@080803B8: ldrb r0, [r3] subs r0, 0x1 strb r0, [r3] -_080803BE: +@080803BE: ldr r0, =0x020322a4 ldr r0, [r0] movs r1, 0x84 @@ -231105,16 +231105,16 @@ _080803BE: adds r0, r1 movs r1, 0 str r1, [r0] - b _08080546 + b @08080546 .align 2, 0 .pool -_080803D4: +@080803D4: bl sub_800A520 lsls r0, 24 cmp r0, 0 - bne _080803E0 - b _08080546 -_080803E0: + bne @080803E0 + b @08080546 +@080803E0: ldr r2, =0x020322a4 ldr r1, [r2] ldrb r0, [r1] @@ -231129,10 +231129,10 @@ _080803E0: bl audio_play movs r0, 0x2 bl gpu_sync_bg_show - b _08080546 + b @08080546 .align 2, 0 .pool -_08080408: +@08080408: movs r1, 0x80 lsls r1, 3 movs r0, 0 @@ -231156,7 +231156,7 @@ _08080408: lsls r0, 16 lsrs r0, 16 cmp r0, 0xFF - bls _0808048C + bls @0808048C movs r0, 0xC movs r1, 0x2 bl lcd_io_set_bits @@ -231194,16 +231194,16 @@ _08080408: bl audio_play bl sub_808074C bl sub_80807BC -_0808048C: +@0808048C: ldr r0, [r4] - b _080804BE + b @080804BE .align 2, 0 .pool -_0808049C: +@0808049C: bl sub_8083380 lsls r0, 24 cmp r0, 0 - beq _080804BA + beq @080804BA ldr r0, =0x020322a4 ldr r1, [r0] movs r3, 0x84 @@ -231214,47 +231214,47 @@ _0808049C: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_080804BA: +@080804BA: ldr r0, =0x020322a4 ldr r0, [r0] -_080804BE: +@080804BE: movs r1, 0xA0 lsls r1, 1 adds r0, r1 bl sub_8082CB4 - b _08080546 + b @08080546 .align 2, 0 .pool -_080804D0: +@080804D0: ldr r0, =0x08339c2c movs r2, 0x10 negs r2, r2 movs r1, 0x78 movs r3, 0x3 bl obj_add_from_template_forward_search - b _080804F8 + b @080804F8 .align 2, 0 .pool -_080804E4: +@080804E4: bl sub_800ADF8 - b _080804F8 -_080804EA: + b @080804F8 +@080804EA: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08080546 + beq @08080546 bl sub_800A418 -_080804F8: +@080804F8: ldr r0, =0x020322a4 ldr r1, [r0] -_080804FC: +@080804FC: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08080546 + b @08080546 .align 2, 0 .pool -_08080508: +@08080508: ldr r5, =0x020322a4 ldr r3, [r5] adds r1, r3, 0 @@ -231273,17 +231273,17 @@ _08080508: lsrs r0, 16 ldr r4, =0x00000193 cmp r0, r4 - beq _08080540 + beq @08080540 bl current_map_music_get ldr r1, [r5] movs r2, 0xAA lsls r2, 1 adds r1, r2 strh r0, [r1] -_08080540: +@08080540: adds r0, r4, 0 bl song_play_for_text -_08080546: +@08080546: ldr r0, =0x020322a4 ldr r1, [r0] movs r3, 0x8E @@ -231310,7 +231310,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 @@ -231373,7 +231373,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 @@ -231390,33 +231390,33 @@ task_tutorial_oak_boy_girl: @ 8080624 adds r0, r1 ldrb r1, [r0] cmp r2, r1 - bcc _0808066C + bcc @0808066C adds r0, r1, 0 adds r0, 0x30 cmp r2, r0 - bcs _0808066C + bcs @0808066C subs r0, 0x1C cmp r2, r0 - bcc _08080668 + bcc @08080668 adds r0, 0x8 cmp r2, r0 - bcs _08080668 + bcs @08080668 movs r0, 0x2 - b _0808066E + b @0808066E .align 2, 0 .pool -_08080668: +@08080668: movs r0, 0x1 - b _0808066E -_0808066C: + b @0808066E +@0808066C: movs r0, 0 -_0808066E: +@0808066E: pop {r1} bx r1 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 @@ -231427,45 +231427,45 @@ sub_8080674: @ 8080674 lsrs r1, 24 movs r6, 0 cmp r5, 0xAF - bne _080806AC + bne @080806AC movs r4, 0 subs r7, r1, 0x1 adds r2, 0x9 -_08080690: +@08080690: adds r0, r2, r6 adds r1, r2, r4 ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bls _0808069E + bls @0808069E adds r6, r4, 0 -_0808069E: +@0808069E: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x4 - bls _08080690 + bls @08080690 adds r0, r6, 0x5 - b _080806C4 -_080806AC: + b @080806C4 +@080806AC: adds r0, r5, 0 subs r0, 0x85 lsls r0, 16 lsrs r6, r0, 16 subs r7, r1, 0x1 cmp r6, 0x4 - bls _080806C8 + bls @080806C8 adds r0, r6, 0 movs r1, 0x5 bl __umodsi3 adds r0, 0x5 -_080806C4: +@080806C4: lsls r0, 16 lsrs r6, r0, 16 -_080806C8: +@080806C8: movs r4, 0 cmp r4, r7 - bge _08080734 + bge @08080734 ldr r0, =0x08339ca0 mov r9, r0 adds r0, r5, 0 @@ -231473,7 +231473,7 @@ _080806C8: lsls r0, 16 lsrs r0, 16 mov r8, r0 -_080806DC: +@080806DC: lsls r0, r6, 1 adds r0, r6 adds r0, r4, r0 @@ -231484,11 +231484,11 @@ _080806DC: bl flag_check lsls r0, 24 cmp r0, 0 - bne _0808071A + bne @0808071A ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0x1 - bne _0808071A + bne @0808071A adds r0, r6, 0 movs r1, 0x5 bl __umodsi3 @@ -231499,11 +231499,11 @@ _080806DC: ldrb r5, [r0] mov r0, r8 cmp r0, 0x4 - bhi _0808071A + bhi @0808071A subs r0, r5, 0x5 lsls r0, 16 lsrs r5, r0, 16 -_0808071A: +@0808071A: adds r4, 0x1 lsls r0, r4, 24 lsrs r0, 24 @@ -231515,8 +231515,8 @@ _0808071A: lsls r4, 16 lsrs r4, 16 cmp r4, r7 - blt _080806DC -_08080734: + blt @080806DC +@08080734: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -231528,13 +231528,13 @@ _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 movs r6, 0xFF ldr r5, =0x083399d0 -_08080756: +@08080756: ldr r3, [r7] lsls r2, r4, 1 adds r0, r3, 0 @@ -231555,14 +231555,14 @@ _08080756: strh r0, [r1] adds r4, 0x1 cmp r4, 0x3 - ble _08080756 + ble @08080756 movs r3, 0 ldr r7, =0x020322a4 -_08080784: +@08080784: movs r4, 0 adds r6, r3, 0x1 lsls r5, r3, 1 -_0808078A: +@0808078A: ldr r2, [r7] lsls r0, r4, 1 adds r1, r2, 0 @@ -231570,18 +231570,18 @@ _0808078A: adds r1, r0 ldrh r0, [r1] cmp r0, r3 - bne _080807A2 + bne @080807A2 adds r0, r2, 0 adds r0, 0x96 adds r0, r5 strh r4, [r0] -_080807A2: +@080807A2: adds r4, 0x1 cmp r4, 0x3 - ble _0808078A + ble @0808078A adds r3, r6, 0 cmp r3, 0x3 - ble _08080784 + ble @08080784 pop {r4-r7} pop {r0} bx r0 @@ -231590,7 +231590,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 @@ -231602,16 +231602,16 @@ sub_80807BC: @ 80807BC ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _080807DE + beq @080807DE bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 mov r10, r0 -_080807DE: +@080807DE: movs r6, 0 ldr r7, =0x020322a4 mov r8, r6 -_080807E4: +@080807E4: ldr r2, [r7] lsls r5, r6, 1 adds r0, r2, 0 @@ -231619,7 +231619,7 @@ _080807E4: adds r3, r0, r5 ldrh r0, [r3] cmp r0, 0xFF - beq _080808B6 + beq @080808B6 adds r1, r2, 0 adds r1, 0x50 ldrh r3, [r3] @@ -231673,7 +231673,7 @@ _080807E4: mov r5, r8 ldrh r0, [r0] cmp r10, r0 - bne _08080890 + bne @08080890 lsls r2, 24 lsrs r2, 24 mov r0, r9 @@ -231684,10 +231684,10 @@ _080807E4: add r1, sp, 0x8 movs r3, 0x1 bl sub_80840D4 - b _080808A6 + b @080808A6 .align 2, 0 .pool -_08080890: +@08080890: lsls r2, 24 lsrs r2, 24 mov r1, r9 @@ -231698,20 +231698,20 @@ _08080890: add r1, sp, 0x8 movs r3, 0x1 bl sub_80840D4 -_080808A6: +@080808A6: lsrs r4, r5, 24 adds r0, r4, 0 bl Window_WriteStandardTileMap adds r0, r4, 0 movs r1, 0x3 bl Window_CopyToVram -_080808B6: +@080808B6: movs r2, 0x80 lsls r2, 17 add r8, r2 adds r6, 0x1 cmp r6, 0x3 - ble _080807E4 + ble @080807E4 add sp, 0x1C pop {r3-r5} mov r8, r3 @@ -231723,7 +231723,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 @@ -231731,41 +231731,41 @@ sub_80808D4: @ 80808D4 ldrb r0, [r0] adds r2, r1, 0 cmp r0, 0x15 - bls _080808E6 - b _08080DAE -_080808E6: + bls @080808E6 + b @08080DAE +@080808E6: lsls r0, 2 - ldr r1, =_080808F8 + ldr r1, =@080808F8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080808F8: - .4byte _08080950 - .4byte _080809E4 - .4byte _08080A04 - .4byte _08080A58 - .4byte _08080A84 - .4byte _08080DAE - .4byte _08080DAE - .4byte _08080DAE - .4byte _08080ABC - .4byte _08080DAE - .4byte _08080DAE - .4byte _08080AEC - .4byte _08080B3C - .4byte _08080BB0 - .4byte _08080BDC - .4byte _08080C78 - .4byte _08080CA0 - .4byte _08080DAE - .4byte _08080CAE - .4byte _08080CAE - .4byte _08080CAE - .4byte _08080CC4 -_08080950: +@080808F8: + .4byte @08080950 + .4byte @080809E4 + .4byte @08080A04 + .4byte @08080A58 + .4byte @08080A84 + .4byte @08080DAE + .4byte @08080DAE + .4byte @08080DAE + .4byte @08080ABC + .4byte @08080DAE + .4byte @08080DAE + .4byte @08080AEC + .4byte @08080B3C + .4byte @08080BB0 + .4byte @08080BDC + .4byte @08080C78 + .4byte @08080CA0 + .4byte @08080DAE + .4byte @08080CAE + .4byte @08080CAE + .4byte @08080CAE + .4byte @08080CC4 +@08080950: bl sub_800B4C0 bl sub_8080588 ldr r4, =0x0203ce7c @@ -231792,7 +231792,7 @@ _08080950: mov r12, r0 movs r7, 0x92 lsls r7, 1 -_0808098E: +@0808098E: ldr r0, [r5] lsls r1, r4, 1 adds r0, 0x64 @@ -231802,7 +231802,7 @@ _0808098E: adds r1, r4 lsls r1, 1 movs r2, 0x2 -_080809A0: +@080809A0: ldr r0, [r5] adds r0, r7 adds r0, r1 @@ -231810,10 +231810,10 @@ _080809A0: adds r1, 0x2 subs r2, 0x1 cmp r2, 0 - bge _080809A0 + bge @080809A0 adds r4, r3, 0 cmp r4, 0x3 - ble _0808098E + ble @0808098E ldr r4, =0x020322a4 ldr r3, [r4] adds r1, r3, 0 @@ -231827,30 +231827,30 @@ _080809A0: mov r2, r12 strh r0, [r2] ldr r1, [r4] - b _08080CB2 + b @08080CB2 .align 2, 0 .pool -_080809E4: +@080809E4: bl sub_807F7D8 lsls r0, 24 cmp r0, 0 - bne _080809F0 - b _08080DAE -_080809F0: + bne @080809F0 + b @08080DAE +@080809F0: ldr r0, =0x020322a4 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] bl sub_8082D28 - b _08080DAE + b @08080DAE .align 2, 0 .pool -_08080A04: +@08080A04: movs r4, 0 ldr r5, =0x083399c8 ldr r6, =0x020322a4 -_08080A0A: +@08080A0A: ldrb r1, [r5] ldrb r2, [r5, 0x1] ldr r0, =0x08339ad8 @@ -231877,11 +231877,11 @@ _08080A0A: adds r5, 0x2 adds r4, 0x1 cmp r4, 0x3 - ble _08080A0A - b _08080CAE + ble @08080A0A + b @08080CAE .align 2, 0 .pool -_08080A58: +@08080A58: movs r0, 0x1 negs r0, r0 movs r4, 0 @@ -231900,10 +231900,10 @@ _08080A58: lsls r3, 1 adds r0, r3 str r4, [r0] - b _08080DAE + b @08080DAE .align 2, 0 .pool -_08080A84: +@08080A84: ldr r4, =0x020322a4 ldr r1, [r4] movs r5, 0x84 @@ -231913,24 +231913,24 @@ _08080A84: adds r0, 0x1 str r0, [r1] cmp r0, 0x2 - bne _08080A9C + bne @08080A9C bl sub_807F9D0 -_08080A9C: +@08080A9C: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08080AAA - b _08080DAE -_08080AAA: + beq @08080AAA + b @08080DAE +@08080AAA: ldr r1, [r4] movs r0, 0x8 strb r0, [r1] - b _08080DAE + b @08080DAE .align 2, 0 .pool -_08080ABC: +@08080ABC: ldr r2, =0x020322a4 ldr r1, [r2] movs r3, 0 @@ -231941,10 +231941,10 @@ _08080ABC: lsls r1, 1 adds r0, r1 strb r3, [r0] - b _08080DAE + b @08080DAE .align 2, 0 .pool -_08080AD8: +@08080AD8: lsls r1, 1 adds r0, r3, 0 adds r0, 0x74 @@ -231953,8 +231953,8 @@ _08080AD8: lsls r1, r4, 24 lsrs r1, 24 bl sub_807FD90 - b _08080B16 -_08080AEC: + b @08080B16 +@08080AEC: movs r4, 0 ldr r2, =0x083399d0 ldr r0, =0x020322a4 @@ -231969,15 +231969,15 @@ _08080AEC: adds r1, r3, r5 ldrb r1, [r1] adds r0, r2 -_08080B08: +@08080B08: ldrb r2, [r0] cmp r1, r2 - beq _08080AD8 + beq @08080AD8 adds r0, 0x1 adds r4, 0x1 cmp r4, 0x3 - ble _08080B08 -_08080B16: + ble @08080B08 +@08080B16: ldr r3, =0x020322a4 ldr r1, [r3] movs r5, 0x84 @@ -231992,10 +231992,10 @@ _08080B16: movs r0, 0x8A lsls r0, 1 adds r1, r0 - b _08080CB2 + b @08080CB2 .align 2, 0 .pool -_08080B3C: +@08080B3C: ldr r3, [r2] movs r2, 0x84 lsls r2, 1 @@ -232004,9 +232004,9 @@ _08080B3C: adds r0, 0x1 str r0, [r1] cmp r0, 0x3C - bgt _08080B50 - b _08080DAE -_08080B50: + bgt @08080B50 + b @08080DAE +@08080B50: movs r5, 0x8A lsls r5, 1 adds r0, r3, r5 @@ -232015,7 +232015,7 @@ _08080B50: ldrb r0, [r0] ldrb r1, [r4] cmp r0, r1 - bcc _08080B94 + bcc @08080B94 ldr r2, =0x083399dc ldr r1, =0x083399e4 ldrb r0, [r4] @@ -232033,13 +232033,13 @@ _08080B50: strh r1, [r0] ldrb r0, [r3] adds r0, 0x1 - b _08080B98 + b @08080B98 .align 2, 0 .pool -_08080B94: +@08080B94: ldrb r0, [r3] subs r0, 0x1 -_08080B98: +@08080B98: strb r0, [r3] ldr r0, =0x020322a4 ldr r0, [r0] @@ -232048,10 +232048,10 @@ _08080B98: adds r0, r3 movs r1, 0 str r1, [r0] - b _08080DAE + b @08080DAE .align 2, 0 .pool -_08080BB0: +@08080BB0: ldr r4, =0x020322a4 ldr r1, [r4] ldrb r0, [r1] @@ -232067,10 +232067,10 @@ _08080BB0: bl sub_8082CB4 movs r0, 0x2 bl gpu_sync_bg_show - b _08080DAE + b @08080DAE .align 2, 0 .pool -_08080BDC: +@08080BDC: movs r1, 0x80 lsls r1, 3 movs r0, 0 @@ -232094,7 +232094,7 @@ _08080BDC: lsls r0, 16 lsrs r0, 16 cmp r0, 0xFF - bls _08080C5C + bls @08080C5C ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] @@ -232131,53 +232131,53 @@ _08080BDC: movs r0, 0x34 bl audio_play bl sub_80807BC -_08080C5C: +@08080C5C: ldr r0, [r4] movs r5, 0xA0 lsls r5, 1 adds r0, r5 bl sub_8082CB4 - b _08080DAE + b @08080DAE .align 2, 0 .pool -_08080C78: +@08080C78: bl sub_8083380 lsls r0, 24 cmp r0, 0 - beq _08080C8C + beq @08080C8C ldr r0, =0x020322a4 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_08080C8C: +@08080C8C: ldr r0, =0x020322a4 ldr r0, [r0] movs r1, 0xA0 lsls r1, 1 adds r0, r1 bl sub_8082CB4 - b _08080DAE + b @08080DAE .align 2, 0 .pool -_08080CA0: +@08080CA0: ldr r0, =0x08339c2c movs r2, 0x10 negs r2, r2 movs r1, 0x78 movs r3, 0x3 bl obj_add_from_template_forward_search -_08080CAE: +@08080CAE: ldr r0, =0x020322a4 ldr r1, [r0] -_08080CB2: +@08080CB2: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08080DAE + b @08080DAE .align 2, 0 .pool -_08080CC4: +@08080CC4: bl sub_8080DF8 ldr r5, =0x020322a4 ldr r4, [r5] @@ -232202,13 +232202,13 @@ _08080CC4: ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0x1 - bne _08080D44 + bne @08080D44 movs r0, 0xD0 lsls r0, 2 bl flag_check lsls r0, 24 cmp r0, 0 - bne _08080D30 + bne @08080D30 ldr r0, =sub_8081224 + 1 movs r1, 0xA bl AddTask @@ -232216,10 +232216,10 @@ _08080CC4: movs r3, 0x90 lsls r3, 1 adds r1, r3 - b _08080D42 + b @08080D42 .align 2, 0 .pool -_08080D30: +@08080D30: ldr r0, =0x083399ec ldr r0, [r0] movs r1, 0xA @@ -232228,21 +232228,21 @@ _08080D30: movs r5, 0x90 lsls r5, 1 adds r1, r5 -_08080D42: +@08080D42: strb r0, [r1] -_08080D44: +@08080D44: ldr r1, =0x020375e0 ldrh r0, [r1] cmp r0, 0x1 - bls _08080D80 + bls @08080D80 movs r4, 0 ldrh r1, [r1] cmp r4, r1 - bge _08080D80 + bge @08080D80 movs r5, 0xA0 lsls r5, 20 ldr r6, =0x083399ec -_08080D5A: +@08080D5A: ldm r6!, {r0} lsrs r1, r5, 24 bl AddTask @@ -232260,14 +232260,14 @@ _08080D5A: ldr r0, =0x020375e0 ldrh r0, [r0] cmp r4, r0 - blt _08080D5A -_08080D80: + blt @08080D5A +@08080D80: bl current_map_music_get lsls r0, 16 lsrs r0, 16 ldr r4, =0x00000193 cmp r0, r4 - beq _08080D9E + beq @08080D9E bl current_map_music_get ldr r1, =0x020322a4 ldr r1, [r1] @@ -232275,13 +232275,13 @@ _08080D80: lsls r5, 1 adds r1, r5 strh r0, [r1] -_08080D9E: +@08080D9E: adds r0, r4, 0 bl song_play_for_text movs r0, 0x35 bl audio_play bl sub_807F738 -_08080DAE: +@08080DAE: ldr r0, =0x020322a4 ldr r1, [r0] movs r2, 0x8E @@ -232309,13 +232309,13 @@ _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 ldr r1, =0x03003090 movs r2, 0x3 -_08080E02: +@08080E02: strh r0, [r3] strh r0, [r3, 0x4] strh r0, [r1] @@ -232323,7 +232323,7 @@ _08080E02: adds r1, 0x10 subs r2, 0x1 cmp r2, 0 - bge _08080E02 + bge @08080E02 pop {r0} bx r0 .align 2, 0 @@ -232331,7 +232331,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 @@ -232348,7 +232348,7 @@ sub_8080E20: @ 8080E20 movs r4, 0xA ldrsh r1, [r2, r4] cmp r0, r1 - ble _08080E58 + ble @08080E58 ldr r0, =0x03003090 movs r4, 0xC ldrsh r1, [r2, r4] @@ -232359,7 +232359,7 @@ sub_8080E20: @ 8080E20 strh r0, [r1] adds r0, r3, 0 bl remove_task -_08080E58: +@08080E58: pop {r4} pop {r0} bx r0 @@ -232368,7 +232368,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 @@ -232396,7 +232396,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 @@ -232409,9 +232409,9 @@ sub_8080EA4: @ 8080EA4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - beq _08080EC2 - b _08080FB8 -_08080EC2: + beq @08080EC2 + b @08080FB8 +@08080EC2: ldr r2, =0x03005e00 lsls r1, r5, 2 adds r0, r1, r5 @@ -232421,15 +232421,15 @@ _08080EC2: ldrsh r0, [r0, r2] adds r6, r1, 0 cmp r0, 0 - beq _08080ED8 - b _08080FC6 -_08080ED8: + beq @08080ED8 + b @08080FC6 +@08080ED8: ldr r0, [r4] ldr r1, =0x00000123 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _08080F9A + bne @08080F9A bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -232444,90 +232444,90 @@ _08080ED8: ldrsh r2, [r0, r4] ldr r0, =0x000001f3 cmp r2, r0 - bgt _08080F40 + bgt @08080F40 cmp r1, 0x4B - bls _08080F2C + bls @08080F2C ldr r1, =0x03003090 ldr r0, =0x00004523 - b _08080F30 + b @08080F30 .align 2, 0 .pool -_08080F2C: +@08080F2C: ldr r1, =0x03003090 ldr r0, =0x00005432 -_08080F30: +@08080F30: strh r0, [r1, 0x14] ldr r0, =0x00005432 - b _08080F9E + b @08080F9E .align 2, 0 .pool -_08080F40: +@08080F40: ldr r0, =0x000005db cmp r2, r0 - bgt _08080F6E + bgt @08080F6E cmp r1, 0x50 - bhi _08080F9A + bhi @08080F9A adds r0, r1, 0 subs r0, 0x15 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3B - bhi _08080F68 + bhi @08080F68 ldr r1, =0x03003090 ldr r0, =0x00005432 - b _08080F9E + b @08080F9E .align 2, 0 .pool -_08080F68: +@08080F68: cmp r1, 0x9 - bhi _08080FA0 - b _08080F90 -_08080F6E: + bhi @08080FA0 + b @08080F90 +@08080F6E: cmp r1, 0x5A - bhi _08080F9A + bhi @08080F9A adds r0, r1, 0 subs r0, 0x47 lsls r0, 24 lsrs r0, 24 cmp r0, 0x13 - bhi _08080F8C + bhi @08080F8C ldr r1, =0x03003090 ldr r0, =0x00005432 - b _08080F9E + b @08080F9E .align 2, 0 .pool -_08080F8C: +@08080F8C: cmp r3, 0x1D - bhi _08080FA0 -_08080F90: + bhi @08080FA0 +@08080F90: movs r0, 0x1 movs r1, 0x5 bl sub_8080E6C - b _08080FA0 -_08080F9A: + b @08080FA0 +@08080F9A: ldr r1, =0x03003090 ldr r0, =0x00004523 -_08080F9E: +@08080F9E: strh r0, [r1, 0x14] -_08080FA0: +@08080FA0: ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 adds r1, r0 movs r0, 0x1 - b _08080FC4 + b @08080FC4 .align 2, 0 .pool -_08080FB8: +@08080FB8: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 movs r0, 0 -_08080FC4: +@08080FC4: strh r0, [r1, 0x8] -_08080FC6: +@08080FC6: pop {r4-r6} pop {r0} bx r0 @@ -232536,7 +232536,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 @@ -232560,10 +232560,10 @@ sub_8080FD0: @ 8080FD0 adds r0, r1, 0 adds r0, 0x14 cmp r2, r0 - bls _080810E0 + bls @080810E0 adds r0, 0x14 cmp r2, r0 - bcs _080810E0 + bcs @080810E0 ldr r2, =0x03005e00 lsls r1, r4, 2 adds r0, r1, r4 @@ -232573,12 +232573,12 @@ sub_8080FD0: @ 8080FD0 ldrsh r0, [r2, r5] adds r5, r1, 0 cmp r0, 0 - bne _080810EE + bne @080810EE ldr r1, =0x00000123 adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0 - bne _080810CC + bne @080810CC bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -232593,72 +232593,72 @@ sub_8080FD0: @ 8080FD0 ldrsh r1, [r0, r6] ldr r0, =0x000001f3 cmp r1, r0 - bgt _08081088 + bgt @08081088 cmp r2, 0x42 - bls _08081078 + bls @08081078 ldr r1, =0x03003090 ldr r0, =0x00004523 strh r0, [r1, 0x24] - b _080810B0 + b @080810B0 .align 2, 0 .pool -_08081078: +@08081078: ldr r1, =0x03003090 ldr r0, =0x00005432 strh r0, [r1, 0x24] - b _080810B0 + b @080810B0 .align 2, 0 .pool -_08081088: +@08081088: cmp r2, 0x41 - bls _08081092 + bls @08081092 ldr r1, =0x03003090 ldr r0, =0x00004523 strh r0, [r1, 0x24] -_08081092: +@08081092: adds r0, r2, 0 subs r0, 0x29 lsls r0, 24 lsrs r0, 24 cmp r0, 0x18 - bhi _080810A4 + bhi @080810A4 ldr r1, =0x03003090 ldr r0, =0x00005432 strh r0, [r1, 0x24] -_080810A4: +@080810A4: cmp r3, 0x9 - bhi _080810B0 + bhi @080810B0 movs r0, 0x2 movs r1, 0x5 bl sub_8080E6C -_080810B0: +@080810B0: ldr r0, =0x03005e00 adds r1, r5, r4 lsls r1, 3 adds r1, r0 movs r0, 0x1 - b _080810EC + b @080810EC .align 2, 0 .pool -_080810CC: +@080810CC: ldr r0, =0x03003090 ldr r1, =0x00004523 strh r1, [r0, 0x24] movs r0, 0x1 strh r0, [r2, 0x8] - b _080810EE + b @080810EE .align 2, 0 .pool -_080810E0: +@080810E0: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 movs r0, 0 -_080810EC: +@080810EC: strh r0, [r1, 0x8] -_080810EE: +@080810EE: pop {r4-r6} pop {r0} bx r0 @@ -232667,7 +232667,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 @@ -232691,10 +232691,10 @@ sub_80810F8: @ 80810F8 adds r0, r1, 0 adds r0, 0x14 cmp r2, r0 - bls _0808120C + bls @0808120C adds r0, 0x14 cmp r2, r0 - bcs _0808120C + bcs @0808120C ldr r2, =0x03005e00 lsls r1, r4, 2 adds r0, r1, r4 @@ -232704,12 +232704,12 @@ sub_80810F8: @ 80810F8 ldrsh r0, [r2, r6] adds r6, r1, 0 cmp r0, 0 - bne _0808121A + bne @0808121A ldr r1, =0x00000123 adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0 - bne _080811F8 + bne @080811F8 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -232723,75 +232723,75 @@ sub_80810F8: @ 80810F8 ldrsh r1, [r0, r3] ldr r0, =0x000001f3 cmp r1, r0 - bgt _080811AC + bgt @080811AC cmp r2, 0x58 - bls _0808119C + bls @0808119C ldr r1, =0x03003090 ldr r0, =0x00004523 strh r0, [r1, 0x34] - b _080811DE + b @080811DE .align 2, 0 .pool -_0808119C: +@0808119C: ldr r1, =0x03003090 ldr r0, =0x00005432 strh r0, [r1, 0x34] - b _080811DE + b @080811DE .align 2, 0 .pool -_080811AC: +@080811AC: cmp r2, 0x3C - bls _080811C0 + bls @080811C0 ldr r1, =0x03003090 ldr r0, =0x00004523 - b _080811D0 + b @080811D0 .align 2, 0 .pool -_080811C0: +@080811C0: adds r0, r2, 0 subs r0, 0x38 lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bhi _080811D2 + bhi @080811D2 ldr r1, =0x03003090 ldr r0, =0x00005432 -_080811D0: +@080811D0: strh r0, [r1, 0x34] -_080811D2: +@080811D2: cmp r2, 0x4 - bhi _080811DE + bhi @080811DE movs r0, 0x3 movs r1, 0x5 bl sub_8080E6C -_080811DE: +@080811DE: ldr r0, =0x03005e00 adds r1, r6, r4 lsls r1, 3 adds r1, r0 movs r0, 0x1 - b _08081218 + b @08081218 .align 2, 0 .pool -_080811F8: +@080811F8: ldr r0, =0x03003090 ldr r1, =0x00004523 strh r1, [r0, 0x34] movs r0, 0x1 strh r0, [r2, 0x8] - b _0808121A + b @0808121A .align 2, 0 .pool -_0808120C: +@0808120C: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 movs r0, 0 -_08081218: +@08081218: strh r0, [r1, 0x8] -_0808121A: +@0808121A: pop {r4-r6} pop {r0} bx r0 @@ -232800,7 +232800,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 @@ -232813,7 +232813,7 @@ sub_8081224: @ 8081224 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _08081270 + bne @08081270 ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -232822,16 +232822,16 @@ sub_8081224: @ 8081224 movs r1, 0x8 ldrsh r0, [r2, r1] cmp r0, 0 - bne _0808127E + bne @0808127E ldr r0, =0x03003090 ldr r1, =0x00004523 strh r1, [r0, 0x14] movs r0, 0x1 strh r0, [r2, 0x8] - b _0808127E + b @0808127E .align 2, 0 .pool -_08081270: +@08081270: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -232839,7 +232839,7 @@ _08081270: adds r1, r0 movs r0, 0 strh r0, [r1, 0x8] -_0808127E: +@0808127E: pop {r4} pop {r0} bx r0 @@ -232848,7 +232848,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} @@ -232888,7 +232888,7 @@ sub_8081288: @ 8081288 adds r2, r1, 0 ldr r0, =0x00004523 cmp r7, r0 - bne _08081314 + bne @08081314 lsls r4, r1, 4 adds r4, r1 lsls r4, 2 @@ -232902,13 +232902,13 @@ sub_8081288: @ 8081288 str r0, [r4] movs r0, 0x28 bl audio_play - b _08081358 + b @08081358 .align 2, 0 .pool -_08081314: +@08081314: ldr r0, =0x00005432 cmp r7, r0 - bne _0808133C + bne @0808133C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -232918,13 +232918,13 @@ _08081314: bl obj_anim_image_start movs r0, 0x1F bl audio_play - b _08081358 + b @08081358 .align 2, 0 .pool -_0808133C: +@0808133C: ldr r0, =0x00002345 cmp r8, r0 - bne _08081358 + bne @08081358 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -232934,7 +232934,7 @@ _0808133C: bl obj_anim_image_start movs r0, 0x20 bl audio_play -_08081358: +@08081358: bl sub_8082E84 pop {r3} mov r8, r3 @@ -232946,7 +232946,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 @@ -232954,23 +232954,23 @@ sub_8081370: @ 8081370 bl sub_807F738 ldr r0, =0x00004523 cmp r4, r0 - beq _080813A4 + beq @080813A4 cmp r4, r0 - bgt _08081398 + bgt @08081398 ldr r0, =0x00002345 cmp r4, r0 - beq _08081474 - b _080814A0 + beq @08081474 + b @080814A0 .align 2, 0 .pool -_08081398: +@08081398: ldr r0, =0x00005432 cmp r5, r0 - beq _0808143C - b _080814A0 + beq @0808143C + b @080814A0 .align 2, 0 .pool -_080813A4: +@080813A4: ldr r7, =0x020322a4 ldr r4, [r7] adds r5, r4, 0 @@ -232980,7 +232980,7 @@ _080813A4: ldrsh r1, [r5, r0] ldr r0, =0x000005db cmp r1, r0 - bgt _080813E0 + bgt @080813E0 ldr r1, =0x08339cc3 adds r0, r4, 0 adds r0, 0x7C @@ -232992,10 +232992,10 @@ _080813A4: bl __divsi3 adds r0, r6, r0 strh r0, [r5] - b _080814A0 + b @080814A0 .align 2, 0 .pool -_080813E0: +@080813E0: ldr r1, =0x08339cc3 adds r0, r4, 0 adds r0, 0x7C @@ -233034,10 +233034,10 @@ _080813E0: lsrs r1, 16 adds r0, r4, 0 bl sub_80832BC - b _080814A0 + b @080814A0 .align 2, 0 .pool -_0808143C: +@0808143C: ldr r0, =0x020322a4 ldr r2, [r0] adds r4, r2, 0 @@ -233047,7 +233047,7 @@ _0808143C: ldrsh r1, [r4, r0] ldr r0, =0x000005db cmp r1, r0 - bgt _080814A0 + bgt @080814A0 ldr r1, =0x08339cc3 adds r0, r2, 0 adds r0, 0x7C @@ -233058,10 +233058,10 @@ _0808143C: lsls r0, 1 bl __divsi3 adds r0, r5, r0 - b _0808149E + b @0808149E .align 2, 0 .pool -_08081474: +@08081474: ldr r0, =0x020322a4 ldr r0, [r0] adds r4, r0, 0 @@ -233080,11 +233080,11 @@ _08081474: lsls r1, 16 asrs r1, 16 cmp r1, 0x7F - bgt _080814A0 + bgt @080814A0 movs r0, 0x80 -_0808149E: +@0808149E: strh r0, [r4] -_080814A0: +@080814A0: pop {r4-r7} pop {r0} bx r0 @@ -233093,7 +233093,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 @@ -233104,34 +233104,34 @@ sub_80814B0: @ 80814B0 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _080814E4 + beq @080814E4 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _080814E4 + beq @080814E4 movs r0, 0xFF lsls r0, 8 ands r0, r3 cmp r0, r2 - bne _080814EC + bne @080814EC movs r0, 0x1 - b _080814EE + b @080814EE .align 2, 0 .pool -_080814E4: +@080814E4: cmp r3, r1 - bne _080814EC + bne @080814EC movs r0, 0x1 - b _080814EE -_080814EC: + b @080814EE +@080814EC: movs r0, 0 -_080814EE: +@080814EE: pop {r1} bx r1 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 @@ -233141,18 +233141,18 @@ sub_80814F4: @ 80814F4 ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 - beq _0808153C + beq @0808153C ldr r3, =0x03003110 ldrh r0, [r3, 0x4] ldr r2, =0x03003090 cmp r0, 0 - beq _0808151C + beq @0808151C movs r1, 0 strh r0, [r2, 0x4] ldr r0, =0x00004444 strh r0, [r2] strh r1, [r3, 0x4] -_0808151C: +@0808151C: ldr r0, =0x03003090 ldr r3, =0x00004444 adds r1, r2, 0 @@ -233160,27 +233160,27 @@ _0808151C: adds r2, r0, 0 adds r2, 0x14 movs r7, 0x2 -_0808152A: +@0808152A: ldrh r0, [r2] cmp r0, 0 - beq _08081532 + beq @08081532 strh r3, [r1] -_08081532: +@08081532: adds r1, 0x10 adds r2, 0x10 subs r7, 0x1 cmp r7, 0 - bge _0808152A -_0808153C: + bge @0808152A +@0808153C: movs r7, 0 ldr r1, =0x020322a4 ldr r0, [r1] adds r0, 0x7C ldrb r0, [r0] cmp r7, r0 - blt _0808154C - b _080816F6 -_0808154C: + blt @0808154C + b @080816F6 +@0808154C: ldr r0, =0x03003090 adds r2, r0, 0 adds r2, 0x20 @@ -233192,7 +233192,7 @@ _0808154C: mov r8, r0 ldr r0, =0x00005432 mov r10, r0 -_08081562: +@08081562: mov r1, r8 ldrh r0, [r1] ldr r1, =0x00004444 @@ -233200,9 +233200,9 @@ _08081562: lsls r2, 7 bl sub_80814B0 cmp r0, 0 - bne _08081576 - b _080816D2 -_08081576: + bne @08081576 + b @080816D2 +@08081576: ldr r6, =0x020322a4 ldr r0, [r6] adds r0, 0x96 @@ -233213,7 +233213,7 @@ _08081576: ldrh r4, [r0, 0x4] ldr r1, =0x00004523 cmp r4, r1 - bne _080815F4 + bne @080815F4 adds r0, r1, 0 bl sub_8081370 ldr r0, [r6] @@ -233231,11 +233231,11 @@ _08081576: lsls r1, 16 ldr r0, =0x03e70000 cmp r1, r0 - bls _080815BA + bls @080815BA movs r0, 0xFA lsls r0, 2 strh r0, [r4] -_080815BA: +@080815BA: lsls r1, r5, 24 lsrs r1, 24 ldr r0, =0x00004523 @@ -233247,12 +233247,12 @@ _080815BA: add r1, r9 ldrh r0, [r1] adds r0, 0x1 - b _0808165E + b @0808165E .align 2, 0 .pool -_080815F4: +@080815F4: cmp r4, r10 - bne _08081632 + bne @08081632 mov r0, r10 bl sub_8081370 ldr r0, [r6] @@ -233278,11 +233278,11 @@ _080815F4: add r1, r9 ldrh r0, [r1] adds r0, 0x1 - b _0808165E -_08081632: + b @0808165E +@08081632: ldr r0, =0x00002345 cmp r4, r0 - bne _0808166A + bne @0808166A lsls r1, r5, 24 lsrs r1, 24 adds r0, r4, 0 @@ -233298,25 +233298,25 @@ _08081632: ldrh r2, [r1] ldr r0, =0x000003e6 cmp r2, r0 - bhi _08081660 + bhi @08081660 adds r0, r2, 0x1 -_0808165E: +@0808165E: strh r0, [r1] -_08081660: +@08081660: mov r0, r8 ldrh r1, [r0, 0x4] ldr r0, =0x00002345 cmp r1, r0 - beq _08081678 -_0808166A: + beq @08081678 +@0808166A: ldr r1, [sp] ldrh r0, [r1] ldr r2, =0x00004523 cmp r0, r2 - beq _08081678 + beq @08081678 cmp r0, r10 - bne _080816D2 -_08081678: + bne @080816D2 +@08081678: ldr r0, =0x020322a4 ldr r0, [r0] adds r2, r0, 0 @@ -233325,7 +233325,7 @@ _08081678: ldrsh r1, [r2, r0] ldr r0, =0x000005dc cmp r1, r0 - ble _080816C8 + ble @080816C8 adds r0, r1, 0 ldr r2, =0xfffffd12 adds r0, r2 @@ -233339,15 +233339,15 @@ _08081678: lsrs r1, 16 ldr r0, =0x03007420 bl MPlayTempoControl - b _080816D2 + b @080816D2 .align 2, 0 .pool -_080816C8: +@080816C8: ldr r0, =0x03007420 movs r1, 0x80 lsls r1, 1 bl MPlayTempoControl -_080816D2: +@080816D2: ldr r1, [sp] adds r1, 0x2 str r1, [sp] @@ -233364,23 +233364,23 @@ _080816D2: adds r0, 0x7C ldrb r0, [r0] cmp r7, r0 - bge _080816F6 - b _08081562 -_080816F6: + bge @080816F6 + b @08081562 +@080816F6: ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 - beq _08081722 + beq @08081722 movs r7, 0 ldr r3, =0x020322a4 ldr r0, [r3] adds r0, 0x7C ldrb r0, [r0] cmp r7, r0 - bge _08081722 + bge @08081722 movs r2, 0 ldr r1, =0x03003090 -_08081710: +@08081710: strh r2, [r1] strh r2, [r1, 0x4] adds r1, 0x10 @@ -233389,8 +233389,8 @@ _08081710: adds r0, 0x7C ldrb r0, [r0] cmp r7, r0 - blt _08081710 -_08081722: + blt @08081710 +@08081722: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -233404,18 +233404,18 @@ _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 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _0808175A + beq @0808175A bl link_get_multiplayer_id lsls r0, 24 lsrs r6, r0, 24 -_0808175A: +@0808175A: ldr r3, =0x020322a4 ldr r1, [r3] lsls r2, r6, 1 @@ -233426,39 +233426,39 @@ _0808175A: adds r1, 0x63 ldrb r0, [r1] cmp r0, 0 - bne _0808182C + bne @0808182C ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x2 - bne _080817A8 + bne @080817A8 ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080817B6 + beq @080817B6 ldrh r2, [r2, 0x28] ldr r1, =0x00000201 adds r0, r1, 0 ands r0, r2 cmp r0, r1 - beq _080817B6 - b _080817BA + beq @080817B6 + b @080817BA .align 2, 0 .pool -_080817A8: +@080817A8: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080817B6 + beq @080817B6 movs r4, 0x1 -_080817B6: +@080817B6: cmp r4, 0 - beq _0808182C -_080817BA: + beq @0808182C +@080817BA: ldr r4, =0x020322a4 ldr r1, [r4] lsls r2, r5, 1 @@ -233486,27 +233486,27 @@ _080817BA: lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _08081810 + bne @08081810 ldr r1, =0x03003110 ldr r0, =0x00004523 - b _08081828 + b @08081828 .align 2, 0 .pool -_08081810: +@08081810: cmp r0, 0x1 - bne _08081824 + bne @08081824 ldr r1, =0x03003110 ldr r0, =0x00005432 - b _08081828 + b @08081828 .align 2, 0 .pool -_08081824: +@08081824: ldr r1, =0x03003110 ldr r0, =0x00002345 -_08081828: +@08081828: strh r0, [r1, 0x4] adds r3, r4, 0 -_0808182C: +@0808182C: ldr r1, [r3] adds r1, 0x72 ldrb r0, [r1] @@ -233515,7 +233515,7 @@ _0808182C: lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 - bls _0808185A + bls @0808185A ldr r0, [r3] adds r1, r0, 0 adds r1, 0x4C @@ -233523,26 +233523,26 @@ _0808182C: movs r4, 0 ldrsh r0, [r1, r4] cmp r0, 0x80 - ble _08081852 + ble @08081852 subs r0, r2, 0x1 strh r0, [r1] -_08081852: +@08081852: ldr r0, [r3] adds r0, 0x72 movs r1, 0 strb r1, [r0] -_0808185A: +@0808185A: ldr r0, =0x020322d5 ldrb r0, [r0] cmp r0, 0 - beq _0808187E + beq @0808187E ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x80 lsls r0, 2 ands r0, r1 cmp r0, 0 - beq _0808187E + beq @0808187E ldr r0, [r3] ldr r1, =0x00000123 adds r2, r0, r1 @@ -233550,7 +233550,7 @@ _0808185A: movs r1, 0x1 eors r0, r1 strb r0, [r2] -_0808187E: +@0808187E: pop {r4-r6} pop {r0} bx r0 @@ -233559,7 +233559,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 @@ -233570,10 +233570,10 @@ sub_8081898: @ 8081898 ldr r1, [r2] ldr r0, =0x00057e03 cmp r1, r0 - bhi _080818B4 + bhi @080818B4 adds r0, r1, 0x1 str r0, [r2] -_080818B4: +@080818B4: bl sub_8081744 ldr r1, [r4] adds r0, r1, 0 @@ -233603,21 +233603,21 @@ _080818B4: adds r3, 0x63 ldrb r0, [r3] cmp r0, 0 - bne _0808191A + bne @0808191A movs r1, 0x8C lsls r1, 1 adds r0, r2, r1 ldrh r1, [r0] ldr r0, =0x000003e7 cmp r1, r0 - bls _0808191A + bls @0808191A adds r0, r2, r5 strh r6, [r0] movs r0, 0x1 strb r0, [r3] ldr r0, =sub_8081FC8 + 1 bl set_callback2 -_0808191A: +@0808191A: ldr r0, =0x020322a4 ldr r1, [r0] movs r2, 0x8E @@ -233644,12 +233644,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 @@ -233660,41 +233660,41 @@ help_system_is_not_first_time: @ 8081964 ldrh r0, [r4] ldrh r1, [r5] cmp r0, r1 - bne _080819A2 + bne @080819A2 adds r0, r4, 0x2 adds r1, r5, 0x2 bl sub_8008C44 cmp r0, 0 - bne _080819B0 + bne @080819B0 ldr r0, [r4, 0x8] ldr r2, =0xffffff00 ands r0, r2 ldr r1, [r5, 0x8] ands r1, r2 cmp r0, r1 - bne _080819B0 + bne @080819B0 ldr r0, [r4, 0xC] ldr r2, =0x00ffffff ands r0, r2 ldr r1, [r5, 0xC] ands r1, r2 cmp r0, r1 - bne _080819B0 -_080819A2: + bne @080819B0 +@080819A2: movs r0, 0x1 - b _080819B2 + b @080819B2 .align 2, 0 .pool -_080819B0: +@080819B0: movs r0, 0 -_080819B2: +@080819B2: pop {r4,r5} pop {r1} bx r1 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 @@ -233709,56 +233709,56 @@ sub_80819B8: @ 80819B8 lsrs r3, 24 mov r2, sp movs r4, 0x5 -_080819D4: +@080819D4: ldrh r0, [r1] strh r0, [r2] adds r1, 0x2 adds r2, 0x2 subs r4, 0x1 cmp r4, 0 - bge _080819D4 + bge @080819D4 movs r6, 0 mov r1, sp movs r4, 0x4 -_080819E8: +@080819E8: movs r2, 0 ldrsh r0, [r1, r2] cmp r0, 0 - bne _080819F2 + bne @080819F2 adds r6, 0x1 -_080819F2: +@080819F2: adds r1, 0x2 subs r4, 0x1 cmp r4, 0 - bge _080819E8 + bge @080819E8 cmp r6, 0x5 - beq _08081A46 + beq @08081A46 cmp r3, 0x3 - bhi _08081A46 + bhi @08081A46 movs r4, 0 ldr r3, [sp, 0x10] cmp r4, r3 - bge _08081A5E + bge @08081A5E mov r3, r10 -_08081A0C: +@08081A0C: movs r6, 0 ldr r7, [sp, 0x10] cmp r6, r7 - bge _08081A54 + bge @08081A54 mov r9, r3 mov r5, r10 lsls r0, r4, 24 mov r8, r0 -_08081A1C: +@08081A1C: mov r1, r9 ldrh r0, [r1] ldrh r2, [r5] cmp r0, r2 - bne _08081A4A + bne @08081A4A cmp r4, r6 - beq _08081A4A + beq @08081A4A cmp r0, 0xAF - bne _08081A46 + bne @08081A46 lsls r2, r6, 24 lsrs r2, 24 mov r0, r10 @@ -233769,122 +233769,122 @@ _08081A1C: lsls r0, 24 ldr r3, [sp, 0xC] cmp r0, 0 - beq _08081A4A -_08081A46: + beq @08081A4A +@08081A46: movs r0, 0xC - b _08081B9E -_08081A4A: + b @08081B9E +@08081A4A: adds r5, 0x10 adds r6, 0x1 ldr r0, [sp, 0x10] cmp r6, r0 - blt _08081A1C -_08081A54: + blt @08081A1C +@08081A54: adds r3, 0x10 adds r4, 0x1 ldr r1, [sp, 0x10] cmp r4, r1 - blt _08081A0C -_08081A5E: + blt @08081A0C +@08081A5E: movs r2, 0 mov r1, sp movs r4, 0x4 -_08081A64: +@08081A64: movs r3, 0 ldrsh r0, [r1, r3] cmp r0, 0 - ble _08081A72 + ble @08081A72 adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 -_08081A72: +@08081A72: adds r1, 0x2 subs r4, 0x1 cmp r4, 0 - bge _08081A64 + bge @08081A64 cmp r2, 0x3 - bls _08081A82 + bls @08081A82 movs r0, 0xD - b _08081B9E -_08081A82: + b @08081B9E +@08081A82: cmp r2, 0x3 - bne _08081A8A + bne @08081A8A movs r0, 0xB - b _08081B9E -_08081A8A: + b @08081B9E +@08081A8A: movs r4, 0 mov r1, sp -_08081A8E: +@08081A8E: movs r7, 0 ldrsh r0, [r1, r7] cmp r0, 0x32 - ble _08081A98 - b _08081B98 -_08081A98: + ble @08081A98 + b @08081B98 +@08081A98: adds r1, 0x2 adds r4, 0x1 cmp r4, 0x4 - ble _08081A8E + ble @08081A8E cmp r2, 0x1 - bne _08081AEA + bne @08081AEA mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - ble _08081AB2 + ble @08081AB2 movs r0, 0x1 - b _08081B9E -_08081AB2: + b @08081B9E +@08081AB2: mov r0, sp ldrh r0, [r0, 0x2] lsls r0, 16 cmp r0, 0 - ble _08081AC0 + ble @08081AC0 movs r0, 0x2 - b _08081B9E -_08081AC0: + b @08081B9E +@08081AC0: mov r0, sp movs r3, 0x4 ldrsh r0, [r0, r3] cmp r0, 0 - ble _08081ACE + ble @08081ACE movs r0, 0x3 - b _08081B9E -_08081ACE: + b @08081B9E +@08081ACE: mov r0, sp movs r4, 0x6 ldrsh r0, [r0, r4] cmp r0, 0 - ble _08081ADC + ble @08081ADC movs r0, 0x4 - b _08081B9E -_08081ADC: + b @08081B9E +@08081ADC: mov r0, sp movs r7, 0x8 ldrsh r0, [r0, r7] cmp r0, 0 - ble _08081AEA + ble @08081AEA movs r0, 0x5 - b _08081B9E -_08081AEA: + b @08081B9E +@08081AEA: cmp r2, 0x2 - bne _08081B9C + bne @08081B9C movs r4, 0 ldr r5, =0x03000df8 mov r1, sp adds r2, r5, 0 -_08081AF6: +@08081AF6: movs r3, 0 ldrsh r0, [r1, r3] cmp r0, 0 - ble _08081B02 + ble @08081B02 strh r4, [r2] adds r2, 0x2 -_08081B02: +@08081B02: adds r1, 0x2 adds r4, 0x1 cmp r4, 0x4 - ble _08081AF6 + ble @08081AF6 movs r4, 0 ldrsh r3, [r5, r4] lsls r0, r3, 1 @@ -233899,82 +233899,82 @@ _08081B02: movs r7, 0 ldrsh r0, [r0, r7] cmp r1, r0 - blt _08081B58 + blt @08081B58 adds r0, r3, 0 cmp r0, 0 - bne _08081B38 + bne @08081B38 lsls r0, r2, 16 - b _08081B62 + b @08081B62 .align 2, 0 .pool -_08081B38: +@08081B38: cmp r0, 0x1 - bne _08081B40 + bne @08081B40 lsls r0, r2, 16 - b _08081B6E -_08081B40: + b @08081B6E +@08081B40: cmp r0, 0x2 - bne _08081B48 + bne @08081B48 lsls r0, r2, 16 - b _08081B7A -_08081B48: + b @08081B7A +@08081B48: cmp r0, 0x3 - bne _08081B50 + bne @08081B50 lsls r0, r2, 16 - b _08081B86 -_08081B50: + b @08081B86 +@08081B50: cmp r0, 0x4 - bne _08081B9C + bne @08081B9C lsls r0, r2, 16 - b _08081B92 -_08081B58: + b @08081B92 +@08081B58: movs r2, 0x2 ldrsh r0, [r5, r2] cmp r0, 0 - bne _08081B68 + bne @08081B68 lsls r0, r3, 16 -_08081B62: +@08081B62: movs r1, 0x6 orrs r0, r1 - b _08081B9E -_08081B68: + b @08081B9E +@08081B68: cmp r0, 0x1 - bne _08081B74 + bne @08081B74 lsls r0, r3, 16 -_08081B6E: +@08081B6E: movs r1, 0x7 orrs r0, r1 - b _08081B9E -_08081B74: + b @08081B9E +@08081B74: cmp r0, 0x2 - bne _08081B80 + bne @08081B80 lsls r0, r3, 16 -_08081B7A: +@08081B7A: movs r1, 0x8 orrs r0, r1 - b _08081B9E -_08081B80: + b @08081B9E +@08081B80: cmp r0, 0x3 - bne _08081B8C + bne @08081B8C lsls r0, r3, 16 -_08081B86: +@08081B86: movs r1, 0x9 orrs r0, r1 - b _08081B9E -_08081B8C: + b @08081B9E +@08081B8C: cmp r0, 0x4 - bne _08081B9C + bne @08081B9C lsls r0, r3, 16 -_08081B92: +@08081B92: movs r1, 0xA orrs r0, r1 - b _08081B9E -_08081B98: + b @08081B9E +@08081B98: movs r0, 0xE - b _08081B9E -_08081B9C: + b @08081B9E +@08081B9C: movs r0, 0 -_08081B9E: +@08081B9E: add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -233986,7 +233986,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 @@ -233995,7 +233995,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] @@ -234005,7 +234005,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 @@ -234014,7 +234014,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] @@ -234024,7 +234024,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 @@ -234046,23 +234046,23 @@ sub_8081BE0: @ 8081BE0 movs r1, 0 adds r0, r7, 0 adds r0, 0xA -_08081C0A: +@08081C0A: strh r1, [r0] subs r0, 0x2 cmp r0, r2 - bge _08081C0A + bge @08081C0A movs r6, 0 cmp r6, r9 - bge _08081C40 + bge @08081C40 ldr r0, =0x03000de8 mov r12, r0 ldr r5, [sp] adds r5, 0x9 -_08081C20: +@08081C20: movs r3, 0 adds r4, r5, 0 mov r2, r12 -_08081C26: +@08081C26: adds r1, r4, r3 ldrh r0, [r2] ldrb r1, [r1] @@ -234071,12 +234071,12 @@ _08081C26: adds r2, 0x2 adds r3, 0x1 cmp r3, 0x5 - ble _08081C26 + ble @08081C26 adds r5, 0x10 adds r6, 0x1 cmp r6, r9 - blt _08081C20 -_08081C40: + blt @08081C20 +@08081C40: movs r1, 0 ldrsh r3, [r7, r1] ldrh r0, [r7] @@ -234098,55 +234098,55 @@ _08081C40: movs r2, 0 adds r1, r7, 0 movs r6, 0x4 -_08081C6A: +@08081C6A: movs r4, 0 ldrsh r0, [r1, r4] cmp r0, 0 - bge _08081C76 + bge @08081C76 strh r2, [r1] adds r3, 0x1 -_08081C76: +@08081C76: adds r1, 0x2 subs r6, 0x1 cmp r6, 0 - bge _08081C6A + bge @08081C6A lsls r0, r3, 24 lsrs r0, 24 mov r10, r0 movs r4, 0 ldr r1, =0x03000de8 movs r6, 0x4 -_08081C8A: +@08081C8A: ldrh r2, [r1] movs r5, 0 ldrsh r0, [r1, r5] cmp r0, 0 - ble _08081CA4 + ble @08081CA4 cmp r0, r3 - bge _08081CA0 + bge @08081CA0 strh r4, [r1] - b _08081CA4 + b @08081CA4 .align 2, 0 .pool -_08081CA0: +@08081CA0: subs r0, r2, r3 strh r0, [r1] -_08081CA4: +@08081CA4: adds r1, 0x2 subs r6, 0x1 cmp r6, 0 - bge _08081C8A + bge @08081C8A ldr r1, =0x03000de8 ldr r2, =0x020322a8 movs r6, 0x4 -_08081CB2: +@08081CB2: movs r3, 0 ldrsh r0, [r1, r3] stm r2!, {r0} adds r1, 0x2 subs r6, 0x1 cmp r6, 0 - bge _08081CB2 + bge @08081CB2 ldr r1, =0x0000014d ldr r0, [sp, 0x8] bl __udivsi3 @@ -234157,7 +234157,7 @@ _08081CB2: ldr r4, =0x020322d0 str r3, [r4] movs r6, 0x4 -_08081CD6: +@08081CD6: movs r0, 0 ldrsh r5, [r7, r0] adds r0, r5, 0 @@ -234175,25 +234175,25 @@ _08081CD6: adds r5, r0, 0 ldr r3, [sp, 0xC] cmp r4, 0x4 - ble _08081D02 + ble @08081D02 adds r5, 0x1 -_08081D02: +@08081D02: strh r5, [r7] adds r7, 0x2 subs r6, 0x1 cmp r6, 0 - bge _08081CD6 + bge @08081CD6 ldr r1, =0x03000de8 ldr r2, =0x020322bc movs r6, 0x4 -_08081D12: +@08081D12: movs r3, 0 ldrsh r0, [r1, r3] stm r2!, {r0} adds r1, 0x2 subs r6, 0x1 cmp r6, 0 - bge _08081D12 + bge @08081D12 ldr r4, =0x03000de8 ldr r0, [sp] adds r1, r4, 0 @@ -234211,14 +234211,14 @@ _08081D12: strh r0, [r4, 0xA] lsls r0, 16 cmp r0, 0 - bge _08081D4C + bge @08081D4C movs r0, 0 strh r0, [r4, 0xA] -_08081D4C: +@08081D4C: mov r5, r8 ldrb r0, [r5] cmp r0, 0xC - bne _08081DA6 + bne @08081DA6 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -234233,39 +234233,39 @@ _08081D4C: adds r1, r4, 0 movs r4, 0x1 movs r3, 0x2 -_08081D74: +@08081D74: adds r2, r0, 0 asrs r2, r6 ands r2, r4 cmp r2, 0 - beq _08081D9C + beq @08081D9C strh r3, [r1] - b _08081D9E + b @08081D9E .align 2, 0 .pool -_08081D9C: +@08081D9C: strh r2, [r1] -_08081D9E: +@08081D9E: adds r1, 0x2 adds r6, 0x1 cmp r6, 0x4 - ble _08081D74 -_08081DA6: + ble @08081D74 +@08081DA6: ldr r7, =0x03000de8 movs r2, 0xFF adds r1, r7, 0 movs r6, 0x5 -_08081DAE: +@08081DAE: movs r3, 0 ldrsh r0, [r1, r3] cmp r0, 0xFF - ble _08081DB8 + ble @08081DB8 strh r2, [r1] -_08081DB8: +@08081DB8: adds r1, 0x2 subs r6, 0x1 cmp r6, 0 - bge _08081DAE + bge @08081DAE ldrh r0, [r7] mov r4, r8 strb r0, [r4, 0x1] @@ -234281,7 +234281,7 @@ _08081DB8: strb r0, [r4, 0x6] movs r6, 0 adds r2, r7, 0 -_08081DDE: +@08081DDE: ldr r5, [sp, 0x4] adds r1, r5, r6 ldrh r0, [r2] @@ -234289,7 +234289,7 @@ _08081DDE: adds r2, 0x2 adds r6, 0x1 cmp r6, 0x5 - ble _08081DDE + ble @08081DDE add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -234303,7 +234303,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] @@ -234320,7 +234320,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] @@ -234333,164 +234333,164 @@ sub_8081E20: @ 8081E20 movs r2, 0 ldr r5, =0x00000383 cmp r1, r5 - bhi _08081E48 + bhi @08081E48 movs r2, 0x5 - b _08081E9A + b @08081E9A .align 2, 0 .pool -_08081E48: +@08081E48: ldr r3, =0xfffffc7c adds r0, r1, r3 lsls r0, 16 lsrs r0, 16 ldr r3, =0x00000257 cmp r0, r3 - bhi _08081E64 + bhi @08081E64 movs r2, 0x4 - b _08081E9A + b @08081E9A .align 2, 0 .pool -_08081E64: +@08081E64: ldr r6, =0xfffffa24 adds r0, r1, r6 lsls r0, 16 lsrs r0, 16 cmp r0, r3 - bhi _08081E78 + bhi @08081E78 movs r2, 0x3 - b _08081E9A + b @08081E9A .align 2, 0 .pool -_08081E78: +@08081E78: ldr r3, =0xfffff7cc adds r0, r1, r3 lsls r0, 16 lsrs r0, 16 cmp r0, r5 - bhi _08081E8C + bhi @08081E8C movs r2, 0x2 - b _08081E9A + b @08081E9A .align 2, 0 .pool -_08081E8C: +@08081E8C: ldr r6, =0xfffff31c adds r0, r1, r6 lsls r0, 16 ldr r1, =0x012b0000 cmp r0, r1 - bhi _08081E9A + bhi @08081E9A movs r2, 0x1 -_08081E9A: +@08081E9A: lsls r0, r2, 16 asrs r0, 16 bl sub_8081BC8 movs r2, 0 cmp r4, 0x40 - bhi _08081F7C + bhi @08081F7C adds r0, r4, 0 subs r0, 0x32 lsls r0, 16 lsrs r0, 16 cmp r0, 0x31 - bhi _08081EC4 + bhi @08081EC4 ldr r2, =0x0000ffff - b _08081F7C + b @08081F7C .align 2, 0 .pool -_08081EC4: +@08081EC4: adds r0, r4, 0 subs r0, 0x64 lsls r0, 16 lsrs r0, 16 cmp r0, 0x31 - bhi _08081ED8 + bhi @08081ED8 ldr r2, =0x0000fffe - b _08081F7C + b @08081F7C .align 2, 0 .pool -_08081ED8: +@08081ED8: adds r0, r4, 0 subs r0, 0x96 lsls r0, 16 lsrs r0, 16 cmp r0, 0x31 - bhi _08081EEC + bhi @08081EEC ldr r2, =0x0000fffd - b _08081F7C + b @08081F7C .align 2, 0 .pool -_08081EEC: +@08081EEC: adds r0, r4, 0 subs r0, 0xC8 lsls r0, 16 lsrs r0, 16 cmp r0, 0x31 - bhi _08081F00 + bhi @08081F00 ldr r2, =0x0000fffc - b _08081F7C + b @08081F7C .align 2, 0 .pool -_08081F00: +@08081F00: adds r0, r4, 0 subs r0, 0xFA lsls r0, 16 lsrs r0, 16 cmp r0, 0x31 - bhi _08081F14 + bhi @08081F14 ldr r2, =0x0000fffb - b _08081F7C + b @08081F7C .align 2, 0 .pool -_08081F14: +@08081F14: ldr r1, =0xfffffea2 adds r0, r4, r1 lsls r0, 16 lsrs r0, 16 cmp r0, 0x31 - bhi _08081F2C + bhi @08081F2C ldr r2, =0x0000fffa - b _08081F7C + b @08081F7C .align 2, 0 .pool -_08081F2C: +@08081F2C: ldr r3, =0xfffffe70 adds r0, r4, r3 lsls r0, 16 lsrs r0, 16 cmp r0, 0x31 - bhi _08081F44 + bhi @08081F44 ldr r2, =0x0000fff9 - b _08081F7C + b @08081F7C .align 2, 0 .pool -_08081F44: +@08081F44: ldr r6, =0xfffffe0c adds r0, r4, r6 lsls r0, 16 lsrs r0, 16 cmp r0, 0x31 - bhi _08081F5C + bhi @08081F5C ldr r2, =0x0000fff8 - b _08081F7C + b @08081F7C .align 2, 0 .pool -_08081F5C: +@08081F5C: ldr r1, =0xfffffdda adds r0, r4, r1 lsls r0, 16 lsrs r0, 16 cmp r0, 0x31 - bhi _08081F74 + bhi @08081F74 ldr r2, =0x0000fff7 - b _08081F7C + b @08081F7C .align 2, 0 .pool -_08081F74: +@08081F74: ldr r0, =0x00000257 cmp r4, r0 - bls _08081F7C + bls @08081F7C ldr r2, =0x0000fff6 -_08081F7C: +@08081F7C: lsls r0, r2, 16 asrs r0, 16 bl sub_8081BB0 @@ -234502,25 +234502,25 @@ _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 ldrb r0, [r0] cmp r0, 0 - beq _08081FB8 + beq @08081FB8 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _08081FB8 + beq @08081FB8 movs r2, 0xBC lsls r2, 6 - b _08081FBA + b @08081FBA .align 2, 0 .pool -_08081FB8: +@08081FB8: ldr r2, =0x00002fff -_08081FBA: +@08081FBA: adds r0, r2, 0 strh r0, [r1] pop {r0} @@ -234530,7 +234530,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} @@ -234539,50 +234539,50 @@ sub_8081FC8: @ 8081FC8 adds r0, 0x63 ldrb r0, [r0] cmp r0, 0x2 - bhi _08081FDE + bhi @08081FDE bl sub_8082D28 -_08081FDE: +@08081FDE: bl link_get_multiplayer_id ldr r0, [r4] adds r0, 0x63 ldrb r0, [r0] subs r0, 0x1 cmp r0, 0xC - bls _08081FF0 - b _0808249E -_08081FF0: + bls @08081FF0 + b @0808249E +@08081FF0: lsls r0, 2 - ldr r1, =_08082004 + ldr r1, =@08082004 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08082004: - .4byte _08082038 - .4byte _08082078 - .4byte _080820D4 - .4byte _080821C8 - .4byte _08082278 - .4byte _08082286 - .4byte _080822B0 - .4byte _08082458 - .4byte _080822E4 - .4byte _08082308 - .4byte _080823B0 - .4byte _08082430 - .4byte _0808246C -_08082038: +@08082004: + .4byte @08082038 + .4byte @08082078 + .4byte @080820D4 + .4byte @080821C8 + .4byte @08082278 + .4byte @08082286 + .4byte @080822B0 + .4byte @08082458 + .4byte @080822E4 + .4byte @08082308 + .4byte @080823B0 + .4byte @08082430 + .4byte @0808246C +@08082038: ldr r0, =0x03007420 movs r1, 0x80 lsls r1, 1 bl MPlayTempoControl movs r4, 0 - b _08082064 + b @08082064 .align 2, 0 .pool -_0808204C: +@0808204C: ldr r0, =0x020322a4 ldr r0, [r0] movs r1, 0x90 @@ -234594,15 +234594,15 @@ _0808204C: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_08082064: +@08082064: ldr r0, =0x020375e0 ldrh r0, [r0] cmp r4, r0 - bcc _0808204C - b _08082458 + bcc @0808204C + b @08082458 .align 2, 0 .pool -_08082078: +@08082078: ldr r4, =0x020322a4 ldr r1, [r4] adds r1, 0x4C @@ -234611,7 +234611,7 @@ _08082078: strh r0, [r1] lsls r0, 16 cmp r0, 0 - bgt _080820C6 + bgt @080820C6 bl sub_8009F8C ldr r2, [r4] adds r1, r2, 0 @@ -234621,18 +234621,18 @@ _08082078: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _080820B0 + beq @080820B0 adds r1, 0x17 ldrb r0, [r1] adds r0, 0x1 - b _080820B6 + b @080820B6 .align 2, 0 .pool -_080820B0: +@080820B0: adds r1, r2, 0 adds r1, 0x63 movs r0, 0x5 -_080820B6: +@080820B6: strb r0, [r1] ldr r0, =0x020322a4 ldr r1, [r0] @@ -234640,32 +234640,32 @@ _080820B6: strb r0, [r1] ldr r0, =0x03007630 bl MPlayStop_rev01 -_080820C6: +@080820C6: bl sub_807F738 - b _0808249E + b @0808249E .align 2, 0 .pool -_080820D4: +@080820D4: bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - beq _080820E0 - b _08082458 -_080820E0: + beq @080820E0 + b @08082458 +@080820E0: bl sub_800A520 lsls r0, 24 cmp r0, 0 - bne _080820EC - b _0808249E -_080820EC: + bne @080820EC + b @0808249E +@080820EC: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _0808218C + beq @0808218C ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _0808218C + beq @0808218C ldr r3, =0x020322a4 ldr r1, [r3] movs r4, 0x8E @@ -234688,13 +234688,13 @@ _080820EC: ldr r7, =0x000011c8 movs r6, 0x92 lsls r6, 1 -_08082128: +@08082128: movs r3, 0 adds r5, r4, 0x1 lsls r0, r4, 1 adds r0, r4 lsls r4, r0, 1 -_08082132: +@08082132: mov r1, r12 ldr r0, [r1] lsls r1, r3, 1 @@ -234709,11 +234709,11 @@ _08082132: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x2 - bls _08082132 + bls @08082132 lsls r0, r5, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _08082128 + bls @08082128 mov r2, r8 ldr r1, [r2] movs r4, 0x8E @@ -234724,15 +234724,15 @@ _08082132: bl link_0800A448 lsls r0, 24 cmp r0, 0 - bne _08082172 - b _0808249E -_08082172: + bne @08082172 + b @0808249E +@08082172: mov r5, r8 ldr r1, [r5] - b _0808245C + b @0808245C .align 2, 0 .pool -_0808218C: +@0808218C: ldr r4, =0x020322a4 ldr r3, [r4] movs r0, 0xCC @@ -234755,20 +234755,20 @@ _0808218C: bl link_0800A448 lsls r0, 24 cmp r0, 0 - bne _080821BE - b _0808249E -_080821BE: + bne @080821BE + b @0808249E +@080821BE: ldr r1, [r4] - b _0808245C + b @0808245C .align 2, 0 .pool -_080821C8: +@080821C8: bl sub_800A550 lsls r0, 24 cmp r0, 0 - bne _080821D4 - b _0808249E -_080821D4: + bne @080821D4 + b @0808249E +@080821D4: bl sub_800A5B4 ldr r5, =0x020322a4 ldr r1, [r5] @@ -234779,11 +234779,11 @@ _080821D4: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _08082254 + beq @08082254 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _08082254 + beq @08082254 ldr r2, =0x020223c4 ldr r3, [r5] ldrh r0, [r2, 0x4] @@ -234801,13 +234801,13 @@ _080821D4: adds r6, r5, 0 movs r2, 0x92 lsls r2, 1 -_08082216: +@08082216: movs r3, 0 adds r5, r4, 0x1 lsls r0, r4, 1 adds r0, r4 lsls r4, r0, 1 -_08082220: +@08082220: ldr r1, [r6] lsls r0, r3, 1 adds r0, r4 @@ -234820,15 +234820,15 @@ _08082220: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x2 - bls _08082220 + bls @08082220 lsls r0, r5, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _08082216 - b _0808249E + bls @08082216 + b @0808249E .align 2, 0 .pool -_08082254: +@08082254: ldr r2, =0x020223c4 ldr r0, =0x020322a4 ldr r3, [r0] @@ -234841,38 +234841,38 @@ _08082254: adds r1, r3, r4 ldr r0, [r2] str r0, [r1] - b _0808249E + b @0808249E .align 2, 0 .pool -_08082278: +@08082278: bl sub_8083B08 lsls r0, 24 cmp r0, 0 - bne _08082284 - b _0808249E -_08082284: - b _08082458 -_08082286: + bne @08082284 + b @0808249E +@08082284: + b @08082458 +@08082286: bl sub_8083450 lsls r0, 24 cmp r0, 0 - bne _08082292 - b _0808249E -_08082292: + bne @08082292 + b @0808249E +@08082292: ldr r0, =0x03005d98 ldrb r0, [r0] cmp r0, 0 - bne _080822A8 + bne @080822A8 movs r0, 0x22 bl sav12_xor_increment - b _08082458 + b @08082458 .align 2, 0 .pool -_080822A8: +@080822A8: movs r0, 0x21 bl sav12_xor_increment - b _08082458 -_080822B0: + b @08082458 +@080822B0: ldr r6, =0x020322a4 ldr r4, [r6] ldr r5, =0x000011b8 @@ -234886,14 +234886,14 @@ _080822B0: adds r1, r5, 0 bl sub_808417C cmp r0, 0 - bne _080822D2 - b _0808249E -_080822D2: + bne @080822D2 + b @0808249E +@080822D2: ldr r1, [r6] - b _0808245C + b @0808245C .align 2, 0 .pool -_080822E4: +@080822E4: ldr r4, =0x020322a4 ldr r0, [r4] adds r0, 0x9E @@ -234905,27 +234905,27 @@ _080822E4: movs r3, 0 bl sub_81996C0 ldr r1, [r4] - b _0808245C + b @0808245C .align 2, 0 .pool -_08082308: +@08082308: bl sub_8198C58 lsls r0, 24 asrs r2, r0, 24 cmp r2, 0 - beq _0808236C + beq @0808236C cmp r2, 0 - bgt _08082322 + bgt @08082322 movs r0, 0x1 negs r0, r0 cmp r2, r0 - beq _08082328 - b _0808249E -_08082322: + beq @08082328 + b @0808249E +@08082322: cmp r2, 0x1 - beq _08082328 - b _0808249E -_08082328: + beq @08082328 + b @0808249E +@08082328: ldr r2, =0x020322a4 ldr r0, [r2] adds r0, 0x9E @@ -234937,7 +234937,7 @@ _08082328: adds r0, 0x1 strb r0, [r1] movs r4, 0 -_0808233E: +@0808233E: ldr r0, =0x020322a4 ldr r0, [r0] lsls r1, r4, 1 @@ -234945,22 +234945,22 @@ _0808233E: adds r0, r1 ldrh r0, [r0] cmp r0, 0xFF - beq _0808235C + beq @0808235C adds r0, r4, 0 bl Window_WriteStandardTileMap adds r0, r4, 0 movs r1, 0x3 bl Window_CopyToVram -_0808235C: +@0808235C: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _0808233E - b _0808249E + bls @0808233E + b @0808249E .align 2, 0 .pool -_0808236C: +@0808236C: ldr r1, =0x020322a4 ldr r0, [r1] adds r0, 0x9E @@ -234971,7 +234971,7 @@ _0808236C: adds r0, 0x1 strb r0, [r1] movs r4, 0 -_08082380: +@08082380: ldr r0, =0x020322a4 ldr r0, [r0] lsls r1, r4, 1 @@ -234979,22 +234979,22 @@ _08082380: adds r0, r1 ldrh r0, [r0] cmp r0, 0xFF - beq _0808239E + beq @0808239E adds r0, r4, 0 bl Window_WriteStandardTileMap adds r0, r4, 0 movs r1, 0x3 bl Window_CopyToVram -_0808239E: +@0808239E: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _08082380 - b _0808249E + bls @08082380 + b @0808249E .align 2, 0 .pool -_080823B0: +@080823B0: ldr r6, =0x03003110 adds r0, r6, 0 bl sub_8081F94 @@ -235004,47 +235004,47 @@ _080823B0: adds r0, 0x9E ldrb r5, [r0] cmp r5, 0 - bne _0808241C + bne @0808241C movs r0, 0x4 bl sub_80D66EC lsls r0, 24 cmp r0, 0 - bne _080823EC + bne @080823EC ldr r0, [r4] adds r0, 0x70 movs r1, 0x2 strh r1, [r0] ldr r0, =0x00009999 - b _08082414 + b @08082414 .align 2, 0 .pool -_080823EC: +@080823EC: bl sub_8136EF4 lsls r0, 24 asrs r0, 24 movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _0808240C + bne @0808240C ldr r0, [r4] adds r0, 0x70 movs r1, 0x3 strh r1, [r0] ldr r0, =0x0000aaaa - b _08082414 + b @08082414 .align 2, 0 .pool -_0808240C: +@0808240C: ldr r0, [r4] adds r0, 0x70 strh r5, [r0] ldr r0, =0x00007779 -_08082414: +@08082414: strh r0, [r6, 0x2] - b _08082458 + b @08082458 .align 2, 0 .pool -_0808241C: +@0808241C: adds r1, r2, 0 adds r1, 0x70 movs r0, 0x1 @@ -235052,14 +235052,14 @@ _0808241C: ldr r0, =0x00008888 strh r0, [r6, 0x2] subs r1, 0xD - b _0808245E + b @0808245E .align 2, 0 .pool -_08082430: +@08082430: ldr r0, =0x03005d98 ldrb r0, [r0] cmp r0, 0 - beq _08082458 + beq @08082458 ldr r0, =sub_8082924 + 1 bl set_callback2 ldr r2, =0x020322a4 @@ -235068,22 +235068,22 @@ _08082430: movs r1, 0 strb r1, [r0] ldr r0, [r2] - b _0808249C + b @0808249C .align 2, 0 .pool -_08082458: +@08082458: ldr r0, =0x020322a4 ldr r1, [r0] -_0808245C: +@0808245C: adds r1, 0x63 -_0808245E: +@0808245E: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0808249E + b @0808249E .align 2, 0 .pool -_0808246C: +@0808246C: ldr r6, =0x020322a4 ldr r4, [r6] ldr r0, =0x000011b8 @@ -235097,7 +235097,7 @@ _0808246C: adds r1, r5, 0 bl sub_808417C cmp r0, 0 - beq _0808249E + beq @0808249E ldr r0, =sub_8082644 + 1 bl set_callback2 ldr r0, [r6] @@ -235105,9 +235105,9 @@ _0808246C: movs r1, 0 strb r1, [r0] ldr r0, [r6] -_0808249C: +@0808249C: strb r1, [r0] -_0808249E: +@0808249E: bl sub_808330C ldr r4, =0x020322a4 ldr r0, [r4] @@ -235142,7 +235142,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] @@ -235152,26 +235152,26 @@ sub_80824FC: @ 80824FC ldr r0, [r0] adds r4, r1, 0 cmp r0, 0x6 - bls _08082512 - b _0808263C -_08082512: + bls @08082512 + b @0808263C +@08082512: lsls r0, 2 - ldr r1, =_08082524 + ldr r1, =@08082524 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08082524: - .4byte _08082540 - .4byte _08082558 - .4byte _08082584 - .4byte _08082594 - .4byte _080825BA - .4byte _08082600 - .4byte _0808261A -_08082540: +@08082524: + .4byte @08082540 + .4byte @08082558 + .4byte @08082584 + .4byte @08082594 + .4byte @080825BA + .4byte @08082600 + .4byte @0808261A +@08082540: bl sub_800ADF8 ldr r0, =0x020322a4 ldr r2, [r0] @@ -235179,14 +235179,14 @@ _08082540: lsls r3, 1 adds r1, r2, r3 movs r0, 0x1 - b _0808260C + b @0808260C .align 2, 0 .pool -_08082558: +@08082558: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _0808263C + beq @0808263C ldr r0, =0x020322a4 ldr r1, [r0] movs r2, 0xD0 @@ -235198,17 +235198,17 @@ _08082558: ldr r1, =0x03002700 movs r0, 0x1 strb r0, [r1] - b _0808263C + b @0808263C .align 2, 0 .pool -_08082584: +@08082584: bl sub_8153430 ldr r0, =0x020322a4 ldr r2, [r0] - b _08082602 + b @08082602 .align 2, 0 .pool -_08082594: +@08082594: ldr r1, [r4] movs r2, 0x84 lsls r2, 1 @@ -235217,7 +235217,7 @@ _08082594: adds r0, 0x1 str r0, [r1] cmp r0, 0xA - bne _0808263C + bne @0808263C bl sub_800ADF8 ldr r1, [r4] movs r3, 0xD0 @@ -235226,17 +235226,17 @@ _08082594: ldr r0, [r1] adds r0, 0x1 str r0, [r1] - b _0808263C -_080825BA: + b @0808263C +@080825BA: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _0808263C + beq @0808263C bl sub_8153474 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - beq _080825E4 + beq @080825E4 ldr r0, =0x020322a4 ldr r0, [r0] movs r1, 0xD0 @@ -235244,10 +235244,10 @@ _080825BA: adds r0, r1 movs r1, 0x5 str r1, [r0] - b _0808263C + b @0808263C .align 2, 0 .pool -_080825E4: +@080825E4: ldr r0, =0x020322a4 ldr r1, [r0] movs r3, 0x84 @@ -235259,26 +235259,26 @@ _080825E4: adds r1, r0 movs r0, 0x3 str r0, [r1] - b _0808263C + b @0808263C .align 2, 0 .pool -_08082600: +@08082600: ldr r2, [r4] -_08082602: +@08082602: movs r3, 0xD0 lsls r3, 1 adds r1, r2, r3 ldr r0, [r1] adds r0, 0x1 -_0808260C: +@0808260C: str r0, [r1] movs r0, 0x84 lsls r0, 1 adds r1, r2, r0 movs r0, 0 str r0, [r1] - b _0808263C -_0808261A: + b @0808263C +@0808261A: ldr r1, [r4] movs r2, 0x84 lsls r2, 1 @@ -235287,24 +235287,24 @@ _0808261A: adds r0, 0x1 str r0, [r1] cmp r0, 0x5 - ble _0808263C + ble @0808263C ldr r1, =0x03002700 movs r0, 0 strb r0, [r1] movs r0, 0x1 - b _0808263E + b @0808263E .align 2, 0 .pool -_0808263C: +@0808263C: movs r0, 0 -_0808263E: +@0808263E: pop {r4} pop {r1} bx r1 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 @@ -235313,69 +235313,69 @@ sub_8082644: @ 8082644 ldrb r0, [r0] adds r6, r1, 0 cmp r0, 0xC - bls _08082658 - b _080828DC -_08082658: + bls @08082658 + b @080828DC +@08082658: lsls r0, 2 - ldr r1, =_0808266C + ldr r1, =@0808266C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0808266C: - .4byte _080826A0 - .4byte _080826EC - .4byte _0808271C - .4byte _08082754 - .4byte _0808278C - .4byte _080827AA - .4byte _080827C8 - .4byte _080827FC - .4byte _08082818 - .4byte _08082828 - .4byte _0808284C - .4byte _080828A4 - .4byte _080828C6 -_080826A0: +@0808266C: + .4byte @080826A0 + .4byte @080826EC + .4byte @0808271C + .4byte @08082754 + .4byte @0808278C + .4byte @080827AA + .4byte @080827C8 + .4byte @080827FC + .4byte @08082818 + .4byte @08082828 + .4byte @0808284C + .4byte @080828A4 + .4byte @080828C6 +@080826A0: ldr r1, [r6] adds r0, r1, 0 adds r0, 0x64 ldrh r2, [r0] ldr r0, =0x00002222 cmp r2, r0 - bne _080826B0 - b _080827A2 -_080826B0: + bne @080826B0 + b @080827A2 +@080826B0: ldr r0, =0x00001111 cmp r2, r0 - beq _080826B8 - b _080828DC -_080826B8: + beq @080826B8 + b @080828DC +@080826B8: adds r0, r1, 0 adds r0, 0x6C ldrh r2, [r0] ldr r0, =0x00009999 cmp r2, r0 - bne _080826D8 + bne @080826D8 adds r1, 0x63 movs r0, 0x2 strb r0, [r1] - b _080828DC + b @080828DC .align 2, 0 .pool -_080826D8: +@080826D8: ldr r0, =0x0000aaaa cmp r2, r0 - bne _080827A2 + bne @080827A2 adds r1, 0x63 movs r0, 0x1 strb r0, [r1] - b _080828DC + b @080828DC .align 2, 0 .pool -_080826EC: +@080826EC: ldr r0, [r6] adds r0, 0x63 movs r1, 0x3 @@ -235392,10 +235392,10 @@ _080826EC: adds r0, r4, 0 bl gf_strcpy ldr r1, =0x083398dd - b _08082740 + b @08082740 .align 2, 0 .pool -_0808271C: +@0808271C: ldr r1, [r6] adds r1, 0x63 ldrb r0, [r1] @@ -235413,13 +235413,13 @@ _0808271C: adds r0, r4, 0 bl gf_strcpy ldr r1, =0x083398b0 -_08082740: +@08082740: adds r0, r4, 0 bl gf_strcat - b _080828DC + b @080828DC .align 2, 0 .pool -_08082754: +@08082754: ldr r4, [r6] ldr r0, =0x000011b8 adds r4, r0 @@ -235432,19 +235432,19 @@ _08082754: adds r1, r5, 0 bl sub_808417C cmp r0, 0 - bne _08082774 - b _080828DC -_08082774: + bne @08082774 + b @080828DC +@08082774: ldr r1, [r6] movs r0, 0x84 lsls r0, 1 adds r2, r1, r0 movs r0, 0 str r0, [r2] - b _080828BC + b @080828BC .align 2, 0 .pool -_0808278C: +@0808278C: ldr r4, [r6] movs r2, 0x84 lsls r2, 1 @@ -235453,16 +235453,16 @@ _0808278C: adds r0, 0x1 str r0, [r1] cmp r0, 0x3C - bgt _080827A0 - b _080828DC -_080827A0: + bgt @080827A0 + b @080828DC +@080827A0: adds r1, r4, 0 -_080827A2: +@080827A2: adds r1, 0x63 movs r0, 0x5 strb r0, [r1] - b _080828DC -_080827AA: + b @080828DC +@080827AA: ldr r0, [r6] ldr r1, =0x000011b8 adds r0, r1 @@ -235470,16 +235470,16 @@ _080827AA: movs r2, 0 bl sub_808417C bl sub_800ADF8 - b _080828BA + b @080828BA .align 2, 0 .pool -_080827C8: +@080827C8: bl sub_800A520 lsls r0, 24 cmp r0, 0 - bne _080827D4 - b _080828DC -_080827D4: + bne @080827D4 + b @080828DC +@080827D4: ldr r3, =0x020322a4 ldr r1, [r3] movs r2, 0x84 @@ -235496,34 +235496,34 @@ _080827D4: lsls r1, 1 adds r0, r1 str r2, [r0] - b _080828DC + b @080828DC .align 2, 0 .pool -_080827FC: +@080827FC: bl sub_80824FC lsls r0, 24 cmp r0, 0 - beq _080828DC + beq @080828DC movs r0, 0x37 bl audio_play ldr r0, =0x020322a4 ldr r1, [r0] - b _080828BC + b @080828BC .align 2, 0 .pool -_08082818: +@08082818: ldr r1, [r6] adds r1, 0x63 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] bl sub_800ADF8 - b _080828DC -_08082828: + b @080828DC +@08082828: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080828DC + beq @080828DC movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -235533,10 +235533,10 @@ _08082828: bl sub_80A1AD4 ldr r0, =0x020322a4 ldr r1, [r0] - b _080828BC + b @080828BC .align 2, 0 .pool -_0808284C: +@0808284C: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -235544,14 +235544,14 @@ _0808284C: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _080828DC + bne @080828DC ldr r2, [r6] adds r0, r2, 0 adds r0, 0x64 ldrh r1, [r0] ldr r0, =0x00002222 cmp r1, r0 - bne _08082898 + bne @08082898 bl Window_FreeMemory movs r0, 0x2 bl bg_unset_tilemap @@ -235562,17 +235562,17 @@ _0808284C: str r4, [r6] ldr r0, =sub_807FA80 + 1 bl set_callback2 - b _080828DC + b @080828DC .align 2, 0 .pool -_08082898: +@08082898: movs r1, 0x84 lsls r1, 1 adds r0, r2, r1 str r4, [r0] adds r1, r2, 0 - b _080828BC -_080828A4: + b @080828BC +@080828A4: ldr r1, [r6] movs r2, 0x84 lsls r2, 1 @@ -235581,27 +235581,27 @@ _080828A4: adds r0, 0x1 str r0, [r1] cmp r0, 0x1E - ble _080828DC + ble @080828DC bl sub_800AC34 -_080828BA: +@080828BA: ldr r1, [r6] -_080828BC: +@080828BC: adds r1, 0x63 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080828DC -_080828C6: + b @080828DC +@080828C6: ldr r0, =0x03003124 ldrb r4, [r0] cmp r4, 0 - bne _080828DC + bne @080828DC ldr r0, [r6] bl free str r4, [r6] ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 -_080828DC: +@080828DC: bl sub_8082AD4 ldr r0, =0x020322a4 ldr r1, [r0] @@ -235630,7 +235630,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] @@ -235638,60 +235638,60 @@ sub_8082924: @ 8082924 ldrb r0, [r0] adds r6, r1, 0 cmp r0, 0xA - bls _08082936 - b _08082A92 -_08082936: + bls @08082936 + b @08082A92 +@08082936: lsls r0, 2 - ldr r1, =_08082948 + ldr r1, =@08082948 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08082948: - .4byte _08082974 - .4byte _080829AA - .4byte _080829D4 - .4byte _08082A00 - .4byte _08082A92 - .4byte _08082A92 - .4byte _08082A92 - .4byte _08082A92 - .4byte _08082A92 - .4byte _08082A30 - .4byte _08082A48 -_08082974: +@08082948: + .4byte @08082974 + .4byte @080829AA + .4byte @080829D4 + .4byte @08082A00 + .4byte @08082A92 + .4byte @08082A92 + .4byte @08082A92 + .4byte @08082A92 + .4byte @08082A92 + .4byte @08082A30 + .4byte @08082A48 +@08082974: ldr r1, [r6] adds r0, r1, 0 adds r0, 0x70 ldrh r0, [r0] cmp r0, 0x1 - bhi _08082986 + bhi @08082986 adds r1, 0x63 movs r0, 0x9 strb r0, [r1] -_08082986: +@08082986: ldr r2, [r6] adds r0, r2, 0 adds r0, 0x70 ldrh r1, [r0] cmp r1, 0x2 - bne _08082996 + bne @08082996 subs r0, 0xD strb r1, [r0] -_08082996: +@08082996: ldr r1, [r6] adds r0, r1, 0 adds r0, 0x70 ldrh r0, [r0] cmp r0, 0x3 - bne _08082A92 + bne @08082A92 adds r1, 0x63 movs r0, 0x1 strb r0, [r1] - b _08082A92 -_080829AA: + b @08082A92 +@080829AA: ldr r0, [r6] adds r0, 0x63 movs r2, 0 @@ -235704,10 +235704,10 @@ _080829AA: ldr r0, =0x02021fc4 ldr r1, =0x08339896 bl gf_strcpy - b _08082A92 + b @08082A92 .align 2, 0 .pool -_080829D4: +@080829D4: ldr r1, [r6] adds r1, 0x63 ldrb r0, [r1] @@ -235721,10 +235721,10 @@ _080829D4: ldr r0, =0x02021fc4 ldr r1, =0x08339858 bl gf_strcpy - b _08082A92 + b @08082A92 .align 2, 0 .pool -_08082A00: +@08082A00: ldr r4, [r6] ldr r2, =0x000011b8 adds r4, r2 @@ -235737,15 +235737,15 @@ _08082A00: adds r1, r5, 0 bl sub_808417C cmp r0, 0 - beq _08082A92 + beq @08082A92 ldr r0, [r6] adds r0, 0x63 movs r1, 0x9 strb r1, [r0] - b _08082A92 + b @08082A92 .align 2, 0 .pool -_08082A30: +@08082A30: movs r0, 0x3 bl sub_80A2390 ldr r0, =0x020322a4 @@ -235754,30 +235754,30 @@ _08082A30: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08082A92 + b @08082A92 .align 2, 0 .pool -_08082A48: +@08082A48: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08082A92 + bne @08082A92 ldr r0, [r6] adds r0, 0x70 ldrh r0, [r0] cmp r0, 0 - bne _08082A70 + bne @08082A70 ldr r0, =sub_807FA80 + 1 bl set_callback2 - b _08082A76 + b @08082A76 .align 2, 0 .pool -_08082A70: +@08082A70: ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 -_08082A76: +@08082A76: bl Window_FreeMemory movs r0, 0x2 bl bg_unset_tilemap @@ -235788,7 +235788,7 @@ _08082A76: bl free movs r0, 0 str r0, [r4] -_08082A92: +@08082A92: bl sub_8082AD4 ldr r0, =0x020322a4 ldr r1, [r0] @@ -235816,14 +235816,14 @@ _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] cmp r0, 0 - bne _08082AE0 - b _08082CA4 -_08082AE0: + bne @08082AE0 + b @08082CA4 +@08082AE0: ldr r4, =0x03003090 ldrh r0, [r4] ldr r1, =0x00002fff @@ -235831,31 +235831,31 @@ _08082AE0: lsls r2, 6 bl sub_80814B0 cmp r0, 0 - beq _08082B66 + beq @08082B66 ldrh r1, [r4, 0x2] ldr r0, =0x00001111 cmp r1, r0 - bne _08082B58 + bne @08082B58 ldrh r3, [r4, 0x4] ldr r0, =0x00009999 cmp r3, r0 - beq _08082B38 + beq @08082B38 cmp r3, r0 - bgt _08082B24 + bgt @08082B24 ldr r0, =0x00008888 - b _08082B26 + b @08082B26 .align 2, 0 .pool -_08082B24: +@08082B24: ldr r0, =0x0000aaaa -_08082B26: +@08082B26: cmp r3, r0 - beq _08082B38 + beq @08082B38 ldr r2, =0x020322a4 - b _08082B48 + b @08082B48 .align 2, 0 .pool -_08082B38: +@08082B38: ldr r2, =0x020322a4 ldr r0, [r2] adds r1, r0, 0 @@ -235864,49 +235864,49 @@ _08082B38: ldrh r1, [r4, 0x6] adds r0, 0x6E strh r1, [r0] -_08082B48: +@08082B48: ldr r0, [r2] adds r0, 0x64 ldr r1, =0x00001111 - b _08082B64 + b @08082B64 .align 2, 0 .pool -_08082B58: +@08082B58: ldr r0, =0x00002222 cmp r1, r0 - bne _08082B66 + bne @08082B66 ldr r0, =0x020322a4 ldr r0, [r0] adds r0, 0x64 -_08082B64: +@08082B64: strh r1, [r0] -_08082B66: +@08082B66: bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - beq _08082B72 - b _08082CA4 -_08082B72: + beq @08082B72 + b @08082CA4 +@08082B72: ldr r2, =0x020322a4 ldr r0, [r2] adds r0, 0x64 ldrh r1, [r0] ldr r0, =0x00001111 cmp r1, r0 - bne _08082B82 - b _08082CA4 -_08082B82: + bne @08082B82 + b @08082CA4 +@08082B82: ldr r0, =0x00002222 cmp r1, r0 - bne _08082B8A - b _08082CA4 -_08082B8A: + bne @08082B8A + b @08082CA4 +@08082B8A: movs r5, 0 adds r7, r2, 0 - b _08082BF4 + b @08082BF4 .align 2, 0 .pool -_08082B9C: +@08082B9C: ldr r6, =0x03003090 lsls r4, r5, 4 adds r0, r4, r6 @@ -235916,57 +235916,57 @@ _08082B9C: lsls r2, 6 bl sub_80814B0 cmp r0, 0 - beq _08082BEE + beq @08082BEE adds r0, r6, 0x2 adds r0, r4, r0 ldrh r2, [r0] ldr r0, =0x00008888 cmp r2, r0 - beq _08082BE4 + beq @08082BE4 cmp r2, r0 - bgt _08082BD8 + bgt @08082BD8 ldr r0, =0x00007779 - b _08082BE0 + b @08082BE0 .align 2, 0 .pool -_08082BD8: +@08082BD8: ldr r0, =0x00009999 cmp r2, r0 - beq _08082BE4 + beq @08082BE4 ldr r0, =0x0000aaaa -_08082BE0: +@08082BE0: cmp r2, r0 - bne _08082BEE -_08082BE4: + bne @08082BEE +@08082BE4: ldr r0, [r7] lsls r1, r5, 1 adds r0, 0x64 adds r0, r1 strh r2, [r0] -_08082BEE: +@08082BEE: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_08082BF4: +@08082BF4: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r5, r0 - bcc _08082B9C + bcc @08082B9C movs r5, 0 - b _08082C12 + b @08082C12 .align 2, 0 .pool -_08082C0C: +@08082C0C: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_08082C12: +@08082C12: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r5, r0 - bcs _08082C2E + bcs @08082C2E ldr r0, =0x020322a4 ldr r0, [r0] lsls r1, r5, 1 @@ -235974,28 +235974,28 @@ _08082C12: adds r0, r1 ldrh r0, [r0] cmp r0, 0 - bne _08082C0C -_08082C2E: + bne @08082C0C +@08082C2E: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r5, r0 - bne _08082CA4 + bne @08082CA4 movs r5, 0 ldr r4, =0x00007779 - b _08082C4E + b @08082C4E .align 2, 0 .pool -_08082C48: +@08082C48: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_08082C4E: +@08082C4E: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r5, r0 - bcs _08082C6A + bcs @08082C6A ldr r0, =0x020322a4 ldr r0, [r0] lsls r1, r5, 1 @@ -236003,8 +236003,8 @@ _08082C4E: adds r0, r1 ldrh r0, [r0] cmp r0, r4 - beq _08082C48 -_08082C6A: + beq @08082C48 +@08082C6A: ldr r4, =0x03003110 adds r0, r4, 0 bl sub_8081F94 @@ -236012,13 +236012,13 @@ _08082C6A: lsls r0, 24 lsrs r0, 24 cmp r5, r0 - bne _08082C90 + bne @08082C90 ldr r0, =0x00002222 strh r0, [r4, 0x2] - b _08082CA4 + b @08082CA4 .align 2, 0 .pool -_08082C90: +@08082C90: ldr r0, =0x00001111 strh r0, [r4, 0x2] ldr r0, =0x020322a4 @@ -236029,7 +236029,7 @@ _08082C90: ldrh r0, [r0] strh r0, [r4, 0x4] strh r5, [r4, 0x6] -_08082CA4: +@08082CA4: pop {r4-r7} pop {r0} bx r0 @@ -236038,7 +236038,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 @@ -236091,7 +236091,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 @@ -236102,26 +236102,26 @@ 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 ldrb r0, [r4] cmp r0, 0 - beq _08082D3C + beq @08082D3C bl link_get_multiplayer_id lsls r0, 24 lsrs r1, r0, 24 -_08082D3C: +@08082D3C: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _08082DCC + beq @08082DCC ldrb r0, [r4] cmp r0, 0 - beq _08082DCC + beq @08082DCC cmp r1, 0 - bne _08082D90 + bne @08082D90 ldr r0, =0x020322a4 ldr r3, [r0] adds r2, r3, 0 @@ -236144,10 +236144,10 @@ _08082D3C: lsls r1, 1 adds r0, r3, r1 bl sub_8082CB4 - b _08082DEA + b @08082DEA .align 2, 0 .pool -_08082D90: +@08082D90: ldr r3, =0x03003090 ldrh r0, [r3] movs r1, 0xFF @@ -236156,7 +236156,7 @@ _08082D90: movs r0, 0x88 lsls r0, 7 cmp r1, r0 - bne _08082DEA + bne @08082DEA ldr r0, =0x020322a4 ldr r2, [r0] ldrh r0, [r3, 0xA] @@ -236172,10 +236172,10 @@ _08082D90: lsls r1, 1 adds r0, r2, r1 bl sub_8082CB4 - b _08082DEA + b @08082DEA .align 2, 0 .pool -_08082DCC: +@08082DCC: ldr r0, =0x020322a4 ldr r1, [r0] adds r2, r1, 0 @@ -236190,7 +236190,7 @@ _08082DCC: lsls r4, 1 adds r0, r1, r4 bl sub_8082CB4 -_08082DEA: +@08082DEA: pop {r4} pop {r0} bx r0 @@ -236199,7 +236199,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] @@ -236234,7 +236234,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] @@ -236248,17 +236248,17 @@ sub_8082E3C: @ 8082E3C movs r1, 0x32 ldrsh r0, [r2, r1] cmp r0, 0 - bge _08082E5A + bge @08082E5A adds r0, 0x7 -_08082E5A: +@08082E5A: asrs r0, 3 strh r0, [r2, 0x24] movs r1, 0x34 ldrsh r0, [r2, r1] cmp r0, 0 - bge _08082E68 + bge @08082E68 adds r0, 0x7 -_08082E68: +@08082E68: asrs r0, 3 strh r0, [r2, 0x26] adds r0, r2, 0 @@ -236267,16 +236267,16 @@ _08082E68: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08082E80 + beq @08082E80 adds r0, r2, 0 bl obj_delete_and_free_tiles -_08082E80: +@08082E80: pop {r0} bx r0 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 @@ -236289,7 +236289,7 @@ sub_8082E84: @ 8082E84 ands r1, r0 adds r0, r1, 0x1 cmp r0, 0 - beq _08082F40 + beq @08082F40 ldr r0, =0x08329f40 mov r9, r0 ldr r2, =0x02020630 @@ -236298,7 +236298,7 @@ sub_8082E84: @ 8082E84 movs r3, 0x1F mov r8, r3 movs r7, 0x10 -_08082EB0: +@08082EB0: bl GenerateRandomNumber ldr r1, =0x020322a4 ldr r4, [r1] @@ -236321,18 +236321,18 @@ _08082EB0: movs r3, 0 ldrsh r1, [r0, r3] cmp r1, 0 - bge _08082EE4 + bge @08082EE4 adds r1, 0x3 -_08082EE4: +@08082EE4: asrs r1, 2 lsls r0, r2, 1 add r0, r9 movs r2, 0 ldrsh r0, [r0, r2] cmp r0, 0 - bge _08082EF4 + bge @08082EF4 adds r0, 0x3 -_08082EF4: +@08082EF4: asrs r2, r0, 2 adds r1, 0x78 adds r2, 0x50 @@ -236367,8 +236367,8 @@ _08082EF4: str r0, [r5] subs r6, 0x1 cmp r6, 0 - bne _08082EB0 -_08082F40: + bne @08082EB0 +@08082F40: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -236381,7 +236381,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] @@ -236399,17 +236399,17 @@ sub_8082F68: @ 8082F68 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08082F94 + beq @08082F94 adds r0, r4, 0 bl obj_delete_and_free_tiles -_08082F94: +@08082F94: pop {r4} pop {r0} bx r0 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] @@ -236425,20 +236425,20 @@ sub_8082F9C: @ 8082F9C movs r1, 0xC negs r1, r1 cmp r0, r1 - bge _08082FC0 + bge @08082FC0 ldr r0, =0x0000fff4 strh r0, [r2, 0x26] -_08082FC0: +@08082FC0: adds r0, r2, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08082FD4 + beq @08082FD4 adds r0, r2, 0 bl obj_delete_and_free_tiles -_08082FD4: +@08082FD4: pop {r0} bx r0 .align 2, 0 @@ -236446,7 +236446,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 @@ -236474,30 +236474,30 @@ 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 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _0808304C + beq @0808304C cmp r0, 0x1 - bgt _08083026 + bgt @08083026 cmp r0, 0 - beq _0808302C - b _080830B2 -_08083026: + beq @0808302C + b @080830B2 +@08083026: cmp r0, 0x2 - beq _08083066 - b _080830B2 -_0808302C: + beq @08083066 + b @080830B2 +@0808302C: ldrh r0, [r4, 0x30] adds r0, 0x8 strh r0, [r4, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x58 - ble _080830B2 + ble @080830B2 movs r0, 0x58 strh r0, [r4, 0x30] ldrh r0, [r4, 0x2E] @@ -236505,29 +236505,29 @@ _0808302C: strh r0, [r4, 0x2E] movs r0, 0x38 bl audio_play - b _080830B2 -_0808304C: + b @080830B2 +@0808304C: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - ble _080830B2 + ble @080830B2 ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] movs r0, 0 strh r0, [r4, 0x32] - b _080830B2 -_08083066: + b @080830B2 +@08083066: ldrh r0, [r4, 0x30] adds r0, 0x4 strh r0, [r4, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0xB0 - ble _080830B2 + ble @080830B2 ldrh r0, [r4, 0x34] adds r0, 0x1 adds r1, r0, 0 @@ -236535,7 +236535,7 @@ _08083066: lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - bne _080830A0 + bne @080830A0 adds r0, r4, 0 bl obj_delete_and_free_tiles ldr r0, =0x08339c60 @@ -236544,10 +236544,10 @@ _08083066: movs r1, 0x78 movs r3, 0x2 bl obj_add_from_template_forward_search - b _080830B2 + b @080830B2 .align 2, 0 .pool -_080830A0: +@080830A0: movs r0, 0 strh r0, [r4, 0x2E] ldr r0, =0x0000fff0 @@ -236556,7 +236556,7 @@ _080830A0: lsrs r1, 24 adds r0, r4, 0 bl obj_anim_image_start -_080830B2: +@080830B2: ldrh r0, [r4, 0x30] strh r0, [r4, 0x26] pop {r4} @@ -236567,30 +236567,30 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080830FC + beq @080830FC cmp r0, 0x1 - bgt _080830D6 + bgt @080830D6 cmp r0, 0 - beq _080830DC - b _08083130 -_080830D6: + beq @080830DC + b @08083130 +@080830D6: cmp r0, 0x2 - beq _08083112 - b _08083130 -_080830DC: + beq @08083112 + b @08083130 +@080830DC: ldrh r0, [r4, 0x30] adds r0, 0x8 strh r0, [r4, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x5C - ble _08083130 + ble @08083130 movs r0, 0x5C strh r0, [r4, 0x30] ldrh r0, [r4, 0x2E] @@ -236598,27 +236598,27 @@ _080830DC: strh r0, [r4, 0x2E] movs r0, 0x15 bl audio_play - b _08083130 -_080830FC: + b @08083130 +@080830FC: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - ble _08083130 + ble @08083130 ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _08083130 -_08083112: + b @08083130 +@08083112: ldrh r0, [r4, 0x30] adds r0, 0x4 strh r0, [r4, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0xB0 - ble _08083130 + ble @08083130 ldr r0, =0x020322a4 ldr r1, [r0] ldrb r0, [r1] @@ -236626,7 +236626,7 @@ _08083112: strb r0, [r1] adds r0, r4, 0 bl obj_delete_and_free_tiles -_08083130: +@08083130: ldrh r0, [r4, 0x30] strh r0, [r4, 0x26] pop {r4} @@ -236637,7 +236637,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 @@ -236650,13 +236650,13 @@ sub_8083140: @ 8083140 adds r1, r2 ldrh r2, [r1] cmp r2, r0 - bcs _08083166 + bcs @08083166 adds r0, r2, 0x2 strh r0, [r1] ldrh r0, [r1] adds r1, r3, 0 bl sub_8083170 -_08083166: +@08083166: pop {r0} bx r0 .align 2, 0 @@ -236664,7 +236664,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 @@ -236674,13 +236674,13 @@ sub_8083170: @ 8083170 bl __divsi3 adds r1, r0, 0 cmp r1, 0 - bge _08083188 + bge @08083188 adds r0, r1, 0x7 -_08083188: +@08083188: asrs r4, r0, 3 movs r3, 0 cmp r3, r4 - bge _080831B0 + bge @080831B0 ldr r0, =0x000080e9 adds r6, r0, 0 adds r0, 0x10 @@ -236689,26 +236689,26 @@ _08083188: adds r2, 0x56 adds r0, r7, 0 adds r3, r4, 0 -_080831A0: +@080831A0: strh r6, [r0, 0x16] strh r5, [r2] adds r2, 0x2 adds r0, 0x2 subs r3, 0x1 cmp r3, 0 - bne _080831A0 + bne @080831A0 adds r3, r4, 0 -_080831B0: +@080831B0: adds r0, r1, 0 cmp r1, 0 - bge _080831B8 + bge @080831B8 adds r0, r1, 0x7 -_080831B8: +@080831B8: asrs r2, r0, 3 lsls r0, r2, 3 subs r2, r1, r0 cmp r2, 0 - beq _080831D6 + beq @080831D6 lsls r0, r3, 1 adds r0, r7 ldr r4, =0xffff80e1 @@ -236719,9 +236719,9 @@ _080831B8: adds r1, r2, r4 strh r1, [r0] adds r3, 0x1 -_080831D6: +@080831D6: cmp r3, 0x7 - bgt _080831FA + bgt @080831FA ldr r0, =0x000080e1 adds r4, r0, 0 adds r0, 0x10 @@ -236731,15 +236731,15 @@ _080831D6: adds r0, 0x56 adds r0, r7 adds r1, r7 -_080831EC: +@080831EC: strh r4, [r1, 0x16] strh r2, [r0] adds r0, 0x2 adds r1, 0x2 adds r3, 0x1 cmp r3, 0x7 - ble _080831EC -_080831FA: + ble @080831EC +@080831FA: pop {r4-r7} pop {r0} bx r0 @@ -236748,17 +236748,17 @@ _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 ldr r1, =0x00057e40 muls r0, r1 cmp r0, 0 - bge _08083222 + bge @08083222 ldr r1, =0x0000ffff adds r0, r1 -_08083222: +@08083222: asrs r0, 16 pop {r1} bx r1 @@ -236767,7 +236767,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 @@ -236780,11 +236780,11 @@ sub_8083230: @ 8083230 adds r1, 0x4E ldrh r0, [r1] cmp r0, r5 - bcs _0808324E + bcs @0808324E strh r5, [r1] -_0808324E: +@0808324E: movs r6, 0 -_08083250: +@08083250: mov r0, sp adds r4, r0, r6 adds r0, r5, 0 @@ -236799,7 +236799,7 @@ _08083250: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x4 - bls _08083250 + bls @08083250 ldr r2, =0x06006458 mov r0, sp ldr r3, =0x00008072 @@ -236836,7 +236836,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 @@ -236844,7 +236844,7 @@ sub_80832BC: @ 80832BC movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 - bne _080832E0 + bne @080832E0 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -236853,38 +236853,38 @@ sub_80832BC: @ 80832BC lsrs r1, r4, 17 subs r0, r1 strh r0, [r6] -_080832E0: +@080832E0: pop {r4-r6} pop {r0} bx r0 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] movs r3, 0 ldrsh r0, [r1, r3] cmp r0, 0 - bge _080832FA + bge @080832FA adds r0, r2, 0x1 strh r0, [r1] -_080832FA: +@080832FA: ldrh r2, [r1] movs r3, 0 ldrsh r0, [r1, r3] cmp r0, 0 - ble _08083308 + ble @08083308 subs r0, r2, 0x1 strh r0, [r1] -_08083308: +@08083308: pop {r0} bx r0 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] @@ -236905,21 +236905,21 @@ 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 lsrs r1, 16 movs r5, 0x8 cmp r1, 0x9 - bhi _08083344 + bhi @08083344 movs r5, 0x10 -_08083344: +@08083344: ldrh r0, [r4] movs r2, 0 ldrsh r1, [r4, r2] cmp r1, 0 - bne _08083362 + bne @08083362 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -236927,29 +236927,29 @@ _08083344: bl __modsi3 lsrs r1, r5, 1 subs r0, r1 - b _08083376 -_08083362: + b @08083376 +@08083362: cmp r1, 0 - bge _0808336A + bge @0808336A adds r0, 0x1 strh r0, [r4] -_0808336A: +@0808336A: ldrh r1, [r4] movs r2, 0 ldrsh r0, [r4, r2] cmp r0, 0 - ble _08083378 + ble @08083378 subs r0, r1, 0x1 -_08083376: +@08083376: strh r0, [r4] -_08083378: +@08083378: pop {r4,r5} pop {r0} bx r0 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] @@ -236958,7 +236958,7 @@ sub_8083380: @ 8083380 adds r0, r2, r4 ldr r1, [r0] cmp r1, 0 - bne _080833A0 + bne @080833A0 movs r3, 0x8E lsls r3, 1 adds r0, r2, r3 @@ -236966,7 +236966,7 @@ sub_8083380: @ 8083380 adds r3, 0x2 adds r0, r2, r3 strh r1, [r0] -_080833A0: +@080833A0: ldr r0, [r5] adds r2, r0, r4 ldr r1, [r2] @@ -236989,12 +236989,12 @@ _080833A0: adds r0, r2, r4 ldr r0, [r0] cmp r0, 0x14 - beq _080833DC + beq @080833DC movs r0, 0 - b _080833F0 + b @080833F0 .align 2, 0 .pool -_080833DC: +@080833DC: movs r1, 0x8E lsls r1, 1 adds r0, r2, r1 @@ -237005,14 +237005,14 @@ _080833DC: adds r0, r2, r3 strh r1, [r0] movs r0, 0x1 -_080833F0: +@080833F0: pop {r4,r5} pop {r1} bx r1 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 @@ -237032,7 +237032,7 @@ sub_80833F8: @ 80833F8 thumb_func_end sub_80833F8 thumb_func_start sub_8083418 -sub_8083418: @ 8083418 +sub_8083418: ; 8083418 push {lr} ldr r0, =0x03005d8c ldr r2, [r0] @@ -237050,9 +237050,9 @@ sub_8083418: @ 8083418 ldrh r1, [r1] ldrh r0, [r2] cmp r0, r1 - bcs _0808343E + bcs @0808343E strh r1, [r2] -_0808343E: +@0808343E: pop {r0} bx r0 .align 2, 0 @@ -237060,7 +237060,7 @@ _0808343E: thumb_func_end sub_8083418 thumb_func_start sub_8083450 -sub_8083450: @ 8083450 +sub_8083450: ; 8083450 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -237072,26 +237072,26 @@ sub_8083450: @ 8083450 ldrb r0, [r0] adds r4, r1, 0 cmp r0, 0x6 - bls _0808346A - b _08083898 -_0808346A: + bls @0808346A + b @08083898 +@0808346A: lsls r0, 2 - ldr r1, =_0808347C + ldr r1, =@0808347C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0808347C: - .4byte _08083498 - .4byte _080834AE - .4byte _080834C8 - .4byte _08083518 - .4byte _08083790 - .4byte _080837A8 - .4byte _0808386C -_08083498: +@0808347C: + .4byte @08083498 + .4byte @080834AE + .4byte @080834C8 + .4byte @08083518 + .4byte @08083790 + .4byte @080837A8 + .4byte @0808386C +@08083498: ldr r1, [r4] ldrb r0, [r1] adds r0, 0x1 @@ -237102,8 +237102,8 @@ _08083498: adds r0, r1 movs r1, 0x11 str r1, [r0] - b _08083898 -_080834AE: + b @08083898 +@080834AE: ldr r1, [r4] movs r3, 0x84 lsls r3, 1 @@ -237112,13 +237112,13 @@ _080834AE: subs r0, 0xA str r0, [r2] cmp r0, 0 - blt _080834C2 - b _08083898 -_080834C2: + blt @080834C2 + b @08083898 +@080834C2: movs r0, 0 str r0, [r2] - b _08083854 -_080834C8: + b @08083854 +@080834C8: ldr r1, [r4] movs r0, 0x84 lsls r0, 1 @@ -237127,11 +237127,11 @@ _080834C8: adds r0, 0x1 str r0, [r1] cmp r0, 0x14 - bgt _080834DC - b _08083898 -_080834DC: + bgt @080834DC + b @08083898 +@080834DC: movs r6, 0 -_080834DE: +@080834DE: ldr r4, =0x020322a4 ldr r0, [r4] adds r0, 0x46 @@ -237147,17 +237147,17 @@ _080834DE: lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x2 - bls _080834DE + bls @080834DE ldr r1, [r4] movs r3, 0x84 lsls r3, 1 adds r2, r1, r3 movs r0, 0 str r0, [r2] - b _08083854 + b @08083854 .align 2, 0 .pool -_08083518: +@08083518: ldr r4, =0x083398f5 movs r0, 0x1 adds r1, r4, 0 @@ -237181,21 +237181,21 @@ _08083518: movs r3, 0x15 mov r9, r3 cmp r0, 0x4 - bne _08083550 + bne @08083550 movs r0, 0x11 mov r9, r0 -_08083550: +@08083550: movs r6, 0 mov r3, sp adds r3, 0x10 str r3, [sp, 0x48] ldrb r2, [r2] cmp r6, r2 - bcs _0808361A + bcs @0808361A adds r7, r1, 0 movs r0, 0x3 mov r10, r0 -_08083564: +@08083564: ldr r0, [r7] movs r2, 0x9E lsls r2, 1 @@ -237277,8 +237277,8 @@ _08083564: adds r0, 0x7C ldrb r0, [r0] cmp r6, r0 - bcc _08083564 -_0808361A: + bcc @08083564 +@0808361A: ldr r1, =0x0833992e movs r3, 0xFF mov r10, r3 @@ -237419,48 +237419,48 @@ _0808361A: movs r0, 0x5 movs r1, 0x2 bl Window_CopyToVram - b _08083898 + b @08083898 .align 2, 0 .pool -_08083790: +@08083790: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0808379E - b _08083898 -_0808379E: + bne @0808379E + b @08083898 +@0808379E: ldr r1, [r4] - b _08083854 + b @08083854 .align 2, 0 .pool -_080837A8: +@080837A8: movs r0, 0x5 movs r1, 0x1 bl sub_8198070 movs r6, 0 add r7, sp, 0x40 ldr r5, =0x020322a4 -_080837B6: +@080837B6: ldr r0, [r5] lsls r2, r6, 1 adds r0, 0x74 adds r0, r2 ldrh r1, [r0] cmp r1, 0 - beq _080837CC + beq @080837CC add r0, sp, 0x38 adds r0, r2 subs r1, 0x85 strh r1, [r0] -_080837CC: +@080837CC: ldr r0, [r5] adds r0, 0x8E adds r0, r2 ldrh r0, [r0] cmp r0, 0xFF - beq _080837EA + beq @080837EA lsls r4, r6, 24 lsrs r4, 24 adds r0, r4, 0 @@ -237468,12 +237468,12 @@ _080837CC: adds r0, r4, 0 movs r1, 0x3 bl Window_CopyToVram -_080837EA: +@080837EA: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x3 - bls _080837B6 + bls @080837B6 bl sub_8081E20 ldr r4, =0x020322a4 ldr r3, [r4] @@ -237514,14 +237514,14 @@ _080837EA: adds r2, r1, r3 movs r0, 0 strh r0, [r2] -_08083854: +@08083854: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08083898 + b @08083898 .align 2, 0 .pool -_0808386C: +@0808386C: ldr r4, [r4] ldr r0, =0x000011b8 adds r5, r4, r0 @@ -237534,15 +237534,15 @@ _0808386C: adds r1, r4, 0 bl sub_808417C cmp r0, 0 - beq _08083898 + beq @08083898 bl sub_8083418 movs r0, 0x1 - b _0808389A + b @0808389A .align 2, 0 .pool -_08083898: +@08083898: movs r0, 0 -_0808389A: +@0808389A: add sp, 0x4C pop {r3-r5} mov r8, r3 @@ -237554,7 +237554,7 @@ _0808389A: thumb_func_end sub_8083450 thumb_func_start sub_80838AC -sub_80838AC: @ 80838AC +sub_80838AC: ; 80838AC push {r4-r6,lr} sub sp, 0xC adds r5, r0, 0 @@ -237621,7 +237621,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 @@ -237632,16 +237632,16 @@ sub_808395C: @ 808395C lsrs r7, r1, 24 movs r0, 0 cmp r0, r7 - bge _080839A8 -_08083972: + bge @080839A8 +@08083972: movs r5, 0 adds r1, r0, 0x1 mov r8, r1 cmp r5, r7 - bge _080839A2 + bge @080839A2 mov r1, r9 adds r6, r1, r0 -_08083980: +@08083980: ldrb r4, [r6] lsls r1, r4, 2 add r1, r12 @@ -237653,18 +237653,18 @@ _08083980: ldr r1, [r1] ldr r0, [r0] cmp r1, r0 - bls _0808399C + bls @0808399C strb r3, [r6] strb r4, [r2] -_0808399C: +@0808399C: adds r5, 0x1 cmp r5, r7 - blt _08083980 -_080839A2: + blt @08083980 +@080839A2: mov r0, r8 cmp r0, r7 - blt _08083972 -_080839A8: + blt @08083972 +@080839A8: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -237674,7 +237674,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 @@ -237688,10 +237688,10 @@ sub_80839B4: @ 80839B4 adds r1, r2, 0 add r3, sp, 0x4 mov r10, r3 - b _080839E4 + b @080839E4 .align 2, 0 .pool -_080839D4: +@080839D4: mov r4, sp adds r0, r4, r5 strb r5, [r0] @@ -237700,17 +237700,17 @@ _080839D4: lsrs r5, r0, 24 ldr r0, [r2] adds r0, 0x7C -_080839E4: +@080839E4: ldrb r0, [r0] cmp r5, r0 - bcc _080839D4 + bcc @080839D4 movs r5, 0 ldr r0, [r1] adds r1, r0, 0 adds r1, 0x7C ldrb r2, [r1] cmp r5, r2 - bcs _08083A5E + bcs @08083A5E mov r9, r10 movs r3, 0x92 lsls r3, 1 @@ -237723,7 +237723,7 @@ _080839E4: movs r1, 0x94 lsls r1, 1 adds r6, r0, r1 -_08083A10: +@08083A10: lsls r4, r5, 2 add r4, r9 lsls r3, r5, 1 @@ -237762,8 +237762,8 @@ _08083A10: mov r1, r12 ldrb r1, [r1] cmp r5, r1 - bcc _08083A10 -_08083A5E: + bcc @08083A10 +@08083A5E: ldr r4, =0x020322a4 ldr r0, [r4] adds r0, 0x7C @@ -237776,11 +237776,11 @@ _08083A5E: adds r0, 0x7C ldrb r0, [r0] cmp r5, r0 - bcs _08083A9E + bcs @08083A9E adds r2, r4, 0 movs r3, 0x9E lsls r3, 1 -_08083A80: +@08083A80: ldr r1, [r2] adds r1, r3 adds r1, r5 @@ -237795,42 +237795,42 @@ _08083A80: adds r0, 0x7C ldrb r0, [r0] cmp r5, r0 - bcc _08083A80 -_08083A9E: + bcc @08083A80 +@08083A9E: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _08083AB4 + bne @08083AB4 movs r3, 0 - b _08083ABC + b @08083ABC .align 2, 0 .pool -_08083AB4: +@08083AB4: bl link_get_multiplayer_id lsls r0, 24 lsrs r3, r0, 24 -_08083ABC: +@08083ABC: movs r5, 0 ldr r1, =0x020322a4 ldr r0, [r1] adds r0, 0x7C ldrb r0, [r0] cmp r5, r0 - bcs _08083AF2 + bcs @08083AF2 movs r6, 0x9E lsls r6, 1 movs r4, 0xD2 lsls r4, 1 -_08083AD2: +@08083AD2: ldr r2, [r1] adds r0, r2, r6 adds r0, r5 ldrb r0, [r0] cmp r0, r3 - bne _08083AE2 + bne @08083AE2 adds r0, r2, r4 strb r5, [r0] -_08083AE2: +@08083AE2: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -237838,8 +237838,8 @@ _08083AE2: adds r0, 0x7C ldrb r0, [r0] cmp r5, r0 - bcc _08083AD2 -_08083AF2: + bcc @08083AD2 +@08083AF2: add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -237853,7 +237853,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 @@ -237865,26 +237865,26 @@ sub_8083B08: @ 8083B08 ldrb r0, [r0] adds r2, r1, 0 cmp r0, 0x6 - bls _08083B22 - b _08083E12 -_08083B22: + bls @08083B22 + b @08083E12 +@08083B22: lsls r0, 2 - ldr r1, =_08083B34 + ldr r1, =@08083B34 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08083B34: - .4byte _08083B50 - .4byte _08083B66 - .4byte _08083B80 - .4byte _08083B9A - .4byte _08083DC8 - .4byte _08083DE2 - .4byte _08083E08 -_08083B50: +@08083B34: + .4byte @08083B50 + .4byte @08083B66 + .4byte @08083B80 + .4byte @08083B9A + .4byte @08083DC8 + .4byte @08083DE2 + .4byte @08083E08 +@08083B50: ldr r1, [r2] ldrb r0, [r1] adds r0, 0x1 @@ -237895,8 +237895,8 @@ _08083B50: adds r0, r1 movs r1, 0xFF str r1, [r0] - b _08083E12 -_08083B66: + b @08083E12 +@08083B66: ldr r1, [r2] movs r3, 0x84 lsls r3, 1 @@ -237905,13 +237905,13 @@ _08083B66: subs r0, 0xA str r0, [r2] cmp r0, 0 - blt _08083B7A - b _08083E12 -_08083B7A: + blt @08083B7A + b @08083E12 +@08083B7A: movs r0, 0 str r0, [r2] - b _08083DF8 -_08083B80: + b @08083DF8 +@08083B80: ldr r1, [r2] movs r0, 0x84 lsls r0, 1 @@ -237920,13 +237920,13 @@ _08083B80: adds r0, 0x1 str r0, [r2] cmp r0, 0x14 - bgt _08083B94 - b _08083E12 -_08083B94: + bgt @08083B94 + b @08083E12 +@08083B94: movs r0, 0 str r0, [r2] - b _08083DF8 -_08083B9A: + b @08083DF8 +@08083B9A: movs r0, 0x5 movs r1, 0 movs r2, 0x1 @@ -238029,14 +238029,14 @@ _08083B9A: adds r0, 0x7C ldrb r0, [r0] cmp r2, r0 - bcc _08083C7C - b _08083D8A -_08083C7C: + bcc @08083C7C + b @08083D8A +@08083C7C: movs r3, 0xFF mov r10, r3 movs r0, 0x3 mov r9, r0 -_08083C84: +@08083C84: ldr r0, [r7] movs r3, 0x9E lsls r3, 1 @@ -238155,9 +238155,9 @@ _08083C84: adds r0, 0x7C ldrb r0, [r0] cmp r2, r0 - bcs _08083D8A - b _08083C84 -_08083D8A: + bcs @08083D8A + b @08083C84 +@08083D8A: movs r0, 0x5 bl Window_WriteStandardTileMap movs r0, 0x5 @@ -238170,10 +238170,10 @@ _08083D8A: adds r2, r1, r3 movs r0, 0 str r0, [r2] - b _08083DF8 + b @08083DF8 .align 2, 0 .pool -_08083DC8: +@08083DC8: ldr r2, [r2] movs r0, 0x84 lsls r0, 1 @@ -238182,38 +238182,38 @@ _08083DC8: adds r0, 0x1 str r0, [r1] cmp r0, 0x14 - ble _08083E12 + ble @08083E12 ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] - b _08083E12 -_08083DE2: + b @08083E12 +@08083DE2: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08083E12 + beq @08083E12 movs r0, 0x5 bl audio_play ldr r0, =0x020322a4 ldr r1, [r0] -_08083DF8: +@08083DF8: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08083E12 + b @08083E12 .align 2, 0 .pool -_08083E08: +@08083E08: ldr r1, [r2] movs r0, 0 strb r0, [r1] movs r0, 0x1 - b _08083E14 -_08083E12: + b @08083E14 +@08083E12: movs r0, 0 -_08083E14: +@08083E14: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -238225,7 +238225,7 @@ _08083E14: thumb_func_end sub_8083B08 thumb_func_start sub_8083E24 -sub_8083E24: @ 8083E24 +sub_8083E24: ; 8083E24 push {r4-r7,lr} sub sp, 0x34 ldr r0, =0x08339d14 @@ -238271,7 +238271,7 @@ sub_8083E24: @ 8083E24 movs r6, 0 movs r7, 0xA4 lsls r7, 22 -_08083E8A: +@08083E8A: ldr r0, =0x03005d8c ldr r0, [r0] lsls r1, r6, 1 @@ -238324,7 +238324,7 @@ _08083E8A: adds r7, r0 adds r6, 0x1 cmp r6, 0x2 - ble _08083E8A + ble @08083E8A ldrb r0, [r4] bl Window_WriteStandardTileMap ldrb r0, [r4] @@ -238339,7 +238339,7 @@ _08083E8A: thumb_func_end sub_8083E24 thumb_func_start sub_8083F3C -sub_8083F3C: @ 8083F3C +sub_8083F3C: ; 8083F3C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -238352,17 +238352,17 @@ sub_8083F3C: @ 8083F3C movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08083F62 + bne @08083F62 ldr r0, =0x0000016f bl fanfare_play ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_08083F62: +@08083F62: bl task_is_not_running_overworld_fanfare lsls r0, 24 cmp r0, 0 - beq _08083F82 + beq @08083F82 ldr r0, =0x020322a4 ldr r0, [r0] movs r1, 0xAA @@ -238372,7 +238372,7 @@ _08083F62: bl song_play_for_text adds r0, r5, 0 bl remove_task -_08083F82: +@08083F82: pop {r4,r5} pop {r0} bx r0 @@ -238381,7 +238381,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 @@ -238412,7 +238412,7 @@ sub_8083F94: @ 8083F94 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _080840C4 + beq @080840C4 ldr r0, =0x020322a4 ldr r2, [r0] movs r4, 0xD2 @@ -238421,9 +238421,9 @@ sub_8083F94: @ 8083F94 ldrb r1, [r1] mov r8, r0 cmp r1, 0 - bne _08084058 + bne @08084058 cmp r3, 0x14 - bls _08084058 + bls @08084058 adds r0, r2, 0 adds r0, 0x7C ldrb r1, [r0] @@ -238466,11 +238466,11 @@ sub_8083F94: @ 8083F94 bl sub_80ECC04 lsls r0, 24 cmp r0, 0 - bne _080840BA - b _080840C4 + bne @080840BA + b @080840C4 .align 2, 0 .pool -_08084058: +@08084058: mov r0, r8 ldr r2, [r0] movs r1, 0xD2 @@ -238482,9 +238482,9 @@ _08084058: ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 - bne _080840C4 + bne @080840C4 cmp r3, 0x14 - bhi _080840C4 + bhi @080840C4 movs r4, 0x9E lsls r4, 1 adds r0, r2, r4 @@ -238516,15 +238516,15 @@ _08084058: bl sub_80ECC04 lsls r0, 24 cmp r0, 0 - beq _080840C4 -_080840BA: + beq @080840C4 +@080840BA: movs r0, 0x1 - b _080840C6 + b @080840C6 .align 2, 0 .pool -_080840C4: +@080840C4: movs r0, 0 -_080840C6: +@080840C6: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -238535,7 +238535,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 @@ -238552,46 +238552,46 @@ sub_80840D4: @ 80840D4 lsrs r7, r3, 24 movs r5, 0 cmp r4, 0x1 - beq _08084116 + beq @08084116 cmp r4, 0x1 - bgt _08084100 + bgt @08084100 cmp r4, 0 - beq _08084108 - b _08084132 -_08084100: + beq @08084108 + b @08084132 +@08084100: cmp r4, 0x2 - beq _08084124 + beq @08084124 cmp r4, 0x3 - bne _08084136 -_08084108: + bne @08084136 +@08084108: add r1, sp, 0x14 movs r0, 0x1 strb r0, [r1] movs r0, 0x2 strb r0, [r1, 0x1] movs r0, 0x3 - b _08084130 -_08084116: + b @08084130 +@08084116: add r0, sp, 0x14 strb r5, [r0] adds r1, r0, 0 movs r0, 0x2 strb r0, [r1, 0x1] movs r0, 0x3 - b _08084130 -_08084124: + b @08084130 +@08084124: add r0, sp, 0x14 strb r5, [r0] adds r1, r0, 0 movs r0, 0x4 strb r0, [r1, 0x1] movs r0, 0x5 -_08084130: +@08084130: strb r0, [r1, 0x2] -_08084132: +@08084132: cmp r4, 0x3 - beq _08084148 -_08084136: + beq @08084148 +@08084136: add r0, sp, 0x14 ldrb r0, [r0] lsls r1, r0, 4 @@ -238600,7 +238600,7 @@ _08084136: lsrs r1, 24 adds r0, r6, 0 bl Window_FastFillPixels -_08084148: +@08084148: movs r0, 0 str r0, [sp] movs r0, 0x1 @@ -238628,7 +238628,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 @@ -238637,11 +238637,11 @@ sub_808417C: @ 808417C movs r0, 0 ldrsh r4, [r5, r0] cmp r4, 0 - beq _08084194 + beq @08084194 cmp r4, 0x1 - beq _080841C6 - b _080841DA -_08084194: + beq @080841C6 + b @080841DA +@08084194: movs r0, 0x4 movs r1, 0 movs r2, 0x14 @@ -238662,20 +238662,20 @@ _08084194: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] - b _080841DA -_080841C6: + b @080841DA +@080841C6: movs r0, 0x4 bl a_pressed_maybe lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne _080841DA + bne @080841DA strh r0, [r5] movs r0, 0x1 - b _080841DC -_080841DA: + b @080841DC +@080841DA: movs r0, 0 -_080841DC: +@080841DC: add sp, 0x8 pop {r4-r7} pop {r1} @@ -238683,7 +238683,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] @@ -238703,7 +238703,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 @@ -238713,9 +238713,9 @@ set_max_playtime_if_appropriate: @ 8084208 ldrh r1, [r0, 0xE] ldr r0, =0x000003e7 cmp r1, r0 - bls _08084220 + bls @08084220 bl set_max_playtime -_08084220: +@08084220: pop {r0} bx r0 .align 2, 0 @@ -238723,7 +238723,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] @@ -238733,12 +238733,12 @@ 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] cmp r0, 0x1 - bne _08084294 + bne @08084294 ldr r2, =0x03005d90 ldr r0, [r2] ldrb r1, [r0, 0x12] @@ -238748,7 +238748,7 @@ gametime_increment: @ 808423C ldr r1, [r2] ldrb r0, [r1, 0x12] cmp r0, 0x3B - bls _08084294 + bls @08084294 strb r3, [r1, 0x12] ldr r0, [r2] ldrb r1, [r0, 0x11] @@ -238757,7 +238757,7 @@ gametime_increment: @ 808423C ldr r1, [r2] ldrb r0, [r1, 0x11] cmp r0, 0x3B - bls _08084294 + bls @08084294 strb r3, [r1, 0x11] ldr r0, [r2] ldrb r1, [r0, 0x10] @@ -238766,7 +238766,7 @@ gametime_increment: @ 808423C ldr r1, [r2] ldrb r0, [r1, 0x10] cmp r0, 0x3B - bls _08084294 + bls @08084294 strb r3, [r1, 0x10] ldr r0, [r2] ldrh r1, [r0, 0xE] @@ -238775,9 +238775,9 @@ gametime_increment: @ 808423C lsls r1, 16 ldr r0, =0x03e70000 cmp r1, r0 - bls _08084294 + bls @08084294 bl set_max_playtime -_08084294: +@08084294: pop {r0} bx r0 .align 2, 0 @@ -238785,7 +238785,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] @@ -238805,8 +238805,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] @@ -238818,7 +238818,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 @@ -238834,26 +238834,26 @@ 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 movs r2, 0 -_080842FC: +@080842FC: adds r0, r4, r2 adds r1, r3, r2 ldrb r1, [r1] strb r1, [r0] adds r2, 0x1 cmp r2, 0x3 - ble _080842FC + ble @080842FC pop {r4} pop {r0} bx r0 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 @@ -238875,7 +238875,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] @@ -238920,7 +238920,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 @@ -238944,7 +238944,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 @@ -238952,7 +238952,7 @@ sub_80843C0: @ 80843C0 mov r12, r0 ldr r4, =0x00002e90 ldr r3, =0x08339d1c -_080843D0: +@080843D0: mov r1, r12 ldr r0, [r1] lsls r1, r2, 5 @@ -238967,7 +238967,7 @@ _080843D0: stm r0!, {r5,r6} adds r2, 0x1 cmp r2, 0xC - ble _080843D0 + ble @080843D0 pop {r4-r7} pop {r0} bx r0 @@ -238976,7 +238976,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 @@ -239008,7 +239008,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 @@ -239025,7 +239025,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 @@ -239034,7 +239034,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 @@ -239051,17 +239051,17 @@ sub_808447C: @ 808447C thumb_func_end sub_808447C thumb_func_start new_game_init_data -new_game_init_data: @ 80844A0 +new_game_init_data: ; 80844A0 push {r4,r5,lr} ldr r0, =0x03006210 ldrh r0, [r0] cmp r0, 0 - beq _080844AE + beq @080844AE cmp r0, 0x2 - bne _080844B2 -_080844AE: + bne @080844B2 +@080844AE: bl sub_802F3F8 -_080844B2: +@080844B2: ldr r1, =0x020322d4 movs r0, 0x1 strb r0, [r1] @@ -239144,7 +239144,7 @@ _080844B2: thumb_func_end new_game_init_data thumb_func_start sub_80845CC -sub_80845CC: @ 80845CC +sub_80845CC: ; 80845CC push {r4-r6,lr} sub sp, 0x4 mov r0, sp @@ -239184,7 +239184,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, =0x08271857 bl script_env_2_execute_new_script @@ -239211,7 +239211,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 @@ -239231,7 +239231,7 @@ flag_var_implications_of_teleport_: @ 8084660 thumb_func_end flag_var_implications_of_teleport_ thumb_func_start new_game -new_game: @ 808469C +new_game: ; 808469C push {lr} bl player_avatar_init_params_reset ldr r0, =0x0000088b @@ -239253,7 +239253,7 @@ new_game: @ 808469C thumb_func_end new_game thumb_func_start flagmods_08054D70 -flagmods_08054D70: @ 80846E4 +flagmods_08054D70: ; 80846E4 push {lr} bl player_avatar_init_params_reset ldr r0, =0x0000088b @@ -239273,7 +239273,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 @@ -239292,14 +239292,14 @@ sub_8084720: @ 8084720 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bne _08084764 + bne @08084764 adds r0, r4, 0 movs r1, 0 bl var_set ldr r0, =0x00004037 movs r1, 0 bl var_set -_08084764: +@08084764: pop {r4} pop {r0} bx r0 @@ -239308,7 +239308,7 @@ _08084764: thumb_func_end sub_8084720 thumb_func_start sub_8084788 -sub_8084788: @ 8084788 +sub_8084788: ; 8084788 push {lr} ldr r0, =0x0000088c bl flag_clear @@ -239323,45 +239323,45 @@ 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: +@080847AC: lsls r0, r4, 24 lsrs r0, 24 movs r1, 0 bl sav12_xor_set adds r4, 0x1 cmp r4, 0x3F - ble _080847AC + ble @080847AC pop {r4} pop {r0} bx r0 thumb_func_end sub_80847A8 thumb_func_start sav12_xor_increment -sav12_xor_increment: @ 80847C4 +sav12_xor_increment: ; 80847C4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x33 - bhi _080847EC + bhi @080847EC adds r0, r4, 0 bl sub_80847F8 adds r1, r0, 0 ldr r0, =0x00fffffe cmp r1, r0 - bhi _080847E4 + bhi @080847E4 adds r1, 0x1 - b _080847E6 + b @080847E6 .align 2, 0 .pool -_080847E4: +@080847E4: ldr r1, =0x00ffffff -_080847E6: +@080847E6: adds r0, r4, 0 bl sav12_xor_set -_080847EC: +@080847EC: pop {r4} pop {r0} bx r0 @@ -239370,12 +239370,12 @@ _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 cmp r1, 0x33 - bhi _08084828 + bhi @08084828 ldr r0, =0x03005d8c ldr r2, [r0] lsls r0, r1, 2 @@ -239388,24 +239388,24 @@ sub_80847F8: @ 80847F8 ldr r0, [r2] ldr r1, [r1] eors r0, r1 - b _0808482A + b @0808482A .align 2, 0 .pool -_08084828: +@08084828: movs r0, 0 -_0808482A: +@0808482A: pop {r1} bx r1 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 lsrs r2, r0, 24 cmp r2, 0x33 - bhi _08084854 + bhi @08084854 ldr r0, =0x03005d8c ldr r1, [r0] lsls r0, r2, 2 @@ -239418,7 +239418,7 @@ sav12_xor_set: @ 8084830 ldr r0, [r0] eors r0, r3 str r0, [r1] -_08084854: +@08084854: pop {r0} bx r0 .align 2, 0 @@ -239426,12 +239426,12 @@ _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 ldr r6, =0x03005d8c -_0808486C: +@0808486C: lsls r1, r4, 2 ldr r0, =0x0000159c adds r1, r0 @@ -239443,7 +239443,7 @@ _0808486C: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3F - bls _0808486C + bls @0808486C pop {r4-r6} pop {r0} bx r0 @@ -239452,7 +239452,7 @@ _0808486C: thumb_func_end sub_8084864 thumb_func_start sub_8084894 -sub_8084894: @ 8084894 +sub_8084894: ; 8084894 push {r4,r5,lr} sub sp, 0x4 movs r0, 0 @@ -239487,7 +239487,7 @@ sub_8084894: @ 8084894 thumb_func_end sub_8084894 thumb_func_start sub_80848E0 -sub_80848E0: @ 80848E0 +sub_80848E0: ; 80848E0 push {lr} ldr r0, =0x02037318 ldr r1, [r0, 0x4] @@ -239498,14 +239498,14 @@ sub_80848E0: @ 80848E0 lsls r3, 4 adds r1, r0, r3 movs r3, 0x3F -_080848F4: +@080848F4: ldr r0, [r2, 0x10] str r0, [r1, 0x10] adds r2, 0x18 adds r1, 0x18 subs r3, 0x1 cmp r3, 0 - bge _080848F4 + bge @080848F4 pop {r0} bx r0 .align 2, 0 @@ -239513,7 +239513,7 @@ _080848F4: thumb_func_end sub_80848E0 thumb_func_start sub_8084910 -sub_8084910: @ 8084910 +sub_8084910: ; 8084910 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -239527,28 +239527,28 @@ sub_8084910: @ 8084910 movs r6, 0xC7 lsls r6, 4 adds r3, r0, r6 -_0808492A: +@0808492A: ldrb r0, [r3] cmp r0, r5 - bne _0808493C + bne @0808493C strh r4, [r3, 0x4] strh r2, [r3, 0x6] - b _08084944 + b @08084944 .align 2, 0 .pool -_0808493C: +@0808493C: adds r3, 0x18 adds r1, 0x1 cmp r1, 0x3F - ble _0808492A -_08084944: + ble @0808492A +@08084944: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_8084910 thumb_func_start sub_808494C -sub_808494C: @ 808494C +sub_808494C: ; 808494C push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -239560,27 +239560,27 @@ sub_808494C: @ 808494C movs r5, 0xC7 lsls r5, 4 adds r2, r0, r5 -_08084962: +@08084962: ldrb r0, [r2] cmp r0, r4 - bne _08084970 + bne @08084970 strb r1, [r2, 0x9] - b _08084978 + b @08084978 .align 2, 0 .pool -_08084970: +@08084970: adds r2, 0x18 adds r3, 0x1 cmp r3, 0x3F - ble _08084962 -_08084978: + ble @08084962 +@08084978: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_808494C 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 @@ -239598,25 +239598,25 @@ 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] ldrh r1, [r0, 0x32] cmp r1, 0 - bne _080849BC + bne @080849BC movs r0, 0 - b _080849C6 + b @080849C6 .align 2, 0 .pool -_080849BC: +@080849BC: ldr r0, =0x08481dd4 subs r1, 0x1 lsls r1, 2 adds r1, r0 ldr r0, [r1] -_080849C6: +@080849C6: pop {r1} bx r1 .align 2, 0 @@ -239624,8 +239624,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] @@ -239653,8 +239653,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, =0x08339d3c ldr r1, [r0, 0x4] @@ -239670,8 +239670,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] @@ -239690,8 +239690,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 @@ -239699,35 +239699,35 @@ warp_data_is_not_neg_1: @ 8084A54 movs r0, 0x1 negs r0, r0 cmp r2, r0 - bne _08084A88 + bne @08084A88 movs r0, 0x1 ldrsb r0, [r1, r0] cmp r0, r2 - bne _08084A88 + bne @08084A88 movs r2, 0x2 ldrsb r2, [r1, r2] cmp r2, r0 - bne _08084A88 + bne @08084A88 movs r0, 0x4 ldrsh r3, [r1, r0] cmp r3, r2 - bne _08084A88 + bne @08084A88 movs r2, 0x6 ldrsh r0, [r1, r2] cmp r0, r3 - bne _08084A88 + bne @08084A88 movs r0, 0x1 - b _08084A8A -_08084A88: + b @08084A8A +@08084A88: movs r0, 0 -_08084A8A: +@08084A8A: pop {r1} bx r1 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, =0x08486578 @@ -239743,8 +239743,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 @@ -239764,8 +239764,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 @@ -239803,7 +239803,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 @@ -239835,8 +239835,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] @@ -239844,12 +239844,12 @@ update_camera_pos_from_warpid: @ 8084B5C ldrsb r1, [r2, r1] adds r4, r0, 0 cmp r1, 0 - blt _08084B94 + blt @08084B94 ldr r3, =0x02037318 ldr r0, [r3, 0x4] ldrb r5, [r0, 0x1] cmp r1, r5 - bge _08084B94 + bge @08084B94 ldr r0, [r0, 0x8] lsls r1, 3 adds r0, r1, r0 @@ -239860,25 +239860,25 @@ update_camera_pos_from_warpid: @ 8084B5C adds r1, r0 ldrh r0, [r1, 0x2] strh r0, [r2, 0x2] - b _08084BCC + b @08084BCC .align 2, 0 .pool -_08084B94: +@08084B94: ldr r1, [r4] ldrh r3, [r1, 0x8] movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0 - blt _08084BB0 + blt @08084BB0 ldrh r2, [r1, 0xA] movs r5, 0xA ldrsh r0, [r1, r5] cmp r0, 0 - blt _08084BB0 + blt @08084BB0 strh r3, [r1] strh r2, [r1, 0x2] - b _08084BCC -_08084BB0: + b @08084BCC +@08084BB0: ldr r3, [r4] ldr r2, =0x02037318 ldr r0, [r2] @@ -239893,7 +239893,7 @@ _08084BB0: adds r0, r1 asrs r0, 1 strh r0, [r3, 0x2] -_08084BCC: +@08084BCC: pop {r4,r5} pop {r0} bx r0 @@ -239902,7 +239902,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 @@ -239912,8 +239912,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 @@ -239946,8 +239946,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 @@ -239966,8 +239966,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 @@ -239996,7 +239996,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] @@ -240026,7 +240026,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] @@ -240040,8 +240040,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 @@ -240049,7 +240049,7 @@ sub_8084CCC: @ 8084CCC bl sub_8122CBC adds r4, r0, 0 cmp r4, 0 - beq _08084CFA + beq @08084CFA movs r0, 0 ldrsb r0, [r4, r0] movs r1, 0x1 @@ -240063,7 +240063,7 @@ sub_8084CCC: @ 8084CCC asrs r4, 24 str r4, [sp] bl warp1_set -_08084CFA: +@08084CFA: add sp, 0x4 pop {r4} pop {r0} @@ -240071,8 +240071,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] @@ -240086,7 +240086,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 @@ -240094,7 +240094,7 @@ sub_8084D1C: @ 8084D1C bl sub_8122CBC adds r5, r0, 0 cmp r5, 0 - beq _08084D50 + beq @08084D50 ldr r0, =0x03005d8c ldr r0, [r0] adds r0, 0x1C @@ -240111,7 +240111,7 @@ sub_8084D1C: @ 8084D1C ldrsb r4, [r5, r4] str r4, [sp, 0x4] bl warp_set -_08084D50: +@08084D50: add sp, 0x8 pop {r4,r5} pop {r0} @@ -240121,7 +240121,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 @@ -240145,13 +240145,13 @@ sub_8084D5C: @ 8084D5C bl is_light_level_1_2_3_5_or_6 lsls r0, 24 cmp r0, 0 - beq _08084DC4 + beq @08084DC4 adds r0, r5, 0 bl is_light_level_1_2_3_5_or_6 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08084DC4 + beq @08084DC4 ldr r0, =0x03005d8c ldr r1, [r0] movs r0, 0x4 @@ -240169,7 +240169,7 @@ sub_8084D5C: @ 8084D5C asrs r4, 24 str r4, [sp] bl sub_8084DD4 -_08084DC4: +@08084DC4: add sp, 0x4 pop {r4-r7} pop {r0} @@ -240179,7 +240179,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 @@ -240214,7 +240214,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] @@ -240228,7 +240228,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 @@ -240261,7 +240261,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] @@ -240274,7 +240274,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 @@ -240307,7 +240307,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 @@ -240318,17 +240318,17 @@ sub_8084EBC: @ 8084EBC adds r0, r4, 0 bl warp_data_is_not_neg_1 cmp r0, 0x1 - bne _08084EF0 + bne @08084EF0 ldr r2, =0x020322e4 ldr r0, =0x020322dc ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [r2] str r1, [r2, 0x4] - b _08084F0A + b @08084F0A .align 2, 0 .pool -_08084EF0: +@08084EF0: movs r0, 0 ldrsb r0, [r4, r0] movs r1, 0x1 @@ -240341,7 +240341,7 @@ _08084EF0: asrs r4, 24 str r4, [sp] bl warp1_set -_08084F0A: +@08084F0A: add sp, 0x4 pop {r4-r6} pop {r0} @@ -240349,7 +240349,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] @@ -240363,7 +240363,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 @@ -240398,7 +240398,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 @@ -240406,7 +240406,7 @@ sub_8084F6C: @ 8084F6C bl sub_8122CBC adds r5, r0, 0 cmp r5, 0 - beq _08084FA0 + beq @08084FA0 ldr r0, =0x03005d8c ldr r0, [r0] adds r0, 0xC @@ -240423,7 +240423,7 @@ sub_8084F6C: @ 8084F6C ldrsb r4, [r5, r4] str r4, [sp, 0x4] bl warp_set -_08084FA0: +@08084FA0: add sp, 0x8 pop {r4,r5} pop {r0} @@ -240433,7 +240433,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] @@ -240446,7 +240446,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 @@ -240455,35 +240455,35 @@ sub_8084FC0: @ 8084FC0 ldr r3, [r0] ldr r1, [r0, 0x4] cmp r1, 0 - bne _08084FDC - b _08084FF0 + bne @08084FDC + b @08084FF0 .align 2, 0 .pool -_08084FD8: +@08084FD8: adds r0, r1, 0 - b _08084FF2 -_08084FDC: + b @08084FF2 +@08084FDC: movs r2, 0 cmp r2, r3 - bge _08084FF0 -_08084FE2: + bge @08084FF0 +@08084FE2: ldrb r0, [r1] cmp r0, r4 - beq _08084FD8 + beq @08084FD8 adds r2, 0x1 adds r1, 0xC cmp r2, r3 - blt _08084FE2 -_08084FF0: + blt @08084FE2 +@08084FF0: movs r0, 0 -_08084FF2: +@08084FF2: pop {r4} pop {r1} bx r1 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 @@ -240495,7 +240495,7 @@ sub_8084FF8: @ 8084FF8 bl sub_8084FC0 adds r1, r0, 0 cmp r1, 0 - beq _08085030 + beq @08085030 movs r0, 0x8 ldrsb r0, [r1, r0] ldrb r1, [r1, 0x9] @@ -240509,22 +240509,22 @@ sub_8084FF8: @ 8084FF8 asrs r4, 24 str r4, [sp] bl warp1_set - b _0808504C -_08085030: + b @0808504C +@08085030: bl mapheader_run_script_with_tag_x6 ldr r0, =0x020322ec bl warp_data_is_not_neg_1 cmp r0, 0 - beq _08085048 + beq @08085048 movs r0, 0 - b _0808504E + b @0808504E .align 2, 0 .pool -_08085048: +@08085048: bl warp1_set_to_warp2 -_0808504C: +@0808504C: movs r0, 0x1 -_0808504E: +@0808504E: add sp, 0x4 pop {r4,r5} pop {r1} @@ -240532,7 +240532,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 @@ -240550,7 +240550,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 @@ -240568,7 +240568,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 @@ -240589,9 +240589,9 @@ mliX_load_map: @ 8085098 ldr r4, =0x02037318 ldrb r0, [r4, 0x14] cmp r0, 0x3A - beq _080850C8 + beq @080850C8 bl sub_8085810 -_080850C8: +@080850C8: bl warp_shift bl set_current_map_header_from_sav1_save_old_name bl sub_8084894 @@ -240614,13 +240614,13 @@ _080850C8: ldr r0, [r4] bl apply_map_tileset2_palette movs r4, 0x6 -_08085116: +@08085116: lsls r0, r4, 24 lsrs r0, 24 bl sub_80ABF00 adds r4, 0x1 cmp r4, 0xC - ble _08085116 + ble @08085116 bl sub_80A0A2C bl mapnumbers_history_shift_sav1_0_2_4_out bl sub_8161D54 @@ -240630,14 +240630,14 @@ _08085116: ldr r2, =0x02037318 ldrb r0, [r2, 0x14] cmp r0, 0x3A - bne _0808514C + bne @0808514C ldr r1, =0x020322fc ldrh r1, [r1] cmp r0, r1 - beq _08085150 -_0808514C: + beq @08085150 +@0808514C: bl sub_80D47E4 -_08085150: +@08085150: add sp, 0x4 pop {r4-r6} pop {r0} @@ -240647,7 +240647,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 @@ -240656,25 +240656,25 @@ mli0_load_map: @ 8085160 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080851A2 + bne @080851A2 ldr r0, =0x02037318 ldrh r1, [r0, 0x12] ldr r0, =0x00000169 cmp r1, r0 - bne _08085190 + bne @08085190 bl sub_81AA1D8 - b _080851A2 + b @080851A2 .align 2, 0 .pool -_08085190: +@08085190: bl sub_81D6074 cmp r0, 0 - beq _0808519E + beq @0808519E bl sub_81D5DF8 - b _080851A2 -_0808519E: + b @080851A2 +@0808519E: bl sub_8084894 -_080851A2: +@080851A2: ldr r4, =0x02037318 ldrb r0, [r4, 0x17] bl is_light_level_1_2_3_5_or_6 @@ -240702,16 +240702,16 @@ _080851A2: lsrs r1, 16 bl sub_80B21B4 cmp r7, 0x1 - beq _080851EE + beq @080851EE bl sub_809E7B0 -_080851EE: +@080851EE: bl sub_80AEDBC bl sub_8085B2C cmp r5, 0 - beq _08085200 + beq @08085200 ldr r0, =0x00000888 bl flag_clear -_08085200: +@08085200: bl update_sav1_flash_used_on_map bl sav1_reset_x2C bl mapheader_run_script_with_tag_x3 @@ -240720,32 +240720,32 @@ _08085200: ldrh r1, [r4, 0x12] ldr r0, =0x00000169 cmp r1, r0 - bne _08085234 + bne @08085234 movs r0, 0 bl sub_8087DAC - b _08085246 + b @08085246 .align 2, 0 .pool -_08085234: +@08085234: bl sub_81D6074 cmp r0, 0 - beq _08085242 + beq @08085242 bl sub_8087DE4 - b _08085246 -_08085242: + b @08085246 +@08085242: bl sub_8087D54 -_08085246: +@08085246: cmp r7, 0x1 - beq _0808525E + beq @0808525E cmp r6, 0 - beq _0808525E + beq @0808525E ldr r1, =0x03005dc0 ldr r0, [r1] ldr r1, [r1, 0x4] bl per_step_2 movs r0, 0x1 bl sub_80E9238 -_0808525E: +@0808525E: pop {r4-r7} pop {r0} bx r0 @@ -240754,7 +240754,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] @@ -240765,7 +240765,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__sp1AA ldr r4, =0x02032300 @@ -240774,38 +240774,38 @@ walkrun_find_lowest_active_bit_in_bitfield: @ 8085278 bl walkrun_bitfield_and_r0 lsls r0, 24 cmp r0, 0 - beq _08085298 + beq @08085298 movs r0, 0x2 - b _080852CA + b @080852CA .align 2, 0 .pool -_08085298: +@08085298: movs r0, 0x4 bl walkrun_bitfield_and_r0 lsls r0, 24 cmp r0, 0 - beq _080852A8 + beq @080852A8 movs r0, 0x4 - b _080852CA -_080852A8: + b @080852CA +@080852A8: movs r0, 0x8 bl walkrun_bitfield_and_r0 lsls r0, 24 cmp r0, 0 - beq _080852B8 + beq @080852B8 movs r0, 0x8 - b _080852CA -_080852B8: + b @080852CA +@080852B8: movs r0, 0x10 bl walkrun_bitfield_and_r0 lsls r0, 24 cmp r0, 0 - beq _080852C8 + beq @080852C8 movs r0, 0x10 - b _080852CA -_080852C8: + b @080852CA +@080852C8: movs r0, 0x1 -_080852CA: +@080852CA: strb r0, [r4] pop {r4} pop {r0} @@ -240813,7 +240813,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 @@ -240853,7 +240853,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 @@ -240861,53 +240861,53 @@ sub_808532C: @ 808532C lsls r2, 24 lsrs r4, r2, 24 cmp r4, 0x8 - beq _08085348 + beq @08085348 ldr r0, =0x0000088d bl flag_check lsls r0, 24 cmp r0, 0 - bne _08085382 -_08085348: + bne @08085382 +@08085348: cmp r4, 0x5 - bne _08085354 + bne @08085354 movs r0, 0x10 - b _08085384 + b @08085384 .align 2, 0 .pool -_08085354: +@08085354: lsls r0, r5, 24 lsrs r0, 24 bl is_tile_grass_maybe lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08085368 + bne @08085368 movs r0, 0x8 - b _08085384 -_08085368: + b @08085384 +@08085368: bl sav1_map_is_biking_allowed cmp r0, 0x1 - bne _08085382 + bne @08085382 ldrb r0, [r6] cmp r0, 0x2 - bne _0808537A + bne @0808537A movs r0, 0x2 - b _08085384 -_0808537A: + b @08085384 +@0808537A: cmp r0, 0x4 - bne _08085382 + bne @08085382 movs r0, 0x4 - b _08085384 -_08085382: + b @08085384 +@08085382: movs r0, 0x1 -_08085384: +@08085384: pop {r4-r6} pop {r1} bx r1 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 @@ -240920,10 +240920,10 @@ sub_808538C: @ 808538C bl flag_check lsls r0, 24 cmp r0, 0 - beq _080853AC + beq @080853AC cmp r5, 0x6 - beq _0808540C -_080853AC: + beq @0808540C +@080853AC: lsls r4, 24 lsrs r5, r4, 24 adds r0, r5, 0 @@ -240931,86 +240931,86 @@ _080853AC: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080853E8 + beq @080853E8 adds r0, r5, 0 bl sub_8088F58 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08085442 + beq @08085442 adds r0, r5, 0 bl sub_8088EFC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08085442 + beq @08085442 adds r0, r5, 0 bl is_tile_x65_warp_arrow_down lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080853F0 -_080853E8: + bne @080853F0 +@080853E8: movs r0, 0x2 - b _08085448 + b @08085448 .align 2, 0 .pool -_080853F0: +@080853F0: adds r0, r5, 0 bl sub_8088FD4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08085442 + beq @08085442 adds r0, r5, 0 bl is_tile_x63_warp_arrow_left lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08085410 -_0808540C: + bne @08085410 +@0808540C: movs r0, 0x4 - b _08085448 -_08085410: + b @08085448 +@08085410: adds r0, r5, 0 bl is_tile_x62_warp_arrow_right lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08085422 + bne @08085422 movs r0, 0x3 - b _08085448 -_08085422: + b @08085448 +@08085422: ldrb r0, [r6] cmp r0, 0x10 - bne _0808542C + bne @0808542C cmp r7, 0x8 - beq _08085446 -_0808542C: + beq @08085446 +@0808542C: cmp r0, 0x8 - bne _08085434 + bne @08085434 cmp r7, 0x10 - beq _08085446 -_08085434: + beq @08085446 +@08085434: lsrs r0, r4, 24 bl is_tile_x61_warp lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08085446 -_08085442: + beq @08085446 +@08085442: movs r0, 0x1 - b _08085448 -_08085446: + b @08085448 +@08085446: ldrb r0, [r6, 0x1] -_08085448: +@08085448: pop {r4-r7} pop {r1} bx r1 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] @@ -241030,54 +241030,54 @@ 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] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0808548C + beq @0808548C movs r0, 0x1 - b _0808548E + b @0808548E .align 2, 0 .pool -_0808548C: +@0808548C: movs r0, 0 -_0808548E: +@0808548E: pop {r1} bx r1 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] cmp r1, 0 - bne _080854B0 + bne @080854B0 ldr r0, =0x03005d8c ldr r0, [r0] adds r0, 0x30 strb r1, [r0] - b _080854DE + b @080854DE .align 2, 0 .pool -_080854B0: +@080854B0: ldr r0, =0x00000888 bl flag_check lsls r0, 24 cmp r0, 0 - beq _080854D0 + beq @080854D0 ldr r0, =0x03005d8c ldr r0, [r0] adds r0, 0x30 movs r1, 0x1 strb r1, [r0] - b _080854DE + b @080854DE .align 2, 0 .pool -_080854D0: +@080854D0: ldr r0, =0x03005d8c ldr r1, [r0] ldr r0, =0x0854fe78 @@ -241085,7 +241085,7 @@ _080854D0: subs r0, 0x1 adds r1, 0x30 strb r0, [r1] -_080854DE: +@080854DE: pop {r0} bx r0 .align 2, 0 @@ -241093,18 +241093,18 @@ _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 - blt _080854FC + blt @080854FC ldr r0, =0x0854fe78 ldr r0, [r0] cmp r1, r0 - ble _080854FE -_080854FC: + ble @080854FE +@080854FC: movs r1, 0 -_080854FE: +@080854FE: ldr r0, =0x03005d8c ldr r0, [r0] adds r0, 0x30 @@ -241116,7 +241116,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 @@ -241127,7 +241127,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] @@ -241142,7 +241142,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 @@ -241151,7 +241151,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 @@ -241160,56 +241160,56 @@ 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 bl flag_check lsls r0, 24 cmp r0, 0 - beq _080855AC + beq @080855AC movs r0, 0 ldrsb r0, [r4, r0] cmp r0, 0 - bne _080855AC + bne @080855AC movs r0, 0x1 ldrsb r0, [r4, r0] cmp r0, 0x5 - blt _08085584 + blt @08085584 cmp r0, 0x8 - ble _0808559E + ble @0808559E cmp r0, 0x2B - bgt _08085584 + bgt @08085584 cmp r0, 0x27 - bge _0808559E -_08085584: + bge @0808559E +@08085584: ldr r0, =0x0000405e bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x3 - bls _080855AC + bls @080855AC movs r0, 0x1 ldrsb r0, [r4, r0] cmp r0, 0x2E - bgt _080855AC + bgt @080855AC cmp r0, 0x2C - blt _080855AC -_0808559E: + blt @080855AC +@0808559E: movs r0, 0x1 - b _080855AE + b @080855AE .align 2, 0 .pool -_080855AC: +@080855AC: movs r0, 0 -_080855AE: +@080855AE: pop {r4} pop {r1} bx r1 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 @@ -241217,59 +241217,59 @@ sub_80855B4: @ 80855B4 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bne _080855D6 + bne @080855D6 movs r0, 0 ldrsb r0, [r4, r0] cmp r0, 0 - bne _080855D6 + bne @080855D6 movs r0, 0x1 ldrsb r0, [r4, r0] cmp r0, 0x7 - beq _080855E0 -_080855D6: + beq @080855E0 +@080855D6: movs r0, 0 - b _080855E2 + b @080855E2 .align 2, 0 .pool -_080855E0: +@080855E0: movs r0, 0x1 -_080855E2: +@080855E2: pop {r4} pop {r1} bx r1 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 bl var_get lsls r0, 16 cmp r0, 0 - bne _08085606 + bne @08085606 movs r0, 0 ldrsb r0, [r4, r0] cmp r0, 0x20 - bne _08085606 + bne @08085606 ldrb r0, [r4, 0x1] cmp r0, 0x1 - bls _08085610 -_08085606: + bls @08085610 +@08085606: movs r0, 0 - b _08085612 + b @08085612 .align 2, 0 .pool -_08085610: +@08085610: movs r0, 0x1 -_08085612: +@08085612: pop {r4} pop {r1} bx r1 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 @@ -241277,78 +241277,78 @@ sub_8085618: @ 8085618 bl var_get lsls r0, 16 cmp r0, 0 - beq _0808564C + beq @0808564C adds r0, r4, 0 bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - bhi _0808564C + bhi @0808564C movs r0, 0 ldrsb r0, [r5, r0] cmp r0, 0xE - bne _0808564C + bne @0808564C ldrb r0, [r5, 0x1] subs r0, 0x9 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bls _08085654 -_0808564C: + bls @08085654 +@0808564C: movs r0, 0 - b _08085656 + b @08085656 .align 2, 0 .pool -_08085654: +@08085654: movs r0, 0x1 -_08085656: +@08085656: pop {r4,r5} pop {r1} bx r1 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 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bne _08085674 + bne @08085674 ldr r0, =0x0000ffff - b _080856CE + b @080856CE .align 2, 0 .pool -_08085674: +@08085674: adds r0, r4, 0 bl sub_8085558 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bne _0808568C + bne @0808568C ldr r0, =0x000001bb - b _080856CE + b @080856CE .align 2, 0 .pool -_0808568C: +@0808568C: adds r0, r4, 0 bl sub_8085618 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bne _080856A4 + bne @080856A4 ldr r0, =0x000001b9 - b _080856CE + b @080856CE .align 2, 0 .pool -_080856A4: +@080856A4: adds r0, r4, 0 bl sub_80855E8 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - beq _080856CA + beq @080856CA movs r0, 0 ldrsb r0, [r4, r0] lsls r0, 16 @@ -241359,18 +241359,18 @@ _080856A4: lsrs r1, 16 bl get_mapheader_by_bank_and_number ldrh r0, [r0, 0x10] - b _080856CE -_080856CA: + b @080856CE +@080856CA: movs r0, 0xCB lsls r0, 1 -_080856CE: +@080856CE: pop {r4} pop {r1} bx r1 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] @@ -241378,17 +241378,17 @@ sav1_map_get_music: @ 80856D4 movs r0, 0xD0 lsls r0, 5 cmp r1, r0 - bne _080856FC + bne @080856FC bl sav1_get_weather_probably lsls r0, 24 lsrs r0, 24 cmp r0, 0x8 - bne _080856FC + bne @080856FC ldr r0, =0x00000199 - b _08085730 + b @08085730 .align 2, 0 .pool -_080856FC: +@080856FC: ldr r4, =0x03005d8c ldr r0, [r4] adds r0, 0x4 @@ -241397,31 +241397,31 @@ _080856FC: lsrs r1, r0, 16 ldr r0, =0x00007fff cmp r1, r0 - beq _0808571C + beq @0808571C adds r0, r1, 0 - b _08085730 + b @08085730 .align 2, 0 .pool -_0808571C: +@0808571C: ldr r0, [r4] movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x17 - ble _0808572C + ble @0808572C movs r0, 0xC9 lsls r0, 1 - b _08085730 -_0808572C: + b @08085730 +@0808572C: movs r0, 0xB4 lsls r0, 1 -_08085730: +@08085730: pop {r4} pop {r1} bx r1 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 @@ -241429,33 +241429,33 @@ warp1_target_get_music: @ 8085738 lsrs r1, r0, 16 ldr r0, =0x00007fff cmp r1, r0 - beq _08085758 + beq @08085758 adds r0, r1, 0 - b _08085774 + b @08085774 .align 2, 0 .pool -_08085758: +@08085758: ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] movs r0, 0x80 lsls r0, 2 cmp r1, r0 - beq _08085770 + beq @08085770 subs r0, 0x6E - b _08085774 + b @08085774 .align 2, 0 .pool -_08085770: +@08085770: movs r0, 0xB4 lsls r0, 1 -_08085774: +@08085774: pop {r1} bx r1 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} @@ -241463,52 +241463,52 @@ 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 lsrs r4, r0, 16 ldr r0, =0x000001bb cmp r4, r0 - beq _080857D6 + beq @080857D6 ldr r0, =0x0000ffff cmp r4, r0 - beq _080857D6 + beq @080857D6 ldr r0, =0x03005d8c ldr r1, [r0] ldrh r0, [r1, 0x2C] cmp r0, 0 - beq _080857B4 + beq @080857B4 adds r4, r0, 0 - b _080857D6 + b @080857D6 .align 2, 0 .pool -_080857B4: +@080857B4: bl sav1_map_get_light_level lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 - bne _080857C8 + bne @080857C8 ldr r4, =0x0000019b - b _080857D6 + b @080857D6 .align 2, 0 .pool -_080857C8: +@080857C8: movs r0, 0x8 bl walkrun_bitfield_and_r0 lsls r0, 24 cmp r0, 0 - beq _080857D6 + beq @080857D6 ldr r4, =0x0000016d -_080857D6: +@080857D6: bl current_map_music_get lsls r0, 16 lsrs r0, 16 cmp r4, r0 - beq _080857E8 + beq @080857E8 adds r0, r4, 0 bl current_map_music_set -_080857E8: +@080857E8: pop {r4} pop {r0} bx r0 @@ -241517,7 +241517,7 @@ _080857E8: thumb_func_end sub_8085784 thumb_func_start sav1_set_x2C -sav1_set_x2C: @ 80857F4 +sav1_set_x2C: ; 80857F4 ldr r1, =0x03005d8c ldr r1, [r1] strh r0, [r1, 0x2C] @@ -241527,7 +241527,7 @@ sav1_set_x2C: @ 80857F4 thumb_func_end sav1_set_x2C thumb_func_start sav1_reset_x2C -sav1_reset_x2C: @ 8085800 +sav1_reset_x2C: ; 8085800 ldr r0, =0x03005d8c ldr r1, [r0] movs r0, 0 @@ -241538,14 +241538,14 @@ sav1_reset_x2C: @ 8085800 thumb_func_end sav1_reset_x2C thumb_func_start sub_8085810 -sub_8085810: @ 8085810 +sub_8085810: ; 8085810 push {r4-r6,lr} ldr r0, =0x00004001 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08085890 + beq @08085890 bl warp1_target_get_music lsls r0, 16 lsrs r4, r0, 16 @@ -241554,49 +241554,49 @@ sub_8085810: @ 8085810 lsrs r5, r0, 16 ldr r0, =0x000001bb cmp r4, r0 - beq _08085856 + beq @08085856 ldr r0, =0x0000ffff cmp r4, r0 - beq _08085856 + beq @08085856 ldr r0, =0x0000019b cmp r5, r0 - beq _08085890 + beq @08085890 ldr r6, =0x0000016d cmp r5, r6 - beq _08085890 + beq @08085890 movs r0, 0x8 bl walkrun_bitfield_and_r0 lsls r0, 24 cmp r0, 0 - beq _08085856 + beq @08085856 adds r4, r6, 0 -_08085856: +@08085856: cmp r4, r5 - beq _08085890 + beq @08085890 movs r0, 0x6 bl walkrun_bitfield_and_r0 lsls r0, 24 cmp r0, 0 - beq _08085888 + beq @08085888 adds r0, r4, 0 movs r1, 0x4 movs r2, 0x4 bl sub_80A2FBC - b _08085890 + b @08085890 .align 2, 0 .pool -_08085888: +@08085888: adds r0, r4, 0 movs r1, 0x8 bl sub_80A2F88 -_08085890: +@08085890: pop {r4-r6} pop {r0} bx r0 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 @@ -241606,20 +241606,20 @@ sub_8085898: @ 8085898 lsls r0, 16 lsrs r0, 16 cmp r4, r0 - beq _080858BE + beq @080858BE bl sav1_map_get_music lsls r0, 16 lsrs r0, 16 movs r1, 0x8 bl sub_80A2F88 -_080858BE: +@080858BE: pop {r4} pop {r0} bx r0 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 @@ -241627,14 +241627,14 @@ sub_80858C4: @ 80858C4 lsls r0, 16 lsrs r1, r0, 16 cmp r1, r4 - beq _080858E4 + beq @080858E4 ldr r0, =0x000001bb cmp r1, r0 - beq _080858E4 + beq @080858E4 adds r0, r4, 0 movs r1, 0x8 bl sub_80A2F88 -_080858E4: +@080858E4: pop {r4} pop {r0} bx r0 @@ -241643,7 +241643,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] @@ -241651,18 +241651,18 @@ is_warp1_light_level_8_or_9: @ 80858F0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08085908 + beq @08085908 movs r0, 0x4 - b _0808590A -_08085908: + b @0808590A +@08085908: movs r0, 0x2 -_0808590A: +@0808590A: pop {r1} bx r1 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 @@ -241675,21 +241675,21 @@ music_something: @ 8085910 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0808597E + beq @0808597E bl current_map_music_get lsls r0, 16 lsrs r0, 16 cmp r4, r0 - beq _0808597E + beq @0808597E ldr r0, =0x0000016d cmp r5, r0 - bne _08085972 + bne @08085972 ldr r0, =0x000040ca bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - bne _08085972 + bne @08085972 ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x0000ffff @@ -241697,22 +241697,22 @@ music_something: @ 8085910 movs r0, 0xE0 lsls r0, 3 cmp r2, r0 - bne _08085972 + bne @08085972 ldr r3, =0x020322e4 ldrh r0, [r3] ands r1, r0 cmp r1, r2 - bne _08085972 + bne @08085972 ldr r1, [r3, 0x4] ldr r0, =0x0035001d cmp r1, r0 - beq _0808597E -_08085972: + beq @0808597E +@08085972: bl is_warp1_light_level_8_or_9 lsls r0, 24 lsrs r0, 24 bl sub_80A2F50 -_0808597E: +@0808597E: pop {r4,r5} pop {r0} bx r0 @@ -241721,7 +241721,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 @@ -241731,7 +241731,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 @@ -241740,7 +241740,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 @@ -241751,7 +241751,7 @@ sub_80859BC: @ 80859BC ldr r0, =0x02032306 ldrb r0, [r0] cmp r0, 0x1 - bne _080859F0 + bne @080859F0 mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -241763,8 +241763,8 @@ sub_80859BC: @ 80859BC bl is_tile_grass_maybe lsls r0, 24 cmp r0, 0 - beq _08085A2C -_080859F0: + beq @08085A2C +@080859F0: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -241790,7 +241790,7 @@ _080859F0: adds r1, r4, 0 movs r3, 0x1 bl sub_80A32C0 -_08085A2C: +@08085A2C: add sp, 0x4 pop {r4} pop {r0} @@ -241800,7 +241800,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 @@ -241810,34 +241810,34 @@ wild_encounter_related: @ 8085A3C movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0x4 - bhi _08085B20 + bhi @08085B20 lsls r0, 2 - ldr r1, =_08085A60 + ldr r1, =@08085A60 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08085A60: - .4byte _08085A74 - .4byte _08085A88 - .4byte _08085AA4 - .4byte _08085B0C - .4byte _08085B20 -_08085A74: +@08085A60: + .4byte @08085A74 + .4byte @08085A88 + .4byte @08085AA4 + .4byte @08085B0C + .4byte @08085B20 +@08085A74: ldr r0, =0x02032304 ldrh r0, [r0] cmp r0, 0 - bne _08085A84 + bne @08085A84 movs r0, 0x4 - b _08085B1E + b @08085B1E .align 2, 0 .pool -_08085A84: +@08085A84: movs r0, 0x1 - b _08085B1E -_08085A88: + b @08085B1E +@08085A88: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -241849,8 +241849,8 @@ _08085A88: adds r0, r1 strh r0, [r7] movs r0, 0x3 - b _08085B1E -_08085AA4: + b @08085B1E +@08085AA4: movs r0, 0x1 mov r9, r0 bl calc_player_party_count @@ -241858,14 +241858,14 @@ _08085AA4: lsrs r0, 24 mov r8, r0 movs r5, 0 - b _08085ABC -_08085AB6: + b @08085ABC +@08085AB6: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_08085ABC: +@08085ABC: cmp r5, r8 - bcs _08085AE4 + bcs @08085AE4 movs r0, 0x64 muls r0, r5 ldr r4, =0x020244ec @@ -241873,16 +241873,16 @@ _08085ABC: movs r1, 0x6 bl pokemon_getattr cmp r0, 0 - bne _08085AB6 + bne @08085AB6 adds r0, r4, 0 bl sub_806B6D8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x44 - bne _08085AB6 + bne @08085AB6 movs r1, 0x2 mov r9, r1 -_08085AE4: +@08085AE4: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -241897,21 +241897,21 @@ _08085AE4: bl __divsi3 strh r0, [r7] movs r0, 0x3 - b _08085B1E + b @08085B1E .align 2, 0 .pool -_08085B0C: +@08085B0C: ldrh r0, [r7] subs r0, 0x1 strh r0, [r7] lsls r0, 16 cmp r0, 0 - bne _08085B20 + bne @08085B20 bl sub_80859BC movs r0, 0x2 -_08085B1E: +@08085B1E: strh r0, [r6] -_08085B20: +@08085B20: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -241921,7 +241921,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] @@ -241929,22 +241929,22 @@ sub_8085B2C: @ 8085B2C movs r0, 0xB4 lsls r0, 6 cmp r1, r0 - bne _08085B5C + bne @08085B5C bl sub_813793C lsls r0, 24 cmp r0, 0 - bne _08085B5C + bne @08085B5C ldr r1, =0x02032306 movs r0, 0x1 strb r0, [r1] bl sub_80B582C - b _08085B62 + b @08085B62 .align 2, 0 .pool -_08085B5C: +@08085B5C: ldr r0, =0x02032306 bl wild_pokemon_rand_for_map -_08085B62: +@08085B62: ldr r1, =0x02032304 strh r0, [r1] pop {r0} @@ -241954,8 +241954,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 @@ -241970,8 +241970,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] @@ -241986,7 +241986,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] @@ -242001,7 +242001,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 @@ -242014,55 +242014,55 @@ 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 cmp r0, 0x3 - beq _08085BEA + beq @08085BEA cmp r0, 0x1 - beq _08085BEA + beq @08085BEA cmp r0, 0x5 - beq _08085BEA + beq @08085BEA cmp r0, 0x2 - beq _08085BEA + beq @08085BEA cmp r0, 0x6 - bne _08085BEE -_08085BEA: + bne @08085BEE +@08085BEA: movs r0, 0x1 - b _08085BF0 -_08085BEE: + b @08085BF0 +@08085BEE: movs r0, 0 -_08085BF0: +@08085BF0: pop {r1} bx r1 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 cmp r0, 0x3 - beq _08085C0A + beq @08085C0A cmp r0, 0x1 - beq _08085C0A + beq @08085C0A cmp r0, 0x6 - beq _08085C0A + beq @08085C0A cmp r0, 0x2 - bne _08085C0E -_08085C0A: + bne @08085C0E +@08085C0A: movs r0, 0x1 - b _08085C10 -_08085C0E: + b @08085C10 +@08085C0E: movs r0, 0 -_08085C10: +@08085C10: pop {r1} bx r1 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 @@ -242070,18 +242070,18 @@ is_light_level_8_or_9: @ 8085C14 adds r0, r1 lsrs r0, 24 cmp r0, 0x1 - bls _08085C28 + bls @08085C28 movs r0, 0 - b _08085C2A -_08085C28: + b @08085C2A +@08085C28: movs r0, 0x1 -_08085C2A: +@08085C2A: pop {r1} bx r1 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] @@ -242103,7 +242103,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] @@ -242125,7 +242125,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] @@ -242147,8 +242147,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} @@ -242205,34 +242205,34 @@ 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 ldr r4, =0x03005da4 ldr r0, [r4] cmp r0, 0 - beq _08085D4E + beq @08085D4E bl free movs r0, 0 str r0, [r4] -_08085D4E: +@08085D4E: ldr r4, =0x03005d9c ldr r0, [r4] cmp r0, 0 - beq _08085D5E + beq @08085D5E bl free movs r0, 0 str r0, [r4] -_08085D5E: +@08085D5E: ldr r4, =0x03005da0 ldr r0, [r4] cmp r0, 0 - beq _08085D6E + beq @08085D6E bl free movs r0, 0 str r0, [r4] -_08085D6E: +@08085D6E: pop {r4} pop {r0} bx r0 @@ -242241,7 +242241,7 @@ _08085D6E: thumb_func_end overworld_free_bg_tilemaps thumb_func_start flag_clear_is_in_safari_zone_ -flag_clear_is_in_safari_zone_: @ 8085D80 +flag_clear_is_in_safari_zone_: ; 8085D80 push {lr} bl flag_clear_is_in_safari_zone pop {r0} @@ -242249,28 +242249,28 @@ flag_clear_is_in_safari_zone_: @ 8085D80 thumb_func_end flag_clear_is_in_safari_zone_ 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] ldr r0, =c1_link_related + 1 cmp r1, r0 - beq _08085DA4 + beq @08085DA4 movs r0, 0 - b _08085DA6 + b @08085DA6 .align 2, 0 .pool -_08085DA4: +@08085DA4: movs r0, 0x1 -_08085DA6: +@08085DA6: pop {r1} bx r1 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 @@ -242290,20 +242290,20 @@ c1_overworld_normal: @ 8085DAC bl script_env_2_is_enabled lsls r0, 24 cmp r0, 0 - bne _08085DFA + bne @08085DFA mov r0, sp bl sub_809C014 cmp r0, 0x1 - bne _08085DF0 + bne @08085DF0 bl script_env_2_enable bl call_203AE8C - b _08085DFA -_08085DF0: + b @08085DFA +@08085DF0: ldrb r0, [r6, 0x2] adds r1, r5, 0 adds r2, r4, 0 bl player_step -_08085DFA: +@08085DFA: add sp, 0x4 pop {r4-r6} pop {r0} @@ -242311,17 +242311,17 @@ _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] ldr r0, =c2_overworld + 1 cmp r1, r0 - bne _08085E18 + bne @08085E18 ldrh r0, [r2, 0x2E] ldrh r1, [r2, 0x2C] bl c1_overworld_normal -_08085E18: +@08085E18: pop {r0} bx r0 .align 2, 0 @@ -242329,7 +242329,7 @@ _08085E18: thumb_func_end c1_overworld thumb_func_start c2_overworld_basic -c2_overworld_basic: @ 8085E24 +c2_overworld_basic: ; 8085E24 push {lr} bl script_env_2_run_current_script bl run_active_tasks @@ -242345,7 +242345,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} @@ -242353,22 +242353,22 @@ 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] lsrs r0, 7 adds r4, r0, 0 cmp r4, 0 - beq _08085E70 + beq @08085E70 movs r0, 0 bl SetVBlankCallback -_08085E70: +@08085E70: bl c2_overworld_basic cmp r4, 0 - beq _08085E7C + beq @08085E7C bl set_vblank_callback_8086390 -_08085E7C: +@08085E7C: pop {r4} pop {r0} bx r0 @@ -242377,7 +242377,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 @@ -242386,7 +242386,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 @@ -242395,46 +242395,46 @@ 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] cmp r0, 0 - beq _08085ECC + beq @08085ECC bl _call_via_r0 lsls r0, 24 cmp r0, 0 - bne _08085EBC + bne @08085EBC movs r0, 0 - b _08085EEC + b @08085EEC .align 2, 0 .pool -_08085EBC: +@08085EBC: movs r1, 0 str r1, [r4] ldr r0, =0x03005dac str r1, [r0] - b _08085EEA + b @08085EEA .align 2, 0 .pool -_08085ECC: +@08085ECC: ldr r0, =0x03005dac ldr r0, [r0] cmp r0, 0 - beq _08085EE0 + beq @08085EE0 bl _call_via_r0 - b _08085EE4 + b @08085EE4 .align 2, 0 .pool -_08085EE0: +@08085EE0: bl mapldr_default -_08085EE4: +@08085EE4: ldr r1, =0x03005dac movs r0, 0 str r0, [r1] -_08085EEA: +@08085EEA: movs r0, 0x1 -_08085EEC: +@08085EEC: pop {r4} pop {r1} bx r1 @@ -242443,7 +242443,7 @@ _08085EEC: thumb_func_end map_post_load_hook_exec thumb_func_start c2_new_game -c2_new_game: @ 8085EF8 +c2_new_game: ; 8085EF8 push {lr} bl sub_808631C bl sub_80A2F30 @@ -242473,7 +242473,7 @@ c2_new_game: @ 8085EF8 thumb_func_end c2_new_game thumb_func_start c2_whiteout -c2_whiteout: @ 8085F58 +c2_whiteout: ; 8085F58 push {lr} sub sp, 0x4 ldr r1, =0x030022c0 @@ -242486,7 +242486,7 @@ c2_whiteout: @ 8085F58 lsls r0, 24 lsrs r0, 24 cmp r0, 0x77 - bls _08085FB0 + bls @08085FB0 bl sub_808631C bl sub_80A2F30 bl flag_clear_is_in_safari_zone_ @@ -242507,7 +242507,7 @@ c2_whiteout: @ 8085F58 bl set_callback1 ldr r0, =c2_overworld + 1 bl set_callback2 -_08085FB0: +@08085FB0: add sp, 0x4 pop {r0} bx r0 @@ -242516,7 +242516,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 @@ -242535,7 +242535,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 @@ -242551,7 +242551,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 @@ -242559,24 +242559,24 @@ sub_8086024: @ 8086024 adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0 - bne _08086046 + bne @08086046 bl sub_808631C bl script_env_1_init bl script_env_2_disable movs r0, 0 bl set_callback1 -_08086046: +@08086046: adds r0, r4, 0 movs r1, 0x1 bl load_map_stuff cmp r0, 0 - beq _08086062 + beq @08086062 bl set_vblank_callback_8086390 ldr r0, =c1_overworld + 1 bl set_callback1 ldr r0, =c2_overworld + 1 bl set_callback2 -_08086062: +@08086062: pop {r4} pop {r0} bx r0 @@ -242585,7 +242585,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 @@ -242600,19 +242600,19 @@ 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 cmp r0, 0 - beq _080860B8 + beq @080860B8 bl set_vblank_callback_8086390 ldr r0, =c1_link_related + 1 bl set_callback1 bl sub_8086C2C ldr r0, =c2_overworld + 1 bl set_callback2 -_080860B8: +@080860B8: pop {r0} bx r0 .align 2, 0 @@ -242620,21 +242620,21 @@ _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 - bne _080860E0 + bne @080860E0 ldr r0, =c2_exit_to_overworld_2_link + 1 bl set_callback2 - b _080860EA + b @080860EA .align 2, 0 .pool -_080860E0: +@080860E0: bl sub_808631C ldr r0, =c2_exit_to_overworld_2_local + 1 bl set_callback2 -_080860EA: +@080860EA: pop {r0} bx r0 .align 2, 0 @@ -242642,16 +242642,16 @@ _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 cmp r0, 0 - beq _0808610A + beq @0808610A bl set_vblank_callback_8086390 ldr r0, =c2_overworld + 1 bl set_callback2 -_0808610A: +@0808610A: pop {r0} bx r0 .align 2, 0 @@ -242659,18 +242659,18 @@ _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 - bne _08086132 + bne @08086132 ldr r0, =0x030026f8 bl map_loading_iteration_2_link cmp r0, 0 - beq _08086132 + beq @08086132 ldr r0, =c2_overworld + 1 bl set_callback2 -_08086132: +@08086132: pop {r0} bx r0 .align 2, 0 @@ -242678,7 +242678,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 @@ -242688,16 +242688,16 @@ c2_8056854: @ 8086140 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _08086174 + beq @08086174 ldr r1, =0x03005dac ldr r0, =sub_80AF314 + 1 - b _08086178 + b @08086178 .align 2, 0 .pool -_08086174: +@08086174: ldr r1, =0x03005dac ldr r0, =sub_80AF214 + 1 -_08086178: +@08086178: str r0, [r1] bl script_env_1_init bl script_env_2_disable @@ -242709,7 +242709,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 @@ -242723,7 +242723,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 @@ -242737,7 +242737,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 @@ -242751,7 +242751,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 @@ -242765,21 +242765,21 @@ 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] movs r0, 0xF8 ands r0, r1 cmp r0, 0x8 - bne _08086222 + bne @08086222 bl sub_80E909C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08086222 + bne @08086222 bl sub_80D47E4 -_08086222: +@08086222: bl sub_80AF3C8 pop {r0} bx r0 @@ -242788,7 +242788,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 @@ -242796,9 +242796,9 @@ sub_8086230: @ 8086230 ldr r0, =0x03006210 ldrh r0, [r0] cmp r0, 0xFF - bne _0808624A + bne @0808624A bl sub_81A3908 -_0808624A: +@0808624A: bl set_current_map_header_from_sav1 bl set_warp2_warp3_to_neg_1 bl sub_81D609C @@ -242808,21 +242808,21 @@ _0808624A: ldrh r1, [r0, 0x12] ldr r0, =0x00000169 cmp r1, r0 - bne _08086278 + bne @08086278 bl sub_81AA2F8 - b _0808628A + b @0808628A .align 2, 0 .pool -_08086278: +@08086278: cmp r4, 0 - beq _08086286 + beq @08086286 cmp r4, 0x6 - beq _08086286 + beq @08086286 bl sub_81D5F48 - b _0808628A -_08086286: + b @0808628A +@08086286: bl sub_80848E0 -_0808628A: +@0808628A: bl sub_809757C bl sub_809E7B0 bl sub_8084788 @@ -242830,37 +242830,37 @@ _0808628A: ldrh r1, [r0, 0x12] ldr r0, =0x00000169 cmp r1, r0 - bne _080862B0 + bne @080862B0 movs r0, 0x1 bl sub_8087DAC - b _080862BE + b @080862BE .align 2, 0 .pool -_080862B0: +@080862B0: cmp r4, 0 - beq _080862BA + beq @080862BA bl sub_8087DE4 - b _080862BE -_080862BA: + b @080862BE +@080862BA: bl sub_8087D74 -_080862BE: +@080862BE: bl set_max_playtime_if_appropriate bl script_env_1_init bl script_env_2_disable bl sub_8195E10 bl sav2_x1_query_bit1 cmp r0, 0x1 - bne _080862F4 + bne @080862F4 bl sav2_x9_clear_bit1 bl warp1_set_to_sav1w bl warp_in bl sub_80EDB44 ldr r0, =c2_load_new_map + 1 bl set_callback2 - b _08086308 + b @08086308 .align 2, 0 .pool -_080862F4: +@080862F4: bl sub_80EDB44 ldr r0, =0x03005dac ldr r1, =sub_8086204 + 1 @@ -242868,7 +242868,7 @@ _080862F4: ldr r0, =c1_overworld + 1 bl set_callback1 bl c2_exit_to_overworld_2_switch -_08086308: +@08086308: pop {r4} pop {r0} bx r0 @@ -242877,28 +242877,28 @@ _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 lsrs r0, 24 cmp r0, 0x1 - bne _0808632E + bne @0808632E bl sub_80097E8 -_0808632E: +@0808632E: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _08086348 + beq @08086348 movs r0, 0xC5 bl enable_irqs movs r0, 0x2 bl disable_irqs - b _08086362 + b @08086362 .align 2, 0 .pool -_08086348: +@08086348: ldr r4, =0x04000208 ldrh r3, [r4] strh r0, [r4] @@ -242912,7 +242912,7 @@ _08086348: orrs r0, r1 strh r0, [r2] strh r3, [r4] -_08086362: +@08086362: movs r0, 0 bl SetVBlankCallback movs r0, 0 @@ -242925,7 +242925,7 @@ _08086362: thumb_func_end sub_808631C thumb_func_start set_vblank_callback_8086390 -set_vblank_callback_8086390: @ 8086380 +set_vblank_callback_8086390: ; 8086380 push {lr} ldr r0, =vblank_cb_8086390 + 1 bl SetVBlankCallback @@ -242936,7 +242936,7 @@ set_vblank_callback_8086390: @ 8086380 thumb_func_end set_vblank_callback_8086390 thumb_func_start vblank_cb_8086390 -vblank_cb_8086390: @ 8086390 +vblank_cb_8086390: ; 8086390 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -242949,34 +242949,34 @@ vblank_cb_8086390: @ 8086390 thumb_func_end vblank_cb_8086390 thumb_func_start sub_80863B0 -sub_80863B0: @ 80863B0 +sub_80863B0: ; 80863B0 push {lr} bl sub_81A9E6C lsls r0, 24 cmp r0, 0 - beq _080863D4 + beq @080863D4 bl door_upload_tiles ldr r2, =0x08339dbc ldr r0, [r2] ldr r1, [r2, 0x4] ldr r2, [r2, 0x8] bl sub_80BA038 - b _080863F0 + b @080863F0 .align 2, 0 .pool -_080863D4: +@080863D4: bl sav1_get_flash_used_on_map lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _080863F0 + beq @080863F0 bl sub_80B00E8 ldr r2, =0x08339dbc ldr r0, [r2] ldr r1, [r2, 0x4] ldr r2, [r2, 0x8] bl sub_80BA038 -_080863F0: +@080863F0: pop {r0} bx r0 .align 2, 0 @@ -242984,450 +242984,450 @@ _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] cmp r0, 0xD - bls _08086404 - b _08086512 -_08086404: + bls @08086404 + b @08086512 +@08086404: lsls r0, 2 - ldr r1, =_08086414 + ldr r1, =@08086414 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08086414: - .4byte _0808644C - .4byte _08086462 - .4byte _0808646A - .4byte _08086472 - .4byte _08086484 - .4byte _08086492 - .4byte _08086498 - .4byte _080864A8 - .4byte _080864B8 - .4byte _080864D4 - .4byte _080864DA - .4byte _080864E0 - .4byte _080864FC - .4byte _0808650E -_0808644C: +@08086414: + .4byte @0808644C + .4byte @08086462 + .4byte @0808646A + .4byte @08086472 + .4byte @08086484 + .4byte @08086492 + .4byte @08086498 + .4byte @080864A8 + .4byte @080864B8 + .4byte @080864D4 + .4byte @080864DA + .4byte @080864E0 + .4byte @080864FC + .4byte @0808650E +@0808644C: bl overworld_bg_setup bl script_env_1_init bl script_env_2_disable bl saveblock_randomize_and_relocate_ bl sub_80867D8 - b _08086506 -_08086462: + b @08086506 +@08086462: movs r0, 0x1 bl mli0_load_map - b _08086506 -_0808646A: + b @08086506 +@0808646A: movs r0, 0x1 bl sub_8086988 - b _08086506 -_08086472: + b @08086506 +@08086472: bl sub_8086AE4 bl sub_80869DC bl sub_8086B14 bl sub_8086AAC - b _08086506 -_08086484: + b @08086506 +@08086484: bl sub_80863B0 bl map_loading_lcd_reset bl sub_8197200 - b _08086506 -_08086492: + b @08086506 +@08086492: bl move_tilemap_camera_to_upper_left_corner - b _08086506 -_08086498: + b @08086506 +@08086498: ldr r0, =0x02037318 ldr r0, [r0] bl copy_map_tileset1_to_vram - b _08086506 + b @08086506 .align 2, 0 .pool -_080864A8: +@080864A8: ldr r0, =0x02037318 ldr r0, [r0] bl copy_map_tileset2_to_vram - b _08086506 + b @08086506 .align 2, 0 .pool -_080864B8: +@080864B8: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08086512 + beq @08086512 ldr r0, =0x02037318 ldr r0, [r0] bl apply_map_tileset1_tileset2_palette - b _08086506 + b @08086506 .align 2, 0 .pool -_080864D4: +@080864D4: bl cur_mapdata_full_redraw - b _08086506 -_080864DA: + b @08086506 +@080864DA: bl cur_mapheader_run_tileset_funcs_after_some_cpuset - b _08086506 -_080864E0: + b @08086506 +@080864E0: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _08086506 + beq @08086506 bl sub_800E0E8 movs r0, 0 movs r1, 0 bl sub_800DFB4 - b _08086506 + b @08086506 .align 2, 0 .pool -_080864FC: +@080864FC: bl map_post_load_hook_exec lsls r0, 24 cmp r0, 0 - beq _08086512 -_08086506: + beq @08086512 +@08086506: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _08086512 -_0808650E: + b @08086512 +@0808650E: movs r0, 0x1 - b _08086514 -_08086512: + b @08086514 +@08086512: movs r0, 0 -_08086514: +@08086514: pop {r4} pop {r1} bx r1 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 ldrb r0, [r4] cmp r0, 0xD - bls _0808652A - b _0808662E -_0808652A: + bls @0808652A + b @0808662E +@0808652A: lsls r0, 2 - ldr r1, =_08086538 + ldr r1, =@08086538 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08086538: - .4byte _08086570 - .4byte _0808657C - .4byte _08086586 - .4byte _0808658E - .4byte _08086598 - .4byte _080865A6 - .4byte _080865AC - .4byte _080865BC - .4byte _080865CC - .4byte _080865E8 - .4byte _080865EE - .4byte _080865F4 - .4byte _08086618 - .4byte _0808662A -_08086570: +@08086538: + .4byte @08086570 + .4byte @0808657C + .4byte @08086586 + .4byte @0808658E + .4byte @08086598 + .4byte @080865A6 + .4byte @080865AC + .4byte @080865BC + .4byte @080865CC + .4byte @080865E8 + .4byte @080865EE + .4byte @080865F4 + .4byte @08086618 + .4byte @0808662A +@08086570: bl sub_808631C adds r0, r5, 0 bl mli0_load_map - b _08086622 -_0808657C: + b @08086622 +@0808657C: bl saveblock_randomize_and_relocate_ bl sub_80867D8 - b _08086622 -_08086586: + b @08086622 +@08086586: adds r0, r5, 0 bl sub_8086988 - b _08086622 -_0808658E: + b @08086622 +@0808658E: bl mli4_mapscripts_and_other bl sub_8086A80 - b _08086622 -_08086598: + b @08086622 +@08086598: bl sub_80863B0 bl map_loading_lcd_reset bl sub_8197200 - b _08086622 -_080865A6: + b @08086622 +@080865A6: bl move_tilemap_camera_to_upper_left_corner - b _08086622 -_080865AC: + b @08086622 +@080865AC: ldr r0, =0x02037318 ldr r0, [r0] bl copy_map_tileset1_to_vram - b _08086622 + b @08086622 .align 2, 0 .pool -_080865BC: +@080865BC: ldr r0, =0x02037318 ldr r0, [r0] bl copy_map_tileset2_to_vram - b _08086622 + b @08086622 .align 2, 0 .pool -_080865CC: +@080865CC: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0808662E + beq @0808662E ldr r0, =0x02037318 ldr r0, [r0] bl apply_map_tileset1_tileset2_palette - b _08086622 + b @08086622 .align 2, 0 .pool -_080865E8: +@080865E8: bl cur_mapdata_full_redraw - b _08086622 -_080865EE: + b @08086622 +@080865EE: bl cur_mapheader_run_tileset_funcs_after_some_cpuset - b _08086622 -_080865F4: + b @08086622 +@080865F4: ldr r0, =0x02037318 ldrb r1, [r0, 0x1A] movs r0, 0xF8 ands r0, r1 cmp r0, 0x8 - bne _08086622 + bne @08086622 bl sub_80E909C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08086622 + bne @08086622 bl sub_80D47E4 - b _08086622 + b @08086622 .align 2, 0 .pool -_08086618: +@08086618: bl map_post_load_hook_exec lsls r0, 24 cmp r0, 0 - beq _0808662E -_08086622: + beq @0808662E +@08086622: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _0808662E -_0808662A: + b @0808662E +@0808662A: movs r0, 0x1 - b _08086630 -_0808662E: + b @08086630 +@0808662E: movs r0, 0 -_08086630: +@08086630: pop {r4,r5} pop {r1} bx r1 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] cmp r0, 0x1 - beq _0808666E + beq @0808666E cmp r0, 0x1 - bgt _0808664C + bgt @0808664C cmp r0, 0 - beq _08086656 - b _0808668E -_0808664C: + beq @08086656 + b @0808668E +@0808664C: cmp r0, 0x2 - beq _08086678 + beq @08086678 cmp r0, 0x3 - beq _0808668A - b _0808668E -_08086656: + beq @0808668A + b @0808668E +@08086656: bl saveblock_randomize_and_relocate_ bl sub_80867D8 movs r0, 0 bl sub_8086988 bl sub_8086A68 bl sub_8086A80 - b _08086682 -_0808666E: + b @08086682 +@0808666E: bl sub_8086860 bl sub_81D64C0 - b _08086682 -_08086678: + b @08086682 +@08086678: bl map_post_load_hook_exec lsls r0, 24 cmp r0, 0 - beq _0808668E -_08086682: + beq @0808668E +@08086682: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _0808668E -_0808668A: + b @0808668E +@0808668A: movs r0, 0x1 - b _08086690 -_0808668E: + b @08086690 +@0808668E: movs r0, 0 -_08086690: +@08086690: pop {r4} pop {r1} bx r1 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] cmp r0, 0xD - bls _080866A4 - b _080867A8 -_080866A4: + bls @080866A4 + b @080867A8 +@080866A4: lsls r0, 2 - ldr r1, =_080866B4 + ldr r1, =@080866B4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080866B4: - .4byte _080866EC - .4byte _080866FA - .4byte _08086702 - .4byte _08086710 - .4byte _0808671E - .4byte _08086724 - .4byte _08086734 - .4byte _08086744 - .4byte _08086760 - .4byte _08086766 - .4byte _08086792 - .4byte _0808676C - .4byte _08086788 - .4byte _0808679A -_080866EC: +@080866B4: + .4byte @080866EC + .4byte @080866FA + .4byte @08086702 + .4byte @08086710 + .4byte @0808671E + .4byte @08086724 + .4byte @08086734 + .4byte @08086744 + .4byte @08086760 + .4byte @08086766 + .4byte @08086792 + .4byte @0808676C + .4byte @08086788 + .4byte @0808679A +@080866EC: bl sub_808631C bl saveblock_randomize_and_relocate_ bl sub_80867D8 - b _08086792 -_080866FA: + b @08086792 +@080866FA: movs r0, 0x1 bl sub_8086988 - b _08086792 -_08086702: + b @08086792 +@08086702: bl sub_8086B9C bl sub_8086A68 bl sub_8086AC8 - b _08086792 -_08086710: + b @08086792 +@08086710: bl sub_80863B0 bl map_loading_lcd_reset bl sub_8197200 - b _08086792 -_0808671E: + b @08086792 +@0808671E: bl move_tilemap_camera_to_upper_left_corner - b _08086792 -_08086724: + b @08086792 +@08086724: ldr r0, =0x02037318 ldr r0, [r0] bl copy_map_tileset1_to_vram - b _08086792 + b @08086792 .align 2, 0 .pool -_08086734: +@08086734: ldr r0, =0x02037318 ldr r0, [r0] bl copy_map_tileset2_to_vram - b _08086792 + b @08086792 .align 2, 0 .pool -_08086744: +@08086744: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080867A8 + beq @080867A8 ldr r0, =0x02037318 ldr r0, [r0] bl apply_map_tileset1_tileset2_palette - b _08086792 + b @08086792 .align 2, 0 .pool -_08086760: +@08086760: bl cur_mapdata_full_redraw - b _08086792 -_08086766: + b @08086792 +@08086766: bl cur_mapheader_run_tileset_funcs_after_some_cpuset - b _08086792 -_0808676C: + b @08086792 +@0808676C: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _08086792 + beq @08086792 bl sub_800E0E8 movs r0, 0 movs r1, 0 bl sub_800DFB4 - b _08086792 + b @08086792 .align 2, 0 .pool -_08086788: +@08086788: bl map_post_load_hook_exec lsls r0, 24 cmp r0, 0 - beq _080867A8 -_08086792: + beq @080867A8 +@08086792: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _080867A8 -_0808679A: + b @080867A8 +@0808679A: bl set_vblank_callback_8086390 ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] movs r0, 0x1 - b _080867AA -_080867A8: + b @080867AA +@080867A8: movs r0, 0 -_080867AA: +@080867AA: pop {r4} pop {r1} bx r1 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: +@080867B4: adds r0, r4, 0 movs r1, 0 bl load_map_stuff cmp r0, 0 - beq _080867B4 + beq @080867B4 pop {r4} pop {r0} bx r0 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 @@ -243436,7 +243436,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 @@ -243466,7 +243466,7 @@ sub_80867D8: @ 80867D8 movs r0, 0x81 lsls r0, 24 mov r12, r0 -_08086816: +@08086816: strh r6, [r4] mov r0, sp str r0, [r1] @@ -243476,7 +243476,7 @@ _08086816: adds r2, r5 subs r3, r5 cmp r3, r5 - bhi _08086816 + bhi @08086816 strh r6, [r4] mov r0, sp str r0, [r1] @@ -243499,7 +243499,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 @@ -243510,7 +243510,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 @@ -243610,7 +243610,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 @@ -243621,21 +243621,21 @@ sub_8086988: @ 8086988 bl clear_all_callback6 bl sub_808A2E4 cmp r4, 0 - bne _080869B4 + bne @080869B4 movs r0, 0 bl npc_paltag_set_load - b _080869BA -_080869B4: + b @080869BA +@080869B4: movs r0, 0x1 bl npc_paltag_set_load -_080869BA: +@080869BA: bl oe_active_list_clear bl sub_80AAFA4 bl sub_80AEE84 cmp r4, 0 - bne _080869CE + bne @080869CE bl overworld_ensure_per_step_coros_running -_080869CE: +@080869CE: bl mapheader_run_script_with_tag_x5 bl sub_81BE6B8 pop {r4} @@ -243644,7 +243644,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 @@ -243663,7 +243663,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 @@ -243705,7 +243705,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 @@ -243717,7 +243717,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 @@ -243739,7 +243739,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] @@ -243754,7 +243754,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] @@ -243769,7 +243769,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 @@ -243795,7 +243795,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} @@ -243817,9 +243817,9 @@ sub_8086B14: @ 8086B14 mov r8, r4 ldrb r0, [r0] cmp r6, r0 - bcs _08086B7E + bcs @08086B7E ldr r7, =0x020229e8 -_08086B44: +@08086B44: lsls r5, r6, 24 lsrs r5, 24 mov r0, sp @@ -243846,8 +243846,8 @@ _08086B44: ldr r0, =0x03005db8 ldrb r0, [r0] cmp r6, r0 - bcc _08086B44 -_08086B7E: + bcc @08086B44 +@08086B7E: bl sub_8086C40 add sp, 0x4 pop {r3} @@ -243860,15 +243860,15 @@ _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 ldrb r0, [r0] cmp r4, r0 - bcs _08086BCA + bcs @08086BCA ldr r5, =0x020229e8 -_08086BAA: +@08086BAA: lsls r0, r4, 24 lsrs r0, 24 lsls r1, r4, 3 @@ -243883,8 +243883,8 @@ _08086BAA: ldr r0, =0x03005db8 ldrb r0, [r0] cmp r4, r0 - bcc _08086BAA -_08086BCA: + bcc @08086BAA +@08086BCA: pop {r4,r5} pop {r0} bx r0 @@ -243893,19 +243893,19 @@ _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] cmp r0, 0 - beq _08086BF2 + beq @08086BF2 bl sub_800F0B8 cmp r0, 0 - beq _08086BF2 + beq @08086BF2 bl sub_8009F3C cmp r0, 0 - bne _08086C14 -_08086BF2: + bne @08086C14 +@08086BF2: ldr r0, =0x03005db4 ldrb r4, [r0] ldr r0, =0x03003020 @@ -243919,7 +243919,7 @@ _08086BF2: lsrs r0, 16 bl sub_8086FA0 bl sub_8086C40 -_08086C14: +@08086C14: pop {r4} pop {r0} bx r0 @@ -243928,7 +243928,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 + 1 @@ -243940,7 +243940,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 @@ -243951,7 +243951,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] @@ -243963,12 +243963,12 @@ 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] cmp r0, 0 - beq _08086C82 + beq @08086C82 ldr r1, =0x03000e19 ldrb r0, [r1] adds r0, 0x1 @@ -243976,9 +243976,9 @@ sub_8086C64: @ 8086C64 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3C - bls _08086C82 + bls @08086C82 bl sub_8010198 -_08086C82: +@08086C82: pop {r0} bx r0 .align 2, 0 @@ -243986,16 +243986,16 @@ _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 adds r0, r1, 0x3 -_08086C98: +@08086C98: strb r2, [r0] subs r0, 0x1 cmp r0, r1 - bge _08086C98 + bge @08086C98 pop {r0} bx r0 .align 2, 0 @@ -244003,7 +244003,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 @@ -244011,31 +244011,31 @@ sub_8086CA8: @ 8086CA8 ldrb r2, [r0] movs r1, 0 cmp r1, r2 - bge _08086CD6 + bge @08086CD6 ldr r4, =0x03000e10 -_08086CBA: +@08086CBA: adds r0, r1, r4 ldrb r0, [r0] cmp r0, r3 - beq _08086CD0 + beq @08086CD0 movs r0, 0 - b _08086CD8 + b @08086CD8 .align 2, 0 .pool -_08086CD0: +@08086CD0: adds r1, 0x1 cmp r1, r2 - blt _08086CBA -_08086CD6: + blt @08086CBA +@08086CD6: movs r0, 0x1 -_08086CD8: +@08086CD8: pop {r4} pop {r1} bx r1 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 @@ -244043,31 +244043,31 @@ sub_8086CE0: @ 8086CE0 ldrb r2, [r0] movs r1, 0 cmp r1, r2 - bge _08086D0E + bge @08086D0E ldr r4, =0x03000e10 -_08086CF2: +@08086CF2: adds r0, r1, r4 ldrb r0, [r0] cmp r0, r3 - bne _08086D08 + bne @08086D08 movs r0, 0x1 - b _08086D10 + b @08086D10 .align 2, 0 .pool -_08086D08: +@08086D08: adds r1, 0x1 cmp r1, r2 - blt _08086CF2 -_08086D0E: + blt @08086CF2 +@08086D0E: movs r0, 0 -_08086D10: +@08086D10: pop {r4} pop {r1} bx r1 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 @@ -244082,14 +244082,14 @@ sub_8086D18: @ 8086D18 adds r5, r7, r0 ldrb r0, [r5] cmp r0, 0x80 - beq _08086D38 - b _08086EB2 -_08086D38: + beq @08086D38 + b @08086EB2 +@08086D38: adds r0, r6, 0 bl sub_8087370 adds r4, r0, 0 cmp r4, 0 - beq _08086D70 + beq @08086D70 bl sub_8087480 mov r1, r9 strh r0, [r1] @@ -244097,206 +244097,206 @@ _08086D38: strb r0, [r5] ldrb r0, [r6, 0x1] cmp r0, 0 - bne _08086D58 - b _08086F26 -_08086D58: + bne @08086D58 + b @08086F26 +@08086D58: ldr r0, =sub_80870F8 + 1 bl c1_link_related_func_set adds r0, r4, 0 bl sub_8087530 - b _08086F26 + b @08086F26 .align 2, 0 .pool -_08086D70: +@08086D70: movs r0, 0x83 bl sub_8086CE0 cmp r0, 0x1 - bne _08086D98 + bne @08086D98 movs r0, 0x81 strb r0, [r5] ldrb r0, [r6, 0x1] cmp r0, 0 - bne _08086D86 - b _08086F26 -_08086D86: + bne @08086D86 + b @08086F26 +@08086D86: ldr r0, =sub_80870F8 + 1 bl c1_link_related_func_set bl sub_8087584 - b _08086F26 + b @08086F26 .align 2, 0 .pool -_08086D98: +@08086D98: mov r0, r8 subs r0, 0x12 cmp r0, 0xA - bls _08086DA2 - b _08086EB2 -_08086DA2: + bls @08086DA2 + b @08086EB2 +@08086DA2: lsls r0, 2 - ldr r1, =_08086DB0 + ldr r1, =@08086DB0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08086DB0: - .4byte _08086E08 - .4byte _08086EB2 - .4byte _08086EB2 - .4byte _08086EB2 - .4byte _08086EB2 - .4byte _08086EB2 - .4byte _08086DDC - .4byte _08086E34 - .4byte _08086EB2 - .4byte _08086E64 - .4byte _08086E90 -_08086DDC: +@08086DB0: + .4byte @08086E08 + .4byte @08086EB2 + .4byte @08086EB2 + .4byte @08086EB2 + .4byte @08086EB2 + .4byte @08086EB2 + .4byte @08086DDC + .4byte @08086E34 + .4byte @08086EB2 + .4byte @08086E64 + .4byte @08086E90 +@08086DDC: adds r0, r6, 0 bl sub_8087358 cmp r0, 0 - beq _08086EB2 + beq @08086EB2 ldr r0, =0x03000e10 adds r0, r7, r0 movs r1, 0x81 strb r1, [r0] ldrb r0, [r6, 0x1] cmp r0, 0 - beq _08086EB2 + beq @08086EB2 ldr r0, =sub_80870F8 + 1 bl c1_link_related_func_set bl sub_808751C - b _08086EB2 + b @08086EB2 .align 2, 0 .pool -_08086E08: +@08086E08: adds r0, r6, 0 bl sub_8087388 cmp r0, 0x1 - bne _08086EB2 + bne @08086EB2 ldr r0, =0x03000e10 adds r0, r7, r0 movs r1, 0x81 strb r1, [r0] ldrb r0, [r6, 0x1] cmp r0, 0 - beq _08086EB2 + beq @08086EB2 ldr r0, =sub_80870F8 + 1 bl c1_link_related_func_set bl sub_808754C - b _08086EB2 + b @08086EB2 .align 2, 0 .pool -_08086E34: +@08086E34: adds r0, r6, 0 bl sub_80873B4 adds r4, r0, 0 cmp r4, 0 - beq _08086EB2 + beq @08086EB2 ldr r0, =0x03000e10 adds r0, r7, r0 movs r1, 0x81 strb r1, [r0] ldrb r0, [r6, 0x1] cmp r0, 0 - beq _08086EB2 + beq @08086EB2 ldr r0, =sub_80870F8 + 1 bl c1_link_related_func_set adds r0, r4, 0 bl sub_8087568 - b _08086EB2 + b @08086EB2 .align 2, 0 .pool -_08086E64: +@08086E64: adds r0, r6, 0 bl sub_8087340 cmp r0, 0 - beq _08086EB2 + beq @08086EB2 ldr r0, =0x03000e10 adds r0, r7, r0 movs r1, 0x81 strb r1, [r0] ldrb r0, [r6, 0x1] cmp r0, 0 - beq _08086EB2 + beq @08086EB2 ldr r0, =sub_808711C + 1 bl c1_link_related_func_set bl sub_8087510 - b _08086EB2 + b @08086EB2 .align 2, 0 .pool -_08086E90: +@08086E90: adds r0, r6, 0 bl sub_8087340 cmp r0, 0 - beq _08086EB2 + beq @08086EB2 ldr r0, =0x03000e10 adds r0, r7, r0 movs r1, 0x81 strb r1, [r0] ldrb r0, [r6, 0x1] cmp r0, 0 - beq _08086EB2 + beq @08086EB2 ldr r0, =sub_8087140 + 1 bl c1_link_related_func_set bl sub_8087510 -_08086EB2: +@08086EB2: mov r0, r8 cmp r0, 0x17 - beq _08086ED8 + beq @08086ED8 cmp r0, 0x17 - bgt _08086ECC + bgt @08086ECC cmp r0, 0x16 - beq _08086EE8 - b _08086F26 + beq @08086EE8 + b @08086F26 .align 2, 0 .pool -_08086ECC: +@08086ECC: mov r1, r8 cmp r1, 0x1A - beq _08086EF8 + beq @08086EF8 cmp r1, 0x1D - beq _08086F18 - b _08086F26 -_08086ED8: + beq @08086F18 + b @08086F26 +@08086ED8: ldr r0, =0x03000e10 adds r0, r7, r0 movs r1, 0x83 strb r1, [r0] - b _08086F26 + b @08086F26 .align 2, 0 .pool -_08086EE8: +@08086EE8: ldr r0, =0x03000e10 adds r0, r7, r0 movs r1, 0x82 strb r1, [r0] - b _08086F26 + b @08086F26 .align 2, 0 .pool -_08086EF8: +@08086EF8: ldr r0, =0x03000e10 adds r0, r7, r0 movs r1, 0x80 strb r1, [r0] ldrb r0, [r6, 0x1] cmp r0, 0 - beq _08086F26 + beq @08086F26 ldr r0, =sub_80870B0 + 1 bl c1_link_related_func_set - b _08086F26 + b @08086F26 .align 2, 0 .pool -_08086F18: +@08086F18: ldr r0, =0x03000e10 adds r1, r7, r0 ldrb r0, [r1] cmp r0, 0x82 - bne _08086F26 + bne @08086F26 movs r0, 0x81 strb r0, [r1] -_08086F26: +@08086F26: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -244308,7 +244308,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 @@ -244319,7 +244319,7 @@ sub_8086F38: @ 8086F38 add r5, sp, 0x10 mov r9, r5 adds r7, r0, 0 -_08086F4C: +@08086F4C: ldrb r4, [r7] movs r0, 0 strh r0, [r5] @@ -244336,12 +244336,12 @@ _08086F4C: adds r0, r6, r0 ldrb r0, [r0] cmp r0, 0x80 - bne _08086F7C + bne @08086F7C adds r0, r4, 0 bl sub_8087068 mov r1, r9 strh r0, [r1] -_08086F7C: +@08086F7C: lsls r0, r6, 24 lsrs r0, 24 ldrb r1, [r5] @@ -244349,7 +244349,7 @@ _08086F7C: adds r7, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble _08086F4C + ble @08086F4C add sp, 0x14 pop {r3,r4} mov r8, r3 @@ -244362,7 +244362,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 @@ -244370,43 +244370,43 @@ sub_8086FA0: @ 8086FA0 adds r0, r1 lsrs r0, 16 cmp r0, 0xC - bhi _08086FC0 + bhi @08086FC0 ldr r0, =0x03005da8 strh r4, [r0] - b _08086FC6 + b @08086FC6 .align 2, 0 .pool -_08086FC0: +@08086FC0: ldr r1, =0x03005da8 movs r0, 0x11 strh r0, [r1] -_08086FC6: +@08086FC6: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _08086FFC + beq @08086FFC bl sub_8087690 cmp r0, 0x1 - bls _08086FFC + bls @08086FFC bl is_c1_link_related_active cmp r0, 0x1 - bne _08086FFC + bne @08086FFC bl sub_8009F3C cmp r0, 0x1 - bne _08086FFC + bne @08086FFC cmp r4, 0x11 - blt _08086FFC + blt @08086FFC cmp r4, 0x15 - ble _08086FF6 + ble @08086FF6 cmp r4, 0x19 - bgt _08086FFC + bgt @08086FFC cmp r4, 0x18 - blt _08086FFC -_08086FF6: + blt @08086FFC +@08086FF6: ldr r1, =0x03005da8 movs r0, 0 strh r0, [r1] -_08086FFC: +@08086FFC: pop {r4} pop {r0} bx r0 @@ -244415,147 +244415,147 @@ _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] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _08087024 + beq @08087024 movs r0, 0x13 - b _08087064 + b @08087064 .align 2, 0 .pool -_08087024: +@08087024: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08087030 + beq @08087030 movs r0, 0x12 - b _08087064 -_08087030: + b @08087064 +@08087030: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0808703C + beq @0808703C movs r0, 0x14 - b _08087064 -_0808703C: + b @08087064 +@0808703C: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08087048 + beq @08087048 movs r0, 0x15 - b _08087064 -_08087048: + b @08087064 +@08087048: ldrh r1, [r2, 0x2E] movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _08087056 + beq @08087056 movs r0, 0x18 - b _08087064 -_08087056: + b @08087064 +@08087056: movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _08087062 + bne @08087062 movs r0, 0x11 - b _08087064 -_08087062: + b @08087064 +@08087062: movs r0, 0x19 -_08087064: +@08087064: pop {r1} bx r1 thumb_func_end sub_808700C thumb_func_start sub_8087068 -sub_8087068: @ 8087068 +sub_8087068: ; 8087068 push {lr} lsls r0, 16 lsrs r0, 16 adds r1, r0, 0 cmp r0, 0x13 - beq _0808708E + beq @0808708E cmp r0, 0x13 - bgt _0808707E + bgt @0808707E cmp r0, 0x12 - beq _08087092 - b _08087096 -_0808707E: + beq @08087092 + b @08087096 +@0808707E: cmp r1, 0x14 - beq _0808708A + beq @0808708A cmp r1, 0x15 - bne _08087096 + bne @08087096 movs r0, 0x4 - b _08087098 -_0808708A: + b @08087098 +@0808708A: movs r0, 0x3 - b _08087098 -_0808708E: + b @08087098 +@0808708E: movs r0, 0x1 - b _08087098 -_08087092: + b @08087098 +@08087092: movs r0, 0x2 - b _08087098 -_08087096: + b @08087098 +@08087096: movs r0, 0 -_08087098: +@08087098: pop {r1} bx r1 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 -_080870A2: +@080870A2: strh r2, [r1] subs r1, 0x2 cmp r1, r0 - bge _080870A2 + bge @080870A2 pop {r0} bx r0 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 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080870C4 + bne @080870C4 movs r0, 0x11 - b _080870E6 -_080870C4: + b @080870E6 +@080870C4: bl sub_800B4DC cmp r0, 0x4 - bls _080870D0 + bls @080870D0 movs r0, 0x1B - b _080870E6 -_080870D0: + b @080870E6 +@080870D0: bl sub_8087690 cmp r0, 0x4 - bls _080870DC + bls @080870DC movs r0, 0x1C - b _080870E6 -_080870DC: + b @080870E6 +@080870DC: adds r0, r4, 0 bl sub_808700C lsls r0, 16 lsrs r0, 16 -_080870E6: +@080870E6: pop {r4} pop {r1} bx r1 thumb_func_end sub_80870B0 thumb_func_start sub_80870EC -sub_80870EC: @ 80870EC +sub_80870EC: ; 80870EC push {lr} bl sub_8086C64 movs r0, 0x11 @@ -244564,18 +244564,18 @@ 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 lsrs r0, 24 movs r4, 0x11 cmp r0, 0x1 - beq _08087110 + beq @08087110 movs r4, 0x1A ldr r0, =sub_80870EC + 1 bl c1_link_related_func_set -_08087110: +@08087110: adds r0, r4, 0 pop {r4} pop {r1} @@ -244585,17 +244585,17 @@ _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 cmp r0, 0x2 - bhi _08087134 + bhi @08087134 movs r4, 0x1A bl script_env_2_disable ldr r0, =sub_80870EC + 1 bl c1_link_related_func_set -_08087134: +@08087134: adds r0, r4, 0 pop {r4} pop {r1} @@ -244605,17 +244605,17 @@ _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 cmp r0, 0x2 - bhi _08087158 + bhi @08087158 movs r4, 0x1A bl script_env_2_disable ldr r0, =sub_80870EC + 1 bl c1_link_related_func_set -_08087158: +@08087158: adds r0, r4, 0 pop {r4} pop {r1} @@ -244625,7 +244625,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 @@ -244634,36 +244634,36 @@ 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 ldrb r0, [r0] cmp r0, 0x82 - bne _080871A0 + bne @080871A0 ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080871A4 + beq @080871A4 ldr r0, =sub_8087164 + 1 bl c1_link_related_func_set movs r0, 0x1D - b _080871A6 + b @080871A6 .align 2, 0 .pool -_080871A0: +@080871A0: bl sub_8086C64 -_080871A4: +@080871A4: movs r0, 0x11 -_080871A6: +@080871A6: pop {r1} bx r1 thumb_func_end sub_8087170 thumb_func_start sub_80871AC -sub_80871AC: @ 80871AC +sub_80871AC: ; 80871AC push {lr} ldr r0, =sub_8087170 + 1 bl c1_link_related_func_set @@ -244675,30 +244675,30 @@ 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 ldrb r0, [r0] cmp r0, 0x83 - beq _080871D4 + beq @080871D4 bl sub_8086C64 -_080871D4: +@080871D4: movs r0, 0x83 bl sub_8086CA8 cmp r0, 0x1 - bne _080871EA + bne @080871EA ldr r0, =0x08277513 bl script_env_1_execute_new_script ldr r0, =sub_80871C0 + 1 bl c1_link_related_func_set -_080871EA: +@080871EA: movs r0, 0x11 pop {r1} bx r1 @@ -244707,7 +244707,7 @@ _080871EA: thumb_func_end sub_80871C4 thumb_func_start sub_80871FC -sub_80871FC: @ 80871FC +sub_80871FC: ; 80871FC push {lr} ldr r0, =sub_80871C4 + 1 bl c1_link_related_func_set @@ -244719,65 +244719,65 @@ 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 cmp r0, 0x1 - beq _08087250 + beq @08087250 ldr r0, =0x03000e14 ldr r2, [r0] ldr r1, =sub_8087170 + 1 adds r3, r0, 0 cmp r2, r1 - bne _0808723A + bne @0808723A ldr r1, =0x03000e10 ldr r0, =0x03005db4 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] cmp r0, 0x82 - bne _08087272 -_0808723A: + bne @08087272 +@0808723A: ldr r1, [r3] ldr r0, =sub_8087164 + 1 cmp r1, r0 - bne _08087268 + bne @08087268 ldr r1, =0x03000e10 ldr r0, =0x03005db4 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] cmp r0, 0x81 - bne _08087268 -_08087250: + bne @08087268 +@08087250: movs r0, 0x2 - b _08087278 + b @08087278 .align 2, 0 .pool -_08087268: +@08087268: movs r0, 0x82 bl sub_8086CA8 cmp r0, 0 - bne _08087276 -_08087272: + bne @08087276 +@08087272: movs r0, 0 - b _08087278 -_08087276: + b @08087278 +@08087276: movs r0, 0x1 -_08087278: +@08087278: pop {r1} bx r1 thumb_func_end sub_8087214 thumb_func_start sub_808727C -sub_808727C: @ 808727C +sub_808727C: ; 808727C push {lr} movs r0, 0x83 bl sub_8086CE0 @@ -244786,7 +244786,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 + 1 bl c1_link_related_func_set @@ -244798,7 +244798,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 + 1 bl c1_link_related_func_set @@ -244810,7 +244810,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 + 1 bl c1_link_related_func_set @@ -244822,7 +244822,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 + 1 bl c1_link_related_func_set @@ -244834,7 +244834,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 @@ -244842,9 +244842,9 @@ sub_80872D8: @ 80872D8 strb r4, [r6] movs r0, 0 cmp r4, r1 - bne _080872EA + bne @080872EA movs r0, 0x1 -_080872EA: +@080872EA: strb r0, [r6, 0x1] ldr r1, =0x02032308 lsls r0, r4, 2 @@ -244886,99 +244886,99 @@ _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 - beq _0808734C + beq @0808734C cmp r0, 0 - bne _08087350 -_0808734C: + bne @08087350 +@0808734C: movs r0, 0x1 - b _08087352 -_08087350: + b @08087352 +@08087350: movs r0, 0 -_08087352: +@08087352: pop {r1} bx r1 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 - beq _08087364 + beq @08087364 cmp r0, 0 - bne _08087368 -_08087364: + bne @08087368 +@08087364: movs r0, 0x1 - b _0808736A -_08087368: + b @0808736A +@08087368: movs r0, 0 -_0808736A: +@0808736A: pop {r1} bx r1 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] cmp r0, 0x2 - bne _08087382 + bne @08087382 adds r0, r1, 0x4 bl sub_809D0F4 - b _08087384 -_08087382: + b @08087384 +@08087382: movs r0, 0 -_08087384: +@08087384: pop {r1} bx r1 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] cmp r0, 0x2 - beq _08087396 + beq @08087396 cmp r0, 0 - bne _080873AC -_08087396: + bne @080873AC +@08087396: ldrb r0, [r4, 0xC] bl is_tile_x65_warp_arrow_down lsls r0, 24 cmp r0, 0 - beq _080873AC + beq @080873AC ldrb r0, [r4, 0x3] cmp r0, 0x1 - bne _080873AC + bne @080873AC movs r0, 0x1 - b _080873AE -_080873AC: + b @080873AE +@080873AC: movs r0, 0 -_080873AE: +@080873AE: pop {r4} pop {r1} bx r1 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 ldrb r0, [r4, 0x2] cmp r0, 0 - beq _080873C8 + beq @080873C8 cmp r0, 0x2 - beq _080873C8 + beq @080873C8 movs r0, 0 - b _08087476 -_080873C8: + b @08087476 +@080873C8: ldr r0, [r4, 0x4] ldr r1, [r4, 0x8] str r0, [sp] @@ -245023,40 +245023,40 @@ _080873C8: lsrs r1, r0, 24 adds r2, r1, 0 cmp r1, 0x4 - beq _0808746C + beq @0808746C ldrb r0, [r4, 0x1] cmp r0, 0 - beq _08087434 + beq @08087434 ldr r0, =0x03000e10 adds r0, r1, r0 ldrb r0, [r0] cmp r0, 0x80 - beq _08087450 -_08087434: + beq @08087450 +@08087434: ldr r0, =0x0827749c - b _08087476 + b @08087476 .align 2, 0 .pool -_08087450: +@08087450: adds r0, r2, 0 bl sub_80B39D4 cmp r0, 0 - bne _08087464 + bne @08087464 ldr r0, =0x0827747e - b _08087476 + b @08087476 .align 2, 0 .pool -_08087464: +@08087464: ldr r0, =0x0827748d - b _08087476 + b @08087476 .align 2, 0 .pool -_0808746C: +@0808746C: ldrb r1, [r4, 0xC] ldrb r2, [r4, 0x3] mov r0, sp bl sub_809C2C8 -_08087476: +@08087476: add sp, 0x8 pop {r4} pop {r1} @@ -245064,64 +245064,64 @@ _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, =0x08277388 cmp r1, r0 - beq _080874C6 + beq @080874C6 ldr r0, =0x082773a3 cmp r1, r0 - beq _08087508 + beq @08087508 ldr r0, =0x082773be cmp r1, r0 - beq _080874C6 + beq @080874C6 ldr r0, =0x082773d9 cmp r1, r0 - beq _08087508 + beq @08087508 ldr r0, =0x0827741d cmp r1, r0 - beq _080874C6 + beq @080874C6 ldr r0, =0x08277432 cmp r1, r0 - beq _08087508 + beq @08087508 ldr r0, =0x08277447 cmp r1, r0 - beq _080874C6 + beq @080874C6 ldr r0, =0x0827745c cmp r1, r0 - beq _08087508 + beq @08087508 ldr r0, =0x08277374 cmp r1, r0 - beq _080874C6 + beq @080874C6 ldr r0, =0x0827737e cmp r1, r0 - beq _08087508 + beq @08087508 ldr r0, =0x082773f5 cmp r1, r0 - bne _080874F8 -_080874C6: + bne @080874F8 +@080874C6: movs r0, 0xA - b _0808750A + b @0808750A .align 2, 0 .pool -_080874F8: +@080874F8: ldr r0, =0x082773ff cmp r1, r0 - beq _08087508 + beq @08087508 movs r0, 0 - b _0808750A + b @0808750A .align 2, 0 .pool -_08087508: +@08087508: movs r0, 0x9 -_0808750A: +@0808750A: pop {r1} bx r1 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} @@ -245129,7 +245129,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 @@ -245140,7 +245140,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 @@ -245154,7 +245154,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 @@ -245168,7 +245168,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 @@ -245182,7 +245182,7 @@ sub_8087568: @ 8087568 thumb_func_end sub_8087568 thumb_func_start sub_8087584 -sub_8087584: @ 8087584 +sub_8087584: ; 8087584 push {lr} ldr r0, =0x08277509 bl script_env_1_execute_new_script @@ -245194,29 +245194,29 @@ 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 - bne _080875A6 + bne @080875A6 movs r0, 0 - b _080875C0 -_080875A6: + b @080875C0 +@080875A6: bl sub_800B4DC cmp r0, 0x2 - bls _080875B8 + bls @080875B8 ldr r1, =0x03000e18 movs r0, 0x1 - b _080875BC + b @080875BC .align 2, 0 .pool -_080875B8: +@080875B8: ldr r1, =0x03000e18 movs r0, 0 -_080875BC: +@080875BC: strb r0, [r1] ldrb r0, [r1] -_080875C0: +@080875C0: pop {r1} bx r1 .align 2, 0 @@ -245224,124 +245224,124 @@ _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 - bls _0808762C + bls @0808762C bl is_c1_link_related_active cmp r0, 0x1 - bne _0808762C + bne @0808762C bl sub_8009F3C cmp r0, 0x1 - bne _0808762C + bne @0808762C ldr r0, =0x03000e14 ldr r1, [r0] ldr r0, =sub_808711C + 1 cmp r1, r0 - beq _08087614 + beq @08087614 ldr r0, =sub_80870F8 + 1 cmp r1, r0 - bne _0808762C + bne @0808762C ldr r0, =0x03000e18 ldrb r2, [r0] movs r1, 0 strb r1, [r0] cmp r2, 0x1 - beq _08087614 + beq @08087614 ldr r2, =0x02037fd4 ldrb r1, [r2, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0808762C + beq @0808762C ldrb r1, [r2, 0xA] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0808762C -_08087614: + beq @0808762C +@08087614: movs r0, 0x1 - b _0808762E + b @0808762E .align 2, 0 .pool -_0808762C: +@0808762C: movs r0, 0 -_0808762E: +@0808762E: pop {r1} bx r1 thumb_func_end sub_80875C8 thumb_func_start sub_8087634 -sub_8087634: @ 8087634 +sub_8087634: ; 8087634 push {lr} bl sub_8087690 cmp r0, 0x1 - bls _08087658 + bls @08087658 bl is_c1_link_related_active cmp r0, 0x1 - bne _08087658 + bne @08087658 bl sub_8009F3C cmp r0, 0x1 - bne _08087658 + bne @08087658 ldr r0, =0x03000e14 ldr r1, [r0] ldr r0, =sub_8087140 + 1 cmp r1, r0 - beq _08087664 -_08087658: + beq @08087664 +@08087658: movs r0, 0 - b _08087666 + b @08087666 .align 2, 0 .pool -_08087664: +@08087664: movs r0, 0x1 -_08087666: +@08087666: pop {r1} bx r1 thumb_func_end sub_8087634 thumb_func_start sub_808766C -sub_808766C: @ 808766C +sub_808766C: ; 808766C push {lr} ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - bne _08087688 + bne @08087688 bl sub_8009F3C cmp r0, 0 - beq _08087688 + beq @08087688 movs r0, 0x1 - b _0808768A + b @0808768A .align 2, 0 .pool -_08087688: +@08087688: movs r0, 0 -_0808768A: +@0808768A: pop {r1} bx r1 thumb_func_end sub_808766C thumb_func_start sub_8087690 -sub_8087690: @ 8087690 +sub_8087690: ; 8087690 push {lr} ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - bne _080876B0 + bne @080876B0 ldr r0, =0x03003170 ldr r1, =0x00000339 adds r0, r1 ldrb r0, [r0] - b _080876B8 + b @080876B8 .align 2, 0 .pool -_080876B0: +@080876B0: ldr r0, =0x03005000 ldr r1, =0x00000c1a adds r0, r1 ldrb r0, [r0] -_080876B8: +@080876B8: pop {r1} bx r1 .align 2, 0 @@ -245349,14 +245349,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 @@ -245369,7 +245369,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 @@ -245379,7 +245379,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 @@ -245463,7 +245463,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 @@ -245496,7 +245496,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 @@ -245506,7 +245506,7 @@ sub_80877DC: @ 80877DC adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0 - beq _080877FE + beq @080877FE ldrb r0, [r1, 0x2] lsls r1, r0, 3 adds r1, r0 @@ -245514,7 +245514,7 @@ sub_80877DC: @ 80877DC ldr r0, =0x02037350 adds r1, r0 strb r2, [r1, 0x19] -_080877FE: +@080877FE: pop {r0} bx r0 .align 2, 0 @@ -245522,7 +245522,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 @@ -245536,7 +245536,7 @@ sub_808780C: @ 808780C adds r4, r0, r1 ldrb r0, [r4, 0x4] cmp r0, 0x40 - beq _08087838 + beq @08087838 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -245544,7 +245544,7 @@ sub_808780C: @ 808780C ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles -_08087838: +@08087838: movs r0, 0 strb r0, [r5] ldrb r1, [r4] @@ -245559,7 +245559,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 @@ -245577,7 +245577,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 @@ -245598,7 +245598,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 @@ -245616,7 +245616,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 @@ -245636,7 +245636,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 @@ -245658,7 +245658,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 @@ -245666,18 +245666,18 @@ sub_808790C: @ 808790C asrs r4, r0, 16 lsls r1, 16 asrs r3, r1, 16 -_0808791A: +@0808791A: lsls r0, r2, 2 adds r1, r0, r5 ldrb r0, [r1] cmp r0, 0 - beq _08087958 + beq @08087958 ldrb r0, [r1, 0x3] cmp r0, 0 - beq _0808792E + beq @0808792E cmp r0, 0x2 - bne _08087958 -_0808792E: + bne @08087958 +@0808792E: ldrb r1, [r1, 0x2] lsls r0, r1, 3 adds r0, r1 @@ -245687,30 +245687,30 @@ _0808792E: movs r6, 0x10 ldrsh r0, [r1, r6] cmp r0, r4 - bne _08087958 + bne @08087958 movs r6, 0x12 ldrsh r0, [r1, r6] cmp r0, r3 - bne _08087958 + bne @08087958 adds r0, r2, 0 - b _08087964 + b @08087964 .align 2, 0 .pool -_08087958: +@08087958: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls _0808791A + bls @0808791A movs r0, 0x4 -_08087964: +@08087964: pop {r4-r6} pop {r1} bx r1 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 @@ -245727,17 +245727,17 @@ sub_808796C: @ 808796C adds r6, r0, r1 ldrb r0, [r5] cmp r0, 0 - beq _080879C8 + beq @080879C8 cmp r3, 0xA - bls _080879A4 + bls @080879A4 ldrb r0, [r6] movs r1, 0x4 orrs r0, r1 strb r0, [r6] - b _080879C8 + b @080879C8 .align 2, 0 .pool -_080879A4: +@080879A4: ldr r4, =0x08339e00 ldr r1, =0x08339dc8 ldrb r0, [r5, 0x3] @@ -245754,7 +245754,7 @@ _080879A4: adds r0, r5, 0 adds r1, r6, 0 bl _call_via_r2 -_080879C8: +@080879C8: pop {r4-r6} pop {r0} bx r0 @@ -245763,7 +245763,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 @@ -245782,13 +245782,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 @@ -245807,13 +245807,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 @@ -245840,7 +245840,7 @@ sub_8087A20: @ 8087A20 bl npc_080587EC lsls r0, 24 cmp r0, 0 - bne _08087A7E + bne @08087A7E adds r1, r5, 0 adds r1, 0x21 movs r0, 0x10 @@ -245855,10 +245855,10 @@ sub_8087A20: @ 8087A20 adds r0, r5, 0 bl sub_8096DB8 movs r0, 0x1 - b _08087A80 -_08087A7E: + b @08087A80 +@08087A7E: movs r0, 0 -_08087A80: +@08087A80: add sp, 0x4 pop {r4-r6} pop {r1} @@ -245866,7 +245866,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 @@ -245881,14 +245881,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 @@ -245906,19 +245906,19 @@ sub_8087AA8: @ 8087AA8 bl numbers_move_direction ldrb r0, [r5] cmp r0, 0 - bne _08087AD8 + bne @08087AD8 adds r0, r4, 0 bl npc_coords_shift_still movs r0, 0x2 strb r0, [r6, 0x3] -_08087AD8: +@08087AD8: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_8087AA8 thumb_func_start npc_something3 -npc_something3: @ 8087AE0 +npc_something3: ; 8087AE0 push {lr} lsls r0, 24 lsrs r0, 24 @@ -245926,47 +245926,47 @@ npc_something3: @ 8087AE0 lsrs r2, r1, 24 subs r0, 0x1 cmp r0, 0x9 - bhi _08087B38 + bhi @08087B38 lsls r0, 2 - ldr r1, =_08087B00 + ldr r1, =@08087B00 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08087B00: - .4byte _08087B28 - .4byte _08087B2C - .4byte _08087B30 - .4byte _08087B34 - .4byte _08087B38 - .4byte _08087B38 - .4byte _08087B28 - .4byte _08087B2C - .4byte _08087B30 - .4byte _08087B34 -_08087B28: +@08087B00: + .4byte @08087B28 + .4byte @08087B2C + .4byte @08087B30 + .4byte @08087B34 + .4byte @08087B38 + .4byte @08087B38 + .4byte @08087B28 + .4byte @08087B2C + .4byte @08087B30 + .4byte @08087B34 +@08087B28: movs r0, 0x2 - b _08087B3A -_08087B2C: + b @08087B3A +@08087B2C: movs r0, 0x1 - b _08087B3A -_08087B30: + b @08087B3A +@08087B30: movs r0, 0x3 - b _08087B3A -_08087B34: + b @08087B3A +@08087B34: movs r0, 0x4 - b _08087B3A -_08087B38: + b @08087B3A +@08087B38: adds r0, r2, 0 -_08087B3A: +@08087B3A: pop {r1} bx r1 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 @@ -245985,13 +245985,13 @@ npc_080587EC: @ 8087B40 lsrs r2, r3, 16 mov r10, r2 asrs r6, r3, 16 -_08087B64: +@08087B64: mov r7, r12 lsls r3, r7, 16 mov r0, r10 lsls r5, r0, 16 cmp r4, r8 - beq _08087BA8 + beq @08087BA8 lsls r0, r4, 3 adds r0, r4 lsls r0, 2 @@ -246001,38 +246001,38 @@ _08087B64: ldrsh r0, [r1, r7] asrs r2, r3, 16 cmp r0, r2 - bne _08087B8C + bne @08087B8C movs r7, 0x12 ldrsh r0, [r1, r7] cmp r0, r6 - beq _08087B9E -_08087B8C: + beq @08087B9E +@08087B8C: movs r7, 0x14 ldrsh r0, [r1, r7] cmp r0, r2 - bne _08087BA8 + bne @08087BA8 movs r0, 0x16 ldrsh r1, [r1, r0] asrs r0, r5, 16 cmp r1, r0 - bne _08087BA8 -_08087B9E: + bne @08087BA8 +@08087B9E: movs r0, 0x1 - b _08087BBE + b @08087BBE .align 2, 0 .pool -_08087BA8: +@08087BA8: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bls _08087B64 + bls @08087B64 asrs r0, r3, 16 asrs r1, r5, 16 bl cur_mapdata_get_middle2bit_at lsls r0, 24 lsrs r0, 24 -_08087BBE: +@08087BBE: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -246043,7 +246043,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 @@ -246061,43 +246061,43 @@ sub_8087BCC: @ 8087BCC adds r4, r0, r1 ldrb r0, [r2] cmp r0, 0 - beq _08087C7A + beq @08087C7A subs r0, r3, 0x1 cmp r0, 0x4 - bhi _08087C56 + bhi @08087C56 lsls r0, 2 - ldr r1, =_08087C0C + ldr r1, =@08087C0C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08087C0C: - .4byte _08087C2C - .4byte _08087C2C - .4byte _08087C38 - .4byte _08087C20 - .4byte _08087C20 -_08087C20: +@08087C0C: + .4byte @08087C2C + .4byte @08087C2C + .4byte @08087C38 + .4byte @08087C20 + .4byte @08087C20 +@08087C20: ldrb r0, [r4] lsls r0, 30 lsrs r0, 31 bl sub_808BD6C - b _08087C44 -_08087C2C: + b @08087C44 +@08087C2C: ldrb r0, [r4] lsls r0, 30 lsrs r0, 31 bl sub_808BD7C - b _08087C44 -_08087C38: + b @08087C44 +@08087C38: ldrb r1, [r4] lsls r1, 30 lsrs r1, 31 movs r0, 0 bl sub_808BD3C -_08087C44: +@08087C44: lsls r0, 24 lsrs r0, 24 ldr r1, =sub_8087C8C + 1 @@ -246106,7 +246106,7 @@ _08087C44: movs r3, 0 bl sub_808DD68 strb r0, [r4, 0x4] -_08087C56: +@08087C56: ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -246125,7 +246125,7 @@ _08087C56: negs r0, r0 ands r0, r1 strb r0, [r4] -_08087C7A: +@08087C7A: add sp, 0x4 pop {r4,r5} pop {r0} @@ -246135,7 +246135,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 @@ -246172,7 +246172,7 @@ sub_8087C8C: @ 8087C8C strb r0, [r5, 0x5] ldrb r0, [r4, 0x3] cmp r0, 0 - bne _08087CF8 + bne @08087CF8 ldrb r0, [r6, 0x19] bl npc_direction_to_obj_anim_image_number adds r1, r0, 0 @@ -246180,10 +246180,10 @@ sub_8087C8C: @ 8087C8C lsrs r1, 24 adds r0, r5, 0 bl obj_anim_image_start - b _08087D0A + b @08087D0A .align 2, 0 .pool -_08087CF8: +@08087CF8: ldrb r0, [r6, 0x19] bl an_run_any__impl_pulse adds r1, r0, 0 @@ -246191,14 +246191,14 @@ _08087CF8: lsrs r1, 24 adds r0, r5, 0 bl obj_anim_image_start_if_different -_08087D0A: +@08087D0A: adds r0, r5, 0 movs r1, 0 bl sub_80979D4 ldrb r0, [r6] lsls r0, 29 cmp r0, 0 - bge _08087D3C + bge @08087D3C ldrh r0, [r5, 0x3C] movs r1, 0x4 ands r1, r0 @@ -246216,14 +246216,14 @@ _08087D0A: ldrh r0, [r5, 0x3C] adds r0, 0x1 strh r0, [r5, 0x3C] -_08087D3C: +@08087D3C: pop {r4-r6} pop {r0} bx r0 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] @@ -246234,7 +246234,7 @@ mapconnection_get_mapheader: @ 8087D44 thumb_func_end mapconnection_get_mapheader thumb_func_start sub_8087D54 -sub_8087D54: @ 8087D54 +sub_8087D54: ; 8087D54 push {r4,lr} ldr r4, =0x02037318 adds r0, r4, 0 @@ -246250,7 +246250,7 @@ sub_8087D54: @ 8087D54 thumb_func_end sub_8087D54 thumb_func_start sub_8087D74 -sub_8087D74: @ 8087D74 +sub_8087D74: ; 8087D74 push {r4,lr} ldr r4, =0x02037318 adds r0, r4, 0 @@ -246273,7 +246273,7 @@ sub_8087D74: @ 8087D74 thumb_func_end sub_8087D74 thumb_func_start sub_8087DAC -sub_8087DAC: @ 8087DAC +sub_8087DAC: ; 8087DAC push {r4,r5,lr} sub sp, 0x4 adds r4, r0, 0 @@ -246298,7 +246298,7 @@ sub_8087DAC: @ 8087DAC thumb_func_end sub_8087DAC thumb_func_start sub_8087DE4 -sub_8087DE4: @ 8087DE4 +sub_8087DE4: ; 8087DE4 push {r4,lr} sub sp, 0x4 ldr r0, =0x03ff03ff @@ -246319,7 +246319,7 @@ sub_8087DE4: @ 8087DE4 thumb_func_end sub_8087DE4 thumb_func_start mapheader_copy_mapdata_with_padding -mapheader_copy_mapdata_with_padding: @ 8087E14 +mapheader_copy_mapdata_with_padding: ; 8087E14 push {r4-r6,lr} sub sp, 0x4 adds r6, r0, 0 @@ -246343,14 +246343,14 @@ mapheader_copy_mapdata_with_padding: @ 8087E14 movs r0, 0xA0 lsls r0, 6 cmp r1, r0 - bgt _08087E56 + bgt @08087E56 ldr r0, [r5, 0xC] ldrh r1, [r5] ldrh r2, [r5, 0x4] bl map_copy_with_padding adds r0, r6, 0 bl mapheader_copy_mapdata_of_adjacent_maps -_08087E56: +@08087E56: add sp, 0x4 pop {r4-r6} pop {r0} @@ -246360,8 +246360,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 @@ -246381,14 +246381,14 @@ map_copy_with_padding: @ 8087E70 adds r0, 0xE adds r4, r0 cmp r2, 0 - beq _08087EB8 + beq @08087EB8 mov r0, r8 lsls r6, r0, 1 adds r5, r2, 0 movs r0, 0x1E adds r0, r6 mov r9, r0 -_08087EA4: +@08087EA4: adds r0, r7, 0 adds r1, r4, 0 mov r2, r8 @@ -246397,8 +246397,8 @@ _08087EA4: adds r7, r6 subs r5, 0x1 cmp r5, 0 - bne _08087EA4 -_08087EB8: + bne @08087EA4 +@08087EB8: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -246410,12 +246410,12 @@ _08087EB8: thumb_func_end map_copy_with_padding thumb_func_start mapheader_copy_mapdata_of_adjacent_maps -mapheader_copy_mapdata_of_adjacent_maps: @ 8087EC8 +mapheader_copy_mapdata_of_adjacent_maps: ; 8087EC8 push {r4-r7,lr} adds r6, r0, 0 ldr r0, [r6, 0xC] cmp r0, 0 - beq _08087F4C + beq @08087F4C ldr r1, [r0] ldr r5, [r0, 0x4] ldr r2, =0x02037340 @@ -246423,69 +246423,69 @@ mapheader_copy_mapdata_of_adjacent_maps: @ 8087EC8 ldr r0, [r0] str r0, [r2] cmp r1, 0 - ble _08087F4C + ble @08087F4C adds r4, r2, 0 adds r7, r1, 0 -_08087EE6: +@08087EE6: adds r0, r5, 0 bl mapconnection_get_mapheader adds r1, r0, 0 ldr r2, [r5, 0x4] ldrb r0, [r5] cmp r0, 0x2 - beq _08087F1E + beq @08087F1E cmp r0, 0x2 - bgt _08087F08 + bgt @08087F08 cmp r0, 0x1 - beq _08087F12 - b _08087F44 + beq @08087F12 + b @08087F44 .align 2, 0 .pool -_08087F08: +@08087F08: cmp r0, 0x3 - beq _08087F2A + beq @08087F2A cmp r0, 0x4 - beq _08087F36 - b _08087F44 -_08087F12: + beq @08087F36 + b @08087F44 +@08087F12: adds r0, r6, 0 bl sub_8087FB8 ldrb r0, [r4] movs r1, 0x1 - b _08087F40 -_08087F1E: + b @08087F40 +@08087F1E: adds r0, r6, 0 bl sub_8088020 ldrb r0, [r4] movs r1, 0x2 - b _08087F40 -_08087F2A: + b @08087F40 +@08087F2A: adds r0, r6, 0 bl sub_8088080 ldrb r0, [r4] movs r1, 0x4 - b _08087F40 -_08087F36: + b @08087F40 +@08087F36: adds r0, r6, 0 bl sub_80880E0 ldrb r0, [r4] movs r1, 0x8 -_08087F40: +@08087F40: orrs r0, r1 strb r0, [r4] -_08087F44: +@08087F44: subs r7, 0x1 adds r5, 0xC cmp r7, 0 - bne _08087EE6 -_08087F4C: + bne @08087EE6 +@08087F4C: pop {r4-r7} pop {r0} bx r0 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} @@ -246507,11 +246507,11 @@ sub_8087F54: @ 8087F54 adds r5, r0, r1 ldr r0, [sp, 0x20] cmp r0, 0 - ble _08087FA6 + ble @08087FA6 adds r4, r0, 0 ldr r3, =0x001fffff mov r8, r3 -_08087F86: +@08087F86: adds r0, r6, 0 adds r1, r5, 0 ldr r2, [sp, 0x1C] @@ -246526,8 +246526,8 @@ _08087F86: adds r6, r0 subs r4, 0x1 cmp r4, 0 - bne _08087F86 -_08087FA6: + bne @08087F86 +@08087FA6: pop {r3} mov r8, r3 pop {r4-r7} @@ -246538,13 +246538,13 @@ _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 adds r5, r1, 0 cmp r5, 0 - beq _08088012 + beq @08088012 ldr r0, [r5] ldr r4, [r0] adds r2, 0x7 @@ -246552,29 +246552,29 @@ sub_8087FB8: @ 8087FB8 ldr r0, [r0, 0x4] adds r7, r0, 0x7 cmp r2, 0 - bge _08087FEC + bge @08087FEC negs r6, r2 adds r2, r4 ldr r0, =0x03005dc0 ldr r3, [r0] cmp r2, r3 - bge _08087FE2 + bge @08087FE2 adds r3, r2, 0 -_08087FE2: +@08087FE2: movs r2, 0 - b _08087FFC + b @08087FFC .align 2, 0 .pool -_08087FEC: +@08087FEC: movs r6, 0 adds r0, r2, r4 ldr r1, =0x03005dc0 ldr r1, [r1] subs r3, r1, r2 cmp r0, r1 - bge _08087FFC + bge @08087FFC adds r3, r4, 0 -_08087FFC: +@08087FFC: movs r0, 0 str r0, [sp] str r3, [sp, 0x4] @@ -246585,7 +246585,7 @@ _08087FFC: adds r2, r5, 0 adds r3, r6, 0 bl sub_8087F54 -_08088012: +@08088012: add sp, 0xC pop {r4-r7} pop {r0} @@ -246595,41 +246595,41 @@ _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 cmp r5, 0 - beq _08088074 + beq @08088074 ldr r0, [r5] ldr r4, [r0] ldr r0, [r0, 0x4] adds r2, 0x7 subs r7, r0, 0x7 cmp r2, 0 - bge _08088050 + bge @08088050 negs r6, r2 adds r2, r4 ldr r0, =0x03005dc0 ldr r3, [r0] cmp r2, r3 - bge _08088046 + bge @08088046 adds r3, r2, 0 -_08088046: +@08088046: movs r2, 0 - b _08088060 + b @08088060 .align 2, 0 .pool -_08088050: +@08088050: movs r6, 0 adds r0, r2, r4 ldr r1, =0x03005dc0 ldr r1, [r1] subs r3, r1, r2 cmp r0, r1 - bge _08088060 + bge @08088060 adds r3, r4, 0 -_08088060: +@08088060: str r7, [sp] str r3, [sp, 0x4] movs r0, 0x7 @@ -246639,7 +246639,7 @@ _08088060: adds r2, r5, 0 adds r3, r6, 0 bl sub_8087F54 -_08088074: +@08088074: add sp, 0xC pop {r4-r7} pop {r0} @@ -246649,41 +246649,41 @@ _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 cmp r5, 0 - beq _080880D4 + beq @080880D4 ldr r0, [r5] ldr r1, [r0] ldr r4, [r0, 0x4] adds r2, 0x7 subs r7, r1, 0x7 cmp r2, 0 - bge _080880B0 + bge @080880B0 negs r6, r2 adds r1, r2, r4 ldr r0, =0x03005dc0 ldr r3, [r0, 0x4] cmp r1, r3 - bge _080880A6 + bge @080880A6 adds r3, r1, 0 -_080880A6: +@080880A6: movs r2, 0 - b _080880C0 + b @080880C0 .align 2, 0 .pool -_080880B0: +@080880B0: movs r6, 0 adds r0, r2, r4 ldr r1, =0x03005dc0 ldr r1, [r1, 0x4] subs r3, r1, r2 cmp r0, r1 - bge _080880C0 + bge @080880C0 adds r3, r4, 0 -_080880C0: +@080880C0: str r6, [sp] movs r0, 0x7 str r0, [sp, 0x4] @@ -246693,7 +246693,7 @@ _080880C0: adds r2, r5, 0 adds r3, r7, 0 bl sub_8087F54 -_080880D4: +@080880D4: add sp, 0xC pop {r4-r7} pop {r0} @@ -246703,13 +246703,13 @@ _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 adds r5, r1, 0 cmp r5, 0 - beq _08088138 + beq @08088138 ldr r0, [r5] ldr r4, [r0, 0x4] ldr r0, [r3] @@ -246717,29 +246717,29 @@ sub_80880E0: @ 80880E0 adds r7, r0, 0x7 adds r2, 0x7 cmp r2, 0 - bge _08088114 + bge @08088114 negs r6, r2 adds r1, r2, r4 ldr r0, =0x03005dc0 ldr r3, [r0, 0x4] cmp r1, r3 - bge _0808810A + bge @0808810A adds r3, r1, 0 -_0808810A: +@0808810A: movs r2, 0 - b _08088124 + b @08088124 .align 2, 0 .pool -_08088114: +@08088114: movs r6, 0 adds r0, r2, r4 ldr r1, =0x03005dc0 ldr r1, [r1, 0x4] subs r3, r1, r2 cmp r0, r1 - bge _08088124 + bge @08088124 adds r3, r4, 0 -_08088124: +@08088124: str r6, [sp] movs r0, 0x8 str r0, [sp, 0x4] @@ -246749,7 +246749,7 @@ _08088124: adds r2, r5, 0 movs r3, 0 bl sub_8087F54 -_08088138: +@08088138: add sp, 0xC pop {r4-r7} pop {r0} @@ -246759,21 +246759,21 @@ _08088138: thumb_func_end sub_80880E0 thumb_func_start cur_mapdata_get_upper4bit_at -cur_mapdata_get_upper4bit_at: @ 8088144 +cur_mapdata_get_upper4bit_at: ; 8088144 push {r4,lr} adds r2, r0, 0 adds r4, r1, 0 cmp r2, 0 - blt _08088174 + blt @08088174 ldr r1, =0x03005dc0 ldr r3, [r1] cmp r2, r3 - bge _08088174 + bge @08088174 cmp r4, 0 - blt _08088174 + blt @08088174 ldr r0, [r1, 0x4] cmp r4, r0 - bge _08088174 + bge @08088174 adds r0, r3, 0 muls r0, r4 adds r0, r2, r0 @@ -246781,10 +246781,10 @@ cur_mapdata_get_upper4bit_at: @ 8088144 lsls r0, 1 adds r0, r1 ldrh r1, [r0] - b _08088196 + b @08088196 .align 2, 0 .pool -_08088174: +@08088174: ldr r0, =0x02037318 ldr r3, [r0] adds r1, r2, 0x1 @@ -246802,38 +246802,38 @@ _08088174: lsls r2, 4 adds r0, r2, 0 orrs r1, r0 -_08088196: +@08088196: ldr r0, =0x000003ff cmp r1, r0 - beq _080881A8 + beq @080881A8 lsrs r0, r1, 12 - b _080881AA + b @080881AA .align 2, 0 .pool -_080881A8: +@080881A8: movs r0, 0 -_080881AA: +@080881AA: pop {r4} pop {r1} bx r1 thumb_func_end cur_mapdata_get_upper4bit_at thumb_func_start cur_mapdata_get_middle2bit_at -cur_mapdata_get_middle2bit_at: @ 80881B0 +cur_mapdata_get_middle2bit_at: ; 80881B0 push {r4,lr} adds r2, r0, 0 adds r4, r1, 0 cmp r2, 0 - blt _080881E0 + blt @080881E0 ldr r1, =0x03005dc0 ldr r3, [r1] cmp r2, r3 - bge _080881E0 + bge @080881E0 cmp r4, 0 - blt _080881E0 + blt @080881E0 ldr r0, [r1, 0x4] cmp r4, r0 - bge _080881E0 + bge @080881E0 adds r0, r3, 0 muls r0, r4 adds r0, r2, r0 @@ -246841,10 +246841,10 @@ cur_mapdata_get_middle2bit_at: @ 80881B0 lsls r0, 1 adds r0, r1 ldrh r1, [r0] - b _08088202 + b @08088202 .align 2, 0 .pool -_080881E0: +@080881E0: ldr r0, =0x02037318 ldr r3, [r0] adds r1, r2, 0x1 @@ -246862,42 +246862,42 @@ _080881E0: lsls r2, 4 adds r0, r2, 0 orrs r1, r0 -_08088202: +@08088202: ldr r0, =0x000003ff cmp r1, r0 - beq _0808821C + beq @0808821C movs r0, 0xC0 lsls r0, 4 ands r1, r0 lsrs r0, r1, 10 - b _0808821E + b @0808821E .align 2, 0 .pool -_0808821C: +@0808821C: movs r0, 0x1 -_0808821E: +@0808821E: pop {r4} pop {r1} bx r1 thumb_func_end cur_mapdata_get_middle2bit_at thumb_func_start cur_mapdata_get_blockid_at -@ int cur_mapdata_get_blockid_at(int x, int y) -cur_mapdata_get_blockid_at: @ 8088224 +; int cur_mapdata_get_blockid_at(int x, int y) +cur_mapdata_get_blockid_at: ; 8088224 push {r4-r6,lr} adds r5, r0, 0 adds r6, r1, 0 cmp r5, 0 - blt _08088254 + blt @08088254 ldr r1, =0x03005dc0 ldr r2, [r1] cmp r5, r2 - bge _08088254 + bge @08088254 cmp r6, 0 - blt _08088254 + blt @08088254 ldr r0, [r1, 0x4] cmp r6, r0 - bge _08088254 + bge @08088254 adds r0, r2, 0 muls r0, r6 adds r0, r5, r0 @@ -246905,10 +246905,10 @@ cur_mapdata_get_blockid_at: @ 8088224 lsls r0, 1 adds r0, r1 ldrh r4, [r0] - b _08088278 + b @08088278 .align 2, 0 .pool -_08088254: +@08088254: ldr r0, =0x02037318 ldr r3, [r0] adds r1, r5, 0x1 @@ -246927,16 +246927,16 @@ _08088254: adds r0, r2, 0 adds r4, r0, 0 orrs r4, r1 -_08088278: +@08088278: ldr r0, =0x000003ff cmp r4, r0 - beq _0808828C + beq @0808828C ands r4, r0 adds r0, r4, 0 - b _080882B0 + b @080882B0 .align 2, 0 .pool -_0808828C: +@0808828C: ldr r0, =0x02037318 ldr r3, [r0] adds r1, r5, 0x1 @@ -246955,7 +246955,7 @@ _0808828C: adds r1, r2, 0 orrs r0, r1 ands r0, r4 -_080882B0: +@080882B0: pop {r4-r6} pop {r1} bx r1 @@ -246964,8 +246964,8 @@ _080882B0: thumb_func_end cur_mapdata_get_blockid_at thumb_func_start cur_mapdata_block_get_role_at -@ int cur_mapdata_block_get_role_at(int x, int y) -cur_mapdata_block_get_role_at: @ 80882BC +; int cur_mapdata_block_get_role_at(int x, int y) +cur_mapdata_block_get_role_at: ; 80882BC push {lr} bl cur_mapdata_get_blockid_at lsls r0, 16 @@ -246979,8 +246979,8 @@ cur_mapdata_block_get_role_at: @ 80882BC thumb_func_end cur_mapdata_block_get_role_at thumb_func_start cur_mapdata_block_get_bgs_at -@ int cur_mapdata_block_get_bgs_at(int x, int y) -cur_mapdata_block_get_bgs_at: @ 80882D4 +; int cur_mapdata_block_get_bgs_at(int x, int y) +cur_mapdata_block_get_bgs_at: ; 80882D4 push {lr} bl cur_mapdata_get_blockid_at lsls r0, 16 @@ -246996,22 +246996,22 @@ cur_mapdata_block_get_bgs_at: @ 80882D4 thumb_func_end cur_mapdata_block_get_bgs_at thumb_func_start setmaptile_0 -setmaptile_0: @ 80882F0 +setmaptile_0: ; 80882F0 push {r4,r5,lr} adds r3, r0, 0 lsls r2, 16 lsrs r5, r2, 16 cmp r3, 0 - blt _08088328 + blt @08088328 ldr r2, =0x03005dc0 ldr r4, [r2] cmp r3, r4 - bge _08088328 + bge @08088328 cmp r1, 0 - blt _08088328 + blt @08088328 ldr r0, [r2, 0x4] cmp r1, r0 - bge _08088328 + bge @08088328 muls r1, r4 adds r1, r3, r1 ldr r0, [r2, 0x8] @@ -247025,7 +247025,7 @@ setmaptile_0: @ 80882F0 ands r0, r5 orrs r2, r0 strh r2, [r1] -_08088328: +@08088328: pop {r4,r5} pop {r0} bx r0 @@ -247034,22 +247034,22 @@ _08088328: thumb_func_end setmaptile_0 thumb_func_start sub_8088338 -sub_8088338: @ 8088338 +sub_8088338: ; 8088338 push {r4,r5,lr} adds r3, r0, 0 lsls r2, 16 lsrs r5, r2, 16 cmp r3, 0 - blt _08088364 + blt @08088364 ldr r2, =0x03005dc0 ldr r4, [r2] cmp r3, r4 - bge _08088364 + bge @08088364 cmp r1, 0 - blt _08088364 + blt @08088364 ldr r0, [r2, 0x4] cmp r1, r0 - bge _08088364 + bge @08088364 adds r0, r4, 0 muls r0, r1 adds r0, r3, r0 @@ -247057,7 +247057,7 @@ sub_8088338: @ 8088338 lsls r0, 1 adds r0, r1 strh r5, [r0] -_08088364: +@08088364: pop {r4,r5} pop {r0} bx r0 @@ -247066,32 +247066,32 @@ _08088364: thumb_func_end sub_8088338 thumb_func_start cur_mapdata_get_behaviour_by_blockid -@ int cur_mapdata_get_behaviour_by_blockid(u16 block_id) -cur_mapdata_get_behaviour_by_blockid: @ 8088370 +; int cur_mapdata_get_behaviour_by_blockid(u16 block_id) +cur_mapdata_get_behaviour_by_blockid: ; 8088370 push {lr} lsls r0, 16 lsrs r2, r0, 16 adds r3, r2, 0 ldr r0, =0x000001ff cmp r2, r0 - bhi _08088394 + bhi @08088394 ldr r0, =0x02037318 ldr r0, [r0] ldr r0, [r0, 0x10] ldr r1, [r0, 0x10] lsls r0, r2, 1 - b _080883B2 + b @080883B2 .align 2, 0 .pool -_08088394: +@08088394: ldr r0, =0x000003ff cmp r2, r0 - bls _080883A4 + bls @080883A4 movs r0, 0xFF - b _080883B6 + b @080883B6 .align 2, 0 .pool -_080883A4: +@080883A4: ldr r0, =0x02037318 ldr r0, [r0] ldr r0, [r0, 0x14] @@ -247099,10 +247099,10 @@ _080883A4: lsls r0, r3, 1 adds r0, r1 ldr r1, =0xfffffc00 -_080883B2: +@080883B2: adds r0, r1 ldrh r0, [r0] -_080883B6: +@080883B6: pop {r1} bx r1 .align 2, 0 @@ -247110,7 +247110,7 @@ _080883B6: thumb_func_end cur_mapdata_get_behaviour_by_blockid thumb_func_start save_serialize_map -save_serialize_map: @ 80883C4 +save_serialize_map: ; 80883C4 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -247129,18 +247129,18 @@ save_serialize_map: @ 80883C4 adds r1, r0, 0 adds r1, 0xE cmp r0, r1 - bge _08088420 + bge @08088420 mov r12, r1 ldr r1, =0x02032318 mov r9, r1 lsls r7, r6, 1 -_080883F2: +@080883F2: adds r1, r6, 0 adds r3, r1, 0 adds r3, 0xF adds r5, r0, 0x1 cmp r1, r3 - bge _0808841A + bge @0808841A mov r2, r8 muls r2, r0 adds r0, r2, 0 @@ -247148,19 +247148,19 @@ _080883F2: add r0, r9 adds r2, r7, r0 subs r1, r3, r1 -_0808840C: +@0808840C: ldrh r0, [r2] strh r0, [r4] adds r4, 0x2 adds r2, 0x2 subs r1, 0x1 cmp r1, 0 - bne _0808840C -_0808841A: + bne @0808840C +@0808841A: adds r0, r5, 0 cmp r0, r12 - blt _080883F2 -_08088420: + blt @080883F2 +@08088420: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -247172,7 +247172,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 @@ -247181,7 +247181,7 @@ sub_8088438: @ 8088438 adds r3, r0, 0 adds r3, 0x34 ldr r4, =0x000001ff -_08088448: +@08088448: lsls r0, r1, 1 adds r0, r3, r0 ldrh r0, [r0] @@ -247190,23 +247190,23 @@ _08088448: lsls r0, 16 lsrs r1, r0, 16 cmp r1, r4 - bls _08088448 + bls @08088448 cmp r2, 0 - beq _0808846C + beq @0808846C movs r0, 0 - b _0808846E + b @0808846E .align 2, 0 .pool -_0808846C: +@0808846C: movs r0, 0x1 -_0808846E: +@0808846E: pop {r4} pop {r1} bx r1 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 @@ -247226,7 +247226,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 @@ -247239,7 +247239,7 @@ mapdata_from_sav2: @ 808849C adds r7, 0x34 bl sub_8088438 cmp r0, 0 - bne _080885AC + bne @080885AC ldr r0, =0x03005dc0 ldr r0, [r0] str r0, [sp] @@ -247254,33 +247254,33 @@ mapdata_from_sav2: @ 808849C adds r0, r6, 0 adds r0, 0xE cmp r6, r0 - bge _0808855A -_080884D6: + bge @0808855A +@080884D6: cmp r6, r8 - bne _080884EC + bne @080884EC cmp r6, 0 - beq _080884EC + beq @080884EC movs r0, 0 mov r9, r0 - b _08088508 + b @08088508 .align 2, 0 .pool -_080884EC: +@080884EC: mov r0, r8 adds r0, 0xD movs r1, 0xFF mov r9, r1 cmp r6, r0 - bne _08088508 + bne @08088508 ldr r0, =0x02037318 ldr r0, [r0] ldr r0, [r0, 0x4] subs r0, 0x1 cmp r6, r0 - beq _08088508 + beq @08088508 movs r2, 0x1 mov r9, r2 -_08088508: +@08088508: mov r5, r10 adds r0, r5, 0 adds r0, 0xF @@ -247290,10 +247290,10 @@ _08088508: adds r2, r6, 0x1 str r2, [sp, 0x4] cmp r5, r0 - bge _08088552 + bge @08088552 ldr r0, [sp] lsls r3, r0, 16 -_08088520: +@08088520: ldr r1, [sp] adds r0, r1, 0 muls r0, r6 @@ -247309,27 +247309,27 @@ _08088520: lsls r0, 24 ldr r3, [sp, 0xC] cmp r0, 0 - bne _08088546 + bne @08088546 ldrh r0, [r7] strh r0, [r4] -_08088546: +@08088546: adds r7, 0x2 adds r5, 0x1 mov r0, r10 adds r0, 0xF cmp r5, r0 - blt _08088520 -_08088552: + blt @08088520 +@08088552: ldr r6, [sp, 0x4] ldr r2, [sp, 0x8] cmp r6, r2 - blt _080884D6 -_0808855A: + blt @080884D6 +@0808855A: mov r5, r10 adds r0, r5, 0 adds r0, 0xF cmp r5, r0 - bge _080885A8 + bge @080885A8 mov r0, r8 subs r0, 0x1 lsls r0, 16 @@ -247338,25 +247338,25 @@ _0808855A: mov r0, r8 adds r0, 0xD lsls r7, r0, 16 -_08088574: +@08088574: mov r0, r8 cmp r0, 0 - beq _08088584 + beq @08088584 asrs r0, r4, 16 mov r2, r9 asrs r1, r2, 16 bl sub_80D423C -_08088584: +@08088584: ldr r0, =0x02037318 ldr r0, [r0] ldr r0, [r0, 0x4] subs r0, 0x1 cmp r6, r0 - bge _08088598 + bge @08088598 asrs r0, r4, 16 asrs r1, r7, 16 bl task00_bag_acit_10 -_08088598: +@08088598: movs r0, 0x80 lsls r0, 9 adds r4, r0 @@ -247364,10 +247364,10 @@ _08088598: mov r0, r10 adds r0, 0xF cmp r5, r0 - blt _08088574 -_080885A8: + blt @08088574 +@080885A8: bl sav2_mapdata_clear -_080885AC: +@080885AC: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -247381,7 +247381,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 @@ -247411,51 +247411,51 @@ sub_80885C4: @ 80885C4 movs r6, 0xE mov r12, r6 cmp r3, 0x2 - beq _0808861E + beq @0808861E cmp r3, 0x2 - bgt _08088614 + bgt @08088614 cmp r3, 0x1 - beq _08088626 - b _0808863E + beq @08088626 + b @0808863E .align 2, 0 .pool -_08088614: +@08088614: cmp r2, 0x3 - beq _08088630 + beq @08088630 cmp r2, 0x4 - beq _08088638 - b _0808863E -_0808861E: + beq @08088638 + b @0808863E +@0808861E: adds r5, 0x1 movs r0, 0xD mov r12, r0 - b _0808863E -_08088626: + b @0808863E +@08088626: movs r1, 0x1 mov r8, r1 movs r3, 0xD mov r12, r3 - b _0808863E -_08088630: + b @0808863E +@08088630: ldr r4, [sp, 0x8] adds r4, 0x1 str r4, [sp, 0x8] - b _0808863C -_08088638: + b @0808863C +@08088638: movs r6, 0x1 mov r9, r6 -_0808863C: +@0808863C: movs r7, 0xE -_0808863E: +@0808863E: movs r1, 0 cmp r1, r12 - bge _08088682 + bge @08088682 ldr r0, =0x02032318 mov r10, r0 -_08088648: +@08088648: adds r4, r1, 0x1 cmp r7, 0 - beq _0808867C + beq @0808867C adds r0, r1, r5 ldr r3, [sp] adds r2, r3, 0 @@ -247472,19 +247472,19 @@ _08088648: lsls r0, 1 ldr r6, [sp, 0x4] adds r1, r0, r6 -_0808866E: +@0808866E: ldrh r0, [r1] strh r0, [r2] adds r1, 0x2 adds r2, 0x2 subs r3, 0x1 cmp r3, 0 - bne _0808866E -_0808867C: + bne @0808866E +@0808867C: adds r1, r4, 0 cmp r1, r12 - blt _08088648 -_08088682: + blt @08088648 +@08088682: bl sav2_mapdata_clear add sp, 0xC pop {r3-r5} @@ -247499,21 +247499,21 @@ _08088682: thumb_func_end sub_80885C4 thumb_func_start mapborder_visible_from_position -mapborder_visible_from_position: @ 808869C +mapborder_visible_from_position: ; 808869C push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 cmp r4, 0 - blt _080886D8 + blt @080886D8 ldr r1, =0x03005dc0 ldr r2, [r1] cmp r4, r2 - bge _080886D8 + bge @080886D8 cmp r5, 0 - blt _080886D8 + blt @080886D8 ldr r0, [r1, 0x4] cmp r5, r0 - bge _080886D8 + bge @080886D8 adds r0, r2, 0 muls r0, r5 adds r0, r4, r0 @@ -247523,11 +247523,11 @@ mapborder_visible_from_position: @ 808869C ldrh r1, [r0] ldr r0, =0x000003ff cmp r1, r0 - beq _08088770 - b _08088700 + beq @08088770 + b @08088700 .align 2, 0 .pool -_080886D8: +@080886D8: ldr r0, =0x02037318 ldr r3, [r0] adds r1, r4, 0x1 @@ -247547,79 +247547,79 @@ _080886D8: orrs r0, r1 ldr r1, =0x000003ff cmp r0, r1 - beq _08088770 -_08088700: + beq @08088770 +@08088700: ldr r1, =0x03005dc0 ldr r0, [r1] subs r0, 0x8 cmp r4, r0 - blt _0808872C + blt @0808872C ldr r0, =0x02037340 ldrb r1, [r0] movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _08088770 + beq @08088770 movs r0, 0x4 - b _08088782 + b @08088782 .align 2, 0 .pool -_0808872C: +@0808872C: cmp r4, 0x6 - bgt _08088744 + bgt @08088744 ldr r0, =0x02037340 ldrb r1, [r0] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08088770 + beq @08088770 movs r0, 0x3 - b _08088782 + b @08088782 .align 2, 0 .pool -_08088744: +@08088744: ldr r0, [r1, 0x4] subs r0, 0x7 cmp r5, r0 - blt _08088760 + blt @08088760 ldr r0, =0x02037340 ldrb r1, [r0] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08088770 + beq @08088770 movs r0, 0x1 - b _08088782 + b @08088782 .align 2, 0 .pool -_08088760: +@08088760: cmp r5, 0x6 - bgt _08088780 + bgt @08088780 ldr r0, =0x02037340 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _0808877C -_08088770: + bne @0808877C +@08088770: movs r0, 0x1 negs r0, r0 - b _08088782 + b @08088782 .align 2, 0 .pool -_0808877C: +@0808877C: movs r0, 0x2 - b _08088782 -_08088780: + b @08088782 +@08088780: movs r0, 0 -_08088782: +@08088782: pop {r4,r5} pop {r1} bx r1 thumb_func_end mapborder_visible_from_position thumb_func_start sub_8088788 -sub_8088788: @ 8088788 +sub_8088788: ; 8088788 push {r4,lr} adds r3, r1, 0 ldr r1, =0x03005d8c @@ -247642,7 +247642,7 @@ sub_8088788: @ 8088788 thumb_func_end sub_8088788 thumb_func_start sub_80887B0 -sub_80887B0: @ 80887B0 +sub_80887B0: ; 80887B0 push {r4,r5,lr} ldr r1, =0x03005d8c ldr r4, [r1] @@ -247666,21 +247666,21 @@ sub_80887B0: @ 80887B0 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080887F0 + beq @080887F0 movs r0, 0x1 - b _080887F2 + b @080887F2 .align 2, 0 .pool -_080887F0: +@080887F0: movs r0, 0 -_080887F2: +@080887F2: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_80887B0 thumb_func_start sub_80887F8 -sub_80887F8: @ 80887F8 +sub_80887F8: ; 80887F8 push {r4-r7,lr} adds r5, r0, 0 adds r4, r1, 0 @@ -247689,17 +247689,17 @@ sub_80887F8: @ 80887F8 bl mapconnection_get_mapheader adds r3, r0, 0 cmp r4, 0x2 - beq _08088860 + beq @08088860 cmp r4, 0x2 - bgt _08088816 + bgt @08088816 cmp r4, 0x1 - beq _0808884C - b _08088872 -_08088816: + beq @0808884C + b @08088872 +@08088816: cmp r4, 0x3 - beq _08088834 + beq @08088834 cmp r4, 0x4 - bne _08088872 + bne @08088872 ldr r0, =0x03005d8c ldr r1, [r0] negs r0, r6 @@ -247707,10 +247707,10 @@ _08088816: ldr r2, [r5, 0x4] ldrh r0, [r1, 0x2] subs r0, r2 - b _08088870 + b @08088870 .align 2, 0 .pool -_08088834: +@08088834: ldr r0, =0x03005d8c ldr r1, [r0] ldr r0, [r3] @@ -247719,10 +247719,10 @@ _08088834: ldr r2, [r5, 0x4] ldrh r0, [r1, 0x2] subs r0, r2 - b _08088870 + b @08088870 .align 2, 0 .pool -_0808884C: +@0808884C: ldr r0, =0x03005d8c ldr r1, [r0] ldr r2, [r5, 0x4] @@ -247730,10 +247730,10 @@ _0808884C: subs r0, r2 strh r0, [r1] negs r0, r7 - b _08088870 + b @08088870 .align 2, 0 .pool -_08088860: +@08088860: ldr r0, =0x03005d8c ldr r1, [r0] ldr r2, [r5, 0x4] @@ -247742,9 +247742,9 @@ _08088860: strh r0, [r1] ldr r0, [r3] ldr r0, [r0, 0x4] -_08088870: +@08088870: strh r0, [r1, 0x2] -_08088872: +@08088872: pop {r4-r7} pop {r0} bx r0 @@ -247753,7 +247753,7 @@ _08088872: thumb_func_end sub_80887F8 thumb_func_start camera_move_maybe -camera_move_maybe: @ 808887C +camera_move_maybe: ; 808887C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -247774,7 +247774,7 @@ camera_move_maybe: @ 808887C adds r7, r0, 0 adds r0, r7, 0x1 cmp r0, 0x1 - bhi _080888C4 + bhi @080888C4 ldr r0, =0x03005d8c ldr r1, [r0] ldrh r0, [r1] @@ -247783,10 +247783,10 @@ camera_move_maybe: @ 808887C ldrh r0, [r1, 0x2] add r0, r9 strh r0, [r1, 0x2] - b _08088932 + b @08088932 .align 2, 0 .pool -_080888C4: +@080888C4: bl save_serialize_map bl sub_81BE72C ldr r1, =0x03005d8c @@ -247836,7 +247836,7 @@ _080888C4: strh r0, [r1, 0x2] mov r0, r8 bl sub_80885C4 -_08088932: +@08088932: ldr r0, =0x02037334 ldrb r0, [r0] lsls r0, 31 @@ -247853,7 +247853,7 @@ _08088932: thumb_func_end camera_move_maybe thumb_func_start sub_8088950 -sub_8088950: @ 8088950 +sub_8088950: ; 8088950 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -247868,11 +247868,11 @@ sub_8088950: @ 8088950 ldr r4, [r0, 0x4] movs r5, 0 cmp r5, r7 - bge _08088998 -_0808896E: + bge @08088998 +@0808896E: ldrb r0, [r4] cmp r0, r6 - bne _08088990 + bne @08088990 adds r0, r6, 0 mov r1, r9 mov r2, r8 @@ -247881,19 +247881,19 @@ _0808896E: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08088990 + bne @08088990 adds r0, r4, 0 - b _0808899A + b @0808899A .align 2, 0 .pool -_08088990: +@08088990: adds r5, 0x1 adds r4, 0xC cmp r5, r7 - blt _0808896E -_08088998: + blt @0808896E +@08088998: movs r0, 0 -_0808899A: +@0808899A: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -247903,7 +247903,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} @@ -247917,9 +247917,9 @@ sub_80889A8: @ 80889A8 bl mapconnection_get_mapheader adds r2, r0, 0 cmp r4, 0x1 - blt _08088A00 + blt @08088A00 cmp r4, 0x2 - bgt _080889E0 + bgt @080889E0 ldr r0, =0x02037318 ldr r0, [r0] ldr r1, [r0] @@ -247927,12 +247927,12 @@ sub_80889A8: @ 80889A8 ldr r2, [r0] ldr r3, [r5, 0x4] adds r0, r7, 0 - b _080889F2 + b @080889F2 .align 2, 0 .pool -_080889E0: +@080889E0: cmp r6, 0x4 - bgt _08088A00 + bgt @08088A00 ldr r0, =0x02037318 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -247940,16 +247940,16 @@ _080889E0: ldr r2, [r0, 0x4] ldr r3, [r5, 0x4] mov r0, r8 -_080889F2: +@080889F2: bl sub_8088A0C lsls r0, 24 lsrs r0, 24 - b _08088A02 + b @08088A02 .align 2, 0 .pool -_08088A00: +@08088A00: movs r0, 0 -_08088A02: +@08088A02: pop {r3} mov r8, r3 pop {r4-r7} @@ -247958,52 +247958,52 @@ _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 adds r2, r3, 0 cmp r3, 0 - bge _08088A1A + bge @08088A1A movs r3, 0 -_08088A1A: +@08088A1A: adds r2, r0, r2 cmp r2, r1 - bge _08088A22 + bge @08088A22 adds r1, r2, 0 -_08088A22: +@08088A22: cmp r3, r4 - bgt _08088A2E + bgt @08088A2E cmp r4, r1 - bgt _08088A2E + bgt @08088A2E movs r0, 0x1 - b _08088A30 -_08088A2E: + b @08088A30 +@08088A2E: movs r0, 0 -_08088A30: +@08088A30: pop {r4} pop {r1} bx r1 thumb_func_end sub_8088A0C thumb_func_start sub_8088A38 -sub_8088A38: @ 8088A38 +sub_8088A38: ; 8088A38 push {lr} cmp r0, 0 - blt _08088A46 + blt @08088A46 cmp r0, r1 - bge _08088A46 + bge @08088A46 movs r0, 0x1 - b _08088A48 -_08088A46: + b @08088A48 +@08088A46: movs r0, 0 -_08088A48: +@08088A48: pop {r1} bx r1 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 @@ -248012,34 +248012,34 @@ sub_8088A4C: @ 8088A4C adds r1, r0, 0 ldrb r0, [r4] cmp r0, 0x1 - blt _08088A84 + blt @08088A84 cmp r0, 0x2 - bgt _08088A72 + bgt @08088A72 ldr r0, [r4, 0x4] subs r0, r5, r0 ldr r1, [r1] ldr r1, [r1] bl sub_8088A38 - b _08088A86 -_08088A72: + b @08088A86 +@08088A72: cmp r0, 0x4 - bgt _08088A84 + bgt @08088A84 ldr r0, [r4, 0x4] subs r0, r6, r0 ldr r1, [r1] ldr r1, [r1, 0x4] bl sub_8088A38 - b _08088A86 -_08088A84: + b @08088A86 +@08088A84: movs r0, 0 -_08088A86: +@08088A86: pop {r4-r6} pop {r1} bx r1 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 @@ -248053,19 +248053,19 @@ sub_8088A8C: @ 8088A8C ldr r2, =0x02037318 ldr r0, [r2, 0xC] cmp r0, 0 - bne _08088AB4 - b _08088B2A + bne @08088AB4 + b @08088B2A .align 2, 0 .pool -_08088AB0: +@08088AB0: adds r0, r4, 0 - b _08088B2C -_08088AB4: + b @08088B2C +@08088AB4: ldr r7, [r0] ldr r4, [r0, 0x4] movs r6, 0 cmp r6, r7 - bge _08088B2A + bge @08088B2A lsls r0, r1, 16 asrs r5, r0, 16 mov r9, r2 @@ -248073,61 +248073,61 @@ _08088AB4: lsls r0, r1, 16 asrs r0, 16 mov r10, r0 -_08088ACC: +@08088ACC: ldrb r1, [r4] adds r3, r1, 0 subs r0, r1, 0x5 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bls _08088B22 + bls @08088B22 cmp r1, 0x2 - bne _08088AE2 + bne @08088AE2 cmp r5, 0x6 - bgt _08088B22 -_08088AE2: + bgt @08088B22 +@08088AE2: cmp r1, 0x1 - bne _08088AF2 + bne @08088AF2 mov r2, r9 ldr r0, [r2] ldr r0, [r0, 0x4] adds r0, 0x7 cmp r5, r0 - blt _08088B22 -_08088AF2: + blt @08088B22 +@08088AF2: mov r0, r8 lsls r2, r0, 16 cmp r1, 0x3 - bne _08088B00 + bne @08088B00 mov r1, r10 cmp r1, 0x6 - bgt _08088B22 -_08088B00: + bgt @08088B22 +@08088B00: cmp r3, 0x4 - bne _08088B12 + bne @08088B12 asrs r1, r2, 16 mov r3, r9 ldr r0, [r3] ldr r0, [r0] adds r0, 0x7 cmp r1, r0 - blt _08088B22 -_08088B12: + blt @08088B22 +@08088B12: asrs r1, r2, 16 subs r1, 0x7 adds r0, r4, 0 subs r2, r5, 0x7 bl sub_8088A4C cmp r0, 0x1 - beq _08088AB0 -_08088B22: + beq @08088AB0 +@08088B22: adds r6, 0x1 adds r4, 0xC cmp r6, r7 - blt _08088ACC -_08088B2A: + blt @08088ACC +@08088B2A: movs r0, 0 -_08088B2C: +@08088B2C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -248138,7 +248138,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 @@ -248155,7 +248155,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] @@ -248170,7 +248170,7 @@ sav1_camera_get_focus_coords: @ 8088B58 thumb_func_end sav1_camera_get_focus_coords thumb_func_start sub_8088B70 -sub_8088B70: @ 8088B70 +sub_8088B70: ; 8088B70 ldr r2, =0x03005d8c ldr r2, [r2] strh r0, [r2] @@ -248181,7 +248181,7 @@ sub_8088B70: @ 8088B70 thumb_func_end sub_8088B70 thumb_func_start sub_8088B80 -sub_8088B80: @ 8088B80 +sub_8088B80: ; 8088B80 ldr r2, =0x03005d8c ldr r3, [r2] ldrh r2, [r3] @@ -248194,24 +248194,24 @@ sub_8088B80: @ 8088B80 thumb_func_end sub_8088B80 thumb_func_start sub_8088B94 -sub_8088B94: @ 8088B94 +sub_8088B94: ; 8088B94 push {r4,r5,lr} adds r4, r0, 0 adds r3, r1, 0 adds r5, r2, 0 cmp r4, 0 - blt _08088BE6 + blt @08088BE6 ldr r2, =0x03005dc0 ldr r1, [r2] cmp r4, r1 - bge _08088BE6 + bge @08088BE6 cmp r3, 0 - blt _08088BE6 + blt @08088BE6 ldr r0, [r2, 0x4] cmp r3, r0 - bge _08088BE6 + bge @08088BE6 cmp r5, 0 - beq _08088BD4 + beq @08088BD4 adds r0, r1, 0 muls r0, r3 adds r0, r4, r0 @@ -248224,10 +248224,10 @@ sub_8088B94: @ 8088B94 adds r2, r3, 0 orrs r1, r2 strh r1, [r0] - b _08088BE6 + b @08088BE6 .align 2, 0 .pool -_08088BD4: +@08088BD4: muls r1, r3 adds r1, r4, r1 ldr r0, [r2, 0x8] @@ -248237,7 +248237,7 @@ _08088BD4: ldr r0, =0x0000f3ff ands r0, r2 strh r0, [r1] -_08088BE6: +@08088BE6: pop {r4,r5} pop {r0} bx r0 @@ -248246,7 +248246,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 @@ -248255,16 +248255,16 @@ sub_8088BF0: @ 8088BF0 lsls r2, 24 lsrs r2, 24 cmp r2, 0xFF - beq _08088C24 + beq @08088C24 cmp r2, 0 - bne _08088C0C + bne @08088C0C lsls r0, 1 subs r3, r0 - b _08088C10 -_08088C0C: + b @08088C10 +@08088C0C: lsls r0, r1, 1 adds r3, r0 -_08088C10: +@08088C10: ldrh r1, [r3] ldr r0, =0x000003ff ands r0, r1 @@ -248273,22 +248273,22 @@ _08088C10: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08088C2C -_08088C24: + beq @08088C2C +@08088C24: movs r0, 0 - b _08088C2E + b @08088C2E .align 2, 0 .pool -_08088C2C: +@08088C2C: movs r0, 0x1 -_08088C2E: +@08088C2E: pop {r1} bx r1 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 @@ -248299,18 +248299,18 @@ copy_tileset_patterns_to_vram: @ 8088C34 lsrs r5, r2, 16 adds r7, r5, 0 cmp r3, 0 - beq _08088C70 + beq @08088C70 ldrb r0, [r3] cmp r0, 0 - bne _08088C60 + bne @08088C60 ldr r1, [r3, 0x4] lsls r2, r4, 21 lsrs r2, 16 movs r0, 0x2 adds r3, r5, 0 bl gpu_copy_bg_tile_pattern_data_to_vram - b _08088C70 -_08088C60: + b @08088C70 +@08088C60: ldr r1, [r3, 0x4] lsls r2, r6, 5 movs r0, 0 @@ -248318,7 +248318,7 @@ _08088C60: movs r0, 0x2 adds r3, r7, 0 bl decompress_and_copy_tile_data_to_vram -_08088C70: +@08088C70: add sp, 0x4 pop {r4-r7} pop {r0} @@ -248326,8 +248326,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 @@ -248338,18 +248338,18 @@ copy_tileset_patterns_to_vram2: @ 8088C78 lsrs r5, r2, 16 adds r7, r5, 0 cmp r3, 0 - beq _08088CB4 + beq @08088CB4 ldrb r0, [r3] cmp r0, 0 - bne _08088CA4 + bne @08088CA4 ldr r1, [r3, 0x4] lsls r2, r4, 21 lsrs r2, 16 movs r0, 0x2 adds r3, r5, 0 bl gpu_copy_bg_tile_pattern_data_to_vram - b _08088CB4 -_08088CA4: + b @08088CB4 +@08088CA4: ldr r1, [r3, 0x4] lsls r2, r6, 5 movs r0, 0 @@ -248357,7 +248357,7 @@ _08088CA4: movs r0, 0x2 adds r3, r7, 0 bl copy_decompressed_tile_data_to_vram_autofree -_08088CB4: +@08088CB4: add sp, 0x4 pop {r4-r7} pop {r0} @@ -248365,18 +248365,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} @@ -248392,10 +248392,10 @@ apply_map_tileset_palette: @ 8088CC4 mov r0, sp strh r1, [r0] cmp r4, 0 - beq _08088D42 + beq @08088D42 ldrb r0, [r4, 0x1] cmp r0, 0 - bne _08088D18 + bne @08088D18 mov r0, sp adds r1, r5, 0 movs r2, 0x2 @@ -248415,10 +248415,10 @@ apply_map_tileset_palette: @ 8088CC4 adds r0, r5, 0 adds r1, r4, 0 bl nullsub_3 - b _08088D42 -_08088D18: + b @08088D42 +@08088D18: cmp r0, 0x1 - bne _08088D32 + bne @08088D32 ldr r0, [r4, 0x8] adds r0, 0xC0 adds r1, r5, 0 @@ -248427,15 +248427,15 @@ _08088D18: lsrs r1, r6, 17 adds r0, r5, 0 bl nullsub_3 - b _08088D42 -_08088D32: + b @08088D42 +@08088D32: ldr r0, [r4, 0x8] mov r1, r8 bl decompress_palette lsrs r1, r6, 17 mov r0, r8 bl nullsub_3 -_08088D42: +@08088D42: add sp, 0x4 pop {r3} mov r8, r3 @@ -248445,8 +248445,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 @@ -248458,8 +248458,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 @@ -248471,8 +248471,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 @@ -248484,8 +248484,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 @@ -248496,8 +248496,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 @@ -248508,12 +248508,12 @@ 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 - beq _08088DCC + beq @08088DCC ldr r0, [r5, 0x10] movs r4, 0x80 lsls r4, 2 @@ -248524,36 +248524,36 @@ copy_map_tileset1_tileset2_to_vram: @ 8088DAC adds r1, r4, 0 adds r2, r4, 0 bl copy_tileset_patterns_to_vram2 -_08088DCC: +@08088DCC: pop {r4,r5} pop {r0} bx r0 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 - beq _08088DE6 + beq @08088DE6 bl apply_map_tileset1_palette adds r0, r4, 0 bl apply_map_tileset2_palette -_08088DE6: +@08088DE6: pop {r4} pop {r0} bx r0 thumb_func_end apply_map_tileset1_tileset2_palette thumb_func_start sub_8088DEC -sub_8088DEC: @ 8088DEC +sub_8088DEC: ; 8088DEC movs r0, 0x1 bx lr thumb_func_end sub_8088DEC thumb_func_start sub_8088DF0 -sub_8088DF0: @ 8088DF0 +sub_8088DF0: ; 8088DF0 push {lr} lsls r0, 24 lsrs r0, 24 @@ -248563,84 +248563,84 @@ sub_8088DF0: @ 8088DF0 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _08088E0C + bne @08088E0C movs r0, 0 - b _08088E0E + b @08088E0E .align 2, 0 .pool -_08088E0C: +@08088E0C: movs r0, 0x1 -_08088E0E: +@08088E0E: pop {r1} bx r1 thumb_func_end sub_8088DF0 thumb_func_start is_tile_x38 -is_tile_x38: @ 8088E14 +is_tile_x38: ; 8088E14 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x38 - beq _08088E22 + beq @08088E22 movs r0, 0 - b _08088E24 -_08088E22: + b @08088E24 +@08088E22: movs r0, 0x1 -_08088E24: +@08088E24: pop {r1} bx r1 thumb_func_end is_tile_x38 thumb_func_start is_tile_x39 -is_tile_x39: @ 8088E28 +is_tile_x39: ; 8088E28 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x39 - beq _08088E36 + beq @08088E36 movs r0, 0 - b _08088E38 -_08088E36: + b @08088E38 +@08088E36: movs r0, 0x1 -_08088E38: +@08088E38: pop {r1} bx r1 thumb_func_end is_tile_x39 thumb_func_start is_tile_x3A -is_tile_x3A: @ 8088E3C +is_tile_x3A: ; 8088E3C push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x3A - beq _08088E4A + beq @08088E4A movs r0, 0 - b _08088E4C -_08088E4A: + b @08088E4C +@08088E4A: movs r0, 0x1 -_08088E4C: +@08088E4C: pop {r1} bx r1 thumb_func_end is_tile_x3A thumb_func_start is_tile_x3B -is_tile_x3B: @ 8088E50 +is_tile_x3B: ; 8088E50 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x3B - beq _08088E5E + beq @08088E5E movs r0, 0 - b _08088E60 -_08088E5E: + b @08088E60 +@08088E5E: movs r0, 0x1 -_08088E60: +@08088E60: pop {r1} bx r1 thumb_func_end is_tile_x3B thumb_func_start sub_8088E64 -sub_8088E64: @ 8088E64 +sub_8088E64: ; 8088E64 push {lr} lsls r0, 24 movs r1, 0xFE @@ -248648,131 +248648,131 @@ sub_8088E64: @ 8088E64 adds r0, r1 lsrs r0, 24 cmp r0, 0x1 - bls _08088E78 + bls @08088E78 movs r0, 0 - b _08088E7A -_08088E78: + b @08088E7A +@08088E78: movs r0, 0x1 -_08088E7A: +@08088E7A: pop {r1} bx r1 thumb_func_end sub_8088E64 thumb_func_start is_x21_or_x2B -is_x21_or_x2B: @ 8088E80 +is_x21_or_x2B: ; 8088E80 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x21 - beq _08088E8E + beq @08088E8E cmp r0, 0x6 - bne _08088E92 -_08088E8E: + bne @08088E92 +@08088E8E: movs r0, 0x1 - b _08088E94 -_08088E92: + b @08088E94 +@08088E92: movs r0, 0 -_08088E94: +@08088E94: pop {r1} bx r1 thumb_func_end is_x21_or_x2B thumb_func_start zero_0 -zero_0: @ 8088E98 +zero_0: ; 8088E98 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x6 - beq _08088EA6 + beq @08088EA6 movs r0, 0 - b _08088EA8 -_08088EA6: + b @08088EA8 +@08088EA6: movs r0, 0x1 -_08088EA8: +@08088EA8: pop {r1} bx r1 thumb_func_end zero_0 thumb_func_start is_water_tile_2 -is_water_tile_2: @ 8088EAC +is_water_tile_2: ; 8088EAC push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x10 - beq _08088ECA + beq @08088ECA cmp r0, 0x16 - beq _08088ECA + beq @08088ECA cmp r0, 0x1A - beq _08088ECA + beq @08088ECA cmp r0, 0x20 - beq _08088ECA + beq @08088ECA cmp r0, 0x14 - beq _08088ECA + beq @08088ECA cmp r0, 0x2B - bne _08088ECE -_08088ECA: + bne @08088ECE +@08088ECA: movs r0, 0x1 - b _08088ED0 -_08088ECE: + b @08088ED0 +@08088ECE: movs r0, 0 -_08088ED0: +@08088ED0: pop {r1} bx r1 thumb_func_end is_water_tile_2 thumb_func_start is_tile_x23_2 -is_tile_x23_2: @ 8088ED4 +is_tile_x23_2: ; 8088ED4 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x20 - beq _08088EE2 + beq @08088EE2 movs r0, 0 - b _08088EE4 -_08088EE2: + b @08088EE4 +@08088EE2: movs r0, 0x1 -_08088EE4: +@08088EE4: pop {r1} bx r1 thumb_func_end is_tile_x23_2 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 cmp r0, 0x69 - beq _08088EF6 + beq @08088EF6 movs r0, 0 - b _08088EF8 -_08088EF6: + b @08088EF8 +@08088EF6: movs r0, 0x1 -_08088EF8: +@08088EF8: pop {r1} bx r1 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 cmp r0, 0x8D - beq _08088F0A + beq @08088F0A cmp r0, 0x69 - bne _08088F0E -_08088F0A: + bne @08088F0E +@08088F0A: movs r0, 0x1 - b _08088F10 -_08088F0E: + b @08088F10 +@08088F0E: movs r0, 0 -_08088F10: +@08088F10: pop {r1} bx r1 thumb_func_end sub_8088EFC thumb_func_start is_tile_TODO -is_tile_TODO: @ 8088F14 +is_tile_TODO: ; 8088F14 push {lr} lsls r0, 24 movs r1, 0x96 @@ -248780,87 +248780,87 @@ is_tile_TODO: @ 8088F14 adds r0, r1 lsrs r0, 24 cmp r0, 0x1 - bls _08088F28 + bls @08088F28 movs r0, 0 - b _08088F2A -_08088F28: + b @08088F2A +@08088F28: movs r0, 0x1 -_08088F2A: +@08088F2A: pop {r1} bx r1 thumb_func_end is_tile_TODO thumb_func_start sub_8088F30 -sub_8088F30: @ 8088F30 +sub_8088F30: ; 8088F30 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - beq _08088F3E + beq @08088F3E movs r0, 0 - b _08088F40 -_08088F3E: + b @08088F40 +@08088F3E: movs r0, 0x1 -_08088F40: +@08088F40: pop {r1} bx r1 thumb_func_end sub_8088F30 thumb_func_start is_tile_x61_warp -is_tile_x61_warp: @ 8088F44 +is_tile_x61_warp: ; 8088F44 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x61 - beq _08088F52 + beq @08088F52 movs r0, 0 - b _08088F54 -_08088F52: + b @08088F54 +@08088F52: movs r0, 0x1 -_08088F54: +@08088F54: pop {r1} bx r1 thumb_func_end is_tile_x61_warp thumb_func_start sub_8088F58 -sub_8088F58: @ 8088F58 +sub_8088F58: ; 8088F58 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x60 - beq _08088F6A + beq @08088F6A cmp r0, 0x6C - beq _08088F6A + beq @08088F6A cmp r0, 0x6E - bne _08088F6E -_08088F6A: + bne @08088F6E +@08088F6A: movs r0, 0x1 - b _08088F70 -_08088F6E: + b @08088F70 +@08088F6E: movs r0, 0 -_08088F70: +@08088F70: pop {r1} bx r1 thumb_func_end sub_8088F58 thumb_func_start sub_8088F74 -sub_8088F74: @ 8088F74 +sub_8088F74: ; 8088F74 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x6E - beq _08088F82 + beq @08088F82 movs r0, 0 - b _08088F84 -_08088F82: + b @08088F84 +@08088F82: movs r0, 0x1 -_08088F84: +@08088F84: pop {r1} bx r1 thumb_func_end sub_8088F74 thumb_func_start is_tile_grass_maybe -is_tile_grass_maybe: @ 8088F88 +is_tile_grass_maybe: ; 8088F88 push {lr} lsls r0, 24 lsrs r0, 24 @@ -248870,92 +248870,92 @@ is_tile_grass_maybe: @ 8088F88 movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _08088FA4 + bne @08088FA4 movs r0, 0 - b _08088FA6 + b @08088FA6 .align 2, 0 .pool -_08088FA4: +@08088FA4: movs r0, 0x1 -_08088FA6: +@08088FA6: pop {r1} bx r1 thumb_func_end is_tile_grass_maybe thumb_func_start is_tile_x62_warp_arrow_right -is_tile_x62_warp_arrow_right: @ 8088FAC +is_tile_x62_warp_arrow_right: ; 8088FAC push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x62 - beq _08088FBA + beq @08088FBA movs r0, 0 - b _08088FBC -_08088FBA: + b @08088FBC +@08088FBA: movs r0, 0x1 -_08088FBC: +@08088FBC: pop {r1} bx r1 thumb_func_end is_tile_x62_warp_arrow_right thumb_func_start is_tile_x63_warp_arrow_left -is_tile_x63_warp_arrow_left: @ 8088FC0 +is_tile_x63_warp_arrow_left: ; 8088FC0 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x63 - beq _08088FCE + beq @08088FCE movs r0, 0 - b _08088FD0 -_08088FCE: + b @08088FD0 +@08088FCE: movs r0, 0x1 -_08088FD0: +@08088FD0: pop {r1} bx r1 thumb_func_end is_tile_x63_warp_arrow_left thumb_func_start sub_8088FD4 -sub_8088FD4: @ 8088FD4 +sub_8088FD4: ; 8088FD4 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x64 - beq _08088FE2 + beq @08088FE2 cmp r0, 0x1B - bne _08088FE6 -_08088FE2: + bne @08088FE6 +@08088FE2: movs r0, 0x1 - b _08088FE8 -_08088FE6: + b @08088FE8 +@08088FE6: movs r0, 0 -_08088FE8: +@08088FE8: pop {r1} bx r1 thumb_func_end sub_8088FD4 thumb_func_start is_tile_x65_warp_arrow_down -is_tile_x65_warp_arrow_down: @ 8088FEC +is_tile_x65_warp_arrow_down: ; 8088FEC push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x65 - beq _08088FFE + beq @08088FFE cmp r0, 0x6D - beq _08088FFE + beq @08088FFE cmp r0, 0x1C - bne _08089002 -_08088FFE: + bne @08089002 +@08088FFE: movs r0, 0x1 - b _08089004 -_08089002: + b @08089004 +@08089002: movs r0, 0 -_08089004: +@08089004: pop {r1} bx r1 thumb_func_end is_tile_x65_warp_arrow_down thumb_func_start sub_8089008 -sub_8089008: @ 8089008 +sub_8089008: ; 8089008 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -248964,25 +248964,25 @@ sub_8089008: @ 8089008 bl is_tile_x62_warp_arrow_right lsls r0, 24 cmp r0, 0 - bne _08089040 + bne @08089040 adds r0, r4, 0 bl is_tile_x63_warp_arrow_left lsls r0, 24 cmp r0, 0 - bne _08089040 + bne @08089040 adds r0, r4, 0 bl sub_8088FD4 lsls r0, 24 cmp r0, 0 - bne _08089040 + bne @08089040 adds r0, r4, 0 bl is_tile_x65_warp_arrow_down lsls r0, 24 cmp r0, 0 - beq _08089042 -_08089040: + beq @08089042 +@08089040: movs r5, 0x1 -_08089042: +@08089042: adds r0, r5, 0 pop {r4,r5} pop {r1} @@ -248990,7 +248990,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 @@ -248999,869 +248999,869 @@ sub_808904C: @ 808904C adds r0, r2 lsrs r0, 24 cmp r0, 0x8 - bls _08089082 + bls @08089082 adds r0, r1, 0 subs r0, 0x50 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bls _08089082 + bls @08089082 cmp r1, 0xD0 - beq _08089082 + beq @08089082 cmp r1, 0xD2 - beq _08089082 + beq @08089082 cmp r1, 0x13 - beq _08089082 + beq @08089082 cmp r1, 0x20 - beq _08089082 + beq @08089082 cmp r1, 0xBB - beq _08089082 + beq @08089082 cmp r1, 0xBC - bne _08089086 -_08089082: + bne @08089086 +@08089082: movs r0, 0x1 - b _08089088 -_08089086: + b @08089088 +@08089086: movs r0, 0 -_08089088: +@08089088: pop {r1} bx r1 thumb_func_end sub_808904C thumb_func_start sub_808908C -sub_808908C: @ 808908C +sub_808908C: ; 808908C push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x20 - beq _0808909A + beq @0808909A movs r0, 0 - b _0808909C -_0808909A: + b @0808909C +@0808909A: movs r0, 0x1 -_0808909C: +@0808909C: pop {r1} bx r1 thumb_func_end sub_808908C thumb_func_start is_tile_x48_slide_around -is_tile_x48_slide_around: @ 80890A0 +is_tile_x48_slide_around: ; 80890A0 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x48 - beq _080890AE + beq @080890AE movs r0, 0 - b _080890B0 -_080890AE: + b @080890B0 +@080890AE: movs r0, 0x1 -_080890B0: +@080890B0: pop {r1} bx r1 thumb_func_end is_tile_x48_slide_around thumb_func_start sub_80890B4 -sub_80890B4: @ 80890B4 +sub_80890B4: ; 80890B4 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 - beq _080890C2 + beq @080890C2 movs r0, 0 - b _080890C4 -_080890C2: + b @080890C4 +@080890C2: movs r0, 0x1 -_080890C4: +@080890C4: pop {r1} bx r1 thumb_func_end sub_80890B4 thumb_func_start task00_0800DE4C -task00_0800DE4C: @ 80890C8 +task00_0800DE4C: ; 80890C8 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x42 - beq _080890D6 + beq @080890D6 movs r0, 0 - b _080890D8 -_080890D6: + b @080890D8 +@080890D6: movs r0, 0x1 -_080890D8: +@080890D8: pop {r1} bx r1 thumb_func_end task00_0800DE4C thumb_func_start is_tile_x43_walk_down -is_tile_x43_walk_down: @ 80890DC +is_tile_x43_walk_down: ; 80890DC push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x43 - beq _080890EA + beq @080890EA movs r0, 0 - b _080890EC -_080890EA: + b @080890EC +@080890EA: movs r0, 0x1 -_080890EC: +@080890EC: pop {r1} bx r1 thumb_func_end is_tile_x43_walk_down thumb_func_start is_tile_x41_walk_left -is_tile_x41_walk_left: @ 80890F0 +is_tile_x41_walk_left: ; 80890F0 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x41 - beq _080890FE + beq @080890FE movs r0, 0 - b _08089100 -_080890FE: + b @08089100 +@080890FE: movs r0, 0x1 -_08089100: +@08089100: pop {r1} bx r1 thumb_func_end is_tile_x41_walk_left thumb_func_start is_tile_x40_walk_right -is_tile_x40_walk_right: @ 8089104 +is_tile_x40_walk_right: ; 8089104 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _08089112 + beq @08089112 movs r0, 0 - b _08089114 -_08089112: + b @08089114 +@08089112: movs r0, 0x1 -_08089114: +@08089114: pop {r1} bx r1 thumb_func_end is_tile_x40_walk_right thumb_func_start is_tile_x52_run_up -is_tile_x52_run_up: @ 8089118 +is_tile_x52_run_up: ; 8089118 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x52 - beq _08089126 + beq @08089126 movs r0, 0 - b _08089128 -_08089126: + b @08089128 +@08089126: movs r0, 0x1 -_08089128: +@08089128: pop {r1} bx r1 thumb_func_end is_tile_x52_run_up thumb_func_start is_tile_x53_run_down -is_tile_x53_run_down: @ 808912C +is_tile_x53_run_down: ; 808912C push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x53 - beq _0808913A + beq @0808913A movs r0, 0 - b _0808913C -_0808913A: + b @0808913C +@0808913A: movs r0, 0x1 -_0808913C: +@0808913C: pop {r1} bx r1 thumb_func_end is_tile_x53_run_down thumb_func_start is_tile_x51_run_left -is_tile_x51_run_left: @ 8089140 +is_tile_x51_run_left: ; 8089140 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x51 - beq _0808914E + beq @0808914E movs r0, 0 - b _08089150 -_0808914E: + b @08089150 +@0808914E: movs r0, 0x1 -_08089150: +@08089150: pop {r1} bx r1 thumb_func_end is_tile_x51_run_left thumb_func_start is_tile_x50_run_right -is_tile_x50_run_right: @ 8089154 +is_tile_x50_run_right: ; 8089154 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x50 - beq _08089162 + beq @08089162 movs r0, 0 - b _08089164 -_08089162: + b @08089164 +@08089162: movs r0, 0x1 -_08089164: +@08089164: pop {r1} bx r1 thumb_func_end is_tile_x50_run_right thumb_func_start is_tile_x46_slide_up -is_tile_x46_slide_up: @ 8089168 +is_tile_x46_slide_up: ; 8089168 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x46 - beq _08089176 + beq @08089176 movs r0, 0 - b _08089178 -_08089176: + b @08089178 +@08089176: movs r0, 0x1 -_08089178: +@08089178: pop {r1} bx r1 thumb_func_end is_tile_x46_slide_up thumb_func_start is_tile_x47_slide_down -is_tile_x47_slide_down: @ 808917C +is_tile_x47_slide_down: ; 808917C push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x47 - beq _0808918A + beq @0808918A movs r0, 0 - b _0808918C -_0808918A: + b @0808918C +@0808918A: movs r0, 0x1 -_0808918C: +@0808918C: pop {r1} bx r1 thumb_func_end is_tile_x47_slide_down thumb_func_start is_tile_x45_slide_left -is_tile_x45_slide_left: @ 8089190 +is_tile_x45_slide_left: ; 8089190 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x45 - beq _0808919E + beq @0808919E movs r0, 0 - b _080891A0 -_0808919E: + b @080891A0 +@0808919E: movs r0, 0x1 -_080891A0: +@080891A0: pop {r1} bx r1 thumb_func_end is_tile_x45_slide_left thumb_func_start is_tile_x44_slide_right -is_tile_x44_slide_right: @ 80891A4 +is_tile_x44_slide_right: ; 80891A4 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x44 - beq _080891B2 + beq @080891B2 movs r0, 0 - b _080891B4 -_080891B2: + b @080891B4 +@080891B2: movs r0, 0x1 -_080891B4: +@080891B4: pop {r1} bx r1 thumb_func_end is_tile_x44_slide_right thumb_func_start is_tile_x80 -is_tile_x80: @ 80891B8 +is_tile_x80: ; 80891B8 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x80 - beq _080891C6 + beq @080891C6 movs r0, 0 - b _080891C8 -_080891C6: + b @080891C8 +@080891C6: movs r0, 0x1 -_080891C8: +@080891C8: pop {r1} bx r1 thumb_func_end is_tile_x80 thumb_func_start is_tile_x86_and_npcunk2_is_x2 -is_tile_x86_and_npcunk2_is_x2: @ 80891CC +is_tile_x86_and_npcunk2_is_x2: ; 80891CC push {lr} lsls r0, 24 lsrs r0, 24 lsls r1, 24 lsrs r1, 24 cmp r1, 0x2 - bne _080891DE + bne @080891DE cmp r0, 0x86 - beq _080891E2 -_080891DE: + beq @080891E2 +@080891DE: movs r0, 0 - b _080891E4 -_080891E2: + b @080891E4 +@080891E2: movs r0, 0x1 -_080891E4: +@080891E4: pop {r1} bx r1 thumb_func_end is_tile_x86_and_npcunk2_is_x2 thumb_func_start IsMetatileComputer -IsMetatileComputer: @ 80891E8 +IsMetatileComputer: ; 80891E8 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x83 - beq _080891F6 + beq @080891F6 movs r0, 0 - b _080891F8 -_080891F6: + b @080891F8 +@080891F6: movs r0, 0x1 -_080891F8: +@080891F8: pop {r1} bx r1 thumb_func_end IsMetatileComputer thumb_func_start is_tile_x84 -is_tile_x84: @ 80891FC +is_tile_x84: ; 80891FC push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x84 - beq _0808920A + beq @0808920A movs r0, 0 - b _0808920C -_0808920A: + b @0808920C +@0808920A: movs r0, 0x1 -_0808920C: +@0808920C: pop {r1} bx r1 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 cmp r0, 0x91 - beq _08089232 + beq @08089232 cmp r0, 0x93 - beq _08089232 + beq @08089232 cmp r0, 0x95 - beq _08089232 + beq @08089232 cmp r0, 0x97 - beq _08089232 + beq @08089232 cmp r0, 0x99 - beq _08089232 + beq @08089232 cmp r0, 0x9B - beq _08089232 + beq @08089232 cmp r0, 0x9D - bne _08089236 -_08089232: + bne @08089236 +@08089232: movs r0, 0x1 - b _08089238 -_08089236: + b @08089238 +@08089236: movs r0, 0 -_08089238: +@08089238: pop {r1} bx r1 thumb_func_end sub_8089210 thumb_func_start sub_808923C -sub_808923C: @ 808923C +sub_808923C: ; 808923C push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x90 - beq _08089252 + beq @08089252 cmp r0, 0x92 - beq _08089252 + beq @08089252 cmp r0, 0x94 - beq _08089252 + beq @08089252 cmp r0, 0x9A - bne _08089256 -_08089252: + bne @08089256 +@08089252: movs r0, 0x1 - b _08089258 -_08089256: + b @08089258 +@08089256: movs r0, 0 -_08089258: +@08089258: pop {r1} bx r1 thumb_func_end sub_808923C thumb_func_start sub_808925C -sub_808925C: @ 808925C +sub_808925C: ; 808925C push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x96 - beq _0808926A + beq @0808926A cmp r0, 0x9C - bne _0808926E -_0808926A: + bne @0808926E +@0808926A: movs r0, 0x1 - b _08089270 -_0808926E: + b @08089270 +@0808926E: movs r0, 0 -_08089270: +@08089270: pop {r1} bx r1 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 cmp r0, 0x98 - beq _08089282 + beq @08089282 movs r0, 0 - b _08089284 -_08089282: + b @08089284 +@08089282: movs r0, 0x1 -_08089284: +@08089284: pop {r1} bx r1 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 cmp r0, 0xB0 - beq _08089296 + beq @08089296 movs r0, 0 - b _08089298 -_08089296: + b @08089298 +@08089296: movs r0, 0x1 -_08089298: +@08089298: pop {r1} bx r1 thumb_func_end sub_8089288 thumb_func_start sub_808929C -sub_808929C: @ 808929C +sub_808929C: ; 808929C push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xB1 - beq _080892AA + beq @080892AA movs r0, 0 - b _080892AC -_080892AA: + b @080892AC +@080892AA: movs r0, 0x1 -_080892AC: +@080892AC: pop {r1} bx r1 thumb_func_end sub_808929C thumb_func_start sub_80892B0 -sub_80892B0: @ 80892B0 +sub_80892B0: ; 80892B0 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xB2 - beq _080892BE + beq @080892BE movs r0, 0 - b _080892C0 -_080892BE: + b @080892C0 +@080892BE: movs r0, 0x1 -_080892C0: +@080892C0: pop {r1} bx r1 thumb_func_end sub_80892B0 thumb_func_start sub_80892C4 -sub_80892C4: @ 80892C4 +sub_80892C4: ; 80892C4 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xB3 - beq _080892D2 + beq @080892D2 movs r0, 0 - b _080892D4 -_080892D2: + b @080892D4 +@080892D2: movs r0, 0x1 -_080892D4: +@080892D4: pop {r1} bx r1 thumb_func_end sub_80892C4 thumb_func_start sub_80892D8 -sub_80892D8: @ 80892D8 +sub_80892D8: ; 80892D8 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xB9 - beq _080892E6 + beq @080892E6 movs r0, 0 - b _080892E8 -_080892E6: + b @080892E8 +@080892E6: movs r0, 0x1 -_080892E8: +@080892E8: pop {r1} bx r1 thumb_func_end sub_80892D8 thumb_func_start sub_80892EC -sub_80892EC: @ 80892EC +sub_80892EC: ; 80892EC push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xC6 - beq _080892FA + beq @080892FA movs r0, 0 - b _080892FC -_080892FA: + b @080892FC +@080892FA: movs r0, 0x1 -_080892FC: +@080892FC: pop {r1} bx r1 thumb_func_end sub_80892EC thumb_func_start sub_8089300 -sub_8089300: @ 8089300 +sub_8089300: ; 8089300 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xC7 - beq _0808930E + beq @0808930E movs r0, 0 - b _08089310 -_0808930E: + b @08089310 +@0808930E: movs r0, 0x1 -_08089310: +@08089310: pop {r1} bx r1 thumb_func_end sub_8089300 thumb_func_start sub_8089314 -sub_8089314: @ 8089314 +sub_8089314: ; 8089314 push {lr} lsls r0, 24 cmp r0, 0 - beq _08089320 + beq @08089320 movs r0, 0 - b _08089322 -_08089320: + b @08089322 +@08089320: movs r0, 0x1 -_08089322: +@08089322: pop {r1} bx r1 thumb_func_end sub_8089314 thumb_func_start sub_8089328 -sub_8089328: @ 8089328 +sub_8089328: ; 8089328 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xB7 - beq _08089336 + beq @08089336 movs r0, 0 - b _08089338 -_08089336: + b @08089338 +@08089336: movs r0, 0x1 -_08089338: +@08089338: pop {r1} bx r1 thumb_func_end sub_8089328 thumb_func_start sub_808933C -sub_808933C: @ 808933C +sub_808933C: ; 808933C push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xB2 - beq _0808934A + beq @0808934A movs r0, 0 - b _0808934C -_0808934A: + b @0808934C +@0808934A: movs r0, 0x1 -_0808934C: +@0808934C: pop {r1} bx r1 thumb_func_end sub_808933C thumb_func_start sub_8089350 -sub_8089350: @ 8089350 +sub_8089350: ; 8089350 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xB5 - beq _0808935E + beq @0808935E movs r0, 0 - b _08089360 -_0808935E: + b @08089360 +@0808935E: movs r0, 0x1 -_08089360: +@08089360: pop {r1} bx r1 thumb_func_end sub_8089350 thumb_func_start sub_8089364 -sub_8089364: @ 8089364 +sub_8089364: ; 8089364 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xC3 - beq _08089372 + beq @08089372 movs r0, 0 - b _08089374 -_08089372: + b @08089374 +@08089372: movs r0, 0x1 -_08089374: +@08089374: pop {r1} bx r1 thumb_func_end sub_8089364 thumb_func_start sub_8089378 -sub_8089378: @ 8089378 +sub_8089378: ; 8089378 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xC2 - beq _08089386 + beq @08089386 movs r0, 0 - b _08089388 -_08089386: + b @08089388 +@08089386: movs r0, 0x1 -_08089388: +@08089388: pop {r1} bx r1 thumb_func_end sub_8089378 thumb_func_start sub_808938C -sub_808938C: @ 808938C +sub_808938C: ; 808938C push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xB8 - beq _0808939A + beq @0808939A movs r0, 0 - b _0808939C -_0808939A: + b @0808939C +@0808939A: movs r0, 0x1 -_0808939C: +@0808939C: pop {r1} bx r1 thumb_func_end sub_808938C thumb_func_start sub_80893A0 -sub_80893A0: @ 80893A0 +sub_80893A0: ; 80893A0 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xBE - beq _080893AE + beq @080893AE movs r0, 0 - b _080893B0 -_080893AE: + b @080893B0 +@080893AE: movs r0, 0x1 -_080893B0: +@080893B0: pop {r1} bx r1 thumb_func_end sub_80893A0 thumb_func_start sub_80893B4 -sub_80893B4: @ 80893B4 +sub_80893B4: ; 80893B4 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xBD - beq _080893C2 + beq @080893C2 movs r0, 0 - b _080893C4 -_080893C2: + b @080893C4 +@080893C2: movs r0, 0x1 -_080893C4: +@080893C4: pop {r1} bx r1 thumb_func_end sub_80893B4 thumb_func_start sub_80893C8 -sub_80893C8: @ 80893C8 +sub_80893C8: ; 80893C8 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xBA - beq _080893D6 + beq @080893D6 movs r0, 0 - b _080893D8 -_080893D6: + b @080893D8 +@080893D6: movs r0, 0x1 -_080893D8: +@080893D8: pop {r1} bx r1 thumb_func_end sub_80893C8 thumb_func_start sub_80893DC -sub_80893DC: @ 80893DC +sub_80893DC: ; 80893DC push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xBF - beq _080893EA + beq @080893EA movs r0, 0 - b _080893EC -_080893EA: + b @080893EC +@080893EA: movs r0, 0x1 -_080893EC: +@080893EC: pop {r1} bx r1 thumb_func_end sub_80893DC thumb_func_start sub_80893F0 -sub_80893F0: @ 80893F0 +sub_80893F0: ; 80893F0 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xC4 - beq _080893FE + beq @080893FE movs r0, 0 - b _08089400 -_080893FE: + b @08089400 +@080893FE: movs r0, 0x1 -_08089400: +@08089400: pop {r1} bx r1 thumb_func_end sub_80893F0 thumb_func_start sub_8089404 -sub_8089404: @ 8089404 +sub_8089404: ; 8089404 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xC5 - beq _08089412 + beq @08089412 movs r0, 0 - b _08089414 -_08089412: + b @08089414 +@08089412: movs r0, 0x1 -_08089414: +@08089414: pop {r1} bx r1 thumb_func_end sub_8089404 thumb_func_start is_tile_x10_or_x16 -is_tile_x10_or_x16: @ 8089418 +is_tile_x10_or_x16: ; 8089418 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x10 - beq _0808942A + beq @0808942A cmp r0, 0x16 - beq _0808942A + beq @0808942A cmp r0, 0x14 - bne _0808942E -_0808942A: + bne @0808942E +@0808942A: movs r0, 0x1 - b _08089430 -_0808942E: + b @08089430 +@0808942E: movs r0, 0 -_08089430: +@08089430: pop {r1} bx r1 thumb_func_end is_tile_x10_or_x16 thumb_func_start is_tile_x16_clear_water -is_tile_x16_clear_water: @ 8089434 +is_tile_x16_clear_water: ; 8089434 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x16 - beq _08089442 + beq @08089442 movs r0, 0 - b _08089444 -_08089442: + b @08089444 +@08089442: movs r0, 0x1 -_08089444: +@08089444: pop {r1} bx r1 thumb_func_end is_tile_x16_clear_water thumb_func_start is_tile_x02_or_xD1 -is_tile_x02_or_xD1: @ 8089448 +is_tile_x02_or_xD1: ; 8089448 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - beq _08089456 + beq @08089456 movs r0, 0 - b _08089458 -_08089456: + b @08089458 +@08089456: movs r0, 0x1 -_08089458: +@08089458: pop {r1} bx r1 thumb_func_end is_tile_x02_or_xD1 thumb_func_start is_tile_tallgrass -is_tile_tallgrass: @ 808945C +is_tile_tallgrass: ; 808945C push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - beq _0808946A + beq @0808946A movs r0, 0 - b _0808946C -_0808946A: + b @0808946C +@0808946A: movs r0, 0x1 -_0808946C: +@0808946C: pop {r1} bx r1 thumb_func_end is_tile_tallgrass thumb_func_start is_tile_xA0 -is_tile_xA0: @ 8089470 +is_tile_xA0: ; 8089470 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xA0 - beq _0808947E + beq @0808947E movs r0, 0 - b _08089480 -_0808947E: + b @08089480 +@0808947E: movs r0, 0x1 -_08089480: +@08089480: pop {r1} bx r1 thumb_func_end is_tile_xA0 thumb_func_start sub_8089484 -sub_8089484: @ 8089484 +sub_8089484: ; 8089484 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x24 - beq _08089492 + beq @08089492 movs r0, 0 - b _08089494 -_08089492: + b @08089494 +@08089492: movs r0, 0x1 -_08089494: +@08089494: pop {r1} bx r1 thumb_func_end sub_8089484 thumb_func_start sub_8089498 -sub_8089498: @ 8089498 +sub_8089498: ; 8089498 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x25 - beq _080894A6 + beq @080894A6 movs r0, 0 - b _080894A8 -_080894A6: + b @080894A8 +@080894A6: movs r0, 0x1 -_080894A8: +@080894A8: pop {r1} bx r1 thumb_func_end sub_8089498 thumb_func_start sub_80894AC -sub_80894AC: @ 80894AC +sub_80894AC: ; 80894AC push {lr} lsls r0, 24 lsrs r1, r0, 24 @@ -249870,25 +249870,25 @@ sub_80894AC: @ 80894AC adds r0, r2 lsrs r0, 24 cmp r0, 0x3 - bls _080894CA + bls @080894CA adds r0, r1, 0 subs r0, 0x7C lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bhi _080894CE -_080894CA: + bhi @080894CE +@080894CA: movs r0, 0x1 - b _080894D0 -_080894CE: + b @080894D0 +@080894CE: movs r0, 0 -_080894D0: +@080894D0: pop {r1} bx r1 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 @@ -249898,33 +249898,33 @@ sub_80894D4: @ 80894D4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bls _0808950A + bls @0808950A adds r0, r1, 0 subs r0, 0x7A lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _080894F8 + bhi @080894F8 movs r0, 0x2 - b _0808950A -_080894F8: + b @0808950A +@080894F8: adds r0, r2, 0 subs r0, 0x7C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bls _08089508 + bls @08089508 movs r0, 0 - b _0808950A -_08089508: + b @0808950A +@08089508: movs r0, 0x3 -_0808950A: +@0808950A: pop {r1} bx r1 thumb_func_end sub_80894D4 thumb_func_start sub_8089510 -sub_8089510: @ 8089510 +sub_8089510: ; 8089510 push {lr} lsls r0, 24 movs r1, 0x90 @@ -249932,18 +249932,18 @@ sub_8089510: @ 8089510 adds r0, r1 lsrs r0, 24 cmp r0, 0x3 - bls _08089524 + bls @08089524 movs r0, 0 - b _08089526 -_08089524: + b @08089526 +@08089524: movs r0, 0x1 -_08089526: +@08089526: pop {r1} bx r1 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 @@ -249951,25 +249951,25 @@ sub_808952C: @ 808952C bl is_tile_grass_maybe lsls r0, 24 cmp r0, 0 - bne _08089550 + bne @08089550 adds r0, r4, 0 bl sub_8088DF0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08089550 + bne @08089550 movs r0, 0x1 - b _08089552 -_08089550: + b @08089552 +@08089550: movs r0, 0 -_08089552: +@08089552: pop {r4} pop {r1} bx r1 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 @@ -249978,57 +249978,57 @@ sub_8089558: @ 8089558 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0808957E + bne @0808957E adds r0, r4, 0 bl sub_8088DF0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0808957E + bne @0808957E movs r0, 0x1 - b _08089580 -_0808957E: + b @08089580 +@0808957E: movs r0, 0 -_08089580: +@08089580: pop {r4} pop {r1} bx r1 thumb_func_end sub_8089558 thumb_func_start sub_8089588 -sub_8089588: @ 8089588 +sub_8089588: ; 8089588 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xB - beq _08089596 + beq @08089596 movs r0, 0 - b _08089598 -_08089596: + b @08089598 +@08089596: movs r0, 0x1 -_08089598: +@08089598: pop {r1} bx r1 thumb_func_end sub_8089588 thumb_func_start sub_808959C -sub_808959C: @ 808959C +sub_808959C: ; 808959C push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xC - beq _080895AA + beq @080895AA movs r0, 0 - b _080895AC -_080895AA: + b @080895AC +@080895AA: movs r0, 0x1 -_080895AC: +@080895AC: pop {r1} bx r1 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 @@ -250037,133 +250037,133 @@ sub_80895B0: @ 80895B0 adds r0, r2 lsrs r0, 24 cmp r0, 0x1 - bls _080895C6 + bls @080895C6 cmp r1, 0x14 - bne _080895CA -_080895C6: + bne @080895CA +@080895C6: movs r0, 0x1 - b _080895CC -_080895CA: + b @080895CC +@080895CA: movs r0, 0 -_080895CC: +@080895CC: pop {r1} bx r1 thumb_func_end sub_80895B0 thumb_func_start sub_80895D0 -sub_80895D0: @ 80895D0 +sub_80895D0: ; 80895D0 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x19 - beq _080895DE + beq @080895DE cmp r0, 0x2A - bne _080895E2 -_080895DE: + bne @080895E2 +@080895DE: movs r0, 0x1 - b _080895E4 -_080895E2: + b @080895E4 +@080895E2: movs r0, 0 -_080895E4: +@080895E4: pop {r1} bx r1 thumb_func_end sub_80895D0 thumb_func_start sub_80895E8 -sub_80895E8: @ 80895E8 +sub_80895E8: ; 80895E8 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x17 - beq _080895FA + beq @080895FA cmp r0, 0x1B - beq _080895FA + beq @080895FA cmp r0, 0x1C - bne _080895FE -_080895FA: + bne @080895FE +@080895FA: movs r0, 0x1 - b _08089600 -_080895FE: + b @08089600 +@080895FE: movs r0, 0 -_08089600: +@08089600: pop {r1} bx r1 thumb_func_end sub_80895E8 thumb_func_start sub_8089604 -sub_8089604: @ 8089604 +sub_8089604: ; 8089604 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x26 - beq _08089612 + beq @08089612 movs r0, 0 - b _08089614 -_08089612: + b @08089614 +@08089612: movs r0, 0x1 -_08089614: +@08089614: pop {r1} bx r1 thumb_func_end sub_8089604 thumb_func_start sub_8089618 -sub_8089618: @ 8089618 +sub_8089618: ; 8089618 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x27 - beq _08089626 + beq @08089626 movs r0, 0 - b _08089628 -_08089626: + b @08089628 +@08089626: movs r0, 0x1 -_08089628: +@08089628: pop {r1} bx r1 thumb_func_end sub_8089618 thumb_func_start sub_808962C -sub_808962C: @ 808962C +sub_808962C: ; 808962C push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x15 - beq _0808963E + beq @0808963E cmp r0, 0x11 - beq _0808963E + beq @0808963E cmp r0, 0x12 - bne _08089642 -_0808963E: + bne @08089642 +@0808963E: movs r0, 0x1 - b _08089644 -_08089642: + b @08089644 +@08089642: movs r0, 0 -_08089644: +@08089644: pop {r1} bx r1 thumb_func_end sub_808962C thumb_func_start sub_8089648 -sub_8089648: @ 8089648 +sub_8089648: ; 8089648 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x18 - beq _08089656 + beq @08089656 cmp r0, 0x1A - bne _0808965A -_08089656: + bne @0808965A +@08089656: movs r0, 0x1 - b _0808965C -_0808965A: + b @0808965C +@0808965A: movs r0, 0 -_0808965C: +@0808965C: pop {r1} bx r1 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 @@ -250171,248 +250171,248 @@ sub_8089660: @ 8089660 bl is_tile_grass_maybe lsls r0, 24 cmp r0, 0 - beq _08089682 + beq @08089682 adds r0, r4, 0 bl is_tile_x13_waterfall lsls r0, 24 cmp r0, 0 - bne _08089682 + bne @08089682 movs r0, 0x1 - b _08089684 -_08089682: + b @08089684 +@08089682: movs r0, 0 -_08089684: +@08089684: pop {r4} pop {r1} bx r1 thumb_func_end sub_8089660 thumb_func_start sub_808968C -sub_808968C: @ 808968C +sub_808968C: ; 808968C push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x30 - beq _080896A6 + beq @080896A6 cmp r0, 0x34 - beq _080896A6 + beq @080896A6 cmp r0, 0x36 - beq _080896A6 + beq @080896A6 cmp r0, 0xC1 - beq _080896A6 + beq @080896A6 cmp r0, 0xBE - bne _080896AA -_080896A6: + bne @080896AA +@080896A6: movs r0, 0x1 - b _080896AC -_080896AA: + b @080896AC +@080896AA: movs r0, 0 -_080896AC: +@080896AC: pop {r1} bx r1 thumb_func_end sub_808968C thumb_func_start sub_80896B0 -sub_80896B0: @ 80896B0 +sub_80896B0: ; 80896B0 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x31 - beq _080896CA + beq @080896CA cmp r0, 0x35 - beq _080896CA + beq @080896CA cmp r0, 0x37 - beq _080896CA + beq @080896CA cmp r0, 0xC1 - beq _080896CA + beq @080896CA cmp r0, 0xBE - bne _080896CE -_080896CA: + bne @080896CE +@080896CA: movs r0, 0x1 - b _080896D0 -_080896CE: + b @080896D0 +@080896CE: movs r0, 0 -_080896D0: +@080896D0: pop {r1} bx r1 thumb_func_end sub_80896B0 thumb_func_start sub_80896D4 -sub_80896D4: @ 80896D4 +sub_80896D4: ; 80896D4 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x32 - beq _080896EA + beq @080896EA cmp r0, 0x34 - beq _080896EA + beq @080896EA cmp r0, 0x35 - beq _080896EA + beq @080896EA cmp r0, 0xC0 - bne _080896EE -_080896EA: + bne @080896EE +@080896EA: movs r0, 0x1 - b _080896F0 -_080896EE: + b @080896F0 +@080896EE: movs r0, 0 -_080896F0: +@080896F0: pop {r1} bx r1 thumb_func_end sub_80896D4 thumb_func_start sub_80896F4 -sub_80896F4: @ 80896F4 +sub_80896F4: ; 80896F4 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x33 - beq _0808970A + beq @0808970A cmp r0, 0x36 - beq _0808970A + beq @0808970A cmp r0, 0x37 - beq _0808970A + beq @0808970A cmp r0, 0xC0 - bne _0808970E -_0808970A: + bne @0808970E +@0808970A: movs r0, 0x1 - b _08089710 -_0808970E: + b @08089710 +@0808970E: movs r0, 0 -_08089710: +@08089710: pop {r1} bx r1 thumb_func_end sub_80896F4 thumb_func_start sub_8089714 -sub_8089714: @ 8089714 +sub_8089714: ; 8089714 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x7 - beq _08089722 + beq @08089722 movs r0, 0 - b _08089724 -_08089722: + b @08089724 +@08089722: movs r0, 0x1 -_08089724: +@08089724: pop {r1} bx r1 thumb_func_end sub_8089714 thumb_func_start is_tile_halfwater -is_tile_halfwater: @ 8089728 +is_tile_halfwater: ; 8089728 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x28 - beq _08089736 + beq @08089736 movs r0, 0 - b _08089738 -_08089736: + b @08089738 +@08089736: movs r0, 0x1 -_08089738: +@08089738: pop {r1} bx r1 thumb_func_end is_tile_halfwater thumb_func_start is_tile_x13_waterfall -is_tile_x13_waterfall: @ 808973C +is_tile_x13_waterfall: ; 808973C push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x13 - beq _0808974A + beq @0808974A movs r0, 0 - b _0808974C -_0808974A: + b @0808974C +@0808974A: movs r0, 0x1 -_0808974C: +@0808974C: pop {r1} bx r1 thumb_func_end is_tile_x13_waterfall thumb_func_start sub_8089750 -sub_8089750: @ 8089750 +sub_8089750: ; 8089750 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x78 - beq _0808975E + beq @0808975E movs r0, 0 - b _08089760 -_0808975E: + b @08089760 +@0808975E: movs r0, 0x1 -_08089760: +@08089760: pop {r1} bx r1 thumb_func_end sub_8089750 thumb_func_start sub_8089764 -sub_8089764: @ 8089764 +sub_8089764: ; 8089764 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x74 - beq _08089772 + beq @08089772 movs r0, 0 - b _08089774 -_08089772: + b @08089774 +@08089772: movs r0, 0x1 -_08089774: +@08089774: pop {r1} bx r1 thumb_func_end sub_8089764 thumb_func_start sub_8089778 -sub_8089778: @ 8089778 +sub_8089778: ; 8089778 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x75 - beq _08089786 + beq @08089786 movs r0, 0 - b _08089788 -_08089786: + b @08089788 +@08089786: movs r0, 0x1 -_08089788: +@08089788: pop {r1} bx r1 thumb_func_end sub_8089778 thumb_func_start sub_808978C -sub_808978C: @ 808978C +sub_808978C: ; 808978C push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x76 - beq _0808979A + beq @0808979A movs r0, 0 - b _0808979C -_0808979A: + b @0808979C +@0808979A: movs r0, 0x1 -_0808979C: +@0808979C: pop {r1} bx r1 thumb_func_end sub_808978C thumb_func_start sub_80897A0 -sub_80897A0: @ 80897A0 +sub_80897A0: ; 80897A0 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x77 - beq _080897AE + beq @080897AE movs r0, 0 - b _080897B0 -_080897AE: + b @080897B0 +@080897AE: movs r0, 0x1 -_080897B0: +@080897B0: pop {r1} bx r1 thumb_func_end sub_80897A0 thumb_func_start is_tile_x17 -is_tile_x17: @ 80897B4 +is_tile_x17: ; 80897B4 push {lr} lsls r0, 24 movs r1, 0x8C @@ -250420,444 +250420,444 @@ is_tile_x17: @ 80897B4 adds r0, r1 lsrs r0, 24 cmp r0, 0x3 - bls _080897C8 + bls @080897C8 movs r0, 0 - b _080897CA -_080897C8: + b @080897CA +@080897C8: movs r0, 0x1 -_080897CA: +@080897CA: pop {r1} bx r1 thumb_func_end is_tile_x17 thumb_func_start is_tile_x8C -is_tile_x8C: @ 80897D0 +is_tile_x8C: ; 80897D0 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x8C - beq _080897DE + beq @080897DE movs r0, 0 - b _080897E0 -_080897DE: + b @080897E0 +@080897DE: movs r0, 0x1 -_080897E0: +@080897E0: pop {r1} bx r1 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 cmp r0, 0x85 - beq _080897F2 + beq @080897F2 movs r0, 0 - b _080897F4 -_080897F2: + b @080897F4 +@080897F2: movs r0, 0x1 -_080897F4: +@080897F4: pop {r1} bx r1 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 cmp r0, 0x8B - beq _08089806 + beq @08089806 movs r0, 0 - b _08089808 -_08089806: + b @08089808 +@08089806: movs r0, 0x1 -_08089808: +@08089808: pop {r1} bx r1 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 cmp r0, 0xEA - beq _0808981A + beq @0808981A movs r0, 0 - b _0808981C -_0808981A: + b @0808981C +@0808981A: movs r0, 0x1 -_0808981C: +@0808981C: pop {r1} bx r1 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 cmp r0, 0x8A - beq _0808982E + beq @0808982E movs r0, 0 - b _08089830 -_0808982E: + b @08089830 +@0808982E: movs r0, 0x1 -_08089830: +@08089830: pop {r1} bx r1 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 cmp r0, 0x87 - beq _08089842 + beq @08089842 movs r0, 0 - b _08089844 -_08089842: + b @08089844 +@08089842: movs r0, 0x1 -_08089844: +@08089844: pop {r1} bx r1 thumb_func_end is_tile_x87 thumb_func_start sub_8089848 -sub_8089848: @ 8089848 +sub_8089848: ; 8089848 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xBB - beq _08089856 + beq @08089856 movs r0, 0 - b _08089858 -_08089856: + b @08089858 +@08089856: movs r0, 0x1 -_08089858: +@08089858: pop {r1} bx r1 thumb_func_end sub_8089848 thumb_func_start sub_808985C -sub_808985C: @ 808985C +sub_808985C: ; 808985C push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xBC - beq _0808986A + beq @0808986A movs r0, 0 - b _0808986C -_0808986A: + b @0808986C +@0808986A: movs r0, 0x1 -_0808986C: +@0808986C: pop {r1} bx r1 thumb_func_end sub_808985C thumb_func_start sub_8089870 -sub_8089870: @ 8089870 +sub_8089870: ; 8089870 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x29 - beq _0808987E + beq @0808987E movs r0, 0 - b _08089880 -_0808987E: + b @08089880 +@0808987E: movs r0, 0x1 -_08089880: +@08089880: pop {r1} bx r1 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 cmp r0, 0x68 - beq _08089892 + beq @08089892 movs r0, 0 - b _08089894 -_08089892: + b @08089894 +@08089892: movs r0, 0x1 -_08089894: +@08089894: pop {r1} bx r1 thumb_func_end is_role_x68 thumb_func_start sub_8089898 -sub_8089898: @ 8089898 +sub_8089898: ; 8089898 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x67 - beq _080898A6 + beq @080898A6 movs r0, 0 - b _080898A8 -_080898A6: + b @080898A8 +@080898A6: movs r0, 0x1 -_080898A8: +@080898A8: pop {r1} bx r1 thumb_func_end sub_8089898 thumb_func_start sub_80898AC -sub_80898AC: @ 80898AC +sub_80898AC: ; 80898AC push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x70 - beq _080898BA + beq @080898BA movs r0, 0 - b _080898BC -_080898BA: + b @080898BC +@080898BA: movs r0, 0x1 -_080898BC: +@080898BC: pop {r1} bx r1 thumb_func_end sub_80898AC thumb_func_start sub_80898C0 -sub_80898C0: @ 80898C0 +sub_80898C0: ; 80898C0 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xE - beq _080898CE + beq @080898CE movs r0, 0 - b _080898D0 -_080898CE: + b @080898D0 +@080898CE: movs r0, 0x1 -_080898D0: +@080898D0: pop {r1} bx r1 thumb_func_end sub_80898C0 thumb_func_start block_field_1_weird_index -block_field_1_weird_index: @ 80898D4 +block_field_1_weird_index: ; 80898D4 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x10 - beq _080898F8 + beq @080898F8 cmp r0, 0x15 - beq _080898F8 + beq @080898F8 cmp r0, 0x11 - beq _080898F8 + beq @080898F8 cmp r0, 0x12 - beq _080898F8 + beq @080898F8 cmp r0, 0x14 - beq _080898F8 + beq @080898F8 subs r0, 0x50 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bhi _080898FC -_080898F8: + bhi @080898FC +@080898F8: movs r0, 0x1 - b _080898FE -_080898FC: + b @080898FE +@080898FC: movs r0, 0 -_080898FE: +@080898FE: pop {r1} bx r1 thumb_func_end block_field_1_weird_index thumb_func_start sub_8089904 -sub_8089904: @ 8089904 +sub_8089904: ; 8089904 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xF - beq _08089912 + beq @08089912 movs r0, 0 - b _08089914 -_08089912: + b @08089914 +@08089912: movs r0, 0x1 -_08089914: +@08089914: pop {r1} bx r1 thumb_func_end sub_8089904 thumb_func_start sub_8089918 -sub_8089918: @ 8089918 +sub_8089918: ; 8089918 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x66 - beq _08089926 + beq @08089926 movs r0, 0 - b _08089928 -_08089926: + b @08089928 +@08089926: movs r0, 0x1 -_08089928: +@08089928: pop {r1} bx r1 thumb_func_end sub_8089918 thumb_func_start sub_808992C -sub_808992C: @ 808992C +sub_808992C: ; 808992C push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xD2 - beq _0808993A + beq @0808993A movs r0, 0 - b _0808993C -_0808993A: + b @0808993C +@0808993A: movs r0, 0x1 -_0808993C: +@0808993C: pop {r1} bx r1 thumb_func_end sub_808992C thumb_func_start sub_8089940 -sub_8089940: @ 8089940 +sub_8089940: ; 8089940 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xD0 - beq _0808994E + beq @0808994E movs r0, 0 - b _08089950 -_0808994E: + b @08089950 +@0808994E: movs r0, 0x1 -_08089950: +@08089950: pop {r1} bx r1 thumb_func_end sub_8089940 thumb_func_start sub_8089954 -sub_8089954: @ 8089954 +sub_8089954: ; 8089954 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xD1 - beq _08089962 + beq @08089962 movs r0, 0 - b _08089964 -_08089962: + b @08089964 +@08089962: movs r0, 0x1 -_08089964: +@08089964: pop {r1} bx r1 thumb_func_end sub_8089954 thumb_func_start sub_8089968 -sub_8089968: @ 8089968 +sub_8089968: ; 8089968 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xD3 - beq _08089976 + beq @08089976 movs r0, 0 - b _08089978 -_08089976: + b @08089978 +@08089976: movs r0, 0x1 -_08089978: +@08089978: pop {r1} bx r1 thumb_func_end sub_8089968 thumb_func_start sub_808997C -sub_808997C: @ 808997C +sub_808997C: ; 808997C push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xD4 - beq _0808998A + beq @0808998A movs r0, 0 - b _0808998C -_0808998A: + b @0808998C +@0808998A: movs r0, 0x1 -_0808998C: +@0808998C: pop {r1} bx r1 thumb_func_end sub_808997C thumb_func_start sub_8089990 -sub_8089990: @ 8089990 +sub_8089990: ; 8089990 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xD5 - beq _0808999E + beq @0808999E movs r0, 0 - b _080899A0 -_0808999E: + b @080899A0 +@0808999E: movs r0, 0x1 -_080899A0: +@080899A0: pop {r1} bx r1 thumb_func_end sub_8089990 thumb_func_start sub_80899A4 -sub_80899A4: @ 80899A4 +sub_80899A4: ; 80899A4 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xD6 - beq _080899B2 + beq @080899B2 movs r0, 0 - b _080899B4 -_080899B2: + b @080899B4 +@080899B2: movs r0, 0x1 -_080899B4: +@080899B4: pop {r1} bx r1 thumb_func_end sub_80899A4 thumb_func_start it_tile_x22 -it_tile_x22: @ 80899B8 +it_tile_x22: ; 80899B8 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x22 - beq _080899C6 + beq @080899C6 cmp r0, 0x2A - bne _080899CA -_080899C6: + bne @080899CA +@080899C6: movs r0, 0x1 - b _080899CC -_080899CA: + b @080899CC +@080899CA: movs r0, 0 -_080899CC: +@080899CC: pop {r1} bx r1 thumb_func_end it_tile_x22 thumb_func_start sub_80899D0 -sub_80899D0: @ 80899D0 +sub_80899D0: ; 80899D0 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xA - beq _080899EC + beq @080899EC cmp r0, 0x3 - beq _080899EC + beq @080899EC cmp r0, 0x28 - beq _080899EC + beq @080899EC bl is_tile_x17 lsls r0, 24 cmp r0, 0 - beq _080899F0 -_080899EC: + beq @080899F0 +@080899EC: movs r0, 0x1 - b _080899F2 -_080899F0: + b @080899F2 +@080899F0: movs r0, 0 -_080899F2: +@080899F2: pop {r1} bx r1 thumb_func_end sub_80899D0 thumb_func_start sub_80899F8 -sub_80899F8: @ 80899F8 +sub_80899F8: ; 80899F8 push {lr} lsls r0, 24 lsrs r1, r0, 24 @@ -250866,274 +250866,274 @@ sub_80899F8: @ 80899F8 adds r0, r2 lsrs r0, 24 cmp r0, 0x1 - bls _08089A12 + bls @08089A12 cmp r1, 0x24 - beq _08089A12 + beq @08089A12 cmp r1, 0x9 - bne _08089A16 -_08089A12: + bne @08089A16 +@08089A12: movs r0, 0x1 - b _08089A18 -_08089A16: + b @08089A18 +@08089A16: movs r0, 0 -_08089A18: +@08089A18: pop {r1} bx r1 thumb_func_end sub_80899F8 thumb_func_start sub_8089A1C -sub_8089A1C: @ 8089A1C +sub_8089A1C: ; 8089A1C push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x8E - beq _08089A2A + beq @08089A2A movs r0, 0 - b _08089A2C -_08089A2A: + b @08089A2C +@08089A2A: movs r0, 0x1 -_08089A2C: +@08089A2C: pop {r1} bx r1 thumb_func_end sub_8089A1C thumb_func_start sub_8089A30 -sub_8089A30: @ 8089A30 +sub_8089A30: ; 8089A30 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xE0 - beq _08089A3E + beq @08089A3E movs r0, 0 - b _08089A40 -_08089A3E: + b @08089A40 +@08089A3E: movs r0, 0x1 -_08089A40: +@08089A40: pop {r1} bx r1 thumb_func_end sub_8089A30 thumb_func_start sub_8089A44 -sub_8089A44: @ 8089A44 +sub_8089A44: ; 8089A44 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xE1 - beq _08089A52 + beq @08089A52 movs r0, 0 - b _08089A54 -_08089A52: + b @08089A54 +@08089A52: movs r0, 0x1 -_08089A54: +@08089A54: pop {r1} bx r1 thumb_func_end sub_8089A44 thumb_func_start sub_8089A58 -sub_8089A58: @ 8089A58 +sub_8089A58: ; 8089A58 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xE2 - beq _08089A66 + beq @08089A66 movs r0, 0 - b _08089A68 -_08089A66: + b @08089A68 +@08089A66: movs r0, 0x1 -_08089A68: +@08089A68: pop {r1} bx r1 thumb_func_end sub_8089A58 thumb_func_start sub_8089A6C -sub_8089A6C: @ 8089A6C +sub_8089A6C: ; 8089A6C push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xE3 - beq _08089A7A + beq @08089A7A movs r0, 0 - b _08089A7C -_08089A7A: + b @08089A7C +@08089A7A: movs r0, 0x1 -_08089A7C: +@08089A7C: pop {r1} bx r1 thumb_func_end sub_8089A6C thumb_func_start sub_8089A80 -sub_8089A80: @ 8089A80 +sub_8089A80: ; 8089A80 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xE4 - beq _08089A8E + beq @08089A8E movs r0, 0 - b _08089A90 -_08089A8E: + b @08089A90 +@08089A8E: movs r0, 0x1 -_08089A90: +@08089A90: pop {r1} bx r1 thumb_func_end sub_8089A80 thumb_func_start sub_8089A94 -sub_8089A94: @ 8089A94 +sub_8089A94: ; 8089A94 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xE5 - beq _08089AA2 + beq @08089AA2 movs r0, 0 - b _08089AA4 -_08089AA2: + b @08089AA4 +@08089AA2: movs r0, 0x1 -_08089AA4: +@08089AA4: pop {r1} bx r1 thumb_func_end sub_8089A94 thumb_func_start sub_8089AA8 -sub_8089AA8: @ 8089AA8 +sub_8089AA8: ; 8089AA8 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xE6 - beq _08089AB6 + beq @08089AB6 movs r0, 0 - b _08089AB8 -_08089AB6: + b @08089AB8 +@08089AB6: movs r0, 0x1 -_08089AB8: +@08089AB8: pop {r1} bx r1 thumb_func_end sub_8089AA8 thumb_func_start sub_8089ABC -sub_8089ABC: @ 8089ABC +sub_8089ABC: ; 8089ABC push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xD - beq _08089ACA + beq @08089ACA movs r0, 0 - b _08089ACC -_08089ACA: + b @08089ACC +@08089ACA: movs r0, 0x1 -_08089ACC: +@08089ACC: pop {r1} bx r1 thumb_func_end sub_8089ABC thumb_func_start sub_8089AD0 -sub_8089AD0: @ 8089AD0 +sub_8089AD0: ; 8089AD0 push {lr} lsls r0, 24 lsrs r0, 24 lsls r1, 24 lsrs r1, 24 cmp r1, 0x2 - bne _08089AE2 + bne @08089AE2 cmp r0, 0xE8 - beq _08089AE6 -_08089AE2: + beq @08089AE6 +@08089AE2: movs r0, 0 - b _08089AE8 -_08089AE6: + b @08089AE8 +@08089AE6: movs r0, 0x1 -_08089AE8: +@08089AE8: pop {r1} bx r1 thumb_func_end sub_8089AD0 thumb_func_start sub_8089AEC -sub_8089AEC: @ 8089AEC +sub_8089AEC: ; 8089AEC push {lr} lsls r0, 24 lsrs r0, 24 lsls r1, 24 lsrs r1, 24 cmp r1, 0x2 - bne _08089AFE + bne @08089AFE cmp r0, 0xE7 - beq _08089B02 -_08089AFE: + beq @08089B02 +@08089AFE: movs r0, 0 - b _08089B04 -_08089B02: + b @08089B04 +@08089B02: movs r0, 0x1 -_08089B04: +@08089B04: pop {r1} bx r1 thumb_func_end sub_8089AEC thumb_func_start is_tile_x8F -is_tile_x8F: @ 8089B08 +is_tile_x8F: ; 8089B08 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x8F - beq _08089B16 + beq @08089B16 movs r0, 0 - b _08089B18 -_08089B16: + b @08089B18 +@08089B16: movs r0, 0x1 -_08089B18: +@08089B18: pop {r1} bx r1 thumb_func_end is_tile_x8F thumb_func_start sub_8089B1C -sub_8089B1C: @ 8089B1C +sub_8089B1C: ; 8089B1C push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - beq _08089B2A + beq @08089B2A movs r0, 0 - b _08089B2C -_08089B2A: + b @08089B2C +@08089B2A: movs r0, 0x1 -_08089B2C: +@08089B2C: pop {r1} bx r1 thumb_func_end sub_8089B1C thumb_func_start sub_8089B30 -sub_8089B30: @ 8089B30 +sub_8089B30: ; 8089B30 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x9 - beq _08089B3E + beq @08089B3E movs r0, 0 - b _08089B40 -_08089B3E: + b @08089B40 +@08089B3E: movs r0, 0x1 -_08089B40: +@08089B40: pop {r1} bx r1 thumb_func_end sub_8089B30 thumb_func_start sub_8089B44 -sub_8089B44: @ 8089B44 +sub_8089B44: ; 8089B44 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0xE9 - beq _08089B52 + beq @08089B52 movs r0, 0 - b _08089B54 -_08089B52: + b @08089B54 +@08089B52: movs r0, 0x1 -_08089B54: +@08089B54: pop {r1} bx r1 thumb_func_end sub_8089B44 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] @@ -251145,7 +251145,7 @@ move_tilemap_camera_to_upper_left_corner_: @ 8089B58 thumb_func_end move_tilemap_camera_to_upper_left_corner_ thumb_func_start tilemap_move_something -tilemap_move_something: @ 8089B68 +tilemap_move_something: ; 8089B68 ldrb r3, [r0, 0x2] adds r3, r1 strb r3, [r0, 0x2] @@ -251163,7 +251163,7 @@ tilemap_move_something: @ 8089B68 thumb_func_end tilemap_move_something thumb_func_start coords8_add -coords8_add: @ 8089B84 +coords8_add: ; 8089B84 ldrb r3, [r0] adds r3, r1 strb r3, [r0] @@ -251174,8 +251174,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_ @@ -251186,7 +251186,7 @@ move_tilemap_camera_to_upper_left_corner: @ 8089B94 thumb_func_end move_tilemap_camera_to_upper_left_corner thumb_func_start sub_8089BA4 -sub_8089BA4: @ 8089BA4 +sub_8089BA4: ; 8089BA4 push {r4,r5,lr} ldr r1, =0x03000e20 ldr r0, =0x03000e28 @@ -251230,7 +251230,7 @@ sub_8089BA4: @ 8089BA4 thumb_func_end sub_8089BA4 thumb_func_start sub_8089C08 -sub_8089C08: @ 8089C08 +sub_8089C08: ; 8089C08 push {r4,lr} ldr r3, =0x03000e20 ldr r2, =0x03000e28 @@ -251252,8 +251252,8 @@ sub_8089C08: @ 8089C08 thumb_func_end sub_8089C08 thumb_func_start cur_mapdata_full_redraw -@ void cur_mapdata_full_redraw() -cur_mapdata_full_redraw: @ 8089C34 +; void cur_mapdata_full_redraw() +cur_mapdata_full_redraw: ; 8089C34 push {lr} ldr r0, =0x03005d8c ldr r1, [r0] @@ -251274,8 +251274,8 @@ cur_mapdata_full_redraw: @ 8089C34 thumb_func_end cur_mapdata_full_redraw thumb_func_start cur_mapdata_redraw_all_blocks_at -@ void cur_mapdata_redraw_all_blocks_at(int x, int y, mapdata_header *mapdata_header) -cur_mapdata_redraw_all_blocks_at: @ 8089C60 +; void cur_mapdata_redraw_all_blocks_at(int x, int y, mapdata_header *mapdata_header) +cur_mapdata_redraw_all_blocks_at: ; 8089C60 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -251286,35 +251286,35 @@ cur_mapdata_redraw_all_blocks_at: @ 8089C60 mov r9, r1 mov r8, r2 movs r1, 0 -_08089C74: +@08089C74: ldr r2, =0x03000e20 ldrb r0, [r2, 0x3] adds r0, r1, r0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1F - bls _08089C88 + bls @08089C88 subs r0, 0x20 lsls r0, 24 lsrs r0, 24 -_08089C88: +@08089C88: lsls r6, r0, 5 movs r4, 0 adds r7, r1, 0x2 str r7, [sp] lsrs r5, r1, 1 -_08089C92: +@08089C92: ldr r1, =0x03000e20 ldrb r0, [r1, 0x2] adds r0, r4, r0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1F - bls _08089CA6 + bls @08089CA6 subs r0, 0x20 lsls r0, 24 lsrs r0, 24 -_08089CA6: +@08089CA6: adds r1, r6, r0 lsls r1, 16 lsrs r1, 16 @@ -251328,12 +251328,12 @@ _08089CA6: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1F - bls _08089C92 + bls @08089C92 ldr r1, [sp] lsls r0, r1, 24 lsrs r1, r0, 24 cmp r1, 0x1F - bls _08089C74 + bls @08089C74 add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -251347,7 +251347,7 @@ _08089CA6: thumb_func_end cur_mapdata_redraw_all_blocks_at thumb_func_start cur_mapheader_draw_map_slice -cur_mapheader_draw_map_slice: @ 8089CE4 +cur_mapheader_draw_map_slice: ; 8089CE4 push {r4-r7,lr} adds r5, r0, 0 adds r6, r1, 0 @@ -251355,29 +251355,29 @@ cur_mapheader_draw_map_slice: @ 8089CE4 ldr r0, =0x02037318 ldr r4, [r0] cmp r6, 0 - ble _08089CFC + ble @08089CFC adds r0, r5, 0 adds r1, r4, 0 bl cur_mapheader_draw_map_slice_left -_08089CFC: +@08089CFC: cmp r6, 0 - bge _08089D08 + bge @08089D08 adds r0, r5, 0 adds r1, r4, 0 bl cur_mapheader_draw_map_slice_right -_08089D08: +@08089D08: cmp r7, 0 - ble _08089D14 + ble @08089D14 adds r0, r5, 0 adds r1, r4, 0 bl cur_mapheader_draw_map_slice_above -_08089D14: +@08089D14: cmp r7, 0 - bge _08089D20 + bge @08089D20 adds r0, r5, 0 adds r1, r4, 0 bl cur_mapheader_draw_map_slice_below -_08089D20: +@08089D20: movs r0, 0x1 strb r0, [r5, 0x4] pop {r4-r7} @@ -251388,7 +251388,7 @@ _08089D20: thumb_func_end cur_mapheader_draw_map_slice thumb_func_start cur_mapheader_draw_map_slice_above -cur_mapheader_draw_map_slice_above: @ 8089D30 +cur_mapheader_draw_map_slice_above: ; 8089D30 push {r4-r7,lr} adds r5, r0, 0 adds r7, r1, 0 @@ -251397,24 +251397,24 @@ cur_mapheader_draw_map_slice_above: @ 8089D30 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1F - bls _08089D48 + bls @08089D48 subs r0, 0x20 lsls r0, 24 lsrs r0, 24 -_08089D48: +@08089D48: lsls r6, r0, 5 movs r4, 0 -_08089D4C: +@08089D4C: ldrb r0, [r5, 0x2] adds r0, r4, r0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1F - bls _08089D5E + bls @08089D5E subs r0, 0x20 lsls r0, 24 lsrs r0, 24 -_08089D5E: +@08089D5E: adds r1, r6, r0 lsls r1, 16 lsrs r1, 16 @@ -251433,7 +251433,7 @@ _08089D5E: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1F - bls _08089D4C + bls @08089D4C pop {r4-r7} pop {r0} bx r0 @@ -251442,24 +251442,24 @@ _08089D5E: thumb_func_end cur_mapheader_draw_map_slice_above thumb_func_start cur_mapheader_draw_map_slice_below -cur_mapheader_draw_map_slice_below: @ 8089D90 +cur_mapheader_draw_map_slice_below: ; 8089D90 push {r4-r7,lr} adds r5, r0, 0 adds r7, r1, 0 ldrb r0, [r5, 0x3] lsls r6, r0, 5 movs r4, 0 -_08089D9C: +@08089D9C: ldrb r0, [r5, 0x2] adds r0, r4, r0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1F - bls _08089DAE + bls @08089DAE subs r0, 0x20 lsls r0, 24 lsrs r0, 24 -_08089DAE: +@08089DAE: adds r1, r6, r0 ldr r0, =0x03005d8c ldr r3, [r0] @@ -251475,7 +251475,7 @@ _08089DAE: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1F - bls _08089D9C + bls @08089D9C pop {r4-r7} pop {r0} bx r0 @@ -251484,7 +251484,7 @@ _08089DAE: thumb_func_end cur_mapheader_draw_map_slice_below thumb_func_start cur_mapheader_draw_map_slice_right -cur_mapheader_draw_map_slice_right: @ 8089DDC +cur_mapheader_draw_map_slice_right: ; 8089DDC push {r4-r7,lr} mov r7, r8 push {r7} @@ -251492,17 +251492,17 @@ cur_mapheader_draw_map_slice_right: @ 8089DDC mov r8, r1 ldrb r6, [r5, 0x2] movs r4, 0 -_08089DEA: +@08089DEA: ldrb r0, [r5, 0x3] adds r0, r4, r0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1F - bls _08089DFC + bls @08089DFC subs r0, 0x20 lsls r0, 24 lsrs r0, 24 -_08089DFC: +@08089DFC: lsls r1, r0, 5 adds r1, r6 lsls r1, 16 @@ -251521,7 +251521,7 @@ _08089DFC: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1F - bls _08089DEA + bls @08089DEA pop {r3} mov r8, r3 pop {r4-r7} @@ -251532,7 +251532,7 @@ _08089DFC: thumb_func_end cur_mapheader_draw_map_slice_right thumb_func_start cur_mapheader_draw_map_slice_left -cur_mapheader_draw_map_slice_left: @ 8089E34 +cur_mapheader_draw_map_slice_left: ; 8089E34 push {r4-r7,lr} mov r7, r8 push {r7} @@ -251543,24 +251543,24 @@ cur_mapheader_draw_map_slice_left: @ 8089E34 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x1F - bls _08089E52 + bls @08089E52 adds r0, r5, 0 subs r0, 0x20 lsls r0, 24 lsrs r5, r0, 24 -_08089E52: +@08089E52: movs r4, 0 -_08089E54: +@08089E54: ldrb r0, [r6, 0x3] adds r0, r4, r0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1F - bls _08089E66 + bls @08089E66 subs r0, 0x20 lsls r0, 24 lsrs r0, 24 -_08089E66: +@08089E66: lsls r1, r0, 5 adds r1, r5 lsls r1, 16 @@ -251580,7 +251580,7 @@ _08089E66: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1F - bls _08089E54 + bls @08089E54 pop {r3} mov r8, r3 pop {r4-r7} @@ -251591,7 +251591,7 @@ _08089E66: thumb_func_end cur_mapheader_draw_map_slice_left thumb_func_start cur_mapdata_draw_block_at -cur_mapdata_draw_block_at: @ 8089EA0 +cur_mapdata_draw_block_at: ; 8089EA0 push {r4-r6,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -251602,7 +251602,7 @@ cur_mapdata_draw_block_at: @ 8089EA0 bl map_pos_to_screenspace adds r1, r0, 0 cmp r1, 0 - blt _08089ECC + blt @08089ECC ldr r0, =0x02037318 ldr r0, [r0] lsls r1, 16 @@ -251612,7 +251612,7 @@ cur_mapdata_draw_block_at: @ 8089EA0 bl cur_mapdata_draw_block_at_internal movs r0, 0x1 strb r0, [r6, 0x4] -_08089ECC: +@08089ECC: pop {r4-r6} pop {r0} bx r0 @@ -251621,7 +251621,7 @@ _08089ECC: thumb_func_end cur_mapdata_draw_block_at thumb_func_start overworld_draw_block_type1_on_map_coord -overworld_draw_block_type1_on_map_coord: @ 8089EDC +overworld_draw_block_type1_on_map_coord: ; 8089EDC push {r4-r6,lr} adds r3, r0, 0 adds r4, r1, 0 @@ -251632,7 +251632,7 @@ overworld_draw_block_type1_on_map_coord: @ 8089EDC adds r2, r4, 0 bl map_pos_to_screenspace cmp r0, 0 - blt _08089F04 + blt @08089F04 lsls r2, r0, 16 lsrs r2, 16 movs r0, 0x1 @@ -251640,7 +251640,7 @@ overworld_draw_block_type1_on_map_coord: @ 8089EDC bl overworld_draw_block movs r0, 0x1 strb r0, [r6, 0x4] -_08089F04: +@08089F04: pop {r4-r6} pop {r0} bx r0 @@ -251649,8 +251649,8 @@ _08089F04: thumb_func_end overworld_draw_block_type1_on_map_coord thumb_func_start cur_mapdata_draw_block_at_internal -@ void cur_mapdata_draw_block_at_internal(mapdata_header *mapdata_header, u16 offset, int x, int y) -cur_mapdata_draw_block_at_internal: @ 8089F10 +; void cur_mapdata_draw_block_at_internal(mapdata_header *mapdata_header, u16 offset, int x, int y) +cur_mapdata_draw_block_at_internal: ; 8089F10 push {r4-r7,lr} mov r7, r8 push {r7} @@ -251668,25 +251668,25 @@ cur_mapdata_draw_block_at_internal: @ 8089F10 movs r0, 0x80 lsls r0, 3 cmp r4, r0 - bls _08089F38 + bls @08089F38 movs r4, 0 -_08089F38: +@08089F38: ldr r0, =0x000001ff cmp r4, r0 - bhi _08089F48 + bhi @08089F48 ldr r0, [r5, 0x10] ldr r5, [r0, 0xC] - b _08089F54 + b @08089F54 .align 2, 0 .pool -_08089F48: +@08089F48: ldr r0, [r5, 0x14] ldr r5, [r0, 0xC] ldr r1, =0xfffffe00 adds r0, r4, r1 lsls r0, 16 lsrs r4, r0, 16 -_08089F54: +@08089F54: adds r0, r6, 0 adds r1, r7, 0 bl cur_mapdata_block_get_bgs_at @@ -251706,22 +251706,22 @@ _08089F54: thumb_func_end cur_mapdata_draw_block_at_internal thumb_func_start overworld_draw_block -@ void overworld_draw_block(int bg, void *block, u16 offset) -overworld_draw_block: @ 8089F78 +; void overworld_draw_block(int bg, void *block, u16 offset) +overworld_draw_block: ; 8089F78 push {r4,lr} adds r4, r1, 0 lsls r2, 16 lsrs r2, 16 cmp r0, 0x1 - beq _08089FD0 + beq @08089FD0 cmp r0, 0x1 - bgt _08089F8E + bgt @08089F8E cmp r0, 0 - beq _0808A030 - b _0808A082 -_08089F8E: + beq @0808A030 + b @0808A082 +@08089F8E: cmp r0, 0x2 - bne _0808A082 + bne @0808A082 ldr r0, =0x03005da4 ldr r0, [r0] lsls r3, r2, 1 @@ -251748,10 +251748,10 @@ _08089F8E: strh r2, [r1] adds r0, 0x42 strh r2, [r0] - b _0808A066 + b @0808A066 .align 2, 0 .pool -_08089FD0: +@08089FD0: ldr r0, =0x03005da4 ldr r0, [r0] lsls r3, r2, 1 @@ -251792,10 +251792,10 @@ _08089FD0: strh r1, [r0] adds r3, 0x42 strh r1, [r3] - b _0808A082 + b @0808A082 .align 2, 0 .pool -_0808A030: +@0808A030: ldr r0, =0x03005da4 ldr r0, [r0] lsls r3, r2, 1 @@ -251823,7 +251823,7 @@ _0808A030: adds r0, 0x42 ldrh r1, [r4, 0x6] strh r1, [r0] -_0808A066: +@0808A066: ldr r0, =0x03005da0 ldr r0, [r0] adds r3, r0 @@ -251838,7 +251838,7 @@ _0808A066: adds r3, 0x42 ldrh r0, [r4, 0xE] strh r0, [r3] -_0808A082: +@0808A082: movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram movs r0, 0x2 @@ -251853,7 +251853,7 @@ _0808A082: thumb_func_end overworld_draw_block thumb_func_start map_pos_to_screenspace -map_pos_to_screenspace: @ 808A0AC +map_pos_to_screenspace: ; 808A0AC push {r4,r5,lr} adds r4, r0, 0 ldr r0, =0x03005d8c @@ -251863,47 +251863,47 @@ map_pos_to_screenspace: @ 808A0AC subs r1, r0 lsls r1, 1 cmp r1, 0x1F - bhi _0808A0D6 + bhi @0808A0D6 ldrb r0, [r4, 0x2] adds r1, r0 cmp r1, 0x1F - ble _0808A0CA + ble @0808A0CA subs r1, 0x20 -_0808A0CA: +@0808A0CA: movs r5, 0x2 ldrsh r0, [r3, r5] subs r0, r2, r0 lsls r2, r0, 1 cmp r2, 0x1F - bls _0808A0E0 -_0808A0D6: + bls @0808A0E0 +@0808A0D6: movs r0, 0x1 negs r0, r0 - b _0808A0EE + b @0808A0EE .align 2, 0 .pool -_0808A0E0: +@0808A0E0: ldrb r0, [r4, 0x3] adds r2, r0 cmp r2, 0x1F - ble _0808A0EA + ble @0808A0EA subs r2, 0x20 -_0808A0EA: +@0808A0EA: lsls r0, r2, 5 adds r0, r1 -_0808A0EE: +@0808A0EE: pop {r4,r5} pop {r1} bx r1 thumb_func_end map_pos_to_screenspace thumb_func_start sub_808A0F4 -sub_808A0F4: @ 808A0F4 +sub_808A0F4: ; 808A0F4 push {lr} adds r3, r0, 0 ldr r2, [r3, 0x4] cmp r2, 0 - beq _0808A114 + beq @0808A114 ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -251915,7 +251915,7 @@ sub_808A0F4: @ 808A0F4 movs r1, 0x34 ldrsh r0, [r0, r1] str r0, [r3, 0xC] -_0808A114: +@0808A114: pop {r0} bx r0 .align 2, 0 @@ -251923,7 +251923,7 @@ _0808A114: thumb_func_end sub_808A0F4 thumb_func_start clear_all_callback6 -clear_all_callback6: @ 808A11C +clear_all_callback6: ; 808A11C ldr r1, =0x03005dd0 movs r0, 0 str r0, [r1, 0x8] @@ -251938,21 +251938,21 @@ clear_all_callback6: @ 808A11C thumb_func_end clear_all_callback6 thumb_func_start sub_808A134 -sub_808A134: @ 808A134 +sub_808A134: ; 808A134 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 ldr r4, =0x03005dd0 ldr r1, [r4, 0x4] cmp r1, 0 - beq _0808A150 + beq @0808A150 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles -_0808A150: +@0808A150: adds r0, r5, 0 bl sub_808ED34 lsls r0, 24 @@ -251969,17 +251969,17 @@ _0808A150: thumb_func_end sub_808A134 thumb_func_start camera_update -camera_update: @ 808A174 +camera_update: ; 808A174 push {r4-r7,lr} mov r7, r8 push {r7} ldr r6, =0x03005dd0 ldr r1, [r6] cmp r1, 0 - beq _0808A188 + beq @0808A188 adds r0, r6, 0 bl _call_via_r1 -_0808A188: +@0808A188: ldr r7, [r6, 0x8] ldr r0, [r6, 0xC] mov r8, r0 @@ -251988,55 +251988,55 @@ _0808A188: ldr r1, [r6, 0x10] ldr r0, [r6, 0x14] cmp r1, 0 - bne _0808A1A6 + bne @0808A1A6 cmp r7, 0 - beq _0808A1A6 + beq @0808A1A6 subs r4, 0x1 cmp r7, 0 - ble _0808A1A6 + ble @0808A1A6 movs r4, 0x1 -_0808A1A6: +@0808A1A6: cmp r0, 0 - bne _0808A1BA + bne @0808A1BA mov r2, r8 cmp r2, 0 - beq _0808A1BA + beq @0808A1BA movs r5, 0x1 negs r5, r5 cmp r2, 0 - ble _0808A1BA + ble @0808A1BA movs r5, 0x1 -_0808A1BA: +@0808A1BA: cmp r1, 0 - beq _0808A1CC + beq @0808A1CC cmn r1, r7 - bne _0808A1CC + bne @0808A1CC movs r4, 0x1 negs r4, r4 cmp r7, 0 - ble _0808A1CC + ble @0808A1CC movs r4, 0x1 -_0808A1CC: +@0808A1CC: cmp r0, 0 - beq _0808A1E0 + beq @0808A1E0 mov r3, r8 cmn r0, r3 - bne _0808A1E0 + bne @0808A1E0 movs r4, 0x1 negs r4, r4 cmp r3, 0 - ble _0808A1E0 + ble @0808A1E0 movs r4, 0x1 -_0808A1E0: +@0808A1E0: ldr r2, =0x03005dd0 ldr r0, [r2, 0x10] adds r1, r0, r7 str r1, [r2, 0x10] adds r0, r1, 0 cmp r1, 0 - bge _0808A1F0 + bge @0808A1F0 adds r0, 0xF -_0808A1F0: +@0808A1F0: asrs r0, 4 lsls r0, 4 subs r0, r1, r0 @@ -252047,18 +252047,18 @@ _0808A1F0: str r1, [r2, 0x14] adds r0, r1, 0 cmp r1, 0 - bge _0808A208 + bge @0808A208 adds r0, 0xF -_0808A208: +@0808A208: asrs r0, 4 lsls r0, 4 subs r0, r1, r0 str r0, [r2, 0x14] cmp r4, 0 - bne _0808A218 + bne @0808A218 cmp r5, 0 - beq _0808A24E -_0808A218: + beq @0808A24E +@0808A218: adds r0, r4, 0 adds r1, r5, 0 bl camera_move_maybe @@ -252080,7 +252080,7 @@ _0808A218: adds r1, r4, 0 adds r2, r5, 0 bl cur_mapheader_draw_map_slice -_0808A24E: +@0808A24E: ldr r0, =0x03000e20 adds r1, r7, 0 mov r2, r8 @@ -252104,7 +252104,7 @@ _0808A24E: thumb_func_end camera_update thumb_func_start camera_move_and_redraw -camera_move_and_redraw: @ 808A284 +camera_move_and_redraw: ; 808A284 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -252133,7 +252133,7 @@ camera_move_and_redraw: @ 808A284 thumb_func_end camera_move_and_redraw thumb_func_start sub_808A2C0 -sub_808A2C0: @ 808A2C0 +sub_808A2C0: ; 808A2C0 ldr r1, =0x03000e30 str r0, [r1] bx lr @@ -252142,7 +252142,7 @@ sub_808A2C0: @ 808A2C0 thumb_func_end sub_808A2C0 thumb_func_start sub_808A2CC -sub_808A2CC: @ 808A2CC +sub_808A2CC: ; 808A2CC ldr r2, =0x03000e28 strh r0, [r2] ldr r0, =0x03000e2a @@ -252156,7 +252156,7 @@ sub_808A2CC: @ 808A2CC thumb_func_end sub_808A2CC thumb_func_start sub_808A2E4 -sub_808A2E4: @ 808A2E4 +sub_808A2E4: ; 808A2E4 ldr r1, =0x03000e30 ldr r0, =nu_805AE74 + 1 str r0, [r1] @@ -252175,14 +252175,14 @@ sub_808A2E4: @ 808A2E4 thumb_func_end sub_808A2E4 thumb_func_start sub_808A314 -sub_808A314: @ 808A314 +sub_808A314: ; 808A314 push {lr} ldr r0, =0x03000e30 ldr r0, [r0] cmp r0, 0 - beq _0808A322 + beq @0808A322 bl _call_via_r0 -_0808A322: +@0808A322: ldr r2, =0x02021bbc ldr r0, =0x03005dec ldr r1, =0x03000e28 @@ -252205,41 +252205,41 @@ _0808A322: thumb_func_end sub_808A314 thumb_func_start nu_805AE74 -nu_805AE74: @ 808A360 +nu_805AE74: ; 808A360 push {lr} ldr r0, =0x02037348 ldrb r0, [r0] cmp r0, 0 - bne _0808A374 + bne @0808A374 bl sub_808A2E4 - b _0808A3FC + b @0808A3FC .align 2, 0 .pool -_0808A374: +@0808A374: ldr r0, =0x02037590 ldrb r0, [r0, 0x3] cmp r0, 0x1 - bne _0808A394 + bne @0808A394 ldr r0, =0x03000e2c ldrb r1, [r0] movs r2, 0x1 eors r1, r2 strb r1, [r0] cmp r1, 0 - beq _0808A3FC - b _0808A39A + beq @0808A3FC + b @0808A39A .align 2, 0 .pool -_0808A394: +@0808A394: ldr r1, =0x03000e2c movs r0, 0 strb r0, [r1] -_0808A39A: +@0808A39A: bl player_get_direction_upper_4bits lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _0808A3C4 + bne @0808A3C4 ldr r2, =0x03000e2a ldrh r3, [r2] movs r0, 0 @@ -252247,71 +252247,71 @@ _0808A39A: movs r0, 0x8 negs r0, r0 cmp r1, r0 - ble _0808A3FC + ble @0808A3FC subs r0, r3, 0x2 - b _0808A3FA + b @0808A3FA .align 2, 0 .pool -_0808A3C4: +@0808A3C4: cmp r0, 0x1 - bne _0808A3E0 + bne @0808A3E0 ldr r1, =0x03000e2a ldrh r2, [r1] movs r3, 0 ldrsh r0, [r1, r3] cmp r0, 0x47 - bgt _0808A3FC + bgt @0808A3FC adds r0, r2, 0x2 strh r0, [r1] - b _0808A3FC + b @0808A3FC .align 2, 0 .pool -_0808A3E0: +@0808A3E0: ldr r2, =0x03000e2a ldrh r0, [r2] movs r3, 0 ldrsh r1, [r2, r3] cmp r1, 0x1F - bgt _0808A3F4 + bgt @0808A3F4 adds r0, 0x2 - b _0808A3FA + b @0808A3FA .align 2, 0 .pool -_0808A3F4: +@0808A3F4: cmp r1, 0x20 - ble _0808A3FC + ble @0808A3FC subs r0, 0x2 -_0808A3FA: +@0808A3FA: strh r0, [r2] -_0808A3FC: +@0808A3FC: pop {r0} bx r0 thumb_func_end nu_805AE74 thumb_func_start sub_808A400 -sub_808A400: @ 808A400 +sub_808A400: ; 808A400 push {lr} adds r2, r0, 0 ldrb r0, [r2, 0x3] cmp r0, 0x2 - bne _0808A420 + bne @0808A420 ldrh r1, [r1, 0x2] ldr r0, [r2, 0x4] adds r0, r1 ldr r1, =0x06007e00 movs r2, 0x80 bl CpuFastSet - b _0808A42E + b @0808A42E .align 2, 0 .pool -_0808A420: +@0808A420: ldrh r1, [r1, 0x2] ldr r0, [r2, 0x4] adds r0, r1 ldr r1, =0x06007f00 movs r2, 0x40 bl CpuFastSet -_0808A42E: +@0808A42E: pop {r0} bx r0 .align 2, 0 @@ -252319,14 +252319,14 @@ _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 lsrs r5, r1, 16 movs r4, 0 adds r1, r6, 0 -_0808A444: +@0808A444: ldrb r0, [r2] lsls r0, 28 lsrs r3, r0, 16 @@ -252337,12 +252337,12 @@ _0808A444: adds r1, 0x2 adds r4, 0x1 cmp r4, 0x3 - ble _0808A444 + ble @0808A444 cmp r4, 0x7 - bgt _0808A472 + bgt @0808A472 lsls r0, r4, 1 adds r1, r0, r6 -_0808A462: +@0808A462: ldrb r0, [r2] lsls r3, r0, 12 adds r2, 0x1 @@ -252350,15 +252350,15 @@ _0808A462: adds r1, 0x2 adds r4, 0x1 cmp r4, 0x7 - ble _0808A462 -_0808A472: + ble @0808A462 +@0808A472: pop {r4-r6} pop {r0} bx r0 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 @@ -252369,7 +252369,7 @@ door_patch_tilemap: @ 808A478 adds r5, r3, 0 ldrb r0, [r0, 0x3] cmp r0, 0x2 - bne _0808A4F4 + bne @0808A4F4 add r4, sp, 0x10 movs r1, 0xFC lsls r1, 2 @@ -252412,8 +252412,8 @@ door_patch_tilemap: @ 808A478 mov r1, r9 adds r2, r4, 0 bl overworld_draw_block_type1_on_map_coord - b _0808A522 -_0808A4F4: + b @0808A522 +@0808A4F4: movs r1, 0xFE lsls r1, 2 mov r0, sp @@ -252433,7 +252433,7 @@ _0808A4F4: mov r1, r9 mov r2, sp bl overworld_draw_block_type1_on_map_coord -_0808A522: +@0808A522: add sp, 0x30 pop {r3,r4} mov r8, r3 @@ -252444,7 +252444,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 @@ -252458,7 +252458,7 @@ sub_808A530: @ 808A530 bl cur_mapdata_draw_block_at ldrb r0, [r4, 0x3] cmp r0, 0x2 - bne _0808A562 + bne @0808A562 adds r4, r5, 0x1 adds r0, r4, 0 adds r1, r7, 0 @@ -252466,14 +252466,14 @@ sub_808A530: @ 808A530 adds r0, r4, 0 adds r1, r6, 0 bl cur_mapdata_draw_block_at -_0808A562: +@0808A562: pop {r4-r7} pop {r0} bx r0 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 @@ -252482,7 +252482,7 @@ sub_808A568: @ 808A568 ldrh r1, [r5, 0x2] ldr r0, =0x0000ffff cmp r1, r0 - bne _0808A5B0 + bne @0808A5B0 adds r0, r4, 0 adds r1, r6, 0 adds r2, r7, 0 @@ -252490,7 +252490,7 @@ sub_808A568: @ 808A568 bl sub_808A964 lsls r0, 24 cmp r0, 0 - beq _0808A5E2 + beq @0808A5E2 ldr r0, =0x020375e0 ldrh r1, [r0] adds r1, 0x7 @@ -252499,10 +252499,10 @@ sub_808A568: @ 808A568 adds r2, 0x7 adds r0, r4, 0 bl sub_808A530 - b _0808A5E2 + b @0808A5E2 .align 2, 0 .pool -_0808A5B0: +@0808A5B0: adds r0, r4, 0 adds r1, r5, 0 bl sub_808A400 @@ -252514,7 +252514,7 @@ _0808A5B0: bl sub_808A964 lsls r0, 24 cmp r0, 0 - beq _0808A5E2 + beq @0808A5E2 ldr r0, =0x020375e0 ldrh r1, [r0] adds r1, 0x7 @@ -252524,7 +252524,7 @@ _0808A5B0: ldr r3, [r4, 0x8] adds r0, r4, 0 bl door_patch_tilemap -_0808A5E2: +@0808A5E2: pop {r4-r7} pop {r0} bx r0 @@ -252533,7 +252533,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 @@ -252541,7 +252541,7 @@ sub_808A5F0: @ 808A5F0 movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0 - bne _0808A616 + bne @0808A616 movs r2, 0x8 ldrsh r1, [r4, r2] lsls r1, 2 @@ -252552,7 +252552,7 @@ sub_808A5F0: @ 808A5F0 ldrsh r3, [r4, r0] adds r0, r6, 0 bl sub_808A568 -_0808A616: +@0808A616: movs r2, 0xA ldrsh r1, [r4, r2] movs r2, 0x8 @@ -252561,7 +252561,7 @@ _0808A616: adds r0, r5 ldrb r0, [r0] cmp r1, r0 - bne _0808A644 + bne @0808A644 movs r0, 0 strh r0, [r4, 0xA] ldrh r0, [r4, 0x8] @@ -252573,23 +252573,23 @@ _0808A616: adds r0, r5 ldrb r0, [r0] cmp r0, 0 - bne _0808A64A + bne @0808A64A movs r0, 0 - b _0808A64C -_0808A644: + b @0808A64C +@0808A644: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] -_0808A64A: +@0808A64A: movs r0, 0x1 -_0808A64C: +@0808A64C: pop {r4-r6} pop {r1} bx r1 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 @@ -252608,10 +252608,10 @@ task50_overworld_door: @ 808A654 orrs r0, r3 bl sub_808A5F0 cmp r0, 0 - bne _0808A682 + bne @0808A682 adds r0, r4, 0 bl remove_task -_0808A682: +@0808A682: pop {r4} pop {r0} bx r0 @@ -252620,48 +252620,48 @@ _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 -_0808A692: + b @0808A694 +@0808A692: adds r1, 0x4 -_0808A694: +@0808A694: ldrb r0, [r1] cmp r0, 0 - bne _0808A692 + bne @0808A692 subs r0, r1, 0x4 pop {r1} bx r1 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 lsrs r1, 16 - b _0808A6B6 -_0808A6AA: + b @0808A6B6 +@0808A6AA: ldrh r0, [r2] cmp r0, r1 - bne _0808A6B4 + bne @0808A6B4 adds r0, r2, 0 - b _0808A6BE -_0808A6B4: + b @0808A6BE +@0808A6B4: adds r2, 0xC -_0808A6B6: +@0808A6B6: ldr r0, [r2, 0x4] cmp r0, 0 - bne _0808A6AA + bne @0808A6AA movs r0, 0 -_0808A6BE: +@0808A6BE: pop {r1} bx r1 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} @@ -252675,7 +252675,7 @@ task_overworld_door_add_if_inactive: @ 808A6C4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0808A718 + beq @0808A718 adds r0, r4, 0 movs r1, 0x50 bl AddTask @@ -252697,13 +252697,13 @@ task_overworld_door_add_if_inactive: @ 808A6C4 strh r2, [r1, 0x4] lsls r0, 24 asrs r0, 24 - b _0808A71C + b @0808A71C .align 2, 0 .pool -_0808A718: +@0808A718: movs r0, 0x1 negs r0, r0 -_0808A71C: +@0808A71C: pop {r3} mov r8, r3 pop {r4-r7} @@ -252712,7 +252712,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} @@ -252720,7 +252720,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 @@ -252735,7 +252735,7 @@ sub_808A734: @ 808A734 bl door_find adds r4, r0, 0 cmp r4, 0 - beq _0808A76A + beq @0808A76A ldr r1, =0x08496f8c adds r0, r1, 0 bl door_frame_last @@ -252744,7 +252744,7 @@ sub_808A734: @ 808A734 adds r2, r5, 0 adds r3, r6, 0 bl sub_808A568 -_0808A76A: +@0808A76A: pop {r4-r6} pop {r0} bx r0 @@ -252753,7 +252753,7 @@ _0808A76A: thumb_func_end sub_808A734 thumb_func_start task_overworld_door_add_for_opening_door_at -task_overworld_door_add_for_opening_door_at: @ 808A774 +task_overworld_door_add_for_opening_door_at: ; 808A774 push {r4-r6,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -252769,29 +252769,29 @@ task_overworld_door_add_for_opening_door_at: @ 808A774 adds r2, r0, 0 adds r4, r2, 0 cmp r2, 0 - bne _0808A79E + bne @0808A79E movs r0, 0x1 negs r0, r0 - b _0808A7C0 -_0808A79E: + b @0808A7C0 +@0808A79E: ldrb r0, [r2, 0x3] cmp r0, 0x2 - beq _0808A7B0 + beq @0808A7B0 ldr r1, =0x08496f8c adds r0, r2, 0 - b _0808A7B4 + b @0808A7B4 .align 2, 0 .pool -_0808A7B0: +@0808A7B0: ldr r1, =0x08496fb4 adds r0, r4, 0 -_0808A7B4: +@0808A7B4: adds r2, r5, 0 adds r3, r6, 0 bl task_overworld_door_add_if_inactive lsls r0, 24 asrs r0, 24 -_0808A7C0: +@0808A7C0: pop {r4-r6} pop {r1} bx r1 @@ -252800,7 +252800,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 @@ -252814,27 +252814,27 @@ sub_808A7CC: @ 808A7CC adds r0, r4, 0 bl door_find cmp r0, 0 - beq _0808A800 + beq @0808A800 ldr r1, =0x08496fa0 adds r2, r5, 0 adds r3, r6, 0 bl task_overworld_door_add_if_inactive lsls r0, 24 asrs r0, 24 - b _0808A804 + b @0808A804 .align 2, 0 .pool -_0808A800: +@0808A800: movs r0, 0x1 negs r0, r0 -_0808A804: +@0808A804: pop {r4-r6} pop {r1} bx r1 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 @@ -252846,22 +252846,22 @@ cur_mapdata_get_door_x2_at: @ 808A80C adds r0, r4, 0 bl door_find cmp r0, 0 - beq _0808A830 + beq @0808A830 ldrb r0, [r0, 0x2] lsls r0, 24 asrs r0, 24 - b _0808A834 -_0808A830: + b @0808A834 +@0808A830: movs r0, 0x1 negs r0, r0 -_0808A834: +@0808A834: pop {r4} pop {r1} bx r1 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 @@ -252875,7 +252875,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 @@ -252885,12 +252885,12 @@ sub_808A854: @ 808A854 bl sub_8088EFC lsls r0, 24 cmp r0, 0 - beq _0808A876 + beq @0808A876 ldr r0, =0x08497174 adds r1, r4, 0 adds r2, r5, 0 bl sub_808A734 -_0808A876: +@0808A876: pop {r4,r5} pop {r0} bx r0 @@ -252899,7 +252899,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 @@ -252909,12 +252909,12 @@ sub_808A880: @ 808A880 bl sub_8088EFC lsls r0, 24 cmp r0, 0 - beq _0808A8A2 + beq @0808A8A2 ldr r0, =0x08497174 adds r1, r4, 0 adds r2, r5, 0 bl sub_808A728 -_0808A8A2: +@0808A8A2: pop {r4,r5} pop {r0} bx r0 @@ -252923,7 +252923,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 @@ -252933,27 +252933,27 @@ sub_808A8AC: @ 808A8AC bl sub_8088EFC lsls r0, 24 cmp r0, 0 - beq _0808A8D8 + beq @0808A8D8 ldr r0, =0x08497174 adds r1, r4, 0 adds r2, r5, 0 bl sub_808A7CC lsls r0, 24 asrs r0, 24 - b _0808A8DC + b @0808A8DC .align 2, 0 .pool -_0808A8D8: +@0808A8D8: movs r0, 0x1 negs r0, r0 -_0808A8DC: +@0808A8DC: pop {r4,r5} pop {r1} bx r1 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 @@ -252963,27 +252963,27 @@ task_overworld_door_add_if_role_69_for_opening_door_at: @ 808A8E4 bl sub_8088EFC lsls r0, 24 cmp r0, 0 - beq _0808A910 + beq @0808A910 ldr r0, =0x08497174 adds r1, r4, 0 adds r2, r5, 0 bl task_overworld_door_add_for_opening_door_at lsls r0, 24 asrs r0, 24 - b _0808A914 + b @0808A914 .align 2, 0 .pool -_0808A910: +@0808A910: movs r0, 0x1 negs r0, r0 -_0808A914: +@0808A914: pop {r4,r5} pop {r1} bx r1 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 + 1 bl is_function_an_active_task @@ -252996,7 +252996,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 @@ -253006,53 +253006,53 @@ cur_mapdata_get_door_sound_at: @ 808A930 lsls r0, 24 asrs r0, 24 cmp r0, 0 - beq _0808A958 + beq @0808A958 cmp r0, 0x1 - bne _0808A954 + bne @0808A954 movs r0, 0x12 - b _0808A95E + b @0808A95E .align 2, 0 .pool -_0808A954: +@0808A954: cmp r0, 0x2 - beq _0808A95C -_0808A958: + beq @0808A95C +@0808A958: movs r0, 0x8 - b _0808A95E -_0808A95C: + b @0808A95E +@0808A95C: movs r0, 0x2F -_0808A95E: +@0808A95E: pop {r1} bx r1 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 flag_check lsls r0, 24 cmp r0, 0 - beq _0808A990 + beq @0808A990 ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] ldr r0, =0x0000101a cmp r1, r0 - bne _0808A990 + bne @0808A990 movs r0, 0x1 - b _0808A992 + b @0808A992 .align 2, 0 .pool -_0808A990: +@0808A990: movs r0, 0 -_0808A992: +@0808A992: pop {r1} bx r1 thumb_func_end sub_808A964 thumb_func_start sub_808A998 -sub_808A998: @ 808A998 +sub_808A998: ; 808A998 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -253071,14 +253071,14 @@ sub_808A998: @ 808A998 thumb_func_end sub_808A998 thumb_func_start sub_808A9BC -sub_808A9BC: @ 808A9BC +sub_808A9BC: ; 808A9BC movs r0, 0 bx lr thumb_func_end sub_808A9BC 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} @@ -253100,7 +253100,7 @@ player_step: @ 808A9C0 bl sub_808C280 ldrb r0, [r4, 0x6] cmp r0, 0 - bne _0808AA26 + bne @0808AA26 adds r0, r7, 0 adds r1, r6, 0 bl sub_8119C3C @@ -253109,20 +253109,20 @@ player_step: @ 808A9C0 bl sub_808AA38 lsls r0, 24 cmp r0, 0 - bne _0808AA26 + bne @0808AA26 adds r0, r5, 0 bl npc_clear_strange_bits bl bike_related bl sub_808AB14 lsls r0, 24 cmp r0, 0 - bne _0808AA26 + bne @0808AA26 mov r0, r8 adds r1, r7, 0 adds r2, r6, 0 bl player_step_by_keypad bl walkrun_clear_x20_when_running_fast -_0808AA26: +@0808AA26: pop {r3} mov r8, r3 pop {r4-r7} @@ -253133,7 +253133,7 @@ _0808AA26: thumb_func_end player_step thumb_func_start sub_808AA38 -sub_808AA38: @ 808AA38 +sub_808AA38: ; 808AA38 push {r4-r6,lr} adds r4, r0, 0 lsls r1, 24 @@ -253142,12 +253142,12 @@ sub_808AA38: @ 808AA38 bl npc_is_visible_or_is_x40 lsls r0, 24 cmp r0, 0 - beq _0808AA92 + beq @0808AA92 adds r0, r4, 0 bl sub_8093284 lsls r0, 24 cmp r0, 0 - bne _0808AA92 + bne @0808AA92 adds r0, r4, 0 bl npc_get_state_or_xFF lsls r0, 24 @@ -253156,39 +253156,39 @@ sub_808AA38: @ 808AA38 adds r0, r1 lsrs r0, 24 cmp r0, 0x3 - bhi _0808AA70 + bhi @0808AA70 cmp r5, 0 - bne _0808AA74 -_0808AA70: + bne @0808AA74 +@0808AA70: movs r0, 0x1 - b _0808AA94 -_0808AA74: + b @0808AA94 +@0808AA74: ldrb r0, [r4, 0x18] lsrs r0, 4 cmp r0, r5 - beq _0808AA84 -_0808AA7C: + beq @0808AA84 +@0808AA7C: adds r0, r4, 0 bl rom_npc_by_local_id_and_map_get_trainer_flag - b _0808AA92 -_0808AA84: + b @0808AA92 +@0808AA84: adds r0, r6, 0 bl sub_808B028 lsls r0, 24 cmp r0, 0 - beq _0808AA7C - b _0808AA70 -_0808AA92: + beq @0808AA7C + b @0808AA70 +@0808AA92: movs r0, 0 -_0808AA94: +@0808AA94: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_808AA38 thumb_func_start npc_clear_strange_bits -@ int npc_clear_strange_bits(npc_state *) -npc_clear_strange_bits: @ 808AA9C +; int npc_clear_strange_bits(npc_state *) +npc_clear_strange_bits: ; 808AA9C ldrb r2, [r0, 0x1] movs r1, 0x11 negs r1, r1 @@ -253210,8 +253210,8 @@ npc_clear_strange_bits: @ 808AA9C thumb_func_end npc_clear_strange_bits thumb_func_start player_step_by_keypad -@ void player_step_by_keypad(int dpad_direction, int buttons_new, int buttons_held) -player_step_by_keypad: @ 808AAC0 +; void player_step_by_keypad(int dpad_direction, int buttons_new, int buttons_held) +player_step_by_keypad: ; 808AAC0 push {r4,lr} lsls r0, 24 lsrs r3, r0, 24 @@ -253224,35 +253224,35 @@ player_step_by_keypad: @ 808AAC0 movs r0, 0x6 ands r0, r1 cmp r0, 0 - beq _0808AAE8 + beq @0808AAE8 adds r0, r3, 0 adds r1, r4, 0 bl dp04_initiate_movement - b _0808AAF0 + b @0808AAF0 .align 2, 0 .pool -_0808AAE8: +@0808AAE8: adds r0, r3, 0 adds r1, r2, 0 bl dp04_continue_movement -_0808AAF0: +@0808AAF0: pop {r4} pop {r0} bx r0 thumb_func_end player_step_by_keypad thumb_func_start walkrun_clear_x20_when_running_fast -walkrun_clear_x20_when_running_fast: @ 808AAF8 +walkrun_clear_x20_when_running_fast: ; 808AAF8 push {lr} ldr r2, =0x02037590 ldrb r0, [r2, 0x2] cmp r0, 0x2 - bne _0808AB0A + bne @0808AB0A ldrb r1, [r2] movs r0, 0xDF ands r0, r1 strb r0, [r2] -_0808AB0A: +@0808AB0A: pop {r0} bx r0 .align 2, 0 @@ -253260,7 +253260,7 @@ _0808AB0A: thumb_func_end walkrun_clear_x20_when_running_fast thumb_func_start sub_808AB14 -sub_808AB14: @ 808AB14 +sub_808AB14: ; 808AB14 push {r4,lr} ldr r4, =0x08497444 bl sub_808AB38 @@ -253279,14 +253279,14 @@ sub_808AB14: @ 808AB14 thumb_func_end sub_808AB14 thumb_func_start sub_808AB38 -sub_808AB38: @ 808AB38 +sub_808AB38: ; 808AB38 push {r4-r6,lr} ldr r3, =0x02037590 ldrb r1, [r3] movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _0808AB8A + bne @0808AB8A ldr r2, =0x02037350 ldrb r1, [r3, 0x5] lsls r0, r1, 3 @@ -253296,7 +253296,7 @@ sub_808AB38: @ 808AB38 ldrb r5, [r0, 0x1E] movs r4, 0 ldr r6, =0x084973fc -_0808AB58: +@0808AB58: lsls r0, r4, 2 adds r0, r6 ldr r1, [r0] @@ -253304,36 +253304,36 @@ _0808AB58: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - beq _0808AB80 + beq @0808AB80 adds r0, r4, 0x1 lsls r0, 24 lsrs r0, 24 - b _0808AB8C + b @0808AB8C .align 2, 0 .pool -_0808AB80: +@0808AB80: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x11 - bls _0808AB58 -_0808AB8A: + bls @0808AB58 +@0808AB8A: movs r0, 0 -_0808AB8C: +@0808AB8C: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_808AB38 thumb_func_start sub_808AB94 -sub_808AB94: @ 808AB94 +sub_808AB94: ; 808AB94 push {r4,lr} ldr r4, =0x02037590 ldrb r1, [r4] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0808ABCE + beq @0808ABCE ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -253355,7 +253355,7 @@ sub_808AB94: @ 808AB94 movs r0, 0xBF ands r0, r1 strb r0, [r4] -_0808ABCE: +@0808ABCE: movs r0, 0 pop {r4} pop {r1} @@ -253365,7 +253365,7 @@ _0808ABCE: thumb_func_end sub_808AB94 thumb_func_start sub_808ABE0 -sub_808ABE0: @ 808ABE0 +sub_808ABE0: ; 808ABE0 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -253389,35 +253389,35 @@ sub_808ABE0: @ 808ABE0 orrs r0, r1 strb r0, [r6] cmp r4, 0 - beq _0808AC3C + beq @0808AC3C bl sub_808AB94 cmp r4, 0x4 - bhi _0808AC24 + bhi @0808AC24 movs r0, 0 - b _0808AC48 + b @0808AC48 .align 2, 0 .pool -_0808AC24: +@0808AC24: cmp r7, 0x6 - bne _0808AC2E + bne @0808AC2E adds r0, r5, 0 bl npc_use_some_d2s_and_sound -_0808AC2E: +@0808AC2E: ldrb r0, [r6] mov r1, r10 orrs r0, r1 strb r0, [r6] movs r0, 0x2 strb r0, [r6, 0x2] - b _0808AC46 -_0808AC3C: + b @0808AC46 +@0808AC3C: movs r0, 0x2 strb r0, [r6, 0x2] adds r0, r5, 0 bl _call_via_r9 -_0808AC46: +@0808AC46: movs r0, 0x1 -_0808AC48: +@0808AC48: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -253428,7 +253428,7 @@ _0808AC48: thumb_func_end sub_808ABE0 thumb_func_start sub_808AC58 -sub_808AC58: @ 808AC58 +sub_808AC58: ; 808AC58 push {lr} adds r1, r0, 0 ldr r0, =0x02037590 @@ -253454,7 +253454,7 @@ sub_808AC58: @ 808AC58 thumb_func_end sub_808AC58 thumb_func_start sub_808AC8C -sub_808AC8C: @ 808AC8C +sub_808AC8C: ; 808AC8C push {lr} ldr r0, =sub_808B738 + 1 bl sub_808AC58 @@ -253467,7 +253467,7 @@ sub_808AC8C: @ 808AC8C thumb_func_end sub_808AC8C thumb_func_start sub_808ACA0 -sub_808ACA0: @ 808ACA0 +sub_808ACA0: ; 808ACA0 push {lr} ldr r1, =sub_808B720 + 1 movs r0, 0x1 @@ -253481,7 +253481,7 @@ sub_808ACA0: @ 808ACA0 thumb_func_end sub_808ACA0 thumb_func_start sub_808ACB8 -sub_808ACB8: @ 808ACB8 +sub_808ACB8: ; 808ACB8 push {lr} ldr r1, =sub_808B720 + 1 movs r0, 0x2 @@ -253495,7 +253495,7 @@ sub_808ACB8: @ 808ACB8 thumb_func_end sub_808ACB8 thumb_func_start sub_808ACD0 -sub_808ACD0: @ 808ACD0 +sub_808ACD0: ; 808ACD0 push {lr} ldr r1, =sub_808B720 + 1 movs r0, 0x3 @@ -253509,7 +253509,7 @@ sub_808ACD0: @ 808ACD0 thumb_func_end sub_808ACD0 thumb_func_start sub_808ACE8 -sub_808ACE8: @ 808ACE8 +sub_808ACE8: ; 808ACE8 push {lr} ldr r1, =sub_808B720 + 1 movs r0, 0x4 @@ -253523,7 +253523,7 @@ sub_808ACE8: @ 808ACE8 thumb_func_end sub_808ACE8 thumb_func_start sub_808AD00 -sub_808AD00: @ 808AD00 +sub_808AD00: ; 808AD00 push {lr} ldr r1, =sub_808B750 + 1 movs r0, 0x1 @@ -253537,7 +253537,7 @@ sub_808AD00: @ 808AD00 thumb_func_end sub_808AD00 thumb_func_start sub_808AD18 -sub_808AD18: @ 808AD18 +sub_808AD18: ; 808AD18 push {lr} ldr r1, =sub_808B750 + 1 movs r0, 0x2 @@ -253551,7 +253551,7 @@ sub_808AD18: @ 808AD18 thumb_func_end sub_808AD18 thumb_func_start sub_808AD30 -sub_808AD30: @ 808AD30 +sub_808AD30: ; 808AD30 push {lr} ldr r1, =sub_808B750 + 1 movs r0, 0x3 @@ -253565,7 +253565,7 @@ sub_808AD30: @ 808AD30 thumb_func_end sub_808AD30 thumb_func_start sub_808AD48 -sub_808AD48: @ 808AD48 +sub_808AD48: ; 808AD48 push {lr} ldr r1, =sub_808B750 + 1 movs r0, 0x4 @@ -253579,7 +253579,7 @@ sub_808AD48: @ 808AD48 thumb_func_end sub_808AD48 thumb_func_start sub_808AD60 -sub_808AD60: @ 808AD60 +sub_808AD60: ; 808AD60 push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -253607,7 +253607,7 @@ sub_808AD60: @ 808AD60 thumb_func_end sub_808AD60 thumb_func_start sub_808AD98 -sub_808AD98: @ 808AD98 +sub_808AD98: ; 808AD98 push {lr} ldr r1, =sub_808B738 + 1 movs r0, 0x1 @@ -253621,7 +253621,7 @@ sub_808AD98: @ 808AD98 thumb_func_end sub_808AD98 thumb_func_start sub_808ADB0 -sub_808ADB0: @ 808ADB0 +sub_808ADB0: ; 808ADB0 push {lr} ldr r1, =sub_808B738 + 1 movs r0, 0x2 @@ -253635,7 +253635,7 @@ sub_808ADB0: @ 808ADB0 thumb_func_end sub_808ADB0 thumb_func_start sub_808ADC8 -sub_808ADC8: @ 808ADC8 +sub_808ADC8: ; 808ADC8 push {lr} ldr r1, =sub_808B738 + 1 movs r0, 0x3 @@ -253649,7 +253649,7 @@ sub_808ADC8: @ 808ADC8 thumb_func_end sub_808ADC8 thumb_func_start sub_808ADE0 -sub_808ADE0: @ 808ADE0 +sub_808ADE0: ; 808ADE0 push {lr} ldr r1, =sub_808B738 + 1 movs r0, 0x4 @@ -253663,7 +253663,7 @@ sub_808ADE0: @ 808ADE0 thumb_func_end sub_808ADE0 thumb_func_start sub_808ADF8 -sub_808ADF8: @ 808ADF8 +sub_808ADF8: ; 808ADF8 push {lr} bl sub_808C4D8 movs r0, 0x1 @@ -253672,7 +253672,7 @@ sub_808ADF8: @ 808ADF8 thumb_func_end sub_808ADF8 thumb_func_start sub_808AE04 -sub_808AE04: @ 808AE04 +sub_808AE04: ; 808AE04 push {lr} bl sub_808C5B0 movs r0, 0x1 @@ -253681,7 +253681,7 @@ sub_808AE04: @ 808AE04 thumb_func_end sub_808AE04 thumb_func_start sub_808AE10 -sub_808AE10: @ 808AE10 +sub_808AE10: ; 808AE10 push {r4,lr} ldr r0, =0x02037590 ldrb r1, [r0, 0x5] @@ -253694,13 +253694,13 @@ sub_808AE10: @ 808AE10 movs r0, 0xF0 ands r0, r1 cmp r0, 0x20 - bne _0808AE36 + bne @0808AE36 bl sub_811A138 lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - bgt _0808AE60 -_0808AE36: + bgt @0808AE60 +@0808AE36: movs r0, 0 bl sub_811A114 ldrb r0, [r4, 0x1] @@ -253712,20 +253712,20 @@ _0808AE36: bl sub_808ABE0 lsls r0, 24 lsrs r0, 24 - b _0808AE62 + b @0808AE62 .align 2, 0 .pool -_0808AE60: +@0808AE60: movs r0, 0 -_0808AE62: +@0808AE62: pop {r4} pop {r1} bx r1 thumb_func_end sub_808AE10 thumb_func_start dp04_continue_movement -@ void dp04_continue_movement(int dpad_direction, int buttons_held) -dp04_continue_movement: @ 808AE68 +; void dp04_continue_movement(int dpad_direction, int buttons_held) +dp04_continue_movement: ; 808AE68 push {r4-r6,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -253751,38 +253751,38 @@ dp04_continue_movement: @ 808AE68 thumb_func_end dp04_continue_movement thumb_func_start walkrun_accelerate -walkrun_accelerate: @ 808AE98 +walkrun_accelerate: ; 808AE98 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _0808AEB0 + bne @0808AEB0 ldr r0, =0x02037590 strb r4, [r0, 0x2] movs r0, 0 - b _0808AED2 + b @0808AED2 .align 2, 0 .pool -_0808AEB0: +@0808AEB0: bl player_get_direction_upper_4bits lsls r0, 24 lsrs r0, 24 cmp r4, r0 - beq _0808AECC + beq @0808AECC ldr r1, =0x02037590 ldrb r0, [r1, 0x2] cmp r0, 0x2 - beq _0808AECC + beq @0808AECC movs r0, 0x1 - b _0808AED0 + b @0808AED0 .align 2, 0 .pool -_0808AECC: +@0808AECC: ldr r1, =0x02037590 movs r0, 0x2 -_0808AED0: +@0808AED0: strb r0, [r1, 0x2] -_0808AED2: +@0808AED2: pop {r4} pop {r1} bx r1 @@ -253791,7 +253791,7 @@ _0808AED2: thumb_func_end walkrun_accelerate thumb_func_start dp04_look1 -dp04_look1: @ 808AEDC +dp04_look1: ; 808AEDC push {lr} bl player_get_direction__sp1AA lsls r0, 24 @@ -253802,7 +253802,7 @@ dp04_look1: @ 808AEDC thumb_func_end dp04_look1 thumb_func_start sub_808AEF0 -sub_808AEF0: @ 808AEF0 +sub_808AEF0: ; 808AEF0 push {lr} lsls r0, 24 lsrs r0, 24 @@ -253812,7 +253812,7 @@ sub_808AEF0: @ 808AEF0 thumb_func_end sub_808AEF0 thumb_func_start sub_808AF00 -sub_808AF00: @ 808AF00 +sub_808AF00: ; 808AF00 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -253823,59 +253823,59 @@ sub_808AF00: @ 808AF00 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq _0808AF4E + beq @0808AF4E cmp r4, 0x6 - bne _0808AF24 + bne @0808AF24 adds r0, r5, 0 bl npc_use_some_d2s_and_sound - b _0808AFB6 -_0808AF24: + b @0808AFB6 +@0808AF24: cmp r4, 0x4 - bne _0808AF3C + bne @0808AF3C adds r0, r5, 0 bl sub_808B324 lsls r0, 24 cmp r0, 0 - beq _0808AF3C + beq @0808AF3C adds r0, r5, 0 bl sub_808B7F8 - b _0808AFB6 -_0808AF3C: + b @0808AFB6 +@0808AF3C: subs r0, r4, 0x5 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bls _0808AFB6 + bls @0808AFB6 adds r0, r5, 0 bl npc_use_some_d2s_and_conditional_sound - b _0808AFB6 -_0808AF4E: + b @0808AFB6 +@0808AF4E: ldr r4, =0x02037590 ldrb r1, [r4] movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _0808AF68 + beq @0808AF68 adds r0, r5, 0 bl sub_808B738 - b _0808AFB6 + b @0808AFB6 .align 2, 0 .pool -_0808AF68: +@0808AF68: movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _0808AFB0 + bne @0808AFB0 movs r0, 0x2 ands r6, r0 cmp r6, 0 - beq _0808AFB0 + beq @0808AFB0 movs r0, 0x8C lsls r0, 4 bl flag_check lsls r0, 24 cmp r0, 0 - beq _0808AFB0 + beq @0808AFB0 ldr r2, =0x02037350 ldrb r1, [r4, 0x5] lsls r0, r1, 3 @@ -253885,27 +253885,27 @@ _0808AF68: ldrb r0, [r0, 0x1E] bl is_tile_to_run_on cmp r0, 0 - bne _0808AFB0 + bne @0808AFB0 adds r0, r5, 0 bl sub_808B780 ldrb r1, [r4] movs r0, 0x80 orrs r0, r1 strb r0, [r4] - b _0808AFB6 + b @0808AFB6 .align 2, 0 .pool -_0808AFB0: +@0808AFB0: adds r0, r5, 0 bl sub_808B720 -_0808AFB6: +@0808AFB6: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_808AF00 thumb_func_start sub_808AFBC -sub_808AFBC: @ 808AFBC +sub_808AFBC: ; 808AFBC push {r4-r6,lr} sub sp, 0x8 adds r6, r0, 0 @@ -253957,7 +253957,7 @@ sub_808AFBC: @ 808AFBC thumb_func_end sub_808AFBC thumb_func_start sub_808B028 -sub_808B028: @ 808B028 +sub_808B028: ; 808B028 push {r4-r6,lr} sub sp, 0x8 adds r6, r0, 0 @@ -254009,7 +254009,7 @@ sub_808B028: @ 808B028 thumb_func_end sub_808B028 thumb_func_start sub_808B094 -sub_808B094: @ 808B094 +sub_808B094: ; 808B094 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -254038,17 +254038,17 @@ sub_808B094: @ 808B094 mov r1, sp strb r0, [r1] cmp r0, 0x3 - bne _0808B0E4 + bne @0808B0E4 adds r0, r5, 0 adds r1, r4, 0 adds r2, r6, 0 bl sub_808B1BC lsls r0, 24 cmp r0, 0 - beq _0808B0E4 + beq @0808B0E4 movs r0, 0x5 - b _0808B152 -_0808B0E4: + b @0808B152 +@0808B0E4: lsls r5, r7, 16 asrs r0, r5, 16 mov r8, r0 @@ -254060,30 +254060,30 @@ _0808B0E4: bl sub_808B214 lsls r0, 24 cmp r0, 0 - beq _0808B108 + beq @0808B108 movs r0, 0x2B bl sav12_xor_increment movs r0, 0x6 - b _0808B152 -_0808B108: + b @0808B152 +@0808B108: mov r0, sp ldrb r0, [r0] cmp r0, 0x4 - bne _0808B124 + bne @0808B124 mov r0, r8 adds r1, r7, 0 adds r2, r6, 0 bl sub_808B238 lsls r0, 24 cmp r0, 0 - beq _0808B124 + beq @0808B124 movs r0, 0x7 - b _0808B152 -_0808B124: + b @0808B152 +@0808B124: mov r0, sp ldrb r0, [r0] cmp r0, 0 - bne _0808B14E + bne @0808B14E asrs r5, 16 asrs r4, 16 adds r0, r6, 0 @@ -254091,19 +254091,19 @@ _0808B124: adds r2, r4, 0 bl sub_80FBEF0 cmp r0, 0 - beq _0808B142 + beq @0808B142 movs r0, 0x8 - b _0808B152 -_0808B142: + b @0808B152 +@0808B142: adds r0, r5, 0 adds r1, r4, 0 mov r2, r10 mov r3, sp bl sub_808B2E4 -_0808B14E: +@0808B14E: mov r0, sp ldrb r0, [r0] -_0808B152: +@0808B152: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -254115,7 +254115,7 @@ _0808B152: thumb_func_end sub_808B094 thumb_func_start sub_808B164 -sub_808B164: @ 808B164 +sub_808B164: ; 808B164 push {r4-r7,lr} sub sp, 0x4 ldr r4, [sp, 0x18] @@ -254136,25 +254136,25 @@ sub_808B164: @ 808B164 mov r1, sp strb r0, [r1] cmp r0, 0 - bne _0808B1AE + bne @0808B1AE adds r0, r6, 0 adds r1, r5, 0 adds r2, r4, 0 bl sub_80FBFD4 cmp r0, 0 - beq _0808B1A2 + beq @0808B1A2 movs r0, 0x8 - b _0808B1B2 -_0808B1A2: + b @0808B1B2 +@0808B1A2: adds r0, r5, 0 adds r1, r4, 0 adds r2, r7, 0 mov r3, sp bl sub_808B2E4 -_0808B1AE: +@0808B1AE: mov r0, sp ldrb r0, [r0] -_0808B1B2: +@0808B1B2: add sp, 0x4 pop {r4-r7} pop {r1} @@ -254162,7 +254162,7 @@ _0808B1B2: thumb_func_end sub_808B164 thumb_func_start sub_808B1BC -sub_808B1BC: @ 808B1BC +sub_808B1BC: ; 808B1BC push {r4-r6,lr} lsls r0, 16 lsrs r3, r0, 16 @@ -254175,7 +254175,7 @@ sub_808B1BC: @ 808B1BC movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _0808B20C + beq @0808B20C lsls r5, r3, 16 asrs r0, r5, 16 lsls r4, 16 @@ -254184,7 +254184,7 @@ sub_808B1BC: @ 808B1BC lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bne _0808B20C + bne @0808B20C lsrs r0, r5, 16 lsrs r1, r4, 16 movs r2, 0x3 @@ -254192,23 +254192,23 @@ sub_808B1BC: @ 808B1BC lsls r0, 24 lsrs r0, 24 cmp r0, 0x10 - bne _0808B20C + bne @0808B20C adds r0, r6, 0 bl sub_808C750 movs r0, 0x1 - b _0808B20E + b @0808B20E .align 2, 0 .pool -_0808B20C: +@0808B20C: movs r0, 0 -_0808B20E: +@0808B20E: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_808B1BC thumb_func_start sub_808B214 -sub_808B214: @ 808B214 +sub_808B214: ; 808B214 push {lr} lsls r2, 24 lsrs r2, 24 @@ -254219,18 +254219,18 @@ sub_808B214: @ 808B214 bl cur_mapdata_role_x38_to_x3B__by_direction lsls r0, 24 cmp r0, 0 - bne _0808B230 + bne @0808B230 movs r0, 0 - b _0808B232 -_0808B230: + b @0808B232 +@0808B230: movs r0, 0x1 -_0808B232: +@0808B232: pop {r1} bx r1 thumb_func_end sub_808B214 thumb_func_start sub_808B238 -sub_808B238: @ 808B238 +sub_808B238: ; 808B238 push {r4-r7,lr} sub sp, 0x4 mov r3, sp @@ -254244,7 +254244,7 @@ sub_808B238: @ 808B238 bl flag_check lsls r0, 24 cmp r0, 0 - beq _0808B2D8 + beq @0808B2D8 mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -254254,7 +254254,7 @@ sub_808B238: @ 808B238 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x10 - beq _0808B2D8 + beq @0808B2D8 ldr r0, =0x02037350 lsls r1, r6, 3 adds r1, r6 @@ -254262,7 +254262,7 @@ sub_808B238: @ 808B238 adds r4, r1, r0 ldrb r0, [r4, 0x5] cmp r0, 0x57 - bne _0808B2D8 + bne @0808B2D8 ldrh r1, [r4, 0x10] mov r0, sp strh r1, [r0] @@ -254282,7 +254282,7 @@ sub_808B238: @ 808B238 bl npc_block_way lsls r0, 24 cmp r0, 0 - bne _0808B2D8 + bne @0808B2D8 mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -254294,17 +254294,17 @@ sub_808B238: @ 808B238 bl sub_8088F58 lsls r0, 24 cmp r0, 0 - bne _0808B2D8 + bne @0808B2D8 adds r0, r6, 0 adds r1, r7, 0 bl task_add_bump_boulder movs r0, 0x1 - b _0808B2DA + b @0808B2DA .align 2, 0 .pool -_0808B2D8: +@0808B2D8: movs r0, 0 -_0808B2DA: +@0808B2DA: add sp, 0x4 pop {r4-r7} pop {r1} @@ -254312,14 +254312,14 @@ _0808B2DA: thumb_func_end sub_808B238 thumb_func_start sub_808B2E4 -sub_808B2E4: @ 808B2E4 +sub_808B2E4: ; 808B2E4 push {r4-r7,lr} adds r6, r3, 0 lsls r2, 24 lsrs r5, r2, 24 movs r4, 0 ldr r7, =0x0849749c -_0808B2F0: +@0808B2F0: lsls r0, r4, 2 adds r0, r7 ldr r1, [r0] @@ -254327,28 +254327,28 @@ _0808B2F0: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - beq _0808B314 + beq @0808B314 ldr r0, =0x084974b0 adds r0, r4, r0 ldrb r0, [r0] strb r0, [r6] - b _0808B31E + b @0808B31E .align 2, 0 .pool -_0808B314: +@0808B314: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 - bls _0808B2F0 -_0808B31E: + bls @0808B2F0 +@0808B31E: pop {r4-r7} pop {r0} bx r0 thumb_func_end sub_808B2E4 thumb_func_start sub_808B324 -sub_808B324: @ 808B324 +sub_808B324: ; 808B324 push {r4-r6,lr} sub sp, 0x4 lsls r0, 24 @@ -254378,7 +254378,7 @@ sub_808B324: @ 808B324 lsrs r1, r0, 24 adds r6, r4, 0 cmp r1, 0x10 - beq _0808B3C0 + beq @0808B3C0 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 @@ -254389,43 +254389,43 @@ sub_808B324: @ 808B324 movs r4, 0 ldrsh r0, [r0, r4] cmp r2, r0 - bne _0808B3C0 + bne @0808B3C0 movs r5, 0x16 ldrsh r1, [r3, r5] movs r4, 0 ldrsh r0, [r6, r4] ldrh r4, [r3, 0x16] cmp r1, r0 - bne _0808B398 + bne @0808B398 movs r5, 0x10 ldrsh r0, [r3, r5] cmp r0, r2 - bne _0808B398 + bne @0808B398 movs r2, 0x12 ldrsh r0, [r3, r2] cmp r0, r1 - beq _0808B3C0 -_0808B398: + beq @0808B3C0 +@0808B398: mov r0, sp movs r5, 0x14 ldrsh r1, [r3, r5] movs r2, 0 ldrsh r0, [r0, r2] cmp r1, r0 - bne _0808B3C0 + bne @0808B3C0 lsls r0, r4, 16 asrs r0, 16 movs r4, 0 ldrsh r1, [r6, r4] cmp r0, r1 - bne _0808B3C0 + bne @0808B3C0 movs r0, 0x1 - b _0808B3C2 + b @0808B3C2 .align 2, 0 .pool -_0808B3C0: +@0808B3C0: movs r0, 0 -_0808B3C2: +@0808B3C2: add sp, 0x4 pop {r4-r6} pop {r1} @@ -254433,7 +254433,7 @@ _0808B3C2: thumb_func_end sub_808B324 thumb_func_start walkrun_set_bike_bits -walkrun_set_bike_bits: @ 808B3CC +walkrun_set_bike_bits: ; 808B3CC push {lr} lsls r0, 16 lsrs r0, 16 @@ -254449,18 +254449,18 @@ walkrun_set_bike_bits: @ 808B3CC thumb_func_end walkrun_set_bike_bits thumb_func_start bike_related -bike_related: @ 808B3E8 +bike_related: ; 808B3E8 push {r4,r5,lr} ldr r0, =0x02037590 ldrb r4, [r0, 0x1] cmp r4, 0 - beq _0808B428 + beq @0808B428 movs r5, 0 -_0808B3F4: +@0808B3F4: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _0808B416 + beq @0808B416 ldr r0, =0x084974b8 lsls r2, r5, 2 adds r2, r0 @@ -254473,17 +254473,17 @@ _0808B3F4: adds r0, r1 ldr r1, [r2] bl _call_via_r1 -_0808B416: +@0808B416: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 lsrs r4, 1 cmp r5, 0x7 - bls _0808B3F4 + bls @0808B3F4 ldr r1, =0x02037590 movs r0, 0 strb r0, [r1, 0x1] -_0808B428: +@0808B428: pop {r4,r5} pop {r0} bx r0 @@ -254492,12 +254492,12 @@ _0808B428: thumb_func_end bike_related thumb_func_start nullsub_32 -nullsub_32: @ 808B43C +nullsub_32: ; 808B43C bx lr thumb_func_end nullsub_32 thumb_func_start sub_808B440 -sub_808B440: @ 808B440 +sub_808B440: ; 808B440 push {r4,lr} adds r4, r0, 0 movs r0, 0 @@ -254519,7 +254519,7 @@ sub_808B440: @ 808B440 thumb_func_end sub_808B440 thumb_func_start sub_808B46C -sub_808B46C: @ 808B46C +sub_808B46C: ; 808B46C push {r4,lr} adds r4, r0, 0 movs r0, 0x1 @@ -254544,7 +254544,7 @@ sub_808B46C: @ 808B46C thumb_func_end sub_808B46C thumb_func_start sub_808B4A0 -sub_808B4A0: @ 808B4A0 +sub_808B4A0: ; 808B4A0 push {r4,lr} adds r4, r0, 0 movs r0, 0x2 @@ -254570,7 +254570,7 @@ sub_808B4A0: @ 808B4A0 thumb_func_end sub_808B4A0 thumb_func_start sub_808B4D8 -sub_808B4D8: @ 808B4D8 +sub_808B4D8: ; 808B4D8 push {r4,lr} adds r4, r0, 0 movs r0, 0x3 @@ -254611,7 +254611,7 @@ sub_808B4D8: @ 808B4D8 thumb_func_end sub_808B4D8 thumb_func_start sub_808B534 -sub_808B534: @ 808B534 +sub_808B534: ; 808B534 push {r4,lr} adds r4, r0, 0 movs r0, 0x4 @@ -254636,7 +254636,7 @@ sub_808B534: @ 808B534 thumb_func_end sub_808B534 thumb_func_start sub_808B568 -sub_808B568: @ 808B568 +sub_808B568: ; 808B568 ldr r2, =0x02037590 ldrb r1, [r2] movs r0, 0x20 @@ -254648,7 +254648,7 @@ sub_808B568: @ 808B568 thumb_func_end sub_808B568 thumb_func_start sub_808B578 -sub_808B578: @ 808B578 +sub_808B578: ; 808B578 push {r4,lr} ldr r4, =0x02037590 movs r0, 0 @@ -254656,35 +254656,35 @@ sub_808B578: @ 808B578 bl player_bits_x42 lsls r0, 24 cmp r0, 0 - beq _0808B5B6 + beq @0808B5B6 bl sub_808B660 lsls r0, 24 cmp r0, 0 - bne _0808B5A8 + bne @0808B5A8 bl sub_808B5BC lsls r0, 24 cmp r0, 0 - bne _0808B5B6 + bne @0808B5B6 movs r0, 0x1 - b _0808B5B4 + b @0808B5B4 .align 2, 0 .pool -_0808B5A8: +@0808B5A8: bl sub_808B618 lsls r0, 24 cmp r0, 0 - bne _0808B5B6 + bne @0808B5B6 movs r0, 0x2 -_0808B5B4: +@0808B5B4: strb r0, [r4, 0x3] -_0808B5B6: +@0808B5B6: pop {r4} pop {r0} bx r0 thumb_func_end sub_808B578 thumb_func_start sub_808B5BC -sub_808B5BC: @ 808B5BC +sub_808B5BC: ; 808B5BC push {lr} ldr r2, =0x02037350 ldr r0, =0x02037590 @@ -254695,67 +254695,67 @@ sub_808B5BC: @ 808B5BC adds r0, r2 ldrb r1, [r0, 0x1C] cmp r1, 0x3 - bls _0808B602 + bls @0808B602 adds r0, r1, 0 subs r0, 0x10 lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bls _0808B602 + bls @0808B602 adds r0, r1, 0 subs r0, 0x19 lsls r0, 24 lsrs r0, 24 cmp r0, 0xF - bls _0808B602 + bls @0808B602 adds r0, r1, 0 subs r0, 0x64 lsls r0, 24 lsrs r0, 24 cmp r0, 0xB - bls _0808B602 + bls @0808B602 adds r0, r1, 0 subs r0, 0x7C lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bhi _0808B610 -_0808B602: + bhi @0808B610 +@0808B602: movs r0, 0x1 - b _0808B612 + b @0808B612 .align 2, 0 .pool -_0808B610: +@0808B610: movs r0, 0 -_0808B612: +@0808B612: pop {r1} bx r1 thumb_func_end sub_808B5BC thumb_func_start sub_808B618 -sub_808B618: @ 808B618 +sub_808B618: ; 808B618 push {lr} bl sub_808B5BC lsls r0, 24 cmp r0, 0 - beq _0808B634 + beq @0808B634 ldr r0, =0x02037590 ldrb r0, [r0, 0x2] cmp r0, 0x1 - beq _0808B634 + beq @0808B634 movs r0, 0x1 - b _0808B636 + b @0808B636 .align 2, 0 .pool -_0808B634: +@0808B634: movs r0, 0 -_0808B636: +@0808B636: pop {r1} bx r1 thumb_func_end sub_808B618 thumb_func_start player_bits_x42 -player_bits_x42: @ 808B63C +player_bits_x42: ; 808B63C push {lr} ldr r0, =0x02037590 ldrb r1, [r0, 0x5] @@ -254774,7 +254774,7 @@ player_bits_x42: @ 808B63C thumb_func_end player_bits_x42 thumb_func_start sub_808B660 -sub_808B660: @ 808B660 +sub_808B660: ; 808B660 push {lr} ldr r0, =0x02037590 ldrb r1, [r0, 0x5] @@ -254793,7 +254793,7 @@ sub_808B660: @ 808B660 thumb_func_end sub_808B660 thumb_func_start player_set_x22 -player_set_x22: @ 808B684 +player_set_x22: ; 808B684 ldr r3, =0x02037350 ldr r1, =0x02037590 ldrb r2, [r1, 0x5] @@ -254809,7 +254809,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] @@ -254825,7 +254825,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 @@ -254845,7 +254845,7 @@ sub_808B6BC: @ 808B6BC thumb_func_end sub_808B6BC thumb_func_start player_npc_set_state_and_x22_etc -player_npc_set_state_and_x22_etc: @ 808B6E4 +player_npc_set_state_and_x22_etc: ; 808B6E4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -254854,7 +254854,7 @@ player_npc_set_state_and_x22_etc: @ 808B6E4 bl player_bits_x42 lsls r0, 24 cmp r0, 0 - bne _0808B712 + bne @0808B712 adds r0, r4, 0 bl player_set_x22 ldr r0, =0x02037590 @@ -254866,7 +254866,7 @@ player_npc_set_state_and_x22_etc: @ 808B6E4 adds r0, r1 adds r1, r5, 0 bl npc_set_state_2 -_0808B712: +@0808B712: pop {r4,r5} pop {r0} bx r0 @@ -254875,7 +254875,7 @@ _0808B712: thumb_func_end player_npc_set_state_and_x22_etc thumb_func_start sub_808B720 -sub_808B720: @ 808B720 +sub_808B720: ; 808B720 push {lr} lsls r0, 24 lsrs r0, 24 @@ -254889,7 +254889,7 @@ sub_808B720: @ 808B720 thumb_func_end sub_808B720 thumb_func_start sub_808B738 -sub_808B738: @ 808B738 +sub_808B738: ; 808B738 push {lr} lsls r0, 24 lsrs r0, 24 @@ -254903,7 +254903,7 @@ sub_808B738: @ 808B738 thumb_func_end sub_808B738 thumb_func_start sub_808B750 -sub_808B750: @ 808B750 +sub_808B750: ; 808B750 push {lr} lsls r0, 24 lsrs r0, 24 @@ -254917,7 +254917,7 @@ sub_808B750: @ 808B750 thumb_func_end sub_808B750 thumb_func_start sub_808B768 -sub_808B768: @ 808B768 +sub_808B768: ; 808B768 push {lr} lsls r0, 24 lsrs r0, 24 @@ -254931,7 +254931,7 @@ sub_808B768: @ 808B768 thumb_func_end sub_808B768 thumb_func_start sub_808B780 -sub_808B780: @ 808B780 +sub_808B780: ; 808B780 push {lr} lsls r0, 24 lsrs r0, 24 @@ -254945,7 +254945,7 @@ sub_808B780: @ 808B780 thumb_func_end sub_808B780 thumb_func_start tile_sound_react -tile_sound_react: @ 808B798 +tile_sound_react: ; 808B798 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -254964,7 +254964,7 @@ tile_sound_react: @ 808B798 thumb_func_end tile_sound_react thumb_func_start sub_808B7BC -sub_808B7BC: @ 808B7BC +sub_808B7BC: ; 808B7BC push {lr} lsls r0, 24 lsrs r0, 24 @@ -254978,7 +254978,7 @@ sub_808B7BC: @ 808B7BC thumb_func_end sub_808B7BC thumb_func_start npc_use_some_d2s_and_conditional_sound -npc_use_some_d2s_and_conditional_sound: @ 808B7D4 +npc_use_some_d2s_and_conditional_sound: ; 808B7D4 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -254997,7 +254997,7 @@ npc_use_some_d2s_and_conditional_sound: @ 808B7D4 thumb_func_end npc_use_some_d2s_and_conditional_sound thumb_func_start sub_808B7F8 -sub_808B7F8: @ 808B7F8 +sub_808B7F8: ; 808B7F8 push {lr} lsls r0, 24 lsrs r0, 24 @@ -255011,7 +255011,7 @@ sub_808B7F8: @ 808B7F8 thumb_func_end sub_808B7F8 thumb_func_start player_npc_use_look1 -player_npc_use_look1: @ 808B810 +player_npc_use_look1: ; 808B810 push {lr} lsls r0, 24 lsrs r0, 24 @@ -255025,7 +255025,7 @@ player_npc_use_look1: @ 808B810 thumb_func_end player_npc_use_look1 thumb_func_start sub_808B828 -sub_808B828: @ 808B828 +sub_808B828: ; 808B828 push {lr} lsls r0, 24 lsrs r0, 24 @@ -255039,7 +255039,7 @@ sub_808B828: @ 808B828 thumb_func_end sub_808B828 thumb_func_start npc_use_some_d2s_and_sound -npc_use_some_d2s_and_sound: @ 808B840 +npc_use_some_d2s_and_sound: ; 808B840 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -255058,19 +255058,19 @@ npc_use_some_d2s_and_sound: @ 808B840 thumb_func_end npc_use_some_d2s_and_sound thumb_func_start sub_808B864 -sub_808B864: @ 808B864 +sub_808B864: ; 808B864 push {r4,lr} ldr r4, =0x02037590 ldrb r0, [r4, 0x3] cmp r0, 0x2 - beq _0808B872 + beq @0808B872 cmp r0, 0 - bne _0808B89A -_0808B872: + bne @0808B89A +@0808B872: bl player_should_look_direction_be_enforced_upon_movement lsls r0, 24 cmp r0, 0 - beq _0808B89A + beq @0808B89A ldr r2, =0x02037350 ldrb r1, [r4, 0x5] lsls r0, r1, 3 @@ -255084,7 +255084,7 @@ _0808B872: lsls r0, 24 lsrs r0, 24 bl sub_808B6BC -_0808B89A: +@0808B89A: pop {r4} pop {r0} bx r0 @@ -255093,7 +255093,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 @@ -255107,7 +255107,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 @@ -255121,7 +255121,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 @@ -255135,7 +255135,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 @@ -255154,7 +255154,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 @@ -255173,7 +255173,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 @@ -255192,7 +255192,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 @@ -255211,7 +255211,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 @@ -255230,7 +255230,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 @@ -255244,7 +255244,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 @@ -255258,7 +255258,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 @@ -255272,7 +255272,7 @@ npc_use_some_d2s: @ 808B9D4 thumb_func_end npc_use_some_d2s thumb_func_start tile_conditional_sound -tile_conditional_sound: @ 808B9EC +tile_conditional_sound: ; 808B9EC push {r4,lr} sub sp, 0x4 lsls r0, 24 @@ -255293,9 +255293,9 @@ tile_conditional_sound: @ 808B9EC bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _0808BA54 + bne @0808BA54 cmp r4, 0x2 - bne _0808BA4E + bne @0808BA4E mov r4, sp adds r4, 0x2 mov r0, sp @@ -255316,11 +255316,11 @@ tile_conditional_sound: @ 808B9EC bl is_tile_x69_2_warp_door lsls r0, 24 cmp r0, 0 - bne _0808BA54 -_0808BA4E: + bne @0808BA54 +@0808BA4E: movs r0, 0x7 bl audio_play -_0808BA54: +@0808BA54: add sp, 0x4 pop {r4} pop {r0} @@ -255330,7 +255330,7 @@ _0808BA54: thumb_func_end tile_conditional_sound thumb_func_start player_get_pos_to_plus_one_step_in_direction_player_is_facing -player_get_pos_to_plus_one_step_in_direction_player_is_facing: @ 808BA68 +player_get_pos_to_plus_one_step_in_direction_player_is_facing: ; 808BA68 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -255364,8 +255364,8 @@ player_get_pos_to_plus_one_step_in_direction_player_is_facing: @ 808BA68 thumb_func_end player_get_pos_to_plus_one_step_in_direction_player_is_facing thumb_func_start player_get_pos_to -@ void player_get_pos_to(int *x, int *y) -player_get_pos_to: @ 808BAAC +; void player_get_pos_to(int *x, int *y) +player_get_pos_to: ; 808BAAC push {r4,r5,lr} ldr r5, =0x02037350 ldr r4, =0x02037590 @@ -255391,7 +255391,7 @@ player_get_pos_to: @ 808BAAC thumb_func_end player_get_pos_to 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 @@ -255406,9 +255406,9 @@ plaer_get_pos_including_state_based_drift: @ 808BADC movs r0, 0xC0 ands r0, r1 cmp r0, 0x40 - beq _0808BAFC - b _0808BC24 -_0808BAFC: + beq @0808BAFC + b @0808BC24 +@0808BAFC: ldr r2, =0x02020630 ldrb r1, [r3, 0x4] lsls r0, r1, 4 @@ -255418,9 +255418,9 @@ _0808BAFC: movs r1, 0x32 ldrsh r0, [r0, r1] cmp r0, 0 - beq _0808BB12 - b _0808BC24 -_0808BB12: + beq @0808BB12 + b @0808BC24 +@0808BB12: ldrh r0, [r3, 0x10] strh r0, [r4] ldrh r0, [r3, 0x12] @@ -255428,104 +255428,104 @@ _0808BB12: ldrb r0, [r3, 0x1C] subs r0, 0x8 cmp r0, 0x30 - bls _0808BB24 - b _0808BC24 -_0808BB24: + bls @0808BB24 + b @0808BC24 +@0808BB24: lsls r0, 2 - ldr r1, =_0808BB40 + ldr r1, =@0808BB40 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0808BB40: - .4byte _0808BC04 - .4byte _0808BC0A - .4byte _0808BC14 - .4byte _0808BC1A - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC24 - .4byte _0808BC04 - .4byte _0808BC0A - .4byte _0808BC14 - .4byte _0808BC1A -_0808BC04: +@0808BB40: + .4byte @0808BC04 + .4byte @0808BC0A + .4byte @0808BC14 + .4byte @0808BC1A + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC24 + .4byte @0808BC04 + .4byte @0808BC0A + .4byte @0808BC14 + .4byte @0808BC1A +@0808BC04: ldrh r0, [r5] adds r0, 0x1 - b _0808BC0E -_0808BC0A: + b @0808BC0E +@0808BC0A: ldrh r0, [r5] subs r0, 0x1 -_0808BC0E: +@0808BC0E: strh r0, [r5] movs r0, 0x1 - b _0808BC30 -_0808BC14: + b @0808BC30 +@0808BC14: ldrh r0, [r4] subs r0, 0x1 - b _0808BC1E -_0808BC1A: + b @0808BC1E +@0808BC1A: ldrh r0, [r4] adds r0, 0x1 -_0808BC1E: +@0808BC1E: strh r0, [r4] movs r0, 0x1 - b _0808BC30 -_0808BC24: + b @0808BC30 +@0808BC24: movs r1, 0x1 negs r1, r1 adds r0, r1, 0 strh r0, [r4] strh r0, [r5] movs r0, 0 -_0808BC30: +@0808BC30: pop {r4,r5} pop {r1} bx r1 thumb_func_end plaer_get_pos_including_state_based_drift thumb_func_start player_get_direction__sp1AA -player_get_direction__sp1AA: @ 808BC38 +player_get_direction__sp1AA: ; 808BC38 ldr r2, =0x02037350 ldr r0, =0x02037590 ldrb r1, [r0, 0x5] @@ -255542,7 +255542,7 @@ player_get_direction__sp1AA: @ 808BC38 thumb_func_end player_get_direction__sp1AA thumb_func_start player_get_direction_upper_4bits -player_get_direction_upper_4bits: @ 808BC58 +player_get_direction_upper_4bits: ; 808BC58 ldr r2, =0x02037350 ldr r0, =0x02037590 ldrb r1, [r0, 0x5] @@ -255558,7 +255558,7 @@ player_get_direction_upper_4bits: @ 808BC58 thumb_func_end player_get_direction_upper_4bits thumb_func_start player_get_height -player_get_height: @ 808BC74 +player_get_height: ; 808BC74 ldr r2, =0x02037350 ldr r0, =0x02037590 ldrb r1, [r0, 0x5] @@ -255574,7 +255574,7 @@ player_get_height: @ 808BC74 thumb_func_end player_get_height thumb_func_start sub_808BC90 -sub_808BC90: @ 808BC90 +sub_808BC90: ; 808BC90 push {lr} adds r3, r0, 0 adds r2, r1, 0 @@ -255598,7 +255598,7 @@ sub_808BC90: @ 808BC90 thumb_func_end sub_808BC90 thumb_func_start walkrun_bitfield_and_r0 -walkrun_bitfield_and_r0: @ 808BCC0 +walkrun_bitfield_and_r0: ; 808BCC0 ldr r1, =0x02037590 ldrb r1, [r1] ands r1, r0 @@ -255609,7 +255609,7 @@ walkrun_bitfield_and_r0: @ 808BCC0 thumb_func_end walkrun_bitfield_and_r0 thumb_func_start sub_808BCD0 -sub_808BCD0: @ 808BCD0 +sub_808BCD0: ; 808BCD0 ldr r0, =0x02037590 ldrb r0, [r0] bx lr @@ -255618,7 +255618,7 @@ sub_808BCD0: @ 808BCD0 thumb_func_end sub_808BCD0 thumb_func_start sub_808BCDC -sub_808BCDC: @ 808BCDC +sub_808BCDC: ; 808BCDC ldr r0, =0x02037590 ldrb r0, [r0, 0x4] bx lr @@ -255627,7 +255627,7 @@ sub_808BCDC: @ 808BCDC thumb_func_end sub_808BCDC thumb_func_start sub_808BCE8 -sub_808BCE8: @ 808BCE8 +sub_808BCE8: ; 808BCE8 push {lr} bl sub_808AB94 pop {r0} @@ -255635,7 +255635,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] @@ -255655,11 +255655,11 @@ sub_808BCF4: @ 808BCF4 bl walkrun_bitfield_and_r0 lsls r0, 24 cmp r0, 0 - beq _0808BD2C + beq @0808BD2C bl sub_811A188 movs r0, 0 bl sub_811A114 -_0808BD2C: +@0808BD2C: pop {r4} pop {r0} bx r0 @@ -255668,7 +255668,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 @@ -255683,7 +255683,7 @@ sub_808BD3C: @ 808BD3C thumb_func_end sub_808BD3C thumb_func_start sub_808BD54 -sub_808BD54: @ 808BD54 +sub_808BD54: ; 808BD54 lsls r0, 24 lsls r1, 24 lsrs r1, 24 @@ -255698,7 +255698,7 @@ sub_808BD54: @ 808BD54 thumb_func_end sub_808BD54 thumb_func_start sub_808BD6C -sub_808BD6C: @ 808BD6C +sub_808BD6C: ; 808BD6C lsls r0, 24 lsrs r0, 24 ldr r1, =0x08497508 @@ -255710,7 +255710,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, =0x0849750a @@ -255722,7 +255722,7 @@ sub_808BD7C: @ 808BD7C thumb_func_end sub_808BD7C thumb_func_start sub_808BD8C -sub_808BD8C: @ 808BD8C +sub_808BD8C: ; 808BD8C push {lr} lsls r0, 24 lsrs r0, 24 @@ -255738,91 +255738,91 @@ sub_808BD8C: @ 808BD8C thumb_func_end sub_808BD8C thumb_func_start sub_808BDA8 -sub_808BDA8: @ 808BDA8 +sub_808BDA8: ; 808BDA8 push {lr} lsls r0, 24 lsrs r0, 24 adds r1, r0, 0 cmp r0, 0x70 - beq _0808BDCA + beq @0808BDCA cmp r0, 0x70 - bgt _0808BDC2 + bgt @0808BDC2 cmp r0, 0x6D - bgt _0808BDCE + bgt @0808BDCE cmp r0, 0x69 - blt _0808BDCE - b _0808BDCA -_0808BDC2: + blt @0808BDCE + b @0808BDCA +@0808BDC2: cmp r1, 0x8A - beq _0808BDCA + beq @0808BDCA cmp r1, 0xC0 - bne _0808BDCE -_0808BDCA: + bne @0808BDCE +@0808BDCA: movs r0, 0x1 - b _0808BDD0 -_0808BDCE: + b @0808BDD0 +@0808BDCE: movs r0, 0 -_0808BDD0: +@0808BDD0: pop {r1} bx r1 thumb_func_end sub_808BDA8 thumb_func_start sub_808BDD4 -sub_808BDD4: @ 808BDD4 +sub_808BDD4: ; 808BDD4 push {lr} lsls r0, 24 lsrs r0, 24 adds r1, r0, 0 cmp r0, 0x70 - beq _0808BDF6 + beq @0808BDF6 cmp r0, 0x70 - bgt _0808BDEE + bgt @0808BDEE cmp r0, 0x5D - bgt _0808BDFA + bgt @0808BDFA cmp r0, 0x59 - blt _0808BDFA - b _0808BDF6 -_0808BDEE: + blt @0808BDFA + b @0808BDF6 +@0808BDEE: cmp r1, 0x8A - beq _0808BDF6 + beq @0808BDF6 cmp r1, 0xC0 - bne _0808BDFA -_0808BDF6: + bne @0808BDFA +@0808BDF6: movs r0, 0x1 - b _0808BDFC -_0808BDFA: + b @0808BDFC +@0808BDFA: movs r0, 0 -_0808BDFC: +@0808BDFC: pop {r1} bx r1 thumb_func_end sub_808BDD4 thumb_func_start party_has_pokemon_with_surf -party_has_pokemon_with_surf: @ 808BE00 +party_has_pokemon_with_surf: ; 808BE00 push {r4,r5,lr} movs r0, 0x8 bl walkrun_bitfield_and_r0 lsls r0, 24 cmp r0, 0 - bne _0808BE44 + bne @0808BE44 movs r5, 0 - b _0808BE2A -_0808BE12: + b @0808BE2A +@0808BE12: adds r0, r4, 0 movs r1, 0x39 bl pokemon_has_move lsls r0, 24 cmp r0, 0 - beq _0808BE24 + beq @0808BE24 movs r0, 0x1 - b _0808BE46 -_0808BE24: + b @0808BE46 +@0808BE24: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_0808BE2A: +@0808BE2A: cmp r5, 0x5 - bhi _0808BE44 + bhi @0808BE44 movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -255832,10 +255832,10 @@ _0808BE2A: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - bne _0808BE12 -_0808BE44: + bne @0808BE12 +@0808BE44: movs r0, 0 -_0808BE46: +@0808BE46: pop {r4,r5} pop {r1} bx r1 @@ -255844,29 +255844,29 @@ _0808BE46: thumb_func_end party_has_pokemon_with_surf thumb_func_start sub_808BE50 -sub_808BE50: @ 808BE50 +sub_808BE50: ; 808BE50 push {lr} bl player_get_direction_upper_4bits lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _0808BE6E + bne @0808BE6E movs r0, 0x8 bl walkrun_bitfield_and_r0 lsls r0, 24 cmp r0, 0 - beq _0808BE6E + beq @0808BE6E movs r0, 0x1 - b _0808BE70 -_0808BE6E: + b @0808BE70 +@0808BE6E: movs r0, 0 -_0808BE70: +@0808BE70: pop {r1} bx r1 thumb_func_end sub_808BE50 thumb_func_start sub_808BE74 -sub_808BE74: @ 808BE74 +sub_808BE74: ; 808BE74 push {r4,r5,lr} sub sp, 0x4 ldr r0, =0x02037590 @@ -255902,12 +255902,12 @@ sub_808BE74: @ 808BE74 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bne _0808BEF4 + bne @0808BEF4 bl player_get_height lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bne _0808BEF4 + bne @0808BEF4 mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -255919,14 +255919,14 @@ sub_808BE74: @ 808BE74 bl block_field_1_weird_index lsls r0, 24 cmp r0, 0 - beq _0808BEF4 + beq @0808BEF4 movs r0, 0x1 - b _0808BEF6 + b @0808BEF6 .align 2, 0 .pool -_0808BEF4: +@0808BEF4: movs r0, 0 -_0808BEF6: +@0808BEF6: add sp, 0x4 pop {r4,r5} pop {r1} @@ -255934,7 +255934,7 @@ _0808BEF6: thumb_func_end sub_808BE74 thumb_func_start walkrun_state_clear -walkrun_state_clear: @ 808BF00 +walkrun_state_clear: ; 808BF00 push {lr} ldr r0, =0x02037590 movs r1, 0 @@ -255947,7 +255947,7 @@ walkrun_state_clear: @ 808BF00 thumb_func_end walkrun_state_clear thumb_func_start sub_808BF14 -sub_808BF14: @ 808BF14 +sub_808BF14: ; 808BF14 lsls r0, 24 lsrs r0, 24 ldr r3, =0x02037590 @@ -255962,7 +255962,7 @@ sub_808BF14: @ 808BF14 thumb_func_end sub_808BF14 thumb_func_start sub_808BF2C -sub_808BF2C: @ 808BF2C +sub_808BF2C: ; 808BF2C push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -255974,33 +255974,33 @@ sub_808BF2C: @ 808BF2C adds r0, r1 lsls r4, r0, 1 adds r6, r3, 0x1 -_0808BF42: +@0808BF42: lsls r0, r2, 1 adds r1, r0, r4 adds r0, r1, r3 ldrb r0, [r0] cmp r0, r5 - bne _0808BF58 + bne @0808BF58 adds r0, r1, r6 ldrb r0, [r0] - b _0808BF64 + b @0808BF64 .align 2, 0 .pool -_0808BF58: +@0808BF58: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x4 - bls _0808BF42 + bls @0808BF42 movs r0, 0x1 -_0808BF64: +@0808BF64: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_808BF2C thumb_func_start sub_808BF6C -sub_808BF6C: @ 808BF6C +sub_808BF6C: ; 808BF6C push {r4-r6,lr} ldr r0, =0x02037590 ldrb r5, [r0] @@ -256011,34 +256011,34 @@ sub_808BF6C: @ 808BF6C adds r0, r1 lsls r4, r0, 1 adds r6, r3, 0x1 -_0808BF80: +@0808BF80: lsls r0, r2, 1 adds r1, r0, r4 adds r0, r1, r6 ldrb r0, [r0] ands r0, r5 cmp r0, 0 - beq _0808BF9C + beq @0808BF9C adds r0, r1, r3 ldrb r0, [r0] - b _0808BFA8 + b @0808BFA8 .align 2, 0 .pool -_0808BF9C: +@0808BF9C: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x4 - bls _0808BF80 + bls @0808BF80 movs r0, 0 -_0808BFA8: +@0808BFA8: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_808BF6C thumb_func_start sub_808BFB0 -sub_808BFB0: @ 808BFB0 +sub_808BFB0: ; 808BFB0 push {r4,r5,lr} adds r4, r1, 0 lsls r0, 24 @@ -256063,7 +256063,7 @@ sub_808BFB0: @ 808BFB0 thumb_func_end sub_808BFB0 thumb_func_start player_avatar_init -player_avatar_init: @ 808BFE0 +player_avatar_init: ; 808BFE0 push {r4-r6,lr} mov r6, r9 mov r5, r8 @@ -256159,7 +256159,7 @@ player_avatar_init: @ 808BFE0 thumb_func_end player_avatar_init thumb_func_start sub_808C0A8 -sub_808C0A8: @ 808C0A8 +sub_808C0A8: ; 808C0A8 push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -256183,7 +256183,7 @@ sub_808C0A8: @ 808C0A8 bl walkrun_bitfield_and_r0 lsls r0, 24 cmp r0, 0 - beq _0808C100 + beq @0808C100 ldr r2, =0x02020630 ldrb r1, [r5, 0x5] lsls r0, r1, 3 @@ -256203,7 +256203,7 @@ sub_808C0A8: @ 808C0A8 ands r0, r2 orrs r0, r3 strb r0, [r1] -_0808C100: +@0808C100: pop {r4-r6} pop {r0} bx r0 @@ -256212,7 +256212,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] @@ -256244,7 +256244,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 @@ -256284,7 +256284,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} @@ -256336,7 +256336,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 @@ -256376,7 +256376,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 @@ -256394,7 +256394,7 @@ sub_808C280: @ 808C280 mov r4, sp mov r7, sp adds r7, 0x2 -_0808C2A2: +@0808C2A2: movs r1, 0 ldrsh r0, [r4, r1] lsls r0, 2 @@ -256404,11 +256404,11 @@ _0808C2A2: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - beq _0808C2E8 + beq @0808C2E8 ldrb r0, [r5, 0x18] lsrs r0, 4 cmp r6, r0 - bne _0808C2E8 + bne @0808C2E8 ldrh r0, [r5, 0x10] strh r0, [r4] ldrh r0, [r5, 0x12] @@ -256424,10 +256424,10 @@ _0808C2A2: ldrsh r3, [r7, r1] adds r1, r6, 0 bl sub_8154298 - b _0808C302 + b @0808C302 .align 2, 0 .pool -_0808C2E8: +@0808C2E8: ldrh r1, [r4] adds r1, 0x1 strh r1, [r4] @@ -256437,10 +256437,10 @@ _0808C2E8: lsls r1, 16 asrs r1, 16 cmp r1, 0x3 - ble _0808C2A2 + ble @0808C2A2 ldrb r0, [r5, 0x1B] bl objid_set_invisible -_0808C302: +@0808C302: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -256451,7 +256451,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 @@ -256481,7 +256481,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 @@ -256492,7 +256492,7 @@ taskFF_bump_boulder: @ 808C34C adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_0808C360: +@0808C360: movs r0, 0x8 ldrsh r3, [r4, r0] lsls r3, 2 @@ -256514,7 +256514,7 @@ _0808C360: bl _call_via_r3 lsls r0, 24 cmp r0, 0 - bne _0808C360 + bne @0808C360 pop {r4-r6} pop {r0} bx r0 @@ -256523,7 +256523,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 @@ -256542,7 +256542,7 @@ sub_808C3A4: @ 808C3A4 thumb_func_end sub_808C3A4 thumb_func_start sub_808C3C4 -sub_808C3C4: @ 808C3C4 +sub_808C3C4: ; 808C3C4 push {r4-r6,lr} adds r6, r0, 0 adds r5, r1, 0 @@ -256551,28 +256551,28 @@ sub_808C3C4: @ 808C3C4 bl npc_is_state_set_and_valid lsls r0, 24 cmp r0, 0 - beq _0808C3DE + beq @0808C3DE adds r0, r5, 0 bl sub_8093284 -_0808C3DE: +@0808C3DE: adds r0, r4, 0 bl npc_is_state_set_and_valid lsls r0, 24 cmp r0, 0 - beq _0808C3F0 + beq @0808C3F0 adds r0, r4, 0 bl sub_8093284 -_0808C3F0: +@0808C3F0: adds r0, r5, 0 bl npc_is_visible_or_is_x40 lsls r0, 24 cmp r0, 0 - bne _0808C472 + bne @0808C472 adds r0, r4, 0 bl npc_is_visible_or_is_x40 lsls r0, 24 cmp r0, 0 - bne _0808C472 + bne @0808C472 adds r0, r5, 0 bl sub_8093284 adds r0, r4, 0 @@ -256618,7 +256618,7 @@ _0808C3F0: ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] -_0808C472: +@0808C472: movs r0, 0 pop {r4-r6} pop {r1} @@ -256628,7 +256628,7 @@ _0808C472: thumb_func_end sub_808C3C4 thumb_func_start sub_808C484 -sub_808C484: @ 808C484 +sub_808C484: ; 808C484 push {r4,r5,lr} adds r4, r1, 0 adds r5, r2, 0 @@ -256636,12 +256636,12 @@ sub_808C484: @ 808C484 bl npc_get_bit7_or_const_x10_when_inactive lsls r0, 24 cmp r0, 0 - beq _0808C4C6 + beq @0808C4C6 adds r0, r5, 0 bl npc_get_bit7_or_const_x10_when_inactive lsls r0, 24 cmp r0, 0 - beq _0808C4C6 + beq @0808C4C6 adds r0, r4, 0 bl sub_8093284 adds r0, r5, 0 @@ -256655,7 +256655,7 @@ sub_808C484: @ 808C484 lsls r0, 24 lsrs r0, 24 bl remove_task -_0808C4C6: +@0808C4C6: movs r0, 0 pop {r4,r5} pop {r1} @@ -256665,7 +256665,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 + 1 adds r0, r4, 0 @@ -256682,7 +256682,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 @@ -256692,7 +256692,7 @@ sub_808C4F8: @ 808C4F8 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_0808C50A: +@0808C50A: movs r0, 0x8 ldrsh r2, [r4, r0] lsls r2, 2 @@ -256709,7 +256709,7 @@ _0808C50A: bl _call_via_r2 lsls r0, 24 cmp r0, 0 - bne _0808C50A + bne @0808C50A pop {r4,r5} pop {r0} bx r0 @@ -256718,7 +256718,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 @@ -256729,7 +256729,7 @@ sub_808C544: @ 808C544 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _0808C5A0 + beq @0808C5A0 movs r0, 0xA bl audio_play ldrb r0, [r4, 0x18] @@ -256747,7 +256747,7 @@ sub_808C544: @ 808C544 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0808C5A0 + ble @0808C5A0 movs r0, 0 strb r0, [r5, 0x6] ldrb r0, [r5, 0x1] @@ -256759,7 +256759,7 @@ sub_808C544: @ 808C544 lsls r0, 24 lsrs r0, 24 bl remove_task -_0808C5A0: +@0808C5A0: movs r0, 0 pop {r4-r6} pop {r1} @@ -256769,7 +256769,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 + 1 adds r0, r4, 0 @@ -256786,7 +256786,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 @@ -256796,7 +256796,7 @@ sub_808C5D0: @ 808C5D0 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_0808C5E2: +@0808C5E2: movs r0, 0x8 ldrsh r2, [r4, r0] lsls r2, 2 @@ -256813,7 +256813,7 @@ _0808C5E2: bl _call_via_r2 lsls r0, 24 cmp r0, 0 - bne _0808C5E2 + bne @0808C5E2 pop {r4,r5} pop {r0} bx r0 @@ -256822,7 +256822,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 @@ -256844,7 +256844,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 @@ -256857,7 +256857,7 @@ sub_808C644: @ 808C644 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _0808C6AC + beq @0808C6AC ldrb r0, [r5, 0x18] lsrs r0, 4 subs r0, 0x1 @@ -256872,28 +256872,28 @@ sub_808C644: @ 808C644 bl npc_set_state_2 ldrb r0, [r4, 0xA] cmp r6, r0 - bne _0808C68A + bne @0808C68A ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] -_0808C68A: +@0808C68A: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] movs r1, 0xC ldrsh r0, [r4, r1] cmp r0, 0x3 - ble _0808C6AC + ble @0808C6AC ldrb r0, [r4, 0xA] bl direction_reversed lsls r0, 24 lsrs r0, 24 cmp r6, r0 - bne _0808C6AC + bne @0808C6AC ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_0808C6AC: +@0808C6AC: movs r0, 0 add sp, 0x4 pop {r4-r6} @@ -256904,7 +256904,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 @@ -256917,7 +256917,7 @@ sub_808C6BC: @ 808C6BC bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _0808C6EC + beq @0808C6EC movs r1, 0xC ldrsh r0, [r5, r1] add r0, sp @@ -256926,7 +256926,7 @@ sub_808C6BC: @ 808C6BC bl npc_set_state_2 movs r0, 0x1 strh r0, [r5, 0x8] -_0808C6EC: +@0808C6EC: movs r0, 0 add sp, 0x8 pop {r4,r5} @@ -256937,7 +256937,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 @@ -256945,7 +256945,7 @@ sub_808C6FC: @ 808C6FC bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _0808C740 + beq @0808C740 ldrb r0, [r4, 0xA] bl direction_reversed lsls r0, 24 @@ -256965,7 +256965,7 @@ sub_808C6FC: @ 808C6FC lsls r0, 24 lsrs r0, 24 bl remove_task -_0808C740: +@0808C740: movs r0, 0 pop {r4,r5} pop {r1} @@ -256975,7 +256975,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 @@ -257013,7 +257013,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 @@ -257028,13 +257028,13 @@ taskFF_0805D1D4: @ 808C7A8 bl npc_is_visible_or_is_x40 lsls r0, 24 cmp r0, 0 - beq _0808C7D4 + beq @0808C7D4 adds r0, r5, 0 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _0808C7FC -_0808C7D4: + beq @0808C7FC +@0808C7D4: ldrb r0, [r5, 0x1A] movs r1, 0x2 bl sub_81555AC @@ -257052,7 +257052,7 @@ _0808C7D4: bl npc_set_state_2 ldr r0, =sub_808C814 + 1 str r0, [r4] -_0808C7FC: +@0808C7FC: pop {r4-r6} pop {r0} bx r0 @@ -257061,7 +257061,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 @@ -257076,7 +257076,7 @@ sub_808C814: @ 808C814 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _0808C87A + beq @0808C87A movs r0, 0 bl sub_808BD8C adds r1, r0, 0 @@ -257105,7 +257105,7 @@ sub_808C814: @ 808C814 bl obj_delete_and_free_tiles adds r0, r5, 0 bl remove_task -_0808C87A: +@0808C87A: pop {r4-r6} pop {r0} bx r0 @@ -257114,7 +257114,7 @@ _0808C87A: thumb_func_end sub_808C814 thumb_func_start fishing_start -fishing_start: @ 808C88C +fishing_start: ; 808C88C push {r4,r5,lr} adds r4, r0, 0 lsls r4, 24 @@ -257140,7 +257140,7 @@ fishing_start: @ 808C88C thumb_func_end fishing_start thumb_func_start sub_808C8C0 -sub_808C8C0: @ 808C8C0 +sub_808C8C0: ; 808C8C0 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -257150,7 +257150,7 @@ sub_808C8C0: @ 808C8C0 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_0808C8D2: +@0808C8D2: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -257160,7 +257160,7 @@ _0808C8D2: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _0808C8D2 + bne @0808C8D2 pop {r4,r5} pop {r0} bx r0 @@ -257169,7 +257169,7 @@ _0808C8D2: thumb_func_end sub_808C8C0 thumb_func_start sub_808C8F8 -sub_808C8F8: @ 808C8F8 +sub_808C8F8: ; 808C8F8 push {r4,lr} adds r4, r0, 0 bl script_env_2_enable @@ -257188,7 +257188,7 @@ sub_808C8F8: @ 808C8F8 thumb_func_end sub_808C8F8 thumb_func_start fish1 -fish1: @ 808C918 +fish1: ; 808C918 push {r4-r6,lr} sub sp, 0x10 adds r5, r0, 0 @@ -257255,7 +257255,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 @@ -257265,11 +257265,11 @@ fish2: @ 808C9B0 lsls r0, 16 asrs r0, 16 cmp r0, 0x3B - ble _0808C9CC + ble @0808C9CC ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_0808C9CC: +@0808C9CC: movs r0, 0 pop {r4} pop {r1} @@ -257277,7 +257277,7 @@ _0808C9CC: thumb_func_end fish2 thumb_func_start sub_808C9D4 -sub_808C9D4: @ 808C9D4 +sub_808C9D4: ; 808C9D4 push {r4,lr} adds r4, r0, 0 movs r0, 0 @@ -257300,17 +257300,17 @@ sub_808C9D4: @ 808C9D4 movs r2, 0x20 ldrsh r0, [r4, r2] cmp r0, 0 - bne _0808CA0C + bne @0808CA0C adds r0, r1, 0x4 strh r0, [r4, 0xE] -_0808CA0C: +@0808CA0C: movs r1, 0xE ldrsh r0, [r4, r1] cmp r0, 0x9 - ble _0808CA18 + ble @0808CA18 movs r0, 0xA strh r0, [r4, 0xE] -_0808CA18: +@0808CA18: movs r0, 0x1 pop {r4} pop {r1} @@ -257318,7 +257318,7 @@ _0808CA18: thumb_func_end sub_808C9D4 thumb_func_start sub_808CA20 -sub_808CA20: @ 808CA20 +sub_808CA20: ; 808CA20 push {r4,r5,lr} sub sp, 0x10 adds r4, r0, 0 @@ -257336,32 +257336,32 @@ sub_808CA20: @ 808CA20 adds r2, r5, 0 ands r2, r0 cmp r2, 0 - beq _0808CA64 + beq @0808CA64 movs r0, 0xB strh r0, [r4, 0x8] movs r1, 0x20 ldrsh r0, [r4, r1] cmp r0, 0 - beq _0808CA58 + beq @0808CA58 movs r0, 0xC strh r0, [r4, 0x8] -_0808CA58: +@0808CA58: movs r0, 0x1 - b _0808CAB4 + b @0808CAB4 .align 2, 0 .pool -_0808CA64: +@0808CA64: lsls r0, r1, 16 asrs r0, 16 cmp r0, 0x13 - ble _0808CAB2 + ble @0808CAB2 strh r2, [r4, 0xA] movs r3, 0xC ldrsh r1, [r4, r3] movs r3, 0xE ldrsh r0, [r4, r3] cmp r1, r0 - blt _0808CA94 + blt @0808CA94 ldrh r0, [r4, 0x8] adds r1, r0, 0x1 strh r1, [r4, 0x8] @@ -257369,14 +257369,14 @@ _0808CA64: movs r3, 0x20 ldrsh r0, [r4, r3] cmp r0, 0 - beq _0808CA8E + beq @0808CA8E adds r0, r1, 0x1 strh r0, [r4, 0x8] -_0808CA8E: +@0808CA8E: adds r0, r2, 0x1 strh r0, [r4, 0x20] - b _0808CAB2 -_0808CA94: + b @0808CAB2 +@0808CA94: movs r0, 0xC ldrsh r3, [r4, r0] lsls r3, 27 @@ -257391,9 +257391,9 @@ _0808CA94: ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] -_0808CAB2: +@0808CAB2: movs r0, 0 -_0808CAB4: +@0808CAB4: add sp, 0x10 pop {r4,r5} pop {r1} @@ -257401,7 +257401,7 @@ _0808CAB4: thumb_func_end sub_808CA20 thumb_func_start sub_808CABC -sub_808CABC: @ 808CABC +sub_808CABC: ; 808CABC push {r4-r6,lr} adds r5, r0, 0 bl sub_808CF78 @@ -257412,26 +257412,26 @@ sub_808CABC: @ 808CABC bl sub_80B56FC lsls r0, 24 cmp r0, 0 - bne _0808CADC + bne @0808CADC movs r0, 0xB strh r0, [r5, 0x8] - b _0808CB5C -_0808CADC: + b @0808CB5C +@0808CADC: ldr r4, =0x020244ec adds r0, r4, 0 movs r1, 0x6 bl pokemon_getattr cmp r0, 0 - bne _0808CB14 + bne @0808CB14 adds r0, r4, 0 bl sub_806B6D8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x15 - beq _0808CAFC + beq @0808CAFC cmp r0, 0x3C - bne _0808CB14 -_0808CAFC: + bne @0808CB14 +@0808CAFC: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -257440,26 +257440,26 @@ _0808CAFC: lsls r0, 16 lsrs r0, 16 cmp r0, 0xE - bls _0808CB14 + bls @0808CB14 movs r6, 0x1 -_0808CB14: +@0808CB14: cmp r6, 0 - bne _0808CB32 + bne @0808CB32 bl GenerateRandomNumber movs r1, 0x1 ands r1, r0 cmp r1, 0 - beq _0808CB30 + beq @0808CB30 movs r0, 0xB strh r0, [r5, 0x8] - b _0808CB32 + b @0808CB32 .align 2, 0 .pool -_0808CB30: +@0808CB30: movs r6, 0x1 -_0808CB32: +@0808CB32: cmp r6, 0x1 - bne _0808CB5C + bne @0808CB5C ldr r0, =0x02037590 ldrb r0, [r0, 0x4] lsls r4, r0, 4 @@ -257476,7 +257476,7 @@ _0808CB32: lsrs r1, 24 adds r0, r4, 0 bl obj_anim_image_start -_0808CB5C: +@0808CB5C: movs r0, 0x1 pop {r4-r6} pop {r1} @@ -257486,7 +257486,7 @@ _0808CB5C: thumb_func_end sub_808CABC thumb_func_start sub_808CB6C -sub_808CB6C: @ 808CB6C +sub_808CB6C: ; 808CB6C push {r4,r5,lr} sub sp, 0xC adds r5, r0, 0 @@ -257515,7 +257515,7 @@ sub_808CB6C: @ 808CB6C thumb_func_end sub_808CB6C thumb_func_start fish7 -fish7: @ 808CBA4 +fish7: ; 808CBA4 push {r4,lr} sub sp, 0x8 adds r4, r0, 0 @@ -257536,23 +257536,23 @@ fish7: @ 808CBA4 movs r2, 0 ldrsh r0, [r0, r2] cmp r1, r0 - blt _0808CBDC + blt @0808CBDC movs r0, 0xC - b _0808CBEC + b @0808CBEC .align 2, 0 .pool -_0808CBDC: +@0808CBDC: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0808CBEE + beq @0808CBEE ldrh r0, [r4, 0x8] adds r0, 0x1 -_0808CBEC: +@0808CBEC: strh r0, [r4, 0x8] -_0808CBEE: +@0808CBEE: movs r0, 0 add sp, 0x8 pop {r4} @@ -257563,7 +257563,7 @@ _0808CBEE: thumb_func_end fish7 thumb_func_start fish8 -fish8: @ 808CBFC +fish8: ; 808CBFC push {r4,lr} sub sp, 0xC adds r4, r0, 0 @@ -257580,9 +257580,9 @@ fish8: @ 808CBFC movs r2, 0x22 ldrsh r0, [r4, r2] cmp r1, r0 - blt _0808CC52 + blt @0808CC52 cmp r1, 0x1 - bgt _0808CC56 + bgt @0808CC56 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -257602,11 +257602,11 @@ fish8: @ 808CBFC lsls r0, 16 asrs r0, 16 cmp r1, r0 - ble _0808CC56 -_0808CC52: + ble @0808CC56 +@0808CC52: movs r0, 0x3 strh r0, [r4, 0x8] -_0808CC56: +@0808CC56: movs r0, 0 add sp, 0xC pop {r4} @@ -257617,7 +257617,7 @@ _0808CC56: thumb_func_end fish8 thumb_func_start sub_808CC64 -sub_808CC64: @ 808CC64 +sub_808CC64: ; 808CC64 push {r4,r5,lr} sub sp, 0x10 adds r4, r0, 0 @@ -257652,7 +257652,7 @@ sub_808CC64: @ 808CC64 thumb_func_end sub_808CC64 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} @@ -257660,20 +257660,20 @@ fishA_wait_for_a_pressed: @ 808CCA8 movs r1, 0xA ldrsh r0, [r5, r1] cmp r0, 0 - bne _0808CCBC + bne @0808CCBC bl sub_808CF78 -_0808CCBC: +@0808CCBC: bl run_remoboxes movs r1, 0xA ldrsh r0, [r5, r1] cmp r0, 0 - bne _0808CD58 + bne @0808CD58 movs r0, 0 bl a_pressed_maybe lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0 - bne _0808CD50 + bne @0808CD50 ldr r7, =0x02037590 ldrb r0, [r7, 0x5] lsls r4, r0, 3 @@ -257695,7 +257695,7 @@ _0808CCBC: movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _0808CD1A + beq @0808CD1A ldrb r0, [r7, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -257705,7 +257705,7 @@ _0808CCBC: movs r1, 0 movs r2, 0 bl sub_8155604 -_0808CD1A: +@0808CD1A: ldr r2, =0x02020630 ldrb r1, [r7, 0x4] lsls r0, r1, 4 @@ -257725,15 +257725,15 @@ _0808CD1A: ldrh r0, [r5, 0xA] adds r0, 0x1 strh r0, [r5, 0xA] - b _0808CD80 + b @0808CD80 .align 2, 0 .pool -_0808CD50: +@0808CD50: movs r1, 0xA ldrsh r0, [r5, r1] cmp r0, 0 - beq _0808CD80 -_0808CD58: + beq @0808CD80 +@0808CD58: ldr r1, =0x02037590 movs r0, 0 strb r0, [r1, 0x6] @@ -257749,7 +257749,7 @@ _0808CD58: lsls r0, 24 lsrs r0, 24 bl remove_task -_0808CD80: +@0808CD80: movs r0, 0 pop {r3} mov r8, r3 @@ -257761,7 +257761,7 @@ _0808CD80: thumb_func_end fishA_wait_for_a_pressed thumb_func_start sub_808CD94 -sub_808CD94: @ 808CD94 +sub_808CD94: ; 808CD94 push {r4,r5,lr} sub sp, 0x10 adds r5, r0, 0 @@ -257810,7 +257810,7 @@ sub_808CD94: @ 808CD94 thumb_func_end sub_808CD94 thumb_func_start sub_808CE04 -sub_808CE04: @ 808CE04 +sub_808CE04: ; 808CE04 push {r4,r5,lr} sub sp, 0x10 adds r5, r0, 0 @@ -257860,7 +257860,7 @@ sub_808CE04: @ 808CE04 thumb_func_end sub_808CE04 thumb_func_start sub_808CE74 -sub_808CE74: @ 808CE74 +sub_808CE74: ; 808CE74 push {r4,lr} adds r4, r0, 0 bl sub_808CF78 @@ -257874,7 +257874,7 @@ sub_808CE74: @ 808CE74 thumb_func_end sub_808CE74 thumb_func_start sub_808CE8C -sub_808CE8C: @ 808CE8C +sub_808CE8C: ; 808CE8C push {r4-r7,lr} mov r7, r8 push {r7} @@ -257891,7 +257891,7 @@ sub_808CE8C: @ 808CE8C ldrb r0, [r1] lsls r0, 27 cmp r0, 0 - bge _0808CF12 + bge @0808CF12 ldrb r0, [r5, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -257912,7 +257912,7 @@ sub_808CE8C: @ 808CE8C movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _0808CEF2 + beq @0808CEF2 ldrb r0, [r5, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -257922,7 +257922,7 @@ sub_808CE8C: @ 808CE8C movs r1, 0 movs r2, 0 bl sub_8155604 -_0808CEF2: +@0808CEF2: ldrb r1, [r5, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -257939,7 +257939,7 @@ _0808CEF2: ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] -_0808CF12: +@0808CF12: movs r0, 0 pop {r3} mov r8, r3 @@ -257951,7 +257951,7 @@ _0808CF12: thumb_func_end sub_808CE8C thumb_func_start fishF -fishF: @ 808CF2C +fishF: ; 808CF2C push {lr} bl run_remoboxes movs r0, 0 @@ -257959,7 +257959,7 @@ fishF: @ 808CF2C lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - bne _0808CF68 + bne @0808CF68 ldr r0, =0x02037590 strb r1, [r0, 0x6] bl script_env_2_disable @@ -257974,7 +257974,7 @@ fishF: @ 808CF2C lsls r0, 24 lsrs r0, 24 bl remove_task -_0808CF68: +@0808CF68: movs r0, 0 pop {r1} bx r1 @@ -257983,7 +257983,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] @@ -258015,7 +258015,7 @@ sub_808CF78: @ 808CF78 movs r7, 0x1 negs r7, r7 cmp r0, r7 - beq _0808CFEA + beq @0808CFEA adds r3, r4, 0 adds r3, 0x2C ldrb r2, [r3] @@ -258039,12 +258039,12 @@ sub_808CF78: @ 808CF78 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, r7 - bne _0808CFF0 -_0808CFEA: + bne @0808CFF0 +@0808CFEA: subs r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_0808CFF0: +@0808CFF0: adds r0, r4, 0 adds r0, 0x2A ldrb r0, [r0] @@ -258059,37 +258059,37 @@ _0808CFF0: lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bhi _0808D022 + bhi @0808D022 movs r0, 0x8 strh r0, [r4, 0x24] bl player_get_direction__sp1AA lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bne _0808D022 + bne @0808D022 ldr r0, =0x0000fff8 strh r0, [r4, 0x24] -_0808D022: +@0808D022: cmp r5, 0x5 - bne _0808D02A + bne @0808D02A ldr r0, =0x0000fff8 strh r0, [r4, 0x26] -_0808D02A: +@0808D02A: adds r0, r5, 0 subs r0, 0xA lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _0808D03A + bhi @0808D03A movs r0, 0x8 strh r0, [r4, 0x26] -_0808D03A: +@0808D03A: ldr r3, =0x02037590 ldrb r1, [r3] movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _0808D05E + beq @0808D05E ldr r2, =0x02037350 ldrb r1, [r3, 0x5] lsls r0, r1, 3 @@ -258101,7 +258101,7 @@ _0808D03A: ldrsh r2, [r4, r1] movs r1, 0x1 bl sub_8155604 -_0808D05E: +@0808D05E: pop {r4-r7} pop {r0} bx r0 @@ -258110,7 +258110,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 @@ -258119,14 +258119,14 @@ 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] cmp r0, 0 - bne _0808D08C + bne @0808D08C movs r0, 0x1 -_0808D08C: +@0808D08C: pop {r1} bx r1 .align 2, 0 @@ -258134,7 +258134,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} @@ -258162,24 +258162,24 @@ sub_808D094: @ 808D094 movs r0, 0 ldrsh r6, [r5, r0] cmp r6, 0x1 - beq _0808D14A + beq @0808D14A cmp r6, 0x1 - bgt _0808D0E8 + bgt @0808D0E8 cmp r6, 0 - beq _0808D0EE - b _0808D18A + beq @0808D0EE + b @0808D18A .align 2, 0 .pool -_0808D0E8: +@0808D0E8: cmp r6, 0x2 - beq _0808D184 - b _0808D18A -_0808D0EE: + beq @0808D184 + b @0808D18A +@0808D0EE: adds r0, r4, 0 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _0808D18A + beq @0808D18A ldrb r0, [r4, 0x18] lsls r0, 28 lsrs r0, 28 @@ -258218,7 +258218,7 @@ _0808D0EE: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] -_0808D14A: +@0808D14A: adds r1, r5, 0x2 adds r0, r4, 0 bl sub_808D38C @@ -258240,17 +258240,17 @@ _0808D14A: movs r0, 0x20 negs r0, r0 cmp r1, r0 - bge _0808D18A + bge @0808D18A ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] - b _0808D18A + b @0808D18A .align 2, 0 .pool -_0808D184: +@0808D184: adds r0, r2, 0 bl remove_task -_0808D18A: +@0808D18A: pop {r3} mov r8, r3 pop {r4-r7} @@ -258259,7 +258259,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 + 1 adds r0, r4, 0 @@ -258276,7 +258276,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 + 1 bl is_function_an_active_task @@ -258289,7 +258289,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 + 1 adds r0, r4, 0 @@ -258306,7 +258306,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 + 1 bl is_function_an_active_task @@ -258319,7 +258319,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 @@ -258349,21 +258349,21 @@ sub_808D1FC: @ 808D1FC movs r2, 0 ldrsh r6, [r5, r2] cmp r6, 0x1 - beq _0808D2DE + beq @0808D2DE cmp r6, 0x1 - bgt _0808D254 + bgt @0808D254 cmp r6, 0 - beq _0808D25E - b _0808D37E + beq @0808D25E + b @0808D37E .align 2, 0 .pool -_0808D254: +@0808D254: cmp r6, 0x2 - beq _0808D31C + beq @0808D31C cmp r6, 0x3 - beq _0808D33A - b _0808D37E -_0808D25E: + beq @0808D33A + b @0808D37E +@0808D25E: bl sub_808D080 lsls r0, 24 lsrs r0, 24 @@ -258424,7 +258424,7 @@ _0808D25E: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] -_0808D2DE: +@0808D2DE: adds r1, r5, 0x2 adds r0, r4, 0 bl sub_808D38C @@ -258437,10 +258437,10 @@ _0808D2DE: lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - bgt _0808D2FE + bgt @0808D2FE movs r0, 0x4 strh r0, [r5, 0x4] -_0808D2FE: +@0808D2FE: ldrh r0, [r5, 0x6] lsls r0, 16 asrs r0, 20 @@ -258449,14 +258449,14 @@ _0808D2FE: movs r3, 0x8 ldrsh r1, [r5, r3] cmp r0, r1 - blt _0808D37E + blt @0808D37E strh r2, [r7, 0x22] movs r0, 0 strh r0, [r5, 0x10] - b _0808D332 + b @0808D332 .align 2, 0 .pool -_0808D31C: +@0808D31C: adds r1, r5, 0x2 adds r0, r4, 0 bl sub_808D38C @@ -258466,13 +258466,13 @@ _0808D31C: lsls r0, 16 asrs r0, 16 cmp r0, 0x8 - ble _0808D37E -_0808D332: + ble @0808D37E +@0808D332: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] - b _0808D37E -_0808D33A: + b @0808D37E +@0808D33A: movs r0, 0xA ldrsh r6, [r5, r0] adds r1, r5, 0x2 @@ -258481,7 +258481,7 @@ _0808D33A: lsls r0, 24 lsrs r0, 24 cmp r6, r0 - bne _0808D37E + bne @0808D37E ldrb r1, [r4, 0x3] movs r0, 0x5 negs r0, r0 @@ -258504,7 +258504,7 @@ _0808D33A: bl sub_808EE8C mov r0, r8 bl remove_task -_0808D37E: +@0808D37E: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -258514,7 +258514,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 @@ -258522,19 +258522,19 @@ sub_808D38C: @ 808D38C movs r2, 0 ldrsh r0, [r6, r2] cmp r0, 0x7 - bgt _0808D3A8 + bgt @0808D3A8 adds r0, r1, 0x1 strh r0, [r6] lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - ble _0808D3E4 -_0808D3A8: + ble @0808D3E4 +@0808D3A8: adds r0, r5, 0 bl npc_get_bit7_or_const_x10_when_inactive lsls r0, 24 cmp r0, 0 - beq _0808D3E4 + beq @0808D3E4 ldr r4, =0x084975bc ldrb r0, [r5, 0x18] lsls r0, 28 @@ -258554,21 +258554,21 @@ _0808D3A8: lsrs r0, 28 adds r0, r4 ldrb r0, [r0] - b _0808D3EA + b @0808D3EA .align 2, 0 .pool -_0808D3E4: +@0808D3E4: ldrb r0, [r5, 0x18] lsls r0, 28 lsrs r0, 28 -_0808D3EA: +@0808D3EA: pop {r4-r6} pop {r1} bx r1 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 @@ -258587,11 +258587,11 @@ 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 -_0808D416: +@0808D416: lsls r0, r4, 3 adds r0, r4 lsls r0, 2 @@ -258601,7 +258601,7 @@ _0808D416: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bls _0808D416 + bls @0808D416 pop {r4,r5} pop {r0} bx r0 @@ -258610,7 +258610,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 @@ -258621,7 +258621,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 @@ -258699,37 +258699,37 @@ 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 ldrb r0, [r2] - b _0808D518 + b @0808D518 .align 2, 0 .pool -_0808D504: +@0808D504: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xF - bhi _0808D51E + bhi @0808D51E lsls r0, r1, 3 adds r0, r1 lsls r0, 2 adds r0, r2 ldrb r0, [r0] -_0808D518: +@0808D518: lsls r0, 31 cmp r0, 0 - bne _0808D504 -_0808D51E: + bne @0808D504 +@0808D51E: adds r0, r1, 0 pop {r1} bx r1 thumb_func_end sub_808D4F4 thumb_func_start get_npc_id_by_local_id -get_npc_id_by_local_id: @ 808D524 +get_npc_id_by_local_id: ; 808D524 push {lr} lsls r0, 24 lsrs r0, 24 @@ -258738,12 +258738,12 @@ get_npc_id_by_local_id: @ 808D524 lsls r2, 24 lsrs r2, 24 cmp r0, 0xFE - bls _0808D53C + bls @0808D53C bl npc_id_by_local_id_ignore_map - b _0808D540 -_0808D53C: + b @0808D540 +@0808D53C: bl npc_id_by_local_id_and_map -_0808D540: +@0808D540: lsls r0, 24 lsrs r0, 24 pop {r1} @@ -258751,7 +258751,7 @@ _0808D540: thumb_func_end get_npc_id_by_local_id thumb_func_start npc_id_by_local_id_and_map_ret_success -npc_id_by_local_id_and_map_ret_success: @ 808D548 +npc_id_by_local_id_and_map_ret_success: ; 808D548 push {r4,lr} adds r4, r3, 0 lsls r0, 24 @@ -258765,19 +258765,19 @@ npc_id_by_local_id_and_map_ret_success: @ 808D548 lsls r0, 24 lsrs r0, 24 cmp r0, 0x10 - beq _0808D56A + beq @0808D56A movs r0, 0 - b _0808D56C -_0808D56A: + b @0808D56C +@0808D56A: movs r0, 0x1 -_0808D56C: +@0808D56C: pop {r4} pop {r1} bx r1 thumb_func_end npc_id_by_local_id_and_map_ret_success thumb_func_start npc_id_by_pos -npc_id_by_pos: @ 808D574 +npc_id_by_pos: ; 808D574 push {r4-r6,lr} movs r3, 0 ldr r5, =0x02037350 @@ -258785,7 +258785,7 @@ npc_id_by_pos: @ 808D574 asrs r4, r0, 16 lsls r1, 16 asrs r1, 16 -_0808D582: +@0808D582: lsls r0, r3, 3 adds r0, r3 lsls r0, 2 @@ -258793,22 +258793,22 @@ _0808D582: ldrb r0, [r2] lsls r0, 31 cmp r0, 0 - beq _0808D5A2 + beq @0808D5A2 movs r6, 0x10 ldrsh r0, [r2, r6] cmp r0, r4 - bne _0808D5A2 + bne @0808D5A2 movs r6, 0x12 ldrsh r0, [r2, r6] cmp r0, r1 - beq _0808D5AC -_0808D5A2: + beq @0808D5AC +@0808D5A2: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0xF - bls _0808D582 -_0808D5AC: + bls @0808D582 +@0808D5AC: adds r0, r3, 0 pop {r4-r6} pop {r1} @@ -258818,7 +258818,7 @@ _0808D5AC: thumb_func_end npc_id_by_pos thumb_func_start npc_id_by_local_id_and_map -npc_id_by_local_id_and_map: @ 808D5B8 +npc_id_by_local_id_and_map: ; 808D5B8 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -258828,7 +258828,7 @@ npc_id_by_local_id_and_map: @ 808D5B8 lsrs r2, 24 movs r1, 0 ldr r6, =0x02037350 -_0808D5CA: +@0808D5CA: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 @@ -258836,41 +258836,41 @@ _0808D5CA: ldrb r0, [r3] lsls r0, 31 cmp r0, 0 - beq _0808D5F4 + beq @0808D5F4 ldrb r0, [r3, 0x8] cmp r0, r5 - bne _0808D5F4 + bne @0808D5F4 ldrb r0, [r3, 0x9] cmp r0, r4 - bne _0808D5F4 + bne @0808D5F4 ldrb r0, [r3, 0xA] cmp r0, r2 - bne _0808D5F4 + bne @0808D5F4 adds r0, r1, 0 - b _0808D600 + b @0808D600 .align 2, 0 .pool -_0808D5F4: +@0808D5F4: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xF - bls _0808D5CA + bls @0808D5CA movs r0, 0x10 -_0808D600: +@0808D600: pop {r4-r6} pop {r1} bx r1 thumb_func_end npc_id_by_local_id_and_map thumb_func_start npc_id_by_local_id_ignore_map -npc_id_by_local_id_ignore_map: @ 808D608 +npc_id_by_local_id_ignore_map: ; 808D608 push {r4,lr} lsls r0, 24 lsrs r3, r0, 24 movs r2, 0 ldr r4, =0x02037350 -_0808D612: +@0808D612: lsls r0, r2, 3 adds r0, r2 lsls r0, 2 @@ -258878,29 +258878,29 @@ _0808D612: ldrb r0, [r1] lsls r0, 31 cmp r0, 0 - beq _0808D630 + beq @0808D630 ldrb r0, [r1, 0x8] cmp r0, r3 - bne _0808D630 + bne @0808D630 adds r0, r2, 0 - b _0808D63C + b @0808D63C .align 2, 0 .pool -_0808D630: +@0808D630: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xF - bls _0808D612 + bls @0808D612 movs r0, 0x10 -_0808D63C: +@0808D63C: pop {r4} pop {r1} bx r1 thumb_func_end npc_id_by_local_id_ignore_map thumb_func_start sub_808D644 -sub_808D644: @ 808D644 +sub_808D644: ; 808D644 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -258918,10 +258918,10 @@ sub_808D644: @ 808D644 bl sub_808D810 lsls r0, 24 cmp r0, 0 - beq _0808D66E + beq @0808D66E movs r0, 0x10 - b _0808D762 -_0808D66E: + b @0808D762 +@0808D66E: mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -259012,12 +259012,12 @@ _0808D66E: adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _0808D75E + beq @0808D75E ldrb r2, [r4, 0x19] adds r0, r7, 0 ands r0, r2 cmp r0, 0 - bne _0808D746 + bne @0808D746 lsls r0, r2, 28 lsrs r0, 28 adds r0, 0x1 @@ -259027,12 +259027,12 @@ _0808D66E: ands r1, r2 orrs r1, r0 strb r1, [r4, 0x19] -_0808D746: +@0808D746: ldrb r2, [r4, 0x19] movs r0, 0xF0 ands r0, r2 cmp r0, 0 - bne _0808D75E + bne @0808D75E lsrs r1, r2, 4 adds r1, 0x1 lsls r1, 4 @@ -259040,10 +259040,10 @@ _0808D746: ands r0, r2 orrs r0, r1 strb r0, [r4, 0x19] -_0808D75E: +@0808D75E: mov r0, sp ldrb r0, [r0] -_0808D762: +@0808D762: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -259056,7 +259056,7 @@ _0808D762: thumb_func_end sub_808D644 thumb_func_start sub_808D77C -sub_808D77C: @ 808D77C +sub_808D77C: ; 808D77C push {r4-r7,lr} mov r7, r8 push {r7} @@ -259066,24 +259066,24 @@ sub_808D77C: @ 808D77C ldr r4, =0x02037318 ldr r0, [r4, 0x4] cmp r0, 0 - beq _0808D7FE + beq @0808D7FE bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - beq _0808D7A8 + beq @0808D7A8 bl sub_81AAA40 lsls r0, 24 lsrs r6, r0, 24 - b _0808D7CA + b @0808D7CA .align 2, 0 .pool -_0808D7A8: +@0808D7A8: bl sub_81D6074 cmp r0, 0 - beq _0808D7C6 + beq @0808D7C6 movs r6, 0x2 - b _0808D7CA -_0808D7B4: + b @0808D7CA +@0808D7B4: ldr r0, [r7] ldrb r1, [r0, 0x5] ldrb r2, [r0, 0x4] @@ -259091,16 +259091,16 @@ _0808D7B4: bl sub_808D644 lsls r0, 24 lsrs r0, 24 - b _0808D800 -_0808D7C6: + b @0808D800 +@0808D7C6: ldr r0, [r4, 0x4] ldrb r6, [r0] -_0808D7CA: +@0808D7CA: movs r5, 0 cmp r5, r6 - bcs _0808D7FE + bcs @0808D7FE ldr r7, =0x03005d8c -_0808D7D2: +@0808D7D2: lsls r0, r5, 1 adds r0, r5 lsls r0, 3 @@ -259111,21 +259111,21 @@ _0808D7D2: adds r4, r1, r0 ldrb r0, [r4] cmp r0, r8 - bne _0808D7F4 + bne @0808D7F4 ldrh r0, [r4, 0x14] bl flag_check lsls r0, 24 cmp r0, 0 - beq _0808D7B4 -_0808D7F4: + beq @0808D7B4 +@0808D7F4: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, r6 - bcc _0808D7D2 -_0808D7FE: + bcc @0808D7D2 +@0808D7FE: movs r0, 0x10 -_0808D800: +@0808D800: pop {r3} mov r8, r3 pop {r4-r7} @@ -259136,7 +259136,7 @@ _0808D800: thumb_func_end sub_808D77C thumb_func_start sub_808D810 -sub_808D810: @ 808D810 +sub_808D810: ; 808D810 push {r4-r7,lr} mov r12, r3 lsls r0, 16 @@ -259151,28 +259151,28 @@ sub_808D810: @ 808D810 lsls r0, 31 adds r7, r1, 0 cmp r0, 0 - beq _0808D864 + beq @0808D864 adds r3, r1, 0 -_0808D830: +@0808D830: lsls r0, r2, 3 adds r0, r2 lsls r0, 2 adds r1, r0, r3 ldrb r0, [r1, 0x8] cmp r0, r6 - bne _0808D84A + bne @0808D84A ldrb r0, [r1, 0x9] cmp r0, r5 - bne _0808D84A + bne @0808D84A ldrb r0, [r1, 0xA] cmp r0, r4 - beq _0808D868 -_0808D84A: + beq @0808D868 +@0808D84A: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xF - bhi _0808D868 + bhi @0808D868 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 @@ -259180,20 +259180,20 @@ _0808D84A: ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - bne _0808D830 -_0808D864: + bne @0808D830 +@0808D864: cmp r2, 0xF - bls _0808D870 -_0808D868: + bls @0808D870 +@0808D868: movs r0, 0x1 - b _0808D8A4 + b @0808D8A4 .align 2, 0 .pool -_0808D870: +@0808D870: mov r0, r12 strb r2, [r0] ldr r1, =0x02037350 -_0808D876: +@0808D876: lsls r0, r2, 3 adds r0, r2 lsls r0, 2 @@ -259201,24 +259201,24 @@ _0808D876: ldrb r0, [r3] lsls r0, 31 cmp r0, 0 - beq _0808D898 + beq @0808D898 ldrb r0, [r3, 0x8] cmp r0, r6 - bne _0808D898 + bne @0808D898 ldrb r0, [r3, 0x9] cmp r0, r5 - bne _0808D898 + bne @0808D898 ldrb r0, [r3, 0xA] cmp r0, r4 - beq _0808D868 -_0808D898: + beq @0808D868 +@0808D898: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xF - bls _0808D876 + bls @0808D876 movs r0, 0 -_0808D8A4: +@0808D8A4: pop {r4-r7} pop {r1} bx r1 @@ -259227,7 +259227,7 @@ _0808D8A4: thumb_func_end sub_808D810 thumb_func_start npc_hide -npc_hide: @ 808D8B0 +npc_hide: ; 808D8B0 push {lr} ldrb r2, [r0] movs r1, 0x2 @@ -259240,7 +259240,7 @@ npc_hide: @ 808D8B0 thumb_func_end npc_hide thumb_func_start npc_hide_by_local_id_and_map -npc_hide_by_local_id_and_map: @ 808D8C4 +npc_hide_by_local_id_and_map: ; 808D8C4 push {lr} sub sp, 0x4 lsls r0, 24 @@ -259253,7 +259253,7 @@ npc_hide_by_local_id_and_map: @ 808D8C4 bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _0808D902 + bne @0808D902 mov r0, sp ldrb r0, [r0] bl rom_npc_id_in_script_by_npc_id @@ -259268,7 +259268,7 @@ npc_hide_by_local_id_and_map: @ 808D8C4 ldr r1, =0x02037350 adds r0, r1 bl npc_hide -_0808D902: +@0808D902: add sp, 0x4 pop {r0} bx r0 @@ -259277,7 +259277,7 @@ _0808D902: thumb_func_end npc_hide_by_local_id_and_map thumb_func_start npc_delete_obj_and_free_tiles_for_npc_type -npc_delete_obj_and_free_tiles_for_npc_type: @ 808D90C +npc_delete_obj_and_free_tiles_for_npc_type: ; 808D90C push {r4,lr} sub sp, 0x8 adds r4, r0, 0 @@ -259314,26 +259314,26 @@ npc_delete_obj_and_free_tiles_for_npc_type: @ 808D90C thumb_func_end npc_delete_obj_and_free_tiles_for_npc_type thumb_func_start npc_hide_all_but_player -npc_hide_all_but_player: @ 808D958 +npc_hide_all_but_player: ; 808D958 push {r4,lr} movs r4, 0 -_0808D95C: +@0808D95C: ldr r0, =0x02037590 ldrb r0, [r0, 0x5] cmp r4, r0 - beq _0808D972 + beq @0808D972 lsls r0, r4, 3 adds r0, r4 lsls r0, 2 ldr r1, =0x02037350 adds r0, r1 bl npc_hide -_0808D972: +@0808D972: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bls _0808D95C + bls @0808D95C pop {r4} pop {r0} bx r0 @@ -259342,7 +259342,7 @@ _0808D972: thumb_func_end npc_hide_all_but_player thumb_func_start npc_spawn_with_provided_template -npc_spawn_with_provided_template: @ 808D98C +npc_spawn_with_provided_template: ; 808D98C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -259369,10 +259369,10 @@ npc_spawn_with_provided_template: @ 808D98C lsrs r0, 24 mov r9, r0 cmp r0, 0x10 - bne _0808D9C8 + bne @0808D9C8 movs r0, 0x10 - b _0808DB2C -_0808D9C8: + b @0808DB2C +@0808D9C8: mov r0, r9 lsls r4, r0, 3 adds r0, r4, r0 @@ -259386,23 +259386,23 @@ _0808D9C8: lsls r0, 28 lsrs r5, r0, 28 cmp r5, 0 - bne _0808D9F4 + bne @0808D9F4 ldrh r0, [r7, 0x2] movs r1, 0 bl npc_load_two_palettes__no_record - b _0808DA16 + b @0808DA16 .align 2, 0 .pool -_0808D9F4: +@0808D9F4: cmp r5, 0xA - bne _0808DA02 + bne @0808DA02 ldrh r0, [r7, 0x2] movs r1, 0xA bl npc_load_two_palettes__and_record - b _0808DA16 -_0808DA02: + b @0808DA16 +@0808DA02: cmp r5, 0xF - bls _0808DA16 + bls @0808DA16 adds r0, r5, 0 subs r0, 0x10 lsls r0, 24 @@ -259410,15 +259410,15 @@ _0808DA02: ldrh r0, [r7, 0x2] adds r1, r5, 0 bl sub_808EAB0 -_0808DA16: +@0808DA16: ldrb r0, [r6, 0x6] cmp r0, 0x4C - bne _0808DA24 + bne @0808DA24 ldrb r0, [r6, 0x1] movs r1, 0x20 orrs r0, r1 strb r0, [r6, 0x1] -_0808DA24: +@0808DA24: ldr r1, =0x0000ffff adds r0, r1, 0 mov r2, r8 @@ -259432,7 +259432,7 @@ _0808DA24: lsrs r0, 24 mov r8, r0 cmp r0, 0x40 - bne _0808DA64 + bne @0808DA64 ldr r0, =0x02037350 mov r2, r9 adds r1, r4, r2 @@ -259444,10 +259444,10 @@ _0808DA24: ands r0, r2 strb r0, [r1] movs r0, 0x10 - b _0808DB2C + b @0808DB2C .align 2, 0 .pool -_0808DA64: +@0808DA64: mov r1, r8 lsls r0, r1, 4 add r0, r8 @@ -259524,7 +259524,7 @@ _0808DA64: strb r0, [r6, 0x1] lsls r0, 27 cmp r0, 0 - blt _0808DB16 + blt @0808DB16 ldrb r0, [r6, 0x18] lsls r0, 28 lsrs r0, 28 @@ -259534,7 +259534,7 @@ _0808DA64: lsrs r1, 24 adds r0, r4, 0 bl obj_anim_image_start -_0808DB16: +@0808DB16: ldrb r0, [r6, 0xB] lsrs r0, 4 adds r1, r4, 0 @@ -259544,7 +259544,7 @@ _0808DB16: adds r1, r4, 0 bl sub_8096518 mov r0, r9 -_0808DB2C: +@0808DB2C: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -259558,7 +259558,7 @@ _0808DB2C: thumb_func_end npc_spawn_with_provided_template thumb_func_start npc_instanciation_something -npc_instanciation_something: @ 808DB40 +npc_instanciation_something: ; 808DB40 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -259612,12 +259612,12 @@ npc_instanciation_something: @ 808DB40 lsrs r2, r0, 24 adds r5, r2, 0 cmp r2, 0x10 - bne _0808DBBC + bne @0808DBBC movs r0, 0x10 - b _0808DBF2 + b @0808DBF2 .align 2, 0 .pool -_0808DBBC: +@0808DBBC: ldr r4, =0x02020630 ldr r1, =0x02037350 lsls r0, r2, 3 @@ -259635,7 +259635,7 @@ _0808DBBC: str r1, [r0] ldr r2, [sp, 0x20] cmp r2, 0 - beq _0808DBF0 + beq @0808DBF0 ldrb r1, [r3, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -259643,9 +259643,9 @@ _0808DBBC: adds r0, r4 adds r1, r2, 0 bl obj_set_f18_to_r0_f42_to_40 -_0808DBF0: +@0808DBF0: adds r0, r5, 0 -_0808DBF2: +@0808DBF2: add sp, 0x2C pop {r3,r4} mov r8, r3 @@ -259658,7 +259658,7 @@ _0808DBF2: thumb_func_end npc_instanciation_something thumb_func_start player_avatar_instanciate_maybe -player_avatar_instanciate_maybe: @ 808DC08 +player_avatar_instanciate_maybe: ; 808DC08 push {r4-r6,lr} sub sp, 0x8 adds r5, r0, 0 @@ -259690,7 +259690,7 @@ player_avatar_instanciate_maybe: @ 808DC08 thumb_func_end player_avatar_instanciate_maybe thumb_func_start sub_808DC44 -sub_808DC44: @ 808DC44 +sub_808DC44: ; 808DC44 push {r4-r6,lr} mov r6, r8 push {r6} @@ -259744,7 +259744,7 @@ sub_808DC44: @ 808DC44 thumb_func_end sub_808DC44 thumb_func_start show_sprite -show_sprite: @ 808DCAC +show_sprite: ; 808DCAC push {r4-r7,lr} sub sp, 0x8 lsls r0, 24 @@ -259758,7 +259758,7 @@ show_sprite: @ 808DCAC bl rom_npc_by_local_id_and_map adds r5, r0, 0 cmp r5, 0 - beq _0808DCF2 + beq @0808DCF2 mov r4, sp adds r4, 0x6 add r0, sp, 0x4 @@ -259776,10 +259776,10 @@ show_sprite: @ 808DCAC bl npc_instanciation_something lsls r0, 24 lsrs r0, 24 - b _0808DCF4 -_0808DCF2: + b @0808DCF4 +@0808DCF2: movs r0, 0x10 -_0808DCF4: +@0808DCF4: add sp, 0x8 pop {r4-r7} pop {r1} @@ -259787,7 +259787,7 @@ _0808DCF4: thumb_func_end show_sprite thumb_func_start sub_808DCFC -sub_808DCFC: @ 808DCFC +sub_808DCFC: ; 808DCFC push {r4-r6,lr} adds r5, r1, 0 adds r4, r2, 0 @@ -259816,7 +259816,7 @@ sub_808DCFC: @ 808DCFC thumb_func_end sub_808DCFC thumb_func_start npc_to_objtemplate__with_indexed_objfunc -npc_to_objtemplate__with_indexed_objfunc: @ 808DD30 +npc_to_objtemplate__with_indexed_objfunc: ; 808DD30 push {r4,lr} lsls r0, 16 lsrs r0, 16 @@ -259834,7 +259834,7 @@ npc_to_objtemplate__with_indexed_objfunc: @ 808DD30 thumb_func_end npc_to_objtemplate__with_indexed_objfunc thumb_func_start rom_npc_to_template -rom_npc_to_template: @ 808DD50 +rom_npc_to_template: ; 808DD50 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -259849,7 +259849,7 @@ rom_npc_to_template: @ 808DD50 thumb_func_end rom_npc_to_template thumb_func_start sub_808DD68 -sub_808DD68: @ 808DD68 +sub_808DD68: ; 808DD68 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -259879,10 +259879,10 @@ sub_808DD68: @ 808DD68 ldrh r1, [r6, 0x2] ldr r0, =0x0000ffff cmp r1, r0 - beq _0808DDAE + beq @0808DDAE adds r0, r1, 0 bl sub_808E894 -_0808DDAE: +@0808DDAE: mov r0, r8 lsls r1, r0, 16 asrs r1, 16 @@ -259896,10 +259896,10 @@ _0808DDAE: adds r0, r6, 0 bl free cmp r5, 0x40 - beq _0808DDF2 + beq @0808DDF2 ldr r1, [sp] cmp r1, 0 - beq _0808DDF2 + beq @0808DDF2 lsls r4, r5, 4 adds r4, r5 lsls r4, 2 @@ -259914,7 +259914,7 @@ _0808DDAE: movs r1, 0x80 orrs r0, r1 strb r0, [r4] -_0808DDF2: +@0808DDF2: adds r0, r5, 0 add sp, 0x4 pop {r3,r4} @@ -259928,7 +259928,7 @@ _0808DDF2: thumb_func_end sub_808DD68 thumb_func_start sprite_new -sprite_new: @ 808DE0C +sprite_new: ; 808DE0C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -259991,7 +259991,7 @@ sprite_new: @ 808DE0C lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 - beq _0808DF6C + beq @0808DF6C lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -260027,13 +260027,13 @@ sprite_new: @ 808DE0C lsls r1, r2, 24 lsrs r0, r1, 28 cmp r0, 0xF - bls _0808DEE4 + bls @0808DEE4 subs r0, 0x10 lsls r0, 4 ands r2, r3 orrs r2, r0 strb r2, [r5, 0x5] -_0808DEE4: +@0808DEE4: adds r2, r5, 0 adds r2, 0x3E ldrb r0, [r2] @@ -260047,28 +260047,28 @@ _0808DEE4: adds r0, r3, 0 ands r0, r1 cmp r0, 0xA - bne _0808DF18 + bne @0808DF18 ldrh r0, [r4, 0x2] lsls r1, 28 lsrs r1, 28 bl npc_load_two_palettes__and_record - b _0808DF2C + b @0808DF2C .align 2, 0 .pool -_0808DF18: +@0808DF18: lsls r1, 28 lsrs r0, r1, 28 cmp r0, 0xF - bls _0808DF2C + bls @0808DF2C ldrh r0, [r4, 0x2] lsrs r2, r1, 28 movs r1, 0xF0 orrs r1, r2 bl sub_808EAB0 -_0808DF2C: +@0808DF2C: ldr r1, [sp, 0x1C] cmp r1, 0 - beq _0808DF48 + beq @0808DF48 adds r0, r5, 0 bl obj_set_f18_to_r0_f42_to_40 adds r2, r5, 0 @@ -260079,7 +260079,7 @@ _0808DF2C: movs r0, 0x80 orrs r1, r0 strb r1, [r2] -_0808DF48: +@0808DF48: adds r0, r5, 0 adds r1, r7, 0 bl sub_8096D5C @@ -260094,7 +260094,7 @@ _0808DF48: lsrs r1, 24 adds r0, r5, 0 bl obj_anim_image_start -_0808DF6C: +@0808DF6C: adds r0, r6, 0 add sp, 0x20 pop {r3-r5} @@ -260107,7 +260107,7 @@ _0808DF6C: thumb_func_end sprite_new thumb_func_start npc_culling_maybe -npc_culling_maybe: @ 808DF80 +npc_culling_maybe: ; 808DF80 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -260123,7 +260123,7 @@ npc_culling_maybe: @ 808DF80 ldr r5, =0x02037318 ldr r0, [r5, 0x4] cmp r0, 0 - beq _0808E078 + beq @0808E078 ldr r0, =0x03005d8c ldr r2, [r0] ldrh r1, [r2] @@ -260144,26 +260144,26 @@ npc_culling_maybe: @ 808DF80 bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - beq _0808DFE0 + beq @0808DFE0 bl sub_81AAA40 lsls r0, 24 lsrs r6, r0, 24 - b _0808DFF0 + b @0808DFF0 .align 2, 0 .pool -_0808DFE0: +@0808DFE0: bl sub_81D6074 cmp r0, 0 - beq _0808DFEC + beq @0808DFEC movs r6, 0x2 - b _0808DFF0 -_0808DFEC: + b @0808DFF0 +@0808DFEC: ldr r0, [r5, 0x4] ldrb r6, [r0] -_0808DFF0: +@0808DFF0: movs r5, 0 cmp r5, r6 - bcs _0808E078 + bcs @0808E078 lsls r0, r4, 16 asrs r0, 16 mov r9, r0 @@ -260171,7 +260171,7 @@ _0808DFF0: lsls r0, r1, 16 asrs r0, 16 mov r8, r0 -_0808E004: +@0808E004: lsls r0, r5, 1 adds r0, r5 lsls r0, 3 @@ -260190,26 +260190,26 @@ _0808E004: lsls r0, 16 asrs r1, r0, 16 cmp r9, r1 - bgt _0808E06E + bgt @0808E06E mov r7, r10 lsls r0, r7, 16 asrs r0, 16 cmp r0, r1 - blt _0808E06E + blt @0808E06E lsls r0, r2, 16 asrs r1, r0, 16 cmp r8, r1 - bgt _0808E06E + bgt @0808E06E ldr r2, [sp, 0xC] lsls r0, r2, 16 asrs r0, 16 cmp r0, r1 - blt _0808E06E + blt @0808E06E ldrh r0, [r4, 0x14] bl flag_check lsls r0, 24 cmp r0, 0 - bne _0808E06E + bne @0808E06E ldr r3, =0x03005d8c ldr r0, [r3] ldrb r1, [r0, 0x5] @@ -260223,13 +260223,13 @@ _0808E004: adds r0, r4, 0 asrs r3, 16 bl npc_instanciation_something -_0808E06E: +@0808E06E: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, r6 - bcc _0808E004 -_0808E078: + bcc @0808E004 +@0808E078: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -260243,32 +260243,32 @@ _0808E078: thumb_func_end npc_culling_maybe thumb_func_start sub_808E08C -sub_808E08C: @ 808E08C +sub_808E08C: ; 808E08C push {r4-r6,lr} movs r3, 0 ldr r6, =0x02032308 -_0808E092: +@0808E092: movs r2, 0 movs r4, 0 adds r5, r3, 0x1 -_0808E098: +@0808E098: lsls r0, r2, 2 adds r1, r0, r6 ldrb r0, [r1] cmp r0, 0 - beq _0808E0AA + beq @0808E0AA ldrb r1, [r1, 0x2] cmp r3, r1 - bne _0808E0AA + bne @0808E0AA movs r4, 0x1 -_0808E0AA: +@0808E0AA: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls _0808E098 + bls @0808E098 cmp r4, 0 - bne _0808E0D2 + bne @0808E0D2 lsls r0, r3, 3 adds r0, r3 lsls r0, 2 @@ -260278,14 +260278,14 @@ _0808E0AA: ldr r1, =0x00010001 ands r0, r1 cmp r0, 0x1 - bne _0808E0D2 + bne @0808E0D2 adds r0, r2, 0 bl sub_808E0EC -_0808E0D2: +@0808E0D2: lsls r0, r5, 24 lsrs r3, r0, 24 cmp r3, 0xF - bls _0808E092 + bls @0808E092 pop {r4-r6} pop {r0} bx r0 @@ -260294,7 +260294,7 @@ _0808E0D2: thumb_func_end sub_808E08C thumb_func_start sub_808E0EC -sub_808E0EC: @ 808E0EC +sub_808E0EC: ; 808E0EC push {r4-r7,lr} adds r3, r0, 0 ldr r0, =0x03005d8c @@ -260315,46 +260315,46 @@ sub_808E0EC: @ 808E0EC lsrs r7, r1, 16 asrs r1, 16 cmp r2, r1 - blt _0808E132 + blt @0808E132 lsls r0, r5, 16 asrs r0, 16 cmp r2, r0 - bgt _0808E132 + bgt @0808E132 movs r0, 0x12 ldrsh r1, [r3, r0] lsls r0, r4, 16 asrs r0, 16 cmp r1, r0 - blt _0808E132 + blt @0808E132 lsls r0, r6, 16 asrs r0, 16 cmp r1, r0 - ble _0808E160 -_0808E132: + ble @0808E160 +@0808E132: movs r0, 0xC ldrsh r1, [r3, r0] lsls r0, r7, 16 asrs r0, 16 cmp r1, r0 - blt _0808E15A + blt @0808E15A lsls r0, r5, 16 asrs r0, 16 cmp r1, r0 - bgt _0808E15A + bgt @0808E15A movs r0, 0xE ldrsh r1, [r3, r0] lsls r0, r4, 16 asrs r0, 16 cmp r1, r0 - blt _0808E15A + blt @0808E15A lsls r0, r6, 16 asrs r0, 16 cmp r1, r0 - ble _0808E160 -_0808E15A: + ble @0808E160 +@0808E15A: adds r0, r3, 0 bl npc_hide -_0808E160: +@0808E160: pop {r4-r7} pop {r0} bx r0 @@ -260363,7 +260363,7 @@ _0808E160: thumb_func_end sub_808E0EC thumb_func_start sub_808E16C -sub_808E16C: @ 808E16C +sub_808E16C: ; 808E16C push {r4-r7,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -260376,7 +260376,7 @@ sub_808E16C: @ 808E16C ldr r7, =0x02037350 lsls r4, 16 lsls r5, 16 -_0808E186: +@0808E186: lsls r0, r6, 3 adds r0, r6 lsls r0, 2 @@ -260384,17 +260384,17 @@ _0808E186: ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - beq _0808E1A0 + beq @0808E1A0 adds r0, r6, 0 asrs r1, r4, 16 asrs r2, r5, 16 bl sub_808E1B8 -_0808E1A0: +@0808E1A0: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0xF - bls _0808E186 + bls @0808E186 bl sub_808D450 pop {r4-r7} pop {r0} @@ -260404,7 +260404,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 @@ -260422,22 +260422,22 @@ sub_808E1B8: @ 808E1B8 str r2, [sp, 0x24] movs r7, 0 ldr r2, =0x02032308 -_0808E1DA: +@0808E1DA: lsls r0, r7, 2 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0 - beq _0808E1EC + beq @0808E1EC ldrb r1, [r1, 0x2] cmp r9, r1 - bne _0808E1EC - b _0808E374 -_0808E1EC: + bne @0808E1EC + b @0808E374 +@0808E1EC: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x3 - bls _0808E1DA + bls @0808E1DA mov r1, r9 lsls r0, r1, 3 add r0, r9 @@ -260471,25 +260471,25 @@ _0808E1EC: lsrs r0, r1, 28 mov r8, r0 cmp r0, 0 - bne _0808E258 + bne @0808E258 ldrh r0, [r5, 0x2] lsrs r1, 28 bl npc_load_two_palettes__no_record - b _0808E27E + b @0808E27E .align 2, 0 .pool -_0808E258: +@0808E258: mov r2, r8 cmp r2, 0xA - bne _0808E268 + bne @0808E268 ldrh r0, [r5, 0x2] lsrs r1, 28 bl npc_load_two_palettes__and_record - b _0808E27E -_0808E268: + b @0808E27E +@0808E268: mov r0, r8 cmp r0, 0xF - bls _0808E27E + bls @0808E27E subs r0, 0x10 lsls r0, 24 lsrs r0, 24 @@ -260497,7 +260497,7 @@ _0808E268: ldrh r0, [r5, 0x2] mov r1, r8 bl sub_808EAB0 -_0808E27E: +@0808E27E: mov r1, sp ldr r2, =0x0000ffff adds r0, r2, 0 @@ -260510,7 +260510,7 @@ _0808E27E: lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x40 - beq _0808E374 + beq @0808E374 lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -260562,19 +260562,19 @@ _0808E27E: str r0, [r4, 0xC] ldrb r0, [r6, 0x6] cmp r0, 0xB - bne _0808E312 + bne @0808E312 mov r0, r9 adds r1, r7, 0 bl sub_808E3C4 bl sub_8154228 strb r0, [r6, 0x1B] -_0808E312: +@0808E312: ldr r1, [sp, 0x20] cmp r1, 0 - beq _0808E31E + beq @0808E31E adds r0, r4, 0 bl obj_set_f18_to_r0_f42_to_40 -_0808E31E: +@0808E31E: mov r0, r8 lsls r2, r0, 4 ldrb r1, [r4, 0x5] @@ -260594,10 +260594,10 @@ _0808E31E: ldrb r0, [r6, 0x1] lsls r0, 27 cmp r0, 0 - blt _0808E362 + blt @0808E362 ldrb r0, [r6, 0x6] cmp r0, 0xB - beq _0808E362 + beq @0808E362 ldrb r0, [r6, 0x18] lsls r0, 28 lsrs r0, 28 @@ -260607,7 +260607,7 @@ _0808E31E: lsrs r1, 24 adds r0, r4, 0 bl obj_anim_image_start -_0808E362: +@0808E362: adds r0, r6, 0 bl sub_808E38C ldrb r0, [r6, 0xB] @@ -260615,7 +260615,7 @@ _0808E362: adds r1, r4, 0 movs r2, 0x1 bl npc_y_height_related -_0808E374: +@0808E374: add sp, 0x28 pop {r3-r5} mov r8, r3 @@ -260629,7 +260629,7 @@ _0808E374: thumb_func_end sub_808E1B8 thumb_func_start sub_808E38C -sub_808E38C: @ 808E38C +sub_808E38C: ; 808E38C push {lr} ldrb r2, [r0] movs r3, 0x3 @@ -260660,7 +260660,7 @@ sub_808E38C: @ 808E38C thumb_func_end sub_808E38C thumb_func_start sub_808E3C4 -sub_808E3C4: @ 808E3C4 +sub_808E3C4: ; 808E3C4 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -260686,7 +260686,7 @@ sub_808E3C4: @ 808E3C4 thumb_func_end sub_808E3C4 thumb_func_start sub_808E3F8 -sub_808E3F8: @ 808E3F8 +sub_808E3F8: ; 808E3F8 push {r4-r7,lr} mov r7, r8 push {r7} @@ -260707,23 +260707,23 @@ sub_808E3F8: @ 808E3F8 lsls r1, r0, 28 lsrs r5, r1, 28 cmp r5, 0 - bne _0808E434 + bne @0808E434 ldrh r0, [r6, 0x2] adds r1, r5, 0 bl pal_patch_for_npc - b _0808E456 + b @0808E456 .align 2, 0 .pool -_0808E434: +@0808E434: cmp r5, 0xA - bne _0808E442 + bne @0808E442 ldrh r0, [r6, 0x2] lsrs r1, 28 bl npc_load_two_palettes__and_record - b _0808E456 -_0808E442: + b @0808E456 +@0808E442: cmp r5, 0xF - bls _0808E456 + bls @0808E456 adds r0, r5, 0 subs r0, 0x10 lsls r0, 24 @@ -260731,7 +260731,7 @@ _0808E442: ldrh r0, [r6, 0x2] adds r1, r5, 0 bl sub_808EAB0 -_0808E456: +@0808E456: ldr r0, [r6, 0x10] ldrb r2, [r0, 0x1] lsrs r2, 6 @@ -260809,9 +260809,9 @@ _0808E456: ldrb r0, [r7, 0x1] lsrs r0, 7 cmp r0, 0 - beq _0808E4F8 + beq @0808E4F8 bl sub_808EE8C -_0808E4F8: +@0808E4F8: pop {r3} mov r8, r3 pop {r4-r7} @@ -260820,7 +260820,7 @@ _0808E4F8: thumb_func_end sub_808E3F8 thumb_func_start sub_808E504 -sub_808E504: @ 808E504 +sub_808E504: ; 808E504 push {r4,lr} sub sp, 0x4 lsls r0, 24 @@ -260835,7 +260835,7 @@ sub_808E504: @ 808E504 bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _0808E538 + bne @0808E538 mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -260845,7 +260845,7 @@ sub_808E504: @ 808E504 adds r0, r1 adds r1, r4, 0 bl sub_808E3F8 -_0808E538: +@0808E538: add sp, 0x4 pop {r4} pop {r0} @@ -260855,7 +260855,7 @@ _0808E538: thumb_func_end sub_808E504 thumb_func_start npc_turn -npc_turn: @ 808E544 +npc_turn: ; 808E544 push {r4-r6,lr} adds r6, r0, 0 lsls r1, 24 @@ -260864,7 +260864,7 @@ npc_turn: @ 808E544 ldrb r0, [r6, 0x1] lsls r0, 27 cmp r0, 0 - blt _0808E58A + blt @0808E58A ldrb r0, [r6, 0x4] lsls r4, r0, 4 adds r4, r0 @@ -260887,7 +260887,7 @@ npc_turn: @ 808E544 adds r0, r5 movs r1, 0 bl obj_anim_image_seek -_0808E58A: +@0808E58A: pop {r4-r6} pop {r0} bx r0 @@ -260896,7 +260896,7 @@ _0808E58A: thumb_func_end npc_turn thumb_func_start npc_turn_by_local_id_and_map -npc_turn_by_local_id_and_map: @ 808E594 +npc_turn_by_local_id_and_map: ; 808E594 push {r4,lr} sub sp, 0x4 lsls r0, 24 @@ -260911,7 +260911,7 @@ npc_turn_by_local_id_and_map: @ 808E594 bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _0808E5C8 + bne @0808E5C8 mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -260921,7 +260921,7 @@ npc_turn_by_local_id_and_map: @ 808E594 adds r0, r1 adds r1, r4, 0 bl npc_turn -_0808E5C8: +@0808E5C8: add sp, 0x4 pop {r4} pop {r0} @@ -260931,7 +260931,7 @@ _0808E5C8: thumb_func_end npc_turn_by_local_id_and_map thumb_func_start sub_808E5D4 -sub_808E5D4: @ 808E5D4 +sub_808E5D4: ; 808E5D4 push {lr} lsls r1, 24 lsrs r1, 24 @@ -260949,7 +260949,7 @@ sub_808E5D4: @ 808E5D4 thumb_func_end sub_808E5D4 thumb_func_start sub_808E5F4 -sub_808E5F4: @ 808E5F4 +sub_808E5F4: ; 808E5F4 push {r4-r7,lr} adds r5, r0, 0 adds r7, r1, 0 @@ -260968,7 +260968,7 @@ sub_808E5F4: @ 808E5F4 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - beq _0808E680 + beq @0808E680 ldrb r1, [r5, 0x1] movs r0, 0x21 negs r0, r0 @@ -260988,9 +260988,9 @@ sub_808E5F4: @ 808E5F4 lsls r0, 24 lsrs r6, r0, 24 cmp r4, 0x2B - bls _0808E648 + bls @0808E648 movs r4, 0 -_0808E648: +@0808E648: ldr r0, =0x0850c908 lsls r4, 2 adds r0, r4, r0 @@ -261017,7 +261017,7 @@ _0808E648: adds r0, r7, 0 adds r1, r6, 0 bl obj_anim_image_start -_0808E680: +@0808E680: pop {r4-r7} pop {r0} bx r0 @@ -261026,40 +261026,40 @@ _0808E680: thumb_func_end sub_808E5F4 thumb_func_start npc_get_type -npc_get_type: @ 808E694 +npc_get_type: ; 808E694 push {lr} lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xEF - bls _0808E6AC + bls @0808E6AC adds r0, r1, 0 adds r0, 0x10 lsls r0, 24 lsrs r0, 24 bl var_load_x4010_plus_r0 adds r1, r0, 0 -_0808E6AC: +@0808E6AC: cmp r1, 0x45 - bne _0808E6C4 + bne @0808E6C4 bl sub_81201C8 lsls r0, 24 ldr r1, =0x085059dc lsrs r0, 22 adds r0, r1 ldr r0, [r0] - b _0808E6D2 + b @0808E6D2 .align 2, 0 .pool -_0808E6C4: +@0808E6C4: cmp r1, 0xEE - bls _0808E6CA + bls @0808E6CA movs r1, 0x5 -_0808E6CA: +@0808E6CA: ldr r0, =0x08505620 lsls r1, 2 adds r1, r0 ldr r0, [r1] -_0808E6D2: +@0808E6D2: pop {r1} bx r1 .align 2, 0 @@ -261067,25 +261067,25 @@ _0808E6D2: thumb_func_end npc_get_type thumb_func_start sub_808E6DC -sub_808E6DC: @ 808E6DC +sub_808E6DC: ; 808E6DC push {r4,lr} adds r4, r0, 0 ldrb r0, [r4, 0x5] cmp r0, 0xEF - bls _0808E6F2 + bls @0808E6F2 adds r0, 0x10 lsls r0, 24 lsrs r0, 24 bl var_load_x4010_plus_r0 strb r0, [r4, 0x5] -_0808E6F2: +@0808E6F2: pop {r4} pop {r0} bx r0 thumb_func_end sub_808E6DC 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 @@ -261100,7 +261100,7 @@ npc_by_local_id_and_map_set_field_1_bit_x20: @ 808E6F8 bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _0808E73A + bne @0808E73A ldr r2, =0x02037350 mov r0, sp ldrb r0, [r0] @@ -261118,7 +261118,7 @@ npc_by_local_id_and_map_set_field_1_bit_x20: @ 808E6F8 ands r0, r3 orrs r0, r2 strb r0, [r1, 0x1] -_0808E73A: +@0808E73A: add sp, 0x4 pop {r4} pop {r0} @@ -261128,7 +261128,7 @@ _0808E73A: thumb_func_end npc_by_local_id_and_map_set_field_1_bit_x20 thumb_func_start npc_get_local_id_and_mapnumbers -npc_get_local_id_and_mapnumbers: @ 808E748 +npc_get_local_id_and_mapnumbers: ; 808E748 push {r4,lr} ldrb r4, [r0, 0x8] strb r4, [r1] @@ -261142,7 +261142,7 @@ npc_get_local_id_and_mapnumbers: @ 808E748 thumb_func_end npc_get_local_id_and_mapnumbers thumb_func_start sub_808E75C -sub_808E75C: @ 808E75C +sub_808E75C: ; 808E75C push {lr} lsls r0, 16 asrs r0, 16 @@ -261152,7 +261152,7 @@ sub_808E75C: @ 808E75C lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x10 - beq _0808E784 + beq @0808E784 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 @@ -261162,7 +261162,7 @@ sub_808E75C: @ 808E75C movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_0808E784: +@0808E784: pop {r0} bx r0 .align 2, 0 @@ -261170,7 +261170,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 @@ -261185,7 +261185,7 @@ sub_808E78C: @ 808E78C bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _0808E7D2 + bne @0808E7D2 mov r0, sp ldrb r0, [r0] lsls r2, r0, 3 @@ -261205,7 +261205,7 @@ sub_808E78C: @ 808E78C strb r1, [r2, 0x3] adds r0, 0x43 strb r4, [r0] -_0808E7D2: +@0808E7D2: add sp, 0x4 pop {r4} pop {r0} @@ -261215,7 +261215,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 @@ -261228,7 +261228,7 @@ sub_808E7E4: @ 808E7E4 bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _0808E820 + bne @0808E820 mov r0, sp ldrb r0, [r0] lsls r1, r0, 3 @@ -261245,7 +261245,7 @@ sub_808E7E4: @ 808E7E4 movs r2, 0x4 orrs r0, r2 strb r0, [r1] -_0808E820: +@0808E820: add sp, 0x4 pop {r0} bx r0 @@ -261254,7 +261254,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] @@ -261272,7 +261272,7 @@ sub_808E82C: @ 808E82C bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _0808E870 + bne @0808E870 ldr r2, =0x02037350 mov r0, sp ldrb r1, [r0] @@ -261288,7 +261288,7 @@ sub_808E82C: @ 808E82C adds r0, r1 strh r5, [r0, 0x24] strh r4, [r0, 0x26] -_0808E870: +@0808E870: add sp, 0x4 pop {r4,r5} pop {r0} @@ -261298,7 +261298,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 gpu_pal_allocator_reset ldr r1, =0x0300301c @@ -261311,7 +261311,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 @@ -261320,12 +261320,12 @@ sub_808E894: @ 808E894 lsrs r1, r0, 24 ldr r0, =0x000011ff cmp r1, r0 - beq _0808E8B2 + beq @0808E8B2 lsls r0, r1, 3 ldr r1, =0x0850bbc8 adds r0, r1 bl sub_808E8F4 -_0808E8B2: +@0808E8B2: pop {r0} bx r0 .align 2, 0 @@ -261333,16 +261333,16 @@ _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 ldrh r0, [r5] ldr r1, =0x000011ff cmp r0, r1 - beq _0808E8EA + beq @0808E8EA adds r6, r1, 0 -_0808E8D0: +@0808E8D0: lsls r0, r4, 1 adds r0, r5 ldrh r0, [r0] @@ -261354,8 +261354,8 @@ _0808E8D0: adds r0, r5 ldrh r0, [r0] cmp r0, r6 - bne _0808E8D0 -_0808E8EA: + bne @0808E8D0 +@0808E8EA: pop {r4-r6} pop {r0} bx r0 @@ -261364,7 +261364,7 @@ _0808E8EA: thumb_func_end sub_808E8C0 thumb_func_start sub_808E8F4 -sub_808E8F4: @ 808E8F4 +sub_808E8F4: ; 808E8F4 push {r4,lr} adds r4, r0, 0 ldrh r0, [r4, 0x4] @@ -261372,22 +261372,22 @@ sub_808E8F4: @ 808E8F4 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _0808E912 + bne @0808E912 adds r0, r4, 0 bl gpu_pal_obj_alloc_tag_and_apply lsls r0, 24 lsrs r0, 24 - b _0808E914 -_0808E912: + b @0808E914 +@0808E912: movs r0, 0xFF -_0808E914: +@0808E914: pop {r4} pop {r1} bx r1 thumb_func_end sub_808E8F4 thumb_func_start pal_patch_for_npc -pal_patch_for_npc: @ 808E91C +pal_patch_for_npc: ; 808E91C push {r4,lr} adds r4, r1, 0 lsls r0, 16 @@ -261416,7 +261416,7 @@ pal_patch_for_npc: @ 808E91C thumb_func_end pal_patch_for_npc thumb_func_start pal_patch_for_npc_range -pal_patch_for_npc_range: @ 808E954 +pal_patch_for_npc_range: ; 808E954 push {r4-r6,lr} adds r5, r0, 0 lsls r1, 24 @@ -261424,8 +261424,8 @@ pal_patch_for_npc_range: @ 808E954 lsls r2, 24 lsrs r6, r2, 24 cmp r4, r6 - bcs _0808E978 -_0808E964: + bcs @0808E978 +@0808E964: ldrh r0, [r5] adds r1, r4, 0 bl pal_patch_for_npc @@ -261434,15 +261434,15 @@ _0808E964: lsls r0, 24 lsrs r4, r0, 24 cmp r4, r6 - bcc _0808E964 -_0808E978: + bcc @0808E964 +@0808E978: pop {r4-r6} pop {r0} bx r0 thumb_func_end pal_patch_for_npc_range thumb_func_start npc_pal_idx_for_given_tag -npc_pal_idx_for_given_tag: @ 808E980 +npc_pal_idx_for_given_tag: ; 808E980 push {r4-r6,lr} lsls r0, 16 lsrs r5, r0, 16 @@ -261452,20 +261452,20 @@ npc_pal_idx_for_given_tag: @ 808E980 ldr r3, =0x000011ff adds r4, r0, 0 cmp r1, r3 - beq _0808E9C0 + beq @0808E9C0 adds r6, r4, 0 adds r1, r3, 0 -_0808E998: +@0808E998: lsls r0, r2, 3 adds r0, r6 ldrh r0, [r0, 0x4] cmp r0, r5 - bne _0808E9B0 + bne @0808E9B0 adds r0, r2, 0 - b _0808E9C2 + b @0808E9C2 .align 2, 0 .pool -_0808E9B0: +@0808E9B0: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 @@ -261473,17 +261473,17 @@ _0808E9B0: adds r0, r4 ldrh r0, [r0, 0x4] cmp r0, r1 - bne _0808E998 -_0808E9C0: + bne @0808E998 +@0808E9C0: movs r0, 0xFF -_0808E9C2: +@0808E9C2: pop {r4-r6} pop {r1} bx r1 thumb_func_end npc_pal_idx_for_given_tag thumb_func_start npc_load_two_palettes__no_record -npc_load_two_palettes__no_record: @ 808E9C8 +npc_load_two_palettes__no_record: ; 808E9C8 push {r4-r6,lr} lsls r0, 16 lsrs r4, r0, 16 @@ -261497,16 +261497,16 @@ npc_load_two_palettes__no_record: @ 808E9C8 ldrh r0, [r1] ldr r2, =0x000011ff cmp r0, r2 - beq _0808EA30 + beq @0808EA30 ldr r0, =0x084975c4 adds r5, r0 adds r6, r2, 0 -_0808E9EC: +@0808E9EC: lsls r2, r3, 3 adds r0, r2, r1 ldrh r0, [r0] cmp r0, r4 - bne _0808EA20 + bne @0808EA20 adds r1, 0x4 adds r1, r2, r1 ldr r0, =0x020375b4 @@ -261517,10 +261517,10 @@ _0808E9EC: ldrh r0, [r0] ldrb r1, [r5] bl pal_patch_for_npc - b _0808EA30 + b @0808EA30 .align 2, 0 .pool -_0808EA20: +@0808EA20: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 @@ -261528,15 +261528,15 @@ _0808EA20: adds r0, r1 ldrh r0, [r0] cmp r0, r6 - bne _0808E9EC -_0808EA30: + bne @0808E9EC +@0808EA30: pop {r4-r6} pop {r0} bx r0 thumb_func_end npc_load_two_palettes__no_record thumb_func_start npc_load_two_palettes__and_record -npc_load_two_palettes__and_record: @ 808EA38 +npc_load_two_palettes__and_record: ; 808EA38 push {r4-r6,lr} lsls r0, 16 lsrs r4, r0, 16 @@ -261552,16 +261552,16 @@ npc_load_two_palettes__and_record: @ 808EA38 ldrh r0, [r1] ldr r2, =0x000011ff cmp r0, r2 - beq _0808EAA8 + beq @0808EAA8 ldr r0, =0x084975c4 adds r5, r0 adds r6, r2, 0 -_0808EA60: +@0808EA60: lsls r2, r3, 3 adds r0, r2, r1 ldrh r0, [r0] cmp r0, r4 - bne _0808EA98 + bne @0808EA98 adds r1, 0x4 adds r1, r2, r1 ldr r0, =0x020375b4 @@ -261572,10 +261572,10 @@ _0808EA60: ldrh r0, [r0] ldrb r1, [r5] bl pal_patch_for_npc - b _0808EAA8 + b @0808EAA8 .align 2, 0 .pool -_0808EA98: +@0808EA98: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 @@ -261583,15 +261583,15 @@ _0808EA98: adds r0, r1 ldrh r0, [r0] cmp r0, r6 - bne _0808EA60 -_0808EAA8: + bne @0808EA60 +@0808EAA8: pop {r4-r6} pop {r0} bx r0 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 @@ -261603,7 +261603,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] @@ -261623,7 +261623,7 @@ sub_808EAC4: @ 808EAC4 thumb_func_end sub_808EAC4 thumb_func_start npc_coords_shift -npc_coords_shift: @ 808EAE4 +npc_coords_shift: ; 808EAE4 ldrh r3, [r0, 0x10] strh r3, [r0, 0x14] ldrh r3, [r0, 0x12] @@ -261634,7 +261634,7 @@ npc_coords_shift: @ 808EAE4 thumb_func_end npc_coords_shift thumb_func_start npc_coords_set -npc_coords_set: @ 808EAF4 +npc_coords_set: ; 808EAF4 lsls r1, 16 lsrs r1, 16 lsls r2, 16 @@ -261647,7 +261647,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} @@ -261714,9 +261714,9 @@ sub_808EB08: @ 808EB08 ldrb r0, [r6, 0x1] lsrs r0, 7 cmp r0, 0 - beq _0808EB9A + beq @0808EB9A bl sub_808EE8C -_0808EB9A: +@0808EB9A: pop {r3} mov r8, r3 pop {r4-r7} @@ -261727,7 +261727,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] @@ -261745,7 +261745,7 @@ sub_808EBA8: @ 808EBA8 bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _0808EBF0 + bne @0808EBF0 lsls r1, r5, 16 lsls r2, r4, 16 mov r0, sp @@ -261762,7 +261762,7 @@ sub_808EBA8: @ 808EBA8 adds r2, r3 asrs r2, 16 bl sub_808EB08 -_0808EBF0: +@0808EBF0: add sp, 0x4 pop {r4,r5} pop {r0} @@ -261772,7 +261772,7 @@ _0808EBF0: thumb_func_end sub_808EBA8 thumb_func_start npc_coords_shift_still -npc_coords_shift_still: @ 808EBFC +npc_coords_shift_still: ; 808EBFC push {lr} movs r2, 0x10 ldrsh r1, [r0, r2] @@ -261784,21 +261784,21 @@ npc_coords_shift_still: @ 808EBFC thumb_func_end npc_coords_shift_still thumb_func_start npcs_rebase -npcs_rebase: @ 808EC10 +npcs_rebase: ; 808EC10 push {r4,r5,lr} ldr r2, =0x02037334 ldrb r1, [r2] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0808EC68 + beq @0808EC68 movs r3, 0 ldr r5, =0x02037350 movs r0, 0x4 ldrsh r4, [r2, r0] movs r0, 0x8 ldrsh r1, [r2, r0] -_0808EC2A: +@0808EC2A: lsls r0, r3, 3 adds r0, r3 lsls r0, 2 @@ -261806,7 +261806,7 @@ _0808EC2A: ldrb r0, [r2] lsls r0, 31 cmp r0, 0 - beq _0808EC5E + beq @0808EC5E ldrh r0, [r2, 0xC] subs r0, r4 strh r0, [r2, 0xC] @@ -261825,13 +261825,13 @@ _0808EC2A: ldrh r0, [r2, 0x16] subs r0, r1 strh r0, [r2, 0x16] -_0808EC5E: +@0808EC5E: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0xF - bls _0808EC2A -_0808EC68: + bls @0808EC2A +@0808EC68: pop {r4,r5} pop {r0} bx r0 @@ -261840,7 +261840,7 @@ _0808EC68: thumb_func_end npcs_rebase thumb_func_start npc_id_by_pos_and_height -npc_id_by_pos_and_height: @ 808EC78 +npc_id_by_pos_and_height: ; 808EC78 push {r4-r7,lr} mov r7, r8 push {r7} @@ -261853,7 +261853,7 @@ npc_id_by_pos_and_height: @ 808EC78 movs r4, 0 ldr r0, =0x02037350 mov r8, r0 -_0808EC90: +@0808EC90: lsls r0, r4, 3 adds r0, r4 lsls r0, 2 @@ -261862,33 +261862,33 @@ _0808EC90: ldrb r0, [r1] lsls r0, 31 cmp r0, 0 - beq _0808ECC8 + beq @0808ECC8 movs r2, 0x10 ldrsh r0, [r1, r2] cmp r0, r7 - bne _0808ECC8 + bne @0808ECC8 movs r2, 0x12 ldrsh r0, [r1, r2] cmp r0, r6 - bne _0808ECC8 + bne @0808ECC8 adds r0, r1, 0 adds r1, r5, 0 bl npc_does_height_match lsls r0, 24 cmp r0, 0 - beq _0808ECC8 + beq @0808ECC8 adds r0, r4, 0 - b _0808ECD4 + b @0808ECD4 .align 2, 0 .pool -_0808ECC8: +@0808ECC8: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bls _0808EC90 + bls @0808EC90 movs r0, 0x10 -_0808ECD4: +@0808ECD4: pop {r3} mov r8, r3 pop {r4-r7} @@ -261897,7 +261897,7 @@ _0808ECD4: thumb_func_end npc_id_by_pos_and_height thumb_func_start npc_does_height_match -npc_does_height_match: @ 808ECE0 +npc_does_height_match: ; 808ECE0 push {lr} lsls r1, 24 lsrs r1, 24 @@ -261905,24 +261905,24 @@ npc_does_height_match: @ 808ECE0 movs r0, 0xF ands r0, r2 cmp r0, 0 - beq _0808ED00 + beq @0808ED00 cmp r1, 0 - beq _0808ED00 + beq @0808ED00 lsls r0, r2, 28 lsrs r0, 28 cmp r0, r1 - beq _0808ED00 + beq @0808ED00 movs r0, 0 - b _0808ED02 -_0808ED00: + b @0808ED02 +@0808ED00: movs r0, 0x1 -_0808ED02: +@0808ED02: pop {r1} bx r1 thumb_func_end npc_does_height_match thumb_func_start overworld_rebase -overworld_rebase: @ 808ED08 +overworld_rebase: ; 808ED08 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -261945,7 +261945,7 @@ overworld_rebase: @ 808ED08 thumb_func_end overworld_rebase thumb_func_start sub_808ED34 -sub_808ED34: @ 808ED34 +sub_808ED34: ; 808ED34 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -261979,7 +261979,7 @@ sub_808ED34: @ 808ED34 thumb_func_end sub_808ED34 thumb_func_start oac_0805F994 -oac_0805F994: @ 808ED78 +oac_0805F994: ; 808ED78 push {r4,r5,lr} sub sp, 0xC mov r2, sp @@ -262001,7 +262001,7 @@ oac_0805F994: @ 808ED78 thumb_func_end oac_0805F994 thumb_func_start sub_808EDA0 -sub_808EDA0: @ 808EDA0 +sub_808EDA0: ; 808EDA0 push {lr} ldr r3, =0x02020630 movs r1, 0x2E @@ -262034,7 +262034,7 @@ sub_808EDA0: @ 808EDA0 thumb_func_end sub_808EDA0 thumb_func_start sub_808EDDC -sub_808EDDC: @ 808EDDC +sub_808EDDC: ; 808EDDC push {r4,r5,lr} ldr r3, =0x02020630 movs r1, 0x2E @@ -262065,7 +262065,7 @@ sub_808EDDC: @ 808EDDC thumb_func_end sub_808EDDC thumb_func_start sub_808EE14 -sub_808EE14: @ 808EE14 +sub_808EE14: ; 808EE14 push {r4,lr} ldr r4, =0x02020630 movs r1, 0x2E @@ -262093,13 +262093,13 @@ sub_808EE14: @ 808EE14 thumb_func_end sub_808EE14 thumb_func_start find_obj_using_oac_0805F994 -find_obj_using_oac_0805F994: @ 808EE44 +find_obj_using_oac_0805F994: ; 808EE44 push {r4,r5,lr} movs r3, 0 ldr r4, =0x02020630 adds r5, r4, 0 adds r5, 0x1C -_0808EE4E: +@0808EE4E: lsls r0, r3, 4 adds r0, r3 lsls r1, r0, 2 @@ -262109,81 +262109,81 @@ _0808EE4E: ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - beq _0808EE78 + beq @0808EE78 adds r0, r1, r5 ldr r1, [r0] ldr r0, =oac_0805F994 + 1 cmp r1, r0 - bne _0808EE78 + bne @0808EE78 adds r0, r2, 0 - b _0808EE84 + b @0808EE84 .align 2, 0 .pool -_0808EE78: +@0808EE78: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3F - bls _0808EE4E + bls @0808EE4E movs r0, 0 -_0808EE84: +@0808EE84: pop {r4,r5} pop {r1} bx r1 thumb_func_end find_obj_using_oac_0805F994 thumb_func_start sub_808EE8C -sub_808EE8C: @ 808EE8C +sub_808EE8C: ; 808EE8C push {lr} bl find_obj_using_oac_0805F994 adds r2, r0, 0 cmp r2, 0 - beq _0808EEA4 + beq @0808EEA4 movs r0, 0 strh r0, [r2, 0x30] ldr r1, [r2, 0x1C] adds r0, r2, 0 bl _call_via_r1 -_0808EEA4: +@0808EEA4: pop {r0} bx r0 thumb_func_end sub_808EE8C thumb_func_start sub_808EEA8 -sub_808EEA8: @ 808EEA8 +sub_808EEA8: ; 808EEA8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 bl find_obj_using_oac_0805F994 cmp r0, 0 - beq _0808EEBC + beq @0808EEBC strh r4, [r0, 0x2E] bl sub_808EE8C -_0808EEBC: +@0808EEBC: pop {r4} pop {r0} bx r0 thumb_func_end sub_808EEA8 thumb_func_start sub_808EEC4 -sub_808EEC4: @ 808EEC4 +sub_808EEC4: ; 808EEC4 push {lr} bl find_obj_using_oac_0805F994 cmp r0, 0 - beq _0808EED6 + beq @0808EED6 ldrh r0, [r0, 0x2E] lsls r0, 24 lsrs r0, 24 - b _0808EED8 -_0808EED6: + b @0808EED8 +@0808EED6: movs r0, 0x40 -_0808EED8: +@0808EED8: pop {r1} bx r1 thumb_func_end sub_808EEC4 thumb_func_start sub_808EEDC -sub_808EEDC: @ 808EEDC +sub_808EEDC: ; 808EEDC push {lr} bl find_obj_using_oac_0805F994 movs r1, 0x2 @@ -262193,7 +262193,7 @@ sub_808EEDC: @ 808EEDC thumb_func_end sub_808EEDC thumb_func_start sub_808EEEC -sub_808EEEC: @ 808EEEC +sub_808EEEC: ; 808EEEC push {r4-r7,lr} mov r7, r8 push {r7} @@ -262207,7 +262207,7 @@ sub_808EEEC: @ 808EEEC lsrs r7, r3, 24 movs r5, 0 ldr r1, =0x02020630 -_0808EF06: +@0808EF06: lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -262217,7 +262217,7 @@ _0808EF06: ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - bne _0808EF38 + bne @0808EF38 adds r0, r4, 0 mov r1, r12 movs r2, 0x44 @@ -262228,16 +262228,16 @@ _0808EF06: adds r0, r4, 0 adds r0, 0x43 strb r7, [r0] - b _0808EF42 + b @0808EF42 .align 2, 0 .pool -_0808EF38: +@0808EF38: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3F - bls _0808EF06 -_0808EF42: + bls @0808EF06 +@0808EF42: adds r0, r5, 0 pop {r3} mov r8, r3 @@ -262247,7 +262247,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} @@ -262263,7 +262263,7 @@ obj_unfreeze: @ 808EF50 ldr r3, =0x02020630 movs r2, 0x1 negs r2, r2 -_0808EF6E: +@0808EF6E: lsls r0, r5, 16 asrs r1, r0, 16 lsls r0, r1, 4 @@ -262275,7 +262275,7 @@ _0808EF6E: ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - bne _0808EFA8 + bne @0808EFA8 adds r0, r4, 0 mov r1, r12 movs r2, 0x44 @@ -262288,18 +262288,18 @@ _0808EF6E: strb r7, [r0] lsls r0, r5, 24 lsrs r0, 24 - b _0808EFB6 + b @0808EFB6 .align 2, 0 .pool -_0808EFA8: +@0808EFA8: subs r0, r1, 0x1 lsls r0, 16 lsrs r5, r0, 16 asrs r0, 16 cmp r0, r2 - bgt _0808EF6E + bgt @0808EF6E movs r0, 0x40 -_0808EFB6: +@0808EFB6: pop {r3} mov r8, r3 pop {r4-r7} @@ -262308,7 +262308,7 @@ _0808EFB6: thumb_func_end obj_unfreeze thumb_func_start npc_set_direction -npc_set_direction: @ 808EFC0 +npc_set_direction: ; 808EFC0 push {r4,lr} adds r3, r0, 0 lsls r1, 24 @@ -262323,7 +262323,7 @@ npc_set_direction: @ 808EFC0 ldrb r0, [r3, 0x1] lsls r0, 30 cmp r0, 0 - blt _0808EFF0 + blt @0808EFF0 movs r0, 0xF adds r1, r2, 0 ands r1, r0 @@ -262333,7 +262333,7 @@ npc_set_direction: @ 808EFC0 ands r0, r2 orrs r0, r1 strb r0, [r3, 0x18] -_0808EFF0: +@0808EFF0: lsls r2, r4, 4 ldrb r1, [r3, 0x18] movs r0, 0xF @@ -262346,7 +262346,7 @@ _0808EFF0: thumb_func_end npc_set_direction thumb_func_start npc_script_by_local_id_and_map -npc_script_by_local_id_and_map: @ 808F004 +npc_script_by_local_id_and_map: ; 808F004 push {lr} lsls r0, 24 lsrs r0, 24 @@ -262361,7 +262361,7 @@ npc_script_by_local_id_and_map: @ 808F004 thumb_func_end npc_script_by_local_id_and_map thumb_func_start npc_get_script_by_npc_id -npc_get_script_by_npc_id: @ 808F01C +npc_get_script_by_npc_id: ; 808F01C push {lr} lsls r0, 24 lsrs r0, 24 @@ -262381,7 +262381,7 @@ npc_get_script_by_npc_id: @ 808F01C thumb_func_end npc_get_script_by_npc_id thumb_func_start rom_npc_id_in_script_by_local_id_and_map -rom_npc_id_in_script_by_local_id_and_map: @ 808F040 +rom_npc_id_in_script_by_local_id_and_map: ; 808F040 push {lr} lsls r0, 24 lsrs r0, 24 @@ -262396,7 +262396,7 @@ rom_npc_id_in_script_by_local_id_and_map: @ 808F040 thumb_func_end rom_npc_id_in_script_by_local_id_and_map thumb_func_start rom_npc_id_in_script_by_npc_id -rom_npc_id_in_script_by_npc_id: @ 808F058 +rom_npc_id_in_script_by_npc_id: ; 808F058 push {lr} lsls r0, 24 lsrs r0, 24 @@ -262418,7 +262418,7 @@ rom_npc_id_in_script_by_npc_id: @ 808F058 thumb_func_end rom_npc_id_in_script_by_npc_id thumb_func_start sub_808F080 -sub_808F080: @ 808F080 +sub_808F080: ; 808F080 push {lr} sub sp, 0x4 lsls r0, 24 @@ -262431,7 +262431,7 @@ sub_808F080: @ 808F080 bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _0808F0B4 + bne @0808F0B4 ldr r2, =0x02037350 mov r0, sp ldrb r1, [r0] @@ -262440,19 +262440,19 @@ sub_808F080: @ 808F080 lsls r0, 2 adds r0, r2 ldrb r0, [r0, 0x7] - b _0808F0B6 + b @0808F0B6 .align 2, 0 .pool -_0808F0B4: +@0808F0B4: movs r0, 0xFF -_0808F0B6: +@0808F0B6: add sp, 0x4 pop {r1} bx r1 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 @@ -262467,7 +262467,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 @@ -262480,7 +262480,7 @@ sub_808F0D4: @ 808F0D4 bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _0808F108 + bne @0808F108 ldr r2, =0x02037350 mov r0, sp ldrb r1, [r0] @@ -262489,19 +262489,19 @@ sub_808F0D4: @ 808F0D4 lsls r0, 2 adds r0, r2 ldrb r0, [r0, 0x1D] - b _0808F10A + b @0808F10A .align 2, 0 .pool -_0808F108: +@0808F108: movs r0, 0xFF -_0808F10A: +@0808F10A: add sp, 0x4 pop {r1} bx r1 thumb_func_end sub_808F0D4 thumb_func_start sub_808F110 -sub_808F110: @ 808F110 +sub_808F110: ; 808F110 lsls r0, 24 lsrs r0, 24 ldr r2, =0x02037350 @@ -262516,7 +262516,7 @@ sub_808F110: @ 808F110 thumb_func_end sub_808F110 thumb_func_start rom_npc_by_local_id_and_map -rom_npc_by_local_id_and_map: @ 808F128 +rom_npc_by_local_id_and_map: ; 808F128 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -262529,26 +262529,26 @@ rom_npc_by_local_id_and_map: @ 808F128 movs r0, 0x5 ldrsb r0, [r1, r0] cmp r0, r3 - bne _0808F160 + bne @0808F160 movs r0, 0x4 ldrsb r0, [r1, r0] cmp r0, r2 - bne _0808F160 + bne @0808F160 movs r0, 0xC7 lsls r0, 4 adds r1, r0 ldr r0, =0x02037318 ldr r0, [r0, 0x4] - b _0808F16C + b @0808F16C .align 2, 0 .pool -_0808F160: +@0808F160: adds r0, r2, 0 adds r1, r3, 0 bl get_mapheader_by_bank_and_number ldr r0, [r0, 0x4] ldr r1, [r0, 0x4] -_0808F16C: +@0808F16C: ldrb r2, [r0] adds r0, r4, 0 bl rom_npc_by_nr @@ -262558,7 +262558,7 @@ _0808F16C: thumb_func_end rom_npc_by_local_id_and_map thumb_func_start rom_npc_by_nr -rom_npc_by_nr: @ 808F17C +rom_npc_by_nr: ; 808F17C push {r4,r5,lr} adds r5, r1, 0 lsls r0, 24 @@ -262567,33 +262567,33 @@ rom_npc_by_nr: @ 808F17C lsrs r2, 24 movs r1, 0 cmp r1, r2 - bcs _0808F1AA -_0808F18E: + bcs @0808F1AA +@0808F18E: lsls r0, r1, 1 adds r0, r1 lsls r0, 3 adds r3, r0, r5 ldrb r0, [r3] cmp r0, r4 - bne _0808F1A0 + bne @0808F1A0 adds r0, r3, 0 - b _0808F1AC -_0808F1A0: + b @0808F1AC +@0808F1A0: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, r2 - bcc _0808F18E -_0808F1AA: + bcc @0808F18E +@0808F1AA: movs r0, 0 -_0808F1AC: +@0808F1AC: pop {r4,r5} pop {r1} bx r1 thumb_func_end rom_npc_by_nr thumb_func_start sub_808F1B4 -sub_808F1B4: @ 808F1B4 +sub_808F1B4: ; 808F1B4 push {r4,r5,lr} adds r3, r0, 0 ldrb r0, [r3, 0x9] @@ -262602,22 +262602,22 @@ sub_808F1B4: @ 808F1B4 movs r1, 0x5 ldrsb r1, [r2, r1] cmp r0, r1 - bne _0808F200 + bne @0808F200 ldrb r1, [r3, 0xA] movs r0, 0x4 ldrsb r0, [r2, r0] cmp r1, r0 - beq _0808F1E2 - b _0808F200 + beq @0808F1E2 + b @0808F200 .align 2, 0 .pool -_0808F1D8: +@0808F1D8: movs r1, 0xC7 lsls r1, 4 adds r0, r1 adds r0, r4, r0 - b _0808F202 -_0808F1E2: + b @0808F202 +@0808F1E2: movs r1, 0 adds r4, r2, 0 ldrb r3, [r3, 0x8] @@ -262625,74 +262625,74 @@ _0808F1E2: lsls r5, 4 adds r2, r4, r5 movs r0, 0 -_0808F1F0: +@0808F1F0: ldrb r5, [r2] cmp r3, r5 - beq _0808F1D8 + beq @0808F1D8 adds r2, 0x18 adds r0, 0x18 adds r1, 0x1 cmp r1, 0x3F - ble _0808F1F0 -_0808F200: + ble @0808F1F0 +@0808F200: movs r0, 0 -_0808F202: +@0808F202: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_808F1B4 thumb_func_start sub_808F208 -sub_808F208: @ 808F208 +sub_808F208: ; 808F208 push {r4,lr} adds r4, r0, 0 bl sub_808F1B4 adds r1, r0, 0 cmp r1, 0 - beq _0808F222 + beq @0808F222 ldrh r0, [r4, 0x10] subs r0, 0x7 strh r0, [r1, 0x4] ldrh r0, [r4, 0x12] subs r0, 0x7 strh r0, [r1, 0x6] -_0808F222: +@0808F222: pop {r4} pop {r0} bx r0 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 cmp r0, 0 - beq _0808F236 + beq @0808F236 str r4, [r0, 0x10] -_0808F236: +@0808F236: pop {r4} pop {r0} bx r0 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 bl sub_808F1B4 cmp r0, 0 - beq _0808F24C + beq @0808F24C strb r4, [r0, 0x9] -_0808F24C: +@0808F24C: pop {r4} pop {r0} bx r0 thumb_func_end sub_808F23C thumb_func_start sub_808F254 -sub_808F254: @ 808F254 +sub_808F254: ; 808F254 push {lr} sub sp, 0x4 lsls r0, 24 @@ -262705,7 +262705,7 @@ sub_808F254: @ 808F254 bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _0808F282 + bne @0808F282 mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -262714,7 +262714,7 @@ sub_808F254: @ 808F254 ldr r1, =0x02037350 adds r0, r1 bl sub_808F208 -_0808F282: +@0808F282: add sp, 0x4 pop {r0} bx r0 @@ -262723,7 +262723,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 @@ -262738,13 +262738,13 @@ sub_808F28C: @ 808F28C bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _0808F2E8 + bne @0808F2E8 cmp r4, 0x6 - beq _0808F2B6 + beq @0808F2B6 cmp r4, 0x7 - beq _0808F2D4 - b _0808F2E8 -_0808F2B6: + beq @0808F2D4 + b @0808F2E8 +@0808F2B6: mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -262754,10 +262754,10 @@ _0808F2B6: adds r0, r1 ldr r1, =0x082766a2 bl sub_808F228 - b _0808F2E8 + b @0808F2E8 .align 2, 0 .pool -_0808F2D4: +@0808F2D4: mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -262767,7 +262767,7 @@ _0808F2D4: adds r0, r1 ldr r1, =0x082766a6 bl sub_808F228 -_0808F2E8: +@0808F2E8: add sp, 0x4 pop {r4} pop {r0} @@ -262777,7 +262777,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 @@ -262790,7 +262790,7 @@ npc_paltag_set_load: @ 808F2F8 ldr r2, =0x020375b4 strb r4, [r2] cmp r4, 0x1 - bne _0808F344 + bne @0808F344 ldr r1, =0x0850be38 ldrb r0, [r2] lsls r0, 2 @@ -262802,10 +262802,10 @@ npc_paltag_set_load: @ 808F2F8 ldr r1, =0x0300301c movs r0, 0x8 strb r0, [r1] - b _0808F356 + b @0808F356 .align 2, 0 .pool -_0808F344: +@0808F344: ldr r0, =0x0850be38 ldrb r1, [r2] lsls r1, 2 @@ -262814,7 +262814,7 @@ _0808F344: movs r1, 0 movs r2, 0xA bl pal_patch_for_npc_range -_0808F356: +@0808F356: pop {r4} pop {r0} bx r0 @@ -262823,12 +262823,12 @@ _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 cmp r2, 0x9 - bhi _0808F39C + bhi @0808F39C ldr r1, =0x0850be38 ldr r0, =0x020375b4 ldrb r0, [r0] @@ -262836,40 +262836,40 @@ npc_paltag_by_palslot: @ 808F360 adds r0, r1 ldr r1, [r0] lsls r0, r2, 1 - b _0808F390 + b @0808F390 .align 2, 0 .pool -_0808F384: +@0808F384: adds r1, r4, 0x4 adds r1, r2, r1 ldr r0, =0x020375b4 ldrb r0, [r0] ldr r1, [r1] lsls r0, 1 -_0808F390: +@0808F390: adds r0, r1 ldrh r0, [r0] - b _0808F3CE + b @0808F3CE .align 2, 0 .pool -_0808F39C: +@0808F39C: movs r3, 0 ldr r0, =0x0850bd78 ldrh r1, [r0] ldr r2, =0x000011ff adds r4, r0, 0 cmp r1, r2 - beq _0808F3CC + beq @0808F3CC adds r6, r4, 0 ldr r0, =0x020375b6 ldrh r1, [r0] adds r5, r2, 0 -_0808F3B2: +@0808F3B2: lsls r2, r3, 3 adds r0, r2, r6 ldrh r0, [r0] cmp r0, r1 - beq _0808F384 + beq @0808F384 adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 @@ -262877,10 +262877,10 @@ _0808F3B2: adds r0, r4 ldrh r0, [r0] cmp r0, r5 - bne _0808F3B2 -_0808F3CC: + bne @0808F3B2 +@0808F3CC: ldr r0, =0x000011ff -_0808F3CE: +@0808F3CE: pop {r4-r6} pop {r1} bx r1 @@ -262889,7 +262889,7 @@ _0808F3CE: thumb_func_end npc_paltag_by_palslot thumb_func_start sub_808F3E0 -sub_808F3E0: @ 808F3E0 +sub_808F3E0: ; 808F3E0 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -262908,13 +262908,13 @@ sub_808F3E0: @ 808F3E0 thumb_func_end sub_808F3E0 thumb_func_start sub_808F404 -sub_808F404: @ 808F404 +sub_808F404: ; 808F404 movs r0, 0 bx lr thumb_func_end sub_808F404 thumb_func_start sub_808F408 -sub_808F408: @ 808F408 +sub_808F408: ; 808F408 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -262933,7 +262933,7 @@ sub_808F408: @ 808F408 thumb_func_end sub_808F408 thumb_func_start sub_808F42C -sub_808F42C: @ 808F42C +sub_808F42C: ; 808F42C push {r4,lr} ldr r3, =0x0850d6f4 movs r4, 0x30 @@ -262952,7 +262952,7 @@ sub_808F42C: @ 808F42C thumb_func_end sub_808F42C thumb_func_start sub_808F44C -sub_808F44C: @ 808F44C +sub_808F44C: ; 808F44C push {r4,lr} adds r4, r1, 0 bl npc_reset @@ -262964,7 +262964,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 @@ -262987,13 +262987,13 @@ 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 npc_obj_exec_an lsls r0, 24 cmp r0, 0 - beq _0808F4C0 + beq @0808F4C0 ldr r5, =0x0850d6dc bl GenerateRandomNumber movs r4, 0x3 @@ -263007,40 +263007,40 @@ sub_808F48C: @ 808F48C bl sub_8097978 strh r4, [r6, 0x30] movs r0, 0x1 - b _0808F4C2 + b @0808F4C2 .align 2, 0 .pool -_0808F4C0: +@0808F4C0: movs r0, 0 -_0808F4C2: +@0808F4C2: pop {r4-r6} pop {r1} bx r1 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 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne _0808F4DC + bne @0808F4DC movs r0, 0 - b _0808F4E2 -_0808F4DC: + b @0808F4E2 +@0808F4DC: movs r0, 0x4 strh r0, [r4, 0x30] movs r0, 0x1 -_0808F4E2: +@0808F4E2: pop {r4} pop {r1} bx r1 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 @@ -263065,10 +263065,10 @@ sub_808F4E8: @ 808F4E8 bl sub_8092B88 lsls r0, 24 cmp r0, 0 - beq _0808F526 + beq @0808F526 movs r0, 0x1 strh r0, [r6, 0x30] -_0808F526: +@0808F526: movs r0, 0x1 add sp, 0x4 pop {r4-r6} @@ -263079,7 +263079,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 @@ -263105,14 +263105,14 @@ 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 bl npc_obj_exec_an lsls r0, 24 cmp r0, 0 - beq _0808F582 + beq @0808F582 ldrb r0, [r4] movs r1, 0x3 negs r1, r1 @@ -263120,7 +263120,7 @@ sub_808F564: @ 808F564 strb r1, [r4] movs r0, 0x1 strh r0, [r5, 0x30] -_0808F582: +@0808F582: movs r0, 0 pop {r4,r5} pop {r1} @@ -263128,7 +263128,7 @@ _0808F582: thumb_func_end sub_808F564 thumb_func_start npc_is_trainer_and_within_sight_distance_blocks_of_player -npc_is_trainer_and_within_sight_distance_blocks_of_player: @ 808F58C +npc_is_trainer_and_within_sight_distance_blocks_of_player: ; 808F58C push {r4-r7,lr} sub sp, 0x4 adds r5, r0, 0 @@ -263136,13 +263136,13 @@ npc_is_trainer_and_within_sight_distance_blocks_of_player: @ 808F58C bl walkrun_bitfield_and_r0 lsls r0, 24 cmp r0, 0 - beq _0808F5F8 + beq @0808F5F8 ldrb r0, [r5, 0x7] cmp r0, 0x1 - beq _0808F5A8 + beq @0808F5A8 cmp r0, 0x3 - bne _0808F5F8 -_0808F5A8: + bne @0808F5F8 +@0808F5A8: mov r7, sp adds r7, 0x2 mov r0, sp @@ -263167,27 +263167,27 @@ _0808F5A8: movs r1, 0 ldrsh r4, [r0, r1] cmp r3, r4 - bgt _0808F5F8 + bgt @0808F5F8 lsls r0, r2, 16 asrs r0, 16 cmp r0, r4 - blt _0808F5F8 + blt @0808F5F8 lsls r0, r5, 16 asrs r0, 16 movs r2, 0 ldrsh r1, [r7, r2] cmp r0, r1 - bgt _0808F5F8 + bgt @0808F5F8 lsls r0, r6, 16 asrs r0, 16 cmp r0, r1 - bge _0808F5FC -_0808F5F8: + bge @0808F5FC +@0808F5F8: movs r0, 0 - b _0808F5FE -_0808F5FC: + b @0808F5FE +@0808F5FC: movs r0, 0x1 -_0808F5FE: +@0808F5FE: add sp, 0x4 pop {r4-r7} pop {r1} @@ -263195,7 +263195,7 @@ _0808F5FE: thumb_func_end npc_is_trainer_and_within_sight_distance_blocks_of_player thumb_func_start sub_808F608 -sub_808F608: @ 808F608 +sub_808F608: ; 808F608 push {r4,lr} lsls r0, 16 lsrs r4, r0, 16 @@ -263204,20 +263204,20 @@ sub_808F608: @ 808F608 lsls r2, 16 lsls r3, 16 cmp r2, r3 - ble _0808F626 + ble @0808F626 movs r2, 0x4 lsls r0, r4, 16 cmp r0, 0 - bge _0808F630 + bge @0808F630 movs r2, 0x3 - b _0808F630 -_0808F626: + b @0808F630 +@0808F626: movs r2, 0x1 lsls r0, 16 cmp r0, 0 - bge _0808F630 + bge @0808F630 movs r2, 0x2 -_0808F630: +@0808F630: adds r0, r2, 0 pop {r4} pop {r1} @@ -263225,34 +263225,34 @@ _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 cmp r1, 0 - bge _0808F644 + bge @0808F644 movs r0, 0x2 -_0808F644: +@0808F644: pop {r1} bx r1 thumb_func_end sub_808F638 thumb_func_start sub_808F648 -sub_808F648: @ 808F648 +sub_808F648: ; 808F648 push {lr} movs r1, 0x4 lsls r0, 16 cmp r0, 0 - bge _0808F654 + bge @0808F654 movs r1, 0x3 -_0808F654: +@0808F654: adds r0, r1, 0 pop {r1} bx r1 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 @@ -263270,7 +263270,7 @@ sub_808F65C: @ 808F65C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0808F698 + bne @0808F698 adds r0, r4, 0 adds r1, r5, 0 adds r2, r6, 0 @@ -263279,11 +263279,11 @@ sub_808F65C: @ 808F65C lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bne _0808F6B2 - b _0808F6B0 -_0808F698: + bne @0808F6B2 + b @0808F6B0 +@0808F698: cmp r0, 0x4 - bne _0808F6B2 + bne @0808F6B2 adds r0, r4, 0 adds r1, r5, 0 adds r2, r6, 0 @@ -263292,17 +263292,17 @@ _0808F698: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0808F6B2 -_0808F6B0: + bne @0808F6B2 +@0808F6B0: movs r0, 0x2 -_0808F6B2: +@0808F6B2: pop {r4-r7} pop {r1} bx r1 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 @@ -263320,7 +263320,7 @@ sub_808F6B8: @ 808F6B8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0808F6F4 + bne @0808F6F4 adds r0, r4, 0 adds r1, r5, 0 adds r2, r6, 0 @@ -263329,11 +263329,11 @@ sub_808F6B8: @ 808F6B8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bne _0808F70E - b _0808F70C -_0808F6F4: + bne @0808F70E + b @0808F70C +@0808F6F4: cmp r0, 0x3 - bne _0808F70E + bne @0808F70E adds r0, r4, 0 adds r1, r5, 0 adds r2, r6, 0 @@ -263342,17 +263342,17 @@ _0808F6F4: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0808F70E -_0808F70C: + bne @0808F70E +@0808F70C: movs r0, 0x2 -_0808F70E: +@0808F70E: pop {r4-r7} pop {r1} bx r1 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 @@ -263370,7 +263370,7 @@ sub_808F714: @ 808F714 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _0808F750 + bne @0808F750 adds r0, r4, 0 adds r1, r5, 0 adds r2, r6, 0 @@ -263379,11 +263379,11 @@ sub_808F714: @ 808F714 lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bne _0808F76A - b _0808F768 -_0808F750: + bne @0808F76A + b @0808F768 +@0808F750: cmp r0, 0x4 - bne _0808F76A + bne @0808F76A adds r0, r4, 0 adds r1, r5, 0 adds r2, r6, 0 @@ -263392,17 +263392,17 @@ _0808F750: lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _0808F76A -_0808F768: + bne @0808F76A +@0808F768: movs r0, 0x1 -_0808F76A: +@0808F76A: pop {r4-r7} pop {r1} bx r1 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 @@ -263420,7 +263420,7 @@ sub_808F770: @ 808F770 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _0808F7AC + bne @0808F7AC adds r0, r4, 0 adds r1, r5, 0 adds r2, r6, 0 @@ -263429,11 +263429,11 @@ sub_808F770: @ 808F770 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bne _0808F7C6 - b _0808F7C4 -_0808F7AC: + bne @0808F7C6 + b @0808F7C4 +@0808F7AC: cmp r0, 0x3 - bne _0808F7C6 + bne @0808F7C6 adds r0, r4, 0 adds r1, r5, 0 adds r2, r6, 0 @@ -263442,17 +263442,17 @@ _0808F7AC: lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _0808F7C6 -_0808F7C4: + bne @0808F7C6 +@0808F7C4: movs r0, 0x1 -_0808F7C6: +@0808F7C6: pop {r4-r7} pop {r1} bx r1 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 @@ -263470,7 +263470,7 @@ sub_808F7CC: @ 808F7CC lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bne _0808F802 + bne @0808F802 adds r0, r7, 0 adds r1, r6, 0 adds r2, r5, 0 @@ -263478,14 +263478,14 @@ sub_808F7CC: @ 808F7CC bl sub_808F638 lsls r0, 24 lsrs r0, 24 -_0808F802: +@0808F802: pop {r4-r7} pop {r1} bx r1 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 @@ -263503,7 +263503,7 @@ sub_808F808: @ 808F808 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bne _0808F83E + bne @0808F83E adds r0, r7, 0 adds r1, r6, 0 adds r2, r5, 0 @@ -263511,14 +263511,14 @@ sub_808F808: @ 808F808 bl sub_808F638 lsls r0, 24 lsrs r0, 24 -_0808F83E: +@0808F83E: pop {r4-r7} pop {r1} bx r1 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 @@ -263536,7 +263536,7 @@ sub_808F844: @ 808F844 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0808F87A + bne @0808F87A adds r0, r7, 0 adds r1, r6, 0 adds r2, r5, 0 @@ -263544,14 +263544,14 @@ sub_808F844: @ 808F844 bl sub_808F648 lsls r0, 24 lsrs r0, 24 -_0808F87A: +@0808F87A: pop {r4-r7} pop {r1} bx r1 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 @@ -263569,7 +263569,7 @@ sub_808F880: @ 808F880 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _0808F8B6 + bne @0808F8B6 adds r0, r7, 0 adds r1, r6, 0 adds r2, r5, 0 @@ -263577,14 +263577,14 @@ sub_808F880: @ 808F880 bl sub_808F648 lsls r0, 24 lsrs r0, 24 -_0808F8B6: +@0808F8B6: pop {r4-r7} pop {r1} bx r1 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 @@ -263593,10 +263593,10 @@ sub_808F8BC: @ 808F8BC bl npc_is_trainer_and_within_sight_distance_blocks_of_player lsls r0, 24 cmp r0, 0 - bne _0808F8D4 + bne @0808F8D4 movs r0, 0 - b _0808F938 -_0808F8D4: + b @0808F938 +@0808F8D4: mov r5, sp adds r5, 0x2 mov r0, sp @@ -263618,19 +263618,19 @@ _0808F8D4: movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bge _0808F908 + bge @0808F908 negs r0, r0 lsls r0, 16 lsrs r2, r0, 16 -_0808F908: +@0808F908: lsls r0, r3, 16 asrs r0, 16 cmp r0, 0 - bge _0808F916 + bge @0808F916 negs r0, r0 lsls r0, 16 lsrs r3, r0, 16 -_0808F916: +@0808F916: ldr r0, =0x0850d714 lsls r4, r6, 2 adds r4, r0 @@ -263647,7 +263647,7 @@ _0808F916: bl _call_via_r4 lsls r0, 24 lsrs r0, 24 -_0808F938: +@0808F938: add sp, 0x4 pop {r4-r6} pop {r1} @@ -263657,7 +263657,7 @@ _0808F938: thumb_func_end sub_808F8BC thumb_func_start sub_808F944 -sub_808F944: @ 808F944 +sub_808F944: ; 808F944 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -263676,7 +263676,7 @@ sub_808F944: @ 808F944 thumb_func_end sub_808F944 thumb_func_start sub_808F968 -sub_808F968: @ 808F968 +sub_808F968: ; 808F968 push {r4,lr} ldr r3, =0x0850d740 movs r4, 0x30 @@ -263695,7 +263695,7 @@ sub_808F968: @ 808F968 thumb_func_end sub_808F968 thumb_func_start sub_808F988 -sub_808F988: @ 808F988 +sub_808F988: ; 808F988 push {r4,lr} adds r4, r1, 0 bl npc_reset @@ -263707,7 +263707,7 @@ sub_808F988: @ 808F988 thumb_func_end sub_808F988 thumb_func_start sub_808F99C -sub_808F99C: @ 808F99C +sub_808F99C: ; 808F99C push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -263730,14 +263730,14 @@ sub_808F99C: @ 808F99C thumb_func_end sub_808F99C thumb_func_start sub_808F9C8 -sub_808F9C8: @ 808F9C8 +sub_808F9C8: ; 808F9C8 push {r4-r7,lr} adds r6, r0, 0 adds r7, r1, 0 bl npc_obj_exec_an lsls r0, 24 cmp r0, 0 - beq _0808F9FE + beq @0808F9FE ldr r4, =0x0850d6dc bl GenerateRandomNumber movs r5, 0x3 @@ -263755,7 +263755,7 @@ sub_808F9C8: @ 808F9C8 ands r0, r1 strb r0, [r6] strh r5, [r7, 0x30] -_0808F9FE: +@0808F9FE: movs r0, 0 pop {r4-r7} pop {r1} @@ -263765,7 +263765,7 @@ _0808F9FE: thumb_func_end sub_808F9C8 thumb_func_start sub_808FA0C -sub_808FA0C: @ 808FA0C +sub_808FA0C: ; 808FA0C push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -263773,27 +263773,27 @@ sub_808FA0C: @ 808FA0C bl sub_809797C lsls r0, 24 cmp r0, 0 - bne _0808FA2A + bne @0808FA2A adds r0, r4, 0 bl npc_is_trainer_and_within_sight_distance_blocks_of_player lsls r0, 24 cmp r0, 0 - beq _0808FA32 -_0808FA2A: + beq @0808FA32 +@0808FA2A: movs r0, 0x4 strh r0, [r5, 0x30] movs r0, 0x1 - b _0808FA34 -_0808FA32: + b @0808FA34 +@0808FA32: movs r0, 0 -_0808FA34: +@0808FA34: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_808FA0C thumb_func_start sub_808FA3C -sub_808FA3C: @ 808FA3C +sub_808FA3C: ; 808FA3C push {r4,r5,lr} sub sp, 0x4 adds r4, r0, 0 @@ -263808,14 +263808,14 @@ sub_808FA3C: @ 808FA3C lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _0808FA6C + bne @0808FA6C bl GenerateRandomNumber movs r1, 0x3 ands r1, r0 mov r2, sp adds r0, r2, r1 ldrb r1, [r0] -_0808FA6C: +@0808FA6C: adds r0, r4, 0 bl npc_set_direction movs r0, 0x1 @@ -263829,7 +263829,7 @@ _0808FA6C: thumb_func_end sub_808FA3C thumb_func_start sub_808FA84 -sub_808FA84: @ 808FA84 +sub_808FA84: ; 808FA84 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -263848,7 +263848,7 @@ sub_808FA84: @ 808FA84 thumb_func_end sub_808FA84 thumb_func_start sub_808FAA8 -sub_808FAA8: @ 808FAA8 +sub_808FAA8: ; 808FAA8 push {r4,lr} ldr r3, =0x0850d754 movs r4, 0x30 @@ -263867,7 +263867,7 @@ sub_808FAA8: @ 808FAA8 thumb_func_end sub_808FAA8 thumb_func_start sub_808FAC8 -sub_808FAC8: @ 808FAC8 +sub_808FAC8: ; 808FAC8 push {r4,lr} adds r4, r1, 0 bl npc_reset @@ -263879,7 +263879,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 @@ -263902,13 +263902,13 @@ sub_808FADC: @ 808FADC thumb_func_end sub_808FADC thumb_func_start sub_808FB08 -sub_808FB08: @ 808FB08 +sub_808FB08: ; 808FB08 push {r4-r6,lr} adds r6, r1, 0 bl npc_obj_exec_an lsls r0, 24 cmp r0, 0 - beq _0808FB3C + beq @0808FB3C ldr r5, =0x0850d6dc bl GenerateRandomNumber movs r4, 0x3 @@ -263922,40 +263922,40 @@ sub_808FB08: @ 808FB08 bl sub_8097978 strh r4, [r6, 0x30] movs r0, 0x1 - b _0808FB3E + b @0808FB3E .align 2, 0 .pool -_0808FB3C: +@0808FB3C: movs r0, 0 -_0808FB3E: +@0808FB3E: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_808FB08 thumb_func_start sub_808FB44 -sub_808FB44: @ 808FB44 +sub_808FB44: ; 808FB44 push {r4,lr} adds r4, r1, 0 adds r0, r4, 0 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne _0808FB58 + bne @0808FB58 movs r0, 0 - b _0808FB5E -_0808FB58: + b @0808FB5E +@0808FB58: movs r0, 0x4 strh r0, [r4, 0x30] movs r0, 0x1 -_0808FB5E: +@0808FB5E: pop {r4} pop {r1} bx r1 thumb_func_end sub_808FB44 thumb_func_start sub_808FB64 -sub_808FB64: @ 808FB64 +sub_808FB64: ; 808FB64 push {r4-r7,lr} sub sp, 0x4 adds r5, r0, 0 @@ -263981,9 +263981,9 @@ sub_808FB64: @ 808FB64 bl sub_8092B88 lsls r0, 24 cmp r0, 0 - beq _0808FBA2 + beq @0808FBA2 strh r7, [r6, 0x30] -_0808FBA2: +@0808FBA2: movs r0, 0x1 add sp, 0x4 pop {r4-r7} @@ -263994,7 +263994,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 @@ -264020,14 +264020,14 @@ 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 bl npc_obj_exec_an lsls r0, 24 cmp r0, 0 - beq _0808FBFE + beq @0808FBFE ldrb r0, [r4] movs r1, 0x3 negs r1, r1 @@ -264035,7 +264035,7 @@ sub_808FBE0: @ 808FBE0 strb r1, [r4] movs r0, 0x1 strh r0, [r5, 0x30] -_0808FBFE: +@0808FBFE: movs r0, 0 pop {r4,r5} pop {r1} @@ -264043,7 +264043,7 @@ _0808FBFE: thumb_func_end sub_808FBE0 thumb_func_start sub_808FC08 -sub_808FC08: @ 808FC08 +sub_808FC08: ; 808FC08 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -264062,7 +264062,7 @@ sub_808FC08: @ 808FC08 thumb_func_end sub_808FC08 thumb_func_start sub_808FC2C -sub_808FC2C: @ 808FC2C +sub_808FC2C: ; 808FC2C push {r4,lr} ldr r3, =0x0850d774 movs r4, 0x30 @@ -264081,7 +264081,7 @@ sub_808FC2C: @ 808FC2C thumb_func_end sub_808FC2C thumb_func_start sub_808FC4C -sub_808FC4C: @ 808FC4C +sub_808FC4C: ; 808FC4C push {r4,lr} adds r4, r1, 0 bl npc_reset @@ -264093,7 +264093,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 @@ -264116,13 +264116,13 @@ 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 npc_obj_exec_an lsls r0, 24 cmp r0, 0 - beq _0808FCC0 + beq @0808FCC0 ldr r5, =0x0850d6dc bl GenerateRandomNumber movs r4, 0x3 @@ -264136,40 +264136,40 @@ sub_808FC8C: @ 808FC8C bl sub_8097978 strh r4, [r6, 0x30] movs r0, 0x1 - b _0808FCC2 + b @0808FCC2 .align 2, 0 .pool -_0808FCC0: +@0808FCC0: movs r0, 0 -_0808FCC2: +@0808FCC2: pop {r4-r6} pop {r1} bx r1 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 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne _0808FCDC + bne @0808FCDC movs r0, 0 - b _0808FCE2 -_0808FCDC: + b @0808FCE2 +@0808FCDC: movs r0, 0x4 strh r0, [r4, 0x30] movs r0, 0x1 -_0808FCE2: +@0808FCE2: pop {r4} pop {r1} bx r1 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 @@ -264195,9 +264195,9 @@ sub_808FCE8: @ 808FCE8 bl sub_8092B88 lsls r0, 24 cmp r0, 0 - beq _0808FD26 + beq @0808FD26 strh r7, [r6, 0x30] -_0808FD26: +@0808FD26: movs r0, 0x1 add sp, 0x4 pop {r4-r7} @@ -264208,7 +264208,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 @@ -264234,14 +264234,14 @@ 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 bl npc_obj_exec_an lsls r0, 24 cmp r0, 0 - beq _0808FD82 + beq @0808FD82 ldrb r0, [r4] movs r1, 0x3 negs r1, r1 @@ -264249,7 +264249,7 @@ sub_808FD64: @ 808FD64 strb r1, [r4] movs r0, 0x1 strh r0, [r5, 0x30] -_0808FD82: +@0808FD82: movs r0, 0 pop {r4,r5} pop {r1} @@ -264257,7 +264257,7 @@ _0808FD82: thumb_func_end sub_808FD64 thumb_func_start sub_808FD8C -sub_808FD8C: @ 808FD8C +sub_808FD8C: ; 808FD8C push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -264276,7 +264276,7 @@ sub_808FD8C: @ 808FD8C thumb_func_end sub_808FD8C thumb_func_start sub_808FDB0 -sub_808FDB0: @ 808FDB0 +sub_808FDB0: ; 808FDB0 push {r4,lr} ldr r3, =0x0850d794 movs r4, 0x30 @@ -264295,7 +264295,7 @@ sub_808FDB0: @ 808FDB0 thumb_func_end sub_808FDB0 thumb_func_start sub_808FDD0 -sub_808FDD0: @ 808FDD0 +sub_808FDD0: ; 808FDD0 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -264318,27 +264318,27 @@ sub_808FDD0: @ 808FDD0 thumb_func_end sub_808FDD0 thumb_func_start sub_808FDFC -sub_808FDFC: @ 808FDFC +sub_808FDFC: ; 808FDFC push {r4,lr} adds r4, r1, 0 bl npc_obj_exec_an lsls r0, 24 cmp r0, 0 - bne _0808FE0E + bne @0808FE0E movs r0, 0 - b _0808FE14 -_0808FE0E: + b @0808FE14 +@0808FE0E: movs r0, 0x2 strh r0, [r4, 0x30] movs r0, 0x1 -_0808FE14: +@0808FE14: pop {r4} pop {r1} bx r1 thumb_func_end sub_808FDFC thumb_func_start sub_808FE1C -sub_808FE1C: @ 808FE1C +sub_808FE1C: ; 808FE1C ldrb r2, [r0] movs r1, 0x3 negs r1, r1 @@ -264349,7 +264349,7 @@ sub_808FE1C: @ 808FE1C thumb_func_end sub_808FE1C thumb_func_start sub_808FE2C -sub_808FE2C: @ 808FE2C +sub_808FE2C: ; 808FE2C push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x2E @@ -264363,7 +264363,7 @@ sub_808FE2C: @ 808FE2C movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0808FE58 + bne @0808FE58 adds r0, r5, 0 adds r1, r4, 0 bl sub_808E5F4 @@ -264371,7 +264371,7 @@ sub_808FE2C: @ 808FE2C movs r0, 0x1 orrs r0, r1 strh r0, [r4, 0x3C] -_0808FE58: +@0808FE58: ldr r2, =sub_808FE70 + 1 adds r0, r5, 0 adds r1, r4, 0 @@ -264384,7 +264384,7 @@ _0808FE58: thumb_func_end sub_808FE2C thumb_func_start sub_808FE70 -sub_808FE70: @ 808FE70 +sub_808FE70: ; 808FE70 push {r4,lr} ldr r3, =0x0850d7a0 movs r4, 0x30 @@ -264403,7 +264403,7 @@ sub_808FE70: @ 808FE70 thumb_func_end sub_808FE70 thumb_func_start sub_808FE90 -sub_808FE90: @ 808FE90 +sub_808FE90: ; 808FE90 push {r4-r7,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -264423,16 +264423,16 @@ sub_808FE90: @ 808FE90 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0 - bne _0808FF00 + bne @0808FF00 ldrh r1, [r5, 0x3C] movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne _0808FEF6 + bne @0808FEF6 subs r6, 0x14 ldrb r0, [r6] cmp r0, 0x4 - bne _0808FEF6 + bne @0808FEF6 ldr r1, =0x02038c08 movs r2, 0x10 ldrsh r0, [r4, r2] @@ -264452,12 +264452,12 @@ sub_808FE90: @ 808FE90 movs r0, 0x17 bl oe_exec strb r7, [r6] -_0808FEF6: +@0808FEF6: movs r0, 0 - b _0808FF42 + b @0808FF42 .align 2, 0 .pool -_0808FF00: +@0808FF00: ldrb r1, [r4, 0x1] movs r0, 0x21 negs r0, r0 @@ -264475,7 +264475,7 @@ _0808FF00: adds r0, 0x2A ldrb r0, [r0] cmp r0, r7 - bne _0808FF3C + bne @0808FF3C adds r0, r4, 0 adds r1, r5, 0 bl sub_808E5F4 @@ -264485,39 +264485,39 @@ _0808FF00: bl npc_set_state_and_pq_record movs r0, 0x1 strh r0, [r5, 0x30] - b _0808FF42 -_0808FF3C: + b @0808FF42 +@0808FF3C: movs r0, 0x2 strh r0, [r5, 0x30] movs r0, 0x1 -_0808FF42: +@0808FF42: pop {r4-r7} pop {r1} bx r1 thumb_func_end sub_808FE90 thumb_func_start sub_808FF48 -sub_808FF48: @ 808FF48 +sub_808FF48: ; 808FF48 push {r4,lr} adds r4, r1, 0 bl npc_obj_exec_an lsls r0, 24 cmp r0, 0 - bne _0808FF5A + bne @0808FF5A movs r0, 0 - b _0808FF60 -_0808FF5A: + b @0808FF60 +@0808FF5A: movs r0, 0 strh r0, [r4, 0x30] movs r0, 0x1 -_0808FF60: +@0808FF60: pop {r4} pop {r1} bx r1 thumb_func_end sub_808FF48 thumb_func_start sub_808FF68 -sub_808FF68: @ 808FF68 +sub_808FF68: ; 808FF68 push {r4,lr} ldrb r2, [r0] movs r3, 0x2 @@ -264558,7 +264558,7 @@ sub_808FF68: @ 808FF68 thumb_func_end sub_808FF68 thumb_func_start sub_808FFB4 -sub_808FFB4: @ 808FFB4 +sub_808FFB4: ; 808FFB4 push {r4,lr} adds r3, r0, 0 adds r4, r1, 0 @@ -264584,10 +264584,10 @@ sub_808FFB4: @ 808FFB4 movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0x40 - bgt _0808FFEC + bgt @0808FFEC movs r0, 0 - b _0808FFFE -_0808FFEC: + b @0808FFFE +@0808FFEC: adds r0, r3, 0 adds r1, r4, 0 bl sub_808E5F4 @@ -264596,14 +264596,14 @@ _0808FFEC: movs r0, 0 strh r0, [r4, 0x32] movs r0, 0x1 -_0808FFFE: +@0808FFFE: pop {r4} pop {r1} bx r1 thumb_func_end sub_808FFB4 thumb_func_start sub_8090004 -sub_8090004: @ 8090004 +sub_8090004: ; 8090004 push {r4,lr} adds r4, r1, 0 ldrh r2, [r4, 0x32] @@ -264628,10 +264628,10 @@ sub_8090004: @ 8090004 movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0x40 - bgt _0809003A + bgt @0809003A movs r0, 0 - b _08090048 -_0809003A: + b @08090048 +@0809003A: movs r0, 0 strh r0, [r4, 0x30] ldrh r1, [r4, 0x3C] @@ -264639,14 +264639,14 @@ _0809003A: ands r0, r1 strh r0, [r4, 0x3C] movs r0, 0x1 -_08090048: +@08090048: pop {r4} pop {r1} bx r1 thumb_func_end sub_8090004 thumb_func_start sub_8090050 -sub_8090050: @ 8090050 +sub_8090050: ; 8090050 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -264665,7 +264665,7 @@ sub_8090050: @ 8090050 thumb_func_end sub_8090050 thumb_func_start sub_8090074 -sub_8090074: @ 8090074 +sub_8090074: ; 8090074 push {r4,lr} ldr r3, =0x0850d7b4 movs r4, 0x30 @@ -264684,7 +264684,7 @@ sub_8090074: @ 8090074 thumb_func_end sub_8090074 thumb_func_start sub_8090094 -sub_8090094: @ 8090094 +sub_8090094: ; 8090094 push {r4,lr} adds r4, r1, 0 bl npc_reset @@ -264696,7 +264696,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 @@ -264719,14 +264719,14 @@ 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 bl npc_obj_exec_an lsls r0, 24 cmp r0, 0 - beq _0809010A + beq @0809010A ldr r4, =0x0850d6dc bl GenerateRandomNumber movs r5, 0x3 @@ -264744,7 +264744,7 @@ sub_80900D4: @ 80900D4 ands r0, r1 strb r0, [r6] strh r5, [r7, 0x30] -_0809010A: +@0809010A: movs r0, 0 pop {r4-r7} pop {r1} @@ -264754,7 +264754,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 @@ -264762,27 +264762,27 @@ sub_8090118: @ 8090118 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne _08090136 + bne @08090136 adds r0, r4, 0 bl npc_is_trainer_and_within_sight_distance_blocks_of_player lsls r0, 24 cmp r0, 0 - beq _0809013E -_08090136: + beq @0809013E +@08090136: movs r0, 0x4 strh r0, [r5, 0x30] movs r0, 0x1 - b _08090140 -_0809013E: + b @08090140 +@0809013E: movs r0, 0 -_08090140: +@08090140: pop {r4,r5} pop {r1} bx r1 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 @@ -264797,14 +264797,14 @@ sub_8090148: @ 8090148 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _08090178 + bne @08090178 bl GenerateRandomNumber movs r1, 0x1 ands r1, r0 mov r2, sp adds r0, r2, r1 ldrb r1, [r0] -_08090178: +@08090178: adds r0, r4, 0 bl npc_set_direction movs r0, 0x1 @@ -264818,7 +264818,7 @@ _08090178: thumb_func_end sub_8090148 thumb_func_start sub_8090190 -sub_8090190: @ 8090190 +sub_8090190: ; 8090190 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -264837,7 +264837,7 @@ sub_8090190: @ 8090190 thumb_func_end sub_8090190 thumb_func_start sub_80901B4 -sub_80901B4: @ 80901B4 +sub_80901B4: ; 80901B4 push {r4,lr} ldr r3, =0x0850d7c8 movs r4, 0x30 @@ -264856,7 +264856,7 @@ sub_80901B4: @ 80901B4 thumb_func_end sub_80901B4 thumb_func_start sub_80901D4 -sub_80901D4: @ 80901D4 +sub_80901D4: ; 80901D4 push {r4,lr} adds r4, r1, 0 bl npc_reset @@ -264868,7 +264868,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 @@ -264891,14 +264891,14 @@ 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 bl npc_obj_exec_an lsls r0, 24 cmp r0, 0 - beq _0809024A + beq @0809024A ldr r4, =0x0850d6dc bl GenerateRandomNumber movs r5, 0x3 @@ -264916,7 +264916,7 @@ sub_8090214: @ 8090214 ands r0, r1 strb r0, [r6] strh r5, [r7, 0x30] -_0809024A: +@0809024A: movs r0, 0 pop {r4-r7} pop {r1} @@ -264926,7 +264926,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 @@ -264934,27 +264934,27 @@ sub_8090258: @ 8090258 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne _08090276 + bne @08090276 adds r0, r4, 0 bl npc_is_trainer_and_within_sight_distance_blocks_of_player lsls r0, 24 cmp r0, 0 - beq _0809027E -_08090276: + beq @0809027E +@08090276: movs r0, 0x4 strh r0, [r5, 0x30] movs r0, 0x1 - b _08090280 -_0809027E: + b @08090280 +@0809027E: movs r0, 0 -_08090280: +@08090280: pop {r4,r5} pop {r1} bx r1 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 @@ -264969,14 +264969,14 @@ sub_8090288: @ 8090288 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _080902B8 + bne @080902B8 bl GenerateRandomNumber movs r1, 0x1 ands r1, r0 mov r2, sp adds r0, r2, r1 ldrb r1, [r0] -_080902B8: +@080902B8: adds r0, r4, 0 bl npc_set_direction movs r0, 0x1 @@ -264990,7 +264990,7 @@ _080902B8: thumb_func_end sub_8090288 thumb_func_start sub_80902D0 -sub_80902D0: @ 80902D0 +sub_80902D0: ; 80902D0 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -265009,7 +265009,7 @@ sub_80902D0: @ 80902D0 thumb_func_end sub_80902D0 thumb_func_start sub_80902F4 -sub_80902F4: @ 80902F4 +sub_80902F4: ; 80902F4 push {r4,lr} ldr r3, =0x0850d7dc movs r4, 0x30 @@ -265028,7 +265028,7 @@ sub_80902F4: @ 80902F4 thumb_func_end sub_80902F4 thumb_func_start sub_8090314 -sub_8090314: @ 8090314 +sub_8090314: ; 8090314 push {r4,lr} adds r4, r1, 0 bl npc_reset @@ -265040,7 +265040,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 @@ -265063,14 +265063,14 @@ 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 bl npc_obj_exec_an lsls r0, 24 cmp r0, 0 - beq _0809038A + beq @0809038A ldr r4, =0x0850d6ec bl GenerateRandomNumber movs r5, 0x3 @@ -265088,7 +265088,7 @@ sub_8090354: @ 8090354 ands r0, r1 strb r0, [r6] strh r5, [r7, 0x30] -_0809038A: +@0809038A: movs r0, 0 pop {r4-r7} pop {r1} @@ -265098,7 +265098,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 @@ -265106,27 +265106,27 @@ sub_8090398: @ 8090398 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne _080903B6 + bne @080903B6 adds r0, r4, 0 bl npc_is_trainer_and_within_sight_distance_blocks_of_player lsls r0, 24 cmp r0, 0 - beq _080903BE -_080903B6: + beq @080903BE +@080903B6: movs r0, 0x4 strh r0, [r5, 0x30] movs r0, 0x1 - b _080903C0 -_080903BE: + b @080903C0 +@080903BE: movs r0, 0 -_080903C0: +@080903C0: pop {r4,r5} pop {r1} bx r1 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 @@ -265141,14 +265141,14 @@ sub_80903C8: @ 80903C8 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _080903F8 + bne @080903F8 bl GenerateRandomNumber movs r1, 0x1 ands r1, r0 mov r2, sp adds r0, r2, r1 ldrb r1, [r0] -_080903F8: +@080903F8: adds r0, r4, 0 bl npc_set_direction movs r0, 0x1 @@ -265162,7 +265162,7 @@ _080903F8: thumb_func_end sub_80903C8 thumb_func_start sub_8090410 -sub_8090410: @ 8090410 +sub_8090410: ; 8090410 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -265181,7 +265181,7 @@ sub_8090410: @ 8090410 thumb_func_end sub_8090410 thumb_func_start sub_8090434 -sub_8090434: @ 8090434 +sub_8090434: ; 8090434 push {r4,lr} ldr r3, =0x0850d7f4 movs r4, 0x30 @@ -265200,7 +265200,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 @@ -265212,7 +265212,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 @@ -265235,14 +265235,14 @@ 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 bl npc_obj_exec_an lsls r0, 24 cmp r0, 0 - beq _080904CA + beq @080904CA ldr r4, =0x0850d6ec bl GenerateRandomNumber movs r5, 0x3 @@ -265260,7 +265260,7 @@ sub_8090494: @ 8090494 ands r0, r1 strb r0, [r6] strh r5, [r7, 0x30] -_080904CA: +@080904CA: movs r0, 0 pop {r4-r7} pop {r1} @@ -265270,7 +265270,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 @@ -265278,27 +265278,27 @@ sub_80904D8: @ 80904D8 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne _080904F6 + bne @080904F6 adds r0, r4, 0 bl npc_is_trainer_and_within_sight_distance_blocks_of_player lsls r0, 24 cmp r0, 0 - beq _080904FE -_080904F6: + beq @080904FE +@080904F6: movs r0, 0x4 strh r0, [r5, 0x30] movs r0, 0x1 - b _08090500 -_080904FE: + b @08090500 +@080904FE: movs r0, 0 -_08090500: +@08090500: pop {r4,r5} pop {r1} bx r1 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 @@ -265313,14 +265313,14 @@ sub_8090508: @ 8090508 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _08090538 + bne @08090538 bl GenerateRandomNumber movs r1, 0x1 ands r1, r0 mov r2, sp adds r0, r2, r1 ldrb r1, [r0] -_08090538: +@08090538: adds r0, r4, 0 bl npc_set_direction movs r0, 0x1 @@ -265334,7 +265334,7 @@ _08090538: thumb_func_end sub_8090508 thumb_func_start sub_8090550 -sub_8090550: @ 8090550 +sub_8090550: ; 8090550 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -265353,7 +265353,7 @@ sub_8090550: @ 8090550 thumb_func_end sub_8090550 thumb_func_start sub_8090574 -sub_8090574: @ 8090574 +sub_8090574: ; 8090574 push {r4,lr} ldr r3, =0x0850d80c movs r4, 0x30 @@ -265372,7 +265372,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 @@ -265384,7 +265384,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 @@ -265407,14 +265407,14 @@ 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 bl npc_obj_exec_an lsls r0, 24 cmp r0, 0 - beq _0809060A + beq @0809060A ldr r4, =0x0850d6ec bl GenerateRandomNumber movs r5, 0x3 @@ -265432,7 +265432,7 @@ sub_80905D4: @ 80905D4 ands r0, r1 strb r0, [r6] strh r5, [r7, 0x30] -_0809060A: +@0809060A: movs r0, 0 pop {r4-r7} pop {r1} @@ -265442,7 +265442,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 @@ -265450,27 +265450,27 @@ sub_8090618: @ 8090618 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne _08090636 + bne @08090636 adds r0, r4, 0 bl npc_is_trainer_and_within_sight_distance_blocks_of_player lsls r0, 24 cmp r0, 0 - beq _0809063E -_08090636: + beq @0809063E +@08090636: movs r0, 0x4 strh r0, [r5, 0x30] movs r0, 0x1 - b _08090640 -_0809063E: + b @08090640 +@0809063E: movs r0, 0 -_08090640: +@08090640: pop {r4,r5} pop {r1} bx r1 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 @@ -265485,14 +265485,14 @@ sub_8090648: @ 8090648 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _08090678 + bne @08090678 bl GenerateRandomNumber movs r1, 0x1 ands r1, r0 mov r2, sp adds r0, r2, r1 ldrb r1, [r0] -_08090678: +@08090678: adds r0, r4, 0 bl npc_set_direction movs r0, 0x1 @@ -265506,7 +265506,7 @@ _08090678: thumb_func_end sub_8090648 thumb_func_start sub_8090690 -sub_8090690: @ 8090690 +sub_8090690: ; 8090690 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -265525,7 +265525,7 @@ sub_8090690: @ 8090690 thumb_func_end sub_8090690 thumb_func_start sub_80906B4 -sub_80906B4: @ 80906B4 +sub_80906B4: ; 80906B4 push {r4,lr} ldr r3, =0x0850d824 movs r4, 0x30 @@ -265544,7 +265544,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 @@ -265556,7 +265556,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 @@ -265579,14 +265579,14 @@ 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 bl npc_obj_exec_an lsls r0, 24 cmp r0, 0 - beq _0809074A + beq @0809074A ldr r4, =0x0850d6ec bl GenerateRandomNumber movs r5, 0x3 @@ -265604,7 +265604,7 @@ sub_8090714: @ 8090714 ands r0, r1 strb r0, [r6] strh r5, [r7, 0x30] -_0809074A: +@0809074A: movs r0, 0 pop {r4-r7} pop {r1} @@ -265614,7 +265614,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 @@ -265622,27 +265622,27 @@ sub_8090758: @ 8090758 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne _08090776 + bne @08090776 adds r0, r4, 0 bl npc_is_trainer_and_within_sight_distance_blocks_of_player lsls r0, 24 cmp r0, 0 - beq _0809077E -_08090776: + beq @0809077E +@08090776: movs r0, 0x4 strh r0, [r5, 0x30] movs r0, 0x1 - b _08090780 -_0809077E: + b @08090780 +@0809077E: movs r0, 0 -_08090780: +@08090780: pop {r4,r5} pop {r1} bx r1 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 @@ -265657,14 +265657,14 @@ sub_8090788: @ 8090788 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _080907B8 + bne @080907B8 bl GenerateRandomNumber movs r1, 0x1 ands r1, r0 mov r2, sp adds r0, r2, r1 ldrb r1, [r0] -_080907B8: +@080907B8: adds r0, r4, 0 bl npc_set_direction movs r0, 0x1 @@ -265678,7 +265678,7 @@ _080907B8: thumb_func_end sub_8090788 thumb_func_start sub_80907D0 -sub_80907D0: @ 80907D0 +sub_80907D0: ; 80907D0 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -265697,7 +265697,7 @@ sub_80907D0: @ 80907D0 thumb_func_end sub_80907D0 thumb_func_start sub_80907F4 -sub_80907F4: @ 80907F4 +sub_80907F4: ; 80907F4 push {r4,lr} ldr r3, =0x0850d83c movs r4, 0x30 @@ -265716,7 +265716,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 @@ -265728,7 +265728,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 @@ -265751,14 +265751,14 @@ 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 bl npc_obj_exec_an lsls r0, 24 cmp r0, 0 - beq _0809088A + beq @0809088A ldr r4, =0x0850d6ec bl GenerateRandomNumber movs r5, 0x3 @@ -265776,7 +265776,7 @@ sub_8090854: @ 8090854 ands r0, r1 strb r0, [r6] strh r5, [r7, 0x30] -_0809088A: +@0809088A: movs r0, 0 pop {r4-r7} pop {r1} @@ -265786,7 +265786,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 @@ -265794,27 +265794,27 @@ sub_8090898: @ 8090898 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne _080908B6 + bne @080908B6 adds r0, r4, 0 bl npc_is_trainer_and_within_sight_distance_blocks_of_player lsls r0, 24 cmp r0, 0 - beq _080908BE -_080908B6: + beq @080908BE +@080908B6: movs r0, 0x4 strh r0, [r5, 0x30] movs r0, 0x1 - b _080908C0 -_080908BE: + b @080908C0 +@080908BE: movs r0, 0 -_080908C0: +@080908C0: pop {r4,r5} pop {r1} bx r1 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 @@ -265829,14 +265829,14 @@ sub_80908C8: @ 80908C8 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _080908F8 + bne @080908F8 bl GenerateRandomNumber movs r1, 0x3 ands r1, r0 mov r2, sp adds r0, r2, r1 ldrb r1, [r0] -_080908F8: +@080908F8: adds r0, r4, 0 bl npc_set_direction movs r0, 0x1 @@ -265850,7 +265850,7 @@ _080908F8: thumb_func_end sub_80908C8 thumb_func_start sub_8090910 -sub_8090910: @ 8090910 +sub_8090910: ; 8090910 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -265869,7 +265869,7 @@ sub_8090910: @ 8090910 thumb_func_end sub_8090910 thumb_func_start sub_8090934 -sub_8090934: @ 8090934 +sub_8090934: ; 8090934 push {r4,lr} ldr r3, =0x0850d854 movs r4, 0x30 @@ -265888,7 +265888,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 @@ -265900,7 +265900,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 @@ -265923,14 +265923,14 @@ 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 bl npc_obj_exec_an lsls r0, 24 cmp r0, 0 - beq _080909CA + beq @080909CA ldr r4, =0x0850d6ec bl GenerateRandomNumber movs r5, 0x3 @@ -265948,7 +265948,7 @@ sub_8090994: @ 8090994 ands r0, r1 strb r0, [r6] strh r5, [r7, 0x30] -_080909CA: +@080909CA: movs r0, 0 pop {r4-r7} pop {r1} @@ -265958,7 +265958,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 @@ -265966,27 +265966,27 @@ sub_80909D8: @ 80909D8 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne _080909F6 + bne @080909F6 adds r0, r4, 0 bl npc_is_trainer_and_within_sight_distance_blocks_of_player lsls r0, 24 cmp r0, 0 - beq _080909FE -_080909F6: + beq @080909FE +@080909F6: movs r0, 0x4 strh r0, [r5, 0x30] movs r0, 0x1 - b _08090A00 -_080909FE: + b @08090A00 +@080909FE: movs r0, 0 -_08090A00: +@08090A00: pop {r4,r5} pop {r1} bx r1 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 @@ -266001,14 +266001,14 @@ sub_8090A08: @ 8090A08 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _08090A38 + bne @08090A38 bl GenerateRandomNumber movs r1, 0x3 ands r1, r0 mov r2, sp adds r0, r2, r1 ldrb r1, [r0] -_08090A38: +@08090A38: adds r0, r4, 0 bl npc_set_direction movs r0, 0x1 @@ -266022,7 +266022,7 @@ _08090A38: thumb_func_end sub_8090A08 thumb_func_start sub_8090A50 -sub_8090A50: @ 8090A50 +sub_8090A50: ; 8090A50 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -266041,7 +266041,7 @@ sub_8090A50: @ 8090A50 thumb_func_end sub_8090A50 thumb_func_start sub_8090A74 -sub_8090A74: @ 8090A74 +sub_8090A74: ; 8090A74 push {r4,lr} ldr r3, =0x0850d86c movs r4, 0x30 @@ -266060,7 +266060,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 @@ -266072,7 +266072,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 @@ -266095,14 +266095,14 @@ 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 bl npc_obj_exec_an lsls r0, 24 cmp r0, 0 - beq _08090B0A + beq @08090B0A ldr r4, =0x0850d6ec bl GenerateRandomNumber movs r5, 0x3 @@ -266120,7 +266120,7 @@ sub_8090AD4: @ 8090AD4 ands r0, r1 strb r0, [r6] strh r5, [r7, 0x30] -_08090B0A: +@08090B0A: movs r0, 0 pop {r4-r7} pop {r1} @@ -266130,7 +266130,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 @@ -266138,27 +266138,27 @@ sub_8090B18: @ 8090B18 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne _08090B36 + bne @08090B36 adds r0, r4, 0 bl npc_is_trainer_and_within_sight_distance_blocks_of_player lsls r0, 24 cmp r0, 0 - beq _08090B3E -_08090B36: + beq @08090B3E +@08090B36: movs r0, 0x4 strh r0, [r5, 0x30] movs r0, 0x1 - b _08090B40 -_08090B3E: + b @08090B40 +@08090B3E: movs r0, 0 -_08090B40: +@08090B40: pop {r4,r5} pop {r1} bx r1 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 @@ -266173,14 +266173,14 @@ sub_8090B48: @ 8090B48 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _08090B78 + bne @08090B78 bl GenerateRandomNumber movs r1, 0x3 ands r1, r0 mov r2, sp adds r0, r2, r1 ldrb r1, [r0] -_08090B78: +@08090B78: adds r0, r4, 0 bl npc_set_direction movs r0, 0x1 @@ -266194,7 +266194,7 @@ _08090B78: thumb_func_end sub_8090B48 thumb_func_start sub_8090B90 -sub_8090B90: @ 8090B90 +sub_8090B90: ; 8090B90 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -266213,7 +266213,7 @@ sub_8090B90: @ 8090B90 thumb_func_end sub_8090B90 thumb_func_start sub_8090BB4 -sub_8090BB4: @ 8090BB4 +sub_8090BB4: ; 8090BB4 push {r4,lr} ldr r3, =0x0850d884 movs r4, 0x30 @@ -266232,7 +266232,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 @@ -266244,7 +266244,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 @@ -266267,14 +266267,14 @@ 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 bl npc_obj_exec_an lsls r0, 24 cmp r0, 0 - beq _08090C4A + beq @08090C4A ldr r4, =0x0850d6ec bl GenerateRandomNumber movs r5, 0x3 @@ -266292,7 +266292,7 @@ sub_8090C14: @ 8090C14 ands r0, r1 strb r0, [r6] strh r5, [r7, 0x30] -_08090C4A: +@08090C4A: movs r0, 0 pop {r4-r7} pop {r1} @@ -266302,7 +266302,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 @@ -266310,27 +266310,27 @@ sub_8090C58: @ 8090C58 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne _08090C76 + bne @08090C76 adds r0, r4, 0 bl npc_is_trainer_and_within_sight_distance_blocks_of_player lsls r0, 24 cmp r0, 0 - beq _08090C7E -_08090C76: + beq @08090C7E +@08090C76: movs r0, 0x4 strh r0, [r5, 0x30] movs r0, 0x1 - b _08090C80 -_08090C7E: + b @08090C80 +@08090C7E: movs r0, 0 -_08090C80: +@08090C80: pop {r4,r5} pop {r1} bx r1 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 @@ -266345,14 +266345,14 @@ sub_8090C88: @ 8090C88 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _08090CB8 + bne @08090CB8 bl GenerateRandomNumber movs r1, 0x3 ands r1, r0 mov r2, sp adds r0, r2, r1 ldrb r1, [r0] -_08090CB8: +@08090CB8: adds r0, r4, 0 bl npc_set_direction movs r0, 0x1 @@ -266366,7 +266366,7 @@ _08090CB8: thumb_func_end sub_8090C88 thumb_func_start sub_8090CD0 -sub_8090CD0: @ 8090CD0 +sub_8090CD0: ; 8090CD0 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -266385,7 +266385,7 @@ sub_8090CD0: @ 8090CD0 thumb_func_end sub_8090CD0 thumb_func_start sub_8090CF4 -sub_8090CF4: @ 8090CF4 +sub_8090CF4: ; 8090CF4 push {r4,lr} ldr r3, =0x0850d89c movs r4, 0x30 @@ -266404,7 +266404,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 @@ -266427,19 +266427,19 @@ 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 npc_obj_exec_an lsls r0, 24 cmp r0, 0 - beq _08090D5A + beq @08090D5A adds r0, r4, 0 movs r1, 0x30 bl sub_8097978 movs r0, 0x2 strh r0, [r4, 0x30] -_08090D5A: +@08090D5A: movs r0, 0 pop {r4} pop {r1} @@ -266447,7 +266447,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 @@ -266455,16 +266455,16 @@ sub_8090D64: @ 8090D64 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne _08090D82 + bne @08090D82 adds r0, r4, 0 bl npc_is_trainer_and_within_sight_distance_blocks_of_player lsls r0, 24 cmp r0, 0 - beq _08090D86 -_08090D82: + beq @08090D86 +@08090D82: movs r0, 0x3 strh r0, [r5, 0x30] -_08090D86: +@08090D86: movs r0, 0 pop {r4,r5} pop {r1} @@ -266472,7 +266472,7 @@ _08090D86: thumb_func_end sub_8090D64 thumb_func_start sub_8090D90 -sub_8090D90: @ 8090D90 +sub_8090D90: ; 8090D90 push {r4,r5,lr} sub sp, 0x8 adds r4, r0, 0 @@ -266487,13 +266487,13 @@ sub_8090D90: @ 8090D90 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _08090DBC + bne @08090DBC ldrb r0, [r4, 0x18] lsls r0, 28 lsrs r0, 28 add r0, sp ldrb r1, [r0] -_08090DBC: +@08090DBC: adds r0, r4, 0 bl npc_set_direction movs r0, 0 @@ -266508,7 +266508,7 @@ _08090DBC: thumb_func_end sub_8090D90 thumb_func_start sub_8090DD4 -sub_8090DD4: @ 8090DD4 +sub_8090DD4: ; 8090DD4 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -266527,7 +266527,7 @@ sub_8090DD4: @ 8090DD4 thumb_func_end sub_8090DD4 thumb_func_start sub_8090DF8 -sub_8090DF8: @ 8090DF8 +sub_8090DF8: ; 8090DF8 push {r4,lr} ldr r3, =0x0850d8b4 movs r4, 0x30 @@ -266546,7 +266546,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 @@ -266569,19 +266569,19 @@ 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 npc_obj_exec_an lsls r0, 24 cmp r0, 0 - beq _08090E5E + beq @08090E5E adds r0, r4, 0 movs r1, 0x30 bl sub_8097978 movs r0, 0x2 strh r0, [r4, 0x30] -_08090E5E: +@08090E5E: movs r0, 0 pop {r4} pop {r1} @@ -266589,7 +266589,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 @@ -266597,16 +266597,16 @@ sub_8090E68: @ 8090E68 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne _08090E86 + bne @08090E86 adds r0, r4, 0 bl npc_is_trainer_and_within_sight_distance_blocks_of_player lsls r0, 24 cmp r0, 0 - beq _08090E8A -_08090E86: + beq @08090E8A +@08090E86: movs r0, 0x3 strh r0, [r5, 0x30] -_08090E8A: +@08090E8A: movs r0, 0 pop {r4,r5} pop {r1} @@ -266614,7 +266614,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 @@ -266629,13 +266629,13 @@ sub_8090E94: @ 8090E94 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _08090EC0 + bne @08090EC0 ldrb r0, [r4, 0x18] lsls r0, 28 lsrs r0, 28 add r0, sp ldrb r1, [r0] -_08090EC0: +@08090EC0: adds r0, r4, 0 bl npc_set_direction movs r0, 0 @@ -266650,7 +266650,7 @@ _08090EC0: thumb_func_end sub_8090E94 thumb_func_start sub_8090ED8 -sub_8090ED8: @ 8090ED8 +sub_8090ED8: ; 8090ED8 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -266669,7 +266669,7 @@ sub_8090ED8: @ 8090ED8 thumb_func_end sub_8090ED8 thumb_func_start sub_8090EFC -sub_8090EFC: @ 8090EFC +sub_8090EFC: ; 8090EFC push {r4,lr} ldr r3, =0x0850d8cc movs r4, 0x30 @@ -266688,7 +266688,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 @@ -266700,7 +266700,7 @@ sub_8090F1C: @ 8090F1C thumb_func_end sub_8090F1C thumb_func_start sub_8090F30 -sub_8090F30: @ 8090F30 +sub_8090F30: ; 8090F30 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -266712,12 +266712,12 @@ sub_8090F30: @ 8090F30 adds r0, 0x21 ldrb r0, [r0] cmp r0, 0 - beq _08090F52 + beq @08090F52 adds r0, r1, 0 bl direction_reversed lsls r0, 24 lsrs r1, r0, 24 -_08090F52: +@08090F52: adds r0, r4, 0 bl npc_set_direction movs r0, 0x2 @@ -266731,7 +266731,7 @@ _08090F52: thumb_func_end sub_8090F30 thumb_func_start sub_8090F68 -sub_8090F68: @ 8090F68 +sub_8090F68: ; 8090F68 push {r4-r7,lr} adds r4, r0, 0 adds r7, r1, 0 @@ -266739,11 +266739,11 @@ sub_8090F68: @ 8090F68 adds r2, 0x21 ldrb r0, [r2] cmp r0, 0 - beq _08090F98 + beq @08090F98 ldr r1, [r4, 0xC] ldr r0, [r4, 0x10] cmp r1, r0 - bne _08090F98 + bne @08090F98 movs r0, 0 strb r0, [r2] ldrb r0, [r4, 0x18] @@ -266754,7 +266754,7 @@ sub_8090F68: @ 8090F68 lsrs r1, 24 adds r0, r4, 0 bl npc_set_direction -_08090F98: +@08090F98: ldrb r1, [r4, 0x18] lsrs r1, 4 adds r0, r4, 0 @@ -266767,7 +266767,7 @@ _08090F98: lsls r0, 24 lsrs r6, r0, 24 cmp r5, 0x1 - bne _08090FEE + bne @08090FEE adds r1, r4, 0 adds r1, 0x21 ldrb r0, [r1] @@ -266792,16 +266792,16 @@ _08090F98: bl sub_8092B88 lsls r0, 24 lsrs r5, r0, 24 -_08090FEE: +@08090FEE: cmp r5, 0 - beq _08091000 + beq @08091000 ldrb r0, [r4, 0x18] lsls r0, 28 lsrs r0, 28 bl d2s_08064244 lsls r0, 24 lsrs r6, r0, 24 -_08091000: +@08091000: adds r0, r4, 0 adds r1, r7, 0 adds r2, r6, 0 @@ -266819,14 +266819,14 @@ _08091000: thumb_func_end sub_8090F68 thumb_func_start sub_8091020 -sub_8091020: @ 8091020 +sub_8091020: ; 8091020 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 bl npc_obj_exec_an lsls r0, 24 cmp r0, 0 - beq _0809103E + beq @0809103E ldrb r0, [r4] movs r1, 0x3 negs r1, r1 @@ -266834,7 +266834,7 @@ sub_8091020: @ 8091020 strb r1, [r4] movs r0, 0x1 strh r0, [r5, 0x30] -_0809103E: +@0809103E: movs r0, 0 pop {r4,r5} pop {r1} @@ -266842,7 +266842,7 @@ _0809103E: thumb_func_end sub_8091020 thumb_func_start sub_8091048 -sub_8091048: @ 8091048 +sub_8091048: ; 8091048 push {r4,lr} adds r4, r1, 0 bl npc_reset @@ -266854,7 +266854,7 @@ sub_8091048: @ 8091048 thumb_func_end sub_8091048 thumb_func_start sub_809105C -sub_809105C: @ 809105C +sub_809105C: ; 809105C push {r4-r7,lr} mov r7, r8 push {r7} @@ -266865,14 +266865,14 @@ sub_809105C: @ 809105C adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x3 - bne _0809107E + bne @0809107E ldr r1, [r4, 0xC] ldr r0, [r4, 0x10] cmp r1, r0 - bne _0809107E + bne @0809107E movs r0, 0 strb r0, [r2] -_0809107E: +@0809107E: adds r5, r4, 0 adds r5, 0x21 ldrb r0, [r5] @@ -266892,7 +266892,7 @@ _0809107E: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080910D8 + bne @080910D8 ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] @@ -266912,16 +266912,16 @@ _0809107E: bl sub_8092B88 lsls r0, 24 lsrs r0, 24 -_080910D8: +@080910D8: cmp r0, 0 - beq _080910EA + beq @080910EA ldrb r0, [r4, 0x18] lsls r0, 28 lsrs r0, 28 bl d2s_08064244 lsls r0, 24 lsrs r6, r0, 24 -_080910EA: +@080910EA: adds r0, r4, 0 mov r1, r8 adds r2, r6, 0 @@ -266942,14 +266942,14 @@ _080910EA: thumb_func_end sub_809105C thumb_func_start sub_8091110 -sub_8091110: @ 8091110 +sub_8091110: ; 8091110 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 bl npc_obj_exec_an lsls r0, 24 cmp r0, 0 - beq _0809112E + beq @0809112E ldrb r0, [r4] movs r1, 0x3 negs r1, r1 @@ -266957,7 +266957,7 @@ sub_8091110: @ 8091110 strb r1, [r4] movs r0, 0x1 strh r0, [r5, 0x30] -_0809112E: +@0809112E: movs r0, 0 pop {r4,r5} pop {r1} @@ -266965,7 +266965,7 @@ _0809112E: thumb_func_end sub_8091110 thumb_func_start sub_8091138 -sub_8091138: @ 8091138 +sub_8091138: ; 8091138 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -266984,7 +266984,7 @@ sub_8091138: @ 8091138 thumb_func_end sub_8091138 thumb_func_start sub_809115C -sub_809115C: @ 809115C +sub_809115C: ; 809115C push {r4,lr} ldr r3, =0x0850d8dc movs r4, 0x30 @@ -267003,7 +267003,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 @@ -267016,16 +267016,16 @@ sub_809117C: @ 809117C adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x2 - bne _080911A8 + bne @080911A8 movs r0, 0xC ldrsh r1, [r4, r0] movs r3, 0x10 ldrsh r0, [r4, r3] cmp r1, r0 - bne _080911A8 + bne @080911A8 movs r0, 0x3 strb r0, [r2] -_080911A8: +@080911A8: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -267041,7 +267041,7 @@ _080911A8: thumb_func_end sub_809117C thumb_func_start sub_80911C4 -sub_80911C4: @ 80911C4 +sub_80911C4: ; 80911C4 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -267060,7 +267060,7 @@ sub_80911C4: @ 80911C4 thumb_func_end sub_80911C4 thumb_func_start sub_80911E8 -sub_80911E8: @ 80911E8 +sub_80911E8: ; 80911E8 push {r4,lr} ldr r3, =0x0850d8ec movs r4, 0x30 @@ -267079,7 +267079,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 @@ -267092,16 +267092,16 @@ sub_8091208: @ 8091208 adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x1 - bne _08091234 + bne @08091234 movs r0, 0xC ldrsh r1, [r4, r0] movs r3, 0x10 ldrsh r0, [r4, r3] cmp r1, r0 - bne _08091234 + bne @08091234 movs r0, 0x2 strb r0, [r2] -_08091234: +@08091234: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -267117,7 +267117,7 @@ _08091234: thumb_func_end sub_8091208 thumb_func_start sub_8091250 -sub_8091250: @ 8091250 +sub_8091250: ; 8091250 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -267136,7 +267136,7 @@ sub_8091250: @ 8091250 thumb_func_end sub_8091250 thumb_func_start sub_8091274 -sub_8091274: @ 8091274 +sub_8091274: ; 8091274 push {r4,lr} ldr r3, =0x0850d8fc movs r4, 0x30 @@ -267155,7 +267155,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 @@ -267168,16 +267168,16 @@ sub_8091294: @ 8091294 adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x1 - bne _080912C0 + bne @080912C0 movs r0, 0xE ldrsh r1, [r4, r0] movs r3, 0x12 ldrsh r0, [r4, r3] cmp r1, r0 - bne _080912C0 + bne @080912C0 movs r0, 0x2 strb r0, [r2] -_080912C0: +@080912C0: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -267193,7 +267193,7 @@ _080912C0: thumb_func_end sub_8091294 thumb_func_start sub_80912DC -sub_80912DC: @ 80912DC +sub_80912DC: ; 80912DC push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -267212,7 +267212,7 @@ sub_80912DC: @ 80912DC thumb_func_end sub_80912DC thumb_func_start sub_8091300 -sub_8091300: @ 8091300 +sub_8091300: ; 8091300 push {r4,lr} ldr r3, =0x0850d90c movs r4, 0x30 @@ -267231,7 +267231,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 @@ -267244,16 +267244,16 @@ sub_8091320: @ 8091320 adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x2 - bne _0809134C + bne @0809134C movs r0, 0xE ldrsh r1, [r4, r0] movs r3, 0x12 ldrsh r0, [r4, r3] cmp r1, r0 - bne _0809134C + bne @0809134C movs r0, 0x3 strb r0, [r2] -_0809134C: +@0809134C: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -267269,7 +267269,7 @@ _0809134C: thumb_func_end sub_8091320 thumb_func_start sub_8091368 -sub_8091368: @ 8091368 +sub_8091368: ; 8091368 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -267288,7 +267288,7 @@ sub_8091368: @ 8091368 thumb_func_end sub_8091368 thumb_func_start sub_809138C -sub_809138C: @ 809138C +sub_809138C: ; 809138C push {r4,lr} ldr r3, =0x0850d91c movs r4, 0x30 @@ -267307,7 +267307,7 @@ sub_809138C: @ 809138C thumb_func_end sub_809138C thumb_func_start sub_80913AC -sub_80913AC: @ 80913AC +sub_80913AC: ; 80913AC push {r4,r5,lr} sub sp, 0x4 adds r4, r0, 0 @@ -267320,16 +267320,16 @@ sub_80913AC: @ 80913AC adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x2 - bne _080913D8 + bne @080913D8 movs r0, 0xC ldrsh r1, [r4, r0] movs r3, 0x10 ldrsh r0, [r4, r3] cmp r1, r0 - bne _080913D8 + bne @080913D8 movs r0, 0x3 strb r0, [r2] -_080913D8: +@080913D8: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -267345,7 +267345,7 @@ _080913D8: thumb_func_end sub_80913AC thumb_func_start sub_80913F4 -sub_80913F4: @ 80913F4 +sub_80913F4: ; 80913F4 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -267364,7 +267364,7 @@ sub_80913F4: @ 80913F4 thumb_func_end sub_80913F4 thumb_func_start sub_8091418 -sub_8091418: @ 8091418 +sub_8091418: ; 8091418 push {r4,lr} ldr r3, =0x0850d92c movs r4, 0x30 @@ -267383,7 +267383,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 @@ -267396,16 +267396,16 @@ sub_8091438: @ 8091438 adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x1 - bne _08091464 + bne @08091464 movs r0, 0xC ldrsh r1, [r4, r0] movs r3, 0x10 ldrsh r0, [r4, r3] cmp r1, r0 - bne _08091464 + bne @08091464 movs r0, 0x2 strb r0, [r2] -_08091464: +@08091464: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -267421,7 +267421,7 @@ _08091464: thumb_func_end sub_8091438 thumb_func_start sub_8091480 -sub_8091480: @ 8091480 +sub_8091480: ; 8091480 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -267440,7 +267440,7 @@ sub_8091480: @ 8091480 thumb_func_end sub_8091480 thumb_func_start sub_80914A4 -sub_80914A4: @ 80914A4 +sub_80914A4: ; 80914A4 push {r4,lr} ldr r3, =0x0850d93c movs r4, 0x30 @@ -267459,7 +267459,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 @@ -267472,16 +267472,16 @@ sub_80914C4: @ 80914C4 adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x1 - bne _080914F0 + bne @080914F0 movs r0, 0xE ldrsh r1, [r4, r0] movs r3, 0x12 ldrsh r0, [r4, r3] cmp r1, r0 - bne _080914F0 + bne @080914F0 movs r0, 0x2 strb r0, [r2] -_080914F0: +@080914F0: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -267497,7 +267497,7 @@ _080914F0: thumb_func_end sub_80914C4 thumb_func_start sub_809150C -sub_809150C: @ 809150C +sub_809150C: ; 809150C push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -267516,7 +267516,7 @@ sub_809150C: @ 809150C thumb_func_end sub_809150C thumb_func_start sub_8091530 -sub_8091530: @ 8091530 +sub_8091530: ; 8091530 push {r4,lr} ldr r3, =0x0850d948 movs r4, 0x30 @@ -267535,7 +267535,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 @@ -267548,16 +267548,16 @@ sub_8091550: @ 8091550 adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x2 - bne _0809157C + bne @0809157C movs r0, 0xE ldrsh r1, [r4, r0] movs r3, 0x12 ldrsh r0, [r4, r3] cmp r1, r0 - bne _0809157C + bne @0809157C movs r0, 0x3 strb r0, [r2] -_0809157C: +@0809157C: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -267573,7 +267573,7 @@ _0809157C: thumb_func_end sub_8091550 thumb_func_start sub_8091598 -sub_8091598: @ 8091598 +sub_8091598: ; 8091598 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -267592,7 +267592,7 @@ sub_8091598: @ 8091598 thumb_func_end sub_8091598 thumb_func_start sub_80915BC -sub_80915BC: @ 80915BC +sub_80915BC: ; 80915BC push {r4,lr} ldr r3, =0x0850d958 movs r4, 0x30 @@ -267611,7 +267611,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 @@ -267624,16 +267624,16 @@ sub_80915DC: @ 80915DC adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x2 - bne _08091608 + bne @08091608 movs r0, 0xE ldrsh r1, [r4, r0] movs r3, 0x12 ldrsh r0, [r4, r3] cmp r1, r0 - bne _08091608 + bne @08091608 movs r0, 0x3 strb r0, [r2] -_08091608: +@08091608: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -267649,7 +267649,7 @@ _08091608: thumb_func_end sub_80915DC thumb_func_start sub_8091624 -sub_8091624: @ 8091624 +sub_8091624: ; 8091624 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -267668,7 +267668,7 @@ sub_8091624: @ 8091624 thumb_func_end sub_8091624 thumb_func_start sub_8091648 -sub_8091648: @ 8091648 +sub_8091648: ; 8091648 push {r4,lr} ldr r3, =0x0850d968 movs r4, 0x30 @@ -267687,7 +267687,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 @@ -267700,16 +267700,16 @@ sub_8091668: @ 8091668 adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x1 - bne _08091694 + bne @08091694 movs r0, 0xE ldrsh r1, [r4, r0] movs r3, 0x12 ldrsh r0, [r4, r3] cmp r1, r0 - bne _08091694 + bne @08091694 movs r0, 0x2 strb r0, [r2] -_08091694: +@08091694: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -267725,7 +267725,7 @@ _08091694: thumb_func_end sub_8091668 thumb_func_start sub_80916B0 -sub_80916B0: @ 80916B0 +sub_80916B0: ; 80916B0 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -267744,7 +267744,7 @@ sub_80916B0: @ 80916B0 thumb_func_end sub_80916B0 thumb_func_start sub_80916D4 -sub_80916D4: @ 80916D4 +sub_80916D4: ; 80916D4 push {r4,lr} ldr r3, =0x0850d978 movs r4, 0x30 @@ -267763,7 +267763,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 @@ -267776,16 +267776,16 @@ sub_80916F4: @ 80916F4 adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x1 - bne _08091720 + bne @08091720 movs r0, 0xC ldrsh r1, [r4, r0] movs r3, 0x10 ldrsh r0, [r4, r3] cmp r1, r0 - bne _08091720 + bne @08091720 movs r0, 0x2 strb r0, [r2] -_08091720: +@08091720: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -267801,7 +267801,7 @@ _08091720: thumb_func_end sub_80916F4 thumb_func_start sub_809173C -sub_809173C: @ 809173C +sub_809173C: ; 809173C push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -267820,7 +267820,7 @@ sub_809173C: @ 809173C thumb_func_end sub_809173C thumb_func_start sub_8091760 -sub_8091760: @ 8091760 +sub_8091760: ; 8091760 push {r4,lr} ldr r3, =0x0850d988 movs r4, 0x30 @@ -267839,7 +267839,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 @@ -267852,16 +267852,16 @@ sub_8091780: @ 8091780 adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x2 - bne _080917AC + bne @080917AC movs r0, 0xC ldrsh r1, [r4, r0] movs r3, 0x10 ldrsh r0, [r4, r3] cmp r1, r0 - bne _080917AC + bne @080917AC movs r0, 0x3 strb r0, [r2] -_080917AC: +@080917AC: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -267877,7 +267877,7 @@ _080917AC: thumb_func_end sub_8091780 thumb_func_start sub_80917C8 -sub_80917C8: @ 80917C8 +sub_80917C8: ; 80917C8 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -267896,7 +267896,7 @@ sub_80917C8: @ 80917C8 thumb_func_end sub_80917C8 thumb_func_start sub_80917EC -sub_80917EC: @ 80917EC +sub_80917EC: ; 80917EC push {r4,lr} ldr r3, =0x0850d998 movs r4, 0x30 @@ -267915,7 +267915,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 @@ -267928,16 +267928,16 @@ sub_809180C: @ 809180C adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x2 - bne _08091838 + bne @08091838 movs r0, 0xE ldrsh r1, [r4, r0] movs r3, 0x12 ldrsh r0, [r4, r3] cmp r1, r0 - bne _08091838 + bne @08091838 movs r0, 0x3 strb r0, [r2] -_08091838: +@08091838: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -267953,7 +267953,7 @@ _08091838: thumb_func_end sub_809180C thumb_func_start sub_8091854 -sub_8091854: @ 8091854 +sub_8091854: ; 8091854 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -267972,7 +267972,7 @@ sub_8091854: @ 8091854 thumb_func_end sub_8091854 thumb_func_start sub_8091878 -sub_8091878: @ 8091878 +sub_8091878: ; 8091878 push {r4,lr} ldr r3, =0x0850d9a8 movs r4, 0x30 @@ -267991,7 +267991,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 @@ -268004,16 +268004,16 @@ sub_8091898: @ 8091898 adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x1 - bne _080918C4 + bne @080918C4 movs r0, 0xE ldrsh r1, [r4, r0] movs r3, 0x12 ldrsh r0, [r4, r3] cmp r1, r0 - bne _080918C4 + bne @080918C4 movs r0, 0x2 strb r0, [r2] -_080918C4: +@080918C4: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -268029,7 +268029,7 @@ _080918C4: thumb_func_end sub_8091898 thumb_func_start sub_80918E0 -sub_80918E0: @ 80918E0 +sub_80918E0: ; 80918E0 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -268048,7 +268048,7 @@ sub_80918E0: @ 80918E0 thumb_func_end sub_80918E0 thumb_func_start sub_8091904 -sub_8091904: @ 8091904 +sub_8091904: ; 8091904 push {r4,lr} ldr r3, =0x0850d9b8 movs r4, 0x30 @@ -268067,7 +268067,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 @@ -268080,16 +268080,16 @@ sub_8091924: @ 8091924 adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x1 - bne _08091950 + bne @08091950 movs r0, 0xC ldrsh r1, [r4, r0] movs r3, 0x10 ldrsh r0, [r4, r3] cmp r1, r0 - bne _08091950 + bne @08091950 movs r0, 0x2 strb r0, [r2] -_08091950: +@08091950: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -268105,7 +268105,7 @@ _08091950: thumb_func_end sub_8091924 thumb_func_start sub_809196C -sub_809196C: @ 809196C +sub_809196C: ; 809196C push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -268124,7 +268124,7 @@ sub_809196C: @ 809196C thumb_func_end sub_809196C thumb_func_start sub_8091990 -sub_8091990: @ 8091990 +sub_8091990: ; 8091990 push {r4,lr} ldr r3, =0x0850d9c8 movs r4, 0x30 @@ -268143,7 +268143,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 @@ -268156,16 +268156,16 @@ sub_80919B0: @ 80919B0 adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x2 - bne _080919DC + bne @080919DC movs r0, 0xC ldrsh r1, [r4, r0] movs r3, 0x10 ldrsh r0, [r4, r3] cmp r1, r0 - bne _080919DC + bne @080919DC movs r0, 0x3 strb r0, [r2] -_080919DC: +@080919DC: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -268181,7 +268181,7 @@ _080919DC: thumb_func_end sub_80919B0 thumb_func_start sub_80919F8 -sub_80919F8: @ 80919F8 +sub_80919F8: ; 80919F8 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -268200,7 +268200,7 @@ sub_80919F8: @ 80919F8 thumb_func_end sub_80919F8 thumb_func_start sub_8091A1C -sub_8091A1C: @ 8091A1C +sub_8091A1C: ; 8091A1C push {r4,lr} ldr r3, =0x0850d9d8 movs r4, 0x30 @@ -268219,7 +268219,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 @@ -268232,16 +268232,16 @@ sub_8091A3C: @ 8091A3C adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x2 - bne _08091A68 + bne @08091A68 movs r0, 0xE ldrsh r1, [r4, r0] movs r3, 0x12 ldrsh r0, [r4, r3] cmp r1, r0 - bne _08091A68 + bne @08091A68 movs r0, 0x3 strb r0, [r2] -_08091A68: +@08091A68: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -268257,7 +268257,7 @@ _08091A68: thumb_func_end sub_8091A3C thumb_func_start sub_8091A84 -sub_8091A84: @ 8091A84 +sub_8091A84: ; 8091A84 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -268276,7 +268276,7 @@ sub_8091A84: @ 8091A84 thumb_func_end sub_8091A84 thumb_func_start sub_8091AA8 -sub_8091AA8: @ 8091AA8 +sub_8091AA8: ; 8091AA8 push {r4,lr} ldr r3, =0x0850d9e8 movs r4, 0x30 @@ -268295,7 +268295,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 @@ -268308,16 +268308,16 @@ sub_8091AC8: @ 8091AC8 adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x2 - bne _08091AF4 + bne @08091AF4 movs r0, 0xE ldrsh r1, [r4, r0] movs r3, 0x12 ldrsh r0, [r4, r3] cmp r1, r0 - bne _08091AF4 + bne @08091AF4 movs r0, 0x3 strb r0, [r2] -_08091AF4: +@08091AF4: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -268333,7 +268333,7 @@ _08091AF4: thumb_func_end sub_8091AC8 thumb_func_start sub_8091B10 -sub_8091B10: @ 8091B10 +sub_8091B10: ; 8091B10 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -268352,7 +268352,7 @@ sub_8091B10: @ 8091B10 thumb_func_end sub_8091B10 thumb_func_start sub_8091B34 -sub_8091B34: @ 8091B34 +sub_8091B34: ; 8091B34 push {r4,lr} ldr r3, =0x0850d9f8 movs r4, 0x30 @@ -268371,7 +268371,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 @@ -268384,16 +268384,16 @@ sub_8091B54: @ 8091B54 adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x2 - bne _08091B80 + bne @08091B80 movs r0, 0xC ldrsh r1, [r4, r0] movs r3, 0x10 ldrsh r0, [r4, r3] cmp r1, r0 - bne _08091B80 + bne @08091B80 movs r0, 0x3 strb r0, [r2] -_08091B80: +@08091B80: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -268409,7 +268409,7 @@ _08091B80: thumb_func_end sub_8091B54 thumb_func_start sub_8091B9C -sub_8091B9C: @ 8091B9C +sub_8091B9C: ; 8091B9C push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -268428,7 +268428,7 @@ sub_8091B9C: @ 8091B9C thumb_func_end sub_8091B9C thumb_func_start sub_8091BC0 -sub_8091BC0: @ 8091BC0 +sub_8091BC0: ; 8091BC0 push {r4,lr} ldr r3, =0x0850da08 movs r4, 0x30 @@ -268447,7 +268447,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 @@ -268460,16 +268460,16 @@ sub_8091BE0: @ 8091BE0 adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x2 - bne _08091C0C + bne @08091C0C movs r0, 0xC ldrsh r1, [r4, r0] movs r3, 0x10 ldrsh r0, [r4, r3] cmp r1, r0 - bne _08091C0C + bne @08091C0C movs r0, 0x3 strb r0, [r2] -_08091C0C: +@08091C0C: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -268485,7 +268485,7 @@ _08091C0C: thumb_func_end sub_8091BE0 thumb_func_start sub_8091C28 -sub_8091C28: @ 8091C28 +sub_8091C28: ; 8091C28 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -268504,7 +268504,7 @@ sub_8091C28: @ 8091C28 thumb_func_end sub_8091C28 thumb_func_start sub_8091C4C -sub_8091C4C: @ 8091C4C +sub_8091C4C: ; 8091C4C push {r4,lr} ldr r3, =0x0850da18 movs r4, 0x30 @@ -268523,7 +268523,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 @@ -268536,16 +268536,16 @@ sub_8091C6C: @ 8091C6C adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x2 - bne _08091C98 + bne @08091C98 movs r0, 0xE ldrsh r1, [r4, r0] movs r3, 0x12 ldrsh r0, [r4, r3] cmp r1, r0 - bne _08091C98 + bne @08091C98 movs r0, 0x3 strb r0, [r2] -_08091C98: +@08091C98: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -268561,7 +268561,7 @@ _08091C98: thumb_func_end sub_8091C6C thumb_func_start sub_8091CB4 -sub_8091CB4: @ 8091CB4 +sub_8091CB4: ; 8091CB4 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -268580,7 +268580,7 @@ sub_8091CB4: @ 8091CB4 thumb_func_end sub_8091CB4 thumb_func_start sub_8091CD8 -sub_8091CD8: @ 8091CD8 +sub_8091CD8: ; 8091CD8 push {r4,lr} ldr r3, =0x0850da28 movs r4, 0x30 @@ -268599,7 +268599,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 @@ -268612,16 +268612,16 @@ sub_8091CF8: @ 8091CF8 adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x2 - bne _08091D24 + bne @08091D24 movs r0, 0xE ldrsh r1, [r4, r0] movs r3, 0x12 ldrsh r0, [r4, r3] cmp r1, r0 - bne _08091D24 + bne @08091D24 movs r0, 0x3 strb r0, [r2] -_08091D24: +@08091D24: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -268637,7 +268637,7 @@ _08091D24: thumb_func_end sub_8091CF8 thumb_func_start sub_8091D40 -sub_8091D40: @ 8091D40 +sub_8091D40: ; 8091D40 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -268656,7 +268656,7 @@ sub_8091D40: @ 8091D40 thumb_func_end sub_8091D40 thumb_func_start sub_8091D64 -sub_8091D64: @ 8091D64 +sub_8091D64: ; 8091D64 push {r4,lr} ldr r3, =0x0850da38 movs r4, 0x30 @@ -268675,7 +268675,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 @@ -268688,16 +268688,16 @@ sub_8091D84: @ 8091D84 adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x2 - bne _08091DB0 + bne @08091DB0 movs r0, 0xC ldrsh r1, [r4, r0] movs r3, 0x10 ldrsh r0, [r4, r3] cmp r1, r0 - bne _08091DB0 + bne @08091DB0 movs r0, 0x3 strb r0, [r2] -_08091DB0: +@08091DB0: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -268713,7 +268713,7 @@ _08091DB0: thumb_func_end sub_8091D84 thumb_func_start sub_8091DCC -sub_8091DCC: @ 8091DCC +sub_8091DCC: ; 8091DCC push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -268732,7 +268732,7 @@ sub_8091DCC: @ 8091DCC thumb_func_end sub_8091DCC thumb_func_start sub_8091DF0 -sub_8091DF0: @ 8091DF0 +sub_8091DF0: ; 8091DF0 push {r4,lr} ldr r3, =0x0850da48 movs r4, 0x30 @@ -268751,7 +268751,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 @@ -268764,16 +268764,16 @@ sub_8091E10: @ 8091E10 adds r2, 0x21 ldrb r0, [r2] cmp r0, 0x2 - bne _08091E3C + bne @08091E3C movs r0, 0xC ldrsh r1, [r4, r0] movs r3, 0x10 ldrsh r0, [r4, r3] cmp r1, r0 - bne _08091E3C + bne @08091E3C movs r0, 0x3 strb r0, [r2] -_08091E3C: +@08091E3C: adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -268789,7 +268789,7 @@ _08091E3C: thumb_func_end sub_8091E10 thumb_func_start sub_8091E58 -sub_8091E58: @ 8091E58 +sub_8091E58: ; 8091E58 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -268808,7 +268808,7 @@ sub_8091E58: @ 8091E58 thumb_func_end sub_8091E58 thumb_func_start sub_8091E7C -sub_8091E7C: @ 8091E7C +sub_8091E7C: ; 8091E7C push {r4,lr} ldr r3, =0x0850da58 movs r4, 0x30 @@ -268827,7 +268827,7 @@ sub_8091E7C: @ 8091E7C thumb_func_end sub_8091E7C thumb_func_start mss_npc_reset_oampriv3_1_unk2_unk3 -mss_npc_reset_oampriv3_1_unk2_unk3: @ 8091E9C +mss_npc_reset_oampriv3_1_unk2_unk3: ; 8091E9C push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -268835,10 +268835,10 @@ mss_npc_reset_oampriv3_1_unk2_unk3: @ 8091E9C adds r4, 0x21 ldrb r0, [r4] cmp r0, 0 - bne _08091EB4 + bne @08091EB4 bl player_get_direction__sp1AA strb r0, [r4] -_08091EB4: +@08091EB4: movs r0, 0x1 strh r0, [r5, 0x30] pop {r4,r5} @@ -268847,7 +268847,7 @@ _08091EB4: thumb_func_end mss_npc_reset_oampriv3_1_unk2_unk3 thumb_func_start sub_8091EC0 -sub_8091EC0: @ 8091EC0 +sub_8091EC0: ; 8091EC0 push {r4-r7,lr} adds r6, r0, 0 adds r7, r1, 0 @@ -268860,16 +268860,16 @@ sub_8091EC0: @ 8091EC0 adds r0, r2 ldrb r0, [r0, 0x1C] cmp r0, 0xFF - beq _08091EE0 + beq @08091EE0 ldrb r0, [r3, 0x3] cmp r0, 0x2 - bne _08091EEC -_08091EE0: + bne @08091EEC +@08091EE0: movs r0, 0 - b _08091F14 + b @08091F14 .align 2, 0 .pool -_08091EEC: +@08091EEC: ldr r5, =0x0850da64 bl player_get_x22 adds r4, r0, 0 @@ -268887,7 +268887,7 @@ _08091EEC: bl _call_via_r4 lsls r0, 24 lsrs r0, 24 -_08091F14: +@08091F14: pop {r4-r7} pop {r1} bx r1 @@ -268896,14 +268896,14 @@ _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 bl npc_obj_exec_an lsls r0, 24 cmp r0, 0 - beq _08091F3E + beq @08091F3E ldrb r0, [r4] movs r1, 0x3 negs r1, r1 @@ -268911,7 +268911,7 @@ sub_8091F20: @ 8091F20 strb r1, [r4] movs r0, 0x1 strh r0, [r5, 0x30] -_08091F3E: +@08091F3E: movs r0, 0 pop {r4,r5} pop {r1} @@ -268919,13 +268919,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 @@ -268961,7 +268961,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} @@ -268975,11 +268975,11 @@ sub_8091F94: @ 8091F94 bl sub_81D49E8 lsls r0, 24 cmp r0, 0 - beq _08091FFC + beq @08091FFC bl sub_81D427C adds r5, r0, 0 cmp r5, 0 - bne _08092012 + bne @08092012 adds r5, r6, 0 ldr r1, =0x085055cd ldrb r0, [r4, 0x6] @@ -269005,10 +269005,10 @@ sub_8091F94: @ 8091F94 adds r0, r4, 0 adds r1, r7, 0 bl npc_set_state_and_pq_record - b _08092084 + b @08092084 .align 2, 0 .pool -_08091FFC: +@08091FFC: ldr r1, =0x085055cd ldrb r0, [r4, 0x6] adds r0, r1 @@ -269019,7 +269019,7 @@ _08091FFC: adds r2, r5, 0 bl state_to_direction adds r5, r0, 0 -_08092012: +@08092012: mov r6, sp adds r6, 0x2 adds r0, r4, 0 @@ -269045,10 +269045,10 @@ _08092012: bl npc_block_way lsls r0, 24 cmp r0, 0 - bne _08092070 + bne @08092070 mov r1, r8 cmp r1, 0 - beq _08092084 + beq @08092084 mov r0, sp movs r2, 0 ldrsh r0, [r0, r2] @@ -269060,8 +269060,8 @@ _08092012: bl _call_via_r8 lsls r0, 24 cmp r0, 0 - bne _08092084 -_08092070: + bne @08092084 +@08092070: adds r0, r5, 0 bl d2s_look1 adds r2, r0, 0 @@ -269070,7 +269070,7 @@ _08092070: adds r0, r4, 0 adds r1, r7, 0 bl npc_set_state_and_pq_record -_08092084: +@08092084: ldrb r0, [r4] movs r1, 0x2 orrs r0, r1 @@ -269089,7 +269089,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} @@ -269134,10 +269134,10 @@ sub_80920A4: @ 80920A4 bl npc_block_way lsls r0, 24 cmp r0, 0 - bne _0809212A + bne @0809212A mov r1, r8 cmp r1, 0 - beq _0809213E + beq @0809213E mov r0, sp movs r2, 0 ldrsh r0, [r0, r2] @@ -269149,8 +269149,8 @@ sub_80920A4: @ 80920A4 bl _call_via_r8 lsls r0, 24 cmp r0, 0 - bne _0809213E -_0809212A: + bne @0809213E +@0809212A: adds r0, r6, 0 bl d2s_look1 adds r2, r0, 0 @@ -269159,7 +269159,7 @@ _0809212A: adds r0, r4, 0 adds r1, r7, 0 bl npc_set_state_and_pq_record -_0809213E: +@0809213E: ldrb r0, [r4] movs r1, 0x2 orrs r0, r1 @@ -269178,7 +269178,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} @@ -269223,10 +269223,10 @@ sub_809215C: @ 809215C bl npc_block_way lsls r0, 24 cmp r0, 0 - bne _080921E2 + bne @080921E2 mov r1, r8 cmp r1, 0 - beq _080921F6 + beq @080921F6 mov r0, sp movs r2, 0 ldrsh r0, [r0, r2] @@ -269238,8 +269238,8 @@ sub_809215C: @ 809215C bl _call_via_r8 lsls r0, 24 cmp r0, 0 - bne _080921F6 -_080921E2: + bne @080921F6 +@080921E2: adds r0, r6, 0 bl d2s_look1 adds r2, r0, 0 @@ -269248,7 +269248,7 @@ _080921E2: adds r0, r4, 0 adds r1, r7, 0 bl npc_set_state_and_pq_record -_080921F6: +@080921F6: ldrb r0, [r4] movs r1, 0x2 orrs r0, r1 @@ -269267,7 +269267,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} @@ -269312,10 +269312,10 @@ sub_8092214: @ 8092214 bl npc_block_way lsls r0, 24 cmp r0, 0 - bne _0809229A + bne @0809229A mov r1, r8 cmp r1, 0 - beq _080922AE + beq @080922AE mov r0, sp movs r2, 0 ldrsh r0, [r0, r2] @@ -269327,8 +269327,8 @@ sub_8092214: @ 8092214 bl _call_via_r8 lsls r0, 24 cmp r0, 0 - bne _080922AE -_0809229A: + bne @080922AE +@0809229A: adds r0, r6, 0 bl d2s_look1 adds r2, r0, 0 @@ -269337,7 +269337,7 @@ _0809229A: adds r0, r4, 0 adds r1, r7, 0 bl npc_set_state_and_pq_record -_080922AE: +@080922AE: ldrb r0, [r4] movs r1, 0x2 orrs r0, r1 @@ -269356,7 +269356,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 @@ -269392,7 +269392,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} @@ -269437,10 +269437,10 @@ sub_8092314: @ 8092314 bl npc_block_way lsls r0, 24 cmp r0, 0 - bne _0809239A + bne @0809239A mov r1, r8 cmp r1, 0 - beq _080923AE + beq @080923AE mov r0, sp movs r2, 0 ldrsh r0, [r0, r2] @@ -269452,8 +269452,8 @@ sub_8092314: @ 8092314 bl _call_via_r8 lsls r0, 24 cmp r0, 0 - bne _080923AE -_0809239A: + bne @080923AE +@0809239A: adds r0, r6, 0 bl d2s_look1 adds r2, r0, 0 @@ -269462,7 +269462,7 @@ _0809239A: adds r0, r4, 0 adds r1, r7, 0 bl npc_set_state_and_pq_record -_080923AE: +@080923AE: ldrb r0, [r4] movs r1, 0x2 orrs r0, r1 @@ -269481,7 +269481,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} @@ -269533,10 +269533,10 @@ oac_hopping: @ 80923CC bl npc_block_way lsls r0, 24 cmp r0, 0 - bne _08092460 + bne @08092460 mov r1, r8 cmp r1, 0 - beq _08092474 + beq @08092474 add r0, sp, 0x4 movs r2, 0 ldrsh r0, [r0, r2] @@ -269548,8 +269548,8 @@ oac_hopping: @ 80923CC bl _call_via_r8 lsls r0, 24 cmp r0, 0 - bne _08092474 -_08092460: + bne @08092474 +@08092460: adds r0, r6, 0 bl d2s_look1 adds r2, r0, 0 @@ -269558,7 +269558,7 @@ _08092460: adds r0, r4, 0 adds r1, r7, 0 bl npc_set_state_and_pq_record -_08092474: +@08092474: ldrb r0, [r4] movs r1, 0x2 orrs r0, r1 @@ -269577,7 +269577,7 @@ _08092474: thumb_func_end oac_hopping thumb_func_start sub_8092494 -sub_8092494: @ 8092494 +sub_8092494: ; 8092494 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -269596,7 +269596,7 @@ sub_8092494: @ 8092494 thumb_func_end sub_8092494 thumb_func_start sub_80924B8 -sub_80924B8: @ 80924B8 +sub_80924B8: ; 80924B8 push {r4,lr} ldr r3, =0x0850da90 movs r4, 0x30 @@ -269615,7 +269615,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 @@ -269628,16 +269628,16 @@ mss_08062EA4: @ 80924D8 adds r0, r2 ldrb r0, [r0, 0x1C] cmp r0, 0xFF - beq _080924F8 + beq @080924F8 ldrb r0, [r3, 0x3] cmp r0, 0x2 - bne _08092504 -_080924F8: + bne @08092504 +@080924F8: movs r0, 0 - b _0809252C + b @0809252C .align 2, 0 .pool -_08092504: +@08092504: ldr r5, =0x0850da64 bl player_get_x22 adds r4, r0, 0 @@ -269655,7 +269655,7 @@ _08092504: bl _call_via_r4 lsls r0, 24 lsrs r0, 24 -_0809252C: +@0809252C: pop {r4-r7} pop {r1} bx r1 @@ -269664,7 +269664,7 @@ _0809252C: thumb_func_end mss_08062EA4 thumb_func_start sub_809253C -sub_809253C: @ 809253C +sub_809253C: ; 809253C push {r4-r6,lr} adds r5, r0, 0 movs r1, 0x2E @@ -269678,14 +269678,14 @@ sub_809253C: @ 809253C adds r6, 0x21 ldrb r0, [r6] cmp r0, 0 - beq _08092564 + beq @08092564 cmp r0, 0x1 - bne _08092584 + bne @08092584 movs r1, 0x3C ldrsh r0, [r5, r1] cmp r0, 0 - bne _08092584 -_08092564: + bne @08092584 +@08092564: ldr r1, =0x02038c08 adds r2, r1, 0x4 adds r3, r1, 0 @@ -269700,7 +269700,7 @@ _08092564: ldrh r0, [r5, 0x3C] adds r0, 0x1 strh r0, [r5, 0x3C] -_08092584: +@08092584: movs r0, 0x2E ldrsh r1, [r5, r0] lsls r0, r1, 3 @@ -269719,7 +269719,7 @@ _08092584: thumb_func_end sub_809253C thumb_func_start sub_80925AC -sub_80925AC: @ 80925AC +sub_80925AC: ; 80925AC push {lr} bl npc_reset movs r0, 0 @@ -269728,7 +269728,7 @@ sub_80925AC: @ 80925AC thumb_func_end sub_80925AC thumb_func_start sub_80925B8 -sub_80925B8: @ 80925B8 +sub_80925B8: ; 80925B8 push {r4-r6,lr} adds r5, r0, 0 movs r1, 0x2E @@ -269742,14 +269742,14 @@ sub_80925B8: @ 80925B8 adds r6, 0x21 ldrb r0, [r6] cmp r0, 0 - beq _080925E0 + beq @080925E0 cmp r0, 0x1 - bne _08092600 + bne @08092600 movs r1, 0x3C ldrsh r0, [r5, r1] cmp r0, 0 - bne _08092600 -_080925E0: + bne @08092600 +@080925E0: ldr r1, =0x02038c08 adds r2, r1, 0x4 adds r3, r1, 0 @@ -269764,7 +269764,7 @@ _080925E0: ldrh r0, [r5, 0x3C] adds r0, 0x1 strh r0, [r5, 0x3C] -_08092600: +@08092600: movs r0, 0x2E ldrsh r1, [r5, r0] lsls r0, r1, 3 @@ -269783,14 +269783,14 @@ _08092600: thumb_func_end sub_80925B8 thumb_func_start sub_8092628 -sub_8092628: @ 8092628 +sub_8092628: ; 8092628 push {r4,lr} adds r3, r0, 0 movs r1, 0x3C ldrsh r0, [r3, r1] ldr r4, =0x02037350 cmp r0, 0 - bne _08092668 + bne @08092668 movs r0, 0x2E ldrsh r1, [r3, r0] lsls r0, r1, 3 @@ -269816,7 +269816,7 @@ sub_8092628: @ 8092628 ldrh r0, [r3, 0x3C] adds r0, 0x1 strh r0, [r3, 0x3C] -_08092668: +@08092668: movs r0, 0x2E ldrsh r1, [r3, r0] lsls r0, r1, 3 @@ -269834,7 +269834,7 @@ _08092668: thumb_func_end sub_8092628 thumb_func_start sub_809268C -sub_809268C: @ 809268C +sub_809268C: ; 809268C push {r4,lr} ldr r3, =0x0850da9c movs r4, 0x30 @@ -269853,7 +269853,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 @@ -269862,16 +269862,16 @@ sub_80926AC: @ 80926AC thumb_func_end sub_80926AC thumb_func_start sub_80926B8 -sub_80926B8: @ 80926B8 +sub_80926B8: ; 80926B8 push {r4,lr} adds r4, r1, 0 bl npc_obj_exec_an lsls r0, 24 cmp r0, 0 - beq _080926CA + beq @080926CA movs r0, 0 strh r0, [r4, 0x30] -_080926CA: +@080926CA: movs r0, 0 pop {r4} pop {r1} @@ -269879,7 +269879,7 @@ _080926CA: thumb_func_end sub_80926B8 thumb_func_start sub_80926D4 -sub_80926D4: @ 80926D4 +sub_80926D4: ; 80926D4 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -269898,7 +269898,7 @@ sub_80926D4: @ 80926D4 thumb_func_end sub_80926D4 thumb_func_start sub_80926F8 -sub_80926F8: @ 80926F8 +sub_80926F8: ; 80926F8 push {r4,lr} ldr r3, =0x0850daa0 movs r4, 0x30 @@ -269917,7 +269917,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 @@ -269940,7 +269940,7 @@ sub_8092718: @ 8092718 thumb_func_end sub_8092718 thumb_func_start sub_8092744 -sub_8092744: @ 8092744 +sub_8092744: ; 8092744 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -269959,7 +269959,7 @@ sub_8092744: @ 8092744 thumb_func_end sub_8092744 thumb_func_start sub_8092768 -sub_8092768: @ 8092768 +sub_8092768: ; 8092768 push {r4,lr} ldr r3, =0x0850daa8 movs r4, 0x30 @@ -269978,7 +269978,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 @@ -270001,7 +270001,7 @@ sub_8092788: @ 8092788 thumb_func_end sub_8092788 thumb_func_start sub_80927B4 -sub_80927B4: @ 80927B4 +sub_80927B4: ; 80927B4 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -270020,7 +270020,7 @@ sub_80927B4: @ 80927B4 thumb_func_end sub_80927B4 thumb_func_start sub_80927D8 -sub_80927D8: @ 80927D8 +sub_80927D8: ; 80927D8 push {r4,lr} ldr r3, =0x0850dab0 movs r4, 0x30 @@ -270039,7 +270039,7 @@ sub_80927D8: @ 80927D8 thumb_func_end sub_80927D8 thumb_func_start sub_80927F8 -sub_80927F8: @ 80927F8 +sub_80927F8: ; 80927F8 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -270062,7 +270062,7 @@ sub_80927F8: @ 80927F8 thumb_func_end sub_80927F8 thumb_func_start sub_8092824 -sub_8092824: @ 8092824 +sub_8092824: ; 8092824 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -270081,7 +270081,7 @@ sub_8092824: @ 8092824 thumb_func_end sub_8092824 thumb_func_start sub_8092848 -sub_8092848: @ 8092848 +sub_8092848: ; 8092848 push {r4,lr} ldr r3, =0x0850dab8 movs r4, 0x30 @@ -270100,7 +270100,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 @@ -270123,7 +270123,7 @@ sub_8092868: @ 8092868 thumb_func_end sub_8092868 thumb_func_start sub_8092894 -sub_8092894: @ 8092894 +sub_8092894: ; 8092894 push {lr} adds r1, r0, 0 movs r0, 0x2E @@ -270142,7 +270142,7 @@ sub_8092894: @ 8092894 thumb_func_end sub_8092894 thumb_func_start sub_80928B8 -sub_80928B8: @ 80928B8 +sub_80928B8: ; 80928B8 push {r4,lr} ldr r3, =0x0850dac0 movs r4, 0x30 @@ -270161,7 +270161,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 @@ -270188,27 +270188,27 @@ 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 npc_obj_exec_an lsls r0, 24 cmp r0, 0 - bne _0809291E + bne @0809291E movs r0, 0 - b _08092924 -_0809291E: + b @08092924 +@0809291E: movs r0, 0x2 strh r0, [r4, 0x30] movs r0, 0x1 -_08092924: +@08092924: pop {r4} pop {r1} bx r1 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 @@ -270219,7 +270219,7 @@ sub_809292C: @ 809292C thumb_func_end sub_809292C thumb_func_start npc_reset -npc_reset: @ 809293C +npc_reset: ; 809293C ldrb r3, [r0] movs r2, 0x3 negs r2, r2 @@ -270238,7 +270238,7 @@ npc_reset: @ 809293C thumb_func_end npc_reset thumb_func_start npc_direction_to_obj_anim_image_number -npc_direction_to_obj_anim_image_number: @ 809295C +npc_direction_to_obj_anim_image_number: ; 809295C lsls r0, 24 lsrs r0, 24 ldr r1, =0x0850dacc @@ -270250,7 +270250,7 @@ npc_direction_to_obj_anim_image_number: @ 809295C thumb_func_end npc_direction_to_obj_anim_image_number thumb_func_start an_run_any__impl_pulse -an_run_any__impl_pulse: @ 809296C +an_run_any__impl_pulse: ; 809296C lsls r0, 24 lsrs r0, 24 ldr r1, =0x0850dad5 @@ -270262,7 +270262,7 @@ an_run_any__impl_pulse: @ 809296C thumb_func_end an_run_any__impl_pulse thumb_func_start sub_809297C -sub_809297C: @ 809297C +sub_809297C: ; 809297C lsls r0, 24 lsrs r0, 24 ldr r1, =0x0850dade @@ -270274,7 +270274,7 @@ sub_809297C: @ 809297C thumb_func_end sub_809297C thumb_func_start sub_809298C -sub_809298C: @ 809298C +sub_809298C: ; 809298C lsls r0, 24 lsrs r0, 24 ldr r1, =0x0850dae7 @@ -270286,7 +270286,7 @@ sub_809298C: @ 809298C thumb_func_end sub_809298C thumb_func_start sub_809299C -sub_809299C: @ 809299C +sub_809299C: ; 809299C lsls r0, 24 lsrs r0, 24 ldr r1, =0x0850daf0 @@ -270298,7 +270298,7 @@ sub_809299C: @ 809299C thumb_func_end sub_809299C thumb_func_start sub_80929AC -sub_80929AC: @ 80929AC +sub_80929AC: ; 80929AC lsls r0, 24 lsrs r0, 24 ldr r1, =0x0850daf9 @@ -270310,7 +270310,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, =0x0850db02 @@ -270322,7 +270322,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, =0x0850db0b @@ -270334,7 +270334,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, =0x0850db14 @@ -270346,7 +270346,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, =0x0850db1d @@ -270358,7 +270358,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, =0x0850db26 @@ -270370,7 +270370,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, =0x0850db2f @@ -270382,7 +270382,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, =0x0850db38 @@ -270394,7 +270394,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, =0x0850db41 @@ -270406,7 +270406,7 @@ sub_8092A2C: @ 8092A2C thumb_func_end sub_8092A2C thumb_func_start sub_8092A3C -sub_8092A3C: @ 8092A3C +sub_8092A3C: ; 8092A3C lsls r0, 24 lsrs r0, 24 ldr r1, =0x0850db4a @@ -270418,33 +270418,33 @@ sub_8092A3C: @ 8092A3C thumb_func_end sub_8092A3C thumb_func_start sub_8092A4C -sub_8092A4C: @ 8092A4C +sub_8092A4C: ; 8092A4C push {lr} adds r2, r0, 0 ldr r1, =0x085094ac - b _08092A64 + b @08092A64 .align 2, 0 .pool -_08092A58: +@08092A58: ldr r0, [r1] cmp r0, r2 - bne _08092A62 + bne @08092A62 adds r0, r1, 0 - b _08092A6C -_08092A62: + b @08092A6C +@08092A62: adds r1, 0x8 -_08092A64: +@08092A64: ldr r0, [r1] cmp r0, 0 - bne _08092A58 + bne @08092A58 movs r0, 0 -_08092A6C: +@08092A6C: pop {r1} bx r1 thumb_func_end sub_8092A4C thumb_func_start npc_apply_anim_looping -npc_apply_anim_looping: @ 8092A70 +npc_apply_anim_looping: ; 8092A70 push {r4,lr} adds r4, r1, 0 lsls r2, 24 @@ -270452,7 +270452,7 @@ npc_apply_anim_looping: @ 8092A70 ldrb r0, [r0, 0x1] lsls r0, 27 cmp r0, 0 - blt _08092AB2 + blt @08092AB2 adds r0, r4, 0 adds r0, 0x2A strb r2, [r0] @@ -270461,32 +270461,32 @@ npc_apply_anim_looping: @ 8092A70 adds r1, r4, 0 adds r1, 0x2B cmp r0, 0 - beq _08092AAA + beq @08092AAA ldrb r2, [r1] ldrb r3, [r0, 0x4] cmp r2, r3 - bne _08092AA0 + bne @08092AA0 ldrb r0, [r0, 0x7] - b _08092AA8 -_08092AA0: + b @08092AA8 +@08092AA0: ldrb r3, [r0, 0x5] cmp r2, r3 - bne _08092AAA + bne @08092AAA ldrb r0, [r0, 0x6] -_08092AA8: +@08092AA8: strb r0, [r1] -_08092AAA: +@08092AAA: ldrb r1, [r1] adds r0, r4, 0 bl obj_anim_image_seek -_08092AB2: +@08092AB2: pop {r4} pop {r0} bx r0 thumb_func_end npc_apply_anim_looping thumb_func_start obj_npc_animation_step -obj_npc_animation_step: @ 8092AB8 +obj_npc_animation_step: ; 8092AB8 push {r4,lr} adds r4, r1, 0 lsls r2, 24 @@ -270494,7 +270494,7 @@ obj_npc_animation_step: @ 8092AB8 ldrb r0, [r0, 0x1] lsls r0, 27 cmp r0, 0 - blt _08092AF0 + blt @08092AF0 adds r0, r4, 0 adds r0, 0x2A strb r2, [r0] @@ -270502,26 +270502,26 @@ obj_npc_animation_step: @ 8092AB8 bl sub_8092A4C adds r2, r0, 0 cmp r2, 0 - beq _08092AF0 + beq @08092AF0 ldrb r1, [r2, 0x5] adds r0, r4, 0 adds r0, 0x2B ldrb r0, [r0] ldrb r3, [r2, 0x4] cmp r0, r3 - bhi _08092AEA + bhi @08092AEA ldrb r1, [r2, 0x4] -_08092AEA: +@08092AEA: adds r0, r4, 0 bl obj_anim_image_seek -_08092AF0: +@08092AF0: pop {r4} pop {r0} bx r0 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 @@ -270532,30 +270532,30 @@ sub_8092AF8: @ 8092AF8 lsls r2, 16 asrs r2, 16 cmp r0, r2 - ble _08092B12 + ble @08092B12 movs r0, 0x3 - b _08092B28 -_08092B12: + b @08092B28 +@08092B12: cmp r0, r2 - bge _08092B1A + bge @08092B1A movs r0, 0x4 - b _08092B28 -_08092B1A: + b @08092B28 +@08092B1A: lsls r1, 16 lsls r0, r3, 16 cmp r1, r0 - bgt _08092B26 + bgt @08092B26 movs r0, 0x1 - b _08092B28 -_08092B26: + b @08092B28 +@08092B26: movs r0, 0x2 -_08092B28: +@08092B28: pop {r1} bx r1 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 @@ -270595,7 +270595,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, =0x0850db53 @@ -270607,7 +270607,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 @@ -270641,7 +270641,7 @@ sub_8092B88: @ 8092B88 thumb_func_end sub_8092B88 thumb_func_start npc_block_way -npc_block_way: @ 8092BC8 +npc_block_way: ; 8092BC8 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -270665,23 +270665,23 @@ npc_block_way: @ 8092BC8 bl npc_is_outside_of_rectangle_or_map lsls r0, 24 cmp r0, 0 - beq _08092BFE + beq @08092BFE movs r0, 0x1 - b _08092C7E -_08092BFE: + b @08092C7E +@08092BFE: adds r0, r5, 0 adds r1, r4, 0 bl cur_mapdata_get_middle2bit_at lsls r0, 24 cmp r0, 0 - bne _08092C40 + bne @08092C40 adds r0, r5, 0 adds r1, r4, 0 bl mapborder_visible_from_position movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _08092C40 + beq @08092C40 adds r0, r6, 0 adds r1, r5, 0 adds r2, r4, 0 @@ -270689,19 +270689,19 @@ _08092BFE: bl tile_x30_to_x37_related lsls r0, 24 cmp r0, 0 - bne _08092C40 + bne @08092C40 ldrb r0, [r6, 0x1] lsrs r0, 7 cmp r0, 0 - beq _08092C44 + beq @08092C44 mov r0, r8 bl sub_80887B0 cmp r0, 0 - bne _08092C44 -_08092C40: + bne @08092C44 +@08092C40: movs r0, 0x2 - b _08092C7E -_08092C44: + b @08092C7E +@08092C44: ldrb r0, [r6, 0xB] lsls r0, 28 lsrs r0, 28 @@ -270716,22 +270716,22 @@ _08092C44: bl cur_mapdata_height_mismatch lsls r0, 24 cmp r0, 0 - beq _08092C68 + beq @08092C68 movs r0, 0x3 - b _08092C7E -_08092C68: + b @08092C7E +@08092C68: adds r0, r6, 0 adds r1, r5, 0 adds r2, r4, 0 bl is_there_a_npc_to_interact_with lsls r0, 24 cmp r0, 0 - bne _08092C7C + bne @08092C7C movs r0, 0 - b _08092C7E -_08092C7C: + b @08092C7E +@08092C7C: movs r0, 0x4 -_08092C7E: +@08092C7E: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -270742,7 +270742,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 @@ -270774,14 +270774,14 @@ sub_8092C8C: @ 8092C8C bl cur_mapdata_get_middle2bit_at lsls r0, 24 cmp r0, 0 - bne _08092D04 + bne @08092D04 adds r0, r6, 0 adds r1, r5, 0 bl mapborder_visible_from_position movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _08092D04 + beq @08092D04 adds r0, r7, 0 adds r1, r6, 0 adds r2, r5, 0 @@ -270789,19 +270789,19 @@ sub_8092C8C: @ 8092C8C bl tile_x30_to_x37_related lsls r0, 24 cmp r0, 0 - bne _08092D04 + bne @08092D04 ldrb r0, [r7, 0x1] lsrs r0, 7 cmp r0, 0 - beq _08092D08 + beq @08092D08 mov r0, r8 bl sub_80887B0 cmp r0, 0 - bne _08092D08 -_08092D04: + bne @08092D08 +@08092D04: movs r0, 0x2 orrs r4, r0 -_08092D08: +@08092D08: ldrb r0, [r7, 0xB] lsls r0, 28 lsrs r0, 28 @@ -270816,24 +270816,24 @@ _08092D08: bl cur_mapdata_height_mismatch lsls r0, 24 cmp r0, 0 - beq _08092D30 + beq @08092D30 movs r0, 0x4 orrs r4, r0 lsls r0, r4, 24 lsrs r4, r0, 24 -_08092D30: +@08092D30: adds r0, r7, 0 adds r1, r6, 0 adds r2, r5, 0 bl is_there_a_npc_to_interact_with lsls r0, 24 cmp r0, 0 - beq _08092D48 + beq @08092D48 movs r0, 0x8 orrs r4, r0 lsls r0, r4, 24 lsrs r4, r0, 24 -_08092D48: +@08092D48: adds r0, r4, 0 pop {r3-r5} mov r8, r3 @@ -270845,7 +270845,7 @@ _08092D48: thumb_func_end sub_8092C8C thumb_func_start npc_is_outside_of_rectangle_or_map -npc_is_outside_of_rectangle_or_map: @ 8092D58 +npc_is_outside_of_rectangle_or_map: ; 8092D58 push {r4,r5,lr} adds r4, r0, 0 lsls r1, 16 @@ -270856,7 +270856,7 @@ npc_is_outside_of_rectangle_or_map: @ 8092D58 movs r0, 0xF ands r0, r1 cmp r0, 0 - beq _08092D90 + beq @08092D90 lsls r1, 28 lsrs r2, r1, 28 ldrh r0, [r4, 0xC] @@ -270869,17 +270869,17 @@ npc_is_outside_of_rectangle_or_map: @ 8092D58 lsls r0, r3, 16 asrs r3, r0, 16 cmp r2, r0 - bgt _08092DBC + bgt @08092DBC lsls r0, r1, 16 asrs r0, 16 cmp r0, r3 - blt _08092DBC -_08092D90: + blt @08092DBC +@08092D90: ldrb r1, [r4, 0x19] movs r0, 0xF0 ands r0, r1 cmp r0, 0 - beq _08092DC0 + beq @08092DC0 lsls r1, 24 lsrs r2, r1, 28 ldrh r0, [r4, 0xE] @@ -270892,24 +270892,24 @@ _08092D90: lsls r0, r5, 16 asrs r3, r0, 16 cmp r2, r0 - bgt _08092DBC + bgt @08092DBC lsls r0, r1, 16 asrs r0, 16 cmp r0, r3 - bge _08092DC0 -_08092DBC: + bge @08092DC0 +@08092DBC: movs r0, 0x1 - b _08092DC2 -_08092DC0: + b @08092DC2 +@08092DC0: movs r0, 0 -_08092DC2: +@08092DC2: pop {r4,r5} pop {r1} bx r1 thumb_func_end npc_is_outside_of_rectangle_or_map thumb_func_start tile_x30_to_x37_related -tile_x30_to_x37_related: @ 8092DC8 +tile_x30_to_x37_related: ; 8092DC8 push {r4-r7,lr} lsls r1, 16 lsrs r6, r1, 16 @@ -270925,7 +270925,7 @@ tile_x30_to_x37_related: @ 8092DC8 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _08092E0A + bne @08092E0A ldr r4, =0x0850db6c adds r4, r5, r4 lsls r0, r6, 16 @@ -270939,22 +270939,22 @@ tile_x30_to_x37_related: @ 8092DC8 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - beq _08092E18 -_08092E0A: + beq @08092E18 +@08092E0A: movs r0, 0x1 - b _08092E1A + b @08092E1A .align 2, 0 .pool -_08092E18: +@08092E18: movs r0, 0 -_08092E1A: +@08092E1A: pop {r4-r7} pop {r1} bx r1 thumb_func_end tile_x30_to_x37_related thumb_func_start is_there_a_npc_to_interact_with -is_there_a_npc_to_interact_with: @ 8092E20 +is_there_a_npc_to_interact_with: ; 8092E20 push {r4-r7,lr} adds r6, r0, 0 lsls r1, 16 @@ -270962,7 +270962,7 @@ is_there_a_npc_to_interact_with: @ 8092E20 movs r4, 0 lsls r2, 16 asrs r5, r2, 16 -_08092E2E: +@08092E2E: lsls r0, r4, 3 adds r0, r4 lsls r0, 2 @@ -270971,29 +270971,29 @@ _08092E2E: ldrb r0, [r2] lsls r0, 31 cmp r0, 0 - beq _08092E88 + beq @08092E88 cmp r2, r6 - beq _08092E88 + beq @08092E88 movs r0, 0x10 ldrsh r1, [r2, r0] lsls r0, r7, 16 asrs r3, r0, 16 cmp r1, r3 - bne _08092E58 + bne @08092E58 movs r1, 0x12 ldrsh r0, [r2, r1] cmp r0, r5 - beq _08092E68 -_08092E58: + beq @08092E68 +@08092E58: movs r1, 0x14 ldrsh r0, [r2, r1] cmp r0, r3 - bne _08092E88 + bne @08092E88 movs r1, 0x16 ldrsh r0, [r2, r1] cmp r0, r5 - bne _08092E88 -_08092E68: + bne @08092E88 +@08092E68: ldrb r0, [r6, 0xB] lsls r0, 28 lsrs r0, 28 @@ -271003,26 +271003,26 @@ _08092E68: bl r0r1_zero_or_same lsls r0, 24 cmp r0, 0 - beq _08092E88 + beq @08092E88 movs r0, 0x1 - b _08092E94 + b @08092E94 .align 2, 0 .pool -_08092E88: +@08092E88: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bls _08092E2E + bls @08092E2E movs r0, 0 -_08092E94: +@08092E94: pop {r4-r7} pop {r1} bx r1 thumb_func_end is_there_a_npc_to_interact_with thumb_func_start sub_8092E9C -sub_8092E9C: @ 8092E9C +sub_8092E9C: ; 8092E9C push {lr} sub sp, 0x4 lsls r0, 24 @@ -271035,7 +271035,7 @@ sub_8092E9C: @ 8092E9C bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _08092EE8 + bne @08092EE8 ldr r3, =0x02020630 ldr r2, =0x02037350 mov r0, sp @@ -271053,21 +271053,21 @@ sub_8092E9C: @ 8092E9C movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08092EE8 + beq @08092EE8 movs r0, 0x1 - b _08092EEA + b @08092EEA .align 2, 0 .pool -_08092EE8: +@08092EE8: movs r0, 0 -_08092EEA: +@08092EEA: add sp, 0x4 pop {r1} bx r1 thumb_func_end sub_8092E9C thumb_func_start sub_8092EF0 -sub_8092EF0: @ 8092EF0 +sub_8092EF0: ; 8092EF0 push {lr} sub sp, 0x4 lsls r0, 24 @@ -271080,7 +271080,7 @@ sub_8092EF0: @ 8092EF0 bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _08092F2E + bne @08092F2E ldr r3, =0x02020630 ldr r2, =0x02037350 mov r0, sp @@ -271098,7 +271098,7 @@ sub_8092EF0: @ 8092EF0 movs r0, 0x4 orrs r0, r2 strh r0, [r1, 0x3C] -_08092F2E: +@08092F2E: add sp, 0x4 pop {r0} bx r0 @@ -271107,7 +271107,7 @@ _08092F2E: thumb_func_end sub_8092EF0 thumb_func_start numbers_move_direction -numbers_move_direction: @ 8092F3C +numbers_move_direction: ; 8092F3C push {r4,lr} lsls r0, 24 ldr r3, =0x0850db7c @@ -271129,7 +271129,7 @@ numbers_move_direction: @ 8092F3C thumb_func_end numbers_move_direction thumb_func_start sub_8092F60 -sub_8092F60: @ 8092F60 +sub_8092F60: ; 8092F60 push {r4,lr} lsls r0, 24 ldr r3, =0x0850db7c @@ -271153,7 +271153,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] @@ -271170,40 +271170,40 @@ sub_8092F88: @ 8092F88 movs r0, 0 ldrsh r1, [r5, r0] cmp r1, 0 - ble _08092FB4 + ble @08092FB4 lsls r0, r3, 16 asrs r0, 16 ldrh r3, [r4] adds r0, r3 strh r0, [r4] -_08092FB4: +@08092FB4: cmp r1, 0 - bge _08092FC2 + bge @08092FC2 ldrh r1, [r4] lsls r0, r7, 16 asrs r0, 16 subs r1, r0 strh r1, [r4] -_08092FC2: +@08092FC2: movs r0, 0x2 ldrsh r1, [r5, r0] cmp r1, 0 - ble _08092FD4 + ble @08092FD4 lsls r0, r6, 16 asrs r0, 16 ldrh r3, [r2] adds r0, r3 strh r0, [r2] -_08092FD4: +@08092FD4: cmp r1, 0 - bge _08092FE4 + bge @08092FE4 ldrh r1, [r2] mov r3, r12 lsls r0, r3, 16 asrs r0, 16 subs r1, r0 strh r1, [r2] -_08092FE4: +@08092FE4: pop {r4-r7} pop {r0} bx r0 @@ -271212,7 +271212,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] @@ -271247,7 +271247,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 @@ -271271,35 +271271,35 @@ sub_8093038: @ 8093038 lsls r0, 16 lsrs r4, r0, 16 cmp r2, 0 - ble _08093072 + ble @08093072 lsls r0, r3, 16 movs r3, 0x80 lsls r3, 13 adds r0, r3 lsrs r3, r0, 16 -_08093072: +@08093072: cmp r2, 0 - bge _0809307E + bge @0809307E lsls r0, r3, 16 ldr r2, =0xfff00000 adds r0, r2 lsrs r3, r0, 16 -_0809307E: +@0809307E: cmp r1, 0 - ble _0809308C + ble @0809308C lsls r0, r4, 16 movs r2, 0x80 lsls r2, 13 adds r0, r2 lsrs r4, r0, 16 -_0809308C: +@0809308C: cmp r1, 0 - bge _08093098 + bge @08093098 lsls r0, r4, 16 ldr r1, =0xfff00000 adds r0, r1 lsrs r4, r0, 16 -_08093098: +@08093098: ldr r2, =0x03005d8c ldr r0, [r2] ldrh r1, [r0] @@ -271330,7 +271330,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} @@ -271370,7 +271370,7 @@ sub_80930E0: @ 80930E0 thumb_func_end sub_80930E0 thumb_func_start sub_809312C -sub_809312C: @ 809312C +sub_809312C: ; 809312C push {lr} adds r2, r0, 0 movs r0, 0 @@ -271379,30 +271379,30 @@ sub_809312C: @ 809312C ldr r3, =0x03005dd0 ldr r0, [r3, 0x10] cmp r0, 0 - ble _08093142 + ble @08093142 movs r0, 0x1 strh r0, [r2] -_08093142: +@08093142: ldr r0, [r3, 0x10] cmp r0, 0 - bge _0809314E + bge @0809314E ldrh r0, [r2] subs r0, 0x1 strh r0, [r2] -_0809314E: +@0809314E: ldr r2, [r3, 0x14] cmp r2, 0 - ble _0809315A + ble @0809315A ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_0809315A: +@0809315A: cmp r2, 0 - bge _08093164 + bge @08093164 ldrh r0, [r1] subs r0, 0x1 strh r0, [r1] -_08093164: +@08093164: pop {r0} bx r0 .align 2, 0 @@ -271410,7 +271410,7 @@ _08093164: thumb_func_end sub_809312C thumb_func_start npc_move_direction_hypothetical -npc_move_direction_hypothetical: @ 809316C +npc_move_direction_hypothetical: ; 809316C push {r4,lr} lsls r1, 24 lsrs r1, 24 @@ -271428,44 +271428,44 @@ npc_move_direction_hypothetical: @ 809316C thumb_func_end npc_move_direction_hypothetical thumb_func_start npc_is_visible_or_is_x40 -npc_is_visible_or_is_x40: @ 809318C +npc_is_visible_or_is_x40: ; 809318C push {lr} ldrb r1, [r0] movs r0, 0x42 ands r0, r1 cmp r0, 0 - bne _0809319C + bne @0809319C movs r0, 0 - b _0809319E -_0809319C: + b @0809319E +@0809319C: movs r0, 0x1 -_0809319E: +@0809319E: pop {r1} bx r1 thumb_func_end npc_is_visible_or_is_x40 thumb_func_start npc_is_state_set_and_valid -npc_is_state_set_and_valid: @ 80931A4 +npc_is_state_set_and_valid: ; 80931A4 push {lr} adds r1, r0, 0 ldrb r0, [r1] lsls r0, 25 cmp r0, 0 - bge _080931BA + bge @080931BA ldrb r0, [r1, 0x1C] cmp r0, 0xFF - beq _080931BA + beq @080931BA movs r0, 0x1 - b _080931BC -_080931BA: + b @080931BC +@080931BA: movs r0, 0 -_080931BC: +@080931BC: pop {r1} bx r1 thumb_func_end npc_is_state_set_and_valid thumb_func_start npc_set_state_2 -npc_set_state_2: @ 80931C0 +npc_set_state_2: ; 80931C0 push {r4-r6,lr} adds r4, r0, 0 lsls r1, 24 @@ -271474,7 +271474,7 @@ npc_set_state_2: @ 80931C0 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - bne _08093200 + bne @08093200 adds r0, r4, 0 bl npc_sync_anim_pause_bits strb r5, [r4, 0x1C] @@ -271492,19 +271492,19 @@ npc_set_state_2: @ 80931C0 adds r0, r2 strh r6, [r0, 0x32] movs r0, 0 - b _08093202 + b @08093202 .align 2, 0 .pool -_08093200: +@08093200: movs r0, 0x1 -_08093202: +@08093202: pop {r4-r6} pop {r1} bx r1 thumb_func_end npc_set_state_2 thumb_func_start sub_8093208 -sub_8093208: @ 8093208 +sub_8093208: ; 8093208 push {r4,r5,lr} adds r5, r0, 0 lsls r4, r1, 24 @@ -271519,22 +271519,22 @@ sub_8093208: @ 8093208 thumb_func_end sub_8093208 thumb_func_start npc_hide_and_trainer_flag_clear_on_tile_x66_at_pos -npc_hide_and_trainer_flag_clear_on_tile_x66_at_pos: @ 8093224 +npc_hide_and_trainer_flag_clear_on_tile_x66_at_pos: ; 8093224 push {lr} adds r1, r0, 0 ldrb r0, [r1] lsls r0, 25 cmp r0, 0 - bge _08093236 + bge @08093236 adds r0, r1, 0 bl rom_npc_by_local_id_and_map_get_trainer_flag -_08093236: +@08093236: pop {r0} bx r0 thumb_func_end npc_hide_and_trainer_flag_clear_on_tile_x66_at_pos thumb_func_start rom_npc_by_local_id_and_map_get_trainer_flag -rom_npc_by_local_id_and_map_get_trainer_flag: @ 809323C +rom_npc_by_local_id_and_map_get_trainer_flag: ; 809323C movs r1, 0xFF strb r1, [r0, 0x1C] ldrb r2, [r0] @@ -271564,35 +271564,35 @@ rom_npc_by_local_id_and_map_get_trainer_flag: @ 809323C thumb_func_end rom_npc_by_local_id_and_map_get_trainer_flag thumb_func_start npc_get_bit7_or_const_x10_when_inactive -npc_get_bit7_or_const_x10_when_inactive: @ 8093270 +npc_get_bit7_or_const_x10_when_inactive: ; 8093270 push {lr} ldrb r1, [r0] lsls r0, r1, 25 cmp r0, 0 - blt _0809327E + blt @0809327E movs r0, 0x10 - b _08093280 -_0809327E: + b @08093280 +@0809327E: lsrs r0, r1, 7 -_08093280: +@08093280: pop {r1} bx r1 thumb_func_end npc_get_bit7_or_const_x10_when_inactive thumb_func_start sub_8093284 -sub_8093284: @ 8093284 +sub_8093284: ; 8093284 push {r4,r5,lr} adds r5, r0, 0 bl npc_get_bit7_or_const_x10_when_inactive lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq _0809329E + beq @0809329E cmp r4, 0x10 - beq _0809329E + beq @0809329E adds r0, r5, 0 bl npc_hide_and_trainer_flag_clear_on_tile_x66_at_pos -_0809329E: +@0809329E: adds r0, r4, 0 pop {r4,r5} pop {r1} @@ -271600,24 +271600,24 @@ _0809329E: thumb_func_end sub_8093284 thumb_func_start npc_get_state_or_xFF -npc_get_state_or_xFF: @ 80932A8 +npc_get_state_or_xFF: ; 80932A8 push {lr} adds r1, r0, 0 ldrb r0, [r1] lsls r0, 25 cmp r0, 0 - blt _080932B8 + blt @080932B8 movs r0, 0xFF - b _080932BA -_080932B8: + b @080932BA +@080932B8: ldrb r0, [r1, 0x1C] -_080932BA: +@080932BA: pop {r1} bx r1 thumb_func_end npc_get_state_or_xFF thumb_func_start meta_step -meta_step: @ 80932C0 +meta_step: ; 80932C0 push {r4-r6,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -271630,24 +271630,24 @@ meta_step: @ 80932C0 bl npc_is_state_set_and_valid lsls r0, 24 cmp r0, 0 - beq _080932EA + beq @080932EA adds r0, r4, 0 adds r1, r5, 0 bl npc_obj_exec_an_2 - b _08093300 -_080932EA: + b @08093300 +@080932EA: ldrb r0, [r4, 0x1] lsls r0, 31 cmp r0, 0 - bne _08093300 -_080932F2: + bne @08093300 +@080932F2: adds r0, r4, 0 adds r1, r5, 0 bl _call_via_r6 lsls r0, 24 cmp r0, 0 - bne _080932F2 -_08093300: + bne @080932F2 +@08093300: adds r0, r4, 0 adds r1, r5, 0 bl dp03_something @@ -271669,7 +271669,7 @@ _08093300: thumb_func_end meta_step thumb_func_start d2s_look1 -d2s_look1: @ 8093330 +d2s_look1: ; 8093330 push {r4,lr} sub sp, 0x8 lsls r0, 24 @@ -271679,9 +271679,9 @@ d2s_look1: @ 8093330 movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _08093348 + bls @08093348 movs r4, 0 -_08093348: +@08093348: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -271694,7 +271694,7 @@ _08093348: thumb_func_end d2s_look1 thumb_func_start d2s_walk -d2s_walk: @ 809335C +d2s_walk: ; 809335C push {r4,lr} sub sp, 0x8 lsls r0, 24 @@ -271704,9 +271704,9 @@ d2s_walk: @ 809335C movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _08093374 + bls @08093374 movs r4, 0 -_08093374: +@08093374: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -271719,7 +271719,7 @@ _08093374: thumb_func_end d2s_walk thumb_func_start sub_8093388 -sub_8093388: @ 8093388 +sub_8093388: ; 8093388 push {r4,lr} sub sp, 0x8 lsls r0, 24 @@ -271729,9 +271729,9 @@ sub_8093388: @ 8093388 movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _080933A0 + bls @080933A0 movs r4, 0 -_080933A0: +@080933A0: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -271744,7 +271744,7 @@ _080933A0: thumb_func_end sub_8093388 thumb_func_start sub_80933B4 -sub_80933B4: @ 80933B4 +sub_80933B4: ; 80933B4 push {r4,lr} sub sp, 0x8 lsls r0, 24 @@ -271754,9 +271754,9 @@ sub_80933B4: @ 80933B4 movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _080933CC + bls @080933CC movs r4, 0 -_080933CC: +@080933CC: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -271769,7 +271769,7 @@ _080933CC: thumb_func_end sub_80933B4 thumb_func_start sub_80933E0 -sub_80933E0: @ 80933E0 +sub_80933E0: ; 80933E0 push {r4,lr} sub sp, 0x8 lsls r0, 24 @@ -271779,9 +271779,9 @@ sub_80933E0: @ 80933E0 movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _080933F8 + bls @080933F8 movs r4, 0 -_080933F8: +@080933F8: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -271794,7 +271794,7 @@ _080933F8: thumb_func_end sub_80933E0 thumb_func_start sub_809340C -sub_809340C: @ 809340C +sub_809340C: ; 809340C push {r4,lr} sub sp, 0x8 lsls r0, 24 @@ -271804,9 +271804,9 @@ sub_809340C: @ 809340C movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _08093424 + bls @08093424 movs r4, 0 -_08093424: +@08093424: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -271819,7 +271819,7 @@ _08093424: thumb_func_end sub_809340C thumb_func_start sub_8093438 -sub_8093438: @ 8093438 +sub_8093438: ; 8093438 push {r4,lr} sub sp, 0x8 lsls r0, 24 @@ -271829,9 +271829,9 @@ sub_8093438: @ 8093438 movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _08093450 + bls @08093450 movs r4, 0 -_08093450: +@08093450: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -271844,7 +271844,7 @@ _08093450: thumb_func_end sub_8093438 thumb_func_start sub_8093464 -sub_8093464: @ 8093464 +sub_8093464: ; 8093464 push {r4,lr} sub sp, 0x8 lsls r0, 24 @@ -271854,9 +271854,9 @@ sub_8093464: @ 8093464 movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _0809347C + bls @0809347C movs r4, 0 -_0809347C: +@0809347C: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -271869,7 +271869,7 @@ _0809347C: thumb_func_end sub_8093464 thumb_func_start d2s_08064110 -d2s_08064110: @ 8093490 +d2s_08064110: ; 8093490 push {r4,lr} sub sp, 0x8 lsls r0, 24 @@ -271879,9 +271879,9 @@ d2s_08064110: @ 8093490 movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _080934A8 + bls @080934A8 movs r4, 0 -_080934A8: +@080934A8: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -271894,7 +271894,7 @@ _080934A8: thumb_func_end d2s_08064110 thumb_func_start sub_80934BC -sub_80934BC: @ 80934BC +sub_80934BC: ; 80934BC push {r4,lr} sub sp, 0x8 lsls r0, 24 @@ -271904,9 +271904,9 @@ sub_80934BC: @ 80934BC movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _080934D4 + bls @080934D4 movs r4, 0 -_080934D4: +@080934D4: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -271919,7 +271919,7 @@ _080934D4: thumb_func_end sub_80934BC thumb_func_start sub_80934E8 -sub_80934E8: @ 80934E8 +sub_80934E8: ; 80934E8 push {r4,lr} sub sp, 0x8 lsls r0, 24 @@ -271929,9 +271929,9 @@ sub_80934E8: @ 80934E8 movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _08093500 + bls @08093500 movs r4, 0 -_08093500: +@08093500: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -271944,7 +271944,7 @@ _08093500: thumb_func_end sub_80934E8 thumb_func_start sub_8093514 -sub_8093514: @ 8093514 +sub_8093514: ; 8093514 push {r4,lr} sub sp, 0x8 lsls r0, 24 @@ -271954,9 +271954,9 @@ sub_8093514: @ 8093514 movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _0809352C + bls @0809352C movs r4, 0 -_0809352C: +@0809352C: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -271969,7 +271969,7 @@ _0809352C: thumb_func_end sub_8093514 thumb_func_start sub_8093540 -sub_8093540: @ 8093540 +sub_8093540: ; 8093540 push {r4,lr} sub sp, 0x8 lsls r0, 24 @@ -271979,9 +271979,9 @@ sub_8093540: @ 8093540 movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _08093558 + bls @08093558 movs r4, 0 -_08093558: +@08093558: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -271994,7 +271994,7 @@ _08093558: thumb_func_end sub_8093540 thumb_func_start sub_809356C -sub_809356C: @ 809356C +sub_809356C: ; 809356C push {r4,lr} sub sp, 0x8 lsls r0, 24 @@ -272004,9 +272004,9 @@ sub_809356C: @ 809356C movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _08093584 + bls @08093584 movs r4, 0 -_08093584: +@08093584: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -272019,7 +272019,7 @@ _08093584: thumb_func_end sub_809356C thumb_func_start d2s_08064244 -d2s_08064244: @ 8093598 +d2s_08064244: ; 8093598 push {r4,lr} sub sp, 0x8 lsls r0, 24 @@ -272029,9 +272029,9 @@ d2s_08064244: @ 8093598 movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _080935B0 + bls @080935B0 movs r4, 0 -_080935B0: +@080935B0: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -272044,7 +272044,7 @@ _080935B0: thumb_func_end d2s_08064244 thumb_func_start sub_80935C4 -sub_80935C4: @ 80935C4 +sub_80935C4: ; 80935C4 push {r4,lr} sub sp, 0x8 lsls r0, 24 @@ -272054,9 +272054,9 @@ sub_80935C4: @ 80935C4 movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _080935DC + bls @080935DC movs r4, 0 -_080935DC: +@080935DC: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -272069,7 +272069,7 @@ _080935DC: thumb_func_end sub_80935C4 thumb_func_start sub_80935F0 -sub_80935F0: @ 80935F0 +sub_80935F0: ; 80935F0 push {r4,lr} sub sp, 0x8 lsls r0, 24 @@ -272079,9 +272079,9 @@ sub_80935F0: @ 80935F0 movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _08093608 + bls @08093608 movs r4, 0 -_08093608: +@08093608: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -272094,7 +272094,7 @@ _08093608: thumb_func_end sub_80935F0 thumb_func_start npc_reciprocate_look -npc_reciprocate_look: @ 809361C +npc_reciprocate_look: ; 809361C push {r4,lr} adds r4, r0, 0 lsls r0, r1, 24 @@ -272116,7 +272116,7 @@ npc_reciprocate_look: @ 809361C thumb_func_end npc_reciprocate_look thumb_func_start sub_8093648 -sub_8093648: @ 8093648 +sub_8093648: ; 8093648 push {r4,lr} sub sp, 0x8 lsls r0, 24 @@ -272126,9 +272126,9 @@ sub_8093648: @ 8093648 movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _08093660 + bls @08093660 movs r4, 0 -_08093660: +@08093660: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -272141,7 +272141,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 @@ -272151,9 +272151,9 @@ sub_8093674: @ 8093674 movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _0809368C + bls @0809368C movs r4, 0 -_0809368C: +@0809368C: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -272166,7 +272166,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 @@ -272176,9 +272176,9 @@ sub_80936A0: @ 80936A0 movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _080936B8 + bls @080936B8 movs r4, 0 -_080936B8: +@080936B8: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -272191,7 +272191,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 @@ -272201,9 +272201,9 @@ sub_80936CC: @ 80936CC movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _080936E4 + bls @080936E4 movs r4, 0 -_080936E4: +@080936E4: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -272216,7 +272216,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 @@ -272226,9 +272226,9 @@ sub_80936F8: @ 80936F8 movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _08093710 + bls @08093710 movs r4, 0 -_08093710: +@08093710: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -272241,7 +272241,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 @@ -272251,9 +272251,9 @@ sub_8093724: @ 8093724 movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _0809373C + bls @0809373C movs r4, 0 -_0809373C: +@0809373C: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -272266,7 +272266,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 @@ -272276,9 +272276,9 @@ sub_8093750: @ 8093750 movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _08093768 + bls @08093768 movs r4, 0 -_08093768: +@08093768: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -272291,7 +272291,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 @@ -272301,9 +272301,9 @@ sub_809377C: @ 809377C movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _08093794 + bls @08093794 movs r4, 0 -_08093794: +@08093794: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -272316,7 +272316,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 @@ -272326,9 +272326,9 @@ sub_80937A8: @ 80937A8 movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _080937C0 + bls @080937C0 movs r4, 0 -_080937C0: +@080937C0: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -272341,7 +272341,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 @@ -272351,9 +272351,9 @@ d2s_08064034: @ 80937D4 movs r2, 0x5 bl memcpy cmp r4, 0x4 - bls _080937EC + bls @080937EC movs r4, 0 -_080937EC: +@080937EC: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] @@ -272366,7 +272366,7 @@ _080937EC: thumb_func_end d2s_08064034 thumb_func_start direction_reversed -direction_reversed: @ 8093800 +direction_reversed: ; 8093800 push {r4,lr} sub sp, 0x8 lsls r0, 24 @@ -272379,16 +272379,16 @@ direction_reversed: @ 8093800 lsls r0, r1, 24 lsrs r0, 24 cmp r0, 0x7 - bhi _08093828 + bhi @08093828 mov r2, sp adds r0, r2, r1 ldrb r0, [r0] - b _0809382A + b @0809382A .align 2, 0 .pool -_08093828: +@08093828: adds r0, r4, 0 -_0809382A: +@0809382A: add sp, 0x8 pop {r4} pop {r1} @@ -272396,7 +272396,7 @@ _0809382A: thumb_func_end direction_reversed thumb_func_start zffu_offset_calc -zffu_offset_calc: @ 8093834 +zffu_offset_calc: ; 8093834 lsls r0, 24 lsls r1, 24 lsrs r1, 24 @@ -272412,7 +272412,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 @@ -272422,17 +272422,17 @@ state_to_direction: @ 809384C lsls r2, 24 lsrs r2, 24 cmp r1, 0 - beq _0809386C + beq @0809386C cmp r2, 0 - beq _0809386C + beq @0809386C cmp r1, 0x4 - bhi _0809386C + bhi @0809386C cmp r2, 0x4 - bls _08093870 -_0809386C: + bls @08093870 +@0809386C: movs r0, 0 - b _08093882 -_08093870: + b @08093882 +@08093870: adds r1, r2, 0 bl zffu_offset_calc ldr r2, =0x0850dc3f @@ -272441,7 +272441,7 @@ _08093870: adds r0, r1 adds r0, r2 ldrb r0, [r0] -_08093882: +@08093882: pop {r4} pop {r1} bx r1 @@ -272450,7 +272450,7 @@ _08093882: thumb_func_end state_to_direction thumb_func_start npc_obj_exec_an_2 -npc_obj_exec_an_2: @ 809388C +npc_obj_exec_an_2: ; 809388C push {r4,lr} adds r4, r0, 0 ldr r2, =0x0850dc50 @@ -272467,12 +272467,12 @@ npc_obj_exec_an_2: @ 809388C bl _call_via_r2 lsls r0, 24 cmp r0, 0 - beq _080938B8 + beq @080938B8 ldrb r0, [r4] movs r1, 0x80 orrs r0, r1 strb r0, [r4] -_080938B8: +@080938B8: pop {r4} pop {r0} bx r0 @@ -272481,7 +272481,7 @@ _080938B8: thumb_func_end npc_obj_exec_an_2 thumb_func_start npc_obj_exec_an -npc_obj_exec_an: @ 80938C4 +npc_obj_exec_an: ; 80938C4 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -272500,25 +272500,25 @@ npc_obj_exec_an: @ 80938C4 bl _call_via_r2 lsls r0, 24 cmp r0, 0 - bne _080938F4 + bne @080938F4 movs r0, 0 - b _080938FE + b @080938FE .align 2, 0 .pool -_080938F4: +@080938F4: movs r0, 0xFF strb r0, [r4, 0x1C] movs r0, 0 strh r0, [r5, 0x32] movs r0, 0x1 -_080938FE: +@080938FE: pop {r4,r5} pop {r1} bx r1 thumb_func_end npc_obj_exec_an thumb_func_start npc_set_state_and_pq_record -npc_set_state_and_pq_record: @ 8093904 +npc_set_state_and_pq_record: ; 8093904 movs r3, 0 strb r2, [r0, 0x1C] strh r3, [r1, 0x32] @@ -272526,7 +272526,7 @@ npc_set_state_and_pq_record: @ 8093904 thumb_func_end npc_set_state_and_pq_record thumb_func_start an_look_any -an_look_any: @ 809390C +an_look_any: ; 809390C push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -272559,7 +272559,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 @@ -272569,7 +272569,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 @@ -272579,7 +272579,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 @@ -272589,7 +272589,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 @@ -272599,7 +272599,7 @@ sub_8093980: @ 8093980 thumb_func_end sub_8093980 thumb_func_start npc_apply_direction -npc_apply_direction: @ 8093990 +npc_apply_direction: ; 8093990 push {r4-r7,lr} mov r7, r8 push {r7} @@ -272647,18 +272647,18 @@ npc_apply_direction: @ 8093990 ldr r0, =0x020375b8 ldr r0, [r0] cmp r0, 0 - beq _08093A0E + beq @08093A0E adds r0, r7, 0 bl sub_8097F78 lsls r0, 24 lsrs r0, 24 cmp r0, 0x10 - beq _08093A0E + beq @08093A0E ldrb r0, [r4] movs r1, 0x40 orrs r0, r1 strb r0, [r4] -_08093A0E: +@08093A0E: ldrb r0, [r7] movs r1, 0x4 orrs r0, r1 @@ -272677,7 +272677,7 @@ _08093A0E: thumb_func_end npc_apply_direction thumb_func_start an_run_any -an_run_any: @ 8093A2C +an_run_any: ; 8093A2C push {r4-r7,lr} mov r7, r8 push {r7} @@ -272724,7 +272724,7 @@ an_run_any: @ 8093A2C thumb_func_end an_run_any thumb_func_start sub_8093A88 -sub_8093A88: @ 8093A88 +sub_8093A88: ; 8093A88 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -272748,7 +272748,7 @@ sub_8093A88: @ 8093A88 thumb_func_end sub_8093A88 thumb_func_start npc_obj_ministep_stop_on_arrival -npc_obj_ministep_stop_on_arrival: @ 8093AB8 +npc_obj_ministep_stop_on_arrival: ; 8093AB8 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -272756,10 +272756,10 @@ npc_obj_ministep_stop_on_arrival: @ 8093AB8 bl obj_npc_ministep lsls r0, 24 cmp r0, 0 - bne _08093ACE + bne @08093ACE movs r0, 0 - b _08093AEA -_08093ACE: + b @08093AEA +@08093ACE: adds r0, r4, 0 bl npc_coords_shift_still ldrb r0, [r4] @@ -272773,14 +272773,14 @@ _08093ACE: orrs r0, r1 strb r0, [r2] movs r0, 0x1 -_08093AEA: +@08093AEA: pop {r4,r5} pop {r1} bx r1 thumb_func_end npc_obj_ministep_stop_on_arrival thumb_func_start sub_8093AF0 -sub_8093AF0: @ 8093AF0 +sub_8093AF0: ; 8093AF0 push {r4-r6,lr} mov r6, r8 push {r6} @@ -272836,7 +272836,7 @@ sub_8093AF0: @ 8093AF0 thumb_func_end sub_8093AF0 thumb_func_start sub_8093B60 -sub_8093B60: @ 8093B60 +sub_8093B60: ; 8093B60 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -272859,7 +272859,7 @@ sub_8093B60: @ 8093B60 thumb_func_end sub_8093B60 thumb_func_start an_walk_any_2 -an_walk_any_2: @ 8093B8C +an_walk_any_2: ; 8093B8C push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -272867,10 +272867,10 @@ an_walk_any_2: @ 8093B8C bl sub_80976EC lsls r0, 24 cmp r0, 0 - bne _08093BA2 + bne @08093BA2 movs r0, 0 - b _08093BBE -_08093BA2: + b @08093BBE +@08093BA2: adds r0, r4, 0 bl npc_coords_shift_still ldrb r0, [r4] @@ -272884,14 +272884,14 @@ _08093BA2: orrs r0, r1 strb r0, [r2] movs r0, 0x1 -_08093BBE: +@08093BBE: pop {r4,r5} pop {r1} bx r1 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 @@ -272908,27 +272908,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08093BF6 + bne @08093BF6 movs r0, 0 - b _08093BFC -_08093BF6: + b @08093BFC +@08093BF6: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08093BFC: +@08093BFC: pop {r4} pop {r1} bx r1 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 @@ -272945,27 +272945,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08093C36 + bne @08093C36 movs r0, 0 - b _08093C3C -_08093C36: + b @08093C3C +@08093C36: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08093C3C: +@08093C3C: pop {r4} pop {r1} bx r1 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 @@ -272982,27 +272982,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08093C76 + bne @08093C76 movs r0, 0 - b _08093C7C -_08093C76: + b @08093C7C +@08093C76: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08093C7C: +@08093C7C: pop {r4} pop {r1} bx r1 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 @@ -273019,27 +273019,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08093CB6 + bne @08093CB6 movs r0, 0 - b _08093CBC -_08093CB6: + b @08093CBC +@08093CB6: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08093CBC: +@08093CBC: pop {r4} pop {r1} bx r1 thumb_func_end sub_8093CA4 thumb_func_start sub_8093CC4 -sub_8093CC4: @ 8093CC4 +sub_8093CC4: ; 8093CC4 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -273056,27 +273056,27 @@ sub_8093CC4: @ 8093CC4 thumb_func_end sub_8093CC4 thumb_func_start sub_8093CE4 -sub_8093CE4: @ 8093CE4 +sub_8093CE4: ; 8093CE4 push {r4,lr} adds r4, r1, 0 bl an_walk_any_2 lsls r0, 24 cmp r0, 0 - bne _08093CF6 + bne @08093CF6 movs r0, 0 - b _08093CFC -_08093CF6: + b @08093CFC +@08093CF6: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08093CFC: +@08093CFC: pop {r4} pop {r1} bx r1 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 @@ -273093,27 +273093,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08093D36 + bne @08093D36 movs r0, 0 - b _08093D3C -_08093D36: + b @08093D3C +@08093D36: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08093D3C: +@08093D3C: pop {r4} pop {r1} bx r1 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 @@ -273130,27 +273130,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08093D76 + bne @08093D76 movs r0, 0 - b _08093D7C -_08093D76: + b @08093D7C +@08093D76: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08093D7C: +@08093D7C: pop {r4} pop {r1} bx r1 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 @@ -273167,27 +273167,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08093DB6 + bne @08093DB6 movs r0, 0 - b _08093DBC -_08093DB6: + b @08093DBC +@08093DB6: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08093DBC: +@08093DBC: pop {r4} pop {r1} bx r1 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 @@ -273205,27 +273205,27 @@ sub_8093DC4: @ 8093DC4 thumb_func_end sub_8093DC4 thumb_func_start sub_8093DE4 -sub_8093DE4: @ 8093DE4 +sub_8093DE4: ; 8093DE4 push {r4,lr} adds r4, r1, 0 bl npc_obj_ministep_stop_on_arrival lsls r0, 24 cmp r0, 0 - bne _08093DF6 + bne @08093DF6 movs r0, 0 - b _08093DFC -_08093DF6: + b @08093DFC +@08093DF6: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08093DFC: +@08093DFC: pop {r4} pop {r1} bx r1 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 @@ -273243,27 +273243,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08093E36 + bne @08093E36 movs r0, 0 - b _08093E3C -_08093E36: + b @08093E3C +@08093E36: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08093E3C: +@08093E3C: pop {r4} pop {r1} bx r1 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 @@ -273281,27 +273281,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08093E76 + bne @08093E76 movs r0, 0 - b _08093E7C -_08093E76: + b @08093E7C +@08093E76: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08093E7C: +@08093E7C: pop {r4} pop {r1} bx r1 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 @@ -273319,27 +273319,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08093EB6 + bne @08093EB6 movs r0, 0 - b _08093EBC -_08093EB6: + b @08093EBC +@08093EB6: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08093EBC: +@08093EBC: pop {r4} pop {r1} bx r1 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 @@ -273357,27 +273357,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08093EF6 + bne @08093EF6 movs r0, 0 - b _08093EFC -_08093EF6: + b @08093EFC +@08093EF6: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08093EFC: +@08093EFC: pop {r4} pop {r1} bx r1 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 @@ -273395,27 +273395,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08093F36 + bne @08093F36 movs r0, 0 - b _08093F3C -_08093F36: + b @08093F3C +@08093F36: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08093F3C: +@08093F3C: pop {r4} pop {r1} bx r1 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 @@ -273433,27 +273433,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08093F76 + bne @08093F76 movs r0, 0 - b _08093F7C -_08093F76: + b @08093F7C +@08093F76: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08093F7C: +@08093F7C: pop {r4} pop {r1} bx r1 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 @@ -273471,27 +273471,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08093FB6 + bne @08093FB6 movs r0, 0 - b _08093FBC -_08093FB6: + b @08093FBC +@08093FB6: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08093FBC: +@08093FBC: pop {r4} pop {r1} bx r1 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 @@ -273584,7 +273584,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 @@ -273618,7 +273618,7 @@ maybe_shadow_1: @ 8094080 thumb_func_end maybe_shadow_1 thumb_func_start sub_80940C4 -sub_80940C4: @ 80940C4 +sub_80940C4: ; 80940C4 push {r4-r7,lr} mov r7, r8 push {r7} @@ -273636,7 +273636,7 @@ sub_80940C4: @ 80940C4 lsrs r0, 24 mov r8, r0 cmp r0, 0x1 - bne _08094154 + bne @08094154 movs r1, 0x36 ldrsh r0, [r7, r1] lsls r0, 1 @@ -273645,7 +273645,7 @@ sub_80940C4: @ 80940C4 movs r2, 0 ldrsh r0, [r0, r2] cmp r0, 0 - beq _08094154 + beq @08094154 add r4, sp, 0xC movs r0, 0 strh r0, [r4] @@ -273683,13 +273683,13 @@ sub_80940C4: @ 80940C4 movs r1, 0x10 orrs r0, r1 strb r0, [r6] - b _08094178 + b @08094178 .align 2, 0 .pool -_08094154: +@08094154: mov r1, r8 cmp r1, 0xFF - bne _08094178 + bne @08094178 adds r0, r6, 0 bl npc_coords_shift_still ldrb r0, [r6] @@ -273704,7 +273704,7 @@ _08094154: movs r1, 0x40 orrs r0, r1 strb r0, [r2] -_08094178: +@08094178: mov r0, r8 add sp, 0x10 pop {r3} @@ -273715,7 +273715,7 @@ _08094178: thumb_func_end sub_80940C4 thumb_func_start sub_8094188 -sub_8094188: @ 8094188 +sub_8094188: ; 8094188 push {lr} ldr r2, =sub_809785C + 1 bl sub_80940C4 @@ -273728,7 +273728,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 + 1 bl sub_80940C4 @@ -273741,41 +273741,41 @@ 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 lsrs r0, 24 cmp r0, 0xFF - beq _080941C2 + beq @080941C2 movs r0, 0 - b _080941C4 -_080941C2: + b @080941C4 +@080941C2: movs r0, 0x1 -_080941C4: +@080941C4: pop {r1} bx r1 thumb_func_end sub_80941B0 thumb_func_start sub_80941C8 -sub_80941C8: @ 80941C8 +sub_80941C8: ; 80941C8 push {lr} bl sub_809419C lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _080941DA + beq @080941DA movs r0, 0 - b _080941DC -_080941DA: + b @080941DC +@080941DA: movs r0, 0x1 -_080941DC: +@080941DC: pop {r1} bx r1 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 @@ -273783,12 +273783,12 @@ sub_80941E0: @ 80941E0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080941FA + beq @080941FA cmp r0, 0xFF - bne _08094226 + bne @08094226 movs r0, 0x1 - b _08094228 -_080941FA: + b @08094228 +@080941FA: ldrb r0, [r4, 0x18] lsrs r0, 4 bl direction_reversed @@ -273807,16 +273807,16 @@ _080941FA: adds r0, r4, 0 adds r1, r5, 0 bl obj_npc_animation_step -_08094226: +@08094226: movs r0, 0 -_08094228: +@08094228: pop {r4,r5} pop {r1} bx r1 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 @@ -273839,17 +273839,17 @@ 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 bl sub_80941B0 lsls r0, 24 cmp r0, 0 - bne _08094270 + bne @08094270 movs r0, 0 - b _08094280 -_08094270: + b @08094280 +@08094270: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -273858,14 +273858,14 @@ _08094270: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_08094280: +@08094280: pop {r4,r5} pop {r1} bx r1 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 @@ -273888,17 +273888,17 @@ 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 bl sub_80941B0 lsls r0, 24 cmp r0, 0 - bne _080942C8 + bne @080942C8 movs r0, 0 - b _080942D8 -_080942C8: + b @080942D8 +@080942C8: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -273907,14 +273907,14 @@ _080942C8: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_080942D8: +@080942D8: pop {r4,r5} pop {r1} bx r1 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 @@ -273937,17 +273937,17 @@ 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 bl sub_80941B0 lsls r0, 24 cmp r0, 0 - bne _08094320 + bne @08094320 movs r0, 0 - b _08094330 -_08094320: + b @08094330 +@08094320: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -273956,14 +273956,14 @@ _08094320: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_08094330: +@08094330: pop {r4,r5} pop {r1} bx r1 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 @@ -273986,17 +273986,17 @@ 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 bl sub_80941B0 lsls r0, 24 cmp r0, 0 - bne _08094378 + bne @08094378 movs r0, 0 - b _08094388 -_08094378: + b @08094388 +@08094378: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -274005,14 +274005,14 @@ _08094378: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_08094388: +@08094388: pop {r4,r5} pop {r1} bx r1 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] @@ -274020,27 +274020,27 @@ 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 strh r0, [r1, 0x34] lsls r0, 16 cmp r0, 0 - beq _080943AA + beq @080943AA movs r0, 0 - b _080943B0 -_080943AA: + b @080943B0 +@080943AA: movs r0, 0x2 strh r0, [r1, 0x32] movs r0, 0x1 -_080943B0: +@080943B0: pop {r1} bx r1 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 @@ -274058,7 +274058,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 @@ -274076,7 +274076,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 @@ -274094,7 +274094,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 @@ -274112,7 +274112,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 @@ -274130,7 +274130,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 @@ -274148,27 +274148,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08094486 + bne @08094486 movs r0, 0 - b _0809448C -_08094486: + b @0809448C +@08094486: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_0809448C: +@0809448C: pop {r4} pop {r1} bx r1 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 @@ -274186,27 +274186,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _080944C6 + bne @080944C6 movs r0, 0 - b _080944CC -_080944C6: + b @080944CC +@080944C6: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_080944CC: +@080944CC: pop {r4} pop {r1} bx r1 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 @@ -274224,27 +274224,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08094506 + bne @08094506 movs r0, 0 - b _0809450C -_08094506: + b @0809450C +@08094506: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_0809450C: +@0809450C: pop {r4} pop {r1} bx r1 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 @@ -274262,27 +274262,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08094546 + bne @08094546 movs r0, 0 - b _0809454C -_08094546: + b @0809454C +@08094546: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_0809454C: +@0809454C: pop {r4} pop {r1} bx r1 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} @@ -274320,17 +274320,17 @@ sub_8094554: @ 8094554 thumb_func_end sub_8094554 thumb_func_start sub_809459C -sub_809459C: @ 809459C +sub_809459C: ; 809459C push {lr} ldrh r0, [r1, 0x34] subs r0, 0x1 strh r0, [r1, 0x34] lsls r0, 16 cmp r0, 0 - beq _080945AE + beq @080945AE movs r0, 0 - b _080945C0 -_080945AE: + b @080945C0 +@080945AE: movs r0, 0x2 strh r0, [r1, 0x32] adds r2, r1, 0 @@ -274340,13 +274340,13 @@ _080945AE: orrs r0, r1 strb r0, [r2] movs r0, 0x1 -_080945C0: +@080945C0: pop {r1} bx r1 thumb_func_end sub_809459C thumb_func_start sub_80945C4 -sub_80945C4: @ 80945C4 +sub_80945C4: ; 80945C4 push {r4,r5,lr} adds r5, r0, 0 adds r4, r1, 0 @@ -274354,7 +274354,7 @@ sub_80945C4: @ 80945C4 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080945EE + beq @080945EE adds r3, r4, 0 adds r3, 0x2C ldrb r2, [r3] @@ -274368,7 +274368,7 @@ sub_80945C4: @ 80945C4 ands r0, r2 orrs r0, r1 strb r0, [r3] -_080945EE: +@080945EE: adds r0, r5, 0 adds r1, r4, 0 bl sub_809459C @@ -274380,7 +274380,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 @@ -274408,7 +274408,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 @@ -274436,7 +274436,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 @@ -274464,7 +274464,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 @@ -274492,7 +274492,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 @@ -274520,7 +274520,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 @@ -274548,7 +274548,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 @@ -274576,7 +274576,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 @@ -274604,7 +274604,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 @@ -274632,7 +274632,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 @@ -274660,7 +274660,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 @@ -274688,7 +274688,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 @@ -274716,7 +274716,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 @@ -274744,7 +274744,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 @@ -274772,7 +274772,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 @@ -274800,7 +274800,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 @@ -274828,7 +274828,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 @@ -274846,27 +274846,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _080949B2 + bne @080949B2 movs r0, 0 - b _080949B8 -_080949B2: + b @080949B8 +@080949B2: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_080949B8: +@080949B8: pop {r4} pop {r1} bx r1 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 @@ -274884,27 +274884,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _080949F2 + bne @080949F2 movs r0, 0 - b _080949F8 -_080949F2: + b @080949F8 +@080949F2: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_080949F8: +@080949F8: pop {r4} pop {r1} bx r1 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 @@ -274922,27 +274922,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08094A32 + bne @08094A32 movs r0, 0 - b _08094A38 -_08094A32: + b @08094A38 +@08094A32: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08094A38: +@08094A38: pop {r4} pop {r1} bx r1 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 @@ -274960,27 +274960,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08094A72 + bne @08094A72 movs r0, 0 - b _08094A78 -_08094A72: + b @08094A78 +@08094A72: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08094A78: +@08094A78: pop {r4} pop {r1} bx r1 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 @@ -274998,27 +274998,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08094AB2 + bne @08094AB2 movs r0, 0 - b _08094AB8 -_08094AB2: + b @08094AB8 +@08094AB2: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08094AB8: +@08094AB8: pop {r4} pop {r1} bx r1 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 @@ -275036,27 +275036,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08094AF2 + bne @08094AF2 movs r0, 0 - b _08094AF8 -_08094AF2: + b @08094AF8 +@08094AF2: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08094AF8: +@08094AF8: pop {r4} pop {r1} bx r1 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 @@ -275074,27 +275074,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08094B32 + bne @08094B32 movs r0, 0 - b _08094B38 -_08094B32: + b @08094B38 +@08094B32: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08094B38: +@08094B38: pop {r4} pop {r1} bx r1 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 @@ -275112,27 +275112,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08094B72 + bne @08094B72 movs r0, 0 - b _08094B78 -_08094B72: + b @08094B78 +@08094B72: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08094B78: +@08094B78: pop {r4} pop {r1} bx r1 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 @@ -275150,27 +275150,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08094BB2 + bne @08094BB2 movs r0, 0 - b _08094BB8 -_08094BB2: + b @08094BB8 +@08094BB2: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08094BB8: +@08094BB8: pop {r4} pop {r1} bx r1 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 @@ -275188,27 +275188,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08094BF2 + bne @08094BF2 movs r0, 0 - b _08094BF8 -_08094BF2: + b @08094BF8 +@08094BF2: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08094BF8: +@08094BF8: pop {r4} pop {r1} bx r1 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 @@ -275226,27 +275226,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08094C32 + bne @08094C32 movs r0, 0 - b _08094C38 -_08094C32: + b @08094C38 +@08094C32: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08094C38: +@08094C38: pop {r4} pop {r1} bx r1 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 @@ -275264,27 +275264,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08094C72 + bne @08094C72 movs r0, 0 - b _08094C78 -_08094C72: + b @08094C78 +@08094C72: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08094C78: +@08094C78: pop {r4} pop {r1} bx r1 thumb_func_end sub_8094C60 thumb_func_start sub_8094C80 -sub_8094C80: @ 8094C80 +sub_8094C80: ; 8094C80 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -275301,27 +275301,27 @@ sub_8094C80: @ 8094C80 thumb_func_end sub_8094C80 thumb_func_start sub_8094CA0 -sub_8094CA0: @ 8094CA0 +sub_8094CA0: ; 8094CA0 push {r4,lr} adds r4, r1, 0 bl npc_obj_ministep_stop_on_arrival lsls r0, 24 cmp r0, 0 - bne _08094CB2 + bne @08094CB2 movs r0, 0 - b _08094CB8 -_08094CB2: + b @08094CB8 +@08094CB2: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08094CB8: +@08094CB8: pop {r4} pop {r1} bx r1 thumb_func_end sub_8094CA0 thumb_func_start sub_8094CC0 -sub_8094CC0: @ 8094CC0 +sub_8094CC0: ; 8094CC0 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -275338,27 +275338,27 @@ sub_8094CC0: @ 8094CC0 thumb_func_end sub_8094CC0 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 lsls r0, 24 cmp r0, 0 - bne _08094CF2 + bne @08094CF2 movs r0, 0 - b _08094CF8 -_08094CF2: + b @08094CF8 +@08094CF2: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08094CF8: +@08094CF8: pop {r4} pop {r1} bx r1 thumb_func_end sub_8094CE0 thumb_func_start sub_8094D00 -sub_8094D00: @ 8094D00 +sub_8094D00: ; 8094D00 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -275375,27 +275375,27 @@ sub_8094D00: @ 8094D00 thumb_func_end sub_8094D00 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 lsls r0, 24 cmp r0, 0 - bne _08094D32 + bne @08094D32 movs r0, 0 - b _08094D38 -_08094D32: + b @08094D38 +@08094D32: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08094D38: +@08094D38: pop {r4} pop {r1} bx r1 thumb_func_end sub_8094D20 thumb_func_start sub_8094D40 -sub_8094D40: @ 8094D40 +sub_8094D40: ; 8094D40 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -275412,27 +275412,27 @@ sub_8094D40: @ 8094D40 thumb_func_end sub_8094D40 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 lsls r0, 24 cmp r0, 0 - bne _08094D72 + bne @08094D72 movs r0, 0 - b _08094D78 -_08094D72: + b @08094D78 +@08094D72: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08094D78: +@08094D78: pop {r4} pop {r1} bx r1 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 @@ -275456,7 +275456,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 @@ -275470,28 +275470,28 @@ 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 bl sub_80979BC lsls r0, 24 cmp r0, 0 - bne _08094DD8 + bne @08094DD8 movs r0, 0 - b _08094DDE -_08094DD8: + b @08094DDE +@08094DD8: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08094DDE: +@08094DDE: pop {r4} pop {r1} bx r1 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 @@ -275517,7 +275517,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 @@ -275534,17 +275534,17 @@ 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 bl sub_80941C8 lsls r0, 24 cmp r0, 0 - bne _08094E4C + bne @08094E4C movs r0, 0 - b _08094E5A -_08094E4C: + b @08094E5A +@08094E4C: movs r0, 0x2 strh r0, [r5, 0x32] ldrb r1, [r4] @@ -275552,14 +275552,14 @@ _08094E4C: ands r0, r1 strb r0, [r4] movs r0, 0x1 -_08094E5A: +@08094E5A: pop {r4,r5} pop {r1} bx r1 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 @@ -275576,17 +275576,17 @@ 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 bl sub_80941C8 lsls r0, 24 cmp r0, 0 - bne _08094E94 + bne @08094E94 movs r0, 0 - b _08094EA2 -_08094E94: + b @08094EA2 +@08094E94: movs r0, 0x2 strh r0, [r5, 0x32] ldrb r1, [r4] @@ -275594,14 +275594,14 @@ _08094E94: ands r0, r1 strb r0, [r4] movs r0, 0x1 -_08094EA2: +@08094EA2: pop {r4,r5} pop {r1} bx r1 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 @@ -275618,17 +275618,17 @@ 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 bl sub_80941C8 lsls r0, 24 cmp r0, 0 - bne _08094EDC + bne @08094EDC movs r0, 0 - b _08094EEA -_08094EDC: + b @08094EEA +@08094EDC: movs r0, 0x2 strh r0, [r5, 0x32] ldrb r1, [r4] @@ -275636,14 +275636,14 @@ _08094EDC: ands r0, r1 strb r0, [r4] movs r0, 0x1 -_08094EEA: +@08094EEA: pop {r4,r5} pop {r1} bx r1 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 @@ -275660,17 +275660,17 @@ 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 bl sub_80941C8 lsls r0, 24 cmp r0, 0 - bne _08094F24 + bne @08094F24 movs r0, 0 - b _08094F32 -_08094F24: + b @08094F32 +@08094F24: movs r0, 0x2 strh r0, [r5, 0x32] ldrb r1, [r4] @@ -275678,14 +275678,14 @@ _08094F24: ands r0, r1 strb r0, [r4] movs r0, 0x1 -_08094F32: +@08094F32: pop {r4,r5} pop {r1} bx r1 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 @@ -275697,7 +275697,7 @@ sub_8094F38: @ 8094F38 bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _08094F82 + bne @08094F82 movs r1, 0x10 ldrsh r0, [r5, r1] movs r2, 0x12 @@ -275720,7 +275720,7 @@ sub_8094F38: @ 8094F38 adds r0, r5, 0 adds r1, r6, 0 bl an_look_any -_08094F82: +@08094F82: movs r0, 0x1 strh r0, [r6, 0x32] add sp, 0x4 @@ -275732,7 +275732,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 @@ -275744,7 +275744,7 @@ sub_8094F94: @ 8094F94 bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _08094FE6 + bne @08094FE6 movs r1, 0x10 ldrsh r0, [r5, r1] movs r2, 0x12 @@ -275770,7 +275770,7 @@ sub_8094F94: @ 8094F94 adds r0, r5, 0 adds r1, r6, 0 bl an_look_any -_08094FE6: +@08094FE6: movs r0, 0x1 strh r0, [r6, 0x32] add sp, 0x4 @@ -275782,7 +275782,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 @@ -275793,7 +275793,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 @@ -275805,7 +275805,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 @@ -275828,17 +275828,17 @@ 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 bl sub_80941B0 lsls r0, 24 cmp r0, 0 - bne _08095058 + bne @08095058 movs r0, 0 - b _08095068 -_08095058: + b @08095068 +@08095058: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -275847,14 +275847,14 @@ _08095058: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_08095068: +@08095068: pop {r4,r5} pop {r1} bx r1 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 @@ -275877,17 +275877,17 @@ 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 bl sub_80941B0 lsls r0, 24 cmp r0, 0 - bne _080950B0 + bne @080950B0 movs r0, 0 - b _080950C0 -_080950B0: + b @080950C0 +@080950B0: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -275896,14 +275896,14 @@ _080950B0: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_080950C0: +@080950C0: pop {r4,r5} pop {r1} bx r1 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 @@ -275926,17 +275926,17 @@ 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 bl sub_80941B0 lsls r0, 24 cmp r0, 0 - bne _08095108 + bne @08095108 movs r0, 0 - b _08095118 -_08095108: + b @08095118 +@08095108: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -275945,14 +275945,14 @@ _08095108: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_08095118: +@08095118: pop {r4,r5} pop {r1} bx r1 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 @@ -275975,17 +275975,17 @@ 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 bl sub_80941B0 lsls r0, 24 cmp r0, 0 - bne _08095160 + bne @08095160 movs r0, 0 - b _08095170 -_08095160: + b @08095170 +@08095160: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -275994,14 +275994,14 @@ _08095160: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_08095170: +@08095170: pop {r4,r5} pop {r1} bx r1 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 @@ -276024,17 +276024,17 @@ 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 bl sub_80941B0 lsls r0, 24 cmp r0, 0 - bne _080951B8 + bne @080951B8 movs r0, 0 - b _080951C8 -_080951B8: + b @080951C8 +@080951B8: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -276043,14 +276043,14 @@ _080951B8: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_080951C8: +@080951C8: pop {r4,r5} pop {r1} bx r1 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 @@ -276073,17 +276073,17 @@ 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 bl sub_80941B0 lsls r0, 24 cmp r0, 0 - bne _08095210 + bne @08095210 movs r0, 0 - b _08095220 -_08095210: + b @08095220 +@08095210: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -276092,14 +276092,14 @@ _08095210: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_08095220: +@08095220: pop {r4,r5} pop {r1} bx r1 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 @@ -276122,17 +276122,17 @@ 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 bl sub_80941B0 lsls r0, 24 cmp r0, 0 - bne _08095268 + bne @08095268 movs r0, 0 - b _08095278 -_08095268: + b @08095278 +@08095268: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -276141,14 +276141,14 @@ _08095268: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_08095278: +@08095278: pop {r4,r5} pop {r1} bx r1 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 @@ -276171,17 +276171,17 @@ 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 bl sub_80941B0 lsls r0, 24 cmp r0, 0 - bne _080952C0 + bne @080952C0 movs r0, 0 - b _080952D0 -_080952C0: + b @080952D0 +@080952C0: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -276190,14 +276190,14 @@ _080952C0: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_080952D0: +@080952D0: pop {r4,r5} pop {r1} bx r1 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 @@ -276220,17 +276220,17 @@ 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 bl sub_80941E0 lsls r0, 24 cmp r0, 0 - bne _08095318 + bne @08095318 movs r0, 0 - b _08095328 -_08095318: + b @08095328 +@08095318: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -276239,14 +276239,14 @@ _08095318: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_08095328: +@08095328: pop {r4,r5} pop {r1} bx r1 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 @@ -276269,17 +276269,17 @@ 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 bl sub_80941E0 lsls r0, 24 cmp r0, 0 - bne _08095370 + bne @08095370 movs r0, 0 - b _08095380 -_08095370: + b @08095380 +@08095370: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -276288,14 +276288,14 @@ _08095370: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_08095380: +@08095380: pop {r4,r5} pop {r1} bx r1 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 @@ -276318,17 +276318,17 @@ 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 bl sub_80941E0 lsls r0, 24 cmp r0, 0 - bne _080953C8 + bne @080953C8 movs r0, 0 - b _080953D8 -_080953C8: + b @080953D8 +@080953C8: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -276337,14 +276337,14 @@ _080953C8: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_080953D8: +@080953D8: pop {r4,r5} pop {r1} bx r1 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 @@ -276367,17 +276367,17 @@ 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 bl sub_80941E0 lsls r0, 24 cmp r0, 0 - bne _08095420 + bne @08095420 movs r0, 0 - b _08095430 -_08095420: + b @08095430 +@08095420: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -276386,14 +276386,14 @@ _08095420: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_08095430: +@08095430: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_809540C thumb_func_start sub_8095438 -sub_8095438: @ 8095438 +sub_8095438: ; 8095438 push {lr} ldr r3, =0x085055cd ldrb r2, [r0, 0x6] @@ -276408,7 +276408,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 @@ -276419,7 +276419,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 @@ -276431,7 +276431,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 @@ -276442,7 +276442,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 @@ -276453,7 +276453,7 @@ sub_8095480: @ 8095480 thumb_func_end sub_8095480 thumb_func_start sub_8095490 -sub_8095490: @ 8095490 +sub_8095490: ; 8095490 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -276477,7 +276477,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 @@ -276488,7 +276488,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 @@ -276500,7 +276500,7 @@ sub_80954CC: @ 80954CC thumb_func_end sub_80954CC thumb_func_start sub_80954DC -sub_80954DC: @ 80954DC +sub_80954DC: ; 80954DC push {r4,lr} adds r4, r1, 0 ldr r1, =0x02038c08 @@ -276520,7 +276520,7 @@ sub_80954DC: @ 80954DC thumb_func_end sub_80954DC thumb_func_start sub_8095500 -sub_8095500: @ 8095500 +sub_8095500: ; 8095500 push {r4,lr} adds r4, r1, 0 ldr r1, =0x02038c08 @@ -276540,7 +276540,7 @@ sub_8095500: @ 8095500 thumb_func_end sub_8095500 thumb_func_start sub_8095524 -sub_8095524: @ 8095524 +sub_8095524: ; 8095524 push {r4,lr} adds r4, r1, 0 ldr r1, =0x02038c08 @@ -276560,23 +276560,23 @@ sub_8095524: @ 8095524 thumb_func_end sub_8095524 thumb_func_start sub_8095548 -sub_8095548: @ 8095548 +sub_8095548: ; 8095548 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 ldrb r0, [r4, 0x6] cmp r0, 0x3F - bne _0809555E + bne @0809555E adds r0, r4, 0 bl sub_80B4578 movs r0, 0 - b _08095586 -_0809555E: + b @08095586 +@0809555E: subs r0, 0x39 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _08095580 + bhi @08095580 adds r0, r4, 0 bl sub_8155D78 movs r0, 0x1 @@ -276586,39 +276586,39 @@ _0809555E: bl sub_809558C lsls r0, 24 lsrs r0, 24 - b _08095586 -_08095580: + b @08095586 +@08095580: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_08095586: +@08095586: pop {r4,r5} pop {r1} bx r1 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 lsls r0, 24 cmp r0, 0 - bne _0809559E + bne @0809559E movs r0, 0 - b _080955A4 -_0809559E: + b @080955A4 +@0809559E: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_080955A4: +@080955A4: pop {r4} pop {r1} bx r1 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 @@ -276634,20 +276634,20 @@ 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 bl sub_80979BC lsls r0, 24 cmp r0, 0 - beq _080955E4 + beq @080955E4 adds r0, r4, 0 movs r1, 0x20 bl sub_8097978 movs r0, 0x2 strh r0, [r4, 0x32] -_080955E4: +@080955E4: movs r0, 0 pop {r4} pop {r1} @@ -276655,7 +276655,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 @@ -276673,14 +276673,14 @@ sub_80955EC: @ 80955EC bl sub_809797C lsls r0, 24 cmp r0, 0 - beq _0809561E + beq @0809561E ldrb r0, [r4, 0x1] movs r1, 0x20 orrs r0, r1 strb r0, [r4, 0x1] movs r0, 0x3 strh r0, [r5, 0x32] -_0809561E: +@0809561E: movs r0, 0 pop {r4,r5} pop {r1} @@ -276688,7 +276688,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 @@ -276704,20 +276704,20 @@ 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 bl sub_80979BC lsls r0, 24 cmp r0, 0 - beq _08095660 + beq @08095660 adds r0, r4, 0 movs r1, 0x20 bl sub_8097978 movs r0, 0x2 strh r0, [r4, 0x32] -_08095660: +@08095660: movs r0, 0 pop {r4} pop {r1} @@ -276725,7 +276725,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 @@ -276743,14 +276743,14 @@ sub_8095668: @ 8095668 bl sub_809797C lsls r0, 24 cmp r0, 0 - beq _0809569A + beq @0809569A ldrb r0, [r4, 0x1] movs r1, 0x20 orrs r0, r1 strb r0, [r4, 0x1] movs r0, 0x3 strh r0, [r5, 0x32] -_0809569A: +@0809569A: movs r0, 0 pop {r4,r5} pop {r1} @@ -276758,7 +276758,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 @@ -276769,7 +276769,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 @@ -276781,7 +276781,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] @@ -276808,7 +276808,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] @@ -276833,7 +276833,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 @@ -276843,7 +276843,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 @@ -276854,7 +276854,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 @@ -276880,16 +276880,16 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08095786 + bne @08095786 movs r0, 0 - b _08095798 -_08095786: + b @08095798 +@08095786: adds r2, r4, 0 adds r2, 0x2C ldrb r0, [r2] @@ -276899,14 +276899,14 @@ _08095786: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08095798: +@08095798: pop {r4} pop {r1} bx r1 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 @@ -276932,16 +276932,16 @@ 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 lsls r0, 24 cmp r0, 0 - bne _080957E6 + bne @080957E6 movs r0, 0 - b _080957F8 -_080957E6: + b @080957F8 +@080957E6: adds r2, r4, 0 adds r2, 0x2C ldrb r0, [r2] @@ -276951,14 +276951,14 @@ _080957E6: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_080957F8: +@080957F8: pop {r4} pop {r1} bx r1 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 @@ -276985,16 +276985,16 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08095846 + bne @08095846 movs r0, 0 - b _08095858 -_08095846: + b @08095858 +@08095846: adds r2, r4, 0 adds r2, 0x2C ldrb r0, [r2] @@ -277004,14 +277004,14 @@ _08095846: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08095858: +@08095858: pop {r4} pop {r1} bx r1 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 @@ -277038,16 +277038,16 @@ 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 lsls r0, 24 cmp r0, 0 - bne _080958A6 + bne @080958A6 movs r0, 0 - b _080958B8 -_080958A6: + b @080958B8 +@080958A6: adds r2, r4, 0 adds r2, 0x2C ldrb r0, [r2] @@ -277057,14 +277057,14 @@ _080958A6: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_080958B8: +@080958B8: pop {r4} pop {r1} bx r1 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 @@ -277096,7 +277096,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 @@ -277106,7 +277106,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 @@ -277116,7 +277116,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 @@ -277126,7 +277126,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 @@ -277136,7 +277136,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 @@ -277156,7 +277156,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 @@ -277176,7 +277176,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 @@ -277196,7 +277196,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 @@ -277216,7 +277216,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 @@ -277236,7 +277236,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 @@ -277256,7 +277256,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 @@ -277276,7 +277276,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 @@ -277296,7 +277296,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 @@ -277316,7 +277316,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 @@ -277336,7 +277336,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 @@ -277356,7 +277356,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 @@ -277376,7 +277376,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 @@ -277393,7 +277393,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 @@ -277401,10 +277401,10 @@ sub_8095B0C: @ 8095B0C bl sub_8097758 lsls r0, 24 cmp r0, 0 - bne _08095B22 + bne @08095B22 movs r0, 0 - b _08095B3E -_08095B22: + b @08095B3E +@08095B22: adds r0, r4, 0 bl npc_coords_shift_still ldrb r0, [r4] @@ -277418,14 +277418,14 @@ _08095B22: orrs r0, r1 strb r0, [r2] movs r0, 0x1 -_08095B3E: +@08095B3E: pop {r4,r5} pop {r1} bx r1 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 @@ -277443,27 +277443,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08095B76 + bne @08095B76 movs r0, 0 - b _08095B7C -_08095B76: + b @08095B7C +@08095B76: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08095B7C: +@08095B7C: pop {r4} pop {r1} bx r1 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 @@ -277496,7 +277496,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 @@ -277519,17 +277519,17 @@ 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 bl sub_80941B0 lsls r0, 24 cmp r0, 0 - bne _08095C08 + bne @08095C08 movs r0, 0 - b _08095C18 -_08095C08: + b @08095C18 +@08095C08: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -277538,14 +277538,14 @@ _08095C08: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_08095C18: +@08095C18: pop {r4,r5} pop {r1} bx r1 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 @@ -277568,17 +277568,17 @@ 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 bl sub_80941B0 lsls r0, 24 cmp r0, 0 - bne _08095C60 + bne @08095C60 movs r0, 0 - b _08095C70 -_08095C60: + b @08095C70 +@08095C60: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -277587,14 +277587,14 @@ _08095C60: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_08095C70: +@08095C70: pop {r4,r5} pop {r1} bx r1 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 @@ -277617,17 +277617,17 @@ 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 bl sub_80941B0 lsls r0, 24 cmp r0, 0 - bne _08095CB8 + bne @08095CB8 movs r0, 0 - b _08095CC8 -_08095CB8: + b @08095CC8 +@08095CB8: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -277636,14 +277636,14 @@ _08095CB8: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_08095CC8: +@08095CC8: pop {r4,r5} pop {r1} bx r1 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 @@ -277666,17 +277666,17 @@ 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 bl sub_80941B0 lsls r0, 24 cmp r0, 0 - bne _08095D10 + bne @08095D10 movs r0, 0 - b _08095D20 -_08095D10: + b @08095D20 +@08095D10: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -277685,14 +277685,14 @@ _08095D10: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_08095D20: +@08095D20: pop {r4,r5} pop {r1} bx r1 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 @@ -277715,17 +277715,17 @@ 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 bl sub_80941B0 lsls r0, 24 cmp r0, 0 - bne _08095D68 + bne @08095D68 movs r0, 0 - b _08095D78 -_08095D68: + b @08095D78 +@08095D68: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -277734,14 +277734,14 @@ _08095D68: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_08095D78: +@08095D78: pop {r4,r5} pop {r1} bx r1 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 @@ -277764,17 +277764,17 @@ 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 bl sub_80941B0 lsls r0, 24 cmp r0, 0 - bne _08095DC0 + bne @08095DC0 movs r0, 0 - b _08095DD0 -_08095DC0: + b @08095DD0 +@08095DC0: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -277783,14 +277783,14 @@ _08095DC0: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_08095DD0: +@08095DD0: pop {r4,r5} pop {r1} bx r1 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 @@ -277813,17 +277813,17 @@ 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 bl sub_80941B0 lsls r0, 24 cmp r0, 0 - bne _08095E18 + bne @08095E18 movs r0, 0 - b _08095E28 -_08095E18: + b @08095E28 +@08095E18: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -277832,14 +277832,14 @@ _08095E18: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_08095E28: +@08095E28: pop {r4,r5} pop {r1} bx r1 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 @@ -277862,17 +277862,17 @@ 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 bl sub_80941B0 lsls r0, 24 cmp r0, 0 - bne _08095E70 + bne @08095E70 movs r0, 0 - b _08095E80 -_08095E70: + b @08095E80 +@08095E70: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -277881,14 +277881,14 @@ _08095E70: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_08095E80: +@08095E80: pop {r4,r5} pop {r1} bx r1 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 @@ -277911,17 +277911,17 @@ 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 bl sub_80941B0 lsls r0, 24 cmp r0, 0 - bne _08095EC8 + bne @08095EC8 movs r0, 0 - b _08095ED8 -_08095EC8: + b @08095ED8 +@08095EC8: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -277930,14 +277930,14 @@ _08095EC8: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_08095ED8: +@08095ED8: pop {r4,r5} pop {r1} bx r1 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 @@ -277960,17 +277960,17 @@ 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 bl sub_80941B0 lsls r0, 24 cmp r0, 0 - bne _08095F20 + bne @08095F20 movs r0, 0 - b _08095F30 -_08095F20: + b @08095F30 +@08095F20: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -277979,14 +277979,14 @@ _08095F20: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_08095F30: +@08095F30: pop {r4,r5} pop {r1} bx r1 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 @@ -278009,17 +278009,17 @@ 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 bl sub_80941B0 lsls r0, 24 cmp r0, 0 - bne _08095F78 + bne @08095F78 movs r0, 0 - b _08095F88 -_08095F78: + b @08095F88 +@08095F78: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -278028,14 +278028,14 @@ _08095F78: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_08095F88: +@08095F88: pop {r4,r5} pop {r1} bx r1 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 @@ -278058,17 +278058,17 @@ 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 bl sub_80941B0 lsls r0, 24 cmp r0, 0 - bne _08095FD0 + bne @08095FD0 movs r0, 0 - b _08095FE0 -_08095FD0: + b @08095FE0 +@08095FD0: ldrb r0, [r4, 0x2] movs r1, 0x41 negs r1, r1 @@ -278077,14 +278077,14 @@ _08095FD0: movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -_08095FE0: +@08095FE0: pop {r4,r5} pop {r1} bx r1 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 @@ -278112,7 +278112,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 @@ -278140,7 +278140,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 @@ -278168,7 +278168,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 @@ -278196,7 +278196,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 @@ -278223,7 +278223,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 @@ -278241,27 +278241,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08096132 + bne @08096132 movs r0, 0 - b _08096138 -_08096132: + b @08096138 +@08096132: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08096138: +@08096138: pop {r4} pop {r1} bx r1 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 @@ -278279,27 +278279,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08096172 + bne @08096172 movs r0, 0 - b _08096178 -_08096172: + b @08096178 +@08096172: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08096178: +@08096178: pop {r4} pop {r1} bx r1 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 @@ -278317,27 +278317,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _080961B2 + bne @080961B2 movs r0, 0 - b _080961B8 -_080961B2: + b @080961B8 +@080961B2: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_080961B8: +@080961B8: pop {r4} pop {r1} bx r1 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 @@ -278355,27 +278355,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _080961F2 + bne @080961F2 movs r0, 0 - b _080961F8 -_080961F2: + b @080961F8 +@080961F2: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_080961F8: +@080961F8: pop {r4} pop {r1} bx r1 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 @@ -278400,7 +278400,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 @@ -278418,27 +278418,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08096262 + bne @08096262 movs r0, 0 - b _08096268 -_08096262: + b @08096268 +@08096262: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08096268: +@08096268: pop {r4} pop {r1} bx r1 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 @@ -278456,27 +278456,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _080962A2 + bne @080962A2 movs r0, 0 - b _080962A8 -_080962A2: + b @080962A8 +@080962A2: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_080962A8: +@080962A8: pop {r4} pop {r1} bx r1 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 @@ -278494,27 +278494,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _080962E2 + bne @080962E2 movs r0, 0 - b _080962E8 -_080962E2: + b @080962E8 +@080962E2: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_080962E8: +@080962E8: pop {r4} pop {r1} bx r1 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 @@ -278532,27 +278532,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _08096322 + bne @08096322 movs r0, 0 - b _08096328 -_08096322: + b @08096328 +@08096322: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08096328: +@08096328: pop {r4} pop {r1} bx r1 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 @@ -278579,7 +278579,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 @@ -278597,27 +278597,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _0809639A + bne @0809639A movs r0, 0 - b _080963A0 -_0809639A: + b @080963A0 +@0809639A: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_080963A0: +@080963A0: pop {r4} pop {r1} bx r1 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 @@ -278635,27 +278635,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _080963DA + bne @080963DA movs r0, 0 - b _080963E0 -_080963DA: + b @080963E0 +@080963DA: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_080963E0: +@080963E0: pop {r4} pop {r1} bx r1 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 @@ -278673,27 +278673,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _0809641A + bne @0809641A movs r0, 0 - b _08096420 -_0809641A: + b @08096420 +@0809641A: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08096420: +@08096420: pop {r4} pop {r1} bx r1 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 @@ -278711,27 +278711,27 @@ 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 lsls r0, 24 cmp r0, 0 - bne _0809645A + bne @0809645A movs r0, 0 - b _08096460 -_0809645A: + b @08096460 +@0809645A: movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -_08096460: +@08096460: pop {r4} pop {r1} bx r1 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 @@ -278743,7 +278743,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] @@ -278758,35 +278758,35 @@ 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 movs r1, 0x26 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080964A6 + beq @080964A6 movs r0, 0 - b _080964B0 -_080964A6: + b @080964B0 +@080964A6: ldrb r0, [r2, 0x1B] bl sub_8098044 movs r0, 0x1 strh r0, [r4, 0x32] -_080964B0: +@080964B0: pop {r4} pop {r1} bx r1 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 -sub_80964BC: @ 80964BC +sub_80964BC: ; 80964BC adds r1, 0x2C ldrb r0, [r1] movs r2, 0x40 @@ -278797,31 +278797,31 @@ sub_80964BC: @ 80964BC thumb_func_end sub_80964BC thumb_func_start npc_obj_transfer_image_anim_pause_flag -npc_obj_transfer_image_anim_pause_flag: @ 80964CC +npc_obj_transfer_image_anim_pause_flag: ; 80964CC push {lr} ldrb r0, [r0, 0x1] lsls r0, 29 cmp r0, 0 - bge _080964E2 + bge @080964E2 adds r0, r1, 0 adds r0, 0x2C ldrb r1, [r0] movs r2, 0x40 orrs r1, r2 strb r1, [r0] -_080964E2: +@080964E2: pop {r0} bx r0 thumb_func_end npc_obj_transfer_image_anim_pause_flag thumb_func_start sub_80964E8 -sub_80964E8: @ 80964E8 +sub_80964E8: ; 80964E8 push {r4,lr} adds r4, r0, 0 ldrb r3, [r4, 0x1] lsls r0, r3, 28 cmp r0, 0 - bge _08096510 + bge @08096510 adds r2, r1, 0 adds r2, 0x2C ldrb r1, [r2] @@ -278836,14 +278836,14 @@ sub_80964E8: @ 80964E8 negs r1, r1 ands r0, r1 strb r0, [r4, 0x1] -_08096510: +@08096510: pop {r4} pop {r0} bx r0 thumb_func_end sub_80964E8 thumb_func_start sub_8096518 -sub_8096518: @ 8096518 +sub_8096518: ; 8096518 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -278857,7 +278857,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 @@ -278875,7 +278875,7 @@ sub_8096530: @ 8096530 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08096594 + beq @08096594 ldrh r1, [r4, 0x24] ldrh r0, [r4, 0x20] adds r1, r0 @@ -278902,10 +278902,10 @@ sub_8096530: @ 8096530 adds r0, r1 ldrh r2, [r2] adds r0, r2 - b _080965BC + b @080965BC .align 2, 0 .pool -_08096594: +@08096594: ldrh r1, [r4, 0x24] ldrh r0, [r4, 0x20] adds r1, r0 @@ -278926,7 +278926,7 @@ _08096594: lsls r0, 24 asrs r0, 24 adds r0, r1 -_080965BC: +@080965BC: lsls r0, 16 lsrs r2, r0, 16 ldrh r0, [r6, 0x8] @@ -278940,42 +278940,42 @@ _080965BC: lsls r0, r3, 16 asrs r0, 16 cmp r0, 0xFF - bgt _080965E4 + bgt @080965E4 lsls r0, r1, 16 asrs r0, 16 movs r1, 0x10 negs r1, r1 cmp r0, r1 - bge _080965EC -_080965E4: + bge @080965EC +@080965E4: ldrb r0, [r5, 0x1] movs r1, 0x40 orrs r0, r1 strb r0, [r5, 0x1] -_080965EC: +@080965EC: lsls r0, r2, 16 asrs r0, 16 cmp r0, 0xAF - bgt _08096600 + bgt @08096600 lsls r0, r4, 16 asrs r0, 16 movs r1, 0x10 negs r1, r1 cmp r0, r1 - bge _08096608 -_08096600: + bge @08096608 +@08096600: ldrb r0, [r5, 0x1] movs r1, 0x40 orrs r0, r1 strb r0, [r5, 0x1] -_08096608: +@08096608: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_8096530 thumb_func_start npc_update_obj_anim_flag -npc_update_obj_anim_flag: @ 8096610 +npc_update_obj_anim_flag: ; 8096610 push {lr} adds r2, r1, 0 adds r2, 0x3E @@ -278988,18 +278988,18 @@ npc_update_obj_anim_flag: @ 8096610 movs r0, 0x60 ands r0, r1 cmp r0, 0 - beq _08096632 + beq @08096632 movs r1, 0x4 adds r0, r3, 0 orrs r0, r1 strb r0, [r2] -_08096632: +@08096632: pop {r0} bx r0 thumb_func_end npc_update_obj_anim_flag thumb_func_start dp03_build_bits_2 -dp03_build_bits_2: @ 8096638 +dp03_build_bits_2: ; 8096638 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -279031,7 +279031,7 @@ dp03_build_bits_2: @ 8096638 thumb_func_end dp03_build_bits_2 thumb_func_start dp03_build_bits_1 -dp03_build_bits_1: @ 8096680 +dp03_build_bits_1: ; 8096680 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -279069,7 +279069,7 @@ dp03_build_bits_1: @ 8096680 thumb_func_end dp03_build_bits_1 thumb_func_start npc_analyze_ground -npc_analyze_ground: @ 80966D8 +npc_analyze_ground: ; 80966D8 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -279104,7 +279104,7 @@ npc_analyze_ground: @ 80966D8 thumb_func_end npc_analyze_ground thumb_func_start npc_update_tile_attributes -npc_update_tile_attributes: @ 8096728 +npc_update_tile_attributes: ; 8096728 push {r4,lr} adds r4, r0, 0 movs r1, 0x14 @@ -279125,7 +279125,7 @@ npc_update_tile_attributes: @ 8096728 thumb_func_end npc_update_tile_attributes thumb_func_start dp03_build_bits_water -dp03_build_bits_water: @ 8096750 +dp03_build_bits_water: ; 8096750 push {r4,r5,lr} sub sp, 0x8 adds r4, r0, 0 @@ -279140,11 +279140,11 @@ dp03_build_bits_water: @ 8096750 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - beq _08096798 + beq @08096798 ldrb r1, [r4, 0x2] lsls r0, r1, 30 cmp r0, 0 - blt _080967A2 + blt @080967A2 movs r0, 0x3 negs r0, r0 ands r0, r1 @@ -279158,16 +279158,16 @@ dp03_build_bits_water: @ 8096750 ldr r0, [r0] orrs r1, r0 str r1, [r5] - b _080967A2 + b @080967A2 .align 2, 0 .pool -_08096798: +@08096798: ldrb r1, [r4, 0x2] movs r0, 0x3 negs r0, r0 ands r0, r1 strb r0, [r4, 0x2] -_080967A2: +@080967A2: add sp, 0x8 pop {r4,r5} pop {r0} @@ -279175,83 +279175,83 @@ _080967A2: thumb_func_end dp03_build_bits_water thumb_func_start dp03_build_bits_normal_grass__bit_1 -dp03_build_bits_normal_grass__bit_1: @ 80967AC +dp03_build_bits_normal_grass__bit_1: ; 80967AC push {r4,lr} adds r4, r1, 0 ldrb r0, [r0, 0x1E] bl is_tile_x02_or_xD1 lsls r0, 24 cmp r0, 0 - beq _080967C4 + beq @080967C4 ldr r0, [r4] movs r1, 0x1 orrs r0, r1 str r0, [r4] -_080967C4: +@080967C4: pop {r4} pop {r0} bx r0 thumb_func_end dp03_build_bits_normal_grass__bit_1 thumb_func_start dp03_build_bits_normal_grass__bit_2 -dp03_build_bits_normal_grass__bit_2: @ 80967CC +dp03_build_bits_normal_grass__bit_2: ; 80967CC push {r4,lr} adds r4, r1, 0 ldrb r0, [r0, 0x1E] bl is_tile_x02_or_xD1 lsls r0, 24 cmp r0, 0 - beq _080967E4 + beq @080967E4 ldr r0, [r4] movs r1, 0x2 orrs r0, r1 str r0, [r4] -_080967E4: +@080967E4: pop {r4} pop {r0} bx r0 thumb_func_end dp03_build_bits_normal_grass__bit_2 thumb_func_start dp03_build_bits_tall_grass_1 -dp03_build_bits_tall_grass_1: @ 80967EC +dp03_build_bits_tall_grass_1: ; 80967EC push {r4,lr} adds r4, r1, 0 ldrb r0, [r0, 0x1E] bl is_tile_tallgrass lsls r0, 24 cmp r0, 0 - beq _08096804 + beq @08096804 ldr r0, [r4] movs r1, 0x4 orrs r0, r1 str r0, [r4] -_08096804: +@08096804: pop {r4} pop {r0} bx r0 thumb_func_end dp03_build_bits_tall_grass_1 thumb_func_start dp03_build_bits_tall_grass_0 -dp03_build_bits_tall_grass_0: @ 809680C +dp03_build_bits_tall_grass_0: ; 809680C push {r4,lr} adds r4, r1, 0 ldrb r0, [r0, 0x1E] bl is_tile_tallgrass lsls r0, 24 cmp r0, 0 - beq _08096824 + beq @08096824 ldr r0, [r4] movs r1, 0x8 orrs r0, r1 str r0, [r4] -_08096824: +@08096824: pop {r4} pop {r0} bx r0 thumb_func_end dp03_build_bits_tall_grass_0 thumb_func_start dp03_build_bits_sand -dp03_build_bits_sand: @ 809682C +dp03_build_bits_sand: ; 809682C push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -279259,36 +279259,36 @@ dp03_build_bits_sand: @ 809682C bl zero_0 lsls r0, 24 cmp r0, 0 - beq _08096846 + beq @08096846 ldr r0, [r5] movs r1, 0x80 lsls r1, 1 - b _08096862 -_08096846: + b @08096862 +@08096846: ldrb r0, [r4, 0x1F] bl is_x21_or_x2B lsls r0, 24 cmp r0, 0 - bne _0809685E + bne @0809685E ldrb r0, [r4, 0x1F] bl sub_8089498 lsls r0, 24 cmp r0, 0 - beq _08096866 -_0809685E: + beq @08096866 +@0809685E: ldr r0, [r5] movs r1, 0x80 -_08096862: +@08096862: orrs r0, r1 str r0, [r5] -_08096866: +@08096866: pop {r4,r5} pop {r0} bx r0 thumb_func_end dp03_build_bits_sand thumb_func_start dp03_build_bits_unknown_1 -dp03_build_bits_unknown_1: @ 809686C +dp03_build_bits_unknown_1: ; 809686C push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -279296,16 +279296,16 @@ dp03_build_bits_unknown_1: @ 809686C bl zero_0 lsls r0, 24 cmp r0, 0 - beq _080968AA + beq @080968AA ldrb r0, [r4, 0x1F] bl zero_0 lsls r0, 24 cmp r0, 0 - beq _080968AA + beq @080968AA ldrb r1, [r4, 0x2] lsls r0, r1, 27 cmp r0, 0 - blt _080968B4 + blt @080968B4 movs r0, 0x11 negs r0, r0 ands r0, r1 @@ -279317,21 +279317,21 @@ dp03_build_bits_unknown_1: @ 809686C lsls r1, 4 orrs r0, r1 str r0, [r5] - b _080968B4 -_080968AA: + b @080968B4 +@080968AA: ldrb r1, [r4, 0x2] movs r0, 0x11 negs r0, r0 ands r0, r1 strb r0, [r4, 0x2] -_080968B4: +@080968B4: pop {r4,r5} pop {r0} bx r0 thumb_func_end dp03_build_bits_unknown_1 thumb_func_start dp03_build_bits_unknown_2 -dp03_build_bits_unknown_2: @ 80968BC +dp03_build_bits_unknown_2: ; 80968BC push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -279339,28 +279339,28 @@ dp03_build_bits_unknown_2: @ 80968BC bl sub_80895E8 lsls r0, 24 cmp r0, 0 - beq _080968DA + beq @080968DA ldrb r0, [r4, 0x1F] bl sub_80895E8 lsls r0, 24 cmp r0, 0 - bne _080968F2 -_080968DA: + bne @080968F2 +@080968DA: ldrb r0, [r4, 0x1E] bl is_tile_x17 lsls r0, 24 cmp r0, 0 - beq _08096910 + beq @08096910 ldrb r0, [r4, 0x1F] bl is_tile_x17 lsls r0, 24 cmp r0, 0 - beq _08096910 -_080968F2: + beq @08096910 +@080968F2: ldrb r1, [r4, 0x2] lsls r0, r1, 28 cmp r0, 0 - blt _0809691A + blt @0809691A movs r0, 0x9 negs r0, r0 ands r0, r1 @@ -279371,21 +279371,21 @@ _080968F2: movs r1, 0x40 orrs r0, r1 str r0, [r5] - b _0809691A -_08096910: + b @0809691A +@08096910: ldrb r1, [r4, 0x2] movs r0, 0x9 negs r0, r0 ands r0, r1 strb r0, [r4, 0x2] -_0809691A: +@0809691A: pop {r4,r5} pop {r0} bx r0 thumb_func_end dp03_build_bits_unknown_2 thumb_func_start dp03_build_bits_splash -dp03_build_bits_splash: @ 8096920 +dp03_build_bits_splash: ; 8096920 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -279393,45 +279393,45 @@ dp03_build_bits_splash: @ 8096920 bl is_tile_x16_clear_water lsls r0, 24 cmp r0, 0 - beq _08096948 + beq @08096948 ldrb r0, [r4, 0x1F] bl is_tile_x16_clear_water lsls r0, 24 cmp r0, 0 - beq _08096948 + beq @08096948 ldr r0, [r5] movs r1, 0x80 lsls r1, 3 orrs r0, r1 str r0, [r5] -_08096948: +@08096948: pop {r4,r5} pop {r0} bx r0 thumb_func_end dp03_build_bits_splash thumb_func_start dp03_build_bits_8067E4C -dp03_build_bits_8067E4C: @ 8096950 +dp03_build_bits_8067E4C: ; 8096950 push {r4,lr} adds r4, r1, 0 ldrb r0, [r0, 0x1E] bl is_tile_x10_or_x16 lsls r0, 24 cmp r0, 0 - beq _0809696A + beq @0809696A ldr r0, [r4] movs r1, 0x80 lsls r1, 2 orrs r0, r1 str r0, [r4] -_0809696A: +@0809696A: pop {r4} pop {r0} bx r0 thumb_func_end dp03_build_bits_8067E4C thumb_func_start dp03_build_bits_tiny_grass -dp03_build_bits_tiny_grass: @ 8096970 +dp03_build_bits_tiny_grass: ; 8096970 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -279439,16 +279439,16 @@ dp03_build_bits_tiny_grass: @ 8096970 bl sub_8089714 lsls r0, 24 cmp r0, 0 - beq _080969AE + beq @080969AE ldrb r0, [r4, 0x1F] bl sub_8089714 lsls r0, 24 cmp r0, 0 - beq _080969AE + beq @080969AE ldrb r1, [r4, 0x2] lsls r0, r1, 29 cmp r0, 0 - blt _080969B8 + blt @080969B8 movs r0, 0x5 negs r0, r0 ands r0, r1 @@ -279460,21 +279460,21 @@ dp03_build_bits_tiny_grass: @ 8096970 lsls r1, 10 orrs r0, r1 str r0, [r5] - b _080969B8 -_080969AE: + b @080969B8 +@080969AE: ldrb r1, [r4, 0x2] movs r0, 0x5 negs r0, r0 ands r0, r1 strb r0, [r4, 0x2] -_080969B8: +@080969B8: pop {r4,r5} pop {r0} bx r0 thumb_func_end dp03_build_bits_tiny_grass thumb_func_start dp03_build_bits_8067EBC -dp03_build_bits_8067EBC: @ 80969C0 +dp03_build_bits_8067EBC: ; 80969C0 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -279482,16 +279482,16 @@ dp03_build_bits_8067EBC: @ 80969C0 bl is_tile_halfwater lsls r0, 24 cmp r0, 0 - beq _080969FE + beq @080969FE ldrb r0, [r4, 0x1F] bl is_tile_halfwater lsls r0, 24 cmp r0, 0 - beq _080969FE + beq @080969FE ldrb r1, [r4, 0x2] lsls r0, r1, 26 cmp r0, 0 - blt _08096A08 + blt @08096A08 movs r0, 0x21 negs r0, r0 ands r0, r1 @@ -279503,41 +279503,41 @@ dp03_build_bits_8067EBC: @ 80969C0 lsls r1, 11 orrs r0, r1 str r0, [r5] - b _08096A08 -_080969FE: + b @08096A08 +@080969FE: ldrb r1, [r4, 0x2] movs r0, 0x21 negs r0, r0 ands r0, r1 strb r0, [r4, 0x2] -_08096A08: +@08096A08: pop {r4,r5} pop {r0} bx r0 thumb_func_end dp03_build_bits_8067EBC thumb_func_start dp03_build_bits_bubbles -dp03_build_bits_bubbles: @ 8096A10 +dp03_build_bits_bubbles: ; 8096A10 push {r4,lr} adds r4, r1, 0 ldrb r0, [r0, 0x1E] bl it_tile_x22 lsls r0, 24 cmp r0, 0 - beq _08096A2A + beq @08096A2A ldr r0, [r4] movs r1, 0x80 lsls r1, 12 orrs r0, r1 str r0, [r4] -_08096A2A: +@08096A2A: pop {r4} pop {r0} bx r0 thumb_func_end dp03_build_bits_bubbles thumb_func_start dp03_build_bits_by_block_behaviour -dp03_build_bits_by_block_behaviour: @ 8096A30 +dp03_build_bits_by_block_behaviour: ; 8096A30 push {r4-r7,lr} mov r7, r8 push {r7} @@ -279547,11 +279547,11 @@ dp03_build_bits_by_block_behaviour: @ 8096A30 ldr r1, =0x02000020 ands r0, r1 cmp r0, 0x20 - bne _08096A82 + bne @08096A82 movs r5, 0 ldr r0, =0x0850e5e4 mov r8, r0 -_08096A4A: +@08096A4A: lsls r4, r5, 2 mov r0, r8 adds r1, r4, r0 @@ -279560,23 +279560,23 @@ _08096A4A: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - beq _08096A78 + beq @08096A78 ldr r0, =0x0850e5fc adds r0, r4, r0 ldr r1, [r6] ldr r0, [r0] orrs r1, r0 str r1, [r6] - b _08096A82 + b @08096A82 .align 2, 0 .pool -_08096A78: +@08096A78: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls _08096A4A -_08096A82: + bls @08096A4A +@08096A82: pop {r3} mov r8, r3 pop {r4-r7} @@ -279585,7 +279585,7 @@ _08096A82: thumb_func_end dp03_build_bits_by_block_behaviour thumb_func_start npcs_and_water_something -npcs_and_water_something: @ 8096A8C +npcs_and_water_something: ; 8096A8C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -279610,12 +279610,12 @@ npcs_and_water_something: @ 8096A8C str r2, [sp, 0x4] asrs r0, 16 cmp r4, r0 - blt _08096AC2 - b _08096BC8 -_08096AC2: + blt @08096AC2 + b @08096BC8 +@08096AC2: movs r0, 0x1 mov r10, r0 -_08096AC6: +@08096AC6: movs r1, 0x10 ldrsh r0, [r5, r1] movs r2, 0x12 @@ -279632,7 +279632,7 @@ _08096AC6: lsrs r0, 24 mov r9, r4 cmp r0, 0 - bne _08096BCA + bne @08096BCA movs r1, 0x14 ldrsh r0, [r5, r1] movs r2, 0x16 @@ -279646,18 +279646,18 @@ _08096AC6: lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _08096BCA + bne @08096BCA movs r2, 0x1 ldr r1, [sp] lsls r0, r1, 16 asrs r1, r0, 16 mov r8, r0 cmp r2, r1 - bge _08096BB6 + bge @08096BB6 movs r0, 0x80 lsls r0, 9 asrs r7, r0, 16 -_08096B20: +@08096B20: movs r1, 0x10 ldrsh r0, [r5, r1] lsls r1, r2, 16 @@ -279674,7 +279674,7 @@ _08096B20: lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _08096BCA + bne @08096BCA movs r1, 0x10 ldrsh r0, [r5, r1] subs r0, r4 @@ -279689,7 +279689,7 @@ _08096B20: lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _08096BCA + bne @08096BCA movs r1, 0x14 ldrsh r0, [r5, r1] adds r0, r4 @@ -279704,7 +279704,7 @@ _08096B20: lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _08096BCA + bne @08096BCA movs r1, 0x14 ldrsh r0, [r5, r1] subs r0, r4 @@ -279719,13 +279719,13 @@ _08096B20: lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _08096BCA + bne @08096BCA adds r0, r4, 0x1 lsls r0, 16 lsrs r2, r0, 16 cmp r0, r8 - blt _08096B20 -_08096BB6: + blt @08096B20 +@08096BB6: movs r1, 0x80 lsls r1, 9 add r1, r9 @@ -279733,11 +279733,11 @@ _08096BB6: ldr r2, [sp, 0x4] lsls r0, r2, 16 cmp r1, r0 - bge _08096BC8 - b _08096AC6 -_08096BC8: + bge @08096BC8 + b @08096AC6 +@08096BC8: movs r0, 0 -_08096BCA: +@08096BCA: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -279749,7 +279749,7 @@ _08096BCA: thumb_func_end npcs_and_water_something thumb_func_start is_reflective_tile -is_reflective_tile: @ 8096BDC +is_reflective_tile: ; 8096BDC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -279757,27 +279757,27 @@ is_reflective_tile: @ 8096BDC bl is_tile_x23_2 lsls r0, 24 cmp r0, 0 - beq _08096BF2 + beq @08096BF2 movs r0, 0x1 - b _08096C04 -_08096BF2: + b @08096C04 +@08096BF2: adds r0, r4, 0 bl is_water_tile_2 lsls r0, 24 cmp r0, 0 - bne _08096C02 + bne @08096C02 movs r0, 0 - b _08096C04 -_08096C02: + b @08096C04 +@08096C02: movs r0, 0x2 -_08096C04: +@08096C04: pop {r4} pop {r1} bx r1 thumb_func_end is_reflective_tile thumb_func_start cur_mapdata_role_x38_to_x3B__by_direction -cur_mapdata_role_x38_to_x3B__by_direction: @ 8096C0C +cur_mapdata_role_x38_to_x3B__by_direction: ; 8096C0C push {r4,lr} lsls r0, 16 lsrs r3, r0, 16 @@ -279786,13 +279786,13 @@ cur_mapdata_role_x38_to_x3B__by_direction: @ 8096C0C lsls r2, 24 lsrs r4, r2, 24 cmp r4, 0 - beq _08096C52 + beq @08096C52 cmp r4, 0x4 - bls _08096C28 + bls @08096C28 subs r0, r4, 0x4 lsls r0, 24 lsrs r4, r0, 24 -_08096C28: +@08096C28: subs r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -279811,41 +279811,41 @@ _08096C28: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08096C5C -_08096C52: + beq @08096C5C +@08096C52: movs r0, 0 - b _08096C62 + b @08096C62 .align 2, 0 .pool -_08096C5C: +@08096C5C: adds r0, r4, 0x1 lsls r0, 24 lsrs r0, 24 -_08096C62: +@08096C62: pop {r4} pop {r1} bx r1 thumb_func_end cur_mapdata_role_x38_to_x3B__by_direction thumb_func_start npc_shuffle_bits_in_tall_grass -npc_shuffle_bits_in_tall_grass: @ 8096C68 +npc_shuffle_bits_in_tall_grass: ; 8096C68 push {r4-r6,lr} adds r5, r0, 0 adds r4, r1, 0 ldrb r0, [r5] lsls r0, 27 cmp r0, 0 - blt _08096CBC + blt @08096CBC ldrb r0, [r5, 0x1E] bl is_tile_tallgrass lsls r0, 24 cmp r0, 0 - beq _08096CBC + beq @08096CBC ldrb r0, [r5, 0x1F] bl is_tile_tallgrass lsls r0, 24 cmp r0, 0 - beq _08096CBC + beq @08096CBC adds r4, 0x42 ldrb r1, [r4] movs r6, 0x40 @@ -279861,21 +279861,21 @@ npc_shuffle_bits_in_tall_grass: @ 8096C68 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08096CBC + bne @08096CBC ldrb r0, [r4] adds r1, r6, 0 ands r1, r0 movs r0, 0x5 orrs r1, r0 strb r1, [r4] -_08096CBC: +@08096CBC: pop {r4-r6} pop {r0} bx r0 thumb_func_end npc_shuffle_bits_in_tall_grass thumb_func_start cur_mapdata_height_mismatch -cur_mapdata_height_mismatch: @ 8096CC4 +cur_mapdata_height_mismatch: ; 8096CC4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -279884,7 +279884,7 @@ cur_mapdata_height_mismatch: @ 8096CC4 lsls r2, 16 lsrs r1, r2, 16 cmp r4, 0 - beq _08096CF2 + beq @08096CF2 lsls r0, 16 asrs r0, 16 lsls r1, 16 @@ -279893,31 +279893,31 @@ cur_mapdata_height_mismatch: @ 8096CC4 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _08096CF2 + beq @08096CF2 cmp r0, 0xF - beq _08096CF2 + beq @08096CF2 cmp r0, r4 - bne _08096CF6 -_08096CF2: + bne @08096CF6 +@08096CF2: movs r0, 0 - b _08096CF8 -_08096CF6: + b @08096CF8 +@08096CF6: movs r0, 0x1 -_08096CF8: +@08096CF8: pop {r4} pop {r1} bx r1 thumb_func_end cur_mapdata_height_mismatch thumb_func_start sub_8096D00 -sub_8096D00: @ 8096D00 +sub_8096D00: ; 8096D00 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 ldrb r0, [r4, 0x3] lsls r0, 29 cmp r0, 0 - blt _08096D4E + blt @08096D4E adds r0, r4, 0 bl sub_8096DB8 ldr r1, =0x0850e644 @@ -279949,7 +279949,7 @@ sub_8096D00: @ 8096D00 ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] -_08096D4E: +@08096D4E: pop {r4,r5} pop {r0} bx r0 @@ -279958,7 +279958,7 @@ _08096D4E: thumb_func_end sub_8096D00 thumb_func_start sub_8096D5C -sub_8096D5C: @ 8096D5C +sub_8096D5C: ; 8096D5C push {r4,lr} lsls r1, 24 lsrs r1, 24 @@ -279998,7 +279998,7 @@ sub_8096D5C: @ 8096D5C thumb_func_end sub_8096D5C thumb_func_start sub_8096DA8 -sub_8096DA8: @ 8096DA8 +sub_8096DA8: ; 8096DA8 lsls r0, 24 lsrs r0, 24 ldr r1, =0x0850e634 @@ -280010,7 +280010,7 @@ sub_8096DA8: @ 8096DA8 thumb_func_end sub_8096DA8 thumb_func_start sub_8096DB8 -sub_8096DB8: @ 8096DB8 +sub_8096DB8: ; 8096DB8 push {r4,r5,lr} adds r4, r0, 0 movs r1, 0x10 @@ -280028,9 +280028,9 @@ sub_8096DB8: @ 8096DB8 lsls r0, 24 lsrs r0, 24 cmp r5, 0xF - beq _08096E06 + beq @08096E06 cmp r0, 0xF - beq _08096E06 + beq @08096E06 movs r3, 0xF adds r0, r5, 0 ands r0, r3 @@ -280041,21 +280041,21 @@ sub_8096DB8: @ 8096DB8 orrs r2, r0 strb r2, [r4, 0xB] cmp r5, 0 - beq _08096E06 + beq @08096E06 cmp r5, 0xF - beq _08096E06 + beq @08096E06 lsls r0, r5, 4 ands r2, r3 orrs r2, r0 strb r2, [r4, 0xB] -_08096E06: +@08096E06: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_8096DB8 thumb_func_start npc_y_height_related -npc_y_height_related: @ 8096E0C +npc_y_height_related: ; 8096E0C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -280093,47 +280093,47 @@ npc_y_height_related: @ 8096E0C thumb_func_end npc_y_height_related thumb_func_start npc_y_height_related_ -npc_y_height_related_: @ 8096E54 +npc_y_height_related_: ; 8096E54 push {lr} adds r2, r0, 0 ldrb r0, [r2, 0x3] lsls r0, 29 cmp r0, 0 - blt _08096E6A + blt @08096E6A ldrb r0, [r2, 0xB] lsrs r0, 4 movs r2, 0x1 bl npc_y_height_related -_08096E6A: +@08096E6A: pop {r0} bx r0 thumb_func_end npc_y_height_related_ thumb_func_start r0r1_zero_or_same -r0r1_zero_or_same: @ 8096E70 +r0r1_zero_or_same: ; 8096E70 push {lr} lsls r0, 24 lsrs r0, 24 lsls r1, 24 lsrs r1, 24 cmp r0, 0 - beq _08096E86 + beq @08096E86 cmp r1, 0 - beq _08096E86 + beq @08096E86 cmp r0, r1 - bne _08096E8A -_08096E86: + bne @08096E8A +@08096E86: movs r0, 0x1 - b _08096E8C -_08096E8A: + b @08096E8C +@08096E8A: movs r0, 0 -_08096E8C: +@08096E8C: pop {r1} bx r1 thumb_func_end r0r1_zero_or_same thumb_func_start dp03_step_grass_normal -dp03_step_grass_normal: @ 8096E90 +dp03_step_grass_normal: ; 8096E90 push {lr} ldr r3, =0x02038c08 movs r2, 0x10 @@ -280172,7 +280172,7 @@ dp03_step_grass_normal: @ 8096E90 thumb_func_end dp03_step_grass_normal thumb_func_start dp03_step_grass_elastic -dp03_step_grass_elastic: @ 8096EDC +dp03_step_grass_elastic: ; 8096EDC push {lr} ldr r3, =0x02038c08 movs r2, 0x10 @@ -280211,7 +280211,7 @@ dp03_step_grass_elastic: @ 8096EDC thumb_func_end dp03_step_grass_elastic thumb_func_start dp03_step_grass_tall_1 -dp03_step_grass_tall_1: @ 8096F28 +dp03_step_grass_tall_1: ; 8096F28 push {lr} ldr r3, =0x02038c08 movs r2, 0x10 @@ -280250,7 +280250,7 @@ dp03_step_grass_tall_1: @ 8096F28 thumb_func_end dp03_step_grass_tall_1 thumb_func_start dp03_step_grass_tall_0 -dp03_step_grass_tall_0: @ 8096F74 +dp03_step_grass_tall_0: ; 8096F74 push {lr} ldr r3, =0x02038c08 movs r2, 0x10 @@ -280289,7 +280289,7 @@ dp03_step_grass_tall_0: @ 8096F74 thumb_func_end dp03_step_grass_tall_0 thumb_func_start dp03_step_water_reflection_0 -dp03_step_water_reflection_0: @ 8096FC0 +dp03_step_water_reflection_0: ; 8096FC0 push {lr} movs r2, 0 bl dp03_step_water_reflection @@ -280298,7 +280298,7 @@ dp03_step_water_reflection_0: @ 8096FC0 thumb_func_end dp03_step_water_reflection_0 thumb_func_start sub_8096FCC -sub_8096FCC: @ 8096FCC +sub_8096FCC: ; 8096FCC push {lr} movs r2, 0x1 bl dp03_step_water_reflection @@ -280307,7 +280307,7 @@ sub_8096FCC: @ 8096FCC thumb_func_end sub_8096FCC thumb_func_start sub_8096FD8 -sub_8096FD8: @ 8096FD8 +sub_8096FD8: ; 8096FD8 push {lr} adds r1, r0, 0 movs r0, 0x22 @@ -280317,7 +280317,7 @@ sub_8096FD8: @ 8096FD8 thumb_func_end sub_8096FD8 thumb_func_start sub_8096FE8 -sub_8096FE8: @ 8096FE8 +sub_8096FE8: ; 8096FE8 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -280340,7 +280340,7 @@ sub_8096FE8: @ 8096FE8 thumb_func_end sub_8096FE8 thumb_func_start dp03_step_sand_heavy -dp03_step_sand_heavy: @ 8097014 +dp03_step_sand_heavy: ; 8097014 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -280363,12 +280363,12 @@ dp03_step_sand_heavy: @ 8097014 thumb_func_end dp03_step_sand_heavy thumb_func_start nullsub_93 -nullsub_93: @ 8097040 +nullsub_93: ; 8097040 bx lr thumb_func_end nullsub_93 thumb_func_start sub_8097044 -sub_8097044: @ 8097044 +sub_8097044: ; 8097044 push {r4,r5,lr} sub sp, 0x4 adds r5, r0, 0 @@ -280407,13 +280407,13 @@ sub_8097044: @ 8097044 thumb_func_end sub_8097044 thumb_func_start sub_8097094 -sub_8097094: @ 8097094 +sub_8097094: ; 8097094 push {r4,lr} adds r4, r0, 0 ldr r1, [r4, 0x10] ldr r0, [r4, 0x14] cmp r1, r0 - beq _080970D6 + beq @080970D6 ldr r2, =0x02038c08 movs r1, 0x14 ldrsh r0, [r4, r1] @@ -280440,7 +280440,7 @@ sub_8097094: @ 8097094 str r0, [r2, 0x10] movs r0, 0x23 bl oe_exec -_080970D6: +@080970D6: pop {r4} pop {r0} bx r0 @@ -280449,7 +280449,7 @@ _080970D6: thumb_func_end sub_8097094 thumb_func_start sub_80970E4 -sub_80970E4: @ 80970E4 +sub_80970E4: ; 80970E4 push {lr} bl sub_8097E14 pop {r0} @@ -280457,7 +280457,7 @@ sub_80970E4: @ 80970E4 thumb_func_end sub_80970E4 thumb_func_start dp03_step_splash_small -dp03_step_splash_small: @ 80970F0 +dp03_step_splash_small: ; 80970F0 push {lr} adds r1, r0, 0 movs r0, 0xF @@ -280467,7 +280467,7 @@ dp03_step_splash_small: @ 80970F0 thumb_func_end dp03_step_splash_small thumb_func_start sub_8097100 -sub_8097100: @ 8097100 +sub_8097100: ; 8097100 push {lr} adds r1, r0, 0 movs r0, 0x27 @@ -280477,7 +280477,7 @@ sub_8097100: @ 8097100 thumb_func_end sub_8097100 thumb_func_start dp03_step_grass_thin -dp03_step_grass_thin: @ 8097110 +dp03_step_grass_thin: ; 8097110 push {r4-r7,lr} sub sp, 0x4 adds r5, r0, 0 @@ -280508,11 +280508,11 @@ dp03_step_grass_thin: @ 8097110 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - bne _0809715A + bne @0809715A adds r0, r5, 0 adds r1, r6, 0 bl dp03_step_grass_normal -_0809715A: +@0809715A: add sp, 0x4 pop {r4-r7} pop {r0} @@ -280522,7 +280522,7 @@ _0809715A: thumb_func_end dp03_step_grass_thin thumb_func_start dp03_step_grass_heavy -dp03_step_grass_heavy: @ 8097168 +dp03_step_grass_heavy: ; 8097168 push {lr} ldr r2, =0x02038c08 movs r3, 0x10 @@ -280545,7 +280545,7 @@ dp03_step_grass_heavy: @ 8097168 thumb_func_end dp03_step_grass_heavy thumb_func_start dp03_step_bike_splash_probably -dp03_step_bike_splash_probably: @ 8097190 +dp03_step_bike_splash_probably: ; 8097190 push {r4,lr} ldr r3, =0x02038c08 movs r4, 0x10 @@ -280571,7 +280571,7 @@ dp03_step_bike_splash_probably: @ 8097190 thumb_func_end dp03_step_bike_splash_probably thumb_func_start dp03_step_drop_water -dp03_step_drop_water: @ 80971C0 +dp03_step_drop_water: ; 80971C0 push {r4,lr} ldr r3, =0x02038c08 movs r4, 0x10 @@ -280597,7 +280597,7 @@ dp03_step_drop_water: @ 80971C0 thumb_func_end dp03_step_drop_water thumb_func_start dp03_step_dust -dp03_step_dust: @ 80971F0 +dp03_step_dust: ; 80971F0 push {r4,lr} ldr r3, =0x02038c08 movs r4, 0x10 @@ -280623,7 +280623,7 @@ dp03_step_dust: @ 80971F0 thumb_func_end dp03_step_dust thumb_func_start dp03_step_grass_tiny -dp03_step_grass_tiny: @ 8097220 +dp03_step_grass_tiny: ; 8097220 push {lr} adds r1, r0, 0 movs r0, 0x29 @@ -280633,7 +280633,7 @@ dp03_step_grass_tiny: @ 8097220 thumb_func_end dp03_step_grass_tiny thumb_func_start sub_8097230 -sub_8097230: @ 8097230 +sub_8097230: ; 8097230 push {lr} adds r1, r0, 0 movs r0, 0x2A @@ -280643,7 +280643,7 @@ sub_8097230: @ 8097230 thumb_func_end sub_8097230 thumb_func_start dp03_step_bubbles -dp03_step_bubbles: @ 8097240 +dp03_step_bubbles: ; 8097240 push {lr} ldr r2, =0x02038c08 movs r3, 0x10 @@ -280661,7 +280661,7 @@ dp03_step_bubbles: @ 8097240 thumb_func_end dp03_step_bubbles thumb_func_start ground_call_by_bits -ground_call_by_bits: @ 8097260 +ground_call_by_bits: ; 8097260 push {r4-r7,lr} mov r7, r8 push {r7} @@ -280672,35 +280672,35 @@ ground_call_by_bits: @ 8097260 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08097284 + bne @08097284 adds r0, r6, 0 bl sub_81D4A58 lsls r0, 24 cmp r0, 0 - beq _080972AC -_08097284: + beq @080972AC +@08097284: movs r4, 0 ldr r0, =0x0850e674 mov r8, r0 -_0809728A: +@0809728A: movs r0, 0x1 ands r0, r5 cmp r0, 0 - beq _080972A0 + beq @080972A0 lsls r0, r4, 2 add r0, r8 ldr r2, [r0] adds r0, r6, 0 adds r1, r7, 0 bl _call_via_r2 -_080972A0: +@080972A0: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 lsrs r5, 1 cmp r4, 0x13 - bls _0809728A -_080972AC: + bls @0809728A +@080972AC: pop {r3} mov r8, r3 pop {r4-r7} @@ -280711,14 +280711,14 @@ _080972AC: thumb_func_end ground_call_by_bits thumb_func_start sub_80972BC -sub_80972BC: @ 80972BC +sub_80972BC: ; 80972BC push {lr} adds r2, r0, 0 adds r3, r1, 0 ldrb r0, [r2] lsls r0, 27 cmp r0, 0 - bge _080972EA + bge @080972EA ldrb r1, [r2, 0x2] movs r0, 0x5 negs r0, r0 @@ -280735,7 +280735,7 @@ sub_80972BC: @ 80972BC ldr r1, =0xfff9f7bd ands r0, r1 str r0, [r3] -_080972EA: +@080972EA: pop {r0} bx r0 .align 2, 0 @@ -280743,18 +280743,18 @@ _080972EA: thumb_func_end sub_80972BC thumb_func_start ground_bits_filter_small_splashes -ground_bits_filter_small_splashes: @ 80972F4 +ground_bits_filter_small_splashes: ; 80972F4 push {lr} adds r2, r1, 0 ldrb r0, [r0] lsls r0, 26 cmp r0, 0 - bge _08097308 + bge @08097308 ldr r0, [r2] ldr r1, =0xfffffbff ands r0, r1 str r0, [r2] -_08097308: +@08097308: pop {r0} bx r0 .align 2, 0 @@ -280762,7 +280762,7 @@ _08097308: thumb_func_end ground_bits_filter_small_splashes thumb_func_start dp03_something_2 -dp03_something_2: @ 8097310 +dp03_something_2: ; 8097310 push {r4,r5,lr} sub sp, 0x4 adds r4, r0, 0 @@ -280770,7 +280770,7 @@ dp03_something_2: @ 8097310 ldrb r0, [r4] lsls r0, 29 cmp r0, 0 - bge _08097354 + bge @08097354 movs r0, 0 str r0, [sp] adds r0, r4, 0 @@ -280793,7 +280793,7 @@ dp03_something_2: @ 8097310 negs r1, r1 ands r0, r1 strb r0, [r4] -_08097354: +@08097354: add sp, 0x4 pop {r4,r5} pop {r0} @@ -280801,7 +280801,7 @@ _08097354: thumb_func_end dp03_something_2 thumb_func_start dp03_something -dp03_something: @ 809735C +dp03_something: ; 809735C push {r4,r5,lr} sub sp, 0x4 adds r4, r0, 0 @@ -280809,7 +280809,7 @@ dp03_something: @ 809735C ldrb r0, [r4] lsls r0, 29 cmp r0, 0 - bge _080973A8 + bge @080973A8 movs r0, 0 str r0, [sp] adds r0, r4, 0 @@ -280835,7 +280835,7 @@ dp03_something: @ 809735C negs r1, r1 ands r0, r1 strb r0, [r4] -_080973A8: +@080973A8: add sp, 0x4 pop {r4,r5} pop {r0} @@ -280843,7 +280843,7 @@ _080973A8: thumb_func_end dp03_something thumb_func_start ground_effects -ground_effects: @ 80973B0 +ground_effects: ; 80973B0 push {r4,r5,lr} sub sp, 0x4 adds r4, r0, 0 @@ -280851,7 +280851,7 @@ ground_effects: @ 80973B0 ldrb r0, [r4] lsls r0, 28 cmp r0, 0 - bge _080973FC + bge @080973FC movs r0, 0 str r0, [sp] adds r0, r4, 0 @@ -280877,7 +280877,7 @@ ground_effects: @ 80973B0 negs r1, r1 ands r0, r1 strb r0, [r4] -_080973FC: +@080973FC: add sp, 0x4 pop {r4,r5} pop {r0} @@ -280885,7 +280885,7 @@ _080973FC: thumb_func_end ground_effects thumb_func_start sub_8097404 -sub_8097404: @ 8097404 +sub_8097404: ; 8097404 push {r4,r5,lr} adds r5, r0, 0 ldrh r1, [r5] @@ -280893,7 +280893,7 @@ sub_8097404: @ 8097404 lsls r0, 1 ands r0, r1 cmp r0, 0 - bne _0809748C + bne @0809748C ldrb r0, [r5, 0x1] movs r4, 0x1 orrs r0, r4 @@ -280950,23 +280950,23 @@ sub_8097404: @ 8097404 orrs r1, r2 strb r1, [r0] movs r0, 0 - b _0809748E + b @0809748E .align 2, 0 .pool -_0809748C: +@0809748C: movs r0, 0x1 -_0809748E: +@0809748E: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_8097404 thumb_func_start player_bitmagic -player_bitmagic: @ 8097494 +player_bitmagic: ; 8097494 push {r4,r5,lr} movs r4, 0 ldr r5, =0x02037350 -_0809749A: +@0809749A: lsls r0, r4, 3 adds r0, r4 lsls r0, 2 @@ -280974,19 +280974,19 @@ _0809749A: ldrb r0, [r1] lsls r0, 31 cmp r0, 0 - beq _080974B8 + beq @080974B8 ldr r0, =0x02037590 ldrb r0, [r0, 0x5] cmp r4, r0 - beq _080974B8 + beq @080974B8 adds r0, r1, 0 bl sub_8097404 -_080974B8: +@080974B8: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bls _0809749A + bls @0809749A pop {r4,r5} pop {r0} bx r0 @@ -280995,15 +280995,15 @@ _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 movs r4, 0 ldr r6, =0x02037350 -_080974DA: +@080974DA: cmp r4, r5 - beq _080974FC + beq @080974FC lsls r0, r4, 3 adds r0, r4 lsls r0, 2 @@ -281011,19 +281011,19 @@ _080974DA: ldrb r0, [r1] lsls r0, 31 cmp r0, 0 - beq _080974FC + beq @080974FC ldr r0, =0x02037590 ldrb r0, [r0, 0x5] cmp r4, r0 - beq _080974FC + beq @080974FC adds r0, r1, 0 bl sub_8097404 -_080974FC: +@080974FC: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bls _080974DA + bls @080974DA pop {r4-r6} pop {r0} bx r0 @@ -281032,7 +281032,7 @@ _080974FC: thumb_func_end sub_80974D0 thumb_func_start npc_sync_anim_pause_bits -npc_sync_anim_pause_bits: @ 8097514 +npc_sync_anim_pause_bits: ; 8097514 push {r4,r5,lr} adds r5, r0, 0 ldrh r2, [r5] @@ -281040,7 +281040,7 @@ npc_sync_anim_pause_bits: @ 8097514 adds r0, r1, 0 ands r0, r2 cmp r0, r1 - bne _0809756C + bne @0809756C ldrb r1, [r5, 0x1] movs r0, 0x2 negs r0, r0 @@ -281077,7 +281077,7 @@ npc_sync_anim_pause_bits: @ 8097514 ands r0, r3 orrs r0, r1 strb r0, [r2] -_0809756C: +@0809756C: pop {r4,r5} pop {r0} bx r0 @@ -281086,11 +281086,11 @@ _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 -_08097582: +@08097582: lsls r0, r4, 3 adds r0, r4 lsls r0, 2 @@ -281098,15 +281098,15 @@ _08097582: ldrb r0, [r1] lsls r0, 31 cmp r0, 0 - beq _08097598 + beq @08097598 adds r0, r1, 0 bl npc_sync_anim_pause_bits -_08097598: +@08097598: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bls _08097582 + bls @08097582 pop {r4,r5} pop {r0} bx r0 @@ -281115,7 +281115,7 @@ _08097598: thumb_func_end sub_809757C thumb_func_start little_step -little_step: @ 80975AC +little_step: ; 80975AC lsls r1, 24 ldr r2, =0x0850db7c lsrs r1, 22 @@ -281134,7 +281134,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, =0x0850db7c lsrs r1, 22 @@ -281155,7 +281155,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, =0x0850db7c lsrs r1, 22 @@ -281178,7 +281178,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, =0x0850db7c lsrs r1, 22 @@ -281199,7 +281199,7 @@ quad_little_steps: @ 8097618 thumb_func_end quad_little_steps thumb_func_start oct_little_steps -oct_little_steps: @ 809763C +oct_little_steps: ; 809763C lsls r1, 24 ldr r2, =0x0850db7c lsrs r1, 22 @@ -281220,7 +281220,7 @@ oct_little_steps: @ 809763C thumb_func_end oct_little_steps thumb_func_start oamt_npc_ministep_reset -oamt_npc_ministep_reset: @ 8097660 +oamt_npc_ministep_reset: ; 8097660 lsls r1, 24 lsrs r1, 24 lsls r2, 24 @@ -281233,7 +281233,7 @@ oamt_npc_ministep_reset: @ 8097660 thumb_func_end oamt_npc_ministep_reset thumb_func_start obj_npc_ministep -obj_npc_ministep: @ 8097674 +obj_npc_ministep: ; 8097674 push {r4,r5,lr} adds r4, r0, 0 ldr r5, =0x0850e768 @@ -281246,7 +281246,7 @@ obj_npc_ministep: @ 8097674 movs r3, 0 ldrsh r0, [r0, r3] cmp r1, r0 - bge _080976D4 + bge @080976D4 ldr r1, =0x0850e754 lsls r0, r2, 2 adds r0, r1 @@ -281273,21 +281273,21 @@ obj_npc_ministep: @ 8097674 movs r3, 0 ldrsh r1, [r1, r3] cmp r0, r1 - blt _080976D4 + blt @080976D4 movs r0, 0x1 - b _080976D6 + b @080976D6 .align 2, 0 .pool -_080976D4: +@080976D4: movs r0, 0 -_080976D6: +@080976D6: pop {r4,r5} pop {r1} bx r1 thumb_func_end obj_npc_ministep thumb_func_start sub_80976DC -sub_80976DC: @ 80976DC +sub_80976DC: ; 80976DC lsls r1, 24 lsrs r1, 24 movs r2, 0 @@ -281298,14 +281298,14 @@ sub_80976DC: @ 80976DC thumb_func_end sub_80976DC thumb_func_start sub_80976EC -sub_80976EC: @ 80976EC +sub_80976EC: ; 80976EC push {r4,lr} adds r4, r0, 0 ldrh r1, [r4, 0x36] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0809770C + bne @0809770C ldrh r1, [r4, 0x34] lsls r1, 24 lsrs r1, 24 @@ -281314,26 +281314,26 @@ sub_80976EC: @ 80976EC ldrh r0, [r4, 0x38] adds r0, 0x1 strh r0, [r4, 0x38] -_0809770C: +@0809770C: ldrh r0, [r4, 0x36] adds r0, 0x1 strh r0, [r4, 0x36] movs r1, 0x38 ldrsh r0, [r4, r1] cmp r0, 0xF - bgt _0809771E + bgt @0809771E movs r0, 0 - b _08097720 -_0809771E: + b @08097720 +@0809771E: movs r0, 0x1 -_08097720: +@08097720: pop {r4} pop {r1} bx r1 thumb_func_end sub_80976EC thumb_func_start sub_8097728 -sub_8097728: @ 8097728 +sub_8097728: ; 8097728 ldr r1, =0x0850e7ba lsls r0, 16 asrs r0, 16 @@ -281347,7 +281347,7 @@ sub_8097728: @ 8097728 thumb_func_end sub_8097728 thumb_func_start sub_809773C -sub_809773C: @ 809773C +sub_809773C: ; 809773C ldr r1, =0x0850e772 lsls r0, 16 asrs r0, 16 @@ -281361,7 +281361,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] @@ -281369,26 +281369,26 @@ 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 movs r1, 0x3C ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _0809778E + beq @0809778E cmp r0, 0x1 - bgt _08097770 + bgt @08097770 cmp r0, 0 - beq _0809777A - b _080977F2 -_08097770: + beq @0809777A + b @080977F2 +@08097770: cmp r0, 0x2 - beq _080977B6 + beq @080977B6 cmp r0, 0x3 - beq _080977CA - b _080977F2 -_0809777A: + beq @080977CA + b @080977F2 +@0809777A: movs r2, 0x3A ldrsh r0, [r5, r2] bl sub_809773C @@ -281397,8 +281397,8 @@ _0809777A: strh r0, [r5, 0x24] movs r2, 0x3A ldrsh r0, [r5, r2] - b _080977E8 -_0809778E: + b @080977E8 +@0809778E: ldrh r0, [r5, 0x3A] movs r4, 0x47 subs r0, r4, r0 @@ -281416,8 +281416,8 @@ _0809778E: bl sub_8097728 ldrh r2, [r5, 0x26] adds r0, r2 - b _080977F0 -_080977B6: + b @080977F0 +@080977B6: movs r1, 0x3A ldrsh r0, [r5, r1] bl sub_809773C @@ -281426,8 +281426,8 @@ _080977B6: strh r1, [r5, 0x24] movs r2, 0x3A ldrsh r0, [r5, r2] - b _080977E8 -_080977CA: + b @080977E8 +@080977CA: ldrh r0, [r5, 0x3A] movs r4, 0x47 subs r0, r4, r0 @@ -281442,13 +281442,13 @@ _080977CA: lsls r4, 16 asrs r4, 16 adds r0, r4, 0 -_080977E8: +@080977E8: bl sub_8097728 ldrh r1, [r5, 0x26] adds r0, r1 -_080977F0: +@080977F0: strh r0, [r5, 0x26] -_080977F2: +@080977F2: ldrh r0, [r5, 0x3A] adds r0, 0x1 movs r1, 0 @@ -281456,20 +281456,20 @@ _080977F2: lsls r0, 16 asrs r0, 16 cmp r0, 0x48 - bne _0809780A + bne @0809780A strh r1, [r5, 0x3A] ldrh r0, [r5, 0x3C] adds r0, 0x1 strh r0, [r5, 0x3C] -_0809780A: +@0809780A: movs r2, 0x3C ldrsh r0, [r5, r2] cmp r0, 0x4 - bne _08097818 + bne @08097818 strh r1, [r5, 0x26] strh r1, [r5, 0x24] movs r6, 0x1 -_08097818: +@08097818: adds r0, r6, 0 pop {r4-r6} pop {r1} @@ -281477,7 +281477,7 @@ _08097818: thumb_func_end sub_8097758 thumb_func_start sub_8097820 -sub_8097820: @ 8097820 +sub_8097820: ; 8097820 lsls r1, 24 ldr r2, =0x0850e834 lsrs r1, 22 @@ -281494,7 +281494,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 @@ -281513,7 +281513,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 @@ -281530,13 +281530,13 @@ sub_809785C: @ 809785C movs r1, 0x36 ldrsh r0, [r4, r1] cmp r0, 0 - beq _0809788E + beq @0809788E ldrh r1, [r4, 0x34] lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 bl little_step -_0809788E: +@0809788E: movs r2, 0x3A ldrsh r0, [r4, r2] movs r2, 0x36 @@ -281563,15 +281563,15 @@ _0809788E: asrs r1, 16 asrs r0, 17 cmp r1, r0 - bne _080978C8 + bne @080978C8 movs r6, 0x1 -_080978C8: +@080978C8: cmp r1, r2 - blt _080978D2 + blt @080978D2 movs r0, 0 strh r0, [r4, 0x26] movs r6, 0xFF -_080978D2: +@080978D2: adds r0, r6, 0 add sp, 0xC pop {r4-r6} @@ -281582,7 +281582,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 @@ -281599,18 +281599,18 @@ sub_80978E4: @ 80978E4 movs r1, 0x36 ldrsh r0, [r5, r1] cmp r0, 0 - beq _08097920 + beq @08097920 ldrh r1, [r5, 0x3A] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _08097920 + bne @08097920 ldrh r1, [r5, 0x34] lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 bl little_step -_08097920: +@08097920: movs r2, 0x3A ldrsh r0, [r5, r2] movs r2, 0x36 @@ -281637,15 +281637,15 @@ _08097920: asrs r1, 16 asrs r0, 17 cmp r1, r0 - bne _0809795A + bne @0809795A movs r6, 0x1 -_0809795A: +@0809795A: cmp r1, r2 - blt _08097964 + blt @08097964 movs r0, 0 strh r0, [r5, 0x26] movs r6, 0xFF -_08097964: +@08097964: adds r0, r6, 0 add sp, 0xC pop {r4-r6} @@ -281656,31 +281656,31 @@ _08097964: thumb_func_end sub_80978E4 thumb_func_start sub_8097978 -sub_8097978: @ 8097978 +sub_8097978: ; 8097978 strh r1, [r0, 0x34] bx lr thumb_func_end sub_8097978 thumb_func_start sub_809797C -sub_809797C: @ 809797C +sub_809797C: ; 809797C push {lr} ldrh r1, [r0, 0x34] subs r1, 0x1 strh r1, [r0, 0x34] lsls r1, 16 cmp r1, 0 - beq _0809798E + beq @0809798E movs r0, 0 - b _08097990 -_0809798E: + b @08097990 +@0809798E: movs r0, 0x1 -_08097990: +@08097990: pop {r1} bx r1 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 @@ -281702,25 +281702,25 @@ 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] movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _080979CE + bne @080979CE movs r0, 0 - b _080979D0 -_080979CE: + b @080979D0 +@080979CE: movs r0, 0x1 -_080979D0: +@080979D0: pop {r1} bx r1 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 @@ -281739,7 +281739,7 @@ sub_80979D4: @ 80979D4 movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _08097A3C + beq @08097A3C mov r0, r12 ldrh r1, [r0, 0x24] ldrh r2, [r0, 0x20] @@ -281768,10 +281768,10 @@ sub_80979D4: @ 80979D4 lsls r0, 16 lsrs r5, r0, 16 adds r2, r3, 0 - b _08097A6A + b @08097A6A .align 2, 0 .pool -_08097A3C: +@08097A3C: mov r0, r12 ldrh r1, [r0, 0x24] ldrh r2, [r0, 0x20] @@ -281795,7 +281795,7 @@ _08097A3C: lsls r0, 16 lsrs r5, r0, 16 adds r4, r3, 0 -_08097A6A: +@08097A6A: ldrb r0, [r4] lsls r0, 24 asrs r0, 25 @@ -281811,46 +281811,46 @@ _08097A6A: lsls r0, r6, 16 asrs r0, 16 cmp r0, 0xFF - bgt _08097A96 + bgt @08097A96 lsls r0, r3, 16 asrs r0, 16 movs r1, 0x10 negs r1, r1 cmp r0, r1 - bge _08097AA2 -_08097A96: + bge @08097AA2 +@08097A96: mov r4, r12 adds r4, 0x3E ldrb r0, [r4] movs r1, 0x4 orrs r0, r1 strb r0, [r4] -_08097AA2: +@08097AA2: lsls r0, r5, 16 asrs r0, 16 cmp r0, 0xAF - bgt _08097AB6 + bgt @08097AB6 lsls r0, r2, 16 asrs r0, 16 movs r1, 0x10 negs r1, r1 cmp r0, r1 - bge _08097AC2 -_08097AB6: + bge @08097AC2 +@08097AB6: mov r0, r12 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_08097AC2: +@08097AC2: pop {r4-r6} pop {r0} bx r0 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 @@ -281871,11 +281871,11 @@ 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 -_08097AF6: +@08097AF6: ldr r0, =0x02020630 adds r2, r5, r0 adds r0, r2, 0 @@ -281884,18 +281884,18 @@ _08097AF6: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08097B16 + beq @08097B16 ldr r1, [r2, 0x1C] ldr r0, =sub_8097AC8 + 1 cmp r1, r0 - bne _08097B16 + bne @08097B16 adds r0, r2, 0 bl obj_delete_and_free_tiles -_08097B16: +@08097B16: adds r5, 0x44 subs r4, 0x1 cmp r4, 0 - bge _08097AF6 + bge @08097AF6 pop {r4,r5} pop {r0} bx r0 @@ -281904,14 +281904,14 @@ _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 movs r3, 0 ldr r6, =0x02020630 movs r4, 0 -_08097B38: +@08097B38: adds r2, r4, r6 adds r0, r2, 0 adds r0, 0x3E @@ -281919,34 +281919,34 @@ _08097B38: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08097B68 + beq @08097B68 ldr r1, [r2, 0x1C] ldr r0, =sub_8097AC8 + 1 cmp r1, r0 - bne _08097B68 + bne @08097B68 ldrh r0, [r2, 0x2E] lsls r0, 24 lsrs r0, 24 cmp r0, r5 - bne _08097B68 + bne @08097B68 adds r0, r3, 0 - b _08097B72 + b @08097B72 .align 2, 0 .pool -_08097B68: +@08097B68: adds r4, 0x44 adds r3, 0x1 cmp r3, 0x3F - ble _08097B38 + ble @08097B38 movs r0, 0x40 -_08097B72: +@08097B72: pop {r4-r6} pop {r1} bx r1 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 @@ -281956,7 +281956,7 @@ sub_8097B78: @ 8097B78 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _08097BAA + beq @08097BAA lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -281969,7 +281969,7 @@ sub_8097B78: @ 8097B78 lsrs r1, 24 adds r0, r4, 0 bl obj_anim_image_start -_08097BAA: +@08097BAA: pop {r4,r5} pop {r0} bx r0 @@ -281978,7 +281978,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 @@ -281987,7 +281987,7 @@ sub_8097BB4: @ 8097BB4 bl sub_8097B2C adds r1, r0, 0 cmp r1, 0x40 - beq _08097C3E + beq @08097C3E lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -282020,15 +282020,15 @@ sub_8097BB4: @ 8097BB4 str r1, [r4, 0xC] ldr r1, [r0, 0x14] cmp r1, 0 - bne _08097C20 + bne @08097C20 str r1, [r4, 0x18] adds r0, r4, 0 adds r0, 0x42 strb r1, [r0] - b _08097C36 + b @08097C36 .align 2, 0 .pool -_08097C20: +@08097C20: adds r0, r4, 0 bl obj_set_f18_to_r0_f42_to_40 adds r2, r4, 0 @@ -282039,18 +282039,18 @@ _08097C20: movs r0, 0x80 orrs r1, r0 strb r1, [r2] -_08097C36: +@08097C36: adds r0, r4, 0 movs r1, 0 bl obj_anim_image_start -_08097C3E: +@08097C3E: pop {r4,r5} pop {r0} bx r0 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 @@ -282060,9 +282060,9 @@ sub_8097C44: @ 8097C44 lsrs r2, r0, 24 adds r3, r2, 0 cmp r2, 0x40 - beq _08097C80 + beq @08097C80 cmp r4, 0 - beq _08097C74 + beq @08097C74 ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 @@ -282070,17 +282070,17 @@ sub_8097C44: @ 8097C44 adds r1, r0 movs r0, 0x1 strh r0, [r1, 0x32] - b _08097C80 + b @08097C80 .align 2, 0 .pool -_08097C74: +@08097C74: ldr r1, =0x02020630 lsls r0, r3, 4 adds r0, r3 lsls r0, 2 adds r0, r1 strh r4, [r0, 0x32] -_08097C80: +@08097C80: pop {r4} pop {r0} bx r0 @@ -282089,7 +282089,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 @@ -282097,10 +282097,10 @@ sub_8097C8C: @ 8097C8C lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - bne _08097CA2 + bne @08097CA2 movs r0, 0 - b _08097CBA -_08097CA2: + b @08097CBA +@08097CA2: movs r3, 0 ldr r0, =0x02020630 lsls r1, r2, 4 @@ -282110,11 +282110,11 @@ _08097CA2: movs r2, 0x32 ldrsh r0, [r1, r2] cmp r0, 0x1 - bne _08097CB8 + bne @08097CB8 movs r3, 0x1 -_08097CB8: +@08097CB8: adds r0, r3, 0 -_08097CBA: +@08097CBA: pop {r1} bx r1 .align 2, 0 @@ -282122,7 +282122,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 @@ -282132,7 +282132,7 @@ sub_8097CC4: @ 8097CC4 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq _08097CEA + beq @08097CEA ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 @@ -282141,7 +282141,7 @@ sub_8097CC4: @ 8097CC4 movs r0, 0 strh r4, [r1, 0x34] strh r0, [r1, 0x36] -_08097CEA: +@08097CEA: pop {r4} pop {r0} bx r0 @@ -282150,22 +282150,22 @@ _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 ldrsh r0, [r2, r1] cmp r0, 0 - beq _08097D06 + beq @08097D06 cmp r0, 0x1 - beq _08097D0E - b _08097D2C -_08097D06: + beq @08097D0E + b @08097D2C +@08097D06: strh r0, [r2, 0x26] ldrh r0, [r2, 0x36] adds r0, 0x1 strh r0, [r2, 0x36] -_08097D0E: +@08097D0E: ldrh r0, [r2, 0x26] subs r0, 0x8 movs r3, 0 @@ -282175,45 +282175,45 @@ _08097D0E: movs r1, 0xA0 negs r1, r1 cmp r0, r1 - bne _08097D2C + bne @08097D2C strh r3, [r2, 0x26] movs r0, 0x1 strh r0, [r2, 0x32] strh r3, [r2, 0x34] strh r3, [r2, 0x36] -_08097D2C: +@08097D2C: pop {r0} bx r0 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 ldrsh r0, [r1, r2] cmp r0, 0 - beq _08097D42 + beq @08097D42 cmp r0, 0x1 - beq _08097D4C - b _08097D5E -_08097D42: + beq @08097D4C + b @08097D5E +@08097D42: ldr r0, =0x0000ff60 strh r0, [r1, 0x26] ldrh r0, [r1, 0x36] adds r0, 0x1 strh r0, [r1, 0x36] -_08097D4C: +@08097D4C: ldrh r0, [r1, 0x26] adds r0, 0x8 strh r0, [r1, 0x26] lsls r0, 16 asrs r0, 16 cmp r0, 0 - bne _08097D5E + bne @08097D5E strh r0, [r1, 0x34] strh r0, [r1, 0x36] -_08097D5E: +@08097D5E: pop {r0} bx r0 .align 2, 0 @@ -282221,40 +282221,40 @@ _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 ldrsh r0, [r1, r2] cmp r0, 0x1 - beq _08097D84 + beq @08097D84 cmp r0, 0x1 - bgt _08097D7E + bgt @08097D7E cmp r0, 0 - beq _08097D98 - b _08097D94 -_08097D7E: + beq @08097D98 + b @08097D94 +@08097D7E: cmp r0, 0x2 - beq _08097D8C - b _08097D94 -_08097D84: + beq @08097D8C + b @08097D94 +@08097D84: adds r0, r1, 0 bl sub_8097D30 - b _08097D98 -_08097D8C: + b @08097D98 +@08097D8C: adds r0, r1, 0 bl sub_8097CF4 - b _08097D98 -_08097D94: + b @08097D98 +@08097D94: movs r0, 0 strh r0, [r1, 0x34] -_08097D98: +@08097D98: pop {r0} bx r0 thumb_func_end sub_8097D68 thumb_func_start sub_8097D9C -sub_8097D9C: @ 8097D9C +sub_8097D9C: ; 8097D9C push {lr} lsls r0, 24 lsrs r0, 24 @@ -282262,7 +282262,7 @@ sub_8097D9C: @ 8097D9C lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq _08097DC0 + beq @08097DC0 ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 @@ -282271,21 +282271,21 @@ sub_8097D9C: @ 8097D9C movs r2, 0x34 ldrsh r0, [r1, r2] cmp r0, 0 - bne _08097DC8 -_08097DC0: + bne @08097DC8 +@08097DC0: movs r0, 0 - b _08097DCA + b @08097DCA .align 2, 0 .pool -_08097DC8: +@08097DC8: movs r0, 0x1 -_08097DCA: +@08097DCA: pop {r1} bx r1 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 @@ -282306,25 +282306,25 @@ oe_exec_and_other_stuff: @ 8097DD0 thumb_func_end oe_exec_and_other_stuff thumb_func_start do_animation_x03 -do_animation_x03: @ 8097DF8 +do_animation_x03: ; 8097DF8 push {lr} adds r1, r0, 0 ldrb r2, [r1, 0x2] lsls r0, r2, 25 cmp r0, 0 - blt _08097E10 + blt @08097E10 movs r0, 0x40 orrs r0, r2 strb r0, [r1, 0x2] movs r0, 0x3 bl oe_exec_and_other_stuff -_08097E10: +@08097E10: pop {r0} bx r0 thumb_func_end do_animation_x03 thumb_func_start sub_8097E14 -sub_8097E14: @ 8097E14 +sub_8097E14: ; 8097E14 push {r4,lr} adds r4, r1, 0 ldrb r0, [r0, 0x5] @@ -282355,7 +282355,7 @@ sub_8097E14: @ 8097E14 thumb_func_end sub_8097E14 thumb_func_start sub_8097E50 -sub_8097E50: @ 8097E50 +sub_8097E50: ; 8097E50 push {r4-r7,lr} mov r7, r8 push {r7} @@ -282367,7 +282367,7 @@ sub_8097E50: @ 8097E50 ldr r1, [r0] adds r6, r0, 0 cmp r1, 0 - bne _08097E80 + bne @08097E80 movs r0, 0x14 bl malloc_and_clear str r0, [r6] @@ -282376,43 +282376,43 @@ sub_8097E50: @ 8097E50 ldr r1, [r6] movs r0, 0x1 strb r0, [r1, 0x10] - b _08097ECC + b @08097ECC .align 2, 0 .pool -_08097E80: +@08097E80: movs r2, 0x10 movs r5, 0 movs r1, 0 adds r3, r6, 0 - b _08097E90 -_08097E8A: + b @08097E90 +@08097E8A: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 -_08097E90: +@08097E90: cmp r1, 0xF - bhi _08097EB2 + bhi @08097EB2 cmp r2, 0x10 - bne _08097EA4 + bne @08097EA4 ldr r0, [r3] adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _08097EA4 + bne @08097EA4 adds r2, r1, 0 -_08097EA4: +@08097EA4: ldr r0, [r3] adds r0, r1 ldrb r0, [r0] ldrb r7, [r4, 0x8] cmp r0, r7 - bne _08097E8A + bne @08097E8A movs r5, 0x1 -_08097EB2: +@08097EB2: cmp r5, 0 - bne _08097ECE + bne @08097ECE cmp r2, 0x10 - beq _08097ECE + beq @08097ECE ldr r0, [r6] adds r0, r2 ldrb r1, [r4, 0x8] @@ -282422,19 +282422,19 @@ _08097EB2: adds r0, 0x1 strb r0, [r1, 0x10] movs r0, 0x1 -_08097ECC: +@08097ECC: mov r12, r0 -_08097ECE: +@08097ECE: mov r1, r12 cmp r1, 0x1 - bne _08097EE0 + bne @08097EE0 ldrb r0, [r4, 0x1] movs r1, 0x10 orrs r0, r1 movs r1, 0x2 orrs r0, r1 strb r0, [r4, 0x1] -_08097EE0: +@08097EE0: movs r0, 0x1 mov r7, r8 strh r0, [r7, 0x32] @@ -282446,7 +282446,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} @@ -282457,14 +282457,14 @@ sub_8097EF0: @ 8097EF0 ldr r5, =0x020375b8 ldr r0, [r5] cmp r0, 0 - beq _08097F68 + beq @08097F68 movs r7, 0 adds r0, r6, 0 bl sub_8097F78 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x10 - beq _08097F28 + beq @08097F28 ldr r0, [r5] adds r0, r1 movs r1, 0 @@ -282474,16 +282474,16 @@ sub_8097EF0: @ 8097EF0 subs r0, 0x1 strb r0, [r1, 0x10] movs r7, 0x1 -_08097F28: +@08097F28: ldr r0, [r5] ldrb r4, [r0, 0x10] cmp r4, 0 - bne _08097F36 + bne @08097F36 bl free str r4, [r5] -_08097F36: +@08097F36: cmp r7, 0x1 - bne _08097F68 + bne @08097F68 ldrb r0, [r6, 0x5] bl npc_get_type ldrb r1, [r0, 0xC] @@ -282506,7 +282506,7 @@ _08097F36: negs r0, r0 ands r0, r1 strb r0, [r2] -_08097F68: +@08097F68: movs r0, 0x1 pop {r3} mov r8, r3 @@ -282518,35 +282518,35 @@ _08097F68: thumb_func_end sub_8097EF0 thumb_func_start sub_8097F78 -sub_8097F78: @ 8097F78 +sub_8097F78: ; 8097F78 push {lr} movs r2, 0 ldr r1, =0x020375b8 ldr r1, [r1] ldrb r3, [r0, 0x8] -_08097F82: +@08097F82: adds r0, r1, r2 ldrb r0, [r0] cmp r0, r3 - bne _08097F94 + bne @08097F94 adds r0, r2, 0 - b _08097FA0 + b @08097FA0 .align 2, 0 .pool -_08097F94: +@08097F94: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xF - bls _08097F82 + bls @08097F82 movs r0, 0x10 -_08097FA0: +@08097FA0: pop {r1} bx r1 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 + 1 @@ -282575,7 +282575,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 @@ -282600,21 +282600,21 @@ sub_8097FE4: @ 8097FE4 movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne _08098020 + bne @08098020 ldrh r0, [r4, 0xE] ldrh r1, [r2, 0x26] adds r0, r1 strh r0, [r2, 0x26] -_08098020: +@08098020: ldrh r1, [r4, 0xC] movs r0, 0xF ands r0, r1 cmp r0, 0 - bne _08098030 + bne @08098030 ldrh r0, [r4, 0xE] negs r0, r0 strh r0, [r4, 0xE] -_08098030: +@08098030: adds r0, r1, 0x1 strh r0, [r4, 0xC] add sp, 0x4 @@ -282626,7 +282626,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 @@ -282651,7 +282651,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 @@ -282659,11 +282659,11 @@ sub_8098074: @ 8098074 lsrs r5, r1, 24 movs r4, 0 ldr r7, =0x02037350 -_08098082: +@08098082: cmp r4, r6 - beq _080980A8 + beq @080980A8 cmp r4, r5 - beq _080980A8 + beq @080980A8 lsls r0, r4, 3 adds r0, r4 lsls r0, 2 @@ -282671,19 +282671,19 @@ _08098082: ldrb r0, [r1] lsls r0, 31 cmp r0, 0 - beq _080980A8 + beq @080980A8 ldr r0, =0x02037590 ldrb r0, [r0, 0x5] cmp r4, r0 - beq _080980A8 + beq @080980A8 adds r0, r1, 0 bl sub_8097404 -_080980A8: +@080980A8: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bls _08098082 + bls @08098082 pop {r4-r7} pop {r0} bx r0 @@ -282692,7 +282692,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] @@ -282703,7 +282703,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] @@ -282714,18 +282714,18 @@ sub_80980D0: @ 80980D0 movs r1, 0xA0 negs r1, r1 cmp r0, r1 - bne _080980EC + bne @080980EC ldrh r0, [r2, 0x32] adds r0, 0x1 strh r0, [r2, 0x32] -_080980EC: +@080980EC: movs r0, 0 pop {r1} bx r1 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] @@ -282738,31 +282738,31 @@ 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 strh r0, [r1, 0x26] lsls r0, 16 cmp r0, 0 - bne _0809811C + bne @0809811C ldrh r0, [r1, 0x32] adds r0, 0x1 strh r0, [r1, 0x32] -_0809811C: +@0809811C: movs r0, 0 pop {r1} bx r1 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] @@ -282785,7 +282785,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 @@ -282797,42 +282797,42 @@ sub_8098154: @ 8098154 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _08098188 + beq @08098188 cmp r0, 0x1 - bgt _0809817C + bgt @0809817C cmp r0, 0 - beq _08098182 - b _080981B0 + beq @08098182 + b @080981B0 .align 2, 0 .pool -_0809817C: +@0809817C: cmp r0, 0x2 - beq _08098198 - b _080981B0 -_08098182: + beq @08098198 + b @080981B0 +@08098182: bl sub_81973A4 - b _08098190 -_08098188: + b @08098190 +@08098188: movs r0, 0 movs r1, 0x1 bl sub_81973C4 -_08098190: +@08098190: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080981B0 -_08098198: + b @080981B0 +@08098198: bl sub_8197224 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - beq _080981B0 + beq @080981B0 ldr r1, =0x020375bc movs r0, 0 strb r0, [r1] adds r0, r5, 0 bl remove_task -_080981B0: +@080981B0: pop {r4,r5} pop {r0} bx r0 @@ -282841,7 +282841,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 + 1 movs r1, 0x50 @@ -282853,16 +282853,16 @@ 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 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _080981E4 + beq @080981E4 bl remove_task -_080981E4: +@080981E4: pop {r0} bx r0 .align 2, 0 @@ -282870,44 +282870,44 @@ _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 ldrb r0, [r4] cmp r0, 0 - bne _0809820C + bne @0809820C adds r0, r1, 0 movs r1, 0x1 bl textbox_fdecode_auto_and_task_add movs r0, 0x2 strb r0, [r4] movs r0, 0x1 - b _0809820E + b @0809820E .align 2, 0 .pool -_0809820C: +@0809820C: movs r0, 0 -_0809820E: +@0809820E: pop {r4} pop {r1} bx r1 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 bl sub_8196094 adds r1, r0, 0 cmp r1, 0 - bne _0809822E + bne @0809822E ldr r0, =0x020375bc strb r1, [r0] adds r0, r4, 0 bl remove_task -_0809822E: +@0809822E: pop {r4} pop {r0} bx r0 @@ -282916,13 +282916,13 @@ _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 ldrb r0, [r5] cmp r0, 0 - bne _08098270 + bne @08098270 ldr r0, =0x02021fc4 adds r1, r4, 0 bl ExpandTextCodes @@ -282934,43 +282934,43 @@ sub_8098238: @ 8098238 movs r0, 0x2 strb r0, [r5] movs r0, 0x1 - b _08098272 + b @08098272 .align 2, 0 .pool -_08098270: +@08098270: movs r0, 0 -_08098272: +@08098272: pop {r4,r5} pop {r1} bx r1 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 ldrb r0, [r2] cmp r0, 0 - bne _08098298 + bne @08098298 movs r0, 0x3 strb r0, [r2] adds r0, r1, 0 movs r1, 0 bl textbox_fdecode_auto_and_task_add movs r0, 0x1 - b _0809829A + b @0809829A .align 2, 0 .pool -_08098298: +@08098298: movs r0, 0 -_0809829A: +@0809829A: pop {r1} bx r1 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 @@ -282985,28 +282985,28 @@ 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] cmp r0, 0 - bne _080982D4 + bne @080982D4 movs r0, 0x2 strb r0, [r1] bl textbox_auto_and_task_add movs r0, 0x1 - b _080982D6 + b @080982D6 .align 2, 0 .pool -_080982D4: +@080982D4: movs r0, 0 -_080982D6: +@080982D6: pop {r1} bx r1 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 @@ -283026,7 +283026,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 get_map_name @@ -283036,7 +283036,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 @@ -283052,7 +283052,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 @@ -283061,25 +283061,25 @@ 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] cmp r0, 0 - beq _08098350 + beq @08098350 movs r0, 0 - b _08098352 + b @08098352 .align 2, 0 .pool -_08098350: +@08098350: movs r0, 0x1 -_08098352: +@08098352: pop {r1} bx r1 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 @@ -283095,7 +283095,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 @@ -283108,63 +283108,63 @@ 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] cmp r0, 0x1 - beq _0809839C + beq @0809839C movs r0, 0x1 - b _0809839E + b @0809839E .align 2, 0 .pool -_0809839C: +@0809839C: movs r0, 0 -_0809839E: +@0809839E: pop {r1} bx r1 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 bl walkrun_is_standing_still lsls r0, 24 cmp r0, 0 - beq _080983BE + beq @080983BE bl sub_808B864 adds r0, r4, 0 bl remove_task -_080983BE: +@080983BE: pop {r4} pop {r0} bx r0 thumb_func_end sub_80983A4 thumb_func_start sub_80983C4 -sub_80983C4: @ 80983C4 +sub_80983C4: ; 80983C4 push {lr} ldr r0, =sub_80983A4 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _080983E0 + bne @080983E0 bl sub_808BCF4 movs r0, 0x1 - b _080983E2 + b @080983E2 .align 2, 0 .pool -_080983E0: +@080983E0: movs r0, 0 -_080983E2: +@080983E2: pop {r1} bx r1 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 + 1 @@ -283177,7 +283177,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 @@ -283189,19 +283189,19 @@ sub_8098400: @ 8098400 movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0 - bne _0809842A + bne @0809842A bl walkrun_is_standing_still lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bne _0809842A + bne @0809842A bl sub_808B864 strh r4, [r5, 0x8] -_0809842A: +@0809842A: movs r1, 0xA ldrsh r0, [r5, r1] cmp r0, 0 - bne _08098452 + bne @08098452 ldr r2, =0x02037350 ldr r0, =0x03005df0 ldrb r1, [r0] @@ -283212,23 +283212,23 @@ _0809842A: ldrb r0, [r1] lsls r0, 30 cmp r0, 0 - blt _08098452 + blt @08098452 adds r0, r1, 0 bl sub_8097404 movs r0, 0x1 strh r0, [r5, 0xA] -_08098452: +@08098452: movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0 - beq _08098468 + beq @08098468 movs r1, 0xA ldrsh r0, [r5, r1] cmp r0, 0 - beq _08098468 + beq @08098468 adds r0, r6, 0 bl remove_task -_08098468: +@08098468: pop {r4-r6} pop {r0} bx r0 @@ -283237,27 +283237,27 @@ _08098468: thumb_func_end sub_8098400 thumb_func_start sub_809847C -sub_809847C: @ 809847C +sub_809847C: ; 809847C push {lr} ldr r0, =sub_8098400 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _08098498 + bne @08098498 bl sub_808BCF4 movs r0, 0x1 - b _0809849A + b @0809849A .align 2, 0 .pool -_08098498: +@08098498: movs r0, 0 -_0809849A: +@0809849A: pop {r1} bx r1 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] @@ -283276,7 +283276,7 @@ sub_80984A0: @ 80984A0 ldrb r0, [r1] lsls r0, 30 cmp r0, 0 - blt _080984DE + blt @080984DE adds r0, r1, 0 bl sub_8097404 ldr r0, =0x03005e00 @@ -283286,7 +283286,7 @@ sub_80984A0: @ 80984A0 adds r1, r0 movs r0, 0x1 strh r0, [r1, 0xA] -_080984DE: +@080984DE: pop {r4,r5} pop {r0} bx r0 @@ -283295,7 +283295,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 @@ -283319,7 +283319,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 @@ -283331,10 +283331,10 @@ sub_8098524: @ 8098524 ldrb r0, [r1] lsls r0, 31 cmp r0, 0 - beq _08098542 + beq @08098542 adds r0, r1, 0 bl sub_8093284 -_08098542: +@08098542: movs r0, 0xFF movs r1, 0 movs r2, 0 @@ -283357,7 +283357,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] @@ -283376,7 +283376,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] @@ -283393,7 +283393,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 @@ -283406,19 +283406,19 @@ sub_80985BC: @ 80985BC movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0 - bne _080985E8 + bne @080985E8 bl walkrun_is_standing_still lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bne _080985E8 + bne @080985E8 bl sub_808B864 strh r4, [r5, 0x8] -_080985E8: +@080985E8: movs r1, 0xA ldrsh r0, [r5, r1] cmp r0, 0 - bne _0809860C + bne @0809860C ldr r0, =0x02037350 lsls r1, r7, 3 adds r1, r7 @@ -283427,23 +283427,23 @@ _080985E8: ldrb r0, [r1] lsls r0, 30 cmp r0, 0 - blt _0809860C + blt @0809860C adds r0, r1, 0 bl sub_8097404 movs r0, 0x1 strh r0, [r5, 0xA] -_0809860C: +@0809860C: movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0 - beq _08098622 + beq @08098622 movs r1, 0xA ldrsh r0, [r5, r1] cmp r0, 0 - beq _08098622 + beq @08098622 adds r0, r6, 0 bl remove_task -_08098622: +@08098622: pop {r4-r7} pop {r0} bx r0 @@ -283452,7 +283452,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 @@ -283464,7 +283464,7 @@ sub_8098630: @ 8098630 ldr r0, =0x030060a8 ldrb r0, [r0] cmp r0, 0x2 - bne _080986E0 + bne @080986E0 movs r0, 0x1 bl sub_80B47E0 lsls r0, 24 @@ -283496,12 +283496,12 @@ sub_8098630: @ 8098630 ldrb r0, [r1] lsls r0, 30 cmp r0, 0 - blt _0809869A + blt @0809869A adds r0, r1, 0 bl sub_8097404 movs r0, 0x1 strh r0, [r6, 0xA] -_0809869A: +@0809869A: adds r0, r7, 0 movs r1, 0x51 bl AddTask @@ -283521,15 +283521,15 @@ _0809869A: ldrb r0, [r1] lsls r0, 30 cmp r0, 0 - blt _0809871A + blt @0809871A adds r0, r1, 0 bl sub_8097404 movs r0, 0x1 strh r0, [r4, 0xA] - b _0809871A + b @0809871A .align 2, 0 .pool -_080986E0: +@080986E0: adds r0, r4, 0 bl sub_80974D0 ldr r0, =sub_80985BC + 1 @@ -283551,12 +283551,12 @@ _080986E0: ldrb r0, [r1] lsls r0, 30 cmp r0, 0 - blt _0809871A + blt @0809871A adds r0, r1, 0 bl sub_8097404 movs r0, 0x1 strh r0, [r5, 0xA] -_0809871A: +@0809871A: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -283568,41 +283568,41 @@ _0809871A: thumb_func_end sub_8098630 thumb_func_start sub_8098734 -sub_8098734: @ 8098734 +sub_8098734: ; 8098734 push {lr} ldr r0, =sub_80985BC + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _08098750 + bne @08098750 bl sub_808BCF4 movs r0, 0x1 - b _08098752 + b @08098752 .align 2, 0 .pool -_08098750: +@08098750: movs r0, 0 -_08098752: +@08098752: pop {r1} bx r1 thumb_func_end sub_8098734 thumb_func_start sub_8098758 -sub_8098758: @ 8098758 +sub_8098758: ; 8098758 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x13 - bhi _08098770 + bhi @08098770 lsls r0, 3 ldr r1, =0x0851021c adds r0, r1 - b _08098772 + b @08098772 .align 2, 0 .pool -_08098770: +@08098770: ldr r0, =0x0851021c -_08098772: +@08098772: pop {r1} bx r1 .align 2, 0 @@ -283610,8 +283610,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 @@ -283642,7 +283642,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 @@ -283656,7 +283656,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} @@ -283701,7 +283701,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 @@ -283725,7 +283725,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 @@ -283912,7 +283912,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 @@ -284109,7 +284109,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 @@ -284185,41 +284185,41 @@ 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 cmp r0, 0x4 - bhi _08098C54 + bhi @08098C54 lsls r0, 2 - ldr r1, =_08098C30 + ldr r1, =@08098C30 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08098C30: - .4byte _08098C44 - .4byte _08098C48 - .4byte _08098C4C - .4byte _08098C50 - .4byte _08098C54 -_08098C44: +@08098C30: + .4byte @08098C44 + .4byte @08098C48 + .4byte @08098C4C + .4byte @08098C50 + .4byte @08098C54 +@08098C44: movs r0, 0 - b _08098C56 -_08098C48: + b @08098C56 +@08098C48: movs r0, 0x10 - b _08098C56 -_08098C4C: + b @08098C56 +@08098C4C: movs r0, 0x20 - b _08098C56 -_08098C50: + b @08098C56 +@08098C50: movs r0, 0x30 - b _08098C56 -_08098C54: + b @08098C56 +@08098C54: movs r0, 0x40 -_08098C56: +@08098C56: lsls r0, 1 ldr r1, =0x0851017c adds r0, r1 @@ -284230,7 +284230,7 @@ _08098C56: thumb_func_end stdpal_get thumb_func_start sub_8098C64 -sub_8098C64: @ 8098C64 +sub_8098C64: ; 8098C64 ldr r0, =0x08ddd728 bx lr .align 2, 0 @@ -284238,7 +284238,7 @@ sub_8098C64: @ 8098C64 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 @@ -284275,8 +284275,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 @@ -284290,29 +284290,29 @@ script_env_init: @ 8098CB8 movs r1, 0x3 adds r0, r3, 0 adds r0, 0x70 -_08098CD2: +@08098CD2: str r2, [r0] subs r0, 0x4 subs r1, 0x1 cmp r1, 0 - bge _08098CD2 + bge @08098CD2 adds r1, r3, 0 adds r1, 0xC movs r2, 0 adds r0, r3, 0 adds r0, 0x58 -_08098CE6: +@08098CE6: str r2, [r0] subs r0, 0x4 cmp r0, r1 - bge _08098CE6 + bge @08098CE6 pop {r0} bx r0 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] @@ -284321,7 +284321,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] @@ -284329,8 +284329,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] @@ -284338,62 +284338,62 @@ 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] cmp r0, 0 - bne _08098D1E -_08098D1A: + bne @08098D1E +@08098D1A: movs r0, 0 - b _08098D90 -_08098D1E: + b @08098D90 +@08098D1E: ldrb r0, [r4, 0x1] cmp r0, 0x1 - beq _08098D56 + beq @08098D56 cmp r0, 0x1 - bgt _08098D2E + bgt @08098D2E cmp r0, 0 - beq _08098D1A - b _08098D8E -_08098D2E: + beq @08098D1A + b @08098D8E +@08098D2E: cmp r0, 0x2 - bne _08098D8E + bne @08098D8E ldr r0, [r4, 0x4] cmp r0, 0 - beq _08098D52 + beq @08098D52 bl _call_via_r0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08098D8E + bne @08098D8E strb r0, [r4, 0x1] - b _08098D8E -_08098D48: + b @08098D8E +@08098D48: strb r2, [r4, 0x1] - b _08098D1A -_08098D4C: + b @08098D1A +@08098D4C: movs r0, 0 strb r0, [r4, 0x1] - b _08098D90 -_08098D52: + b @08098D90 +@08098D52: movs r0, 0x1 strb r0, [r4, 0x1] -_08098D56: +@08098D56: ldr r2, [r4, 0x8] cmp r2, 0 - beq _08098D48 + beq @08098D48 ldr r0, =0x085102bc ldr r0, [r0] cmp r2, r0 - bne _08098D6C -_08098D64: + bne @08098D6C +@08098D64: swi 0x2 - b _08098D64 + b @08098D64 .align 2, 0 .pool -_08098D6C: +@08098D6C: ldrb r1, [r2] adds r0, r2, 0x1 str r0, [r4, 0x8] @@ -284402,32 +284402,32 @@ _08098D6C: adds r1, r0, r1 ldr r0, [r4, 0x60] cmp r1, r0 - bcs _08098D4C + bcs @08098D4C ldr r1, [r1] adds r0, r4, 0 bl _call_via_r1 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08098D56 -_08098D8E: + bne @08098D56 +@08098D8E: movs r0, 0x1 -_08098D90: +@08098D90: pop {r4} pop {r1} bx r1 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 ldrb r1, [r2] adds r0, r1, 0x1 cmp r0, 0x13 - bgt _08098DBA + bgt @08098DBA lsls r0, r1, 2 adds r1, r2, 0 adds r1, 0xC @@ -284437,22 +284437,22 @@ script_stack_push: @ 8098D98 adds r0, 0x1 strb r0, [r2] movs r0, 0 - b _08098DBC -_08098DBA: + b @08098DBC +@08098DBA: movs r0, 0x1 -_08098DBC: +@08098DBC: pop {r1} bx r1 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] cmp r0, 0 - beq _08098DDC + beq @08098DDC subs r0, 0x1 strb r0, [r2] ldrb r1, [r2] @@ -284461,24 +284461,24 @@ script_stack_pop: @ 8098DC0 adds r0, 0xC adds r0, r1 ldr r0, [r0] - b _08098DDE -_08098DDC: + b @08098DDE +@08098DDC: movs r0, 0 -_08098DDE: +@08098DDE: pop {r1} bx r1 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 @@ -284491,8 +284491,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 @@ -284503,8 +284503,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] @@ -284519,8 +284519,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] @@ -284548,7 +284548,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] @@ -284558,7 +284558,7 @@ script_env_2_enable: @ 8098E54 thumb_func_end script_env_2_enable thumb_func_start script_env_2_disable -script_env_2_disable: @ 8098E60 +script_env_2_disable: ; 8098E60 ldr r1, =0x03000f2c movs r0, 0 strb r0, [r1] @@ -284568,8 +284568,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 @@ -284578,26 +284578,26 @@ 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] cmp r0, 0 - beq _08098E8C + beq @08098E8C movs r0, 0 - b _08098E8E + b @08098E8E .align 2, 0 .pool -_08098E8C: +@08098E8C: movs r0, 0x1 -_08098E8E: +@08098E8E: pop {r1} bx r1 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, =0x081db67c @@ -284613,38 +284613,38 @@ 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] cmp r0, 0x2 - beq _08098EF0 + beq @08098EF0 cmp r0, 0x1 - beq _08098EF0 + beq @08098EF0 bl script_env_2_enable ldr r0, =0x03000e40 bl script_main_handler lsls r0, 24 cmp r0, 0 - beq _08098EE8 + beq @08098EE8 movs r0, 0x1 - b _08098EF2 + b @08098EF2 .align 2, 0 .pool -_08098EE8: +@08098EE8: movs r0, 0x2 strb r0, [r4] bl script_env_2_disable -_08098EF0: +@08098EF0: movs r0, 0 -_08098EF2: +@08098EF2: pop {r4} pop {r1} bx r1 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 @@ -284667,7 +284667,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] @@ -284677,7 +284677,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 @@ -284690,8 +284690,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 @@ -284702,13 +284702,13 @@ script_env_2_execute_new_script: @ 8098F50 adds r0, r4, 0 adds r1, r5, 0 bl script_setup_bytecode_script -_08098F68: +@08098F68: ldr r0, =0x03000eb8 bl script_main_handler lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08098F68 + beq @08098F68 pop {r4,r5} pop {r0} bx r0 @@ -284717,29 +284717,29 @@ _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 ldr r0, =0x02037318 ldr r2, [r0, 0x8] cmp r2, 0 - beq _08098F9C -_08098F96: + beq @08098F9C +@08098F96: ldrb r0, [r2] cmp r0, 0 - bne _08098FA4 -_08098F9C: + bne @08098FA4 +@08098F9C: movs r0, 0 - b _08098FC2 + b @08098FC2 .align 2, 0 .pool -_08098FA4: +@08098FA4: cmp r0, r1 - beq _08098FAC + beq @08098FAC adds r2, 0x5 - b _08098F96 -_08098FAC: + b @08098F96 +@08098FAC: adds r2, 0x1 ldrb r0, [r2] ldrb r1, [r2, 0x1] @@ -284751,46 +284751,46 @@ _08098FAC: ldrb r1, [r2, 0x3] lsls r1, 24 adds r0, r1 -_08098FC2: +@08098FC2: pop {r1} bx r1 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 bl mapheader_get_tagged_pointer cmp r0, 0 - beq _08098FDA + beq @08098FDA bl script_env_2_execute_new_script -_08098FDA: +@08098FDA: pop {r0} bx r0 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 bl mapheader_get_tagged_pointer adds r6, r0, 0 cmp r6, 0 - beq _08098FFC -_08098FF0: + beq @08098FFC +@08098FF0: ldrb r1, [r6] ldrb r0, [r6, 0x1] lsls r0, 8 orrs r1, r0 cmp r1, 0 - bne _08099000 -_08098FFC: + bne @08099000 +@08098FFC: movs r0, 0 - b _0809903A -_08099000: + b @0809903A +@08099000: adds r6, 0x2 ldrb r5, [r6] ldrb r0, [r6, 0x1] @@ -284805,10 +284805,10 @@ _08099000: lsls r4, 16 lsls r0, 16 cmp r4, r0 - beq _08099026 + beq @08099026 adds r6, 0x4 - b _08098FF0 -_08099026: + b @08098FF0 +@08099026: ldrb r0, [r6] ldrb r1, [r6, 0x1] lsls r1, 8 @@ -284819,14 +284819,14 @@ _08099026: ldrb r1, [r6, 0x3] lsls r1, 24 adds r0, r1 -_0809903A: +@0809903A: pop {r4-r6} pop {r1} bx r1 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 @@ -284835,7 +284835,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 @@ -284844,7 +284844,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 @@ -284853,7 +284853,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 @@ -284862,7 +284862,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 @@ -284871,39 +284871,39 @@ 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 cmp r0, 0 - beq _08099090 + beq @08099090 bl script_env_1_execute_new_script movs r0, 0x1 - b _08099092 -_08099090: + b @08099092 +@08099090: movs r0, 0 -_08099092: +@08099092: pop {r1} bx r1 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 cmp r0, 0 - beq _080990A8 + beq @080990A8 bl script_env_2_execute_new_script -_080990A8: +@080990A8: pop {r0} bx r0 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] @@ -284921,7 +284921,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 @@ -284941,7 +284941,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 @@ -284968,7 +284968,7 @@ sub_80990FC: @ 80990FC bl killram ldr r0, =0x000003e3 cmp r8, r0 - bhi _08099174 + bhi @08099174 movs r0, 0x33 strb r0, [r4] mov r2, r9 @@ -284987,12 +284987,12 @@ sub_80990FC: @ 80990FC adds r1, r2 str r0, [r1] movs r0, 0x1 - b _08099176 + b @08099176 .align 2, 0 .pool -_08099174: +@08099174: movs r0, 0 -_08099176: +@08099176: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -285004,7 +285004,7 @@ _08099176: thumb_func_end sub_80990FC thumb_func_start sub_8099188 -sub_8099188: @ 8099188 +sub_8099188: ; 8099188 push {r4-r7,lr} adds r4, r1, 0 lsls r0, 24 @@ -285018,45 +285018,45 @@ sub_8099188: @ 8099188 str r0, [r7] ldrb r0, [r2] cmp r0, 0x33 - bne _080991F0 + bne @080991F0 ldrb r1, [r2, 0x1] movs r0, 0x4 ldrsb r0, [r5, r0] cmp r1, r0 - bne _080991F0 + bne @080991F0 ldrb r1, [r2, 0x2] movs r0, 0x5 ldrsb r0, [r5, r0] cmp r1, r0 - bne _080991F0 + bne @080991F0 ldrb r0, [r2, 0x3] cmp r0, r3 - bne _080991F0 + bne @080991F0 bl sub_80990AC ldr r1, [r6] ldr r2, =0x00003728 adds r1, r2 ldr r1, [r1] cmp r0, r1 - bne _080991EC + bne @080991EC str r4, [r7] ldr r1, =0x00003730 adds r0, r5, r1 - b _080991F2 + b @080991F2 .align 2, 0 .pool -_080991EC: +@080991EC: bl killram -_080991F0: +@080991F0: adds r0, r4, 0 -_080991F2: +@080991F2: pop {r4-r7} pop {r1} bx r1 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] @@ -285064,37 +285064,37 @@ sub_80991F8: @ 80991F8 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0x33 - bne _0809923C + bne @0809923C ldrb r0, [r1, 0x1] cmp r0, 0xFF - bne _0809923C + bne @0809923C ldrb r0, [r1, 0x2] cmp r0, 0xFF - bne _0809923C + bne @0809923C ldrb r0, [r1, 0x3] cmp r0, 0xFF - bne _0809923C + bne @0809923C bl sub_80990AC ldr r1, [r4] ldr r2, =0x00003728 adds r1, r2 ldr r1, [r1] cmp r0, r1 - bne _0809923C + bne @0809923C movs r0, 0x1 - b _0809923E + b @0809923E .align 2, 0 .pool -_0809923C: +@0809923C: movs r0, 0 -_0809923E: +@0809923E: pop {r4} pop {r1} bx r1 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] @@ -285102,43 +285102,43 @@ sub_8099244: @ 8099244 adds r4, r5, r0 bl sub_801B27C cmp r0, 0 - beq _08099298 + beq @08099298 ldrb r0, [r4] cmp r0, 0x33 - bne _08099298 + bne @08099298 ldrb r0, [r4, 0x1] cmp r0, 0xFF - bne _08099298 + bne @08099298 ldrb r0, [r4, 0x2] cmp r0, 0xFF - bne _08099298 + bne @08099298 ldrb r0, [r4, 0x3] cmp r0, 0xFF - bne _08099298 + bne @08099298 bl sub_80990AC ldr r1, [r6] ldr r2, =0x00003728 adds r1, r2 ldr r1, [r1] cmp r0, r1 - bne _08099294 + bne @08099294 ldr r1, =0x00003730 adds r0, r5, r1 - b _0809929A + b @0809929A .align 2, 0 .pool -_08099294: +@08099294: bl killram -_08099298: +@08099298: movs r0, 0 -_0809929A: +@0809929A: pop {r4-r6} pop {r1} bx r1 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 @@ -285146,9 +285146,9 @@ sub_80992A0: @ 80992A0 lsrs r1, 16 ldr r0, =0x000003e3 cmp r1, r0 - bls _080992B2 + bls @080992B2 adds r1, r0, 0 -_080992B2: +@080992B2: movs r0, 0xFF str r0, [sp] adds r0, r2, 0 @@ -285163,19 +285163,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 @@ -285184,7 +285184,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 @@ -285198,7 +285198,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 @@ -285215,7 +285215,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 @@ -285241,7 +285241,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 @@ -285251,7 +285251,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 @@ -285260,7 +285260,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 @@ -285274,7 +285274,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 @@ -285283,7 +285283,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 @@ -285297,8 +285297,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] @@ -285316,11 +285316,11 @@ s06_if_jump: @ 80993A4 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _080993D2 + bne @080993D2 adds r0, r5, 0 adds r1, r2, 0 bl script_jump -_080993D2: +@080993D2: movs r0, 0 pop {r4,r5} pop {r1} @@ -285330,7 +285330,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] @@ -285348,11 +285348,11 @@ s07_if_call: @ 80993E0 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _0809940E + bne @0809940E adds r0, r5, 0 adds r1, r2, 0 bl script_call -_0809940E: +@0809940E: movs r0, 0 pop {r4,r5} pop {r1} @@ -285362,8 +285362,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 @@ -285380,8 +285380,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 @@ -285400,7 +285400,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 @@ -285419,7 +285419,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] @@ -285439,11 +285439,11 @@ sBB_virtual_if_jump: @ 8099480 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _080994B2 + bne @080994B2 adds r0, r5, 0 adds r1, r2, 0 bl script_jump -_080994B2: +@080994B2: movs r0, 0 pop {r4,r5} pop {r1} @@ -285453,7 +285453,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] @@ -285473,11 +285473,11 @@ sBC_virtual_if_call: @ 80994C4 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _080994F6 + bne @080994F6 adds r0, r5, 0 adds r1, r2, 0 bl script_call -_080994F6: +@080994F6: movs r0, 0 pop {r4,r5} pop {r1} @@ -285487,7 +285487,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] @@ -285499,11 +285499,11 @@ s08_jumpstd: @ 8099508 adds r1, r0 ldr r0, =0x081dc2cc cmp r1, r0 - bcs _08099528 + bcs @08099528 ldr r1, [r1] adds r0, r2, 0 bl script_jump -_08099528: +@08099528: movs r0, 0 pop {r1} bx r1 @@ -285512,7 +285512,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] @@ -285524,11 +285524,11 @@ s09_callstd: @ 8099538 adds r1, r0 ldr r0, =0x081dc2cc cmp r1, r0 - bcs _08099558 + bcs @08099558 ldr r1, [r1] adds r0, r2, 0 bl script_call -_08099558: +@08099558: movs r0, 0 pop {r1} bx r1 @@ -285537,7 +285537,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] @@ -285555,17 +285555,17 @@ s0A_jumpstd_if: @ 8099568 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _080995A0 + bne @080995A0 lsls r0, r4, 2 ldr r1, =0x081dc2a0 adds r1, r0, r1 ldr r0, =0x081dc2cc cmp r1, r0 - bcs _080995A0 + bcs @080995A0 ldr r1, [r1] adds r0, r3, 0 bl script_jump -_080995A0: +@080995A0: movs r0, 0 pop {r4} pop {r1} @@ -285575,7 +285575,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] @@ -285593,17 +285593,17 @@ s0B_callstd_if: @ 80995B4 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _080995EC + bne @080995EC lsls r0, r4, 2 ldr r1, =0x081dc2a0 adds r1, r0, r1 ldr r0, =0x081dc2cc cmp r1, r0 - bcs _080995EC + bcs @080995EC ldr r1, [r1] adds r0, r3, 0 bl script_call -_080995EC: +@080995EC: movs r0, 0 pop {r4} pop {r1} @@ -285613,7 +285613,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] @@ -285626,7 +285626,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 @@ -285639,7 +285639,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] @@ -285653,8 +285653,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] @@ -285674,8 +285674,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] @@ -285696,8 +285696,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] @@ -285712,8 +285712,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 @@ -285731,8 +285731,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] @@ -285753,7 +285753,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 @@ -285773,7 +285773,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 @@ -285789,7 +285789,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 @@ -285807,7 +285807,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 @@ -285829,7 +285829,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 @@ -285850,30 +285850,30 @@ 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 lsls r1, 16 lsrs r1, 16 cmp r0, r1 - bcs _080997AE + bcs @080997AE movs r0, 0 - b _080997B8 -_080997AE: + b @080997B8 +@080997AE: cmp r0, r1 - beq _080997B6 + beq @080997B6 movs r0, 0x2 - b _080997B8 -_080997B6: + b @080997B8 +@080997B6: movs r0, 0x1 -_080997B8: +@080997B8: pop {r1} bx r1 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] @@ -285900,7 +285900,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] @@ -285923,7 +285923,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] @@ -285947,7 +285947,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 @@ -285970,7 +285970,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 @@ -285988,7 +285988,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 @@ -286006,7 +286006,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 @@ -286029,7 +286029,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 @@ -286054,7 +286054,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 @@ -286074,7 +286074,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 @@ -286097,7 +286097,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 @@ -286122,7 +286122,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 @@ -286155,7 +286155,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 @@ -286188,7 +286188,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 @@ -286221,7 +286221,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 @@ -286254,7 +286254,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 @@ -286276,7 +286276,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 @@ -286309,7 +286309,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 @@ -286342,7 +286342,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 @@ -286364,7 +286364,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 @@ -286386,7 +286386,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 @@ -286408,7 +286408,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 @@ -286430,8 +286430,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 @@ -286443,8 +286443,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 @@ -286456,8 +286456,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 @@ -286472,8 +286472,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] @@ -286487,8 +286487,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] @@ -286503,8 +286503,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 @@ -286519,28 +286519,28 @@ 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] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08099CC0 + beq @08099CC0 movs r0, 0 - b _08099CC2 + b @08099CC2 .align 2, 0 .pool -_08099CC0: +@08099CC0: movs r0, 0x1 -_08099CC2: +@08099CC2: pop {r1} bx r1 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] @@ -286561,8 +286561,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] @@ -286587,8 +286587,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] @@ -286596,16 +286596,16 @@ sub_8099D20: @ 8099D20 adds r0, 0x1 str r0, [r5, 0x8] cmp r4, 0x1 - beq _08099D3E + beq @08099D3E cmp r4, 0x1 - bgt _08099D3A + bgt @08099D3A cmp r4, 0 - beq _08099D60 - b _08099D3E -_08099D3A: + beq @08099D60 + b @08099D3E +@08099D3A: cmp r4, 0x2 - beq _08099D60 -_08099D3E: + beq @08099D60 +@08099D3E: ldr r0, =0x02037714 ldr r1, =0x02037fe8 ldr r2, =0x04000100 @@ -286613,10 +286613,10 @@ _08099D3E: adds r0, r4, 0 movs r1, 0 bl fade_screen - b _08099D72 + b @08099D72 .align 2, 0 .pool -_08099D60: +@08099D60: ldr r0, =0x02037fe8 ldr r1, =0x02037714 ldr r2, =0x04000100 @@ -286624,7 +286624,7 @@ _08099D60: adds r0, r4, 0 movs r1, 0 bl fade_screen -_08099D72: +@08099D72: ldr r1, =sub_8099CA8 + 1 adds r0, r5, 0 bl script_setup_asm_script @@ -286637,7 +286637,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] @@ -286645,21 +286645,21 @@ s28_pause_asm: @ 8099D94 strh r0, [r1] lsls r0, 16 cmp r0, 0 - beq _08099DAC + beq @08099DAC movs r0, 0 - b _08099DAE + b @08099DAE .align 2, 0 .pool -_08099DAC: +@08099DAC: movs r0, 0x1 -_08099DAE: +@08099DAE: pop {r1} bx r1 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 @@ -286677,8 +286677,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 @@ -286705,8 +286705,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 @@ -286715,8 +286715,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 sub_802F588 ldr r2, =0x020375d8 @@ -286740,8 +286740,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 @@ -286756,8 +286756,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 @@ -286766,8 +286766,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 @@ -286776,8 +286776,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] @@ -286791,8 +286791,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 @@ -286807,8 +286807,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 @@ -286872,8 +286872,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 @@ -286937,8 +286937,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 @@ -287002,7 +287002,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] @@ -287018,9 +287018,9 @@ sub_809A054: @ 809A054 adds r1, r4, 0 bl player_get_pos_to cmp r6, 0xFF - bne _0809A092 + bne @0809A092 cmp r5, 0xFF - bne _0809A092 + bne @0809A092 add r0, sp, 0x4 ldrh r0, [r0] subs r0, 0x7 @@ -287031,8 +287031,8 @@ sub_809A054: @ 809A054 lsls r1, 16 asrs r1, 16 bl sub_8084EBC - b _0809A0B6 -_0809A092: + b @0809A0B6 +@0809A092: lsls r0, r6, 24 asrs r0, 24 lsls r1, r5, 24 @@ -287050,7 +287050,7 @@ _0809A092: asrs r4, 24 str r4, [sp] bl warp1_set -_0809A0B6: +@0809A0B6: bl sp13F_fall_to_last_warp bl player_avatar_init_params_reset movs r0, 0x1 @@ -287061,7 +287061,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 @@ -287125,7 +287125,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 @@ -287189,7 +287189,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 @@ -287251,7 +287251,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 @@ -287315,7 +287315,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 @@ -287377,7 +287377,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 @@ -287439,7 +287439,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 @@ -287501,8 +287501,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 @@ -287531,7 +287531,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 @@ -287547,7 +287547,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 @@ -287559,23 +287559,23 @@ 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 cmp r0, 0 - beq _0809A4D8 + beq @0809A4D8 movs r0, 0 - b _0809A4DA -_0809A4D8: + b @0809A4DA +@0809A4D8: movs r0, 0x1 -_0809A4DA: +@0809A4DA: pop {r1} bx r1 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 + 1 bl script_setup_asm_script @@ -287587,7 +287587,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 @@ -287599,7 +287599,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 @@ -287609,7 +287609,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 + 1 bl script_setup_asm_script @@ -287621,8 +287621,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 @@ -287634,10 +287634,10 @@ s33_play_music: @ 809A52C adds r0, 0x1 str r0, [r4, 0x8] cmp r1, 0x1 - bne _0809A54C + bne @0809A54C adds r0, r2, 0 bl sav1_set_x2C -_0809A54C: +@0809A54C: adds r0, r5, 0 bl current_map_music_set movs r0, 0 @@ -287647,7 +287647,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 @@ -287659,7 +287659,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 @@ -287668,7 +287668,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 @@ -287680,7 +287680,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] @@ -287688,15 +287688,15 @@ s37_fadeout: @ 809A590 adds r0, 0x1 str r0, [r4, 0x8] cmp r1, 0 - beq _0809A5AA + beq @0809A5AA lsls r0, r1, 26 lsrs r0, 24 bl sub_80A31E8 - b _0809A5B0 -_0809A5AA: + b @0809A5B0 +@0809A5AA: movs r0, 0x4 bl sub_80A31E8 -_0809A5B0: +@0809A5B0: ldr r1, =sub_80A3200 + 1 adds r0, r4, 0 bl script_setup_asm_script @@ -287709,29 +287709,29 @@ _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] adds r1, 0x1 str r1, [r0, 0x8] cmp r2, 0 - beq _0809A5DC + beq @0809A5DC lsls r0, r2, 26 lsrs r0, 24 bl sub_80A3228 - b _0809A5E2 -_0809A5DC: + b @0809A5E2 +@0809A5DC: movs r0, 0x4 bl sub_80A3228 -_0809A5E2: +@0809A5E2: movs r0, 0 pop {r1} bx r1 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 @@ -287762,7 +287762,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 @@ -287796,7 +287796,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] @@ -287814,7 +287814,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 @@ -287824,10 +287824,10 @@ s51_waitmove: @ 809A698 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - beq _0809A6B4 + beq @0809A6B4 ldr r0, =0x020375ca strh r1, [r0] -_0809A6B4: +@0809A6B4: ldr r1, =0x020375cc ldr r0, =0x03005d8c ldr r2, [r0] @@ -287850,7 +287850,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 @@ -287860,10 +287860,10 @@ s52_waitmove_remote: @ 809A6EC lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - beq _0809A708 + beq @0809A708 ldr r0, =0x020375ca strh r1, [r0] -_0809A708: +@0809A708: ldr r0, [r4, 0x8] ldrb r2, [r0] adds r0, 0x1 @@ -287887,7 +287887,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 @@ -287908,7 +287908,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 @@ -287932,7 +287932,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 @@ -287953,7 +287953,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 @@ -287977,7 +287977,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 @@ -288025,7 +288025,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 @@ -288065,7 +288065,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 @@ -288086,7 +288086,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 @@ -288111,7 +288111,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 @@ -288136,7 +288136,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 @@ -288166,7 +288166,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 @@ -288190,7 +288190,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 @@ -288202,14 +288202,14 @@ s5A_face_player: @ 809A9A4 ldrb r0, [r4] lsls r0, 31 cmp r0, 0 - beq _0809A9CC + beq @0809A9CC bl player_get_direction__sp1AA adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 bl npc_reciprocate_look -_0809A9CC: +@0809A9CC: movs r0, 0 pop {r4} pop {r1} @@ -288219,7 +288219,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 @@ -288246,7 +288246,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 @@ -288267,7 +288267,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} @@ -288322,7 +288322,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] @@ -288339,38 +288339,38 @@ 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 cmp r0, 0 - bne _0809AAE4 + bne @0809AAE4 bl sub_80983E8 ldr r1, =sub_80983C4 + 1 adds r0, r4, 0 bl script_setup_asm_script movs r0, 0x1 - b _0809AAE6 + b @0809AAE6 .align 2, 0 .pool -_0809AAE4: +@0809AAE4: movs r0, 0 -_0809AAE6: +@0809AAE6: pop {r4} pop {r1} bx r1 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 cmp r0, 0 - beq _0809AAFC + beq @0809AAFC movs r0, 0 - b _0809AB3A -_0809AAFC: + b @0809AB3A +@0809AAFC: ldr r2, =0x02037350 ldr r0, =0x03005df0 ldrb r1, [r0] @@ -288381,22 +288381,22 @@ _0809AAFC: ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - beq _0809AB2C + beq @0809AB2C bl sub_80984A0 ldr r1, =sub_809847C + 1 adds r0, r4, 0 bl script_setup_asm_script - b _0809AB38 + b @0809AB38 .align 2, 0 .pool -_0809AB2C: +@0809AB2C: bl sub_80983E8 ldr r1, =sub_80983C4 + 1 adds r0, r4, 0 bl script_setup_asm_script -_0809AB38: +@0809AB38: movs r0, 0x1 -_0809AB3A: +@0809AB3A: pop {r4} pop {r1} bx r1 @@ -288405,7 +288405,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 @@ -288431,7 +288431,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 @@ -288444,10 +288444,10 @@ s6C_release_2: @ 809AB7C ldrb r0, [r1] lsls r0, 31 cmp r0, 0 - beq _0809AB9E + beq @0809AB9E adds r0, r1, 0 bl sub_8093284 -_0809AB9E: +@0809AB9E: movs r0, 0xFF movs r1, 0 movs r2, 0 @@ -288471,14 +288471,14 @@ _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 cmp r0, 0 - bne _0809ABE2 + bne @0809ABE2 ldr r0, [r4, 0x64] -_0809ABE2: +@0809ABE2: bl box_related_two__2 movs r0, 0 pop {r4} @@ -288487,14 +288487,14 @@ _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 cmp r0, 0 - bne _0809ABFE + bne @0809ABFE ldr r0, [r4, 0x64] -_0809ABFE: +@0809ABFE: bl sub_8098238 movs r0, 0 pop {r4} @@ -288503,15 +288503,15 @@ _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 adds r3, r0, 0 cmp r3, 0 - bne _0809AC1C + bne @0809AC1C ldr r3, [r4, 0x64] -_0809AC1C: +@0809AC1C: ldr r2, =0x03003014 ldrb r0, [r2] movs r1, 0x4 @@ -288530,16 +288530,16 @@ _0809AC1C: thumb_func_end s9B_unknown thumb_func_start s78_braille_msgbox -s78_braille_msgbox: @ 809AC3C +s78_braille_msgbox: ; 809AC3C push {r4,r5,lr} sub sp, 0xC adds r5, r0, 0 bl script_read_word adds r4, r0, 0 cmp r4, 0 - bne _0809AC4E + bne @0809AC4E ldr r4, [r5, 0x64] -_0809AC4E: +@0809AC4E: bl sub_81973A4 movs r0, 0 movs r1, 0x1 @@ -288561,7 +288561,7 @@ _0809AC4E: thumb_func_end s78_braille_msgbox thumb_func_start sub_809AC78 -sub_809AC78: @ 809AC78 +sub_809AC78: ; 809AC78 push {lr} ldr r1, =sub_809833C + 1 bl script_setup_asm_script @@ -288573,7 +288573,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 @@ -288582,31 +288582,31 @@ 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] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0809ACB8 + bne @0809ACB8 movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _0809ACB8 + bne @0809ACB8 movs r0, 0 - b _0809ACBA + b @0809ACBA .align 2, 0 .pool -_0809ACB8: +@0809ACB8: movs r0, 0x1 -_0809ACBA: +@0809ACBA: pop {r1} bx r1 thumb_func_end sub_809AC98 thumb_func_start sub_809ACC0 -sub_809ACC0: @ 809ACC0 +sub_809ACC0: ; 809ACC0 push {lr} ldr r1, =sub_809AC98 + 1 bl script_setup_asm_script @@ -288618,7 +288618,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] @@ -288632,19 +288632,19 @@ s6E_yes_no: @ 809ACD4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809ACF6 + beq @0809ACF6 movs r0, 0 - b _0809ACFC -_0809ACF6: + b @0809ACFC +@0809ACF6: bl script_env_2_set_ctx_paused movs r0, 0x1 -_0809ACFC: +@0809ACFC: pop {r1} bx r1 thumb_func_end s6E_yes_no thumb_func_start sub_809AD00 -sub_809AD00: @ 809AD00 +sub_809AD00: ; 809AD00 push {r4,r5,lr} ldr r2, [r0, 0x8] ldrb r5, [r2] @@ -288664,20 +288664,20 @@ sub_809AD00: @ 809AD00 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809AD2E + beq @0809AD2E movs r0, 0 - b _0809AD34 -_0809AD2E: + b @0809AD34 +@0809AD2E: bl script_env_2_set_ctx_paused movs r0, 0x1 -_0809AD34: +@0809AD34: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_809AD00 thumb_func_start sub_809AD3C -sub_809AD3C: @ 809AD3C +sub_809AD3C: ; 809AD3C push {r4-r6,lr} mov r6, r8 push {r6} @@ -288705,13 +288705,13 @@ sub_809AD3C: @ 809AD3C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809AD7A + beq @0809AD7A movs r0, 0 - b _0809AD80 -_0809AD7A: + b @0809AD80 +@0809AD7A: bl script_env_2_set_ctx_paused movs r0, 0x1 -_0809AD80: +@0809AD80: add sp, 0x4 pop {r3} mov r8, r3 @@ -288721,13 +288721,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} @@ -288755,13 +288755,13 @@ sub_809AD90: @ 809AD90 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809ADCE + beq @0809ADCE movs r0, 0 - b _0809ADD4 -_0809ADCE: + b @0809ADD4 +@0809ADCE: bl script_env_2_set_ctx_paused movs r0, 0x1 -_0809ADD4: +@0809ADD4: add sp, 0x4 pop {r3} mov r8, r3 @@ -288771,7 +288771,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] @@ -288780,7 +288780,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] @@ -288789,7 +288789,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 @@ -288813,37 +288813,37 @@ 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 adds r1, r0, 0 cmp r1, 0 - beq _0809AE40 + beq @0809AE40 adds r0, r4, 0 bl script_setup_asm_script movs r0, 0x1 - b _0809AE42 -_0809AE40: + b @0809AE42 +@0809AE40: movs r0, 0 -_0809AE42: +@0809AE42: pop {r4} pop {r1} bx r1 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] adds r1, 0x1 str r1, [r0, 0x8] cmp r2, 0 - beq _0809AE5C + beq @0809AE5C adds r0, r2, 0 bl sub_812FDA8 -_0809AE5C: +@0809AE5C: bl sub_80F8ADC bl script_env_2_set_ctx_paused movs r0, 0x1 @@ -288852,7 +288852,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} @@ -288872,34 +288872,34 @@ sub_809AE6C: @ 809AE6C lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x1C - bls _0809AE9C + bls @0809AE9C movs r7, 0x1C -_0809AE9C: +@0809AE9C: movs r5, 0x4 ldrb r0, [r4] adds r2, r7, 0x2 add r1, sp, 0x18 mov r8, r1 cmp r0, 0xFF - beq _0809AEC0 + beq @0809AEC0 adds r1, r4, 0 -_0809AEAC: +@0809AEAC: ldrb r0, [r1] adds r1, 0x1 cmp r0, 0xFE - bne _0809AEBA + bne @0809AEBA adds r0, r5, 0x3 lsls r0, 24 lsrs r5, r0, 24 -_0809AEBA: +@0809AEBA: ldrb r0, [r1] cmp r0, 0xFF - bne _0809AEAC -_0809AEC0: + bne @0809AEAC +@0809AEC0: cmp r5, 0x12 - bls _0809AEC6 + bls @0809AEC6 movs r5, 0x12 -_0809AEC6: +@0809AEC6: lsls r0, r2, 24 lsrs r0, 24 movs r2, 0x1E @@ -288995,7 +288995,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 @@ -289004,7 +289004,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 @@ -289019,7 +289019,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] @@ -289050,7 +289050,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] @@ -289085,7 +289085,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] @@ -289119,7 +289119,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] @@ -289145,7 +289145,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] @@ -289183,7 +289183,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] @@ -289212,7 +289212,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] @@ -289243,7 +289243,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] @@ -289277,7 +289277,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] @@ -289307,7 +289307,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] @@ -289334,7 +289334,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] @@ -289356,7 +289356,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 @@ -289373,7 +289373,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] @@ -289398,7 +289398,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] @@ -289427,7 +289427,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 @@ -289487,7 +289487,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 @@ -289509,7 +289509,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] @@ -289532,7 +289532,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 @@ -289541,36 +289541,36 @@ sub_809B3DC: @ 809B3DC movs r0, 0x6 strh r0, [r1] movs r6, 0 - b _0809B42A + b @0809B42A .align 2, 0 .pool -_0809B3F4: +@0809B3F4: adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _0809B424 + bne @0809B424 adds r0, r4, 0 adds r1, r7, 0 bl pokemon_has_move lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809B424 + bne @0809B424 ldr r0, =0x020375f0 strh r6, [r0] ldr r0, =0x020375e0 strh r5, [r0] - b _0809B44A + b @0809B44A .align 2, 0 .pool -_0809B424: +@0809B424: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_0809B42A: +@0809B42A: cmp r6, 0x5 - bhi _0809B44A + bhi @0809B44A movs r0, 0x64 adds r1, r6, 0 muls r1, r0 @@ -289583,8 +289583,8 @@ _0809B42A: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - bne _0809B3F4 -_0809B44A: + bne @0809B3F4 +@0809B44A: movs r0, 0 pop {r4-r7} pop {r1} @@ -289594,8 +289594,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 @@ -289605,7 +289605,7 @@ s90_add_money: @ 809B458 adds r0, 0x1 str r0, [r4, 0x8] cmp r1, 0 - bne _0809B47E + bne @0809B47E ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x92 @@ -289613,7 +289613,7 @@ s90_add_money: @ 809B458 adds r0, r1 adds r1, r2, 0 bl add_money -_0809B47E: +@0809B47E: movs r0, 0 pop {r4} pop {r1} @@ -289623,8 +289623,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 @@ -289634,7 +289634,7 @@ s91_subtract_money: @ 809B48C adds r0, 0x1 str r0, [r4, 0x8] cmp r1, 0 - bne _0809B4B2 + bne @0809B4B2 ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x92 @@ -289642,7 +289642,7 @@ s91_subtract_money: @ 809B48C adds r0, r1 adds r1, r2, 0 bl subtract_money -_0809B4B2: +@0809B4B2: movs r0, 0 pop {r4} pop {r1} @@ -289652,8 +289652,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 @@ -289663,7 +289663,7 @@ s92_check_money: @ 809B4C0 adds r0, 0x1 str r0, [r4, 0x8] cmp r1, 0 - bne _0809B4EE + bne @0809B4EE ldr r4, =0x020375f0 ldr r0, =0x03005d8c ldr r0, [r0] @@ -289675,7 +289675,7 @@ s92_check_money: @ 809B4C0 lsls r0, 24 lsrs r0, 24 strh r0, [r4] -_0809B4EE: +@0809B4EE: movs r0, 0 pop {r4} pop {r1} @@ -289685,8 +289685,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] @@ -289699,7 +289699,7 @@ s93_display_money: @ 809B500 adds r2, 0x1 str r2, [r0, 0x8] cmp r1, 0 - bne _0809B530 + bne @0809B530 ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x92 @@ -289709,7 +289709,7 @@ s93_display_money: @ 809B500 adds r1, r5, 0 adds r2, r4, 0 bl sub_80E52EC -_0809B530: +@0809B530: movs r0, 0 pop {r4,r5} pop {r1} @@ -289719,7 +289719,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 @@ -289728,8 +289728,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 @@ -289739,7 +289739,7 @@ s95_update_money: @ 809B548 adds r2, 0x1 str r2, [r0, 0x8] cmp r1, 0 - bne _0809B56E + bne @0809B56E ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x92 @@ -289747,7 +289747,7 @@ s95_update_money: @ 809B548 adds r0, r1 bl decrypt_money bl sub_80E52D4 -_0809B56E: +@0809B56E: movs r0, 0 pop {r1} bx r1 @@ -289756,7 +289756,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] @@ -289778,7 +289778,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 @@ -289790,7 +289790,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 @@ -289805,7 +289805,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] @@ -289818,7 +289818,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 @@ -289827,7 +289827,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 @@ -289839,7 +289839,7 @@ sub_809B5F0: @ 809B5F0 thumb_func_end sub_809B5F0 thumb_func_start sub_809B604 -sub_809B604: @ 809B604 +sub_809B604: ; 809B604 push {r4,lr} adds r4, r0, 0 bl sub_80B1B10 @@ -289851,7 +289851,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 @@ -289869,7 +289869,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 @@ -289884,7 +289884,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 @@ -289899,7 +289899,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 @@ -289925,7 +289925,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 @@ -289935,7 +289935,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 sub_80E1284 @@ -289946,7 +289946,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 sub_80E12A8 @@ -289957,7 +289957,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 sub_80E12C8 @@ -289968,7 +289968,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 @@ -289987,7 +289987,7 @@ s89_open_casino_game1: @ 809B6F4 thumb_func_end s89_open_casino_game1 thumb_func_start sub_809B71C -sub_809B71C: @ 809B71C +sub_809B71C: ; 809B71C push {r4,r5,lr} ldr r1, [r0, 0x8] ldrb r5, [r1] @@ -290000,20 +290000,20 @@ sub_809B71C: @ 809B71C adds r2, 0x1 str r2, [r0, 0x8] cmp r3, 0 - bne _0809B744 + bne @0809B744 adds r0, r5, 0 movs r1, 0 adds r2, r4, 0 movs r3, 0 bl sub_80E191C - b _0809B750 -_0809B744: + b @0809B750 +@0809B744: adds r0, r5, 0 adds r1, r3, 0 adds r2, r4, 0 movs r3, 0 bl sub_80E191C -_0809B750: +@0809B750: movs r0, 0 pop {r4,r5} pop {r1} @@ -290021,7 +290021,7 @@ _0809B750: thumb_func_end sub_809B71C thumb_func_start sub_809B758 -sub_809B758: @ 809B758 +sub_809B758: ; 809B758 push {r4,lr} bl script_read_halfword lsls r0, 16 @@ -290043,7 +290043,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 @@ -290053,7 +290053,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 @@ -290063,7 +290063,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 @@ -290073,7 +290073,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] @@ -290087,7 +290087,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 @@ -290108,7 +290108,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] @@ -290133,27 +290133,27 @@ 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] bl oe_active_list_contains lsls r0, 24 cmp r0, 0 - beq _0809B83C + beq @0809B83C movs r0, 0 - b _0809B83E + b @0809B83E .align 2, 0 .pool -_0809B83C: +@0809B83C: movs r0, 0x1 -_0809B83E: +@0809B83E: pop {r1} bx r1 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 @@ -290174,7 +290174,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 @@ -290189,7 +290189,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] @@ -290202,7 +290202,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 @@ -290229,7 +290229,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 + 1 bl script_setup_asm_script @@ -290241,7 +290241,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 @@ -290277,13 +290277,13 @@ sA2_setmaptile: @ 809B8F0 lsls r1, 16 lsrs r5, r1, 16 cmp r0, 0 - bne _0809B954 + bne @0809B954 adds r0, r6, 0 adds r1, r5, 0 adds r2, r7, 0 bl setmaptile_0 - b _0809B966 -_0809B954: + b @0809B966 +@0809B954: movs r1, 0xC0 lsls r1, 4 adds r0, r1, 0 @@ -290292,7 +290292,7 @@ _0809B954: adds r0, r6, 0 adds r1, r5, 0 bl setmaptile_0 -_0809B966: +@0809B966: movs r0, 0 pop {r4-r7} pop {r1} @@ -290300,7 +290300,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 @@ -290340,7 +290340,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 @@ -290373,23 +290373,23 @@ 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 cmp r0, 0 - beq _0809BA1C + beq @0809BA1C movs r0, 0 - b _0809BA1E -_0809BA1C: + b @0809BA1E +@0809BA1C: movs r0, 0x1 -_0809BA1E: +@0809BA1E: pop {r1} bx r1 thumb_func_end sub_809BA0C thumb_func_start sub_809BA24 -sub_809BA24: @ 809BA24 +sub_809BA24: ; 809BA24 push {lr} ldr r1, =sub_809BA0C + 1 bl script_setup_asm_script @@ -290401,7 +290401,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 @@ -290434,7 +290434,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 @@ -290467,7 +290467,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] @@ -290495,13 +290495,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 @@ -290517,7 +290517,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 @@ -290529,16 +290529,16 @@ sub_809BB20: @ 809BB20 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809BB48 + bne @0809BB48 ldr r1, =0x020375f0 movs r0, 0 - b _0809BB4C + b @0809BB4C .align 2, 0 .pool -_0809BB48: +@0809BB48: ldr r1, =0x020375f0 movs r0, 0x1 -_0809BB4C: +@0809BB4C: strh r0, [r1] movs r0, 0 pop {r1} @@ -290548,7 +290548,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 @@ -290560,16 +290560,16 @@ sub_809BB58: @ 809BB58 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809BB80 + bne @0809BB80 ldr r1, =0x020375f0 movs r0, 0 - b _0809BB84 + b @0809BB84 .align 2, 0 .pool -_0809BB80: +@0809BB80: ldr r1, =0x020375f0 movs r0, 0x1 -_0809BB84: +@0809BB84: strh r0, [r1] movs r0, 0 pop {r1} @@ -290579,7 +290579,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 @@ -290598,7 +290598,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 @@ -290607,7 +290607,7 @@ sub_809BBB4: @ 809BBB4 thumb_func_end sub_809BBB4 thumb_func_start sub_809BBC0 -sub_809BBC0: @ 809BBC0 +sub_809BBC0: ; 809BBC0 push {lr} bl script_read_halfword lsls r0, 16 @@ -290622,7 +290622,7 @@ sub_809BBC0: @ 809BBC0 thumb_func_end sub_809BBC0 thumb_func_start sub_809BBDC -sub_809BBDC: @ 809BBDC +sub_809BBDC: ; 809BBDC push {lr} bl sub_81A895C movs r0, 0 @@ -290631,7 +290631,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 @@ -290644,15 +290644,15 @@ 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 cmp r0, 0 - beq _0809BC0C + beq @0809BC0C movs r0, 0 - b _0809BC30 -_0809BC0C: + b @0809BC30 +@0809BC0C: ldr r2, =0x02037350 ldr r0, =0x03005df0 ldrb r1, [r0] @@ -290663,14 +290663,14 @@ _0809BC0C: ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - beq _0809BC2E + beq @0809BC2E bl sub_8098630 ldr r1, =sub_8098734 + 1 adds r0, r4, 0 bl script_setup_asm_script -_0809BC2E: +@0809BC2E: movs r0, 0x1 -_0809BC30: +@0809BC30: pop {r4} pop {r1} bx r1 @@ -290679,7 +290679,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 @@ -290707,7 +290707,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 @@ -290733,20 +290733,20 @@ 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 adds r2, r0, 0 cmp r2, 0 - beq _0809BCD0 + beq @0809BCD0 ldr r1, =0x020375c0 ldr r0, [r4, 0x8] str r0, [r1] adds r0, r4, 0 adds r1, r2, 0 bl script_jump -_0809BCD0: +@0809BCD0: movs r0, 0 pop {r4} pop {r1} @@ -290756,7 +290756,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 @@ -290824,7 +290824,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 @@ -290841,7 +290841,7 @@ sub_809BD70: @ 809BD70 adds r0, 0x1 str r0, [r4, 0x8] cmp r3, 0x5 - bhi _0809BDA6 + bhi @0809BDA6 movs r0, 0x64 muls r0, r3 ldr r1, =0x020244ec @@ -290849,7 +290849,7 @@ sub_809BD70: @ 809BD70 movs r1, 0x23 mov r2, sp bl pokemon_setattr -_0809BDA6: +@0809BDA6: movs r0, 0 add sp, 0x4 pop {r4} @@ -290860,7 +290860,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] @@ -290876,7 +290876,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] @@ -290905,7 +290905,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] @@ -290934,7 +290934,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 @@ -290943,7 +290943,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 @@ -291007,7 +291007,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 @@ -291033,8 +291033,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 @@ -291056,122 +291056,122 @@ process_overworld_input: @ 809BF08 lsls r0, 24 lsrs r7, r0, 24 cmp r6, 0x2 - bne _0809BF3C + bne @0809BF3C cmp r7, 0 - beq _0809BF40 -_0809BF3C: + beq @0809BF40 +@0809BF3C: cmp r6, 0 - bne _0809BFA2 -_0809BF40: + bne @0809BFA2 +@0809BF40: bl sub_811A138 lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - beq _0809BF8C + beq @0809BF8C movs r0, 0x8 ands r0, r5 cmp r0, 0 - beq _0809BF5C + beq @0809BF5C ldrb r0, [r4] movs r1, 0x4 orrs r0, r1 strb r0, [r4] -_0809BF5C: +@0809BF5C: movs r0, 0x4 ands r0, r5 cmp r0, 0 - beq _0809BF6C + beq @0809BF6C ldrb r0, [r4] movs r1, 0x8 orrs r0, r1 strb r0, [r4] -_0809BF6C: +@0809BF6C: movs r0, 0x1 ands r0, r5 cmp r0, 0 - beq _0809BF7C + beq @0809BF7C ldrb r0, [r4] movs r1, 0x1 orrs r0, r1 strb r0, [r4] -_0809BF7C: +@0809BF7C: movs r0, 0x2 ands r0, r5 cmp r0, 0 - beq _0809BF8C + beq @0809BF8C ldrb r0, [r4] movs r1, 0x80 orrs r0, r1 strb r0, [r4] -_0809BF8C: +@0809BF8C: movs r0, 0xF0 mov r1, r8 ands r0, r1 cmp r0, 0 - beq _0809BFA2 + beq @0809BFA2 ldrb r0, [r4] movs r1, 0x10 orrs r0, r1 movs r1, 0x20 orrs r0, r1 strb r0, [r4] -_0809BFA2: +@0809BFA2: cmp r7, 0 - bne _0809BFC8 + bne @0809BFC8 cmp r6, 0x2 - bne _0809BFB8 + bne @0809BFB8 mov r0, r9 cmp r0, 0x2 - bne _0809BFB8 + bne @0809BFB8 ldrb r0, [r4] movs r1, 0x40 orrs r0, r1 strb r0, [r4] -_0809BFB8: +@0809BFB8: cmp r7, 0 - bne _0809BFC8 + bne @0809BFC8 cmp r6, 0x2 - bne _0809BFC8 + bne @0809BFC8 ldrb r0, [r4] movs r1, 0x2 orrs r0, r1 strb r0, [r4] -_0809BFC8: +@0809BFC8: movs r0, 0x40 mov r1, r8 ands r0, r1 cmp r0, 0 - beq _0809BFDC + beq @0809BFDC movs r0, 0x2 - b _0809C004 + b @0809C004 .align 2, 0 .pool -_0809BFDC: +@0809BFDC: movs r0, 0x80 mov r1, r8 ands r0, r1 cmp r0, 0 - beq _0809BFEA + beq @0809BFEA movs r0, 0x1 - b _0809C004 -_0809BFEA: + b @0809C004 +@0809BFEA: movs r0, 0x20 mov r1, r8 ands r0, r1 cmp r0, 0 - beq _0809BFF8 + beq @0809BFF8 movs r0, 0x3 - b _0809C004 -_0809BFF8: + b @0809C004 +@0809BFF8: movs r0, 0x10 mov r1, r8 ands r0, r1 cmp r0, 0 - beq _0809C006 + beq @0809C006 movs r0, 0x4 -_0809C004: +@0809C004: strb r0, [r4, 0x2] -_0809C006: +@0809C006: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -291181,8 +291181,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 @@ -291209,26 +291209,26 @@ sub_809C014: @ 809C014 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809C14E + beq @0809C14E bl mapheader_run_first_tag2_script_list_match lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809C14E + beq @0809C14E ldrb r1, [r5] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0809C070 + beq @0809C070 bl sub_809C89C cmp r0, 0x1 - beq _0809C14E -_0809C070: + beq @0809C14E +@0809C070: ldrb r1, [r5] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0809C096 + beq @0809C096 movs r0, 0x5 bl sav12_xor_increment bl increment_var_x4026_on_birth_island_modulo_100 @@ -291239,28 +291239,28 @@ _0809C070: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809C14E -_0809C096: + beq @0809C14E +@0809C096: ldrb r1, [r5] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0809C0AE + beq @0809C0AE adds r0, r4, 0 bl is_it_battle_time_3 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809C14E -_0809C0AE: + beq @0809C14E +@0809C0AE: ldrb r1, [r5] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0809C0D0 + beq @0809C0D0 ldrb r0, [r5, 0x2] cmp r0, r6 - bne _0809C0D0 + bne @0809C0D0 mov r0, sp adds r1, r4, 0 adds r2, r6, 0 @@ -291268,8 +291268,8 @@ _0809C0AE: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809C14E -_0809C0D0: + beq @0809C14E +@0809C0D0: mov r4, sp mov r0, sp bl player_get_next_pos_and_height @@ -291285,7 +291285,7 @@ _0809C0D0: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0809C106 + beq @0809C106 mov r0, sp adds r1, r4, 0 adds r2, r6, 0 @@ -291293,16 +291293,16 @@ _0809C0D0: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809C14E -_0809C106: + beq @0809C14E +@0809C106: ldrb r1, [r5] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0809C128 + beq @0809C128 ldrb r0, [r5, 0x2] cmp r0, r6 - bne _0809C128 + bne @0809C128 mov r0, sp adds r1, r4, 0 adds r2, r6, 0 @@ -291310,43 +291310,43 @@ _0809C106: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809C14E -_0809C128: + beq @0809C14E +@0809C128: ldrb r1, [r5] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0809C13A + beq @0809C13A bl sub_809C868 cmp r0, 0x1 - beq _0809C14E -_0809C13A: + beq @0809C14E +@0809C13A: ldrb r1, [r5] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0809C15C + beq @0809C15C movs r0, 0x6 bl audio_play bl sub_809FA9C -_0809C14E: +@0809C14E: movs r0, 0x1 - b _0809C172 + b @0809C172 .align 2, 0 .pool -_0809C15C: +@0809C15C: movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _0809C170 + beq @0809C170 bl sub_81AD520 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809C14E -_0809C170: + beq @0809C14E +@0809C170: movs r0, 0 -_0809C172: +@0809C172: add sp, 0x8 pop {r4-r6} pop {r1} @@ -291354,7 +291354,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 @@ -291367,7 +291367,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 @@ -291387,9 +291387,9 @@ player_get_next_pos_and_height: @ 809C194 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _0809C1C6 + beq @0809C1C6 bl player_get_height -_0809C1C6: +@0809C1C6: strb r0, [r5, 0x4] add sp, 0x4 pop {r4,r5} @@ -291398,7 +291398,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 @@ -291421,7 +291421,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 @@ -291430,38 +291430,38 @@ sub_809C1FC: @ 809C1FC bl onpress_a_get_script adds r4, r0, 0 cmp r4, 0 - bne _0809C214 + bne @0809C214 movs r0, 0 - b _0809C24C -_0809C214: + b @0809C24C +@0809C214: ldr r0, =0x081f860d cmp r4, r0 - beq _0809C244 + beq @0809C244 ldr r0, =0x081f9553 cmp r4, r0 - beq _0809C244 + beq @0809C244 ldr r0, =0x0823b4bb cmp r4, r0 - beq _0809C244 + beq @0809C244 ldr r0, =0x0823b589 cmp r4, r0 - beq _0809C244 + beq @0809C244 ldr r0, =0x082766a2 cmp r4, r0 - beq _0809C244 + beq @0809C244 ldr r0, =0x082766a6 cmp r4, r0 - beq _0809C244 + beq @0809C244 ldr r0, =0x08271d92 cmp r4, r0 - beq _0809C244 + beq @0809C244 movs r0, 0x5 bl audio_play -_0809C244: +@0809C244: adds r0, r4, 0 bl script_env_1_execute_new_script movs r0, 0x1 -_0809C24C: +@0809C24C: pop {r4} pop {r1} bx r1 @@ -291470,7 +291470,7 @@ _0809C24C: thumb_func_end sub_809C1FC thumb_func_start onpress_a_get_script -onpress_a_get_script: @ 809C270 +onpress_a_get_script: ; 809C270 push {r4-r7,lr} mov r7, r8 push {r7} @@ -291485,27 +291485,27 @@ onpress_a_get_script: @ 809C270 adds r2, r4, 0 bl sub_809C384 cmp r0, 0 - bne _0809C2BC + bne @0809C2BC adds r0, r6, 0 adds r1, r5, 0 adds r2, r4, 0 bl sub_809C458 cmp r0, 0 - bne _0809C2BC + bne @0809C2BC adds r0, r6, 0 adds r1, r5, 0 adds r2, r4, 0 bl sub_809C538 cmp r0, 0 - bne _0809C2BC + bne @0809C2BC adds r0, r6, 0 mov r1, r8 adds r2, r7, 0 bl sub_809C7EC cmp r0, 0 - bne _0809C2BC + bne @0809C2BC movs r0, 0 -_0809C2BC: +@0809C2BC: pop {r3} mov r8, r3 pop {r4-r7} @@ -291514,7 +291514,7 @@ _0809C2BC: thumb_func_end onpress_a_get_script thumb_func_start sub_809C2C8 -sub_809C2C8: @ 809C2C8 +sub_809C2C8: ; 809C2C8 push {r4-r6,lr} adds r4, r0, 0 lsls r2, 24 @@ -291529,11 +291529,11 @@ sub_809C2C8: @ 809C2C8 bl is_tile_x80 lsls r0, 24 cmp r0, 0 - bne _0809C2F0 + bne @0809C2F0 ldrh r0, [r4] ldrh r1, [r4, 0x2] - b _0809C30E -_0809C2F0: + b @0809C30E +@0809C2F0: ldr r1, =0x08339d64 lsls r2, r6, 3 adds r0, r2, r1 @@ -291549,13 +291549,13 @@ _0809C2F0: adds r1, r2 lsls r1, 16 lsrs r1, 16 -_0809C30E: +@0809C30E: ldrb r2, [r4, 0x4] bl npc_id_by_pos_and_height lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x10 - beq _0809C32E + beq @0809C32E ldr r1, =0x02037350 lsls r2, r3, 3 adds r0, r2, r3 @@ -291564,27 +291564,27 @@ _0809C30E: ldrb r0, [r0, 0x8] adds r5, r1, 0 cmp r0, 0xFF - bne _0809C33C -_0809C32E: + bne @0809C33C +@0809C32E: movs r0, 0 - b _0809C36E + b @0809C36E .align 2, 0 .pool -_0809C33C: +@0809C33C: movs r4, 0 ldr r1, =0x02032308 -_0809C340: +@0809C340: ldrb r0, [r1] cmp r0, 0x1 - bne _0809C34C + bne @0809C34C ldrb r0, [r1, 0x2] cmp r0, r3 - beq _0809C32E -_0809C34C: + beq @0809C32E +@0809C34C: adds r1, 0x4 adds r4, 0x1 cmp r4, 0x3 - ble _0809C340 + ble @0809C340 ldr r0, =0x03005df0 strb r3, [r0] ldr r1, =0x020375f2 @@ -291597,7 +291597,7 @@ _0809C34C: strh r6, [r0] adds r0, r3, 0 bl npc_get_script_by_npc_id -_0809C36E: +@0809C36E: pop {r4-r6} pop {r1} bx r1 @@ -291606,7 +291606,7 @@ _0809C36E: thumb_func_end sub_809C2C8 thumb_func_start sub_809C384 -sub_809C384: @ 809C384 +sub_809C384: ; 809C384 push {r4-r7,lr} adds r5, r0, 0 lsls r1, 24 @@ -291620,7 +291620,7 @@ sub_809C384: @ 809C384 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x10 - beq _0809C3B4 + beq @0809C3B4 ldr r1, =0x02037350 lsls r2, r4, 3 adds r0, r2, r4 @@ -291629,14 +291629,14 @@ sub_809C384: @ 809C384 ldrb r0, [r0, 0x8] adds r3, r1, 0 cmp r0, 0xFF - bne _0809C40C -_0809C3B4: + bne @0809C40C +@0809C3B4: adds r0, r6, 0 bl is_tile_x80 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C400 + bne @0809C400 ldr r1, =0x08339d64 lsls r2, r7, 3 adds r0, r2, r1 @@ -291657,7 +291657,7 @@ _0809C3B4: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x10 - beq _0809C400 + beq @0809C400 ldr r1, =0x02037350 lsls r2, r4, 3 adds r0, r2, r4 @@ -291666,13 +291666,13 @@ _0809C3B4: ldrb r0, [r0, 0x8] adds r3, r1, 0 cmp r0, 0xFF - bne _0809C40C -_0809C400: + bne @0809C40C +@0809C400: movs r0, 0 - b _0809C44E + b @0809C44E .align 2, 0 .pool -_0809C40C: +@0809C40C: ldr r0, =0x03005df0 strb r4, [r0] ldr r1, =0x020375f2 @@ -291685,21 +291685,21 @@ _0809C40C: strh r7, [r0] bl sub_81D6074 cmp r0, 0x1 - bne _0809C43C + bne @0809C43C bl sub_81D62AC - b _0809C442 + b @0809C442 .align 2, 0 .pool -_0809C43C: +@0809C43C: adds r0, r4, 0 bl npc_get_script_by_npc_id -_0809C442: +@0809C442: adds r1, r0, 0 ldr r0, =0x020375f2 ldrb r0, [r0] bl sub_8099188 adds r1, r0, 0 -_0809C44E: +@0809C44E: pop {r4-r7} pop {r1} bx r1 @@ -291708,7 +291708,7 @@ _0809C44E: thumb_func_end sub_809C384 thumb_func_start sub_809C458 -sub_809C458: @ 809C458 +sub_809C458: ; 809C458 push {r4,r5,lr} lsls r2, 24 lsrs r5, r2, 24 @@ -291725,55 +291725,55 @@ sub_809C458: @ 809C458 adds r0, r4, 0 bl sub_809D11C cmp r0, 0 - beq _0809C4CC + beq @0809C4CC ldr r2, [r0, 0x8] cmp r2, 0 - bne _0809C490 + bne @0809C490 ldr r0, =0x082c8436 - b _0809C532 + b @0809C532 .align 2, 0 .pool -_0809C490: +@0809C490: ldrb r0, [r0, 0x5] cmp r0, 0x8 - bhi _0809C530 + bhi @0809C530 lsls r0, 2 - ldr r1, =_0809C4A4 + ldr r1, =@0809C4A4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0809C4A4: - .4byte _0809C530 - .4byte _0809C4C8 - .4byte _0809C4D0 - .4byte _0809C4D6 - .4byte _0809C4DC - .4byte _0809C4E2 - .4byte _0809C4E2 - .4byte _0809C4E2 - .4byte _0809C510 -_0809C4C8: +@0809C4A4: + .4byte @0809C530 + .4byte @0809C4C8 + .4byte @0809C4D0 + .4byte @0809C4D6 + .4byte @0809C4DC + .4byte @0809C4E2 + .4byte @0809C4E2 + .4byte @0809C4E2 + .4byte @0809C510 +@0809C4C8: cmp r5, 0x2 - beq _0809C530 -_0809C4CC: + beq @0809C530 +@0809C4CC: movs r0, 0 - b _0809C532 -_0809C4D0: + b @0809C532 +@0809C4D0: cmp r5, 0x1 - beq _0809C530 - b _0809C4CC -_0809C4D6: + beq @0809C530 + b @0809C4CC +@0809C4D6: cmp r5, 0x4 - beq _0809C530 - b _0809C4CC -_0809C4DC: + beq @0809C530 + b @0809C4CC +@0809C4DC: cmp r5, 0x3 - beq _0809C530 - b _0809C4CC -_0809C4E2: + beq @0809C530 + b @0809C4CC +@0809C4E2: ldr r1, =0x020375e0 lsrs r0, r2, 16 movs r3, 0xFA @@ -291787,34 +291787,34 @@ _0809C4E2: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809C4CC + beq @0809C4CC ldr r0, =0x08271cb7 - b _0809C532 + b @0809C532 .align 2, 0 .pool -_0809C510: +@0809C510: cmp r5, 0x2 - bne _0809C4CC + bne @0809C4CC ldr r0, =0x020375e0 strh r2, [r0] bl sub_80E9680 lsls r0, 24 cmp r0, 0 - beq _0809C4CC + beq @0809C4CC ldr r0, =0x082759f1 - b _0809C532 + b @0809C532 .align 2, 0 .pool -_0809C530: +@0809C530: adds r0, r2, 0 -_0809C532: +@0809C532: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_809C458 thumb_func_start sub_809C538 -sub_809C538: @ 809C538 +sub_809C538: ; 809C538 push {r4-r6,lr} adds r6, r0, 0 lsls r1, 24 @@ -291827,221 +291827,221 @@ sub_809C538: @ 809C538 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C55C + bne @0809C55C ldr r0, =0x0827ee0b - b _0809C7E4 + b @0809C7E4 .align 2, 0 .pool -_0809C55C: +@0809C55C: adds r0, r5, 0 bl IsMetatileComputer lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C574 + bne @0809C574 ldr r0, =0x08271d92 - b _0809C7E4 + b @0809C7E4 .align 2, 0 .pool -_0809C574: +@0809C574: adds r0, r5, 0 bl is_tile_x8B lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C58C + bne @0809C58C ldr r0, =0x081e615d - b _0809C7E4 + b @0809C7E4 .align 2, 0 .pool -_0809C58C: +@0809C58C: adds r0, r5, 0 bl is_tile_xEA lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C5A4 + bne @0809C5A4 ldr r0, =0x082393f9 - b _0809C7E4 + b @0809C7E4 .align 2, 0 .pool -_0809C5A4: +@0809C5A4: adds r0, r5, 0 bl is_tile_x84 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C5B4 - b _0809C6E4 -_0809C5B4: + bne @0809C5B4 + b @0809C6E4 +@0809C5B4: adds r0, r5, 0 bl is_tile_x87 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C5CC + bne @0809C5CC ldr r0, =0x082a4bac - b _0809C7E4 + b @0809C7E4 .align 2, 0 .pool -_0809C5CC: +@0809C5CC: adds r0, r5, 0 bl is_tile_x8C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C5E4 + bne @0809C5E4 ldr r0, =0x0826a22a - b _0809C7E4 + b @0809C7E4 .align 2, 0 .pool -_0809C5E4: +@0809C5E4: adds r0, r5, 0 bl is_tile_x85 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C5FC + bne @0809C5FC ldr r0, =0x0827208f - b _0809C7E4 + b @0809C7E4 .align 2, 0 .pool -_0809C5FC: +@0809C5FC: adds r0, r5, 0 bl sub_8089A1C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C614 + bne @0809C614 ldr r0, =0x08292de5 - b _0809C7E4 + b @0809C7E4 .align 2, 0 .pool -_0809C614: +@0809C614: adds r0, r5, 0 bl sub_8089A30 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C62C + bne @0809C62C ldr r0, =0x082725ce - b _0809C7E4 + b @0809C7E4 .align 2, 0 .pool -_0809C62C: +@0809C62C: adds r0, r5, 0 bl sub_8089A44 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C644 + bne @0809C644 ldr r0, =0x082725d7 - b _0809C7E4 + b @0809C7E4 .align 2, 0 .pool -_0809C644: +@0809C644: adds r0, r5, 0 bl sub_8089A58 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C65C + bne @0809C65C ldr r0, =0x082725e0 - b _0809C7E4 + b @0809C7E4 .align 2, 0 .pool -_0809C65C: +@0809C65C: adds r0, r5, 0 bl sub_8089A6C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C674 + bne @0809C674 ldr r0, =0x082725e9 - b _0809C7E4 + b @0809C7E4 .align 2, 0 .pool -_0809C674: +@0809C674: adds r0, r5, 0 bl sub_8089A80 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C68C + bne @0809C68C ldr r0, =0x082725f2 - b _0809C7E4 + b @0809C7E4 .align 2, 0 .pool -_0809C68C: +@0809C68C: adds r0, r5, 0 bl sub_8089A94 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C6A4 + bne @0809C6A4 ldr r0, =0x082725fb - b _0809C7E4 + b @0809C7E4 .align 2, 0 .pool -_0809C6A4: +@0809C6A4: adds r0, r5, 0 bl sub_8089AA8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C6BC + bne @0809C6BC ldr r0, =0x08272604 - b _0809C7E4 + b @0809C7E4 .align 2, 0 .pool -_0809C6BC: +@0809C6BC: adds r0, r5, 0 adds r1, r4, 0 bl sub_8089AD0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C6D4 + bne @0809C6D4 ldr r0, =0x08277b8a - b _0809C7E4 + b @0809C7E4 .align 2, 0 .pool -_0809C6D4: +@0809C6D4: adds r0, r5, 0 adds r1, r4, 0 bl sub_8089AEC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C6EC -_0809C6E4: + bne @0809C6EC +@0809C6E4: ldr r0, =0x08277365 - b _0809C7E4 + b @0809C7E4 .align 2, 0 .pool -_0809C6EC: +@0809C6EC: adds r0, r5, 0 bl is_tile_x8F lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C704 + bne @0809C704 ldr r0, =0x0827381b - b _0809C7E4 + b @0809C7E4 .align 2, 0 .pool -_0809C704: +@0809C704: adds r0, r5, 0 bl sub_8089B44 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C71C + bne @0809C71C ldr r0, =0x082c8393 - b _0809C7E4 + b @0809C7E4 .align 2, 0 .pool -_0809C71C: +@0809C71C: movs r4, 0x4 ldrsb r4, [r6, r4] movs r1, 0 @@ -292052,95 +292052,95 @@ _0809C71C: lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bne _0809C7D0 + bne @0809C7D0 adds r0, r5, 0 bl sub_8089288 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C74C + bne @0809C74C ldr r0, =0x0823b4bb - b _0809C7E4 + b @0809C7E4 .align 2, 0 .pool -_0809C74C: +@0809C74C: adds r0, r5, 0 bl sub_808929C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C764 + bne @0809C764 ldr r0, =0x0823b589 - b _0809C7E4 + b @0809C7E4 .align 2, 0 .pool -_0809C764: +@0809C764: adds r0, r5, 0 bl sub_80893DC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C77C + bne @0809C77C ldr r0, =0x0823b684 - b _0809C7E4 + b @0809C7E4 .align 2, 0 .pool -_0809C77C: +@0809C77C: adds r0, r5, 0 bl sub_80893F0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C794 + bne @0809C794 ldr r0, =0x0823b68c - b _0809C7E4 + b @0809C7E4 .align 2, 0 .pool -_0809C794: +@0809C794: adds r0, r5, 0 bl sub_80892EC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C7A8 + bne @0809C7A8 bl sub_80EB56C - b _0809C7E2 -_0809C7A8: + b @0809C7E2 +@0809C7A8: adds r0, r5, 0 bl sub_8089364 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C7BC + bne @0809C7BC bl sub_80EB9E0 - b _0809C7E2 -_0809C7BC: + b @0809C7E2 +@0809C7BC: adds r0, r5, 0 bl sub_8089350 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C7E2 + bne @0809C7E2 bl sub_80EBB28 - b _0809C7E2 -_0809C7D0: + b @0809C7E2 +@0809C7D0: adds r0, r5, 0 bl sub_8089300 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C7E2 + bne @0809C7E2 bl sub_80EB498 -_0809C7E2: +@0809C7E2: movs r0, 0 -_0809C7E4: +@0809C7E4: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_809C538 thumb_func_start sub_809C7EC -sub_809C7EC: @ 809C7EC +sub_809C7EC: ; 809C7EC push {r4,lr} lsls r1, 24 lsrs r4, r1, 24 @@ -292149,114 +292149,114 @@ sub_809C7EC: @ 809C7EC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C824 + bne @0809C824 bl party_has_pokemon_with_surf lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C824 + bne @0809C824 bl sub_808BE74 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C824 + bne @0809C824 ldr r0, =0x08271ea0 - b _0809C862 + b @0809C862 .align 2, 0 .pool -_0809C824: +@0809C824: adds r0, r4, 0 bl is_tile_x13_waterfall lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C860 + bne @0809C860 ldr r0, =0x0000086e bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C858 + bne @0809C858 bl sub_808BE50 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C858 + bne @0809C858 ldr r0, =0x08290a49 - b _0809C862 + b @0809C862 .align 2, 0 .pool -_0809C858: +@0809C858: ldr r0, =0x08290a83 - b _0809C862 + b @0809C862 .align 2, 0 .pool -_0809C860: +@0809C860: movs r0, 0 -_0809C862: +@0809C862: pop {r4} pop {r1} bx r1 thumb_func_end sub_809C7EC thumb_func_start sub_809C868 -sub_809C868: @ 809C868 +sub_809C868: ; 809C868 push {lr} ldr r0, =0x0000086d bl flag_check lsls r0, 24 cmp r0, 0 - beq _0809C894 + beq @0809C894 bl sub_809D1E8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _0809C894 + bne @0809C894 ldr r0, =0x08290b0f bl script_env_1_execute_new_script movs r0, 0x1 - b _0809C896 + b @0809C896 .align 2, 0 .pool -_0809C894: +@0809C894: movs r0, 0 -_0809C896: +@0809C896: pop {r1} bx r1 thumb_func_end sub_809C868 thumb_func_start sub_809C89C -sub_809C89C: @ 809C89C +sub_809C89C: ; 809C89C push {lr} ldr r0, =0x0000086d bl flag_check lsls r0, 24 cmp r0, 0 - beq _0809C8D4 + beq @0809C8D4 ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x5 - bne _0809C8D4 + bne @0809C8D4 bl sub_809D1E8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C8D4 + bne @0809C8D4 ldr r0, =0x08290b5a bl script_env_1_execute_new_script movs r0, 0x1 - b _0809C8D6 + b @0809C8D6 .align 2, 0 .pool -_0809C8D4: +@0809C8D4: movs r0, 0 -_0809C8D6: +@0809C8D6: pop {r1} bx r1 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 @@ -292266,43 +292266,43 @@ sub_809C8DC: @ 809C8DC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809C92E + beq @0809C92E adds r0, r5, 0 adds r1, r4, 0 bl sub_809CC9C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809C92E + beq @0809C92E adds r0, r4, 0 bl sub_809C96C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809C92E + beq @0809C92E adds r0, r6, 0 bl per_step_scripts lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809C92E + beq @0809C92E bl sub_80B5870 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809C92E + beq @0809C92E movs r0, 0 - b _0809C930 -_0809C92E: + b @0809C930 +@0809C92E: movs r0, 0x1 -_0809C930: +@0809C930: pop {r4-r6} pop {r1} bx r1 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] @@ -292317,22 +292317,22 @@ mapheader_trigger_activate_at__run_now: @ 809C938 adds r0, r4, 0 bl mapheader_trigger_activate_at cmp r0, 0 - beq _0809C964 + beq @0809C964 bl script_env_1_execute_new_script movs r0, 0x1 - b _0809C966 + b @0809C966 .align 2, 0 .pool -_0809C964: +@0809C964: movs r0, 0 -_0809C966: +@0809C966: pop {r4} pop {r1} bx r1 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 @@ -292341,40 +292341,40 @@ sub_809C96C: @ 809C96C bl sub_8089918 lsls r0, 24 cmp r0, 0 - beq _0809C988 + beq @0809C988 ldr r0, =0x082a8337 - b _0809C996 + b @0809C996 .align 2, 0 .pool -_0809C988: +@0809C988: adds r0, r4, 0 bl sub_8089ABC lsls r0, 24 cmp r0, 0 - beq _0809C9A4 + beq @0809C9A4 ldr r0, =0x08252be8 -_0809C996: +@0809C996: bl script_env_1_execute_new_script movs r0, 0x1 - b _0809C9EA + b @0809C9EA .align 2, 0 .pool -_0809C9A4: +@0809C9A4: adds r0, r4, 0 bl sub_80893C8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C9B8 + bne @0809C9B8 bl sub_80FA9D0 - b _0809C9E8 -_0809C9B8: + b @0809C9E8 +@0809C9B8: adds r0, r4, 0 bl sub_80893B4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809C9E8 + bne @0809C9E8 mov r4, sp adds r4, 0x2 mov r0, sp @@ -292389,9 +292389,9 @@ _0809C9B8: lsls r0, 16 asrs r0, 16 bl sub_80FA970 -_0809C9E8: +@0809C9E8: movs r0, 0 -_0809C9EA: +@0809C9EA: add sp, 0x4 pop {r4} pop {r1} @@ -292399,15 +292399,15 @@ _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 bl in_trade_center cmp r0, 0x1 - bne _0809CA04 - b _0809CB24 -_0809CA04: + bne @0809CA04 + b @0809CB24 +@0809CA04: bl sub_80B215C bl happiness_algorithm_step bl sub_81D4998 @@ -292416,134 +292416,134 @@ _0809CA04: movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _0809CAF8 + bne @0809CAF8 lsls r0, r4, 24 lsrs r0, 24 bl sub_808904C lsls r0, 24 cmp r0, 0 - bne _0809CAF8 + bne @0809CAF8 bl overworld_poison_step lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809CA48 + bne @0809CA48 ldr r0, =0x082736bc bl script_env_1_execute_new_script - b _0809CB28 + b @0809CB28 .align 2, 0 .pool -_0809CA48: +@0809CA48: bl sub_8070BD0 lsls r0, 24 cmp r0, 0 - beq _0809CA64 + beq @0809CA64 movs r0, 0xD bl sav12_xor_increment ldr r0, =0x08291fc0 bl script_env_1_execute_new_script - b _0809CB28 + b @0809CB28 .align 2, 0 .pool -_0809CA64: +@0809CA64: bl sub_813B3B0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809CA7C + bne @0809CA7C ldr r0, =0x08273d1f bl script_env_1_execute_new_script - b _0809CB28 + b @0809CB28 .align 2, 0 .pool -_0809CA7C: +@0809CA7C: bl sub_8179A04 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809CA94 + bne @0809CA94 ldr r0, =0x08238eaf bl script_env_1_execute_new_script - b _0809CB28 + b @0809CB28 .align 2, 0 .pool -_0809CA94: +@0809CA94: bl is_tile_that_overrides_player_control cmp r0, 0x1 - bne _0809CAA8 + bne @0809CAA8 ldr r0, =0x081df7ba bl script_env_1_execute_new_script - b _0809CB28 + b @0809CB28 .align 2, 0 .pool -_0809CAA8: +@0809CAA8: bl sub_8138120 cmp r0, 0x1 - bne _0809CABC + bne @0809CABC ldr r0, =0x081f49ec bl script_env_1_execute_new_script - b _0809CB28 + b @0809CB28 .align 2, 0 .pool -_0809CABC: +@0809CABC: bl sub_8138168 cmp r0, 0x1 - bne _0809CAD0 + bne @0809CAD0 ldr r0, =0x081fa4d6 bl script_env_1_execute_new_script - b _0809CB28 + b @0809CB28 .align 2, 0 .pool -_0809CAD0: +@0809CAD0: bl sub_81381B0 cmp r0, 0x1 - bne _0809CAE4 + bne @0809CAE4 ldr r0, =0x0821307b bl script_env_1_execute_new_script - b _0809CB28 + b @0809CB28 .align 2, 0 .pool -_0809CAE4: +@0809CAE4: bl sub_81381F8 cmp r0, 0x1 - bne _0809CAF8 + bne @0809CAF8 ldr r0, =0x08224175 bl script_env_1_execute_new_script - b _0809CB28 + b @0809CB28 .align 2, 0 .pool -_0809CAF8: +@0809CAF8: bl safari_step lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809CB28 + beq @0809CB28 movs r0, 0x1 bl sub_8137FC0 cmp r0, 0x1 - bne _0809CB1C + bne @0809CB1C ldr r0, =0x0823c050 bl script_env_1_execute_new_script - b _0809CB28 + b @0809CB28 .align 2, 0 .pool -_0809CB1C: +@0809CB1C: bl sub_8196034 cmp r0, 0 - bne _0809CB28 -_0809CB24: + bne @0809CB28 +@0809CB24: movs r0, 0 - b _0809CB2A -_0809CB28: + b @0809CB2A +@0809CB28: movs r0, 0x1 -_0809CB2A: +@0809CB2A: pop {r4} pop {r1} bx r1 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 @@ -292555,7 +292555,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 var_get_pointer @@ -292567,18 +292567,18 @@ happiness_algorithm_step: @ 809CB44 ands r1, r2 strh r1, [r0] cmp r1, 0 - bne _0809CB72 + bne @0809CB72 ldr r5, =0x020244ec movs r4, 0x5 -_0809CB62: +@0809CB62: adds r0, r5, 0 movs r1, 0x5 bl happiness_algorithm adds r5, 0x64 subs r4, 0x1 cmp r4, 0 - bge _0809CB62 -_0809CB72: + bge @0809CB62 +@0809CB72: pop {r4,r5} pop {r0} bx r0 @@ -292587,7 +292587,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 @@ -292599,12 +292599,12 @@ 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] cmp r0, 0x9 - beq _0809CBD4 + beq @0809CBD4 ldr r0, =0x0000402b bl var_get_pointer ldrh r1, [r0] @@ -292615,27 +292615,27 @@ overworld_poison_step: @ 809CB94 ands r1, r2 strh r1, [r0] cmp r1, 0 - bne _0809CBD4 + bne @0809CBD4 bl overworld_poison cmp r0, 0x1 - beq _0809CBD4 + beq @0809CBD4 cmp r0, 0x1 - ble _0809CBD4 + ble @0809CBD4 cmp r0, 0x2 - bne _0809CBD4 + bne @0809CBD4 movs r0, 0x1 - b _0809CBD6 + b @0809CBD6 .align 2, 0 .pool -_0809CBD4: +@0809CBD4: movs r0, 0 -_0809CBD6: +@0809CBD6: pop {r1} bx r1 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] @@ -292645,7 +292645,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 @@ -292653,16 +292653,16 @@ is_it_battle_time_3: @ 809CBE8 ldr r6, =0x020375d4 ldrb r0, [r6] cmp r0, 0x3 - bhi _0809CC0C + bhi @0809CC0C adds r0, 0x1 strb r0, [r6] ldr r0, =0x020375d6 strh r4, [r0] movs r0, 0 - b _0809CC30 + b @0809CC30 .align 2, 0 .pool -_0809CC0C: +@0809CC0C: ldr r5, =0x020375d6 ldrh r1, [r5] adds r0, r4, 0 @@ -292670,25 +292670,25 @@ _0809CC0C: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809CC28 + beq @0809CC28 strh r4, [r5] movs r0, 0 - b _0809CC30 + b @0809CC30 .align 2, 0 .pool -_0809CC28: +@0809CC28: movs r0, 0 strb r0, [r6] strh r7, [r5] movs r0, 0x1 -_0809CC30: +@0809CC30: pop {r4-r7} pop {r1} bx r1 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} @@ -292711,13 +292711,13 @@ mapheader_run_first_tag2_script_list_match_conditionally: @ 809CC38 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809CC90 + bne @0809CC90 lsls r0, r6, 24 asrs r4, r0, 24 movs r0, 0x1 negs r0, r0 cmp r4, r0 - beq _0809CC90 + beq @0809CC90 bl walkrun_find_lowest_active_bit_in_bitfield mov r0, r8 adds r1, r4, 0 @@ -292725,12 +292725,12 @@ mapheader_run_first_tag2_script_list_match_conditionally: @ 809CC38 bl sub_809CEB0 bl sub_80AF734 movs r0, 0x1 - b _0809CC92 + b @0809CC92 .align 2, 0 .pool -_0809CC90: +@0809CC90: movs r0, 0 -_0809CC92: +@0809CC92: pop {r3} mov r8, r3 pop {r4-r7} @@ -292739,7 +292739,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 @@ -292753,13 +292753,13 @@ sub_809CC9C: @ 809CC9C movs r0, 0x1 negs r0, r0 cmp r4, r0 - beq _0809CD8A + beq @0809CD8A adds r0, r5, 0 bl is_warp_tile lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809CD8A + bne @0809CD8A bl walkrun_find_lowest_active_bit_in_bitfield adds r0, r7, 0 adds r1, r4, 0 @@ -292772,90 +292772,90 @@ sub_809CC9C: @ 809CC9C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809CCF8 + bne @0809CCF8 adds r0, r4, 0 bl sub_80AF80C movs r0, 0x1 - b _0809CD8C + b @0809CD8C .align 2, 0 .pool -_0809CCF8: +@0809CCF8: adds r0, r4, 0 bl sub_8089870 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809CD0E + bne @0809CD0E bl sub_80AF828 movs r0, 0x1 - b _0809CD8C -_0809CD0E: + b @0809CD8C +@0809CD0E: adds r0, r4, 0 bl is_role_x68 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809CD24 + bne @0809CD24 bl sub_80AF838 movs r0, 0x1 - b _0809CD8C -_0809CD24: + b @0809CD8C +@0809CD24: adds r0, r4, 0 bl sub_8089898 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809CD3A + bne @0809CD3A bl sub_80AF848 movs r0, 0x1 - b _0809CD8C -_0809CD3A: + b @0809CD8C +@0809CD3A: adds r0, r4, 0 bl sub_80898AC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809CD50 + bne @0809CD50 bl sub_80B0268 movs r0, 0x1 - b _0809CD8C -_0809CD50: + b @0809CD8C +@0809CD50: adds r0, r4, 0 bl sub_8089904 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809CD6C + bne @0809CD6C ldr r0, =0x082a8350 bl script_env_1_execute_new_script movs r0, 0x1 - b _0809CD8C + b @0809CD8C .align 2, 0 .pool -_0809CD6C: +@0809CD6C: adds r0, r4, 0 bl sub_80898C0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809CD82 + bne @0809CD82 bl sub_80AF87C movs r0, 0x1 - b _0809CD8C -_0809CD82: + b @0809CD8C +@0809CD82: bl sub_80AF734 movs r0, 0x1 - b _0809CD8C -_0809CD8A: + b @0809CD8C +@0809CD8A: movs r0, 0 -_0809CD8C: +@0809CD8C: pop {r4-r7} pop {r1} bx r1 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 @@ -292864,73 +292864,73 @@ is_warp_tile: @ 809CD94 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809CE2A + beq @0809CE2A adds r0, r4, 0 bl is_tile_x61_warp lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809CE2A + beq @0809CE2A adds r0, r4, 0 bl is_tile_TODO lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809CE2A + beq @0809CE2A adds r0, r4, 0 bl sub_8088F58 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809CE2A + beq @0809CE2A adds r0, r4, 0 bl sub_8089870 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809CE2A + beq @0809CE2A adds r0, r4, 0 bl is_role_x68 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809CE2A + beq @0809CE2A adds r0, r4, 0 bl sub_8089898 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809CE2A + beq @0809CE2A adds r0, r4, 0 bl sub_8089904 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809CE2A + beq @0809CE2A adds r0, r4, 0 bl sub_80898C0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809CE2A + beq @0809CE2A adds r0, r4, 0 bl sub_80898AC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0809CE2A + beq @0809CE2A movs r0, 0 - b _0809CE2C -_0809CE2A: + b @0809CE2C +@0809CE2A: movs r0, 0x1 -_0809CE2C: +@0809CE2C: pop {r4} pop {r1} bx r1 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 @@ -292938,50 +292938,50 @@ is_non_stair_warp_tile: @ 809CE34 lsrs r1, 24 adds r2, r1, 0 cmp r1, 0x2 - beq _0809CE58 + beq @0809CE58 cmp r1, 0x2 - bgt _0809CE4E + bgt @0809CE4E cmp r1, 0x1 - beq _0809CE62 - b _0809CE84 -_0809CE4E: + beq @0809CE62 + b @0809CE84 +@0809CE4E: cmp r2, 0x3 - beq _0809CE6C + beq @0809CE6C cmp r2, 0x4 - beq _0809CE76 - b _0809CE84 -_0809CE58: + beq @0809CE76 + b @0809CE84 +@0809CE58: lsls r0, 24 lsrs r0, 24 bl sub_8088FD4 - b _0809CE7E -_0809CE62: + b @0809CE7E +@0809CE62: lsls r0, 24 lsrs r0, 24 bl is_tile_x65_warp_arrow_down - b _0809CE7E -_0809CE6C: + b @0809CE7E +@0809CE6C: lsls r0, 24 lsrs r0, 24 bl is_tile_x63_warp_arrow_left - b _0809CE7E -_0809CE76: + b @0809CE7E +@0809CE76: lsls r0, 24 lsrs r0, 24 bl is_tile_x62_warp_arrow_right -_0809CE7E: +@0809CE7E: lsls r0, 24 lsrs r0, 24 - b _0809CE86 -_0809CE84: + b @0809CE86 +@0809CE84: movs r0, 0 -_0809CE86: +@0809CE86: pop {r1} bx r1 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] @@ -293001,7 +293001,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 @@ -293011,35 +293011,35 @@ sub_809CEB0: @ 809CEB0 lsrs r5, r0, 24 adds r6, r5, 0 cmp r5, 0 - beq _0809CF00 + beq @0809CF00 bl sub_81D6490 lsls r0, 24 lsrs r0, 24 cmp r5, r0 - bne _0809CEF0 + bne @0809CEF0 lsls r0, r4, 24 adds r4, r0, 0 cmp r4, 0 - bne _0809CEE8 + bne @0809CEE8 ldr r0, =0x02037318 ldr r0, [r0, 0x4] ldr r5, [r0, 0x8] - b _0809CF0E + b @0809CF0E .align 2, 0 .pool -_0809CEE8: +@0809CEE8: bl sub_81D6120 adds r5, r0, 0 - b _0809CF0E -_0809CEF0: + b @0809CF0E +@0809CEF0: cmp r6, 0x5 - bne _0809CF00 + bne @0809CF00 lsls r4, 24 lsrs r0, r4, 24 bl sub_81D6134 adds r5, r0, 0 - b _0809CF0E -_0809CF00: + b @0809CF0E +@0809CF00: ldr r0, =0x02037318 ldr r0, [r0, 0x4] lsls r2, r4, 24 @@ -293047,16 +293047,16 @@ _0809CF00: ldr r0, [r0, 0x8] adds r5, r0, r1 adds r4, r2, 0 -_0809CF0E: +@0809CF0E: ldrb r0, [r5, 0x6] cmp r0, 0x7F - bne _0809CF20 + bne @0809CF20 ldrb r0, [r5, 0x5] bl copy_saved_warp2_bank_and_enter_x_to_warp1 - b _0809CF6E + b @0809CF6E .align 2, 0 .pool -_0809CF20: +@0809CF20: movs r0, 0x7 ldrsb r0, [r5, r0] movs r1, 0x6 @@ -293079,7 +293079,7 @@ _0809CF20: adds r0, r1 ldrb r0, [r0, 0x6] cmp r0, 0x7F - bne _0809CF6E + bne @0809CF6E asrs r3, r4, 24 lsls r0, r3, 3 adds r0, r1 @@ -293092,7 +293092,7 @@ _0809CF20: lsls r2, 24 asrs r2, 24 bl saved_warp2_set -_0809CF6E: +@0809CF6E: pop {r4-r7} pop {r0} bx r0 @@ -293101,7 +293101,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 @@ -293110,7 +293110,7 @@ map_warp_consider_2_to_inside: @ 809CF78 lsls r2, 24 lsrs r2, 24 cmp r2, 0x2 - bne _0809CFFC + bne @0809CFFC lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 @@ -293118,22 +293118,22 @@ map_warp_consider_2_to_inside: @ 809CF78 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809CFB0 + bne @0809CFB0 ldr r0, =0x02037318 ldr r1, [r0, 0x4] adds r0, r5, 0 bl sub_80E9668 movs r0, 0x1 - b _0809CFFE + b @0809CFFE .align 2, 0 .pool -_0809CFB0: +@0809CFB0: adds r0, r4, 0 bl is_tile_x69_2_warp_door lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809CFFC + bne @0809CFFC ldr r6, =0x02037318 adds r0, r6, 0 adds r1, r5, 0 @@ -293143,13 +293143,13 @@ _0809CFB0: movs r0, 0x1 negs r0, r0 cmp r4, r0 - beq _0809CFFC + beq @0809CFFC adds r0, r7, 0 bl is_warp_tile lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809CFFC + bne @0809CFFC bl walkrun_find_lowest_active_bit_in_bitfield adds r0, r6, 0 adds r1, r4, 0 @@ -293157,19 +293157,19 @@ _0809CFB0: bl sub_809CEB0 bl sub_80AF7D0 movs r0, 0x1 - b _0809CFFE + b @0809CFFE .align 2, 0 .pool -_0809CFFC: +@0809CFFC: movs r0, 0 -_0809CFFE: +@0809CFFE: pop {r4-r7} pop {r1} bx r1 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 @@ -293182,75 +293182,75 @@ map_warp_check: @ 809D004 ldrb r3, [r0, 0x1] movs r2, 0 cmp r2, r3 - bge _0809D042 -_0809D01E: + bge @0809D042 +@0809D01E: ldrh r0, [r1] cmp r0, r6 - bne _0809D03A + bne @0809D03A ldrh r0, [r1, 0x2] cmp r0, r5 - bne _0809D03A + bne @0809D03A ldrb r0, [r1, 0x4] cmp r0, r4 - beq _0809D034 + beq @0809D034 cmp r0, 0 - bne _0809D03A -_0809D034: + bne @0809D03A +@0809D034: lsls r0, r2, 24 asrs r0, 24 - b _0809D046 -_0809D03A: + b @0809D046 +@0809D03A: adds r2, 0x1 adds r1, 0x8 cmp r2, r3 - blt _0809D01E -_0809D042: + blt @0809D01E +@0809D042: movs r0, 0x1 negs r0, r0 -_0809D046: +@0809D046: pop {r4-r6} pop {r1} bx r1 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 - beq _0809D082 + beq @0809D082 ldr r1, [r4, 0xC] cmp r1, 0 - bne _0809D062 + bne @0809D062 ldrb r0, [r4, 0x6] bl trigger_activate_alternative__deprecated - b _0809D082 -_0809D062: + b @0809D082 +@0809D062: ldrh r0, [r4, 0x6] cmp r0, 0 - beq _0809D07C + beq @0809D07C ldrh r0, [r4, 0x6] bl var_get lsls r0, 16 lsrs r0, 16 ldrb r1, [r4, 0x8] cmp r0, r1 - bne _0809D082 + bne @0809D082 ldr r0, [r4, 0xC] - b _0809D084 -_0809D07C: + b @0809D084 +@0809D07C: adds r0, r1, 0 bl script_env_2_execute_new_script -_0809D082: +@0809D082: movs r0, 0 -_0809D084: +@0809D084: pop {r4} pop {r1} bx r1 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 @@ -293270,35 +293270,35 @@ mapheader_trigger_activate_at: @ 809D08C ldrb r7, [r0, 0x2] movs r6, 0 cmp r6, r7 - bge _0809D0E2 + bge @0809D0E2 adds r5, r1, 0 adds r4, r5, 0 -_0809D0B8: +@0809D0B8: ldrh r0, [r4] cmp r0, r10 - bne _0809D0D8 + bne @0809D0D8 ldrh r0, [r4, 0x2] cmp r0, r9 - bne _0809D0D8 + bne @0809D0D8 ldrb r0, [r4, 0x4] cmp r0, r8 - beq _0809D0CE + beq @0809D0CE cmp r0, 0 - bne _0809D0D8 -_0809D0CE: + bne @0809D0D8 +@0809D0CE: adds r0, r5, 0 bl trigger_activate cmp r0, 0 - bne _0809D0E4 -_0809D0D8: + bne @0809D0E4 +@0809D0D8: adds r4, 0x10 adds r5, 0x10 adds r6, 0x1 cmp r6, r7 - blt _0809D0B8 -_0809D0E2: + blt @0809D0B8 +@0809D0E2: movs r0, 0 -_0809D0E4: +@0809D0E4: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -293309,7 +293309,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] @@ -293331,7 +293331,7 @@ sub_809D0F4: @ 809D0F4 thumb_func_end sub_809D0F4 thumb_func_start sub_809D11C -sub_809D11C: @ 809D11C +sub_809D11C: ; 809D11C push {r4-r7,lr} lsls r1, 16 lsrs r7, r1, 16 @@ -293344,42 +293344,42 @@ sub_809D11C: @ 809D11C ldrb r3, [r0, 0x3] movs r2, 0 cmp r2, r3 - bcs _0809D162 -_0809D136: + bcs @0809D162 +@0809D136: lsls r0, r2, 1 adds r0, r2 lsls r0, 2 adds r1, r0, r4 ldrh r0, [r1] cmp r0, r7 - bne _0809D158 + bne @0809D158 ldrh r0, [r1, 0x2] cmp r0, r6 - bne _0809D158 + bne @0809D158 ldrb r0, [r1, 0x4] cmp r0, r5 - beq _0809D154 + beq @0809D154 cmp r0, 0 - bne _0809D158 -_0809D154: + bne @0809D158 +@0809D154: adds r0, r1, 0 - b _0809D164 -_0809D158: + b @0809D164 +@0809D158: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, r3 - bcc _0809D136 -_0809D162: + bcc @0809D136 +@0809D162: movs r0, 0 -_0809D164: +@0809D164: pop {r4-r7} pop {r1} bx r1 thumb_func_end sub_809D11C thumb_func_start dive_warp -dive_warp: @ 809D16C +dive_warp: ; 809D16C push {r4,r5,lr} adds r4, r0, 0 lsls r1, 16 @@ -293387,13 +293387,13 @@ dive_warp: @ 809D16C ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x5 - bne _0809D1A4 + bne @0809D1A4 lsls r0, r5, 24 lsrs r0, 24 bl sub_80895D0 lsls r0, 24 cmp r0, 0 - bne _0809D1A4 + bne @0809D1A4 ldrh r0, [r4] subs r0, 0x7 lsls r0, 16 @@ -293403,17 +293403,17 @@ dive_warp: @ 809D16C lsls r1, 16 lsrs r1, 16 bl sub_8085058 - b _0809D1C8 + b @0809D1C8 .align 2, 0 .pool -_0809D1A4: +@0809D1A4: lsls r0, r5, 24 lsrs r0, 24 bl sub_80895B0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809D1E0 + bne @0809D1E0 ldrh r0, [r4] subs r0, 0x7 lsls r0, 16 @@ -293423,26 +293423,26 @@ _0809D1A4: lsls r1, 16 lsrs r1, 16 bl sub_8085078 -_0809D1C8: +@0809D1C8: lsls r0, 24 cmp r0, 0 - beq _0809D1E0 + beq @0809D1E0 bl walkrun_find_lowest_active_bit_in_bitfield bl sp13E_warp_to_last_warp movs r0, 0xE9 bl audio_play movs r0, 0x1 - b _0809D1E2 -_0809D1E0: + b @0809D1E2 +@0809D1E0: movs r0, 0 -_0809D1E2: +@0809D1E2: pop {r4,r5} pop {r1} bx r1 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 @@ -293461,12 +293461,12 @@ sub_809D1E8: @ 809D1E8 ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x5 - bne _0809D244 + bne @0809D244 adds r0, r5, 0 bl sub_80895D0 lsls r0, 24 cmp r0, 0 - bne _0809D244 + bne @0809D244 mov r0, sp ldrh r0, [r0] subs r0, 0x7 @@ -293480,18 +293480,18 @@ sub_809D1E8: @ 809D1E8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809D274 + bne @0809D274 movs r0, 0x1 - b _0809D276 + b @0809D276 .align 2, 0 .pool -_0809D244: +@0809D244: adds r0, r5, 0 bl sub_80895B0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809D274 + bne @0809D274 mov r0, sp ldrh r0, [r0] subs r0, 0x7 @@ -293505,12 +293505,12 @@ _0809D244: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809D274 + bne @0809D274 movs r0, 0x2 - b _0809D276 -_0809D274: + b @0809D276 +@0809D274: movs r0, 0 -_0809D276: +@0809D276: add sp, 0x4 pop {r4,r5} pop {r1} @@ -293518,7 +293518,7 @@ _0809D276: thumb_func_end sub_809D1E8 thumb_func_start sub_809D280 -sub_809D280: @ 809D280 +sub_809D280: ; 809D280 push {r4,r5,lr} sub sp, 0x8 bl player_get_direction_upper_4bits @@ -293547,7 +293547,7 @@ sub_809D280: @ 809D280 thumb_func_end sub_809D280 thumb_func_start sub_809D2BC -sub_809D2BC: @ 809D2BC +sub_809D2BC: ; 809D2BC push {r4,lr} sub sp, 0x8 bl player_get_direction_upper_4bits @@ -293580,7 +293580,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] @@ -293609,7 +293609,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] @@ -293640,7 +293640,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] @@ -293656,7 +293656,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 var_get_pointer @@ -293674,7 +293674,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 var_get_pointer @@ -293702,37 +293702,37 @@ 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] ldrb r0, [r0, 0x1A] cmp r0, 0xDA - bne _0809D468 + bne @0809D468 ldr r0, =0x00004046 bl var_get lsls r0, 16 ldr r1, =0x03020000 cmp r0, r1 - bne _0809D468 + bne @0809D468 ldr r0, =0x00000896 bl flag_check lsls r0, 24 cmp r0, 0 - beq _0809D468 + beq @0809D468 movs r0, 0x1 - b _0809D46A + b @0809D46A .align 2, 0 .pool -_0809D468: +@0809D468: movs r0, 0 -_0809D46A: +@0809D46A: pop {r1} bx r1 thumb_func_end sub_809D42C thumb_func_start sub_809D470 -sub_809D470: @ 809D470 +sub_809D470: ; 809D470 push {lr} ldr r0, =0x000008ac bl flag_clear @@ -293743,7 +293743,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 flag_set @@ -293754,7 +293754,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 flag_check @@ -293767,7 +293767,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 flag_clear @@ -293778,7 +293778,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 flag_set @@ -293789,7 +293789,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 flag_check @@ -293802,7 +293802,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 @@ -293851,7 +293851,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 @@ -293884,7 +293884,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 @@ -293898,7 +293898,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 @@ -293913,66 +293913,66 @@ 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 flag_check lsls r0, 24 cmp r0, 0 - beq _0809D640 + beq @0809D640 ldr r0, =0x0000402c bl var_get lsls r0, 16 movs r1, 0x92 lsls r1, 20 cmp r0, r1 - bne _0809D640 + bne @0809D640 movs r0, 0x1 - b _0809D642 + b @0809D642 .align 2, 0 .pool -_0809D640: +@0809D640: movs r0, 0 -_0809D642: +@0809D642: pop {r1} bx r1 thumb_func_end sub_809D614 thumb_func_start var_get_pointer -@ u16 *var_get_pointer(u16 var_id) -var_get_pointer: @ 809D648 +; u16 *var_get_pointer(u16 var_id) +var_get_pointer: ; 809D648 push {lr} lsls r0, 16 lsrs r1, r0, 16 adds r2, r1, 0 ldr r0, =0x00003fff cmp r1, r0 - bhi _0809D660 + bhi @0809D660 movs r0, 0 - b _0809D688 + b @0809D688 .align 2, 0 .pool -_0809D660: +@0809D660: lsls r0, r1, 16 cmp r0, 0 - bge _0809D67C + bge @0809D67C ldr r0, =0x081dba0c ldr r2, =0xffff8000 adds r1, r2 lsls r1, 2 adds r1, r0 ldr r0, [r1] - b _0809D688 + b @0809D688 .align 2, 0 .pool -_0809D67C: +@0809D67C: ldr r0, =0x03005d8c lsls r1, r2, 1 ldr r2, =0xffff939c adds r1, r2 ldr r0, [r0] adds r0, r1 -_0809D688: +@0809D688: pop {r1} bx r1 .align 2, 0 @@ -293980,28 +293980,28 @@ _0809D688: thumb_func_end var_get_pointer thumb_func_start var_get -@ u16 var_get(u16 var_id) -var_get: @ 809D694 +; u16 var_get(u16 var_id) +var_get: ; 809D694 push {r4,lr} lsls r0, 16 lsrs r4, r0, 16 adds r0, r4, 0 bl var_get_pointer cmp r0, 0 - beq _0809D6A8 + beq @0809D6A8 ldrh r0, [r0] - b _0809D6AA -_0809D6A8: + b @0809D6AA +@0809D6A8: adds r0, r4, 0 -_0809D6AA: +@0809D6AA: pop {r4} pop {r1} bx r1 thumb_func_end var_get thumb_func_start var_set -@ bool var_set(u16 var_id, u16 value) -var_set: @ 809D6B0 +; bool var_set(u16 var_id, u16 value) +var_set: ; 809D6B0 push {r4,lr} lsls r0, 16 lsrs r0, 16 @@ -294009,20 +294009,20 @@ var_set: @ 809D6B0 lsrs r4, r1, 16 bl var_get_pointer cmp r0, 0 - beq _0809D6C8 + beq @0809D6C8 strh r4, [r0] movs r0, 0x1 - b _0809D6CA -_0809D6C8: + b @0809D6CA +@0809D6C8: movs r0, 0 -_0809D6CA: +@0809D6CA: pop {r4} pop {r1} bx r1 thumb_func_end var_set thumb_func_start var_load_x4010_plus_r0 -var_load_x4010_plus_r0: @ 809D6D0 +var_load_x4010_plus_r0: ; 809D6D0 push {lr} lsls r0, 24 lsrs r0, 8 @@ -294039,41 +294039,41 @@ var_load_x4010_plus_r0: @ 809D6D0 thumb_func_end var_load_x4010_plus_r0 thumb_func_start flag_get_pointer -@ u8 *flag_get_pointer(u16 flag_id) -flag_get_pointer: @ 809D6EC +; u8 *flag_get_pointer(u16 flag_id) +flag_get_pointer: ; 809D6EC push {lr} lsls r1, r0, 16 lsrs r2, r1, 16 adds r3, r2, 0 cmp r2, 0 - bne _0809D6FC + bne @0809D6FC movs r0, 0 - b _0809D72E -_0809D6FC: + b @0809D72E +@0809D6FC: ldr r0, =0x00003fff cmp r2, r0 - bhi _0809D71C + bhi @0809D71C ldr r0, =0x03005d8c lsrs r1, 19 ldr r2, =0x00001270 adds r1, r2 ldr r0, [r0] - b _0809D72C + b @0809D72C .align 2, 0 .pool -_0809D71C: +@0809D71C: ldr r1, =0xffffc000 adds r0, r3, r1 cmp r0, 0 - bge _0809D728 + bge @0809D728 ldr r2, =0xffffc007 adds r0, r3, r2 -_0809D728: +@0809D728: asrs r0, 3 ldr r1, =0x020375fc -_0809D72C: +@0809D72C: adds r0, r1 -_0809D72E: +@0809D72E: pop {r1} bx r1 .align 2, 0 @@ -294081,8 +294081,8 @@ _0809D72E: thumb_func_end flag_get_pointer thumb_func_start flag_set -@ bool flag_set(u16 flag_id) -flag_set: @ 809D740 +; bool flag_set(u16 flag_id) +flag_set: ; 809D740 push {r4,lr} lsls r0, 16 lsrs r4, r0, 16 @@ -294090,7 +294090,7 @@ flag_set: @ 809D740 bl flag_get_pointer adds r2, r0, 0 cmp r2, 0 - beq _0809D760 + beq @0809D760 movs r0, 0x7 ands r0, r4 movs r1, 0x1 @@ -294098,7 +294098,7 @@ flag_set: @ 809D740 ldrb r0, [r2] orrs r1, r0 strb r1, [r2] -_0809D760: +@0809D760: movs r0, 0 pop {r4} pop {r1} @@ -294106,8 +294106,8 @@ _0809D760: thumb_func_end flag_set thumb_func_start flag_clear -@ bool flag_clear(u16 flag_id) -flag_clear: @ 809D768 +; bool flag_clear(u16 flag_id) +flag_clear: ; 809D768 push {r4,lr} lsls r0, 16 lsrs r4, r0, 16 @@ -294115,7 +294115,7 @@ flag_clear: @ 809D768 bl flag_get_pointer adds r2, r0, 0 cmp r2, 0 - beq _0809D788 + beq @0809D788 movs r0, 0x7 ands r0, r4 movs r1, 0x1 @@ -294123,7 +294123,7 @@ flag_clear: @ 809D768 ldrb r0, [r2] bics r0, r1 strb r0, [r2] -_0809D788: +@0809D788: movs r0, 0 pop {r4} pop {r1} @@ -294131,15 +294131,15 @@ _0809D788: thumb_func_end flag_clear thumb_func_start flag_check -@ bool flag_check(u16 flag_id) -flag_check: @ 809D790 +; bool flag_check(u16 flag_id) +flag_check: ; 809D790 push {r4,lr} lsls r0, 16 lsrs r4, r0, 16 adds r0, r4, 0 bl flag_get_pointer cmp r0, 0 - beq _0809D7B4 + beq @0809D7B4 ldrb r0, [r0] movs r1, 0x7 ands r1, r4 @@ -294147,19 +294147,19 @@ flag_check: @ 809D790 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0809D7B4 + beq @0809D7B4 movs r0, 0x1 - b _0809D7B6 -_0809D7B4: + b @0809D7B6 +@0809D7B4: movs r0, 0 -_0809D7B6: +@0809D7B6: pop {r4} pop {r1} bx r1 thumb_func_end flag_check thumb_func_start sub_809D7BC -sub_809D7BC: @ 809D7BC +sub_809D7BC: ; 809D7BC push {lr} movs r0, 0x1 bl sub_80AEDF0 @@ -294168,7 +294168,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 @@ -294177,7 +294177,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 @@ -294186,7 +294186,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 @@ -294195,7 +294195,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 @@ -294204,7 +294204,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 @@ -294213,7 +294213,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 @@ -294222,7 +294222,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 @@ -294231,7 +294231,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 @@ -294240,7 +294240,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 @@ -294249,7 +294249,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 @@ -294258,7 +294258,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 @@ -294267,7 +294267,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 @@ -294276,39 +294276,39 @@ sub_809D84C: @ 809D84C thumb_func_end sub_809D84C thumb_func_start trigger_activate_alternative__deprecated -trigger_activate_alternative__deprecated: @ 809D858 +trigger_activate_alternative__deprecated: ; 809D858 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 movs r2, 0 ldr r3, =0x085102e0 -_0809D862: +@0809D862: lsls r1, r2, 3 adds r0, r1, r3 ldrb r0, [r0] cmp r0, r4 - bne _0809D87C + bne @0809D87C adds r0, r3, 0x4 adds r0, r1, r0 ldr r0, [r0] bl _call_via_r0 - b _0809D886 + b @0809D886 .align 2, 0 .pool -_0809D87C: +@0809D87C: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xC - bls _0809D862 -_0809D886: + bls @0809D862 +@0809D886: pop {r4} pop {r0} bx r0 thumb_func_end trigger_activate_alternative__deprecated 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 @@ -294331,43 +294331,43 @@ 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 ldrsh r0, [r4, r1] cmp r0, 0 - beq _0809D8CA + beq @0809D8CA cmp r0, 0x1 - beq _0809D8E8 - b _0809D8FC -_0809D8CA: + beq @0809D8E8 + b @0809D8FC +@0809D8CA: ldr r0, =0x030022c0 ldr r0, [r0, 0x20] movs r1, 0x80 lsls r1, 5 ands r0, r1 cmp r0, 0 - beq _0809D8FC + beq @0809D8FC bl sub_809E7B0 ldrh r0, [r4] adds r0, 0x1 - b _0809D8FA + b @0809D8FA .align 2, 0 .pool -_0809D8E8: +@0809D8E8: ldr r0, =0x030022c0 ldr r0, [r0, 0x20] movs r1, 0x80 lsls r1, 5 ands r0, r1 cmp r0, 0 - bne _0809D8FC + bne @0809D8FC ldrh r0, [r4] subs r0, 0x1 -_0809D8FA: +@0809D8FA: strh r0, [r4] -_0809D8FC: +@0809D8FC: pop {r4} pop {r0} bx r0 @@ -294376,7 +294376,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 @@ -294388,13 +294388,13 @@ sub_809D908: @ 809D908 bl script_env_2_is_enabled lsls r0, 24 cmp r0, 0 - bne _0809D930 + bne @0809D930 adds r0, r4, 0 bl sub_809D8B8 adds r0, r4, 0x2 adds r1, r4, 0x4 bl wild_encounter_related -_0809D930: +@0809D930: pop {r4} pop {r0} bx r0 @@ -294403,7 +294403,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 + 1 adds r0, r5, 0 @@ -294411,7 +294411,7 @@ overworld_ensure_per_step_coros_running: @ 809D93C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _0809D966 + bne @0809D966 adds r0, r5, 0 movs r1, 0x50 bl AddTask @@ -294423,27 +294423,27 @@ overworld_ensure_per_step_coros_running: @ 809D93C lsls r1, 3 adds r1, r2 strh r4, [r1, 0x8] -_0809D966: +@0809D966: ldr r4, =sub_809E638 + 1 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _0809D97C + bne @0809D97C adds r0, r4, 0 movs r1, 0x50 bl AddTask -_0809D97C: +@0809D97C: ldr r4, =sub_809D908 + 1 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _0809D992 + bne @0809D992 adds r0, r4, 0 movs r1, 0x50 bl AddTask -_0809D992: +@0809D992: pop {r4,r5} pop {r0} bx r0 @@ -294452,7 +294452,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 @@ -294461,7 +294461,7 @@ activate_per_step_callback: @ 809D9A8 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xFF - beq _0809D9EA + beq @0809D9EA lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -294470,28 +294470,28 @@ activate_per_step_callback: @ 809D9A8 movs r2, 0 adds r0, r1, 0 adds r0, 0x1E -_0809D9CC: +@0809D9CC: strh r2, [r0] subs r0, 0x2 cmp r0, r1 - bge _0809D9CC + bge @0809D9CC cmp r4, 0x7 - bls _0809D9E8 + bls @0809D9E8 movs r0, 0 strh r0, [r1] - b _0809D9EA + b @0809D9EA .align 2, 0 .pool -_0809D9E8: +@0809D9E8: strh r4, [r1] -_0809D9EA: +@0809D9EA: pop {r4} pop {r0} bx r0 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 + 1 bl get_task_id_by_function @@ -294502,7 +294502,7 @@ wild_encounter_reset_coro_args: @ 809D9F0 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xFF - beq _0809DA1A + beq @0809DA1A lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -294511,7 +294511,7 @@ wild_encounter_reset_coro_args: @ 809D9F0 movs r1, 0 strh r1, [r0, 0x2] strh r1, [r0, 0x4] -_0809DA1A: +@0809DA1A: pop {r0} bx r0 .align 2, 0 @@ -294519,12 +294519,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 @@ -294533,46 +294533,46 @@ sub_809DA30: @ 809DA30 bl sub_8089764 lsls r0, 24 cmp r0, 0 - beq _0809DA48 + beq @0809DA48 adds r0, r5, 0 - b _0809DA80 -_0809DA48: + b @0809DA80 +@0809DA48: adds r0, r4, 0 bl sub_8089778 lsls r0, 24 cmp r0, 0 - beq _0809DA5A + beq @0809DA5A adds r0, r5, 0 adds r0, 0x8 - b _0809DA80 -_0809DA5A: + b @0809DA80 +@0809DA5A: adds r0, r4, 0 bl sub_808978C lsls r0, 24 cmp r0, 0 - beq _0809DA6C + beq @0809DA6C adds r0, r5, 0 adds r0, 0x10 - b _0809DA80 -_0809DA6C: + b @0809DA80 +@0809DA6C: adds r0, r4, 0 bl sub_80897A0 lsls r0, 24 cmp r0, 0 - bne _0809DA7C + bne @0809DA7C movs r0, 0 - b _0809DA80 -_0809DA7C: + b @0809DA80 +@0809DA7C: adds r0, r5, 0 adds r0, 0x18 -_0809DA80: +@0809DA80: pop {r4,r5} pop {r1} bx r1 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} @@ -294593,7 +294593,7 @@ sub_809DA88: @ 809DA88 adds r4, r0, 0 adds r5, r4, 0 cmp r4, 0 - beq _0809DB06 + beq @0809DB06 movs r0, 0 ldrsb r0, [r4, r0] adds r0, r6, r0 @@ -294604,7 +294604,7 @@ sub_809DA88: @ 809DA88 bl setmaptile_0 mov r0, r8 cmp r0, 0 - beq _0809DADE + beq @0809DADE movs r0, 0 ldrsb r0, [r4, r0] adds r0, r6, r0 @@ -294612,7 +294612,7 @@ sub_809DA88: @ 809DA88 ldrsb r1, [r4, r1] adds r1, r7, r1 bl cur_mapdata_draw_block_at -_0809DADE: +@0809DADE: movs r0, 0x4 ldrsb r0, [r5, r0] adds r0, r6, r0 @@ -294623,7 +294623,7 @@ _0809DADE: bl setmaptile_0 mov r0, r8 cmp r0, 0 - beq _0809DB06 + beq @0809DB06 movs r0, 0x4 ldrsb r0, [r5, r0] adds r0, r6, r0 @@ -294631,7 +294631,7 @@ _0809DADE: ldrsb r1, [r5, r1] adds r1, r7, r1 bl cur_mapdata_draw_block_at -_0809DB06: +@0809DB06: pop {r3} mov r8, r3 pop {r4-r7} @@ -294640,7 +294640,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 @@ -294661,7 +294661,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 @@ -294682,7 +294682,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 @@ -294703,7 +294703,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 @@ -294729,52 +294729,52 @@ sub_809DB7C: @ 809DB7C bl sub_8089764 lsls r0, 24 cmp r0, 0 - beq _0809DBC0 + beq @0809DBC0 lsls r0, r7, 16 asrs r0, 16 cmp r0, r5 - ble _0809DC06 -_0809DBBC: + ble @0809DC06 +@0809DBBC: movs r0, 0 - b _0809DC08 -_0809DBC0: + b @0809DC08 +@0809DBC0: adds r0, r4, 0 bl sub_8089778 lsls r0, 24 cmp r0, 0 - beq _0809DBD8 + beq @0809DBD8 mov r1, r9 lsls r0, r1, 16 asrs r0, 16 cmp r0, r5 - bge _0809DC06 - b _0809DBBC -_0809DBD8: + bge @0809DC06 + b @0809DBBC +@0809DBD8: adds r0, r4, 0 bl sub_808978C lsls r0, 24 cmp r0, 0 - beq _0809DBF0 + beq @0809DBF0 mov r1, r8 lsls r0, r1, 16 asrs r0, 16 cmp r0, r6 - ble _0809DC06 - b _0809DBBC -_0809DBF0: + ble @0809DC06 + b @0809DBBC +@0809DBF0: adds r0, r4, 0 bl sub_80897A0 lsls r0, 24 cmp r0, 0 - beq _0809DC06 + beq @0809DC06 mov r1, r10 lsls r0, r1, 16 asrs r0, 16 cmp r0, r6 - blt _0809DBBC -_0809DC06: + blt @0809DBBC +@0809DC06: movs r0, 0x1 -_0809DC08: +@0809DC08: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -294785,7 +294785,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 @@ -294811,52 +294811,52 @@ sub_809DC18: @ 809DC18 bl sub_8089764 lsls r0, 24 cmp r0, 0 - beq _0809DC5C + beq @0809DC5C lsls r0, r7, 16 asrs r0, 16 cmp r5, r0 - bge _0809DCA2 -_0809DC58: + bge @0809DCA2 +@0809DC58: movs r0, 0 - b _0809DCA4 -_0809DC5C: + b @0809DCA4 +@0809DC5C: adds r0, r4, 0 bl sub_8089778 lsls r0, 24 cmp r0, 0 - beq _0809DC74 + beq @0809DC74 mov r1, r9 lsls r0, r1, 16 asrs r0, 16 cmp r5, r0 - ble _0809DCA2 - b _0809DC58 -_0809DC74: + ble @0809DCA2 + b @0809DC58 +@0809DC74: adds r0, r4, 0 bl sub_808978C lsls r0, 24 cmp r0, 0 - beq _0809DC8C + beq @0809DC8C mov r1, r8 lsls r0, r1, 16 asrs r0, 16 cmp r6, r0 - bge _0809DCA2 - b _0809DC58 -_0809DC8C: + bge @0809DCA2 + b @0809DC58 +@0809DC8C: adds r0, r4, 0 bl sub_80897A0 lsls r0, 24 cmp r0, 0 - beq _0809DCA2 + beq @0809DCA2 mov r1, r10 lsls r0, r1, 16 asrs r0, 16 cmp r6, r0 - bgt _0809DC58 -_0809DCA2: + bgt @0809DC58 +@0809DCA2: movs r0, 0x1 -_0809DCA4: +@0809DCA4: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -294867,7 +294867,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 @@ -294886,19 +294886,19 @@ sub_809DCB4: @ 809DCB4 ldrsh r0, [r4, r1] adds r6, r5, 0 cmp r0, 0x1 - beq _0809DD0E + beq @0809DD0E cmp r0, 0x1 - bgt _0809DCEC + bgt @0809DCEC cmp r0, 0 - beq _0809DCF2 - b _0809DE1E + beq @0809DCF2 + b @0809DE1E .align 2, 0 .pool -_0809DCEC: +@0809DCEC: cmp r0, 0x2 - beq _0809DDDC - b _0809DE1E -_0809DCF2: + beq @0809DDDC + b @0809DE1E +@0809DCF2: mov r0, sp ldrh r0, [r0] strh r0, [r4, 0x4] @@ -294911,22 +294911,22 @@ _0809DCF2: ldrsh r1, [r5, r3] movs r2, 0x1 bl sub_809DB34 - b _0809DE1A -_0809DD0E: + b @0809DE1A +@0809DD0E: mov r0, sp movs r7, 0 ldrsh r1, [r0, r7] movs r2, 0x4 ldrsh r0, [r4, r2] cmp r1, r0 - bne _0809DD28 + bne @0809DD28 movs r3, 0 ldrsh r1, [r5, r3] movs r7, 0x6 ldrsh r0, [r4, r7] cmp r1, r0 - beq _0809DE1E -_0809DD28: + beq @0809DE1E +@0809DD28: mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -294938,7 +294938,7 @@ _0809DD28: ldrsh r3, [r4, r5] bl sub_809DB7C cmp r0, 0 - beq _0809DD70 + beq @0809DD70 movs r7, 0x4 ldrsh r0, [r4, r7] movs r2, 0x6 @@ -294959,14 +294959,14 @@ _0809DD28: strh r0, [r4, 0x2] movs r0, 0x8 strh r0, [r4, 0xC] - b _0809DD7A -_0809DD70: + b @0809DD7A +@0809DD70: movs r7, 0x1 negs r7, r7 adds r0, r7, 0 strh r0, [r4, 0x8] strh r0, [r4, 0xA] -_0809DD7A: +@0809DD7A: mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -294979,7 +294979,7 @@ _0809DD7A: ldrsh r3, [r4, r7] bl sub_809DC18 cmp r0, 0 - beq _0809DDAE + beq @0809DDAE mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -294991,7 +294991,7 @@ _0809DD7A: strh r0, [r4, 0x2] movs r0, 0x8 strh r0, [r4, 0xC] -_0809DDAE: +@0809DDAE: mov r0, sp ldrh r0, [r0] strh r0, [r4, 0x4] @@ -295008,17 +295008,17 @@ _0809DDAE: bl is_tile_x17 lsls r0, 24 cmp r0, 0 - beq _0809DE1E + beq @0809DE1E movs r0, 0x46 bl audio_play - b _0809DE1E -_0809DDDC: + b @0809DE1E +@0809DDDC: ldrh r0, [r4, 0xC] subs r0, 0x1 strh r0, [r4, 0xC] lsls r0, 16 cmp r0, 0 - bne _0809DE1E + bne @0809DE1E mov r0, sp movs r7, 0 ldrsh r0, [r0, r7] @@ -295031,21 +295031,21 @@ _0809DDDC: movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _0809DE1A + beq @0809DE1A movs r5, 0xA ldrsh r0, [r4, r5] cmp r0, r1 - beq _0809DE1A + beq @0809DE1A movs r7, 0x8 ldrsh r0, [r4, r7] movs r2, 0xA ldrsh r1, [r4, r2] movs r2, 0x1 bl sub_809DB58 -_0809DE1A: +@0809DE1A: movs r0, 0x1 strh r0, [r4, 0x2] -_0809DE1E: +@0809DE1E: add sp, 0x4 pop {r4-r7} pop {r0} @@ -295053,7 +295053,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 @@ -295065,7 +295065,7 @@ sub_809DE28: @ 809DE28 movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _0809DE82 + bne @0809DE82 lsls r0, r4, 16 asrs r4, r0, 16 lsls r0, r5, 16 @@ -295076,27 +295076,27 @@ sub_809DE28: @ 809DE28 adds r1, r0, 0 ldr r0, =0x0000024e cmp r1, r0 - beq _0809DE68 + beq @0809DE68 adds r0, 0x8 cmp r1, r0 - beq _0809DE78 - b _0809DE82 + beq @0809DE78 + b @0809DE82 .align 2, 0 .pool -_0809DE68: +@0809DE68: ldr r2, =0x0000024f adds r0, r4, 0 adds r1, r5, 0 bl setmaptile_0 - b _0809DE82 + b @0809DE82 .align 2, 0 .pool -_0809DE78: +@0809DE78: ldr r2, =0x00000257 adds r0, r4, 0 adds r1, r5, 0 bl setmaptile_0 -_0809DE82: +@0809DE82: pop {r4,r5} pop {r0} bx r0 @@ -295105,7 +295105,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 @@ -295117,7 +295117,7 @@ sub_809DE8C: @ 809DE8C movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _0809DEE6 + bne @0809DEE6 lsls r0, r4, 16 asrs r4, r0, 16 lsls r0, r5, 16 @@ -295128,27 +295128,27 @@ sub_809DE8C: @ 809DE8C adds r1, r0, 0 ldr r0, =0x0000024f cmp r1, r0 - beq _0809DECC + beq @0809DECC adds r0, 0x8 cmp r1, r0 - beq _0809DEDC - b _0809DEE6 + beq @0809DEDC + b @0809DEE6 .align 2, 0 .pool -_0809DECC: +@0809DECC: ldr r2, =0x0000024e adds r0, r4, 0 adds r1, r5, 0 bl setmaptile_0 - b _0809DEE6 + b @0809DEE6 .align 2, 0 .pool -_0809DEDC: +@0809DEDC: ldr r2, =0x00000256 adds r0, r4, 0 adds r1, r5, 0 bl setmaptile_0 -_0809DEE6: +@0809DEE6: pop {r4,r5} pop {r0} bx r0 @@ -295157,7 +295157,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 @@ -295180,21 +295180,21 @@ sub_809DEF0: @ 809DEF0 ldrsh r5, [r6, r0] mov r9, r4 cmp r5, 0x1 - beq _0809DF84 + beq @0809DF84 cmp r5, 0x1 - bgt _0809DF30 + bgt @0809DF30 cmp r5, 0 - beq _0809DF38 - b _0809E0F6 + beq @0809DF38 + b @0809E0F6 .align 2, 0 .pool -_0809DF30: +@0809DF30: cmp r5, 0x2 - bne _0809DF36 - b _0809E064 -_0809DF36: - b _0809E0F6 -_0809DF38: + bne @0809DF36 + b @0809E064 +@0809DF36: + b @0809E0F6 +@0809DF38: mov r0, sp ldrh r0, [r0] strh r0, [r6, 0x4] @@ -295212,9 +295212,9 @@ _0809DF38: bl sub_8089750 lsls r0, 24 cmp r0, 0 - bne _0809DF62 - b _0809E0F2 -_0809DF62: + bne @0809DF62 + b @0809E0F2 +@0809DF62: mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -295229,8 +295229,8 @@ _0809DF62: movs r3, 0 ldrsh r1, [r2, r3] bl cur_mapdata_draw_block_at - b _0809E0F2 -_0809DF84: + b @0809E0F2 +@0809DF84: ldrh r0, [r6, 0x6] mov r8, r0 mov r0, sp @@ -295241,7 +295241,7 @@ _0809DF84: movs r3, 0x4 ldrsh r7, [r6, r3] cmp r0, r7 - bne _0809DFAC + bne @0809DFAC mov r0, r9 movs r2, 0 ldrsh r1, [r0, r2] @@ -295249,9 +295249,9 @@ _0809DF84: lsls r0, r3, 16 asrs r0, 16 cmp r1, r0 - bne _0809DFAC - b _0809E0F6 -_0809DFAC: + bne @0809DFAC + b @0809E0F6 +@0809DFAC: mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -295281,22 +295281,22 @@ _0809DFAC: lsls r0, r5, 24 adds r5, r4, 0 cmp r0, 0 - bne _0809DFF4 + bne @0809DFF4 movs r1, 0x1 -_0809DFF4: +@0809DFF4: cmp r1, 0 - beq _0809E008 + beq @0809E008 ldr r1, [sp, 0x4] cmp r1, 0x1 - beq _0809E002 + beq @0809E002 cmp r7, 0x1 - bne _0809E008 -_0809E002: + bne @0809E008 +@0809E002: movs r0, 0x47 bl audio_play -_0809E008: +@0809E008: cmp r7, 0 - beq _0809E044 + beq @0809E044 mov r2, r10 lsls r4, r2, 16 asrs r4, 16 @@ -295321,7 +295321,7 @@ _0809E008: movs r3, 0 ldrsh r1, [r2, r3] bl cur_mapdata_draw_block_at -_0809E044: +@0809E044: mov r0, r10 strh r0, [r6, 0x8] mov r1, r8 @@ -295333,12 +295333,12 @@ _0809E044: ldrh r0, [r2] strh r0, [r6, 0x6] cmp r7, 0 - beq _0809E0F6 + beq @0809E0F6 movs r0, 0x10 strh r0, [r6, 0xC] movs r0, 0x2 strh r0, [r6, 0x2] -_0809E064: +@0809E064: ldrh r0, [r6, 0xC] subs r0, 0x1 strh r0, [r6, 0xC] @@ -295353,25 +295353,25 @@ _0809E064: lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - bhi _0809E0EA + bhi @0809E0EA lsls r0, 2 - ldr r1, =_0809E094 + ldr r1, =@0809E094 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0809E094: - .4byte _0809E0B4 - .4byte _0809E0EA - .4byte _0809E0EA - .4byte _0809E0EA - .4byte _0809E0C6 - .4byte _0809E0EA - .4byte _0809E0EA - .4byte _0809E0EA -_0809E0B4: +@0809E094: + .4byte @0809E0B4 + .4byte @0809E0EA + .4byte @0809E0EA + .4byte @0809E0EA + .4byte @0809E0C6 + .4byte @0809E0EA + .4byte @0809E0EA + .4byte @0809E0EA +@0809E0B4: mov r2, r10 lsls r0, r2, 16 asrs r0, 16 @@ -295379,8 +295379,8 @@ _0809E0B4: lsls r1, r3, 16 asrs r1, 16 bl cur_mapdata_draw_block_at - b _0809E0EA -_0809E0C6: + b @0809E0EA +@0809E0C6: mov r0, r10 lsls r5, r0, 16 asrs r5, 16 @@ -295396,15 +295396,15 @@ _0809E0C6: adds r0, r5, 0 adds r1, r4, 0 bl sub_809DE8C -_0809E0EA: +@0809E0EA: movs r2, 0xC ldrsh r0, [r6, r2] cmp r0, 0 - bne _0809E0F6 -_0809E0F2: + bne @0809E0F6 +@0809E0F2: movs r0, 0x1 strh r0, [r6, 0x2] -_0809E0F6: +@0809E0F6: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -295416,7 +295416,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 @@ -295425,33 +295425,33 @@ sub_809E108: @ 809E108 adds r0, r2 lsrs r0, 16 cmp r0, 0xA - bhi _0809E144 + bhi @0809E144 lsls r0, r1, 16 asrs r1, r0, 16 ldr r2, =0xfffa0000 adds r0, r2 lsrs r0, 16 cmp r0, 0xD - bhi _0809E144 + bhi @0809E144 ldr r0, =0x085103c8 lsls r1, 1 adds r1, r0 ldrh r0, [r1] cmp r0, 0 - beq _0809E144 + beq @0809E144 movs r0, 0x1 - b _0809E146 + b @0809E146 .align 2, 0 .pool -_0809E144: +@0809E144: movs r0, 0 -_0809E146: +@0809E146: pop {r1} bx r1 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 @@ -295461,7 +295461,7 @@ sub_809E14C: @ 809E14C adds r1, r4, 0 bl sub_809E108 cmp r0, 0 - beq _0809E17A + beq @0809E17A ldr r1, =0x085103c8 lsls r0, r4, 1 adds r0, r1 @@ -295473,7 +295473,7 @@ sub_809E14C: @ 809E14C ldrh r2, [r0] orrs r1, r2 strh r1, [r0] -_0809E17A: +@0809E17A: pop {r4,r5} pop {r0} bx r0 @@ -295482,7 +295482,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 @@ -295492,7 +295492,7 @@ sub_809E184: @ 809E184 adds r1, r4, 0 bl sub_809E108 cmp r0, 0 - beq _0809E1B6 + beq @0809E1B6 ldr r1, =0x085103c8 lsls r0, r4, 1 adds r0, r1 @@ -295505,22 +295505,22 @@ sub_809E184: @ 809E184 lsls r1, r2 ands r1, r0 cmp r1, 0 - bne _0809E1C0 -_0809E1B6: + bne @0809E1C0 +@0809E1B6: movs r0, 0 - b _0809E1C2 + b @0809E1C2 .align 2, 0 .pool -_0809E1C0: +@0809E1C0: movs r0, 0x1 -_0809E1C2: +@0809E1C2: pop {r4,r5} pop {r1} bx r1 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 @@ -295532,34 +295532,34 @@ sub_809E1C8: @ 809E1C8 ldr r7, [r0, 0x4] movs r5, 0 cmp r5, r9 - bge _0809E210 -_0809E1E0: + bge @0809E210 +@0809E1E0: movs r4, 0 adds r0, r5, 0x1 mov r8, r0 cmp r4, r7 - bge _0809E20A + bge @0809E20A lsls r6, r5, 16 -_0809E1EC: +@0809E1EC: lsls r1, r4, 16 asrs r1, 16 asrs r0, r6, 16 bl sub_809E184 cmp r0, 0x1 - bne _0809E204 + bne @0809E204 adds r1, r4, 0x7 adds r0, r5, 0x7 ldr r2, =0x0000020e bl setmaptile_0 -_0809E204: +@0809E204: adds r4, 0x1 cmp r4, r7 - blt _0809E1EC -_0809E20A: + blt @0809E1EC +@0809E20A: mov r5, r8 cmp r5, r9 - blt _0809E1E0 -_0809E210: + blt @0809E1E0 +@0809E210: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -295571,7 +295571,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 @@ -295584,23 +295584,23 @@ sub_809E224: @ 809E224 movs r1, 0x2 ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _0809E270 + beq @0809E270 cmp r0, 0x1 - bgt _0809E24C + bgt @0809E24C cmp r0, 0 - beq _0809E258 - b _0809E3A6 + beq @0809E258 + b @0809E3A6 .align 2, 0 .pool -_0809E24C: +@0809E24C: cmp r0, 0x2 - beq _0809E306 + beq @0809E306 cmp r0, 0x3 - bne _0809E256 - b _0809E360 -_0809E256: - b _0809E3A6 -_0809E258: + bne @0809E256 + b @0809E360 +@0809E256: + b @0809E3A6 +@0809E258: mov r4, sp adds r4, 0x2 mov r0, sp @@ -295611,8 +295611,8 @@ _0809E258: strh r0, [r5, 0x4] ldrh r0, [r4] strh r0, [r5, 0x6] - b _0809E3A2 -_0809E270: + b @0809E3A2 +@0809E270: mov r7, sp adds r7, 0x2 mov r0, sp @@ -295625,15 +295625,15 @@ _0809E270: movs r3, 0x4 ldrsh r0, [r5, r3] cmp r1, r0 - bne _0809E29A + bne @0809E29A movs r0, 0 ldrsh r1, [r7, r0] movs r3, 0x6 ldrsh r0, [r5, r3] cmp r1, r0 - bne _0809E29A - b _0809E3A6 -_0809E29A: + bne @0809E29A + b @0809E3A6 +@0809E29A: strh r2, [r5, 0x4] ldrh r0, [r7] strh r0, [r5, 0x6] @@ -295656,42 +295656,42 @@ _0809E29A: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809E2E0 + bne @0809E2E0 ldrh r0, [r6] adds r0, 0x1 strh r0, [r6] movs r0, 0x4 strh r0, [r5, 0xC] movs r0, 0x2 - b _0809E2F8 + b @0809E2F8 .align 2, 0 .pool -_0809E2E0: +@0809E2E0: adds r0, r4, 0 bl sub_8089618 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809E3A6 + bne @0809E3A6 movs r0, 0 strh r0, [r6] movs r0, 0x4 strh r0, [r5, 0xC] movs r0, 0x3 -_0809E2F8: +@0809E2F8: strh r0, [r5, 0x2] mov r0, sp ldrh r0, [r0] strh r0, [r5, 0x8] ldrh r0, [r7] strh r0, [r5, 0xA] - b _0809E3A6 -_0809E306: + b @0809E3A6 +@0809E306: ldrh r1, [r5, 0xC] movs r3, 0xC ldrsh r0, [r5, r3] cmp r0, 0 - bne _0809E36A + bne @0809E36A mov r1, sp ldrh r0, [r5, 0x8] strh r0, [r1] @@ -295724,20 +295724,20 @@ _0809E306: lsls r1, 16 asrs r1, 16 bl sub_809E14C - b _0809E3A2 + b @0809E3A2 .align 2, 0 .pool -_0809E360: +@0809E360: ldrh r1, [r5, 0xC] movs r3, 0xC ldrsh r0, [r5, r3] cmp r0, 0 - beq _0809E370 -_0809E36A: + beq @0809E370 +@0809E36A: subs r0, r1, 0x1 strh r0, [r5, 0xC] - b _0809E3A6 -_0809E370: + b @0809E3A6 +@0809E370: mov r1, sp ldrh r0, [r5, 0x8] strh r0, [r1] @@ -295760,10 +295760,10 @@ _0809E370: movs r2, 0 ldrsh r1, [r4, r2] bl cur_mapdata_draw_block_at -_0809E3A2: +@0809E3A2: movs r0, 0x1 strh r0, [r5, 0x2] -_0809E3A6: +@0809E3A6: add sp, 0x4 pop {r4-r7} pop {r0} @@ -295773,7 +295773,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 @@ -295795,14 +295795,14 @@ sub_809E3B4: @ 809E3B4 movs r3, 0x2 ldrsh r0, [r5, r3] cmp r1, r0 - bne _0809E3EE + bne @0809E3EE movs r0, 0 ldrsh r1, [r4, r0] movs r3, 0x4 ldrsh r0, [r5, r3] cmp r1, r0 - beq _0809E47A -_0809E3EE: + beq @0809E47A +@0809E3EE: strh r2, [r5, 0x2] ldrh r0, [r4] strh r0, [r5, 0x4] @@ -295817,7 +295817,7 @@ _0809E3EE: bl sub_8089484 lsls r0, 24 cmp r0, 0 - beq _0809E47A + beq @0809E47A mov r0, sp movs r3, 0 ldrsh r0, [r0, r3] @@ -295826,7 +295826,7 @@ _0809E3EE: bl cur_mapdata_get_blockid_at ldr r1, =0x0000020a cmp r0, r1 - bne _0809E444 + bne @0809E444 mov r0, sp movs r3, 0 ldrsh r0, [r0, r3] @@ -295835,10 +295835,10 @@ _0809E3EE: ldr r2, =0x00000212 movs r3, 0x4 bl ash - b _0809E456 + b @0809E456 .align 2, 0 .pool -_0809E444: +@0809E444: mov r0, sp movs r3, 0 ldrsh r0, [r0, r3] @@ -295847,24 +295847,24 @@ _0809E444: ldr r2, =0x00000206 movs r3, 0x4 bl ash -_0809E456: +@0809E456: movs r0, 0x87 lsls r0, 1 movs r1, 0x1 bl sub_80D6724 lsls r0, 24 cmp r0, 0 - beq _0809E47A + beq @0809E47A ldr r0, =0x00004048 bl var_get_pointer adds r2, r0, 0 ldrh r1, [r2] ldr r0, =0x0000270e cmp r1, r0 - bhi _0809E47A + bhi @0809E47A adds r0, r1, 0x1 strh r0, [r2] -_0809E47A: +@0809E47A: add sp, 0x4 pop {r4,r5} pop {r0} @@ -295874,7 +295874,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 @@ -295886,9 +295886,9 @@ sub_809E490: @ 809E490 ldr r1, =0x0000022f ldr r2, =0x00000237 cmp r0, r1 - bne _0809E4AC + bne @0809E4AC subs r2, 0x31 -_0809E4AC: +@0809E4AC: adds r0, r5, 0 adds r1, r4, 0 bl setmaptile_0 @@ -295903,7 +295903,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 @@ -295931,45 +295931,45 @@ sub_809E4CC: @ 809E4CC ldrsh r0, [r5, r3] adds r7, r4, 0 cmp r0, 0 - beq _0809E51E + beq @0809E51E subs r0, r1, 0x1 strh r0, [r5, 0x8] lsls r0, 16 cmp r0, 0 - bne _0809E51E + bne @0809E51E movs r1, 0xA ldrsh r0, [r5, r1] movs r2, 0xC ldrsh r1, [r5, r2] bl sub_809E490 -_0809E51E: +@0809E51E: ldrh r1, [r5, 0xE] movs r3, 0xE ldrsh r0, [r5, r3] cmp r0, 0 - beq _0809E53E + beq @0809E53E subs r0, r1, 0x1 strh r0, [r5, 0xE] lsls r0, 16 cmp r0, 0 - bne _0809E53E + bne @0809E53E movs r1, 0x10 ldrsh r0, [r5, r1] movs r2, 0x12 ldrsh r1, [r5, r2] bl sub_809E490 -_0809E53E: +@0809E53E: lsls r0, r6, 24 lsrs r6, r0, 24 adds r0, r6, 0 bl sub_8089918 lsls r0, 24 cmp r0, 0 - beq _0809E556 + beq @0809E556 ldr r0, =0x00004022 movs r1, 0 bl var_set -_0809E556: +@0809E556: mov r0, sp ldrh r2, [r0] movs r3, 0 @@ -295977,14 +295977,14 @@ _0809E556: movs r3, 0x4 ldrsh r0, [r5, r3] cmp r1, r0 - bne _0809E572 + bne @0809E572 movs r0, 0 ldrsh r1, [r7, r0] movs r3, 0x6 ldrsh r0, [r5, r3] cmp r1, r0 - beq _0809E5D2 -_0809E572: + beq @0809E5D2 +@0809E572: strh r2, [r5, 0x4] adds r4, r7, 0 ldrh r0, [r4] @@ -295993,20 +295993,20 @@ _0809E572: bl sub_808992C lsls r0, 24 cmp r0, 0 - beq _0809E5D2 + beq @0809E5D2 bl sub_811A138 lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - beq _0809E59A + beq @0809E59A ldr r0, =0x00004022 movs r1, 0 bl var_set -_0809E59A: +@0809E59A: movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0 - bne _0809E5BC + bne @0809E5BC movs r0, 0x3 strh r0, [r5, 0x8] mov r0, sp @@ -296014,14 +296014,14 @@ _0809E59A: strh r0, [r5, 0xA] ldrh r0, [r4] strh r0, [r5, 0xC] - b _0809E5D2 + b @0809E5D2 .align 2, 0 .pool -_0809E5BC: +@0809E5BC: movs r2, 0xE ldrsh r0, [r5, r2] cmp r0, 0 - bne _0809E5D2 + bne @0809E5D2 movs r0, 0x3 strh r0, [r5, 0xE] mov r0, sp @@ -296029,7 +296029,7 @@ _0809E5BC: strh r0, [r5, 0x10] ldrh r0, [r7] strh r0, [r5, 0x12] -_0809E5D2: +@0809E5D2: add sp, 0x4 pop {r4-r7} pop {r0} @@ -296037,7 +296037,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 @@ -296049,22 +296049,22 @@ sub_809E5DC: @ 809E5DC strh r0, [r3] lsls r0, 16 cmp r0, 0 - bne _0809E5F8 + bne @0809E5F8 movs r2, 0xE8 - b _0809E60C -_0809E5F8: + b @0809E60C +@0809E5F8: ldr r1, =0x085103fc movs r2, 0 ldrsh r0, [r3, r2] cmp r0, 0 - bge _0809E604 + bge @0809E604 adds r0, 0x7 -_0809E604: +@0809E604: asrs r0, 3 lsls r0, 1 adds r0, r1 ldrh r2, [r0] -_0809E60C: +@0809E60C: lsls r5, 16 asrs r5, 16 lsls r4, 16 @@ -296087,7 +296087,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} @@ -296119,13 +296119,13 @@ sub_809E638: @ 809E638 ldrsh r1, [r4, r0] mov r8, r5 cmp r1, 0 - beq _0809E688 + beq @0809E688 cmp r1, 0x1 - beq _0809E6B4 - b _0809E708 + beq @0809E6B4 + b @0809E708 .align 2, 0 .pool -_0809E688: +@0809E688: strh r7, [r4] mov r0, sp ldrh r0, [r0] @@ -296138,8 +296138,8 @@ _0809E688: strh r1, [r4, 0xE] strh r1, [r4, 0x14] strh r1, [r4, 0x1A] - b _0809E708 -_0809E6A2: + b @0809E708 +@0809E6A2: movs r0, 0x20 strh r0, [r1] mov r0, sp @@ -296148,8 +296148,8 @@ _0809E6A2: mov r2, r8 ldrh r0, [r2] strh r0, [r1, 0x4] - b _0809E708 -_0809E6B4: + b @0809E708 +@0809E6B4: mov r0, sp movs r3, 0x4 ldrsh r1, [r4, r3] @@ -296157,14 +296157,14 @@ _0809E6B4: movs r3, 0 ldrsh r0, [r0, r3] cmp r1, r0 - bne _0809E6D0 + bne @0809E6D0 movs r0, 0x6 ldrsh r1, [r4, r0] movs r3, 0 ldrsh r0, [r5, r3] cmp r1, r0 - beq _0809E708 -_0809E6D0: + beq @0809E708 +@0809E6D0: strh r2, [r4, 0x4] ldrh r0, [r5] strh r0, [r4, 0x6] @@ -296179,40 +296179,40 @@ _0809E6D0: bl sub_8089940 lsls r0, 24 cmp r0, 0 - beq _0809E708 + beq @0809E708 movs r6, 0x4 adds r1, r4, 0 adds r1, 0x8 -_0809E6F8: +@0809E6F8: movs r3, 0 ldrsh r0, [r1, r3] cmp r0, 0 - beq _0809E6A2 + beq @0809E6A2 adds r1, 0x6 adds r6, 0x3 cmp r6, 0xD - ble _0809E6F8 -_0809E708: + ble @0809E6F8 +@0809E708: ldr r2, =0x02037334 ldrb r1, [r2] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0809E728 + beq @0809E728 movs r1, 0 ldrsh r0, [r4, r1] cmp r7, r0 - beq _0809E728 + beq @0809E728 strh r7, [r4] ldrh r0, [r2, 0x4] ldrh r1, [r2, 0x8] - b _0809E72C + b @0809E72C .align 2, 0 .pool -_0809E728: +@0809E728: movs r0, 0 movs r1, 0 -_0809E72C: +@0809E72C: lsls r0, 16 asrs r0, 16 mov r8, r0 @@ -296222,11 +296222,11 @@ _0809E72C: adds r5, 0x8 adds r4, r5, 0 movs r6, 0x9 -_0809E73E: +@0809E73E: movs r2, 0 ldrsh r0, [r4, r2] cmp r0, 0 - beq _0809E762 + beq @0809E762 ldrh r0, [r4, 0x2] mov r3, r8 subs r0, r3 @@ -296240,12 +296240,12 @@ _0809E73E: ldrsh r2, [r4, r3] adds r0, r5, 0 bl sub_809E5DC -_0809E762: +@0809E762: adds r4, 0x6 adds r5, 0x6 subs r6, 0x3 cmp r6, 0 - bge _0809E73E + bge @0809E73E add sp, 0x4 pop {r3} mov r8, r3 @@ -296255,7 +296255,7 @@ _0809E762: thumb_func_end sub_809E638 thumb_func_start sub_809E778 -sub_809E778: @ 809E778 +sub_809E778: ; 809E778 push {lr} ldr r0, =0x00000895 bl flag_set @@ -296278,24 +296278,24 @@ 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 flag_check lsls r0, 24 cmp r0, 0 - beq _0809E7DA + beq @0809E7DA bl sub_813B9C0 lsls r0, 24 cmp r0, 0 - bne _0809E7DA + bne @0809E7DA bl sub_802F588 ldr r4, =0x03005cf8 adds r0, r4, 0 bl sub_809E7E8 adds r0, r4, 0 bl sub_809E858 -_0809E7DA: +@0809E7DA: pop {r4} pop {r0} bx r0 @@ -296304,7 +296304,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 @@ -296314,9 +296314,9 @@ sub_809E7E8: @ 809E7E8 movs r2, 0 ldrsh r1, [r5, r2] cmp r0, r1 - beq _0809E84E + beq @0809E84E cmp r0, r1 - bgt _0809E84E + bgt @0809E84E ldrh r4, [r5] subs r4, r0 lsls r4, 16 @@ -296344,7 +296344,7 @@ sub_809E7E8: @ 809E7E8 bl sub_8177584 ldrh r0, [r5] strh r0, [r6] -_0809E84E: +@0809E84E: pop {r4-r6} pop {r0} bx r0 @@ -296353,7 +296353,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 @@ -296382,9 +296382,9 @@ sub_809E858: @ 809E858 ldrsb r0, [r4, r0] adds r0, r1, r0 cmp r0, 0 - beq _0809E8A8 + beq @0809E8A8 cmp r0, 0 - blt _0809E8A8 + blt @0809E8A8 bl sub_80E1870 ldr r2, [r6] adds r2, 0xA0 @@ -296392,7 +296392,7 @@ sub_809E858: @ 809E858 ldr r1, [r5, 0x4] str r0, [r2] str r1, [r2, 0x4] -_0809E8A8: +@0809E8A8: add sp, 0x8 pop {r4-r6} pop {r0} @@ -296402,7 +296402,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 + 1 @@ -296414,7 +296414,7 @@ sub_809E8B4: @ 809E8B4 thumb_func_end sub_809E8B4 thumb_func_start sub_809E8C8 -sub_809E8C8: @ 809E8C8 +sub_809E8C8: ; 809E8C8 push {lr} ldr r0, =sub_81349F4 + 1 bl set_callback2 @@ -296428,7 +296428,7 @@ sub_809E8C8: @ 809E8C8 thumb_func_end sub_809E8C8 thumb_func_start sub_809E8E8 -sub_809E8E8: @ 809E8E8 +sub_809E8E8: ; 809E8E8 push {lr} adds r3, r0, 0 ldr r2, =0x03005e00 @@ -296443,27 +296443,27 @@ sub_809E8E8: @ 809E8E8 movs r2, 0x30 ldrsh r0, [r3, r2] cmp r1, r0 - beq _0809E9FE + beq @0809E9FE strh r1, [r3, 0x30] subs r0, r1, 0x1 cmp r0, 0x5 - bhi _0809E9FE + bhi @0809E9FE lsls r0, 2 - ldr r1, =_0809E920 + ldr r1, =@0809E920 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0809E920: - .4byte _0809E938 - .4byte _0809E95C - .4byte _0809E980 - .4byte _0809E9A4 - .4byte _0809E9CE - .4byte _0809E9F8 -_0809E938: +@0809E920: + .4byte @0809E938 + .4byte @0809E95C + .4byte @0809E980 + .4byte @0809E9A4 + .4byte @0809E9CE + .4byte @0809E9F8 +@0809E938: adds r2, r3, 0 adds r2, 0x3E ldrb r1, [r2] @@ -296481,8 +296481,8 @@ _0809E938: ands r0, r1 strb r0, [r2] movs r0, 0x35 - b _0809E9C6 -_0809E95C: + b @0809E9C6 +@0809E95C: adds r2, r3, 0 adds r2, 0x3E ldrb r1, [r2] @@ -296500,8 +296500,8 @@ _0809E95C: ands r0, r1 strb r0, [r2] movs r0, 0x56 - b _0809E9C6 -_0809E980: + b @0809E9C6 +@0809E980: adds r2, r3, 0 adds r2, 0x3E ldrb r1, [r2] @@ -296519,8 +296519,8 @@ _0809E980: ands r0, r1 strb r0, [r2] movs r0, 0x65 - b _0809E9C6 -_0809E9A4: + b @0809E9C6 +@0809E9A4: adds r2, r3, 0 adds r2, 0x3E ldrb r1, [r2] @@ -296538,12 +296538,12 @@ _0809E9A4: ands r0, r1 strb r0, [r2] movs r0, 0x74 -_0809E9C6: +@0809E9C6: strh r0, [r3, 0x20] movs r0, 0x44 strh r0, [r3, 0x22] - b _0809E9FE -_0809E9CE: + b @0809E9FE +@0809E9CE: adds r2, r3, 0 adds r2, 0x3E ldrb r1, [r2] @@ -296564,17 +296564,17 @@ _0809E9CE: strh r0, [r3, 0x20] movs r0, 0x50 strh r0, [r3, 0x22] - b _0809E9FE -_0809E9F8: + b @0809E9FE +@0809E9F8: adds r0, r3, 0 bl obj_delete_and_free_tiles -_0809E9FE: +@0809E9FE: pop {r0} bx r0 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 @@ -296589,27 +296589,27 @@ sub_809EA04: @ 809EA04 movs r2, 0x30 ldrsh r0, [r3, r2] cmp r1, r0 - beq _0809EAFE + beq @0809EAFE strh r1, [r3, 0x30] subs r0, r1, 0x1 cmp r0, 0x5 - bhi _0809EAFE + bhi @0809EAFE lsls r0, 2 - ldr r1, =_0809EA3C + ldr r1, =@0809EA3C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0809EA3C: - .4byte _0809EA54 - .4byte _0809EA78 - .4byte _0809EA9C - .4byte _0809EAC0 - .4byte _0809EAEA - .4byte _0809EAF8 -_0809EA54: +@0809EA3C: + .4byte @0809EA54 + .4byte @0809EA78 + .4byte @0809EA9C + .4byte @0809EAC0 + .4byte @0809EAEA + .4byte @0809EAF8 +@0809EA54: adds r2, r3, 0 adds r2, 0x3E ldrb r1, [r2] @@ -296627,8 +296627,8 @@ _0809EA54: ands r0, r1 strb r0, [r2] movs r0, 0x35 - b _0809EAE2 -_0809EA78: + b @0809EAE2 +@0809EA78: adds r2, r3, 0 adds r2, 0x3E ldrb r1, [r2] @@ -296646,8 +296646,8 @@ _0809EA78: ands r0, r1 strb r0, [r2] movs r0, 0x56 - b _0809EAE2 -_0809EA9C: + b @0809EAE2 +@0809EA9C: adds r2, r3, 0 adds r2, 0x3E ldrb r1, [r2] @@ -296665,8 +296665,8 @@ _0809EA9C: ands r0, r1 strb r0, [r2] movs r0, 0x65 - b _0809EAE2 -_0809EAC0: + b @0809EAE2 +@0809EAC0: adds r2, r3, 0 adds r2, 0x3E ldrb r1, [r2] @@ -296684,29 +296684,29 @@ _0809EAC0: ands r0, r1 strb r0, [r2] movs r0, 0x74 -_0809EAE2: +@0809EAE2: strh r0, [r3, 0x20] movs r0, 0x5C strh r0, [r3, 0x22] - b _0809EAFE -_0809EAEA: + b @0809EAFE +@0809EAEA: adds r0, r3, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] - b _0809EAFE -_0809EAF8: + b @0809EAFE +@0809EAF8: adds r0, r3, 0 bl obj_delete_and_free_tiles -_0809EAFE: +@0809EAFE: pop {r0} bx r0 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} @@ -296764,7 +296764,7 @@ sub_809EB04: @ 809EB04 thumb_func_end sub_809EB04 thumb_func_start sub_809EB8C -sub_809EB8C: @ 809EB8C +sub_809EB8C: ; 809EB8C push {lr} ldr r0, =0x085104c4 ldrh r0, [r0, 0x4] @@ -296776,7 +296776,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 @@ -296794,7 +296794,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 @@ -296900,7 +296900,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 @@ -296965,7 +296965,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 @@ -296975,60 +296975,60 @@ sub_809ED38: @ 809ED38 movs r0, 0x80 ands r0, r3 cmp r0, 0 - beq _0809ED52 + beq @0809ED52 ldrh r0, [r4] subs r0, 0x1 - b _0809ED6C -_0809ED52: + b @0809ED6C +@0809ED52: movs r0, 0x40 ands r0, r3 cmp r0, 0 - beq _0809ED60 + beq @0809ED60 ldrh r0, [r4] adds r0, 0x1 - b _0809ED8A -_0809ED60: + b @0809ED8A +@0809ED60: movs r0, 0x20 ands r0, r3 cmp r0, 0 - beq _0809ED7A + beq @0809ED7A ldrh r0, [r4] subs r0, 0xA -_0809ED6C: +@0809ED6C: strh r0, [r4] movs r1, 0 ldrsh r0, [r4, r1] cmp r0, r5 - bge _0809ED96 + bge @0809ED96 strh r2, [r4] - b _0809ED96 -_0809ED7A: + b @0809ED96 +@0809ED7A: movs r0, 0x10 ands r1, r0 cmp r1, 0 - bne _0809ED86 + bne @0809ED86 movs r0, 0 - b _0809ED98 -_0809ED86: + b @0809ED98 +@0809ED86: ldrh r0, [r4] adds r0, 0xA -_0809ED8A: +@0809ED8A: strh r0, [r4] movs r1, 0 ldrsh r0, [r4, r1] cmp r0, r2 - ble _0809ED96 + ble @0809ED96 strh r5, [r4] -_0809ED96: +@0809ED96: movs r0, 0x1 -_0809ED98: +@0809ED98: pop {r4,r5} pop {r1} bx r1 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 @@ -297044,7 +297044,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 @@ -297068,7 +297068,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} @@ -297093,7 +297093,7 @@ sub_809EDE8: @ 809EDE8 ands r0, r3 mov r12, r1 cmp r0, 0 - beq _0809EE3C + beq @0809EE3C mov r0, r8 subs r0, 0x8 adds r0, r7, r0 @@ -297102,42 +297102,42 @@ sub_809EDE8: @ 809EDE8 movs r0, 0 strh r0, [r5, 0x2] movs r0, 0x6 - b _0809EE5C + b @0809EE5C .align 2, 0 .pool -_0809EE3C: +@0809EE3C: movs r0, 0x10 ands r0, r3 cmp r0, 0 - beq _0809EE4A + beq @0809EE4A ldrb r0, [r2, 0x7] cmp r0, 0 - bne _0809EE5C -_0809EE4A: + bne @0809EE5C +@0809EE4A: mov r3, r12 ldrh r1, [r3, 0x2E] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0809EE66 + beq @0809EE66 ldrb r0, [r2, 0x6] cmp r0, 0 - beq _0809EE66 -_0809EE5C: + beq @0809EE66 +@0809EE5C: strh r0, [r5, 0x4] movs r0, 0x5 bl audio_play - b _0809EEF4 -_0809EE66: + b @0809EEF4 +@0809EE66: cmp r4, 0x5 - bne _0809EEB4 + bne @0809EEB4 mov r0, r12 ldrh r1, [r0, 0x2E] movs r4, 0x1 adds r0, r4, 0 ands r0, r1 cmp r0, 0 - beq _0809EEF4 + beq @0809EEF4 ldr r1, =0x03005cf8 ldrh r0, [r5, 0x6] strh r0, [r1] @@ -297159,10 +297159,10 @@ _0809EE66: strh r4, [r5, 0x2] movs r0, 0x6 strh r0, [r5, 0x4] - b _0809EEF4 + b @0809EEF4 .align 2, 0 .pool -_0809EEB4: +@0809EEB4: ldrb r0, [r2] lsls r0, 1 adds r0, r5, r0 @@ -297174,7 +297174,7 @@ _0809EEB4: ands r3, r4 bl sub_809ED38 cmp r0, 0 - beq _0809EEF4 + beq @0809EEF4 movs r0, 0x5 bl audio_play ldrb r0, [r5, 0x10] @@ -297191,7 +297191,7 @@ _0809EEB4: ldrb r0, [r5, 0x10] movs r1, 0x2 bl Window_CopyToVram -_0809EEF4: +@0809EEF4: add sp, 0xC pop {r3} mov r8, r3 @@ -297201,7 +297201,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 @@ -297264,7 +297264,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 @@ -297296,7 +297296,7 @@ sub_809EF88: @ 809EF88 movs r0, 0x81 lsls r0, 24 mov r12, r0 -_0809EFCA: +@0809EFCA: strh r6, [r4] mov r0, sp str r0, [r1] @@ -297306,7 +297306,7 @@ _0809EFCA: adds r2, r5 subs r3, r5 cmp r3, r5 - bhi _0809EFCA + bhi @0809EFCA strh r6, [r4] mov r0, sp str r0, [r1] @@ -297342,7 +297342,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 @@ -297370,7 +297370,7 @@ sub_809F048: @ 809F048 thumb_func_end sub_809F048 thumb_func_start sub_809F090 -sub_809F090: @ 809F090 +sub_809F090: ; 809F090 push {lr} bl run_active_tasks bl call_obj_callbacks @@ -297382,7 +297382,7 @@ sub_809F090: @ 809F090 thumb_func_end sub_809F090 thumb_func_start sub_809F0AC -sub_809F0AC: @ 809F0AC +sub_809F0AC: ; 809F0AC push {lr} bl copy_queue_process bl copy_super_sprites_to_oam @@ -297392,7 +297392,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 @@ -297421,7 +297421,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 @@ -297434,13 +297434,13 @@ sub_809F0F8: @ 809F0F8 movs r0, 0 ldrsh r5, [r6, r0] cmp r5, 0 - beq _0809F11C + beq @0809F11C cmp r5, 0x1 - beq _0809F1B2 - b _0809F1F8 + beq @0809F1B2 + b @0809F1F8 .align 2, 0 .pool -_0809F11C: +@0809F11C: movs r2, 0x85 lsls r2, 2 movs r0, 0 @@ -297508,29 +297508,29 @@ _0809F11C: ldrh r0, [r6] adds r0, 0x1 strh r0, [r6] -_0809F1B2: +@0809F1B2: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0809F1E4 + beq @0809F1E4 adds r0, r7, 0 bl remove_task bl do_reset - b _0809F1F8 + b @0809F1F8 .align 2, 0 .pool -_0809F1E4: +@0809F1E4: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0809F1F8 + beq @0809F1F8 movs r0, 0x5 bl audio_play adds r0, r7, 0 bl remove_task -_0809F1F8: +@0809F1F8: add sp, 0xC pop {r4-r7} pop {r0} @@ -297538,7 +297538,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 @@ -297551,26 +297551,26 @@ sub_809F200: @ 809F200 movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0x6 - bls _0809F21C - b _0809F404 -_0809F21C: + bls @0809F21C + b @0809F404 +@0809F21C: lsls r0, 2 - ldr r1, =_0809F230 + ldr r1, =@0809F230 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0809F230: - .4byte _0809F24C - .4byte _0809F268 - .4byte _0809F2B4 - .4byte _0809F310 - .4byte _0809F398 - .4byte _0809F3C8 - .4byte _0809F3EA -_0809F24C: +@0809F230: + .4byte @0809F24C + .4byte @0809F268 + .4byte @0809F2B4 + .4byte @0809F310 + .4byte @0809F398 + .4byte @0809F3C8 + .4byte @0809F3EA +@0809F24C: movs r0, 0x1 negs r0, r0 ldr r1, =0x0000ffff @@ -297581,33 +297581,33 @@ _0809F24C: bl sub_80A1AD4 movs r0, 0x1 strh r0, [r5] - b _0809F404 + b @0809F404 .align 2, 0 .pool -_0809F268: +@0809F268: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0809F276 - b _0809F404 -_0809F276: + beq @0809F276 + b @0809F404 +@0809F276: ldr r0, =0x03006210 ldrh r0, [r0] cmp r0, 0 - beq _0809F282 + beq @0809F282 cmp r0, 0x2 - bne _0809F29C -_0809F282: + bne @0809F29C +@0809F282: ldr r0, =0x085ecaa7 bl sub_809F0C0 movs r0, 0x5 strh r0, [r5] - b _0809F404 + b @0809F404 .align 2, 0 .pool -_0809F29C: +@0809F29C: bl sub_802F588 ldr r0, =sub_809F0F8 + 1 movs r1, 0x50 @@ -297615,10 +297615,10 @@ _0809F29C: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x2] - b _0809F334 + b @0809F334 .align 2, 0 .pool -_0809F2B4: +@0809F2B4: ldr r2, =0x03005e00 movs r0, 0x2 ldrsh r1, [r5, r0] @@ -297628,9 +297628,9 @@ _0809F2B4: adds r0, r2 ldrb r0, [r0, 0x4] cmp r0, 0x1 - bne _0809F2CA - b _0809F404 -_0809F2CA: + bne @0809F2CA + b @0809F404 +@0809F2CA: movs r0, 0 movs r1, 0 bl sub_8198070 @@ -297652,10 +297652,10 @@ _0809F2CA: strh r0, [r5, 0x2] movs r0, 0x3 strh r0, [r5] - b _0809F404 + b @0809F404 .align 2, 0 .pool -_0809F310: +@0809F310: ldr r2, =0x03005e00 movs r0, 0x2 ldrsh r1, [r5, r0] @@ -297666,20 +297666,20 @@ _0809F310: movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0 - beq _0809F404 + beq @0809F404 movs r2, 0xA ldrsh r0, [r1, r2] cmp r0, 0 - bne _0809F340 + bne @0809F340 ldrb r0, [r5, 0x2] bl remove_task -_0809F334: +@0809F334: movs r0, 0x2 strh r0, [r5] - b _0809F404 + b @0809F404 .align 2, 0 .pool -_0809F340: +@0809F340: ldrb r0, [r5, 0x2] bl remove_task bl sub_802F3F8 @@ -297708,38 +297708,38 @@ _0809F340: bl sub_809F0C0 movs r0, 0x4 strh r0, [r5] - b _0809F404 + b @0809F404 .align 2, 0 .pool -_0809F398: +@0809F398: movs r0, 0 bl save_game_when_memory_present lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809F3B8 + bne @0809F3B8 ldr r0, =0x085eca8a bl sub_809F0C0 movs r0, 0x49 bl audio_play - b _0809F3C4 + b @0809F3C4 .align 2, 0 .pool -_0809F3B8: +@0809F3B8: ldr r0, =0x085eca9a bl sub_809F0C0 movs r0, 0x16 bl audio_play -_0809F3C4: +@0809F3C4: movs r0, 0x5 strh r0, [r5] -_0809F3C8: +@0809F3C8: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0809F404 + beq @0809F404 movs r0, 0x1 negs r0, r0 ldr r1, =0x0000ffff @@ -297750,18 +297750,18 @@ _0809F3C8: bl sub_80A1AD4 movs r0, 0x6 strh r0, [r5] -_0809F3EA: +@0809F3EA: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0809F404 + bne @0809F404 adds r0, r4, 0 bl remove_task bl Window_FreeMemory bl do_reset -_0809F404: +@0809F404: add sp, 0x4 pop {r4,r5} pop {r0} @@ -297771,7 +297771,7 @@ _0809F404: thumb_func_end sub_809F200 thumb_func_start sub_809F41C -sub_809F41C: @ 809F41C +sub_809F41C: ; 809F41C push {lr} ldr r0, =0x00000861 bl flag_set @@ -297787,60 +297787,60 @@ sub_809F41C: @ 809F41C thumb_func_end sub_809F41C thumb_func_start start_menu_compose -start_menu_compose: @ 809F440 +start_menu_compose: ; 809F440 push {lr} ldr r0, =0x0203760f movs r1, 0 strb r1, [r0] bl is_c1_link_related_active cmp r0, 0x1 - bne _0809F45C + bne @0809F45C bl sub_809F568 - b _0809F4AC + b @0809F4AC .align 2, 0 .pool -_0809F45C: +@0809F45C: bl in_trade_center cmp r0, 0x1 - bne _0809F46A + bne @0809F46A bl sub_809F5A4 - b _0809F4AC -_0809F46A: + b @0809F4AC +@0809F46A: bl flag_check_is_in_safari_zone cmp r0, 0x1 - bne _0809F478 + bne @0809F478 bl sub_809F538 - b _0809F4AC -_0809F478: + b @0809F4AC +@0809F478: bl sub_81A80A8 lsls r0, 24 cmp r0, 0 - beq _0809F488 + beq @0809F488 bl sub_809F5E0 - b _0809F4AC -_0809F488: + b @0809F4AC +@0809F488: bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - beq _0809F498 + beq @0809F498 bl sub_809F604 - b _0809F4AC -_0809F498: + b @0809F4AC +@0809F498: bl sub_813994C lsls r0, 24 cmp r0, 0 - beq _0809F4A8 + beq @0809F4A8 bl sub_809F634 - b _0809F4AC -_0809F4A8: + b @0809F4AC +@0809F4A8: bl sub_809F4CC -_0809F4AC: +@0809F4AC: pop {r0} bx r0 thumb_func_end start_menu_compose thumb_func_start sub_809F4B0 -sub_809F4B0: @ 809F4B0 +sub_809F4B0: ; 809F4B0 push {lr} adds r2, r0, 0 lsls r2, 24 @@ -297855,27 +297855,27 @@ sub_809F4B0: @ 809F4B0 thumb_func_end sub_809F4B0 thumb_func_start sub_809F4CC -sub_809F4CC: @ 809F4CC +sub_809F4CC: ; 809F4CC push {lr} ldr r0, =0x00000861 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809F4E2 + bne @0809F4E2 movs r0, 0 bl sub_809F4B0 -_0809F4E2: +@0809F4E2: movs r0, 0x86 lsls r0, 4 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809F4F8 + bne @0809F4F8 movs r0, 0x1 bl sub_809F4B0 -_0809F4F8: +@0809F4F8: movs r0, 0x2 bl sub_809F4B0 ldr r0, =0x00000862 @@ -297883,10 +297883,10 @@ _0809F4F8: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809F512 + bne @0809F512 movs r0, 0x3 bl sub_809F4B0 -_0809F512: +@0809F512: movs r0, 0x4 bl sub_809F4B0 movs r0, 0x5 @@ -297902,7 +297902,7 @@ _0809F512: thumb_func_end sub_809F4CC thumb_func_start sub_809F538 -sub_809F538: @ 809F538 +sub_809F538: ; 809F538 push {lr} movs r0, 0x8 bl sub_809F4B0 @@ -297923,7 +297923,7 @@ sub_809F538: @ 809F538 thumb_func_end sub_809F538 thumb_func_start sub_809F568 -sub_809F568: @ 809F568 +sub_809F568: ; 809F568 push {lr} movs r0, 0x1 bl sub_809F4B0 @@ -297934,10 +297934,10 @@ sub_809F568: @ 809F568 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809F58A + bne @0809F58A movs r0, 0x3 bl sub_809F4B0 -_0809F58A: +@0809F58A: movs r0, 0x9 bl sub_809F4B0 movs r0, 0x6 @@ -297951,7 +297951,7 @@ _0809F58A: thumb_func_end sub_809F568 thumb_func_start sub_809F5A4 -sub_809F5A4: @ 809F5A4 +sub_809F5A4: ; 809F5A4 push {lr} movs r0, 0x1 bl sub_809F4B0 @@ -297962,10 +297962,10 @@ sub_809F5A4: @ 809F5A4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809F5C6 + bne @0809F5C6 movs r0, 0x3 bl sub_809F4B0 -_0809F5C6: +@0809F5C6: movs r0, 0x4 bl sub_809F4B0 movs r0, 0x6 @@ -297979,7 +297979,7 @@ _0809F5C6: thumb_func_end sub_809F5A4 thumb_func_start sub_809F5E0 -sub_809F5E0: @ 809F5E0 +sub_809F5E0: ; 809F5E0 push {lr} movs r0, 0 bl sub_809F4B0 @@ -297996,7 +297996,7 @@ sub_809F5E0: @ 809F5E0 thumb_func_end sub_809F5E0 thumb_func_start sub_809F604 -sub_809F604: @ 809F604 +sub_809F604: ; 809F604 push {lr} movs r0, 0x1 bl sub_809F4B0 @@ -298017,7 +298017,7 @@ sub_809F604: @ 809F604 thumb_func_end sub_809F604 thumb_func_start sub_809F634 -sub_809F634: @ 809F634 +sub_809F634: ; 809F634 push {lr} movs r0, 0x1 bl sub_809F4B0 @@ -298032,7 +298032,7 @@ sub_809F634: @ 809F634 thumb_func_end sub_809F634 thumb_func_start sub_809F654 -sub_809F654: @ 809F654 +sub_809F654: ; 809F654 push {r4,r5,lr} sub sp, 0xC ldr r4, =0x0203760c @@ -298077,7 +298077,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 @@ -298086,16 +298086,16 @@ sub_809F6C8: @ 809F6C8 adds r0, r1 ldrh r0, [r0] cmp r0, 0x7 - bne _0809F6F0 + bne @0809F6F0 ldr r4, =0x0203760d ldr r0, =0x08510538 - b _0809F6F4 + b @0809F6F4 .align 2, 0 .pool -_0809F6F0: +@0809F6F0: ldr r4, =0x0203760d ldr r0, =0x08510530 -_0809F6F4: +@0809F6F4: bl Window_AddFromTemplate strb r0, [r4] ldr r4, =0x0203760d @@ -298142,11 +298142,11 @@ _0809F6F4: thumb_func_end sub_809F6C8 thumb_func_start sub_809F774 -sub_809F774: @ 809F774 +sub_809F774: ; 809F774 push {r4,lr} bl flag_check_is_in_safari_zone cmp r0, 0 - beq _0809F796 + beq @0809F796 ldr r4, =0x0203760c ldrb r0, [r4] movs r1, 0 @@ -298156,18 +298156,18 @@ sub_809F774: @ 809F774 bl Window_CopyToVram ldrb r0, [r4] bl Window_Remove -_0809F796: +@0809F796: bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - beq _0809F7B0 + beq @0809F7B0 ldr r4, =0x0203760d ldrb r0, [r4] movs r1, 0 bl sub_8198070 ldrb r0, [r4] bl Window_Remove -_0809F7B0: +@0809F7B0: pop {r4} pop {r0} bx r0 @@ -298176,7 +298176,7 @@ _0809F7B0: thumb_func_end sub_809F774 thumb_func_start sub_809F7C0 -sub_809F7C0: @ 809F7C0 +sub_809F7C0: ; 809F7C0 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -298190,7 +298190,7 @@ sub_809F7C0: @ 809F7C0 mov r9, r0 ldr r1, =0x02021fc4 mov r10, r1 -_0809F7DA: +@0809F7DA: ldr r0, =0x02037610 lsls r2, 24 asrs r4, r2, 24 @@ -298204,7 +298204,7 @@ _0809F7DA: ldr r0, =sub_809FC8C + 1 adds r7, r2, 0 cmp r1, r0 - bne _0809F828 + bne @0809F828 bl sub_8197A08 lsls r0, 24 lsrs r0, 24 @@ -298218,10 +298218,10 @@ _0809F7DA: lsrs r3, 16 movs r2, 0x8 bl sub_819A024 - b _0809F858 + b @0809F858 .align 2, 0 .pool -_0809F828: +@0809F828: mov r1, r9 adds r0, r3, r1 ldr r1, [r0] @@ -298243,7 +298243,7 @@ _0809F828: mov r2, r10 movs r3, 0x8 bl Print -_0809F858: +@0809F858: movs r0, 0x80 lsls r0, 17 adds r1, r7, r0 @@ -298252,21 +298252,21 @@ _0809F858: ldr r0, =0x0203760f ldrb r0, [r0] cmp r1, r0 - bge _0809F87C + bge @0809F87C subs r6, 0x1 cmp r6, 0 - bne _0809F7DA + bne @0809F7DA mov r1, r8 strb r2, [r1] movs r0, 0 - b _0809F882 + b @0809F882 .align 2, 0 .pool -_0809F87C: +@0809F87C: mov r0, r8 strb r2, [r0] movs r0, 0x1 -_0809F882: +@0809F882: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -298278,7 +298278,7 @@ _0809F882: thumb_func_end sub_809F7C0 thumb_func_start sub_809F894 -sub_809F894: @ 809F894 +sub_809F894: ; 809F894 push {r4,lr} sub sp, 0xC ldr r0, =0x02037619 @@ -298286,34 +298286,34 @@ sub_809F894: @ 809F894 ldrsb r1, [r0, r1] adds r2, r0, 0 cmp r1, 0x5 - bhi _0809F98C + bhi @0809F98C lsls r0, r1, 2 - ldr r1, =_0809F8B8 + ldr r1, =@0809F8B8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0809F8B8: - .4byte _0809F8D0 - .4byte _0809F8D8 - .4byte _0809F8E4 - .4byte _0809F90C - .4byte _0809F930 - .4byte _0809F94C -_0809F8D0: +@0809F8B8: + .4byte @0809F8D0 + .4byte @0809F8D8 + .4byte @0809F8E4 + .4byte @0809F90C + .4byte @0809F930 + .4byte @0809F94C +@0809F8D0: ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] - b _0809F98C -_0809F8D8: + b @0809F98C +@0809F8D8: bl start_menu_compose ldr r1, =0x02037619 - b _0809F940 + b @0809F940 .align 2, 0 .pool -_0809F8E4: +@0809F8E4: bl sub_81973A4 ldr r0, =0x0203760f ldrb r0, [r0] @@ -298325,41 +298325,41 @@ _0809F8E4: ldr r1, =0x02037619 movs r0, 0 strb r0, [r1, 0x1] - b _0809F940 + b @0809F940 .align 2, 0 .pool -_0809F90C: +@0809F90C: bl flag_check_is_in_safari_zone cmp r0, 0 - beq _0809F918 + beq @0809F918 bl sub_809F654 -_0809F918: +@0809F918: bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - beq _0809F926 + beq @0809F926 bl sub_809F6C8 -_0809F926: +@0809F926: ldr r1, =0x02037619 - b _0809F940 + b @0809F940 .align 2, 0 .pool -_0809F930: +@0809F930: ldr r4, =0x0203761a adds r0, r4, 0 movs r1, 0x2 bl sub_809F7C0 cmp r0, 0 - beq _0809F98C + beq @0809F98C subs r1, r4, 0x1 -_0809F940: +@0809F940: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0809F98C + b @0809F98C .align 2, 0 .pool -_0809F94C: +@0809F94C: bl sub_8197A08 lsls r0, 24 lsrs r0, 24 @@ -298382,12 +298382,12 @@ _0809F94C: movs r1, 0x1 bl Window_CopyToVram movs r0, 0x1 - b _0809F98E + b @0809F98E .align 2, 0 .pool -_0809F98C: +@0809F98C: movs r0, 0 -_0809F98E: +@0809F98E: add sp, 0xC pop {r4} pop {r1} @@ -298395,16 +298395,16 @@ _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 strb r0, [r1] strb r0, [r1, 0x1] -_0809F9A2: +@0809F9A2: bl sub_809F894 cmp r0, 0 - beq _0809F9A2 + beq @0809F9A2 pop {r0} bx r0 .align 2, 0 @@ -298412,23 +298412,23 @@ _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 bl sub_809F894 cmp r0, 0x1 - bne _0809F9C8 + bne @0809F9C8 adds r0, r4, 0 bl set_task_function_to_args_14_15 -_0809F9C8: +@0809F9C8: pop {r4} pop {r0} bx r0 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 @@ -298452,23 +298452,23 @@ 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 - beq _0809FA12 + beq @0809FA12 bl sub_80AF688 movs r0, 0x1 - b _0809FA14 -_0809FA12: + b @0809FA14 +@0809FA12: movs r0, 0 -_0809FA14: +@0809FA14: pop {r1} bx r1 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] @@ -298482,7 +298482,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 @@ -298494,38 +298494,38 @@ sub_809FA34: @ 809FA34 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - beq _0809FA58 + beq @0809FA58 cmp r0, 0x1 - beq _0809FA7C - b _0809FA92 + beq @0809FA7C + b @0809FA92 .align 2, 0 .pool -_0809FA58: +@0809FA58: bl in_trade_center cmp r0, 0x1 - bne _0809FA64 + bne @0809FA64 bl var_800D_set_xB -_0809FA64: +@0809FA64: ldr r1, =0x03005df4 ldr r0, =sub_809FAC4 + 1 str r0, [r1] ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0809FA92 + b @0809FA92 .align 2, 0 .pool -_0809FA7C: +@0809FA7C: ldr r0, =0x03005df4 ldr r0, [r0] bl _call_via_r0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0809FA92 + bne @0809FA92 adds r0, r5, 0 bl remove_task -_0809FA92: +@0809FA92: pop {r4,r5} pop {r0} bx r0 @@ -298534,15 +298534,15 @@ _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 - bne _0809FAB2 + bne @0809FAB2 bl player_bitmagic bl sub_808B864 bl sub_808BCF4 -_0809FAB2: +@0809FAB2: ldr r0, =sub_809FA34 + 1 bl sub_809F9D0 bl script_env_2_enable @@ -298553,14 +298553,14 @@ _0809FAB2: thumb_func_end sub_809FA9C thumb_func_start sub_809FAC4 -sub_809FAC4: @ 809FAC4 +sub_809FAC4: ; 809FAC4 push {r4,lr} ldr r4, =0x030022c0 ldrh r1, [r4, 0x2E] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0809FAE4 + beq @0809FAE4 movs r0, 0x5 bl audio_play movs r0, 0x1 @@ -298568,24 +298568,24 @@ sub_809FAC4: @ 809FAC4 bl MoveMenuCursor ldr r1, =0x0203760e strb r0, [r1] -_0809FAE4: +@0809FAE4: ldrh r1, [r4, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0809FAFE + beq @0809FAFE movs r0, 0x5 bl audio_play movs r0, 0x1 bl MoveMenuCursor ldr r1, =0x0203760e strb r0, [r1] -_0809FAFE: +@0809FAFE: ldrh r1, [r4, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0809FB98 + beq @0809FB98 movs r0, 0x5 bl audio_play ldr r1, =0x08510540 @@ -298600,13 +298600,13 @@ _0809FAFE: ldr r1, [r0] ldr r0, =sm_pokedex + 1 cmp r1, r0 - bne _0809FB34 + bne @0809FB34 movs r0, 0 bl pokedex_count lsls r0, 16 cmp r0, 0 - beq _0809FBA0 -_0809FB34: + beq @0809FBA0 +@0809FB34: ldr r3, =0x03005df4 ldr r1, =0x08510540 ldr r2, =0x02037610 @@ -298621,54 +298621,54 @@ _0809FB34: str r1, [r3] ldr r0, =sub_809FCFC + 1 cmp r1, r0 - beq _0809FBA0 + beq @0809FBA0 ldr r0, =sub_809FD64 + 1 cmp r1, r0 - beq _0809FBA0 + beq @0809FBA0 ldr r0, =sub_809FD74 + 1 cmp r1, r0 - beq _0809FBA0 + beq @0809FBA0 ldr r0, =sub_809FDC0 + 1 cmp r1, r0 - beq _0809FBA0 + beq @0809FBA0 movs r0, 0x1 movs r1, 0 bl fade_screen - b _0809FBA0 + b @0809FBA0 .align 2, 0 .pool -_0809FB98: +@0809FB98: movs r0, 0xA ands r0, r1 cmp r0, 0 - bne _0809FBA4 -_0809FBA0: + bne @0809FBA4 +@0809FBA0: movs r0, 0 - b _0809FBAE -_0809FBA4: + b @0809FBAE +@0809FBA4: bl sub_809F774 bl sub_80A0934 movs r0, 0x1 -_0809FBAE: +@0809FBAE: pop {r4} pop {r1} bx r1 thumb_func_end sub_809FAC4 thumb_func_start sm_pokedex -sm_pokedex: @ 809FBB4 +sm_pokedex: ; 809FBB4 push {lr} ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0809FBCC + beq @0809FBCC movs r0, 0 - b _0809FBE6 + b @0809FBE6 .align 2, 0 .pool -_0809FBCC: +@0809FBCC: movs r0, 0x29 bl sav12_xor_increment bl play_some_sound @@ -298677,7 +298677,7 @@ _0809FBCC: ldr r0, =sub_80BB534 + 1 bl set_callback2 movs r0, 0x1 -_0809FBE6: +@0809FBE6: pop {r1} bx r1 .align 2, 0 @@ -298685,26 +298685,26 @@ _0809FBE6: thumb_func_end sm_pokedex thumb_func_start sub_809FBF0 -sub_809FBF0: @ 809FBF0 +sub_809FBF0: ; 809FBF0 push {lr} ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0809FC08 + beq @0809FC08 movs r0, 0 - b _0809FC1C + b @0809FC1C .align 2, 0 .pool -_0809FC08: +@0809FC08: bl play_some_sound bl sub_809F774 bl overworld_free_bg_tilemaps ldr r0, =sub_81B7F34 + 1 bl set_callback2 movs r0, 0x1 -_0809FC1C: +@0809FC1C: pop {r1} bx r1 .align 2, 0 @@ -298712,26 +298712,26 @@ _0809FC1C: thumb_func_end sub_809FBF0 thumb_func_start sub_809FC24 -sub_809FC24: @ 809FC24 +sub_809FC24: ; 809FC24 push {lr} ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0809FC3C + beq @0809FC3C movs r0, 0 - b _0809FC50 + b @0809FC50 .align 2, 0 .pool -_0809FC3C: +@0809FC3C: bl play_some_sound bl sub_809F774 bl overworld_free_bg_tilemaps ldr r0, =c2_bag + 1 bl set_callback2 movs r0, 0x1 -_0809FC50: +@0809FC50: pop {r1} bx r1 .align 2, 0 @@ -298739,26 +298739,26 @@ _0809FC50: thumb_func_end sub_809FC24 thumb_func_start sub_809FC58 -sub_809FC58: @ 809FC58 +sub_809FC58: ; 809FC58 push {lr} ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0809FC70 + beq @0809FC70 movs r0, 0 - b _0809FC84 + b @0809FC84 .align 2, 0 .pool -_0809FC70: +@0809FC70: bl play_some_sound bl sub_809F774 bl overworld_free_bg_tilemaps ldr r0, =sub_81C7250 + 1 bl set_callback2 movs r0, 0x1 -_0809FC84: +@0809FC84: pop {r1} bx r1 .align 2, 0 @@ -298766,64 +298766,64 @@ _0809FC84: thumb_func_end sub_809FC58 thumb_func_start sub_809FC8C -sub_809FC8C: @ 809FC8C +sub_809FC8C: ; 809FC8C push {lr} ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0809FCF4 + bne @0809FCF4 bl play_some_sound bl sub_809F774 bl overworld_free_bg_tilemaps bl is_c1_link_related_active cmp r0, 0 - bne _0809FCB6 + bne @0809FCB6 bl in_trade_center cmp r0, 0 - beq _0809FCC8 -_0809FCB6: + beq @0809FCC8 +@0809FCB6: ldr r0, =sub_8086194 + 1 bl sub_80C4DDC - b _0809FCEA + b @0809FCEA .align 2, 0 .pool -_0809FCC8: +@0809FCC8: ldr r0, =0x000008d2 bl flag_check lsls r0, 24 cmp r0, 0 - beq _0809FCE4 + beq @0809FCE4 ldr r0, =sub_8086194 + 1 bl sub_80C51C4 - b _0809FCEA + b @0809FCEA .align 2, 0 .pool -_0809FCE4: +@0809FCE4: ldr r0, =sub_8086194 + 1 bl sub_80C4DDC -_0809FCEA: +@0809FCEA: movs r0, 0x1 - b _0809FCF6 + b @0809FCF6 .align 2, 0 .pool -_0809FCF4: +@0809FCF4: movs r0, 0 -_0809FCF6: +@0809FCF6: pop {r1} bx r1 thumb_func_end sub_809FC8C thumb_func_start sub_809FCFC -sub_809FCFC: @ 809FCFC +sub_809FCFC: ; 809FCFC push {lr} bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - beq _0809FD0C + beq @0809FD0C bl sub_809F774 -_0809FD0C: +@0809FD0C: ldr r1, =0x03005df4 ldr r0, =sub_809FE28 + 1 str r0, [r1] @@ -298835,19 +298835,19 @@ _0809FD0C: thumb_func_end sub_809FCFC thumb_func_start sub_809FD20 -sub_809FD20: @ 809FD20 +sub_809FD20: ; 809FD20 push {lr} ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0809FD38 + beq @0809FD38 movs r0, 0 - b _0809FD52 + b @0809FD52 .align 2, 0 .pool -_0809FD38: +@0809FD38: bl play_some_sound bl sub_809F774 bl overworld_free_bg_tilemaps @@ -298857,7 +298857,7 @@ _0809FD38: ldr r0, =sub_8086194 + 1 str r0, [r1, 0x8] movs r0, 0x1 -_0809FD52: +@0809FD52: pop {r1} bx r1 .align 2, 0 @@ -298865,7 +298865,7 @@ _0809FD52: thumb_func_end sub_809FD20 thumb_func_start sub_809FD64 -sub_809FD64: @ 809FD64 +sub_809FD64: ; 809FD64 push {lr} bl sub_809F774 bl sub_80A0934 @@ -298875,7 +298875,7 @@ sub_809FD64: @ 809FD64 thumb_func_end sub_809FD64 thumb_func_start sub_809FD74 -sub_809FD74: @ 809FD74 +sub_809FD74: ; 809FD74 push {lr} bl sub_809F774 bl sub_80A0934 @@ -298886,19 +298886,19 @@ sub_809FD74: @ 809FD74 thumb_func_end sub_809FD74 thumb_func_start sub_809FD88 -sub_809FD88: @ 809FD88 +sub_809FD88: ; 809FD88 push {lr} ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0809FDA0 + beq @0809FDA0 movs r0, 0 - b _0809FDB4 + b @0809FDB4 .align 2, 0 .pool -_0809FDA0: +@0809FDA0: bl play_some_sound bl overworld_free_bg_tilemaps ldr r0, =0x03005db4 @@ -298906,7 +298906,7 @@ _0809FDA0: ldr r1, =sub_8086194 + 1 bl sub_80C4E74 movs r0, 0x1 -_0809FDB4: +@0809FDB4: pop {r1} bx r1 .align 2, 0 @@ -298914,7 +298914,7 @@ _0809FDB4: thumb_func_end sub_809FD88 thumb_func_start sub_809FDC0 -sub_809FDC0: @ 809FDC0 +sub_809FDC0: ; 809FDC0 ldr r1, =0x03005df4 ldr r0, =sub_809FE9C + 1 str r0, [r1] @@ -298925,7 +298925,7 @@ sub_809FDC0: @ 809FDC0 thumb_func_end sub_809FDC0 thumb_func_start atk17_seteffectuser -atk17_seteffectuser: @ 809FDD4 +atk17_seteffectuser: ; 809FDD4 push {lr} movs r0, 0 movs r1, 0 @@ -298941,26 +298941,26 @@ atk17_seteffectuser: @ 809FDD4 thumb_func_end atk17_seteffectuser thumb_func_start sub_809FDF4 -sub_809FDF4: @ 809FDF4 +sub_809FDF4: ; 809FDF4 push {lr} ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0809FE0C + beq @0809FE0C movs r0, 0 - b _0809FE20 + b @0809FE20 .align 2, 0 .pool -_0809FE0C: +@0809FE0C: bl play_some_sound bl sub_809F774 bl overworld_free_bg_tilemaps ldr r0, =sub_81C4EFC + 1 bl set_callback2 movs r0, 0x1 -_0809FE20: +@0809FE20: pop {r1} bx r1 .align 2, 0 @@ -298968,7 +298968,7 @@ _0809FE20: thumb_func_end sub_809FDF4 thumb_func_start sub_809FE28 -sub_809FE28: @ 809FE28 +sub_809FE28: ; 809FE28 push {lr} bl sub_809FF28 ldr r1, =0x03005df4 @@ -298982,21 +298982,21 @@ 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 lsrs r0, 24 cmp r0, 0x1 - beq _0809FE7C + beq @0809FE7C cmp r0, 0x1 - ble _0809FE94 + ble @0809FE94 cmp r0, 0x2 - beq _0809FE60 + beq @0809FE60 cmp r0, 0x3 - beq _0809FE7C - b _0809FE94 -_0809FE60: + beq @0809FE7C + b @0809FE94 +@0809FE60: movs r0, 0 movs r1, 0 bl sub_8197DF8 @@ -299004,10 +299004,10 @@ _0809FE60: ldr r1, =0x03005df4 ldr r0, =sub_809FAC4 + 1 str r0, [r1] - b _0809FE94 + b @0809FE94 .align 2, 0 .pool -_0809FE7C: +@0809FE7C: movs r0, 0 movs r1, 0x1 bl sub_8197DF8 @@ -299015,16 +299015,16 @@ _0809FE7C: bl script_env_2_disable bl sub_81A9EC8 movs r0, 0x1 - b _0809FE96 -_0809FE94: + b @0809FE96 +@0809FE94: movs r0, 0 -_0809FE96: +@0809FE96: pop {r1} bx r1 thumb_func_end sub_809FE44 thumb_func_start sub_809FE9C -sub_809FE9C: @ 809FE9C +sub_809FE9C: ; 809FE9C push {lr} bl sub_80A0340 ldr r1, =0x03005df4 @@ -299038,7 +299038,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 @@ -299052,27 +299052,27 @@ 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 lsrs r0, 24 cmp r0, 0x1 - beq _0809FEEC + beq @0809FEEC cmp r0, 0x1 - ble _0809FF20 + ble @0809FF20 cmp r0, 0x2 - beq _0809FF00 - b _0809FF20 -_0809FEEC: + beq @0809FF00 + b @0809FF20 +@0809FEEC: bl sub_809F774 ldr r1, =0x03005df4 ldr r0, =sub_809FEB8 + 1 str r0, [r1] - b _0809FF20 + b @0809FF20 .align 2, 0 .pool -_0809FF00: +@0809FF00: movs r0, 0 movs r1, 0x1 bl sub_8197DF8 @@ -299081,18 +299081,18 @@ _0809FF00: ldr r0, =0x08252c88 bl script_env_1_execute_new_script movs r0, 0x1 - b _0809FF22 + b @0809FF22 .align 2, 0 .pool -_0809FF20: +@0809FF20: movs r0, 0 -_0809FF22: +@0809FF22: pop {r1} bx r1 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 @@ -299108,13 +299108,13 @@ 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 lsrs r0, 16 cmp r0, 0x1 - beq _0809FF78 + beq @0809FF78 ldr r1, =0x02037621 movs r0, 0 strb r0, [r1] @@ -299123,18 +299123,18 @@ sub_809FF4C: @ 809FF4C bl _call_via_r0 lsls r0, 24 lsrs r0, 24 - b _0809FF7A + b @0809FF7A .align 2, 0 .pool -_0809FF78: +@0809FF78: movs r0, 0 -_0809FF7A: +@0809FF7A: pop {r1} bx r1 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 + 1 @@ -299147,7 +299147,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 @@ -299172,7 +299172,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 @@ -299180,29 +299180,29 @@ task50_save_game: @ 809FFD0 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x1 - beq _0809FFFC + beq @0809FFFC cmp r1, 0x1 - bgt _0809FFEC + bgt @0809FFEC cmp r1, 0 - beq _080A000A - b _080A0000 -_0809FFEC: + beq @080A000A + b @080A0000 +@0809FFEC: cmp r1, 0x3 - bgt _080A0000 + bgt @080A0000 ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - b _080A0000 + b @080A0000 .align 2, 0 .pool -_0809FFFC: +@0809FFFC: ldr r0, =0x020375f0 strh r1, [r0] -_080A0000: +@080A0000: adds r0, r4, 0 bl remove_task bl script_env_2_enable_and_set_ctx_running -_080A000A: +@080A000A: pop {r4} pop {r0} bx r0 @@ -299211,7 +299211,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 @@ -299221,7 +299221,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} @@ -299229,7 +299229,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] @@ -299239,7 +299239,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] @@ -299250,53 +299250,53 @@ sub_80A003C: @ 80A003C movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080A0064 + bne @080A0064 lsls r0, r2, 24 cmp r0, 0 - beq _080A006A + beq @080A006A movs r0, 0 - b _080A006C + b @080A006C .align 2, 0 .pool -_080A0064: +@080A0064: movs r0, 0x5 bl audio_play -_080A006A: +@080A006A: movs r0, 0x1 -_080A006C: +@080A006C: pop {r1} bx r1 thumb_func_end sub_80A003C thumb_func_start sub_80A0070 -sub_80A0070: @ 80A0070 +sub_80A0070: ; 80A0070 push {lr} ldr r1, =0x02037620 ldrb r0, [r1] cmp r0, 0 - bne _080A0094 + bne @080A0094 ldr r0, =0x030022c0 ldrh r1, [r0, 0x2C] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080A0098 + beq @080A0098 movs r0, 0x1 - b _080A009A + b @080A009A .align 2, 0 .pool -_080A0094: +@080A0094: subs r0, 0x1 strb r0, [r1] -_080A0098: +@080A0098: movs r0, 0 -_080A009A: +@080A009A: pop {r1} bx r1 thumb_func_end sub_80A0070 thumb_func_start sub_80A00A0 -sub_80A00A0: @ 80A00A0 +sub_80A00A0: ; 80A00A0 push {lr} bl sub_8197A08 lsls r0, 24 @@ -299308,18 +299308,18 @@ sub_80A00A0: @ 80A00A0 bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - beq _080A00D4 + beq @080A00D4 ldr r0, =0x08252ca7 ldr r1, =sub_80A00EC + 1 bl sub_809FF98 - b _080A00DC + b @080A00DC .align 2, 0 .pool -_080A00D4: +@080A00D4: ldr r0, =0x082c87b4 ldr r1, =sub_80A00EC + 1 bl sub_809FF98 -_080A00DC: +@080A00DC: movs r0, 0 pop {r1} bx r1 @@ -299328,7 +299328,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 @@ -299342,80 +299342,80 @@ 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 asrs r1, r0, 24 cmp r1, 0 - beq _080A012A + beq @080A012A cmp r1, 0 - bgt _080A0124 + bgt @080A0124 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _080A0168 - b _080A0174 -_080A0124: + beq @080A0168 + b @080A0174 +@080A0124: cmp r1, 0x1 - beq _080A0168 - b _080A0174 -_080A012A: + beq @080A0168 + b @080A0174 +@080A012A: ldr r0, =0x03006210 ldrh r0, [r0] cmp r0, 0 - beq _080A0136 + beq @080A0136 cmp r0, 0x2 - bne _080A013E -_080A0136: + bne @080A013E +@080A0136: ldr r0, =0x020322d4 ldrb r0, [r0] cmp r0, 0 - bne _080A0158 -_080A013E: + bne @080A0158 +@080A013E: ldr r1, =0x0203761c ldr r0, =sub_80A017C + 1 str r0, [r1] - b _080A0174 + b @080A0174 .align 2, 0 .pool -_080A0158: +@080A0158: ldr r1, =0x0203761c ldr r0, =sub_80A0234 + 1 str r0, [r1] - b _080A0174 + b @080A0174 .align 2, 0 .pool -_080A0168: +@080A0168: bl sub_80A0024 bl sub_80A0014 movs r0, 0x2 - b _080A0176 -_080A0174: + b @080A0176 +@080A0174: movs r0, 0 -_080A0176: +@080A0176: pop {r1} bx r1 thumb_func_end sub_80A0108 thumb_func_start sub_80A017C -sub_80A017C: @ 80A017C +sub_80A017C: ; 80A017C push {lr} ldr r0, =0x020322d4 ldrb r0, [r0] cmp r0, 0x1 - bne _080A019C + bne @080A019C ldr r0, =0x082c8845 ldr r1, =sub_80A01B4 + 1 bl sub_809FF98 - b _080A01A4 + b @080A01A4 .align 2, 0 .pool -_080A019C: +@080A019C: ldr r0, =0x082c87d5 ldr r1, =sub_80A01D0 + 1 bl sub_809FF98 -_080A01A4: +@080A01A4: movs r0, 0 pop {r1} bx r1 @@ -299424,7 +299424,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 @@ -299439,7 +299439,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 @@ -299453,45 +299453,45 @@ 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 asrs r1, r0, 24 cmp r1, 0 - beq _080A020E + beq @080A020E cmp r1, 0 - bgt _080A0208 + bgt @080A0208 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _080A0220 - b _080A022C -_080A0208: + beq @080A0220 + b @080A022C +@080A0208: cmp r1, 0x1 - beq _080A0220 - b _080A022C -_080A020E: + beq @080A0220 + b @080A022C +@080A020E: ldr r1, =0x0203761c ldr r0, =sub_80A0234 + 1 str r0, [r1] - b _080A022C + b @080A022C .align 2, 0 .pool -_080A0220: +@080A0220: bl sub_80A0024 bl sub_80A0014 movs r0, 0x2 - b _080A022E -_080A022C: + b @080A022E +@080A022C: movs r0, 0 -_080A022E: +@080A022E: pop {r1} bx r1 thumb_func_end sub_80A01EC thumb_func_start sub_80A0234 -sub_80A0234: @ 80A0234 +sub_80A0234: ; 80A0234 push {lr} ldr r0, =0x082c8810 ldr r1, =sub_80A024C + 1 @@ -299504,7 +299504,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 @@ -299512,35 +299512,35 @@ sub_80A024C: @ 80A024C ldr r4, =0x020322d4 ldrb r0, [r4] cmp r0, 0x1 - bne _080A0274 + bne @080A0274 movs r0, 0x4 bl save_game_when_memory_present lsls r0, 24 lsrs r1, r0, 24 movs r0, 0 strb r0, [r4] - b _080A027E + b @080A027E .align 2, 0 .pool -_080A0274: +@080A0274: movs r0, 0 bl save_game_when_memory_present lsls r0, 24 lsrs r1, r0, 24 -_080A027E: +@080A027E: cmp r1, 0x1 - bne _080A0294 + bne @080A0294 ldr r0, =0x082c8832 ldr r1, =sub_80A02B0 + 1 bl sub_809FF98 - b _080A029C + b @080A029C .align 2, 0 .pool -_080A0294: +@080A0294: ldr r0, =0x082c892a ldr r1, =sub_80A02FC + 1 bl sub_809FF98 -_080A029C: +@080A029C: bl sub_80A0030 movs r0, 0 pop {r4} @@ -299551,19 +299551,19 @@ _080A029C: thumb_func_end sub_80A024C thumb_func_start sub_80A02B0 -sub_80A02B0: @ 80A02B0 +sub_80A02B0: ; 80A02B0 push {lr} movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _080A02CA + bne @080A02CA movs r0, 0x37 bl audio_play ldr r1, =0x0203761c ldr r0, =sub_80A02D8 + 1 str r0, [r1] -_080A02CA: +@080A02CA: movs r0, 0 pop {r1} bx r1 @@ -299572,40 +299572,40 @@ _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 cmp r0, 0 - bne _080A02F6 + bne @080A02F6 bl sub_80A003C lsls r0, 24 cmp r0, 0 - beq _080A02F6 + beq @080A02F6 bl sub_80A0024 movs r0, 0x1 - b _080A02F8 -_080A02F6: + b @080A02F8 +@080A02F6: movs r0, 0 -_080A02F8: +@080A02F8: pop {r1} bx r1 thumb_func_end sub_80A02D8 thumb_func_start sub_80A02FC -sub_80A02FC: @ 80A02FC +sub_80A02FC: ; 80A02FC push {lr} movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _080A0316 + bne @080A0316 movs r0, 0x16 bl audio_play ldr r1, =0x0203761c ldr r0, =sub_80A0324 + 1 str r0, [r1] -_080A0316: +@080A0316: movs r0, 0 pop {r1} bx r1 @@ -299614,24 +299614,24 @@ _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 cmp r0, 0 - beq _080A0338 + beq @080A0338 bl sub_80A0024 movs r0, 0x3 - b _080A033A -_080A0338: + b @080A033A +@080A0338: movs r0, 0 -_080A033A: +@080A033A: pop {r1} bx r1 thumb_func_end sub_80A0324 thumb_func_start sub_80A0340 -sub_80A0340: @ 80A0340 +sub_80A0340: ; 80A0340 ldr r1, =0x0203761c ldr r0, =sub_80A035C + 1 str r0, [r1] @@ -299644,7 +299644,7 @@ sub_80A0340: @ 80A0340 thumb_func_end sub_80A0340 thumb_func_start sub_80A035C -sub_80A035C: @ 80A035C +sub_80A035C: ; 80A035C push {lr} bl sub_8197A08 lsls r0, 24 @@ -299663,7 +299663,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 @@ -299678,40 +299678,40 @@ 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 asrs r1, r0, 24 cmp r1, 0 - beq _080A03C6 + beq @080A03C6 cmp r1, 0 - bgt _080A03C0 + bgt @080A03C0 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _080A03CA - b _080A03D2 -_080A03C0: + beq @080A03CA + b @080A03D2 +@080A03C0: cmp r1, 0x1 - beq _080A03CA - b _080A03D2 -_080A03C6: + beq @080A03CA + b @080A03D2 +@080A03C6: movs r0, 0x2 - b _080A03D4 -_080A03CA: + b @080A03D4 +@080A03CA: bl sub_80A0014 movs r0, 0x1 - b _080A03D4 -_080A03D2: + b @080A03D4 +@080A03D2: movs r0, 0 -_080A03D4: +@080A03D4: pop {r1} bx r1 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} @@ -299719,7 +299719,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} @@ -299727,24 +299727,24 @@ sub_80A03E4: @ 80A03E4 mov r8, r0 ldrb r0, [r0] cmp r0, 0x4 - bls _080A03F6 - b _080A04FC -_080A03F6: + bls @080A03F6 + b @080A04FC +@080A03F6: lsls r0, 2 - ldr r1, =_080A0404 + ldr r1, =@080A0404 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080A0404: - .4byte _080A0418 - .4byte _080A0490 - .4byte _080A04A2 - .4byte _080A04D4 - .4byte _080A04F8 -_080A0418: +@080A0404: + .4byte @080A0418 + .4byte @080A0490 + .4byte @080A04A2 + .4byte @080A04D4 + .4byte @080A04F8 +@080A0418: movs r0, 0 movs r1, 0 bl lcd_io_set @@ -299775,7 +299775,7 @@ _080A0418: movs r0, 0x81 lsls r0, 24 mov r12, r0 -_080A045A: +@080A045A: strh r6, [r4] mov r0, sp str r0, [r1] @@ -299785,7 +299785,7 @@ _080A045A: adds r2, r5 subs r3, r5 cmp r3, r5 - bhi _080A045A + bhi @080A045A strh r6, [r4] mov r0, sp str r0, [r1] @@ -299795,16 +299795,16 @@ _080A045A: orrs r0, r2 str r0, [r1, 0x8] ldr r0, [r1, 0x8] - b _080A04FC + b @080A04FC .align 2, 0 .pool -_080A0490: +@080A0490: bl reset_all_obj_data bl clear_tasks bl sub_80A1A74 bl dp12_8087EA4 - b _080A04FC -_080A04A2: + b @080A04FC +@080A04A2: movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags ldr r1, =0x085105a8 @@ -299819,10 +299819,10 @@ _080A04A2: bl box_border_load_tiles_and_pal movs r0, 0xF0 bl sub_81978B0 - b _080A04FC + b @080A04FC .align 2, 0 .pool -_080A04D4: +@080A04D4: movs r0, 0 bl gpu_sync_bg_show movs r0, 0x1 @@ -299834,19 +299834,19 @@ _080A04D4: bl SetVBlankCallback movs r0, 0x1 bl enable_irqs - b _080A04FC + b @080A04FC .align 2, 0 .pool -_080A04F8: +@080A04F8: movs r0, 0x1 - b _080A0506 -_080A04FC: + b @080A0506 +@080A04FC: mov r1, r8 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] movs r0, 0 -_080A0506: +@080A0506: add sp, 0x4 pop {r3} mov r8, r3 @@ -299856,18 +299856,18 @@ _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 cmp r0, 0 - beq _080A052E + beq @080A052E ldr r0, =sub_80A0550 + 1 movs r1, 0x50 bl AddTask ldr r0, =sub_80A0540 + 1 bl set_callback2 -_080A052E: +@080A052E: pop {r0} bx r0 .align 2, 0 @@ -299875,7 +299875,7 @@ _080A052E: thumb_func_end sub_80A0514 thumb_func_start sub_80A0540 -sub_80A0540: @ 80A0540 +sub_80A0540: ; 80A0540 push {lr} bl run_active_tasks bl fade_and_return_progress_probably @@ -299884,7 +299884,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 @@ -299899,32 +299899,32 @@ sub_80A0550: @ 80A0550 movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080A0570 - b _080A06A8 -_080A0570: + beq @080A0570 + b @080A06A8 +@080A0570: movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0x6 - bls _080A057A - b _080A06A8 -_080A057A: + bls @080A057A + b @080A06A8 +@080A057A: lsls r0, 2 - ldr r1, =_080A0590 + ldr r1, =@080A0590 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080A0590: - .4byte _080A05AC - .4byte _080A0630 - .4byte _080A063C - .4byte _080A065C - .4byte _080A0670 - .4byte _080A0688 - .4byte _080A0698 -_080A05AC: +@080A0590: + .4byte @080A05AC + .4byte @080A0630 + .4byte @080A063C + .4byte @080A065C + .4byte @080A0670 + .4byte @080A0688 + .4byte @080A0698 +@080A05AC: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels @@ -299960,48 +299960,48 @@ _080A05AC: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _080A0620 + beq @080A0620 bl in_trade_center cmp r0, 0 - beq _080A0620 + beq @080A0620 bl sub_800A07C cmp r0, 0 - beq _080A061C + beq @080A061C strh r6, [r5] - b _080A06A8 + b @080A06A8 .align 2, 0 .pool -_080A061C: +@080A061C: movs r0, 0x5 - b _080A06A6 -_080A0620: + b @080A06A6 +@080A0620: ldr r0, =0x03002700 movs r1, 0x1 strb r1, [r0] movs r0, 0x1 - b _080A06A6 + b @080A06A6 .align 2, 0 .pool -_080A0630: +@080A0630: bl sub_8076D5C bl sub_8153430 movs r0, 0x2 - b _080A06A6 -_080A063C: + b @080A06A6 +@080A063C: bl sub_8153474 lsls r0, 24 cmp r0, 0 - beq _080A06A8 + beq @080A06A8 bl sav2_gender2_inplace_and_xFE movs r0, 0x3 strh r0, [r5] ldr r1, =0x03002700 movs r0, 0 strb r0, [r1] - b _080A06A8 + b @080A06A8 .align 2, 0 .pool -_080A065C: +@080A065C: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -300010,35 +300010,35 @@ _080A065C: movs r3, 0x10 bl sub_80A1AD4 movs r0, 0x4 - b _080A06A6 -_080A0670: + b @080A06A6 +@080A0670: bl Window_FreeMemory ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 adds r0, r4, 0 bl remove_task - b _080A06A8 + b @080A06A8 .align 2, 0 .pool -_080A0688: +@080A0688: ldr r0, =sub_8153688 + 1 movs r1, 0x5 bl AddTask movs r0, 0x6 - b _080A06A6 + b @080A06A6 .align 2, 0 .pool -_080A0698: +@080A0698: ldr r0, =sub_8153688 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _080A06A8 + bne @080A06A8 movs r0, 0x3 -_080A06A6: +@080A06A6: strh r0, [r5] -_080A06A8: +@080A06A8: add sp, 0x10 pop {r4-r6} pop {r0} @@ -300048,7 +300048,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 @@ -300065,7 +300065,7 @@ sub_80A06B4: @ 80A06B4 bl flag_check lsls r0, 24 cmp r0, 0 - bne _080A06EC + bne @080A06EC add r0, sp, 0xC ldrb r1, [r0, 0x4] subs r1, 0x2 @@ -300076,7 +300076,7 @@ sub_80A06B4: @ 80A06B4 ands r0, r2 orrs r0, r1 str r0, [sp, 0x10] -_080A06EC: +@080A06EC: ldr r6, =0x02037622 add r0, sp, 0xC bl Window_AddFromTemplate @@ -300090,10 +300090,10 @@ _080A06EC: movs r1, 0x4 mov r9, r1 cmp r0, 0 - bne _080A0710 + bne @080A0710 movs r0, 0x8 mov r9, r0 -_080A0710: +@080A0710: movs r4, 0x1 ldr r5, =0x02021fc4 movs r0, 0x3 @@ -300170,7 +300170,7 @@ _080A0710: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080A0802 + bne @080A0802 movs r4, 0x31 ldrb r0, [r6] ldr r2, =0x085eed34 @@ -300200,7 +300200,7 @@ _080A0710: movs r1, 0x1 adds r2, r5, 0 bl Print -_080A0802: +@080A0802: adds r4, 0x10 ldrb r0, [r6] ldr r2, =0x085eed3c @@ -300248,7 +300248,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] @@ -300264,7 +300264,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 @@ -300272,11 +300272,11 @@ sub_80A08A4: @ 80A08A4 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _080A08C0 + bne @080A08C0 adds r0, r4, 0 bl remove_task bl script_env_2_enable_and_set_ctx_running -_080A08C0: +@080A08C0: pop {r4} pop {r0} bx r0 @@ -300285,7 +300285,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 + 1 movs r1, 0x5 @@ -300318,7 +300318,7 @@ sub_80A08CC: @ 80A08CC thumb_func_end sub_80A08CC thumb_func_start sub_80A0914 -sub_80A0914: @ 80A0914 +sub_80A0914: ; 80A0914 push {lr} bl sub_8197A08 lsls r0, 24 @@ -300333,7 +300333,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 @@ -300343,7 +300343,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] @@ -300354,8 +300354,8 @@ append_byte: @ 80A0944 thumb_func_end append_byte 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 @@ -300375,7 +300375,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 @@ -300384,7 +300384,7 @@ sub_80A0980: @ 80A0980 ldr r3, =0x03000f34 ldrb r0, [r3] cmp r0, 0x13 - bhi _080A09C0 + bhi @080A09C0 ldr r2, =0x02037624 adds r1, r0, 0 lsls r0, r1, 1 @@ -300408,7 +300408,7 @@ sub_80A0980: @ 80A0980 ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] -_080A09C0: +@080A09C0: pop {r4-r6} pop {r0} bx r0 @@ -300417,19 +300417,19 @@ _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 adds r6, r4, 0 ldrb r0, [r4] cmp r3, r0 - bge _080A0A02 + bge @080A0A02 ldr r2, =0x040000d4 ldr r1, =0x02037624 movs r5, 0x80 lsls r5, 24 -_080A09E6: +@080A09E6: ldr r0, [r1] str r0, [r2] ldr r0, [r1, 0x4] @@ -300443,8 +300443,8 @@ _080A09E6: adds r3, 0x1 ldrb r0, [r4] cmp r3, r0 - blt _080A09E6 -_080A0A02: + blt @080A09E6 +@080A0A02: movs r0, 0 strb r0, [r6] pop {r4-r6} @@ -300455,7 +300455,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 @@ -300465,7 +300465,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} @@ -300473,7 +300473,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 @@ -300485,10 +300485,10 @@ sub_80A0A38: @ 80A0A38 lsrs r0, 16 ldrh r1, [r1] cmp r0, r1 - bcc _080A0A56 + bcc @080A0A56 movs r0, 0 strh r0, [r2] -_080A0A56: +@080A0A56: ldr r4, =0x03000f3a ldrh r0, [r4] adds r0, 0x1 @@ -300498,24 +300498,24 @@ _080A0A56: lsrs r0, 16 ldrh r1, [r1] cmp r0, r1 - bcc _080A0A6E + bcc @080A0A6E movs r0, 0 strh r0, [r4] -_080A0A6E: +@080A0A6E: ldr r0, =0x03000f40 ldr r1, [r0] cmp r1, 0 - beq _080A0A7C + beq @080A0A7C ldrh r0, [r2] bl _call_via_r1 -_080A0A7C: +@080A0A7C: ldr r0, =0x03000f44 ldr r1, [r0] cmp r1, 0 - beq _080A0A8A + beq @080A0A8A ldrh r0, [r4] bl _call_via_r1 -_080A0A8A: +@080A0A8A: pop {r4} pop {r0} bx r0 @@ -300524,7 +300524,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 @@ -300538,12 +300538,12 @@ cur_mapheader_run_tileset1_func: @ 80A0AA8 ldr r0, [r0] ldr r0, [r0, 0x10] cmp r0, 0 - beq _080A0ACE + beq @080A0ACE ldr r0, [r0, 0x14] cmp r0, 0 - beq _080A0ACE + beq @080A0ACE bl _call_via_r0 -_080A0ACE: +@080A0ACE: pop {r0} bx r0 .align 2, 0 @@ -300551,7 +300551,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 @@ -300565,12 +300565,12 @@ cur_mapheader_run_tileset2_func: @ 80A0AE4 ldr r0, [r0] ldr r0, [r0, 0x14] cmp r0, 0 - beq _080A0B0A + beq @080A0B0A ldr r0, [r0, 0x14] cmp r0, 0 - beq _080A0B0A + beq @080A0B0A bl _call_via_r0 -_080A0B0A: +@080A0B0A: pop {r0} bx r0 .align 2, 0 @@ -300578,7 +300578,7 @@ _080A0B0A: thumb_func_end cur_mapheader_run_tileset2_func thumb_func_start sub_80A0B20 -sub_80A0B20: @ 80A0B20 +sub_80A0B20: ; 80A0B20 ldr r1, =0x03000f36 movs r0, 0 strh r0, [r1] @@ -300596,7 +300596,7 @@ sub_80A0B20: @ 80A0B20 thumb_func_end sub_80A0B20 thumb_func_start sub_80A0B48 -sub_80A0B48: @ 80A0B48 +sub_80A0B48: ; 80A0B48 ldr r1, =0x03000f36 movs r0, 0 strh r0, [r1] @@ -300614,7 +300614,7 @@ sub_80A0B48: @ 80A0B48 thumb_func_end sub_80A0B48 thumb_func_start sub_80A0B70 -sub_80A0B70: @ 80A0B70 +sub_80A0B70: ; 80A0B70 push {r4,r5,lr} lsls r5, r0, 16 movs r0, 0xF0 @@ -300622,53 +300622,53 @@ sub_80A0B70: @ 80A0B70 ands r0, r5 lsrs r4, r0, 16 cmp r4, 0 - bne _080A0B86 + bne @080A0B86 lsrs r0, r5, 20 bl sub_80A0BCC -_080A0B86: +@080A0B86: cmp r4, 0x1 - bne _080A0B90 + bne @080A0B90 lsrs r0, r5, 20 bl sub_80A0BF4 -_080A0B90: +@080A0B90: cmp r4, 0x2 - bne _080A0B9A + bne @080A0B9A lsrs r0, r5, 20 bl sub_80A0C1C -_080A0B9A: +@080A0B9A: cmp r4, 0x3 - bne _080A0BA4 + bne @080A0BA4 lsrs r0, r5, 20 bl sub_80A0C44 -_080A0BA4: +@080A0BA4: cmp r4, 0x4 - bne _080A0BAE + bne @080A0BAE lsrs r0, r5, 20 bl sub_80A12AC -_080A0BAE: +@080A0BAE: pop {r4,r5} pop {r0} bx r0 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 lsls r0, 11 ands r0, r1 cmp r0, 0 - bne _080A0BC8 + bne @080A0BC8 lsrs r0, r1, 19 bl sub_80A1688 -_080A0BC8: +@080A0BC8: pop {r0} bx r0 thumb_func_end sub_80A0BB4 thumb_func_start sub_80A0BCC -sub_80A0BCC: @ 80A0BCC +sub_80A0BCC: ; 80A0BCC push {lr} lsls r0, 16 movs r1, 0xC0 @@ -300688,7 +300688,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 @@ -300709,7 +300709,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 @@ -300730,7 +300730,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 @@ -300750,7 +300750,7 @@ sub_80A0C44: @ 80A0C44 thumb_func_end sub_80A0C44 thumb_func_start sub_80A0C6C -sub_80A0C6C: @ 80A0C6C +sub_80A0C6C: ; 80A0C6C ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] @@ -300767,7 +300767,7 @@ sub_80A0C6C: @ 80A0C6C thumb_func_end sub_80A0C6C thumb_func_start sub_80A0C94 -sub_80A0C94: @ 80A0C94 +sub_80A0C94: ; 80A0C94 ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] @@ -300784,7 +300784,7 @@ sub_80A0C94: @ 80A0C94 thumb_func_end sub_80A0C94 thumb_func_start sub_80A0CC0 -sub_80A0CC0: @ 80A0CC0 +sub_80A0CC0: ; 80A0CC0 ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] @@ -300801,7 +300801,7 @@ sub_80A0CC0: @ 80A0CC0 thumb_func_end sub_80A0CC0 thumb_func_start sub_80A0CEC -sub_80A0CEC: @ 80A0CEC +sub_80A0CEC: ; 80A0CEC ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] @@ -300818,7 +300818,7 @@ sub_80A0CEC: @ 80A0CEC thumb_func_end sub_80A0CEC thumb_func_start sub_80A0D18 -sub_80A0D18: @ 80A0D18 +sub_80A0D18: ; 80A0D18 ldr r1, =0x03000f3a ldr r0, =0x03000f36 ldrh r0, [r0] @@ -300836,7 +300836,7 @@ sub_80A0D18: @ 80A0D18 thumb_func_end sub_80A0D18 thumb_func_start sub_80A0D48 -sub_80A0D48: @ 80A0D48 +sub_80A0D48: ; 80A0D48 ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] @@ -300853,7 +300853,7 @@ sub_80A0D48: @ 80A0D48 thumb_func_end sub_80A0D48 thumb_func_start sub_80A0D74 -sub_80A0D74: @ 80A0D74 +sub_80A0D74: ; 80A0D74 ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] @@ -300870,7 +300870,7 @@ sub_80A0D74: @ 80A0D74 thumb_func_end sub_80A0D74 thumb_func_start sub_80A0D9C -sub_80A0D9C: @ 80A0D9C +sub_80A0D9C: ; 80A0D9C ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] @@ -300887,7 +300887,7 @@ sub_80A0D9C: @ 80A0D9C thumb_func_end sub_80A0D9C thumb_func_start sub_80A0DC4 -sub_80A0DC4: @ 80A0DC4 +sub_80A0DC4: ; 80A0DC4 ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] @@ -300904,7 +300904,7 @@ sub_80A0DC4: @ 80A0DC4 thumb_func_end sub_80A0DC4 thumb_func_start sub_80A0DEC -sub_80A0DEC: @ 80A0DEC +sub_80A0DEC: ; 80A0DEC ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] @@ -300921,7 +300921,7 @@ sub_80A0DEC: @ 80A0DEC thumb_func_end sub_80A0DEC thumb_func_start sub_80A0E14 -sub_80A0E14: @ 80A0E14 +sub_80A0E14: ; 80A0E14 ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] @@ -300938,7 +300938,7 @@ sub_80A0E14: @ 80A0E14 thumb_func_end sub_80A0E14 thumb_func_start sub_80A0E40 -sub_80A0E40: @ 80A0E40 +sub_80A0E40: ; 80A0E40 ldr r1, =0x03000f3a ldr r0, =0x03000f36 ldrh r0, [r0] @@ -300956,7 +300956,7 @@ sub_80A0E40: @ 80A0E40 thumb_func_end sub_80A0E40 thumb_func_start sub_80A0E70 -sub_80A0E70: @ 80A0E70 +sub_80A0E70: ; 80A0E70 ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] @@ -300973,7 +300973,7 @@ sub_80A0E70: @ 80A0E70 thumb_func_end sub_80A0E70 thumb_func_start sub_80A0E9C -sub_80A0E9C: @ 80A0E9C +sub_80A0E9C: ; 80A0E9C ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] @@ -300990,7 +300990,7 @@ sub_80A0E9C: @ 80A0E9C thumb_func_end sub_80A0E9C thumb_func_start sub_80A0EC8 -sub_80A0EC8: @ 80A0EC8 +sub_80A0EC8: ; 80A0EC8 ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] @@ -301007,7 +301007,7 @@ sub_80A0EC8: @ 80A0EC8 thumb_func_end sub_80A0EC8 thumb_func_start sub_80A0EF4 -sub_80A0EF4: @ 80A0EF4 +sub_80A0EF4: ; 80A0EF4 ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] @@ -301023,7 +301023,7 @@ sub_80A0EF4: @ 80A0EF4 thumb_func_end sub_80A0EF4 thumb_func_start Tileset28AnimationHeader -Tileset28AnimationHeader: @ 80A0F18 +Tileset28AnimationHeader: ; 80A0F18 ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] @@ -301039,7 +301039,7 @@ Tileset28AnimationHeader: @ 80A0F18 thumb_func_end Tileset28AnimationHeader thumb_func_start sub_80A0F3C -sub_80A0F3C: @ 80A0F3C +sub_80A0F3C: ; 80A0F3C ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] @@ -301056,7 +301056,7 @@ sub_80A0F3C: @ 80A0F3C thumb_func_end sub_80A0F3C thumb_func_start sub_80A0F68 -sub_80A0F68: @ 80A0F68 +sub_80A0F68: ; 80A0F68 ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] @@ -301072,7 +301072,7 @@ sub_80A0F68: @ 80A0F68 thumb_func_end sub_80A0F68 thumb_func_start sub_80A0F8C -sub_80A0F8C: @ 80A0F8C +sub_80A0F8C: ; 80A0F8C ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] @@ -301089,7 +301089,7 @@ sub_80A0F8C: @ 80A0F8C thumb_func_end sub_80A0F8C thumb_func_start sub_80A0FB8 -sub_80A0FB8: @ 80A0FB8 +sub_80A0FB8: ; 80A0FB8 ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] @@ -301106,7 +301106,7 @@ sub_80A0FB8: @ 80A0FB8 thumb_func_end sub_80A0FB8 thumb_func_start sub_80A0FE4 -sub_80A0FE4: @ 80A0FE4 +sub_80A0FE4: ; 80A0FE4 ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] @@ -301123,7 +301123,7 @@ sub_80A0FE4: @ 80A0FE4 thumb_func_end sub_80A0FE4 thumb_func_start sub_80A1010 -sub_80A1010: @ 80A1010 +sub_80A1010: ; 80A1010 ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] @@ -301140,7 +301140,7 @@ sub_80A1010: @ 80A1010 thumb_func_end sub_80A1010 thumb_func_start sub_80A103C -sub_80A103C: @ 80A103C +sub_80A103C: ; 80A103C push {r4-r6,lr} lsls r5, r0, 16 movs r0, 0xE0 @@ -301148,95 +301148,95 @@ sub_80A103C: @ 80A103C ands r0, r5 lsrs r6, r0, 16 cmp r6, 0 - bne _080A105C + bne @080A105C lsrs r4, r5, 19 adds r0, r4, 0 movs r1, 0 bl sub_80A1434 adds r0, r4, 0 bl sub_80A1470 -_080A105C: +@080A105C: cmp r6, 0x1 - bne _080A1068 + bne @080A1068 lsrs r0, r5, 19 movs r1, 0x1 bl sub_80A1434 -_080A1068: +@080A1068: cmp r6, 0x2 - bne _080A1074 + bne @080A1074 lsrs r0, r5, 19 movs r1, 0x2 bl sub_80A1434 -_080A1074: +@080A1074: cmp r6, 0x3 - bne _080A1080 + bne @080A1080 lsrs r0, r5, 19 movs r1, 0x3 bl sub_80A1434 -_080A1080: +@080A1080: cmp r6, 0x4 - bne _080A108C + bne @080A108C lsrs r0, r5, 19 movs r1, 0x4 bl sub_80A1434 -_080A108C: +@080A108C: cmp r6, 0x5 - bne _080A1098 + bne @080A1098 lsrs r0, r5, 19 movs r1, 0x5 bl sub_80A1434 -_080A1098: +@080A1098: cmp r6, 0x6 - bne _080A10A4 + bne @080A10A4 lsrs r0, r5, 19 movs r1, 0x6 bl sub_80A1434 -_080A10A4: +@080A10A4: cmp r6, 0x7 - bne _080A10B0 + bne @080A10B0 lsrs r0, r5, 19 movs r1, 0x7 bl sub_80A1434 -_080A10B0: +@080A10B0: pop {r4-r6} pop {r0} bx r0 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 lsls r0, 11 ands r0, r1 cmp r0, 0 - bne _080A10CC + bne @080A10CC lsrs r0, r1, 19 bl sub_80A1520 -_080A10CC: +@080A10CC: pop {r0} bx r0 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 lsls r0, 12 ands r0, r1 cmp r0, 0 - bne _080A10E4 + bne @080A10E4 lsrs r0, r1, 20 bl sub_80A1598 -_080A10E4: +@080A10E4: pop {r0} bx r0 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 @@ -301244,60 +301244,60 @@ sub_80A10E8: @ 80A10E8 ands r0, r4 lsrs r5, r0, 16 cmp r5, 0 - bne _080A1100 + bne @080A1100 lsrs r0, r4, 19 movs r1, 0 bl sub_80A1394 -_080A1100: +@080A1100: cmp r5, 0x1 - bne _080A110C + bne @080A110C lsrs r0, r4, 19 movs r1, 0x1 bl sub_80A1394 -_080A110C: +@080A110C: cmp r5, 0x2 - bne _080A1118 + bne @080A1118 lsrs r0, r4, 19 movs r1, 0x2 bl sub_80A1394 -_080A1118: +@080A1118: cmp r5, 0x3 - bne _080A1124 + bne @080A1124 lsrs r0, r4, 19 movs r1, 0x3 bl sub_80A1394 -_080A1124: +@080A1124: cmp r5, 0x4 - bne _080A1130 + bne @080A1130 lsrs r0, r4, 19 movs r1, 0x4 bl sub_80A1394 -_080A1130: +@080A1130: cmp r5, 0x5 - bne _080A113C + bne @080A113C lsrs r0, r4, 19 movs r1, 0x5 bl sub_80A1394 -_080A113C: +@080A113C: cmp r5, 0x6 - bne _080A1148 + bne @080A1148 lsrs r0, r4, 19 movs r1, 0x6 bl sub_80A1394 -_080A1148: +@080A1148: cmp r5, 0x7 - bne _080A1154 + bne @080A1154 lsrs r0, r4, 19 movs r1, 0x7 bl sub_80A1394 -_080A1154: +@080A1154: pop {r4,r5} pop {r0} bx r0 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 @@ -301305,24 +301305,24 @@ sub_80A115C: @ 80A115C ands r0, r4 lsrs r5, r0, 16 cmp r5, 0 - bne _080A1176 + bne @080A1176 lsrs r0, r4, 20 lsls r0, 24 lsrs r0, 24 bl sub_80A12D4 -_080A1176: +@080A1176: cmp r5, 0x1 - bne _080A1180 + bne @080A1180 lsrs r0, r4, 20 bl sub_80A1498 -_080A1180: +@080A1180: pop {r4,r5} pop {r0} bx r0 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 @@ -301330,60 +301330,60 @@ sub_80A1188: @ 80A1188 ands r0, r4 lsrs r5, r0, 16 cmp r5, 0 - bne _080A11A0 + bne @080A11A0 lsrs r0, r4, 19 movs r1, 0 bl sub_80A14C0 -_080A11A0: +@080A11A0: cmp r5, 0x1 - bne _080A11AC + bne @080A11AC lsrs r0, r4, 19 movs r1, 0x1 bl sub_80A14C0 -_080A11AC: +@080A11AC: cmp r5, 0x2 - bne _080A11B8 + bne @080A11B8 lsrs r0, r4, 19 movs r1, 0x2 bl sub_80A14C0 -_080A11B8: +@080A11B8: cmp r5, 0x3 - bne _080A11C4 + bne @080A11C4 lsrs r0, r4, 19 movs r1, 0x3 bl sub_80A14C0 -_080A11C4: +@080A11C4: cmp r5, 0x4 - bne _080A11D0 + bne @080A11D0 lsrs r0, r4, 19 movs r1, 0x4 bl sub_80A14C0 -_080A11D0: +@080A11D0: cmp r5, 0x5 - bne _080A11DC + bne @080A11DC lsrs r0, r4, 19 movs r1, 0x5 bl sub_80A14C0 -_080A11DC: +@080A11DC: cmp r5, 0x6 - bne _080A11E8 + bne @080A11E8 lsrs r0, r4, 19 movs r1, 0x6 bl sub_80A14C0 -_080A11E8: +@080A11E8: cmp r5, 0x7 - bne _080A11F4 + bne @080A11F4 lsrs r0, r4, 19 movs r1, 0x7 bl sub_80A14C0 -_080A11F4: +@080A11F4: pop {r4,r5} pop {r0} bx r0 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 @@ -301391,60 +301391,60 @@ sub_80A11FC: @ 80A11FC ands r0, r4 lsrs r5, r0, 16 cmp r5, 0 - bne _080A1216 + bne @080A1216 lsrs r0, r4, 20 lsls r0, 24 lsrs r0, 24 bl sub_80A131C -_080A1216: +@080A1216: cmp r5, 0x1 - bne _080A1224 + bne @080A1224 lsrs r0, r4, 20 lsls r0, 24 lsrs r0, 24 bl sub_80A136C -_080A1224: +@080A1224: pop {r4,r5} pop {r0} bx r0 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 lsls r0, 12 ands r0, r1 cmp r0, 0 - bne _080A1240 + bne @080A1240 lsrs r0, r1, 20 bl sub_80A1798 -_080A1240: +@080A1240: pop {r0} bx r0 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 lsls r0, 12 ands r0, r1 cmp r0, 0 - bne _080A125C + bne @080A125C lsrs r0, r1, 20 lsls r0, 24 lsrs r0, 24 bl sub_80A1344 -_080A125C: +@080A125C: pop {r0} bx r0 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 @@ -301452,48 +301452,48 @@ sub_80A1260: @ 80A1260 ands r0, r1 lsrs r0, 16 cmp r0, 0x1 - bne _080A1276 + bne @080A1276 lsrs r0, r1, 20 bl sub_80A14F8 -_080A1276: +@080A1276: pop {r0} bx r0 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 lsls r0, 11 ands r0, r1 cmp r0, 0 - bne _080A1290 + bne @080A1290 lsrs r0, r1, 19 bl sub_80A1548 -_080A1290: +@080A1290: pop {r0} bx r0 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 lsls r0, 11 ands r0, r1 cmp r0, 0 - bne _080A12A8 + bne @080A12A8 lsrs r0, r1, 19 bl sub_80A1570 -_080A12A8: +@080A12A8: pop {r0} bx r0 thumb_func_end sub_80A1294 thumb_func_start sub_80A12AC -sub_80A12AC: @ 80A12AC +sub_80A12AC: ; 80A12AC push {lr} lsls r0, 16 movs r1, 0xC0 @@ -301514,7 +301514,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 @@ -301547,7 +301547,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 @@ -301568,7 +301568,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 @@ -301588,7 +301588,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 @@ -301609,7 +301609,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 @@ -301619,7 +301619,7 @@ sub_80A1394: @ 80A1394 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0xB - bhi _080A13F0 + bhi @080A13F0 adds r0, r5, 0 movs r1, 0xC bl __umodsi3 @@ -301643,10 +301643,10 @@ sub_80A1394: @ 80A1394 ldr r1, [r5] movs r2, 0x80 bl sub_80A0980 - b _080A141C + b @080A141C .align 2, 0 .pool -_080A13F0: +@080A13F0: movs r0, 0x3 ands r5, r0 ldr r0, =0x085153e4 @@ -301667,7 +301667,7 @@ _080A13F0: ldr r1, [r4] movs r2, 0x80 bl sub_80A0980 -_080A141C: +@080A141C: pop {r4-r6} pop {r0} bx r0 @@ -301676,7 +301676,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 @@ -301692,7 +301692,7 @@ sub_80A1434: @ 80A1434 adds r1, r0 ldr r2, [r1] cmp r2, 0 - beq _080A1464 + beq @080A1464 ldr r0, =0x08515804 lsls r1, r3, 2 adds r1, r0 @@ -301700,7 +301700,7 @@ sub_80A1434: @ 80A1434 adds r0, r2, 0 movs r2, 0x80 bl sub_80A0980 -_080A1464: +@080A1464: pop {r0} bx r0 .align 2, 0 @@ -301708,7 +301708,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 @@ -301728,7 +301728,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 @@ -301748,7 +301748,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 @@ -301776,7 +301776,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 @@ -301796,7 +301796,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 @@ -301816,7 +301816,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 @@ -301836,7 +301836,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 @@ -301856,7 +301856,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 @@ -301876,39 +301876,39 @@ 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 movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _080A15D4 + bne @080A15D4 lsrs r0, r2, 17 bl sub_80A1748 -_080A15D4: +@080A15D4: pop {r0} bx r0 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 lsls r0, 11 ands r0, r1 cmp r0, 0 - bne _080A15EC + bne @080A15EC lsrs r0, r1, 19 bl sub_80A16B0 -_080A15EC: +@080A15EC: pop {r0} bx r0 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 @@ -301916,92 +301916,92 @@ sub_80A15F0: @ 80A15F0 movs r0, 0x3F ands r0, r5 cmp r0, 0x1 - bne _080A1606 + bne @080A1606 lsrs r0, r4, 22 bl sub_80A1720 -_080A1606: +@080A1606: movs r0, 0x7 ands r0, r5 cmp r0, 0x1 - bne _080A1614 + bne @080A1614 lsrs r0, r4, 19 bl sub_80A16F8 -_080A1614: +@080A1614: pop {r4,r5} pop {r0} bx r0 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 lsls r0, 10 ands r0, r1 cmp r0, 0 - bne _080A1630 + bne @080A1630 lsrs r0, r1, 18 bl sub_80A1770 -_080A1630: +@080A1630: pop {r0} bx r0 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 lsls r0, 11 ands r0, r4 cmp r0, 0 - bne _080A1650 + bne @080A1650 lsrs r4, 19 adds r0, r4, 0 bl sub_80A17C0 adds r0, r4, 0 bl sub_80A17EC -_080A1650: +@080A1650: pop {r4} pop {r0} bx r0 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 lsls r0, 10 ands r0, r1 cmp r0, 0 - bne _080A166C + bne @080A166C lsrs r0, r1, 18 bl sub_80A1818 -_080A166C: +@080A166C: pop {r0} bx r0 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 lsls r0, 10 ands r0, r1 cmp r0, 0 - bne _080A1684 + bne @080A1684 lsrs r0, r1, 18 bl sub_80A1884 -_080A1684: +@080A1684: pop {r0} bx r0 thumb_func_end sub_80A1670 thumb_func_start sub_80A1688 -sub_80A1688: @ 80A1688 +sub_80A1688: ; 80A1688 push {lr} lsls r0, 16 lsrs r0, 16 @@ -302021,7 +302021,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 @@ -302052,7 +302052,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 @@ -302072,7 +302072,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 @@ -302092,7 +302092,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 @@ -302113,7 +302113,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 @@ -302134,7 +302134,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 @@ -302155,7 +302155,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 @@ -302177,7 +302177,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 @@ -302199,7 +302199,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, =0x0852487c @@ -302227,14 +302227,14 @@ sub_80A1818: @ 80A1818 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _080A1862 + beq @080A1862 ldr r1, =0x03000f44 ldr r0, =sub_80A1670 + 1 str r0, [r1] ldr r1, =0x03000f3c movs r0, 0x20 strh r0, [r1] -_080A1862: +@080A1862: pop {r0} bx r0 .align 2, 0 @@ -302242,7 +302242,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, =0x0852487c @@ -302260,7 +302260,7 @@ sub_80A1884: @ 80A1884 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _080A18D6 + bne @080A18D6 ldr r0, =0x02037fd4 ldrh r2, [r0, 0x4] lsls r2, 21 @@ -302278,10 +302278,10 @@ sub_80A1884: @ 80A1884 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - bne _080A18D6 + bne @080A18D6 ldr r0, =0x03000f44 str r1, [r0] -_080A18D6: +@080A18D6: pop {r0} bx r0 .align 2, 0 @@ -302289,8 +302289,8 @@ _080A18D6: thumb_func_end sub_80A1884 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 @@ -302321,8 +302321,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 @@ -302349,7 +302349,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 @@ -302388,8 +302388,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] @@ -302399,7 +302399,7 @@ copy_pal_bg_faded_to_pal_ram: @ 80A19C0 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - bne _080A1A02 + bne @080A1A02 ldr r1, =0x02037b14 movs r2, 0xA0 lsls r2, 19 @@ -302415,14 +302415,14 @@ copy_pal_bg_faded_to_pal_ram: @ 80A19C0 movs r0, 0x3 ands r0, r1 cmp r0, 0x2 - bne _080A1A02 + bne @080A1A02 ldrb r1, [r4, 0x7] adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _080A1A02 + beq @080A1A02 bl sub_80A2968 -_080A1A02: +@080A1A02: pop {r4,r5} pop {r0} bx r0 @@ -302431,36 +302431,36 @@ _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] cmp r0, 0 - beq _080A1A30 + beq @080A1A30 movs r0, 0xFF - b _080A1A68 + b @080A1A68 .align 2, 0 .pool -_080A1A30: +@080A1A30: ldr r0, =0x02037fd4 ldrb r0, [r0, 0x9] movs r1, 0x3 ands r1, r0 cmp r1, 0 - bne _080A1A48 + bne @080A1A48 bl pal_fade__0 - b _080A1A56 + b @080A1A56 .align 2, 0 .pool -_080A1A48: +@080A1A48: cmp r1, 0x1 - bne _080A1A52 + bne @080A1A52 bl pal_fade__1 - b _080A1A56 -_080A1A52: + b @080A1A56 +@080A1A52: bl pal_fade__2 -_080A1A56: +@080A1A56: lsls r0, 24 lsrs r3, r0, 24 ldr r2, =0x02037fe4 @@ -302470,7 +302470,7 @@ _080A1A56: orrs r0, r1 str r0, [r2] adds r0, r3, 0 -_080A1A68: +@080A1A68: pop {r1} bx r1 .align 2, 0 @@ -302478,17 +302478,17 @@ _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: +@080A1A78: adds r0, r4, 0 bl palslot_dead_struct_update adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bls _080A1A78 + bls @080A1A78 bl pal_fade_control_reset_maybe pop {r4} pop {r0} @@ -302496,7 +302496,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 @@ -302505,7 +302505,7 @@ sub_80A1A94: @ 80A1A94 ldr r7, =0x02037714 ldr r6, =0x02037b14 ldr r5, =0x000001ff -_080A1AA4: +@080A1AA4: lsls r1, r4, 1 adds r3, r1, r7 mov r0, r12 @@ -302519,7 +302519,7 @@ _080A1AA4: lsls r0, 16 lsrs r4, r0, 16 cmp r4, r5 - bls _080A1AA4 + bls @080A1AA4 pop {r4-r7} pop {r0} bx r0 @@ -302528,7 +302528,7 @@ _080A1AA4: thumb_func_end sub_80A1A94 thumb_func_start sub_80A1AD4 -sub_80A1AD4: @ 80A1AD4 +sub_80A1AD4: ; 80A1AD4 push {r4-r7,lr} mov r7, r8 push {r7} @@ -302549,12 +302549,12 @@ sub_80A1AD4: @ 80A1AD4 movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080A1B08 + beq @080A1B08 movs r0, 0 - b _080A1C00 + b @080A1C00 .align 2, 0 .pool -_080A1B08: +@080A1B08: ldrb r0, [r5, 0xA] movs r3, 0x79 negs r3, r3 @@ -302566,7 +302566,7 @@ _080A1B08: lsls r0, r6, 24 asrs r1, r0, 24 cmp r1, 0 - bge _080A1B36 + bge @080A1B36 lsls r0, r2, 25 lsrs r0, 28 negs r1, r1 @@ -302578,7 +302578,7 @@ _080A1B08: orrs r2, r0 strb r2, [r5, 0xA] movs r6, 0 -_080A1B36: +@080A1B36: str r4, [r5] movs r4, 0x3F adds r1, r6, 0 @@ -302628,17 +302628,17 @@ _080A1B36: ands r0, r1 strb r0, [r5, 0x9] cmp r12, r7 - bcs _080A1BB0 + bcs @080A1BB0 movs r0, 0x41 negs r0, r0 ands r3, r0 - b _080A1BB4 + b @080A1BB4 .align 2, 0 .pool -_080A1BB0: +@080A1BB0: movs r0, 0x40 orrs r3, r0 -_080A1BB4: +@080A1BB4: strb r3, [r5, 0x8] bl fade_and_return_progress_probably ldr r4, =0x02037fd4 @@ -302659,14 +302659,14 @@ _080A1BB4: movs r0, 0x3 ands r0, r1 cmp r0, 0x2 - bne _080A1BF0 + bne @080A1BF0 ldrb r1, [r4, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080A1BF0 + beq @080A1BF0 bl sub_80A2968 -_080A1BF0: +@080A1BF0: ldr r2, =0x02037fd4 lsls r3, r5, 7 ldrb r1, [r2, 0x8] @@ -302675,7 +302675,7 @@ _080A1BF0: orrs r0, r3 strb r0, [r2, 0x8] movs r0, 0x1 -_080A1C00: +@080A1C00: pop {r3} mov r8, r3 pop {r4-r7} @@ -302686,7 +302686,7 @@ _080A1C00: thumb_func_end sub_80A1AD4 thumb_func_start sub_80A1C1C -sub_80A1C1C: @ 80A1C1C +sub_80A1C1C: ; 80A1C1C push {r4-r6,lr} mov r6, r8 push {r6} @@ -302724,13 +302724,13 @@ 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 lsrs r7, r0, 24 movs r5, 0 -_080A1C6E: +@080A1C6E: lsls r0, r5, 1 adds r0, r5 lsls r0, 2 @@ -302739,13 +302739,13 @@ _080A1C6E: ldrb r0, [r4, 0x4] lsls r0, 31 cmp r0, 0 - beq _080A1CCC + beq @080A1CCC ldr r2, [r4] ldrb r0, [r2, 0x8] lsls r0, 31 lsrs r0, 31 cmp r0, r7 - bne _080A1CCC + bne @080A1CCC ldrh r1, [r4, 0x6] lsls r1, 20 lsrs r1, 25 @@ -302753,43 +302753,43 @@ _080A1C6E: lsls r0, 27 lsrs r0, 27 cmp r1, r0 - bne _080A1CAA + bne @080A1CAA adds r0, r4, 0 bl sub_80A1F00 ldrb r0, [r4, 0x4] lsls r0, 31 cmp r0, 0 - beq _080A1CCC -_080A1CAA: + beq @080A1CCC +@080A1CAA: ldrb r0, [r4, 0x8] cmp r0, 0 - bne _080A1CC0 + bne @080A1CC0 adds r0, r4, 0 adds r1, r6, 0 bl sub_80A1CDC - b _080A1CC4 + b @080A1CC4 .align 2, 0 .pool -_080A1CC0: +@080A1CC0: subs r0, 0x1 strb r0, [r4, 0x8] -_080A1CC4: +@080A1CC4: adds r0, r4, 0 adds r1, r6, 0 bl sub_80A1E40 -_080A1CCC: +@080A1CCC: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0xF - bls _080A1C6E + bls @080A1C6E pop {r4-r7} pop {r0} bx r0 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} @@ -302809,14 +302809,14 @@ sub_80A1CDC: @ 80A1CDC movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080A1D78 + bne @080A1D78 lsrs r0, r2, 27 cmp r6, r0 - bcs _080A1DC4 + bcs @080A1DC4 ldr r0, =0x02037714 mov r12, r0 ldr r7, =0x02037b14 -_080A1D10: +@080A1D10: ldr r0, [r4, 0x4] lsls r0, 11 lsrs r0, 22 @@ -302859,16 +302859,16 @@ _080A1D10: lsls r0, 25 lsrs r0, 27 cmp r6, r0 - bcc _080A1D10 - b _080A1DC4 + bcc @080A1D10 + b @080A1DC4 .align 2, 0 .pool -_080A1D78: +@080A1D78: lsrs r0, r2, 27 cmp r6, r0 - bcs _080A1DC4 + bcs @080A1DC4 ldr r3, =0x02037b14 -_080A1D80: +@080A1D80: ldr r1, [r4, 0x4] lsls r1, 11 lsrs r1, 22 @@ -302902,8 +302902,8 @@ _080A1D80: lsls r0, 25 lsrs r0, 27 cmp r6, r0 - bcc _080A1D80 -_080A1DC4: + bcc @080A1D80 +@080A1DC4: ldrh r0, [r4, 0x4] lsls r0, 21 lsrs r0, 23 @@ -302934,18 +302934,18 @@ _080A1DC4: lsls r0, 27 lsrs r0, 27 cmp r1, r0 - blt _080A1E14 + blt @080A1E14 ldrb r0, [r4, 0x9] cmp r0, 0 - beq _080A1E0C + beq @080A1E0C subs r0, 0x1 strb r0, [r4, 0x9] -_080A1E0C: +@080A1E0C: ldrh r1, [r4, 0x6] adds r0, r5, 0 ands r0, r1 strh r0, [r4, 0x6] -_080A1E14: +@080A1E14: ldrh r0, [r4, 0x4] lsls r0, 21 lsrs r0, 27 @@ -302965,7 +302965,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 @@ -302973,7 +302973,7 @@ sub_80A1E40: @ 80A1E40 movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080A1EF4 + beq @080A1EF4 ldrh r0, [r4, 0x4] lsls r0, 21 lsrs r6, r0, 23 @@ -302984,19 +302984,19 @@ sub_80A1E40: @ 80A1E40 ldr r1, [r3] ands r0, r1 cmp r0, 0 - beq _080A1EF4 + beq @080A1EF4 ldr r2, [r4] ldrb r1, [r2, 0x8] adds r0, r5, 0 ands r0, r1 cmp r0, 0 - bne _080A1E9C + bne @080A1E9C ldrb r1, [r3, 0x4] lsls r1, 26 ldrb r0, [r3, 0x8] lsls r0, 26 cmp r1, r0 - beq _080A1EF4 + beq @080A1EF4 adds r0, r6, 0 ldrb r1, [r2, 0x9] lsls r1, 25 @@ -303008,19 +303008,19 @@ sub_80A1E40: @ 80A1E40 lsls r3, 17 lsrs r3, 17 bl pal_fade_1 - b _080A1EF4 + b @080A1EF4 .align 2, 0 .pool -_080A1E9C: +@080A1E9C: ldrb r1, [r3, 0x4] movs r0, 0x3F ands r0, r1 cmp r0, 0 - bne _080A1EF4 + bne @080A1EF4 ldrb r0, [r4, 0x8] ldrb r1, [r2, 0xA] cmp r0, r1 - beq _080A1EF4 + beq @080A1EF4 ldrh r0, [r4, 0x6] lsls r0, 20 lsrs r0, 25 @@ -303032,9 +303032,9 @@ _080A1E9C: movs r3, 0 adds r1, r2, 0 cmp r3, r1 - bcs _080A1EF4 + bcs @080A1EF4 ldr r6, =0x02037b14 -_080A1EC8: +@080A1EC8: ldrh r1, [r4, 0x4] lsls r1, 21 lsrs r1, 23 @@ -303056,8 +303056,8 @@ _080A1EC8: lsls r0, 25 lsrs r0, 27 cmp r3, r0 - bcc _080A1EC8 -_080A1EF4: + bcc @080A1EC8 +@080A1EF4: pop {r4-r6} pop {r0} bx r0 @@ -303066,17 +303066,17 @@ _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] cmp r0, 0 - bne _080A1F50 + bne @080A1F50 ldr r2, [r3] ldrb r0, [r2, 0xB] lsrs r0, 5 cmp r0, 0 - bne _080A1F40 + bne @080A1F40 ldrh r1, [r3, 0x6] ldr r0, =0xfffff01f ands r0, r1 @@ -303094,27 +303094,27 @@ sub_80A1F00: @ 80A1F00 ands r1, r2 orrs r1, r0 str r1, [r3, 0x4] - b _080A1F54 + b @080A1F54 .align 2, 0 .pool -_080A1F40: +@080A1F40: cmp r0, 0 - blt _080A1F54 + blt @080A1F54 cmp r0, 0x2 - bgt _080A1F54 + bgt @080A1F54 ldrh r0, [r2] bl sub_80A1F58 - b _080A1F54 -_080A1F50: + b @080A1F54 +@080A1F50: subs r0, 0x1 strb r0, [r3, 0x9] -_080A1F54: +@080A1F54: pop {r0} bx r0 thumb_func_end sub_80A1F00 thumb_func_start sub_80A1F58 -sub_80A1F58: @ 80A1F58 +sub_80A1F58: ; 80A1F58 push {lr} lsls r0, 16 lsrs r0, 16 @@ -303122,15 +303122,15 @@ sub_80A1F58: @ 80A1F58 lsls r0, 24 lsrs r0, 24 cmp r0, 0x10 - beq _080A1F6E + beq @080A1F6E bl palslot_dead_struct_update -_080A1F6E: +@080A1F6E: pop {r0} bx r0 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 @@ -303171,7 +303171,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] @@ -303229,7 +303229,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 @@ -303237,7 +303237,7 @@ sub_80A2048: @ 80A2048 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x10 - beq _080A206C + beq @080A206C ldr r1, =0x02037f14 lsls r0, r2, 1 adds r0, r2 @@ -303247,7 +303247,7 @@ sub_80A2048: @ 80A2048 movs r2, 0x2 orrs r1, r2 strb r1, [r0, 0x4] -_080A206C: +@080A206C: pop {r0} bx r0 .align 2, 0 @@ -303255,7 +303255,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 @@ -303263,7 +303263,7 @@ sub_80A2074: @ 80A2074 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x10 - beq _080A209A + beq @080A209A ldr r0, =0x02037f14 lsls r1, r2, 1 adds r1, r2 @@ -303274,7 +303274,7 @@ sub_80A2074: @ 80A2074 negs r0, r0 ands r0, r2 strb r0, [r1, 0x4] -_080A209A: +@080A209A: pop {r0} bx r0 .align 2, 0 @@ -303282,13 +303282,13 @@ _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 movs r1, 0 ldr r3, =0x02037f14 -_080A20AE: +@080A20AE: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 @@ -303296,55 +303296,55 @@ _080A20AE: ldr r0, [r0] ldrh r0, [r0] cmp r0, r2 - bne _080A20C8 + bne @080A20C8 adds r0, r1, 0 - b _080A20D4 + b @080A20D4 .align 2, 0 .pool -_080A20C8: +@080A20C8: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xF - bls _080A20AE + bls @080A20AE movs r0, 0x10 -_080A20D4: +@080A20D4: pop {r1} bx r1 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] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080A20F0 + bne @080A20F0 movs r0, 0 - b _080A220C + b @080A220C .align 2, 0 .pool -_080A20F0: +@080A20F0: bl sub_80A29BC lsls r0, 24 cmp r0, 0 - beq _080A20FE + beq @080A20FE ldrb r0, [r4, 0x7] - b _080A220A -_080A20FE: + b @080A220A +@080A20FE: ldrb r1, [r4, 0xA] movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne _080A2132 + bne @080A2132 ldrb r2, [r4, 0x4] lsls r1, r2, 26 ldrb r0, [r4, 0x8] lsls r0, 26 cmp r1, r0 - bcs _080A212A + bcs @080A212A lsrs r0, r1, 26 adds r0, 0x1 movs r1, 0x3F @@ -303355,13 +303355,13 @@ _080A20FE: orrs r1, r0 strb r1, [r4, 0x4] movs r0, 0x2 - b _080A220C -_080A212A: + b @080A220C +@080A212A: movs r0, 0x40 negs r0, r0 ands r0, r2 strb r0, [r4, 0x4] -_080A2132: +@080A2132: movs r5, 0 ldr r2, =0x02037fd4 ldrb r1, [r2, 0xA] @@ -303369,25 +303369,25 @@ _080A2132: ands r0, r1 adds r7, r2, 0 cmp r0, 0 - bne _080A214C + bne @080A214C ldrh r4, [r7] - b _080A2152 + b @080A2152 .align 2, 0 .pool -_080A214C: +@080A214C: ldrh r4, [r7, 0x2] movs r5, 0x80 lsls r5, 1 -_080A2152: +@080A2152: cmp r4, 0 - beq _080A2184 + beq @080A2184 ldr r7, =0x02037fd4 adds r6, r7, 0 -_080A215A: +@080A215A: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _080A2176 + beq @080A2176 ldrh r2, [r6, 0x4] lsls r2, 21 lsrs r2, 27 @@ -303397,15 +303397,15 @@ _080A215A: adds r0, r5, 0 movs r1, 0x10 bl pal_fade_1 -_080A2176: +@080A2176: lsrs r4, 1 adds r0, r5, 0 adds r0, 0x10 lsls r0, 16 lsrs r5, r0, 16 cmp r4, 0 - bne _080A215A -_080A2184: + bne @080A215A +@080A2184: ldrb r2, [r7, 0xA] lsls r0, r2, 29 lsrs r0, 31 @@ -303422,7 +303422,7 @@ _080A2184: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - bne _080A2208 + bne @080A2208 ldrh r6, [r7, 0x4] lsls r2, r6, 21 ldrb r0, [r7, 0x5] @@ -303430,30 +303430,30 @@ _080A2184: lsrs r1, r2, 27 lsrs r0, r5, 27 cmp r1, r0 - bne _080A21C4 + bne @080A21C4 str r3, [r7] movs r0, 0x2 orrs r4, r0 strb r4, [r7, 0xA] - b _080A2208 + b @080A2208 .align 2, 0 .pool -_080A21C4: +@080A21C4: ldrb r1, [r7, 0x8] movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _080A21E0 + bne @080A21E0 lsrs r3, r2, 27 lsls r0, r4, 25 lsrs r0, 28 adds r3, r0, r3 lsrs r0, r5, 27 cmp r3, r0 - ble _080A21F6 + ble @080A21F6 adds r3, r0, 0 - b _080A21F6 -_080A21E0: + b @080A21F6 +@080A21E0: lsrs r3, r2, 27 lsls r0, r4, 25 lsrs r0, 28 @@ -303463,9 +303463,9 @@ _080A21E0: asrs r0, 24 lsrs r1, r5, 27 cmp r0, r1 - bge _080A21F6 + bge @080A21F6 adds r3, r1, 0 -_080A21F6: +@080A21F6: lsls r0, r3, 24 asrs r0, 24 movs r1, 0x1F @@ -303475,11 +303475,11 @@ _080A21F6: ands r1, r6 orrs r1, r0 strh r1, [r7, 0x4] -_080A2208: +@080A2208: ldrb r0, [r7, 0x7] -_080A220A: +@080A220A: lsrs r0, 7 -_080A220C: +@080A220C: pop {r4-r7} pop {r1} bx r1 @@ -303488,24 +303488,24 @@ _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 cmp r1, 0 - beq _080A2256 + beq @080A2256 ldr r7, =0x02037b14 -_080A2224: +@080A2224: movs r0, 0x1 ands r0, r1 lsrs r4, r1, 1 adds r5, r3, 0 adds r5, 0x10 cmp r0, 0 - beq _080A224C + beq @080A224C movs r2, 0 adds r6, r7, 0 -_080A2236: +@080A2236: adds r0, r3, r2 lsls r0, 1 adds r0, r6 @@ -303516,14 +303516,14 @@ _080A2236: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xF - bls _080A2236 -_080A224C: + bls @080A2236 +@080A224C: adds r1, r4, 0 lsls r0, r5, 16 lsrs r3, r0, 16 cmp r1, 0 - bne _080A2224 -_080A2256: + bne @080A2224 +@080A2256: pop {r4-r7} pop {r0} bx r0 @@ -303532,7 +303532,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 @@ -303551,10 +303551,10 @@ sub_80A2260: @ 80A2260 movs r0, 0 mov r9, r0 cmp r4, 0 - beq _080A231C + beq @080A231C lsls r1, 24 str r1, [sp, 0x8] -_080A228A: +@080A228A: movs r0, 0x1 ands r0, r4 lsrs r4, 1 @@ -303563,7 +303563,7 @@ _080A228A: add r1, r9 mov r10, r1 cmp r0, 0 - beq _080A230E + beq @080A230E movs r4, 0 ldr r2, =0x02037b14 mov r8, r2 @@ -303577,7 +303577,7 @@ _080A228A: movs r5, 0x1F asrs r7, r0, 24 asrs r6, r1, 24 -_080A22B6: +@080A22B6: mov r0, r9 adds r2, r0, r4 lsls r2, 1 @@ -303621,16 +303621,16 @@ _080A22B6: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bls _080A22B6 -_080A230E: + bls @080A22B6 +@080A230E: ldr r4, [sp, 0xC] mov r1, r10 lsls r0, r1, 16 lsrs r0, 16 mov r9, r0 cmp r4, 0 - bne _080A228A -_080A231C: + bne @080A228A +@080A231C: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -303644,30 +303644,30 @@ _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} adds r1, r0, 0 movs r3, 0 cmp r1, 0 - beq _080A237E + beq @080A237E ldr r0, =0x02037b14 mov r8, r0 ldr r0, =0x02037714 mov r12, r0 -_080A234A: +@080A234A: movs r0, 0x1 ands r0, r1 lsrs r4, r1, 1 adds r5, r3, 0 adds r5, 0x10 cmp r0, 0 - beq _080A2374 + beq @080A2374 movs r2, 0 mov r7, r8 mov r6, r12 -_080A235E: +@080A235E: adds r0, r3, r2 lsls r0, 1 adds r1, r0, r7 @@ -303678,14 +303678,14 @@ _080A235E: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xF - bls _080A235E -_080A2374: + bls @080A235E +@080A2374: adds r1, r4, 0 lsls r0, r5, 16 lsrs r3, r0, 16 cmp r1, 0 - bne _080A234A -_080A237E: + bne @080A234A +@080A237E: pop {r3} mov r8, r3 pop {r4-r7} @@ -303696,7 +303696,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 @@ -303716,7 +303716,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 @@ -303749,7 +303749,7 @@ sub_80A23B4: @ 80A23B4 orrs r0, r1 strb r0, [r2, 0x9] cmp r4, 0x2 - bne _080A2406 + bne @080A2406 mov r1, sp movs r0, 0 strh r0, [r1] @@ -303757,9 +303757,9 @@ sub_80A23B4: @ 80A23B4 ldr r2, =0x01000200 mov r0, sp bl CpuSet -_080A2406: +@080A2406: cmp r4, 0 - bne _080A241C + bne @080A241C mov r0, sp adds r0, 0x2 ldr r2, =0x00007fff @@ -303768,7 +303768,7 @@ _080A2406: ldr r1, =0x02037b14 ldr r2, =0x01000200 bl CpuSet -_080A241C: +@080A241C: bl fade_and_return_progress_probably add sp, 0x4 pop {r4} @@ -303779,7 +303779,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 @@ -303791,65 +303791,65 @@ pal_fade__1: @ 80A2438 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080A2458 + bne @080A2458 movs r0, 0 - b _080A2792 + b @080A2792 .align 2, 0 .pool -_080A2458: +@080A2458: bl sub_80A29BC lsls r0, 24 cmp r0, 0 - beq _080A2466 + beq @080A2466 ldrb r0, [r4, 0x7] - b _080A2790 -_080A2466: + b @080A2790 +@080A2466: ldrb r1, [r4, 0xA] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080A247C + beq @080A247C movs r2, 0x80 lsls r2, 1 movs r0, 0x80 lsls r0, 2 mov r10, r0 - b _080A2484 -_080A247C: + b @080A2484 +@080A247C: movs r2, 0 movs r1, 0x80 lsls r1, 1 mov r10, r1 -_080A2484: +@080A2484: ldr r1, =0x02037fd4 ldrb r0, [r1, 0x8] lsls r0, 26 lsrs r0, 26 cmp r0, 0x1 - beq _080A2544 + beq @080A2544 cmp r0, 0x1 - bgt _080A24A0 + bgt @080A24A0 cmp r0, 0 - beq _080A24AE - b _080A2694 + beq @080A24AE + b @080A2694 .align 2, 0 .pool -_080A24A0: +@080A24A0: cmp r0, 0x2 - bne _080A24A6 - b _080A25A8 -_080A24A6: + bne @080A24A6 + b @080A25A8 +@080A24A6: cmp r0, 0x3 - bne _080A24AC - b _080A2630 -_080A24AC: - b _080A2694 -_080A24AE: + bne @080A24AC + b @080A2630 +@080A24AC: + b @080A2694 +@080A24AE: adds r7, r2, 0 cmp r7, r10 - bcc _080A24B6 - b _080A2694 -_080A24B6: + bcc @080A24B6 + b @080A2694 +@080A24B6: lsls r2, r7, 1 ldr r0, =0x02037714 adds r0, r2, r0 @@ -303885,25 +303885,25 @@ _080A24B6: lsrs r3, 3 asrs r0, r3, 24 cmp r2, r0 - bge _080A2500 + bge @080A2500 lsrs r6, r3, 24 -_080A2500: +@080A2500: lsls r0, r5, 24 asrs r0, 24 mov r2, r12 lsls r1, r2, 24 cmp r0, r12 - bge _080A250E + bge @080A250E lsrs r5, r1, 24 -_080A250E: +@080A250E: lsls r0, r4, 24 asrs r0, 24 mov r3, r8 lsls r1, r3, 24 cmp r0, r8 - bge _080A251C + bge @080A251C lsrs r4, r1, 24 -_080A251C: +@080A251C: lsls r1, r6, 24 asrs r1, 24 lsls r0, r5, 24 @@ -303918,16 +303918,16 @@ _080A251C: lsls r0, 16 lsrs r7, r0, 16 cmp r7, r10 - bcc _080A24B6 - b _080A2694 + bcc @080A24B6 + b @080A2694 .align 2, 0 .pool -_080A2544: +@080A2544: adds r7, r2, 0 cmp r7, r10 - bcc _080A254C - b _080A2694 -_080A254C: + bcc @080A254C + b @080A2694 +@080A254C: lsls r1, r7, 1 ldr r0, =0x02037b14 adds r2, r1, r0 @@ -303945,21 +303945,21 @@ _080A254C: lsrs r1, 27 adds r4, r1, 0x2 cmp r6, 0x1F - ble _080A2572 + ble @080A2572 movs r6, 0x1F -_080A2572: +@080A2572: lsls r0, r5, 24 asrs r0, 24 cmp r0, 0x1F - ble _080A257C + ble @080A257C movs r5, 0x1F -_080A257C: +@080A257C: lsls r0, r4, 24 asrs r0, 24 cmp r0, 0x1F - ble _080A2586 + ble @080A2586 movs r4, 0x1F -_080A2586: +@080A2586: lsls r1, r6, 24 asrs r1, 24 lsls r0, r5, 24 @@ -303973,15 +303973,15 @@ _080A2586: lsls r0, 16 lsrs r7, r0, 16 cmp r7, r10 - bcc _080A254C - b _080A2694 + bcc @080A254C + b @080A2694 .align 2, 0 .pool -_080A25A8: +@080A25A8: adds r7, r2, 0 cmp r7, r10 - bcs _080A2694 -_080A25AE: + bcs @080A2694 +@080A25AE: lsls r2, r7, 1 ldr r0, =0x02037714 adds r0, r2, r0 @@ -304011,25 +304011,25 @@ _080A25AE: lsrs r3, 3 asrs r0, r3, 24 cmp r6, r0 - ble _080A25EC + ble @080A25EC lsrs r6, r3, 24 -_080A25EC: +@080A25EC: lsls r0, r5, 24 asrs r0, 24 mov r3, r12 lsls r1, r3, 24 cmp r0, r12 - ble _080A25FA + ble @080A25FA lsrs r5, r1, 24 -_080A25FA: +@080A25FA: lsls r0, r4, 24 asrs r0, 24 mov r3, r8 lsls r1, r3, 24 cmp r0, r8 - ble _080A2608 + ble @080A2608 lsrs r4, r1, 24 -_080A2608: +@080A2608: lsls r1, r6, 24 asrs r1, 24 lsls r0, r5, 24 @@ -304043,17 +304043,17 @@ _080A2608: lsls r0, 16 lsrs r7, r0, 16 cmp r7, r10 - bcc _080A25AE - b _080A2694 + bcc @080A25AE + b @080A2694 .align 2, 0 .pool -_080A2630: +@080A2630: adds r7, r2, 0 cmp r7, r10 - bcs _080A2694 + bcs @080A2694 ldr r4, =0x02037b14 mov r8, r4 -_080A263A: +@080A263A: lsls r0, r7, 1 mov r1, r8 adds r3, r0, r1 @@ -304075,19 +304075,19 @@ _080A263A: lsrs r4, r1, 24 lsrs r6, r2, 24 cmp r2, 0 - bge _080A2668 + bge @080A2668 movs r6, 0 -_080A2668: +@080A2668: lsls r0, r5, 24 cmp r0, 0 - bge _080A2670 + bge @080A2670 movs r5, 0 -_080A2670: +@080A2670: lsls r0, r4, 24 cmp r0, 0 - bge _080A2678 + bge @080A2678 movs r4, 0 -_080A2678: +@080A2678: lsls r1, r6, 24 asrs r1, 24 lsls r0, r5, 24 @@ -304101,8 +304101,8 @@ _080A2678: lsls r0, 16 lsrs r7, r0, 16 cmp r7, r10 - bcc _080A263A -_080A2694: + bcc @080A263A +@080A2694: ldr r0, =0x02037fd4 ldrb r2, [r0, 0xA] lsls r0, r2, 29 @@ -304119,12 +304119,12 @@ _080A2694: movs r0, 0x4 ands r0, r3 cmp r0, 0 - beq _080A26C4 + beq @080A26C4 ldrb r0, [r1, 0x7] - b _080A2790 + b @080A2790 .align 2, 0 .pool -_080A26C4: +@080A26C4: ldr r2, =0x02037fd4 ldrh r4, [r2, 0x4] lsls r5, r4, 21 @@ -304133,15 +304133,15 @@ _080A26C4: lsrs r1, r2, 28 subs r0, r1 cmp r0, 0 - bge _080A26E8 + bge @080A26E8 ldr r0, =0xfffff83f ands r0, r4 ldr r3, =0x02037fd4 strh r0, [r3, 0x4] - b _080A26FE + b @080A26FE .align 2, 0 .pool -_080A26E8: +@080A26E8: lsrs r1, r5, 27 lsrs r0, r2, 28 subs r1, r0 @@ -304153,42 +304153,42 @@ _080A26E8: orrs r0, r1 ldr r4, =0x02037fd4 strh r0, [r4, 0x4] -_080A26FE: +@080A26FE: ldr r1, =0x02037fd4 ldrh r0, [r1, 0x4] movs r1, 0xF8 lsls r1, 3 ands r1, r0 cmp r1, 0 - bne _080A278C + bne @080A278C ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] lsls r0, 26 lsrs r0, 26 cmp r0, 0x1 - beq _080A2750 + beq @080A2750 cmp r0, 0x1 - bgt _080A272C + bgt @080A272C cmp r0, 0 - beq _080A2736 - b _080A2778 + beq @080A2736 + b @080A2778 .align 2, 0 .pool -_080A272C: +@080A272C: cmp r0, 0x2 - beq _080A2736 + beq @080A2736 cmp r0, 0x3 - beq _080A276C - b _080A2778 -_080A2736: + beq @080A276C + b @080A2778 +@080A2736: ldr r0, =0x02037714 ldr r1, =0x02037b14 ldr r2, =0x04000100 bl CpuSet - b _080A2778 + b @080A2778 .align 2, 0 .pool -_080A2750: +@080A2750: movs r0, 0x1 negs r0, r0 str r0, [sp] @@ -304196,16 +304196,16 @@ _080A2750: ldr r2, =0x05000100 mov r0, sp bl CpuSet - b _080A2778 + b @080A2778 .align 2, 0 .pool -_080A276C: +@080A276C: str r1, [sp, 0x4] add r0, sp, 0x4 ldr r1, =0x02037b14 ldr r2, =0x05000100 bl CpuSet -_080A2778: +@080A2778: ldr r2, =0x02037fd4 ldrb r1, [r2, 0x9] movs r0, 0x4 @@ -304216,12 +304216,12 @@ _080A2778: movs r1, 0x2 orrs r0, r1 strb r0, [r2, 0xA] -_080A278C: +@080A278C: ldr r3, =0x02037fd4 ldrb r0, [r3, 0x7] -_080A2790: +@080A2790: lsrs r0, 7 -_080A2792: +@080A2792: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -304235,7 +304235,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 @@ -304298,17 +304298,17 @@ sub_80A27B0: @ 80A27B0 ands r0, r1 strb r0, [r7, 0x9] cmp r2, r3 - bcs _080A2840 + bcs @080A2840 movs r0, 0x41 negs r0, r0 ands r6, r0 - b _080A2844 + b @080A2844 .align 2, 0 .pool -_080A2840: +@080A2840: movs r0, 0x40 orrs r6, r0 -_080A2844: +@080A2844: strb r6, [r7, 0x8] pop {r4-r7} pop {r0} @@ -304316,7 +304316,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] @@ -304324,18 +304324,18 @@ pal_fade__2: @ 80A284C ands r0, r1 adds r4, r2, 0 cmp r0, 0 - bne _080A2864 + bne @080A2864 movs r0, 0 - b _080A295C + b @080A295C .align 2, 0 .pool -_080A2864: +@080A2864: ldrb r2, [r4, 0x4] lsls r1, r2, 26 ldrb r3, [r4, 0x8] lsls r0, r3, 26 cmp r1, r0 - bcs _080A2886 + bcs @080A2886 lsrs r0, r1, 26 adds r0, 0x1 movs r1, 0x3F @@ -304346,8 +304346,8 @@ _080A2864: orrs r1, r0 strb r1, [r4, 0x4] movs r0, 0x2 - b _080A295C -_080A2886: + b @080A295C +@080A2886: movs r0, 0x40 negs r0, r0 ands r0, r2 @@ -304355,7 +304355,7 @@ _080A2886: movs r0, 0x40 ands r0, r3 cmp r0, 0 - bne _080A28E4 + bne @080A28E4 ldrh r1, [r4, 0x4] lsls r0, r1, 21 lsrs r0, 27 @@ -304373,7 +304373,7 @@ _080A2886: lsrs r1, r5, 27 lsrs r0, 3 cmp r1, r0 - bls _080A2930 + bls @080A2930 ldrb r2, [r4, 0x9] lsls r1, r2, 28 lsrs r1, 31 @@ -304391,10 +304391,10 @@ _080A2886: ands r0, r7 lsls r0, 6 ands r3, r6 - b _080A292C + b @080A292C .align 2, 0 .pool -_080A28E4: +@080A28E4: ldrh r2, [r4, 0x4] lsls r1, r2, 21 lsrs r0, r1, 27 @@ -304412,7 +304412,7 @@ _080A28E4: ldrb r0, [r4, 0x5] lsrs r0, 3 cmp r1, r0 - bge _080A2930 + bge @080A2930 ldrb r2, [r4, 0x9] lsls r1, r2, 28 lsrs r1, 31 @@ -304431,35 +304431,35 @@ _080A28E4: ands r0, r6 lsls r0, 6 ands r3, r5 -_080A292C: +@080A292C: orrs r3, r0 strh r3, [r4, 0x4] -_080A2930: +@080A2930: ldrb r1, [r4, 0x9] movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _080A2958 + beq @080A2958 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080A294E + beq @080A294E movs r0, 0 str r0, [r4] ldrh r1, [r4, 0x4] ldr r0, =0xfffff83f ands r0, r1 strh r0, [r4, 0x4] -_080A294E: +@080A294E: ldrb r1, [r4, 0x9] movs r0, 0x5 negs r0, r0 ands r0, r1 strb r0, [r4, 0x9] -_080A2958: +@080A2958: ldrb r0, [r4, 0x7] lsrs r0, 7 -_080A295C: +@080A295C: pop {r4-r7} pop {r1} bx r1 @@ -304468,7 +304468,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] @@ -304483,7 +304483,7 @@ sub_80A2968: @ 80A2968 movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _080A29AC + beq @080A29AC movs r0, 0x9 negs r0, r0 ands r0, r1 @@ -304501,7 +304501,7 @@ sub_80A2968: @ 80A2968 movs r0, 0x7F ands r0, r1 strb r0, [r4, 0x7] -_080A29AC: +@080A29AC: pop {r4} pop {r0} bx r0 @@ -304510,14 +304510,14 @@ _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] movs r0, 0x2 ands r0, r4 cmp r0, 0 - beq _080A2A18 + beq @080A2A18 ldr r2, [r3, 0x8] movs r0, 0xF8 lsls r0, 9 @@ -304525,7 +304525,7 @@ sub_80A29BC: @ 80A29BC movs r1, 0x80 lsls r1, 7 cmp r0, r1 - bne _080A29FC + bne @080A29FC ldrb r1, [r3, 0x7] movs r0, 0x7F ands r0, r1 @@ -304538,10 +304538,10 @@ sub_80A29BC: @ 80A29BC ldr r1, =0xfffe0fff ands r0, r1 str r0, [r3, 0x8] - b _080A2A10 + b @080A2A10 .align 2, 0 .pool -_080A29FC: +@080A29FC: lsls r0, r2, 15 lsrs r0, 27 adds r0, 0x1 @@ -304552,21 +304552,21 @@ _080A29FC: ands r1, r2 orrs r1, r0 str r1, [r3, 0x8] -_080A2A10: +@080A2A10: movs r0, 0x1 - b _080A2A1A + b @080A2A1A .align 2, 0 .pool -_080A2A18: +@080A2A18: movs r0, 0 -_080A2A1A: +@080A2A1A: pop {r4} pop {r1} bx r1 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 @@ -304575,33 +304575,33 @@ sub_80A2A20: @ 80A2A20 lsrs r6, r2, 16 movs r5, 0 cmp r4, 0 - beq _080A2A54 -_080A2A32: + beq @080A2A54 +@080A2A32: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _080A2A46 + beq @080A2A46 adds r0, r5, 0 movs r1, 0x10 adds r2, r7, 0 adds r3, r6, 0 bl pal_fade_1 -_080A2A46: +@080A2A46: lsrs r4, 1 adds r0, r5, 0 adds r0, 0x10 lsls r0, 16 lsrs r5, r0, 16 cmp r4, 0 - bne _080A2A32 -_080A2A54: + bne @080A2A32 +@080A2A54: pop {r4-r7} pop {r0} bx r0 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 @@ -304624,16 +304624,16 @@ 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 lsrs r1, 16 cmp r1, 0 - beq _080A2AD8 + beq @080A2AD8 movs r6, 0x1F adds r5, r1, 0 -_080A2AA0: +@080A2AA0: ldrh r1, [r4] movs r2, 0x1F ands r2, r1 @@ -304661,25 +304661,25 @@ _080A2AA0: adds r4, 0x2 subs r5, 0x1 cmp r5, 0 - bne _080A2AA0 -_080A2AD8: + bne @080A2AA0 +@080A2AD8: pop {r4-r6} pop {r0} bx r0 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 lsrs r1, 16 cmp r1, 0 - beq _080A2B34 + beq @080A2B34 movs r6, 0x1F ldr r7, =0x0852489c adds r5, r1, 0 -_080A2AF2: +@080A2AF2: ldrh r1, [r4] movs r2, 0x1F ands r2, r1 @@ -304700,9 +304700,9 @@ _080A2AF2: adds r2, r0 asrs r2, 8 cmp r2, 0x1F - bls _080A2B1E + bls @080A2B1E movs r2, 0x1F -_080A2B1E: +@080A2B1E: adds r0, r2, r7 ldrb r2, [r0] lsls r0, r2, 10 @@ -304713,8 +304713,8 @@ _080A2B1E: adds r4, 0x2 subs r5, 0x1 cmp r5, 0 - bne _080A2AF2 -_080A2B34: + bne @080A2AF2 +@080A2B34: pop {r4-r7} pop {r0} bx r0 @@ -304723,16 +304723,16 @@ _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 lsrs r1, 16 cmp r1, 0 - beq _080A2BA2 + beq @080A2BA2 movs r7, 0x1F adds r6, r1, 0 -_080A2B50: +@080A2B50: ldrh r0, [r5] movs r1, 0x1F ands r1, r0 @@ -304763,9 +304763,9 @@ _080A2B50: lsls r0, 20 lsrs r3, r0, 24 cmp r2, 0x1F - ble _080A2B90 + ble @080A2B90 movs r2, 0x1F -_080A2B90: +@080A2B90: lsls r0, r3, 10 lsls r1, r4, 5 orrs r0, r1 @@ -304774,8 +304774,8 @@ _080A2B90: adds r5, 0x2 subs r6, 0x1 cmp r6, 0 - bne _080A2B50 -_080A2BA2: + bne @080A2B50 +@080A2BA2: pop {r4-r7} pop {r0} bx r0 @@ -304784,7 +304784,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 @@ -304803,10 +304803,10 @@ sub_80A2BAC: @ 80A2BAC lsrs r0, 16 mov r12, r0 cmp r1, 0 - beq _080A2C38 + beq @080A2C38 movs r7, 0x1F adds r6, r1, 0 -_080A2BD6: +@080A2BD6: ldrh r0, [r5] movs r1, 0x1F ands r1, r0 @@ -304839,17 +304839,17 @@ _080A2BD6: lsls r0, 16 lsrs r3, r0, 24 cmp r4, 0x1F - ble _080A2C1A + ble @080A2C1A movs r4, 0x1F -_080A2C1A: +@080A2C1A: cmp r2, 0x1F - ble _080A2C20 + ble @080A2C20 movs r2, 0x1F -_080A2C20: +@080A2C20: cmp r3, 0x1F - ble _080A2C26 + ble @080A2C26 movs r3, 0x1F -_080A2C26: +@080A2C26: lsls r0, r3, 10 lsls r1, r2, 5 orrs r0, r1 @@ -304858,8 +304858,8 @@ _080A2C26: adds r5, 0x2 subs r6, 0x1 cmp r6, 0 - bne _080A2BD6 -_080A2C38: + bne @080A2BD6 +@080A2C38: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -304869,7 +304869,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 @@ -304908,22 +304908,22 @@ sub_80A2C44: @ 80A2C44 lsls r4, 24 asrs r4, 24 cmp r4, 0 - blt _080A2CA4 + blt @080A2CA4 strh r4, [r1, 0xE] movs r0, 0x1 - b _080A2CAC + b @080A2CAC .align 2, 0 .pool -_080A2CA4: +@080A2CA4: movs r0, 0 strh r0, [r1, 0xE] negs r0, r4 adds r0, 0x1 -_080A2CAC: +@080A2CAC: strh r0, [r1, 0xC] lsls r4, r5, 2 cmp r6, r7 - bcs _080A2CC4 + bcs @080A2CC4 ldr r0, =0x03005e00 adds r1, r4, r5 lsls r1, 3 @@ -304932,7 +304932,7 @@ _080A2CAC: ldrsh r0, [r1, r2] negs r0, r0 strh r0, [r1, 0xC] -_080A2CC4: +@080A2CC4: adds r0, r5, 0 movs r1, 0x5 mov r2, r10 @@ -304960,53 +304960,53 @@ _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 movs r2, 0 ldr r4, =sub_80A2D54 + 1 ldr r1, =0x03005e00 -_080A2D04: +@080A2D04: ldrb r0, [r1, 0x4] cmp r0, 0x1 - bne _080A2D24 + bne @080A2D24 ldr r0, [r1] cmp r0, r4 - bne _080A2D24 + bne @080A2D24 movs r5, 0x18 ldrsh r0, [r1, r5] cmp r0, r3 - bne _080A2D24 + bne @080A2D24 movs r0, 0x1 - b _080A2D2E + b @080A2D2E .align 2, 0 .pool -_080A2D24: +@080A2D24: adds r1, 0x28 adds r2, 0x1 cmp r2, 0xF - ble _080A2D04 + ble @080A2D04 movs r0, 0 -_080A2D2E: +@080A2D2E: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_80A2CF8 thumb_func_start sub_80A2D34 -sub_80A2D34: @ 80A2D34 +sub_80A2D34: ; 80A2D34 push {lr} - b _080A2D3C -_080A2D38: + b @080A2D3C +@080A2D38: bl remove_task -_080A2D3C: +@080A2D3C: ldr r0, =sub_80A2D54 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _080A2D38 + bne @080A2D38 pop {r0} bx r0 .align 2, 0 @@ -305014,7 +305014,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 @@ -305035,7 +305035,7 @@ sub_80A2D54: @ 80A2D54 movs r2, 0x6 ldrsh r1, [r4, r2] cmp r0, r1 - ble _080A2DCC + ble @080A2DCC movs r0, 0 strh r0, [r4, 0x8] ldrb r1, [r4] @@ -305049,39 +305049,39 @@ sub_80A2D54: @ 80A2D54 movs r6, 0x2 ldrsh r2, [r4, r6] cmp r0, r2 - bne _080A2DAC + bne @080A2DAC adds r0, r5, 0 bl remove_task - b _080A2DCC + b @080A2DCC .align 2, 0 .pool -_080A2DAC: +@080A2DAC: ldrh r0, [r4, 0x4] adds r1, r0 strh r1, [r4] lsls r0, 16 cmp r0, 0 - blt _080A2DC2 + blt @080A2DC2 lsls r0, r1, 16 asrs r0, 16 cmp r0, r2 - blt _080A2DCC - b _080A2DCA -_080A2DC2: + blt @080A2DCC + b @080A2DCA +@080A2DC2: lsls r0, r1, 16 asrs r0, 16 cmp r0, r2 - bgt _080A2DCC -_080A2DCA: + bgt @080A2DCC +@080A2DCA: strh r3, [r4] -_080A2DCC: +@080A2DCC: pop {r4-r6} pop {r0} bx r0 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 @@ -305094,61 +305094,61 @@ 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] adds r2, r0, 0 cmp r1, 0x7 - bhi _080A2ECA + bhi @080A2ECA lsls r0, r1, 2 - ldr r1, =_080A2E08 + ldr r1, =@080A2E08 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080A2E08: - .4byte _080A2ECA - .4byte _080A2E28 - .4byte _080A2ECA - .4byte _080A2ECA - .4byte _080A2ECA - .4byte _080A2E3C - .4byte _080A2E5C - .4byte _080A2E98 -_080A2E28: +@080A2E08: + .4byte @080A2ECA + .4byte @080A2E28 + .4byte @080A2ECA + .4byte @080A2ECA + .4byte @080A2ECA + .4byte @080A2E3C + .4byte @080A2E5C + .4byte @080A2E98 +@080A2E28: movs r0, 0x2 strb r0, [r2] ldr r0, =0x03000f48 ldrh r0, [r0] bl song_play_for_text - b _080A2ECA + b @080A2ECA .align 2, 0 .pool -_080A2E3C: +@080A2E3C: bl sub_80A3258 lsls r0, 24 cmp r0, 0 - beq _080A2ECA + beq @080A2ECA ldr r0, =0x03000f4a movs r1, 0 strh r1, [r0] ldr r0, =0x03000f4c strb r1, [r0] - b _080A2ECA + b @080A2ECA .align 2, 0 .pool -_080A2E5C: +@080A2E5C: bl sub_80A3258 lsls r0, 24 cmp r0, 0 - beq _080A2ECA + beq @080A2ECA bl task_is_not_running_overworld_fanfare lsls r0, 24 cmp r0, 0 - beq _080A2ECA + beq @080A2ECA ldr r2, =0x03000f48 ldr r1, =0x03000f4a ldrh r0, [r1] @@ -305160,18 +305160,18 @@ _080A2E5C: strb r0, [r1] ldrh r0, [r2] bl song_play_for_text - b _080A2ECA + b @080A2ECA .align 2, 0 .pool -_080A2E98: +@080A2E98: bl sub_80A3258 lsls r0, 24 cmp r0, 0 - beq _080A2ECA + beq @080A2ECA bl task_is_not_running_overworld_fanfare lsls r0, 24 cmp r0, 0 - beq _080A2ECA + beq @080A2ECA ldr r4, =0x03000f4a ldrh r0, [r4] ldr r5, =0x03000f4d @@ -305186,7 +305186,7 @@ _080A2E98: movs r0, 0x2 strb r0, [r1] strb r2, [r5] -_080A2ECA: +@080A2ECA: pop {r4,r5} pop {r0} bx r0 @@ -305195,7 +305195,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] @@ -305211,7 +305211,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 @@ -305220,7 +305220,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 @@ -305235,7 +305235,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] @@ -305250,17 +305250,17 @@ 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 bl sub_80A303C lsls r0, 24 cmp r0, 0 - beq _080A2F66 + beq @080A2F66 adds r0, r4, 0 bl play_sound_effect -_080A2F66: +@080A2F66: ldr r0, =0x03000f48 movs r1, 0 strh r1, [r0] @@ -305277,7 +305277,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 @@ -305302,7 +305302,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 @@ -305332,7 +305332,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 @@ -305359,29 +305359,29 @@ 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] cmp r0, 0x6 - beq _080A3058 + beq @080A3058 cmp r0, 0x5 - beq _080A3058 + beq @080A3058 cmp r0, 0x7 - beq _080A3058 + beq @080A3058 movs r0, 0x1 - b _080A305A + b @080A305A .align 2, 0 .pool -_080A3058: +@080A3058: movs r0, 0 -_080A305A: +@080A305A: pop {r1} bx r1 thumb_func_end sub_80A303C thumb_func_start pause_music_for_sound_maybe -pause_music_for_sound_maybe: @ 80A3060 +pause_music_for_sound_maybe: ; 80A3060 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -305404,40 +305404,40 @@ 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 ldr r2, =0x03000f4e ldrh r0, [r2] cmp r0, 0 - beq _080A30B0 + beq @080A30B0 subs r0, 0x1 strh r0, [r2] movs r0, 0 - b _080A30C8 + b @080A30C8 .align 2, 0 .pool -_080A30B0: +@080A30B0: cmp r1, 0 - bne _080A30C0 + bne @080A30C0 ldr r0, =0x03007420 bl m4aMPlayContinue - b _080A30C6 + b @080A30C6 .align 2, 0 .pool -_080A30C0: +@080A30C0: movs r0, 0 bl m4aSongNumStart -_080A30C6: +@080A30C6: movs r0, 0x1 -_080A30C8: +@080A30C8: pop {r1} bx r1 thumb_func_end ducking_tick thumb_func_start sub_80A30CC -sub_80A30CC: @ 80A30CC +sub_80A30CC: ; 80A30CC push {lr} lsls r0, 24 ldr r1, =0x085248bc @@ -305452,76 +305452,76 @@ sub_80A30CC: @ 80A30CC thumb_func_end sub_80A30CC thumb_func_start fanfare_play -fanfare_play: @ 80A30E4 +fanfare_play: ; 80A30E4 push {lr} lsls r0, 16 lsrs r3, r0, 16 movs r1, 0 ldr r2, =0x085248bc -_080A30EE: +@080A30EE: ldrh r0, [r2] cmp r0, r3 - bne _080A3108 + bne @080A3108 lsls r0, r1, 24 lsrs r0, 24 bl pause_music_for_sound_maybe bl task_add_50_overworld_fanfare_if_not_running - b _080A311A + b @080A311A .align 2, 0 .pool -_080A3108: +@080A3108: adds r2, 0x4 adds r1, 0x1 cmp r1, 0x11 - bls _080A30EE + bls @080A30EE movs r0, 0 bl pause_music_for_sound_maybe bl task_add_50_overworld_fanfare_if_not_running -_080A311A: +@080A311A: pop {r0} bx r0 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 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080A3138 + beq @080A3138 movs r0, 0x1 - b _080A313A + b @080A313A .align 2, 0 .pool -_080A3138: +@080A3138: movs r0, 0 -_080A313A: +@080A313A: pop {r1} bx r1 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 ldr r1, =0x03000f4e ldrh r0, [r1] cmp r0, 0 - beq _080A3158 + beq @080A3158 subs r0, 0x1 strh r0, [r1] - b _080A3164 + b @080A3164 .align 2, 0 .pool -_080A3158: +@080A3158: ldr r0, =0x03007420 bl m4aMPlayContinue adds r0, r4, 0 bl remove_task -_080A3164: +@080A3164: pop {r4} pop {r0} bx r0 @@ -305530,7 +305530,7 @@ _080A3164: thumb_func_end task50_overworld_fanfare thumb_func_start task_add_50_overworld_fanfare_if_not_running -task_add_50_overworld_fanfare_if_not_running: @ 80A3170 +task_add_50_overworld_fanfare_if_not_running: ; 80A3170 push {r4,lr} ldr r4, =task50_overworld_fanfare + 1 adds r0, r4, 0 @@ -305538,11 +305538,11 @@ task_add_50_overworld_fanfare_if_not_running: @ 80A3170 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080A318A + beq @080A318A adds r0, r4, 0 movs r1, 0x50 bl AddTask -_080A318A: +@080A318A: pop {r4} pop {r0} bx r0 @@ -305551,7 +305551,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 @@ -305560,14 +305560,14 @@ sub_80A3194: @ 80A3194 ldr r0, =0x03005df8 ldrb r0, [r0] cmp r0, 0 - beq _080A31A8 + beq @080A31A8 movs r5, 0 -_080A31A8: +@080A31A8: ldr r6, =0x0000ffff cmp r5, r6 - bne _080A31B0 + bne @080A31B0 movs r5, 0 -_080A31B0: +@080A31B0: adds r0, r5, 0 bl m4aSongNumStart ldr r4, =0x03007420 @@ -305590,7 +305590,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 @@ -305604,29 +305604,29 @@ 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] cmp r1, 0 - blt _080A3220 + blt @080A3220 ldr r0, =0x0000ffff ands r1, r0 cmp r1, 0 - beq _080A3220 + beq @080A3220 movs r0, 0 - b _080A3222 + b @080A3222 .align 2, 0 .pool -_080A3220: +@080A3220: movs r0, 0x1 -_080A3222: +@080A3222: pop {r1} bx r1 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 @@ -305640,8 +305640,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 @@ -305655,25 +305655,25 @@ 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] cmp r0, 0 - beq _080A326C + beq @080A326C movs r0, 0 - b _080A326E + b @080A326E .align 2, 0 .pool -_080A326C: +@080A326C: movs r0, 0x1 -_080A326E: +@080A326E: pop {r1} bx r1 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 @@ -305708,7 +305708,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 @@ -305729,7 +305729,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 @@ -305739,7 +305739,7 @@ sub_80A32E4: @ 80A32E4 lsls r2, 24 lsrs r4, r2, 24 cmp r4, 0x1 - bne _080A330A + bne @080A330A lsls r1, r5, 24 asrs r1, 24 str r4, [sp] @@ -305747,8 +305747,8 @@ sub_80A32E4: @ 80A32E4 movs r2, 0x78 movs r3, 0xA bl sub_80A344C - b _080A332E -_080A330A: + b @080A332E +@080A330A: ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x55 @@ -305764,7 +305764,7 @@ _080A330A: movs r0, 0x2 strb r0, [r1] bl sub_80A3754 -_080A332E: +@080A332E: add sp, 0x4 pop {r4-r6} pop {r0} @@ -305774,7 +305774,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 @@ -305787,26 +305787,26 @@ sub_80A3344: @ 80A3344 lsrs r2, 24 adds r4, r2, 0 cmp r2, 0x1 - bne _080A336E + bne @080A336E lsls r1, 24 asrs r1, 24 str r2, [sp] movs r2, 0x78 movs r3, 0xA bl sub_80A344C - b _080A3394 -_080A336E: + b @080A3394 +@080A336E: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - bne _080A3384 + bne @080A3384 ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x55 bl MPlayVolumeControl -_080A3384: +@080A3384: lsls r1, r5, 24 asrs r1, 24 str r4, [sp] @@ -305814,7 +305814,7 @@ _080A3384: movs r2, 0x78 movs r3, 0xA bl sub_80A344C -_080A3394: +@080A3394: add sp, 0x4 pop {r4-r6} pop {r0} @@ -305824,7 +305824,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 @@ -305834,7 +305834,7 @@ play_cry_maybe: @ 80A33A8 lsls r2, 24 lsrs r4, r2, 24 cmp r4, 0x1 - bne _080A33CE + bne @080A33CE lsls r1, r5, 24 asrs r1, 24 str r4, [sp] @@ -305842,8 +305842,8 @@ play_cry_maybe: @ 80A33A8 movs r2, 0x78 movs r3, 0xA bl sub_80A344C - b _080A33EE -_080A33CE: + b @080A33EE +@080A33CE: ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x55 @@ -305858,7 +305858,7 @@ _080A33CE: ldr r1, =0x020383ec movs r0, 0x2 strb r0, [r1] -_080A33EE: +@080A33EE: add sp, 0x4 pop {r4-r6} pop {r0} @@ -305868,7 +305868,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 @@ -305900,7 +305900,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 @@ -305930,112 +305930,112 @@ sub_80A344C: @ 80A344C lsls r4, 6 mov r8, r5 cmp r1, 0xC - bhi _080A3562 + bhi @080A3562 lsls r0, r1, 2 - ldr r1, =_080A349C + ldr r1, =@080A349C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080A349C: - .4byte _080A3562 - .4byte _080A34D0 - .4byte _080A34D6 - .4byte _080A34E4 - .4byte _080A34F8 - .4byte _080A3510 - .4byte _080A351C - .4byte _080A352C - .4byte _080A3536 - .4byte _080A3540 - .4byte _080A3550 - .4byte _080A3560 - .4byte _080A355C -_080A34D0: +@080A349C: + .4byte @080A3562 + .4byte @080A34D0 + .4byte @080A34D6 + .4byte @080A34E4 + .4byte @080A34F8 + .4byte @080A3510 + .4byte @080A351C + .4byte @080A352C + .4byte @080A3536 + .4byte @080A3540 + .4byte @080A3550 + .4byte @080A3560 + .4byte @080A355C +@080A34D0: movs r6, 0x14 movs r5, 0xE1 - b _080A3562 -_080A34D6: + b @080A3562 +@080A34D6: movs r5, 0xE1 ldr r4, =0x00003cf0 movs r1, 0x14 - b _080A3504 + b @080A3504 .align 2, 0 .pool -_080A34E4: +@080A34E4: movs r6, 0x32 movs r5, 0xC8 ldr r4, =0x00003db8 movs r3, 0x14 mov r8, r3 movs r2, 0x5A - b _080A3562 + b @080A3562 .align 2, 0 .pool -_080A34F8: +@080A34F8: movs r6, 0x19 movs r0, 0x1 mov r9, r0 movs r5, 0x64 ldr r4, =0x00003cf0 movs r1, 0xC0 -_080A3504: +@080A3504: mov r8, r1 movs r2, 0x5A - b _080A3562 + b @080A3562 .align 2, 0 .pool -_080A3510: +@080A3510: movs r5, 0xC8 ldr r4, =0x00003868 - b _080A3562 + b @080A3562 .align 2, 0 .pool -_080A351C: +@080A351C: movs r5, 0xDC ldr r4, =0x00003cc3 movs r3, 0xC0 mov r8, r3 movs r2, 0x46 - b _080A3562 + b @080A3562 .align 2, 0 .pool -_080A352C: +@080A352C: movs r6, 0xA movs r5, 0x64 movs r4, 0xE8 lsls r4, 6 - b _080A3562 -_080A3536: + b @080A3562 +@080A3536: movs r6, 0x3C movs r5, 0xE1 movs r4, 0xF4 lsls r4, 6 - b _080A3562 -_080A3540: + b @080A3562 +@080A3540: movs r6, 0xF movs r0, 0x1 mov r9, r0 movs r5, 0x7D ldr r4, =0x00003b60 - b _080A3562 + b @080A3562 .align 2, 0 .pool -_080A3550: +@080A3550: movs r6, 0x64 movs r5, 0xE1 ldr r4, =0x00003b60 - b _080A3562 + b @080A3562 .align 2, 0 .pool -_080A355C: +@080A355C: movs r6, 0x14 movs r5, 0xE1 -_080A3560: +@080A3560: ldr r4, =0x00003a98 -_080A3562: +@080A3562: adds r0, r2, 0 bl sub_82E1744 mov r1, r10 @@ -306066,99 +306066,99 @@ _080A3562: lsrs r0, 24 adds r2, r0, 0 cmp r0, 0x1 - beq _080A35F0 + beq @080A35F0 cmp r0, 0x1 - bgt _080A35C0 + bgt @080A35C0 cmp r0, 0 - beq _080A35CA - b _080A365E + beq @080A35CA + b @080A365E .align 2, 0 .pool -_080A35C0: +@080A35C0: cmp r2, 0x2 - beq _080A3614 + beq @080A3614 cmp r2, 0x3 - beq _080A3638 - b _080A365E -_080A35CA: + beq @080A3638 + b @080A365E +@080A35CA: mov r0, r9 cmp r0, 0 - beq _080A35E0 + beq @080A35E0 lsls r0, r1, 1 adds r0, r1 lsls r0, 2 ldr r1, =0x0869ef24 - b _080A3654 + b @080A3654 .align 2, 0 .pool -_080A35E0: +@080A35E0: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 ldr r1, =0x0869dcf4 - b _080A3654 + b @080A3654 .align 2, 0 .pool -_080A35F0: +@080A35F0: mov r3, r9 cmp r3, 0 - beq _080A3604 + beq @080A3604 lsls r0, r1, 1 adds r0, r1 lsls r0, 2 ldr r1, =0x0869f524 - b _080A3654 + b @080A3654 .align 2, 0 .pool -_080A3604: +@080A3604: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 ldr r1, =0x0869e2f4 - b _080A3654 + b @080A3654 .align 2, 0 .pool -_080A3614: +@080A3614: mov r0, r9 cmp r0, 0 - beq _080A3628 + beq @080A3628 lsls r0, r1, 1 adds r0, r1 lsls r0, 2 ldr r1, =0x0869fb24 - b _080A3654 + b @080A3654 .align 2, 0 .pool -_080A3628: +@080A3628: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 ldr r1, =0x0869e8f4 - b _080A3654 + b @080A3654 .align 2, 0 .pool -_080A3638: +@080A3638: mov r3, r9 cmp r3, 0 - beq _080A364C + beq @080A364C lsls r0, r1, 1 adds r0, r1 lsls r0, 2 ldr r1, =0x086a0124 - b _080A3654 + b @080A3654 .align 2, 0 .pool -_080A364C: +@080A364C: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 ldr r1, =0x0869eef4 -_080A3654: +@080A3654: adds r0, r1 bl sub_82E1674 ldr r1, =0x020383e8 str r0, [r1] -_080A365E: +@080A365E: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -306172,28 +306172,28 @@ _080A365E: thumb_func_end sub_80A344C thumb_func_start sub_80A3678 -sub_80A3678: @ 80A3678 +sub_80A3678: ; 80A3678 push {lr} ldr r0, =sub_80A370C + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080A3694 + beq @080A3694 bl sub_8000964 movs r0, 0x1 - b _080A3696 + b @080A3696 .align 2, 0 .pool -_080A3694: +@080A3694: movs r0, 0 -_080A3696: +@080A3696: pop {r1} bx r1 thumb_func_end sub_80A3678 thumb_func_start sub_80A369C -sub_80A369C: @ 80A369C +sub_80A369C: ; 80A369C push {lr} ldr r0, =0x020383e8 ldr r0, [r0] @@ -306206,7 +306206,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] @@ -306218,64 +306218,64 @@ 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] bl sub_82E17CC cmp r0, 0 - bne _080A36E4 + bne @080A36E4 bl sub_8000964 movs r0, 0 - b _080A36E6 + b @080A36E6 .align 2, 0 .pool -_080A36E4: +@080A36E4: movs r0, 0x1 -_080A36E6: +@080A36E6: pop {r1} bx r1 thumb_func_end sub_80A36C8 thumb_func_start sub_80A36EC -sub_80A36EC: @ 80A36EC +sub_80A36EC: ; 80A36EC push {lr} ldr r0, =0x020383e8 ldr r0, [r0] bl sub_82E17CC cmp r0, 0 - bne _080A3704 + bne @080A3704 movs r0, 0 - b _080A3706 + b @080A3706 .align 2, 0 .pool -_080A3704: +@080A3704: movs r0, 0x1 -_080A3706: +@080A3706: pop {r1} bx r1 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 ldr r1, =0x020383ec ldrb r0, [r1] cmp r0, 0 - beq _080A3724 + beq @080A3724 subs r0, 0x1 strb r0, [r1] - b _080A3742 + b @080A3742 .align 2, 0 .pool -_080A3724: +@080A3724: ldr r0, =0x020383e8 ldr r0, [r0] bl sub_82E17CC cmp r0, 0 - bne _080A3742 + bne @080A3742 ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x80 @@ -306283,7 +306283,7 @@ _080A3724: bl MPlayVolumeControl adds r0, r4, 0 bl remove_task -_080A3742: +@080A3742: pop {r4} pop {r0} bx r0 @@ -306292,7 +306292,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 + 1 adds r0, r4, 0 @@ -306300,11 +306300,11 @@ sub_80A3754: @ 80A3754 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080A376E + beq @080A376E adds r0, r4, 0 movs r1, 0x50 bl AddTask -_080A376E: +@080A376E: pop {r4} pop {r0} bx r0 @@ -306313,21 +306313,21 @@ _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 ldr r0, =0x03005df8 ldrb r0, [r0] cmp r0, 0 - beq _080A3788 + beq @080A3788 movs r1, 0 -_080A3788: +@080A3788: ldr r0, =0x0000ffff cmp r1, r0 - bne _080A3790 + bne @080A3790 movs r1, 0 -_080A3790: +@080A3790: adds r0, r1, 0 bl m4aSongNumStart pop {r0} @@ -306337,7 +306337,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 @@ -306347,7 +306347,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} @@ -306384,7 +306384,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 @@ -306409,7 +306409,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 @@ -306434,7 +306434,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 @@ -306456,7 +306456,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] @@ -306464,80 +306464,80 @@ mplay_has_finished_maybe: @ 80A38A0 lsls r2, 24 adds r3, r0, 0 cmp r1, 0 - bge _080A38BA + bge @080A38BA ldr r0, =0x03007630 ldr r0, [r0, 0x4] ands r0, r2 cmp r0, 0 - bne _080A38CC -_080A38BA: + bne @080A38CC +@080A38BA: ldr r1, =0x0000ffff ldrh r0, [r3, 0x4] cmp r0, 0 - bne _080A38DC + bne @080A38DC ldr r0, =0x03007630 ldr r0, [r0, 0x4] ands r0, r1 cmp r0, 0 - bne _080A38DC -_080A38CC: + bne @080A38DC +@080A38CC: movs r0, 0 - b _080A38DE + b @080A38DE .align 2, 0 .pool -_080A38DC: +@080A38DC: movs r0, 0x1 -_080A38DE: +@080A38DE: pop {r1} bx r1 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] cmp r1, 0 - blt _080A3904 + blt @080A3904 ldr r0, =0x0000ffff ands r1, r0 cmp r1, 0 - beq _080A3904 + beq @080A3904 movs r0, 0x1 - b _080A3906 + b @080A3906 .align 2, 0 .pool -_080A3904: +@080A3904: movs r0, 0 -_080A3906: +@080A3906: pop {r1} bx r1 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] cmp r1, 0 - blt _080A392C + blt @080A392C ldr r0, =0x0000ffff ands r1, r0 cmp r1, 0 - beq _080A392C + beq @080A392C movs r0, 0x1 - b _080A392E + b @080A392E .align 2, 0 .pool -_080A392C: +@080A392C: movs r0, 0 -_080A392E: +@080A392E: pop {r1} bx r1 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 @@ -306575,23 +306575,23 @@ sub_80A3934: @ 80A3934 adds r3, r1, 0 ldr r1, =0x0203840a movs r2, 0x7 -_080A397E: +@080A397E: ldrh r0, [r1] orrs r0, r3 strh r0, [r1] adds r1, 0x2 subs r2, 0x1 cmp r2, 0 - bge _080A397E + bge @080A397E ldr r1, =0x0203841e movs r2, 0 adds r0, r1, 0 adds r0, 0xE -_080A3994: +@080A3994: strh r2, [r0] subs r0, 0x2 cmp r0, r1 - bge _080A3994 + bge @080A3994 movs r1, 0 movs r0, 0xFF strb r0, [r4] @@ -306619,7 +306619,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 @@ -306642,7 +306642,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 @@ -306659,7 +306659,7 @@ move_something: @ 80A3A48 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080A3AE8 + bne @080A3AE8 bl sub_80A8278 movs r0, 0 bl sub_8072A88 @@ -306670,24 +306670,24 @@ move_something: @ 80A3A48 ldr r6, =0x0202406e movs r7, 0x64 ldr r5, =0x02038438 -_080A3A84: +@080A3A84: lsls r0, r4, 24 lsrs r0, 24 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080A3AA8 + beq @080A3AA8 ldrh r0, [r6] muls r0, r7 ldr r1, =0x02024744 - b _080A3AAE + b @080A3AAE .align 2, 0 .pool -_080A3AA8: +@080A3AA8: ldrh r0, [r6] muls r0, r7 ldr r1, =0x020244ec -_080A3AAE: +@080A3AAE: adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -306696,17 +306696,17 @@ _080A3AAE: adds r5, 0x2 adds r4, 0x1 cmp r4, 0x3 - ble _080A3A84 + ble @080A3A84 ldr r3, =0x02038434 ldr r5, =0x02038430 ldr r1, =0x020383fd mov r12, r1 ldr r7, =0x020383f8 ldr r6, =move_anim_execute + 1 - b _080A3B10 + b @080A3B10 .align 2, 0 .pool -_080A3AE8: +@080A3AE8: ldr r3, =0x02038434 ldr r5, =0x02038430 mov r0, r8 @@ -306719,7 +306719,7 @@ _080A3AE8: ldr r2, =0x02039f34 ldr r1, =0x02038438 movs r4, 0x3 -_080A3B00: +@080A3B00: ldr r0, [r2] ldr r0, [r0, 0x18] ldrh r0, [r0] @@ -306727,28 +306727,28 @@ _080A3B00: adds r1, 0x2 subs r4, 0x1 cmp r4, 0 - bge _080A3B00 -_080A3B10: + bge @080A3B00 +@080A3B10: mov r0, r9 cmp r0, 0 - bne _080A3B38 + bne @080A3B38 strh r0, [r3] - b _080A3B3C + b @080A3B3C .align 2, 0 .pool -_080A3B38: +@080A3B38: mov r1, r8 strh r1, [r3] -_080A3B3C: +@080A3B3C: ldr r1, =0x0203841e movs r2, 0 adds r0, r1, 0 adds r0, 0xE -_080A3B44: +@080A3B44: strh r2, [r0] subs r0, 0x2 cmp r0, r1 - bge _080A3B44 + bge @080A3B44 movs r0, 0xFF strb r0, [r5] movs r0, 0x1 @@ -306770,37 +306770,37 @@ _080A3B44: adds r2, r0, 0 ldr r1, =0x0203840a movs r4, 0x7 -_080A3B76: +@080A3B76: ldrh r0, [r1] orrs r0, r2 strh r0, [r1] adds r1, 0x2 subs r4, 0x1 cmp r4, 0 - bge _080A3B76 + bge @080A3B76 mov r1, r9 cmp r1, 0 - beq _080A3BC2 + beq @080A3BC2 movs r4, 0 ldr r2, =0x082c8d64 - b _080A3BAA + b @080A3BAA .align 2, 0 .pool -_080A3BA8: +@080A3BA8: adds r4, 0x1 -_080A3BAA: +@080A3BAA: lsls r0, r4, 1 adds r0, r2 ldrh r0, [r0] ldr r1, =0x0000ffff cmp r0, r1 - beq _080A3BC2 + beq @080A3BC2 cmp r8, r0 - bne _080A3BA8 + bne @080A3BA8 ldr r0, =0x03007420 movs r2, 0x80 bl MPlayVolumeControl -_080A3BC2: +@080A3BC2: ldr r0, =0x02022e24 movs r1, 0 strh r1, [r0] @@ -306823,7 +306823,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 @@ -306841,7 +306841,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 @@ -306857,7 +306857,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 @@ -306873,34 +306873,34 @@ 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 movs r2, 0 ldr r4, =0x0000ffff ldr r1, =0x0203840a -_080A3C60: +@080A3C60: ldrh r0, [r1] cmp r0, r4 - bne _080A3C74 + bne @080A3C74 strh r3, [r1] - b _080A3C7C + b @080A3C7C .align 2, 0 .pool -_080A3C74: +@080A3C74: adds r1, 0x2 adds r2, 0x1 cmp r2, 0x7 - ble _080A3C60 -_080A3C7C: + ble @080A3C60 +@080A3C7C: pop {r4} pop {r0} bx r0 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 @@ -306908,55 +306908,55 @@ sub_80A3C84: @ 80A3C84 ldr r0, =0x0000ffff adds r4, r0, 0 ldr r1, =0x0203840a -_080A3C92: +@080A3C92: ldrh r0, [r1] cmp r0, r3 - bne _080A3CA8 + bne @080A3CA8 orrs r0, r4 strh r0, [r1] - b _080A3CB0 + b @080A3CB0 .align 2, 0 .pool -_080A3CA8: +@080A3CA8: adds r1, 0x2 adds r2, 0x1 cmp r2, 0x7 - ble _080A3C92 -_080A3CB0: + ble @080A3C92 +@080A3CB0: pop {r4} pop {r0} bx r0 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] movs r0, 0 ldrsb r0, [r2, r0] cmp r0, 0 - bgt _080A3CDC + bgt @080A3CDC ldr r0, =0x020383f8 ldr r1, =move_anim_execute + 1 str r1, [r0] movs r0, 0 - b _080A3CDE + b @080A3CDE .align 2, 0 .pool -_080A3CDC: +@080A3CDC: subs r0, r1, 0x1 -_080A3CDE: +@080A3CDE: strb r0, [r2] pop {r0} bx r0 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, =0x08525e98 -_080A3CE8: +@080A3CE8: ldr r0, =0x020383f0 ldr r0, [r0] ldrb r0, [r0] @@ -306969,12 +306969,12 @@ _080A3CE8: lsls r0, 24 asrs r0, 24 cmp r0, 0 - bne _080A3D0C + bne @080A3D0C ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 - bne _080A3CE8 -_080A3D0C: + bne @080A3CE8 +@080A3D0C: pop {r4} pop {r0} bx r0 @@ -306983,7 +306983,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] @@ -307024,8 +307024,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] @@ -307060,7 +307060,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] @@ -307085,11 +307085,11 @@ ma02_instanciate_template: @ 80A3DD8 adds r1, 0x7 str r1, [r5] cmp r0, 0 - beq _080A3E28 + beq @080A3E28 adds r6, r5, 0 ldr r5, =0x0203841e adds r3, r0, 0 -_080A3E10: +@080A3E10: ldr r2, [r6] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -307101,43 +307101,43 @@ _080A3E10: adds r5, 0x2 subs r3, 0x1 cmp r3, 0 - bne _080A3E10 -_080A3E28: + bne @080A3E10 +@080A3E28: movs r0, 0x80 ands r0, r4 cmp r0, 0 - beq _080A3E58 + beq @080A3E58 movs r0, 0x80 eors r4, r0 cmp r4, 0x3F - bls _080A3E48 + bls @080A3E48 adds r0, r4, 0 subs r0, 0x40 - b _080A3E4A + b @080A3E4A .align 2, 0 .pool -_080A3E48: +@080A3E48: negs r0, r4 -_080A3E4A: +@080A3E4A: lsls r0, 24 lsrs r4, r0, 24 ldr r0, =0x02038437 - b _080A3E6A + b @080A3E6A .align 2, 0 .pool -_080A3E58: +@080A3E58: cmp r4, 0x3F - bls _080A3E62 + bls @080A3E62 adds r0, r4, 0 subs r0, 0x40 - b _080A3E64 -_080A3E62: + b @080A3E64 +@080A3E62: negs r0, r4 -_080A3E64: +@080A3E64: lsls r0, 24 lsrs r4, r0, 24 ldr r0, =0x02038436 -_080A3E6A: +@080A3E6A: ldrb r0, [r0] bl sub_80A82E4 lsls r0, 24 @@ -307150,9 +307150,9 @@ _080A3E6A: lsls r0, r6, 16 asrs r0, 16 cmp r0, 0x2 - bgt _080A3E88 + bgt @080A3E88 movs r6, 0x3 -_080A3E88: +@080A3E88: ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 @@ -307183,7 +307183,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] @@ -307208,11 +307208,11 @@ sub_80A3ECC: @ 80A3ECC adds r1, 0x7 str r1, [r4] cmp r0, 0 - beq _080A3F1C + beq @080A3F1C adds r5, r4, 0 ldr r4, =0x0203841e adds r3, r0, 0 -_080A3F04: +@080A3F04: ldr r2, [r5] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -307224,8 +307224,8 @@ _080A3F04: adds r4, 0x2 subs r3, 0x1 cmp r3, 0 - bne _080A3F04 -_080A3F1C: + bne @080A3F04 +@080A3F1C: adds r0, r6, 0 adds r1, r7, 0 bl AddTask @@ -307244,7 +307244,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] @@ -307255,12 +307255,12 @@ ma04_wait_countdown: @ 80A3F48 strb r0, [r3] lsls r0, 24 cmp r0, 0 - bne _080A3F66 + bne @080A3F66 movs r4, 0x1 negs r4, r4 adds r0, r4, 0 strb r0, [r3] -_080A3F66: +@080A3F66: adds r0, r2, 0x1 str r0, [r1] ldr r1, =0x020383f8 @@ -307274,26 +307274,26 @@ _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] cmp r2, 0 - bne _080A3FAC + bne @080A3FAC ldr r0, =0x020383f0 ldr r1, [r0] adds r1, 0x1 str r1, [r0] ldr r0, =0x020383fc strb r2, [r0] - b _080A3FB2 + b @080A3FB2 .align 2, 0 .pool -_080A3FAC: +@080A3FAC: ldr r1, =0x020383fc movs r0, 0x1 strb r0, [r1] -_080A3FB2: +@080A3FB2: pop {r0} bx r0 .align 2, 0 @@ -307301,17 +307301,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} @@ -307320,30 +307320,30 @@ sub_80A3FC4: @ 80A3FC4 ldr r0, =0x020383fe ldrb r0, [r0] cmp r0, 0 - bne _080A3FEC + bne @080A3FEC ldr r0, =0x020383ff ldrb r0, [r0] cmp r0, 0 - bne _080A3FEC + bne @080A3FEC ldr r1, =0x02038430 ldrb r0, [r1] cmp r0, 0xFF - bne _080A3FEC + bne @080A3FEC ldrb r0, [r1, 0x1] cmp r0, 0xFF - beq _080A4004 -_080A3FEC: + beq @080A4004 +@080A3FEC: ldr r1, =0x0203842e movs r0, 0 strh r0, [r1] - b _080A401E + b @080A401E .align 2, 0 .pool -_080A4004: +@080A4004: bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - beq _080A403C + beq @080A403C ldr r1, =0x0203842e ldrh r0, [r1] adds r0, 0x1 @@ -307351,20 +307351,20 @@ _080A4004: lsls r0, 16 lsrs r0, 16 cmp r0, 0x5A - bhi _080A4030 -_080A401E: + bhi @080A4030 +@080A401E: ldr r1, =0x020383fc movs r0, 0x1 strb r0, [r1] - b _080A40A2 + b @080A40A2 .align 2, 0 .pool -_080A4030: +@080A4030: ldr r0, =0x030075f0 bl MPlayStop_rev01 ldr r0, =0x03007630 bl MPlayStop_rev01 -_080A403C: +@080A403C: ldr r1, =0x0203842e movs r0, 0 strh r0, [r1] @@ -307372,10 +307372,10 @@ _080A403C: ldr r7, =0x0000ffff ldr r6, =0x08524b44 ldr r4, =0x0203840a -_080A404A: +@080A404A: ldrh r0, [r4] cmp r0, r7 - beq _080A406E + beq @080A406E lsls r0, 3 adds r0, r6 ldrh r0, [r0, 0x6] @@ -307389,14 +307389,14 @@ _080A404A: adds r0, r7, 0 orrs r0, r1 strh r0, [r4] -_080A406E: +@080A406E: adds r4, 0x2 adds r5, 0x1 cmp r5, 0x7 - ble _080A404A + ble @080A404A mov r1, r8 cmp r1, 0 - bne _080A40A2 + bne @080A40A2 ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x80 @@ -307405,15 +307405,15 @@ _080A406E: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080A409C + bne @080A409C bl sub_80A8278 movs r0, 0x1 bl sub_8072A88 -_080A409C: +@080A409C: ldr r0, =0x020383fd mov r1, r8 strb r1, [r0] -_080A40A2: +@080A40A2: pop {r3} mov r8, r3 pop {r4-r7} @@ -307424,7 +307424,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] @@ -307446,7 +307446,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} @@ -307477,13 +307477,13 @@ sub_80A40F4: @ 80A40F4 movs r3, 0x4 ldrsh r0, [r6, r3] cmp r0, 0 - bne _080A4148 + bne @080A4148 adds r0, r7, 0 bl move_anim_task_del - b _080A41BE + b @080A41BE .align 2, 0 .pool -_080A4148: +@080A4148: ldr r0, =task_pA_ma0A_obj_to_bg_pal + 1 movs r1, 0xA bl AddTask @@ -307507,20 +307507,20 @@ _080A4148: movs r3, 0x2 ldrsh r0, [r6, r3] cmp r0, 0 - bne _080A4190 + bne @080A4190 ldr r0, =0x02022e18 ldrh r0, [r0] strh r0, [r1, 0xE] ldr r0, =0x02022e1a - b _080A4198 + b @080A4198 .align 2, 0 .pool -_080A4190: +@080A4190: ldr r0, =0x02022e1c ldrh r0, [r0] strh r0, [r1, 0xE] ldr r0, =0x02022e1e -_080A4198: +@080A4198: ldrh r0, [r0] strh r0, [r1, 0x10] ldr r1, =0x03005e00 @@ -307539,7 +307539,7 @@ _080A4198: strb r2, [r0] adds r0, r7, 0 bl move_anim_task_del -_080A41BE: +@080A41BE: pop {r3} mov r8, r3 pop {r4-r7} @@ -307550,7 +307550,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] @@ -307560,20 +307560,20 @@ sub_80A41D8: @ 80A41D8 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _080A41F8 + beq @080A41F8 ldr r0, =0x02038437 - b _080A41FA + b @080A41FA .align 2, 0 .pool -_080A41F8: +@080A41F8: ldr r0, =0x02038436 -_080A41FA: +@080A41FA: ldrb r4, [r0] adds r0, r4, 0 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _080A4266 + beq @080A4266 adds r0, r4, 0 bl battle_get_per_side_status lsls r0, 24 @@ -307582,19 +307582,19 @@ _080A41FA: adds r0, r1 lsrs r0, 24 cmp r0, 0x1 - bls _080A4226 + bls @080A4226 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A4230 -_080A4226: + beq @080A4230 +@080A4226: movs r5, 0 - b _080A4232 + b @080A4232 .align 2, 0 .pool -_080A4230: +@080A4230: movs r5, 0x1 -_080A4232: +@080A4232: adds r0, r4, 0 adds r1, r5, 0 movs r2, 0 @@ -307619,14 +307619,14 @@ _080A4232: movs r1, 0x1 strh r1, [r0, 0xC] strh r2, [r0, 0xE] -_080A4266: +@080A4266: movs r0, 0x2 eors r4, r0 adds r0, r4, 0 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _080A42D8 + beq @080A42D8 adds r0, r4, 0 bl battle_get_per_side_status lsls r0, 24 @@ -307635,19 +307635,19 @@ _080A4266: adds r0, r1 lsrs r0, 24 cmp r0, 0x1 - bls _080A4294 + bls @080A4294 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A42A4 -_080A4294: + beq @080A42A4 +@080A4294: movs r5, 0 - b _080A42A6 + b @080A42A6 .align 2, 0 .pool -_080A42A4: +@080A42A4: movs r5, 0x1 -_080A42A6: +@080A42A6: adds r0, r4, 0 adds r1, r5, 0 movs r2, 0 @@ -307671,7 +307671,7 @@ _080A42A6: movs r1, 0x1 strh r1, [r0, 0xC] strh r1, [r0, 0xE] -_080A42D8: +@080A42D8: ldr r1, =0x020383f0 ldr r0, [r1] adds r0, 0x1 @@ -307690,7 +307690,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 @@ -307698,24 +307698,24 @@ b_side_obj__get_some_boolean: @ 80A4310 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A4330 + beq @080A4330 ldr r0, =0x02038436 ldrb r0, [r0] cmp r4, r0 - beq _080A4374 - b _080A4384 + beq @080A4374 + b @080A4384 .align 2, 0 .pool -_080A4330: +@080A4330: adds r0, r4, 0 bl sub_80A6A90 lsls r0, 24 cmp r0, 0 - beq _080A4384 + beq @080A4384 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080A4374 + bne @080A4374 ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -307725,7 +307725,7 @@ _080A4330: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080A4374 + beq @080A4374 ldr r2, =0x02020630 ldr r0, =0x020241e4 adds r0, r5, r0 @@ -307738,22 +307738,22 @@ _080A4330: ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt _080A4384 -_080A4374: + blt @080A4384 +@080A4374: movs r0, 0x1 - b _080A4386 + b @080A4386 .align 2, 0 .pool -_080A4384: +@080A4384: movs r0, 0 -_080A4386: +@080A4386: pop {r4,r5} pop {r1} bx r1 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 @@ -307767,14 +307767,14 @@ sub_80A438C: @ 80A438C lsrs r2, 24 mov r9, r2 cmp r1, 0 - beq _080A43AA - b _080A455E -_080A43AA: + beq @080A43AA + b @080A455E +@080A43AA: bl sub_80A4DF0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080A43DC + bne @080A43DC ldr r1, =0x06008000 movs r2, 0x80 lsls r2, 6 @@ -307787,10 +307787,10 @@ _080A43AA: movs r0, 0xFF movs r3, 0 bl RequestDma3Fill - b _080A43F8 + b @080A43F8 .align 2, 0 .pool -_080A43DC: +@080A43DC: ldr r1, =0x06004000 movs r2, 0x80 lsls r2, 6 @@ -307803,7 +307803,7 @@ _080A43DC: movs r0, 0xFF movs r3, 0 bl RequestDma3Fill -_080A43F8: +@080A43F8: add r0, sp, 0x10 bl sub_80A6B30 add r0, sp, 0x20 @@ -307849,7 +307849,7 @@ _080A43F8: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A447A + beq @080A447A ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] @@ -307857,11 +307857,11 @@ _080A43F8: bl sub_80DB2A8 lsls r0, 24 cmp r0, 0 - beq _080A447A + beq @080A447A ldrh r0, [r5] subs r0, 0x1 strh r0, [r5] -_080A447A: +@080A447A: ldr r5, =0x02022e1a ldr r2, =0x02020630 lsls r1, r4, 4 @@ -307876,7 +307876,7 @@ _080A447A: strh r0, [r5] mov r0, r9 cmp r0, 0 - beq _080A44B0 + beq @080A44B0 ldr r0, =0x020241e4 adds r0, r6, r0 ldrb r1, [r0] @@ -307889,7 +307889,7 @@ _080A447A: movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_080A44B0: +@080A44B0: ldr r0, =0x02022e18 ldrh r1, [r0] movs r0, 0x14 @@ -307918,17 +307918,17 @@ _080A44B0: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A4524 + beq @080A4524 movs r3, 0 - b _080A452E + b @080A452E .align 2, 0 .pool -_080A4524: +@080A4524: adds r0, r6, 0 bl battle_get_per_side_status lsls r0, 24 lsrs r3, r0, 24 -_080A452E: +@080A452E: add r0, sp, 0x10 ldrb r0, [r0, 0x8] str r0, [sp] @@ -307946,12 +307946,12 @@ _080A452E: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080A4558 - b _080A4666 -_080A4558: + bne @080A4558 + b @080A4666 +@080A4558: bl sub_80A46A0 - b _080A4666 -_080A455E: + b @080A4666 +@080A455E: ldr r1, =0x06006000 movs r2, 0x80 lsls r2, 6 @@ -308021,7 +308021,7 @@ _080A455E: strh r0, [r4] mov r0, r9 cmp r0, 0 - beq _080A460E + beq @080A460E ldrb r1, [r2] lsls r0, r1, 4 adds r0, r1 @@ -308032,7 +308032,7 @@ _080A455E: movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_080A460E: +@080A460E: ldrh r1, [r5] movs r0, 0x18 bl lcd_io_set @@ -308071,7 +308071,7 @@ _080A460E: movs r1, 0 movs r2, 0 bl sub_8118FBC -_080A4666: +@080A4666: add sp, 0x28 pop {r3,r4} mov r8, r3 @@ -308084,7 +308084,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 @@ -308094,7 +308094,7 @@ sub_80A46A0: @ 80A46A0 bl sub_80DB2A8 lsls r0, 24 cmp r0, 0 - beq _080A4712 + beq @080A4712 mov r0, sp bl sub_80A6B30 ldr r6, [sp, 0x4] @@ -308102,13 +308102,13 @@ sub_80A46A0: @ 80A46A0 movs r0, 0x7 mov r12, r0 movs r7, 0 -_080A46C6: +@080A46C6: movs r4, 0 adds r3, r7, r6 mov r1, r12 lsls r0, r1, 1 adds r2, r0, r6 -_080A46D0: +@080A46D0: ldrh r1, [r3] ldrh r0, [r2] strh r0, [r3] @@ -308117,34 +308117,34 @@ _080A46D0: subs r2, 0x2 adds r4, 0x1 cmp r4, 0x3 - ble _080A46D0 + ble @080A46D0 movs r0, 0x20 add r12, r0 adds r7, 0x40 adds r5, 0x1 cmp r5, 0x7 - ble _080A46C6 + ble @080A46C6 movs r5, 0 movs r1, 0x80 lsls r1, 3 adds r3, r1, 0 -_080A46F6: +@080A46F6: adds r2, r5, 0x1 lsls r0, r5, 6 adds r1, r0, r6 movs r4, 0x7 -_080A46FE: +@080A46FE: ldrh r0, [r1] eors r0, r3 strh r0, [r1] adds r1, 0x2 subs r4, 0x1 cmp r4, 0 - bge _080A46FE + bge @080A46FE adds r5, r2, 0 cmp r5, 0x7 - ble _080A46F6 -_080A4712: + ble @080A46F6 +@080A4712: add sp, 0x10 pop {r4-r7} pop {r0} @@ -308154,7 +308154,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} @@ -308166,23 +308166,23 @@ sub_80A4720: @ 80A4720 movs r0, 0x40 mov r12, r0 cmp r3, 0 - bne _080A473C + bne @080A473C movs r1, 0x20 mov r12, r1 -_080A473C: +@080A473C: lsls r0, r5, 28 lsrs r5, r0, 16 movs r0, 0 cmp r0, r12 - bge _080A476C + bge @080A476C ldr r7, =0x00000fff -_080A4748: +@080A4748: adds r4, r0, 0x1 lsls r0, 6 mov r1, r8 adds r3, r0, r1 movs r2, 0x1F -_080A4752: +@080A4752: ldrh r1, [r3] adds r0, r7, 0 ands r0, r1 @@ -308192,11 +308192,11 @@ _080A4752: adds r3, 0x2 subs r2, 0x1 cmp r2, 0 - bge _080A4752 + bge @080A4752 adds r0, r4, 0 cmp r0, r12 - blt _080A4748 -_080A476C: + blt @080A4748 +@080A476C: pop {r3} mov r8, r3 pop {r4-r7} @@ -308207,7 +308207,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 @@ -308216,13 +308216,13 @@ sub_80A477C: @ 80A477C mov r0, sp bl sub_80A6B30 cmp r4, 0 - beq _080A479C + beq @080A479C bl sub_80A4DF0 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq _080A47B8 -_080A479C: + beq @080A47B8 +@080A479C: movs r0, 0x1 bl sub_80A6C68 ldr r0, =0x02022e18 @@ -308230,17 +308230,17 @@ _080A479C: strh r1, [r0] ldr r0, =0x02022e1a strh r1, [r0] - b _080A47C6 + b @080A47C6 .align 2, 0 .pool -_080A47B8: +@080A47B8: movs r0, 0x2 bl sub_80A6C68 ldr r0, =0x02022e1c strh r4, [r0] ldr r0, =0x02022e1e strh r4, [r0] -_080A47C6: +@080A47C6: add sp, 0x10 pop {r4} pop {r0} @@ -308250,8 +308250,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 @@ -308287,7 +308287,7 @@ task_pA_ma0A_obj_to_bg_pal: @ 80A47D8 movs r1, 0x12 ldrsh r0, [r5, r1] cmp r0, 0 - bne _080A4870 + bne @080A4870 ldr r1, =0x02022e18 lsls r0, r3, 16 asrs r0, 16 @@ -308311,10 +308311,10 @@ task_pA_ma0A_obj_to_bg_pal: @ 80A47D8 adds r1, r2 ldr r2, =0x04000008 bl CpuSet - b _080A4896 + b @080A4896 .align 2, 0 .pool -_080A4870: +@080A4870: ldr r1, =0x02022e1c lsls r0, r3, 16 asrs r0, 16 @@ -308333,7 +308333,7 @@ _080A4870: subs r1, 0xE0 ldr r2, =0x04000008 bl CpuSet -_080A4896: +@080A4896: add sp, 0x10 pop {r4-r6} pop {r0} @@ -308343,7 +308343,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] @@ -308351,34 +308351,34 @@ ma0B_0807324C: @ 80A48B0 str r1, [r0] ldrb r4, [r2, 0x1] cmp r4, 0 - bne _080A48C8 + bne @080A48C8 movs r4, 0x2 - b _080A48D2 + b @080A48D2 .align 2, 0 .pool -_080A48C8: +@080A48C8: cmp r4, 0x1 - bne _080A48CE + bne @080A48CE movs r4, 0x3 -_080A48CE: +@080A48CE: cmp r4, 0 - beq _080A48D6 -_080A48D2: + beq @080A48D6 +@080A48D2: cmp r4, 0x2 - bne _080A48E0 -_080A48D6: + bne @080A48E0 +@080A48D6: ldr r0, =0x02038436 - b _080A48E2 + b @080A48E2 .align 2, 0 .pool -_080A48E0: +@080A48E0: ldr r0, =0x02038437 -_080A48E2: +@080A48E2: ldrb r5, [r0] ldr r3, =0x02038430 ldrb r0, [r3] cmp r0, 0xFF - beq _080A4908 + beq @080A4908 ldr r2, =0x02020630 ldr r0, =0x020241e4 adds r0, r5, r0 @@ -308393,12 +308393,12 @@ _080A48E2: negs r1, r1 ands r1, r2 strb r1, [r0] -_080A4908: +@080A4908: cmp r4, 0x1 - bls _080A4948 + bls @080A4948 ldrb r0, [r3, 0x1] cmp r0, 0xFF - beq _080A4948 + beq @080A4948 ldr r3, =0x02020630 ldr r2, =0x020241e4 movs r1, 0x2 @@ -308416,12 +308416,12 @@ _080A4908: negs r1, r1 ands r1, r2 strb r1, [r0] - b _080A494A + b @080A494A .align 2, 0 .pool -_080A4948: +@080A4948: movs r4, 0 -_080A494A: +@080A494A: ldr r0, =sub_80A4980 + 1 movs r1, 0x5 bl AddTask @@ -308446,7 +308446,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 @@ -308461,7 +308461,7 @@ sub_80A4980: @ 80A4980 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - beq _080A4A0A + beq @080A4A0A ldrb r0, [r1, 0xC] bl battle_get_per_side_status lsls r0, 24 @@ -308470,30 +308470,30 @@ sub_80A4980: @ 80A4980 adds r0, r1 lsrs r0, 24 cmp r0, 0x1 - bls _080A49BC + bls @080A49BC bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A49C4 -_080A49BC: + beq @080A49C4 +@080A49BC: movs r4, 0 - b _080A49C6 + b @080A49C6 .align 2, 0 .pool -_080A49C4: +@080A49C4: movs r4, 0x1 -_080A49C6: +@080A49C6: ldr r6, =0x02038430 ldrb r0, [r6] cmp r0, 0xFF - beq _080A49DE + beq @080A49DE adds r0, r4, 0 bl sub_80A477C ldrb r0, [r6] bl remove_task movs r0, 0xFF strb r0, [r6] -_080A49DE: +@080A49DE: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -308502,7 +308502,7 @@ _080A49DE: movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0x1 - ble _080A4A04 + ble @080A4A04 movs r0, 0x1 eors r4, r0 adds r0, r4, 0 @@ -308511,10 +308511,10 @@ _080A49DE: bl remove_task movs r0, 0xFF strb r0, [r6, 0x1] -_080A4A04: +@080A4A04: adds r0, r5, 0 bl remove_task -_080A4A0A: +@080A4A0A: pop {r4-r6} pop {r0} bx r0 @@ -308523,7 +308523,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] @@ -308531,35 +308531,35 @@ sub_80A4A18: @ 80A4A18 str r1, [r0] ldrb r5, [r2, 0x1] cmp r5, 0 - bne _080A4A30 + bne @080A4A30 movs r5, 0x2 - b _080A4A3A + b @080A4A3A .align 2, 0 .pool -_080A4A30: +@080A4A30: cmp r5, 0x1 - bne _080A4A36 + bne @080A4A36 movs r5, 0x3 -_080A4A36: +@080A4A36: cmp r5, 0 - beq _080A4A3E -_080A4A3A: + beq @080A4A3E +@080A4A3A: cmp r5, 0x2 - bne _080A4A48 -_080A4A3E: + bne @080A4A48 +@080A4A3E: ldr r0, =0x02038436 - b _080A4A4A + b @080A4A4A .align 2, 0 .pool -_080A4A48: +@080A4A48: ldr r0, =0x02038437 -_080A4A4A: +@080A4A4A: ldrb r4, [r0] adds r0, r4, 0 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _080A4A8A + beq @080A4A8A adds r0, r4, 0 bl battle_get_per_side_status lsls r0, 24 @@ -308568,32 +308568,32 @@ _080A4A4A: adds r0, r1 lsrs r0, 24 cmp r0, 0x1 - bls _080A4A76 + bls @080A4A76 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A4A80 -_080A4A76: + beq @080A4A80 +@080A4A76: movs r1, 0 - b _080A4A82 + b @080A4A82 .align 2, 0 .pool -_080A4A80: +@080A4A80: movs r1, 0x1 -_080A4A82: +@080A4A82: adds r0, r4, 0 movs r2, 0 bl sub_80A438C -_080A4A8A: +@080A4A8A: movs r0, 0x2 eors r4, r0 cmp r5, 0x1 - bls _080A4ACA + bls @080A4ACA adds r0, r4, 0 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _080A4ACA + beq @080A4ACA adds r0, r4, 0 bl battle_get_per_side_status lsls r0, 24 @@ -308602,21 +308602,21 @@ _080A4A8A: adds r0, r1 lsrs r0, 24 cmp r0, 0x1 - bls _080A4ABC + bls @080A4ABC bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A4AC0 -_080A4ABC: + beq @080A4AC0 +@080A4ABC: movs r1, 0 - b _080A4AC2 -_080A4AC0: + b @080A4AC2 +@080A4AC0: movs r1, 0x1 -_080A4AC2: +@080A4AC2: adds r0, r4, 0 movs r2, 0 bl sub_80A438C -_080A4ACA: +@080A4ACA: ldr r1, =0x020383f0 ldr r0, [r1] adds r0, 0x1 @@ -308629,7 +308629,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] @@ -308637,35 +308637,35 @@ ma23_8073484: @ 80A4ADC str r1, [r0] ldrb r5, [r2, 0x1] cmp r5, 0 - bne _080A4AF4 + bne @080A4AF4 movs r5, 0x2 - b _080A4AFE + b @080A4AFE .align 2, 0 .pool -_080A4AF4: +@080A4AF4: cmp r5, 0x1 - bne _080A4AFA + bne @080A4AFA movs r5, 0x3 -_080A4AFA: +@080A4AFA: cmp r5, 0 - beq _080A4B02 -_080A4AFE: + beq @080A4B02 +@080A4AFE: cmp r5, 0x2 - bne _080A4B0C -_080A4B02: + bne @080A4B0C +@080A4B02: ldr r0, =0x02038436 - b _080A4B0E + b @080A4B0E .align 2, 0 .pool -_080A4B0C: +@080A4B0C: ldr r0, =0x02038437 -_080A4B0E: +@080A4B0E: ldrb r6, [r0] adds r0, r6, 0 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _080A4B38 + beq @080A4B38 ldr r2, =0x02020630 ldr r0, =0x020241e4 adds r0, r6, r0 @@ -308680,9 +308680,9 @@ _080A4B0E: negs r1, r1 ands r1, r2 strb r1, [r0] -_080A4B38: +@080A4B38: cmp r5, 0x1 - bls _080A4B78 + bls @080A4B78 movs r0, 0x2 adds r4, r6, 0 eors r4, r0 @@ -308690,7 +308690,7 @@ _080A4B38: bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _080A4B78 + beq @080A4B78 ldr r2, =0x02020630 ldr r0, =0x020241e4 adds r0, r4, r0 @@ -308705,12 +308705,12 @@ _080A4B38: negs r1, r1 ands r1, r2 strb r1, [r0] - b _080A4B7A + b @080A4B7A .align 2, 0 .pool -_080A4B78: +@080A4B78: movs r5, 0 -_080A4B7A: +@080A4B7A: ldr r0, =sub_80A4BB0 + 1 movs r1, 0x5 bl AddTask @@ -308735,7 +308735,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 @@ -308750,7 +308750,7 @@ sub_80A4BB0: @ 80A4BB0 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - beq _080A4C3E + beq @080A4C3E ldrb r4, [r1, 0xC] adds r0, r4, 0 bl battle_get_per_side_status @@ -308760,27 +308760,27 @@ sub_80A4BB0: @ 80A4BB0 adds r0, r1 lsrs r0, 24 cmp r0, 0x1 - bls _080A4BEE + bls @080A4BEE bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A4BF8 -_080A4BEE: + beq @080A4BF8 +@080A4BEE: movs r5, 0 - b _080A4BFA + b @080A4BFA .align 2, 0 .pool -_080A4BF8: +@080A4BF8: movs r5, 0x1 -_080A4BFA: +@080A4BFA: adds r0, r4, 0 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _080A4C0C + beq @080A4C0C adds r0, r5, 0 bl sub_80A477C -_080A4C0C: +@080A4C0C: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -308789,22 +308789,22 @@ _080A4C0C: movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0x1 - ble _080A4C38 + ble @080A4C38 movs r0, 0x2 eors r4, r0 adds r0, r4, 0 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _080A4C38 + beq @080A4C38 movs r0, 0x1 eors r5, r0 adds r0, r5, 0 bl sub_80A477C -_080A4C38: +@080A4C38: adds r0, r6, 0 bl remove_task -_080A4C3E: +@080A4C3E: pop {r4-r6} pop {r0} bx r0 @@ -308813,7 +308813,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] @@ -308842,7 +308842,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] @@ -308865,7 +308865,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] @@ -308884,7 +308884,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] @@ -308912,7 +308912,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] @@ -308923,7 +308923,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] @@ -308950,7 +308950,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] @@ -308961,10 +308961,10 @@ ma11_if_else: @ 80A4D48 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080A4D62 + beq @080A4D62 adds r0, r2, 0x5 str r0, [r3] -_080A4D62: +@080A4D62: ldr r2, [r3] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -308984,7 +308984,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] @@ -308996,7 +308996,7 @@ ma12_cond_if: @ 80A4D88 ldr r0, =0x02038432 ldrb r0, [r0] cmp r1, r0 - bne _080A4DC0 + bne @080A4DC0 ldrb r1, [r2, 0x1] ldrb r0, [r3, 0x1] lsls r0, 8 @@ -309008,20 +309008,20 @@ ma12_cond_if: @ 80A4D88 lsls r0, 24 adds r1, r0 str r1, [r5] - b _080A4DC4 + b @080A4DC4 .align 2, 0 .pool -_080A4DC0: +@080A4DC0: adds r0, r4, 0x6 str r0, [r5] -_080A4DC4: +@080A4DC4: pop {r4,r5} pop {r0} bx r0 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 @@ -309043,7 +309043,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 @@ -309052,20 +309052,20 @@ sub_80A4DF0: @ 80A4DF0 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080A4E10 + beq @080A4E10 movs r0, 0 - b _080A4E12 + b @080A4E12 .align 2, 0 .pool -_080A4E10: +@080A4E10: movs r0, 0x1 -_080A4E12: +@080A4E12: pop {r1} bx r1 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] @@ -309096,7 +309096,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} @@ -309119,33 +309119,33 @@ sub_80A4E5C: @ 80A4E5C bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A4EA8 + beq @080A4EA8 ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 strh r6, [r0, 0x8] - b _080A4EDA + b @080A4EDA .align 2, 0 .pool -_080A4EA8: +@080A4EA8: ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _080A4ECC + bne @080A4ECC ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 strh r7, [r0, 0x8] - b _080A4EDA + b @080A4EDA .align 2, 0 .pool -_080A4ECC: +@080A4ECC: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -309153,7 +309153,7 @@ _080A4ECC: adds r0, r1 mov r1, r8 strh r1, [r0, 0x8] -_080A4EDA: +@080A4EDA: ldr r1, =0x02038433 movs r0, 0x1 strb r0, [r1] @@ -309167,7 +309167,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 @@ -309182,7 +309182,7 @@ task_p5_load_battle_screen_elements: @ 80A4EF4 ldrsh r3, [r4, r0] adds r7, r1, 0 cmp r3, 0 - bne _080A4F2C + bne @080A4F2C str r3, [sp] movs r0, 0xE8 movs r1, 0 @@ -309192,42 +309192,42 @@ task_p5_load_battle_screen_elements: @ 80A4EF4 ldrh r0, [r4, 0x1C] adds r0, 0x1 strh r0, [r4, 0x1C] - b _080A4FBC + b @080A4FBC .align 2, 0 .pool -_080A4F2C: +@080A4F2C: ldr r2, =0x02037fd4 ldrb r1, [r2, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080A4FBC + bne @080A4FBC cmp r3, 0x1 - bne _080A4F50 + bne @080A4F50 adds r0, r6, 0x1 strh r0, [r4, 0x1C] ldr r1, =0x02038433 movs r0, 0x2 strb r0, [r1] - b _080A4F94 + b @080A4F94 .align 2, 0 .pool -_080A4F50: +@080A4F50: cmp r3, 0x2 - bne _080A4F94 + bne @080A4F94 ldrh r0, [r4, 0x8] lsls r2, r0, 16 asrs r1, r2, 16 movs r0, 0x1 negs r0, r0 cmp r1, r0 - bne _080A4F68 + bne @080A4F68 bl dp01t_11_3_message_for_player_only - b _080A4F6E -_080A4F68: + b @080A4F6E +@080A4F68: lsrs r0, r2, 16 bl sub_80A4FC8 -_080A4F6E: +@080A4F6E: movs r0, 0x1 str r0, [sp] movs r0, 0xE8 @@ -309243,17 +309243,17 @@ _080A4F6E: ldrh r1, [r0, 0x1C] adds r1, 0x1 strh r1, [r0, 0x1C] - b _080A4FBC + b @080A4FBC .align 2, 0 .pool -_080A4F94: +@080A4F94: ldrb r1, [r2, 0x7] movs r0, 0x80 ands r0, r1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _080A4FBC + bne @080A4FBC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -309261,12 +309261,12 @@ _080A4F94: movs r1, 0x1C ldrsh r0, [r0, r1] cmp r0, 0x3 - bne _080A4FBC + bne @080A4FBC adds r0, r5, 0 bl remove_task ldr r0, =0x02038433 strb r4, [r0] -_080A4FBC: +@080A4FBC: add sp, 0x4 pop {r4-r7} pop {r0} @@ -309276,14 +309276,14 @@ _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 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A5050 + beq @080A5050 ldr r6, =0x08525d54 lsls r4, r7, 1 adds r4, r7 @@ -309324,10 +309324,10 @@ sub_80A4FC8: @ 80A4FC8 adds r0, r4, 0 movs r2, 0x20 bl decompress_palette - b _080A507E + b @080A507E .align 2, 0 .pool -_080A5050: +@080A5050: ldr r5, =0x08525d54 lsls r4, r7, 1 adds r4, r7 @@ -309348,7 +309348,7 @@ _080A5050: movs r1, 0x20 movs r2, 0x20 bl decompress_palette -_080A507E: +@080A507E: pop {r4-r7} pop {r0} bx r0 @@ -309357,23 +309357,23 @@ _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 cmp r0, 0 - beq _080A50A2 + beq @080A50A2 bl sub_80D7724 - b _080A50A6 -_080A50A2: + b @080A50A6 +@080A50A2: bl sub_8035770 -_080A50A6: +@080A50A6: pop {r0} bx r0 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] @@ -309401,25 +309401,25 @@ 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] cmp r0, 0x2 - bne _080A5114 + bne @080A5114 ldr r1, =0x020383f0 ldr r0, [r1] adds r0, 0x1 str r0, [r1] ldr r1, =0x020383fc movs r0, 0 - b _080A5118 + b @080A5118 .align 2, 0 .pool -_080A5114: +@080A5114: ldr r1, =0x020383fc movs r0, 0x1 -_080A5118: +@080A5118: strb r0, [r1] pop {r0} bx r0 @@ -309428,26 +309428,26 @@ _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] cmp r2, 0 - bne _080A5148 + bne @080A5148 ldr r0, =0x020383f0 ldr r1, [r0] adds r1, 0x1 str r1, [r0] ldr r0, =0x020383fc strb r2, [r0] - b _080A514E + b @080A514E .align 2, 0 .pool -_080A5148: +@080A5148: ldr r1, =0x020383fc movs r0, 0x1 strb r0, [r1] -_080A514E: +@080A514E: pop {r0} bx r0 .align 2, 0 @@ -309455,7 +309455,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] @@ -309474,14 +309474,14 @@ 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 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080A51C0 + bne @080A51C0 ldr r0, =0x020244d0 ldr r1, [r0] ldr r0, =0x02038436 @@ -309495,103 +309495,103 @@ sub_80A5178: @ 80A5178 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080A51C0 + beq @080A51C0 adds r0, r2, 0 bl battle_side_get_owner lsls r0, 24 movs r4, 0xC0 cmp r0, 0 - beq _080A5252 + beq @080A5252 movs r4, 0x3F - b _080A5252 + b @080A5252 .align 2, 0 .pool -_080A51C0: +@080A51C0: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A51E8 + beq @080A51E8 ldr r0, =0x02038436 ldr r1, =0x02038437 ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bne _080A524C + bne @080A524C cmp r0, 0x2 - bne _080A524C + bne @080A524C cmp r4, 0x3F - beq _080A525E - b _080A524C + beq @080A525E + b @080A524C .align 2, 0 .pool -_080A51E8: +@080A51E8: ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _080A5226 + bne @080A5226 ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _080A5252 + bne @080A5252 lsls r0, r4, 24 asrs r1, r0, 24 cmp r1, 0x3F - bne _080A5218 + bne @080A5218 movs r4, 0xC0 - b _080A5252 + b @080A5252 .align 2, 0 .pool -_080A5218: +@080A5218: movs r0, 0x40 negs r0, r0 cmp r1, r0 - beq _080A5252 + beq @080A5252 negs r0, r1 lsls r0, 24 - b _080A5250 -_080A5226: + b @080A5250 +@080A5226: ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080A524C + bne @080A524C lsls r0, r4, 24 asrs r0, 24 movs r1, 0x40 negs r1, r1 cmp r0, r1 - bne _080A5252 + bne @080A5252 movs r4, 0x3F - b _080A5252 + b @080A5252 .align 2, 0 .pool -_080A524C: +@080A524C: lsls r0, r4, 24 negs r0, r0 -_080A5250: +@080A5250: lsrs r4, r0, 24 -_080A5252: +@080A5252: lsls r0, r4, 24 asrs r0, 24 cmp r0, 0x3F - ble _080A525E + ble @080A525E movs r4, 0x3F - b _080A526C -_080A525E: + b @080A526C +@080A525E: lsls r0, r4, 24 asrs r0, 24 movs r1, 0x40 negs r1, r1 cmp r0, r1 - bge _080A526C + bge @080A526C movs r4, 0xC0 -_080A526C: +@080A526C: lsls r0, r4, 24 asrs r0, 24 pop {r4} @@ -309600,14 +309600,14 @@ _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 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080A52C0 + bne @080A52C0 ldr r0, =0x020244d0 ldr r1, [r0] ldr r0, =0x02038436 @@ -309621,33 +309621,33 @@ sub_80A5278: @ 80A5278 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080A52C0 + beq @080A52C0 adds r0, r2, 0 bl battle_side_get_owner lsls r0, 24 movs r4, 0xC0 cmp r0, 0 - beq _080A52DE + beq @080A52DE movs r4, 0x3F - b _080A52DE + b @080A52DE .align 2, 0 .pool -_080A52C0: +@080A52C0: ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _080A52D8 + bne @080A52D8 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A52DE -_080A52D8: + beq @080A52DE +@080A52D8: lsls r0, r4, 24 negs r0, r0 lsrs r4, r0, 24 -_080A52DE: +@080A52DE: lsls r0, r4, 24 asrs r0, 24 pop {r4} @@ -309658,22 +309658,22 @@ _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 asrs r2, r0, 16 cmp r2, 0x3F - ble _080A52FC + ble @080A52FC movs r1, 0x3F - b _080A5306 -_080A52FC: + b @080A5306 +@080A52FC: movs r0, 0x40 negs r0, r0 cmp r2, r0 - bge _080A5306 + bge @080A5306 ldr r1, =0x0000ffc0 -_080A5306: +@080A5306: lsls r0, r1, 16 asrs r0, 16 pop {r1} @@ -309683,7 +309683,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 @@ -309693,29 +309693,29 @@ sub_80A5314: @ 80A5314 lsls r1, 16 asrs r1, 16 cmp r0, r1 - bge _080A5332 + bge @080A5332 lsls r0, r2, 16 asrs r0, 16 cmp r0, 0 - bge _080A5342 - b _080A5340 -_080A5332: + bge @080A5342 + b @080A5340 +@080A5332: cmp r0, r1 - ble _080A5348 + ble @080A5348 lsls r0, r3, 16 asrs r0, 16 cmp r0, 0 - bge _080A5340 + bge @080A5340 negs r0, r0 -_080A5340: +@080A5340: negs r0, r0 -_080A5342: +@080A5342: lsls r0, 16 lsrs r0, 16 - b _080A534A -_080A5348: + b @080A534A +@080A5348: movs r0, 0 -_080A534A: +@080A534A: lsls r0, 16 asrs r0, 16 pop {r1} @@ -309723,7 +309723,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] @@ -309752,7 +309752,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] @@ -309775,7 +309775,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 @@ -309864,7 +309864,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 @@ -309882,7 +309882,7 @@ c3_08073CEC: @ 80A5478 movs r3, 0xE ldrsh r1, [r2, r3] cmp r0, r1 - blt _080A54FC + blt @080A54FC strh r7, [r2, 0x18] ldrh r6, [r2, 0x8] ldrh r3, [r2, 0xA] @@ -309895,33 +309895,33 @@ c3_08073CEC: @ 80A5478 lsrs r4, r0, 16 strh r4, [r2, 0x10] cmp r1, 0 - bne _080A54C0 + bne @080A54C0 lsls r2, r3, 16 - b _080A54E4 + b @080A54E4 .align 2, 0 .pool -_080A54C0: +@080A54C0: lsls r1, r6, 16 lsls r0, r3, 16 asrs r3, r0, 16 adds r2, r0, 0 cmp r1, r2 - bge _080A54D6 + bge @080A54D6 lsls r0, r4, 16 asrs r0, 16 cmp r0, r3 - blt _080A54E0 - b _080A54E4 -_080A54D6: + blt @080A54E0 + b @080A54E4 +@080A54D6: lsls r0, r4, 16 asrs r0, 16 cmp r0, r3 - bgt _080A54E0 + bgt @080A54E0 movs r7, 0x1 -_080A54E0: +@080A54E0: cmp r7, 0 - beq _080A54F4 -_080A54E4: + beq @080A54F4 +@080A54E4: lsrs r4, r2, 16 adds r0, r5, 0 bl remove_task @@ -309929,11 +309929,11 @@ _080A54E4: ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] -_080A54F4: +@080A54F4: lsls r0, r4, 24 asrs r0, 24 bl sub_80A3870 -_080A54FC: +@080A54FC: pop {r4-r7} pop {r0} bx r0 @@ -309942,7 +309942,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 @@ -310011,7 +310011,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 @@ -310100,7 +310100,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 @@ -310163,7 +310163,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 @@ -310180,7 +310180,7 @@ sub_80A56E4: @ 80A56E4 movs r3, 0xC ldrsh r1, [r2, r3] cmp r0, r1 - blt _080A5732 + blt @080A5732 movs r0, 0 strh r0, [r2, 0x18] ldrh r0, [r2, 0x8] @@ -310194,14 +310194,14 @@ sub_80A56E4: @ 80A56E4 asrs r1, 24 bl audio_play_and_stuff cmp r4, 0 - bne _080A5732 + bne @080A5732 adds r0, r5, 0 bl remove_task ldr r1, =0x020383ff ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] -_080A5732: +@080A5732: pop {r4,r5} pop {r0} bx r0 @@ -310210,7 +310210,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} @@ -310263,7 +310263,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 @@ -310277,7 +310277,7 @@ sub_80A57B4: @ 80A57B4 strh r1, [r2, 0xC] lsls r0, 16 cmp r0, 0 - bgt _080A57E8 + bgt @080A57E8 ldrh r0, [r2, 0x8] movs r1, 0xA ldrsb r1, [r2, r1] @@ -310288,7 +310288,7 @@ sub_80A57B4: @ 80A57B4 ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] -_080A57E8: +@080A57E8: pop {r4} pop {r0} bx r0 @@ -310297,7 +310297,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] @@ -310319,11 +310319,11 @@ sub_80A57F8: @ 80A57F8 adds r1, 0x6 str r1, [r4] cmp r0, 0 - beq _080A5842 + beq @080A5842 adds r5, r4, 0 ldr r4, =0x0203841e adds r3, r0, 0 -_080A582A: +@080A582A: ldr r2, [r5] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -310335,8 +310335,8 @@ _080A582A: adds r4, 0x2 subs r3, 0x1 cmp r3, 0 - bne _080A582A -_080A5842: + bne @080A582A +@080A5842: adds r0, r6, 0 movs r1, 0x1 bl AddTask @@ -310355,17 +310355,17 @@ _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] cmp r5, 0 - bne _080A58B4 + bne @080A58B4 bl mplay_has_finished_maybe lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq _080A58CC + beq @080A58CC ldr r4, =0x0203842e ldrh r0, [r4] adds r0, 0x1 @@ -310373,27 +310373,27 @@ ma20_wait_for_something: @ 80A586C lsls r0, 16 lsrs r0, 16 cmp r0, 0x5A - bls _080A58BA + bls @080A58BA ldr r0, =0x030075f0 bl MPlayStop_rev01 ldr r0, =0x03007630 bl MPlayStop_rev01 strh r5, [r4] - b _080A58DE + b @080A58DE .align 2, 0 .pool -_080A58B4: +@080A58B4: ldr r1, =0x0203842e movs r0, 0 strh r0, [r1] -_080A58BA: +@080A58BA: ldr r1, =0x020383fc movs r0, 0x1 strb r0, [r1] - b _080A58DE + b @080A58DE .align 2, 0 .pool -_080A58CC: +@080A58CC: ldr r0, =0x0203842e movs r2, 0 strh r1, [r0] @@ -310403,7 +310403,7 @@ _080A58CC: str r0, [r1] ldr r0, =0x020383fc strb r2, [r0] -_080A58DE: +@080A58DE: pop {r4,r5} pop {r0} bx r0 @@ -310412,7 +310412,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] @@ -310431,7 +310431,7 @@ ma21_08074164: @ 80A58F0 movs r6, 0 ldrsh r0, [r2, r6] cmp r1, r0 - bne _080A5938 + bne @080A5938 ldrb r1, [r3, 0x3] ldrb r0, [r3, 0x4] lsls r0, 8 @@ -310443,21 +310443,21 @@ ma21_08074164: @ 80A58F0 lsls r0, 24 adds r1, r0 str r1, [r5] - b _080A593E + b @080A593E .align 2, 0 .pool -_080A5938: +@080A5938: adds r0, r4, 0 adds r0, 0x8 str r0, [r5] -_080A593E: +@080A593E: pop {r4-r6} pop {r0} bx r0 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] @@ -310466,7 +310466,7 @@ sub_80A5944: @ 80A5944 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A5978 + beq @080A5978 ldr r2, [r4] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -310479,21 +310479,21 @@ sub_80A5944: @ 80A5944 lsls r0, 24 adds r1, r0 str r1, [r4] - b _080A597E + b @080A597E .align 2, 0 .pool -_080A5978: +@080A5978: ldr r0, [r4] adds r0, 0x4 str r0, [r4] -_080A597E: +@080A597E: pop {r4} pop {r0} bx r0 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] @@ -310501,14 +310501,14 @@ sub_80A5984: @ 80A5984 adds r1, 0x2 str r1, [r0] cmp r2, 0 - beq _080A59A0 + beq @080A59A0 ldr r0, =0x02038437 - b _080A59A2 + b @080A59A2 .align 2, 0 .pool -_080A59A0: +@080A59A0: ldr r0, =0x02038436 -_080A59A2: +@080A59A2: ldrb r0, [r0] bl battle_get_per_side_status lsls r0, 24 @@ -310516,12 +310516,12 @@ _080A59A2: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080A59D2 + bne @080A59D2 cmp r4, 0 - beq _080A59BE + beq @080A59BE cmp r4, 0x3 - bne _080A59D2 -_080A59BE: + bne @080A59D2 +@080A59BE: movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 @@ -310530,7 +310530,7 @@ _080A59BE: movs r1, 0x4 movs r2, 0x2 bl lcd_bg_operations -_080A59D2: +@080A59D2: pop {r4} pop {r0} bx r0 @@ -310539,7 +310539,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] @@ -310548,7 +310548,7 @@ sub_80A59DC: @ 80A59DC bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080A5A04 + bne @080A5A04 movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 @@ -310557,7 +310557,7 @@ sub_80A59DC: @ 80A59DC movs r1, 0x4 movs r2, 0x2 bl lcd_bg_operations -_080A5A04: +@080A5A04: pop {r0} bx r0 .align 2, 0 @@ -310565,7 +310565,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] @@ -310582,28 +310582,28 @@ sub_80A5A0C: @ 80A5A0C lsls r4, 24 lsls r0, 24 cmp r4, r0 - beq _080A5A78 + beq @080A5A78 cmp r6, 0 - beq _080A5A48 + beq @080A5A48 ldrb r0, [r5] - b _080A5A4A + b @080A5A4A .align 2, 0 .pool -_080A5A48: +@080A5A48: ldrb r0, [r7] -_080A5A4A: +@080A5A4A: bl battle_get_per_side_status lsls r0, 24 lsrs r4, r0, 24 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080A5A78 + bne @080A5A78 cmp r4, 0 - beq _080A5A64 + beq @080A5A64 cmp r4, 0x3 - bne _080A5A78 -_080A5A64: + bne @080A5A78 +@080A5A64: movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 @@ -310612,14 +310612,14 @@ _080A5A64: movs r1, 0x4 movs r2, 0x2 bl lcd_bg_operations -_080A5A78: +@080A5A78: pop {r4-r7} pop {r0} bx r0 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] @@ -310628,7 +310628,7 @@ ma2B_make_side_invisible: @ 80A5A80 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq _080A5AA8 + beq @080A5AA8 ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -310639,7 +310639,7 @@ ma2B_make_side_invisible: @ 80A5A80 movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_080A5AA8: +@080A5AA8: ldr r0, [r4] adds r0, 0x2 str r0, [r4] @@ -310651,7 +310651,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] @@ -310660,7 +310660,7 @@ ma2C_make_side_visible: @ 80A5ABC lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq _080A5AE6 + beq @080A5AE6 ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -310672,7 +310672,7 @@ ma2C_make_side_visible: @ 80A5ABC negs r1, r1 ands r1, r2 strb r1, [r0] -_080A5AE6: +@080A5AE6: ldr r0, [r4] adds r0, 0x2 str r0, [r4] @@ -310684,7 +310684,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] @@ -310694,11 +310694,11 @@ sub_80A5AFC: @ 80A5AFC bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080A5BA6 + bne @080A5BA6 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _080A5BA6 + beq @080A5BA6 ldr r6, =0x02038436 ldrb r0, [r6] bl battle_side_get_owner @@ -310709,29 +310709,29 @@ sub_80A5AFC: @ 80A5AFC lsls r4, 24 lsls r0, 24 cmp r4, r0 - bne _080A5BA6 + bne @080A5BA6 cmp r7, 0 - bne _080A5B54 + bne @080A5B54 ldrb r0, [r6] bl battle_get_per_side_status_permutated lsls r0, 24 lsrs r4, r0, 24 movs r0, 0 - b _080A5B60 + b @080A5B60 .align 2, 0 .pool -_080A5B54: +@080A5B54: ldrb r0, [r5] bl battle_get_per_side_status_permutated lsls r0, 24 lsrs r4, r0, 24 movs r0, 0x1 -_080A5B60: +@080A5B60: bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq _080A5BA6 + beq @080A5BA6 ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -310745,30 +310745,30 @@ _080A5B60: ands r0, r1 strb r0, [r3] cmp r4, 0x2 - bne _080A5B90 + bne @080A5B90 ldrb r0, [r2, 0x5] movs r1, 0xC orrs r0, r1 strb r0, [r2, 0x5] -_080A5B90: +@080A5B90: cmp r4, 0x1 - bne _080A5BA0 + bne @080A5BA0 movs r0, 0 bl sub_80A477C - b _080A5BA6 + b @080A5BA6 .align 2, 0 .pool -_080A5BA0: +@080A5BA0: movs r0, 0x1 bl sub_80A477C -_080A5BA6: +@080A5BA6: pop {r4-r7} pop {r0} bx r0 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] @@ -310778,11 +310778,11 @@ sub_80A5BAC: @ 80A5BAC bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080A5C38 + bne @080A5C38 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _080A5C38 + beq @080A5C38 ldr r6, =0x02038436 ldrb r0, [r6] bl battle_side_get_owner @@ -310793,31 +310793,31 @@ sub_80A5BAC: @ 80A5BAC lsls r4, 24 lsls r0, 24 cmp r4, r0 - bne _080A5C38 + bne @080A5C38 cmp r7, 0 - bne _080A5C04 + bne @080A5C04 ldrb r0, [r6] bl battle_get_per_side_status_permutated lsls r0, 24 lsrs r4, r0, 24 movs r0, 0 - b _080A5C10 + b @080A5C10 .align 2, 0 .pool -_080A5C04: +@080A5C04: ldrb r0, [r5] bl battle_get_per_side_status_permutated lsls r0, 24 lsrs r4, r0, 24 movs r0, 0x1 -_080A5C10: +@080A5C10: bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq _080A5C38 + beq @080A5C38 cmp r4, 0x2 - bne _080A5C38 + bne @080A5C38 ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -310830,7 +310830,7 @@ _080A5C10: movs r2, 0x8 orrs r1, r2 strb r1, [r0, 0x5] -_080A5C38: +@080A5C38: pop {r4-r7} pop {r0} bx r0 @@ -310839,7 +310839,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 @@ -310856,7 +310856,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 @@ -310865,30 +310865,30 @@ sub_80A5C6C: @ 80A5C6C bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A5C8A + beq @080A5C8A cmp r4, 0x3 - bne _080A5C8A + bne @080A5C8A cmp r5, 0x3 - bne _080A5C8A + bne @080A5C8A movs r4, 0x1 -_080A5C8A: +@080A5C8A: cmp r4, 0x4 - bhi _080A5D00 + bhi @080A5D00 lsls r0, r4, 2 - ldr r1, =_080A5C9C + ldr r1, =@080A5C9C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080A5C9C: - .4byte _080A5CB0 - .4byte _080A5CD8 - .4byte _080A5CB0 - .4byte _080A5D00 - .4byte _080A5D00 -_080A5CB0: +@080A5C9C: + .4byte @080A5CB0 + .4byte @080A5CD8 + .4byte @080A5CB0 + .4byte @080A5D00 + .4byte @080A5D00 +@080A5CB0: ldr r4, =0x08525f58 adds r0, r5, 0 bl battle_get_per_side_status @@ -310902,10 +310902,10 @@ _080A5CB0: adds r0, r1 adds r0, r4 ldrb r0, [r0] - b _080A5DB0 + b @080A5DB0 .align 2, 0 .pool -_080A5CD8: +@080A5CD8: ldr r4, =0x08525f58 adds r0, r5, 0 bl battle_get_per_side_status @@ -310919,14 +310919,14 @@ _080A5CD8: adds r0, r1 adds r0, r4 ldrb r0, [r0, 0x1] - b _080A5DB0 + b @080A5DB0 .align 2, 0 .pool -_080A5D00: +@080A5D00: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A5D28 + beq @080A5D28 ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0x18] @@ -310934,20 +310934,20 @@ _080A5D00: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080A5D24 + beq @080A5D24 ldrh r1, [r2, 0x2] - b _080A5D9A + b @080A5D9A .align 2, 0 .pool -_080A5D24: +@080A5D24: ldrh r1, [r2] - b _080A5D9A -_080A5D28: + b @080A5D9A +@080A5D28: adds r0, r5, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080A5D60 + beq @080A5D60 ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -310955,7 +310955,7 @@ _080A5D28: adds r1, r0, r1 ldrh r0, [r1, 0x2] cmp r0, 0 - bne _080A5D98 + bne @080A5D98 ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 @@ -310963,10 +310963,10 @@ _080A5D28: movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 - b _080A5D7E + b @080A5D7E .align 2, 0 .pool -_080A5D60: +@080A5D60: ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -310974,7 +310974,7 @@ _080A5D60: adds r1, r0, r1 ldrh r0, [r1, 0x2] cmp r0, 0 - bne _080A5D98 + bne @080A5D98 ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 @@ -310982,38 +310982,38 @@ _080A5D60: movs r0, 0x64 muls r0, r1 ldr r1, =0x020244ec -_080A5D7E: +@080A5D7E: adds r0, r1 movs r1, 0xB bl pokemon_getattr lsls r0, 16 lsrs r1, r0, 16 - b _080A5D9A + b @080A5D9A .align 2, 0 .pool -_080A5D98: +@080A5D98: ldrh r1, [r1, 0x2] -_080A5D9A: +@080A5D9A: cmp r4, 0x3 - bne _080A5DA4 + bne @080A5DA4 adds r0, r5, 0 movs r2, 0x1 - b _080A5DA8 -_080A5DA4: + b @080A5DA8 +@080A5DA4: adds r0, r5, 0 movs r2, 0 -_080A5DA8: +@080A5DA8: bl sub_80A600C lsls r0, 24 lsrs r0, 24 -_080A5DB0: +@080A5DB0: pop {r4,r5} pop {r1} bx r1 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 @@ -311023,19 +311023,19 @@ sub_80A5DB8: @ 80A5DB8 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080A5DDA + beq @080A5DDA bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080A5DDA - b _080A5EC8 -_080A5DDA: + bne @080A5DDA + b @080A5EC8 +@080A5DDA: cmp r5, 0xC9 - bne _080A5E90 + bne @080A5E90 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A5E04 + beq @080A5E04 ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0x18] @@ -311043,15 +311043,15 @@ _080A5DDA: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080A5E00 + beq @080A5E00 ldr r2, [r2, 0x10] - b _080A5E42 + b @080A5E42 .align 2, 0 .pool -_080A5E00: +@080A5E00: ldr r2, [r2, 0x8] - b _080A5E42 -_080A5E04: + b @080A5E42 +@080A5E04: ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] @@ -311059,7 +311059,7 @@ _080A5E04: adds r0, r1, r0 ldrh r0, [r0, 0x2] cmp r0, 0 - bne _080A5E3C + bne @080A5E3C ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -311071,14 +311071,14 @@ _080A5E04: movs r1, 0 bl pokemon_getattr adds r2, r0, 0 - b _080A5E42 + b @080A5E42 .align 2, 0 .pool -_080A5E3C: +@080A5E3C: ldr r0, =0x020244bc adds r0, r1, r0 ldr r2, [r0] -_080A5E42: +@080A5E42: movs r0, 0xC0 lsls r0, 18 ands r0, r2 @@ -311101,53 +311101,53 @@ _080A5E42: lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne _080A5E7C + bne @080A5E7C adds r0, r5, 0 - b _080A5E86 + b @080A5E86 .align 2, 0 .pool -_080A5E7C: +@080A5E7C: movs r1, 0xCE lsls r1, 1 adds r0, r1 lsls r0, 16 lsrs r0, 16 -_080A5E86: +@080A5E86: ldr r1, =0x083021d8 lsls r0, 2 - b _080A5F90 + b @080A5F90 .align 2, 0 .pool -_080A5E90: +@080A5E90: ldr r0, =0x00000181 cmp r5, r0 - bne _080A5EB0 + bne @080A5EB0 ldr r0, =0x08525f8c ldr r1, =0x020244e4 adds r1, r4, r1 ldrb r1, [r1] adds r1, r0 ldrb r0, [r1] - b _080A5F94 + b @080A5F94 .align 2, 0 .pool -_080A5EB0: +@080A5EB0: movs r0, 0xCE lsls r0, 1 cmp r5, r0 - bls _080A5EC0 + bls @080A5EC0 ldr r0, =0x083021d8 - b _080A5F92 + b @080A5F92 .align 2, 0 .pool -_080A5EC0: +@080A5EC0: ldr r1, =0x083021d8 - b _080A5F8E + b @080A5F8E .align 2, 0 .pool -_080A5EC8: +@080A5EC8: cmp r5, 0xC9 - bne _080A5F58 + bne @080A5F58 ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] @@ -311155,7 +311155,7 @@ _080A5EC8: adds r0, r1, r0 ldrh r0, [r0, 0x2] cmp r0, 0 - bne _080A5F04 + bne @080A5F04 ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -311167,14 +311167,14 @@ _080A5EC8: movs r1, 0 bl pokemon_getattr adds r2, r0, 0 - b _080A5F0A + b @080A5F0A .align 2, 0 .pool -_080A5F04: +@080A5F04: ldr r0, =0x020244bc adds r0, r1, r0 ldr r2, [r0] -_080A5F0A: +@080A5F0A: movs r0, 0xC0 lsls r0, 18 ands r0, r2 @@ -311197,27 +311197,27 @@ _080A5F0A: lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne _080A5F44 + bne @080A5F44 adds r0, r5, 0 - b _080A5F4E + b @080A5F4E .align 2, 0 .pool -_080A5F44: +@080A5F44: movs r1, 0xCE lsls r1, 1 adds r0, r1 lsls r0, 16 lsrs r0, 16 -_080A5F4E: +@080A5F4E: ldr r1, =0x08300d38 lsls r0, 2 - b _080A5F90 + b @080A5F90 .align 2, 0 .pool -_080A5F58: +@080A5F58: ldr r0, =0x00000181 cmp r5, r0 - bne _080A5F7C + bne @080A5F7C ldr r0, =0x08525f78 ldr r1, =0x020244e4 adds r1, r4, r1 @@ -311225,27 +311225,27 @@ _080A5F58: lsls r1, 2 adds r1, r0 ldrb r0, [r1, 0x1] - b _080A5F94 + b @080A5F94 .align 2, 0 .pool -_080A5F7C: +@080A5F7C: movs r0, 0xCE lsls r0, 1 cmp r5, r0 - bls _080A5F8C + bls @080A5F8C ldr r0, =0x08300d38 - b _080A5F92 + b @080A5F92 .align 2, 0 .pool -_080A5F8C: +@080A5F8C: ldr r1, =0x08300d38 -_080A5F8E: +@080A5F8E: lsls r0, r5, 2 -_080A5F90: +@080A5F90: adds r0, r1 -_080A5F92: +@080A5F92: ldrb r0, [r0, 0x1] -_080A5F94: +@080A5F94: pop {r4,r5} pop {r1} bx r1 @@ -311254,7 +311254,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 @@ -311267,38 +311267,38 @@ sub_80A5FA0: @ 80A5FA0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080A5FFE + bne @080A5FFE bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080A5FFE + bne @080A5FFE ldr r0, =0x00000181 cmp r4, r0 - bne _080A5FE8 + bne @080A5FE8 ldr r0, =0x08525f88 ldr r1, =0x020244e4 adds r1, r6, r1 ldrb r1, [r1] adds r1, r0 ldrb r5, [r1] - b _080A5FFE + b @080A5FFE .align 2, 0 .pool -_080A5FE8: +@080A5FE8: movs r0, 0xCE lsls r0, 1 cmp r4, r0 - bls _080A5FF8 + bls @080A5FF8 ldr r0, =0x08305dcc - b _080A5FFC + b @080A5FFC .align 2, 0 .pool -_080A5FF8: +@080A5FF8: ldr r0, =0x08305dcc adds r0, r7, r0 -_080A5FFC: +@080A5FFC: ldrb r5, [r0] -_080A5FFE: +@080A5FFE: adds r0, r5, 0 pop {r4-r7} pop {r1} @@ -311308,7 +311308,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 @@ -311320,19 +311320,19 @@ sub_80A600C: @ 80A600C bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080A6030 + beq @080A6030 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A603E -_080A6030: + beq @080A603E +@080A6030: adds r0, r6, 0 adds r1, r5, 0 bl sub_80A5DB8 lsls r0, 24 lsrs r4, r0, 24 - b _080A605C -_080A603E: + b @080A605C +@080A603E: adds r0, r6, 0 adds r1, r5, 0 bl sub_80A5DB8 @@ -311346,7 +311346,7 @@ _080A603E: subs r0, r4, r0 lsls r0, 16 lsrs r4, r0, 16 -_080A605C: +@080A605C: adds r0, r6, 0 bl battle_get_per_side_status ldr r3, =0x08525f58 @@ -311364,21 +311364,21 @@ _080A605C: lsls r0, 24 lsrs r4, r0, 24 cmp r7, 0 - beq _080A609C + beq @080A609C adds r0, r6, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _080A6096 + bne @080A6096 adds r0, r4, 0 adds r0, 0x8 lsls r0, 24 lsrs r4, r0, 24 -_080A6096: +@080A6096: cmp r4, 0x68 - bls _080A609C + bls @080A609C movs r4, 0x68 -_080A609C: +@080A609C: adds r0, r4, 0 pop {r4-r7} pop {r1} @@ -311388,7 +311388,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 @@ -311399,11 +311399,11 @@ sub_80A60AC: @ 80A60AC adds r1, r0 lsrs r1, 24 cmp r1, 0x1 - bhi _080A6126 + bhi @080A6126 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A60E8 + beq @080A60E8 ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0x18] @@ -311411,15 +311411,15 @@ sub_80A60AC: @ 80A60AC movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080A60E4 + beq @080A60E4 ldrh r1, [r2, 0x2] - b _080A610E + b @080A610E .align 2, 0 .pool -_080A60E4: +@080A60E4: ldrh r1, [r2] - b _080A610E -_080A60E8: + b @080A610E +@080A60E8: ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -311427,33 +311427,33 @@ _080A60E8: adds r1, r0, r1 ldrh r0, [r1, 0x2] cmp r0, 0 - bne _080A610C + bne @080A610C ldr r1, =0x02038438 lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] - b _080A610E + b @080A610E .align 2, 0 .pool -_080A610C: +@080A610C: ldrh r1, [r1, 0x2] -_080A610E: +@080A610E: cmp r5, 0x3 - bne _080A611C + bne @080A611C adds r0, r4, 0 movs r2, 0x1 bl sub_80A600C - b _080A612E -_080A611C: + b @080A612E +@080A611C: adds r0, r4, 0 movs r2, 0 bl sub_80A600C - b _080A612E -_080A6126: + b @080A612E +@080A6126: adds r0, r4, 0 adds r1, r5, 0 bl sub_80A5C6C -_080A612E: +@080A612E: lsls r0, 24 lsrs r0, 24 pop {r4,r5} @@ -311462,7 +311462,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 @@ -311475,7 +311475,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 @@ -311483,7 +311483,7 @@ sub_80A614C: @ 80A614C bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080A6170 + beq @080A6170 adds r0, r4, 0 movs r1, 0x1 bl sub_80A5C6C @@ -311491,8 +311491,8 @@ sub_80A614C: @ 80A614C lsrs r0, 8 movs r1, 0x80 lsls r1, 13 - b _080A6180 -_080A6170: + b @080A6180 +@080A6170: adds r0, r4, 0 movs r1, 0x1 bl sub_80A5C6C @@ -311500,7 +311500,7 @@ _080A6170: lsrs r0, 8 movs r1, 0x88 lsls r1, 13 -_080A6180: +@080A6180: adds r0, r1 lsrs r0, 16 lsls r0, 24 @@ -311511,7 +311511,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 @@ -311523,12 +311523,12 @@ sub_80A6190: @ 80A6190 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080A6238 + bne @080A6238 adds r0, r5, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080A61E4 + beq @080A61E4 ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -311536,7 +311536,7 @@ sub_80A6190: @ 80A6190 adds r1, r0, r1 ldrh r0, [r1, 0x2] cmp r0, 0 - bne _080A621C + bne @080A621C ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 @@ -311544,10 +311544,10 @@ sub_80A6190: @ 80A6190 movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 - b _080A6202 + b @080A6202 .align 2, 0 .pool -_080A61E4: +@080A61E4: ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -311555,7 +311555,7 @@ _080A61E4: adds r1, r0, r1 ldrh r0, [r1, 0x2] cmp r0, 0 - bne _080A621C + bne @080A621C ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 @@ -311563,30 +311563,30 @@ _080A61E4: movs r0, 0x64 muls r0, r1 ldr r1, =0x020244ec -_080A6202: +@080A6202: adds r0, r1 movs r1, 0xB bl pokemon_getattr lsls r0, 16 lsrs r4, r0, 16 - b _080A621E + b @080A621E .align 2, 0 .pool -_080A621C: +@080A621C: ldrh r4, [r1, 0x2] -_080A621E: +@080A621E: adds r0, r5, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080A6238 + beq @080A6238 adds r0, r5, 0 adds r1, r4, 0 bl sub_80A5FA0 subs r0, r6, r0 lsls r0, 24 lsrs r6, r0, 24 -_080A6238: +@080A6238: adds r0, r6, 0 pop {r4-r6} pop {r1} @@ -311594,41 +311594,41 @@ _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 adds r1, r0, 0 cmp r0, 0 - bne _080A6268 + bne @080A6268 ldr r4, =0x02038436 ldrb r0, [r4] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 - beq _080A62B6 + beq @080A62B6 ldr r1, =0x020241e4 ldrb r0, [r4] - b _080A62C6 + b @080A62C6 .align 2, 0 .pool -_080A6268: +@080A6268: cmp r0, 0x1 - bne _080A6288 + bne @080A6288 ldr r4, =0x02038437 ldrb r0, [r4] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 - beq _080A62B6 + beq @080A62B6 ldr r1, =0x020241e4 ldrb r0, [r4] - b _080A62C6 + b @080A62C6 .align 2, 0 .pool -_080A6288: +@080A6288: cmp r1, 0x2 - bne _080A62A4 + bne @080A62A4 ldr r5, =0x02038436 ldrb r0, [r5] movs r4, 0x2 @@ -311636,11 +311636,11 @@ _080A6288: bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _080A62B6 - b _080A62C0 + beq @080A62B6 + b @080A62C0 .align 2, 0 .pool -_080A62A4: +@080A62A4: ldr r5, =0x02038437 ldrb r0, [r5] movs r4, 0x2 @@ -311648,20 +311648,20 @@ _080A62A4: bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - bne _080A62C0 -_080A62B6: + bne @080A62C0 +@080A62B6: movs r0, 0xFF - b _080A62CA + b @080A62CA .align 2, 0 .pool -_080A62C0: +@080A62C0: ldr r1, =0x020241e4 ldrb r0, [r5] eors r0, r4 -_080A62C6: +@080A62C6: adds r0, r1 ldrb r0, [r0] -_080A62CA: +@080A62CA: pop {r4,r5} pop {r1} bx r1 @@ -311670,7 +311670,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] @@ -311678,7 +311678,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] @@ -311689,13 +311689,13 @@ 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 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080A6340 + beq @080A6340 movs r2, 0x2E ldrsh r0, [r4, r2] movs r2, 0x30 @@ -311715,41 +311715,41 @@ sub_80A62EC: @ 80A62EC lsls r0, r1, 16 asrs r0, 16 cmp r0, 0xFF - ble _080A632C + ble @080A632C ldr r2, =0xffffff00 - b _080A6334 + b @080A6334 .align 2, 0 .pool -_080A632C: +@080A632C: cmp r0, 0 - bge _080A6338 + bge @080A6338 movs r2, 0x80 lsls r2, 1 -_080A6334: +@080A6334: adds r0, r1, r2 strh r0, [r4, 0x2E] -_080A6338: +@080A6338: ldrh r0, [r4, 0x34] subs r0, 0x1 strh r0, [r4, 0x34] - b _080A6346 -_080A6340: + b @080A6346 +@080A6340: adds r0, r4, 0 bl sub_80A62DC -_080A6346: +@080A6346: pop {r4} pop {r0} bx r0 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 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080A63BC + beq @080A63BC movs r2, 0x2E ldrsh r0, [r4, r2] ldrh r1, [r4, 0x38] @@ -311783,41 +311783,41 @@ sub_80A634C: @ 80A634C lsls r0, r1, 16 asrs r0, 16 cmp r0, 0xFF - ble _080A63A8 + ble @080A63A8 ldr r2, =0xffffff00 - b _080A63B0 + b @080A63B0 .align 2, 0 .pool -_080A63A8: +@080A63A8: cmp r0, 0 - bge _080A63B4 + bge @080A63B4 movs r2, 0x80 lsls r2, 1 -_080A63B0: +@080A63B0: adds r0, r1, r2 strh r0, [r4, 0x2E] -_080A63B4: +@080A63B4: ldrh r0, [r4, 0x34] subs r0, 0x1 strh r0, [r4, 0x34] - b _080A63C2 -_080A63BC: + b @080A63C2 +@080A63BC: adds r0, r4, 0 bl sub_80A62DC -_080A63C2: +@080A63C2: pop {r4} pop {r0} bx r0 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 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080A6444 + beq @080A6444 movs r2, 0x2E ldrsh r0, [r4, r2] movs r2, 0x30 @@ -311841,59 +311841,59 @@ sub_80A63C8: @ 80A63C8 lsls r0, r1, 16 asrs r0, 16 cmp r0, 0xFF - ble _080A6410 + ble @080A6410 ldr r2, =0xffffff00 - b _080A6418 + b @080A6418 .align 2, 0 .pool -_080A6410: +@080A6410: cmp r0, 0 - bge _080A641C + bge @080A641C movs r2, 0x80 lsls r2, 1 -_080A6418: +@080A6418: adds r0, r1, r2 strh r0, [r4, 0x2E] -_080A641C: +@080A641C: ldrh r1, [r4, 0x36] movs r2, 0x36 ldrsh r0, [r4, r2] cmp r0, 0xFF - ble _080A6430 + ble @080A6430 ldr r2, =0xffffff00 - b _080A6438 + b @080A6438 .align 2, 0 .pool -_080A6430: +@080A6430: cmp r0, 0 - bge _080A643C + bge @080A643C movs r2, 0x80 lsls r2, 1 -_080A6438: +@080A6438: adds r0, r1, r2 strh r0, [r4, 0x36] -_080A643C: +@080A643C: ldrh r0, [r4, 0x34] subs r0, 0x1 strh r0, [r4, 0x34] - b _080A644A -_080A6444: + b @080A644A +@080A6444: adds r0, r4, 0 bl sub_80A62DC -_080A644A: +@080A644A: pop {r4} pop {r0} bx r0 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 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080A64A4 + beq @080A64A4 movs r2, 0x2E ldrsh r0, [r4, r2] movs r2, 0x30 @@ -311913,55 +311913,55 @@ sub_80A6450: @ 80A6450 lsls r0, r1, 16 asrs r0, 16 cmp r0, 0xFF - ble _080A6490 + ble @080A6490 ldr r2, =0xffffff00 - b _080A6498 + b @080A6498 .align 2, 0 .pool -_080A6490: +@080A6490: cmp r0, 0 - bge _080A649C + bge @080A649C movs r2, 0x80 lsls r2, 1 -_080A6498: +@080A6498: adds r0, r1, r2 strh r0, [r4, 0x2E] -_080A649C: +@080A649C: ldrh r0, [r4, 0x34] subs r0, 0x1 strh r0, [r4, 0x34] - b _080A64AA -_080A64A4: + b @080A64AA +@080A64A4: adds r0, r4, 0 bl sub_80A62DC -_080A64AA: +@080A64AA: pop {r4} pop {r0} bx r0 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] movs r3, 0x2E ldrsh r0, [r1, r3] cmp r0, 0 - ble _080A64C4 + ble @080A64C4 subs r0, r2, 0x1 strh r0, [r1, 0x2E] - b _080A64CA -_080A64C4: + b @080A64CA +@080A64C4: adds r0, r1, 0 bl sub_80A62DC -_080A64CA: +@080A64CA: pop {r0} bx r0 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 @@ -311977,7 +311977,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 @@ -311985,11 +311985,11 @@ sub_80A64EC: @ 80A64EC movs r2, 0x32 ldrsh r0, [r4, r2] cmp r1, r0 - ble _080A6502 + ble @080A6502 ldrh r0, [r4, 0x2E] negs r0, r0 strh r0, [r4, 0x2E] -_080A6502: +@080A6502: movs r1, 0x32 ldrsh r0, [r4, r1] movs r2, 0x30 @@ -312000,9 +312000,9 @@ _080A6502: ldrsh r1, [r4, r2] bl __divsi3 cmp r0, 0 - bge _080A651C + bge @080A651C negs r0, r0 -_080A651C: +@080A651C: strh r0, [r4, 0x2E] movs r1, 0x36 ldrsh r0, [r4, r1] @@ -312020,14 +312020,14 @@ _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] movs r3, 0x2E ldrsh r0, [r1, r3] cmp r0, 0 - ble _080A6560 + ble @080A6560 subs r0, r2, 0x1 strh r0, [r1, 0x2E] ldrh r0, [r1, 0x30] @@ -312038,24 +312038,24 @@ sub_80A653C: @ 80A653C ldrh r3, [r1, 0x26] adds r0, r3 strh r0, [r1, 0x26] - b _080A6566 -_080A6560: + b @080A6566 +@080A6560: adds r0, r1, 0 bl sub_80A62DC -_080A6566: +@080A6566: pop {r0} bx r0 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] movs r3, 0x2E ldrsh r0, [r2, r3] cmp r0, 0 - ble _080A659C + ble @080A659C subs r0, r1, 0x1 strh r0, [r2, 0x2E] ldrh r0, [r2, 0x30] @@ -312072,24 +312072,24 @@ sub_80A656C: @ 80A656C lsls r1, 16 asrs r1, 24 strh r1, [r2, 0x26] - b _080A65A2 -_080A659C: + b @080A65A2 +@080A659C: adds r0, r2, 0 bl sub_80A62DC -_080A65A2: +@080A65A2: pop {r0} bx r0 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] movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0 - ble _080A65D8 + ble @080A65D8 subs r0, r1, 0x1 strh r0, [r4, 0x2E] ldrh r0, [r4, 0x30] @@ -312106,11 +312106,11 @@ sub_80A65A8: @ 80A65A8 lsls r1, 16 asrs r1, 24 strh r1, [r4, 0x26] - b _080A65DE -_080A65D8: + b @080A65DE +@080A65D8: adds r0, r4, 0 bl sub_80A62DC -_080A65DE: +@080A65DE: adds r0, r4, 0 bl sub_80D30DC pop {r4} @@ -312119,7 +312119,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] @@ -312153,14 +312153,14 @@ 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] movs r2, 0x2E ldrsh r0, [r3, r2] cmp r0, 0 - ble _080A6674 + ble @080A6674 subs r0, r1, 0x1 strh r0, [r3, 0x2E] ldr r2, =0x02020630 @@ -312184,27 +312184,27 @@ sub_80A6630: @ 80A6630 ldrh r2, [r0, 0x26] adds r1, r2 strh r1, [r0, 0x26] - b _080A667A + b @080A667A .align 2, 0 .pool -_080A6674: +@080A6674: adds r0, r3, 0 bl sub_80A62DC -_080A667A: +@080A667A: pop {r4} pop {r0} bx r0 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] movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0 - ble _080A66D0 + ble @080A66D0 subs r0, r1, 0x1 strh r0, [r4, 0x2E] ldrh r1, [r4, 0x30] @@ -312235,27 +312235,27 @@ sub_80A6680: @ 80A6680 lsls r0, 16 asrs r0, 24 strh r0, [r1, 0x26] - b _080A66D6 + b @080A66D6 .align 2, 0 .pool -_080A66D0: +@080A66D0: adds r0, r4, 0 bl sub_80A62DC -_080A66D6: +@080A66D6: pop {r4} pop {r0} bx r0 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] movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0 - ble _080A673E + ble @080A673E subs r0, r1, 0x1 strh r0, [r4, 0x2E] ldrh r1, [r4, 0x32] @@ -312278,11 +312278,11 @@ sub_80A66DC: @ 80A66DC ldrsh r1, [r4, r2] bl __modsi3 cmp r0, 0 - bne _080A6744 + bne @080A6744 movs r1, 0x38 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080A6744 + beq @080A6744 adds r3, r4, 0 adds r3, 0x3E ldrb r2, [r3] @@ -312296,18 +312296,18 @@ sub_80A66DC: @ 80A66DC ands r0, r2 orrs r0, r1 strb r0, [r3] - b _080A6744 -_080A673E: + b @080A6744 +@080A673E: adds r0, r4, 0 bl sub_80A62DC -_080A6744: +@080A6744: pop {r4} pop {r0} bx r0 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 @@ -312319,7 +312319,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] @@ -312353,7 +312353,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] @@ -312366,7 +312366,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 @@ -312374,16 +312374,16 @@ sub_80A67BC: @ 80A67BC movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080A67D2 + beq @080A67D2 adds r0, r2, 0 bl sub_80A62DC -_080A67D2: +@080A67D2: pop {r0} bx r0 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 @@ -312391,16 +312391,16 @@ sub_80A67D8: @ 80A67D8 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080A67EE + beq @080A67EE adds r0, r2, 0 bl sub_80A62DC -_080A67EE: +@080A67EE: pop {r0} bx r0 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 @@ -312417,7 +312417,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 @@ -312436,7 +312436,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 @@ -312460,7 +312460,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} @@ -312481,35 +312481,35 @@ sub_80A6864: @ 80A6864 lsls r0, 24 lsrs r0, 24 cmp r6, r0 - bhi _080A68B0 + bhi @080A68B0 cmp r6, r0 - bcs _080A68A4 + bcs @080A68A4 lsls r0, r5, 16 - b _080A68C0 + b @080A68C0 .align 2, 0 .pool -_080A68A4: +@080A68A4: ldrb r0, [r7] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080A68BC -_080A68B0: + beq @080A68BC +@080A68B0: ldrh r1, [r4, 0x20] lsls r0, r5, 16 asrs r0, 16 subs r1, r0 strh r1, [r4, 0x20] - b _080A68C8 -_080A68BC: + b @080A68C8 +@080A68BC: mov r1, r8 lsls r0, r1, 16 -_080A68C0: +@080A68C0: asrs r0, 16 ldrh r1, [r4, 0x20] adds r0, r1 strh r0, [r4, 0x20] -_080A68C8: +@080A68C8: pop {r3} mov r8, r3 pop {r4-r7} @@ -312518,7 +312518,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] @@ -312541,13 +312541,13 @@ 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 lsls r0, 24 cmp r0, 0 - bne _080A692C + bne @080A692C ldrh r0, [r4, 0x3A] ldrh r1, [r4, 0x3C] adds r0, r1 @@ -312561,23 +312561,23 @@ sub_80A6900: @ 80A6900 adds r0, r1 strh r0, [r4, 0x26] movs r0, 0 - b _080A692E -_080A692C: + b @080A692E +@080A692C: movs r0, 0x1 -_080A692E: +@080A692E: pop {r4} pop {r1} bx r1 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 lsls r0, 24 cmp r0, 0 - bne _080A6960 + bne @080A6960 ldrh r0, [r4, 0x3A] ldrh r1, [r4, 0x3C] adds r0, r1 @@ -312591,17 +312591,17 @@ sub_80A6934: @ 80A6934 adds r0, r1 strh r0, [r4, 0x24] movs r0, 0 - b _080A6962 -_080A6960: + b @080A6962 +@080A6960: movs r0, 0x1 -_080A6962: +@080A6962: pop {r4} pop {r1} bx r1 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 @@ -312617,12 +312617,12 @@ 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 cmp r1, 0 - bne _080A69A8 + bne @080A69A8 ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0 @@ -312636,7 +312636,7 @@ sub_80A6980: @ 80A6980 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] -_080A69A8: +@080A69A8: ldr r4, =0x0203841e movs r0, 0 ldrsh r1, [r4, r0] @@ -312654,12 +312654,12 @@ _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 cmp r1, 0 - bne _080A69F0 + bne @080A69F0 ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 @@ -312669,10 +312669,10 @@ sub_80A69CC: @ 80A69CC strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x1 - b _080A6A04 + b @080A6A04 .align 2, 0 .pool -_080A69F0: +@080A69F0: ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 @@ -312682,7 +312682,7 @@ _080A69F0: strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 -_080A6A04: +@080A6A04: bl sub_80A60AC lsls r0, 24 lsrs r0, 24 @@ -312704,7 +312704,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 @@ -312718,7 +312718,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 @@ -312730,7 +312730,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 @@ -312738,22 +312738,22 @@ battle_get_side_with_given_state: @ 80A6A54 ldr r0, =0x0202406c ldrb r2, [r0] cmp r1, r2 - bcs _080A6A7E + bcs @080A6A7E ldr r4, =0x02024076 ldrb r0, [r4] cmp r0, r3 - beq _080A6A7E -_080A6A6C: + beq @080A6A7E +@080A6A6C: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, r2 - bcs _080A6A7E + bcs @080A6A7E adds r0, r1, r4 ldrb r0, [r0] cmp r0, r3 - bne _080A6A6C -_080A6A7E: + bne @080A6A6C +@080A6A7E: adds r0, r1, 0 pop {r4} pop {r1} @@ -312763,7 +312763,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 @@ -312771,29 +312771,29 @@ sub_80A6A90: @ 80A6A90 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A6ABC + beq @080A6ABC ldr r0, =0x02038436 ldrb r0, [r0] cmp r0, r4 - beq _080A6B0A + beq @080A6B0A ldr r0, =0x02038437 ldrb r0, [r0] cmp r0, r4 - beq _080A6B0A - b _080A6B18 + beq @080A6B0A + b @080A6B18 .align 2, 0 .pool -_080A6ABC: +@080A6ABC: ldr r0, =0x02024076 adds r0, r4, r0 ldrb r0, [r0] cmp r0, 0xFF - beq _080A6B18 + beq @080A6B18 adds r0, r4, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080A6AF0 + beq @080A6AF0 ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -312801,10 +312801,10 @@ _080A6ABC: movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 - b _080A6AFE + b @080A6AFE .align 2, 0 .pool -_080A6AF0: +@080A6AF0: ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 @@ -312812,27 +312812,27 @@ _080A6AF0: movs r0, 0x64 muls r0, r1 ldr r1, =0x020244ec -_080A6AFE: +@080A6AFE: adds r0, r1 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _080A6B18 -_080A6B0A: + beq @080A6B18 +@080A6B0A: movs r0, 0x1 - b _080A6B1A + b @080A6B1A .align 2, 0 .pool -_080A6B18: +@080A6B18: movs r0, 0 -_080A6B1A: +@080A6B1A: pop {r4,r5} pop {r1} bx r1 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 @@ -312843,14 +312843,14 @@ 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 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq _080A6B64 + beq @080A6B64 ldr r0, =0x0202305c ldr r0, [r0] str r0, [r4] @@ -312863,10 +312863,10 @@ sub_80A6B30: @ 80A6B30 movs r0, 0x1 strb r0, [r4, 0x9] strh r1, [r4, 0xA] - b _080A6B7E + b @080A6B7E .align 2, 0 .pool -_080A6B64: +@080A6B64: ldr r0, =0x0202305c ldr r0, [r0] str r0, [r4] @@ -312880,7 +312880,7 @@ _080A6B64: movs r0, 0x80 lsls r0, 2 strh r0, [r4, 0xA] -_080A6B7E: +@080A6B7E: strh r1, [r4, 0xC] pop {r4} pop {r0} @@ -312890,7 +312890,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 @@ -312898,7 +312898,7 @@ sub_80A6B90: @ 80A6B90 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq _080A6BC4 + beq @080A6BC4 ldr r0, =0x0202305c ldr r0, [r0] str r0, [r4] @@ -312911,16 +312911,16 @@ sub_80A6B90: @ 80A6B90 movs r0, 0x1 strb r0, [r4, 0x9] strh r1, [r4, 0xA] - b _080A6BEA + b @080A6BEA .align 2, 0 .pool -_080A6BC4: +@080A6BC4: cmp r5, 0x1 - bne _080A6BD0 + bne @080A6BD0 adds r0, r4, 0 bl sub_80A6B30 - b _080A6BEC -_080A6BD0: + b @080A6BEC +@080A6BD0: ldr r0, =0x0202305c ldr r0, [r0] str r0, [r4] @@ -312934,9 +312934,9 @@ _080A6BD0: movs r0, 0xC0 lsls r0, 2 strh r0, [r4, 0xA] -_080A6BEA: +@080A6BEA: strh r1, [r4, 0xC] -_080A6BEC: +@080A6BEC: pop {r4,r5} pop {r0} bx r0 @@ -312945,7 +312945,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 @@ -312958,7 +312958,7 @@ sub_80A6BFC: @ 80A6BFC lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - beq _080A6C30 + beq @080A6C30 movs r0, 0 movs r1, 0xE strb r1, [r4, 0x8] @@ -312966,43 +312966,43 @@ sub_80A6BFC: @ 80A6BFC strb r1, [r4, 0x9] strh r0, [r4, 0xA] strh r0, [r4, 0xC] - b _080A6C60 + b @080A6C60 .align 2, 0 .pool -_080A6C30: +@080A6C30: ldr r0, =0x02038436 ldrb r0, [r0] bl battle_get_per_side_status_permutated lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x1 - bne _080A6C50 + bne @080A6C50 movs r0, 0x8 strb r0, [r4, 0x8] strb r1, [r4, 0x9] movs r0, 0x80 lsls r0, 2 - b _080A6C5C + b @080A6C5C .align 2, 0 .pool -_080A6C50: +@080A6C50: movs r0, 0x9 strb r0, [r4, 0x8] movs r0, 0x2 strb r0, [r4, 0x9] movs r0, 0xC0 lsls r0, 2 -_080A6C5C: +@080A6C5C: strh r0, [r4, 0xA] strh r5, [r4, 0xC] -_080A6C60: +@080A6C60: pop {r4,r5} pop {r0} bx r0 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 @@ -313045,7 +313045,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} @@ -313084,7 +313084,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 @@ -313114,7 +313114,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 @@ -313128,7 +313128,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 @@ -313138,14 +313138,14 @@ sub_80A6D60: @ 80A6D60 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080A6D86 + bne @080A6D86 ldrb r0, [r4, 0x8] ldr r1, [r4, 0x4] lsls r3, r5, 24 lsrs r3, 24 movs r2, 0 bl sub_80A4720 -_080A6D86: +@080A6D86: ldrb r0, [r4, 0x9] bl gpu_copy_wram_bg_tilemap_to_vram pop {r4,r5} @@ -313154,32 +313154,32 @@ _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 cmp r0, 0 - bne _080A6DA4 + bne @080A6DA4 movs r0, 0x2 - b _080A6DA6 -_080A6DA4: + b @080A6DA6 +@080A6DA4: movs r0, 0x1 -_080A6DA6: +@080A6DA6: pop {r1} bx r1 thumb_func_end sub_80A6D94 thumb_func_start sub_80A6DAC -sub_80A6DAC: @ 80A6DAC +sub_80A6DAC: ; 80A6DAC push {lr} lsls r0, 24 cmp r0, 0 - beq _080A6DBE + beq @080A6DBE bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A6DD4 -_080A6DBE: + beq @080A6DD4 +@080A6DBE: movs r0, 0x3 movs r1, 0 movs r2, 0 @@ -313188,8 +313188,8 @@ _080A6DBE: movs r1, 0x1 movs r2, 0x1 bl lcd_bg_operations - b _080A6DE8 -_080A6DD4: + b @080A6DE8 +@080A6DD4: movs r0, 0x3 movs r1, 0 movs r2, 0x1 @@ -313198,13 +313198,13 @@ _080A6DD4: movs r1, 0x1 movs r2, 0 bl lcd_bg_operations -_080A6DE8: +@080A6DE8: pop {r0} bx r0 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] @@ -313225,7 +313225,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] @@ -313258,7 +313258,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 @@ -313279,16 +313279,16 @@ obj_translate_based_on_private_1_2_3_4: @ 80A6E54 lsrs r3, r2, 31 mov r9, r3 cmp r1, 0 - bge _080A6E80 + bge @080A6E80 negs r1, r1 -_080A6E80: +@080A6E80: lsls r0, r1, 24 lsrs r6, r0, 16 adds r0, r2, 0 cmp r0, 0 - bge _080A6E8C + bge @080A6E8C negs r0, r0 -_080A6E8C: +@080A6E8C: lsls r0, 24 lsrs r5, r0, 16 movs r0, 0x2E @@ -313305,26 +313305,26 @@ _080A6E8C: lsrs r5, r0, 16 mov r2, r8 cmp r2, 0 - beq _080A6EB8 + beq @080A6EB8 movs r0, 0x1 orrs r6, r0 - b _080A6EBC -_080A6EB8: + b @080A6EBC +@080A6EB8: ldr r0, =0x0000fffe ands r6, r0 -_080A6EBC: +@080A6EBC: mov r3, r9 cmp r3, 0 - beq _080A6ECC + beq @080A6ECC movs r0, 0x1 orrs r5, r0 - b _080A6ED0 + b @080A6ED0 .align 2, 0 .pool -_080A6ECC: +@080A6ECC: ldr r0, =0x0000fffe ands r5, r0 -_080A6ED0: +@080A6ED0: movs r0, 0 strh r6, [r7, 0x30] strh r5, [r7, 0x32] @@ -313341,7 +313341,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] @@ -313362,7 +313362,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] @@ -313383,16 +313383,16 @@ 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 ldrsh r0, [r2, r1] cmp r0, 0 - bne _080A6F4C + bne @080A6F4C movs r0, 0x1 - b _080A6F90 -_080A6F4C: + b @080A6F90 +@080A6F4C: ldrh r1, [r2, 0x30] ldrh r4, [r2, 0x32] ldrh r6, [r2, 0x34] @@ -313406,24 +313406,24 @@ _080A6F4C: movs r0, 0x1 ands r1, r0 cmp r1, 0 - beq _080A6F6E + beq @080A6F6E lsrs r0, r3, 24 negs r0, r0 - b _080A6F70 -_080A6F6E: + b @080A6F70 +@080A6F6E: lsrs r0, r3, 24 -_080A6F70: +@080A6F70: strh r0, [r2, 0x24] movs r0, 0x1 ands r4, r0 cmp r4, 0 - beq _080A6F80 + beq @080A6F80 lsrs r0, r5, 8 negs r0, r0 - b _080A6F82 -_080A6F80: + b @080A6F82 +@080A6F80: lsrs r0, r5, 8 -_080A6F82: +@080A6F82: strh r0, [r2, 0x26] strh r6, [r2, 0x34] strh r5, [r2, 0x36] @@ -313431,30 +313431,30 @@ _080A6F82: subs r0, 0x1 strh r0, [r2, 0x2E] movs r0, 0 -_080A6F90: +@080A6F90: pop {r4-r6} pop {r1} bx r1 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 lsls r0, 24 cmp r0, 0 - beq _080A6FAC + beq @080A6FAC adds r0, r4, 0 bl sub_80A62DC -_080A6FAC: +@080A6FAC: pop {r4} pop {r0} bx r0 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 @@ -313462,17 +313462,17 @@ sub_80A6FB4: @ 80A6FB4 bl sub_80A6F3C lsls r0, 24 cmp r0, 0 - beq _080A6FCE + beq @080A6FCE adds r0, r4, 0 bl sub_80A62DC -_080A6FCE: +@080A6FCE: pop {r4} pop {r0} bx r0 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 @@ -313481,9 +313481,9 @@ sub_80A6FD4: @ 80A6FD4 ldrsh r0, [r4, r2] subs r0, r1, r0 cmp r0, 0 - bge _080A6FE8 + bge @080A6FE8 negs r0, r0 -_080A6FE8: +@080A6FE8: lsls r0, 8 movs r2, 0x2E ldrsh r1, [r4, r2] @@ -313497,7 +313497,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] @@ -313518,7 +313518,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 @@ -313539,16 +313539,16 @@ sub_80A7028: @ 80A7028 lsrs r3, r2, 31 mov r9, r3 cmp r1, 0 - bge _080A7054 + bge @080A7054 negs r1, r1 -_080A7054: +@080A7054: lsls r0, r1, 20 lsrs r6, r0, 16 adds r0, r2, 0 cmp r0, 0 - bge _080A7060 + bge @080A7060 negs r0, r0 -_080A7060: +@080A7060: lsls r0, 20 lsrs r5, r0, 16 movs r0, 0x2E @@ -313565,26 +313565,26 @@ _080A7060: lsrs r5, r0, 16 mov r2, r8 cmp r2, 0 - beq _080A708C + beq @080A708C movs r0, 0x1 orrs r6, r0 - b _080A7090 -_080A708C: + b @080A7090 +@080A708C: ldr r0, =0x0000fffe ands r6, r0 -_080A7090: +@080A7090: mov r3, r9 cmp r3, 0 - beq _080A70A0 + beq @080A70A0 movs r0, 0x1 orrs r5, r0 - b _080A70A4 + b @080A70A4 .align 2, 0 .pool -_080A70A0: +@080A70A0: ldr r0, =0x0000fffe ands r5, r0 -_080A70A4: +@080A70A4: movs r0, 0 strh r6, [r7, 0x30] strh r5, [r7, 0x32] @@ -313601,7 +313601,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] @@ -313622,16 +313622,16 @@ 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 ldrsh r0, [r2, r1] cmp r0, 0 - bne _080A70F8 + bne @080A70F8 movs r0, 0x1 - b _080A713C -_080A70F8: + b @080A713C +@080A70F8: ldrh r1, [r2, 0x30] ldrh r4, [r2, 0x32] ldrh r6, [r2, 0x34] @@ -313645,24 +313645,24 @@ _080A70F8: movs r0, 0x1 ands r1, r0 cmp r1, 0 - beq _080A711A + beq @080A711A lsrs r0, r3, 20 negs r0, r0 - b _080A711C -_080A711A: + b @080A711C +@080A711A: lsrs r0, r3, 20 -_080A711C: +@080A711C: strh r0, [r2, 0x24] movs r0, 0x1 ands r4, r0 cmp r4, 0 - beq _080A712C + beq @080A712C lsrs r0, r5, 4 negs r0, r0 - b _080A712E -_080A712C: + b @080A712E +@080A712C: lsrs r0, r5, 4 -_080A712E: +@080A712E: strh r0, [r2, 0x26] strh r6, [r2, 0x34] strh r5, [r2, 0x36] @@ -313670,30 +313670,30 @@ _080A712E: subs r0, 0x1 strh r0, [r2, 0x2E] movs r0, 0 -_080A713C: +@080A713C: pop {r4-r6} pop {r1} bx r1 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 lsls r0, 24 cmp r0, 0 - beq _080A7158 + beq @080A7158 adds r0, r4, 0 bl sub_80A62DC -_080A7158: +@080A7158: pop {r4} pop {r0} bx r0 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 @@ -313702,9 +313702,9 @@ sub_80A7160: @ 80A7160 ldrsh r0, [r4, r2] subs r0, r1, r0 cmp r0, 0 - bge _080A7174 + bge @080A7174 negs r0, r0 -_080A7174: +@080A7174: lsls r0, 4 movs r2, 0x2E ldrsh r1, [r4, r2] @@ -313718,7 +313718,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] @@ -313739,7 +313739,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 @@ -313759,7 +313759,7 @@ obj_id_set_rotscale: @ 80A71B4 bl sub_80A7238 lsls r0, 24 cmp r0, 0 - beq _080A71F0 + beq @080A71F0 mov r0, sp ldrh r0, [r0] negs r0, r0 @@ -313769,7 +313769,7 @@ obj_id_set_rotscale: @ 80A71B4 ands r1, r5 orrs r1, r0 str r1, [sp] -_080A71F0: +@080A71F0: ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 @@ -313783,7 +313783,7 @@ _080A71F0: adds r1, r5, 0 movs r2, 0x1 movs r3, 0x2 - bl _082E709C + bl ObjAffineSet ldr r0, =0x02021bc0 lsls r4, 3 adds r4, r0 @@ -313804,12 +313804,12 @@ _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 cmp r0, 0 - beq _080A7268 + beq @080A7268 ldr r4, =0x02020630 movs r0, 0 bl obj_id_for_side_relative_to_move @@ -313822,21 +313822,21 @@ sub_80A7238: @ 80A7238 movs r2, 0x32 ldrsh r0, [r1, r2] cmp r0, 0xC9 - beq _080A7268 + beq @080A7268 movs r0, 0x1 - b _080A726A + b @080A726A .align 2, 0 .pool -_080A7268: +@080A7268: movs r0, 0 -_080A726A: +@080A726A: pop {r4} pop {r1} bx r1 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} @@ -313856,13 +313856,13 @@ sub_80A7270: @ 80A7270 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080A72A6 + bne @080A72A6 adds r0, r7, 0 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _080A72B4 -_080A72A6: + beq @080A72B4 +@080A72A6: adds r2, r4, 0 adds r2, 0x3E ldrb r1, [r2] @@ -313870,7 +313870,7 @@ _080A72A6: negs r0, r0 ands r0, r1 strb r0, [r2] -_080A72B4: +@080A72B4: ldr r1, =0x02020630 lsls r4, r6, 4 adds r0, r4, r6 @@ -313895,11 +313895,11 @@ _080A72B4: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080A7312 + bne @080A7312 ldrb r0, [r5, 0x1] lsls r0, 30 cmp r0, 0 - bne _080A7312 + bne @080A7312 ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -313917,7 +313917,7 @@ _080A72B4: ands r0, r2 orrs r0, r1 strb r0, [r5, 0x3] -_080A7312: +@080A7312: ldr r1, =0x02020630 adds r0, r4, r6 lsls r0, 2 @@ -313942,7 +313942,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 @@ -313989,7 +313989,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 @@ -314008,11 +314008,11 @@ sub_80A73A0: @ 80A73A0 movs r3, 0x4 ldrsh r0, [r0, r3] cmp r0, 0 - bge _080A73CC + bge @080A73CC negs r0, r0 lsls r0, 16 lsrs r1, r0, 16 -_080A73CC: +@080A73CC: lsls r0, r1, 16 asrs r0, 19 strh r0, [r2, 0x26] @@ -314023,7 +314023,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} @@ -314045,7 +314045,7 @@ sub_80A73E0: @ 80A73E0 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _080A7486 + beq @080A7486 adds r0, r4, 0 adds r0, 0x2C ldrb r1, [r0] @@ -314053,7 +314053,7 @@ sub_80A73E0: @ 80A73E0 orrs r1, r2 strb r1, [r0] cmp r6, 0 - beq _080A742E + beq @080A742E ldrb r3, [r4, 0x1] lsrs r1, r3, 6 ldrb r2, [r4, 0x3] @@ -314062,7 +314062,7 @@ sub_80A73E0: @ 80A73E0 lsrs r3, 30 adds r0, r4, 0 bl oam_center -_080A742E: +@080A742E: ldr r6, =0xffff0000 lsls r0, r7, 16 orrs r5, r0 @@ -314075,7 +314075,7 @@ _080A742E: bl sub_80A7238 lsls r0, 24 cmp r0, 0 - beq _080A745C + beq @080A745C mov r0, sp ldrh r0, [r0] negs r0, r0 @@ -314085,7 +314085,7 @@ _080A742E: ands r1, r6 orrs r1, r0 str r1, [sp] -_080A745C: +@080A745C: ldrb r4, [r4, 0x3] lsls r4, 26 lsrs r4, 27 @@ -314094,7 +314094,7 @@ _080A745C: adds r1, r5, 0 movs r2, 0x1 movs r3, 0x2 - bl _082E709C + bl ObjAffineSet ldr r0, =0x02021bc0 lsls r4, 3 adds r4, r0 @@ -314106,7 +314106,7 @@ _080A745C: strh r0, [r4, 0x4] ldrh r0, [r5, 0x6] strh r0, [r4, 0x6] -_080A7486: +@080A7486: add sp, 0x10 pop {r3} mov r8, r3 @@ -314118,7 +314118,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 @@ -314151,7 +314151,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 @@ -314165,7 +314165,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 @@ -314180,20 +314180,20 @@ 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 lsrs r0, 16 cmp r1, 0 - bne _080A7588 + bne @080A7588 ldr r2, =0x02037714 ldr r1, =0x02037b14 lsls r0, 1 adds r4, r0, r1 adds r5, r0, r2 movs r6, 0xF -_080A7524: +@080A7524: ldr r0, [r5] lsls r2, r0, 27 lsrs r2, 27 @@ -314235,11 +314235,11 @@ _080A7524: adds r5, 0x2 subs r6, 0x1 cmp r6, 0 - bge _080A7524 - b _080A7598 + bge @080A7524 + b @080A7598 .align 2, 0 .pool -_080A7588: +@080A7588: lsls r1, r0, 1 ldr r0, =0x02037714 adds r0, r1, r0 @@ -314247,7 +314247,7 @@ _080A7588: adds r1, r2 ldr r2, =0x04000008 bl CpuSet -_080A7598: +@080A7598: pop {r4-r7} pop {r0} bx r0 @@ -314256,7 +314256,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 @@ -314286,22 +314286,22 @@ sub_80A75AC: @ 80A75AC str r6, [sp, 0x4] movs r4, 0 cmp r0, 0 - beq _080A7602 + beq @080A7602 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080A75F6 + bne @080A75F6 movs r4, 0xE - b _080A7602 -_080A75F6: + b @080A7602 +@080A75F6: bl sub_80A6D94 lsls r0, 24 lsrs r0, 24 movs r4, 0x1 lsls r4, r0 -_080A7602: +@080A7602: cmp r7, 0 - beq _080A7614 + beq @080A7614 ldr r0, =0x02038436 ldrb r0, [r0] adds r1, r0, 0 @@ -314309,10 +314309,10 @@ _080A7602: movs r0, 0x1 lsls r0, r1 orrs r4, r0 -_080A7614: +@080A7614: mov r0, r8 cmp r0, 0 - beq _080A7628 + beq @080A7628 ldr r0, =0x02038437 ldrb r0, [r0] adds r1, r0, 0 @@ -314320,10 +314320,10 @@ _080A7614: movs r0, 0x1 lsls r0, r1 orrs r4, r0 -_080A7628: +@080A7628: mov r0, r9 cmp r0, 0 - beq _080A764E + beq @080A764E ldr r6, =0x02038436 ldrb r0, [r6] movs r5, 0x2 @@ -314331,7 +314331,7 @@ _080A7628: bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _080A764E + beq @080A764E ldrb r0, [r6] eors r0, r5 adds r1, r0, 0 @@ -314339,10 +314339,10 @@ _080A7628: movs r0, 0x1 lsls r0, r1 orrs r4, r0 -_080A764E: +@080A764E: mov r0, r10 cmp r0, 0 - beq _080A7674 + beq @080A7674 ldr r6, =0x02038437 ldrb r0, [r6] movs r5, 0x2 @@ -314350,7 +314350,7 @@ _080A764E: bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _080A7674 + beq @080A7674 ldrb r0, [r6] eors r0, r5 adds r1, r0, 0 @@ -314358,36 +314358,36 @@ _080A764E: movs r0, 0x1 lsls r0, r1 orrs r4, r0 -_080A7674: +@080A7674: ldr r0, [sp] cmp r0, 0 - beq _080A769A + beq @080A769A bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080A7694 + bne @080A7694 movs r0, 0x80 lsls r0, 1 - b _080A7698 + b @080A7698 .align 2, 0 .pool -_080A7694: +@080A7694: movs r0, 0x80 lsls r0, 7 -_080A7698: +@080A7698: orrs r4, r0 -_080A769A: +@080A769A: ldr r0, [sp, 0x4] cmp r0, 0 - beq _080A76B0 + beq @080A76B0 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080A76B0 + bne @080A76B0 movs r0, 0x80 lsls r0, 2 orrs r4, r0 -_080A76B0: +@080A76B0: adds r0, r4, 0 add sp, 0x8 pop {r3-r5} @@ -314400,7 +314400,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} @@ -314417,15 +314417,15 @@ sub_80A76C4: @ 80A76C4 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A76F2 + beq @080A76F2 cmp r5, 0 - beq _080A77A0 + beq @080A77A0 movs r4, 0x80 lsls r4, 11 - b _080A77A0 -_080A76F2: + b @080A77A0 +@080A76F2: cmp r5, 0 - beq _080A771A + beq @080A771A movs r0, 0 bl battle_get_side_with_given_state lsls r0, 24 @@ -314433,7 +314433,7 @@ _080A76F2: bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _080A771A + beq @080A771A movs r0, 0 bl battle_get_side_with_given_state lsls r0, 24 @@ -314441,9 +314441,9 @@ _080A76F2: adds r0, 0x10 movs r4, 0x1 lsls r4, r0 -_080A771A: +@080A771A: cmp r6, 0 - beq _080A7746 + beq @080A7746 movs r0, 0x2 bl battle_get_side_with_given_state lsls r0, 24 @@ -314451,7 +314451,7 @@ _080A771A: bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _080A7746 + beq @080A7746 movs r0, 0x2 bl battle_get_side_with_given_state lsls r0, 24 @@ -314461,9 +314461,9 @@ _080A771A: movs r0, 0x1 lsls r0, r1 orrs r4, r0 -_080A7746: +@080A7746: cmp r7, 0 - beq _080A7772 + beq @080A7772 movs r0, 0x1 bl battle_get_side_with_given_state lsls r0, 24 @@ -314471,7 +314471,7 @@ _080A7746: bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _080A7772 + beq @080A7772 movs r0, 0x1 bl battle_get_side_with_given_state lsls r0, 24 @@ -314481,10 +314481,10 @@ _080A7746: movs r0, 0x1 lsls r0, r1 orrs r4, r0 -_080A7772: +@080A7772: mov r0, r8 cmp r0, 0 - beq _080A77A0 + beq @080A77A0 movs r0, 0x3 bl battle_get_side_with_given_state lsls r0, 24 @@ -314492,7 +314492,7 @@ _080A7772: bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _080A77A0 + beq @080A77A0 movs r0, 0x3 bl battle_get_side_with_given_state lsls r0, 24 @@ -314502,7 +314502,7 @@ _080A7772: movs r0, 0x1 lsls r0, r1 orrs r4, r0 -_080A77A0: +@080A77A0: adds r0, r4, 0 pop {r3} mov r8, r3 @@ -314512,14 +314512,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 @@ -314531,56 +314531,56 @@ 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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _080A7806 + bne @080A7806 ldr r2, =0x0203841e movs r3, 0x6 ldrsh r0, [r2, r3] movs r1, 0 cmp r0, 0 - bne _080A77E2 + bne @080A77E2 movs r1, 0x1 -_080A77E2: +@080A77E2: movs r3, 0x4 ldrsh r0, [r2, r3] cmp r0, 0 - bne _080A77F8 + bne @080A77F8 adds r0, r4, 0 bl sub_80A69CC - b _080A77FE + b @080A77FE .align 2, 0 .pool -_080A77F8: +@080A77F8: adds r0, r4, 0 bl sub_80A6980 -_080A77FE: +@080A77FE: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _080A781A -_080A7806: + b @080A781A +@080A7806: adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x30 ands r0, r1 cmp r0, 0 - beq _080A781A + beq @080A781A adds r0, r4, 0 bl move_anim_8074EE0 -_080A781A: +@080A781A: pop {r4} pop {r0} bx r0 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 @@ -314591,15 +314591,15 @@ sub_80A7820: @ 80A7820 ands r0, r1 movs r1, 0 cmp r0, 0 - bne _080A7838 + bne @080A7838 movs r1, 0x1 -_080A7838: +@080A7838: ldrb r0, [r6, 0xA] movs r7, 0x1 cmp r0, 0 - bne _080A7842 + bne @080A7842 movs r7, 0x3 -_080A7842: +@080A7842: adds r0, r5, 0 bl sub_80A69CC ldr r0, =0x02038436 @@ -314607,11 +314607,11 @@ _080A7842: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080A785C + beq @080A785C ldrh r0, [r6, 0x4] negs r0, r0 strh r0, [r6, 0x4] -_080A785C: +@080A785C: ldrh r0, [r6, 0x8] strh r0, [r5, 0x2E] ldr r4, =0x02038437 @@ -314644,7 +314644,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 @@ -314654,12 +314654,12 @@ sub_80A78AC: @ 80A78AC bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080A78CC + beq @080A78CC ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] -_080A78CC: +@080A78CC: ldr r4, =0x0203841e ldrh r0, [r4, 0x8] strh r0, [r6, 0x2E] @@ -314694,68 +314694,68 @@ _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 lsls r0, 24 cmp r0, 0 - beq _080A7930 + beq @080A7930 adds r0, r4, 0 bl move_anim_8072740 -_080A7930: +@080A7930: pop {r4} pop {r0} bx r0 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 movs r2, 0xC ldrsh r1, [r0, r2] cmp r1, 0 - bne _080A7950 + bne @080A7950 movs r4, 0x1 movs r7, 0x3 - b _080A7954 + b @080A7954 .align 2, 0 .pool -_080A7950: +@080A7950: movs r4, 0 movs r7, 0x1 -_080A7954: +@080A7954: movs r1, 0xA ldrsh r0, [r0, r1] cmp r0, 0 - bne _080A796C + bne @080A796C adds r0, r5, 0 adds r1, r4, 0 bl sub_80A69CC ldr r0, =0x02038436 - b _080A7976 + b @080A7976 .align 2, 0 .pool -_080A796C: +@080A796C: adds r0, r5, 0 adds r1, r4, 0 bl sub_80A6980 ldr r0, =0x02038437 -_080A7976: +@080A7976: ldrb r6, [r0] ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080A798E + beq @080A798E ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] -_080A798E: +@080A798E: adds r0, r5, 0 adds r1, r4, 0 bl sub_80A6980 @@ -314791,7 +314791,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 @@ -314799,13 +314799,13 @@ duplicate_obj_of_side_rel2move_in_transparent_mode: @ 80A79E8 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xFF - beq _080A7A52 + beq @080A7A52 movs r6, 0 ldr r2, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r1, r0, 2 -_080A7A04: +@080A7A04: lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -314815,7 +314815,7 @@ _080A7A04: ldrb r0, [r5] lsls r0, 31 cmp r0, 0 - bne _080A7A48 + bne @080A7A48 adds r0, r4, 0 adds r1, r2 movs r2, 0x44 @@ -314835,26 +314835,26 @@ _080A7A04: strb r0, [r5] lsls r0, r6, 16 asrs r0, 16 - b _080A7A56 + b @080A7A56 .align 2, 0 .pool -_080A7A48: +@080A7A48: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x3F - bls _080A7A04 -_080A7A52: + bls @080A7A04 +@080A7A52: movs r0, 0x1 negs r0, r0 -_080A7A56: +@080A7A56: pop {r4-r6} pop {r1} bx r1 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 @@ -314868,7 +314868,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 @@ -314880,25 +314880,25 @@ sub_80A7A74: @ 80A7A74 movs r4, 0 ldrsh r0, [r2, r4] cmp r1, r0 - ble _080A7A8E + ble @080A7A8E movs r3, 0x1 -_080A7A8E: +@080A7A8E: cmp r1, r0 - bge _080A7A94 + bge @080A7A94 ldr r3, =0x0000ffff -_080A7A94: +@080A7A94: movs r0, 0x6 ldrsh r1, [r2, r0] movs r4, 0x2 ldrsh r0, [r2, r4] cmp r1, r0 - ble _080A7AA2 + ble @080A7AA2 movs r6, 0x1 -_080A7AA2: +@080A7AA2: cmp r1, r0 - bge _080A7AA8 + bge @080A7AA8 ldr r6, =0x0000ffff -_080A7AA8: +@080A7AA8: ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 @@ -314937,7 +314937,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 @@ -314954,7 +314954,7 @@ sub_80A7AFC: @ 80A7AFC movs r2, 0xA ldrsh r1, [r4, r2] cmp r0, r1 - ble _080A7B90 + ble @080A7B90 movs r0, 0 strh r0, [r4, 0x8] ldrh r0, [r4, 0xC] @@ -314963,32 +314963,32 @@ sub_80A7AFC: @ 80A7AFC movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _080A7B4C + beq @080A7B4C ldrh r2, [r4, 0xE] movs r3, 0xE ldrsh r1, [r4, r3] movs r3, 0x16 ldrsh r0, [r4, r3] cmp r1, r0 - beq _080A7B60 + beq @080A7B60 ldrh r0, [r4, 0x12] adds r0, r2, r0 strh r0, [r4, 0xE] - b _080A7B60 + b @080A7B60 .align 2, 0 .pool -_080A7B4C: +@080A7B4C: ldrh r2, [r4, 0x10] movs r0, 0x10 ldrsh r1, [r4, r0] movs r3, 0x18 ldrsh r0, [r4, r3] cmp r1, r0 - beq _080A7B60 + beq @080A7B60 ldrh r0, [r4, 0x14] adds r0, r2, r0 strh r0, [r4, 0x10] -_080A7B60: +@080A7B60: ldrh r1, [r4, 0x10] lsls r1, 8 ldrh r0, [r4, 0xE] @@ -315002,23 +315002,23 @@ _080A7B60: movs r2, 0x16 ldrsh r0, [r4, r2] cmp r1, r0 - bne _080A7B90 + bne @080A7B90 movs r3, 0x10 ldrsh r1, [r4, r3] movs r2, 0x18 ldrsh r0, [r4, r2] cmp r1, r0 - bne _080A7B90 + bne @080A7B90 adds r0, r5, 0 bl move_anim_task_del -_080A7B90: +@080A7B90: pop {r4,r5} pop {r0} bx r0 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 @@ -315028,13 +315028,13 @@ sub_80A7B98: @ 80A7B98 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0xFF - bne _080A7BBC + bne @080A7BBC adds r0, r4, 0 bl move_anim_task_del - b _080A7BE2 + b @080A7BE2 .align 2, 0 .pool -_080A7BBC: +@080A7BBC: ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -315053,7 +315053,7 @@ _080A7BBC: adds r1, r2 strh r1, [r0, 0x8] bl sub_80A7BF4 -_080A7BE2: +@080A7BE2: pop {r4} pop {r0} bx r0 @@ -315062,7 +315062,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 @@ -315084,7 +315084,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 @@ -315102,13 +315102,13 @@ sub_80A7C1C: @ 80A7C1C movs r2, 0x12 ldrsh r1, [r4, r2] cmp r0, r1 - blt _080A7CAC + blt @080A7CAC movs r0, 0 strh r0, [r4, 0x10] movs r1, 0x14 ldrsh r0, [r4, r1] cmp r0, 0 - bne _080A7C78 + bne @080A7C78 ldrh r2, [r4, 0xC] adds r2, 0x1 strh r2, [r4, 0xC] @@ -315123,13 +315123,13 @@ sub_80A7C1C: @ 80A7C1C movs r2, 0xE ldrsh r0, [r4, r2] cmp r1, r0 - bne _080A7CAC + bne @080A7CAC movs r0, 0x1 strh r0, [r4, 0x14] - b _080A7CAC + b @080A7CAC .align 2, 0 .pool -_080A7C78: +@080A7C78: ldrh r2, [r4, 0xC] subs r2, 0x1 strh r2, [r4, 0xC] @@ -315142,27 +315142,27 @@ _080A7C78: movs r0, 0xC ldrsh r1, [r4, r0] cmp r1, 0 - bne _080A7CAC + bne @080A7CAC ldrh r0, [r4, 0x16] subs r0, 0x1 strh r0, [r4, 0x16] lsls r0, 16 cmp r0, 0 - beq _080A7CA6 + beq @080A7CA6 strh r1, [r4, 0x10] strh r1, [r4, 0x14] - b _080A7CAC -_080A7CA6: + b @080A7CAC +@080A7CA6: adds r0, r5, 0 bl move_anim_task_del -_080A7CAC: +@080A7CAC: pop {r4,r5} pop {r0} bx r0 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 @@ -315172,13 +315172,13 @@ sub_80A7CB4: @ 80A7CB4 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - bne _080A7CD8 + bne @080A7CD8 adds r0, r4, 0 bl move_anim_task_del - b _080A7CEE + b @080A7CEE .align 2, 0 .pool -_080A7CD8: +@080A7CD8: ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -315189,7 +315189,7 @@ _080A7CD8: adds r1, r2 strh r1, [r0, 0x8] bl sub_80A7BF4 -_080A7CEE: +@080A7CEE: pop {r4} pop {r0} bx r0 @@ -315198,7 +315198,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 @@ -315228,7 +315228,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 @@ -315246,15 +315246,15 @@ sub_80A7D34: @ 80A7D34 ldrsh r2, [r1, r6] ldr r0, =0x00007ffe cmp r2, r0 - beq _080A7DDC + beq @080A7DDC cmp r2, r0 - bgt _080A7E3C + bgt @080A7E3C subs r0, 0x1 cmp r2, r0 - beq _080A7DE2 + beq @080A7DE2 ldrb r0, [r1, 0x5] cmp r0, 0 - bne _080A7D82 + bne @080A7D82 ldrh r0, [r1] strh r0, [r4, 0x1C] ldrh r0, [r1, 0x2] @@ -315267,7 +315267,7 @@ sub_80A7D34: @ 80A7D34 adds r0, r1, 0 adds r0, 0x8 str r0, [r5] -_080A7D82: +@080A7D82: ldr r1, [r5] ldrh r0, [r1] ldrh r2, [r4, 0x1C] @@ -315302,43 +315302,43 @@ _080A7D82: ldr r1, [r5] ldrb r1, [r1, 0x5] cmp r0, r1 - blt _080A7E62 + blt @080A7E62 movs r0, 0 strh r0, [r4, 0x18] - b _080A7E34 + b @080A7E34 .align 2, 0 .pool -_080A7DDC: +@080A7DDC: ldrh r0, [r1, 0x2] strh r0, [r4, 0x16] - b _080A7E62 -_080A7DE2: + b @080A7E62 +@080A7DE2: ldrh r2, [r1, 0x2] movs r6, 0x2 ldrsh r0, [r1, r6] cmp r0, 0 - beq _080A7E34 + beq @080A7E34 ldrh r1, [r4, 0x1A] movs r3, 0x1A ldrsh r0, [r4, r3] cmp r0, 0 - beq _080A7E02 + beq @080A7E02 subs r0, r1, 0x1 strh r0, [r4, 0x1A] lsls r0, 16 cmp r0, 0 - bne _080A7E04 - b _080A7E34 -_080A7E02: + bne @080A7E04 + b @080A7E34 +@080A7E02: strh r2, [r4, 0x1A] -_080A7E04: +@080A7E04: movs r6, 0x16 ldrsh r0, [r4, r6] cmp r0, 0 - beq _080A7E62 + beq @080A7E62 ldr r3, =0x02038444 ldr r5, =0x00007ffd -_080A7E10: +@080A7E10: ldrh r2, [r4, 0x16] subs r1, r2, 0x1 strh r1, [r4, 0x16] @@ -315348,19 +315348,19 @@ _080A7E10: movs r6, 0 ldrsh r0, [r0, r6] cmp r0, r5 - beq _080A7E60 + beq @080A7E60 lsls r0, r1, 16 cmp r0, 0 - bne _080A7E10 - b _080A7E62 + bne @080A7E10 + b @080A7E62 .align 2, 0 .pool -_080A7E34: +@080A7E34: ldrh r0, [r4, 0x16] adds r0, 0x1 strh r0, [r4, 0x16] - b _080A7E62 -_080A7E3C: + b @080A7E62 +@080A7E3C: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -315375,21 +315375,21 @@ _080A7E3C: lsrs r0, 24 bl sub_80A7344 movs r0, 0 - b _080A7E64 + b @080A7E64 .align 2, 0 .pool -_080A7E60: +@080A7E60: strh r2, [r4, 0x16] -_080A7E62: +@080A7E62: movs r0, 0x1 -_080A7E64: +@080A7E64: pop {r4-r6} pop {r1} bx r1 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 @@ -315416,9 +315416,9 @@ sub_80A7E6C: @ 80A7E6C ldrsh r1, [r1, r2] bl __divsi3 cmp r0, 0x80 - ble _080A7EA8 + ble @080A7EA8 movs r0, 0x80 -_080A7EA8: +@080A7EA8: subs r0, r5, r0 lsrs r1, r0, 31 adds r0, r1 @@ -315432,7 +315432,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 @@ -315461,9 +315461,9 @@ sub_80A7EC0: @ 80A7EC0 ldrsh r1, [r1, r2] bl __divsi3 cmp r0, 0x80 - ble _080A7F00 + ble @080A7F00 movs r0, 0x80 -_080A7F00: +@080A7F00: subs r0, r5, r0 lsrs r1, r0, 31 adds r0, r1 @@ -315477,7 +315477,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 @@ -315494,17 +315494,17 @@ sub_80A7F18: @ 80A7F18 ldr r7, =0x00000181 ldr r0, =0x020244e4 adds r6, r5, r0 -_080A7F38: +@080A7F38: adds r0, r4, r1 ldrb r0, [r0] cmp r0, r2 - beq _080A7F42 - b _080A8034 -_080A7F42: + beq @080A7F42 + b @080A8034 +@080A7F42: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A7F78 + beq @080A7F78 ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] @@ -315513,16 +315513,16 @@ _080A7F42: lsls r0, r2, 2 adds r0, r1 ldrb r0, [r0, 0x1] - b _080A8042 + b @080A8042 .align 2, 0 .pool -_080A7F78: +@080A7F78: lsls r0, r4, 24 lsrs r0, 24 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _080A7FD8 + bne @080A7FD8 ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -315530,7 +315530,7 @@ _080A7F78: adds r1, r0, r1 ldrh r0, [r1, 0x2] cmp r0, 0 - bne _080A7FC0 + bne @080A7FC0 ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -315543,24 +315543,24 @@ _080A7F78: bl pokemon_getattr lsls r0, 16 lsrs r2, r0, 16 - b _080A7FC2 + b @080A7FC2 .align 2, 0 .pool -_080A7FC0: +@080A7FC0: ldrh r2, [r1, 0x2] -_080A7FC2: +@080A7FC2: cmp r2, r7 - bne _080A7FD0 + bne @080A7FD0 ldr r0, =0x08525f8c - b _080A8018 + b @080A8018 .align 2, 0 .pool -_080A7FD0: +@080A7FD0: ldr r0, =0x083021d8 - b _080A8026 + b @080A8026 .align 2, 0 .pool -_080A7FD8: +@080A7FD8: ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -315568,7 +315568,7 @@ _080A7FD8: adds r1, r0, r1 ldrh r0, [r1, 0x2] cmp r0, 0 - bne _080A8010 + bne @080A8010 ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -315581,48 +315581,48 @@ _080A7FD8: bl pokemon_getattr lsls r0, 16 lsrs r2, r0, 16 - b _080A8012 + b @080A8012 .align 2, 0 .pool -_080A8010: +@080A8010: ldrh r2, [r1, 0x2] -_080A8012: +@080A8012: cmp r2, r7 - bne _080A8024 + bne @080A8024 ldr r0, =0x08525f88 -_080A8018: +@080A8018: ldrb r1, [r6] adds r1, r0 ldrb r0, [r1] - b _080A8042 + b @080A8042 .align 2, 0 .pool -_080A8024: +@080A8024: ldr r0, =0x08300d38 -_080A8026: +@080A8026: lsls r1, r2, 2 adds r1, r0 ldrb r0, [r1, 0x1] - b _080A8042 + b @080A8042 .align 2, 0 .pool -_080A8034: +@080A8034: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x3 - bhi _080A8040 - b _080A7F38 -_080A8040: + bhi @080A8040 + b @080A7F38 +@080A8040: movs r0, 0x40 -_080A8042: +@080A8042: pop {r4-r7} pop {r1} bx r1 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] @@ -315630,7 +315630,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 @@ -315639,7 +315639,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} @@ -315694,22 +315694,22 @@ 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] movs r2, 0x18 ldrsh r0, [r4, r2] cmp r0, 0 - bne _080A80DA + bne @080A80DA movs r0, 0 - b _080A8136 -_080A80DA: + b @080A8136 +@080A80DA: subs r0, r1, 0x1 strh r0, [r4, 0x18] lsls r0, 16 cmp r0, 0 - beq _080A80F4 + beq @080A80F4 ldrh r0, [r4, 0x1E] ldrh r3, [r4, 0x1A] adds r0, r3 @@ -315717,12 +315717,12 @@ _080A80DA: ldrh r0, [r4, 0x20] ldrh r1, [r4, 0x1C] adds r0, r1 - b _080A80FA -_080A80F4: + b @080A80FA +@080A80F4: ldrh r0, [r4, 0x22] strh r0, [r4, 0x1A] ldrh r0, [r4, 0x24] -_080A80FA: +@080A80FA: strh r0, [r4, 0x1C] ldrh r0, [r4, 0x26] lsls r0, 24 @@ -315736,13 +315736,13 @@ _080A80FA: movs r0, 0x18 ldrsh r3, [r4, r0] cmp r3, 0 - beq _080A8124 + beq @080A8124 ldrh r0, [r4, 0x26] lsls r0, 24 lsrs r0, 24 bl sub_80A7E6C - b _080A8134 -_080A8124: + b @080A8134 +@080A8124: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -315751,9 +315751,9 @@ _080A8124: lsls r0, 2 adds r0, r2 strh r3, [r0, 0x26] -_080A8134: +@080A8134: ldrb r0, [r4, 0x18] -_080A8136: +@080A8136: pop {r4} pop {r1} bx r1 @@ -315762,7 +315762,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 @@ -315770,15 +315770,15 @@ sub_80A8140: @ 80A8140 ldrb r0, [r0] movs r1, 0 cmp r0, 0x1E - bls _080A815E + bls @080A815E movs r1, 0x1 cmp r0, 0x64 - bls _080A815E + bls @080A815E movs r1, 0x3 cmp r0, 0xC8 - bhi _080A815E + bhi @080A815E movs r1, 0x2 -_080A815E: +@080A815E: ldr r0, =0x0203841e strh r1, [r0, 0xE] adds r0, r2, 0 @@ -315790,7 +315790,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} @@ -315802,7 +315802,7 @@ sub_80A8174: @ 80A8174 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _080A81B4 + beq @080A81B4 ldr r2, =0x02020630 ldr r1, =0x020241e4 ldrb r0, [r6] @@ -315822,14 +315822,14 @@ sub_80A8174: @ 80A8174 ands r0, r3 orrs r0, r2 strb r0, [r1, 0x5] -_080A81B4: +@080A81B4: ldr r0, =0x02038436 mov r8, r0 ldrb r0, [r0] bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _080A81EC + beq @080A81EC ldr r2, =0x02020630 ldr r1, =0x020241e4 mov r3, r8 @@ -315850,14 +315850,14 @@ _080A81B4: ands r0, r3 orrs r0, r2 strb r0, [r1, 0x5] -_080A81EC: +@080A81EC: ldrb r0, [r6] movs r5, 0x2 eors r0, r5 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _080A8224 + beq @080A8224 ldr r2, =0x02020630 ldr r1, =0x020241e4 ldrb r0, [r6] @@ -315878,14 +315878,14 @@ _080A81EC: ands r0, r3 orrs r0, r2 strb r0, [r1, 0x5] -_080A8224: +@080A8224: mov r1, r8 ldrb r0, [r1] eors r0, r5 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _080A825C + beq @080A825C ldr r2, =0x02020630 ldr r1, =0x020241e4 mov r3, r8 @@ -315906,7 +315906,7 @@ _080A8224: ands r0, r2 orrs r0, r3 strb r0, [r1, 0x5] -_080A825C: +@080A825C: pop {r3} mov r8, r3 pop {r4-r7} @@ -315917,22 +315917,22 @@ _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 ldrb r0, [r0] cmp r5, r0 - bge _080A82D2 + bge @080A82D2 ldr r6, =0x02020630 -_080A8286: +@080A8286: lsls r0, r5, 24 lsrs r4, r0, 24 adds r0, r4, 0 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _080A82C8 + beq @080A82C8 adds r0, r4, 0 bl sub_80A82E4 ldr r3, =0x020241e4 @@ -315957,13 +315957,13 @@ _080A8286: movs r1, 0x8 orrs r2, r1 strb r2, [r0, 0x5] -_080A82C8: +@080A82C8: adds r5, 0x1 ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 - blt _080A8286 -_080A82D2: + blt @080A8286 +@080A82D2: pop {r4-r6} pop {r0} bx r0 @@ -315972,46 +315972,46 @@ _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 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A8300 + beq @080A8300 cmp r4, 0x2 - bne _080A82FC + bne @080A82FC movs r0, 0x1E - b _080A8320 -_080A82FC: + b @080A8320 +@080A82FC: movs r0, 0x28 - b _080A8320 -_080A8300: + b @080A8320 +@080A8300: adds r0, r4, 0 bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 movs r1, 0x1E cmp r0, 0 - beq _080A831E + beq @080A831E movs r1, 0x14 cmp r0, 0x2 - beq _080A831E + beq @080A831E movs r1, 0x32 cmp r0, 0x1 - bne _080A831E + bne @080A831E movs r1, 0x28 -_080A831E: +@080A831E: adds r0, r1, 0 -_080A8320: +@080A8320: pop {r4} pop {r1} bx r1 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 @@ -316021,60 +316021,60 @@ sub_80A8328: @ 80A8328 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A8344 + beq @080A8344 movs r0, 0x2 - b _080A835C -_080A8344: + b @080A835C +@080A8344: cmp r4, 0 - beq _080A834C + beq @080A834C cmp r4, 0x3 - bne _080A8350 -_080A834C: + bne @080A8350 +@080A834C: movs r0, 0x2 - b _080A8352 -_080A8350: + b @080A8352 +@080A8350: movs r0, 0x1 -_080A8352: +@080A8352: movs r1, 0x4 bl sub_8118140 lsls r0, 24 lsrs r0, 24 -_080A835C: +@080A835C: pop {r4} pop {r1} bx r1 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 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080A838A + bne @080A838A adds r0, r4, 0 bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _080A8386 + beq @080A8386 cmp r0, 0x3 - bne _080A838A -_080A8386: + bne @080A838A +@080A8386: movs r0, 0x2 - b _080A838C -_080A838A: + b @080A838C +@080A838A: movs r0, 0x1 -_080A838C: +@080A838C: pop {r4} pop {r1} bx r1 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 @@ -316120,13 +316120,13 @@ sub_80A8394: @ 80A8394 ldr r4, =0x020244d4 ldr r0, [r4] cmp r0, 0 - beq _080A8412 + beq @080A8412 movs r1, 0xBE lsls r1, 1 adds r0, r1 ldr r0, [r0] cmp r0, 0 - bne _080A8412 + bne @080A8412 movs r0, 0x80 lsls r0, 6 bl malloc_and_clear @@ -316135,10 +316135,10 @@ sub_80A8394: @ 80A8394 lsls r2, 1 adds r1, r2 str r0, [r1] -_080A8412: +@080A8412: mov r3, r9 cmp r3, 0 - bne _080A84B0 + bne @080A84B0 adds r0, r6, 0 ldr r1, [sp, 0x3C] mov r2, r8 @@ -316152,7 +316152,7 @@ _080A8412: bl decompress_palette ldr r3, [sp, 0x44] cmp r3, 0x1 - beq _080A845E + beq @080A845E ldr r0, [sp, 0x40] lsls r1, r0, 24 lsrs r1, 24 @@ -316161,7 +316161,7 @@ _080A8412: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080A845E + beq @080A845E ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -316170,8 +316170,8 @@ _080A8412: adds r0, r1 ldrh r0, [r0, 0x2] cmp r0, 0 - beq _080A8488 -_080A845E: + beq @080A8488 +@080A845E: lsls r0, r6, 3 ldr r1, =0x0830a18c adds r0, r1 @@ -316182,10 +316182,10 @@ _080A845E: adds r1, r3 ldr r1, [r1] movs r2, 0x1 - b _080A850A + b @080A850A .align 2, 0 .pool -_080A8488: +@080A8488: lsls r0, r6, 3 ldr r1, =0x0830a18c adds r0, r1 @@ -316200,10 +316200,10 @@ _080A8488: adds r2, r6, 0 mov r3, r8 bl load_poke_gfx_probably - b _080A8540 + b @080A8540 .align 2, 0 .pool -_080A84B0: +@080A84B0: adds r0, r6, 0 ldr r1, [sp, 0x3C] mov r2, r8 @@ -316217,7 +316217,7 @@ _080A84B0: bl decompress_palette ldr r0, [sp, 0x44] cmp r0, 0x1 - beq _080A84F6 + beq @080A84F6 ldr r2, [sp, 0x40] lsls r1, r2, 24 lsrs r1, 24 @@ -316226,7 +316226,7 @@ _080A84B0: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080A84F6 + beq @080A84F6 ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -316235,8 +316235,8 @@ _080A84B0: adds r0, r1 ldrh r2, [r0, 0x2] cmp r2, 0 - beq _080A8524 -_080A84F6: + beq @080A8524 +@080A84F6: lsls r0, r6, 3 ldr r1, =0x083028b8 adds r0, r1 @@ -316247,15 +316247,15 @@ _080A84F6: adds r1, r2 ldr r1, [r1] movs r2, 0 -_080A850A: +@080A850A: str r2, [sp] adds r2, r6, 0 mov r3, r8 bl sub_8034B7C - b _080A8540 + b @080A8540 .align 2, 0 .pool -_080A8524: +@080A8524: lsls r0, r6, 3 ldr r1, =0x083028b8 adds r0, r1 @@ -316269,7 +316269,7 @@ _080A8524: adds r2, r6, 0 mov r3, r8 bl load_poke_gfx_probably -_080A8540: +@080A8540: ldr r5, =0x020244d4 ldr r0, [r5] movs r4, 0xBE @@ -316294,7 +316294,7 @@ _080A8540: str r1, [r0] mov r0, r9 cmp r0, 0 - bne _080A85A0 + bne @080A85A0 lsls r0, r7, 1 adds r0, r7 lsls r0, 3 @@ -316304,10 +316304,10 @@ _080A8540: lsls r1, r2, 16 asrs r1, 16 ldr r3, =0x08300d38 - b _080A85B2 + b @080A85B2 .align 2, 0 .pool -_080A85A0: +@080A85A0: lsls r0, r7, 1 adds r0, r7 lsls r0, 3 @@ -316317,7 +316317,7 @@ _080A85A0: lsls r1, r2, 16 asrs r1, 16 ldr r3, =0x083021d8 -_080A85B2: +@080A85B2: lsls r2, r6, 2 adds r2, r3 ldrb r2, [r2, 0x1] @@ -316332,7 +316332,7 @@ _080A85B2: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A85EE + beq @080A85EE ldr r3, =0x02020630 lsls r0, r4, 4 adds r0, r4 @@ -316345,7 +316345,7 @@ _080A85B2: adds r0, r3 movs r1, 0 bl sub_8008258 -_080A85EE: +@080A85EE: adds r0, r4, 0 add sp, 0x10 pop {r3-r5} @@ -316360,7 +316360,7 @@ _080A85EE: thumb_func_end sub_80A8394 thumb_func_start sub_80A8610 -sub_80A8610: @ 80A8610 +sub_80A8610: ; 80A8610 push {lr} bl obj_delete_and_free_resources pop {r0} @@ -316368,7 +316368,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 @@ -316382,7 +316382,7 @@ sub_80A861C: @ 80A861C bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A86C4 + beq @080A86C4 ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0x18] @@ -316390,18 +316390,18 @@ sub_80A861C: @ 80A861C movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080A8654 + beq @080A8654 ldrh r7, [r2, 0x2] ldr r2, [r2, 0x10] - b _080A8658 + b @080A8658 .align 2, 0 .pool -_080A8654: +@080A8654: ldrh r7, [r2] ldr r2, [r2, 0x8] -_080A8658: +@080A8658: cmp r7, 0xC9 - bne _080A86A4 + bne @080A86A4 movs r0, 0xC0 lsls r0, 18 ands r0, r2 @@ -316424,42 +316424,42 @@ _080A8658: lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne _080A8690 + bne @080A8690 movs r0, 0xC9 - b _080A869A -_080A8690: + b @080A869A +@080A8690: movs r1, 0xCE lsls r1, 1 adds r0, r1 lsls r0, 16 lsrs r0, 16 -_080A869A: +@080A869A: lsls r1, r0, 2 ldr r0, =0x083021d8 - b _080A8864 + b @080A8864 .align 2, 0 .pool -_080A86A4: +@080A86A4: ldr r0, =0x00000181 cmp r7, r0 - bne _080A86AC - b _080A8834 -_080A86AC: + bne @080A86AC + b @080A8834 +@080A86AC: movs r0, 0xCE lsls r0, 1 cmp r7, r0 - bhi _080A877C + bhi @080A877C lsls r1, r7, 2 ldr r0, =0x083021d8 - b _080A8864 + b @080A8864 .align 2, 0 .pool -_080A86C4: +@080A86C4: mov r0, r8 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _080A8790 + bne @080A8790 ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] @@ -316468,7 +316468,7 @@ _080A86C4: adds r1, r2, r0 ldrh r0, [r1, 0x2] cmp r0, 0 - bne _080A871C + bne @080A871C ldr r0, =0x0202406e mov r1, r8 lsls r4, r1, 1 @@ -316488,17 +316488,17 @@ _080A86C4: movs r1, 0 bl pokemon_getattr adds r2, r0, 0 - b _080A8724 + b @080A8724 .align 2, 0 .pool -_080A871C: +@080A871C: ldrh r7, [r1, 0x2] ldr r0, =0x020244bc adds r0, r2, r0 ldr r2, [r0] -_080A8724: +@080A8724: cmp r7, 0xC9 - bne _080A8774 + bne @080A8774 movs r0, 0xC0 lsls r0, 18 ands r0, r2 @@ -316521,40 +316521,40 @@ _080A8724: lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne _080A8760 + bne @080A8760 movs r0, 0xC9 - b _080A876A + b @080A876A .align 2, 0 .pool -_080A8760: +@080A8760: movs r1, 0xCE lsls r1, 1 adds r0, r1 lsls r0, 16 lsrs r0, 16 -_080A876A: +@080A876A: lsls r1, r0, 2 ldr r0, =0x083021d8 - b _080A8864 + b @080A8864 .align 2, 0 .pool -_080A8774: +@080A8774: movs r0, 0xCE lsls r0, 1 cmp r7, r0 - bls _080A8784 -_080A877C: + bls @080A8784 +@080A877C: ldr r4, =0x083021d8 - b _080A8866 + b @080A8866 .align 2, 0 .pool -_080A8784: +@080A8784: lsls r1, r7, 2 ldr r0, =0x083021d8 - b _080A8864 + b @080A8864 .align 2, 0 .pool -_080A8790: +@080A8790: ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] @@ -316563,7 +316563,7 @@ _080A8790: adds r1, r2, r0 ldrh r0, [r1, 0x2] cmp r0, 0 - bne _080A87DC + bne @080A87DC ldr r0, =0x0202406e mov r1, r8 lsls r4, r1, 1 @@ -316583,17 +316583,17 @@ _080A8790: movs r1, 0 bl pokemon_getattr adds r2, r0, 0 - b _080A87E4 + b @080A87E4 .align 2, 0 .pool -_080A87DC: +@080A87DC: ldrh r7, [r1, 0x2] ldr r0, =0x020244bc adds r0, r2, r0 ldr r2, [r0] -_080A87E4: +@080A87E4: cmp r7, 0xC9 - bne _080A882E + bne @080A882E movs r0, 0xC0 lsls r0, 18 ands r0, r2 @@ -316616,81 +316616,81 @@ _080A87E4: lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne _080A8820 + bne @080A8820 movs r0, 0xC9 - b _080A882A + b @080A882A .align 2, 0 .pool -_080A8820: +@080A8820: movs r1, 0xCE lsls r1, 1 adds r0, r1 lsls r0, 16 lsrs r0, 16 -_080A882A: +@080A882A: lsls r1, r0, 2 - b _080A8862 -_080A882E: + b @080A8862 +@080A882E: ldr r0, =0x00000181 cmp r7, r0 - bne _080A8850 -_080A8834: + bne @080A8850 +@080A8834: ldr r0, =0x020244e4 add r0, r8 ldrb r0, [r0] lsls r0, 2 ldr r1, =0x08525f78 adds r4, r0, r1 - b _080A8866 + b @080A8866 .align 2, 0 .pool -_080A8850: +@080A8850: movs r0, 0xCE lsls r0, 1 cmp r7, r0 - bls _080A8860 + bls @080A8860 ldr r4, =0x08300d38 - b _080A8866 + b @080A8866 .align 2, 0 .pool -_080A8860: +@080A8860: lsls r1, r7, 2 -_080A8862: +@080A8862: ldr r0, =0x08300d38 -_080A8864: +@080A8864: adds r4, r1, r0 -_080A8866: +@080A8866: mov r0, r9 cmp r0, 0x6 - bhi _080A8916 + bhi @080A8916 lsls r0, 2 - ldr r1, =_080A8880 + ldr r1, =@080A8880 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080A8880: - .4byte _080A889C - .4byte _080A88A6 - .4byte _080A88D2 - .4byte _080A88EA - .4byte _080A88AE - .4byte _080A88C0 - .4byte _080A8902 -_080A889C: +@080A8880: + .4byte @080A889C + .4byte @080A88A6 + .4byte @080A88D2 + .4byte @080A88EA + .4byte @080A88AE + .4byte @080A88C0 + .4byte @080A8902 +@080A889C: ldrb r1, [r4] movs r0, 0xF ands r0, r1 lsls r0, 3 - b _080A8918 -_080A88A6: + b @080A8918 +@080A88A6: ldrb r0, [r4] lsrs r0, 4 lsls r0, 3 - b _080A8918 -_080A88AE: + b @080A8918 +@080A88AE: mov r0, r8 movs r1, 0x2 bl sub_80A5C6C @@ -316698,8 +316698,8 @@ _080A88AE: lsrs r0, 24 ldrb r1, [r4] lsrs r1, 4 - b _080A88E4 -_080A88C0: + b @080A88E4 +@080A88C0: mov r0, r8 movs r1, 0x2 bl sub_80A5C6C @@ -316707,8 +316707,8 @@ _080A88C0: lsrs r0, 24 ldrb r1, [r4] lsrs r1, 4 - b _080A88FC -_080A88D2: + b @080A88FC +@080A88D2: mov r0, r8 movs r1, 0x3 bl sub_80A5C6C @@ -316717,11 +316717,11 @@ _080A88D2: ldrb r2, [r4] movs r1, 0xF ands r1, r2 -_080A88E4: +@080A88E4: lsls r1, 2 subs r0, r1 - b _080A8918 -_080A88EA: + b @080A8918 +@080A88EA: mov r0, r8 movs r1, 0x3 bl sub_80A5C6C @@ -316730,11 +316730,11 @@ _080A88EA: ldrb r2, [r4] movs r1, 0xF ands r1, r2 -_080A88FC: +@080A88FC: lsls r1, 2 adds r0, r1 - b _080A8918 -_080A8902: + b @080A8918 +@080A8902: mov r0, r8 movs r1, 0x1 bl sub_80A5C6C @@ -316743,10 +316743,10 @@ _080A8902: adds r0, 0x1F ldrb r1, [r4, 0x1] subs r0, r1 - b _080A8918 -_080A8916: + b @080A8918 +@080A8916: movs r0, 0 -_080A8918: +@080A8918: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -316756,7 +316756,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 @@ -316768,14 +316768,14 @@ sub_80A8924: @ 80A8924 lsrs r4, r0, 24 lsls r1, 24 cmp r1, 0 - bne _080A8942 + bne @080A8942 movs r5, 0 movs r6, 0x1 - b _080A8946 -_080A8942: + b @080A8946 +@080A8942: movs r5, 0x2 movs r6, 0x3 -_080A8946: +@080A8946: adds r0, r4, 0 adds r1, r5, 0 bl sub_80A5C6C @@ -316790,11 +316790,11 @@ _080A8946: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _080A8998 + beq @080A8998 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080A8998 + bne @080A8998 movs r0, 0x2 eors r4, r0 adds r0, r4, 0 @@ -316810,15 +316810,15 @@ _080A8946: mov r0, r8 lsls r1, r0, 16 lsls r2, r7, 16 - b _080A89A4 -_080A8998: + b @080A89A4 +@080A8998: mov r0, r8 lsls r1, r0, 16 lsrs r5, r1, 16 lsls r0, r7, 16 lsrs r3, r0, 16 adds r2, r0, 0 -_080A89A4: +@080A89A4: asrs r0, r1, 16 adds r0, r5 asrs r0, 1 @@ -316839,7 +316839,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 @@ -316918,7 +316918,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 @@ -316927,7 +316927,7 @@ sub_80A8A6C: @ 80A8A6C bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080A8AAC + beq @080A8AAC ldr r2, =0x0203841e ldrh r0, [r4, 0x20] ldrh r1, [r2] @@ -316943,16 +316943,16 @@ sub_80A8A6C: @ 80A8A6C orrs r0, r1 strb r0, [r3] adds r1, r2, 0 - b _080A8AB6 + b @080A8AB6 .align 2, 0 .pool -_080A8AAC: +@080A8AAC: ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] adds r0, r2 strh r0, [r4, 0x20] -_080A8AB6: +@080A8AB6: ldrh r0, [r1, 0x2] ldrh r2, [r4, 0x22] adds r0, r2 @@ -316978,7 +316978,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 @@ -316986,7 +316986,7 @@ sub_80A8AEC: @ 80A8AEC bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080A8B1C + beq @080A8B1C ldr r2, =0x0203841e ldrh r0, [r4, 0x20] ldrh r1, [r2] @@ -316997,16 +316997,16 @@ sub_80A8AEC: @ 80A8AEC negs r0, r0 strh r0, [r2, 0x6] adds r1, r2, 0 - b _080A8B26 + b @080A8B26 .align 2, 0 .pool -_080A8B1C: +@080A8B1C: ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] adds r0, r2 strh r0, [r4, 0x20] -_080A8B26: +@080A8B26: ldrh r0, [r1, 0x2] ldrh r2, [r4, 0x22] adds r0, r2 @@ -317035,7 +317035,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 @@ -317044,23 +317044,23 @@ sub_80A8B64: @ 80A8B64 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080A8B90 + beq @080A8B90 ldr r0, =0x0203841e ldrh r1, [r4, 0x20] ldrh r2, [r0] subs r1, r2 strh r1, [r4, 0x20] - b _080A8B9C + b @080A8B9C .align 2, 0 .pool -_080A8B90: +@080A8B90: ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] adds r0, r2 strh r0, [r4, 0x20] adds r0, r1, 0 -_080A8B9C: +@080A8B9C: ldrh r0, [r0, 0x2] ldrh r1, [r4, 0x22] adds r0, r1 @@ -317078,7 +317078,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 @@ -317099,11 +317099,11 @@ sub_80A8BC4: @ 80A8BC4 lsls r0, 24 movs r1, 0x8 cmp r0, 0 - beq _080A8BF8 + beq @080A8BF8 movs r0, 0x8 negs r0, r0 adds r1, r0, 0 -_080A8BF8: +@080A8BF8: strh r1, [r5, 0xA] strh r6, [r5, 0xC] strh r6, [r5, 0xE] @@ -317145,17 +317145,17 @@ _080A8BF8: lsrs r0, 24 strh r0, [r5, 0x14] cmp r0, 0x14 - beq _080A8C54 + beq @080A8C54 cmp r0, 0x28 - bne _080A8C68 -_080A8C54: + bne @080A8C68 +@080A8C54: movs r0, 0x2 - b _080A8C6A + b @080A8C6A .align 2, 0 .pool -_080A8C68: +@080A8C68: movs r0, 0x3 -_080A8C6A: +@080A8C6A: strh r0, [r5, 0x14] lsls r0, r4, 1 ldr r1, =0x02037714 @@ -317181,7 +317181,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 @@ -317193,19 +317193,19 @@ sub_80A8CAC: @ 80A8CAC movs r1, 0xC ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080A8D10 + beq @080A8D10 cmp r0, 0x1 - bgt _080A8CD4 + bgt @080A8CD4 cmp r0, 0 - beq _080A8CDA - b _080A8D6C + beq @080A8CDA + b @080A8D6C .align 2, 0 .pool -_080A8CD4: +@080A8CD4: cmp r0, 0x2 - beq _080A8D58 - b _080A8D6C -_080A8CDA: + beq @080A8D58 + b @080A8D6C +@080A8CDA: adds r0, r4, 0 adds r1, r5, 0 bl sub_80A8D78 @@ -317226,12 +317226,12 @@ _080A8CDA: lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - bne _080A8D6C + bne @080A8D6C strh r1, [r4, 0xE] - b _080A8D4A + b @080A8D4A .align 2, 0 .pool -_080A8D10: +@080A8D10: adds r0, r4, 0 adds r1, r5, 0 bl sub_80A8D78 @@ -317252,7 +317252,7 @@ _080A8D10: lsls r0, 16 asrs r2, r0, 16 cmp r2, 0 - bne _080A8D6C + bne @080A8D6C movs r1, 0x8 ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -317260,23 +317260,23 @@ _080A8D10: lsls r1, 2 adds r1, r3 strh r2, [r1, 0x24] -_080A8D4A: +@080A8D4A: ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] - b _080A8D6C + b @080A8D6C .align 2, 0 .pool -_080A8D58: +@080A8D58: movs r2, 0x12 ldrsh r0, [r4, r2] cmp r0, 0 - bne _080A8D6C + bne @080A8D6C ldr r0, =0x00002771 bl gpu_pal_free_tag adds r0, r5, 0 bl move_anim_task_del -_080A8D6C: +@080A8D6C: pop {r4,r5} pop {r0} bx r0 @@ -317285,7 +317285,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} @@ -317299,7 +317299,7 @@ sub_80A8D78: @ 80A8D78 lsrs r7, r0, 16 asrs r0, 16 cmp r0, 0 - blt _080A8DE8 + blt @080A8DE8 ldr r5, =0x02020630 lsls r4, r0, 4 adds r4, r0 @@ -317341,7 +317341,7 @@ sub_80A8D78: @ 80A8D78 ldrh r0, [r6, 0x12] adds r0, 0x1 strh r0, [r6, 0x12] -_080A8DE8: +@080A8DE8: pop {r3} mov r8, r3 pop {r4-r7} @@ -317352,7 +317352,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] @@ -317360,7 +317360,7 @@ sub_80A8DFC: @ 80A8DFC strh r0, [r3, 0x2E] lsls r0, 16 cmp r0, 0 - bne _080A8E26 + bne @080A8E26 ldr r2, =0x03005e00 movs r0, 0x30 ldrsh r1, [r3, r0] @@ -317373,7 +317373,7 @@ sub_80A8DFC: @ 80A8DFC strh r1, [r0, 0x12] adds r0, r3, 0 bl obj_delete_but_dont_free_vram -_080A8E26: +@080A8E26: pop {r0} bx r0 .align 2, 0 @@ -317381,7 +317381,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 @@ -317401,14 +317401,14 @@ sub_80A8E30: @ 80A8E30 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _080A8E68 + bne @080A8E68 movs r0, 0x5 - b _080A8E6A + b @080A8E6A .align 2, 0 .pool -_080A8E68: +@080A8E68: ldr r0, =0x0000fff6 -_080A8E6A: +@080A8E6A: strh r0, [r5, 0x2E] ldr r0, =0x0000ffd8 strh r0, [r5, 0x30] @@ -317422,7 +317422,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] @@ -317448,10 +317448,10 @@ sub_80A8E88: @ 80A8E88 movs r1, 0x14 negs r1, r1 cmp r0, r1 - bge _080A8EC4 + bge @080A8EC4 adds r0, r5, 0x1 strh r0, [r4, 0x30] -_080A8EC4: +@080A8EC4: movs r1, 0x22 ldrsh r0, [r4, r1] movs r2, 0x26 @@ -317460,17 +317460,17 @@ _080A8EC4: movs r1, 0x20 negs r1, r1 cmp r0, r1 - bge _080A8EDC + bge @080A8EDC adds r0, r4, 0 bl move_anim_8072740 -_080A8EDC: +@080A8EDC: pop {r4,r5} pop {r0} bx r0 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 @@ -317489,7 +317489,7 @@ sub_80A8EE4: @ 80A8EE4 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _080A8F24 + bne @080A8F24 ldrh r0, [r5, 0x8] adds r0, 0x1E ldrh r1, [r4, 0x20] @@ -317497,10 +317497,10 @@ sub_80A8EE4: @ 80A8EE4 strh r0, [r4, 0x20] ldrh r0, [r5, 0xA] subs r0, 0x14 - b _080A8F32 + b @080A8F32 .align 2, 0 .pool -_080A8F24: +@080A8F24: ldrh r0, [r5, 0x8] subs r0, 0x1E ldrh r1, [r4, 0x20] @@ -317508,7 +317508,7 @@ _080A8F24: strh r0, [r4, 0x20] ldrh r0, [r5, 0xA] subs r0, 0x50 -_080A8F32: +@080A8F32: strh r0, [r4, 0x22] ldr r0, =sub_80A6EEC + 1 str r0, [r4, 0x1C] @@ -317525,12 +317525,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] @@ -317560,46 +317560,46 @@ 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 adds r0, 0x21 ldrb r0, [r0] cmp r0, 0x13 - bls _080A934C - b _080A95A4 -_080A934C: + bls @080A934C + b @080A95A4 +@080A934C: lsls r0, 2 - ldr r1, =_080A9360 + ldr r1, =@080A9360 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080A9360: - .4byte _080A93B0 - .4byte _080A942C - .4byte _080A9444 - .4byte _080A944A - .4byte _080A9450 - .4byte _080A9460 - .4byte _080A9466 - .4byte _080A948E - .4byte _080A9492 - .4byte _080A9496 - .4byte _080A949A - .4byte _080A94B8 - .4byte _080A94C0 - .4byte _080A94C8 - .4byte _080A94D0 - .4byte _080A94D8 - .4byte _080A94E0 - .4byte _080A94E8 - .4byte _080A94F0 - .4byte _080A94F8 -_080A93B0: +@080A9360: + .4byte @080A93B0 + .4byte @080A942C + .4byte @080A9444 + .4byte @080A944A + .4byte @080A9450 + .4byte @080A9460 + .4byte @080A9466 + .4byte @080A948E + .4byte @080A9492 + .4byte @080A9496 + .4byte @080A949A + .4byte @080A94B8 + .4byte @080A94C0 + .4byte @080A94C8 + .4byte @080A94D0 + .4byte @080A94D8 + .4byte @080A94E0 + .4byte @080A94E8 + .4byte @080A94F0 + .4byte @080A94F8 +@080A93B0: bl dp12_8087EA4 bl trs_config movs r0, 0x1 @@ -317636,10 +317636,10 @@ _080A93B0: strh r1, [r0] ldr r0, =0x02022e22 strh r1, [r0] - b _080A95D2 + b @080A95D2 .align 2, 0 .pool -_080A942C: +@080A942C: movs r0, 0 str r0, [sp, 0x4] movs r1, 0xC0 @@ -317647,27 +317647,27 @@ _080A942C: ldr r2, =0x01006000 add r0, sp, 0x4 bl CpuFastSet - b _080A95D2 + b @080A95D2 .align 2, 0 .pool -_080A9444: +@080A9444: bl sub_8035AA4 - b _080A95D2 -_080A944A: + b @080A95D2 +@080A944A: bl reset_all_obj_data - b _080A95D2 -_080A9450: + b @080A95D2 +@080A9450: bl gpu_pal_allocator_reset ldr r1, =0x0300301c movs r0, 0x4 strb r0, [r1] - b _080A95D2 + b @080A95D2 .align 2, 0 .pool -_080A9460: +@080A9460: bl sub_805E350 - b _080A95D2 -_080A9466: + b @080A95D2 +@080A9466: ldr r5, =0x02024474 adds r4, r5, 0 adds r4, 0x22 @@ -317675,78 +317675,78 @@ _080A9466: bl sub_805E08C lsls r0, 24 cmp r0, 0 - beq _080A9484 + beq @080A9484 movs r0, 0 strb r0, [r4] - b _080A95D2 + b @080A95D2 .align 2, 0 .pool -_080A9484: +@080A9484: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] adds r1, r5, 0 - b _080A94AA -_080A948E: + b @080A94AA +@080A948E: movs r0, 0 - b _080A949C -_080A9492: + b @080A949C +@080A9492: movs r0, 0x1 - b _080A949C -_080A9496: + b @080A949C +@080A9496: movs r0, 0x2 - b _080A949C -_080A949A: + b @080A949C +@080A949A: movs r0, 0x3 -_080A949C: +@080A949C: bl sub_80A9614 lsls r0, 24 cmp r0, 0 - beq _080A94A8 - b _080A95D2 -_080A94A8: + beq @080A94A8 + b @080A95D2 +@080A94A8: ldr r1, =0x02024474 -_080A94AA: +@080A94AA: adds r1, 0x21 ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] - b _080A95D2 + b @080A95D2 .align 2, 0 .pool -_080A94B8: +@080A94B8: movs r0, 0 bl sub_80A9708 - b _080A95D2 -_080A94C0: + b @080A95D2 +@080A94C0: movs r0, 0x1 bl sub_80A9708 - b _080A95D2 -_080A94C8: + b @080A95D2 +@080A94C8: movs r0, 0x2 bl sub_80A9708 - b _080A95D2 -_080A94D0: + b @080A95D2 +@080A94D0: movs r0, 0x3 bl sub_80A9708 - b _080A95D2 -_080A94D8: + b @080A95D2 +@080A94D8: movs r0, 0 bl sub_80A9ADC - b _080A95D2 -_080A94E0: + b @080A95D2 +@080A94E0: movs r0, 0x1 bl sub_80A9ADC - b _080A95D2 -_080A94E8: + b @080A95D2 +@080A94E8: movs r0, 0x2 bl sub_80A9ADC - b _080A95D2 -_080A94F0: + b @080A95D2 +@080A94F0: movs r0, 0x3 bl sub_80A9ADC - b _080A95D2 -_080A94F8: + b @080A95D2 +@080A94F8: bl sub_805EC84 movs r0, 0x1 bl battle_get_side_with_given_state @@ -317771,7 +317771,7 @@ _080A94F8: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _080A955C + beq @080A955C movs r0, 0x3 bl battle_get_side_with_given_state adds r4, r0, 0 @@ -317789,7 +317789,7 @@ _080A94F8: lsrs r1, 16 adds r0, r4, 0 bl sub_805EE54 -_080A955C: +@080A955C: ldr r1, =0x020244ac ldr r0, =0x020244b8 ldrb r0, [r0] @@ -317800,19 +317800,19 @@ _080A955C: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _080A95D2 + beq @080A95D2 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _080A95D2 + beq @080A95D2 bl sub_800E0E8 movs r0, 0 movs r1, 0 bl sub_800DFB4 - b _080A95D2 + b @080A95D2 .align 2, 0 .pool -_080A95A4: +@080A95A4: ldr r0, =vblank_cb_08078BB4 + 1 bl SetVBlankCallback bl sub_80A95F4 @@ -317831,7 +317831,7 @@ _080A95A4: ldr r0, =sub_8038420 + 1 bl set_callback2 bl sub_805EF14 -_080A95D2: +@080A95D2: ldr r1, =0x02024474 adds r1, 0x21 ldrb r0, [r1] @@ -317846,7 +317846,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 @@ -317864,19 +317864,19 @@ 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 ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - bcs _080A96FC + bcs @080A96FC adds r0, r4, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080A9676 + beq @080A9676 ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -317886,7 +317886,7 @@ sub_80A9614: @ 80A9614 movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne _080A966C + bne @080A966C ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -317897,44 +317897,44 @@ sub_80A9614: @ 80A9614 adds r0, r1 adds r1, r4, 0 bl sub_805DC0C - b _080A96F4 + b @080A96F4 .align 2, 0 .pool -_080A966C: +@080A966C: adds r0, r4, 0 movs r1, 0 bl sub_805E7DC - b _080A96F4 -_080A9676: + b @080A96F4 +@080A9676: ldr r0, =0x02022fec ldr r1, [r0] movs r2, 0x80 ands r1, r2 cmp r1, 0 - beq _080A9698 + beq @080A9698 cmp r4, 0 - bne _080A9698 + bne @080A9698 ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] - b _080A96AA + b @080A96AA .align 2, 0 .pool -_080A9698: +@080A9698: ldr r0, [r0] movs r1, 0x80 lsls r1, 2 ands r0, r1 cmp r0, 0 - beq _080A96B2 + beq @080A96B2 cmp r4, 0 - bne _080A96B2 + bne @080A96B2 movs r0, 0x6 -_080A96AA: +@080A96AA: movs r1, 0 bl sub_805DF84 - b _080A96F4 -_080A96B2: + b @080A96F4 +@080A96B2: ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -317944,7 +317944,7 @@ _080A96B2: movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne _080A96EC + bne @080A96EC ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -317955,19 +317955,19 @@ _080A96B2: adds r0, r1 adds r1, r4, 0 bl sub_805DD7C - b _080A96F4 + b @080A96F4 .align 2, 0 .pool -_080A96EC: +@080A96EC: adds r0, r4, 0 movs r1, 0 bl sub_805E7DC -_080A96F4: +@080A96F4: ldr r0, =0x02024474 adds r0, 0x22 movs r1, 0 strb r1, [r0] -_080A96FC: +@080A96FC: movs r0, 0x1 pop {r4} pop {r1} @@ -317977,7 +317977,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 @@ -317989,9 +317989,9 @@ sub_80A9708: @ 80A9708 ldr r0, =0x0202406c ldrb r0, [r0] cmp r7, r0 - bcc _080A9722 - b _080A9AA0 -_080A9722: + bcc @080A9722 + b @080A9AA0 +@080A9722: ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] @@ -318002,16 +318002,16 @@ _080A9722: ands r0, r1 str r2, [sp] cmp r0, 0 - beq _080A9748 + beq @080A9748 adds r0, r7, 0 bl sub_80A614C - b _080A974E + b @080A974E .align 2, 0 .pool -_080A9748: +@080A9748: adds r0, r7, 0 bl sub_80A6138 -_080A974E: +@080A974E: lsls r0, 24 lsrs r0, 24 mov r8, r0 @@ -318019,9 +318019,9 @@ _080A974E: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _080A9762 - b _080A986C -_080A9762: + bne @080A9762 + b @080A986C +@080A9762: ldr r1, =0x0202406e lsls r0, r7, 1 adds r6, r0, r1 @@ -318037,9 +318037,9 @@ _080A9762: movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - bne _080A9786 - b _080A9AA0 -_080A9786: + bne @080A9786 + b @080A9AA0 +@080A9786: ldrh r0, [r6] mov r2, r10 muls r2, r0 @@ -318130,18 +318130,18 @@ _080A9786: ldr r0, [r0] ldr r2, [sp] adds r0, r2, r0 - b _080A9A50 + b @080A9A50 .align 2, 0 .pool -_080A986C: +@080A986C: ldr r0, =0x02022fec ldr r1, [r0] movs r2, 0x80 ands r1, r2 cmp r1, 0 - beq _080A98D0 + beq @080A98D0 cmp r7, 0 - bne _080A98D0 + bne @080A98D0 ldr r5, =0x03005d90 ldr r0, [r5] ldrb r4, [r0, 0x8] @@ -318172,18 +318172,18 @@ _080A986C: lsls r3, 24 lsrs r3, 24 adds r0, r6, 0 - b _080A9914 + b @080A9914 .align 2, 0 .pool -_080A98D0: +@080A98D0: ldr r0, [r0] movs r1, 0x80 lsls r1, 2 ands r0, r1 cmp r0, 0 - beq _080A9968 + beq @080A9968 cmp r7, 0 - bne _080A9968 + bne @080A9968 movs r0, 0 bl battle_get_per_side_status adds r1, r0, 0 @@ -318207,7 +318207,7 @@ _080A98D0: lsls r3, 24 lsrs r3, 24 adds r0, r5, 0 -_080A9914: +@080A9914: movs r1, 0x50 adds r2, r4, 0 bl obj_add_from_template_forward_search @@ -318238,10 +318238,10 @@ _080A9914: lsls r0, 2 adds r0, r4 strh r7, [r0, 0x2E] - b _080A9A70 + b @080A9A70 .align 2, 0 .pool -_080A9968: +@080A9968: ldr r1, =0x0202406e lsls r0, r7, 1 adds r6, r0, r1 @@ -318257,9 +318257,9 @@ _080A9968: movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - bne _080A998C - b _080A9AA0 -_080A998C: + bne @080A998C + b @080A9AA0 +@080A998C: ldrh r0, [r6] mov r1, r10 muls r1, r0 @@ -318350,11 +318350,11 @@ _080A998C: ldr r0, [r0] ldr r1, [sp] adds r0, r1, r0 -_080A9A50: +@080A9A50: ldrh r1, [r0, 0x2] ldr r0, =0x00000181 cmp r1, r0 - bne _080A9A70 + bne @080A9A70 ldrb r0, [r4] lsls r1, r0, 4 adds r1, r0 @@ -318367,7 +318367,7 @@ _080A9A50: adds r0, r2 ldr r0, [r0] str r0, [r1] -_080A9A70: +@080A9A70: ldr r1, =0x02020630 ldr r0, =0x020241e4 adds r0, r7, r0 @@ -318392,7 +318392,7 @@ _080A9A70: ands r0, r3 orrs r0, r1 strb r0, [r2] -_080A9AA0: +@080A9AA0: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -318406,42 +318406,42 @@ _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 ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 - bcc _080A9AEC - b _080A9C5E -_080A9AEC: + bcc @080A9AEC + b @080A9C5E +@080A9AEC: ldr r0, =0x02022fec ldr r1, [r0] movs r2, 0x80 ands r1, r2 cmp r1, 0 - beq _080A9B0C + beq @080A9B0C cmp r5, 0 - bne _080A9B0C + bne @080A9B0C bl battle_make_oam_safari_battle - b _080A9B24 + b @080A9B24 .align 2, 0 .pool -_080A9B0C: +@080A9B0C: ldr r0, [r0] movs r1, 0x80 lsls r1, 2 ands r0, r1 cmp r0, 0 - beq _080A9B1E + beq @080A9B1E cmp r5, 0 - bne _080A9B1E - b _080A9C5E -_080A9B1E: + bne @080A9B1E + b @080A9C5E +@080A9B1E: adds r0, r5, 0 bl battle_make_oam_normal_battle -_080A9B24: +@080A9B24: lsls r0, 24 lsrs r6, r0, 24 ldr r0, =0x03005d70 @@ -318455,7 +318455,7 @@ _080A9B24: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080A9B6C + beq @080A9B6C ldrb r0, [r4] ldr r1, =0x0202406e lsls r4, r5, 1 @@ -318467,16 +318467,16 @@ _080A9B24: adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe - b _080A9BB8 + b @080A9BB8 .align 2, 0 .pool -_080A9B6C: +@080A9B6C: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 - beq _080A9BA0 + beq @080A9BA0 ldrb r0, [r4] ldr r1, =0x0202406e lsls r4, r5, 1 @@ -318488,10 +318488,10 @@ _080A9B6C: adds r1, r2 movs r2, 0xA bl healthbar_draw_field_maybe - b _080A9BB8 + b @080A9BB8 .align 2, 0 .pool -_080A9BA0: +@080A9BA0: ldrb r0, [r4] ldr r1, =0x0202406e lsls r4, r5, 1 @@ -318503,40 +318503,40 @@ _080A9BA0: adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe -_080A9BB8: +@080A9BB8: adds r0, r5, 0 bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - beq _080A9BD4 + beq @080A9BD4 adds r0, r5, 0 bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _080A9BF0 -_080A9BD4: + bne @080A9BF0 +@080A9BD4: ldr r0, =0x03005d70 adds r0, r5, r0 ldrb r0, [r0] movs r1, 0x1 bl nullsub_30 - b _080A9BFC + b @080A9BFC .align 2, 0 .pool -_080A9BF0: +@080A9BF0: ldr r0, =0x03005d70 adds r0, r5, r0 ldrb r0, [r0] movs r1, 0 bl nullsub_30 -_080A9BFC: +@080A9BFC: adds r0, r5, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080A9C34 + beq @080A9C34 ldr r0, =0x0202406e adds r0, r4, r0 ldrh r1, [r0] @@ -318547,19 +318547,19 @@ _080A9BFC: movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - bne _080A9C5E + bne @080A9C5E adds r0, r6, 0 bl sub_8072984 - b _080A9C5E + b @080A9C5E .align 2, 0 .pool -_080A9C34: +@080A9C34: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 - bne _080A9C5E + bne @080A9C5E ldr r0, =0x0202406e adds r0, r4, r0 ldrh r1, [r0] @@ -318570,10 +318570,10 @@ _080A9C34: movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - bne _080A9C5E + bne @080A9C5E adds r0, r6, 0 bl sub_8072984 -_080A9C5E: +@080A9C5E: pop {r4-r6} pop {r0} bx r0 @@ -318582,7 +318582,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} @@ -318613,7 +318613,7 @@ sub_80A9C70: @ 80A9C70 adds r1, r0, r1 strh r4, [r1, 0x8] cmp r5, 0 - beq _080A9D30 + beq @080A9D30 movs r0, 0x1F strh r0, [r1, 0xA] movs r5, 0 @@ -318622,7 +318622,7 @@ sub_80A9C70: @ 80A9C70 adds r0, r6 lsls r0, 2 adds r6, r0, r7 -_080A9CC4: +@080A9CC4: movs r0, 0x20 ldrsh r1, [r6, r0] ldrh r2, [r6, 0x22] @@ -318653,19 +318653,19 @@ _080A9CC4: orrs r0, r1 strb r0, [r2] cmp r5, 0x4 - bls _080A9D08 + bls @080A9D08 movs r0, 0x15 strh r0, [r3, 0x3A] -_080A9D08: +@080A9D08: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x9 - bls _080A9CC4 - b _080A9D90 + bls @080A9CC4 + b @080A9D90 .align 2, 0 .pool -_080A9D30: +@080A9D30: movs r0, 0xF8 lsls r0, 7 strh r0, [r1, 0xA] @@ -318675,7 +318675,7 @@ _080A9D30: adds r0, r6 lsls r0, 2 adds r6, r0, r7 -_080A9D42: +@080A9D42: movs r2, 0x20 ldrsh r1, [r6, r2] ldrh r2, [r6, 0x22] @@ -318706,16 +318706,16 @@ _080A9D42: orrs r0, r1 strb r0, [r2] cmp r5, 0x4 - bls _080A9D86 + bls @080A9D86 movs r0, 0x15 strh r0, [r3, 0x3A] -_080A9D86: +@080A9D86: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x9 - bls _080A9D42 -_080A9D90: + bls @080A9D42 +@080A9D90: ldr r0, =0x02020630 lsls r1, r4, 4 adds r1, r4 @@ -318734,7 +318734,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 @@ -318747,7 +318747,7 @@ sub_80A9DB4: @ 80A9DB4 movs r2, 0xC ldrsh r0, [r4, r2] cmp r0, 0x2 - bne _080A9E3A + bne @080A9E3A movs r0, 0 strh r0, [r4, 0xC] movs r1, 0x8 @@ -318765,27 +318765,27 @@ sub_80A9DB4: @ 80A9DB4 movs r1, 0x12 ldrsh r0, [r4, r1] cmp r0, 0 - bne _080A9E10 + bne @080A9E10 ldrh r0, [r4, 0x10] adds r0, 0x1 strh r0, [r4, 0x10] lsls r0, 16 asrs r0, 16 cmp r0, 0x8 - ble _080A9E3E + ble @080A9E3E movs r0, 0x1 eors r0, r2 strh r0, [r4, 0x12] - b _080A9E3E + b @080A9E3E .align 2, 0 .pool -_080A9E10: +@080A9E10: ldrh r1, [r4, 0x10] subs r0, r1, 0x1 strh r0, [r4, 0x10] lsls r0, 16 cmp r0, 0 - bge _080A9E3E + bge @080A9E3E strh r1, [r4, 0x10] movs r0, 0x1 eors r0, r2 @@ -318796,28 +318796,28 @@ _080A9E10: lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - bne _080A9E3E + bne @080A9E3E adds r0, r5, 0 bl remove_task - b _080A9E3E -_080A9E3A: + b @080A9E3E +@080A9E3A: adds r0, r1, 0x1 strh r0, [r4, 0xC] -_080A9E3E: +@080A9E3E: pop {r4,r5} pop {r0} bx r0 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] movs r3, 0x3A ldrsh r0, [r2, r3] cmp r0, 0 - bne _080A9E70 + bne @080A9E70 adds r3, r2, 0 adds r3, 0x3E ldrb r0, [r3] @@ -318829,19 +318829,19 @@ sub_80A9E44: @ 80A9E44 str r1, [r2, 0x1C] adds r0, r2, 0 bl _call_via_r1 - b _080A9E74 + b @080A9E74 .align 2, 0 .pool -_080A9E70: +@080A9E70: subs r0, r1, 0x1 strh r0, [r2, 0x3A] -_080A9E74: +@080A9E74: pop {r0} bx r0 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 @@ -318857,16 +318857,16 @@ sub_80A9E78: @ 80A9E78 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0x7F - bgt _080A9EA4 + bgt @080A9EA4 adds r1, r4, 0 adds r1, 0x43 movs r0, 0x1D - b _080A9EAA -_080A9EA4: + b @080A9EAA +@080A9EA4: adds r1, r4, 0 adds r1, 0x43 movs r0, 0x1F -_080A9EAA: +@080A9EAA: strb r0, [r1] ldrh r0, [r4, 0x2E] adds r0, 0x8 @@ -318888,25 +318888,25 @@ _080A9EAA: lsls r0, 16 asrs r0, 16 cmp r0, 0x34 - bne _080A9EEC + bne @080A9EEC movs r1, 0x3C ldrsh r0, [r4, r1] cmp r0, 0 - beq _080A9EE6 + beq @080A9EE6 adds r0, r4, 0 bl obj_delete_and_free_resources - b _080A9EEC -_080A9EE6: + b @080A9EEC +@080A9EE6: adds r0, r4, 0 bl obj_delete_and_free_tiles -_080A9EEC: +@080A9EEC: pop {r4} pop {r0} bx r0 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 @@ -318930,12 +318930,12 @@ sub_80A9EF4: @ 80A9EF4 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080A9F32 + beq @080A9F32 lsls r0, r5, 16 ldr r1, =0xfffa0000 adds r0, r1 lsrs r5, r0, 16 -_080A9F32: +@080A9F32: movs r1, 0xFD lsls r1, 6 movs r0, 0x50 @@ -318958,7 +318958,7 @@ _080A9F32: lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 - bne _080A9F7C + bne @080A9F7C ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 @@ -318969,7 +318969,7 @@ _080A9F32: movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_080A9F7C: +@080A9F7C: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -318993,7 +318993,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 @@ -319009,15 +319009,15 @@ sub_80A9FD0: @ 80A9FD0 lsls r0, 16 asrs r0, 16 cmp r0, 0xA - bne _080AA004 + bne @080AA004 ldr r0, =sub_80AA020 + 1 str r0, [r1] movs r0, 0 strh r0, [r1, 0xA] - b _080AA01A + b @080AA01A .align 2, 0 .pool -_080AA004: +@080AA004: lsls r0, r2, 24 lsrs r0, 24 movs r1, 0x10 @@ -319028,13 +319028,13 @@ _080AA004: lsrs r1, 16 movs r0, 0x52 bl lcd_io_set -_080AA01A: +@080AA01A: pop {r0} bx r0 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 @@ -319054,7 +319054,7 @@ sub_80AA020: @ 80AA020 lsls r0, 16 asrs r0, 16 cmp r0, 0xD - ble _080AA0B0 + ble @080AA0B0 ldrh r0, [r5, 0xC] adds r0, 0x1 movs r6, 0 @@ -319062,7 +319062,7 @@ sub_80AA020: @ 80AA020 lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - bne _080AA0B0 + bne @080AA0B0 ldr r3, =0x02037b14 lsls r2, 4 mov r12, r2 @@ -319092,7 +319092,7 @@ sub_80AA020: @ 80AA020 lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - bne _080AA0B0 + bne @080AA0B0 strh r6, [r5, 0xE] strh r6, [r5, 0xA] ldrh r0, [r5, 0x10] @@ -319101,12 +319101,12 @@ sub_80AA020: @ 80AA020 lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - bne _080AA0B0 + bne @080AA0B0 movs r0, 0x9 strh r0, [r5, 0xA] ldr r0, =sub_80AA0D0 + 1 str r0, [r5] -_080AA0B0: +@080AA0B0: pop {r4-r6} pop {r0} bx r0 @@ -319115,7 +319115,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 @@ -319133,15 +319133,15 @@ sub_80AA0D0: @ 80AA0D0 movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _080AA108 + bne @080AA108 ldr r0, =sub_80AA124 + 1 str r0, [r2] movs r0, 0 strh r0, [r2, 0xA] - b _080AA11E + b @080AA11E .align 2, 0 .pool -_080AA108: +@080AA108: lsls r0, r3, 24 lsrs r0, 24 movs r1, 0x10 @@ -319152,13 +319152,13 @@ _080AA108: lsrs r1, 16 movs r0, 0x52 bl lcd_io_set -_080AA11E: +@080AA11E: pop {r0} bx r0 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 @@ -319174,7 +319174,7 @@ sub_80AA124: @ 80AA124 lsls r0, 16 asrs r0, 16 cmp r0, 0x25 - bne _080AA16C + bne @080AA16C ldrh r0, [r1, 0x26] lsls r0, 24 lsrs r0, 24 @@ -319187,12 +319187,12 @@ sub_80AA124: @ 80AA124 bl obj_free_rotscale_entry adds r0, r4, 0 bl obj_delete_and_free_tiles - b _080AA186 + b @080AA186 .align 2, 0 .pool -_080AA16C: +@080AA16C: cmp r0, 0x27 - bne _080AA186 + bne @080AA186 movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -319201,14 +319201,14 @@ _080AA16C: bl lcd_io_set adds r0, r4, 0 bl move_anim_task_del -_080AA186: +@080AA186: pop {r4} pop {r0} bx r0 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 @@ -319219,204 +319219,204 @@ sub_80AA18C: @ 80AA18C ldrh r0, [r0] subs r0, 0xF cmp r0, 0x2B - bls _080AA1A4 - b _080AA328 -_080AA1A4: + bls @080AA1A4 + b @080AA328 +@080AA1A4: lsls r0, 2 - ldr r1, =_080AA1B8 + ldr r1, =@080AA1B8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080AA1B8: - .4byte _080AA268 - .4byte _080AA26E - .4byte _080AA274 - .4byte _080AA27A - .4byte _080AA280 - .4byte _080AA286 - .4byte _080AA28C - .4byte _080AA292 - .4byte _080AA298 - .4byte _080AA29E - .4byte _080AA2A4 - .4byte _080AA2AA - .4byte _080AA2B0 - .4byte _080AA2B6 - .4byte _080AA328 - .4byte _080AA328 - .4byte _080AA328 - .4byte _080AA328 - .4byte _080AA328 - .4byte _080AA328 - .4byte _080AA328 - .4byte _080AA328 - .4byte _080AA328 - .4byte _080AA328 - .4byte _080AA2BC - .4byte _080AA2C0 - .4byte _080AA2C4 - .4byte _080AA2C8 - .4byte _080AA2CC - .4byte _080AA2D0 - .4byte _080AA2D4 - .4byte _080AA2D8 - .4byte _080AA2E0 - .4byte _080AA2E8 - .4byte _080AA2F0 - .4byte _080AA2F8 - .4byte _080AA300 - .4byte _080AA308 - .4byte _080AA328 - .4byte _080AA328 - .4byte _080AA310 - .4byte _080AA314 - .4byte _080AA318 - .4byte _080AA320 -_080AA268: +@080AA1B8: + .4byte @080AA268 + .4byte @080AA26E + .4byte @080AA274 + .4byte @080AA27A + .4byte @080AA280 + .4byte @080AA286 + .4byte @080AA28C + .4byte @080AA292 + .4byte @080AA298 + .4byte @080AA29E + .4byte @080AA2A4 + .4byte @080AA2AA + .4byte @080AA2B0 + .4byte @080AA2B6 + .4byte @080AA328 + .4byte @080AA328 + .4byte @080AA328 + .4byte @080AA328 + .4byte @080AA328 + .4byte @080AA328 + .4byte @080AA328 + .4byte @080AA328 + .4byte @080AA328 + .4byte @080AA328 + .4byte @080AA2BC + .4byte @080AA2C0 + .4byte @080AA2C4 + .4byte @080AA2C8 + .4byte @080AA2CC + .4byte @080AA2D0 + .4byte @080AA2D4 + .4byte @080AA2D8 + .4byte @080AA2E0 + .4byte @080AA2E8 + .4byte @080AA2F0 + .4byte @080AA2F8 + .4byte @080AA300 + .4byte @080AA308 + .4byte @080AA328 + .4byte @080AA328 + .4byte @080AA310 + .4byte @080AA314 + .4byte @080AA318 + .4byte @080AA320 +@080AA268: movs r5, 0 movs r2, 0 - b _080AA330 -_080AA26E: + b @080AA330 +@080AA26E: movs r5, 0 movs r2, 0x1 - b _080AA330 -_080AA274: + b @080AA330 +@080AA274: movs r5, 0 movs r2, 0x3 - b _080AA330 -_080AA27A: + b @080AA330 +@080AA27A: movs r5, 0 movs r2, 0x5 - b _080AA330 -_080AA280: + b @080AA330 +@080AA280: movs r5, 0 movs r2, 0x6 - b _080AA330 -_080AA286: + b @080AA330 +@080AA286: movs r5, 0 movs r2, 0x2 - b _080AA330 -_080AA28C: + b @080AA330 +@080AA28C: movs r5, 0 movs r2, 0x4 - b _080AA330 -_080AA292: + b @080AA330 +@080AA292: movs r5, 0x1 movs r2, 0 - b _080AA330 -_080AA298: + b @080AA330 +@080AA298: movs r5, 0x1 movs r2, 0x1 - b _080AA330 -_080AA29E: + b @080AA330 +@080AA29E: movs r5, 0x1 movs r2, 0x3 - b _080AA330 -_080AA2A4: + b @080AA330 +@080AA2A4: movs r5, 0x1 movs r2, 0x5 - b _080AA330 -_080AA2AA: + b @080AA330 +@080AA2AA: movs r5, 0x1 movs r2, 0x6 - b _080AA330 -_080AA2B0: + b @080AA330 +@080AA2B0: movs r5, 0x1 movs r2, 0x2 - b _080AA330 -_080AA2B6: + b @080AA330 +@080AA2B6: movs r5, 0x1 movs r2, 0x4 - b _080AA330 -_080AA2BC: + b @080AA330 +@080AA2BC: movs r5, 0 - b _080AA2DA -_080AA2C0: + b @080AA2DA +@080AA2C0: movs r5, 0 - b _080AA2E2 -_080AA2C4: + b @080AA2E2 +@080AA2C4: movs r5, 0 - b _080AA2EA -_080AA2C8: + b @080AA2EA +@080AA2C8: movs r5, 0 - b _080AA2F2 -_080AA2CC: + b @080AA2F2 +@080AA2CC: movs r5, 0 - b _080AA2FA -_080AA2D0: + b @080AA2FA +@080AA2D0: movs r5, 0 - b _080AA302 -_080AA2D4: + b @080AA302 +@080AA2D4: movs r5, 0 - b _080AA30A -_080AA2D8: + b @080AA30A +@080AA2D8: movs r5, 0x1 -_080AA2DA: +@080AA2DA: movs r2, 0 movs r3, 0x1 - b _080AA330 -_080AA2E0: + b @080AA330 +@080AA2E0: movs r5, 0x1 -_080AA2E2: +@080AA2E2: movs r2, 0x1 movs r3, 0x1 - b _080AA330 -_080AA2E8: + b @080AA330 +@080AA2E8: movs r5, 0x1 -_080AA2EA: +@080AA2EA: movs r2, 0x3 movs r3, 0x1 - b _080AA330 -_080AA2F0: + b @080AA330 +@080AA2F0: movs r5, 0x1 -_080AA2F2: +@080AA2F2: movs r2, 0x5 movs r3, 0x1 - b _080AA330 -_080AA2F8: + b @080AA330 +@080AA2F8: movs r5, 0x1 -_080AA2FA: +@080AA2FA: movs r2, 0x6 movs r3, 0x1 - b _080AA330 -_080AA300: + b @080AA330 +@080AA300: movs r5, 0x1 -_080AA302: +@080AA302: movs r2, 0x2 movs r3, 0x1 - b _080AA330 -_080AA308: + b @080AA330 +@080AA308: movs r5, 0x1 -_080AA30A: +@080AA30A: movs r2, 0x4 movs r3, 0x1 - b _080AA330 -_080AA310: + b @080AA330 +@080AA310: movs r5, 0 - b _080AA31A -_080AA314: + b @080AA31A +@080AA314: movs r5, 0 - b _080AA322 -_080AA318: + b @080AA322 +@080AA318: movs r5, 0x1 -_080AA31A: +@080AA31A: movs r2, 0xFF movs r3, 0 - b _080AA330 -_080AA320: + b @080AA330 +@080AA320: movs r5, 0x1 -_080AA322: +@080AA322: movs r2, 0xFF movs r3, 0x1 - b _080AA330 -_080AA328: + b @080AA330 +@080AA328: adds r0, r4, 0 bl move_anim_task_del - b _080AA352 -_080AA330: + b @080AA352 +@080AA330: ldr r0, =0x0203841e movs r1, 0 strh r5, [r0] @@ -319433,7 +319433,7 @@ _080AA330: str r1, [r0] adds r0, r4, 0 bl _call_via_r1 -_080AA352: +@080AA352: pop {r4,r5} pop {r0} bx r0 @@ -319442,7 +319442,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 @@ -319475,7 +319475,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 @@ -319485,7 +319485,7 @@ task0A_80788BC: @ 80AA3B4 ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 - bne _080AA3F6 + bne @080AA3F6 ldr r0, =0x020244d0 ldr r2, [r0] ldr r1, =0x03005e00 @@ -319507,7 +319507,7 @@ task0A_80788BC: @ 80AA3B4 strb r0, [r1] adds r0, r4, 0 bl remove_task -_080AA3F6: +@080AA3F6: pop {r4} pop {r0} bx r0 @@ -319516,7 +319516,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 @@ -319529,7 +319529,7 @@ sub_80AA40C: @ 80AA40C movs r1, 0xA ldrsh r0, [r0, r1] cmp r0, 0 - beq _080AA43C + beq @080AA43C ldrb r0, [r3, 0x1] movs r1, 0xD negs r1, r1 @@ -319537,26 +319537,26 @@ sub_80AA40C: @ 80AA40C strb r1, [r3, 0x1] movs r0, 0x42 strh r0, [r3, 0x22] - b _080AA46A + b @080AA46A .align 2, 0 .pool -_080AA43C: +@080AA43C: ldrh r1, [r3, 0x22] movs r2, 0x22 ldrsh r0, [r3, r2] cmp r0, 0x42 - beq _080AA44A + beq @080AA44A adds r0, r1, 0x1 strh r0, [r3, 0x22] -_080AA44A: +@080AA44A: ldrh r1, [r3, 0x2E] movs r2, 0x2E ldrsh r0, [r3, r2] cmp r0, 0 - beq _080AA458 + beq @080AA458 subs r0, r1, 0x1 strh r0, [r3, 0x2E] -_080AA458: +@080AA458: ldr r0, =0x0853ff70 movs r2, 0x2E ldrsh r1, [r3, r2] @@ -319565,7 +319565,7 @@ _080AA458: ldrh r1, [r1] movs r0, 0x52 bl lcd_io_set -_080AA46A: +@080AA46A: pop {r0} bx r0 .align 2, 0 @@ -319573,7 +319573,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 @@ -319586,66 +319586,66 @@ sub_80AA474: @ 80AA474 movs r1, 0xA ldrsh r0, [r0, r1] cmp r0, 0 - beq _080AA4A0 + beq @080AA4A0 ldrb r0, [r3, 0x1] movs r1, 0xD negs r1, r1 ands r1, r0 strb r1, [r3, 0x1] movs r0, 0x42 - b _080AA4AC + b @080AA4AC .align 2, 0 .pool -_080AA4A0: +@080AA4A0: ldrh r1, [r3, 0x22] movs r2, 0x22 ldrsh r0, [r3, r2] cmp r0, 0x42 - beq _080AA4AE + beq @080AA4AE adds r0, r1, 0x1 -_080AA4AC: +@080AA4AC: strh r0, [r3, 0x22] -_080AA4AE: +@080AA4AE: pop {r0} bx r0 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 ldrsh r0, [r2, r1] cmp r0, 0x1 - bne _080AA4DC + bne @080AA4DC ldrh r0, [r2, 0x30] adds r0, 0x1 strh r0, [r2, 0x30] movs r1, 0x10 ands r0, r1 cmp r0, 0 - bne _080AA4DC + bne @080AA4DC adds r0, r2, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] - b _080AA4E8 -_080AA4DC: + b @080AA4E8 +@080AA4DC: adds r2, 0x3E ldrb r1, [r2] movs r0, 0x5 negs r0, r0 ands r0, r1 strb r0, [r2] -_080AA4E8: +@080AA4E8: pop {r0} bx r0 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 @@ -319653,7 +319653,7 @@ sub_80AA4EC: @ 80AA4EC lsrs r0, 16 movs r6, 0 lsls r7, r1, 16 -_080AA4FA: +@080AA4FA: lsls r5, r0, 16 asrs r5, 16 ldr r0, =0x085400d8 @@ -319680,7 +319680,7 @@ _080AA4FA: lsls r5, 16 lsrs r0, r5, 16 cmp r6, 0x4 - bls _080AA4FA + bls @080AA4FA pop {r4-r7} pop {r0} bx r0 @@ -319689,7 +319689,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 @@ -319697,7 +319697,7 @@ sub_80AA548: @ 80AA548 lsrs r0, 16 movs r5, 0 lsls r6, r1, 16 -_080AA556: +@080AA556: lsls r4, r0, 16 asrs r4, 16 ldr r0, =0x085400d8 @@ -319724,7 +319724,7 @@ _080AA556: lsls r4, 16 lsrs r0, r4, 16 cmp r5, 0x4 - bls _080AA556 + bls @080AA556 pop {r4-r6} pop {r0} bx r0 @@ -319733,8 +319733,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] @@ -319742,44 +319742,44 @@ title_screen_logo_shine_obj_callback_type1: @ 80AA5A4 ldrsh r1, [r3, r0] ldr r0, =0x0000010f cmp r1, r0 - bgt _080AA63C + bgt @080AA63C movs r4, 0x2E ldrsh r0, [r3, r4] adds r4, r2, 0 cmp r0, 0 - beq _080AA630 + beq @080AA630 cmp r1, 0x77 - bgt _080AA5E0 + bgt @080AA5E0 ldrh r1, [r3, 0x30] movs r2, 0x30 ldrsh r0, [r3, r2] cmp r0, 0x1E - bgt _080AA5F8 + bgt @080AA5F8 adds r1, 0x1 strh r1, [r3, 0x30] lsls r0, r1, 16 asrs r0, 16 cmp r0, 0x1E - bgt _080AA5F8 + bgt @080AA5F8 adds r0, r1, 0x1 - b _080AA5F6 + b @080AA5F6 .align 2, 0 .pool -_080AA5E0: +@080AA5E0: ldrh r1, [r3, 0x30] movs r4, 0x30 ldrsh r0, [r3, r4] cmp r0, 0 - beq _080AA5F8 + beq @080AA5F8 subs r0, r1, 0x1 strh r0, [r3, 0x30] lsls r0, 16 cmp r0, 0 - beq _080AA5F8 + beq @080AA5F8 subs r0, r1, 0x2 -_080AA5F6: +@080AA5F6: strh r0, [r3, 0x30] -_080AA5F8: +@080AA5F8: ldrh r1, [r3, 0x30] movs r0, 0x1F ands r0, r1 @@ -319791,36 +319791,36 @@ _080AA5F8: ldrsh r0, [r3, r1] ldrh r4, [r3, 0x20] cmp r0, 0x84 - beq _080AA61C + beq @080AA61C cmp r0, 0x88 - beq _080AA61C + beq @080AA61C cmp r0, 0x8C - beq _080AA61C + beq @080AA61C cmp r0, 0x90 - bne _080AA62C -_080AA61C: + bne @080AA62C +@080AA61C: ldr r1, =0x02037b14 ldr r0, =0x000033f8 strh r0, [r1] - b _080AA630 + b @080AA630 .align 2, 0 .pool -_080AA62C: +@080AA62C: ldr r0, =0x02037b14 strh r2, [r0] -_080AA630: +@080AA630: adds r0, r4, 0x4 strh r0, [r3, 0x20] - b _080AA648 + b @080AA648 .align 2, 0 .pool -_080AA63C: +@080AA63C: ldr r1, =0x02037b14 movs r0, 0 strh r0, [r1] adds r0, r3, 0 bl obj_delete_and_free_tiles -_080AA648: +@080AA648: pop {r4} pop {r0} bx r0 @@ -319829,8 +319829,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] @@ -319838,24 +319838,24 @@ title_screen_logo_shine_obj_callback_type2: @ 80AA654 ldrsh r1, [r2, r0] ldr r0, =0x0000010f cmp r1, r0 - bgt _080AA670 + bgt @080AA670 adds r0, r3, 0 adds r0, 0x8 strh r0, [r2, 0x20] - b _080AA676 + b @080AA676 .align 2, 0 .pool -_080AA670: +@080AA670: adds r0, r2, 0 bl obj_delete_and_free_tiles -_080AA676: +@080AA676: pop {r0} bx r0 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 @@ -319864,16 +319864,16 @@ title_screen_add_logo_shine_obj: @ 80AA67C lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x1 - beq _080AA6D0 + beq @080AA6D0 cmp r5, 0x1 - bgt _080AA698 + bgt @080AA698 cmp r5, 0 - beq _080AA69C - b _080AA766 -_080AA698: + beq @080AA69C + b @080AA766 +@080AA698: cmp r5, 0x2 - bne _080AA766 -_080AA69C: + bne @080AA766 +@080AA69C: ldr r0, =0x08540124 movs r1, 0 movs r2, 0x44 @@ -319894,10 +319894,10 @@ _080AA69C: orrs r1, r2 strb r1, [r0, 0x1] strh r5, [r0, 0x2E] - b _080AA766 + b @080AA766 .align 2, 0 .pool -_080AA6D0: +@080AA6D0: ldr r0, =0x08540124 mov r9, r0 movs r1, 0 @@ -319970,7 +319970,7 @@ _080AA6D0: mov r2, r8 orrs r4, r2 strb r4, [r0, 0x1] -_080AA766: +@080AA766: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -319983,8 +319983,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 copy_super_sprites_to_oam @@ -320001,8 +320001,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 @@ -320011,23 +320011,23 @@ c2_title_screen_1: @ 80AA7A4 adds r0, r1 ldrb r0, [r0] cmp r0, 0x5 - bhi _080AA7E0 + bhi @080AA7E0 lsls r0, 2 - ldr r1, =_080AA7C8 + ldr r1, =@080AA7C8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080AA7C8: - .4byte _080AA7E0 - .4byte _080AA8C4 - .4byte _080AA998 - .4byte _080AA9E0 - .4byte _080AAA14 - .4byte _080AAAF0 -_080AA7E0: +@080AA7C8: + .4byte @080AA7E0 + .4byte @080AA8C4 + .4byte @080AA998 + .4byte @080AA9E0 + .4byte @080AAA14 + .4byte @080AAAF0 +@080AA7E0: movs r0, 0 bl SetVBlankCallback movs r0, 0x50 @@ -320111,10 +320111,10 @@ _080AA7E0: adds r0, r1 movs r1, 0x1 strb r1, [r0] - b _080AAB1E + b @080AAB1E .align 2, 0 .pool -_080AA8C4: +@080AA8C4: ldr r0, =0x08dde690 movs r1, 0xC0 lsls r1, 19 @@ -320165,10 +320165,10 @@ _080AA8C4: adds r0, r2 movs r1, 0x2 strb r1, [r0] - b _080AAB1E + b @080AAB1E .align 2, 0 .pool -_080AA998: +@080AA998: ldr r0, =task_title_screen_1 + 1 movs r1, 0 bl AddTask @@ -320194,10 +320194,10 @@ _080AA998: adds r0, r1 movs r1, 0x3 strb r1, [r0] - b _080AAB1E + b @080AAB1E .align 2, 0 .pool -_080AA9E0: +@080AA9E0: movs r0, 0x1 negs r0, r0 ldr r1, =0x0000ffff @@ -320214,10 +320214,10 @@ _080AA9E0: adds r0, r2 movs r1, 0x4 strb r1, [r0] - b _080AAB1E + b @080AAB1E .align 2, 0 .pool -_080AAA14: +@080AAA14: movs r2, 0x80 lsls r2, 1 movs r0, 0x78 @@ -320288,15 +320288,15 @@ _080AAA14: adds r0, r1 movs r1, 0x5 strb r1, [r0] - b _080AAB1E + b @080AAB1E .align 2, 0 .pool -_080AAAF0: +@080AAAF0: bl fade_and_return_progress_probably lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _080AAB1E + bne @080AAB1E movs r0, 0 bl title_screen_add_logo_shine_obj str r4, [sp] @@ -320311,7 +320311,7 @@ _080AAAF0: bl sub_80BA384 ldr r0, =c2_title_screen_2 + 1 bl set_callback2 -_080AAB1E: +@080AAB1E: add sp, 0x14 pop {r4} pop {r0} @@ -320321,8 +320321,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 run_active_tasks bl call_obj_callbacks @@ -320333,8 +320333,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 @@ -320344,7 +320344,7 @@ task_title_screen_1: @ 80AAB44 ands r0, r1 ldr r6, =0x03005e00 cmp r0, 0 - bne _080AAB6A + bne @080AAB6A lsls r0, r5, 2 adds r1, r0, r5 lsls r1, 3 @@ -320353,8 +320353,8 @@ task_title_screen_1: @ 80AAB44 ldrsh r1, [r1, r2] adds r4, r0, 0 cmp r1, 0 - beq _080AAB7C -_080AAB6A: + beq @080AAB7C +@080AAB6A: lsls r3, r5, 2 adds r0, r3, r5 lsls r0, 3 @@ -320364,28 +320364,28 @@ _080AAB6A: strh r1, [r0, 0xA] strh r2, [r0, 0x8] adds r4, r3, 0 -_080AAB7C: +@080AAB7C: adds r0, r4, r5 lsls r0, 3 adds r6, r0, r6 movs r1, 0x8 ldrsh r0, [r6, r1] cmp r0, 0 - beq _080AABC0 + beq @080AABC0 ldrh r0, [r6, 0x8] cmp r0, 0xB0 - bne _080AABA0 + bne @080AABA0 movs r0, 0x1 bl title_screen_add_logo_shine_obj - b _080AABAA + b @080AABAA .align 2, 0 .pool -_080AABA0: +@080AABA0: cmp r0, 0x40 - bne _080AABAA + bne @080AABAA movs r0, 0x2 bl title_screen_add_logo_shine_obj -_080AABAA: +@080AABAA: ldr r0, =0x03005e00 adds r1, r4, r5 lsls r1, 3 @@ -320393,10 +320393,10 @@ _080AABAA: ldrh r0, [r1, 0x8] subs r0, 0x1 strh r0, [r1, 0x8] - b _080AAC32 + b @080AAC32 .align 2, 0 .pool -_080AABC0: +@080AABC0: ldr r1, =0x00001441 movs r0, 0 bl lcd_io_set @@ -320446,7 +320446,7 @@ _080AABC0: strh r0, [r6, 0x8] ldr r0, =task_title_screen_2 + 1 str r0, [r6] -_080AAC32: +@080AAC32: pop {r4-r6} pop {r0} bx r0 @@ -320455,8 +320455,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 @@ -320466,7 +320466,7 @@ task_title_screen_2: @ 80AAC50 ands r0, r1 ldr r2, =0x03005e00 cmp r0, 0 - bne _080AAC76 + bne @080AAC76 lsls r0, r4, 2 adds r1, r0, r4 lsls r1, 3 @@ -320475,8 +320475,8 @@ task_title_screen_2: @ 80AAC50 ldrsh r1, [r1, r3] adds r6, r0, 0 cmp r1, 0 - beq _080AAC88 -_080AAC76: + beq @080AAC88 +@080AAC76: lsls r3, r4, 2 adds r0, r3, r4 lsls r0, 3 @@ -320486,7 +320486,7 @@ _080AAC76: strh r1, [r0, 0xA] strh r2, [r0, 0x8] adds r6, r3, 0 -_080AAC88: +@080AAC88: ldr r1, =0x03005e00 adds r0, r6, r4 lsls r0, 3 @@ -320495,13 +320495,13 @@ _080AAC88: movs r1, 0x8 ldrsh r7, [r5, r1] cmp r7, 0 - beq _080AACA8 + beq @080AACA8 subs r0, 0x1 strh r0, [r5, 0x8] - b _080AACE2 + b @080AACE2 .align 2, 0 .pool -_080AACA8: +@080AACA8: movs r0, 0x1 strh r0, [r5, 0xA] ldr r1, =0x00002142 @@ -320525,7 +320525,7 @@ _080AACA8: strh r7, [r5, 0x10] ldr r0, =task_title_screen_3 + 1 str r0, [r5] -_080AACE2: +@080AACE2: ldr r2, =0x03005e00 adds r0, r6, r4 lsls r0, 3 @@ -320534,15 +320534,15 @@ _080AACE2: movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne _080AAD02 + bne @080AAD02 ldrh r1, [r3, 0xC] movs r5, 0xC ldrsh r0, [r3, r5] cmp r0, 0 - beq _080AAD02 + beq @080AAD02 adds r0, r1, 0x1 strh r0, [r3, 0xC] -_080AAD02: +@080AAD02: adds r0, r6, r4 lsls r0, 3 adds r3, r0, r2 @@ -320550,15 +320550,15 @@ _080AAD02: movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080AAD20 + bne @080AAD20 ldrh r1, [r3, 0xE] movs r5, 0xE ldrsh r0, [r3, r5] cmp r0, 0 - beq _080AAD20 + beq @080AAD20 adds r0, r1, 0x1 strh r0, [r3, 0xE] -_080AAD20: +@080AAD20: adds r4, r6, r4 lsls r4, 3 adds r4, r2 @@ -320585,8 +320585,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 @@ -320596,14 +320596,14 @@ task_title_screen_3: @ 80AAD64 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080AAD84 + bne @080AAD84 movs r0, 0x8 ands r0, r1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq _080AADB0 -_080AAD84: + beq @080AADB0 +@080AAD84: movs r0, 0x4 bl play_sound_effect movs r0, 0x1 @@ -320616,28 +320616,28 @@ _080AAD84: bl sub_80A1AD4 ldr r0, =c2_title_menu_1 + 1 bl set_callback2 - b _080AAE98 + b @080AAE98 .align 2, 0 .pool -_080AADB0: +@080AADB0: ldrh r1, [r2, 0x2C] movs r0, 0x46 ands r0, r1 cmp r0, 0x46 - bne _080AADC8 + bne @080AADC8 ldr r0, =c2_clear_save_data_screen_1 + 1 bl set_callback2 - b _080AAE98 + b @080AAE98 .align 2, 0 .pool -_080AADC8: +@080AADC8: movs r0, 0x26 ands r0, r1 cmp r0, 0x26 - bne _080AADFC + bne @080AADFC bl sub_809D614 cmp r0, 0x1 - bne _080AADFC + bne @080AADFC movs r0, 0x4 bl play_sound_effect movs r0, 0x1 @@ -320649,16 +320649,16 @@ _080AADC8: bl sub_80A1AD4 ldr r0, =c2_reset_rtc_screen_1 + 1 bl set_callback2 - b _080AAE98 + b @080AAE98 .align 2, 0 .pool -_080AADFC: +@080AADFC: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2C] movs r0, 0x6 ands r0, r1 cmp r0, 0x6 - bne _080AAE30 + bne @080AAE30 movs r0, 0x4 bl play_sound_effect movs r0, 0x1 @@ -320670,10 +320670,10 @@ _080AADFC: bl sub_80A1AD4 ldr r0, =c2_berry_program_update_screen_1 + 1 bl set_callback2 - b _080AAE98 + b @080AAE98 .align 2, 0 .pool -_080AAE30: +@080AAE30: movs r0, 0x2C movs r1, 0 bl lcd_io_set @@ -320691,7 +320691,7 @@ _080AAE30: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _080AAE72 + beq @080AAE72 ldrh r0, [r3, 0x10] adds r0, 0x1 strh r0, [r3, 0x10] @@ -320705,14 +320705,14 @@ _080AAE30: ldr r1, =0x02022e18 movs r0, 0 strh r0, [r1] -_080AAE72: +@080AAE72: ldrb r0, [r3, 0x8] bl title_screen_update_rayquaza_ring_palette ldr r0, =0x03007420 ldr r1, =0x0000ffff ldrh r0, [r0, 0x4] cmp r0, 0 - bne _080AAE98 + bne @080AAE98 movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -320722,7 +320722,7 @@ _080AAE72: bl sub_80A1AD4 ldr r0, =c2_show_copyright_and_intro_again_1 + 1 bl set_callback2 -_080AAE98: +@080AAE98: add sp, 0x4 pop {r4,r5} pop {r0} @@ -320732,15 +320732,15 @@ _080AAE98: thumb_func_end task_title_screen_3 thumb_func_start c2_title_menu_1 -c2_title_menu_1: @ 80AAEB8 +c2_title_menu_1: ; 80AAEB8 push {lr} bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne _080AAECA + bne @080AAECA ldr r0, =c2_title_menu_2 + 1 bl set_callback2 -_080AAECA: +@080AAECA: pop {r0} bx r0 .align 2, 0 @@ -320748,15 +320748,15 @@ _080AAECA: thumb_func_end c2_title_menu_1 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 cmp r0, 0 - bne _080AAEE6 + bne @080AAEE6 ldr r0, =c2_show_copyright_and_intro_again_2 + 1 bl set_callback2 -_080AAEE6: +@080AAEE6: pop {r0} bx r0 .align 2, 0 @@ -320764,15 +320764,15 @@ _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 cmp r0, 0 - bne _080AAF02 + bne @080AAF02 ldr r0, =c2_clear_save_data_screen_2 + 1 bl set_callback2 -_080AAF02: +@080AAF02: pop {r0} bx r0 .align 2, 0 @@ -320780,15 +320780,15 @@ _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 cmp r0, 0 - bne _080AAF1E + bne @080AAF1E ldr r0, =sub_809EF88 + 1 bl set_callback2 -_080AAF1E: +@080AAF1E: pop {r0} bx r0 .align 2, 0 @@ -320796,16 +320796,16 @@ _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 cmp r0, 0 - bne _080AAF3E + bne @080AAF3E bl m4aMPlayAllStop ldr r0, =sub_81BF384 + 1 bl set_callback2 -_080AAF3E: +@080AAF3E: pop {r0} bx r0 .align 2, 0 @@ -320813,8 +320813,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 @@ -320822,7 +320822,7 @@ title_screen_update_rayquaza_ring_palette: @ 80AAF48 movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne _080AAF9C + bne @080AAF9C adds r0, r1, 0 movs r1, 0x80 bl cosine @@ -320833,18 +320833,18 @@ title_screen_update_rayquaza_ring_palette: @ 80AAF48 lsls r0, r2, 5 subs r0, r2 cmp r0, 0 - bge _080AAF72 + bge @080AAF72 adds r0, 0xFF -_080AAF72: +@080AAF72: asrs r0, 8 movs r3, 0x1F subs r1, r3, r0 movs r0, 0x16 muls r0, r2 cmp r0, 0 - bge _080AAF82 + bge @080AAF82 adds r0, 0xFF -_080AAF82: +@080AAF82: asrs r0, 8 subs r0, r3, r0 lsls r0, 5 @@ -320857,22 +320857,22 @@ _080AAF82: movs r1, 0xEF movs r2, 0x2 bl gpu_pal_apply -_080AAF9C: +@080AAF9C: add sp, 0x4 pop {r0} bx r0 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 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - bne _080AB060 + bne @080AB060 movs r0, 0x90 lsls r0, 5 bl gpu_pal_alloc_new @@ -320953,7 +320953,7 @@ sub_80AAFA4: @ 80AAFA4 ldr r1, =0x000006c9 adds r4, r1 strb r0, [r4] -_080AB060: +@080AB060: pop {r4-r6} pop {r0} bx r0 @@ -320962,36 +320962,36 @@ _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 cmp r4, 0x3 - beq _080AB0AE + beq @080AB0AE cmp r4, 0x5 - beq _080AB0AE + beq @080AB0AE cmp r4, 0xD - beq _080AB0AE + beq @080AB0AE bl play_some_sound -_080AB0AE: +@080AB0AE: ldr r1, =0x02038454 ldr r2, =0x000006d1 adds r0, r1, r2 ldrb r0, [r0] cmp r0, r4 - beq _080AB0D2 + beq @080AB0D2 movs r3, 0xDA lsls r3, 3 adds r0, r1, r3 ldrb r0, [r0] cmp r0, r4 - bne _080AB0D2 + bne @080AB0D2 ldr r0, =0x0854c150 lsls r1, r4, 4 adds r1, r0 ldr r0, [r1] bl _call_via_r0 -_080AB0D2: +@080AB0D2: ldr r1, =0x02038454 ldr r2, =0x000006d3 adds r0, r1, r2 @@ -321011,7 +321011,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 @@ -321033,7 +321033,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 @@ -321060,7 +321060,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 @@ -321070,7 +321070,7 @@ sub_80AB160: @ 80AB160 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 - beq _080AB198 + beq @080AB198 ldr r1, =0x0854c150 movs r3, 0xDA lsls r3, 3 @@ -321088,7 +321088,7 @@ sub_80AB160: @ 80AB160 adds r0, r1 ldr r1, =sub_80AB1B0 + 1 str r1, [r0] -_080AB198: +@080AB198: pop {r4} pop {r0} bx r0 @@ -321097,7 +321097,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 @@ -321111,7 +321111,7 @@ sub_80AB1B0: @ 80AB1B0 ldrb r0, [r6] ldrb r2, [r7] cmp r0, r2 - beq _080AB22C + beq @080AB22C ldr r0, =0x0854c150 mov r9, r0 ldrb r0, [r6] @@ -321124,13 +321124,13 @@ sub_80AB1B0: @ 80AB1B0 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _080AB23C + bne @080AB23C ldr r1, =0x000006c6 adds r1, r5 mov r8, r1 ldrb r0, [r1] cmp r0, 0x2 - beq _080AB23C + beq @080AB23C ldrb r0, [r7] lsls r0, 4 add r0, r9 @@ -321147,10 +321147,10 @@ sub_80AB1B0: @ 80AB1B0 adds r1, r5, r2 movs r0, 0x1 strb r0, [r1] - b _080AB23C + b @080AB23C .align 2, 0 .pool -_080AB22C: +@080AB22C: ldr r0, =0x0854c150 ldrb r1, [r6] lsls r1, 4 @@ -321158,7 +321158,7 @@ _080AB22C: adds r1, r0 ldr r0, [r1] bl _call_via_r0 -_080AB23C: +@080AB23C: ldr r1, =0x0854c240 ldr r0, =0x02038454 ldr r2, =0x000006c6 @@ -321179,7 +321179,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 @@ -321194,18 +321194,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 @@ -321218,38 +321218,38 @@ sub_80AB294: @ 80AB294 mov r12, r0 ldr r1, =0x020388b4 mov r10, r1 -_080AB2AC: +@080AB2AC: mov r7, r10 mov r0, r12 cmp r0, 0 - bne _080AB2B8 + bne @080AB2B8 ldr r1, =0xfffffda0 adds r7, r1 -_080AB2B8: +@080AB2B8: movs r5, 0 movs r0, 0x1 add r0, r12 mov r9, r0 -_080AB2C0: +@080AB2C0: lsls r1, r5, 8 lsls r0, r5, 24 lsrs r2, r0, 16 mov r0, r12 cmp r0, 0 - bne _080AB2E4 + bne @080AB2E4 adds r0, r1, 0 lsls r0, 12 lsrs r4, r0, 16 - b _080AB2E6 + b @080AB2E6 .align 2, 0 .pool -_080AB2E4: +@080AB2E4: movs r4, 0 -_080AB2E6: +@080AB2E6: movs r3, 0 adds r1, r5, 0x1 mov r8, r1 -_080AB2EC: +@080AB2EC: subs r1, r2, r4 lsls r1, 16 lsrs r2, r1, 16 @@ -321262,22 +321262,22 @@ _080AB2EC: lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x2 - bls _080AB2EC + bls @080AB2EC adds r6, r2, 0 movs r0, 0xF8 lsls r0, 5 subs r0, r2 cmp r0, 0 - bge _080AB314 + bge @080AB314 adds r0, 0xF -_080AB314: +@080AB314: lsls r0, 12 lsrs r4, r0, 16 cmp r5, 0xB - bhi _080AB35E + bhi @080AB35E cmp r3, 0x12 - bhi _080AB384 -_080AB320: + bhi @080AB384 +@080AB320: adds r0, r2, r4 lsls r0, 16 lsrs r2, r0, 16 @@ -321285,14 +321285,14 @@ _080AB320: lsls r0, 16 asrs r1, r0, 16 cmp r1, 0 - ble _080AB33C + ble @080AB33C lsrs r0, 31 adds r0, r1, r0 asrs r0, 1 subs r0, r2, r0 lsls r0, 16 lsrs r2, r0, 16 -_080AB33C: +@080AB33C: lsls r0, r3, 5 adds r0, r7 adds r1, r0, r5 @@ -321301,21 +321301,21 @@ _080AB33C: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1F - bls _080AB352 + bls @080AB352 movs r0, 0x1F strb r0, [r1] -_080AB352: +@080AB352: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x12 - bls _080AB320 - b _080AB384 -_080AB35E: + bls @080AB320 + b @080AB384 +@080AB35E: cmp r3, 0x12 - bhi _080AB384 + bhi @080AB384 movs r6, 0x1F -_080AB364: +@080AB364: adds r1, r2, r4 lsls r1, 16 lsrs r2, r1, 16 @@ -321325,26 +321325,26 @@ _080AB364: lsrs r1, 24 strb r1, [r0] cmp r1, 0x1F - bls _080AB37A + bls @080AB37A strb r6, [r0] -_080AB37A: +@080AB37A: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x12 - bls _080AB364 -_080AB384: + bls @080AB364 +@080AB384: mov r1, r8 lsls r0, r1, 16 lsrs r5, r0, 16 cmp r5, 0x1F - bls _080AB2C0 + bls @080AB2C0 mov r1, r9 lsls r0, r1, 16 lsrs r0, 16 mov r12, r0 cmp r0, 0x1 - bls _080AB2AC + bls @080AB2AC pop {r3-r5} mov r8, r3 mov r9, r4 @@ -321355,7 +321355,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 @@ -321363,7 +321363,7 @@ sub_80AB3A8: @ 80AB3A8 ldrb r1, [r2] adds r3, r0, 0 cmp r1, 0x2 - beq _080AB42C + beq @080AB42C movs r7, 0xD8 lsls r7, 3 adds r4, r3, r7 @@ -321376,13 +321376,13 @@ sub_80AB3A8: @ 80AB3A8 movs r5, 0 ldrsb r5, [r0, r5] cmp r6, r5 - bne _080AB3E4 + bne @080AB3E4 movs r0, 0x3 strb r0, [r2] - b _080AB42C + b @080AB42C .align 2, 0 .pool -_080AB3E4: +@080AB3E4: ldr r0, =0x000006c3 adds r2, r3, r0 ldrb r0, [r2] @@ -321394,20 +321394,20 @@ _080AB3E4: lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bcc _080AB42C + bcc @080AB42C movs r0, 0 strb r0, [r2] mov r0, r12 cmp r6, r5 - bge _080AB414 + bge @080AB414 adds r0, 0x1 - b _080AB418 + b @080AB418 .align 2, 0 .pool -_080AB414: +@080AB414: mov r0, r12 subs r0, 0x1 -_080AB418: +@080AB418: strb r0, [r4] movs r1, 0xD8 lsls r1, 3 @@ -321417,14 +321417,14 @@ _080AB418: movs r0, 0 movs r1, 0x20 bl pal_fade_2 -_080AB42C: +@080AB42C: pop {r4-r7} pop {r0} bx r0 thumb_func_end sub_80AB3A8 thumb_func_start sub_80AB434 -sub_80AB434: @ 80AB434 +sub_80AB434: ; 80AB434 push {lr} ldr r2, =0x02038454 ldr r0, =0x000006cb @@ -321435,44 +321435,44 @@ sub_80AB434: @ 80AB434 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bls _080AB452 + bls @080AB452 ldr r3, =0x000006ca adds r1, r2, r3 movs r0, 0 strb r0, [r1] -_080AB452: +@080AB452: movs r1, 0xDA lsls r1, 3 adds r0, r2, r1 ldrb r0, [r0] subs r0, 0x3 cmp r0, 0xA - bhi _080AB51C + bhi @080AB51C lsls r0, 2 - ldr r1, =_080AB47C + ldr r1, =@080AB47C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080AB47C: - .4byte _080AB4A8 - .4byte _080AB4A8 - .4byte _080AB4A8 - .4byte _080AB4F4 - .4byte _080AB51C - .4byte _080AB51C - .4byte _080AB51C - .4byte _080AB51C - .4byte _080AB4A8 - .4byte _080AB4D0 - .4byte _080AB4A8 -_080AB4A8: +@080AB47C: + .4byte @080AB4A8 + .4byte @080AB4A8 + .4byte @080AB4A8 + .4byte @080AB4F4 + .4byte @080AB51C + .4byte @080AB51C + .4byte @080AB51C + .4byte @080AB51C + .4byte @080AB4A8 + .4byte @080AB4D0 + .4byte @080AB4A8 +@080AB4A8: bl sub_80AB54C lsls r0, 24 cmp r0, 0 - bne _080AB53C + bne @080AB53C ldr r0, =0x02038454 movs r2, 0xD8 lsls r2, 3 @@ -321482,14 +321482,14 @@ _080AB4A8: ldr r3, =0x000006c6 adds r0, r3 strb r2, [r0] - b _080AB53C + b @080AB53C .align 2, 0 .pool -_080AB4D0: +@080AB4D0: bl sub_80AB5AC lsls r0, 24 cmp r0, 0 - bne _080AB53C + bne @080AB53C ldr r1, =0x02038454 movs r0, 0xD8 lsls r0, 3 @@ -321498,15 +321498,15 @@ _080AB4D0: strb r0, [r2] ldr r2, =0x000006c6 adds r1, r2 - b _080AB538 + b @080AB538 .align 2, 0 .pool -_080AB4F4: +@080AB4F4: bl sub_80AB604 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - bne _080AB53C + bne @080AB53C ldr r0, =0x02038454 movs r3, 0xD8 lsls r3, 3 @@ -321516,16 +321516,16 @@ _080AB4F4: adds r0, r1 movs r1, 0x3 strb r1, [r0] - b _080AB53C + b @080AB53C .align 2, 0 .pool -_080AB51C: +@080AB51C: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080AB53C + bne @080AB53C ldr r3, =0x000006c1 adds r0, r2, r3 ldrb r1, [r0] @@ -321534,10 +321534,10 @@ _080AB51C: strb r1, [r0] ldr r0, =0x000006c6 adds r1, r2, r0 -_080AB538: +@080AB538: movs r0, 0x3 strb r0, [r1] -_080AB53C: +@080AB53C: pop {r0} bx r0 .align 2, 0 @@ -321545,7 +321545,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 @@ -321553,13 +321553,13 @@ sub_80AB54C: @ 80AB54C adds r4, r2, r0 ldrb r0, [r4] cmp r0, 0x10 - beq _080AB5A2 + beq @080AB5A2 adds r1, r0, 0x1 strb r1, [r4] lsls r0, r1, 24 lsrs r0, 24 cmp r0, 0xF - bhi _080AB594 + bhi @080AB594 movs r3, 0x10 subs r3, r1 lsls r3, 24 @@ -321573,19 +321573,19 @@ sub_80AB54C: @ 80AB54C movs r2, 0x3 bl sub_80AB848 movs r0, 0x1 - b _080AB5A4 + b @080AB5A4 .align 2, 0 .pool -_080AB594: +@080AB594: movs r0, 0 movs r1, 0x20 movs r2, 0x3 bl pal_fade_2 movs r0, 0x10 strb r0, [r4] -_080AB5A2: +@080AB5A2: movs r0, 0 -_080AB5A4: +@080AB5A4: add sp, 0x4 pop {r4} pop {r1} @@ -321593,20 +321593,20 @@ _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 adds r4, r2, r0 ldrb r0, [r4] cmp r0, 0x10 - beq _080AB5FC + beq @080AB5FC adds r3, r0, 0x1 strb r3, [r4] lsls r0, r3, 24 lsrs r0, 24 cmp r0, 0xF - bhi _080AB5EC + bhi @080AB5EC movs r0, 0x6 negs r0, r0 movs r1, 0x10 @@ -321618,10 +321618,10 @@ sub_80AB5AC: @ 80AB5AC ldrh r2, [r2] bl sub_80AB990 movs r0, 0x1 - b _080AB5FE + b @080AB5FE .align 2, 0 .pool -_080AB5EC: +@080AB5EC: movs r2, 0x6 negs r2, r2 movs r0, 0 @@ -321629,23 +321629,23 @@ _080AB5EC: bl pal_fade_2 movs r0, 0x10 strb r0, [r4] -_080AB5FC: +@080AB5FC: movs r0, 0 -_080AB5FE: +@080AB5FE: pop {r4} pop {r1} bx r1 thumb_func_end sub_80AB5AC thumb_func_start sub_80AB604 -sub_80AB604: @ 80AB604 +sub_80AB604: ; 80AB604 push {lr} ldr r2, =0x02038454 ldr r1, =0x000006c7 adds r0, r2, r1 ldrb r1, [r0] cmp r1, 0x10 - beq _080AB638 + beq @080AB638 adds r1, 0x1 strb r1, [r0] movs r0, 0x10 @@ -321657,23 +321657,23 @@ sub_80AB604: @ 80AB604 ldrh r1, [r1] bl sub_80ABAB0 movs r0, 0x1 - b _080AB63A + b @080AB63A .align 2, 0 .pool -_080AB638: +@080AB638: movs r0, 0 -_080AB63A: +@080AB63A: pop {r1} bx r1 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 @@ -321689,7 +321689,7 @@ pal_fade_2: @ 80AB644 lsls r2, 24 asrs r0, r2, 24 cmp r0, 0 - ble _080AB754 + ble @080AB754 subs r0, 0x1 lsls r0, 24 lsrs r0, 24 @@ -321700,20 +321700,20 @@ pal_fade_2: @ 80AB644 lsrs r0, 24 mov r9, r0 cmp r4, r9 - bcc _080AB67C - b _080AB82E -_080AB67C: + bcc @080AB67C + b @080AB82E +@080AB67C: ldr r1, [sp] lsls r0, r1, 24 asrs r0, 19 str r0, [sp, 0x4] -_080AB684: +@080AB684: ldr r0, =0x03000f50 ldr r0, [r0] adds r0, r4 ldrb r0, [r0] cmp r0, 0 - bne _080AB6C0 + bne @080AB6C0 lsls r1, r6, 1 ldr r0, =0x02037714 adds r0, r1, r0 @@ -321730,12 +321730,12 @@ _080AB684: mov r8, r2 adds r4, 0x1 mov r12, r4 - b _080AB73E + b @080AB73E .align 2, 0 .pool -_080AB6C0: +@080AB6C0: cmp r0, 0x2 - beq _080AB6D4 + beq @080AB6D4 adds r1, r4, 0 subs r1, 0x10 ldr r2, =0x02038454 @@ -321743,17 +321743,17 @@ _080AB6C0: adds r0, r2, r3 ldrb r0, [r0] cmp r1, r0 - bne _080AB6E4 -_080AB6D4: + bne @080AB6E4 +@080AB6D4: ldr r0, =0x020388b4 - b _080AB6EA + b @080AB6EA .align 2, 0 .pool -_080AB6E4: +@080AB6E4: movs r3, 0x80 lsls r3, 2 adds r0, r2, r3 -_080AB6EA: +@080AB6EA: ldr r1, [sp, 0x4] adds r5, r1, r0 movs r7, 0 @@ -321764,7 +321764,7 @@ _080AB6EA: mov r12, r4 ldr r3, =0x02037b14 mov r10, r3 -_080AB6FE: +@080AB6FE: adds r2, r6, 0 lsls r0, r2, 1 ldr r1, =0x02037714 @@ -321796,19 +321796,19 @@ _080AB6FE: lsls r0, 16 lsrs r7, r0, 16 cmp r7, 0xF - bls _080AB6FE -_080AB73E: + bls @080AB6FE +@080AB73E: mov r2, r12 lsls r0, r2, 16 lsrs r4, r0, 16 cmp r0, r8 - bcc _080AB684 - b _080AB82E + bcc @080AB684 + b @080AB82E .align 2, 0 .pool -_080AB754: +@080AB754: cmp r0, 0 - bge _080AB81C + bge @080AB81C mvns r0, r0 lsls r0, 24 lsrs r0, 24 @@ -321820,14 +321820,14 @@ _080AB754: mov r9, r0 adds r4, r3, 0 cmp r4, r9 - bcs _080AB82E -_080AB770: + bcs @080AB82E +@080AB770: ldr r0, =0x03000f50 ldr r0, [r0] adds r0, r4 ldrb r0, [r0] cmp r0, 0 - bne _080AB7AC + bne @080AB7AC lsls r1, r6, 1 ldr r0, =0x02037714 adds r0, r1, r0 @@ -321844,10 +321844,10 @@ _080AB770: mov r8, r3 adds r4, 0x1 mov r12, r4 - b _080AB804 + b @080AB804 .align 2, 0 .pool -_080AB7AC: +@080AB7AC: movs r7, 0 mov r0, r9 lsls r0, 16 @@ -321859,7 +321859,7 @@ _080AB7AC: ldr r2, [sp] lsls r0, r2, 24 asrs r5, r0, 11 -_080AB7C2: +@080AB7C2: lsls r0, r6, 1 ldr r3, =0x02037b14 adds r4, r0, r3 @@ -321892,17 +321892,17 @@ _080AB7C2: lsls r0, 16 lsrs r7, r0, 16 cmp r7, 0xF - bls _080AB7C2 -_080AB804: + bls @080AB7C2 +@080AB804: mov r3, r12 lsls r0, r3, 16 lsrs r4, r0, 16 cmp r0, r8 - bcc _080AB770 - b _080AB82E + bcc @080AB770 + b @080AB82E .align 2, 0 .pool -_080AB81C: +@080AB81C: lsls r1, r4, 5 ldr r0, =0x02037714 adds r0, r1, r0 @@ -321911,7 +321911,7 @@ _080AB81C: mov r3, r9 lsls r2, r3, 3 bl CpuFastSet -_080AB82E: +@080AB82E: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -321925,7 +321925,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 @@ -321966,17 +321966,17 @@ sub_80AB848: @ 80AB848 lsrs r2, 24 adds r4, r0, 0 cmp r4, r10 - bcs _080AB974 + bcs @080AB974 lsls r0, r2, 24 asrs r0, 19 str r0, [sp, 0x10] -_080AB8A0: +@080AB8A0: ldr r0, =0x03000f50 ldr r0, [r0] adds r0, r4 ldrb r0, [r0] cmp r0, 0 - bne _080AB8D4 + bne @080AB8D4 mov r0, sp ldrh r3, [r0] adds r0, r6, 0 @@ -321992,30 +321992,30 @@ _080AB8A0: mov r9, r3 adds r4, 0x1 mov r12, r4 - b _080AB96A + b @080AB96A .align 2, 0 .pool -_080AB8D4: +@080AB8D4: cmp r0, 0x1 - bne _080AB8E4 + bne @080AB8E4 ldr r0, =0x02038654 ldr r1, [sp, 0x10] adds r5, r1, r0 - b _080AB8EA + b @080AB8EA .align 2, 0 .pool -_080AB8E4: +@080AB8E4: ldr r0, =0x020388b4 ldr r3, [sp, 0x10] adds r5, r3, r0 -_080AB8EA: +@080AB8EA: movs r7, 0 mov r0, r10 lsls r0, 16 mov r9, r0 adds r4, 0x1 mov r12, r4 -_080AB8F6: +@080AB8F6: adds r4, r6, 0 lsls r0, r4, 1 ldr r1, =0x02037714 @@ -322073,14 +322073,14 @@ _080AB8F6: lsls r0, 16 lsrs r7, r0, 16 cmp r7, 0xF - bls _080AB8F6 -_080AB96A: + bls @080AB8F6 +@080AB96A: mov r1, r12 lsls r0, r1, 16 lsrs r4, r0, 16 cmp r0, r9 - bcc _080AB8A0 -_080AB974: + bcc @080AB8A0 +@080AB974: add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -322094,7 +322094,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 @@ -322123,13 +322123,13 @@ sub_80AB990: @ 80AB990 mov r10, r0 movs r5, 0 movs r4, 0 -_080AB9C8: +@080AB9C8: ldr r0, =0x03000f50 ldr r0, [r0] adds r0, r4 ldrb r0, [r0] cmp r0, 0 - bne _080AB9F4 + bne @080AB9F4 mov r0, sp ldrh r3, [r0] adds r0, r5, 0 @@ -322142,10 +322142,10 @@ _080AB9C8: lsrs r5, r0, 16 adds r4, 0x1 mov r8, r4 - b _080ABA8A + b @080ABA8A .align 2, 0 .pool -_080AB9F4: +@080AB9F4: movs r0, 0 mov r12, r0 ldr r1, [sp, 0x4] @@ -322155,7 +322155,7 @@ _080AB9F4: movs r7, 0x1E asrs r0, 11 mov r9, r0 -_080ABA06: +@080ABA06: adds r4, r5, 0 lsls r0, r4, 1 ldr r5, =0x02037714 @@ -322221,13 +322221,13 @@ _080ABA06: lsrs r0, 16 mov r12, r0 cmp r0, 0xF - bls _080ABA06 -_080ABA8A: + bls @080ABA06 +@080ABA8A: mov r1, r8 lsls r0, r1, 16 lsrs r4, r0, 16 cmp r4, 0x1F - bls _080AB9C8 + bls @080AB9C8 add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -322241,7 +322241,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 @@ -322271,13 +322271,13 @@ sub_80ABAB0: @ 80ABAB0 lsrs r0, 27 mov r10, r0 movs r4, 0x10 -_080ABAEC: +@080ABAEC: lsls r0, r4, 24 lsrs r0, 24 bl sub_80ABC00 lsls r0, 24 cmp r0, 0 - beq _080ABB9C + beq @080ABB9C adds r0, r4, 0x1 lsls r1, r0, 20 lsrs r1, 16 @@ -322286,10 +322286,10 @@ _080ABAEC: lsrs r6, r1, 16 mov r9, r0 cmp r6, r12 - bcs _080ABBB0 + bcs @080ABBB0 movs r0, 0x1C mov r8, r0 -_080ABB10: +@080ABB10: lsls r5, r6, 1 ldr r0, =0x02037714 adds r0, r5, r0 @@ -322354,11 +322354,11 @@ _080ABB10: lsls r0, 16 lsrs r6, r0, 16 cmp r6, r12 - bcc _080ABB10 - b _080ABBB0 + bcc @080ABB10 + b @080ABBB0 .align 2, 0 .pool -_080ABB9C: +@080ABB9C: lsls r0, r4, 20 lsrs r0, 16 mov r1, sp @@ -322368,12 +322368,12 @@ _080ABB9C: bl pal_fade_1 adds r4, 0x1 mov r9, r4 -_080ABBB0: +@080ABBB0: mov r1, r9 lsls r0, r1, 16 lsrs r4, r0, 16 cmp r4, 0x1F - bls _080ABAEC + bls @080ABAEC add sp, 0xC pop {r3-r5} mov r8, r3 @@ -322385,7 +322385,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 @@ -322394,7 +322394,7 @@ sub_80ABBCC: @ 80ABBCC adds r1, r3, r0 ldrb r0, [r1] cmp r0, 0x5 - bhi _080ABBEE + bhi @080ABBEE ldr r4, =0x000006f4 adds r0, r3, r4 ldrb r3, [r1] @@ -322403,7 +322403,7 @@ sub_80ABBCC: @ 80ABBCC ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_080ABBEE: +@080ABBEE: pop {r4} pop {r0} bx r0 @@ -322412,7 +322412,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 @@ -322422,35 +322422,35 @@ sub_80ABC00: @ 80ABC00 adds r0, r2, r4 ldrb r0, [r0] cmp r1, r0 - bcs _080ABC3E + bcs @080ABC3E ldr r5, =0x000006f4 adds r4, r2, r5 adds r2, r0, 0 -_080ABC1A: +@080ABC1A: adds r0, r1, r4 ldrb r0, [r0] cmp r0, r3 - bne _080ABC34 + bne @080ABC34 movs r0, 0x1 - b _080ABC40 + b @080ABC40 .align 2, 0 .pool -_080ABC34: +@080ABC34: adds r0, r1, 0x1 lsls r0, 16 lsrs r1, r0, 16 cmp r1, r2 - bcc _080ABC1A -_080ABC3E: + bcc @080ABC1A +@080ABC3E: movs r0, 0 -_080ABC40: +@080ABC40: pop {r4,r5} pop {r1} bx r1 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 @@ -322459,7 +322459,7 @@ sub_80ABC48: @ 80ABC48 adds r0, r5, r1 ldrb r0, [r0] cmp r0, 0x3 - bne _080ABC6E + bne @080ABC6E lsls r2, r4, 24 asrs r2, 24 movs r0, 0 @@ -322469,7 +322469,7 @@ sub_80ABC48: @ 80ABC48 lsls r1, 3 adds r0, r5, r1 strb r4, [r0] -_080ABC6E: +@080ABC6E: pop {r4,r5} pop {r0} bx r0 @@ -322478,7 +322478,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 @@ -322491,7 +322491,7 @@ sub_80ABC7C: @ 80ABC7C adds r2, r3, r0 ldrb r0, [r2] cmp r0, 0x3 - bne _080ABCBC + bne @080ABCBC movs r1, 0 strb r1, [r2] movs r2, 0xD8 @@ -322510,7 +322510,7 @@ sub_80ABC7C: @ 80ABC7C lsls r0, r4, 24 asrs r0, 24 bl sub_80ABC48 -_080ABCBC: +@080ABCBC: pop {r4-r6} pop {r0} bx r0 @@ -322519,7 +322519,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 @@ -322528,67 +322528,67 @@ fade_screen: @ 80ABCD0 lsls r1, 24 lsrs r5, r1, 24 cmp r0, 0x1 - beq _080ABD08 + beq @080ABD08 cmp r0, 0x1 - bgt _080ABCEC + bgt @080ABCEC cmp r0, 0 - beq _080ABCF6 - b _080ABDE4 -_080ABCEC: + beq @080ABCF6 + b @080ABDE4 +@080ABCEC: cmp r2, 0x2 - beq _080ABCFC + beq @080ABCFC cmp r2, 0x3 - beq _080ABD0C - b _080ABDE4 -_080ABCF6: + beq @080ABD0C + b @080ABDE4 +@080ABCF6: movs r4, 0 movs r1, 0 - b _080ABD10 -_080ABCFC: + b @080ABD10 +@080ABCFC: ldr r4, =0x0000ffff movs r1, 0 - b _080ABD10 + b @080ABD10 .align 2, 0 .pool -_080ABD08: +@080ABD08: movs r4, 0 - b _080ABD0E -_080ABD0C: + b @080ABD0E +@080ABD0C: ldr r4, =0x0000ffff -_080ABD0E: +@080ABD0E: movs r1, 0x1 -_080ABD10: +@080ABD10: ldr r0, =0x02038454 movs r2, 0xDA lsls r2, 3 adds r0, r2 ldrb r0, [r0] cmp r0, 0x3 - blt _080ABD38 + blt @080ABD38 cmp r0, 0x6 - ble _080ABD2A + ble @080ABD2A cmp r0, 0xD - bgt _080ABD38 + bgt @080ABD38 cmp r0, 0xB - blt _080ABD38 -_080ABD2A: + blt @080ABD38 +@080ABD2A: movs r2, 0x1 - b _080ABD3A + b @080ABD3A .align 2, 0 .pool -_080ABD38: +@080ABD38: movs r2, 0 -_080ABD3A: +@080ABD3A: cmp r1, 0 - beq _080ABD7C + beq @080ABD7C cmp r2, 0 - beq _080ABD4E + beq @080ABD4E ldr r0, =0x02037b14 ldr r1, =0x02037714 movs r2, 0x80 lsls r2, 1 bl CpuFastSet -_080ABD4E: +@080ABD4E: movs r0, 0x1 negs r0, r0 lsls r1, r5, 24 @@ -322602,24 +322602,24 @@ _080ABD4E: adds r0, r3 movs r1, 0x2 strb r1, [r0] - b _080ABDE4 + b @080ABDE4 .align 2, 0 .pool -_080ABD7C: +@080ABD7C: ldr r1, =0x02038454 ldr r3, =0x000006c4 adds r0, r1, r3 strh r4, [r0] cmp r2, 0 - beq _080ABDA0 + beq @080ABDA0 ldr r0, =0x000006c7 adds r1, r0 movs r0, 0 strb r0, [r1] - b _080ABDB2 + b @080ABDB2 .align 2, 0 .pool -_080ABDA0: +@080ABDA0: movs r0, 0x1 negs r0, r0 lsls r1, r5, 24 @@ -322628,7 +322628,7 @@ _080ABDA0: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 -_080ABDB2: +@080ABDB2: ldr r4, =0x02038454 ldr r1, =0x000006c6 adds r0, r4, r1 @@ -322653,7 +322653,7 @@ _080ABDB2: lsls r3, 3 adds r4, r3 strb r5, [r4] -_080ABDE4: +@080ABDE4: add sp, 0x4 pop {r4,r5} pop {r0} @@ -322663,7 +322663,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 @@ -322679,7 +322679,7 @@ sub_80ABDFC: @ 80ABDFC thumb_func_end sub_80ABDFC thumb_func_start sub_80ABE18 -sub_80ABE18: @ 80ABE18 +sub_80ABE18: ; 80ABE18 push {r4-r6,lr} lsls r0, 24 lsrs r0, 8 @@ -322693,14 +322693,14 @@ sub_80ABE18: @ 80ABE18 ldrb r0, [r0] adds r1, r5, 0 cmp r0, 0x1 - beq _080ABE60 + beq @080ABE60 cmp r0, 0x2 - beq _080ABEAC + beq @080ABEAC adds r2, 0xA adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x6 - beq _080ABEE4 + beq @080ABEE4 lsls r0, r4, 24 lsrs r0, 24 subs r2, 0x10 @@ -322709,31 +322709,31 @@ sub_80ABE18: @ 80ABE18 ldrsb r2, [r1, r2] movs r1, 0x1 bl pal_fade_2 - b _080ABEF4 + b @080ABEF4 .align 2, 0 .pool -_080ABE60: +@080ABE60: ldr r2, =0x000006ca adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080ABEF4 + beq @080ABEF4 adds r2, 0x6 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x6 - bne _080ABE7C + bne @080ABE7C lsls r0, r4, 24 lsrs r0, 24 bl sub_80ABBCC -_080ABE7C: +@080ABE7C: lsls r0, r4, 20 lsrs r4, r0, 16 movs r2, 0 ldr r6, =0x02037b14 ldr r0, =0x000006c4 adds r3, r5, r0 -_080ABE88: +@080ABE88: adds r0, r4, r2 lsls r0, 1 adds r0, r6 @@ -322743,11 +322743,11 @@ _080ABE88: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0xF - bls _080ABE88 - b _080ABEF4 + bls @080ABE88 + b @080ABEF4 .align 2, 0 .pool -_080ABEAC: +@080ABEAC: lsls r0, r4, 20 lsrs r4, r0, 16 lsls r1, r4, 1 @@ -322767,10 +322767,10 @@ _080ABEAC: adds r0, r4, 0 movs r1, 0x10 bl pal_fade_1 - b _080ABEF4 + b @080ABEF4 .align 2, 0 .pool -_080ABEE4: +@080ABEE4: lsls r0, r4, 20 lsrs r4, r0, 16 ldr r3, =0x000073fc @@ -322778,7 +322778,7 @@ _080ABEE4: movs r1, 0x10 movs r2, 0xC bl pal_fade_1 -_080ABEF4: +@080ABEF4: pop {r4-r6} pop {r0} bx r0 @@ -322787,7 +322787,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 @@ -322806,23 +322806,23 @@ 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 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x1 - beq _080ABF3C + beq @080ABF3C movs r0, 0 - b _080ABF42 + b @080ABF42 .align 2, 0 .pool -_080ABF3C: +@080ABF3C: ldr r2, =0x000006ca adds r0, r1, r2 ldrb r0, [r0] -_080ABF42: +@080ABF42: pop {r1} bx r1 .align 2, 0 @@ -322830,7 +322830,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 @@ -322853,7 +322853,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] @@ -322861,7 +322861,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 @@ -322876,7 +322876,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 @@ -322884,7 +322884,7 @@ sub_80ABFA4: @ 80ABFA4 movs r0, 0 ldrsb r0, [r4, r0] cmp r0, 0x1F - bgt _080ABFD8 + bgt @080ABFD8 ldr r0, =0x0000074e adds r1, r0 adds r0, r4, 0 @@ -322892,21 +322892,21 @@ sub_80ABFA4: @ 80ABFA4 movs r0, 0 ldrsb r0, [r4, r0] cmp r0, 0x1F - bgt _080ABFD8 + bgt @080ABFD8 movs r0, 0x1 - b _080ABFDA + b @080ABFDA .align 2, 0 .pool -_080ABFD8: +@080ABFD8: movs r0, 0 -_080ABFDA: +@080ABFDA: pop {r4} pop {r1} bx r1 thumb_func_end sub_80ABFA4 thumb_func_start sub_80ABFE0 -sub_80ABFE0: @ 80ABFE0 +sub_80ABFE0: ; 80ABFE0 push {lr} lsls r0, 24 asrs r0, 24 @@ -322917,7 +322917,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 @@ -322939,7 +322939,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 @@ -322947,19 +322947,19 @@ sub_80AC01C: @ 80AC01C movs r2, 0 ldrsh r1, [r7, r2] cmp r1, 0x1 - beq _080AC090 + beq @080AC090 cmp r1, 0x1 - bgt _080AC040 + bgt @080AC040 cmp r1, 0 - beq _080AC046 - b _080AC118 + beq @080AC046 + b @080AC118 .align 2, 0 .pool -_080AC040: +@080AC040: cmp r1, 0x2 - beq _080AC0E4 - b _080AC118 -_080AC046: + beq @080AC0E4 + b @080AC118 +@080AC046: movs r3, 0xE8 lsls r3, 3 adds r6, r5, r3 @@ -322969,7 +322969,7 @@ _080AC046: lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - ble _080AC118 + ble @080AC118 strh r1, [r6] ldr r0, =0x0000073c adds r4, r5, r0 @@ -322983,7 +322983,7 @@ _080AC046: movs r2, 0 ldrsh r0, [r4, r2] cmp r0, 0x5 - ble _080AC118 + ble @080AC118 ldr r3, =0x0000073e adds r0, r5, r3 strh r1, [r0] @@ -322991,10 +322991,10 @@ _080AC046: strh r0, [r7] movs r0, 0x3C strh r0, [r6] - b _080AC118 + b @080AC118 .align 2, 0 .pool -_080AC090: +@080AC090: movs r0, 0xE8 lsls r0, 3 adds r2, r5, r0 @@ -323022,17 +323022,17 @@ _080AC090: movs r3, 0 ldrsh r1, [r4, r3] cmp r0, r1 - beq _080AC0D0 + beq @080AC0D0 lsls r0, r2, 24 asrs r0, 24 bl sub_80ABFE0 -_080AC0D0: +@080AC0D0: ldrh r0, [r6] strh r0, [r4] - b _080AC118 + b @080AC118 .align 2, 0 .pool -_080AC0E4: +@080AC0E4: movs r0, 0xE8 lsls r0, 3 adds r1, r5, r0 @@ -323043,7 +323043,7 @@ _080AC0E4: lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - ble _080AC118 + ble @080AC118 strh r6, [r1] ldr r1, =0x0000073c adds r4, r5, r1 @@ -323056,9 +323056,9 @@ _080AC0E4: movs r2, 0 ldrsh r0, [r4, r2] cmp r0, 0x3 - bne _080AC118 + bne @080AC118 strh r6, [r7] -_080AC118: +@080AC118: pop {r4-r7} pop {r0} bx r0 @@ -323067,7 +323067,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 @@ -323099,7 +323099,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 @@ -323131,7 +323131,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 @@ -323143,7 +323143,7 @@ sub_80AC1A8: @ 80AC1A8 ldr r1, [r4] adds r5, r0, 0 cmp r2, r1 - beq _080AC26C + beq @080AC26C ldr r0, =0x00000739 adds r2, r5, r0 ldrb r0, [r2] @@ -323155,7 +323155,7 @@ sub_80AC1A8: @ 80AC1A8 lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bls _080AC238 + bls @080AC238 movs r0, 0 strb r0, [r2] movs r0, 0xE7 @@ -323167,17 +323167,17 @@ sub_80AC1A8: @ 80AC1A8 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _080AC210 + beq @080AC210 ldrh r1, [r3] adds r2, r1, 0 ldrh r0, [r4] cmp r2, r0 - bcs _080AC230 + bcs @080AC230 adds r0, r1, 0x1 - b _080AC236 + b @080AC236 .align 2, 0 .pool -_080AC210: +@080AC210: ldr r1, =0x00000732 adds r3, r5, r1 ldr r2, =0x00000736 @@ -323186,18 +323186,18 @@ _080AC210: adds r2, r1, 0 ldrh r0, [r0] cmp r2, r0 - bcs _080AC230 + bcs @080AC230 adds r0, r1, 0x1 - b _080AC236 + b @080AC236 .align 2, 0 .pool -_080AC230: +@080AC230: cmp r2, r0 - bls _080AC238 + bls @080AC238 subs r0, r1, 0x1 -_080AC236: +@080AC236: strh r0, [r3] -_080AC238: +@080AC238: ldr r6, =0x00000732 adds r0, r5, r6 ldrh r1, [r0] @@ -323216,92 +323216,92 @@ _080AC238: adds r0, r5, r2 ldr r0, [r0] cmp r1, r0 - beq _080AC26C + beq @080AC26C movs r0, 0 - b _080AC26E + b @080AC26E .align 2, 0 .pool -_080AC26C: +@080AC26C: movs r0, 0x1 -_080AC26E: +@080AC26E: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_80AC1A8 thumb_func_start sub_80AC274 -sub_80AC274: @ 80AC274 +sub_80AC274: ; 80AC274 push {lr} lsls r0, 24 lsrs r0, 24 subs r0, 0x1 cmp r0, 0x9 - bhi _080AC306 + bhi @080AC306 lsls r0, 2 - ldr r1, =_080AC290 + ldr r1, =@080AC290 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080AC290: - .4byte _080AC2B8 - .4byte _080AC2C0 - .4byte _080AC2C8 - .4byte _080AC2D0 - .4byte _080AC2D8 - .4byte _080AC2E0 - .4byte _080AC2E8 - .4byte _080AC2F0 - .4byte _080AC2F8 - .4byte _080AC300 -_080AC2B8: +@080AC290: + .4byte @080AC2B8 + .4byte @080AC2C0 + .4byte @080AC2C8 + .4byte @080AC2D0 + .4byte @080AC2D8 + .4byte @080AC2E0 + .4byte @080AC2E8 + .4byte @080AC2F0 + .4byte @080AC2F8 + .4byte @080AC300 +@080AC2B8: movs r0, 0x1 bl sub_80AEDF0 - b _080AC306 -_080AC2C0: + b @080AC306 +@080AC2C0: movs r0, 0x2 bl sub_80AEDF0 - b _080AC306 -_080AC2C8: + b @080AC306 +@080AC2C8: movs r0, 0x3 bl sub_80AEDF0 - b _080AC306 -_080AC2D0: + b @080AC306 +@080AC2D0: movs r0, 0x4 bl sub_80AEDF0 - b _080AC306 -_080AC2D8: + b @080AC306 +@080AC2D8: movs r0, 0x5 bl sub_80AEDF0 - b _080AC306 -_080AC2E0: + b @080AC306 +@080AC2E0: movs r0, 0x6 bl sub_80AEDF0 - b _080AC306 -_080AC2E8: + b @080AC306 +@080AC2E8: movs r0, 0x9 bl sub_80AEDF0 - b _080AC306 -_080AC2F0: + b @080AC306 +@080AC2F0: movs r0, 0x7 bl sub_80AEDF0 - b _080AC306 -_080AC2F8: + b @080AC306 +@080AC2F8: movs r0, 0x8 bl sub_80AEDF0 - b _080AC306 -_080AC300: + b @080AC306 +@080AC300: movs r0, 0xB bl sub_80AEDF0 -_080AC306: +@080AC306: pop {r0} bx r0 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 @@ -323313,7 +323313,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 @@ -323322,41 +323322,41 @@ sub_80AC31C: @ 80AC31C adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0x2 - beq _080AC36E + beq @080AC36E cmp r2, 0x53 - beq _080AC354 + beq @080AC354 cmp r2, 0x53 - bgt _080AC344 + bgt @080AC344 cmp r2, 0x51 - beq _080AC360 - b _080AC36E + beq @080AC360 + b @080AC36E .align 2, 0 .pool -_080AC344: +@080AC344: cmp r2, 0x55 - bne _080AC36E + bne @080AC36E ldr r0, =0x000006dd adds r1, r0 movs r0, 0 - b _080AC366 + b @080AC366 .align 2, 0 .pool -_080AC354: +@080AC354: ldr r3, =0x000006dd adds r1, r3 movs r0, 0x1 - b _080AC366 + b @080AC366 .align 2, 0 .pool -_080AC360: +@080AC360: ldr r0, =0x000006dd adds r1, r0 movs r0, 0x2 -_080AC366: +@080AC366: strb r0, [r1] adds r0, r2, 0 bl audio_play -_080AC36E: +@080AC36E: pop {r0} bx r0 .align 2, 0 @@ -323364,41 +323364,41 @@ _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 cmp r0, 0 - beq _080AC3B6 + beq @080AC3B6 ldr r0, =0x02038454 ldr r1, =0x000006dd adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - beq _080AC3A8 + beq @080AC3A8 cmp r0, 0x1 - bgt _080AC3B0 + bgt @080AC3B0 cmp r0, 0 - bne _080AC3B0 + bne @080AC3B0 movs r0, 0x56 bl audio_play - b _080AC3B6 + b @080AC3B6 .align 2, 0 .pool -_080AC3A8: +@080AC3A8: movs r0, 0x54 bl audio_play - b _080AC3B6 -_080AC3B0: + b @080AC3B6 +@080AC3B0: movs r0, 0x52 bl audio_play -_080AC3B6: +@080AC3B6: pop {r0} bx r0 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 @@ -323409,7 +323409,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 @@ -323421,7 +323421,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 @@ -323433,7 +323433,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 @@ -323456,7 +323456,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, =0x0854c250 str r0, [r1] @@ -323466,7 +323466,7 @@ sub_80AC428: @ 80AC428 thumb_func_end sub_80AC428 thumb_func_start sub_80AC438 -sub_80AC438: @ 80AC438 +sub_80AC438: ; 80AC438 push {lr} ldr r0, =0x0854c14c ldr r0, [r0] @@ -323488,11 +323488,11 @@ sub_80AC438: @ 80AC438 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _080AC46C + bne @080AC46C movs r0, 0 movs r1, 0x10 bl sub_80AC124 -_080AC46C: +@080AC46C: pop {r0} bx r0 .align 2, 0 @@ -323500,7 +323500,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, =0x0854c14c @@ -323509,14 +323509,14 @@ sub_80AC484: @ 80AC484 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - bne _080AC4A4 + bne @080AC4A4 adds r4, r1, r2 -_080AC49A: +@080AC49A: bl sub_80AC4B4 ldrb r0, [r4] cmp r0, 0 - beq _080AC49A -_080AC4A4: + beq @080AC49A +@080AC4A4: pop {r4} pop {r0} bx r0 @@ -323525,7 +323525,7 @@ _080AC4A4: thumb_func_end sub_80AC484 thumb_func_start sub_80AC4B4 -sub_80AC4B4: @ 80AC4B4 +sub_80AC4B4: ; 80AC4B4 push {r4,r5,lr} ldr r0, =0x0854c14c ldr r5, [r0] @@ -323533,41 +323533,41 @@ sub_80AC4B4: @ 80AC4B4 adds r4, r5, r0 ldrh r0, [r4] cmp r0, 0x1 - beq _080AC4E4 + beq @080AC4E4 cmp r0, 0x1 - bgt _080AC4D8 + bgt @080AC4D8 cmp r0, 0 - beq _080AC4DE - b _080AC508 + beq @080AC4DE + b @080AC508 .align 2, 0 .pool -_080AC4D8: +@080AC4D8: cmp r0, 0x2 - beq _080AC4F0 - b _080AC508 -_080AC4DE: + beq @080AC4F0 + b @080AC508 +@080AC4DE: bl sub_80AC594 - b _080AC502 -_080AC4E4: + b @080AC502 +@080AC4E4: movs r0, 0xC movs r1, 0x8 movs r2, 0x1 bl sub_80AC164 - b _080AC502 -_080AC4F0: + b @080AC502 +@080AC4F0: bl sub_80AC1A8 lsls r0, 24 cmp r0, 0 - beq _080AC508 + beq @080AC508 ldr r0, =0x000006d2 adds r1, r5, r0 movs r0, 0x1 strb r0, [r1] -_080AC502: +@080AC502: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -_080AC508: +@080AC508: pop {r4,r5} pop {r0} bx r0 @@ -323576,7 +323576,7 @@ _080AC508: thumb_func_end sub_80AC4B4 thumb_func_start sub_80AC514 -sub_80AC514: @ 80AC514 +sub_80AC514: ; 80AC514 push {r4,lr} ldr r0, =0x0854c14c ldr r0, [r0] @@ -323584,39 +323584,39 @@ sub_80AC514: @ 80AC514 adds r4, r0, r1 ldrh r0, [r4] cmp r0, 0 - beq _080AC534 + beq @080AC534 cmp r0, 0x1 - beq _080AC540 + beq @080AC540 movs r0, 0 - b _080AC556 + b @080AC556 .align 2, 0 .pool -_080AC534: +@080AC534: movs r0, 0 movs r1, 0x10 movs r2, 0x1 bl sub_80AC164 - b _080AC54E -_080AC540: + b @080AC54E +@080AC540: bl sub_80AC1A8 lsls r0, 24 cmp r0, 0 - beq _080AC554 + beq @080AC554 bl sub_80AC660 -_080AC54E: +@080AC54E: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -_080AC554: +@080AC554: movs r0, 0x1 -_080AC556: +@080AC556: pop {r4} pop {r1} bx r1 thumb_func_end sub_80AC514 thumb_func_start sub_80AC55C -sub_80AC55C: @ 80AC55C +sub_80AC55C: ; 80AC55C ldr r0, =0x0854c14c ldr r1, [r0] ldr r0, =0x000006c1 @@ -323633,7 +323633,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} @@ -323641,18 +323641,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, =0x0854c14c ldr r0, [r0] @@ -323660,13 +323660,13 @@ sub_80AC594: @ 80AC594 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - beq _080AC650 + beq @080AC650 ldr r0, =0x0854fb5c bl gpu_tile_obj_alloc_tag_and_copy_to_vram ldr r0, =0x0854c290 bl sub_80ABF4C movs r5, 0 -_080AC5B2: +@080AC5B2: ldr r0, =0x0854fb78 movs r1, 0 movs r2, 0 @@ -323675,7 +323675,7 @@ _080AC5B2: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 - beq _080AC628 + beq @080AC628 ldr r0, =0x0854c14c ldr r1, [r0] lsls r2, r5, 2 @@ -323709,10 +323709,10 @@ _080AC5B2: movs r1, 0x2 orrs r0, r1 strb r0, [r4] - b _080AC63A + b @080AC63A .align 2, 0 .pool -_080AC628: +@080AC628: ldr r0, =0x0854c14c ldr r1, [r0] lsls r0, r5, 2 @@ -323722,19 +323722,19 @@ _080AC628: adds r1, r0 movs r0, 0 str r0, [r1] -_080AC63A: +@080AC63A: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x2 - bls _080AC5B2 + bls @080AC5B2 ldr r0, =0x0854c14c ldr r0, [r0] ldr r1, =0x000006de adds r0, r1 movs r1, 0x1 strb r1, [r0] -_080AC650: +@080AC650: pop {r4,r5} pop {r0} bx r0 @@ -323743,7 +323743,7 @@ _080AC650: thumb_func_end sub_80AC594 thumb_func_start sub_80AC660 -sub_80AC660: @ 80AC660 +sub_80AC660: ; 80AC660 push {r4,r5,lr} ldr r0, =0x0854c14c ldr r1, [r0] @@ -323751,24 +323751,24 @@ sub_80AC660: @ 80AC660 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080AC6A4 + beq @080AC6A4 movs r4, 0 movs r0, 0xFA lsls r0, 1 adds r5, r1, r0 -_080AC678: +@080AC678: lsls r0, r4, 2 adds r0, r5, r0 ldr r0, [r0] cmp r0, 0 - beq _080AC686 + beq @080AC686 bl obj_delete_and_free_tiles -_080AC686: +@080AC686: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x2 - bls _080AC678 + bls @080AC678 movs r0, 0x90 lsls r0, 5 bl gpu_tile_obj_free_by_tag @@ -323778,7 +323778,7 @@ _080AC686: adds r0, r1 movs r1, 0 strb r1, [r0] -_080AC6A4: +@080AC6A4: pop {r4,r5} pop {r0} bx r0 @@ -323787,7 +323787,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] @@ -323796,17 +323796,17 @@ sub_80AC6B4: @ 80AC6B4 ands r0, r1 strh r0, [r2, 0x2E] cmp r0, 0 - beq _080AC6CC + beq @080AC6CC ldrh r0, [r2, 0x20] subs r0, 0x1 strh r0, [r2, 0x20] -_080AC6CC: +@080AC6CC: pop {r0} bx r0 thumb_func_end sub_80AC6B4 thumb_func_start sub_80AC6D0 -sub_80AC6D0: @ 80AC6D0 +sub_80AC6D0: ; 80AC6D0 ldr r0, =0x0854c14c ldr r1, [r0] ldr r0, =0x000006cc @@ -323829,7 +323829,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, =0x0854c14c @@ -323838,14 +323838,14 @@ sub_80AC704: @ 80AC704 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - bne _080AC724 + bne @080AC724 adds r4, r1, r2 -_080AC71A: +@080AC71A: bl sub_80AC734 ldrb r0, [r4] cmp r0, 0 - beq _080AC71A -_080AC724: + beq @080AC71A +@080AC724: pop {r4} pop {r0} bx r0 @@ -323854,7 +323854,7 @@ _080AC724: thumb_func_end sub_80AC704 thumb_func_start sub_80AC734 -sub_80AC734: @ 80AC734 +sub_80AC734: ; 80AC734 push {lr} ldr r1, =0x0854c14c ldr r0, [r1] @@ -323863,64 +323863,64 @@ sub_80AC734: @ 80AC734 ldrh r0, [r0] adds r2, r1, 0 cmp r0, 0x4 - bhi _080AC810 + bhi @080AC810 lsls r0, 2 - ldr r1, =_080AC75C + ldr r1, =@080AC75C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080AC75C: - .4byte _080AC770 - .4byte _080AC78C - .4byte _080AC7A4 - .4byte _080AC7C0 - .4byte _080AC7D8 -_080AC770: +@080AC75C: + .4byte @080AC770 + .4byte @080AC78C + .4byte @080AC7A4 + .4byte @080AC7C0 + .4byte @080AC7D8 +@080AC770: ldr r1, [r2] ldr r2, =0x000006c6 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080AC814 + beq @080AC814 ldr r0, =0x000006cc adds r1, r0 - b _080AC7F8 + b @080AC7F8 .align 2, 0 .pool -_080AC78C: +@080AC78C: bl sub_80ABF84 ldr r0, =0x0854c14c ldr r1, [r0] ldr r2, =0x000006cc adds r1, r2 - b _080AC7F8 + b @080AC7F8 .align 2, 0 .pool -_080AC7A4: +@080AC7A4: bl sub_80ABFA4 lsls r0, 24 cmp r0, 0 - bne _080AC814 + bne @080AC814 ldr r0, =0x0854c14c ldr r1, [r0] ldr r0, =0x000006cc adds r1, r0 - b _080AC7F8 + b @080AC7F8 .align 2, 0 .pool -_080AC7C0: +@080AC7C0: bl sub_80ABFF0 ldr r0, =0x0854c14c ldr r1, [r0] ldr r2, =0x000006cc adds r1, r2 - b _080AC7F8 + b @080AC7F8 .align 2, 0 .pool -_080AC7D8: +@080AC7D8: bl sub_80AC01C ldr r0, =0x0854c14c ldr r2, [r0] @@ -323929,35 +323929,35 @@ _080AC7D8: movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x6 - bne _080AC814 + bne @080AC814 ldr r0, =0x000006d2 adds r1, r2, r0 movs r0, 0x1 strb r0, [r1] ldr r0, =0x000006cc adds r1, r2, r0 -_080AC7F8: +@080AC7F8: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _080AC814 + b @080AC814 .align 2, 0 .pool -_080AC810: +@080AC810: bl sub_80AC01C -_080AC814: +@080AC814: pop {r0} bx r0 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 + 1 movs r1, 0x50 @@ -323969,7 +323969,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 @@ -323981,22 +323981,22 @@ task50_0807B6D4: @ 80AC830 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x4 - bhi _080AC922 + bhi @080AC922 lsls r0, 2 - ldr r1, =_080AC85C + ldr r1, =@080AC85C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080AC85C: - .4byte _080AC870 - .4byte _080AC89A - .4byte _080AC8C8 - .4byte _080AC8F8 - .4byte _080AC918 -_080AC870: +@080AC85C: + .4byte @080AC870 + .4byte @080AC89A + .4byte @080AC8C8 + .4byte @080AC8F8 + .4byte @080AC918 +@080AC870: movs r0, 0 strh r0, [r4, 0xA] strh r0, [r4, 0xC] @@ -324015,28 +324015,28 @@ _080AC870: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080AC89A: +@080AC89A: ldrh r0, [r4, 0xA] adds r0, 0x3 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x10 - ble _080AC8AC + ble @080AC8AC movs r0, 0x10 strh r0, [r4, 0xA] -_080AC8AC: +@080AC8AC: ldrh r1, [r4, 0xA] movs r0, 0x54 bl lcd_io_set movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0xF - ble _080AC922 - b _080AC910 + ble @080AC922 + b @080AC910 .align 2, 0 .pool -_080AC8C8: +@080AC8C8: ldrh r0, [r4, 0xC] adds r0, 0x1 movs r1, 0 @@ -324044,24 +324044,24 @@ _080AC8C8: lsls r0, 16 asrs r0, 16 cmp r0, 0x9 - ble _080AC922 + ble @080AC922 strh r1, [r4, 0xC] ldrh r0, [r4, 0xA] subs r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 cmp r0, 0 - bgt _080AC8EE + bgt @080AC8EE strh r1, [r4, 0xA] ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080AC8EE: +@080AC8EE: ldrh r1, [r4, 0xA] movs r0, 0x54 bl lcd_io_set - b _080AC922 -_080AC8F8: + b @080AC922 +@080AC8F8: movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -324071,23 +324071,23 @@ _080AC8F8: ldrh r1, [r4, 0xE] movs r0, 0x48 bl lcd_io_set -_080AC910: +@080AC910: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080AC922 -_080AC918: + b @080AC922 +@080AC918: bl script_env_2_enable_and_set_ctx_running adds r0, r5, 0 bl remove_task -_080AC922: +@080AC922: pop {r4,r5} pop {r0} bx r0 thumb_func_end task50_0807B6D4 thumb_func_start sub_80AC928 -sub_80AC928: @ 80AC928 +sub_80AC928: ; 80AC928 push {r4,lr} ldr r0, =0x0854c14c ldr r1, [r0] @@ -324131,7 +324131,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, =0x0854c14c @@ -324140,14 +324140,14 @@ sub_80AC994: @ 80AC994 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - bne _080AC9B4 + bne @080AC9B4 adds r4, r1, r2 -_080AC9AA: +@080AC9AA: bl sub_80AC9C4 ldrb r0, [r4] cmp r0, 0 - beq _080AC9AA -_080AC9B4: + beq @080AC9AA +@080AC9B4: pop {r4} pop {r0} bx r0 @@ -324156,7 +324156,7 @@ _080AC9B4: thumb_func_end sub_80AC994 thumb_func_start sub_80AC9C4 -sub_80AC9C4: @ 80AC9C4 +sub_80AC9C4: ; 80AC9C4 push {r4,r5,lr} ldr r0, =0x0854c14c ldr r5, [r0] @@ -324164,41 +324164,41 @@ sub_80AC9C4: @ 80AC9C4 adds r4, r5, r0 ldrh r0, [r4] cmp r0, 0x1 - beq _080AC9F4 + beq @080AC9F4 cmp r0, 0x1 - bgt _080AC9E8 + bgt @080AC9E8 cmp r0, 0 - beq _080AC9EE - b _080ACA18 + beq @080AC9EE + b @080ACA18 .align 2, 0 .pool -_080AC9E8: +@080AC9E8: cmp r0, 0x2 - beq _080ACA00 - b _080ACA18 -_080AC9EE: + beq @080ACA00 + b @080ACA18 +@080AC9EE: bl sub_80ACD68 - b _080ACA12 -_080AC9F4: + b @080ACA12 +@080AC9F4: bl sub_80ACD78 lsls r0, 24 cmp r0, 0 - bne _080ACA18 - b _080ACA12 -_080ACA00: + bne @080ACA18 + b @080ACA12 +@080ACA00: bl sub_80ACEAC lsls r0, 24 cmp r0, 0 - bne _080ACA18 + bne @080ACA18 ldr r0, =0x000006d2 adds r1, r5, r0 movs r0, 0x1 strb r0, [r1] -_080ACA12: +@080ACA12: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -_080ACA18: +@080ACA18: pop {r4,r5} pop {r0} bx r0 @@ -324207,7 +324207,7 @@ _080ACA18: thumb_func_end sub_80AC9C4 thumb_func_start sub_80ACA24 -sub_80ACA24: @ 80ACA24 +sub_80ACA24: ; 80ACA24 push {r4,r5,lr} ldr r0, =0x0854c14c ldr r2, [r0] @@ -324216,45 +324216,45 @@ sub_80ACA24: @ 80ACA24 ldrh r1, [r3] adds r4, r0, 0 cmp r1, 0 - beq _080ACA48 + beq @080ACA48 cmp r1, 0x1 - beq _080ACA7C + beq @080ACA7C movs r0, 0 - b _080ACAAA + b @080ACAAA .align 2, 0 .pool -_080ACA48: +@080ACA48: ldr r5, =0x000006d1 adds r0, r2, r5 ldrb r0, [r0] cmp r0, 0x3 - beq _080ACA5A + beq @080ACA5A cmp r0, 0x5 - beq _080ACA5A + beq @080ACA5A cmp r0, 0xD - bne _080ACA70 -_080ACA5A: + bne @080ACA70 +@080ACA5A: ldr r0, [r4] ldr r1, =0x000006ce adds r0, r1 movs r1, 0xFF strh r1, [r0] movs r0, 0 - b _080ACAAA + b @080ACAAA .align 2, 0 .pool -_080ACA70: +@080ACA70: ldr r4, =0x000006d9 adds r0, r2, r4 strb r1, [r0] ldrh r0, [r3] adds r0, 0x1 strh r0, [r3] -_080ACA7C: +@080ACA7C: bl sub_80ACEAC lsls r0, 24 cmp r0, 0 - bne _080ACAA8 + bne @080ACAA8 bl sub_80ACF38 ldr r0, =0x0854c14c ldr r1, [r0] @@ -324264,19 +324264,19 @@ _080ACA7C: adds r0, 0x1 strh r0, [r1] movs r0, 0 - b _080ACAAA + b @080ACAAA .align 2, 0 .pool -_080ACAA8: +@080ACAA8: movs r0, 0x1 -_080ACAAA: +@080ACAAA: pop {r4,r5} pop {r1} bx r1 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} @@ -324284,10 +324284,10 @@ sub_80ACAB0: @ 80ACAB0 movs r1, 0x30 ldrsh r0, [r7, r1] cmp r0, 0 - bne _080ACAC4 + bne @080ACAC4 ldr r0, =0x00000169 strh r0, [r7, 0x30] -_080ACAC4: +@080ACAC4: movs r2, 0x30 ldrsh r1, [r7, r2] ldr r0, =0x41c64e6d @@ -324370,13 +324370,13 @@ _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 ldrsh r0, [r5, r1] cmp r0, 0 - bne _080ACC60 + bne @080ACC60 ldr r3, =0x0854fc44 ldr r4, =0x0854c14c ldr r2, [r4] @@ -324407,37 +324407,37 @@ sub_80ACB84: @ 80ACB84 ldrsh r0, [r5, r3] adds r3, r4, 0 cmp r0, 0 - beq _080ACC04 + beq @080ACC04 adds r0, r1, 0 adds r0, 0x8 lsls r0, 16 movs r1, 0x80 lsls r1, 17 cmp r0, r1 - bhi _080ACC04 + bhi @080ACC04 adds r1, r2, 0 movs r0, 0x10 negs r0, r0 cmp r1, r0 - blt _080ACC04 + blt @080ACC04 cmp r1, 0xB0 - bgt _080ACC04 + bgt @080ACC04 adds r0, r5, 0 adds r0, 0x3E ldrb r2, [r0] movs r1, 0x5 negs r1, r1 ands r1, r2 - b _080ACC0E + b @080ACC0E .align 2, 0 .pool -_080ACC04: +@080ACC04: adds r0, r5, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 -_080ACC0E: +@080ACC0E: strb r1, [r0] adds r4, r0, 0 ldrh r0, [r5, 0x2E] @@ -324445,7 +324445,7 @@ _080ACC0E: strh r0, [r5, 0x2E] lsls r0, 16 cmp r0, 0 - bne _080ACC80 + bne @080ACC80 ldr r0, [r3] ldr r1, =0x000006dc adds r0, r1 @@ -324471,17 +324471,17 @@ _080ACC0E: movs r1, 0x2 orrs r0, r1 strb r0, [r4] - b _080ACC80 + b @080ACC80 .align 2, 0 .pool -_080ACC60: +@080ACC60: adds r0, r5, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080ACC80 + beq @080ACC80 adds r2, r5, 0 adds r2, 0x3E ldrb r0, [r2] @@ -324490,39 +324490,39 @@ _080ACC60: strb r0, [r2] adds r0, r5, 0 bl sub_80ACAB0 -_080ACC80: +@080ACC80: pop {r4,r5} pop {r0} bx r0 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] movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0 - bne _080ACCA8 + bne @080ACCA8 adds r0, r4, 0 bl sub_80ACAB0 ldr r0, =sub_80ACB84 + 1 str r0, [r4, 0x1C] - b _080ACCAC + b @080ACCAC .align 2, 0 .pool -_080ACCA8: +@080ACCA8: subs r0, r1, 0x1 strh r0, [r4, 0x2E] -_080ACCAC: +@080ACCAC: pop {r4} pop {r0} bx r0 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} @@ -324558,40 +324558,40 @@ sub_80ACCB4: @ 80ACCB4 lsrs r6, r0, 16 ldr r0, =0x0000ffff cmp r6, r0 - beq _080ACD12 + beq @080ACD12 adds r5, r0, 0 -_080ACD02: +@080ACD02: adds r0, r7, 0 bl sub_80ACAB0 subs r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, r5 - bne _080ACD02 -_080ACD12: + bne @080ACD02 +@080ACD12: cmp r4, r8 - bcs _080ACD48 + bcs @080ACD48 subs r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 ldr r0, =0x0000ffff cmp r4, r0 - beq _080ACD34 + beq @080ACD34 adds r5, r0, 0 -_080ACD24: +@080ACD24: adds r0, r7, 0 bl sub_80ACB84 subs r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, r5 - bne _080ACD24 -_080ACD34: + bne @080ACD24 +@080ACD34: movs r0, 0 - b _080ACD5C + b @080ACD5C .align 2, 0 .pool -_080ACD48: +@080ACD48: mov r1, r8 subs r0, r4, r1 strh r0, [r7, 0x2E] @@ -324602,7 +324602,7 @@ _080ACD48: orrs r0, r1 strb r0, [r2] movs r0, 0x1 -_080ACD5C: +@080ACD5C: strh r0, [r7, 0x3A] pop {r3} mov r8, r3 @@ -324612,7 +324612,7 @@ _080ACD5C: thumb_func_end sub_80ACCB4 thumb_func_start sub_80ACD68 -sub_80ACD68: @ 80ACD68 +sub_80ACD68: ; 80ACD68 push {lr} ldr r0, =0x0854fc54 bl gpu_tile_obj_alloc_tag_and_copy_to_vram @@ -324623,7 +324623,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 @@ -324635,9 +324635,9 @@ sub_80ACD78: @ 80ACD78 adds r2, r4, r0 ldrb r0, [r2] cmp r0, 0x18 - bne _080ACD92 - b _080ACE98 -_080ACD92: + bne @080ACD92 + b @080ACE98 +@080ACD92: ldrb r7, [r2] ldr r0, =0x0854fc2c ldr r2, =0x0854fb90 @@ -324652,7 +324652,7 @@ _080ACD92: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 - beq _080ACE40 + beq @080ACE40 ldr r3, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 @@ -324673,9 +324673,9 @@ _080ACD92: mov r12, r4 mov r8, r2 cmp r0, r1 - ble _080ACDF6 + ble @080ACDF6 adds r2, r1, 0 -_080ACDDE: +@080ACDDE: adds r0, r4, r5 lsls r0, 2 ldr r6, =0x02020630 @@ -324687,8 +324687,8 @@ _080ACDDE: lsls r1, 16 asrs r1, 16 cmp r1, r2 - bgt _080ACDDE -_080ACDF6: + bgt @080ACDDE +@080ACDF6: mov r0, r12 adds r4, r0, r5 lsls r4, 2 @@ -324709,14 +324709,14 @@ _080ACDF6: ldr r0, [r0] add r0, r10 str r4, [r0] - b _080ACE46 + b @080ACE46 .align 2, 0 .pool -_080ACE40: +@080ACE40: adds r1, r4, r6 movs r0, 0 str r0, [r1] -_080ACE46: +@080ACE46: ldr r0, =0x0854c14c ldr r2, [r0] ldr r6, =0x000006da @@ -324727,39 +324727,39 @@ _080ACE46: lsls r0, 24 lsrs r0, 24 cmp r0, 0x18 - bne _080ACE9C + bne @080ACE9C movs r3, 0 adds r1, r2, 0 ldr r5, =sub_80ACB84 + 1 ldr r4, =sub_80ACC88 + 1 -_080ACE64: +@080ACE64: lsls r0, r3, 2 adds r0, r1, r0 ldr r2, [r0] cmp r2, 0 - beq _080ACE8E + beq @080ACE8E movs r6, 0x3A ldrsh r0, [r2, r6] cmp r0, 0 - bne _080ACE8C + bne @080ACE8C str r5, [r2, 0x1C] - b _080ACE8E + b @080ACE8E .align 2, 0 .pool -_080ACE8C: +@080ACE8C: str r4, [r2, 0x1C] -_080ACE8E: +@080ACE8E: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x17 - bls _080ACE64 -_080ACE98: + bls @080ACE64 +@080ACE98: movs r0, 0 - b _080ACE9E -_080ACE9C: + b @080ACE9E +@080ACE9C: movs r0, 0x1 -_080ACE9E: +@080ACE9E: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -324770,7 +324770,7 @@ _080ACE9E: thumb_func_end sub_80ACD78 thumb_func_start sub_80ACEAC -sub_80ACEAC: @ 80ACEAC +sub_80ACEAC: ; 80ACEAC push {r4-r7,lr} ldr r0, =0x0854c14c ldr r3, [r0] @@ -324782,12 +324782,12 @@ sub_80ACEAC: @ 80ACEAC ldrb r0, [r4] ldrb r7, [r5] cmp r0, r7 - bne _080ACED0 + bne @080ACED0 movs r0, 0 - b _080ACF32 + b @080ACF32 .align 2, 0 .pool -_080ACED0: +@080ACED0: ldr r0, =0x000006d6 adds r2, r3, r0 ldrh r0, [r2] @@ -324800,13 +324800,13 @@ _080ACED0: lsrs r0, 16 ldrb r1, [r1] cmp r0, r1 - bls _080ACF30 + bls @080ACF30 strh r6, [r2] ldrb r0, [r4] adds r1, r0, 0 ldrb r5, [r5] cmp r1, r5 - bcs _080ACF10 + bcs @080ACF10 adds r0, 0x1 strb r0, [r4] lsls r0, r1, 2 @@ -324814,10 +324814,10 @@ _080ACED0: ldr r1, [r0] movs r0, 0x1 strh r0, [r1, 0x38] - b _080ACF30 + b @080ACF30 .align 2, 0 .pool -_080ACF10: +@080ACF10: subs r0, 0x1 strb r0, [r4] ldrb r0, [r4] @@ -324834,16 +324834,16 @@ _080ACF10: movs r2, 0x4 orrs r0, r2 strb r0, [r1] -_080ACF30: +@080ACF30: movs r0, 0x1 -_080ACF32: +@080ACF32: pop {r4-r7} pop {r1} bx r1 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, =0x0854c14c @@ -324853,24 +324853,24 @@ sub_80ACF38: @ 80ACF38 adds r7, r0, 0 ldrb r1, [r1] cmp r4, r1 - bcs _080ACF6A + bcs @080ACF6A adds r5, r2, 0 adds r6, r5, r3 -_080ACF50: +@080ACF50: lsls r0, r4, 2 adds r0, r5, r0 ldr r0, [r0] cmp r0, 0 - beq _080ACF5E + beq @080ACF5E bl obj_delete_and_free_tiles -_080ACF5E: +@080ACF5E: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 ldrb r0, [r6] cmp r4, r0 - bcc _080ACF50 -_080ACF6A: + bcc @080ACF50 +@080ACF6A: ldr r0, [r7] ldr r1, =0x000006da adds r0, r1 @@ -324886,7 +324886,7 @@ _080ACF6A: thumb_func_end sub_80ACF38 thumb_func_start sub_80ACF8C -sub_80ACF8C: @ 80ACF8C +sub_80ACF8C: ; 80ACF8C push {r4,lr} ldr r0, =0x0854c14c ldr r1, [r0] @@ -324922,7 +324922,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} @@ -324933,10 +324933,10 @@ sub_80ACFDC: @ 80ACFDC adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 - bne _080AD032 + bne @080AD032 mov r8, r2 adds r7, r1, r3 -_080ACFF8: +@080ACFF8: bl snowflakes_progress2 movs r4, 0 mov r1, r8 @@ -324945,11 +324945,11 @@ _080ACFF8: adds r0, r3 ldrb r0, [r0] cmp r4, r0 - bcs _080AD02C + bcs @080AD02C ldr r0, =0x0854c14c ldr r5, [r0] adds r6, r5, r3 -_080AD012: +@080AD012: lsls r1, r4, 2 adds r0, r5, 0 adds r0, 0x60 @@ -324961,12 +324961,12 @@ _080AD012: lsrs r4, r0, 16 ldrb r0, [r6] cmp r4, r0 - bcc _080AD012 -_080AD02C: + bcc @080AD012 +@080AD02C: ldrb r0, [r7] cmp r0, 0 - beq _080ACFF8 -_080AD032: + beq @080ACFF8 +@080AD032: pop {r3} mov r8, r3 pop {r4-r7} @@ -324977,7 +324977,7 @@ _080AD032: thumb_func_end sub_80ACFDC thumb_func_start snowflakes_progress2 -snowflakes_progress2: @ 80AD048 +snowflakes_progress2: ; 80AD048 push {r4,r5,lr} ldr r0, =0x0854c14c ldr r5, [r0] @@ -324985,11 +324985,11 @@ snowflakes_progress2: @ 80AD048 adds r4, r5, r0 ldrh r0, [r4] cmp r0, 0 - bne _080AD070 + bne @080AD070 bl snowflakes_progress lsls r0, 24 cmp r0, 0 - bne _080AD070 + bne @080AD070 ldr r0, =0x000006d2 adds r1, r5, r0 movs r0, 0x1 @@ -324997,7 +324997,7 @@ snowflakes_progress2: @ 80AD048 ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -_080AD070: +@080AD070: pop {r4,r5} pop {r0} bx r0 @@ -325006,7 +325006,7 @@ _080AD070: thumb_func_end snowflakes_progress2 thumb_func_start sub_80AD084 -sub_80AD084: @ 80AD084 +sub_80AD084: ; 80AD084 push {r4,lr} ldr r0, =0x0854c14c ldr r2, [r0] @@ -325014,14 +325014,14 @@ sub_80AD084: @ 80AD084 adds r3, r2, r0 ldrh r1, [r3] cmp r1, 0 - beq _080AD0A4 + beq @080AD0A4 cmp r1, 0x1 - beq _080AD0B6 + beq @080AD0B6 movs r0, 0 - b _080AD0E2 + b @080AD0E2 .align 2, 0 .pool -_080AD0A4: +@080AD0A4: ldr r4, =0x000006e5 adds r0, r2, r4 strb r1, [r0] @@ -325031,11 +325031,11 @@ _080AD0A4: ldrh r0, [r3] adds r0, 0x1 strh r0, [r3] -_080AD0B6: +@080AD0B6: bl snowflakes_progress lsls r0, 24 cmp r0, 0 - bne _080AD0E0 + bne @080AD0E0 ldr r0, =0x0854c14c ldr r1, [r0] ldr r0, =0x000006ce @@ -325044,19 +325044,19 @@ _080AD0B6: adds r0, 0x1 strh r0, [r1] movs r0, 0 - b _080AD0E2 + b @080AD0E2 .align 2, 0 .pool -_080AD0E0: +@080AD0E0: movs r0, 0x1 -_080AD0E2: +@080AD0E2: pop {r4} pop {r1} bx r1 thumb_func_end sub_80AD084 thumb_func_start snowflakes_progress -snowflakes_progress: @ 80AD0E8 +snowflakes_progress: ; 80AD0E8 push {r4,lr} ldr r0, =0x0854c14c ldr r1, [r0] @@ -325067,12 +325067,12 @@ snowflakes_progress: @ 80AD0E8 ldrb r0, [r3] ldrb r4, [r2] cmp r0, r4 - bne _080AD110 + bne @080AD110 movs r0, 0 - b _080AD152 + b @080AD152 .align 2, 0 .pool -_080AD110: +@080AD110: movs r0, 0xDC lsls r0, 3 adds r1, r0 @@ -325082,18 +325082,18 @@ _080AD110: lsls r0, 16 lsrs r0, 16 cmp r0, 0x24 - bls _080AD13A + bls @080AD13A movs r0, 0 strh r0, [r1] ldrb r0, [r3] ldrb r2, [r2] cmp r0, r2 - bcs _080AD136 + bcs @080AD136 bl snowflake_add - b _080AD13A -_080AD136: + b @080AD13A +@080AD136: bl snowflake_remove -_080AD13A: +@080AD13A: ldr r0, =0x0854c14c ldr r0, [r0] ldr r2, =0x000006e4 @@ -325106,7 +325106,7 @@ _080AD13A: negs r0, r1 orrs r0, r1 lsrs r0, 31 -_080AD152: +@080AD152: pop {r4} pop {r1} bx r1 @@ -325115,7 +325115,7 @@ _080AD152: thumb_func_end snowflakes_progress thumb_func_start snowflake_add -snowflake_add: @ 80AD164 +snowflake_add: ; 80AD164 push {r4-r6,lr} ldr r0, =0x0854fc8c movs r1, 0 @@ -325125,7 +325125,7 @@ snowflake_add: @ 80AD164 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq _080AD1C8 + beq @080AD1C8 ldr r0, =0x02020630 lsls r4, r1, 4 adds r4, r1 @@ -325154,19 +325154,19 @@ snowflake_add: @ 80AD164 adds r5, r0 str r4, [r5] movs r0, 0x1 - b _080AD1CA + b @080AD1CA .align 2, 0 .pool -_080AD1C8: +@080AD1C8: movs r0, 0 -_080AD1CA: +@080AD1CA: pop {r4-r6} pop {r1} bx r1 thumb_func_end snowflake_add thumb_func_start snowflake_remove -snowflake_remove: @ 80AD1D0 +snowflake_remove: ; 80AD1D0 push {lr} ldr r0, =0x0854c14c ldr r1, [r0] @@ -325174,12 +325174,12 @@ snowflake_remove: @ 80AD1D0 adds r2, r1, r0 ldrb r0, [r2] cmp r0, 0 - bne _080AD1EC + bne @080AD1EC movs r0, 0 - b _080AD200 + b @080AD200 .align 2, 0 .pool -_080AD1EC: +@080AD1EC: subs r0, 0x1 strb r0, [r2] lsls r0, 24 @@ -325189,13 +325189,13 @@ _080AD1EC: ldr r0, [r1] bl obj_delete_and_free_tiles movs r0, 0x1 -_080AD200: +@080AD200: pop {r1} bx r1 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 @@ -325262,9 +325262,9 @@ sub_80AD204: @ 80AD204 strh r7, [r5, 0x34] movs r0, 0x1 cmp r4, 0 - bne _080AD294 + bne @080AD294 movs r0, 0x2 -_080AD294: +@080AD294: strh r0, [r5, 0x32] movs r0, 0x1F ands r0, r6 @@ -325279,7 +325279,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, =0x0854c14c @@ -325288,7 +325288,7 @@ sub_80AD2B0: @ 80AD2B0 adds r4, r0, r1 ldrh r0, [r4] cmp r0, 0x12 - bls _080AD2F6 + bls @080AD2F6 adds r2, r3, 0 adds r2, 0x3E ldrb r1, [r2] @@ -325315,7 +325315,7 @@ sub_80AD2B0: @ 80AD2B0 lsls r0, 7 strh r0, [r3, 0x2E] strh r2, [r4] -_080AD2F6: +@080AD2F6: pop {r4} pop {r0} bx r0 @@ -325324,7 +325324,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] @@ -325348,9 +325348,9 @@ sub_80AD30C: @ 80AD30C movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bge _080AD33E + bge @080AD33E adds r0, 0x3F -_080AD33E: +@080AD33E: asrs r0, 6 strh r0, [r4, 0x24] adds r0, r4, 0 @@ -325370,33 +325370,33 @@ _080AD33E: lsls r0, 1 ands r0, r2 cmp r0, 0 - beq _080AD370 + beq @080AD370 ldr r3, =0xffffff00 adds r0, r3, 0 orrs r2, r0 lsls r0, r2, 16 lsrs r3, r0, 16 -_080AD370: +@080AD370: lsls r0, r3, 16 asrs r0, 16 movs r2, 0x3 negs r2, r2 cmp r0, r2 - bge _080AD394 + bge @080AD394 adds r1, r5 movs r0, 0xF2 subs r0, r1 - b _080AD39C + b @080AD39C .align 2, 0 .pool -_080AD394: +@080AD394: cmp r0, 0xF2 - ble _080AD39E + ble @080AD39E adds r0, r1, r5 subs r0, r2, r0 -_080AD39C: +@080AD39C: strh r0, [r4, 0x20] -_080AD39E: +@080AD39E: adds r0, r4, 0 adds r0, 0x29 movs r3, 0 @@ -325413,7 +325413,7 @@ _080AD39E: lsls r0, 16 lsrs r0, 16 cmp r0, 0x6 - bhi _080AD3E0 + bhi @080AD3E0 adds r1, r3 movs r0, 0xFA subs r0, r1 @@ -325426,16 +325426,16 @@ _080AD39E: strh r1, [r4, 0x38] movs r0, 0xDC strh r0, [r4, 0x3A] - b _080AD40C + b @080AD40C .align 2, 0 .pool -_080AD3E0: +@080AD3E0: adds r0, r2, 0 subs r0, 0xF3 lsls r0, 16 lsrs r0, 16 cmp r0, 0x6 - bhi _080AD40C + bhi @080AD40C movs r1, 0 movs r0, 0xA3 strh r0, [r4, 0x22] @@ -325452,7 +325452,7 @@ _080AD3E0: strb r0, [r2] ldr r0, =sub_80AD2B0 + 1 str r0, [r4, 0x1C] -_080AD40C: +@080AD40C: ldrh r0, [r4, 0x38] adds r0, 0x1 strh r0, [r4, 0x38] @@ -325461,7 +325461,7 @@ _080AD40C: movs r3, 0x3A ldrsh r1, [r4, r3] cmp r0, r1 - bne _080AD438 + bne @080AD438 adds r0, r4, 0 bl sub_80AD204 movs r0, 0xFA @@ -325474,7 +325474,7 @@ _080AD40C: strb r0, [r2] ldr r0, =sub_80AD2B0 + 1 str r0, [r4, 0x1C] -_080AD438: +@080AD438: pop {r4,r5} pop {r0} bx r0 @@ -325483,7 +325483,7 @@ _080AD438: thumb_func_end sub_80AD30C thumb_func_start sub_80AD444 -sub_80AD444: @ 80AD444 +sub_80AD444: ; 80AD444 push {r4,r5,lr} ldr r0, =0x0854c14c ldr r1, [r0] @@ -325531,7 +325531,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, =0x0854c14c @@ -325540,14 +325540,14 @@ sub_80AD4B8: @ 80AD4B8 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - bne _080AD4D8 + bne @080AD4D8 adds r4, r1, r2 -_080AD4CE: +@080AD4CE: bl sub_80AD584 ldrb r0, [r4] cmp r0, 0 - beq _080AD4CE -_080AD4D8: + beq @080AD4CE +@080AD4D8: pop {r4} pop {r0} bx r0 @@ -325556,7 +325556,7 @@ _080AD4D8: thumb_func_end sub_80AD4B8 thumb_func_start sub_80AD4E8 -sub_80AD4E8: @ 80AD4E8 +sub_80AD4E8: ; 80AD4E8 push {r4,r5,lr} ldr r0, =0x0854c14c ldr r1, [r0] @@ -325602,7 +325602,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, =0x0854c14c @@ -325611,14 +325611,14 @@ sub_80AD554: @ 80AD554 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - bne _080AD574 + bne @080AD574 adds r4, r1, r2 -_080AD56A: +@080AD56A: bl sub_80AD584 ldrb r0, [r4] cmp r0, 0 - beq _080AD56A -_080AD574: + beq @080AD56A +@080AD574: pop {r4} pop {r0} bx r0 @@ -325627,7 +325627,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, =0x0854c14c @@ -325636,34 +325636,34 @@ sub_80AD584: @ 80AD584 adds r0, r1 ldrh r0, [r0] cmp r0, 0xE - bls _080AD59A - b _080AD8FA -_080AD59A: + bls @080AD59A + b @080AD8FA +@080AD59A: lsls r0, 2 - ldr r1, =_080AD5B0 + ldr r1, =@080AD5B0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080AD5B0: - .4byte _080AD5EC - .4byte _080AD608 - .4byte _080AD62C - .4byte _080AD65C - .4byte _080AD680 - .4byte _080AD6B0 - .4byte _080AD6E0 - .4byte _080AD70C - .4byte _080AD72A - .4byte _080AD788 - .4byte _080AD80C - .4byte _080AD834 - .4byte _080AD864 - .4byte _080AD8A8 - .4byte _080AD8DC -_080AD5EC: +@080AD5B0: + .4byte @080AD5EC + .4byte @080AD608 + .4byte @080AD62C + .4byte @080AD65C + .4byte @080AD680 + .4byte @080AD6B0 + .4byte @080AD6E0 + .4byte @080AD70C + .4byte @080AD72A + .4byte @080AD788 + .4byte @080AD80C + .4byte @080AD834 + .4byte @080AD864 + .4byte @080AD8A8 + .4byte @080AD8DC +@080AD5EC: bl sub_80ACD68 ldr r0, =0x0854c14c ldr r1, [r0] @@ -325671,32 +325671,32 @@ _080AD5EC: adds r1, r2 ldrh r0, [r1] adds r0, 0x1 - b _080AD8F8 + b @080AD8F8 .align 2, 0 .pool -_080AD608: +@080AD608: bl sub_80ACD78 lsls r0, 24 cmp r0, 0 - beq _080AD614 - b _080AD8FA -_080AD614: + beq @080AD614 + b @080AD8FA +@080AD614: ldr r0, =0x0854c14c ldr r1, [r0] ldr r3, =0x000006cc adds r1, r3 ldrh r0, [r1] adds r0, 0x1 - b _080AD8F8 + b @080AD8F8 .align 2, 0 .pool -_080AD62C: +@080AD62C: bl sub_80ACEAC lsls r0, 24 cmp r0, 0 - beq _080AD638 - b _080AD8FA -_080AD638: + beq @080AD638 + b @080AD8FA +@080AD638: ldr r0, =0x0854c14c ldr r1, [r0] ldr r0, =0x000006d2 @@ -325707,26 +325707,26 @@ _080AD638: adds r1, r2 ldrh r0, [r1] adds r0, 0x1 - b _080AD8F8 + b @080AD8F8 .align 2, 0 .pool -_080AD65C: +@080AD65C: ldr r0, =0x0854c14c ldr r1, [r0] ldr r3, =0x000006c6 adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 - bne _080AD66C - b _080AD8FA -_080AD66C: + bne @080AD66C + b @080AD8FA +@080AD66C: ldr r0, =0x000006cc adds r1, r0 movs r0, 0x6 - b _080AD8F8 + b @080AD8F8 .align 2, 0 .pool -_080AD680: +@080AD680: ldr r0, =0x0854c14c ldr r4, [r0] ldr r2, =0x000006ea @@ -325749,7 +325749,7 @@ _080AD680: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -_080AD6B0: +@080AD6B0: ldr r0, =0x0854c14c ldr r2, [r0] ldr r3, =0x000006e6 @@ -325759,17 +325759,17 @@ _080AD6B0: strh r0, [r1] lsls r0, 16 cmp r0, 0 - beq _080AD6C6 - b _080AD8FA -_080AD6C6: + beq @080AD6C6 + b @080AD8FA +@080AD6C6: ldr r0, =0x000006cc adds r1, r2, r0 ldrh r0, [r1] adds r0, 0x1 - b _080AD8F8 + b @080AD8F8 .align 2, 0 .pool -_080AD6E0: +@080AD6E0: ldr r0, =0x0854c14c ldr r4, [r0] ldr r1, =0x000006ea @@ -325783,10 +325783,10 @@ _080AD6E0: ldr r2, =0x000006eb adds r1, r4, r2 strb r0, [r1] - b _080AD768 + b @080AD768 .align 2, 0 .pool -_080AD70C: +@080AD70C: bl GenerateRandomNumber ldr r1, =0x0854c14c ldr r2, [r1] @@ -325801,7 +325801,7 @@ _080AD70C: ldrh r0, [r2] adds r0, 0x1 strh r0, [r2] -_080AD72A: +@080AD72A: movs r0, 0x13 bl sub_80ABC48 ldr r0, =0x0854c14c @@ -325810,15 +325810,15 @@ _080AD72A: adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - bne _080AD74E + bne @080AD74E ldr r3, =0x000006ec adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0x1 - bne _080AD74E + bne @080AD74E movs r0, 0x14 bl sub_80AD9BC -_080AD74E: +@080AD74E: bl GenerateRandomNumber ldr r1, =0x0854c14c ldr r4, [r1] @@ -325830,16 +325830,16 @@ _080AD74E: ldr r2, =0x000006e6 adds r1, r4, r2 strh r0, [r1] -_080AD768: +@080AD768: ldr r3, =0x000006cc adds r4, r3 ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - b _080AD8FA + b @080AD8FA .align 2, 0 .pool -_080AD788: +@080AD788: ldr r0, =0x0854c14c ldr r4, [r0] ldr r0, =0x000006e6 @@ -325849,9 +325849,9 @@ _080AD788: strh r0, [r5] lsls r0, 16 cmp r0, 0 - beq _080AD79E - b _080AD8FA -_080AD79E: + beq @080AD79E + b @080AD8FA +@080AD79E: movs r0, 0x3 bl sub_80ABC48 ldr r2, =0x000006ea @@ -325865,7 +325865,7 @@ _080AD79E: strb r0, [r1] lsls r0, 24 cmp r0, 0 - beq _080AD7E8 + beq @080AD7E8 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -325876,28 +325876,28 @@ _080AD79E: ldr r0, =0x000006cc adds r1, r4, r0 movs r0, 0xA - b _080AD8F8 + b @080AD8F8 .align 2, 0 .pool -_080AD7E8: +@080AD7E8: ldr r1, =0x000006eb adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0 - bne _080AD800 + bne @080AD800 ldr r2, =0x000006cc adds r1, r4, r2 - b _080AD8F6 + b @080AD8F6 .align 2, 0 .pool -_080AD800: +@080AD800: ldr r3, =0x000006cc adds r1, r4, r3 movs r0, 0xB - b _080AD8F8 + b @080AD8F8 .align 2, 0 .pool -_080AD80C: +@080AD80C: ldr r0, =0x0854c14c ldr r2, [r0] ldr r0, =0x000006e6 @@ -325907,14 +325907,14 @@ _080AD80C: strh r0, [r1] lsls r0, 16 cmp r0, 0 - bne _080AD8FA + bne @080AD8FA ldr r3, =0x000006cc adds r1, r2, r3 movs r0, 0x8 - b _080AD8F8 + b @080AD8F8 .align 2, 0 .pool -_080AD834: +@080AD834: bl GenerateRandomNumber ldr r1, =0x0854c14c ldr r2, [r1] @@ -325931,10 +325931,10 @@ _080AD834: ldrh r0, [r2] adds r0, 0x1 strh r0, [r2] - b _080AD8FA + b @080AD8FA .align 2, 0 .pool -_080AD864: +@080AD864: ldr r0, =0x0854c14c ldr r5, [r0] ldr r1, =0x000006e6 @@ -325944,7 +325944,7 @@ _080AD864: strh r0, [r4] lsls r0, 16 cmp r0, 0 - bne _080AD8FA + bne @080AD8FA movs r0, 0x64 bl sub_80AD9BC movs r0, 0x13 @@ -325958,10 +325958,10 @@ _080AD864: adds r1, r5, r2 ldrh r0, [r1] adds r0, 0x1 - b _080AD8F8 + b @080AD8F8 .align 2, 0 .pool -_080AD8A8: +@080AD8A8: ldr r0, =0x0854c14c ldr r4, [r0] ldr r3, =0x000006e6 @@ -325971,7 +325971,7 @@ _080AD8A8: strh r0, [r1] lsls r0, 16 cmp r0, 0 - bne _080AD8FA + bne @080AD8FA movs r0, 0x13 movs r1, 0x3 movs r2, 0x5 @@ -325980,28 +325980,28 @@ _080AD8A8: adds r1, r4, r0 ldrh r0, [r1] adds r0, 0x1 - b _080AD8F8 + b @080AD8F8 .align 2, 0 .pool -_080AD8DC: +@080AD8DC: ldr r0, =0x0854c14c ldr r2, [r0] ldr r1, =0x000006c6 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x3 - bne _080AD8FA + bne @080AD8FA ldr r3, =0x000006ea adds r1, r2, r3 movs r0, 0x1 strb r0, [r1] ldr r0, =0x000006cc adds r1, r2, r0 -_080AD8F6: +@080AD8F6: movs r0, 0x4 -_080AD8F8: +@080AD8F8: strh r0, [r1] -_080AD8FA: +@080AD8FA: pop {r4,r5} pop {r0} bx r0 @@ -326010,7 +326010,7 @@ _080AD8FA: thumb_func_end sub_80AD584 thumb_func_start sub_80AD910 -sub_80AD910: @ 80AD910 +sub_80AD910: ; 80AD910 push {r4-r6,lr} ldr r0, =0x0854c14c ldr r6, [r0] @@ -326018,26 +326018,26 @@ sub_80AD910: @ 80AD910 adds r5, r6, r0 ldrh r1, [r5] cmp r1, 0x1 - beq _080AD946 + beq @080AD946 cmp r1, 0x1 - bgt _080AD934 + bgt @080AD934 cmp r1, 0 - beq _080AD93A - b _080AD9AC + beq @080AD93A + b @080AD9AC .align 2, 0 .pool -_080AD934: +@080AD934: cmp r1, 0x2 - beq _080AD990 - b _080AD9AC -_080AD93A: + beq @080AD990 + b @080AD9AC +@080AD93A: ldr r2, =0x000006ea adds r0, r6, r2 strb r1, [r0] ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] -_080AD946: +@080AD946: bl sub_80AD584 ldr r0, =0x0854c14c ldr r2, [r0] @@ -326045,16 +326045,16 @@ _080AD946: adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 - beq _080AD9B4 + beq @080AD9B4 subs r1, 0x19 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x3 - beq _080AD9AC + beq @080AD9AC cmp r0, 0x5 - beq _080AD9AC + beq @080AD9AC cmp r0, 0xD - beq _080AD9AC + beq @080AD9AC ldr r0, =0x000006d9 adds r1, r2, r0 movs r0, 0 @@ -326064,15 +326064,15 @@ _080AD946: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _080AD9B4 + b @080AD9B4 .align 2, 0 .pool -_080AD990: +@080AD990: bl sub_80ACEAC lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _080AD9B4 + bne @080AD9B4 bl sub_80ACF38 ldr r1, =0x000006ed adds r0, r6, r1 @@ -326080,21 +326080,21 @@ _080AD990: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] -_080AD9AC: +@080AD9AC: movs r0, 0 - b _080AD9B6 + b @080AD9B6 .align 2, 0 .pool -_080AD9B4: +@080AD9B4: movs r0, 0x1 -_080AD9B6: +@080AD9B6: pop {r4-r6} pop {r1} bx r1 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 @@ -326104,7 +326104,7 @@ sub_80AD9BC: @ 80AD9BC adds r5, r4, r0 ldrb r0, [r5] cmp r0, 0 - bne _080AD9EA + bne @080AD9EA bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -326116,7 +326116,7 @@ sub_80AD9BC: @ 80AD9BC strh r0, [r1] movs r0, 0x1 strb r0, [r5] -_080AD9EA: +@080AD9EA: pop {r4-r6} pop {r0} bx r0 @@ -326125,7 +326125,7 @@ _080AD9EA: thumb_func_end sub_80AD9BC thumb_func_start sub_80AD9F8 -sub_80AD9F8: @ 80AD9F8 +sub_80AD9F8: ; 80AD9F8 push {r4,lr} ldr r0, =0x0854c14c ldr r1, [r0] @@ -326133,50 +326133,50 @@ sub_80AD9F8: @ 80AD9F8 adds r0, r1, r2 ldrb r4, [r0] cmp r4, 0x1 - bne _080ADA58 + bne @080ADA58 movs r0, 0xDD lsls r0, 3 adds r1, r0 ldrh r0, [r1] cmp r0, 0 - bne _080ADA54 + bne @080ADA54 bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - bne _080ADA58 + bne @080ADA58 bl GenerateRandomNumber ands r4, r0 cmp r4, 0 - beq _080ADA38 + beq @080ADA38 movs r0, 0x57 bl audio_play - b _080ADA3E + b @080ADA3E .align 2, 0 .pool -_080ADA38: +@080ADA38: movs r0, 0x58 bl audio_play -_080ADA3E: +@080ADA3E: ldr r0, =0x0854c14c ldr r0, [r0] ldr r1, =0x000006ed adds r0, r1 movs r1, 0 strb r1, [r0] - b _080ADA58 + b @080ADA58 .align 2, 0 .pool -_080ADA54: +@080ADA54: subs r0, 0x1 strh r0, [r1] -_080ADA58: +@080ADA58: pop {r4} pop {r0} bx r0 thumb_func_end sub_80AD9F8 thumb_func_start sub_80ADA60 -sub_80ADA60: @ 80ADA60 +sub_80ADA60: ; 80ADA60 push {lr} ldr r0, =0x0854c14c ldr r3, [r0] @@ -326199,7 +326199,7 @@ sub_80ADA60: @ 80ADA60 adds r0, r3, r1 ldrb r1, [r0] cmp r1, 0 - bne _080ADAA8 + bne @080ADAA8 adds r2, 0x2E adds r0, r3, r2 strh r1, [r0] @@ -326212,7 +326212,7 @@ sub_80ADA60: @ 80ADA60 movs r0, 0 movs r1, 0x10 bl sub_80AC124 -_080ADAA8: +@080ADAA8: pop {r0} bx r0 .align 2, 0 @@ -326220,7 +326220,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, =0x0854c14c @@ -326229,14 +326229,14 @@ sub_80ADAC0: @ 80ADAC0 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - bne _080ADAE0 + bne @080ADAE0 adds r4, r1, r2 -_080ADAD6: +@080ADAD6: bl sub_80ADAF0 ldrb r0, [r4] cmp r0, 0 - beq _080ADAD6 -_080ADAE0: + beq @080ADAD6 +@080ADAE0: pop {r4} pop {r0} bx r0 @@ -326245,7 +326245,7 @@ _080ADAE0: thumb_func_end sub_80ADAC0 thumb_func_start sub_80ADAF0 -sub_80ADAF0: @ 80ADAF0 +sub_80ADAF0: ; 80ADAF0 push {r4-r6,lr} ldr r0, =0x0854c14c ldr r6, [r0] @@ -326269,42 +326269,42 @@ sub_80ADAF0: @ 80ADAF0 lsls r0, 16 lsrs r0, 16 cmp r0, 0x3 - bls _080ADB2A + bls @080ADB2A movs r0, 0 strh r0, [r1] ldrh r0, [r2] adds r0, 0x1 strh r0, [r2] -_080ADB2A: +@080ADB2A: ldr r1, =0x000006cc adds r5, r6, r1 ldrh r4, [r5] cmp r4, 0 - beq _080ADB50 + beq @080ADB50 cmp r4, 0x1 - beq _080ADB90 - b _080ADBA6 + beq @080ADB90 + b @080ADBA6 .align 2, 0 .pool -_080ADB50: +@080ADB50: bl sub_80ADCAC movs r3, 0xDA lsls r3, 3 adds r0, r6, r3 ldrb r0, [r0] cmp r0, 0x6 - bne _080ADB6C + bne @080ADB6C movs r0, 0xC movs r1, 0x8 movs r2, 0x3 bl sub_80AC164 - b _080ADB76 -_080ADB6C: + b @080ADB76 +@080ADB6C: movs r0, 0x4 movs r1, 0x10 movs r2, 0 bl sub_80AC164 -_080ADB76: +@080ADB76: ldr r0, =0x0854c14c ldr r1, [r0] ldr r0, =0x000006cc @@ -326312,21 +326312,21 @@ _080ADB76: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _080ADBA6 + b @080ADBA6 .align 2, 0 .pool -_080ADB90: +@080ADB90: bl sub_80AC1A8 lsls r0, 24 cmp r0, 0 - beq _080ADBA6 + beq @080ADBA6 ldr r1, =0x000006d2 adds r0, r6, r1 strb r4, [r0] ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] -_080ADBA6: +@080ADBA6: pop {r4-r6} pop {r0} bx r0 @@ -326335,7 +326335,7 @@ _080ADBA6: thumb_func_end sub_80ADAF0 thumb_func_start sub_80ADBB0 -sub_80ADBB0: @ 80ADBB0 +sub_80ADBB0: ; 80ADBB0 push {r4,lr} ldr r0, =0x0854c14c ldr r2, [r0] @@ -326359,61 +326359,61 @@ sub_80ADBB0: @ 80ADBB0 lsls r0, 16 lsrs r0, 16 cmp r0, 0x3 - bls _080ADBEA + bls @080ADBEA movs r0, 0 strh r0, [r1] ldrh r0, [r3] adds r0, 0x1 strh r0, [r3] -_080ADBEA: +@080ADBEA: ldr r1, =0x000006ce adds r4, r2, r1 ldrh r0, [r4] cmp r0, 0x1 - beq _080ADC26 + beq @080ADC26 cmp r0, 0x1 - bgt _080ADC14 + bgt @080ADC14 cmp r0, 0 - beq _080ADC1A - b _080ADC3E + beq @080ADC1A + b @080ADC3E .align 2, 0 .pool -_080ADC14: +@080ADC14: cmp r0, 0x2 - beq _080ADC32 - b _080ADC3E -_080ADC1A: + beq @080ADC32 + b @080ADC3E +@080ADC1A: movs r0, 0 movs r1, 0x10 movs r2, 0x3 bl sub_80AC164 - b _080ADC36 -_080ADC26: + b @080ADC36 +@080ADC26: bl sub_80AC1A8 lsls r0, 24 cmp r0, 0 - beq _080ADC42 - b _080ADC36 -_080ADC32: + beq @080ADC42 + b @080ADC36 +@080ADC32: bl sub_80ADD68 -_080ADC36: +@080ADC36: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - b _080ADC42 -_080ADC3E: + b @080ADC42 +@080ADC3E: movs r0, 0 - b _080ADC44 -_080ADC42: + b @080ADC44 +@080ADC42: movs r0, 0x1 -_080ADC44: +@080ADC44: pop {r4} pop {r1} bx r1 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 @@ -326433,7 +326433,7 @@ sub_80ADC4C: @ 80ADC4C lsls r1, 16 ldr r0, =0x010f0000 cmp r1, r0 - ble _080ADC90 + ble @080ADC90 movs r0, 0xF0 lsls r0, 1 adds r1, r0, 0 @@ -326448,7 +326448,7 @@ sub_80ADC4C: @ 80ADC4C ldr r0, =0x000001ff ands r1, r0 strh r1, [r3, 0x20] -_080ADC90: +@080ADC90: pop {r4} pop {r0} bx r0 @@ -326457,7 +326457,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, =0x0854c14c @@ -326466,7 +326466,7 @@ sub_80ADCAC: @ 80ADCAC adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _080ADD56 + bne @080ADD56 ldr r0, =0x0854fd30 ldr r1, [r0, 0x4] ldr r0, [r0] @@ -326475,7 +326475,7 @@ sub_80ADCAC: @ 80ADCAC mov r0, sp bl gpu_tile_obj_alloc_tag_and_copy_to_vram movs r5, 0 -_080ADCD0: +@080ADCD0: ldr r0, =0x0854fd18 movs r1, 0 movs r2, 0 @@ -326484,7 +326484,7 @@ _080ADCD0: lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _080ADD34 + beq @080ADD34 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -326511,10 +326511,10 @@ _080ADCD0: adds r0, 0xA0 adds r0, r1 str r4, [r0] - b _080ADD42 + b @080ADD42 .align 2, 0 .pool -_080ADD34: +@080ADD34: ldr r2, =0x0854c14c ldr r1, [r2] lsls r0, r5, 2 @@ -326522,18 +326522,18 @@ _080ADD34: adds r1, r0 movs r0, 0 str r0, [r1] -_080ADD42: +@080ADD42: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x13 - bls _080ADCD0 + bls @080ADCD0 ldr r0, [r2] ldr r1, =0x000006fb adds r0, r1 movs r1, 0x1 strb r1, [r0] -_080ADD56: +@080ADD56: add sp, 0x8 pop {r4,r5} pop {r0} @@ -326543,7 +326543,7 @@ _080ADD56: thumb_func_end sub_80ADCAC thumb_func_start sub_80ADD68 -sub_80ADD68: @ 80ADD68 +sub_80ADD68: ; 80ADD68 push {r4,r5,lr} ldr r0, =0x0854c14c ldr r1, [r0] @@ -326551,23 +326551,23 @@ sub_80ADD68: @ 80ADD68 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080ADDA8 + beq @080ADDA8 movs r4, 0 adds r5, r1, 0 adds r5, 0xA0 -_080ADD7E: +@080ADD7E: lsls r0, r4, 2 adds r0, r5, r0 ldr r0, [r0] cmp r0, 0 - beq _080ADD8C + beq @080ADD8C bl obj_delete_and_free_tiles -_080ADD8C: +@080ADD8C: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x13 - bls _080ADD7E + bls @080ADD7E ldr r0, =0x00001201 bl gpu_tile_obj_free_by_tag ldr r0, =0x0854c14c @@ -326576,7 +326576,7 @@ _080ADD8C: adds r0, r1 movs r1, 0 strb r1, [r0] -_080ADDA8: +@080ADDA8: pop {r4,r5} pop {r0} bx r0 @@ -326585,7 +326585,7 @@ _080ADDA8: thumb_func_end sub_80ADD68 thumb_func_start sub_80ADDBC -sub_80ADDBC: @ 80ADDBC +sub_80ADDBC: ; 80ADDBC push {lr} ldr r0, =0x0854c14c ldr r1, [r0] @@ -326612,7 +326612,7 @@ sub_80ADDBC: @ 80ADDBC adds r1, r0 ldrb r0, [r1] cmp r0, 0 - bne _080ADE04 + bne @080ADE04 movs r0, 0 movs r1, 0x10 bl sub_80AC124 @@ -326620,7 +326620,7 @@ sub_80ADDBC: @ 80ADDBC lsls r1, 6 movs r0, 0x52 bl lcd_io_set -_080ADE04: +@080ADE04: pop {r0} bx r0 .align 2, 0 @@ -326628,7 +326628,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, =0x0854c14c @@ -326637,14 +326637,14 @@ sub_80ADE18: @ 80ADE18 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - bne _080ADE38 + bne @080ADE38 adds r4, r1, r2 -_080ADE2E: +@080ADE2E: bl sub_80ADE48 ldrb r0, [r4] cmp r0, 0 - beq _080ADE2E -_080ADE38: + beq @080ADE2E +@080ADE38: pop {r4} pop {r0} bx r0 @@ -326653,7 +326653,7 @@ _080ADE38: thumb_func_end sub_80ADE18 thumb_func_start sub_80ADE48 -sub_80ADE48: @ 80ADE48 +sub_80ADE48: ; 80ADE48 push {r4,r5,lr} ldr r2, =0x0854c14c ldr r1, [r2] @@ -326665,79 +326665,79 @@ sub_80ADE48: @ 80ADE48 adds r1, r0 strh r3, [r1] cmp r3, 0xEF - bls _080ADE74 + bls @080ADE74 adds r4, r1, 0 adds r1, r3, 0 -_080ADE64: +@080ADE64: adds r3, r1, 0 subs r3, 0xF0 adds r1, r3, 0 lsls r0, r3, 16 lsrs r0, 16 cmp r0, 0xEF - bhi _080ADE64 + bhi @080ADE64 strh r3, [r4] -_080ADE74: +@080ADE74: ldr r5, [r2] ldr r1, =0x000006cc adds r4, r5, r1 ldrh r0, [r4] cmp r0, 0x1 - beq _080ADEAC + beq @080ADEAC cmp r0, 0x1 - bgt _080ADEA0 + bgt @080ADEA0 cmp r0, 0 - beq _080ADEA6 - b _080ADEE8 + beq @080ADEA6 + b @080ADEE8 .align 2, 0 .pool -_080ADEA0: +@080ADEA0: cmp r0, 0x2 - beq _080ADEC8 - b _080ADEE8 -_080ADEA6: + beq @080ADEC8 + b @080ADEE8 +@080ADEA6: bl sub_80ADF5C - b _080ADEDA -_080ADEAC: + b @080ADEDA +@080ADEAC: movs r1, 0xE0 lsls r1, 3 adds r0, r5, r1 ldrb r0, [r0] cmp r0, 0 - bne _080ADEBC + bne @080ADEBC bl sub_80ADF6C -_080ADEBC: +@080ADEBC: movs r0, 0x10 movs r1, 0 movs r2, 0x1 bl sub_80AC164 - b _080ADEDA -_080ADEC8: + b @080ADEDA +@080ADEC8: bl sub_80AC1A8 lsls r0, 24 cmp r0, 0 - beq _080ADEEC + beq @080ADEEC ldr r0, =0x000006d2 adds r1, r5, r0 movs r0, 0x1 strb r0, [r1] -_080ADEDA: +@080ADEDA: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - b _080ADEEC + b @080ADEEC .align 2, 0 .pool -_080ADEE8: +@080ADEE8: bl sub_80AC1A8 -_080ADEEC: +@080ADEEC: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_80ADE48 thumb_func_start sub_80ADEF4 -sub_80ADEF4: @ 80ADEF4 +sub_80ADEF4: ; 80ADEF4 push {r4,lr} ldr r0, =0x0854c14c ldr r0, [r0] @@ -326745,55 +326745,55 @@ sub_80ADEF4: @ 80ADEF4 adds r4, r0, r1 ldrh r0, [r4] cmp r0, 0x1 - beq _080ADF2A + beq @080ADF2A cmp r0, 0x1 - bgt _080ADF18 + bgt @080ADF18 cmp r0, 0 - beq _080ADF1E - b _080ADF4E + beq @080ADF1E + b @080ADF4E .align 2, 0 .pool -_080ADF18: +@080ADF18: cmp r0, 0x2 - beq _080ADF40 - b _080ADF4E -_080ADF1E: + beq @080ADF40 + b @080ADF4E +@080ADF1E: movs r0, 0 movs r1, 0x10 movs r2, 0x1 bl sub_80AC164 - b _080ADF38 -_080ADF2A: + b @080ADF38 +@080ADF2A: bl sub_80AC1A8 lsls r0, 24 cmp r0, 0 - beq _080ADF52 + beq @080ADF52 bl sub_80AE014 -_080ADF38: +@080ADF38: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - b _080ADF52 -_080ADF40: + b @080ADF52 +@080ADF40: movs r0, 0x52 movs r1, 0 bl lcd_io_set ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -_080ADF4E: +@080ADF4E: movs r0, 0 - b _080ADF54 -_080ADF52: + b @080ADF54 +@080ADF52: movs r0, 0x1 -_080ADF54: +@080ADF54: pop {r4} pop {r1} bx r1 thumb_func_end sub_80ADEF4 thumb_func_start sub_80ADF5C -sub_80ADF5C: @ 80ADF5C +sub_80ADF5C: ; 80ADF5C push {lr} ldr r0, =0x0854fd38 bl gpu_tile_obj_alloc_tag_and_copy_to_vram @@ -326804,7 +326804,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, =0x0854c14c ldr r0, [r0] @@ -326813,9 +326813,9 @@ sub_80ADF6C: @ 80ADF6C adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _080AE008 + bne @080AE008 movs r5, 0 -_080ADF80: +@080ADF80: ldr r0, =0x0854fd58 movs r1, 0 movs r2, 0 @@ -326824,7 +326824,7 @@ _080ADF80: lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _080ADFE4 + beq @080ADFE4 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -326855,10 +326855,10 @@ _080ADF80: adds r0, 0xF0 adds r0, r1 str r4, [r0] - b _080ADFF2 + b @080ADFF2 .align 2, 0 .pool -_080ADFE4: +@080ADFE4: ldr r2, =0x0854c14c ldr r1, [r2] lsls r0, r5, 2 @@ -326866,19 +326866,19 @@ _080ADFE4: adds r1, r0 movs r0, 0 str r0, [r1] -_080ADFF2: +@080ADFF2: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x13 - bls _080ADF80 + bls @080ADF80 ldr r0, [r2] movs r1, 0xE0 lsls r1, 3 adds r0, r1 movs r1, 0x1 strb r1, [r0] -_080AE008: +@080AE008: pop {r4,r5} pop {r0} bx r0 @@ -326887,7 +326887,7 @@ _080AE008: thumb_func_end sub_80ADF6C thumb_func_start sub_80AE014 -sub_80AE014: @ 80AE014 +sub_80AE014: ; 80AE014 push {r4,r5,lr} ldr r0, =0x0854c14c ldr r1, [r0] @@ -326896,23 +326896,23 @@ sub_80AE014: @ 80AE014 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080AE058 + beq @080AE058 movs r4, 0 adds r5, r1, 0 adds r5, 0xF0 -_080AE02C: +@080AE02C: lsls r0, r4, 2 adds r0, r5, r0 ldr r0, [r0] cmp r0, 0 - beq _080AE03A + beq @080AE03A bl obj_delete_and_free_tiles -_080AE03A: +@080AE03A: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x13 - bls _080AE02C + bls @080AE02C ldr r0, =0x00001202 bl gpu_tile_obj_free_by_tag ldr r0, =0x0854c14c @@ -326922,7 +326922,7 @@ _080AE03A: adds r0, r1 movs r1, 0 strb r1, [r0] -_080AE058: +@080AE058: pop {r4,r5} pop {r0} bx r0 @@ -326931,7 +326931,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] @@ -326940,13 +326940,13 @@ sub_80AE068: @ 80AE068 lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - ble _080AE084 + ble @080AE084 movs r0, 0 strh r0, [r3, 0x30] ldrh r0, [r3, 0x2E] adds r0, 0x1 strh r0, [r3, 0x2E] -_080AE084: +@080AE084: ldr r1, =0x02021bbe ldrh r0, [r3, 0x2E] ldrh r1, [r1] @@ -326966,7 +326966,7 @@ _080AE084: lsls r1, 16 ldr r0, =0x010f0000 cmp r1, r0 - ble _080AE0C8 + ble @080AE0C8 movs r0, 0xF0 lsls r0, 1 adds r1, r0, 0 @@ -326981,7 +326981,7 @@ _080AE084: ldr r0, =0x000001ff ands r1, r0 strh r1, [r3, 0x20] -_080AE0C8: +@080AE0C8: pop {r4} pop {r0} bx r0 @@ -326990,7 +326990,7 @@ _080AE0C8: thumb_func_end sub_80AE068 thumb_func_start sub_80AE0E4 -sub_80AE0E4: @ 80AE0E4 +sub_80AE0E4: ; 80AE0E4 push {r4,lr} ldr r0, =0x0854c14c ldr r3, [r0] @@ -327021,7 +327021,7 @@ sub_80AE0E4: @ 80AE0E4 adds r0, r3, r1 ldrb r2, [r0] cmp r2, 0 - bne _080AE14E + bne @080AE14E adds r4, 0x2A adds r0, r3, r4 strh r2, [r0] @@ -327043,7 +327043,7 @@ sub_80AE0E4: @ 80AE0E4 movs r0, 0 movs r1, 0x10 bl sub_80AC124 -_080AE14E: +@080AE14E: pop {r4} pop {r0} bx r0 @@ -327052,7 +327052,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, =0x0854c14c @@ -327061,14 +327061,14 @@ sub_80AE168: @ 80AE168 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - bne _080AE188 + bne @080AE188 adds r4, r1, r2 -_080AE17E: +@080AE17E: bl sub_80AE198 ldrb r0, [r4] cmp r0, 0 - beq _080AE17E -_080AE188: + beq @080AE17E +@080AE188: pop {r4} pop {r0} bx r0 @@ -327077,7 +327077,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, =0x0854c14c @@ -327086,41 +327086,41 @@ sub_80AE198: @ 80AE198 adds r4, r5, r0 ldrh r0, [r4] cmp r0, 0x1 - beq _080AE1CC + beq @080AE1CC cmp r0, 0x1 - bgt _080AE1C0 + bgt @080AE1C0 cmp r0, 0 - beq _080AE1C6 - b _080AE1F0 + beq @080AE1C6 + b @080AE1F0 .align 2, 0 .pool -_080AE1C0: +@080AE1C0: cmp r0, 0x2 - beq _080AE1D8 - b _080AE1F0 -_080AE1C6: + beq @080AE1D8 + b @080AE1F0 +@080AE1C6: bl sub_80AE2F0 - b _080AE1EA -_080AE1CC: + b @080AE1EA +@080AE1CC: movs r0, 0xC movs r1, 0x8 movs r2, 0x8 bl sub_80AC164 - b _080AE1EA -_080AE1D8: + b @080AE1EA +@080AE1D8: bl sub_80AC1A8 lsls r0, 24 cmp r0, 0 - beq _080AE1F0 + beq @080AE1F0 ldr r0, =0x000006d2 adds r1, r5, r0 movs r0, 0x1 strb r0, [r1] -_080AE1EA: +@080AE1EA: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -_080AE1F0: +@080AE1F0: pop {r4,r5} pop {r0} bx r0 @@ -327129,7 +327129,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, =0x0854c14c @@ -327138,50 +327138,50 @@ sub_80AE1FC: @ 80AE1FC adds r4, r0, r1 ldrh r0, [r4] cmp r0, 0x1 - beq _080AE236 + beq @080AE236 cmp r0, 0x1 - bgt _080AE224 + bgt @080AE224 cmp r0, 0 - beq _080AE22A - b _080AE24E + beq @080AE22A + b @080AE24E .align 2, 0 .pool -_080AE224: +@080AE224: cmp r0, 0x2 - beq _080AE242 - b _080AE24E -_080AE22A: + beq @080AE242 + b @080AE24E +@080AE22A: movs r0, 0 movs r1, 0x10 movs r2, 0x1 bl sub_80AC164 - b _080AE246 -_080AE236: + b @080AE246 +@080AE236: bl sub_80AC1A8 lsls r0, 24 cmp r0, 0 - beq _080AE252 - b _080AE246 -_080AE242: + beq @080AE252 + b @080AE246 +@080AE242: bl sub_80AE3A8 -_080AE246: +@080AE246: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - b _080AE252 -_080AE24E: + b @080AE252 +@080AE24E: movs r0, 0 - b _080AE254 -_080AE252: + b @080AE254 +@080AE252: movs r0, 0x1 -_080AE254: +@080AE254: pop {r4} pop {r1} bx r1 thumb_func_end sub_80AE1FC thumb_func_start sub_80AE25C -sub_80AE25C: @ 80AE25C +sub_80AE25C: ; 80AE25C push {r4,r5,lr} ldr r0, =0x0854c14c ldr r3, [r0] @@ -327196,7 +327196,7 @@ sub_80AE25C: @ 80AE25C lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - bls _080AE288 + bls @080AE288 movs r0, 0xE4 lsls r0, 3 adds r1, r3, r0 @@ -327204,7 +327204,7 @@ sub_80AE25C: @ 80AE25C adds r0, 0x1 strh r0, [r1] strh r5, [r2] -_080AE288: +@080AE288: ldr r1, =0x0000071e adds r2, r3, r1 ldrh r0, [r2] @@ -327212,14 +327212,14 @@ _080AE288: strh r0, [r2] ands r0, r4 cmp r0, 0x4 - bls _080AE2A4 + bls @080AE2A4 ldr r0, =0x00000722 adds r1, r3, r0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] strh r5, [r2] -_080AE2A4: +@080AE2A4: ldr r0, =0x02021bbc movs r2, 0xE4 lsls r2, 3 @@ -327249,7 +327249,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, =0x0854c14c @@ -327258,7 +327258,7 @@ sub_80AE2F0: @ 80AE2F0 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _080AE396 + bne @080AE396 ldr r0, =0x0854fd70 ldr r1, [r0, 0x4] ldr r0, [r0] @@ -327267,7 +327267,7 @@ sub_80AE2F0: @ 80AE2F0 mov r0, sp bl gpu_tile_obj_alloc_tag_and_copy_to_vram movs r6, 0 -_080AE314: +@080AE314: adds r0, r6, 0 movs r1, 0x5 bl __udivsi3 @@ -327281,7 +327281,7 @@ _080AE314: lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _080AE370 + beq @080AE370 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -327300,10 +327300,10 @@ _080AE314: adds r0, r3 adds r0, r1 str r4, [r0] - b _080AE382 + b @080AE382 .align 2, 0 .pool -_080AE370: +@080AE370: ldr r2, =0x0854c14c ldr r1, [r2] lsls r0, r6, 2 @@ -327313,18 +327313,18 @@ _080AE370: adds r1, r0 movs r0, 0 str r0, [r1] -_080AE382: +@080AE382: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x13 - bls _080AE314 + bls @080AE314 ldr r0, [r2] ldr r1, =0x00000724 adds r0, r1 movs r1, 0x1 strb r1, [r0] -_080AE396: +@080AE396: add sp, 0x8 pop {r4-r6} pop {r0} @@ -327334,7 +327334,7 @@ _080AE396: thumb_func_end sub_80AE2F0 thumb_func_start sub_80AE3A8 -sub_80AE3A8: @ 80AE3A8 +sub_80AE3A8: ; 80AE3A8 push {r4,r5,lr} ldr r0, =0x0854c14c ldr r1, [r0] @@ -327342,24 +327342,24 @@ sub_80AE3A8: @ 80AE3A8 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080AE3EA + beq @080AE3EA movs r4, 0 movs r0, 0xA0 lsls r0, 1 adds r5, r1, r0 -_080AE3C0: +@080AE3C0: lsls r0, r4, 2 adds r0, r5, r0 ldr r0, [r0] cmp r0, 0 - beq _080AE3CE + beq @080AE3CE bl obj_delete_and_free_tiles -_080AE3CE: +@080AE3CE: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x13 - bls _080AE3C0 + bls @080AE3C0 ldr r0, =0x00001203 bl gpu_tile_obj_free_by_tag ldr r0, =0x0854c14c @@ -327368,7 +327368,7 @@ _080AE3CE: adds r0, r1 movs r1, 0 strb r1, [r0] -_080AE3EA: +@080AE3EA: pop {r4,r5} pop {r0} bx r0 @@ -327377,7 +327377,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, =0x0854c14c @@ -327399,7 +327399,7 @@ sub_80AE3FC: @ 80AE3FC lsls r1, 16 ldr r0, =0x010f0000 cmp r1, r0 - ble _080AE444 + ble @080AE444 movs r0, 0xF0 lsls r0, 1 adds r1, r0, 0 @@ -327414,7 +327414,7 @@ sub_80AE3FC: @ 80AE3FC ldr r0, =0x000001ff ands r1, r0 strh r1, [r3, 0x20] -_080AE444: +@080AE444: pop {r4} pop {r0} bx r0 @@ -327423,7 +327423,7 @@ _080AE444: thumb_func_end sub_80AE3FC thumb_func_start sub_80AE45C -sub_80AE45C: @ 80AE45C +sub_80AE45C: ; 80AE45C push {r4,lr} ldr r0, =0x0854c14c ldr r3, [r0] @@ -327446,7 +327446,7 @@ sub_80AE45C: @ 80AE45C adds r0, r3, r1 ldrb r2, [r0] cmp r2, 0 - bne _080AE4B8 + bne @080AE4B8 adds r4, 0x43 adds r1, r3, r4 adds r4, 0x4 @@ -327462,15 +327462,15 @@ sub_80AE45C: @ 80AE45C strh r2, [r0] ldrh r2, [r1] cmp r2, 0x5F - bls _080AE4B0 + bls @080AE4B0 movs r0, 0x80 subs r0, r2 strh r0, [r1] -_080AE4B0: +@080AE4B0: movs r0, 0 movs r1, 0x10 bl sub_80AC124 -_080AE4B8: +@080AE4B8: pop {r4} pop {r0} bx r0 @@ -327479,7 +327479,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, =0x0854c14c @@ -327488,14 +327488,14 @@ sub_80AE4DC: @ 80AE4DC adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - bne _080AE4FC + bne @080AE4FC adds r4, r1, r2 -_080AE4F2: +@080AE4F2: bl sub_80AE50C ldrb r0, [r4] cmp r0, 0 - beq _080AE4F2 -_080AE4FC: + beq @080AE4F2 +@080AE4FC: pop {r4} pop {r0} bx r0 @@ -327504,7 +327504,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 @@ -327514,50 +327514,50 @@ sub_80AE50C: @ 80AE50C adds r1, r5, r0 ldrh r0, [r1] cmp r0, 0x5F - bls _080AE528 + bls @080AE528 movs r0, 0x20 strh r0, [r1] -_080AE528: +@080AE528: ldr r0, =0x000006cc adds r4, r5, r0 ldrh r0, [r4] cmp r0, 0x1 - beq _080AE558 + beq @080AE558 cmp r0, 0x1 - bgt _080AE548 + bgt @080AE548 cmp r0, 0 - beq _080AE54E - b _080AE57C + beq @080AE54E + b @080AE57C .align 2, 0 .pool -_080AE548: +@080AE548: cmp r0, 0x2 - beq _080AE564 - b _080AE57C -_080AE54E: + beq @080AE564 + b @080AE57C +@080AE54E: bl sub_80AE738 bl sub_80AE7F8 - b _080AE576 -_080AE558: + b @080AE576 +@080AE558: movs r0, 0x10 movs r1, 0 movs r2, 0 bl sub_80AC164 - b _080AE576 -_080AE564: + b @080AE576 +@080AE564: bl sub_80AC1A8 lsls r0, 24 cmp r0, 0 - beq _080AE57C + beq @080AE57C ldr r0, =0x000006d2 adds r1, r5, r0 movs r0, 0x1 strb r0, [r1] -_080AE576: +@080AE576: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -_080AE57C: +@080AE57C: pop {r4,r5} pop {r0} bx r0 @@ -327566,7 +327566,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 @@ -327576,50 +327576,50 @@ sub_80AE588: @ 80AE588 adds r4, r0, r1 ldrh r0, [r4] cmp r0, 0x1 - beq _080AE5C6 + beq @080AE5C6 cmp r0, 0x1 - bgt _080AE5B4 + bgt @080AE5B4 cmp r0, 0 - beq _080AE5BA - b _080AE5DE + beq @080AE5BA + b @080AE5DE .align 2, 0 .pool -_080AE5B4: +@080AE5B4: cmp r0, 0x2 - beq _080AE5D2 - b _080AE5DE -_080AE5BA: + beq @080AE5D2 + b @080AE5DE +@080AE5BA: movs r0, 0 movs r1, 0x10 movs r2, 0 bl sub_80AC164 - b _080AE5D6 -_080AE5C6: + b @080AE5D6 +@080AE5C6: bl sub_80AC1A8 lsls r0, 24 cmp r0, 0 - beq _080AE5E2 - b _080AE5D6 -_080AE5D2: + beq @080AE5E2 + b @080AE5D6 +@080AE5D2: bl sub_80AE6A4 -_080AE5D6: +@080AE5D6: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - b _080AE5E2 -_080AE5DE: + b @080AE5E2 +@080AE5DE: movs r0, 0 - b _080AE5E4 -_080AE5E2: + b @080AE5E4 +@080AE5E2: movs r0, 0x1 -_080AE5E4: +@080AE5E4: pop {r4} pop {r1} bx r1 thumb_func_end sub_80AE588 thumb_func_start sub_80AE5EC -sub_80AE5EC: @ 80AE5EC +sub_80AE5EC: ; 80AE5EC push {lr} ldr r0, =0x0854c14c ldr r2, [r0] @@ -327631,7 +327631,7 @@ sub_80AE5EC: @ 80AE5EC lsls r0, 16 lsrs r0, 16 cmp r0, 0x4 - bls _080AE612 + bls @080AE612 ldr r1, =0x00000712 adds r0, r2, r1 ldrh r1, [r0] @@ -327639,7 +327639,7 @@ sub_80AE5EC: @ 80AE5EC movs r2, 0 strh r1, [r0] strh r2, [r3] -_080AE612: +@080AE612: pop {r0} bx r0 .align 2, 0 @@ -327647,7 +327647,7 @@ _080AE612: thumb_func_end sub_80AE5EC thumb_func_start sub_80AE624 -sub_80AE624: @ 80AE624 +sub_80AE624: ; 80AE624 push {r4-r6,lr} ldr r0, =0x0854c14c ldr r2, [r0] @@ -327703,7 +327703,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, =0x0854c14c ldr r1, [r0] @@ -327711,24 +327711,24 @@ sub_80AE6A4: @ 80AE6A4 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080AE6E6 + beq @080AE6E6 movs r4, 0 movs r0, 0xC8 lsls r0, 1 adds r5, r1, r0 -_080AE6BC: +@080AE6BC: lsls r0, r4, 2 adds r0, r5, r0 ldr r0, [r0] cmp r0, 0 - beq _080AE6CA + beq @080AE6CA bl obj_delete_and_free_tiles -_080AE6CA: +@080AE6CA: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x13 - bls _080AE6BC + bls @080AE6BC ldr r0, =0x0854c14c ldr r0, [r0] ldr r1, =0x00000716 @@ -327737,38 +327737,38 @@ _080AE6CA: strb r1, [r0] ldr r0, =0x00001204 bl gpu_tile_obj_free_by_tag -_080AE6E6: +@080AE6E6: ldr r0, =0x0854c14c ldr r1, [r0] ldr r2, =0x00000717 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080AE720 + beq @080AE720 movs r4, 0 movs r0, 0xF0 lsls r0, 1 adds r5, r1, r0 -_080AE6FC: +@080AE6FC: lsls r0, r4, 2 adds r0, r5, r0 ldr r0, [r0] cmp r0, 0 - beq _080AE70A + beq @080AE70A bl obj_delete_and_free_tiles -_080AE70A: +@080AE70A: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x4 - bls _080AE6FC + bls @080AE6FC ldr r0, =0x0854c14c ldr r0, [r0] ldr r1, =0x00000717 adds r0, r1 movs r1, 0 strb r1, [r0] -_080AE720: +@080AE720: pop {r4,r5} pop {r0} bx r0 @@ -327777,7 +327777,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, =0x0854c14c @@ -327786,13 +327786,13 @@ sub_80AE738: @ 80AE738 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _080AE7E6 + bne @080AE7E6 ldr r0, =0x0854fddc bl gpu_tile_obj_alloc_tag_and_copy_to_vram ldr r0, =0x0854c2b0 bl sub_80ABF4C movs r7, 0 -_080AE758: +@080AE758: adds r0, r7, 0 movs r1, 0x5 bl __udivsi3 @@ -327806,7 +327806,7 @@ _080AE758: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq _080AE7C0 + beq @080AE7C0 ldr r2, =0x0854c14c ldr r5, [r2] lsls r0, r7, 2 @@ -327828,10 +327828,10 @@ _080AE758: ldr r0, [r5] strh r6, [r0, 0x30] ldr r2, [sp] - b _080AE7D2 + b @080AE7D2 .align 2, 0 .pool -_080AE7C0: +@080AE7C0: ldr r2, =0x0854c14c ldr r1, [r2] lsls r0, r7, 2 @@ -327841,18 +327841,18 @@ _080AE7C0: adds r1, r0 movs r0, 0 str r0, [r1] -_080AE7D2: +@080AE7D2: adds r0, r7, 0x1 lsls r0, 16 lsrs r7, r0, 16 cmp r7, 0x13 - bls _080AE758 + bls @080AE758 ldr r0, [r2] ldr r1, =0x00000716 adds r0, r1 movs r1, 0x1 strb r1, [r0] -_080AE7E6: +@080AE7E6: add sp, 0x4 pop {r4-r7} pop {r0} @@ -327862,7 +327862,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 @@ -327874,12 +327874,12 @@ sub_80AE7F8: @ 80AE7F8 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _080AE8E4 + bne @080AE8E4 movs r7, 0 mov r9, r4 movs r2, 0 mov r10, r2 -_080AE818: +@080AE818: lsls r0, r7, 1 mov r8, r0 adds r6, r0, r7 @@ -327895,7 +327895,7 @@ _080AE818: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq _080AE8BC + beq @080AE8BC mov r2, r9 ldr r4, [r2] lsls r0, r7, 2 @@ -327943,10 +327943,10 @@ _080AE818: ldr r1, [r4] ldr r0, =sub_80AE958 + 1 str r0, [r1, 0x1C] - b _080AE8CE + b @080AE8CE .align 2, 0 .pool -_080AE8BC: +@080AE8BC: mov r2, r9 ldr r0, [r2] lsls r1, r7, 2 @@ -327956,7 +327956,7 @@ _080AE8BC: adds r0, r1 mov r1, r10 str r1, [r0] -_080AE8CE: +@080AE8CE: mov r2, r9 ldr r0, [r2] ldr r1, =0x00000717 @@ -327967,8 +327967,8 @@ _080AE8CE: lsls r0, 16 lsrs r7, r0, 16 cmp r7, 0x4 - bls _080AE818 -_080AE8E4: + bls @080AE818 +@080AE8E4: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -327981,7 +327981,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, =0x0854c14c @@ -328003,7 +328003,7 @@ sub_80AE8F8: @ 80AE8F8 lsls r1, 16 ldr r0, =0x010f0000 cmp r1, r0 - ble _080AE940 + ble @080AE940 movs r0, 0xF0 lsls r0, 1 adds r1, r0, 0 @@ -328018,7 +328018,7 @@ sub_80AE8F8: @ 80AE8F8 ldr r0, =0x000001ff ands r1, r0 strh r1, [r3, 0x20] -_080AE940: +@080AE940: pop {r4} pop {r0} bx r0 @@ -328027,7 +328027,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] @@ -328038,10 +328038,10 @@ sub_80AE958: @ 80AE958 movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _080AE972 + bne @080AE972 ldr r0, =sub_80AE97C + 1 str r0, [r2, 0x1C] -_080AE972: +@080AE972: pop {r0} bx r0 .align 2, 0 @@ -328049,7 +328049,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] @@ -328060,12 +328060,12 @@ sub_80AE97C: @ 80AE97C movs r1, 0x30 negs r1, r1 cmp r0, r1 - bge _080AE99A + bge @080AE99A movs r0, 0xD0 strh r0, [r5, 0x22] movs r0, 0x4 strh r0, [r5, 0x2E] -_080AE99A: +@080AE99A: movs r0, 0x2E ldrsh r4, [r5, r0] ldr r3, =0x08329f40 @@ -328098,13 +328098,13 @@ _080AE99A: lsls r0, 16 asrs r0, 16 cmp r0, 0x8 - ble _080AE9E6 + ble @080AE9E6 movs r0, 0 strh r0, [r5, 0x32] ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] -_080AE9E6: +@080AE9E6: pop {r4,r5} pop {r0} bx r0 @@ -328113,7 +328113,7 @@ _080AE9E6: thumb_func_end sub_80AE97C thumb_func_start sub_80AE9F0 -sub_80AE9F0: @ 80AE9F0 +sub_80AE9F0: ; 80AE9F0 ldr r0, =0x0854c14c ldr r1, [r0] ldr r0, =0x000006cc @@ -328134,7 +328134,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} @@ -328142,18 +328142,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, =0x0854c14c @@ -328162,7 +328162,7 @@ sub_80AEA34: @ 80AEA34 adds r0, r4, r1 ldrb r5, [r0] cmp r5, 0 - bne _080AEA6C + bne @080AEA6C ldr r0, =0x0854fdf8 bl gpu_tile_obj_alloc_tag_and_copy_to_vram movs r2, 0xE5 @@ -328180,7 +328180,7 @@ sub_80AEA34: @ 80AEA34 adds r2, 0x6 adds r0, r4, r2 strh r5, [r0] -_080AEA6C: +@080AEA6C: pop {r4,r5} pop {r0} bx r0 @@ -328189,7 +328189,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, =0x0854c14c @@ -328198,14 +328198,14 @@ sub_80AEA88: @ 80AEA88 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - bne _080AEAA8 + bne @080AEAA8 adds r4, r1, r2 -_080AEA9E: +@080AEA9E: bl sub_80AEAB8 ldrb r0, [r4] cmp r0, 0 - beq _080AEA9E -_080AEAA8: + beq @080AEA9E +@080AEAA8: pop {r4} pop {r0} bx r0 @@ -328214,7 +328214,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, =0x0854c14c @@ -328237,16 +328237,16 @@ sub_80AEAB8: @ 80AEAB8 lsrs r0, 16 ldrb r1, [r1] cmp r0, r1 - bls _080AEB10 + bls @080AEB10 strh r6, [r4] ldrh r0, [r3] adds r0, 0x1 strh r0, [r3] ands r0, r7 cmp r0, 0x7 - bls _080AEAF8 + bls @080AEAF8 strh r6, [r3] -_080AEAF8: +@080AEAF8: ldr r0, =0x0000072a adds r4, r5, r0 ldrh r0, [r4] @@ -328256,9 +328256,9 @@ _080AEAF8: strh r0, [r4] ands r0, r7 cmp r0, 0xC - bls _080AEB10 + bls @080AEB10 strh r6, [r4] -_080AEB10: +@080AEB10: pop {r4-r7} pop {r0} bx r0 @@ -328267,24 +328267,24 @@ _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 cmp r0, 0 - beq _080AEB3C + beq @080AEB3C movs r0, 0x1 - b _080AEB42 -_080AEB3C: + b @080AEB42 +@080AEB3C: bl sub_80AEBD0 movs r0, 0 -_080AEB42: +@080AEB42: pop {r1} bx r1 thumb_func_end sub_80AEB2C thumb_func_start sub_80AEB48 -sub_80AEB48: @ 80AEB48 +sub_80AEB48: ; 80AEB48 push {r4,lr} lsls r0, 16 ldr r1, =0x0854fe00 @@ -328306,7 +328306,7 @@ sub_80AEB48: @ 80AEB48 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq _080AEBB0 + beq @080AEBB0 ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 @@ -328336,7 +328336,7 @@ sub_80AEB48: @ 80AEB48 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_080AEBB0: +@080AEBB0: pop {r4} pop {r0} bx r0 @@ -328345,7 +328345,7 @@ _080AEBB0: thumb_func_end sub_80AEB48 thumb_func_start sub_80AEBD0 -sub_80AEBD0: @ 80AEBD0 +sub_80AEBD0: ; 80AEBD0 push {r4,r5,lr} ldr r0, =0x0854c14c ldr r0, [r0] @@ -328353,10 +328353,10 @@ sub_80AEBD0: @ 80AEBD0 adds r0, r1 ldrh r0, [r0] cmp r0, 0 - beq _080AEC1A + beq @080AEC1A movs r4, 0 ldr r5, =0x02020630 -_080AEBE4: +@080AEBE4: lsls r0, r4, 4 adds r0, r4 lsls r2, r0, 2 @@ -328366,15 +328366,15 @@ _080AEBE4: ldr r1, [r0] ldr r0, =0x0854fe44 cmp r1, r0 - bne _080AEBFE + bne @080AEBFE adds r0, r2, r5 bl obj_delete_and_free_tiles -_080AEBFE: +@080AEBFE: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x3F - bls _080AEBE4 + bls @080AEBE4 ldr r0, =0x00001205 bl gpu_tile_obj_free_by_tag ldr r0, =0x0854c14c @@ -328383,7 +328383,7 @@ _080AEBFE: adds r0, r1 movs r1, 0 strh r1, [r0] -_080AEC1A: +@080AEC1A: pop {r4,r5} pop {r0} bx r0 @@ -328392,7 +328392,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] @@ -328402,31 +328402,31 @@ unc_0807DAB4: @ 80AEC34 lsls r0, 16 asrs r0, 16 cmp r0, 0x8 - ble _080AEC74 + ble @080AEC74 strh r2, [r1, 0x2E] movs r3, 0x30 ldrsh r0, [r1, r3] cmp r0, 0 - bne _080AEC66 + bne @080AEC66 ldrh r0, [r1, 0x24] adds r0, 0x1 strh r0, [r1, 0x24] lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _080AEC74 + ble @080AEC74 movs r0, 0x1 strh r0, [r1, 0x30] - b _080AEC74 -_080AEC66: + b @080AEC74 +@080AEC66: ldrh r0, [r1, 0x24] subs r0, 0x1 strh r0, [r1, 0x24] lsls r0, 16 cmp r0, 0 - bgt _080AEC74 + bgt @080AEC74 strh r2, [r1, 0x30] -_080AEC74: +@080AEC74: ldrh r0, [r1, 0x22] subs r0, 0x3 strh r0, [r1, 0x22] @@ -328436,16 +328436,16 @@ _080AEC74: lsls r0, 16 asrs r0, 16 cmp r0, 0x77 - ble _080AEC8E + ble @080AEC8E adds r0, r1, 0 bl obj_delete_and_free_tiles -_080AEC8E: +@080AEC8E: pop {r0} bx r0 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 @@ -328456,7 +328456,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 @@ -328468,19 +328468,19 @@ sub_80AECA8: @ 80AECA8 movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080AECCC + beq @080AECCC cmp r0, 0x1 - beq _080AECF8 - b _080AED1C + beq @080AECF8 + b @080AED1C .align 2, 0 .pool -_080AECCC: +@080AECCC: ldrh r0, [r4, 0x1E] subs r1, r0, 0x1 strh r1, [r4, 0x1E] lsls r0, 16 cmp r0, 0 - bgt _080AED1C + bgt @080AED1C ldrb r0, [r4, 0x2] bl weather_set ldr r1, =0x02038bc4 @@ -328492,16 +328492,16 @@ _080AECCC: strh r0, [r4, 0x1E] ldrh r0, [r4] adds r0, 0x1 - b _080AED1A + b @080AED1A .align 2, 0 .pool -_080AECF8: +@080AECF8: ldrh r0, [r4, 0x1E] subs r1, r0, 0x1 strh r1, [r4, 0x1E] lsls r0, 16 cmp r0, 0 - bgt _080AED1C + bgt @080AED1C ldrb r0, [r4, 0x4] bl weather_set ldr r1, =0x02038bc4 @@ -328512,9 +328512,9 @@ _080AECF8: adds r0, r1, 0 strh r0, [r4, 0x1E] movs r0, 0 -_080AED1A: +@080AED1A: strh r0, [r4] -_080AED1C: +@080AED1C: pop {r4} pop {r0} bx r0 @@ -328523,7 +328523,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 + 1 movs r1, 0 @@ -328542,33 +328542,33 @@ bag_add_task0_by_acit: @ 80AED28 ldr r3, =0x02038bc4 ldrb r2, [r3] cmp r2, 0xD - bne _080AED60 + bne @080AED60 movs r0, 0xC - b _080AED66 + b @080AED66 .align 2, 0 .pool -_080AED60: +@080AED60: cmp r2, 0xC - bne _080AED6C + bne @080AED6C movs r0, 0xD -_080AED66: +@080AED66: strh r0, [r1, 0x2] strh r2, [r1, 0x4] - b _080AED78 -_080AED6C: + b @080AED78 +@080AED6C: movs r0, 0xD strb r0, [r3] movs r0, 0xC strh r0, [r1, 0x2] movs r0, 0xD strh r0, [r1, 0x4] -_080AED78: +@080AED78: pop {r0} bx r0 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] @@ -328593,7 +328593,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 @@ -328604,7 +328604,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] @@ -328629,7 +328629,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 @@ -328641,7 +328641,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 @@ -328653,42 +328653,42 @@ 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 lsrs r4, r0, 24 cmp r4, 0xF - bne _080AEE4C + bne @080AEE4C ldr r0, =sub_80AECA8 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _080AEE3E + bne @080AEE3E bl bag_add_task0_by_acit -_080AEE3E: +@080AEE3E: ldr r0, =0x02038bc4 ldrb r4, [r0] - b _080AEE6E + b @080AEE6E .align 2, 0 .pool -_080AEE4C: +@080AEE4C: ldr r5, =sub_80AECA8 + 1 adds r0, r5, 0 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - beq _080AEE68 + beq @080AEE68 adds r0, r5, 0 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task -_080AEE68: +@080AEE68: ldr r1, =0x02038bc4 movs r0, 0xD strb r0, [r1] -_080AEE6E: +@080AEE6E: adds r0, r4, 0 bl weather_set pop {r4,r5} @@ -328699,42 +328699,42 @@ _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 lsrs r4, r0, 24 cmp r4, 0xF - bne _080AEEB0 + bne @080AEEB0 ldr r0, =sub_80AECA8 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _080AEEA2 + bne @080AEEA2 bl bag_add_task0_by_acit -_080AEEA2: +@080AEEA2: ldr r0, =0x02038bc4 ldrb r4, [r0] - b _080AEED2 + b @080AEED2 .align 2, 0 .pool -_080AEEB0: +@080AEEB0: ldr r5, =sub_80AECA8 + 1 adds r0, r5, 0 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - beq _080AEECC + beq @080AEECC adds r0, r5, 0 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task -_080AEECC: +@080AEECC: ldr r1, =0x02038bc4 movs r0, 0xD strb r0, [r1] -_080AEED2: +@080AEED2: adds r0, r4, 0 bl sub_80AB104 pop {r4,r5} @@ -328745,114 +328745,114 @@ _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 cmp r0, 0x15 - bhi _080AEFB4 + bhi @080AEFB4 lsls r0, 2 - ldr r1, =_080AEF00 + ldr r1, =@080AEF00 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080AEF00: - .4byte _080AEFB4 - .4byte _080AEF58 - .4byte _080AEF5C - .4byte _080AEF60 - .4byte _080AEF64 - .4byte _080AEF68 - .4byte _080AEF6C - .4byte _080AEF70 - .4byte _080AEF74 - .4byte _080AEF78 - .4byte _080AEF7C - .4byte _080AEF80 - .4byte _080AEF84 - .4byte _080AEF88 - .4byte _080AEF8C - .4byte _080AEF90 - .4byte _080AEFB4 - .4byte _080AEFB4 - .4byte _080AEFB4 - .4byte _080AEFB4 - .4byte _080AEF94 - .4byte _080AEF9C -_080AEF58: +@080AEF00: + .4byte @080AEFB4 + .4byte @080AEF58 + .4byte @080AEF5C + .4byte @080AEF60 + .4byte @080AEF64 + .4byte @080AEF68 + .4byte @080AEF6C + .4byte @080AEF70 + .4byte @080AEF74 + .4byte @080AEF78 + .4byte @080AEF7C + .4byte @080AEF80 + .4byte @080AEF84 + .4byte @080AEF88 + .4byte @080AEF8C + .4byte @080AEF90 + .4byte @080AEFB4 + .4byte @080AEFB4 + .4byte @080AEFB4 + .4byte @080AEFB4 + .4byte @080AEF94 + .4byte @080AEF9C +@080AEF58: movs r0, 0x1 - b _080AEFB6 -_080AEF5C: + b @080AEFB6 +@080AEF5C: movs r0, 0x2 - b _080AEFB6 -_080AEF60: + b @080AEFB6 +@080AEF60: movs r0, 0x3 - b _080AEFB6 -_080AEF64: + b @080AEFB6 +@080AEF64: movs r0, 0x4 - b _080AEFB6 -_080AEF68: + b @080AEFB6 +@080AEF68: movs r0, 0x5 - b _080AEFB6 -_080AEF6C: + b @080AEFB6 +@080AEF6C: movs r0, 0x6 - b _080AEFB6 -_080AEF70: + b @080AEFB6 +@080AEF70: movs r0, 0x7 - b _080AEFB6 -_080AEF74: + b @080AEFB6 +@080AEF74: movs r0, 0x8 - b _080AEFB6 -_080AEF78: + b @080AEFB6 +@080AEF78: movs r0, 0x9 - b _080AEFB6 -_080AEF7C: + b @080AEFB6 +@080AEF7C: movs r0, 0xA - b _080AEFB6 -_080AEF80: + b @080AEFB6 +@080AEF80: movs r0, 0xB - b _080AEFB6 -_080AEF84: + b @080AEFB6 +@080AEF84: movs r0, 0xC - b _080AEFB6 -_080AEF88: + b @080AEFB6 +@080AEF88: movs r0, 0xD - b _080AEFB6 -_080AEF8C: + b @080AEFB6 +@080AEF8C: movs r0, 0xE - b _080AEFB6 -_080AEF90: + b @080AEFB6 +@080AEF90: movs r0, 0xF - b _080AEFB6 -_080AEF94: + b @080AEFB6 +@080AEF94: ldr r1, =0x0854fe5c - b _080AEF9E + b @080AEF9E .align 2, 0 .pool -_080AEF9C: +@080AEF9C: ldr r1, =0x0854fe60 -_080AEF9E: +@080AEF9E: ldr r0, =0x03005d8c ldr r0, [r0] adds r0, 0x2F ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] - b _080AEFB6 + b @080AEFB6 .align 2, 0 .pool -_080AEFB4: +@080AEFB4: movs r0, 0 -_080AEFB6: +@080AEFB6: pop {r1} bx r1 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] @@ -328872,27 +328872,27 @@ 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 lsrs r2, r0, 24 cmp r0, r1 - beq _080AEFF6 + beq @080AEFF6 cmp r2, 0x3 - beq _080AEFF0 + beq @080AEFF0 cmp r2, 0x5 - bne _080AEFF6 -_080AEFF0: + bne @080AEFF6 +@080AEFF0: movs r0, 0x28 bl sav12_xor_increment -_080AEFF6: +@080AEFF6: pop {r0} bx r0 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 @@ -328909,7 +328909,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 @@ -328926,7 +328926,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 @@ -328941,29 +328941,29 @@ pal_fill_for_maplights: @ 80AF040 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _080AF06A + beq @080AF06A cmp r0, 0x1 - beq _080AF078 - b _080AF084 -_080AF06A: + beq @080AF078 + b @080AF084 +@080AF06A: bl palette_bg_faded_fill_black movs r0, 0 movs r1, 0 bl fade_screen - b _080AF084 -_080AF078: + b @080AF084 +@080AF078: bl palette_bg_faded_fill_white movs r0, 0x2 movs r1, 0 bl fade_screen -_080AF084: +@080AF084: pop {r4} pop {r0} bx r0 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 @@ -328974,7 +328974,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 @@ -328985,7 +328985,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 @@ -328998,34 +328998,34 @@ sub_80AF0B4: @ 80AF0B4 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _080AF0DA + beq @080AF0DA cmp r0, 0x1 - beq _080AF0E4 - b _080AF0EC -_080AF0DA: + beq @080AF0E4 + b @080AF0EC +@080AF0DA: movs r0, 0x1 movs r1, 0 bl fade_screen - b _080AF0EC -_080AF0E4: + b @080AF0EC +@080AF0E4: movs r0, 0x3 movs r1, 0 bl fade_screen -_080AF0EC: +@080AF0EC: pop {r4} pop {r0} bx r0 thumb_func_end sub_80AF0B4 thumb_func_start sub_80AF0F4 -sub_80AF0F4: @ 80AF0F4 +sub_80AF0F4: ; 80AF0F4 push {lr} lsls r0, 24 movs r1, 0 cmp r0, 0 - bne _080AF100 + bne @080AF100 movs r1, 0x1 -_080AF100: +@080AF100: adds r0, r1, 0 bl sub_808C0A8 pop {r0} @@ -329033,23 +329033,23 @@ _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 bl sub_80AF71C cmp r0, 0x1 - bne _080AF120 + bne @080AF120 adds r0, r4, 0 bl remove_task -_080AF120: +@080AF120: pop {r4} pop {r0} bx r0 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 @@ -329064,24 +329064,24 @@ 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 bl sub_80AF71C cmp r0, 0x1 - bne _080AF160 + bne @080AF160 adds r0, r4, 0 bl remove_task bl script_env_2_enable_and_set_ctx_running -_080AF160: +@080AF160: pop {r4} pop {r0} bx r0 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 @@ -329096,7 +329096,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 @@ -329110,7 +329110,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 @@ -329122,25 +329122,25 @@ task_mpl_807DD60: @ 80AF1A4 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080AF1DE + beq @080AF1DE cmp r0, 0x1 - bgt _080AF1CC + bgt @080AF1CC cmp r0, 0 - beq _080AF1D2 - b _080AF20E + beq @080AF1D2 + b @080AF20E .align 2, 0 .pool -_080AF1CC: +@080AF1CC: cmp r0, 0x2 - beq _080AF1FC - b _080AF20E -_080AF1D2: + beq @080AF1FC + b @080AF20E +@080AF1D2: bl sub_80B3050 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0xA] - b _080AF1F4 -_080AF1DE: + b @080AF1F4 +@080AF1DE: movs r1, 0xA ldrsh r0, [r4, r1] lsls r1, r0, 2 @@ -329149,28 +329149,28 @@ _080AF1DE: adds r1, r2 ldrb r0, [r1, 0x4] cmp r0, 0x1 - beq _080AF20E + beq @080AF20E bl pal_fill_for_maplights -_080AF1F4: +@080AF1F4: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080AF20E -_080AF1FC: + b @080AF20E +@080AF1FC: bl sub_80AF71C cmp r0, 0x1 - bne _080AF20E + bne @080AF20E bl script_env_2_disable adds r0, r5, 0 bl remove_task -_080AF20E: +@080AF20E: pop {r4,r5} pop {r0} bx r0 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 @@ -329185,7 +329185,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 @@ -329197,26 +329197,26 @@ sub_80AF234: @ 80AF234 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080AF268 + beq @080AF268 cmp r0, 0x1 - bgt _080AF25C + bgt @080AF25C cmp r0, 0 - beq _080AF262 - b _080AF2AE + beq @080AF262 + b @080AF2AE .align 2, 0 .pool -_080AF25C: +@080AF25C: cmp r0, 0x2 - beq _080AF298 - b _080AF2AE -_080AF262: + beq @080AF298 + b @080AF2AE +@080AF262: bl sub_800ADF8 - b _080AF290 -_080AF268: + b @080AF290 +@080AF268: bl sub_800A520 lsls r0, 24 cmp r0, 0 - bne _080AF28C + bne @080AF28C ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] @@ -329224,34 +329224,34 @@ _080AF268: movs r1, 0xE1 lsls r1, 19 cmp r0, r1 - ble _080AF2AE + ble @080AF2AE movs r0, 0xC0 lsls r0, 7 bl sub_8011170 - b _080AF2AE -_080AF28C: + b @080AF2AE +@080AF28C: bl pal_fill_for_maplights -_080AF290: +@080AF290: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080AF2AE -_080AF298: + b @080AF2AE +@080AF298: bl sub_80AF71C cmp r0, 0x1 - bne _080AF2AE + bne @080AF2AE bl sub_8009F18 bl script_env_2_disable adds r0, r5, 0 bl remove_task -_080AF2AE: +@080AF2AE: pop {r4,r5} pop {r0} bx r0 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 @@ -329263,45 +329263,45 @@ sub_80AF2B4: @ 80AF2B4 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080AF2E8 + beq @080AF2E8 cmp r0, 0x1 - bgt _080AF2DC + bgt @080AF2DC cmp r0, 0 - beq _080AF2E2 - b _080AF30C + beq @080AF2E2 + b @080AF30C .align 2, 0 .pool -_080AF2DC: +@080AF2DC: cmp r0, 0x2 - beq _080AF2FA - b _080AF30C -_080AF2E2: + beq @080AF2FA + b @080AF30C +@080AF2E2: bl sub_800ADF8 - b _080AF2F2 -_080AF2E8: + b @080AF2F2 +@080AF2E8: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080AF30C -_080AF2F2: + beq @080AF30C +@080AF2F2: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080AF30C -_080AF2FA: + b @080AF30C +@080AF2FA: bl sub_8009F18 bl sub_8086C2C bl script_env_2_disable adds r0, r5, 0 bl remove_task -_080AF30C: +@080AF30C: pop {r4,r5} pop {r0} bx r0 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 @@ -329316,7 +329316,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 @@ -329337,21 +329337,21 @@ sub_80AF334: @ 80AF334 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080AF36C + bne @080AF36C ldr r1, =sub_80AF438 + 1 - b _080AF37E + b @080AF37E .align 2, 0 .pool -_080AF36C: +@080AF36C: adds r0, r4, 0 bl sub_8088F58 lsls r0, 24 lsrs r0, 24 ldr r1, =task_map_chg_seq_0807E2CC + 1 cmp r0, 0x1 - bne _080AF37E + bne @080AF37E ldr r1, =task_map_chg_seq_0807E20C + 1 -_080AF37E: +@080AF37E: adds r0, r1, 0 movs r1, 0xA bl AddTask @@ -329364,7 +329364,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 @@ -329375,7 +329375,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 @@ -329386,13 +329386,13 @@ 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 - bne _080AF3D6 + bne @080AF3D6 bl sub_8085784 -_080AF3D6: +@080AF3D6: bl pal_fill_black bl sub_80AF334 bl script_env_2_enable @@ -329401,7 +329401,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 @@ -329418,7 +329418,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 @@ -329437,7 +329437,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 @@ -329454,22 +329454,22 @@ sub_80AF438: @ 80AF438 ldrsh r0, [r5, r2] adds r2, r1, 0 cmp r0, 0x4 - bhi _080AF54A + bhi @080AF54A lsls r0, 2 - ldr r1, =_080AF46C + ldr r1, =@080AF46C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080AF46C: - .4byte _080AF480 - .4byte _080AF4A4 - .4byte _080AF4DC - .4byte _080AF520 - .4byte _080AF540 -_080AF480: +@080AF46C: + .4byte @080AF480 + .4byte @080AF4A4 + .4byte @080AF4DC + .4byte @080AF520 + .4byte @080AF540 +@080AF480: movs r0, 0 bl sub_80AF0F4 bl player_bitmagic @@ -329483,11 +329483,11 @@ _080AF480: bl sub_808A854 movs r0, 0x1 strh r0, [r5, 0x8] - b _080AF54A -_080AF4A4: + b @080AF54A +@080AF4A4: bl sub_80AF71C cmp r0, 0 - beq _080AF54A + beq @080AF54A movs r0, 0x1 bl sub_80AF0F4 movs r0, 0xFF @@ -329506,14 +329506,14 @@ _080AF4A4: bl npc_set_state_2 movs r0, 0x2 strh r0, [r5, 0x8] - b _080AF54A + b @080AF54A .align 2, 0 .pool -_080AF4DC: +@080AF4DC: bl walkrun_is_standing_still lsls r0, 24 cmp r0, 0 - beq _080AF54A + beq @080AF54A movs r1, 0 ldrsh r0, [r6, r1] movs r2, 0 @@ -329537,38 +329537,38 @@ _080AF4DC: bl sub_8093284 movs r0, 0x3 strh r0, [r5, 0x8] - b _080AF54A + b @080AF54A .align 2, 0 .pool -_080AF520: +@080AF520: movs r1, 0xA ldrsh r0, [r5, r1] cmp r0, 0 - blt _080AF536 + blt @080AF536 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 ldrb r0, [r1, 0x4] cmp r0, 0x1 - beq _080AF54A -_080AF536: + beq @080AF54A +@080AF536: bl sub_809757C movs r0, 0x4 strh r0, [r5, 0x8] - b _080AF54A -_080AF540: + b @080AF54A +@080AF540: bl script_env_2_disable adds r0, r4, 0 bl remove_task -_080AF54A: +@080AF54A: pop {r4-r7} pop {r0} bx r0 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 @@ -329584,21 +329584,21 @@ task_map_chg_seq_0807E20C: @ 80AF550 movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _080AF5A2 + beq @080AF5A2 cmp r0, 0x1 - bgt _080AF580 + bgt @080AF580 cmp r0, 0 - beq _080AF58A - b _080AF60A + beq @080AF58A + b @080AF60A .align 2, 0 .pool -_080AF580: +@080AF580: cmp r0, 0x2 - beq _080AF5EC + beq @080AF5EC cmp r0, 0x3 - beq _080AF600 - b _080AF60A -_080AF58A: + beq @080AF600 + b @080AF60A +@080AF58A: movs r0, 0 bl sub_80AF0F4 bl player_bitmagic @@ -329607,11 +329607,11 @@ _080AF58A: bl player_get_pos_to movs r0, 0x1 strh r0, [r5, 0x8] - b _080AF60A -_080AF5A2: + b @080AF60A +@080AF5A2: bl sub_80AF71C cmp r0, 0 - beq _080AF60A + beq @080AF60A movs r0, 0x1 bl sub_80AF0F4 movs r0, 0xFF @@ -329636,30 +329636,30 @@ _080AF5A2: bl npc_set_state_2 movs r0, 0x2 strh r0, [r5, 0x8] - b _080AF60A + b @080AF60A .align 2, 0 .pool -_080AF5EC: +@080AF5EC: bl walkrun_is_standing_still lsls r0, 24 cmp r0, 0 - beq _080AF60A + beq @080AF60A bl sub_809757C movs r0, 0x3 strh r0, [r5, 0x8] - b _080AF60A -_080AF600: + b @080AF60A +@080AF600: bl script_env_2_disable adds r0, r4, 0 bl remove_task -_080AF60A: +@080AF60A: pop {r4-r7} pop {r0} bx r0 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 @@ -329671,47 +329671,47 @@ task_map_chg_seq_0807E2CC: @ 80AF610 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080AF634 + beq @080AF634 cmp r0, 0x1 - beq _080AF644 - b _080AF65A + beq @080AF644 + b @080AF65A .align 2, 0 .pool -_080AF634: +@080AF634: bl player_bitmagic bl script_env_2_enable ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080AF65A -_080AF644: + b @080AF65A +@080AF644: bl sub_80AF71C cmp r0, 0 - beq _080AF65A + beq @080AF65A bl sub_809757C bl script_env_2_disable adds r0, r5, 0 bl remove_task -_080AF65A: +@080AF65A: pop {r4,r5} pop {r0} bx r0 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 bl sub_80AF71C cmp r0, 0x1 - bne _080AF67C + bne @080AF67C adds r0, r4, 0 bl remove_task ldr r0, =sub_809FA34 + 1 movs r1, 0x50 bl AddTask -_080AF67C: +@080AF67C: pop {r4} pop {r0} bx r0 @@ -329720,7 +329720,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 + 1 @@ -329734,7 +329734,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 @@ -329743,25 +329743,25 @@ 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 bl sub_80AF71C cmp r0, 0x1 - bne _080AF6CC + bne @080AF6CC bl script_env_2_disable adds r0, r4, 0 bl remove_task bl sub_80984F4 -_080AF6CC: +@080AF6CC: pop {r4} pop {r0} bx r0 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 @@ -329775,7 +329775,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 @@ -329790,7 +329790,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 @@ -329800,24 +329800,24 @@ 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 lsrs r0, 24 cmp r0, 0x1 - beq _080AF72E + beq @080AF72E movs r0, 0 - b _080AF730 -_080AF72E: + b @080AF730 +@080AF72E: movs r0, 0x1 -_080AF730: +@080AF730: pop {r1} bx r1 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 @@ -329838,7 +329838,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 @@ -329857,7 +329857,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 @@ -329878,7 +329878,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 @@ -329894,7 +329894,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 @@ -329907,7 +329907,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 @@ -329922,7 +329922,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 @@ -329932,7 +329932,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 @@ -329942,7 +329942,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 @@ -329962,7 +329962,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 @@ -329985,7 +329985,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 @@ -330002,7 +330002,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 @@ -330014,41 +330014,41 @@ sub_80AF8E0: @ 80AF8E0 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080AF914 + beq @080AF914 cmp r0, 0x1 - bgt _080AF908 + bgt @080AF908 cmp r0, 0 - beq _080AF90E - b _080AF93E + beq @080AF90E + b @080AF93E .align 2, 0 .pool -_080AF908: +@080AF908: cmp r0, 0x2 - beq _080AF92E - b _080AF93E -_080AF90E: + beq @080AF92E + b @080AF93E +@080AF90E: bl script_env_2_enable - b _080AF926 -_080AF914: + b @080AF926 +@080AF914: bl sub_80AF710 cmp r0, 0 - bne _080AF93E + bne @080AF93E bl sub_80859A0 lsls r0, 24 cmp r0, 0 - beq _080AF93E -_080AF926: + beq @080AF93E +@080AF926: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080AF93E -_080AF92E: + b @080AF93E +@080AF92E: bl warp_in ldr r0, =sub_8086074 + 1 bl set_callback2 adds r0, r5, 0 bl remove_task -_080AF93E: +@080AF93E: pop {r4,r5} pop {r0} bx r0 @@ -330057,7 +330057,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 @@ -330074,7 +330074,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 @@ -330086,19 +330086,19 @@ sub_80AF96C: @ 80AF96C movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080AF9B2 + beq @080AF9B2 cmp r0, 0x1 - bgt _080AF994 + bgt @080AF994 cmp r0, 0 - beq _080AF99A - b _080AF9E8 + beq @080AF99A + b @080AF9E8 .align 2, 0 .pool -_080AF994: +@080AF994: cmp r0, 0x2 - beq _080AF9D0 - b _080AF9E8 -_080AF99A: + beq @080AF9D0 + b @080AF9E8 +@080AF99A: bl sub_8009FAC movs r0, 0x1 movs r1, 0 @@ -330106,32 +330106,32 @@ _080AF99A: bl music_something movs r0, 0x9 bl audio_play - b _080AF9C8 -_080AF9B2: + b @080AF9C8 +@080AF9B2: bl sub_80AF710 cmp r0, 0 - bne _080AF9E8 + bne @080AF9E8 bl sub_80859A0 lsls r0, 24 cmp r0, 0 - beq _080AF9E8 + beq @080AF9E8 bl sub_800AC34 -_080AF9C8: +@080AF9C8: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - b _080AF9E8 -_080AF9D0: + b @080AF9E8 +@080AF9D0: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _080AF9E8 + bne @080AF9E8 bl warp_in ldr r0, =c2_load_new_map + 1 bl set_callback2 adds r0, r5, 0 bl remove_task -_080AF9E8: +@080AF9E8: pop {r4,r5} pop {r0} bx r0 @@ -330140,7 +330140,7 @@ _080AF9E8: thumb_func_end sub_80AF96C thumb_func_start sub_80AF9F8 -sub_80AF9F8: @ 80AF9F8 +sub_80AF9F8: ; 80AF9F8 push {lr} ldr r0, =sub_80AF96C + 1 movs r1, 0xA @@ -330152,7 +330152,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 @@ -330164,49 +330164,49 @@ sub_80AFA0C: @ 80AFA0C movs r0, 0x8 ldrsh r5, [r4, r0] cmp r5, 0x1 - beq _080AFA44 + beq @080AFA44 cmp r5, 0x1 - bgt _080AFA34 + bgt @080AFA34 cmp r5, 0 - beq _080AFA3A - b _080AFA7C + beq @080AFA3A + b @080AFA7C .align 2, 0 .pool -_080AFA34: +@080AFA34: cmp r5, 0x2 - beq _080AFA6C - b _080AFA7C -_080AFA3A: + beq @080AFA6C + b @080AFA7C +@080AFA3A: bl player_bitmagic bl script_env_2_enable - b _080AFA64 -_080AFA44: + b @080AFA64 +@080AFA44: bl sub_80AF710 cmp r0, 0 - bne _080AFA7C + bne @080AFA7C movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0 - bne _080AFA5A + bne @080AFA5A bl sub_81BE72C strh r5, [r4, 0xA] -_080AFA5A: +@080AFA5A: bl sub_80859A0 lsls r0, 24 cmp r0, 0 - beq _080AFA7C -_080AFA64: + beq @080AFA7C +@080AFA64: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080AFA7C -_080AFA6C: + b @080AFA7C +@080AFA6C: bl warp_in ldr r0, =c2_load_new_map + 1 bl set_callback2 adds r0, r6, 0 bl remove_task -_080AFA7C: +@080AFA7C: pop {r4-r6} pop {r0} bx r0 @@ -330215,7 +330215,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 @@ -330232,24 +330232,24 @@ sub_80AFA88: @ 80AFA88 ldrsh r1, [r5, r2] adds r2, r0, 0 cmp r1, 0x4 - bls _080AFAAC - b _080AFBE8 -_080AFAAC: + bls @080AFAAC + b @080AFBE8 +@080AFAAC: lsls r0, r1, 2 - ldr r1, =_080AFAC0 + ldr r1, =@080AFAC0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080AFAC0: - .4byte _080AFAD4 - .4byte _080AFB10 - .4byte _080AFB6C - .4byte _080AFBB8 - .4byte _080AFBD4 -_080AFAD4: +@080AFAC0: + .4byte @080AFAD4 + .4byte @080AFB10 + .4byte @080AFB6C + .4byte @080AFBB8 + .4byte @080AFBD4 +@080AFAD4: bl player_bitmagic adds r0, r4, 0 adds r1, r6, 0 @@ -330274,20 +330274,20 @@ _080AFAD4: strh r0, [r5, 0xA] movs r0, 0x1 strh r0, [r5, 0x8] - b _080AFBE8 -_080AFB10: + b @080AFBE8 +@080AFB10: movs r1, 0xA ldrsh r0, [r5, r1] cmp r0, 0 - blt _080AFB26 + blt @080AFB26 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 ldrb r0, [r1, 0x4] cmp r0, 0x1 - beq _080AFBE8 -_080AFB26: + beq @080AFBE8 +@080AFB26: movs r0, 0xFF movs r1, 0 movs r2, 0 @@ -330316,14 +330316,14 @@ _080AFB26: bl npc_set_state_2 movs r0, 0x2 strh r0, [r5, 0x8] - b _080AFBE8 + b @080AFBE8 .align 2, 0 .pool -_080AFB6C: +@080AFB6C: bl walkrun_is_standing_still lsls r0, 24 cmp r0, 0 - beq _080AFBE8 + beq @080AFBE8 movs r2, 0 ldrsh r0, [r4, r2] movs r2, 0 @@ -330350,26 +330350,26 @@ _080AFB6C: bl sub_80AF0F4 movs r0, 0x3 strh r0, [r5, 0x8] - b _080AFBE8 + b @080AFBE8 .align 2, 0 .pool -_080AFBB8: +@080AFBB8: movs r1, 0xA ldrsh r0, [r5, r1] cmp r0, 0 - blt _080AFBCE + blt @080AFBCE lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 ldrb r0, [r1, 0x4] cmp r0, 0x1 - beq _080AFBE8 -_080AFBCE: + beq @080AFBE8 +@080AFBCE: movs r0, 0x4 strh r0, [r5, 0x8] - b _080AFBE8 -_080AFBD4: + b @080AFBE8 +@080AFBD4: bl music_something bl sub_80AF0B4 bl play_some_sound @@ -330377,7 +330377,7 @@ _080AFBD4: strh r0, [r5, 0x8] ldr r0, =sub_80AFA0C + 1 str r0, [r5] -_080AFBE8: +@080AFBE8: pop {r4-r6} pop {r0} bx r0 @@ -330386,7 +330386,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 @@ -330398,42 +330398,42 @@ task0A_fade_n_map_maybe: @ 80AFBF4 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080AFC2C + beq @080AFC2C cmp r0, 0x1 - bgt _080AFC1C + bgt @080AFC1C cmp r0, 0 - beq _080AFC22 - b _080AFC56 + beq @080AFC22 + b @080AFC56 .align 2, 0 .pool -_080AFC1C: +@080AFC1C: cmp r0, 0x2 - beq _080AFC46 - b _080AFC56 -_080AFC22: + beq @080AFC46 + b @080AFC56 +@080AFC22: bl player_bitmagic bl script_env_2_enable - b _080AFC3E -_080AFC2C: + b @080AFC3E +@080AFC2C: bl sub_80AF710 cmp r0, 0 - bne _080AFC56 + bne @080AFC56 bl sub_80859A0 lsls r0, 24 cmp r0, 0 - beq _080AFC56 -_080AFC3E: + beq @080AFC56 +@080AFC3E: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080AFC56 -_080AFC46: + b @080AFC56 +@080AFC46: bl warp_in ldr r0, =sub_8086024 + 1 bl set_callback2 adds r0, r5, 0 bl remove_task -_080AFC56: +@080AFC56: pop {r4,r5} pop {r0} bx r0 @@ -330442,7 +330442,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 @@ -330463,38 +330463,38 @@ 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 + bhi @080AFCC0 cmp r2, 0 - bge _080AFCA4 + bge @080AFCA4 movs r2, 0 -_080AFCA4: +@080AFCA4: cmp r2, 0xFF - ble _080AFCAA + ble @080AFCAA movs r2, 0xFF -_080AFCAA: +@080AFCAA: cmp r3, 0 - bge _080AFCB0 + bge @080AFCB0 movs r3, 0 -_080AFCB0: +@080AFCB0: cmp r3, 0xFF - ble _080AFCB6 + ble @080AFCB6 movs r3, 0xFF -_080AFCB6: +@080AFCB6: lsls r1, 1 adds r1, r0 lsls r0, r2, 8 orrs r0, r3 strh r0, [r1] -_080AFCC0: +@080AFCC0: pop {r0} bx r0 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 @@ -330508,8 +330508,8 @@ sub_80AFCC4: @ 80AFCC4 mov r8, r6 movs r7, 0 cmp r6, 0 - blt _080AFD40 -_080AFCE0: + blt @080AFD40 +@080AFCE0: mov r0, r9 subs r1, r0, r7 mov r0, r10 @@ -330547,15 +330547,15 @@ _080AFCE0: mov r8, r1 adds r7, 0x1 cmp r1, 0 - bge _080AFD3C + bge @080AFD3C subs r1, r6, 0x1 lsls r0, r1, 1 add r8, r0 adds r6, r1, 0 -_080AFD3C: +@080AFD3C: cmp r6, r7 - bge _080AFCE0 -_080AFD40: + bge @080AFCE0 +@080AFD40: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -330567,38 +330567,38 @@ _080AFD40: thumb_func_end sub_80AFCC4 thumb_func_start sub_80AFD50 -sub_80AFD50: @ 80AFD50 +sub_80AFD50: ; 80AFD50 push {lr} cmp r1, 0xA0 - bhi _080AFD78 + bhi @080AFD78 cmp r2, 0 - bge _080AFD5C + bge @080AFD5C movs r2, 0 -_080AFD5C: +@080AFD5C: cmp r2, 0xF0 - ble _080AFD62 + ble @080AFD62 movs r2, 0xF0 -_080AFD62: +@080AFD62: cmp r3, 0 - bge _080AFD68 + bge @080AFD68 movs r3, 0 -_080AFD68: +@080AFD68: cmp r3, 0xF0 - ble _080AFD6E + ble @080AFD6E movs r3, 0xF0 -_080AFD6E: +@080AFD6E: lsls r1, 1 adds r1, r0 lsls r0, r2, 8 orrs r0, r3 strh r0, [r1] -_080AFD78: +@080AFD78: pop {r0} bx r0 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 @@ -330612,8 +330612,8 @@ sub_80AFD7C: @ 80AFD7C mov r8, r6 movs r7, 0 cmp r6, 0 - blt _080AFDF8 -_080AFD98: + blt @080AFDF8 +@080AFD98: mov r0, r9 subs r1, r0, r7 mov r0, r10 @@ -330651,15 +330651,15 @@ _080AFD98: mov r8, r1 adds r7, 0x1 cmp r1, 0 - bge _080AFDF4 + bge @080AFDF4 subs r1, r6, 0x1 lsls r0, r1, 1 add r8, r0 adds r6, r1, 0 -_080AFDF4: +@080AFDF4: cmp r6, r7 - bge _080AFD98 -_080AFDF8: + bge @080AFD98 +@080AFDF8: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -330671,7 +330671,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 @@ -330683,19 +330683,19 @@ sub_80AFE08: @ 80AFE08 movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080AFE64 + beq @080AFE64 cmp r0, 0x1 - bgt _080AFE30 + bgt @080AFE30 cmp r0, 0 - beq _080AFE36 - b _080AFEC6 + beq @080AFE36 + b @080AFEC6 .align 2, 0 .pool -_080AFE30: +@080AFE30: cmp r0, 0x2 - beq _080AFEBC - b _080AFEC6 -_080AFE36: + beq @080AFEBC + b @080AFEC6 +@080AFE36: ldr r0, =0x02039b28 ldrb r1, [r0, 0x14] lsls r0, r1, 4 @@ -330712,10 +330712,10 @@ _080AFE36: bl sub_80AFCC4 movs r0, 0x1 strh r0, [r4] - b _080AFEC6 + b @080AFEC6 .align 2, 0 .pool -_080AFE64: +@080AFE64: ldr r0, =0x02039b28 ldrb r1, [r0, 0x14] lsls r0, r1, 4 @@ -330741,33 +330741,33 @@ _080AFE64: movs r2, 0x8 ldrsh r1, [r4, r2] cmp r0, r1 - ble _080AFEC6 + ble @080AFEC6 movs r3, 0xC ldrsh r0, [r4, r3] cmp r0, 0x1 - bne _080AFEB4 + bne @080AFEB4 bl remove_some_task movs r0, 0x2 strh r0, [r4] - b _080AFEC6 + b @080AFEC6 .align 2, 0 .pool -_080AFEB4: +@080AFEB4: adds r0, r5, 0 bl remove_task - b _080AFEC6 -_080AFEBC: + b @080AFEC6 +@080AFEBC: bl dp12_8087EA4 adds r0, r5, 0 bl remove_task -_080AFEC6: +@080AFEC6: pop {r4-r6} pop {r0} bx r0 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 @@ -330779,19 +330779,19 @@ sub_80AFECC: @ 80AFECC movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080AFF28 + beq @080AFF28 cmp r0, 0x1 - bgt _080AFEF4 + bgt @080AFEF4 cmp r0, 0 - beq _080AFEFA - b _080AFF8A + beq @080AFEFA + b @080AFF8A .align 2, 0 .pool -_080AFEF4: +@080AFEF4: cmp r0, 0x2 - beq _080AFF80 - b _080AFF8A -_080AFEFA: + beq @080AFF80 + b @080AFF8A +@080AFEFA: ldr r0, =0x02039b28 ldrb r1, [r0, 0x14] lsls r0, r1, 4 @@ -330808,10 +330808,10 @@ _080AFEFA: bl sub_80AFD7C movs r0, 0x1 strh r0, [r4] - b _080AFF8A + b @080AFF8A .align 2, 0 .pool -_080AFF28: +@080AFF28: ldr r0, =0x02039b28 ldrb r1, [r0, 0x14] lsls r0, r1, 4 @@ -330837,33 +330837,33 @@ _080AFF28: movs r2, 0x8 ldrsh r1, [r4, r2] cmp r0, r1 - ble _080AFF8A + ble @080AFF8A movs r3, 0xC ldrsh r0, [r4, r3] cmp r0, 0x1 - bne _080AFF78 + bne @080AFF78 bl remove_some_task movs r0, 0x2 strh r0, [r4] - b _080AFF8A + b @080AFF8A .align 2, 0 .pool -_080AFF78: +@080AFF78: adds r0, r5, 0 bl remove_task - b _080AFF8A -_080AFF80: + b @080AFF8A +@080AFF80: bl dp12_8087EA4 adds r0, r5, 0 bl remove_task -_080AFF8A: +@080AFF8A: pop {r4-r6} pop {r0} bx r0 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 @@ -330871,11 +330871,11 @@ sub_80AFF90: @ 80AFF90 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _080AFFAC + bne @080AFFAC bl script_env_2_enable_and_set_ctx_running adds r0, r4, 0 bl remove_task -_080AFFAC: +@080AFFAC: pop {r4} pop {r0} bx r0 @@ -330884,18 +330884,18 @@ _080AFFAC: thumb_func_end sub_80AFF90 thumb_func_start sub_80AFFB8 -sub_80AFFB8: @ 80AFFB8 +sub_80AFFB8: ; 80AFFB8 push {r4,lr} ldr r4, =sub_80AFF90 + 1 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _080AFFD0 + bne @080AFFD0 adds r0, r4, 0 movs r1, 0x50 bl AddTask -_080AFFD0: +@080AFFD0: pop {r4} pop {r0} bx r0 @@ -330904,7 +330904,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 @@ -330935,15 +330935,15 @@ sub_80AFFDC: @ 80AFFDC strh r0, [r1, 0x4] strh r6, [r1, 0xC] cmp r5, r4 - bge _080B0028 + bge @080B0028 strh r7, [r1, 0xA] - b _080B002C + b @080B002C .align 2, 0 .pool -_080B0028: +@080B0028: negs r0, r7 strh r0, [r1, 0xA] -_080B002C: +@080B002C: adds r0, r2, 0 pop {r3,r4} mov r8, r3 @@ -330954,7 +330954,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 @@ -330985,15 +330985,15 @@ sub_80B003C: @ 80B003C strh r0, [r1, 0x4] strh r6, [r1, 0xC] cmp r5, r4 - bge _080B0088 + bge @080B0088 strh r7, [r1, 0xA] - b _080B008C + b @080B008C .align 2, 0 .pool -_080B0088: +@080B0088: negs r0, r7 strh r0, [r1, 0xA] -_080B008C: +@080B008C: adds r0, r2, 0 pop {r3,r4} mov r8, r3 @@ -331004,7 +331004,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 @@ -331015,9 +331015,9 @@ sub_80B009C: @ 80B009C lsrs r0, 24 movs r5, 0 cmp r4, 0 - bne _080B00B6 + bne @080B00B6 movs r5, 0x1 -_080B00B6: +@080B00B6: ldr r1, =0x0854fe64 lsls r0, 1 adds r0, r1 @@ -331042,12 +331042,12 @@ _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 cmp r0, 0 - beq _080B0116 + beq @080B0116 ldr r4, =0x02038c28 ldr r1, =0x0854fe64 lsls r0, 1 @@ -331064,7 +331064,7 @@ sub_80B00E8: @ 80B00E8 lsls r2, 1 adds r0, r4, 0 bl CpuFastSet -_080B0116: +@080B0116: pop {r4} pop {r0} bx r0 @@ -331073,7 +331073,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 @@ -331100,7 +331100,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 @@ -331112,39 +331112,39 @@ task0A_mpl_807E31C: @ 80B0160 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080B0184 + beq @080B0184 cmp r0, 0x1 - beq _080B0198 - b _080B01B6 + beq @080B0198 + b @080B01B6 .align 2, 0 .pool -_080B0184: +@080B0184: bl player_bitmagic bl script_env_2_enable bl sub_808D194 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080B01B6 -_080B0198: + b @080B01B6 +@080B0198: bl sub_80AF71C cmp r0, 0 - beq _080B01B6 + beq @080B01B6 bl sub_808D1B4 cmp r0, 0x1 - beq _080B01B6 + beq @080B01B6 bl sub_809757C bl script_env_2_disable adds r0, r5, 0 bl remove_task -_080B01B6: +@080B01B6: pop {r4,r5} pop {r0} bx r0 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 @@ -331156,53 +331156,53 @@ sub_80B01BC: @ 80B01BC movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080B0202 + beq @080B0202 cmp r0, 0x1 - bgt _080B01E4 + bgt @080B01E4 cmp r0, 0 - beq _080B01EE - b _080B023A + beq @080B01EE + b @080B023A .align 2, 0 .pool -_080B01E4: +@080B01E4: cmp r0, 0x2 - beq _080B0210 + beq @080B0210 cmp r0, 0x3 - beq _080B022A - b _080B023A -_080B01EE: + beq @080B022A + b @080B023A +@080B01EE: bl player_bitmagic bl script_env_2_enable movs r0, 0x2D bl audio_play bl sub_808D1C8 - b _080B0222 -_080B0202: + b @080B0222 +@080B0202: bl sub_808D1E8 cmp r0, 0 - bne _080B023A + bne @080B023A bl sub_80AF0B4 - b _080B0222 -_080B0210: + b @080B0222 +@080B0210: bl sub_80AF710 cmp r0, 0 - bne _080B023A + bne @080B023A bl sub_80859A0 lsls r0, 24 cmp r0, 0 - beq _080B023A -_080B0222: + beq @080B023A +@080B0222: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080B023A -_080B022A: + b @080B023A +@080B022A: bl warp_in ldr r0, =c2_load_new_map + 1 bl set_callback2 adds r0, r5, 0 bl remove_task -_080B023A: +@080B023A: pop {r4,r5} pop {r0} bx r0 @@ -331211,7 +331211,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 + 1 @@ -331227,7 +331227,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 @@ -331243,25 +331243,25 @@ 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 cmp r0, 0 - bne _080B029A + bne @080B029A movs r1, 0x1F - b _080B02A0 -_080B029A: + b @080B02A0 +@080B029A: movs r0, 0xF8 lsls r0, 7 adds r1, r0, 0 -_080B02A0: +@080B02A0: mov r0, sp strh r1, [r0] movs r5, 0 movs r4, 0xF0 lsls r4, 16 -_080B02AA: +@080B02AA: lsrs r1, r4, 16 mov r0, sp movs r2, 0x2 @@ -331271,7 +331271,7 @@ _080B02AA: adds r4, r0 adds r5, 0x1 cmp r5, 0xF - ble _080B02AA + ble @080B02AA add sp, 0x4 pop {r4,r5} pop {r0} @@ -331279,7 +331279,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 @@ -331289,22 +331289,22 @@ sub_80B02C8: @ 80B02C8 ldrh r1, [r2] lsrs r4, r1, 8 cmp r0, 0 - beq _080B02EC + beq @080B02EC cmp r5, 0 - beq _080B02F6 + beq @080B02F6 subs r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 - b _080B02F6 + b @080B02F6 .align 2, 0 .pool -_080B02EC: +@080B02EC: cmp r4, 0xF - bhi _080B02F6 + bhi @080B02F6 adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_080B02F6: +@080B02F6: lsls r1, r4, 8 orrs r1, r5 lsls r1, 16 @@ -331312,21 +331312,21 @@ _080B02F6: movs r0, 0x52 bl lcd_io_set cmp r5, 0 - bne _080B0310 + bne @080B0310 cmp r4, 0x10 - bne _080B0310 + bne @080B0310 movs r0, 0x1 - b _080B0312 -_080B0310: + b @080B0312 +@080B0310: movs r0, 0 -_080B0312: +@080B0312: pop {r4,r5} pop {r1} bx r1 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 @@ -331339,27 +331339,27 @@ sub_80B0318: @ 80B0318 movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0x7 - bls _080B0334 - b _080B052C -_080B0334: + bls @080B0334 + b @080B052C +@080B0334: lsls r0, 2 - ldr r1, =_080B0348 + ldr r1, =@080B0348 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080B0348: - .4byte _080B0368 - .4byte _080B0424 - .4byte _080B0450 - .4byte _080B046C - .4byte _080B0482 - .4byte _080B04F2 - .4byte _080B04AC - .4byte _080B04BA -_080B0368: +@080B0348: + .4byte @080B0368 + .4byte @080B0424 + .4byte @080B0450 + .4byte @080B046C + .4byte @080B0482 + .4byte @080B04F2 + .4byte @080B04AC + .4byte @080B04BA +@080B0368: movs r0, 0x80 lsls r0, 19 ldrh r0, [r0] @@ -331426,10 +331426,10 @@ _080B0368: bl sub_80BA038 movs r0, 0x1 strh r0, [r5] - b _080B052C + b @080B052C .align 2, 0 .pool -_080B0424: +@080B0424: movs r0, 0 movs r1, 0x11 movs r2, 0 @@ -331448,20 +331448,20 @@ _080B0424: movs r3, 0xA0 bl sub_80B003C strh r4, [r5] - b _080B052C -_080B0450: + b @080B052C +@080B0450: ldr r0, =sub_80AFECC + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _080B052C + bne @080B052C bl script_env_2_enable_and_set_ctx_running movs r0, 0x3 strh r0, [r5] - b _080B052C + b @080B052C .align 2, 0 .pool -_080B046C: +@080B046C: bl sub_808A2E4 movs r0, 0 bl sub_808A2C0 @@ -331470,14 +331470,14 @@ _080B046C: movs r0, 0x4 strh r0, [r5, 0x8] strh r0, [r5] - b _080B052C -_080B0482: + b @080B052C +@080B0482: ldrh r0, [r5, 0x8] subs r0, 0x1 strh r0, [r5, 0x8] lsls r0, 16 cmp r0, 0 - bne _080B052C + bne @080B052C movs r0, 0x4 strh r0, [r5, 0x8] ldrh r0, [r5, 0xA] @@ -331487,26 +331487,26 @@ _080B0482: movs r1, 0x4 negs r1, r1 cmp r0, 0 - beq _080B04A4 + beq @080B04A4 movs r1, 0x4 -_080B04A4: +@080B04A4: movs r0, 0 bl sub_808A2CC - b _080B052C -_080B04AC: + b @080B052C +@080B04AC: bl sub_808A2E4 movs r0, 0x8 strh r0, [r5, 0x8] movs r0, 0x7 strh r0, [r5] - b _080B052C -_080B04BA: + b @080B052C +@080B04BA: ldrh r0, [r5, 0x8] subs r0, 0x1 strh r0, [r5, 0x8] lsls r0, 16 cmp r0, 0 - bne _080B052C + bne @080B052C movs r0, 0x8 strh r0, [r5, 0x8] ldrh r0, [r5, 0xA] @@ -331518,7 +331518,7 @@ _080B04BA: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B052C + bne @080B052C movs r0, 0x5 strh r0, [r5] movs r0, 0 @@ -331526,8 +331526,8 @@ _080B04BA: movs r2, 0 movs r3, 0x1 bl sub_8199DF0 - b _080B052C -_080B04F2: + b @080B052C +@080B04F2: movs r0, 0x40 movs r1, 0xFF bl lcd_io_set @@ -331549,7 +331549,7 @@ _080B04F2: bl script_env_2_enable_and_set_ctx_running adds r0, r4, 0 bl remove_task -_080B052C: +@080B052C: add sp, 0x8 pop {r4,r5} pop {r0} @@ -331557,7 +331557,7 @@ _080B052C: thumb_func_end sub_80B0318 thumb_func_start sub_80B0534 -sub_80B0534: @ 80B0534 +sub_80B0534: ; 80B0534 push {lr} ldr r0, =sub_80B0318 + 1 movs r1, 0x50 @@ -331572,29 +331572,29 @@ sub_80B0534: @ 80B0534 ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 - bne _080B0568 + bne @080B0568 strh r0, [r1, 0x2] movs r0, 0x68 - b _080B0580 + b @080B0580 .align 2, 0 .pool -_080B0568: +@080B0568: cmp r0, 0x1 - bne _080B0572 + bne @080B0572 strh r0, [r1, 0x2] movs r0, 0x88 - b _080B0580 -_080B0572: + b @080B0580 +@080B0572: cmp r0, 0x2 - bne _080B057A + bne @080B057A movs r0, 0 - b _080B057C -_080B057A: + b @080B057C +@080B057A: movs r0, 0x1 -_080B057C: +@080B057C: strh r0, [r1, 0x2] movs r0, 0x78 -_080B0580: +@080B0580: strh r0, [r1, 0x4] movs r0, 0x50 strh r0, [r1, 0x6] @@ -331603,7 +331603,7 @@ _080B0580: thumb_func_end sub_80B0534 thumb_func_start sub_80B058C -sub_80B058C: @ 80B058C +sub_80B058C: ; 80B058C push {lr} ldr r0, =sub_80B0318 + 1 bl get_task_id_by_function @@ -331623,7 +331623,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 + 1 @@ -331636,7 +331636,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 @@ -331644,18 +331644,18 @@ task50_0807F0C8: @ 80B05CC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B05E8 + bne @080B05E8 adds r0, r4, 0 bl remove_task bl script_env_2_enable_and_set_ctx_running -_080B05E8: +@080B05E8: pop {r4} pop {r0} bx r0 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 @@ -331667,29 +331667,29 @@ task01_battle_start: @ 80B05F0 movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080B0614 + beq @080B0614 cmp r0, 0x1 - beq _080B062E - b _080B0652 + beq @080B062E + b @080B0652 .align 2, 0 .pool -_080B0614: +@080B0614: bl c3_80A0DD8_is_running cmp r0, 0 - bne _080B0652 + bne @080B0652 ldrb r0, [r4, 0x2] bl sub_8145EF4 bl sub_81BE72C ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - b _080B0652 -_080B062E: + b @080B0652 +@080B062E: bl sub_8145F20 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B0652 + bne @080B0652 bl overworld_free_bg_tilemaps ldr r0, =sub_8036760 + 1 bl set_callback2 @@ -331697,7 +331697,7 @@ _080B062E: bl overworld_poison_timer_set adds r0, r5, 0 bl remove_task -_080B0652: +@080B0652: pop {r4,r5} pop {r0} bx r0 @@ -331706,7 +331706,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 @@ -331735,22 +331735,22 @@ 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 flag_check_is_in_safari_zone cmp r0, 0 - beq _080B06A8 + beq @080B06A8 bl sub_80B077C - b _080B06AC -_080B06A8: + b @080B06AC +@080B06A8: bl sub_80B06BC -_080B06AC: +@080B06AC: pop {r0} bx r0 thumb_func_end sub_80B0698 thumb_func_start sub_80B06B0 -sub_80B06B0: @ 80B06B0 +sub_80B06B0: ; 80B06B0 push {lr} bl sub_80B07B4 pop {r0} @@ -331758,7 +331758,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 @@ -331772,7 +331772,7 @@ sub_80B06BC: @ 80B06BC bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - beq _080B06F2 + beq @080B06F2 ldr r0, =0x0000400e movs r1, 0 bl var_set @@ -331781,7 +331781,7 @@ sub_80B06BC: @ 80B06BC lsls r1, 14 orrs r0, r1 str r0, [r4] -_080B06F2: +@080B06F2: bl sub_80B0EC8 lsls r0, 24 lsrs r0, 24 @@ -331801,7 +331801,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 @@ -331831,7 +331831,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 @@ -331854,7 +331854,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 @@ -331884,7 +331884,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 sub_80B0F34 lsls r0, 24 @@ -331901,27 +331901,27 @@ 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 sub_81A9E40 lsls r0, 24 cmp r0, 0 - beq _080B0846 + beq @080B0846 movs r0, 0xA bl sub_80B100C lsls r0, 24 lsrs r0, 24 movs r1, 0 bl task_add_01_battle_start - b _080B0856 -_080B0846: + b @080B0856 +@080B0846: movs r0, 0xB bl sub_80B100C lsls r0, 24 lsrs r0, 24 movs r1, 0 bl task_add_01_battle_start -_080B0856: +@080B0856: movs r0, 0x7 bl sav12_xor_increment movs r0, 0x9 @@ -331932,7 +331932,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 @@ -331957,7 +331957,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 @@ -331984,7 +331984,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 @@ -332012,7 +332012,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 @@ -332030,32 +332030,32 @@ sub_80B0934: @ 80B0934 movs r0, 0xCA lsls r0, 1 cmp r1, r0 - beq _080B09B8 + beq @080B09B8 cmp r1, r0 - bhi _080B0988 + bhi @080B0988 cmp r1, 0x97 - beq _080B09F4 + beq @080B09F4 cmp r1, 0x97 - bcc _080B099A + bcc @080B099A cmp r1, 0xFA - bhi _080B099A + bhi @080B099A cmp r1, 0xF9 - bcc _080B099A + bcc @080B099A ldr r1, =0x00000229 - b _080B09E6 + b @080B09E6 .align 2, 0 .pool -_080B0988: +@080B0988: movs r0, 0xCB lsls r0, 1 cmp r1, r0 - beq _080B09CE + beq @080B09CE cmp r1, r0 - bcc _080B099A + bcc @080B099A adds r0, 0x4 cmp r1, r0 - beq _080B09E4 -_080B099A: + beq @080B09E4 +@080B099A: ldr r2, =0x02022fec ldr r0, [r2] movs r1, 0x80 @@ -332066,10 +332066,10 @@ _080B099A: lsls r1, 1 movs r0, 0x17 bl task_add_01_battle_start - b _080B09FE + b @080B09FE .align 2, 0 .pool -_080B09B8: +@080B09B8: ldr r0, [r4] movs r1, 0x80 lsls r1, 22 @@ -332079,8 +332079,8 @@ _080B09B8: lsls r1, 1 movs r0, 0x16 bl task_add_01_battle_start - b _080B09FE -_080B09CE: + b @080B09FE +@080B09CE: ldr r0, [r4] movs r1, 0x80 lsls r1, 23 @@ -332090,21 +332090,21 @@ _080B09CE: lsls r1, 1 movs r0, 0x18 bl task_add_01_battle_start - b _080B09FE -_080B09E4: + b @080B09FE +@080B09E4: ldr r1, =0x00000227 -_080B09E6: +@080B09E6: movs r0, 0 bl task_add_01_battle_start - b _080B09FE + b @080B09FE .align 2, 0 .pool -_080B09F4: +@080B09F4: movs r1, 0xEC lsls r1, 1 movs r0, 0xA bl task_add_01_battle_start -_080B09FE: +@080B09FE: movs r0, 0x7 bl sav12_xor_increment movs r0, 0x8 @@ -332117,7 +332117,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 @@ -332130,20 +332130,20 @@ sub_80B0A18: @ 80B0A18 ldr r0, =gUnknown_82E9530 ldrb r0, [r0] cmp r0, 0x2 - bne _080B0A50 + bne @080B0A50 movs r1, 0xF0 lsls r1, 1 movs r0, 0xB bl task_add_01_battle_start - b _080B0A5A + b @080B0A5A .align 2, 0 .pool -_080B0A50: +@080B0A50: movs r1, 0xF0 lsls r1, 1 movs r0, 0x6 bl task_add_01_battle_start -_080B0A5A: +@080B0A5A: movs r0, 0x7 bl sav12_xor_increment movs r0, 0x8 @@ -332155,7 +332155,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 @@ -332174,34 +332174,34 @@ sub_80B0A74: @ 80B0A74 movs r0, 0xC9 lsls r0, 1 cmp r1, r0 - beq _080B0ACC + beq @080B0ACC cmp r1, r0 - bgt _080B0ABC + bgt @080B0ABC subs r0, 0x1 cmp r1, r0 - beq _080B0AC8 - b _080B0AD4 + beq @080B0AC8 + b @080B0AD4 .align 2, 0 .pool -_080B0ABC: +@080B0ABC: ldr r0, =0x00000193 cmp r2, r0 - beq _080B0AD0 - b _080B0AD4 + beq @080B0AD0 + b @080B0AD4 .align 2, 0 .pool -_080B0AC8: +@080B0AC8: movs r0, 0x15 - b _080B0AD6 -_080B0ACC: + b @080B0AD6 +@080B0ACC: movs r0, 0x13 - b _080B0AD6 -_080B0AD0: + b @080B0AD6 +@080B0AD0: movs r0, 0x14 - b _080B0AD6 -_080B0AD4: + b @080B0AD6 +@080B0AD4: movs r0, 0xA -_080B0AD6: +@080B0AD6: ldr r1, =0x000001df bl task_add_01_battle_start movs r0, 0x7 @@ -332217,7 +332217,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 @@ -332235,27 +332235,27 @@ sub_80B0AF8: @ 80B0AF8 ldrb r0, [r0] bl battle_exit_is_player_defeat cmp r0, 0x1 - bne _080B0B4C + bne @080B0B4C bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _080B0B4C + bne @080B0B4C bl sub_81A80A8 lsls r0, 24 cmp r0, 0 - bne _080B0B4C + bne @080B0B4C ldr r0, =c2_whiteout + 1 bl set_callback2 - b _080B0B58 + b @080B0B58 .align 2, 0 .pool -_080B0B4C: +@080B0B4C: ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 ldr r1, =0x03005dac ldr r0, =sub_80AF6F0 + 1 str r0, [r1] -_080B0B58: +@080B0B58: add sp, 0x4 pop {r0} bx r0 @@ -332264,7 +332264,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 @@ -332282,26 +332282,26 @@ sub_80B0B6C: @ 80B0B6C ldrb r0, [r0] bl battle_exit_is_player_defeat cmp r0, 0x1 - bne _080B0BC0 + bne @080B0BC0 bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - beq _080B0BB4 + beq @080B0BB4 ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 - b _080B0BC6 + b @080B0BC6 .align 2, 0 .pool -_080B0BB4: +@080B0BB4: ldr r0, =c2_whiteout + 1 bl set_callback2 - b _080B0BC6 + b @080B0BC6 .align 2, 0 .pool -_080B0BC0: +@080B0BC0: ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 -_080B0BC6: +@080B0BC6: add sp, 0x4 pop {r0} bx r0 @@ -332310,7 +332310,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 @@ -332332,141 +332332,141 @@ sub_80B0BD0: @ 80B0BD0 bl is_tile_x02_or_xD1 lsls r0, 24 cmp r0, 0 - beq _080B0C06 + beq @080B0C06 movs r0, 0 - b _080B0D1A -_080B0C06: + b @080B0D1A +@080B0C06: adds r0, r4, 0 bl is_tile_tallgrass lsls r0, 24 cmp r0, 0 - beq _080B0C16 + beq @080B0C16 movs r0, 0x1 - b _080B0D1A -_080B0C16: + b @080B0D1A +@080B0C16: adds r0, r4, 0 bl is_x21_or_x2B lsls r0, 24 cmp r0, 0 - bne _080B0D18 + bne @080B0D18 ldr r0, =0x02037318 ldrb r0, [r0, 0x17] subs r0, 0x1 cmp r0, 0x8 - bhi _080B0C9C + bhi @080B0C9C lsls r0, 2 - ldr r1, =_080B0C40 + ldr r1, =@080B0C40 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080B0C40: - .4byte _080B0C9C - .4byte _080B0C9C - .4byte _080B0C9C - .4byte _080B0C64 - .4byte _080B0C88 - .4byte _080B0C8C - .4byte _080B0C9C - .4byte _080B0C74 - .4byte _080B0C74 -_080B0C64: +@080B0C40: + .4byte @080B0C9C + .4byte @080B0C9C + .4byte @080B0C9C + .4byte @080B0C64 + .4byte @080B0C88 + .4byte @080B0C8C + .4byte @080B0C9C + .4byte @080B0C74 + .4byte @080B0C74 +@080B0C64: lsls r0, r5, 24 lsrs r4, r0, 24 adds r0, r4, 0 bl sub_8089588 lsls r0, 24 cmp r0, 0 - beq _080B0C78 -_080B0C74: + beq @080B0C78 +@080B0C74: movs r0, 0x8 - b _080B0D1A -_080B0C78: + b @080B0D1A +@080B0C78: adds r0, r4, 0 bl is_tile_grass_maybe lsls r0, 24 cmp r0, 0 - bne _080B0CE0 + bne @080B0CE0 movs r0, 0x7 - b _080B0D1A -_080B0C88: + b @080B0D1A +@080B0C88: movs r0, 0x3 - b _080B0D1A -_080B0C8C: + b @080B0D1A +@080B0C8C: lsls r0, r5, 24 lsrs r0, 24 bl is_tile_grass_maybe lsls r0, 24 cmp r0, 0 - bne _080B0CF2 - b _080B0D10 -_080B0C9C: + bne @080B0CF2 + b @080B0D10 +@080B0C9C: lsls r0, r5, 24 lsrs r4, r0, 24 adds r0, r4, 0 bl sub_808962C lsls r0, 24 cmp r0, 0 - bne _080B0CF2 + bne @080B0CF2 adds r0, r4, 0 bl is_tile_grass_maybe lsls r0, 24 cmp r0, 0 - bne _080B0CE0 + bne @080B0CE0 adds r0, r4, 0 bl sub_808959C lsls r0, 24 cmp r0, 0 - beq _080B0CC8 + beq @080B0CC8 movs r0, 0x6 - b _080B0D1A -_080B0CC8: + b @080B0D1A +@080B0CC8: movs r0, 0x8 bl walkrun_bitfield_and_r0 lsls r0, 24 cmp r0, 0 - beq _080B0CF6 + beq @080B0CF6 adds r0, r4, 0 bl sub_80894D4 lsls r0, 24 cmp r0, 0 - beq _080B0CE4 -_080B0CE0: + beq @080B0CE4 +@080B0CE0: movs r0, 0x5 - b _080B0D1A -_080B0CE4: + b @080B0D1A +@080B0CE4: adds r0, r4, 0 bl sub_80894AC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B0CF6 -_080B0CF2: + bne @080B0CF6 +@080B0CF2: movs r0, 0x4 - b _080B0D1A -_080B0CF6: + b @080B0D1A +@080B0CF6: ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] movs r0, 0xE0 lsls r0, 5 cmp r1, r0 - beq _080B0D18 + beq @080B0D18 bl sav1_get_weather_probably lsls r0, 24 lsrs r0, 24 cmp r0, 0x8 - beq _080B0D18 -_080B0D10: + beq @080B0D18 +@080B0D10: movs r0, 0x9 - b _080B0D1A + b @080B0D1A .align 2, 0 .pool -_080B0D18: +@080B0D18: movs r0, 0x2 -_080B0D1A: +@080B0D1A: add sp, 0x4 pop {r4,r5} pop {r1} @@ -332474,7 +332474,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 @@ -332493,32 +332493,32 @@ sub_80B0D24: @ 80B0D24 bl sav1_get_flash_used_on_map lsls r0, 24 cmp r0, 0 - beq _080B0D54 + beq @080B0D54 movs r0, 0x2 - b _080B0D7E -_080B0D54: + b @080B0D7E +@080B0D54: lsls r0, r4, 24 lsrs r0, 24 bl is_tile_grass_maybe lsls r0, 24 cmp r0, 0 - bne _080B0D7C + bne @080B0D7C ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x4 - beq _080B0D78 + beq @080B0D78 cmp r0, 0x5 - beq _080B0D7C + beq @080B0D7C movs r0, 0 - b _080B0D7E + b @080B0D7E .align 2, 0 .pool -_080B0D78: +@080B0D78: movs r0, 0x1 - b _080B0D7E -_080B0D7C: + b @080B0D7E +@080B0D7C: movs r0, 0x3 -_080B0D7E: +@080B0D7E: add sp, 0x4 pop {r4} pop {r1} @@ -332526,13 +332526,13 @@ _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 movs r7, 0 movs r6, 0 -_080B0D92: +@080B0D92: movs r0, 0x64 adds r1, r6, 0 muls r1, r0 @@ -332545,14 +332545,14 @@ _080B0D92: movs r0, 0xCE lsls r0, 1 cmp r1, r0 - beq _080B0DD6 + beq @080B0DD6 cmp r1, 0 - beq _080B0DD6 + beq @080B0DD6 adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _080B0DD6 + beq @080B0DD6 adds r0, r4, 0 movs r1, 0x38 bl pokemon_getattr @@ -332563,12 +332563,12 @@ _080B0D92: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - beq _080B0DDC -_080B0DD6: + beq @080B0DDC +@080B0DD6: adds r6, 0x1 cmp r6, 0x5 - ble _080B0D92 -_080B0DDC: + ble @080B0D92 +@080B0DDC: adds r0, r7, 0 pop {r4-r7} pop {r1} @@ -332578,7 +332578,7 @@ _080B0DDC: thumb_func_end sub_80B0D88 thumb_func_start sub_80B0DE8 -sub_80B0DE8: @ 80B0DE8 +sub_80B0DE8: ; 80B0DE8 push {r4,r5,lr} lsls r0, 16 lsrs r0, 16 @@ -332593,35 +332593,35 @@ sub_80B0DE8: @ 80B0DE8 adds r0, 0x20 ldrb r0, [r0] cmp r0, r4 - bcs _080B0E08 + bcs @080B0E08 adds r4, r0, 0 -_080B0E08: +@080B0E08: movs r3, 0 ldrb r0, [r2] cmp r0, 0x1 - beq _080B0E50 + beq @080B0E50 cmp r0, 0x1 - bgt _080B0E20 + bgt @080B0E20 cmp r0, 0 - beq _080B0E2A - b _080B0EC0 + beq @080B0E2A + b @080B0EC0 .align 2, 0 .pool -_080B0E20: +@080B0E20: cmp r0, 0x2 - beq _080B0E76 + beq @080B0E76 cmp r0, 0x3 - beq _080B0E9C - b _080B0EC0 -_080B0E2A: + beq @080B0E9C + b @080B0EC0 +@080B0E2A: adds r0, r5, 0 adds r0, 0x24 adds r0, r1, r0 ldr r1, [r0] movs r2, 0 cmp r3, r4 - bcs _080B0EC0 -_080B0E38: + bcs @080B0EC0 +@080B0E38: lsls r0, r2, 3 adds r0, r1 ldrb r0, [r0, 0x2] @@ -332632,17 +332632,17 @@ _080B0E38: lsls r0, 24 lsrs r2, r0, 24 cmp r2, r4 - bcc _080B0E38 - b _080B0EC0 -_080B0E50: + bcc @080B0E38 + b @080B0EC0 +@080B0E50: adds r0, r5, 0 adds r0, 0x24 adds r0, r1, r0 ldr r1, [r0] movs r2, 0 cmp r3, r4 - bcs _080B0EC0 -_080B0E5E: + bcs @080B0EC0 +@080B0E5E: lsls r0, r2, 4 adds r0, r1 ldrb r0, [r0, 0x2] @@ -332653,17 +332653,17 @@ _080B0E5E: lsls r0, 24 lsrs r2, r0, 24 cmp r2, r4 - bcc _080B0E5E - b _080B0EC0 -_080B0E76: + bcc @080B0E5E + b @080B0EC0 +@080B0E76: adds r0, r5, 0 adds r0, 0x24 adds r0, r1, r0 ldr r1, [r0] movs r2, 0 cmp r3, r4 - bcs _080B0EC0 -_080B0E84: + bcs @080B0EC0 +@080B0E84: lsls r0, r2, 3 adds r0, r1 ldrb r0, [r0, 0x2] @@ -332674,17 +332674,17 @@ _080B0E84: lsls r0, 24 lsrs r2, r0, 24 cmp r2, r4 - bcc _080B0E84 - b _080B0EC0 -_080B0E9C: + bcc @080B0E84 + b @080B0EC0 +@080B0E9C: adds r0, r5, 0 adds r0, 0x24 adds r0, r1, r0 ldr r1, [r0] movs r2, 0 cmp r3, r4 - bcs _080B0EC0 -_080B0EAA: + bcs @080B0EC0 +@080B0EAA: lsls r0, r2, 4 adds r0, r1 ldrb r0, [r0, 0x2] @@ -332695,8 +332695,8 @@ _080B0EAA: lsls r0, 24 lsrs r2, r0, 24 cmp r2, r4 - bcc _080B0EAA -_080B0EC0: + bcc @080B0EAA +@080B0EC0: adds r0, r3, 0 pop {r4,r5} pop {r1} @@ -332704,7 +332704,7 @@ _080B0EC0: thumb_func_end sub_80B0DE8 thumb_func_start sub_80B0EC8 -sub_80B0EC8: @ 80B0EC8 +sub_80B0EC8: ; 80B0EC8 push {r4-r6,lr} bl sub_80B0D24 lsls r0, 24 @@ -332721,52 +332721,52 @@ sub_80B0EC8: @ 80B0EC8 lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bcs _080B0F10 + bcs @080B0F10 bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - beq _080B0F04 + beq @080B0F04 movs r0, 0 - b _080B0F2E + b @080B0F2E .align 2, 0 .pool -_080B0F04: +@080B0F04: ldr r0, =0x0854fe88 lsls r1, r5, 1 - b _080B0F20 + b @080B0F20 .align 2, 0 .pool -_080B0F10: +@080B0F10: bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _080B0F2C + bne @080B0F2C ldr r0, =0x0854fe88 lsls r1, r6, 1 adds r0, 0x1 -_080B0F20: +@080B0F20: adds r1, r0 ldrb r0, [r1] - b _080B0F2E + b @080B0F2E .align 2, 0 .pool -_080B0F2C: +@080B0F2C: movs r0, 0xA -_080B0F2E: +@080B0F2E: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_80B0EC8 thumb_func_start sub_80B0F34 -sub_80B0F34: @ 80B0F34 +sub_80B0F34: ; 80B0F34 push {r4-r6,lr} ldr r4, =0x02038bca ldrh r1, [r4] movs r0, 0x80 lsls r0, 3 cmp r1, r0 - beq _080B0F98 + beq @080B0F98 ldr r1, =0x08310030 ldrh r2, [r4] lsls r0, r2, 2 @@ -332775,70 +332775,70 @@ sub_80B0F34: @ 80B0F34 adds r0, r1 ldrb r1, [r0, 0x1] cmp r1, 0x1F - bne _080B0F94 + bne @080B0F94 adds r1, r2, 0 ldr r0, =0x00000105 cmp r1, r0 - bne _080B0F6C + bne @080B0F6C movs r0, 0xC - b _080B1000 + b @080B1000 .align 2, 0 .pool -_080B0F6C: +@080B0F6C: movs r0, 0x83 lsls r0, 1 cmp r1, r0 - bne _080B0F78 + bne @080B0F78 movs r0, 0xD - b _080B1000 -_080B0F78: + b @080B1000 +@080B0F78: ldr r0, =0x00000107 cmp r1, r0 - bne _080B0F88 + bne @080B0F88 movs r0, 0xE - b _080B1000 + b @080B1000 .align 2, 0 .pool -_080B0F88: +@080B0F88: movs r0, 0x84 lsls r0, 1 cmp r1, r0 - bne _080B0F98 + bne @080B0F98 movs r0, 0xF - b _080B1000 -_080B0F94: + b @080B1000 +@080B0F94: cmp r1, 0x26 - bne _080B0F9C -_080B0F98: + bne @080B0F9C +@080B0F98: movs r0, 0x10 - b _080B1000 -_080B0F9C: + b @080B1000 +@080B0F9C: cmp r1, 0x9 - beq _080B0FA8 + beq @080B0FA8 cmp r1, 0x35 - beq _080B0FA8 + beq @080B0FA8 cmp r1, 0x31 - bne _080B0FAC -_080B0FA8: + bne @080B0FAC +@080B0FA8: movs r0, 0x12 - b _080B1000 -_080B0FAC: + b @080B1000 +@080B0FAC: cmp r1, 0x3 - beq _080B0FB8 + beq @080B0FB8 cmp r1, 0xD - beq _080B0FB8 + beq @080B0FB8 cmp r1, 0xB - bne _080B0FBC -_080B0FB8: + bne @080B0FBC +@080B0FB8: movs r0, 0x11 - b _080B1000 -_080B0FBC: + b @080B1000 +@080B0FBC: ldrb r0, [r0, 0x18] movs r5, 0x1 cmp r0, 0x1 - bne _080B0FC6 + bne @080B0FC6 movs r5, 0x2 -_080B0FC6: +@080B0FC6: bl sub_80B0D24 lsls r0, 24 lsrs r6, r0, 24 @@ -332853,20 +332853,20 @@ _080B0FC6: lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bcc _080B0FF8 + bcc @080B0FF8 ldr r0, =0x0854fe90 lsls r1, r6, 1 adds r0, 0x1 - b _080B0FFC + b @080B0FFC .align 2, 0 .pool -_080B0FF8: +@080B0FF8: ldr r0, =0x0854fe90 lsls r1, r6, 1 -_080B0FFC: +@080B0FFC: adds r1, r0 ldrb r0, [r1] -_080B1000: +@080B1000: pop {r4-r6} pop {r1} bx r1 @@ -332875,7 +332875,7 @@ _080B1000: thumb_func_end sub_80B0F34 thumb_func_start sub_80B100C -sub_80B100C: @ 80B100C +sub_80B100C: ; 80B100C push {r4,r5,lr} adds r5, r0, 0 ldr r0, =0x02024744 @@ -332889,97 +332889,97 @@ sub_80B100C: @ 80B100C lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bcs _080B1090 + bcs @080B1090 cmp r5, 0xA - beq _080B1048 + beq @080B1048 cmp r5, 0xA - bgt _080B1040 + bgt @080B1040 cmp r5, 0x3 - beq _080B105C - b _080B106C + beq @080B105C + b @080B106C .align 2, 0 .pool -_080B1040: +@080B1040: cmp r5, 0xD - bgt _080B106C + bgt @080B106C movs r0, 0x4 - b _080B1120 -_080B1048: + b @080B1120 +@080B1048: ldr r4, =0x0854fea4 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 movs r1, 0x3 - b _080B1114 + b @080B1114 .align 2, 0 .pool -_080B105C: +@080B105C: ldr r4, =0x0854fea7 bl GenerateRandomNumber ands r5, r0 lsls r0, r5, 16 - b _080B111A + b @080B111A .align 2, 0 .pool -_080B106C: +@080B106C: ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x3 - beq _080B10EC + beq @080B10EC ldr r4, =0x0854fe98 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 - b _080B1112 + b @080B1112 .align 2, 0 .pool -_080B1090: +@080B1090: cmp r5, 0xA - beq _080B10A6 + beq @080B10A6 cmp r5, 0xA - bgt _080B109E + bgt @080B109E cmp r5, 0x3 - beq _080B10B8 - b _080B10C8 -_080B109E: + beq @080B10B8 + b @080B10C8 +@080B109E: cmp r5, 0xD - bgt _080B10C8 + bgt @080B10C8 movs r0, 0x3 - b _080B1120 -_080B10A6: + b @080B1120 +@080B10A6: ldr r4, =0x0854fea4 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 movs r1, 0x3 - b _080B1114 + b @080B1114 .align 2, 0 .pool -_080B10B8: +@080B10B8: ldr r4, =0x0854fea7 bl GenerateRandomNumber ands r5, r0 lsls r0, r5, 16 - b _080B111A + b @080B111A .align 2, 0 .pool -_080B10C8: +@080B10C8: ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x3 - beq _080B10EC + beq @080B10EC ldr r4, =0x0854fe98 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 - b _080B1112 + b @080B1112 .align 2, 0 .pool -_080B10EC: +@080B10EC: ldr r0, =0x03005d90 ldr r1, [r0] ldr r2, =0x00000cb2 @@ -332999,16 +332999,16 @@ _080B10EC: lsls r0, 16 lsrs r0, 16 ldr r4, =0x0854fe98 -_080B1112: +@080B1112: movs r1, 0xC -_080B1114: +@080B1114: bl __umodsi3 lsls r0, 16 -_080B111A: +@080B111A: lsrs r0, 16 adds r0, r4 ldrb r0, [r0] -_080B1120: +@080B1120: pop {r4,r5} pop {r1} bx r1 @@ -333017,7 +333017,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 + 1 bl set_callback2 @@ -333031,7 +333031,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 @@ -333064,7 +333064,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 run_active_tasks @@ -333072,7 +333072,7 @@ sub_80B11A8: @ 80B11A8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B11F0 + bne @080B11F0 ldr r1, =0x02022fec movs r0, 0x10 str r0, [r1] @@ -333090,7 +333090,7 @@ sub_80B11A8: @ 80B11A8 bl sav12_xor_increment bl sub_80EECC8 bl sub_80B1218 -_080B11F0: +@080B11F0: pop {r0} bx r0 .align 2, 0 @@ -333098,7 +333098,7 @@ _080B11F0: thumb_func_end sub_80B11A8 thumb_func_start sub_80B1204 -sub_80B1204: @ 80B1204 +sub_80B1204: ; 80B1204 push {lr} bl sav1_reset_x2C ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 @@ -333110,37 +333110,37 @@ 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 movs r1, 0x3C bl __umodsi3 cmp r0, 0 - bne _080B122E + bne @080B122E bl sub_81DA57C -_080B122E: +@080B122E: pop {r0} bx r0 thumb_func_end sub_80B1218 thumb_func_start sub_80B1234 -sub_80B1234: @ 80B1234 +sub_80B1234: ; 80B1234 push {lr} movs r0, 0x9 bl sub_80847F8 movs r1, 0x14 bl __umodsi3 cmp r0, 0 - bne _080B124A + bne @080B124A bl sub_81DA57C -_080B124A: +@080B124A: pop {r0} bx r0 thumb_func_end sub_80B1234 thumb_func_start sub_80B1250 -sub_80B1250: @ 80B1250 +sub_80B1250: ; 80B1250 adds r2, r0, 0 ldrb r0, [r2] ldrb r1, [r2, 0x1] @@ -333156,7 +333156,7 @@ sub_80B1250: @ 80B1250 thumb_func_end sub_80B1250 thumb_func_start sub_80B1268 -sub_80B1268: @ 80B1268 +sub_80B1268: ; 80B1268 adds r1, r0, 0 ldrb r0, [r1] ldrb r1, [r1, 0x1] @@ -333166,13 +333166,13 @@ sub_80B1268: @ 80B1268 thumb_func_end sub_80B1268 thumb_func_start ldrb -ldrb: @ 80B1274 +ldrb: ; 80B1274 ldrb r0, [r0] bx lr thumb_func_end ldrb thumb_func_start trainerflag_opponent -trainerflag_opponent: @ 80B1278 +trainerflag_opponent: ; 80B1278 ldr r1, =0x02038bca movs r2, 0xA0 lsls r2, 3 @@ -333187,7 +333187,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 @@ -333202,39 +333202,39 @@ 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 - bhi _080B12E0 + bhi @080B12E0 lsls r0, 2 - ldr r1, =_080B12C0 + ldr r1, =@080B12C0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080B12C0: - .4byte _080B12E0 - .4byte _080B12DC - .4byte _080B12DC - .4byte _080B12E0 - .4byte _080B12E0 - .4byte _080B12E0 - .4byte _080B12E0 -_080B12DC: +@080B12C0: + .4byte @080B12E0 + .4byte @080B12DC + .4byte @080B12DC + .4byte @080B12E0 + .4byte @080B12E0 + .4byte @080B12E0 + .4byte @080B12E0 +@080B12DC: movs r0, 0x1 - b _080B12E2 -_080B12E0: + b @080B12E2 +@080B12E0: movs r0, 0 -_080B12E2: +@080B12E2: pop {r1} bx r1 thumb_func_end battle_exit_is_player_defeat thumb_func_start sub_80B12E8 -sub_80B12E8: @ 80B12E8 +sub_80B12E8: ; 80B12E8 ldr r0, =0x02038bca movs r1, 0 strh r1, [r0] @@ -333246,7 +333246,7 @@ sub_80B12E8: @ 80B12E8 thumb_func_end sub_80B12E8 thumb_func_start sub_80B12FC -sub_80B12FC: @ 80B12FC +sub_80B12FC: ; 80B12FC push {lr} ldr r0, =0x02038bc8 movs r1, 0 @@ -333254,23 +333254,23 @@ sub_80B12FC: @ 80B12FC ldr r0, =0x02038bfc ldrb r1, [r0] cmp r1, 0 - bne _080B132C + bne @080B132C ldr r0, =0x02038bd4 str r1, [r0] ldr r0, =0x02038bdc str r1, [r0] ldr r0, =0x02038bf0 - b _080B1338 + b @080B1338 .align 2, 0 .pool -_080B132C: +@080B132C: ldr r0, =0x02038bd8 movs r1, 0 str r1, [r0] ldr r0, =0x02038be0 str r1, [r0] ldr r0, =0x02038bf4 -_080B1338: +@080B1338: str r1, [r0] ldr r1, =0x02038bd0 movs r0, 0 @@ -333289,69 +333289,69 @@ _080B1338: thumb_func_end sub_80B12FC thumb_func_start battle_load_arguments -battle_load_arguments: @ 80B1370 +battle_load_arguments: ; 80B1370 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 -_080B1376: +@080B1376: ldrb r0, [r4, 0x4] cmp r0, 0x6 - bhi _080B13E8 + bhi @080B13E8 lsls r0, 2 - ldr r1, =_080B138C + ldr r1, =@080B138C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080B138C: - .4byte _080B13A8 - .4byte _080B13B6 - .4byte _080B13C4 - .4byte _080B13D2 - .4byte _080B13DA - .4byte _080B13E2 - .4byte _080B13EC -_080B13A8: +@080B138C: + .4byte @080B13A8 + .4byte @080B13B6 + .4byte @080B13C4 + .4byte @080B13D2 + .4byte @080B13DA + .4byte @080B13E2 + .4byte @080B13EC +@080B13A8: adds r0, r5, 0 bl ldrb ldr r1, [r4] strb r0, [r1] adds r5, 0x1 - b _080B13E8 -_080B13B6: + b @080B13E8 +@080B13B6: adds r0, r5, 0 bl sub_80B1268 ldr r1, [r4] strh r0, [r1] adds r5, 0x2 - b _080B13E8 -_080B13C4: + b @080B13E8 +@080B13C4: adds r0, r5, 0 bl sub_80B1250 ldr r1, [r4] str r0, [r1] adds r5, 0x4 - b _080B13E8 -_080B13D2: + b @080B13E8 +@080B13D2: ldr r1, [r4] movs r0, 0 strb r0, [r1] - b _080B13E8 -_080B13DA: + b @080B13E8 +@080B13DA: ldr r1, [r4] movs r0, 0 strh r0, [r1] - b _080B13E8 -_080B13E2: + b @080B13E8 +@080B13E2: ldr r1, [r4] movs r0, 0 str r0, [r1] -_080B13E8: +@080B13E8: adds r4, 0x8 - b _080B1376 -_080B13EC: + b @080B1376 +@080B13EC: ldr r0, [r4] str r5, [r0] pop {r4,r5} @@ -333360,12 +333360,12 @@ _080B13EC: thumb_func_end battle_load_arguments thumb_func_start battle_80801F0 -battle_80801F0: @ 80B13F8 +battle_80801F0: ; 80B13F8 push {lr} ldr r0, =0x02038bd0 ldrh r1, [r0] cmp r1, 0 - beq _080B141A + beq @080B141A ldr r0, =0x020375f2 strh r1, [r0] lsls r0, r1, 24 @@ -333377,7 +333377,7 @@ battle_80801F0: @ 80B13F8 bl get_npc_id_by_local_id ldr r1, =0x03005df0 strb r0, [r1] -_080B141A: +@080B141A: pop {r0} bx r0 .align 2, 0 @@ -333385,7 +333385,7 @@ _080B141A: thumb_func_end battle_80801F0 thumb_func_start battle_configure_by_script -battle_configure_by_script: @ 80B1430 +battle_configure_by_script: ; 80B1430 push {r4,r5,lr} adds r5, r0, 0 bl sub_80B12FC @@ -333398,73 +333398,73 @@ battle_configure_by_script: @ 80B1430 ldrh r0, [r4] subs r0, 0x1 cmp r0, 0xB - bls _080B1450 - b _080B15F4 -_080B1450: + bls @080B1450 + b @080B15F4 +@080B1450: lsls r0, 2 - ldr r1, =_080B1464 + ldr r1, =@080B1464 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080B1464: - .4byte _080B14CC - .4byte _080B14B0 - .4byte _080B1494 - .4byte _080B14A8 - .4byte _080B1514 - .4byte _080B14D4 - .4byte _080B14EC - .4byte _080B14D4 - .4byte _080B153C - .4byte _080B1590 - .4byte _080B1598 - .4byte _080B15A8 -_080B1494: +@080B1464: + .4byte @080B14CC + .4byte @080B14B0 + .4byte @080B1494 + .4byte @080B14A8 + .4byte @080B1514 + .4byte @080B14D4 + .4byte @080B14EC + .4byte @080B14D4 + .4byte @080B153C + .4byte @080B1590 + .4byte @080B1598 + .4byte @080B15A8 +@080B1494: ldr r0, =0x0854ff84 adds r1, r5, 0 bl battle_load_arguments ldr r0, =0x082713c2 - b _080B161E + b @080B161E .align 2, 0 .pool -_080B14A8: +@080B14A8: ldr r0, =0x0854ff3c - b _080B14D6 + b @080B14D6 .align 2, 0 .pool -_080B14B0: +@080B14B0: ldr r0, =0x02038bfc ldrb r0, [r0] cmp r0, 0 - bne _080B14C4 + bne @080B14C4 ldr r0, =0x0854fef4 - b _080B15FE + b @080B15FE .align 2, 0 .pool -_080B14C4: +@080B14C4: ldr r0, =0x0855005c - b _080B1616 + b @080B1616 .align 2, 0 .pool -_080B14CC: +@080B14CC: ldr r0, =0x0854fef4 - b _080B15FE + b @080B15FE .align 2, 0 .pool -_080B14D4: +@080B14D4: ldr r0, =0x0854ffcc -_080B14D6: +@080B14D6: adds r1, r5, 0 bl battle_load_arguments bl battle_80801F0 ldr r0, =0x0827138a - b _080B161E + b @080B161E .align 2, 0 .pool -_080B14EC: +@080B14EC: ldr r0, =0x0854ff3c adds r1, r5, 0 bl battle_load_arguments @@ -333474,10 +333474,10 @@ _080B14EC: bl sub_80B2234 strh r0, [r4] ldr r0, =0x082713f8 - b _080B161E + b @080B161E .align 2, 0 .pool -_080B1514: +@080B1514: ldr r0, =0x0854feac adds r1, r5, 0 bl battle_load_arguments @@ -333487,14 +333487,14 @@ _080B1514: bl sub_80B2234 strh r0, [r4] ldr r0, =0x082713d1 - b _080B161E + b @080B161E .align 2, 0 .pool -_080B153C: +@080B153C: ldr r0, =0x02038bfc ldrb r0, [r0] cmp r0, 0 - bne _080B156C + bne @080B156C ldr r0, =0x0854feac adds r1, r5, 0 bl battle_load_arguments @@ -333503,42 +333503,42 @@ _080B153C: ldrb r0, [r0] bl sub_81A9AA8 ldr r1, =0x02038bca - b _080B157E + b @080B157E .align 2, 0 .pool -_080B156C: +@080B156C: ldr r0, =0x08550014 adds r1, r5, 0 bl battle_load_arguments ldr r0, =0x020375f2 ldrb r0, [r0] bl sub_81A9AA8 -_080B157C: +@080B157C: ldr r1, =0x02038bcc -_080B157E: +@080B157E: strh r0, [r1] - b _080B161C + b @080B161C .align 2, 0 .pool -_080B1590: +@080B1590: ldr r0, =0x0854feac - b _080B159A + b @080B159A .align 2, 0 .pool -_080B1598: +@080B1598: ldr r0, =0x08550014 -_080B159A: +@080B159A: adds r1, r5, 0 bl battle_load_arguments movs r0, 0 - b _080B161E + b @080B161E .align 2, 0 .pool -_080B15A8: +@080B15A8: ldr r0, =0x02038bfc ldrb r0, [r0] cmp r0, 0 - bne _080B15D8 + bne @080B15D8 ldr r0, =0x0854feac adds r1, r5, 0 bl battle_load_arguments @@ -333547,40 +333547,40 @@ _080B15A8: ldrb r0, [r0] bl battle_init ldr r1, =0x02038bca - b _080B157E + b @080B157E .align 2, 0 .pool -_080B15D8: +@080B15D8: ldr r0, =0x08550014 adds r1, r5, 0 bl battle_load_arguments ldr r0, =0x020375f2 ldrb r0, [r0] bl battle_init - b _080B157C + b @080B157C .align 2, 0 .pool -_080B15F4: +@080B15F4: ldr r0, =0x02038bfc ldrb r0, [r0] cmp r0, 0 - bne _080B1614 + bne @080B1614 ldr r0, =0x0854feac -_080B15FE: +@080B15FE: adds r1, r5, 0 bl battle_load_arguments bl battle_80801F0 - b _080B161C + b @080B161C .align 2, 0 .pool -_080B1614: +@080B1614: ldr r0, =0x08550014 -_080B1616: +@080B1616: adds r1, r5, 0 bl battle_load_arguments -_080B161C: +@080B161C: ldr r0, =0x08271362 -_080B161E: +@080B161E: pop {r4,r5} pop {r1} bx r1 @@ -333589,7 +333589,7 @@ _080B161E: thumb_func_end battle_configure_by_script thumb_func_start sub_80B162C -sub_80B162C: @ 80B162C +sub_80B162C: ; 80B162C push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -333617,7 +333617,7 @@ sub_80B162C: @ 80B162C thumb_func_end sub_80B162C thumb_func_start sub_80B1670 -sub_80B1670: @ 80B1670 +sub_80B1670: ; 80B1670 push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -333642,7 +333642,7 @@ sub_80B1670: @ 80B1670 thumb_func_end sub_80B1670 thumb_func_start sub_80B16A4 -sub_80B16A4: @ 80B16A4 +sub_80B16A4: ; 80B16A4 push {lr} ldr r0, =0x08271354 bl script_env_1_execute_new_script @@ -333654,7 +333654,7 @@ sub_80B16A4: @ 80B16A4 thumb_func_end sub_80B16A4 thumb_func_start sub_80B16B8 -sub_80B16B8: @ 80B16B8 +sub_80B16B8: ; 80B16B8 push {lr} adds r0, 0x2 bl sub_80B1268 @@ -333671,7 +333671,7 @@ sub_80B16B8: @ 80B16B8 thumb_func_end sub_80B16B8 thumb_func_start sub_80B16D8 -sub_80B16D8: @ 80B16D8 +sub_80B16D8: ; 80B16D8 push {r4,lr} ldr r0, =0x03005df0 ldrb r0, [r0] @@ -333697,7 +333697,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 @@ -333706,32 +333706,32 @@ sub_80B170C: @ 80B170C thumb_func_end sub_80B170C thumb_func_start sub_80B1718 -sub_80B1718: @ 80B1718 +sub_80B1718: ; 80B1718 push {lr} bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - beq _080B1734 + beq @080B1734 ldr r0, =0x03005df0 ldrb r0, [r0] bl sub_81A9AC4 - b _080B1752 + b @080B1752 .align 2, 0 .pool -_080B1734: +@080B1734: bl sub_81D6074 cmp r0, 0 - bne _080B174A + bne @080B174A bl trainerflag_opponent lsls r0, 16 lsrs r0, 16 bl flag_check - b _080B1752 -_080B174A: + b @080B1752 +@080B174A: ldr r0, =0x03005df0 ldrb r0, [r0] bl sub_81D619C -_080B1752: +@080B1752: lsls r0, 24 lsrs r0, 24 pop {r1} @@ -333741,17 +333741,17 @@ _080B1752: thumb_func_end sub_80B1718 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] cmp r0, 0 - beq _080B1776 + beq @080B1776 bl sub_80B1290 lsls r0, 16 lsrs r0, 16 bl flag_set -_080B1776: +@080B1776: bl trainerflag_opponent lsls r0, 16 lsrs r0, 16 @@ -333763,7 +333763,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 @@ -333774,7 +333774,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 @@ -333789,7 +333789,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 @@ -333802,7 +333802,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 @@ -333815,26 +333815,26 @@ 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] cmp r0, 0x2 - bne _080B17FC + bne @080B17FC ldr r1, =0x02022fec ldr r0, =0x00008009 - b _080B1800 + b @080B1800 .align 2, 0 .pool -_080B17FC: +@080B17FC: ldr r1, =0x02022fec movs r0, 0x8 -_080B1800: +@080B1800: str r0, [r1] bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - beq _080B1884 + beq @080B1884 ldr r0, =0x0000400e movs r1, 0 bl var_set @@ -333847,7 +333847,7 @@ _080B1800: ldr r0, =0x030060a8 ldrb r0, [r0] cmp r0, 0x2 - bne _080B1864 + bne @080B1864 movs r0, 0x1 bl sub_816306C ldr r4, =0x020247a8 @@ -333864,10 +333864,10 @@ _080B1800: lsls r1, 1 adds r0, r4, r1 bl zero_pokemon_struct - b _080B187A + b @080B187A .align 2, 0 .pool -_080B1864: +@080B1864: movs r0, 0x1 bl sub_8163048 ldr r4, =0x020247a8 @@ -333876,16 +333876,16 @@ _080B1864: adds r4, 0x64 adds r0, r4, 0 bl zero_pokemon_struct -_080B187A: +@080B187A: bl sub_81A9B04 - b _080B18B8 + b @080B18B8 .align 2, 0 .pool -_080B1884: +@080B1884: bl sub_81D5C18 lsls r0, 24 cmp r0, 0 - beq _080B18B8 + beq @080B18B8 ldr r2, =0x02022fec ldr r0, [r2] movs r1, 0x80 @@ -333895,16 +333895,16 @@ _080B1884: ldr r0, =0x030060a8 ldrb r0, [r0] cmp r0, 0x2 - bne _080B18B0 + bne @080B18B0 bl sub_81D639C - b _080B18B4 + b @080B18B4 .align 2, 0 .pool -_080B18B0: +@080B18B0: bl sub_81D6384 -_080B18B4: +@080B18B4: bl sub_81D61E8 -_080B18B8: +@080B18B8: ldr r1, =0x02038bf9 ldr r2, =0x030060a8 ldrb r0, [r2] @@ -333922,19 +333922,19 @@ _080B18B8: bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _080B18E8 + bne @080B18E8 bl sub_81D5C18 lsls r0, 24 cmp r0, 0 - beq _080B1908 -_080B18E8: + beq @080B1908 +@080B18E8: bl sub_80B0828 - b _080B190C + b @080B190C .align 2, 0 .pool -_080B1908: +@080B1908: bl task_add_01_battle_start_with_music_and_stats -_080B190C: +@080B190C: bl script_env_2_set_ctx_paused pop {r4} pop {r0} @@ -333942,53 +333942,53 @@ _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] movs r0, 0x80 lsls r0, 3 cmp r1, r0 - beq _080B1946 + beq @080B1946 ldr r0, =0x0202433a ldrb r0, [r0] bl battle_exit_is_player_defeat cmp r0, 0x1 - bne _080B1968 + bne @080B1968 bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _080B1946 + bne @080B1946 bl sub_81D5C18 lsls r0, 24 cmp r0, 0 - beq _080B195C -_080B1946: + beq @080B195C +@080B1946: ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 - b _080B198A + b @080B198A .align 2, 0 .pool -_080B195C: +@080B195C: ldr r0, =c2_whiteout + 1 bl set_callback2 - b _080B198A + b @080B198A .align 2, 0 .pool -_080B1968: +@080B1968: ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _080B198A + bne @080B198A bl sub_81D5C18 lsls r0, 24 cmp r0, 0 - bne _080B198A + bne @080B198A bl sub_80B20BC bl rom_npc_set_flag_for_script_id -_080B198A: +@080B198A: pop {r0} bx r0 .align 2, 0 @@ -333996,37 +333996,37 @@ _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] movs r0, 0x80 lsls r0, 3 cmp r1, r0 - bne _080B19B4 + bne @080B19B4 ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 - b _080B19E2 + b @080B19E2 .align 2, 0 .pool -_080B19B4: +@080B19B4: ldr r0, =0x0202433a ldrb r0, [r0] bl battle_exit_is_player_defeat cmp r0, 0x1 - bne _080B19D0 + bne @080B19D0 ldr r0, =c2_whiteout + 1 bl set_callback2 - b _080B19E2 + b @080B19E2 .align 2, 0 .pool -_080B19D0: +@080B19D0: ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 bl sub_80B20BC bl rom_npc_set_flag_for_script_id bl sub_80B22BC -_080B19E2: +@080B19E2: pop {r0} bx r0 .align 2, 0 @@ -334034,7 +334034,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 @@ -334051,26 +334051,26 @@ sub_80B19EC: @ 80B19EC thumb_func_end sub_80B19EC thumb_func_start sub_80B1A14 -sub_80B1A14: @ 80B1A14 +sub_80B1A14: ; 80B1A14 push {lr} bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - beq _080B1A7C + beq @080B1A7C ldr r0, =0x030060a8 ldrb r0, [r0] cmp r0, 0x1 - bhi _080B1A44 + bhi @080B1A44 ldr r0, =0x020375f2 ldrb r0, [r0] bl sub_81A9AA8 lsls r0, 16 lsrs r0, 16 bl sub_81A9EDC - b _080B1AD8 + b @080B1AD8 .align 2, 0 .pool -_080B1A44: +@080B1A44: ldr r3, =0x02037350 ldr r2, =0x03006090 ldr r0, =0x02038bfc @@ -334089,18 +334089,18 @@ _080B1A44: lsls r0, 16 lsrs r0, 16 bl sub_81A9EDC - b _080B1AD8 + b @080B1AD8 .align 2, 0 .pool -_080B1A7C: +@080B1A7C: bl sub_81D5C18 lsls r0, 24 cmp r0, 0 - beq _080B1AEC + beq @080B1AEC ldr r0, =0x030060a8 ldrb r0, [r0] cmp r0, 0x1 - bhi _080B1AAC + bhi @080B1AAC ldr r0, =0x020375f2 ldrb r0, [r0] bl battle_init @@ -334109,10 +334109,10 @@ _080B1A7C: lsrs r1, 16 movs r0, 0x2 bl sub_81D572C - b _080B1AD8 + b @080B1AD8 .align 2, 0 .pool -_080B1AAC: +@080B1AAC: ldr r3, =0x02037350 ldr r2, =0x03006090 ldr r0, =0x02038bfc @@ -334133,28 +334133,28 @@ _080B1AAC: lsrs r1, 16 movs r0, 0x2 bl sub_81D572C -_080B1AD8: +@080B1AD8: bl sub_80982B8 - b _080B1AF4 + b @080B1AF4 .align 2, 0 .pool -_080B1AEC: +@080B1AEC: bl sub_80B1C7C bl box_related_two__2 -_080B1AF4: +@080B1AF4: pop {r0} bx r0 thumb_func_end sub_80B1A14 thumb_func_start sub_80B1AF8 -sub_80B1AF8: @ 80B1AF8 +sub_80B1AF8: ; 80B1AF8 push {lr} ldr r0, =0x02038bec ldr r0, [r0] cmp r0, 0 - bne _080B1B04 + bne @080B1B04 ldr r0, =0x082c8436 -_080B1B04: +@080B1B04: pop {r1} bx r1 .align 2, 0 @@ -334162,39 +334162,39 @@ _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] cmp r2, 0 - beq _080B1B3C + beq @080B1B3C movs r0, 0 strb r0, [r1] ldr r0, =0x02038bf4 ldr r2, [r0] cmp r2, 0 - beq _080B1B54 + beq @080B1B54 ldr r1, =0x03006080 movs r0, 0x1 strh r0, [r1] adds r0, r2, 0 - b _080B1B56 + b @080B1B56 .align 2, 0 .pool -_080B1B3C: +@080B1B3C: ldr r0, =0x02038bf0 ldr r1, [r0] cmp r1, 0 - beq _080B1B54 + beq @080B1B54 ldr r0, =0x03006080 strh r2, [r0] adds r0, r1, 0 - b _080B1B56 + b @080B1B56 .align 2, 0 .pool -_080B1B54: +@080B1B54: ldr r0, =0x082742e6 -_080B1B56: +@080B1B56: pop {r1} bx r1 .align 2, 0 @@ -334202,7 +334202,7 @@ _080B1B56: thumb_func_end sub_80B1B10 thumb_func_start sub_80B1B60 -sub_80B1B60: @ 80B1B60 +sub_80B1B60: ; 80B1B60 push {lr} bl sub_80B1D18 bl box_related_two__2 @@ -334211,122 +334211,122 @@ sub_80B1B60: @ 80B1B60 thumb_func_end sub_80B1B60 thumb_func_start sub_80B1B70 -sub_80B1B70: @ 80B1B70 +sub_80B1B70: ; 80B1B70 push {lr} ldr r0, =0x02038bfc ldrb r0, [r0] cmp r0, 0 - bne _080B1B88 + bne @080B1B88 ldr r0, =0x02038bca - b _080B1B8A + b @080B1B8A .align 2, 0 .pool -_080B1B88: +@080B1B88: ldr r0, =0x02038bcc -_080B1B8A: +@080B1B8A: ldrh r1, [r0] ldr r0, =0x02038bc8 ldrh r0, [r0] cmp r0, 0x1 - beq _080B1C62 + beq @080B1C62 cmp r0, 0x8 - beq _080B1C62 + beq @080B1C62 adds r0, r1, 0 bl sub_806D888 lsls r0, 24 lsrs r0, 24 cmp r0, 0xD - bhi _080B1C5C + bhi @080B1C5C lsls r0, 2 - ldr r1, =_080B1BBC + ldr r1, =@080B1BBC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080B1BBC: - .4byte _080B1BF4 - .4byte _080B1BFA - .4byte _080B1C04 - .4byte _080B1C5C - .4byte _080B1C0C - .4byte _080B1C12 - .4byte _080B1C1C - .4byte _080B1C24 - .4byte _080B1C2C - .4byte _080B1C34 - .4byte _080B1C3C - .4byte _080B1C42 - .4byte _080B1C4C - .4byte _080B1C54 -_080B1BF4: +@080B1BBC: + .4byte @080B1BF4 + .4byte @080B1BFA + .4byte @080B1C04 + .4byte @080B1C5C + .4byte @080B1C0C + .4byte @080B1C12 + .4byte @080B1C1C + .4byte @080B1C24 + .4byte @080B1C2C + .4byte @080B1C34 + .4byte @080B1C3C + .4byte @080B1C42 + .4byte @080B1C4C + .4byte @080B1C54 +@080B1BF4: movs r0, 0xBE lsls r0, 1 - b _080B1C5E -_080B1BFA: + b @080B1C5E +@080B1BFA: ldr r0, =0x00000197 - b _080B1C5E + b @080B1C5E .align 2, 0 .pool -_080B1C04: +@080B1C04: ldr r0, =0x0000017b - b _080B1C5E + b @080B1C5E .align 2, 0 .pool -_080B1C0C: +@080B1C0C: movs r0, 0xD0 lsls r0, 1 - b _080B1C5E -_080B1C12: + b @080B1C5E +@080B1C12: ldr r0, =0x000001a1 - b _080B1C5E + b @080B1C5E .align 2, 0 .pool -_080B1C1C: +@080B1C1C: ldr r0, =0x000001a3 - b _080B1C5E + b @080B1C5E .align 2, 0 .pool -_080B1C24: +@080B1C24: ldr r0, =0x000001b9 - b _080B1C5E + b @080B1C5E .align 2, 0 .pool -_080B1C2C: +@080B1C2C: ldr r0, =0x00000181 - b _080B1C5E + b @080B1C5E .align 2, 0 .pool -_080B1C34: +@080B1C34: ldr r0, =0x000001c1 - b _080B1C5E + b @080B1C5E .align 2, 0 .pool -_080B1C3C: +@080B1C3C: movs r0, 0xE1 lsls r0, 1 - b _080B1C5E -_080B1C42: + b @080B1C5E +@080B1C42: ldr r0, =0x000001c3 - b _080B1C5E + b @080B1C5E .align 2, 0 .pool -_080B1C4C: +@080B1C4C: ldr r0, =0x000001c5 - b _080B1C5E + b @080B1C5E .align 2, 0 .pool -_080B1C54: +@080B1C54: ldr r0, =0x0000018d - b _080B1C5E + b @080B1C5E .align 2, 0 .pool -_080B1C5C: +@080B1C5C: ldr r0, =0x000001a7 -_080B1C5E: +@080B1C5E: bl current_map_music_set -_080B1C62: +@080B1C62: pop {r0} bx r0 .align 2, 0 @@ -334334,12 +334334,12 @@ _080B1C62: thumb_func_end sub_80B1B70 thumb_func_start sub_80B1C6C -sub_80B1C6C: @ 80B1C6C +sub_80B1C6C: ; 80B1C6C push {lr} cmp r0, 0 - bne _080B1C74 + bne @080B1C74 ldr r0, =0x085e8d03 -_080B1C74: +@080B1C74: pop {r1} bx r1 .align 2, 0 @@ -334347,19 +334347,19 @@ _080B1C74: thumb_func_end sub_80B1C6C thumb_func_start sub_80B1C7C -sub_80B1C7C: @ 80B1C7C +sub_80B1C7C: ; 80B1C7C push {lr} ldr r0, =0x02038bfc ldrb r0, [r0] cmp r0, 0 - beq _080B1C94 + beq @080B1C94 ldr r0, =0x02038bd8 - b _080B1C96 + b @080B1C96 .align 2, 0 .pool -_080B1C94: +@080B1C94: ldr r0, =0x02038bd4 -_080B1C96: +@080B1C96: ldr r0, [r0] bl sub_80B1C6C pop {r1} @@ -334369,22 +334369,22 @@ _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] movs r0, 0x80 lsls r0, 3 cmp r1, r0 - bne _080B1CBC + bne @080B1CBC bl sub_80EA250 - b _080B1CC0 + b @080B1CC0 .align 2, 0 .pool -_080B1CBC: +@080B1CBC: ldr r0, =0x02038bdc ldr r0, [r0] -_080B1CC0: +@080B1CC0: ldr r4, =0x02021fc4 bl sub_80B1C6C adds r1, r0, 0 @@ -334399,7 +334399,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 @@ -334417,7 +334417,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] @@ -334429,7 +334429,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] @@ -334441,122 +334441,122 @@ 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 movs r3, 0 adds r2, r0, 0 -_080B1D36: +@080B1D36: ldrh r0, [r2] cmp r0, r1 - bne _080B1D40 + bne @080B1D40 adds r0, r3, 0 - b _080B1D4C -_080B1D40: + b @080B1D4C +@080B1D40: adds r2, 0x10 adds r3, 0x1 cmp r3, 0x4D - ble _080B1D36 + ble @080B1D36 movs r0, 0x1 negs r0, r0 -_080B1D4C: +@080B1D4C: pop {r1} bx r1 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 movs r4, 0 adds r2, r0, 0 -_080B1D5A: +@080B1D5A: movs r1, 0 ldrh r0, [r2] cmp r0, 0 - beq _080B1D80 + beq @080B1D80 movs r3, 0 -_080B1D64: +@080B1D64: adds r0, r2, r3 ldrh r0, [r0] cmp r0, r5 - bne _080B1D70 + bne @080B1D70 adds r0, r4, 0 - b _080B1D8C -_080B1D70: + b @080B1D8C +@080B1D70: adds r3, 0x2 adds r1, 0x1 cmp r1, 0x4 - bgt _080B1D80 + bgt @080B1D80 adds r0, r2, r3 ldrh r0, [r0] cmp r0, 0 - bne _080B1D64 -_080B1D80: + bne @080B1D64 +@080B1D80: adds r2, 0x10 adds r4, 0x1 cmp r4, 0x4D - ble _080B1D5A + ble @080B1D5A movs r0, 0x1 negs r0, r0 -_080B1D8C: +@080B1D8C: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_80B1D50 thumb_func_start sub_80B1D94 -sub_80B1D94: @ 80B1D94 +sub_80B1D94: ; 80B1D94 push {lr} cmp r0, 0x48 - ble _080B1D9E + ble @080B1D9E movs r0, 0x1 - b _080B1DB8 -_080B1D9E: + b @080B1DB8 +@080B1D9E: cmp r0, 0x40 - bne _080B1DB6 + bne @080B1DB6 movs r0, 0x7E bl flag_check movs r1, 0 lsls r0, 24 cmp r0, 0 - bne _080B1DB2 + bne @080B1DB2 movs r1, 0x1 -_080B1DB2: +@080B1DB2: adds r0, r1, 0 - b _080B1DB8 -_080B1DB6: + b @080B1DB8 +@080B1DB6: movs r0, 0 -_080B1DB8: +@080B1DB8: pop {r1} bx r1 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 lsls r1, r6, 4 adds r1, r0 adds r4, r1, 0x2 - b _080B1DCE -_080B1DCA: + b @080B1DCE +@080B1DCA: adds r4, 0x2 adds r5, 0x1 -_080B1DCE: +@080B1DCE: cmp r5, 0x4 - bgt _080B1DE2 + bgt @080B1DE2 ldrh r0, [r4] cmp r0, 0 - beq _080B1DE2 + beq @080B1DE2 bl trainer_flag_check lsls r0, 24 cmp r0, 0 - bne _080B1DCA -_080B1DE2: + bne @080B1DCA +@080B1DE2: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000009ca @@ -334571,7 +334571,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 @@ -334587,17 +334587,17 @@ sub_80B1DFC: @ 80B1DFC movs r5, 0 adds r4, r6, 0 adds r4, 0xA -_080B1E1A: +@080B1E1A: ldrh r0, [r4] cmp r0, r9 - bne _080B1E74 + bne @080B1E74 ldrh r0, [r4, 0x2] cmp r0, r8 - bne _080B1E74 + bne @080B1E74 adds r0, r5, 0 bl sub_80B1D94 cmp r0, 0 - bne _080B1E74 + bne @080B1E74 ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000009ca @@ -334605,7 +334605,7 @@ _080B1E1A: adds r0, r5 ldrb r0, [r0] cmp r0, 0 - bne _080B1E72 + bne @080B1E72 movs r1, 0xAE lsls r1, 1 adds r0, r5, r1 @@ -334614,7 +334614,7 @@ _080B1E1A: bl flag_check lsls r0, 24 cmp r0, 0 - beq _080B1E74 + beq @080B1E74 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -334623,17 +334623,17 @@ _080B1E1A: lsls r0, 16 lsrs r0, 16 cmp r0, 0x1E - bhi _080B1E74 + bhi @080B1E74 adds r0, r6, 0 adds r1, r5, 0 bl sub_80B1DBC -_080B1E72: +@080B1E72: movs r7, 0x1 -_080B1E74: +@080B1E74: adds r4, 0x10 adds r5, 0x1 cmp r5, 0x40 - ble _080B1E1A + ble @080B1E1A adds r0, r7, 0 pop {r3,r4} mov r8, r3 @@ -334646,7 +334646,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, =0x085500a4 @@ -334657,11 +334657,11 @@ sub_80B1E94: @ 80B1E94 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B1EB4 + bne @080B1EB4 adds r0, r5, 0 adds r1, r4, 0 bl sub_80B1DBC -_080B1EB4: +@080B1EB4: pop {r4,r5} pop {r0} bx r0 @@ -334670,7 +334670,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 @@ -334680,38 +334680,38 @@ sub_80B1EC0: @ 80B1EC0 adds r3, r0, 0 adds r3, 0xA ldr r5, =0x03005d8c -_080B1ED2: +@080B1ED2: ldrh r0, [r3] cmp r0, r4 - bne _080B1EF8 + bne @080B1EF8 ldrh r0, [r3, 0x2] cmp r0, r2 - bne _080B1EF8 + bne @080B1EF8 ldr r0, [r5] ldr r6, =0x000009ca adds r0, r6 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _080B1EF8 + beq @080B1EF8 movs r0, 0x1 - b _080B1F02 + b @080B1F02 .align 2, 0 .pool -_080B1EF8: +@080B1EF8: adds r3, 0x10 adds r1, 0x1 cmp r1, 0x4D - ble _080B1ED2 + ble @080B1ED2 movs r0, 0 -_080B1F02: +@080B1F02: pop {r4-r6} pop {r1} bx r1 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 @@ -334720,29 +334720,29 @@ sub_80B1F08: @ 80B1F08 movs r1, 0 adds r3, r0, 0 adds r3, 0xA -_080B1F18: +@080B1F18: ldrh r0, [r3] cmp r0, r4 - bne _080B1F28 + bne @080B1F28 ldrh r0, [r3, 0x2] cmp r0, r2 - bne _080B1F28 + bne @080B1F28 movs r0, 0x1 - b _080B1F32 -_080B1F28: + b @080B1F32 +@080B1F28: adds r3, 0x10 adds r1, 0x1 cmp r1, 0x4D - ble _080B1F18 + ble @080B1F18 movs r0, 0 -_080B1F32: +@080B1F32: pop {r4} pop {r1} bx r1 thumb_func_end sub_80B1F08 thumb_func_start sub_80B1F38 -sub_80B1F38: @ 80B1F38 +sub_80B1F38: ; 80B1F38 push {lr} lsls r1, 16 lsrs r1, 16 @@ -334751,9 +334751,9 @@ sub_80B1F38: @ 80B1F38 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _080B1F6C + beq @080B1F6C cmp r1, 0x63 - bgt _080B1F6C + bgt @080B1F6C ldr r0, =0x03005d8c ldr r0, [r0] ldr r2, =0x000009ca @@ -334761,20 +334761,20 @@ sub_80B1F38: @ 80B1F38 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _080B1F6C + beq @080B1F6C movs r0, 0x1 - b _080B1F6E + b @080B1F6E .align 2, 0 .pool -_080B1F6C: +@080B1F6C: movs r0, 0 -_080B1F6E: +@080B1F6E: pop {r1} bx r1 thumb_func_end sub_80B1F38 thumb_func_start sub_80B1F74 -sub_80B1F74: @ 80B1F74 +sub_80B1F74: ; 80B1F74 push {lr} lsls r1, 16 lsrs r1, 16 @@ -334783,9 +334783,9 @@ sub_80B1F74: @ 80B1F74 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _080B1FA8 + beq @080B1FA8 cmp r1, 0x63 - bgt _080B1FA8 + bgt @080B1FA8 ldr r0, =0x03005d8c ldr r0, [r0] ldr r2, =0x000009ca @@ -334793,20 +334793,20 @@ sub_80B1F74: @ 80B1F74 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _080B1FA8 + beq @080B1FA8 movs r0, 0x1 - b _080B1FAA + b @080B1FAA .align 2, 0 .pool -_080B1FA8: +@080B1FA8: movs r0, 0 -_080B1FAA: +@080B1FAA: pop {r1} bx r1 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 @@ -334816,46 +334816,46 @@ sub_80B1FB0: @ 80B1FB0 movs r0, 0x1 negs r0, r0 cmp r1, r0 - bne _080B1FD8 + bne @080B1FD8 movs r0, 0 - b _080B1FFE -_080B1FCA: + b @080B1FFE +@080B1FCA: subs r0, r6, 0x1 lsls r0, 1 adds r0, r7, r0 ldrh r0, [r0] - b _080B1FFE -_080B1FD4: + b @080B1FFE +@080B1FD4: ldrh r0, [r5] - b _080B1FFE -_080B1FD8: + b @080B1FFE +@080B1FD8: lsls r0, r1, 4 adds r7, r4, r0 movs r6, 0x1 adds r5, r7, 0x2 adds r4, r5, 0 -_080B1FE2: +@080B1FE2: ldrh r0, [r4] cmp r0, 0 - beq _080B1FCA + beq @080B1FCA bl trainer_flag_check lsls r0, 24 cmp r0, 0 - beq _080B1FD4 + beq @080B1FD4 adds r4, 0x2 adds r5, 0x2 adds r6, 0x1 cmp r6, 0x4 - ble _080B1FE2 + ble @080B1FE2 ldrh r0, [r7, 0x8] -_080B1FFE: +@080B1FFE: pop {r4-r7} pop {r1} bx r1 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 @@ -334865,47 +334865,47 @@ sub_80B2004: @ 80B2004 movs r0, 0x1 negs r0, r0 cmp r1, r0 - bne _080B2032 + bne @080B2032 movs r0, 0 - b _080B2054 -_080B201E: + b @080B2054 +@080B201E: subs r0, r5, 0x1 lsls r0, 1 adds r0, r6, r0 ldrh r0, [r0] - b _080B2054 -_080B2028: + b @080B2054 +@080B2028: subs r0, r5, 0x1 lsls r0, 1 adds r0, r6, r0 ldrh r0, [r0] - b _080B2054 -_080B2032: + b @080B2054 +@080B2032: lsls r0, r1, 4 adds r6, r4, r0 movs r5, 0x1 adds r4, r6, 0x2 -_080B203A: +@080B203A: ldrh r0, [r4] cmp r0, 0 - beq _080B201E + beq @080B201E bl trainer_flag_check lsls r0, 24 cmp r0, 0 - beq _080B2028 + beq @080B2028 adds r4, 0x2 adds r5, 0x1 cmp r5, 0x4 - ble _080B203A + ble @080B203A ldrh r0, [r6, 0x8] -_080B2054: +@080B2054: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_80B2004 thumb_func_start sub_80B205C -sub_80B205C: @ 80B205C +sub_80B205C: ; 80B205C push {lr} lsls r1, 16 lsrs r1, 16 @@ -334914,7 +334914,7 @@ sub_80B205C: @ 80B205C movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _080B207E + beq @080B207E ldr r0, =0x03005d8c ldr r0, [r0] ldr r2, =0x000009ca @@ -334922,7 +334922,7 @@ sub_80B205C: @ 80B205C adds r0, r1 movs r1, 0 strb r1, [r0] -_080B207E: +@080B207E: pop {r0} bx r0 .align 2, 0 @@ -334930,28 +334930,28 @@ _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 movs r4, 0xAE lsls r4, 1 ldr r2, =0x085500a4 -_080B2098: +@080B2098: ldrh r0, [r2] cmp r0, r3 - bne _080B20A8 + bne @080B20A8 adds r0, r1, r4 - b _080B20B2 + b @080B20B2 .align 2, 0 .pool -_080B20A8: +@080B20A8: adds r2, 0x10 adds r1, 0x1 cmp r1, 0x4D - ble _080B2098 + ble @080B2098 ldr r0, =0x0000ffff -_080B20B2: +@080B20B2: pop {r4} pop {r1} bx r1 @@ -334960,24 +334960,24 @@ _080B20B2: thumb_func_end sub_80B208C thumb_func_start sub_80B20BC -sub_80B20BC: @ 80B20BC +sub_80B20BC: ; 80B20BC push {lr} ldr r0, =0x0000012f bl flag_check lsls r0, 24 cmp r0, 0 - beq _080B20E2 + beq @080B20E2 ldr r0, =0x02038bca ldrh r0, [r0] bl sub_80B208C adds r1, r0, 0 ldr r0, =0x0000ffff cmp r1, r0 - beq _080B20E2 + beq @080B20E2 lsls r0, r1, 16 lsrs r0, 16 bl flag_set -_080B20E2: +@080B20E2: pop {r0} bx r0 .align 2, 0 @@ -334985,7 +334985,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 @@ -334995,108 +334995,108 @@ sub_80B20F4: @ 80B20F4 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _080B211E + beq @080B211E lsls r0, r1, 4 adds r0, r4 ldrh r0, [r0, 0x2] bl trainer_flag_check lsls r0, 24 cmp r0, 0 - beq _080B211E + beq @080B211E movs r0, 0x1 - b _080B2120 -_080B211E: + b @080B2120 +@080B211E: movs r0, 0 -_080B2120: +@080B2120: pop {r4} pop {r1} bx r1 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 ldr r4, =0x08550584 -_080B2130: +@080B2130: ldrh r0, [r4] bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B214C + bne @080B214C adds r6, 0x1 cmp r6, 0x4 - ble _080B214C + ble @080B214C movs r0, 0x1 - b _080B2156 + b @080B2156 .align 2, 0 .pool -_080B214C: +@080B214C: adds r4, 0x2 adds r5, 0x1 cmp r5, 0x7 - bls _080B2130 + bls @080B2130 movs r0, 0 -_080B2156: +@080B2156: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_80B2128 thumb_func_start sub_80B215C -sub_80B215C: @ 80B215C +sub_80B215C: ; 80B215C push {lr} bl sub_80B2128 cmp r0, 0 - beq _080B2184 + beq @080B2184 ldr r0, =0x03005d8c ldr r0, [r0] ldr r2, =0x000009c8 adds r1, r0, r2 ldrh r0, [r1] cmp r0, 0xFE - bls _080B2180 + bls @080B2180 movs r0, 0xFF - b _080B2182 + b @080B2182 .align 2, 0 .pool -_080B2180: +@080B2180: adds r0, 0x1 -_080B2182: +@080B2182: strh r0, [r1] -_080B2184: +@080B2184: pop {r0} bx r0 thumb_func_end sub_80B215C thumb_func_start sub_80B2188 -sub_80B2188: @ 80B2188 +sub_80B2188: ; 80B2188 push {lr} bl sub_80B2128 cmp r0, 0 - beq _080B21AC + beq @080B21AC ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000009c8 adds r0, r1 ldrh r0, [r0] cmp r0, 0xFE - bls _080B21AC + bls @080B21AC movs r0, 0x1 - b _080B21AE + b @080B21AE .align 2, 0 .pool -_080B21AC: +@080B21AC: movs r0, 0 -_080B21AE: +@080B21AE: pop {r1} bx r1 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 @@ -335104,20 +335104,20 @@ sub_80B21B4: @ 80B21B4 lsrs r4, r1, 16 bl sub_80B2188 cmp r0, 0 - beq _080B21E0 + beq @080B21E0 ldr r0, =0x085500a4 adds r1, r5, 0 adds r2, r4, 0 bl sub_80B1DFC cmp r0, 0x1 - bne _080B21E0 + bne @080B21E0 ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000009c8 adds r0, r1 movs r1, 0 strh r1, [r0] -_080B21E0: +@080B21E0: pop {r4,r5} pop {r0} bx r0 @@ -335126,7 +335126,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 @@ -335144,7 +335144,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 @@ -335162,7 +335162,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 @@ -335178,7 +335178,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 @@ -335194,7 +335194,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, =0x085500a4 ldr r4, =0x02038bca @@ -335203,25 +335203,25 @@ sub_80B226C: @ 80B226C bl sub_80B1F38 lsls r0, 24 cmp r0, 0 - bne _080B2298 + bne @080B2298 ldrh r1, [r4] adds r0, r5, 0 bl sub_80B20F4 lsls r0, 24 lsrs r0, 24 - b _080B229A + b @080B229A .align 2, 0 .pool -_080B2298: +@080B2298: movs r0, 0x1 -_080B229A: +@080B229A: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_80B226C thumb_func_start sub_80B22A0 -sub_80B22A0: @ 80B22A0 +sub_80B22A0: ; 80B22A0 push {lr} ldr r0, =0x085500a4 ldr r1, =0x02038bca @@ -335236,7 +335236,7 @@ sub_80B22A0: @ 80B22A0 thumb_func_end sub_80B22A0 thumb_func_start sub_80B22BC -sub_80B22BC: @ 80B22BC +sub_80B22BC: ; 80B22BC push {lr} ldr r0, =0x085500a4 ldr r1, =0x02038bca @@ -335250,12 +335250,12 @@ sub_80B22BC: @ 80B22BC thumb_func_end sub_80B22BC thumb_func_start sub_80B22D8 -sub_80B22D8: @ 80B22D8 +sub_80B22D8: ; 80B22D8 push {lr} ldr r1, =0x02038bf9 ldrb r0, [r1] cmp r0, 0x1 - bls _080B2300 + bls @080B2300 movs r0, 0 strb r0, [r1] ldr r1, =0x02038bf8 @@ -335263,16 +335263,16 @@ sub_80B22D8: @ 80B22D8 strb r0, [r1] ldr r1, =0x020375f0 movs r0, 0x1 - b _080B230A + b @080B230A .align 2, 0 .pool -_080B2300: +@080B2300: ldr r1, =0x02038bf8 movs r0, 0 strb r0, [r1] ldr r1, =0x020375f0 movs r0, 0 -_080B230A: +@080B230A: strh r0, [r1] pop {r0} bx r0 @@ -335281,7 +335281,7 @@ _080B230A: thumb_func_end sub_80B22D8 thumb_func_start sub_80B2318 -sub_80B2318: @ 80B2318 +sub_80B2318: ; 80B2318 push {r4-r7,lr} lsls r0, 16 ldr r7, =0x085500a4 @@ -335292,43 +335292,43 @@ sub_80B2318: @ 80B2318 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080B2338 + beq @080B2338 movs r0, 0 - b _080B2364 + b @080B2364 .align 2, 0 .pool -_080B2338: +@080B2338: movs r5, 0x1 adds r0, r4, 0x2 adds r0, r7 ldrh r0, [r0] cmp r0, 0 - beq _080B2360 + beq @080B2360 adds r4, r6, 0x2 -_080B2346: +@080B2346: ldrh r0, [r4] bl trainer_flag_check lsls r0, 24 cmp r0, 0 - beq _080B2360 + beq @080B2360 adds r4, 0x2 adds r5, 0x1 cmp r5, 0x4 - bgt _080B2360 + bgt @080B2360 ldrh r0, [r4] cmp r0, 0 - bne _080B2346 -_080B2360: + bne @080B2346 +@080B2360: lsls r0, r5, 16 lsrs r0, 16 -_080B2364: +@080B2364: pop {r4-r7} pop {r1} bx r1 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 @@ -335340,7 +335340,7 @@ sub_80B236C: @ 80B236C lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _080B23A0 + bne @080B23A0 adds r0, r4, 0 movs r1, 0x50 bl AddTask @@ -335353,7 +335353,7 @@ sub_80B236C: @ 80B236C adds r1, r2 strh r6, [r1, 0xA] strh r5, [r1, 0xC] -_080B23A0: +@080B23A0: pop {r4-r6} pop {r0} bx r0 @@ -335362,7 +335362,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 @@ -335410,7 +335410,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 @@ -335427,7 +335427,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 @@ -335441,28 +335441,28 @@ sub_80B243C: @ 80B243C movs r1, 0x6 ldrsh r0, [r4, r1] cmp r5, r0 - beq _080B2472 + beq @080B2472 cmp r5, 0x1 - bhi _080B2468 + bhi @080B2468 ldrh r0, [r4, 0xA] bl sub_80B241C - b _080B2470 + b @080B2470 .align 2, 0 .pool -_080B2468: +@080B2468: ldrh r0, [r4, 0xA] adds r1, r5, 0 bl sub_80B23B0 -_080B2470: +@080B2470: strh r5, [r4, 0x6] -_080B2472: +@080B2472: pop {r4,r5} pop {r0} bx r0 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 @@ -335473,36 +335473,36 @@ sub_80B2478: @ 80B2478 lsrs r0, 24 subs r0, 0x1 cmp r0, 0x6 - bhi _080B24F0 + bhi @080B24F0 lsls r0, 2 - ldr r1, =_080B24A0 + ldr r1, =@080B24A0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080B24A0: - .4byte _080B24BC - .4byte _080B24F0 - .4byte _080B24C0 - .4byte _080B24C4 - .4byte _080B24C8 - .4byte _080B24CC - .4byte _080B24EC -_080B24BC: +@080B24A0: + .4byte @080B24BC + .4byte @080B24F0 + .4byte @080B24C0 + .4byte @080B24C4 + .4byte @080B24C8 + .4byte @080B24CC + .4byte @080B24EC +@080B24BC: movs r0, 0x1 - b _080B24F2 -_080B24C0: + b @080B24F2 +@080B24C0: movs r0, 0x3 - b _080B24F2 -_080B24C4: + b @080B24F2 +@080B24C4: movs r0, 0x7 - b _080B24F2 -_080B24C8: + b @080B24F2 +@080B24C8: movs r0, 0x9 - b _080B24F2 -_080B24CC: + b @080B24F2 +@080B24CC: ldr r4, =0x02021cc4 bl sub_800ABAC adds r1, r0, 0 @@ -335513,22 +335513,22 @@ _080B24CC: movs r3, 0x1 bl decimal_int_to_string movs r0, 0x4 - b _080B24F2 + b @080B24F2 .align 2, 0 .pool -_080B24EC: +@080B24EC: movs r0, 0xA - b _080B24F2 -_080B24F0: + b @080B24F2 +@080B24F0: movs r0, 0 -_080B24F2: +@080B24F2: pop {r4} pop {r1} bx r1 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 @@ -335536,10 +335536,10 @@ sub_80B24F8: @ 80B24F8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080B250E + beq @080B250E movs r0, 0 - b _080B251E -_080B250E: + b @080B251E +@080B250E: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -335548,7 +335548,7 @@ _080B250E: ldr r0, =sub_80B2D2C + 1 str r0, [r1] movs r0, 0x1 -_080B251E: +@080B251E: pop {r4} pop {r1} bx r1 @@ -335557,7 +335557,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 @@ -335566,12 +335566,12 @@ sub_80B252C: @ 80B252C movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080B2570 + beq @080B2570 bl sub_800B320 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _080B2570 + bne @080B2570 ldr r0, =0x020229c6 strh r1, [r0] ldr r1, =0x03005e00 @@ -335582,40 +335582,40 @@ sub_80B252C: @ 80B252C ldr r1, =sub_80B2CEC + 1 str r1, [r0] movs r0, 0x1 - b _080B2572 + b @080B2572 .align 2, 0 .pool -_080B2570: +@080B2570: movs r0, 0 -_080B2572: +@080B2572: pop {r4} pop {r1} bx r1 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 bl sub_800B320 lsls r0, 24 cmp r0, 0 - beq _080B258E + beq @080B258E movs r0, 0x1 bl sub_800B330 -_080B258E: +@080B258E: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _080B25A4 + bne @080B25A4 movs r0, 0 - b _080B25BA + b @080B25BA .align 2, 0 .pool -_080B25A4: +@080B25A4: ldr r1, =0x020229c6 movs r0, 0 strh r0, [r1] @@ -335627,7 +335627,7 @@ _080B25A4: ldr r1, =sub_80B2CEC + 1 str r1, [r0] movs r0, 0x1 -_080B25BA: +@080B25BA: pop {r4} pop {r1} bx r1 @@ -335636,7 +335636,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 @@ -335644,10 +335644,10 @@ sub_80B25CC: @ 80B25CC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080B25E2 + beq @080B25E2 movs r0, 0 - b _080B25F2 -_080B25E2: + b @080B25F2 +@080B25E2: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -335656,7 +335656,7 @@ _080B25E2: ldr r0, =sub_80B2D2C + 1 str r0, [r1] movs r0, 0x1 -_080B25F2: +@080B25F2: pop {r4} pop {r1} bx r1 @@ -335665,7 +335665,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 @@ -335680,12 +335680,12 @@ sub_80B2600: @ 80B2600 lsls r0, 16 asrs r0, 16 cmp r0, 0xA - bne _080B262A + bne @080B262A movs r0, 0x2 bl sub_800A4D8 adds r0, r4, 0 bl remove_task -_080B262A: +@080B262A: pop {r4} pop {r0} bx r0 @@ -335694,7 +335694,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 @@ -335706,24 +335706,24 @@ sub_80B2634: @ 80B2634 movs r3, 0 ldrsh r2, [r4, r3] cmp r2, 0 - bne _080B266C + bne @080B266C bl sub_800A0AC bl sub_800AB98 bl sub_800A2BC ldr r0, =0x08550594 bl Window_AddFromTemplate strh r0, [r4, 0xA] - b _080B2678 + b @080B2678 .align 2, 0 .pool -_080B266C: +@080B266C: cmp r2, 0x9 - ble _080B2678 + ble @080B2678 subs r0, 0x8 adds r0, r1, r0 ldr r1, =sub_80B2688 + 1 str r1, [r0] -_080B2678: +@080B2678: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] @@ -335735,7 +335735,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 @@ -335745,13 +335745,13 @@ sub_80B2688: @ 80B2688 adds r0, r4, 0 bl sub_80B252C cmp r0, 0x1 - beq _080B26FC + beq @080B26FC adds r0, r4, 0 bl sub_80B2578 cmp r0, 0x1 - beq _080B26FC + beq @080B26FC cmp r5, 0x1 - bls _080B26FC + bls @080B26FC movs r0, 0x1 bl sub_800B330 ldr r1, =0x03005e00 @@ -335765,24 +335765,24 @@ sub_80B2688: @ 80B2688 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B26EC + bne @080B26EC movs r0, 0x15 bl audio_play ldr r0, =0x082780b3 bl box_related_two__3 ldr r0, =sub_80B270C + 1 - b _080B26FA + b @080B26FA .align 2, 0 .pool -_080B26EC: +@080B26EC: movs r0, 0x16 bl audio_play ldr r0, =0x08278131 bl box_related_two__3 ldr r0, =sub_80B2918 + 1 -_080B26FA: +@080B26FA: str r0, [r4] -_080B26FC: +@080B26FC: pop {r4,r5} pop {r0} bx r0 @@ -335791,27 +335791,27 @@ _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 adds r0, r4, 0 bl sub_80B252C cmp r0, 0x1 - beq _080B274C + beq @080B274C adds r0, r4, 0 bl sub_80B25CC cmp r0, 0x1 - beq _080B274C + beq @080B274C adds r0, r4, 0 bl sub_80B24F8 cmp r0, 0x1 - beq _080B274C + beq @080B274C bl textbox_any_visible lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - bne _080B274C + bne @080B274C ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -335820,7 +335820,7 @@ sub_80B270C: @ 80B270C strh r2, [r1, 0xE] ldr r0, =sub_80B275C + 1 str r0, [r1] -_080B274C: +@080B274C: pop {r4} pop {r0} bx r0 @@ -335829,7 +335829,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 @@ -335850,15 +335850,15 @@ sub_80B275C: @ 80B275C adds r0, r4, 0 bl sub_80B252C cmp r0, 0x1 - beq _080B27E4 + beq @080B27E4 adds r0, r4, 0 bl sub_80B25CC cmp r0, 0x1 - beq _080B27E4 + beq @080B27E4 adds r0, r4, 0 bl sub_80B24F8 cmp r0, 0x1 - beq _080B27E4 + beq @080B27E4 adds r6, r5, 0 adds r0, r4, 0 adds r1, r6, 0 @@ -335868,11 +335868,11 @@ sub_80B275C: @ 80B275C movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080B27E4 + beq @080B27E4 movs r1, 0x2 ldrsh r0, [r7, r1] cmp r5, r0 - blt _080B27E4 + blt @080B27E4 adds r0, r6, 0 bl sub_800AA04 ldrh r0, [r7, 0xA] @@ -335889,7 +335889,7 @@ sub_80B275C: @ 80B275C add r0, r8 ldr r1, =sub_80B2804 + 1 str r1, [r0] -_080B27E4: +@080B27E4: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -335901,7 +335901,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 @@ -335909,33 +335909,33 @@ sub_80B2804: @ 80B2804 adds r0, r5, 0 bl sub_80B252C cmp r0, 0x1 - beq _080B2898 + beq @080B2898 adds r0, r5, 0 bl sub_80B25CC cmp r0, 0x1 - beq _080B2898 + beq @080B2898 adds r0, r5, 0 bl sub_80B24F8 cmp r0, 0x1 - beq _080B2898 + beq @080B2898 bl textbox_any_visible lsls r0, 24 cmp r0, 0 - bne _080B2898 + bne @080B2898 bl sub_800AA48 adds r4, r0, 0 bl sub_800ABAC lsls r4, 24 lsls r0, 24 cmp r4, r0 - bne _080B2852 + bne @080B2852 ldr r0, =0x030022c0 ldrh r1, [r0, 0x2C] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080B2878 -_080B2852: + beq @080B2878 +@080B2852: ldr r0, =0x082780b3 bl box_related_two__3 ldr r1, =0x03005e00 @@ -335945,14 +335945,14 @@ _080B2852: adds r0, r1 ldr r1, =sub_80B270C + 1 str r1, [r0] - b _080B2898 + b @080B2898 .align 2, 0 .pool -_080B2878: +@080B2878: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080B2898 + beq @080B2898 movs r0, 0x5 bl audio_play bl sub_800A620 @@ -335963,7 +335963,7 @@ _080B2878: adds r1, r0 ldr r0, =sub_80B28A8 + 1 str r0, [r1] -_080B2898: +@080B2898: pop {r4-r6} pop {r0} bx r0 @@ -335972,7 +335972,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 @@ -335986,25 +335986,25 @@ sub_80B28A8: @ 80B28A8 adds r0, r4, 0 bl sub_80B24F8 cmp r0, 0x1 - beq _080B290A + beq @080B290A adds r0, r4, 0 bl sub_80B2D6C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080B290A + beq @080B290A bl sub_800ABAC adds r4, r0, 0 bl sub_800AA48 lsls r4, 24 lsls r0, 24 cmp r4, r0 - beq _080B28F4 + beq @080B28F4 ldr r0, =sub_80B2D2C + 1 - b _080B2908 + b @080B2908 .align 2, 0 .pool -_080B28F4: +@080B28F4: ldr r4, =0x020375f0 adds r0, r7, 0 adds r1, r6, 0 @@ -336012,11 +336012,11 @@ _080B28F4: strh r0, [r4] lsls r0, 16 cmp r0, 0 - beq _080B290A + beq @080B290A ldr r0, =sub_80B2A08 + 1 -_080B2908: +@080B2908: str r0, [r5] -_080B290A: +@080B290A: pop {r4-r7} pop {r0} bx r0 @@ -336025,7 +336025,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} @@ -336041,11 +336041,11 @@ sub_80B2918: @ 80B2918 adds r0, r4, 0 bl sub_80B252C cmp r0, 0x1 - beq _080B29E6 + beq @080B29E6 adds r0, r4, 0 bl sub_80B24F8 cmp r0, 0x1 - beq _080B29E6 + beq @080B29E6 ldr r4, =0x020375f0 adds r0, r6, 0 adds r1, r5, 0 @@ -336055,31 +336055,31 @@ sub_80B2918: @ 80B2918 lsls r0, r1, 16 lsrs r2, r0, 16 cmp r2, 0 - beq _080B29E6 + beq @080B29E6 subs r0, r1, 0x3 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bhi _080B297C + bhi @080B297C bl sub_800AC34 bl textbox_close ldr r0, =sub_80B2CB0 + 1 - b _080B29E4 + b @080B29E4 .align 2, 0 .pool -_080B297C: +@080B297C: cmp r2, 0x7 - beq _080B2984 + beq @080B2984 cmp r2, 0x9 - bne _080B2994 -_080B2984: + bne @080B2994 +@080B2984: bl sub_80097E8 bl textbox_close ldr r0, =sub_80B2CB0 + 1 - b _080B29E4 + b @080B29E4 .align 2, 0 .pool -_080B2994: +@080B2994: bl sub_800ABAC ldr r4, =0x03005db8 strb r0, [r4] @@ -336114,9 +336114,9 @@ _080B2994: adds r4, 0x56 strh r0, [r4] ldr r0, =sub_80B2C30 + 1 -_080B29E4: +@080B29E4: str r0, [r7] -_080B29E6: +@080B29E6: pop {r3} mov r8, r3 pop {r4-r7} @@ -336127,7 +336127,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} @@ -336136,31 +336136,31 @@ sub_80B2A08: @ 80B2A08 adds r0, r7, 0 bl sub_80B24F8 cmp r0, 0x1 - beq _080B2ACE + beq @080B2ACE ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x4 - bne _080B2A38 + bne @080B2A38 bl sub_800A064 cmp r0, 0 - bne _080B2A4A + bne @080B2A4A bl sub_800AC34 - b _080B2A4E + b @080B2A4E .align 2, 0 .pool -_080B2A38: +@080B2A38: cmp r0, 0x3 - bne _080B2A42 + bne @080B2A42 bl sub_800AC34 - b _080B2A4E -_080B2A42: + b @080B2A4E +@080B2A42: cmp r0, 0x7 - beq _080B2A4A + beq @080B2A4A cmp r0, 0x9 - bne _080B2A6C -_080B2A4A: + bne @080B2A6C +@080B2A4A: bl sub_80097E8 -_080B2A4E: +@080B2A4E: bl textbox_close ldr r0, =0x03005e00 lsls r1, r7, 2 @@ -336169,10 +336169,10 @@ _080B2A4E: adds r1, r0 ldr r0, =sub_80B2CB0 + 1 str r0, [r1] - b _080B2ACE + b @080B2ACE .align 2, 0 .pool -_080B2A6C: +@080B2A6C: bl sub_800ABAC ldr r4, =0x03005db8 strb r0, [r4] @@ -336215,7 +336215,7 @@ _080B2A6C: str r1, [r0] movs r0, 0x2 bl sub_800A4D8 -_080B2ACE: +@080B2ACE: pop {r3} mov r8, r3 pop {r4-r7} @@ -336226,7 +336226,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 @@ -336249,7 +336249,7 @@ sub_80B2AF4: @ 80B2AF4 mov r10, r0 ldr r0, =0x083185c8 mov r9, r0 -_080B2B20: +@080B2B20: lsls r0, r1, 1 adds r1, 0x1 mov r8, r1 @@ -336257,22 +336257,22 @@ _080B2B20: adds r4, r0, r1 ldr r5, [sp, 0x4] movs r6, 0x1 -_080B2B2E: +@080B2B2E: ldrh r0, [r4] ldrh r1, [r5] cmp r0, r1 - bne _080B2B5E + bne @080B2B5E cmp r7, 0 - bne _080B2B48 + bne @080B2B48 mov r1, r10 muls r1, r0 add r1, r9 ldr r0, =0x02021cc4 bl gf_strcpy movs r2, 0x1 -_080B2B48: +@080B2B48: cmp r7, 0x1 - bne _080B2B5C + bne @080B2B5C ldrh r0, [r4] mov r1, r10 muls r1, r0 @@ -336280,16 +336280,16 @@ _080B2B48: ldr r0, =0x02021dc4 bl gf_strcpy movs r2, 0x1 -_080B2B5C: +@080B2B5C: adds r7, 0x1 -_080B2B5E: +@080B2B5E: adds r5, 0x2 subs r6, 0x1 cmp r6, 0 - bge _080B2B2E + bge @080B2B2E mov r1, r8 cmp r1, 0x1 - ble _080B2B20 + ble @080B2B20 ldr r0, =0x020375e2 strh r7, [r0] adds r0, r2, 0 @@ -336306,29 +336306,29 @@ _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 ldr r1, =0x02039b58 ldrh r0, [r5] cmp r0, 0x1 - bne _080B2C10 + bne @080B2C10 ldr r0, =0x020229c6 ldrh r2, [r0] ldr r0, =0x00002266 cmp r2, r0 - beq _080B2BB2 + beq @080B2BB2 adds r0, 0x11 cmp r2, r0 - bne _080B2BEC -_080B2BB2: + bne @080B2BEC +@080B2BB2: adds r0, r1, 0 adds r0, 0x54 adds r1, 0xB8 bl sub_80B2AF4 cmp r0, 0 - beq _080B2BEC + beq @080B2BEC movs r0, 0xB strh r0, [r5] bl sub_800AC34 @@ -336339,10 +336339,10 @@ _080B2BB2: adds r0, r1 ldr r1, =sub_80B2CB0 + 1 str r1, [r0] - b _080B2C22 + b @080B2C22 .align 2, 0 .pool -_080B2BEC: +@080B2BEC: ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -336354,10 +336354,10 @@ _080B2BEC: lsls r0, r4, 24 lsrs r0, 24 bl remove_task - b _080B2C22 + b @080B2C22 .align 2, 0 .pool -_080B2C10: +@080B2C10: bl sub_800AC34 ldr r0, =0x03005e00 lsls r1, r4, 2 @@ -336366,7 +336366,7 @@ _080B2C10: adds r1, r0 ldr r0, =sub_80B2CB0 + 1 str r0, [r1] -_080B2C22: +@080B2C22: pop {r4,r5} pop {r0} bx r0 @@ -336375,27 +336375,27 @@ _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 adds r0, r5, 0 bl sub_80B24F8 cmp r0, 0x1 - beq _080B2C9C + beq @080B2C9C bl sub_800A550 adds r4, r0, 0 bl sub_800A9A8 lsls r4, 24 lsls r0, 24 cmp r4, r0 - bne _080B2C9C + bne @080B2C9C movs r4, 0 ldr r6, =0x020229e8 - b _080B2C7E + b @080B2C7E .align 2, 0 .pool -_080B2C5C: +@080B2C5C: movs r0, 0x64 muls r0, r4 ldr r1, =0x02039b58 @@ -336412,19 +336412,19 @@ _080B2C5C: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_080B2C7E: +@080B2C7E: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bcc _080B2C5C + bcc @080B2C5C movs r0, 0 bl sub_800B330 bl sub_800A5B4 ldr r0, =0x020375f0 adds r1, r5, 0 bl task_map_chg_seq_0807EC34 -_080B2C9C: +@080B2C9C: pop {r4-r6} pop {r0} bx r0 @@ -336433,14 +336433,14 @@ _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 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _080B2CDE + bne @080B2CDE ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 @@ -336453,7 +336453,7 @@ sub_80B2CB0: @ 80B2CB0 bl Window_Remove adds r0, r5, 0 bl remove_task -_080B2CDE: +@080B2CDE: pop {r4,r5} pop {r0} bx r0 @@ -336462,7 +336462,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 @@ -336491,7 +336491,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 @@ -336520,7 +336520,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 @@ -336536,16 +336536,16 @@ sub_80B2D6C: @ 80B2D6C movs r1, 0x96 lsls r1, 18 cmp r0, r1 - bgt _080B2D94 + bgt @080B2D94 movs r0, 0 - b _080B2D9A + b @080B2D9A .align 2, 0 .pool -_080B2D94: +@080B2D94: ldr r0, =sub_80B2D2C + 1 str r0, [r2] movs r0, 0x1 -_080B2D9A: +@080B2D9A: pop {r1} bx r1 .align 2, 0 @@ -336553,50 +336553,50 @@ _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 ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0x2 - beq _080B2DDC + beq @080B2DDC cmp r0, 0x2 - bgt _080B2DC0 + bgt @080B2DC0 cmp r0, 0x1 - beq _080B2DCA - b _080B2E34 + beq @080B2DCA + b @080B2E34 .align 2, 0 .pool -_080B2DC0: +@080B2DC0: cmp r0, 0x5 - beq _080B2DEC + beq @080B2DEC cmp r0, 0x9 - beq _080B2E00 - b _080B2E34 -_080B2DCA: + beq @080B2E00 + b @080B2E34 +@080B2DCA: movs r3, 0x2 ldr r1, =0x020229c6 ldr r4, =0x00002233 - b _080B2E30 + b @080B2E30 .align 2, 0 .pool -_080B2DDC: +@080B2DDC: movs r3, 0x2 ldr r1, =0x020229c6 ldr r4, =0x00002244 - b _080B2E30 + b @080B2E30 .align 2, 0 .pool -_080B2DEC: +@080B2DEC: movs r3, 0x4 movs r2, 0x4 ldr r1, =0x020229c6 ldr r4, =0x00002255 - b _080B2E30 + b @080B2E30 .align 2, 0 .pool -_080B2E00: +@080B2E00: movs r3, 0x2 ldr r0, =0x03005d90 ldr r0, [r0] @@ -336606,19 +336606,19 @@ _080B2E00: movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne _080B2E2C + bne @080B2E2C ldr r1, =0x020229c6 ldr r4, =0x00002266 - b _080B2E30 + b @080B2E30 .align 2, 0 .pool -_080B2E2C: +@080B2E2C: ldr r1, =0x020229c6 ldr r4, =0x00002277 -_080B2E30: +@080B2E30: adds r0, r4, 0 strh r0, [r1] -_080B2E34: +@080B2E34: adds r0, r3, 0 adds r1, r2, 0 bl sub_80B236C @@ -336630,7 +336630,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 @@ -336649,7 +336649,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 @@ -336671,7 +336671,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 + 1 adds r0, r4, 0 @@ -336679,7 +336679,7 @@ sub_80B2EA8: @ 80B2EA8 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - bne _080B2ED4 + bne @080B2ED4 adds r0, r4, 0 movs r1, 0x50 bl AddTask @@ -336692,7 +336692,7 @@ sub_80B2EA8: @ 80B2EA8 adds r0, r1 movs r1, 0 strh r1, [r0, 0x8] -_080B2ED4: +@080B2ED4: pop {r4} pop {r0} bx r0 @@ -336701,7 +336701,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 @@ -336716,17 +336716,17 @@ sub_80B2EE4: @ 80B2EE4 movs r1, 0x8 ldrsh r0, [r0, r1] cmp r0, 0 - beq _080B2F0C + beq @080B2F0C cmp r0, 0x1 - beq _080B2FB4 - b _080B2FC6 + beq @080B2FB4 + b @080B2FC6 .align 2, 0 .pool -_080B2F0C: +@080B2F0C: ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x1 - bne _080B2FA8 + bne @080B2FA8 movs r7, 0 movs r0, 0 mov r8, r0 @@ -336736,32 +336736,32 @@ _080B2F0C: lsrs r5, r0, 24 movs r4, 0 cmp r7, r5 - bge _080B2F74 + bge @080B2F74 ldr r0, =0x020229e8 ldrb r2, [r0] ldrh r3, [r0, 0x1A] subs r1, r2, 0x1 mov r12, r0 cmp r1, 0x1 - bhi _080B2F4A - b _080B2F6E + bhi @080B2F4A + b @080B2F6E .align 2, 0 .pool -_080B2F44: +@080B2F44: movs r1, 0x1 mov r8, r1 - b _080B2F56 -_080B2F4A: + b @080B2F56 +@080B2F4A: cmp r2, 0x3 - bne _080B2F56 + bne @080B2F56 cmp r3, 0x1 - bne _080B2F56 + bne @080B2F56 movs r0, 0x1 mov r9, r0 -_080B2F56: +@080B2F56: adds r4, 0x1 cmp r4, r5 - bge _080B2F74 + bge @080B2F74 lsls r0, r4, 3 subs r0, r4 lsls r0, 2 @@ -336770,22 +336770,22 @@ _080B2F56: ldrh r3, [r0, 0x1A] subs r0, r2, 0x1 cmp r0, 0x1 - bhi _080B2F4A -_080B2F6E: + bhi @080B2F4A +@080B2F6E: cmp r3, 0x1 - bne _080B2F44 + bne @080B2F44 movs r7, 0x1 -_080B2F74: +@080B2F74: mov r1, r8 cmp r1, 0 - beq _080B2F82 + beq @080B2F82 mov r0, r9 cmp r0, 0 - beq _080B2F82 + beq @080B2F82 movs r7, 0x1 -_080B2F82: +@080B2F82: cmp r7, 0 - beq _080B2FA8 + beq @080B2FA8 ldr r1, =0x020375f0 movs r0, 0xC strh r0, [r1] @@ -336797,23 +336797,23 @@ _080B2F82: adds r0, r1 movs r1, 0x1 strh r1, [r0, 0x8] - b _080B2FC6 + b @080B2FC6 .align 2, 0 .pool -_080B2FA8: +@080B2FA8: bl script_env_2_enable_and_set_ctx_running adds r0, r6, 0 bl remove_task - b _080B2FC6 -_080B2FB4: + b @080B2FC6 +@080B2FB4: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _080B2FC6 + bne @080B2FC6 bl script_env_2_enable_and_set_ctx_running adds r0, r6, 0 bl remove_task -_080B2FC6: +@080B2FC6: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -336825,7 +336825,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 @@ -336844,7 +336844,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 @@ -336863,7 +336863,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 @@ -336882,60 +336882,60 @@ 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 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - beq _080B3068 + beq @080B3068 movs r0, 0xFF - b _080B3134 + b @080B3134 .align 2, 0 .pool -_080B3068: +@080B3068: ldr r0, =0x020375e0 ldrh r0, [r0] subs r0, 0x1 cmp r0, 0x8 - bhi _080B3128 + bhi @080B3128 lsls r0, 2 - ldr r1, =_080B3084 + ldr r1, =@080B3084 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080B3084: - .4byte _080B30A8 - .4byte _080B30B8 - .4byte _080B3110 - .4byte _080B3120 - .4byte _080B30C8 - .4byte _080B3128 - .4byte _080B3128 - .4byte _080B3128 - .4byte _080B30D8 -_080B30A8: +@080B3084: + .4byte @080B30A8 + .4byte @080B30B8 + .4byte @080B3110 + .4byte @080B3120 + .4byte @080B30C8 + .4byte @080B3128 + .4byte @080B3128 + .4byte @080B3128 + .4byte @080B30D8 +@080B30A8: ldr r1, =0x020229c6 ldr r2, =0x00002233 - b _080B3124 + b @080B3124 .align 2, 0 .pool -_080B30B8: +@080B30B8: ldr r1, =0x020229c6 ldr r2, =0x00002244 - b _080B3124 + b @080B3124 .align 2, 0 .pool -_080B30C8: +@080B30C8: ldr r1, =0x020229c6 ldr r2, =0x00002255 - b _080B3124 + b @080B3124 .align 2, 0 .pool -_080B30D8: +@080B30D8: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000ca9 @@ -336944,37 +336944,37 @@ _080B30D8: movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne _080B3100 + bne @080B3100 ldr r1, =0x020229c6 ldr r2, =0x00002266 - b _080B3124 + b @080B3124 .align 2, 0 .pool -_080B3100: +@080B3100: ldr r1, =0x020229c6 ldr r2, =0x00002277 - b _080B3124 + b @080B3124 .align 2, 0 .pool -_080B3110: +@080B3110: ldr r1, =0x020229c6 ldr r2, =0x00001111 - b _080B3124 + b @080B3124 .align 2, 0 .pool -_080B3120: +@080B3120: ldr r1, =0x020229c6 ldr r2, =0x00003322 -_080B3124: +@080B3124: adds r0, r2, 0 strh r0, [r1] -_080B3128: +@080B3128: ldr r0, =sub_80B3144 + 1 movs r1, 0x50 bl AddTask lsls r0, 24 lsrs r0, 24 -_080B3134: +@080B3134: pop {r1} bx r1 .align 2, 0 @@ -336982,7 +336982,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 @@ -336994,23 +336994,23 @@ sub_80B3144: @ 80B3144 movs r3, 0 ldrsh r2, [r4, r3] cmp r2, 0 - bne _080B3178 + bne @080B3178 bl sub_8009734 bl sub_800A2BC ldr r0, =task00_08081A90 + 1 movs r1, 0x50 bl AddTask - b _080B3184 + b @080B3184 .align 2, 0 .pool -_080B3178: +@080B3178: cmp r2, 0x9 - ble _080B3184 + ble @080B3184 subs r0, 0x8 adds r0, r1, r0 ldr r1, =sub_80B3194 + 1 str r1, [r0] -_080B3184: +@080B3184: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] @@ -337022,7 +337022,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 @@ -337031,31 +337031,31 @@ sub_80B3194: @ 80B3194 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bls _080B31DA + bls @080B31DA bl sub_800ABBC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B31CC + bne @080B31CC ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 ldr r0, =sub_80B31E8 + 1 - b _080B31D8 + b @080B31D8 .align 2, 0 .pool -_080B31CC: +@080B31CC: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 ldr r0, =sub_80B3220 + 1 -_080B31D8: +@080B31D8: str r0, [r1] -_080B31DA: +@080B31DA: pop {r4,r5} pop {r0} bx r0 @@ -337064,7 +337064,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 @@ -337074,7 +337074,7 @@ sub_80B31E8: @ 80B31E8 lsls r4, 24 lsls r0, 24 cmp r4, r0 - bne _080B3212 + bne @080B3212 bl sub_800A620 ldr r0, =0x03005e00 lsls r1, r5, 2 @@ -337083,7 +337083,7 @@ sub_80B31E8: @ 80B31E8 adds r1, r0 ldr r0, =sub_80B3220 + 1 str r0, [r1] -_080B3212: +@080B3212: pop {r4,r5} pop {r0} bx r0 @@ -337092,24 +337092,24 @@ _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 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 - bne _080B3248 + bne @080B3248 bl sub_800A23C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B3248 + bne @080B3248 bl sub_800AB18 bl sub_8009F18 adds r0, r4, 0 bl remove_task -_080B3248: +@080B3248: pop {r4} pop {r0} bx r0 @@ -337118,7 +337118,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} @@ -337126,46 +337126,46 @@ 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 + beq @080B3284 cmp r0, 0x2 - bgt _080B3270 + bgt @080B3270 cmp r0, 0x1 - beq _080B327A - b _080B32A6 -_080B3270: + beq @080B327A + b @080B32A6 +@080B3270: cmp r0, 0x5 - beq _080B3290 + beq @080B3290 cmp r0, 0x9 - beq _080B32A0 - b _080B32A6 -_080B327A: + beq @080B32A0 + b @080B32A6 +@080B327A: ldr r1, =0x02022fec movs r0, 0xA - b _080B32A4 + b @080B32A4 .align 2, 0 .pool -_080B3284: +@080B3284: ldr r1, =0x02022fec movs r0, 0xB - b _080B32A4 + b @080B32A4 .align 2, 0 .pool -_080B3290: +@080B3290: bl sub_80F94E8 ldr r1, =0x02022fec movs r0, 0x4B - b _080B32A4 + b @080B32A4 .align 2, 0 .pool -_080B32A0: +@080B32A0: ldr r1, =0x02022fec ldr r0, =0x0000014b -_080B32A4: +@080B32A4: str r0, [r1] -_080B32A6: +@080B32A6: pop {r0} bx r0 .align 2, 0 @@ -337173,7 +337173,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 @@ -337185,23 +337185,23 @@ sub_80B32B4: @ 80B32B4 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x5 - bhi _080B33A0 + bhi @080B33A0 lsls r0, 2 - ldr r1, =_080B32E0 + ldr r1, =@080B32E0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080B32E0: - .4byte _080B32F8 - .4byte _080B3318 - .4byte _080B3328 - .4byte _080B3338 - .4byte _080B333E - .4byte _080B3354 -_080B32F8: +@080B32E0: + .4byte @080B32F8 + .4byte @080B3318 + .4byte @080B3328 + .4byte @080B3338 + .4byte @080B333E + .4byte @080B3354 +@080B32F8: movs r0, 0x1 movs r1, 0 bl fade_screen @@ -337210,59 +337210,59 @@ _080B32F8: adds r0, r2, 0 strh r0, [r1] bl sub_8009FAC - b _080B3346 + b @080B3346 .align 2, 0 .pool -_080B3318: +@080B3318: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 - b _080B3342 + b @080B3342 .align 2, 0 .pool -_080B3328: +@080B3328: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - ble _080B33A0 - b _080B3346 -_080B3338: + ble @080B33A0 + b @080B3346 +@080B3338: bl sub_800AC34 - b _080B3346 -_080B333E: + b @080B3346 +@080B333E: ldr r0, =0x03003124 ldrb r0, [r0] -_080B3342: +@080B3342: cmp r0, 0 - bne _080B33A0 -_080B3346: + bne @080B33A0 +@080B3346: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080B33A0 + b @080B33A0 .align 2, 0 .pool -_080B3354: +@080B3354: ldr r0, =0x020229e8 ldr r0, [r0, 0x4] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _080B3370 + beq @080B3370 ldr r0, =0x000001dd bl current_map_music_set__default_for_battle - b _080B3378 + b @080B3378 .align 2, 0 .pool -_080B3370: +@080B3370: movs r0, 0xEE lsls r0, 1 bl current_map_music_set__default_for_battle -_080B3378: +@080B3378: ldr r0, =0x020375e0 ldrh r0, [r0] bl sub_80B3260 @@ -337279,7 +337279,7 @@ _080B3378: str r0, [r1, 0x8] adds r0, r5, 0 bl remove_task -_080B33A0: +@080B33A0: pop {r4,r5} pop {r0} bx r0 @@ -337288,7 +337288,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 @@ -337300,27 +337300,27 @@ sub_80B33BC: @ 80B33BC movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0x7 - bls _080B33D6 - b _080B3532 -_080B33D6: + bls @080B33D6 + b @080B3532 +@080B33D6: lsls r0, 2 - ldr r1, =_080B33E8 + ldr r1, =@080B33E8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080B33E8: - .4byte _080B3408 - .4byte _080B342C - .4byte _080B3444 - .4byte _080B3458 - .4byte _080B34B0 - .4byte _080B34C4 - .4byte _080B34CE - .4byte _080B34DE -_080B3408: +@080B33E8: + .4byte @080B3408 + .4byte @080B342C + .4byte @080B3444 + .4byte @080B3458 + .4byte @080B34B0 + .4byte @080B34C4 + .4byte @080B34CE + .4byte @080B34DE +@080B3408: movs r0, 0x1 movs r1, 0 bl fade_screen @@ -337331,47 +337331,47 @@ _080B3408: bl sub_8009FAC movs r0, 0x1 strh r0, [r6] - b _080B3532 + b @080B3532 .align 2, 0 .pool -_080B342C: +@080B342C: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080B343A - b _080B3532 -_080B343A: + beq @080B343A + b @080B3532 +@080B343A: movs r0, 0x2 strh r0, [r6] - b _080B3532 + b @080B3532 .align 2, 0 .pool -_080B3444: +@080B3444: ldr r1, =0x020229cc movs r0, 0 movs r2, 0x1C bl link_0800A448 movs r0, 0x3 strh r0, [r6] - b _080B3532 + b @080B3532 .align 2, 0 .pool -_080B3458: +@080B3458: bl sub_800A550 adds r4, r0, 0 bl sub_800A9D8 lsls r4, 24 lsls r0, 24 cmp r4, r0 - bne _080B3532 + bne @080B3532 movs r4, 0 ldr r5, =0x020229e8 - b _080B349A + b @080B349A .align 2, 0 .pool -_080B3474: +@080B3474: lsls r1, r4, 8 ldr r2, =0x020223c4 adds r0, r5, 0 @@ -337389,58 +337389,58 @@ _080B3474: bl sub_800A5EC adds r5, 0x1C adds r4, 0x1 -_080B349A: +@080B349A: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r4, r0 - blt _080B3474 + blt @080B3474 movs r0, 0x4 strh r0, [r6] - b _080B3532 + b @080B3532 .align 2, 0 .pool -_080B34B0: +@080B34B0: ldrh r0, [r6, 0x2] adds r0, 0x1 strh r0, [r6, 0x2] lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - ble _080B3532 + ble @080B3532 movs r0, 0x5 strh r0, [r6] - b _080B3532 -_080B34C4: + b @080B3532 +@080B34C4: bl sub_800ADF8 movs r0, 0x6 strh r0, [r6] - b _080B3532 -_080B34CE: + b @080B3532 +@080B34CE: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080B3532 + beq @080B3532 movs r0, 0x7 strh r0, [r6] - b _080B3532 -_080B34DE: + b @080B3532 +@080B34DE: ldr r0, =0x020229e8 ldr r0, [r0, 0x4] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _080B34FC + beq @080B34FC ldr r0, =0x000001dd bl current_map_music_set__default_for_battle - b _080B3504 + b @080B3504 .align 2, 0 .pool -_080B34FC: +@080B34FC: movs r0, 0xEE lsls r0, 1 bl current_map_music_set__default_for_battle -_080B3504: +@080B3504: ldr r1, =0x020229e8 ldr r0, =0x00002211 str r0, [r1, 0x14] @@ -337460,7 +337460,7 @@ _080B3504: str r0, [r1, 0x8] adds r0, r4, 0 bl remove_task -_080B3532: +@080B3532: pop {r4-r7} pop {r0} bx r0 @@ -337469,7 +337469,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 @@ -337477,35 +337477,35 @@ sub_80B3554: @ 80B3554 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - beq _080B35E0 + beq @080B35E0 cmp r0, 0x1 - bgt _080B3574 + bgt @080B3574 cmp r0, 0 - beq _080B357A - b _080B35FE + beq @080B357A + b @080B35FE .align 2, 0 .pool -_080B3574: +@080B3574: cmp r0, 0x2 - beq _080B35F8 - b _080B35FE -_080B357A: + beq @080B35F8 + b @080B35FE +@080B357A: bl sub_8009FCC lsls r0, 24 lsrs r3, r0, 24 movs r4, 0 movs r2, 0 cmp r4, r3 - bge _080B35AC + bge @080B35AC ldr r1, =0x020229e8 ldrb r0, [r1] subs r0, 0x4 cmp r0, 0x1 - bls _080B35B0 -_080B3594: + bls @080B35B0 +@080B3594: adds r2, 0x1 cmp r2, r3 - bge _080B35AC + bge @080B35AC lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -337513,22 +337513,22 @@ _080B3594: ldrb r0, [r0] subs r0, 0x4 cmp r0, 0x1 - bhi _080B3594 + bhi @080B3594 movs r4, 0x1 -_080B35AC: +@080B35AC: cmp r4, 0 - beq _080B35C8 -_080B35B0: + beq @080B35C8 +@080B35B0: ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 movs r1, 0x2 strb r1, [r0] - b _080B35FE + b @080B35FE .align 2, 0 .pool -_080B35C8: +@080B35C8: bl sub_800AC34 ldr r0, =0x030022c0 movs r1, 0x87 @@ -337536,23 +337536,23 @@ _080B35C8: adds r0, r1 movs r1, 0x1 strb r1, [r0] - b _080B35FE + b @080B35FE .align 2, 0 .pool -_080B35E0: +@080B35E0: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _080B35FE + bne @080B35FE ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 - b _080B35FE + b @080B35FE .align 2, 0 .pool -_080B35F8: +@080B35F8: ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 -_080B35FE: +@080B35FE: bl run_active_tasks pop {r4} pop {r0} @@ -337562,7 +337562,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] @@ -337580,7 +337580,7 @@ sub_80B360C: @ 80B360C lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bhi _080B36B2 + bhi @080B36B2 ldr r0, =0x03005db4 ldrb r0, [r0] movs r5, 0x1 @@ -337589,17 +337589,17 @@ sub_80B360C: @ 80B360C ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _080B36B2 + beq @080B36B2 ldr r0, =0x0202433a ldrb r0, [r0] cmp r0, 0x1 - beq _080B3670 + beq @080B3670 cmp r0, 0x2 - beq _080B3694 - b _080B36B2 + beq @080B3694 + b @080B36B2 .align 2, 0 .pool -_080B3670: +@080B3670: ldr r4, =0x020229e8 bl link_get_multiplayer_id eors r0, r5 @@ -337613,10 +337613,10 @@ _080B3670: ldr r1, [r1] movs r0, 0 bl sub_801B990 - b _080B36B2 + b @080B36B2 .align 2, 0 .pool -_080B3694: +@080B3694: ldr r4, =0x020229e8 bl link_get_multiplayer_id eors r0, r5 @@ -337630,19 +337630,19 @@ _080B3694: ldr r1, [r1] movs r0, 0x1 bl sub_801B990 -_080B36B2: +@080B36B2: bl in_trade_center cmp r0, 0x1 - bne _080B36CC + bne @080B36CC ldr r1, =0x030022c0 ldr r0, =sub_80B3554 + 1 - b _080B36D0 + b @080B36D0 .align 2, 0 .pool -_080B36CC: +@080B36CC: ldr r1, =0x030022c0 ldr r0, =c2_8056854 + 1 -_080B36D0: +@080B36D0: str r0, [r1, 0x8] ldr r0, =sub_80A0514 + 1 bl set_callback2 @@ -337654,7 +337654,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] @@ -337662,16 +337662,16 @@ sub_80B36EC: @ 80B36EC lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bls _080B3706 + bls @080B3706 adds r0, r1, 0 cmp r0, 0x5 - beq _080B3706 + beq @080B3706 cmp r0, 0x9 - bne _080B370E -_080B3706: + bne @080B370E +@080B3706: bl copy_player_party_from_sav1 bl sub_8076FE0 -_080B370E: +@080B370E: movs r0, 0x7F bl copy_saved_warp2_bank_and_enter_x_to_warp1 pop {r0} @@ -337681,7 +337681,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} @@ -337689,7 +337689,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 @@ -337701,78 +337701,78 @@ sub_80B3728: @ 80B3728 movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _080B376C + beq @080B376C cmp r0, 0x1 - bgt _080B3750 + bgt @080B3750 cmp r0, 0 - beq _080B375A - b _080B37CC + beq @080B375A + b @080B37CC .align 2, 0 .pool -_080B3750: +@080B3750: cmp r0, 0x2 - beq _080B378C + beq @080B378C cmp r0, 0x3 - beq _080B37B8 - b _080B37CC -_080B375A: + beq @080B37B8 + b @080B37CC +@080B375A: ldr r0, =0x08278091 bl box_related_two__2 movs r0, 0x1 strh r0, [r5, 0x8] - b _080B37CC + b @080B37CC .align 2, 0 .pool -_080B376C: +@080B376C: bl sub_809833C lsls r0, 24 cmp r0, 0 - beq _080B37CC + beq @080B37CC bl sub_8087288 ldr r0, =0x020375e2 ldrb r0, [r0] bl sub_8009628 movs r0, 0x2 strh r0, [r5, 0x8] - b _080B37CC + b @080B37CC .align 2, 0 .pool -_080B378C: +@080B378C: bl sub_8087214 cmp r0, 0x1 - beq _080B379E + beq @080B379E cmp r0, 0x1 - bcc _080B37CC + bcc @080B37CC cmp r0, 0x2 - beq _080B37B2 - b _080B37CC -_080B379E: + beq @080B37B2 + b @080B37CC +@080B379E: bl textbox_close movs r0, 0 strh r0, [r5, 0x8] bl sub_80872C4 adds r0, r4, 0 bl set_task_function_to_args_14_15 - b _080B37CC -_080B37B2: + b @080B37CC +@080B37B2: movs r0, 0x3 strh r0, [r5, 0x8] - b _080B37CC -_080B37B8: + b @080B37CC +@080B37B8: bl sub_808729C movs r0, 0x1 bl sub_8197AE8 adds r0, r4, 0 bl remove_task bl script_env_2_enable_and_set_ctx_running -_080B37CC: +@080B37CC: pop {r4,r5} pop {r0} bx r0 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 + 1 @@ -337793,7 +337793,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 @@ -337805,61 +337805,61 @@ sub_80B37FC: @ 80B37FC movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080B3840 + beq @080B3840 cmp r0, 0x1 - bgt _080B3824 + bgt @080B3824 cmp r0, 0 - beq _080B382E - b _080B3884 + beq @080B382E + b @080B3884 .align 2, 0 .pool -_080B3824: +@080B3824: cmp r0, 0x2 - beq _080B3854 + beq @080B3854 cmp r0, 0x3 - beq _080B3870 - b _080B3884 -_080B382E: + beq @080B3870 + b @080B3884 +@080B382E: bl script_env_2_enable movs r0, 0x1 movs r1, 0 bl fade_screen bl sub_8009FAC - b _080B3864 -_080B3840: + b @080B3864 +@080B3840: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080B3884 - b _080B3864 + bne @080B3884 + b @080B3864 .align 2, 0 .pool -_080B3854: +@080B3854: ldr r1, =0x02032298 movs r0, 0 strb r0, [r1] strb r0, [r1, 0x1] bl m4aMPlayAllStop bl sub_800AC34 -_080B3864: +@080B3864: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080B3884 + b @080B3884 .align 2, 0 .pool -_080B3870: +@080B3870: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _080B3884 + bne @080B3884 ldr r0, =sub_80773AC + 1 bl set_callback2 adds r0, r5, 0 bl remove_task -_080B3884: +@080B3884: pop {r4,r5} pop {r0} bx r0 @@ -337868,7 +337868,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 @@ -337880,81 +337880,81 @@ sub_80B3894: @ 80B3894 movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080B38D8 + beq @080B38D8 cmp r0, 0x1 - bgt _080B38BC + bgt @080B38BC cmp r0, 0 - beq _080B38C6 - b _080B391C + beq @080B38C6 + b @080B391C .align 2, 0 .pool -_080B38BC: +@080B38BC: cmp r0, 0x2 - beq _080B38EC + beq @080B38EC cmp r0, 0x3 - beq _080B3908 - b _080B391C -_080B38C6: + beq @080B3908 + b @080B391C +@080B38C6: bl script_env_2_enable movs r0, 0x1 movs r1, 0 bl fade_screen bl Rfu_set_zero - b _080B38FC -_080B38D8: + b @080B38FC +@080B38D8: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080B391C - b _080B38FC + bne @080B391C + b @080B38FC .align 2, 0 .pool -_080B38EC: +@080B38EC: ldr r1, =0x02032298 movs r0, 0 strb r0, [r1] strb r0, [r1, 0x1] bl m4aMPlayAllStop bl sub_800ADF8 -_080B38FC: +@080B38FC: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - b _080B391C + b @080B391C .align 2, 0 .pool -_080B3908: +@080B3908: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080B391C + beq @080B391C bl sub_8013F78 adds r0, r5, 0 bl remove_task -_080B391C: +@080B391C: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_80B3894 thumb_func_start sub_80B3924 -sub_80B3924: @ 80B3924 +sub_80B3924: ; 80B3924 push {lr} ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _080B3940 + beq @080B3940 ldr r0, =sub_80B3894 + 1 bl sub_80B37D4 - b _080B3946 + b @080B3946 .align 2, 0 .pool -_080B3940: +@080B3940: ldr r0, =sub_80B37FC + 1 bl sub_80B37D4 -_080B3946: +@080B3946: pop {r0} bx r0 .align 2, 0 @@ -337962,7 +337962,7 @@ _080B3946: thumb_func_end sub_80B3924 thumb_func_start sub_80B3950 -sub_80B3950: @ 80B3950 +sub_80B3950: ; 80B3950 push {lr} ldr r0, =sub_80B37FC + 1 movs r1, 0x50 @@ -337974,12 +337974,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 @@ -337988,16 +337988,16 @@ sub_80B3968: @ 80B3968 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _080B3994 + beq @080B3994 ldr r0, =sub_80B33BC + 1 bl sub_80B37D4 - b _080B399A + b @080B399A .align 2, 0 .pool -_080B3994: +@080B3994: ldr r0, =sub_80B32B4 + 1 bl sub_80B37D4 -_080B399A: +@080B399A: pop {r0} bx r0 .align 2, 0 @@ -338005,7 +338005,7 @@ _080B399A: thumb_func_end sub_80B3968 thumb_func_start sub_80B39A4 -sub_80B39A4: @ 80B39A4 +sub_80B39A4: ; 80B39A4 push {lr} ldr r0, =sub_80B3728 + 1 movs r1, 0x50 @@ -338018,7 +338018,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] @@ -338031,7 +338031,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 @@ -338050,7 +338050,7 @@ sub_80B39D4: @ 80B39D4 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq _080B3A28 + beq @080B3A28 ldr r0, =0x02021dc4 ldr r2, =0x0855059c subs r1, 0x1 @@ -338059,19 +338059,19 @@ sub_80B39D4: @ 80B39D4 ldr r1, [r1] bl gf_strcpy movs r0, 0x1 - b _080B3A2A + b @080B3A2A .align 2, 0 .pool -_080B3A28: +@080B3A28: movs r0, 0 -_080B3A2A: +@080B3A2A: pop {r4} pop {r1} bx r1 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 @@ -338088,56 +338088,56 @@ task00_08081A90: @ 80B3A30 movs r0, 0x96 lsls r0, 17 cmp r1, r0 - ble _080B3A62 + ble @080B3A62 bl sub_80097E8 ldr r0, =c2_800ACD4 + 1 bl set_callback2 adds r0, r4, 0 bl remove_task -_080B3A62: +@080B3A62: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _080B3AA6 + beq @080B3AA6 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - bne _080B3AA0 + bne @080B3AA0 bl sub_800AA60 lsls r0, 24 cmp r0, 0 - bne _080B3A86 + bne @080B3A86 bl sub_80097E8 ldr r0, =c2_800ACD4 + 1 bl set_callback2 -_080B3A86: +@080B3A86: adds r0, r4, 0 bl remove_task - b _080B3AA6 + b @080B3AA6 .align 2, 0 .pool -_080B3AA0: +@080B3AA0: adds r0, r5, 0 bl remove_task -_080B3AA6: +@080B3AA6: pop {r4,r5} pop {r0} bx r0 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 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _080B3AC4 + bne @080B3AC4 bl script_env_2_enable_and_set_ctx_running adds r0, r4, 0 bl remove_task -_080B3AC4: +@080B3AC4: pop {r4} pop {r0} bx r0 @@ -338146,7 +338146,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 @@ -338167,7 +338167,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 @@ -338179,87 +338179,87 @@ sub_80B3AF8: @ 80B3AF8 movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _080B3B54 + beq @080B3B54 cmp r0, 0x1 - bgt _080B3B20 + bgt @080B3B20 cmp r0, 0 - beq _080B3B2A - b _080B3BB8 + beq @080B3B2A + b @080B3BB8 .align 2, 0 .pool -_080B3B20: +@080B3B20: cmp r0, 0x2 - beq _080B3B68 + beq @080B3B68 cmp r0, 0x3 - beq _080B3B9E - b _080B3BB8 -_080B3B2A: + beq @080B3B9E + b @080B3BB8 +@080B3B2A: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _080B3B40 + beq @080B3B40 adds r0, r4, 0 bl remove_task - b _080B3BB8 + b @080B3BB8 .align 2, 0 .pool -_080B3B40: +@080B3B40: bl sub_8009734 ldr r0, =task00_08081A90 + 1 movs r1, 0x1 bl AddTask - b _080B3B96 + b @080B3B96 .align 2, 0 .pool -_080B3B54: +@080B3B54: ldrh r0, [r5, 0x2] adds r0, 0x1 strh r0, [r5, 0x2] lsls r0, 16 asrs r0, 16 cmp r0, 0xB - ble _080B3BB8 + ble @080B3BB8 movs r0, 0 strh r0, [r5, 0x2] - b _080B3B96 -_080B3B68: + b @080B3B96 +@080B3B68: bl sub_800ABAC adds r4, r0, 0 bl sub_800AA48 lsls r4, 24 lsls r0, 24 cmp r4, r0 - bcc _080B3BB8 + bcc @080B3BB8 bl sub_800ABBC lsls r0, 24 cmp r0, 0 - beq _080B3B96 + beq @080B3B96 ldrh r0, [r5, 0x2] adds r0, 0x1 strh r0, [r5, 0x2] lsls r0, 16 asrs r0, 16 cmp r0, 0x1E - ble _080B3BB8 + ble @080B3BB8 bl sub_800A620 -_080B3B96: +@080B3B96: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] - b _080B3BB8 -_080B3B9E: + b @080B3BB8 +@080B3B9E: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 - bne _080B3BB8 + bne @080B3BB8 bl sub_800A23C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B3BB8 + bne @080B3BB8 adds r0, r4, 0 bl remove_task -_080B3BB8: +@080B3BB8: pop {r4,r5} pop {r0} bx r0 @@ -338268,17 +338268,17 @@ _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] cmp r0, 0 - bne _080B3BD6 + bne @080B3BD6 ldr r1, =0x020229c6 ldr r2, =0x00002288 adds r0, r2, 0 strh r0, [r1] -_080B3BD6: +@080B3BD6: pop {r0} bx r0 .align 2, 0 @@ -338286,7 +338286,7 @@ _080B3BD6: thumb_func_end sub_80B3BC4 thumb_func_start sub_80B3BE8 -sub_80B3BE8: @ 80B3BE8 +sub_80B3BE8: ; 80B3BE8 push {r4-r7,lr} ldr r0, =0x030060a8 movs r1, 0 @@ -338295,7 +338295,7 @@ sub_80B3BE8: @ 80B3BE8 strb r1, [r0] movs r4, 0 ldr r6, =0x02037350 -_080B3BF8: +@080B3BF8: lsls r0, r4, 3 adds r0, r4 lsls r0, 2 @@ -338303,42 +338303,42 @@ _080B3BF8: ldrb r0, [r1] lsls r0, 31 cmp r0, 0 - beq _080B3C38 + beq @080B3C38 ldrb r0, [r1, 0x7] cmp r0, 0x1 - beq _080B3C12 + beq @080B3C12 cmp r0, 0x3 - bne _080B3C38 -_080B3C12: + bne @080B3C38 +@080B3C12: adds r0, r4, 0 bl sub_80B3D00 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - beq _080B3C42 + beq @080B3C42 cmp r0, 0 - beq _080B3C38 + beq @080B3C38 ldr r0, =0x030060a8 ldrb r1, [r0] adds r5, r0, 0 cmp r1, 0x1 - bhi _080B3C88 + bhi @080B3C88 bl sub_806B638 lsls r0, 24 cmp r0, 0 - bne _080B3C42 -_080B3C38: + bne @080B3C42 +@080B3C38: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bls _080B3BF8 -_080B3C42: + bls @080B3BF8 +@080B3C42: ldr r0, =0x030060a8 ldrb r4, [r0] adds r5, r0, 0 cmp r4, 0x1 - bne _080B3C88 + bne @080B3C88 bl sub_80B12E8 ldr r2, =0x03006090 ldrb r0, [r5] @@ -338355,22 +338355,22 @@ _080B3C42: ldr r0, =0x030060ac strb r4, [r0] movs r0, 0x1 - b _080B3CF4 + b @080B3CF4 .align 2, 0 .pool -_080B3C88: +@080B3C88: ldrb r0, [r5] cmp r0, 0x2 - bne _080B3CEC + bne @080B3CEC bl sub_80B12E8 movs r4, 0 ldrb r5, [r5] cmp r4, r5 - bcs _080B3CC6 + bcs @080B3CC6 ldr r6, =0x03006090 adds r7, r6, 0x4 ldr r5, =0x02038bfc -_080B3CA0: +@080B3CA0: lsls r1, r4, 1 adds r1, r4 lsls r1, 2 @@ -338388,8 +338388,8 @@ _080B3CA0: ldr r0, =0x030060a8 ldrb r0, [r0] cmp r4, r0 - bcc _080B3CA0 -_080B3CC6: + bcc @080B3CA0 +@080B3CC6: bl sub_80B16A4 ldr r1, =0x02038bfc movs r0, 0 @@ -338398,15 +338398,15 @@ _080B3CC6: movs r0, 0x1 strb r0, [r1] movs r0, 0x1 - b _080B3CF4 + b @080B3CF4 .align 2, 0 .pool -_080B3CEC: +@080B3CEC: ldr r1, =0x030060ac movs r0, 0 strb r0, [r1] movs r0, 0 -_080B3CF4: +@080B3CF4: pop {r4-r7} pop {r1} bx r1 @@ -338415,7 +338415,7 @@ _080B3CF4: thumb_func_end sub_80B3BE8 thumb_func_start sub_80B3D00 -sub_80B3D00: @ 80B3D00 +sub_80B3D00: ; 80B3D00 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -338426,38 +338426,38 @@ sub_80B3D00: @ 80B3D00 mov r9, r0 bl sub_81D6074 cmp r0, 0x1 - bne _080B3D1E + bne @080B3D1E bl sub_81D62AC - b _080B3D24 -_080B3D1E: + b @080B3D24 +@080B3D1E: adds r0, r5, 0 bl npc_get_script_by_npc_id -_080B3D24: +@080B3D24: adds r7, r0, 0 bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - beq _080B3D3E + beq @080B3D3E adds r0, r5, 0 bl sub_81A9AC4 -_080B3D36: +@080B3D36: lsls r0, 24 -_080B3D38: +@080B3D38: cmp r0, 0 - beq _080B3D56 - b _080B3DE0 -_080B3D3E: + beq @080B3D56 + b @080B3DE0 +@080B3D3E: bl sub_81D6074 cmp r0, 0x1 - bne _080B3D4E + bne @080B3D4E adds r0, r5, 0 bl sub_81D619C - b _080B3D36 -_080B3D4E: + b @080B3D36 +@080B3D4E: adds r0, r7, 0 bl sub_80B16B8 - b _080B3D38 -_080B3D56: + b @080B3D38 +@080B3D56: lsls r4, r5, 3 adds r0, r4, r5 lsls r0, 2 @@ -338468,22 +338468,22 @@ _080B3D56: lsrs r6, r0, 24 mov r8, r4 cmp r6, 0 - beq _080B3DE0 + beq @080B3DE0 ldrb r0, [r7, 0x1] cmp r0, 0x4 - beq _080B3D7C + beq @080B3D7C cmp r0, 0x7 - beq _080B3D7C + beq @080B3D7C cmp r0, 0x6 - bne _080B3D8A -_080B3D7C: + bne @080B3D8A +@080B3D7C: bl sub_806B638 lsls r0, 24 cmp r0, 0 - bne _080B3DE0 + bne @080B3DE0 movs r1, 0x2 mov r9, r1 -_080B3D8A: +@080B3D8A: ldr r2, =0x03006090 ldr r4, =0x030060a8 ldrb r1, [r4] @@ -338518,12 +338518,12 @@ _080B3D8A: adds r0, 0x1 strb r0, [r4] mov r0, r9 - b _080B3DE2 + b @080B3DE2 .align 2, 0 .pool -_080B3DE0: +@080B3DE0: movs r0, 0 -_080B3DE2: +@080B3DE2: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -338533,7 +338533,7 @@ _080B3DE2: thumb_func_end sub_80B3D00 thumb_func_start sub_80B3DF0 -sub_80B3DF0: @ 80B3DF0 +sub_80B3DF0: ; 80B3DF0 push {r4-r7,lr} mov r7, r8 push {r7} @@ -338547,7 +338547,7 @@ sub_80B3DF0: @ 80B3DF0 ldrb r0, [r7, 0x7] mov r8, r4 cmp r0, 0x1 - bne _080B3E50 + bne @080B3E50 ldr r1, =0x0855072c ldrb r0, [r7, 0x18] lsls r0, 28 @@ -338573,15 +338573,15 @@ sub_80B3DF0: @ 80B3DF0 bl sub_80B3FB0 lsls r0, 24 lsrs r0, 24 - b _080B3E90 + b @080B3E90 .align 2, 0 .pool -_080B3E4C: +@080B3E4C: adds r0, r6, 0 - b _080B3E90 -_080B3E50: + b @080B3E90 +@080B3E50: movs r5, 0 -_080B3E52: +@080B3E52: ldr r0, =0x0855072c lsls r4, r5, 2 adds r4, r0 @@ -338606,12 +338606,12 @@ _080B3E52: bl sub_80B3FB0 lsls r0, 24 cmp r0, 0 - bne _080B3E4C + bne @080B3E4C adds r5, r4, 0 cmp r5, 0x3 - bls _080B3E52 + bls @080B3E52 movs r0, 0 -_080B3E90: +@080B3E90: add sp, 0x4 pop {r3} mov r8, r3 @@ -338623,7 +338623,7 @@ _080B3E90: thumb_func_end sub_80B3DF0 thumb_func_start sub_80B3EA0 -sub_80B3EA0: @ 80B3EA0 +sub_80B3EA0: ; 80B3EA0 push {r4-r6,lr} adds r4, r0, 0 lsls r1, 16 @@ -338635,34 +338635,34 @@ sub_80B3EA0: @ 80B3EA0 lsls r2, 16 asrs r2, 16 cmp r0, r2 - bne _080B3EDA + bne @080B3EDA lsls r0, r5, 16 asrs r2, r0, 16 ldrh r3, [r4, 0x12] movs r1, 0x12 ldrsh r0, [r4, r1] cmp r2, r0 - ble _080B3EDA + ble @080B3EDA adds r1, r0, 0 lsls r0, r6, 16 asrs r0, 16 adds r1, r0 cmp r2, r1 - bgt _080B3EDA + bgt @080B3EDA subs r0, r5, r3 lsls r0, 24 lsrs r0, 24 - b _080B3EDC -_080B3EDA: + b @080B3EDC +@080B3EDA: movs r0, 0 -_080B3EDC: +@080B3EDC: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_80B3EA0 thumb_func_start sub_80B3EE4 -sub_80B3EE4: @ 80B3EE4 +sub_80B3EE4: ; 80B3EE4 push {r4-r6,lr} adds r4, r0, 0 lsls r1, 16 @@ -338674,34 +338674,34 @@ sub_80B3EE4: @ 80B3EE4 lsls r2, 16 asrs r2, 16 cmp r0, r2 - bne _080B3F1E + bne @080B3F1E lsls r0, r5, 16 asrs r2, r0, 16 ldrh r3, [r4, 0x12] movs r1, 0x12 ldrsh r0, [r4, r1] cmp r2, r0 - bge _080B3F1E + bge @080B3F1E adds r1, r0, 0 lsls r0, r6, 16 asrs r0, 16 subs r1, r0 cmp r2, r1 - blt _080B3F1E + blt @080B3F1E subs r0, r3, r5 lsls r0, 24 lsrs r0, 24 - b _080B3F20 -_080B3F1E: + b @080B3F20 +@080B3F1E: movs r0, 0 -_080B3F20: +@080B3F20: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_80B3EE4 thumb_func_start sub_80B3F28 -sub_80B3F28: @ 80B3F28 +sub_80B3F28: ; 80B3F28 push {r4-r6,lr} adds r4, r0, 0 lsls r1, 16 @@ -338713,34 +338713,34 @@ sub_80B3F28: @ 80B3F28 lsls r3, 16 asrs r3, 16 cmp r0, r3 - bne _080B3F62 + bne @080B3F62 lsls r0, r5, 16 asrs r3, r0, 16 ldrh r2, [r4, 0x10] movs r1, 0x10 ldrsh r0, [r4, r1] cmp r3, r0 - bge _080B3F62 + bge @080B3F62 adds r1, r0, 0 lsls r0, r6, 16 asrs r0, 16 subs r1, r0 cmp r3, r1 - blt _080B3F62 + blt @080B3F62 subs r0, r2, r5 lsls r0, 24 lsrs r0, 24 - b _080B3F64 -_080B3F62: + b @080B3F64 +@080B3F62: movs r0, 0 -_080B3F64: +@080B3F64: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_80B3F28 thumb_func_start sub_80B3F6C -sub_80B3F6C: @ 80B3F6C +sub_80B3F6C: ; 80B3F6C push {r4-r6,lr} adds r4, r0, 0 lsls r1, 16 @@ -338752,34 +338752,34 @@ sub_80B3F6C: @ 80B3F6C lsls r3, 16 asrs r3, 16 cmp r0, r3 - bne _080B3FA6 + bne @080B3FA6 lsls r0, r5, 16 asrs r3, r0, 16 ldrh r2, [r4, 0x10] movs r1, 0x10 ldrsh r0, [r4, r1] cmp r3, r0 - ble _080B3FA6 + ble @080B3FA6 adds r1, r0, 0 lsls r0, r6, 16 asrs r0, 16 adds r1, r0 cmp r3, r1 - bgt _080B3FA6 + bgt @080B3FA6 subs r0, r5, r2 lsls r0, 24 lsrs r0, 24 - b _080B3FA8 -_080B3FA6: + b @080B3FA8 +@080B3FA6: movs r0, 0 -_080B3FA8: +@080B3FA8: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_80B3F6C thumb_func_start sub_80B3FB0 -sub_80B3FB0: @ 80B3FB0 +sub_80B3FB0: ; 80B3FB0 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -338792,7 +338792,7 @@ sub_80B3FB0: @ 80B3FB0 lsls r2, 24 lsrs r7, r2, 24 cmp r1, 0 - beq _080B4056 + beq @080B4056 ldrh r1, [r6, 0x10] mov r0, sp strh r1, [r0] @@ -338809,8 +338809,8 @@ sub_80B3FB0: @ 80B3FB0 mov r4, r9 subs r4, 0x1 cmp r5, r4 - bge _080B4028 -_080B3FEE: + bge @080B4028 +@080B3FEE: mov r0, sp movs r2, 0 ldrsh r1, [r0, r2] @@ -338823,13 +338823,13 @@ _080B3FEE: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq _080B4014 + beq @080B4014 movs r0, 0x2 negs r0, r0 ands r1, r0 cmp r1, 0 - bne _080B4056 -_080B4014: + bne @080B4056 +@080B4014: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -338838,8 +338838,8 @@ _080B4014: mov r2, r8 bl numbers_move_direction cmp r5, r4 - blt _080B3FEE -_080B4028: + blt @080B3FEE +@080B4028: ldrb r4, [r6, 0x19] lsls r5, r4, 28 lsrs r5, 28 @@ -338861,13 +338861,13 @@ _080B4028: orrs r5, r4 strb r5, [r6, 0x19] cmp r1, 0x4 - beq _080B405A -_080B4056: + beq @080B405A +@080B4056: movs r0, 0 - b _080B405C -_080B405A: + b @080B405C +@080B405A: mov r0, r9 -_080B405C: +@080B405C: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -338878,7 +338878,7 @@ _080B405C: thumb_func_end sub_80B3FB0 thumb_func_start sub_80B406C -sub_80B406C: @ 80B406C +sub_80B406C: ; 80B406C push {r4,r5,lr} lsls r5, r1, 24 lsrs r5, 24 @@ -338920,22 +338920,22 @@ sub_80B406C: @ 80B406C thumb_func_end sub_80B406C thumb_func_start sub_80B40C8 -sub_80B40C8: @ 80B40C8 +sub_80B40C8: ; 80B40C8 push {r4,r5,lr} adds r2, r0, 0 ldr r0, =0x02038bfc ldrb r0, [r0] cmp r0, 0 - bne _080B40E4 + bne @080B40E4 ldr r0, =0x03006090 ldrb r5, [r0, 0x8] - b _080B40E8 + b @080B40E8 .align 2, 0 .pool -_080B40E4: +@080B40E4: ldr r0, =0x03006090 ldrb r5, [r0, 0x14] -_080B40E8: +@080B40E8: ldr r4, =c3_8081EDC + 1 adds r0, r5, 0 adds r1, r4, 0 @@ -338957,7 +338957,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 @@ -338976,15 +338976,15 @@ c3_8081EDC: @ 80B4118 ldrb r0, [r5] lsls r0, 31 cmp r0, 0 - bne _080B4150 + bne @080B4150 adds r0, r6, 0 bl set_task_function_to_args_14_15 - b _080B416C + b @080B416C .align 2, 0 .pool -_080B4150: +@080B4150: ldr r7, =0x0855073c -_080B4152: +@080B4152: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -338996,8 +338996,8 @@ _080B4152: bl _call_via_r3 lsls r0, 24 cmp r0, 0 - bne _080B4152 -_080B416C: + bne @080B4152 +@080B416C: pop {r4-r7} pop {r0} bx r0 @@ -339006,13 +339006,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 @@ -339045,7 +339045,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 @@ -339053,10 +339053,10 @@ sub_80B41C0: @ 80B41C0 bl oe_active_list_contains lsls r0, 24 cmp r0, 0 - beq _080B41D6 + beq @080B41D6 movs r0, 0 - b _080B41F8 -_080B41D6: + b @080B41F8 +@080B41D6: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -339065,25 +339065,25 @@ _080B41D6: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _080B41EC + bhi @080B41EC movs r0, 0x6 strh r0, [r4, 0x8] -_080B41EC: +@080B41EC: ldrb r0, [r5, 0x6] cmp r0, 0x3F - bne _080B41F6 + bne @080B41F6 movs r0, 0x8 strh r0, [r4, 0x8] -_080B41F6: +@080B41F6: movs r0, 0x1 -_080B41F8: +@080B41F8: pop {r4,r5} pop {r1} bx r1 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 @@ -339091,17 +339091,17 @@ sub_80B4200: @ 80B4200 bl npc_is_visible_or_is_x40 lsls r0, 24 cmp r0, 0 - beq _080B421E + beq @080B421E adds r0, r4, 0 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _080B4252 -_080B421E: + beq @080B4252 +@080B421E: movs r1, 0xE ldrsh r0, [r5, r1] cmp r0, 0 - beq _080B4244 + beq @080B4244 ldrb r0, [r4, 0x18] lsls r0, 28 lsrs r0, 28 @@ -339114,15 +339114,15 @@ _080B421E: ldrh r0, [r5, 0xE] subs r0, 0x1 strh r0, [r5, 0xE] - b _080B4252 -_080B4244: + b @080B4252 +@080B4244: adds r0, r4, 0 movs r1, 0x3E bl npc_set_state_2 ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] -_080B4252: +@080B4252: movs r0, 0 pop {r4,r5} pop {r1} @@ -339130,7 +339130,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 @@ -339138,13 +339138,13 @@ sub_80B425C: @ 80B425C bl npc_is_visible_or_is_x40 lsls r0, 24 cmp r0, 0 - beq _080B427A + beq @080B427A adds r0, r5, 0 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _080B4308 -_080B427A: + beq @080B4308 +@080B427A: ldrb r0, [r5, 0x18] lsls r0, 28 lsrs r0, 28 @@ -339176,13 +339176,13 @@ _080B427A: bl npc_is_visible_or_is_x40 lsls r0, 24 cmp r0, 0 - beq _080B42D2 + beq @080B42D2 adds r0, r4, 0 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _080B4308 -_080B42D2: + beq @080B4308 +@080B42D2: bl sub_808BCE8 ldr r0, =0x02037590 ldrb r0, [r0, 0x5] @@ -339206,7 +339206,7 @@ _080B42D2: ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] -_080B4308: +@080B4308: movs r0, 0 pop {r4-r6} pop {r1} @@ -339216,7 +339216,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 @@ -339231,16 +339231,16 @@ sub_80B4318: @ 80B4318 bl npc_is_visible_or_is_x40 lsls r0, 24 cmp r0, 0 - beq _080B4344 + beq @080B4344 adds r0, r4, 0 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _080B434A -_080B4344: + beq @080B434A +@080B4344: adds r0, r5, 0 bl set_task_function_to_args_14_15 -_080B434A: +@080B434A: movs r0, 0 pop {r4,r5} pop {r1} @@ -339250,7 +339250,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 @@ -339258,20 +339258,20 @@ sub_80B435C: @ 80B435C bl npc_is_visible_or_is_x40 lsls r0, 24 cmp r0, 0 - beq _080B437A + beq @080B437A adds r0, r4, 0 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _080B4388 -_080B437A: + beq @080B4388 +@080B437A: adds r0, r4, 0 movs r1, 0x59 bl npc_set_state_2 ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] -_080B4388: +@080B4388: movs r0, 0 pop {r4,r5} pop {r1} @@ -339279,17 +339279,17 @@ _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 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _080B43A4 + beq @080B43A4 movs r0, 0x3 strh r0, [r4, 0x8] -_080B43A4: +@080B43A4: movs r0, 0 pop {r4} pop {r1} @@ -339297,7 +339297,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 @@ -339305,20 +339305,20 @@ sub_80B43AC: @ 80B43AC bl npc_is_visible_or_is_x40 lsls r0, 24 cmp r0, 0 - beq _080B43CA + beq @080B43CA adds r0, r4, 0 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _080B43D8 -_080B43CA: + beq @080B43D8 +@080B43CA: adds r0, r4, 0 movs r1, 0x3E bl npc_set_state_2 ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] -_080B43D8: +@080B43D8: movs r0, 0 pop {r4,r5} pop {r1} @@ -339326,7 +339326,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 @@ -339334,7 +339334,7 @@ sub_80B43E0: @ 80B43E0 bl npc_get_bit7_or_const_x10_when_inactive lsls r0, 24 cmp r0, 0 - beq _080B4426 + beq @080B4426 ldr r2, =0x02038c08 movs r1, 0x10 ldrsh r0, [r4, r1] @@ -339360,7 +339360,7 @@ sub_80B43E0: @ 80B43E0 ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] -_080B4426: +@080B4426: movs r0, 0 pop {r4,r5} pop {r1} @@ -339370,7 +339370,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 @@ -339384,7 +339384,7 @@ sub_80B4438: @ 80B4438 adds r1, 0x2B ldrb r0, [r1] cmp r0, 0x2 - bne _080B44A0 + bne @080B44A0 ldrb r1, [r4, 0x3] movs r0, 0x5 negs r0, r0 @@ -339420,7 +339420,7 @@ sub_80B4438: @ 80B4438 ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] -_080B44A0: +@080B44A0: movs r0, 0 pop {r4,r5} pop {r1} @@ -339430,17 +339430,17 @@ _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 bl oe_active_list_contains lsls r0, 24 cmp r0, 0 - bne _080B44C0 + bne @080B44C0 movs r0, 0x3 strh r0, [r4, 0x8] -_080B44C0: +@080B44C0: movs r0, 0 pop {r4} pop {r1} @@ -339448,7 +339448,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 @@ -339466,13 +339466,13 @@ sub_80B44C8: @ 80B44C8 movs r1, 0x16 ldrsh r0, [r4, r1] cmp r0, 0 - bne _080B44FA + bne @080B44FA ldr r0, [sp] bl rom_npc_by_local_id_and_map_get_trainer_flag ldrh r0, [r4, 0x16] adds r0, 0x1 strh r0, [r4, 0x16] -_080B44FA: +@080B44FA: ldr r1, =0x0855076c movs r2, 0x8 ldrsh r0, [r4, r2] @@ -339486,12 +339486,12 @@ _080B44FA: movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x3 - bne _080B4564 + bne @080B4564 movs r0, 0x31 bl oe_active_list_contains lsls r0, 24 cmp r0, 0 - bne _080B4564 + bne @080B4564 ldr r4, [sp] ldrb r0, [r4, 0x18] lsls r0, 28 @@ -339514,16 +339514,16 @@ _080B44FA: bl sub_808F23C adds r0, r5, 0 bl remove_task - b _080B456E + b @080B456E .align 2, 0 .pool -_080B4564: +@080B4564: ldr r2, [sp] ldrb r1, [r2] movs r0, 0x7F ands r0, r1 strb r0, [r2] -_080B456E: +@080B456E: add sp, 0x4 pop {r4,r5} pop {r0} @@ -339531,7 +339531,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 + 1 @@ -339556,7 +339556,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 + 1 bl sub_80B40C8 @@ -339567,7 +339567,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 @@ -339578,16 +339578,16 @@ 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] cmp r0, 0x2 - bne _080B4610 + bne @080B4610 ldr r1, =0x02038bfc ldrb r0, [r1] cmp r0, 0 - bne _080B460C + bne @080B460C adds r0, 0x1 strb r0, [r1] ldr r1, =0x020375f0 @@ -339597,17 +339597,17 @@ sub_80B45D0: @ 80B45D0 ldr r0, =0x03006090 ldrb r0, [r0, 0xC] bl sub_80974D0 - b _080B4616 + b @080B4616 .align 2, 0 .pool -_080B460C: +@080B460C: movs r0, 0 strb r0, [r1] -_080B4610: +@080B4610: ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] -_080B4616: +@080B4616: pop {r0} bx r0 .align 2, 0 @@ -339615,7 +339615,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, =0x085507b4 movs r1, 0 @@ -339625,7 +339625,7 @@ oei_exclamation_mark: @ 80B4620 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq _080B4648 + beq @080B4648 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -339634,7 +339634,7 @@ oei_exclamation_mark: @ 80B4620 movs r1, 0 movs r2, 0 bl sub_80B46D8 -_080B4648: +@080B4648: movs r0, 0 pop {r1} bx r1 @@ -339643,7 +339643,7 @@ _080B4648: thumb_func_end oei_exclamation_mark thumb_func_start sub_80B4658 -sub_80B4658: @ 80B4658 +sub_80B4658: ; 80B4658 push {lr} ldr r0, =0x085507b4 movs r1, 0 @@ -339653,7 +339653,7 @@ sub_80B4658: @ 80B4658 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq _080B4680 + beq @080B4680 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -339662,7 +339662,7 @@ sub_80B4658: @ 80B4658 movs r1, 0x21 movs r2, 0x1 bl sub_80B46D8 -_080B4680: +@080B4680: movs r0, 0 pop {r1} bx r1 @@ -339671,7 +339671,7 @@ _080B4680: thumb_func_end sub_80B4658 thumb_func_start sub_80B4690 -sub_80B4690: @ 80B4690 +sub_80B4690: ; 80B4690 push {r4,lr} ldr r0, =0x085507cc movs r1, 0 @@ -339681,7 +339681,7 @@ sub_80B4690: @ 80B4690 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _080B46C6 + beq @080B46C6 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -339697,7 +339697,7 @@ sub_80B4690: @ 80B4690 movs r1, 0x20 orrs r0, r1 strb r0, [r4, 0x5] -_080B46C6: +@080B46C6: movs r0, 0 pop {r4} pop {r1} @@ -339707,7 +339707,7 @@ _080B46C6: thumb_func_end sub_80B4690 thumb_func_start sub_80B46D8 -sub_80B46D8: @ 80B46D8 +sub_80B46D8: ; 80B46D8 push {r4,lr} lsls r2, 24 lsrs r2, 24 @@ -339746,7 +339746,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 @@ -339763,22 +339763,22 @@ objc_exclamation_mark_probably: @ 80B4724 bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _080B4756 + bne @080B4756 adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080B4764 -_080B4756: + beq @080B4764 +@080B4756: ldrh r1, [r4, 0x3C] lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 bl oe_stop - b _080B47B2 -_080B4764: + b @080B47B2 +@080B4764: ldr r2, =0x02037350 mov r0, sp ldrb r1, [r0] @@ -339809,15 +339809,15 @@ _080B4764: lsls r2, 16 asrs r2, 16 cmp r2, 0 - beq _080B47B0 + beq @080B47B0 adds r0, r3, 0x1 strh r0, [r4, 0x34] - b _080B47B2 + b @080B47B2 .align 2, 0 .pool -_080B47B0: +@080B47B0: strh r2, [r4, 0x34] -_080B47B2: +@080B47B2: add sp, 0x4 pop {r4} pop {r0} @@ -339825,21 +339825,21 @@ _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] cmp r0, 0 - beq _080B47D4 + beq @080B47D4 ldr r0, =0x03006090 ldrb r0, [r0, 0xC] - b _080B47D8 + b @080B47D8 .align 2, 0 .pool -_080B47D4: +@080B47D4: ldr r0, =0x03006090 ldrb r0, [r0] -_080B47D8: +@080B47D8: pop {r1} bx r1 .align 2, 0 @@ -339847,26 +339847,26 @@ _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 cmp r0, 0x1 - bls _080B47EE + bls @080B47EE movs r0, 0 - b _080B4800 -_080B47EE: + b @080B4800 +@080B47EE: cmp r0, 0 - beq _080B47FC + beq @080B47FC ldr r0, =0x03006090 ldrb r0, [r0, 0xC] - b _080B4800 + b @080B4800 .align 2, 0 .pool -_080B47FC: +@080B47FC: ldr r0, =0x03006090 ldrb r0, [r0] -_080B4800: +@080B4800: pop {r1} bx r1 .align 2, 0 @@ -339874,12 +339874,12 @@ _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] cmp r0, 0x1 - bne _080B4870 + bne @080B4870 ldr r2, =0x03006090 ldr r0, =0x03006080 ldrh r1, [r0] @@ -339910,10 +339910,10 @@ sub_80B4808: @ 80B4808 ldrb r2, [r0, 0x4] movs r0, 0xFF bl exec_movement - b _080B489E + b @080B489E .align 2, 0 .pool -_080B4870: +@080B4870: ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -339935,7 +339935,7 @@ _080B4870: ldrb r2, [r0, 0x4] movs r0, 0xFF bl exec_movement -_080B489E: +@080B489E: movs r0, 0xFF bl sub_809BE48 pop {r0} @@ -339945,7 +339945,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 @@ -339954,7 +339954,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 @@ -339985,16 +339985,16 @@ sub_80B48C4: @ 80B48C4 ldrh r6, [r1] ldrh r5, [r2] cmp r5, r9 - bhi _080B496E + bhi @080B496E ldr r0, =0x02037318 mov r10, r0 -_080B4906: +@080B4906: movs r4, 0 mov r1, r10 ldr r0, [r1] ldr r0, [r0] cmp r4, r0 - bge _080B4964 + bge @080B4964 ldr r1, [sp] lsls r0, r1, 16 asrs r0, 16 @@ -340002,7 +340002,7 @@ _080B4906: ldr r1, [sp, 0x4] lsls r0, r1, 16 asrs r7, r0, 16 -_080B4920: +@080B4920: adds r0, r4, 0x7 adds r1, r5, 0x7 bl cur_mapdata_block_get_role_at @@ -340012,19 +340012,19 @@ _080B4920: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B4954 + bne @080B4954 adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r8, r4 - bne _080B4954 + bne @080B4954 cmp r7, r5 - bne _080B4954 + bne @080B4954 adds r0, r6, 0 - b _080B4974 + b @080B4974 .align 2, 0 .pool -_080B4954: +@080B4954: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -340032,18 +340032,18 @@ _080B4954: ldr r0, [r1] ldr r0, [r0] cmp r4, r0 - blt _080B4920 -_080B4964: + blt @080B4920 +@080B4964: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, r9 - bls _080B4906 -_080B496E: + bls @080B4906 +@080B496E: adds r0, r6, 0x1 lsls r0, 16 lsrs r0, 16 -_080B4974: +@080B4974: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -340055,7 +340055,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 @@ -340068,7 +340068,7 @@ sub_80B4984: @ 80B4984 movs r0, 0x88 lsls r0, 6 cmp r1, r0 - bne _080B4A7A + bne @080B4A7A add r5, sp, 0xC mov r4, sp adds r4, 0xE @@ -340088,23 +340088,23 @@ sub_80B4984: @ 80B4984 mov r8, r4 ldrh r2, [r0, 0x6] cmp r1, r2 - blt _080B49D0 + blt @080B49D0 ldrh r3, [r0, 0x8] cmp r1, r3 - bgt _080B49D0 + bgt @080B49D0 movs r7, 0x1 -_080B49D0: +@080B49D0: mov r2, r8 movs r3, 0 ldrsh r1, [r2, r3] ldrh r2, [r0, 0xC] cmp r1, r2 - blt _080B49E4 + blt @080B49E4 ldrh r0, [r0, 0xE] cmp r1, r0 - bgt _080B49E4 + bgt @080B49E4 movs r7, 0x2 -_080B49E4: +@080B49E4: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -340113,14 +340113,14 @@ _080B49E4: lsls r0, 16 lsrs r0, 16 cmp r0, 0x31 - bls _080B4A08 - b _080B4A7A + bls @080B4A08 + b @080B4A7A .align 2, 0 .pool -_080B4A04: +@080B4A04: movs r0, 0x1 - b _080B4A7C -_080B4A08: + b @080B4A7C +@080B4A08: ldr r0, =0x03005d8c ldr r0, [r0] ldr r3, =0x00002e6a @@ -340129,7 +340129,7 @@ _080B4A08: bl sub_80B4AB8 movs r5, 0 ldr r6, =0x000001bf -_080B4A1A: +@080B4A1A: bl sub_80B4A98 lsls r1, r5, 1 mov r2, sp @@ -340141,21 +340141,21 @@ _080B4A1A: strh r0, [r4] lsls r0, 16 cmp r0, 0 - bne _080B4A38 + bne @080B4A38 strh r6, [r4] -_080B4A38: +@080B4A38: ldrh r0, [r4] subs r0, 0x1 lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - bls _080B4A4A + bls @080B4A4A adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_080B4A4A: +@080B4A4A: cmp r5, 0x6 - bne _080B4A1A + bne @080B4A1A mov r3, r9 movs r1, 0 ldrsh r0, [r3, r1] @@ -340167,20 +340167,20 @@ _080B4A4A: lsls r0, 16 lsrs r1, r0, 16 movs r5, 0 -_080B4A66: +@080B4A66: lsls r0, r5, 1 add r0, sp ldrh r0, [r0] cmp r1, r0 - beq _080B4A04 + beq @080B4A04 adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls _080B4A66 -_080B4A7A: + bls @080B4A66 +@080B4A7A: movs r0, 0 -_080B4A7C: +@080B4A7C: add sp, 0x10 pop {r3,r4} mov r8, r3 @@ -340193,7 +340193,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 @@ -340208,7 +340208,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 @@ -340219,7 +340219,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 @@ -340229,104 +340229,104 @@ wild_pokemon_rand_grass: @ 80B4AC8 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x13 - bhi _080B4AE4 + bhi @080B4AE4 movs r0, 0 - b _080B4B7E -_080B4AE4: + b @080B4B7E +@080B4AE4: adds r0, r1, 0 subs r0, 0x14 lsls r0, 24 lsrs r0, 24 cmp r0, 0x13 - bhi _080B4AF4 + bhi @080B4AF4 movs r0, 0x1 - b _080B4B7E -_080B4AF4: + b @080B4B7E +@080B4AF4: adds r0, r1, 0 subs r0, 0x28 lsls r0, 24 lsrs r0, 24 cmp r0, 0x9 - bhi _080B4B04 + bhi @080B4B04 movs r0, 0x2 - b _080B4B7E -_080B4B04: + b @080B4B7E +@080B4B04: adds r0, r1, 0 subs r0, 0x32 lsls r0, 24 lsrs r0, 24 cmp r0, 0x9 - bhi _080B4B14 + bhi @080B4B14 movs r0, 0x3 - b _080B4B7E -_080B4B14: + b @080B4B7E +@080B4B14: adds r0, r1, 0 subs r0, 0x3C lsls r0, 24 lsrs r0, 24 cmp r0, 0x9 - bhi _080B4B24 + bhi @080B4B24 movs r0, 0x4 - b _080B4B7E -_080B4B24: + b @080B4B7E +@080B4B24: adds r0, r1, 0 subs r0, 0x46 lsls r0, 24 lsrs r0, 24 cmp r0, 0x9 - bhi _080B4B34 + bhi @080B4B34 movs r0, 0x5 - b _080B4B7E -_080B4B34: + b @080B4B7E +@080B4B34: adds r0, r1, 0 subs r0, 0x50 lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bhi _080B4B44 + bhi @080B4B44 movs r0, 0x6 - b _080B4B7E -_080B4B44: + b @080B4B7E +@080B4B44: adds r0, r1, 0 subs r0, 0x55 lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bhi _080B4B54 + bhi @080B4B54 movs r0, 0x7 - b _080B4B7E -_080B4B54: + b @080B4B7E +@080B4B54: adds r0, r1, 0 subs r0, 0x5A lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bhi _080B4B64 + bhi @080B4B64 movs r0, 0x8 - b _080B4B7E -_080B4B64: + b @080B4B7E +@080B4B64: adds r0, r1, 0 subs r0, 0x5E lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bhi _080B4B74 + bhi @080B4B74 movs r0, 0x9 - b _080B4B7E -_080B4B74: + b @080B4B7E +@080B4B74: cmp r1, 0x62 - beq _080B4B7C + beq @080B4B7C movs r0, 0xB - b _080B4B7E -_080B4B7C: + b @080B4B7E +@080B4B7C: movs r0, 0xA -_080B4B7E: +@080B4B7E: pop {r1} bx r1 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 @@ -340337,45 +340337,45 @@ wild_pokemon_rand_water: @ 80B4B84 lsrs r1, r0, 24 adds r2, r1, 0 cmp r1, 0x3B - bhi _080B4BA2 + bhi @080B4BA2 movs r0, 0 - b _080B4BD4 -_080B4BA2: + b @080B4BD4 +@080B4BA2: adds r0, r1, 0 subs r0, 0x3C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1D - bhi _080B4BB2 + bhi @080B4BB2 movs r0, 0x1 - b _080B4BD4 -_080B4BB2: + b @080B4BD4 +@080B4BB2: adds r0, r1, 0 subs r0, 0x5A lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bhi _080B4BC2 + bhi @080B4BC2 movs r0, 0x2 - b _080B4BD4 -_080B4BC2: + b @080B4BD4 +@080B4BC2: adds r0, r2, 0 subs r0, 0x5F lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bls _080B4BD2 + bls @080B4BD2 movs r0, 0x4 - b _080B4BD4 -_080B4BD2: + b @080B4BD4 +@080B4BD2: movs r0, 0x3 -_080B4BD4: +@080B4BD4: pop {r1} bx r1 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 @@ -340389,76 +340389,76 @@ sub_80B4BD8: @ 80B4BD8 lsls r0, 24 lsrs r1, r0, 24 cmp r4, 0x1 - beq _080B4C12 + beq @080B4C12 cmp r4, 0x1 - bgt _080B4C02 + bgt @080B4C02 cmp r4, 0 - beq _080B4C08 - b _080B4C6C -_080B4C02: + beq @080B4C08 + b @080B4C6C +@080B4C02: cmp r6, 0x2 - beq _080B4C36 - b _080B4C6C -_080B4C08: + beq @080B4C36 + b @080B4C6C +@080B4C08: movs r5, 0x1 cmp r1, 0x45 - bhi _080B4C6C + bhi @080B4C6C movs r5, 0 - b _080B4C6C -_080B4C12: + b @080B4C6C +@080B4C12: cmp r1, 0x3B - bhi _080B4C18 + bhi @080B4C18 movs r5, 0x2 -_080B4C18: +@080B4C18: adds r0, r1, 0 subs r0, 0x3C lsls r0, 24 lsrs r0, 24 cmp r0, 0x13 - bhi _080B4C26 + bhi @080B4C26 movs r5, 0x3 -_080B4C26: +@080B4C26: adds r0, r1, 0 subs r0, 0x50 lsls r0, 24 lsrs r0, 24 cmp r0, 0x13 - bhi _080B4C6C + bhi @080B4C6C movs r5, 0x4 - b _080B4C6C -_080B4C36: + b @080B4C6C +@080B4C36: cmp r1, 0x27 - bhi _080B4C3C + bhi @080B4C3C movs r5, 0x5 -_080B4C3C: +@080B4C3C: adds r0, r1, 0 subs r0, 0x28 lsls r0, 24 lsrs r0, 24 cmp r0, 0x27 - bhi _080B4C4A + bhi @080B4C4A movs r5, 0x6 -_080B4C4A: +@080B4C4A: adds r0, r1, 0 subs r0, 0x50 lsls r0, 24 lsrs r0, 24 cmp r0, 0xE - bhi _080B4C58 + bhi @080B4C58 movs r5, 0x7 -_080B4C58: +@080B4C58: adds r0, r1, 0 subs r0, 0x5F lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bhi _080B4C66 + bhi @080B4C66 movs r5, 0x8 -_080B4C66: +@080B4C66: cmp r1, 0x63 - bne _080B4C6C + bne @080B4C6C movs r5, 0x9 -_080B4C6C: +@080B4C6C: adds r0, r5, 0 pop {r4-r6} pop {r1} @@ -340466,20 +340466,20 @@ _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] ldrb r1, [r4] cmp r0, r1 - bcc _080B4C86 + bcc @080B4C86 ldrb r7, [r4] adds r6, r0, 0 - b _080B4C8A -_080B4C86: + b @080B4C8A +@080B4C86: ldrb r7, [r4, 0x1] ldrb r6, [r4] -_080B4C8A: +@080B4C8A: subs r4, r6, r7 adds r4, 0x1 lsls r4, 24 @@ -340496,56 +340496,56 @@ _080B4C8A: movs r1, 0x6 bl pokemon_getattr cmp r0, 0 - bne _080B4CEA + bne @080B4CEA adds r0, r5, 0 bl sub_806B6D8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x37 - beq _080B4CC8 + beq @080B4CC8 cmp r0, 0x48 - beq _080B4CC8 + beq @080B4CC8 cmp r0, 0x2E - bne _080B4CEA -_080B4CC8: + bne @080B4CEA +@080B4CC8: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _080B4CE0 + bne @080B4CE0 adds r0, r6, 0 - b _080B4CF0 + b @080B4CF0 .align 2, 0 .pool -_080B4CE0: +@080B4CE0: cmp r4, 0 - beq _080B4CEA + beq @080B4CEA subs r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_080B4CEA: +@080B4CEA: adds r0, r7, r4 lsls r0, 24 lsrs r0, 24 -_080B4CF0: +@080B4CF0: pop {r4-r7} pop {r1} bx r1 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, =0x08552d48 ldrb r1, [r0] adds r5, r0, 0 cmp r1, 0xFF - beq _080B4D6C + beq @080B4D6C ldr r6, =0x00006a18 -_080B4D08: +@080B4D08: lsls r0, r4, 2 adds r0, r4 lsls r0, 2 @@ -340556,32 +340556,32 @@ _080B4D08: movs r0, 0x4 ldrsb r0, [r2, r0] cmp r1, r0 - bne _080B4D58 + bne @080B4D58 ldrb r1, [r3, 0x1] movs r0, 0x5 ldrsb r0, [r2, r0] cmp r1, r0 - bne _080B4D58 + bne @080B4D58 ldrh r0, [r2, 0x4] cmp r0, r6 - bne _080B4D44 + bne @080B4D44 ldr r0, =0x0000403e bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x8 - bls _080B4D3E + bls @080B4D3E movs r0, 0 -_080B4D3E: +@080B4D3E: adds r0, r4, r0 lsls r0, 16 lsrs r4, r0, 16 -_080B4D44: +@080B4D44: adds r0, r4, 0 - b _080B4D6E + b @080B4D6E .align 2, 0 .pool -_080B4D58: +@080B4D58: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -340591,10 +340591,10 @@ _080B4D58: adds r0, r5 ldrb r0, [r0] cmp r0, 0xFF - bne _080B4D08 -_080B4D6C: + bne @080B4D08 +@080B4D6C: ldr r0, =0x0000ffff -_080B4D6E: +@080B4D6E: pop {r4-r6} pop {r1} bx r1 @@ -340603,12 +340603,12 @@ _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 flag_check_is_in_safari_zone cmp r0, 0x1 - bne _080B4E0E + bne @080B4E0E bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -340617,13 +340617,13 @@ sub_80B4D78: @ 80B4D78 lsls r0, 16 lsrs r0, 16 cmp r0, 0x4F - bhi _080B4E0E + bhi @080B4E0E bl sub_80FC3B8 adds r7, r0, 0 cmp r7, 0 - beq _080B4E0E + beq @080B4E0E movs r5, 0 -_080B4DA6: +@080B4DA6: mov r1, sp adds r0, r1, r5 strb r5, [r0] @@ -340631,41 +340631,41 @@ _080B4DA6: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x18 - bls _080B4DA6 + bls @080B4DA6 movs r5, 0 -_080B4DB8: +@080B4DB8: adds r1, r5, 0x1 lsls r0, r1, 24 lsrs r4, r0, 24 adds r6, r1, 0 cmp r4, 0x18 - bhi _080B4DE8 + bhi @080B4DE8 add r5, sp -_080B4DC6: +@080B4DC6: bl GenerateRandomNumber movs r1, 0x1 ands r1, r0 cmp r1, 0 - beq _080B4DDE + beq @080B4DDE ldrb r2, [r5] mov r0, sp adds r1, r0, r4 ldrb r0, [r1] strb r0, [r5] strb r2, [r1] -_080B4DDE: +@080B4DDE: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x18 - bls _080B4DC6 -_080B4DE8: + bls @080B4DC6 +@080B4DE8: lsls r0, r6, 24 lsrs r5, r0, 24 cmp r5, 0x17 - bls _080B4DB8 + bls @080B4DB8 movs r5, 0 -_080B4DF2: +@080B4DF2: mov r1, sp adds r4, r1, r5 ldrb r0, [r4] @@ -340673,51 +340673,51 @@ _080B4DF2: bl sub_8136FE4 lsls r0, 16 cmp r0, 0 - bgt _080B4E48 + bgt @080B4E48 adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x18 - bls _080B4DF2 -_080B4E0E: + bls @080B4DF2 +@080B4E0E: ldr r4, =0x020244ec adds r0, r4, 0 movs r1, 0x6 bl pokemon_getattr cmp r0, 0 - bne _080B4E4C + bne @080B4E4C adds r0, r4, 0 bl sub_806B6D8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1C - bne _080B4E4C + bne @080B4E4C bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _080B4E4C + bne @080B4E4C adds r0, r4, 0 movs r1, 0 bl pokemon_getattr - b _080B4E54 + b @080B4E54 .align 2, 0 .pool -_080B4E48: +@080B4E48: ldrb r0, [r4] - b _080B4E5E -_080B4E4C: + b @080B4E5E +@080B4E4C: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 -_080B4E54: +@080B4E54: movs r1, 0x19 bl __umodsi3 lsls r0, 24 lsrs r0, 24 -_080B4E5E: +@080B4E5E: add sp, 0x1C pop {r4-r7} pop {r1} @@ -340725,7 +340725,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 @@ -340741,30 +340741,30 @@ sub_80B4E68: @ 80B4E68 adds r0, r1 ldrb r0, [r0, 0x10] cmp r0, 0 - beq _080B4E96 + beq @080B4E96 cmp r0, 0 - blt _080B4E98 + blt @080B4E98 cmp r0, 0xFF - bgt _080B4E98 + bgt @080B4E98 cmp r0, 0xFE - blt _080B4E98 -_080B4E96: + blt @080B4E98 +@080B4E96: movs r2, 0 -_080B4E98: +@080B4E98: cmp r2, 0 - beq _080B4F28 + beq @080B4F28 ldr r5, =0x020244ec adds r0, r5, 0 movs r1, 0x6 bl pokemon_getattr cmp r0, 0 - bne _080B4F28 + bne @080B4F28 adds r0, r5, 0 bl sub_806B6D8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x38 - bne _080B4F28 + bne @080B4F28 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -340772,7 +340772,7 @@ _080B4E98: bl __umodsi3 lsls r0, 16 cmp r0, 0 - beq _080B4F28 + beq @080B4F28 adds r0, r5, 0 movs r1, 0xB bl pokemon_getattr @@ -340788,14 +340788,14 @@ _080B4E98: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xFE - bne _080B4F00 + bne @080B4F00 movs r4, 0 - b _080B4F02 + b @080B4F02 .align 2, 0 .pool -_080B4F00: +@080B4F00: movs r4, 0xFE -_080B4F02: +@080B4F02: bl sub_80B4D78 lsls r0, 24 lsrs r0, 24 @@ -340809,10 +340809,10 @@ _080B4F02: adds r2, r7, 0 movs r3, 0x20 bl sub_8067EF8 - b _080B4F40 + b @080B4F40 .align 2, 0 .pool -_080B4F28: +@080B4F28: bl sub_80B4D78 lsls r0, 24 lsrs r0, 24 @@ -340823,7 +340823,7 @@ _080B4F28: adds r2, r7, 0 movs r3, 0x20 bl pokemon_make_with_nature -_080B4F40: +@080B4F40: add sp, 0xC pop {r4-r7} pop {r0} @@ -340833,7 +340833,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 @@ -340846,17 +340846,17 @@ sub_80B4F4C: @ 80B4F4C mov r0, sp strb r1, [r0] cmp r3, 0x1 - beq _080B4FA0 + beq @080B4FA0 cmp r3, 0x1 - bgt _080B4F70 + bgt @080B4F70 cmp r3, 0 - beq _080B4F76 - b _080B4FBA -_080B4F70: + beq @080B4F76 + b @080B4FBA +@080B4F70: cmp r4, 0x2 - beq _080B4FB2 - b _080B4FBA -_080B4F76: + beq @080B4FB2 + b @080B4FBA +@080B4F76: ldr r0, [r5, 0x4] movs r1, 0x8 movs r2, 0x2A @@ -340864,7 +340864,7 @@ _080B4F76: bl sub_80B5A50 lsls r0, 24 cmp r0, 0 - bne _080B4FBA + bne @080B4FBA ldr r0, [r5, 0x4] movs r1, 0xD movs r2, 0x9 @@ -340872,10 +340872,10 @@ _080B4F76: bl sub_80B5A50 lsls r0, 24 cmp r0, 0 - bne _080B4FBA + bne @080B4FBA bl wild_pokemon_rand_grass - b _080B4FB6 -_080B4FA0: + b @080B4FB6 +@080B4FA0: ldr r0, [r5, 0x4] movs r1, 0xD movs r2, 0x9 @@ -340883,13 +340883,13 @@ _080B4FA0: bl sub_80B5A50 lsls r0, 24 cmp r0, 0 - bne _080B4FBA -_080B4FB2: + bne @080B4FBA +@080B4FB2: bl wild_pokemon_rand_water -_080B4FB6: +@080B4FB6: mov r1, sp strb r0, [r1] -_080B4FBA: +@080B4FBA: mov r0, sp ldrb r1, [r0] lsls r1, 2 @@ -340901,34 +340901,34 @@ _080B4FBA: movs r0, 0x1 ands r0, r6 cmp r0, 0 - beq _080B4FE0 + beq @080B4FE0 adds r0, r4, 0 bl sub_80B58CC lsls r0, 24 cmp r0, 0 - beq _080B5000 -_080B4FE0: + beq @080B5000 +@080B4FE0: ldr r0, =0x02037318 ldrh r1, [r0, 0x12] movs r0, 0xB3 lsls r0, 1 cmp r1, r0 - beq _080B5008 + beq @080B5008 movs r0, 0x2 ands r0, r6 cmp r0, 0 - beq _080B5008 + beq @080B5008 adds r0, r4, 0 bl sub_80B5934 lsls r0, 24 cmp r0, 0 - bne _080B5008 -_080B5000: + bne @080B5008 +@080B5000: movs r0, 0 - b _080B501C + b @080B501C .align 2, 0 .pool -_080B5008: +@080B5008: mov r0, sp ldrb r0, [r0] ldr r1, [r5, 0x4] @@ -340938,7 +340938,7 @@ _080B5008: adds r1, r4, 0 bl sub_80B4E68 movs r0, 0x1 -_080B501C: +@080B501C: add sp, 0x4 pop {r4-r6} pop {r1} @@ -340946,7 +340946,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 @@ -340974,14 +340974,14 @@ sub_80B5024: @ 80B5024 thumb_func_end sub_80B5024 thumb_func_start sub_80B505C -sub_80B505C: @ 80B505C +sub_80B505C: ; 80B505C push {r4,lr} lsls r0, 24 lsrs r0, 24 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _080B508C + beq @080B508C ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00002b94 @@ -340990,12 +340990,12 @@ sub_80B505C: @ 80B505C bl sub_80B58CC lsls r0, 24 cmp r0, 0 - bne _080B508C + bne @080B508C movs r0, 0 - b _080B50C6 + b @080B50C6 .align 2, 0 .pool -_080B508C: +@080B508C: ldr r0, =0x03005d8c ldr r1, [r0] ldr r2, =0x00002b90 @@ -341006,7 +341006,7 @@ _080B508C: ldrb r1, [r1] bl sub_80B4E68 movs r4, 0 -_080B50A2: +@080B50A2: ldr r0, =0x03005d8c ldr r0, [r0] lsls r1, r4, 1 @@ -341022,9 +341022,9 @@ _080B50A2: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x3 - bls _080B50A2 + bls @080B50A2 movs r0, 0x1 -_080B50C6: +@080B50C6: pop {r4} pop {r1} bx r1 @@ -341033,7 +341033,7 @@ _080B50C6: thumb_func_end sub_80B505C thumb_func_start sub_80B50DC -sub_80B50DC: @ 80B50DC +sub_80B50DC: ; 80B50DC push {r4,lr} ldr r4, =0x03005d8c ldr r2, [r4] @@ -341041,21 +341041,21 @@ sub_80B50DC: @ 80B50DC adds r0, r2, r1 ldrh r0, [r0] cmp r0, 0 - beq _080B513C + beq @080B513C movs r1, 0x5 ldrsb r1, [r2, r1] ldr r3, =0x00002b92 adds r0, r2, r3 ldrb r0, [r0] cmp r1, r0 - bne _080B513C + bne @080B513C movs r1, 0x4 ldrsb r1, [r2, r1] adds r3, 0x1 adds r0, r2, r3 ldrb r0, [r0] cmp r1, r0 - bne _080B513C + bne @080B513C bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -341068,21 +341068,21 @@ sub_80B50DC: @ 80B50DC lsrs r0, 16 ldrb r1, [r1] cmp r0, r1 - bcs _080B513C + bcs @080B513C movs r0, 0x1 - b _080B513E + b @080B513E .align 2, 0 .pool -_080B513C: +@080B513C: movs r0, 0 -_080B513E: +@080B513E: pop {r4} pop {r1} bx r1 thumb_func_end sub_80B50DC thumb_func_start sub_80B5144 -sub_80B5144: @ 80B5144 +sub_80B5144: ; 80B5144 push {r4,lr} adds r4, r0, 0 lsls r4, 16 @@ -341096,19 +341096,19 @@ sub_80B5144: @ 80B5144 lsls r0, 16 lsrs r0, 16 cmp r0, r4 - bcc _080B5168 + bcc @080B5168 movs r0, 0 - b _080B516A -_080B5168: + b @080B516A +@080B5168: movs r0, 0x1 -_080B516A: +@080B516A: pop {r4} pop {r1} bx r1 thumb_func_end sub_80B5144 thumb_func_start sub_80B5170 -sub_80B5170: @ 80B5170 +sub_80B5170: ; 80B5170 push {r4,lr} sub sp, 0x4 str r0, [sp] @@ -341120,7 +341120,7 @@ sub_80B5170: @ 80B5170 bl walkrun_bitfield_and_r0 lsls r0, 24 cmp r0, 0 - beq _080B519A + beq @080B519A ldr r1, [sp] lsls r0, r1, 2 adds r0, r1 @@ -341128,73 +341128,73 @@ sub_80B5170: @ 80B5170 movs r1, 0x64 bl __udivsi3 str r0, [sp] -_080B519A: +@080B519A: mov r0, sp bl sub_80B5AB0 mov r0, sp bl sub_80B5AF0 cmp r4, 0 - bne _080B5216 + bne @080B5216 ldr r4, =0x020244ec adds r0, r4, 0 movs r1, 0x6 bl pokemon_getattr cmp r0, 0 - bne _080B5216 + bne @080B5216 adds r0, r4, 0 bl sub_806B6D8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B51E8 + bne @080B51E8 ldr r0, =0x02037318 ldrh r1, [r0, 0x12] ldr r0, =0x00000169 cmp r1, r0 - bne _080B5210 + bne @080B5210 ldr r1, [sp] lsls r0, r1, 1 adds r0, r1 lsrs r0, 2 - b _080B5214 + b @080B5214 .align 2, 0 .pool -_080B51E8: +@080B51E8: cmp r0, 0x23 - bne _080B51F2 + bne @080B51F2 ldr r0, [sp] lsls r0, 1 - b _080B5214 -_080B51F2: + b @080B5214 +@080B51F2: cmp r0, 0x49 - beq _080B5210 + beq @080B5210 cmp r0, 0x47 - bne _080B5200 + bne @080B5200 ldr r0, [sp] lsls r0, 1 - b _080B5214 -_080B5200: + b @080B5214 +@080B5200: cmp r0, 0x8 - bne _080B5216 + bne @080B5216 ldr r0, =0x03005d8c ldr r0, [r0] adds r0, 0x2E ldrb r0, [r0] cmp r0, 0x8 - bne _080B5216 -_080B5210: + bne @080B5216 +@080B5210: ldr r0, [sp] lsrs r0, 1 -_080B5214: +@080B5214: str r0, [sp] -_080B5216: +@080B5216: ldr r0, [sp] movs r1, 0xB4 lsls r1, 4 cmp r0, r1 - bls _080B5222 + bls @080B5222 str r1, [sp] -_080B5222: +@080B5222: ldr r0, [sp] lsls r0, 16 lsrs r0, 16 @@ -341210,7 +341210,7 @@ _080B5222: thumb_func_end sub_80B5170 thumb_func_start sub_80B523C -sub_80B523C: @ 80B523C +sub_80B523C: ; 80B523C push {lr} bl GenerateRandomNumber lsls r0, 16 @@ -341220,18 +341220,18 @@ sub_80B523C: @ 80B523C lsls r0, 16 lsrs r0, 16 cmp r0, 0x3B - bhi _080B5258 + bhi @080B5258 movs r0, 0x1 - b _080B525A -_080B5258: + b @080B525A +@080B5258: movs r0, 0 -_080B525A: +@080B525A: pop {r1} bx r1 thumb_func_end sub_80B523C thumb_func_start sub_80B5260 -sub_80B5260: @ 80B5260 +sub_80B5260: ; 80B5260 push {lr} ldr r0, =0x03005d8c ldr r0, [r0] @@ -341239,23 +341239,23 @@ sub_80B5260: @ 80B5260 movs r0, 0xE0 lsls r0, 3 cmp r1, r0 - bne _080B5280 + bne @080B5280 movs r0, 0x53 bl flag_check lsls r0, 24 lsrs r0, 24 - b _080B5282 + b @080B5282 .align 2, 0 .pool -_080B5280: +@080B5280: movs r0, 0 -_080B5282: +@080B5282: pop {r1} bx r1 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 @@ -341269,32 +341269,32 @@ is_it_battle_time_2: @ 80B5288 ldr r0, =0x02038c00 ldrb r0, [r0] cmp r0, 0x1 - bne _080B52A6 - b _080B54FE -_080B52A6: + bne @080B52A6 + b @080B54FE +@080B52A6: bl get_wild_data_index_for_map lsls r0, 16 lsrs r5, r0, 16 ldr r0, =0x0000ffff cmp r5, r0 - bne _080B539C + bne @080B539C ldr r0, =0x02037318 ldrh r1, [r0, 0x12] movs r0, 0xB3 lsls r0, 1 cmp r1, r0 - bne _080B5330 + bne @080B5330 bl sub_81A7D00 lsls r0, 24 lsrs r5, r0, 24 cmp r7, r6 - beq _080B52D8 + beq @080B52D8 bl sub_80B523C lsls r0, 24 cmp r0, 0 - bne _080B52D8 - b _080B54FE -_080B52D8: + bne @080B52D8 + b @080B54FE +@080B52D8: ldr r1, =0x08553a14 lsls r0, r5, 2 adds r0, r5 @@ -341308,9 +341308,9 @@ _080B52D8: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080B52F8 - b _080B54FE -_080B52F8: + beq @080B52F8 + b @080B54FE +@080B52F8: ldr r0, [r4] movs r1, 0 movs r2, 0x2 @@ -341318,39 +341318,39 @@ _080B52F8: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080B530C - b _080B54FE -_080B530C: + beq @080B530C + b @080B54FE +@080B530C: movs r0, 0x1 bl sub_81A7B90 cmp r0, 0 - bne _080B5318 - b _080B54FE -_080B5318: + bne @080B5318 + b @080B54FE +@080B5318: bl sub_80B06B0 movs r0, 0x1 - b _080B5500 + b @080B5500 .align 2, 0 .pool -_080B5330: +@080B5330: ldr r0, =0x00000169 cmp r1, r0 - beq _080B5338 - b _080B54FE -_080B5338: + beq @080B5338 + b @080B54FE +@080B5338: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000cb2 adds r0, r1 ldrh r5, [r0] cmp r7, r6 - beq _080B5352 + beq @080B5352 bl sub_80B523C lsls r0, 24 cmp r0, 0 - bne _080B5352 - b _080B54FE -_080B5352: + bne @080B5352 + b @080B54FE +@080B5352: ldr r1, =0x08553894 lsls r0, r5, 2 adds r0, r5 @@ -341364,9 +341364,9 @@ _080B5352: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080B5372 - b _080B54FE -_080B5372: + beq @080B5372 + b @080B54FE +@080B5372: ldr r0, [r4] movs r1, 0 movs r2, 0x2 @@ -341374,14 +341374,14 @@ _080B5372: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080B5386 - b _080B54FE -_080B5386: + beq @080B5386 + b @080B54FE +@080B5386: bl sub_81A9C04 - b _080B54F6 + b @080B54F6 .align 2, 0 .pool -_080B539C: +@080B539C: lsls r0, r6, 24 lsrs r4, r0, 24 adds r0, r4, 0 @@ -341389,7 +341389,7 @@ _080B539C: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B543C + bne @080B543C ldr r1, =0x08552d48 lsls r2, r5, 2 adds r0, r2, r5 @@ -341399,17 +341399,17 @@ _080B539C: ldr r0, [r0] adds r4, r2, 0 cmp r0, 0 - bne _080B53C4 - b _080B54FE -_080B53C4: + bne @080B53C4 + b @080B54FE +@080B53C4: cmp r7, r6 - beq _080B53D4 + beq @080B53D4 bl sub_80B523C lsls r0, 24 cmp r0, 0 - bne _080B53D4 - b _080B54FE -_080B53D4: + bne @080B53D4 + b @080B54FE +@080B53D4: ldr r1, =0x08552d48 adds r0, r4, r5 lsls r0, 2 @@ -341422,26 +341422,26 @@ _080B53D4: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080B53F2 - b _080B54FE -_080B53F2: + beq @080B53F2 + b @080B54FE +@080B53F2: bl sub_8161EDC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080B54BA + beq @080B54BA bl sub_80B50DC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B5418 + bne @080B5418 movs r0, 0x3 bl sub_80B505C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080B54F6 -_080B5418: + beq @080B54F6 +@080B5418: ldr r1, =0x08552d48 adds r0, r4, r5 lsls r0, 2 @@ -341454,34 +341454,34 @@ _080B5418: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080B54F6 - b _080B54FE + beq @080B54F6 + b @080B54FE .align 2, 0 .pool -_080B543C: +@080B543C: adds r0, r4, 0 bl sub_8089558 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080B5464 + beq @080B5464 movs r0, 0x8 bl walkrun_bitfield_and_r0 lsls r0, 24 cmp r0, 0 - beq _080B54FE + beq @080B54FE adds r0, r4, 0 bl sub_80894AC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B54FE -_080B5464: + bne @080B54FE +@080B5464: bl sub_80B5260 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080B54FE + beq @080B54FE ldr r1, =0x08552d48 lsls r2, r5, 2 adds r0, r2, r5 @@ -341491,14 +341491,14 @@ _080B5464: ldr r0, [r0] adds r4, r2, 0 cmp r0, 0 - beq _080B54FE + beq @080B54FE cmp r8, r9 - beq _080B5492 + beq @080B5492 bl sub_80B523C lsls r0, 24 cmp r0, 0 - beq _080B54FE -_080B5492: + beq @080B54FE +@080B5492: ldr r1, =0x08552d48 adds r0, r4, r5 lsls r0, 2 @@ -341511,13 +341511,13 @@ _080B5492: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B54FE + bne @080B54FE bl sub_8161EDC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B54E4 -_080B54BA: + bne @080B54E4 +@080B54BA: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000031dc @@ -341526,13 +341526,13 @@ _080B54BA: bl sub_80B58CC lsls r0, 24 cmp r0, 0 - beq _080B54FE + beq @080B54FE bl sub_80B072C movs r0, 0x1 - b _080B5500 + b @080B5500 .align 2, 0 .pool -_080B54E4: +@080B54E4: ldr r0, [r4] movs r1, 0x1 movs r2, 0x3 @@ -341540,14 +341540,14 @@ _080B54E4: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B54FE -_080B54F6: + bne @080B54FE +@080B54F6: bl sub_80B0698 movs r0, 0x1 - b _080B5500 -_080B54FE: + b @080B5500 +@080B54FE: movs r0, 0 -_080B5500: +@080B5500: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -341557,14 +341557,14 @@ _080B5500: thumb_func_end is_it_battle_time_2 thumb_func_start sub_80B550C -sub_80B550C: @ 80B550C +sub_80B550C: ; 80B550C push {r4,lr} bl get_wild_data_index_for_map lsls r0, 16 lsrs r2, r0, 16 ldr r0, =0x0000ffff cmp r2, r0 - beq _080B5568 + beq @080B5568 ldr r1, =0x08552d48 lsls r0, r2, 2 adds r0, r2 @@ -341573,14 +341573,14 @@ sub_80B550C: @ 80B550C adds r0, r1 ldr r4, [r0] cmp r4, 0 - beq _080B5554 + beq @080B5554 ldrb r0, [r4] movs r1, 0x1 bl sub_80B5170 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B5568 + bne @080B5568 adds r0, r4, 0 movs r1, 0x2 movs r2, 0x3 @@ -341588,19 +341588,19 @@ sub_80B550C: @ 80B550C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bne _080B5568 + bne @080B5568 bl sub_80B0698 -_080B5554: +@080B5554: ldr r0, =0x020375f0 strh r4, [r0] - b _080B556E + b @080B556E .align 2, 0 .pool -_080B5568: +@080B5568: ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] -_080B556E: +@080B556E: pop {r4} pop {r0} bx r0 @@ -341609,7 +341609,7 @@ _080B556E: thumb_func_end sub_80B550C thumb_func_start sub_80B5578 -sub_80B5578: @ 80B5578 +sub_80B5578: ; 80B5578 push {r4,r5,lr} sub sp, 0x4 mov r5, sp @@ -341622,13 +341622,13 @@ sub_80B5578: @ 80B5578 lsrs r4, r0, 16 ldr r0, =0x0000ffff cmp r4, r0 - bne _080B562C + bne @080B562C ldr r0, =0x02037318 ldrh r1, [r0, 0x12] movs r0, 0xB3 lsls r0, 1 cmp r1, r0 - bne _080B55E4 + bne @080B55E4 bl sub_81A7D00 lsls r0, 24 lsrs r4, r0, 24 @@ -341645,22 +341645,22 @@ sub_80B5578: @ 80B5578 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080B55CA - b _080B56F2 -_080B55CA: + beq @080B55CA + b @080B56F2 +@080B55CA: movs r0, 0 bl sub_81A7B90 bl sub_80B06B0 movs r0, 0x1 - b _080B56F4 + b @080B56F4 .align 2, 0 .pool -_080B55E4: +@080B55E4: ldr r0, =0x00000169 cmp r1, r0 - beq _080B55EC - b _080B56F2 -_080B55EC: + beq @080B55EC + b @080B56F2 +@080B55EC: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000cb2 @@ -341679,12 +341679,12 @@ _080B55EC: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B56F2 + bne @080B56F2 bl sub_81A9C04 - b _080B56EA + b @080B56EA .align 2, 0 .pool -_080B562C: +@080B562C: mov r0, sp movs r2, 0 ldrsh r0, [r0, r2] @@ -341697,7 +341697,7 @@ _080B562C: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B568C + bne @080B568C ldr r1, =0x08552d48 lsls r0, r4, 2 adds r0, r4 @@ -341706,29 +341706,29 @@ _080B562C: adds r0, r1 ldr r4, [r0] cmp r4, 0 - beq _080B56F2 + beq @080B56F2 bl sub_8161EDC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080B56D4 + beq @080B56D4 bl sub_80B50DC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B5680 + bne @080B5680 movs r0, 0 bl sub_80B505C - b _080B56EA + b @080B56EA .align 2, 0 .pool -_080B5680: +@080B5680: adds r0, r4, 0 movs r1, 0 movs r2, 0 bl sub_80B4F4C - b _080B56EA -_080B568C: + b @080B56EA +@080B568C: mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -341741,12 +341741,12 @@ _080B568C: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B56F2 + bne @080B56F2 bl sub_80B5260 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080B56F2 + beq @080B56F2 ldr r1, =0x08552d48 lsls r0, r4, 2 adds r0, r4 @@ -341755,30 +341755,30 @@ _080B568C: adds r0, r1 ldr r4, [r0] cmp r4, 0 - beq _080B56F2 + beq @080B56F2 bl sub_8161EDC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B56E0 -_080B56D4: + bne @080B56E0 +@080B56D4: bl sub_80B072C movs r0, 0x1 - b _080B56F4 + b @080B56F4 .align 2, 0 .pool -_080B56E0: +@080B56E0: adds r0, r4, 0 movs r1, 0x1 movs r2, 0 bl sub_80B4F4C -_080B56EA: +@080B56EA: bl sub_80B0698 movs r0, 0x1 - b _080B56F4 -_080B56F2: + b @080B56F4 +@080B56F2: movs r0, 0 -_080B56F4: +@080B56F4: add sp, 0x4 pop {r4,r5} pop {r1} @@ -341786,14 +341786,14 @@ _080B56F4: thumb_func_end sub_80B5578 thumb_func_start sub_80B56FC -sub_80B56FC: @ 80B56FC +sub_80B56FC: ; 80B56FC push {lr} bl get_wild_data_index_for_map lsls r0, 16 lsrs r2, r0, 16 ldr r0, =0x0000ffff cmp r2, r0 - beq _080B572C + beq @080B572C ldr r0, =0x08552d48 lsls r1, r2, 2 adds r1, r2 @@ -341802,20 +341802,20 @@ sub_80B56FC: @ 80B56FC adds r1, r0 ldr r0, [r1] cmp r0, 0 - beq _080B572C + beq @080B572C movs r0, 0x1 - b _080B572E + b @080B572E .align 2, 0 .pool -_080B572C: +@080B572C: movs r0, 0 -_080B572E: +@080B572E: pop {r1} bx r1 thumb_func_end sub_80B56FC thumb_func_start sub_80B5734 -sub_80B5734: @ 80B5734 +sub_80B5734: ; 80B5734 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -341823,7 +341823,7 @@ sub_80B5734: @ 80B5734 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B5764 + bne @080B5764 ldr r4, =0x08553a78 adds r0, r4, 0 bl sub_80B4C74 @@ -341833,10 +341833,10 @@ sub_80B5734: @ 80B5734 ldrh r4, [r4, 0x2] adds r0, r4, 0 bl sub_80B4E68 - b _080B5784 + b @080B5784 .align 2, 0 .pool -_080B5764: +@080B5764: ldr r4, =0x08552d48 bl get_wild_data_index_for_map lsls r0, 16 @@ -341851,7 +341851,7 @@ _080B5764: bl sub_80B5024 lsls r0, 16 lsrs r4, r0, 16 -_080B5784: +@080B5784: movs r0, 0xC bl sav12_xor_increment adds r0, r4, 0 @@ -341865,7 +341865,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 @@ -341875,7 +341875,7 @@ wild_pokemon_rand_for_map: @ 80B57A0 lsrs r3, r0, 16 ldr r0, =0x0000ffff cmp r3, r0 - beq _080B57D2 + beq @080B57D2 ldr r2, =0x08552d48 lsls r1, r3, 2 adds r1, r3 @@ -341887,26 +341887,26 @@ wild_pokemon_rand_for_map: @ 80B57A0 adds r1, r2 ldr r4, [r1] cmp r5, 0 - bne _080B57E0 + bne @080B57E0 cmp r4, 0 - bne _080B57E6 -_080B57D2: + bne @080B57E6 +@080B57D2: movs r0, 0 - b _080B5826 + b @080B5826 .align 2, 0 .pool -_080B57E0: +@080B57E0: cmp r4, 0 - bne _080B57F4 - b _080B5818 -_080B57E6: + bne @080B57F4 + b @080B5818 +@080B57E6: movs r0, 0x1 strb r0, [r6] bl wild_pokemon_rand_water lsls r0, 24 ldr r1, [r4, 0x4] - b _080B5820 -_080B57F4: + b @080B5820 +@080B57F4: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -341915,36 +341915,36 @@ _080B57F4: lsls r0, 16 lsrs r0, 16 cmp r0, 0x4F - bls _080B5818 + bls @080B5818 movs r0, 0x1 strb r0, [r6] bl wild_pokemon_rand_water lsls r0, 24 ldr r1, [r4, 0x4] - b _080B5820 -_080B5818: + b @080B5820 +@080B5818: bl wild_pokemon_rand_grass lsls r0, 24 ldr r1, [r5, 0x4] -_080B5820: +@080B5820: lsrs r0, 22 adds r0, r1 ldrh r0, [r0, 0x2] -_080B5826: +@080B5826: pop {r4-r6} pop {r1} bx r1 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 lsrs r2, r0, 16 ldr r0, =0x0000ffff cmp r2, r0 - beq _080B5868 + beq @080B5868 ldr r1, =0x08552d48 lsls r0, r2, 2 adds r0, r2 @@ -341953,45 +341953,45 @@ sub_80B582C: @ 80B582C adds r0, r1 ldr r4, [r0] cmp r4, 0 - beq _080B5868 + beq @080B5868 bl wild_pokemon_rand_water lsls r0, 24 ldr r1, [r4, 0x4] lsrs r0, 22 adds r0, r1 ldrh r0, [r0, 0x2] - b _080B586A + b @080B586A .align 2, 0 .pool -_080B5868: +@080B5868: movs r0, 0 -_080B586A: +@080B586A: pop {r4} pop {r1} bx r1 thumb_func_end sub_80B582C thumb_func_start sub_80B5870 -sub_80B5870: @ 80B5870 +sub_80B5870: ; 80B5870 push {r4,r5,lr} bl sub_81A80A8 lsls r0, 24 cmp r0, 0 - bne _080B58C4 + bne @080B58C4 bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _080B58C4 + bne @080B58C4 bl in_trade_center cmp r0, 0x1 - beq _080B58C4 + beq @080B58C4 ldr r5, =0x00004021 adds r0, r5, 0 bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0 - beq _080B58C4 + beq @080B58C4 subs r4, r0, 0x1 lsls r4, 16 lsrs r4, 16 @@ -341999,23 +341999,23 @@ sub_80B5870: @ 80B5870 adds r1, r4, 0 bl var_set cmp r4, 0 - bne _080B58C4 + bne @080B58C4 ldr r0, =0x082a4b2a bl script_env_1_execute_new_script movs r0, 0x1 - b _080B58C6 + b @080B58C6 .align 2, 0 .pool -_080B58C4: +@080B58C4: movs r0, 0 -_080B58C6: +@080B58C6: pop {r4,r5} pop {r1} bx r1 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 @@ -342023,9 +342023,9 @@ sub_80B58CC: @ 80B58CC bl var_get lsls r0, 16 cmp r0, 0 - beq _080B5912 + beq @080B5912 movs r5, 0 -_080B58E0: +@080B58E0: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -342035,40 +342035,40 @@ _080B58E0: movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _080B5920 + beq @080B5920 adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _080B5920 + bne @080B5920 adds r0, r4, 0 movs r1, 0x38 bl pokemon_getattr lsls r0, 24 lsrs r0, 24 cmp r6, r0 - bcc _080B592A -_080B5912: + bcc @080B592A +@080B5912: movs r0, 0x1 - b _080B592C + b @080B592C .align 2, 0 .pool -_080B5920: +@080B5920: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls _080B58E0 -_080B592A: + bls @080B58E0 +@080B592A: movs r0, 0 -_080B592C: +@080B592C: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_80B58CC thumb_func_start sub_80B5934 -sub_80B5934: @ 80B5934 +sub_80B5934: ; 80B5934 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -342077,47 +342077,47 @@ sub_80B5934: @ 80B5934 movs r1, 0x6 bl pokemon_getattr cmp r0, 0 - bne _080B5988 + bne @080B5988 adds r0, r4, 0 bl sub_806B6D8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x33 - beq _080B595A + beq @080B595A cmp r0, 0x16 - bne _080B5988 -_080B595A: + bne @080B5988 +@080B595A: adds r0, r4, 0 movs r1, 0x38 bl pokemon_getattr lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 - bls _080B5988 + bls @080B5988 subs r0, 0x5 cmp r5, r0 - bgt _080B5988 + bgt @080B5988 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _080B5988 + bne @080B5988 movs r0, 0 - b _080B598A + b @080B598A .align 2, 0 .pool -_080B5988: +@080B5988: movs r0, 0x1 -_080B598A: +@080B598A: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_80B5934 thumb_func_start sub_80B5990 -sub_80B5990: @ 80B5990 +sub_80B5990: ; 80B5990 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -342142,24 +342142,24 @@ sub_80B5990: @ 80B5990 mov r5, sp movs r3, 0 cmp r3, r2 - bcs _080B59D2 + bcs @080B59D2 movs r1, 0 -_080B59C4: +@080B59C4: adds r0, r5, r3 strb r1, [r0] adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, r2 - bcc _080B59C4 -_080B59D2: + bcc @080B59C4 +@080B59D2: movs r4, 0 movs r3, 0 cmp r4, r2 - bcs _080B5A12 + bcs @080B5A12 ldr r6, =0x083203cc mov r10, r6 -_080B59DE: +@080B59DE: lsls r0, r3, 2 add r0, r12 ldrh r1, [r0, 0x2] @@ -342171,34 +342171,34 @@ _080B59DE: ldrb r0, [r1, 0x6] ldr r6, [r7] cmp r0, r6 - beq _080B59FC + beq @080B59FC ldrb r0, [r1, 0x7] cmp r0, r6 - bne _080B5A08 -_080B59FC: + bne @080B5A08 +@080B59FC: adds r1, r4, 0 adds r0, r1, 0x1 lsls r0, 24 lsrs r4, r0, 24 adds r1, r5, r1 strb r3, [r1] -_080B5A08: +@080B5A08: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, r2 - bcc _080B59DE -_080B5A12: + bcc @080B59DE +@080B5A12: cmp r4, 0 - beq _080B5A1A + beq @080B5A1A cmp r4, r2 - bne _080B5A24 -_080B5A1A: + bne @080B5A24 +@080B5A1A: movs r0, 0 - b _080B5A3C + b @080B5A3C .align 2, 0 .pool -_080B5A24: +@080B5A24: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -342209,7 +342209,7 @@ _080B5A24: mov r1, r8 strb r0, [r1] movs r0, 0x1 -_080B5A3C: +@080B5A3C: mov sp, r9 add sp, 0x4 pop {r3-r5} @@ -342222,7 +342222,7 @@ _080B5A3C: thumb_func_end sub_80B5990 thumb_func_start sub_80B5A50 -sub_80B5A50: @ 80B5A50 +sub_80B5A50: ; 80B5A50 push {r4-r7,lr} mov r7, r8 push {r7} @@ -342237,20 +342237,20 @@ sub_80B5A50: @ 80B5A50 movs r1, 0x6 bl pokemon_getattr cmp r0, 0 - bne _080B5AA4 + bne @080B5AA4 adds r0, r4, 0 bl sub_806B6D8 lsls r0, 24 lsrs r0, 24 cmp r0, r5 - bne _080B5AA4 + bne @080B5AA4 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _080B5AA4 + bne @080B5AA4 adds r0, r7, 0 adds r1, r6, 0 movs r2, 0xC @@ -342258,12 +342258,12 @@ sub_80B5A50: @ 80B5A50 bl sub_80B5990 lsls r0, 24 lsrs r0, 24 - b _080B5AA6 + b @080B5AA6 .align 2, 0 .pool -_080B5AA4: +@080B5AA4: movs r0, 0 -_080B5AA6: +@080B5AA6: pop {r3} mov r8, r3 pop {r4-r7} @@ -342272,7 +342272,7 @@ _080B5AA6: thumb_func_end sub_80B5A50 thumb_func_start sub_80B5AB0 -sub_80B5AB0: @ 80B5AB0 +sub_80B5AB0: ; 80B5AB0 push {r4,lr} adds r4, r0, 0 ldr r0, =0x000008ad @@ -342280,25 +342280,25 @@ sub_80B5AB0: @ 80B5AB0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B5AD0 + bne @080B5AD0 ldr r0, [r4] lsrs r1, r0, 1 adds r0, r1 - b _080B5AE2 + b @080B5AE2 .align 2, 0 .pool -_080B5AD0: +@080B5AD0: ldr r0, =0x000008ae bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B5AE4 + bne @080B5AE4 ldr r0, [r4] lsrs r0, 1 -_080B5AE2: +@080B5AE2: str r0, [r4] -_080B5AE4: +@080B5AE4: pop {r4} pop {r0} bx r0 @@ -342307,20 +342307,20 @@ _080B5AE4: thumb_func_end sub_80B5AB0 thumb_func_start sub_80B5AF0 -sub_80B5AF0: @ 80B5AF0 +sub_80B5AF0: ; 80B5AF0 push {r4,lr} adds r4, r0, 0 ldr r0, =0x020244ec movs r1, 0xC bl pokemon_getattr cmp r0, 0xBE - bne _080B5B0C + bne @080B5B0C ldr r0, [r4] lsls r0, 1 movs r1, 0x3 bl __udivsi3 str r0, [r4] -_080B5B0C: +@080B5B0C: pop {r4} pop {r0} bx r0 @@ -342329,7 +342329,7 @@ _080B5B0C: thumb_func_end sub_80B5AF0 thumb_func_start oe_exec -oe_exec: @ 80B5B18 +oe_exec: ; 80B5B18 push {r4,r5,lr} sub sp, 0x8 adds r4, r0, 0 @@ -342344,7 +342344,7 @@ oe_exec: @ 80B5B18 str r0, [sp] add r4, sp, 0x4 ldr r5, =0x0855c1f0 -_080B5B36: +@080B5B36: ldr r0, [sp] ldrb r0, [r0] lsls r0, 2 @@ -342355,7 +342355,7 @@ _080B5B36: bl _call_via_r2 lsls r0, 24 cmp r0, 0 - bne _080B5B36 + bne @080B5B36 ldr r0, [sp, 0x4] add sp, 0x8 pop {r4,r5} @@ -342366,7 +342366,7 @@ _080B5B36: thumb_func_end oe_exec thumb_func_start oec00_load_gfx -oec00_load_gfx: @ 80B5B60 +oec00_load_gfx: ; 80B5B60 push {lr} ldr r1, [r0] adds r1, 0x1 @@ -342378,7 +342378,7 @@ oec00_load_gfx: @ 80B5B60 thumb_func_end oec00_load_gfx thumb_func_start sub_80B5B74 -sub_80B5B74: @ 80B5B74 +sub_80B5B74: ; 80B5B74 push {lr} ldr r1, [r0] adds r1, 0x1 @@ -342390,7 +342390,7 @@ sub_80B5B74: @ 80B5B74 thumb_func_end sub_80B5B74 thumb_func_start sub_80B5B88 -sub_80B5B88: @ 80B5B88 +sub_80B5B88: ; 80B5B88 push {lr} ldr r1, [r0] adds r1, 0x1 @@ -342402,7 +342402,7 @@ sub_80B5B88: @ 80B5B88 thumb_func_end sub_80B5B88 thumb_func_start sub_80B5B9C -sub_80B5B9C: @ 80B5B9C +sub_80B5B9C: ; 80B5B9C push {lr} ldr r2, [r0] adds r2, 0x1 @@ -342414,13 +342414,13 @@ sub_80B5B9C: @ 80B5B9C thumb_func_end sub_80B5B9C thumb_func_start sub_80B5BB0 -sub_80B5BB0: @ 80B5BB0 +sub_80B5BB0: ; 80B5BB0 movs r0, 0 bx lr thumb_func_end sub_80B5BB0 thumb_func_start sub_80B5BB4 -sub_80B5BB4: @ 80B5BB4 +sub_80B5BB4: ; 80B5BB4 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -342441,7 +342441,7 @@ sub_80B5BB4: @ 80B5BB4 thumb_func_end sub_80B5BB4 thumb_func_start sub_80B5BDC -sub_80B5BDC: @ 80B5BDC +sub_80B5BDC: ; 80B5BDC push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -342460,7 +342460,7 @@ sub_80B5BDC: @ 80B5BDC thumb_func_end sub_80B5BDC thumb_func_start sub_80B5C00 -sub_80B5C00: @ 80B5C00 +sub_80B5C00: ; 80B5C00 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -342479,7 +342479,7 @@ sub_80B5C00: @ 80B5C00 thumb_func_end sub_80B5C00 thumb_func_start oe_read_word -oe_read_word: @ 80B5C24 +oe_read_word: ; 80B5C24 ldr r2, [r0] ldrb r0, [r2] ldrb r1, [r2, 0x1] @@ -342495,7 +342495,7 @@ oe_read_word: @ 80B5C24 thumb_func_end oe_read_word thumb_func_start oec00_load_gfx_impl -oec00_load_gfx_impl: @ 80B5C3C +oec00_load_gfx_impl: ; 80B5C3C push {r4,r5,lr} adds r4, r0, 0 bl oe_read_word @@ -342505,10 +342505,10 @@ oec00_load_gfx_impl: @ 80B5C3C lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 - bne _080B5C5A + bne @080B5C5A adds r0, r5, 0 bl gpu_tile_obj_alloc_tag_and_copy_to_vram -_080B5C5A: +@080B5C5A: ldr r0, [r4] adds r0, 0x4 str r0, [r4] @@ -342520,7 +342520,7 @@ _080B5C5A: thumb_func_end oec00_load_gfx_impl thumb_func_start sub_80B5C6C -sub_80B5C6C: @ 80B5C6C +sub_80B5C6C: ; 80B5C6C push {r4,r5,lr} adds r5, r0, 0 bl oe_read_word @@ -342540,7 +342540,7 @@ sub_80B5C6C: @ 80B5C6C thumb_func_end sub_80B5C6C thumb_func_start sub_80B5C94 -sub_80B5C94: @ 80B5C94 +sub_80B5C94: ; 80B5C94 push {r4,lr} adds r4, r0, 0 bl oe_read_word @@ -342554,7 +342554,7 @@ sub_80B5C94: @ 80B5C94 thumb_func_end sub_80B5C94 thumb_func_start oec03_call_asm_impl -oec03_call_asm_impl: @ 80B5CAC +oec03_call_asm_impl: ; 80B5CAC push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -342570,7 +342570,7 @@ oec03_call_asm_impl: @ 80B5CAC thumb_func_end oec03_call_asm_impl thumb_func_start oe_stop_ -oe_stop_: @ 80B5CC8 +oe_stop_: ; 80B5CC8 push {r4,r5,lr} adds r1, r0, 0 adds r1, 0x40 @@ -342588,7 +342588,7 @@ oe_stop_: @ 80B5CC8 thumb_func_end oe_stop_ thumb_func_start oe_stop -oe_stop: @ 80B5CEC +oe_stop: ; 80B5CEC push {r4,lr} lsls r4, r1, 24 lsrs r4, 24 @@ -342601,7 +342601,7 @@ oe_stop: @ 80B5CEC thumb_func_end oe_stop thumb_func_start gpu_tile_obj_free_by_ado_when_unused_maybe -gpu_tile_obj_free_by_ado_when_unused_maybe: @ 80B5D04 +gpu_tile_obj_free_by_ado_when_unused_maybe: ; 80B5D04 push {r4,r5,lr} lsls r0, 16 lsrs r4, r0, 16 @@ -342611,10 +342611,10 @@ gpu_tile_obj_free_by_ado_when_unused_maybe: @ 80B5D04 lsrs r3, r0, 16 ldr r0, =0x0000ffff cmp r3, r0 - beq _080B5D58 + beq @080B5D58 movs r2, 0 ldr r5, =0x02020630 -_080B5D1E: +@080B5D1E: lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -342624,27 +342624,27 @@ _080B5D1E: ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - beq _080B5D48 + beq @080B5D48 adds r0, r1, 0 adds r0, 0x3F ldrb r0, [r0] lsls r0, 25 cmp r0, 0 - bge _080B5D48 + bge @080B5D48 adds r0, r1, 0 adds r0, 0x40 ldrh r0, [r0] cmp r4, r0 - beq _080B5D58 -_080B5D48: + beq @080B5D58 +@080B5D48: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3F - bls _080B5D1E + bls @080B5D1E adds r0, r3, 0 bl gpu_tile_obj_free_by_tag -_080B5D58: +@080B5D58: pop {r4,r5} pop {r0} bx r0 @@ -342653,7 +342653,7 @@ _080B5D58: thumb_func_end gpu_tile_obj_free_by_ado_when_unused_maybe thumb_func_start gpu_pal_free_by_index_when_unused -gpu_pal_free_by_index_when_unused: @ 80B5D68 +gpu_pal_free_by_index_when_unused: ; 80B5D68 push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -342663,11 +342663,11 @@ gpu_pal_free_by_index_when_unused: @ 80B5D68 lsrs r5, r0, 16 ldr r0, =0x0000ffff cmp r5, r0 - beq _080B5DB0 + beq @080B5DB0 movs r2, 0 ldr r6, =0x02020630 adds r3, r4, 0 -_080B5D84: +@080B5D84: lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -342677,20 +342677,20 @@ _080B5D84: ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - beq _080B5DA0 + beq @080B5DA0 ldrb r0, [r1, 0x5] lsrs r0, 4 cmp r0, r3 - beq _080B5DB0 -_080B5DA0: + beq @080B5DB0 +@080B5DA0: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3F - bls _080B5D84 + bls @080B5D84 adds r0, r5, 0 bl gpu_pal_free_tag -_080B5DB0: +@080B5DB0: pop {r4-r6} pop {r0} bx r0 @@ -342699,12 +342699,12 @@ _080B5DB0: thumb_func_end gpu_pal_free_by_index_when_unused thumb_func_start oe_active_list_clear -oe_active_list_clear: @ 80B5DC0 +oe_active_list_clear: ; 80B5DC0 push {r4,lr} movs r2, 0 ldr r4, =0x03000f58 movs r3, 0xFF -_080B5DC8: +@080B5DC8: adds r0, r2, r4 ldrb r1, [r0] orrs r1, r3 @@ -342713,7 +342713,7 @@ _080B5DC8: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x1F - bls _080B5DC8 + bls @080B5DC8 pop {r4} pop {r0} bx r0 @@ -342722,93 +342722,93 @@ _080B5DC8: thumb_func_end oe_active_list_clear thumb_func_start oe_active_list_add -oe_active_list_add: @ 80B5DE4 +oe_active_list_add: ; 80B5DE4 push {r4,lr} lsls r0, 24 lsrs r3, r0, 24 movs r2, 0 ldr r4, =0x03000f58 -_080B5DEE: +@080B5DEE: adds r1, r2, r4 ldrb r0, [r1] cmp r0, 0xFF - bne _080B5E00 + bne @080B5E00 strb r3, [r1] - b _080B5E0A + b @080B5E0A .align 2, 0 .pool -_080B5E00: +@080B5E00: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x1F - bls _080B5DEE -_080B5E0A: + bls @080B5DEE +@080B5E0A: pop {r4} pop {r0} bx r0 thumb_func_end oe_active_list_add thumb_func_start oe_active_list_remove -oe_active_list_remove: @ 80B5E10 +oe_active_list_remove: ; 80B5E10 push {r4,r5,lr} lsls r0, 24 lsrs r3, r0, 24 movs r2, 0 ldr r4, =0x03000f58 movs r5, 0xFF -_080B5E1C: +@080B5E1C: adds r1, r2, r4 ldrb r0, [r1] cmp r0, r3 - bne _080B5E30 + bne @080B5E30 orrs r0, r5 strb r0, [r1] - b _080B5E3A + b @080B5E3A .align 2, 0 .pool -_080B5E30: +@080B5E30: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x1F - bls _080B5E1C -_080B5E3A: + bls @080B5E1C +@080B5E3A: pop {r4,r5} pop {r0} bx r0 thumb_func_end oe_active_list_remove thumb_func_start oe_active_list_contains -oe_active_list_contains: @ 80B5E40 +oe_active_list_contains: ; 80B5E40 push {lr} lsls r0, 24 lsrs r2, r0, 24 movs r1, 0 ldr r3, =0x03000f58 -_080B5E4A: +@080B5E4A: adds r0, r1, r3 ldrb r0, [r0] cmp r0, r2 - bne _080B5E5C + bne @080B5E5C movs r0, 0x1 - b _080B5E68 + b @080B5E68 .align 2, 0 .pool -_080B5E5C: +@080B5E5C: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x1F - bls _080B5E4A + bls @080B5E4A movs r0, 0 -_080B5E68: +@080B5E68: pop {r1} bx r1 thumb_func_end oe_active_list_contains thumb_func_start sub_80B5E6C -sub_80B5E6C: @ 80B5E6C +sub_80B5E6C: ; 80B5E6C push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -342879,7 +342879,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 @@ -342906,7 +342906,7 @@ sub_80B5F0C: @ 80B5F0C thumb_func_end sub_80B5F0C thumb_func_start sub_80B5F44 -sub_80B5F44: @ 80B5F44 +sub_80B5F44: ; 80B5F44 push {r4-r6,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -342938,7 +342938,7 @@ sub_80B5F44: @ 80B5F44 thumb_func_end sub_80B5F44 thumb_func_start sub_80B5F84 -sub_80B5F84: @ 80B5F84 +sub_80B5F84: ; 80B5F84 push {r4,r5,lr} sub sp, 0x10 lsls r0, 16 @@ -342972,15 +342972,15 @@ sub_80B5F84: @ 80B5F84 bl sub_80AC3F8 ldr r0, =0x0000ffff cmp r5, r0 - beq _080B5FDC + beq @080B5FDC lsls r0, r5, 24 lsrs r0, 24 - b _080B5FDE + b @080B5FDE .align 2, 0 .pool -_080B5FDC: +@080B5FDC: movs r0, 0x40 -_080B5FDE: +@080B5FDE: add sp, 0x10 pop {r4,r5} pop {r1} @@ -342988,7 +342988,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 @@ -343036,15 +343036,15 @@ sub_80B5FE8: @ 80B5FE8 bl sub_80AC3F8 ldr r0, =0x0000ffff cmp r4, r0 - beq _080B605C + beq @080B605C lsls r0, r4, 24 lsrs r0, 24 - b _080B605E + b @080B605E .align 2, 0 .pool -_080B605C: +@080B605C: movs r0, 0x40 -_080B605E: +@080B605E: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -343056,7 +343056,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 @@ -343065,12 +343065,12 @@ sub_80B6070: @ 80B6070 ldrb r0, [r4, 0x1] lsls r0, 30 cmp r0, 0 - beq _080B608E + beq @080B608E ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 bl rotscale_free_entry -_080B608E: +@080B608E: adds r0, r5, 0 bl sub_818D820 pop {r4,r5} @@ -343079,7 +343079,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 @@ -343150,7 +343150,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} @@ -343211,7 +343211,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 @@ -343245,7 +343245,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 @@ -343269,7 +343269,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] @@ -343300,7 +343300,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 @@ -343313,7 +343313,7 @@ sub_80B6250: @ 80B6250 movs r4, 0x2E ldrsh r0, [r1, r4] cmp r0, 0x1 - ble _080B6282 + ble @080B6282 movs r0, 0x16 ldrsh r1, [r2, r0] lsls r0, r1, 4 @@ -343326,7 +343326,7 @@ sub_80B6250: @ 80B6250 ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] -_080B6282: +@080B6282: pop {r4} pop {r0} bx r0 @@ -343335,7 +343335,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 @@ -343348,11 +343348,11 @@ sub_80B628C: @ 80B628C movs r1, 0x2E ldrsh r0, [r0, r1] cmp r0, 0x4 - ble _080B62AC + ble @080B62AC ldrh r0, [r3, 0x8] adds r0, 0x1 strh r0, [r3, 0x8] -_080B62AC: +@080B62AC: pop {r0} bx r0 .align 2, 0 @@ -343360,7 +343360,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 @@ -343372,7 +343372,7 @@ sub_80B62B4: @ 80B62B4 movs r2, 0x2E ldrsh r0, [r1, r2] cmp r0, 0x6 - ble _080B62E6 + ble @080B62E6 adds r0, r1, 0 bl obj_delete_and_free_tiles movs r0, 0x19 @@ -343382,7 +343382,7 @@ sub_80B62B4: @ 80B62B4 lsls r0, 24 lsrs r0, 24 bl remove_task -_080B62E6: +@080B62E6: pop {r0} bx r0 .align 2, 0 @@ -343390,7 +343390,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 @@ -343420,7 +343420,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 @@ -343444,7 +343444,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] @@ -343499,7 +343499,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 @@ -343512,14 +343512,14 @@ sub_80B63D4: @ 80B63D4 movs r1, 0x2E ldrsh r0, [r0, r1] cmp r0, 0x1 - ble _080B63FA + ble @080B63FA ldrh r0, [r3, 0x26] adds r0, 0x1 strh r0, [r3, 0x26] ldrh r0, [r3, 0x8] adds r0, 0x1 strh r0, [r3, 0x8] -_080B63FA: +@080B63FA: pop {r0} bx r0 .align 2, 0 @@ -343527,7 +343527,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 @@ -343540,11 +343540,11 @@ sub_80B6404: @ 80B6404 movs r1, 0x2E ldrsh r0, [r0, r1] cmp r0, 0x4 - ble _080B6424 + ble @080B6424 ldrh r0, [r3, 0x8] adds r0, 0x1 strh r0, [r3, 0x8] -_080B6424: +@080B6424: pop {r0} bx r0 .align 2, 0 @@ -343552,7 +343552,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 @@ -343564,7 +343564,7 @@ sub_80B642C: @ 80B642C movs r2, 0x2E ldrsh r0, [r1, r2] cmp r0, 0x6 - ble _080B645E + ble @080B645E adds r0, r1, 0 bl obj_delete_and_free_tiles movs r0, 0x3E @@ -343574,7 +343574,7 @@ sub_80B642C: @ 80B642C lsls r0, 24 lsrs r0, 24 bl remove_task -_080B645E: +@080B645E: pop {r0} bx r0 .align 2, 0 @@ -343582,7 +343582,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} @@ -343624,7 +343624,7 @@ sub_80B646C: @ 80B646C thumb_func_end sub_80B646C thumb_func_start sub_80B64C0 -sub_80B64C0: @ 80B64C0 +sub_80B64C0: ; 80B64C0 push {lr} ldr r2, =0x0855c384 movs r3, 0x2E @@ -343640,20 +343640,20 @@ 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] movs r2, 0x30 ldrsh r0, [r4, r2] cmp r0, 0 - beq _080B64F4 + beq @080B64F4 subs r0, r1, 0x1 strh r0, [r4, 0x30] lsls r0, 16 cmp r0, 0 - bne _080B6550 -_080B64F4: + bne @080B6550 +@080B64F4: movs r0, 0x19 strh r0, [r4, 0x30] ldr r0, =0x0855c304 @@ -343698,17 +343698,17 @@ _080B64F4: strh r0, [r4, 0x3A] movs r0, 0x17 bl audio_play -_080B6550: +@080B6550: movs r1, 0x3A ldrsh r0, [r4, r1] cmp r0, 0 - bne _080B6562 + bne @080B6562 movs r0, 0x20 strh r0, [r4, 0x30] ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] -_080B6562: +@080B6562: pop {r4} pop {r0} bx r0 @@ -343717,7 +343717,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] @@ -343726,7 +343726,7 @@ sub_80B6574: @ 80B6574 lsls r0, 16 asrs r2, r0, 16 cmp r2, 0 - bne _080B65A4 + bne @080B65A4 ldrh r0, [r1, 0x2E] adds r0, 0x1 strh r0, [r1, 0x2E] @@ -343737,17 +343737,17 @@ sub_80B6574: @ 80B6574 movs r2, 0x38 ldrsh r0, [r1, r2] cmp r0, 0 - beq _080B65A4 + beq @080B65A4 movs r0, 0xB8 lsls r0, 1 bl fanfare_play -_080B65A4: +@080B65A4: pop {r0} bx r0 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 @@ -343759,7 +343759,7 @@ sub_80B65A8: @ 80B65A8 strh r0, [r7, 0x30] lsls r0, 16 cmp r0, 0 - bne _080B65D8 + bne @080B65D8 movs r0, 0x8 strh r0, [r7, 0x30] ldrh r0, [r7, 0x32] @@ -343768,11 +343768,11 @@ sub_80B65A8: @ 80B65A8 ands r0, r1 strh r0, [r7, 0x32] cmp r0, 0 - bne _080B65D8 + bne @080B65D8 ldrh r0, [r7, 0x34] adds r0, 0x1 strh r0, [r7, 0x34] -_080B65D8: +@080B65D8: ldrh r4, [r7, 0x32] adds r4, 0x3 movs r0, 0x3 @@ -343872,7 +343872,7 @@ _080B65D8: movs r3, 0x34 ldrsh r0, [r7, r3] cmp r0, 0x2 - ble _080B66C2 + ble @080B66C2 ldrh r0, [r7, 0x2E] adds r0, 0x1 movs r1, 0 @@ -343880,7 +343880,7 @@ _080B65D8: movs r0, 0x8 strh r0, [r7, 0x30] strh r1, [r7, 0x32] -_080B66C2: +@080B66C2: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -343893,7 +343893,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} @@ -343903,7 +343903,7 @@ sub_80B66E8: @ 80B66E8 strh r0, [r2, 0x30] lsls r0, 16 cmp r0, 0 - bne _080B6718 + bne @080B6718 movs r0, 0x8 strh r0, [r2, 0x30] ldrh r0, [r2, 0x32] @@ -343912,13 +343912,13 @@ sub_80B66E8: @ 80B66E8 ands r0, r1 strh r0, [r2, 0x32] cmp r0, 0x3 - bne _080B6718 + bne @080B6718 ldrh r0, [r2, 0x2E] adds r0, 0x1 strh r0, [r2, 0x2E] movs r0, 0x1E strh r0, [r2, 0x30] -_080B6718: +@080B6718: ldrh r4, [r2, 0x32] lsls r4, 24 lsrs r4, 24 @@ -344000,7 +344000,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] @@ -344008,17 +344008,17 @@ sub_80B67DC: @ 80B67DC strh r0, [r1, 0x30] lsls r0, 16 cmp r0, 0 - bne _080B67F2 + bne @080B67F2 ldrh r0, [r1, 0x2E] adds r0, 0x1 strh r0, [r1, 0x2E] -_080B67F2: +@080B67F2: pop {r0} bx r0 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] @@ -344026,34 +344026,34 @@ 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 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080B6816 + beq @080B6816 bl task_is_not_running_overworld_fanfare lsls r0, 24 cmp r0, 0 - beq _080B681C -_080B6816: + beq @080B681C +@080B6816: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] -_080B681C: +@080B681C: pop {r4} pop {r0} bx r0 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 @@ -344066,10 +344066,10 @@ sub_80B6828: @ 80B6828 movs r1, 0x2E ldrsh r0, [r0, r1] cmp r0, 0x4 - ble _080B6848 + ble @080B6848 adds r0, r3, 0 bl oe_stop_ -_080B6848: +@080B6848: pop {r0} bx r0 .align 2, 0 @@ -344077,7 +344077,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 @@ -344121,13 +344121,13 @@ 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 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080B68D0 + beq @080B68D0 movs r0, 0 strh r0, [r4, 0x2E] adds r2, r4, 0 @@ -344139,24 +344139,24 @@ sub_80B68AC: @ 80B68AC adds r0, r4, 0 movs r1, 0x1 bl obj_anim_image_start -_080B68D0: +@080B68D0: adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080B68E4 + beq @080B68E4 adds r0, r4, 0 bl oe_stop_ -_080B68E4: +@080B68E4: pop {r4} pop {r0} bx r0 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 @@ -344166,7 +344166,7 @@ sub_80B68EC: @ 80B68EC lsrs r2, 16 lsls r3, 24 cmp r3, 0 - bne _080B6934 + bne @080B6934 ldr r0, =0x0855c334 lsls r1, 16 asrs r1, 16 @@ -344183,10 +344183,10 @@ sub_80B68EC: @ 80B68EC adds r0, r1 ldr r1, =0x0855c2c4 bl obj_set_f18_to_r0_f42_to_40 - b _080B6948 + b @080B6948 .align 2, 0 .pool -_080B6934: +@080B6934: ldr r0, =0x0855c34c lsls r1, 16 asrs r1, 16 @@ -344196,7 +344196,7 @@ _080B6934: bl obj_add_from_template_backward_search lsls r0, 24 lsrs r4, r0, 24 -_080B6948: +@080B6948: ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 @@ -344217,7 +344217,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 @@ -344230,18 +344230,18 @@ sub_80B6970: @ 80B6970 movs r1, 0x26 ldrsh r0, [r0, r1] cmp r0, 0 - beq _080B69C6 + beq @080B69C6 ldrh r1, [r3, 0x30] movs r2, 0x30 ldrsh r0, [r3, r2] cmp r0, 0 - beq _080B699E + beq @080B699E subs r0, r1, 0x1 strh r0, [r3, 0x30] lsls r0, 16 cmp r0, 0 - bne _080B69C0 -_080B699E: + bne @080B69C0 +@080B699E: movs r0, 0x10 strh r0, [r3, 0x30] movs r0, 0x3E @@ -344259,18 +344259,18 @@ _080B699E: orrs r0, r1 mov r1, r12 strb r0, [r1] -_080B69C0: +@080B69C0: ldrh r0, [r3, 0x32] adds r0, 0x1 strh r0, [r3, 0x32] -_080B69C6: +@080B69C6: movs r2, 0x32 ldrsh r0, [r3, r2] cmp r0, 0x7F - ble _080B69D4 + ble @080B69D4 adds r0, r3, 0 bl oe_stop_ -_080B69D4: +@080B69D4: pop {r0} bx r0 .align 2, 0 @@ -344278,7 +344278,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 + 1 bl set_callback2 @@ -344292,7 +344292,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 + 1 @@ -344310,7 +344310,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 @@ -344322,31 +344322,31 @@ task00_8084310: @ 80B6A24 movs r0, 0x8 ldrsh r6, [r4, r0] cmp r6, 0 - bne _080B6A64 + bne @080B6A64 bl sub_80ABDFC lsls r0, 24 cmp r0, 0 - beq _080B6A8A + beq @080B6A8A bl brm_get_pokemon_selection ldr r1, =0x02038c08 lsls r0, 24 lsrs r0, 24 str r0, [r1] cmp r0, 0x5 - ble _080B6A58 + ble @080B6A58 str r6, [r1] -_080B6A58: +@080B6A58: movs r0, 0x1F bl oe_exec ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080B6A64: +@080B6A64: movs r0, 0x1F bl oe_active_list_contains lsls r0, 24 cmp r0, 0 - bne _080B6A8A + bne @080B6A8A bl flag_var_implications_of_teleport_ bl warp_in ldr r0, =c2_load_new_map + 1 @@ -344356,7 +344356,7 @@ _080B6A64: str r0, [r1] adds r0, r5, 0 bl remove_task -_080B6A8A: +@080B6A8A: pop {r4-r6} pop {r0} bx r0 @@ -344365,7 +344365,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 @@ -344387,7 +344387,7 @@ mapldr_08084390: @ 80B6AA4 movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _080B6AE6 + beq @080B6AE6 ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -344395,7 +344395,7 @@ mapldr_08084390: @ 80B6AA4 adds r0, r4 movs r1, 0x3 bl npc_turn -_080B6AE6: +@080B6AE6: bl script_env_2_enable bl player_bitmagic ldr r1, =0x03005dac @@ -344409,7 +344409,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 @@ -344422,29 +344422,29 @@ c3_080843F8: @ 80B6B0C movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - bne _080B6B3E + bne @080B6B3E ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080B6B58 + bne @080B6B58 movs r0, 0x20 bl oe_exec ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080B6B3E: +@080B6B3E: movs r0, 0x20 bl oe_active_list_contains lsls r0, 24 cmp r0, 0 - bne _080B6B58 + bne @080B6B58 bl script_env_2_disable bl sub_809757C adds r0, r5, 0 bl remove_task -_080B6B58: +@080B6B58: pop {r4,r5} pop {r0} bx r0 @@ -344453,7 +344453,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 @@ -344472,7 +344472,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 @@ -344482,7 +344482,7 @@ sub_80B6B94: @ 80B6B94 ldr r0, =0x03005e00 adds r4, r1, r0 ldr r5, =0x0855c3c8 -_080B6BA6: +@080B6BA6: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -344492,7 +344492,7 @@ _080B6BA6: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _080B6BA6 + bne @080B6BA6 pop {r4,r5} pop {r0} bx r0 @@ -344501,7 +344501,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 @@ -344580,17 +344580,17 @@ 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 lsls r0, 24 cmp r0, 0 - beq _080B6C88 + beq @080B6C88 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080B6C88: +@080B6C88: movs r0, 0 pop {r4} pop {r1} @@ -344598,7 +344598,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 @@ -344652,7 +344652,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 @@ -344676,28 +344676,28 @@ sub_80B6D04: @ 80B6D04 movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0x7 - bgt _080B6D46 + bgt @080B6D46 ldrh r1, [r4, 0xC] adds r0, r2, r1 strh r0, [r4, 0xC] movs r1, 0xF ands r0, r1 cmp r0, 0 - beq _080B6D46 + beq @080B6D46 lsls r0, r2, 1 strh r0, [r4, 0xA] -_080B6D46: +@080B6D46: ldrh r2, [r4, 0xE] movs r1, 0xE ldrsh r0, [r4, r1] cmp r0, 0 - bne _080B6D84 + bne @080B6D84 movs r0, 0x26 ldrsh r1, [r5, r0] movs r0, 0x10 negs r0, r0 cmp r1, r0 - blt _080B6D84 + blt @080B6D84 adds r0, r2, 0x1 strh r0, [r4, 0xE] ldrb r1, [r6, 0x3] @@ -344718,11 +344718,11 @@ _080B6D46: movs r1, 0x4 orrs r0, r1 strb r0, [r6] -_080B6D84: +@080B6D84: movs r1, 0x26 ldrsh r0, [r5, r1] cmp r0, 0 - blt _080B6DA8 + blt @080B6DA8 movs r0, 0xD6 bl audio_play ldrb r0, [r6] @@ -344736,7 +344736,7 @@ _080B6D84: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080B6DA8: +@080B6DA8: movs r0, 0 pop {r4-r6} pop {r1} @@ -344746,7 +344746,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 @@ -344763,7 +344763,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 @@ -344779,19 +344779,19 @@ sub_80B6DD8: @ 80B6DD8 movs r1, 0x3 ands r0, r1 cmp r0, 0 - bne _080B6E00 + bne @080B6E00 lsls r0, r2, 16 asrs r0, 17 strh r0, [r4, 0xA] -_080B6E00: +@080B6E00: movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0 - bne _080B6E0E + bne @080B6E0E ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080B6E0E: +@080B6E0E: movs r0, 0 pop {r4} pop {r1} @@ -344799,7 +344799,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 @@ -344821,7 +344821,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 @@ -344840,10 +344840,10 @@ sub_80B6E4C: @ 80B6E4C movs r0, 0 strh r0, [r1, 0xA] cmp r4, 0x6A - bne _080B6E78 + bne @080B6E78 movs r0, 0x1 strh r0, [r1, 0xA] -_080B6E78: +@080B6E78: pop {r4} pop {r0} bx r0 @@ -344852,7 +344852,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 @@ -344862,7 +344862,7 @@ sub_80B6E88: @ 80B6E88 ldr r0, =0x03005e00 adds r4, r1, r0 ldr r5, =0x0855c3e4 -_080B6E9A: +@080B6E9A: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -344872,7 +344872,7 @@ _080B6E9A: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _080B6E9A + bne @080B6E9A pop {r4,r5} pop {r0} bx r0 @@ -344881,7 +344881,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 @@ -344898,7 +344898,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 @@ -344912,13 +344912,13 @@ sub_80B6EE0: @ 80B6EE0 bl npc_is_visible_or_is_x40 lsls r0, 24 cmp r0, 0 - beq _080B6F0A + beq @080B6F0A adds r0, r4, 0 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _080B6F3E -_080B6F0A: + beq @080B6F3E +@080B6F0A: bl player_get_direction__sp1AA lsls r0, 24 lsrs r0, 24 @@ -344936,13 +344936,13 @@ _080B6F0A: strh r1, [r5, 0xE] ldrb r0, [r5, 0xA] cmp r0, 0 - bne _080B6F38 + bne @080B6F38 movs r0, 0x4 strh r0, [r5, 0x8] -_080B6F38: +@080B6F38: movs r0, 0x50 bl audio_play -_080B6F3E: +@080B6F3E: movs r0, 0 pop {r4,r5} pop {r1} @@ -344952,19 +344952,19 @@ _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 movs r1, 0xC ldrsh r0, [r4, r1] cmp r0, 0x3 - ble _080B6F6A + ble @080B6F6A bl sub_80B7050 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080B6F6A: +@080B6F6A: movs r0, 0 pop {r4} pop {r1} @@ -344972,7 +344972,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 @@ -344982,19 +344982,19 @@ 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 movs r1, 0xC ldrsh r0, [r4, r1] cmp r0, 0x3 - ble _080B6F9E + ble @080B6F9E bl sub_80B7050 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080B6F9E: +@080B6F9E: movs r0, 0 pop {r4} pop {r1} @@ -345002,7 +345002,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 @@ -345012,7 +345012,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 @@ -345038,11 +345038,11 @@ sub_80B6FB8: @ 80B6FB8 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _080B6FF6 + beq @080B6FF6 ldrh r0, [r5, 0xC] adds r0, 0x1 strh r0, [r5, 0xC] -_080B6FF6: +@080B6FF6: pop {r4,r5} pop {r0} bx r0 @@ -345051,7 +345051,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 @@ -345077,11 +345077,11 @@ sub_80B7004: @ 80B7004 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _080B7042 + beq @080B7042 ldrh r0, [r5, 0xC] adds r0, 0x1 strh r0, [r5, 0xC] -_080B7042: +@080B7042: pop {r4,r5} pop {r0} bx r0 @@ -345090,7 +345090,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 @@ -345099,19 +345099,19 @@ 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] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080B709C + bne @080B709C bl sub_80859A0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B709C + bne @080B709C bl sub_80E1570 bl warp_in ldr r1, =0x03005dac @@ -345124,7 +345124,7 @@ sub_80B7060: @ 80B7060 lsls r0, 24 lsrs r0, 24 bl remove_task -_080B709C: +@080B709C: pop {r0} bx r0 .align 2, 0 @@ -345132,7 +345132,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 @@ -345150,7 +345150,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 @@ -345160,7 +345160,7 @@ sub_80B70DC: @ 80B70DC ldr r0, =0x03005e00 adds r4, r1, r0 ldr r5, =0x0855c3fc -_080B70EE: +@080B70EE: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -345170,7 +345170,7 @@ _080B70EE: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _080B70EE + bne @080B70EE pop {r4,r5} pop {r0} bx r0 @@ -345179,7 +345179,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 @@ -345217,16 +345217,16 @@ sub_80B7114: @ 80B7114 movs r0, 0x10 strh r0, [r5, 0xA] cmp r1, 0x6B - bne _080B717C + bne @080B717C movs r1, 0x1 movs r0, 0x3 strh r0, [r5, 0x8] - b _080B717E + b @080B717E .align 2, 0 .pool -_080B717C: +@080B717C: movs r1, 0 -_080B717E: +@080B717E: adds r0, r1, 0 bl sub_80E1558 movs r0, 0x1 @@ -345237,7 +345237,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 @@ -345269,7 +345269,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 @@ -345295,20 +345295,20 @@ sub_80B71D0: @ 80B71D0 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _080B720E + beq @080B720E ldrh r0, [r4, 0xA] subs r0, 0x1 strh r0, [r4, 0xA] -_080B720E: +@080B720E: movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0 - bne _080B721E + bne @080B721E strh r0, [r5, 0x24] strh r0, [r5, 0x26] movs r0, 0x5 strh r0, [r4, 0x8] -_080B721E: +@080B721E: movs r0, 0 pop {r4,r5} pop {r1} @@ -345318,7 +345318,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 @@ -345350,7 +345350,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 @@ -345376,21 +345376,21 @@ sub_80B7270: @ 80B7270 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _080B72AE + beq @080B72AE ldrh r0, [r4, 0xA] subs r0, 0x1 strh r0, [r4, 0xA] -_080B72AE: +@080B72AE: movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0 - bne _080B72C0 + bne @080B72C0 strh r0, [r5, 0x24] strh r0, [r5, 0x26] ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080B72C0: +@080B72C0: movs r0, 0 pop {r4,r5} pop {r1} @@ -345400,29 +345400,29 @@ _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 lsls r0, 24 cmp r0, 0 - bne _080B72EC + bne @080B72EC bl sub_80E1570 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] movs r0, 0x1 - b _080B72EE -_080B72EC: + b @080B72EE +@080B72EC: movs r0, 0 -_080B72EE: +@080B72EE: pop {r4} pop {r1} bx r1 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] @@ -345435,7 +345435,7 @@ sub_80B72F4: @ 80B72F4 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _080B7338 + beq @080B7338 bl sub_808EE8C bl script_env_2_disable movs r0, 0x4 @@ -345450,7 +345450,7 @@ sub_80B72F4: @ 80B72F4 lsls r0, 24 lsrs r0, 24 bl remove_task -_080B7338: +@080B7338: movs r0, 0 pop {r4} pop {r1} @@ -345460,7 +345460,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 + 1 adds r0, r4, 0 @@ -345486,7 +345486,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 @@ -345496,7 +345496,7 @@ sub_80B7384: @ 80B7384 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_080B7396: +@080B7396: movs r0, 0x8 ldrsh r2, [r4, r0] lsls r2, 2 @@ -345513,7 +345513,7 @@ _080B7396: bl _call_via_r2 lsls r0, 24 cmp r0, 0 - bne _080B7396 + bne @080B7396 pop {r4,r5} pop {r0} bx r0 @@ -345522,7 +345522,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 @@ -345541,7 +345541,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 @@ -345550,7 +345550,7 @@ waterfall_1_do_anim_probably: @ 80B73F0 bl npc_is_visible_or_is_x40 lsls r0, 24 cmp r0, 0 - bne _080B7420 + bne @080B7420 adds r0, r5, 0 bl sub_8093284 ldr r1, =0x02038c08 @@ -345562,7 +345562,7 @@ waterfall_1_do_anim_probably: @ 80B73F0 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080B7420: +@080B7420: movs r0, 0 pop {r4,r5} pop {r1} @@ -345572,29 +345572,29 @@ _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 bl oe_active_list_contains lsls r0, 24 cmp r0, 0 - bne _080B7446 + bne @080B7446 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] movs r0, 0x1 - b _080B7448 -_080B7446: + b @080B7448 +@080B7446: movs r0, 0 -_080B7448: +@080B7448: pop {r4} pop {r1} bx r1 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 @@ -345615,7 +345615,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 @@ -345623,16 +345623,16 @@ sub_80B7478: @ 80B7478 bl sub_8093284 lsls r0, 24 cmp r0, 0 - bne _080B748E + bne @080B748E movs r0, 0 - b _080B74CA -_080B748E: + b @080B74CA +@080B748E: ldrb r0, [r4, 0x1E] bl is_tile_x13_waterfall lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _080B74C4 + bne @080B74C4 bl script_env_2_disable ldr r0, =0x02037590 strb r4, [r0, 0x6] @@ -345644,21 +345644,21 @@ _080B748E: movs r0, 0x2B bl oe_active_list_remove movs r0, 0 - b _080B74CA + b @080B74CA .align 2, 0 .pool -_080B74C4: +@080B74C4: movs r0, 0x3 strh r0, [r5, 0x8] movs r0, 0x1 -_080B74CA: +@080B74CA: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_80B7478 thumb_func_start sub_80B74D0 -sub_80B74D0: @ 80B74D0 +sub_80B74D0: ; 80B74D0 push {r4,lr} ldr r4, =sub_80B750C + 1 adds r0, r4, 0 @@ -345686,7 +345686,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 @@ -345696,7 +345696,7 @@ sub_80B750C: @ 80B750C adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_080B751E: +@080B751E: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -345706,7 +345706,7 @@ _080B751E: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _080B751E + bne @080B751E pop {r4,r5} pop {r0} bx r0 @@ -345715,7 +345715,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] @@ -345729,7 +345729,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 @@ -345751,7 +345751,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 @@ -345762,7 +345762,7 @@ dive_3_unknown: @ 80B7580 bl oe_active_list_contains lsls r0, 24 cmp r0, 0 - bne _080B75C4 + bne @080B75C4 ldr r2, =0x02037350 ldr r0, =0x02037590 ldrb r1, [r0, 0x5] @@ -345780,7 +345780,7 @@ dive_3_unknown: @ 80B7580 bl remove_task movs r0, 0x2C bl oe_active_list_remove -_080B75C4: +@080B75C4: movs r0, 0 add sp, 0x8 pop {r1} @@ -345790,7 +345790,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 @@ -345804,7 +345804,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 @@ -345815,7 +345815,7 @@ sub_80B75F0: @ 80B75F0 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_080B7604: +@080B7604: movs r0, 0x8 ldrsh r3, [r4, r0] lsls r3, 2 @@ -345837,7 +345837,7 @@ _080B7604: bl _call_via_r3 lsls r0, 24 cmp r0, 0 - bne _080B7604 + bne @080B7604 pop {r4-r6} pop {r0} bx r0 @@ -345846,7 +345846,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 @@ -345874,7 +345874,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 @@ -345890,13 +345890,13 @@ sub_80B7684: @ 80B7684 lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - ble _080B76B0 + ble @080B76B0 movs r0, 0 strh r0, [r4, 0xC] ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080B76B0: +@080B76B0: movs r0, 0 pop {r4} pop {r1} @@ -345904,7 +345904,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 @@ -345943,7 +345943,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 @@ -345961,33 +345961,33 @@ sub_80B7704: @ 80B7704 lsls r0, r1, 16 asrs r0, 16 cmp r0, 0x11 - bgt _080B773E + bgt @080B773E movs r0, 0x1 ands r1, r0 cmp r1, 0 - bne _080B7750 + bne @080B7750 lsls r0, r2, 16 asrs r0, 16 cmp r0, 0x3 - bgt _080B7750 + bgt @080B7750 lsls r0, r2, 1 - b _080B774E -_080B773E: + b @080B774E +@080B773E: movs r0, 0x4 ands r1, r0 cmp r1, 0 - bne _080B7750 + bne @080B7750 lsls r0, r2, 16 cmp r0, 0 - ble _080B7750 + ble @080B7750 asrs r0, 17 -_080B774E: +@080B774E: strh r0, [r4, 0xA] -_080B7750: +@080B7750: movs r1, 0xC ldrsh r0, [r4, r1] cmp r0, 0x6 - ble _080B779C + ble @080B779C adds r0, r5, 0 adds r0, 0x29 movs r1, 0 @@ -346006,7 +346006,7 @@ _080B7750: asrs r2, 16 adds r0, r2 cmn r3, r0 - ble _080B7798 + ble @080B7798 ldrh r0, [r5, 0x26] ldrh r1, [r4, 0xE] subs r0, r1 @@ -346014,27 +346014,27 @@ _080B7750: lsls r0, r1, 16 asrs r0, 16 cmp r0, 0x7 - bgt _080B779C + bgt @080B779C adds r0, r1, 0x1 strh r0, [r4, 0xE] - b _080B779C + b @080B779C .align 2, 0 .pool -_080B7798: +@080B7798: movs r0, 0x1 strh r0, [r4, 0x10] -_080B779C: +@080B779C: ldrh r2, [r4, 0x12] movs r1, 0x12 ldrsh r0, [r4, r1] cmp r0, 0 - bne _080B77DA + bne @080B77DA movs r7, 0x26 ldrsh r1, [r5, r7] movs r0, 0x10 negs r0, r0 cmp r1, r0 - bge _080B77DA + bge @080B77DA adds r0, r2, 0x1 strh r0, [r4, 0x12] ldrb r0, [r6, 0x3] @@ -346055,19 +346055,19 @@ _080B779C: movs r1, 0x80 orrs r0, r1 strb r0, [r2] -_080B77DA: +@080B77DA: movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0 - bne _080B77F0 + bne @080B77F0 movs r7, 0x10 ldrsh r0, [r4, r7] cmp r0, 0 - beq _080B77F0 + beq @080B77F0 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080B77F0: +@080B77F0: movs r0, 0 pop {r4-r7} pop {r1} @@ -346075,7 +346075,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 @@ -346090,19 +346090,19 @@ 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] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080B784C + bne @080B784C bl sub_80859A0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B784C + bne @080B784C bl warp_in ldr r1, =0x03005dac ldr r0, =mapldr_080851BC + 1 @@ -346114,7 +346114,7 @@ sub_80B7814: @ 80B7814 lsls r0, 24 lsrs r0, 24 bl remove_task -_080B784C: +@080B784C: movs r0, 0 pop {r1} bx r1 @@ -346123,7 +346123,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 @@ -346140,7 +346140,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 @@ -346151,7 +346151,7 @@ sub_80B7890: @ 80B7890 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_080B78A4: +@080B78A4: movs r0, 0x8 ldrsh r3, [r4, r0] lsls r3, 2 @@ -346173,7 +346173,7 @@ _080B78A4: bl _call_via_r3 lsls r0, 24 cmp r0, 0 - bne _080B78A4 + bne @080B78A4 pop {r4-r6} pop {r0} bx r0 @@ -346182,7 +346182,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 @@ -346207,7 +346207,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 @@ -346215,7 +346215,7 @@ sub_80B791C: @ 80B791C bl sub_80ABDFC lsls r0, 24 cmp r0, 0 - beq _080B795C + beq @080B795C ldr r1, =0x02038c08 movs r2, 0x10 ldrsh r0, [r5, r2] @@ -346238,7 +346238,7 @@ sub_80B791C: @ 80B791C ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080B795C: +@080B795C: movs r0, 0 pop {r4-r6} pop {r1} @@ -346248,7 +346248,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 @@ -346262,7 +346262,7 @@ sub_80B7968: @ 80B7968 adds r0, 0x2B ldrb r0, [r0] cmp r0, 0x1 - bls _080B79B0 + bls @080B79B0 ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] @@ -346281,7 +346281,7 @@ sub_80B7968: @ 80B7968 lsrs r1, 24 adds r0, r4, 0 bl npc_set_state_2 -_080B79B0: +@080B79B0: movs r0, 0 pop {r4} pop {r1} @@ -346291,13 +346291,13 @@ _080B79B0: thumb_func_end sub_80B7968 thumb_func_start sub_80B79BC -sub_80B79BC: @ 80B79BC +sub_80B79BC: ; 80B79BC push {lr} adds r0, r1, 0 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _080B79E6 + beq @080B79E6 ldr r1, =0x02037590 movs r0, 0 strb r0, [r1, 0x6] @@ -346308,7 +346308,7 @@ sub_80B79BC: @ 80B79BC lsls r0, 24 lsrs r0, 24 bl remove_task -_080B79E6: +@080B79E6: movs r0, 0 pop {r1} bx r1 @@ -346317,7 +346317,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 @@ -346364,7 +346364,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 @@ -346372,17 +346372,17 @@ sub_80B7A58: @ 80B7A58 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080B7A70 + beq @080B7A70 adds r0, r2, 0 movs r1, 0x32 bl oe_stop -_080B7A70: +@080B7A70: pop {r0} bx r0 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 @@ -346396,7 +346396,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 @@ -346407,7 +346407,7 @@ sub_80B7A8C: @ 80B7A8C adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_080B7AA0: +@080B7AA0: movs r0, 0x8 ldrsh r3, [r4, r0] lsls r3, 2 @@ -346429,7 +346429,7 @@ _080B7AA0: bl _call_via_r3 lsls r0, 24 cmp r0, 0 - bne _080B7AA0 + bne @080B7AA0 pop {r4-r6} pop {r0} bx r0 @@ -346438,7 +346438,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 @@ -346463,7 +346463,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 @@ -346472,12 +346472,12 @@ sub_80B7B18: @ 80B7B18 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _080B7B8C + beq @080B7B8C ldrh r1, [r5, 0xA] movs r2, 0xA ldrsh r0, [r5, r2] cmp r0, 0x3 - ble _080B7B6C + ble @080B7B6C ldr r1, =0x02038c08 movs r2, 0x10 ldrsh r0, [r4, r2] @@ -346500,10 +346500,10 @@ sub_80B7B18: @ 80B7B18 ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] - b _080B7B8C + b @080B7B8C .align 2, 0 .pool -_080B7B6C: +@080B7B6C: adds r0, r1, 0x1 strh r0, [r5, 0xA] ldrb r0, [r4, 0x18] @@ -346517,7 +346517,7 @@ _080B7B6C: bl npc_set_state_2 movs r0, 0x27 bl audio_play -_080B7B8C: +@080B7B8C: movs r0, 0 pop {r4-r6} pop {r1} @@ -346525,7 +346525,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 @@ -346539,7 +346539,7 @@ sub_80B7B94: @ 80B7B94 adds r0, 0x2B ldrb r0, [r0] cmp r0, 0x2 - bne _080B7BBE + bne @080B7BBE ldrb r0, [r4, 0x1] movs r1, 0x20 orrs r0, r1 @@ -346547,7 +346547,7 @@ sub_80B7B94: @ 80B7B94 ldrh r0, [r3, 0x8] adds r0, 0x1 strh r0, [r3, 0x8] -_080B7BBE: +@080B7BBE: movs r0, 0 pop {r4} pop {r1} @@ -346557,20 +346557,20 @@ _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 bl oe_active_list_contains lsls r0, 24 cmp r0, 0 - bne _080B7BEA + bne @080B7BEA bl music_something bl sub_80AF0B4 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080B7BEA: +@080B7BEA: movs r0, 0 pop {r4} pop {r1} @@ -346578,19 +346578,19 @@ _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] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080B7C2C + bne @080B7C2C bl sub_80859A0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B7C2C + bne @080B7C2C bl warp_in ldr r1, =0x03005dac ldr r0, =sub_80B6B68 + 1 @@ -346602,7 +346602,7 @@ sub_80B7BF4: @ 80B7BF4 lsls r0, 24 lsrs r0, 24 bl remove_task -_080B7C2C: +@080B7C2C: movs r0, 0 pop {r1} bx r1 @@ -346611,7 +346611,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 @@ -346658,7 +346658,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 @@ -346666,17 +346666,17 @@ sub_80B7CAC: @ 80B7CAC movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080B7CC4 + beq @080B7CC4 adds r0, r2, 0 movs r1, 0x31 bl oe_stop -_080B7CC4: +@080B7CC4: pop {r0} bx r0 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 @@ -346690,7 +346690,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 @@ -346714,7 +346714,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] @@ -346732,7 +346732,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 @@ -346744,15 +346744,15 @@ sub_80B7D34: @ 80B7D34 movs r2, 0x24 ldrsh r0, [r4, r2] cmp r0, 0 - beq _080B7D60 + beq @080B7D60 subs r0, r1, 0x1 strh r0, [r4, 0x24] lsls r0, 16 cmp r0, 0 - bne _080B7D60 + bne @080B7D60 bl music_something bl sub_80AF0B4 -_080B7D60: +@080B7D60: ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -346764,28 +346764,28 @@ _080B7D60: bl npc_is_visible_or_is_x40 lsls r0, 24 cmp r0, 0 - beq _080B7D86 + beq @080B7D86 adds r0, r5, 0 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _080B7E40 -_080B7D86: + beq @080B7E40 +@080B7D86: movs r1, 0x24 ldrsh r0, [r4, r1] cmp r0, 0 - bne _080B7DF8 + bne @080B7DF8 ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080B7DF8 + bne @080B7DF8 bl sub_80859A0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B7DF8 + bne @080B7DF8 ldrh r1, [r4, 0x26] lsls r1, 24 lsrs r1, 24 @@ -346803,21 +346803,21 @@ _080B7D86: lsls r0, 24 lsrs r0, 24 bl remove_task - b _080B7E40 + b @080B7E40 .align 2, 0 .pool -_080B7DF8: +@080B7DF8: ldrh r1, [r4, 0xA] movs r2, 0xA ldrsh r0, [r4, r2] cmp r0, 0 - beq _080B7E0C + beq @080B7E0C subs r0, r1, 0x1 strh r0, [r4, 0xA] lsls r0, 16 cmp r0, 0 - bne _080B7E40 -_080B7E0C: + bne @080B7E40 +@080B7E0C: ldrb r0, [r5, 0x18] lsls r0, 28 lsrs r0, 28 @@ -346833,17 +346833,17 @@ _080B7E0C: movs r2, 0xC ldrsh r0, [r4, r2] cmp r0, 0xB - bgt _080B7E34 + bgt @080B7E34 adds r0, r1, 0x1 strh r0, [r4, 0xC] -_080B7E34: +@080B7E34: ldrh r1, [r4, 0xC] lsls r1, 16 asrs r1, 18 movs r0, 0x8 asrs r0, r1 strh r0, [r4, 0xA] -_080B7E40: +@080B7E40: add sp, 0x8 pop {r4,r5} pop {r0} @@ -346851,7 +346851,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 @@ -346881,7 +346881,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 @@ -346905,13 +346905,13 @@ 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 lsls r0, 24 cmp r0, 0 - beq _080B7EE2 + beq @080B7EE2 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -346919,14 +346919,14 @@ sub_80B7EC4: @ 80B7EC4 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x26] -_080B7EE2: +@080B7EE2: pop {r4} pop {r0} bx r0 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 @@ -346945,35 +346945,35 @@ sub_80B7EE8: @ 80B7EE8 movs r2, 0xA ldrsh r0, [r5, r2] cmp r0, 0 - beq _080B7F1A + beq @080B7F1A subs r0, r1, 0x1 strh r0, [r5, 0xA] lsls r0, 16 cmp r0, 0 - bne _080B7FAC -_080B7F1A: + bne @080B7FAC +@080B7F1A: adds r0, r6, 0 bl npc_is_visible_or_is_x40 lsls r0, 24 cmp r0, 0 - beq _080B7F32 + beq @080B7F32 adds r0, r6, 0 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _080B7FC0 -_080B7F32: + beq @080B7FC0 +@080B7F32: movs r1, 0xC ldrsh r0, [r5, r1] cmp r0, 0x1F - ble _080B7F7C + ble @080B7F7C movs r2, 0x26 ldrsh r4, [r5, r2] bl player_get_direction__sp1AA lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bne _080B7F7C + bne @080B7F7C ldrb r1, [r6, 0x1] movs r0, 0x21 negs r0, r0 @@ -346986,10 +346986,10 @@ _080B7F32: lsls r0, 24 lsrs r0, 24 bl remove_task - b _080B7FC0 + b @080B7FC0 .align 2, 0 .pool -_080B7F7C: +@080B7F7C: ldrb r0, [r6, 0x18] lsls r0, 28 lsrs r0, 28 @@ -347005,15 +347005,15 @@ _080B7F7C: movs r2, 0xC ldrsh r0, [r5, r2] cmp r0, 0x1F - bgt _080B7FA4 + bgt @080B7FA4 adds r0, r1, 0x1 strh r0, [r5, 0xC] -_080B7FA4: +@080B7FA4: ldrh r0, [r5, 0xC] lsls r0, 16 asrs r0, 18 strh r0, [r5, 0xA] -_080B7FAC: +@080B7FAC: ldrb r2, [r6, 0x1] lsls r1, r2, 26 lsrs r1, 31 @@ -347024,7 +347024,7 @@ _080B7FAC: ands r0, r2 orrs r0, r1 strb r0, [r6, 0x1] -_080B7FC0: +@080B7FC0: add sp, 0x8 pop {r4-r6} pop {r0} @@ -347032,7 +347032,7 @@ _080B7FC0: thumb_func_end sub_80B7EE8 thumb_func_start sub_80B7FC8 -sub_80B7FC8: @ 80B7FC8 +sub_80B7FC8: ; 80B7FC8 push {lr} ldr r0, =sub_80B7FDC + 1 movs r1, 0 @@ -347044,7 +347044,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 @@ -347068,7 +347068,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 @@ -347087,7 +347087,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 @@ -347106,13 +347106,13 @@ sub_80B8034: @ 80B8034 movs r2, 0xA ldrsh r0, [r4, r2] cmp r0, 0 - beq _080B8066 + beq @080B8066 subs r0, r1, 0x1 strh r0, [r4, 0xA] lsls r0, 16 cmp r0, 0 - bne _080B8080 -_080B8066: + bne @080B8080 +@080B8066: ldrb r0, [r5, 0x18] lsls r0, 28 lsrs r0, 28 @@ -347125,18 +347125,18 @@ _080B8066: ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] -_080B8080: +@080B8080: movs r1, 0xC ldrsh r0, [r4, r1] cmp r0, 0x7 - ble _080B80AE + ble @080B80AE movs r2, 0x26 ldrsh r1, [r4, r2] ldrb r0, [r5, 0x18] lsls r0, 28 lsrs r0, 28 cmp r1, r0 - bne _080B80AE + bne @080B80AE ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -347148,7 +347148,7 @@ _080B8080: strh r0, [r4, 0xE] movs r0, 0x2D bl audio_play -_080B80AE: +@080B80AE: add sp, 0x8 pop {r4,r5} pop {r0} @@ -347158,7 +347158,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 @@ -347184,7 +347184,7 @@ sub_80B80C4: @ 80B80C4 strh r0, [r4, 0xA] lsls r0, 16 cmp r0, 0 - bgt _080B810E + bgt @080B810E movs r0, 0x4 strh r0, [r4, 0xA] ldrb r0, [r3, 0x18] @@ -347194,7 +347194,7 @@ sub_80B80C4: @ 80B80C4 ldrb r1, [r0] adds r0, r3, 0 bl npc_turn -_080B810E: +@080B810E: ldrh r0, [r5, 0x22] ldrh r1, [r4, 0xE] subs r0, r1 @@ -347208,20 +347208,20 @@ _080B810E: strh r0, [r4, 0xC] lsls r0, 16 cmp r0, 0 - bgt _080B813A + bgt @080B813A movs r0, 0x4 strh r0, [r4, 0xC] lsls r0, r1, 16 asrs r0, 16 cmp r0, 0x7 - bgt _080B813A + bgt @080B813A lsls r0, r1, 1 strh r0, [r4, 0xE] -_080B813A: +@080B813A: movs r1, 0x10 ldrsh r0, [r4, r1] cmp r0, 0x8 - ble _080B8168 + ble @080B8168 ldrb r1, [r5, 0x5] movs r0, 0xD negs r0, r0 @@ -347235,23 +347235,23 @@ _080B813A: movs r0, 0xC0 ands r0, r1 cmp r0, 0 - beq _080B8168 + beq @080B8168 movs r0, 0x3F ands r0, r1 movs r1, 0x80 orrs r0, r1 strb r0, [r2] -_080B8168: +@080B8168: movs r2, 0x10 ldrsh r0, [r4, r2] cmp r0, 0xA7 - ble _080B817E + ble @080B817E ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] bl music_something bl sub_80AF0B4 -_080B817E: +@080B817E: add sp, 0x8 pop {r4,r5} pop {r0} @@ -347261,7 +347261,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 @@ -347269,20 +347269,20 @@ sub_80B8198: @ 80B8198 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080B81E6 + bne @080B81E6 movs r1, 0x12 ldrsh r0, [r4, r1] cmp r0, 0 - bne _080B81B8 + bne @080B81B8 bl sub_81BE72C movs r0, 0x1 strh r0, [r4, 0x12] -_080B81B8: +@080B81B8: bl sub_80859A0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B81E6 + bne @080B81E6 bl copy_saved_warp3_bank_and_enter_x_to_warp1 bl warp_in ldr r0, =c2_load_new_map + 1 @@ -347295,7 +347295,7 @@ _080B81B8: lsls r0, 24 lsrs r0, 24 bl remove_task -_080B81E6: +@080B81E6: pop {r4} pop {r0} bx r0 @@ -347304,7 +347304,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 @@ -347335,7 +347335,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 @@ -347359,13 +347359,13 @@ 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 lsls r0, 24 cmp r0, 0 - beq _080B82F6 + beq @080B82F6 ldr r5, =0x02037590 ldrb r0, [r5, 0x4] lsls r2, r0, 4 @@ -347416,7 +347416,7 @@ sub_80B8280: @ 80B8280 strh r0, [r6, 0x26] movs r0, 0x2D bl audio_play -_080B82F6: +@080B82F6: pop {r4-r6} pop {r0} bx r0 @@ -347425,7 +347425,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 @@ -347455,12 +347455,12 @@ sub_80B830C: @ 80B830C movs r1, 0x8 negs r1, r1 cmp r0, r1 - blt _080B8384 + blt @080B8384 ldrh r1, [r4, 0x22] movs r2, 0x22 ldrsh r0, [r4, r2] cmp r0, 0 - bne _080B83AA + bne @080B83AA adds r0, r1, 0x1 strh r0, [r4, 0x22] ldrb r0, [r6] @@ -347476,10 +347476,10 @@ sub_80B830C: @ 80B830C ands r0, r2 orrs r0, r1 strb r0, [r3] - b _080B83AA + b @080B83AA .align 2, 0 .pool -_080B8384: +@080B8384: ldrb r1, [r5, 0x5] movs r0, 0xD negs r0, r0 @@ -347493,39 +347493,39 @@ _080B8384: movs r0, 0xC0 ands r0, r1 cmp r0, 0 - beq _080B83AA + beq @080B83AA movs r0, 0x3F ands r0, r1 movs r1, 0x80 orrs r0, r1 strb r0, [r2] -_080B83AA: +@080B83AA: ldrh r2, [r5, 0x26] movs r3, 0x26 ldrsh r1, [r5, r3] movs r0, 0x30 negs r0, r0 cmp r1, r0 - blt _080B83CE + blt @080B83CE ldrh r1, [r4, 0xA] movs r3, 0xA ldrsh r0, [r4, r3] cmp r0, 0x1 - ble _080B83CE + ble @080B83CE movs r0, 0x1 ands r0, r2 cmp r0, 0 - bne _080B83CE + bne @080B83CE subs r0, r1, 0x1 strh r0, [r4, 0xA] -_080B83CE: +@080B83CE: ldrh r0, [r4, 0xC] subs r0, 0x1 movs r7, 0 strh r0, [r4, 0xC] lsls r0, 16 cmp r0, 0 - bne _080B83F0 + bne @080B83F0 movs r0, 0x4 strh r0, [r4, 0xC] ldrb r0, [r6, 0x18] @@ -347535,11 +347535,11 @@ _080B83CE: ldrb r1, [r0] adds r0, r6, 0 bl npc_turn -_080B83F0: +@080B83F0: movs r1, 0x26 ldrsh r0, [r5, r1] cmp r0, 0 - blt _080B8406 + blt @080B8406 strh r7, [r5, 0x26] ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -347547,7 +347547,7 @@ _080B83F0: movs r0, 0x1 strh r0, [r4, 0xA] strh r7, [r4, 0xC] -_080B8406: +@080B8406: add sp, 0x8 pop {r4-r7} pop {r0} @@ -347555,7 +347555,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 @@ -347575,7 +347575,7 @@ sub_80B8410: @ 80B8410 strh r0, [r4, 0xA] lsls r0, 16 cmp r0, 0 - bne _080B8484 + bne @080B8484 ldrb r0, [r5, 0x18] lsls r0, 28 lsrs r0, 28 @@ -347591,14 +347591,14 @@ sub_80B8410: @ 80B8410 lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _080B8484 + ble @080B8484 movs r0, 0x24 ldrsh r1, [r4, r0] ldrb r0, [r5, 0x18] lsls r0, 28 lsrs r0, 28 cmp r1, r0 - bne _080B8484 + bne @080B8484 bl script_env_2_disable bl sub_808EE8C bl sub_809757C @@ -347607,7 +347607,7 @@ sub_80B8410: @ 80B8410 lsls r0, 24 lsrs r0, 24 bl remove_task -_080B8484: +@080B8484: add sp, 0x8 pop {r4,r5} pop {r0} @@ -347617,7 +347617,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 @@ -347626,14 +347626,14 @@ sub_80B849C: @ 80B849C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080B84BC + bne @080B84BC ldr r0, =sub_80B8554 + 1 - b _080B84BE + b @080B84BE .align 2, 0 .pool -_080B84BC: +@080B84BC: ldr r0, =sub_80B88B4 + 1 -_080B84BE: +@080B84BE: movs r1, 0xFF bl AddTask lsls r0, 24 @@ -347660,7 +347660,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] @@ -347702,7 +347702,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 @@ -347726,7 +347726,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 @@ -347772,7 +347772,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 @@ -347817,7 +347817,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] @@ -347838,19 +347838,19 @@ sub_80B8660: @ 80B8660 adds r5, r0, 0x2 lsrs r2, r1, 16 cmp r1, 0 - bge _080B868C + bge @080B868C movs r2, 0 -_080B868C: +@080B868C: lsls r0, r4, 16 asrs r0, 16 cmp r0, 0x27 - bgt _080B8696 + bgt @080B8696 movs r4, 0x28 -_080B8696: +@080B8696: cmp r5, 0x78 - ble _080B869C + ble @080B869C movs r5, 0x78 -_080B869C: +@080B869C: lsls r2, 16 asrs r2, 16 lsls r1, r2, 8 @@ -347865,11 +347865,11 @@ _080B869C: orrs r0, r1 strh r0, [r3, 0xC] cmp r2, 0 - bne _080B86DC + bne @080B86DC cmp r4, 0x28 - bne _080B86DC + bne @080B86DC cmp r1, 0x78 - bne _080B86DC + bne @080B86DC ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r3, r0] @@ -347883,7 +347883,7 @@ _080B869C: ldrh r0, [r3, 0x8] adds r0, 0x1 strh r0, [r3, 0x8] -_080B86DC: +@080B86DC: pop {r4-r7} pop {r0} bx r0 @@ -347892,7 +347892,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] @@ -347908,11 +347908,11 @@ sub_80B86EC: @ 80B86EC movs r1, 0x3C ldrsh r0, [r0, r1] cmp r0, 0 - beq _080B8712 + beq @080B8712 ldrh r0, [r3, 0x8] adds r0, 0x1 strh r0, [r3, 0x8] -_080B8712: +@080B8712: pop {r0} bx r0 .align 2, 0 @@ -347920,7 +347920,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] @@ -347939,15 +347939,15 @@ sub_80B871C: @ 80B871C lsrs r4, r1, 16 asrs r1, 16 cmp r1, 0x50 - ble _080B8744 + ble @080B8744 movs r4, 0x50 -_080B8744: +@080B8744: lsls r0, r2, 16 asrs r0, 16 cmp r0, 0x50 - bgt _080B874E + bgt @080B874E movs r2, 0x51 -_080B874E: +@080B874E: lsls r0, r4, 16 asrs r0, 16 lsls r1, r0, 8 @@ -347956,20 +347956,20 @@ _080B874E: orrs r1, r2 strh r1, [r3, 0xC] cmp r0, 0x50 - bne _080B876A + bne @080B876A cmp r2, 0x51 - bne _080B876A + bne @080B876A ldrh r0, [r3, 0x8] adds r0, 0x1 strh r0, [r3, 0x8] -_080B876A: +@080B876A: pop {r4} pop {r0} bx r0 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 @@ -348006,7 +348006,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 @@ -348043,7 +348043,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 + 1 @@ -348088,7 +348088,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 @@ -348100,7 +348100,7 @@ sub_80B8874: @ 80B8874 lsls r0, 8 adds r4, r0, 0 ldr r3, =0x0000013f -_080B888A: +@080B888A: lsls r0, r1, 1 adds r0, r5 ldrh r0, [r0] @@ -348111,7 +348111,7 @@ _080B888A: lsrs r1, r0, 16 adds r2, 0x2 cmp r1, r3 - bls _080B888A + bls @080B888A pop {r4,r5} pop {r0} bx r0 @@ -348120,7 +348120,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 @@ -348144,7 +348144,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] @@ -348171,7 +348171,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} @@ -348220,13 +348220,13 @@ 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 lsls r0, 24 cmp r0, 0 - beq _080B89C4 + beq @080B89C4 movs r0, 0x42 movs r1, 0xF0 bl lcd_io_set @@ -348246,7 +348246,7 @@ sub_80B898C: @ 80B898C ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080B89C4: +@080B89C4: adds r0, r4, 0 bl sub_80B8B28 pop {r4} @@ -348257,7 +348257,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 @@ -348271,11 +348271,11 @@ sub_80B89DC: @ 80B89DC movs r1, 0x3C ldrsh r0, [r0, r1] cmp r0, 0 - beq _080B8A00 + beq @080B8A00 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080B8A00: +@080B8A00: pop {r4} pop {r0} bx r0 @@ -348284,7 +348284,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 @@ -348312,7 +348312,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 @@ -348320,18 +348320,18 @@ sub_80B8A44: @ 80B8A44 bl sub_80B8BF0 lsls r0, 24 cmp r0, 0 - beq _080B8A5E + beq @080B8A5E ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080B8A5E: +@080B8A5E: pop {r4} pop {r0} bx r0 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 @@ -348382,7 +348382,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 + 1 @@ -348415,7 +348415,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] @@ -348426,7 +348426,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 @@ -348438,10 +348438,10 @@ sub_80B8B38: @ 80B8B38 movs r1, 0x10 ldrsh r0, [r5, r1] cmp r0, 0x1F - ble _080B8B54 + ble @080B8B54 movs r0, 0x1 - b _080B8BD8 -_080B8B54: + b @080B8BD8 +@080B8B54: ldrh r0, [r5, 0xE] lsls r0, 16 asrs r3, r0, 19 @@ -348450,7 +348450,7 @@ _080B8B54: movs r4, 0x10 ldrsh r0, [r5, r4] cmp r3, r0 - blt _080B8BD6 + blt @080B8BD6 movs r0, 0x20 subs r3, r0, r3 ands r3, r1 @@ -348476,7 +348476,7 @@ _080B8B54: mov r6, r12 adds r6, 0x1 ands r6, r0 -_080B8B98: +@080B8B98: lsls r1, r4, 5 adds r2, r1, r3 lsls r2, 1 @@ -348504,13 +348504,13 @@ _080B8B98: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x9 - bls _080B8B98 + bls @080B8B98 ldrh r0, [r5, 0x10] adds r0, 0x2 strh r0, [r5, 0x10] -_080B8BD6: +@080B8BD6: movs r0, 0 -_080B8BD8: +@080B8BD8: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -348524,16 +348524,16 @@ _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 ldrsh r0, [r5, r1] cmp r0, 0x1F - ble _080B8C00 + ble @080B8C00 movs r0, 0x1 - b _080B8C54 -_080B8C00: + b @080B8C54 +@080B8C00: ldrh r0, [r5, 0xE] lsls r0, 16 asrs r0, 19 @@ -348542,7 +348542,7 @@ _080B8C00: movs r1, 0x10 ldrsh r0, [r5, r1] cmp r2, r0 - blt _080B8C52 + blt @080B8C52 ldrh r0, [r5, 0xA] lsls r0, 16 asrs r2, r0, 19 @@ -348558,7 +348558,7 @@ _080B8C00: adds r4, r2, 0x1 movs r0, 0x1F ands r4, r0 -_080B8C30: +@080B8C30: lsls r0, r3, 5 adds r1, r0, r2 lsls r1, 1 @@ -348572,13 +348572,13 @@ _080B8C30: lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x9 - bls _080B8C30 + bls @080B8C30 ldrh r0, [r5, 0x10] adds r0, 0x2 strh r0, [r5, 0x10] -_080B8C52: +@080B8C52: movs r0, 0 -_080B8C54: +@080B8C54: pop {r4-r7} pop {r1} bx r1 @@ -348587,7 +348587,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 @@ -348633,7 +348633,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] @@ -348642,7 +348642,7 @@ sub_80B8CC0: @ 80B8CC0 lsls r0, 16 asrs r0, 16 cmp r0, 0x78 - bgt _080B8D00 + bgt @080B8D00 movs r0, 0x78 strh r0, [r1, 0x20] movs r0, 0x1E @@ -348652,26 +348652,26 @@ sub_80B8CC0: @ 80B8CC0 movs r2, 0x3A ldrsh r0, [r1, r2] cmp r0, 0 - beq _080B8CF8 + beq @080B8CF8 ldrh r0, [r1, 0x2E] movs r1, 0 movs r2, 0x7D movs r3, 0xA bl sub_80A32C0 - b _080B8D00 + b @080B8D00 .align 2, 0 .pool -_080B8CF8: +@080B8CF8: ldrh r0, [r1, 0x2E] movs r1, 0 bl cry_related -_080B8D00: +@080B8D00: pop {r0} bx r0 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] @@ -348679,10 +348679,10 @@ sub_80B8D04: @ 80B8D04 strh r0, [r1, 0x30] lsls r0, 16 cmp r0, 0 - bne _080B8D18 + bne @080B8D18 ldr r0, =sub_80B8D20 + 1 str r0, [r1, 0x1C] -_080B8D18: +@080B8D18: pop {r0} bx r0 .align 2, 0 @@ -348690,7 +348690,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] @@ -348699,21 +348699,21 @@ sub_80B8D20: @ 80B8D20 movs r0, 0x40 negs r0, r0 cmp r1, r0 - bge _080B8D38 + bge @080B8D38 movs r0, 0x1 strh r0, [r2, 0x3C] - b _080B8D3E -_080B8D38: + b @080B8D3E +@080B8D38: adds r0, r3, 0 subs r0, 0x14 strh r0, [r2, 0x20] -_080B8D3E: +@080B8D3E: pop {r0} bx r0 thumb_func_end sub_80B8D20 thumb_func_start sub_80B8D44 -sub_80B8D44: @ 80B8D44 +sub_80B8D44: ; 80B8D44 push {lr} ldr r0, =sub_80B8D84 + 1 movs r1, 0xFF @@ -348739,7 +348739,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 @@ -348763,7 +348763,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} @@ -348807,7 +348807,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 @@ -348821,13 +348821,13 @@ sub_80B8E14: @ 80B8E14 bl npc_is_visible_or_is_x40 lsls r0, 24 cmp r0, 0 - beq _080B8E3E + beq @080B8E3E adds r0, r4, 0 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _080B8E50 -_080B8E3E: + beq @080B8E50 +@080B8E3E: bl sub_808C114 adds r0, r4, 0 movs r1, 0x39 @@ -348835,7 +348835,7 @@ _080B8E3E: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] -_080B8E50: +@080B8E50: pop {r4,r5} pop {r0} bx r0 @@ -348844,7 +348844,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 @@ -348857,7 +348857,7 @@ sub_80B8E60: @ 80B8E60 bl npc_get_bit7_or_const_x10_when_inactive lsls r0, 24 cmp r0, 0 - beq _080B8E96 + beq @080B8E96 ldr r2, =0x02038c08 movs r1, 0x26 ldrsh r0, [r4, r1] @@ -348870,7 +348870,7 @@ sub_80B8E60: @ 80B8E60 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080B8E96: +@080B8E96: pop {r4} pop {r0} bx r0 @@ -348879,14 +348879,14 @@ _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 bl oe_active_list_contains lsls r0, 24 cmp r0, 0 - bne _080B8F12 + bne @080B8F12 ldr r5, =0x02037590 ldrb r0, [r5, 0x5] lsls r4, r0, 3 @@ -348926,7 +348926,7 @@ sub_80B8EA8: @ 80B8EA8 ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] -_080B8F12: +@080B8F12: pop {r4-r6} pop {r0} bx r0 @@ -348935,7 +348935,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] @@ -348948,7 +348948,7 @@ sub_80B8F24: @ 80B8F24 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _080B8F84 + beq @080B8F84 movs r0, 0 strb r0, [r5, 0x6] ldrb r1, [r5] @@ -348975,7 +348975,7 @@ sub_80B8F24: @ 80B8F24 lsls r0, 24 lsrs r0, 24 bl remove_task -_080B8F84: +@080B8F84: pop {r4,r5} pop {r0} bx r0 @@ -348984,7 +348984,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} @@ -349044,13 +349044,13 @@ sub_80B8F98: @ 80B8F98 ldr r7, =0x0600f800 ldr r0, =0x0000bff4 adds r6, r0, 0 -_080B901A: +@080B901A: movs r2, 0xC lsls r0, r4, 1 lsls r5, r4, 5 adds r0, r4 lsls r3, r0, 1 -_080B9024: +@080B9024: adds r0, r5, r2 lsls r0, 1 adds r0, r7 @@ -349062,19 +349062,19 @@ _080B9024: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x11 - bls _080B9024 + bls @080B9024 adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xE - bls _080B901A + bls @080B901A movs r0, 0 ldr r5, =0x0855b630 -_080B904A: +@080B904A: movs r4, 0 adds r7, r0, 0x1 lsls r6, r0, 5 -_080B9050: +@080B9050: lsls r1, r4, 2 adds r1, r6, r1 ldr r0, =0x06008020 @@ -349102,11 +349102,11 @@ _080B9050: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bls _080B9050 + bls @080B9050 lsls r0, r7, 24 lsrs r0, 24 cmp r0, 0x59 - bls _080B904A + bls @080B904A mov r0, r8 pop {r3} mov r8, r3 @@ -349118,7 +349118,7 @@ _080B9050: thumb_func_end sub_80B8F98 thumb_func_start sub_80B90CC -sub_80B90CC: @ 80B90CC +sub_80B90CC: ; 80B90CC push {r4,lr} ldr r0, =0x085059f8 ldr r0, [r0, 0x68] @@ -349159,7 +349159,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 @@ -349181,7 +349181,7 @@ sub_80B9128: @ 80B9128 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - beq _080B918A + beq @080B918A movs r2, 0x30 ldrsh r0, [r4, r2] lsls r1, r0, 4 @@ -349207,15 +349207,15 @@ sub_80B9128: @ 80B9128 strh r0, [r1, 0x22] strh r5, [r1, 0x24] strh r5, [r1, 0x26] -_080B918A: +@080B918A: movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0x7F - ble _080B919A + ble @080B919A adds r0, r4, 0 movs r1, 0x1E bl oe_stop -_080B919A: +@080B919A: pop {r4,r5} pop {r0} bx r0 @@ -349224,7 +349224,7 @@ _080B919A: thumb_func_end sub_80B9128 thumb_func_start sub_80B91A4 -sub_80B91A4: @ 80B91A4 +sub_80B91A4: ; 80B91A4 push {lr} ldr r0, =sub_80B91D4 + 1 movs r1, 0xFE @@ -349247,7 +349247,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 @@ -349271,7 +349271,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 @@ -349285,13 +349285,13 @@ sub_80B9204: @ 80B9204 bl npc_is_visible_or_is_x40 lsls r0, 24 cmp r0, 0 - beq _080B922E + beq @080B922E adds r0, r4, 0 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _080B924C -_080B922E: + beq @080B924C +@080B922E: ldrb r0, [r6] strh r0, [r5, 0x26] movs r0, 0x1 @@ -349304,7 +349304,7 @@ _080B922E: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] -_080B924C: +@080B924C: pop {r4-r6} pop {r0} bx r0 @@ -349313,7 +349313,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 @@ -349326,7 +349326,7 @@ sub_80B925C: @ 80B925C bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _080B928C + beq @080B928C ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -349336,7 +349336,7 @@ sub_80B925C: @ 80B925C str r0, [r1] movs r0, 0x3B bl oe_exec -_080B928C: +@080B928C: pop {r4} pop {r0} bx r0 @@ -349345,14 +349345,14 @@ _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 bl oe_active_list_contains lsls r0, 24 cmp r0, 0 - bne _080B92E8 + bne @080B92E8 ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -349364,14 +349364,14 @@ sub_80B92A0: @ 80B92A0 movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _080B92D8 + beq @080B92D8 ldrb r0, [r5, 0x1A] movs r1, 0x2 bl sub_81555AC ldrb r0, [r5, 0x1A] movs r1, 0 bl sub_81555D8 -_080B92D8: +@080B92D8: bl sub_80B94C4 lsls r0, 24 lsrs r0, 24 @@ -349379,7 +349379,7 @@ _080B92D8: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080B92E8: +@080B92E8: pop {r4,r5} pop {r0} bx r0 @@ -349388,14 +349388,14 @@ _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] bl sub_80B9508 lsls r0, 24 cmp r0, 0 - beq _080B932C + beq @080B932C ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -349412,7 +349412,7 @@ sub_80B92F8: @ 80B92F8 adds r0, r1 movs r1, 0x2 bl npc_set_state_2 -_080B932C: +@080B932C: pop {r4} pop {r0} bx r0 @@ -349421,7 +349421,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 @@ -349435,18 +349435,18 @@ sub_80B933C: @ 80B933C movs r3, 0xC ldrsh r0, [r4, r3] cmp r0, 0 - beq _080B9362 + beq @080B9362 subs r0, r1, 0x1 strh r0, [r4, 0xC] lsls r0, 16 cmp r0, 0 - bne _080B9380 -_080B9362: + bne @080B9380 +@080B9362: adds r0, r2, 0 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _080B9380 + beq @080B9380 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -349454,7 +349454,7 @@ _080B9362: bl audio_play ldrb r0, [r4, 0xA] bl sub_80B9524 -_080B9380: +@080B9380: pop {r4} pop {r0} bx r0 @@ -349463,7 +349463,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] @@ -349472,7 +349472,7 @@ sub_80B9390: @ 80B9390 lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - ble _080B9406 + ble @080B9406 ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -349506,20 +349506,20 @@ sub_80B9390: @ 80B9390 movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _080B93FC + beq @080B93FC ldrb r1, [r4, 0x1A] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r6 bl obj_delete_and_free_tiles -_080B93FC: +@080B93FC: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] movs r0, 0 strh r0, [r5, 0xC] -_080B9406: +@080B9406: pop {r4-r6} pop {r0} bx r0 @@ -349528,7 +349528,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] @@ -349537,7 +349537,7 @@ sub_80B9418: @ 80B9418 lsls r0, 16 asrs r0, 16 cmp r0, 0x9 - ble _080B9464 + ble @080B9464 ldr r0, =0x02037590 ldrb r0, [r0, 0x5] lsls r4, r0, 3 @@ -349564,7 +349564,7 @@ sub_80B9418: @ 80B9418 ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] -_080B9464: +@080B9464: pop {r4,r5} pop {r0} bx r0 @@ -349573,33 +349573,33 @@ _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] bl sub_80B9508 lsls r0, 24 cmp r0, 0 - beq _080B948E + beq @080B948E bl sub_80AF0B4 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080B948E: +@080B948E: pop {r4} pop {r0} bx r0 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] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080B94B6 + bne @080B94B6 movs r0, 0x1F bl oe_active_list_remove ldr r0, =sub_80B91D4 + 1 @@ -349607,7 +349607,7 @@ sub_80B9494: @ 80B9494 lsls r0, 24 lsrs r0, 24 bl remove_task -_080B94B6: +@080B94B6: pop {r0} bx r0 .align 2, 0 @@ -349615,7 +349615,7 @@ _080B94B6: thumb_func_end sub_80B9494 thumb_func_start sub_80B94C4 -sub_80B94C4: @ 80B94C4 +sub_80B94C4: ; 80B94C4 push {lr} ldr r0, =0x085059f8 ldr r0, [r0, 0x68] @@ -349648,7 +349648,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 @@ -349665,7 +349665,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 @@ -349696,7 +349696,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 @@ -349713,17 +349713,17 @@ 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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _080B9628 + bne @080B9628 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - bne _080B95C0 + bne @080B95C0 ldrb r0, [r4, 0x1] movs r1, 0x3 orrs r0, r1 @@ -349746,7 +349746,7 @@ sub_80B957C: @ 80B957C strh r0, [r4, 0x30] adds r0, 0xC0 strh r0, [r4, 0x32] -_080B95C0: +@080B95C0: ldrh r0, [r4, 0x32] lsls r0, 16 asrs r0, 24 @@ -349768,15 +349768,15 @@ _080B95C0: ldrsh r1, [r4, r0] ldr r0, =0x000007ff cmp r1, r0 - bgt _080B95F6 + bgt @080B95F6 adds r0, r2, 0 adds r0, 0x60 strh r0, [r4, 0x32] -_080B95F6: +@080B95F6: movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0x81 - ble _080B9628 + ble @080B9628 ldrh r0, [r4, 0x3C] adds r0, 0x1 strh r0, [r4, 0x3C] @@ -349796,7 +349796,7 @@ _080B95F6: adds r0, r4, 0 movs r3, 0 bl oam_center -_080B9628: +@080B9628: pop {r4} pop {r0} bx r0 @@ -349805,7 +349805,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 @@ -349827,7 +349827,7 @@ sub_80B963C: @ 80B963C movs r1, 0x3A ldrsh r0, [r4, r1] cmp r0, 0x40 - beq _080B969A + beq @080B969A lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -349851,14 +349851,14 @@ sub_80B963C: @ 80B963C strh r0, [r1, 0x22] strh r5, [r1, 0x24] strh r5, [r1, 0x26] -_080B969A: +@080B969A: movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0x7F - ble _080B96A6 + ble @080B96A6 movs r0, 0x1 strh r0, [r4, 0x3C] -_080B96A6: +@080B96A6: pop {r4,r5} pop {r0} bx r0 @@ -349867,17 +349867,17 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _080B9784 + bne @080B9784 movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0 - bne _080B96FA + bne @080B96FA ldrb r0, [r4, 0x1] movs r1, 0x3 orrs r0, r1 @@ -349903,7 +349903,7 @@ sub_80B96B0: @ 80B96B0 strh r0, [r4, 0x32] movs r0, 0x80 strh r0, [r4, 0x36] -_080B96FA: +@080B96FA: ldrh r1, [r4, 0x32] lsls r1, 16 asrs r1, 24 @@ -349931,30 +349931,30 @@ _080B96FA: movs r2, 0x80 lsls r2, 1 cmp r0, r2 - ble _080B973C + ble @080B973C ldrh r0, [r4, 0x36] subs r0, r1, r0 strh r0, [r4, 0x32] -_080B973C: +@080B973C: ldrh r1, [r4, 0x36] movs r3, 0x36 ldrsh r0, [r4, r3] cmp r0, 0xFF - bgt _080B974C + bgt @080B974C adds r0, r1, 0 adds r0, 0x18 strh r0, [r4, 0x36] -_080B974C: +@080B974C: movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0xFF - bgt _080B9756 + bgt @080B9756 strh r2, [r4, 0x32] -_080B9756: +@080B9756: movs r2, 0x34 ldrsh r0, [r4, r2] cmp r0, 0x3B - ble _080B9784 + ble @080B9784 ldrh r0, [r4, 0x3C] adds r0, 0x1 strh r0, [r4, 0x3C] @@ -349973,7 +349973,7 @@ _080B9756: movs r1, 0x4 orrs r0, r1 strb r0, [r2] -_080B9784: +@080B9784: pop {r4} pop {r0} bx r0 @@ -349982,7 +349982,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 @@ -350005,7 +350005,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 + 1 movs r1, 0xFE @@ -350018,7 +350018,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 @@ -350042,7 +350042,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 @@ -350056,13 +350056,13 @@ sub_80B9804: @ 80B9804 bl npc_is_visible_or_is_x40 lsls r0, 24 cmp r0, 0 - beq _080B982E + beq @080B982E adds r0, r4, 0 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _080B98A6 -_080B982E: + beq @080B98A6 +@080B982E: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] @@ -350077,11 +350077,11 @@ _080B982E: movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _080B9856 + beq @080B9856 ldrb r0, [r4, 0x1A] movs r1, 0 bl sub_81555AC -_080B9856: +@080B9856: movs r0, 0x3 bl sub_808BD8C adds r1, r0, 0 @@ -350114,7 +350114,7 @@ _080B9856: ldrb r0, [r5, 0xA] ldrb r1, [r4, 0x4] bl sub_80B9560 -_080B98A6: +@080B98A6: pop {r4-r6} pop {r0} bx r0 @@ -350123,20 +350123,20 @@ _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] movs r2, 0xC ldrsh r0, [r5, r2] cmp r0, 0 - beq _080B98D0 + beq @080B98D0 subs r0, r1, 0x1 strh r0, [r5, 0xC] lsls r0, 16 cmp r0, 0 - bne _080B9910 -_080B98D0: + bne @080B9910 +@080B98D0: ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -350168,7 +350168,7 @@ _080B98D0: adds r0, 0x1 strh r0, [r5, 0x8] strh r1, [r5, 0xC] -_080B9910: +@080B9910: pop {r4,r5} pop {r0} bx r0 @@ -350177,7 +350177,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 @@ -350204,11 +350204,11 @@ sub_80B9924: @ 80B9924 lsls r0, 16 asrs r0, 16 cmp r0, 0x11 - ble _080B9962 + ble @080B9962 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080B9962: +@080B9962: add sp, 0x24 pop {r4} pop {r0} @@ -350218,14 +350218,14 @@ _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] bl sub_80B9508 lsls r0, 24 cmp r0, 0 - beq _080B99DC + beq @080B99DC ldr r0, =0x02037590 ldrb r0, [r0, 0x5] lsls r5, r0, 3 @@ -350265,7 +350265,7 @@ sub_80B9978: @ 80B9978 ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] -_080B99DC: +@080B99DC: pop {r4-r6} pop {r0} bx r0 @@ -350274,7 +350274,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 @@ -350287,13 +350287,13 @@ sub_80B99F0: @ 80B99F0 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _080B9A18 + beq @080B9A18 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] ldrb r0, [r4, 0xA] bl sub_80B9794 -_080B9A18: +@080B9A18: pop {r4} pop {r0} bx r0 @@ -350302,14 +350302,14 @@ _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] bl sub_80B9508 lsls r0, 24 cmp r0, 0 - beq _080B9A54 + beq @080B9A54 movs r0, 0xA ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -350323,7 +350323,7 @@ sub_80B9A28: @ 80B9A28 strh r0, [r4, 0x8] movs r0, 0x10 strh r0, [r4, 0xA] -_080B9A54: +@080B9A54: pop {r4} pop {r0} bx r0 @@ -350332,7 +350332,7 @@ _080B9A54: thumb_func_end sub_80B9A28 thumb_func_start fishE -fishE: @ 80B9A60 +fishE: ; 80B9A60 push {r4-r7,lr} adds r5, r0, 0 ldrh r0, [r5, 0xA] @@ -350340,7 +350340,7 @@ fishE: @ 80B9A60 strh r0, [r5, 0xA] lsls r0, 16 cmp r0, 0 - bne _080B9ACA + bne @080B9ACA ldr r6, =0x02037590 ldrb r1, [r6, 0x5] lsls r0, r1, 3 @@ -350353,12 +350353,12 @@ fishE: @ 80B9A60 movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _080B9A94 + beq @080B9A94 movs r7, 0x3 ldrb r0, [r4, 0x1A] movs r1, 0x1 bl sub_81555AC -_080B9A94: +@080B9A94: adds r0, r7, 0 bl sub_808BD8C adds r1, r0, 0 @@ -350380,7 +350380,7 @@ _080B9A94: lsls r0, 24 lsrs r0, 24 bl remove_task -_080B9ACA: +@080B9ACA: pop {r4-r7} pop {r0} bx r0 @@ -350389,7 +350389,7 @@ _080B9ACA: thumb_func_end fishE thumb_func_start sub_80B9ADC -sub_80B9ADC: @ 80B9ADC +sub_80B9ADC: ; 80B9ADC push {r4,lr} sub sp, 0x4 ldr r4, =0x02038c08 @@ -350400,7 +350400,7 @@ sub_80B9ADC: @ 80B9ADC bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _080B9B2C + bne @080B9B2C ldr r0, =sub_80B9BE8 + 1 movs r1, 0x50 bl AddTask @@ -350420,13 +350420,13 @@ sub_80B9ADC: @ 80B9ADC strh r0, [r1, 0x16] ldr r0, [r4, 0x8] strh r0, [r1, 0x18] - b _080B9B32 + b @080B9B32 .align 2, 0 .pool -_080B9B2C: +@080B9B2C: movs r0, 0x41 bl oe_active_list_remove -_080B9B32: +@080B9B32: movs r0, 0 add sp, 0x4 pop {r4} @@ -350435,7 +350435,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 @@ -350447,37 +350447,37 @@ sub_80B9B3C: @ 80B9B3C movs r1, 0xE ldrsh r0, [r4, r1] cmp r0, 0 - beq _080B9B78 + beq @080B9B78 ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - ble _080B9B7C + ble @080B9B7C movs r0, 0 strh r0, [r4, 0xC] ldrh r1, [r4, 0xA] movs r2, 0xA ldrsh r0, [r4, r2] cmp r0, 0 - beq _080B9B7C + beq @080B9B7C subs r0, r1, 0x1 - b _080B9B7A + b @080B9B7A .align 2, 0 .pool -_080B9B78: +@080B9B78: movs r0, 0x4 -_080B9B7A: +@080B9B7A: strh r0, [r4, 0xA] -_080B9B7C: +@080B9B7C: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _080B9BB6 + ble @080B9BB6 movs r0, 0 strh r0, [r4] ldrh r0, [r4, 0x2] @@ -350486,35 +350486,35 @@ _080B9B7C: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _080B9BAC + beq @080B9BAC ldrh r1, [r4, 0xA] negs r1, r1 lsls r1, 16 asrs r1, 16 movs r0, 0 bl sub_808A2CC - b _080B9BB6 -_080B9BAC: + b @080B9BB6 +@080B9BAC: movs r0, 0xA ldrsh r1, [r4, r0] movs r0, 0 bl sub_808A2CC -_080B9BB6: +@080B9BB6: bl sub_808A314 movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0 - bne _080B9BC8 + bne @080B9BC8 adds r0, r5, 0 bl remove_task -_080B9BC8: +@080B9BC8: pop {r4,r5} pop {r0} bx r0 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 @@ -350530,7 +350530,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 @@ -350560,7 +350560,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 + 1 @@ -350583,7 +350583,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 @@ -350593,7 +350593,7 @@ sub_80B9C54: @ 80B9C54 lsls r0, 16 asrs r0, 16 cmp r0, 0x78 - ble _080B9CC2 + ble @080B9CC2 ldr r2, =0x02037350 movs r1, 0x4 ldrsh r0, [r7, r1] @@ -350634,7 +350634,7 @@ sub_80B9C54: @ 80B9C54 ldrh r0, [r7, 0x2] adds r0, 0x1 strh r0, [r7, 0x2] -_080B9CC2: +@080B9CC2: add sp, 0x4 pop {r4-r7} pop {r0} @@ -350644,7 +350644,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 @@ -350654,12 +350654,12 @@ sub_80B9CDC: @ 80B9CDC movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080B9D16 + bne @080B9D16 ldr r0, =sub_80B9B3C + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _080B9D16 + bne @080B9D16 bl sub_808A2E4 ldrb r0, [r4, 0xC] ldrb r1, [r4, 0xE] @@ -350669,7 +350669,7 @@ sub_80B9CDC: @ 80B9CDC bl oe_active_list_remove adds r0, r5, 0 bl remove_task -_080B9D16: +@080B9D16: pop {r4,r5} pop {r0} bx r0 @@ -350678,7 +350678,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} @@ -350706,7 +350706,7 @@ sub_80B9D24: @ 80B9D24 lsls r2, 16 mov r8, r2 lsls r7, r0, 16 -_080B9D5A: +@080B9D5A: ldr r0, =0x0855c5ec mov r2, r8 asrs r1, r2, 16 @@ -350716,7 +350716,7 @@ _080B9D5A: lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _080B9D96 + beq @080B9D96 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -350735,10 +350735,10 @@ _080B9D5A: ands r0, r2 orrs r0, r1 strb r0, [r4, 0x5] -_080B9D96: +@080B9D96: adds r5, 0x1 cmp r5, 0x3 - ble _080B9D5A + ble @080B9D5A pop {r3} mov r8, r3 pop {r4-r7} @@ -350749,76 +350749,76 @@ _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 ldrsh r0, [r1, r2] cmp r0, 0x1 - beq _080B9DE4 + beq @080B9DE4 cmp r0, 0x1 - bgt _080B9DCE + bgt @080B9DCE cmp r0, 0 - beq _080B9DD8 - b _080B9E02 -_080B9DCE: + beq @080B9DD8 + b @080B9E02 +@080B9DCE: cmp r0, 0x2 - beq _080B9DF0 + beq @080B9DF0 cmp r0, 0x3 - beq _080B9DF6 - b _080B9E02 -_080B9DD8: + beq @080B9DF6 + b @080B9E02 +@080B9DD8: ldrh r0, [r1, 0x20] subs r0, 0x10 strh r0, [r1, 0x20] ldrh r0, [r1, 0x22] subs r0, 0xC - b _080B9E00 -_080B9DE4: + b @080B9E00 +@080B9DE4: ldrh r0, [r1, 0x20] adds r0, 0x10 strh r0, [r1, 0x20] ldrh r0, [r1, 0x22] subs r0, 0xC - b _080B9E00 -_080B9DF0: + b @080B9E00 +@080B9DF0: ldrh r0, [r1, 0x20] subs r0, 0x10 - b _080B9DFA -_080B9DF6: + b @080B9DFA +@080B9DF6: ldrh r0, [r1, 0x20] adds r0, 0x10 -_080B9DFA: +@080B9DFA: strh r0, [r1, 0x20] ldrh r0, [r1, 0x22] adds r0, 0xC -_080B9E00: +@080B9E00: strh r0, [r1, 0x22] -_080B9E02: +@080B9E02: ldrh r0, [r1, 0x20] adds r0, 0x4 lsls r0, 16 lsrs r0, 16 cmp r0, 0xF8 - bhi _080B9E1E + bhi @080B9E1E movs r0, 0x22 ldrsh r2, [r1, r0] movs r0, 0x4 negs r0, r0 cmp r2, r0 - blt _080B9E1E + blt @080B9E1E cmp r2, 0xA4 - ble _080B9E24 -_080B9E1E: + ble @080B9E24 +@080B9E1E: adds r0, r1, 0 bl obj_delete_and_free_tiles -_080B9E24: +@080B9E24: pop {r0} bx r0 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 @@ -350829,7 +350829,7 @@ sub_80B9E28: @ 80B9E28 bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _080B9EBE + bne @080B9EBE mov r0, sp ldrb r0, [r0] lsls r4, r0, 3 @@ -350891,7 +350891,7 @@ sub_80B9E28: @ 80B9E28 mov r0, sp ldrb r0, [r0] strh r0, [r2, 0x1A] -_080B9EBE: +@080B9EBE: movs r0, 0 add sp, 0x4 pop {r4-r7} @@ -350902,7 +350902,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 @@ -350921,13 +350921,13 @@ sub_80B9EDC: @ 80B9EDC movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0 - beq _080B9F10 + beq @080B9F10 cmp r0, 0x1 - beq _080B9F4E - b _080B9FAC + beq @080B9F4E + b @080B9FAC .align 2, 0 .pool -_080B9F10: +@080B9F10: ldrh r0, [r6, 0x20] lsls r0, 4 strh r0, [r5, 0x8] @@ -350957,12 +350957,12 @@ _080B9F10: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] -_080B9F4E: +@080B9F4E: ldrh r1, [r5, 0x10] movs r2, 0x10 ldrsh r0, [r5, r2] cmp r0, 0 - beq _080B9F7C + beq @080B9F7C subs r0, r1, 0x1 strh r0, [r5, 0x10] ldrh r1, [r5, 0xC] @@ -350980,8 +350980,8 @@ _080B9F4E: lsls r0, 16 asrs r0, 20 strh r0, [r6, 0x22] - b _080B9FAC -_080B9F7C: + b @080B9FAC +@080B9F7C: movs r1, 0x12 ldrsh r0, [r5, r1] lsls r4, r0, 3 @@ -351003,7 +351003,7 @@ _080B9F7C: bl oe_active_list_remove adds r0, r7, 0 bl remove_task -_080B9FAC: +@080B9FAC: pop {r4-r7} pop {r0} bx r0 @@ -351012,7 +351012,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 @@ -351029,11 +351029,11 @@ remove_some_task: @ 80B9FB8 ldrh r0, [r1, 0xA] ldrb r0, [r4, 0x18] cmp r0, 0xFF - beq _080B9FE2 + beq @080B9FE2 bl remove_task movs r0, 0xFF strb r0, [r4, 0x18] -_080B9FE2: +@080B9FE2: pop {r4} pop {r0} bx r0 @@ -351042,7 +351042,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 @@ -351072,7 +351072,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] @@ -351080,7 +351080,7 @@ sub_80BA038: @ 80BA038 str r2, [sp, 0x8] ldr r0, =0xa2600001 cmp r1, r0 - bne _080BA06C + bne @080BA06C ldr r0, =0x02039b28 ldr r1, =0x02038c2a str r1, [r0] @@ -351089,10 +351089,10 @@ sub_80BA038: @ 80BA038 adds r1, r2 str r1, [r0, 0x4] ldr r1, =sub_80BA134 + 1 - b _080BA07C + b @080BA07C .align 2, 0 .pool -_080BA06C: +@080BA06C: ldr r0, =0x02039b28 ldr r1, =0x02038c2c str r1, [r0] @@ -351101,7 +351101,7 @@ _080BA06C: adds r1, r2 str r1, [r0, 0x4] ldr r1, =sub_80BA154 + 1 -_080BA07C: +@080BA07C: str r1, [r0, 0x10] adds r1, r0, 0 ldr r0, [sp, 0x4] @@ -351123,14 +351123,14 @@ _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] cmp r0, 0 - beq _080BA122 + beq @080BA122 cmp r0, 0x3 - bne _080BA0EC + bne @080BA0EC movs r0, 0 strb r0, [r4, 0x15] ldr r1, =0x040000b0 @@ -351146,10 +351146,10 @@ sub_80BA0A8: @ 80BA0A8 ldr r1, =0x02039b44 movs r0, 0x1 strb r0, [r1] - b _080BA122 + b @080BA122 .align 2, 0 .pool -_080BA0EC: +@080BA0EC: ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] ldr r0, =0x0000c5ff @@ -351176,7 +351176,7 @@ _080BA0EC: movs r1, 0x1 eors r0, r1 strb r0, [r4, 0x14] -_080BA122: +@080BA122: pop {r4} pop {r0} bx r0 @@ -351185,7 +351185,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] @@ -351202,7 +351202,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] @@ -351219,7 +351219,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 @@ -351232,16 +351232,16 @@ task00_for_dp12: @ 80BA174 ldr r0, =0x02039b44 ldrb r0, [r0] cmp r0, 0 - beq _080BA1A4 + beq @080BA1A4 mov r0, r12 bl remove_task ldr r1, =0x02039b28 movs r0, 0xFF strb r0, [r1, 0x18] - b _080BA324 + b @080BA324 .align 2, 0 .pool -_080BA1A4: +@080BA1A4: ldr r1, =0x03005e00 mov r0, r12 lsls r2, r0, 2 @@ -351253,75 +351253,75 @@ _080BA1A4: mov r10, r1 mov r9, r2 cmp r0, 0 - beq _080BA250 + beq @080BA250 movs r1, 0x14 ldrsh r0, [r3, r1] cmp r0, 0xE - bhi _080BA250 + bhi @080BA250 lsls r0, 2 - ldr r1, =_080BA1D8 + ldr r1, =@080BA1D8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080BA1D8: - .4byte _080BA214 - .4byte _080BA250 - .4byte _080BA21C - .4byte _080BA250 - .4byte _080BA224 - .4byte _080BA250 - .4byte _080BA22C - .4byte _080BA250 - .4byte _080BA234 - .4byte _080BA250 - .4byte _080BA23C - .4byte _080BA250 - .4byte _080BA244 - .4byte _080BA250 - .4byte _080BA24C -_080BA214: +@080BA1D8: + .4byte @080BA214 + .4byte @080BA250 + .4byte @080BA21C + .4byte @080BA250 + .4byte @080BA224 + .4byte @080BA250 + .4byte @080BA22C + .4byte @080BA250 + .4byte @080BA234 + .4byte @080BA250 + .4byte @080BA23C + .4byte @080BA250 + .4byte @080BA244 + .4byte @080BA250 + .4byte @080BA24C +@080BA214: ldr r0, =0x02022e14 - b _080BA24E + b @080BA24E .align 2, 0 .pool -_080BA21C: +@080BA21C: ldr r0, =0x02022e16 - b _080BA24E + b @080BA24E .align 2, 0 .pool -_080BA224: +@080BA224: ldr r0, =0x02022e18 - b _080BA24E + b @080BA24E .align 2, 0 .pool -_080BA22C: +@080BA22C: ldr r0, =0x02022e1a - b _080BA24E + b @080BA24E .align 2, 0 .pool -_080BA234: +@080BA234: ldr r0, =0x02022e1c - b _080BA24E + b @080BA24E .align 2, 0 .pool -_080BA23C: +@080BA23C: ldr r0, =0x02022e1e - b _080BA24E + b @080BA24E .align 2, 0 .pool -_080BA244: +@080BA244: ldr r0, =0x02022e20 - b _080BA24E + b @080BA24E .align 2, 0 .pool -_080BA24C: +@080BA24C: ldr r0, =0x02022e22 -_080BA24E: +@080BA24E: ldrh r6, [r0] -_080BA250: +@080BA250: mov r0, r9 add r0, r12 lsls r0, 3 @@ -351331,7 +351331,7 @@ _080BA250: movs r3, 0x10 ldrsh r0, [r1, r3] cmp r0, 0 - beq _080BA2BC + beq @080BA2BC subs r0, r2, 0x1 strh r0, [r1, 0x10] movs r4, 0xE @@ -351344,14 +351344,14 @@ _080BA250: movs r4, 0xA ldrsh r0, [r1, r4] cmp r3, r0 - bge _080BA324 + bge @080BA324 ldr r5, =0x02038c28 ldr r0, =0x02039b28 mov r8, r0 adds r7, r1, 0 lsls r0, r2, 1 adds r4, r0, r5 -_080BA28A: +@080BA28A: lsls r2, r3, 1 mov r0, r8 ldrb r1, [r0, 0x14] @@ -351368,11 +351368,11 @@ _080BA28A: movs r1, 0xA ldrsh r0, [r7, r1] cmp r3, r0 - blt _080BA28A - b _080BA324 + blt @080BA28A + b @080BA324 .align 2, 0 .pool -_080BA2BC: +@080BA2BC: ldrh r0, [r1, 0x12] strh r0, [r1, 0x10] movs r2, 0xE @@ -351385,14 +351385,14 @@ _080BA2BC: movs r4, 0xA ldrsh r0, [r1, r4] cmp r3, r0 - bge _080BA304 + bge @080BA304 ldr r5, =0x02038c28 adds r7, r1, 0 lsls r0, r2, 1 adds r4, r0, r5 ldr r0, =0x02039b28 mov r8, r0 -_080BA2E2: +@080BA2E2: lsls r2, r3, 1 mov r0, r8 ldrb r1, [r0, 0x14] @@ -351409,8 +351409,8 @@ _080BA2E2: movs r1, 0xA ldrsh r0, [r7, r1] cmp r3, r0 - blt _080BA2E2 -_080BA304: + blt @080BA2E2 +@080BA304: mov r0, r9 add r0, r12 lsls r0, 3 @@ -351424,10 +351424,10 @@ _080BA304: movs r4, 0xC ldrsh r1, [r2, r4] cmp r0, r1 - bne _080BA324 + bne @080BA324 movs r0, 0 strh r0, [r2, 0xE] -_080BA324: +@080BA324: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -351440,7 +351440,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 @@ -351451,7 +351451,7 @@ sub_80BA33C: @ 80BA33C movs r2, 0 ldr r0, =0x08329f40 mov r12, r0 -_080BA350: +@080BA350: lsls r0, r1, 1 adds r3, r0, r6 lsls r0, r2, 1 @@ -351460,9 +351460,9 @@ _080BA350: ldrsh r0, [r0, r7] muls r0, r4 cmp r0, 0 - bge _080BA364 + bge @080BA364 adds r0, 0xFF -_080BA364: +@080BA364: asrs r0, 8 strh r0, [r3] adds r0, r2, r5 @@ -351472,7 +351472,7 @@ _080BA364: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0xFF - bls _080BA350 + bls @080BA350 pop {r4-r7} pop {r0} bx r0 @@ -351481,7 +351481,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 @@ -351581,7 +351581,7 @@ sub_80BA384: @ 80BA384 bl sub_80BA33C ldr r0, [sp, 0xC] cmp r5, r0 - bge _080BA47E + bge @080BA47E ldr r1, =0xfffffd80 adds r2, r4, r1 lsls r1, r5, 1 @@ -351592,7 +351592,7 @@ sub_80BA384: @ 80BA384 adds r1, r2 adds r2, r4, 0 adds r5, r6, 0 -_080BA46A: +@080BA46A: ldrh r0, [r2] strh r0, [r1] ldrh r0, [r2] @@ -351602,8 +351602,8 @@ _080BA46A: adds r1, 0x2 subs r5, 0x1 cmp r5, 0 - bne _080BA46A -_080BA47E: + bne @080BA46A +@080BA47E: adds r0, r7, 0 add sp, 0x20 pop {r3-r5} @@ -351618,7 +351618,7 @@ _080BA47E: thumb_func_end sub_80BA384 thumb_func_start sub_80BA4B0 -sub_80BA4B0: @ 80BA4B0 +sub_80BA4B0: ; 80BA4B0 push {lr} bl run_active_tasks bl call_obj_callbacks @@ -351629,7 +351629,7 @@ sub_80BA4B0: @ 80BA4B0 thumb_func_end sub_80BA4B0 thumb_func_start sub_80BA4C8 -sub_80BA4C8: @ 80BA4C8 +sub_80BA4C8: ; 80BA4C8 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -351639,7 +351639,7 @@ sub_80BA4C8: @ 80BA4C8 thumb_func_end sub_80BA4C8 thumb_func_start c2_options_menu -c2_options_menu: @ 80BA4DC +c2_options_menu: ; 80BA4DC push {r4-r7,lr} mov r7, r8 push {r7} @@ -351651,39 +351651,39 @@ c2_options_menu: @ 80BA4DC ldrb r0, [r0] adds r2, r1, 0 cmp r0, 0xB - bhi _080BA538 + bhi @080BA538 lsls r0, 2 - ldr r1, =_080BA508 + ldr r1, =@080BA508 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080BA508: - .4byte _080BA538 - .4byte _080BA54C - .4byte _080BA69C - .4byte _080BA6BC - .4byte _080BA6E0 - .4byte _080BA718 - .4byte _080BA728 - .4byte _080BA740 - .4byte _080BA748 - .4byte _080BA760 - .4byte _080BA774 - .4byte _080BA80C -_080BA538: +@080BA508: + .4byte @080BA538 + .4byte @080BA54C + .4byte @080BA69C + .4byte @080BA6BC + .4byte @080BA6E0 + .4byte @080BA718 + .4byte @080BA728 + .4byte @080BA740 + .4byte @080BA748 + .4byte @080BA760 + .4byte @080BA774 + .4byte @080BA80C +@080BA538: movs r0, 0 bl SetVBlankCallback ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _080BA7F4 + b @080BA7F4 .align 2, 0 .pool -_080BA54C: +@080BA54C: movs r3, 0xC0 lsls r3, 19 movs r4, 0xC0 @@ -351699,7 +351699,7 @@ _080BA54C: movs r0, 0x81 lsls r0, 24 mov r12, r0 -_080BA56A: +@080BA56A: strh r6, [r2] add r0, sp, 0x4 str r0, [r1] @@ -351709,7 +351709,7 @@ _080BA56A: adds r3, r5 subs r4, r5 cmp r4, r5 - bhi _080BA56A + bhi @080BA56A strh r6, [r2] add r2, sp, 0x4 str r2, [r1] @@ -351820,10 +351820,10 @@ _080BA56A: bl gpu_sync_bg_show movs r0, 0x1 bl gpu_sync_bg_show - b _080BA7EC + b @080BA7EC .align 2, 0 .pool -_080BA69C: +@080BA69C: bl sub_80A1A74 bl remove_some_task bl clear_tasks @@ -351832,10 +351832,10 @@ _080BA69C: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _080BA7F4 + b @080BA7F4 .align 2, 0 .pool -_080BA6BC: +@080BA6BC: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x14] @@ -351848,10 +351848,10 @@ _080BA6BC: lsls r3, 1 movs r0, 0x1 bl gpu_copy_bg_tile_pattern_data_to_vram - b _080BA7EC + b @080BA7EC .align 2, 0 .pool -_080BA6E0: +@080BA6E0: ldr r0, =0x0855c6a0 movs r1, 0 movs r2, 0x2 @@ -351869,18 +351869,18 @@ _080BA6E0: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _080BA7F4 + b @080BA7F4 .align 2, 0 .pool -_080BA718: +@080BA718: ldr r0, =0x0855c604 movs r1, 0x10 movs r2, 0x20 bl gpu_pal_apply - b _080BA7EC + b @080BA7EC .align 2, 0 .pool -_080BA728: +@080BA728: movs r0, 0 bl Window_WriteStandardTileMap bl sub_80BB0D0 @@ -351888,15 +351888,15 @@ _080BA728: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _080BA7F4 + b @080BA7F4 .align 2, 0 .pool -_080BA740: +@080BA740: movs r0, 0x87 lsls r0, 3 adds r1, r2, r0 - b _080BA7F4 -_080BA748: + b @080BA7F4 +@080BA748: movs r0, 0x1 bl Window_WriteStandardTileMap bl sub_80BB104 @@ -351907,16 +351907,16 @@ _080BA748: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_080BA760: +@080BA760: bl sub_80BB154 ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _080BA7F4 + b @080BA7F4 .align 2, 0 .pool -_080BA774: +@080BA774: ldr r0, =sub_80BA83C + 1 movs r1, 0 bl AddTask @@ -351968,19 +351968,19 @@ _080BA774: movs r0, 0x1 movs r1, 0x3 bl Window_CopyToVram -_080BA7EC: +@080BA7EC: ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 -_080BA7F4: +@080BA7F4: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080BA828 + b @080BA828 .align 2, 0 .pool -_080BA80C: +@080BA80C: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -351992,7 +351992,7 @@ _080BA80C: bl SetVBlankCallback ldr r0, =sub_80BA4B0 + 1 bl set_callback2 -_080BA828: +@080BA828: add sp, 0xC pop {r3} mov r8, r3 @@ -352004,7 +352004,7 @@ _080BA828: thumb_func_end c2_options_menu thumb_func_start sub_80BA83C -sub_80BA83C: @ 80BA83C +sub_80BA83C: ; 80BA83C push {lr} lsls r0, 24 lsrs r2, r0, 24 @@ -352013,7 +352013,7 @@ sub_80BA83C: @ 80BA83C movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080BA85C + bne @080BA85C ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -352021,7 +352021,7 @@ sub_80BA83C: @ 80BA83C adds r1, r0 ldr r0, =sub_80BA86C + 1 str r0, [r1] -_080BA85C: +@080BA85C: pop {r0} bx r0 .align 2, 0 @@ -352029,7 +352029,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 @@ -352038,7 +352038,7 @@ sub_80BA86C: @ 80BA86C movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080BA89C + beq @080BA89C ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -352047,35 +352047,35 @@ sub_80BA86C: @ 80BA86C movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0x6 - beq _080BA892 - b _080BAA5A -_080BA892: - b _080BA8AE + beq @080BA892 + b @080BAA5A +@080BA892: + b @080BA8AE .align 2, 0 .pool -_080BA89C: +@080BA89C: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080BA8BC + beq @080BA8BC ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 -_080BA8AE: +@080BA8AE: ldr r0, =sub_80BAA64 + 1 str r0, [r1] - b _080BAA5A + b @080BAA5A .align 2, 0 .pool -_080BA8BC: +@080BA8BC: movs r0, 0x40 ands r0, r1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0 - beq _080BA8EC + beq @080BA8EC ldr r1, =0x03005e00 lsls r2, r4, 2 adds r0, r2, r4 @@ -352086,19 +352086,19 @@ _080BA8BC: ldrsh r0, [r3, r6] adds r7, r1, 0 cmp r0, 0 - ble _080BA8E8 + ble @080BA8E8 subs r0, r5, 0x1 - b _080BA90C + b @080BA90C .align 2, 0 .pool -_080BA8E8: +@080BA8E8: movs r0, 0x6 - b _080BA90C -_080BA8EC: + b @080BA90C +@080BA8EC: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080BA924 + beq @080BA924 ldr r1, =0x03005e00 lsls r2, r4, 2 adds r0, r2, r4 @@ -352109,23 +352109,23 @@ _080BA8EC: ldrsh r0, [r3, r7] adds r7, r1, 0 cmp r0, 0x5 - bgt _080BA914 + bgt @080BA914 adds r0, r5, 0x1 -_080BA90C: +@080BA90C: strh r0, [r3, 0x8] - b _080BA916 + b @080BA916 .align 2, 0 .pool -_080BA914: +@080BA914: strh r6, [r3, 0x8] -_080BA916: +@080BA916: adds r0, r2, r4 lsls r0, 3 adds r0, r7 ldrb r0, [r0, 0x8] bl sub_80BAB38 - b _080BAA5A -_080BA924: + b @080BAA5A +@080BA924: ldr r0, =0x03005e00 lsls r2, r4, 2 adds r1, r2, r4 @@ -352135,25 +352135,25 @@ _080BA924: ldrsh r1, [r1, r3] adds r7, r0, 0 cmp r1, 0x5 - bls _080BA93A - b _080BAA5A -_080BA93A: + bls @080BA93A + b @080BAA5A +@080BA93A: lsls r0, r1, 2 - ldr r1, =_080BA94C + ldr r1, =@080BA94C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080BA94C: - .4byte _080BA964 - .4byte _080BA98A - .4byte _080BA9B0 - .4byte _080BA9D6 - .4byte _080BA9FC - .4byte _080BAA22 -_080BA964: +@080BA94C: + .4byte @080BA964 + .4byte @080BA98A + .4byte @080BA9B0 + .4byte @080BA9D6 + .4byte @080BA9FC + .4byte @080BAA22 +@080BA964: adds r4, r2, r4 lsls r4, 3 adds r4, r7 @@ -352167,11 +352167,11 @@ _080BA964: movs r6, 0xA ldrsh r0, [r4, r6] cmp r5, r0 - beq _080BAA46 + beq @080BAA46 adds r0, r1, 0 bl sub_80BAC38 - b _080BAA46 -_080BA98A: + b @080BAA46 +@080BA98A: adds r4, r2, r4 lsls r4, 3 adds r4, r7 @@ -352185,11 +352185,11 @@ _080BA98A: movs r7, 0xC ldrsh r0, [r4, r7] cmp r5, r0 - beq _080BAA46 + beq @080BAA46 adds r0, r1, 0 bl sub_80BAD08 - b _080BAA46 -_080BA9B0: + b @080BAA46 +@080BA9B0: adds r4, r2, r4 lsls r4, 3 adds r4, r7 @@ -352203,11 +352203,11 @@ _080BA9B0: movs r2, 0xE ldrsh r0, [r4, r2] cmp r5, r0 - beq _080BAA46 + beq @080BAA46 adds r0, r1, 0 bl sub_80BAD84 - b _080BAA46 -_080BA9D6: + b @080BAA46 +@080BA9D6: adds r4, r2, r4 lsls r4, 3 adds r4, r7 @@ -352221,11 +352221,11 @@ _080BA9D6: movs r3, 0x10 ldrsh r0, [r4, r3] cmp r5, r0 - beq _080BAA46 + beq @080BAA46 adds r0, r1, 0 bl sub_80BAE08 - b _080BAA46 -_080BA9FC: + b @080BAA46 +@080BA9FC: adds r4, r2, r4 lsls r4, 3 adds r4, r7 @@ -352239,11 +352239,11 @@ _080BA9FC: movs r6, 0x12 ldrsh r0, [r4, r6] cmp r5, r0 - beq _080BAA46 + beq @080BAA46 adds r0, r1, 0 bl sub_80BB028 - b _080BAA46 -_080BAA22: + b @080BAA46 +@080BAA22: adds r4, r2, r4 lsls r4, 3 adds r4, r7 @@ -352257,20 +352257,20 @@ _080BAA22: movs r7, 0x14 ldrsh r0, [r4, r7] cmp r5, r0 - beq _080BAA46 + beq @080BAA46 adds r0, r1, 0 bl sub_80BAF0C -_080BAA46: +@080BAA46: ldr r1, =0x02039b48 ldrb r0, [r1] cmp r0, 0 - beq _080BAA5A + beq @080BAA5A movs r0, 0 strb r0, [r1] movs r0, 0x1 movs r1, 0x2 bl Window_CopyToVram -_080BAA5A: +@080BAA5A: pop {r4-r7} pop {r0} bx r0 @@ -352279,7 +352279,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 @@ -352360,7 +352360,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 @@ -352369,14 +352369,14 @@ sub_80BAB08: @ 80BAB08 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080BAB2C + bne @080BAB2C adds r0, r2, 0 bl remove_task bl Window_FreeMemory ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 -_080BAB2C: +@080BAB2C: pop {r0} bx r0 .align 2, 0 @@ -352384,7 +352384,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 @@ -352409,7 +352409,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 @@ -352423,8 +352423,8 @@ sub_80BAB68: @ 80BAB68 ldrb r1, [r4] adds r0, r1, 0 cmp r0, 0xFF - beq _080BABA0 -_080BAB84: + beq @080BABA0 +@080BAB84: mov r0, sp adds r0, r2 adds r0, 0xC @@ -352436,18 +352436,18 @@ _080BAB84: ldrb r1, [r4] adds r0, r1, 0 cmp r0, 0xFF - beq _080BABA0 + beq @080BABA0 cmp r2, 0xE - bls _080BAB84 -_080BABA0: + bls @080BAB84 +@080BABA0: cmp r3, 0 - beq _080BABAE + beq @080BABAE add r1, sp, 0xC movs r0, 0x4 strb r0, [r1, 0x2] movs r0, 0x5 strb r0, [r1, 0x5] -_080BABAE: +@080BABAE: mov r1, sp adds r1, r2 adds r1, 0xC @@ -352473,7 +352473,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 @@ -352482,42 +352482,42 @@ sub_80BABDC: @ 80BABDC movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080BAC08 + beq @080BAC08 cmp r3, 0x1 - bhi _080BAC00 + bhi @080BAC00 adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 - b _080BAC02 + b @080BAC02 .align 2, 0 .pool -_080BAC00: +@080BAC00: movs r3, 0 -_080BAC02: +@080BAC02: ldr r1, =0x02039b48 movs r0, 0x1 strb r0, [r1] -_080BAC08: +@080BAC08: ldrh r1, [r2, 0x2E] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080BAC2C + beq @080BAC2C cmp r3, 0 - beq _080BAC24 + beq @080BAC24 subs r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 - b _080BAC26 + b @080BAC26 .align 2, 0 .pool -_080BAC24: +@080BAC24: movs r3, 0x2 -_080BAC26: +@080BAC26: ldr r1, =0x02039b48 movs r0, 0x1 strb r0, [r1] -_080BAC2C: +@080BAC2C: adds r0, r3, 0 pop {r1} bx r1 @@ -352526,7 +352526,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} @@ -352602,7 +352602,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 @@ -352611,12 +352611,12 @@ sub_80BACE0: @ 80BACE0 movs r0, 0x30 ands r0, r1 cmp r0, 0 - beq _080BACFA + beq @080BACFA movs r1, 0x1 eors r2, r1 ldr r0, =0x02039b48 strb r1, [r0] -_080BACFA: +@080BACFA: adds r0, r2, 0 pop {r1} bx r1 @@ -352625,7 +352625,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 @@ -352665,7 +352665,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 @@ -352674,12 +352674,12 @@ sub_80BAD5C: @ 80BAD5C movs r0, 0x30 ands r0, r1 cmp r0, 0 - beq _080BAD76 + beq @080BAD76 movs r1, 0x1 eors r2, r1 ldr r0, =0x02039b48 strb r1, [r0] -_080BAD76: +@080BAD76: adds r0, r2, 0 pop {r1} bx r1 @@ -352688,7 +352688,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 @@ -352728,7 +352728,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 @@ -352737,14 +352737,14 @@ sub_80BADD8: @ 80BADD8 movs r0, 0x30 ands r0, r1 cmp r0, 0 - beq _080BADF8 + beq @080BADF8 movs r4, 0x1 eors r5, r4 adds r0, r5, 0 bl sub_82E1810 ldr r0, =0x02039b48 strb r4, [r0] -_080BADF8: +@080BADF8: adds r0, r5, 0 pop {r4,r5} pop {r1} @@ -352754,7 +352754,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 @@ -352794,7 +352794,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 @@ -352803,18 +352803,18 @@ sub_80BAE5C: @ 80BAE5C movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080BAEAE + beq @080BAEAE cmp r4, 0x12 - bhi _080BAE80 + bhi @080BAE80 adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 - b _080BAE82 + b @080BAE82 .align 2, 0 .pool -_080BAE80: +@080BAE80: movs r4, 0 -_080BAE82: +@080BAE82: adds r0, r4, 0 bl sub_8098758 ldr r1, [r0] @@ -352833,24 +352833,24 @@ _080BAE82: ldr r1, =0x02039b48 movs r0, 0x1 strb r0, [r1] -_080BAEAE: +@080BAEAE: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080BAEFE + beq @080BAEFE cmp r4, 0 - beq _080BAED0 + beq @080BAED0 subs r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 - b _080BAED2 + b @080BAED2 .align 2, 0 .pool -_080BAED0: +@080BAED0: movs r4, 0x13 -_080BAED2: +@080BAED2: adds r0, r4, 0 bl sub_8098758 ldr r1, [r0] @@ -352869,7 +352869,7 @@ _080BAED2: ldr r1, =0x02039b48 movs r0, 0x1 strb r0, [r1] -_080BAEFE: +@080BAEFE: adds r0, r4, 0 pop {r4} pop {r1} @@ -352879,7 +352879,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 @@ -352892,9 +352892,9 @@ sub_80BAF0C: @ 80BAF0C ldrb r0, [r1] ldr r7, =0x085ee635 cmp r0, 0xFF - beq _080BAF44 + beq @080BAF44 adds r2, r1, 0 -_080BAF28: +@080BAF28: mov r0, sp adds r1, r0, r5 adds r0, r5, r2 @@ -352906,17 +352906,17 @@ _080BAF28: adds r0, r5, r2 ldrb r0, [r0] cmp r0, 0xFF - beq _080BAF44 + beq @080BAF44 cmp r5, 0x5 - bls _080BAF28 -_080BAF44: + bls @080BAF28 +@080BAF44: adds r0, r6, 0 movs r1, 0xA bl __udivsi3 adds r2, r0, 0 lsls r0, r2, 24 cmp r0, 0 - beq _080BAF80 + beq @080BAF80 mov r0, sp adds r1, r0, r5 adds r0, r2, 0 @@ -352932,10 +352932,10 @@ _080BAF44: bl __umodsi3 adds r0, 0xA1 strb r0, [r4] - b _080BAF9E + b @080BAF9E .align 2, 0 .pool -_080BAF80: +@080BAF80: mov r0, sp adds r4, r0, r5 adds r0, r6, 0 @@ -352950,7 +352950,7 @@ _080BAF80: adds r1, r0, r5 movs r0, 0x77 strb r0, [r1] -_080BAF9E: +@080BAF9E: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 @@ -352975,7 +352975,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 @@ -352984,42 +352984,42 @@ sub_80BAFCC: @ 80BAFCC movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080BAFF8 + beq @080BAFF8 cmp r3, 0x1 - bhi _080BAFF0 + bhi @080BAFF0 adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 - b _080BAFF2 + b @080BAFF2 .align 2, 0 .pool -_080BAFF0: +@080BAFF0: movs r3, 0 -_080BAFF2: +@080BAFF2: ldr r1, =0x02039b48 movs r0, 0x1 strb r0, [r1] -_080BAFF8: +@080BAFF8: ldrh r1, [r2, 0x2E] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080BB01C + beq @080BB01C cmp r3, 0 - beq _080BB014 + beq @080BB014 subs r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 - b _080BB016 + b @080BB016 .align 2, 0 .pool -_080BB014: +@080BB014: movs r3, 0x2 -_080BB016: +@080BB016: ldr r1, =0x02039b48 movs r0, 0x1 strb r0, [r1] -_080BB01C: +@080BB01C: adds r0, r3, 0 pop {r1} bx r1 @@ -353028,7 +353028,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} @@ -353105,7 +353105,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 @@ -353132,7 +353132,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 @@ -353140,7 +353140,7 @@ sub_80BB104: @ 80BB104 bl Window_FastFillPixels movs r4, 0 ldr r5, =0x0855c664 -_080BB114: +@080BB114: lsls r0, r4, 2 adds r0, r5 ldr r2, [r0] @@ -353161,7 +353161,7 @@ _080BB114: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x6 - bls _080BB114 + bls @080BB114 movs r0, 0x1 movs r1, 0x3 bl Window_CopyToVram @@ -353174,7 +353174,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 @@ -353345,7 +353345,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 @@ -353375,7 +353375,7 @@ sub_80BB2D0: @ 80BB2D0 ldr r3, =0x03005d8c ldr r6, =0x00000988 ldr r5, =0x00003b24 -_080BB30C: +@080BB30C: ldr r0, [r4] adds r0, 0x28 adds r0, r1 @@ -353396,7 +353396,7 @@ _080BB30C: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x33 - bls _080BB30C + bls @080BB30C pop {r4-r6} pop {r0} bx r0 @@ -353405,7 +353405,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] @@ -353418,7 +353418,7 @@ sub_80BB358: @ 80BB358 thumb_func_end sub_80BB358 thumb_func_start sub_80BB370 -sub_80BB370: @ 80BB370 +sub_80BB370: ; 80BB370 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -353428,7 +353428,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 @@ -353440,7 +353440,7 @@ sub_80BB384: @ 80BB384 movs r6, 0x3 negs r6, r6 ldr r5, =0x00000181 -_080BB39A: +@080BB39A: lsls r1, r3, 2 adds r1, r4, r1 ldrh r0, [r1] @@ -353455,7 +353455,7 @@ _080BB39A: lsls r0, 16 lsrs r3, r0, 16 cmp r3, r5 - bls _080BB39A + bls @080BB39A movs r2, 0xC1 lsls r2, 3 adds r0, r4, r2 @@ -353503,7 +353503,7 @@ _080BB39A: adds r2, r4, r0 ldr r1, =0x0000ffff adds r5, r1, 0 -_080BB416: +@080BB416: lsls r0, r3, 1 adds r0, r2, r0 ldrh r1, [r0] @@ -353513,7 +353513,7 @@ _080BB416: lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x3 - bls _080BB416 + bls @080BB416 movs r2, 0xC5 lsls r2, 3 adds r0, r4, r2 @@ -353555,7 +353555,7 @@ _080BB416: ldr r0, =0x0000063a adds r1, r4, r0 movs r2, 0 -_080BB47C: +@080BB47C: lsls r0, r3, 1 adds r0, r1, r0 strh r2, [r0] @@ -353563,7 +353563,7 @@ _080BB47C: lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x3 - bls _080BB47C + bls @080BB47C ldr r1, =0x0000064a adds r0, r4, r1 movs r1, 0 @@ -353597,26 +353597,26 @@ _080BB47C: ldr r0, =0x00000654 adds r1, r4, r0 movs r2, 0 -_080BB4CE: +@080BB4CE: adds r0, r1, r3 strb r2, [r0] adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x7 - bls _080BB4CE + bls @080BB4CE movs r3, 0 ldr r2, =0x0000065c adds r1, r4, r2 movs r2, 0 -_080BB4E4: +@080BB4E4: adds r0, r1, r3 strb r2, [r0] adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x7 - bls _080BB4E4 + bls @080BB4E4 pop {r4-r7} pop {r0} bx r0 @@ -353625,7 +353625,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} @@ -353636,15 +353636,15 @@ sub_80BB534: @ 80BB534 adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0x1 - beq _080BB5FC + beq @080BB5FC cmp r0, 0x1 - ble _080BB558 + ble @080BB558 cmp r0, 0x2 - beq _080BB628 + beq @080BB628 cmp r0, 0x3 - bne _080BB558 - b _080BB71C -_080BB558: + bne @080BB558 + b @080BB71C +@080BB558: movs r0, 0 bl SetVBlankCallback movs r0, 0 @@ -353664,7 +353664,7 @@ _080BB558: movs r0, 0x81 lsls r0, 24 mov r12, r0 -_080BB582: +@080BB582: strh r6, [r2] mov r0, sp str r0, [r1] @@ -353674,7 +353674,7 @@ _080BB582: adds r3, r5 subs r4, r5 cmp r4, r5 - bhi _080BB582 + bhi @080BB582 strh r6, [r2] mov r2, sp str r2, [r1] @@ -353718,10 +353718,10 @@ _080BB582: adds r0, r2 movs r1, 0x1 strb r1, [r0] - b _080BB74C + b @080BB74C .align 2, 0 .pool -_080BB5FC: +@080BB5FC: bl remove_some_task bl clear_tasks bl reset_all_obj_data @@ -353734,10 +353734,10 @@ _080BB5FC: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _080BB74C + b @080BB74C .align 2, 0 .pool -_080BB628: +@080BB628: ldr r4, =0x02039b4c ldr r0, =0x00000664 bl malloc_and_clear @@ -353756,12 +353756,12 @@ _080BB628: bl sub_809D42C adds r1, r0, 0 cmp r1, 0 - bne _080BB65E + bne @080BB65E ldr r0, [r4] ldr r2, =0x00000612 adds r0, r2 strh r1, [r0] -_080BB65E: +@080BB65E: ldr r1, [r4] ldr r0, [r5] ldrb r2, [r0, 0x18] @@ -353785,7 +353785,7 @@ _080BB65E: strb r1, [r0] bl sub_809D42C cmp r0, 0 - bne _080BB6D0 + bne @080BB6D0 movs r0, 0 bl sub_80C0844 ldr r1, [r4] @@ -353794,10 +353794,10 @@ _080BB65E: strh r0, [r1] movs r0, 0x1 bl sub_80C0844 - b _080BB6E4 + b @080BB6E4 .align 2, 0 .pool -_080BB6D0: +@080BB6D0: movs r0, 0 bl pokedex_count ldr r1, [r4] @@ -353806,7 +353806,7 @@ _080BB6D0: strh r0, [r1] movs r0, 0x1 bl pokedex_count -_080BB6E4: +@080BB6E4: ldr r1, [r4] ldr r3, =0x0000061c adds r1, r3 @@ -353824,10 +353824,10 @@ _080BB6E4: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080BB74C + b @080BB74C .align 2, 0 .pool -_080BB71C: +@080BB71C: movs r0, 0x1 bl enable_irqs ldr r0, =sub_80BB370 + 1 @@ -353847,7 +353847,7 @@ _080BB71C: ldr r1, =0x0000ffff movs r2, 0x80 bl MPlayVolumeControl -_080BB74C: +@080BB74C: add sp, 0x8 pop {r3} mov r8, r3 @@ -353859,7 +353859,7 @@ _080BB74C: thumb_func_end sub_80BB534 thumb_func_start sub_80BB774 -sub_80BB774: @ 80BB774 +sub_80BB774: ; 80BB774 push {lr} bl run_active_tasks bl call_obj_callbacks @@ -353870,7 +353870,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 @@ -353887,7 +353887,7 @@ sub_80BB78C: @ 80BB78C bl sub_80BC514 lsls r0, 24 cmp r0, 0 - beq _080BB7BE + beq @080BB7BE ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -353895,7 +353895,7 @@ sub_80BB78C: @ 80BB78C adds r1, r0 ldr r0, =sub_80BB7D4 + 1 str r0, [r1] -_080BB7BE: +@080BB7BE: pop {r4} pop {r0} bx r0 @@ -353904,7 +353904,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 @@ -353926,20 +353926,20 @@ sub_80BB7D4: @ 80BB7D4 ldrsh r2, [r1, r4] mov r8, r2 cmp r2, 0 - beq _080BB810 + beq @080BB810 subs r0, 0x8 strh r0, [r1] - b _080BBA06 + b @080BBA06 .align 2, 0 .pool -_080BB810: +@080BB810: ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x1 mov r9, r0 ands r0, r1 cmp r0, 0 - beq _080BB8A4 + beq @080BB8A4 ldr r1, =0x0000060e adds r0, r3, r1 ldrh r0, [r0] @@ -353948,7 +353948,7 @@ _080BB810: ldrb r0, [r0, 0x2] lsls r0, 31 cmp r0, 0 - beq _080BB8A4 + beq @080BB8A4 bl sub_80BD8D0 ldr r4, =0x02020630 ldr r0, [r7] @@ -353989,17 +353989,17 @@ _080BB810: ldr r1, =sub_80BBBF4 + 1 str r1, [r0] movs r0, 0x15 - b _080BB976 + b @080BB976 .align 2, 0 .pool -_080BB8A4: +@080BB8A4: ldrh r2, [r2, 0x2E] movs r0, 0x8 ands r0, r2 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq _080BB8FC + beq @080BB8FC ldr r3, =0x02039b4c ldr r1, [r3] ldr r4, =0x00000652 @@ -354024,16 +354024,16 @@ _080BB8A4: str r1, [r0] movs r0, 0x5 bl audio_play - b _080BBA06 + b @080BBA06 .align 2, 0 .pool -_080BB8FC: +@080BB8FC: movs r0, 0x4 ands r0, r2 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - beq _080BB9A0 + beq @080BB9A0 movs r0, 0x5 bl audio_play movs r0, 0x1 @@ -354086,17 +354086,17 @@ _080BB8FC: ldr r0, =sub_80BBD1C + 1 str r0, [r3] movs r0, 0x2 -_080BB976: +@080BB976: bl audio_play bl sub_80BC890 - b _080BBA06 + b @080BBA06 .align 2, 0 .pool -_080BB9A0: +@080BB9A0: movs r0, 0x2 ands r0, r2 cmp r0, 0 - beq _080BB9D8 + beq @080BB9D8 movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -354113,10 +354113,10 @@ _080BB9A0: str r1, [r0] movs r0, 0x3 bl audio_play - b _080BBA06 + b @080BBA06 .align 2, 0 .pool -_080BB9D8: +@080BB9D8: ldr r5, =0x02039b4c ldr r0, [r5] ldr r4, =0x0000060e @@ -354131,7 +354131,7 @@ _080BB9D8: adds r1, r0 ldrb r0, [r1] cmp r0, 0 - beq _080BBA06 + beq @080BBA06 ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -354139,7 +354139,7 @@ _080BB9D8: adds r1, r0 ldr r0, =sub_80BBA28 + 1 str r0, [r1] -_080BBA06: +@080BBA06: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -354152,7 +354152,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 @@ -354170,7 +354170,7 @@ sub_80BBA28: @ 80BBA28 bl sub_80BD404 lsls r0, 24 cmp r0, 0 - beq _080BBA5C + beq @080BBA5C ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -354178,7 +354178,7 @@ sub_80BBA28: @ 80BBA28 adds r1, r0 ldr r0, =sub_80BB7D4 + 1 str r0, [r1] -_080BBA5C: +@080BBA5C: pop {r4} pop {r0} bx r0 @@ -354187,7 +354187,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 @@ -354205,36 +354205,36 @@ sub_80BBA78: @ 80BBA78 movs r4, 0 ldrsh r0, [r1, r4] cmp r0, 0x50 - beq _080BBAB0 + beq @080BBAB0 adds r0, r2, 0 adds r0, 0x8 strh r0, [r1] - b _080BBBE8 + b @080BBBE8 .align 2, 0 .pool -_080BBAB0: +@080BBAB0: ldr r5, =0x030022c0 ldrh r1, [r5, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080BBB58 + beq @080BBB58 movs r2, 0xCA lsls r2, 3 adds r0, r3, r2 ldrh r0, [r0] cmp r0, 0x1 - beq _080BBADC + beq @080BBADC cmp r0, 0x1 - ble _080BBB20 + ble @080BBB20 cmp r0, 0x2 - beq _080BBAF4 + beq @080BBAF4 cmp r0, 0x3 - beq _080BBB34 - b _080BBB20 + beq @080BBB34 + b @080BBB20 .align 2, 0 .pool -_080BBADC: +@080BBADC: ldr r4, =0x0000060e adds r1, r3, r4 movs r0, 0 @@ -354242,10 +354242,10 @@ _080BBADC: ldr r0, =0x0000062c adds r1, r3, r0 movs r0, 0x40 - b _080BBB0C + b @080BBB0C .align 2, 0 .pool -_080BBAF4: +@080BBAF4: ldr r1, =0x0000060c adds r2, r3, r1 ldrh r0, [r2] @@ -354258,7 +354258,7 @@ _080BBAF4: adds r0, 0x30 ldr r2, =0x0000062c adds r1, r3, r2 -_080BBB0C: +@080BBB0C: strb r0, [r1] bl sub_80BDA40 ldr r0, [r6] @@ -354267,14 +354267,14 @@ _080BBB0C: movs r1, 0xE bl sub_80BD2B4 ldrh r1, [r5, 0x2E] -_080BBB20: +@080BBB20: movs r0, 0x8 orrs r0, r1 strh r0, [r5, 0x2E] - b _080BBB58 + b @080BBB58 .align 2, 0 .pool -_080BBB34: +@080BBB34: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -354291,13 +354291,13 @@ _080BBB34: str r1, [r0] movs r0, 0x3 bl audio_play -_080BBB58: +@080BBB58: ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0xA ands r0, r1 cmp r0, 0 - beq _080BBB98 + beq @080BBB98 ldr r0, =0x02039b4c ldr r0, [r0] ldr r3, =0x0000064f @@ -354311,15 +354311,15 @@ _080BBB58: adds r0, r1 ldr r1, =sub_80BB7D4 + 1 str r1, [r0] - b _080BBBB6 + b @080BBBB6 .align 2, 0 .pool -_080BBB98: +@080BBB98: ldrh r1, [r2, 0x30] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _080BBBC4 + beq @080BBBC4 ldr r0, =0x02039b4c ldr r0, [r0] movs r4, 0xCA @@ -354327,21 +354327,21 @@ _080BBB98: adds r1, r0, r4 ldrh r0, [r1] cmp r0, 0 - beq _080BBBC4 + beq @080BBBC4 subs r0, 0x1 strh r0, [r1] -_080BBBB6: +@080BBBB6: movs r0, 0x5 bl audio_play - b _080BBBE8 + b @080BBBE8 .align 2, 0 .pool -_080BBBC4: +@080BBBC4: ldrh r1, [r2, 0x30] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080BBBE8 + beq @080BBBE8 ldr r0, =0x02039b4c ldr r0, [r0] movs r2, 0xCA @@ -354349,12 +354349,12 @@ _080BBBC4: adds r1, r0, r2 ldrh r0, [r1] cmp r0, 0x2 - bhi _080BBBE8 + bhi @080BBBE8 adds r0, 0x1 strh r0, [r1] movs r0, 0x5 bl audio_play -_080BBBE8: +@080BBBE8: add sp, 0x4 pop {r4-r7} pop {r0} @@ -354364,7 +354364,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 @@ -354381,11 +354381,11 @@ sub_80BBBF4: @ 80BBBF4 movs r2, 0x20 ldrsh r0, [r1, r2] cmp r0, 0x30 - bne _080BBC52 + bne @080BBC52 movs r2, 0x22 ldrsh r0, [r1, r2] cmp r0, 0x38 - bne _080BBC52 + bne @080BBC52 ldr r1, =0x0000064a adds r0, r3, r1 ldrb r1, [r0] @@ -354411,7 +354411,7 @@ sub_80BBBF4: @ 80BBBF4 strh r0, [r1, 0x8] ldr r0, =sub_80BBC74 + 1 str r0, [r1] -_080BBC52: +@080BBC52: pop {r4-r6} pop {r0} bx r0 @@ -354420,7 +354420,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 @@ -354437,23 +354437,23 @@ sub_80BBC74: @ 80BBC74 adds r0, r2 ldrb r0, [r0, 0x4] cmp r0, 0 - beq _080BBCE0 + beq @080BBCE0 ldr r5, =0x02039b4c ldr r0, [r5] ldr r1, =0x0000064a adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _080BBCFC + bne @080BBCFC ldrb r0, [r4, 0x8] bl sub_80BE9C4 lsls r0, 24 cmp r0, 0 - bne _080BBCFC + bne @080BBCFC bl sub_80BD930 lsls r0, 24 cmp r0, 0 - beq _080BBCFC + beq @080BBCFC ldr r0, [r5] ldr r2, =0x0000060e adds r1, r0, r2 @@ -354462,10 +354462,10 @@ sub_80BBC74: @ 80BBC74 adds r0, r1 ldrb r1, [r4, 0x8] bl sub_80BE9F8 - b _080BBCFC + b @080BBCFC .align 2, 0 .pool -_080BBCE0: +@080BBCE0: ldr r2, =0x02039b50 ldr r0, =0x02039b4c ldr r1, [r0] @@ -354480,7 +354480,7 @@ _080BBCE0: strb r0, [r2] ldr r0, =sub_80BB78C + 1 str r0, [r4] -_080BBCFC: +@080BBCFC: pop {r4,r5} pop {r0} bx r0 @@ -354489,7 +354489,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 @@ -354506,7 +354506,7 @@ sub_80BBD1C: @ 80BBD1C adds r0, r2 ldrb r4, [r0, 0x4] cmp r4, 0 - bne _080BBDCA + bne @080BBDCA bl sub_80BDA40 ldr r5, =0x02039b4c ldr r2, [r5] @@ -354514,7 +354514,7 @@ sub_80BBD1C: @ 80BBD1C adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 - beq _080BBD7C + beq @080BBD7C ldr r3, =0x0000060e adds r0, r2, r3 strh r4, [r0] @@ -354523,10 +354523,10 @@ sub_80BBD1C: @ 80BBD1C movs r0, 0x40 strb r0, [r1] ldr r0, =sub_80BBE70 + 1 - b _080BBDC8 + b @080BBDC8 .align 2, 0 .pool -_080BBD7C: +@080BBD7C: ldr r1, =0x0000062a adds r0, r2, r1 ldrh r1, [r0] @@ -354550,12 +354550,12 @@ _080BBD7C: bl sub_809D42C adds r1, r0, 0 cmp r1, 0 - bne _080BBDB6 + bne @080BBDB6 ldr r0, [r5] ldr r2, =0x00000612 adds r0, r2 strh r1, [r0] -_080BBDB6: +@080BBDB6: ldr r0, [r5] movs r3, 0xC3 lsls r3, 3 @@ -354565,9 +354565,9 @@ _080BBDB6: adds r0, r2 strh r1, [r0] ldr r0, =sub_80BB78C + 1 -_080BBDC8: +@080BBDC8: str r0, [r6] -_080BBDCA: +@080BBDCA: pop {r4-r6} pop {r0} bx r0 @@ -354576,7 +354576,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 @@ -354585,7 +354585,7 @@ sub_80BBDE8: @ 80BBDE8 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080BBE4A + bne @080BBE4A ldr r4, =0x03005d90 ldr r0, [r4] ldr r5, =0x02039b4c @@ -354597,10 +354597,10 @@ sub_80BBDE8: @ 80BBDE8 bl sub_809D42C adds r1, r0, 0 cmp r1, 0 - bne _080BBE18 + bne @080BBE18 ldr r0, [r4] strb r1, [r0, 0x19] -_080BBE18: +@080BBE18: ldr r1, [r4] ldr r0, [r5] ldr r2, =0x00000616 @@ -354620,7 +354620,7 @@ _080BBE18: bl MPlayVolumeControl ldr r0, [r5] bl free -_080BBE4A: +@080BBE4A: pop {r4-r6} pop {r0} bx r0 @@ -354629,7 +354629,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 @@ -354645,7 +354645,7 @@ sub_80BBE70: @ 80BBE70 bl sub_80BC514 lsls r0, 24 cmp r0, 0 - beq _080BBEA0 + beq @080BBEA0 ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -354653,7 +354653,7 @@ sub_80BBE70: @ 80BBE70 adds r1, r0 ldr r0, =sub_80BBEB8 + 1 str r0, [r1] -_080BBEA0: +@080BBEA0: pop {r4} pop {r0} bx r0 @@ -354662,7 +354662,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 @@ -354680,20 +354680,20 @@ sub_80BBEB8: @ 80BBEB8 movs r2, 0 ldrsh r4, [r1, r2] cmp r4, 0 - beq _080BBEEC + beq @080BBEEC subs r0, 0x8 strh r0, [r1] - b _080BC08A + b @080BC08A .align 2, 0 .pool -_080BBEEC: +@080BBEEC: ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r7, 0x1 adds r0, r7, 0 ands r0, r1 cmp r0, 0 - beq _080BBF70 + beq @080BBF70 ldr r1, =0x0000060e adds r0, r3, r1 ldrh r0, [r0] @@ -354702,7 +354702,7 @@ _080BBEEC: ldrb r0, [r0, 0x2] lsls r0, 31 cmp r0, 0 - beq _080BBF70 + beq @080BBF70 bl sub_80BD8D0 ldr r3, =0x02020630 ldr r0, [r5] @@ -354736,17 +354736,17 @@ _080BBEEC: ldr r1, =sub_80BC2D4 + 1 str r1, [r0] movs r0, 0x15 - b _080BC00A + b @080BC00A .align 2, 0 .pool -_080BBF70: +@080BBF70: ldrh r2, [r2, 0x2E] movs r0, 0x8 ands r0, r2 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - beq _080BBFC8 + beq @080BBFC8 ldr r3, =0x02039b4c ldr r1, [r3] ldr r2, =0x00000652 @@ -354771,16 +354771,16 @@ _080BBF70: str r1, [r0] movs r0, 0x5 bl audio_play - b _080BC08A + b @080BC08A .align 2, 0 .pool -_080BBFC8: +@080BBFC8: movs r0, 0x4 ands r0, r2 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0 - beq _080BC024 + beq @080BC024 movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -354806,17 +354806,17 @@ _080BBFC8: ldr r0, =sub_80BBD1C + 1 str r0, [r1] movs r0, 0x2 -_080BC00A: +@080BC00A: bl audio_play bl sub_80BC890 - b _080BC08A + b @080BC08A .align 2, 0 .pool -_080BC024: +@080BC024: movs r0, 0x2 ands r0, r2 cmp r0, 0 - beq _080BC05C + beq @080BC05C movs r0, 0x1 negs r0, r0 str r3, [sp] @@ -354833,10 +354833,10 @@ _080BC024: str r1, [r0] movs r0, 0x3 bl audio_play - b _080BC08A + b @080BC08A .align 2, 0 .pool -_080BC05C: +@080BC05C: ldr r5, =0x02039b4c ldr r0, [r5] ldr r4, =0x0000060e @@ -354851,7 +354851,7 @@ _080BC05C: adds r1, r0 ldrb r0, [r1] cmp r0, 0 - beq _080BC08A + beq @080BC08A ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -354859,7 +354859,7 @@ _080BC05C: adds r1, r0 ldr r0, =sub_80BC0A8 + 1 str r0, [r1] -_080BC08A: +@080BC08A: add sp, 0x4 pop {r4-r7} pop {r0} @@ -354869,7 +354869,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 @@ -354887,7 +354887,7 @@ sub_80BC0A8: @ 80BC0A8 bl sub_80BD404 lsls r0, 24 cmp r0, 0 - beq _080BC0DC + beq @080BC0DC ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -354895,7 +354895,7 @@ sub_80BC0A8: @ 80BC0A8 adds r1, r0 ldr r0, =sub_80BBEB8 + 1 str r0, [r1] -_080BC0DC: +@080BC0DC: pop {r4} pop {r0} bx r0 @@ -354904,7 +354904,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 @@ -354922,43 +354922,43 @@ sub_80BC0F8: @ 80BC0F8 movs r3, 0 ldrsh r0, [r1, r3] cmp r0, 0x60 - beq _080BC130 + beq @080BC130 adds r0, r2, 0 adds r0, 0x8 strh r0, [r1] - b _080BC2C8 + b @080BC2C8 .align 2, 0 .pool -_080BC130: +@080BC130: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080BC13E - b _080BC238 -_080BC13E: + bne @080BC13E + b @080BC238 +@080BC13E: movs r1, 0xCA lsls r1, 3 adds r0, r5, r1 ldrh r0, [r0] cmp r0, 0x4 - bhi _080BC1C2 + bhi @080BC1C2 lsls r0, 2 - ldr r1, =_080BC15C + ldr r1, =@080BC15C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080BC15C: - .4byte _080BC1C2 - .4byte _080BC170 - .4byte _080BC194 - .4byte _080BC1E4 - .4byte _080BC214 -_080BC170: +@080BC15C: + .4byte @080BC1C2 + .4byte @080BC170 + .4byte @080BC194 + .4byte @080BC1E4 + .4byte @080BC214 +@080BC170: ldr r5, =0x02039b4c ldr r1, [r5] ldr r4, =0x0000060e @@ -354969,10 +354969,10 @@ _080BC170: adds r1, r2 movs r0, 0x40 strb r0, [r1] - b _080BC1B2 + b @080BC1B2 .align 2, 0 .pool -_080BC194: +@080BC194: ldr r5, =0x02039b4c ldr r2, [r5] ldr r0, =0x0000060c @@ -354988,23 +354988,23 @@ _080BC194: ldr r1, =0x0000062c adds r2, r1 strb r0, [r2] -_080BC1B2: +@080BC1B2: bl sub_80BDA40 ldr r0, [r5] adds r0, r4 ldrh r0, [r0] movs r1, 0xE bl sub_80BD2B4 -_080BC1C2: +@080BC1C2: ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x8 orrs r0, r1 strh r0, [r2, 0x2E] - b _080BC238 + b @080BC238 .align 2, 0 .pool -_080BC1E4: +@080BC1E4: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -355021,10 +355021,10 @@ _080BC1E4: str r1, [r0] movs r0, 0x34 bl audio_play - b _080BC238 + b @080BC238 .align 2, 0 .pool -_080BC214: +@080BC214: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -355041,13 +355041,13 @@ _080BC214: str r1, [r0] movs r0, 0x3 bl audio_play -_080BC238: +@080BC238: ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0xA ands r0, r1 cmp r0, 0 - beq _080BC278 + beq @080BC278 ldr r0, =0x02039b4c ldr r0, [r0] ldr r2, =0x0000064f @@ -355061,15 +355061,15 @@ _080BC238: adds r0, r1 ldr r1, =sub_80BBEB8 + 1 str r1, [r0] - b _080BC296 + b @080BC296 .align 2, 0 .pool -_080BC278: +@080BC278: ldrh r1, [r2, 0x30] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _080BC2A4 + beq @080BC2A4 ldr r0, =0x02039b4c ldr r0, [r0] movs r3, 0xCA @@ -355077,21 +355077,21 @@ _080BC278: adds r1, r0, r3 ldrh r0, [r1] cmp r0, 0 - beq _080BC2A4 + beq @080BC2A4 subs r0, 0x1 strh r0, [r1] -_080BC296: +@080BC296: movs r0, 0x5 bl audio_play - b _080BC2C8 + b @080BC2C8 .align 2, 0 .pool -_080BC2A4: +@080BC2A4: ldrh r1, [r2, 0x30] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080BC2C8 + beq @080BC2C8 ldr r0, =0x02039b4c ldr r0, [r0] movs r2, 0xCA @@ -355099,12 +355099,12 @@ _080BC2A4: adds r1, r0, r2 ldrh r0, [r1] cmp r0, 0x3 - bhi _080BC2C8 + bhi @080BC2C8 adds r0, 0x1 strh r0, [r1] movs r0, 0x5 bl audio_play -_080BC2C8: +@080BC2C8: add sp, 0x4 pop {r4-r6} pop {r0} @@ -355114,7 +355114,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 @@ -355131,11 +355131,11 @@ sub_80BC2D4: @ 80BC2D4 movs r2, 0x20 ldrsh r0, [r1, r2] cmp r0, 0x30 - bne _080BC33A + bne @080BC33A movs r2, 0x22 ldrsh r0, [r1, r2] cmp r0, 0x38 - bne _080BC33A + bne @080BC33A ldr r1, =0x0000064a adds r0, r3, r1 ldrb r1, [r0] @@ -355165,7 +355165,7 @@ sub_80BC2D4: @ 80BC2D4 strh r2, [r0] ldr r0, =sub_80BC360 + 1 str r0, [r1] -_080BC33A: +@080BC33A: pop {r4-r6} pop {r0} bx r0 @@ -355174,7 +355174,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 @@ -355191,23 +355191,23 @@ sub_80BC360: @ 80BC360 adds r0, r2 ldrb r0, [r0, 0x4] cmp r0, 0 - beq _080BC3CC + beq @080BC3CC ldr r5, =0x02039b4c ldr r0, [r5] ldr r1, =0x0000064a adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _080BC3D0 + bne @080BC3D0 ldrb r0, [r4, 0x8] bl sub_80BE9C4 lsls r0, 24 cmp r0, 0 - bne _080BC3D0 + bne @080BC3D0 bl sub_80BD930 lsls r0, 24 cmp r0, 0 - beq _080BC3D0 + beq @080BC3D0 ldr r0, [r5] ldr r2, =0x0000060e adds r1, r0, r2 @@ -355216,13 +355216,13 @@ sub_80BC360: @ 80BC360 adds r0, r1 ldrb r1, [r4, 0x8] bl sub_80BE9F8 - b _080BC3D0 + b @080BC3D0 .align 2, 0 .pool -_080BC3CC: +@080BC3CC: ldr r0, =sub_80BBE70 + 1 str r0, [r4] -_080BC3D0: +@080BC3D0: pop {r4,r5} pop {r0} bx r0 @@ -355231,7 +355231,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 @@ -355240,7 +355240,7 @@ sub_80BC3DC: @ 80BC3DC movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080BC450 + bne @080BC450 ldr r4, =0x02039b4c ldr r0, [r4] ldr r2, =0x0000062a @@ -355265,12 +355265,12 @@ sub_80BC3DC: @ 80BC3DC bl sub_809D42C adds r1, r0, 0 cmp r1, 0 - bne _080BC42A + bne @080BC42A ldr r0, [r4] ldr r2, =0x00000612 adds r0, r2 strh r1, [r0] -_080BC42A: +@080BC42A: ldr r0, [r4] movs r3, 0xC3 lsls r3, 3 @@ -355288,7 +355288,7 @@ _080BC42A: str r1, [r0] bl sub_80BDA40 bl sub_80BC890 -_080BC450: +@080BC450: pop {r4,r5} pop {r0} bx r0 @@ -355297,7 +355297,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 @@ -355306,7 +355306,7 @@ sub_80BC47C: @ 80BC47C movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080BC4E8 + bne @080BC4E8 ldr r4, =0x02039b4c ldr r0, [r4] ldr r2, =0x0000062a @@ -355331,12 +355331,12 @@ sub_80BC47C: @ 80BC47C bl sub_809D42C adds r1, r0, 0 cmp r1, 0 - bne _080BC4CA + bne @080BC4CA ldr r0, [r4] ldr r2, =0x00000612 adds r0, r2 strh r1, [r0] -_080BC4CA: +@080BC4CA: ldr r0, [r4] movs r3, 0xC3 lsls r3, 3 @@ -355352,7 +355352,7 @@ _080BC4CA: adds r0, r1 ldr r1, =sub_80BBDE8 + 1 str r1, [r0] -_080BC4E8: +@080BC4E8: pop {r4,r5} pop {r0} bx r0 @@ -355361,7 +355361,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 @@ -355373,24 +355373,24 @@ sub_80BC514: @ 80BC514 ldrb r0, [r0] adds r3, r1, 0 cmp r0, 0x6 - bhi _080BC55C + bhi @080BC55C lsls r0, 2 - ldr r1, =_080BC540 + ldr r1, =@080BC540 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080BC540: - .4byte _080BC55C - .4byte _080BC6CC - .4byte _080BC6FC - .4byte _080BC704 - .4byte _080BC768 - .4byte _080BC790 - .4byte _080BC818 -_080BC55C: +@080BC540: + .4byte @080BC55C + .4byte @080BC6CC + .4byte @080BC6FC + .4byte @080BC704 + .4byte @080BC768 + .4byte @080BC790 + .4byte @080BC818 +@080BC55C: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -355398,9 +355398,9 @@ _080BC55C: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - beq _080BC56E - b _080BC838 -_080BC56E: + beq @080BC56E + b @080BC838 +@080BC56E: movs r0, 0 bl SetVBlankCallback ldr r4, =0x02039b4c @@ -355462,27 +355462,27 @@ _080BC56E: movs r3, 0 bl gpu_copy_to_wram_bg_tile_map cmp r5, 0 - bne _080BC640 + bne @080BC640 ldr r1, =0x08dc2a08 movs r3, 0xA0 lsls r3, 2 movs r0, 0 movs r2, 0 bl gpu_copy_to_wram_bg_tile_map - b _080BC64E + b @080BC64E .align 2, 0 .pool -_080BC640: +@080BC640: ldr r1, =0x08dc2b1c movs r3, 0xA0 lsls r3, 2 movs r0, 0 movs r2, 0 bl gpu_copy_to_wram_bg_tile_map -_080BC64E: +@080BC64E: bl sub_80A1A74 cmp r5, 0 - bne _080BC674 + bne @080BC674 ldr r3, =0x02039b4c ldr r1, [r3] ldr r0, =0x0000064c @@ -355491,10 +355491,10 @@ _080BC64E: movs r0, 0x2 negs r0, r0 ands r0, r2 - b _080BC682 + b @080BC682 .align 2, 0 .pool -_080BC674: +@080BC674: ldr r3, =0x02039b4c ldr r1, [r3] ldr r2, =0x0000064c @@ -355502,7 +355502,7 @@ _080BC674: ldrb r0, [r1] movs r2, 0x1 orrs r0, r2 -_080BC682: +@080BC682: strb r0, [r1] ldr r0, [r3] ldr r1, =0x0000064c @@ -355525,10 +355525,10 @@ _080BC682: adds r0, r2 movs r1, 0x1 strb r1, [r0] - b _080BC838 + b @080BC838 .align 2, 0 .pool -_080BC6CC: +@080BC6CC: bl reset_all_obj_data bl gpu_pal_allocator_reset ldr r1, =0x0300301c @@ -355540,17 +355540,17 @@ _080BC6CC: bl gpu_pal_obj_alloc_and_load_multiple adds r0, r5, 0 bl sub_80BDB7C - b _080BC7F8 + b @080BC7F8 .align 2, 0 .pool -_080BC6FC: +@080BC6FC: movs r2, 0x87 lsls r2, 3 adds r1, r3, r2 - b _080BC800 -_080BC704: + b @080BC800 +@080BC704: cmp r5, 0 - bne _080BC71C + bne @080BC71C ldr r0, =0x02039b4c ldr r1, [r0] ldr r2, =0x00000612 @@ -355560,7 +355560,7 @@ _080BC704: adds r1, r2 ldrb r1, [r1] bl sub_80BC8D4 -_080BC71C: +@080BC71C: ldr r4, =0x02039b4c ldr r0, [r4] ldr r1, =0x0000060e @@ -355585,10 +355585,10 @@ _080BC71C: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - b _080BC7F8 + b @080BC7F8 .align 2, 0 .pool -_080BC768: +@080BC768: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -355602,10 +355602,10 @@ _080BC768: movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _080BC800 + b @080BC800 .align 2, 0 .pool -_080BC790: +@080BC790: ldr r1, =0x00003f3f movs r0, 0x48 bl lcd_io_set @@ -355644,19 +355644,19 @@ _080BC790: bl gpu_sync_bg_show movs r0, 0x3 bl gpu_sync_bg_show -_080BC7F8: +@080BC7F8: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 -_080BC800: +@080BC800: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080BC838 + b @080BC838 .align 2, 0 .pool -_080BC818: +@080BC818: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -355664,18 +355664,18 @@ _080BC818: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - bne _080BC838 + bne @080BC838 movs r1, 0x87 lsls r1, 3 adds r0, r3, r1 strb r2, [r0] movs r0, 0x1 - b _080BC83A + b @080BC83A .align 2, 0 .pool -_080BC838: +@080BC838: movs r0, 0 -_080BC83A: +@080BC83A: add sp, 0x4 pop {r4-r6} pop {r1} @@ -355683,34 +355683,34 @@ _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 cmp r0, 0x1 - bne _080BC858 + bne @080BC858 ldr r0, =0x08dc17b6 - b _080BC862 + b @080BC862 .align 2, 0 .pool -_080BC858: +@080BC858: bl sub_809D42C cmp r0, 0 - bne _080BC870 + bne @080BC870 ldr r0, =0x08dc16f6 -_080BC862: +@080BC862: movs r1, 0x1 movs r2, 0xBE bl gpu_pal_apply - b _080BC87A + b @080BC87A .align 2, 0 .pool -_080BC870: +@080BC870: ldr r0, =0x08dc1876 movs r1, 0x1 movs r2, 0xBE bl gpu_pal_apply -_080BC87A: +@080BC87A: bl sub_8098C64 movs r1, 0xF0 movs r2, 0x20 @@ -355722,39 +355722,39 @@ _080BC87A: thumb_func_end sub_80BC844 thumb_func_start sub_80BC890 -sub_80BC890: @ 80BC890 +sub_80BC890: ; 80BC890 push {lr} bl Window_FreeMemory movs r0, 0 bl bg_get_tilemap cmp r0, 0 - beq _080BC8A4 + beq @080BC8A4 bl free -_080BC8A4: +@080BC8A4: movs r0, 0x1 bl bg_get_tilemap cmp r0, 0 - beq _080BC8B2 + beq @080BC8B2 bl free -_080BC8B2: +@080BC8B2: movs r0, 0x2 bl bg_get_tilemap cmp r0, 0 - beq _080BC8C0 + beq @080BC8C0 bl free -_080BC8C0: +@080BC8C0: movs r0, 0x3 bl bg_get_tilemap cmp r0, 0 - beq _080BC8CE + beq @080BC8CE bl free -_080BC8CE: +@080BC8CE: pop {r0} bx r0 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 @@ -355772,71 +355772,71 @@ sub_80BC8D4: @ 80BC8D4 movs r5, 0 strh r5, [r0] cmp r4, 0 - beq _080BC8FC + beq @080BC8FC cmp r4, 0x1 - beq _080BC910 -_080BC8FC: + beq @080BC910 +@080BC8FC: mov r1, sp movs r0, 0xCA strh r0, [r1] movs r0, 0x1 strh r0, [r1, 0x2] - b _080BC92C + b @080BC92C .align 2, 0 .pool -_080BC910: +@080BC910: bl sub_809D42C cmp r0, 0 - beq _080BC924 + beq @080BC924 mov r0, sp movs r1, 0xC1 lsls r1, 1 strh r1, [r0] strh r5, [r0, 0x2] - b _080BC92C -_080BC924: + b @080BC92C +@080BC924: mov r0, sp movs r1, 0xCA strh r1, [r0] strh r4, [r0, 0x2] -_080BC92C: +@080BC92C: cmp r6, 0x5 - bls _080BC932 - b _080BCDB4 -_080BC932: + bls @080BC932 + b @080BCDB4 +@080BC932: lsls r0, r6, 2 - ldr r1, =_080BC940 + ldr r1, =@080BC940 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080BC940: - .4byte _080BC958 - .4byte _080BCACC - .4byte _080BCB78 - .4byte _080BCC08 - .4byte _080BCCA0 - .4byte _080BCD30 -_080BC958: +@080BC940: + .4byte @080BC958 + .4byte @080BCACC + .4byte @080BCB78 + .4byte @080BCC08 + .4byte @080BCCA0 + .4byte @080BCD30 +@080BC958: mov r0, sp ldrh r0, [r0, 0x2] cmp r0, 0 - beq _080BCA00 + beq @080BCA00 movs r4, 0 mov r0, sp ldrh r0, [r0] cmp r4, r0 - blt _080BC96C - b _080BCDB4 -_080BC96C: + blt @080BC96C + b @080BCDB4 +@080BC96C: mov r5, sp ldr r2, =0x02039b4c mov r8, r2 movs r3, 0x1 mov r9, r3 -_080BC976: +@080BC976: lsls r4, 16 asrs r4, 16 adds r7, r4, 0x1 @@ -355887,37 +355887,37 @@ _080BC976: ldrb r0, [r4, 0x2] lsls r0, 31 cmp r0, 0 - beq _080BC9EA + beq @080BC9EA ldr r2, =0x0000060c adds r0, r1, r2 mov r3, r10 strh r3, [r0] -_080BC9EA: +@080BC9EA: adds r4, r6, 0 lsls r0, r4, 16 asrs r0, 16 ldrh r7, [r5] cmp r0, r7 - blt _080BC976 - b _080BCDB4 + blt @080BC976 + b @080BCDB4 .align 2, 0 .pool -_080BCA00: +@080BCA00: movs r4, 0 movs r5, 0 mov r10, r5 mov r0, sp ldrh r0, [r0] cmp r4, r0 - blt _080BCA10 - b _080BCDB4 -_080BCA10: + blt @080BCA10 + b @080BCDB4 +@080BCA10: mov r6, sp ldr r0, =0x02039b4c mov r8, r0 movs r1, 0x1 mov r9, r1 -_080BCA1A: +@080BCA1A: lsls r4, 16 asrs r0, r4, 16 adds r0, 0x1 @@ -355928,13 +355928,13 @@ _080BCA1A: lsls r0, 24 adds r7, r4, 0 cmp r0, 0 - beq _080BCA36 + beq @080BCA36 movs r2, 0x1 mov r10, r2 -_080BCA36: +@080BCA36: mov r3, r10 cmp r3, 0 - beq _080BCAB2 + beq @080BCAB2 mov r4, r8 ldr r1, [r4] lsls r0, r5, 16 @@ -355984,16 +355984,16 @@ _080BCA36: ldrb r0, [r4, 0x2] lsls r0, 31 cmp r0, 0 - beq _080BCAAC + beq @080BCAAC adds r1, r5, 0x1 ldr r4, =0x0000060c adds r0, r2, r4 strh r1, [r0] -_080BCAAC: +@080BCAAC: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 -_080BCAB2: +@080BCAB2: movs r1, 0x80 lsls r1, 9 adds r0, r7, r1 @@ -356001,11 +356001,11 @@ _080BCAB2: asrs r0, 16 ldrh r2, [r6] cmp r0, r2 - blt _080BCA1A - b _080BCDB4 + blt @080BCA1A + b @080BCDB4 .align 2, 0 .pool -_080BCACC: +@080BCACC: movs r4, 0 mov r5, sp ldr r3, =0x02039b4c @@ -356013,7 +356013,7 @@ _080BCACC: ldr r6, =0x0000060c movs r7, 0x1 mov r9, r7 -_080BCADA: +@080BCADA: ldr r1, =0x0855c6a4 lsls r4, 16 asrs r0, r4, 15 @@ -356027,13 +356027,13 @@ _080BCADA: adds r7, r4, 0 ldrh r1, [r5] cmp r0, r1 - bhi _080BCB58 + bhi @080BCB58 ldrh r0, [r5, 0x4] movs r1, 0 bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - beq _080BCB58 + beq @080BCB58 mov r3, r8 ldr r2, [r3] adds r3, r2, r6 @@ -356074,7 +356074,7 @@ _080BCADA: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_080BCB58: +@080BCB58: movs r2, 0x80 lsls r2, 9 adds r1, r7, r2 @@ -356082,17 +356082,17 @@ _080BCB58: movs r0, 0xCD lsls r0, 17 cmp r1, r0 - ble _080BCADA - b _080BCDB4 + ble @080BCADA + b @080BCDB4 .align 2, 0 .pool -_080BCB78: +@080BCB78: ldr r4, =0x00000181 lsls r0, r4, 16 mov r5, sp ldr r7, =0x02039b4c ldr r6, =0x0000060c -_080BCB82: +@080BCB82: ldr r1, =0x0855c9da asrs r0, 15 adds r0, r1 @@ -356104,13 +356104,13 @@ _080BCB82: lsrs r0, 16 ldrh r3, [r5] cmp r0, r3 - bhi _080BCBE2 + bhi @080BCBE2 ldrh r0, [r5, 0x4] movs r1, 0x1 bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - beq _080BCBE2 + beq @080BCBE2 ldr r2, [r7] adds r3, r2, r6 ldrh r0, [r3] @@ -356139,18 +356139,18 @@ _080BCB82: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_080BCBE2: +@080BCBE2: lsls r0, r4, 16 ldr r4, =0xffff0000 adds r0, r4 lsrs r4, r0, 16 lsls r0, r4, 16 cmp r0, 0 - bge _080BCB82 - b _080BCDB4 + bge @080BCB82 + b @080BCDB4 .align 2, 0 .pool -_080BCC08: +@080BCC08: movs r4, 0 mov r5, sp ldr r7, =0x02039b4c @@ -356158,7 +356158,7 @@ _080BCC08: ldr r6, =0x0000060c ldr r0, =0x00000181 mov r9, r0 -_080BCC16: +@080BCC16: ldr r1, =0x0855c9da lsls r4, 16 asrs r0, r4, 15 @@ -356172,13 +356172,13 @@ _080BCC16: adds r7, r4, 0 ldrh r1, [r5] cmp r0, r1 - bhi _080BCC7E + bhi @080BCC7E ldrh r0, [r5, 0x4] movs r1, 0x1 bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - beq _080BCC7E + beq @080BCC7E mov r3, r8 ldr r2, [r3] adds r3, r2, r6 @@ -356209,24 +356209,24 @@ _080BCC16: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_080BCC7E: +@080BCC7E: movs r1, 0x80 lsls r1, 9 adds r0, r7, r1 lsrs r4, r0, 16 asrs r0, 16 cmp r0, r9 - ble _080BCC16 - b _080BCDB4 + ble @080BCC16 + b @080BCDB4 .align 2, 0 .pool -_080BCCA0: +@080BCCA0: ldr r4, =0x00000181 lsls r0, r4, 16 mov r5, sp ldr r7, =0x02039b4c ldr r6, =0x0000060c -_080BCCAA: +@080BCCAA: ldr r1, =0x0855ccde asrs r0, 15 adds r0, r1 @@ -356238,13 +356238,13 @@ _080BCCAA: lsrs r0, 16 ldrh r2, [r5] cmp r0, r2 - bhi _080BCD0A + bhi @080BCD0A ldrh r0, [r5, 0x4] movs r1, 0x1 bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - beq _080BCD0A + beq @080BCD0A ldr r2, [r7] adds r3, r2, r6 ldrh r0, [r3] @@ -356273,18 +356273,18 @@ _080BCCAA: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_080BCD0A: +@080BCD0A: lsls r0, r4, 16 ldr r3, =0xffff0000 adds r0, r3 lsrs r4, r0, 16 lsls r0, r4, 16 cmp r0, 0 - bge _080BCCAA - b _080BCDB4 + bge @080BCCAA + b @080BCDB4 .align 2, 0 .pool -_080BCD30: +@080BCD30: movs r4, 0 mov r5, sp ldr r7, =0x02039b4c @@ -356292,7 +356292,7 @@ _080BCD30: ldr r6, =0x0000060c ldr r0, =0x00000181 mov r9, r0 -_080BCD3E: +@080BCD3E: ldr r1, =0x0855ccde lsls r4, 16 asrs r0, r4, 15 @@ -356306,13 +356306,13 @@ _080BCD3E: adds r7, r4, 0 ldrh r1, [r5] cmp r0, r1 - bhi _080BCDA6 + bhi @080BCDA6 ldrh r0, [r5, 0x4] movs r1, 0x1 bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - beq _080BCDA6 + beq @080BCDA6 mov r3, r8 ldr r2, [r3] adds r3, r2, r6 @@ -356343,15 +356343,15 @@ _080BCD3E: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_080BCDA6: +@080BCDA6: movs r1, 0x80 lsls r1, 9 adds r0, r7, r1 lsrs r4, r0, 16 asrs r0, 16 cmp r0, r9 - ble _080BCD3E -_080BCDB4: + ble @080BCD3E +@080BCDB4: ldr r1, =0x02039b4c ldr r0, [r1] ldr r2, =0x0000060c @@ -356361,7 +356361,7 @@ _080BCDB4: asrs r0, r3, 16 ldr r2, =0x00000181 cmp r0, r2 - bgt _080BCE08 + bgt @080BCE08 adds r5, r1, 0 movs r4, 0x2 negs r4, r4 @@ -356372,7 +356372,7 @@ _080BCDB4: adds r7, r2, 0 ldr r0, =0x0000ffff adds r6, r0, 0 -_080BCDDC: +@080BCDDC: ldr r1, [r5] asrs r3, 16 lsls r4, r3, 2 @@ -356394,8 +356394,8 @@ _080BCDDC: lsls r3, 16 asrs r0, r3, 16 cmp r0, r7 - ble _080BCDDC -_080BCE08: + ble @080BCDDC +@080BCE08: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -356409,7 +356409,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} @@ -356455,7 +356455,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 @@ -356468,25 +356468,25 @@ sub_80BCE84: @ 80BCE84 lsls r2, 16 lsrs r7, r2, 16 cmp r0, 0x1 - beq _080BCF7C + beq @080BCF7C cmp r0, 0x1 - ble _080BCEA8 + ble @080BCEA8 cmp r0, 0x2 - bne _080BCEA8 - b _080BD074 -_080BCEA8: + bne @080BCEA8 + b @080BD074 +@080BCEA8: subs r0, r1, 0x5 lsls r0, 16 lsrs r1, r0, 16 movs r0, 0 mov r9, r0 -_080BCEB2: +@080BCEB2: lsls r0, r1, 16 lsrs r5, r0, 16 mov r10, r0 ldr r1, =0x00000181 cmp r5, r1 - bhi _080BCED2 + bhi @080BCED2 ldr r2, =0x02039b4c mov r8, r2 ldr r0, [r2] @@ -356496,18 +356496,18 @@ _080BCEB2: ldrh r0, [r0] ldr r1, =0x0000ffff cmp r0, r1 - bne _080BCEF0 -_080BCED2: + bne @080BCEF0 +@080BCED2: mov r2, r9 lsls r1, r2, 25 lsrs r1, 24 movs r0, 0x11 adds r2, r7, 0 bl sub_80BD28C - b _080BCF64 + b @080BCF64 .align 2, 0 .pool -_080BCEF0: +@080BCEF0: mov r3, r9 lsls r0, r3, 25 lsrs r4, r0, 24 @@ -356521,7 +356521,7 @@ _080BCEF0: ldrb r0, [r0, 0x2] lsls r0, 31 cmp r0, 0 - beq _080BCF42 + beq @080BCF42 adds r0, r5, 0 movs r1, 0x12 adds r2, r4, 0 @@ -356544,8 +356544,8 @@ _080BCEF0: movs r1, 0x16 adds r2, r4, 0 bl sub_80BD23C - b _080BCF64 -_080BCF42: + b @080BCF64 +@080BCF42: adds r0, r5, 0 movs r1, 0x12 adds r2, r4, 0 @@ -356560,7 +356560,7 @@ _080BCF42: movs r1, 0x16 adds r2, r4, 0 bl sub_80BD23C -_080BCF64: +@080BCF64: movs r0, 0x80 lsls r0, 9 add r0, r10 @@ -356571,16 +356571,16 @@ _080BCF64: lsrs r0, 16 mov r9, r0 cmp r0, 0xA - bls _080BCEB2 - b _080BD13E -_080BCF7C: + bls @080BCEB2 + b @080BD13E +@080BCF7C: subs r0, r1, 0x5 lsls r1, r0, 16 lsrs r5, r1, 16 ldr r0, =0x00000181 ldr r2, =0x02039b4c cmp r5, r0 - bhi _080BCF9A + bhi @080BCF9A adds r6, r2, 0 ldr r3, [r6] asrs r4, r1, 14 @@ -356588,8 +356588,8 @@ _080BCF7C: ldrh r1, [r0] ldr r0, =0x0000ffff cmp r1, r0 - bne _080BCFB8 -_080BCF9A: + bne @080BCFB8 +@080BCF9A: ldr r0, [r2] movs r1, 0xC6 lsls r1, 3 @@ -356597,10 +356597,10 @@ _080BCF9A: movs r2, 0 ldrsh r1, [r0, r2] lsls r1, 25 - b _080BD0B2 + b @080BD0B2 .align 2, 0 .pool -_080BCFB8: +@080BCFB8: movs r1, 0xC6 lsls r1, 3 adds r0, r3, r1 @@ -356616,7 +356616,7 @@ _080BCFB8: ldrb r0, [r0, 0x2] lsls r0, 31 cmp r0, 0 - beq _080BD028 + beq @080BD028 movs r3, 0xC6 lsls r3, 3 adds r0, r1, r3 @@ -356653,8 +356653,8 @@ _080BCFB8: ldrsh r2, [r1, r3] lsls r2, 25 lsrs r2, 24 - b _080BD06C -_080BD028: + b @080BD06C +@080BD028: movs r2, 0xC6 lsls r2, 3 adds r0, r1, r2 @@ -356687,11 +356687,11 @@ _080BD028: lsls r2, 25 lsrs r2, 24 movs r0, 0 -_080BD06C: +@080BD06C: movs r1, 0x16 bl sub_80BD23C - b _080BD13E -_080BD074: + b @080BD13E +@080BD074: adds r0, r1, 0x5 lsls r0, 16 lsrs r1, r0, 16 @@ -356706,34 +356706,34 @@ _080BD074: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0xF - bls _080BD09A + bls @080BD09A adds r0, r2, 0 subs r0, 0x10 lsls r0, 16 lsrs r2, r0, 16 -_080BD09A: +@080BD09A: lsls r1, 16 lsrs r5, r1, 16 ldr r0, =0x00000181 cmp r5, r0 - bhi _080BD0B0 + bhi @080BD0B0 asrs r6, r1, 14 adds r0, r3, r6 ldrh r1, [r0] ldr r0, =0x0000ffff cmp r1, r0 - bne _080BD0CC -_080BD0B0: + bne @080BD0CC +@080BD0B0: lsls r1, r2, 25 -_080BD0B2: +@080BD0B2: lsrs r1, 24 movs r0, 0x11 adds r2, r7, 0 bl sub_80BD28C - b _080BD13E + b @080BD13E .align 2, 0 .pool -_080BD0CC: +@080BD0CC: lsls r0, r2, 25 lsrs r4, r0, 24 movs r0, 0x11 @@ -356746,7 +356746,7 @@ _080BD0CC: ldrb r0, [r0, 0x2] lsls r0, 31 cmp r0, 0 - beq _080BD11C + beq @080BD11C adds r0, r5, 0 movs r1, 0x12 adds r2, r4, 0 @@ -356769,8 +356769,8 @@ _080BD0CC: movs r1, 0x16 adds r2, r4, 0 bl sub_80BD23C - b _080BD13E -_080BD11C: + b @080BD13E +@080BD11C: adds r0, r5, 0 movs r1, 0x12 adds r2, r4, 0 @@ -356785,7 +356785,7 @@ _080BD11C: movs r1, 0x16 adds r2, r4, 0 bl sub_80BD23C -_080BD13E: +@080BD13E: movs r0, 0 movs r1, 0x2 bl Window_CopyToVram @@ -356799,7 +356799,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} @@ -356825,12 +356825,12 @@ sub_80BD154: @ 80BD154 adds r0, r1 ldrh r0, [r0] cmp r0, 0 - bne _080BD194 + bne @080BD194 adds r0, r6, 0 bl NationalToHoennOrder lsls r0, 16 lsrs r6, r0, 16 -_080BD194: +@080BD194: add r4, sp, 0x4 adds r0, r6, 0 movs r1, 0x64 @@ -356872,7 +356872,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 @@ -356881,7 +356881,7 @@ sub_80BD1F4: @ 80BD1F4 lsls r2, 24 lsrs r4, r2, 24 cmp r0, 0 - beq _080BD220 + beq @080BD220 ldr r1, =0x0855d2be lsls r2, r3, 3 lsls r3, r4, 3 @@ -356891,10 +356891,10 @@ sub_80BD1F4: @ 80BD1F4 str r0, [sp, 0x4] movs r0, 0 bl Window_CopyWholePixelBlockToWindow - b _080BD234 + b @080BD234 .align 2, 0 .pool -_080BD220: +@080BD220: lsls r2, r3, 3 lsls r3, r4, 3 movs r0, 0x8 @@ -356904,7 +356904,7 @@ _080BD220: movs r0, 0 movs r1, 0 bl Window_FillPixelRect -_080BD234: +@080BD234: add sp, 0x8 pop {r4} pop {r0} @@ -356912,7 +356912,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 @@ -356924,17 +356924,17 @@ sub_80BD23C: @ 80BD23C bl NationalPokedexNumToSpecies adds r1, r0, 0 cmp r1, 0 - beq _080BD264 + beq @080BD264 movs r0, 0xB muls r1, r0 ldr r0, =0x083185c8 adds r4, r1, r0 - b _080BD266 + b @080BD266 .align 2, 0 .pool -_080BD264: +@080BD264: ldr r4, =0x0855d2fe -_080BD266: +@080BD266: str r5, [sp] movs r0, 0 movs r1, 0x7 @@ -356954,7 +356954,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 @@ -356976,7 +356976,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} @@ -356996,7 +356996,7 @@ sub_80BD2B4: @ 80BD2B4 ldr r4, =0x0000061e ldr r0, =0x0000ffff adds r3, r0, 0 -_080BD2DA: +@080BD2DA: ldr r1, [r5] lsls r0, r2, 1 adds r1, r4 @@ -357008,7 +357008,7 @@ _080BD2DA: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls _080BD2DA + bls @080BD2DA ldr r0, [r7] ldr r1, =0x00000626 adds r0, r1 @@ -357022,7 +357022,7 @@ _080BD2DA: lsrs r0, 16 ldr r4, =0x0000ffff cmp r0, r4 - beq _080BD334 + beq @080BD334 movs r1, 0x60 movs r2, 0x50 bl sub_80BDACC @@ -357040,13 +357040,13 @@ _080BD2DA: adds r0, r3 ldr r1, =0x0000ffe0 strh r1, [r0, 0x38] -_080BD334: +@080BD334: adds r0, r6, 0 bl sub_80BDA8C lsls r0, 16 lsrs r0, 16 cmp r0, r4 - beq _080BD366 + beq @080BD366 movs r1, 0x60 movs r2, 0x50 bl sub_80BDACC @@ -357064,7 +357064,7 @@ _080BD334: adds r0, r3 movs r1, 0 strh r1, [r0, 0x38] -_080BD366: +@080BD366: adds r0, r6, 0x1 lsls r0, 16 lsrs r0, 16 @@ -357072,7 +357072,7 @@ _080BD366: lsls r0, 16 lsrs r0, 16 cmp r0, r4 - beq _080BD39C + beq @080BD39C movs r1, 0x60 movs r2, 0x50 bl sub_80BDACC @@ -357090,7 +357090,7 @@ _080BD366: adds r0, r3 movs r1, 0x20 strh r1, [r0, 0x38] -_080BD39C: +@080BD39C: movs r0, 0 adds r1, r6, 0 mov r2, r8 @@ -357125,7 +357125,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} @@ -357142,26 +357142,26 @@ sub_80BD404: @ 80BD404 ldrb r3, [r2] adds r7, r0, 0 cmp r3, 0 - bne _080BD428 - b _080BD578 -_080BD428: + bne @080BD428 + b @080BD578 +@080BD428: subs r0, r3, 0x1 strb r0, [r2] cmp r4, 0x1 - beq _080BD440 + beq @080BD440 cmp r4, 0x2 - beq _080BD4DC - b _080BD558 + beq @080BD4DC + b @080BD558 .align 2, 0 .pool -_080BD440: +@080BD440: movs r3, 0 ldr r4, =0x0000ffff mov r12, r4 ldr r0, =0x02020630 mov r8, r0 adds r2, r7, 0 -_080BD44C: +@080BD44C: ldr r0, [r2] lsls r1, r3, 1 ldr r4, =0x0000061e @@ -357169,7 +357169,7 @@ _080BD44C: adds r1, r0, r1 ldrh r0, [r1] cmp r0, r12 - beq _080BD46A + beq @080BD46A lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -357177,12 +357177,12 @@ _080BD44C: ldrh r0, [r1, 0x38] adds r0, r5 strh r0, [r1, 0x38] -_080BD46A: +@080BD46A: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x3 - bls _080BD44C + bls @080BD44C ldr r4, [r7] ldr r1, =0x0000062e adds r0, r4, r1 @@ -357217,17 +357217,17 @@ _080BD46A: ldrb r0, [r2] subs r0, r1 strb r0, [r2] - b _080BD558 + b @080BD558 .align 2, 0 .pool -_080BD4DC: +@080BD4DC: movs r3, 0 ldr r2, =0x0000ffff mov r12, r2 ldr r4, =0x02020630 mov r8, r4 adds r2, r7, 0 -_080BD4E8: +@080BD4E8: ldr r0, [r2] lsls r1, r3, 1 ldr r4, =0x0000061e @@ -357235,7 +357235,7 @@ _080BD4E8: adds r1, r0, r1 ldrh r0, [r1] cmp r0, r12 - beq _080BD506 + beq @080BD506 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -357243,12 +357243,12 @@ _080BD4E8: ldrh r0, [r1, 0x38] subs r0, r5 strh r0, [r1, 0x38] -_080BD506: +@080BD506: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x3 - bls _080BD4E8 + bls @080BD4E8 ldr r4, [r7] ldr r1, =0x0000062e adds r0, r4, r1 @@ -357283,12 +357283,12 @@ _080BD506: ldrb r3, [r1] adds r0, r3 strb r0, [r1] -_080BD558: +@080BD558: movs r0, 0 - b _080BD598 + b @080BD598 .align 2, 0 .pool -_080BD578: +@080BD578: ldr r4, =0x0000062d adds r2, r1, r4 movs r3, 0xC6 @@ -357304,7 +357304,7 @@ _080BD578: movs r0, 0x1A bl lcd_io_set movs r0, 0x1 -_080BD598: +@080BD598: pop {r3} mov r8, r3 pop {r4-r7} @@ -357315,7 +357315,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 @@ -357331,13 +357331,13 @@ sub_80BD5A8: @ 80BD5A8 adds r0, r6 strh r1, [r0] cmp r2, 0x1 - beq _080BD5D8 + beq @080BD5D8 cmp r2, 0x2 - beq _080BD638 - b _080BD694 + beq @080BD638 + b @080BD694 .align 2, 0 .pool -_080BD5D8: +@080BD5D8: subs r0, r3, 0x1 lsls r0, 16 lsrs r0, 16 @@ -357346,7 +357346,7 @@ _080BD5D8: lsrs r1, r0, 16 ldr r0, =0x0000ffff cmp r1, r0 - beq _080BD612 + beq @080BD612 adds r0, r1, 0 movs r1, 0x60 movs r2, 0x50 @@ -357365,22 +357365,22 @@ _080BD5D8: adds r0, r3 ldr r1, =0x0000ffc0 strh r1, [r0, 0x38] -_080BD612: +@080BD612: ldr r0, [r4] adds r1, r0, r5 ldrh r2, [r1] movs r3, 0 ldrsh r0, [r1, r3] cmp r0, 0 - ble _080BD634 + ble @080BD634 subs r0, r2, 0x1 - b _080BD692 + b @080BD692 .align 2, 0 .pool -_080BD634: +@080BD634: movs r0, 0xF - b _080BD692 -_080BD638: + b @080BD692 +@080BD638: adds r0, r3, 0x1 lsls r0, 16 lsrs r0, 16 @@ -357389,7 +357389,7 @@ _080BD638: lsrs r1, r0, 16 ldr r0, =0x0000ffff cmp r1, r0 - beq _080BD672 + beq @080BD672 adds r0, r1, 0 movs r1, 0x60 movs r2, 0x50 @@ -357408,30 +357408,30 @@ _080BD638: adds r0, r3 movs r1, 0x40 strh r1, [r0, 0x38] -_080BD672: +@080BD672: ldr r0, [r4] adds r1, r0, r5 ldrh r2, [r1] movs r6, 0 ldrsh r0, [r1, r6] cmp r0, 0xE - bgt _080BD690 + bgt @080BD690 adds r0, r2, 0x1 - b _080BD692 + b @080BD692 .align 2, 0 .pool -_080BD690: +@080BD690: movs r0, 0 -_080BD692: +@080BD692: strh r0, [r1] -_080BD694: +@080BD694: pop {r4-r6} pop {r0} bx r0 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 @@ -357448,9 +357448,9 @@ sub_80BD69C: @ 80BD69C movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _080BD6FC + beq @080BD6FC cmp r7, 0 - beq _080BD6FC + beq @080BD6FC movs r1, 0x1 mov r10, r1 ldr r0, =0x02039b4c @@ -357470,15 +357470,15 @@ sub_80BD69C: @ 80BD69C adds r1, r7, 0 bl sub_80BD5A8 movs r0, 0x1 - b _080BD734 + b @080BD734 .align 2, 0 .pool -_080BD6FC: +@080BD6FC: ldrh r1, [r2, 0x2C] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080BD74C + beq @080BD74C ldr r0, =0x02039b4c ldr r0, [r0] ldr r3, =0x0000060c @@ -357486,7 +357486,7 @@ _080BD6FC: ldrh r0, [r0] subs r0, 0x1 cmp r7, r0 - bge _080BD74C + bge @080BD74C movs r1, 0x2 mov r10, r1 lsls r3, r0, 16 @@ -357500,26 +357500,26 @@ _080BD6FC: adds r1, r7, 0 bl sub_80BD5A8 movs r0, 0x2 -_080BD734: +@080BD734: adds r1, r7, 0 adds r2, r4, 0 bl sub_80BCE84 movs r0, 0x6C bl audio_play - b _080BD81A + b @080BD81A .align 2, 0 .pool -_080BD74C: +@080BD74C: ldrh r1, [r2, 0x2E] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080BD7B4 + beq @080BD7B4 cmp r7, 0 - beq _080BD7B4 + beq @080BD7B4 adds r6, r7, 0 movs r4, 0 -_080BD75E: +@080BD75E: ldr r5, =0x02039b4c ldr r0, [r5] ldr r2, =0x0000060c @@ -357537,7 +357537,7 @@ _080BD75E: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x6 - bls _080BD75E + bls @080BD75E ldr r1, [r5] ldr r3, =0x0000062c adds r1, r3 @@ -357552,15 +357552,15 @@ _080BD75E: bl sub_80BD2B4 movs r0, 0x6D bl audio_play - b _080BD81A + b @080BD81A .align 2, 0 .pool -_080BD7B4: +@080BD7B4: ldrh r1, [r2, 0x2E] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080BD81A + beq @080BD81A ldr r0, =0x02039b4c ldr r0, [r0] ldr r3, =0x0000060c @@ -357568,10 +357568,10 @@ _080BD7B4: ldrh r0, [r0] subs r0, 0x1 cmp r7, r0 - bge _080BD81A + bge @080BD81A adds r6, r7, 0 movs r4, 0 -_080BD7D2: +@080BD7D2: ldr r5, =0x02039b4c ldr r0, [r5] ldr r1, =0x0000060c @@ -357589,7 +357589,7 @@ _080BD7D2: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x6 - bls _080BD7D2 + bls @080BD7D2 ldr r1, [r5] ldr r2, =0x0000062c adds r1, r2 @@ -357604,10 +357604,10 @@ _080BD7D2: bl sub_80BD2B4 movs r0, 0x6D bl audio_play -_080BD81A: +@080BD81A: mov r0, r10 cmp r0, 0 - bne _080BD83C + bne @080BD83C ldr r0, =0x02039b4c ldr r0, [r0] movs r1, 0xC7 @@ -357615,10 +357615,10 @@ _080BD81A: adds r0, r1 mov r2, r10 strh r2, [r0] - b _080BD8A2 + b @080BD8A2 .align 2, 0 .pool -_080BD83C: +@080BD83C: ldr r1, =0x0855d28c ldr r6, =0x02039b4c ldr r2, [r6] @@ -357666,10 +357666,10 @@ _080BD83C: adds r1, r0, r2 ldrh r0, [r1] cmp r0, 0xB - bhi _080BD8A2 + bhi @080BD8A2 adds r0, 0x1 strh r0, [r1] -_080BD8A2: +@080BD8A2: adds r0, r7, 0 pop {r3-r5} mov r8, r3 @@ -357683,14 +357683,14 @@ _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 mov r12, r0 ldr r6, =0x02020630 ldr r5, =0x0000ffff -_080BD8DC: +@080BD8DC: mov r1, r12 ldr r3, [r1] lsls r1, r4, 1 @@ -357705,22 +357705,22 @@ _080BD8DC: movs r7, 0x24 ldrsh r0, [r1, r7] cmp r0, 0 - bne _080BD90C + bne @080BD90C movs r7, 0x26 ldrsh r0, [r1, r7] cmp r0, 0 - bne _080BD90C + bne @080BD90C cmp r2, r5 - beq _080BD90C + beq @080BD90C ldr r1, =0x00000626 adds r0, r3, r1 strh r2, [r0] -_080BD90C: +@080BD90C: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x3 - bls _080BD8DC + bls @080BD8DC pop {r4-r7} pop {r0} bx r0 @@ -357729,7 +357729,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] @@ -357741,12 +357741,12 @@ sub_80BD930: @ 80BD930 movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _080BD9B8 + beq @080BD9B8 cmp r4, 0 - beq _080BD9B8 + beq @080BD9B8 adds r2, r4, 0 adds r5, r3, 0 -_080BD950: +@080BD950: ldr r0, [r5] ldr r1, =0x0000060c adds r0, r1 @@ -357766,52 +357766,52 @@ _080BD950: ldrb r0, [r0, 0x2] lsls r0, 31 cmp r0, 0 - bne _080BD9A0 + bne @080BD9A0 cmp r2, 0 - bne _080BD950 -_080BD97E: + bne @080BD950 +@080BD97E: ldr r0, =0x02039b4c ldr r1, [r0] ldr r0, =0x0000060e adds r2, r1, r0 ldrh r0, [r2] cmp r0, r4 - bne _080BD9A4 - b _080BDA38 + bne @080BD9A4 + b @080BDA38 .align 2, 0 .pool -_080BD9A0: +@080BD9A0: adds r4, r2, 0 - b _080BD97E -_080BD9A4: + b @080BD97E +@080BD9A4: strh r4, [r2] ldr r0, =0x0000062c adds r1, r0 ldrb r0, [r1] subs r0, 0x10 - b _080BDA20 + b @080BDA20 .align 2, 0 .pool -_080BD9B4: +@080BD9B4: adds r4, r2, 0 - b _080BDA08 -_080BD9B8: + b @080BDA08 +@080BD9B8: ldrh r1, [r2, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080BDA38 + beq @080BDA38 ldr r0, [r3] ldr r1, =0x0000060c adds r0, r1 ldrh r0, [r0] subs r0, 0x1 cmp r4, r0 - bge _080BDA38 + bge @080BDA38 adds r2, r4, 0 adds r6, r3, 0 adds r5, r1, 0 -_080BD9D6: +@080BD9D6: ldr r0, [r6] adds r0, r5 ldrh r3, [r0] @@ -357830,46 +357830,46 @@ _080BD9D6: ldrb r0, [r0, 0x2] lsls r0, 31 cmp r0, 0 - bne _080BD9B4 + bne @080BD9B4 adds r0, r1, r5 ldrh r0, [r0] subs r0, 0x1 cmp r2, r0 - blt _080BD9D6 -_080BDA08: + blt @080BD9D6 +@080BDA08: ldr r0, =0x02039b4c ldr r1, [r0] ldr r0, =0x0000060e adds r2, r1, r0 ldrh r0, [r2] cmp r0, r4 - beq _080BDA38 + beq @080BDA38 strh r4, [r2] ldr r0, =0x0000062c adds r1, r0 ldrb r0, [r1] adds r0, 0x10 -_080BDA20: +@080BDA20: strb r0, [r1] movs r0, 0x1 - b _080BDA3A + b @080BDA3A .align 2, 0 .pool -_080BDA38: +@080BDA38: movs r0, 0 -_080BDA3A: +@080BDA3A: pop {r4-r6} pop {r1} bx r1 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 ldr r7, =0x0000ffff -_080BDA48: +@080BDA48: ldr r0, [r6] lsls r4, r5, 1 ldr r1, =0x0000061e @@ -357877,7 +357877,7 @@ _080BDA48: adds r1, r0, r4 ldrh r0, [r1] cmp r0, r7 - beq _080BDA6C + beq @080BDA6C bl sub_818D820 ldr r1, [r6] ldr r0, =0x0000061e @@ -357887,12 +357887,12 @@ _080BDA48: adds r0, r7, 0 orrs r0, r2 strh r0, [r1] -_080BDA6C: +@080BDA6C: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x3 - bls _080BDA48 + bls @080BDA48 movs r0, 0 pop {r4-r7} pop {r1} @@ -357902,13 +357902,13 @@ _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 ldr r0, =0x00000181 cmp r2, r0 - bhi _080BDAA8 + bhi @080BDAA8 ldr r0, =0x02039b4c ldr r1, [r0] lsls r0, r2, 2 @@ -357916,28 +357916,28 @@ sub_80BDA8C: @ 80BDA8C ldrh r1, [r2] ldr r0, =0x0000ffff cmp r1, r0 - bne _080BDAB8 -_080BDAA8: + bne @080BDAB8 +@080BDAA8: ldr r0, =0x0000ffff - b _080BDAC6 + b @080BDAC6 .align 2, 0 .pool -_080BDAB8: +@080BDAB8: ldrb r0, [r2, 0x2] lsls r0, 31 cmp r0, 0 - bne _080BDAC4 + bne @080BDAC4 movs r0, 0 - b _080BDAC6 -_080BDAC4: + b @080BDAC6 +@080BDAC4: ldrh r0, [r2] -_080BDAC6: +@080BDAC6: pop {r1} bx r1 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 @@ -357952,7 +357952,7 @@ sub_80BDACC: @ 80BDACC mov r9, r0 ldr r3, =0x0000ffff lsls r1, 16 -_080BDAE8: +@080BDAE8: mov r4, r9 ldr r0, [r4] lsls r7, r6, 1 @@ -357961,7 +357961,7 @@ _080BDAE8: adds r0, r7 ldrh r0, [r0] cmp r0, r3 - bne _080BDB60 + bne @080BDB60 lsls r2, 16 mov r0, r8 asrs r1, 16 @@ -358001,17 +358001,17 @@ _080BDAE8: adds r0, r7 strh r5, [r0] adds r0, r5, 0 - b _080BDB6C + b @080BDB6C .align 2, 0 .pool -_080BDB60: +@080BDB60: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x3 - bls _080BDAE8 + bls @080BDAE8 ldr r0, =0x0000ffff -_080BDB6C: +@080BDB6C: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -358023,7 +358023,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 @@ -358178,14 +358178,14 @@ sub_80BDB7C: @ 80BDB7C strh r0, [r1, 0x30] mov r1, r8 cmp r1, 0 - beq _080BDCCC - b _080BE414 -_080BDCCC: + beq @080BDCCC + b @080BE414 +@080BDCCC: bl sub_809D42C cmp r0, 0 - beq _080BDCD6 - b _080BDF4C -_080BDCD6: + beq @080BDCD6 + b @080BDF4C +@080BDCD6: ldr r4, =0x0855d1f4 adds r0, r4, 0 movs r1, 0x20 @@ -358233,20 +358233,20 @@ _080BDCD6: adds r0, r4, 0 bl obj_anim_image_start cmp r5, 0 - beq _080BDD6C + beq @080BDD6C movs r0, 0x1 mov r8, r0 - b _080BDD78 + b @080BDD78 .align 2, 0 .pool -_080BDD6C: +@080BDD6C: adds r0, r4, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_080BDD78: +@080BDD78: ldr r0, =0x0855d224 movs r1, 0x20 movs r2, 0x30 @@ -358268,11 +358268,11 @@ _080BDD78: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - bne _080BDDB0 + bne @080BDDB0 mov r0, r8 cmp r0, 0 - beq _080BDDD4 -_080BDDB0: + beq @080BDDD4 +@080BDDB0: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -358281,10 +358281,10 @@ _080BDDB0: lsls r1, r5, 24 lsrs r1, 24 bl obj_anim_image_start - b _080BDDE8 + b @080BDDE8 .align 2, 0 .pool -_080BDDD4: +@080BDDD4: ldr r1, =0x02020630 lsls r0, r7, 4 adds r0, r7 @@ -358295,7 +358295,7 @@ _080BDDD4: movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_080BDDE8: +@080BDDE8: ldr r6, =0x0855d224 adds r0, r6, 0 movs r1, 0x28 @@ -358350,20 +358350,20 @@ _080BDDE8: adds r0, r4, 0 bl obj_anim_image_start cmp r5, 0 - beq _080BDE80 + beq @080BDE80 movs r0, 0x1 mov r8, r0 - b _080BDE8C + b @080BDE8C .align 2, 0 .pool -_080BDE80: +@080BDE80: adds r0, r4, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_080BDE8C: +@080BDE8C: ldr r0, =0x0855d224 movs r1, 0x20 movs r2, 0x50 @@ -358385,11 +358385,11 @@ _080BDE8C: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - bne _080BDEC4 + bne @080BDEC4 mov r0, r8 cmp r0, 0 - beq _080BDEE8 -_080BDEC4: + beq @080BDEE8 +@080BDEC4: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -358398,10 +358398,10 @@ _080BDEC4: lsls r1, r5, 24 lsrs r1, 24 bl obj_anim_image_start - b _080BDEFC + b @080BDEFC .align 2, 0 .pool -_080BDEE8: +@080BDEE8: ldr r1, =0x02020630 lsls r0, r7, 4 adds r0, r7 @@ -358412,7 +358412,7 @@ _080BDEE8: movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_080BDEFC: +@080BDEFC: ldr r0, =0x0855d224 movs r1, 0x28 movs r2, 0x50 @@ -358440,10 +358440,10 @@ _080BDEFC: lsls r1, 24 lsrs r1, 24 bl obj_anim_image_start - b _080BE3E2 + b @080BE3E2 .align 2, 0 .pool -_080BDF4C: +@080BDF4C: ldr r4, =0x0855d1f4 adds r0, r4, 0 movs r1, 0x20 @@ -358528,20 +358528,20 @@ _080BDF4C: adds r0, r4, 0 bl obj_anim_image_start cmp r5, 0 - beq _080BE024 + beq @080BE024 movs r0, 0x1 mov r8, r0 - b _080BE030 + b @080BE030 .align 2, 0 .pool -_080BE024: +@080BE024: adds r0, r4, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_080BE030: +@080BE030: ldr r0, =0x0855d23c movs r1, 0x30 movs r2, 0x2D @@ -358559,11 +358559,11 @@ _080BE030: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - bne _080BE060 + bne @080BE060 mov r1, r8 cmp r1, 0 - beq _080BE07C -_080BE060: + beq @080BE07C +@080BE060: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -358572,10 +358572,10 @@ _080BE060: lsls r1, r5, 24 lsrs r1, 24 bl obj_anim_image_start - b _080BE090 + b @080BE090 .align 2, 0 .pool -_080BE07C: +@080BE07C: ldr r1, =0x02020630 lsls r0, r7, 4 adds r0, r7 @@ -358586,7 +358586,7 @@ _080BE07C: movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_080BE090: +@080BE090: ldr r5, =0x0855d23c adds r0, r5, 0 movs r1, 0x38 @@ -358638,20 +358638,20 @@ _080BE090: adds r0, r4, 0 bl obj_anim_image_start cmp r5, 0 - beq _080BE11C + beq @080BE11C movs r0, 0x1 mov r8, r0 - b _080BE128 + b @080BE128 .align 2, 0 .pool -_080BE11C: +@080BE11C: adds r0, r4, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_080BE128: +@080BE128: ldr r0, =0x0855d23c movs r1, 0x30 movs r2, 0x37 @@ -358673,11 +358673,11 @@ _080BE128: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - bne _080BE160 + bne @080BE160 mov r0, r8 cmp r0, 0 - beq _080BE184 -_080BE160: + beq @080BE184 +@080BE160: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -358686,10 +358686,10 @@ _080BE160: lsls r1, r5, 24 lsrs r1, 24 bl obj_anim_image_start - b _080BE198 + b @080BE198 .align 2, 0 .pool -_080BE184: +@080BE184: ldr r1, =0x02020630 lsls r0, r7, 4 adds r0, r7 @@ -358700,7 +358700,7 @@ _080BE184: movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_080BE198: +@080BE198: ldr r5, =0x0855d23c adds r0, r5, 0 movs r1, 0x38 @@ -358756,20 +358756,20 @@ _080BE198: adds r0, r4, 0 bl obj_anim_image_start cmp r5, 0 - beq _080BE230 + beq @080BE230 movs r1, 0x1 mov r8, r1 - b _080BE23C + b @080BE23C .align 2, 0 .pool -_080BE230: +@080BE230: adds r0, r4, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_080BE23C: +@080BE23C: ldr r0, =0x0855d23c movs r1, 0x30 movs r2, 0x51 @@ -358787,11 +358787,11 @@ _080BE23C: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - bne _080BE26C + bne @080BE26C mov r0, r8 cmp r0, 0 - beq _080BE288 -_080BE26C: + beq @080BE288 +@080BE26C: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -358800,10 +358800,10 @@ _080BE26C: lsls r1, r5, 24 lsrs r1, 24 bl obj_anim_image_start - b _080BE29C + b @080BE29C .align 2, 0 .pool -_080BE288: +@080BE288: ldr r1, =0x02020630 lsls r0, r7, 4 adds r0, r7 @@ -358814,7 +358814,7 @@ _080BE288: movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_080BE29C: +@080BE29C: ldr r5, =0x0855d23c adds r0, r5, 0 movs r1, 0x38 @@ -358866,20 +358866,20 @@ _080BE29C: adds r0, r4, 0 bl obj_anim_image_start cmp r5, 0 - beq _080BE328 + beq @080BE328 movs r0, 0x1 mov r8, r0 - b _080BE334 + b @080BE334 .align 2, 0 .pool -_080BE328: +@080BE328: adds r0, r4, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_080BE334: +@080BE334: ldr r0, =0x0855d23c movs r1, 0x30 movs r2, 0x5B @@ -358901,11 +358901,11 @@ _080BE334: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - bne _080BE36C + bne @080BE36C mov r0, r8 cmp r0, 0 - beq _080BE390 -_080BE36C: + beq @080BE390 +@080BE36C: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -358914,10 +358914,10 @@ _080BE36C: lsls r1, r5, 24 lsrs r1, 24 bl obj_anim_image_start - b _080BE3A4 + b @080BE3A4 .align 2, 0 .pool -_080BE390: +@080BE390: ldr r1, =0x02020630 lsls r0, r7, 4 adds r0, r7 @@ -358928,7 +358928,7 @@ _080BE390: movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_080BE3A4: +@080BE3A4: ldr r0, =0x0855d23c movs r1, 0x38 movs r2, 0x5B @@ -358956,7 +358956,7 @@ _080BE3A4: lsls r1, 24 lsrs r1, 24 bl obj_anim_image_start -_080BE3E2: +@080BE3E2: ldr r0, =0x0855d254 movs r1, 0x88 movs r2, 0x60 @@ -358969,10 +358969,10 @@ _080BE3E2: adds r0, r7 lsls r0, 2 adds r0, r1 - b _080BE42C + b @080BE42C .align 2, 0 .pool -_080BE414: +@080BE414: ldr r0, =0x0855d254 movs r1, 0x88 movs r2, 0x50 @@ -358984,7 +358984,7 @@ _080BE414: adds r0, r7 lsls r0, 2 add r0, r10 -_080BE42C: +@080BE42C: adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 @@ -359002,12 +359002,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 @@ -359016,10 +359016,10 @@ sub_80BE44C: @ 80BE44C adds r0, r2 ldrb r0, [r0] cmp r0, 0 - beq _080BE464 + beq @080BE464 adds r0, r1, 0 bl obj_delete_and_free_tiles -_080BE464: +@080BE464: pop {r0} bx r0 .align 2, 0 @@ -359027,7 +359027,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] @@ -359046,45 +359046,45 @@ sub_80BE470: @ 80BE470 ldr r1, [r2, 0x20] ldr r0, =0x00380030 cmp r1, r0 - beq _080BE4D4 + beq @080BE4D4 ldrh r1, [r2, 0x20] movs r3, 0x20 ldrsh r0, [r2, r3] cmp r0, 0x30 - ble _080BE4A4 + ble @080BE4A4 subs r0, r1, 0x1 strh r0, [r2, 0x20] -_080BE4A4: +@080BE4A4: ldrh r1, [r2, 0x20] movs r3, 0x20 ldrsh r0, [r2, r3] cmp r0, 0x2F - bgt _080BE4B2 + bgt @080BE4B2 adds r0, r1, 0x1 strh r0, [r2, 0x20] -_080BE4B2: +@080BE4B2: ldrh r1, [r2, 0x22] movs r3, 0x22 ldrsh r0, [r2, r3] cmp r0, 0x38 - ble _080BE4C0 + ble @080BE4C0 subs r0, r1, 0x1 strh r0, [r2, 0x22] -_080BE4C0: +@080BE4C0: ldrh r1, [r2, 0x22] movs r3, 0x22 ldrsh r0, [r2, r3] cmp r0, 0x37 - bgt _080BE4D8 + bgt @080BE4D8 adds r0, r1, 0x1 strh r0, [r2, 0x22] - b _080BE4D8 + b @080BE4D8 .align 2, 0 .pool -_080BE4D4: +@080BE4D4: ldr r0, =nullsub_38 + 1 str r0, [r2, 0x1C] -_080BE4D8: +@080BE4D8: pop {r0} bx r0 .align 2, 0 @@ -359092,7 +359092,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 @@ -359105,9 +359105,9 @@ sub_80BE4E0: @ 80BE4E0 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080BE520 + beq @080BE520 cmp r0, 0x3 - beq _080BE520 + beq @080BE520 lsls r5, r6, 1 ldr r4, =0x0000061e adds r0, r1, r4 @@ -359117,10 +359117,10 @@ sub_80BE4E0: @ 80BE4E0 ldr r0, [r7] adds r0, r4 adds r0, r5 - b _080BE5EC + b @080BE5EC .align 2, 0 .pool -_080BE520: +@080BE520: ldr r2, =0x08329f40 ldrh r0, [r4, 0x38] lsls r0, 24 @@ -359131,9 +359131,9 @@ _080BE520: movs r0, 0x4C muls r0, r1 cmp r0, 0 - bge _080BE538 + bge @080BE538 adds r0, 0xFF -_080BE538: +@080BE538: asrs r0, 8 strh r0, [r4, 0x26] movs r1, 0x38 @@ -359149,9 +359149,9 @@ _080BE538: adds r2, r0, 0 ldr r0, =0x0000ffff cmp r2, r0 - bls _080BE55C + bls @080BE55C adds r2, r0, 0 -_080BE55C: +@080BE55C: ldrh r0, [r4, 0x30] adds r0, 0x1 lsls r0, 24 @@ -359179,7 +359179,7 @@ _080BE55C: lsls r0, 16 lsrs r0, 16 cmp r0, 0x7E - bhi _080BE5B4 + bhi @080BE5B4 adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -359189,27 +359189,27 @@ _080BE55C: strb r1, [r2] movs r0, 0x1 strh r0, [r4, 0x2E] - b _080BE5C0 + b @080BE5C0 .align 2, 0 .pool -_080BE5B4: +@080BE5B4: adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 strb r0, [r2] -_080BE5C0: +@080BE5C0: ldrh r0, [r4, 0x38] adds r0, 0x3F lsls r0, 16 lsrs r0, 16 cmp r0, 0x7E - bls _080BE5F0 + bls @080BE5F0 movs r3, 0x2E ldrsh r0, [r4, r3] cmp r0, 0 - beq _080BE5F0 + beq @080BE5F0 ldr r5, =0x02039b4c ldr r0, [r5] lsls r6, 1 @@ -359221,10 +359221,10 @@ _080BE5C0: ldr r0, [r5] adds r0, r4 adds r0, r6 -_080BE5EC: +@080BE5EC: ldr r1, =0x0000ffff strh r1, [r0] -_080BE5F0: +@080BE5F0: add sp, 0x4 pop {r4-r7} pop {r0} @@ -359234,7 +359234,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 @@ -359243,15 +359243,15 @@ sub_80BE604: @ 80BE604 adds r0, r2 ldrb r0, [r0] cmp r0, 0 - beq _080BE62C + beq @080BE62C cmp r0, 0x3 - beq _080BE62C + beq @080BE62C adds r0, r4, 0 bl obj_delete_and_free_tiles - b _080BE648 + b @080BE648 .align 2, 0 .pool -_080BE62C: +@080BE62C: ldr r2, [r1] ldr r1, =0x0000060e adds r0, r2, r1 @@ -359265,7 +359265,7 @@ _080BE62C: subs r1, 0x1 bl __divsi3 strh r0, [r4, 0x26] -_080BE648: +@080BE648: pop {r4} pop {r0} bx r0 @@ -359274,7 +359274,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 @@ -359284,19 +359284,19 @@ sub_80BE658: @ 80BE658 ldrb r0, [r0] adds r5, r1, 0 cmp r0, 0 - beq _080BE680 + beq @080BE680 cmp r0, 0x3 - beq _080BE680 + beq @080BE680 adds r0, r3, 0 bl obj_delete_and_free_tiles - b _080BE750 + b @080BE750 .align 2, 0 .pool -_080BE680: +@080BE680: movs r1, 0x30 ldrsh r0, [r3, r1] cmp r0, 0 - beq _080BE6C2 + beq @080BE6C2 ldr r0, [r5] ldr r2, =0x0000060e adds r1, r0, r2 @@ -359306,58 +359306,58 @@ _080BE680: ldrh r0, [r0] subs r0, 0x1 cmp r1, r0 - bne _080BE6AC + bne @080BE6AC adds r0, r3, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 - b _080BE6B8 + b @080BE6B8 .align 2, 0 .pool -_080BE6AC: +@080BE6AC: adds r0, r3, 0 adds r0, 0x3E ldrb r2, [r0] movs r1, 0x5 negs r1, r1 ands r1, r2 -_080BE6B8: +@080BE6B8: strb r1, [r0] adds r2, r0, 0 ldrh r1, [r3, 0x32] lsls r0, r1, 24 - b _080BE6F8 -_080BE6C2: + b @080BE6F8 +@080BE6C2: ldr r0, [r5] ldr r1, =0x0000060e adds r0, r1 ldrh r0, [r0] cmp r0, 0 - bne _080BE6E0 + bne @080BE6E0 adds r0, r3, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 - b _080BE6EC + b @080BE6EC .align 2, 0 .pool -_080BE6E0: +@080BE6E0: adds r0, r3, 0 adds r0, 0x3E ldrb r2, [r0] movs r1, 0x5 negs r1, r1 ands r1, r2 -_080BE6EC: +@080BE6EC: strb r1, [r0] adds r2, r0, 0 ldrh r1, [r3, 0x32] adds r0, r1, 0 subs r0, 0x80 lsls r0, 24 -_080BE6F8: +@080BE6F8: lsrs r0, 24 adds r4, r1, 0 ldr r1, =0x08329f40 @@ -359366,9 +359366,9 @@ _080BE6F8: movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bge _080BE70C + bge @080BE70C adds r0, 0x3F -_080BE70C: +@080BE70C: asrs r0, 6 strh r0, [r3, 0x26] adds r0, r4, 0 @@ -359379,38 +359379,38 @@ _080BE70C: adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 - bne _080BE748 + bne @080BE748 adds r3, 0x3 adds r0, r1, r3 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _080BE748 + bne @080BE748 ldrb r1, [r2] movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne _080BE748 + bne @080BE748 movs r0, 0x5 negs r0, r0 ands r0, r1 - b _080BE74E + b @080BE74E .align 2, 0 .pool -_080BE748: +@080BE748: ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 -_080BE74E: +@080BE74E: strb r0, [r2] -_080BE750: +@080BE750: pop {r4,r5} pop {r0} bx r0 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 @@ -359419,12 +359419,12 @@ sub_80BE758: @ 80BE758 adds r0, r2 ldrb r0, [r0] cmp r0, 0 - beq _080BE774 + beq @080BE774 cmp r0, 0x3 - beq _080BE774 + beq @080BE774 adds r0, r1, 0 bl obj_delete_and_free_tiles -_080BE774: +@080BE774: pop {r0} bx r0 .align 2, 0 @@ -359432,7 +359432,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 @@ -359443,15 +359443,15 @@ sub_80BE780: @ 80BE780 ldrb r0, [r0] adds r7, r1, 0 cmp r0, 0 - beq _080BE7AC + beq @080BE7AC cmp r0, 0x3 - beq _080BE7AC + beq @080BE7AC adds r0, r6, 0 bl obj_delete_and_free_tiles - b _080BE824 + b @080BE824 .align 2, 0 .pool -_080BE7AC: +@080BE7AC: ldr r0, [r7] ldr r5, =0x0000062c adds r0, r5 @@ -359497,9 +359497,9 @@ _080BE7AC: adds r0, r1 lsls r0, 3 cmp r0, 0 - bge _080BE80C + bge @080BE80C adds r0, 0xFF -_080BE80C: +@080BE80C: asrs r0, 8 strh r0, [r6, 0x24] lsls r1, r3, 16 @@ -359508,12 +359508,12 @@ _080BE80C: adds r0, r1 lsls r0, 3 cmp r0, 0 - bge _080BE820 + bge @080BE820 adds r0, 0xFF -_080BE820: +@080BE820: asrs r0, 8 strh r0, [r6, 0x26] -_080BE824: +@080BE824: add sp, 0x4 pop {r4-r7} pop {r0} @@ -359523,7 +359523,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 @@ -359532,35 +359532,35 @@ sub_80BE834: @ 80BE834 adds r0, r2 ldrb r2, [r0] cmp r2, 0 - beq _080BE85C + beq @080BE85C cmp r2, 0x3 - beq _080BE85C + beq @080BE85C adds r0, r3, 0 bl obj_delete_and_free_tiles - b _080BE8D4 + b @080BE8D4 .align 2, 0 .pool -_080BE85C: +@080BE85C: ldr r4, [r1] ldr r1, =0x0000064a adds r0, r4, r1 ldrb r0, [r0] movs r1, 0x60 cmp r0, 0 - bne _080BE86C + bne @080BE86C movs r1, 0x50 -_080BE86C: +@080BE86C: ldr r2, =0x0000064f adds r0, r4, r2 ldrb r0, [r0] cmp r0, 0 - beq _080BE8C8 + beq @080BE8C8 adds r2, 0x3 adds r0, r4, r2 movs r2, 0 ldrsh r0, [r0, r2] cmp r0, r1 - bne _080BE8C8 + bne @080BE8C8 adds r2, r3, 0 adds r2, 0x3E ldrb r1, [r2] @@ -359582,32 +359582,32 @@ _080BE86C: movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bge _080BE8B0 + bge @080BE8B0 adds r0, 0x3F -_080BE8B0: +@080BE8B0: asrs r0, 6 strh r0, [r3, 0x24] adds r0, r2, 0 adds r0, 0x8 strh r0, [r3, 0x32] - b _080BE8D4 + b @080BE8D4 .align 2, 0 .pool -_080BE8C8: +@080BE8C8: adds r0, r3, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_080BE8D4: +@080BE8D4: pop {r4} pop {r0} bx r0 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 @@ -359641,7 +359641,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 @@ -359707,7 +359707,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 @@ -359719,24 +359719,24 @@ sub_80BE9C4: @ 80BE9C4 movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0 - bne _080BE9F0 + bne @080BE9F0 ldr r1, [r1] ldr r0, =sub_80BEDF4 + 1 cmp r1, r0 - bne _080BE9F0 + bne @080BE9F0 movs r0, 0 - b _080BE9F2 + b @080BE9F2 .align 2, 0 .pool -_080BE9F0: +@080BE9F0: movs r0, 0x1 -_080BE9F2: +@080BE9F2: pop {r1} bx r1 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 @@ -359759,7 +359759,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 @@ -359771,36 +359771,36 @@ sub_80BEA24: @ 80BEA24 ldrb r0, [r0] adds r5, r1, 0 cmp r0, 0xA - bhi _080BEA7C + bhi @080BEA7C lsls r0, 2 - ldr r1, =_080BEA50 + ldr r1, =@080BEA50 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080BEA50: - .4byte _080BEA7C - .4byte _080BEAF0 - .4byte _080BEB50 - .4byte _080BEB90 - .4byte _080BEB98 - .4byte _080BEC08 - .4byte _080BEC60 - .4byte _080BECBC - .4byte _080BED04 - .4byte _080BED5E - .4byte _080BED7C -_080BEA7C: +@080BEA50: + .4byte @080BEA7C + .4byte @080BEAF0 + .4byte @080BEB50 + .4byte @080BEB90 + .4byte @080BEB98 + .4byte @080BEC08 + .4byte @080BEC60 + .4byte @080BECBC + .4byte @080BED04 + .4byte @080BED5E + .4byte @080BED7C +@080BEA7C: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080BEA8A - b _080BEDA0 -_080BEA8A: + beq @080BEA8A + b @080BEDA0 +@080BEA8A: ldr r0, =0x02039b4c ldr r0, [r0] ldr r3, =0x0000064a @@ -359821,29 +359821,29 @@ _080BEA8A: movs r3, 0xA ldrsh r0, [r1, r3] cmp r0, 0 - beq _080BEABA + beq @080BEABA movs r2, 0x80 lsls r2, 5 -_080BEABA: +@080BEABA: movs r3, 0xC ldrsh r0, [r1, r3] cmp r0, 0 - beq _080BEACA + beq @080BEACA movs r1, 0x80 lsls r1, 2 adds r0, r1, 0 orrs r2, r0 -_080BEACA: +@080BEACA: adds r0, r2, 0 bl sub_80C09B0 movs r2, 0x87 lsls r2, 3 adds r0, r5, r2 strb r6, [r0] - b _080BEDA0 + b @080BEDA0 .align 2, 0 .pool -_080BEAF0: +@080BEAF0: ldr r1, =0x08dc1934 movs r2, 0x80 lsls r2, 6 @@ -359876,10 +359876,10 @@ _080BEAF0: movs r3, 0x87 lsls r3, 3 adds r1, r3 - b _080BED70 + b @080BED70 .align 2, 0 .pool -_080BEB50: +@080BEB50: movs r0, 0xD bl sub_80BFCDC ldr r4, =0x02039b4c @@ -359900,15 +359900,15 @@ _080BEB50: movs r3, 0x87 lsls r3, 3 adds r1, r3 - b _080BED70 + b @080BED70 .align 2, 0 .pool -_080BEB90: +@080BEB90: movs r0, 0x87 lsls r0, 3 adds r1, r5, r0 - b _080BED70 -_080BEB98: + b @080BED70 +@080BEB98: ldr r4, =0x02039b54 ldr r3, [r4] ldrh r0, [r3] @@ -359930,12 +359930,12 @@ _080BEB98: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _080BEBD0 + bne @080BEBD0 ldr r0, =0x02037716 movs r1, 0x31 movs r2, 0x1E bl gpu_pal_apply -_080BEBD0: +@080BEBD0: movs r0, 0 movs r1, 0x3 bl Window_CopyToVram @@ -359949,10 +359949,10 @@ _080BEBD0: movs r3, 0x87 lsls r3, 3 adds r1, r3 - b _080BED70 + b @080BED70 .align 2, 0 .pool -_080BEC08: +@080BEC08: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -359961,7 +359961,7 @@ _080BEC08: movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0 - bne _080BEC44 + bne @080BEC44 ldr r0, =0x02039b54 ldr r0, [r0] ldrh r0, [r0] @@ -359982,15 +359982,15 @@ _080BEC08: negs r0, r0 ands r0, r2 strb r0, [r1, 0x5] -_080BEC44: +@080BEC44: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _080BED70 + b @080BED70 .align 2, 0 .pool -_080BEC60: +@080BEC60: movs r3, 0 ldr r0, =0x03005e00 lsls r1, r4, 2 @@ -360000,13 +360000,13 @@ _080BEC60: movs r2, 0xC ldrsh r0, [r1, r2] cmp r0, 0 - beq _080BEC76 + beq @080BEC76 movs r3, 0x14 -_080BEC76: +@080BEC76: movs r2, 0xA ldrsh r0, [r1, r2] cmp r0, 0 - beq _080BEC98 + beq @080BEC98 ldr r2, =0x02020630 movs r0, 0x10 ldrsh r1, [r1, r0] @@ -360020,7 +360020,7 @@ _080BEC76: movs r0, 0x1 lsls r0, r1 orrs r3, r0 -_080BEC98: +@080BEC98: mvns r0, r3 movs r1, 0 str r1, [sp] @@ -360030,10 +360030,10 @@ _080BEC98: ldr r0, =0x030060b4 ldr r0, [r0] bl SetVBlankCallback - b _080BED68 + b @080BED68 .align 2, 0 .pool -_080BECBC: +@080BECBC: movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -360059,16 +360059,16 @@ _080BECBC: movs r3, 0x87 lsls r3, 3 adds r1, r3 - b _080BED70 + b @080BED70 .align 2, 0 .pool -_080BED04: +@080BED04: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080BEDA0 + bne @080BEDA0 movs r0, 0x87 lsls r0, 3 adds r2, r5, r0 @@ -360083,7 +360083,7 @@ _080BED04: movs r1, 0xE ldrsh r0, [r0, r1] cmp r0, 0 - bne _080BED58 + bne @080BED58 bl sub_80A369C ldr r0, =0x02039b54 ldr r0, [r0] @@ -360095,31 +360095,31 @@ _080BED04: movs r2, 0x7D movs r3, 0xA bl sub_80A32C0 - b _080BEDA0 + b @080BEDA0 .align 2, 0 .pool -_080BED58: +@080BED58: adds r0, r3, 0x1 strb r0, [r2] - b _080BEDA0 -_080BED5E: + b @080BEDA0 +@080BED5E: bl sub_80A36C8 lsls r0, 24 cmp r0, 0 - bne _080BEDA0 -_080BED68: + bne @080BEDA0 +@080BED68: ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 -_080BED70: +@080BED70: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080BEDA0 + b @080BEDA0 .align 2, 0 .pool -_080BED7C: +@080BED7C: ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -360138,7 +360138,7 @@ _080BED7C: lsls r3, 3 adds r0, r5, r3 strb r2, [r0] -_080BEDA0: +@080BEDA0: add sp, 0x4 pop {r4-r6} pop {r0} @@ -360148,39 +360148,39 @@ _080BEDA0: thumb_func_end sub_80BEA24 thumb_func_start sub_80BEDB0 -sub_80BEDB0: @ 80BEDB0 +sub_80BEDB0: ; 80BEDB0 push {lr} bl Window_FreeMemory movs r0, 0 bl bg_get_tilemap cmp r0, 0 - beq _080BEDC4 + beq @080BEDC4 bl free -_080BEDC4: +@080BEDC4: movs r0, 0x1 bl bg_get_tilemap cmp r0, 0 - beq _080BEDD2 + beq @080BEDD2 bl free -_080BEDD2: +@080BEDD2: movs r0, 0x2 bl bg_get_tilemap cmp r0, 0 - beq _080BEDE0 + beq @080BEDE0 bl free -_080BEDE0: +@080BEDE0: movs r0, 0x3 bl bg_get_tilemap cmp r0, 0 - beq _080BEDEE + beq @080BEDEE bl free -_080BEDEE: +@080BEDEE: pop {r0} bx r0 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 @@ -360193,7 +360193,7 @@ sub_80BEDF4: @ 80BEDF4 movs r0, 0x8 ldrsh r5, [r4, r0] cmp r5, 0 - beq _080BEE34 + beq @080BEE34 movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -360205,10 +360205,10 @@ sub_80BEDF4: @ 80BEDF4 str r0, [r4] movs r0, 0x6C bl audio_play - b _080BEFBA + b @080BEFBA .align 2, 0 .pool -_080BEE34: +@080BEE34: ldr r1, =0x030022c0 ldrh r2, [r1, 0x2E] movs r0, 0x2 @@ -360216,39 +360216,39 @@ _080BEE34: lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0 - beq _080BEE50 + beq @080BEE50 movs r0, 0x1 negs r0, r0 str r5, [sp] - b _080BEF0E + b @080BEF0E .align 2, 0 .pool -_080BEE50: +@080BEE50: movs r0, 0x1 ands r0, r2 cmp r0, 0 - beq _080BEF28 + beq @080BEF28 ldr r5, =0x02039b4c ldr r0, [r5] ldr r1, =0x0000064d adds r0, r1 ldrb r1, [r0] cmp r1, 0x1 - beq _080BEEA0 + beq @080BEEA0 cmp r1, 0x1 - bgt _080BEE78 + bgt @080BEE78 cmp r1, 0 - beq _080BEE82 - b _080BEFBA + beq @080BEE82 + b @080BEFBA .align 2, 0 .pool -_080BEE78: +@080BEE78: cmp r1, 0x2 - beq _080BEEC0 + beq @080BEEC0 cmp r1, 0x3 - beq _080BEF08 - b _080BEFBA -_080BEE82: + beq @080BEF08 + b @080BEFBA +@080BEE82: movs r0, 0x15 negs r0, r0 str r3, [sp] @@ -360260,10 +360260,10 @@ _080BEE82: ldr r3, =0x0000064e adds r0, r3 movs r1, 0x1 - b _080BEEF0 + b @080BEEF0 .align 2, 0 .pool -_080BEEA0: +@080BEEA0: movs r0, 0x15 negs r0, r0 str r3, [sp] @@ -360275,22 +360275,22 @@ _080BEEA0: ldr r1, =0x0000064e adds r0, r1 movs r1, 0x2 - b _080BEEF0 + b @080BEEF0 .align 2, 0 .pool -_080BEEC0: +@080BEEC0: ldr r0, =0x02039b54 ldr r0, [r0] ldrb r0, [r0, 0x2] ands r1, r0 cmp r1, 0 - bne _080BEED8 + bne @080BEED8 movs r0, 0x20 bl audio_play - b _080BEFBA + b @080BEFBA .align 2, 0 .pool -_080BEED8: +@080BEED8: movs r0, 0x15 negs r0, r0 str r3, [sp] @@ -360302,20 +360302,20 @@ _080BEED8: ldr r3, =0x0000064e adds r0, r3 movs r1, 0x3 -_080BEEF0: +@080BEEF0: strb r1, [r0] ldr r0, =sub_80BEFD0 + 1 str r0, [r4] movs r0, 0x15 bl audio_play - b _080BEFBA + b @080BEFBA .align 2, 0 .pool -_080BEF08: +@080BEF08: movs r0, 0x1 negs r0, r0 str r3, [sp] -_080BEF0E: +@080BEF0E: movs r1, 0 movs r2, 0 movs r3, 0x10 @@ -360324,32 +360324,32 @@ _080BEF0E: str r0, [r4] movs r0, 0x3 bl audio_play - b _080BEFBA + b @080BEFBA .align 2, 0 .pool -_080BEF28: +@080BEF28: movs r0, 0x20 ands r0, r2 cmp r0, 0 - bne _080BEF44 + bne @080BEF44 movs r0, 0x80 lsls r0, 2 ands r0, r2 cmp r0, 0 - beq _080BEF78 + beq @080BEF78 ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x1 - bne _080BEF78 -_080BEF44: + bne @080BEF78 +@080BEF44: ldr r3, =0x02039b4c ldr r0, [r3] ldr r4, =0x0000064d adds r2, r0, r4 ldrb r0, [r2] cmp r0, 0 - beq _080BEF78 + beq @080BEF78 subs r0, 0x1 strb r0, [r2] ldr r0, [r3] @@ -360359,33 +360359,33 @@ _080BEF44: bl sub_80BFD0C movs r0, 0x6D bl audio_play - b _080BEFBA + b @080BEFBA .align 2, 0 .pool -_080BEF78: +@080BEF78: ldrh r1, [r1, 0x2E] movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _080BEF96 + bne @080BEF96 movs r0, 0x80 lsls r0, 1 ands r0, r1 cmp r0, 0 - beq _080BEFBA + beq @080BEFBA ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x1 - bne _080BEFBA -_080BEF96: + bne @080BEFBA +@080BEF96: ldr r2, =0x02039b4c ldr r0, [r2] ldr r3, =0x0000064d adds r1, r0, r3 ldrb r0, [r1] cmp r0, 0x2 - bhi _080BEFBA + bhi @080BEFBA adds r0, 0x1 strb r0, [r1] ldr r0, [r2] @@ -360395,7 +360395,7 @@ _080BEF96: bl sub_80BFD0C movs r0, 0x6D bl audio_play -_080BEFBA: +@080BEFBA: add sp, 0x4 pop {r4,r5} pop {r0} @@ -360405,7 +360405,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 @@ -360414,7 +360414,7 @@ sub_80BEFD0: @ 80BEFD0 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080BF02C + bne @080BF02C ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 @@ -360428,26 +360428,26 @@ sub_80BEFD0: @ 80BEFD0 adds r0, r1 ldrb r0, [r0] cmp r0, 0x2 - beq _080BF020 + beq @080BF020 cmp r0, 0x2 - ble _080BF008 + ble @080BF008 cmp r0, 0x3 - beq _080BF028 -_080BF008: + beq @080BF028 +@080BF008: ldr r0, =sub_80BF0AC + 1 - b _080BF02A + b @080BF02A .align 2, 0 .pool -_080BF020: +@080BF020: ldr r0, =sub_80BF250 + 1 - b _080BF02A + b @080BF02A .align 2, 0 .pool -_080BF028: +@080BF028: ldr r0, =sub_80BF82C + 1 -_080BF02A: +@080BF02A: str r0, [r4] -_080BF02C: +@080BF02C: pop {r4} pop {r0} bx r0 @@ -360456,7 +360456,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 @@ -360465,7 +360465,7 @@ sub_80BF038: @ 80BF038 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080BF05E + bne @080BF05E ldr r0, =0x03005e00 lsls r4, r2, 2 adds r4, r2 @@ -360475,7 +360475,7 @@ sub_80BF038: @ 80BF038 bl sub_818D820 ldr r0, =sub_80BEA24 + 1 str r0, [r4] -_080BF05E: +@080BF05E: pop {r4} pop {r0} bx r0 @@ -360484,7 +360484,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 @@ -360493,7 +360493,7 @@ sub_80BF070: @ 80BF070 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080BF09C + bne @080BF09C ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -360504,7 +360504,7 @@ sub_80BF070: @ 80BF070 bl sub_80BEDB0 adds r0, r4, 0 bl remove_task -_080BF09C: +@080BF09C: pop {r4} pop {r0} bx r0 @@ -360513,7 +360513,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 @@ -360523,12 +360523,12 @@ sub_80BF0AC: @ 80BF0AC adds r7, r2, r0 ldrb r0, [r7] cmp r0, 0x1 - beq _080BF120 + beq @080BF120 cmp r0, 0x1 - ble _080BF0C8 + ble @080BF0C8 cmp r0, 0x2 - beq _080BF15C -_080BF0C8: + beq @080BF15C +@080BF0C8: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -360536,7 +360536,7 @@ _080BF0C8: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _080BF196 + bne @080BF196 ldr r4, =0x02039b4c ldr r0, [r4] ldr r1, =0x0000064a @@ -360557,10 +360557,10 @@ _080BF0C8: strb r5, [r0] movs r0, 0x1 strb r0, [r7] - b _080BF196 + b @080BF196 .align 2, 0 .pool -_080BF120: +@080BF120: movs r0, 0xD bl sub_80BFCF4 movs r0, 0 @@ -360581,10 +360581,10 @@ _080BF120: ldrb r0, [r7] adds r0, 0x1 strb r0, [r7] - b _080BF196 + b @080BF196 .align 2, 0 .pool -_080BF15C: +@080BF15C: ldr r0, =0x02039b54 ldr r0, [r0] ldrh r0, [r0] @@ -360611,7 +360611,7 @@ _080BF15C: adds r0, r1 ldr r1, =sub_80BF1B4 + 1 str r1, [r0] -_080BF196: +@080BF196: pop {r4-r7} pop {r0} bx r0 @@ -360620,7 +360620,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 @@ -360630,7 +360630,7 @@ sub_80BF1B4: @ 80BF1B4 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _080BF1D6 + beq @080BF1D6 ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -360638,7 +360638,7 @@ sub_80BF1B4: @ 80BF1B4 adds r1, r0 ldr r0, =sub_80BF1EC + 1 str r0, [r1] -_080BF1D6: +@080BF1D6: pop {r0} bx r0 .align 2, 0 @@ -360646,7 +360646,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 @@ -360655,36 +360655,36 @@ sub_80BF1EC: @ 80BF1EC movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080BF242 + bne @080BF242 ldr r0, =0x02039b4c ldr r0, [r0] ldr r1, =0x0000064e adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - beq _080BF210 + beq @080BF210 cmp r0, 0x2 - beq _080BF234 -_080BF210: + beq @080BF234 +@080BF210: ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 adds r1, r0 ldr r0, =sub_80BEA24 + 1 - b _080BF240 + b @080BF240 .align 2, 0 .pool -_080BF234: +@080BF234: ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 adds r1, r0 ldr r0, =sub_80BF250 + 1 -_080BF240: +@080BF240: str r0, [r1] -_080BF242: +@080BF242: pop {r0} bx r0 .align 2, 0 @@ -360692,7 +360692,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 @@ -360704,36 +360704,36 @@ sub_80BF250: @ 80BF250 ldrb r0, [r0] adds r2, r1, 0 cmp r0, 0xA - bhi _080BF2A8 + bhi @080BF2A8 lsls r0, 2 - ldr r1, =_080BF27C + ldr r1, =@080BF27C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080BF27C: - .4byte _080BF2A8 - .4byte _080BF310 - .4byte _080BF360 - .4byte _080BF38C - .4byte _080BF3A0 - .4byte _080BF3D0 - .4byte _080BF41C - .4byte _080BF498 - .4byte _080BF514 - .4byte _080BF540 - .4byte _080BF590 -_080BF2A8: +@080BF27C: + .4byte @080BF2A8 + .4byte @080BF310 + .4byte @080BF360 + .4byte @080BF38C + .4byte @080BF3A0 + .4byte @080BF3D0 + .4byte @080BF41C + .4byte @080BF498 + .4byte @080BF514 + .4byte @080BF540 + .4byte @080BF590 +@080BF2A8: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080BF2B6 - b _080BF5B2 -_080BF2B6: + beq @080BF2B6 + b @080BF5B2 +@080BF2B6: ldr r0, =0x03007420 bl MPlayStop_rev01 ldr r5, =0x02039b4c @@ -360760,10 +360760,10 @@ _080BF2B6: lsls r2, 3 adds r4, r2 strb r1, [r4] - b _080BF5B2 + b @080BF5B2 .align 2, 0 .pool -_080BF310: +@080BF310: ldr r1, =0x08dc1934 movs r2, 0x80 lsls r2, 6 @@ -360790,10 +360790,10 @@ _080BF310: movs r3, 0x87 lsls r3, 3 adds r1, r3 - b _080BF582 + b @080BF582 .align 2, 0 .pool -_080BF360: +@080BF360: movs r0, 0xD bl sub_80BFCF4 movs r0, 0x1 @@ -360807,19 +360807,19 @@ _080BF360: lsls r0, 31 lsrs r0, 31 bl sub_80BC844 - b _080BF57A + b @080BF57A .align 2, 0 .pool -_080BF38C: +@080BF38C: bl sub_80A1A74 ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _080BF582 + b @080BF582 .align 2, 0 .pool -_080BF3A0: +@080BF3A0: ldr r0, =0x085e871b movs r1, 0x52 movs r2, 0x21 @@ -360835,10 +360835,10 @@ _080BF3A0: movs r3, 0x87 lsls r3, 3 adds r1, r3 - b _080BF582 + b @080BF582 .align 2, 0 .pool -_080BF3D0: +@080BF3D0: ldr r0, =0x02039b54 ldr r0, [r0] ldrh r0, [r0] @@ -360867,10 +360867,10 @@ _080BF3D0: strb r0, [r1, 0x5] ldr r0, =0x030061ec strb r3, [r0] - b _080BF57A + b @080BF57A .align 2, 0 .pool -_080BF41C: +@080BF41C: ldr r1, =0xffff0000 ldr r0, [sp, 0x4] ands r0, r1 @@ -360903,9 +360903,9 @@ _080BF41C: bl sub_8145354 lsls r0, 24 cmp r0, 0 - bne _080BF462 - b _080BF5B2 -_080BF462: + bne @080BF462 + b @080BF5B2 +@080BF462: ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 @@ -360916,10 +360916,10 @@ _080BF462: strb r0, [r1] ldr r0, =0x030061ec strb r2, [r0] - b _080BF5B2 + b @080BF5B2 .align 2, 0 .pool -_080BF498: +@080BF498: ldr r1, =0x00ffffff ldr r0, [sp, 0xC] ands r0, r1 @@ -360943,7 +360943,7 @@ _080BF498: bl sub_8145850 lsls r0, 24 cmp r0, 0 - beq _080BF4D8 + beq @080BF4D8 ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 @@ -360951,7 +360951,7 @@ _080BF498: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_080BF4D8: +@080BF4D8: movs r0, 0x3 movs r1, 0x2 bl Window_CopyToVram @@ -360966,10 +360966,10 @@ _080BF4D8: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - b _080BF5B2 + b @080BF5B2 .align 2, 0 .pool -_080BF514: +@080BF514: movs r0, 0x15 negs r0, r0 movs r1, 0 @@ -360984,10 +360984,10 @@ _080BF514: movs r4, 0x87 lsls r4, 3 adds r1, r4 - b _080BF582 + b @080BF582 .align 2, 0 .pool -_080BF540: +@080BF540: movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -361009,19 +361009,19 @@ _080BF540: bl gpu_sync_bg_show movs r0, 0x3 bl gpu_sync_bg_show -_080BF57A: +@080BF57A: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 -_080BF582: +@080BF582: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080BF5B2 + b @080BF5B2 .align 2, 0 .pool -_080BF590: +@080BF590: ldr r0, =0x02039b4c ldr r0, [r0] ldr r1, =0x0000064e @@ -361039,7 +361039,7 @@ _080BF590: adds r0, r1 ldr r1, =sub_80BF5CC + 1 str r1, [r0] -_080BF5B2: +@080BF5B2: add sp, 0x14 pop {r4,r5} pop {r0} @@ -361049,7 +361049,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 @@ -361059,21 +361059,21 @@ sub_80BF5CC: @ 80BF5CC bl sub_80A36EC lsls r0, 24 cmp r0, 0 - beq _080BF5EC + beq @080BF5EC movs r0, 0x1 bl sub_80BF7FC - b _080BF5F2 -_080BF5EC: + b @080BF5F2 +@080BF5EC: movs r0, 0 bl sub_80BF7FC -_080BF5F2: +@080BF5F2: ldr r1, =0x030022c0 ldrh r2, [r1, 0x2E] movs r0, 0x1 ands r0, r2 adds r5, r1, 0 cmp r0, 0 - beq _080BF624 + beq @080BF624 movs r0, 0x1 bl sub_80BF7FC ldr r0, =0x02039b54 @@ -361083,10 +361083,10 @@ _080BF5F2: lsls r0, 16 lsrs r0, 16 bl sub_8145534 - b _080BF772 + b @080BF772 .align 2, 0 .pool -_080BF624: +@080BF624: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -361094,15 +361094,15 @@ _080BF624: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq _080BF636 - b _080BF772 -_080BF636: + beq @080BF636 + b @080BF772 +@080BF636: movs r0, 0x2 ands r0, r2 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0 - beq _080BF694 + beq @080BF694 movs r0, 0x15 negs r0, r0 str r1, [sp] @@ -361127,25 +361127,25 @@ _080BF636: str r1, [r0] movs r0, 0x3 bl audio_play - b _080BF772 + b @080BF772 .align 2, 0 .pool -_080BF694: +@080BF694: movs r0, 0x20 ands r0, r2 cmp r0, 0 - bne _080BF6B0 + bne @080BF6B0 movs r0, 0x80 lsls r0, 2 ands r0, r2 cmp r0, 0 - beq _080BF700 + beq @080BF700 ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x1 - bne _080BF700 -_080BF6B0: + bne @080BF700 +@080BF6B0: movs r0, 0x15 negs r0, r0 str r3, [sp] @@ -361170,39 +361170,39 @@ _080BF6B0: str r1, [r0] movs r0, 0x6D bl audio_play - b _080BF772 + b @080BF772 .align 2, 0 .pool -_080BF700: +@080BF700: ldrh r1, [r5, 0x2E] movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _080BF71E + bne @080BF71E movs r0, 0x80 lsls r0, 1 ands r0, r1 cmp r0, 0 - beq _080BF772 + beq @080BF772 ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x1 - bne _080BF772 -_080BF71E: + bne @080BF772 +@080BF71E: ldr r0, =0x02039b54 ldr r0, [r0] ldrb r1, [r0, 0x2] movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _080BF73C + bne @080BF73C movs r0, 0x20 bl audio_play - b _080BF772 + b @080BF772 .align 2, 0 .pool -_080BF73C: +@080BF73C: movs r0, 0x15 negs r0, r0 movs r1, 0 @@ -361227,7 +361227,7 @@ _080BF73C: str r1, [r0] movs r0, 0x6D bl audio_play -_080BF772: +@080BF772: add sp, 0x4 pop {r4,r5} pop {r0} @@ -361237,7 +361237,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 @@ -361246,7 +361246,7 @@ sub_80BF790: @ 80BF790 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080BF7F0 + bne @080BF7F0 bl sub_8145914 ldr r1, =0x03005e00 lsls r0, r4, 2 @@ -361261,26 +361261,26 @@ sub_80BF790: @ 80BF790 adds r0, r1 ldrb r0, [r0] cmp r0, 0x2 - beq _080BF7E4 + beq @080BF7E4 cmp r0, 0x2 - ble _080BF7CC + ble @080BF7CC cmp r0, 0x3 - beq _080BF7EC -_080BF7CC: + beq @080BF7EC +@080BF7CC: ldr r0, =sub_80BEA24 + 1 - b _080BF7EE + b @080BF7EE .align 2, 0 .pool -_080BF7E4: +@080BF7E4: ldr r0, =sub_80BF0AC + 1 - b _080BF7EE + b @080BF7EE .align 2, 0 .pool -_080BF7EC: +@080BF7EC: ldr r0, =sub_80BF82C + 1 -_080BF7EE: +@080BF7EE: str r0, [r4] -_080BF7F0: +@080BF7F0: pop {r4} pop {r0} bx r0 @@ -361289,19 +361289,19 @@ _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 cmp r0, 0 - beq _080BF810 + beq @080BF810 ldr r1, =0x00000392 - b _080BF812 + b @080BF812 .align 2, 0 .pool -_080BF810: +@080BF810: ldr r1, =0x000002af -_080BF812: +@080BF812: mov r0, sp strh r1, [r0] mov r0, sp @@ -361316,7 +361316,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 @@ -361328,35 +361328,35 @@ sub_80BF82C: @ 80BF82C ldrb r0, [r0] adds r5, r1, 0 cmp r0, 0x9 - bhi _080BF880 + bhi @080BF880 lsls r0, 2 - ldr r1, =_080BF858 + ldr r1, =@080BF858 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080BF858: - .4byte _080BF880 - .4byte _080BF8D8 - .4byte _080BF910 - .4byte _080BF93C - .4byte _080BF97C - .4byte _080BF982 - .4byte _080BFA34 - .4byte _080BFAE8 - .4byte _080BFB14 - .4byte _080BFB64 -_080BF880: +@080BF858: + .4byte @080BF880 + .4byte @080BF8D8 + .4byte @080BF910 + .4byte @080BF93C + .4byte @080BF97C + .4byte @080BF982 + .4byte @080BFA34 + .4byte @080BFAE8 + .4byte @080BFB14 + .4byte @080BFB64 +@080BF880: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080BF88E - b _080BFB94 -_080BF88E: + beq @080BF88E + b @080BFB94 +@080BF88E: ldr r4, =0x02039b4c ldr r0, [r4] ldr r1, =0x0000064a @@ -361381,10 +361381,10 @@ _080BF88E: adds r1, r5, r0 movs r0, 0x1 strb r0, [r1] - b _080BFB94 + b @080BFB94 .align 2, 0 .pool -_080BF8D8: +@080BF8D8: ldr r1, =0x08dc1934 movs r2, 0x80 lsls r2, 6 @@ -361403,10 +361403,10 @@ _080BF8D8: bl Window_FastFillPixels movs r0, 0 bl Window_WriteStandardTileMap - b _080BFB4E + b @080BFB4E .align 2, 0 .pool -_080BF910: +@080BF910: movs r0, 0xD bl sub_80BFCF4 movs r0, 0x2 @@ -361420,10 +361420,10 @@ _080BF910: lsls r0, 31 lsrs r0, 31 bl sub_80BC844 - b _080BFB4E + b @080BFB4E .align 2, 0 .pool -_080BF93C: +@080BF93C: ldr r1, =0x085e8723 add r0, sp, 0x4 bl gf_strcpy @@ -361445,13 +361445,13 @@ _080BF93C: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _080BFB56 + b @080BFB56 .align 2, 0 .pool -_080BF97C: +@080BF97C: bl sub_80A1A74 - b _080BFB4E -_080BF982: + b @080BFB4E +@080BF982: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] @@ -361522,10 +361522,10 @@ _080BF982: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _080BFB56 + b @080BFB56 .align 2, 0 .pool -_080BFA34: +@080BFA34: ldr r5, =0x02039b54 ldr r0, [r5] ldrh r0, [r0] @@ -361597,10 +361597,10 @@ _080BFA34: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - b _080BFB4E + b @080BFB4E .align 2, 0 .pool -_080BFAE8: +@080BFAE8: movs r0, 0x15 negs r0, r0 movs r1, 0 @@ -361615,10 +361615,10 @@ _080BFAE8: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _080BFB56 + b @080BFB56 .align 2, 0 .pool -_080BFB14: +@080BFB14: movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -361640,19 +361640,19 @@ _080BFB14: bl gpu_sync_bg_show movs r0, 0x3 bl gpu_sync_bg_show -_080BFB4E: +@080BFB4E: ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 -_080BFB56: +@080BFB56: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080BFB94 + b @080BFB94 .align 2, 0 .pool -_080BFB64: +@080BFB64: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -361660,7 +361660,7 @@ _080BFB64: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - bne _080BFB94 + bne @080BFB94 ldr r0, =0x02039b4c ldr r0, [r0] ldr r1, =0x0000064e @@ -361677,7 +361677,7 @@ _080BFB64: adds r0, r1 ldr r1, =sub_80BFBB0 + 1 str r1, [r0] -_080BFB94: +@080BFB94: add sp, 0x44 pop {r4-r7} pop {r0} @@ -361687,7 +361687,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 @@ -361700,7 +361700,7 @@ sub_80BFBB0: @ 80BFBB0 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0 - beq _080BFC10 + beq @080BFC10 movs r0, 0x15 negs r0, r0 movs r1, 0 @@ -361723,25 +361723,25 @@ sub_80BFBB0: @ 80BFBB0 str r1, [r0] movs r0, 0x3 bl audio_play - b _080BFC5C + b @080BFC5C .align 2, 0 .pool -_080BFC10: +@080BFC10: movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _080BFC2C + bne @080BFC2C movs r0, 0x80 lsls r0, 2 ands r0, r1 cmp r0, 0 - beq _080BFC5C + beq @080BFC5C ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x1 - bne _080BFC5C -_080BFC2C: + bne @080BFC5C +@080BFC2C: movs r0, 0x15 negs r0, r0 str r2, [sp] @@ -361764,7 +361764,7 @@ _080BFC2C: str r1, [r0] movs r0, 0x6D bl audio_play -_080BFC5C: +@080BFC5C: add sp, 0x4 pop {r4,r5} pop {r0} @@ -361774,7 +361774,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 @@ -361783,7 +361783,7 @@ sub_80BFC78: @ 80BFC78 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080BFCD0 + bne @080BFCD0 ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 @@ -361799,19 +361799,19 @@ sub_80BFC78: @ 80BFC78 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - beq _080BFCB2 + beq @080BFCB2 cmp r0, 0x2 - beq _080BFCCC -_080BFCB2: + beq @080BFCCC +@080BFCB2: ldr r0, =sub_80BEA24 + 1 - b _080BFCCE + b @080BFCCE .align 2, 0 .pool -_080BFCCC: +@080BFCCC: ldr r0, =sub_80BF250 + 1 -_080BFCCE: +@080BFCCE: str r0, [r4] -_080BFCD0: +@080BFCD0: pop {r4} pop {r0} bx r0 @@ -361820,7 +361820,7 @@ _080BFCD0: thumb_func_end sub_80BFC78 thumb_func_start sub_80BFCDC -sub_80BFCDC: @ 80BFCDC +sub_80BFCDC: ; 80BFCDC push {lr} ldr r1, =0x08dc2f5c movs r0, 0x1 @@ -361834,7 +361834,7 @@ sub_80BFCDC: @ 80BFCDC thumb_func_end sub_80BFCDC thumb_func_start sub_80BFCF4 -sub_80BFCF4: @ 80BFCF4 +sub_80BFCF4: ; 80BFCF4 push {lr} ldr r1, =0x08dc2fec movs r0, 0x1 @@ -361848,7 +361848,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} @@ -361859,7 +361859,7 @@ sub_80BFD0C: @ 80BFD0C bl bg_get_tilemap adds r7, r0, 0 movs r1, 0 -_080BFD22: +@080BFD22: lsls r0, r1, 3 subs r0, r1 adds r0, 0x1 @@ -361868,14 +361868,14 @@ _080BFD22: movs r3, 0x80 lsls r3, 7 cmp r1, r8 - bne _080BFD38 + bne @080BFD38 movs r3, 0x80 lsls r3, 6 -_080BFD38: +@080BFD38: movs r2, 0 adds r6, r1, 0x1 ldr r4, =0x00000fff -_080BFD3E: +@080BFD3E: adds r1, r5, r2 lsls r1, 1 adds r1, r7 @@ -361892,11 +361892,11 @@ _080BFD3E: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x6 - bls _080BFD3E + bls @080BFD3E lsls r0, r6, 24 lsrs r1, r0, 24 cmp r1, 0x3 - bls _080BFD22 + bls @080BFD22 movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram pop {r3} @@ -361909,7 +361909,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} @@ -361920,28 +361920,28 @@ sub_80BFD7C: @ 80BFD7C bl bg_get_tilemap adds r7, r0, 0 movs r1, 0 -_080BFD92: +@080BFD92: lsls r0, r1, 3 subs r0, r1 adds r0, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r1, r8 - beq _080BFDA4 + beq @080BFDA4 cmp r1, 0x3 - bne _080BFDAA -_080BFDA4: + bne @080BFDAA +@080BFDA4: movs r3, 0x80 lsls r3, 6 - b _080BFDAE -_080BFDAA: + b @080BFDAE +@080BFDAA: movs r3, 0x80 lsls r3, 7 -_080BFDAE: +@080BFDAE: movs r2, 0 adds r5, r1, 0x1 ldr r4, =0x00000fff -_080BFDB4: +@080BFDB4: adds r1, r6, r2 lsls r1, 1 adds r1, r7 @@ -361958,11 +361958,11 @@ _080BFDB4: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x6 - bls _080BFDB4 + bls @080BFDB4 lsls r0, r5, 24 lsrs r1, r0, 24 cmp r1, 0x3 - bls _080BFD92 + bls @080BFD92 movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram pop {r3} @@ -361975,7 +361975,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 @@ -362009,7 +362009,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 @@ -362024,32 +362024,32 @@ sub_80BFE38: @ 80BFE38 ldrsh r0, [r0, r2] adds r2, r1, 0 cmp r0, 0x6 - bhi _080BFE84 + bhi @080BFE84 lsls r0, 2 - ldr r1, =_080BFE68 + ldr r1, =@080BFE68 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080BFE68: - .4byte _080BFE84 - .4byte _080BFF0C - .4byte _080BFF78 - .4byte _080BFF82 - .4byte _080BFFA8 - .4byte _080C0000 - .4byte _080C0044 -_080BFE84: +@080BFE68: + .4byte @080BFE84 + .4byte @080BFF0C + .4byte @080BFF78 + .4byte @080BFF82 + .4byte @080BFFA8 + .4byte @080C0000 + .4byte @080C0044 +@080BFE84: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080BFE92 - b _080C0074 -_080BFE92: + beq @080BFE92 + b @080C0074 +@080BFE92: ldr r1, =0x030060b4 ldr r0, =0x030022c0 ldr r0, [r0, 0xC] @@ -362087,10 +362087,10 @@ _080BFE92: adds r0, r1 movs r1, 0x1 strh r1, [r0, 0x8] - b _080C0074 + b @080C0074 .align 2, 0 .pool -_080BFF0C: +@080BFF0C: ldr r1, =0x08dc1934 movs r2, 0x80 lsls r2, 6 @@ -362128,16 +362128,16 @@ _080BFF0C: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080C0074 + b @080C0074 .align 2, 0 .pool -_080BFF78: +@080BFF78: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r2 - b _080C0038 -_080BFF82: + b @080C0038 +@080BFF82: bl sub_809D42C adds r1, r0, 0 adds r0, r4, 0 @@ -362151,8 +362151,8 @@ _080BFF82: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - b _080C002E -_080BFFA8: + b @080C002E +@080BFFA8: adds r0, r4, 0 movs r1, 0x30 movs r2, 0x38 @@ -362187,10 +362187,10 @@ _080BFFA8: lsls r0, 3 adds r0, r1 strh r4, [r0, 0xE] - b _080C0038 + b @080C0038 .align 2, 0 .pool -_080C0000: +@080C0000: movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -362208,20 +362208,20 @@ _080C0000: bl gpu_sync_bg_show movs r0, 0x3 bl gpu_sync_bg_show -_080C002E: +@080C002E: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 -_080C0038: +@080C0038: ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b _080C0074 + b @080C0074 .align 2, 0 .pool -_080C0044: +@080C0044: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -362229,7 +362229,7 @@ _080C0044: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - bne _080C0074 + bne @080C0074 adds r0, r4, 0 bl NationalPokedexNumToSpecies lsls r0, 16 @@ -362244,7 +362244,7 @@ _080C0044: strh r6, [r0, 0xC] ldr r1, =sub_80C0088 + 1 str r1, [r0] -_080C0074: +@080C0074: add sp, 0x4 pop {r4-r6} pop {r0} @@ -362254,7 +362254,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 @@ -362264,7 +362264,7 @@ sub_80C0088: @ 80C0088 movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _080C00E8 + beq @080C00E8 ldr r0, =0x0000ffff movs r1, 0 str r1, [sp] @@ -362288,10 +362288,10 @@ sub_80C0088: @ 80C0088 str r2, [r0] ldr r0, =blockset_load_palette_to_gpu + 1 str r0, [r1] - b _080C011E + b @080C011E .align 2, 0 .pool -_080C00E8: +@080C00E8: ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -362303,20 +362303,20 @@ _080C00E8: movs r0, 0x10 ands r1, r0 cmp r1, 0 - beq _080C0114 + beq @080C0114 ldr r0, =0x08dc16f6 movs r1, 0x31 movs r2, 0xE bl gpu_pal_apply - b _080C011E + b @080C011E .align 2, 0 .pool -_080C0114: +@080C0114: ldr r0, =0x08dc1756 movs r1, 0x31 movs r2, 0xE bl gpu_pal_apply -_080C011E: +@080C011E: add sp, 0x4 pop {r4} pop {r0} @@ -362326,7 +362326,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 @@ -362335,7 +362335,7 @@ blockset_load_palette_to_gpu: @ 80C012C movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080C01BA + bne @080C01BA movs r1, 0x82 lsls r1, 5 movs r0, 0 @@ -362344,15 +362344,15 @@ blockset_load_palette_to_gpu: @ 80C012C movs r0, 0x2 bl bg_get_tilemap cmp r0, 0 - beq _080C015A + beq @080C015A bl free -_080C015A: +@080C015A: movs r0, 0x3 bl bg_get_tilemap cmp r0, 0 - beq _080C0168 + beq @080C0168 bl free -_080C0168: +@080C0168: ldr r0, =0x03005e00 lsls r4, r6, 2 adds r4, r6 @@ -362390,7 +362390,7 @@ _080C0168: bl decompress_palette adds r0, r6, 0 bl remove_task -_080C01BA: +@080C01BA: pop {r4-r6} pop {r0} bx r0 @@ -362399,54 +362399,54 @@ _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] movs r3, 0x20 ldrsh r0, [r1, r3] cmp r0, 0x77 - bgt _080C01DE + bgt @080C01DE adds r0, r2, 0x2 strh r0, [r1, 0x20] -_080C01DE: +@080C01DE: ldrh r2, [r1, 0x20] movs r3, 0x20 ldrsh r0, [r1, r3] cmp r0, 0x78 - ble _080C01EC + ble @080C01EC subs r0, r2, 0x2 strh r0, [r1, 0x20] -_080C01EC: +@080C01EC: ldrh r2, [r1, 0x22] movs r3, 0x22 ldrsh r0, [r1, r3] cmp r0, 0x4F - bgt _080C01FA + bgt @080C01FA adds r0, r2, 0x1 strh r0, [r1, 0x22] -_080C01FA: +@080C01FA: ldrh r2, [r1, 0x22] movs r3, 0x22 ldrsh r0, [r1, r3] cmp r0, 0x50 - ble _080C0208 + ble @080C0208 subs r0, r2, 0x1 strh r0, [r1, 0x22] -_080C0208: +@080C0208: pop {r0} bx r0 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 adds r5, r1, 0 adds r7, r2, 0 cmp r3, 0 - beq _080C0234 + beq @080C0234 ldr r4, =0x085e8735 movs r0, 0x1 adds r1, r4, 0 @@ -362458,21 +362458,21 @@ sub_80C020C: @ 80C020C adds r0, r4, 0 movs r2, 0 bl sub_80BE8DC -_080C0234: +@080C0234: cmp r5, 0 - bne _080C024C + bne @080C024C lsls r4, r6, 16 lsrs r0, r4, 16 bl NationalToHoennOrder lsls r0, 16 lsrs r5, r0, 16 - b _080C0250 + b @080C0250 .align 2, 0 .pool -_080C024C: +@080C024C: adds r5, r6, 0 lsls r4, r6, 16 -_080C0250: +@080C0250: ldr r1, =0x085e8d4f mov r0, sp bl gf_strcpy @@ -362489,33 +362489,33 @@ _080C0250: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - beq _080C028C + beq @080C028C movs r0, 0xB muls r1, r0 ldr r0, =0x083185c8 adds r0, r1, r0 - b _080C028E + b @080C028E .align 2, 0 .pool -_080C028C: +@080C028C: ldr r0, =0x0856e688 -_080C028E: +@080C028E: movs r1, 0x84 movs r2, 0x19 bl sub_80BE8DC cmp r7, 0 - beq _080C02AC + beq @080C02AC add r4, sp, 0x10 adds r0, r6, 0 adds r1, r4, 0 bl sub_81DB468 adds r0, r4, 0 - b _080C02AE + b @080C02AE .align 2, 0 .pool -_080C02AC: +@080C02AC: ldr r0, =0x085e86b8 -_080C02AE: +@080C02AE: movs r1, 0x64 movs r2, 0x29 bl sub_80BE8DC @@ -362528,7 +362528,7 @@ _080C02AE: movs r2, 0x49 bl sub_80BE8DC cmp r7, 0 - beq _080C02FC + beq @080C02FC ldr r0, =0x0856b5b0 lsls r4, r6, 5 adds r4, r0 @@ -362540,10 +362540,10 @@ _080C02AE: movs r1, 0x81 movs r2, 0x49 bl sub_80C0460 - b _080C0310 + b @080C0310 .align 2, 0 .pool -_080C02FC: +@080C02FC: ldr r0, =0x085e86c6 movs r1, 0x81 movs r2, 0x39 @@ -362552,20 +362552,20 @@ _080C02FC: movs r1, 0x81 movs r2, 0x49 bl sub_80BE8DC -_080C0310: +@080C0310: cmp r7, 0 - beq _080C032C + beq @080C032C ldr r0, =0x0856b5b0 lsls r1, r6, 5 adds r0, 0x10 adds r1, r0 ldr r4, [r1] - b _080C032E + b @080C032E .align 2, 0 .pool -_080C032C: +@080C032C: ldr r4, =0x0855d30c -_080C032E: +@080C032E: movs r0, 0x1 adds r1, r4, 0 movs r2, 0xF0 @@ -362585,7 +362585,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 @@ -362607,9 +362607,9 @@ sub_80C0354: @ 80C0354 movs r1, 0xA bl __umodsi3 cmp r0, 0x4 - bls _080C0386 + bls @080C0386 adds r7, 0xA -_080C0386: +@080C0386: adds r0, r7, 0 movs r1, 0x78 bl __udivsi3 @@ -362632,7 +362632,7 @@ _080C0386: bl __udivsi3 adds r2, r0, 0 cmp r2, 0 - bne _080C03D4 + bne @080C03D4 mov r1, sp adds r1, 0x2 movs r0, 0x12 @@ -362642,10 +362642,10 @@ _080C0386: adds r0, r6, 0 adds r0, 0xA1 strb r0, [r1] - b _080C03F4 + b @080C03F4 .align 2, 0 .pool -_080C03D4: +@080C03D4: mov r1, sp adds r1, 0x2 movs r0, 0xC @@ -362661,7 +362661,7 @@ _080C03D4: bl __umodsi3 adds r0, 0xA1 strb r0, [r4] -_080C03F4: +@080C03F4: adds r1, r5, 0 adds r0, r1, 0x1 lsls r0, 24 @@ -362716,7 +362716,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 @@ -362739,9 +362739,9 @@ sub_80C0460: @ 80C0460 movs r1, 0xA bl __umodsi3 cmp r0, 0x4 - bls _080C0494 + bls @080C0494 adds r7, 0xA -_080C0494: +@080C0494: movs r0, 0 mov r8, r0 mov r4, sp @@ -362753,19 +362753,19 @@ _080C0494: lsls r0, 24 lsrs r0, 24 cmp r0, 0xA1 - bne _080C04C0 + bne @080C04C0 movs r6, 0x1 mov r1, sp movs r0, 0x77 strb r0, [r1] - b _080C04C6 + b @080C04C6 .align 2, 0 .pool -_080C04C0: +@080C04C0: movs r1, 0x1 mov r8, r1 movs r6, 0x1 -_080C04C6: +@080C04C6: ldr r1, =0x000186a0 adds r0, r7, 0 bl __umodsi3 @@ -362779,10 +362779,10 @@ _080C04C6: lsls r0, 24 lsrs r0, 24 cmp r0, 0xA1 - bne _080C0504 + bne @080C0504 mov r2, r8 cmp r2, 0 - bne _080C0504 + bne @080C0504 adds r1, r6, 0 adds r0, r1, 0x1 lsls r0, 24 @@ -362790,16 +362790,16 @@ _080C04C6: add r1, sp movs r0, 0x77 strb r0, [r1] - b _080C050E + b @080C050E .align 2, 0 .pool -_080C0504: +@080C0504: movs r3, 0x1 mov r8, r3 adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_080C050E: +@080C050E: ldr r1, =0x00002710 adds r0, r7, 0 bl __umodsi3 @@ -362815,10 +362815,10 @@ _080C050E: lsls r0, 24 lsrs r0, 24 cmp r0, 0xA1 - bne _080C054C + bne @080C054C mov r1, r8 cmp r1, 0 - bne _080C054C + bne @080C054C adds r1, r6, 0 adds r0, r1, 0x1 lsls r0, 24 @@ -362826,14 +362826,14 @@ _080C050E: add r1, sp movs r0, 0x77 strb r0, [r1] - b _080C0552 + b @080C0552 .align 2, 0 .pool -_080C054C: +@080C054C: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_080C0552: +@080C0552: movs r1, 0xFA lsls r1, 2 adds r0, r7, 0 @@ -362934,7 +362934,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, =0x0856b5b0 @@ -362945,32 +362945,32 @@ 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 lsls r1, 24 lsrs r1, 24 cmp r1, 0 - beq _080C0646 + beq @080C0646 cmp r1, 0x1 - beq _080C0654 + beq @080C0654 movs r0, 0x1 - b _080C065C -_080C0646: + b @080C065C +@080C0646: ldr r0, =0x0856b5b0 lsls r1, r2, 5 adds r1, r0 ldrh r0, [r1, 0xC] - b _080C065C + b @080C065C .align 2, 0 .pool -_080C0654: +@080C0654: ldr r0, =0x0856b5b0 lsls r1, r2, 5 adds r1, r0 ldrh r0, [r1, 0xE] -_080C065C: +@080C065C: pop {r1} bx r1 .align 2, 0 @@ -362978,7 +362978,7 @@ _080C065C: thumb_func_end sub_80C0630 thumb_func_start pokedex_flag_operation -pokedex_flag_operation: @ 80C0664 +pokedex_flag_operation: ; 80C0664 push {r4-r7,lr} lsls r0, 16 lsls r1, 24 @@ -362998,25 +362998,25 @@ pokedex_flag_operation: @ 80C0664 lsrs r5, r0, 24 movs r6, 0 cmp r2, 0x1 - beq _080C06FC + beq @080C06FC cmp r2, 0x1 - bgt _080C069C + bgt @080C069C cmp r2, 0 - beq _080C06AA - b _080C07E8 + beq @080C06AA + b @080C07E8 .align 2, 0 .pool -_080C069C: +@080C069C: cmp r3, 0x2 - bne _080C06A2 - b _080C079C -_080C06A2: + bne @080C06A2 + b @080C079C +@080C06A2: cmp r3, 0x3 - bne _080C06A8 - b _080C07D8 -_080C06A8: - b _080C07E8 -_080C06AA: + bne @080C06A8 + b @080C07D8 +@080C06A8: + b @080C07E8 +@080C06AA: ldr r1, =0x03005d90 ldr r0, [r1] adds r0, 0x5C @@ -363025,9 +363025,9 @@ _080C06AA: ands r2, r5 adds r7, r1, 0 cmp r2, 0 - bne _080C06BE - b _080C07E8 -_080C06BE: + bne @080C06BE + b @080C07E8 +@080C06BE: ldr r0, =0x03005d8c ldr r3, [r0] ldr r6, =0x00000988 @@ -363037,23 +363037,23 @@ _080C06BE: ands r1, r5 adds r6, r0, 0 cmp r2, r1 - bne _080C06E0 + bne @080C06E0 ldr r1, =0x00003b24 adds r0, r3, r1 adds r0, r4 ldrb r0, [r0] ands r0, r5 cmp r2, r0 - beq _080C073E -_080C06E0: + beq @080C073E +@080C06E0: ldr r1, [r7] adds r1, 0x5C adds r1, r4 mvns r3, r5 - b _080C076A + b @080C076A .align 2, 0 .pool -_080C06FC: +@080C06FC: ldr r1, =0x03005d90 ldr r3, [r1] adds r0, r3, 0 @@ -363063,7 +363063,7 @@ _080C06FC: ands r2, r5 adds r7, r1, 0 cmp r2, 0 - beq _080C07E8 + beq @080C07E8 adds r0, r3, 0 adds r0, 0x5C adds r0, r4 @@ -363071,7 +363071,7 @@ _080C06FC: ands r0, r5 ldr r6, =0x03005d8c cmp r2, r0 - bne _080C0754 + bne @080C0754 ldr r1, [r6] ldr r3, =0x00000988 adds r0, r1, r3 @@ -363079,20 +363079,20 @@ _080C06FC: ldrb r0, [r0] ands r0, r5 cmp r2, r0 - bne _080C0754 + bne @080C0754 ldr r3, =0x00003b24 adds r0, r1, r3 adds r0, r4 ldrb r0, [r0] ands r0, r5 cmp r2, r0 - bne _080C0754 -_080C073E: + bne @080C0754 +@080C073E: movs r6, 0x1 - b _080C07E8 + b @080C07E8 .align 2, 0 .pool -_080C0754: +@080C0754: ldr r1, [r7] adds r1, 0x28 adds r1, r4 @@ -363104,7 +363104,7 @@ _080C0754: ldr r1, [r7] adds r1, 0x5C adds r1, r4 -_080C076A: +@080C076A: ldrb r2, [r1] adds r0, r3, 0 ands r0, r2 @@ -363125,10 +363125,10 @@ _080C076A: ands r3, r1 strb r3, [r0] movs r6, 0 - b _080C07E8 + b @080C07E8 .align 2, 0 .pool -_080C079C: +@080C079C: ldr r0, =0x03005d90 ldr r1, [r0] adds r1, 0x5C @@ -363149,20 +363149,20 @@ _080C079C: ldr r1, [r3] ldr r3, =0x00003b24 adds r1, r3 - b _080C07DE + b @080C07DE .align 2, 0 .pool -_080C07D8: +@080C07D8: ldr r0, =0x03005d90 ldr r1, [r0] adds r1, 0x28 -_080C07DE: +@080C07DE: adds r1, r4 ldrb r2, [r1] adds r0, r5, 0 orrs r0, r2 strb r0, [r1] -_080C07E8: +@080C07E8: adds r0, r6, 0 pop {r4-r7} pop {r1} @@ -363172,46 +363172,46 @@ _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 movs r5, 0 movs r0, 0 ldr r7, =0x00000181 -_080C0800: +@080C0800: cmp r6, 0 - beq _080C0810 + beq @080C0810 cmp r6, 0x1 - beq _080C081A + beq @080C081A adds r4, r0, 0x1 - b _080C0832 + b @080C0832 .align 2, 0 .pool -_080C0810: +@080C0810: adds r4, r0, 0x1 lsls r0, r4, 16 lsrs r0, 16 movs r1, 0 - b _080C0822 -_080C081A: + b @080C0822 +@080C081A: adds r4, r0, 0x1 lsls r0, r4, 16 lsrs r0, 16 movs r1, 0x1 -_080C0822: +@080C0822: bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - beq _080C0832 + beq @080C0832 adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 -_080C0832: +@080C0832: lsls r0, r4, 16 lsrs r0, 16 cmp r0, r7 - bls _080C0800 + bls @080C0800 adds r0, r5, 0 pop {r4-r7} pop {r1} @@ -363219,20 +363219,20 @@ _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 movs r5, 0 movs r0, 0 -_080C084E: +@080C084E: cmp r6, 0 - beq _080C085A + beq @080C085A cmp r6, 0x1 - beq _080C086C + beq @080C086C adds r4, r0, 0x1 - b _080C088C -_080C085A: + b @080C088C +@080C085A: adds r4, r0, 0x1 lsls r0, r4, 16 lsrs r0, 16 @@ -363240,8 +363240,8 @@ _080C085A: lsls r0, 16 lsrs r0, 16 movs r1, 0 - b _080C087C -_080C086C: + b @080C087C +@080C086C: adds r4, r0, 0x1 lsls r0, r4, 16 lsrs r0, 16 @@ -363249,19 +363249,19 @@ _080C086C: lsls r0, 16 lsrs r0, 16 movs r1, 0x1 -_080C087C: +@080C087C: bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - beq _080C088C + beq @080C088C adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 -_080C088C: +@080C088C: lsls r0, r4, 16 lsrs r0, 16 cmp r0, 0xC9 - bls _080C084E + bls @080C084E adds r0, r5, 0 pop {r4-r6} pop {r1} @@ -363269,43 +363269,43 @@ _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 movs r5, 0 movs r0, 0 -_080C08A6: +@080C08A6: cmp r6, 0 - beq _080C08B2 + beq @080C08B2 cmp r6, 0x1 - beq _080C08BC + beq @080C08BC adds r4, r0, 0x1 - b _080C08D4 -_080C08B2: + b @080C08D4 +@080C08B2: adds r4, r0, 0x1 lsls r0, r4, 16 lsrs r0, 16 movs r1, 0 - b _080C08C4 -_080C08BC: + b @080C08C4 +@080C08BC: adds r4, r0, 0x1 lsls r0, r4, 16 lsrs r0, 16 movs r1, 0x1 -_080C08C4: +@080C08C4: bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - beq _080C08D4 + beq @080C08D4 adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 -_080C08D4: +@080C08D4: lsls r0, r4, 16 lsrs r0, 16 cmp r0, 0x96 - bls _080C08A6 + bls @080C08A6 adds r0, r5, 0 pop {r4-r6} pop {r1} @@ -363313,10 +363313,10 @@ _080C08D4: thumb_func_end sub_80C089C thumb_func_start sub_80C08E4 -sub_80C08E4: @ 80C08E4 +sub_80C08E4: ; 80C08E4 push {r4,lr} movs r0, 0 -_080C08E8: +@080C08E8: adds r0, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -363328,25 +363328,25 @@ _080C08E8: bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - bne _080C0908 + bne @080C0908 movs r0, 0 - b _080C0910 -_080C0908: + b @080C0910 +@080C0908: adds r0, r4, 0 cmp r0, 0xC7 - bls _080C08E8 + bls @080C08E8 movs r0, 0x1 -_080C0910: +@080C0910: pop {r4} pop {r1} bx r1 thumb_func_end sub_80C08E4 thumb_func_start sub_80C0918 -sub_80C0918: @ 80C0918 +sub_80C0918: ; 80C0918 push {r4,lr} movs r0, 0 -_080C091C: +@080C091C: adds r0, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -363355,25 +363355,25 @@ _080C091C: bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - bne _080C0934 + bne @080C0934 movs r0, 0 - b _080C093C -_080C0934: + b @080C093C +@080C0934: adds r0, r4, 0 cmp r0, 0x95 - bls _080C091C + bls @080C091C movs r0, 0x1 -_080C093C: +@080C093C: pop {r4} pop {r1} bx r1 thumb_func_end sub_80C0918 thumb_func_start sub_80C0944 -sub_80C0944: @ 80C0944 +sub_80C0944: ; 80C0944 push {r4,r5,lr} movs r0, 0 -_080C0948: +@080C0948: adds r0, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -363382,12 +363382,12 @@ _080C0948: bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - beq _080C0996 + beq @080C0996 adds r0, r4, 0 cmp r0, 0x95 - bls _080C0948 + bls @080C0948 movs r0, 0x97 -_080C0964: +@080C0964: adds r0, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -363396,13 +363396,13 @@ _080C0964: bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - beq _080C0996 + beq @080C0996 adds r0, r4, 0 cmp r0, 0xF7 - bls _080C0964 + bls @080C0964 movs r0, 0xFB ldr r5, =0x0000017f -_080C0982: +@080C0982: adds r0, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -363411,25 +363411,25 @@ _080C0982: bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - bne _080C09A0 -_080C0996: + bne @080C09A0 +@080C0996: movs r0, 0 - b _080C09A8 + b @080C09A8 .align 2, 0 .pool -_080C09A0: +@080C09A0: adds r0, r4, 0 cmp r0, r5 - bls _080C0982 + bls @080C0982 movs r0, 0x1 -_080C09A8: +@080C09A8: pop {r4,r5} pop {r1} bx r1 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 @@ -363439,7 +363439,7 @@ sub_80C09B0: @ 80C09B0 adds r0, r4, 0 ands r0, r1 cmp r0, 0 - bne _080C09E2 + bne @080C09E2 movs r0, 0 bl lcd_io_clear_bits movs r0, 0x8 @@ -363451,13 +363451,13 @@ sub_80C09B0: @ 80C09B0 movs r0, 0x12 movs r1, 0 bl lcd_io_set -_080C09E2: +@080C09E2: movs r1, 0x80 lsls r1, 2 adds r0, r4, 0 ands r0, r1 cmp r0, 0 - bne _080C0A0C + bne @080C0A0C movs r0, 0 bl lcd_io_clear_bits movs r0, 0xA @@ -363469,13 +363469,13 @@ _080C09E2: movs r0, 0x16 movs r1, 0 bl lcd_io_set -_080C0A0C: +@080C0A0C: movs r1, 0x80 lsls r1, 3 adds r0, r4, 0 ands r0, r1 cmp r0, 0 - bne _080C0A36 + bne @080C0A36 movs r0, 0 bl lcd_io_clear_bits movs r0, 0xC @@ -363487,13 +363487,13 @@ _080C0A0C: movs r0, 0x1A movs r1, 0 bl lcd_io_set -_080C0A36: +@080C0A36: movs r1, 0x80 lsls r1, 4 adds r0, r4, 0 ands r0, r1 cmp r0, 0 - bne _080C0A60 + bne @080C0A60 movs r0, 0 bl lcd_io_clear_bits movs r0, 0xE @@ -363505,12 +363505,12 @@ _080C0A36: movs r0, 0x1E movs r1, 0 bl lcd_io_set -_080C0A60: +@080C0A60: movs r1, 0x80 lsls r1, 5 ands r5, r1 cmp r5, 0 - bne _080C0A7E + bne @080C0A7E movs r0, 0 bl lcd_io_clear_bits bl reset_all_obj_data @@ -363518,7 +363518,7 @@ _080C0A60: ldr r1, =0x0300301c movs r0, 0x8 strb r0, [r1] -_080C0A7E: +@080C0A7E: pop {r4,r5} pop {r0} bx r0 @@ -363527,7 +363527,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 @@ -363559,7 +363559,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 @@ -363622,7 +363622,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} @@ -363638,7 +363638,7 @@ sub_80C0B44: @ 80C0B44 lsrs r6, r3, 24 movs r4, 0 movs r2, 0xFF -_080C0B62: +@080C0B62: mov r1, sp adds r0, r1, r4 ldrb r1, [r0] @@ -363648,12 +363648,12 @@ _080C0B62: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xA - bls _080C0B62 + bls @080C0B62 adds r0, r5, 0 bl NationalPokedexNumToSpecies adds r5, r0, 0 cmp r5, 0 - beq _080C0BC0 + beq @080C0BC0 movs r4, 0 ldr r2, =0x083185c8 movs r0, 0xB @@ -363662,10 +363662,10 @@ _080C0B62: adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0xFF - beq _080C0BD4 + beq @080C0BD4 adds r3, r2, 0 adds r2, r1, 0 -_080C0B98: +@080C0B98: mov r0, sp adds r1, r0, r4 adds r0, r4, r2 @@ -363679,16 +363679,16 @@ _080C0B98: adds r0, r3 ldrb r0, [r0] cmp r0, 0xFF - beq _080C0BD4 + beq @080C0BD4 cmp r4, 0x9 - bls _080C0B98 - b _080C0BD4 + bls @080C0B98 + b @080C0BD4 .align 2, 0 .pool -_080C0BC0: +@080C0BC0: movs r4, 0 movs r1, 0xAE -_080C0BC4: +@080C0BC4: mov r2, sp adds r0, r2, r4 strb r1, [r0] @@ -363696,8 +363696,8 @@ _080C0BC4: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 - bls _080C0BC4 -_080C0BD4: + bls @080C0BC4 +@080C0BD4: mov r0, r8 mov r1, sp adds r2, r7, 0 @@ -363713,7 +363713,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 @@ -363726,7 +363726,7 @@ sub_80C0BF0: @ 80C0BF0 lsrs r5, r3, 24 movs r2, 0 movs r1, 0 -_080C0C08: +@080C0C08: mov r3, sp adds r0, r3, r2 strb r1, [r0] @@ -363734,26 +363734,26 @@ _080C0C08: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xA - bls _080C0C08 + bls @080C0C08 movs r3, 0 ldrb r0, [r4] cmp r0, 0 - beq _080C0C32 -_080C0C20: + beq @080C0C32 +@080C0C20: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 adds r0, r4, r3 ldrb r0, [r0] cmp r0, 0 - beq _080C0C32 + beq @080C0C32 cmp r3, 0xA - bls _080C0C20 -_080C0C32: + bls @080C0C20 +@080C0C32: movs r2, 0 cmp r2, r3 - bcs _080C0C52 -_080C0C38: + bcs @080C0C52 +@080C0C38: adds r0, r2, 0 adds r0, 0xB subs r0, r3 @@ -363766,8 +363766,8 @@ _080C0C38: lsls r0, 24 lsrs r2, r0, 24 cmp r2, r3 - bcc _080C0C38 -_080C0C52: + bcc @080C0C38 +@080C0C52: mov r1, sp movs r0, 0xFF strb r0, [r1, 0xB] @@ -363782,7 +363782,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} @@ -363804,17 +363804,17 @@ sub_80C0C6C: @ 80C0C6C lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _080C0CA2 + bne @080C0CA2 mov r1, sp movs r0, 0x77 strb r0, [r1] - b _080C0CAA -_080C0CA2: + b @080C0CAA +@080C0CA2: mov r1, sp adds r0, 0xA1 strb r0, [r1] movs r5, 0x1 -_080C0CAA: +@080C0CAA: movs r1, 0xFA lsls r1, 2 adds r0, r4, 0 @@ -363826,16 +363826,16 @@ _080C0CAA: lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _080C0CD0 + bne @080C0CD0 cmp r5, 0 - bne _080C0CD0 + bne @080C0CD0 mov r1, sp movs r0, 0x77 - b _080C0CD4 -_080C0CD0: + b @080C0CD4 +@080C0CD0: mov r1, sp adds r0, 0xA1 -_080C0CD4: +@080C0CD4: strb r0, [r1, 0x1] mov r5, sp movs r1, 0xFA @@ -363879,7 +363879,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} @@ -363900,13 +363900,13 @@ sub_80C0D30: @ 80C0D30 movs r5, 0 movs r1, 0 movs r7, 0x2 -_080C0D5A: +@080C0D5A: mov r2, r12 adds r0, r2, r1 ldrb r3, [r0] movs r4, 0 adds r6, r1, 0x1 -_080C0D64: +@080C0D64: lsls r2, r4, 1 adds r1, r3, 0 asrs r1, r2 @@ -363920,10 +363920,10 @@ _080C0D64: lsls r0, r2 ands r0, r3 cmp r0, 0 - beq _080C0D84 + beq @080C0D84 movs r0, 0x20 orrs r1, r0 -_080C0D84: +@080C0D84: mov r2, sp adds r0, r2, r5 strb r1, [r0] @@ -363934,11 +363934,11 @@ _080C0D84: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x3 - bls _080C0D64 + bls @080C0D64 lsls r0, r6, 16 lsrs r1, r0, 16 cmp r1, 0x1F - bls _080C0D5A + bls @080C0D5A mov r0, r8 mov r1, sp movs r2, 0x80 @@ -363955,7 +363955,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 @@ -363990,7 +363990,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 @@ -364002,85 +364002,85 @@ sub_80C0E0C: @ 80C0E0C lsls r3, 16 lsrs r3, 16 cmp r4, 0x1 - beq _080C0E38 + beq @080C0E38 cmp r4, 0x1 - bgt _080C0E2E + bgt @080C0E2E cmp r4, 0 - beq _080C0E40 - b _080C0E60 -_080C0E2E: + beq @080C0E40 + b @080C0E60 +@080C0E2E: cmp r5, 0x2 - beq _080C0E52 + beq @080C0E52 cmp r5, 0x3 - beq _080C0E46 - b _080C0E60 -_080C0E38: + beq @080C0E46 + b @080C0E60 +@080C0E38: cmp r0, r2 - bls _080C0E60 + bls @080C0E60 subs r0, 0x1 - b _080C0E58 -_080C0E40: + b @080C0E58 +@080C0E40: cmp r0, r3 - bcs _080C0E60 - b _080C0E56 -_080C0E46: + bcs @080C0E60 + b @080C0E56 +@080C0E46: cmp r0, r2 - bls _080C0E4E + bls @080C0E4E subs r0, 0x1 - b _080C0E58 -_080C0E4E: + b @080C0E58 +@080C0E4E: adds r0, r3, 0 - b _080C0E60 -_080C0E52: + b @080C0E60 +@080C0E52: cmp r0, r3 - bcs _080C0E5E -_080C0E56: + bcs @080C0E5E +@080C0E56: adds r0, 0x1 -_080C0E58: +@080C0E58: lsls r0, 16 lsrs r0, 16 - b _080C0E60 -_080C0E5E: + b @080C0E60 +@080C0E5E: adds r0, r2, 0 -_080C0E60: +@080C0E60: pop {r4,r5} pop {r1} bx r1 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 cmp r1, 0xC9 - beq _080C0E88 + beq @080C0E88 movs r0, 0x9A lsls r0, 1 cmp r1, r0 - bne _080C0E94 + bne @080C0E94 ldr r0, =0x03005d90 ldr r0, [r0] ldr r0, [r0, 0x20] - b _080C0E96 + b @080C0E96 .align 2, 0 .pool -_080C0E88: +@080C0E88: ldr r0, =0x03005d90 ldr r0, [r0] ldr r0, [r0, 0x1C] - b _080C0E96 + b @080C0E96 .align 2, 0 .pool -_080C0E94: +@080C0E94: movs r0, 0 -_080C0E96: +@080C0E96: pop {r1} bx r1 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 @@ -364127,7 +364127,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 @@ -364158,7 +364158,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 @@ -364187,14 +364187,14 @@ sub_80C0F30: @ 80C0F30 movs r6, 0 ldr r4, =0x00000181 ldr r3, =0x02039b4c -_080C0F6A: +@080C0F6A: ldr r2, [r3] lsls r0, r5, 2 adds r1, r2, r0 ldrb r0, [r1, 0x2] lsls r0, 31 cmp r0, 0 - beq _080C0F86 + beq @080C0F86 lsls r0, r6, 2 adds r0, r2, r0 ldr r1, [r1] @@ -364202,12 +364202,12 @@ _080C0F6A: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 -_080C0F86: +@080C0F86: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, r4 - bls _080C0F6A + bls @080C0F6A ldr r1, =0x02039b4c ldr r0, [r1] ldr r2, =0x0000060c @@ -364215,12 +364215,12 @@ _080C0F86: adds r1, r6, 0 strh r6, [r0] cmp r7, 0xFF - beq _080C103C + beq @080C103C movs r5, 0 lsls r0, r1, 16 movs r6, 0 cmp r0, 0 - beq _080C1032 + beq @080C1032 lsls r7, 2 ldr r0, =0x0856ed08 adds r0, 0x3 @@ -364229,7 +364229,7 @@ _080C0F86: ldr r0, =0x0856ed08 adds r0, r7 mov r9, r0 -_080C0FBA: +@080C0FBA: ldr r1, =0x02039b4c ldr r0, [r1] lsls r4, r5, 2 @@ -364247,7 +364247,7 @@ _080C0FBA: mov r0, r9 ldrb r0, [r0] cmp r2, r0 - bcc _080C0FF2 + bcc @080C0FF2 mov r1, r9 ldrb r0, [r1] ldr r1, =0x0856ed08 @@ -364256,21 +364256,21 @@ _080C0FBA: ldrb r1, [r1] adds r0, r1 cmp r2, r0 - blt _080C100A -_080C0FF2: + blt @080C100A +@080C0FF2: ldr r0, =0x0856ed08 adds r0, 0x2 adds r0, r7, r0 ldrb r2, [r0] cmp r3, r2 - bcc _080C101E + bcc @080C101E ldrb r1, [r0] ldr r2, [sp, 0xC] ldrb r0, [r2] adds r1, r0 cmp r3, r1 - bge _080C101E -_080C100A: + bge @080C101E +@080C100A: ldr r2, =0x02039b4c ldr r0, [r2] lsls r1, r6, 2 @@ -364281,7 +364281,7 @@ _080C100A: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 -_080C101E: +@080C101E: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 @@ -364291,17 +364291,17 @@ _080C101E: adds r0, r2 ldrh r0, [r0] cmp r5, r0 - bcc _080C0FBA -_080C1032: + bcc @080C0FBA +@080C1032: ldr r1, =0x02039b4c ldr r0, [r1] ldr r2, =0x0000060c adds r0, r2 strh r6, [r0] -_080C103C: +@080C103C: ldr r0, [sp, 0x4] cmp r0, 0xFF - beq _080C10AC + beq @080C10AC movs r5, 0 movs r6, 0 ldr r1, =0x02039b4c @@ -364310,11 +364310,11 @@ _080C103C: adds r0, r2 ldrh r0, [r0] cmp r6, r0 - bcs _080C10A2 + bcs @080C10A2 adds r7, r1, 0 ldr r0, =0x083203cc mov r8, r0 -_080C105A: +@080C105A: ldr r0, [r7] lsls r4, r5, 2 adds r0, r4 @@ -364331,7 +364331,7 @@ _080C105A: lsrs r0, 25 ldr r1, [sp, 0x4] cmp r1, r0 - bne _080C1090 + bne @080C1090 ldr r0, [r7] lsls r1, r6, 2 adds r1, r0, r1 @@ -364341,7 +364341,7 @@ _080C105A: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 -_080C1090: +@080C1090: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 @@ -364350,30 +364350,30 @@ _080C1090: adds r0, r2 ldrh r0, [r0] cmp r5, r0 - bcc _080C105A -_080C10A2: + bcc @080C105A +@080C10A2: ldr r1, =0x02039b4c ldr r0, [r1] ldr r2, =0x0000060c adds r0, r2 strh r6, [r0] -_080C10AC: +@080C10AC: ldr r0, [sp, 0x8] cmp r0, 0xFF - bne _080C10C2 + bne @080C10C2 mov r1, r10 cmp r1, 0xFF - bne _080C10BA - b _080C11DE -_080C10BA: + bne @080C10BA + b @080C11DE +@080C10BA: mov r2, r10 str r2, [sp, 0x8] movs r0, 0xFF mov r10, r0 -_080C10C2: +@080C10C2: mov r1, r10 cmp r1, 0xFF - bne _080C1158 + bne @080C1158 movs r5, 0 movs r6, 0 ldr r2, =0x02039b4c @@ -364382,18 +364382,18 @@ _080C10C2: adds r0, r1 ldrh r0, [r0] cmp r6, r0 - bcs _080C11D4 + bcs @080C11D4 adds r3, r2, 0 mov r7, sp mov r8, r2 -_080C10E0: +@080C10E0: ldr r0, [r3] lsls r4, r5, 2 adds r1, r0, r4 ldrb r0, [r1, 0x2] lsls r0, 30 cmp r0, 0 - bge _080C112A + bge @080C112A ldrh r0, [r1] str r3, [sp, 0x10] bl NationalPokedexNumToSpecies @@ -364411,10 +364411,10 @@ _080C10E0: ldr r3, [sp, 0x10] ldr r2, [sp, 0x8] cmp r1, r2 - beq _080C1118 + beq @080C1118 cmp r0, r2 - bne _080C112A -_080C1118: + bne @080C112A +@080C1118: ldr r0, [r3] lsls r1, r6, 2 adds r1, r0, r1 @@ -364424,7 +364424,7 @@ _080C1118: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 -_080C112A: +@080C112A: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 @@ -364434,11 +364434,11 @@ _080C112A: adds r0, r2 ldrh r0, [r0] cmp r5, r0 - bcc _080C10E0 - b _080C11D4 + bcc @080C10E0 + b @080C11D4 .align 2, 0 .pool -_080C1158: +@080C1158: movs r5, 0 movs r6, 0 ldr r1, =0x02039b4c @@ -364447,9 +364447,9 @@ _080C1158: adds r0, r2 ldrh r0, [r0] cmp r6, r0 - bcs _080C11D4 + bcs @080C11D4 mov r7, sp -_080C116C: +@080C116C: ldr r0, [r1] lsls r1, r5, 2 adds r2, r0, r1 @@ -364457,7 +364457,7 @@ _080C116C: lsls r0, 30 adds r4, r1, 0 cmp r0, 0 - bge _080C11C0 + bge @080C11C0 ldrh r0, [r2] bl NationalPokedexNumToSpecies lsls r0, 16 @@ -364473,16 +364473,16 @@ _080C116C: strb r0, [r7, 0x1] ldr r2, [sp, 0x8] cmp r1, r2 - bne _080C11A2 + bne @080C11A2 cmp r0, r10 - beq _080C11AC -_080C11A2: + beq @080C11AC +@080C11A2: cmp r1, r10 - bne _080C11C0 + bne @080C11C0 ldr r1, [sp, 0x8] cmp r0, r1 - bne _080C11C0 -_080C11AC: + bne @080C11C0 +@080C11AC: ldr r2, =0x02039b4c ldr r0, [r2] lsls r1, r6, 2 @@ -364493,7 +364493,7 @@ _080C11AC: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 -_080C11C0: +@080C11C0: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 @@ -364503,25 +364503,25 @@ _080C11C0: adds r0, r2 ldrh r0, [r0] cmp r5, r0 - bcc _080C116C -_080C11D4: + bcc @080C116C +@080C11D4: ldr r1, =0x02039b4c ldr r0, [r1] ldr r2, =0x0000060c adds r0, r2 strh r6, [r0] -_080C11DE: +@080C11DE: ldr r1, =0x02039b4c ldr r0, [r1] ldr r2, =0x0000060c adds r1, r0, r2 ldrh r0, [r1] cmp r0, 0 - beq _080C1232 + beq @080C1232 adds r5, r0, 0 ldr r0, =0x00000181 cmp r5, r0 - bhi _080C1232 + bhi @080C1232 ldr r4, =0x02039b4c movs r1, 0x2 negs r1, r1 @@ -364532,7 +364532,7 @@ _080C11DE: mov r8, r0 ldr r0, =0x0000ffff adds r7, r0, 0 -_080C1208: +@080C1208: ldr r1, [r4] lsls r3, r5, 2 adds r1, r3 @@ -364553,8 +364553,8 @@ _080C1208: lsls r0, 16 lsrs r5, r0, 16 cmp r5, r8 - bls _080C1208 -_080C1232: + bls @080C1208 +@080C1232: adds r0, r6, 0 add sp, 0x14 pop {r3-r5} @@ -364569,7 +364569,7 @@ _080C1232: thumb_func_end sub_80C0F30 thumb_func_start sub_80C1258 -sub_80C1258: @ 80C1258 +sub_80C1258: ; 80C1258 push {lr} ldr r0, =sub_80C12E0 + 1 movs r1, 0 @@ -364583,7 +364583,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 @@ -364617,7 +364617,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 @@ -364644,7 +364644,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 @@ -364656,22 +364656,22 @@ sub_80C12E0: @ 80C12E0 ldrb r0, [r0] adds r3, r1, 0 cmp r0, 0x4 - bhi _080C1320 + bhi @080C1320 lsls r0, 2 - ldr r1, =_080C130C + ldr r1, =@080C130C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C130C: - .4byte _080C1320 - .4byte _080C1414 - .4byte _080C1480 - .4byte _080C14A0 - .4byte _080C14F0 -_080C1320: +@080C130C: + .4byte @080C1320 + .4byte @080C1414 + .4byte @080C1480 + .4byte @080C14A0 + .4byte @080C14F0 +@080C1320: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -364679,9 +364679,9 @@ _080C1320: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - beq _080C1332 - b _080C1516 -_080C1332: + beq @080C1332 + b @080C1516 +@080C1332: ldr r0, =0x02039b4c ldr r0, [r0] ldr r1, =0x0000064a @@ -364732,22 +364732,22 @@ _080C1332: bl copy_decompressed_tile_data_to_vram_autofree bl sub_809D42C cmp r0, 0 - bne _080C13E4 + bne @080C13E4 ldr r1, =0x08dc3a0c movs r0, 0x3 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map - b _080C13F0 + b @080C13F0 .align 2, 0 .pool -_080C13E4: +@080C13E4: ldr r1, =0x08dc3870 movs r0, 0x3 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map -_080C13F0: +@080C13F0: ldr r0, =0x08dc3286 movs r1, 0x1 movs r2, 0x7E @@ -364758,10 +364758,10 @@ _080C13F0: adds r0, r2 movs r1, 0x1 strb r1, [r0] - b _080C1516 + b @080C1516 .align 2, 0 .pool -_080C1414: +@080C1414: ldr r0, =0x0855d26c bl gpu_tile_obj_decompress_and_load ldr r0, =0x0855d27c @@ -364774,7 +364774,7 @@ _080C1414: lsls r2, r0, 3 ldr r5, =0x03005e08 movs r3, 0 -_080C1432: +@080C1432: lsls r0, r1, 1 adds r0, r2 adds r0, r5 @@ -364783,7 +364783,7 @@ _080C1432: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0xF - bls _080C1432 + bls @080C1432 adds r0, r4, 0 bl sub_80C23B8 movs r0, 0 @@ -364799,10 +364799,10 @@ _080C1432: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - b _080C14DA + b @080C14DA .align 2, 0 .pool -_080C1480: +@080C1480: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -364814,10 +364814,10 @@ _080C1480: movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _080C14E2 + b @080C14E2 .align 2, 0 .pool -_080C14A0: +@080C14A0: movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -364839,19 +364839,19 @@ _080C14A0: bl gpu_sync_bg_show movs r0, 0x3 bl gpu_sync_bg_show -_080C14DA: +@080C14DA: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 -_080C14E2: +@080C14E2: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C1516 + b @080C1516 .align 2, 0 .pool -_080C14F0: +@080C14F0: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -364859,7 +364859,7 @@ _080C14F0: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - bne _080C1516 + bne @080C1516 ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -364871,7 +364871,7 @@ _080C14F0: lsls r1, 3 adds r0, r3, r1 strb r2, [r0] -_080C1516: +@080C1516: add sp, 0x4 pop {r4,r5} pop {r0} @@ -364881,39 +364881,39 @@ _080C1516: thumb_func_end sub_80C12E0 thumb_func_start sub_80C152C -sub_80C152C: @ 80C152C +sub_80C152C: ; 80C152C push {lr} bl Window_FreeMemory movs r0, 0 bl bg_get_tilemap cmp r0, 0 - beq _080C1540 + beq @080C1540 bl free -_080C1540: +@080C1540: movs r0, 0x1 bl bg_get_tilemap cmp r0, 0 - beq _080C154E + beq @080C154E bl free -_080C154E: +@080C154E: movs r0, 0x2 bl bg_get_tilemap cmp r0, 0 - beq _080C155C + beq @080C155C bl free -_080C155C: +@080C155C: movs r0, 0x3 bl bg_get_tilemap cmp r0, 0 - beq _080C156A + beq @080C156A bl free -_080C156A: +@080C156A: pop {r0} bx r0 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 @@ -364942,7 +364942,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 @@ -364951,7 +364951,7 @@ sub_80C15B0: @ 80C15B0 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080C15E4 + beq @080C15E4 movs r0, 0x3 bl audio_play ldr r0, =0x03005e00 @@ -364961,14 +364961,14 @@ sub_80C15B0: @ 80C15B0 adds r1, r0 ldr r0, =sub_80C1D38 + 1 str r0, [r1] - b _080C16BC + b @080C16BC .align 2, 0 .pool -_080C15E4: +@080C15E4: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080C1640 + beq @080C1640 ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -364977,47 +364977,47 @@ _080C15E4: movs r0, 0x8 ldrsh r4, [r5, r0] cmp r4, 0x1 - beq _080C161C + beq @080C161C cmp r4, 0x1 - bgt _080C160C + bgt @080C160C cmp r4, 0 - beq _080C1612 - b _080C16BC + beq @080C1612 + b @080C16BC .align 2, 0 .pool -_080C160C: +@080C160C: cmp r4, 0x2 - beq _080C1630 - b _080C16BC -_080C1612: + beq @080C1630 + b @080C16BC +@080C1612: movs r0, 0x15 bl audio_play strh r4, [r5, 0xA] - b _080C1626 -_080C161C: + b @080C1626 +@080C161C: movs r0, 0x15 bl audio_play movs r0, 0x4 strh r0, [r5, 0xA] -_080C1626: +@080C1626: ldr r0, =sub_80C16CC + 1 str r0, [r5] - b _080C16BC + b @080C16BC .align 2, 0 .pool -_080C1630: +@080C1630: movs r0, 0x3 bl audio_play ldr r0, =sub_80C1D38 + 1 str r0, [r5] - b _080C16BC + b @080C16BC .align 2, 0 .pool -_080C1640: +@080C1640: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080C167C + beq @080C167C ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -365026,7 +365026,7 @@ _080C1640: movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - ble _080C167C + ble @080C167C movs r0, 0x6D bl audio_play ldrh r0, [r4, 0x8] @@ -365040,13 +365040,13 @@ _080C1640: bl Window_CopyToVram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram -_080C167C: +@080C167C: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080C16BC + beq @080C16BC ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -365055,7 +365055,7 @@ _080C167C: movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - bgt _080C16BC + bgt @080C16BC movs r0, 0x6D bl audio_play ldrh r0, [r4, 0x8] @@ -365069,7 +365069,7 @@ _080C167C: bl Window_CopyToVram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram -_080C16BC: +@080C16BC: pop {r4,r5} pop {r0} bx r0 @@ -365078,7 +365078,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 @@ -365108,7 +365108,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 @@ -365120,22 +365120,22 @@ sub_80C170C: @ 80C170C movs r1, 0x8 ldrsh r0, [r0, r1] cmp r0, 0 - beq _080C1740 + beq @080C1740 bl sub_809D42C ldr r6, =0x0856edb8 cmp r0, 0 - bne _080C174C + bne @080C174C ldr r6, =0x0856edf0 - b _080C174C + b @080C174C .align 2, 0 .pool -_080C1740: +@080C1740: bl sub_809D42C ldr r6, =0x0856ed9c cmp r0, 0 - bne _080C174C + bne @080C174C ldr r6, =0x0856edd4 -_080C174C: +@080C174C: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 @@ -365143,7 +365143,7 @@ _080C174C: lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0 - beq _080C178C + beq @080C178C movs r0, 0x17 bl audio_play adds r0, r5, 0 @@ -365155,14 +365155,14 @@ _080C174C: adds r1, r0 ldr r0, =sub_80C1570 + 1 str r0, [r1] - b _080C1994 + b @080C1994 .align 2, 0 .pool -_080C178C: +@080C178C: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080C1870 + beq @080C1870 ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -365171,11 +365171,11 @@ _080C178C: movs r2, 0xA ldrsh r0, [r6, r2] cmp r0, 0x6 - bne _080C1860 + bne @080C1860 movs r1, 0x8 ldrsh r0, [r6, r1] cmp r0, 0 - beq _080C183C + beq @080C183C ldr r1, =0x02039b52 movs r0, 0x40 strb r0, [r1] @@ -365199,11 +365199,11 @@ _080C178C: strb r0, [r1, 0x19] bl sub_809D42C cmp r0, 0 - bne _080C17E8 + bne @080C17E8 ldr r1, [r4] movs r0, 0 strb r0, [r1, 0x19] -_080C17E8: +@080C17E8: ldr r0, [r7] ldr r1, [r4] ldrb r1, [r1, 0x19] @@ -365226,10 +365226,10 @@ _080C17E8: bl audio_play ldr r0, =sub_80C1D38 + 1 str r0, [r6] - b _080C1994 + b @080C1994 .align 2, 0 .pool -_080C183C: +@080C183C: ldr r0, =0x085e875b bl sub_80C2618 ldr r0, =sub_80C19A4 + 1 @@ -365239,22 +365239,22 @@ _080C183C: movs r0, 0 movs r1, 0x2 bl Window_CopyToVram - b _080C1994 + b @080C1994 .align 2, 0 .pool -_080C1860: +@080C1860: movs r0, 0x15 bl audio_play ldr r0, =sub_80C1B64 + 1 str r0, [r6] - b _080C1994 + b @080C1994 .align 2, 0 .pool -_080C1870: +@080C1870: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080C18B6 + beq @080C18B6 ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -365266,7 +365266,7 @@ _080C1870: adds r0, r6 ldrb r0, [r0] cmp r0, 0xFF - beq _080C18B6 + beq @080C18B6 movs r0, 0x5 bl audio_play movs r2, 0xA @@ -365282,13 +365282,13 @@ _080C1870: bl Window_CopyToVram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram -_080C18B6: +@080C18B6: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080C1900 + beq @080C1900 ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -365300,7 +365300,7 @@ _080C18B6: adds r0, r6 ldrb r0, [r0, 0x1] cmp r0, 0xFF - beq _080C1900 + beq @080C1900 movs r0, 0x5 bl audio_play movs r2, 0xA @@ -365316,13 +365316,13 @@ _080C18B6: bl Window_CopyToVram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram -_080C1900: +@080C1900: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _080C194A + beq @080C194A ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -365334,7 +365334,7 @@ _080C1900: adds r0, r6 ldrb r0, [r0, 0x2] cmp r0, 0xFF - beq _080C194A + beq @080C194A movs r0, 0x5 bl audio_play movs r2, 0xA @@ -365350,13 +365350,13 @@ _080C1900: bl Window_CopyToVram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram -_080C194A: +@080C194A: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080C1994 + beq @080C1994 ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -365368,7 +365368,7 @@ _080C194A: adds r0, r6 ldrb r0, [r0, 0x3] cmp r0, 0xFF - beq _080C1994 + beq @080C1994 movs r0, 0x5 bl audio_play movs r2, 0xA @@ -365384,7 +365384,7 @@ _080C194A: bl Window_CopyToVram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram -_080C1994: +@080C1994: pop {r4-r7} pop {r0} bx r0 @@ -365393,7 +365393,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 @@ -365471,34 +365471,34 @@ 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 bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - bne _080C1AA6 + bne @080C1AA6 ldr r0, =0x02039b4c ldr r0, [r0] ldr r1, =0x0000060c adds r0, r1 ldrh r0, [r0] cmp r0, 0 - beq _080C1A84 + beq @080C1A84 movs r0, 0x1F bl audio_play ldr r0, =0x085e8773 bl sub_80C2618 - b _080C1A90 + b @080C1A90 .align 2, 0 .pool -_080C1A84: +@080C1A84: movs r0, 0x20 bl audio_play ldr r0, =0x085e8785 bl sub_80C2618 -_080C1A90: +@080C1A90: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -365509,7 +365509,7 @@ _080C1A90: movs r0, 0 movs r1, 0x2 bl Window_CopyToVram -_080C1AA6: +@080C1AA6: pop {r4} pop {r0} bx r0 @@ -365518,7 +365518,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 @@ -365528,14 +365528,14 @@ sub_80C1AB8: @ 80C1AB8 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080C1B54 + beq @080C1B54 ldr r5, =0x02039b4c ldr r1, [r5] ldr r3, =0x0000060c adds r0, r1, r3 ldrh r0, [r0] cmp r0, 0 - beq _080C1B40 + beq @080C1B40 ldr r0, =0x0000064e adds r1, r0 movs r0, 0x1 @@ -365567,10 +365567,10 @@ sub_80C1AB8: @ 80C1AB8 str r1, [r0] movs r0, 0x3 bl audio_play - b _080C1B54 + b @080C1B54 .align 2, 0 .pool -_080C1B40: +@080C1B40: ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -365580,7 +365580,7 @@ _080C1B40: str r0, [r1] movs r0, 0x17 bl audio_play -_080C1B54: +@080C1B54: pop {r4,r5} pop {r0} bx r0 @@ -365589,7 +365589,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 @@ -365636,7 +365636,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} @@ -365671,20 +365671,20 @@ sub_80C1BCC: @ 80C1BCC movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080C1C30 + beq @080C1C30 movs r0, 0x15 bl audio_play bl sub_80C267C movs r0, 0x1 bl sub_80C21D4 - b _080C1C50 + b @080C1C50 .align 2, 0 .pool -_080C1C30: +@080C1C30: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080C1C68 + beq @080C1C68 movs r0, 0x17 bl audio_play bl sub_80C267C @@ -365694,7 +365694,7 @@ _080C1C30: strh r0, [r4] ldrh r0, [r5, 0x26] strh r0, [r6] -_080C1C50: +@080C1C50: ldr r0, =sub_80C16CC + 1 str r0, [r5] movs r0, 0 @@ -365702,31 +365702,31 @@ _080C1C50: bl Window_CopyToVram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - b _080C1D2E + b @080C1D2E .align 2, 0 .pool -_080C1C68: +@080C1C68: movs r3, 0 mov r0, r12 ldrh r1, [r0, 0x30] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _080C1CCA + beq @080C1CCA ldrh r0, [r4] cmp r0, 0 - beq _080C1C8E + beq @080C1C8E bl sub_80C2638 ldrh r0, [r4] subs r0, 0x1 strh r0, [r4] ldrh r0, [r4] bl sub_80C2650 - b _080C1CAA -_080C1C8E: + b @080C1CAA +@080C1C8E: ldrh r0, [r6] cmp r0, 0 - beq _080C1CA6 + beq @080C1CA6 subs r0, 0x1 strh r0, [r6] adds r0, r7, 0 @@ -365734,10 +365734,10 @@ _080C1C8E: ldrh r0, [r4] bl sub_80C2650 movs r3, 0x1 -_080C1CA6: +@080C1CA6: cmp r3, 0 - beq _080C1D2E -_080C1CAA: + beq @080C1D2E +@080C1CAA: movs r0, 0x5 bl audio_play ldrh r0, [r4] @@ -365750,31 +365750,31 @@ _080C1CAA: movs r0, 0 movs r1, 0x2 bl Window_CopyToVram - b _080C1D2E -_080C1CCA: + b @080C1D2E +@080C1CCA: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080C1D2E + beq @080C1D2E ldrh r0, [r4] cmp r0, 0x4 - bhi _080C1CEE + bhi @080C1CEE cmp r0, r2 - bcs _080C1CEE + bcs @080C1CEE bl sub_80C2638 ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] ldrh r0, [r4] bl sub_80C2650 - b _080C1D10 -_080C1CEE: + b @080C1D10 +@080C1CEE: cmp r2, 0x5 - bls _080C1D0C + bls @080C1D0C ldrh r1, [r6] subs r0, r2, 0x5 cmp r1, r0 - bge _080C1D0C + bge @080C1D0C adds r0, r1, 0x1 strh r0, [r6] adds r0, r7, 0 @@ -365782,10 +365782,10 @@ _080C1CEE: movs r0, 0x5 bl sub_80C2650 movs r3, 0x1 -_080C1D0C: +@080C1D0C: cmp r3, 0 - beq _080C1D2E -_080C1D10: + beq @080C1D2E +@080C1D10: movs r0, 0x5 bl audio_play ldrh r0, [r4] @@ -365798,7 +365798,7 @@ _080C1D10: movs r0, 0 movs r1, 0x2 bl Window_CopyToVram -_080C1D2E: +@080C1D2E: pop {r3} mov r8, r3 pop {r4-r7} @@ -365807,7 +365807,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 @@ -365836,7 +365836,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 @@ -365845,11 +365845,11 @@ sub_80C1D70: @ 80C1D70 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080C1D8C + bne @080C1D8C bl sub_80C152C adds r0, r4, 0 bl remove_task -_080C1D8C: +@080C1D8C: pop {r4} pop {r0} bx r0 @@ -365858,7 +365858,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} @@ -365877,12 +365877,12 @@ sub_80C1D98: @ 80C1D98 adds r2, r0, 0 movs r3, 0 cmp r3, r4 - bcs _080C1DEC + bcs @080C1DEC lsls r0, r5, 6 adds r7, r0, r2 ldr r5, =0x00000fff lsls r2, r6, 12 -_080C1DC8: +@080C1DC8: mov r0, r8 adds r1, r0, r3 lsls r1, 1 @@ -365900,8 +365900,8 @@ _080C1DC8: lsls r0, 16 lsrs r3, r0, 16 cmp r3, r4 - bcc _080C1DC8 -_080C1DEC: + bcc @080C1DC8 +@080C1DEC: pop {r3} mov r8, r3 pop {r4-r7} @@ -365912,7 +365912,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 @@ -365926,37 +365926,37 @@ sub_80C1DFC: @ 80C1DFC lsls r2, 1 orrs r5, r2 cmp r4, 0xA - bhi _080C1EE8 + bhi @080C1EE8 lsls r0, r4, 2 - ldr r1, =_080C1E28 + ldr r1, =@080C1E28 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C1E28: - .4byte _080C1E54 - .4byte _080C1E54 - .4byte _080C1E54 - .4byte _080C1E64 - .4byte _080C1E64 - .4byte _080C1E7C - .4byte _080C1E7C - .4byte _080C1E64 - .4byte _080C1E64 - .4byte _080C1EA4 - .4byte _080C1E94 -_080C1E54: +@080C1E28: + .4byte @080C1E54 + .4byte @080C1E54 + .4byte @080C1E54 + .4byte @080C1E64 + .4byte @080C1E64 + .4byte @080C1E7C + .4byte @080C1E7C + .4byte @080C1E64 + .4byte @080C1E64 + .4byte @080C1EA4 + .4byte @080C1E94 +@080C1E54: ldr r1, =0x0856ed30 lsls r0, r4, 3 adds r0, r1 ldrb r1, [r0, 0x4] ldrb r2, [r0, 0x5] - b _080C1EC2 + b @080C1EC2 .align 2, 0 .pool -_080C1E64: +@080C1E64: ldr r2, =0x0856ed48 subs r1, r4, 0x3 lsls r0, r1, 1 @@ -365968,7 +365968,7 @@ _080C1E64: ldrb r3, [r0, 0x6] adds r0, r5, 0 bl sub_80C1D98 -_080C1E7C: +@080C1E7C: ldr r2, =0x0856ed48 subs r1, r4, 0x3 lsls r0, r1, 1 @@ -365978,21 +365978,21 @@ _080C1E7C: ldrb r1, [r0, 0x7] ldrb r2, [r0, 0x8] ldrb r3, [r0, 0x9] - b _080C1EC4 + b @080C1EC4 .align 2, 0 .pool -_080C1E94: +@080C1E94: ldr r0, =0x0856ed48 ldrb r1, [r0, 0x1C] ldrb r2, [r0, 0x1D] ldrb r3, [r0, 0x1E] - b _080C1EC4 + b @080C1EC4 .align 2, 0 .pool -_080C1EA4: +@080C1EA4: bl sub_809D42C cmp r0, 0 - bne _080C1ED0 + bne @080C1ED0 ldr r2, =0x0856ed48 subs r1, r4, 0x3 lsls r0, r1, 1 @@ -366004,15 +366004,15 @@ _080C1EA4: subs r2, 0x2 lsls r2, 24 lsrs r2, 24 -_080C1EC2: +@080C1EC2: ldrb r3, [r0, 0x6] -_080C1EC4: +@080C1EC4: adds r0, r5, 0 bl sub_80C1D98 - b _080C1EE8 + b @080C1EE8 .align 2, 0 .pool -_080C1ED0: +@080C1ED0: ldr r2, =0x0856ed48 subs r1, r4, 0x3 lsls r0, r1, 1 @@ -366024,7 +366024,7 @@ _080C1ED0: ldrb r3, [r0, 0x6] adds r0, r5, 0 bl sub_80C1D98 -_080C1EE8: +@080C1EE8: pop {r4,r5} pop {r0} bx r0 @@ -366033,23 +366033,23 @@ _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 adds r1, r0, 0 cmp r0, 0x1 - beq _080C1F5E + beq @080C1F5E cmp r0, 0x1 - bgt _080C1F0A + bgt @080C1F0A cmp r0, 0 - beq _080C1F10 - b _080C203C -_080C1F0A: + beq @080C1F10 + b @080C203C +@080C1F0A: cmp r1, 0x2 - beq _080C1FCE - b _080C203C -_080C1F10: + beq @080C1FCE + b @080C203C +@080C1F10: movs r0, 0 movs r1, 0 movs r2, 0 @@ -366081,8 +366081,8 @@ _080C1F10: movs r0, 0x6 movs r1, 0x1 movs r2, 0 - b _080C1FAA -_080C1F5E: + b @080C1FAA +@080C1F5E: movs r0, 0 movs r1, 0x1 movs r2, 0 @@ -366114,7 +366114,7 @@ _080C1F5E: movs r0, 0x6 movs r1, 0x1 movs r2, 0x1 -_080C1FAA: +@080C1FAA: bl sub_80C1DFC movs r0, 0x7 movs r1, 0x1 @@ -366128,8 +366128,8 @@ _080C1FAA: movs r1, 0x1 movs r2, 0 bl sub_80C1DFC - b _080C203C -_080C1FCE: + b @080C203C +@080C1FCE: movs r0, 0 movs r1, 0x1 movs r2, 0 @@ -366174,13 +366174,13 @@ _080C1FCE: movs r1, 0x1 movs r2, 0x1 bl sub_80C1DFC -_080C203C: +@080C203C: pop {r0} bx r0 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 @@ -366200,7 +366200,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 @@ -366208,59 +366208,59 @@ sub_80C2064: @ 80C2064 lsrs r4, r1, 24 bl sub_80C1EF4 cmp r4, 0x6 - bhi _080C20DE + bhi @080C20DE lsls r0, r4, 2 - ldr r1, =_080C2084 + ldr r1, =@080C2084 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C2084: - .4byte _080C20A0 - .4byte _080C20A4 - .4byte _080C20A8 - .4byte _080C20B6 - .4byte _080C20C4 - .4byte _080C20C8 - .4byte _080C20D4 -_080C20A0: +@080C2084: + .4byte @080C20A0 + .4byte @080C20A4 + .4byte @080C20A8 + .4byte @080C20B6 + .4byte @080C20C4 + .4byte @080C20C8 + .4byte @080C20D4 +@080C20A0: movs r0, 0x3 - b _080C20CA -_080C20A4: + b @080C20CA +@080C20A4: movs r0, 0x4 - b _080C20CA -_080C20A8: + b @080C20CA +@080C20A8: movs r0, 0xA movs r1, 0 movs r2, 0 bl sub_80C1DFC movs r0, 0x5 - b _080C20CA -_080C20B6: + b @080C20CA +@080C20B6: movs r0, 0xA movs r1, 0 movs r2, 0 bl sub_80C1DFC movs r0, 0x6 - b _080C20CA -_080C20C4: + b @080C20CA +@080C20C4: movs r0, 0x7 - b _080C20CA -_080C20C8: + b @080C20CA +@080C20C8: movs r0, 0x8 -_080C20CA: +@080C20CA: movs r1, 0 movs r2, 0 bl sub_80C1DFC - b _080C20DE -_080C20D4: + b @080C20DE +@080C20D4: movs r0, 0x9 movs r1, 0 movs r2, 0 bl sub_80C1DFC -_080C20DE: +@080C20DE: ldr r0, =0x0856ed48 lsls r1, r4, 1 adds r1, r4 @@ -366276,7 +366276,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 @@ -366351,7 +366351,7 @@ sub_80C20F8: @ 80C20F8 bl sub_80C1270 bl sub_809D42C cmp r0, 0 - beq _080C21B6 + beq @080C21B6 ldrh r0, [r5, 0xE] ldrh r5, [r5, 0xC] adds r0, r5 @@ -366364,7 +366364,7 @@ sub_80C20F8: @ 80C20F8 movs r1, 0x2D movs r2, 0x51 bl sub_80C1270 -_080C21B6: +@080C21B6: pop {r4,r5} pop {r0} bx r0 @@ -366373,7 +366373,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 @@ -366382,14 +366382,14 @@ sub_80C21D4: @ 80C21D4 bl bg_get_tilemap adds r5, r0, 0 cmp r4, 0 - bne _080C2268 + bne @080C2268 ldr r1, =0x00000c0b adds r0, r1, 0 strh r0, [r5, 0x22] movs r1, 0x12 ldr r0, =0x0000080d adds r2, r0, 0 -_080C21F4: +@080C21F4: lsls r0, r1, 1 adds r0, r5 strh r2, [r0] @@ -366397,19 +366397,19 @@ _080C21F4: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x1E - bls _080C21F4 + bls @080C21F4 movs r2, 0x1 ldr r1, =0x0000040a adds r6, r1, 0 movs r4, 0x2 -_080C220C: +@080C220C: lsls r0, r2, 6 adds r0, r5 strh r6, [r0, 0x22] movs r1, 0x12 adds r3, r2, 0x1 adds r2, r0, 0 -_080C2218: +@080C2218: lsls r0, r1, 1 adds r0, r2 strh r4, [r0] @@ -366417,11 +366417,11 @@ _080C2218: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x1E - bls _080C2218 + bls @080C2218 lsls r0, r3, 16 lsrs r2, r0, 16 cmp r2, 0xC - bls _080C220C + bls @080C220C ldr r2, =0x00000362 adds r1, r5, r2 adds r2, 0xA9 @@ -366431,7 +366431,7 @@ _080C2218: movs r3, 0xD0 lsls r3, 2 movs r2, 0xD -_080C2242: +@080C2242: lsls r0, r1, 1 adds r0, r5 adds r0, r3 @@ -366440,19 +366440,19 @@ _080C2242: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x1E - bls _080C2242 - b _080C228C + bls @080C2242 + b @080C228C .align 2, 0 .pool -_080C2268: +@080C2268: movs r2, 0 movs r4, 0x4F -_080C226C: +@080C226C: movs r1, 0x11 lsls r0, r2, 6 adds r3, r2, 0x1 adds r2, r0, r5 -_080C2274: +@080C2274: lsls r0, r1, 1 adds r0, r2 strh r4, [r0] @@ -366460,19 +366460,19 @@ _080C2274: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x1D - bls _080C2274 + bls @080C2274 lsls r0, r3, 16 lsrs r2, r0, 16 cmp r2, 0xD - bls _080C226C -_080C228C: + bls @080C226C +@080C228C: pop {r4-r6} pop {r0} bx r0 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} @@ -366501,10 +366501,10 @@ sub_80C2294: @ 80C2294 bl sub_80C267C movs r5, 0 ldrh r4, [r7] - b _080C22F2 + b @080C22F2 .align 2, 0 .pool -_080C22D8: +@080C22D8: adds r0, r1, r6 ldr r1, [r0, 0x4] adds r0, r5, 0 @@ -366516,14 +366516,14 @@ _080C22D8: lsls r0, 16 lsrs r4, r0, 16 cmp r5, 0x5 - bhi _080C22FC -_080C22F2: + bhi @080C22FC +@080C22F2: lsls r1, r4, 3 adds r0, r1, r6 ldr r0, [r0, 0x4] cmp r0, 0 - bne _080C22D8 -_080C22FC: + bne @080C22D8 +@080C22FC: mov r1, r8 ldrh r0, [r1] ldrh r1, [r7] @@ -366540,7 +366540,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 @@ -366566,58 +366566,58 @@ sub_80C2318: @ 80C2318 lsls r0, 16 lsrs r2, r0, 16 cmp r3, 0x5 - bhi _080C237C + bhi @080C237C lsls r0, r3, 2 - ldr r1, =_080C2364 + ldr r1, =@080C2364 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C2364: - .4byte _080C2390 - .4byte _080C239A - .4byte _080C23AA - .4byte _080C23AA - .4byte _080C2388 - .4byte _080C2380 -_080C237C: +@080C2364: + .4byte @080C2390 + .4byte @080C239A + .4byte @080C23AA + .4byte @080C23AA + .4byte @080C2388 + .4byte @080C2380 +@080C237C: movs r0, 0 - b _080C23B0 -_080C2380: + b @080C23B0 +@080C2380: ldr r0, =0x0856efac - b _080C23AC + b @080C23AC .align 2, 0 .pool -_080C2388: +@080C2388: ldr r0, =0x0856efae - b _080C23AC + b @080C23AC .align 2, 0 .pool -_080C2390: +@080C2390: cmp r2, 0 - beq _080C239E + beq @080C239E lsls r0, r2, 24 lsrs r0, 24 - b _080C23B0 -_080C239A: + b @080C23B0 +@080C239A: cmp r2, 0 - bne _080C23A2 -_080C239E: + bne @080C23A2 +@080C239E: movs r0, 0xFF - b _080C23B0 -_080C23A2: + b @080C23B0 +@080C23A2: subs r0, r2, 0x1 lsls r0, 24 lsrs r0, 24 - b _080C23B0 -_080C23AA: + b @080C23B0 +@080C23AA: ldr r0, =0x0856efb4 -_080C23AC: +@080C23AC: adds r0, r2, r0 ldrb r0, [r0] -_080C23B0: +@080C23B0: pop {r1} bx r1 .align 2, 0 @@ -366625,7 +366625,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 @@ -366636,17 +366636,17 @@ sub_80C23B8: @ 80C23B8 ldrh r0, [r0] adds r5, r1, 0 cmp r0, 0 - beq _080C23D2 + beq @080C23D2 cmp r0, 0x1 - beq _080C23E0 -_080C23D2: + beq @080C23E0 +@080C23D2: movs r3, 0 - b _080C23E2 + b @080C23E2 .align 2, 0 .pool -_080C23E0: +@080C23E0: movs r3, 0x1 -_080C23E2: +@080C23E2: ldr r1, =0x03005e00 lsls r2, r4, 2 adds r0, r2, r4 @@ -366660,40 +366660,40 @@ _080C23E2: ldrh r0, [r0] adds r5, r1, 0 cmp r0, 0x5 - bhi _080C2428 + bhi @080C2428 lsls r0, 2 - ldr r1, =_080C2410 + ldr r1, =@080C2410 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C2410: - .4byte _080C2428 - .4byte _080C242C - .4byte _080C2430 - .4byte _080C2434 - .4byte _080C2438 - .4byte _080C243C -_080C2428: +@080C2410: + .4byte @080C2428 + .4byte @080C242C + .4byte @080C2430 + .4byte @080C2434 + .4byte @080C2438 + .4byte @080C243C +@080C2428: movs r3, 0 - b _080C243E -_080C242C: + b @080C243E +@080C242C: movs r3, 0x1 - b _080C243E -_080C2430: + b @080C243E +@080C2430: movs r3, 0x2 - b _080C243E -_080C2434: + b @080C243E +@080C2434: movs r3, 0x3 - b _080C243E -_080C2438: + b @080C243E +@080C2438: movs r3, 0x4 - b _080C243E -_080C243C: + b @080C243E +@080C243C: movs r3, 0x5 -_080C243E: +@080C243E: adds r0, r2, r4 lsls r0, 3 adds r0, r5 @@ -366704,7 +366704,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 @@ -366727,23 +366727,23 @@ sub_80C244C: @ 80C244C lsls r0, 16 lsrs r0, 16 cmp r0, 0x5 - bls _080C248C + bls @080C248C ldrh r0, [r1] cmp r0, 0 - beq _080C248C + beq @080C248C movs r0, 0 - b _080C248E + b @080C248E .align 2, 0 .pool -_080C248C: +@080C248C: movs r0, 0x1 -_080C248E: +@080C248E: pop {r1} bx r1 thumb_func_end sub_80C244C thumb_func_start sub_80C2494 -sub_80C2494: @ 80C2494 +sub_80C2494: ; 80C2494 push {lr} lsls r0, 24 lsrs r0, 24 @@ -366766,24 +366766,24 @@ sub_80C2494: @ 80C2494 lsls r0, 16 lsrs r0, 16 cmp r0, 0x5 - bls _080C24D8 + bls @080C24D8 ldrh r1, [r1] subs r0, 0x5 cmp r1, r0 - bge _080C24D8 + bge @080C24D8 movs r0, 0 - b _080C24DA + b @080C24DA .align 2, 0 .pool -_080C24D8: +@080C24D8: movs r0, 0x1 -_080C24DA: +@080C24DA: pop {r1} bx r1 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 @@ -366796,48 +366796,48 @@ sub_80C24E0: @ 80C24E0 ldr r1, [r0] ldr r0, =sub_80C1BCC + 1 cmp r1, r0 - bne _080C2580 + bne @080C2580 movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080C2528 + beq @080C2528 ldrh r0, [r4, 0x2E] lsls r0, 24 lsrs r0, 24 bl sub_80C2494 lsls r0, 24 cmp r0, 0 - beq _080C2544 + beq @080C2544 adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 - b _080C2550 + b @080C2550 .align 2, 0 .pool -_080C2528: +@080C2528: ldrh r0, [r4, 0x2E] lsls r0, 24 lsrs r0, 24 bl sub_80C244C lsls r0, 24 cmp r0, 0 - beq _080C2544 + beq @080C2544 adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 - b _080C2550 -_080C2544: + b @080C2550 +@080C2544: adds r2, r4, 0 adds r2, 0x3E ldrb r1, [r2] movs r0, 0x5 negs r0, r0 ands r0, r1 -_080C2550: +@080C2550: strb r0, [r2] ldrh r2, [r4, 0x32] movs r1, 0x30 @@ -366851,32 +366851,32 @@ _080C2550: movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bge _080C256E + bge @080C256E adds r0, 0x7F -_080C256E: +@080C256E: asrs r0, 7 strh r0, [r4, 0x26] adds r0, r2, 0 adds r0, 0x8 strh r0, [r4, 0x32] - b _080C258C + b @080C258C .align 2, 0 .pool -_080C2580: +@080C2580: adds r0, r4, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_080C258C: +@080C258C: pop {r4} pop {r0} bx r0 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 @@ -366940,7 +366940,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 @@ -366958,7 +366958,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 @@ -366972,7 +366972,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, =0x085e8b3a @@ -366987,7 +366987,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 @@ -367000,7 +367000,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 @@ -367012,7 +367012,7 @@ sub_80C267C: @ 80C267C thumb_func_end sub_80C267C thumb_func_start sub_80C2690 -sub_80C2690: @ 80C2690 +sub_80C2690: ; 80C2690 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -367022,7 +367022,7 @@ sub_80C2690: @ 80C2690 ldr r0, [r0] ldrb r0, [r0, 0x9] cmp r0, 0 - beq _080C26C0 + beq @080C26C0 ldr r1, =0x040000d4 ldr r0, =0x02038c28 str r0, [r1] @@ -367033,7 +367033,7 @@ sub_80C2690: @ 80C2690 ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] -_080C26C0: +@080C26C0: pop {r0} bx r0 .align 2, 0 @@ -367041,7 +367041,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] @@ -367069,7 +367069,7 @@ sub_80C26D4: @ 80C26D4 thumb_func_end sub_80C26D4 thumb_func_start sub_80C2710 -sub_80C2710: @ 80C2710 +sub_80C2710: ; 80C2710 push {lr} bl run_active_tasks bl call_obj_callbacks @@ -367080,7 +367080,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 @@ -367107,7 +367107,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 @@ -367117,100 +367117,100 @@ sub_80C2760: @ 80C2760 ldrb r0, [r0] adds r4, r1, 0 cmp r0, 0x10 - bls _080C2776 - b _080C2ACA -_080C2776: + bls @080C2776 + b @080C2ACA +@080C2776: lsls r0, 2 - ldr r1, =_080C2788 + ldr r1, =@080C2788 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C2788: - .4byte _080C27CC - .4byte _080C27E2 - .4byte _080C27F0 - .4byte _080C27F8 - .4byte _080C280C - .4byte _080C2820 - .4byte _080C2830 - .4byte _080C2836 - .4byte _080C289C - .4byte _080C28C8 - .4byte _080C28E4 - .4byte _080C299C - .4byte _080C2970 - .4byte _080C2AAA - .4byte _080C2A98 - .4byte _080C2A2C - .4byte _080C2A68 -_080C27CC: +@080C2788: + .4byte @080C27CC + .4byte @080C27E2 + .4byte @080C27F0 + .4byte @080C27F8 + .4byte @080C280C + .4byte @080C2820 + .4byte @080C2830 + .4byte @080C2836 + .4byte @080C289C + .4byte @080C28C8 + .4byte @080C28E4 + .4byte @080C299C + .4byte @080C2970 + .4byte @080C2AAA + .4byte @080C2A98 + .4byte @080C2A2C + .4byte @080C2A68 +@080C27CC: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _080C27D8 - b _080C2ACA -_080C27D8: + beq @080C27D8 + b @080C2ACA +@080C27D8: movs r0, 0x1 movs r1, 0 bl Window_FastFillPixels - b _080C28D4 -_080C27E2: + b @080C28D4 +@080C27E2: bl sub_80C3438 lsls r0, 24 cmp r0, 0 - bne _080C27EE - b _080C2ACA -_080C27EE: - b _080C28D4 -_080C27F0: + bne @080C27EE + b @080C2ACA +@080C27EE: + b @080C28D4 +@080C27F0: movs r0, 0x1 bl sub_80C438C - b _080C28D4 -_080C27F8: + b @080C28D4 +@080C27F8: movs r0, 0x2 movs r1, 0 bl Window_FastFillPixels bl sub_80C4FF0 movs r0, 0x2 bl sub_80C438C - b _080C28D4 -_080C280C: + b @080C28D4 +@080C280C: ldr r0, [r4] ldr r1, =0x00000ef8 adds r0, r1 bl sub_80C4550 ldr r1, [r4] - b _080C28D8 + b @080C28D8 .align 2, 0 .pool -_080C2820: +@080C2820: ldr r0, [r4] movs r2, 0xB3 lsls r2, 3 adds r0, r2 bl sub_80C45C0 ldr r1, [r4] - b _080C28D8 -_080C2830: + b @080C28D8 +@080C2830: bl sub_80C4630 - b _080C28D4 -_080C2836: + b @080C28D4 +@080C2836: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 - bne _080C2852 + bne @080C2852 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 - bne _080C2852 + bne @080C2852 bl sub_800E0E8 movs r0, 0xE6 movs r1, 0x96 bl sub_800DFB4 -_080C2852: +@080C2852: movs r6, 0x1 negs r6, r6 ldr r4, =0x02039ce8 @@ -367233,58 +367233,58 @@ _080C2852: ldr r0, =sub_80C2690 + 1 bl SetVBlankCallback ldr r1, [r4] - b _080C28D8 + b @080C28D8 .align 2, 0 .pool -_080C289C: +@080C289C: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - beq _080C28A8 - b _080C2ACA -_080C28A8: + beq @080C28A8 + b @080C2ACA +@080C28A8: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _080C28B4 - b _080C2ACA -_080C28B4: + beq @080C28B4 + b @080C2ACA +@080C28B4: movs r0, 0xFB bl audio_play ldr r0, =0x02039ce8 ldr r1, [r0] movs r0, 0xA strb r0, [r1] - b _080C2ACA + b @080C2ACA .align 2, 0 .pool -_080C28C8: +@080C28C8: bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - beq _080C28D4 - b _080C2ACA -_080C28D4: + beq @080C28D4 + b @080C2ACA +@080C28D4: ldr r0, =0x02039ce8 ldr r1, [r0] -_080C28D8: +@080C28D8: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C2ACA + b @080C2ACA .align 2, 0 .pool -_080C28E4: +@080C28E4: ldr r0, =0x03003124 ldrb r5, [r0] cmp r5, 0 - bne _080C290A + bne @080C290A ldr r0, [r4] ldr r1, =0x00000529 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _080C290A + beq @080C290A bl sub_80C3880 movs r0, 0x1 bl sub_80C438C @@ -367292,13 +367292,13 @@ _080C28E4: ldr r2, =0x00000529 adds r0, r2 strb r5, [r0] -_080C290A: +@080C290A: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080C293C + beq @080C293C bl sub_80C4918 movs r0, 0xF9 bl audio_play @@ -367306,86 +367306,86 @@ _080C290A: ldr r1, [r0] movs r0, 0xC strb r0, [r1] - b _080C2ACA + b @080C2ACA .align 2, 0 .pool -_080C293C: +@080C293C: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _080C2946 - b _080C2ACA -_080C2946: + bne @080C2946 + b @080C2ACA +@080C2946: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _080C2960 + beq @080C2960 ldr r4, =0x02039ce8 ldr r0, [r4] ldrb r0, [r0, 0x5] cmp r0, 0 - beq _080C2960 + beq @080C2960 bl in_trade_center cmp r0, 0x1 - beq _080C2A14 -_080C2960: + beq @080C2A14 +@080C2960: movs r0, 0x1 negs r0, r0 ldr r4, =0x02039ce8 - b _080C2A74 + b @080C2A74 .align 2, 0 .pool -_080C2970: +@080C2970: bl sub_80C4940 lsls r0, 24 cmp r0, 0 - bne _080C297C - b _080C2ACA -_080C297C: + bne @080C297C + b @080C2ACA +@080C297C: bl sub_8087598 cmp r0, 0x1 - bne _080C2986 - b _080C2ACA -_080C2986: + bne @080C2986 + b @080C2ACA +@080C2986: movs r0, 0xFB bl audio_play ldr r0, =0x02039ce8 ldr r1, [r0] movs r0, 0xB strb r0, [r1] - b _080C2ACA + b @080C2ACA .align 2, 0 .pool -_080C299C: +@080C299C: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080C29F4 + beq @080C29F4 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _080C29DC + beq @080C29DC ldr r0, [r4] ldrb r0, [r0, 0x5] cmp r0, 0 - beq _080C29C0 + beq @080C29C0 bl in_trade_center cmp r0, 0x1 - beq _080C2A14 -_080C29C0: + beq @080C2A14 +@080C29C0: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _080C29DC + beq @080C29DC movs r0, 0x1 negs r0, r0 ldr r4, =0x02039ce8 - b _080C2A74 + b @080C2A74 .align 2, 0 .pool -_080C29DC: +@080C29DC: bl sub_80C4918 ldr r0, =0x02039ce8 ldr r1, [r0] @@ -367393,40 +367393,40 @@ _080C29DC: strb r0, [r1] movs r0, 0xF9 bl audio_play - b _080C2ACA + b @080C2ACA .align 2, 0 .pool -_080C29F4: +@080C29F4: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080C2ACA + beq @080C2ACA ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _080C2A20 + beq @080C2A20 ldr r0, [r4] ldrb r0, [r0, 0x5] cmp r0, 0 - beq _080C2A20 + beq @080C2A20 bl in_trade_center cmp r0, 0x1 - bne _080C2A20 -_080C2A14: + bne @080C2A20 +@080C2A14: ldr r1, [r4] movs r0, 0xF strb r0, [r1] - b _080C2ACA + b @080C2ACA .align 2, 0 .pool -_080C2A20: +@080C2A20: movs r0, 0x1 negs r0, r0 ldr r4, =0x02039ce8 - b _080C2A74 + b @080C2A74 .align 2, 0 .pool -_080C2A2C: +@080C2A2C: bl sub_800AC34 movs r0, 0 movs r1, 0x1 @@ -367448,17 +367448,17 @@ _080C2A2C: ldr r1, [r0] movs r0, 0x10 strb r0, [r1] - b _080C2ACA + b @080C2ACA .align 2, 0 .pool -_080C2A68: +@080C2A68: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _080C2ACA + bne @080C2ACA movs r0, 0x1 negs r0, r0 -_080C2A74: +@080C2A74: ldr r1, [r4] ldr r2, =0x0000052c adds r1, r2 @@ -367471,32 +367471,32 @@ _080C2A74: ldr r1, [r4] movs r0, 0xE strb r0, [r1] - b _080C2ACA + b @080C2ACA .align 2, 0 .pool -_080C2A98: +@080C2A98: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne _080C2ACA + bne @080C2ACA adds r0, r5, 0 bl sub_80C2728 - b _080C2ACA -_080C2AAA: + b @080C2ACA +@080C2AAA: bl sub_80C4940 lsls r0, 24 cmp r0, 0 - beq _080C2ACA + beq @080C2ACA bl sub_8087598 cmp r0, 0x1 - beq _080C2ACA + beq @080C2ACA ldr r0, =0x02039ce8 ldr r1, [r0] movs r0, 0xA strb r0, [r1] movs r0, 0xFB bl audio_play -_080C2ACA: +@080C2ACA: add sp, 0xC pop {r4-r6} pop {r0} @@ -367506,176 +367506,176 @@ _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] ldrb r0, [r1, 0x2] cmp r0, 0x5 - bls _080C2AE6 - b _080C2C64 -_080C2AE6: + bls @080C2AE6 + b @080C2C64 +@080C2AE6: lsls r0, 2 - ldr r1, =_080C2AF8 + ldr r1, =@080C2AF8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C2AF8: - .4byte _080C2B10 - .4byte _080C2B44 - .4byte _080C2B78 - .4byte _080C2BD0 - .4byte _080C2C04 - .4byte _080C2C38 -_080C2B10: +@080C2AF8: + .4byte @080C2B10 + .4byte @080C2B44 + .4byte @080C2B78 + .4byte @080C2BD0 + .4byte @080C2C04 + .4byte @080C2C38 +@080C2B10: ldr r0, =0x02039ce8 ldr r1, [r0] ldr r2, =0x0000052a adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080C2B34 + beq @080C2B34 ldr r0, =0x08dd1f78 ldr r2, =0x00000ef8 - b _080C2C4A + b @080C2C4A .align 2, 0 .pool -_080C2B34: +@080C2B34: ldr r0, =0x08dd2ae0 ldr r2, =0x00000ef8 - b _080C2C4A + b @080C2C4A .align 2, 0 .pool -_080C2B44: +@080C2B44: ldr r0, =0x02039ce8 ldr r1, [r0] ldr r2, =0x0000052a adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080C2B68 + beq @080C2B68 ldr r0, =0x08dd21b0 ldr r2, =0x00000a48 - b _080C2C4A + b @080C2C4A .align 2, 0 .pool -_080C2B68: +@080C2B68: ldr r0, =0x08dd2d30 ldr r2, =0x00000a48 - b _080C2C4A + b @080C2C4A .align 2, 0 .pool -_080C2B78: +@080C2B78: ldr r0, =0x02039ce8 ldr r1, [r0] ldrb r0, [r1, 0x5] cmp r0, 0 - bne _080C2BAC + bne @080C2BAC ldr r2, =0x0000052a adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080C2BA0 + beq @080C2BA0 ldr r0, =0x08dd2010 adds r2, 0x6E - b _080C2C4A + b @080C2C4A .align 2, 0 .pool -_080C2BA0: +@080C2BA0: ldr r0, =0x08dd2b78 movs r2, 0xB3 lsls r2, 3 - b _080C2C4A + b @080C2C4A .align 2, 0 .pool -_080C2BAC: +@080C2BAC: ldr r2, =0x0000052a adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080C2BC4 + beq @080C2BC4 ldr r0, =0x08dd228c adds r2, 0x6E - b _080C2C4A + b @080C2C4A .align 2, 0 .pool -_080C2BC4: +@080C2BC4: ldr r0, =0x08dd2e5c movs r2, 0xB3 lsls r2, 3 - b _080C2C4A + b @080C2C4A .align 2, 0 .pool -_080C2BD0: +@080C2BD0: ldr r0, =0x02039ce8 ldr r1, [r0] ldr r2, =0x0000052a adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080C2BF4 + beq @080C2BF4 ldr r0, =0x0856f5cc ldr r2, =0x000013a8 - b _080C2C4A + b @080C2C4A .align 2, 0 .pool -_080C2BF4: +@080C2BF4: ldr r0, =0x0856f814 ldr r2, =0x000013a8 - b _080C2C4A + b @080C2C4A .align 2, 0 .pool -_080C2C04: +@080C2C04: ldr r0, =0x02039ce8 ldr r1, [r0] ldr r2, =0x0000052a adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080C2C28 + beq @080C2C28 ldr r0, =0x08dd1ab8 ldr r2, =0x000019a8 - b _080C2C4A + b @080C2C4A .align 2, 0 .pool -_080C2C28: +@080C2C28: ldr r0, =0x08dd246c ldr r2, =0x000019a8 - b _080C2C4A + b @080C2C4A .align 2, 0 .pool -_080C2C38: +@080C2C38: ldr r0, =0x02039ce8 ldr r1, [r0] ldr r2, =0x0000052a adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - bne _080C2C6C + bne @080C2C6C ldr r0, =0x0856f018 ldr r2, =0x000017a8 -_080C2C4A: +@080C2C4A: adds r1, r2 bl LZ77UnCompWram - b _080C2C6C + b @080C2C6C .align 2, 0 .pool -_080C2C64: +@080C2C64: movs r0, 0 strb r0, [r1, 0x2] movs r0, 0x1 - b _080C2C78 -_080C2C6C: + b @080C2C78 +@080C2C6C: ldr r0, =0x02039ce8 ldr r1, [r0] ldrb r0, [r1, 0x2] adds r0, 0x1 strb r0, [r1, 0x2] movs r0, 0 -_080C2C78: +@080C2C78: pop {r1} bx r1 .align 2, 0 @@ -367683,7 +367683,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 @@ -367693,40 +367693,40 @@ sub_80C2C80: @ 80C2C80 ldrb r0, [r0] adds r3, r1, 0 cmp r0, 0xA - bls _080C2C96 - b _080C2DD8 -_080C2C96: + bls @080C2C96 + b @080C2DD8 +@080C2C96: lsls r0, 2 - ldr r1, =_080C2CA8 + ldr r1, =@080C2CA8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C2CA8: - .4byte _080C2CD4 - .4byte _080C2CEC - .4byte _080C2D14 - .4byte _080C2D50 - .4byte _080C2D6A - .4byte _080C2D74 - .4byte _080C2D88 - .4byte _080C2D8E - .4byte _080C2DA0 - .4byte _080C2DA6 - .4byte _080C2DB8 -_080C2CD4: +@080C2CA8: + .4byte @080C2CD4 + .4byte @080C2CEC + .4byte @080C2D14 + .4byte @080C2D50 + .4byte @080C2D6A + .4byte @080C2D74 + .4byte @080C2D88 + .4byte @080C2D8E + .4byte @080C2DA0 + .4byte @080C2DA6 + .4byte @080C2DB8 +@080C2CD4: bl sub_80C334C bl sub_80C3414 ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _080C2DCC + b @080C2DCC .align 2, 0 .pool -_080C2CEC: +@080C2CEC: movs r1, 0xE0 lsls r1, 19 movs r0, 0 @@ -367741,17 +367741,17 @@ _080C2CEC: movs r0, 0x87 lsls r0, 3 adds r1, r3, r0 - b _080C2DCC + b @080C2DCC .align 2, 0 .pool -_080C2D14: +@080C2D14: ldr r0, =0x02039ce8 ldr r0, [r0] ldr r1, =0x0000052c adds r0, r1 ldrh r0, [r0] cmp r0, 0 - bne _080C2D36 + bne @080C2D36 movs r2, 0xA0 lsls r2, 19 add r1, sp, 0x4 @@ -367762,14 +367762,14 @@ _080C2D14: ldr r1, =0x81000200 str r1, [r0, 0x8] ldr r0, [r0, 0x8] -_080C2D36: +@080C2D36: movs r2, 0x87 lsls r2, 3 adds r1, r3, r2 - b _080C2DCC + b @080C2DCC .align 2, 0 .pool -_080C2D50: +@080C2D50: bl reset_all_obj_data bl gpu_pal_allocator_reset bl sub_80A1A74 @@ -367780,125 +367780,125 @@ _080C2D50: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_080C2D6A: +@080C2D6A: bl sub_80C3388 - b _080C2DC4 + b @080C2DC4 .align 2, 0 .pool -_080C2D74: +@080C2D74: bl sub_80C41D8 ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _080C2DCC + b @080C2DCC .align 2, 0 .pool -_080C2D88: +@080C2D88: bl sub_80C2AD8 - b _080C2DBC -_080C2D8E: + b @080C2DBC +@080C2D8E: bl sub_80C4330 ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _080C2DCC + b @080C2DCC .align 2, 0 .pool -_080C2DA0: +@080C2DA0: bl sub_80C3278 - b _080C2DC4 -_080C2DA6: + b @080C2DC4 +@080C2DA6: bl sub_80C3548 ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _080C2DCC + b @080C2DCC .align 2, 0 .pool -_080C2DB8: +@080C2DB8: bl sub_80C43A8 -_080C2DBC: +@080C2DBC: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080C2DDC -_080C2DC4: + bne @080C2DDC +@080C2DC4: ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 -_080C2DCC: +@080C2DCC: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C2DDC + b @080C2DDC .align 2, 0 .pool -_080C2DD8: +@080C2DD8: bl sub_80C3404 -_080C2DDC: +@080C2DDC: add sp, 0x8 pop {r0} bx r0 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 lsrs r0, 24 bl sub_80847F8 cmp r0, r4 - bls _080C2DF6 + bls @080C2DF6 adds r0, r4, 0 -_080C2DF6: +@080C2DF6: pop {r4} pop {r1} bx r1 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: +@080C2E00: lsls r4, r5, 1 ldr r1, =0x000008c4 adds r0, r4, r1 bl flag_check lsls r0, 24 cmp r0, 0 - beq _080C2E1E + beq @080C2E1E ldr r1, =0x000008c5 adds r0, r4, r1 bl flag_check lsls r0, 24 cmp r0, 0 - bne _080C2E2C -_080C2E1E: + bne @080C2E2C +@080C2E1E: movs r0, 0 - b _080C2E38 + b @080C2E38 .align 2, 0 .pool -_080C2E2C: +@080C2E2C: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x6 - bls _080C2E00 + bls @080C2E00 movs r0, 0x1 -_080C2E38: +@080C2E38: pop {r4,r5} pop {r1} bx r1 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 @@ -367908,26 +367908,26 @@ sub_80C2E40: @ 80C2E40 bl sub_80C08E4 lsls r0, 16 cmp r0, 0 - beq _080C2E5A + beq @080C2E5A adds r4, 0x1 -_080C2E5A: +@080C2E5A: bl sub_80F8940 lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bls _080C2E6C + bls @080C2E6C adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_080C2E6C: +@080C2E6C: bl sub_80C2DFC lsls r0, 24 cmp r0, 0 - beq _080C2E7C + beq @080C2E7C adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_080C2E7C: +@080C2E7C: adds r0, r4, 0 pop {r4} pop {r1} @@ -367935,47 +367935,47 @@ _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 ldrh r0, [r1, 0x6] cmp r0, 0 - bne _080C2E96 + bne @080C2E96 ldr r0, [r1, 0x8] cmp r0, 0 - beq _080C2E98 -_080C2E96: + beq @080C2E98 +@080C2E96: movs r2, 0x1 -_080C2E98: +@080C2E98: ldrb r0, [r1, 0x3] cmp r0, 0 - beq _080C2EA4 + beq @080C2EA4 adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 -_080C2EA4: +@080C2EA4: ldrh r0, [r1, 0x1A] cmp r0, 0x31 - bls _080C2EB0 + bls @080C2EB0 adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 -_080C2EB0: +@080C2EB0: ldrb r0, [r1, 0x4] cmp r0, 0 - beq _080C2EBC + beq @080C2EBC adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 -_080C2EBC: +@080C2EBC: adds r0, r2, 0 pop {r1} bx r1 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} @@ -367997,9 +367997,9 @@ sub_80C2EC4: @ 80C2EC4 movs r0, 0xA bl sub_80847F8 cmp r0, 0 - bne _080C2EF6 + bne @080C2EF6 movs r4, 0 -_080C2EF6: +@080C2EF6: lsrs r0, r4, 16 strh r0, [r5, 0x6] lsrs r1, r4, 8 @@ -368010,12 +368010,12 @@ _080C2EF6: strh r4, [r5, 0xA] ldr r1, =0x000003e7 cmp r0, r1 - bls _080C2F14 + bls @080C2F14 strh r1, [r5, 0x6] movs r0, 0x3B strh r0, [r5, 0x8] strh r0, [r5, 0xA] -_080C2F14: +@080C2F14: ldr r0, =0x00000861 bl flag_check strb r0, [r5, 0x2] @@ -368057,7 +368057,7 @@ _080C2F14: ldr r0, [r4] ldr r1, =0x00002bb0 adds r3, r0, r1 -_080C2F74: +@080C2F74: lsls r0, r2, 1 adds r1, r6, r0 adds r0, r3, r0 @@ -368067,29 +368067,29 @@ _080C2F74: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls _080C2F74 + bls @080C2F74 ldr r0, =0x03005d90 ldr r1, [r0] adds r0, r7, 0 bl gf_strcpy mov r0, r8 cmp r0, 0x1 - beq _080C3004 + beq @080C3004 cmp r0, 0x1 - bgt _080C2FC0 + bgt @080C2FC0 cmp r0, 0 - beq _080C2FCC - b _080C3014 + beq @080C2FCC + b @080C3014 .align 2, 0 .pool -_080C2FC0: +@080C2FC0: mov r1, r8 cmp r1, 0x2 - bne _080C3014 + bne @080C3014 movs r0, 0 strh r0, [r5, 0x18] strh r0, [r5, 0x1A] -_080C2FCC: +@080C2FCC: ldr r1, =0x000003e7 movs r0, 0x23 bl sav12_xor_get_clamped_above @@ -368102,17 +368102,17 @@ _080C2FCC: lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bls _080C2FF0 + bls @080C2FF0 movs r0, 0x1 strb r0, [r5, 0x4] -_080C2FF0: +@080C2FF0: adds r0, r5, 0 bl sub_80C2E84 strb r0, [r5, 0x1] - b _080C3014 + b @080C3014 .align 2, 0 .pool -_080C3004: +@080C3004: movs r1, 0 movs r0, 0 strh r0, [r5, 0x18] @@ -368121,7 +368121,7 @@ _080C3004: strh r0, [r5, 0x1E] strb r1, [r5, 0x4] strb r1, [r5, 0x1] -_080C3014: +@080C3014: pop {r3} mov r8, r3 pop {r4-r7} @@ -368130,7 +368130,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 @@ -368159,28 +368159,28 @@ sub_80C3020: @ 80C3020 strh r0, [r2] ldrh r0, [r1] cmp r0, 0 - beq _080C3066 + beq @080C3066 ldrb r0, [r4, 0x1] adds r0, 0x1 strb r0, [r4, 0x1] -_080C3066: +@080C3066: ldrb r0, [r4] cmp r0, 0x1 - bne _080C3084 + bne @080C3084 ldr r2, =0x08329d54 ldrh r0, [r4, 0xE] movs r1, 0x7 ands r0, r1 adds r0, 0x8 - b _080C308C + b @080C308C .align 2, 0 .pool -_080C3084: +@080C3084: ldr r2, =0x08329d54 ldrh r0, [r4, 0xE] movs r1, 0x7 ands r0, r1 -_080C308C: +@080C308C: lsls r0, 1 adds r0, r2 ldrh r1, [r0] @@ -368195,7 +368195,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 @@ -368219,28 +368219,28 @@ sub_80C30A4: @ 80C30A4 ldrh r1, [r1] strh r1, [r4, 0x3C] cmp r0, 0 - beq _080C30E0 + beq @080C30E0 ldrb r0, [r4, 0x1] adds r0, 0x1 strb r0, [r4, 0x1] -_080C30E0: +@080C30E0: ldrb r0, [r4] cmp r0, 0x1 - bne _080C3100 + bne @080C3100 ldr r2, =0x08329d54 ldrh r0, [r4, 0xE] movs r1, 0x7 ands r0, r1 adds r0, 0x8 - b _080C3108 + b @080C3108 .align 2, 0 .pool -_080C3100: +@080C3100: ldr r2, =0x08329d54 ldrh r0, [r4, 0xE] movs r1, 0x7 ands r0, r1 -_080C3108: +@080C3108: lsls r0, 1 adds r0, r2 ldrh r1, [r0] @@ -368255,7 +368255,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 @@ -368272,29 +368272,29 @@ sub_80C3120: @ 80C3120 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080C3162 + beq @080C3162 cmp r0, 0x1 - bgt _080C3150 + bgt @080C3150 cmp r0, 0 - beq _080C3156 - b _080C318A -_080C3150: + beq @080C3156 + b @080C318A +@080C3150: cmp r0, 0x2 - beq _080C316E - b _080C318A -_080C3156: + beq @080C316E + b @080C318A +@080C3156: adds r0, r5, 0 adds r1, r6, 0 movs r2, 0x60 bl memcpy - b _080C318A -_080C3162: + b @080C318A +@080C3162: adds r0, r5, 0 adds r1, r6, 0 movs r2, 0x38 bl memcpy - b _080C318A -_080C316E: + b @080C318A +@080C316E: adds r0, r5, 0 adds r1, r6, 0 movs r2, 0x60 @@ -368308,14 +368308,14 @@ _080C316E: ldrh r1, [r6, 0x3C] adds r0, 0x2 strh r1, [r0] -_080C318A: +@080C318A: pop {r4-r6} pop {r0} bx r0 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] @@ -368342,27 +368342,27 @@ sub_80C3190: @ 80C3190 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080C31CE + beq @080C31CE ldrb r0, [r1, 0xA] adds r0, 0x1 strb r0, [r1, 0xA] -_080C31CE: +@080C31CE: ldr r1, [r4] ldr r3, =0x0000053a adds r0, r1, r3 ldrh r0, [r0] cmp r0, 0 - bne _080C31E4 + bne @080C31E4 ldr r2, =0x0000053c adds r0, r1, r2 ldr r0, [r0] cmp r0, 0 - beq _080C31EA -_080C31E4: + beq @080C31EA +@080C31E4: ldrb r0, [r1, 0xB] adds r0, 0x1 strb r0, [r1, 0xB] -_080C31EA: +@080C31EA: ldr r2, =0x02039ce8 ldr r1, [r2] movs r3, 0xA9 @@ -368370,40 +368370,40 @@ _080C31EA: adds r0, r1, r3 ldr r0, [r0] cmp r0, 0 - beq _080C3200 + beq @080C3200 ldrb r0, [r1, 0xC] adds r0, 0x1 strb r0, [r1, 0xC] -_080C3200: +@080C3200: ldr r1, [r2] ldr r3, =0x00000554 adds r0, r1, r3 ldrh r0, [r0] cmp r0, 0 - beq _080C3212 + beq @080C3212 ldrb r0, [r1, 0x10] adds r0, 0x1 strb r0, [r1, 0x10] -_080C3212: +@080C3212: ldr r1, [r2] ldr r2, =0x0000054c adds r0, r1, r2 ldr r0, [r0] cmp r0, 0 - beq _080C3224 + beq @080C3224 ldrb r0, [r1, 0xD] adds r0, 0x1 strb r0, [r1, 0xD] -_080C3224: +@080C3224: movs r5, 0 ldr r4, =0x00000867 -_080C3228: +@080C3228: lsls r0, r4, 16 lsrs r0, 16 bl flag_check lsls r0, 24 cmp r0, 0 - beq _080C3244 + beq @080C3244 ldr r0, =0x02039ce8 ldr r1, [r0] adds r1, 0x11 @@ -368411,14 +368411,14 @@ _080C3228: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_080C3244: +@080C3244: adds r4, 0x1 adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 ldr r0, =0x0000086e cmp r4, r0 - bls _080C3228 + bls @080C3228 pop {r4,r5} pop {r0} bx r0 @@ -368427,7 +368427,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 @@ -368462,22 +368462,22 @@ sub_80C3278: @ 80C3278 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _080C32E0 + beq @080C32E0 movs r0, 0xC7 bl enable_irqs - b _080C32E6 + b @080C32E6 .align 2, 0 .pool -_080C32E0: +@080C32E0: movs r0, 0x3 bl enable_irqs -_080C32E6: +@080C32E6: pop {r0} bx r0 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 @@ -368488,9 +368488,9 @@ sub_80C32EC: @ 80C32EC lsrs r2, r0, 24 asrs r0, 24 cmp r0, 0x4 - bgt _080C3306 + bgt @080C3306 movs r2, 0 -_080C3306: +@080C3306: ldr r4, =0x02039ce8 ldr r0, [r4] movs r1, 0xA5 @@ -368525,7 +368525,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 @@ -368551,7 +368551,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 gpu_reset_bgs_and_dma3_busy_flags @@ -368602,7 +368602,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 + 1 bl set_callback2 @@ -368613,7 +368613,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 @@ -368629,59 +368629,59 @@ 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] ldrb r0, [r1, 0x1] cmp r0, 0x5 - bhi _080C3494 + bhi @080C3494 lsls r0, 2 - ldr r1, =_080C3458 + ldr r1, =@080C3458 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C3458: - .4byte _080C3470 - .4byte _080C3476 - .4byte _080C347C - .4byte _080C3482 - .4byte _080C3488 - .4byte _080C348E -_080C3470: +@080C3458: + .4byte @080C3470 + .4byte @080C3476 + .4byte @080C347C + .4byte @080C3482 + .4byte @080C3488 + .4byte @080C348E +@080C3470: bl sub_80C3574 - b _080C349C -_080C3476: + b @080C349C +@080C3476: bl sub_80C3608 - b _080C349C -_080C347C: + b @080C349C +@080C347C: bl sub_80C3684 - b _080C349C -_080C3482: + b @080C349C +@080C3482: bl sub_80C378C - b _080C349C -_080C3488: + b @080C349C +@080C3488: bl sub_80C3880 - b _080C349C -_080C348E: + b @080C349C +@080C348E: bl sub_80C3A18 - b _080C349C -_080C3494: + b @080C349C +@080C3494: movs r0, 0 strb r0, [r1, 0x1] movs r0, 0x1 - b _080C34A8 -_080C349C: + b @080C34A8 +@080C349C: ldr r0, =0x02039ce8 ldr r1, [r0] ldrb r0, [r1, 0x1] adds r0, 0x1 strb r0, [r1, 0x1] movs r0, 0 -_080C34A8: +@080C34A8: pop {r1} bx r1 .align 2, 0 @@ -368689,70 +368689,70 @@ _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] ldrb r0, [r1, 0x1] cmp r0, 0x7 - bhi _080C352C + bhi @080C352C lsls r0, 2 - ldr r1, =_080C34D0 + ldr r1, =@080C34D0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C34D0: - .4byte _080C34F0 - .4byte _080C34F6 - .4byte _080C34FC - .4byte _080C3502 - .4byte _080C3508 - .4byte _080C3512 - .4byte _080C351C - .4byte _080C3526 -_080C34F0: +@080C34D0: + .4byte @080C34F0 + .4byte @080C34F6 + .4byte @080C34FC + .4byte @080C3502 + .4byte @080C3508 + .4byte @080C3512 + .4byte @080C351C + .4byte @080C3526 +@080C34F0: bl sub_80C3B50 - b _080C3534 -_080C34F6: + b @080C3534 +@080C34F6: bl sub_80C3CCC - b _080C3534 -_080C34FC: + b @080C3534 +@080C34FC: bl sub_80C3D60 - b _080C3534 -_080C3502: + b @080C3534 +@080C3502: bl sub_80C3DF0 - b _080C3534 -_080C3508: + b @080C3534 +@080C3508: bl sub_80C3E58 bl sub_80C3F64 - b _080C3534 -_080C3512: + b @080C3534 +@080C3512: bl sub_80C3ED4 bl sub_80C3FE0 - b _080C3534 -_080C351C: + b @080C3534 +@080C351C: bl sub_80C4140 bl sub_80C40CC - b _080C3534 -_080C3526: + b @080C3534 +@080C3526: bl sub_80C42A4 - b _080C3534 -_080C352C: + b @080C3534 +@080C352C: movs r0, 0 strb r0, [r1, 0x1] movs r0, 0x1 - b _080C3540 -_080C3534: + b @080C3540 +@080C3534: ldr r0, =0x02039ce8 ldr r1, [r0] ldrb r0, [r1, 0x1] adds r0, 0x1 strb r0, [r1, 0x1] movs r0, 0 -_080C3540: +@080C3540: pop {r1} bx r1 .align 2, 0 @@ -368760,7 +368760,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 @@ -368776,7 +368776,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, =0x085ecf71 @@ -368800,7 +368800,7 @@ sub_80C3574: @ 80C3574 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _080C35E0 + bne @080C35E0 ldr r0, =0x0856fb0c str r0, [sp] movs r0, 0x1 @@ -368813,10 +368813,10 @@ sub_80C3574: @ 80C3574 movs r2, 0x14 movs r3, 0x1C bl box_print - b _080C35FA + b @080C35FA .align 2, 0 .pool -_080C35E0: +@080C35E0: ldr r0, =0x0856fb0c str r0, [sp] movs r0, 0x1 @@ -368829,7 +368829,7 @@ _080C35E0: movs r2, 0x10 movs r3, 0x21 bl box_print -_080C35FA: +@080C35FA: add sp, 0x2C pop {r4,r5} pop {r0} @@ -368839,7 +368839,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, =0x085ecf78 @@ -368858,22 +368858,22 @@ sub_80C3608: @ 80C3608 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _080C3650 + bne @080C3650 movs r0, 0x1 add r1, sp, 0xC movs r2, 0x50 bl sub_81DB35C adds r0, 0x84 - b _080C365C + b @080C365C .align 2, 0 .pool -_080C3650: +@080C3650: movs r0, 0x1 add r1, sp, 0xC movs r2, 0x60 bl sub_81DB35C adds r0, 0x78 -_080C365C: +@080C365C: movs r3, 0x9 lsls r2, r0, 24 lsrs r2, 24 @@ -368896,7 +368896,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 @@ -368905,7 +368905,7 @@ sub_80C3684: @ 80C3684 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _080C36C4 + bne @080C36C4 ldr r0, =0x0856fb0c str r0, [sp] movs r0, 0x1 @@ -368918,10 +368918,10 @@ sub_80C3684: @ 80C3684 movs r2, 0x14 movs r3, 0x38 bl box_print - b _080C36DE + b @080C36DE .align 2, 0 .pool -_080C36C4: +@080C36C4: ldr r0, =0x0856fb0c str r0, [sp] movs r0, 0x1 @@ -368934,7 +368934,7 @@ _080C36C4: movs r2, 0x10 movs r3, 0x39 bl box_print -_080C36DE: +@080C36DE: ldr r0, =0x02021cc4 ldr r4, =0x02039ce8 ldr r1, [r4] @@ -368954,22 +368954,22 @@ _080C36DE: adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _080C3734 + bne @080C3734 movs r0, 0x1 adds r1, r5, 0 movs r2, 0x90 bl sub_81DB368 movs r3, 0x38 - b _080C3740 + b @080C3740 .align 2, 0 .pool -_080C3734: +@080C3734: movs r0, 0x1 adds r1, r5, 0 movs r2, 0x80 bl sub_81DB368 movs r3, 0x39 -_080C3740: +@080C3740: lsls r2, r0, 24 lsrs r2, 24 ldr r0, =0x0856fb0c @@ -368991,18 +368991,18 @@ _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 - bne _080C377E + bne @080C377E movs r0, 0x1 bl sub_80C0844 - b _080C3784 -_080C377E: + b @080C3784 +@080C377E: movs r0, 0x1 bl pokedex_count -_080C3784: +@080C3784: lsls r0, 16 lsrs r0, 16 pop {r1} @@ -369010,21 +369010,21 @@ _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 bl flag_check lsls r0, 24 cmp r0, 0 - beq _080C386E + beq @080C386E ldr r0, =0x02039ce8 ldr r0, [r0] ldr r1, =0x0000052b adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _080C37DC + bne @080C37DC ldr r0, =0x0856fb0c str r0, [sp] movs r0, 0x1 @@ -369037,10 +369037,10 @@ sub_80C378C: @ 80C378C movs r2, 0x14 movs r3, 0x48 bl box_print - b _080C37F6 + b @080C37F6 .align 2, 0 .pool -_080C37DC: +@080C37DC: ldr r0, =0x0856fb0c str r0, [sp] movs r0, 0x1 @@ -369053,7 +369053,7 @@ _080C37DC: movs r2, 0x10 movs r3, 0x49 bl box_print -_080C37F6: +@080C37F6: ldr r5, =0x02021fc4 ldr r4, =0x02039ce8 ldr r0, [r4] @@ -369072,22 +369072,22 @@ _080C37F6: adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _080C3848 + bne @080C3848 movs r0, 0x1 adds r1, r5, 0 movs r2, 0x90 bl sub_81DB368 movs r3, 0x48 - b _080C3854 + b @080C3854 .align 2, 0 .pool -_080C3848: +@080C3848: movs r0, 0x1 adds r1, r5, 0 movs r2, 0x80 bl sub_81DB368 movs r3, 0x49 -_080C3854: +@080C3854: lsls r2, r0, 24 lsrs r2, 24 ldr r0, =0x0856fb0c @@ -369100,7 +369100,7 @@ _080C3854: movs r0, 0x1 movs r1, 0x1 bl box_print -_080C386E: +@080C386E: add sp, 0xC pop {r4,r5} pop {r0} @@ -369110,7 +369110,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 @@ -369123,7 +369123,7 @@ sub_80C3880: @ 80C3880 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _080C38C8 + bne @080C38C8 ldr r0, =0x0856fb0c str r0, [sp] movs r0, 0x1 @@ -369136,10 +369136,10 @@ sub_80C3880: @ 80C3880 movs r2, 0x14 movs r3, 0x58 bl box_print - b _080C38E2 + b @080C38E2 .align 2, 0 .pool -_080C38C8: +@080C38C8: ldr r0, =0x0856fb0c str r0, [sp] movs r0, 0x1 @@ -369152,36 +369152,36 @@ _080C38C8: movs r2, 0x10 movs r3, 0x59 bl box_print -_080C38E2: +@080C38E2: ldr r0, =0x02039ce8 ldr r1, [r0] ldrb r0, [r1, 0x5] cmp r0, 0 - beq _080C390C + beq @080C390C ldr r2, =0x00000544 adds r0, r1, r2 ldrh r5, [r0] adds r2, 0x2 adds r0, r1, r2 ldrh r6, [r0] - b _080C3914 + b @080C3914 .align 2, 0 .pool -_080C390C: +@080C390C: ldr r0, =0x03005d90 ldr r0, [r0] ldrh r5, [r0, 0xE] ldrb r6, [r0, 0x10] -_080C3914: +@080C3914: ldr r0, =0x000003e7 cmp r5, r0 - bls _080C391C + bls @080C391C adds r5, r0, 0 -_080C391C: +@080C391C: cmp r6, 0x3B - bls _080C3922 + bls @080C3922 movs r6, 0x3B -_080C3922: +@080C3922: ldr r1, =0x085ecf8f movs r0, 0x1 movs r2, 0 @@ -369193,16 +369193,16 @@ _080C3922: adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _080C3958 + bne @080C3958 movs r7, 0x90 movs r4, 0x58 - b _080C395C + b @080C395C .align 2, 0 .pool -_080C3958: +@080C3958: movs r7, 0x80 movs r4, 0x59 -_080C395C: +@080C395C: mov r0, r10 adds r0, 0x1E subs r7, r0 @@ -369286,7 +369286,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} @@ -369295,7 +369295,7 @@ sub_80C3A18: @ 80C3A18 ldr r1, [r7] ldrb r0, [r1, 0x5] cmp r0, 0 - beq _080C3ACE + beq @080C3ACE ldr r0, =0x0856fb48 mov r8, r0 ldr r4, =0x0000052b @@ -369372,7 +369372,7 @@ sub_80C3A18: @ 80C3A18 movs r0, 0x1 movs r1, 0x1 bl box_print -_080C3ACE: +@080C3ACE: add sp, 0xC pop {r3} mov r8, r3 @@ -369384,7 +369384,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] @@ -369405,7 +369405,7 @@ sub_80C3AF0: @ 80C3AF0 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080C3B30 + beq @080C3B30 ldr r0, =0x02021cc4 adds r1, 0x4D bl gf_strcpy @@ -369413,7 +369413,7 @@ sub_80C3AF0: @ 80C3AF0 adds r0, 0x4D ldr r1, =0x085ecfa6 bl ExpandTextCodes -_080C3B30: +@080C3B30: pop {r4} pop {r0} bx r0 @@ -369422,7 +369422,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 @@ -369431,7 +369431,7 @@ sub_80C3B50: @ 80C3B50 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - bne _080C3B8C + bne @080C3B8C ldr r0, =0x0856fb0c str r0, [sp] movs r0, 0x1 @@ -369445,10 +369445,10 @@ sub_80C3B50: @ 80C3B50 movs r2, 0x88 movs r3, 0x9 bl box_print - b _080C3BB6 + b @080C3BB6 .align 2, 0 .pool -_080C3B8C: +@080C3B8C: adds r1, 0x4D movs r0, 0x1 movs r2, 0xD8 @@ -369468,7 +369468,7 @@ _080C3B8C: movs r1, 0x1 movs r3, 0x9 bl box_print -_080C3BB6: +@080C3BB6: add sp, 0xC pop {r4} pop {r0} @@ -369478,13 +369478,13 @@ _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] ldrb r0, [r1, 0xB] cmp r0, 0 - beq _080C3C0E + beq @080C3C0E ldr r0, =0x02021cc4 ldr r2, =0x0000053a adds r1, r2 @@ -369512,7 +369512,7 @@ sub_80C3BC4: @ 80C3BC4 adds r0, 0x93 ldr r1, =0x0856fb4c bl ExpandTextCodes -_080C3C0E: +@080C3C0E: pop {r4} pop {r0} bx r0 @@ -369521,7 +369521,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 @@ -369590,19 +369590,19 @@ 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] ldrb r0, [r2, 0xB] cmp r0, 0 - beq _080C3CE4 + beq @080C3CE4 ldr r1, =0x085ecfb8 adds r2, 0x93 ldr r3, =0x0856fb0f movs r0, 0 bl sub_80C3C34 -_080C3CE4: +@080C3CE4: pop {r0} bx r0 .align 2, 0 @@ -369610,13 +369610,13 @@ _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] ldrb r0, [r1, 0xC] cmp r0, 0 - beq _080C3D40 + beq @080C3D40 adds r0, r1, 0 adds r0, 0xD9 ldr r2, =0x0856fb5c @@ -369646,7 +369646,7 @@ sub_80C3CF4: @ 80C3CF4 movs r2, 0 movs r3, 0x4 bl decimal_int_to_string -_080C3D40: +@080C3D40: pop {r4} pop {r0} bx r0 @@ -369655,13 +369655,13 @@ _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] ldrb r0, [r1, 0xC] cmp r0, 0 - beq _080C3D9A + beq @080C3D9A ldr r0, =0x02021cc4 ldr r2, =0x00000165 adds r1, r2 @@ -369681,7 +369681,7 @@ sub_80C3D60: @ 80C3D60 movs r0, 0x1 adds r2, r4, 0 bl sub_80C3C34 -_080C3D9A: +@080C3D9A: pop {r4,r5} pop {r0} bx r0 @@ -369690,13 +369690,13 @@ _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] ldrb r0, [r1, 0x10] cmp r0, 0 - beq _080C3DDE + beq @080C3DDE ldr r2, =0x00000237 adds r0, r1, r2 ldr r2, =0x00000554 @@ -369705,7 +369705,7 @@ sub_80C3DC0: @ 80C3DC0 movs r2, 0x1 movs r3, 0x5 bl decimal_int_to_string -_080C3DDE: +@080C3DDE: pop {r0} bx r0 .align 2, 0 @@ -369713,20 +369713,20 @@ _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] ldrb r0, [r2, 0x10] cmp r0, 0 - beq _080C3E0A + beq @080C3E0A ldr r1, =0x085ed010 ldr r0, =0x00000237 adds r2, r0 ldr r3, =0x0856fb0f movs r0, 0x2 bl sub_80C3C34 -_080C3E0A: +@080C3E0A: pop {r0} bx r0 .align 2, 0 @@ -369734,7 +369734,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] @@ -369742,19 +369742,19 @@ sub_80C3E20: @ 80C3E20 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 - bne _080C3E48 + bne @080C3E48 movs r3, 0xAE lsls r3, 3 adds r0, r2, r3 ldr r1, [r0] cmp r1, 0 - beq _080C3E48 + beq @080C3E48 ldr r3, =0x000002c3 adds r0, r2, r3 movs r2, 0x1 movs r3, 0x5 bl decimal_int_to_string -_080C3E48: +@080C3E48: pop {r0} bx r0 .align 2, 0 @@ -369762,7 +369762,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] @@ -369770,19 +369770,19 @@ sub_80C3E58: @ 80C3E58 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 - bne _080C3E80 + bne @080C3E80 adds r1, 0x46 adds r0, r2, r1 ldr r0, [r0] cmp r0, 0 - beq _080C3E80 + beq @080C3E80 ldr r1, =0x085ed036 ldr r0, =0x000002c3 adds r2, r0 ldr r3, =0x0856fb0f movs r0, 0x4 bl sub_80C3C34 -_080C3E80: +@080C3E80: pop {r0} bx r0 .align 2, 0 @@ -369790,7 +369790,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] @@ -369798,18 +369798,18 @@ sub_80C3E98: @ 80C3E98 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 - bne _080C3EBE + bne @080C3EBE ldr r3, =0x00000574 adds r0, r2, r3 ldr r1, [r0] cmp r1, 0 - beq _080C3EBE + beq @080C3EBE ldr r3, =0x0000034f adds r0, r2, r3 movs r2, 0x1 movs r3, 0x5 bl decimal_int_to_string -_080C3EBE: +@080C3EBE: pop {r0} bx r0 .align 2, 0 @@ -369817,7 +369817,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] @@ -369825,19 +369825,19 @@ sub_80C3ED4: @ 80C3ED4 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 - bne _080C3EFC + bne @080C3EFC adds r1, 0x4A adds r0, r2, r1 ldr r0, [r0] cmp r0, 0 - beq _080C3EFC + beq @080C3EFC ldr r1, =0x085ed01f ldr r0, =0x0000034f adds r2, r0 ldr r3, =0x0856fb0f movs r0, 0x3 bl sub_80C3C34 -_080C3EFC: +@080C3EFC: pop {r0} bx r0 .align 2, 0 @@ -369845,7 +369845,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] @@ -369853,12 +369853,12 @@ sub_80C3F14: @ 80C3F14 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080C3F46 + beq @080C3F46 ldr r0, =0x00000552 adds r1, r0 ldrh r0, [r1] cmp r0, 0 - beq _080C3F46 + beq @080C3F46 ldr r0, =0x02021cc4 ldrh r1, [r1] movs r2, 0x1 @@ -369869,7 +369869,7 @@ sub_80C3F14: @ 80C3F14 adds r0, r1 ldr r1, =0x085ed096 bl ExpandTextCodes -_080C3F46: +@080C3F46: pop {r4} pop {r0} bx r0 @@ -369878,7 +369878,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] @@ -369886,19 +369886,19 @@ sub_80C3F64: @ 80C3F64 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 - beq _080C3F8C + beq @080C3F8C adds r1, 0x28 adds r0, r2, r1 ldrh r0, [r0] cmp r0, 0 - beq _080C3F8C + beq @080C3F8C ldr r1, =0x085ed085 ldr r0, =0x00000395 adds r2, r0 ldr r3, =0x0856fb0f movs r0, 0x3 bl sub_80C3C34 -_080C3F8C: +@080C3F8C: pop {r0} bx r0 .align 2, 0 @@ -369906,7 +369906,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] @@ -369914,20 +369914,20 @@ sub_80C3FA4: @ 80C3FA4 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080C3FCE + beq @080C3FCE movs r3, 0xAA lsls r3, 3 adds r2, r1, r3 ldrh r0, [r2] cmp r0, 0 - beq _080C3FCE + beq @080C3FCE ldr r3, =0x000003db adds r0, r1, r3 ldrh r1, [r2] movs r2, 0x1 movs r3, 0x5 bl decimal_int_to_string -_080C3FCE: +@080C3FCE: pop {r0} bx r0 .align 2, 0 @@ -369935,7 +369935,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] @@ -369943,19 +369943,19 @@ sub_80C3FE0: @ 80C3FE0 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 - beq _080C4008 + beq @080C4008 adds r1, 0x26 adds r0, r2, r1 ldrh r0, [r0] cmp r0, 0 - beq _080C4008 + beq @080C4008 ldr r1, =0x085ed09f ldr r0, =0x000003db adds r2, r0 ldr r3, =0x0856fb0f movs r0, 0x4 bl sub_80C3C34 -_080C4008: +@080C4008: pop {r0} bx r0 .align 2, 0 @@ -369963,7 +369963,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] @@ -369971,18 +369971,18 @@ sub_80C4020: @ 80C4020 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x1 - beq _080C4044 + beq @080C4044 cmp r0, 0x1 - ble _080C40B6 + ble @080C40B6 cmp r0, 0x2 - beq _080C4094 - b _080C40B6 + beq @080C4094 + b @080C40B6 .align 2, 0 .pool -_080C4044: +@080C4044: ldrb r0, [r1, 0xD] cmp r0, 0 - beq _080C40B6 + beq @080C40B6 ldr r0, =0x02021cc4 ldr r2, =0x0000054c adds r1, r2 @@ -370003,15 +370003,15 @@ _080C4044: adds r0, r1 ldr r1, =0x085ed0e0 bl ExpandTextCodes - b _080C40B6 + b @080C40B6 .align 2, 0 .pool -_080C4094: +@080C4094: ldr r2, =0x00000596 adds r1, r2 ldrh r0, [r1] cmp r0, 0 - beq _080C40B6 + beq @080C40B6 ldr r0, =0x02021cc4 ldrh r1, [r1] movs r2, 0x1 @@ -370022,7 +370022,7 @@ _080C4094: adds r0, r1 ldr r1, =0x085ed0c8 bl ExpandTextCodes -_080C40B6: +@080C40B6: pop {r4} pop {r0} bx r0 @@ -370031,7 +370031,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] @@ -370039,40 +370039,40 @@ sub_80C40CC: @ 80C40CC adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x1 - beq _080C40F0 + beq @080C40F0 cmp r0, 0x1 - ble _080C412C + ble @080C412C cmp r0, 0x2 - beq _080C4114 - b _080C412C + beq @080C4114 + b @080C412C .align 2, 0 .pool -_080C40F0: +@080C40F0: ldrb r0, [r2, 0xD] cmp r0, 0 - beq _080C412C + beq @080C412C ldr r1, =0x085ed0d3 ldr r0, =0x00000421 adds r2, r0 ldr r3, =0x0856fb0c movs r0, 0x5 bl sub_80C3C34 - b _080C412C + b @080C412C .align 2, 0 .pool -_080C4114: +@080C4114: ldr r1, =0x00000596 adds r0, r2, r1 ldrh r0, [r0] cmp r0, 0 - beq _080C412C + beq @080C412C ldr r1, =0x085ed0b6 ldr r0, =0x00000421 adds r2, r0 ldr r3, =0x0856fb0f movs r0, 0x5 bl sub_80C3C34 -_080C412C: +@080C412C: pop {r0} bx r0 .align 2, 0 @@ -370080,7 +370080,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, =0x0856fb68 @@ -370099,9 +370099,9 @@ sub_80C4140: @ 80C4140 ldrb r0, [r0] adds r5, r4, 0 cmp r0, 0 - bne _080C41C0 + bne @080C41C0 movs r4, 0 -_080C416C: +@080C416C: ldr r0, =0x02039ce8 ldr r0, [r0] lsls r1, r4, 1 @@ -370111,7 +370111,7 @@ _080C416C: adds r1, r0, r1 ldrh r0, [r1] cmp r0, 0 - beq _080C41B6 + beq @080C41B6 bl sub_80D30A0 lsls r0, 24 lsrs r0, 24 @@ -370137,13 +370137,13 @@ _080C416C: movs r0, 0x3 movs r3, 0xF bl bg_write_sequence_to_wram_tile_map_rect -_080C41B6: +@080C41B6: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls _080C416C -_080C41C0: + bls @080C416C +@080C41C0: add sp, 0x20 pop {r4,r5} pop {r0} @@ -370153,7 +370153,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, =0x08dde1f8 @@ -370169,17 +370169,17 @@ sub_80C41D8: @ 80C41D8 adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0x1 - beq _080C4214 + beq @080C4214 cmp r0, 0x1 - ble _080C424A + ble @080C424A cmp r0, 0x2 - beq _080C422A + beq @080C422A cmp r0, 0x3 - beq _080C4242 - b _080C424A + beq @080C4242 + b @080C424A .align 2, 0 .pool -_080C4214: +@080C4214: movs r2, 0x8D lsls r2, 3 adds r0, r4, r2 @@ -370189,8 +370189,8 @@ _080C4214: movs r2, 0 movs r3, 0 bl sub_80A2BAC - b _080C424A -_080C422A: + b @080C424A +@080C422A: adds r0, r4, r5 movs r2, 0xFA lsls r2, 1 @@ -370201,12 +370201,12 @@ _080C422A: str r1, [sp] movs r1, 0x60 bl sub_80A2BAC - b _080C424A -_080C4242: + b @080C424A +@080C4242: adds r0, r4, r5 movs r1, 0x60 bl TintPalette_SepiaTone -_080C424A: +@080C424A: ldr r0, =0x02039ce8 ldr r0, [r0] movs r1, 0x8D @@ -370216,7 +370216,7 @@ _080C424A: movs r2, 0xC0 bl gpu_pal_apply movs r4, 0 -_080C425E: +@080C425E: ldr r0, =0x02039ce8 ldr r0, [r0] lsls r1, r4, 1 @@ -370226,7 +370226,7 @@ _080C425E: adds r1, r0, r1 ldrh r0, [r1] cmp r0, 0 - beq _080C428E + beq @080C428E movs r1, 0 bl sub_80D3020 adds r1, r0, 0 @@ -370239,12 +370239,12 @@ _080C425E: movs r2, 0x80 lsls r2, 2 bl gpu_copy_bg_tile_pattern_data_to_vram -_080C428E: +@080C428E: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls _080C425E + bls @080C425E add sp, 0x4 pop {r4,r5} pop {r0} @@ -370254,7 +370254,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, =0x0856fb74 @@ -370267,14 +370267,14 @@ sub_80C42A4: @ 80C42A4 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - bne _080C4316 + bne @080C4316 adds r2, 0x56 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x1 - bne _080C4316 + bne @080C4316 movs r4, 0 -_080C42CC: +@080C42CC: ldr r0, =0x02039ce8 ldr r0, [r0] ldr r1, =0x00000584 @@ -370282,7 +370282,7 @@ _080C42CC: adds r0, r4 ldrb r3, [r0] cmp r3, 0 - beq _080C430C + beq @080C430C lsls r1, r4, 18 movs r2, 0xA0 lsls r2, 17 @@ -370306,13 +370306,13 @@ _080C42CC: movs r0, 0x3 movs r3, 0x2 bl bg_write_sequence_to_wram_tile_map_rect -_080C430C: +@080C430C: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _080C42CC -_080C4316: + bls @080C42CC +@080C4316: add sp, 0x14 pop {r4} pop {r0} @@ -370322,7 +370322,7 @@ _080C4316: thumb_func_end sub_80C42A4 thumb_func_start sub_80C4330 -sub_80C4330: @ 80C4330 +sub_80C4330: ; 80C4330 push {lr} ldr r0, =0x0856f54c movs r1, 0xB0 @@ -370356,7 +370356,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 @@ -370372,31 +370372,31 @@ 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 ldr r0, [r0] ldrb r0, [r0, 0x3] cmp r0, 0x4 - bls _080C43B8 - b _080C4532 -_080C43B8: + bls @080C43B8 + b @080C4532 +@080C43B8: lsls r0, 2 - ldr r1, =_080C43CC + ldr r1, =@080C43CC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C43CC: - .4byte _080C43E0 - .4byte _080C43F8 - .4byte _080C4418 - .4byte _080C44D8 - .4byte _080C4500 -_080C43E0: +@080C43CC: + .4byte @080C43E0 + .4byte @080C43F8 + .4byte @080C4418 + .4byte @080C44D8 + .4byte @080C4500 +@080C43E0: ldr r0, =0x02039ce8 ldr r1, [r0] ldr r0, =0x000013a8 @@ -370404,10 +370404,10 @@ _080C43E0: movs r2, 0x80 lsls r2, 3 movs r0, 0x3 - b _080C4406 + b @080C4406 .align 2, 0 .pool -_080C43F8: +@080C43F8: ldr r0, =0x02039ce8 ldr r1, [r0] ldr r3, =0x000019a8 @@ -370415,20 +370415,20 @@ _080C43F8: movs r2, 0xC0 lsls r2, 5 movs r0, 0 -_080C4406: +@080C4406: movs r3, 0 bl gpu_copy_bg_tile_pattern_data_to_vram - b _080C4536 + b @080C4536 .align 2, 0 .pool -_080C4418: +@080C4418: ldr r4, =0x02039ce8 ldr r2, [r4] ldr r1, =0x0000052a adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 - beq _080C447C + beq @080C447C ldr r1, =0x0856fae4 ldr r3, =0x00000535 adds r0, r2, r3 @@ -370448,15 +370448,15 @@ _080C4418: adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _080C44B2 + beq @080C44B2 ldr r0, =0x0856f4ac movs r1, 0x10 movs r2, 0x20 bl gpu_pal_apply - b _080C44B2 + b @080C44B2 .align 2, 0 .pool -_080C447C: +@080C447C: ldr r1, =0x0856faf8 ldr r3, =0x00000535 adds r0, r2, r3 @@ -370476,20 +370476,20 @@ _080C447C: adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _080C44B2 + beq @080C44B2 ldr r0, =0x0856f4cc movs r1, 0x10 movs r2, 0x20 bl gpu_pal_apply -_080C44B2: +@080C44B2: ldr r0, =0x0856f52c movs r1, 0x40 movs r2, 0x20 bl gpu_pal_apply - b _080C4536 + b @080C4536 .align 2, 0 .pool -_080C44D8: +@080C44D8: ldr r4, =0x02039ce8 ldr r1, [r4] ldr r3, =0x00003ca8 @@ -370501,10 +370501,10 @@ _080C44D8: adds r1, r0 movs r0, 0x2 bl bg_set_tilemap - b _080C4536 + b @080C4536 .align 2, 0 .pool -_080C4500: +@080C4500: movs r4, 0x20 str r4, [sp] str r4, [sp, 0x4] @@ -370527,17 +370527,17 @@ _080C4500: movs r2, 0 movs r3, 0 bl bg_fill_tilemap_rect -_080C4532: +@080C4532: movs r0, 0x1 - b _080C4542 -_080C4536: + b @080C4542 +@080C4536: ldr r0, =0x02039ce8 ldr r1, [r0] ldrb r0, [r1, 0x3] adds r0, 0x1 strb r0, [r1, 0x3] movs r0, 0 -_080C4542: +@080C4542: add sp, 0x8 pop {r4} pop {r1} @@ -370547,7 +370547,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 @@ -370555,7 +370555,7 @@ sub_80C4550: @ 80C4550 ldr r1, =0x00005ca8 adds r6, r0, r1 movs r1, 0 -_080C455E: +@080C455E: movs r2, 0 lsls r5, r1, 16 asrs r1, r5, 16 @@ -370563,12 +370563,12 @@ _080C455E: lsls r0, r1, 4 subs r0, r1 lsls r4, r0, 1 -_080C456C: +@080C456C: lsls r0, r2, 16 asrs r1, r0, 16 adds r2, r0, 0 cmp r1, 0x1D - bgt _080C4590 + bgt @080C4590 adds r0, r3, r1 lsls r0, 1 adds r0, r6 @@ -370576,15 +370576,15 @@ _080C456C: lsls r1, 1 adds r1, r7 ldrh r1, [r1] - b _080C4598 + b @080C4598 .align 2, 0 .pool -_080C4590: +@080C4590: adds r0, r3, r1 lsls r0, 1 adds r0, r6 ldrh r1, [r7] -_080C4598: +@080C4598: strh r1, [r0] movs r1, 0x80 lsls r1, 9 @@ -370592,12 +370592,12 @@ _080C4598: lsrs r2, r0, 16 asrs r0, 16 cmp r0, 0x1F - ble _080C456C + ble @080C456C adds r0, r5, r1 lsrs r1, r0, 16 asrs r0, 16 cmp r0, 0x13 - ble _080C455E + ble @080C455E movs r0, 0x2 bl gpu_copy_wram_bg_tilemap_to_vram pop {r4-r7} @@ -370606,7 +370606,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 @@ -370614,7 +370614,7 @@ sub_80C45C0: @ 80C45C0 ldr r1, =0x00003ca8 adds r6, r0, r1 movs r1, 0 -_080C45CE: +@080C45CE: movs r2, 0 lsls r5, r1, 16 asrs r1, r5, 16 @@ -370622,12 +370622,12 @@ _080C45CE: lsls r0, r1, 4 subs r0, r1 lsls r4, r0, 1 -_080C45DC: +@080C45DC: lsls r0, r2, 16 asrs r1, r0, 16 adds r2, r0, 0 cmp r1, 0x1D - bgt _080C4600 + bgt @080C4600 adds r0, r3, r1 lsls r0, 1 adds r0, r6 @@ -370635,15 +370635,15 @@ _080C45DC: lsls r1, 1 adds r1, r7 ldrh r1, [r1] - b _080C4608 + b @080C4608 .align 2, 0 .pool -_080C4600: +@080C4600: adds r0, r3, r1 lsls r0, 1 adds r0, r6 ldrh r1, [r7] -_080C4608: +@080C4608: strh r1, [r0] movs r1, 0x80 lsls r1, 9 @@ -370651,12 +370651,12 @@ _080C4608: lsrs r2, r0, 16 asrs r0, 16 cmp r0, 0x1F - ble _080C45DC + ble @080C45DC adds r0, r5, r1 lsrs r1, r0, 16 asrs r0, 16 cmp r0, 0x13 - ble _080C45CE + ble @080C45CE movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram pop {r4-r7} @@ -370665,7 +370665,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 @@ -370699,12 +370699,12 @@ sub_80C4630: @ 80C4630 ldr r0, [r4] ldrb r0, [r0, 0x5] cmp r0, 0 - bne _080C4724 + bne @080C4724 movs r2, 0x4 mov r9, r2 movs r2, 0 movs r6, 0x1 -_080C467E: +@080C467E: ldr r0, =0x02039ce8 ldr r1, [r0] lsls r0, r2, 16 @@ -370713,7 +370713,7 @@ _080C467E: adds r1, r7 ldrb r0, [r1] cmp r0, 0 - beq _080C4700 + beq @080C4700 mov r3, r9 lsls r5, r3, 24 lsrs r5, 24 @@ -370766,7 +370766,7 @@ _080C467E: adds r2, r4, 0 movs r3, 0x10 bl Bg_FillWramTileMapRectWithTileAndPalette -_080C4700: +@080C4700: adds r0, r7, 0x1 lsls r0, 16 mov r1, r8 @@ -370784,8 +370784,8 @@ _080C4700: lsrs r2, r0, 16 asrs r0, 16 cmp r0, 0x7 - ble _080C467E -_080C4724: + ble @080C467E +@080C4724: movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram add sp, 0xC @@ -370801,7 +370801,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 @@ -370810,10 +370810,10 @@ sub_80C474C: @ 80C474C adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - bne _080C4800 + bne @080C4800 ldrb r0, [r1, 0x10] cmp r0, 0 - beq _080C478A + beq @080C478A movs r4, 0x1 str r4, [sp] str r4, [sp, 0x4] @@ -370831,14 +370831,14 @@ sub_80C474C: @ 80C474C movs r2, 0x1B movs r3, 0xA bl Bg_FillWramTileMapRectWithTileAndPalette -_080C478A: +@080C478A: ldr r0, [r6] movs r1, 0xAE lsls r1, 3 adds r0, r1 ldr r0, [r0] cmp r0, 0 - beq _080C47BE + beq @080C47BE movs r4, 0x1 str r4, [sp] str r4, [sp, 0x4] @@ -370856,13 +370856,13 @@ _080C478A: movs r2, 0x15 movs r3, 0xE bl Bg_FillWramTileMapRectWithTileAndPalette -_080C47BE: +@080C47BE: ldr r0, [r6] ldr r2, =0x00000574 adds r0, r2 ldr r0, [r0] cmp r0, 0 - beq _080C48B8 + beq @080C48B8 movs r4, 0x1 str r4, [sp] str r4, [sp, 0x4] @@ -370880,13 +370880,13 @@ _080C47BE: movs r2, 0x1B movs r3, 0xC bl Bg_FillWramTileMapRectWithTileAndPalette - b _080C48B8 + b @080C48B8 .align 2, 0 .pool -_080C4800: +@080C4800: ldrb r0, [r1, 0x10] cmp r0, 0 - beq _080C482E + beq @080C482E movs r4, 0x1 str r4, [sp] str r4, [sp, 0x4] @@ -370905,14 +370905,14 @@ _080C4800: movs r2, 0x1B movs r3, 0xA bl Bg_FillWramTileMapRectWithTileAndPalette -_080C482E: +@080C482E: ldr r0, [r6] movs r1, 0xAA lsls r1, 3 adds r0, r1 ldrh r0, [r0] cmp r0, 0 - beq _080C4864 + beq @080C4864 movs r4, 0x1 str r4, [sp] str r4, [sp, 0x4] @@ -370931,11 +370931,11 @@ _080C482E: movs r2, 0x1B movs r3, 0xE bl Bg_FillWramTileMapRectWithTileAndPalette -_080C4864: +@080C4864: ldr r0, [r6] ldrb r0, [r0, 0xD] cmp r0, 0 - beq _080C48B8 + beq @080C48B8 movs r4, 0x1 str r4, [sp] str r4, [sp, 0x4] @@ -370970,7 +370970,7 @@ _080C4864: movs r2, 0x1B movs r3, 0x10 bl Bg_FillWramTileMapRectWithTileAndPalette -_080C48B8: +@080C48B8: movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram add sp, 0xC @@ -370980,7 +370980,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] @@ -370990,7 +370990,7 @@ sub_80C48C8: @ 80C48C8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3C - bls _080C48F6 + bls @080C48F6 ldr r1, [r3] movs r0, 0 strb r0, [r1, 0x6] @@ -371004,7 +371004,7 @@ sub_80C48C8: @ 80C48C8 adds r0, r1 movs r1, 0x1 strb r1, [r0] -_080C48F6: +@080C48F6: pop {r0} bx r0 .align 2, 0 @@ -371012,7 +371012,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 @@ -371026,7 +371026,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 + 1 adds r0, r4, 0 @@ -371045,27 +371045,27 @@ 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 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _080C4958 + beq @080C4958 movs r0, 0 - b _080C495A + b @080C495A .align 2, 0 .pool -_080C4958: +@080C4958: movs r0, 0x1 -_080C495A: +@080C495A: pop {r1} bx r1 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 @@ -371075,7 +371075,7 @@ sub_80C4960: @ 80C4960 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_080C4972: +@080C4972: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -371085,7 +371085,7 @@ _080C4972: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _080C4972 + bne @080C4972 pop {r4,r5} pop {r0} bx r0 @@ -371094,7 +371094,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 @@ -371109,12 +371109,12 @@ sub_80C4998: @ 80C4998 movs r3, 0xF0 lsls r3, 3 adds r0, r3 -_080C49BC: +@080C49BC: strh r2, [r0] adds r0, 0x2 adds r1, 0x1 cmp r1, 0x9F - bls _080C49BC + bls @080C49BC ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -371127,7 +371127,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 @@ -371144,18 +371144,18 @@ sub_80C49D8: @ 80C49D8 movs r2, 0xA ldrsh r0, [r0, r2] cmp r0, 0x4C - ble _080C4A08 + ble @080C4A08 movs r0, 0x4D mov r3, r8 strh r0, [r3, 0xA] - b _080C4A0E + b @080C4A0E .align 2, 0 .pool -_080C4A08: +@080C4A08: adds r0, r1, 0x7 mov r4, r8 strh r0, [r4, 0xA] -_080C4A0E: +@080C4A0E: ldr r0, =0x02039ce8 ldr r0, [r0] mov r2, r8 @@ -371192,9 +371192,9 @@ _080C4A0E: lsls r5, 1 movs r2, 0 cmp r2, r7 - bcs _080C4A78 + bcs @080C4A78 ldr r3, =0x02038c28 -_080C4A60: +@080C4A60: lsls r0, r2, 16 asrs r0, 16 lsls r1, r0, 1 @@ -371206,8 +371206,8 @@ _080C4A60: lsrs r2, r0, 16 asrs r0, 16 cmp r0, r7 - bcc _080C4A60 -_080C4A78: + bcc @080C4A60 +@080C4A78: lsls r1, r2, 16 mov r3, r9 lsls r0, r3, 16 @@ -371217,11 +371217,11 @@ _080C4A78: ldr r4, [sp] lsrs r7, r4, 16 cmp r1, r0 - bge _080C4AB0 + bge @080C4AB0 ldr r0, =0x02038c28 mov r12, r0 adds r4, r3, 0 -_080C4A92: +@080C4A92: lsrs r3, r6, 16 adds r6, r5 mov r2, r10 @@ -371236,15 +371236,15 @@ _080C4A92: lsls r1, r2, 16 asrs r0, r1, 16 cmp r0, r4 - blt _080C4A92 -_080C4AB0: + blt @080C4A92 +@080C4AB0: adds r3, r7, 0 lsls r1, r2, 16 asrs r0, r1, 16 cmp r0, 0x9F - bgt _080C4ACE + bgt @080C4ACE ldr r2, =0x02038c28 -_080C4ABC: +@080C4ABC: asrs r0, r1, 16 lsls r1, r0, 1 adds r1, r2 @@ -371253,8 +371253,8 @@ _080C4ABC: lsls r1, r0, 16 asrs r0, r1, 16 cmp r0, 0x9F - ble _080C4ABC -_080C4ACE: + ble @080C4ABC +@080C4ACE: mov r3, r9 ldr r0, [r3] movs r1, 0x1 @@ -371263,11 +371263,11 @@ _080C4ACE: movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0x4C - ble _080C4AE6 + ble @080C4AE6 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080C4AE6: +@080C4AE6: movs r0, 0 add sp, 0x4 pop {r3-r5} @@ -371282,7 +371282,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 @@ -371293,27 +371293,27 @@ sub_80C4B08: @ 80C4B08 bl sub_8087598 adds r2, r4, 0 cmp r0, 0x1 - beq _080C4C08 -_080C4B20: + beq @080C4C08 +@080C4B20: ldr r3, [r2] ldrb r0, [r3, 0x4] cmp r0, 0x4 - bhi _080C4BE4 + bhi @080C4BE4 lsls r0, 2 - ldr r1, =_080C4B3C + ldr r1, =@080C4B3C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C4B3C: - .4byte _080C4B50 - .4byte _080C4B6C - .4byte _080C4B8C - .4byte _080C4BB0 - .4byte _080C4BCE -_080C4B50: +@080C4B3C: + .4byte @080C4B50 + .4byte @080C4B6C + .4byte @080C4B8C + .4byte @080C4BB0 + .4byte @080C4BCE +@080C4B50: movs r0, 0x1 movs r1, 0 bl Window_FastFillPixels @@ -371325,65 +371325,65 @@ _080C4B50: movs r2, 0 movs r3, 0 bl bg_fill_tilemap_rect - b _080C4BF6 -_080C4B6C: + b @080C4BF6 +@080C4B6C: ldr r0, [r2] ldrb r0, [r0, 0x8] cmp r0, 0 - bne _080C4B80 + bne @080C4B80 bl sub_80C34B0 lsls r0, 24 cmp r0, 0 - bne _080C4BF6 - b _080C4C08 -_080C4B80: + bne @080C4BF6 + b @080C4C08 +@080C4B80: bl sub_80C3438 lsls r0, 24 cmp r0, 0 - bne _080C4BF6 - b _080C4C08 -_080C4B8C: + bne @080C4BF6 + b @080C4C08 +@080C4B8C: ldr r0, =0x02039ce8 ldr r1, [r0] ldrb r0, [r1, 0x8] cmp r0, 0 - bne _080C4BA8 + bne @080C4BA8 ldr r2, =0x00000a48 adds r0, r1, r2 bl sub_80C45C0 - b _080C4BF6 + b @080C4BF6 .align 2, 0 .pool -_080C4BA8: +@080C4BA8: movs r0, 0x1 bl sub_80C438C - b _080C4BF6 -_080C4BB0: + b @080C4BF6 +@080C4BB0: ldr r0, =0x02039ce8 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - bne _080C4BC4 + bne @080C4BC4 bl sub_80C474C - b _080C4BF6 + b @080C4BF6 .align 2, 0 .pool -_080C4BC4: +@080C4BC4: movs r0, 0x2 movs r1, 0 bl Window_FastFillPixels - b _080C4BF6 -_080C4BCE: + b @080C4BF6 +@080C4BCE: ldr r0, =0x02039ce8 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - beq _080C4BF6 + beq @080C4BF6 bl sub_80C4FF0 - b _080C4BF6 + b @080C4BF6 .align 2, 0 .pool -_080C4BE4: +@080C4BE4: ldrh r0, [r5, 0x8] adds r0, 0x1 movs r1, 0 @@ -371392,8 +371392,8 @@ _080C4BE4: strb r0, [r3, 0x9] ldr r0, [r2] strb r1, [r0, 0x4] - b _080C4C08 -_080C4BF6: + b @080C4C08 +@080C4BF6: ldr r2, =0x02039ce8 ldr r1, [r2] ldrb r0, [r1, 0x4] @@ -371402,8 +371402,8 @@ _080C4BF6: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _080C4B20 -_080C4C08: + beq @080C4B20 +@080C4C08: movs r0, 0 add sp, 0x8 pop {r4,r5} @@ -371414,7 +371414,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 @@ -371424,7 +371424,7 @@ sub_80C4C1C: @ 80C4C1C ldr r0, [r4] ldrb r0, [r0, 0x8] cmp r0, 0 - beq _080C4C50 + beq @080C4C50 movs r0, 0x2 bl sub_80C438C ldr r0, [r4] @@ -371437,7 +371437,7 @@ sub_80C4C1C: @ 80C4C1C adds r0, r1 bl sub_80C45C0 bl sub_80C4630 -_080C4C50: +@080C4C50: movs r0, 0x1 bl sub_80C438C ldr r2, [r4] @@ -371462,7 +371462,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 @@ -371479,17 +371479,17 @@ sub_80C4C84: @ 80C4C84 movs r3, 0xA ldrsh r0, [r0, r3] cmp r0, 0x5 - bgt _080C4CB0 + bgt @080C4CB0 mov r4, r8 strh r2, [r4, 0xA] - b _080C4CB6 + b @080C4CB6 .align 2, 0 .pool -_080C4CB0: +@080C4CB0: subs r0, r1, 0x5 mov r1, r8 strh r0, [r1, 0xA] -_080C4CB6: +@080C4CB6: ldr r0, =0x02039ce8 ldr r0, [r0] mov r2, r8 @@ -371526,9 +371526,9 @@ _080C4CB6: lsrs r5, 1 movs r2, 0 cmp r2, r7 - bcs _080C4D20 + bcs @080C4D20 ldr r3, =0x02038c28 -_080C4D08: +@080C4D08: lsls r0, r2, 16 asrs r0, 16 lsls r1, r0, 1 @@ -371540,8 +371540,8 @@ _080C4D08: lsrs r2, r0, 16 asrs r0, 16 cmp r0, r7 - bcc _080C4D08 -_080C4D20: + bcc @080C4D08 +@080C4D20: lsls r1, r2, 16 mov r3, r9 lsls r0, r3, 16 @@ -371551,11 +371551,11 @@ _080C4D20: ldr r4, [sp] lsrs r7, r4, 16 cmp r1, r0 - bge _080C4D56 + bge @080C4D56 ldr r0, =0x02038c28 mov r12, r0 adds r4, r3, 0 -_080C4D3A: +@080C4D3A: lsrs r3, r6, 16 adds r6, r5 add r5, r10 @@ -371569,15 +371569,15 @@ _080C4D3A: lsls r1, r2, 16 asrs r0, r1, 16 cmp r0, r4 - blt _080C4D3A -_080C4D56: + blt @080C4D3A +@080C4D56: adds r3, r7, 0 lsls r1, r2, 16 asrs r0, r1, 16 cmp r0, 0x9F - bgt _080C4D74 + bgt @080C4D74 ldr r2, =0x02038c28 -_080C4D62: +@080C4D62: asrs r0, r1, 16 lsls r1, r0, 1 adds r1, r2 @@ -371586,8 +371586,8 @@ _080C4D62: lsls r1, r0, 16 asrs r0, r1, 16 cmp r0, 0x9F - ble _080C4D62 -_080C4D74: + ble @080C4D62 +@080C4D74: mov r1, r9 ldr r0, [r1] movs r1, 0x1 @@ -371596,11 +371596,11 @@ _080C4D74: movs r3, 0xA ldrsh r0, [r2, r3] cmp r0, 0 - bgt _080C4D8C + bgt @080C4D8C ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] -_080C4D8C: +@080C4D8C: movs r0, 0 add sp, 0x4 pop {r3-r5} @@ -371615,7 +371615,7 @@ _080C4D8C: thumb_func_end sub_80C4C84 thumb_func_start sub_80C4DB0 -sub_80C4DB0: @ 80C4DB0 +sub_80C4DB0: ; 80C4DB0 push {lr} movs r0, 0x1 bl gpu_sync_bg_show @@ -371636,7 +371636,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 @@ -371650,36 +371650,36 @@ sub_80C4DDC: @ 80C4DDC str r5, [r0] ldr r0, =sub_80C5868 + 1 cmp r5, r0 - bne _080C4E18 + bne @080C4E18 ldr r0, =0x0000052c adds r1, r0 ldr r0, =0x00007fff - b _080C4E1E + b @080C4E1E .align 2, 0 .pool -_080C4E18: +@080C4E18: ldr r2, =0x0000052c adds r1, r2 movs r0, 0 -_080C4E1E: +@080C4E1E: strh r0, [r1] bl in_trade_center adds r3, r0, 0 cmp r3, 0x1 - bne _080C4E3C + bne @080C4E3C ldr r1, =0x02039ce8 ldr r0, [r1] strb r3, [r0, 0x5] adds r2, r1, 0 - b _080C4E44 + b @080C4E44 .align 2, 0 .pool -_080C4E3C: +@080C4E3C: ldr r2, =0x02039ce8 ldr r1, [r2] movs r0, 0 strb r0, [r1, 0x5] -_080C4E44: +@080C4E44: ldr r0, [r2] ldr r1, =0x00007caa adds r0, r1 @@ -371699,7 +371699,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 @@ -371744,7 +371744,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] @@ -371770,7 +371770,7 @@ sub_80C4EE4: @ 80C4EE4 adds r1, r3 strb r0, [r1] movs r5, 0 -_080C4F18: +@080C4F18: movs r0, 0xD muls r0, r5 adds r0, 0x19 @@ -371786,7 +371786,7 @@ _080C4F18: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _080C4F18 + bls @080C4F18 pop {r4,r5} pop {r0} bx r0 @@ -371795,29 +371795,29 @@ _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] cmp r1, 0 - bne _080C4F7C + bne @080C4F7C ldr r0, =gUnknown_82E9530 ldrb r1, [r0] subs r0, r1, 0x4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _080C4F74 + bhi @080C4F74 movs r0, 0 - b _080C4FC2 + b @080C4FC2 .align 2, 0 .pool -_080C4F74: +@080C4F74: cmp r1, 0x3 - beq _080C4FC0 + beq @080C4FC0 movs r0, 0x1 - b _080C4FC2 -_080C4F7C: + b @080C4FC2 +@080C4F7C: ldr r2, =0x0000056c adds r0, r1, r2 ldrb r2, [r0] @@ -371825,34 +371825,34 @@ _080C4F7C: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _080C4FA0 + bhi @080C4FA0 ldr r0, =0x0000052b adds r1, r0 movs r0, 0 strb r0, [r1] - b _080C4FC2 + b @080C4FC2 .align 2, 0 .pool -_080C4FA0: +@080C4FA0: lsls r0, r2, 24 lsrs r0, 24 cmp r0, 0x3 - beq _080C4FB8 + beq @080C4FB8 ldr r2, =0x0000052b adds r1, r2 movs r0, 0x1 strb r0, [r1] - b _080C4FC2 + b @080C4FC2 .align 2, 0 .pool -_080C4FB8: +@080C4FB8: ldr r0, =0x0000052b adds r1, r0 movs r0, 0x1 strb r0, [r1] -_080C4FC0: +@080C4FC0: movs r0, 0x2 -_080C4FC2: +@080C4FC2: pop {r1} bx r1 .align 2, 0 @@ -371860,7 +371860,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 @@ -371869,32 +371869,32 @@ sub_80C4FCC: @ 80C4FCC adds r0, r2 lsrs r0, 24 cmp r0, 0x1 - bhi _080C4FE2 + bhi @080C4FE2 movs r0, 0 - b _080C4FEC -_080C4FE2: + b @080C4FEC +@080C4FE2: cmp r1, 0x3 - beq _080C4FEA + beq @080C4FEA movs r0, 0x1 - b _080C4FEC -_080C4FEA: + b @080C4FEC +@080C4FEA: movs r0, 0x2 -_080C4FEC: +@080C4FEC: pop {r1} bx r1 thumb_func_end sub_80C4FCC thumb_func_start sub_80C4FF0 -sub_80C4FF0: @ 80C4FF0 +sub_80C4FF0: ; 80C4FF0 push {r4-r6,lr} sub sp, 0x8 bl in_trade_center cmp r0, 0x1 - bne _080C5060 + bne @080C5060 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 - bne _080C5060 + bne @080C5060 ldr r5, =0x02039ce8 ldr r0, [r5] ldr r1, =0x00000583 @@ -371925,10 +371925,10 @@ sub_80C4FF0: @ 80C4FF0 str r1, [sp, 0x4] movs r1, 0x1 bl sub_818D938 - b _080C50AE + b @080C50AE .align 2, 0 .pool -_080C5060: +@080C5060: ldr r2, =0x0856fb20 ldr r6, =0x02039ce8 ldr r0, [r6] @@ -371966,7 +371966,7 @@ _080C5060: str r1, [sp, 0x4] movs r1, 0x1 bl sub_818D938 -_080C50AE: +@080C50AE: add sp, 0x8 pop {r4-r6} pop {r0} @@ -371976,7 +371976,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 @@ -372076,7 +372076,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 + 1 @@ -372088,7 +372088,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] @@ -372102,41 +372102,41 @@ 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 ldr r0, [r5] cmp r0, 0 - beq _080C5204 + beq @080C5204 movs r0, 0x1 - b _080C52C8 + b @080C52C8 .align 2, 0 .pool -_080C5204: +@080C5204: movs r0, 0x18 bl malloc_and_clear str r0, [r5] cmp r0, 0 - bne _080C5214 + bne @080C5214 movs r0, 0x2 - b _080C52C8 -_080C5214: + b @080C52C8 +@080C5214: str r4, [r0] bl sav1_map_get_name lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3A - beq _080C5232 + beq @080C5232 cmp r4, 0xCA - beq _080C5232 + beq @080C5232 ldr r0, [r5] movs r1, 0xB0 strh r1, [r0, 0x8] movs r1, 0x68 strh r1, [r0, 0xA] - b _080C5240 -_080C5232: + b @080C5240 +@080C5232: ldr r2, =0x02039cec ldr r1, [r2] movs r0, 0xB0 @@ -372144,7 +372144,7 @@ _080C5232: movs r0, 0x30 strh r0, [r1, 0xA] adds r5, r2, 0 -_080C5240: +@080C5240: ldr r1, [r5] ldr r0, =0x03005d90 ldr r0, [r0] @@ -372178,41 +372178,41 @@ _080C5240: strb r1, [r3, 0xE] movs r4, 0 adds r6, r5, 0 -_080C5286: +@080C5286: lsls r5, r4, 1 ldr r1, =0x000008c4 adds r0, r5, r1 bl flag_check lsls r0, 24 cmp r0, 0 - beq _080C52A2 + beq @080C52A2 ldr r1, [r6] adds r1, 0xF adds r1, r4 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_080C52A2: +@080C52A2: ldr r2, =0x000008c5 adds r0, r5, r2 bl flag_check lsls r0, 24 cmp r0, 0 - beq _080C52BC + beq @080C52BC ldr r1, [r6] adds r1, 0xF adds r1, r4 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_080C52BC: +@080C52BC: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x6 - bls _080C5286 + bls @080C5286 movs r0, 0 -_080C52C8: +@080C52C8: pop {r4-r6} pop {r1} bx r1 @@ -372221,12 +372221,12 @@ _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] cmp r0, 0 - beq _080C5308 + beq @080C5308 movs r1, 0 movs r2, 0x18 bl memset @@ -372234,85 +372234,85 @@ sub_80C52E4: @ 80C52E4 bl free movs r0, 0 str r0, [r4] - b _080C530A + b @080C530A .align 2, 0 .pool -_080C5308: +@080C5308: movs r0, 0x1 -_080C530A: +@080C530A: pop {r4} pop {r1} bx r1 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] cmp r0, 0 - beq _080C5324 + beq @080C5324 movs r0, 0x1 - b _080C533A + b @080C533A .align 2, 0 .pool -_080C5324: +@080C5324: ldr r0, =0x00002434 bl malloc_and_clear str r0, [r4] cmp r0, 0 - beq _080C5338 + beq @080C5338 movs r0, 0 - b _080C533A + b @080C533A .align 2, 0 .pool -_080C5338: +@080C5338: movs r0, 0x2 -_080C533A: +@080C533A: pop {r4} pop {r1} bx r1 thumb_func_end sub_80C5310 thumb_func_start sub_80C5340 -sub_80C5340: @ 80C5340 +sub_80C5340: ; 80C5340 push {r4,lr} bl Window_FreeMemory ldr r4, =0x02039cf0 ldr r0, [r4] cmp r0, 0 - bne _080C5358 + bne @080C5358 movs r0, 0x1 - b _080C53A0 + b @080C53A0 .align 2, 0 .pool -_080C5358: +@080C5358: ldr r0, [r0, 0x28] cmp r0, 0 - beq _080C5368 + beq @080C5368 bl free ldr r1, [r4] movs r0, 0 str r0, [r1, 0x28] -_080C5368: +@080C5368: ldr r0, [r4] ldr r0, [r0, 0x24] cmp r0, 0 - beq _080C537A + beq @080C537A bl free ldr r1, [r4] movs r0, 0 str r0, [r1, 0x24] -_080C537A: +@080C537A: ldr r0, [r4] ldr r0, [r0, 0x20] cmp r0, 0 - beq _080C538C + beq @080C538C bl free ldr r1, [r4] movs r0, 0 str r0, [r1, 0x20] -_080C538C: +@080C538C: ldr r0, [r4] ldr r2, =0x00002434 movs r1, 0 @@ -372321,7 +372321,7 @@ _080C538C: bl free movs r0, 0 str r0, [r4] -_080C53A0: +@080C53A0: pop {r4} pop {r1} bx r1 @@ -372330,7 +372330,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 @@ -372339,7 +372339,7 @@ pokemon_details: @ 80C53AC adds r0, 0x2C ldrb r0, [r0] cmp r0, 0 - beq _080C5416 + beq @080C5416 ldr r3, =0x085713e0 ldr r0, =0x02039cec ldr r0, [r0] @@ -372383,7 +372383,7 @@ pokemon_details: @ 80C53AC str r0, [sp, 0xC] movs r0, 0x2 bl call_gpu_bg_affine_set -_080C5416: +@080C5416: bl copy_super_sprites_to_oam bl copy_queue_process bl copy_pal_bg_faded_to_pal_ram @@ -372396,7 +372396,7 @@ _080C5416: thumb_func_end pokemon_details thumb_func_start sub_80C5438 -sub_80C5438: @ 80C5438 +sub_80C5438: ; 80C5438 push {lr} bl run_active_tasks bl call_obj_callbacks @@ -372406,17 +372406,17 @@ 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 - beq _080C5464 + beq @080C5464 ldr r0, =sub_80C5A48 + 1 movs r1, 0 bl AddTask ldr r0, =sub_80C5438 + 1 bl set_callback2 -_080C5464: +@080C5464: pop {r0} bx r0 .align 2, 0 @@ -372424,19 +372424,19 @@ _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 - beq _080C547E + beq @080C547E bl sub_80C51D8 -_080C547E: +@080C547E: pop {r0} bx r0 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 @@ -372445,51 +372445,51 @@ sub_80C5484: @ 80C5484 ldr r0, [r0] ldrh r0, [r0, 0x4] cmp r0, 0xA - bls _080C5498 - b _080C56F4 -_080C5498: + bls @080C5498 + b @080C56F4 +@080C5498: lsls r0, 2 - ldr r1, =_080C54AC + ldr r1, =@080C54AC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C54AC: - .4byte _080C54D8 - .4byte _080C54EE - .4byte _080C54F4 - .4byte _080C550A - .4byte _080C5510 - .4byte _080C5560 - .4byte _080C5570 - .4byte _080C55D0 - .4byte _080C5624 - .4byte _080C5684 - .4byte _080C56D0 -_080C54D8: +@080C54AC: + .4byte @080C54D8 + .4byte @080C54EE + .4byte @080C54F4 + .4byte @080C550A + .4byte @080C5510 + .4byte @080C5560 + .4byte @080C5570 + .4byte @080C55D0 + .4byte @080C5624 + .4byte @080C5684 + .4byte @080C56D0 +@080C54D8: movs r0, 0 bl SetVBlankCallback bl remove_some_task bl vblank_hblank_handler_set_zero movs r0, 0x2 bl disable_irqs - b _080C56F4 -_080C54EE: + b @080C56F4 +@080C54EE: bl sub_80C50D0 - b _080C56F4 -_080C54F4: + b @080C56F4 +@080C54F4: bl clear_tasks bl reset_all_obj_data bl gpu_pal_allocator_reset bl sub_80A1A74 bl reset_temp_tile_data_buffers - b _080C56F4 -_080C550A: + b @080C56F4 +@080C550A: bl sub_80C5310 - b _080C56F4 -_080C5510: + b @080C56F4 +@080C5510: movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags ldr r1, =0x085713e8 @@ -372515,17 +372515,17 @@ _080C5510: movs r1, 0x6 movs r2, 0x1 bl gpu_bg_config_set_field - b _080C56F4 + b @080C56F4 .align 2, 0 .pool -_080C5560: +@080C5560: ldr r0, =0x08571400 bl Window_InitFromTemplates bl TextBox_ResetSomeField - b _080C56F4 + b @080C56F4 .align 2, 0 .pool -_080C5570: +@080C5570: ldr r0, =0x085712f8 add r1, sp, 0x8 bl malloc_and_decompress @@ -372555,16 +372555,16 @@ _080C5570: movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - b _080C56F4 + b @080C56F4 .align 2, 0 .pool -_080C55D0: +@080C55D0: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - beq _080C55DC - b _080C56FE -_080C55DC: + beq @080C55DC + b @080C56FE +@080C55DC: movs r5, 0x1E str r5, [sp] movs r4, 0x14 @@ -372594,8 +372594,8 @@ _080C55DC: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x2 bl gpu_copy_wram_bg_tilemap_to_vram - b _080C56F4 -_080C5624: + b @080C56F4 +@080C5624: ldr r4, =0x08de07c8 movs r2, 0xD0 lsls r2, 1 @@ -372627,17 +372627,17 @@ _080C5624: movs r1, 0xE ands r1, r0 cmp r1, 0x2 - beq _080C5674 + beq @080C5674 cmp r1, 0x4 - bne _080C56F4 -_080C5674: + bne @080C56F4 +@080C5674: movs r0, 0 strh r0, [r5, 0x4] movs r0, 0x1 - b _080C5700 + b @080C5700 .align 2, 0 .pool -_080C5684: +@080C5684: movs r1, 0x82 lsls r1, 5 movs r0, 0 @@ -372664,33 +372664,33 @@ _080C5684: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - b _080C56F4 + b @080C56F4 .align 2, 0 .pool -_080C56D0: +@080C56D0: bl call_obj_callbacks bl obj_sync_something bl fade_and_return_progress_probably lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _080C56FE + bne @080C56FE ldr r0, =0x02039cec ldr r0, [r0] strh r1, [r0, 0x4] movs r0, 0x1 - b _080C5700 + b @080C5700 .align 2, 0 .pool -_080C56F4: +@080C56F4: ldr r0, =0x02039cec ldr r1, [r0] ldrh r0, [r1, 0x4] adds r0, 0x1 strh r0, [r1, 0x4] -_080C56FE: +@080C56FE: movs r0, 0 -_080C5700: +@080C5700: add sp, 0xC pop {r4,r5} pop {r1} @@ -372700,7 +372700,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 @@ -372708,31 +372708,31 @@ sub_80C570C: @ 80C570C ldrh r0, [r0, 0x4] adds r2, r1, 0 cmp r0, 0x5 - bhi _080C57E4 + bhi @080C57E4 lsls r0, 2 - ldr r1, =_080C5730 + ldr r1, =@080C5730 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C5730: - .4byte _080C5748 - .4byte _080C5770 - .4byte _080C577C - .4byte _080C57A6 - .4byte _080C57AC - .4byte _080C57BE -_080C5748: +@080C5730: + .4byte @080C5748 + .4byte @080C5770 + .4byte @080C577C + .4byte @080C57A6 + .4byte @080C57AC + .4byte @080C57BE +@080C5748: ldr r0, [r2] ldrb r0, [r0, 0xE] movs r1, 0xE ands r1, r0 cmp r1, 0x2 - beq _080C576A + beq @080C576A cmp r1, 0x4 - beq _080C576A + beq @080C576A movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -372740,18 +372740,18 @@ _080C5748: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - b _080C57E4 -_080C576A: + b @080C57E4 +@080C576A: ldr r1, [r2] movs r0, 0x2 - b _080C57EC -_080C5770: + b @080C57EC +@080C5770: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - beq _080C57E4 - b _080C57EE -_080C577C: + beq @080C57E4 + b @080C57EE +@080C577C: movs r0, 0 movs r1, 0 bl lcd_io_set @@ -372765,17 +372765,17 @@ _080C577C: bl SetVBlankCallback bl remove_some_task bl vblank_hblank_handler_set_zero - b _080C57E4 -_080C57A6: + b @080C57E4 +@080C57A6: bl sub_80C63FC - b _080C57E4 -_080C57AC: + b @080C57E4 +@080C57AC: bl sub_80C50D0 bl clear_tasks bl reset_all_obj_data bl gpu_pal_allocator_reset - b _080C57E4 -_080C57BE: + b @080C57E4 +@080C57BE: movs r0, 0 bl bg_unset_tilemap movs r0, 0x1 @@ -372788,19 +372788,19 @@ _080C57BE: movs r0, 0 strh r0, [r1, 0x4] movs r0, 0x1 - b _080C57F0 + b @080C57F0 .align 2, 0 .pool -_080C57E4: +@080C57E4: ldr r0, =0x02039cec ldr r1, [r0] ldrh r0, [r1, 0x4] adds r0, 0x1 -_080C57EC: +@080C57EC: strh r0, [r1, 0x4] -_080C57EE: +@080C57EE: movs r0, 0 -_080C57F0: +@080C57F0: add sp, 0x4 pop {r1} bx r1 @@ -372809,7 +372809,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 @@ -372817,71 +372817,71 @@ sub_80C57FC: @ 80C57FC ldr r7, =0x08571454 lsls r1, 16 asrs r5, r1, 16 -_080C580A: +@080C580A: lsls r0, r4, 3 adds r3, r0, r7 movs r1, 0 ldrsh r0, [r3, r1] cmp r0, r5 - bgt _080C5854 + bgt @080C5854 movs r1, 0x2 ldrsh r0, [r3, r1] cmp r0, r5 - blt _080C5854 + blt @080C5854 movs r0, 0x4 ldrsh r1, [r3, r0] lsls r0, r6, 16 asrs r2, r0, 16 cmp r1, r2 - bgt _080C5854 + bgt @080C5854 movs r1, 0x6 ldrsh r0, [r3, r1] cmp r0, r2 - blt _080C5854 + blt @080C5854 cmp r4, 0x5 - bls _080C5842 + bls @080C5842 ldr r0, =0x02039cec ldr r0, [r0] adds r0, r4 ldrb r0, [r0, 0x9] cmp r0, 0 - beq _080C585E -_080C5842: + beq @080C585E +@080C5842: adds r0, r4, 0x1 lsls r0, 24 lsrs r0, 24 - b _080C5860 + b @080C5860 .align 2, 0 .pool -_080C5854: +@080C5854: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xC - bls _080C580A -_080C585E: + bls @080C580A +@080C585E: movs r0, 0 -_080C5860: +@080C5860: pop {r4-r7} pop {r1} bx r1 thumb_func_end sub_80C57FC thumb_func_start sub_80C5868 -sub_80C5868: @ 80C5868 +sub_80C5868: ; 80C5868 push {lr} bl sub_80C5484 cmp r0, 0 - beq _080C58C6 + beq @080C58C6 ldr r1, =0x02039cec ldr r0, [r1] ldrb r0, [r0, 0xE] lsls r0, 28 lsrs r0, 29 cmp r0, 0x1 - blt _080C58AC + blt @080C58AC cmp r0, 0x2 - bgt _080C58AC + bgt @080C58AC ldr r0, =sub_80C5BD8 + 1 movs r1, 0 bl AddTask @@ -372894,10 +372894,10 @@ sub_80C5868: @ 80C5868 adds r1, r2 movs r0, 0x1 strh r0, [r1, 0x8] - b _080C58C0 + b @080C58C0 .align 2, 0 .pool -_080C58AC: +@080C58AC: ldr r2, [r1] ldrb r1, [r2, 0xE] movs r0, 0xF @@ -372907,10 +372907,10 @@ _080C58AC: ldr r0, =sub_80C5A48 + 1 movs r1, 0 bl AddTask -_080C58C0: +@080C58C0: ldr r0, =sub_80C5438 + 1 bl set_callback2 -_080C58C6: +@080C58C6: pop {r0} bx r0 .align 2, 0 @@ -372918,7 +372918,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] @@ -372937,24 +372937,24 @@ sub_80C58D4: @ 80C58D4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080C5914 + beq @080C5914 cmp r0, 0x2 - beq _080C591C + beq @080C591C bl sub_8085784 - b _080C5924 + b @080C5924 .align 2, 0 .pool -_080C5914: +@080C5914: ldr r0, =0x000001cd - b _080C5920 + b @080C5920 .align 2, 0 .pool -_080C591C: +@080C591C: movs r0, 0xE7 lsls r0, 1 -_080C5920: +@080C5920: bl song_play_for_text -_080C5924: +@080C5924: ldr r0, =sub_80C5868 + 1 bl set_callback2 pop {r4} @@ -372965,36 +372965,36 @@ _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 - beq _080C599A + beq @080C599A ldr r0, =0x02039cec ldr r2, [r0] ldrb r0, [r2, 0xE] lsls r0, 28 lsrs r0, 29 cmp r0, 0x2 - beq _080C5994 + beq @080C5994 cmp r0, 0x2 - bgt _080C595C + bgt @080C595C cmp r0, 0x1 - beq _080C5962 - b _080C599A + beq @080C5962 + b @080C599A .align 2, 0 .pool -_080C595C: +@080C595C: cmp r0, 0x3 - beq _080C5970 - b _080C599A -_080C5962: + beq @080C5970 + b @080C599A +@080C5962: ldr r0, =sub_80C5868 + 1 bl sub_80C6454 - b _080C599A + b @080C599A .align 2, 0 .pool -_080C5970: +@080C5970: ldr r1, =0x02039cf8 ldr r0, [r2] str r0, [r1] @@ -373005,13 +373005,13 @@ _080C5970: bl sub_80C52E4 ldr r0, =sub_80C58D4 + 1 bl sub_8185E24 - b _080C599A + b @080C599A .align 2, 0 .pool -_080C5994: +@080C5994: ldr r0, =sub_80C5868 + 1 bl sub_80C4DDC -_080C599A: +@080C599A: pop {r0} bx r0 .align 2, 0 @@ -373019,7 +373019,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 @@ -373028,24 +373028,24 @@ sub_80C59A4: @ 80C59A4 lsrs r1, 24 adds r2, r1, 0 cmp r1, 0x1 - blt _080C59CC + blt @080C59CC cmp r1, 0x2 - ble _080C59F4 + ble @080C59F4 cmp r1, 0x3 - bne _080C59CC + bne @080C59CC ldr r0, =0x02039cec ldr r2, [r0] ldrb r1, [r2, 0xE] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080C59D4 -_080C59CC: + bne @080C59D4 +@080C59CC: movs r0, 0 - b _080C5A30 + b @080C5A30 .align 2, 0 .pool -_080C59D4: +@080C59D4: movs r0, 0xF negs r0, r0 ands r0, r1 @@ -373056,10 +373056,10 @@ _080C59D4: bl remove_task ldr r0, =sub_80C5934 + 1 bl set_callback2 - b _080C5A1A + b @080C5A1A .align 2, 0 .pool -_080C59F4: +@080C59F4: ldr r0, =0x02039cec ldr r3, [r0] movs r0, 0x7 @@ -373079,7 +373079,7 @@ _080C59F4: str r1, [r0] movs r1, 0 strh r1, [r0, 0x8] -_080C5A1A: +@080C5A1A: ldr r0, =0x02039cec ldr r2, [r0] ldr r0, =0x02039cf0 @@ -373091,7 +373091,7 @@ _080C5A1A: ldrh r0, [r0, 0x22] strh r0, [r2, 0xA] movs r0, 0x1 -_080C5A30: +@080C5A30: pop {r4} pop {r1} bx r1 @@ -373100,7 +373100,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 @@ -373110,7 +373110,7 @@ sub_80C5A48: @ 80C5A48 movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _080C5A80 + beq @080C5A80 ldr r0, =0x02039cf0 ldr r4, [r0] ldr r1, [r4] @@ -373118,24 +373118,24 @@ sub_80C5A48: @ 80C5A48 movs r7, 0x22 ldrsh r0, [r1, r7] cmp r0, 0x8 - ble _080C5A80 + ble @080C5A80 subs r0, r3, 0x2 strh r0, [r1, 0x22] ldr r1, [r4] movs r3, 0x22 ldrsh r0, [r1, r3] cmp r0, 0x7 - bgt _080C5A7E + bgt @080C5A7E movs r0, 0x2 strh r0, [r1, 0x22] -_080C5A7E: +@080C5A7E: movs r5, 0x1 -_080C5A80: +@080C5A80: ldrh r1, [r2, 0x2C] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080C5AAE + beq @080C5AAE ldr r0, =0x02039cf0 ldr r4, [r0] ldr r1, [r4] @@ -373143,24 +373143,24 @@ _080C5A80: movs r7, 0x22 ldrsh r0, [r1, r7] cmp r0, 0x87 - bgt _080C5AAE + bgt @080C5AAE adds r0, r3, 0x2 strh r0, [r1, 0x22] ldr r1, [r4] movs r3, 0x22 ldrsh r0, [r1, r3] cmp r0, 0x88 - ble _080C5AAC + ble @080C5AAC movs r0, 0x88 strh r0, [r1, 0x22] -_080C5AAC: +@080C5AAC: movs r5, 0x1 -_080C5AAE: +@080C5AAE: ldrh r1, [r2, 0x2C] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080C5ADC + beq @080C5ADC ldr r0, =0x02039cf0 ldr r4, [r0] ldr r1, [r4] @@ -373168,24 +373168,24 @@ _080C5AAE: movs r7, 0x20 ldrsh r0, [r1, r7] cmp r0, 0x5 - ble _080C5ADC + ble @080C5ADC subs r0, r3, 0x2 strh r0, [r1, 0x20] ldr r1, [r4] movs r3, 0x20 ldrsh r0, [r1, r3] cmp r0, 0x4 - bgt _080C5ADA + bgt @080C5ADA movs r0, 0x5 strh r0, [r1, 0x20] -_080C5ADA: +@080C5ADA: movs r5, 0x1 -_080C5ADC: +@080C5ADC: ldrh r1, [r2, 0x2C] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080C5B0A + beq @080C5B0A ldr r0, =0x02039cf0 ldr r4, [r0] ldr r1, [r4] @@ -373193,33 +373193,33 @@ _080C5ADC: movs r7, 0x20 ldrsh r0, [r1, r7] cmp r0, 0xE7 - bgt _080C5B0A + bgt @080C5B0A adds r0, r3, 0x2 strh r0, [r1, 0x20] ldr r1, [r4] movs r3, 0x20 ldrsh r0, [r1, r3] cmp r0, 0xE8 - ble _080C5B08 + ble @080C5B08 movs r0, 0xE8 strh r0, [r1, 0x20] -_080C5B08: +@080C5B08: movs r5, 0x1 -_080C5B0A: +@080C5B0A: cmp r5, 0 - bne _080C5B88 + bne @080C5B88 ldr r4, =0x02039cec ldr r0, [r4] ldrb r3, [r0, 0xC] cmp r3, 0 - beq _080C5B5E + beq @080C5B5E ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080C5B5E + beq @080C5B5E cmp r3, 0x3 - bhi _080C5B48 + bhi @080C5B48 movs r0, 0x5 bl audio_play ldr r0, [r4] @@ -373227,36 +373227,36 @@ _080C5B0A: adds r0, r6, 0 bl sub_80C59A4 cmp r0, 0 - bne _080C5BCA - b _080C5B5E + bne @080C5BCA + b @080C5B5E .align 2, 0 .pool -_080C5B48: +@080C5B48: cmp r3, 0x4 - bne _080C5B5E + bne @080C5B5E movs r0, 0x3 bl audio_play ldr r0, =sub_80C5470 + 1 bl set_callback2 adds r0, r6, 0 bl remove_task -_080C5B5E: +@080C5B5E: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080C5BCA + beq @080C5BCA movs r0, 0x3 bl audio_play ldr r0, =sub_80C5470 + 1 bl set_callback2 adds r0, r6, 0 bl remove_task - b _080C5BCA + b @080C5BCA .align 2, 0 .pool -_080C5B88: +@080C5B88: ldr r0, =0x02039cf0 ldr r0, [r0] ldr r1, [r0] @@ -373275,7 +373275,7 @@ _080C5B88: ldr r0, [r4] ldrb r0, [r0, 0xC] cmp r0, r5 - beq _080C5BCA + beq @080C5BCA adds r0, r5, 0 bl sub_80C5ED0 ldr r1, [r4] @@ -373287,7 +373287,7 @@ _080C5B88: ldrb r0, [r1, 0xC] ldrb r1, [r1, 0xD] bl sub_80C6104 -_080C5BCA: +@080C5BCA: pop {r4-r7} pop {r0} bx r0 @@ -373296,7 +373296,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} @@ -373313,25 +373313,25 @@ sub_80C5BD8: @ 80C5BD8 ldr r0, [r7] ldrh r0, [r0, 0x4] cmp r0, 0x1 - beq _080C5CD4 + beq @080C5CD4 cmp r0, 0x1 - bgt _080C5C0C + bgt @080C5C0C cmp r0, 0 - beq _080C5C14 - b _080C5D9C + beq @080C5C14 + b @080C5D9C .align 2, 0 .pool -_080C5C0C: +@080C5C0C: cmp r0, 0x2 - bne _080C5C12 - b _080C5D2A -_080C5C12: - b _080C5D9C -_080C5C14: + bne @080C5C12 + b @080C5D2A +@080C5C12: + b @080C5D9C +@080C5C14: movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 - bne _080C5C4C + bne @080C5C4C movs r0, 0x1 movs r1, 0 bl sub_80C5F58 @@ -373351,10 +373351,10 @@ _080C5C14: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - b _080C5CA4 + b @080C5CA4 .align 2, 0 .pool -_080C5C4C: +@080C5C4C: movs r1, 0xFE lsls r1, 1 adds r0, r1, 0 @@ -373391,7 +373391,7 @@ _080C5C4C: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 -_080C5CA4: +@080C5CA4: ldr r4, =0x02039cf0 ldr r0, [r4] adds r0, 0x2C @@ -373407,10 +373407,10 @@ _080C5CA4: bl sub_8151624 ldr r1, [r4] strh r0, [r1, 0x30] - b _080C5D9C + b @080C5D9C .align 2, 0 .pool -_080C5CD4: +@080C5CD4: bl fade_and_return_progress_probably ldrh r0, [r6, 0x6] ldrh r1, [r6, 0x2] @@ -373434,51 +373434,51 @@ _080C5CD4: movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 - bne _080C5D1C + bne @080C5D1C movs r0, 0x2 ldrsh r1, [r6, r0] movs r0, 0xFE lsls r0, 1 cmp r1, r0 - ble _080C5DA6 - b _080C5D9C + ble @080C5DA6 + b @080C5D9C .align 2, 0 .pool -_080C5D1C: +@080C5D1C: movs r0, 0x2 ldrsh r1, [r6, r0] movs r0, 0x80 lsls r0, 1 cmp r1, r0 - bne _080C5DA6 - b _080C5D9C -_080C5D2A: + bne @080C5DA6 + b @080C5D9C +@080C5D2A: ldr r0, =0x02039cf0 ldr r0, [r0] adds r1, r0, 0 adds r1, 0x2C ldrb r0, [r1] cmp r0, 0 - beq _080C5D3C + beq @080C5D3C movs r0, 0 strb r0, [r1] -_080C5D3C: +@080C5D3C: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne _080C5DA6 + bne @080C5DA6 movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 - bne _080C5D64 + bne @080C5D64 adds r0, r4, 0 bl remove_task ldr r0, =sub_80C5934 + 1 bl set_callback2 - b _080C5D82 + b @080C5D82 .align 2, 0 .pool -_080C5D64: +@080C5D64: movs r0, 0 movs r1, 0 bl sub_80C5F58 @@ -373493,7 +373493,7 @@ _080C5D64: adds r0, r5, r0 ldr r1, =sub_80C5A48 + 1 str r1, [r0] -_080C5D82: +@080C5D82: movs r0, 0x2 movs r1, 0x6 movs r2, 0 @@ -373501,17 +373501,17 @@ _080C5D82: ldr r0, =0x02039cec ldr r1, [r0] movs r0, 0 - b _080C5DA4 + b @080C5DA4 .align 2, 0 .pool -_080C5D9C: +@080C5D9C: ldr r0, =0x02039cec ldr r1, [r0] ldrh r0, [r1, 0x4] adds r0, 0x1 -_080C5DA4: +@080C5DA4: strh r0, [r1, 0x4] -_080C5DA6: +@080C5DA6: add sp, 0x4 pop {r3} mov r8, r3 @@ -373523,13 +373523,13 @@ _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} sub sp, 0xC movs r4, 0 -_080C5DC2: +@080C5DC2: adds r0, r4, 0 bl Window_WriteStandardTileMap adds r0, r4, 0 @@ -373539,7 +373539,7 @@ _080C5DC2: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 - bls _080C5DC2 + bls @080C5DC2 ldr r4, =0x085ed8ff movs r0, 0x1 adds r1, r4, 0 @@ -373622,7 +373622,7 @@ _080C5DC2: ldrb r0, [r0, 0xC] bl sub_80C5ED0 movs r4, 0 -_080C5E92: +@080C5E92: adds r0, r4, 0 movs r1, 0x3 bl Window_CopyToVram @@ -373630,7 +373630,7 @@ _080C5E92: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 - bls _080C5E92 + bls @080C5E92 movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram add sp, 0xC @@ -373644,7 +373644,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 @@ -373653,14 +373653,14 @@ sub_80C5ED0: @ 80C5ED0 movs r1, 0 bl Window_FastFillPixels cmp r4, 0x3 - bne _080C5F18 + bne @080C5F18 ldr r0, =0x02039cec ldr r0, [r0] ldrb r0, [r0, 0xE] movs r1, 0x1 ands r1, r0 cmp r1, 0 - bne _080C5F18 + bne @080C5F18 ldr r0, =0x0857144b str r0, [sp] str r1, [sp, 0x4] @@ -373672,12 +373672,12 @@ sub_80C5ED0: @ 80C5ED0 movs r2, 0x2 movs r3, 0 bl box_print - b _080C5F3A + b @080C5F3A .align 2, 0 .pool -_080C5F18: +@080C5F18: cmp r4, 0 - beq _080C5F3A + beq @080C5F3A ldr r0, =0x0857144b str r0, [sp] movs r0, 0 @@ -373692,7 +373692,7 @@ _080C5F18: movs r2, 0x2 movs r3, 0 bl box_print -_080C5F3A: +@080C5F3A: movs r0, 0x3 movs r1, 0x3 bl Window_CopyToVram @@ -373707,7 +373707,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} @@ -373722,15 +373722,15 @@ sub_80C5F58: @ 80C5F58 lsls r0, 28 lsrs r0, 29 cmp r0, 0x1 - beq _080C5F80 + beq @080C5F80 cmp r0, 0x2 - beq _080C5FC2 - b _080C60EE + beq @080C5FC2 + b @080C60EE .align 2, 0 .pool -_080C5F80: +@080C5F80: cmp r2, 0 - beq _080C5FA8 + beq @080C5FA8 ldr r0, =0x02039cf0 ldr r0, [r0] ldr r1, [r0, 0x20] @@ -373744,10 +373744,10 @@ _080C5F80: movs r2, 0x10 movs r3, 0x3 bl bg_copy_tilemap_rect_simple - b _080C6004 + b @080C6004 .align 2, 0 .pool -_080C5FA8: +@080C5FA8: movs r0, 0xC str r0, [sp] movs r0, 0x7 @@ -373759,10 +373759,10 @@ _080C5FA8: movs r2, 0x10 movs r3, 0x3 bl Bg_FillWramTileMapRectWithTileAndPalette - b _080C6004 -_080C5FC2: + b @080C6004 +@080C5FC2: cmp r2, 0 - beq _080C5FEC + beq @080C5FEC ldr r0, =0x02039cf0 ldr r0, [r0] ldr r1, [r0, 0x20] @@ -373777,10 +373777,10 @@ _080C5FC2: movs r2, 0x10 movs r3, 0xA bl bg_copy_tilemap_rect_simple - b _080C6004 + b @080C6004 .align 2, 0 .pool -_080C5FEC: +@080C5FEC: movs r0, 0xC str r0, [sp] movs r0, 0x7 @@ -373792,11 +373792,11 @@ _080C5FEC: movs r2, 0x10 movs r3, 0xA bl Bg_FillWramTileMapRectWithTileAndPalette -_080C6004: +@080C6004: movs r0, 0x2 bl gpu_copy_wram_bg_tilemap_to_vram cmp r7, 0 - beq _080C6084 + beq @080C6084 movs r4, 0xFE lsls r4, 1 adds r0, r4, 0 @@ -373848,10 +373848,10 @@ _080C6004: str r0, [sp, 0xC] movs r0, 0x2 bl call_gpu_bg_affine_set - b _080C60EE + b @080C60EE .align 2, 0 .pool -_080C6084: +@080C6084: movs r4, 0x80 lsls r4, 1 adds r0, r4, 0 @@ -373902,7 +373902,7 @@ _080C6084: str r7, [sp, 0xC] movs r0, 0x2 bl call_gpu_bg_affine_set -_080C60EE: +@080C60EE: add sp, 0x10 pop {r3} mov r8, r3 @@ -373914,7 +373914,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 @@ -373922,19 +373922,19 @@ sub_80C6104: @ 80C6104 lsls r1, 24 lsrs r5, r1, 24 cmp r5, 0x2 - beq _080C614C + beq @080C614C cmp r5, 0x2 - bgt _080C611E + bgt @080C611E cmp r5, 0x1 - beq _080C6128 - b _080C61C4 -_080C611E: + beq @080C6128 + b @080C61C4 +@080C611E: cmp r5, 0x3 - beq _080C6170 + beq @080C6170 cmp r5, 0x4 - beq _080C61A4 - b _080C61C4 -_080C6128: + beq @080C61A4 + b @080C61C4 +@080C6128: ldr r0, =0x02039cf0 ldr r0, [r0] ldr r1, [r0, 0x24] @@ -373948,10 +373948,10 @@ _080C6128: movs r2, 0x10 movs r3, 0x3 bl bg_copy_tilemap_rect_simple - b _080C61CE + b @080C61CE .align 2, 0 .pool -_080C614C: +@080C614C: ldr r0, =0x02039cf0 ldr r0, [r0] ldr r1, [r0, 0x24] @@ -373966,17 +373966,17 @@ _080C614C: str r0, [sp, 0x8] movs r0, 0x1 movs r2, 0x10 - b _080C6192 + b @080C6192 .align 2, 0 .pool -_080C6170: +@080C6170: ldr r0, =0x02039cec ldr r0, [r0] ldrb r1, [r0, 0xE] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080C61C4 + beq @080C61C4 ldr r0, =0x02039cf0 ldr r0, [r0] ldr r1, [r0, 0x28] @@ -373987,13 +373987,13 @@ _080C6170: str r0, [sp, 0x8] movs r0, 0x1 movs r2, 0x2 -_080C6192: +@080C6192: movs r3, 0xA bl bg_copy_tilemap_rect_simple - b _080C61CE + b @080C61CE .align 2, 0 .pool -_080C61A4: +@080C61A4: ldr r1, =0x08de3350 movs r0, 0x9 str r0, [sp] @@ -374005,30 +374005,30 @@ _080C61A4: movs r2, 0x15 movs r3, 0 bl bg_copy_tilemap_rect_simple - b _080C61CE + b @080C61CE .align 2, 0 .pool -_080C61C4: +@080C61C4: subs r0, r4, 0x1 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bhi _080C6294 -_080C61CE: + bhi @080C6294 +@080C61CE: cmp r4, 0x2 - beq _080C620C + beq @080C620C cmp r4, 0x2 - bgt _080C61DC + bgt @080C61DC cmp r4, 0x1 - beq _080C61E6 - b _080C6284 -_080C61DC: + beq @080C61E6 + b @080C6284 +@080C61DC: cmp r4, 0x3 - beq _080C6230 + beq @080C6230 cmp r4, 0x4 - beq _080C6264 - b _080C6284 -_080C61E6: + beq @080C6264 + b @080C6284 +@080C61E6: ldr r0, =0x02039cf0 ldr r0, [r0] ldr r1, [r0, 0x24] @@ -374043,10 +374043,10 @@ _080C61E6: movs r2, 0x10 movs r3, 0x3 bl bg_copy_tilemap_rect_simple - b _080C628E + b @080C628E .align 2, 0 .pool -_080C620C: +@080C620C: ldr r0, =0x02039cf0 ldr r0, [r0] ldr r1, [r0, 0x24] @@ -374061,17 +374061,17 @@ _080C620C: str r0, [sp, 0x8] movs r0, 0x1 movs r2, 0x10 - b _080C6254 + b @080C6254 .align 2, 0 .pool -_080C6230: +@080C6230: ldr r0, =0x02039cec ldr r0, [r0] ldrb r1, [r0, 0xE] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080C6294 + beq @080C6294 ldr r0, =0x02039cf0 ldr r0, [r0] ldr r1, [r0, 0x28] @@ -374083,13 +374083,13 @@ _080C6230: str r0, [sp, 0x8] movs r0, 0x1 movs r2, 0x2 -_080C6254: +@080C6254: movs r3, 0xA bl bg_copy_tilemap_rect_simple - b _080C628E + b @080C628E .align 2, 0 .pool -_080C6264: +@080C6264: ldr r1, =0x08de3374 movs r0, 0x9 str r0, [sp] @@ -374101,19 +374101,19 @@ _080C6264: movs r2, 0x15 movs r3, 0 bl bg_copy_tilemap_rect_simple - b _080C628E + b @080C628E .align 2, 0 .pool -_080C6284: +@080C6284: subs r0, r5, 0x1 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bhi _080C6294 -_080C628E: + bhi @080C6294 +@080C628E: movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram -_080C6294: +@080C6294: add sp, 0xC pop {r4,r5} pop {r0} @@ -374121,7 +374121,7 @@ _080C6294: thumb_func_end sub_80C6104 thumb_func_start sub_80C629C -sub_80C629C: @ 80C629C +sub_80C629C: ; 80C629C push {r4,lr} ldr r1, =0x08de3060 movs r0, 0x1 @@ -374150,7 +374150,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 @@ -374193,7 +374193,7 @@ sub_80C62DC: @ 80C62DC strb r0, [r1, 0x5] mov r8, sp mov r9, r3 -_080C633C: +@080C633C: ldr r0, =0x02039cec ldr r0, [r0] adds r0, 0xF @@ -374201,7 +374201,7 @@ _080C633C: ldrb r0, [r2] adds r4, r5, 0x1 cmp r0, 0 - beq _080C63C2 + beq @080C63C2 mov r1, sp ldr r0, =0x085715e4 ldm r0!, {r3,r6,r7} @@ -374259,11 +374259,11 @@ _080C633C: ldr r0, [r0] adds r1, r5, 0 bl obj_anim_image_start -_080C63C2: +@080C63C2: lsls r0, r4, 24 lsrs r5, r0, 24 cmp r5, 0x6 - bls _080C633C + bls @080C633C add sp, 0x18 pop {r3,r4} mov r8, r3 @@ -374276,7 +374276,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 @@ -374286,26 +374286,26 @@ sub_80C63FC: @ 80C63FC ldr r0, [r4] str r5, [r0] adds r6, r4, 0 -_080C6410: +@080C6410: ldr r0, [r6] lsls r4, r5, 2 adds r0, 0x4 adds r0, r4 ldr r0, [r0] cmp r0, 0 - beq _080C642C + beq @080C642C bl obj_delete_and_free_tiles ldr r0, [r6] adds r0, 0x4 adds r0, r4 movs r1, 0 str r1, [r0] -_080C642C: +@080C642C: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x6 - bls _080C6410 + bls @080C6410 bl gpu_pal_allocator_reset movs r0, 0x2 bl gpu_tile_obj_free_by_tag @@ -374319,21 +374319,21 @@ _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 ldr r0, [r5] cmp r0, 0 - beq _080C6466 + beq @080C6466 adds r0, r4, 0 bl set_callback2 -_080C6466: +@080C6466: ldr r0, =0x00003014 bl malloc_and_clear str r0, [r5] @@ -374352,7 +374352,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 @@ -374375,49 +374375,49 @@ 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 ldr r0, [r0] ldrh r0, [r0, 0x4] cmp r0, 0x7 - bls _080C64DC - b _080C6694 -_080C64DC: + bls @080C64DC + b @080C6694 +@080C64DC: lsls r0, 2 - ldr r1, =_080C64F0 + ldr r1, =@080C64F0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C64F0: - .4byte _080C6510 - .4byte _080C6520 - .4byte _080C6526 - .4byte _080C6538 - .4byte _080C65C0 - .4byte _080C65E8 - .4byte _080C6628 - .4byte _080C6678 -_080C6510: +@080C64F0: + .4byte @080C6510 + .4byte @080C6520 + .4byte @080C6526 + .4byte @080C6538 + .4byte @080C65C0 + .4byte @080C65E8 + .4byte @080C6628 + .4byte @080C6678 +@080C6510: movs r0, 0 bl SetVBlankCallback bl remove_some_task bl vblank_hblank_handler_set_zero - b _080C6694 -_080C6520: + b @080C6694 +@080C6520: bl sub_80C50D0 - b _080C6694 -_080C6526: + b @080C6694 +@080C6526: bl reset_all_obj_data bl gpu_pal_allocator_reset bl sub_80A1A74 bl reset_temp_tile_data_buffers - b _080C6694 -_080C6538: + b @080C6694 +@080C6538: movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags ldr r1, =0x085713f4 @@ -374466,10 +374466,10 @@ _080C6538: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram - b _080C6618 + b @080C6618 .align 2, 0 .pool -_080C65C0: +@080C65C0: ldr r0, =0x08571428 bl Window_InitFromTemplates bl TextBox_ResetSomeField @@ -374481,14 +374481,14 @@ _080C65C0: movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - b _080C6694 + b @080C6694 .align 2, 0 .pool -_080C65E8: +@080C65E8: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - bne _080C669E + bne @080C669E ldr r0, =0x08de07c8 movs r2, 0xD0 lsls r2, 1 @@ -374504,13 +374504,13 @@ _080C65E8: movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map -_080C6618: +@080C6618: movs r0, 0x2 bl gpu_copy_wram_bg_tilemap_to_vram - b _080C6694 + b @080C6694 .align 2, 0 .pool -_080C6628: +@080C6628: movs r1, 0x82 lsls r1, 5 movs r0, 0 @@ -374537,31 +374537,31 @@ _080C6628: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - b _080C6694 + b @080C6694 .align 2, 0 .pool -_080C6678: +@080C6678: bl fade_and_return_progress_probably lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _080C669E + bne @080C669E ldr r0, =0x02039cec ldr r0, [r0] strh r1, [r0, 0x4] movs r0, 0x1 - b _080C66A0 + b @080C66A0 .align 2, 0 .pool -_080C6694: +@080C6694: ldr r0, =0x02039cec ldr r1, [r0] ldrh r0, [r1, 0x4] adds r0, 0x1 strh r0, [r1, 0x4] -_080C669E: +@080C669E: movs r0, 0 -_080C66A0: +@080C66A0: add sp, 0x8 pop {r4,r5} pop {r1} @@ -374571,30 +374571,30 @@ _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 ldr r0, [r0] ldrh r0, [r0, 0x4] cmp r0, 0x5 - bhi _080C67A4 + bhi @080C67A4 lsls r0, 2 - ldr r1, =_080C66CC + ldr r1, =@080C66CC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C66CC: - .4byte _080C66E4 - .4byte _080C66FC - .4byte _080C6722 - .4byte _080C6732 - .4byte _080C6774 - .4byte _080C6782 -_080C66E4: +@080C66CC: + .4byte @080C66E4 + .4byte @080C66FC + .4byte @080C6722 + .4byte @080C6732 + .4byte @080C6774 + .4byte @080C6782 +@080C66E4: movs r0, 0x1 negs r0, r0 ldr r1, =0x00007fff @@ -374603,14 +374603,14 @@ _080C66E4: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - b _080C67A4 + b @080C67A4 .align 2, 0 .pool -_080C66FC: +@080C66FC: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne _080C67AE + bne @080C67AE movs r0, 0 movs r1, 0 bl lcd_io_set @@ -374620,49 +374620,49 @@ _080C66FC: bl gpu_sync_bg_hide movs r0, 0x2 bl gpu_sync_bg_hide - b _080C67A4 -_080C6722: + b @080C67A4 +@080C6722: movs r0, 0 bl SetVBlankCallback bl remove_some_task bl vblank_hblank_handler_set_zero - b _080C67A4 -_080C6732: + b @080C67A4 +@080C6732: ldr r4, =0x02039cf4 ldr r0, [r4] ldr r0, [r0, 0x4] cmp r0, 0 - beq _080C6746 + beq @080C6746 bl obj_delete_and_free_tiles movs r0, 0 bl gpu_tile_obj_free_by_tag -_080C6746: +@080C6746: ldr r0, [r4] ldr r0, [r0, 0xC] cmp r0, 0 - beq _080C6758 + beq @080C6758 bl obj_delete_and_free_tiles movs r0, 0x1 bl gpu_tile_obj_free_by_tag -_080C6758: +@080C6758: ldr r0, [r4] ldr r0, [r0, 0x8] cmp r0, 0 - beq _080C676A + beq @080C676A bl obj_delete_and_free_tiles movs r0, 0x4 bl gpu_tile_obj_free_by_tag -_080C676A: +@080C676A: bl Window_FreeMemory - b _080C67A4 + b @080C67A4 .align 2, 0 .pool -_080C6774: +@080C6774: bl sub_80C50D0 bl reset_all_obj_data bl gpu_pal_allocator_reset - b _080C67A4 -_080C6782: + b @080C67A4 +@080C6782: movs r0, 0 bl bg_unset_tilemap movs r0, 0x1 @@ -374674,18 +374674,18 @@ _080C6782: movs r0, 0 strh r0, [r1, 0x4] movs r0, 0x1 - b _080C67B0 + b @080C67B0 .align 2, 0 .pool -_080C67A4: +@080C67A4: ldr r0, =0x02039cec ldr r1, [r0] ldrh r0, [r1, 0x4] adds r0, 0x1 strh r0, [r1, 0x4] -_080C67AE: +@080C67AE: movs r0, 0 -_080C67B0: +@080C67B0: add sp, 0x4 pop {r4} pop {r1} @@ -374695,7 +374695,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 @@ -374707,146 +374707,146 @@ sub_80C67BC: @ 80C67BC movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0x5 - bls _080C67D6 - b _080C68DA -_080C67D6: + bls @080C67D6 + b @080C68DA +@080C67D6: lsls r0, 2 - ldr r1, =_080C67E8 + ldr r1, =@080C67E8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C67E8: - .4byte _080C6800 - .4byte _080C6806 - .4byte _080C686C - .4byte _080C6894 - .4byte _080C68C4 - .4byte _080C68CE -_080C6800: +@080C67E8: + .4byte @080C6800 + .4byte @080C6806 + .4byte @080C686C + .4byte @080C6894 + .4byte @080C68C4 + .4byte @080C68CE +@080C6800: bl sub_80C64CC - b _080C68C8 -_080C6806: + b @080C68C8 +@080C6806: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r2, 0x2 adds r0, r2, 0 ands r0, r1 cmp r0, 0 - beq _080C6824 + beq @080C6824 movs r0, 0x3 bl audio_play movs r0, 0x4 - b _080C68DE + b @080C68DE .align 2, 0 .pool -_080C6824: +@080C6824: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080C6848 + beq @080C6848 ldr r0, =0x02039cf4 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0x5 - bls _080C6844 + bls @080C6844 movs r0, 0 bl sub_80C6C70 - b _080C68E0 + b @080C68E0 .align 2, 0 .pool -_080C6844: +@080C6844: strh r2, [r4] - b _080C68E0 -_080C6848: + b @080C68E0 +@080C6848: movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _080C68E0 + beq @080C68E0 ldr r0, =0x02039cf4 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0 - bne _080C6868 + bne @080C6868 movs r0, 0x1 bl sub_80C6C70 - b _080C68E0 + b @080C68E0 .align 2, 0 .pool -_080C6868: +@080C6868: movs r0, 0x3 - b _080C68DE -_080C686C: + b @080C68DE +@080C686C: movs r1, 0x2 ldrsh r0, [r4, r1] cmp r0, 0x3 - ble _080C6882 + ble @080C6882 movs r0, 0 bl sub_80C6C70 movs r0, 0 strh r0, [r4, 0x2] movs r0, 0x1 - b _080C68DE -_080C6882: + b @080C68DE +@080C6882: ldr r0, =0x02039cf4 ldr r0, [r0] ldr r1, [r0, 0x4] ldrh r0, [r1, 0x22] adds r0, 0x4 - b _080C68B4 + b @080C68B4 .align 2, 0 .pool -_080C6894: +@080C6894: movs r1, 0x2 ldrsh r0, [r4, r1] cmp r0, 0x3 - ble _080C68AA + ble @080C68AA movs r0, 0x1 bl sub_80C6C70 movs r0, 0 strh r0, [r4, 0x2] movs r0, 0x1 - b _080C68DE -_080C68AA: + b @080C68DE +@080C68AA: ldr r0, =0x02039cf4 ldr r0, [r0] ldr r1, [r0, 0x4] ldrh r0, [r1, 0x22] subs r0, 0x4 -_080C68B4: +@080C68B4: strh r0, [r1, 0x22] ldrh r0, [r4, 0x2] adds r0, 0x1 strh r0, [r4, 0x2] - b _080C68E0 + b @080C68E0 .align 2, 0 .pool -_080C68C4: +@080C68C4: bl sub_80C66AC -_080C68C8: +@080C68C8: cmp r0, 0 - bne _080C68DA - b _080C68E0 -_080C68CE: + bne @080C68DA + b @080C68E0 +@080C68CE: adds r0, r2, 0 bl remove_task bl sub_80C6498 - b _080C68E0 -_080C68DA: + b @080C68E0 +@080C68DA: ldrh r0, [r4] adds r0, 0x1 -_080C68DE: +@080C68DE: strh r0, [r4] -_080C68E0: +@080C68E0: pop {r4} pop {r0} bx r0 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 @@ -374854,81 +374854,81 @@ sub_80C68E8: @ 80C68E8 adds r0, r2 lsrs r0, 16 cmp r0, 0x3 - bls _080C6904 + bls @080C6904 adds r0, r1, 0 subs r0, 0xF lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - bhi _080C690C -_080C6904: + bhi @080C690C +@080C6904: movs r0, 0x1 - b _080C696E + b @080C696E .align 2, 0 .pool -_080C690C: +@080C690C: adds r0, r1, 0 subs r0, 0x12 lsls r0, 16 lsrs r0, 16 cmp r0, 0x3 - bhi _080C691C + bhi @080C691C movs r0, 0x2 - b _080C696E -_080C691C: + b @080C696E +@080C691C: adds r0, r1, 0 subs r0, 0x16 lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - bhi _080C692C + bhi @080C692C movs r0, 0x3 - b _080C696E -_080C692C: + b @080C696E +@080C692C: adds r0, r1, 0 subs r0, 0x1C lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - bhi _080C693C + bhi @080C693C movs r0, 0x4 - b _080C696E -_080C693C: + b @080C696E +@080C693C: adds r0, r1, 0 subs r0, 0x1F lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - bhi _080C694C + bhi @080C694C movs r0, 0x5 - b _080C696E -_080C694C: + b @080C696E +@080C694C: adds r0, r1, 0 subs r0, 0x22 lsls r0, 16 lsrs r0, 16 cmp r0, 0x5 - bhi _080C695C + bhi @080C695C movs r0, 0x6 - b _080C696E -_080C695C: + b @080C696E +@080C695C: adds r0, r1, 0 subs r0, 0x19 lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - bls _080C696C + bls @080C696C movs r0, 0 - b _080C696E -_080C696C: + b @080C696E +@080C696C: movs r0, 0x7 -_080C696E: +@080C696E: pop {r1} bx r1 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 @@ -375018,21 +375018,21 @@ sub_80C6974: @ 80C6974 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3A - beq _080C6A40 + beq @080C6A40 cmp r5, 0xCA - beq _080C6A40 - b _080C6B7A -_080C6A40: + beq @080C6A40 + b @080C6B7A +@080C6A40: ldr r4, =0x03005d8c ldr r2, [r4] movs r0, 0x5 ldrsb r0, [r2, r0] cmp r0, 0x4 - beq _080C6A52 + beq @080C6A52 cmp r0, 0xE - bne _080C6A98 + bne @080C6A98 movs r7, 0x37 -_080C6A52: +@080C6A52: lsls r0, r7, 16 asrs r0, 16 ldrh r6, [r2] @@ -375041,38 +375041,38 @@ _080C6A52: lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _080C6A66 + bge @080C6A66 adds r0, 0x7 -_080C6A66: +@080C6A66: lsls r0, 13 lsrs r7, r0, 16 lsls r0, r4, 16 asrs r0, 16 cmp r0, 0 - bge _080C6A74 + bge @080C6A74 adds r0, 0x7 -_080C6A74: +@080C6A74: lsls r0, 13 lsrs r4, r0, 16 movs r5, 0 - b _080C6AF2 + b @080C6AF2 .align 2, 0 .pool -_080C6A98: +@080C6A98: lsls r0, 16 lsrs r0, 16 bl sub_80C68E8 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - beq _080C6AB4 + beq @080C6AB4 subs r0, r5, 0x1 lsls r0, 4 adds r0, r6 ldrh r7, [r0, 0x8] ldrh r4, [r0, 0xA] - b _080C6AF2 -_080C6AB4: + b @080C6AF2 +@080C6AB4: ldr r1, [r4] adds r0, r1, 0 adds r0, 0x25 @@ -375080,35 +375080,35 @@ _080C6AB4: lsls r0, 24 asrs r0, 24 cmp r0, 0xE - bne _080C6ACE + bne @080C6ACE ldrh r0, [r1, 0x28] adds r0, 0x37 lsls r0, 16 lsrs r7, r0, 16 - b _080C6AD0 -_080C6ACE: + b @080C6AD0 +@080C6ACE: ldrh r7, [r1, 0x28] -_080C6AD0: +@080C6AD0: ldr r0, =0x03005d8c ldr r0, [r0] ldrh r4, [r0, 0x2A] lsls r0, r7, 16 asrs r0, 16 cmp r0, 0 - bge _080C6AE0 + bge @080C6AE0 adds r0, 0x7 -_080C6AE0: +@080C6AE0: lsls r0, 13 lsrs r7, r0, 16 lsls r0, r4, 16 asrs r0, 16 cmp r0, 0 - bge _080C6AEE + bge @080C6AEE adds r0, 0x7 -_080C6AEE: +@080C6AEE: lsls r0, 13 lsrs r4, r0, 16 -_080C6AF2: +@080C6AF2: ldr r0, =0x085714d4 bl gpu_tile_obj_decompress_and_load mov r1, sp @@ -375124,14 +375124,14 @@ _080C6AF2: adds r0, 0x4 strh r0, [r1, 0x2] cmp r5, 0 - beq _080C6B2C + beq @080C6B2C lsls r1, r7, 16 asrs r1, 16 lsls r2, r4, 16 - b _080C6B3E + b @080C6B3E .align 2, 0 .pool -_080C6B2C: +@080C6B2C: lsls r1, r7, 19 lsls r2, r4, 19 movs r0, 0xA0 @@ -375141,7 +375141,7 @@ _080C6B2C: movs r3, 0x90 lsls r3, 14 adds r2, r3 -_080C6B3E: +@080C6B3E: asrs r2, 16 mov r0, sp movs r3, 0 @@ -375165,12 +375165,12 @@ _080C6B3E: ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - beq _080C6B7A + beq @080C6B7A ldr r0, [r4] ldr r0, [r0, 0x8] movs r1, 0x1 bl obj_anim_image_start -_080C6B7A: +@080C6B7A: add sp, 0x18 pop {r3,r4} mov r8, r3 @@ -375183,11 +375183,11 @@ _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 -_080C6B9A: +@080C6B9A: adds r0, r4, 0 bl Window_WriteStandardTileMap adds r0, r4, 0 @@ -375197,16 +375197,16 @@ _080C6B9A: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _080C6B9A + bls @080C6B9A movs r4, 0 movs r6, 0 ldr r5, =0x08571650 -_080C6BB8: +@080C6BB8: ldr r0, =0x02039cf4 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r4, r0 - bne _080C6BF0 + bne @080C6BF0 lsls r1, r4, 4 adds r3, r1, 0x1 lsls r3, 24 @@ -375221,10 +375221,10 @@ _080C6BB8: movs r1, 0x7 movs r2, 0x4 bl box_print - b _080C6C0E + b @080C6C0E .align 2, 0 .pool -_080C6BF0: +@080C6BF0: lsls r1, r4, 4 adds r3, r1, 0x1 lsls r3, 24 @@ -375239,12 +375239,12 @@ _080C6BF0: movs r1, 0x7 movs r2, 0x4 bl box_print -_080C6C0E: +@080C6C0E: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x6 - bls _080C6BB8 + bls @080C6BB8 ldr r0, =0x08571448 str r0, [sp] movs r0, 0 @@ -375264,7 +375264,7 @@ _080C6C0E: movs r3, 0 bl box_print movs r4, 0 -_080C6C40: +@080C6C40: adds r0, r4, 0 movs r1, 0x3 bl Window_CopyToVram @@ -375272,7 +375272,7 @@ _080C6C40: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _080C6C40 + bls @080C6C40 movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram add sp, 0xC @@ -375284,27 +375284,27 @@ _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} sub sp, 0xC lsls r0, 24 cmp r0, 0 - beq _080C6C8C + beq @080C6C8C ldr r0, =0x02039cf4 ldr r4, [r0] ldrb r5, [r4, 0x10] adds r0, r5, 0x6 - b _080C6C94 + b @080C6C94 .align 2, 0 .pool -_080C6C8C: +@080C6C8C: ldr r0, =0x02039cf4 ldr r4, [r0] ldrb r5, [r4, 0x10] adds r0, r5, 0x1 -_080C6C94: +@080C6C94: movs r1, 0x7 bl __modsi3 strb r0, [r4, 0x10] @@ -375390,7 +375390,7 @@ _080C6C94: movs r3, 0 bl box_print movs r4, 0 -_080C6D4A: +@080C6D4A: adds r0, r4, 0 movs r1, 0x3 bl Window_CopyToVram @@ -375398,7 +375398,7 @@ _080C6D4A: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _080C6D4A + bls @080C6D4A movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x6C @@ -375414,7 +375414,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 @@ -375471,15 +375471,15 @@ sub_80C6D80: @ 80C6D80 mov r8, r0 ldr r1, [sp, 0x28] cmp r1, 0 - bne _080C6E04 + bne @080C6E04 add r0, sp, 0x14 - b _080C6E08 + b @080C6E08 .align 2, 0 .pool -_080C6E04: +@080C6E04: add r0, sp, 0x14 mov r1, r9 -_080C6E08: +@080C6E08: strb r1, [r0] add r1, sp, 0x14 movs r2, 0 @@ -375504,15 +375504,15 @@ _080C6E08: ldr r0, [sp, 0x4C] mov r10, r4 cmp r0, 0x6 - bls _080C6E3E + bls @080C6E3E movs r0, 0x6 -_080C6E3E: +@080C6E3E: ldr r4, [sp, 0x4C] subs r4, 0x6 cmp r0, 0 - ble _080C6E70 + ble @080C6E70 adds r5, r0, 0 -_080C6E48: +@080C6E48: adds r0, r6, 0 adds r1, r7, 0 movs r2, 0x40 @@ -375530,10 +375530,10 @@ _080C6E48: adds r7, r0 subs r5, 0x1 cmp r5, 0 - bne _080C6E48 -_080C6E70: + bne @080C6E48 +@080C6E70: cmp r4, 0 - ble _080C6E90 + ble @080C6E90 add r0, sp, 0x18 mov r2, r9 lsls r1, r2, 4 @@ -375547,7 +375547,7 @@ _080C6E70: orrs r2, r1 adds r1, r7, 0 bl CpuSet -_080C6E90: +@080C6E90: mov r1, r10 lsrs r0, r1, 24 bl Window_Remove @@ -375564,7 +375564,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 @@ -375680,29 +375680,29 @@ 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 movs r4, 0 movs r5, 0 -_080C6FAA: +@080C6FAA: lsls r1, r4, 24 lsrs r1, 24 adds r0, r6, 0 movs r2, 0xB bl get_pokemon_data_from_any_box cmp r0, 0 - beq _080C6FC0 + beq @080C6FC0 adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 -_080C6FC0: +@080C6FC0: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x1D - bls _080C6FAA + bls @080C6FAA lsls r0, r5, 24 lsrs r0, 24 pop {r4-r6} @@ -375711,42 +375711,42 @@ _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 movs r4, 0 -_080C6FDC: +@080C6FDC: lsls r1, r4, 24 lsrs r1, 24 adds r0, r5, 0 movs r2, 0xB bl get_pokemon_data_from_any_box cmp r0, 0 - bne _080C6FF2 + bne @080C6FF2 lsls r0, r4, 16 asrs r0, 16 - b _080C7000 -_080C6FF2: + b @080C7000 +@080C6FF2: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x1D - bls _080C6FDC + bls @080C6FDC movs r0, 0x1 negs r0, r0 -_080C7000: +@080C7000: pop {r4,r5} pop {r1} bx r1 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 -_080C700E: +@080C700E: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -375756,21 +375756,21 @@ _080C700E: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _080C7036 + beq @080C7036 adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _080C7036 + bne @080C7036 adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 -_080C7036: +@080C7036: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x5 - bls _080C700E + bls @080C700E lsls r0, r6, 24 lsrs r0, 24 pop {r4-r6} @@ -375781,15 +375781,15 @@ _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 movs r6, 0 lsrs r7, r0, 24 -_080C705A: +@080C705A: cmp r5, r7 - beq _080C7092 + beq @080C7092 movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -375799,26 +375799,26 @@ _080C705A: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _080C7092 + beq @080C7092 adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _080C7092 + bne @080C7092 adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _080C7092 + beq @080C7092 adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 -_080C7092: +@080C7092: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x5 - bls _080C705A + bls @080C705A lsls r0, r6, 24 lsrs r0, 24 pop {r4-r7} @@ -375829,7 +375829,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] @@ -375843,11 +375843,11 @@ 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 -_080C70CA: +@080C70CA: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -375855,16 +375855,16 @@ _080C70CA: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _080C70E2 + beq @080C70E2 adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 -_080C70E2: +@080C70E2: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x5 - bls _080C70CA + bls @080C70CA lsls r0, r5, 24 lsrs r0, 24 pop {r4,r5} @@ -375875,7 +375875,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 @@ -375884,14 +375884,14 @@ sub_80C70FC: @ 80C70FC adds r1, r0, 0 adds r5, r4 cmp r1, r5 - bcs _080C711A + bcs @080C711A movs r0, 0 -_080C7112: +@080C7112: strb r0, [r1] adds r1, 0x1 cmp r1, r5 - bcc _080C7112 -_080C711A: + bcc @080C7112 +@080C711A: movs r0, 0xFF strb r0, [r1] adds r0, r1, 0 @@ -375901,7 +375901,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 @@ -375940,12 +375940,12 @@ sub_80C7128: @ 80C7128 adds r7, r0 movs r4, 0 cmp r4, r8 - bcs _080C7198 + bcs @080C7198 mov r0, r9 lsrs r0, 1 mov r9, r0 lsls r5, r3, 1 -_080C717E: +@080C717E: adds r0, r7, 0 adds r1, r6, 0 mov r3, r9 @@ -375957,8 +375957,8 @@ _080C717E: lsls r0, 16 lsrs r4, r0, 16 cmp r4, r8 - bcc _080C717E -_080C7198: + bcc @080C717E +@080C7198: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -375968,7 +375968,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 @@ -375992,7 +375992,7 @@ sub_80C71A4: @ 80C71A4 str r0, [sp, 0x4] movs r0, 0 cmp r0, r10 - bcs _080C724E + bcs @080C724E movs r6, 0x80 lsls r6, 5 mov r5, sp @@ -376004,7 +376004,7 @@ sub_80C71A4: @ 80C71A4 lsls r2, 24 orrs r1, r2 mov r9, r1 -_080C71EA: +@080C71EA: adds r3, r4, 0 ldr r2, [sp, 0x4] movs r1, 0x40 @@ -376013,7 +376013,7 @@ _080C71EA: adds r0, 0x1 mov r12, r0 cmp r2, r6 - bhi _080C7214 + bhi @080C7214 movs r0, 0 strh r0, [r5] mov r2, sp @@ -376022,10 +376022,10 @@ _080C71EA: mov r0, r9 str r0, [r7, 0x8] ldr r0, [r7, 0x8] - b _080C7242 + b @080C7242 .align 2, 0 .pool -_080C7214: +@080C7214: movs r4, 0 strh r4, [r5] ldr r1, =0x040000d4 @@ -376038,7 +376038,7 @@ _080C7214: adds r3, r6 subs r2, r6 cmp r2, r6 - bhi _080C7214 + bhi @080C7214 strh r4, [r5] mov r0, sp str r0, [r1] @@ -376049,14 +376049,14 @@ _080C7214: orrs r0, r2 str r0, [r1, 0x8] ldr r0, [r1, 0x8] -_080C7242: +@080C7242: mov r4, r8 mov r1, r12 lsls r0, r1, 16 lsrs r0, 16 cmp r0, r10 - bcc _080C71EA -_080C724E: + bcc @080C71EA +@080C724E: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -376070,7 +376070,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 @@ -376083,24 +376083,24 @@ c3_0808C39C: @ 80C7268 movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0x4 - bls _080C7284 - b _080C756A -_080C7284: + bls @080C7284 + b @080C756A +@080C7284: lsls r0, 2 - ldr r1, =_080C7298 + ldr r1, =@080C7298 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C7298: - .4byte _080C72AC - .4byte _080C730C - .4byte _080C7320 - .4byte _080C746A - .4byte _080C7544 -_080C72AC: +@080C7298: + .4byte @080C72AC + .4byte @080C730C + .4byte @080C7320 + .4byte @080C746A + .4byte @080C7544 +@080C72AC: ldrb r0, [r5, 0xA] adds r1, r5, 0 adds r1, 0x26 @@ -376139,21 +376139,21 @@ _080C72AC: lsrs r0, 24 movs r1, 0x3 bl Window_CopyToVram - b _080C7318 + b @080C7318 .align 2, 0 .pool -_080C730C: +@080C730C: bl sub_80ABDFC lsls r0, 24 cmp r0, 0 - bne _080C7318 - b _080C756A -_080C7318: + bne @080C7318 + b @080C756A +@080C7318: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] - b _080C756A -_080C7320: + b @080C756A +@080C7320: bl ProcessMenuInput lsls r0, 24 asrs r0, 24 @@ -376163,18 +376163,18 @@ _080C7320: movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _080C73D0 + beq @080C73D0 cmp r1, r0 - bgt _080C7342 + bgt @080C7342 subs r0, 0x1 cmp r1, r0 - beq _080C7348 - b _080C73F6 -_080C7342: + beq @080C7348 + b @080C73F6 +@080C7342: cmp r1, 0x4 - beq _080C73D0 - b _080C73F6 -_080C7348: + beq @080C73D0 + b @080C73F6 +@080C7348: ldrh r3, [r5, 0xA] strh r3, [r5, 0xE] ldr r2, =0x030022c0 @@ -376182,39 +376182,39 @@ _080C7348: movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _080C7366 + beq @080C7366 subs r0, r3, 0x1 strh r0, [r5, 0xE] lsls r0, 16 cmp r0, 0 - bge _080C7366 + bge @080C7366 movs r0, 0x4 strh r0, [r5, 0xE] -_080C7366: +@080C7366: ldrh r1, [r2, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080C7382 + beq @080C7382 ldrh r0, [r5, 0xE] adds r0, 0x1 strh r0, [r5, 0xE] lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _080C7382 + ble @080C7382 movs r0, 0 strh r0, [r5, 0xE] -_080C7382: +@080C7382: lsls r0, r3, 16 asrs r0, 16 ldrh r2, [r5, 0xE] movs r3, 0xE ldrsh r1, [r5, r3] cmp r0, r1 - bne _080C7392 - b _080C756A -_080C7392: + bne @080C7392 + b @080C756A +@080C7392: movs r4, 0 strh r2, [r5, 0xA] movs r0, 0 @@ -376238,10 +376238,10 @@ _080C7392: movs r1, 0x1 movs r3, 0 bl text_box_related_one - b _080C756A + b @080C756A .align 2, 0 .pool -_080C73D0: +@080C73D0: ldrh r0, [r5, 0x26] lsls r0, 24 lsrs r0, 24 @@ -376255,17 +376255,17 @@ _080C73D0: bl Window_Remove adds r0, r4, 0 bl remove_task - b _080C756A -_080C73F6: + b @080C756A +@080C73F6: movs r3, 0xC ldrsh r4, [r5, r3] cmp r4, 0 - bne _080C7428 + bne @080C7428 bl sub_80C70C4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x6 - bne _080C7428 + bne @080C7428 movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels @@ -376277,19 +376277,19 @@ _080C73F6: str r0, [sp, 0x8] movs r4, 0x3 str r4, [sp, 0xC] - b _080C7532 + b @080C7532 .align 2, 0 .pool -_080C7428: +@080C7428: movs r1, 0xC ldrsh r0, [r5, r1] cmp r0, 0x1 - bne _080C745C + bne @080C745C bl sub_80C70C4 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bne _080C745C + bne @080C745C movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels @@ -376301,24 +376301,24 @@ _080C7428: str r4, [sp, 0x8] movs r4, 0x3 str r4, [sp, 0xC] - b _080C7532 + b @080C7532 .align 2, 0 .pool -_080C745C: +@080C745C: movs r0, 0x1 movs r1, 0 bl fade_screen movs r0, 0x4 strh r0, [r5, 0x8] - b _080C756A -_080C746A: + b @080C756A +@080C746A: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r7, 0x3 adds r4, r7, 0 ands r4, r1 cmp r4, 0 - beq _080C749C + beq @080C749C movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels @@ -376331,25 +376331,25 @@ _080C746A: ldr r2, [r0] movs r0, 0 str r0, [sp] - b _080C7528 + b @080C7528 .align 2, 0 .pool -_080C749C: +@080C749C: movs r0, 0x40 ands r0, r1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0 - beq _080C74E8 + beq @080C74E8 ldrh r0, [r5, 0xA] subs r0, 0x1 strh r0, [r5, 0xA] lsls r0, 16 cmp r0, 0 - bge _080C74B8 + bge @080C74B8 movs r0, 0x4 strh r0, [r5, 0xA] -_080C74B8: +@080C74B8: movs r0, 0x1 negs r0, r0 bl MoveMenuCursor @@ -376368,23 +376368,23 @@ _080C74B8: adds r0, r1 ldr r2, [r0] str r4, [sp] - b _080C7528 + b @080C7528 .align 2, 0 .pool -_080C74E8: +@080C74E8: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080C756A + beq @080C756A ldrh r0, [r5, 0xA] adds r0, 0x1 strh r0, [r5, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble _080C7500 + ble @080C7500 strh r6, [r5, 0xA] -_080C7500: +@080C7500: movs r0, 0x1 bl MoveMenuCursor bl GetMenuCursorPos @@ -376402,28 +376402,28 @@ _080C7500: adds r0, r1 ldr r2, [r0] str r6, [sp] -_080C7528: +@080C7528: movs r4, 0x2 str r4, [sp, 0x4] movs r0, 0x1 str r0, [sp, 0x8] str r7, [sp, 0xC] -_080C7532: +@080C7532: movs r0, 0 movs r1, 0x1 movs r3, 0 bl text_box_related_one strh r4, [r5, 0x8] - b _080C756A + b @080C756A .align 2, 0 .pool -_080C7544: +@080C7544: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080C756A + bne @080C756A bl overworld_free_bg_tilemaps ldrb r0, [r5, 0xC] bl sub_80C7D74 @@ -376433,7 +376433,7 @@ _080C7544: bl Window_Remove adds r0, r4, 0 bl remove_task -_080C756A: +@080C756A: add sp, 0x10 pop {r4-r7} pop {r0} @@ -376443,7 +376443,7 @@ _080C756A: thumb_func_end c3_0808C39C thumb_func_start sub_80C7578 -sub_80C7578: @ 80C7578 +sub_80C7578: ; 80C7578 push {lr} ldr r0, =c3_0808C39C + 1 movs r1, 0x50 @@ -376466,7 +376466,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] @@ -376500,7 +376500,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 @@ -376557,7 +376557,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 @@ -376574,7 +376574,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} @@ -376588,14 +376588,14 @@ sub_80C76A4: @ 80C76A4 adds r4, r3, 0 ldr r2, =0x0000ffff cmp r3, 0x1 - bhi _080C76C6 + bhi @080C76C6 movs r2, 0x1 cmp r3, 0x1 - beq _080C76CA -_080C76C6: + beq @080C76CA +@080C76C6: cmp r4, 0x3 - bne _080C7714 -_080C76CA: + bne @080C7714 +@080C76CA: lsls r0, 24 asrs r0, 24 lsls r2, 16 @@ -376605,10 +376605,10 @@ _080C76CA: asrs r1, r0, 16 adds r6, r2, 0 cmp r1, 0 - blt _080C7760 + blt @080C7760 cmp r1, r7 - bgt _080C7760 -_080C76E2: + bgt @080C7760 +@080C76E2: asrs r4, r0, 16 lsls r0, r4, 2 adds r0, r4 @@ -376617,25 +376617,25 @@ _080C76E2: movs r1, 0xB bl pokemon_getattr_encrypted cmp r0, 0 - bne _080C770C + bne @080C770C asrs r0, r6, 16 adds r0, r4, r0 lsls r0, 16 asrs r2, r0, 16 cmp r2, 0 - blt _080C7760 + blt @080C7760 cmp r2, r7 - ble _080C76E2 - b _080C7760 + ble @080C76E2 + b @080C7760 .align 2, 0 .pool -_080C770C: +@080C770C: adds r0, r4, 0 - b _080C7764 -_080C7710: + b @080C7764 +@080C7710: adds r0, r5, 0 - b _080C7764 -_080C7714: + b @080C7764 +@080C7714: lsls r0, 24 asrs r0, 24 lsls r2, 16 @@ -376645,10 +376645,10 @@ _080C7714: asrs r1, r0, 16 adds r6, r2, 0 cmp r1, 0 - blt _080C7760 + blt @080C7760 cmp r1, r7 - bgt _080C7760 -_080C772C: + bgt @080C7760 +@080C772C: asrs r5, r0, 16 lsls r0, r5, 2 adds r0, r5 @@ -376659,25 +376659,25 @@ _080C772C: movs r1, 0xB bl pokemon_getattr_encrypted cmp r0, 0 - beq _080C7750 + beq @080C7750 adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr_encrypted cmp r0, 0 - beq _080C7710 -_080C7750: + beq @080C7710 +@080C7750: asrs r0, r6, 16 adds r0, r5, r0 lsls r0, 16 asrs r2, r0, 16 cmp r2, 0 - blt _080C7760 + blt @080C7760 cmp r2, r7 - ble _080C772C -_080C7760: + ble @080C772C +@080C7760: movs r0, 0x1 negs r0, r0 -_080C7764: +@080C7764: pop {r3} mov r8, r3 pop {r4-r7} @@ -376686,15 +376686,15 @@ _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 movs r5, 0 -_080C777A: +@080C777A: movs r4, 0 lsls r6, r5, 24 -_080C777E: +@080C777E: lsls r1, r4, 24 lsrs r1, 24 lsrs r0, r6, 24 @@ -376703,14 +376703,14 @@ _080C777E: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x1D - bls _080C777E + bls @080C777E adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0xD - bls _080C777A + bls @080C777A movs r5, 0 -_080C779E: +@080C779E: lsls r0, r5, 24 lsrs r0, 24 bl sav3_get_box_name @@ -376724,9 +376724,9 @@ _080C779E: lsls r4, 16 lsrs r5, r4, 16 cmp r5, 0xD - bls _080C779E + bls @080C779E movs r5, 0 -_080C77C2: +@080C77C2: lsls r0, r5, 24 lsrs r0, 24 movs r1, 0x3 @@ -376736,7 +376736,7 @@ _080C77C2: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0xD - bls _080C77C2 + bls @080C77C2 bl sub_80D242C pop {r4-r6} pop {r0} @@ -376746,7 +376746,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} @@ -376789,10 +376789,10 @@ sub_80C77E8: @ 80C77E8 bl memset ldr r0, [sp, 0x38] cmp r0, 0 - beq _080C7846 + beq @080C7846 adds r0, r4, 0 bl gpu_pal_obj_alloc_tag_and_apply -_080C7846: +@080C7846: mov r0, sp bl gpu_tile_obj_alloc_and_load_multiple ldr r0, =0x02039d04 @@ -376824,7 +376824,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] @@ -376833,12 +376833,12 @@ sub_80C7890: @ 80C7890 adds r0, r1, r2 ldr r0, [r0] cmp r0, 0 - beq _080C78AC + beq @080C78AC adds r2, 0x6 adds r0, r1, r2 ldrh r0, [r0] bl gpu_pal_free_tag -_080C78AC: +@080C78AC: ldr r0, [r5] movs r4, 0x90 lsls r4, 2 @@ -376860,7 +376860,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 @@ -376870,7 +376870,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} @@ -376878,25 +376878,25 @@ 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] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080C790C + beq @080C790C movs r0, 0x5 bl audio_play movs r0, 0xC9 - b _080C7954 + b @080C7954 .align 2, 0 .pool -_080C790C: +@080C790C: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080C792C + beq @080C792C movs r0, 0x5 bl audio_play ldr r0, =0x02039d04 @@ -376905,35 +376905,35 @@ _080C790C: lsls r1, 2 adds r0, r1 ldrb r0, [r0] - b _080C7954 + b @080C7954 .align 2, 0 .pool -_080C792C: +@080C792C: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080C7940 + beq @080C7940 movs r0, 0x5 bl audio_play bl sub_80C7BB4 - b _080C7952 -_080C7940: + b @080C7952 +@080C7940: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080C7952 + beq @080C7952 movs r0, 0x5 bl audio_play bl sub_80C7B80 -_080C7952: +@080C7952: movs r0, 0xC8 -_080C7954: +@080C7954: pop {r1} bx r1 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 @@ -377024,7 +377024,7 @@ sub_80C7958: @ 80C7958 ldr r0, =0x08571710 str r0, [sp, 0xC] movs r4, 0 -_080C7A10: +@080C7A10: ldr r0, [r6] ldr r1, =0x00000246 adds r0, r1 @@ -377049,15 +377049,15 @@ _080C7A10: movs r0, 0x2 ands r0, r4 cmp r0, 0 - beq _080C7A4A + beq @080C7A4A movs r0, 0xC4 strh r0, [r1, 0x20] movs r5, 0x2 -_080C7A4A: +@080C7A4A: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _080C7A6E + beq @080C7A6E ldr r1, [r6] adds r1, 0x4 adds r1, r3 @@ -377072,7 +377072,7 @@ _080C7A4A: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 -_080C7A6E: +@080C7A6E: ldr r0, [r6] adds r0, 0x4 adds r0, r3 @@ -377084,10 +377084,10 @@ _080C7A6E: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x3 - bls _080C7A10 + bls @080C7A10 movs r4, 0 ldr r5, =0x02039d04 -_080C7A8C: +@080C7A8C: lsls r0, r4, 3 adds r0, r4 lsls r0, 19 @@ -377112,24 +377112,24 @@ _080C7A8C: adds r0, r1 str r2, [r0] cmp r2, 0 - beq _080C7AD4 + beq @080C7AD4 movs r1, 0x1 cmp r4, 0 - bne _080C7ACC + bne @080C7ACC movs r3, 0x1 negs r3, r3 adds r1, r3, 0 -_080C7ACC: +@080C7ACC: strh r1, [r2, 0x2E] ldr r1, [r0] ldr r0, =sub_80C7CF4 + 1 str r0, [r1, 0x1C] -_080C7AD4: +@080C7AD4: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x1 - bls _080C7A8C + bls @080C7A8C bl sub_80C7BE4 add sp, 0x3C pop {r4-r6} @@ -377140,42 +377140,42 @@ _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] ldr r0, [r0] cmp r0, 0 - beq _080C7B2A + beq @080C7B2A bl obj_delete_and_free_tiles ldr r1, [r4] movs r0, 0 str r0, [r1] -_080C7B2A: +@080C7B2A: movs r5, 0 adds r6, r4, 0 -_080C7B2E: +@080C7B2E: ldr r0, [r6] lsls r4, r5, 2 adds r0, 0x4 adds r0, r4 ldr r0, [r0] cmp r0, 0 - beq _080C7B4A + beq @080C7B4A bl obj_delete_and_free_tiles ldr r0, [r6] adds r0, 0x4 adds r0, r4 movs r1, 0 str r1, [r0] -_080C7B4A: +@080C7B4A: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x3 - bls _080C7B2E + bls @080C7B2E movs r5, 0 -_080C7B56: +@080C7B56: ldr r0, =0x02039d04 ldr r0, [r0] lsls r1, r5, 2 @@ -377183,14 +377183,14 @@ _080C7B56: adds r0, r1 ldr r0, [r0] cmp r0, 0 - beq _080C7B6A + beq @080C7B6A bl obj_delete_and_free_tiles -_080C7B6A: +@080C7B6A: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x1 - bls _080C7B56 + bls @080C7B56 pop {r4-r6} pop {r0} bx r0 @@ -377199,7 +377199,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] @@ -377212,14 +377212,14 @@ sub_80C7B80: @ 80C7B80 lsls r0, 24 lsrs r0, 24 cmp r0, 0xD - bls _080C7BA6 + bls @080C7BA6 ldr r0, [r2] movs r1, 0x91 lsls r1, 2 adds r0, r1 movs r1, 0 strb r1, [r0] -_080C7BA6: +@080C7BA6: bl sub_80C7BE4 pop {r0} bx r0 @@ -377228,7 +377228,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] @@ -377237,14 +377237,14 @@ sub_80C7BB4: @ 80C7BB4 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 - beq _080C7BD0 + beq @080C7BD0 subs r1, r0, 0x1 - b _080C7BD2 + b @080C7BD2 .align 2, 0 .pool -_080C7BD0: +@080C7BD0: movs r1, 0xD -_080C7BD2: +@080C7BD2: movs r3, 0x91 lsls r3, 2 adds r0, r2, r3 @@ -377255,7 +377255,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 @@ -377371,7 +377371,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] @@ -377381,7 +377381,7 @@ sub_80C7CF4: @ 80C7CF4 lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble _080C7D24 + ble @080C7D24 strh r2, [r1, 0x30] ldrh r0, [r1, 0x2E] ldrh r3, [r1, 0x24] @@ -377393,16 +377393,16 @@ sub_80C7CF4: @ 80C7CF4 lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - ble _080C7D24 + ble @080C7D24 strh r2, [r1, 0x32] strh r2, [r1, 0x24] -_080C7D24: +@080C7D24: pop {r0} bx r0 thumb_func_end sub_80C7CF4 thumb_func_start sub_80C7D28 -sub_80C7D28: @ 80C7D28 +sub_80C7D28: ; 80C7D28 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -377423,7 +377423,7 @@ sub_80C7D28: @ 80C7D28 thumb_func_end sub_80C7D28 thumb_func_start c2_Box -c2_Box: @ 80C7D54 +c2_Box: ; 80C7D54 push {lr} bl run_active_tasks bl do_scheduled_bg_tilemap_copies_to_vram @@ -377436,7 +377436,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 @@ -377448,13 +377448,13 @@ sub_80C7D74: @ 80C7D74 bl malloc str r0, [r4] cmp r0, 0 - bne _080C7DA8 + bne @080C7DA8 ldr r0, =sub_80C7678 + 1 bl set_callback2 - b _080C7DD4 + b @080C7DD4 .align 2, 0 .pool -_080C7DA8: +@080C7DA8: movs r2, 0 strb r5, [r0, 0x1] ldr r0, [r4] @@ -377474,7 +377474,7 @@ _080C7DA8: strb r0, [r1] ldr r0, =c2_Box + 1 bl set_callback2 -_080C7DD4: +@080C7DD4: pop {r4,r5} pop {r0} bx r0 @@ -377483,7 +377483,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 @@ -377492,13 +377492,13 @@ c2_808CE60: @ 80C7DEC adds r1, r0, 0 str r1, [r4] cmp r1, 0 - bne _080C7E18 + bne @080C7E18 ldr r0, =sub_80C7678 + 1 bl set_callback2 - b _080C7E3C + b @080C7E3C .align 2, 0 .pool -_080C7E18: +@080C7E18: ldr r0, =0x02039d0d ldrb r0, [r0] movs r2, 0 @@ -377515,7 +377515,7 @@ _080C7E18: strb r0, [r1, 0x4] ldr r0, =c2_Box + 1 bl set_callback2 -_080C7E3C: +@080C7E3C: pop {r4} pop {r0} bx r0 @@ -377524,7 +377524,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 @@ -377555,7 +377555,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 @@ -377606,7 +377606,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 @@ -377615,9 +377615,9 @@ sub_80C7F1C: @ 80C7F1C ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x1 - bne _080C7F32 + bne @080C7F32 movs r1, 0x1 -_080C7F32: +@080C7F32: strb r1, [r2] ldr r1, =0x02039d0e movs r0, 0 @@ -377629,13 +377629,13 @@ _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] ldrb r0, [r0, 0x1] cmp r0, 0x3 - bne _080C7F6A + bne @080C7F6A movs r1, 0xFC lsls r1, 6 movs r0, 0x50 @@ -377643,7 +377643,7 @@ sub_80C7F4C: @ 80C7F4C ldr r1, =0x00000b07 movs r0, 0x52 bl lcd_io_set -_080C7F6A: +@080C7F6A: movs r1, 0xFA lsls r1, 5 movs r0, 0 @@ -377655,7 +377655,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 @@ -377676,37 +377676,37 @@ 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 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0xA - bls _080C7FB8 - b _080C81A2 -_080C7FB8: + bls @080C7FB8 + b @080C81A2 +@080C7FB8: lsls r0, 2 - ldr r1, =_080C7FCC + ldr r1, =@080C7FCC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C7FCC: - .4byte _080C7FF8 - .4byte _080C8050 - .4byte _080C805E - .4byte _080C808C - .4byte _080C80A8 - .4byte _080C80C6 - .4byte _080C80E6 - .4byte _080C80EC - .4byte _080C80F2 - .4byte _080C8100 - .4byte _080C814A -_080C7FF8: +@080C7FCC: + .4byte @080C7FF8 + .4byte @080C8050 + .4byte @080C805E + .4byte @080C808C + .4byte @080C80A8 + .4byte @080C80C6 + .4byte @080C80E6 + .4byte @080C80EC + .4byte @080C80F2 + .4byte @080C8100 + .4byte @080C814A +@080C7FF8: movs r0, 0 bl SetVBlankCallback movs r0, 0 @@ -377717,43 +377717,43 @@ _080C7FF8: ldr r0, [r0] ldrb r0, [r0, 0x3] cmp r0, 0 - beq _080C8046 + beq @080C8046 ldr r0, =0x02039d0f ldrb r0, [r0] cmp r0, 0x1 - beq _080C8036 + beq @080C8036 cmp r0, 0x1 - bgt _080C8030 + bgt @080C8030 cmp r0, 0 - beq _080C803C - b _080C8046 + beq @080C803C + b @080C8046 .align 2, 0 .pool -_080C8030: +@080C8030: cmp r0, 0x2 - beq _080C8042 - b _080C8046 -_080C8036: + beq @080C8042 + b @080C8046 +@080C8036: bl sub_80CE790 - b _080C8046 -_080C803C: + b @080C8046 +@080C803C: bl sub_80CE8E4 - b _080C8046 -_080C8042: + b @080C8046 +@080C8042: bl sub_80C9F6C -_080C8046: +@080C8046: bl sub_80CA044 bl sub_80CA0C8 - b _080C8198 -_080C8050: + b @080C8198 +@080C8050: bl sub_80CA0A4 lsls r0, 24 cmp r0, 0 - beq _080C805C - b _080C8198 -_080C805C: - b _080C80D0 -_080C805E: + beq @080C805C + b @080C8198 +@080C805C: + b @080C80D0 +@080C805E: movs r0, 0 bl Window_WriteStandardTileMap movs r0, 0x1 @@ -377769,73 +377769,73 @@ _080C805E: movs r1, 0xB movs r2, 0xE0 bl sub_809882C - b _080C8198 + b @080C8198 .align 2, 0 .pool -_080C808C: +@080C808C: bl sub_80C7E50 ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x3] cmp r0, 0 - beq _080C809C - b _080C8198 -_080C809C: + beq @080C809C + b @080C8198 +@080C809C: bl sub_80C7F1C - b _080C8198 + b @080C8198 .align 2, 0 .pool -_080C80A8: +@080C80A8: bl sub_80CAF04 ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x3] cmp r0, 0 - bne _080C80C0 + bne @080C80C0 bl sub_80CD36C - b _080C8198 + b @080C8198 .align 2, 0 .pool -_080C80C0: +@080C80C0: bl sub_80CD3EC - b _080C8198 -_080C80C6: + b @080C8198 +@080C80C6: bl sub_80D0164 lsls r0, 24 cmp r0, 0 - bne _080C80DC -_080C80D0: + bne @080C80DC +@080C80D0: ldr r0, =sub_80C9E50 + 1 bl add_to_c3_somehow - b _080C81A2 + b @080C81A2 .align 2, 0 .pool -_080C80DC: +@080C80DC: bl sub_80C9FEC bl sub_80CAC1C - b _080C8198 -_080C80E6: + b @080C8198 +@080C80E6: bl sub_80CA0D8 - b _080C8198 -_080C80EC: + b @080C8198 +@080C80EC: bl sub_80CA704 - b _080C8198 -_080C80F2: + b @080C8198 +@080C80F2: bl get_preferred_box lsls r0, 24 lsrs r0, 24 bl sub_80CC32C - b _080C8198 -_080C8100: + b @080C8198 +@080C8100: bl sub_80CC35C lsls r0, 24 cmp r0, 0 - bne _080C81A2 + bne @080C81A2 ldr r0, =0x02039d08 ldr r2, [r0] ldrb r0, [r2, 0x1] cmp r0, 0x3 - beq _080C8140 + beq @080C8140 ldr r1, =0x00000da4 adds r0, r2, r1 movs r1, 0xD @@ -377846,20 +377846,20 @@ _080C8100: strh r1, [r2] bl sub_811F90C bl sub_811FA90 - b _080C8198 + b @080C8198 .align 2, 0 .pool -_080C8140: +@080C8140: bl sub_80D0C60 bl sub_80CAEAC - b _080C8198 -_080C814A: + b @080C8198 +@080C814A: bl sub_80C7F4C ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x3] cmp r0, 0 - bne _080C8174 + bne @080C8174 movs r0, 0x1 negs r0, r0 movs r1, 0x10 @@ -377867,10 +377867,10 @@ _080C814A: bl sub_80A2A20 ldr r0, =sub_80C81AC + 1 bl add_to_c3_somehow - b _080C8186 + b @080C8186 .align 2, 0 .pool -_080C8174: +@080C8174: movs r0, 0x1 negs r0, r0 movs r1, 0x10 @@ -377878,19 +377878,19 @@ _080C8174: bl sub_80A2A20 ldr r0, =box_related_2 + 1 bl add_to_c3_somehow -_080C8186: +@080C8186: ldr r0, =sub_80C7D28 + 1 bl SetVBlankCallback - b _080C81A2 + b @080C81A2 .align 2, 0 .pool -_080C8198: +@080C8198: ldr r0, =0x02039d08 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_080C81A2: +@080C81A2: add sp, 0x4 pop {r0} bx r0 @@ -377899,19 +377899,19 @@ _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] ldrb r0, [r0] cmp r0, 0 - beq _080C81C4 + beq @080C81C4 cmp r0, 0x1 - beq _080C81DE - b _080C81EE + beq @080C81DE + b @080C81EE .align 2, 0 .pool -_080C81C4: +@080C81C4: movs r0, 0x2 bl audio_play movs r0, 0x14 @@ -377922,15 +377922,15 @@ _080C81C4: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C81EE -_080C81DE: + b @080C81EE +@080C81DE: bl sub_80F9C1C lsls r0, 24 cmp r0, 0 - bne _080C81EE + bne @080C81EE ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow -_080C81EE: +@080C81EE: pop {r4} pop {r0} bx r0 @@ -377939,28 +377939,28 @@ _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 ldr r0, [r4] ldrb r0, [r0] cmp r0, 0x1 - beq _080C8230 + beq @080C8230 cmp r0, 0x1 - bgt _080C8214 + bgt @080C8214 cmp r0, 0 - beq _080C821E - b _080C82A0 + beq @080C821E + b @080C82A0 .align 2, 0 .pool -_080C8214: +@080C8214: cmp r0, 0x2 - beq _080C8268 + beq @080C8268 cmp r0, 0x3 - beq _080C8290 - b _080C82A0 -_080C821E: + beq @080C8290 + b @080C82A0 +@080C821E: movs r1, 0x1 negs r1, r1 str r0, [sp] @@ -377968,59 +377968,59 @@ _080C821E: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - b _080C8282 -_080C8230: + b @080C8282 +@080C8230: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne _080C82A0 + bne @080C82A0 ldr r0, =0x02039d0f ldrb r0, [r0] cmp r0, 0x2 - bne _080C825C + bne @080C825C ldr r0, =0x0203ce7c ldrh r0, [r0] cmp r0, 0 - beq _080C825C + beq @080C825C movs r0, 0x1C bl sub_80CAC58 - b _080C8282 + b @080C8282 .align 2, 0 .pool -_080C825C: +@080C825C: ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow - b _080C82A0 + b @080C82A0 .align 2, 0 .pool -_080C8268: +@080C8268: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _080C82A0 + bne @080C82A0 ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _080C82A0 + beq @080C82A0 bl sub_80CADC4 -_080C8282: +@080C8282: ldr r1, [r4] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C82A0 + b @080C82A0 .align 2, 0 .pool -_080C8290: +@080C8290: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _080C82A0 + bne @080C82A0 ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow -_080C82A0: +@080C82A0: add sp, 0x4 pop {r4} pop {r0} @@ -378030,91 +378030,91 @@ _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] ldrb r0, [r0] cmp r0, 0xB - bls _080C82BA - b _080C879E -_080C82BA: + bls @080C82BA + b @080C879E +@080C82BA: lsls r0, 2 - ldr r1, =_080C82CC + ldr r1, =@080C82CC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C82CC: - .4byte _080C82FC - .4byte _080C861C - .4byte _080C865C - .4byte _080C86B4 - .4byte _080C86D8 - .4byte _080C86E2 - .4byte _080C86FC - .4byte _080C871C - .4byte _080C8722 - .4byte _080C8738 - .4byte _080C8764 - .4byte _080C878C -_080C82FC: +@080C82CC: + .4byte @080C82FC + .4byte @080C861C + .4byte @080C865C + .4byte @080C86B4 + .4byte @080C86D8 + .4byte @080C86E2 + .4byte @080C86FC + .4byte @080C871C + .4byte @080C8722 + .4byte @080C8738 + .4byte @080C8764 + .4byte @080C878C +@080C82FC: bl sub_80CF9EC lsls r0, 24 lsrs r0, 24 subs r0, 0x1 cmp r0, 0x19 - bls _080C830C - b _080C879E -_080C830C: + bls @080C830C + b @080C879E +@080C830C: lsls r0, 2 - ldr r1, =_080C831C + ldr r1, =@080C831C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C831C: - .4byte _080C8384 - .4byte _080C879E - .4byte _080C879E - .4byte _080C8414 - .4byte _080C8398 - .4byte _080C83CC - .4byte _080C842C - .4byte _080C8440 - .4byte _080C844C - .4byte _080C8484 - .4byte _080C84C8 - .4byte _080C854C - .4byte _080C850C - .4byte _080C851E - .4byte _080C8560 - .4byte _080C8574 - .4byte _080C8588 - .4byte _080C859C - .4byte _080C8420 - .4byte _080C85B0 - .4byte _080C85D0 - .4byte _080C85BA - .4byte _080C85DA - .4byte _080C8614 - .4byte _080C85DE - .4byte _080C85F8 -_080C8384: +@080C831C: + .4byte @080C8384 + .4byte @080C879E + .4byte @080C879E + .4byte @080C8414 + .4byte @080C8398 + .4byte @080C83CC + .4byte @080C842C + .4byte @080C8440 + .4byte @080C844C + .4byte @080C8484 + .4byte @080C84C8 + .4byte @080C854C + .4byte @080C850C + .4byte @080C851E + .4byte @080C8560 + .4byte @080C8574 + .4byte @080C8588 + .4byte @080C859C + .4byte @080C8420 + .4byte @080C85B0 + .4byte @080C85D0 + .4byte @080C85BA + .4byte @080C85DA + .4byte @080C8614 + .4byte @080C85DE + .4byte @080C85F8 +@080C8384: movs r0, 0x5 bl audio_play ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x1 strb r0, [r1] - b _080C879E + b @080C879E .align 2, 0 .pool -_080C8398: +@080C8398: ldr r4, =0x02039d08 ldr r0, [r4] ldrb r0, [r0, 0x1] @@ -378122,32 +378122,32 @@ _080C8398: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bls _080C83BC + bls @080C83BC movs r0, 0x10 bl sub_80CAC58 ldr r1, [r4] movs r0, 0x3 strb r0, [r1] - b _080C879E + b @080C879E .align 2, 0 .pool -_080C83BC: +@080C83BC: bl sub_80CDC0C ldr r0, =sub_80C87A8 + 1 bl add_to_c3_somehow - b _080C879E + b @080C879E .align 2, 0 .pool -_080C83CC: +@080C83CC: ldr r4, =0x02039d08 ldr r0, [r4] ldrb r0, [r0, 0x1] cmp r0, 0x2 - bne _080C8400 + bne @080C8400 bl sub_80CEAD0 lsls r0, 24 cmp r0, 0 - beq _080C8406 + beq @080C8406 ldr r0, [r4] ldr r1, =0x00000ce6 adds r0, r1 @@ -378155,49 +378155,49 @@ _080C83CC: bl itemid_is_mail lsls r0, 24 cmp r0, 0 - beq _080C83F4 - b _080C84E6 -_080C83F4: - b _080C8406 + beq @080C83F4 + b @080C84E6 +@080C83F4: + b @080C8406 .align 2, 0 .pool -_080C8400: +@080C8400: cmp r0, 0x3 - beq _080C8406 - b _080C879E -_080C8406: + beq @080C8406 + b @080C879E +@080C8406: ldr r0, =sub_80C87E8 + 1 bl add_to_c3_somehow - b _080C879E + b @080C879E .align 2, 0 .pool -_080C8414: +@080C8414: ldr r0, =sub_80C9BE8 + 1 bl add_to_c3_somehow - b _080C879E + b @080C879E .align 2, 0 .pool -_080C8420: +@080C8420: ldr r0, =sub_80C9D1C + 1 bl add_to_c3_somehow - b _080C879E + b @080C879E .align 2, 0 .pool -_080C842C: +@080C842C: movs r0, 0x5 bl audio_play ldr r0, =box_related + 1 bl add_to_c3_somehow - b _080C879E + b @080C879E .align 2, 0 .pool -_080C8440: +@080C8440: ldr r0, =sub_80C8864 + 1 bl add_to_c3_somehow - b _080C879E + b @080C879E .align 2, 0 .pool -_080C844C: +@080C844C: movs r0, 0x5 bl audio_play bl get_preferred_box @@ -378210,19 +378210,19 @@ _080C844C: adds r1, r2 strh r0, [r1] cmp r0, 0xD - ble _080C846E + ble @080C846E movs r0, 0 strh r0, [r1] -_080C846E: +@080C846E: ldr r1, [r4] ldrb r0, [r1, 0x1] cmp r0, 0x3 - beq _080C84BC + beq @080C84BC adds r0, r1, r2 - b _080C8776 + b @080C8776 .align 2, 0 .pool -_080C8484: +@080C8484: movs r0, 0x5 bl audio_play bl get_preferred_box @@ -378235,29 +378235,29 @@ _080C8484: adds r1, r2 strh r0, [r1] cmp r0, 0 - bge _080C84A6 + bge @080C84A6 movs r0, 0xD strh r0, [r1] -_080C84A6: +@080C84A6: ldr r1, [r4] ldrb r0, [r1, 0x1] cmp r0, 0x3 - beq _080C84BC + beq @080C84BC adds r0, r1, r2 - b _080C8776 + b @080C8776 .align 2, 0 .pool -_080C84BC: +@080C84BC: bl sub_80CFEA8 ldr r1, [r4] movs r0, 0xA strb r0, [r1] - b _080C879E -_080C84C8: + b @080C879E +@080C84C8: bl sub_80CEA30 lsls r0, 24 cmp r0, 0 - bne _080C8528 + bne @080C8528 ldr r4, =0x02039d08 ldr r0, [r4] ldr r1, =0x00000ce6 @@ -378266,180 +378266,180 @@ _080C84C8: bl itemid_is_mail lsls r0, 24 cmp r0, 0 - beq _080C84F8 -_080C84E6: + beq @080C84F8 +@080C84E6: ldr r1, [r4] movs r0, 0x5 strb r0, [r1] - b _080C879E + b @080C879E .align 2, 0 .pool -_080C84F8: +@080C84F8: movs r0, 0x5 bl audio_play ldr r0, =sub_80C8D78 + 1 bl add_to_c3_somehow - b _080C879E + b @080C879E .align 2, 0 .pool -_080C850C: +@080C850C: bl sub_80CEA30 lsls r0, 24 cmp r0, 0 - bne _080C8528 + bne @080C8528 movs r0, 0x5 bl audio_play - b _080C872C -_080C851E: + b @080C872C +@080C851E: bl sub_80CEA6C lsls r0, 24 cmp r0, 0 - bne _080C8538 -_080C8528: + bne @080C8538 +@080C8528: ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x4 strb r0, [r1] - b _080C879E + b @080C879E .align 2, 0 .pool -_080C8538: +@080C8538: movs r0, 0x5 bl audio_play ldr r0, =c3_0808DC50 + 1 bl add_to_c3_somehow - b _080C879E + b @080C879E .align 2, 0 .pool -_080C854C: +@080C854C: movs r0, 0x5 bl audio_play ldr r0, =sub_80C8C90 + 1 bl add_to_c3_somehow - b _080C879E + b @080C879E .align 2, 0 .pool -_080C8560: +@080C8560: movs r0, 0x5 bl audio_play ldr r0, =sub_80C8BEC + 1 bl add_to_c3_somehow - b _080C879E + b @080C879E .align 2, 0 .pool -_080C8574: +@080C8574: movs r0, 0x5 bl audio_play ldr r0, =sub_80C9128 + 1 bl add_to_c3_somehow - b _080C879E + b @080C879E .align 2, 0 .pool -_080C8588: +@080C8588: movs r0, 0x5 bl audio_play ldr r0, =sub_80C91DC + 1 bl add_to_c3_somehow - b _080C879E + b @080C879E .align 2, 0 .pool -_080C859C: +@080C859C: movs r0, 0x5 bl audio_play ldr r0, =sub_80C93B0 + 1 bl add_to_c3_somehow - b _080C879E + b @080C879E .align 2, 0 .pool -_080C85B0: +@080C85B0: movs r0, 0x5 bl audio_play movs r0, 0 - b _080C8600 -_080C85BA: + b @080C8600 +@080C85BA: movs r0, 0x1 bl sub_80D01D0 ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x8 strb r0, [r1] - b _080C879E + b @080C879E .align 2, 0 .pool -_080C85D0: +@080C85D0: movs r0, 0x5 bl audio_play movs r0, 0x2 - b _080C85E6 -_080C85DA: + b @080C85E6 +@080C85DA: movs r0, 0x3 - b _080C8600 -_080C85DE: + b @080C8600 +@080C85DE: movs r0, 0x5 bl audio_play movs r0, 0x4 -_080C85E6: +@080C85E6: bl sub_80D01D0 ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x9 strb r0, [r1] - b _080C879E + b @080C879E .align 2, 0 .pool -_080C85F8: +@080C85F8: movs r0, 0x5 bl audio_play movs r0, 0x5 -_080C8600: +@080C8600: bl sub_80D01D0 ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x7 strb r0, [r1] - b _080C879E + b @080C879E .align 2, 0 .pool -_080C8614: +@080C8614: movs r0, 0x20 bl audio_play - b _080C879E -_080C861C: + b @080C879E +@080C861C: bl sub_80CD554 lsls r0, 24 cmp r0, 0 - beq _080C8628 - b _080C879E -_080C8628: + beq @080C8628 + b @080C879E +@080C8628: bl sub_80CEAF8 lsls r0, 24 cmp r0, 0 - beq _080C8638 + beq @080C8638 bl sub_80CA9C0 - b _080C863C -_080C8638: + b @080C863C +@080C8638: bl sub_80CA9EC -_080C863C: +@080C863C: ldr r4, =0x02039d08 ldr r0, [r4] ldr r1, =0x00000cea adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _080C864E + beq @080C864E bl BoxSetMosaic -_080C864E: +@080C864E: ldr r1, [r4] - b _080C86C8 + b @080C86C8 .align 2, 0 .pool -_080C865C: +@080C865C: bl sub_80CC54C lsls r0, 24 cmp r0, 0 - beq _080C8668 - b _080C879E -_080C8668: + beq @080C8668 + b @080C879E +@080C8668: ldr r0, =0x02039d08 ldr r0, [r0] ldr r1, =0x000002ca @@ -378449,136 +378449,136 @@ _080C8668: ldr r0, =0x02039d0c ldrb r0, [r0] cmp r0, 0 - bne _080C8690 + bne @080C8690 bl sub_80CEAD0 lsls r0, 24 cmp r0, 0 - bne _080C8690 + bne @080C8690 bl sub_80CE00C bl BoxSetMosaic -_080C8690: +@080C8690: ldr r4, =0x02039d08 ldr r1, [r4] ldrb r0, [r1, 0x1] cmp r0, 0x3 - bne _080C86C8 + bne @080C86C8 bl sub_80CFECC ldr r1, [r4] movs r0, 0xB strb r0, [r1] - b _080C879E + b @080C879E .align 2, 0 .pool -_080C86B4: +@080C86B4: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 - beq _080C879E + beq @080C879E bl sub_80CADC4 ldr r0, =0x02039d08 ldr r1, [r0] -_080C86C8: +@080C86C8: movs r0, 0 strb r0, [r1] - b _080C879E + b @080C879E .align 2, 0 .pool -_080C86D8: +@080C86D8: movs r0, 0x20 bl audio_play movs r0, 0xD - b _080C86EA -_080C86E2: + b @080C86EA +@080C86E2: movs r0, 0x20 bl audio_play movs r0, 0x16 -_080C86EA: +@080C86EA: bl sub_80CAC58 ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x6 strb r0, [r1] - b _080C879E + b @080C879E .align 2, 0 .pool -_080C86FC: +@080C86FC: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 - beq _080C879E + beq @080C879E bl sub_80CADC4 ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow - b _080C879E + b @080C879E .align 2, 0 .pool -_080C871C: +@080C871C: bl sub_80D01E4 - b _080C8790 -_080C8722: + b @080C8790 +@080C8722: bl sub_80D01E4 lsls r0, 24 cmp r0, 0 - bne _080C879E -_080C872C: + bne @080C879E +@080C872C: ldr r0, =sub_80C8B90 + 1 bl add_to_c3_somehow - b _080C879E + b @080C879E .align 2, 0 .pool -_080C8738: +@080C8738: bl sub_80D01E4 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _080C879E + bne @080C879E ldr r5, =0x02039d08 ldr r0, [r5] ldr r1, =0x00000cea adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _080C8756 + beq @080C8756 bl BoxSetMosaic -_080C8756: +@080C8756: ldr r0, [r5] strb r4, [r0] - b _080C879E + b @080C879E .align 2, 0 .pool -_080C8764: +@080C8764: bl sub_80D1218 lsls r0, 24 cmp r0, 0 - bne _080C879E + bne @080C879E ldr r4, =0x02039d08 ldr r0, [r4] ldr r1, =0x000002ca adds r0, r1 -_080C8776: +@080C8776: ldrb r0, [r0] bl sub_80CC464 ldr r1, [r4] movs r0, 0x2 strb r0, [r1] - b _080C879E + b @080C879E .align 2, 0 .pool -_080C878C: +@080C878C: bl sub_80D1218 -_080C8790: +@080C8790: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _080C879E + bne @080C879E ldr r0, =0x02039d08 ldr r0, [r0] strb r1, [r0] -_080C879E: +@080C879E: pop {r4,r5} pop {r0} bx r0 @@ -378587,33 +378587,33 @@ _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] ldrb r0, [r0] cmp r0, 0 - beq _080C87C0 + beq @080C87C0 cmp r0, 0x1 - beq _080C87CE - b _080C87DE + beq @080C87CE + b @080C87DE .align 2, 0 .pool -_080C87C0: +@080C87C0: bl sub_80CAB4C ldr r1, [r4] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C87DE -_080C87CE: + b @080C87DE +@080C87CE: bl sub_80CAB70 lsls r0, 24 cmp r0, 0 - bne _080C87DE + bne @080C87DE ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow -_080C87DE: +@080C87DE: pop {r4} pop {r0} bx r0 @@ -378622,60 +378622,60 @@ _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] ldrb r0, [r0] cmp r0, 0x1 - beq _080C8816 + beq @080C8816 cmp r0, 0x1 - bgt _080C8804 + bgt @080C8804 cmp r0, 0 - beq _080C880A - b _080C8856 + beq @080C880A + b @080C8856 .align 2, 0 .pool -_080C8804: +@080C8804: cmp r0, 0x2 - beq _080C8836 - b _080C8856 -_080C880A: + beq @080C8836 + b @080C8856 +@080C880A: movs r0, 0x5 bl audio_play bl sub_80CA888 - b _080C882C -_080C8816: + b @080C882C +@080C8816: bl sub_80CA8C8 lsls r0, 24 cmp r0, 0 - bne _080C8856 + bne @080C8856 bl sub_80CDC2C lsls r0, 24 lsrs r0, 24 bl sub_80CDBF8 -_080C882C: +@080C882C: ldr r1, [r4] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C8856 -_080C8836: + b @080C8856 +@080C8836: bl sub_80CD554 lsls r0, 24 cmp r0, 0 - bne _080C8856 + bne @080C8856 ldr r0, [r4] ldr r1, =0x00000cea adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _080C8850 + beq @080C8850 bl BoxSetMosaic -_080C8850: +@080C8850: ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow -_080C8856: +@080C8856: pop {r4} pop {r0} bx r0 @@ -378684,186 +378684,186 @@ _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] ldrb r0, [r0] cmp r0, 0x6 - bls _080C8872 - b _080C8B82 -_080C8872: + bls @080C8872 + b @080C8B82 +@080C8872: lsls r0, 2 - ldr r1, =_080C8884 + ldr r1, =@080C8884 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C8884: - .4byte _080C88A0 - .4byte _080C8904 - .4byte _080C8920 - .4byte _080C8B3C - .4byte _080C8B50 - .4byte _080C8B46 - .4byte _080C8B6C -_080C88A0: +@080C8884: + .4byte @080C88A0 + .4byte @080C8904 + .4byte @080C8920 + .4byte @080C8B3C + .4byte @080C8B50 + .4byte @080C8B46 + .4byte @080C8B6C +@080C88A0: bl sub_80CA2B8 lsls r0, 24 cmp r0, 0 - beq _080C88AC - b _080C8B82 -_080C88AC: + beq @080C88AC + b @080C8B82 +@080C88AC: movs r0, 0x5 bl audio_play ldr r4, =0x02039d08 ldr r0, [r4] ldrb r0, [r0, 0x1] cmp r0, 0x3 - beq _080C88C8 + beq @080C88C8 movs r0, 0x4 bl sub_80CAC58 - b _080C88F2 + b @080C88F2 .align 2, 0 .pool -_080C88C8: +@080C88C8: bl sub_80D127C lsls r0, 24 cmp r0, 0 - bne _080C88DE + bne @080C88DE ldr r0, [r4] ldr r1, =0x00000ce6 adds r0, r1 ldrh r0, [r0] cmp r0, 0 - beq _080C88EC -_080C88DE: + beq @080C88EC +@080C88DE: movs r0, 0x17 bl sub_80CAC58 - b _080C88F2 + b @080C88F2 .align 2, 0 .pool -_080C88EC: +@080C88EC: movs r0, 0x18 bl sub_80CAC58 -_080C88F2: +@080C88F2: bl sub_80CFFD0 ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x1 strb r0, [r1] - b _080C8B82 + b @080C8B82 .align 2, 0 .pool -_080C8904: +@080C8904: bl sub_80D00A8 lsls r0, 24 cmp r0, 0 - beq _080C8910 - b _080C8B82 -_080C8910: + beq @080C8910 + b @080C8B82 +@080C8910: ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x2 strb r0, [r1] - b _080C8B82 + b @080C8B82 .align 2, 0 .pool -_080C8920: +@080C8920: bl sub_80D00AC adds r0, 0x1 lsls r0, 16 asrs r0, 16 cmp r0, 0x12 - bls _080C8930 - b _080C8B82 -_080C8930: + bls @080C8930 + b @080C8B82 +@080C8930: lsls r0, 2 - ldr r1, =_080C8940 + ldr r1, =@080C8940 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C8940: - .4byte _080C898C - .4byte _080C898C - .4byte _080C8A0C - .4byte _080C89F4 - .4byte _080C899C - .4byte _080C89D4 - .4byte _080C89BC - .4byte _080C8AAC - .4byte _080C8A48 - .4byte _080C8AC0 - .4byte _080C8B82 - .4byte _080C8B82 - .4byte _080C8B82 - .4byte _080C8AD4 - .4byte _080C8AE8 - .4byte _080C8B1C - .4byte _080C8B08 - .4byte _080C8AFC - .4byte _080C8B30 -_080C898C: +@080C8940: + .4byte @080C898C + .4byte @080C898C + .4byte @080C8A0C + .4byte @080C89F4 + .4byte @080C899C + .4byte @080C89D4 + .4byte @080C89BC + .4byte @080C8AAC + .4byte @080C8A48 + .4byte @080C8AC0 + .4byte @080C8B82 + .4byte @080C8B82 + .4byte @080C8B82 + .4byte @080C8AD4 + .4byte @080C8AE8 + .4byte @080C8B1C + .4byte @080C8B08 + .4byte @080C8AFC + .4byte @080C8B30 +@080C898C: bl sub_80CADC4 ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow - b _080C8B82 + b @080C8B82 .align 2, 0 .pool -_080C899C: +@080C899C: bl sub_80CEA30 lsls r0, 24 cmp r0, 0 - bne _080C8A52 + bne @080C8A52 movs r0, 0x5 bl audio_play bl sub_80CADC4 ldr r0, =sub_80C8B90 + 1 bl add_to_c3_somehow - b _080C8B82 + b @080C8B82 .align 2, 0 .pool -_080C89BC: +@080C89BC: movs r0, 0x5 bl audio_play bl sub_80CADC4 ldr r0, =sub_80C8BEC + 1 bl add_to_c3_somehow - b _080C8B82 + b @080C8B82 .align 2, 0 .pool -_080C89D4: +@080C89D4: bl sub_80CEA6C lsls r0, 24 cmp r0, 0 - beq _080C8A52 + beq @080C8A52 movs r0, 0x5 bl audio_play bl sub_80CADC4 ldr r0, =c3_0808DC50 + 1 bl add_to_c3_somehow - b _080C8B82 + b @080C8B82 .align 2, 0 .pool -_080C89F4: +@080C89F4: movs r0, 0x5 bl audio_play bl sub_80CADC4 ldr r0, =sub_80C8C90 + 1 bl add_to_c3_somehow - b _080C8B82 + b @080C8B82 .align 2, 0 .pool -_080C8A0C: +@080C8A0C: bl sub_80CEA30 lsls r0, 24 cmp r0, 0 - bne _080C8A52 + bne @080C8A52 ldr r4, =0x02039d08 ldr r0, [r4] ldr r2, =0x00000ce6 @@ -378872,158 +378872,158 @@ _080C8A0C: bl itemid_is_mail lsls r0, 24 cmp r0, 0 - bne _080C8A8C + bne @080C8A8C movs r0, 0x5 bl audio_play bl sub_80CADC4 ldr r0, =sub_80C8D78 + 1 bl add_to_c3_somehow - b _080C8B82 + b @080C8B82 .align 2, 0 .pool -_080C8A48: +@080C8A48: bl sub_80CEA30 lsls r0, 24 cmp r0, 0 - beq _080C8A60 -_080C8A52: + beq @080C8A60 +@080C8A52: ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x3 strb r0, [r1] - b _080C8B82 + b @080C8B82 .align 2, 0 .pool -_080C8A60: +@080C8A60: ldr r4, =0x02039d08 ldr r1, [r4] ldr r2, =0x00000ced adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080C8A7C + beq @080C8A7C movs r0, 0x5 strb r0, [r1] - b _080C8B82 + b @080C8B82 .align 2, 0 .pool -_080C8A7C: +@080C8A7C: ldr r2, =0x00000ce6 adds r0, r1, r2 ldrh r0, [r0] bl itemid_is_mail lsls r0, 24 cmp r0, 0 - beq _080C8A98 -_080C8A8C: + beq @080C8A98 +@080C8A8C: ldr r1, [r4] movs r0, 0x4 strb r0, [r1] - b _080C8B82 + b @080C8B82 .align 2, 0 .pool -_080C8A98: +@080C8A98: movs r0, 0x5 bl audio_play ldr r0, =sub_80C8EB4 + 1 bl add_to_c3_somehow - b _080C8B82 + b @080C8B82 .align 2, 0 .pool -_080C8AAC: +@080C8AAC: movs r0, 0x5 bl audio_play ldr r0, =sub_80C9B28 + 1 bl add_to_c3_somehow - b _080C8B82 + b @080C8B82 .align 2, 0 .pool -_080C8AC0: +@080C8AC0: movs r0, 0x5 bl audio_play ldr r0, =sub_80C90A4 + 1 bl add_to_c3_somehow - b _080C8B82 + b @080C8B82 .align 2, 0 .pool -_080C8AD4: +@080C8AD4: movs r0, 0x5 bl audio_play ldr r0, =sub_80C9128 + 1 bl add_to_c3_somehow - b _080C8B82 + b @080C8B82 .align 2, 0 .pool -_080C8AE8: +@080C8AE8: movs r0, 0x5 bl audio_play ldr r0, =sub_80C91DC + 1 bl add_to_c3_somehow - b _080C8B82 + b @080C8B82 .align 2, 0 .pool -_080C8AFC: +@080C8AFC: ldr r0, =sub_80C9298 + 1 bl add_to_c3_somehow - b _080C8B82 + b @080C8B82 .align 2, 0 .pool -_080C8B08: +@080C8B08: movs r0, 0x5 bl audio_play ldr r0, =sub_80C93B0 + 1 bl add_to_c3_somehow - b _080C8B82 + b @080C8B82 .align 2, 0 .pool -_080C8B1C: +@080C8B1C: movs r0, 0x5 bl audio_play ldr r0, =sub_80C9B88 + 1 bl add_to_c3_somehow - b _080C8B82 + b @080C8B82 .align 2, 0 .pool -_080C8B30: +@080C8B30: ldr r0, =sub_80C9498 + 1 bl add_to_c3_somehow - b _080C8B82 + b @080C8B82 .align 2, 0 .pool -_080C8B3C: +@080C8B3C: movs r0, 0x20 bl audio_play movs r0, 0xD - b _080C8B58 -_080C8B46: + b @080C8B58 +@080C8B46: movs r0, 0x20 bl audio_play movs r0, 0x11 - b _080C8B58 -_080C8B50: + b @080C8B58 +@080C8B50: movs r0, 0x20 bl audio_play movs r0, 0x16 -_080C8B58: +@080C8B58: bl sub_80CAC58 ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x6 strb r0, [r1] - b _080C8B82 + b @080C8B82 .align 2, 0 .pool -_080C8B6C: +@080C8B6C: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 - beq _080C8B82 + beq @080C8B82 bl sub_80CADC4 ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow -_080C8B82: +@080C8B82: pop {r4} pop {r0} bx r0 @@ -379032,44 +379032,44 @@ _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] ldrb r0, [r0] cmp r0, 0 - beq _080C8BA8 + beq @080C8BA8 cmp r0, 0x1 - beq _080C8BB8 - b _080C8BE2 + beq @080C8BB8 + b @080C8BE2 .align 2, 0 .pool -_080C8BA8: +@080C8BA8: movs r0, 0 bl sub_80CDC38 ldr r1, [r4] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C8BE2 -_080C8BB8: + b @080C8BE2 +@080C8BB8: bl sub_80CDCAC lsls r0, 24 cmp r0, 0 - bne _080C8BE2 + bne @080C8BE2 ldr r0, =0x02039d0c ldrb r0, [r0] cmp r0, 0 - beq _080C8BDC + beq @080C8BDC ldr r0, =sub_80C9670 + 1 bl add_to_c3_somehow - b _080C8BE2 + b @080C8BE2 .align 2, 0 .pool -_080C8BDC: +@080C8BDC: ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow -_080C8BE2: +@080C8BE2: pop {r4} pop {r0} bx r0 @@ -379078,44 +379078,44 @@ _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] ldrb r0, [r0] cmp r0, 0 - beq _080C8C04 + beq @080C8C04 cmp r0, 0x1 - beq _080C8C14 - b _080C8C3E + beq @080C8C14 + b @080C8C3E .align 2, 0 .pool -_080C8C04: +@080C8C04: movs r0, 0x1 bl sub_80CDC38 ldr r1, [r4] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C8C3E -_080C8C14: + b @080C8C3E +@080C8C14: bl sub_80CDCAC lsls r0, 24 cmp r0, 0 - bne _080C8C3E + bne @080C8C3E ldr r0, =0x02039d0c ldrb r0, [r0] cmp r0, 0 - beq _080C8C38 + beq @080C8C38 ldr r0, =sub_80C9670 + 1 bl add_to_c3_somehow - b _080C8C3E + b @080C8C3E .align 2, 0 .pool -_080C8C38: +@080C8C38: ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow -_080C8C3E: +@080C8C3E: pop {r4} pop {r0} bx r0 @@ -379124,35 +379124,35 @@ _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] ldrb r0, [r0] cmp r0, 0 - beq _080C8C60 + beq @080C8C60 cmp r0, 0x1 - beq _080C8C70 - b _080C8C84 + beq @080C8C70 + b @080C8C84 .align 2, 0 .pool -_080C8C60: +@080C8C60: movs r0, 0x2 bl sub_80CDC38 ldr r1, [r4] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C8C84 -_080C8C70: + b @080C8C84 +@080C8C70: bl sub_80CDCAC lsls r0, 24 cmp r0, 0 - bne _080C8C84 + bne @080C8C84 bl BoxSetMosaic ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow -_080C8C84: +@080C8C84: pop {r4} pop {r0} bx r0 @@ -379161,44 +379161,44 @@ _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] ldrb r0, [r0] cmp r0, 0x5 - bhi _080C8D6E + bhi @080C8D6E lsls r0, 2 - ldr r1, =_080C8CB0 + ldr r1, =@080C8CB0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C8CB0: - .4byte _080C8CC8 - .4byte _080C8D00 - .4byte _080C8D20 - .4byte _080C8D36 - .4byte _080C8D48 - .4byte _080C8D68 -_080C8CC8: +@080C8CB0: + .4byte @080C8CC8 + .4byte @080C8D00 + .4byte @080C8D20 + .4byte @080C8D36 + .4byte @080C8D48 + .4byte @080C8D68 +@080C8CC8: bl calc_player_party_count lsls r0, 24 lsrs r0, 24 cmp r0, 0x6 - bne _080C8CE8 + bne @080C8CE8 movs r0, 0xE bl sub_80CAC58 ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x1 strb r0, [r1] - b _080C8D6E + b @080C8D6E .align 2, 0 .pool -_080C8CE8: +@080C8CE8: bl sub_80CDC18 movs r0, 0 bl sub_80CDC38 @@ -379206,58 +379206,58 @@ _080C8CE8: ldr r1, [r0] movs r0, 0x2 strb r0, [r1] - b _080C8D6E + b @080C8D6E .align 2, 0 .pool -_080C8D00: +@080C8D00: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 - beq _080C8D6E + beq @080C8D6E bl sub_80CADC4 ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow - b _080C8D6E + b @080C8D6E .align 2, 0 .pool -_080C8D20: +@080C8D20: bl sub_80CDCAC lsls r0, 24 cmp r0, 0 - bne _080C8D6E + bne @080C8D6E movs r0, 0x1 bl sub_80CC0D4 bl sub_80CAB4C - b _080C8D56 -_080C8D36: + b @080C8D56 +@080C8D36: bl sub_80CAB70 lsls r0, 24 cmp r0, 0 - bne _080C8D6E + bne @080C8D6E movs r0, 0x1 bl sub_80CDC38 - b _080C8D56 -_080C8D48: + b @080C8D56 +@080C8D48: bl sub_80CDCAC lsls r0, 24 cmp r0, 0 - bne _080C8D6E + bne @080C8D6E bl sub_80CAB20 -_080C8D56: +@080C8D56: ldr r0, =0x02039d08 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C8D6E + b @080C8D6E .align 2, 0 .pool -_080C8D68: +@080C8D68: ldr r0, =sub_80C87E8 + 1 bl add_to_c3_somehow -_080C8D6E: +@080C8D6E: pop {r0} bx r0 .align 2, 0 @@ -379265,31 +379265,31 @@ _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 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x4 - bls _080C8D88 - b _080C8EA2 -_080C8D88: + bls @080C8D88 + b @080C8EA2 +@080C8D88: lsls r0, 2 - ldr r1, =_080C8D9C + ldr r1, =@080C8D9C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C8D9C: - .4byte _080C8DB0 - .4byte _080C8DEC - .4byte _080C8E4C - .4byte _080C8E64 - .4byte _080C8E88 -_080C8DB0: +@080C8D9C: + .4byte @080C8DB0 + .4byte @080C8DEC + .4byte @080C8E4C + .4byte @080C8E64 + .4byte @080C8E88 +@080C8DB0: movs r0, 0x6 bl sub_80CAC58 ldr r4, =0x02039d08 @@ -379308,28 +379308,28 @@ _080C8DB0: ldr r1, [r4] ldrb r0, [r1] adds r0, 0x1 - b _080C8EA0 + b @080C8EA0 .align 2, 0 .pool -_080C8DEC: +@080C8DEC: bl sub_80C78F0 lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 cmp r0, 0xC8 - beq _080C8EA2 + beq @080C8EA2 cmp r0, 0xC9 - bne _080C8E0C + bne @080C8E0C bl sub_80CADC4 bl sub_80C78E4 bl sub_80C7890 - b _080C8E7A -_080C8E0C: + b @080C8E7A +@080C8E0C: adds r0, r4, 0 bl sub_80CE19C lsls r0, 24 cmp r0, 0 - beq _080C8E38 + beq @080C8E38 ldr r0, =0x02039d0e strb r4, [r0] bl sub_80CADC4 @@ -379338,57 +379338,57 @@ _080C8E0C: ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x2 - b _080C8EA0 + b @080C8EA0 .align 2, 0 .pool -_080C8E38: +@080C8E38: movs r0, 0x8 bl sub_80CAC58 ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x4 - b _080C8EA0 + b @080C8EA0 .align 2, 0 .pool -_080C8E4C: +@080C8E4C: bl party_compaction bl sub_80CB950 ldr r0, =0x02039d08 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 - b _080C8EA0 + b @080C8EA0 .align 2, 0 .pool -_080C8E64: +@080C8E64: bl sub_80CB9BC lsls r0, 24 cmp r0, 0 - bne _080C8EA2 + bne @080C8EA2 bl sub_80CE22C bl BoxSetMosaic bl sub_80CAB20 -_080C8E7A: +@080C8E7A: ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow - b _080C8EA2 + b @080C8EA2 .align 2, 0 .pool -_080C8E88: +@080C8E88: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 - beq _080C8EA2 + beq @080C8EA2 movs r0, 0x6 bl sub_80CAC58 ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x1 -_080C8EA0: +@080C8EA0: strb r0, [r1] -_080C8EA2: +@080C8EA2: add sp, 0x4 pop {r4} pop {r0} @@ -379398,39 +379398,39 @@ _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] ldrb r0, [r0] cmp r0, 0xD - bls _080C8EC2 - b _080C9096 -_080C8EC2: + bls @080C8EC2 + b @080C9096 +@080C8EC2: lsls r0, 2 - ldr r1, =_080C8ED4 + ldr r1, =@080C8ED4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C8ED4: - .4byte _080C8F0C - .4byte _080C8F22 - .4byte _080C8F5A - .4byte _080C8F80 - .4byte _080C8F8C - .4byte _080C8FA4 - .4byte _080C8FE0 - .4byte _080C8FF8 - .4byte _080C9004 - .4byte _080C9008 - .4byte _080C901C - .4byte _080C9038 - .4byte _080C904A - .4byte _080C9080 -_080C8F0C: +@080C8ED4: + .4byte @080C8F0C + .4byte @080C8F22 + .4byte @080C8F5A + .4byte @080C8F80 + .4byte @080C8F8C + .4byte @080C8FA4 + .4byte @080C8FE0 + .4byte @080C8FF8 + .4byte @080C9004 + .4byte @080C9008 + .4byte @080C901C + .4byte @080C9038 + .4byte @080C904A + .4byte @080C9080 +@080C8F0C: movs r0, 0x9 bl sub_80CAC58 movs r0, 0x1 @@ -379440,183 +379440,183 @@ _080C8F0C: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_080C8F22: +@080C8F22: bl sub_8198C58 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _080C8F4C + beq @080C8F4C cmp r1, 0 - bgt _080C8F40 + bgt @080C8F40 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _080C8F46 - b _080C9096 + beq @080C8F46 + b @080C9096 .align 2, 0 .pool -_080C8F40: +@080C8F40: cmp r1, 0x1 - beq _080C8F46 - b _080C9096 -_080C8F46: + beq @080C8F46 + b @080C9096 +@080C8F46: bl sub_80CADC4 - b _080C8FF8 -_080C8F4C: + b @080C8FF8 +@080C8F4C: bl sub_80CADC4 bl sub_80CE3A0 bl sub_80CE250 - b _080C905C -_080C8F5A: + b @080C905C +@080C8F5A: bl sub_80CE580 bl sub_80CE2A8 lsls r0, 24 cmp r0, 0 - beq _080C8F6A - b _080C9096 -_080C8F6A: - b _080C8F72 -_080C8F6C: + beq @080C8F6A + b @080C9096 +@080C8F6A: + b @080C8F72 +@080C8F6C: cmp r0, 0 - bne _080C8F72 - b _080C9070 -_080C8F72: + bne @080C8F72 + b @080C9070 +@080C8F72: bl sub_80CE580 lsls r0, 24 asrs r0, 24 cmp r0, 0x1 - bne _080C8F6C - b _080C905C -_080C8F80: + bne @080C8F6C + b @080C905C +@080C8F80: bl sub_80CE2D8 bl sub_80CA230 movs r0, 0xA - b _080C9058 -_080C8F8C: + b @080C9058 +@080C8F8C: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 - bne _080C8F9A - b _080C9096 -_080C8F9A: + bne @080C8F9A + b @080C9096 +@080C8F9A: movs r0, 0xB - b _080C9058 + b @080C9058 .align 2, 0 .pool -_080C8FA4: +@080C8FA4: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 - beq _080C9096 + beq @080C9096 bl sub_80CADC4 ldr r0, =0x02039d0c ldrb r0, [r0] cmp r0, 0 - beq _080C8FD0 + beq @080C8FD0 bl party_compaction bl sub_80CB950 - b _080C905C + b @080C905C .align 2, 0 .pool -_080C8FD0: +@080C8FD0: ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x7 strb r0, [r1] - b _080C9096 + b @080C9096 .align 2, 0 .pool -_080C8FE0: +@080C8FE0: bl sub_80CB9BC lsls r0, 24 cmp r0, 0 - bne _080C9096 + bne @080C9096 bl sub_80CE00C bl BoxSetMosaic bl sub_80CAB20 - b _080C905C -_080C8FF8: + b @080C905C +@080C8FF8: ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow - b _080C9096 + b @080C9096 .align 2, 0 .pool -_080C9004: +@080C9004: movs r0, 0xA - b _080C9058 -_080C9008: + b @080C9058 +@080C9008: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 - beq _080C9096 + beq @080C9096 movs r0, 0x15 - b _080C9058 + b @080C9058 .align 2, 0 .pool -_080C901C: +@080C901C: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 - beq _080C9096 + beq @080C9096 bl sub_80CADC4 bl sub_80CC064 - b _080C905C + b @080C905C .align 2, 0 .pool -_080C9038: +@080C9038: bl sub_80CC0A0 lsls r0, 24 cmp r0, 0 - bne _080C9096 + bne @080C9096 bl sub_80CE324 movs r0, 0x13 - b _080C9058 -_080C904A: + b @080C9058 +@080C904A: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 - beq _080C9096 + beq @080C9096 movs r0, 0x14 -_080C9058: +@080C9058: bl sub_80CAC58 -_080C905C: +@080C905C: ldr r0, =0x02039d08 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C9096 + b @080C9096 .align 2, 0 .pool -_080C9070: +@080C9070: ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x8 strb r0, [r1] - b _080C9096 + b @080C9096 .align 2, 0 .pool -_080C9080: +@080C9080: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 - beq _080C9096 + beq @080C9096 bl sub_80CADC4 ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow -_080C9096: +@080C9096: pop {r0} bx r0 .align 2, 0 @@ -379624,19 +379624,19 @@ _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] ldrb r0, [r0] cmp r0, 0 - beq _080C90BC + beq @080C90BC cmp r0, 0x1 - beq _080C90F0 - b _080C9118 + beq @080C90F0 + b @080C9118 .align 2, 0 .pool -_080C90BC: +@080C90BC: movs r0, 0xC bl sub_80CAC58 ldr r0, [r4] @@ -379656,14 +379656,14 @@ _080C90BC: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C9118 + b @080C9118 .align 2, 0 .pool -_080C90F0: +@080C90F0: bl sub_811FBA4 lsls r0, 24 cmp r0, 0 - bne _080C9118 + bne @080C9118 bl sub_811FAF8 bl sub_80CADC4 ldr r0, [r4] @@ -379674,7 +379674,7 @@ _080C90F0: bl sub_80CA230 ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow -_080C9118: +@080C9118: pop {r4} pop {r0} bx r0 @@ -379683,45 +379683,45 @@ _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] ldrb r1, [r0] cmp r1, 0x1 - beq _080C9174 + beq @080C9174 cmp r1, 0x1 - bgt _080C9144 + bgt @080C9144 cmp r1, 0 - beq _080C914E - b _080C91D2 + beq @080C914E + b @080C91D2 .align 2, 0 .pool -_080C9144: +@080C9144: cmp r1, 0x2 - beq _080C919C + beq @080C919C cmp r1, 0x3 - beq _080C91C2 - b _080C91D2 -_080C914E: + beq @080C91C2 + b @080C91D2 +@080C914E: ldr r1, =0x00000ce6 adds r0, r1 ldrh r0, [r0] bl itemid_is_mail lsls r0, 24 cmp r0, 0 - bne _080C9168 + bne @080C9168 bl sub_80CADC4 - b _080C91B8 + b @080C91B8 .align 2, 0 .pool -_080C9168: +@080C9168: ldr r0, =sub_80C96B8 + 1 bl add_to_c3_somehow - b _080C91D2 + b @080C91D2 .align 2, 0 .pool -_080C9174: +@080C9174: movs r0, 0x2 bl sub_80CFE54 ldr r0, =0x02039d0c @@ -379735,33 +379735,33 @@ _080C9174: lsrs r1, 24 adds r0, r4, 0 bl sub_80D0E90 - b _080C91B8 + b @080C91B8 .align 2, 0 .pool -_080C919C: +@080C919C: bl sub_80D1218 lsls r0, 24 cmp r0, 0 - bne _080C91D2 + bne @080C91D2 movs r0, 0x3 bl sub_80CFE54 bl sub_80CADC4 bl sub_80CE00C bl sub_80CA4FC -_080C91B8: +@080C91B8: ldr r1, [r5] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C91D2 -_080C91C2: + b @080C91D2 +@080C91C2: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _080C91D2 + bne @080C91D2 ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow -_080C91D2: +@080C91D2: pop {r4,r5} pop {r0} bx r0 @@ -379770,28 +379770,28 @@ _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] ldrb r0, [r0] cmp r0, 0x4 - bhi _080C928C + bhi @080C928C lsls r0, 2 - ldr r1, =_080C91FC + ldr r1, =@080C91FC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C91FC: - .4byte _080C9264 - .4byte _080C9210 - .4byte _080C9238 - .4byte _080C9258 - .4byte _080C927C -_080C9210: +@080C91FC: + .4byte @080C9264 + .4byte @080C9210 + .4byte @080C9238 + .4byte @080C9258 + .4byte @080C927C +@080C9210: movs r0, 0x2 bl sub_80CFE54 ldr r0, =0x02039d0c @@ -379805,47 +379805,47 @@ _080C9210: lsrs r1, 24 adds r0, r4, 0 bl sub_80D1080 - b _080C9268 + b @080C9268 .align 2, 0 .pool -_080C9238: +@080C9238: bl sub_80D1218 lsls r0, 24 cmp r0, 0 - bne _080C928C + bne @080C928C movs r0, 0 bl sub_80CFE54 bl sub_80CE00C bl sub_80CA4FC movs r0, 0x1C bl sub_80CAC58 - b _080C9268 -_080C9258: + b @080C9268 +@080C9258: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 - beq _080C928C -_080C9264: + beq @080C928C +@080C9264: bl sub_80CADC4 -_080C9268: +@080C9268: ldr r0, =0x02039d08 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C928C + b @080C928C .align 2, 0 .pool -_080C927C: +@080C927C: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _080C928C + bne @080C928C ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow -_080C928C: +@080C928C: pop {r4} pop {r0} bx r0 @@ -379854,31 +379854,31 @@ _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] ldrb r0, [r0] adds r5, r1, 0 cmp r0, 0x4 - bls _080C92A8 - b _080C93A2 -_080C92A8: + bls @080C92A8 + b @080C93A2 +@080C92A8: lsls r0, 2 - ldr r1, =_080C92BC + ldr r1, =@080C92BC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C92BC: - .4byte _080C92D0 - .4byte _080C9328 - .4byte _080C9348 - .4byte _080C938C - .4byte _080C9374 -_080C92D0: +@080C92BC: + .4byte @080C92D0 + .4byte @080C9328 + .4byte @080C9348 + .4byte @080C938C + .4byte @080C9374 +@080C92D0: ldr r0, [r5] ldr r1, =0x00000ce6 adds r0, r1 @@ -379887,7 +379887,7 @@ _080C92D0: bl bag_add_item lsls r0, 24 cmp r0, 0 - bne _080C92FC + bne @080C92FC movs r0, 0x20 bl audio_play movs r0, 0x1A @@ -379895,10 +379895,10 @@ _080C92D0: ldr r1, [r5] movs r0, 0x3 strb r0, [r1] - b _080C93A2 + b @080C93A2 .align 2, 0 .pool -_080C92FC: +@080C92FC: movs r0, 0x5 bl audio_play ldr r0, =0x02039d0c @@ -379915,30 +379915,30 @@ _080C92FC: ldr r1, [r5] movs r0, 0x1 strb r0, [r1] - b _080C93A2 + b @080C93A2 .align 2, 0 .pool -_080C9328: +@080C9328: bl sub_80D1218 lsls r0, 24 cmp r0, 0 - bne _080C93A2 + bne @080C93A2 movs r0, 0x19 bl sub_80CAC58 ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x2 strb r0, [r1] - b _080C93A2 + b @080C93A2 .align 2, 0 .pool -_080C9348: +@080C9348: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 - beq _080C93A2 + beq @080C93A2 bl sub_80CADC4 bl sub_80CE00C bl sub_80CA4FC @@ -379946,30 +379946,30 @@ _080C9348: ldr r1, [r0] movs r0, 0x4 strb r0, [r1] - b _080C93A2 + b @080C93A2 .align 2, 0 .pool -_080C9374: +@080C9374: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _080C93A2 + bne @080C93A2 ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow - b _080C93A2 + b @080C93A2 .align 2, 0 .pool -_080C938C: +@080C938C: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 - beq _080C93A2 + beq @080C93A2 bl sub_80CADC4 ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow -_080C93A2: +@080C93A2: pop {r4,r5} pop {r0} bx r0 @@ -379978,29 +379978,29 @@ _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] ldrb r0, [r0] adds r4, r1, 0 cmp r0, 0x4 - bhi _080C948C + bhi @080C948C lsls r0, 2 - ldr r1, =_080C93D0 + ldr r1, =@080C93D0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C93D0: - .4byte _080C93E4 - .4byte _080C9410 - .4byte _080C9438 - .4byte _080C9458 - .4byte _080C947C -_080C93E4: +@080C93D0: + .4byte @080C93E4 + .4byte @080C9410 + .4byte @080C9438 + .4byte @080C9458 + .4byte @080C947C +@080C93E4: ldr r0, [r4] ldr r1, =0x00000ce6 adds r0, r1 @@ -380008,19 +380008,19 @@ _080C93E4: bl itemid_is_mail lsls r0, 24 cmp r0, 0 - bne _080C9404 + bne @080C9404 bl sub_80CADC4 ldr r1, [r4] - b _080C946C + b @080C946C .align 2, 0 .pool -_080C9404: +@080C9404: ldr r0, =sub_80C96B8 + 1 bl add_to_c3_somehow - b _080C948C + b @080C948C .align 2, 0 .pool -_080C9410: +@080C9410: movs r0, 0x2 bl sub_80CFE54 ldr r0, =0x02039d0c @@ -380034,47 +380034,47 @@ _080C9410: lsrs r1, 24 adds r0, r4, 0 bl sub_80D0FAC - b _080C9468 + b @080C9468 .align 2, 0 .pool -_080C9438: +@080C9438: bl sub_80D1218 lsls r0, 24 cmp r0, 0 - bne _080C948C + bne @080C948C movs r0, 0x3 bl sub_80CFE54 bl sub_80CE00C bl sub_80CA4FC movs r0, 0x1D bl sub_80CAC58 - b _080C9468 -_080C9458: + b @080C9468 +@080C9458: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 - beq _080C948C + beq @080C948C bl sub_80CADC4 -_080C9468: +@080C9468: ldr r0, =0x02039d08 ldr r1, [r0] -_080C946C: +@080C946C: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C948C + b @080C948C .align 2, 0 .pool -_080C947C: +@080C947C: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _080C948C + bne @080C948C ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow -_080C948C: +@080C948C: pop {r4} pop {r0} bx r0 @@ -380083,83 +380083,83 @@ _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] ldrb r0, [r0] cmp r0, 0x6 - bhi _080C9544 + bhi @080C9544 lsls r0, 2 - ldr r1, =_080C94B8 + ldr r1, =@080C94B8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C94B8: - .4byte _080C94D4 - .4byte _080C94DA - .4byte _080C94F4 - .4byte _080C94FA - .4byte _080C9500 - .4byte _080C9518 - .4byte _080C9534 -_080C94D4: +@080C94B8: + .4byte @080C94D4 + .4byte @080C94DA + .4byte @080C94F4 + .4byte @080C94FA + .4byte @080C9500 + .4byte @080C9518 + .4byte @080C9534 +@080C94D4: bl sub_80CADC4 - b _080C9522 -_080C94DA: + b @080C9522 +@080C94DA: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _080C9544 + bne @080C9544 movs r0, 0x6 bl audio_play bl sub_80D17B4 bl sub_80D1818 - b _080C9522 -_080C94F4: + b @080C9522 +@080C94F4: bl sub_80D184C - b _080C951C -_080C94FA: + b @080C951C +@080C94FA: bl is_dma3_queue_busy_with_gpu_copy - b _080C951C -_080C9500: + b @080C951C +@080C9500: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 - beq _080C9544 + beq @080C9544 movs r0, 0x6 bl audio_play - b _080C9522 + b @080C9522 .align 2, 0 .pool -_080C9518: +@080C9518: bl sub_80D18E4 -_080C951C: +@080C951C: lsls r0, 24 cmp r0, 0 - bne _080C9544 -_080C9522: + bne @080C9544 +@080C9522: ldr r0, =0x02039d08 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C9544 + b @080C9544 .align 2, 0 .pool -_080C9534: +@080C9534: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _080C9544 + bne @080C9544 ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow -_080C9544: +@080C9544: pop {r0} bx r0 .align 2, 0 @@ -380167,31 +380167,31 @@ _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] ldrb r0, [r0] cmp r0, 0x5 - bls _080C955A - b _080C9664 -_080C955A: + bls @080C955A + b @080C9664 +@080C955A: lsls r0, 2 - ldr r1, =_080C956C + ldr r1, =@080C956C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C956C: - .4byte _080C9584 - .4byte _080C95A4 - .4byte _080C9602 - .4byte _080C9624 - .4byte _080C9638 - .4byte _080C9654 -_080C9584: +@080C956C: + .4byte @080C9584 + .4byte @080C95A4 + .4byte @080C9602 + .4byte @080C9624 + .4byte @080C9638 + .4byte @080C9654 +@080C9584: movs r0, 0x5 bl audio_play movs r0, 0x1B @@ -380202,29 +380202,29 @@ _080C9584: ldr r1, [r0] movs r0, 0x1 strb r0, [r1] - b _080C9664 + b @080C9664 .align 2, 0 .pool -_080C95A4: +@080C95A4: bl sub_8198C58 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _080C95C8 + beq @080C95C8 cmp r1, 0 - bgt _080C95BE + bgt @080C95BE movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _080C95C2 - b _080C9664 -_080C95BE: + beq @080C95C2 + b @080C9664 +@080C95BE: cmp r1, 0x1 - bne _080C9664 -_080C95C2: + bne @080C9664 +@080C95C2: bl sub_80CADC4 - b _080C9648 -_080C95C8: + b @080C9648 +@080C95C8: ldr r4, =0x02039d08 ldr r0, [r4] ldr r1, =0x00002234 @@ -380235,66 +380235,66 @@ _080C95C8: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080C95F4 + bne @080C95F4 bl sub_80CADC4 ldr r1, [r4] movs r0, 0x3 strb r0, [r1] - b _080C9664 + b @080C9664 .align 2, 0 .pool -_080C95F4: +@080C95F4: movs r0, 0x1A bl sub_80CAC58 ldr r1, [r4] movs r0, 0x2 strb r0, [r1] - b _080C9664 -_080C9602: + b @080C9664 +@080C9602: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 - beq _080C9664 + beq @080C9664 bl sub_80CADC4 ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x5 strb r0, [r1] - b _080C9664 + b @080C9664 .align 2, 0 .pool -_080C9624: +@080C9624: bl sub_80D1194 ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x4 strb r0, [r1] - b _080C9664 + b @080C9664 .align 2, 0 .pool -_080C9638: +@080C9638: bl sub_80D1218 lsls r0, 24 cmp r0, 0 - bne _080C9664 + bne @080C9664 movs r0, 0 bl sub_80CFE54 -_080C9648: +@080C9648: ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow - b _080C9664 + b @080C9664 .align 2, 0 .pool -_080C9654: +@080C9654: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _080C9664 + bne @080C9664 ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow -_080C9664: +@080C9664: pop {r4} pop {r0} bx r0 @@ -380303,35 +380303,35 @@ _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] ldrb r0, [r0] cmp r0, 0 - beq _080C9688 + beq @080C9688 cmp r0, 0x1 - beq _080C969A - b _080C96AE + beq @080C969A + b @080C96AE .align 2, 0 .pool -_080C9688: +@080C9688: bl party_compaction bl sub_80CB950 ldr r1, [r4] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C96AE -_080C969A: + b @080C96AE +@080C969A: bl sub_80CB9BC lsls r0, 24 cmp r0, 0 - bne _080C96AE + bne @080C96AE bl sub_80CAB20 ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow -_080C96AE: +@080C96AE: pop {r4} pop {r0} bx r0 @@ -380340,60 +380340,60 @@ _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] ldrb r0, [r0] cmp r0, 0x1 - beq _080C96E6 + beq @080C96E6 cmp r0, 0x1 - bgt _080C96D4 + bgt @080C96D4 cmp r0, 0 - beq _080C96DE - b _080C9720 + beq @080C96DE + b @080C9720 .align 2, 0 .pool -_080C96D4: +@080C96D4: cmp r0, 0x2 - beq _080C96F2 + beq @080C96F2 cmp r0, 0x3 - beq _080C9710 - b _080C9720 -_080C96DE: + beq @080C9710 + b @080C9720 +@080C96DE: movs r0, 0x1E bl sub_80CAC58 - b _080C9702 -_080C96E6: + b @080C9702 +@080C96E6: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _080C9720 - b _080C9702 -_080C96F2: + bne @080C9720 + b @080C9702 +@080C96F2: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 - beq _080C9720 + beq @080C9720 bl sub_80CADC4 -_080C9702: +@080C9702: ldr r1, [r4] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C9720 + b @080C9720 .align 2, 0 .pool -_080C9710: +@080C9710: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _080C9720 + bne @080C9720 ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow -_080C9720: +@080C9720: pop {r4} pop {r0} bx r0 @@ -380402,25 +380402,25 @@ _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] ldrb r0, [r0] cmp r0, 0x1 - beq _080C9762 + beq @080C9762 cmp r0, 0x1 - bgt _080C9748 + bgt @080C9748 cmp r0, 0 - beq _080C974E - b _080C9818 + beq @080C974E + b @080C9818 .align 2, 0 .pool -_080C9748: +@080C9748: cmp r0, 0x2 - beq _080C9774 - b _080C9818 -_080C974E: + beq @080C9774 + b @080C9818 +@080C974E: movs r0, 0x1 bl sub_80CAC58 bl sub_80CFFD0 @@ -380428,78 +380428,78 @@ _080C974E: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C9818 -_080C9762: + b @080C9818 +@080C9762: bl sub_80D00A8 lsls r0, 24 cmp r0, 0 - bne _080C9818 + bne @080C9818 ldr r1, [r4] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_080C9774: +@080C9774: bl sub_80D00AC adds r0, 0x1 lsls r0, 16 asrs r0, 16 cmp r0, 0xC - bhi _080C9818 + bhi @080C9818 lsls r0, 2 - ldr r1, =_080C9790 + ldr r1, =@080C9790 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C9790: - .4byte _080C97C4 - .4byte _080C97C4 - .4byte _080C9818 - .4byte _080C9818 - .4byte _080C9818 - .4byte _080C9818 - .4byte _080C9818 - .4byte _080C9818 - .4byte _080C9818 - .4byte _080C9818 - .4byte _080C9808 - .4byte _080C97F0 - .4byte _080C97DC -_080C97C4: +@080C9790: + .4byte @080C97C4 + .4byte @080C97C4 + .4byte @080C9818 + .4byte @080C9818 + .4byte @080C9818 + .4byte @080C9818 + .4byte @080C9818 + .4byte @080C9818 + .4byte @080C9818 + .4byte @080C9818 + .4byte @080C9808 + .4byte @080C97F0 + .4byte @080C97DC +@080C97C4: movs r0, 0x1 bl sub_80CD1A8 bl sub_80CADC4 ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow - b _080C9818 + b @080C9818 .align 2, 0 .pool -_080C97DC: +@080C97DC: movs r0, 0x5 bl audio_play ldr r0, =sub_80C9AC8 + 1 bl add_to_c3_somehow - b _080C9818 + b @080C9818 .align 2, 0 .pool -_080C97F0: +@080C97F0: movs r0, 0x5 bl audio_play bl sub_80CADC4 ldr r0, =sub_80C9824 + 1 bl add_to_c3_somehow - b _080C9818 + b @080C9818 .align 2, 0 .pool -_080C9808: +@080C9808: movs r0, 0x5 bl audio_play bl sub_80CADC4 ldr r0, =sub_80C99D8 + 1 bl add_to_c3_somehow -_080C9818: +@080C9818: pop {r4} pop {r0} bx r0 @@ -380508,32 +380508,32 @@ _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] ldrb r0, [r0] cmp r0, 0x6 - bls _080C9832 - b _080C99CC -_080C9832: + bls @080C9832 + b @080C99CC +@080C9832: lsls r0, 2 - ldr r1, =_080C9844 + ldr r1, =@080C9844 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C9844: - .4byte _080C9860 - .4byte _080C9878 - .4byte _080C9894 - .4byte _080C990C - .4byte _080C993C - .4byte _080C9990 - .4byte _080C99AC -_080C9860: +@080C9844: + .4byte @080C9860 + .4byte @080C9878 + .4byte @080C9894 + .4byte @080C990C + .4byte @080C993C + .4byte @080C9990 + .4byte @080C99AC +@080C9860: bl sub_80CADD8 movs r0, 0x2 bl sub_80CAC58 @@ -380541,24 +380541,24 @@ _080C9860: ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 - b _080C99CA + b @080C99CA .align 2, 0 .pool -_080C9878: +@080C9878: bl sub_80D00A8 lsls r0, 24 cmp r0, 0 - beq _080C9884 - b _080C99CC -_080C9884: + beq @080C9884 + b @080C99CC +@080C9884: ldr r0, =0x02039d08 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 - b _080C99CA + b @080C99CA .align 2, 0 .pool -_080C9894: +@080C9894: bl sub_80D00AC ldr r4, =0x02039d08 ldr r1, [r4] @@ -380568,26 +380568,26 @@ _080C9894: movs r0, 0 ldrsh r1, [r1, r0] cmp r1, 0x15 - bgt _080C98C0 + bgt @080C98C0 cmp r1, 0x12 - bge _080C98D2 + bge @080C98D2 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _080C98C6 - b _080C99CC + beq @080C98C6 + b @080C99CC .align 2, 0 .pool -_080C98C0: +@080C98C0: cmp r1, 0x16 - beq _080C98EC - b _080C99CC -_080C98C6: + beq @080C98EC + b @080C99CC +@080C98C6: movs r0, 0x1 bl sub_80CD1A8 bl sub_80CADC4 - b _080C99A0 -_080C98D2: + b @080C99A0 +@080C98D2: movs r0, 0x5 bl audio_play bl sub_80D013C @@ -380598,8 +380598,8 @@ _080C98D2: strh r0, [r2] ldrb r0, [r1] adds r0, 0x1 - b _080C99CA -_080C98EC: + b @080C99CA +@080C98EC: movs r0, 0x5 bl audio_play ldr r0, [r4] @@ -380612,12 +380612,12 @@ _080C98EC: bl sub_80CADC4 ldr r1, [r4] movs r0, 0x6 - b _080C99CA -_080C990C: + b @080C99CA +@080C990C: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _080C99CC + bne @080C99CC ldr r4, =0x02039d08 ldr r0, [r4] ldr r1, =0x0000078e @@ -380629,10 +380629,10 @@ _080C990C: ldr r1, [r4] ldrb r0, [r1] adds r0, 0x1 - b _080C99CA + b @080C99CA .align 2, 0 .pool -_080C993C: +@080C993C: bl sub_80D00AC ldr r4, =0x02039d08 ldr r1, [r4] @@ -380645,17 +380645,17 @@ _080C993C: movs r0, 0x2 negs r0, r0 cmp r1, r0 - beq _080C99CC + beq @080C99CC adds r0, 0x1 cmp r1, r0 - bne _080C996C + bne @080C996C bl sub_80CADC4 ldr r1, [r4] movs r0, 0 - b _080C99CA + b @080C99CA .align 2, 0 .pool -_080C996C: +@080C996C: movs r0, 0x5 bl audio_play bl sub_80CADC4 @@ -380670,25 +380670,25 @@ _080C996C: ldr r1, [r4] ldrb r0, [r1] adds r0, 0x1 - b _080C99CA -_080C9990: + b @080C99CA +@080C9990: bl sub_80CC6B0 lsls r0, 24 cmp r0, 0 - bne _080C99CC + bne @080C99CC movs r0, 0x1 bl sub_80CD1A8 -_080C99A0: +@080C99A0: ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow - b _080C99CC + b @080C99CC .align 2, 0 .pool -_080C99AC: +@080C99AC: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _080C99CC + bne @080C99CC ldr r4, =0x02039d08 ldr r0, [r4] movs r1, 0xF2 @@ -380698,9 +380698,9 @@ _080C99AC: bl sub_80CC680 ldr r1, [r4] movs r0, 0x5 -_080C99CA: +@080C99CA: strb r0, [r1] -_080C99CC: +@080C99CC: pop {r4,r5} pop {r0} bx r0 @@ -380709,28 +380709,28 @@ _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 ldr r0, [r5] ldrb r4, [r0] cmp r4, 0x1 - beq _080C9A2C + beq @080C9A2C cmp r4, 0x1 - bgt _080C99F4 + bgt @080C99F4 cmp r4, 0 - beq _080C99FE - b _080C9AB8 + beq @080C99FE + b @080C9AB8 .align 2, 0 .pool -_080C99F4: +@080C99F4: cmp r4, 0x2 - beq _080C9A84 + beq @080C9A84 cmp r4, 0x3 - beq _080C9A9C - b _080C9AB8 -_080C99FE: + beq @080C9A9C + b @080C9AB8 +@080C99FE: movs r0, 0x5 bl sub_80CAC58 ldr r0, [r5] @@ -380745,10 +380745,10 @@ _080C99FE: lsls r0, 24 lsrs r0, 24 bl sub_80C78D4 - b _080C9A8E + b @080C9A8E .align 2, 0 .pool -_080C9A2C: +@080C9A2C: bl sub_80C78F0 ldr r1, [r5] lsls r0, 24 @@ -380759,7 +380759,7 @@ _080C9A2C: movs r2, 0 ldrsh r0, [r1, r2] cmp r0, 0xC8 - beq _080C9AB8 + beq @080C9AB8 bl sub_80CADC4 bl sub_80C78E4 bl sub_80C7890 @@ -380769,39 +380769,39 @@ _080C9A2C: movs r2, 0 ldrsh r0, [r1, r2] cmp r0, 0xC9 - beq _080C9A6C + beq @080C9A6C adds r4, r0, 0 bl get_preferred_box lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bne _080C9A8E -_080C9A6C: + bne @080C9A8E +@080C9A6C: movs r0, 0x1 bl sub_80CD1A8 ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow - b _080C9AB8 + b @080C9AB8 .align 2, 0 .pool -_080C9A84: +@080C9A84: ldr r1, =0x000002ca adds r0, r1 ldrb r0, [r0] bl sub_80CC464 -_080C9A8E: +@080C9A8E: ldr r1, [r5] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C9AB8 + b @080C9AB8 .align 2, 0 .pool -_080C9A9C: +@080C9A9C: bl sub_80CC54C lsls r0, 24 cmp r0, 0 - bne _080C9AB8 + bne @080C9AB8 ldr r0, [r5] ldr r2, =0x000002ca adds r0, r2 @@ -380809,7 +380809,7 @@ _080C9A9C: bl sub_80D1D18 ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow -_080C9AB8: +@080C9AB8: add sp, 0x4 pop {r4,r5} pop {r0} @@ -380819,20 +380819,20 @@ _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 ldr r0, [r5] ldrb r4, [r0] cmp r4, 0 - beq _080C9AE0 + beq @080C9AE0 cmp r4, 0x1 - beq _080C9AFE - b _080C9B18 + beq @080C9AFE + b @080C9B18 .align 2, 0 .pool -_080C9AE0: +@080C9AE0: bl sub_80CE760 movs r0, 0x1 negs r0, r0 @@ -380845,12 +380845,12 @@ _080C9AE0: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C9B18 -_080C9AFE: + b @080C9B18 +@080C9AFE: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne _080C9B18 + bne @080C9B18 ldr r0, =0x02039d0f strb r4, [r0] ldr r1, [r5] @@ -380858,7 +380858,7 @@ _080C9AFE: strb r0, [r1, 0x2] ldr r0, =sub_80C9E50 + 1 bl add_to_c3_somehow -_080C9B18: +@080C9B18: add sp, 0x4 pop {r4,r5} pop {r0} @@ -380868,20 +380868,20 @@ _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 ldr r0, [r5] ldrb r4, [r0] cmp r4, 0 - beq _080C9B40 + beq @080C9B40 cmp r4, 0x1 - beq _080C9B5E - b _080C9B78 + beq @080C9B5E + b @080C9B78 .align 2, 0 .pool -_080C9B40: +@080C9B40: bl sub_80CE7E8 movs r0, 0x1 negs r0, r0 @@ -380894,20 +380894,20 @@ _080C9B40: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C9B78 -_080C9B5E: + b @080C9B78 +@080C9B5E: bl fade_and_return_progress_probably lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _080C9B78 + bne @080C9B78 ldr r0, =0x02039d0f strb r1, [r0] ldr r0, [r5] strb r4, [r0, 0x2] ldr r0, =sub_80C9E50 + 1 bl add_to_c3_somehow -_080C9B78: +@080C9B78: add sp, 0x4 pop {r4,r5} pop {r0} @@ -380917,20 +380917,20 @@ _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 ldr r0, [r4] ldrb r1, [r0] cmp r1, 0 - beq _080C9BA0 + beq @080C9BA0 cmp r1, 0x1 - beq _080C9BBA - b _080C9BD6 + beq @080C9BBA + b @080C9BD6 .align 2, 0 .pool -_080C9BA0: +@080C9BA0: movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -380942,12 +380942,12 @@ _080C9BA0: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C9BD6 -_080C9BBA: + b @080C9BD6 +@080C9BBA: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne _080C9BD6 + bne @080C9BD6 ldr r1, =0x02039d0f movs r0, 0x2 strb r0, [r1] @@ -380956,7 +380956,7 @@ _080C9BBA: strb r0, [r1, 0x2] ldr r0, =sub_80C9E50 + 1 bl add_to_c3_somehow -_080C9BD6: +@080C9BD6: add sp, 0x4 pop {r4} pop {r0} @@ -380966,34 +380966,34 @@ _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] ldrb r0, [r0] cmp r0, 0x4 - bls _080C9BF6 - b _080C9D08 -_080C9BF6: + bls @080C9BF6 + b @080C9D08 +@080C9BF6: lsls r0, 2 - ldr r1, =_080C9C08 + ldr r1, =@080C9C08 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C9C08: - .4byte _080C9C1C - .4byte _080C9C78 - .4byte _080C9C8C - .4byte _080C9CC8 - .4byte _080C9CE4 -_080C9C1C: +@080C9C08: + .4byte @080C9C1C + .4byte @080C9C78 + .4byte @080C9C8C + .4byte @080C9CC8 + .4byte @080C9CE4 +@080C9C1C: bl sub_80CEAD0 lsls r0, 24 cmp r0, 0 - beq _080C9C40 + beq @080C9C40 movs r0, 0x20 bl audio_play movs r0, 0xF @@ -381002,20 +381002,20 @@ _080C9C1C: ldr r1, [r0] movs r0, 0x1 strb r0, [r1] - b _080C9D08 + b @080C9D08 .align 2, 0 .pool -_080C9C40: +@080C9C40: bl sub_80D127C lsls r0, 24 cmp r0, 0 - beq _080C9C58 + beq @080C9C58 ldr r0, =sub_80C954C + 1 bl add_to_c3_somehow - b _080C9D08 + b @080C9D08 .align 2, 0 .pool -_080C9C58: +@080C9C58: movs r0, 0x5 bl audio_play movs r0, 0 @@ -381026,67 +381026,67 @@ _080C9C58: ldr r1, [r0] movs r0, 0x2 strb r0, [r1] - b _080C9D08 + b @080C9D08 .align 2, 0 .pool -_080C9C78: +@080C9C78: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 - beq _080C9D08 - b _080C9CAA + beq @080C9D08 + b @080C9CAA .align 2, 0 .pool -_080C9C8C: +@080C9C8C: bl sub_8198C58 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _080C9CBC + beq @080C9CBC cmp r1, 0 - bgt _080C9CA6 + bgt @080C9CA6 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _080C9CAA - b _080C9D08 -_080C9CA6: + beq @080C9CAA + b @080C9D08 +@080C9CA6: cmp r1, 0x1 - bne _080C9D08 -_080C9CAA: + bne @080C9D08 +@080C9CAA: bl sub_80CADC4 ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow - b _080C9D08 + b @080C9D08 .align 2, 0 .pool -_080C9CBC: +@080C9CBC: movs r0, 0x3 bl audio_play bl sub_80CADC4 - b _080C9CD2 -_080C9CC8: + b @080C9CD2 +@080C9CC8: movs r0, 0x14 movs r1, 0 movs r2, 0x1 bl sub_80F9BF4 -_080C9CD2: +@080C9CD2: ldr r0, =0x02039d08 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C9D08 + b @080C9D08 .align 2, 0 .pool -_080C9CE4: +@080C9CE4: bl sub_80F9C30 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _080C9D08 + bne @080C9D08 bl sub_80CABE0 bl calc_player_party_count ldr r1, =0x020244e9 @@ -381096,7 +381096,7 @@ _080C9CE4: strb r4, [r0, 0x2] ldr r0, =sub_80C9E50 + 1 bl add_to_c3_somehow -_080C9D08: +@080C9D08: pop {r4} pop {r0} bx r0 @@ -381105,34 +381105,34 @@ _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] ldrb r0, [r0] cmp r0, 0x4 - bls _080C9D2A - b _080C9E3C -_080C9D2A: + bls @080C9D2A + b @080C9E3C +@080C9D2A: lsls r0, 2 - ldr r1, =_080C9D3C + ldr r1, =@080C9D3C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080C9D3C: - .4byte _080C9D50 - .4byte _080C9DAC - .4byte _080C9DC0 - .4byte _080C9DFC - .4byte _080C9E18 -_080C9D50: +@080C9D3C: + .4byte @080C9D50 + .4byte @080C9DAC + .4byte @080C9DC0 + .4byte @080C9DFC + .4byte @080C9E18 +@080C9D50: bl sub_80CEAD0 lsls r0, 24 cmp r0, 0 - beq _080C9D74 + beq @080C9D74 movs r0, 0x20 bl audio_play movs r0, 0xF @@ -381141,20 +381141,20 @@ _080C9D50: ldr r1, [r0] movs r0, 0x1 strb r0, [r1] - b _080C9E3C + b @080C9E3C .align 2, 0 .pool -_080C9D74: +@080C9D74: bl sub_80D127C lsls r0, 24 cmp r0, 0 - beq _080C9D8C + beq @080C9D8C ldr r0, =sub_80C954C + 1 bl add_to_c3_somehow - b _080C9E3C + b @080C9E3C .align 2, 0 .pool -_080C9D8C: +@080C9D8C: movs r0, 0x5 bl audio_play movs r0, 0x12 @@ -381165,68 +381165,68 @@ _080C9D8C: ldr r1, [r0] movs r0, 0x2 strb r0, [r1] - b _080C9E3C + b @080C9E3C .align 2, 0 .pool -_080C9DAC: +@080C9DAC: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 - beq _080C9E3C - b _080C9DE0 + beq @080C9E3C + b @080C9DE0 .align 2, 0 .pool -_080C9DC0: +@080C9DC0: bl sub_8198C58 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _080C9DE0 + beq @080C9DE0 cmp r1, 0 - bgt _080C9DDA + bgt @080C9DDA movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _080C9DF0 - b _080C9E3C -_080C9DDA: + beq @080C9DF0 + b @080C9E3C +@080C9DDA: cmp r1, 0x1 - beq _080C9DF0 - b _080C9E3C -_080C9DE0: + beq @080C9DF0 + b @080C9E3C +@080C9DE0: bl sub_80CADC4 ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow - b _080C9E3C + b @080C9E3C .align 2, 0 .pool -_080C9DF0: +@080C9DF0: movs r0, 0x3 bl audio_play bl sub_80CADC4 - b _080C9E06 -_080C9DFC: + b @080C9E06 +@080C9DFC: movs r0, 0x14 movs r1, 0 movs r2, 0 bl sub_80F9BF4 -_080C9E06: +@080C9E06: ldr r0, =0x02039d08 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080C9E3C + b @080C9E3C .align 2, 0 .pool -_080C9E18: +@080C9E18: bl sub_80F9C30 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _080C9E3C + bne @080C9E3C bl sub_80CABE0 bl calc_player_party_count ldr r1, =0x020244e9 @@ -381236,7 +381236,7 @@ _080C9E18: strb r4, [r0, 0x2] ldr r0, =sub_80C9E50 + 1 bl add_to_c3_somehow -_080C9E3C: +@080C9E3C: pop {r4} pop {r0} bx r0 @@ -381245,7 +381245,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} @@ -381258,38 +381258,38 @@ sub_80C9E50: @ 80C9E50 ldrb r4, [r0, 0x2] ldrb r0, [r0, 0x1] cmp r0, 0x3 - bne _080C9E88 + bne @080C9E88 bl sub_80D127C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080C9E88 + bne @080C9E88 bl sub_80D12D4 ldr r1, =0x02039d12 - b _080C9E8C + b @080C9E8C .align 2, 0 .pool -_080C9E88: +@080C9E88: ldr r1, =0x02039d12 movs r0, 0 -_080C9E8C: +@080C9E8C: strh r0, [r1] cmp r4, 0x1 - beq _080C9EB4 + beq @080C9EB4 cmp r4, 0x1 - ble _080C9E9E + ble @080C9E9E cmp r4, 0x2 - beq _080C9F1C + beq @080C9F1C cmp r4, 0x3 - beq _080C9F48 -_080C9E9E: + beq @080C9F48 +@080C9E9E: bl sub_80C9FC8 ldr r0, =sub_80C7678 + 1 bl set_callback2 - b _080C9F56 + b @080C9F56 .align 2, 0 .pool -_080C9EB4: +@080C9EB4: ldr r0, =0x02039d08 ldr r1, [r0] ldr r2, =0x0000218c @@ -381306,10 +381306,10 @@ _080C9EB4: ldrb r5, [r1] bl sub_80C9FC8 cmp r5, 0 - bne _080C9F04 + bne @080C9F04 ldr r0, =0x02039d14 cmp r4, r0 - bne _080C9F04 + bne @080C9F04 ldr r0, =c2_808CE60 + 1 str r0, [sp] movs r0, 0 @@ -381317,10 +381317,10 @@ _080C9EB4: adds r2, r7, 0 adds r3, r6, 0 bl sub_81BFA80 - b _080C9F56 + b @080C9F56 .align 2, 0 .pool -_080C9F04: +@080C9F04: ldr r0, =c2_808CE60 + 1 str r0, [sp] adds r0, r5, 0 @@ -381328,10 +381328,10 @@ _080C9F04: adds r2, r7, 0 adds r3, r6, 0 bl sub_81BF8EC - b _080C9F56 + b @080C9F56 .align 2, 0 .pool -_080C9F1C: +@080C9F1C: bl sub_80C9FC8 bl get_preferred_box lsls r0, 24 @@ -381346,16 +381346,16 @@ _080C9F1C: movs r2, 0 movs r3, 0 bl do_choose_name_or_words_screen - b _080C9F56 + b @080C9F56 .align 2, 0 .pool -_080C9F48: +@080C9F48: bl sub_80C9FC8 ldr r2, =c2_808CE60 + 1 movs r0, 0xB movs r1, 0 bl sub_81AAC90 -_080C9F56: +@080C9F56: mov r0, r8 bl remove_task add sp, 0x8 @@ -381369,7 +381369,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 @@ -381377,14 +381377,14 @@ sub_80C9F6C: @ 80C9F6C mov r0, sp strh r1, [r0] cmp r1, 0 - beq _080C9FC0 + beq @080C9FC0 bl sub_80CFE08 lsls r0, 24 lsrs r1, r0, 24 ldr r0, =0x02039d0c ldrb r0, [r0] cmp r0, 0 - beq _080C9FAC + beq @080C9FAC movs r0, 0x64 muls r0, r1 ldr r1, =0x020244ec @@ -381392,27 +381392,27 @@ sub_80C9F6C: @ 80C9F6C movs r1, 0xC mov r2, sp bl pokemon_setattr - b _080C9FB6 + b @080C9FB6 .align 2, 0 .pool -_080C9FAC: +@080C9FAC: adds r0, r1, 0 movs r1, 0xC mov r2, sp bl set_pokemon_data_from_selected_box -_080C9FB6: +@080C9FB6: mov r0, sp ldrh r0, [r0] movs r1, 0x1 bl sub_80D6AA4 -_080C9FC0: +@080C9FC0: add sp, 0x4 pop {r0} bx r0 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 @@ -381430,7 +381430,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 @@ -381454,7 +381454,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 @@ -381469,7 +381469,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, =0x08572734 @@ -381506,27 +381506,27 @@ sub_80CA044: @ 80CA044 thumb_func_end sub_80CA044 thumb_func_start sub_80CA0A4 -sub_80CA0A4: @ 80CA0A4 +sub_80CA0A4: ; 80CA0A4 push {lr} ldr r0, =0x08572714 bl Window_InitFromTemplates lsls r0, 16 cmp r0, 0 - beq _080CA0C0 + beq @080CA0C0 bl TextBox_ResetSomeField movs r0, 0x1 - b _080CA0C2 + b @080CA0C2 .align 2, 0 .pool -_080CA0C0: +@080CA0C0: movs r0, 0 -_080CA0C2: +@080CA0C2: pop {r1} bx r1 thumb_func_end sub_80CA0A4 thumb_func_start sub_80CA0C8 -sub_80CA0C8: @ 80CA0C8 +sub_80CA0C8: ; 80CA0C8 push {lr} ldr r0, =0x08572744 bl gpu_pal_obj_alloc_tag_and_apply @@ -381537,7 +381537,7 @@ sub_80CA0C8: @ 80CA0C8 thumb_func_end sub_80CA0C8 thumb_func_start sub_80CA0D8 -sub_80CA0D8: @ 80CA0D8 +sub_80CA0D8: ; 80CA0D8 push {lr} ldr r0, =0x085723dc movs r1, 0 @@ -381555,20 +381555,20 @@ sub_80CA0D8: @ 80CA0D8 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x3 - beq _080CA124 + beq @080CA124 ldr r0, =0x0857241c movs r1, 0x30 movs r2, 0x20 bl gpu_pal_apply - b _080CA12E + b @080CA12E .align 2, 0 .pool -_080CA124: +@080CA124: ldr r0, =0x0857243c movs r1, 0x30 movs r2, 0x20 bl gpu_pal_apply -_080CA12E: +@080CA12E: ldr r1, =0x00001e05 movs r0, 0xA bl lcd_io_set @@ -381583,7 +381583,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 @@ -381634,7 +381634,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, =0x0857274c @@ -381645,7 +381645,7 @@ sub_80CA1C4: @ 80CA1C4 mov r0, sp bl gpu_tile_obj_alloc_tag_and_copy_to_vram movs r4, 0 -_080CA1DA: +@080CA1DA: lsls r1, r4, 6 subs r1, r4 adds r1, 0x8 @@ -381673,7 +381673,7 @@ _080CA1DA: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x1 - bls _080CA1DA + bls @080CA1DA add sp, 0x8 pop {r4} pop {r0} @@ -381683,7 +381683,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] @@ -381705,7 +381705,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 @@ -381715,7 +381715,7 @@ BoxSetMosaic: @ 80CA260 adds r0, r1 ldr r2, [r0] cmp r2, 0 - beq _080CA2AC + beq @080CA2AC ldrb r0, [r2, 0x1] movs r1, 0x10 orrs r0, r1 @@ -381742,7 +381742,7 @@ BoxSetMosaic: @ 80CA260 lsrs r1, 16 movs r0, 0x4C bl lcd_io_set -_080CA2AC: +@080CA2AC: pop {r0} bx r0 .align 2, 0 @@ -381750,7 +381750,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 @@ -381766,7 +381766,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] @@ -381775,10 +381775,10 @@ BoxSetMosaic2: @ 80CA2D0 strh r0, [r4, 0x2E] lsls r0, 16 cmp r0, 0 - bge _080CA2E6 + bge @080CA2E6 movs r0, 0 strh r0, [r4, 0x2E] -_080CA2E6: +@080CA2E6: ldrh r0, [r4, 0x2E] lsls r1, r0, 12 lsls r0, 8 @@ -381790,7 +381790,7 @@ _080CA2E6: movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - bne _080CA30E + bne @080CA30E ldrb r0, [r4, 0x1] movs r1, 0x11 negs r1, r1 @@ -381798,7 +381798,7 @@ _080CA2E6: strb r1, [r4, 0x1] ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] -_080CA30E: +@080CA30E: pop {r4} pop {r0} bx r0 @@ -381807,7 +381807,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 @@ -381837,7 +381837,7 @@ sub_80CA318: @ 80CA318 mov r5, r12 movs r2, 0 ldr r1, =0x000007ff -_080CA352: +@080CA352: ldr r0, [r5] adds r0, r4 adds r0, r6 @@ -381846,12 +381846,12 @@ _080CA352: lsls r0, 16 lsrs r6, r0, 16 cmp r6, r1 - bls _080CA352 + bls @080CA352 movs r6, 0 ldr r5, =0x02039d08 ldr r4, =0x00002244 movs r2, 0 -_080CA36C: +@080CA36C: ldr r0, [r5] lsls r1, r6, 1 adds r0, r4 @@ -381861,7 +381861,7 @@ _080CA36C: lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0xF - bls _080CA36C + bls @080CA36C ldr r0, =0x02039d08 ldr r0, [r0] movs r6, 0x89 @@ -381874,17 +381874,17 @@ _080CA36C: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - beq _080CA420 + beq @080CA420 adds r0, r7, 0 bl gpu_pal_obj_alloc_tag_and_apply lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xFF - beq _080CA420 - b _080CA40C + beq @080CA420 + b @080CA40C .align 2, 0 .pool -_080CA3C4: +@080CA3C4: ldr r0, =0x02039d08 ldr r2, [r0] movs r7, 0x89 @@ -381909,10 +381909,10 @@ _080CA3C4: ldr r7, =0x06010000 adds r0, r7 str r0, [r2] - b _080CA420 + b @080CA420 .align 2, 0 .pool -_080CA40C: +@080CA40C: mov r0, sp movs r1, 0x28 movs r2, 0x30 @@ -381921,8 +381921,8 @@ _080CA40C: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - bne _080CA3C4 -_080CA420: + bne @080CA3C4 +@080CA420: ldr r0, =0x02039d08 ldr r0, [r0] movs r1, 0x89 @@ -381930,12 +381930,12 @@ _080CA420: adds r0, r1 ldr r0, [r0] cmp r0, 0 - bne _080CA43C + bne @080CA43C movs r0, 0x2 bl gpu_tile_obj_free_by_tag ldr r0, =0x0000dac6 bl gpu_pal_free_tag -_080CA43C: +@080CA43C: add sp, 0x28 pop {r4-r7} pop {r0} @@ -381945,7 +381945,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 @@ -381958,9 +381958,9 @@ sub_80CA44C: @ 80CA44C adds r0, r2, r7 ldr r0, [r0] cmp r0, 0 - beq _080CA4F2 + beq @080CA4F2 cmp r4, 0 - beq _080CA4E8 + beq @080CA4E8 lsls r0, r4, 3 ldr r1, =0x0830a18c adds r0, r1 @@ -382002,16 +382002,16 @@ sub_80CA44C: @ 80CA44C negs r0, r0 ands r0, r2 strb r0, [r1] - b _080CA4F2 + b @080CA4F2 .align 2, 0 .pool -_080CA4E8: +@080CA4E8: adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_080CA4F2: +@080CA4F2: add sp, 0x4 pop {r4-r7} pop {r0} @@ -382019,7 +382019,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 @@ -382029,7 +382029,7 @@ sub_80CA4FC: @ 80CA4FC ldr r2, [r6] ldrb r0, [r2, 0x1] cmp r0, 0x3 - beq _080CA588 + beq @080CA588 ldr r0, =0x00000cf9 adds r2, r0 movs r4, 0 @@ -382074,10 +382074,10 @@ sub_80CA4FC: @ 80CA4FC movs r1, 0 movs r3, 0x6 bl Print - b _080CA5E8 + b @080CA5E8 .align 2, 0 .pool -_080CA588: +@080CA588: ldr r0, =0x00000d65 adds r2, r0 movs r4, 0 @@ -382122,7 +382122,7 @@ _080CA588: movs r1, 0x2 movs r3, 0xA bl Print -_080CA5E8: +@080CA5E8: movs r0, 0 movs r1, 0x2 bl Window_CopyToVram @@ -382132,7 +382132,7 @@ _080CA5E8: adds r0, r1, r2 ldrh r0, [r0] cmp r0, 0 - beq _080CA640 + beq @080CA640 adds r2, 0x7 adds r0, r1, r2 ldrb r0, [r0] @@ -382149,10 +382149,10 @@ _080CA5E8: movs r0, 0x5 negs r0, r0 ands r0, r2 - b _080CA64E + b @080CA64E .align 2, 0 .pool -_080CA640: +@080CA640: ldr r2, =0x00000d94 adds r0, r1, r2 ldr r1, [r0] @@ -382160,7 +382160,7 @@ _080CA640: ldrb r0, [r1] movs r2, 0x4 orrs r0, r2 -_080CA64E: +@080CA64E: strb r0, [r1] add sp, 0xC pop {r4-r6} @@ -382171,7 +382171,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 @@ -382180,7 +382180,7 @@ sub_80CA65C: @ 80CA65C adds r0, r1 ldrh r0, [r0] cmp r0, 0 - beq _080CA6B4 + beq @080CA6B4 movs r0, 0x2 str r0, [sp] movs r0, 0 @@ -382189,7 +382189,7 @@ sub_80CA65C: @ 80CA65C movs r3, 0x8 bl sub_80D27AC movs r4, 0 -_080CA680: +@080CA680: ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r4, 2 @@ -382206,11 +382206,11 @@ _080CA680: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x1 - bls _080CA680 - b _080CA6E6 + bls @080CA680 + b @080CA6E6 .align 2, 0 .pool -_080CA6B4: +@080CA6B4: movs r0, 0x2 str r0, [sp] movs r0, 0 @@ -382219,7 +382219,7 @@ _080CA6B4: movs r3, 0x8 bl sub_80D27AC movs r4, 0 -_080CA6C6: +@080CA6C6: ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r4, 2 @@ -382234,8 +382234,8 @@ _080CA6C6: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x1 - bls _080CA6C6 -_080CA6E6: + bls @080CA6C6 +@080CA6E6: movs r0, 0 bl sub_80D2918 movs r0, 0x1 @@ -382249,7 +382249,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, =0x08dd36c8 @@ -382288,7 +382288,7 @@ sub_80CA704: @ 80CA704 ldr r0, =0x02039d0c ldrb r0, [r0] cmp r0, 0 - beq _080CA790 + beq @080CA790 movs r0, 0x1 bl sub_80CA984 movs r0, 0x1 @@ -382297,10 +382297,10 @@ sub_80CA704: @ 80CA704 bl sub_80D2918 movs r0, 0x1 bl sub_80D2918 - b _080CA7B2 + b @080CA7B2 .align 2, 0 .pool -_080CA790: +@080CA790: movs r0, 0x2 str r0, [sp] movs r0, 0x1 @@ -382314,7 +382314,7 @@ _080CA790: bl sub_80D2918 movs r0, 0x2 bl sub_80D2918 -_080CA7B2: +@080CA7B2: movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram ldr r0, =0x02039d08 @@ -382332,7 +382332,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] @@ -382358,7 +382358,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] @@ -382366,7 +382366,7 @@ sub_80CA80C: @ 80CA80C adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x14 - beq _080CA87A + beq @080CA87A movs r0, 0xB0 lsls r0, 2 adds r1, r2, r0 @@ -382397,18 +382397,18 @@ sub_80CA80C: @ 80CA80C lsls r0, 24 lsrs r0, 24 cmp r0, 0x14 - beq _080CA874 + beq @080CA874 movs r0, 0x1 - b _080CA87C + b @080CA87C .align 2, 0 .pool -_080CA874: +@080CA874: ldr r1, =0x02039d0c movs r0, 0x1 strb r0, [r1] -_080CA87A: +@080CA87A: movs r0, 0 -_080CA87C: +@080CA87C: pop {r4} pop {r1} bx r1 @@ -382417,7 +382417,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] @@ -382437,9 +382437,9 @@ sub_80CA888: @ 80CA888 ldr r0, [r4] ldrb r0, [r0, 0x1] cmp r0, 0x3 - bne _080CA8B4 + bne @080CA8B4 bl sub_80D11CC -_080CA8B4: +@080CA8B4: pop {r4} pop {r0} bx r0 @@ -382448,7 +382448,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 @@ -382457,7 +382457,7 @@ sub_80CA8C8: @ 80CA8C8 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x14 - beq _080CA974 + beq @080CA974 movs r0, 0xB0 lsls r0, 2 adds r1, r2, r0 @@ -382499,14 +382499,14 @@ sub_80CA8C8: @ 80CA8C8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x14 - beq _080CA94C + beq @080CA94C movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram movs r0, 0x1 - b _080CA976 + b @080CA976 .align 2, 0 .pool -_080CA94C: +@080CA94C: ldr r0, =0x02039d0c movs r1, 0 strb r1, [r0] @@ -382522,9 +382522,9 @@ _080CA94C: bl sub_80D2918 movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram -_080CA974: +@080CA974: movs r0, 0 -_080CA976: +@080CA976: add sp, 0x8 pop {r4,r5} pop {r1} @@ -382534,27 +382534,27 @@ _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 cmp r0, 0 - beq _080CA99E + beq @080CA99E movs r0, 0x2 str r0, [sp] movs r1, 0 movs r2, 0 movs r3, 0x9 bl sub_80D27AC - b _080CA9AC -_080CA99E: + b @080CA9AC +@080CA99E: movs r0, 0x2 str r0, [sp] movs r1, 0 movs r2, 0x2 movs r3, 0x9 bl sub_80D27AC -_080CA9AC: +@080CA9AC: movs r0, 0x2 bl sub_80D2918 movs r0, 0x1 @@ -382565,7 +382565,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 @@ -382587,7 +382587,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] @@ -382595,12 +382595,12 @@ sub_80CA9EC: @ 80CA9EC adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0 - beq _080CAA06 + beq @080CAA06 movs r0, 0 strb r0, [r1] movs r0, 0x1 bl sub_80CA984 -_080CAA06: +@080CAA06: pop {r0} bx r0 .align 2, 0 @@ -382608,7 +382608,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] @@ -382616,7 +382616,7 @@ sub_80CAA14: @ 80CAA14 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080CAA60 + beq @080CAA60 movs r0, 0xB2 lsls r0, 2 adds r1, r0 @@ -382626,7 +382626,7 @@ sub_80CAA14: @ 80CAA14 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1E - bls _080CAA60 + bls @080CAA60 ldr r0, [r3] movs r1, 0xB2 lsls r1, 2 @@ -382639,15 +382639,15 @@ sub_80CAA14: @ 80CAA14 adds r1, r0, r4 ldrb r0, [r1] cmp r0, 0 - bne _080CAA54 + bne @080CAA54 movs r2, 0x1 -_080CAA54: +@080CAA54: strb r2, [r1] ldr r0, [r3] adds r0, r4 ldrb r0, [r0] bl sub_80CA984 -_080CAA60: +@080CAA60: pop {r4} pop {r0} bx r0 @@ -382656,10 +382656,10 @@ _080CAA60: thumb_func_end sub_80CAA14 thumb_func_start sub_80CAA74 -sub_80CAA74: @ 80CAA74 +sub_80CAA74: ; 80CAA74 push {r4,lr} movs r4, 0x1 -_080CAA78: +@080CAA78: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -382675,7 +382675,7 @@ _080CAA78: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls _080CAA78 + bls @080CAA78 pop {r4} pop {r0} bx r0 @@ -382684,16 +382684,16 @@ _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 lsls r1, 24 ldr r7, =0x085724bc cmp r1, 0 - beq _080CAAB8 + beq @080CAAB8 ldr r7, =0x085724a4 -_080CAAB8: +@080CAAB8: subs r0, 0x1 lsls r1, r0, 1 adds r1, r0 @@ -382708,14 +382708,14 @@ _080CAAB8: movs r0, 0 ldr r1, =0x02039d08 mov r12, r1 -_080CAAD4: +@080CAAD4: movs r2, 0 adds r4, r7, 0 adds r4, 0x8 adds r5, r3, 0 adds r5, 0xC adds r6, r0, 0x1 -_080CAAE0: +@080CAAE0: mov r0, r12 ldr r1, [r0] adds r0, r3, r2 @@ -382730,14 +382730,14 @@ _080CAAE0: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x3 - bls _080CAAE0 + bls @080CAAE0 adds r7, r4, 0 lsls r0, r5, 16 lsrs r3, r0, 16 lsls r0, r6, 16 lsrs r0, 16 cmp r0, 0x2 - bls _080CAAD4 + bls @080CAAD4 pop {r4-r7} pop {r0} bx r0 @@ -382746,7 +382746,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 @@ -382767,7 +382767,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] @@ -382785,7 +382785,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] @@ -382793,59 +382793,59 @@ sub_80CAB70: @ 80CAB70 adds r0, r5 ldrb r0, [r0] cmp r0, 0x1 - beq _080CABAA + beq @080CABAA cmp r0, 0x1 - bgt _080CAB94 + bgt @080CAB94 cmp r0, 0 - beq _080CAB9A - b _080CABD8 + beq @080CAB9A + b @080CABD8 .align 2, 0 .pool -_080CAB94: +@080CAB94: cmp r0, 0x2 - beq _080CABD4 - b _080CABD8 -_080CAB9A: + beq @080CABD4 + b @080CABD8 +@080CAB9A: bl sub_80CA80C lsls r0, 24 cmp r0, 0 - bne _080CABD8 + bne @080CABD8 bl sub_80CDBA0 - b _080CABC4 -_080CABAA: + b @080CABC4 +@080CABAA: bl sub_80CD554 lsls r0, 24 cmp r0, 0 - bne _080CABD8 + bne @080CABD8 ldr r0, [r4] ldr r1, =0x00000cea adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _080CABC4 + beq @080CABC4 bl BoxSetMosaic -_080CABC4: +@080CABC4: ldr r1, [r4] adds r1, r5 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080CABD8 + b @080CABD8 .align 2, 0 .pool -_080CABD4: +@080CABD4: movs r0, 0 - b _080CABDA -_080CABD8: + b @080CABDA +@080CABD8: movs r0, 0x1 -_080CABDA: +@080CABDA: pop {r4,r5} pop {r1} bx r1 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 @@ -382853,7 +382853,7 @@ sub_80CABE0: @ 80CABE0 lsls r0, 24 lsrs r0, 24 cmp r1, r0 - beq _080CAC0A + beq @080CAC0A ldr r0, =0x000008d7 bl flag_clear ldr r4, =0x00004036 @@ -382863,7 +382863,7 @@ sub_80CABE0: @ 80CABE0 lsrs r1, 24 adds r0, r4, 0 bl var_set -_080CAC0A: +@080CAC0A: pop {r4} pop {r0} bx r0 @@ -382872,7 +382872,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 @@ -382902,7 +382902,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 @@ -382913,48 +382913,48 @@ sub_80CAC58: @ 80CAC58 adds r0, r1 ldrb r0, [r0, 0x4] cmp r0, 0x7 - bhi _080CAD30 + bhi @080CAD30 lsls r0, 2 - ldr r1, =_080CAC84 + ldr r1, =@080CAC84 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080CAC84: - .4byte _080CAD30 - .4byte _080CACA4 - .4byte _080CACA4 - .4byte _080CACA4 - .4byte _080CACB8 - .4byte _080CACB8 - .4byte _080CACB8 - .4byte _080CACD0 -_080CACA4: +@080CAC84: + .4byte @080CAD30 + .4byte @080CACA4 + .4byte @080CACA4 + .4byte @080CACA4 + .4byte @080CACB8 + .4byte @080CACB8 + .4byte @080CACB8 + .4byte @080CACD0 +@080CACA4: ldr r0, =0x02039d08 ldr r1, [r0] ldr r0, =0x00000cee adds r1, r0 - b _080CACC0 + b @080CACC0 .align 2, 0 .pool -_080CACB8: +@080CACB8: ldr r0, =0x02039d08 ldr r1, [r0] ldr r2, =0x000021e0 adds r1, r2 -_080CACC0: +@080CACC0: movs r0, 0 bl sub_81AFC0C - b _080CAD30 + b @080CAD30 .align 2, 0 .pool -_080CACD0: +@080CACD0: bl sub_80D127C lsls r0, 24 cmp r0, 0 - beq _080CACF4 + beq @080CACF4 ldr r0, =0x02039d08 ldr r4, [r0] ldr r0, =0x000021eb @@ -382962,29 +382962,29 @@ _080CACD0: bl sub_80D12B8 adds r1, r0, 0 adds r0, r4, 0 - b _080CAD00 + b @080CAD00 .align 2, 0 .pool -_080CACF4: +@080CACF4: ldr r0, =0x02039d08 ldr r1, [r0] ldr r2, =0x000021eb adds r0, r1, r2 ldr r2, =0x00000d65 adds r1, r2 -_080CAD00: +@080CAD00: bl gf_strcpy adds r2, r0, 0 - b _080CAD16 + b @080CAD16 .align 2, 0 .pool -_080CAD14: +@080CAD14: adds r2, r1, 0 -_080CAD16: +@080CAD16: subs r1, r2, 0x1 ldrb r0, [r1] cmp r0, 0 - beq _080CAD14 + beq @080CAD14 movs r0, 0xFF strb r0, [r2] ldr r0, =0x02039d08 @@ -382993,7 +382993,7 @@ _080CAD16: adds r1, r0 movs r0, 0 bl sub_81AFC0C -_080CAD30: +@080CAD30: ldr r5, =0x02039d08 ldr r0, [r5] ldr r4, =0x00002190 @@ -383038,7 +383038,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 @@ -383060,7 +383060,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 @@ -383072,7 +383072,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 @@ -383085,36 +383085,36 @@ sub_80CADD8: @ 80CADD8 bl sub_80CFF34 bl sub_80D2494 cmp r0, 0 - beq _080CAE04 + beq @080CAE04 movs r0, 0x16 bl sub_80CFF34 -_080CAE04: +@080CAE04: bl sub_80CFFD0 pop {r0} bx r0 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 adds r5, r4, 0 bl sub_80CFEF0 cmp r4, 0x1 - beq _080CAE4A + beq @080CAE4A cmp r4, 0x1 - bgt _080CAE26 + bgt @080CAE26 cmp r4, 0 - beq _080CAE30 - b _080CAE96 -_080CAE26: + beq @080CAE30 + b @080CAE96 +@080CAE26: cmp r5, 0x2 - beq _080CAE64 + beq @080CAE64 cmp r5, 0x3 - beq _080CAE7E - b _080CAE96 -_080CAE30: + beq @080CAE7E + b @080CAE96 +@080CAE30: movs r0, 0x17 bl sub_80CFF34 movs r0, 0x18 @@ -383123,8 +383123,8 @@ _080CAE30: bl sub_80CFF34 movs r0, 0x1A bl sub_80CFF34 - b _080CAE96 -_080CAE4A: + b @080CAE96 +@080CAE4A: movs r0, 0x1B bl sub_80CFF34 movs r0, 0x1C @@ -383133,8 +383133,8 @@ _080CAE4A: bl sub_80CFF34 movs r0, 0x1E bl sub_80CFF34 - b _080CAE96 -_080CAE64: + b @080CAE96 +@080CAE64: movs r0, 0x1F bl sub_80CFF34 movs r0, 0x20 @@ -383143,8 +383143,8 @@ _080CAE64: bl sub_80CFF34 movs r0, 0x22 bl sub_80CFF34 - b _080CAE96 -_080CAE7E: + b @080CAE96 +@080CAE7E: movs r0, 0x23 bl sub_80CFF34 movs r0, 0x24 @@ -383153,7 +383153,7 @@ _080CAE7E: bl sub_80CFF34 movs r0, 0x26 bl sub_80CFF34 -_080CAE96: +@080CAE96: bl sub_80CFFD0 pop {r4,r5} pop {r0} @@ -383161,7 +383161,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 @@ -383170,41 +383170,41 @@ 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 cmp r0, 0 - bne _080CAEE8 + bne @080CAEE8 ldr r0, =0x02039d0c ldrb r0, [r0] cmp r0, 0 - beq _080CAED8 + beq @080CAED8 bl sub_80CFE08 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 movs r0, 0x1 bl sub_80D0D8C - b _080CAEE8 + b @080CAEE8 .align 2, 0 .pool -_080CAED8: +@080CAED8: bl sub_80CFE08 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 movs r0, 0 bl sub_80D0D8C -_080CAEE8: +@080CAEE8: ldr r1, =0x02039d12 ldrh r0, [r1] cmp r0, 0 - beq _080CAEFA + beq @080CAEFA bl sub_80D0F38 movs r0, 0x3 bl sub_80CFE54 -_080CAEFA: +@080CAEFA: pop {r0} bx r0 .align 2, 0 @@ -383212,7 +383212,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 @@ -383220,7 +383220,7 @@ sub_80CAF04: @ 80CAF04 ldr r5, =0x00000b08 movs r4, 0 adds r6, r3, 0 -_080CAF14: +@080CAF14: ldr r0, [r3] lsls r1, r2, 1 adds r0, r5 @@ -383230,12 +383230,12 @@ _080CAF14: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x27 - bls _080CAF14 + bls @080CAF14 movs r2, 0 ldr r5, =0x02039d08 ldr r4, =0x00000b58 movs r3, 0 -_080CAF30: +@080CAF30: ldr r0, [r5] lsls r1, r2, 1 adds r0, r4 @@ -383245,13 +383245,13 @@ _080CAF30: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x27 - bls _080CAF30 + bls @080CAF30 movs r2, 0 ldr r5, =0x02039d08 movs r4, 0xA7 lsls r4, 4 movs r3, 0 -_080CAF4E: +@080CAF4E: ldr r0, [r5] lsls r1, r2, 2 adds r0, r4 @@ -383261,12 +383261,12 @@ _080CAF4E: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x5 - bls _080CAF4E + bls @080CAF4E movs r2, 0 ldr r5, =0x02039d08 ldr r4, =0x00000a88 movs r3, 0 -_080CAF6A: +@080CAF6A: ldr r0, [r5] lsls r1, r2, 2 adds r0, r4 @@ -383276,7 +383276,7 @@ _080CAF6A: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x1D - bls _080CAF6A + bls @080CAF6A ldr r0, [r6] ldr r2, =0x00000a6c adds r1, r0, r2 @@ -383293,22 +383293,22 @@ _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 movs r1, 0x1 cmp r0, 0 - beq _080CAFBC + beq @080CAFBC movs r1, 0x2 -_080CAFBC: +@080CAFBC: adds r0, r1, 0 pop {r1} bx r1 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 @@ -383351,7 +383351,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 @@ -383365,11 +383365,11 @@ sub_80CB028: @ 80CB028 mov r8, r0 movs r6, 0 movs r7, 0 -_080CB042: +@080CB042: movs r5, 0 adds r1, r7, 0x1 mov r10, r1 -_080CB048: +@080CB048: mov r0, r9 adds r1, r6, 0 movs r2, 0x41 @@ -383377,7 +383377,7 @@ _080CB048: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq _080CB0B0 + beq @080CB0B0 mov r0, r9 adds r1, r6, 0 movs r2, 0 @@ -383414,10 +383414,10 @@ _080CB048: adds r1, r3 adds r1, r2 str r0, [r1] - b _080CB0C0 + b @080CB0C0 .align 2, 0 .pool -_080CB0B0: +@080CB0B0: ldr r0, =0x02039d08 ldr r0, [r0] mov r2, r8 @@ -383426,7 +383426,7 @@ _080CB0B0: adds r0, r3 adds r0, r1 str r4, [r0] -_080CB0C0: +@080CB0C0: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 @@ -383439,28 +383439,28 @@ _080CB0C0: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x5 - bls _080CB048 + bls @080CB048 mov r1, r10 lsls r0, r1, 16 lsrs r7, r0, 16 cmp r7, 0x4 - bls _080CB042 + bls @080CB042 ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x3 - bne _080CB126 + bne @080CB126 movs r6, 0 movs r2, 0xD negs r2, r2 adds r4, r2, 0 -_080CB0F6: +@080CB0F6: mov r0, r9 adds r1, r6, 0 movs r2, 0xC bl get_pokemon_data_from_any_box cmp r0, 0 - bne _080CB11C + bne @080CB11C ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r6, 2 @@ -383473,13 +383473,13 @@ _080CB0F6: movs r1, 0x4 orrs r0, r1 strb r0, [r2, 0x1] -_080CB11C: +@080CB11C: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x1D - bls _080CB0F6 -_080CB126: + bls @080CB0F6 +@080CB126: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -383493,7 +383493,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} @@ -383507,7 +383507,7 @@ sub_80CB140: @ 80CB140 lsrs r0, 16 mov r8, r0 cmp r0, 0 - beq _080CB1DA + beq @080CB1DA adds r0, r7, 0 movs r1, 0x6 bl __umodsi3 @@ -383558,7 +383558,7 @@ sub_80CB140: @ 80CB140 str r3, [r0] ldrb r0, [r2, 0x1] cmp r0, 0x3 - bne _080CB1DA + bne @080CB1DA ldrb r0, [r3, 0x1] movs r1, 0xD negs r1, r1 @@ -383566,7 +383566,7 @@ sub_80CB140: @ 80CB140 movs r0, 0x4 orrs r1, r0 strb r1, [r3, 0x1] -_080CB1DA: +@080CB1DA: add sp, 0x8 pop {r3} mov r8, r3 @@ -383578,7 +383578,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 @@ -383587,25 +383587,25 @@ sub_80CB1F0: @ 80CB1F0 ldr r6, =0x00000a88 movs r5, 0x1 ldr r4, =sub_80CB278 + 1 -_080CB200: +@080CB200: ldr r0, [r7] lsls r1, r2, 2 adds r0, r6 adds r1, r0, r1 ldr r0, [r1] cmp r0, 0 - beq _080CB218 + beq @080CB218 strh r3, [r0, 0x32] ldr r0, [r1] strh r5, [r0, 0x36] ldr r0, [r1] str r4, [r0, 0x1C] -_080CB218: +@080CB218: adds r0, r2, 0x1 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x1D - bls _080CB200 + bls @080CB200 pop {r4-r7} pop {r0} bx r0 @@ -383614,22 +383614,22 @@ _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] movs r3, 0x30 ldrsh r0, [r2, r3] cmp r0, 0 - beq _080CB250 + beq @080CB250 subs r0, r1, 0x1 strh r0, [r2, 0x30] ldrh r0, [r2, 0x32] ldrh r1, [r2, 0x20] adds r0, r1 strh r0, [r2, 0x20] - b _080CB266 -_080CB250: + b @080CB266 +@080CB250: ldr r0, =0x02039d08 ldr r1, [r0] ldr r3, =0x00000c66 @@ -383641,7 +383641,7 @@ _080CB250: strh r0, [r2, 0x20] ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] -_080CB266: +@080CB266: pop {r0} bx r0 .align 2, 0 @@ -383649,18 +383649,18 @@ _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] movs r3, 0x36 ldrsh r0, [r2, r3] cmp r0, 0 - beq _080CB28C + beq @080CB28C subs r0, r1, 0x1 strh r0, [r2, 0x36] - b _080CB2A8 -_080CB28C: + b @080CB2A8 +@080CB28C: ldrh r0, [r2, 0x32] ldrh r1, [r2, 0x20] adds r0, r1 @@ -383672,10 +383672,10 @@ _080CB28C: lsls r0, 16 lsrs r0, 16 cmp r0, 0xB6 - bls _080CB2A8 + bls @080CB2A8 ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] -_080CB2A8: +@080CB2A8: pop {r0} bx r0 .align 2, 0 @@ -383683,13 +383683,13 @@ _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 movs r6, 0 ldr r7, =0x02039d08 -_080CB2BA: +@080CB2BA: ldr r0, [r7] lsls r4, r5, 2 ldr r1, =0x00000a88 @@ -383697,7 +383697,7 @@ _080CB2BA: adds r0, r4 ldr r0, [r0] cmp r0, 0 - beq _080CB2DA + beq @080CB2DA bl sub_80CC314 ldr r0, [r7] ldr r1, =0x00000a88 @@ -383705,7 +383705,7 @@ _080CB2BA: adds r0, r4 movs r1, 0 str r1, [r0] -_080CB2DA: +@080CB2DA: adds r0, r5, 0x6 lsls r0, 24 lsrs r5, r0, 24 @@ -383713,7 +383713,7 @@ _080CB2DA: lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x4 - bls _080CB2BA + bls @080CB2BA pop {r4-r7} pop {r0} bx r0 @@ -383722,7 +383722,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 @@ -383767,11 +383767,11 @@ sub_80CB2F8: @ 80CB2F8 ldr r0, [r1] ldrb r0, [r0, 0x1] cmp r0, 0x3 - beq _080CB3F0 + beq @080CB3F0 movs r7, 0x4 lsls r2, 16 mov r10, r2 -_080CB358: +@080CB358: ldr r6, =0x02039d08 ldr r2, [r6] lsls r0, r5, 1 @@ -383780,7 +383780,7 @@ _080CB358: adds r1, r0 ldrh r0, [r1] cmp r0, 0 - beq _080CB3C2 + beq @080CB3C2 lsls r4, r5, 2 ldr r6, =0x00000be4 adds r1, r2, r6 @@ -383804,7 +383804,7 @@ _080CB358: adds r1, r0, r4 str r2, [r1] cmp r2, 0 - beq _080CB3C2 + beq @080CB3C2 mov r6, sp ldrh r6, [r6, 0x8] strh r6, [r2, 0x30] @@ -383824,7 +383824,7 @@ _080CB358: lsls r0, 24 lsrs r0, 24 mov r9, r0 -_080CB3C2: +@080CB3C2: adds r0, r5, 0x6 lsls r0, 24 lsrs r5, r0, 24 @@ -383835,16 +383835,16 @@ _080CB3C2: mov r8, r0 subs r7, 0x1 cmp r7, 0 - bge _080CB358 - b _080CB4A6 + bge @080CB358 + b @080CB4A6 .align 2, 0 .pool -_080CB3F0: +@080CB3F0: mov r10, r1 movs r7, 0x4 lsls r2, 16 str r2, [sp, 0x18] -_080CB3F8: +@080CB3F8: mov r6, r10 ldr r2, [r6] lsls r0, r5, 1 @@ -383853,7 +383853,7 @@ _080CB3F8: adds r1, r0 ldrh r0, [r1] cmp r0, 0 - beq _080CB490 + beq @080CB490 lsls r4, r5, 2 ldr r6, =0x00000be4 adds r1, r2, r6 @@ -383877,7 +383877,7 @@ _080CB3F8: adds r1, r0, r4 str r2, [r1] cmp r2, 0 - beq _080CB490 + beq @080CB490 mov r6, sp ldrh r6, [r6, 0x8] strh r6, [r2, 0x30] @@ -383899,7 +383899,7 @@ _080CB3F8: movs r2, 0xC bl get_pokemon_data_from_any_box cmp r0, 0 - bne _080CB486 + bne @080CB486 mov r2, r10 ldr r0, [r2] ldr r3, =0x00000a88 @@ -383914,13 +383914,13 @@ _080CB3F8: movs r0, 0x4 orrs r1, r0 strb r1, [r2, 0x1] -_080CB486: +@080CB486: mov r0, r9 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r9, r0 -_080CB490: +@080CB490: adds r0, r5, 0x6 lsls r0, 24 lsrs r5, r0, 24 @@ -383931,8 +383931,8 @@ _080CB490: mov r8, r0 subs r7, 0x1 cmp r7, 0 - bge _080CB3F8 -_080CB4A6: + bge @080CB3F8 +@080CB4A6: mov r0, r9 add sp, 0x1C pop {r3-r5} @@ -383947,7 +383947,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 @@ -383988,20 +383988,20 @@ sub_80CB4CC: @ 80CB4CC strh r5, [r3] bl sub_80CB6F0 cmp r4, 0 - ble _080CB544 + ble @080CB544 ldr r0, [r6] ldr r2, =0x00000c68 adds r0, r2 movs r1, 0 - b _080CB54C + b @080CB54C .align 2, 0 .pool -_080CB544: +@080CB544: ldr r0, [r6] ldr r3, =0x00000c68 adds r0, r3 movs r1, 0x5 -_080CB54C: +@080CB54C: strb r1, [r0] ldr r0, =0x02039d08 ldr r2, [r0] @@ -384028,7 +384028,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] @@ -384037,30 +384037,30 @@ sub_80CB584: @ 80CB584 adds r1, r0, r4 ldrh r0, [r1] cmp r0, 0 - beq _080CB59A + beq @080CB59A subs r0, 0x1 strh r0, [r1] -_080CB59A: +@080CB59A: ldr r3, [r5] ldr r6, =0x00000c6a adds r0, r3, r6 ldrb r0, [r0] cmp r0, 0x1 - beq _080CB61C + beq @080CB61C cmp r0, 0x1 - bgt _080CB5B8 + bgt @080CB5B8 cmp r0, 0 - beq _080CB5C0 - b _080CB6DE + beq @080CB5C0 + b @080CB6DE .align 2, 0 .pool -_080CB5B8: +@080CB5B8: cmp r0, 0x2 - bne _080CB5BE - b _080CB6CC -_080CB5BE: - b _080CB6DE -_080CB5C0: + bne @080CB5BE + b @080CB6CC +@080CB5BE: + b @080CB6DE +@080CB5C0: ldr r0, =0x00000c62 adds r1, r3, r0 ldr r2, =0x00000c64 @@ -384073,9 +384073,9 @@ _080CB5C0: lsls r0, 16 lsrs r0, 16 cmp r0, 0xBA - bhi _080CB5DC - b _080CB6E8 -_080CB5DC: + bhi @080CB5DC + b @080CB6E8 +@080CB5DC: ldr r1, =0x00000c68 adds r0, r3, r1 ldrb r0, [r0] @@ -384097,10 +384097,10 @@ _080CB5DC: ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] - b _080CB6E8 + b @080CB6E8 .align 2, 0 .pool -_080CB61C: +@080CB61C: ldr r2, =0x00000c62 adds r1, r3, r2 ldr r6, =0x00000c64 @@ -384130,19 +384130,19 @@ _080CB61C: movs r1, 0 ldrsb r1, [r0, r1] cmp r1, 0 - ble _080CB662 + ble @080CB662 adds r0, r2, r6 ldrb r0, [r0] cmp r0, 0x5 - beq _080CB66E -_080CB662: + beq @080CB66E +@080CB662: cmp r1, 0 - bge _080CB69C + bge @080CB69C adds r0, r2, r6 ldrb r0, [r0] cmp r0, 0 - bne _080CB69C -_080CB66E: + bne @080CB69C +@080CB66E: ldr r0, =0x02039d08 ldr r1, [r0] ldr r2, =0x00000c6a @@ -384150,10 +384150,10 @@ _080CB66E: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080CB6E8 + b @080CB6E8 .align 2, 0 .pool -_080CB69C: +@080CB69C: ldr r3, =0x02039d08 ldr r0, [r3] ldr r6, =0x00000c68 @@ -384169,34 +384169,34 @@ _080CB69C: ldr r1, =0x00000c6a adds r0, r1 strb r2, [r0] - b _080CB6E8 + b @080CB6E8 .align 2, 0 .pool -_080CB6CC: +@080CB6CC: ldr r2, =0x00000c66 adds r0, r3, r2 ldrh r0, [r0] cmp r0, 0 - bne _080CB6E8 + bne @080CB6E8 adds r1, r3, r4 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_080CB6DE: +@080CB6DE: movs r0, 0 - b _080CB6EA + b @080CB6EA .align 2, 0 .pool -_080CB6E8: +@080CB6E8: movs r0, 0x1 -_080CB6EA: +@080CB6EA: pop {r4-r6} pop {r1} bx r1 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 @@ -384207,11 +384207,11 @@ sub_80CB6F0: @ 80CB6F0 movs r0, 0 ldr r1, =0x02039d08 mov r9, r1 -_080CB704: +@080CB704: adds r0, 0x1 mov r8, r0 movs r7, 0x5 -_080CB70A: +@080CB70A: lsls r0, r5, 24 lsrs r4, r0, 24 adds r0, r6, 0 @@ -384227,7 +384227,7 @@ _080CB70A: strh r0, [r1] lsls r0, 16 cmp r0, 0 - beq _080CB744 + beq @080CB744 adds r0, r6, 0 adds r1, r4, 0 movs r2, 0 @@ -384239,14 +384239,14 @@ _080CB70A: adds r1, r3 adds r1, r2 str r0, [r1] -_080CB744: +@080CB744: adds r5, 0x1 subs r7, 0x1 cmp r7, 0 - bge _080CB70A + bge @080CB70A mov r0, r8 cmp r0, 0x4 - ble _080CB704 + ble @080CB704 ldr r0, =0x02039d08 ldr r0, [r0] ldr r1, =0x00000c5c @@ -384263,7 +384263,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 @@ -384274,7 +384274,7 @@ sub_80CB778: @ 80CB778 adds r1, r4 ldr r0, [r1] cmp r0, 0 - beq _080CB79E + beq @080CB79E bl sub_80CC314 ldr r0, [r5] ldr r1, =0x00000a88 @@ -384282,7 +384282,7 @@ sub_80CB778: @ 80CB778 adds r0, r4 movs r1, 0 str r1, [r0] -_080CB79E: +@080CB79E: pop {r4,r5} pop {r0} bx r0 @@ -384291,7 +384291,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 @@ -384304,7 +384304,7 @@ sub_80CB7AC: @ 80CB7AC adds r1, r0 ldr r3, [r1] cmp r3, 0 - beq _080CB7DA + beq @080CB7DA movs r0, 0x3 adds r1, r2, 0 ands r1, r0 @@ -384315,7 +384315,7 @@ sub_80CB7AC: @ 80CB7AC ands r0, r2 orrs r0, r1 strb r0, [r3, 0x1] -_080CB7DA: +@080CB7DA: pop {r0} bx r0 .align 2, 0 @@ -384323,7 +384323,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} @@ -384357,7 +384357,7 @@ sub_80CB7E8: @ 80CB7E8 str r0, [r1] movs r7, 0x1 movs r6, 0x1 -_080CB830: +@080CB830: movs r0, 0x64 adds r1, r6, 0 muls r1, r0 @@ -384369,7 +384369,7 @@ _080CB830: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - beq _080CB894 + beq @080CB894 adds r0, r4, 0 movs r1, 0 bl pokemon_getattr @@ -384400,10 +384400,10 @@ _080CB830: adds r0, r7, 0x1 lsls r0, 16 lsrs r7, r0, 16 - b _080CB8A4 + b @080CB8A4 .align 2, 0 .pool -_080CB894: +@080CB894: ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r6, 2 @@ -384412,24 +384412,24 @@ _080CB894: adds r0, r2 adds r0, r1 str r5, [r0] -_080CB8A4: +@080CB8A4: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x5 - bls _080CB830 + bls @080CB830 ldr r3, =0x02039d08 mov r0, r8 cmp r0, 0 - bne _080CB8EA + bne @080CB8EA movs r6, 0 cmp r6, r7 - bcs _080CB8EA + bcs @080CB8EA mov r12, r3 movs r5, 0xA7 lsls r5, 4 movs r4, 0x4 -_080CB8C4: +@080CB8C4: mov r2, r12 ldr r1, [r2] lsls r0, r6, 2 @@ -384448,24 +384448,24 @@ _080CB8C4: lsls r0, 16 lsrs r6, r0, 16 cmp r6, r7 - bcc _080CB8C4 -_080CB8EA: + bcc @080CB8C4 +@080CB8EA: ldr r0, [r3] ldrb r0, [r0, 0x1] cmp r0, 0x3 - bne _080CB93C + bne @080CB93C movs r6, 0 adds r7, r3, 0 movs r5, 0xA7 lsls r5, 4 -_080CB8FA: +@080CB8FA: ldr r0, [r7] lsls r4, r6, 2 adds r0, r5 adds r0, r4 ldr r0, [r0] cmp r0, 0 - beq _080CB932 + beq @080CB932 movs r0, 0x64 muls r0, r6 ldr r1, =0x020244ec @@ -384473,7 +384473,7 @@ _080CB8FA: movs r1, 0xC bl pokemon_getattr cmp r0, 0 - bne _080CB932 + bne @080CB932 ldr r0, [r7] adds r0, r5 adds r0, r4 @@ -384486,13 +384486,13 @@ _080CB8FA: movs r0, 0x4 orrs r1, r0 strb r1, [r2, 0x1] -_080CB932: +@080CB932: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x5 - bls _080CB8FA -_080CB93C: + bls @080CB8FA +@080CB93C: add sp, 0x8 pop {r3} mov r8, r3 @@ -384504,7 +384504,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 @@ -384518,16 +384518,16 @@ sub_80CB950: @ 80CB950 adds r3, r0, 0 movs r7, 0xA7 lsls r7, 4 -_080CB96A: +@080CB96A: ldr r0, [r3] lsls r4, r5, 2 adds r0, r7 adds r0, r4 ldr r0, [r0] cmp r0, 0 - beq _080CB9A0 + beq @080CB9A0 cmp r5, r6 - beq _080CB99A + beq @080CB99A adds r1, r6, 0 str r3, [sp] bl sub_80CB9D0 @@ -384542,16 +384542,16 @@ _080CB96A: ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] -_080CB99A: +@080CB99A: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 -_080CB9A0: +@080CB9A0: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x5 - bls _080CB96A + bls @080CB96A add sp, 0x4 pop {r4-r7} pop {r0} @@ -384561,7 +384561,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 @@ -384573,18 +384573,18 @@ 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 lsrs r1, 16 strh r1, [r2, 0x30] cmp r1, 0 - bne _080CB9E4 + bne @080CB9E4 movs r3, 0x68 movs r4, 0x40 - b _080CB9F6 -_080CB9E4: + b @080CB9F6 +@080CB9E4: movs r3, 0x98 subs r1, 0x1 lsls r0, r1, 1 @@ -384594,7 +384594,7 @@ _080CB9E4: lsls r1, 13 adds r0, r1 lsrs r4, r0, 16 -_080CB9F6: +@080CB9F6: ldrh r0, [r2, 0x20] lsls r0, 3 strh r0, [r2, 0x32] @@ -384606,9 +384606,9 @@ _080CB9F6: ldrsh r0, [r2, r3] subs r0, r1, r0 cmp r0, 0 - bge _080CBA10 + bge @080CBA10 adds r0, 0x7 -_080CBA10: +@080CBA10: asrs r0, 3 strh r0, [r2, 0x36] lsls r0, r4, 16 @@ -384617,9 +384617,9 @@ _080CBA10: ldrsh r1, [r2, r3] subs r0, r1 cmp r0, 0 - bge _080CBA24 + bge @080CBA24 adds r0, 0x7 -_080CBA24: +@080CBA24: asrs r0, 3 strh r0, [r2, 0x38] movs r0, 0x8 @@ -384634,14 +384634,14 @@ _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] movs r1, 0x3A ldrsh r0, [r3, r1] cmp r0, 0 - beq _080CBA6C + beq @080CBA6C ldrh r0, [r3, 0x36] ldrh r4, [r3, 0x32] adds r0, r4 @@ -384658,17 +384658,17 @@ sub_80CBA3C: @ 80CBA3C strh r1, [r3, 0x22] subs r0, r2, 0x1 strh r0, [r3, 0x3A] - b _080CBAB2 -_080CBA6C: + b @080CBAB2 +@080CBA6C: movs r1, 0x30 ldrsh r0, [r3, r1] cmp r0, 0 - bne _080CBA7C + bne @080CBA7C movs r0, 0x68 strh r0, [r3, 0x20] movs r0, 0x40 - b _080CBA8E -_080CBA7C: + b @080CBA8E +@080CBA7C: movs r0, 0x98 strh r0, [r3, 0x20] movs r4, 0x30 @@ -384678,7 +384678,7 @@ _080CBA7C: adds r0, r1 lsls r0, 3 adds r0, 0x10 -_080CBA8E: +@080CBA8E: strh r0, [r3, 0x22] ldr r0, =nullsub_12 + 1 str r0, [r3, 0x1C] @@ -384697,7 +384697,7 @@ _080CBA8E: ldrb r0, [r2] subs r0, 0x1 strb r0, [r2] -_080CBAB2: +@080CBAB2: pop {r4} pop {r0} bx r0 @@ -384706,7 +384706,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] @@ -384714,14 +384714,14 @@ sub_80CBAC4: @ 80CBAC4 adds r0, r1 ldr r0, [r0] cmp r0, 0 - beq _080CBAE2 + beq @080CBAE2 bl sub_80CC314 ldr r0, [r4] ldr r1, =0x00000a6c adds r0, r1 movs r1, 0 str r1, [r0] -_080CBAE2: +@080CBAE2: pop {r4} pop {r0} bx r0 @@ -384730,7 +384730,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 @@ -384738,7 +384738,7 @@ sub_80CBAF0: @ 80CBAF0 asrs r4, r0, 16 movs r5, 0x5 negs r5, r5 -_080CBAFE: +@080CBAFE: ldr r0, [r6] lsls r1, r3, 2 movs r2, 0xA7 @@ -384747,7 +384747,7 @@ _080CBAFE: adds r2, r0, r1 ldr r1, [r2] cmp r1, 0 - beq _080CBB56 + beq @080CBB56 ldrh r0, [r1, 0x22] adds r0, r4, r0 strh r0, [r1, 0x22] @@ -384767,35 +384767,35 @@ _080CBAFE: adds r0, r1 lsrs r0, 16 cmp r0, 0xC0 - bls _080CBB4C + bls @080CBB4C adds r0, r2, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] - b _080CBB56 + b @080CBB56 .align 2, 0 .pool -_080CBB4C: +@080CBB4C: adds r2, 0x3E ldrb r1, [r2] adds r0, r5, 0 ands r0, r1 strb r0, [r2] -_080CBB56: +@080CBB56: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x5 - bls _080CBAFE + bls @080CBAFE pop {r4-r6} pop {r0} bx r0 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 @@ -384807,7 +384807,7 @@ sub_80CBB68: @ 80CBB68 adds r1, r4 ldr r0, [r1] cmp r0, 0 - beq _080CBB92 + beq @080CBB92 bl sub_80CC314 ldr r0, [r5] movs r1, 0xA7 @@ -384816,7 +384816,7 @@ sub_80CBB68: @ 80CBB68 adds r0, r4 movs r1, 0 str r1, [r0] -_080CBB92: +@080CBB92: pop {r4,r5} pop {r0} bx r0 @@ -384825,11 +384825,11 @@ _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 -_080CBBA2: +@080CBBA2: ldr r0, [r6] lsls r4, r5, 2 movs r1, 0xA7 @@ -384838,7 +384838,7 @@ _080CBBA2: adds r0, r4 ldr r0, [r0] cmp r0, 0 - beq _080CBBC6 + beq @080CBBC6 bl sub_80CC314 ldr r0, [r6] movs r1, 0xA7 @@ -384847,12 +384847,12 @@ _080CBBA2: adds r0, r4 movs r1, 0 str r1, [r0] -_080CBBC6: +@080CBBC6: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x5 - bls _080CBBA2 + bls @080CBBA2 pop {r4-r6} pop {r0} bx r0 @@ -384861,7 +384861,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 @@ -384875,7 +384875,7 @@ sub_80CBBDC: @ 80CBBDC adds r1, r0 ldr r3, [r1] cmp r3, 0 - beq _080CBC0C + beq @080CBC0C movs r0, 0x3 adds r1, r2, 0 ands r1, r0 @@ -384886,7 +384886,7 @@ sub_80CBBDC: @ 80CBBDC ands r0, r2 orrs r0, r1 strb r0, [r3, 0x1] -_080CBC0C: +@080CBC0C: pop {r0} bx r0 .align 2, 0 @@ -384894,7 +384894,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 @@ -384902,7 +384902,7 @@ sub_80CBC14: @ 80CBC14 lsrs r1, 24 adds r5, r1, 0 cmp r4, 0 - bne _080CBC44 + bne @080CBC44 ldr r3, =0x02039d08 ldr r0, [r3] ldr r5, =0x00000a6c @@ -384914,12 +384914,12 @@ sub_80CBC14: @ 80CBC14 ldr r1, [r0] str r1, [r2] str r4, [r0] - b _080CBC60 + b @080CBC60 .align 2, 0 .pool -_080CBC44: +@080CBC44: cmp r4, 0x1 - bne _080CBC96 + bne @080CBC96 ldr r3, =0x02039d08 ldr r0, [r3] ldr r1, =0x00000a6c @@ -384932,7 +384932,7 @@ _080CBC44: str r1, [r2] movs r1, 0 str r1, [r0] -_080CBC60: +@080CBC60: adds r5, r3, 0 ldr r0, [r5] ldr r4, =0x00000a6c @@ -384959,7 +384959,7 @@ _080CBC60: adds r0, 0x43 movs r1, 0x7 strb r1, [r0] -_080CBC96: +@080CBC96: pop {r4,r5} pop {r0} bx r0 @@ -384968,14 +384968,14 @@ _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 lsls r1, 24 lsrs r6, r1, 24 cmp r0, 0xE - bne _080CBCF8 + bne @080CBCF8 ldr r3, =0x02039d08 ldr r1, [r3] lsls r5, r6, 2 @@ -385001,10 +385001,10 @@ sub_80CBCAC: @ 80CBCAC adds r0, 0x43 movs r1, 0xC strb r1, [r0] - b _080CBD34 + b @080CBD34 .align 2, 0 .pool -_080CBCF8: +@080CBCF8: ldr r5, =0x02039d08 ldr r1, [r5] lsls r4, r6, 2 @@ -385034,7 +385034,7 @@ _080CBCF8: adds r4, 0x43 strb r1, [r4] adds r3, r5, 0 -_080CBD34: +@080CBD34: ldr r1, [r3] ldr r0, =0x00000a6c adds r1, r0 @@ -385051,14 +385051,14 @@ _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 lsls r1, 24 lsrs r4, r1, 24 cmp r0, 0xE - bne _080CBD80 + bne @080CBD80 ldr r3, =0x02039d08 ldr r1, [r3] movs r0, 0xB0 @@ -385067,10 +385067,10 @@ sub_80CBD5C: @ 80CBD5C lsls r0, r4, 2 movs r4, 0xA7 lsls r4, 4 - b _080CBD8E + b @080CBD8E .align 2, 0 .pool -_080CBD80: +@080CBD80: ldr r3, =0x02039d08 ldr r1, [r3] movs r0, 0xB0 @@ -385078,7 +385078,7 @@ _080CBD80: adds r2, r1, r0 lsls r0, r4, 2 ldr r4, =0x00000a88 -_080CBD8E: +@080CBD8E: adds r0, r4 adds r1, r0 str r1, [r2] @@ -385100,7 +385100,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 @@ -385112,12 +385112,12 @@ sub_80CBDC4: @ 80CBDC4 adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0x10 - bne _080CBDE8 + bne @080CBDE8 movs r0, 0 - b _080CBEF4 + b @080CBEF4 .align 2, 0 .pool -_080CBDE8: +@080CBDE8: adds r0, 0x1 strb r0, [r1] ldr r2, [r6] @@ -385127,7 +385127,7 @@ _080CBDE8: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080CBE18 + beq @080CBE18 movs r1, 0xB0 lsls r1, 4 adds r0, r2, r1 @@ -385142,7 +385142,7 @@ _080CBDE8: ldrh r0, [r1, 0x22] adds r0, 0x1 strh r0, [r1, 0x22] -_080CBE18: +@080CBE18: ldr r3, [r6] movs r7, 0xB0 lsls r7, 4 @@ -385159,9 +385159,9 @@ _080CBE18: movs r2, 0 ldrsh r0, [r0, r2] cmp r0, 0 - bge _080CBE3C + bge @080CBE3C adds r0, 0xF -_080CBE3C: +@080CBE3C: asrs r0, 4 mov r2, r8 strh r0, [r2, 0x24] @@ -385175,15 +385175,15 @@ _080CBE3C: movs r5, 0 ldrsh r0, [r0, r5] cmp r0, 0 - bge _080CBE5A + bge @080CBE5A adds r0, 0xF -_080CBE5A: +@080CBE5A: asrs r0, 4 negs r0, r0 strh r0, [r2, 0x24] ldrb r0, [r1] cmp r0, 0x8 - bne _080CBEBE + bne @080CBEBE ldr r3, [r3] ldr r0, [r4] ldr r0, [r0] @@ -385227,13 +385227,13 @@ _080CBE5A: adds r0, 0x43 movs r1, 0x7 strb r1, [r0] -_080CBEBE: +@080CBEBE: ldr r1, [r6] mov r5, r9 adds r0, r1, r5 ldrb r0, [r0] cmp r0, 0x10 - bne _080CBEF2 + bne @080CBEF2 mov r0, r8 adds r2, r1, r0 ldr r3, [r2] @@ -385254,9 +385254,9 @@ _080CBEBE: ldr r1, [r0] ldr r0, =nullsub_12 + 1 str r0, [r1, 0x1C] -_080CBEF2: +@080CBEF2: movs r0, 0x1 -_080CBEF4: +@080CBEF4: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -385268,7 +385268,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 @@ -385276,17 +385276,17 @@ sub_80CBF14: @ 80CBF14 lsls r1, 24 lsrs r4, r1, 24 cmp r0, 0x1 - beq _080CBF4C + beq @080CBF4C cmp r0, 0x1 - bgt _080CBF2E + bgt @080CBF2E cmp r0, 0 - beq _080CBF34 - b _080CBFC0 -_080CBF2E: + beq @080CBF34 + b @080CBFC0 +@080CBF2E: cmp r2, 0x2 - beq _080CBF70 - b _080CBFC0 -_080CBF34: + beq @080CBF70 + b @080CBFC0 +@080CBF34: ldr r3, =0x02039d08 ldr r1, [r3] ldr r0, =0x00000b04 @@ -385294,25 +385294,25 @@ _080CBF34: lsls r0, r4, 2 movs r4, 0xA7 lsls r4, 4 - b _080CBF58 + b @080CBF58 .align 2, 0 .pool -_080CBF4C: +@080CBF4C: ldr r3, =0x02039d08 ldr r1, [r3] ldr r0, =0x00000b04 adds r2, r1, r0 lsls r0, r4, 2 ldr r4, =0x00000a88 -_080CBF58: +@080CBF58: adds r0, r4 adds r1, r0 str r1, [r2] adds r4, r3, 0 - b _080CBF80 + b @080CBF80 .align 2, 0 .pool -_080CBF70: +@080CBF70: ldr r0, =0x02039d08 ldr r1, [r0] ldr r3, =0x00000b04 @@ -385321,14 +385321,14 @@ _080CBF70: adds r1, r4 str r1, [r2] adds r4, r0, 0 -_080CBF80: +@080CBF80: ldr r0, [r4] ldr r1, =0x00000b04 adds r0, r1 ldr r0, [r0] ldr r0, [r0] cmp r0, 0 - beq _080CBFC0 + beq @080CBFC0 bl obj_alloc_rotscale_entry ldr r0, [r4] ldr r3, =0x00000b04 @@ -385352,7 +385352,7 @@ _080CBF80: ldr r0, [r0] movs r1, 0 bl sub_8008258 -_080CBFC0: +@080CBFC0: pop {r4} pop {r0} bx r0 @@ -385361,7 +385361,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] @@ -385370,39 +385370,39 @@ sub_80CBFD8: @ 80CBFD8 ldr r0, [r0] ldr r1, [r0] cmp r1, 0 - beq _080CBFF8 + beq @080CBFF8 adds r3, r1, 0 adds r3, 0x3E ldrb r2, [r3] movs r0, 0x4 ands r0, r2 cmp r0, 0 - beq _080CC004 -_080CBFF8: + beq @080CC004 +@080CBFF8: movs r0, 0 - b _080CC01A + b @080CC01A .align 2, 0 .pool -_080CC004: +@080CC004: adds r0, r1, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080CC018 + beq @080CC018 movs r0, 0x4 orrs r0, r2 strb r0, [r3] -_080CC018: +@080CC018: movs r0, 0x1 -_080CC01A: +@080CC01A: pop {r1} bx r1 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] @@ -385411,7 +385411,7 @@ sub_80CC020: @ 80CC020 ldr r0, [r0] ldr r0, [r0] cmp r0, 0 - beq _080CC056 + beq @080CC056 ldrb r0, [r0, 0x3] lsls r0, 26 lsrs r0, 27 @@ -385428,7 +385428,7 @@ sub_80CC020: @ 80CC020 ldr r1, [r0] movs r0, 0 str r0, [r1] -_080CC056: +@080CC056: pop {r4} pop {r0} bx r0 @@ -385437,7 +385437,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] @@ -385446,7 +385446,7 @@ sub_80CC064: @ 80CC064 ldr r0, [r0] ldr r0, [r0] cmp r0, 0 - beq _080CC094 + beq @080CC094 adds r2, r0, 0 adds r2, 0x3E ldrb r1, [r2] @@ -385461,7 +385461,7 @@ sub_80CC064: @ 80CC064 ldr r0, [r0] movs r1, 0x1 bl sub_8008258 -_080CC094: +@080CC094: pop {r0} bx r0 .align 2, 0 @@ -385469,7 +385469,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] @@ -385477,30 +385477,30 @@ sub_80CC0A0: @ 80CC0A0 adds r2, r0, r1 ldr r0, [r2] cmp r0, 0 - bne _080CC0BC + bne @080CC0BC movs r0, 0 - b _080CC0D0 + b @080CC0D0 .align 2, 0 .pool -_080CC0BC: +@080CC0BC: ldr r0, [r0] adds r0, 0x3F ldrb r1, [r0] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080CC0CE + beq @080CC0CE movs r0, 0 str r0, [r2] -_080CC0CE: +@080CC0CE: movs r0, 0x1 -_080CC0D0: +@080CC0D0: pop {r1} bx r1 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 @@ -385523,7 +385523,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 @@ -385543,7 +385543,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 @@ -385555,54 +385555,54 @@ sub_80CC124: @ 80CC124 ldrh r0, [r0] adds r2, r1, 0 cmp r0, r3 - beq _080CC158 + beq @080CC158 adds r6, r2, 0 ldr r5, =0x00000b58 -_080CC140: +@080CC140: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x27 - bhi _080CC158 + bhi @080CC158 ldr r0, [r6] lsls r1, r4, 1 adds r0, r5 adds r0, r1 ldrh r0, [r0] cmp r0, r3 - bne _080CC140 -_080CC158: + bne @080CC140 +@080CC158: cmp r4, 0x28 - bne _080CC198 + bne @080CC198 movs r4, 0 ldr r0, [r2] ldr r5, =0x00000b58 adds r0, r5 ldrh r0, [r0] cmp r0, 0 - beq _080CC184 + beq @080CC184 adds r6, r2, 0 -_080CC16C: +@080CC16C: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x27 - bhi _080CC184 + bhi @080CC184 ldr r0, [r6] lsls r1, r4, 1 adds r0, r5 adds r0, r1 ldrh r0, [r0] cmp r0, 0 - bne _080CC16C -_080CC184: + bne @080CC16C +@080CC184: cmp r4, 0x28 - bne _080CC198 + bne @080CC198 ldr r0, =0x0000ffff - b _080CC1CA + b @080CC1CA .align 2, 0 .pool -_080CC198: +@080CC198: ldr r1, [r2] lsls r2, r4, 1 ldr r5, =0x00000b58 @@ -385626,7 +385626,7 @@ _080CC198: ldr r2, =0x04000080 bl CpuSet adds r0, r4, 0 -_080CC1CA: +@080CC1CA: pop {r4-r6} pop {r1} bx r1 @@ -385635,13 +385635,13 @@ _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 movs r3, 0 ldr r6, =0x02039d08 -_080CC1EA: +@080CC1EA: ldr r1, [r6] lsls r2, r3, 1 ldr r4, =0x00000b58 @@ -385649,7 +385649,7 @@ _080CC1EA: adds r4, r0, r2 ldrh r0, [r4] cmp r0, r5 - bne _080CC220 + bne @080CC220 ldr r0, =0x00000b08 adds r1, r0 adds r1, r2 @@ -385659,25 +385659,25 @@ _080CC1EA: lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne _080CC22A + bne @080CC22A strh r0, [r4] - b _080CC22A + b @080CC22A .align 2, 0 .pool -_080CC220: +@080CC220: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x27 - bls _080CC1EA -_080CC22A: + bls @080CC1EA +@080CC22A: pop {r4-r6} pop {r0} bx r0 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 @@ -385724,7 +385724,7 @@ sub_80CC230: @ 80CC230 adds r5, r0, 0 ldr r0, =0x0000ffff cmp r5, r0 - beq _080CC302 + beq @080CC302 ldr r7, [sp, 0x18] lsls r1, r7, 16 asrs r1, 16 @@ -385737,7 +385737,7 @@ sub_80CC230: @ 80CC230 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq _080CC2FC + beq @080CC2FC ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -385761,15 +385761,15 @@ sub_80CC230: @ 80CC230 strb r1, [r0, 0x5] mov r1, r10 strh r1, [r0, 0x2E] - b _080CC304 + b @080CC304 .align 2, 0 .pool -_080CC2FC: +@080CC2FC: adds r0, r6, 0 bl sub_80CC1E0 -_080CC302: +@080CC302: movs r0, 0 -_080CC304: +@080CC304: add sp, 0x1C pop {r3-r5} mov r8, r3 @@ -385781,7 +385781,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] @@ -385794,7 +385794,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 @@ -385818,7 +385818,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 + 1 bl is_function_an_active_task @@ -385831,7 +385831,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 @@ -385843,22 +385843,22 @@ sub_80CC370: @ 80CC370 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x4 - bhi _080CC454 + bhi @080CC454 lsls r0, 2 - ldr r1, =_080CC39C + ldr r1, =@080CC39C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080CC39C: - .4byte _080CC3B0 - .4byte _080CC3E8 - .4byte _080CC41C - .4byte _080CC426 - .4byte _080CC44C -_080CC3B0: +@080CC39C: + .4byte @080CC3B0 + .4byte @080CC3E8 + .4byte @080CC41C + .4byte @080CC426 + .4byte @080CC44C +@080CC3B0: ldr r1, =0x02039d08 ldr r0, [r1] ldr r2, =0x000002d2 @@ -385878,10 +385878,10 @@ _080CC3B0: movs r3, 0x1 bl RequestDma3Fill strh r0, [r4, 0xA] - b _080CC458 + b @080CC458 .align 2, 0 .pool -_080CC3E8: +@080CC3E8: movs r1, 0xA ldrsh r0, [r4, r1] bl CheckForSpaceForDma3Request @@ -385890,7 +385890,7 @@ _080CC3E8: movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080CC45E + beq @080CC45E ldr r0, =0x02039d08 ldr r1, [r0] ldr r2, =0x00004ac4 @@ -385899,18 +385899,18 @@ _080CC3E8: bl bg_set_tilemap movs r0, 0x2 bl gpu_sync_bg_show - b _080CC458 + b @080CC458 .align 2, 0 .pool -_080CC41C: +@080CC41C: ldrb r0, [r4, 0xC] movs r1, 0 bl sub_80CC7A0 - b _080CC458 -_080CC426: + b @080CC458 +@080CC426: bl sub_80CCA00 cmp r0, 0 - beq _080CC45E + beq @080CC45E ldrb r0, [r4, 0xC] bl sub_80CCB50 bl sub_80CD02C @@ -385919,29 +385919,29 @@ _080CC426: ldr r1, =0x00005b0a movs r0, 0xC bl lcd_io_set - b _080CC458 + b @080CC458 .align 2, 0 .pool -_080CC44C: +@080CC44C: adds r0, r2, 0 bl remove_task - b _080CC458 -_080CC454: + b @080CC458 +@080CC454: movs r0, 0 - b _080CC45C -_080CC458: + b @080CC45C +@080CC458: ldrh r0, [r4, 0x8] adds r0, 0x1 -_080CC45C: +@080CC45C: strh r0, [r4, 0x8] -_080CC45E: +@080CC45E: pop {r4} pop {r0} bx r0 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} @@ -385961,17 +385961,17 @@ sub_80CC464: @ 80CC464 negs r0, r0 adds r1, r0, 0 cmp r3, 0 - ble _080CC490 + ble @080CC490 movs r1, 0x6 -_080CC490: +@080CC490: ldr r7, =0x000002ce adds r0, r2, r7 strh r1, [r0] movs r1, 0x2 cmp r3, 0 - ble _080CC49E + ble @080CC49E movs r1, 0x1 -_080CC49E: +@080CC49E: ldr r7, =0x000002d3 adds r0, r2, r7 strb r1, [r0] @@ -385988,9 +385988,9 @@ _080CC49E: ldr r2, [r5] movs r1, 0 cmp r3, 0 - bgt _080CC4C2 + bgt @080CC4C2 movs r1, 0x5 -_080CC4C2: +@080CC4C2: ldr r4, =0x000002d6 adds r0, r2, r4 strh r1, [r0] @@ -386000,19 +386000,19 @@ _080CC4C2: strh r3, [r0] movs r1, 0x38 cmp r3, 0 - ble _080CC4DC + ble @080CC4DC movs r0, 0x84 lsls r0, 1 adds r1, r0, 0 -_080CC4DC: +@080CC4DC: ldr r4, =0x000002da adds r0, r2, r4 strh r1, [r0] movs r1, 0 cmp r3, 0 - bgt _080CC4EA + bgt @080CC4EA movs r1, 0x5 -_080CC4EA: +@080CC4EA: movs r7, 0xB7 lsls r7, 2 adds r0, r2, r7 @@ -386049,7 +386049,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] @@ -386057,19 +386057,19 @@ sub_80CC54C: @ 80CC54C adds r0, r1, r5 ldrb r0, [r0] cmp r0, 0x1 - beq _080CC594 + beq @080CC594 cmp r0, 0x1 - bgt _080CC570 + bgt @080CC570 cmp r0, 0 - beq _080CC576 - b _080CC624 + beq @080CC576 + b @080CC624 .align 2, 0 .pool -_080CC570: +@080CC570: cmp r0, 0x2 - beq _080CC5E4 - b _080CC624 -_080CC576: + beq @080CC5E4 + b @080CC624 +@080CC576: ldr r2, =0x00000a64 adds r0, r1, r2 ldrb r0, [r0] @@ -386084,10 +386084,10 @@ _080CC576: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_080CC594: +@080CC594: bl sub_80CCA00 cmp r0, 0 - beq _080CC632 + beq @080CC632 ldr r6, =0x02039d08 ldr r1, [r6] ldr r4, =0x00000a64 @@ -386113,10 +386113,10 @@ _080CC594: lsls r0, 24 asrs r0, 24 bl sub_80CD0B8 - b _080CC624 + b @080CC624 .align 2, 0 .pool -_080CC5E4: +@080CC5E4: bl sub_80CB584 lsls r0, 24 lsrs r5, r0, 24 @@ -386126,7 +386126,7 @@ _080CC5E4: adds r3, r2, r4 ldrh r0, [r3] cmp r0, 0 - beq _080CC620 + beq @080CC620 movs r0, 0xB3 lsls r0, 2 adds r1, r2, r0 @@ -386141,13 +386141,13 @@ _080CC5E4: strh r0, [r3] lsls r0, 16 cmp r0, 0 - bne _080CC632 + bne @080CC632 bl sub_80CCEE0 bl sub_80CD158 -_080CC620: +@080CC620: adds r0, r5, 0 - b _080CC634 -_080CC624: + b @080CC634 +@080CC624: ldr r0, =0x02039d08 ldr r1, [r0] ldr r4, =0x00000a63 @@ -386155,9 +386155,9 @@ _080CC624: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_080CC632: +@080CC632: movs r0, 0x1 -_080CC634: +@080CC634: pop {r4-r6} pop {r1} bx r1 @@ -386166,7 +386166,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 @@ -386175,34 +386175,34 @@ sub_80CC644: @ 80CC644 lsrs r1, r0, 24 movs r2, 0 cmp r1, r4 - beq _080CC66E -_080CC658: + beq @080CC66E +@080CC658: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xD - bls _080CC664 + bls @080CC664 movs r1, 0 -_080CC664: +@080CC664: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r1, r4 - bne _080CC658 -_080CC66E: + bne @080CC658 +@080CC66E: movs r0, 0x1 negs r0, r0 cmp r2, 0x6 - bhi _080CC678 + bhi @080CC678 movs r0, 0x1 -_080CC678: +@080CC678: pop {r4} pop {r1} bx r1 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 @@ -386226,7 +386226,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 @@ -386236,22 +386236,22 @@ sub_80CC6B0: @ 80CC6B0 ldrb r0, [r0] adds r4, r1, 0 cmp r0, 0x4 - bhi _080CC794 + bhi @080CC794 lsls r0, 2 - ldr r1, =_080CC6DC + ldr r1, =@080CC6DC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080CC6DC: - .4byte _080CC6F0 - .4byte _080CC718 - .4byte _080CC732 - .4byte _080CC76C - .4byte _080CC790 -_080CC6F0: +@080CC6DC: + .4byte @080CC6F0 + .4byte @080CC718 + .4byte @080CC732 + .4byte @080CC76C + .4byte @080CC790 +@080CC6F0: ldr r0, [r4] movs r1, 0xE7 lsls r1, 3 @@ -386266,24 +386266,24 @@ _080CC6F0: ldr r1, [r4] ldr r2, =0x00000a62 adds r1, r2 - b _080CC77E + b @080CC77E .align 2, 0 .pool -_080CC718: +@080CC718: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne _080CC794 + bne @080CC794 bl get_preferred_box lsls r0, 24 lsrs r0, 24 movs r1, 0 bl sub_80CC7A0 - b _080CC776 -_080CC732: + b @080CC776 +@080CC732: bl sub_80CCA00 cmp r0, 0x1 - bne _080CC794 + bne @080CC794 bl sub_80CCF9C ldr r4, =0x02039d08 ldr r0, [r4] @@ -386300,32 +386300,32 @@ _080CC732: ldr r1, [r4] ldr r2, =0x00000a62 adds r1, r2 - b _080CC77E + b @080CC77E .align 2, 0 .pool -_080CC76C: +@080CC76C: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne _080CC794 -_080CC776: + bne @080CC794 +@080CC776: ldr r0, =0x02039d08 ldr r1, [r0] ldr r0, =0x00000a62 adds r1, r0 -_080CC77E: +@080CC77E: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080CC794 + b @080CC794 .align 2, 0 .pool -_080CC790: +@080CC790: movs r0, 0 - b _080CC796 -_080CC794: + b @080CC796 +@080CC794: movs r0, 0x1 -_080CC796: +@080CC796: add sp, 0x4 pop {r4} pop {r1} @@ -386333,7 +386333,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 @@ -386355,21 +386355,21 @@ sub_80CC7A0: @ 80CC7A0 movs r0, 0 ldrsb r0, [r2, r0] cmp r0, 0 - beq _080CC7E6 + beq @080CC7E6 movs r3, 0 ldr r0, =0x000002d2 adds r2, r1, r0 ldrb r0, [r2] cmp r0, 0 - bne _080CC7DA + bne @080CC7DA movs r3, 0x1 -_080CC7DA: +@080CC7DA: strb r3, [r2] ldr r0, [r4] ldr r1, =0x00004ac4 adds r0, r1 bl sub_80CCAE0 -_080CC7E6: +@080CC7E6: ldr r7, =0x02039d08 ldr r0, [r7] ldr r2, =0x000006fa @@ -386379,7 +386379,7 @@ _080CC7E6: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x10 - beq _080CC8C4 + beq @080CC8C4 lsls r0, r1, 1 adds r0, r1 lsls r0, 2 @@ -386407,7 +386407,7 @@ _080CC7E6: movs r0, 0 ldrsb r0, [r4, r0] cmp r0, 0 - beq _080CC874 + beq @080CC874 ldr r0, [r6, 0x8] ldr r2, =0x000002d2 adds r1, r2 @@ -386419,10 +386419,10 @@ _080CC7E6: lsrs r1, 16 movs r2, 0x40 bl gpu_pal_apply - b _080CC888 + b @080CC888 .align 2, 0 .pool -_080CC874: +@080CC874: ldr r0, [r6, 0x8] ldr r2, =0x000002d2 adds r1, r2 @@ -386432,7 +386432,7 @@ _080CC874: adds r1, r2 movs r2, 0x20 bl CpuSet -_080CC888: +@080CC888: ldr r0, [r6] mov r1, sp bl malloc_and_decompress @@ -386451,10 +386451,10 @@ _080CC888: lsls r3, 8 movs r0, 0x2 bl gpu_copy_bg_tile_pattern_data_to_vram - b _080CC9DA + b @080CC9DA .align 2, 0 .pool -_080CC8C4: +@080CC8C4: bl sub_80D24A8 lsls r1, r0, 1 adds r1, r0 @@ -386499,7 +386499,7 @@ _080CC8C4: movs r0, 0 ldrsb r0, [r5, r0] cmp r0, 0 - beq _080CC960 + beq @080CC960 adds r0, r1, r4 ldr r2, =0x000002d2 adds r1, r2 @@ -386511,10 +386511,10 @@ _080CC8C4: lsrs r1, 16 movs r2, 0x40 bl gpu_pal_apply - b _080CC976 + b @080CC976 .align 2, 0 .pool -_080CC960: +@080CC960: ldr r2, =0x00000792 adds r0, r1, r2 ldr r3, =0x000002d2 @@ -386525,7 +386525,7 @@ _080CC960: adds r1, r2 movs r2, 0x20 bl CpuSet -_080CC976: +@080CC976: ldr r0, [r6] mov r1, sp bl malloc_and_decompress @@ -386570,7 +386570,7 @@ _080CC976: lsls r3, 8 movs r0, 0x2 bl gpu_copy_bg_tile_pattern_data_to_vram -_080CC9DA: +@080CC9DA: movs r0, 0x2 bl gpu_copy_wram_bg_tilemap_to_vram add sp, 0x8 @@ -386582,31 +386582,31 @@ _080CC9DA: thumb_func_end sub_80CC7A0 thumb_func_start sub_80CCA00 -sub_80CCA00: @ 80CCA00 +sub_80CCA00: ; 80CCA00 push {r4,r5,lr} bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq _080CCA12 + beq @080CCA12 movs r0, 0 - b _080CCA2E -_080CCA12: + b @080CCA2E +@080CCA12: ldr r5, =0x02039d08 ldr r0, [r5] ldr r1, =0x00000a68 adds r0, r1 ldr r0, [r0] cmp r0, 0 - beq _080CCA2C + beq @080CCA2C bl free ldr r0, [r5] ldr r1, =0x00000a68 adds r0, r1 str r4, [r0] -_080CCA2C: +@080CCA2C: movs r0, 0x1 -_080CCA2E: +@080CCA2E: pop {r4,r5} pop {r1} bx r1 @@ -386615,7 +386615,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 @@ -386663,21 +386663,21 @@ sub_80CCA3C: @ 80CCA3C movs r3, 0 bl bg_copy_tilemap_rect cmp r7, 0 - beq _080CCAD2 + beq @080CCAD2 cmp r7, 0 - ble _080CCAB0 + ble @080CCAB0 lsls r0, r6, 16 movs r1, 0xA0 lsls r1, 13 adds r0, r1 - b _080CCAB6 + b @080CCAB6 .align 2, 0 .pool -_080CCAB0: +@080CCAB0: lsls r0, r6, 16 ldr r3, =0xfffc0000 adds r0, r3 -_080CCAB6: +@080CCAB6: lsrs r6, r0, 16 lsls r2, r6, 24 lsrs r2, 24 @@ -386691,7 +386691,7 @@ _080CCAB6: movs r1, 0 movs r3, 0x2 bl Bg_FillWramTileMapRectWithTileAndPalette -_080CCAD2: +@080CCAD2: add sp, 0x24 pop {r4-r7} pop {r0} @@ -386701,7 +386701,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 @@ -386717,46 +386717,46 @@ sub_80CCAE0: @ 80CCAE0 ands r3, r0 adds r0, r3, 0 cmp r0, 0x1F - bgt _080CCB10 + bgt @080CCB10 lsls r0, 1 movs r6, 0x98 lsls r6, 3 adds r0, r6 - b _080CCB18 + b @080CCB18 .align 2, 0 .pool -_080CCB10: +@080CCB10: lsls r0, 1 movs r1, 0xC8 lsls r1, 4 adds r0, r1 -_080CCB18: +@080CCB18: adds r2, r0 movs r0, 0 movs r5, 0 movs r4, 0x3F -_080CCB20: +@080CCB20: strh r5, [r2] adds r2, 0x2 adds r3, 0x1 ands r3, r4 adds r1, r3, 0 cmp r1, 0 - bne _080CCB32 + bne @080CCB32 ldr r6, =0xfffff7c0 adds r2, r6 -_080CCB32: +@080CCB32: cmp r1, 0x20 - bne _080CCB3C + bne @080CCB3C movs r1, 0xF8 lsls r1, 3 adds r2, r1 -_080CCB3C: +@080CCB3C: adds r0, 0x1 lsls r0, 16 lsrs r0, 16 cmp r0, 0x2B - bls _080CCB20 + bls @080CCB20 pop {r4-r6} pop {r0} bx r0 @@ -386765,7 +386765,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 @@ -386898,7 +386898,7 @@ sub_80CCB50: @ 80CCB50 movs r4, 0 lsls r0, 16 asrs r6, r0, 16 -_080CCC70: +@080CCC70: lsls r1, r4, 5 adds r1, r6, r1 lsls r1, 16 @@ -386930,7 +386930,7 @@ _080CCC70: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x1 - bls _080CCC70 + bls @080CCC70 ldr r0, [r5] movs r4, 0xDF lsls r4, 3 @@ -386950,7 +386950,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 @@ -386991,16 +386991,16 @@ sub_80CCCFC: @ 80CCCFC mov r8, r4 adds r6, r3, 0 cmp r0, 0 - bne _080CCD50 + bne @080CCD50 movs r1, 0x1 -_080CCD50: +@080CCD50: strb r1, [r2] mov r7, r8 ldr r0, [r7] adds r0, r5 ldrb r0, [r0] cmp r0, 0 - bne _080CCD8C + bne @080CCD8C ldr r0, [r6, 0x4] mov r1, r12 ands r0, r1 @@ -387012,10 +387012,10 @@ _080CCD50: adds r0, r5 ldrh r0, [r0] mov r9, r0 - b _080CCDB0 + b @080CCDB0 .align 2, 0 .pool -_080CCD8C: +@080CCD8C: ldr r0, [r6, 0x4] mov r7, r12 ands r0, r7 @@ -387034,7 +387034,7 @@ _080CCD8C: strh r0, [r1] ldr r0, =0x0000dac9 strh r0, [r1, 0x2] -_080CCDB0: +@080CCDB0: mov r5, r8 ldr r4, [r5] ldr r5, =0x000021b8 @@ -387090,7 +387090,7 @@ _080CCDB0: mov r9, r8 negs r2, r2 mov r8, r2 -_080CCE2E: +@080CCE2E: lsls r6, r7, 5 mov r5, r10 lsls r1, r5, 16 @@ -387155,7 +387155,7 @@ _080CCE2E: lsls r0, 16 lsrs r7, r0, 16 cmp r7, 0x1 - bls _080CCE2E + bls @080CCE2E add sp, 0x2C pop {r3-r5} mov r8, r3 @@ -387169,7 +387169,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] @@ -387178,16 +387178,16 @@ sub_80CCEE0: @ 80CCEE0 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _080CCF00 + bne @080CCF00 movs r0, 0x4 bl gpu_tile_obj_free_by_tag - b _080CCF06 + b @080CCF06 .align 2, 0 .pool -_080CCF00: +@080CCF00: movs r0, 0x3 bl gpu_tile_obj_free_by_tag -_080CCF06: +@080CCF06: ldr r0, =0x02039d08 ldr r0, [r0] movs r3, 0xE4 @@ -387210,18 +387210,18 @@ _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] movs r3, 0x32 ldrsh r0, [r2, r3] cmp r0, 0 - beq _080CCF44 + beq @080CCF44 subs r0, r1, 0x1 strh r0, [r2, 0x32] - b _080CCF5C -_080CCF44: + b @080CCF5C +@080CCF44: ldrh r0, [r2, 0x2E] ldrh r1, [r2, 0x20] adds r0, r1 @@ -387231,10 +387231,10 @@ _080CCF44: movs r3, 0x30 ldrsh r1, [r2, r3] cmp r0, r1 - bne _080CCF5C + bne @080CCF5C ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] -_080CCF5C: +@080CCF5C: pop {r0} bx r0 .align 2, 0 @@ -387242,18 +387242,18 @@ _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] movs r3, 0x30 ldrsh r0, [r2, r3] cmp r0, 0 - beq _080CCF78 + beq @080CCF78 subs r0, r1, 0x1 strh r0, [r2, 0x30] - b _080CCF96 -_080CCF78: + b @080CCF96 +@080CCF78: ldrh r0, [r2, 0x2E] ldrh r1, [r2, 0x20] adds r0, r1 @@ -387265,16 +387265,16 @@ _080CCF78: lsls r0, 16 lsrs r0, 16 cmp r0, 0xC0 - bls _080CCF96 + bls @080CCF96 adds r0, r2, 0 bl obj_delete_and_free_tiles -_080CCF96: +@080CCF96: pop {r0} bx r0 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 @@ -387289,7 +387289,7 @@ sub_80CCF9C: @ 80CCF9C adds r0, r2, r3 ldrb r0, [r0] cmp r0, 0 - bne _080CCFE4 + bne @080CCFE4 lsls r0, r1, 2 ldr r1, =0x08577574 adds r0, r1 @@ -387301,10 +387301,10 @@ sub_80CCF9C: @ 80CCF9C adds r1, r2 movs r2, 0x2 bl CpuSet - b _080CCFFC + b @080CCFFC .align 2, 0 .pool -_080CCFE4: +@080CCFE4: lsls r0, r1, 2 ldr r1, =0x08577574 adds r0, r1 @@ -387316,7 +387316,7 @@ _080CCFE4: adds r1, r2 movs r2, 0x2 bl CpuSet -_080CCFFC: +@080CCFFC: pop {r0} bx r0 .align 2, 0 @@ -387324,7 +387324,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 @@ -387343,12 +387343,12 @@ 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, =0x0857b080 bl gpu_tile_obj_alloc_tag_and_copy_to_vram movs r5, 0 -_080CD036: +@080CD036: lsls r1, r5, 4 adds r1, r5 lsls r1, 19 @@ -387363,7 +387363,7 @@ _080CD036: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq _080CD088 + beq @080CD088 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -387375,11 +387375,11 @@ _080CD036: bl obj_anim_image_start movs r0, 0x1 cmp r5, 0 - bne _080CD076 + bne @080CD076 movs r1, 0x1 negs r1, r1 adds r0, r1, 0 -_080CD076: +@080CD076: strh r0, [r4, 0x34] ldr r0, =0x02039d08 ldr r0, [r0] @@ -387389,19 +387389,19 @@ _080CD076: adds r0, r2 adds r0, r1 str r4, [r0] -_080CD088: +@080CD088: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x1 - bls _080CD036 + bls @080CD036 bl sub_80CEADC lsls r0, 24 cmp r0, 0 - beq _080CD0A2 + beq @080CD0A2 movs r0, 0x1 bl sub_80CD1A8 -_080CD0A2: +@080CD0A2: pop {r4,r5} pop {r0} bx r0 @@ -387410,7 +387410,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 @@ -387421,7 +387421,7 @@ sub_80CD0B8: @ 80CD0B8 lsls r6, 3 movs r4, 0 movs r3, 0x2 -_080CD0CC: +@080CD0CC: mov r0, r12 ldr r1, [r0] lsls r0, r2, 2 @@ -387435,10 +387435,10 @@ _080CD0CC: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x1 - bls _080CD0CC + bls @080CD0CC lsls r0, r5, 24 cmp r0, 0 - bge _080CD114 + bge @080CD114 ldr r1, [r7] movs r2, 0xE6 lsls r2, 3 @@ -387453,10 +387453,10 @@ _080CD0CC: strh r0, [r2, 0x30] ldr r0, [r3] movs r2, 0x48 - b _080CD130 + b @080CD130 .align 2, 0 .pool -_080CD114: +@080CD114: ldr r1, [r7] movs r2, 0xE6 lsls r2, 3 @@ -387471,7 +387471,7 @@ _080CD114: strh r0, [r2, 0x30] ldr r0, [r3] movs r2, 0xF8 -_080CD130: +@080CD130: strh r2, [r0, 0x32] ldr r0, [r1] strh r2, [r0, 0x32] @@ -387495,14 +387495,14 @@ _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 movs r6, 0x5 negs r6, r6 ldr r4, =0x02039d08 -_080CD164: +@080CD164: ldr r1, [r4] lsls r0, r3, 2 movs r2, 0xE6 @@ -387527,7 +387527,7 @@ _080CD164: lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x1 - bls _080CD164 + bls @080CD164 movs r0, 0x1 bl sub_80CD1A8 pop {r4-r6} @@ -387538,18 +387538,18 @@ _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 - beq _080CD1E4 + beq @080CD1E4 movs r2, 0 ldr r6, =0x02039d08 movs r5, 0xE6 lsls r5, 3 movs r3, 0 movs r4, 0x1 -_080CD1BC: +@080CD1BC: ldr r1, [r6] lsls r0, r2, 2 adds r1, r5 @@ -387566,17 +387566,17 @@ _080CD1BC: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x1 - bls _080CD1BC - b _080CD204 + bls @080CD1BC + b @080CD204 .align 2, 0 .pool -_080CD1E4: +@080CD1E4: movs r2, 0 ldr r5, =0x02039d08 movs r4, 0xE6 lsls r4, 3 movs r3, 0 -_080CD1EE: +@080CD1EE: ldr r0, [r5] lsls r1, r2, 2 adds r0, r4 @@ -387587,8 +387587,8 @@ _080CD1EE: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x1 - bls _080CD1EE -_080CD204: + bls @080CD1EE +@080CD204: pop {r4-r6} pop {r0} bx r0 @@ -387597,32 +387597,32 @@ _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 ldrsh r0, [r2, r1] cmp r0, 0x4 - bhi _080CD2DC + bhi @080CD2DC lsls r0, 2 - ldr r1, =_080CD22C + ldr r1, =@080CD22C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080CD22C: - .4byte _080CD240 - .4byte _080CD246 - .4byte _080CD274 - .4byte _080CD27A - .4byte _080CD2CC -_080CD240: +@080CD22C: + .4byte @080CD240 + .4byte @080CD246 + .4byte @080CD274 + .4byte @080CD27A + .4byte @080CD2CC +@080CD240: movs r0, 0 strh r0, [r2, 0x24] - b _080CD2DC -_080CD246: + b @080CD2DC +@080CD246: ldrh r0, [r2, 0x30] adds r0, 0x1 movs r1, 0 @@ -387630,7 +387630,7 @@ _080CD246: lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble _080CD2DC + ble @080CD2DC strh r1, [r2, 0x30] ldrh r0, [r2, 0x34] ldrh r3, [r2, 0x24] @@ -387642,15 +387642,15 @@ _080CD246: lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - ble _080CD2DC + ble @080CD2DC strh r1, [r2, 0x32] strh r1, [r2, 0x24] - b _080CD2DC -_080CD274: + b @080CD2DC +@080CD274: movs r0, 0x3 strh r0, [r2, 0x2E] - b _080CD2DC -_080CD27A: + b @080CD2DC +@080CD27A: ldr r0, =0x02039d08 ldr r1, [r0] ldr r0, =0x000002ce @@ -387663,20 +387663,20 @@ _080CD27A: lsls r0, 16 lsrs r0, 16 cmp r0, 0xAE - bls _080CD2A0 + bls @080CD2A0 adds r3, r2, 0 adds r3, 0x3E ldrb r0, [r3] movs r1, 0x4 orrs r0, r1 strb r0, [r3] -_080CD2A0: +@080CD2A0: ldrh r0, [r2, 0x30] subs r0, 0x1 strh r0, [r2, 0x30] lsls r0, 16 cmp r0, 0 - bne _080CD2DC + bne @080CD2DC ldrh r0, [r2, 0x32] strh r0, [r2, 0x20] adds r3, r2, 0 @@ -387688,10 +387688,10 @@ _080CD2A0: strb r0, [r3] movs r0, 0x4 strh r0, [r2, 0x2E] - b _080CD2DC + b @080CD2DC .align 2, 0 .pool -_080CD2CC: +@080CD2CC: ldr r0, =0x02039d08 ldr r0, [r0] ldr r1, =0x000002ce @@ -387700,7 +387700,7 @@ _080CD2CC: ldrh r0, [r0] subs r1, r0 strh r1, [r2, 0x20] -_080CD2DC: +@080CD2DC: pop {r0} bx r0 .align 2, 0 @@ -387708,7 +387708,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} @@ -387734,7 +387734,7 @@ sub_80CD2E8: @ 80CD2E8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _080CD360 + beq @080CD360 movs r1, 0x1 ands r1, r7 lsls r4, r0, 4 @@ -387759,12 +387759,12 @@ sub_80CD2E8: @ 80CD2E8 ldr r0, =nullsub_12 + 1 str r0, [r4] adds r0, r6, 0 - b _080CD362 + b @080CD362 .align 2, 0 .pool -_080CD360: +@080CD360: movs r0, 0 -_080CD362: +@080CD362: pop {r3} mov r8, r3 pop {r4-r7} @@ -387773,23 +387773,23 @@ _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] ldrb r1, [r0, 0x1] cmp r1, 0x1 - beq _080CD388 + beq @080CD388 ldr r1, =0x02039d78 movs r0, 0 strb r0, [r1] - b _080CD38C + b @080CD38C .align 2, 0 .pool -_080CD388: +@080CD388: ldr r0, =0x02039d78 strb r1, [r0] -_080CD38C: +@080CD38C: ldr r0, =0x02039d79 movs r1, 0 strb r1, [r0] @@ -387822,7 +387822,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 @@ -387840,7 +387840,7 @@ sub_80CD3EC: @ 80CD3EC ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 - beq _080CD426 + beq @080CD426 ldr r0, [r3] ldr r1, =0x000020a4 adds r0, r1 @@ -387848,7 +387848,7 @@ sub_80CD3EC: @ 80CD3EC movs r2, 0x64 bl memcpy bl sub_80CAFC4 -_080CD426: +@080CD426: pop {r0} bx r0 .align 2, 0 @@ -387856,7 +387856,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 @@ -387865,22 +387865,22 @@ sub_80CD444: @ 80CD444 lsls r1, 24 lsrs r5, r1, 24 cmp r0, 0x4 - bhi _080CD4FC + bhi @080CD4FC lsls r0, 2 - ldr r1, =_080CD464 + ldr r1, =@080CD464 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080CD464: - .4byte _080CD478 - .4byte _080CD4A6 - .4byte _080CD4CE - .4byte _080CD4D6 - .4byte _080CD4F4 -_080CD478: +@080CD464: + .4byte @080CD478 + .4byte @080CD4A6 + .4byte @080CD4CE + .4byte @080CD4D6 + .4byte @080CD4F4 +@080CD478: adds r0, r5, 0 movs r1, 0x6 bl __umodsi3 @@ -387901,22 +387901,22 @@ _080CD478: lsls r1, 3 adds r1, 0x20 strh r1, [r6] - b _080CD4FC -_080CD4A6: + b @080CD4FC +@080CD4A6: cmp r5, 0 - bne _080CD4B2 + bne @080CD4B2 movs r0, 0x68 strh r0, [r4] movs r0, 0x34 - b _080CD4FA -_080CD4B2: + b @080CD4FA +@080CD4B2: cmp r5, 0x6 - bne _080CD4BE + bne @080CD4BE movs r0, 0x98 strh r0, [r4] movs r0, 0x84 - b _080CD4FA -_080CD4BE: + b @080CD4FA +@080CD4BE: movs r0, 0x98 strh r0, [r4] subs r1, r5, 0x1 @@ -387924,51 +387924,51 @@ _080CD4BE: adds r0, r1 lsls r0, 3 adds r0, 0x4 - b _080CD4FA -_080CD4CE: + b @080CD4FA +@080CD4CE: movs r0, 0xA2 strh r0, [r4] movs r0, 0xC - b _080CD4FA -_080CD4D6: + b @080CD4FA +@080CD4D6: ldr r0, =0x02039d7a ldrb r0, [r0] movs r1, 0xE cmp r0, 0 - beq _080CD4E2 + beq @080CD4E2 movs r1, 0x8 -_080CD4E2: +@080CD4E2: strh r1, [r6] movs r0, 0x58 muls r0, r5 adds r0, 0x78 strh r0, [r4] - b _080CD4FC + b @080CD4FC .align 2, 0 .pool -_080CD4F4: +@080CD4F4: movs r0, 0xA0 strh r0, [r4] movs r0, 0x60 -_080CD4FA: +@080CD4FA: strh r0, [r6] -_080CD4FC: +@080CD4FC: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_80CD444 thumb_func_start sub_80CD504 -sub_80CD504: @ 80CD504 +sub_80CD504: ; 80CD504 push {lr} ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0 - beq _080CD538 + beq @080CD538 cmp r0, 0x1 - bne _080CD54C + bne @080CD54C ldr r0, =0x02039d79 movs r1, 0 ldrsb r1, [r0, r1] @@ -387978,29 +387978,29 @@ sub_80CD504: @ 80CD504 adds r0, r1 movs r1, 0xB bl pokemon_getattr - b _080CD542 + b @080CD542 .align 2, 0 .pool -_080CD538: +@080CD538: ldr r0, =0x02039d79 ldrb r0, [r0] movs r1, 0xB bl get_pokemon_data_from_selected_box -_080CD542: +@080CD542: lsls r0, 16 lsrs r0, 16 - b _080CD54E + b @080CD54E .align 2, 0 .pool -_080CD54C: +@080CD54C: movs r0, 0 -_080CD54E: +@080CD54E: pop {r1} bx r1 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] @@ -388009,25 +388009,25 @@ sub_80CD554: @ 80CD554 adds r1, r5, r0 ldrh r0, [r1] cmp r0, 0 - bne _080CD57E + bne @080CD57E ldrb r0, [r5, 0x1] cmp r0, 0x3 - beq _080CD574 + beq @080CD574 movs r0, 0 - b _080CD69A + b @080CD69A .align 2, 0 .pool -_080CD574: +@080CD574: bl sub_80D1218 lsls r0, 24 lsrs r0, 24 - b _080CD69A -_080CD57E: + b @080CD69A +@080CD57E: subs r0, 0x1 strh r0, [r1] lsls r0, 16 cmp r0, 0 - beq _080CD67C + beq @080CD67C ldr r1, =0x00000cbc adds r4, r5, r1 ldr r2, =0x00000cc4 @@ -388062,14 +388062,14 @@ _080CD57E: movs r3, 0x80 lsls r3, 1 cmp r0, r3 - ble _080CD5DA + ble @080CD5DA ldr r4, =0xffffff00 adds r0, r2, r4 lsls r0, 16 asrs r0, 16 adds r0, 0x40 strh r0, [r1, 0x20] -_080CD5DA: +@080CD5DA: ldr r0, [r7] adds r0, r6 ldr r1, [r0] @@ -388077,14 +388077,14 @@ _080CD5DA: movs r4, 0x20 ldrsh r0, [r1, r4] cmp r0, 0x3F - bgt _080CD5F6 + bgt @080CD5F6 movs r0, 0x40 subs r0, r2 lsls r0, 16 asrs r0, 16 subs r0, r3, r0 strh r0, [r1, 0x20] -_080CD5F6: +@080CD5F6: ldr r0, [r7] adds r0, r6 ldr r1, [r0] @@ -388092,14 +388092,14 @@ _080CD5F6: movs r3, 0x22 ldrsh r0, [r1, r3] cmp r0, 0xB0 - ble _080CD612 + ble @080CD612 adds r0, r2, 0 subs r0, 0xB0 lsls r0, 16 asrs r0, 16 subs r0, 0x10 strh r0, [r1, 0x22] -_080CD612: +@080CD612: ldr r0, [r7] adds r0, r6 ldr r2, [r0] @@ -388109,25 +388109,25 @@ _080CD612: movs r1, 0x10 negs r1, r1 cmp r0, r1 - bge _080CD632 + bge @080CD632 subs r0, r1, r3 movs r1, 0xB0 lsls r0, 16 asrs r0, 16 subs r1, r0 strh r1, [r2, 0x22] -_080CD632: +@080CD632: ldr r0, [r7] ldr r2, =0x00000cd7 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0 - beq _080CD698 + beq @080CD698 subs r0, 0x1 strb r0, [r1] lsls r0, 24 cmp r0, 0 - bne _080CD698 + bne @080CD698 ldr r0, [r7] adds r0, r6 ldr r2, [r0] @@ -388143,10 +388143,10 @@ _080CD632: ands r0, r3 orrs r0, r1 strb r0, [r2] - b _080CD698 + b @080CD698 .align 2, 0 .pool -_080CD67C: +@080CD67C: ldr r3, =0x00000cb4 adds r2, r5, r3 ldr r1, [r2] @@ -388160,9 +388160,9 @@ _080CD67C: ldrh r0, [r0] strh r0, [r1, 0x22] bl sub_80CDA68 -_080CD698: +@080CD698: movs r0, 0x1 -_080CD69A: +@080CD69A: pop {r4-r7} pop {r1} bx r1 @@ -388171,7 +388171,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 @@ -388215,7 +388215,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] @@ -388224,34 +388224,34 @@ sub_80CD70C: @ 80CD70C ldrh r1, [r1] adds r4, r0, 0 cmp r1, 0 - beq _080CD730 + beq @080CD730 movs r0, 0xCD lsls r0, 4 adds r1, r2, r0 movs r0, 0xC - b _080CD738 + b @080CD738 .align 2, 0 .pool -_080CD730: +@080CD730: movs r3, 0xCD lsls r3, 4 adds r1, r2, r3 movs r0, 0x6 -_080CD738: +@080CD738: strh r0, [r1] ldr r1, [r4] ldr r0, =0x00000cd7 adds r2, r1, r0 ldrb r0, [r2] cmp r0, 0 - beq _080CD752 + beq @080CD752 movs r3, 0xCD lsls r3, 4 adds r0, r1, r3 ldrh r0, [r0] lsrs r0, 1 strb r0, [r2] -_080CD752: +@080CD752: ldr r2, [r4] ldr r1, =0x00000cd2 adds r0, r2, r1 @@ -388260,9 +388260,9 @@ _080CD752: movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _080CD78C + beq @080CD78C cmp r1, 0x1 - beq _080CD7AC + beq @080CD7AC ldr r3, =0x00000cce adds r0, r2, r3 movs r3, 0 @@ -388272,10 +388272,10 @@ _080CD752: ldr r0, [r0] movs r2, 0x22 ldrsh r0, [r0, r2] - b _080CD7C0 + b @080CD7C0 .align 2, 0 .pool -_080CD78C: +@080CD78C: ldr r3, =0x00000cce adds r0, r2, r3 movs r3, 0 @@ -388286,10 +388286,10 @@ _080CD78C: movs r2, 0x22 ldrsh r0, [r0, r2] adds r0, 0xC0 - b _080CD7C0 + b @080CD7C0 .align 2, 0 .pool -_080CD7AC: +@080CD7AC: ldr r3, =0x00000cce adds r0, r2, r3 movs r3, 0 @@ -388300,7 +388300,7 @@ _080CD7AC: movs r2, 0x22 ldrsh r0, [r0, r2] subs r0, 0xC0 -_080CD7C0: +@080CD7C0: subs r7, r1, r0 ldr r2, [r4] ldr r3, =0x00000cd3 @@ -388310,9 +388310,9 @@ _080CD7C0: movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _080CD7FC + beq @080CD7FC cmp r1, 0x1 - beq _080CD81C + beq @080CD81C ldr r1, =0x00000ccc adds r0, r2, r1 movs r3, 0 @@ -388322,10 +388322,10 @@ _080CD7C0: ldr r0, [r0] movs r2, 0x20 ldrsh r0, [r0, r2] - b _080CD830 + b @080CD830 .align 2, 0 .pool -_080CD7FC: +@080CD7FC: ldr r3, =0x00000ccc adds r0, r2, r3 movs r3, 0 @@ -388336,10 +388336,10 @@ _080CD7FC: movs r2, 0x20 ldrsh r0, [r0, r2] adds r0, 0xC0 - b _080CD830 + b @080CD830 .align 2, 0 .pool -_080CD81C: +@080CD81C: ldr r3, =0x00000ccc adds r0, r2, r3 movs r3, 0 @@ -388350,7 +388350,7 @@ _080CD81C: movs r2, 0x20 ldrsh r0, [r0, r2] subs r0, 0xC0 -_080CD830: +@080CD830: subs r0, r1, r0 lsls r7, 8 lsls r0, 8 @@ -388394,7 +388394,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 @@ -388408,85 +388408,85 @@ sub_80CD894: @ 80CD894 ldr r1, [r5] ldrb r0, [r1, 0x1] cmp r0, 0x3 - beq _080CD8E4 + beq @080CD8E4 ldr r2, =0x000021ff adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - bne _080CD8FC + bne @080CD8FC ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 - bne _080CD8FC + bne @080CD8FC ldr r2, =0x00000cb4 adds r0, r1, r2 ldr r0, [r0] movs r1, 0x1 bl obj_anim_image_start - b _080CD8FC + b @080CD8FC .align 2, 0 .pool -_080CD8E4: +@080CD8E4: bl sub_80D127C lsls r0, 24 cmp r0, 0 - bne _080CD8FC + bne @080CD8FC ldr r0, [r5] ldr r1, =0x00000cb4 adds r0, r1 ldr r0, [r0] movs r1, 0x1 bl obj_anim_image_start -_080CD8FC: +@080CD8FC: ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x3 - bne _080CD95C + bne @080CD95C ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0 - bne _080CD930 + bne @080CD930 ldr r0, =0x02039d79 ldrb r1, [r0] movs r0, 0 bl sub_80D0E50 - b _080CD93E + b @080CD93E .align 2, 0 .pool -_080CD930: +@080CD930: cmp r0, 0x1 - bne _080CD93E + bne @080CD93E ldr r0, =0x02039d79 ldrb r1, [r0] movs r0, 0x1 bl sub_80D0E50 -_080CD93E: +@080CD93E: cmp r4, 0 - bne _080CD950 + bne @080CD950 movs r0, 0 adds r1, r6, 0 bl sub_80D0D8C - b _080CD95C + b @080CD95C .align 2, 0 .pool -_080CD950: +@080CD950: cmp r4, 0x1 - bne _080CD988 + bne @080CD988 movs r0, 0x1 adds r1, r6, 0 bl sub_80D0D8C -_080CD95C: +@080CD95C: cmp r4, 0x1 - bne _080CD988 + bne @080CD988 ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0x1 - beq _080CD988 + beq @080CD988 ldr r1, =0x02039d08 ldr r0, [r1] ldr r2, =0x00000cd6 @@ -388501,13 +388501,13 @@ _080CD95C: movs r2, 0x4 orrs r0, r2 strb r0, [r1] -_080CD988: +@080CD988: cmp r4, 0 - beq _080CD9E4 + beq @080CD9E4 cmp r4, 0 - blt _080CDA56 + blt @080CDA56 cmp r4, 0x3 - bgt _080CDA56 + bgt @080CDA56 ldr r5, =0x02039d08 ldr r0, [r5] ldr r2, =0x00000cb4 @@ -388536,17 +388536,17 @@ _080CD988: ands r2, r0 orrs r2, r3 strb r2, [r1, 0x5] - b _080CDA56 + b @080CDA56 .align 2, 0 .pool -_080CD9E4: +@080CD9E4: ldr r3, =0x02039d08 ldr r1, [r3] ldr r2, =0x000021ff adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080CDA28 + beq @080CDA28 ldr r2, =0x00000cb4 adds r0, r1, r2 ldr r2, [r0] @@ -388564,10 +388564,10 @@ _080CD9E4: movs r2, 0x4 orrs r0, r2 strb r0, [r1] - b _080CDA56 + b @080CDA56 .align 2, 0 .pool -_080CDA28: +@080CDA28: ldr r2, =0x00000cb4 adds r0, r1, r2 ldr r2, [r0] @@ -388583,14 +388583,14 @@ _080CDA28: lsls r0, 24 asrs r0, 24 cmp r0, 0 - bne _080CDA56 + bne @080CDA56 ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 - beq _080CDA56 + beq @080CDA56 movs r0, 0x2 bl sub_80CC0D4 -_080CDA56: +@080CDA56: pop {r4-r6} pop {r0} bx r0 @@ -388599,7 +388599,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 @@ -388615,61 +388615,61 @@ sub_80CDA68: @ 80CDA68 strb r0, [r1] ldrb r0, [r2, 0x1] cmp r0, 0x3 - beq _080CDAC0 + beq @080CDAC0 ldr r1, =0x000021ff adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 - bne _080CDAD8 + bne @080CDAD8 ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 - bne _080CDAD8 + bne @080CDAD8 subs r3, 0x21 adds r0, r2, r3 ldr r0, [r0] movs r1, 0 bl obj_anim_image_start - b _080CDAD8 + b @080CDAD8 .align 2, 0 .pool -_080CDAC0: +@080CDAC0: bl sub_80D127C lsls r0, 24 cmp r0, 0 - bne _080CDAD8 + bne @080CDAD8 ldr r0, [r4] ldr r1, =0x00000cb4 adds r0, r1 ldr r0, [r0] movs r1, 0 bl obj_anim_image_start -_080CDAD8: +@080CDAD8: bl sub_80CEB40 ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0x1 - beq _080CDB0E + beq @080CDB0E cmp r0, 0x1 - bgt _080CDAFC + bgt @080CDAFC cmp r0, 0 - beq _080CDB30 - b _080CDB8A + beq @080CDB30 + b @080CDB8A .align 2, 0 .pool -_080CDAFC: +@080CDAFC: cmp r0, 0x2 - beq _080CDB06 + beq @080CDB06 cmp r0, 0x3 - bne _080CDB8A - b _080CDB1E -_080CDB06: + bne @080CDB8A + b @080CDB1E +@080CDB06: movs r0, 0x1 bl sub_80CD1A8 - b _080CDB8A -_080CDB0E: + b @080CDB8A +@080CDB0E: ldr r0, =0x02039d08 ldr r0, [r0] ldr r2, =0x00000cb8 @@ -388678,20 +388678,20 @@ _080CDB0E: adds r0, 0x43 movs r1, 0xD strb r1, [r0] -_080CDB1E: +@080CDB1E: movs r0, 0x1 bl sub_80CC0D4 - b _080CDB8A + b @080CDB8A .align 2, 0 .pool -_080CDB30: +@080CDB30: ldr r4, =0x02039d08 ldr r1, [r4] ldr r3, =0x000021ff adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 - bne _080CDB8A + bne @080CDB8A ldr r2, =0x00000cb4 adds r0, r1, r2 ldr r3, [r0] @@ -388729,7 +388729,7 @@ _080CDB30: strb r0, [r1] movs r0, 0x2 bl sub_80CC0D4 -_080CDB8A: +@080CDB8A: pop {r4} pop {r0} bx r0 @@ -388738,24 +388738,24 @@ _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] cmp r0, 0 - bne _080CDBB4 + bne @080CDBB4 movs r3, 0 - b _080CDBC2 + b @080CDBC2 .align 2, 0 .pool -_080CDBB4: +@080CDBB4: bl calc_player_party_count lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x5 - bls _080CDBC2 + bls @080CDBC2 movs r3, 0x5 -_080CDBC2: +@080CDBC2: ldr r0, =0x02039d08 ldr r2, [r0] ldr r1, =0x00000cb4 @@ -388766,12 +388766,12 @@ _080CDBC2: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080CDBE0 + beq @080CDBE0 ldr r0, =0x00000cd7 adds r1, r2, r0 movs r0, 0x1 strb r0, [r1] -_080CDBE0: +@080CDBE0: movs r0, 0x1 adds r1, r3, 0 bl sub_80CD894 @@ -388782,7 +388782,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 @@ -388794,7 +388794,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] @@ -388804,7 +388804,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] @@ -388815,7 +388815,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 @@ -388824,7 +388824,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] @@ -388846,26 +388846,26 @@ 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 - bne _080CDC84 + bne @080CDC84 ldr r0, =0x02039d08 ldr r1, [r0] ldr r2, =0x00000d8c adds r1, r2 ldr r2, =sub_80CDEB4 + 1 - b _080CDC8E + b @080CDC8E .align 2, 0 .pool -_080CDC84: +@080CDC84: ldr r0, =0x02039d08 ldr r1, [r0] ldr r2, =0x00000d8c adds r1, r2 ldr r2, =sub_80CDEC4 + 1 -_080CDC8E: +@080CDC8E: str r2, [r1] ldr r0, [r0] movs r1, 0xD9 @@ -388880,7 +388880,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] @@ -388897,7 +388897,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] @@ -388906,44 +388906,44 @@ sub_80CDCCC: @ 80CDCCC adds r0, r1, r5 ldrb r0, [r0] cmp r0, 0x1 - beq _080CDD1C + beq @080CDD1C cmp r0, 0x1 - bgt _080CDCEC + bgt @080CDCEC cmp r0, 0 - beq _080CDCF6 - b _080CDD54 + beq @080CDCF6 + b @080CDD54 .align 2, 0 .pool -_080CDCEC: +@080CDCEC: cmp r0, 0x2 - beq _080CDD40 + beq @080CDD40 cmp r0, 0x3 - beq _080CDCFE - b _080CDD54 -_080CDCF6: + beq @080CDCFE + b @080CDD54 +@080CDCF6: ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 - beq _080CDD08 -_080CDCFE: + beq @080CDD08 +@080CDCFE: movs r0, 0 - b _080CDD56 + b @080CDD56 .align 2, 0 .pool -_080CDD08: +@080CDD08: ldr r2, =0x00000cb4 adds r0, r1, r2 ldr r0, [r0] movs r1, 0x2 bl obj_anim_image_start - b _080CDD4A + b @080CDD4A .align 2, 0 .pool -_080CDD1C: +@080CDD1C: bl sub_80CDED4 lsls r0, 24 cmp r0, 0 - bne _080CDD54 + bne @080CDD54 ldr r0, [r4] ldr r1, =0x00000cb4 adds r0, r1 @@ -388951,30 +388951,30 @@ _080CDD1C: movs r1, 0x3 bl obj_anim_image_start bl sub_80CDF38 - b _080CDD4A + b @080CDD4A .align 2, 0 .pool -_080CDD40: +@080CDD40: bl sub_80CDF08 lsls r0, 24 cmp r0, 0 - bne _080CDD54 -_080CDD4A: + bne @080CDD54 +@080CDD4A: ldr r1, [r4] adds r1, r5 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_080CDD54: +@080CDD54: movs r0, 0x1 -_080CDD56: +@080CDD56: pop {r4,r5} pop {r1} bx r1 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] @@ -388983,23 +388983,23 @@ sub_80CDD5C: @ 80CDD5C adds r0, r5 ldrb r0, [r0] cmp r0, 0x1 - beq _080CDDA4 + beq @080CDDA4 cmp r0, 0x1 - bgt _080CDD7C + bgt @080CDD7C cmp r0, 0 - beq _080CDD82 - b _080CDDD0 + beq @080CDD82 + b @080CDDD0 .align 2, 0 .pool -_080CDD7C: +@080CDD7C: cmp r0, 0x2 - beq _080CDDCC - b _080CDDD0 -_080CDD82: + beq @080CDDCC + b @080CDDD0 +@080CDD82: bl sub_80CDED4 lsls r0, 24 cmp r0, 0 - bne _080CDDD0 + bne @080CDDD0 ldr r0, [r4] ldr r1, =0x00000cb4 adds r0, r1 @@ -389007,42 +389007,42 @@ _080CDD82: movs r1, 0x2 bl obj_anim_image_start bl sub_80CDFAC - b _080CDDBC + b @080CDDBC .align 2, 0 .pool -_080CDDA4: +@080CDDA4: bl sub_80CDF08 lsls r0, 24 cmp r0, 0 - bne _080CDDD0 + bne @080CDDD0 ldr r0, [r4] ldr r1, =0x00000cb4 adds r0, r1 ldr r0, [r0] movs r1, 0 bl obj_anim_image_start -_080CDDBC: +@080CDDBC: ldr r1, [r4] adds r1, r5 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080CDDD0 + b @080CDDD0 .align 2, 0 .pool -_080CDDCC: +@080CDDCC: movs r0, 0 - b _080CDDD2 -_080CDDD0: + b @080CDDD2 +@080CDDD0: movs r0, 0x1 -_080CDDD2: +@080CDDD2: pop {r4,r5} pop {r1} bx r1 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] @@ -389051,39 +389051,39 @@ sub_80CDDD8: @ 80CDDD8 adds r0, r1, r5 ldrb r0, [r0] cmp r0, 0x1 - beq _080CDE68 + beq @080CDE68 cmp r0, 0x1 - bgt _080CDDF8 + bgt @080CDDF8 cmp r0, 0 - beq _080CDDFE - b _080CDEAC + beq @080CDDFE + b @080CDEAC .align 2, 0 .pool -_080CDDF8: +@080CDDF8: cmp r0, 0x2 - beq _080CDEA8 - b _080CDEAC -_080CDDFE: + beq @080CDEA8 + b @080CDEAC +@080CDDFE: ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0 - beq _080CDE20 + beq @080CDE20 cmp r0, 0x1 - bne _080CDEA8 + bne @080CDEA8 ldr r0, =0x00000d91 adds r1, r0 movs r0, 0xE - b _080CDE2A + b @080CDE2A .align 2, 0 .pool -_080CDE20: +@080CDE20: bl get_preferred_box ldr r1, [r4] ldr r2, =0x00000d91 adds r1, r2 -_080CDE2A: +@080CDE2A: strb r0, [r1] ldr r4, =0x02039d08 ldr r0, [r4] @@ -389103,14 +389103,14 @@ _080CDE2A: movs r0, 0xD9 lsls r0, 4 adds r1, r0 - b _080CDE94 + b @080CDE94 .align 2, 0 .pool -_080CDE68: +@080CDE68: bl sub_80CBDC4 lsls r0, 24 cmp r0, 0 - bne _080CDEAC + bne @080CDEAC ldr r0, [r4] ldr r1, =0x00000cb4 adds r0, r1 @@ -389126,26 +389126,26 @@ _080CDE68: bl diegohint1 ldr r1, [r4] adds r1, r5 -_080CDE94: +@080CDE94: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080CDEAC + b @080CDEAC .align 2, 0 .pool -_080CDEA8: +@080CDEA8: movs r0, 0 - b _080CDEAE -_080CDEAC: + b @080CDEAE +@080CDEAC: movs r0, 0x1 -_080CDEAE: +@080CDEAE: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_80CDDD8 thumb_func_start sub_80CDEB4 -sub_80CDEB4: @ 80CDEB4 +sub_80CDEB4: ; 80CDEB4 push {lr} bl sub_80CDED4 lsls r0, 24 @@ -389155,7 +389155,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 @@ -389165,7 +389165,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] @@ -389175,28 +389175,28 @@ sub_80CDED4: @ 80CDED4 movs r2, 0x26 ldrsh r0, [r1, r2] cmp r0, 0 - beq _080CDEEC + beq @080CDEEC cmp r0, 0x8 - beq _080CDEFC -_080CDEEC: + beq @080CDEFC +@080CDEEC: ldrh r0, [r1, 0x26] adds r0, 0x1 strh r0, [r1, 0x26] - b _080CDF00 + b @080CDF00 .align 2, 0 .pool -_080CDEFC: +@080CDEFC: movs r0, 0 - b _080CDF02 -_080CDF00: + b @080CDF02 +@080CDF00: movs r0, 0x1 -_080CDF02: +@080CDF02: pop {r1} bx r1 thumb_func_end sub_80CDED4 thumb_func_start sub_80CDF08 -sub_80CDF08: @ 80CDF08 +sub_80CDF08: ; 80CDF08 push {lr} ldr r0, =0x02039d08 ldr r0, [r0] @@ -389206,32 +389206,32 @@ sub_80CDF08: @ 80CDF08 movs r2, 0x26 ldrsh r0, [r1, r2] cmp r0, 0 - beq _080CDF30 + beq @080CDF30 ldrh r0, [r1, 0x26] subs r0, 0x1 strh r0, [r1, 0x26] movs r0, 0x1 - b _080CDF32 + b @080CDF32 .align 2, 0 .pool -_080CDF30: +@080CDF30: movs r0, 0 -_080CDF32: +@080CDF32: pop {r1} bx r1 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] lsls r0, 24 asrs r0, 24 cmp r0, 0 - beq _080CDF68 + beq @080CDF68 cmp r0, 0x1 - bne _080CDF94 + bne @080CDF94 ldr r4, =0x02039d79 ldrb r1, [r4] movs r0, 0xE @@ -389239,17 +389239,17 @@ sub_80CDF38: @ 80CDF38 ldrb r1, [r4] movs r0, 0 bl sub_80CBC14 - b _080CDF8E + b @080CDF8E .align 2, 0 .pool -_080CDF68: +@080CDF68: ldr r0, =0x02039d08 ldr r0, [r0] ldr r1, =0x000021ff adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _080CDF8E + bne @080CDF8E bl get_preferred_box lsls r0, 24 lsrs r0, 24 @@ -389259,11 +389259,11 @@ _080CDF68: ldrb r1, [r4] movs r0, 0x1 bl sub_80CBC14 -_080CDF8E: +@080CDF8E: ldr r1, =0x02039d7a movs r0, 0x1 strb r0, [r1] -_080CDF94: +@080CDF94: pop {r4} pop {r0} bx r0 @@ -389272,16 +389272,16 @@ _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] lsls r0, 24 asrs r0, 24 cmp r0, 0 - beq _080CDFDC + beq @080CDFDC cmp r0, 0x1 - bne _080CDFFE + bne @080CDFFE ldr r4, =0x02039d79 ldrb r1, [r4] movs r0, 0xE @@ -389289,10 +389289,10 @@ sub_80CDFAC: @ 80CDFAC ldrb r1, [r4] movs r0, 0xE bl sub_80CBCAC - b _080CDFF8 + b @080CDFF8 .align 2, 0 .pool -_080CDFDC: +@080CDFDC: bl get_preferred_box adds r4, r0, 0 lsls r4, 24 @@ -389304,11 +389304,11 @@ _080CDFDC: ldrb r1, [r5] adds r0, r4, 0 bl sub_80CBCAC -_080CDFF8: +@080CDFF8: ldr r1, =0x02039d7a movs r0, 0 strb r0, [r1] -_080CDFFE: +@080CDFFE: pop {r4,r5} pop {r0} bx r0 @@ -389317,7 +389317,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} @@ -389325,14 +389325,14 @@ 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 lsls r1, 24 lsrs r5, r1, 24 cmp r4, 0xE - bne _080CE054 + bne @080CE054 ldr r0, =0x02039d08 ldr r0, [r0] ldr r1, =0x000020a4 @@ -389346,10 +389346,10 @@ sub_80CE018: @ 80CE018 adds r1, r3 movs r2, 0x64 bl memcpy - b _080CE064 + b @080CE064 .align 2, 0 .pool -_080CE054: +@080CE054: ldr r0, =0x02039d08 ldr r2, [r0] ldr r0, =0x000020a4 @@ -389357,7 +389357,7 @@ _080CE054: adds r0, r4, 0 adds r1, r5, 0 bl sub_80D2054 -_080CE064: +@080CE064: adds r0, r4, 0 adds r1, r5, 0 bl sub_80CE0E8 @@ -389373,14 +389373,14 @@ _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 lsls r1, 24 lsrs r7, r1, 24 cmp r6, 0xE - bne _080CE0C0 + bne @080CE0C0 ldr r1, =0x020244ec movs r0, 0x64 muls r0, r7 @@ -389391,10 +389391,10 @@ diegohint2: @ 80CE08C adds r1, r2 movs r2, 0x64 bl memcpy - b _080CE0D8 + b @080CE0D8 .align 2, 0 .pool -_080CE0C0: +@080CE0C0: ldr r5, =0x02039d08 ldr r0, [r5] ldr r4, =0x000020a4 @@ -389405,7 +389405,7 @@ _080CE0C0: adds r0, r6, 0 adds r1, r7, 0 bl sub_80D1F18 -_080CE0D8: +@080CE0D8: pop {r4-r7} pop {r0} bx r0 @@ -389414,38 +389414,38 @@ _080CE0D8: thumb_func_end diegohint2 thumb_func_start sub_80CE0E8 -sub_80CE0E8: @ 80CE0E8 +sub_80CE0E8: ; 80CE0E8 push {lr} lsls r0, 24 lsrs r0, 24 lsls r1, 24 lsrs r1, 24 cmp r0, 0xE - bne _080CE108 + bne @080CE108 movs r0, 0x64 muls r0, r1 ldr r1, =0x020244ec adds r0, r1 bl zero_pokemon_struct - b _080CE10C + b @080CE10C .align 2, 0 .pool -_080CE108: +@080CE108: bl sub_80D2018 -_080CE10C: +@080CE10C: pop {r0} bx r0 thumb_func_end sub_80CE0E8 thumb_func_start diegohint1 -diegohint1: @ 80CE110 +diegohint1: ; 80CE110 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 lsls r1, 24 lsrs r7, r1, 24 cmp r6, 0xE - bne _080CE144 + bne @080CE144 ldr r0, =0x02039d08 ldr r0, [r0] ldr r1, =0x00002108 @@ -389456,10 +389456,10 @@ diegohint1: @ 80CE110 adds r1, r2 movs r2, 0x64 bl memcpy - b _080CE154 + b @080CE154 .align 2, 0 .pool -_080CE144: +@080CE144: ldr r0, =0x02039d08 ldr r2, [r0] ldr r0, =0x00002108 @@ -389467,7 +389467,7 @@ _080CE144: adds r0, r6, 0 adds r1, r7, 0 bl sub_80D2054 -_080CE154: +@080CE154: adds r0, r6, 0 adds r1, r7, 0 bl diegohint2 @@ -389495,7 +389495,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 @@ -389507,14 +389507,14 @@ sub_80CE19C: @ 80CE19C movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _080CE1BA + bne @080CE1BA movs r0, 0 - b _080CE21A -_080CE1BA: + b @080CE21A +@080CE1BA: ldr r5, =0x02039d7a ldrb r0, [r5] cmp r0, 0 - beq _080CE1DC + beq @080CE1DC lsls r4, 24 lsrs r1, r4, 24 adds r0, r6, 0 @@ -389522,10 +389522,10 @@ _080CE1BA: bl sub_80CBAC4 movs r0, 0 strb r0, [r5] - b _080CE1F6 + b @080CE1F6 .align 2, 0 .pool -_080CE1DC: +@080CE1DC: ldr r5, =0x02039d79 ldrb r1, [r5] movs r0, 0xE @@ -389536,15 +389536,15 @@ _080CE1DC: bl diegohint2 ldrb r0, [r5] bl sub_80CBB68 -_080CE1F6: +@080CE1F6: bl get_preferred_box lsls r0, 24 lsrs r0, 24 cmp r6, r0 - bne _080CE208 + bne @080CE208 lsrs r0, r4, 24 bl sub_80CB140 -_080CE208: +@080CE208: ldr r0, =0x02039d08 ldr r0, [r0] ldr r1, =0x00000cb4 @@ -389553,7 +389553,7 @@ _080CE208: movs r1, 0x1 bl obj_anim_image_start movs r0, 0x1 -_080CE21A: +@080CE21A: pop {r4-r6} pop {r1} bx r1 @@ -389562,7 +389562,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] @@ -389579,17 +389579,17 @@ 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] cmp r0, 0 - beq _080CE264 + beq @080CE264 movs r2, 0x2 - b _080CE274 + b @080CE274 .align 2, 0 .pool -_080CE264: +@080CE264: ldr r0, =0x02039d78 movs r1, 0 ldrsb r1, [r0, r1] @@ -389598,7 +389598,7 @@ _080CE264: negs r0, r1 orrs r0, r1 lsrs r2, r0, 31 -_080CE274: +@080CE274: ldr r0, =0x02039d79 ldrb r1, [r0] adds r0, r2, 0 @@ -389617,15 +389617,15 @@ _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 cmp r0, 0 - beq _080CE2B8 + beq @080CE2B8 movs r0, 0x1 - b _080CE2CA -_080CE2B8: + b @080CE2CA +@080CE2B8: ldr r0, =0x02039d08 ldr r0, [r0] ldr r1, =0x00000cb4 @@ -389634,7 +389634,7 @@ _080CE2B8: movs r1, 0 bl obj_anim_image_start movs r0, 0 -_080CE2CA: +@080CE2CA: pop {r1} bx r1 .align 2, 0 @@ -389642,39 +389642,39 @@ _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 ldrb r0, [r1] cmp r0, 0 - beq _080CE2F0 + beq @080CE2F0 movs r0, 0 strb r0, [r1] - b _080CE316 + b @080CE316 .align 2, 0 .pool -_080CE2F0: +@080CE2F0: ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0x1 - bne _080CE304 + bne @080CE304 movs r2, 0xE - b _080CE30C + b @080CE30C .align 2, 0 .pool -_080CE304: +@080CE304: bl get_preferred_box lsls r0, 24 lsrs r2, r0, 24 -_080CE30C: +@080CE30C: ldr r0, =0x02039d79 ldrb r1, [r0] adds r0, r2, 0 bl sub_80CE0E8 -_080CE316: +@080CE316: bl sub_80CEB40 pop {r0} bx r0 @@ -389683,12 +389683,12 @@ _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] cmp r0, 0 - beq _080CE33E + beq @080CE33E ldr r0, =0x02039d08 ldr r0, [r0] ldr r1, =0x00000cb4 @@ -389696,7 +389696,7 @@ sub_80CE324: @ 80CE324 ldr r0, [r0] movs r1, 0x3 bl obj_anim_image_start -_080CE33E: +@080CE33E: pop {r0} bx r0 .align 2, 0 @@ -389704,37 +389704,37 @@ _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 ldr r4, =0x0857b9a4 -_080CE358: +@080CE358: movs r1, 0 ldrsb r1, [r4, r1] cmp r1, 0x22 - beq _080CE378 + beq @080CE378 ldr r0, =0x03005d8c ldr r2, [r0] movs r0, 0x4 ldrsb r0, [r2, r0] cmp r1, r0 - bne _080CE37E + bne @080CE37E movs r1, 0x1 ldrsb r1, [r4, r1] movs r0, 0x5 ldrsb r0, [r2, r0] cmp r1, r0 - bne _080CE37E -_080CE378: + bne @080CE37E +@080CE378: ldrh r0, [r4, 0x2] strh r0, [r3] adds r3, 0x2 -_080CE37E: +@080CE37E: adds r4, 0x4 adds r5, 0x1 cmp r5, 0x5 - bls _080CE358 + bls @080CE358 ldr r1, =0x00000163 adds r0, r1, 0 strh r0, [r3] @@ -389746,12 +389746,12 @@ _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 cmp r3, 0 - bne _080CE3D0 + bne @080CE3D0 ldr r2, =0x02039d08 ldr r0, [r2] ldr r1, =0x0000216d @@ -389762,14 +389762,14 @@ sub_80CE3A0: @ 80CE3A0 ldr r2, =0x0000216c adds r0, r2 strb r3, [r0] - b _080CE504 + b @080CE504 .align 2, 0 .pool -_080CE3D0: +@080CE3D0: ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 - beq _080CE418 + beq @080CE418 ldr r4, =0x02039d08 ldr r1, [r4] ldr r3, =0x00002108 @@ -389788,16 +389788,16 @@ _080CE3D0: adds r0, r1 movs r1, 0x1 negs r1, r1 - b _080CE494 + b @080CE494 .align 2, 0 .pool -_080CE418: +@080CE418: ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0x1 - bne _080CE464 + bne @080CE464 ldr r4, =0x02039d08 ldr r0, [r4] ldr r2, =0x00002108 @@ -389816,10 +389816,10 @@ _080CE418: adds r0, r3 movs r1, 0xE strb r1, [r0] - b _080CE488 + b @080CE488 .align 2, 0 .pool -_080CE464: +@080CE464: bl get_preferred_box lsls r0, 24 lsrs r0, 24 @@ -389835,14 +389835,14 @@ _080CE464: ldr r2, =0x00002170 adds r1, r2 strb r0, [r1] -_080CE488: +@080CE488: ldr r0, =0x02039d08 ldr r0, [r0] ldr r1, =0x02039d79 ldrb r1, [r1] ldr r3, =0x00002171 adds r0, r3 -_080CE494: +@080CE494: strb r1, [r0] ldr r5, =0x02039d08 ldr r0, [r5] @@ -389861,15 +389861,15 @@ _080CE494: strh r0, [r1] lsls r0, 16 cmp r0, 0 - beq _080CE4E8 + beq @080CE4E8 ldr r0, =0x0000216d adds r1, r2, r0 movs r0, 0 strb r0, [r1] - b _080CE4F8 + b @080CE4F8 .align 2, 0 .pool -_080CE4E8: +@080CE4E8: ldr r1, =0x0000216d adds r0, r2, r1 movs r1, 0x1 @@ -389878,14 +389878,14 @@ _080CE4E8: ldr r2, =0x0000216c adds r0, r2 strb r1, [r0] -_080CE4F8: +@080CE4F8: ldr r0, =0x02039d08 ldr r0, [r0] ldr r3, =0x00002172 adds r0, r3 movs r1, 0 strh r1, [r0] -_080CE504: +@080CE504: pop {r4,r5} pop {r0} bx r0 @@ -389894,7 +389894,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] @@ -389902,7 +389902,7 @@ sub_80CE51C: @ 80CE51C orrs r0, r1 lsrs r5, r0, 31 movs r4, 0 -_080CE52A: +@080CE52A: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -389910,48 +389910,48 @@ _080CE52A: movs r1, 0x5 bl pokemon_getattr cmp r0, 0 - beq _080CE53E + beq @080CE53E adds r5, 0x1 -_080CE53E: +@080CE53E: adds r4, 0x1 cmp r4, 0x5 - ble _080CE52A + ble @080CE52A cmp r5, 0x2 - ble _080CE554 -_080CE548: + ble @080CE554 +@080CE548: movs r0, 0x1 - b _080CE578 + b @080CE578 .align 2, 0 .pool -_080CE554: +@080CE554: movs r6, 0 -_080CE556: +@080CE556: movs r4, 0 -_080CE558: +@080CE558: adds r0, r6, 0 adds r1, r4, 0 bl sub_80D2270 cmp r0, 0 - beq _080CE56A + beq @080CE56A adds r5, 0x1 cmp r5, 0x2 - bgt _080CE548 -_080CE56A: + bgt @080CE548 +@080CE56A: adds r4, 0x1 cmp r4, 0x1D - ble _080CE558 + ble @080CE558 adds r6, 0x1 cmp r6, 0xD - ble _080CE556 + ble @080CE556 movs r0, 0 -_080CE578: +@080CE578: pop {r4-r6} pop {r1} bx r1 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} @@ -389962,29 +389962,29 @@ sub_80CE580: @ 80CE580 ldrb r1, [r1] adds r5, r0, 0 cmp r1, 0 - beq _080CE5B0 + beq @080CE5B0 ldr r1, =0x0000216c adds r0, r2, r1 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 - b _080CE736 + b @080CE736 .align 2, 0 .pool -_080CE5B0: +@080CE5B0: ldr r3, =0x00002172 adds r0, r2, r3 ldrh r0, [r0] cmp r0, 0 - beq _080CE5C4 + beq @080CE5C4 cmp r0, 0x1 - beq _080CE690 - b _080CE732 + beq @080CE690 + b @080CE732 .align 2, 0 .pool -_080CE5C4: +@080CE5C4: movs r6, 0 -_080CE5C6: +@080CE5C6: ldr r2, [r5] ldr r1, =0x00002170 adds r0, r2, r1 @@ -389992,15 +389992,15 @@ _080CE5C6: lsls r0, 24 asrs r0, 24 cmp r0, 0xE - bne _080CE5E4 + bne @080CE5E4 ldr r3, =0x00002171 adds r0, r2, r3 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, r6 - beq _080CE606 -_080CE5E4: + beq @080CE606 +@080CE5E4: movs r0, 0x64 muls r0, r6 ldr r1, =0x020244ec @@ -390017,19 +390017,19 @@ _080CE5E4: ldrh r0, [r1] bics r0, r4 strh r0, [r1] -_080CE606: +@080CE606: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x5 - bls _080CE5C6 + bls @080CE5C6 ldr r2, =0x02039d08 ldr r1, [r2] ldr r3, =0x00002174 adds r0, r1, r3 ldrh r0, [r0] cmp r0, 0 - bne _080CE64C + bne @080CE64C subs r3, 0x7 adds r0, r1, r3 movs r1, 0x1 @@ -390038,10 +390038,10 @@ _080CE606: ldr r2, =0x0000216c adds r0, r2 strb r1, [r0] - b _080CE732 + b @080CE732 .align 2, 0 .pool -_080CE64C: +@080CE64C: ldr r3, =0x0000216e adds r0, r1, r3 movs r1, 0 @@ -390056,10 +390056,10 @@ _080CE64C: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _080CE732 + b @080CE732 .align 2, 0 .pool -_080CE674: +@080CE674: ldr r1, =0x0000216d adds r0, r5, r1 movs r1, 0x1 @@ -390069,14 +390069,14 @@ _080CE674: ldr r3, =0x0000216c adds r0, r3 strb r1, [r0] - b _080CE732 + b @080CE732 .align 2, 0 .pool -_080CE690: +@080CE690: movs r6, 0 mov r8, r5 ldr r7, =0x0000ffff -_080CE696: +@080CE696: mov r0, r8 ldr r3, [r0] ldr r1, =0x0000216e @@ -390092,7 +390092,7 @@ _080CE696: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq _080CE6E0 + beq @080CE6E0 ldr r5, [r5] ldr r3, =0x00002170 adds r0, r5, r3 @@ -390105,15 +390105,15 @@ _080CE696: adds r0, r7, 0 ands r0, r3 cmp r1, r0 - beq _080CE6E0 + beq @080CE6E0 ldr r2, =0x00002174 adds r1, r5, r2 ldrh r0, [r1] bics r0, r4 strh r0, [r1] cmp r0, 0 - beq _080CE674 -_080CE6E0: + beq @080CE674 +@080CE6E0: ldr r2, =0x02039d08 ldr r1, [r2] ldr r3, =0x0000216f @@ -390126,7 +390126,7 @@ _080CE6E0: asrs r0, 24 adds r5, r2, 0 cmp r0, 0x1D - ble _080CE728 + ble @080CE728 ldr r0, [r2] ldr r1, =0x0000216f adds r0, r1 @@ -390140,7 +390140,7 @@ _080CE6E0: lsls r0, 24 asrs r0, 24 cmp r0, 0xD - ble _080CE728 + ble @080CE728 ldr r0, [r2] ldr r1, =0x0000216d adds r0, r1 @@ -390150,16 +390150,16 @@ _080CE6E0: ldr r2, =0x0000216c adds r0, r2 strb r3, [r0] -_080CE728: +@080CE728: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x1D - bls _080CE696 -_080CE732: + bls @080CE696 +@080CE732: movs r0, 0x1 negs r0, r0 -_080CE736: +@080CE736: pop {r3} mov r8, r3 pop {r4-r7} @@ -390170,12 +390170,12 @@ _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] cmp r0, 0 - beq _080CE77A + beq @080CE77A ldr r0, =0x02039d14 ldr r1, =0x02039d08 ldr r1, [r1] @@ -390183,7 +390183,7 @@ sub_80CE760: @ 80CE760 adds r1, r2 movs r2, 0x64 bl memcpy -_080CE77A: +@080CE77A: pop {r0} bx r0 .align 2, 0 @@ -390191,16 +390191,16 @@ _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] cmp r0, 0 - beq _080CE7D8 + beq @080CE7D8 ldr r0, =0x02039d7b ldrb r0, [r0] cmp r0, 0xE - bne _080CE7C8 + bne @080CE7C8 ldr r0, =0x02039d08 ldr r0, [r0] ldr r1, =0x000020a4 @@ -390208,10 +390208,10 @@ sub_80CE790: @ 80CE790 ldr r1, =0x02039d14 movs r2, 0x64 bl memcpy - b _080CE7D8 + b @080CE7D8 .align 2, 0 .pool -_080CE7C8: +@080CE7C8: ldr r0, =0x02039d08 ldr r0, [r0] ldr r1, =0x000020a4 @@ -390219,7 +390219,7 @@ _080CE7C8: ldr r1, =0x02039d14 movs r2, 0x50 bl memcpy -_080CE7D8: +@080CE7D8: pop {r0} bx r0 .align 2, 0 @@ -390227,12 +390227,12 @@ _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] cmp r5, 0 - beq _080CE838 + beq @080CE838 bl sub_80CE760 ldr r3, =0x02039d08 ldr r1, [r3] @@ -390252,16 +390252,16 @@ sub_80CE7E8: @ 80CE7E8 ldr r1, =0x00002188 adds r0, r1 strb r2, [r0] - b _080CE8CA + b @080CE8CA .align 2, 0 .pool -_080CE838: +@080CE838: ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0x1 - bne _080CE894 + bne @080CE894 ldr r4, =0x02039d08 ldr r1, [r4] ldr r0, =0x0000218c @@ -390283,10 +390283,10 @@ _080CE838: ldr r4, =0x00002188 adds r0, r4 strb r5, [r0] - b _080CE8CA + b @080CE8CA .align 2, 0 .pool -_080CE894: +@080CE894: bl get_preferred_box lsls r0, 24 lsrs r0, 24 @@ -390312,7 +390312,7 @@ _080CE894: adds r0, r4 movs r1, 0x2 strb r1, [r0] -_080CE8CA: +@080CE8CA: pop {r4,r5} pop {r0} bx r0 @@ -390321,22 +390321,22 @@ _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] cmp r0, 0 - beq _080CE8F8 + beq @080CE8F8 bl sub_80CE790 - b _080CE900 + b @080CE900 .align 2, 0 .pool -_080CE8F8: +@080CE8F8: ldr r0, =0x02039d79 ldr r1, =0x0203cf20 ldrb r1, [r1] strb r1, [r0] -_080CE900: +@080CE900: pop {r0} bx r0 .align 2, 0 @@ -390344,7 +390344,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 @@ -390359,7 +390359,7 @@ party_compaction: @ 80CE90C mov r8, r1 subs r0, 0x65 mov r10, r0 -_080CE928: +@080CE928: mov r0, r9 muls r0, r6 mov r1, r8 @@ -390369,40 +390369,40 @@ _080CE928: bl pokemon_getattr lsls r0, 16 cmp r0, 0 - beq _080CE960 + beq @080CE960 cmp r6, r5 - beq _080CE950 + beq @080CE950 mov r0, r9 muls r0, r5 add r0, r8 adds r1, r4, 0 movs r2, 0x64 bl memcpy -_080CE950: +@080CE950: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 - b _080CE96A + b @080CE96A .align 2, 0 .pool -_080CE960: +@080CE960: lsls r0, r7, 16 asrs r0, 16 cmp r0, r10 - bne _080CE96A + bne @080CE96A adds r7, r6, 0 -_080CE96A: +@080CE96A: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x5 - bls _080CE928 + bls @080CE928 lsls r7, 16 cmp r5, 0x5 - bhi _080CE992 + bhi @080CE992 movs r6, 0x64 ldr r4, =0x020244ec -_080CE97E: +@080CE97E: adds r0, r5, 0 muls r0, r6 adds r0, r4 @@ -390411,8 +390411,8 @@ _080CE97E: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x5 - bls _080CE97E -_080CE992: + bls @080CE97E +@080CE992: asrs r0, r7, 16 pop {r3-r5} mov r8, r3 @@ -390426,7 +390426,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 @@ -390441,22 +390441,22 @@ sub_80CE9A8: @ 80CE9A8 ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 - beq _080CE9E8 + beq @080CE9E8 ldr r0, [r2] ldr r1, =0x000020a4 adds r0, r1 movs r1, 0x8 mov r2, sp bl pokemon_setattr - b _080CEA1C + b @080CEA1C .align 2, 0 .pool -_080CE9E8: +@080CE9E8: ldr r4, =0x02039d78 movs r0, 0 ldrsb r0, [r4, r0] cmp r0, 0x1 - bne _080CEA08 + bne @080CEA08 ldr r0, =0x02039d79 movs r1, 0 ldrsb r1, [r0, r1] @@ -390467,17 +390467,17 @@ _080CE9E8: movs r1, 0x8 mov r2, sp bl pokemon_setattr -_080CEA08: +@080CEA08: movs r0, 0 ldrsb r0, [r4, r0] cmp r0, 0 - bne _080CEA1C + bne @080CEA1C ldr r0, =0x02039d79 ldrb r0, [r0] movs r1, 0x8 mov r2, sp bl set_pokemon_data_from_selected_box -_080CEA1C: +@080CEA1C: add sp, 0x4 pop {r4} pop {r0} @@ -390487,81 +390487,81 @@ _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] lsls r0, 24 asrs r0, 24 cmp r0, 0x1 - bne _080CEA64 + bne @080CEA64 ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 - bne _080CEA64 + bne @080CEA64 ldr r0, =0x02039d79 ldrb r0, [r0] bl sub_80C7050 lsls r0, 24 cmp r0, 0 - bne _080CEA64 + bne @080CEA64 movs r0, 0x1 - b _080CEA66 + b @080CEA66 .align 2, 0 .pool -_080CEA64: +@080CEA64: movs r0, 0 -_080CEA66: +@080CEA66: pop {r1} bx r1 thumb_func_end sub_80CEA30 thumb_func_start sub_80CEA6C -sub_80CEA6C: @ 80CEA6C +sub_80CEA6C: ; 80CEA6C push {lr} ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 - beq _080CEAC8 + beq @080CEAC8 ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0x1 - bne _080CEAAC + bne @080CEAAC ldr r0, =0x02039d79 ldrb r0, [r0] bl sub_80C7050 lsls r0, 24 cmp r0, 0 - bne _080CEAAC + bne @080CEAAC ldr r0, =0x02039d08 ldr r1, [r0] ldr r2, =0x00000ced adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - bne _080CEAC8 + bne @080CEAC8 ldr r2, =0x000020a4 adds r0, r1, r2 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _080CEAC8 -_080CEAAC: + beq @080CEAC8 +@080CEAAC: movs r0, 0x1 - b _080CEACA + b @080CEACA .align 2, 0 .pool -_080CEAC8: +@080CEAC8: movs r0, 0 -_080CEACA: +@080CEACA: pop {r1} bx r1 thumb_func_end sub_80CEA6C thumb_func_start sub_80CEAD0 -sub_80CEAD0: @ 80CEAD0 +sub_80CEAD0: ; 80CEAD0 ldr r0, =0x02039d7a ldrb r0, [r0] bx lr @@ -390570,7 +390570,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 @@ -390578,9 +390578,9 @@ sub_80CEADC: @ 80CEADC lsls r0, 24 asrs r0, 24 cmp r0, 0x2 - bne _080CEAEE + bne @080CEAEE movs r1, 0x1 -_080CEAEE: +@080CEAEE: adds r0, r1, 0 pop {r1} bx r1 @@ -390589,7 +390589,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 @@ -390597,15 +390597,15 @@ sub_80CEAF8: @ 80CEAF8 lsls r0, 24 asrs r0, 24 cmp r0, 0x3 - bne _080CEB16 + bne @080CEB16 ldr r0, =0x02039d79 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0x1 - bne _080CEB16 + bne @080CEB16 movs r1, 0x1 -_080CEB16: +@080CEB16: adds r0, r1, 0 pop {r1} bx r1 @@ -390614,7 +390614,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 @@ -390622,9 +390622,9 @@ sub_80CEB24: @ 80CEB24 lsls r0, 24 asrs r0, 24 cmp r0, 0 - bne _080CEB36 + bne @080CEB36 movs r1, 0x1 -_080CEB36: +@080CEB36: adds r0, r1, 0 pop {r1} bx r1 @@ -390633,7 +390633,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] @@ -390641,38 +390641,38 @@ sub_80CEB40: @ 80CEB40 ldr r3, =0x02039d7a ldrb r0, [r3] cmp r0, 0 - bne _080CEB52 + bne @080CEB52 movs r2, 0x1 -_080CEB52: +@080CEB52: ldr r4, =0x00000cea adds r0, r1, r4 strb r2, [r0] ldrb r0, [r3] cmp r0, 0 - bne _080CEBD0 + bne @080CEBD0 ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0x1 - beq _080CEB8A + beq @080CEB8A cmp r0, 0x1 - bgt _080CEB84 + bgt @080CEB84 cmp r0, 0 - beq _080CEBBA - b _080CEBD0 + beq @080CEBBA + b @080CEBD0 .align 2, 0 .pool -_080CEB84: +@080CEB84: cmp r0, 0x3 - bgt _080CEBD0 - b _080CEBB0 -_080CEB8A: + bgt @080CEBD0 + b @080CEBB0 +@080CEB8A: ldr r1, =0x02039d79 movs r0, 0 ldrsb r0, [r1, r0] cmp r0, 0x5 - bgt _080CEBB0 + bgt @080CEBB0 adds r1, r0, 0 movs r0, 0x64 muls r0, r1 @@ -390680,15 +390680,15 @@ _080CEB8A: adds r0, r1 movs r1, 0 bl sub_80CEC00 - b _080CEBD0 + b @080CEBD0 .align 2, 0 .pool -_080CEBB0: +@080CEBB0: movs r0, 0 movs r1, 0x2 bl sub_80CEC00 - b _080CEBD0 -_080CEBBA: + b @080CEBD0 +@080CEBBA: bl get_preferred_box lsls r0, 24 lsrs r0, 24 @@ -390697,7 +390697,7 @@ _080CEBBA: bl get_pokemon_by_box_and_pos movs r1, 0x1 bl sub_80CEC00 -_080CEBD0: +@080CEBD0: pop {r4} pop {r0} bx r0 @@ -390706,27 +390706,27 @@ _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] cmp r0, 0 - beq _080CEBF8 + beq @080CEBF8 ldr r0, =0x02039d14 movs r1, 0 bl sub_80CEC00 - b _080CEBFC + b @080CEBFC .align 2, 0 .pool -_080CEBF8: +@080CEBF8: bl sub_80CEB40 -_080CEBFC: +@080CEBFC: pop {r0} bx r0 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 @@ -390746,7 +390746,7 @@ sub_80CEC00: @ 80CEC00 mov r9, r0 mov r10, r0 cmp r5, 0 - bne _080CED18 + bne @080CED18 adds r6, r4, 0 adds r0, r4, 0 movs r1, 0x41 @@ -390758,9 +390758,9 @@ sub_80CEC00: @ 80CEC00 strh r0, [r1] lsls r0, 16 cmp r0, 0 - bne _080CEC44 - b _080CEE34 -_080CEC44: + bne @080CEC44 + b @080CEE34 +@080CEC44: adds r0, r4, 0 movs r1, 0x4 bl pokemon_getattr @@ -390768,17 +390768,17 @@ _080CEC44: lsrs r0, 24 mov r10, r0 cmp r0, 0 - beq _080CEC74 + beq @080CEC74 mov r1, r8 ldr r0, [r1] ldr r2, =0x00000ced adds r0, r2 movs r1, 0x1 strb r1, [r0] - b _080CEC86 + b @080CEC86 .align 2, 0 .pool -_080CEC74: +@080CEC74: adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr @@ -390787,7 +390787,7 @@ _080CEC74: ldr r2, =0x00000ced adds r1, r2 strb r0, [r1] -_080CEC86: +@080CEC86: ldr r4, =0x02039d08 ldr r2, [r4] ldr r5, =0x00000cee @@ -390838,14 +390838,14 @@ _080CEC86: ldr r3, =0x00000ce6 adds r1, r3 strh r0, [r1] - b _080CEE26 + b @080CEE26 .align 2, 0 .pool -_080CED18: +@080CED18: cmp r5, 0x1 - beq _080CED1E - b _080CEE1C -_080CED1E: + beq @080CED1E + b @080CEE1C +@080CED1E: adds r7, r4, 0 adds r0, r7, 0 movs r1, 0x41 @@ -390857,9 +390857,9 @@ _080CED1E: strh r0, [r1] lsls r0, 16 cmp r0, 0 - bne _080CED3A - b _080CEE34 -_080CED3A: + bne @080CED3A + b @080CEE34 +@080CED3A: adds r0, r7, 0 movs r1, 0x1 bl pokemon_getattr_encrypted @@ -390871,16 +390871,16 @@ _080CED3A: lsrs r0, 24 mov r10, r0 cmp r0, 0 - beq _080CED6C + beq @080CED6C mov r1, r8 ldr r0, [r1] ldr r2, =0x00000ced adds r0, r2 strb r5, [r0] - b _080CED7E + b @080CED7E .align 2, 0 .pool -_080CED6C: +@080CED6C: adds r0, r7, 0 movs r1, 0x2D bl pokemon_getattr_encrypted @@ -390889,7 +390889,7 @@ _080CED6C: ldr r2, =0x00000ced adds r1, r2 strb r0, [r1] -_080CED7E: +@080CED7E: ldr r5, =0x02039d08 ldr r2, [r5] ldr r4, =0x00000cee @@ -390946,24 +390946,24 @@ _080CED7E: ldr r2, =0x00000ce6 adds r1, r2 strh r0, [r1] - b _080CEE26 + b @080CEE26 .align 2, 0 .pool -_080CEE1C: +@080CEE1C: ldr r3, =0x00000ce4 adds r0, r1, r3 mov r1, r9 strh r1, [r0] strh r1, [r2] -_080CEE26: +@080CEE26: ldr r0, =0x02039d08 ldr r1, [r0] ldr r2, =0x00000ce4 adds r0, r1, r2 ldrh r2, [r0] cmp r2, 0 - bne _080CEE94 -_080CEE34: + bne @080CEE94 +@080CEE34: ldr r4, =0x02039d08 ldr r0, [r4] ldr r3, =0x00000cee @@ -390992,18 +390992,18 @@ _080CEE34: ldr r0, [r4] ldr r1, =0x00000d65 adds r0, r1 - b _080CEEF2 + b @080CEEF2 .align 2, 0 .pool -_080CEE94: +@080CEE94: ldr r3, =0x00000ced adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 - beq _080CEF14 + beq @080CEF14 mov r0, r10 cmp r0, 0 - beq _080CEEC0 + beq @080CEEC0 ldr r2, =0x00000cf9 adds r0, r1, r2 adds r3, 0x1 @@ -391011,17 +391011,17 @@ _080CEE94: movs r2, 0 movs r3, 0x5 bl sub_8009128 - b _080CEECE + b @080CEECE .align 2, 0 .pool -_080CEEC0: +@080CEEC0: ldr r2, =0x00000cf9 adds r0, r1, r2 ldr r1, =0x085e8264 movs r2, 0 movs r3, 0x8 bl sub_8009128 -_080CEECE: +@080CEECE: ldr r4, =0x02039d08 ldr r0, [r4] ldr r3, =0x00000d1d @@ -391038,22 +391038,22 @@ _080CEECE: ldr r0, [r4] ldr r2, =0x00000d65 adds r0, r2 -_080CEEF2: +@080CEEF2: movs r1, 0 movs r2, 0x8 bl RepeatChar - b _080CF0B8 + b @080CF0B8 .align 2, 0 .pool -_080CEF14: +@080CEF14: cmp r2, 0x1D - beq _080CEF1C + beq @080CEF1C cmp r2, 0x20 - bne _080CEF20 -_080CEF1C: + bne @080CEF20 +@080CEF1C: movs r3, 0xFF mov r9, r3 -_080CEF20: +@080CEF20: ldr r4, =0x02039d08 ldr r1, [r4] ldr r2, =0x00000cf9 @@ -391095,9 +391095,9 @@ _080CEF20: adds r2, r4, r1 mov r3, r9 cmp r3, 0 - beq _080CEFD4 + beq @080CEFD4 cmp r3, 0xFE - beq _080CF000 + beq @080CF000 movs r0, 0x2 strb r0, [r2] ldr r0, =0x00000d44 @@ -391114,10 +391114,10 @@ _080CEF20: strb r0, [r2] ldr r0, =0x00000d47 adds r2, r4, r0 - b _080CF020 + b @080CF020 .align 2, 0 .pool -_080CEFD4: +@080CEFD4: strb r0, [r2] ldr r1, =0x00000d44 adds r2, r4, r1 @@ -391133,10 +391133,10 @@ _080CEFD4: strb r0, [r2] adds r1, 0x3 adds r2, r4, r1 - b _080CF020 + b @080CF020 .align 2, 0 .pool -_080CF000: +@080CF000: movs r0, 0x6 strb r0, [r2] ldr r3, =0x00000d44 @@ -391153,7 +391153,7 @@ _080CF000: strb r0, [r2] adds r3, 0x3 adds r2, r4, r3 -_080CF020: +@080CF020: movs r0, 0xFC strb r0, [r2] adds r2, 0x1 @@ -391196,7 +391196,7 @@ _080CF020: adds r1, r4, r2 ldrh r0, [r1] cmp r0, 0 - beq _080CF0AC + beq @080CF0AC ldr r3, =0x00000d65 adds r4, r3 bl itemid_get_item @@ -391205,16 +391205,16 @@ _080CF020: movs r2, 0 movs r3, 0x8 bl sub_8009128 - b _080CF0B8 + b @080CF0B8 .align 2, 0 .pool -_080CF0AC: +@080CF0AC: ldr r1, =0x00000d65 adds r0, r4, r1 movs r1, 0 movs r2, 0x8 bl RepeatChar -_080CF0B8: +@080CF0B8: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -391227,7 +391227,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] @@ -391235,22 +391235,22 @@ sub_80CF0CC: @ 80CF0CC adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - beq _080CF0F4 + beq @080CF0F4 cmp r0, 0x1 - ble _080CF0E4 + ble @080CF0E4 cmp r0, 0x2 - beq _080CF0FA -_080CF0E4: + beq @080CF0FA +@080CF0E4: bl sub_80CF108 - b _080CF0FE + b @080CF0FE .align 2, 0 .pool -_080CF0F4: +@080CF0F4: bl sub_80CF374 - b _080CF0FE -_080CF0FA: + b @080CF0FE +@080CF0FA: bl sub_80CF4B0 -_080CF0FE: +@080CF0FE: lsls r0, 24 lsrs r0, 24 pop {r1} @@ -391258,7 +391258,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 @@ -391291,13 +391291,13 @@ sub_80CF108: @ 80CF108 ands r0, r1 adds r3, r2, 0 cmp r0, 0 - beq _080CF14C - b _080CF33C -_080CF14C: + beq @080CF14C + b @080CF33C +@080CF14C: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080CF1A8 + beq @080CF1A8 movs r6, 0x1 lsls r0, r4, 24 movs r1, 0xC0 @@ -391306,9 +391306,9 @@ _080CF14C: lsrs r4, r0, 24 asrs r0, 24 cmp r0, 0x1D - bgt _080CF168 - b _080CF358 -_080CF168: + bgt @080CF168 + b @080CF358 +@080CF168: movs r2, 0x3 mov r8, r2 subs r0, 0x1E @@ -391324,14 +391324,14 @@ _080CF168: ldr r0, [r5] add r0, r9 strb r6, [r0] - b _080CF358 + b @080CF358 .align 2, 0 .pool -_080CF1A8: +@080CF1A8: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080CF1DE + beq @080CF1DE movs r6, 0x1 movs r0, 0 ldrsb r0, [r3, r0] @@ -391339,12 +391339,12 @@ _080CF1A8: bl __modsi3 lsls r0, 24 cmp r0, 0 - beq _080CF1CA + beq @080CF1CA lsls r0, r4, 24 movs r3, 0xFF lsls r3, 24 - b _080CF34C -_080CF1CA: + b @080CF34C +@080CF1CA: ldr r0, [r5] adds r0, r7 movs r1, 0xFF @@ -391354,12 +391354,12 @@ _080CF1CA: lsls r1, 19 adds r0, r1 lsrs r4, r0, 24 - b _080CF358 -_080CF1DE: + b @080CF358 +@080CF1DE: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080CF212 + beq @080CF212 movs r6, 0x1 movs r0, 0 ldrsb r0, [r3, r0] @@ -391367,193 +391367,193 @@ _080CF1DE: movs r1, 0x6 bl __modsi3 cmp r0, 0 - beq _080CF204 + beq @080CF204 lsls r0, r4, 24 movs r2, 0x80 lsls r2, 17 adds r0, r2 lsrs r4, r0, 24 - b _080CF358 -_080CF204: + b @080CF358 +@080CF204: ldr r0, [r5] adds r0, r7 strb r6, [r0] lsls r0, r4, 24 movs r3, 0xFB lsls r3, 24 - b _080CF34C -_080CF212: + b @080CF34C +@080CF212: ldrh r1, [r6, 0x2E] movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _080CF220 + beq @080CF220 movs r6, 0x1 - b _080CF352 -_080CF220: + b @080CF352 +@080CF220: movs r4, 0x1 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080CF2E4 + beq @080CF2E4 bl sub_80CFA5C lsls r0, 24 cmp r0, 0 - beq _080CF2E4 + beq @080CF2E4 ldr r0, =0x02039d7d ldrb r0, [r0] cmp r0, 0 - bne _080CF244 + bne @080CF244 movs r0, 0x8 - b _080CF366 + b @080CF366 .align 2, 0 .pool -_080CF244: +@080CF244: ldr r1, [r5] ldrb r0, [r1, 0x1] cmp r0, 0x2 - bne _080CF254 + bne @080CF254 ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0x1 - bne _080CF2D4 -_080CF254: + bne @080CF2D4 +@080CF254: movs r0, 0 bl sub_80CFF98 subs r0, 0x1 lsls r0, 24 asrs r0, 24 cmp r0, 0xE - bhi _080CF2E4 + bhi @080CF2E4 lsls r0, 2 - ldr r1, =_080CF278 + ldr r1, =@080CF278 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080CF278: - .4byte _080CF2B4 - .4byte _080CF2B8 - .4byte _080CF2BC - .4byte _080CF2C0 - .4byte _080CF2C4 - .4byte _080CF2E4 - .4byte _080CF2E4 - .4byte _080CF2E4 - .4byte _080CF2E4 - .4byte _080CF2E4 - .4byte _080CF2E4 - .4byte _080CF2C8 - .4byte _080CF2CC - .4byte _080CF2E4 - .4byte _080CF2D0 -_080CF2B4: +@080CF278: + .4byte @080CF2B4 + .4byte @080CF2B8 + .4byte @080CF2BC + .4byte @080CF2C0 + .4byte @080CF2C4 + .4byte @080CF2E4 + .4byte @080CF2E4 + .4byte @080CF2E4 + .4byte @080CF2E4 + .4byte @080CF2E4 + .4byte @080CF2E4 + .4byte @080CF2C8 + .4byte @080CF2CC + .4byte @080CF2E4 + .4byte @080CF2D0 +@080CF2B4: movs r0, 0xB - b _080CF366 -_080CF2B8: + b @080CF366 +@080CF2B8: movs r0, 0xC - b _080CF366 -_080CF2BC: + b @080CF366 +@080CF2BC: movs r0, 0xD - b _080CF366 -_080CF2C0: + b @080CF366 +@080CF2C0: movs r0, 0xE - b _080CF366 -_080CF2C4: + b @080CF366 +@080CF2C4: movs r0, 0xF - b _080CF366 -_080CF2C8: + b @080CF366 +@080CF2C8: movs r0, 0x10 - b _080CF366 -_080CF2CC: + b @080CF366 +@080CF2CC: movs r0, 0x11 - b _080CF366 -_080CF2D0: + b @080CF366 +@080CF2D0: movs r0, 0x12 - b _080CF366 -_080CF2D4: + b @080CF366 +@080CF2D4: ldr r2, =0x000021ff adds r0, r1, r2 strb r4, [r0] movs r0, 0x14 - b _080CF366 + b @080CF366 .align 2, 0 .pool -_080CF2E4: +@080CF2E4: ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080CF2F8 + beq @080CF2F8 movs r0, 0x13 - b _080CF366 + b @080CF366 .align 2, 0 .pool -_080CF2F8: +@080CF2F8: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x1 - bne _080CF326 + bne @080CF326 ldrh r1, [r2, 0x2C] movs r0, 0x80 lsls r0, 2 ands r0, r1 cmp r0, 0 - beq _080CF318 + beq @080CF318 movs r0, 0xA - b _080CF366 + b @080CF366 .align 2, 0 .pool -_080CF318: +@080CF318: movs r0, 0x80 lsls r0, 1 ands r0, r1 cmp r0, 0 - beq _080CF326 + beq @080CF326 movs r0, 0x9 - b _080CF366 -_080CF326: + b @080CF366 +@080CF326: ldrh r1, [r2, 0x2E] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080CF338 + beq @080CF338 bl sub_80CFDC4 movs r0, 0 - b _080CF366 -_080CF338: + b @080CF366 +@080CF338: movs r6, 0 - b _080CF364 -_080CF33C: + b @080CF364 +@080CF33C: movs r6, 0x1 movs r0, 0 ldrsb r0, [r2, r0] cmp r0, 0x5 - ble _080CF352 + ble @080CF352 lsls r0, r4, 24 movs r3, 0xFA lsls r3, 24 -_080CF34C: +@080CF34C: adds r0, r3 lsrs r4, r0, 24 - b _080CF358 -_080CF352: + b @080CF358 +@080CF352: movs r0, 0x2 mov r8, r0 movs r4, 0 -_080CF358: +@080CF358: cmp r6, 0 - beq _080CF364 + beq @080CF364 mov r0, r8 adds r1, r4, 0 bl sub_80CD894 -_080CF364: +@080CF364: adds r0, r6, 0 -_080CF366: +@080CF366: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -391564,19 +391564,19 @@ _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] movs r4, 0x1 ands r4, r0 cmp r4, 0 - beq _080CF428 + beq @080CF428 ldrh r1, [r1, 0x30] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _080CF3AC + beq @080CF3AC ldr r4, =0x02039d79 movs r0, 0 ldrsb r0, [r4, r0] @@ -391584,33 +391584,33 @@ sub_80CF374: @ 80CF374 bl __divsi3 lsls r0, 24 cmp r0, 0 - beq _080CF420 + beq @080CF420 ldrb r1, [r4] subs r1, 0x6 - b _080CF40E + b @080CF40E .align 2, 0 .pool -_080CF3AC: +@080CF3AC: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080CF3CC + beq @080CF3CC ldr r1, =0x02039d79 movs r0, 0 ldrsb r0, [r1, r0] adds r0, 0x6 cmp r0, 0x1D - bgt _080CF420 + bgt @080CF420 ldrb r1, [r1] adds r1, 0x6 - b _080CF40E + b @080CF40E .align 2, 0 .pool -_080CF3CC: +@080CF3CC: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080CF3F0 + beq @080CF3F0 ldr r4, =0x02039d79 movs r0, 0 ldrsb r0, [r4, r0] @@ -391618,17 +391618,17 @@ _080CF3CC: bl __modsi3 lsls r0, 24 cmp r0, 0 - beq _080CF420 + beq @080CF420 ldrb r1, [r4] subs r1, 0x1 - b _080CF40E + b @080CF40E .align 2, 0 .pool -_080CF3F0: +@080CF3F0: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080CF424 + beq @080CF424 ldr r4, =0x02039d79 movs r0, 0 ldrsb r0, [r4, r0] @@ -391636,25 +391636,25 @@ _080CF3F0: movs r1, 0x6 bl __modsi3 cmp r0, 0 - beq _080CF420 + beq @080CF420 ldrb r1, [r4] adds r1, 0x1 -_080CF40E: +@080CF40E: lsls r1, 24 lsrs r1, 24 movs r0, 0 bl sub_80CD894 movs r0, 0x15 - b _080CF49C + b @080CF49C .align 2, 0 .pool -_080CF420: +@080CF420: movs r0, 0x18 - b _080CF49C -_080CF424: + b @080CF49C +@080CF424: movs r0, 0 - b _080CF49C -_080CF428: + b @080CF49C +@080CF428: bl sub_80D0BA4 lsls r0, 24 lsrs r0, 24 @@ -391663,7 +391663,7 @@ _080CF428: lsls r1, 24 asrs r1, 24 cmp r0, r1 - beq _080CF47C + beq @080CF47C ldr r2, =0x02039d7a ldr r0, =0x02039d08 ldr r1, [r0] @@ -391681,10 +391681,10 @@ _080CF428: ldr r1, =0x02039d7b strb r0, [r1] movs r0, 0x17 - b _080CF49C + b @080CF49C .align 2, 0 .pool -_080CF47C: +@080CF47C: ldr r1, =0x02039d08 ldr r0, [r1] ldr r2, =0x000021ff @@ -391701,7 +391701,7 @@ _080CF47C: ands r0, r2 strb r0, [r1] movs r0, 0x16 -_080CF49C: +@080CF49C: pop {r4} pop {r1} bx r1 @@ -391710,91 +391710,91 @@ _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] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _080CF4DC + beq @080CF4DC movs r0, 0 bl sub_80D0580 lsls r0, 24 cmp r0, 0 - beq _080CF588 + beq @080CF588 ldr r0, =0x02039d79 ldrb r1, [r0] subs r1, 0x6 - b _080CF53A + b @080CF53A .align 2, 0 .pool -_080CF4DC: +@080CF4DC: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080CF4FC + beq @080CF4FC movs r0, 0x1 bl sub_80D0580 lsls r0, 24 cmp r0, 0 - beq _080CF588 + beq @080CF588 ldr r0, =0x02039d79 ldrb r1, [r0] adds r1, 0x6 - b _080CF53A + b @080CF53A .align 2, 0 .pool -_080CF4FC: +@080CF4FC: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080CF51C + beq @080CF51C movs r0, 0x2 bl sub_80D0580 lsls r0, 24 cmp r0, 0 - beq _080CF5A2 + beq @080CF5A2 ldr r0, =0x02039d79 ldrb r1, [r0] subs r1, 0x1 - b _080CF53A + b @080CF53A .align 2, 0 .pool -_080CF51C: +@080CF51C: movs r0, 0x10 ands r0, r1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq _080CF54C + beq @080CF54C movs r0, 0x3 bl sub_80D0580 lsls r0, 24 cmp r0, 0 - beq _080CF5B6 + beq @080CF5B6 ldr r0, =0x02039d79 ldrb r1, [r0] adds r1, 0x1 -_080CF53A: +@080CF53A: lsls r1, 24 lsrs r1, 24 movs r0, 0 bl sub_80CD894 movs r0, 0x19 - b _080CF5BC + b @080CF5BC .align 2, 0 .pool -_080CF54C: +@080CF54C: ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080CF580 + beq @080CF580 bl sub_80D0BC0 lsls r0, 24 cmp r0, 0 - beq _080CF588 + beq @080CF588 ldr r0, =0x02039d7a strb r4, [r0] ldr r0, =0x02039d08 @@ -391803,53 +391803,53 @@ _080CF54C: adds r0, r1 strb r4, [r0] movs r0, 0x1A - b _080CF5BC + b @080CF5BC .align 2, 0 .pool -_080CF580: +@080CF580: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080CF58C -_080CF588: + beq @080CF58C +@080CF588: movs r0, 0x18 - b _080CF5BC -_080CF58C: + b @080CF5BC +@080CF58C: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x1 - bne _080CF5BA + bne @080CF5BA ldrh r1, [r2, 0x2C] movs r0, 0x80 lsls r0, 2 ands r0, r1 cmp r0, 0 - beq _080CF5AC -_080CF5A2: + beq @080CF5AC +@080CF5A2: movs r0, 0xA - b _080CF5BC + b @080CF5BC .align 2, 0 .pool -_080CF5AC: +@080CF5AC: movs r0, 0x80 lsls r0, 1 ands r0, r1 cmp r0, 0 - beq _080CF5BA -_080CF5B6: + beq @080CF5BA +@080CF5B6: movs r0, 0x9 - b _080CF5BC -_080CF5BA: + b @080CF5BC +@080CF5BA: movs r0, 0 -_080CF5BC: +@080CF5BC: pop {r4} pop {r1} bx r1 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 @@ -391882,13 +391882,13 @@ sub_80CF5C4: @ 80CF5C4 adds r5, r6, 0 mov r12, r1 cmp r0, 0 - beq _080CF608 - b _080CF7A8 -_080CF608: + beq @080CF608 + b @080CF7A8 +@080CF608: movs r0, 0x80 ands r0, r3 cmp r0, 0 - beq _080CF64C + beq @080CF64C lsls r0, r4, 24 movs r1, 0x80 lsls r1, 17 @@ -391896,223 +391896,223 @@ _080CF608: lsrs r4, r0, 24 asrs r0, 24 cmp r0, 0x6 - ble _080CF622 + ble @080CF622 movs r4, 0 -_080CF622: +@080CF622: lsls r0, r4, 24 asrs r0, 24 movs r1, 0 ldrsb r1, [r5, r1] cmp r0, r1 - bne _080CF630 - b _080CF7C6 -_080CF630: + bne @080CF630 + b @080CF7C6 +@080CF630: movs r7, 0x1 - b _080CF7CA + b @080CF7CA .align 2, 0 .pool -_080CF64C: +@080CF64C: movs r0, 0x20 ands r0, r3 cmp r0, 0 - beq _080CF670 + beq @080CF670 ldrb r1, [r5] movs r0, 0 ldrsb r0, [r5, r0] cmp r0, 0 - beq _080CF670 + beq @080CF670 movs r7, 0x1 ldr r0, [r2] ldr r2, =0x00000cd6 adds r0, r2 strb r1, [r0] movs r4, 0 - b _080CF7C6 + b @080CF7C6 .align 2, 0 .pool -_080CF670: +@080CF670: mov r3, r12 ldrh r1, [r3, 0x30] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080CF69E + beq @080CF69E movs r0, 0 ldrsb r0, [r5, r0] cmp r0, 0 - bne _080CF694 + bne @080CF694 movs r7, 0x1 ldr r0, [r2] ldr r1, =0x00000cd6 adds r0, r1 ldrb r4, [r0] - b _080CF7C6 + b @080CF7C6 .align 2, 0 .pool -_080CF694: +@080CF694: movs r7, 0x6 movs r2, 0 mov r9, r2 movs r4, 0 - b _080CF7C6 -_080CF69E: + b @080CF7C6 +@080CF69E: mov r3, r12 ldrh r1, [r3, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080CF75C + beq @080CF75C movs r0, 0 ldrsb r0, [r5, r0] cmp r0, 0x6 - bne _080CF6C4 + bne @080CF6C4 ldr r0, [r2] ldrb r0, [r0, 0x1] cmp r0, 0x1 - bne _080CF6BE + bne @080CF6BE movs r0, 0x4 - b _080CF7D8 -_080CF6BE: + b @080CF7D8 +@080CF6BE: movs r0, 0x1 mov r8, r0 - b _080CF75C -_080CF6C4: + b @080CF75C +@080CF6C4: bl sub_80CFA5C lsls r0, 24 cmp r0, 0 - beq _080CF75C + beq @080CF75C ldr r0, =0x02039d7d ldrb r0, [r0] cmp r0, 0 - bne _080CF6E0 + bne @080CF6E0 movs r0, 0x8 - b _080CF7D8 + b @080CF7D8 .align 2, 0 .pool -_080CF6E0: +@080CF6E0: movs r0, 0 bl sub_80CFF98 subs r0, 0x1 lsls r0, 24 asrs r0, 24 cmp r0, 0xE - bhi _080CF75C + bhi @080CF75C lsls r0, 2 - ldr r1, =_080CF700 + ldr r1, =@080CF700 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080CF700: - .4byte _080CF73C - .4byte _080CF740 - .4byte _080CF744 - .4byte _080CF748 - .4byte _080CF74C - .4byte _080CF75C - .4byte _080CF75C - .4byte _080CF75C - .4byte _080CF75C - .4byte _080CF75C - .4byte _080CF75C - .4byte _080CF750 - .4byte _080CF754 - .4byte _080CF75C - .4byte _080CF758 -_080CF73C: +@080CF700: + .4byte @080CF73C + .4byte @080CF740 + .4byte @080CF744 + .4byte @080CF748 + .4byte @080CF74C + .4byte @080CF75C + .4byte @080CF75C + .4byte @080CF75C + .4byte @080CF75C + .4byte @080CF75C + .4byte @080CF75C + .4byte @080CF750 + .4byte @080CF754 + .4byte @080CF75C + .4byte @080CF758 +@080CF73C: movs r0, 0xB - b _080CF7D8 -_080CF740: + b @080CF7D8 +@080CF740: movs r0, 0xC - b _080CF7D8 -_080CF744: + b @080CF7D8 +@080CF744: movs r0, 0xD - b _080CF7D8 -_080CF748: + b @080CF7D8 +@080CF748: movs r0, 0xE - b _080CF7D8 -_080CF74C: + b @080CF7D8 +@080CF74C: movs r0, 0xF - b _080CF7D8 -_080CF750: + b @080CF7D8 +@080CF750: movs r0, 0x10 - b _080CF7D8 -_080CF754: + b @080CF7D8 +@080CF754: movs r0, 0x11 - b _080CF7D8 -_080CF758: + b @080CF7D8 +@080CF758: movs r0, 0x12 - b _080CF7D8 -_080CF75C: + b @080CF7D8 +@080CF75C: ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x2 ands r0, r1 mov r12, r2 cmp r0, 0 - beq _080CF784 + beq @080CF784 ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x1 - bne _080CF780 + bne @080CF780 movs r0, 0x13 - b _080CF7D8 + b @080CF7D8 .align 2, 0 .pool -_080CF780: +@080CF780: movs r1, 0x1 mov r8, r1 -_080CF784: +@080CF784: mov r2, r8 cmp r2, 0 - beq _080CF794 + beq @080CF794 movs r7, 0x6 movs r3, 0 mov r9, r3 movs r4, 0 - b _080CF7C6 -_080CF794: + b @080CF7C6 +@080CF794: mov r0, r12 ldrh r1, [r0, 0x2E] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080CF7C6 + beq @080CF7C6 bl sub_80CFDC4 movs r0, 0 - b _080CF7D8 -_080CF7A8: + b @080CF7D8 +@080CF7A8: lsls r0, r4, 24 movs r1, 0xFF lsls r1, 24 adds r0, r1 lsrs r4, r0, 24 cmp r0, 0 - bge _080CF7B8 + bge @080CF7B8 movs r4, 0x6 -_080CF7B8: +@080CF7B8: lsls r0, r4, 24 asrs r0, 24 movs r1, 0 ldrsb r1, [r6, r1] cmp r0, r1 - beq _080CF7C6 + beq @080CF7C6 movs r7, 0x1 -_080CF7C6: +@080CF7C6: cmp r7, 0 - beq _080CF7D6 -_080CF7CA: + beq @080CF7D6 +@080CF7CA: cmp r7, 0x6 - beq _080CF7D6 + beq @080CF7D6 mov r0, r9 adds r1, r4, 0 bl sub_80CD894 -_080CF7D6: +@080CF7D6: adds r0, r7, 0 -_080CF7D8: +@080CF7D8: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -392122,7 +392122,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] @@ -392143,110 +392143,110 @@ sub_80CF7E4: @ 80CF7E4 movs r0, 0x40 ands r0, r2 cmp r0, 0 - bne _080CF8AA + bne @080CF8AA movs r0, 0x80 ands r0, r2 cmp r0, 0 - beq _080CF834 + beq @080CF834 movs r4, 0x1 movs r1, 0 movs r6, 0x2 - b _080CF8B6 + b @080CF8B6 .align 2, 0 .pool -_080CF834: +@080CF834: ldrh r2, [r1, 0x2C] movs r0, 0x20 ands r0, r2 cmp r0, 0 - bne _080CF85A + bne @080CF85A movs r0, 0x10 ands r0, r2 cmp r0, 0 - bne _080CF86E + bne @080CF86E ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x1 - bne _080CF872 + bne @080CF872 movs r0, 0x80 lsls r0, 2 ands r0, r2 cmp r0, 0 - beq _080CF864 -_080CF85A: + beq @080CF864 +@080CF85A: movs r0, 0xA - b _080CF8D2 + b @080CF8D2 .align 2, 0 .pool -_080CF864: +@080CF864: movs r0, 0x80 lsls r0, 1 ands r0, r2 cmp r0, 0 - beq _080CF872 -_080CF86E: + beq @080CF872 +@080CF86E: movs r0, 0x9 - b _080CF8D2 -_080CF872: + b @080CF8D2 +@080CF872: ldrh r1, [r1, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080CF88A + beq @080CF88A movs r0, 0 bl sub_80CD1A8 bl sub_80CFA38 movs r0, 0x7 - b _080CF8D2 -_080CF88A: + b @080CF8D2 +@080CF88A: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080CF896 + beq @080CF896 movs r0, 0x13 - b _080CF8D2 -_080CF896: + b @080CF8D2 +@080CF896: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080CF8A6 + beq @080CF8A6 bl sub_80CFDC4 movs r0, 0 - b _080CF8D2 -_080CF8A6: + b @080CF8D2 +@080CF8A6: movs r4, 0 - b _080CF8D0 -_080CF8AA: + b @080CF8D0 +@080CF8AA: movs r4, 0x1 movs r1, 0x3 movs r6, 0 ldr r0, [r3] adds r0, r5 strb r4, [r0] -_080CF8B6: +@080CF8B6: cmp r4, 0 - beq _080CF8D0 + beq @080CF8D0 lsls r5, r1, 24 cmp r1, 0x2 - beq _080CF8C6 + beq @080CF8C6 movs r0, 0 bl sub_80CD1A8 -_080CF8C6: +@080CF8C6: lsrs r0, r5, 24 lsls r1, r6, 24 lsrs r1, 24 bl sub_80CD894 -_080CF8D0: +@080CF8D0: adds r0, r4, 0 -_080CF8D2: +@080CF8D2: pop {r4-r6} pop {r1} bx r1 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} @@ -392276,24 +392276,24 @@ sub_80CF8D8: @ 80CF8D8 ands r0, r1 adds r4, r3, 0 cmp r0, 0 - bne _080CF9B2 + bne @080CF9B2 movs r0, 0x88 ands r0, r1 cmp r0, 0 - beq _080CF944 + beq @080CF944 movs r7, 0x1 movs r0, 0x2 mov r8, r0 movs r2, 0 ldr r0, [r4] - b _080CF9D0 + b @080CF9D0 .align 2, 0 .pool -_080CF944: +@080CF944: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080CF960 + beq @080CF960 movs r7, 0x1 lsls r0, r2, 24 movs r1, 0xFF @@ -392301,14 +392301,14 @@ _080CF944: adds r0, r1 lsrs r2, r0, 24 cmp r0, 0 - bge _080CF9D4 + bge @080CF9D4 movs r2, 0x1 - b _080CF9D4 -_080CF960: + b @080CF9D4 +@080CF960: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080CF97E + beq @080CF97E movs r7, 0x1 lsls r0, r2, 24 movs r1, 0x80 @@ -392317,39 +392317,39 @@ _080CF960: lsrs r2, r0, 24 asrs r0, 24 cmp r0, 0x1 - ble _080CF9D4 + ble @080CF9D4 movs r2, 0 - b _080CF9D4 -_080CF97E: + b @080CF9D4 +@080CF97E: ldrh r1, [r7, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080CF992 + beq @080CF992 movs r0, 0x4 cmp r2, 0 - bne _080CF9E2 + bne @080CF9E2 movs r0, 0x5 - b _080CF9E2 -_080CF992: + b @080CF9E2 +@080CF992: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080CF99E + beq @080CF99E movs r0, 0x13 - b _080CF9E2 -_080CF99E: + b @080CF9E2 +@080CF99E: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080CF9AE + beq @080CF9AE bl sub_80CFDC4 movs r0, 0 - b _080CF9E2 -_080CF9AE: + b @080CF9E2 +@080CF9AE: movs r7, 0 - b _080CF9E0 -_080CF9B2: + b @080CF9E0 +@080CF9B2: movs r7, 0x1 movs r0, 0 mov r8, r0 @@ -392362,22 +392362,22 @@ _080CF9B2: ldrsb r0, [r1, r0] movs r2, 0x1D cmp r0, 0 - bne _080CF9CE + bne @080CF9CE movs r2, 0x18 -_080CF9CE: +@080CF9CE: ldr r0, [r3] -_080CF9D0: +@080CF9D0: adds r0, r5 strb r7, [r0] -_080CF9D4: +@080CF9D4: cmp r7, 0 - beq _080CF9E0 + beq @080CF9E0 mov r0, r8 adds r1, r2, 0 bl sub_80CD894 -_080CF9E0: +@080CF9E0: adds r0, r7, 0 -_080CF9E2: +@080CF9E2: pop {r3} mov r8, r3 pop {r4-r7} @@ -392386,16 +392386,16 @@ _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, =0x0857b9bc ldr r1, [r0] adds r4, r0, 0 cmp r1, 0 - beq _080CFA30 + beq @080CFA30 ldr r5, =0x02039d78 -_080CF9FC: +@080CF9FC: lsls r0, r3, 3 adds r2, r0, r4 movs r1, 0x4 @@ -392403,15 +392403,15 @@ _080CF9FC: movs r0, 0 ldrsb r0, [r5, r0] cmp r1, r0 - bne _080CFA20 + bne @080CFA20 ldr r0, [r2] bl _call_via_r0 lsls r0, 24 lsrs r0, 24 - b _080CFA32 + b @080CFA32 .align 2, 0 .pool -_080CFA20: +@080CFA20: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 @@ -392419,17 +392419,17 @@ _080CFA20: adds r0, r4 ldr r0, [r0] cmp r0, 0 - bne _080CF9FC -_080CFA30: + bne @080CF9FC +@080CFA30: movs r0, 0 -_080CFA32: +@080CFA32: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_80CF9EC thumb_func_start sub_80CFA38 -sub_80CFA38: @ 80CFA38 +sub_80CFA38: ; 80CFA38 push {lr} bl sub_80CFEF0 movs r0, 0x9 @@ -392445,21 +392445,21 @@ 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 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x3 - bne _080CFA78 + bne @080CFA78 bl sub_80CFB44 - b _080CFA7C + b @080CFA7C .align 2, 0 .pool -_080CFA78: +@080CFA78: bl sub_80CFA84 -_080CFA7C: +@080CFA7C: lsls r0, 24 lsrs r0, 24 pop {r1} @@ -392467,7 +392467,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 @@ -392476,78 +392476,78 @@ sub_80CFA84: @ 80CFA84 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x1 - beq _080CFAAE + beq @080CFAAE cmp r0, 0x1 - bgt _080CFAA8 + bgt @080CFAA8 cmp r0, 0 - beq _080CFABA - b _080CFAF4 + beq @080CFABA + b @080CFAF4 .align 2, 0 .pool -_080CFAA8: +@080CFAA8: cmp r0, 0x2 - beq _080CFAC6 - b _080CFAF4 -_080CFAAE: + beq @080CFAC6 + b @080CFAF4 +@080CFAAE: cmp r1, 0 - beq _080CFAF4 + beq @080CFAF4 movs r0, 0x1 bl sub_80CFF34 - b _080CFAF8 -_080CFABA: + b @080CFAF8 +@080CFABA: cmp r1, 0 - beq _080CFAF4 + beq @080CFAF4 movs r0, 0x2 bl sub_80CFF34 - b _080CFAF8 -_080CFAC6: + b @080CFAF8 +@080CFAC6: ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 - beq _080CFAE8 + beq @080CFAE8 cmp r1, 0 - beq _080CFAE0 + beq @080CFAE0 movs r0, 0x4 bl sub_80CFF34 - b _080CFAF8 + b @080CFAF8 .align 2, 0 .pool -_080CFAE0: +@080CFAE0: movs r0, 0x5 bl sub_80CFF34 - b _080CFAF8 -_080CFAE8: + b @080CFAF8 +@080CFAE8: cmp r1, 0 - beq _080CFAF4 + beq @080CFAF4 movs r0, 0x3 bl sub_80CFF34 - b _080CFAF8 -_080CFAF4: + b @080CFAF8 +@080CFAF4: movs r0, 0 - b _080CFB3E -_080CFAF8: + b @080CFB3E +@080CFAF8: movs r0, 0x6 bl sub_80CFF34 ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x2 - bne _080CFB2A + bne @080CFB2A ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0 - bne _080CFB24 + bne @080CFB24 movs r0, 0x2 bl sub_80CFF34 - b _080CFB2A + b @080CFB2A .align 2, 0 .pool -_080CFB24: +@080CFB24: movs r0, 0x1 bl sub_80CFF34 -_080CFB2A: +@080CFB2A: movs r0, 0x8 bl sub_80CFF34 movs r0, 0x7 @@ -392555,13 +392555,13 @@ _080CFB2A: movs r0, 0 bl sub_80CFF34 movs r0, 0x1 -_080CFB3E: +@080CFB3E: pop {r1} bx r1 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] @@ -392571,81 +392571,81 @@ sub_80CFB44: @ 80CFB44 movs r0, 0xCE lsls r0, 1 cmp r1, r0 - beq _080CFBDA + beq @080CFBDA bl sub_80D127C lsls r0, 24 cmp r0, 0 - bne _080CFBAC + bne @080CFBAC ldr r2, [r4] ldr r0, =0x00000ce6 adds r1, r2, r0 ldrh r0, [r1] cmp r0, 0 - bne _080CFB8C + bne @080CFB8C adds r0, r2, r5 ldrh r0, [r0] cmp r0, 0 - beq _080CFBDA + beq @080CFBDA movs r0, 0xE bl sub_80CFF34 - b _080CFBE4 + b @080CFBE4 .align 2, 0 .pool -_080CFB8C: +@080CFB8C: ldrh r0, [r1] bl itemid_is_mail lsls r0, 24 cmp r0, 0 - bne _080CFBA4 + bne @080CFBA4 movs r0, 0xC bl sub_80CFF34 movs r0, 0x10 bl sub_80CFF34 -_080CFBA4: +@080CFBA4: movs r0, 0x11 bl sub_80CFF34 - b _080CFBE4 -_080CFBAC: + b @080CFBE4 +@080CFBAC: ldr r2, [r4] ldr r0, =0x00000ce6 adds r1, r2, r0 ldrh r0, [r1] cmp r0, 0 - bne _080CFBCC + bne @080CFBCC adds r0, r2, r5 ldrh r0, [r0] cmp r0, 0 - beq _080CFBDA + beq @080CFBDA movs r0, 0xD bl sub_80CFF34 - b _080CFBE4 + b @080CFBE4 .align 2, 0 .pool -_080CFBCC: +@080CFBCC: ldrh r0, [r1] bl itemid_is_mail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080CFBDE -_080CFBDA: + bne @080CFBDE +@080CFBDA: movs r0, 0 - b _080CFBEC -_080CFBDE: + b @080CFBEC +@080CFBDE: movs r0, 0xF bl sub_80CFF34 -_080CFBE4: +@080CFBE4: movs r0, 0 bl sub_80CFF34 movs r0, 0x1 -_080CFBEC: +@080CFBEC: pop {r4,r5} pop {r1} bx r1 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 @@ -392663,7 +392663,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 @@ -392716,7 +392716,7 @@ sub_80CFC14: @ 80CFC14 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _080CFD18 + beq @080CFD18 ldr r2, [r6] ldr r4, =0x00000cb4 adds r3, r2, r4 @@ -392751,37 +392751,37 @@ sub_80CFC14: @ 80CFC14 ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 - beq _080CFD22 + beq @080CFD22 ldr r0, [r6] adds r0, r4 ldr r0, [r0] movs r1, 0x3 bl obj_anim_image_start - b _080CFD22 + b @080CFD22 .align 2, 0 .pool -_080CFD18: +@080CFD18: ldr r0, [r6] ldr r1, =0x00000cb4 adds r0, r1 movs r1, 0 str r1, [r0] -_080CFD22: +@080CFD22: ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0x1 - bne _080CFD3C + bne @080CFD3C movs r3, 0xD movs r4, 0x1 - b _080CFD40 + b @080CFD40 .align 2, 0 .pool -_080CFD3C: +@080CFD3C: movs r3, 0x15 movs r4, 0x2 -_080CFD40: +@080CFD40: ldr r0, =0x0857ba68 movs r1, 0 movs r2, 0 @@ -392789,7 +392789,7 @@ _080CFD40: lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _080CFDA8 + beq @080CFDA8 ldr r5, =0x02039d08 ldr r2, [r5] ldr r3, =0x00000cb8 @@ -392812,7 +392812,7 @@ _080CFD40: lsls r0, 24 asrs r0, 24 cmp r0, 0 - beq _080CFDB4 + beq @080CFDB4 ldr r0, [r5] ldr r4, =0x00000cb8 adds r0, r4 @@ -392822,17 +392822,17 @@ _080CFD40: movs r2, 0x4 orrs r0, r2 strb r0, [r1] - b _080CFDB4 + b @080CFDB4 .align 2, 0 .pool -_080CFDA8: +@080CFDA8: ldr r0, =0x02039d08 ldr r0, [r0] ldr r5, =0x00000cb8 adds r0, r5 movs r1, 0 str r1, [r0] -_080CFDB4: +@080CFDB4: add sp, 0x2C pop {r4-r6} pop {r0} @@ -392842,15 +392842,15 @@ _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 ldrb r0, [r2] cmp r0, 0 - bne _080CFDD2 + bne @080CFDD2 movs r1, 0x1 -_080CFDD2: +@080CFDD2: strb r1, [r2] ldr r0, =0x02039d08 ldr r0, [r0] @@ -392875,7 +392875,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 @@ -392884,7 +392884,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 @@ -392893,7 +392893,7 @@ sub_80CFE14: @ 80CFE14 lsls r0, 24 asrs r0, 24 cmp r0, 0 - bne _080CFE48 + bne @080CFE48 ldr r4, =0x02039d79 movs r0, 0 ldrsb r0, [r4, r0] @@ -392904,13 +392904,13 @@ sub_80CFE14: @ 80CFE14 ldrsb r0, [r4, r0] movs r1, 0x6 bl __divsi3 - b _080CFE4C + b @080CFE4C .align 2, 0 .pool -_080CFE48: +@080CFE48: movs r0, 0 strb r0, [r5] -_080CFE4C: +@080CFE4C: strb r0, [r6] pop {r4-r6} pop {r0} @@ -392918,7 +392918,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 @@ -392936,7 +392936,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 @@ -392945,7 +392945,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 @@ -392964,19 +392964,19 @@ 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] lsls r0, 24 asrs r0, 24 cmp r0, 0 - bne _080CFEC0 + bne @080CFEC0 ldr r0, =0x02039d79 ldrb r1, [r0] movs r0, 0 bl sub_80D0E50 -_080CFEC0: +@080CFEC0: pop {r0} bx r0 .align 2, 0 @@ -392984,19 +392984,19 @@ _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] lsls r0, 24 asrs r0, 24 cmp r0, 0 - bne _080CFEE4 + bne @080CFEE4 ldr r0, =0x02039d79 ldrb r1, [r0] movs r0, 0 bl sub_80D0D8C -_080CFEE4: +@080CFEE4: pop {r0} bx r0 .align 2, 0 @@ -393004,7 +393004,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 @@ -393035,7 +393035,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 @@ -393045,7 +393045,7 @@ sub_80CFF34: @ 80CFF34 adds r1, r2, r5 ldrb r0, [r1] cmp r0, 0x6 - bhi _080CFF7E + bhi @080CFF7E adds r1, r0, 0 lsls r1, 3 ldr r0, =0x00000c74 @@ -393065,15 +393065,15 @@ sub_80CFF34: @ 80CFF34 adds r0, r2 ldrb r2, [r0] cmp r1, r2 - bls _080CFF74 + bls @080CFF74 strb r1, [r0] -_080CFF74: +@080CFF74: ldr r1, [r4] adds r1, r5 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_080CFF7E: +@080CFF7E: pop {r4,r5} pop {r0} bx r0 @@ -393082,7 +393082,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 @@ -393092,26 +393092,26 @@ sub_80CFF98: @ 80CFF98 adds r0, r1, r3 ldrb r0, [r0] cmp r2, r0 - bcs _080CFFC8 + bcs @080CFFC8 lsls r0, r2, 3 ldr r2, =0x00000c78 adds r1, r2 adds r1, r0 movs r0, 0 ldrsb r0, [r1, r0] - b _080CFFCC + b @080CFFCC .align 2, 0 .pool -_080CFFC8: +@080CFFC8: movs r0, 0x1 negs r0, r0 -_080CFFCC: +@080CFFCC: pop {r1} bx r1 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} @@ -393202,13 +393202,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 @@ -393217,51 +393217,51 @@ sub_80D00AC: @ 80D00AC movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080D0102 + bne @080D0102 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080D00CE + beq @080D00CE movs r0, 0x5 bl audio_play adds r5, 0x1 -_080D00CE: +@080D00CE: ldrh r1, [r4, 0x2E] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _080D00EC + beq @080D00EC movs r0, 0x5 bl audio_play movs r0, 0x1 negs r0, r0 bl MoveMenuCursor - b _080D010A + b @080D010A .align 2, 0 .pool -_080D00EC: +@080D00EC: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080D010A + beq @080D010A movs r0, 0x5 bl audio_play movs r0, 0x1 bl MoveMenuCursor - b _080D010A -_080D0102: + b @080D010A +@080D0102: bl GetMenuCursorPos lsls r0, 24 lsrs r5, r0, 24 -_080D010A: +@080D010A: movs r0, 0x2 negs r0, r0 cmp r5, r0 - beq _080D0116 + beq @080D0116 bl sub_80D013C -_080D0116: +@080D0116: cmp r5, 0 - blt _080D0128 + blt @080D0128 ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r5, 3 @@ -393269,7 +393269,7 @@ _080D0116: adds r0, r2 adds r0, r1 ldr r5, [r0] -_080D0128: +@080D0128: lsls r0, r5, 16 asrs r0, 16 pop {r4,r5} @@ -393280,7 +393280,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] @@ -393302,14 +393302,14 @@ 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 bl malloc str r0, [r4] cmp r0, 0 - beq _080D01B0 + beq @080D01B0 ldr r0, =0x0857bb1c bl Window_AddFromTemplate8Bpp adds r1, r0, 0 @@ -393322,32 +393322,32 @@ sub_80D0164: @ 80D0164 lsls r0, r1, 16 lsrs r0, 16 cmp r0, 0xFF - beq _080D01B0 + beq @080D01B0 lsls r0, r1, 24 lsrs r0, 24 movs r1, 0 bl Window_FastFillPixels movs r0, 0x1 - b _080D01B2 + b @080D01B2 .align 2, 0 .pool -_080D01B0: +@080D01B0: movs r0, 0 -_080D01B2: +@080D01B2: pop {r4} pop {r1} bx r1 thumb_func_end sub_80D0164 thumb_func_start sub_80D01B8 -sub_80D01B8: @ 80D01B8 +sub_80D01B8: ; 80D01B8 push {lr} ldr r0, =0x02039d80 ldr r0, [r0] cmp r0, 0 - beq _080D01C6 + beq @080D01C6 bl free -_080D01C6: +@080D01C6: pop {r0} bx r0 .align 2, 0 @@ -393355,7 +393355,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 @@ -393368,83 +393368,83 @@ 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] ldrb r0, [r0] cmp r0, 0x5 - bhi _080D0244 + bhi @080D0244 lsls r0, 2 - ldr r1, =_080D0204 + ldr r1, =@080D0204 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080D0204: - .4byte _080D021C - .4byte _080D0222 - .4byte _080D0228 - .4byte _080D022E - .4byte _080D0234 - .4byte _080D023A -_080D021C: +@080D0204: + .4byte @080D021C + .4byte @080D0222 + .4byte @080D0228 + .4byte @080D022E + .4byte @080D0234 + .4byte @080D023A +@080D021C: bl sub_80D024C - b _080D023E -_080D0222: + b @080D023E +@080D0222: bl sub_80D0344 - b _080D023E -_080D0228: + b @080D023E +@080D0228: bl sub_80D03B0 - b _080D023E -_080D022E: + b @080D023E +@080D022E: bl sub_80D0420 - b _080D023E -_080D0234: + b @080D023E +@080D0234: bl sub_80D04A0 - b _080D023E -_080D023A: + b @080D023E +@080D023A: bl sub_80D04C8 -_080D023E: +@080D023E: lsls r0, 24 lsrs r0, 24 - b _080D0246 -_080D0244: + b @080D0246 +@080D0244: movs r0, 0 -_080D0246: +@080D0246: pop {r1} bx r1 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 ldr r1, [r6] ldrb r0, [r1, 0x1] cmp r0, 0x1 - beq _080D027C + beq @080D027C cmp r0, 0x1 - bgt _080D0268 + bgt @080D0268 cmp r0, 0 - beq _080D026E - b _080D0338 + beq @080D026E + b @080D0338 .align 2, 0 .pool -_080D0268: +@080D0268: cmp r0, 0x2 - beq _080D0324 - b _080D0338 -_080D026E: + beq @080D0324 + b @080D0338 +@080D026E: movs r0, 0 bl gpu_sync_bg_hide movs r0, 0x80 bl sub_80D304C - b _080D030E -_080D027C: + b @080D030E +@080D027C: adds r0, r1, 0x2 adds r1, 0x3 bl sub_80CFE14 @@ -393506,26 +393506,26 @@ _080D027C: movs r0, 0x8 movs r1, 0x80 bl lcd_io_set_bits -_080D030E: +@080D030E: ldr r1, [r6] ldrb r0, [r1, 0x1] adds r0, 0x1 strb r0, [r1, 0x1] - b _080D0338 + b @080D0338 .align 2, 0 .pool -_080D0324: +@080D0324: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _080D0338 + bne @080D0338 movs r0, 0 bl gpu_sync_bg_show movs r0, 0 - b _080D033A -_080D0338: + b @080D033A +@080D0338: movs r0, 0x1 -_080D033A: +@080D033A: add sp, 0x8 pop {r4-r6} pop {r1} @@ -393533,43 +393533,43 @@ _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] ldrb r0, [r0, 0x1] cmp r0, 0x1 - beq _080D036E + beq @080D036E cmp r0, 0x1 - bgt _080D0360 + bgt @080D0360 cmp r0, 0 - beq _080D0366 - b _080D03A8 + beq @080D0366 + b @080D03A8 .align 2, 0 .pool -_080D0360: +@080D0360: cmp r0, 0x2 - beq _080D0382 - b _080D03A8 -_080D0366: + beq @080D0382 + b @080D03A8 +@080D0366: movs r0, 0 bl gpu_sync_bg_hide - b _080D0378 -_080D036E: + b @080D0378 +@080D036E: bl sub_80D0B5C movs r0, 0 bl sub_80CFE54 -_080D0378: +@080D0378: ldr r1, [r4] ldrb r0, [r1, 0x1] adds r0, 0x1 strb r0, [r1, 0x1] - b _080D03A8 -_080D0382: + b @080D03A8 +@080D0382: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _080D03A8 + bne @080D03A8 bl sub_80CFE84 movs r0, 0x3 bl stdpal_get @@ -393579,33 +393579,33 @@ _080D0382: movs r0, 0 bl gpu_sync_bg_show movs r0, 0 - b _080D03AA -_080D03A8: + b @080D03AA +@080D03A8: movs r0, 0x1 -_080D03AA: +@080D03AA: pop {r4} pop {r1} bx r1 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] ldrb r0, [r0, 0x1] cmp r0, 0 - beq _080D03C8 + beq @080D03C8 cmp r0, 0x1 - beq _080D040C - b _080D0416 + beq @080D040C + b @080D0416 .align 2, 0 .pool -_080D03C8: +@080D03C8: bl sub_80CD554 lsls r0, 24 cmp r0, 0 - bne _080D0416 + bne @080D0416 ldr r1, [r4] adds r0, r1, 0x6 adds r1, 0x7 @@ -393629,51 +393629,51 @@ _080D03C8: ldrb r0, [r1, 0x1] adds r0, 0x1 strb r0, [r1, 0x1] - b _080D0416 + b @080D0416 .align 2, 0 .pool -_080D040C: +@080D040C: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 - b _080D0418 -_080D0416: + b @080D0418 +@080D0416: movs r0, 0x1 -_080D0418: +@080D0418: pop {r4} pop {r1} bx r1 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] ldrb r0, [r0, 0x1] cmp r0, 0x1 - beq _080D044E + beq @080D044E cmp r0, 0x1 - bgt _080D043C + bgt @080D043C cmp r0, 0 - beq _080D0442 - b _080D0498 + beq @080D0442 + b @080D0498 .align 2, 0 .pool -_080D043C: +@080D043C: cmp r0, 0x2 - beq _080D047A - b _080D0498 -_080D0442: + beq @080D047A + b @080D0498 +@080D0442: bl sub_80D08CC bl sub_80D09A4 movs r0, 0 - b _080D046C -_080D044E: + b @080D046C +@080D044E: bl sub_80CDCAC lsls r0, 24 cmp r0, 0 - bne _080D0498 + bne @080D0498 movs r0, 0x3 bl sub_80CFE54 movs r1, 0x80 @@ -393682,14 +393682,14 @@ _080D044E: movs r2, 0x8 bl sub_80D0884 movs r0, 0x1 -_080D046C: +@080D046C: bl sub_80CDC64 ldr r1, [r4] ldrb r0, [r1, 0x1] adds r0, 0x1 strb r0, [r1, 0x1] - b _080D0498 -_080D047A: + b @080D0498 +@080D047A: bl sub_80D0894 adds r4, r0, 0 lsls r4, 24 @@ -393698,21 +393698,21 @@ _080D047A: lsls r0, 24 lsrs r0, 24 cmp r4, 0 - bne _080D0498 + bne @080D0498 cmp r0, 0 - bne _080D0498 + bne @080D0498 movs r0, 0 - b _080D049A -_080D0498: + b @080D049A +@080D0498: movs r0, 0x1 -_080D049A: +@080D049A: pop {r4} pop {r1} bx r1 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 @@ -393722,41 +393722,41 @@ sub_80D04A0: @ 80D04A0 lsls r0, 24 lsrs r0, 24 cmp r4, 0 - bne _080D04C0 + bne @080D04C0 cmp r0, 0 - bne _080D04C0 + bne @080D04C0 movs r0, 0 - b _080D04C2 -_080D04C0: + b @080D04C2 +@080D04C0: movs r0, 0x1 -_080D04C2: +@080D04C2: pop {r4} pop {r1} bx r1 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] ldrb r0, [r0, 0x1] cmp r0, 0x1 - beq _080D0506 + beq @080D0506 cmp r0, 0x1 - bgt _080D04E4 + bgt @080D04E4 cmp r0, 0 - beq _080D04EE - b _080D0576 + beq @080D04EE + b @080D0576 .align 2, 0 .pool -_080D04E4: +@080D04E4: cmp r0, 0x2 - beq _080D0532 + beq @080D0532 cmp r0, 0x3 - beq _080D0550 - b _080D0576 -_080D04EE: + beq @080D0550 + b @080D0576 +@080D04EE: bl sub_80D0AAC movs r1, 0xFF lsls r1, 8 @@ -393765,16 +393765,16 @@ _080D04EE: bl sub_80D0884 movs r0, 0 bl sub_80CDC64 - b _080D0546 -_080D0506: + b @080D0546 +@080D0506: bl sub_80CDCAC lsls r0, 24 cmp r0, 0 - bne _080D0576 + bne @080D0576 bl sub_80D0894 lsls r0, 24 cmp r0, 0 - bne _080D0576 + bne @080D0576 bl sub_80D0A1C movs r0, 0x2 bl sub_80CFE54 @@ -393782,26 +393782,26 @@ _080D0506: bl sub_80CDC64 movs r0, 0 bl gpu_sync_bg_hide - b _080D0546 -_080D0532: + b @080D0546 +@080D0532: bl sub_80CDCAC lsls r0, 24 cmp r0, 0 - bne _080D0576 + bne @080D0576 movs r0, 0 bl sub_80CFE54 bl sub_80D0B5C -_080D0546: +@080D0546: ldr r1, [r4] ldrb r0, [r1, 0x1] adds r0, 0x1 strb r0, [r1, 0x1] - b _080D0576 -_080D0550: + b @080D0576 +@080D0550: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _080D0576 + bne @080D0576 movs r0, 0x3 bl stdpal_get movs r1, 0xD0 @@ -393811,95 +393811,95 @@ _080D0550: movs r0, 0 bl gpu_sync_bg_show movs r0, 0 - b _080D0578 -_080D0576: + b @080D0578 +@080D0576: movs r0, 0x1 -_080D0578: +@080D0578: pop {r4} pop {r1} bx r1 thumb_func_end sub_80D04C8 thumb_func_start sub_80D0580 -sub_80D0580: @ 80D0580 +sub_80D0580: ; 80D0580 push {lr} lsls r0, 24 lsrs r0, 24 adds r1, r0, 0 cmp r0, 0x1 - beq _080D05BC + beq @080D05BC cmp r0, 0x1 - bgt _080D0596 + bgt @080D0596 cmp r0, 0 - beq _080D05A0 - b _080D0624 -_080D0596: + beq @080D05A0 + b @080D0624 +@080D0596: cmp r1, 0x2 - beq _080D05DC + beq @080D05DC cmp r1, 0x3 - beq _080D05FC - b _080D0624 -_080D05A0: + beq @080D05FC + b @080D0624 +@080D05A0: ldr r0, =0x02039d80 ldr r1, [r0] ldrb r0, [r1, 0x9] cmp r0, 0 - beq _080D060A + beq @080D060A subs r0, 0x1 strb r0, [r1, 0x9] movs r1, 0x80 lsls r1, 3 movs r0, 0 - b _080D05F0 + b @080D05F0 .align 2, 0 .pool -_080D05BC: +@080D05BC: ldr r0, =0x02039d80 ldr r1, [r0] ldrb r2, [r1, 0x9] ldrb r0, [r1, 0xB] adds r0, r2, r0 cmp r0, 0x4 - bgt _080D060A + bgt @080D060A adds r0, r2, 0x1 strb r0, [r1, 0x9] movs r1, 0xFC lsls r1, 8 movs r0, 0 - b _080D05F0 + b @080D05F0 .align 2, 0 .pool -_080D05DC: +@080D05DC: ldr r0, =0x02039d80 ldr r1, [r0] ldrb r0, [r1, 0x8] cmp r0, 0 - beq _080D060A + beq @080D060A subs r0, 0x1 strb r0, [r1, 0x8] movs r0, 0x80 lsls r0, 3 movs r1, 0 -_080D05F0: +@080D05F0: movs r2, 0x6 bl sub_80D0884 - b _080D0624 + b @080D0624 .align 2, 0 .pool -_080D05FC: +@080D05FC: ldr r0, =0x02039d80 ldr r1, [r0] ldrb r2, [r1, 0x8] ldrb r0, [r1, 0xA] adds r0, r2, r0 cmp r0, 0x5 - ble _080D0614 -_080D060A: + ble @080D0614 +@080D060A: movs r0, 0 - b _080D0626 + b @080D0626 .align 2, 0 .pool -_080D0614: +@080D0614: adds r0, r2, 0x1 strb r0, [r1, 0x8] movs r0, 0xFC @@ -393907,15 +393907,15 @@ _080D0614: movs r1, 0 movs r2, 0x6 bl sub_80D0884 -_080D0624: +@080D0624: movs r0, 0x1 -_080D0626: +@080D0626: pop {r1} bx r1 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] @@ -393923,15 +393923,15 @@ sub_80D062C: @ 80D062C ldrb r5, [r2, 0x6] subs r1, r3, r5 cmp r1, 0 - bge _080D063E + bge @080D063E negs r1, r1 -_080D063E: +@080D063E: ldrb r0, [r2, 0x4] subs r0, r3, r0 cmp r0, 0 - bge _080D0648 + bge @080D0648 negs r0, r0 -_080D0648: +@080D0648: subs r0, r1, r0 lsls r0, 16 lsrs r4, r0, 16 @@ -393939,27 +393939,27 @@ _080D0648: ldrb r0, [r2, 0x7] subs r3, r1, r0 cmp r3, 0 - bge _080D065A + bge @080D065A negs r3, r3 -_080D065A: +@080D065A: ldrb r2, [r2, 0x5] subs r0, r1, r2 cmp r0, 0 - bge _080D0664 + bge @080D0664 negs r0, r0 -_080D0664: +@080D0664: subs r0, r3, r0 lsls r0, 16 lsrs r7, r0, 16 lsls r0, r4, 16 asrs r4, r0, 16 cmp r4, 0 - ble _080D0678 + ble @080D0678 adds r0, r5, 0 bl sub_80D06D0 -_080D0678: +@080D0678: cmp r4, 0 - bge _080D0694 + bge @080D0694 ldr r2, [r6] ldrb r0, [r2, 0x4] ldrb r1, [r2, 0x3] @@ -393970,19 +393970,19 @@ _080D0678: ldrb r1, [r2, 0x3] ldrb r2, [r2, 0x5] bl sub_80D06D0 -_080D0694: +@080D0694: lsls r0, r7, 16 asrs r4, r0, 16 cmp r4, 0 - ble _080D06A8 + ble @080D06A8 ldr r2, [r6] ldrb r0, [r2, 0x7] ldrb r1, [r2, 0x2] ldrb r2, [r2, 0x4] bl sub_80D0708 -_080D06A8: +@080D06A8: cmp r4, 0 - bge _080D06C4 + bge @080D06C4 ldr r2, [r6] ldrb r0, [r2, 0x5] ldrb r1, [r2, 0x2] @@ -393993,7 +393993,7 @@ _080D06A8: ldrb r1, [r2, 0x2] ldrb r2, [r2, 0x4] bl sub_80D0708 -_080D06C4: +@080D06C4: pop {r4-r7} pop {r0} bx r0 @@ -394002,7 +394002,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 @@ -394013,12 +394013,12 @@ sub_80D06D0: @ 80D06D0 lsrs r5, r2, 24 adds r0, r5, 0 cmp r4, r5 - bls _080D06EE + bls @080D06EE adds r4, r5, 0 adds r5, r1, 0 cmp r0, r5 - bhi _080D0700 -_080D06EE: + bhi @080D0700 +@080D06EE: adds r1, r4, 0 adds r0, r1, 0x1 lsls r0, 24 @@ -394026,15 +394026,15 @@ _080D06EE: adds r0, r6, 0 bl sub_80D07B0 cmp r4, r5 - bls _080D06EE -_080D0700: + bls @080D06EE +@080D0700: pop {r4-r6} pop {r0} bx r0 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 @@ -394045,12 +394045,12 @@ sub_80D0708: @ 80D0708 lsrs r5, r2, 24 adds r0, r5, 0 cmp r4, r5 - bls _080D0726 + bls @080D0726 adds r4, r5, 0 adds r5, r1, 0 cmp r0, r5 - bhi _080D0738 -_080D0726: + bhi @080D0738 +@080D0726: adds r0, r4, 0 adds r1, r0, 0x1 lsls r1, 24 @@ -394058,15 +394058,15 @@ _080D0726: adds r1, r6, 0 bl sub_80D07B0 cmp r4, r5 - bls _080D0726 -_080D0738: + bls @080D0726 +@080D0738: pop {r4-r6} pop {r0} bx r0 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 @@ -394077,12 +394077,12 @@ sub_80D0740: @ 80D0740 lsrs r5, r2, 24 adds r0, r5, 0 cmp r4, r5 - bls _080D075E + bls @080D075E adds r4, r5, 0 adds r5, r1, 0 cmp r0, r5 - bhi _080D0770 -_080D075E: + bhi @080D0770 +@080D075E: adds r1, r4, 0 adds r0, r1, 0x1 lsls r0, 24 @@ -394090,15 +394090,15 @@ _080D075E: adds r0, r6, 0 bl sub_80D0834 cmp r4, r5 - bls _080D075E -_080D0770: + bls @080D075E +@080D0770: pop {r4-r6} pop {r0} bx r0 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 @@ -394109,12 +394109,12 @@ sub_80D0778: @ 80D0778 lsrs r5, r2, 24 adds r0, r5, 0 cmp r4, r5 - bls _080D0796 + bls @080D0796 adds r4, r5, 0 adds r5, r1, 0 cmp r0, r5 - bhi _080D07A8 -_080D0796: + bhi @080D07A8 +@080D0796: adds r0, r4, 0 adds r1, r0, 0x1 lsls r1, 24 @@ -394122,15 +394122,15 @@ _080D0796: adds r1, r6, 0 bl sub_80D0834 cmp r4, r5 - bls _080D0796 -_080D07A8: + bls @080D0796 +@080D07A8: pop {r4-r6} pop {r0} bx r0 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 @@ -394153,7 +394153,7 @@ sub_80D07B0: @ 80D07B0 bl get_pokemon_data_from_selected_box adds r1, r0, 0 cmp r5, 0 - beq _080D0828 + beq @080D0828 adds r0, r5, 0 movs r2, 0x1 bl sub_80D2EDC @@ -394186,7 +394186,7 @@ sub_80D07B0: @ 80D07B0 movs r2, 0 movs r3, 0 bl Window_CopyPixelRectToWindow4BppTo8Bpp -_080D0828: +@080D0828: add sp, 0x1C pop {r4-r7} pop {r0} @@ -394196,7 +394196,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 @@ -394213,7 +394213,7 @@ sub_80D0834: @ 80D0834 bl get_pokemon_data_from_selected_box lsls r0, 16 cmp r0, 0 - beq _080D0878 + beq @080D0878 ldr r0, =0x02039d08 ldr r0, [r0] movs r1, 0x88 @@ -394229,7 +394229,7 @@ sub_80D0834: @ 80D0834 str r1, [sp, 0x4] movs r1, 0 bl Window_FillPixelRect8Bpp -_080D0878: +@080D0878: add sp, 0x8 pop {r4,r5} pop {r0} @@ -394239,7 +394239,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] @@ -394251,13 +394251,13 @@ 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] ldrh r0, [r1, 0x10] cmp r0, 0 - beq _080D08BE + beq @080D08BE ldrh r1, [r1, 0xC] movs r0, 0 movs r2, 0x1 @@ -394271,7 +394271,7 @@ sub_80D0894: @ 80D0894 ldrh r0, [r1, 0x10] subs r0, 0x1 strh r0, [r1, 0x10] -_080D08BE: +@080D08BE: ldr r0, [r4] ldrb r0, [r0, 0x10] pop {r4} @@ -394282,7 +394282,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 @@ -394293,26 +394293,26 @@ sub_80D08CC: @ 80D08CC ldrb r0, [r1, 0x4] ldrb r2, [r1, 0x2] cmp r0, r2 - bls _080D08E4 + bls @080D08E4 adds r0, r2, 0 -_080D08E4: +@080D08E4: strb r0, [r1, 0x8] ldr r1, [r4] ldrb r0, [r1, 0x5] ldrb r2, [r1, 0x3] cmp r0, r2 - bls _080D08F2 + bls @080D08F2 adds r0, r2, 0 -_080D08F2: +@080D08F2: strb r0, [r1, 0x9] ldr r2, [r4] ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x4] subs r0, r1, r0 cmp r0, 0 - bge _080D0902 + bge @080D0902 negs r0, r0 -_080D0902: +@080D0902: adds r0, 0x1 strb r0, [r2, 0xA] ldr r2, [r4] @@ -394320,9 +394320,9 @@ _080D0902: ldrb r0, [r2, 0x5] subs r0, r1, r0 cmp r0, 0 - bge _080D0914 + bge @080D0914 negs r0, r0 -_080D0914: +@080D0914: adds r0, 0x1 strb r0, [r2, 0xB] bl get_preferred_box @@ -394341,8 +394341,8 @@ _080D0914: mov r9, r0 adds r2, r1, 0 cmp r2, r9 - bge _080D0990 -_080D093C: + bge @080D0990 +@080D093C: lsls r0, r2, 1 adds r0, r2 ldr r3, =0x02039d80 @@ -394355,10 +394355,10 @@ _080D093C: ldrb r4, [r1, 0x8] adds r7, r2, 0x1 cmp r4, r8 - bge _080D098A + bge @080D098A mov r0, r8 subs r4, r0, r4 -_080D095A: +@080D095A: mov r0, r10 adds r1, r5, 0 bl get_pokemon_by_box_and_pos @@ -394380,12 +394380,12 @@ _080D095A: lsrs r5, r0, 24 subs r4, 0x1 cmp r4, 0 - bne _080D095A -_080D098A: + bne @080D095A +@080D098A: adds r2, r7, 0 cmp r2, r9 - blt _080D093C -_080D0990: + blt @080D093C +@080D0990: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -394398,7 +394398,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 @@ -394419,8 +394419,8 @@ sub_80D09A4: @ 80D09A4 ldr r0, [r4] ldrb r2, [r0, 0x9] cmp r2, r9 - bge _080D0A0C -_080D09D0: + bge @080D0A0C +@080D09D0: lsls r0, r2, 1 adds r0, r2 ldr r1, =0x02039d80 @@ -394433,9 +394433,9 @@ _080D09D0: ldrb r4, [r1, 0x8] adds r6, r2, 0x1 cmp r4, r7 - bge _080D0A06 + bge @080D0A06 subs r4, r7, r4 -_080D09EC: +@080D09EC: adds r0, r5, 0 bl sub_80CB778 mov r0, r8 @@ -394446,12 +394446,12 @@ _080D09EC: lsrs r5, r0, 24 subs r4, 0x1 cmp r4, 0 - bne _080D09EC -_080D0A06: + bne @080D09EC +@080D0A06: adds r2, r6, 0 cmp r2, r9 - blt _080D09D0 -_080D0A0C: + blt @080D09D0 +@080D0A0C: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -394463,7 +394463,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 @@ -394482,8 +394482,8 @@ sub_80D0A1C: @ 80D0A1C movs r6, 0 adds r2, r1, 0 cmp r2, r10 - bge _080D0A98 -_080D0A42: + bge @080D0A98 +@080D0A42: lsls r0, r2, 1 adds r0, r2 ldr r3, =0x02039d80 @@ -394496,11 +394496,11 @@ _080D0A42: ldrb r4, [r1, 0x8] adds r7, r2, 0x1 cmp r4, r8 - bge _080D0A92 + bge @080D0A92 mov r9, r3 mov r0, r8 subs r4, r0, r4 -_080D0A62: +@080D0A62: lsls r1, r6, 2 adds r1, r6 lsls r1, 4 @@ -394511,10 +394511,10 @@ _080D0A62: movs r1, 0x5 bl pokemon_getattr_encrypted cmp r0, 0 - beq _080D0A80 + beq @080D0A80 adds r0, r5, 0 bl sub_80CB140 -_080D0A80: +@080D0A80: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 @@ -394523,12 +394523,12 @@ _080D0A80: lsrs r5, r0, 24 subs r4, 0x1 cmp r4, 0 - bne _080D0A62 -_080D0A92: + bne @080D0A62 +@080D0A92: adds r2, r7, 0 cmp r2, r10 - blt _080D0A42 -_080D0A98: + blt @080D0A42 +@080D0A98: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -394541,7 +394541,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 @@ -394567,8 +394567,8 @@ sub_80D0AAC: @ 80D0AAC ldrb r3, [r0, 0x9] ldr r0, [sp] cmp r3, r0 - bge _080D0B46 -_080D0AE2: + bge @080D0B46 +@080D0AE2: lsls r0, r3, 1 adds r0, r3 ldr r2, =0x02039d80 @@ -394582,11 +394582,11 @@ _080D0AE2: adds r3, 0x1 mov r9, r3 cmp r5, r10 - bge _080D0B3E + bge @080D0B3E mov r8, r2 mov r0, r10 subs r5, r0, r5 -_080D0B04: +@080D0B04: lsls r0, r7, 2 adds r0, r7 lsls r0, 4 @@ -394598,14 +394598,14 @@ _080D0B04: movs r1, 0x5 bl pokemon_getattr_encrypted cmp r0, 0 - beq _080D0B2C + beq @080D0B2C mov r0, r8 ldr r2, [r0] adds r2, r4 ldr r0, [sp, 0x4] adds r1, r6, 0 bl sub_80D1F18 -_080D0B2C: +@080D0B2C: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 @@ -394614,13 +394614,13 @@ _080D0B2C: lsrs r7, r0, 24 subs r5, 0x1 cmp r5, 0 - bne _080D0B04 -_080D0B3E: + bne @080D0B04 +@080D0B3E: mov r3, r9 ldr r1, [sp] cmp r3, r1 - blt _080D0AE2 -_080D0B46: + blt @080D0AE2 +@080D0B46: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -394634,7 +394634,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 @@ -394668,7 +394668,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] @@ -394685,7 +394685,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 @@ -394705,12 +394705,12 @@ sub_80D0BC0: @ 80D0BC0 movs r7, 0 adds r6, r1, 0 cmp r6, r0 - bge _080D0C4E + bge @080D0C4E lsls r0, r6, 1 adds r0, r6 lsls r0, 1 mov r8, r0 -_080D0BF0: +@080D0BF0: ldr r2, =0x02039d80 ldr r1, [r2] ldrb r0, [r1, 0x8] @@ -394719,9 +394719,9 @@ _080D0BF0: lsrs r5, r0, 24 ldrb r4, [r1, 0x8] cmp r4, r9 - bge _080D0C42 + bge @080D0C42 mov r10, r2 -_080D0C04: +@080D0C04: lsls r1, r7, 2 adds r1, r7 lsls r1, 4 @@ -394732,17 +394732,17 @@ _080D0C04: movs r1, 0x5 bl pokemon_getattr_encrypted cmp r0, 0 - beq _080D0C30 + beq @080D0C30 adds r0, r5, 0 movs r1, 0x5 bl get_pokemon_data_from_selected_box cmp r0, 0 - beq _080D0C30 + beq @080D0C30 movs r0, 0 - b _080D0C50 + b @080D0C50 .align 2, 0 .pool -_080D0C30: +@080D0C30: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 @@ -394751,17 +394751,17 @@ _080D0C30: lsrs r5, r0, 24 adds r4, 0x1 cmp r4, r9 - blt _080D0C04 -_080D0C42: + blt @080D0C04 +@080D0C42: movs r0, 0x6 add r8, r0 adds r6, 0x1 ldr r2, [sp] cmp r6, r2 - blt _080D0BF0 -_080D0C4E: + blt @080D0BF0 +@080D0C4E: movs r0, 0x1 -_080D0C50: +@080D0C50: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -394773,7 +394773,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 @@ -394784,7 +394784,7 @@ sub_80D0C60: @ 80D0C60 ldr r0, [r3] ldrb r0, [r0, 0x1] cmp r0, 0x3 - bne _080D0D3E + bne @080D0D3E ldr r0, =0x03000f78 str r0, [sp, 0x18] ldr r1, =0xffff0000 @@ -394806,7 +394806,7 @@ sub_80D0C60: @ 80D0C60 mov r8, r3 movs r0, 0 mov r10, r0 -_080D0CA0: +@080D0CA0: adds r6, r7, 0x7 lsls r1, r6, 16 mov r2, r9 @@ -394881,8 +394881,8 @@ _080D0CA0: strb r2, [r0] adds r7, 0x1 cmp r7, 0x2 - ble _080D0CA0 -_080D0D3E: + ble @080D0CA0 +@080D0D3E: ldr r0, =0x02039d08 ldr r0, [r0] ldr r4, =0x00002234 @@ -394902,7 +394902,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} @@ -394915,33 +394915,33 @@ sub_80D0D8C: @ 80D0D8C ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x3 - bne _080D0E42 + bne @080D0E42 mov r0, r8 adds r1, r7, 0 bl sub_80D1324 cmp r0, 0 - bne _080D0E42 + bne @080D0E42 mov r0, r8 cmp r0, 0 - beq _080D0DC4 + beq @080D0DC4 cmp r0, 0x1 - beq _080D0DDA - b _080D0E42 + beq @080D0DDA + b @080D0E42 .align 2, 0 .pool -_080D0DC4: +@080D0DC4: adds r0, r7, 0 movs r1, 0x5 bl get_pokemon_data_from_selected_box cmp r0, 0 - beq _080D0E42 + beq @080D0E42 adds r0, r7, 0 movs r1, 0xC bl get_pokemon_data_from_selected_box - b _080D0DFC -_080D0DDA: + b @080D0DFC +@080D0DDA: cmp r7, 0x5 - bhi _080D0E42 + bhi @080D0E42 movs r0, 0x64 adds r1, r7, 0 muls r1, r0 @@ -394951,15 +394951,15 @@ _080D0DDA: movs r1, 0x5 bl pokemon_getattr cmp r0, 0 - beq _080D0E42 + beq @080D0E42 adds r0, r4, 0 movs r1, 0xC bl pokemon_getattr -_080D0DFC: +@080D0DFC: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq _080D0E42 + beq @080D0E42 adds r0, r4, 0 bl sub_80D1794 adds r6, r0, 0 @@ -394984,7 +394984,7 @@ _080D0DFC: adds r0, r4, 0 movs r1, 0x1 bl sub_80D1740 -_080D0E42: +@080D0E42: pop {r3} mov r8, r3 pop {r4-r7} @@ -394995,7 +394995,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 @@ -395005,7 +395005,7 @@ sub_80D0E50: @ 80D0E50 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x3 - bne _080D0E86 + bne @080D0E86 adds r0, r6, 0 adds r1, r5, 0 bl sub_80D1370 @@ -395020,7 +395020,7 @@ sub_80D0E50: @ 80D0E50 adds r2, r6, 0 adds r3, r5, 0 bl sub_80D1604 -_080D0E86: +@080D0E86: pop {r4-r6} pop {r0} bx r0 @@ -395029,7 +395029,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 @@ -395041,7 +395041,7 @@ sub_80D0E90: @ 80D0E90 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x3 - bne _080D0F20 + bne @080D0F20 adds r0, r6, 0 adds r1, r5, 0 bl sub_80D1370 @@ -395064,7 +395064,7 @@ sub_80D0E90: @ 80D0E90 movs r2, 0 bl sub_80D140C cmp r6, 0 - bne _080D0EF8 + bne @080D0EF8 adds r0, r5, 0 movs r1, 0xC mov r2, sp @@ -395072,10 +395072,10 @@ sub_80D0E90: @ 80D0E90 adds r0, r5, 0 movs r1, 0x1 bl sub_80CB7AC - b _080D0F10 + b @080D0F10 .align 2, 0 .pool -_080D0EF8: +@080D0EF8: movs r0, 0x64 muls r0, r7 ldr r1, =0x020244ec @@ -395086,7 +395086,7 @@ _080D0EF8: adds r0, r7, 0 movs r1, 0x1 bl sub_80CBBDC -_080D0F10: +@080D0F10: ldr r0, =0x02039d08 ldr r0, [r0] ldr r2, =0x00000ce6 @@ -395095,7 +395095,7 @@ _080D0F10: ldr r2, =0x00002234 adds r0, r2 strh r1, [r0] -_080D0F20: +@080D0F20: add sp, 0x4 pop {r4-r7} pop {r0} @@ -395105,7 +395105,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} @@ -395156,7 +395156,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 @@ -395171,7 +395171,7 @@ sub_80D0FAC: @ 80D0FAC ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x3 - bne _080D106A + bne @080D106A mov r0, r9 adds r1, r7, 0 bl sub_80D1370 @@ -395187,7 +395187,7 @@ sub_80D0FAC: @ 80D0FAC bl sub_80D1604 mov r1, r9 cmp r1, 0 - bne _080D101C + bne @080D101C adds r0, r7, 0 movs r1, 0xC bl get_pokemon_data_from_selected_box @@ -395203,10 +395203,10 @@ sub_80D0FAC: @ 80D0FAC mov r1, r8 ldr r0, [r1] adds r0, r4 - b _080D1048 + b @080D1048 .align 2, 0 .pool -_080D101C: +@080D101C: movs r0, 0x64 adds r4, r7, 0 muls r4, r0 @@ -395227,7 +395227,7 @@ _080D101C: mov r1, r8 ldr r0, [r1] adds r0, r5 -_080D1048: +@080D1048: strh r6, [r0] movs r0, 0x2 movs r1, 0 @@ -395242,7 +395242,7 @@ _080D1048: mov r2, r9 adds r3, r7, 0 bl sub_80D1604 -_080D106A: +@080D106A: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -395254,7 +395254,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} @@ -395267,7 +395267,7 @@ sub_80D1080: @ 80D1080 ldr r0, [r6] ldrb r0, [r0, 0x1] cmp r0, 0x3 - bne _080D1100 + bne @080D1100 movs r0, 0x2 movs r1, 0 bl sub_80D1370 @@ -395283,7 +395283,7 @@ sub_80D1080: @ 80D1080 adds r3, r5, 0 bl sub_80D1604 cmp r7, 0 - bne _080D10E0 + bne @080D10E0 ldr r2, [r6] ldr r0, =0x00002234 adds r2, r0 @@ -395293,10 +395293,10 @@ sub_80D1080: @ 80D1080 adds r0, r5, 0 movs r1, 0 bl sub_80CB7AC - b _080D1100 + b @080D1100 .align 2, 0 .pool -_080D10E0: +@080D10E0: movs r0, 0x64 mov r1, r8 muls r1, r0 @@ -395311,7 +395311,7 @@ _080D10E0: mov r0, r8 movs r1, 0 bl sub_80CBBDC -_080D1100: +@080D1100: pop {r3} mov r8, r3 pop {r4-r7} @@ -395322,7 +395322,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 @@ -395334,7 +395334,7 @@ sub_80D1114: @ 80D1114 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x3 - bne _080D1188 + bne @080D1188 movs r1, 0 mov r0, sp strh r1, [r0] @@ -395353,7 +395353,7 @@ sub_80D1114: @ 80D1114 adds r3, r5, 0 bl sub_80D1604 cmp r6, 0 - bne _080D1170 + bne @080D1170 adds r0, r5, 0 movs r1, 0xC mov r2, sp @@ -395361,10 +395361,10 @@ sub_80D1114: @ 80D1114 adds r0, r5, 0 movs r1, 0x1 bl sub_80CB7AC - b _080D1188 + b @080D1188 .align 2, 0 .pool -_080D1170: +@080D1170: movs r0, 0x64 muls r0, r7 ldr r1, =0x020244ec @@ -395375,7 +395375,7 @@ _080D1170: adds r0, r7, 0 movs r1, 0x1 bl sub_80CBBDC -_080D1188: +@080D1188: add sp, 0x4 pop {r4-r7} pop {r0} @@ -395385,13 +395385,13 @@ _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] ldrb r0, [r0, 0x1] cmp r0, 0x3 - bne _080D11C2 + bne @080D11C2 movs r0, 0x2 movs r1, 0 bl sub_80D1370 @@ -395406,7 +395406,7 @@ sub_80D1194: @ 80D1194 movs r2, 0x2 movs r3, 0 bl sub_80D1604 -_080D11C2: +@080D11C2: pop {r4} pop {r0} bx r0 @@ -395415,15 +395415,15 @@ _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] ldrb r0, [r0, 0x1] cmp r0, 0x3 - bne _080D120A + bne @080D120A movs r4, 0 -_080D11DA: +@080D11DA: ldr r0, =0x02039d08 ldr r1, [r0] lsls r0, r4, 4 @@ -395432,23 +395432,23 @@ _080D11DA: adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080D1204 + beq @080D1204 subs r2, 0x2 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x1 - bne _080D1204 + bne @080D1204 lsls r0, r4, 24 lsrs r0, 24 movs r1, 0x7 movs r2, 0x2 movs r3, 0 bl sub_80D1604 -_080D1204: +@080D1204: adds r4, 0x1 cmp r4, 0x2 - ble _080D11DA -_080D120A: + ble @080D11DA +@080D120A: pop {r4} pop {r0} bx r0 @@ -395457,7 +395457,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 @@ -395465,12 +395465,12 @@ sub_80D1218: @ 80D1218 ldr r1, =0x00002204 adds r4, r0, r1 adds r3, r0, 0 -_080D1226: +@080D1226: ldr r1, =0x00002210 adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0 - beq _080D1268 + beq @080D1268 ldr r2, [r4] adds r0, r2, 0 adds r0, 0x3F @@ -395478,68 +395478,68 @@ _080D1226: movs r0, 0x28 ands r0, r1 cmp r0, 0x8 - beq _080D124E + beq @080D124E ldr r1, [r2, 0x1C] ldr r0, =nullsub_12 + 1 cmp r1, r0 - beq _080D1268 + beq @080D1268 ldr r0, =sub_80D1AD8 + 1 cmp r1, r0 - beq _080D1268 -_080D124E: + beq @080D1268 +@080D124E: movs r0, 0x1 - b _080D1274 + b @080D1274 .align 2, 0 .pool -_080D1268: +@080D1268: adds r4, 0x10 adds r3, 0x10 adds r5, 0x1 cmp r5, 0x2 - ble _080D1226 + ble @080D1226 movs r0, 0 -_080D1274: +@080D1274: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_80D1218 thumb_func_start sub_80D127C -sub_80D127C: @ 80D127C +sub_80D127C: ; 80D127C push {lr} ldr r0, =0x02039d08 ldr r1, [r0] ldrb r0, [r1, 0x1] cmp r0, 0x3 - bne _080D12B0 + bne @080D12B0 movs r2, 0 ldr r0, =0x0000220e adds r1, r0 -_080D128E: +@080D128E: ldrb r0, [r1, 0x2] cmp r0, 0 - beq _080D12A8 + beq @080D12A8 ldrb r0, [r1] cmp r0, 0x2 - bne _080D12A8 + bne @080D12A8 movs r0, 0x1 - b _080D12B2 + b @080D12B2 .align 2, 0 .pool -_080D12A8: +@080D12A8: adds r1, 0x10 adds r2, 0x1 cmp r2, 0x2 - ble _080D128E -_080D12B0: + ble @080D128E +@080D12B0: movs r0, 0 -_080D12B2: +@080D12B2: pop {r1} bx r1 thumb_func_end sub_80D127C thumb_func_start sub_80D12B8 -sub_80D12B8: @ 80D12B8 +sub_80D12B8: ; 80D12B8 push {lr} ldr r0, =0x02039d08 ldr r0, [r0] @@ -395554,7 +395554,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 @@ -395566,40 +395566,40 @@ 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 ldr r3, =0x00002210 movs r4, 0x1 -_080D12F2: +@080D12F2: ldr r0, [r5] lsls r1, r2, 4 adds r0, r1 adds r1, r0, r3 ldrb r0, [r1] cmp r0, 0 - bne _080D1310 + bne @080D1310 strb r4, [r1] adds r0, r2, 0 - b _080D131C + b @080D131C .align 2, 0 .pool -_080D1310: +@080D1310: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x2 - bls _080D12F2 + bls @080D12F2 movs r0, 0x3 -_080D131C: +@080D131C: pop {r4,r5} pop {r1} bx r1 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 @@ -395608,40 +395608,40 @@ sub_80D1324: @ 80D1324 movs r3, 0 ldr r0, =0x02039d08 ldr r2, [r0] -_080D1334: +@080D1334: ldr r5, =0x00002210 adds r0, r2, r5 ldrb r0, [r0] cmp r0, 0 - beq _080D1360 + beq @080D1360 subs r5, 0x2 adds r0, r2, r5 ldrb r0, [r0] cmp r0, r4 - bne _080D1360 + bne @080D1360 adds r5, 0x1 adds r0, r2, r5 ldrb r0, [r0] cmp r0, r1 - bne _080D1360 + bne @080D1360 movs r0, 0x1 - b _080D136A + b @080D136A .align 2, 0 .pool -_080D1360: +@080D1360: adds r2, 0x10 adds r3, 0x1 cmp r3, 0x2 - ble _080D1334 + ble @080D1334 movs r0, 0 -_080D136A: +@080D136A: pop {r4,r5} pop {r1} bx r1 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 @@ -395650,43 +395650,43 @@ sub_80D1370: @ 80D1370 movs r3, 0 ldr r0, =0x02039d08 ldr r1, [r0] -_080D1380: +@080D1380: lsls r0, r3, 4 adds r2, r1, r0 ldr r6, =0x00002210 adds r0, r2, r6 ldrb r0, [r0] cmp r0, 0 - beq _080D13B0 + beq @080D13B0 subs r6, 0x2 adds r0, r2, r6 ldrb r0, [r0] cmp r0, r5 - bne _080D13B0 + bne @080D13B0 adds r6, 0x1 adds r0, r2, r6 ldrb r0, [r0] cmp r0, r4 - bne _080D13B0 + bne @080D13B0 adds r0, r3, 0 - b _080D13BC + b @080D13BC .align 2, 0 .pool -_080D13B0: +@080D13B0: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x2 - bls _080D1380 + bls @080D1380 movs r0, 0x3 -_080D13BC: +@080D13BC: pop {r4-r6} pop {r1} bx r1 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 @@ -395695,36 +395695,36 @@ sub_80D13C4: @ 80D13C4 ldr r0, =0x00002204 adds r4, r3, r0 ldr r6, =0x00002210 -_080D13D4: +@080D13D4: lsls r1, r2, 4 adds r0, r3, r1 adds r0, r6 ldrb r0, [r0] cmp r0, 0 - beq _080D13F8 + beq @080D13F8 adds r0, r4, r1 ldr r0, [r0] cmp r0, r5 - bne _080D13F8 + bne @080D13F8 adds r0, r2, 0 - b _080D1404 + b @080D1404 .align 2, 0 .pool -_080D13F8: +@080D13F8: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x2 - bls _080D13D4 + bls @080D13D4 movs r0, 0x3 -_080D1404: +@080D1404: pop {r4-r6} pop {r1} bx r1 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} @@ -395736,17 +395736,17 @@ sub_80D140C: @ 80D140C lsls r2, 24 lsrs r7, r2, 24 cmp r5, 0x2 - bhi _080D150A + bhi @080D150A cmp r1, 0 - beq _080D1438 + beq @080D1438 cmp r1, 0x1 - beq _080D1494 + beq @080D1494 ldr r4, =0x02039d08 lsls r3, r5, 4 - b _080D14F4 + b @080D14F4 .align 2, 0 .pool -_080D1438: +@080D1438: adds r0, r7, 0 movs r1, 0x6 bl __umodsi3 @@ -395786,12 +395786,12 @@ _080D1438: strb r0, [r2, 0x5] adds r4, r6, 0 adds r3, r5, 0 - b _080D14F4 + b @080D14F4 .align 2, 0 .pool -_080D1494: +@080D1494: cmp r7, 0 - bne _080D14BC + bne @080D14BC ldr r4, =0x02039d08 ldr r0, [r4] lsls r3, r5, 4 @@ -395804,10 +395804,10 @@ _080D1494: ldr r1, [r0] movs r0, 0x4C strh r0, [r1, 0x22] - b _080D14DC + b @080D14DC .align 2, 0 .pool -_080D14BC: +@080D14BC: ldr r4, =0x02039d08 ldr r0, [r4] lsls r3, r5, 4 @@ -395824,7 +395824,7 @@ _080D14BC: lsls r0, 3 adds r0, 0x1C strh r0, [r2, 0x22] -_080D14DC: +@080D14DC: ldr r0, [r4] ldr r1, =0x00002204 adds r0, r1 @@ -395837,7 +395837,7 @@ _080D14DC: movs r1, 0x4 orrs r0, r1 strb r0, [r2, 0x5] -_080D14F4: +@080D14F4: ldr r0, [r4] adds r0, r3 ldr r1, =0x0000220e @@ -395849,7 +395849,7 @@ _080D14F4: ldr r1, =0x0000220f adds r0, r1 strb r7, [r0] -_080D150A: +@080D150A: pop {r3} mov r8, r3 pop {r4-r7} @@ -395860,7 +395860,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 @@ -395871,7 +395871,7 @@ sub_80D1524: @ 80D1524 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x2 - bhi _080D15AC + bhi @080D15AC movs r0, 0 str r0, [sp] ldr r4, =0x02039d08 @@ -395890,7 +395890,7 @@ sub_80D1524: @ 80D1524 mov r8, r7 adds r7, r4, 0 movs r4, 0x2 -_080D1562: +@080D1562: ldr r1, [r7] adds r0, r1, r5 adds r1, r6 @@ -395900,7 +395900,7 @@ _080D1562: adds r5, 0x60 subs r4, 0x1 cmp r4, 0 - bge _080D1562 + bge @080D1562 ldr r5, =0x02039d08 ldr r1, [r5] ldr r4, =0x000042c4 @@ -395924,7 +395924,7 @@ _080D1562: adds r0, r4, 0 movs r2, 0x20 bl gpu_pal_apply -_080D15AC: +@080D15AC: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -395937,14 +395937,14 @@ _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 lsls r1, 24 lsrs r3, r1, 24 cmp r2, 0x2 - bhi _080D15F6 + bhi @080D15F6 ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r2, 4 @@ -395954,7 +395954,7 @@ sub_80D15D4: @ 80D15D4 ldr r0, [r0] adds r1, r3, 0 bl sub_8008258 -_080D15F6: +@080D15F6: pop {r0} bx r0 .align 2, 0 @@ -395962,7 +395962,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 @@ -395973,31 +395973,31 @@ sub_80D1604: @ 80D1604 lsls r3, 24 lsrs r3, 24 cmp r4, 0x2 - bls _080D161C - b _080D172E -_080D161C: + bls @080D161C + b @080D172E +@080D161C: cmp r0, 0x7 - bls _080D1622 - b _080D172E -_080D1622: + bls @080D1622 + b @080D172E +@080D1622: lsls r0, 2 - ldr r1, =_080D1630 + ldr r1, =@080D1630 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080D1630: - .4byte _080D1650 - .4byte _080D1674 - .4byte _080D1698 - .4byte _080D16C4 - .4byte _080D16F0 - .4byte _080D172E - .4byte _080D172E - .4byte _080D171C -_080D1650: +@080D1630: + .4byte @080D1650 + .4byte @080D1674 + .4byte @080D1698 + .4byte @080D16C4 + .4byte @080D16F0 + .4byte @080D172E + .4byte @080D172E + .4byte @080D171C +@080D1650: ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r4, 4 @@ -396008,10 +396008,10 @@ _080D1650: strh r4, [r1, 0x2E] ldr r1, [r0] ldr r0, =sub_80D1A48 + 1 - b _080D172C + b @080D172C .align 2, 0 .pool -_080D1674: +@080D1674: ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r4, 4 @@ -396023,10 +396023,10 @@ _080D1674: strh r1, [r2, 0x2E] ldr r1, [r0] ldr r0, =sub_80D1A74 + 1 - b _080D172C + b @080D172C .align 2, 0 .pool -_080D1698: +@080D1698: ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r4, 4 @@ -396042,10 +396042,10 @@ _080D1698: strh r3, [r1, 0x3C] ldr r1, [r0] ldr r0, =sub_80D1B14 + 1 - b _080D172C + b @080D172C .align 2, 0 .pool -_080D16C4: +@080D16C4: ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r4, 4 @@ -396061,10 +396061,10 @@ _080D16C4: strh r5, [r2, 0x3A] ldr r0, [r0] strh r3, [r0, 0x3C] - b _080D172E + b @080D172E .align 2, 0 .pool -_080D16F0: +@080D16F0: ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r4, 4 @@ -396080,10 +396080,10 @@ _080D16F0: strh r3, [r1, 0x3C] ldr r1, [r0] ldr r0, =sub_80D1C30 + 1 - b _080D172C + b @080D172C .align 2, 0 .pool -_080D171C: +@080D171C: ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r4, 4 @@ -396092,9 +396092,9 @@ _080D171C: adds r0, r1 ldr r1, [r0] ldr r0, =sub_80D1CCC + 1 -_080D172C: +@080D172C: str r0, [r1, 0x1C] -_080D172E: +@080D172E: pop {r4,r5} pop {r0} bx r0 @@ -396103,14 +396103,14 @@ _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 lsls r1, 24 lsrs r4, r1, 24 cmp r2, 0x2 - bhi _080D1780 + bhi @080D1780 ldr r1, =0x02039d08 ldr r0, [r1] lsls r2, 4 @@ -396125,9 +396125,9 @@ sub_80D1740: @ 80D1740 ldr r0, [r0] movs r3, 0 cmp r4, 0 - bne _080D176E + bne @080D176E movs r3, 0x1 -_080D176E: +@080D176E: adds r2, r0, 0 adds r2, 0x3E lsls r3, 2 @@ -396137,7 +396137,7 @@ _080D176E: ands r0, r1 orrs r0, r3 strb r0, [r2] -_080D1780: +@080D1780: pop {r4} pop {r0} bx r0 @@ -396146,7 +396146,7 @@ _080D1780: thumb_func_end sub_80D1740 thumb_func_start sub_80D1794 -sub_80D1794: @ 80D1794 +sub_80D1794: ; 80D1794 push {lr} lsls r0, 16 lsrs r0, 16 @@ -396157,7 +396157,7 @@ sub_80D1794: @ 80D1794 thumb_func_end sub_80D1794 thumb_func_start sub_80D17A4 -sub_80D17A4: @ 80D17A4 +sub_80D17A4: ; 80D17A4 push {lr} lsls r0, 16 lsrs r0, 16 @@ -396168,24 +396168,24 @@ sub_80D17A4: @ 80D17A4 thumb_func_end sub_80D17A4 thumb_func_start sub_80D17B4 -sub_80D17B4: @ 80D17B4 +sub_80D17B4: ; 80D17B4 push {r4,lr} sub sp, 0x14 bl sub_80D127C lsls r0, 24 cmp r0, 0 - beq _080D17D4 + beq @080D17D4 ldr r0, =0x02039d08 ldr r0, [r0] ldr r1, =0x00002234 - b _080D17DA + b @080D17DA .align 2, 0 .pool -_080D17D4: +@080D17D4: ldr r0, =0x02039d08 ldr r0, [r0] ldr r1, =0x00000ce6 -_080D17DA: +@080D17DA: adds r0, r1 ldrh r0, [r0] bl itemid_get_description @@ -396214,7 +396214,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] @@ -396237,7 +396237,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 @@ -396246,12 +396246,12 @@ sub_80D184C: @ 80D184C adds r1, r0, r2 ldrh r0, [r1] cmp r0, 0 - bne _080D186C + bne @080D186C movs r0, 0 - b _080D18D2 + b @080D18D2 .align 2, 0 .pool -_080D186C: +@080D186C: subs r0, 0x1 strh r0, [r1] ldrh r1, [r1] @@ -396259,8 +396259,8 @@ _080D186C: subs r5, r0, r1 movs r4, 0 cmp r4, r5 - bge _080D18BC -_080D187C: + bge @080D18BC +@080D187C: movs r0, 0 movs r1, 0xA bl bg_get_field @@ -396290,8 +396290,8 @@ _080D187C: bl bg_write_sequence_to_wram_tile_map_rect adds r4, 0x1 cmp r4, r5 - blt _080D187C -_080D18BC: + blt @080D187C +@080D18BC: adds r0, r5, 0 bl sub_80D19B4 ldr r0, =0x02039d08 @@ -396302,7 +396302,7 @@ _080D18BC: negs r0, r1 orrs r0, r1 lsrs r0, 31 -_080D18D2: +@080D18D2: add sp, 0x10 pop {r4,r5} pop {r1} @@ -396312,7 +396312,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 @@ -396321,14 +396321,14 @@ sub_80D18E4: @ 80D18E4 adds r0, r4 ldrh r0, [r0] cmp r0, 0x16 - bne _080D1904 + bne @080D1904 movs r0, 0 - b _080D19A4 + b @080D19A4 .align 2, 0 .pool -_080D1904: +@080D1904: cmp r0, 0 - bne _080D1920 + bne @080D1920 movs r0, 0x1 str r0, [sp] movs r0, 0x9 @@ -396340,7 +396340,7 @@ _080D1904: movs r2, 0x15 movs r3, 0xC bl Bg_FillWramTileMapRectWithTileAndPalette -_080D1920: +@080D1920: ldr r1, [r5] adds r1, r4 ldrh r0, [r1] @@ -396351,8 +396351,8 @@ _080D1920: subs r5, r0, r1 movs r4, 0 cmp r4, r5 - bge _080D1976 -_080D1936: + bge @080D1976 +@080D1936: movs r0, 0 movs r1, 0xA bl bg_get_field @@ -396382,13 +396382,13 @@ _080D1936: bl bg_write_sequence_to_wram_tile_map_rect adds r4, 0x1 cmp r4, r5 - blt _080D1936 -_080D1976: + blt @080D1936 +@080D1976: cmp r5, 0 - blt _080D1980 + blt @080D1980 adds r0, r5, 0 bl sub_80D19B4 -_080D1980: +@080D1980: adds r2, r5, 0x1 lsls r2, 24 lsrs r2, 24 @@ -396405,7 +396405,7 @@ _080D1980: movs r0, 0 bl schedule_bg_copy_tilemap_to_vram movs r0, 0x1 -_080D19A4: +@080D19A4: add sp, 0x10 pop {r4,r5} pop {r1} @@ -396415,12 +396415,12 @@ _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 cmp r7, 0 - beq _080D19EC + beq @080D19EC movs r1, 0x9D lsls r1, 1 lsls r4, r7, 24 @@ -396442,7 +396442,7 @@ sub_80D19B4: @ 80D19B4 movs r2, 0 movs r3, 0x14 bl Bg_FillWramTileMapRectWithTileAndPalette -_080D19EC: +@080D19EC: ldr r1, =0x0000013b lsls r5, r7, 24 lsrs r5, 24 @@ -396484,7 +396484,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 @@ -396492,7 +396492,7 @@ sub_80D1A48: @ 80D1A48 movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080D1A68 + beq @080D1A68 ldrh r0, [r4, 0x2E] lsls r0, 24 lsrs r0, 24 @@ -396500,7 +396500,7 @@ sub_80D1A48: @ 80D1A48 bl sub_80D1740 ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] -_080D1A68: +@080D1A68: pop {r4} pop {r0} bx r0 @@ -396509,17 +396509,17 @@ _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 ldrsh r1, [r3, r0] cmp r1, 0 - beq _080D1A86 + beq @080D1A86 cmp r1, 0x1 - beq _080D1AA2 - b _080D1AD0 -_080D1A86: + beq @080D1AA2 + b @080D1AD0 +@080D1A86: ldrh r0, [r3, 0x20] lsls r0, 4 strh r0, [r3, 0x30] @@ -396534,7 +396534,7 @@ _080D1A86: ldrh r0, [r3, 0x2E] adds r0, 0x1 strh r0, [r3, 0x2E] -_080D1AA2: +@080D1AA2: ldrh r1, [r3, 0x30] ldrh r0, [r3, 0x34] subs r1, r0 @@ -396555,10 +396555,10 @@ _080D1AA2: lsls r0, 16 asrs r0, 16 cmp r0, 0xB - ble _080D1AD0 + ble @080D1AD0 ldr r0, =sub_80D1AD8 + 1 str r0, [r3, 0x1C] -_080D1AD0: +@080D1AD0: pop {r0} bx r0 .align 2, 0 @@ -396566,7 +396566,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 @@ -396597,17 +396597,17 @@ 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 ldrsh r1, [r4, r0] cmp r1, 0 - beq _080D1B26 + beq @080D1B26 cmp r1, 0x1 - beq _080D1B42 - b _080D1B8A -_080D1B26: + beq @080D1B42 + b @080D1B8A +@080D1B26: ldrh r0, [r4, 0x20] lsls r0, 4 strh r0, [r4, 0x30] @@ -396622,7 +396622,7 @@ _080D1B26: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] -_080D1B42: +@080D1B42: ldrh r0, [r4, 0x34] ldrh r1, [r4, 0x30] adds r0, r1 @@ -396643,7 +396643,7 @@ _080D1B42: lsls r0, 16 asrs r0, 16 cmp r0, 0xB - ble _080D1B8A + ble @080D1B8A adds r0, r4, 0 bl sub_80D13C4 lsls r0, 24 @@ -396657,7 +396657,7 @@ _080D1B42: bl sub_80D140C ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] -_080D1B8A: +@080D1B8A: pop {r4} pop {r0} bx r0 @@ -396666,17 +396666,17 @@ _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 ldrsh r1, [r4, r0] cmp r1, 0 - beq _080D1BA6 + beq @080D1BA6 cmp r1, 0x1 - beq _080D1BC2 - b _080D1C20 -_080D1BA6: + beq @080D1BC2 + b @080D1C20 +@080D1BA6: ldrh r0, [r4, 0x20] lsls r0, 4 strh r0, [r4, 0x30] @@ -396691,7 +396691,7 @@ _080D1BA6: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] -_080D1BC2: +@080D1BC2: ldrh r1, [r4, 0x30] ldrh r0, [r4, 0x34] subs r1, r0 @@ -396721,7 +396721,7 @@ _080D1BC2: lsls r0, 16 asrs r0, 16 cmp r0, 0xB - ble _080D1C20 + ble @080D1C20 adds r0, r4, 0 bl sub_80D13C4 lsls r0, 24 @@ -396737,7 +396737,7 @@ _080D1BC2: strh r0, [r4, 0x24] ldr r0, =sub_80D1AD8 + 1 str r0, [r4, 0x1C] -_080D1C20: +@080D1C20: pop {r4} pop {r0} bx r0 @@ -396746,17 +396746,17 @@ _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 ldrsh r1, [r4, r0] cmp r1, 0 - beq _080D1C42 + beq @080D1C42 cmp r1, 0x1 - beq _080D1C5E - b _080D1CBE -_080D1C42: + beq @080D1C5E + b @080D1CBE +@080D1C42: ldrh r0, [r4, 0x20] lsls r0, 4 strh r0, [r4, 0x30] @@ -396771,7 +396771,7 @@ _080D1C42: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] -_080D1C5E: +@080D1C5E: ldrh r0, [r4, 0x34] ldrh r1, [r4, 0x30] adds r0, r1 @@ -396802,7 +396802,7 @@ _080D1C5E: lsls r0, 16 asrs r0, 16 cmp r0, 0xB - ble _080D1CBE + ble @080D1CBE adds r0, r4, 0 bl sub_80D13C4 lsls r0, 24 @@ -396818,7 +396818,7 @@ _080D1C5E: str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] -_080D1CBE: +@080D1CBE: pop {r4} pop {r0} bx r0 @@ -396827,7 +396827,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] @@ -396841,7 +396841,7 @@ sub_80D1CCC: @ 80D1CCC movs r1, 0x10 negs r1, r1 cmp r0, r1 - bge _080D1CFC + bge @080D1CFC ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] adds r0, r2, 0 @@ -396850,7 +396850,7 @@ sub_80D1CCC: @ 80D1CCC lsrs r0, 24 movs r1, 0 bl sub_80D1740 -_080D1CFC: +@080D1CFC: pop {r0} bx r0 .align 2, 0 @@ -396858,18 +396858,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] @@ -396879,16 +396879,16 @@ 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 cmp r1, 0xD - bhi _080D1D28 + bhi @080D1D28 ldr r0, =0x03005d94 ldr r0, [r0] strb r1, [r0] -_080D1D28: +@080D1D28: pop {r0} bx r0 .align 2, 0 @@ -396896,7 +396896,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 @@ -396904,9 +396904,9 @@ get_pokemon_data_from_any_box: @ 80D1D30 lsls r1, 24 lsrs r4, r1, 24 cmp r3, 0xD - bhi _080D1D6C + bhi @080D1D6C cmp r4, 0x1D - bhi _080D1D6C + bhi @080D1D6C ldr r2, =0x03005d94 lsls r0, r3, 2 adds r0, r3 @@ -396922,19 +396922,19 @@ get_pokemon_data_from_any_box: @ 80D1D30 adds r0, r1 adds r1, r5, 0 bl pokemon_getattr_encrypted - b _080D1D6E + b @080D1D6E .align 2, 0 .pool -_080D1D6C: +@080D1D6C: movs r0, 0 -_080D1D6E: +@080D1D6E: pop {r4,r5} pop {r1} bx r1 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 @@ -396943,9 +396943,9 @@ set_pokemon_data_from_any_box: @ 80D1D74 lsls r1, 24 lsrs r4, r1, 24 cmp r3, 0xD - bhi _080D1DAC + bhi @080D1DAC cmp r4, 0x1D - bhi _080D1DAC + bhi @080D1DAC ldr r2, =0x03005d94 lsls r0, r3, 2 adds r0, r3 @@ -396962,7 +396962,7 @@ set_pokemon_data_from_any_box: @ 80D1D74 adds r1, r5, 0 adds r2, r6, 0 bl pokemon_setattr_encrypted -_080D1DAC: +@080D1DAC: pop {r4-r6} pop {r0} bx r0 @@ -396971,7 +396971,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 @@ -396989,7 +396989,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 @@ -397010,7 +397010,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 @@ -397018,9 +397018,9 @@ sub_80D1DFC: @ 80D1DFC lsls r1, 24 lsrs r4, r1, 24 cmp r3, 0xD - bhi _080D1E38 + bhi @080D1E38 cmp r4, 0x1D - bhi _080D1E38 + bhi @080D1E38 ldr r2, =0x03005d94 lsls r0, r3, 2 adds r0, r3 @@ -397037,29 +397037,29 @@ sub_80D1DFC: @ 80D1DFC movs r1, 0x2 adds r2, r5, 0 bl pokemon_getattr_encrypted - b _080D1E3C + b @080D1E3C .align 2, 0 .pool -_080D1E38: +@080D1E38: movs r0, 0xFF strb r0, [r5] -_080D1E3C: +@080D1E3C: pop {r4,r5} pop {r0} bx r0 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 lsls r1, 24 lsrs r2, r1, 24 cmp r0, 0xD - bhi _080D1E84 + bhi @080D1E84 cmp r2, 0x1D - bhi _080D1E84 + bhi @080D1E84 ldr r6, =0x03005d94 lsls r1, r0, 2 adds r1, r0 @@ -397076,12 +397076,12 @@ sub_80D1E44: @ 80D1E44 movs r1, 0x5 bl pokemon_getattr_encrypted cmp r0, 0 - beq _080D1E84 + beq @080D1E84 ldr r0, [r6] adds r0, r5 adds r0, r4 bl sub_80690C0 -_080D1E84: +@080D1E84: movs r0, 0 pop {r4-r6} pop {r1} @@ -397091,7 +397091,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 @@ -397099,9 +397099,9 @@ sub_80D1E90: @ 80D1E90 lsls r1, 24 lsrs r4, r1, 24 cmp r3, 0xD - bhi _080D1EC6 + bhi @080D1EC6 cmp r4, 0x1D - bhi _080D1EC6 + bhi @080D1EC6 ldr r2, =0x03005d94 lsls r0, r3, 2 adds r0, r3 @@ -397118,7 +397118,7 @@ sub_80D1E90: @ 80D1E90 movs r1, 0x2 adds r2, r5, 0 bl pokemon_setattr_encrypted -_080D1EC6: +@080D1EC6: pop {r4,r5} pop {r0} bx r0 @@ -397127,7 +397127,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 @@ -397136,9 +397136,9 @@ sub_80D1ED0: @ 80D1ED0 lsls r1, 24 lsrs r4, r1, 24 cmp r3, 0xD - bhi _080D1F10 + bhi @080D1F10 cmp r4, 0x1D - bhi _080D1F10 + bhi @080D1F10 ldr r2, =0x03005d94 lsls r0, r3, 2 adds r0, r3 @@ -397155,19 +397155,19 @@ sub_80D1ED0: @ 80D1ED0 adds r1, r5, 0 adds r2, r6, 0 bl pokemon_getattr_encrypted - b _080D1F12 + b @080D1F12 .align 2, 0 .pool -_080D1F10: +@080D1F10: movs r0, 0 -_080D1F12: +@080D1F12: pop {r4-r6} pop {r1} bx r1 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 @@ -397175,9 +397175,9 @@ sub_80D1F18: @ 80D1F18 lsls r1, 24 lsrs r1, 24 cmp r4, 0xD - bhi _080D1F4E + bhi @080D1F4E cmp r1, 0x1D - bhi _080D1F4E + bhi @080D1F4E ldr r0, =0x03005d94 ldr r0, [r0] lsls r3, r1, 2 @@ -397194,7 +397194,7 @@ sub_80D1F18: @ 80D1F18 adds r1, r5, 0 movs r2, 0x50 bl memcpy -_080D1F4E: +@080D1F4E: pop {r4,r5} pop {r0} bx r0 @@ -397203,7 +397203,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 @@ -397211,9 +397211,9 @@ sub_80D1F58: @ 80D1F58 lsls r1, 24 lsrs r2, r1, 24 cmp r4, 0xD - bhi _080D1F8E + bhi @080D1F8E cmp r2, 0x1D - bhi _080D1F8E + bhi @080D1F8E ldr r0, =0x03005d94 ldr r1, [r0] lsls r3, r2, 2 @@ -397230,7 +397230,7 @@ sub_80D1F58: @ 80D1F58 adds r0, r5, 0 movs r2, 0x50 bl memcpy -_080D1F8E: +@080D1F8E: pop {r4,r5} pop {r0} bx r0 @@ -397239,7 +397239,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 @@ -397267,9 +397267,9 @@ sub_80D1F98: @ 80D1F98 lsls r0, 24 lsrs r3, r0, 24 cmp r7, 0xD - bhi _080D2004 + bhi @080D2004 cmp r6, 0x1D - bhi _080D2004 + bhi @080D2004 ldr r2, =0x03005d94 lsls r0, r7, 2 adds r0, r7 @@ -397293,7 +397293,7 @@ sub_80D1F98: @ 80D1F98 mov r2, r8 adds r3, r4, 0 bl create_pokemon -_080D2004: +@080D2004: add sp, 0x14 pop {r3,r4} mov r8, r3 @@ -397306,16 +397306,16 @@ _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 lsls r1, 24 lsrs r4, r1, 24 cmp r3, 0xD - bhi _080D2048 + bhi @080D2048 cmp r4, 0x1D - bhi _080D2048 + bhi @080D2048 ldr r2, =0x03005d94 lsls r0, r3, 2 adds r0, r3 @@ -397330,7 +397330,7 @@ sub_80D2018: @ 80D2018 lsls r1, 4 adds r0, r1 bl zero_pokemon_boxed_data -_080D2048: +@080D2048: pop {r4} pop {r0} bx r0 @@ -397339,7 +397339,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 @@ -397347,9 +397347,9 @@ sub_80D2054: @ 80D2054 lsls r1, 24 lsrs r4, r1, 24 cmp r3, 0xD - bhi _080D2088 + bhi @080D2088 cmp r4, 0x1D - bhi _080D2088 + bhi @080D2088 ldr r2, =0x03005d94 lsls r0, r3, 2 adds r0, r3 @@ -397365,7 +397365,7 @@ sub_80D2054: @ 80D2054 adds r0, r1 adds r1, r5, 0 bl sub_8069004 -_080D2088: +@080D2088: pop {r4,r5} pop {r0} bx r0 @@ -397374,17 +397374,17 @@ _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 lsls r1, 24 lsrs r4, r1, 24 cmp r3, 0xD - bhi _080D20C8 + bhi @080D20C8 cmp r4, 0x1D - bhi _080D20C8 + bhi @080D20C8 ldr r2, =0x03005d94 lsls r0, r3, 2 adds r0, r3 @@ -397398,27 +397398,27 @@ get_pokemon_by_box_and_pos: @ 80D2094 adds r1, r4 lsls r1, 4 adds r0, r1 - b _080D20CA + b @080D20CA .align 2, 0 .pool -_080D20C8: +@080D20C8: movs r0, 0 -_080D20CA: +@080D20CA: pop {r4} pop {r1} bx r1 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 cmp r2, 0xD - bls _080D20DE + bls @080D20DE movs r0, 0 - b _080D20EC -_080D20DE: + b @080D20EC +@080D20DE: ldr r0, =0x03005d94 lsls r1, r2, 3 adds r1, r2 @@ -397426,7 +397426,7 @@ _080D20DE: adds r1, r2 ldr r0, [r0] adds r0, r1 -_080D20EC: +@080D20EC: pop {r1} bx r1 .align 2, 0 @@ -397434,22 +397434,22 @@ _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 cmp r1, 0xD - bls _080D2106 + bls @080D2106 movs r0, 0 - b _080D2112 -_080D2106: + b @080D2112 +@080D2106: ldr r0, =0x03005d94 ldr r0, [r0] ldr r2, =0x000083c2 adds r0, r2 adds r0, r1 ldrb r0, [r0] -_080D2112: +@080D2112: pop {r1} bx r1 .align 2, 0 @@ -397457,23 +397457,23 @@ _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 lsls r1, 24 lsrs r1, 24 cmp r2, 0xD - bhi _080D213E + bhi @080D213E cmp r1, 0x10 - bhi _080D213E + bhi @080D213E ldr r0, =0x03005d94 ldr r0, [r0] ldr r3, =0x000083c2 adds r0, r3 adds r0, r2 strb r1, [r0] -_080D213E: +@080D213E: pop {r0} bx r0 .align 2, 0 @@ -397481,7 +397481,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} @@ -397495,14 +397495,14 @@ sub_80D214C: @ 80D214C adds r4, r3, 0 ldr r2, =0x0000ffff cmp r3, 0x1 - bhi _080D216E + bhi @080D216E movs r2, 0x1 cmp r3, 0x1 - beq _080D2172 -_080D216E: + beq @080D2172 +@080D216E: cmp r4, 0x3 - bne _080D21BC -_080D2172: + bne @080D21BC +@080D2172: lsls r0, 24 asrs r0, 24 lsls r2, 16 @@ -397512,10 +397512,10 @@ _080D2172: asrs r1, r0, 16 adds r6, r2, 0 cmp r1, 0 - blt _080D2208 + blt @080D2208 cmp r1, r7 - bgt _080D2208 -_080D218A: + bgt @080D2208 +@080D218A: asrs r4, r0, 16 lsls r0, r4, 2 adds r0, r4 @@ -397524,25 +397524,25 @@ _080D218A: movs r1, 0xB bl pokemon_getattr_encrypted cmp r0, 0 - bne _080D21B4 + bne @080D21B4 asrs r0, r6, 16 adds r0, r4, r0 lsls r0, 16 asrs r2, r0, 16 cmp r2, 0 - blt _080D2208 + blt @080D2208 cmp r2, r7 - ble _080D218A - b _080D2208 + ble @080D218A + b @080D2208 .align 2, 0 .pool -_080D21B4: +@080D21B4: adds r0, r4, 0 - b _080D220C -_080D21B8: + b @080D220C +@080D21B8: adds r0, r5, 0 - b _080D220C -_080D21BC: + b @080D220C +@080D21BC: lsls r0, 24 asrs r0, 24 lsls r2, 16 @@ -397552,10 +397552,10 @@ _080D21BC: asrs r1, r0, 16 adds r6, r2, 0 cmp r1, 0 - blt _080D2208 + blt @080D2208 cmp r1, r7 - bgt _080D2208 -_080D21D4: + bgt @080D2208 +@080D21D4: asrs r5, r0, 16 lsls r0, r5, 2 adds r0, r5 @@ -397566,25 +397566,25 @@ _080D21D4: movs r1, 0xB bl pokemon_getattr_encrypted cmp r0, 0 - beq _080D21F8 + beq @080D21F8 adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr_encrypted cmp r0, 0 - beq _080D21B8 -_080D21F8: + beq @080D21B8 +@080D21F8: asrs r0, r6, 16 adds r0, r5, r0 lsls r0, 16 asrs r2, r0, 16 cmp r2, 0 - blt _080D2208 + blt @080D2208 cmp r2, r7 - ble _080D21D4 -_080D2208: + ble @080D21D4 +@080D2208: movs r0, 0x1 negs r0, r0 -_080D220C: +@080D220C: pop {r3} mov r8, r3 pop {r4-r7} @@ -397593,7 +397593,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} @@ -397602,11 +397602,11 @@ sub_80D2218: @ 80D2218 ldr r0, =0x03005d94 mov r8, r0 movs r7, 0x4 -_080D2228: +@080D2228: movs r5, 0 adds r6, r7, 0 movs r4, 0 -_080D222E: +@080D222E: mov r1, r8 ldr r0, [r1] adds r0, r6 @@ -397616,24 +397616,24 @@ _080D222E: bl pokemon_getattr_encrypted ldr r2, [sp] cmp r0, 0 - bne _080D224C + bne @080D224C movs r0, 0x1 - b _080D2262 + b @080D2262 .align 2, 0 .pool -_080D224C: +@080D224C: adds r4, 0x50 adds r5, 0x1 cmp r5, 0x1D - ble _080D222E + ble @080D222E movs r0, 0x96 lsls r0, 4 adds r7, r0 adds r2, 0x1 cmp r2, 0xD - ble _080D2228 + ble @080D2228 movs r0, 0 -_080D2262: +@080D2262: add sp, 0x4 pop {r3} mov r8, r3 @@ -397643,13 +397643,13 @@ _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 - bhi _080D22C8 + bhi @080D22C8 cmp r2, 0x1D - bhi _080D22C8 + bhi @080D22C8 ldr r6, =0x03005d94 lsls r1, r0, 2 adds r1, r0 @@ -397666,35 +397666,35 @@ sub_80D2270: @ 80D2270 movs r1, 0x5 bl pokemon_getattr_encrypted cmp r0, 0 - beq _080D22C8 + beq @080D22C8 ldr r0, [r6] adds r0, r5 adds r0, r4 movs r1, 0x6 bl pokemon_getattr_encrypted cmp r0, 0 - bne _080D22C8 + bne @080D22C8 ldr r0, [r6] adds r0, r5 adds r0, r4 movs r1, 0x4 bl pokemon_getattr_encrypted cmp r0, 0 - bne _080D22C8 + bne @080D22C8 movs r0, 0x1 - b _080D22CA + b @080D22CA .align 2, 0 .pool -_080D22C8: +@080D22C8: movs r0, 0 -_080D22CA: +@080D22CA: pop {r4-r6} pop {r1} bx r1 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 @@ -397703,7 +397703,7 @@ sub_80D22D0: @ 80D22D0 movs r0, 0 ldr r1, =0x03005d94 mov r9, r1 -_080D22E0: +@080D22E0: lsls r1, r0, 2 adds r2, r0, 0x1 mov r8, r2 @@ -397714,7 +397714,7 @@ _080D22E0: lsls r0, 5 adds r4, r0, 0x4 movs r6, 0x1D -_080D22F4: +@080D22F4: mov r1, r9 ldr r0, [r1] adds r0, r4 @@ -397722,7 +397722,7 @@ _080D22F4: movs r1, 0x5 bl pokemon_getattr_encrypted cmp r0, 0 - beq _080D231A + beq @080D231A mov r2, r9 ldr r0, [r2] adds r0, r4 @@ -397730,16 +397730,16 @@ _080D22F4: movs r1, 0x6 bl pokemon_getattr_encrypted cmp r0, 0 - bne _080D231A + bne @080D231A adds r7, 0x1 -_080D231A: +@080D231A: adds r5, 0x50 subs r6, 0x1 cmp r6, 0 - bge _080D22F4 + bge @080D22F4 mov r0, r8 cmp r0, 0xD - ble _080D22E0 + ble @080D22E0 adds r0, r7, 0 pop {r3,r4} mov r8, r3 @@ -397752,7 +397752,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 @@ -397761,7 +397761,7 @@ sub_80D233C: @ 80D233C movs r0, 0 ldr r1, =0x03005d94 mov r9, r1 -_080D234C: +@080D234C: lsls r1, r0, 2 adds r2, r0, 0x1 mov r8, r2 @@ -397772,7 +397772,7 @@ _080D234C: lsls r0, 5 adds r4, r0, 0x4 movs r6, 0x1D -_080D2360: +@080D2360: mov r1, r9 ldr r0, [r1] adds r0, r4 @@ -397780,7 +397780,7 @@ _080D2360: movs r1, 0x5 bl pokemon_getattr_encrypted cmp r0, 0 - bne _080D2384 + bne @080D2384 mov r2, r9 ldr r0, [r2] adds r0, r4 @@ -397788,17 +397788,17 @@ _080D2360: movs r1, 0x6 bl pokemon_getattr_encrypted cmp r0, 0 - beq _080D2386 -_080D2384: + beq @080D2386 +@080D2384: adds r7, 0x1 -_080D2386: +@080D2386: adds r5, 0x50 subs r6, 0x1 cmp r6, 0 - bge _080D2360 + bge @080D2360 mov r0, r8 cmp r0, 0xD - ble _080D234C + ble @080D234C adds r0, r7, 0 pop {r3,r4} mov r8, r3 @@ -397811,7 +397811,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} @@ -397824,24 +397824,24 @@ sub_80D23A8: @ 80D23A8 mov r8, r0 ldr r7, =0x03005d94 movs r5, 0x4 -_080D23C0: +@080D23C0: movs r6, 0 movs r4, 0 -_080D23C4: +@080D23C4: ldr r0, [r7] adds r0, r5 adds r0, r4 movs r1, 0x5 bl pokemon_getattr_encrypted cmp r0, 0 - beq _080D2404 + beq @080D2404 ldr r0, [r7] adds r0, r5 adds r0, r4 movs r1, 0x6 bl pokemon_getattr_encrypted cmp r0, 0 - bne _080D2404 + bne @080D2404 ldr r0, [r7] adds r0, r5 adds r0, r4 @@ -397849,16 +397849,16 @@ _080D23C4: mov r2, sp bl pokemon_getattr_encrypted cmp r0, 0 - beq _080D2404 + beq @080D2404 movs r0, 0x1 - b _080D241E + b @080D241E .align 2, 0 .pool -_080D2404: +@080D2404: adds r4, 0x50 adds r6, 0x1 cmp r6, 0x1D - ble _080D23C4 + ble @080D23C4 movs r0, 0x96 lsls r0, 4 adds r5, r0 @@ -397866,9 +397866,9 @@ _080D2404: add r8, r0 mov r0, r8 cmp r0, 0xD - ble _080D23C0 + ble @080D23C0 movs r0, 0 -_080D241E: +@080D241E: add sp, 0x4 pop {r3} mov r8, r3 @@ -397878,7 +397878,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 @@ -397912,7 +397912,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 @@ -397924,7 +397924,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 @@ -397936,7 +397936,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 @@ -397948,18 +397948,18 @@ 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 cmp r1, 0xF - bhi _080D24D0 + bhi @080D24D0 ldr r0, =0x03005d8c ldr r0, [r0] ldr r2, =0x00003d85 adds r0, r2 strb r1, [r0] -_080D24D0: +@080D24D0: pop {r0} bx r0 .align 2, 0 @@ -397967,7 +397967,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 @@ -397979,18 +397979,18 @@ 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 cmp r1, 0x1D - bhi _080D2504 + bhi @080D2504 ldr r0, =0x03005d8c ldr r0, [r0] ldr r2, =0x00003d84 adds r0, r2 strb r1, [r0] -_080D2504: +@080D2504: pop {r0} bx r0 .align 2, 0 @@ -397998,7 +397998,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 @@ -398009,7 +398009,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] @@ -398027,7 +398027,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 @@ -398038,7 +398038,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 @@ -398053,7 +398053,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 @@ -398062,9 +398062,9 @@ sub_80D2578: @ 80D2578 adds r0, r2 ldrb r0, [r0] cmp r0, 0xFF - bne _080D258C + bne @080D258C movs r1, 0x1 -_080D258C: +@080D258C: adds r0, r1, 0 pop {r1} bx r1 @@ -398073,7 +398073,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 @@ -398086,16 +398086,16 @@ sub_80D259C: @ 80D259C ldr r5, =0x02039d88 movs r1, 0 cmp r0, 0 - beq _080D25BA + beq @080D25BA adds r1, r4, 0 -_080D25BA: +@080D25BA: strh r1, [r5] movs r2, 0 cmp r2, r1 - bcs _080D25E2 + bcs @080D25E2 movs r3, 0 adds r4, r5, 0 -_080D25C6: +@080D25C6: ldr r0, [r6] lsls r1, r2, 1 adds r1, r2 @@ -398109,8 +398109,8 @@ _080D25C6: lsrs r2, r0, 16 ldrh r0, [r4] cmp r2, r0 - bcc _080D25C6 -_080D25E2: + bcc @080D25C6 +@080D25E2: pop {r4-r6} pop {r0} bx r0 @@ -398119,7 +398119,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] @@ -398131,33 +398131,33 @@ 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 ldrh r0, [r0] cmp r4, r0 - bge _080D2634 + bge @080D2634 movs r5, 0 -_080D2612: +@080D2612: ldr r0, =0x02039d84 ldr r0, [r0] adds r0, r5, r0 adds r0, 0x2C ldrb r0, [r0] cmp r0, 0x1 - bne _080D2628 + bne @080D2628 lsls r0, r4, 24 lsrs r0, 24 bl sub_80D2918 -_080D2628: +@080D2628: adds r5, 0x30 adds r4, 0x1 ldr r0, =0x02039d88 ldrh r0, [r0] cmp r4, r0 - blt _080D2612 -_080D2634: + blt @080D2612 +@080D2634: pop {r4,r5} pop {r0} bx r0 @@ -398166,7 +398166,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 @@ -398188,7 +398188,7 @@ sub_80D2644: @ 80D2644 ldr r0, =0x02039d88 ldrh r0, [r0] cmp r6, r0 - bcs _080D272C + bcs @080D272C ldr r0, =0x02039d84 mov r9, r0 ldr r0, [r0] @@ -398235,18 +398235,18 @@ sub_80D2644: @ 80D2644 strh r1, [r5, 0x22] mov r2, r8 cmp r0, 0 - beq _080D26E8 + beq @080D26E8 adds r1, r5, 0 adds r1, 0x2A movs r0, 0x1 - b _080D26EE + b @080D26EE .align 2, 0 .pool -_080D26E8: +@080D26E8: adds r1, r5, 0 adds r1, 0x2A movs r0, 0x2 -_080D26EE: +@080D26EE: strb r0, [r1] ldr r4, =0x02039d84 ldr r1, [r4] @@ -398278,7 +398278,7 @@ _080D26EE: adds r2, 0x2C movs r0, 0x1 strb r0, [r2] -_080D272C: +@080D272C: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -398292,7 +398292,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 @@ -398300,7 +398300,7 @@ sub_80D2740: @ 80D2740 ldr r0, =0x02039d88 ldrh r0, [r0] cmp r2, r0 - bcs _080D2764 + bcs @080D2764 ldr r0, =0x02039d84 ldr r1, [r0] lsls r0, r2, 1 @@ -398311,7 +398311,7 @@ sub_80D2740: @ 80D2740 adds r0, 0x2C movs r1, 0x1 strb r1, [r0] -_080D2764: +@080D2764: pop {r0} bx r0 .align 2, 0 @@ -398319,7 +398319,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 @@ -398330,7 +398330,7 @@ sub_80D2770: @ 80D2770 ldr r0, =0x02039d88 ldrh r0, [r0] cmp r3, r0 - bcs _080D279C + bcs @080D279C ldr r0, =0x02039d84 ldr r1, [r0] lsls r0, r3, 1 @@ -398342,7 +398342,7 @@ sub_80D2770: @ 80D2770 adds r0, 0x2C movs r1, 0x1 strb r1, [r0] -_080D279C: +@080D279C: pop {r4} pop {r0} bx r0 @@ -398351,7 +398351,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 @@ -398367,7 +398367,7 @@ sub_80D27AC: @ 80D27AC ldr r0, =0x02039d88 ldrh r0, [r0] cmp r5, r0 - bcs _080D27E6 + bcs @080D27E6 ldr r0, =0x02039d84 ldr r1, [r0] lsls r0, r5, 1 @@ -398381,7 +398381,7 @@ sub_80D27AC: @ 80D27AC adds r0, 0x2C movs r1, 0x1 strb r1, [r0] -_080D27E6: +@080D27E6: pop {r4-r6} pop {r0} bx r0 @@ -398390,7 +398390,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 @@ -398401,31 +398401,31 @@ sub_80D27F4: @ 80D27F4 ldr r0, =0x02039d88 ldrh r0, [r0] cmp r5, r0 - bcc _080D280C - b _080D290E -_080D280C: + bcc @080D280C + b @080D290E +@080D280C: ldr r4, =0x02039d84 lsls r2, r5, 1 cmp r1, 0x5 - bls _080D2816 - b _080D2900 -_080D2816: + bls @080D2816 + b @080D2900 +@080D2816: lsls r0, r1, 2 - ldr r1, =_080D282C + ldr r1, =@080D282C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080D282C: - .4byte _080D2844 - .4byte _080D2864 - .4byte _080D2888 - .4byte _080D28A8 - .4byte _080D28CC - .4byte _080D28E8 -_080D2844: +@080D282C: + .4byte @080D2844 + .4byte @080D2864 + .4byte @080D2888 + .4byte @080D28A8 + .4byte @080D28CC + .4byte @080D28E8 +@080D2844: ldr r4, =0x02039d84 ldr r0, [r4] lsls r3, r5, 1 @@ -398439,10 +398439,10 @@ _080D2844: strh r0, [r1, 0x14] ldrh r0, [r1, 0x10] subs r0, r2 - b _080D287E + b @080D287E .align 2, 0 .pool -_080D2864: +@080D2864: ldr r4, =0x02039d84 ldr r0, [r4] lsls r3, r5, 1 @@ -398456,13 +398456,13 @@ _080D2864: strh r0, [r1, 0xC] ldrh r0, [r1, 0x10] adds r0, r2 -_080D287E: +@080D287E: strh r0, [r1, 0x10] adds r2, r3, 0 - b _080D2900 + b @080D2900 .align 2, 0 .pool -_080D2888: +@080D2888: ldr r4, =0x02039d84 ldr r0, [r4] lsls r3, r5, 1 @@ -398476,10 +398476,10 @@ _080D2888: strh r0, [r1, 0x16] ldrh r0, [r1, 0x12] subs r0, r2 - b _080D28C2 + b @080D28C2 .align 2, 0 .pool -_080D28A8: +@080D28A8: ldr r4, =0x02039d84 ldr r0, [r4] lsls r3, r5, 1 @@ -398493,13 +398493,13 @@ _080D28A8: strh r0, [r1, 0xE] ldrh r0, [r1, 0x12] adds r0, r2 -_080D28C2: +@080D28C2: strh r0, [r1, 0x12] adds r2, r3, 0 - b _080D2900 + b @080D2900 .align 2, 0 .pool -_080D28CC: +@080D28CC: ldr r3, =0x02039d84 ldr r0, [r3] lsls r2, r5, 1 @@ -398511,10 +398511,10 @@ _080D28CC: ldrh r4, [r1, 0x14] adds r0, r4 strh r0, [r1, 0x14] - b _080D28FE + b @080D28FE .align 2, 0 .pool -_080D28E8: +@080D28E8: ldr r3, =0x02039d84 ldr r0, [r3] lsls r2, r5, 1 @@ -398526,9 +398526,9 @@ _080D28E8: ldrh r4, [r1, 0x16] adds r0, r4 strh r0, [r1, 0x16] -_080D28FE: +@080D28FE: adds r4, r3, 0 -_080D2900: +@080D2900: ldr r0, [r4] adds r1, r2, r5 lsls r1, 4 @@ -398536,7 +398536,7 @@ _080D2900: adds r1, 0x2C movs r0, 0x1 strb r0, [r1] -_080D290E: +@080D290E: pop {r4-r6} pop {r0} bx r0 @@ -398545,7 +398545,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 @@ -398553,7 +398553,7 @@ sub_80D2918: @ 80D2918 ldr r0, =0x02039d88 ldrh r0, [r0] cmp r2, r0 - bcs _080D2952 + bcs @080D2952 ldr r5, =0x02039d84 ldr r0, [r5] lsls r1, r2, 1 @@ -398562,10 +398562,10 @@ sub_80D2918: @ 80D2918 adds r0, r4, r0 ldr r0, [r0, 0x18] cmp r0, 0 - beq _080D2940 + beq @080D2940 adds r0, r2, 0 bl sub_80D2960 -_080D2940: +@080D2940: adds r0, r6, 0 bl sub_80D29F8 ldr r1, [r5] @@ -398574,7 +398574,7 @@ _080D2940: adds r0, 0xC ldm r0!, {r2-r4} stm r1!, {r2-r4} -_080D2952: +@080D2952: pop {r4-r6} pop {r0} bx r0 @@ -398583,7 +398583,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 @@ -398619,9 +398619,9 @@ sub_80D2960: @ 80D2960 movs r6, 0 ldrh r0, [r0, 0x6] cmp r6, r0 - bge _080D29E4 + bge @080D29E4 mov r10, r4 -_080D29AA: +@080D29AA: mov r0, r10 ldr r1, [r0] mov r2, r8 @@ -398649,8 +398649,8 @@ _080D29AA: adds r4, r0 ldrh r4, [r4, 0x6] cmp r6, r4 - blt _080D29AA -_080D29E4: + blt @080D29AA +@080D29E4: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -398664,7 +398664,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 @@ -398700,9 +398700,9 @@ sub_80D29F8: @ 80D29F8 movs r6, 0 ldrh r0, [r0, 0x12] cmp r6, r0 - bge _080D2A7C + bge @080D2A7C mov r10, r4 -_080D2A42: +@080D2A42: mov r0, r10 ldr r1, [r0] mov r2, r8 @@ -398730,8 +398730,8 @@ _080D2A42: adds r4, r0 ldrh r4, [r4, 0x12] cmp r6, r4 - blt _080D2A42 -_080D2A7C: + blt @080D2A42 +@080D2A7C: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -398745,7 +398745,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] @@ -398758,19 +398758,19 @@ 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] ldrb r0, [r1, 0x4] cmp r0, 0 - beq _080D2AE2 + beq @080D2AE2 movs r4, 0 ldrb r1, [r1, 0x4] cmp r4, r1 - bcs _080D2ADA + bcs @080D2ADA adds r5, r2, 0 -_080D2ABA: +@080D2ABA: ldr r0, [r5] lsls r1, r4, 2 adds r1, r4 @@ -398785,13 +398785,13 @@ _080D2ABA: ldr r0, [r5] ldrb r0, [r0, 0x4] cmp r4, r0 - bcc _080D2ABA -_080D2ADA: + bcc @080D2ABA +@080D2ADA: ldr r0, =0x02039d8c ldr r1, [r0] movs r0, 0 strb r0, [r1, 0x4] -_080D2AE2: +@080D2AE2: pop {r4,r5} pop {r0} bx r0 @@ -398800,7 +398800,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 @@ -398837,7 +398837,7 @@ sub_80D2AEC: @ 80D2AEC adds r1, r0, 0 ldrb r7, [r2, 0x5] cmp r1, r7 - bcs _080D2B74 + bcs @080D2B74 adds r0, 0x1 strb r0, [r2, 0x4] lsls r0, r1, 2 @@ -398864,12 +398864,12 @@ sub_80D2AEC: @ 80D2AEC ldr r0, =sub_80D2B88 + 1 str r0, [r1, 0x10] movs r0, 0x1 - b _080D2B76 + b @080D2B76 .align 2, 0 .pool -_080D2B74: +@080D2B74: movs r0, 0 -_080D2B76: +@080D2B76: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -398881,12 +398881,12 @@ _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 - b _080D2BB2 -_080D2B90: + b @080D2BB2 +@080D2B90: ldr r0, [r4] ldr r1, [r4, 0x4] ldrh r2, [r4, 0x8] @@ -398903,17 +398903,17 @@ _080D2B90: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 -_080D2BB2: +@080D2BB2: ldrh r0, [r4, 0xC] cmp r5, r0 - bcc _080D2B90 + bcc @080D2B90 pop {r4,r5} pop {r0} bx r0 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] @@ -398931,7 +398931,7 @@ sub_80D2BC0: @ 80D2BC0 adds r1, r0, 0 ldrb r7, [r2, 0x5] cmp r1, r7 - bcs _080D2C14 + bcs @080D2C14 adds r0, 0x1 strb r0, [r2, 0x4] lsls r0, r1, 2 @@ -398950,19 +398950,19 @@ sub_80D2BC0: @ 80D2BC0 ldr r0, =sub_80D2C1C + 1 str r0, [r1, 0x10] movs r0, 0x1 - b _080D2C16 + b @080D2C16 .align 2, 0 .pool -_080D2C14: +@080D2C14: movs r0, 0 -_080D2C16: +@080D2C16: pop {r4-r7} pop {r1} bx r1 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 @@ -398973,7 +398973,7 @@ sub_80D2C1C: @ 80D2C1C movs r0, 0 ldrh r1, [r6, 0xC] cmp r0, r1 - bcs _080D2CAA + bcs @080D2CAA movs r7, 0x80 lsls r7, 5 mov r5, sp @@ -398982,14 +398982,14 @@ sub_80D2C1C: @ 80D2C1C movs r1, 0x81 lsls r1, 24 mov r10, r1 -_080D2C42: +@080D2C42: ldr r2, [r6, 0x4] ldrh r3, [r6, 0x8] mov r12, r2 adds r0, 0x1 mov r9, r0 cmp r3, r7 - bhi _080D2C6C + bhi @080D2C6C movs r0, 0 strh r0, [r5] mov r2, sp @@ -399001,10 +399001,10 @@ _080D2C42: mov r2, r10 orrs r0, r2 mov r1, r8 - b _080D2C94 + b @080D2C94 .align 2, 0 .pool -_080D2C6C: +@080D2C6C: movs r4, 0 strh r4, [r5] ldr r1, =0x040000d4 @@ -399017,7 +399017,7 @@ _080D2C6C: adds r2, r7 subs r3, r7 cmp r3, r7 - bhi _080D2C6C + bhi @080D2C6C strh r4, [r5] mov r0, sp str r0, [r1] @@ -399025,7 +399025,7 @@ _080D2C6C: lsrs r0, r3, 1 mov r2, r10 orrs r0, r2 -_080D2C94: +@080D2C94: str r0, [r1, 0x8] ldr r0, [r1, 0x8] mov r0, r12 @@ -399036,8 +399036,8 @@ _080D2C94: lsrs r0, 16 ldrh r2, [r6, 0xC] cmp r0, r2 - bcc _080D2C42 -_080D2CAA: + bcc @080D2C42 +@080D2CAA: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -399051,7 +399051,7 @@ _080D2CAA: thumb_func_end sub_80D2C1C thumb_func_start sub_80D2CC4 -sub_80D2CC4: @ 80D2CC4 +sub_80D2CC4: ; 80D2CC4 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -399098,10 +399098,10 @@ sub_80D2CC4: @ 80D2CC4 movs r0, 0xCE lsls r0, 1 cmp r4, r0 - bls _080D2D2A + bls @080D2D2A mov r0, sp strh r5, [r0, 0x14] -_080D2D2A: +@080D2D2A: mov r0, r8 lsls r1, r0, 16 asrs r1, 16 @@ -399132,7 +399132,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 @@ -399194,49 +399194,49 @@ sub_80D2D78: @ 80D2D78 thumb_func_end sub_80D2D78 thumb_func_start sub_80D2E08 -sub_80D2E08: @ 80D2E08 +sub_80D2E08: ; 80D2E08 push {lr} lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0xC9 - bne _080D2E32 + bne @080D2E32 adds r0, r1, 0 bl sub_80D2E48 lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne _080D2E24 + bne @080D2E24 movs r0, 0xC9 - b _080D2E2E -_080D2E24: + b @080D2E2E +@080D2E24: movs r1, 0xCE lsls r1, 1 adds r0, r1 lsls r0, 16 lsrs r0, 16 -_080D2E2E: +@080D2E2E: adds r1, r0, 0 - b _080D2E40 -_080D2E32: + b @080D2E40 +@080D2E32: movs r0, 0xCE lsls r0, 1 adds r1, r2, 0 cmp r1, r0 - bls _080D2E40 + bls @080D2E40 movs r1, 0x82 lsls r1, 1 -_080D2E40: +@080D2E40: adds r0, r1, 0 pop {r1} bx r1 thumb_func_end sub_80D2E08 thumb_func_start sub_80D2E48 -sub_80D2E48: @ 80D2E48 +sub_80D2E48: ; 80D2E48 push {lr} adds r2, r0, 0 cmp r2, 0 - beq _080D2E7E + beq @080D2E7E movs r0, 0xC0 lsls r0, 18 ands r0, r2 @@ -399258,16 +399258,16 @@ sub_80D2E48: @ 80D2E48 bl __umodsi3 lsls r0, 16 lsrs r0, 16 - b _080D2E80 -_080D2E7E: + b @080D2E80 +@080D2E7E: movs r0, 0 -_080D2E80: +@080D2E80: pop {r1} bx r1 thumb_func_end sub_80D2E48 thumb_func_start sub_80D2E84 -sub_80D2E84: @ 80D2E84 +sub_80D2E84: ; 80D2E84 push {r4,lr} sub sp, 0x4 lsls r0, 16 @@ -399278,38 +399278,38 @@ sub_80D2E84: @ 80D2E84 lsls r0, 16 lsrs r0, 16 cmp r0, 0xC9 - bne _080D2EBA + bne @080D2EBA mov r0, sp ldrh r0, [r0] cmp r0, 0 - bne _080D2EAA + bne @080D2EAA mov r1, sp adds r0, 0xC9 - b _080D2EB2 -_080D2EAA: + b @080D2EB2 +@080D2EAA: mov r1, sp movs r2, 0xCE lsls r2, 1 adds r0, r2 -_080D2EB2: +@080D2EB2: strh r0, [r1] mov r0, sp ldrh r0, [r0] - b _080D2ED2 -_080D2EBA: + b @080D2ED2 +@080D2EBA: movs r0, 0xCE lsls r0, 1 cmp r4, r0 - bls _080D2EC6 + bls @080D2EC6 movs r4, 0x82 lsls r4, 1 -_080D2EC6: +@080D2EC6: adds r0, r4, 0 movs r1, 0 bl sub_80D2E08 lsls r0, 16 lsrs r0, 16 -_080D2ED2: +@080D2ED2: add sp, 0x4 pop {r4} pop {r1} @@ -399317,7 +399317,7 @@ _080D2ED2: thumb_func_end sub_80D2E84 thumb_func_start sub_80D2EDC -sub_80D2EDC: @ 80D2EDC +sub_80D2EDC: ; 80D2EDC push {r4,lr} adds r4, r2, 0 lsls r0, 16 @@ -399333,7 +399333,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} @@ -399341,11 +399341,11 @@ 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, =0x0857c540 -_080D2F0A: +@080D2F0A: lsls r0, r4, 3 adds r0, r5 bl gpu_pal_obj_alloc_tag_and_apply @@ -399353,7 +399353,7 @@ _080D2F0A: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls _080D2F0A + bls @080D2F0A pop {r4,r5} pop {r0} bx r0 @@ -399362,17 +399362,17 @@ _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 movs r0, 0xCE lsls r0, 1 cmp r1, r0 - bls _080D2F3A + bls @080D2F3A movs r1, 0x82 lsls r1, 1 -_080D2F3A: +@080D2F3A: ldr r0, =0x0857c388 adds r0, r1, r0 ldrb r0, [r0] @@ -399384,10 +399384,10 @@ _080D2F3A: lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _080D2F5A + bne @080D2F5A adds r0, r4, 0 bl gpu_pal_obj_alloc_tag_and_apply -_080D2F5A: +@080D2F5A: pop {r4} pop {r0} bx r0 @@ -399396,7 +399396,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 @@ -399411,10 +399411,10 @@ sub_80D2F68: @ 80D2F68 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _080D2F8E + bne @080D2F8E adds r0, r4, 0 bl gpu_pal_obj_alloc_tag_and_apply -_080D2F8E: +@080D2F8E: pop {r4} pop {r0} bx r0 @@ -399423,11 +399423,11 @@ _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, =0x0857c540 -_080D2FA2: +@080D2FA2: lsls r0, r4, 3 adds r0, r5 ldrh r0, [r0, 0x4] @@ -399436,7 +399436,7 @@ _080D2FA2: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls _080D2FA2 + bls @080D2FA2 pop {r4,r5} pop {r0} bx r0 @@ -399445,17 +399445,17 @@ _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 movs r0, 0xCE lsls r0, 1 cmp r1, r0 - bls _080D2FD2 + bls @080D2FD2 movs r1, 0x82 lsls r1, 1 -_080D2FD2: +@080D2FD2: ldr r0, =0x0857c388 adds r0, r1, r0 ldrb r0, [r0] @@ -399471,7 +399471,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 @@ -399490,7 +399490,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} @@ -399498,7 +399498,7 @@ sub_80D3014: @ 80D3014 thumb_func_end sub_80D3014 thumb_func_start sub_80D3020 -sub_80D3020: @ 80D3020 +sub_80D3020: ; 80D3020 push {lr} adds r3, r1, 0 lsls r0, 16 @@ -399510,13 +399510,13 @@ sub_80D3020: @ 80D3020 movs r1, 0xCD lsls r1, 1 cmp r0, r1 - bne _080D3042 + bne @080D3042 cmp r3, 0x1 - bne _080D3042 + bne @080D3042 movs r0, 0x80 lsls r0, 3 adds r2, r0 -_080D3042: +@080D3042: adds r0, r2, 0 pop {r1} bx r1 @@ -399525,15 +399525,15 @@ _080D3042: thumb_func_end sub_80D3020 thumb_func_start sub_80D304C -sub_80D304C: @ 80D304C +sub_80D304C: ; 80D304C push {r4-r6,lr} lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0xA0 - bhi _080D3074 + bhi @080D3074 ldr r6, =0x0857c540 movs r5, 0x5 -_080D305A: +@080D305A: ldr r0, [r6] adds r1, r4, 0 movs r2, 0x20 @@ -399545,8 +399545,8 @@ _080D305A: adds r6, 0x8 subs r5, 0x1 cmp r5, 0 - bge _080D305A -_080D3074: + bge @080D305A +@080D3074: pop {r4-r6} pop {r0} bx r0 @@ -399555,17 +399555,17 @@ _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 movs r0, 0xCE lsls r0, 1 cmp r1, r0 - bls _080D3092 + bls @080D3092 movs r1, 0x82 lsls r1, 1 -_080D3092: +@080D3092: ldr r0, =0x0857c388 adds r0, r1, r0 ldrb r0, [r0] @@ -399576,7 +399576,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, =0x0857c388 @@ -399588,17 +399588,17 @@ 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 movs r0, 0xCE lsls r0, 1 cmp r2, r0 - bls _080D30C2 + bls @080D30C2 movs r2, 0x82 lsls r2, 1 -_080D30C2: +@080D30C2: ldr r1, =0x0857c540 ldr r0, =0x0857c388 adds r0, r2, r0 @@ -399613,7 +399613,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 @@ -399627,7 +399627,7 @@ sub_80D30DC: @ 80D30DC mov r9, r0 ands r0, r2 cmp r0, 0 - bne _080D3190 + bne @080D3190 movs r1, 0x2A adds r1, r4 mov r8, r1 @@ -399646,15 +399646,15 @@ sub_80D30DC: @ 80D30DC movs r0, 0x2 negs r0, r0 cmp r3, r0 - beq _080D3126 + beq @080D3126 adds r0, 0x1 cmp r3, r0 - bne _080D312A - b _080D31A4 -_080D3126: + bne @080D312A + b @080D31A4 +@080D3126: strb r7, [r5] - b _080D31A4 -_080D312A: + b @080D31A4 +@080D312A: ldr r2, =0x0857c5f0 ldrb r1, [r4, 0x3] lsrs r1, 6 @@ -399699,10 +399699,10 @@ _080D312A: adds r0, 0x1 strb r0, [r5] ldrb r7, [r5] - b _080D31A4 + b @080D31A4 .align 2, 0 .pool -_080D3190: +@080D3190: lsls r0, r2, 26 lsrs r0, 26 subs r0, 0x1 @@ -399713,7 +399713,7 @@ _080D3190: ands r1, r2 orrs r1, r0 strb r1, [r6] -_080D31A4: +@080D31A4: adds r0, r7, 0 pop {r3,r4} mov r8, r3 @@ -399724,7 +399724,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 @@ -399827,7 +399827,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 @@ -399858,7 +399858,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 @@ -399877,7 +399877,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 @@ -399891,18 +399891,18 @@ exec_movement: @ 80D32E8 bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - beq _080D330A + beq @080D330A movs r0, 0x1 - b _080D3332 -_080D330A: + b @080D3332 +@080D330A: ldr r0, =sub_80D3660 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _080D331C + bne @080D331C movs r0, 0x32 bl sub_80D33AC -_080D331C: +@080D331C: bl sub_80D33F4 lsls r0, 24 lsrs r0, 24 @@ -399912,7 +399912,7 @@ _080D331C: bl sub_80D3408 lsls r0, 24 lsrs r0, 24 -_080D3332: +@080D3332: add sp, 0x4 pop {r4} pop {r1} @@ -399922,7 +399922,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 @@ -399935,7 +399935,7 @@ sub_80D3340: @ 80D3340 bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _080D3382 + bne @080D3382 bl sub_80D33F4 lsls r0, 24 lsrs r4, r0, 24 @@ -399946,15 +399946,15 @@ sub_80D3340: @ 80D3340 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x10 - beq _080D3382 + beq @080D3382 adds r0, r4, 0 bl sub_80D3584 lsls r0, 24 lsrs r0, 24 - b _080D3384 -_080D3382: + b @080D3384 +@080D3382: movs r0, 0x1 -_080D3384: +@080D3384: add sp, 0x4 pop {r4} pop {r1} @@ -399962,25 +399962,25 @@ _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 lsrs r4, r0, 24 cmp r4, 0xFF - beq _080D33A6 + beq @080D33A6 adds r0, r4, 0 bl sub_80D361C adds r0, r4, 0 bl remove_task -_080D33A6: +@080D33A6: pop {r4} pop {r0} bx r0 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 @@ -399996,7 +399996,7 @@ sub_80D33AC: @ 80D33AC ldr r5, =0x03005e08 ldr r0, =0x0000ffff adds r4, r0, 0 -_080D33CC: +@080D33CC: lsls r0, r2, 1 adds r0, r3 adds r0, r5 @@ -400007,7 +400007,7 @@ _080D33CC: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xF - bls _080D33CC + bls @080D33CC pop {r4,r5} pop {r0} bx r0 @@ -400016,7 +400016,7 @@ _080D33CC: thumb_func_end sub_80D33AC thumb_func_start sub_80D33F4 -sub_80D33F4: @ 80D33F4 +sub_80D33F4: ; 80D33F4 push {lr} ldr r0, =sub_80D3660 + 1 bl get_task_id_by_function @@ -400029,7 +400029,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 @@ -400047,36 +400047,36 @@ sub_80D3408: @ 80D3408 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x10 - beq _080D3444 + beq @080D3444 adds r0, r5, 0 adds r1, r4, 0 bl sub_80D3584 lsls r0, 24 cmp r0, 0 - beq _080D3464 + beq @080D3464 adds r0, r5, 0 adds r1, r4, 0 adds r2, r6, 0 - b _080D345A -_080D3444: + b @080D345A +@080D3444: adds r0, r7, 0 movs r1, 0xFF bl sub_80D3474 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x10 - beq _080D3464 + beq @080D3464 adds r0, r7, 0 adds r1, r4, 0 mov r2, r8 -_080D345A: +@080D345A: mov r3, r9 bl sub_80D35DC movs r0, 0 - b _080D3466 -_080D3464: + b @080D3466 +@080D3464: movs r0, 0x1 -_080D3466: +@080D3466: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -400086,7 +400086,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 @@ -400099,29 +400099,29 @@ sub_80D3474: @ 80D3474 adds r1, r0 adds r1, 0x2 movs r2, 0 -_080D348C: +@080D348C: ldrb r0, [r1] cmp r0, r3 - bne _080D349C + bne @080D349C adds r0, r2, 0 - b _080D34AA + b @080D34AA .align 2, 0 .pool -_080D349C: +@080D349C: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 adds r1, 0x1 cmp r2, 0xF - bls _080D348C + bls @080D348C movs r0, 0x10 -_080D34AA: +@080D34AA: pop {r1} bx r1 thumb_func_end sub_80D3474 thumb_func_start sub_80D34B0 -sub_80D34B0: @ 80D34B0 +sub_80D34B0: ; 80D34B0 push {lr} lsls r0, 24 lsrs r0, 24 @@ -400136,16 +400136,16 @@ sub_80D34B0: @ 80D34B0 str r1, [r2] movs r0, 0 cmp r0, r3 - bcs _080D34DC -_080D34CE: + bcs @080D34DC +@080D34CE: adds r0, 0x1 lsls r0, 24 lsrs r0, 24 adds r1, 0x1 cmp r0, r3 - bcc _080D34CE + bcc @080D34CE str r1, [r2] -_080D34DC: +@080D34DC: pop {r0} bx r0 .align 2, 0 @@ -400153,7 +400153,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 @@ -400174,7 +400174,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 @@ -400194,7 +400194,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 @@ -400219,7 +400219,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 @@ -400241,7 +400241,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 @@ -400258,20 +400258,20 @@ sub_80D3584: @ 80D3584 ldrh r1, [r2, 0x8] ands r0, r1 cmp r0, 0 - bne _080D35B4 + bne @080D35B4 movs r0, 0 - b _080D35B6 + b @080D35B6 .align 2, 0 .pool -_080D35B4: +@080D35B4: movs r0, 0x1 -_080D35B6: +@080D35B6: pop {r1} bx r1 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 @@ -400283,7 +400283,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 @@ -400295,7 +400295,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} @@ -400327,7 +400327,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 @@ -400338,10 +400338,10 @@ sub_80D361C: @ 80D361C adds r1, r0 adds r4, r1, 0x2 movs r5, 0 -_080D3630: +@080D3630: ldrb r0, [r4] cmp r0, 0xFF - beq _080D3646 + beq @080D3646 adds r1, r0, 0 lsls r0, r1, 3 adds r0, r1 @@ -400349,13 +400349,13 @@ _080D3630: ldr r1, =0x02037350 adds r0, r1 bl npc_sync_anim_pause_bits -_080D3646: +@080D3646: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 adds r4, 0x1 cmp r5, 0xF - bls _080D3630 + bls @080D3630 pop {r4,r5} pop {r0} bx r0 @@ -400364,21 +400364,21 @@ _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 lsrs r7, r0, 24 movs r5, 0 mov r6, sp -_080D366C: +@080D366C: adds r0, r7, 0 adds r1, r5, 0 mov r2, sp bl sub_80D3508 ldrb r0, [r6] cmp r0, 0xFF - beq _080D3690 + beq @080D3690 adds r4, r0, 0 adds r0, r5, 0 bl sub_80D35CC @@ -400387,12 +400387,12 @@ _080D366C: adds r1, r5, 0 adds r2, r4, 0 bl sub_80D36A4 -_080D3690: +@080D3690: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0xF - bls _080D366C + bls @080D366C add sp, 0x4 pop {r4-r7} pop {r0} @@ -400400,7 +400400,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} @@ -400421,35 +400421,35 @@ sub_80D36A4: @ 80D36A4 bl npc_is_state_set_and_valid lsls r0, 24 cmp r0, 0 - beq _080D36DC + beq @080D36DC adds r0, r4, 0 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _080D370E -_080D36DC: + beq @080D370E +@080D36DC: ldrb r1, [r5] cmp r1, 0xFE - bne _080D36F8 + bne @080D36F8 adds r0, r7, 0 adds r1, r6, 0 bl sub_80D355C adds r0, r4, 0 bl sub_8097404 - b _080D370E + b @080D370E .align 2, 0 .pool -_080D36F8: +@080D36F8: adds r0, r4, 0 bl npc_set_state_2 lsls r0, 24 cmp r0, 0 - bne _080D370E + bne @080D370E adds r5, 0x1 mov r0, r8 adds r1, r5, 0 bl npc_obj_offscreen_culling_and_flag_update -_080D370E: +@080D370E: pop {r3} mov r8, r3 pop {r4-r7} @@ -400458,7 +400458,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 @@ -400470,7 +400470,7 @@ sub_80D3718: @ 80D3718 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080D3754 + bne @080D3754 ldr r1, =0x03005db0 ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] @@ -400478,10 +400478,10 @@ sub_80D3718: @ 80D3718 ldr r0, =sub_80D3A9C + 1 str r0, [r1] movs r0, 0x1 - b _080D3A2C + b @080D3A2C .align 2, 0 .pool -_080D3754: +@080D3754: ldr r0, =0x0203ab40 adds r1, r0, 0x2 bl player_get_pos_to @@ -400497,28 +400497,28 @@ _080D3754: lsrs r0, 24 str r0, [sp, 0xC] cmp r0, 0x34 - bne _080D3798 + bne @080D3798 ldr r1, =0x03001100 movs r0, 0x5 strb r0, [r1] ldr r0, =0x03001101 movs r1, 0x2 - b _080D37A2 + b @080D37A2 .align 2, 0 .pool -_080D3798: +@080D3798: ldr r1, =0x03001100 movs r0, 0x3 strb r0, [r1] ldr r0, =0x03001101 movs r1, 0x1 -_080D37A2: +@080D37A2: strb r1, [r0] ldr r0, =0x03001102 strb r1, [r0] movs r6, 0 movs r1, 0 -_080D37AC: +@080D37AC: mov r2, sp adds r0, r2, r6 strb r1, [r0] @@ -400526,22 +400526,22 @@ _080D37AC: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x8 - bls _080D37AC + bls @080D37AC movs r6, 0 ldr r2, =0x03001108 movs r1, 0 -_080D37C2: +@080D37C2: adds r0, r6, r2 strb r1, [r0] adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x18 - bls _080D37C2 + bls @080D37C2 movs r3, 0 str r3, [sp, 0x10] movs r6, 0 -_080D37D6: +@080D37D6: ldr r4, =0x0000ffff adds r0, r6, r4 ldr r1, =0x0203ab40 @@ -400558,7 +400558,7 @@ _080D37D6: lsls r0, r6, 2 adds r0, r6 mov r9, r0 -_080D37F6: +@080D37F6: ldr r3, =0x0000ffff adds r0, r5, r3 ldr r4, =0x0203ab40 @@ -400577,7 +400577,7 @@ _080D37F6: movs r1, 0x4 ldrsb r1, [r2, r1] cmp r0, r1 - bne _080D38BC + bne @080D38BC adds r0, r4, 0 mov r1, r10 bl cur_mapdata_block_get_role_at @@ -400588,14 +400588,14 @@ _080D37F6: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080D3846 + beq @080D3846 adds r0, r4, 0 bl sub_8089484 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080D3856 -_080D3846: + bne @080D3856 +@080D3846: adds r0, r5, 0x6 add r0, r9 ldr r3, =0x03001108 @@ -400604,7 +400604,7 @@ _080D3846: strb r1, [r0] movs r0, 0x1 str r0, [sp, 0x10] -_080D3856: +@080D3856: mov r1, r8 lsls r0, r1, 16 asrs r0, 16 @@ -400614,15 +400614,15 @@ _080D3856: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080D3890 + bne @080D3890 adds r0, r7, r6 adds r0, r5 mov r3, sp adds r1, r3, r0 - b _080D38C4 + b @080D38C4 .align 2, 0 .pool -_080D3890: +@080D3890: adds r0, r7, r6 adds r0, r5 mov r2, sp @@ -400634,52 +400634,52 @@ _080D3890: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x1 - bne _080D38C8 + bne @080D38C8 adds r0, r5, 0x6 add r0, r9 ldr r3, =0x03001108 adds r0, r3 strb r1, [r0] - b _080D38C8 + b @080D38C8 .align 2, 0 .pool -_080D38BC: +@080D38BC: adds r0, r7, r6 adds r0, r5 mov r4, sp adds r1, r4, r0 -_080D38C4: +@080D38C4: movs r0, 0 strb r0, [r1] -_080D38C8: +@080D38C8: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x2 - bls _080D37F6 + bls @080D37F6 ldr r1, [sp, 0x18] lsls r0, r1, 24 lsrs r6, r0, 24 cmp r6, 0x2 - bhi _080D38DE - b _080D37D6 -_080D38DE: + bhi @080D38DE + b @080D37D6 +@080D38DE: ldr r2, [sp, 0xC] cmp r2, 0x34 - beq _080D38EE + beq @080D38EE ldr r3, [sp, 0x10] cmp r3, 0x1 - beq _080D38EC - b _080D3A2A -_080D38EC: - b _080D3A1E -_080D38EE: + beq @080D38EC + b @080D3A2A +@080D38EC: + b @080D3A1E +@080D38EE: movs r6, 0 ldr r4, =0x0203ab40 mov r9, r4 ldr r0, =0x0857c608 mov r10, r0 -_080D38F8: +@080D38F8: lsls r2, r6, 2 mov r3, r10 adds r1, r2, r3 @@ -400707,8 +400707,8 @@ _080D38F8: str r6, [sp, 0x18] adds r6, r2, 0 cmp r0, 0 - beq _080D395A -_080D3930: + beq @080D395A +@080D3930: adds r1, r2, 0 adds r0, r5, r2 adds r0, r3 @@ -400719,20 +400719,20 @@ _080D3930: add r0, sp ldrb r0, [r0] cmp r0, 0 - beq _080D39F4 + beq @080D39F4 adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x1 - bhi _080D395A + bhi @080D395A adds r0, r5, r1 adds r0, r3 ldrb r0, [r0] cmp r0, 0 - bne _080D3930 -_080D395A: + bne @080D3930 +@080D395A: cmp r7, 0x1 - bne _080D3A0C + bne @080D3A0C mov r1, r8 lsls r0, r1, 16 asrs r5, r0, 16 @@ -400747,7 +400747,7 @@ _080D395A: movs r1, 0x4 ldrsb r1, [r2, r1] cmp r0, r1 - bne _080D3A0C + bne @080D3A0C mov r3, r10 adds r2, r6, r3 movs r1, 0x1 @@ -400769,14 +400769,14 @@ _080D395A: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080D39BC + beq @080D39BC adds r0, r4, 0 bl sub_8089484 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080D39F8 -_080D39BC: + bne @080D39F8 +@080D39BC: ldr r1, =0x03005db0 ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] @@ -400788,43 +400788,43 @@ _080D39BC: strb r7, [r0] movs r4, 0x1 str r4, [sp, 0x10] - b _080D3A0C + b @080D3A0C .align 2, 0 .pool -_080D39F4: +@080D39F4: movs r7, 0 - b _080D395A -_080D39F8: + b @080D395A +@080D39F8: adds r0, r4, 0 bl sub_80899F8 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x1 - bne _080D3A0C + bne @080D3A0C ldr r0, =0x03001108 adds r0, r6, r0 strb r1, [r0] -_080D3A0C: +@080D3A0C: ldr r1, [sp, 0x18] lsls r0, r1, 24 lsrs r6, r0, 24 cmp r6, 0xF - bhi _080D3A18 - b _080D38F8 -_080D3A18: + bhi @080D3A18 + b @080D38F8 +@080D3A18: ldr r2, [sp, 0x10] cmp r2, 0x1 - bne _080D3A2A -_080D3A1E: + bne @080D3A2A +@080D3A1E: ldr r1, =0x03005db0 ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] ldr r1, =0x0203ceec ldr r0, =hm2_ruin_valley + 1 str r0, [r1] -_080D3A2A: +@080D3A2A: ldr r0, [sp, 0x10] -_080D3A2C: +@080D3A2C: add sp, 0x1C pop {r3-r5} mov r8, r3 @@ -400838,7 +400838,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 oe_exec @@ -400854,7 +400854,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 @@ -400878,7 +400878,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 @@ -400894,7 +400894,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 @@ -400918,7 +400918,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 oe_active_list_remove @@ -400929,7 +400929,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 @@ -400939,12 +400939,12 @@ sub_80D3B00: @ 80D3B00 adds r0, r4, 0 bl player_get_pos_to adds r7, r4, 0 -_080D3B16: +@080D3B16: ldr r0, =0x03001108 adds r0, r6, r0 ldrb r0, [r0] cmp r0, 0x1 - bne _080D3B64 + bne @080D3B64 adds r0, r6, 0 movs r1, 0x5 bl __umodsi3 @@ -400975,12 +400975,12 @@ _080D3B16: adds r0, r4, 0 adds r1, r5, 0 bl sub_808E75C -_080D3B64: +@080D3B64: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x18 - bls _080D3B16 + bls @080D3B16 ldr r2, =0x0203ab40 ldr r0, =0x03001101 ldrb r1, [r0] @@ -401003,7 +401003,7 @@ _080D3B64: str r0, [r4] movs r6, 0 ldr r5, =0x02020630 -_080D3BA0: +@080D3BA0: ldr r0, =0x02037590 ldrb r1, [r0, 0x4] lsls r0, r1, 4 @@ -401038,7 +401038,7 @@ _080D3BA0: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x7 - bls _080D3BA0 + bls @080D3BA0 movs r0, 0 pop {r4-r7} pop {r1} @@ -401048,7 +401048,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 @@ -401062,106 +401062,106 @@ sub_80D3C10: @ 80D3C10 adds r1, r0, 0 ldr r0, =0x00000207 cmp r1, r0 - bgt _080D3C5C + bgt @080D3C5C subs r0, 0x1 cmp r1, r0 - bge _080D3CD4 + bge @080D3CD4 cmp r1, 0x25 - beq _080D3CF6 + beq @080D3CF6 cmp r1, 0x25 - bgt _080D3C4C + bgt @080D3C4C cmp r1, 0xD - beq _080D3C9C + beq @080D3C9C cmp r1, 0x15 - beq _080D3C9C - b _080D3D00 + beq @080D3C9C + b @080D3D00 .align 2, 0 .pool -_080D3C4C: +@080D3C4C: movs r0, 0xE3 lsls r0, 1 cmp r1, r0 - beq _080D3CAC + beq @080D3CAC adds r0, 0x1 cmp r1, r0 - beq _080D3CB2 - b _080D3D00 -_080D3C5C: + beq @080D3CB2 + b @080D3D00 +@080D3C5C: ldr r0, =0x00000212 cmp r1, r0 - beq _080D3CE4 + beq @080D3CE4 cmp r1, r0 - bgt _080D3C78 + bgt @080D3C78 subs r0, 0xA cmp r1, r0 - beq _080D3C9C + beq @080D3C9C adds r0, 0x2 cmp r1, r0 - beq _080D3CE4 - b _080D3D00 + beq @080D3CE4 + b @080D3D00 .align 2, 0 .pool -_080D3C78: +@080D3C78: ldr r0, =0x00000282 cmp r1, r0 - beq _080D3CC4 + beq @080D3CC4 cmp r1, r0 - bgt _080D3C90 + bgt @080D3C90 subs r0, 0x1 cmp r1, r0 - beq _080D3CBC - b _080D3D00 + beq @080D3CBC + b @080D3D00 .align 2, 0 .pool -_080D3C90: +@080D3C90: ldr r0, =0x00000283 cmp r1, r0 - beq _080D3CCC - b _080D3D00 + beq @080D3CCC + b @080D3D00 .align 2, 0 .pool -_080D3C9C: +@080D3C9C: lsls r0, r6, 16 asrs r0, 16 lsls r1, r7, 16 asrs r1, 16 movs r2, 0x1 bl setmaptile_0 - b _080D3D00 -_080D3CAC: + b @080D3D00 +@080D3CAC: movs r2, 0xE7 lsls r2, 1 - b _080D3CD6 -_080D3CB2: + b @080D3CD6 +@080D3CB2: ldr r2, =0x000001cf - b _080D3CD6 + b @080D3CD6 .align 2, 0 .pool -_080D3CBC: +@080D3CBC: ldr r2, =0x00000279 - b _080D3CD6 + b @080D3CD6 .align 2, 0 .pool -_080D3CC4: +@080D3CC4: ldr r2, =0x0000027a - b _080D3CD6 + b @080D3CD6 .align 2, 0 .pool -_080D3CCC: +@080D3CCC: ldr r2, =0x0000027b - b _080D3CD6 + b @080D3CD6 .align 2, 0 .pool -_080D3CD4: +@080D3CD4: ldr r2, =0x00000271 -_080D3CD6: +@080D3CD6: adds r0, r4, 0 adds r1, r5, 0 bl setmaptile_0 - b _080D3D00 + b @080D3D00 .align 2, 0 .pool -_080D3CE4: +@080D3CE4: lsls r0, r6, 16 asrs r0, 16 lsls r1, r7, 16 @@ -401169,20 +401169,20 @@ _080D3CE4: movs r2, 0x86 lsls r2, 2 bl setmaptile_0 - b _080D3D00 -_080D3CF6: + b @080D3D00 +@080D3CF6: adds r0, r4, 0 adds r1, r5, 0 movs r2, 0xE bl setmaptile_0 -_080D3D00: +@080D3D00: pop {r4-r7} pop {r0} bx r0 thumb_func_end sub_80D3C10 thumb_func_start sub_80D3D08 -sub_80D3D08: @ 80D3D08 +sub_80D3D08: ; 80D3D08 push {lr} lsls r0, 16 asrs r0, 16 @@ -401193,42 +401193,42 @@ sub_80D3D08: @ 80D3D08 lsrs r1, r0, 16 adds r2, r1, 0 cmp r1, 0x1 - bne _080D3D24 + bne @080D3D24 movs r0, 0x1 - b _080D3D56 -_080D3D24: + b @080D3D56 +@080D3D24: ldr r0, =0x00000279 cmp r1, r0 - bne _080D3D34 + bne @080D3D34 movs r0, 0x2 - b _080D3D56 + b @080D3D56 .align 2, 0 .pool -_080D3D34: +@080D3D34: ldr r0, =0x0000027a cmp r1, r0 - bne _080D3D44 + bne @080D3D44 movs r0, 0x3 - b _080D3D56 + b @080D3D56 .align 2, 0 .pool -_080D3D44: +@080D3D44: ldr r0, =0x0000027b cmp r2, r0 - beq _080D3D54 + beq @080D3D54 movs r0, 0 - b _080D3D56 + b @080D3D56 .align 2, 0 .pool -_080D3D54: +@080D3D54: movs r0, 0x4 -_080D3D56: +@080D3D56: pop {r1} bx r1 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 @@ -401250,12 +401250,12 @@ sub_80D3D5C: @ 80D3D5C str r0, [sp] movs r4, 0 cmp r4, r2 - blt _080D3D8A - b _080D3EA0 -_080D3D8A: + blt @080D3D8A + b @080D3EA0 +@080D3D8A: lsls r0, r3, 16 asrs r7, r0, 16 -_080D3D8E: +@080D3D8E: mov r1, r9 lsls r0, r1, 16 asrs r0, 16 @@ -401270,7 +401270,7 @@ _080D3D8E: bl cur_mapdata_get_blockid_at mov r8, r4 cmp r0, 0x15 - bne _080D3E12 + bne @080D3E12 adds r4, r7, 0x1 lsls r1, r4, 16 asrs r1, 16 @@ -401279,49 +401279,49 @@ _080D3D8E: lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - beq _080D3DE8 + beq @080D3DE8 cmp r0, 0x2 - bgt _080D3DD0 + bgt @080D3DD0 cmp r0, 0x1 - beq _080D3DDA - b _080D3E12 + beq @080D3DDA + b @080D3E12 .align 2, 0 .pool -_080D3DD0: +@080D3DD0: cmp r0, 0x3 - beq _080D3DF8 + beq @080D3DF8 cmp r0, 0x4 - beq _080D3E08 - b _080D3E12 -_080D3DDA: + beq @080D3E08 + b @080D3E12 +@080D3DDA: adds r0, r5, 0 adds r1, r4, 0 movs r2, 0x82 lsls r2, 2 bl setmaptile_0 - b _080D3E12 -_080D3DE8: + b @080D3E12 +@080D3DE8: adds r0, r5, 0 adds r1, r4, 0 ldr r2, =0x00000281 bl setmaptile_0 - b _080D3E12 + b @080D3E12 .align 2, 0 .pool -_080D3DF8: +@080D3DF8: adds r0, r5, 0 adds r1, r4, 0 ldr r2, =0x00000282 bl setmaptile_0 - b _080D3E12 + b @080D3E12 .align 2, 0 .pool -_080D3E08: +@080D3E08: adds r0, r5, 0 adds r1, r4, 0 ldr r2, =0x00000283 bl setmaptile_0 -_080D3E12: +@080D3E12: lsls r0, r6, 16 asrs r5, r0, 16 ldr r3, [sp] @@ -401331,7 +401331,7 @@ _080D3E12: adds r1, r4, 0 bl cur_mapdata_get_blockid_at cmp r0, 0x1 - bne _080D3E8C + bne @080D3E8C adds r4, 0x1 adds r0, r5, 0 adds r1, r4, 0 @@ -401339,45 +401339,45 @@ _080D3E12: movs r1, 0x82 lsls r1, 2 cmp r0, r1 - bne _080D3E44 + bne @080D3E44 adds r0, r5, 0 adds r1, r4, 0 movs r2, 0x1 bl setmaptile_0 -_080D3E44: +@080D3E44: adds r0, r5, 0 adds r1, r4, 0 bl cur_mapdata_get_blockid_at ldr r1, =0x00000281 cmp r0, r1 - bne _080D3E5C + bne @080D3E5C adds r0, r5, 0 adds r1, r4, 0 ldr r2, =0x00000279 bl setmaptile_0 -_080D3E5C: +@080D3E5C: adds r0, r5, 0 adds r1, r4, 0 bl cur_mapdata_get_blockid_at ldr r1, =0x00000282 cmp r0, r1 - bne _080D3E74 + bne @080D3E74 adds r0, r5, 0 adds r1, r4, 0 ldr r2, =0x0000027a bl setmaptile_0 -_080D3E74: +@080D3E74: adds r0, r5, 0 adds r1, r4, 0 bl cur_mapdata_get_blockid_at ldr r1, =0x00000283 cmp r0, r1 - bne _080D3E8C + bne @080D3E8C adds r0, r5, 0 adds r1, r4, 0 ldr r2, =0x0000027b bl setmaptile_0 -_080D3E8C: +@080D3E8C: movs r1, 0x80 lsls r1, 9 add r1, r8 @@ -401386,13 +401386,13 @@ _080D3E8C: ldr r0, =0x03001100 ldrb r0, [r0] cmp r1, r0 - bge _080D3EA0 - b _080D3D8E -_080D3EA0: + bge @080D3EA0 + b @080D3D8E +@080D3EA0: ldr r1, =0x03001100 ldrb r0, [r1] cmp r0, 0x5 - bne _080D3EC8 + bne @080D3EC8 mov r3, r9 lsls r5, r3, 16 asrs r5, 16 @@ -401407,7 +401407,7 @@ _080D3EA0: adds r1, r5, 0 adds r2, r4, 0 bl sub_80D3EF4 -_080D3EC8: +@080D3EC8: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -401421,7 +401421,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 @@ -401437,7 +401437,7 @@ sub_80D3EF4: @ 80D3EF4 lsrs r2, 16 mov r10, r2 cmp r0, 0 - bne _080D3F2C + bne @080D3F2C mov r2, sp ldr r1, =0x03001108 ldrb r0, [r1, 0x5] @@ -401447,14 +401447,14 @@ sub_80D3EF4: @ 80D3EF4 ldrb r0, [r1, 0xF] strb r0, [r2, 0x2] mov r8, r5 - b _080D3F4E + b @080D3F4E .align 2, 0 .pool -_080D3F2C: +@080D3F2C: cmp r0, 0x1 - beq _080D3F32 - b _080D414A -_080D3F32: + beq @080D3F32 + b @080D414A +@080D3F32: mov r2, sp ldr r1, =0x03001108 ldrb r0, [r1, 0x9] @@ -401469,11 +401469,11 @@ _080D3F32: adds r0, r1 lsrs r0, 16 mov r8, r0 -_080D3F4E: +@080D3F4E: mov r0, sp ldrb r0, [r0] cmp r0, 0x1 - bne _080D3FC6 + bne @080D3FC6 mov r1, r8 lsls r0, r1, 16 asrs r5, r0, 16 @@ -401487,49 +401487,49 @@ _080D3F4E: movs r1, 0x82 lsls r1, 2 cmp r0, r1 - bne _080D3F7E + bne @080D3F7E adds r0, r5, 0 adds r1, r4, 0 movs r2, 0x1 bl setmaptile_0 -_080D3F7E: +@080D3F7E: adds r0, r5, 0 adds r1, r4, 0 bl cur_mapdata_get_blockid_at ldr r1, =0x00000281 cmp r0, r1 - bne _080D3F96 + bne @080D3F96 ldr r2, =0x00000279 adds r0, r5, 0 adds r1, r4, 0 bl setmaptile_0 -_080D3F96: +@080D3F96: adds r0, r5, 0 adds r1, r4, 0 bl cur_mapdata_get_blockid_at ldr r1, =0x00000282 cmp r0, r1 - bne _080D3FAE + bne @080D3FAE ldr r2, =0x0000027a adds r0, r5, 0 adds r1, r4, 0 bl setmaptile_0 -_080D3FAE: +@080D3FAE: adds r0, r5, 0 adds r1, r4, 0 bl cur_mapdata_get_blockid_at ldr r1, =0x00000283 cmp r0, r1 - bne _080D3FC6 + bne @080D3FC6 ldr r2, =0x0000027b adds r0, r5, 0 adds r1, r4, 0 bl setmaptile_0 -_080D3FC6: +@080D3FC6: mov r0, sp ldrb r0, [r0, 0x1] cmp r0, 0x1 - bne _080D40C0 + bne @080D40C0 mov r0, r8 lsls r5, r0, 16 asrs r6, r5, 16 @@ -401541,7 +401541,7 @@ _080D3FC6: bl cur_mapdata_get_blockid_at mov r9, r4 cmp r0, 0x15 - bne _080D4056 + bne @080D4056 adds r4, r7, 0x3 lsls r1, r4, 16 asrs r1, 16 @@ -401550,44 +401550,44 @@ _080D3FC6: lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - beq _080D4034 + beq @080D4034 cmp r0, 0x2 - bgt _080D4024 + bgt @080D4024 cmp r0, 0x1 - beq _080D402E - b _080D4056 + beq @080D402E + b @080D4056 .align 2, 0 .pool -_080D4024: +@080D4024: cmp r0, 0x3 - beq _080D403C + beq @080D403C cmp r0, 0x4 - beq _080D404C - b _080D4056 -_080D402E: + beq @080D404C + b @080D4056 +@080D402E: movs r2, 0x82 lsls r2, 2 - b _080D403E -_080D4034: + b @080D403E +@080D4034: ldr r2, =0x00000281 - b _080D403E + b @080D403E .align 2, 0 .pool -_080D403C: +@080D403C: ldr r2, =0x00000282 -_080D403E: +@080D403E: adds r0, r6, 0 adds r1, r4, 0 bl setmaptile_0 - b _080D4056 + b @080D4056 .align 2, 0 .pool -_080D404C: +@080D404C: ldr r2, =0x00000283 adds r0, r6, 0 adds r1, r4, 0 bl setmaptile_0 -_080D4056: +@080D4056: asrs r5, 16 mov r1, r9 asrs r0, r1, 16 @@ -401598,49 +401598,49 @@ _080D4056: movs r1, 0x82 lsls r1, 2 cmp r0, r1 - bne _080D4078 + bne @080D4078 adds r0, r5, 0 adds r1, r4, 0 movs r2, 0x1 bl setmaptile_0 -_080D4078: +@080D4078: adds r0, r5, 0 adds r1, r4, 0 bl cur_mapdata_get_blockid_at ldr r1, =0x00000281 cmp r0, r1 - bne _080D4090 + bne @080D4090 ldr r2, =0x00000279 adds r0, r5, 0 adds r1, r4, 0 bl setmaptile_0 -_080D4090: +@080D4090: adds r0, r5, 0 adds r1, r4, 0 bl cur_mapdata_get_blockid_at ldr r1, =0x00000282 cmp r0, r1 - bne _080D40A8 + bne @080D40A8 ldr r2, =0x0000027a adds r0, r5, 0 adds r1, r4, 0 bl setmaptile_0 -_080D40A8: +@080D40A8: adds r0, r5, 0 adds r1, r4, 0 bl cur_mapdata_get_blockid_at ldr r1, =0x00000283 cmp r0, r1 - bne _080D40C0 + bne @080D40C0 ldr r2, =0x0000027b adds r0, r5, 0 adds r1, r4, 0 bl setmaptile_0 -_080D40C0: +@080D40C0: mov r0, sp ldrb r0, [r0, 0x2] cmp r0, 0x1 - bne _080D414A + bne @080D414A mov r1, r8 lsls r0, r1, 16 asrs r5, r0, 16 @@ -401651,7 +401651,7 @@ _080D40C0: adds r0, r5, 0 bl cur_mapdata_get_blockid_at cmp r0, 0x15 - bne _080D414A + bne @080D414A adds r4, 0x4 lsls r1, r4, 16 asrs r1, 16 @@ -401660,44 +401660,44 @@ _080D40C0: lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - beq _080D4128 + beq @080D4128 cmp r0, 0x2 - bgt _080D4118 + bgt @080D4118 cmp r0, 0x1 - beq _080D4122 - b _080D414A + beq @080D4122 + b @080D414A .align 2, 0 .pool -_080D4118: +@080D4118: cmp r0, 0x3 - beq _080D4130 + beq @080D4130 cmp r0, 0x4 - beq _080D4140 - b _080D414A -_080D4122: + beq @080D4140 + b @080D414A +@080D4122: movs r2, 0x82 lsls r2, 2 - b _080D4132 -_080D4128: + b @080D4132 +@080D4128: ldr r2, =0x00000281 - b _080D4132 + b @080D4132 .align 2, 0 .pool -_080D4130: +@080D4130: ldr r2, =0x00000282 -_080D4132: +@080D4132: adds r0, r5, 0 adds r1, r4, 0 bl setmaptile_0 - b _080D414A + b @080D414A .align 2, 0 .pool -_080D4140: +@080D4140: ldr r2, =0x00000283 adds r0, r5, 0 adds r1, r4, 0 bl setmaptile_0 -_080D414A: +@080D414A: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -401711,7 +401711,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] @@ -401725,7 +401725,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 @@ -401758,14 +401758,14 @@ objc_8097BBC: @ 80D4174 movs r2, 0x30 ldrsh r0, [r4, r2] cmp r0, 0x1C - beq _080D41C0 + beq @080D41C0 adds r0, r1, 0x1 strh r0, [r4, 0x30] - b _080D41C4 -_080D41C0: + b @080D41C4 +@080D41C0: ldr r0, =sub_80D41D0 + 1 str r0, [r4, 0x1C] -_080D41C4: +@080D41C4: pop {r4} pop {r0} bx r0 @@ -401774,10 +401774,10 @@ _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: +@080D41D4: ldr r6, =0x02039dd0 ldr r0, [r6] adds r0, r4 @@ -401792,7 +401792,7 @@ _080D41D4: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bls _080D41D4 + bls @080D41D4 ldr r0, [r6] ldrb r1, [r0] lsls r0, r1, 4 @@ -401811,10 +401811,10 @@ _080D41D4: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080D422A + bne @080D422A ldr r0, =0x08267edb bl script_env_1_execute_new_script -_080D422A: +@080D422A: pop {r4-r6} pop {r0} bx r0 @@ -401823,7 +401823,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 @@ -401837,7 +401837,7 @@ sub_80D423C: @ 80D423C bl sub_8089B1C lsls r0, 24 cmp r0, 0 - beq _080D42AE + beq @080D42AE adds r4, 0x1 lsls r1, r4, 16 asrs r1, 16 @@ -401846,42 +401846,42 @@ sub_80D423C: @ 80D423C lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - beq _080D428A + beq @080D428A cmp r0, 0x2 - bgt _080D427A + bgt @080D427A cmp r0, 0x1 - beq _080D4284 - b _080D42AE -_080D427A: + beq @080D4284 + b @080D42AE +@080D427A: cmp r0, 0x3 - beq _080D4294 + beq @080D4294 cmp r0, 0x4 - beq _080D42A4 - b _080D42AE -_080D4284: + beq @080D42A4 + b @080D42AE +@080D4284: movs r2, 0x82 lsls r2, 2 - b _080D4296 -_080D428A: + b @080D4296 +@080D428A: ldr r2, =0x00000281 - b _080D4296 + b @080D4296 .align 2, 0 .pool -_080D4294: +@080D4294: ldr r2, =0x00000282 -_080D4296: +@080D4296: adds r0, r5, 0 adds r1, r4, 0 bl setmaptile_0 - b _080D42AE + b @080D42AE .align 2, 0 .pool -_080D42A4: +@080D42A4: ldr r2, =0x00000283 adds r0, r5, 0 adds r1, r4, 0 bl setmaptile_0 -_080D42AE: +@080D42AE: pop {r4,r5} pop {r0} bx r0 @@ -401890,7 +401890,7 @@ _080D42AE: thumb_func_end sub_80D423C thumb_func_start task00_bag_acit_10 -task00_bag_acit_10: @ 80D42B8 +task00_bag_acit_10: ; 80D42B8 push {r4,r5,lr} lsls r0, 16 asrs r4, r0, 16 @@ -401900,7 +401900,7 @@ task00_bag_acit_10: @ 80D42B8 adds r1, r5, 0 bl cur_mapdata_get_blockid_at cmp r0, 0x1 - bne _080D434A + bne @080D434A adds r5, 0x1 adds r0, r4, 0 adds r1, r5, 0 @@ -401910,58 +401910,58 @@ task00_bag_acit_10: @ 80D42B8 bl sub_8089B30 lsls r0, 24 cmp r0, 0 - beq _080D434A + beq @080D434A adds r0, r4, 0 adds r1, r5, 0 bl cur_mapdata_get_blockid_at adds r1, r0, 0 ldr r0, =0x00000281 cmp r1, r0 - beq _080D4328 + beq @080D4328 cmp r1, r0 - bgt _080D4308 + bgt @080D4308 subs r0, 0x79 cmp r1, r0 - beq _080D431C - b _080D434A + beq @080D431C + b @080D434A .align 2, 0 .pool -_080D4308: +@080D4308: ldr r0, =0x00000282 cmp r1, r0 - beq _080D4330 + beq @080D4330 adds r0, 0x1 cmp r1, r0 - beq _080D4340 - b _080D434A + beq @080D4340 + b @080D434A .align 2, 0 .pool -_080D431C: +@080D431C: adds r0, r4, 0 adds r1, r5, 0 movs r2, 0x1 bl setmaptile_0 - b _080D434A -_080D4328: + b @080D434A +@080D4328: ldr r2, =0x00000279 - b _080D4332 + b @080D4332 .align 2, 0 .pool -_080D4330: +@080D4330: ldr r2, =0x0000027a -_080D4332: +@080D4332: adds r0, r4, 0 adds r1, r5, 0 bl setmaptile_0 - b _080D434A + b @080D434A .align 2, 0 .pool -_080D4340: +@080D4340: ldr r2, =0x0000027b adds r0, r4, 0 adds r1, r5, 0 bl setmaptile_0 -_080D434A: +@080D434A: pop {r4,r5} pop {r0} bx r0 @@ -401970,7 +401970,7 @@ _080D434A: thumb_func_end task00_bag_acit_10 thumb_func_start sub_80D4354 -sub_80D4354: @ 80D4354 +sub_80D4354: ; 80D4354 push {lr} movs r0, 0x80 bl audio_play @@ -401982,11 +401982,11 @@ 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 -_080D4372: +@080D4372: lsls r1, r4, 3 adds r1, r4 lsls r1, 2 @@ -401999,7 +401999,7 @@ _080D4372: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bls _080D4372 + bls @080D4372 pop {r4,r5} pop {r0} bx r0 @@ -402008,43 +402008,43 @@ _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 adds r4, r0, 0 adds r1, r3, 0 movs r2, 0x8 -_080D43A8: +@080D43A8: ldrh r0, [r1] orrs r0, r4 strh r0, [r1] adds r1, 0x2 subs r2, 0x1 cmp r2, 0 - bge _080D43A8 + bge @080D43A8 movs r2, 0 adds r6, r3, 0 adds r6, 0x1A adds r4, r3, 0 adds r4, 0x12 movs r5, 0xFF -_080D43C2: +@080D43C2: adds r1, r4, r2 ldrb r0, [r1] orrs r0, r5 strb r0, [r1] adds r2, 0x1 cmp r2, 0x7 - ble _080D43C2 + ble @080D43C2 adds r1, r6, 0 movs r2, 0 adds r0, r1, 0x3 -_080D43D6: +@080D43D6: strb r2, [r0] subs r0, 0x1 cmp r0, r1 - bge _080D43D6 + bge @080D43D6 movs r1, 0 movs r0, 0x1 strh r0, [r3, 0x1E] @@ -402057,7 +402057,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 @@ -402067,24 +402067,24 @@ sub_80D43F0: @ 80D43F0 bl itemid_is_mail lsls r0, 24 cmp r0, 0 - beq _080D4418 + beq @080D4418 adds r0, r4, 0 movs r1, 0x40 bl pokemon_getattr cmp r0, 0xFF - beq _080D4418 + beq @080D4418 movs r0, 0x1 - b _080D441A -_080D4418: + b @080D441A +@080D4418: movs r0, 0 -_080D441A: +@080D441A: pop {r4} pop {r1} bx r1 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 @@ -402107,7 +402107,7 @@ sub_80D4420: @ 80D4420 mov r10, r4 mov r9, r3 adds r4, r3, 0 -_080D444C: +@080D444C: mov r1, r10 ldr r0, [r1] ldrb r2, [r4] @@ -402120,9 +402120,9 @@ _080D444C: adds r0, r1 ldrh r0, [r0] cmp r0, 0 - beq _080D4468 - b _080D45A8 -_080D4468: + beq @080D4468 + b @080D45A8 +@080D4468: movs r4, 0 ldr r2, =0x03005d90 mov r12, r2 @@ -402130,7 +402130,7 @@ _080D4468: add r5, sp, 0x4 ldr r3, =0x0000ffff adds r6, r3, 0 -_080D4476: +@080D4476: ldr r2, [r7] lsls r3, r4, 1 ldrb r1, [r5] @@ -402148,11 +402148,11 @@ _080D4476: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x8 - bls _080D4476 + bls @080D4476 movs r4, 0 ldr r5, =0x03005d8c add r3, sp, 0x4 -_080D44A0: +@080D44A0: ldr r2, [r5] ldrb r1, [r3] lsls r0, r1, 3 @@ -402171,7 +402171,7 @@ _080D44A0: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x6 - bls _080D44A0 + bls @080D44A0 mov r3, r10 ldr r2, [r3] mov r0, r9 @@ -402200,7 +402200,7 @@ _080D44A0: ldr r6, =0x03005d8c add r3, sp, 0x4 ldr r5, =0x03005d90 -_080D4500: +@080D4500: ldr r2, [r6] ldrb r1, [r3] lsls r0, r1, 3 @@ -402219,7 +402219,7 @@ _080D4500: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _080D4500 + bls @080D4500 mov r0, r8 movs r1, 0xB bl pokemon_getattr_encrypted @@ -402264,19 +402264,19 @@ _080D4500: bl pokemon_setattr mov r1, r9 ldrb r0, [r1] - b _080D45B6 + b @080D45B6 .align 2, 0 .pool -_080D45A8: +@080D45A8: adds r0, r2, 0x1 strb r0, [r3] ldrb r0, [r4] cmp r0, 0x5 - bhi _080D45B4 - b _080D444C -_080D45B4: + bhi @080D45B4 + b @080D444C +@080D45B4: movs r0, 0xFF -_080D45B6: +@080D45B6: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -402288,19 +402288,19 @@ _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 cmp r0, 0xC9 - bne _080D45E0 + bne @080D45E0 adds r0, r1, 0 bl sub_80D2E48 lsls r0, 16 ldr r1, =0x75300000 adds r0, r1 lsrs r0, 16 -_080D45E0: +@080D45E0: pop {r1} bx r1 .align 2, 0 @@ -402308,7 +402308,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 @@ -402317,21 +402317,21 @@ sub_80D45E8: @ 80D45E8 lsls r0, r2, 16 lsrs r0, 16 cmp r0, 0x1B - bhi _080D4604 + bhi @080D4604 movs r0, 0xC9 strh r2, [r1] - b _080D4606 + b @080D4606 .align 2, 0 .pool -_080D4604: +@080D4604: adds r0, r3, 0 -_080D4606: +@080D4606: pop {r1} bx r1 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 @@ -402343,7 +402343,7 @@ sub_80D460C: @ 80D460C strb r0, [r4] ldrb r2, [r4] cmp r2, 0xFF - beq _080D4670 + beq @080D4670 ldr r0, =0x03005d8c ldr r1, [r0] lsls r0, r2, 3 @@ -402373,12 +402373,12 @@ sub_80D460C: @ 80D460C mov r2, sp bl pokemon_setattr ldrb r0, [r4] - b _080D4672 + b @080D4672 .align 2, 0 .pool -_080D4670: +@080D4670: movs r0, 0xFF -_080D4672: +@080D4672: add sp, 0x8 pop {r4-r7} pop {r1} @@ -402386,20 +402386,20 @@ _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 bl sub_80D43F0 lsls r0, 24 cmp r0, 0 - beq _080D46D2 + beq @080D46D2 adds r0, r4, 0 movs r1, 0x40 bl pokemon_getattr @@ -402430,7 +402430,7 @@ sub_80D4680: @ 80D4680 movs r1, 0xC mov r2, sp bl pokemon_setattr -_080D46D2: +@080D46D2: add sp, 0x8 pop {r4} pop {r0} @@ -402440,7 +402440,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 @@ -402460,7 +402460,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 @@ -402479,7 +402479,7 @@ sub_80D4700: @ 80D4700 ldr r0, =0x03005d8c mov r8, r0 ldr r3, =0x00002be0 -_080D4724: +@080D4724: mov r1, r8 ldr r0, [r1] lsls r1, r7, 3 @@ -402491,7 +402491,7 @@ _080D4724: adds r0, r4, r2 ldrh r6, [r0] cmp r6, 0 - bne _080D47A0 + bne @080D47A0 adds r4, r3 adds r0, r5, 0 movs r1, 0x40 @@ -402533,17 +402533,17 @@ _080D4724: mov r2, sp bl pokemon_setattr adds r0, r7, 0 - b _080D47AC + b @080D47AC .align 2, 0 .pool -_080D47A0: +@080D47A0: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0xF - bls _080D4724 + bls @080D4724 movs r0, 0xFF -_080D47AC: +@080D47AC: add sp, 0xC pop {r3,r4} mov r8, r3 @@ -402554,25 +402554,25 @@ _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 cmp r0, 0x84 - bgt _080D47CE + bgt @080D47CE cmp r0, 0x79 - blt _080D47CE + blt @080D47CE movs r0, 0x1 - b _080D47D0 -_080D47CE: + b @080D47D0 +@080D47CE: movs r0, 0 -_080D47D0: +@080D47D0: pop {r1} bx r1 thumb_func_end itemid_is_mail thumb_func_start sub_80D47D4 -sub_80D47D4: @ 80D47D4 +sub_80D47D4: ; 80D47D4 push {lr} bl sub_80A0934 bl sub_80D47E4 @@ -402582,7 +402582,7 @@ sub_80D47D4: @ 80D47D4 thumb_func_end sub_80D47D4 thumb_func_start sub_80D47E4 -sub_80D47E4: @ 80D47E4 +sub_80D47E4: ; 80D47E4 push {r4,lr} movs r0, 0x80 lsls r0, 7 @@ -402590,13 +402590,13 @@ sub_80D47E4: @ 80D47E4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080D486C + beq @080D486C ldr r4, =sub_80D487C + 1 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _080D4844 + bne @080D4844 adds r0, r4, 0 movs r1, 0x5A bl AddTask @@ -402620,10 +402620,10 @@ sub_80D47E4: @ 80D47E4 adds r0, r2 movs r1, 0x28 strh r1, [r0, 0xC] - b _080D486C + b @080D486C .align 2, 0 .pool -_080D4844: +@080D4844: ldr r3, =0x03005e00 ldr r2, =0x02039dd4 ldrb r0, [r2] @@ -402634,10 +402634,10 @@ _080D4844: movs r4, 0x8 ldrsh r0, [r1, r4] cmp r0, 0x2 - beq _080D485E + beq @080D485E movs r0, 0x2 strh r0, [r1, 0x8] -_080D485E: +@080D485E: ldrb r0, [r2] lsls r1, r0, 2 adds r1, r0 @@ -402645,7 +402645,7 @@ _080D485E: adds r1, r3 movs r0, 0x1 strh r0, [r1, 0xE] -_080D486C: +@080D486C: pop {r4} pop {r0} bx r0 @@ -402654,7 +402654,7 @@ _080D486C: thumb_func_end sub_80D47E4 thumb_func_start sub_80D487C -sub_80D487C: @ 80D487C +sub_80D487C: ; 80D487C push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -402667,24 +402667,24 @@ sub_80D487C: @ 80D487C ldrsh r1, [r4, r2] adds r3, r0, 0 cmp r1, 0x6 - bhi _080D4966 + bhi @080D4966 lsls r0, r1, 2 - ldr r1, =_080D48A8 + ldr r1, =@080D48A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080D48A8: - .4byte _080D48DE - .4byte _080D4908 - .4byte _080D4920 - .4byte _080D4966 - .4byte _080D494C - .4byte _080D4960 - .4byte _080D48C4 -_080D48C4: +@080D48A8: + .4byte @080D48DE + .4byte @080D4908 + .4byte @080D4920 + .4byte @080D4966 + .4byte @080D494C + .4byte @080D4960 + .4byte @080D48C4 +@080D48C4: ldrh r0, [r4, 0x10] adds r0, 0x1 movs r1, 0 @@ -402692,19 +402692,19 @@ _080D48C4: lsls r0, 16 asrs r0, 16 cmp r0, 0x1E - ble _080D4966 + ble @080D4966 strh r1, [r4, 0x8] strh r1, [r4, 0x10] bl sub_80D49B0 - b _080D4966 -_080D48DE: + b @080D4966 +@080D48DE: ldrh r0, [r4, 0xC] subs r0, 0x2 movs r2, 0 strh r0, [r4, 0xC] lsls r0, 16 cmp r0, 0 - bgt _080D4966 + bgt @080D4966 strh r2, [r4, 0xC] movs r0, 0x1 strh r0, [r4, 0x8] @@ -402715,23 +402715,23 @@ _080D48DE: lsls r0, 3 adds r0, r3 strh r2, [r0, 0xA] - b _080D4966 + b @080D4966 .align 2, 0 .pool -_080D4908: +@080D4908: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x78 - ble _080D4966 + ble @080D4966 movs r0, 0 strh r0, [r4, 0xA] movs r0, 0x2 strh r0, [r4, 0x8] - b _080D4966 -_080D4920: + b @080D4966 +@080D4920: ldrh r0, [r4, 0xC] adds r0, 0x2 movs r1, 0 @@ -402739,23 +402739,23 @@ _080D4920: lsls r0, 16 asrs r0, 16 cmp r0, 0x27 - ble _080D4966 + ble @080D4966 movs r0, 0x28 strh r0, [r4, 0xC] movs r2, 0xE ldrsh r0, [r4, r2] cmp r0, 0 - beq _080D4946 + beq @080D4946 movs r0, 0x6 strh r0, [r4, 0x8] strh r1, [r4, 0x10] strh r1, [r4, 0xE] - b _080D4966 -_080D4946: + b @080D4966 +@080D4946: movs r0, 0x4 strh r0, [r4, 0x8] - b _080D496E -_080D494C: + b @080D496E +@080D494C: bl rboxid_upload_textbox_1_no_pal lsls r0, 24 lsrs r0, 24 @@ -402763,28 +402763,28 @@ _080D494C: bl sub_819746C movs r0, 0x5 strh r0, [r4, 0x8] - b _080D4966 -_080D4960: + b @080D4966 +@080D4960: bl call_203AE8C - b _080D496E -_080D4966: + b @080D496E +@080D4966: ldrh r1, [r4, 0xC] movs r0, 0x12 bl lcd_io_set -_080D496E: +@080D496E: pop {r4} pop {r0} bx r0 thumb_func_end sub_80D487C thumb_func_start call_203AE8C -call_203AE8C: @ 80D4974 +call_203AE8C: ; 80D4974 push {lr} ldr r0, =sub_80D487C + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - beq _080D49A4 + beq @080D49A4 bl rboxid_upload_textbox_1_no_pal lsls r0, 24 lsrs r0, 24 @@ -402797,7 +402797,7 @@ call_203AE8C: @ 80D4974 ldr r0, =0x02039dd4 ldrb r0, [r0] bl remove_task -_080D49A4: +@080D49A4: pop {r0} bx r0 .align 2, 0 @@ -402805,27 +402805,27 @@ _080D49A4: thumb_func_end call_203AE8C thumb_func_start sub_80D49B0 -sub_80D49B0: @ 80D49B0 +sub_80D49B0: ; 80D49B0 push {r4,r5,lr} sub sp, 0x24 bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - beq _080D4A08 + beq @080D4A08 ldr r0, =0x02037318 ldrh r1, [r0, 0x12] movs r0, 0xBD lsls r0, 1 cmp r1, r0 - bne _080D49DC + bne @080D49DC mov r4, sp adds r4, 0xF ldr r0, =0x0857f544 ldr r1, [r0, 0x1C] - b _080D49F2 + b @080D49F2 .align 2, 0 .pool -_080D49DC: +@080D49DC: mov r4, sp adds r4, 0xF ldr r1, =0x0857f544 @@ -402837,13 +402837,13 @@ _080D49DC: lsls r0, 2 adds r0, r1 ldr r1, [r0] -_080D49F2: +@080D49F2: adds r0, r4, 0 bl gf_strcpy - b _080D4A18 + b @080D4A18 .align 2, 0 .pool -_080D4A08: +@080D4A08: mov r4, sp adds r4, 0xF ldr r0, =0x02037318 @@ -402851,7 +402851,7 @@ _080D4A08: adds r0, r4, 0 movs r2, 0 bl GetMapName -_080D4A18: +@080D4A18: bl sub_8197A40 bl sub_80D4BE0 movs r0, 0x7 @@ -402895,7 +402895,7 @@ _080D4A18: thumb_func_end sub_80D49B0 thumb_func_start sub_80D4A78 -sub_80D4A78: @ 80D4A78 +sub_80D4A78: ; 80D4A78 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -402926,7 +402926,7 @@ sub_80D4A78: @ 80D4A78 mov r8, r6 str r0, [sp, 0x18] subs r4, r1, 0x1 -_080D4AB4: +@080D4AB4: ldr r0, =0x0000021d adds r1, r5, r0 lsls r1, 16 @@ -402946,7 +402946,7 @@ _080D4AB4: adds r4, 0x1 adds r5, 0x1 cmp r5, 0xB - ble _080D4AB4 + ble @080D4AB4 ldr r1, =0x00000229 movs r0, 0x1 negs r0, r0 @@ -403027,7 +403027,7 @@ _080D4AB4: adds r0, r1, r2 lsls r4, r0, 24 movs r6, 0x1 -_080D4B8A: +@080D4B8A: ldr r3, =0x0000022f adds r1, r5, r3 lsls r1, 16 @@ -403047,7 +403047,7 @@ _080D4B8A: bl Bg_FillWramTileMapRectWithTileAndPalette adds r5, 0x1 cmp r5, 0xB - ble _080D4B8A + ble @080D4B8A add sp, 0x1C pop {r3-r5} mov r8, r3 @@ -403061,7 +403061,7 @@ _080D4B8A: thumb_func_end sub_80D4A78 thumb_func_start sub_80D4BE0 -sub_80D4BE0: @ 80D4BE0 +sub_80D4BE0: ; 80D4BE0 push {r4,r5,lr} sub sp, 0x8 bl rboxid_upload_textbox_1_no_pal @@ -403070,19 +403070,19 @@ sub_80D4BE0: @ 80D4BE0 ldr r0, =0x02037318 ldrb r1, [r0, 0x14] cmp r1, 0x57 - bls _080D4C0A + bls @080D4C0A cmp r1, 0xC4 - bls _080D4C08 + bls @080D4C08 adds r0, r1, 0 subs r0, 0x6D lsls r0, 16 lsrs r1, r0, 16 - b _080D4C0A + b @080D4C0A .align 2, 0 .pool -_080D4C08: +@080D4C08: movs r1, 0 -_080D4C0A: +@080D4C0A: ldr r0, =0x0857f464 adds r0, r1, r0 ldrb r4, [r0] @@ -403108,22 +403108,22 @@ _080D4C0A: ldr r0, =0x02037318 ldrb r0, [r0, 0x16] cmp r0, 0xE - bne _080D4C6C + bne @080D4C6C ldr r0, =0x0857f444 movs r1, 0xE0 movs r2, 0x20 bl gpu_pal_apply - b _080D4C7A + b @080D4C7A .align 2, 0 .pool -_080D4C6C: +@080D4C6C: lsls r0, r4, 5 ldr r1, =0x0857f384 adds r0, r1 movs r1, 0xE0 movs r2, 0x20 bl gpu_pal_apply -_080D4C7A: +@080D4C7A: lsls r1, r4, 4 subs r1, r4 lsls r1, 6 @@ -403146,7 +403146,7 @@ _080D4C7A: thumb_func_end sub_80D4BE0 thumb_func_start sub_80D4CA8 -sub_80D4CA8: @ 80D4CA8 +sub_80D4CA8: ; 80D4CA8 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -403157,7 +403157,7 @@ sub_80D4CA8: @ 80D4CA8 adds r5, r0, r1 ldrb r0, [r5] cmp r0, 0xFF - beq _080D4CEE + beq @080D4CEE adds r4, 0x64 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag @@ -403178,7 +403178,7 @@ sub_80D4CA8: @ 80D4CA8 bl obj_delete_and_free_tiles movs r0, 0xFF strb r0, [r5] -_080D4CEE: +@080D4CEE: pop {r4,r5} pop {r0} bx r0 @@ -403187,7 +403187,7 @@ _080D4CEE: thumb_func_end sub_80D4CA8 thumb_func_start sub_80D4D00 -sub_80D4D00: @ 80D4D00 +sub_80D4D00: ; 80D4D00 push {r4,r5,lr} adds r5, r0, 0 lsls r5, 24 @@ -403213,7 +403213,7 @@ sub_80D4D00: @ 80D4D00 thumb_func_end sub_80D4D00 thumb_func_start sub_80D4D38 -sub_80D4D38: @ 80D4D38 +sub_80D4D38: ; 80D4D38 push {lr} lsls r0, 24 lsrs r3, r0, 24 @@ -403229,7 +403229,7 @@ sub_80D4D38: @ 80D4D38 ldr r2, =0x02020630 adds r2, r0, r2 cmp r1, 0 - beq _080D4D84 + beq @080D4D84 ldr r0, =0x0000fffb strh r0, [r2, 0x26] ldr r0, =sub_80D4D94 + 1 @@ -403239,33 +403239,33 @@ sub_80D4D38: @ 80D4D38 adds r0, r2, 0 movs r1, 0 bl obj_anim_image_start - b _080D4D90 + b @080D4D90 .align 2, 0 .pool -_080D4D84: +@080D4D84: adds r1, r3, 0x1 lsls r1, 24 lsrs r1, 24 adds r0, r2, 0 bl obj_anim_image_start -_080D4D90: +@080D4D90: pop {r0} bx r0 thumb_func_end sub_80D4D38 thumb_func_start sub_80D4D94 -sub_80D4D94: @ 80D4D94 +sub_80D4D94: ; 80D4D94 push {r4,lr} adds r4, r0, 0 ldrh r1, [r4, 0x26] movs r2, 0x26 ldrsh r0, [r4, r2] cmp r0, 0 - beq _080D4DA8 + beq @080D4DA8 adds r0, r1, 0x1 strh r0, [r4, 0x26] - b _080D4DB8 -_080D4DA8: + b @080D4DB8 +@080D4DA8: ldrh r1, [r4, 0x2E] lsls r1, 24 lsrs r1, 24 @@ -403273,7 +403273,7 @@ _080D4DA8: bl obj_anim_image_start ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] -_080D4DB8: +@080D4DB8: pop {r4} pop {r0} bx r0 @@ -403282,7 +403282,7 @@ _080D4DB8: thumb_func_end sub_80D4D94 thumb_func_start sub_80D4DC4 -sub_80D4DC4: @ 80D4DC4 +sub_80D4DC4: ; 80D4DC4 push {r4,lr} ldr r0, =0x0203ce54 ldr r0, [r0] @@ -403300,13 +403300,13 @@ sub_80D4DC4: @ 80D4DC4 movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080D4DF4 + beq @080D4DF4 adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 ldr r0, =sub_80D4E0C + 1 str r0, [r4, 0x1C] -_080D4DF4: +@080D4DF4: pop {r4} pop {r0} bx r0 @@ -403315,7 +403315,7 @@ _080D4DF4: thumb_func_end sub_80D4DC4 thumb_func_start sub_80D4E0C -sub_80D4E0C: @ 80D4E0C +sub_80D4E0C: ; 80D4E0C push {r4,lr} adds r4, r0, 0 adds r0, 0x3F @@ -403323,13 +403323,13 @@ sub_80D4E0C: @ 80D4E0C movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080D4E28 + beq @080D4E28 adds r0, r4, 0 movs r1, 0 bl sub_8008258 ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] -_080D4E28: +@080D4E28: pop {r4} pop {r0} bx r0 @@ -403338,7 +403338,7 @@ _080D4E28: thumb_func_end sub_80D4E0C thumb_func_start sub_80D4E34 -sub_80D4E34: @ 80D4E34 +sub_80D4E34: ; 80D4E34 push {r4,r5,lr} adds r5, r0, 0 lsls r5, 16 @@ -403372,7 +403372,7 @@ sub_80D4E34: @ 80D4E34 thumb_func_end sub_80D4E34 thumb_func_start sub_80D4E8C -sub_80D4E8C: @ 80D4E8C +sub_80D4E8C: ; 80D4E8C ldrh r2, [r0, 0x30] ldrh r1, [r0, 0x34] adds r1, 0x1 @@ -403393,7 +403393,7 @@ sub_80D4E8C: @ 80D4E8C thumb_func_end sub_80D4E8C thumb_func_start sub_80D4EB0 -sub_80D4EB0: @ 80D4EB0 +sub_80D4EB0: ; 80D4EB0 push {r4,lr} adds r4, r0, 0 ldrb r1, [r4, 0x1] @@ -403408,14 +403408,14 @@ sub_80D4EB0: @ 80D4EB0 movs r0, 0x1 negs r0, r0 cmp r1, r0 - bne _080D4ED8 + bne @080D4ED8 ldr r0, =0x0857fb98 - b _080D4EDA + b @080D4EDA .align 2, 0 .pool -_080D4ED8: +@080D4ED8: ldr r0, =0x0857fb9c -_080D4EDA: +@080D4EDA: str r0, [r4, 0x10] adds r0, r4, 0 bl obj_alloc_rotscale_entry @@ -403443,7 +403443,7 @@ _080D4EDA: thumb_func_end sub_80D4EB0 thumb_func_start sub_80D4F14 -sub_80D4F14: @ 80D4F14 +sub_80D4F14: ; 80D4F14 push {r4,lr} adds r4, r0, 0 ldrh r0, [r4, 0x34] @@ -403454,17 +403454,17 @@ sub_80D4F14: @ 80D4F14 movs r1, 0x34 ldrsh r0, [r4, r1] cmp r0, 0x10 - bne _080D4F32 + bne @080D4F32 movs r0, 0x1 bl sub_80D4CA8 -_080D4F32: +@080D4F32: pop {r4} pop {r0} bx r0 thumb_func_end sub_80D4F14 thumb_func_start sub_80D4F38 -sub_80D4F38: @ 80D4F38 +sub_80D4F38: ; 80D4F38 push {r4-r6,lr} lsls r0, 16 lsrs r6, r0, 16 @@ -403477,7 +403477,7 @@ sub_80D4F38: @ 80D4F38 adds r5, r0, r1 ldrb r0, [r5] cmp r0, 0xFF - bne _080D4F86 + bne @080D4F86 adds r4, 0x66 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag @@ -403490,7 +403490,7 @@ sub_80D4F38: @ 80D4F38 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq _080D4F86 + beq @080D4F86 strb r2, [r5] ldr r1, =0x02020630 lsls r0, r2, 4 @@ -403501,7 +403501,7 @@ sub_80D4F38: @ 80D4F38 strh r1, [r0, 0x24] movs r1, 0x58 strh r1, [r0, 0x26] -_080D4F86: +@080D4F86: pop {r4-r6} pop {r0} bx r0 @@ -403510,7 +403510,7 @@ _080D4F86: thumb_func_end sub_80D4F38 thumb_func_start sub_80D4F98 -sub_80D4F98: @ 80D4F98 +sub_80D4F98: ; 80D4F98 push {lr} lsls r0, 24 movs r1, 0x80 @@ -403523,7 +403523,7 @@ sub_80D4F98: @ 80D4F98 thumb_func_end sub_80D4F98 thumb_func_start sub_80D4FAC -sub_80D4FAC: @ 80D4FAC +sub_80D4FAC: ; 80D4FAC push {lr} ldr r0, =0x0203ce54 ldr r0, [r0] @@ -403538,7 +403538,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 @@ -403556,7 +403556,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 @@ -403579,7 +403579,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} @@ -403594,12 +403594,12 @@ sub_80D5018: @ 80D5018 lsls r0, 1 adds r4, r0 movs r7, 0 -_080D5036: +@080D5036: adds r4, 0x20 movs r5, 0 adds r1, r7, 0x1 mov r8, r1 -_080D503E: +@080D503E: adds r0, r4, 0 adds r1, r6, 0 movs r2, 0x20 @@ -403610,16 +403610,16 @@ _080D503E: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls _080D503E + bls @080D503E cmp r7, 0x5 - beq _080D505C + beq @080D505C adds r4, 0x20 -_080D505C: +@080D505C: mov r1, r8 lsls r0, r1, 24 lsrs r7, r0, 24 cmp r7, 0x5 - bls _080D5036 + bls @080D5036 pop {r3} mov r8, r3 pop {r4-r7} @@ -403628,16 +403628,16 @@ _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 lsrs r0, 24 adds r4, r0, 0 cmp r4, 0x2A - bne _080D5082 + bne @080D5082 bl sub_80E162C -_080D5082: +@080D5082: ldr r5, =0x0857fc94 lsls r4, 3 adds r0, r5, 0x4 @@ -403670,7 +403670,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 @@ -403700,7 +403700,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 gpu_pal_free_tag @@ -403711,7 +403711,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} @@ -403743,7 +403743,7 @@ sub_80D511C: @ 80D511C adds r4, r1, 0 mov r0, r8 cmp r0, 0x1 - bne _080D5172 + bne @080D5172 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -403751,7 +403751,7 @@ sub_80D511C: @ 80D511C adds r0, r1 movs r1, 0x1 bl sub_8008258 -_080D5172: +@080D5172: adds r0, r4, 0 pop {r3} mov r8, r3 @@ -403763,7 +403763,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, =0x0857fe10 @@ -403781,7 +403781,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 @@ -403791,13 +403791,13 @@ sub_80D51AC: @ 80D51AC lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - bne _080D51D0 + bne @080D51D0 adds r0, r5, 0 bl move_anim_task_del - b _080D520C + b @080D520C .align 2, 0 .pool -_080D51D0: +@080D51D0: ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -403827,7 +403827,7 @@ _080D51D0: str r1, [r0] adds r0, r5, 0 bl _call_via_r1 -_080D520C: +@080D520C: pop {r4,r5} pop {r0} bx r0 @@ -403836,7 +403836,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 @@ -403850,7 +403850,7 @@ sub_80D5220: @ 80D5220 ldrsh r5, [r3, r2] adds r7, r1, 0 cmp r5, 0 - bne _080D52C6 + bne @080D52C6 ldr r2, =0x02020630 movs r6, 0x8 ldrsh r1, [r3, r6] @@ -403862,15 +403862,15 @@ sub_80D5220: @ 80D5220 ldrsh r0, [r1, r6] adds r6, r2, 0 cmp r0, 0 - bne _080D5264 + bne @080D5264 ldrh r0, [r3, 0x10] strh r0, [r1, 0x24] - b _080D5266 + b @080D5266 .align 2, 0 .pool -_080D5264: +@080D5264: strh r5, [r1, 0x24] -_080D5266: +@080D5266: lsls r2, r4, 2 adds r0, r2, r4 lsls r0, 3 @@ -403884,12 +403884,12 @@ _080D5266: movs r5, 0x26 ldrsh r0, [r1, r5] cmp r0, 0 - bne _080D5286 + bne @080D5286 ldrh r0, [r3, 0x12] - b _080D5288 -_080D5286: + b @080D5288 +@080D5286: movs r0, 0 -_080D5288: +@080D5288: strh r0, [r1, 0x26] adds r0, r2, r4 lsls r0, 3 @@ -403902,7 +403902,7 @@ _080D5288: lsls r0, 16 asrs r3, r0, 16 cmp r3, 0 - bne _080D52CA + bne @080D52CA movs r0, 0x8 ldrsh r1, [r2, r0] lsls r0, r1, 4 @@ -403919,18 +403919,18 @@ _080D5288: strh r3, [r0, 0x26] adds r0, r4, 0 bl move_anim_task_del - b _080D52CA -_080D52C6: + b @080D52CA +@080D52C6: subs r0, 0x1 strh r0, [r3, 0xE] -_080D52CA: +@080D52CA: pop {r4-r7} pop {r0} bx r0 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 @@ -403940,45 +403940,45 @@ sub_80D52D0: @ 80D52D0 movs r3, 0 ldrsh r1, [r2, r3] cmp r1, 0x3 - bgt _080D52FC + bgt @080D52FC lsls r0, 24 lsrs r0, 24 bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0xFF - bne _080D5352 - b _080D5356 + bne @080D5352 + b @080D5356 .align 2, 0 .pool -_080D52FC: +@080D52FC: cmp r1, 0x8 - beq _080D5348 + beq @080D5348 movs r1, 0 ldrsh r0, [r2, r1] cmp r0, 0x5 - beq _080D531C + beq @080D531C cmp r0, 0x5 - bgt _080D5312 + bgt @080D5312 cmp r0, 0x4 - beq _080D5318 - b _080D5324 -_080D5312: + beq @080D5318 + b @080D5324 +@080D5312: cmp r0, 0x6 - beq _080D5320 - b _080D5324 -_080D5318: + beq @080D5320 + b @080D5324 +@080D5318: movs r0, 0 - b _080D5326 -_080D531C: + b @080D5326 +@080D531C: movs r0, 0x2 - b _080D5326 -_080D5320: + b @080D5326 +@080D5320: movs r0, 0x1 - b _080D5326 -_080D5324: + b @080D5326 +@080D5324: movs r0, 0x3 -_080D5326: +@080D5326: bl battle_get_side_with_given_state lsls r0, 24 lsrs r4, r0, 24 @@ -403986,31 +403986,31 @@ _080D5326: bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - bne _080D533C + bne @080D533C movs r6, 0x1 -_080D533C: +@080D533C: ldr r0, =0x020241e4 adds r0, r4, r0 - b _080D5350 + b @080D5350 .align 2, 0 .pool -_080D5348: +@080D5348: ldr r1, =0x020241e4 ldr r0, =0x02038436 ldrb r0, [r0] adds r0, r1 -_080D5350: +@080D5350: ldrb r3, [r0] -_080D5352: +@080D5352: cmp r6, 0 - beq _080D5368 -_080D5356: + beq @080D5368 +@080D5356: adds r0, r5, 0 bl move_anim_task_del - b _080D53A6 + b @080D53A6 .align 2, 0 .pool -_080D5368: +@080D5368: ldr r1, =0x02020630 lsls r0, r3, 4 adds r0, r3 @@ -404041,7 +404041,7 @@ _080D5368: str r1, [r0] adds r0, r5, 0 bl _call_via_r1 -_080D53A6: +@080D53A6: pop {r4-r6} pop {r0} bx r0 @@ -404050,7 +404050,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} @@ -404066,7 +404066,7 @@ sub_80D53BC: @ 80D53BC ldrsh r0, [r3, r4] mov r12, r1 cmp r0, 0 - bne _080D5474 + bne @080D5474 ldr r2, =0x02020630 movs r7, 0x8 ldrsh r1, [r3, r7] @@ -404081,15 +404081,15 @@ sub_80D53BC: @ 80D53BC ldrsh r0, [r3, r7] adds r7, r2, 0 cmp r1, r0 - bne _080D5408 + bne @080D5408 negs r0, r5 strh r0, [r4, 0x24] - b _080D540A + b @080D540A .align 2, 0 .pool -_080D5408: +@080D5408: strh r5, [r4, 0x24] -_080D540A: +@080D540A: lsls r3, r6, 2 adds r1, r3, r6 lsls r1, 3 @@ -404107,13 +404107,13 @@ _080D540A: movs r2, 0x12 ldrsh r0, [r1, r2] cmp r8, r0 - bne _080D5434 + bne @080D5434 negs r0, r5 strh r0, [r4, 0x26] - b _080D5436 -_080D5434: + b @080D5436 +@080D5434: strh r5, [r4, 0x26] -_080D5436: +@080D5436: adds r0, r3, r6 lsls r0, 3 mov r4, r12 @@ -404126,7 +404126,7 @@ _080D5436: lsls r0, 16 asrs r2, r0, 16 cmp r2, 0 - bne _080D5478 + bne @080D5478 movs r0, 0x8 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -404143,11 +404143,11 @@ _080D5436: strh r2, [r0, 0x26] adds r0, r6, 0 bl move_anim_task_del - b _080D5478 -_080D5474: + b @080D5478 +@080D5474: subs r0, r2, 0x1 strh r0, [r3, 0xE] -_080D5478: +@080D5478: pop {r3} mov r8, r3 pop {r4-r7} @@ -404156,7 +404156,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 @@ -404166,13 +404166,13 @@ sub_80D5484: @ 80D5484 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0xFF - bne _080D54A8 + bne @080D54A8 adds r0, r5, 0 bl move_anim_task_del - b _080D54F6 + b @080D54F6 .align 2, 0 .pool -_080D54A8: +@080D54A8: ldr r0, =0x02020630 lsls r1, r3, 4 adds r1, r3 @@ -404211,7 +404211,7 @@ _080D54A8: str r2, [r1] adds r0, r5, 0 bl _call_via_r2 -_080D54F6: +@080D54F6: pop {r4-r6} pop {r0} bx r0 @@ -404220,7 +404220,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 @@ -404234,14 +404234,14 @@ sub_80D5508: @ 80D5508 ldrsh r0, [r4, r3] adds r6, r1, 0 cmp r0, 0 - beq _080D5526 - b _080D5638 -_080D5526: + beq @080D5526 + b @080D5638 +@080D5526: ldrh r1, [r4, 0xA] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080D5568 + beq @080D5568 ldr r2, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] @@ -404264,10 +404264,10 @@ _080D5526: adds r1, r3 strh r1, [r0, 0x26] adds r3, r2, 0 - b _080D5592 + b @080D5592 .align 2, 0 .pool -_080D5568: +@080D5568: ldr r3, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] @@ -404289,7 +404289,7 @@ _080D5568: ldrh r2, [r4, 0x14] subs r1, r2 strh r1, [r0, 0x26] -_080D5592: +@080D5592: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -404304,11 +404304,11 @@ _080D5592: movs r6, 0xC ldrsh r1, [r4, r6] cmp r0, r1 - blt _080D563C + blt @080D563C movs r0, 0x1 ands r2, r0 cmp r2, 0 - beq _080D55F8 + beq @080D55F8 movs r1, 0x8 ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -404337,10 +404337,10 @@ _080D5592: ldrh r3, [r1, 0x26] adds r0, r3 strh r0, [r1, 0x26] - b _080D5630 + b @080D5630 .align 2, 0 .pool -_080D55F8: +@080D55F8: movs r6, 0x8 ldrsh r0, [r4, r6] lsls r2, r0, 4 @@ -404369,21 +404369,21 @@ _080D55F8: ldrh r0, [r2, 0x26] subs r0, r1 strh r0, [r2, 0x26] -_080D5630: +@080D5630: adds r0, r5, 0 bl move_anim_task_del - b _080D563C -_080D5638: + b @080D563C +@080D5638: subs r0, r2, 0x1 strh r0, [r4, 0xE] -_080D563C: +@080D563C: pop {r4-r6} pop {r0} bx r0 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 @@ -404426,7 +404426,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 @@ -404447,7 +404447,7 @@ sub_80D56A4: @ 80D56A4 mov r12, r2 ldr r7, =0x02020630 cmp r0, r1 - bne _080D56F6 + bne @080D56F6 movs r0, 0 strh r0, [r3, 0x18] lsls r0, r5, 4 @@ -404460,16 +404460,16 @@ sub_80D56A4: @ 80D56A4 lsls r0, r4, 16 asrs r0, 16 cmp r2, r0 - bne _080D56EE + bne @080D56EE negs r0, r2 lsls r0, 16 lsrs r4, r0, 16 -_080D56EE: +@080D56EE: lsls r0, r4, 16 asrs r0, 16 adds r0, r3 strh r0, [r1, 0x24] -_080D56F6: +@080D56F6: lsls r2, r6, 2 adds r2, r6 lsls r2, 3 @@ -404491,10 +404491,10 @@ _080D56F6: strh r0, [r2, 0x10] lsls r0, 16 cmp r0, 0 - bne _080D5728 + bne @080D5728 adds r0, r6, 0 bl move_anim_task_del -_080D5728: +@080D5728: pop {r4-r7} pop {r0} bx r0 @@ -404503,7 +404503,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} @@ -404518,10 +404518,10 @@ sub_80D5738: @ 80D5738 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x5 - ble _080D575C + ble @080D575C movs r0, 0x5 strh r0, [r4, 0x8] -_080D575C: +@080D575C: movs r1, 0 movs r2, 0x8 ldrsh r0, [r4, r2] @@ -404532,17 +404532,17 @@ _080D575C: ldr r2, =sub_80D57B8 + 1 mov r8, r2 cmp r1, r0 - bge _080D5782 + bge @080D5782 adds r2, r0, 0 -_080D5774: +@080D5774: lsls r0, r6, 25 lsrs r6, r0, 24 adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, r2 - blt _080D5774 -_080D5782: + blt @080D5774 +@080D5782: adds r0, r4, r5 lsls r0, 3 add r0, r12 @@ -404568,7 +404568,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 @@ -404607,20 +404607,20 @@ sub_80D57B8: @ 80D57B8 ands r0, r1 strh r0, [r5, 0x12] cmp r0, 0 - bne _080D5810 + bne @080D5810 ldrh r0, [r5, 0xE] subs r0, 0x1 strh r0, [r5, 0xE] -_080D5810: +@080D5810: movs r2, 0xE ldrsh r0, [r5, r2] cmp r0, 0 - bne _080D5822 + bne @080D5822 strh r0, [r4, 0x24] strh r0, [r4, 0x26] adds r0, r6, 0 bl move_anim_task_del -_080D5822: +@080D5822: pop {r4-r6} pop {r0} bx r0 @@ -404629,7 +404629,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 @@ -404638,12 +404638,12 @@ sub_80D5830: @ 80D5830 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080D584C + beq @080D584C ldr r1, =0x0203841e ldrh r0, [r1, 0x2] negs r0, r0 strh r0, [r1, 0x2] -_080D584C: +@080D584C: adds r0, r4, 0 bl sub_80D5738 pop {r4} @@ -404654,7 +404654,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 @@ -404668,17 +404668,17 @@ sub_80D5860: @ 80D5860 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080D5890 + beq @080D5890 ldr r1, =0x0203841e ldrh r0, [r1, 0x2] negs r0, r0 - b _080D5894 + b @080D5894 .align 2, 0 .pool -_080D5890: +@080D5890: ldr r1, =0x0203841e ldrh r0, [r1, 0x2] -_080D5894: +@080D5894: strh r0, [r4, 0x30] ldrh r2, [r1] movs r0, 0 @@ -404704,7 +404704,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] @@ -404722,7 +404722,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 @@ -404757,7 +404757,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] @@ -404775,7 +404775,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 @@ -404783,16 +404783,16 @@ sub_80D5968: @ 80D5968 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _080D598C + bne @080D598C ldr r1, =0x020241e4 ldr r0, =0x02038436 - b _080D5990 + b @080D5990 .align 2, 0 .pool -_080D598C: +@080D598C: ldr r1, =0x020241e4 ldr r0, =0x02038437 -_080D5990: +@080D5990: ldrb r0, [r0] adds r0, r1 ldrb r7, [r0] @@ -404836,16 +404836,16 @@ _080D5990: movs r1, 0x2 ldrsh r0, [r5, r1] cmp r0, 0x1 - bne _080D5A00 + bne @080D5A00 strh r3, [r6, 0x32] - b _080D5A06 + b @080D5A06 .align 2, 0 .pool -_080D5A00: +@080D5A00: cmp r0, 0x2 - bne _080D5A06 + bne @080D5A06 strh r3, [r6, 0x30] -_080D5A06: +@080D5A06: ldr r0, =0x0203841e ldrh r1, [r0, 0x2] lsls r0, r7, 8 @@ -404862,7 +404862,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] @@ -404880,24 +404880,24 @@ sub_80D5A24: @ 80D5A24 movs r6, 0x2E ldrsh r1, [r2, r6] cmp r1, 0 - bne _080D5A64 + bne @080D5A64 cmp r4, 0x1 - bhi _080D5A4E + bhi @080D5A4E strh r1, [r3, 0x24] -_080D5A4E: +@080D5A4E: cmp r5, 0x2 - beq _080D5A56 + beq @080D5A56 cmp r5, 0 - bne _080D5A58 -_080D5A56: + bne @080D5A58 +@080D5A56: strh r1, [r3, 0x26] -_080D5A58: +@080D5A58: adds r0, r2, 0 bl move_anim_8072740 - b _080D5A8E + b @080D5A8E .align 2, 0 .pool -_080D5A64: +@080D5A64: subs r0, 0x1 strh r0, [r2, 0x2E] ldrh r1, [r2, 0x30] @@ -404919,28 +404919,28 @@ _080D5A64: ldrh r2, [r2, 0x3A] adds r0, r2 strh r0, [r3, 0x26] -_080D5A8E: +@080D5A8E: pop {r4-r6} pop {r0} bx r0 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 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _080D5AB0 + bne @080D5AB0 ldr r0, =0x02038436 - b _080D5AB2 + b @080D5AB2 .align 2, 0 .pool -_080D5AB0: +@080D5AB0: ldr r0, =0x02038437 -_080D5AB2: +@080D5AB2: ldrb r2, [r0] ldr r0, =0x020241e4 adds r0, r2, r0 @@ -404949,7 +404949,7 @@ _080D5AB2: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080D5ADC + beq @080D5ADC ldr r1, =0x0203841e ldrh r0, [r1, 0x2] negs r0, r0 @@ -404957,11 +404957,11 @@ _080D5AB2: movs r2, 0x6 ldrsh r0, [r1, r2] cmp r0, 0x1 - bne _080D5ADC + bne @080D5ADC ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] -_080D5ADC: +@080D5ADC: ldr r2, =0x0203841e ldrh r0, [r2, 0x8] movs r4, 0 @@ -405007,7 +405007,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 @@ -405020,14 +405020,14 @@ sub_80D5B48: @ 80D5B48 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _080D5B70 + bne @080D5B70 ldr r0, =0x02038436 - b _080D5B72 + b @080D5B72 .align 2, 0 .pool -_080D5B70: +@080D5B70: ldr r0, =0x02038437 -_080D5B72: +@080D5B72: ldrb r1, [r0] ldr r0, =0x020241e4 adds r0, r1, r0 @@ -405036,7 +405036,7 @@ _080D5B72: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080D5B9C + beq @080D5B9C ldr r1, =0x0203841e ldrh r0, [r1, 0x2] negs r0, r0 @@ -405044,11 +405044,11 @@ _080D5B72: movs r2, 0x6 ldrsh r0, [r1, r2] cmp r0, 0x1 - bne _080D5B9C + bne @080D5B9C ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] -_080D5B9C: +@080D5B9C: ldr r5, =0x0203841e ldrh r0, [r5, 0x8] strh r0, [r6, 0x2E] @@ -405084,18 +405084,18 @@ _080D5B9C: strh r0, [r6, 0x3A] lsls r0, 16 cmp r0, 0 - bne _080D5C04 + bne @080D5C04 ldr r1, =move_anim_8072740 + 1 adds r0, r6, 0 bl oamt_set_x3A_32 - b _080D5C0C + b @080D5C0C .align 2, 0 .pool -_080D5C04: +@080D5C04: ldr r1, =sub_80D5C20 + 1 adds r0, r6, 0 bl oamt_set_x3A_32 -_080D5C0C: +@080D5C0C: ldr r0, =sub_80A6680 + 1 str r0, [r6, 0x1C] pop {r4-r7} @@ -405106,7 +405106,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 @@ -405133,7 +405133,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 @@ -405150,14 +405150,14 @@ sub_80D5C50: @ 80D5C50 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080D5C82 + beq @080D5C82 ldrh r0, [r5, 0x2] negs r0, r0 strh r0, [r5, 0x2] ldrh r0, [r5, 0xA] negs r0, r0 strh r0, [r5, 0xA] -_080D5C82: +@080D5C82: ldrb r0, [r5] bl obj_id_for_side_relative_to_move ldr r1, =0x03005e00 @@ -405201,7 +405201,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 @@ -405238,10 +405238,10 @@ sub_80D5CE4: @ 80D5CE4 strh r0, [r5, 0xE] lsls r0, 16 cmp r0, 0 - bne _080D5D34 + bne @080D5D34 ldr r0, =sub_80D5D48 + 1 str r0, [r5] -_080D5D34: +@080D5D34: pop {r4,r5} pop {r0} bx r0 @@ -405250,7 +405250,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 @@ -405264,13 +405264,13 @@ sub_80D5D48: @ 80D5D48 movs r2, 0x10 ldrsh r0, [r4, r2] cmp r0, 0 - ble _080D5D70 + ble @080D5D70 subs r0, r1, 0x1 strh r0, [r4, 0x10] - b _080D5DA4 + b @080D5DA4 .align 2, 0 .pool -_080D5D70: +@080D5D70: ldrb r0, [r4, 0x8] ldrh r2, [r4, 0x12] ldrh r1, [r4, 0x20] @@ -405293,10 +405293,10 @@ _080D5D70: strh r0, [r4, 0x14] lsls r0, 16 cmp r0, 0 - bne _080D5DA4 + bne @080D5DA4 adds r0, r5, 0 bl move_anim_task_del -_080D5DA4: +@080D5DA4: pop {r4,r5} pop {r0} bx r0 @@ -405305,7 +405305,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 @@ -405313,50 +405313,50 @@ sub_80D5DB0: @ 80D5DB0 movs r2, 0 ldrsh r0, [r1, r2] cmp r0, 0x2 - beq _080D5DDE + beq @080D5DDE cmp r0, 0x2 - bgt _080D5DD8 + bgt @080D5DD8 cmp r0, 0 - blt _080D5E10 + blt @080D5E10 ldrb r0, [r1] bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r2, r0, 24 - b _080D5E18 + b @080D5E18 .align 2, 0 .pool -_080D5DD8: +@080D5DD8: cmp r0, 0x3 - beq _080D5DE8 - b _080D5E10 -_080D5DDE: + beq @080D5DE8 + b @080D5E10 +@080D5DDE: ldr r5, =0x02038436 - b _080D5DEA + b @080D5DEA .align 2, 0 .pool -_080D5DE8: +@080D5DE8: ldr r5, =0x02038437 -_080D5DEA: +@080D5DEA: ldrb r0, [r5] movs r4, 0x2 eors r0, r4 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _080D5E10 + beq @080D5E10 ldr r1, =0x020241e4 ldrb r0, [r5] eors r0, r4 adds r0, r1 ldrb r2, [r0] - b _080D5E18 + b @080D5E18 .align 2, 0 .pool -_080D5E10: +@080D5E10: adds r0, r6, 0 bl move_anim_task_del - b _080D5E58 -_080D5E18: + b @080D5E58 +@080D5E18: ldr r1, =0x03005e00 lsls r4, r6, 2 adds r0, r4, r6 @@ -405368,17 +405368,17 @@ _080D5E18: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080D5E44 + beq @080D5E44 ldr r0, =0x0203841e ldrh r0, [r0, 0x2] - b _080D5E4A + b @080D5E4A .align 2, 0 .pool -_080D5E44: +@080D5E44: ldr r0, =0x0203841e ldrh r0, [r0, 0x2] negs r0, r0 -_080D5E4A: +@080D5E4A: strh r0, [r5, 0xA] ldr r0, =0x03005e00 adds r1, r4, r6 @@ -405386,7 +405386,7 @@ _080D5E4A: adds r1, r0 ldr r0, =sub_80D5E6C + 1 str r0, [r1] -_080D5E58: +@080D5E58: pop {r4-r6} pop {r0} bx r0 @@ -405395,7 +405395,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 @@ -405423,10 +405423,10 @@ sub_80D5E6C: @ 80D5E6C movs r0, 0x98 lsls r0, 1 cmp r1, r0 - bls _080D5EAA + bls @080D5EAA adds r0, r4, 0 bl move_anim_task_del -_080D5EAA: +@080D5EAA: pop {r4} pop {r0} bx r0 @@ -405435,7 +405435,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 @@ -405444,12 +405444,12 @@ sub_80D5EB8: @ 80D5EB8 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080D5ED4 + beq @080D5ED4 ldr r1, =0x0203841e ldrh r0, [r1, 0x2] negs r0, r0 strh r0, [r1, 0x2] -_080D5ED4: +@080D5ED4: ldr r4, =0x0203841e ldrb r0, [r4, 0x8] bl obj_id_for_side_relative_to_move @@ -405472,15 +405472,15 @@ _080D5ED4: movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - bne _080D5F14 + bne @080D5F14 ldrb r0, [r6] - b _080D5F18 + b @080D5F18 .align 2, 0 .pool -_080D5F14: +@080D5F14: ldr r0, =0x02038437 ldrb r0, [r0] -_080D5F18: +@080D5F18: strh r0, [r2, 0x12] ldr r1, =0x03005e00 adds r0, r3, r5 @@ -405498,7 +405498,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 @@ -405528,7 +405528,7 @@ sub_80D5F3C: @ 80D5F3C movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - bne _080D5F94 + bne @080D5F94 ldr r0, =0x02020630 lsls r2, r7, 4 adds r1, r2, r7 @@ -405537,15 +405537,15 @@ sub_80D5F3C: @ 80D5F3C strh r5, [r1, 0x24] mov r9, r0 adds r4, r2, 0 - b _080D5FDA + b @080D5FDA .align 2, 0 .pool -_080D5F94: +@080D5F94: ldrb r0, [r4, 0x12] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _080D5FBC + bne @080D5FBC ldr r1, =0x02020630 lsls r2, r7, 4 adds r0, r2, r7 @@ -405556,11 +405556,11 @@ _080D5F94: mov r9, r1 adds r4, r2, 0 cmp r0, 0 - bge _080D5FD8 - b _080D5FD6 + bge @080D5FD8 + b @080D5FD6 .align 2, 0 .pool -_080D5FBC: +@080D5FBC: ldr r1, =0x02020630 lsls r2, r7, 4 adds r0, r2, r7 @@ -405572,16 +405572,16 @@ _080D5FBC: mov r9, r1 adds r4, r2, 0 cmp r0, 0 - bge _080D5FD6 + bge @080D5FD6 negs r0, r0 -_080D5FD6: +@080D5FD6: negs r0, r0 -_080D5FD8: +@080D5FD8: strh r0, [r3, 0x26] -_080D5FDA: +@080D5FDA: mov r5, r8 cmp r5, 0x7F - bls _080D5FFC + bls @080D5FFC ldr r1, =0x03005e00 lsls r2, r6, 2 adds r0, r2, r6 @@ -405591,15 +405591,15 @@ _080D5FDA: ldrsh r0, [r3, r5] adds r5, r1, 0 cmp r0, 0 - bne _080D5FFC + bne @080D5FFC movs r1, 0x20 ldrsh r0, [r3, r1] cmp r0, 0x1 - beq _080D601E -_080D5FFC: + beq @080D601E +@080D5FFC: mov r2, r8 cmp r2, 0x7E - bhi _080D6050 + bhi @080D6050 ldr r1, =0x03005e00 lsls r2, r6, 2 adds r0, r2, r6 @@ -405609,12 +405609,12 @@ _080D5FFC: ldrsh r0, [r3, r5] adds r5, r1, 0 cmp r0, 0x1 - bne _080D6050 + bne @080D6050 movs r1, 0x20 ldrsh r0, [r3, r1] cmp r0, 0 - bne _080D6050 -_080D601E: + bne @080D6050 +@080D601E: adds r1, r2, r6 lsls r1, 3 adds r1, r5 @@ -405631,7 +405631,7 @@ _080D601E: lsls r0, 16 asrs r3, r0, 16 cmp r3, 0 - bne _080D6050 + bne @080D6050 adds r0, r4, r7 lsls r0, 2 add r0, r9 @@ -405639,7 +405639,7 @@ _080D601E: strh r3, [r0, 0x26] adds r0, r6, 0 bl move_anim_task_del -_080D6050: +@080D6050: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -405651,7 +405651,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 @@ -405693,7 +405693,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 @@ -405726,12 +405726,12 @@ sub_80D60BC: @ 80D60BC lsls r0, 16 asrs r1, r0, 16 cmp r1, 0 - bne _080D612C + bne @080D612C ldrh r2, [r4, 0xE] movs r3, 0xE ldrsh r0, [r4, r3] cmp r0, 0 - ble _080D6120 + ble @080D6120 ldrh r0, [r4, 0x8] negs r0, r0 strh r0, [r4, 0x8] @@ -405740,22 +405740,22 @@ sub_80D60BC: @ 80D60BC strh r0, [r4, 0xA] strh r2, [r4, 0xC] strh r1, [r4, 0xE] - b _080D612C + b @080D612C .align 2, 0 .pool -_080D6120: +@080D6120: adds r0, r6, 0 bl sub_80A7344 adds r0, r5, 0 bl move_anim_task_del -_080D612C: +@080D612C: pop {r4-r6} pop {r0} bx r0 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} @@ -405781,19 +405781,19 @@ sub_80D6134: @ 80D6134 movs r3, 0x6 ldrsh r0, [r4, r3] cmp r0, 0x1 - beq _080D6178 + beq @080D6178 strh r1, [r2, 0xE] - b _080D6184 + b @080D6184 .align 2, 0 .pool -_080D6178: +@080D6178: ldrh r0, [r4] ldrh r1, [r4, 0x2] adds r3, r0, 0 muls r3, r1 adds r0, r3, 0 strh r0, [r2, 0xE] -_080D6184: +@080D6184: ldr r1, =0x03005e00 lsls r4, r7, 2 adds r0, r4, r7 @@ -405810,34 +405810,34 @@ _080D6184: lsls r0, 24 mov r8, r4 cmp r0, 0 - beq _080D61B8 + beq @080D61B8 movs r0, 0x1 strh r0, [r5, 0x16] - b _080D61DC + b @080D61DC .align 2, 0 .pool -_080D61B8: +@080D61B8: movs r1, 0x4 ldrsh r0, [r6, r1] cmp r0, 0 - bne _080D61C8 + bne @080D61C8 ldr r0, =0x02038436 - b _080D61CA + b @080D61CA .align 2, 0 .pool -_080D61C8: +@080D61C8: ldr r0, =0x02038437 -_080D61CA: +@080D61CA: ldrb r0, [r0] bl battle_side_get_owner movs r1, 0 lsls r0, 24 cmp r0, 0 - bne _080D61DA + bne @080D61DA movs r1, 0x1 -_080D61DA: +@080D61DA: strh r1, [r5, 0x16] -_080D61DC: +@080D61DC: ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 @@ -405846,11 +405846,11 @@ _080D61DC: movs r3, 0x16 ldrsh r0, [r4, r3] cmp r0, 0 - beq _080D6208 + beq @080D6208 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080D6208 + bne @080D6208 movs r1, 0xE ldrsh r0, [r4, r1] negs r0, r0 @@ -405859,7 +405859,7 @@ _080D61DC: ldrsh r0, [r4, r2] negs r0, r0 strh r0, [r4, 0x10] -_080D6208: +@080D6208: ldr r0, =0x03005e00 mov r3, r8 adds r1, r3, r7 @@ -405877,7 +405877,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} @@ -405903,29 +405903,29 @@ sub_80D622C: @ 80D622C movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0 - bne _080D6274 + bne @080D6274 ldr r0, =0x02038436 - b _080D6276 + b @080D6276 .align 2, 0 .pool -_080D6274: +@080D6274: ldr r0, =0x02038437 -_080D6276: +@080D6276: ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080D6288 + beq @080D6288 ldrh r0, [r4, 0x2] negs r0, r0 strh r0, [r4, 0x2] -_080D6288: +@080D6288: ldr r0, =0x0203841e movs r2, 0x6 ldrsh r1, [r0, r2] adds r6, r0, 0 cmp r1, 0x1 - beq _080D62B0 + beq @080D62B0 ldr r2, =0x03005e00 lsls r3, r5, 2 adds r0, r3, r5 @@ -405933,10 +405933,10 @@ _080D6288: adds r0, r2 movs r1, 0 strh r1, [r0, 0xE] - b _080D62CA + b @080D62CA .align 2, 0 .pool -_080D62B0: +@080D62B0: ldr r3, =0x03005e00 lsls r4, r5, 2 adds r0, r4, r5 @@ -405950,7 +405950,7 @@ _080D62B0: strh r1, [r0, 0xE] adds r2, r3, 0 adds r3, r4, 0 -_080D62CA: +@080D62CA: adds r1, r3, r5 lsls r1, 3 adds r1, r2 @@ -405982,7 +405982,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 @@ -406004,10 +406004,10 @@ sub_80D6308: @ 80D6308 movs r2, 0x16 ldrsh r0, [r4, r2] cmp r0, 0 - beq _080D633C + beq @080D633C ldrb r0, [r4, 0x12] bl sub_80A73A0 -_080D633C: +@080D633C: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] @@ -406016,26 +406016,26 @@ _080D633C: movs r2, 0xC ldrsh r1, [r4, r2] cmp r0, r1 - blt _080D6382 + blt @080D6382 movs r1, 0x14 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080D6364 + beq @080D6364 cmp r0, 0x1 - ble _080D636A + ble @080D636A cmp r0, 0x2 - beq _080D6372 - b _080D636A + beq @080D6372 + b @080D636A .align 2, 0 .pool -_080D6364: +@080D6364: ldrb r0, [r4, 0x12] bl sub_80A7344 -_080D636A: +@080D636A: adds r0, r5, 0 bl move_anim_task_del - b _080D6382 -_080D6372: + b @080D6382 +@080D6372: movs r0, 0 strh r0, [r4, 0xA] movs r2, 0x10 @@ -406044,14 +406044,14 @@ _080D6372: strh r0, [r4, 0x10] movs r0, 0x1 strh r0, [r4, 0x14] -_080D6382: +@080D6382: pop {r4,r5} pop {r0} bx r0 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} @@ -406062,7 +406062,7 @@ sub_80D6388: @ 80D6388 ldrsh r1, [r0, r2] mov r8, r0 cmp r1, 0 - bne _080D63C0 + bne @080D63C0 ldr r4, =0x03005e00 lsls r5, r7, 2 adds r0, r5, r7 @@ -406072,10 +406072,10 @@ sub_80D6388: @ 80D6388 ldrh r0, [r0] movs r1, 0xC bl __udivsi3 - b _080D63D4 + b @080D63D4 .align 2, 0 .pool -_080D63C0: +@080D63C0: ldr r4, =0x03005e00 lsls r5, r7, 2 adds r0, r5, r7 @@ -406085,22 +406085,22 @@ _080D63C0: ldr r0, [r0] movs r1, 0xC bl __divsi3 -_080D63D4: +@080D63D4: strh r0, [r6, 0x26] lsls r0, 16 adds r1, r4, 0 cmp r0, 0 - bgt _080D63E2 + bgt @080D63E2 movs r0, 0x1 strh r0, [r6, 0x26] -_080D63E2: +@080D63E2: movs r2, 0x26 ldrsh r0, [r6, r2] cmp r0, 0x10 - ble _080D63EE + ble @080D63EE movs r0, 0x10 strh r0, [r6, 0x26] -_080D63EE: +@080D63EE: adds r4, r5, r7 lsls r4, 3 adds r4, r1 @@ -406160,7 +406160,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 @@ -406177,7 +406177,7 @@ sub_80D646C: @ 80D646C movs r2, 0xA ldrsh r1, [r3, r2] cmp r0, r1 - ble _080D654A + ble @080D654A movs r0, 0 strh r0, [r3, 0x8] ldrh r0, [r3, 0x20] @@ -406188,9 +406188,9 @@ sub_80D646C: @ 80D646C movs r2, 0x1C ldrsh r0, [r3, r2] cmp r0, 0 - beq _080D64DE + beq @080D64DE cmp r1, 0 - beq _080D64C8 + beq @080D64C8 ldr r2, =0x02020630 movs r0, 0x16 ldrsh r1, [r3, r0] @@ -406201,10 +406201,10 @@ sub_80D646C: @ 80D646C ldrh r1, [r3, 0x22] ldrh r2, [r3, 0x18] adds r1, r2 - b _080D64DC + b @080D64DC .align 2, 0 .pool -_080D64C8: +@080D64C8: ldr r2, =0x02020630 movs r0, 0x16 ldrsh r1, [r3, r0] @@ -406215,17 +406215,17 @@ _080D64C8: ldrh r1, [r3, 0x18] ldrh r2, [r3, 0x24] subs r1, r2 -_080D64DC: +@080D64DC: strh r1, [r0, 0x24] -_080D64DE: +@080D64DE: movs r1, 0x1E ldrsh r0, [r3, r1] cmp r0, 0 - beq _080D6518 + beq @080D6518 movs r2, 0x20 ldrsh r4, [r3, r2] cmp r4, 0 - beq _080D6508 + beq @080D6508 ldr r2, =0x02020630 movs r0, 0x16 ldrsh r1, [r3, r0] @@ -406235,10 +406235,10 @@ _080D64DE: adds r0, r2 ldrh r1, [r3, 0x26] strh r1, [r0, 0x26] - b _080D6518 + b @080D6518 .align 2, 0 .pool -_080D6508: +@080D6508: ldr r2, =0x02020630 movs r0, 0x16 ldrsh r1, [r3, r0] @@ -406247,14 +406247,14 @@ _080D6508: lsls r0, 2 adds r0, r2 strh r4, [r0, 0x26] -_080D6518: +@080D6518: ldrh r0, [r3, 0xC] subs r0, 0x1 strh r0, [r3, 0xC] lsls r0, 16 asrs r4, r0, 16 cmp r4, 0 - bne _080D654A + bne @080D654A ldr r2, =0x02020630 movs r0, 0x16 ldrsh r1, [r3, r0] @@ -406272,7 +406272,7 @@ _080D6518: strh r4, [r0, 0x26] adds r0, r5, 0 bl move_anim_task_del -_080D654A: +@080D654A: pop {r4,r5} pop {r0} bx r0 @@ -406281,7 +406281,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] @@ -406297,7 +406297,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 @@ -406312,19 +406312,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 @@ -406334,7 +406334,7 @@ encrypt_decrypt_all_item_quantities: @ 80D658C movs r1, 0 ldr r0, =0x02039dd8 mov r9, r0 -_080D659E: +@080D659E: movs r6, 0 lsls r5, r1, 3 mov r2, r9 @@ -406342,9 +406342,9 @@ _080D659E: adds r7, r1, 0x1 ldrb r0, [r0, 0x4] cmp r6, r0 - bcs _080D65CC + bcs @080D65CC ldr r2, =0x02039dd8 -_080D65B0: +@080D65B0: adds r4, r5, r2 lsls r1, r6, 2 ldr r0, [r4] @@ -406357,11 +406357,11 @@ _080D65B0: ldr r2, [sp] ldrb r4, [r4, 0x4] cmp r6, r4 - bcc _080D65B0 -_080D65CC: + bcc @080D65B0 +@080D65CC: adds r1, r7, 0 cmp r1, 0x4 - bls _080D659E + bls @080D659E add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -406374,7 +406374,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} @@ -406382,8 +406382,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 @@ -406426,8 +406426,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 @@ -406442,35 +406442,35 @@ 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 lsrs r3, r0, 16 adds r1, r3, 0 cmp r3, 0x4 - bne _080D668C + bne @080D668C cmp r2, 0x1 - bhi _080D667C + bhi @080D667C movs r0, 0x4 bl itemid_get_item adds r1, r0, 0 - b _080D667E -_080D667C: + b @080D667E +@080D667C: ldr r1, =0x085efcd4 -_080D667E: +@080D667E: adds r0, r4, 0 bl gf_strcpy - b _080D66BE + b @080D66BE .align 2, 0 .pool -_080D668C: +@080D668C: adds r0, r3, 0 subs r0, 0x85 lsls r0, 16 lsrs r0, 16 cmp r0, 0x2A - bhi _080D66B0 + bhi @080D66B0 lsls r1, r3, 3 subs r1, r3 lsls r1, 2 @@ -406478,29 +406478,29 @@ _080D668C: adds r1, r0 adds r0, r4, 0 bl sub_80D66C4 - b _080D66BE + b @080D66BE .align 2, 0 .pool -_080D66B0: +@080D66B0: adds r0, r1, 0 bl itemid_get_item adds r1, r0, 0 adds r0, r4, 0 bl gf_strcpy -_080D66BE: +@080D66BE: pop {r4} pop {r0} bx r0 thumb_func_end sub_80D6660 thumb_func_start sub_80D66C4 -sub_80D66C4: @ 80D66C4 +sub_80D66C4: ; 80D66C4 push {r4,lr} ldr r4, =0x085efce5 cmp r2, 0x1 - bhi _080D66CE + bhi @080D66CE ldr r4, =0x085efcdf -_080D66CE: +@080D66CE: bl gf_strcpy movs r1, 0 strb r1, [r0] @@ -406515,7 +406515,7 @@ _080D66CE: thumb_func_end sub_80D66C4 thumb_func_start sub_80D66EC -sub_80D66EC: @ 80D66EC +sub_80D66EC: ; 80D66EC push {lr} lsls r0, 24 movs r2, 0 @@ -406525,33 +406525,33 @@ sub_80D66EC: @ 80D66EC adds r0, r1 ldrb r1, [r0, 0x4] cmp r2, r1 - bcs _080D671E + bcs @080D671E ldr r3, [r0] -_080D6702: +@080D6702: lsls r0, r2, 2 adds r0, r3 ldrh r0, [r0] cmp r0, 0 - beq _080D6714 + beq @080D6714 movs r0, 0x1 - b _080D6720 + b @080D6720 .align 2, 0 .pool -_080D6714: +@080D6714: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, r1 - bcc _080D6702 -_080D671E: + bcc @080D6702 +@080D671E: movs r0, 0 -_080D6720: +@080D6720: pop {r1} bx r1 thumb_func_end sub_80D66EC thumb_func_start sub_80D6724 -sub_80D6724: @ 80D6724 +sub_80D6724: ; 80D6724 push {r4-r7,lr} lsls r0, 16 lsrs r7, r0, 16 @@ -406561,30 +406561,30 @@ sub_80D6724: @ 80D6724 bl itemid_get_pocket_number lsls r0, 24 cmp r0, 0 - beq _080D67B6 + beq @080D67B6 bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _080D6752 + bne @080D6752 ldr r0, =0x00004004 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080D6768 -_080D6752: + bne @080D6768 +@080D6752: adds r0, r7, 0 adds r1, r5, 0 bl sub_80D710C lsls r0, 24 lsrs r0, 24 - b _080D67B8 + b @080D67B8 .align 2, 0 .pool -_080D6764: +@080D6764: movs r0, 0x1 - b _080D67B8 -_080D6768: + b @080D67B8 +@080D6768: adds r0, r7, 0 bl itemid_get_pocket_number subs r0, 0x1 @@ -406592,41 +406592,41 @@ _080D6768: movs r6, 0 ldr r1, =0x02039dd8 lsrs r4, r0, 21 - b _080D67AE + b @080D67AE .align 2, 0 .pool -_080D6780: +@080D6780: adds r0, r4, r1 ldr r1, [r0] lsls r0, r6, 2 adds r1, r0, r1 ldrh r0, [r1] cmp r0, r7 - bne _080D67A6 + bne @080D67A6 adds r0, r1, 0x2 bl decrypt_bag_item_quantity lsls r0, 16 lsrs r0, 16 cmp r0, r5 - bcs _080D6764 + bcs @080D6764 subs r0, r5, r0 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - beq _080D6764 -_080D67A6: + beq @080D6764 +@080D67A6: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 ldr r1, =0x02039dd8 -_080D67AE: +@080D67AE: adds r0, r4, r1 ldrb r0, [r0, 0x4] cmp r6, r0 - bcc _080D6780 -_080D67B6: + bcc @080D6780 +@080D67B6: movs r0, 0 -_080D67B8: +@080D67B8: pop {r4-r7} pop {r1} bx r1 @@ -406635,34 +406635,34 @@ _080D67B8: thumb_func_end sub_80D6724 thumb_func_start sub_80D67C4 -sub_80D67C4: @ 80D67C4 +sub_80D67C4: ; 80D67C4 push {r4,lr} movs r4, 0x85 -_080D67C8: +@080D67C8: adds r0, r4, 0 movs r1, 0x1 bl sub_80D6724 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x1 - bne _080D67E4 + bne @080D67E4 ldr r0, =0x020375f0 strh r1, [r0] movs r0, 0x1 - b _080D67F6 + b @080D67F6 .align 2, 0 .pool -_080D67E4: +@080D67E4: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0xB2 - bls _080D67C8 + bls @080D67C8 ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] movs r0, 0 -_080D67F6: +@080D67F6: pop {r4} pop {r1} bx r1 @@ -406671,7 +406671,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 @@ -406686,27 +406686,27 @@ sub_80D6800: @ 80D6800 bl itemid_get_pocket_number lsls r0, 24 cmp r0, 0 - beq _080D6906 + beq @080D6906 bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _080D6838 + bne @080D6838 ldr r0, =0x00004004 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080D684C -_080D6838: + bne @080D684C +@080D6838: mov r0, r8 adds r1, r5, 0 bl sub_80D7184 lsls r0, 24 lsrs r0, 24 - b _080D6916 + b @080D6916 .align 2, 0 .pool -_080D684C: +@080D684C: mov r0, r8 bl itemid_get_pocket_number subs r0, 0x1 @@ -406714,9 +406714,9 @@ _080D684C: lsrs r2, r0, 24 ldr r7, =0x000003e7 cmp r2, 0x3 - beq _080D6860 + beq @080D6860 movs r7, 0x63 -_080D6860: +@080D6860: movs r6, 0 ldr r1, =0x02039dd8 lsls r4, r2, 3 @@ -406724,19 +406724,19 @@ _080D6860: mov r9, r4 ldrb r0, [r0, 0x4] cmp r6, r0 - bcs _080D68BC + bcs @080D68BC subs r0, r2, 0x2 lsls r0, 24 lsrs r0, 24 mov r10, r0 -_080D6878: +@080D6878: adds r0, r4, r1 ldr r1, [r0] lsls r0, r6, 2 adds r1, r0, r1 ldrh r0, [r1] cmp r0, r8 - bne _080D68AC + bne @080D68AC adds r0, r1, 0x2 str r2, [sp] bl decrypt_bag_item_quantity @@ -406745,17 +406745,17 @@ _080D6878: adds r0, r1, r5 ldr r2, [sp] cmp r0, r7 - ble _080D6914 + ble @080D6914 mov r0, r10 cmp r0, 0x1 - bls _080D6906 + bls @080D6906 subs r0, r7, r1 subs r0, r5, r0 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - beq _080D6914 -_080D68AC: + beq @080D6914 +@080D68AC: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 @@ -406763,37 +406763,37 @@ _080D68AC: adds r0, r4, r1 ldrb r0, [r0, 0x4] cmp r6, r0 - bcc _080D6878 -_080D68BC: + bcc @080D6878 +@080D68BC: cmp r5, 0 - beq _080D6914 + beq @080D6914 movs r6, 0 ldr r3, =0x02039dd8 mov r1, r9 adds r0, r1, r3 ldrb r0, [r0, 0x4] cmp r6, r0 - bcs _080D6902 + bcs @080D6902 adds r4, r3, 0 subs r0, r2, 0x2 lsls r0, 24 lsrs r2, r0, 24 -_080D68D6: +@080D68D6: adds r0, r1, r4 ldr r1, [r0] lsls r0, r6, 2 adds r0, r1 ldrh r0, [r0] cmp r0, 0 - bne _080D68F2 + bne @080D68F2 cmp r5, r7 - bls _080D6914 + bls @080D6914 cmp r2, 0x1 - bls _080D6906 + bls @080D6906 subs r0, r5, r7 lsls r0, 16 lsrs r5, r0, 16 -_080D68F2: +@080D68F2: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 @@ -406801,18 +406801,18 @@ _080D68F2: adds r0, r1, r3 ldrb r0, [r0, 0x4] cmp r6, r0 - bcc _080D68D6 -_080D6902: + bcc @080D68D6 +@080D6902: cmp r5, 0 - beq _080D6914 -_080D6906: + beq @080D6914 +@080D6906: movs r0, 0 - b _080D6916 + b @080D6916 .align 2, 0 .pool -_080D6914: +@080D6914: movs r0, 0x1 -_080D6916: +@080D6916: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -406824,8 +406824,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 @@ -406840,30 +406840,30 @@ bag_add_item: @ 80D6928 bl itemid_get_pocket_number lsls r0, 24 cmp r0, 0 - bne _080D694C + bne @080D694C movs r0, 0 - b _080D6A92 -_080D694C: + b @080D6A92 +@080D694C: bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _080D6964 + bne @080D6964 ldr r0, =0x00004004 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080D6978 -_080D6964: + bne @080D6978 +@080D6964: mov r0, r9 adds r1, r5, 0 bl sub_80D7204 lsls r0, 24 lsrs r0, 24 - b _080D6A92 + b @080D6A92 .align 2, 0 .pool -_080D6978: +@080D6978: mov r0, r9 bl itemid_get_pocket_number subs r0, 0x1 @@ -406884,25 +406884,25 @@ _080D6978: ldr r2, =0x000003e7 mov r0, r10 cmp r0, 0x3 - beq _080D69AA + beq @080D69AA movs r2, 0x63 -_080D69AA: +@080D69AA: movs r6, 0 ldrb r0, [r7, 0x4] cmp r6, r0 - bcs _080D6A06 + bcs @080D6A06 mov r0, r10 subs r0, 0x2 lsls r0, 24 lsrs r0, 24 str r0, [sp] -_080D69BC: +@080D69BC: lsls r0, r6, 2 mov r3, r8 adds r1, r0, r3 ldrh r0, [r1] cmp r0, r9 - bne _080D69FA + bne @080D69FA adds r4, r1, 0x2 adds r0, r4, 0 str r2, [sp, 0x4] @@ -406912,10 +406912,10 @@ _080D69BC: adds r1, r0, r5 ldr r2, [sp, 0x4] cmp r1, r2 - ble _080D6A68 + ble @080D6A68 ldr r1, [sp] cmp r1, 0x1 - bls _080D6A74 + bls @080D6A74 subs r0, r2, r0 subs r0, r5, r0 lsls r0, 16 @@ -406925,44 +406925,44 @@ _080D69BC: bl encrypt_bag_item_quantity ldr r2, [sp, 0x4] cmp r5, 0 - beq _080D6A7E -_080D69FA: + beq @080D6A7E +@080D69FA: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 ldrb r0, [r7, 0x4] cmp r6, r0 - bcc _080D69BC -_080D6A06: + bcc @080D69BC +@080D6A06: cmp r5, 0 - beq _080D6A7E + beq @080D6A7E movs r6, 0 cmp r6, r0 - bcs _080D6A62 + bcs @080D6A62 mov r0, r10 subs r0, 0x2 lsls r0, 24 lsrs r4, r0, 24 -_080D6A18: +@080D6A18: lsls r0, r6, 2 mov r3, r8 adds r1, r0, r3 ldrh r0, [r1] cmp r0, 0 - bne _080D6A56 + bne @080D6A56 mov r0, r9 strh r0, [r1] cmp r5, r2 - bhi _080D6A40 + bhi @080D6A40 adds r0, r1, 0x2 adds r1, r5, 0 bl encrypt_bag_item_quantity - b _080D6A7E + b @080D6A7E .align 2, 0 .pool -_080D6A40: +@080D6A40: cmp r4, 0x1 - bls _080D6A74 + bls @080D6A74 subs r0, r5, r2 lsls r0, 16 lsrs r5, r0, 16 @@ -406971,29 +406971,29 @@ _080D6A40: str r2, [sp, 0x4] bl encrypt_bag_item_quantity ldr r2, [sp, 0x4] -_080D6A56: +@080D6A56: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 ldrb r1, [r7, 0x4] cmp r6, r1 - bcc _080D6A18 -_080D6A62: + bcc @080D6A18 +@080D6A62: cmp r5, 0 - beq _080D6A7E - b _080D6A74 -_080D6A68: + beq @080D6A7E + b @080D6A74 +@080D6A68: lsls r1, 16 lsrs r1, 16 adds r0, r4, 0 bl encrypt_bag_item_quantity - b _080D6A7E -_080D6A74: + b @080D6A7E +@080D6A74: mov r0, r8 bl free movs r0, 0 - b _080D6A92 -_080D6A7E: + b @080D6A92 +@080D6A7E: ldr r0, [r7] ldrb r2, [r7, 0x4] lsls r2, 2 @@ -407002,7 +407002,7 @@ _080D6A7E: mov r0, r8 bl free movs r0, 0x1 -_080D6A92: +@080D6A92: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -407014,7 +407014,7 @@ _080D6A92: thumb_func_end bag_add_item thumb_func_start sub_80D6AA4 -sub_80D6AA4: @ 80D6AA4 +sub_80D6AA4: ; 80D6AA4 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -407028,30 +407028,30 @@ sub_80D6AA4: @ 80D6AA4 bl itemid_get_pocket_number lsls r0, 24 cmp r0, 0 - beq _080D6B38 + beq @080D6B38 mov r0, r8 cmp r0, 0 - beq _080D6B38 + beq @080D6B38 bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _080D6AE0 + bne @080D6AE0 ldr r0, =0x00004004 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080D6AF4 -_080D6AE0: + bne @080D6AF4 +@080D6AE0: mov r0, r8 adds r1, r7, 0 bl sub_80D7334 lsls r0, 24 lsrs r0, 24 - b _080D6C5A + b @080D6C5A .align 2, 0 .pool -_080D6AF4: +@080D6AF4: mov r0, r8 bl itemid_get_pocket_number subs r0, 0x1 @@ -407064,40 +407064,40 @@ _080D6AF4: movs r6, 0 ldrb r2, [r5, 0x4] cmp r6, r2 - bcs _080D6B34 -_080D6B10: + bcs @080D6B34 +@080D6B10: ldr r0, [r5] lsls r1, r6, 2 adds r1, r0 ldrh r0, [r1] cmp r0, r8 - bne _080D6B28 + bne @080D6B28 adds r0, r1, 0x2 bl decrypt_bag_item_quantity adds r0, r4, r0 lsls r0, 16 lsrs r4, r0, 16 -_080D6B28: +@080D6B28: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 ldrb r0, [r5, 0x4] cmp r6, r0 - bcc _080D6B10 -_080D6B34: + bcc @080D6B10 +@080D6B34: cmp r4, r7 - bcs _080D6B40 -_080D6B38: + bcs @080D6B40 +@080D6B38: movs r0, 0 - b _080D6C5A + b @080D6C5A .align 2, 0 .pool -_080D6B40: +@080D6B40: bl sub_80E9214 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080D6B70 + bne @080D6B70 ldr r4, =0x000040ee adds r0, r4, 0 bl var_get @@ -407113,27 +407113,27 @@ _080D6B40: ldr r0, =0x000040ed mov r1, r8 bl var_set -_080D6B70: +@080D6B70: mov r0, r9 bl sub_81ABB2C lsls r0, 24 lsrs r1, r0, 24 ldrb r0, [r5, 0x4] cmp r0, r1 - bls _080D6BE6 + bls @080D6BE6 ldr r0, [r5] lsls r1, 2 adds r2, r1, r0 ldrh r0, [r2] adds r4, r1, 0 cmp r0, r8 - bne _080D6BE6 + bne @080D6BE6 adds r0, r2, 0x2 bl decrypt_bag_item_quantity lsls r0, 16 lsrs r1, r0, 16 cmp r1, r7 - bcc _080D6BB8 + bcc @080D6BB8 ldr r0, [r5] adds r0, r4 adds r0, 0x2 @@ -407142,10 +407142,10 @@ _080D6B70: lsrs r1, 16 bl encrypt_bag_item_quantity movs r7, 0 - b _080D6BCA + b @080D6BCA .align 2, 0 .pool -_080D6BB8: +@080D6BB8: subs r0, r7, r1 lsls r0, 16 lsrs r7, r0, 16 @@ -407154,7 +407154,7 @@ _080D6BB8: adds r0, 0x2 movs r1, 0 bl encrypt_bag_item_quantity -_080D6BCA: +@080D6BCA: ldr r0, [r5] adds r0, r4 adds r0, 0x2 @@ -407162,32 +407162,32 @@ _080D6BCA: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0 - bne _080D6BE2 + bne @080D6BE2 ldr r0, [r5] adds r0, r4, r0 strh r2, [r0] -_080D6BE2: +@080D6BE2: cmp r7, 0 - beq _080D6C58 -_080D6BE6: + beq @080D6C58 +@080D6BE6: movs r6, 0 ldrb r0, [r5, 0x4] cmp r6, r0 - bcs _080D6C58 -_080D6BEE: + bcs @080D6C58 +@080D6BEE: ldr r0, [r5] lsls r1, r6, 2 adds r2, r1, r0 ldrh r0, [r2] adds r4, r1, 0 cmp r0, r8 - bne _080D6C4C + bne @080D6C4C adds r0, r2, 0x2 bl decrypt_bag_item_quantity lsls r0, 16 lsrs r1, r0, 16 cmp r1, r7 - bcc _080D6C1E + bcc @080D6C1E ldr r0, [r5] adds r0, r4 adds r0, 0x2 @@ -407196,8 +407196,8 @@ _080D6BEE: lsrs r1, 16 bl encrypt_bag_item_quantity movs r7, 0 - b _080D6C30 -_080D6C1E: + b @080D6C30 +@080D6C1E: subs r0, r7, r1 lsls r0, 16 lsrs r7, r0, 16 @@ -407206,7 +407206,7 @@ _080D6C1E: adds r0, 0x2 movs r1, 0 bl encrypt_bag_item_quantity -_080D6C30: +@080D6C30: ldr r0, [r5] adds r0, r4 adds r0, 0x2 @@ -407214,23 +407214,23 @@ _080D6C30: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0 - bne _080D6C48 + bne @080D6C48 ldr r0, [r5] adds r0, r4, r0 strh r2, [r0] -_080D6C48: +@080D6C48: cmp r7, 0 - beq _080D6C58 -_080D6C4C: + beq @080D6C58 +@080D6C4C: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 ldrb r2, [r5, 0x4] cmp r6, r2 - bcc _080D6BEE -_080D6C58: + bcc @080D6BEE +@080D6C58: movs r0, 0x1 -_080D6C5A: +@080D6C5A: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -407240,7 +407240,7 @@ _080D6C5A: thumb_func_end sub_80D6AA4 thumb_func_start sub_80D6C68 -sub_80D6C68: @ 80D6C68 +sub_80D6C68: ; 80D6C68 push {lr} lsls r0, 16 lsrs r0, 16 @@ -407252,17 +407252,17 @@ 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 movs r4, 0 lsrs r1, 24 cmp r4, r1 - bcs _080D6CA6 + bcs @080D6CA6 adds r5, r1, 0 movs r7, 0 -_080D6C8E: +@080D6C8E: lsls r0, r4, 2 adds r0, r6 strh r7, [r0] @@ -407273,22 +407273,22 @@ _080D6C8E: lsls r0, 16 lsrs r4, r0, 16 cmp r4, r5 - bcc _080D6C8E -_080D6CA6: + bcc @080D6C8E +@080D6CA6: pop {r4-r7} pop {r0} bx r0 thumb_func_end sub_80D6C7C thumb_func_start sub_80D6CAC -sub_80D6CAC: @ 80D6CAC +sub_80D6CAC: ; 80D6CAC push {lr} movs r1, 0 ldr r0, =0x03005d8c ldr r2, [r0] movs r3, 0x93 lsls r3, 3 -_080D6CB8: +@080D6CB8: lsls r0, r1, 24 asrs r1, r0, 24 lsls r0, r1, 2 @@ -407296,27 +407296,27 @@ _080D6CB8: adds r0, r3 ldrh r0, [r0] cmp r0, 0 - bne _080D6CD0 + bne @080D6CD0 adds r0, r1, 0 - b _080D6CE0 + b @080D6CE0 .align 2, 0 .pool -_080D6CD0: +@080D6CD0: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 asrs r0, 24 cmp r0, 0x31 - ble _080D6CB8 + ble @080D6CB8 movs r0, 0x1 negs r0, r0 -_080D6CE0: +@080D6CE0: pop {r1} bx r1 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 @@ -407324,22 +407324,22 @@ sub_80D6CE4: @ 80D6CE4 ldr r3, [r0] movs r4, 0x93 lsls r4, 3 -_080D6CF2: +@080D6CF2: lsls r0, r1, 2 adds r0, r3, r0 adds r0, r4 ldrh r0, [r0] cmp r0, 0 - beq _080D6D04 + beq @080D6D04 adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 -_080D6D04: +@080D6D04: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x31 - bls _080D6CF2 + bls @080D6CF2 adds r0, r2, 0 pop {r4} pop {r1} @@ -407349,14 +407349,14 @@ _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 lsls r1, 16 lsrs r5, r1, 16 movs r4, 0 -_080D6D28: +@080D6D28: ldr r0, =0x03005d8c ldr r2, [r0] lsls r1, r4, 2 @@ -407366,7 +407366,7 @@ _080D6D28: adds r0, r3 ldrh r0, [r0] cmp r0, r6 - bne _080D6D5C + bne @080D6D5C adds r0, r1, r2 ldr r1, =0x0000049a adds r0, r1 @@ -407374,26 +407374,26 @@ _080D6D28: lsls r0, 16 lsrs r0, 16 cmp r0, r5 - bcc _080D6D5C + bcc @080D6D5C movs r0, 0x1 - b _080D6D68 + b @080D6D68 .align 2, 0 .pool -_080D6D5C: +@080D6D5C: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x31 - bls _080D6D28 + bls @080D6D28 movs r0, 0 -_080D6D68: +@080D6D68: pop {r4-r6} pop {r1} bx r1 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} @@ -407414,12 +407414,12 @@ sub_80D6D70: @ 80D6D70 movs r2, 0xC8 bl memcpy movs r6, 0 -_080D6D9C: +@080D6D9C: lsls r0, r6, 2 adds r1, r0, r7 ldrh r0, [r1] cmp r0, r8 - bne _080D6DD0 + bne @080D6DD0 adds r4, r1, 0x2 adds r0, r4, 0 bl sub_80D6584 @@ -407428,7 +407428,7 @@ _080D6D9C: adds r1, r2, r5 ldr r3, =0x000003e7 cmp r1, r3 - ble _080D6E04 + ble @080D6E04 ldr r1, =0x0000fc19 adds r0, r5, r1 adds r0, r2, r0 @@ -407438,35 +407438,35 @@ _080D6D9C: adds r1, r3, 0 bl sub_80D6588 cmp r5, 0 - beq _080D6E20 -_080D6DD0: + beq @080D6E20 +@080D6DD0: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x31 - bls _080D6D9C + bls @080D6D9C cmp r5, 0 - beq _080D6E20 + beq @080D6E20 bl sub_80D6CAC lsls r0, 24 asrs r1, r0, 24 movs r0, 0x1 negs r0, r0 cmp r1, r0 - bne _080D6E10 + bne @080D6E10 adds r0, r7, 0 bl free movs r0, 0 - b _080D6E3A + b @080D6E3A .align 2, 0 .pool -_080D6E04: +@080D6E04: lsls r1, 16 lsrs r1, 16 adds r0, r4, 0 bl sub_80D6588 - b _080D6E20 -_080D6E10: + b @080D6E20 +@080D6E10: lsls r0, r1, 2 adds r0, r7 mov r1, r8 @@ -407474,7 +407474,7 @@ _080D6E10: adds r0, 0x2 adds r1, r5, 0 bl sub_80D6588 -_080D6E20: +@080D6E20: ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x93 @@ -407486,7 +407486,7 @@ _080D6E20: adds r0, r7, 0 bl free movs r0, 0x1 -_080D6E3A: +@080D6E3A: pop {r3} mov r8, r3 pop {r4-r7} @@ -407497,7 +407497,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 @@ -407514,13 +407514,13 @@ sub_80D6E48: @ 80D6E48 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - bne _080D6E76 + bne @080D6E76 movs r2, 0x93 lsls r2, 3 adds r0, r3, r2 strh r1, [r0] bl sub_80D6E84 -_080D6E76: +@080D6E76: pop {r0} bx r0 .align 2, 0 @@ -407528,29 +407528,29 @@ _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: +@080D6E88: adds r1, r2, 0x1 lsls r0, r1, 16 lsrs r4, r0, 16 adds r6, r1, 0 cmp r4, 0x31 - bhi _080D6ECA + bhi @080D6ECA ldr r0, =0x03005d8c mov r12, r0 lsls r5, r2, 2 movs r7, 0x93 lsls r7, 3 -_080D6E9E: +@080D6E9E: mov r0, r12 ldr r1, [r0] adds r0, r1, r5 adds r0, r7 ldrh r0, [r0] cmp r0, 0 - bne _080D6EC0 + bne @080D6EC0 movs r0, 0x93 lsls r0, 3 adds r1, r0 @@ -407561,17 +407561,17 @@ _080D6E9E: ldr r0, [r1] str r0, [r2] str r3, [r1] -_080D6EC0: +@080D6EC0: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x31 - bls _080D6E9E -_080D6ECA: + bls @080D6E9E +@080D6ECA: lsls r0, r6, 16 lsrs r2, r0, 16 cmp r2, 0x30 - bls _080D6E88 + bls @080D6E88 pop {r4-r7} pop {r0} bx r0 @@ -407580,7 +407580,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] @@ -407589,29 +407589,29 @@ sub_80D6EDC: @ 80D6EDC ldrh r2, [r1] ldr r3, =0x00000103 cmp r2, r3 - beq _080D6F04 + beq @080D6F04 movs r0, 0x88 lsls r0, 1 cmp r2, r0 - beq _080D6F0C - b _080D6F0E + beq @080D6F0C + b @080D6F0E .align 2, 0 .pool -_080D6F04: +@080D6F04: movs r0, 0x88 lsls r0, 1 strh r0, [r1] - b _080D6F0E -_080D6F0C: + b @080D6F0E +@080D6F0C: strh r3, [r1] -_080D6F0E: +@080D6F0E: pop {r0} bx r0 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 @@ -407628,8 +407628,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 @@ -407651,7 +407651,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] @@ -407660,69 +407660,69 @@ 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 - b _080D6FA6 -_080D6F6C: + b @080D6FA6 +@080D6F6C: adds r1, r3, 0x1 lsls r0, r1, 16 lsrs r4, r0, 16 adds r7, r1, 0 cmp r4, r2 - bcs _080D6FA2 + bcs @080D6FA2 lsls r5, r3, 2 -_080D6F7A: +@080D6F7A: ldr r0, [r6] adds r0, r5 adds r0, 0x2 bl decrypt_bag_item_quantity lsls r0, 16 cmp r0, 0 - bne _080D6F96 + bne @080D6F96 ldr r1, [r6] adds r0, r1, r5 lsls r2, r4, 2 adds r1, r2 bl swap32 -_080D6F96: +@080D6F96: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 ldrb r0, [r6, 0x4] cmp r4, r0 - bcc _080D6F7A -_080D6FA2: + bcc @080D6F7A +@080D6FA2: lsls r0, r7, 16 lsrs r3, r0, 16 -_080D6FA6: +@080D6FA6: ldrb r2, [r6, 0x4] subs r0, r2, 0x1 cmp r3, r0 - blt _080D6F6C + blt @080D6F6C pop {r4-r7} pop {r0} bx r0 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} adds r6, r0, 0 movs r3, 0 - b _080D701A -_080D6FC0: + b @080D701A +@080D6FC0: adds r1, r3, 0x1 lsls r0, r1, 16 lsrs r5, r0, 16 mov r8, r1 cmp r5, r2 - bcs _080D7014 + bcs @080D7014 lsls r7, r3, 2 -_080D6FCE: +@080D6FCE: ldr r0, [r6] adds r0, r7 adds r0, 0x2 @@ -407730,42 +407730,42 @@ _080D6FCE: lsls r0, 16 lsls r4, r5, 2 cmp r0, 0 - beq _080D6FFE + beq @080D6FFE ldr r0, [r6] adds r0, r4 adds r0, 0x2 bl decrypt_bag_item_quantity lsls r0, 16 cmp r0, 0 - beq _080D7008 + beq @080D7008 ldr r0, [r6] adds r1, r7, r0 adds r0, r4, r0 ldrh r1, [r1] ldrh r0, [r0] cmp r1, r0 - bls _080D7008 -_080D6FFE: + bls @080D7008 +@080D6FFE: ldr r1, [r6] adds r0, r1, r7 adds r1, r4 bl swap32 -_080D7008: +@080D7008: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 ldrb r0, [r6, 0x4] cmp r5, r0 - bcc _080D6FCE -_080D7014: + bcc @080D6FCE +@080D7014: mov r1, r8 lsls r0, r1, 16 lsrs r3, r0, 16 -_080D701A: +@080D701A: ldrb r2, [r6, 0x4] subs r0, r2, 0x1 cmp r3, r0 - blt _080D6FC0 + blt @080D6FC0 pop {r3} mov r8, r3 pop {r4-r7} @@ -407774,25 +407774,25 @@ _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 cmp r1, r3 - beq _080D708C + beq @080D708C lsls r0, r1, 2 adds r0, r4 ldr r6, [r0] cmp r3, r1 - bls _080D7064 + bls @080D7064 subs r3, 0x1 lsls r1, 16 lsls r0, r3, 16 asrs r2, r0, 16 cmp r1, r0 - bge _080D7086 + bge @080D7086 adds r5, r2, 0 -_080D704E: +@080D704E: asrs r2, r1, 16 lsls r0, r2, 2 adds r0, r4 @@ -407802,16 +407802,16 @@ _080D704E: lsls r1, r2, 16 asrs r0, r1, 16 cmp r0, r5 - blt _080D704E - b _080D7086 -_080D7064: + blt @080D704E + b @080D7086 +@080D7064: lsls r1, 16 lsls r0, r3, 16 asrs r2, r0, 16 cmp r1, r0 - ble _080D7086 + ble @080D7086 adds r5, r2, 0 -_080D7070: +@080D7070: asrs r2, r1, 16 lsls r1, r2, 2 adds r1, r4 @@ -407822,23 +407822,23 @@ _080D7070: lsls r1, r2, 16 asrs r0, r1, 16 cmp r0, r5 - bgt _080D7070 -_080D7086: + bgt @080D7070 +@080D7086: lsls r0, r3, 2 adds r0, r4 str r6, [r0] -_080D708C: +@080D708C: pop {r4-r6} pop {r0} bx r0 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 -_080D709A: +@080D709A: lsls r1, r4, 3 adds r1, r5 ldr r0, [r1] @@ -407848,7 +407848,7 @@ _080D709A: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x4 - bls _080D709A + bls @080D709A pop {r4,r5} pop {r0} bx r0 @@ -407857,7 +407857,7 @@ _080D709A: thumb_func_end sub_80D7094 thumb_func_start sub_80D70BC -sub_80D70BC: @ 80D70BC +sub_80D70BC: ; 80D70BC push {r4-r7,lr} lsls r0, 16 lsrs r6, r0, 16 @@ -407871,27 +407871,27 @@ sub_80D70BC: @ 80D70BC movs r4, 0 ldrb r0, [r5, 0x4] cmp r7, r0 - bcs _080D70FE -_080D70DA: + bcs @080D70FE +@080D70DA: ldr r0, [r5] lsls r1, r4, 2 adds r1, r0 ldrh r0, [r1] cmp r0, r6 - bne _080D70F2 + bne @080D70F2 adds r0, r1, 0x2 bl decrypt_bag_item_quantity adds r0, r7, r0 lsls r0, 16 lsrs r7, r0, 16 -_080D70F2: +@080D70F2: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 ldrb r0, [r5, 0x4] cmp r4, r0 - bcc _080D70DA -_080D70FE: + bcc @080D70DA +@080D70FE: adds r0, r7, 0 pop {r4-r7} pop {r1} @@ -407901,7 +407901,7 @@ _080D70FE: thumb_func_end sub_80D70BC thumb_func_start sub_80D710C -sub_80D710C: @ 80D710C +sub_80D710C: ; 80D710C push {r4,r5,lr} lsls r0, 16 lsrs r5, r0, 16 @@ -407928,41 +407928,41 @@ sub_80D710C: @ 80D710C adds r0, r1 adds r3, r0 movs r1, 0 -_080D7140: +@080D7140: lsls r0, r1, 1 adds r0, r2 ldrh r0, [r0] cmp r0, r5 - bne _080D7170 + bne @080D7170 adds r0, r3, r1 ldrb r0, [r0] cmp r0, r4 - bcs _080D715C + bcs @080D715C subs r0, r4, r0 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - bne _080D7170 -_080D715C: + bne @080D7170 +@080D715C: movs r0, 0x1 - b _080D717C + b @080D717C .align 2, 0 .pool -_080D7170: +@080D7170: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x9 - bls _080D7140 + bls @080D7140 movs r0, 0 -_080D717C: +@080D717C: pop {r4,r5} pop {r1} bx r1 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 @@ -407989,45 +407989,45 @@ sub_80D7184: @ 80D7184 adds r0, r1 adds r3, r0 movs r1, 0 -_080D71B8: +@080D71B8: lsls r0, r1, 1 adds r0, r2 ldrh r0, [r0] cmp r0, r5 - beq _080D71C6 + beq @080D71C6 cmp r0, 0 - bne _080D71F0 -_080D71C6: + bne @080D71F0 +@080D71C6: adds r0, r3, r1 ldrb r0, [r0] adds r0, r4 cmp r0, 0x63 - ble _080D71DA + ble @080D71DA subs r0, 0x63 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - bne _080D71F0 -_080D71DA: + bne @080D71F0 +@080D71DA: movs r0, 0x1 - b _080D71FC + b @080D71FC .align 2, 0 .pool -_080D71F0: +@080D71F0: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x9 - bls _080D71B8 + bls @080D71B8 movs r0, 0 -_080D71FC: +@080D71FC: pop {r4,r5} pop {r1} bx r1 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 @@ -408073,85 +408073,85 @@ sub_80D7204: @ 80D7204 movs r2, 0xA bl memcpy movs r2, 0 -_080D7266: +@080D7266: lsls r0, r2, 1 adds r0, r5 ldrh r0, [r0] cmp r0, r7 - bne _080D72AA + bne @080D72AA adds r1, r6, r2 ldrb r0, [r1] cmp r0, 0x62 - bhi _080D72AA + bhi @080D72AA adds r0, r4 strb r0, [r1] lsls r0, 24 lsrs r0, 24 cmp r0, 0x63 - bls _080D72A4 + bls @080D72A4 ldrb r0, [r1] subs r0, 0x63 lsls r0, 16 lsrs r4, r0, 16 movs r0, 0x63 strb r0, [r1] - b _080D72A6 + b @080D72A6 .align 2, 0 .pool -_080D72A4: +@080D72A4: movs r4, 0 -_080D72A6: +@080D72A6: cmp r4, 0 - beq _080D7304 -_080D72AA: + beq @080D7304 +@080D72AA: adds r0, r2, 0x1 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x9 - bls _080D7266 + bls @080D7266 cmp r4, 0 - beq _080D7304 + beq @080D7304 movs r2, 0 -_080D72BA: +@080D72BA: lsls r0, r2, 1 adds r1, r0, r5 ldrh r0, [r1] cmp r0, 0 - bne _080D72E6 + bne @080D72E6 strh r7, [r1] adds r1, r6, r2 strb r4, [r1] lsls r0, r4, 24 lsrs r0, 24 cmp r0, 0x63 - bls _080D72E0 + bls @080D72E0 ldrb r0, [r1] subs r0, 0x63 lsls r0, 16 lsrs r4, r0, 16 movs r0, 0x63 strb r0, [r1] - b _080D72E2 -_080D72E0: + b @080D72E2 +@080D72E0: movs r4, 0 -_080D72E2: +@080D72E2: cmp r4, 0 - beq _080D7304 -_080D72E6: + beq @080D7304 +@080D72E6: adds r0, r2, 0x1 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x9 - bls _080D72BA + bls @080D72BA cmp r4, 0 - beq _080D7304 + beq @080D7304 adds r0, r5, 0 bl free adds r0, r6, 0 bl free movs r0, 0 - b _080D7326 -_080D7304: + b @080D7326 +@080D7304: mov r0, r9 adds r1, r5, 0 movs r2, 0x14 @@ -408165,7 +408165,7 @@ _080D7304: adds r0, r6, 0 bl free movs r0, 0x1 -_080D7326: +@080D7326: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -408175,7 +408175,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 @@ -408217,22 +408217,22 @@ sub_80D7334: @ 80D7334 adds r3, r0, r1 ldrh r0, [r3] cmp r0, r9 - bne _080D73B4 + bne @080D73B4 adds r1, r7, r2 ldrb r0, [r1] cmp r0, r4 - bcc _080D73B4 + bcc @080D73B4 subs r0, r4 strb r0, [r1] lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _080D744C + bne @080D744C strh r0, [r3] - b _080D744C + b @080D744C .align 2, 0 .pool -_080D73B4: +@080D73B4: movs r0, 0x14 bl malloc adds r5, r0, 0 @@ -408248,25 +408248,25 @@ _080D73B4: movs r2, 0xA bl memcpy movs r2, 0 -_080D73DA: +@080D73DA: lsls r0, r2, 1 adds r3, r0, r5 ldrh r0, [r3] cmp r0, r9 - bne _080D740E + bne @080D740E adds r1, r6, r2 ldrb r0, [r1] cmp r0, r4 - bcc _080D73FC + bcc @080D73FC subs r0, r4 strb r0, [r1] movs r4, 0 lsls r0, 24 cmp r0, 0 - bne _080D740A + bne @080D740A strh r4, [r3] - b _080D740A -_080D73FC: + b @080D740A +@080D73FC: subs r0, r4, r0 lsls r0, 16 lsrs r4, r0, 16 @@ -408274,24 +408274,24 @@ _080D73FC: strb r0, [r1] movs r0, 0 strh r0, [r3] -_080D740A: +@080D740A: cmp r4, 0 - beq _080D742C -_080D740E: + beq @080D742C +@080D740E: adds r0, r2, 0x1 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x9 - bls _080D73DA + bls @080D73DA cmp r4, 0 - beq _080D742C + beq @080D742C adds r0, r5, 0 bl free adds r0, r6, 0 bl free movs r0, 0 - b _080D744E -_080D742C: + b @080D744E +@080D742C: mov r0, r8 adds r1, r5, 0 movs r2, 0x14 @@ -408304,9 +408304,9 @@ _080D742C: bl free adds r0, r6, 0 bl free -_080D744C: +@080D744C: movs r0, 0x1 -_080D744E: +@080D744E: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -408316,26 +408316,26 @@ _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 movs r0, 0xBC lsls r0, 1 cmp r1, r0 - bhi _080D746E + bhi @080D746E adds r0, r1, 0 - b _080D7470 -_080D746E: + b @080D7470 +@080D746E: movs r0, 0 -_080D7470: +@080D7470: pop {r1} bx r1 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 @@ -408353,7 +408353,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 @@ -408373,7 +408373,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 @@ -408393,7 +408393,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 @@ -408413,7 +408413,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 @@ -408433,7 +408433,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 @@ -408454,7 +408454,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 @@ -408474,7 +408474,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 @@ -408494,7 +408494,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 @@ -408514,7 +408514,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 @@ -408534,7 +408534,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 @@ -408555,7 +408555,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 @@ -408576,7 +408576,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 @@ -408597,7 +408597,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 @@ -408618,12 +408618,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] @@ -408633,7 +408633,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 @@ -408691,7 +408691,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, =0x08c17ab0 movs r1, 0xC0 @@ -408715,7 +408715,7 @@ sub_80D7724: @ 80D7724 bl sub_80D782C movs r4, 0 movs r5, 0xA0 -_080D775E: +@080D775E: ldr r0, =0x0201a004 adds r0, r5, r0 ldr r1, =0x02039f26 @@ -408728,7 +408728,7 @@ _080D775E: adds r5, 0x20 adds r4, 0x1 cmp r4, 0x3 - ble _080D775E + ble @080D775E pop {r4,r5} pop {r0} bx r0 @@ -408737,7 +408737,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 gpu_reset_bgs_and_dma3_busy_flags @@ -408750,7 +408750,7 @@ sub_80D779C: @ 80D779C movs r2, 0x1 bl gpu_bg_config_set_field movs r4, 0 -_080D77BA: +@080D77BA: lsls r0, r4, 24 lsrs r0, 24 ldr r1, =0x02039f34 @@ -408762,7 +408762,7 @@ _080D77BA: bl bg_set_tilemap adds r4, 0x1 cmp r4, 0x3 - ble _080D77BA + ble @080D77BA pop {r4} pop {r0} bx r0 @@ -408771,7 +408771,7 @@ _080D77BA: thumb_func_end sub_80D779C thumb_func_start sub_80D77E4 -sub_80D77E4: @ 80D77E4 +sub_80D77E4: ; 80D77E4 push {lr} ldr r0, =0x08587f44 bl Window_InitFromTemplates @@ -408781,23 +408781,23 @@ sub_80D77E4: @ 80D77E4 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080D7818 + beq @080D7818 ldr r2, =0x03003014 ldrb r1, [r2] movs r0, 0x2 negs r0, r0 ands r0, r1 strb r0, [r2] - b _080D7822 + b @080D7822 .align 2, 0 .pool -_080D7818: +@080D7818: ldr r0, =0x03003014 ldrb r1, [r0] movs r2, 0x1 orrs r1, r2 strb r1, [r0] -_080D7822: +@080D7822: pop {r0} bx r0 .align 2, 0 @@ -408805,7 +408805,7 @@ _080D7822: thumb_func_end sub_80D77E4 thumb_func_start sub_80D782C -sub_80D782C: @ 80D782C +sub_80D782C: ; 80D782C push {r4,r5,lr} ldr r0, =0x08587c30 movs r1, 0xF0 @@ -408818,7 +408818,7 @@ sub_80D782C: @ 80D782C movs r5, 0xA movs r4, 0xFA lsls r4, 16 -_080D7848: +@080D7848: lsrs r1, r4, 16 ldr r0, =0x020378f6 movs r2, 0x2 @@ -408828,7 +408828,7 @@ _080D7848: adds r4, r0 adds r5, 0x1 cmp r5, 0xD - ble _080D7848 + ble @080D7848 ldr r0, =0x00007e3f movs r1, 0xF3 movs r2, 0x2 @@ -408841,7 +408841,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] @@ -408851,7 +408851,7 @@ sub_80D787C: @ 80D787C bl memset movs r5, 0 movs r2, 0xFF -_080D7890: +@080D7890: ldr r0, [r4] ldr r1, [r0] adds r1, 0x2 @@ -408861,11 +408861,11 @@ _080D7890: strb r0, [r1] adds r5, 0x1 cmp r5, 0x3 - ble _080D7890 + ble @080D7890 movs r4, 0 ldr r6, =0x02039f34 movs r5, 0x3 -_080D78AA: +@080D78AA: ldr r0, [r6] ldr r0, [r0, 0x4] adds r0, r4, r0 @@ -408875,14 +408875,14 @@ _080D78AA: adds r4, 0x1C subs r5, 0x1 cmp r5, 0 - bge _080D78AA + bge @080D78AA ldr r4, =0x02039f34 movs r7, 0x4 negs r7, r7 movs r6, 0xFF movs r3, 0 movs r5, 0x3 -_080D78CC: +@080D78CC: ldr r0, [r4] ldr r1, [r0, 0x4] adds r1, r3, r1 @@ -408905,7 +408905,7 @@ _080D78CC: adds r3, 0x1C subs r5, 0x1 cmp r5, 0 - bge _080D78CC + bge @080D78CC ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0, 0x8] @@ -408930,16 +408930,16 @@ _080D78CC: movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080D7938 + bne @080D7938 movs r0, 0 bl sub_80DCE58 -_080D7938: +@080D7938: movs r5, 0 adds r2, r4, 0 movs r6, 0xFF movs r3, 0 ldr r4, =0x02039f26 -_080D7942: +@080D7942: ldr r0, [r2] ldr r1, [r0, 0x4] adds r1, r3, r1 @@ -408956,7 +408956,7 @@ _080D7942: adds r3, 0x1C adds r5, 0x1 cmp r5, 0x3 - ble _080D7942 + ble @080D7942 bl sub_80DD590 ldr r0, =0x02039f34 ldr r0, [r0] @@ -408972,7 +408972,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 @@ -409060,7 +409060,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] @@ -409143,7 +409143,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 @@ -409151,21 +409151,21 @@ sub_80D7B24: @ 80D7B24 adds r6, r0, r1 ldrb r5, [r6] cmp r5, 0x1 - beq _080D7BD4 + beq @080D7BD4 cmp r5, 0x1 - bgt _080D7B44 + bgt @080D7B44 cmp r5, 0 - beq _080D7B4E - b _080D7C56 + beq @080D7B4E + b @080D7C56 .align 2, 0 .pool -_080D7B44: +@080D7B44: cmp r5, 0x2 - beq _080D7BDA + beq @080D7BDA cmp r5, 0x3 - beq _080D7C04 - b _080D7C56 -_080D7B4E: + beq @080D7C04 + b @080D7C56 +@080D7B4E: ldr r0, =0x02039f38 strb r5, [r0] bl sub_80D7988 @@ -409206,14 +409206,14 @@ _080D7B4E: strb r5, [r0] bl sub_806E414 bl sub_80D787C - b _080D7BF6 + b @080D7BF6 .align 2, 0 .pool -_080D7BD4: +@080D7BD4: movs r0, 0x2 strb r0, [r6] - b _080D7C56 -_080D7BDA: + b @080D7C56 +@080D7BDA: ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0] @@ -409221,20 +409221,20 @@ _080D7BDA: bl sub_80D7E44 lsls r0, 24 cmp r0, 0 - beq _080D7C56 + beq @080D7C56 ldr r0, [r4] ldr r0, [r0] adds r0, 0x59 movs r1, 0 strb r1, [r0] -_080D7BF6: +@080D7BF6: ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] - b _080D7C56 + b @080D7C56 .align 2, 0 .pool -_080D7C04: +@080D7C04: bl sub_80DE224 ldr r0, =0x02022e18 movs r1, 0 @@ -409264,12 +409264,12 @@ _080D7C04: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080D7C56 + beq @080D7C56 bl sub_800E0E8 movs r0, 0x8 movs r1, 0x8 bl sub_800DFB4 -_080D7C56: +@080D7C56: pop {r4-r6} pop {r0} bx r0 @@ -409278,7 +409278,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 @@ -409289,7 +409289,7 @@ sub_80D7C7C: @ 80D7C7C lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - bne _080D7CA2 + bne @080D7CA2 ldr r0, =0x03005e00 lsls r1, r3, 2 adds r1, r3 @@ -409298,7 +409298,7 @@ sub_80D7C7C: @ 80D7C7C strh r2, [r1, 0x8] ldr r0, =sub_80D7CB4 + 1 str r0, [r1] -_080D7CA2: +@080D7CA2: pop {r0} bx r0 .align 2, 0 @@ -409306,7 +409306,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 @@ -409315,11 +409315,11 @@ sub_80D7CB4: @ 80D7CB4 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080D7D90 + beq @080D7D90 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080D7D3A + beq @080D7D3A ldr r2, =0x03005e00 lsls r1, r5, 2 adds r0, r1, r5 @@ -409329,28 +409329,28 @@ sub_80D7CB4: @ 80D7CB4 ldrsh r0, [r4, r2] adds r6, r1, 0 cmp r0, 0x1 - beq _080D7D04 + beq @080D7D04 cmp r0, 0x1 - bgt _080D7CF4 + bgt @080D7CF4 cmp r0, 0 - beq _080D7CFA - b _080D7D3A + beq @080D7CFA + b @080D7D3A .align 2, 0 .pool -_080D7CF4: +@080D7CF4: cmp r0, 0x2 - beq _080D7D28 - b _080D7D3A -_080D7CFA: + beq @080D7D28 + b @080D7D3A +@080D7CFA: bl sub_80DBF68 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080D7D04: +@080D7D04: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080D7D9E + beq @080D7D9E bl sub_800ADF8 ldr r0, =0x03005e00 adds r1, r6, r5 @@ -409359,19 +409359,19 @@ _080D7D04: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _080D7D9E + b @080D7D9E .align 2, 0 .pool -_080D7D28: +@080D7D28: bl sub_800A520 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080D7D9E + bne @080D7D9E ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080D7D3A: +@080D7D3A: ldr r2, =0x02037fd4 ldrb r1, [r2, 0x7] movs r0, 0x80 @@ -409379,7 +409379,7 @@ _080D7D3A: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _080D7D9E + bne @080D7D9E ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -409389,9 +409389,9 @@ _080D7D3A: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _080D7D62 + bne @080D7D62 bl sub_80DBF68 -_080D7D62: +@080D7D62: ldr r0, =sub_80D7DAC + 1 movs r1, 0 bl AddTask @@ -409403,10 +409403,10 @@ _080D7D62: strh r4, [r0, 0x8] ldr r1, =nullsub_41 + 1 str r1, [r0] - b _080D7D9E + b @080D7D9E .align 2, 0 .pool -_080D7D90: +@080D7D90: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -409414,7 +409414,7 @@ _080D7D90: adds r1, r0 ldr r0, =sub_80D80C8 + 1 str r0, [r1] -_080D7D9E: +@080D7D9E: pop {r4-r6} pop {r0} bx r0 @@ -409423,7 +409423,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 @@ -409437,7 +409437,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 @@ -409455,7 +409455,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 @@ -409469,7 +409469,7 @@ sub_80D7DE8: @ 80D7DE8 strh r1, [r0, 0x8] lsls r1, 16 cmp r1, 0 - bgt _080D7E2A + bgt @080D7E2A bl link_get_multiplayer_id adds r0, r4, 0 bl remove_task @@ -409487,7 +409487,7 @@ sub_80D7DE8: @ 80D7DE8 ldr r0, =0x030060b8 ldr r0, [r0] str r0, [r1] -_080D7E2A: +@080D7E2A: pop {r4,r5} pop {r0} bx r0 @@ -409496,7 +409496,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 @@ -409506,26 +409506,26 @@ sub_80D7E44: @ 80D7E44 mov r10, r0 ldrb r0, [r0] cmp r0, 0x6 - bls _080D7E5A - b _080D80A4 -_080D7E5A: + bls @080D7E5A + b @080D80A4 +@080D7E5A: lsls r0, 2 - ldr r1, =_080D7E68 + ldr r1, =@080D7E68 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080D7E68: - .4byte _080D7E84 - .4byte _080D7EC8 - .4byte _080D7ED8 - .4byte _080D7F28 - .4byte _080D7F40 - .4byte _080D7F7C - .4byte _080D8004 -_080D7E84: +@080D7E68: + .4byte @080D7E84 + .4byte @080D7EC8 + .4byte @080D7ED8 + .4byte @080D7F28 + .4byte @080D7F40 + .4byte @080D7F7C + .4byte @080D8004 +@080D7E84: ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] movs r1, 0x80 @@ -409549,18 +409549,18 @@ _080D7E84: adds r2, r4, 0 movs r3, 0x1 bl RequestDma3Fill - b _080D80AE + b @080D80AE .align 2, 0 .pool -_080D7EC8: +@080D7EC8: ldr r0, =0x08c17ab0 movs r1, 0xC0 lsls r1, 19 bl call_LZZUnCompVram - b _080D80AE + b @080D80AE .align 2, 0 .pool -_080D7ED8: +@080D7ED8: ldr r0, =0x08c1850c ldr r4, =0x06002000 adds r1, r4, 0 @@ -409574,7 +409574,7 @@ _080D7ED8: lsls r2, 5 movs r7, 0x84 lsls r7, 24 -_080D7EF4: +@080D7EF4: str r4, [r1] str r3, [r1, 0x4] str r6, [r1, 0x8] @@ -409583,17 +409583,17 @@ _080D7EF4: adds r3, r2 subs r5, r2 cmp r5, r2 - bhi _080D7EF4 + bhi @080D7EF4 str r4, [r1] str r3, [r1, 0x4] lsrs r0, r5, 2 orrs r0, r7 str r0, [r1, 0x8] ldr r0, [r1, 0x8] - b _080D80AE + b @080D80AE .align 2, 0 .pool -_080D7F28: +@080D7F28: ldr r1, =0x08c16fa8 movs r0, 0x3 movs r2, 0 @@ -409601,10 +409601,10 @@ _080D7F28: bl gpu_copy_to_wram_bg_tile_map movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - b _080D80AE + b @080D80AE .align 2, 0 .pool -_080D7F40: +@080D7F40: ldr r1, =0x08c17170 movs r0, 0x2 movs r2, 0 @@ -409622,10 +409622,10 @@ _080D7F40: ldr r1, =0x84000200 str r1, [r0, 0x8] ldr r0, [r0, 0x8] - b _080D80AE + b @080D80AE .align 2, 0 .pool -_080D7F7C: +@080D7F7C: ldr r0, =0x08c16e90 movs r2, 0x80 lsls r2, 2 @@ -409671,10 +409671,10 @@ _080D7F7C: str r1, [r0, 0x8] ldr r0, [r0, 0x8] bl sub_80D782C - b _080D80AE + b @080D80AE .align 2, 0 .pool -_080D8004: +@080D8004: bl sub_80DD04C bl sub_80DBF90 bl sub_80DB2BC @@ -409723,22 +409723,22 @@ _080D8004: bl gpu_sync_bg_show movs r0, 0x1 bl gpu_sync_bg_show - b _080D80AE + b @080D80AE .align 2, 0 .pool -_080D80A4: +@080D80A4: movs r0, 0 mov r1, r10 strb r0, [r1] movs r0, 0x1 - b _080D80B8 -_080D80AE: + b @080D80B8 +@080D80AE: mov r2, r10 ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] movs r0, 0 -_080D80B8: +@080D80B8: add sp, 0x40 pop {r3-r5} mov r8, r3 @@ -409750,7 +409750,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 @@ -409765,7 +409765,7 @@ sub_80D80C8: @ 80D80C8 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - bne _080D80F8 + bne @080D80F8 ldr r0, =0x03005e00 lsls r1, r3, 2 adds r1, r3 @@ -409775,7 +409775,7 @@ sub_80D80C8: @ 80D80C8 strh r2, [r1, 0xA] ldr r0, =sub_80D8108 + 1 str r0, [r1] -_080D80F8: +@080D80F8: pop {r0} bx r0 .align 2, 0 @@ -409783,7 +409783,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 @@ -409797,22 +409797,22 @@ sub_80D8108: @ 80D8108 ldrsh r0, [r0, r2] adds r2, r1, 0 cmp r0, 0x4 - bhi _080D8208 + bhi @080D8208 lsls r0, 2 - ldr r1, =_080D8138 + ldr r1, =@080D8138 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080D8138: - .4byte _080D814C - .4byte _080D8176 - .4byte _080D8194 - .4byte _080D81B0 - .4byte _080D8208 -_080D814C: +@080D8138: + .4byte @080D814C + .4byte @080D8176 + .4byte @080D8194 + .4byte @080D81B0 + .4byte @080D8208 +@080D814C: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -409823,7 +409823,7 @@ _080D814C: lsls r0, 16 asrs r0, 16 cmp r0, 0x3C - ble _080D822C + ble @080D822C movs r0, 0 strh r0, [r4, 0xA] movs r0, 0x61 @@ -409832,8 +409832,8 @@ _080D814C: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080D822C -_080D8176: + b @080D822C +@080D8176: ldr r1, =0x02022e1a ldrh r0, [r1] adds r0, 0x7 @@ -409841,15 +409841,15 @@ _080D8176: lsls r0, 16 asrs r0, 16 cmp r0, 0xA0 - ble _080D822C + ble @080D822C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r2 - b _080D81FA + b @080D81FA .align 2, 0 .pool -_080D8194: +@080D8194: bl sub_80DE350 ldr r0, =0x03005e00 lsls r1, r5, 2 @@ -409859,10 +409859,10 @@ _080D8194: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _080D822C + b @080D822C .align 2, 0 .pool -_080D81B0: +@080D81B0: movs r0, 0x8 bl lcd_io_get mov r1, sp @@ -409895,14 +409895,14 @@ _080D81B0: adds r0, r5 lsls r0, 3 adds r0, r1 -_080D81FA: +@080D81FA: ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b _080D822C + b @080D822C .align 2, 0 .pool -_080D8208: +@080D8208: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] @@ -409912,7 +409912,7 @@ _080D8208: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _080D822C + bne @080D822C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -409921,7 +409921,7 @@ _080D8208: strh r1, [r0, 0xA] ldr r1, =sub_80D833C + 1 str r1, [r0] -_080D822C: +@080D822C: add sp, 0x4 pop {r4,r5} pop {r0} @@ -409931,28 +409931,28 @@ _080D822C: thumb_func_end sub_80D8108 thumb_func_start sub_80D823C -sub_80D823C: @ 80D823C +sub_80D823C: ; 80D823C push {r4,r5,lr} bl call_obj_callbacks bl run_active_tasks bl obj_sync_something bl fade_and_return_progress_probably movs r4, 0 -_080D8250: +@080D8250: ldr r5, =0x02039f38 ldrb r0, [r5] asrs r0, r4 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _080D8266 + beq @080D8266 lsls r0, r4, 24 lsrs r0, 24 bl gpu_copy_wram_bg_tilemap_to_vram -_080D8266: +@080D8266: adds r4, 0x1 cmp r4, 0x3 - ble _080D8250 + ble @080D8250 movs r0, 0 strb r0, [r5] pop {r4,r5} @@ -409963,7 +409963,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] @@ -410024,7 +410024,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 @@ -410036,7 +410036,7 @@ sub_80D833C: @ 80D833C movs r0, 0x8 ldrsh r1, [r4, r0] cmp r1, 0 - bne _080D840C + bne @080D840C ldr r0, =0x02022e16 strh r1, [r0] ldr r0, =0x02022e1e @@ -410064,18 +410064,18 @@ sub_80D833C: @ 80D833C bl sub_80DBCA8 lsls r0, 24 cmp r0, 0 - bne _080D83CC + bne @080D83CC ldr r0, =0x02022e2c ldr r1, =0x0827d507 bl gf_strcpy - b _080D83D4 + b @080D83D4 .align 2, 0 .pool -_080D83CC: +@080D83CC: ldr r0, =0x02022e2c ldr r1, =0x0827d531 bl gf_strcpy -_080D83D4: +@080D83D4: bl sub_80DB89C ldr r4, =0x02021fc4 ldr r1, =0x02022e2c @@ -410092,17 +410092,17 @@ _080D83D4: ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b _080D841A + b @080D841A .align 2, 0 .pool -_080D840C: +@080D840C: bl sub_80DED4C cmp r0, 0 - bne _080D841A + bne @080D841A strh r0, [r4, 0x8] ldr r0, =sub_80D8424 + 1 str r0, [r4] -_080D841A: +@080D841A: pop {r4,r5} pop {r0} bx r0 @@ -410111,7 +410111,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 @@ -410121,10 +410121,10 @@ sub_80D8424: @ 80D8424 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080D843C + bne @080D843C cmp r1, 0x2 - bne _080D8482 -_080D843C: + bne @080D8482 +@080D843C: movs r0, 0x5 bl audio_play ldr r0, =0x02039f25 @@ -410132,7 +410132,7 @@ _080D843C: bl sub_80DBCA8 lsls r0, 24 cmp r0, 0 - bne _080D8474 + bne @080D8474 movs r0, 0x1 bl sub_80DC490 ldr r0, =0x03005e00 @@ -410141,19 +410141,19 @@ _080D843C: lsls r1, 3 adds r1, r0 ldr r0, =sub_80D8490 + 1 - b _080D8480 + b @080D8480 .align 2, 0 .pool -_080D8474: +@080D8474: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 ldr r0, =sub_80D8894 + 1 -_080D8480: +@080D8480: str r0, [r1] -_080D8482: +@080D8482: pop {r4,r5} pop {r0} bx r0 @@ -410162,7 +410162,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 @@ -410183,7 +410183,7 @@ sub_80D8490: @ 80D8490 ldr r2, =0x02039e1e mov r10, r2 ldr r7, =0x02039f34 -_080D84B8: +@080D84B8: lsls r1, r6, 1 mov r0, r8 ldrb r2, [r0] @@ -410200,12 +410200,12 @@ _080D84B8: adds r0, r1 ldrh r0, [r0, 0x8] cmp r0, 0 - beq _080D853C + beq @080D853C adds r0, r2, 0 bl sub_80DE1E8 lsls r0, 24 cmp r0, 0 - beq _080D853C + beq @080D853C ldr r0, [r7] mov r2, r8 ldrb r1, [r2] @@ -410219,7 +410219,7 @@ _080D84B8: bl sub_80E5414 lsls r0, 24 cmp r0, 0 - beq _080D853C + beq @080D853C ldr r0, [r7] mov r2, r8 ldrb r1, [r2] @@ -410232,15 +410232,15 @@ _080D84B8: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080D853C + beq @080D853C add r0, sp, 0x4 ldr r1, =0x085ed1a0 - b _080D8566 + b @080D8566 .align 2, 0 .pool -_080D853C: +@080D853C: cmp r4, 0 - beq _080D856C + beq @080D856C ldr r0, [r7] mov r2, r8 ldrb r1, [r2] @@ -410251,19 +410251,19 @@ _080D853C: adds r0, r2 ldrh r0, [r0, 0x8] cmp r0, r4 - bne _080D856C + bne @080D856C ldr r0, =0x0858c2b4 lsls r1, r4, 3 adds r1, r0 ldrb r0, [r1] cmp r0, 0x3 - beq _080D856C + beq @080D856C add r0, sp, 0x4 ldr r1, =0x085ed1a7 -_080D8566: +@080D8566: bl gf_strcpy adds r5, r0, 0 -_080D856C: +@080D856C: movs r0, 0xD adds r1, r4, 0 muls r1, r0 @@ -410287,7 +410287,7 @@ _080D856C: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x3 - bls _080D84B8 + bls @080D84B8 ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0] @@ -410329,7 +410329,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 @@ -410342,23 +410342,23 @@ sub_80D8610: @ 80D8610 adds r1, 0x1E adds r1, r0, r1 movs r2, 0x3 -_080D8628: +@080D8628: ldrh r0, [r1] cmp r0, 0 - beq _080D8634 + beq @080D8634 adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_080D8634: +@080D8634: adds r1, 0x2 subs r2, 0x1 cmp r2, 0 - bge _080D8628 + bge @080D8628 ldrh r0, [r3, 0x2E] movs r5, 0x1 ands r5, r0 cmp r5, 0 - beq _080D8670 + beq @080D8670 movs r0, 0x5 bl audio_play ldr r0, =0x03005e00 @@ -410368,29 +410368,29 @@ _080D8634: adds r1, r0 ldr r0, =sub_80D8894 + 1 str r0, [r1] - b _080D87FA + b @080D87FA .align 2, 0 .pool -_080D8670: +@080D8670: ldrh r0, [r3, 0x30] cmp r0, 0x20 - bne _080D8678 - b _080D87FA -_080D8678: + bne @080D8678 + b @080D87FA +@080D8678: cmp r0, 0x20 - bgt _080D8682 + bgt @080D8682 cmp r0, 0x2 - beq _080D868E - b _080D87FA -_080D8682: + beq @080D868E + b @080D87FA +@080D8682: cmp r0, 0x40 - beq _080D8730 + beq @080D8730 cmp r0, 0x80 - bne _080D868C - b _080D879C -_080D868C: - b _080D87FA -_080D868E: + bne @080D868C + b @080D879C +@080D868C: + b @080D87FA +@080D868E: movs r0, 0x5 bl audio_play movs r0, 0 @@ -410409,18 +410409,18 @@ _080D868E: bl sub_80DBCA8 lsls r0, 24 cmp r0, 0 - bne _080D86DC + bne @080D86DC ldr r0, =0x02022e2c ldr r1, =0x0827d507 bl gf_strcpy - b _080D86E4 + b @080D86E4 .align 2, 0 .pool -_080D86DC: +@080D86DC: ldr r0, =0x02022e2c ldr r1, =0x0827d531 bl gf_strcpy -_080D86E4: +@080D86E4: bl sub_80DB89C ldr r4, =0x02021fc4 ldr r1, =0x02022e2c @@ -410441,10 +410441,10 @@ _080D86E4: adds r0, r1 ldr r1, =sub_80D8424 + 1 str r1, [r0] - b _080D87FA + b @080D87FA .align 2, 0 .pool -_080D8730: +@080D8730: ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0] @@ -410456,14 +410456,14 @@ _080D8730: ldr r1, [r0] ldrb r0, [r1] cmp r0, 0 - bne _080D8754 + bne @080D8754 subs r0, r6, 0x1 - b _080D8756 + b @080D8756 .align 2, 0 .pool -_080D8754: +@080D8754: subs r0, 0x1 -_080D8756: +@080D8756: strb r0, [r1] ldr r4, =0x02039f34 ldr r0, [r4] @@ -410486,13 +410486,13 @@ _080D8756: ldrh r0, [r1] bl prints_contest_move_description cmp r6, 0x1 - bls _080D87FA + bls @080D87FA movs r0, 0x5 bl audio_play - b _080D87FA + b @080D87FA .align 2, 0 .pool -_080D879C: +@080D879C: ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0] @@ -410505,15 +410505,15 @@ _080D879C: ldrb r2, [r1] subs r0, r6, 0x1 cmp r2, r0 - bne _080D87C0 + bne @080D87C0 strb r5, [r1] - b _080D87C4 + b @080D87C4 .align 2, 0 .pool -_080D87C0: +@080D87C0: adds r0, r2, 0x1 strb r0, [r1] -_080D87C4: +@080D87C4: ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0] @@ -410535,10 +410535,10 @@ _080D87C4: ldrh r0, [r1] bl prints_contest_move_description cmp r6, 0x1 - bls _080D87FA + bls @080D87FA movs r0, 0x5 bl audio_play -_080D87FA: +@080D87FA: pop {r4-r7} pop {r0} bx r0 @@ -410547,7 +410547,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 @@ -410573,7 +410573,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} @@ -410618,7 +410618,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 @@ -410627,7 +410627,7 @@ sub_80D8894: @ 80D8894 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080D890C + beq @080D890C ldr r4, =0x02039f25 ldrb r0, [r4] bl sub_80DB8B8 @@ -410659,10 +410659,10 @@ sub_80D8894: @ 80D8894 bl sub_80DBF68 movs r0, 0 bl sub_80DC490 - b _080D891E + b @080D891E .align 2, 0 .pool -_080D890C: +@080D890C: bl sub_80DB918 ldr r0, =0x03005e00 lsls r1, r5, 2 @@ -410671,7 +410671,7 @@ _080D890C: adds r1, r0 ldr r0, =sub_80D895C + 1 str r0, [r1] -_080D891E: +@080D891E: pop {r4,r5} pop {r0} bx r0 @@ -410680,7 +410680,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 @@ -410703,7 +410703,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 @@ -410718,7 +410718,7 @@ sub_80D895C: @ 80D895C movs r6, 0 movs r5, 0xA0 lsls r5, 19 -_080D897C: +@080D897C: lsrs r4, r5, 24 adds r0, r4, 0 movs r1, 0 @@ -410733,7 +410733,7 @@ _080D897C: adds r5, r0 adds r6, 0x1 cmp r6, 0x3 - ble _080D897C + ble @080D897C movs r0, 0 bl sub_80DED60 ldr r1, =0x02037b14 @@ -410771,7 +410771,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 @@ -410786,7 +410786,7 @@ sub_80D8A04: @ 80D8A04 lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - ble _080D8A42 + ble @080D8A42 movs r0, 0 strh r0, [r4, 0x8] ldrh r0, [r4, 0xA] @@ -410795,13 +410795,13 @@ sub_80D8A04: @ 80D8A04 lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - bne _080D8A42 + bne @080D8A42 bl sub_80DDBE8 movs r0, 0x1 bl sub_80DE69C ldr r0, =sub_80D8A50 + 1 str r0, [r4] -_080D8A42: +@080D8A42: pop {r4} pop {r0} bx r0 @@ -410810,7 +410810,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 @@ -410822,7 +410822,7 @@ sub_80D8A50: @ 80D8A50 lsls r0, 2 ands r0, r1 cmp r0, 0 - bne _080D8A76 + bne @080D8A76 ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -410830,7 +410830,7 @@ sub_80D8A50: @ 80D8A50 adds r1, r0 ldr r0, =sub_80D8A88 + 1 str r0, [r1] -_080D8A76: +@080D8A76: pop {r0} bx r0 .align 2, 0 @@ -410838,7 +410838,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 @@ -410853,7 +410853,7 @@ sub_80D8A88: @ 80D8A88 lsls r0, 16 asrs r0, 16 cmp r0, 0x13 - ble _080D8B18 + ble @080D8B18 ldr r2, =0x02039f34 ldr r0, [r2] ldr r1, [r0] @@ -410870,18 +410870,18 @@ sub_80D8A88: @ 80D8A88 ands r0, r1 adds r7, r3, 0 cmp r0, 0 - beq _080D8B08 + beq @080D8B08 bl sub_80DA8A4 lsls r0, 24 cmp r0, 0 - beq _080D8B08 + beq @080D8B08 movs r4, 0 ldr r1, =0x02039f30 ldrb r0, [r1] cmp r0, 0x3 - bgt _080D8B08 + bgt @080D8B08 adds r5, r1, 0 -_080D8ADE: +@080D8ADE: ldrb r0, [r5] adds r0, r4 lsls r0, 24 @@ -410901,8 +410901,8 @@ _080D8ADE: ldrb r0, [r5] adds r0, r4, r0 cmp r0, 0x3 - ble _080D8ADE -_080D8B08: + ble @080D8ADE +@080D8B08: ldr r1, =0x03005e00 adds r0, r7, r6 lsls r0, 3 @@ -410911,7 +410911,7 @@ _080D8B08: strh r1, [r0, 0x8] ldr r1, =sub_80D8B38 + 1 str r1, [r0] -_080D8B18: +@080D8B18: pop {r4-r7} pop {r0} bx r0 @@ -410920,7 +410920,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 @@ -410945,79 +410945,79 @@ sub_80D8B38: @ 80D8B38 mov r9, r2 adds r4, r1, 0 cmp r0, 0x3B - bls _080D8B6E - bl _080DA100 -_080D8B6E: + bls @080D8B6E + bl @080DA100 +@080D8B6E: lsls r0, 2 - ldr r1, =_080D8B84 + ldr r1, =@080D8B84 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080D8B84: - .4byte _080D8C74 - .4byte _080D8D30 - .4byte _080D8D56 - .4byte _080D8DC4 - .4byte _080D8E7C - .4byte _080D8EC8 - .4byte _080D8F84 - .4byte _080D8FB8 - .4byte _080D9010 - .4byte _080D908C - .4byte _080D9FC0 - .4byte _080D9FEC - .4byte _080D9238 - .4byte _080D926C - .4byte _080D9774 - .4byte _080D9864 - .4byte _080D98D4 - .4byte _080D9904 - .4byte _080D99EC - .4byte _080D999E - .4byte _080DA024 - .4byte _080DA0A0 - .4byte _080DA0C2 - .4byte _080D90B4 - .4byte _080D9180 - .4byte _080D9388 - .4byte _080D939E - .4byte _080D947C - .4byte _080D94A0 - .4byte _080D9508 - .4byte _080D95EC - .4byte _080DA038 - .4byte _080DA080 - .4byte _080D9EBC - .4byte _080D9F48 - .4byte _080D929A - .4byte _080D92D0 - .4byte _080D92F6 - .4byte _080D9334 - .4byte _080D955C - .4byte _080D95C4 - .4byte _080D9A2C - .4byte _080DA100 - .4byte _080D9DAC - .4byte _080DA100 - .4byte _080D9830 - .4byte _080D997C - .4byte _080D921A - .4byte _080D91A4 - .4byte _080D91F4 - .4byte _080D935C - .4byte _080D9690 - .4byte _080D971C - .4byte _080D9BAA - .4byte _080D9C68 - .4byte _080D9F68 - .4byte _080D9F84 - .4byte _080D9DD4 - .4byte _080D9E60 - .4byte _080D9EA0 -_080D8C74: +@080D8B84: + .4byte @080D8C74 + .4byte @080D8D30 + .4byte @080D8D56 + .4byte @080D8DC4 + .4byte @080D8E7C + .4byte @080D8EC8 + .4byte @080D8F84 + .4byte @080D8FB8 + .4byte @080D9010 + .4byte @080D908C + .4byte @080D9FC0 + .4byte @080D9FEC + .4byte @080D9238 + .4byte @080D926C + .4byte @080D9774 + .4byte @080D9864 + .4byte @080D98D4 + .4byte @080D9904 + .4byte @080D99EC + .4byte @080D999E + .4byte @080DA024 + .4byte @080DA0A0 + .4byte @080DA0C2 + .4byte @080D90B4 + .4byte @080D9180 + .4byte @080D9388 + .4byte @080D939E + .4byte @080D947C + .4byte @080D94A0 + .4byte @080D9508 + .4byte @080D95EC + .4byte @080DA038 + .4byte @080DA080 + .4byte @080D9EBC + .4byte @080D9F48 + .4byte @080D929A + .4byte @080D92D0 + .4byte @080D92F6 + .4byte @080D9334 + .4byte @080D955C + .4byte @080D95C4 + .4byte @080D9A2C + .4byte @080DA100 + .4byte @080D9DAC + .4byte @080DA100 + .4byte @080D9830 + .4byte @080D997C + .4byte @080D921A + .4byte @080D91A4 + .4byte @080D91F4 + .4byte @080D935C + .4byte @080D9690 + .4byte @080D971C + .4byte @080D9BAA + .4byte @080D9C68 + .4byte @080D9F68 + .4byte @080D9F84 + .4byte @080D9DD4 + .4byte @080D9E60 + .4byte @080D9EA0 +@080D8C74: bl sub_80DCD48 movs r7, 0 ldr r0, =0x02039f34 @@ -411030,15 +411030,15 @@ _080D8C74: mov r10, r5 ldrb r2, [r0] cmp r1, r2 - beq _080D8C9C + beq @080D8C9C adds r2, r0, 0 -_080D8C92: +@080D8C92: adds r7, 0x1 adds r0, r2, r7 ldrb r0, [r0] cmp r1, r0 - bne _080D8C92 -_080D8C9C: + bne @080D8C92 +@080D8C9C: ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0] @@ -411052,7 +411052,7 @@ _080D8C9C: adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _080D8D14 + beq @080D8D14 ldrb r0, [r2, 0x7] movs r1, 0x4 orrs r0, r1 @@ -411060,12 +411060,12 @@ _080D8C9C: bl sub_80DA8A4 lsls r0, 24 cmp r0, 0 - beq _080D8CD4 + beq @080D8CD4 ldr r0, [r4] ldr r0, [r0] ldrb r0, [r0, 0x11] bl sub_80DD080 -_080D8CD4: +@080D8CD4: ldr r4, =sub_80FCC88 + 1 adds r0, r4, 0 movs r1, 0 @@ -411082,10 +411082,10 @@ _080D8CD4: lsls r0, 3 adds r0, r1 strh r5, [r0, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D8D14: +@080D8D14: adds r0, r6, 0 bl sub_80DD080 ldr r0, =0x03005e00 @@ -411095,10 +411095,10 @@ _080D8D14: adds r1, r0 movs r0, 0x2 strh r0, [r1, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D8D30: +@080D8D30: mov r3, r9 ldr r0, [r3] ldr r0, [r0] @@ -411106,9 +411106,9 @@ _080D8D30: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080D8D44 - bl _080DA100 -_080D8D44: + beq @080D8D44 + bl @080DA100 +@080D8D44: mov r5, r8 lsls r0, r5, 2 add r0, r8 @@ -411116,8 +411116,8 @@ _080D8D44: adds r0, r4 movs r1, 0x2 strh r1, [r0, 0x8] - bl _080DA100 -_080D8D56: + bl @080DA100 +@080D8D56: adds r0, r6, 0 bl sub_80DF080 bl sub_80DF750 @@ -411132,15 +411132,15 @@ _080D8D56: movs r0, 0x6 ands r0, r1 cmp r0, 0 - bne _080D8D86 + bne @080D8D86 ldrb r1, [r2, 0xB] movs r0, 0x80 ands r0, r1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - beq _080D8DA4 -_080D8D86: + beq @080D8DA4 +@080D8D86: ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 @@ -411149,10 +411149,10 @@ _080D8D86: adds r1, r0 movs r0, 0x1F strh r0, [r1, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D8DA4: +@080D8DA4: bl sub_80DB89C ldr r0, =0x03005e00 mov r3, r8 @@ -411163,21 +411163,21 @@ _080D8DA4: strh r6, [r1, 0x1C] movs r0, 0x3 strh r0, [r1, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D8DC4: +@080D8DC4: mov r4, r8 lsls r4, 2 mov r10, r4 ldr r1, =0x020244e4 movs r2, 0 adds r0, r1, 0x3 -_080D8DD0: +@080D8DD0: strb r2, [r0] subs r0, 0x1 cmp r0, r1 - bge _080D8DD0 + bge @080D8DD0 movs r7, 0x4 mov r5, r9 ldr r0, [r5] @@ -411238,10 +411238,10 @@ _080D8DD0: movs r1, 0 bl sub_80DCBE8 strh r7, [r4, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D8E7C: +@080D8E7C: mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -411257,9 +411257,9 @@ _080D8E7C: ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - beq _080D8EA0 - bl _080DA100 -_080D8EA0: + beq @080D8EA0 + bl @080DA100 +@080D8EA0: mov r3, r9 ldr r0, [r3] ldr r1, [r0, 0x14] @@ -411269,15 +411269,15 @@ _080D8EA0: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080D8EB8 - bl _080DA100 -_080D8EB8: + beq @080D8EB8 + bl @080DA100 +@080D8EB8: movs r0, 0x5 strh r0, [r2, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D8EC8: +@080D8EC8: mov r5, r9 ldr r0, [r5] ldr r1, [r0, 0x4] @@ -411289,7 +411289,7 @@ _080D8EC8: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080D8EF2 + beq @080D8EF2 mov r1, r8 lsls r0, r1, 2 add r0, r8 @@ -411297,8 +411297,8 @@ _080D8EC8: adds r0, r4 movs r1, 0x21 strh r1, [r0, 0x8] - bl _080DA100 -_080D8EF2: + bl @080DA100 +@080D8EF2: bl sub_80DB89C ldr r0, =0x02021cc4 lsls r1, r6, 6 @@ -411313,7 +411313,7 @@ _080D8EF2: movs r0, 0xB1 lsls r0, 1 cmp r1, r0 - bhi _080D8F38 + bhi @080D8F38 ldr r0, =0x02021dc4 adds r2, r1, 0 movs r1, 0xD @@ -411321,10 +411321,10 @@ _080D8EF2: ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy - b _080D8F48 + b @080D8F48 .align 2, 0 .pool -_080D8F38: +@080D8F38: ldr r0, =0x02021dc4 ldr r2, =0x08587f1c ldrb r1, [r3, 0xA] @@ -411332,7 +411332,7 @@ _080D8F38: adds r1, r2 ldr r1, [r1] bl gf_strcpy -_080D8F48: +@080D8F48: ldr r4, =0x02021fc4 ldr r1, =0x0827d55a adds r0, r4, 0 @@ -411348,16 +411348,16 @@ _080D8F48: adds r0, r1 movs r1, 0x6 strh r1, [r0, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D8F84: +@080D8F84: bl sub_80DED4C adds r1, r0, 0 cmp r1, 0 - beq _080D8F92 - bl _080DA100 -_080D8F92: + beq @080D8F92 + bl @080DA100 +@080D8F92: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] @@ -411371,10 +411371,10 @@ _080D8F92: adds r0, r1 movs r1, 0x7 strh r1, [r0, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D8FB8: +@080D8FB8: mov r5, r9 ldr r1, [r5] ldr r0, [r1] @@ -411409,19 +411409,19 @@ _080D8FB8: adds r0, r1 movs r1, 0x8 strh r1, [r0, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D9010: +@080D9010: ldr r0, =0x020383f8 ldr r0, [r0] bl _call_via_r0 ldr r0, =0x020383fd ldrb r4, [r0] cmp r4, 0 - beq _080D9024 - bl _080DA100 -_080D9024: + beq @080D9024 + bl @080DA100 +@080D9024: adds r0, r6, 0 bl sub_80DE9B0 ldr r0, =0x02039f34 @@ -411430,7 +411430,7 @@ _080D9024: adds r0, 0x5A ldrb r0, [r0] cmp r0, 0 - beq _080D9060 + beq @080D9060 ldr r0, =0x03005e00 mov r3, r8 lsls r1, r3, 2 @@ -411440,10 +411440,10 @@ _080D9024: strh r4, [r1, 0x1C] movs r0, 0x9 strh r0, [r1, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D9060: +@080D9060: ldr r1, [r1, 0x4] lsls r0, r6, 3 subs r0, r6 @@ -411453,18 +411453,18 @@ _080D9060: movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _080D907A + bne @080D907A adds r0, r6, 0 bl sub_80DC674 -_080D907A: +@080D907A: bl sub_80DE12C ldr r0, =0x03005e00 mov r4, r8 lsls r1, r4, 2 - b _080D9192 + b @080D9192 .align 2, 0 .pool -_080D908C: +@080D908C: mov r5, r8 lsls r0, r5, 2 add r0, r8 @@ -411476,15 +411476,15 @@ _080D908C: lsls r0, 16 asrs r0, 16 cmp r0, 0x1E - bgt _080D90A8 - bl _080DA100 -_080D90A8: + bgt @080D90A8 + bl @080DA100 +@080D90A8: movs r0, 0 strh r0, [r2, 0x1C] movs r0, 0x7 strh r0, [r2, 0x8] - bl _080DA100 -_080D90B4: + bl @080DA100 +@080D90B4: mov r0, r8 lsls r2, r0, 2 adds r0, r2, r0 @@ -411505,7 +411505,7 @@ _080D90B4: mov r10, r2 str r1, [sp, 0x4] cmp r0, 0xFF - beq _080D90FA + beq @080D90FA ldrb r1, [r3, 0x13] adds r0, r6, 0 bl sub_80DD45C @@ -411517,24 +411517,24 @@ _080D90B4: strb r1, [r0, 0x13] movs r0, 0x18 strh r0, [r7, 0x8] - bl _080DA100 -_080D90FA: + bl @080DA100 +@080D90FA: ldrb r0, [r3, 0x14] cmp r0, 0xFF - beq _080D9178 + beq @080D9178 movs r7, 0 cmp r7, r6 - beq _080D910E + beq @080D910E mov r2, r12 ldrb r0, [r2, 0x13] cmp r0, 0xFF - bne _080D912C -_080D910E: + bne @080D912C +@080D910E: adds r7, 0x1 cmp r7, 0x3 - bgt _080D912C + bgt @080D912C cmp r7, r6 - beq _080D910E + beq @080D910E mov r3, r9 ldr r0, [r3] ldr r1, [r0, 0x4] @@ -411544,10 +411544,10 @@ _080D910E: adds r0, r1 ldrb r0, [r0, 0x13] cmp r0, 0xFF - beq _080D910E -_080D912C: + beq @080D910E +@080D912C: cmp r7, 0x4 - bne _080D9168 + bne @080D9168 mov r4, r9 ldr r0, [r4] ldr r0, [r0, 0x4] @@ -411571,40 +411571,40 @@ _080D912C: adds r0, r1 movs r1, 0x18 strh r1, [r0, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D9168: +@080D9168: mov r0, r10 add r0, r8 lsls r0, 3 adds r0, r4 movs r1, 0x30 strh r1, [r0, 0x8] - bl _080DA100 -_080D9178: + bl @080DA100 +@080D9178: movs r0, 0x30 strh r0, [r7, 0x8] - bl _080DA100 -_080D9180: + bl @080DA100 +@080D9180: bl sub_80DED4C cmp r0, 0 - beq _080D918C - bl _080DA100 -_080D918C: + beq @080D918C + bl @080DA100 +@080D918C: ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 -_080D9192: +@080D9192: add r1, r8 lsls r1, 3 adds r1, r0 movs r0, 0x17 strh r0, [r1, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D91A4: +@080D91A4: mov r3, r9 ldr r0, [r3] ldr r1, [r0, 0x4] @@ -411616,22 +411616,22 @@ _080D91A4: movs r3, 0x3 ands r3, r0 cmp r3, 0x1 - bne _080D91C4 + bne @080D91C4 movs r0, 0x5 bl sub_80DD720 - b _080D91DA -_080D91C4: + b @080D91DA +@080D91C4: cmp r3, 0x2 - bne _080D91D0 + bne @080D91D0 movs r0, 0x6 bl sub_80DD720 - b _080D91DA -_080D91D0: + b @080D91DA +@080D91D0: cmp r3, 0x3 - bne _080D9208 + bne @080D9208 movs r0, 0x7 bl sub_80DD720 -_080D91DA: +@080D91DA: ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 @@ -411640,10 +411640,10 @@ _080D91DA: adds r1, r0 movs r0, 0x31 strh r0, [r1, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D91F4: +@080D91F4: mov r3, r9 ldr r0, [r3] ldr r0, [r0] @@ -411651,9 +411651,9 @@ _080D91F4: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080D9208 - bl _080DA100 -_080D9208: + beq @080D9208 + bl @080DA100 +@080D9208: mov r5, r8 lsls r0, r5, 2 add r0, r8 @@ -411661,8 +411661,8 @@ _080D9208: adds r0, r4 movs r1, 0x2F strh r1, [r0, 0x8] - bl _080DA100 -_080D921A: + bl @080DA100 +@080D921A: movs r0, 0x1 bl sub_80DE008 ldr r0, =0x03005e00 @@ -411673,10 +411673,10 @@ _080D921A: adds r1, r0 movs r0, 0xC strh r0, [r1, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D9238: +@080D9238: mov r3, r9 ldr r0, [r3] ldr r1, [r0, 0x4] @@ -411697,10 +411697,10 @@ _080D9238: adds r0, r1 movs r1, 0xD strh r1, [r0, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D926C: +@080D926C: mov r0, r9 ldr r1, [r0] ldr r0, [r1] @@ -411712,9 +411712,9 @@ _080D926C: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080D9288 - bl _080DA100 -_080D9288: + beq @080D9288 + bl @080DA100 +@080D9288: mov r1, r8 lsls r0, r1, 2 add r0, r8 @@ -411722,8 +411722,8 @@ _080D9288: adds r0, r4 movs r1, 0x23 strh r1, [r0, 0x8] - bl _080DA100 -_080D929A: + bl @080DA100 +@080D929A: mov r2, r9 ldr r0, [r2] ldr r1, [r0, 0x4] @@ -411735,10 +411735,10 @@ _080D929A: movs r0, 0x30 ands r0, r1 cmp r0, 0x10 - bne _080D92B8 + bne @080D92B8 movs r0, 0x8 bl sub_80DD720 -_080D92B8: +@080D92B8: ldr r0, =0x03005e00 mov r3, r8 lsls r1, r3, 2 @@ -411747,10 +411747,10 @@ _080D92B8: adds r1, r0 movs r0, 0x24 strh r0, [r1, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D92D0: +@080D92D0: mov r5, r9 ldr r0, [r5] ldr r0, [r0] @@ -411758,9 +411758,9 @@ _080D92D0: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080D92E4 - bl _080DA100 -_080D92E4: + beq @080D92E4 + bl @080DA100 +@080D92E4: mov r1, r8 lsls r0, r1, 2 add r0, r8 @@ -411768,14 +411768,14 @@ _080D92E4: adds r0, r4 movs r1, 0x25 strh r1, [r0, 0x8] - bl _080DA100 -_080D92F6: + bl @080DA100 +@080D92F6: adds r0, r6, 0 movs r1, 0x1 bl sub_80DB5B8 lsls r0, 24 cmp r0, 0 - beq _080D9320 + beq @080D9320 ldr r1, =0x03005e00 mov r2, r8 lsls r0, r2, 2 @@ -411786,20 +411786,20 @@ _080D92F6: strh r1, [r0, 0x1C] movs r1, 0x26 strh r1, [r0, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D9320: +@080D9320: ldr r0, =0x03005e00 mov r3, r8 lsls r1, r3, 2 add r1, r8 lsls r1, 3 adds r1, r0 - b _080D9354 + b @080D9354 .align 2, 0 .pool -_080D9334: +@080D9334: mov r5, r8 lsls r0, r5, 2 add r0, r8 @@ -411811,24 +411811,24 @@ _080D9334: lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - bgt _080D9350 - bl _080DA100 -_080D9350: + bgt @080D9350 + bl @080DA100 +@080D9350: movs r0, 0 strh r0, [r1, 0x1C] -_080D9354: +@080D9354: movs r0, 0x32 strh r0, [r1, 0x8] - bl _080DA100 -_080D935C: + bl @080DA100 +@080D935C: adds r0, r6, 0 bl sub_80DB798 lsls r0, 24 cmp r0, 0 - beq _080D936E + beq @080D936E movs r0, 0x63 bl audio_play -_080D936E: +@080D936E: ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 @@ -411837,10 +411837,10 @@ _080D936E: adds r1, r0 movs r0, 0x19 strh r0, [r1, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D9388: +@080D9388: mov r3, r8 lsls r0, r3, 2 add r0, r8 @@ -411850,8 +411850,8 @@ _080D9388: strh r1, [r0, 0xA] movs r1, 0x1A strh r1, [r0, 0x8] - bl _080DA100 -_080D939E: + bl @080DA100 +@080D939E: movs r3, 0 movs r5, 0 str r5, [sp] @@ -411864,38 +411864,38 @@ _080D939E: ldrsh r7, [r0, r2] mov r10, r1 cmp r7, 0x3 - bgt _080D9418 + bgt @080D9418 ldr r5, =0x02039f26 ldr r2, =0x02039f34 -_080D93BC: +@080D93BC: movs r3, 0 str r3, [sp] adds r0, r3, 0 cmp r0, r6 - beq _080D93E4 + beq @080D93E4 ldrb r0, [r5] cmp r0, r7 - bne _080D93E4 + bne @080D93E4 ldr r0, [r2] ldr r0, [r0, 0x4] ldrb r0, [r0, 0x13] cmp r0, 0xFF - beq _080D93E4 + beq @080D93E4 movs r1, 0x1 str r1, [sp] - b _080D940C + b @080D940C .align 2, 0 .pool -_080D93E4: +@080D93E4: adds r3, 0x1 cmp r3, 0x3 - bgt _080D940C + bgt @080D940C cmp r3, r6 - beq _080D93E4 + beq @080D93E4 adds r0, r3, r5 ldrb r0, [r0] cmp r0, r7 - bne _080D93E4 + bne @080D93E4 ldr r0, [r2] ldr r1, [r0, 0x4] lsls r0, r3, 3 @@ -411904,23 +411904,23 @@ _080D93E4: adds r0, r1 ldrb r0, [r0, 0x13] cmp r0, 0xFF - beq _080D93E4 + beq @080D93E4 movs r0, 0x1 str r0, [sp] -_080D940C: +@080D940C: ldr r1, [sp] cmp r1, 0 - bne _080D9422 + bne @080D9422 adds r7, 0x1 cmp r7, 0x3 - ble _080D93BC -_080D9418: + ble @080D93BC +@080D9418: ldr r2, [sp] lsls r0, r2, 24 asrs r2, r0, 24 cmp r2, 0 - beq _080D9464 -_080D9422: + beq @080D9464 +@080D9422: mov r5, r10 add r5, r8 lsls r5, 3 @@ -411948,10 +411948,10 @@ _080D9422: strb r0, [r4, 0x13] movs r0, 0x1B strh r0, [r5, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D9464: +@080D9464: mov r0, r10 add r0, r8 lsls r0, 3 @@ -411961,13 +411961,13 @@ _080D9464: movs r1, 0x33 strh r1, [r0, 0x8] bl sub_80DB884 - bl _080DA100 -_080D947C: + bl @080DA100 +@080D947C: bl sub_80DED4C cmp r0, 0 - beq _080D9488 - bl _080DA100 -_080D9488: + beq @080D9488 + bl @080DA100 +@080D9488: ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 @@ -411976,10 +411976,10 @@ _080D9488: adds r1, r0 movs r0, 0x1C strh r0, [r1, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D94A0: +@080D94A0: movs r7, 0 mov r3, r8 lsls r0, r3, 2 @@ -411993,16 +411993,16 @@ _080D94A0: adds r5, r1, 0 ldrb r0, [r5] cmp r2, r0 - beq _080D94CA + beq @080D94CA adds r1, r2, 0 adds r2, r5, 0 -_080D94C0: +@080D94C0: adds r7, 0x1 adds r0, r7, r2 ldrb r0, [r0] cmp r1, r0 - bne _080D94C0 -_080D94CA: + bne @080D94C0 +@080D94CA: mov r1, r9 ldr r0, [r1] ldr r1, [r0, 0x4] @@ -412026,10 +412026,10 @@ _080D94CA: adds r0, r1 movs r1, 0x1D strh r1, [r0, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D9508: +@080D9508: movs r7, 0 mov r2, r8 lsls r0, r2, 2 @@ -412043,14 +412043,14 @@ _080D9508: adds r5, r1, 0 ldrb r0, [r5] cmp r3, r0 - beq _080D952E -_080D9524: + beq @080D952E +@080D9524: adds r7, 0x1 adds r0, r7, r1 ldrb r0, [r0] cmp r3, r0 - bne _080D9524 -_080D952E: + bne @080D9524 +@080D952E: mov r1, r9 ldr r0, [r1] ldr r1, [r0, 0x14] @@ -412060,19 +412060,19 @@ _080D952E: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080D9546 - bl _080DA100 -_080D9546: + beq @080D9546 + bl @080DA100 +@080D9546: mov r0, r10 add r0, r8 lsls r0, 3 adds r0, r4 movs r1, 0x27 strh r1, [r0, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D955C: +@080D955C: movs r7, 0 mov r2, r8 lsls r0, r2, 2 @@ -412086,23 +412086,23 @@ _080D955C: adds r5, r1, 0 ldrb r4, [r5] cmp r2, r4 - beq _080D9586 + beq @080D9586 adds r1, r2, 0 adds r2, r5, 0 -_080D957C: +@080D957C: adds r7, 0x1 adds r0, r7, r2 ldrb r0, [r0] cmp r1, r0 - bne _080D957C -_080D9586: + bne @080D957C +@080D9586: lsls r0, r7, 24 lsrs r0, 24 movs r1, 0x1 bl sub_80DB5B8 lsls r0, 24 cmp r0, 0 - beq _080D95B4 + beq @080D95B4 ldr r1, =0x03005e00 mov r0, r10 add r0, r8 @@ -412112,19 +412112,19 @@ _080D9586: strh r1, [r0, 0x1C] movs r1, 0x28 strh r1, [r0, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D95B4: +@080D95B4: ldr r0, =0x03005e00 mov r1, r10 add r1, r8 lsls r1, 3 adds r1, r0 - b _080D95E4 + b @080D95E4 .align 2, 0 .pool -_080D95C4: +@080D95C4: mov r5, r8 lsls r0, r5, 2 add r0, r8 @@ -412136,16 +412136,16 @@ _080D95C4: lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - bgt _080D95E0 - bl _080DA100 -_080D95E0: + bgt @080D95E0 + bl @080DA100 +@080D95E0: movs r0, 0 strh r0, [r1, 0x1C] -_080D95E4: +@080D95E4: movs r0, 0x1E strh r0, [r1, 0x8] - bl _080DA100 -_080D95EC: + bl @080DA100 +@080D95EC: movs r7, 0 ldr r2, =0x02039f26 ldrb r3, [r2] @@ -412159,36 +412159,36 @@ _080D95EC: mov r10, r1 adds r5, r2, 0 cmp r3, r0 - beq _080D961E + beq @080D961E adds r3, r5, 0 adds r2, r4, 0 -_080D960C: +@080D960C: adds r7, 0x1 cmp r7, 0x3 - bgt _080D961E + bgt @080D961E adds r0, r7, r3 ldrb r1, [r0] movs r4, 0xA ldrsh r0, [r2, r4] cmp r1, r0 - bne _080D960C -_080D961E: + bne @080D960C +@080D961E: lsls r4, r7, 24 lsrs r0, r4, 24 bl sub_80DB798 lsls r0, 24 adds r6, r4, 0 cmp r0, 0 - beq _080D963C + beq @080D963C movs r0, 0x63 bl audio_play - b _080D9642 + b @080D9642 .align 2, 0 .pool -_080D963C: +@080D963C: movs r0, 0x64 bl audio_play -_080D9642: +@080D9642: ldr r5, =0x02039f34 ldr r0, [r5] ldr r1, [r0, 0x4] @@ -412200,7 +412200,7 @@ _080D9642: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080D9670 + beq @080D9670 lsrs r0, r6, 24 bl sub_80DC674 ldr r0, [r5] @@ -412211,7 +412211,7 @@ _080D9642: negs r0, r0 ands r0, r2 strb r0, [r1, 0x15] -_080D9670: +@080D9670: ldr r0, =0x03005e00 mov r1, r10 add r1, r8 @@ -412222,10 +412222,10 @@ _080D9670: strh r0, [r1, 0xA] movs r0, 0x1A strh r0, [r1, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D9690: +@080D9690: mov r5, r8 lsls r2, r5, 2 adds r0, r2, r5 @@ -412238,9 +412238,9 @@ _080D9690: asrs r0, 16 mov r10, r2 cmp r0, 0x9 - bgt _080D96AE - bl _080DA100 -_080D96AE: + bgt @080D96AE + bl @080DA100 +@080D96AE: movs r0, 0 strh r0, [r4, 0x1C] mov r1, r9 @@ -412254,13 +412254,13 @@ _080D96AE: movs r0, 0x6 ands r0, r1 cmp r0, 0 - bne _080D96D4 + bne @080D96D4 ldrb r1, [r2, 0x11] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080D96F6 -_080D96D4: + beq @080D96F6 +@080D96D4: bl sub_80DB89C ldr r0, =0x02021cc4 lsls r1, r6, 6 @@ -412274,7 +412274,7 @@ _080D96D4: adds r0, r4, 0 movs r1, 0x1 bl sub_80DEC30 -_080D96F6: +@080D96F6: ldr r0, =0x03005e00 mov r1, r10 add r1, r8 @@ -412282,15 +412282,15 @@ _080D96F6: adds r1, r0 movs r0, 0x34 strh r0, [r1, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D971C: +@080D971C: bl sub_80DED4C cmp r0, 0 - beq _080D9728 - bl _080DA100 -_080D9728: + beq @080D9728 + bl @080DA100 +@080D9728: ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -412302,7 +412302,7 @@ _080D9728: movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _080D975C + bne @080D975C ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 @@ -412311,10 +412311,10 @@ _080D9728: adds r1, r0 movs r0, 0x11 strh r0, [r1, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D975C: +@080D975C: ldr r0, =0x03005e00 mov r3, r8 lsls r1, r3, 2 @@ -412323,10 +412323,10 @@ _080D975C: adds r1, r0 movs r0, 0xE strh r0, [r1, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D9774: +@080D9774: mov r4, r9 ldr r0, [r4] ldr r1, [r0, 0x4] @@ -412338,30 +412338,30 @@ _080D9774: lsls r4, r0, 24 lsrs r5, r4, 24 cmp r5, 0 - beq _080D97DC + beq @080D97DC bl sub_80DB89C asrs r0, r4, 24 cmp r0, 0x1 - bne _080D97A0 + bne @080D97A0 ldr r0, =0x0827e32e - b _080D97A6 + b @080D97A6 .align 2, 0 .pool -_080D97A0: +@080D97A0: cmp r0, 0x2 - bne _080D97B4 + bne @080D97B4 ldr r0, =0x0827e35b -_080D97A6: +@080D97A6: movs r1, 0x1 bl sub_80DEC30 - b _080D97BC + b @080D97BC .align 2, 0 .pool -_080D97B4: +@080D97B4: ldr r0, =0x0827e38d movs r1, 0x1 bl sub_80DEC30 -_080D97BC: +@080D97BC: movs r0, 0x3 bl sub_80DD720 ldr r1, =0x03005e00 @@ -412372,10 +412372,10 @@ _080D97BC: adds r0, r1 movs r1, 0 strh r1, [r0, 0x1C] - b _080D9812 + b @080D9812 .align 2, 0 .pool -_080D97DC: +@080D97DC: bl sub_80DB89C ldr r0, =0x02021cc4 lsls r1, r6, 6 @@ -412398,13 +412398,13 @@ _080D97DC: lsls r0, 3 adds r0, r1 strh r5, [r0, 0x1C] -_080D9812: +@080D9812: movs r1, 0x2D strh r1, [r0, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D9830: +@080D9830: mov r3, r9 ldr r0, [r3] ldr r2, [r0] @@ -412412,9 +412412,9 @@ _080D9830: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080D9844 - bl _080DA100 -_080D9844: + beq @080D9844 + bl @080DA100 +@080D9844: ldrb r0, [r2, 0x11] bl sub_80DC9B4 ldr r1, =0x03005e00 @@ -412425,15 +412425,15 @@ _080D9844: adds r0, r1 movs r1, 0xF strh r1, [r0, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D9864: +@080D9864: bl sub_80DED4C cmp r0, 0 - beq _080D9870 - bl _080DA100 -_080D9870: + beq @080D9870 + bl @080DA100 +@080D9870: ldr r1, =0x03005e00 mov r5, r8 lsls r0, r5, 2 @@ -412446,9 +412446,9 @@ _080D9870: lsls r0, 16 asrs r0, 16 cmp r0, 0x32 - bgt _080D988E - bl _080DA100 -_080D988E: + bgt @080D988E + bl @080DA100 +@080D988E: ldr r7, =0x02039f34 ldr r0, [r7] ldr r1, [r0, 0x4] @@ -412461,7 +412461,7 @@ _080D988E: mov r8, r0 ands r0, r1 cmp r0, 0 - bne _080D98C2 + bne @080D98C2 movs r1, 0x2 ldrsh r0, [r2, r1] ldrb r1, [r2, 0x17] @@ -412474,13 +412474,13 @@ _080D988E: ldrb r2, [r1, 0x17] adds r0, r2 strh r0, [r1, 0x2] -_080D98C2: +@080D98C2: mov r3, r8 strh r3, [r4, 0x8] - bl _080DA100 + bl @080DA100 .align 2, 0 .pool -_080D98D4: +@080D98D4: mov r5, r9 ldr r0, [r5] ldr r1, [r0, 0x14] @@ -412492,9 +412492,9 @@ _080D98D4: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq _080D98F0 - bl _080DA100 -_080D98F0: + beq @080D98F0 + bl @080DA100 +@080D98F0: mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -412503,8 +412503,8 @@ _080D98F0: strh r1, [r0, 0x1C] movs r1, 0x11 strh r1, [r0, 0x8] - bl _080DA100 -_080D9904: + bl @080DA100 +@080D9904: mov r3, r9 ldr r0, [r3] ldr r1, [r0, 0x4] @@ -412516,7 +412516,7 @@ _080D9904: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080D996C + beq @080D996C bl sub_80DB89C ldr r0, =0x02021cc4 lsls r1, r6, 6 @@ -412541,10 +412541,10 @@ _080D9904: bl sub_80DD720 movs r0, 0x2E strh r0, [r4, 0x8] - b _080DA100 + b @080DA100 .align 2, 0 .pool -_080D996C: +@080D996C: mov r1, r8 lsls r0, r1, 2 add r0, r8 @@ -412552,8 +412552,8 @@ _080D996C: adds r0, r4 movs r1, 0x29 strh r1, [r0, 0x8] - b _080DA100 -_080D997C: + b @080DA100 +@080D997C: mov r2, r9 ldr r0, [r2] ldr r0, [r0] @@ -412561,9 +412561,9 @@ _080D997C: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080D998E - b _080DA100 -_080D998E: + beq @080D998E + b @080DA100 +@080D998E: mov r3, r8 lsls r0, r3, 2 add r0, r8 @@ -412571,13 +412571,13 @@ _080D998E: adds r0, r4 movs r1, 0x13 strh r1, [r0, 0x8] - b _080DA100 -_080D999E: + b @080DA100 +@080D999E: bl sub_80DED4C cmp r0, 0 - beq _080D99A8 - b _080DA100 -_080D99A8: + beq @080D99A8 + b @080DA100 +@080D99A8: ldr r5, =0x02039f34 ldr r0, [r5] ldr r1, [r0, 0x4] @@ -412606,10 +412606,10 @@ _080D99A8: adds r0, r1 movs r1, 0x12 strh r1, [r0, 0x8] - b _080DA100 + b @080DA100 .align 2, 0 .pool -_080D99EC: +@080D99EC: bl sub_80DCD48 ldr r0, =0x02039f34 ldr r0, [r0] @@ -412622,9 +412622,9 @@ _080D99EC: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq _080D9A0A - b _080DA100 -_080D9A0A: + beq @080D9A0A + b @080DA100 +@080D9A0A: ldr r0, =0x03005e00 mov r5, r8 lsls r4, r5, 2 @@ -412635,10 +412635,10 @@ _080D9A0A: bl sub_80DB89C movs r0, 0x29 strh r0, [r4, 0x8] - b _080DA100 + b @080DA100 .align 2, 0 .pool -_080D9A2C: +@080D9A2C: mov r1, r9 ldr r0, [r1] ldr r2, [r0, 0x10] @@ -412646,12 +412646,12 @@ _080D9A2C: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080D9A56 + beq @080D9A56 ldr r0, [r2] lsls r0, 20 lsrs r0, 29 cmp r6, r0 - beq _080D9A56 + beq @080D9A56 mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -412659,8 +412659,8 @@ _080D9A2C: adds r0, r4 movs r1, 0x39 strh r1, [r0, 0x8] - b _080DA100 -_080D9A56: + b @080DA100 +@080D9A56: mov r3, r9 ldr r1, [r3] ldr r0, [r1, 0x10] @@ -412676,7 +412676,7 @@ _080D9A56: ands r0, r1 str r2, [sp, 0x4] cmp r0, 0 - beq _080D9A94 + beq @080D9A94 movs r4, 0x1 str r4, [sp] ldr r0, =0x02021ec4 @@ -412686,10 +412686,10 @@ _080D9A56: ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy - b _080D9AAE + b @080D9AAE .align 2, 0 .pool -_080D9A94: +@080D9A94: ldr r0, =0x02021ec4 ldr r3, =0x08587f08 ldr r2, =0x0858c2b4 @@ -412702,11 +412702,11 @@ _080D9A94: adds r1, r3 ldr r1, [r1] bl gf_strcpy -_080D9AAE: +@080D9AAE: ldr r5, [sp] lsls r0, r5, 24 cmp r0, 0 - ble _080D9AD2 + ble @080D9AD2 ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -412718,10 +412718,10 @@ _080D9AAE: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080D9AD2 + beq @080D9AD2 movs r3, 0 str r3, [sp] -_080D9AD2: +@080D9AD2: bl sub_80DB89C ldr r0, =0x02021cc4 lsls r1, r6, 6 @@ -412743,48 +412743,48 @@ _080D9AD2: ldrsb r0, [r1, r0] adds r5, r2, 0 cmp r0, 0 - bge _080D9B06 + bge @080D9B06 movs r0, 0 strb r0, [r1, 0x13] -_080D9B06: +@080D9B06: cmp r3, 0 - bne _080D9B30 + bne @080D9B30 ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 - b _080D9F58 + b @080D9F58 .align 2, 0 .pool -_080D9B30: +@080D9B30: cmp r3, 0 - bge _080D9B48 + bge @080D9B48 ldr r0, =0x02021fc4 ldr r1, =0x0827e73c bl ExpandTextCodes - b _080D9B74 + b @080D9B74 .align 2, 0 .pool -_080D9B48: +@080D9B48: cmp r3, 0 - ble _080D9B6C + ble @080D9B6C ldr r0, [r4] ldr r0, [r0] ldrb r0, [r0, 0x13] lsls r0, 24 asrs r0, 24 cmp r0, 0x4 - bgt _080D9B6C + bgt @080D9B6C ldr r0, =0x02021fc4 ldr r1, =0x0827e717 bl ExpandTextCodes - b _080D9B74 + b @080D9B74 .align 2, 0 .pool -_080D9B6C: +@080D9B6C: ldr r0, =0x02021fc4 ldr r1, =0x0827e76a bl ExpandTextCodes -_080D9B74: +@080D9B74: ldr r0, =0x02021fc4 movs r1, 0x1 bl sub_80DEC30 @@ -412798,17 +412798,17 @@ _080D9B74: strh r0, [r1, 0x1C] strh r0, [r1, 0x1E] cmp r5, 0 - bge _080D9BA4 + bge @080D9BA4 movs r0, 0x35 strh r0, [r1, 0x8] - b _080DA100 + b @080DA100 .align 2, 0 .pool -_080D9BA4: +@080D9BA4: movs r0, 0x36 strh r0, [r1, 0x8] - b _080DA100 -_080D9BAA: + b @080DA100 +@080D9BAA: mov r5, r8 lsls r0, r5, 2 add r0, r8 @@ -412817,48 +412817,48 @@ _080D9BAA: movs r0, 0x1C ldrsh r3, [r4, r0] cmp r3, 0x1 - beq _080D9BE8 + beq @080D9BE8 cmp r3, 0x1 - bgt _080D9BC6 + bgt @080D9BC6 cmp r3, 0 - beq _080D9BD0 - b _080DA100 -_080D9BC6: + beq @080D9BD0 + b @080DA100 +@080D9BC6: cmp r3, 0x2 - beq _080D9C0C + beq @080D9C0C cmp r3, 0x3 - beq _080D9C46 - b _080DA100 -_080D9BD0: + beq @080D9C46 + b @080DA100 +@080D9BD0: movs r0, 0x1 negs r0, r0 movs r1, 0x1 bl sub_80DDED0 ldr r0, =0x00000187 bl fanfare_play - b _080D9C3E + b @080D9C3E .align 2, 0 .pool -_080D9BE8: +@080D9BE8: mov r1, r9 ldr r0, [r1] ldr r0, [r0] ldrb r0, [r0, 0x7] ands r3, r0 cmp r3, 0 - beq _080D9BF8 - b _080DA100 -_080D9BF8: + beq @080D9BF8 + b @080DA100 +@080D9BF8: bl sub_80DED4C cmp r0, 0 - beq _080D9C02 - b _080DA100 -_080D9C02: + beq @080D9C02 + b @080DA100 +@080D9C02: movs r0, 0x1 negs r0, r0 bl sub_80DDCDC - b _080D9C3E -_080D9C0C: + b @080D9C3E +@080D9C0C: mov r2, r9 ldr r0, [r2] ldr r0, [r0] @@ -412868,29 +412868,29 @@ _080D9C0C: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - beq _080D9C22 - b _080DA100 -_080D9C22: + beq @080D9C22 + b @080DA100 +@080D9C22: ldrh r0, [r4, 0x1E] adds r1, r0, 0x1 strh r1, [r4, 0x1E] lsls r0, 16 asrs r0, 16 cmp r0, 0x1D - bgt _080D9C32 - b _080DA100 -_080D9C32: + bgt @080D9C32 + b @080DA100 +@080D9C32: strh r2, [r4, 0x1E] movs r1, 0x1 negs r1, r1 adds r0, r1, 0 bl sub_80DDED0 -_080D9C3E: +@080D9C3E: ldrh r0, [r4, 0x1C] adds r0, 0x1 strh r0, [r4, 0x1C] - b _080DA100 -_080D9C46: + b @080DA100 +@080D9C46: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -412898,17 +412898,17 @@ _080D9C46: lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _080D9C58 - b _080DA100 -_080D9C58: + beq @080D9C58 + b @080DA100 +@080D9C58: strh r0, [r4, 0x1C] strh r0, [r4, 0x1E] movs r0, 0x2B strh r0, [r4, 0x8] - b _080DA100 + b @080DA100 .align 2, 0 .pool -_080D9C68: +@080D9C68: mov r3, r8 lsls r1, r3, 2 adds r0, r1, r3 @@ -412918,33 +412918,33 @@ _080D9C68: ldrsh r0, [r0, r5] mov r10, r1 cmp r0, 0x4 - bls _080D9C7E - b _080DA100 -_080D9C7E: + bls @080D9C7E + b @080DA100 +@080D9C7E: lsls r0, 2 - ldr r1, =_080D9C8C + ldr r1, =@080D9C8C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080D9C8C: - .4byte _080D9CA0 - .4byte _080D9CB0 - .4byte _080D9CD4 - .4byte _080D9D3E - .4byte _080D9D84 -_080D9CA0: +@080D9C8C: + .4byte @080D9CA0 + .4byte @080D9CB0 + .4byte @080D9CD4 + .4byte @080D9D3E + .4byte @080D9D84 +@080D9CA0: bl sub_80DED4C cmp r0, 0 - beq _080D9CAA - b _080DA100 -_080D9CAA: + beq @080D9CAA + b @080DA100 +@080D9CAA: movs r0, 0x1 movs r1, 0x1 - b _080D9D68 -_080D9CB0: + b @080D9D68 +@080D9CB0: mov r1, r9 ldr r0, [r1] ldr r0, [r0] @@ -412952,16 +412952,16 @@ _080D9CB0: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080D9CC2 - b _080DA100 -_080D9CC2: + beq @080D9CC2 + b @080DA100 +@080D9CC2: bl sub_80DDE0C movs r0, 0xDF bl audio_play movs r0, 0x1 bl sub_80DDCDC - b _080D9D6C -_080D9CD4: + b @080D9D6C +@080D9CD4: mov r3, r9 ldr r2, [r3] ldr r0, [r2] @@ -412971,9 +412971,9 @@ _080D9CD4: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq _080D9CEA - b _080DA100 -_080D9CEA: + beq @080D9CEA + b @080DA100 +@080D9CEA: mov r0, r10 add r0, r8 lsls r0, 3 @@ -412984,9 +412984,9 @@ _080D9CEA: lsls r0, 16 asrs r0, 16 cmp r0, 0x1D - bgt _080D9D02 - b _080DA100 -_080D9D02: + bgt @080D9D02 + b @080DA100 +@080D9D02: strh r3, [r5, 0x1E] ldr r0, [r2, 0x4] lsls r4, r6, 3 @@ -413015,8 +413015,8 @@ _080D9D02: ldrh r0, [r5, 0x1C] adds r0, 0x1 strh r0, [r5, 0x1C] - b _080DA100 -_080D9D3E: + b @080DA100 +@080D9D3E: mov r4, r9 ldr r2, [r4] ldr r1, [r2, 0x14] @@ -413026,23 +413026,23 @@ _080D9D3E: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080D9D54 - b _080DA100 -_080D9D54: + beq @080D9D54 + b @080DA100 +@080D9D54: ldr r0, [r2] ldrb r1, [r0, 0x6] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080D9D62 - b _080DA100 -_080D9D62: + beq @080D9D62 + b @080DA100 +@080D9D62: movs r1, 0x1 negs r1, r1 movs r0, 0x1 -_080D9D68: +@080D9D68: bl sub_80DDED0 -_080D9D6C: +@080D9D6C: ldr r0, =0x03005e00 mov r1, r10 add r1, r8 @@ -413051,10 +413051,10 @@ _080D9D6C: ldrh r0, [r1, 0x1C] adds r0, 0x1 strh r0, [r1, 0x1C] - b _080DA100 + b @080DA100 .align 2, 0 .pool -_080D9D84: +@080D9D84: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -413062,9 +413062,9 @@ _080D9D84: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq _080D9D96 - b _080DA100 -_080D9D96: + beq @080D9D96 + b @080DA100 +@080D9D96: mov r0, r10 add r0, r8 lsls r0, 3 @@ -413073,10 +413073,10 @@ _080D9D96: strh r3, [r0, 0x1E] movs r1, 0x2B strh r1, [r0, 0x8] - b _080DA100 + b @080DA100 .align 2, 0 .pool -_080D9DAC: +@080D9DAC: mov r5, r9 ldr r0, [r5] ldr r1, [r0, 0x14] @@ -413086,17 +413086,17 @@ _080D9DAC: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080D9DC2 - b _080DA100 -_080D9DC2: + beq @080D9DC2 + b @080DA100 +@080D9DC2: bl sub_80DB89C ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 - b _080D9F58 + b @080D9F58 .align 2, 0 .pool -_080D9DD4: +@080D9DD4: bl sub_80DB89C ldr r0, =0x02021ec4 ldr r5, =0x02039f34 @@ -413141,15 +413141,15 @@ _080D9DD4: adds r0, r1 movs r1, 0x3A strh r1, [r0, 0x8] - b _080DA100 + b @080DA100 .align 2, 0 .pool -_080D9E60: +@080D9E60: bl sub_80DED4C cmp r0, 0 - beq _080D9E6A - b _080DA100 -_080D9E6A: + beq @080D9E6A + b @080DA100 +@080D9E6A: bl sub_80DB89C ldr r4, =0x02021fc4 ldr r1, =0x0827e817 @@ -413166,23 +413166,23 @@ _080D9E6A: adds r0, r1 movs r1, 0x3B strh r1, [r0, 0x8] - b _080DA100 + b @080DA100 .align 2, 0 .pool -_080D9EA0: +@080D9EA0: bl sub_80DED4C cmp r0, 0 - beq _080D9EAA - b _080DA100 -_080D9EAA: + beq @080D9EAA + b @080DA100 +@080D9EAA: bl sub_80DB89C ldr r0, =0x03005e00 mov r5, r8 lsls r1, r5, 2 - b _080D9F58 + b @080D9F58 .align 2, 0 .pool -_080D9EBC: +@080D9EBC: mov r1, r9 ldr r0, [r1] ldr r1, [r0, 0x4] @@ -413194,12 +413194,12 @@ _080D9EBC: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080D9EDC + beq @080D9EDC movs r0, 0x11 negs r0, r0 ands r0, r1 strb r0, [r2, 0x15] -_080D9EDC: +@080D9EDC: adds r0, r6, 0 bl sub_80DC9B4 ldr r0, =0x02021cc4 @@ -413233,28 +413233,28 @@ _080D9EDC: adds r0, r1 movs r1, 0x22 strh r1, [r0, 0x8] - b _080DA100 + b @080DA100 .align 2, 0 .pool -_080D9F48: +@080D9F48: bl sub_80DED4C cmp r0, 0 - beq _080D9F52 - b _080DA100 -_080D9F52: + beq @080D9F52 + b @080DA100 +@080D9F52: ldr r0, =0x03005e00 mov r4, r8 lsls r1, r4, 2 -_080D9F58: +@080D9F58: add r1, r8 lsls r1, 3 adds r1, r0 movs r0, 0x37 strh r0, [r1, 0x8] - b _080DA100 + b @080DA100 .align 2, 0 .pool -_080D9F68: +@080D9F68: bl sub_80DDBE8 ldr r0, =0x03005e00 mov r5, r8 @@ -413264,10 +413264,10 @@ _080D9F68: adds r1, r0 movs r0, 0x38 strh r0, [r1, 0x8] - b _080DA100 + b @080DA100 .align 2, 0 .pool -_080D9F84: +@080D9F84: mov r1, r9 ldr r0, [r1] ldr r2, [r0] @@ -413277,16 +413277,16 @@ _080D9F84: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq _080D9F9A - b _080DA100 -_080D9F9A: + beq @080D9F9A + b @080DA100 +@080D9F9A: movs r0, 0x13 ldrsb r0, [r2, r0] cmp r0, 0x4 - ble _080D9FA8 + ble @080D9FA8 strb r1, [r2, 0x13] bl sub_80DD940 -_080D9FA8: +@080D9FA8: ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 @@ -413295,10 +413295,10 @@ _080D9FA8: adds r1, r0 movs r0, 0xA strh r0, [r1, 0x8] - b _080DA100 + b @080DA100 .align 2, 0 .pool -_080D9FC0: +@080D9FC0: mov r3, r8 lsls r2, r3, 2 add r2, r8 @@ -413315,10 +413315,10 @@ _080D9FC0: str r1, [r0] movs r0, 0xB strh r0, [r2, 0x8] - b _080DA100 + b @080DA100 .align 2, 0 .pool -_080D9FEC: +@080D9FEC: mov r5, r8 lsls r0, r5, 2 add r0, r8 @@ -413335,17 +413335,17 @@ _080D9FEC: ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - bge _080DA100 + bge @080DA100 adds r0, r6, 0 bl obj_free_rotscale_entry adds r0, r6, 0 bl obj_delete_and_free_tiles movs r0, 0x14 strh r0, [r4, 0x8] - b _080DA100 + b @080DA100 .align 2, 0 .pool -_080DA024: +@080DA024: mov r1, r8 lsls r0, r1, 2 add r0, r8 @@ -413355,8 +413355,8 @@ _080DA024: strh r1, [r0, 0x1C] movs r1, 0x15 strh r1, [r0, 0x8] - b _080DA100 -_080DA038: + b @080DA100 +@080DA038: bl sub_80DB89C ldr r0, =0x02021cc4 lsls r1, r6, 6 @@ -413378,13 +413378,13 @@ _080DA038: adds r0, r1 movs r1, 0x20 strh r1, [r0, 0x8] - b _080DA100 + b @080DA100 .align 2, 0 .pool -_080DA080: +@080DA080: bl sub_80DED4C cmp r0, 0 - bne _080DA100 + bne @080DA100 ldr r0, =0x03005e00 mov r3, r8 lsls r1, r3, 2 @@ -413393,10 +413393,10 @@ _080DA080: adds r1, r0 movs r0, 0x15 strh r0, [r1, 0x8] - b _080DA100 + b @080DA100 .align 2, 0 .pool -_080DA0A0: +@080DA0A0: mov r5, r8 lsls r0, r5, 2 add r0, r8 @@ -413408,13 +413408,13 @@ _080DA0A0: lsls r0, 16 asrs r0, 16 cmp r0, 0x1D - ble _080DA100 + ble @080DA100 movs r0, 0 strh r0, [r1, 0x1C] movs r0, 0x16 strh r0, [r1, 0x8] - b _080DA100 -_080DA0C2: + b @080DA100 +@080DA0C2: mov r1, r9 ldr r0, [r1] ldr r1, [r0] @@ -413425,7 +413425,7 @@ _080DA0C2: lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bne _080DA0F4 + bne @080DA0F4 mov r3, r8 lsls r0, r3, 2 add r0, r8 @@ -413436,17 +413436,17 @@ _080DA0C2: strh r2, [r0, 0xC] ldr r1, =sub_80DA198 + 1 str r1, [r0] - b _080DA100 + b @080DA100 .align 2, 0 .pool -_080DA0F4: +@080DA0F4: mov r5, r8 lsls r0, r5, 2 add r0, r8 lsls r0, 3 adds r0, r4 strh r2, [r0, 0x8] -_080DA100: +@080DA100: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -413458,7 +413458,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 @@ -413478,29 +413478,29 @@ 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] movs r3, 0x24 ldrsh r2, [r1, r3] cmp r2, 0 - beq _080DA148 + beq @080DA148 subs r0, 0x2 strh r0, [r1, 0x24] - b _080DA15C -_080DA148: + b @080DA15C +@080DA148: ldrh r0, [r1, 0x2E] adds r0, 0x1 strh r0, [r1, 0x2E] lsls r0, 16 asrs r0, 16 cmp r0, 0x1F - bne _080DA15C + bne @080DA15C strh r2, [r1, 0x2E] ldr r0, =nullsub_12 + 1 str r0, [r1, 0x1C] -_080DA15C: +@080DA15C: pop {r0} bx r0 .align 2, 0 @@ -413508,7 +413508,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] @@ -413522,7 +413522,7 @@ sub_80DA164: @ 80DA164 movs r1, 0x20 negs r1, r1 cmp r0, r1 - bge _080DA18E + bge @080DA18E ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] adds r2, 0x3E @@ -413530,7 +413530,7 @@ sub_80DA164: @ 80DA164 movs r1, 0x4 orrs r0, r1 strb r0, [r2] -_080DA18E: +@080DA18E: pop {r0} bx r0 .align 2, 0 @@ -413538,7 +413538,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 @@ -413550,26 +413550,26 @@ sub_80DA198: @ 80DA198 movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _080DA22E + beq @080DA22E cmp r0, 0x1 - bgt _080DA1C0 + bgt @080DA1C0 cmp r0, 0 - beq _080DA1C6 - b _080DA250 + beq @080DA1C6 + b @080DA250 .align 2, 0 .pool -_080DA1C0: +@080DA1C0: cmp r0, 0x2 - beq _080DA248 - b _080DA250 -_080DA1C6: + beq @080DA248 + b @080DA250 +@080DA1C6: ldr r0, =0x02039f2a ldrb r1, [r0] movs r6, 0x1 adds r0, r6, 0 ands r0, r1 cmp r0, 0 - beq _080DA224 + beq @080DA224 ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0] @@ -413580,10 +413580,10 @@ _080DA1C6: bl sub_80DA8A4 lsls r0, 24 cmp r0, 0 - beq _080DA1F4 + beq @080DA1F4 bl sub_80DB944 bl sub_80DBA18 -_080DA1F4: +@080DA1F4: ldr r4, =sub_80FCC88 + 1 adds r0, r4, 0 movs r1, 0 @@ -413595,14 +413595,14 @@ _080DA1F4: bl set_task_function_and_args_14_15 bl sub_80DBF68 strh r6, [r5, 0x8] - b _080DA250 + b @080DA250 .align 2, 0 .pool -_080DA224: +@080DA224: bl sub_80DB944 bl sub_80DBA18 - b _080DA23E -_080DA22E: + b @080DA23E +@080DA22E: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] @@ -413610,19 +413610,19 @@ _080DA22E: movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne _080DA250 -_080DA23E: + bne @080DA250 +@080DA23E: movs r0, 0x2 strh r0, [r5, 0x8] - b _080DA250 + b @080DA250 .align 2, 0 .pool -_080DA248: +@080DA248: movs r0, 0 strh r0, [r5, 0x8] ldr r0, =sub_80DA25C + 1 str r0, [r5] -_080DA250: +@080DA250: pop {r4-r6} pop {r0} bx r0 @@ -413631,7 +413631,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 @@ -413656,7 +413656,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 @@ -413668,31 +413668,31 @@ sub_80DA28C: @ 80DA28C movs r0, 0x8 ldrsh r5, [r4, r0] cmp r5, 0x1 - beq _080DA2D2 + beq @080DA2D2 cmp r5, 0x1 - bgt _080DA2B4 + bgt @080DA2B4 cmp r5, 0 - beq _080DA2BA - b _080DA312 + beq @080DA2BA + b @080DA312 .align 2, 0 .pool -_080DA2B4: +@080DA2B4: cmp r5, 0x2 - beq _080DA304 - b _080DA312 -_080DA2BA: + beq @080DA304 + b @080DA312 +@080DA2BA: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - ble _080DA312 + ble @080DA312 movs r0, 0x2 bl sub_80DE69C strh r5, [r4, 0xA] - b _080DA2F6 -_080DA2D2: + b @080DA2F6 +@080DA2D2: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] @@ -413702,30 +413702,30 @@ _080DA2D2: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _080DA312 + bne @080DA312 ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - ble _080DA312 + ble @080DA312 strh r1, [r4, 0xA] -_080DA2F6: +@080DA2F6: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080DA312 + b @080DA312 .align 2, 0 .pool -_080DA304: +@080DA304: bl sub_80DC3AC movs r0, 0 strh r0, [r4, 0x8] strh r0, [r4, 0xA] ldr r0, =sub_80DA31C + 1 str r0, [r4] -_080DA312: +@080DA312: pop {r4,r5} pop {r0} bx r0 @@ -413734,14 +413734,14 @@ _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 bl sub_80DC3C4 lsls r0, 24 cmp r0, 0 - beq _080DA33A + beq @080DA33A ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -413749,7 +413749,7 @@ sub_80DA31C: @ 80DA31C adds r1, r0 ldr r0, =sub_80DA348 + 1 str r0, [r1] -_080DA33A: +@080DA33A: pop {r4} pop {r0} bx r0 @@ -413758,7 +413758,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 @@ -413786,7 +413786,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 @@ -413801,7 +413801,7 @@ sub_80DA38C: @ 80DA38C lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - ble _080DA3BE + ble @080DA3BE movs r0, 0 strh r0, [r1, 0x8] ldrh r0, [r1, 0xA] @@ -413809,10 +413809,10 @@ sub_80DA38C: @ 80DA38C strh r0, [r1, 0xA] lsls r0, 16 cmp r0, 0 - bne _080DA3BE + bne @080DA3BE ldr r0, =sub_80DA3CC + 1 str r0, [r1] -_080DA3BE: +@080DA3BE: pop {r0} bx r0 .align 2, 0 @@ -413820,7 +413820,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 @@ -413832,7 +413832,7 @@ sub_80DA3CC: @ 80DA3CC movs r1, 0x8 ldrsh r0, [r6, r1] cmp r0, 0 - bne _080DA448 + bne @080DA448 ldr r0, =0x02039f34 ldr r0, [r0] ldr r5, =0x02039f25 @@ -413863,18 +413863,18 @@ sub_80DA3CC: @ 80DA3CC ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] - b _080DA45A + b @080DA45A .align 2, 0 .pool -_080DA448: +@080DA448: bl sub_80DED4C cmp r0, 0 - bne _080DA45A + bne @080DA45A strh r0, [r6, 0x8] ldr r0, =sub_80DA464 + 1 str r0, [r6] bl sub_80DCD48 -_080DA45A: +@080DA45A: pop {r4-r6} pop {r0} bx r0 @@ -413883,7 +413883,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 @@ -413898,13 +413898,13 @@ sub_80DA464: @ 80DA464 lsls r0, 16 asrs r0, 16 cmp r0, 0x1D - ble _080DA48E + ble @080DA48E movs r0, 0 strh r0, [r4, 0x8] bl sub_80DC3AC ldr r0, =sub_80DA49C + 1 str r0, [r4] -_080DA48E: +@080DA48E: pop {r4} pop {r0} bx r0 @@ -413913,14 +413913,14 @@ _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 bl sub_80DC3C4 lsls r0, 24 cmp r0, 0 - beq _080DA4BE + beq @080DA4BE ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -413930,7 +413930,7 @@ sub_80DA49C: @ 80DA49C strh r1, [r0, 0x8] ldr r1, =sub_80DA4CC + 1 str r1, [r0] -_080DA4BE: +@080DA4BE: pop {r4} pop {r0} bx r0 @@ -413939,7 +413939,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 @@ -413960,7 +413960,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 @@ -413981,7 +413981,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 @@ -414022,17 +414022,17 @@ sub_80DA51C: @ 80DA51C ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x5 - bne _080DA590 + bne @080DA590 ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 ldr r0, =sub_80DA5E8 + 1 - b _080DA5A0 + b @080DA5A0 .align 2, 0 .pool -_080DA590: +@080DA590: bl sub_80DDB0C ldr r0, =0x03005e00 lsls r1, r5, 2 @@ -414040,7 +414040,7 @@ _080DA590: lsls r1, 3 adds r1, r0 ldr r0, =sub_80DA5B4 + 1 -_080DA5A0: +@080DA5A0: str r0, [r1] add sp, 0x4 pop {r4,r5} @@ -414051,7 +414051,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 @@ -414062,7 +414062,7 @@ sub_80DA5B4: @ 80DA5B4 movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _080DA5D8 + bne @080DA5D8 ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -414070,7 +414070,7 @@ sub_80DA5B4: @ 80DA5B4 adds r1, r0 ldr r0, =sub_80D833C + 1 str r0, [r1] -_080DA5D8: +@080DA5D8: pop {r0} bx r0 .align 2, 0 @@ -414078,7 +414078,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 @@ -414091,7 +414091,7 @@ sub_80DA5E8: @ 80DA5E8 movs r3, 0 ldr r2, =0x02039f10 movs r1, 0x3 -_080DA600: +@080DA600: ldr r0, [r4] ldr r0, [r0, 0x4] adds r0, r3, r0 @@ -414101,7 +414101,7 @@ _080DA600: adds r2, 0x2 subs r1, 0x1 cmp r1, 0 - bge _080DA600 + bge @080DA600 bl sub_80DBD18 bl sub_80DB89C ldr r0, =0x02039f2a @@ -414109,7 +414109,7 @@ _080DA600: movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080DA65C + bne @080DA65C ldr r0, =0x02039f34 ldr r2, [r0] ldr r0, =0x02039f25 @@ -414121,14 +414121,14 @@ _080DA600: adds r0, r2 ldrh r0, [r0, 0x8] bl sub_80ED03C - b _080DA668 + b @080DA668 .align 2, 0 .pool -_080DA65C: +@080DA65C: bl sub_80DF250 bl sub_80DF4F8 bl sub_80DF750 -_080DA668: +@080DA668: ldr r1, =0x030060b8 ldr r0, =0x03005d80 ldr r0, [r0] @@ -414157,14 +414157,14 @@ _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 bl sub_80DED4C adds r4, r0, 0 cmp r4, 0 - bne _080DA6EA + bne @080DA6EA bl sub_80DE224 ldr r0, =0x02022e18 strh r4, [r0] @@ -414182,7 +414182,7 @@ sub_80DA6B4: @ 80DA6B4 strh r4, [r0, 0x8] ldr r1, =sub_80DA700 + 1 str r1, [r0] -_080DA6EA: +@080DA6EA: pop {r4,r5} pop {r0} bx r0 @@ -414191,7 +414191,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 @@ -414201,13 +414201,13 @@ sub_80DA700: @ 80DA700 strh r0, [r1] lsls r0, 16 cmp r0, 0 - bge _080DA718 + bge @080DA718 movs r0, 0 strh r0, [r1] -_080DA718: +@080DA718: ldrh r2, [r1] cmp r2, 0 - bne _080DA72E + bne @080DA72E ldr r0, =0x03005e00 lsls r1, r3, 2 adds r1, r3 @@ -414216,7 +414216,7 @@ _080DA718: ldr r0, =sub_80DA740 + 1 str r0, [r1] strh r2, [r1, 0x8] -_080DA72E: +@080DA72E: pop {r0} bx r0 .align 2, 0 @@ -414224,7 +414224,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 @@ -414240,7 +414240,7 @@ sub_80DA740: @ 80DA740 lsls r0, 16 asrs r0, 16 cmp r0, 0x31 - ble _080DA794 + ble @080DA794 movs r0, 0 strh r0, [r4, 0x8] ldr r0, =0x02039f2a @@ -414248,12 +414248,12 @@ sub_80DA740: @ 80DA740 movs r1, 0x1 ands r1, r0 cmp r1, 0 - beq _080DA780 + beq @080DA780 ldr r0, =sub_80DA7A0 + 1 - b _080DA792 + b @080DA792 .align 2, 0 .pool -_080DA780: +@080DA780: movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -414262,9 +414262,9 @@ _080DA780: movs r3, 0x10 bl sub_80A1AD4 ldr r0, =sub_80DA830 + 1 -_080DA792: +@080DA792: str r0, [r4] -_080DA794: +@080DA794: add sp, 0x4 pop {r4} pop {r0} @@ -414274,7 +414274,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 @@ -414306,7 +414306,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 @@ -414338,7 +414338,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 @@ -414347,7 +414347,7 @@ sub_80DA830: @ 80DA830 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080DA860 + bne @080DA860 adds r0, r2, 0 bl remove_task ldr r0, =0x03005dac @@ -414358,7 +414358,7 @@ sub_80DA830: @ 80DA830 bl sub_805F094 ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 -_080DA860: +@080DA860: pop {r0} bx r0 .align 2, 0 @@ -414366,7 +414366,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 @@ -414375,18 +414375,18 @@ 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] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080DA898 + bne @080DA898 ldr r1, =0x02039f25 movs r0, 0x3 strb r0, [r1] -_080DA898: +@080DA898: pop {r0} bx r0 .align 2, 0 @@ -414394,27 +414394,27 @@ _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 ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - beq _080DA8C0 + beq @080DA8C0 movs r0, 0 - b _080DA8C2 + b @080DA8C2 .align 2, 0 .pool -_080DA8C0: +@080DA8C0: movs r0, 0x1 -_080DA8C2: +@080DA8C2: pop {r1} bx r1 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} @@ -414431,10 +414431,10 @@ sub_80DA8C8: @ 80DA8C8 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080DA8F2 + beq @080DA8F2 mov r0, sp bl sub_80DF9D4 -_080DA8F2: +@080DA8F2: ldr r5, =0x02039f25 ldrb r0, [r5] lsls r0, 6 @@ -414446,20 +414446,20 @@ _080DA8F2: ldr r0, [r6] ldrb r0, [r0, 0x8] cmp r0, 0 - bne _080DA928 + bne @080DA928 ldrb r0, [r5] lsls r0, 6 adds r0, r4, r0 movs r1, 0xD8 - b _080DA930 + b @080DA930 .align 2, 0 .pool -_080DA928: +@080DA928: ldrb r0, [r5] lsls r0, 6 adds r0, r4, r0 movs r1, 0xD9 -_080DA930: +@080DA930: strb r1, [r0, 0x8] ldr r7, =0x02039e00 ldr r6, =0x02039f25 @@ -414498,14 +414498,14 @@ _080DA930: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080DA994 + beq @080DA994 adds r0, r5, 0 movs r1, 0x3 bl pokemon_getattr adds r1, r0, 0 mov r0, sp bl sub_80DF9E0 -_080DA994: +@080DA994: ldrb r0, [r6] lsls r0, 6 adds r4, r7, 0x2 @@ -414632,82 +414632,82 @@ _080DA994: adds r0, 0x1 ldrb r4, [r0] cmp r2, 0xFE - bne _080DAAC4 + bne @080DAAC4 adds r3, 0x14 - b _080DAB12 + b @080DAB12 .align 2, 0 .pool -_080DAAC4: +@080DAAC4: cmp r2, 0xFF - bne _080DAAD4 + bne @080DAAD4 lsls r0, r5, 16 movs r1, 0xA0 lsls r1, 13 adds r0, r1 lsrs r5, r0, 16 - b _080DAB12 -_080DAAD4: + b @080DAB12 +@080DAAD4: movs r0, 0x80 lsls r0, 1 cmp r2, r0 - bne _080DAAE8 + bne @080DAAE8 lsls r0, r6, 16 movs r1, 0xA0 lsls r1, 13 adds r0, r1 lsrs r6, r0, 16 - b _080DAB12 -_080DAAE8: + b @080DAB12 +@080DAAE8: ldr r0, =0x00000101 cmp r2, r0 - bne _080DAB00 + bne @080DAB00 lsls r0, r7, 16 movs r1, 0xA0 lsls r1, 13 adds r0, r1 lsrs r7, r0, 16 - b _080DAB12 + b @080DAB12 .align 2, 0 .pool -_080DAB00: +@080DAB00: movs r0, 0x81 lsls r0, 1 cmp r2, r0 - bne _080DAB12 + bne @080DAB12 lsls r0, r4, 16 movs r1, 0xA0 lsls r1, 13 adds r0, r1 lsrs r4, r0, 16 -_080DAB12: +@080DAB12: cmp r3, 0xFF - ble _080DAB18 + ble @080DAB18 movs r3, 0xFF -_080DAB18: +@080DAB18: lsls r0, r5, 16 asrs r0, 16 cmp r0, 0xFF - ble _080DAB22 + ble @080DAB22 movs r5, 0xFF -_080DAB22: +@080DAB22: lsls r0, r6, 16 asrs r0, 16 cmp r0, 0xFF - ble _080DAB2C + ble @080DAB2C movs r6, 0xFF -_080DAB2C: +@080DAB2C: lsls r0, r7, 16 asrs r0, 16 cmp r0, 0xFF - ble _080DAB36 + ble @080DAB36 movs r7, 0xFF -_080DAB36: +@080DAB36: lsls r0, r4, 16 asrs r0, 16 cmp r0, 0xFF - ble _080DAB40 + ble @080DAB40 movs r4, 0xFF -_080DAB40: +@080DAB40: ldr r2, =0x02039e00 ldr r1, =0x02039f25 ldrb r0, [r1] @@ -414746,7 +414746,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} @@ -414763,91 +414763,91 @@ sub_80DAB8C: @ 80DAB8C bl flag_check lsls r0, 24 cmp r0, 0 - beq _080DABC0 + beq @080DABC0 ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080DABC0 + bne @080DABC0 movs r7, 0x1 -_080DABC0: +@080DABC0: movs r5, 0 ldr r2, =0x085880a4 ldr r3, =0x085898a4 -_080DABC6: +@080DABC6: ldrb r0, [r2, 0x1C] lsls r0, 30 lsrs r0, 30 cmp r8, r0 - bne _080DAC3A + bne @080DAC3A cmp r7, 0x1 - bne _080DABEC + bne @080DABEC ldrb r0, [r3] cmp r0, 0x1 - beq _080DAC3A - b _080DABF2 + beq @080DAC3A + b @080DABF2 .align 2, 0 .pool -_080DABEC: +@080DABEC: ldrb r0, [r3] cmp r0, 0x2 - beq _080DAC3A -_080DABF2: + beq @080DAC3A +@080DABF2: cmp r4, 0 - bne _080DABFE + bne @080DABFE ldrb r0, [r2, 0x1C] lsls r0, 29 cmp r0, 0 - blt _080DAC2E -_080DABFE: + blt @080DAC2E +@080DABFE: cmp r4, 0x1 - bne _080DAC0A + bne @080DAC0A ldrb r0, [r2, 0x1C] lsls r0, 28 cmp r0, 0 - blt _080DAC2E -_080DAC0A: + blt @080DAC2E +@080DAC0A: cmp r4, 0x2 - bne _080DAC16 + bne @080DAC16 ldrb r0, [r2, 0x1C] lsls r0, 27 cmp r0, 0 - blt _080DAC2E -_080DAC16: + blt @080DAC2E +@080DAC16: cmp r4, 0x3 - bne _080DAC22 + bne @080DAC22 ldrb r0, [r2, 0x1C] lsls r0, 26 cmp r0, 0 - blt _080DAC2E -_080DAC22: + blt @080DAC2E +@080DAC22: cmp r4, 0x4 - bne _080DAC3A + bne @080DAC3A ldrb r0, [r2, 0x1C] lsls r0, 25 cmp r0, 0 - bge _080DAC3A -_080DAC2E: + bge @080DAC3A +@080DAC2E: adds r0, r6, 0 adds r1, r0, 0x1 lsls r1, 24 lsrs r6, r1, 24 add r0, sp strb r5, [r0] -_080DAC3A: +@080DAC3A: adds r2, 0x40 adds r3, 0x1 adds r5, 0x1 cmp r5, 0x5F - bls _080DABC6 + bls @080DABC6 mov r0, sp adds r1, r0, r6 movs r0, 0xFF strb r0, [r1] movs r5, 0 ldr r7, =0x085880a4 -_080DAC50: +@080DAC50: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -414870,21 +414870,21 @@ _080DAC50: adds r2, r5, 0x1 subs r1, r6, 0x1 cmp r0, 0xFF - beq _080DAC92 + beq @080DAC92 adds r3, r4, 0 -_080DAC86: +@080DAC86: ldrb r0, [r3, 0x1] strb r0, [r3] adds r3, 0x1 ldrb r0, [r3] cmp r0, 0xFF - bne _080DAC86 -_080DAC92: + bne @080DAC86 +@080DAC92: lsls r0, r1, 24 lsrs r6, r0, 24 adds r5, r2, 0 cmp r5, 0x2 - ble _080DAC50 + ble @080DAC50 ldr r0, =0x02039f24 ldrb r0, [r0] bl sub_80DA8C8 @@ -414899,7 +414899,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 @@ -414915,79 +414915,79 @@ sub_80DACBC: @ 80DACBC ldrb r1, [r0] mov r9, r0 cmp r1, 0x4 - bne _080DACDE - b _080DADF6 -_080DACDE: + bne @080DACDE + b @080DADF6 +@080DACDE: movs r5, 0 ldr r3, =0x085880a4 ldr r6, =0x085898a4 -_080DACE4: +@080DACE4: ldrb r0, [r3, 0x1C] lsls r0, 30 lsrs r0, 30 cmp r2, r0 - bne _080DAD56 + bne @080DAD56 mov r0, r8 cmp r0, 0x1 - bne _080DAD08 + bne @080DAD08 ldrb r0, [r6] cmp r0, 0x1 - beq _080DAD56 - b _080DAD0E + beq @080DAD56 + b @080DAD0E .align 2, 0 .pool -_080DAD08: +@080DAD08: ldrb r0, [r6] cmp r0, 0x2 - beq _080DAD56 -_080DAD0E: + beq @080DAD56 +@080DAD0E: cmp r4, 0 - bne _080DAD1A + bne @080DAD1A ldrb r0, [r3, 0x1C] lsls r0, 29 cmp r0, 0 - blt _080DAD4A -_080DAD1A: + blt @080DAD4A +@080DAD1A: cmp r4, 0x1 - bne _080DAD26 + bne @080DAD26 ldrb r0, [r3, 0x1C] lsls r0, 28 cmp r0, 0 - blt _080DAD4A -_080DAD26: + blt @080DAD4A +@080DAD26: cmp r4, 0x2 - bne _080DAD32 + bne @080DAD32 ldrb r0, [r3, 0x1C] lsls r0, 27 cmp r0, 0 - blt _080DAD4A -_080DAD32: + blt @080DAD4A +@080DAD32: cmp r4, 0x3 - bne _080DAD3E + bne @080DAD3E ldrb r0, [r3, 0x1C] lsls r0, 26 cmp r0, 0 - blt _080DAD4A -_080DAD3E: + blt @080DAD4A +@080DAD3E: cmp r4, 0x4 - bne _080DAD56 + bne @080DAD56 ldrb r0, [r3, 0x1C] lsls r0, 25 cmp r0, 0 - bge _080DAD56 -_080DAD4A: + bge @080DAD56 +@080DAD4A: adds r0, r7, 0 adds r1, r0, 0x1 lsls r1, 24 lsrs r7, r1, 24 add r0, sp strb r5, [r0] -_080DAD56: +@080DAD56: adds r3, 0x40 adds r6, 0x1 adds r5, 0x1 cmp r5, 0x5F - bls _080DACE4 + bls @080DACE4 mov r3, sp adds r1, r3, r7 movs r0, 0xFF @@ -414998,14 +414998,14 @@ _080DAD56: movs r0, 0x4 subs r0, r1 cmp r5, r0 - bge _080DADF6 + bge @080DADF6 ldr r3, =0x02039e00 mov r8, r3 mov r6, r9 movs r0, 0x2 add r0, r8 mov r9, r0 -_080DAD82: +@080DAD82: bl sub_80F903C lsls r0, 16 lsrs r0, 16 @@ -415043,16 +415043,16 @@ _080DAD82: adds r3, r5, 0x1 subs r1, r7, 0x1 cmp r0, 0xFF - beq _080DADE6 + beq @080DADE6 adds r2, r4, 0 -_080DADDA: +@080DADDA: ldrb r0, [r2, 0x1] strb r0, [r2] adds r2, 0x1 ldrb r0, [r2] cmp r0, 0xFF - bne _080DADDA -_080DADE6: + bne @080DADDA +@080DADE6: lsls r0, r1, 24 lsrs r7, r0, 24 adds r5, r3, 0 @@ -415060,8 +415060,8 @@ _080DADE6: movs r0, 0x4 subs r0, r1 cmp r5, r0 - blt _080DAD82 -_080DADF6: + blt @080DAD82 +@080DADF6: add sp, 0x64 pop {r3,r4} mov r8, r3 @@ -415074,81 +415074,81 @@ _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 bl pokemon_getattr cmp r0, 0 - beq _080DAE1E + beq @080DAE1E movs r0, 0x3 - b _080DAE9A -_080DAE1E: + b @080DAE9A +@080DAE1E: adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - bne _080DAE2E + bne @080DAE2E movs r0, 0x4 - b _080DAE9A -_080DAE2E: + b @080DAE9A +@080DAE2E: ldr r0, =0x02039f2c ldrh r0, [r0] cmp r0, 0x4 - bhi _080DAE82 + bhi @080DAE82 lsls r0, 2 - ldr r1, =_080DAE48 + ldr r1, =@080DAE48 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080DAE48: - .4byte _080DAE5C - .4byte _080DAE62 - .4byte _080DAE68 - .4byte _080DAE6E - .4byte _080DAE74 -_080DAE5C: +@080DAE48: + .4byte @080DAE5C + .4byte @080DAE62 + .4byte @080DAE68 + .4byte @080DAE6E + .4byte @080DAE74 +@080DAE5C: adds r0, r4, 0 movs r1, 0x32 - b _080DAE78 -_080DAE62: + b @080DAE78 +@080DAE62: adds r0, r4, 0 movs r1, 0x33 - b _080DAE78 -_080DAE68: + b @080DAE78 +@080DAE68: adds r0, r4, 0 movs r1, 0x34 - b _080DAE78 -_080DAE6E: + b @080DAE78 +@080DAE6E: adds r0, r4, 0 movs r1, 0x35 - b _080DAE78 -_080DAE74: + b @080DAE78 +@080DAE74: adds r0, r4, 0 movs r1, 0x36 -_080DAE78: +@080DAE78: bl pokemon_getattr lsls r0, 24 lsrs r1, r0, 24 - b _080DAE86 -_080DAE82: + b @080DAE86 +@080DAE82: movs r0, 0 - b _080DAE9A -_080DAE86: + b @080DAE9A +@080DAE86: ldr r0, =0x02039f2e adds r2, r1, 0 ldrh r1, [r0] movs r0, 0x2 cmp r2, r1 - bhi _080DAE9A + bhi @080DAE9A movs r0, 0 cmp r2, r1 - bcc _080DAE9A + bcc @080DAE9A movs r0, 0x1 -_080DAE9A: +@080DAE9A: pop {r4} pop {r1} bx r1 @@ -415157,10 +415157,10 @@ _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: +@080DAEA8: ldr r0, =0x02039f26 adds r0, r5, r0 ldrb r0, [r0] @@ -415174,7 +415174,7 @@ _080DAEA8: bl sub_80DAF88 adds r5, 0x1 cmp r5, 0x3 - ble _080DAEA8 + ble @080DAEA8 pop {r4,r5} pop {r0} bx r0 @@ -415183,7 +415183,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 @@ -415206,7 +415206,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 @@ -415221,7 +415221,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 @@ -415248,9 +415248,9 @@ sub_80DAF1C: @ 80DAF1C bl sub_81DB368 adds r2, r0, 0 cmp r2, 0x37 - ble _080DAF5C + ble @080DAF5C movs r2, 0x37 -_080DAF5C: +@080DAF5C: ldr r0, =0x02039f26 adds r0, r5, r0 ldrb r0, [r0] @@ -415268,7 +415268,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 @@ -415283,7 +415283,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 @@ -415313,29 +415313,29 @@ 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 lsls r1, 24 lsrs r0, r1, 24 cmp r0, 0x4 - bhi _080DB06C + bhi @080DB06C lsls r0, 2 - ldr r1, =_080DAFFC + ldr r1, =@080DAFFC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080DAFFC: - .4byte _080DB010 - .4byte _080DB028 - .4byte _080DB040 - .4byte _080DB050 - .4byte _080DB06C -_080DB010: +@080DAFFC: + .4byte @080DB010 + .4byte @080DB028 + .4byte @080DB040 + .4byte @080DB050 + .4byte @080DB06C +@080DB010: ldr r0, =0x02039e00 lsls r2, 6 adds r1, r2, r0 @@ -415345,10 +415345,10 @@ _080DB010: adds r3, 0x4 ldrb r4, [r3] adds r1, 0x27 - b _080DB07E + b @080DB07E .align 2, 0 .pool -_080DB028: +@080DB028: ldr r0, =0x02039e00 lsls r2, 6 adds r1, r2, r0 @@ -415358,35 +415358,35 @@ _080DB028: subs r3, 0x1 ldrb r4, [r3] adds r1, 0x28 - b _080DB07E + b @080DB07E .align 2, 0 .pool -_080DB040: +@080DB040: ldr r1, =0x02039e00 lsls r2, 6 adds r3, r2, r1 adds r0, r3, 0 adds r0, 0x28 - b _080DB05A + b @080DB05A .align 2, 0 .pool -_080DB050: +@080DB050: ldr r1, =0x02039e00 lsls r2, 6 adds r3, r2, r1 adds r0, r3, 0 adds r0, 0x29 -_080DB05A: +@080DB05A: ldrb r5, [r0] subs r0, 0x1 ldrb r4, [r0] adds r0, 0x2 ldrb r3, [r0] adds r0, r1, 0 - b _080DB080 + b @080DB080 .align 2, 0 .pool -_080DB06C: +@080DB06C: ldr r0, =0x02039e00 lsls r2, 6 adds r1, r2, r0 @@ -415396,9 +415396,9 @@ _080DB06C: subs r3, 0x1 ldrb r4, [r3] adds r1, 0x26 -_080DB07E: +@080DB07E: ldrb r3, [r1] -_080DB080: +@080DB080: adds r1, r2, r0 adds r1, 0x2B adds r0, r4, r3 @@ -415416,13 +415416,13 @@ _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 movs r4, 0 ldr r5, =0x02039f00 -_080DB0A6: +@080DB0A6: lsls r0, r4, 24 lsrs r0, 24 adds r1, r6, 0 @@ -415431,7 +415431,7 @@ _080DB0A6: adds r5, 0x2 adds r4, 0x1 cmp r4, 0x3 - ble _080DB0A6 + ble @080DB0A6 pop {r4-r6} pop {r0} bx r0 @@ -415440,7 +415440,7 @@ _080DB0A6: thumb_func_end sub_80DB09C thumb_func_start sub_80DB0C4 -sub_80DB0C4: @ 80DB0C4 +sub_80DB0C4: ; 80DB0C4 push {r4,r5,lr} ldr r0, =0x08587c00 bl gpu_tile_obj_decompress_and_load @@ -415479,7 +415479,7 @@ sub_80DB0C4: @ 80DB0C4 thumb_func_end sub_80DB0C4 thumb_func_start sub_80DB120 -sub_80DB120: @ 80DB120 +sub_80DB120: ; 80DB120 push {lr} ldr r0, =0x08587c08 bl gpu_tile_obj_decompress_and_load @@ -415516,7 +415516,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} @@ -415531,7 +415531,7 @@ sub_80DB174: @ 80DB174 ldr r0, =0x02039f25 ldrb r0, [r0] cmp r4, r0 - bne _080DB1B8 + bne @080DB1B8 lsls r0, r5, 3 ldr r1, =0x083028b8 adds r0, r1 @@ -415541,10 +415541,10 @@ sub_80DB174: @ 80DB174 adds r2, r5, 0 adds r3, r6, 0 bl help_system_enable_unless_flashback__sp199 - b _080DB1CC + b @080DB1CC .align 2, 0 .pool -_080DB1B8: +@080DB1B8: lsls r0, r5, 3 ldr r1, =0x083028b8 adds r0, r1 @@ -415554,7 +415554,7 @@ _080DB1B8: adds r2, r5, 0 adds r3, r6, 0 bl sub_8034B50 -_080DB1CC: +@080DB1CC: adds r0, r5, 0 adds r1, r7, 0 adds r2, r6, 0 @@ -415616,20 +415616,20 @@ _080DB1CC: bl sub_80DB2A8 lsls r0, 24 cmp r0, 0 - beq _080DB278 + beq @080DB278 mov r0, r8 adds r0, 0x10 adds r0, r6, r0 ldr r1, =0x082ff6c0 - b _080DB280 + b @080DB280 .align 2, 0 .pool -_080DB278: +@080DB278: mov r0, r8 adds r0, 0x10 adds r0, r6, r0 ldr r1, =0x082ff694 -_080DB280: +@080DB280: str r1, [r0] lsls r0, r7, 4 adds r0, r7 @@ -415649,23 +415649,23 @@ _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 cmp r0, 0xC9 - beq _080DB2B6 + beq @080DB2B6 movs r0, 0x1 - b _080DB2B8 -_080DB2B6: + b @080DB2B8 +@080DB2B6: movs r0, 0 -_080DB2B8: +@080DB2B8: pop {r1} bx r1 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] @@ -415691,7 +415691,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 @@ -415705,38 +415705,38 @@ sub_80DB2EC: @ 80DB2EC adds r0, r2 ldrb r0, [r0] cmp r0, 0x8 - bhi _080DB354 + bhi @080DB354 lsls r0, 2 - ldr r1, =_080DB320 + ldr r1, =@080DB320 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080DB320: - .4byte _080DB344 - .4byte _080DB344 - .4byte _080DB34C - .4byte _080DB34C - .4byte _080DB354 - .4byte _080DB354 - .4byte _080DB354 - .4byte _080DB354 - .4byte _080DB344 -_080DB344: +@080DB320: + .4byte @080DB344 + .4byte @080DB344 + .4byte @080DB34C + .4byte @080DB34C + .4byte @080DB354 + .4byte @080DB354 + .4byte @080DB354 + .4byte @080DB354 + .4byte @080DB344 +@080DB344: ldr r0, =0x00009082 - b _080DB356 + b @080DB356 .align 2, 0 .pool -_080DB34C: +@080DB34C: ldr r0, =0x00009088 - b _080DB356 + b @080DB356 .align 2, 0 .pool -_080DB354: +@080DB354: ldr r0, =0x00009086 -_080DB356: +@080DB356: lsls r1, r3, 12 movs r2, 0x90 lsls r2, 8 @@ -415753,7 +415753,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} @@ -415769,18 +415769,18 @@ prints_contest_move_description: @ 80DB370 lsrs r0, 29 ldr r7, =0x00004040 cmp r0, 0 - beq _080DB3A4 + beq @080DB3A4 adds r7, 0x5 cmp r0, 0x1 - beq _080DB3A4 + beq @080DB3A4 adds r7, 0x5 cmp r0, 0x2 - beq _080DB3A4 + beq @080DB3A4 adds r7, 0x40 cmp r0, 0x3 - bne _080DB3A4 + bne @080DB3A4 subs r7, 0x20 -_080DB3A4: +@080DB3A4: movs r6, 0x5 str r6, [sp] movs r4, 0x1 @@ -415814,22 +415814,22 @@ _080DB3A4: ldrb r0, [r2, 0x1] adds r7, r1, 0 cmp r0, 0xFF - bne _080DB3FC + bne @080DB3FC movs r6, 0 - b _080DB408 + b @080DB408 .align 2, 0 .pool -_080DB3FC: +@080DB3FC: ldrb r0, [r2, 0x1] movs r1, 0xA bl __udivsi3 lsls r0, 24 lsrs r6, r0, 24 -_080DB408: +@080DB408: cmp r6, 0x8 - bls _080DB40E + bls @080DB40E movs r6, 0x8 -_080DB40E: +@080DB40E: ldr r1, =0x00005035 movs r0, 0x8 str r0, [sp] @@ -415857,22 +415857,22 @@ _080DB40E: adds r1, r0, r1 ldrb r0, [r1, 0x2] cmp r0, 0xFF - bne _080DB460 + bne @080DB460 movs r6, 0 - b _080DB46C + b @080DB46C .align 2, 0 .pool -_080DB460: +@080DB460: ldrb r0, [r1, 0x2] movs r1, 0xA bl __udivsi3 lsls r0, 24 lsrs r6, r0, 24 -_080DB46C: +@080DB46C: cmp r6, 0x8 - bls _080DB472 + bls @080DB472 movs r6, 0x8 -_080DB472: +@080DB472: ldr r1, =0x00005036 movs r0, 0x8 str r0, [sp] @@ -415918,7 +415918,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} @@ -415939,9 +415939,9 @@ sub_80DB4E0: @ 80DB4E0 bl sub_80DBCA8 lsls r0, 24 cmp r0, 0 - bne _080DB560 + bne @080DB560 cmp r5, 0 - beq _080DB560 + beq @080DB560 adds r0, r5, 0 adds r1, r4, 0 bl sub_80DB2EC @@ -415976,10 +415976,10 @@ sub_80DB4E0: @ 80DB4E0 adds r1, r4, 0 movs r2, 0x14 bl sub_80DECB8 - b _080DB576 + b @080DB576 .align 2, 0 .pool -_080DB560: +@080DB560: movs r0, 0x2 str r0, [sp] str r0, [sp, 0x4] @@ -415990,7 +415990,7 @@ _080DB560: movs r2, 0x14 adds r3, r7, 0 bl sub_80DED10 -_080DB576: +@080DB576: add sp, 0x10 pop {r3} mov r8, r3 @@ -416000,11 +416000,11 @@ _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 -_080DB58A: +@080DB58A: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x4] @@ -416016,7 +416016,7 @@ _080DB58A: adds r5, 0x1C adds r4, 0x1 cmp r4, 0x3 - ble _080DB58A + ble @080DB58A pop {r4,r5} pop {r0} bx r0 @@ -416025,7 +416025,7 @@ _080DB58A: thumb_func_end sub_80DB584 thumb_func_start sub_80DB5B0 -sub_80DB5B0: @ 80DB5B0 +sub_80DB5B0: ; 80DB5B0 ldr r0, =0x00002034 bx lr .align 2, 0 @@ -416033,7 +416033,7 @@ sub_80DB5B0: @ 80DB5B0 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 @@ -416058,12 +416058,12 @@ sub_80DB5B8: @ 80DB5B8 movs r5, 0x30 ands r5, r0 cmp r5, 0 - bne _080DB5F4 + bne @080DB5F4 movs r0, 0 - b _080DB68A + b @080DB68A .align 2, 0 .pool -_080DB5F4: +@080DB5F4: ldr r0, =0x02039f26 adds r0, r2, r0 ldrb r1, [r0] @@ -416079,7 +416079,7 @@ _080DB5F4: lsls r0, 24 asrs r4, r0, 24 cmp r5, 0x10 - bne _080DB648 + bne @080DB648 bl sub_80DB5B0 adds r1, r0, 0 lsls r1, 16 @@ -416097,12 +416097,12 @@ _080DB5F4: bl sub_80DED10 mov r1, r8 cmp r1, 0 - beq _080DB688 + beq @080DB688 movs r0, 0x5B - b _080DB672 + b @080DB672 .align 2, 0 .pool -_080DB648: +@080DB648: adds r3, r6, r4 lsls r3, 24 lsrs r3, 24 @@ -416121,9 +416121,9 @@ _080DB648: bl sub_80DED10 mov r0, r10 cmp r0, 0 - beq _080DB688 + beq @080DB688 movs r0, 0x26 -_080DB672: +@080DB672: bl audio_play mov r1, r9 ldr r0, [r1] @@ -416134,9 +416134,9 @@ _080DB672: negs r0, r0 ands r0, r2 strb r0, [r1, 0x10] -_080DB688: +@080DB688: movs r0, 0x1 -_080DB68A: +@080DB68A: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -416148,7 +416148,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 @@ -416162,7 +416162,7 @@ sub_80DB69C: @ 80DB69C mov r9, r1 movs r0, 0 mov r8, r0 -_080DB6B6: +@080DB6B6: ldr r0, =0x02039f26 adds r0, r7, r0 ldrb r0, [r0] @@ -416218,7 +416218,7 @@ _080DB6B6: add r8, r1 adds r7, 0x1 cmp r7, 0x3 - ble _080DB6B6 + ble @080DB6B6 add sp, 0xC pop {r3-r5} mov r8, r3 @@ -416232,42 +416232,42 @@ _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 movs r0, 0 cmp r1, 0x4 - bhi _080DB78A + bhi @080DB78A lsls r0, r1, 2 - ldr r1, =_080DB764 + ldr r1, =@080DB764 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080DB764: - .4byte _080DB778 - .4byte _080DB77C - .4byte _080DB780 - .4byte _080DB784 - .4byte _080DB788 -_080DB778: +@080DB764: + .4byte @080DB778 + .4byte @080DB77C + .4byte @080DB780 + .4byte @080DB784 + .4byte @080DB788 +@080DB778: movs r0, 0x80 - b _080DB78A -_080DB77C: + b @080DB78A +@080DB77C: movs r0, 0x84 - b _080DB78A -_080DB780: + b @080DB78A +@080DB780: movs r0, 0x86 - b _080DB78A -_080DB784: + b @080DB78A +@080DB784: movs r0, 0x88 - b _080DB78A -_080DB788: + b @080DB78A +@080DB788: movs r0, 0x82 -_080DB78A: +@080DB78A: movs r1, 0x90 lsls r1, 8 adds r0, r1 @@ -416278,7 +416278,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 @@ -416309,48 +416309,48 @@ sub_80DB798: @ 80DB798 ldr r1, =0x00ff0003 ands r0, r1 cmp r0, 0 - bne _080DB7DC + bne @080DB7DC ldrb r0, [r2, 0xF] cmp r0, 0 - beq _080DB7EC -_080DB7DC: + beq @080DB7EC +@080DB7DC: movs r0, 0 - b _080DB80E + b @080DB80E .align 2, 0 .pool -_080DB7EC: +@080DB7EC: ldrb r1, [r2, 0xC] mov r0, r9 ands r0, r1 cmp r0, 0 - beq _080DB7FA + beq @080DB7FA movs r0, 0x1 - b _080DB80E -_080DB7FA: + b @080DB80E +@080DB7FA: movs r0, 0x6 ands r0, r1 cmp r0, 0 - bne _080DB80C + bne @080DB80C ldrb r1, [r2, 0xB] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080DB81A -_080DB80C: + beq @080DB81A +@080DB80C: movs r0, 0x2 -_080DB80E: +@080DB80E: bl sub_80DB748 lsls r0, 16 lsrs r0, 16 mov r8, r0 - b _080DB81E -_080DB81A: + b @080DB81E +@080DB81A: movs r0, 0 mov r9, r0 -_080DB81E: +@080DB81E: mov r1, r9 cmp r1, 0 - beq _080DB85E + beq @080DB85E movs r6, 0x2 str r6, [sp] movs r4, 0x1 @@ -416377,8 +416377,8 @@ _080DB81E: movs r0, 0 movs r2, 0x14 bl sub_80DECB8 - b _080DB874 -_080DB85E: + b @080DB874 +@080DB85E: movs r0, 0x2 str r0, [sp] str r0, [sp, 0x4] @@ -416389,7 +416389,7 @@ _080DB85E: movs r2, 0x14 adds r3, r7, 0 bl sub_80DED10 -_080DB874: +@080DB874: mov r0, r9 add sp, 0x10 pop {r3,r4} @@ -416401,23 +416401,23 @@ _080DB874: thumb_func_end sub_80DB798 thumb_func_start sub_80DB884 -sub_80DB884: @ 80DB884 +sub_80DB884: ; 80DB884 push {r4,lr} movs r4, 0 -_080DB888: +@080DB888: lsls r0, r4, 24 lsrs r0, 24 bl sub_80DB798 adds r4, 0x1 cmp r4, 0x3 - ble _080DB888 + ble @080DB888 pop {r4} pop {r0} bx r0 thumb_func_end sub_80DB884 thumb_func_start sub_80DB89C -sub_80DB89C: @ 80DB89C +sub_80DB89C: ; 80DB89C push {lr} movs r0, 0x4 movs r1, 0 @@ -416432,7 +416432,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 @@ -416441,14 +416441,14 @@ sub_80DB8B8: @ 80DB8B8 bl sub_80DBCA8 lsls r0, 24 cmp r0, 0 - beq _080DB8D0 + beq @080DB8D0 movs r0, 0 - b _080DB90A -_080DB8D0: + b @080DB90A +@080DB8D0: ldr r0, =0x02039f25 ldrb r0, [r0] cmp r4, r0 - beq _080DB8F4 + beq @080DB8F4 adds r0, r4, 0 bl sub_81562C4 bl sub_8156324 @@ -416456,10 +416456,10 @@ _080DB8D0: ldr r2, =0x02039e00 lsrs r0, 23 lsls r1, r4, 6 - b _080DB902 + b @080DB902 .align 2, 0 .pool -_080DB8F4: +@080DB8F4: ldr r2, =0x02039e00 ldr r0, =0x02039f34 ldr r0, [r0] @@ -416467,12 +416467,12 @@ _080DB8F4: ldrb r0, [r0] lsls r0, 1 lsls r1, r5, 6 -_080DB902: +@080DB902: adds r0, r1 adds r2, 0x1E adds r0, r2 ldrh r0, [r0] -_080DB90A: +@080DB90A: pop {r4,r5} pop {r1} bx r1 @@ -416481,11 +416481,11 @@ _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 -_080DB91E: +@080DB91E: lsls r0, r4, 24 lsrs r0, 24 bl sub_80DB8B8 @@ -416497,7 +416497,7 @@ _080DB91E: adds r5, 0x1C adds r4, 0x1 cmp r4, 0x3 - ble _080DB91E + ble @080DB91E pop {r4,r5} pop {r0} bx r0 @@ -416506,7 +416506,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 @@ -416516,7 +416516,7 @@ sub_80DB944: @ 80DB944 mov r4, sp movs r3, 0 movs r6, 0x3 -_080DB956: +@080DB956: ldr r2, [r5] ldr r1, [r2, 0x4] adds r1, r3, r1 @@ -416532,13 +416532,13 @@ _080DB956: adds r3, 0x1C subs r6, 0x1 cmp r6, 0 - bge _080DB956 + bge @080DB956 movs r6, 0 -_080DB978: +@080DB978: movs r4, 0x3 cmp r4, r6 - ble _080DB9A4 -_080DB97E: + ble @080DB9A4 +@080DB97E: subs r5, r4, 0x1 lsls r0, r5, 1 mov r1, sp @@ -416551,18 +416551,18 @@ _080DB97E: movs r7, 0 ldrsh r0, [r2, r7] cmp r1, r0 - bge _080DB99E + bge @080DB99E ldrh r0, [r2] strh r4, [r2] strh r0, [r3] -_080DB99E: +@080DB99E: adds r4, r5, 0 cmp r4, r6 - bgt _080DB97E -_080DB9A4: + bgt @080DB97E +@080DB9A4: adds r6, 0x1 cmp r6, 0x2 - ble _080DB978 + ble @080DB978 movs r6, 0 movs r0, 0x4 negs r0, r0 @@ -416571,14 +416571,14 @@ _080DB9A4: mov r8, r1 movs r7, 0x3 mov r12, r7 -_080DB9BA: +@080DB9BA: movs r4, 0 lsls r0, r6, 3 adds r7, r6, 0x1 subs r0, r6 lsls r5, r0, 2 mov r3, sp -_080DB9C6: +@080DB9C6: mov r1, r8 ldr r0, [r1] ldr r0, [r0, 0x4] @@ -416588,7 +416588,7 @@ _080DB9C6: movs r6, 0 ldrsh r0, [r3, r6] cmp r1, r0 - bne _080DB9F0 + bne @080DB9F0 mov r0, r12 ands r4, r0 ldrb r1, [r2, 0xB] @@ -416596,18 +416596,18 @@ _080DB9C6: ands r0, r1 orrs r0, r4 strb r0, [r2, 0xB] - b _080DB9F8 + b @080DB9F8 .align 2, 0 .pool -_080DB9F0: +@080DB9F0: adds r3, 0x2 adds r4, 0x1 cmp r4, 0x3 - ble _080DB9C6 -_080DB9F8: + ble @080DB9C6 +@080DB9F8: adds r6, r7, 0 cmp r6, 0x3 - ble _080DB9BA + ble @080DB9BA movs r0, 0x1 bl sub_80DCE58 bl sub_80DD590 @@ -416621,39 +416621,39 @@ _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 movs r3, 0x3 -_080DBA20: +@080DBA20: ldr r0, [r4] ldr r0, [r0, 0x4] adds r1, r2, r0 ldrh r0, [r1, 0x6] cmp r0, 0 - bne _080DBA34 + bne @080DBA34 movs r1, 0x5 - b _080DBA52 + b @080DBA52 .align 2, 0 .pool -_080DBA34: +@080DBA34: movs r5, 0x2 ldrsh r0, [r1, r5] movs r1, 0 cmp r0, 0 - ble _080DBA52 + ble @080DBA52 movs r1, 0x1 cmp r0, 0x1D - ble _080DBA52 + ble @080DBA52 movs r1, 0x2 cmp r0, 0x3B - ble _080DBA52 + ble @080DBA52 movs r1, 0x4 cmp r0, 0x4F - bgt _080DBA52 + bgt @080DBA52 movs r1, 0x3 -_080DBA52: +@080DBA52: ldr r0, [r4] ldr r0, [r0, 0x4] adds r0, r2, r0 @@ -416661,14 +416661,14 @@ _080DBA52: adds r2, 0x1C subs r3, 0x1 cmp r3, 0 - bge _080DBA20 + bge @080DBA20 pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_80DBA18 thumb_func_start sub_80DBA68 -sub_80DBA68: @ 80DBA68 +sub_80DBA68: ; 80DBA68 push {lr} lsls r0, 24 lsrs r0, 24 @@ -416683,26 +416683,26 @@ sub_80DBA68: @ 80DBA68 movs r0, 0x6 ands r0, r1 cmp r0, 0 - bne _080DBA90 + bne @080DBA90 ldrb r1, [r2, 0xB] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080DBA98 -_080DBA90: + beq @080DBA98 +@080DBA90: movs r0, 0 - b _080DBA9A + b @080DBA9A .align 2, 0 .pool -_080DBA98: +@080DBA98: movs r0, 0x1 -_080DBA9A: +@080DBA9A: pop {r1} bx r1 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 @@ -416719,7 +416719,7 @@ sub_80DBAA0: @ 80DBAA0 mov r9, r0 movs r4, 0 movs r6, 0x3 -_080DBAC0: +@080DBAC0: ldr r1, [r5] ldr r0, [r1, 0x4] adds r0, r4, r0 @@ -416739,7 +416739,7 @@ _080DBAC0: movs r0, 0x6 ands r0, r2 cmp r0, 0 - beq _080DBAFC + beq @080DBAFC lsls r0, r2, 29 lsrs r0, 30 subs r0, 0x1 @@ -416750,7 +416750,7 @@ _080DBAC0: ands r1, r2 orrs r1, r0 strb r1, [r3, 0xC] -_080DBAFC: +@080DBAFC: ldr r0, [r5] ldr r0, [r0, 0x4] adds r0, r4, r0 @@ -416861,7 +416861,7 @@ _080DBAFC: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080DBBF4 + beq @080DBBF4 ldrb r1, [r2, 0xC] mov r0, r10 ands r0, r1 @@ -416875,7 +416875,7 @@ _080DBAFC: adds r0, r7, 0 ands r0, r2 strb r0, [r1, 0x11] -_080DBBF4: +@080DBBF4: ldr r0, [r5] ldr r0, [r0, 0x4] adds r2, r4, r0 @@ -416883,7 +416883,7 @@ _080DBBF4: movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _080DBC1A + beq @080DBC1A ldrb r0, [r2, 0xB] movs r1, 0x80 orrs r0, r1 @@ -416895,7 +416895,7 @@ _080DBBF4: mov r0, r12 ands r0, r2 strb r0, [r1, 0x11] -_080DBC1A: +@080DBC1A: ldr r0, [r5] ldr r1, [r0, 0x4] adds r1, r4, r1 @@ -416907,14 +416907,14 @@ _080DBC1A: adds r4, 0x1C subs r6, 0x1 cmp r6, 0 - blt _080DBC34 - b _080DBAC0 -_080DBC34: + blt @080DBC34 + b @080DBAC0 +@080DBC34: movs r6, 0 ldr r5, =0x02039f34 movs r7, 0 movs r4, 0 -_080DBC3C: +@080DBC3C: ldr r3, [r5] ldr r0, [r3, 0x4] adds r0, r4, r0 @@ -416950,7 +416950,7 @@ _080DBC3C: adds r4, 0x1C adds r6, 0x1 cmp r6, 0x3 - ble _080DBC3C + ble @080DBC3C ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0x10] @@ -416971,7 +416971,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 @@ -416986,26 +416986,26 @@ sub_80DBCA8: @ 80DBCA8 movs r0, 0x6 ands r0, r1 cmp r0, 0 - bne _080DBCD0 + bne @080DBCD0 ldrb r1, [r2, 0xB] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080DBCD8 -_080DBCD0: + beq @080DBCD8 +@080DBCD0: movs r0, 0x1 - b _080DBCDA + b @080DBCDA .align 2, 0 .pool -_080DBCD8: +@080DBCD8: movs r0, 0 -_080DBCDA: +@080DBCDA: pop {r1} bx r1 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 @@ -417031,16 +417031,16 @@ 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: +@080DBD1C: lsls r0, r4, 24 lsrs r0, 24 bl sub_80DBCE0 adds r4, 0x1 cmp r4, 0x3 - ble _080DBD1C + ble @080DBD1C bl sub_80DBD4C pop {r4} pop {r0} @@ -417048,7 +417048,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 @@ -417063,7 +417063,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 @@ -417086,45 +417086,45 @@ sub_80DBD4C: @ 80DBD4C adds r6, 0x14 str r6, [sp, 0x6C] mov r4, sp -_080DBD7A: +@080DBD7A: bl GenerateRandomNumber strh r0, [r4] movs r2, 0 cmp r2, r9 - bge _080DBDB8 + bge @080DBDB8 mov r1, sp lsls r0, 16 lsrs r0, 16 ldrh r1, [r1] cmp r0, r1 - bne _080DBD9C + bne @080DBD9C subs r4, 0x2 movs r7, 0x1 negs r7, r7 add r9, r7 - b _080DBDB8 -_080DBD9C: + b @080DBDB8 +@080DBD9C: adds r2, 0x1 cmp r2, r9 - bge _080DBDB8 + bge @080DBDB8 lsls r0, r2, 1 mov r3, sp adds r1, r3, r0 ldrh r0, [r4] ldrh r1, [r1] cmp r0, r1 - bne _080DBD9C + bne @080DBD9C subs r4, 0x2 movs r6, 0x1 negs r6, r6 add r9, r6 -_080DBDB8: +@080DBDB8: adds r4, 0x2 movs r7, 0x1 add r9, r7 mov r0, r9 cmp r0, 0x3 - ble _080DBD7A + ble @080DBD7A movs r1, 0 mov r9, r1 mov r4, sp @@ -417132,7 +417132,7 @@ _080DBDB8: ldr r2, [sp, 0x64] ldr r5, =0x02039f00 ldr r3, [sp, 0x68] -_080DBDD2: +@080DBDD2: mov r7, r9 lsls r1, r7, 4 movs r7, 0 @@ -417156,13 +417156,13 @@ _080DBDD2: add r9, r0 mov r1, r9 cmp r1, 0x3 - ble _080DBDD2 + ble @080DBDD2 movs r3, 0 mov r9, r3 -_080DBE06: +@080DBE06: movs r4, 0x3 cmp r4, r9 - ble _080DBE90 + ble @080DBE90 add r7, sp, 0x48 ldr r6, [sp, 0x68] str r6, [sp, 0x58] @@ -417171,7 +417171,7 @@ _080DBE06: str r0, [sp, 0x5C] ldr r1, [sp, 0x6C] str r1, [sp, 0x60] -_080DBE1C: +@080DBE1C: subs r3, r4, 0x1 mov r10, r3 mov r0, r10 @@ -417180,7 +417180,7 @@ _080DBE1C: bl sub_80DBF30 lsls r0, 24 cmp r0, 0 - beq _080DBE8A + beq @080DBE8A mov r6, r10 lsls r2, r6, 4 ldr r0, [sp, 0x64] @@ -417226,21 +417226,21 @@ _080DBE1C: str r0, [r3] ldr r0, [r7, 0xC] str r0, [r1] -_080DBE8A: +@080DBE8A: mov r4, r10 cmp r4, r9 - bgt _080DBE1C -_080DBE90: + bgt @080DBE1C +@080DBE90: movs r1, 0x1 add r9, r1 mov r3, r9 cmp r3, 0x2 - ble _080DBE06 + ble @080DBE06 movs r6, 0 mov r9, r6 ldr r2, =0x02039f20 ldr r1, [sp, 0x6C] -_080DBEA2: +@080DBEA2: ldr r0, [r1] adds r0, r2 mov r7, r9 @@ -417250,7 +417250,7 @@ _080DBEA2: add r9, r0 mov r3, r9 cmp r3, 0x3 - ble _080DBEA2 + ble @080DBEA2 add sp, 0x70 pop {r3-r5} mov r8, r3 @@ -417264,14 +417264,14 @@ _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] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080DBF0E + beq @080DBF0E ldr r0, =0x03005d90 ldr r2, [r0] ldr r1, =0x02039f20 @@ -417291,11 +417291,11 @@ sub_80DBED4: @ 80DBED4 adds r0, 0x1 ldr r1, =0x0000270f cmp r0, r1 - ble _080DBF0C + ble @080DBF0C adds r0, r1, 0 -_080DBF0C: +@080DBF0C: strh r0, [r2] -_080DBF0E: +@080DBF0E: pop {r0} bx r0 .align 2, 0 @@ -417303,7 +417303,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 @@ -417312,34 +417312,34 @@ sub_80DBF30: @ 80DBF30 ldr r2, [r0] ldr r1, [r3] cmp r2, r1 - blt _080DBF60 + blt @080DBF60 cmp r2, r1 - bgt _080DBF52 + bgt @080DBF52 ldr r2, [r0, 0x4] ldr r1, [r3, 0x4] cmp r2, r1 - blt _080DBF60 + blt @080DBF60 cmp r2, r1 - ble _080DBF56 -_080DBF52: + ble @080DBF56 +@080DBF52: movs r2, 0 - b _080DBF62 -_080DBF56: + b @080DBF62 +@080DBF56: ldr r1, [r0, 0x8] ldr r0, [r3, 0x8] movs r2, 0 cmp r1, r0 - bge _080DBF62 -_080DBF60: + bge @080DBF62 +@080DBF60: movs r2, 0x1 -_080DBF62: +@080DBF62: adds r0, r2, 0 pop {r1} bx r1 thumb_func_end sub_80DBF30 thumb_func_start sub_80DBF68 -sub_80DBF68: @ 80DBF68 +sub_80DBF68: ; 80DBF68 push {lr} ldr r0, =0x02022e16 movs r1, 0 @@ -417357,13 +417357,13 @@ 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 lsls r5, 18 movs r4, 0x3 -_080DBF9A: +@080DBF9A: lsrs r3, r5, 24 movs r0, 0x8 str r0, [sp] @@ -417380,7 +417380,7 @@ _080DBF9A: adds r5, r0 subs r4, 0x1 cmp r4, 0 - bge _080DBF9A + bge @080DBF9A add sp, 0xC pop {r4,r5} pop {r0} @@ -417388,21 +417388,21 @@ _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 ldr r1, =0x00005011 cmp r0, 0 - beq _080DBFE2 + beq @080DBFE2 ldr r1, =0x00006011 cmp r0, 0x1 - beq _080DBFE2 + beq @080DBFE2 ldr r1, =0x00008011 cmp r0, 0x2 - bne _080DBFE2 + bne @080DBFE2 ldr r1, =0x00007011 -_080DBFE2: +@080DBFE2: adds r0, r1, 0x1 lsls r0, 16 lsrs r0, 16 @@ -417413,7 +417413,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 @@ -417423,16 +417423,16 @@ sub_80DBFFC: @ 80DBFFC lsrs r1, r0, 24 asrs r2, r0, 24 cmp r2, 0x10 - ble _080DC016 + ble @080DC016 movs r1, 0x10 - b _080DC020 -_080DC016: + b @080DC020 +@080DC016: movs r0, 0x10 negs r0, r0 cmp r2, r0 - bge _080DC020 + bge @080DC020 movs r1, 0xF0 -_080DC020: +@080DC020: lsls r0, r1, 24 asrs r0, 24 pop {r1} @@ -417440,7 +417440,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} @@ -417495,26 +417495,26 @@ sub_80DC028: @ 80DC028 adds r1, r0, r2 adds r0, r4, 0 cmp r4, 0 - bge _080DC0A0 + bge @080DC0A0 negs r0, r4 -_080DC0A0: +@080DC0A0: strh r0, [r1, 0x8] lsls r0, r5, 24 asrs r0, 24 strh r0, [r1, 0xA] cmp r4, 0 - bgt _080DC0B4 + bgt @080DC0B4 cmp r4, 0 - bne _080DC0C8 + bne @080DC0C8 cmp r0, 0 - ble _080DC0C8 -_080DC0B4: + ble @080DC0C8 +@080DC0B4: movs r0, 0x1 strh r0, [r1, 0xC] - b _080DC0D6 + b @080DC0D6 .align 2, 0 .pool -_080DC0C8: +@080DC0C8: ldr r2, =0x03005e00 lsls r3, r7, 2 adds r0, r3, r7 @@ -417522,7 +417522,7 @@ _080DC0C8: adds r0, r2 ldr r1, =0x0000ffff strh r1, [r0, 0xC] -_080DC0D6: +@080DC0D6: adds r0, r3, r7 lsls r0, 3 adds r0, r2 @@ -417539,7 +417539,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 @@ -417563,16 +417563,16 @@ sub_80DC0F4: @ 80DC0F4 lsls r0, 16 asrs r0, 16 cmp r0, 0xE - bgt _080DC126 - b _080DC2A8 -_080DC126: + bgt @080DC126 + b @080DC2A8 +@080DC126: movs r0, 0 strh r0, [r4, 0x1C] ldrh r2, [r4, 0xA] movs r5, 0xA ldrsh r0, [r4, r5] cmp r0, 0 - bne _080DC15C + bne @080DC15C adds r0, r7, 0 bl remove_task ldr r0, =0x02039f34 @@ -417586,16 +417586,16 @@ _080DC126: negs r0, r0 ands r0, r2 strb r0, [r1, 0x2] - b _080DC2A8 + b @080DC2A8 .align 2, 0 .pool -_080DC15C: +@080DC15C: cmp r3, 0 - bne _080DC1A4 + bne @080DC1A4 lsls r0, r1, 16 mov r8, r0 cmp r0, 0 - bge _080DC17A + bge @080DC17A mov r0, r9 bl sub_80DBFC8 adds r0, 0x2 @@ -417603,15 +417603,15 @@ _080DC15C: lsrs r6, r0, 16 ldrh r0, [r4, 0xA] adds r0, 0x1 - b _080DC188 -_080DC17A: + b @080DC188 +@080DC17A: mov r0, r9 bl sub_80DBFC8 lsls r0, 16 lsrs r6, r0, 16 ldrh r0, [r4, 0xA] subs r0, 0x1 -_080DC188: +@080DC188: strh r0, [r4, 0xA] ldr r1, =0x03005e00 lsls r0, r7, 2 @@ -417623,18 +417623,18 @@ _080DC188: strh r2, [r0, 0x8] lsls r1, 24 lsrs r5, r1, 24 - b _080DC210 + b @080DC210 .align 2, 0 .pool -_080DC1A4: +@080DC1A4: movs r3, 0xC ldrsh r0, [r4, r3] cmp r0, 0 - bge _080DC1DE + bge @080DC1DE lsls r0, r1, 16 mov r8, r0 cmp r0, 0 - bge _080DC1CC + bge @080DC1CC ldrh r0, [r4, 0x8] adds r1, r0, 0x1 strh r1, [r4, 0x8] @@ -417645,8 +417645,8 @@ _080DC1A4: mov r0, r9 bl sub_80DBFC8 adds r0, 0x2 - b _080DC20C -_080DC1CC: + b @080DC20C +@080DC1CC: ldrh r0, [r4, 0x8] subs r0, 0x1 strh r0, [r4, 0x8] @@ -417655,12 +417655,12 @@ _080DC1CC: movs r6, 0 subs r0, r2, 0x1 strh r0, [r4, 0xA] - b _080DC210 -_080DC1DE: + b @080DC210 +@080DC1DE: lsls r0, r1, 16 mov r8, r0 cmp r0, 0 - bge _080DC1F8 + bge @080DC1F8 ldrh r0, [r4, 0x8] subs r0, 0x1 strh r0, [r4, 0x8] @@ -417669,8 +417669,8 @@ _080DC1DE: movs r6, 0 adds r0, r2, 0x1 strh r0, [r4, 0xA] - b _080DC210 -_080DC1F8: + b @080DC210 +@080DC1F8: ldrh r0, [r4, 0x8] adds r1, r0, 0x1 strh r1, [r4, 0x8] @@ -417680,22 +417680,22 @@ _080DC1F8: strh r0, [r4, 0xA] mov r0, r9 bl sub_80DBFC8 -_080DC20C: +@080DC20C: lsls r0, 16 lsrs r6, r0, 16 -_080DC210: +@080DC210: str r5, [sp, 0xC] movs r0, 0 mov r10, r0 cmp r5, 0x7 - bls _080DC226 + bls @080DC226 movs r2, 0x1 mov r10, r2 adds r0, r5, 0 subs r0, 0x8 lsls r0, 24 lsrs r5, r0, 24 -_080DC226: +@080DC226: adds r2, r5, 0 adds r2, 0x16 lsls r2, 24 @@ -417719,7 +417719,7 @@ _080DC226: bl sub_80DED10 mov r3, r8 cmp r3, 0 - ble _080DC284 + ble @080DC284 movs r0, 0x60 bl audio_play ldr r4, =0x030075f0 @@ -417731,20 +417731,20 @@ _080DC226: asrs r2, 16 adds r0, r4, 0 bl MPlayPitchControl - b _080DC28A + b @080DC28A .align 2, 0 .pool -_080DC284: +@080DC284: movs r0, 0x16 bl audio_play -_080DC28A: +@080DC28A: mov r2, r10 cmp r2, 0 - bne _080DC2A8 + bne @080DC2A8 cmp r5, 0 - bne _080DC2A8 + bne @080DC2A8 cmp r6, 0 - bne _080DC2A8 + bne @080DC2A8 ldr r0, =0x03005e00 lsls r1, r7, 2 adds r1, r7 @@ -417753,7 +417753,7 @@ _080DC28A: ldrh r0, [r1, 0xC] negs r0, r0 strh r0, [r1, 0xC] -_080DC2A8: +@080DC2A8: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -417767,13 +417767,13 @@ _080DC2A8: thumb_func_end sub_80DC0F4 thumb_func_start sub_80DC2BC -sub_80DC2BC: @ 80DC2BC +sub_80DC2BC: ; 80DC2BC push {r4,r5,lr} ldr r0, =0x08587a74 bl gpu_tile_obj_alloc_tag_and_copy_to_vram movs r4, 0 ldr r5, =0x08587a6c -_080DC2C8: +@080DC2C8: ldr r0, =0x02039f26 adds r0, r4, r0 ldrb r0, [r0] @@ -417791,7 +417791,7 @@ _080DC2C8: strb r0, [r1] adds r4, 0x1 cmp r4, 0x3 - ble _080DC2C8 + ble @080DC2C8 pop {r4,r5} pop {r0} bx r0 @@ -417800,7 +417800,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 @@ -417830,16 +417830,16 @@ sub_80DC308: @ 80DC308 lsrs r5, r0, 16 asrs r0, 16 cmp r0, 0x38 - ble _080DC350 + ble @080DC350 movs r5, 0x38 - b _080DC356 + b @080DC356 .align 2, 0 .pool -_080DC350: +@080DC350: cmp r0, 0 - bge _080DC356 + bge @080DC356 movs r5, 0 -_080DC356: +@080DC356: ldr r2, =0x02020630 lsls r3, r7, 4 adds r0, r3, r7 @@ -417861,14 +417861,14 @@ _080DC356: movs r5, 0x24 ldrsh r1, [r4, r5] cmp r0, r1 - ble _080DC38C + ble @080DC38C movs r0, 0x1 - b _080DC38E + b @080DC38E .align 2, 0 .pool -_080DC38C: +@080DC38C: ldr r0, =0x0000ffff -_080DC38E: +@080DC38E: strh r0, [r4, 0x32] adds r0, r3, r7 lsls r0, 2 @@ -417885,23 +417885,23 @@ _080DC38E: thumb_func_end sub_80DC308 thumb_func_start sub_80DC3AC -sub_80DC3AC: @ 80DC3AC +sub_80DC3AC: ; 80DC3AC push {r4,lr} movs r4, 0 -_080DC3B0: +@080DC3B0: lsls r0, r4, 24 lsrs r0, 24 bl sub_80DC308 adds r4, 0x1 cmp r4, 0x3 - ble _080DC3B0 + ble @080DC3B0 pop {r4} pop {r0} bx r0 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 @@ -417911,12 +417911,12 @@ sub_80DC3C4: @ 80DC3C4 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080DC3F2 + bne @080DC3F2 movs r4, 0x1 -_080DC3DA: +@080DC3DA: adds r2, 0x1 cmp r2, 0x3 - bgt _080DC3F2 + bgt @080DC3F2 ldr r0, [r3] ldr r1, [r0, 0x14] lsls r0, r2, 2 @@ -417925,24 +417925,24 @@ _080DC3DA: adds r0, r4, 0 ands r0, r1 cmp r0, 0 - beq _080DC3DA -_080DC3F2: + beq @080DC3DA +@080DC3F2: cmp r2, 0x4 - beq _080DC400 + beq @080DC400 movs r0, 0 - b _080DC402 + b @080DC402 .align 2, 0 .pool -_080DC400: +@080DC400: movs r0, 0x1 -_080DC402: +@080DC402: pop {r4} pop {r1} bx r1 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] @@ -417951,7 +417951,7 @@ sub_80DC408: @ 80DC408 movs r4, 0x30 ldrsh r0, [r3, r4] cmp r1, r0 - bne _080DC440 + bne @080DC440 ldr r0, =0x02039f34 ldr r0, [r0] movs r2, 0x2E @@ -417966,28 +417966,28 @@ sub_80DC408: @ 80DC408 strb r0, [r1, 0x2] ldr r0, =nullsub_12 + 1 str r0, [r3, 0x1C] - b _080DC446 + b @080DC446 .align 2, 0 .pool -_080DC440: +@080DC440: ldrh r0, [r3, 0x32] adds r0, r2, r0 strh r0, [r3, 0x24] -_080DC446: +@080DC446: pop {r4} pop {r0} bx r0 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 ldr r5, =0x02039f34 ldr r4, =0x08587a6c ldr r3, =0x02039f26 -_080DC458: +@080DC458: ldr r0, [r5] ldr r1, [r0, 0x14] lsls r0, r2, 2 @@ -418004,7 +418004,7 @@ _080DC458: strh r0, [r1, 0x22] adds r2, 0x1 cmp r2, 0x3 - ble _080DC458 + ble @080DC458 pop {r4-r6} pop {r0} bx r0 @@ -418013,7 +418013,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 @@ -418022,13 +418022,13 @@ sub_80DC490: @ 80DC490 ldr r5, =0x02020630 ldr r4, =0x02039f34 movs r2, 0 -_080DC4A0: +@080DC4A0: adds r0, r3, r7 ldrb r0, [r0] cmp r0, 0x1 - bls _080DC4E2 + bls @080DC4E2 cmp r6, 0 - bne _080DC4CC + bne @080DC4CC ldr r0, [r4] ldr r0, [r0, 0x14] adds r0, r2, r0 @@ -418038,10 +418038,10 @@ _080DC4A0: lsls r0, 2 adds r0, r5 movs r1, 0xB4 - b _080DC4E0 + b @080DC4E0 .align 2, 0 .pool -_080DC4CC: +@080DC4CC: ldr r0, [r4] ldr r0, [r0, 0x14] adds r0, r2, r0 @@ -418052,20 +418052,20 @@ _080DC4CC: adds r0, r5 movs r1, 0x80 lsls r1, 1 -_080DC4E0: +@080DC4E0: strh r1, [r0, 0x20] -_080DC4E2: +@080DC4E2: adds r2, 0x4 adds r3, 0x1 cmp r3, 0x3 - ble _080DC4A0 + ble @080DC4A0 pop {r4-r7} pop {r0} bx r0 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} @@ -418076,7 +418076,7 @@ sub_80DC4F0: @ 80DC4F0 ldr r0, =0x02020630 mov r8, r0 movs r6, 0 -_080DC506: +@080DC506: lsls r0, r5, 3 ldr r1, =0x08587ae8 adds r0, r1 @@ -418123,7 +418123,7 @@ _080DC506: adds r6, 0x18 adds r5, 0x1 cmp r5, 0x3 - ble _080DC506 + ble @080DC506 pop {r3} mov r8, r3 pop {r4-r7} @@ -418134,7 +418134,7 @@ _080DC506: thumb_func_end sub_80DC4F0 thumb_func_start sub_80DC594 -sub_80DC594: @ 80DC594 +sub_80DC594: ; 80DC594 push {lr} ldr r0, =0x08587bb0 bl gpu_tile_obj_decompress_and_load @@ -418169,7 +418169,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 + 1 movs r1, 0x1E @@ -418186,7 +418186,7 @@ sub_80DC5E8: @ 80DC5E8 lsls r1, 3 ldr r4, =0x03005e08 movs r3, 0xFF -_080DC60A: +@080DC60A: lsls r0, r2, 3 adds r0, r1 adds r0, r4 @@ -418195,7 +418195,7 @@ _080DC60A: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls _080DC60A + bls @080DC60A pop {r4} pop {r0} bx r0 @@ -418204,7 +418204,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 @@ -418240,7 +418240,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 @@ -418264,7 +418264,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 @@ -418290,10 +418290,10 @@ sub_80DC6A4: @ 80DC6A4 movs r2, 0 ldrsh r0, [r1, r2] cmp r0, 0 - beq _080DC6DC + beq @080DC6DC cmp r0, 0xFF - bne _080DC716 -_080DC6DC: + bne @080DC716 +@080DC6DC: movs r3, 0 movs r0, 0xFF strh r0, [r1] @@ -418321,7 +418321,7 @@ _080DC6DC: bl pal_fade_1 adds r0, r6, 0 bl remove_task -_080DC716: +@080DC716: pop {r4-r7} pop {r0} bx r0 @@ -418330,7 +418330,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 @@ -418349,7 +418349,7 @@ sub_80DC728: @ 80DC728 negs r1, r1 add r1, r8 mov r10, r1 -_080DC74C: +@080DC74C: lsls r0, r6, 26 lsrs r3, r0, 24 lsls r0, r3, 1 @@ -418360,7 +418360,7 @@ _080DC74C: movs r5, 0 ldrsh r0, [r2, r5] cmp r0, 0xFF - beq _080DC7CA + beq @080DC7CA adds r0, r3, 0x1 lsls r1, r0, 1 adds r1, r7 @@ -418369,14 +418369,14 @@ _080DC74C: ldrsh r1, [r1, r5] adds r5, r0, 0 cmp r1, 0 - bne _080DC77C + bne @080DC77C adds r0, r4, 0x1 - b _080DC77E + b @080DC77E .align 2, 0 .pool -_080DC77C: +@080DC77C: subs r0, r4, 0x1 -_080DC77E: +@080DC77E: strh r0, [r2] lsls r1, r3, 1 mov r0, r9 @@ -418389,10 +418389,10 @@ _080DC77E: ldrsh r0, [r0, r4] adds r4, r1, 0 cmp r0, 0x10 - beq _080DC79C + beq @080DC79C cmp r0, 0 - bne _080DC7AA -_080DC79C: + bne @080DC7AA +@080DC79C: lsls r0, r5, 1 adds r0, r2 adds r0, r3 @@ -418400,7 +418400,7 @@ _080DC79C: movs r2, 0x1 eors r1, r2 strh r1, [r0] -_080DC7AA: +@080DC7AA: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] @@ -418416,12 +418416,12 @@ _080DC7AA: movs r1, 0x2 ldr r3, =0x00004bff bl pal_fade_1 -_080DC7CA: +@080DC7CA: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x3 - bls _080DC74C + bls @080DC74C pop {r3-r5} mov r8, r3 mov r9, r4 @@ -418434,7 +418434,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 + 1 movs r1, 0x1E @@ -418444,13 +418444,13 @@ sub_80DC7EC: @ 80DC7EC ldr r1, [r1] strb r0, [r1, 0xE] movs r4, 0 -_080DC800: +@080DC800: lsls r0, r4, 24 lsrs r0, 24 bl sub_80DC81C adds r4, 0x1 cmp r4, 0x3 - ble _080DC800 + ble @080DC800 pop {r4} pop {r0} bx r0 @@ -418459,7 +418459,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 @@ -418496,23 +418496,23 @@ 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: +@080DC868: lsls r0, r4, 24 lsrs r0, 24 bl sub_80DC87C adds r4, 0x1 cmp r4, 0x3 - ble _080DC868 + ble @080DC868 pop {r4} pop {r0} bx r0 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 @@ -418551,7 +418551,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 @@ -418568,7 +418568,7 @@ sub_80DC8D0: @ 80DC8D0 mov r8, r0 ldr r1, =0x00004bff mov r10, r1 -_080DC8F0: +@080DC8F0: lsls r0, r7, 26 lsrs r3, r0, 24 lsls r0, r3, 1 @@ -418578,7 +418578,7 @@ _080DC8F0: movs r5, 0 ldrsh r0, [r2, r5] cmp r0, 0xFF - beq _080DC996 + beq @080DC996 adds r0, r3, 0x2 lsls r0, 1 adds r0, r6 @@ -418590,7 +418590,7 @@ _080DC8F0: lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - ble _080DC996 + ble @080DC996 strh r4, [r1] adds r0, r3, 0x1 lsls r1, r0, 1 @@ -418600,16 +418600,16 @@ _080DC8F0: ldrsh r1, [r1, r4] adds r4, r0, 0 cmp r1, 0 - bne _080DC940 + bne @080DC940 ldrh r0, [r2] adds r0, 0x1 - b _080DC944 + b @080DC944 .align 2, 0 .pool -_080DC940: +@080DC940: ldrh r0, [r2] subs r0, 0x1 -_080DC944: +@080DC944: strh r0, [r2] lsls r1, r3, 1 mov r5, r9 @@ -418622,10 +418622,10 @@ _080DC944: ldrsh r0, [r0, r5] adds r5, r1, 0 cmp r0, 0x10 - beq _080DC962 + beq @080DC962 cmp r0, 0 - bne _080DC970 -_080DC962: + bne @080DC970 +@080DC962: lsls r0, r4, 1 adds r0, r2 adds r0, r3 @@ -418633,7 +418633,7 @@ _080DC962: movs r2, 0x1 eors r1, r2 strh r1, [r0] -_080DC970: +@080DC970: adds r4, r7, 0x5 lsls r4, 4 adds r0, r4, 0 @@ -418651,12 +418651,12 @@ _080DC970: movs r1, 0x1 mov r3, r10 bl pal_fade_1 -_080DC996: +@080DC996: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x3 - bls _080DC8F0 + bls @080DC8F0 pop {r3-r5} mov r8, r3 mov r9, r4 @@ -418669,7 +418669,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 @@ -418684,22 +418684,22 @@ sub_80DC9B4: @ 80DC9B4 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080DC9E0 + beq @080DC9E0 adds r0, r2, 0 bl sub_80DC630 - b _080DC9E6 + b @080DC9E6 .align 2, 0 .pool -_080DC9E0: +@080DC9E0: adds r0, r2, 0 bl sub_80DC674 -_080DC9E6: +@080DC9E6: pop {r0} bx r0 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 @@ -418868,7 +418868,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 @@ -418898,7 +418898,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 @@ -418914,7 +418914,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 @@ -418927,7 +418927,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 @@ -418980,16 +418980,16 @@ sub_80DCBE8: @ 80DCBE8 str r0, [r4] mov r3, r9 cmp r3, 0 - bne _080DCC70 + bne @080DCC70 movs r0, 0x65 bl audio_play - b _080DCC76 + b @080DCC76 .align 2, 0 .pool -_080DCC70: +@080DCC70: movs r0, 0x2 bl audio_play -_080DCC76: +@080DCC76: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -418999,7 +418999,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 @@ -419007,7 +419007,7 @@ sub_80DCC84: @ 80DCC84 movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080DCCCC + beq @080DCCCC mov r0, r12 ldrh r1, [r0, 0x2E] lsls r1, 24 @@ -419022,7 +419022,7 @@ sub_80DCC84: @ 80DCC84 ldrb r0, [r0] lsls r0, 26 cmp r0, 0 - bge _080DCCCC + bge @080DCCCC mov r3, r12 adds r3, 0x3E ldrb r0, [r3] @@ -419036,7 +419036,7 @@ sub_80DCC84: @ 80DCC84 ldr r0, =sub_80DCCD8 + 1 mov r1, r12 str r0, [r1, 0x1C] -_080DCCCC: +@080DCCCC: pop {r0} bx r0 .align 2, 0 @@ -419044,7 +419044,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] @@ -419070,7 +419070,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 @@ -419079,59 +419079,59 @@ sub_80DCD08: @ 80DCD08 ldrb r1, [r2] adds r3, r0, 0 cmp r1, 0x1 - bne _080DCD24 + bne @080DCD24 movs r0, 0 - b _080DCD26 + b @080DCD26 .align 2, 0 .pool -_080DCD24: +@080DCD24: movs r0, 0x1 -_080DCD26: +@080DCD26: strb r0, [r2] movs r1, 0xD0 lsls r1, 9 adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0 - bne _080DCD3E + bne @080DCD3E bl sub_80DAEA4 bl sub_80DB2BC - b _080DCD42 -_080DCD3E: + b @080DCD42 +@080DCD3E: bl sub_80DCD48 -_080DCD42: +@080DCD42: pop {r0} bx r0 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 ldrb r0, [r0] cmp r0, 0 - beq _080DCE44 + beq @080DCE44 ldr r0, =0x02000000 movs r1, 0xD0 lsls r1, 9 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _080DCE44 + beq @080DCE44 cmp r0, 0 - blt _080DCD7C + blt @080DCD7C cmp r0, 0x3 - bgt _080DCD7C + bgt @080DCD7C cmp r0, 0x2 - blt _080DCD7C + blt @080DCD7C bl sub_80DF750 - b _080DCE44 + b @080DCE44 .align 2, 0 .pool -_080DCD7C: +@080DCD7C: movs r5, 0 -_080DCD7E: +@080DCD7E: adds r0, r5, 0 movs r1, 0 bl Window_FastFillPixels @@ -419139,9 +419139,9 @@ _080DCD7E: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _080DCD7E + bls @080DCD7E movs r5, 0 -_080DCD92: +@080DCD92: ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -419154,7 +419154,7 @@ _080DCD92: movs r1, 0x4 ldrsh r0, [r0, r1] cmp r0, 0 - bge _080DCDBC + bge @080DCDBC negs r0, r0 lsls r0, 16 lsrs r4, r0, 16 @@ -419162,7 +419162,7 @@ _080DCD92: ldr r1, =0x085e8d40 bl gf_strcpy adds r2, r0, 0 -_080DCDBC: +@080DCDBC: lsls r1, r4, 16 asrs r1, 16 adds r0, r2, 0 @@ -419182,9 +419182,9 @@ _080DCDBC: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _080DCD92 + bls @080DCD92 movs r5, 0 -_080DCDEA: +@080DCDEA: ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -419197,7 +419197,7 @@ _080DCDEA: movs r1, 0x2 ldrsh r0, [r0, r1] cmp r0, 0 - bge _080DCE14 + bge @080DCE14 negs r0, r0 lsls r0, 16 lsrs r4, r0, 16 @@ -419205,7 +419205,7 @@ _080DCDEA: ldr r1, =0x085e8d40 bl gf_strcpy adds r2, r0, 0 -_080DCE14: +@080DCE14: lsls r1, r4, 16 asrs r1, 16 adds r0, r2, 0 @@ -419225,9 +419225,9 @@ _080DCE14: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _080DCDEA + bls @080DCDEA bl sub_80DB2BC -_080DCE44: +@080DCE44: add sp, 0xC pop {r4,r5} pop {r0} @@ -419237,7 +419237,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 @@ -419256,7 +419256,7 @@ sub_80DCE58: @ 80DCE58 add r4, sp, 0x4 adds r6, r4, 0 movs r7, 0 -_080DCE7E: +@080DCE7E: bl GenerateRandomNumber adds r1, r0, 0 mov r0, sp @@ -419265,45 +419265,45 @@ _080DCE7E: strh r1, [r0] movs r2, 0 cmp r2, r5 - bge _080DCEB6 + bge @080DCEB6 lsls r0, r1, 16 lsrs r0, 16 mov r1, sp ldrh r1, [r1, 0x4] cmp r0, r1 - beq _080DCEB0 -_080DCE9E: + beq @080DCEB0 +@080DCE9E: adds r2, 0x1 cmp r2, r5 - bge _080DCEB6 + bge @080DCEB6 lsls r0, r2, 1 adds r0, r4, r0 ldrh r1, [r6] ldrh r0, [r0] cmp r1, r0 - bne _080DCE9E -_080DCEB0: + bne @080DCE9E +@080DCEB0: subs r6, 0x2 subs r7, 0x2 subs r5, 0x1 -_080DCEB6: +@080DCEB6: adds r6, 0x2 adds r7, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble _080DCE7E + ble @080DCE7E mov r2, r8 cmp r2, 0 - bne _080DCF80 + bne @080DCF80 movs r5, 0 ldr r3, =0x02039f26 mov r8, r3 -_080DCECC: +@080DCECC: mov r6, r8 strb r5, [r6] movs r4, 0 cmp r4, r5 - bge _080DCF48 + bge @080DCF48 ldr r7, =0x02039f00 mov r9, r7 lsls r0, r5, 1 @@ -419319,7 +419319,7 @@ _080DCECC: ldr r3, =0x02039f26 adds r6, r3, 0 mov r10, r6 -_080DCEF4: +@080DCEF4: ldrb r0, [r3] lsls r2, r0, 1 mov r7, r9 @@ -419330,58 +419330,58 @@ _080DCEF4: movs r6, 0 ldrsh r0, [r7, r6] cmp r1, r0 - blt _080DCF1C + blt @080DCF1C cmp r1, r0 - bne _080DCF40 + bne @080DCF40 ldr r7, [sp, 0xC] adds r0, r7, r2 ldrh r0, [r0] ldr r1, [sp, 0x10] ldrh r1, [r1] cmp r0, r1 - bcs _080DCF40 -_080DCF1C: + bcs @080DCF40 +@080DCF1C: adds r2, r5, 0 cmp r5, r4 - ble _080DCF34 + ble @080DCF34 subs r0, r5, 0x1 mov r6, r10 adds r1, r0, r6 -_080DCF28: +@080DCF28: ldrb r0, [r1] strb r0, [r1, 0x1] subs r1, 0x1 subs r2, 0x1 cmp r2, r4 - bgt _080DCF28 -_080DCF34: + bgt @080DCF28 +@080DCF34: strb r5, [r3] - b _080DCF48 + b @080DCF48 .align 2, 0 .pool -_080DCF40: +@080DCF40: adds r3, 0x1 adds r4, 0x1 cmp r4, r5 - blt _080DCEF4 -_080DCF48: + blt @080DCEF4 +@080DCF48: cmp r4, r5 - bne _080DCF50 + bne @080DCF50 mov r7, r8 strb r5, [r7] -_080DCF50: +@080DCF50: movs r0, 0x1 add r8, r0 adds r5, 0x1 cmp r5, 0x3 - ble _080DCECC + ble @080DCECC ldr r4, =0x02039f26 mov r0, sp adds r1, r4, 0 movs r2, 0x4 bl memcpy movs r5, 0 -_080DCF68: +@080DCF68: mov r1, sp adds r0, r1, r5 ldrb r0, [r0] @@ -419389,11 +419389,11 @@ _080DCF68: strb r5, [r0] adds r5, 0x1 cmp r5, 0x3 - ble _080DCF68 - b _080DD034 + ble @080DCF68 + b @080DD034 .align 2, 0 .pool -_080DCF80: +@080DCF80: mov r0, sp movs r1, 0xFF movs r2, 0x4 @@ -419401,7 +419401,7 @@ _080DCF80: movs r5, 0 ldr r3, =0x02039f26 movs r6, 0 -_080DCF90: +@080DCF90: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x4] @@ -419411,39 +419411,39 @@ _080DCF90: lsrs r2, r0, 30 mov r7, sp adds r1, r7, r2 - b _080DCFB6 + b @080DCFB6 .align 2, 0 .pool -_080DCFAC: +@080DCFAC: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 mov r0, sp adds r1, r0, r2 -_080DCFB6: +@080DCFB6: ldrb r0, [r1] cmp r0, 0xFF - bne _080DCFAC + bne @080DCFAC strb r5, [r1] strb r2, [r3] adds r3, 0x1 adds r6, 0x1C adds r5, 0x1 cmp r5, 0x3 - ble _080DCF90 + ble @080DCF90 movs r5, 0 -_080DCFCC: +@080DCFCC: movs r4, 0x3 adds r1, r5, 0x1 mov r10, r1 cmp r4, r5 - ble _080DD02E + ble @080DD02E mov r9, r4 ldr r2, =0x02039f26 mov r8, r2 add r3, sp, 0x4 mov r12, r3 -_080DCFE0: +@080DCFE0: ldr r6, =0x02039f34 ldr r0, [r6] ldr r1, [r0, 0x4] @@ -419461,14 +419461,14 @@ _080DCFE0: ands r0, r3 subs r3, r4, 0x1 cmp r1, r0 - bne _080DD028 + bne @080DD028 mov r0, r8 adds r7, r3, r0 adds r2, r4, r0 ldrb r6, [r7] ldrb r1, [r2] cmp r6, r1 - bcs _080DD028 + bcs @080DD028 lsls r0, r3, 1 add r0, r12 lsls r1, r4, 1 @@ -419476,19 +419476,19 @@ _080DCFE0: ldrh r0, [r0] ldrh r1, [r1] cmp r0, r1 - bcs _080DD028 + bcs @080DD028 ldrb r0, [r2] strb r6, [r2] strb r0, [r7] -_080DD028: +@080DD028: adds r4, r3, 0 cmp r4, r5 - bgt _080DCFE0 -_080DD02E: + bgt @080DCFE0 +@080DD02E: mov r5, r10 cmp r5, 0x2 - ble _080DCFCC -_080DD034: + ble @080DCFCC +@080DD034: add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -419502,11 +419502,11 @@ _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 -_080DD052: +@080DD052: ldr r0, =0x0201a004 adds r0, r5, r0 ldr r1, =0x02039f26 @@ -419519,7 +419519,7 @@ _080DD052: adds r5, 0x20 adds r4, 0x1 cmp r4, 0x3 - ble _080DD052 + ble @080DD052 bl sub_80DAEA4 pop {r4,r5} pop {r0} @@ -419529,7 +419529,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 @@ -419553,9 +419553,9 @@ sub_80DD080: @ 80DD080 lsls r0, 24 mov r8, r4 cmp r0, 0 - bne _080DD0B4 - b _080DD3C4 -_080DD0B4: + bne @080DD0B4 + b @080DD3C4 +@080DD0B4: ldr r0, [r4] ldr r1, [r0, 0x4] adds r1, r5, r1 @@ -419575,9 +419575,9 @@ _080DD0B4: ldrh r0, [r2, 0x6] ldrh r1, [r2, 0x8] cmp r0, r1 - bne _080DD110 + bne @080DD110 cmp r0, 0 - beq _080DD110 + beq @080DD110 ldrb r0, [r2, 0x15] movs r1, 0x1 orrs r0, r1 @@ -419597,10 +419597,10 @@ _080DD0B4: ands r0, r3 orrs r0, r1 strb r0, [r2, 0xB] - b _080DD12C + b @080DD12C .align 2, 0 .pool -_080DD110: +@080DD110: ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0, 0x4] @@ -419615,7 +419615,7 @@ _080DD110: strb r0, [r1, 0xB] mov r8, r4 adds r7, r3, 0 -_080DD12C: +@080DD12C: mov r2, r8 ldr r4, [r2] ldr r2, [r4, 0x4] @@ -419645,7 +419645,7 @@ _080DD12C: mov r4, r8 movs r3, 0 movs r1, 0 -_080DD166: +@080DD166: ldr r0, [r4] ldr r0, [r0, 0x4] adds r0, r1, r0 @@ -419658,7 +419658,7 @@ _080DD166: adds r1, 0x1C adds r2, 0x1 cmp r2, 0x3 - ble _080DD166 + ble @080DD166 ldr r5, =0x02039f34 ldr r0, [r5] ldr r1, [r0, 0x4] @@ -419669,13 +419669,13 @@ _080DD166: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080DD1B4 + beq @080DD1B4 ldrh r0, [r2, 0x8] ldrh r1, [r2, 0x6] bl sub_80E5414 lsls r0, 24 cmp r0, 0 - bne _080DD1B4 + bne @080DD1B4 ldr r0, [r5] ldr r1, [r0, 0x4] adds r1, r4, r1 @@ -419684,7 +419684,7 @@ _080DD166: negs r0, r0 ands r0, r2 strb r0, [r1, 0x15] -_080DD1B4: +@080DD1B4: ldr r0, =0x0858cecc add r0, r9 ldr r0, [r0] @@ -419699,31 +419699,31 @@ _080DD1B4: movs r0, 0x30 ands r0, r1 cmp r0, 0x10 - bne _080DD1EC + bne @080DD1EC ldrh r1, [r2, 0x2] subs r1, 0xA movs r0, 0xD ldrsb r0, [r2, r0] - b _080DD206 + b @080DD206 .align 2, 0 .pool -_080DD1EC: +@080DD1EC: ldrb r1, [r2, 0x11] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080DD200 + beq @080DD200 movs r1, 0xD ldrsb r1, [r2, r1] lsls r0, r1, 1 adds r0, r1 - b _080DD204 -_080DD200: + b @080DD204 +@080DD200: movs r0, 0xD ldrsb r0, [r2, r0] -_080DD204: +@080DD204: ldrh r1, [r2, 0x2] -_080DD206: +@080DD206: adds r0, r1 strh r0, [r2, 0x2] ldr r5, =0x02039f34 @@ -419746,7 +419746,7 @@ _080DD206: bl sub_80DE1E8 lsls r0, 24 cmp r0, 0 - beq _080DD2E2 + beq @080DD2E2 ldr r0, [r5] ldr r1, [r0, 0x4] adds r1, r4, r1 @@ -419756,7 +419756,7 @@ _080DD206: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq _080DD29C + beq @080DD29C ldr r0, [r5] ldr r0, [r0, 0x4] adds r2, r4, r0 @@ -419764,7 +419764,7 @@ _080DD206: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080DD29C + beq @080DD29C strb r3, [r2, 0x16] ldr r0, [r5] ldr r1, [r0, 0x4] @@ -419794,10 +419794,10 @@ _080DD206: adds r1, r4, r1 ldrb r0, [r1, 0x15] movs r2, 0x8 - b _080DD2C8 + b @080DD2C8 .align 2, 0 .pool -_080DD29C: +@080DD29C: ldr r2, =0x0858c2b4 ldr r5, =0x02039f34 ldr r0, [r5] @@ -419810,7 +419810,7 @@ _080DD29C: adds r0, r2 ldrb r0, [r0, 0x2] cmp r0, 0 - beq _080DD2D8 + beq @080DD2D8 ldrb r0, [r3, 0x15] movs r1, 0x10 orrs r0, r1 @@ -419820,19 +419820,19 @@ _080DD29C: adds r1, r4, r1 ldrb r0, [r1, 0x15] movs r2, 0x40 -_080DD2C8: +@080DD2C8: orrs r0, r2 strb r0, [r1, 0x15] - b _080DD2E2 + b @080DD2E2 .align 2, 0 .pool -_080DD2D8: +@080DD2D8: ldrb r1, [r3, 0x15] movs r0, 0x11 negs r0, r0 ands r0, r1 strb r0, [r3, 0x15] -_080DD2E2: +@080DD2E2: ldr r5, =0x02039f34 ldr r0, [r5] ldr r1, [r0, 0x4] @@ -419844,7 +419844,7 @@ _080DD2E2: mov r8, r0 ands r0, r1 cmp r0, 0 - beq _080DD30A + beq @080DD30A ldrb r0, [r2, 0xB] lsls r0, 25 lsrs r0, 29 @@ -419853,7 +419853,7 @@ _080DD2E2: adds r1, r0 lsls r1, 1 strb r1, [r2, 0x18] -_080DD30A: +@080DD30A: ldr r0, [r5] ldr r0, [r0, 0x4] adds r2, r4, r0 @@ -419861,7 +419861,7 @@ _080DD30A: mov r0, r8 ands r0, r1 cmp r0, 0 - beq _080DD334 + beq @080DD334 ldrb r1, [r2, 0x15] movs r0, 0x11 negs r0, r0 @@ -419875,7 +419875,7 @@ _080DD30A: ldr r0, [r2, 0x4] adds r0, r4, r0 strh r1, [r0] -_080DD334: +@080DD334: ldr r0, [r5] ldr r0, [r0, 0x4] adds r0, r4, r0 @@ -419891,17 +419891,17 @@ _080DD334: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080DD35C + beq @080DD35C ldr r0, [r2, 0x10] mov r1, r8 strb r1, [r0] -_080DD35C: +@080DD35C: ldr r1, [r5] ldr r3, [r1, 0x10] movs r0, 0 ldrsb r0, [r3, r0] cmp r0, 0 - ble _080DD388 + ble @080DD388 ldr r0, [r1] ldrb r0, [r0, 0x13] lsls r0, 24 @@ -419910,17 +419910,17 @@ _080DD35C: ldrsb r1, [r3, r1] adds r0, r1 cmp r0, 0x4 - ble _080DD384 + ble @080DD384 movs r0, 0x3C - b _080DD38A + b @080DD38A .align 2, 0 .pool -_080DD384: +@080DD384: movs r0, 0xA - b _080DD38A -_080DD388: + b @080DD38A +@080DD388: movs r0, 0 -_080DD38A: +@080DD38A: strb r0, [r3, 0x2] bl GenerateRandomNumber lsls r0, 16 @@ -419930,21 +419930,21 @@ _080DD38A: lsls r0, 24 lsrs r0, 24 movs r2, 0 - b _080DD3AE -_080DD3A2: + b @080DD3AE +@080DD3A2: subs r0, 0x1 lsls r0, 24 lsrs r0, 24 -_080DD3A8: +@080DD3A8: adds r2, 0x1 cmp r2, 0x3 - bgt _080DD3B6 -_080DD3AE: + bgt @080DD3B6 +@080DD3AE: cmp r2, r6 - beq _080DD3A8 + beq @080DD3A8 cmp r0, 0 - bne _080DD3A2 -_080DD3B6: + bne @080DD3A2 +@080DD3B6: ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -419952,7 +419952,7 @@ _080DD3B6: lsls r0, 2 adds r0, r1 strb r2, [r0, 0x1B] -_080DD3C4: +@080DD3C4: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -419964,7 +419964,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 @@ -419981,7 +419981,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 @@ -419998,7 +419998,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 @@ -420007,41 +420007,41 @@ sub_80DD40C: @ 80DD40C lsrs r1, 24 adds r2, r1, 0 cmp r1, 0x3B - bls _080DD426 + bls @080DD426 movs r1, 0x35 bl sub_80DD3D4 - b _080DD456 -_080DD426: + b @080DD456 +@080DD426: cmp r1, 0x27 - bls _080DD432 + bls @080DD432 movs r1, 0x34 bl sub_80DD3D4 - b _080DD456 -_080DD432: + b @080DD456 +@080DD432: cmp r1, 0x1D - bls _080DD43E + bls @080DD43E movs r1, 0x33 bl sub_80DD3D4 - b _080DD456 -_080DD43E: + b @080DD456 +@080DD43E: cmp r1, 0x13 - bls _080DD44A + bls @080DD44A movs r1, 0x32 bl sub_80DD3D4 - b _080DD456 -_080DD44A: + b @080DD456 +@080DD44A: cmp r2, 0x9 - bls _080DD456 + bls @080DD456 adds r0, r3, 0 movs r1, 0x31 bl sub_80DD3D4 -_080DD456: +@080DD456: pop {r0} bx r0 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 @@ -420082,48 +420082,48 @@ sub_80DD45C: @ 80DD45C ldrb r0, [r0, 0x1] lsls r1, r0, 29 cmp r1, 0 - bne _080DD4DC + bne @080DD4DC ldr r0, =0x02021ec4 ldr r1, =0x0827e837 bl gf_strcpy - b _080DD52C + b @080DD52C .align 2, 0 .pool -_080DD4DC: +@080DD4DC: lsrs r0, r1, 29 cmp r0, 0x1 - bne _080DD4F4 + bne @080DD4F4 ldr r0, =0x02021ec4 ldr r1, =0x0827e83f bl gf_strcpy - b _080DD52C + b @080DD52C .align 2, 0 .pool -_080DD4F4: +@080DD4F4: lsrs r0, r1, 29 cmp r0, 0x2 - bne _080DD50C + bne @080DD50C ldr r0, =0x02021ec4 ldr r1, =0x0827e847 bl gf_strcpy - b _080DD52C + b @080DD52C .align 2, 0 .pool -_080DD50C: +@080DD50C: lsrs r0, r1, 29 cmp r0, 0x3 - bne _080DD524 + bne @080DD524 ldr r0, =0x02021ec4 ldr r1, =0x0827e850 bl gf_strcpy - b _080DD52C + b @080DD52C .align 2, 0 .pool -_080DD524: +@080DD524: ldr r0, =0x02021ec4 ldr r1, =0x0827e85a bl gf_strcpy -_080DD52C: +@080DD52C: ldr r4, =0x02021fc4 ldr r1, =0x08587e10 lsls r0, r6, 2 @@ -420143,7 +420143,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 @@ -420171,7 +420171,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 @@ -420186,7 +420186,7 @@ sub_80DD590: @ 80DD590 mov r6, r9 movs r5, 0 adds r3, r2, 0 -_080DD5AC: +@080DD5AC: mov r0, sp adds r1, r0, r4 adds r0, r4, r6 @@ -420196,57 +420196,57 @@ _080DD5AC: strb r5, [r0] adds r4, 0x1 cmp r4, 0x3 - ble _080DD5AC + ble @080DD5AC movs r4, 0 ldr r7, =0x02039f34 ldr r1, [r7] mov r8, r1 adds r5, r2, 0 -_080DD5CA: +@080DD5CA: movs r2, 0 mov r0, r8 ldr r1, [r0, 0x4] -_080DD5D0: +@080DD5D0: ldrb r0, [r1, 0x19] cmp r0, r4 - beq _080DD604 + beq @080DD604 adds r1, 0x1C adds r2, 0x1 cmp r2, 0x3 - ble _080DD5D0 -_080DD5DE: + ble @080DD5D0 +@080DD5DE: cmp r2, 0x4 - bne _080DD684 + bne @080DD684 movs r2, 0 ldrb r0, [r5] cmp r0, 0 - bne _080DD612 + bne @080DD612 ldr r0, [r7] ldr r0, [r0, 0x4] ldrb r0, [r0, 0x19] cmp r0, 0xFF - bne _080DD612 + bne @080DD612 mov r12, r2 movs r2, 0x1 - b _080DD63A + b @080DD63A .align 2, 0 .pool -_080DD604: +@080DD604: mov r1, sp adds r0, r1, r2 strb r4, [r0] adds r1, r5, r2 movs r0, 0x1 strb r0, [r1] - b _080DD5DE -_080DD612: + b @080DD5DE +@080DD612: adds r2, 0x1 cmp r2, 0x3 - bgt _080DD676 + bgt @080DD676 adds r0, r5, r2 ldrb r0, [r0] cmp r0, 0 - bne _080DD612 + bne @080DD612 ldr r0, [r7] ldr r1, [r0, 0x4] lsls r0, r2, 3 @@ -420255,45 +420255,45 @@ _080DD612: adds r0, r1 ldrb r0, [r0, 0x19] cmp r0, 0xFF - bne _080DD612 + bne @080DD612 lsls r0, r2, 24 lsrs r0, 24 mov r12, r0 adds r2, 0x1 -_080DD63A: +@080DD63A: cmp r2, 0x3 - bgt _080DD676 + bgt @080DD676 ldr r6, =0x02039f26 lsls r0, r2, 3 subs r0, r2 lsls r3, r0, 2 -_080DD646: +@080DD646: adds r0, r5, r2 ldrb r0, [r0] cmp r0, 0 - bne _080DD66E + bne @080DD66E ldr r0, [r7] ldr r0, [r0, 0x4] adds r0, r3, r0 ldrb r0, [r0, 0x19] cmp r0, 0xFF - bne _080DD66E + bne @080DD66E mov r1, r12 adds r0, r1, r6 adds r1, r2, r6 ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bls _080DD66E + bls @080DD66E lsls r0, r2, 24 lsrs r0, 24 mov r12, r0 -_080DD66E: +@080DD66E: adds r3, 0x1C adds r2, 0x1 cmp r2, 0x3 - ble _080DD646 -_080DD676: + ble @080DD646 +@080DD676: mov r0, sp add r0, r12 strb r4, [r0] @@ -420301,14 +420301,14 @@ _080DD676: adds r1, r5, r0 movs r0, 0x1 strb r0, [r1] -_080DD684: +@080DD684: adds r4, 0x1 cmp r4, 0x3 - ble _080DD5CA + ble @080DD5CA movs r4, 0 ldr r6, =0x02039f34 movs r5, 0 -_080DD690: +@080DD690: ldr r0, [r6] ldr r1, [r0, 0x8] adds r1, r4 @@ -420335,7 +420335,7 @@ _080DD690: adds r5, 0x1C adds r4, 0x1 cmp r4, 0x3 - ble _080DD690 + ble @080DD690 add sp, 0x8 pop {r3,r4} mov r8, r3 @@ -420348,7 +420348,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] @@ -420357,7 +420357,7 @@ sub_80DD6DC: @ 80DD6DC lsls r0, 16 asrs r0, 16 cmp r0, 0x54 - ble _080DD712 + ble @080DD712 movs r0, 0 strh r0, [r2, 0x30] adds r3, r2, 0 @@ -420376,7 +420376,7 @@ sub_80DD6DC: @ 80DD6DC negs r0, r0 ands r0, r1 strb r0, [r2, 0x6] -_080DD712: +@080DD712: pop {r0} bx r0 .align 2, 0 @@ -420384,7 +420384,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 @@ -420393,28 +420393,28 @@ sub_80DD720: @ 80DD720 ldr r0, [r0] ldrb r5, [r0, 0x12] cmp r1, 0x8 - bls _080DD734 - b _080DD8D4 -_080DD734: + bls @080DD734 + b @080DD8D4 +@080DD734: lsls r0, r1, 2 - ldr r1, =_080DD748 + ldr r1, =@080DD748 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080DD748: - .4byte _080DD76C - .4byte _080DD76C - .4byte _080DD79C - .4byte _080DD7D0 - .4byte _080DD804 - .4byte _080DD838 - .4byte _080DD86C - .4byte _080DD8D4 - .4byte _080DD8A0 -_080DD76C: +@080DD748: + .4byte @080DD76C + .4byte @080DD76C + .4byte @080DD79C + .4byte @080DD7D0 + .4byte @080DD804 + .4byte @080DD838 + .4byte @080DD86C + .4byte @080DD8D4 + .4byte @080DD8A0 +@080DD76C: ldr r0, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 @@ -420430,10 +420430,10 @@ _080DD76C: strh r0, [r1, 0x4] movs r0, 0x20 bl audio_play - b _080DD8F8 + b @080DD8F8 .align 2, 0 .pool -_080DD79C: +@080DD79C: ldr r0, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 @@ -420451,10 +420451,10 @@ _080DD79C: strh r0, [r1, 0x4] movs r0, 0x1F bl audio_play - b _080DD8F8 + b @080DD8F8 .align 2, 0 .pool -_080DD7D0: +@080DD7D0: ldr r0, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 @@ -420472,10 +420472,10 @@ _080DD7D0: strh r0, [r1, 0x4] movs r0, 0x1F bl audio_play - b _080DD8F8 + b @080DD8F8 .align 2, 0 .pool -_080DD804: +@080DD804: ldr r0, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 @@ -420493,10 +420493,10 @@ _080DD804: strh r0, [r1, 0x4] movs r0, 0x2D bl audio_play - b _080DD8F8 + b @080DD8F8 .align 2, 0 .pool -_080DD838: +@080DD838: ldr r0, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 @@ -420514,10 +420514,10 @@ _080DD838: strh r0, [r1, 0x4] movs r0, 0x2D bl audio_play - b _080DD8F8 + b @080DD8F8 .align 2, 0 .pool -_080DD86C: +@080DD86C: ldr r0, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 @@ -420535,10 +420535,10 @@ _080DD86C: strh r0, [r1, 0x4] movs r0, 0x2D bl audio_play - b _080DD8F8 + b @080DD8F8 .align 2, 0 .pool -_080DD8A0: +@080DD8A0: ldr r0, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 @@ -420556,10 +420556,10 @@ _080DD8A0: strh r0, [r1, 0x4] movs r0, 0xC3 bl audio_play - b _080DD8F8 + b @080DD8F8 .align 2, 0 .pool -_080DD8D4: +@080DD8D4: ldr r0, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 @@ -420577,7 +420577,7 @@ _080DD8D4: strh r0, [r1, 0x4] movs r0, 0x2D bl audio_play -_080DD8F8: +@080DD8F8: adds r2, r4, 0 ldr r4, =0x02020630 adds r2, r5 @@ -420609,7 +420609,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 @@ -420621,16 +420621,16 @@ sub_80DD940: @ 80DD940 ldr r0, =0x06010000 mov r8, r0 ldr r7, =0x04000008 -_080DD956: +@080DD956: ldr r0, [r6] ldr r1, [r0] movs r0, 0x13 ldrsb r0, [r1, r0] ldr r4, =0x08d8ec24 cmp r5, r0 - bge _080DD966 + bge @080DD966 adds r4, 0x40 -_080DD966: +@080DD966: adds r0, r1, 0 adds r0, 0x58 ldrb r1, [r0] @@ -420675,12 +420675,12 @@ _080DD966: lsls r0, 24 asrs r0, 24 cmp r0, 0x4 - ble _080DD9C8 + ble @080DD9C8 bl sub_80DDA20 -_080DD9C8: +@080DD9C8: adds r5, 0x1 cmp r5, 0x4 - ble _080DD956 + ble @080DD956 pop {r3,r4} mov r8, r3 mov r9, r4 @@ -420692,7 +420692,7 @@ _080DD9C8: thumb_func_end sub_80DD940 thumb_func_start sub_80DD9F0 -sub_80DD9F0: @ 80DD9F0 +sub_80DD9F0: ; 80DD9F0 lsls r0, 16 ldr r3, =0x085899ec ldr r1, =0x0858c2b4 @@ -420715,7 +420715,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 + 1 movs r1, 0xA @@ -420744,7 +420744,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 @@ -420759,22 +420759,22 @@ c3_08130B10: @ 80DDA60 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - bne _080DDAFE + bne @080DDAFE movs r0, 0 strh r0, [r2, 0x8] movs r3, 0xE ldrsh r0, [r2, r3] cmp r0, 0 - bne _080DDA94 + bne @080DDA94 ldrh r0, [r2, 0x10] adds r0, 0x1 - b _080DDA98 + b @080DDA98 .align 2, 0 .pool -_080DDA94: +@080DDA94: ldrh r0, [r2, 0x10] subs r0, 0x1 -_080DDA98: +@080DDA98: strh r0, [r2, 0x10] lsls r0, r5, 2 adds r0, r5 @@ -420796,10 +420796,10 @@ _080DDA98: movs r1, 0x10 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080DDACA + beq @080DDACA cmp r0, 0x10 - bne _080DDAFE -_080DDACA: + bne @080DDAFE +@080DDACA: ldrh r0, [r4, 0xE] movs r1, 0x1 eors r0, r1 @@ -420811,7 +420811,7 @@ _080DDACA: lsls r0, 24 asrs r0, 24 cmp r0, 0x4 - bgt _080DDAFE + bgt @080DDAFE movs r3, 0xC ldrsh r0, [r4, r3] lsls r0, 4 @@ -420824,7 +420824,7 @@ _080DDACA: bl pal_fade_1 adds r0, r5, 0 bl remove_task -_080DDAFE: +@080DDAFE: pop {r4-r6} pop {r0} bx r0 @@ -420833,7 +420833,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 + 1 movs r1, 0xA @@ -420877,7 +420877,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 @@ -420913,14 +420913,14 @@ sub_80DDB6C: @ 80DDB6C movs r1, 0x24 ldrsh r0, [r2, r1] cmp r0, 0 - ble _080DDBB8 + ble @080DDBB8 movs r0, 0 strh r0, [r2, 0x24] -_080DDBB8: +@080DDBB8: movs r5, 0x24 ldrsh r0, [r2, r5] cmp r0, 0 - bne _080DDBD4 + bne @080DDBD4 ldr r0, [r4] ldr r2, [r0] ldrb r1, [r2, 0x6] @@ -420930,7 +420930,7 @@ _080DDBB8: strb r0, [r2, 0x6] adds r0, r3, 0 bl remove_task -_080DDBD4: +@080DDBD4: pop {r4,r5} pop {r0} bx r0 @@ -420939,7 +420939,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 @@ -420956,15 +420956,15 @@ sub_80DDBE8: @ 80DDBE8 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - bge _080DDC1C + bge @080DDC1C ldrb r1, [r2, 0x6] movs r0, 0x41 negs r0, r0 ands r0, r1 - b _080DDC40 + b @080DDC40 .align 2, 0 .pool -_080DDC1C: +@080DDC1C: ldr r0, =task08_080CD1CC + 1 movs r1, 0xA bl AddTask @@ -420982,7 +420982,7 @@ _080DDC1C: ldrb r0, [r2, 0x6] movs r1, 0x40 orrs r0, r1 -_080DDC40: +@080DDC40: strb r0, [r2, 0x6] pop {r4,r5} pop {r0} @@ -420992,7 +420992,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 @@ -421030,14 +421030,14 @@ task08_080CD1CC: @ 80DDC4C movs r1, 0x46 negs r1, r1 cmp r0, r1 - bge _080DDC9C + bge @080DDC9C ldr r0, =0x0000ffba strh r0, [r3, 0x24] -_080DDC9C: +@080DDC9C: movs r2, 0x24 ldrsh r0, [r3, r2] cmp r0, r1 - bne _080DDCC4 + bne @080DDCC4 adds r2, r3, 0 adds r2, 0x3E ldrb r0, [r2] @@ -421053,7 +421053,7 @@ _080DDC9C: strb r0, [r2, 0x6] adds r0, r4, 0 bl remove_task -_080DDCC4: +@080DDCC4: pop {r4,r5} pop {r0} bx r0 @@ -421062,7 +421062,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 @@ -421095,7 +421095,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 @@ -421107,22 +421107,22 @@ sub_80DDD20: @ 80DDD20 movs r1, 0x1C ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080DDD54 + beq @080DDD54 cmp r0, 0x1 - bgt _080DDD48 + bgt @080DDD48 cmp r0, 0 - beq _080DDD4E - b _080DDD9C + beq @080DDD4E + b @080DDD9C .align 2, 0 .pool -_080DDD48: +@080DDD48: cmp r0, 0x2 - beq _080DDD70 - b _080DDD9C -_080DDD4E: + beq @080DDD70 + b @080DDD9C +@080DDD4E: bl sub_80DDB0C - b _080DDD64 -_080DDD54: + b @080DDD64 +@080DDD54: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] @@ -421130,22 +421130,22 @@ _080DDD54: movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _080DDD9C -_080DDD64: + bne @080DDD9C +@080DDD64: ldrh r0, [r4, 0x1C] adds r0, 0x1 strh r0, [r4, 0x1C] - b _080DDD9C + b @080DDD9C .align 2, 0 .pool -_080DDD70: +@080DDD70: ldrh r0, [r4, 0x1E] adds r1, r0, 0x1 strh r1, [r4, 0x1E] lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - ble _080DDD9C + ble @080DDD9C movs r0, 0 strh r0, [r4, 0x1E] bl sub_80DD940 @@ -421159,7 +421159,7 @@ _080DDD70: strb r0, [r2, 0x6] adds r0, r5, 0 bl remove_task -_080DDD9C: +@080DDD9C: pop {r4,r5} pop {r0} bx r0 @@ -421168,7 +421168,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] @@ -421200,7 +421200,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] @@ -421222,7 +421222,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 + 1 movs r1, 0xF @@ -421241,7 +421241,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 @@ -421256,23 +421256,23 @@ sub_80DDE30: @ 80DDE30 lsls r0, 16 asrs r0, 16 cmp r0, 0x6 - ble _080DDEBA + ble @080DDEBA movs r0, 0 strh r0, [r4, 0x1C] movs r1, 0x1E ldrsh r0, [r4, r1] cmp r0, 0 - bne _080DDE78 + bne @080DDE78 ldr r0, =0x02019000 ldr r1, =0x06002000 movs r2, 0x80 lsls r2, 5 movs r3, 0x1 bl RequestDma3Copy - b _080DDE8C + b @080DDE8C .align 2, 0 .pool -_080DDE78: +@080DDE78: ldr r0, =0x02018000 ldr r1, =0x06002000 movs r2, 0x80 @@ -421282,7 +421282,7 @@ _080DDE78: ldrh r0, [r4, 0x20] adds r0, 0x1 strh r0, [r4, 0x20] -_080DDE8C: +@080DDE8C: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -421295,7 +421295,7 @@ _080DDE8C: movs r1, 0x20 ldrsh r0, [r0, r1] cmp r0, 0x9 - bne _080DDEBA + bne @080DDEBA ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0] @@ -421305,7 +421305,7 @@ _080DDE8C: strb r0, [r2, 0x6] adds r0, r5, 0 bl remove_task -_080DDEBA: +@080DDEBA: pop {r4,r5} pop {r0} bx r0 @@ -421314,7 +421314,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 @@ -421328,12 +421328,12 @@ sub_80DDED0: @ 80DDED0 lsrs r6, r0, 24 lsls r4, 24 cmp r4, 0 - ble _080DDF38 + ble @080DDF38 ldr r7, =0x0000237e lsls r0, r5, 24 adds r4, r0, 0 cmp r4, 0 - ble _080DDF1C + ble @080DDF1C movs r5, 0 ldr r2, =0x02039f34 ldr r0, [r2] @@ -421344,10 +421344,10 @@ sub_80DDED0: @ 80DDED0 adds r0, r1 lsls r0, 24 lsrs r3, r0, 24 - b _080DDF4E + b @080DDF4E .align 2, 0 .pool -_080DDF1C: +@080DDF1C: ldr r2, =0x02039f34 ldr r0, [r2] ldr r0, [r0] @@ -421358,24 +421358,24 @@ _080DDF1C: lsls r0, 24 lsrs r5, r0, 24 movs r3, 0 - b _080DDF4E + b @080DDF4E .align 2, 0 .pool -_080DDF38: +@080DDF38: movs r7, 0 lsls r0, r5, 24 adds r4, r0, 0 cmp r4, 0 - ble _080DDF48 + ble @080DDF48 movs r5, 0 movs r3, 0xC - b _080DDF4C -_080DDF48: + b @080DDF4C +@080DDF48: movs r5, 0xC movs r3, 0 -_080DDF4C: +@080DDF4C: ldr r2, =0x02039f34 -_080DDF4E: +@080DDF4E: ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 @@ -421401,7 +421401,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 @@ -421415,22 +421415,22 @@ sub_80DDF80: @ 80DDF80 strh r1, [r3, 0x1C] lsls r0, 16 cmp r0, 0 - blt _080DDFFC + blt @080DDFFC movs r0, 0 strh r0, [r3, 0x1C] movs r1, 0xC ldrsh r0, [r3, r1] cmp r0, 0 - ble _080DDFB4 + ble @080DDFB4 ldrh r0, [r3, 0xA] adds r0, 0x1 - b _080DDFB8 + b @080DDFB8 .align 2, 0 .pool -_080DDFB4: +@080DDFB4: ldrh r0, [r3, 0xA] subs r0, 0x1 -_080DDFB8: +@080DDFB8: strh r0, [r3, 0xA] lsls r4, r5, 2 adds r4, r5 @@ -421451,7 +421451,7 @@ _080DDFB8: movs r2, 0xE ldrsh r0, [r4, r2] cmp r1, r0 - bne _080DDFFC + bne @080DDFFC adds r0, r5, 0 bl remove_task ldr r0, =0x02039f34 @@ -421462,7 +421462,7 @@ _080DDFB8: negs r0, r0 ands r0, r1 strb r0, [r2, 0x7] -_080DDFFC: +@080DDFFC: pop {r4,r5} pop {r0} bx r0 @@ -421471,7 +421471,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 @@ -421487,7 +421487,7 @@ sub_80DE008: @ 80DE008 ldr r6, =0x02020630 movs r4, 0 movs r7, 0 -_080DE026: +@080DE026: mov r1, r8 ldr r0, [r1] ldr r0, [r0, 0x4] @@ -421496,10 +421496,10 @@ _080DE026: movs r0, 0xC0 ands r0, r1 cmp r0, 0 - beq _080DE0BC + beq @080DE0BC mov r2, r10 cmp r2, 0 - beq _080DE0BC + beq @080DE0BC lsls r0, r5, 24 lsrs r0, 24 bl sub_80DE0F0 @@ -421548,10 +421548,10 @@ _080DE026: negs r3, r3 adds r2, r3, 0 ands r1, r2 - b _080DE0D6 + b @080DE0D6 .align 2, 0 .pool -_080DE0BC: +@080DE0BC: mov r1, r9 ldr r0, [r1] ldr r0, [r0, 0x14] @@ -421565,13 +421565,13 @@ _080DE0BC: ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 -_080DE0D6: +@080DE0D6: strb r1, [r0] adds r4, 0x4 adds r7, 0x1C adds r5, 0x1 cmp r5, 0x3 - ble _080DE026 + ble @080DE026 pop {r3-r5} mov r8, r3 mov r9, r4 @@ -421582,7 +421582,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 @@ -421597,17 +421597,17 @@ sub_80DE0F0: @ 80DE0F0 movs r0, 0xC0 ands r0, r1 cmp r0, 0x40 - bne _080DE120 + bne @080DE120 ldrb r0, [r2, 0x19] lsls r0, 5 ldr r1, =0x08d8e9b4 adds r0, r1 - b _080DE122 + b @080DE122 .align 2, 0 .pool -_080DE120: +@080DE120: ldr r0, =0x08d8ea34 -_080DE122: +@080DE122: pop {r1} bx r1 .align 2, 0 @@ -421615,7 +421615,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 @@ -421629,7 +421629,7 @@ sub_80DE12C: @ 80DE12C mov r8, r0 movs r0, 0x11 mov r9, r0 -_080DE146: +@080DE146: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] @@ -421637,13 +421637,13 @@ _080DE146: adds r0, r7 ldrb r0, [r0] cmp r0, 0 - beq _080DE1CA + beq @080DE1CA lsls r0, r7, 24 lsrs r0, 24 bl sub_80DBCA8 lsls r0, 24 cmp r0, 0 - bne _080DE1CA + bne @080DE1CA ldr r0, =0x02039f26 adds r0, r7, r0 ldrb r0, [r0] @@ -421691,10 +421691,10 @@ _080DE146: bl sub_80DECB8 movs r0, 0x63 bl audio_play -_080DE1CA: +@080DE1CA: adds r7, 0x1 cmp r7, 0x3 - ble _080DE146 + ble @080DE146 add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -421708,7 +421708,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 @@ -421724,26 +421724,26 @@ sub_80DE1E8: @ 80DE1E8 adds r0, r3, 0 ands r0, r1 cmp r0, 0 - bne _080DE212 + bne @080DE212 ldrb r1, [r2, 0xC] adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _080DE21C -_080DE212: + beq @080DE21C +@080DE212: movs r0, 0 - b _080DE21E + b @080DE21E .align 2, 0 .pool -_080DE21C: +@080DE21C: movs r0, 0x1 -_080DE21E: +@080DE21E: pop {r1} bx r1 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} @@ -421835,7 +421835,7 @@ sub_80DE224: @ 80DE224 movs r5, 0 ldr r7, =0x02020630 movs r6, 0x4 -_080DE2F0: +@080DE2F0: ldr r0, [r4] ldr r0, [r0, 0x14] lsls r3, r5, 2 @@ -421865,7 +421865,7 @@ _080DE2F0: strb r0, [r1, 0x5] adds r5, 0x1 cmp r5, 0x3 - ble _080DE2F0 + ble @080DE2F0 add sp, 0xC pop {r3} mov r8, r3 @@ -421877,7 +421877,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 @@ -421934,7 +421934,7 @@ sub_80DE350: @ 80DE350 ldr r0, =0x02022e1a strh r5, [r0] ldr r7, =0x02020630 -_080DE3CA: +@080DE3CA: ldr r0, [r6] ldr r0, [r0, 0x14] lsls r3, r5, 2 @@ -421962,7 +421962,7 @@ _080DE3CA: strb r0, [r1, 0x5] adds r5, 0x1 cmp r5, 0x3 - ble _080DE3CA + ble @080DE3CA add sp, 0x8 pop {r4-r7} pop {r0} @@ -421972,7 +421972,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 @@ -422001,7 +422001,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 @@ -422011,13 +422011,13 @@ sub_80DE464: @ 80DE464 strh r0, [r1] lsls r0, 16 cmp r0, 0 - bge _080DE47C + bge @080DE47C movs r0, 0 strh r0, [r1] -_080DE47C: +@080DE47C: ldrh r2, [r1] cmp r2, 0 - bne _080DE496 + bne @080DE496 ldr r0, =0x03005e00 lsls r1, r3, 2 adds r1, r3 @@ -422028,7 +422028,7 @@ _080DE47C: strh r2, [r1, 0xC] ldr r0, =sub_80DE4A8 + 1 str r0, [r1] -_080DE496: +@080DE496: pop {r0} bx r0 .align 2, 0 @@ -422036,7 +422036,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 @@ -422048,26 +422048,26 @@ sub_80DE4A8: @ 80DE4A8 movs r0, 0x8 ldrsh r1, [r5, r0] cmp r1, 0x1 - beq _080DE52C + beq @080DE52C cmp r1, 0x1 - bgt _080DE4D0 + bgt @080DE4D0 cmp r1, 0 - beq _080DE4DA - b _080DE5B4 + beq @080DE4DA + b @080DE5B4 .align 2, 0 .pool -_080DE4D0: +@080DE4D0: cmp r1, 0x2 - beq _080DE58A + beq @080DE58A cmp r1, 0x3 - beq _080DE5A4 - b _080DE5B4 -_080DE4DA: + beq @080DE5A4 + b @080DE5B4 +@080DE4DA: movs r2, 0 adds r6, r3, 0 ldr r5, =0x02039f34 ldr r3, =0x02039f26 -_080DE4E2: +@080DE4E2: ldr r0, [r5] ldr r1, [r0] adds r1, 0x14 @@ -422077,7 +422077,7 @@ _080DE4E2: strb r0, [r1] adds r2, 0x1 cmp r2, 0x3 - ble _080DE4E2 + ble @080DE4E2 bl sub_80DBF90 bl sub_80DC864 bl sub_80DB69C @@ -422091,15 +422091,15 @@ _080DE4E2: adds r1, r0 movs r0, 0x1 strh r0, [r1, 0x8] - b _080DE5B4 + b @080DE5B4 .align 2, 0 .pool -_080DE52C: +@080DE52C: ldr r0, =0x02039f2a ldrb r0, [r0] ands r1, r0 cmp r1, 0 - beq _080DE584 + beq @080DE584 ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0] @@ -422110,9 +422110,9 @@ _080DE52C: bl sub_80DA8A4 lsls r0, 24 cmp r0, 0 - beq _080DE552 + beq @080DE552 bl sub_80DBAA0 -_080DE552: +@080DE552: ldr r4, =sub_80FCC88 + 1 adds r0, r4, 0 movs r1, 0 @@ -422125,13 +422125,13 @@ _080DE552: bl sub_80DBF68 movs r0, 0x2 strh r0, [r5, 0x8] - b _080DE5B4 + b @080DE5B4 .align 2, 0 .pool -_080DE584: +@080DE584: bl sub_80DBAA0 - b _080DE59A -_080DE58A: + b @080DE59A +@080DE58A: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] @@ -422139,21 +422139,21 @@ _080DE58A: movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne _080DE5B4 -_080DE59A: + bne @080DE5B4 +@080DE59A: movs r0, 0x3 strh r0, [r5, 0x8] - b _080DE5B4 + b @080DE5B4 .align 2, 0 .pool -_080DE5A4: +@080DE5A4: bl sub_80DB884 bl sub_80DB2BC movs r0, 0 strh r0, [r5, 0x8] ldr r0, =sub_80DE5F4 + 1 str r0, [r5] -_080DE5B4: +@080DE5B4: pop {r4-r6} pop {r0} bx r0 @@ -422162,7 +422162,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 @@ -422173,7 +422173,7 @@ sub_80DE5C0: @ 80DE5C0 lsls r0, 16 asrs r0, 16 cmp r0, 0xA0 - ble _080DE5E4 + ble @080DE5E4 ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -422181,7 +422181,7 @@ sub_80DE5C0: @ 80DE5C0 adds r1, r0 ldr r0, =sub_80DA4F4 + 1 str r0, [r1] -_080DE5E4: +@080DE5E4: pop {r0} bx r0 .align 2, 0 @@ -422189,7 +422189,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 @@ -422202,54 +422202,54 @@ sub_80DE5F4: @ 80DE5F4 movs r3, 0xC ldrsh r0, [r1, r3] cmp r0, 0x9 - bgt _080DE618 + bgt @080DE618 adds r0, r2, 0x1 strh r0, [r1, 0xC] - b _080DE654 + b @080DE654 .align 2, 0 .pool -_080DE618: +@080DE618: ldrh r3, [r1, 0xA] movs r4, 0xA ldrsh r0, [r1, r4] cmp r0, 0 - bne _080DE636 + bne @080DE636 ldrh r2, [r1, 0x8] movs r4, 0x8 ldrsh r0, [r1, r4] cmp r0, 0x10 - bne _080DE632 + bne @080DE632 adds r0, r3, 0x1 strh r0, [r1, 0xA] - b _080DE654 -_080DE632: + b @080DE654 +@080DE632: adds r0, r2, 0x1 - b _080DE652 -_080DE636: + b @080DE652 +@080DE636: ldrh r0, [r1, 0x8] movs r3, 0x8 ldrsh r2, [r1, r3] cmp r2, 0 - bne _080DE650 + bne @080DE650 strh r2, [r1, 0xA] strh r2, [r1, 0xC] ldr r0, =sub_80DE65C + 1 str r0, [r1] - b _080DE654 + b @080DE654 .align 2, 0 .pool -_080DE650: +@080DE650: subs r0, 0x1 -_080DE652: +@080DE652: strh r0, [r1, 0x8] -_080DE654: +@080DE654: pop {r4} pop {r0} bx r0 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 @@ -422262,13 +422262,13 @@ sub_80DE65C: @ 80DE65C movs r2, 0xC ldrsh r0, [r4, r2] cmp r0, 0x9 - bgt _080DE680 + bgt @080DE680 adds r0, r1, 0x1 strh r0, [r4, 0xC] - b _080DE690 + b @080DE690 .align 2, 0 .pool -_080DE680: +@080DE680: movs r0, 0 strh r0, [r4, 0xC] movs r0, 0x61 @@ -422276,7 +422276,7 @@ _080DE680: bl audio_play_and_stuff ldr r0, =sub_80DE5C0 + 1 str r0, [r4] -_080DE690: +@080DE690: pop {r4} pop {r0} bx r0 @@ -422285,7 +422285,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} @@ -422295,7 +422295,7 @@ sub_80DE69C: @ 80DE69C movs r7, 0 ldr r6, =0x02020630 ldr r5, =0x02039f34 -_080DE6AE: +@080DE6AE: bl rotscale_alloc_entry ldr r1, [r5] ldr r1, [r1, 0x14] @@ -422347,7 +422347,7 @@ _080DE6AE: bl sub_8008258 mov r0, r8 cmp r0, 0x2 - bne _080DE74C + bne @080DE74C ldr r0, [r5] ldr r0, [r0, 0x14] adds r0, r4, r0 @@ -422372,10 +422372,10 @@ _080DE6AE: adds r2, r3, 0 ands r1, r2 strb r1, [r0] -_080DE74C: +@080DE74C: adds r7, 0x1 cmp r7, 0x3 - ble _080DE6AE + ble @080DE6AE ldr r0, =sub_80DE794 + 1 movs r1, 0x5 bl AddTask @@ -422405,7 +422405,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 @@ -422422,7 +422422,7 @@ sub_80DE794: @ 80DE794 ldrb r0, [r0] lsls r0, 26 cmp r0, 0 - bge _080DE822 + bge @080DE822 ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -422430,11 +422430,11 @@ sub_80DE794: @ 80DE794 adds r1, r0 ldrb r0, [r1, 0x8] cmp r0, 0x1 - bne _080DE7EC + bne @080DE7EC movs r4, 0 adds r5, r2, 0 movs r2, 0x4 -_080DE7CC: +@080DE7CC: ldr r0, [r3] ldr r1, [r0, 0x14] lsls r0, r4, 2 @@ -422450,10 +422450,10 @@ _080DE7CC: strb r1, [r0] adds r4, 0x1 cmp r4, 0x3 - ble _080DE7CC -_080DE7EC: + ble @080DE7CC +@080DE7EC: movs r4, 0 -_080DE7EE: +@080DE7EE: ldr r5, =0x02039f34 ldr r0, [r5] ldr r1, [r0, 0x14] @@ -422468,7 +422468,7 @@ _080DE7EE: bl obj_free_rotscale_entry adds r4, 0x1 cmp r4, 0x3 - ble _080DE7EE + ble @080DE7EE ldr r0, [r5] ldr r2, [r0] ldrb r1, [r2, 0x7] @@ -422478,7 +422478,7 @@ _080DE7EE: strb r0, [r2, 0x7] adds r0, r6, 0 bl remove_task -_080DE822: +@080DE822: pop {r4-r6} pop {r0} bx r0 @@ -422487,31 +422487,31 @@ _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 movs r0, 0xB1 lsls r0, 1 cmp r1, r0 - bls _080DE844 + bls @080DE844 movs r1, 0x1 -_080DE844: +@080DE844: adds r0, r1, 0 pop {r1} bx r1 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 ldr r0, =0x0000019b cmp r1, r0 - bls _080DE85A + bls @080DE85A movs r1, 0 -_080DE85A: +@080DE85A: adds r0, r1, 0 pop {r1} bx r1 @@ -422520,7 +422520,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 @@ -422551,47 +422551,47 @@ sub_80DE864: @ 80DE864 ldr r1, =0x020244e4 movs r2, 0 adds r0, r1, 0x3 -_080DE8A8: +@080DE8A8: strb r2, [r0] subs r0, 0x1 cmp r0, r1 - bge _080DE8A8 + bge @080DE8A8 cmp r5, 0x90 - beq _080DE920 + beq @080DE920 cmp r5, 0x90 - bgt _080DE8DE + bgt @080DE8DE cmp r5, 0x4C - beq _080DE978 + beq @080DE978 cmp r5, 0x4C - bgt _080DE8D4 + bgt @080DE8D4 cmp r5, 0xD - beq _080DE978 - b _080DE9A2 + beq @080DE978 + b @080DE9A2 .align 2, 0 .pool -_080DE8D4: +@080DE8D4: cmp r5, 0x82 - beq _080DE978 + beq @080DE978 cmp r5, 0x8F - beq _080DE978 - b _080DE9A2 -_080DE8DE: + beq @080DE978 + b @080DE9A2 +@080DE8DE: cmp r5, 0xD8 - beq _080DE960 + beq @080DE960 cmp r5, 0xD8 - bgt _080DE8EC + bgt @080DE8EC cmp r5, 0xAE - beq _080DE8FA - b _080DE9A2 -_080DE8EC: + beq @080DE8FA + b @080DE9A2 +@080DE8EC: cmp r5, 0xDA - beq _080DE96C + beq @080DE96C movs r0, 0x88 lsls r0, 1 cmp r5, r0 - beq _080DE920 - b _080DE9A2 -_080DE8FA: + beq @080DE920 + b @080DE9A2 +@080DE8FA: ldr r0, =0x083203cc lsls r1, r6, 3 subs r1, r6 @@ -422599,17 +422599,17 @@ _080DE8FA: adds r1, r0 ldrb r0, [r1, 0x6] cmp r0, 0x7 - beq _080DE910 + beq @080DE910 ldrb r0, [r1, 0x7] cmp r0, 0x7 - bne _080DE99C -_080DE910: + bne @080DE99C +@080DE910: ldr r1, =0x02038432 movs r0, 0 - b _080DE9A0 + b @080DE9A0 .align 2, 0 .pool -_080DE920: +@080DE920: ldr r6, =0x02039f34 ldr r0, [r6] ldr r1, [r0, 0x4] @@ -422635,22 +422635,22 @@ _080DE920: movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x4] - b _080DE9A2 + b @080DE9A2 .align 2, 0 .pool -_080DE960: +@080DE960: ldr r1, =0x0203841a movs r0, 0xFF - b _080DE9A0 + b @080DE9A0 .align 2, 0 .pool -_080DE96C: +@080DE96C: ldr r1, =0x0203841a movs r0, 0 - b _080DE9A0 + b @080DE9A0 .align 2, 0 .pool -_080DE978: +@080DE978: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] @@ -422658,20 +422658,20 @@ _080DE978: adds r2, 0x5A ldrb r1, [r2] cmp r1, 0 - bne _080DE99C + bne @080DE99C movs r0, 0x2 strb r0, [r2] ldr r0, =0x02038432 strb r1, [r0] - b _080DE9A2 + b @080DE9A2 .align 2, 0 .pool -_080DE99C: +@080DE99C: ldr r1, =0x02038432 movs r0, 0x1 -_080DE9A0: +@080DE9A0: strb r0, [r1] -_080DE9A2: +@080DE9A2: bl sub_80DEA5C pop {r4-r7} pop {r0} @@ -422681,7 +422681,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] @@ -422695,10 +422695,10 @@ sub_80DE9B0: @ 80DE9B0 adds r1, 0x5A ldrb r0, [r1] cmp r0, 0 - beq _080DE9D2 + beq @080DE9D2 subs r0, 0x1 strb r0, [r1] -_080DE9D2: +@080DE9D2: pop {r4} pop {r0} bx r0 @@ -422707,7 +422707,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 @@ -422742,7 +422742,7 @@ sub_80DE9DC: @ 80DE9DC thumb_func_end sub_80DE9DC thumb_func_start sub_80DEA20 -sub_80DEA20: @ 80DEA20 +sub_80DEA20: ; 80DEA20 push {lr} ldr r0, =nullsub_12 + 1 bl object_new_hidden_with_callback @@ -422766,7 +422766,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] @@ -422803,7 +422803,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 @@ -422814,59 +422814,59 @@ sub_80DEAA8: @ 80DEAA8 adds r1, r2 ldrb r0, [r1, 0x6] cmp r0, 0x20 - bhi _080DEB60 + bhi @080DEB60 lsls r0, 2 - ldr r1, =_080DEAD0 + ldr r1, =@080DEAD0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080DEAD0: - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB54 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB54 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 - .4byte _080DEB60 -_080DEB54: +@080DEAD0: + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB54 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB54 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 + .4byte @080DEB60 +@080DEB54: ldr r1, =0x0202420c movs r0, 0x2 - b _080DEB64 + b @080DEB64 .align 2, 0 .pool -_080DEB60: +@080DEB60: ldr r1, =0x0202420c movs r0, 0x3 -_080DEB64: +@080DEB64: strb r0, [r1] pop {r0} bx r0 @@ -422875,7 +422875,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 @@ -422923,7 +422923,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 @@ -422971,7 +422971,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] @@ -423005,32 +423005,32 @@ sub_80DEC30: @ 80DEC30 movs r0, 0x80 strb r0, [r2, 0xD] cmp r1, 0 - bne _080DEC80 + bne @080DEC80 mov r0, sp movs r1, 0 movs r2, 0 bl remo_copy - b _080DECA4 -_080DEC80: + b @080DECA4 +@080DEC80: ldr r0, =0x02039f2a ldrb r1, [r0] adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _080DEC94 + beq @080DEC94 movs r1, 0x4 - b _080DEC9C + b @080DEC9C .align 2, 0 .pool -_080DEC94: +@080DEC94: bl sav2_get_text_speed lsls r0, 24 lsrs r1, r0, 24 -_080DEC9C: +@080DEC9C: mov r0, sp movs r2, 0 bl remo_copy -_080DECA4: +@080DECA4: movs r0, 0x4 bl Window_WriteStandardTileMap movs r0, 0 @@ -423042,7 +423042,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} @@ -423087,7 +423087,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] @@ -423120,7 +423120,7 @@ sub_80DED10: @ 80DED10 thumb_func_end sub_80DED10 thumb_func_start sub_80DED4C -sub_80DED4C: @ 80DED4C +sub_80DED4C: ; 80DED4C push {lr} bl run_remoboxes movs r0, 0x4 @@ -423132,7 +423132,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 @@ -423145,17 +423145,17 @@ 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 ldr r5, =0x00000624 movs r4, 0 -_080DED7E: +@080DED7E: adds r3, r0, 0x1 lsls r1, r0, 3 movs r2, 0x3 -_080DED84: +@080DED84: ldr r0, [r6] adds r0, r5 adds r0, r1 @@ -423163,10 +423163,10 @@ _080DED84: adds r1, 0x2 subs r2, 0x1 cmp r2, 0 - bge _080DED84 + bge @080DED84 adds r0, r3, 0 cmp r0, 0x4 - ble _080DED7E + ble @080DED7E pop {r4-r6} pop {r0} bx r0 @@ -423175,7 +423175,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 @@ -423197,71 +423197,71 @@ sub_80DEDA8: @ 80DEDA8 ldr r1, =0x02039f20 ldrb r0, [r1] cmp r0, 0 - beq _080DEDE6 -_080DEDD8: + beq @080DEDE6 +@080DEDD8: adds r5, 0x1 cmp r5, 0x2 - bgt _080DEDE6 + bgt @080DEDE6 adds r0, r5, r1 ldrb r0, [r0] cmp r0, 0 - bne _080DEDD8 -_080DEDE6: + bne @080DEDD8 +@080DEDE6: ldr r0, [sp] cmp r0, 0xFF - bne _080DEE00 + bne @080DEE00 ldr r0, =0x02039f25 ldrb r0, [r0] cmp r5, r0 - beq _080DEE00 + beq @080DEE00 movs r0, 0 - b _080DEF90 + b @080DEF90 .align 2, 0 .pool -_080DEE00: +@080DEE00: ldr r0, =0x02039f2c ldrh r0, [r0] cmp r0, 0x4 - bhi _080DEE4C + bhi @080DEE4C lsls r0, 2 - ldr r1, =_080DEE1C + ldr r1, =@080DEE1C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080DEE1C: - .4byte _080DEE4C - .4byte _080DEE30 - .4byte _080DEE36 - .4byte _080DEE3C - .4byte _080DEE42 -_080DEE30: +@080DEE1C: + .4byte @080DEE4C + .4byte @080DEE30 + .4byte @080DEE36 + .4byte @080DEE3C + .4byte @080DEE42 +@080DEE30: mov r0, r8 adds r0, 0x3 - b _080DEE46 -_080DEE36: + b @080DEE46 +@080DEE36: mov r0, r8 adds r0, 0x6 - b _080DEE46 -_080DEE3C: + b @080DEE46 +@080DEE3C: mov r0, r8 adds r0, 0x9 - b _080DEE46 -_080DEE42: + b @080DEE46 +@080DEE42: mov r0, r8 adds r0, 0xC -_080DEE46: +@080DEE46: lsls r0, 24 lsrs r0, 24 mov r8, r0 -_080DEE4C: +@080DEE4C: ldr r1, [sp] cmp r1, 0xFE - bne _080DEE54 - b _080DEF50 -_080DEE54: + bne @080DEE54 + b @080DEF50 +@080DEE54: adds r0, r1, 0 movs r1, 0x1 bl sub_80DEFA8 @@ -423316,17 +423316,17 @@ _080DEE54: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080DEEF4 + beq @080DEEF4 mov r3, r10 ldr r0, [r3] adds r0, r7 ldr r1, =0x00002eae adds r0, r1 movs r1, 0x4 - b _080DEF02 + b @080DEF02 .align 2, 0 .pool -_080DEEF4: +@080DEEF4: mov r2, r10 ldr r0, [r2] adds r0, r7 @@ -423334,11 +423334,11 @@ _080DEEF4: ldrh r1, [r1] ldr r3, =0x00002eae adds r0, r3 -_080DEF02: +@080DEF02: strb r1, [r0] ldr r0, [sp] cmp r0, 0xFF - beq _080DEF34 + beq @080DEF34 ldr r0, =0x03005d8c ldr r0, [r0] mov r2, r9 @@ -423349,10 +423349,10 @@ _080DEF02: ldr r3, =0x00002e9a adds r0, r3 strb r1, [r0] - b _080DEF8E + b @080DEF8E .align 2, 0 .pool -_080DEF34: +@080DEF34: ldr r0, =0x03005d8c ldr r0, [r0] mov r2, r9 @@ -423362,10 +423362,10 @@ _080DEF34: adds r0, r3 mov r1, r8 strb r1, [r0] - b _080DEF8E + b @080DEF8E .align 2, 0 .pool -_080DEF50: +@080DEF50: ldr r6, =0x02039f3c ldr r4, =0x02039e00 lsls r5, 6 @@ -423395,9 +423395,9 @@ _080DEF50: bl gf_strcpy mov r2, r8 strb r2, [r6, 0xA] -_080DEF8E: +@080DEF8E: movs r0, 0x1 -_080DEF90: +@080DEF90: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -423411,24 +423411,24 @@ _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 lsls r1, 24 lsrs r1, 24 cmp r0, 0x3 - bgt _080DEFF8 + bgt @080DEFF8 cmp r0, 0 - blt _080DEFF8 + blt @080DEFF8 cmp r1, 0 - beq _080DEFE6 + beq @080DEFE6 movs r2, 0x5 ldr r0, =0x03005d8c mov r12, r0 ldr r4, =0x00002e90 ldr r3, =0x00002e70 -_080DEFC8: +@080DEFC8: mov r1, r12 ldr r0, [r1] lsls r1, r2, 5 @@ -423443,60 +423443,60 @@ _080DEFC8: stm r0!, {r5,r6} subs r2, 0x1 cmp r2, 0 - bgt _080DEFC8 -_080DEFE6: + bgt @080DEFC8 +@080DEFE6: movs r0, 0 - b _080DF03A + b @080DF03A .align 2, 0 .pool -_080DEFF8: +@080DEFF8: ldr r0, =0x02039f2c ldrh r0, [r0] cmp r0, 0x4 - bhi _080DF038 + bhi @080DF038 lsls r0, 2 - ldr r1, =_080DF014 + ldr r1, =@080DF014 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080DF014: - .4byte _080DF028 - .4byte _080DF02C - .4byte _080DF030 - .4byte _080DF034 - .4byte _080DF038 -_080DF028: +@080DF014: + .4byte @080DF028 + .4byte @080DF02C + .4byte @080DF030 + .4byte @080DF034 + .4byte @080DF038 +@080DF028: movs r0, 0x8 - b _080DF03A -_080DF02C: + b @080DF03A +@080DF02C: movs r0, 0x9 - b _080DF03A -_080DF030: + b @080DF03A +@080DF030: movs r0, 0xA - b _080DF03A -_080DF034: + b @080DF03A +@080DF034: movs r0, 0xB - b _080DF03A -_080DF038: + b @080DF03A +@080DF038: movs r0, 0xC -_080DF03A: +@080DF03A: pop {r4-r7} pop {r1} bx r1 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 mov r12, r0 ldr r4, =0x00002e90 ldr r3, =0x08587fa4 -_080DF04C: +@080DF04C: mov r1, r12 ldr r0, [r1] lsls r1, r2, 5 @@ -423512,7 +423512,7 @@ _080DF04C: adds r3, 0x20 adds r2, 0x1 cmp r2, 0x7 - ble _080DF04C + ble @080DF04C pop {r4-r7} pop {r0} bx r0 @@ -423521,7 +423521,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 @@ -423534,11 +423534,11 @@ sub_80DF080: @ 80DF080 ands r0, r1 adds r6, r2, 0 cmp r0, 0 - bne _080DF0D2 + bne @080DF0D2 movs r0, 0 ldrsb r0, [r5, r0] cmp r0, 0 - ble _080DF0D2 + ble @080DF0D2 ldr r1, [r3, 0x4] lsls r0, r4, 3 subs r0, r4 @@ -423548,7 +423548,7 @@ sub_80DF080: @ 80DF080 adds r0, r7, 0 ands r0, r1 cmp r0, 0 - bne _080DF0D2 + bne @080DF0D2 ldr r1, [r3, 0x1C] lsls r2, r4, 4 adds r1, r2, r1 @@ -423563,7 +423563,7 @@ sub_80DF080: @ 80DF080 movs r1, 0x2 orrs r0, r1 strb r0, [r2, 0xE] -_080DF0D2: +@080DF0D2: ldr r3, [r6] ldr r1, [r3, 0x4] lsls r2, r4, 3 @@ -423576,7 +423576,7 @@ _080DF0D2: ands r0, r1 adds r7, r2, 0 cmp r0, 0 - beq _080DF0FA + beq @080DF0FA ldr r0, [r3, 0x1C] lsls r1, r4, 4 adds r1, r0 @@ -423584,22 +423584,22 @@ _080DF0D2: movs r0, 0x2 orrs r0, r2 strb r0, [r1, 0xC] -_080DF0FA: +@080DF0FA: ldr r3, [r6] ldr r2, [r3, 0x10] ldrb r1, [r2, 0x1] adds r0, r5, 0 ands r0, r1 cmp r0, 0 - bne _080DF126 + bne @080DF126 movs r0, 0 ldrsb r0, [r2, r0] cmp r0, 0 - beq _080DF126 + beq @080DF126 movs r0, 0x2 ldrsb r0, [r2, r0] cmp r0, 0x3C - bne _080DF126 + bne @080DF126 ldr r0, [r3, 0x1C] lsls r1, r4, 4 adds r1, r0 @@ -423607,7 +423607,7 @@ _080DF0FA: movs r0, 0x4 orrs r0, r2 strb r0, [r1, 0xC] -_080DF126: +@080DF126: ldr r3, [r6] ldr r1, [r3, 0x4] subs r0, r7, r4 @@ -423617,10 +423617,10 @@ _080DF126: movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _080DF14E + beq @080DF14E ldrb r0, [r2, 0x16] cmp r0, 0 - beq _080DF14E + beq @080DF14E ldr r0, [r3, 0x1C] lsls r1, r4, 4 adds r1, r0 @@ -423628,18 +423628,18 @@ _080DF126: movs r0, 0x8 orrs r0, r2 strb r0, [r1, 0xC] -_080DF14E: +@080DF14E: movs r3, 0 movs r5, 0 -_080DF152: +@080DF152: cmp r3, r4 - beq _080DF180 + beq @080DF180 ldr r1, [r6] ldr r0, [r1, 0x4] adds r0, r5, r0 ldrb r0, [r0, 0xE] cmp r0, 0 - beq _080DF180 + beq @080DF180 ldr r0, [r1, 0x1C] lsls r2, r4, 4 adds r2, r0 @@ -423655,11 +423655,11 @@ _080DF152: movs r1, 0x40 orrs r0, r1 strb r0, [r2, 0xC] -_080DF180: +@080DF180: adds r5, 0x1C adds r3, 0x1 cmp r3, 0x3 - ble _080DF152 + ble @080DF152 ldr r2, [r6] ldr r1, [r2, 0x4] subs r0, r7, r4 @@ -423669,13 +423669,13 @@ _080DF180: movs r0, 0x6 ands r0, r3 cmp r0, 0 - bne _080DF1A6 + bne @080DF1A6 ldrb r1, [r1, 0xB] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080DF1BC -_080DF1A6: + beq @080DF1BC +@080DF1A6: ldr r0, [r2, 0x1C] lsls r1, r4, 4 adds r1, r0 @@ -423683,14 +423683,14 @@ _080DF1A6: movs r0, 0x20 orrs r0, r2 strb r0, [r1, 0xC] - b _080DF1F6 + b @080DF1F6 .align 2, 0 .pool -_080DF1BC: +@080DF1BC: movs r0, 0x1 ands r0, r3 cmp r0, 0 - bne _080DF1F6 + bne @080DF1F6 ldr r2, [r2, 0x1C] lsls r3, r4, 4 adds r2, r3, r2 @@ -423716,7 +423716,7 @@ _080DF1BC: adds r0, r5, r0 ldrh r0, [r0, 0x6] strh r0, [r3] -_080DF1F6: +@080DF1F6: ldr r2, [r6] ldr r1, [r2, 0x4] subs r0, r7, r4 @@ -423727,7 +423727,7 @@ _080DF1F6: adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _080DF21A + beq @080DF21A ldr r0, [r2, 0x1C] lsls r1, r4, 4 adds r1, r0 @@ -423735,24 +423735,24 @@ _080DF1F6: movs r0, 0x2 orrs r0, r2 strb r0, [r1, 0xD] -_080DF21A: +@080DF21A: ldr r2, [r6] ldr r0, [r2] ldrb r0, [r0, 0x13] lsls r0, 24 asrs r0, 24 cmp r0, 0x4 - bne _080DF24A + bne @080DF24A ldr r3, [r2, 0x10] ldrb r1, [r3, 0x1] adds r0, r5, 0 ands r0, r1 cmp r0, 0 - bne _080DF24A + bne @080DF24A movs r0, 0 ldrsb r0, [r3, r0] cmp r0, 0 - bge _080DF24A + bge @080DF24A ldr r0, [r2, 0x1C] lsls r1, r4, 4 adds r1, r0 @@ -423760,14 +423760,14 @@ _080DF21A: movs r0, 0x20 orrs r0, r2 strb r0, [r1, 0xD] -_080DF24A: +@080DF24A: pop {r4-r7} pop {r0} bx r0 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 @@ -423792,25 +423792,25 @@ sub_80DF250: @ 80DF250 movs r2, 0 movs r3, 0x80 lsls r3, 17 -_080DF280: +@080DF280: adds r0, r4, r5 ldrb r0, [r0] cmp r0, 0 - bne _080DF298 + bne @080DF298 lsrs r0, r2, 24 str r0, [sp, 0x20] - b _080DF29E + b @080DF29E .align 2, 0 .pool -_080DF298: +@080DF298: cmp r0, 0x3 - bne _080DF29E + bne @080DF29E lsrs r1, r2, 24 -_080DF29E: +@080DF29E: adds r2, r3 adds r4, 0x1 cmp r4, 0x3 - ble _080DF280 + ble @080DF280 ldr r0, [r6] ldr r0, [r0, 0x1C] lsls r1, 4 @@ -423825,10 +423825,10 @@ _080DF29E: str r1, [sp, 0x30] mov r9, r4 mov r10, r4 -_080DF2C2: +@080DF2C2: ldr r2, [sp, 0x20] cmp r4, r2 - beq _080DF2EE + beq @080DF2EE ldr r1, =0x02039f08 lsls r0, r2, 1 adds r0, r1 @@ -423839,7 +423839,7 @@ _080DF2C2: ldrsh r0, [r1, r6] subs r2, r0 cmp r2, 0x32 - bgt _080DF2EE + bgt @080DF2EE ldr r7, =0x02039f34 ldr r0, [r7] ldr r2, [r0, 0x1C] @@ -423848,7 +423848,7 @@ _080DF2C2: movs r1, 0x4 orrs r0, r1 strb r0, [r2, 0xD] -_080DF2EE: +@080DF2EE: ldr r1, =0x02039f34 ldr r0, [r1] ldr r0, [r0, 0x1C] @@ -423858,12 +423858,12 @@ _080DF2EE: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _080DF30A + bne @080DF30A ldrb r0, [r2, 0xD] movs r1, 0x8 orrs r0, r1 strb r0, [r2, 0xD] -_080DF30A: +@080DF30A: movs r5, 0 ldr r2, =0x02039f00 add r2, r10 @@ -423873,28 +423873,28 @@ _080DF30A: movs r3, 0 ldrsh r0, [r7, r3] cmp r1, r0 - blt _080DF336 + blt @080DF336 adds r3, r2, 0 adds r2, r7, 0 -_080DF322: +@080DF322: adds r2, 0x2 adds r5, 0x1 cmp r5, 0x3 - bgt _080DF336 + bgt @080DF336 movs r6, 0 ldrsh r1, [r3, r6] movs r7, 0 ldrsh r0, [r2, r7] cmp r1, r0 - bge _080DF322 -_080DF336: + bge @080DF322 +@080DF336: cmp r5, 0x4 - bne _080DF354 + bne @080DF354 ldr r1, =0x02039f20 adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0 - beq _080DF354 + beq @080DF354 ldr r2, =0x02039f34 ldr r0, [r2] ldr r2, [r0, 0x1C] @@ -423903,7 +423903,7 @@ _080DF336: movs r1, 0x10 orrs r0, r1 strb r0, [r2, 0xD] -_080DF354: +@080DF354: movs r3, 0 mov r12, r3 mov r8, r3 @@ -423918,35 +423918,35 @@ _080DF354: mov r1, r10 adds r6, r1, r0 adds r3, r0, 0 -_080DF370: +@080DF370: movs r7, 0 ldrsh r0, [r2, r7] ldr r1, [sp, 0x34] cmp r1, r0 - ble _080DF37E + ble @080DF37E movs r7, 0x1 mov r12, r7 -_080DF37E: +@080DF37E: movs r0, 0 ldrsh r1, [r6, r0] movs r7, 0 ldrsh r0, [r3, r7] cmp r1, r0 - ble _080DF38E + ble @080DF38E movs r0, 0x1 mov r8, r0 -_080DF38E: +@080DF38E: adds r2, 0x2 adds r3, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble _080DF370 + ble @080DF370 mov r1, r12 cmp r1, 0 - bne _080DF3B4 + bne @080DF3B4 mov r2, r8 cmp r2, 0 - bne _080DF3B4 + bne @080DF3B4 ldr r3, =0x02039f34 ldr r0, [r3] ldr r2, [r0, 0x1C] @@ -423955,7 +423955,7 @@ _080DF38E: movs r1, 0x40 orrs r0, r1 strb r0, [r2, 0xD] -_080DF3B4: +@080DF3B4: ldr r6, =0x02039f34 ldr r0, [r6] ldr r0, [r0, 0x1C] @@ -423965,34 +423965,34 @@ _080DF3B4: movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080DF3D0 + bne @080DF3D0 ldrb r0, [r2, 0xD] movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0xD] -_080DF3D0: +@080DF3D0: movs r0, 0x10 add r9, r0 movs r1, 0x2 add r10, r1 adds r4, 0x1 cmp r4, 0x3 - bgt _080DF3E0 - b _080DF2C2 -_080DF3E0: + bgt @080DF3E0 + b @080DF2C2 +@080DF3E0: movs r4, 0 movs r5, 0 movs r3, 0 ldr r2, [sp, 0x28] mov r1, sp -_080DF3EA: +@080DF3EA: strh r3, [r1] adds r0, r2, r4 strb r5, [r0] adds r1, 0x2 adds r4, 0x1 cmp r4, 0x4 - ble _080DF3EA + ble @080DF3EA mov r1, sp ldr r0, =0x0000ffff strh r0, [r1, 0xA] @@ -424004,7 +424004,7 @@ _080DF3EA: ldr r0, [r0] mov r8, r0 ldr r7, [sp, 0x30] -_080DF40E: +@080DF40E: mov r3, r8 ldr r0, [r3, 0x1C] adds r0, r7, r0 @@ -424014,37 +424014,37 @@ _080DF40E: adds r4, 0x1 mov r12, r4 cmp r0, 0 - beq _080DF450 + beq @080DF450 ldr r0, =0x02039f34 ldr r6, [r0] ldr r3, [sp, 0x28] mov r4, sp movs r5, 0x4 -_080DF42C: +@080DF42C: ldr r0, [r6, 0x1C] adds r0, r7, r0 adds r0, r1 ldrh r0, [r0] ldrh r2, [r4] cmp r0, r2 - beq _080DF440 + beq @080DF440 cmp r2, 0 - bne _080DF446 + bne @080DF446 strh r0, [r4] -_080DF440: +@080DF440: ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] -_080DF446: +@080DF446: adds r3, 0x1 adds r4, 0x2 subs r5, 0x1 cmp r5, 0 - bge _080DF42C -_080DF450: + bge @080DF42C +@080DF450: mov r4, r12 cmp r4, 0x4 - ble _080DF40E + ble @080DF40E mov r0, sp ldrh r0, [r0] ldr r6, [sp, 0x2C] @@ -424057,27 +424057,27 @@ _080DF450: ldrh r0, [r1] ldr r1, =0x0000ffff cmp r0, r1 - beq _080DF4C0 + beq @080DF4C0 ldr r5, [sp, 0x2C] adds r7, r1, 0 mov r2, sp adds r2, 0x2 -_080DF478: +@080DF478: ldr r0, [sp, 0x28] adds r1, r0, r4 ldrb r0, [r1] cmp r3, r0 - bcs _080DF4A4 + bcs @080DF4A4 ldrh r0, [r2] strh r0, [r5] ldrb r3, [r1] movs r6, 0x1 - b _080DF4B6 + b @080DF4B6 .align 2, 0 .pool -_080DF4A4: +@080DF4A4: cmp r3, r0 - bne _080DF4B6 + bne @080DF4B6 lsls r0, r6, 1 adds r0, r5, r0 ldrh r1, [r2] @@ -424085,13 +424085,13 @@ _080DF4A4: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_080DF4B6: +@080DF4B6: adds r2, 0x2 adds r4, 0x1 ldrh r0, [r2] cmp r0, r7 - bne _080DF478 -_080DF4C0: + bne @080DF478 +@080DF4C0: bl GenerateRandomNumber ldr r1, =0x02039f34 ldr r1, [r1] @@ -424120,7 +424120,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 @@ -424133,24 +424133,24 @@ sub_80DF4F8: @ 80DF4F8 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _080DF514 - b _080DF6EE -_080DF514: + beq @080DF514 + b @080DF6EE +@080DF514: movs r7, 0 movs r3, 0 ldr r0, =0x02039f34 mov r12, r0 -_080DF51C: +@080DF51C: adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0 - bne _080DF528 + bne @080DF528 lsls r0, r3, 24 lsrs r7, r0, 24 -_080DF528: +@080DF528: adds r3, 0x1 cmp r3, 0x3 - ble _080DF51C + ble @080DF51C movs r1, 0 mov r9, r1 mov r10, r1 @@ -424167,35 +424167,35 @@ _080DF528: ldr r0, =0x02039f18 adds r2, r0 adds r4, r0, 0 -_080DF54E: +@080DF54E: movs r1, 0 ldrsh r0, [r5, r1] ldr r6, [sp, 0x8] cmp r6, r0 - bge _080DF562 + bge @080DF562 mov r0, r9 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r9, r0 -_080DF562: +@080DF562: movs r0, 0 ldrsh r1, [r2, r0] movs r6, 0 ldrsh r0, [r4, r6] cmp r1, r0 - bge _080DF578 + bge @080DF578 mov r0, r10 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r10, r0 -_080DF578: +@080DF578: adds r5, 0x2 adds r4, 0x2 adds r3, 0x1 cmp r3, 0x3 - ble _080DF54E + ble @080DF54E mov r1, r12 ldr r0, [r1] ldr r0, [r0, 0x1C] @@ -424204,19 +424204,19 @@ _080DF578: movs r4, 0 movs r2, 0x1 movs r3, 0x7 -_080DF592: +@080DF592: adds r0, r1, 0 ands r0, r2 cmp r0, 0 - beq _080DF5A0 + beq @080DF5A0 adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_080DF5A0: +@080DF5A0: lsrs r1, 1 subs r3, 0x1 cmp r3, 0 - bge _080DF592 + bge @080DF592 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -424235,35 +424235,35 @@ _080DF5A0: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080DF5DC + beq @080DF5DC cmp r5, 0 - beq _080DF5F6 -_080DF5D6: + beq @080DF5F6 +@080DF5D6: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_080DF5DC: +@080DF5DC: lsrs r1, 1 adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 adds r3, 0x1 cmp r3, 0x7 - bgt _080DF5F6 + bgt @080DF5F6 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080DF5DC + beq @080DF5DC cmp r5, r4 - bne _080DF5D6 -_080DF5F6: + bne @080DF5D6 +@080DF5F6: movs r1, 0x1 adds r0, r1, 0 lsls r0, r2 lsls r0, 16 lsrs r2, r0, 16 cmp r7, 0 - bne _080DF628 + bne @080DF628 mov r0, sp strb r1, [r0] ldr r1, =0x02039f34 @@ -424271,10 +424271,10 @@ _080DF5F6: ldr r0, [r0, 0x1C] ldrb r4, [r0, 0x1D] movs r3, 0x2 - b _080DF638 + b @080DF638 .align 2, 0 .pool -_080DF628: +@080DF628: mov r1, sp movs r0, 0 strb r0, [r1] @@ -424283,16 +424283,16 @@ _080DF628: ldr r0, [r0, 0x1C] ldrb r4, [r0, 0xD] movs r3, 0x1 -_080DF638: +@080DF638: mov r12, r1 movs r5, 0x1 lsls r2, 24 str r2, [sp, 0x4] cmp r3, 0x3 - bgt _080DF682 -_080DF644: + bgt @080DF682 +@080DF644: cmp r3, r7 - beq _080DF67C + beq @080DF67C mov r6, r12 ldr r2, [r6] ldr r0, [r2, 0x1C] @@ -424300,30 +424300,30 @@ _080DF644: adds r0, r1, r0 ldrb r0, [r0, 0xD] cmp r4, r0 - bcs _080DF66C + bcs @080DF66C mov r0, sp strb r3, [r0] ldr r0, [r2, 0x1C] adds r0, r1, r0 ldrb r4, [r0, 0xD] movs r5, 0x1 - b _080DF67C + b @080DF67C .align 2, 0 .pool -_080DF66C: +@080DF66C: cmp r4, r0 - bne _080DF67C + bne @080DF67C mov r1, sp adds r0, r1, r5 strb r3, [r0] adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_080DF67C: +@080DF67C: adds r3, 0x1 cmp r3, 0x3 - ble _080DF644 -_080DF682: + ble @080DF644 +@080DF682: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -424343,20 +424343,20 @@ _080DF682: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _080DF6C4 -_080DF6AE: + bne @080DF6C4 +@080DF6AE: lsrs r2, 1 adds r3, 0x1 cmp r3, 0x7 - bgt _080DF6C4 + bgt @080DF6C4 ldr r0, [r5] ldr r0, [r0, 0x1C] adds r0, r1, r0 ldrb r4, [r0, 0xD] ands r4, r2 cmp r4, 0 - beq _080DF6AE -_080DF6C4: + beq @080DF6AE +@080DF6C4: mov r0, r9 bl sub_80ECDA4 mov r0, r10 @@ -424373,7 +424373,7 @@ _080DF6C4: adds r0, r4, 0 adds r1, r6, 0 bl sub_80ECEB4 -_080DF6EE: +@080DF6EE: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -424387,7 +424387,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 @@ -424398,39 +424398,39 @@ sub_80DF704: @ 80DF704 ldrb r1, [r2] adds r4, r0, 0 cmp r1, 0 - bne _080DF72C + bne @080DF72C cmp r3, 0 - bne _080DF728 + bne @080DF728 movs r0, 0x2 - b _080DF72E + b @080DF72E .align 2, 0 .pool -_080DF728: +@080DF728: movs r0, 0x3 - b _080DF72E -_080DF72C: + b @080DF72E +@080DF72C: movs r0, 0 -_080DF72E: +@080DF72E: strb r0, [r2] movs r1, 0xD0 lsls r1, 9 adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0 - bne _080DF746 + bne @080DF746 bl sub_80DAEA4 bl sub_80DB2BC - b _080DF74A -_080DF746: + b @080DF74A +@080DF746: bl sub_80DF750 -_080DF74A: +@080DF74A: pop {r4} pop {r0} bx r0 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 @@ -424440,9 +424440,9 @@ sub_80DF750: @ 80DF750 ldr r0, =0x020322d5 ldrb r0, [r0] cmp r0, 0 - bne _080DF766 - b _080DF924 -_080DF766: + bne @080DF766 + b @080DF924 +@080DF766: ldr r0, =0x02000000 movs r1, 0xD0 lsls r1, 9 @@ -424452,14 +424452,14 @@ _080DF766: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bls _080DF77C - b _080DF924 -_080DF77C: + bls @080DF77C + b @080DF924 +@080DF77C: movs r7, 0 mov r2, sp adds r2, 0x18 str r2, [sp, 0x30] -_080DF784: +@080DF784: adds r0, r7, 0 movs r1, 0 bl Window_FastFillPixels @@ -424467,20 +424467,20 @@ _080DF784: lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x3 - bls _080DF784 + bls @080DF784 ldr r0, =0x02000000 movs r1, 0xD0 lsls r1, 9 adds r0, r1 ldrb r0, [r0] cmp r0, 0x2 - bne _080DF874 + bne @080DF874 movs r7, 0 movs r2, 0x7 mov r10, r2 ldr r0, [sp, 0x30] mov r9, r0 -_080DF7AE: +@080DF7AE: add r0, sp, 0x4 ldr r1, =0x085ed1b2 bl gf_strcpy @@ -424503,7 +424503,7 @@ _080DF7AE: movs r6, 0x7 adds r2, r7, 0x1 mov r8, r2 -_080DF7DE: +@080DF7DE: movs r1, 0x1 ands r1, r4 adds r0, r5, 0 @@ -424521,11 +424521,11 @@ _080DF7DE: movs r2, 0x1 negs r2, r2 cmp r0, r2 - bgt _080DF7DE + bgt @080DF7DE movs r6, 0 ldr r4, =0x02039f26 ldr r3, [sp, 0x30] -_080DF80A: +@080DF80A: lsls r0, r6, 24 asrs r0, 24 adds r2, r3, r0 @@ -424539,7 +424539,7 @@ _080DF80A: lsrs r6, r0, 24 asrs r5, r0, 24 cmp r5, 0x4 - ble _080DF80A + ble @080DF80A mov r0, r9 adds r1, r0, r5 movs r0, 0xFF @@ -424565,11 +424565,11 @@ _080DF80A: lsls r0, r1, 24 lsrs r7, r0, 24 cmp r7, 0x3 - bls _080DF7AE - b _080DF920 + bls @080DF7AE + b @080DF920 .align 2, 0 .pool -_080DF874: +@080DF874: movs r7, 0 mov r2, sp adds r2, 0x6 @@ -424578,7 +424578,7 @@ _080DF874: mov r9, r0 movs r1, 0x7 mov r10, r1 -_080DF884: +@080DF884: add r0, sp, 0x4 ldr r1, =0x085ed1b5 bl gf_strcpy @@ -424592,7 +424592,7 @@ _080DF884: movs r6, 0x7 adds r2, r7, 0x1 mov r8, r2 -_080DF8A0: +@080DF8A0: movs r1, 0x1 ands r1, r4 adds r0, r5, 0 @@ -424610,11 +424610,11 @@ _080DF8A0: movs r2, 0x1 negs r2, r2 cmp r0, r2 - bgt _080DF8A0 + bgt @080DF8A0 movs r6, 0 ldr r4, =0x02039f26 ldr r3, [sp, 0x30] -_080DF8CC: +@080DF8CC: lsls r0, r6, 24 asrs r0, 24 adds r2, r3, r0 @@ -424628,7 +424628,7 @@ _080DF8CC: lsrs r6, r0, 24 asrs r5, r0, 24 cmp r5, 0x4 - ble _080DF8CC + ble @080DF8CC mov r0, r9 adds r1, r0, r5 movs r0, 0xFF @@ -424654,10 +424654,10 @@ _080DF8CC: lsls r0, r1, 24 lsrs r7, r0, 24 cmp r7, 0x3 - bls _080DF884 -_080DF920: + bls @080DF884 +@080DF920: bl sub_80DB2BC -_080DF924: +@080DF924: add sp, 0x34 pop {r3-r5} mov r8, r3 @@ -424671,89 +424671,89 @@ _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 ldrb r0, [r4] cmp r0, 0xFC - bne _080DF956 + bne @080DF956 ldrb r0, [r4, 0x1] cmp r0, 0x15 - bne _080DF956 + bne @080DF956 movs r0, 0x2 - b _080DF9CC -_080DF956: + b @080DF9CC +@080DF956: adds r0, r4, 0 bl sub_8008C24 lsls r0, 16 lsrs r0, 16 cmp r0, 0x5 - bhi _080DF9CA + bhi @080DF9CA ldrb r0, [r4] cmp r0, 0xFF - beq _080DF9CA -_080DF96A: + beq @080DF9CA +@080DF96A: ldrb r1, [r4] adds r0, r1, 0 adds r0, 0x45 lsls r0, 24 lsrs r0, 24 cmp r0, 0x33 - bls _080DF9BE + bls @080DF9BE adds r0, r1, 0 adds r0, 0x5F lsls r0, 24 lsrs r0, 24 cmp r0, 0x9 - bls _080DF9BE + bls @080DF9BE adds r0, r1, 0 cmp r0, 0 - beq _080DF9BE + beq @080DF9BE cmp r0, 0xAD - beq _080DF9BE + beq @080DF9BE cmp r0, 0xB8 - beq _080DF9BE + beq @080DF9BE cmp r0, 0xAB - beq _080DF9BE + beq @080DF9BE cmp r0, 0xAC - beq _080DF9BE + beq @080DF9BE cmp r0, 0xB5 - beq _080DF9BE + beq @080DF9BE cmp r0, 0xB6 - beq _080DF9BE + beq @080DF9BE cmp r0, 0xBA - beq _080DF9BE + beq @080DF9BE cmp r0, 0xAE - beq _080DF9BE + beq @080DF9BE cmp r0, 0xB0 - beq _080DF9BE + beq @080DF9BE cmp r0, 0xB1 - beq _080DF9BE + beq @080DF9BE cmp r0, 0xB2 - beq _080DF9BE + beq @080DF9BE cmp r0, 0xB3 - beq _080DF9BE + beq @080DF9BE cmp r0, 0xB1 - bne _080DF9C8 -_080DF9BE: + bne @080DF9C8 +@080DF9BE: adds r4, 0x1 ldrb r0, [r4] cmp r0, 0xFF - bne _080DF96A - b _080DF9CA -_080DF9C8: + bne @080DF96A + b @080DF9CA +@080DF9C8: movs r5, 0x1 -_080DF9CA: +@080DF9CA: adds r0, r5, 0 -_080DF9CC: +@080DF9CC: pop {r4,r5} pop {r1} bx r1 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] @@ -424762,37 +424762,37 @@ 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 bl sub_8009370 cmp r4, 0x1 - bne _080DF9F8 + bne @080DF9F8 movs r0, 0xFF strb r0, [r5, 0x5] movs r0, 0xFC strb r0, [r5, 0xA] - b _080DFA00 -_080DF9F8: + b @080DFA00 +@080DF9F8: ldrb r1, [r5, 0x5] movs r0, 0xFF strb r0, [r5, 0x5] strb r1, [r5, 0xA] -_080DFA00: +@080DFA00: pop {r4,r5} pop {r0} bx r0 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 adds r4, r5, 0x2 cmp r6, 0x1 - bne _080DFA28 + bne @080DFA28 adds r0, r4, 0 bl sub_80DF940 adds r1, r0, 0 @@ -424800,24 +424800,24 @@ sub_80DFA08: @ 80DFA08 lsrs r1, 24 adds r0, r4, 0 bl sub_8009308 - b _080DFA3E -_080DFA28: + b @080DFA3E +@080DFA28: ldrb r0, [r4, 0xA] cmp r0, 0xFC - bne _080DFA38 + bne @080DFA38 adds r0, r4, 0 movs r1, 0x1 bl sub_8009308 - b _080DFA3E -_080DFA38: + b @080DFA3E +@080DFA38: strb r0, [r4, 0x5] movs r0, 0xFF strb r0, [r4, 0xA] -_080DFA3E: +@080DFA3E: adds r4, r5, 0 adds r4, 0xD cmp r6, 0x1 - bne _080DFA68 + bne @080DFA68 movs r0, 0xFF strb r0, [r4, 0x7] ldrb r0, [r4, 0x4] @@ -424834,21 +424834,21 @@ _080DFA3E: strb r0, [r4, 0x1] movs r0, 0xFC strb r0, [r5, 0xD] - b _080DFA70 -_080DFA68: + b @080DFA70 +@080DFA68: ldrb r0, [r4, 0x7] strb r0, [r4, 0x5] movs r0, 0xFF strb r0, [r4, 0x7] -_080DFA70: +@080DFA70: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_80DFA08 thumb_func_start CreateShopMainMenu -@ s8 CreateShopMainMenu(s8 type) -CreateShopMainMenu: @ 80DFA78 +; s8 CreateShopMainMenu(s8 type) +CreateShopMainMenu: ; 80DFA78 push {r4,r5,lr} sub sp, 0x10 adds r4, r0, 0 @@ -424858,7 +424858,7 @@ CreateShopMainMenu: @ 80DFA78 ldr r5, =0x02039f60 strb r4, [r5, 0xF] cmp r4, 0 - bne _080DFACC + bne @080DFACC ldr r0, =0x08589a38 ldr r1, [r0, 0x4] ldr r0, [r0] @@ -424879,10 +424879,10 @@ CreateShopMainMenu: @ 80DFA78 strb r0, [r5, 0xE] str r4, [r5, 0x4] movs r5, 0x3 - b _080DFAF8 + b @080DFAF8 .align 2, 0 .pool -_080DFACC: +@080DFACC: ldr r0, =0x08589a38 ldr r1, [r0, 0xC] ldr r0, [r0, 0x8] @@ -424903,7 +424903,7 @@ _080DFACC: strb r0, [r5, 0xE] str r4, [r5, 0x4] movs r5, 0x2 -_080DFAF8: +@080DFAF8: ldr r4, =0x02039f60 ldrb r0, [r4, 0xE] movs r1, 0 @@ -424935,8 +424935,8 @@ _080DFAF8: thumb_func_end CreateShopMainMenu thumb_func_start SetShopMenuCallback -@ void SetShopMenuCallback() -SetShopMenuCallback: @ 80DFB4C +; void SetShopMenuCallback() +SetShopMenuCallback: ; 80DFB4C ldr r1, =0x02039f60 str r0, [r1] bx lr @@ -424945,8 +424945,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 @@ -424955,8 +424955,8 @@ SetShopItemsForSale: @ 80DFB58 strh r2, [r3, 0xC] ldrh r0, [r1] cmp r0, 0 - beq _080DFB80 -_080DFB6A: + beq @080DFB80 +@080DFB6A: ldrh r0, [r3, 0xC] adds r0, 0x1 strh r0, [r3, 0xC] @@ -424967,8 +424967,8 @@ _080DFB6A: adds r0, r1 ldrh r0, [r0] cmp r0, 0 - bne _080DFB6A -_080DFB80: + bne @080DFB6A +@080DFB80: pop {r0} bx r0 .align 2, 0 @@ -424976,7 +424976,7 @@ _080DFB80: thumb_func_end SetShopItemsForSale thumb_func_start Task_ShopMenu -Task_ShopMenu: @ 80DFB88 +Task_ShopMenu: ; 80DFB88 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -424987,16 +424987,16 @@ Task_ShopMenu: @ 80DFB88 movs r0, 0x2 negs r0, r0 cmp r2, r0 - beq _080DFBC4 + beq @080DFBC4 adds r0, 0x1 cmp r2, r0 - bne _080DFBB4 + bne @080DFBB4 movs r0, 0x5 bl audio_play adds r0, r4, 0 bl HandleShopQuit - b _080DFBC4 -_080DFBB4: + b @080DFBC4 +@080DFBB4: ldr r0, =0x02039f60 ldr r1, [r0, 0x4] lsls r0, r2, 3 @@ -425004,7 +425004,7 @@ _080DFBB4: ldr r1, [r0, 0x4] adds r0, r5, 0 bl _call_via_r1 -_080DFBC4: +@080DFBC4: pop {r4,r5} pop {r0} bx r0 @@ -425013,7 +425013,7 @@ _080DFBC4: thumb_func_end Task_ShopMenu thumb_func_start HandleShopBuy -HandleShopBuy: @ 80DFBD0 +HandleShopBuy: ; 80DFBD0 push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -425041,7 +425041,7 @@ HandleShopBuy: @ 80DFBD0 thumb_func_end HandleShopBuy thumb_func_start HandleShopSell -HandleShopSell: @ 80DFC0C +HandleShopSell: ; 80DFC0C push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -425069,7 +425069,7 @@ HandleShopSell: @ 80DFC0C thumb_func_end HandleShopSell thumb_func_start sub_80DFC48 -sub_80DFC48: @ 80DFC48 +sub_80DFC48: ; 80DFC48 push {lr} ldr r0, =0x03005dac ldr r1, =sub_80DFCE0 + 1 @@ -425083,7 +425083,7 @@ sub_80DFC48: @ 80DFC48 thumb_func_end sub_80DFC48 thumb_func_start HandleShopQuit -HandleShopQuit: @ 80DFC68 +HandleShopQuit: ; 80DFC68 push {r4,r5,lr} adds r4, r0, 0 lsls r4, 24 @@ -425100,9 +425100,9 @@ HandleShopQuit: @ 80DFC68 bl remove_task ldr r5, [r5] cmp r5, 0 - beq _080DFC98 + beq @080DFC98 bl _call_via_r5 -_080DFC98: +@080DFC98: pop {r4,r5} pop {r0} bx r0 @@ -425111,7 +425111,7 @@ _080DFC98: thumb_func_end HandleShopQuit thumb_func_start sub_80DFCA4 -sub_80DFCA4: @ 80DFCA4 +sub_80DFCA4: ; 80DFCA4 push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 @@ -425125,7 +425125,7 @@ sub_80DFCA4: @ 80DFCA4 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080DFCD2 + bne @080DFCD2 adds r0, r2, 0 bl remove_task ldrh r0, [r4, 0x10] @@ -425133,7 +425133,7 @@ sub_80DFCA4: @ 80DFCA4 ldrh r1, [r4, 0x12] orrs r0, r1 bl set_callback2 -_080DFCD2: +@080DFCD2: pop {r4} pop {r0} bx r0 @@ -425142,7 +425142,7 @@ _080DFCD2: thumb_func_end sub_80DFCA4 thumb_func_start sub_80DFCE0 -sub_80DFCE0: @ 80DFCE0 +sub_80DFCE0: ; 80DFCE0 push {lr} bl pal_fill_black ldr r0, =sub_80DFCF8 + 1 @@ -425155,7 +425155,7 @@ sub_80DFCE0: @ 80DFCE0 thumb_func_end sub_80DFCE0 thumb_func_start sub_80DFCF8 -sub_80DFCF8: @ 80DFCF8 +sub_80DFCF8: ; 80DFCF8 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -425164,24 +425164,24 @@ sub_80DFCF8: @ 80DFCF8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080DFD36 + bne @080DFD36 ldr r0, =0x02039f60 ldrb r0, [r0, 0xF] cmp r0, 0x2 - bne _080DFD2C + bne @080DFD2C ldr r1, =0x085e95c7 ldr r2, =sub_80DFD44 + 1 adds r0, r4, 0 bl sub_81978EC - b _080DFD36 + b @080DFD36 .align 2, 0 .pool -_080DFD2C: +@080DFD2C: ldr r1, =0x085e959b ldr r2, =sub_80DFD44 + 1 adds r0, r5, 0 bl sub_81978EC -_080DFD36: +@080DFD36: pop {r4,r5} pop {r0} bx r0 @@ -425190,7 +425190,7 @@ _080DFD36: thumb_func_end sub_80DFCF8 thumb_func_start sub_80DFD44 -sub_80DFD44: @ 80DFD44 +sub_80DFD44: ; 80DFD44 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -425208,7 +425208,7 @@ sub_80DFD44: @ 80DFD44 thumb_func_end sub_80DFD44 thumb_func_start sub_80DFD64 -sub_80DFD64: @ 80DFD64 +sub_80DFD64: ; 80DFD64 push {lr} bl run_active_tasks bl call_obj_callbacks @@ -425220,7 +425220,7 @@ sub_80DFD64: @ 80DFD64 thumb_func_end sub_80DFD64 thumb_func_start sub_80DFD80 -sub_80DFD80: @ 80DFD80 +sub_80DFD80: ; 80DFD80 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -425230,7 +425230,7 @@ sub_80DFD80: @ 80DFD80 thumb_func_end sub_80DFD80 thumb_func_start sub_80DFD94 -sub_80DFD94: @ 80DFD94 +sub_80DFD94: ; 80DFD94 push {r4,r5,lr} sub sp, 0xC ldr r0, =0x030022c0 @@ -425239,11 +425239,11 @@ sub_80DFD94: @ 80DFD94 adds r5, r0, r1 ldrb r4, [r5] cmp r4, 0 - beq _080DFE20 + beq @080DFE20 cmp r4, 0x1 - bne _080DFDAC - b _080DFEE4 -_080DFDAC: + bne @080DFDAC + b @080DFEE4 +@080DFDAC: bl CreateShopMoneyBox bl sub_80E01C8 ldr r0, =sub_80E0AC8 + 1 @@ -425281,10 +425281,10 @@ _080DFDAC: bl SetVBlankCallback ldr r0, =sub_80DFD64 + 1 bl set_callback2 - b _080DFEF4 + b @080DFEF4 .align 2, 0 .pool -_080DFE20: +@080DFE20: bl vblank_hblank_handler_set_zero str r4, [sp, 0x8] movs r1, 0xE0 @@ -425352,19 +425352,19 @@ _080DFE20: bl bg_fill_tilemap_rect bl sub_80E0468 bl sub_80E0424 - b _080DFEEE + b @080DFEEE .align 2, 0 .pool -_080DFEE4: +@080DFEE4: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - bne _080DFEF4 -_080DFEEE: + bne @080DFEF4 +@080DFEEE: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] -_080DFEF4: +@080DFEF4: add sp, 0xC pop {r4,r5} pop {r0} @@ -425372,7 +425372,7 @@ _080DFEF4: thumb_func_end sub_80DFD94 thumb_func_start FreeShopItemNames -FreeShopItemNames: @ 80DFEFC +FreeShopItemNames: ; 80DFEFC push {lr} ldr r0, =0x02039f70 ldr r0, [r0] @@ -425391,7 +425391,7 @@ FreeShopItemNames: @ 80DFEFC thumb_func_end FreeShopItemNames thumb_func_start GetShopItemNames -GetShopItemNames: @ 80DFF2C +GetShopItemNames: ; 80DFF2C push {r4-r7,lr} ldr r7, =0x02039f74 ldr r4, =0x02039f60 @@ -425409,8 +425409,8 @@ GetShopItemNames: @ 80DFF2C movs r6, 0 ldrh r0, [r4, 0xC] cmp r6, r0 - bcs _080DFF78 -_080DFF54: + bcs @080DFF78 +@080DFF54: lsls r1, r6, 3 ldr r0, [r7] adds r0, r1 @@ -425427,8 +425427,8 @@ _080DFF54: lsrs r6, r0, 16 ldrh r2, [r4, 0xC] cmp r6, r2 - bcc _080DFF54 -_080DFF78: + bcc @080DFF54 +@080DFF78: ldr r4, =0x02039f78 lsls r5, r6, 4 ldr r0, [r4] @@ -425461,15 +425461,15 @@ _080DFF78: lsls r0, r1, 16 lsrs r0, 16 cmp r0, 0x8 - bls _080DFFDC + bls @080DFFDC movs r0, 0x8 strh r0, [r3, 0xE] - b _080DFFDE + b @080DFFDE .align 2, 0 .pool -_080DFFDC: +@080DFFDC: strh r1, [r3, 0xE] -_080DFFDE: +@080DFFDE: ldr r0, =0x02039f70 ldr r0, [r0] ldr r1, =0x03006310 @@ -425485,8 +425485,8 @@ _080DFFDE: thumb_func_end GetShopItemNames thumb_func_start GetShopItemName -@ void GetShopItemName(ShopItem *items1, s16 itemId, char *name) -GetShopItemName: @ 80E0000 +; void GetShopItemName(ShopItem *items1, s16 itemId, char *name) +GetShopItemName: ; 80E0000 push {r4-r6,lr} adds r6, r0, 0 adds r5, r2, 0 @@ -425495,20 +425495,20 @@ GetShopItemName: @ 80E0000 ldr r0, =0x02039f60 ldrb r0, [r0, 0xF] cmp r0, 0 - bne _080E0020 + bne @080E0020 adds r0, r4, 0 adds r1, r5, 0 bl itemid_get_name - b _080E002C + b @080E002C .align 2, 0 .pool -_080E0020: +@080E0020: lsls r1, r4, 5 ldr r0, =0x085a5c09 adds r1, r0 adds r0, r5, 0 bl gf_strcpy -_080E002C: +@080E002C: str r5, [r6] str r4, [r6, 0x4] pop {r4-r6} @@ -425519,7 +425519,7 @@ _080E002C: thumb_func_end GetShopItemName thumb_func_start PrintShopItemDescription -PrintShopItemDescription: @ 80E003C +PrintShopItemDescription: ; 80E003C push {r4-r7,lr} mov r7, r8 push {r7} @@ -425528,14 +425528,14 @@ PrintShopItemDescription: @ 80E003C lsls r1, 24 lsrs r1, 24 cmp r1, 0x1 - beq _080E0054 + beq @080E0054 movs r0, 0x5 bl audio_play -_080E0054: +@080E0054: movs r0, 0x2 negs r0, r0 cmp r7, r0 - beq _080E0078 + beq @080E0078 lsls r4, r7, 16 lsrs r0, r4, 16 ldr r1, =0x02039f70 @@ -425544,10 +425544,10 @@ _080E0054: adds r1, r2 ldrb r1, [r1] bl AddItemIconObjectInShop - b _080E008A + b @080E008A .align 2, 0 .pool -_080E0078: +@080E0078: ldr r0, =0x0000ffff ldr r1, =0x02039f70 ldr r1, [r1] @@ -425556,7 +425556,7 @@ _080E0078: ldrb r1, [r1] bl AddItemIconObjectInShop lsls r4, r7, 16 -_080E008A: +@080E008A: lsrs r4, 16 mov r8, r4 ldr r6, =0x02039f70 @@ -425577,29 +425577,29 @@ _080E008A: movs r0, 0x2 negs r0, r0 cmp r7, r0 - beq _080E00E8 + beq @080E00E8 ldr r0, =0x02039f60 ldrb r0, [r0, 0xF] cmp r0, 0 - bne _080E00D8 + bne @080E00D8 mov r0, r8 bl itemid_get_description adds r4, r0, 0 - b _080E00EA + b @080E00EA .align 2, 0 .pool -_080E00D8: +@080E00D8: ldr r0, =0x085a5c08 lsls r1, r7, 5 adds r0, 0x18 adds r1, r0 ldr r4, [r1] - b _080E00EA + b @080E00EA .align 2, 0 .pool -_080E00E8: +@080E00E8: ldr r4, =0x085e93e0 -_080E00EA: +@080E00EA: movs r0, 0x2 movs r1, 0 bl Window_FastFillPixels @@ -425622,7 +425622,7 @@ _080E00EA: thumb_func_end PrintShopItemDescription thumb_func_start PrintShopBuyPrice -PrintShopBuyPrice: @ 80E0114 +PrintShopBuyPrice: ; 80E0114 push {r4-r7,lr} sub sp, 0x14 lsls r0, 24 @@ -425632,11 +425632,11 @@ PrintShopBuyPrice: @ 80E0114 movs r0, 0x2 negs r0, r0 cmp r1, r0 - beq _080E01AC + beq @080E01AC ldr r0, =0x02039f60 ldrb r0, [r0, 0xF] cmp r0, 0 - bne _080E0164 + bne @080E0164 ldr r5, =0x02021cc4 lsls r0, r1, 16 lsrs r0, 16 @@ -425654,10 +425654,10 @@ PrintShopBuyPrice: @ 80E0114 movs r2, 0 movs r3, 0x5 bl decimal_int_to_string - b _080E0176 + b @080E0176 .align 2, 0 .pool -_080E0164: +@080E0164: ldr r0, =0x02021cc4 ldr r2, =0x085a5c08 lsls r1, 5 @@ -425666,7 +425666,7 @@ _080E0164: movs r2, 0 movs r3, 0x5 bl decimal_int_to_string -_080E0176: +@080E0176: ldr r4, =0x02021fc4 ldr r1, =0x085e969c adds r0, r4, 0 @@ -425691,7 +425691,7 @@ _080E0176: movs r1, 0x7 adds r3, r7, 0 bl sub_8199EEC -_080E01AC: +@080E01AC: add sp, 0x14 pop {r4-r7} pop {r0} @@ -425701,7 +425701,7 @@ _080E01AC: thumb_func_end PrintShopBuyPrice thumb_func_start sub_80E01C8 -sub_80E01C8: @ 80E01C8 +sub_80E01C8: ; 80E01C8 push {r4,r5,lr} sub sp, 0x10 ldr r5, =0x02039f70 @@ -425710,12 +425710,12 @@ sub_80E01C8: @ 80E01C8 adds r0, r2, r4 ldrb r0, [r0] cmp r0, 0xFF - bne _080E0206 + bne @080E0206 ldr r0, =0x02039f60 ldrh r1, [r0, 0xC] adds r0, r1, 0x1 cmp r0, 0x8 - ble _080E0206 + ble @080E0206 subs r0, r1, 0x7 str r0, [sp] ldr r0, =0x00000834 @@ -425732,7 +425732,7 @@ sub_80E01C8: @ 80E01C8 ldr r1, [r5] adds r1, r4 strb r0, [r1] -_080E0206: +@080E0206: add sp, 0x10 pop {r4,r5} pop {r0} @@ -425742,7 +425742,7 @@ _080E0206: thumb_func_end sub_80E01C8 thumb_func_start sub_80E0224 -sub_80E0224: @ 80E0224 +sub_80E0224: ; 80E0224 push {r4,lr} ldr r4, =0x02039f70 ldr r0, [r4] @@ -425750,14 +425750,14 @@ sub_80E0224: @ 80E0224 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xFF - beq _080E0242 + beq @080E0242 bl sub_81AF620 ldr r0, [r4] ldr r1, =0x0000200b adds r0, r1 movs r1, 0xFF strb r1, [r0] -_080E0242: +@080E0242: pop {r4} pop {r0} bx r0 @@ -425766,7 +425766,7 @@ _080E0242: thumb_func_end sub_80E0224 thumb_func_start sub_80E0250 -sub_80E0250: @ 80E0250 +sub_80E0250: ; 80E0250 push {r4,lr} sub sp, 0x8 adds r4, r1, 0 @@ -425794,7 +425794,7 @@ sub_80E0250: @ 80E0250 thumb_func_end sub_80E0250 thumb_func_start AddItemIconObjectInShop -AddItemIconObjectInShop: @ 80E0284 +AddItemIconObjectInShop: ; 80E0284 push {r4,lr} sub sp, 0x8 lsls r0, 16 @@ -425808,15 +425808,15 @@ AddItemIconObjectInShop: @ 80E0284 adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0xFF - bne _080E0310 + bne @080E0310 ldr r0, =0x02039f60 ldrb r0, [r0, 0xF] cmp r0, 0 - beq _080E02AE + beq @080E02AE ldr r0, =0x0000ffff cmp r2, r0 - bne _080E02F0 -_080E02AE: + bne @080E02F0 +@080E02AE: ldr r0, =0x0000083e adds r1, r3, r0 adds r0, r1, 0 @@ -425824,7 +425824,7 @@ _080E02AE: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq _080E0310 + beq @080E0310 strb r2, [r4] ldr r1, =0x02020630 lsls r0, r2, 4 @@ -425835,10 +425835,10 @@ _080E02AE: strh r1, [r0, 0x24] movs r1, 0x58 strh r1, [r0, 0x26] - b _080E0310 + b @080E0310 .align 2, 0 .pool -_080E02F0: +@080E02F0: lsls r0, r2, 24 lsrs r0, 24 ldr r2, =0x0000083e @@ -425852,9 +425852,9 @@ _080E02F0: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq _080E0310 + beq @080E0310 strb r2, [r4] -_080E0310: +@080E0310: add sp, 0x8 pop {r4} pop {r0} @@ -425864,7 +425864,7 @@ _080E0310: thumb_func_end AddItemIconObjectInShop thumb_func_start sub_80E031C -sub_80E031C: @ 80E031C +sub_80E031C: ; 80E031C push {r4,r5,lr} lsls r1, 24 lsrs r4, r1, 24 @@ -425875,7 +425875,7 @@ sub_80E031C: @ 80E031C adds r5, r0, r1 ldrb r0, [r5] cmp r0, 0xFF - beq _080E0356 + beq @080E0356 ldr r0, =0x0000083e adds r4, r0 adds r0, r4, 0 @@ -425891,7 +425891,7 @@ sub_80E031C: @ 80E031C bl obj_delete_and_free_tiles movs r0, 0xFF strb r0, [r5] -_080E0356: +@080E0356: pop {r4,r5} pop {r0} bx r0 @@ -425900,7 +425900,7 @@ _080E0356: thumb_func_end sub_80E031C thumb_func_start sub_80E036C -sub_80E036C: @ 80E036C +sub_80E036C: ; 80E036C push {r4,lr} movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags @@ -425974,7 +425974,7 @@ sub_80E036C: @ 80E036C thumb_func_end sub_80E036C thumb_func_start sub_80E0424 -sub_80E0424: @ 80E0424 +sub_80E0424: ; 80E0424 push {lr} sub sp, 0x4 ldr r1, =0x08d9afbc @@ -426001,7 +426001,7 @@ sub_80E0424: @ 80E0424 thumb_func_end sub_80E0424 thumb_func_start sub_80E0468 -sub_80E0468: @ 80E0468 +sub_80E0468: ; 80E0468 push {lr} ldr r0, =0x08589a70 bl Window_InitFromTemplates @@ -426027,7 +426027,7 @@ sub_80E0468: @ 80E0468 thumb_func_end sub_80E0468 thumb_func_start sub_80E04A4 -sub_80E04A4: @ 80E04A4 +sub_80E04A4: ; 80E04A4 push {r4-r6,lr} sub sp, 0x14 ldr r6, [sp, 0x24] @@ -426063,7 +426063,7 @@ sub_80E04A4: @ 80E04A4 thumb_func_end sub_80E04A4 thumb_func_start sub_80E04E8 -sub_80E04E8: @ 80E04E8 +sub_80E04E8: ; 80E04E8 push {r4-r6,lr} sub sp, 0x10 adds r4, r0, 0 @@ -426093,7 +426093,7 @@ sub_80E04E8: @ 80E04E8 thumb_func_end sub_80E04E8 thumb_func_start CreateShopMoneyBox -CreateShopMoneyBox: @ 80E0524 +CreateShopMoneyBox: ; 80E0524 push {lr} bl sub_80E0570 bl sub_80E0A40 @@ -426126,7 +426126,7 @@ CreateShopMoneyBox: @ 80E0524 thumb_func_end CreateShopMoneyBox thumb_func_start sub_80E0570 -sub_80E0570: @ 80E0570 +sub_80E0570: ; 80E0570 push {lr} bl sub_80E075C bl sub_80E08F0 @@ -426136,7 +426136,7 @@ sub_80E0570: @ 80E0570 thumb_func_end sub_80E0570 thumb_func_start sub_80E0584 -sub_80E0584: @ 80E0584 +sub_80E0584: ; 80E0584 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -426161,12 +426161,12 @@ sub_80E0584: @ 80E0584 strh r0, [r4] movs r1, 0 mov r10, r4 -_080E05B6: +@080E05B6: movs r4, 0 lsls r7, r1, 16 asrs r0, r7, 16 mov r8, r0 -_080E05BE: +@080E05BE: mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -426186,7 +426186,7 @@ _080E05BE: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080E0608 + bne @080E0608 mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -426198,15 +426198,15 @@ _080E05BE: bl cur_mapdata_block_get_bgs_at lsls r0, 24 lsrs r5, r0, 24 - b _080E060A + b @080E060A .align 2, 0 .pool -_080E0608: +@080E0608: movs r5, 0x1 -_080E060A: +@080E060A: ldr r0, =0x000001ff cmp r6, r0 - bhi _080E062C + bhi @080E062C asrs r0, r4, 16 mov r2, r9 ldr r1, [r2, 0x10] @@ -426216,10 +426216,10 @@ _080E060A: asrs r1, r7, 16 adds r3, r5, 0 bl sub_80E0670 - b _080E0644 + b @080E0644 .align 2, 0 .pool -_080E062C: +@080E062C: asrs r0, r4, 16 mov r3, r9 ldr r2, [r3, 0x14] @@ -426231,19 +426231,19 @@ _080E062C: asrs r1, r7, 16 adds r3, r5, 0 bl sub_80E0670 -_080E0644: +@080E0644: movs r1, 0x80 lsls r1, 9 adds r0, r4, r1 lsrs r4, r0, 16 asrs r0, 16 cmp r0, 0xE - ble _080E05BE + ble @080E05BE adds r0, r7, r1 lsrs r1, r0, 16 asrs r0, 16 cmp r0, 0x9 - ble _080E05B6 + ble @080E05B6 add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -426257,7 +426257,7 @@ _080E0644: thumb_func_end sub_80E0584 thumb_func_start sub_80E0670 -sub_80E0670: @ 80E0670 +sub_80E0670: ; 80E0670 push {r4-r7,lr} adds r7, r2, 0 lsls r3, 24 @@ -426268,17 +426268,17 @@ sub_80E0670: @ 80E0670 lsls r1, 22 lsrs r1, 16 cmp r3, 0x1 - beq _080E06C0 + beq @080E06C0 cmp r3, 0x1 - bgt _080E0690 + bgt @080E0690 cmp r3, 0 - beq _080E0696 - b _080E0728 -_080E0690: + beq @080E0696 + b @080E0728 +@080E0690: cmp r2, 0x2 - beq _080E06F8 - b _080E0728 -_080E0696: + beq @080E06F8 + b @080E0728 +@080E0696: ldr r6, =0x02039f70 ldr r0, [r6] movs r2, 0xC0 @@ -426295,10 +426295,10 @@ _080E0696: ldr r0, [r6] movs r1, 0x80 lsls r1, 4 - b _080E06E2 + b @080E06E2 .align 2, 0 .pool -_080E06C0: +@080E06C0: ldr r6, =0x02039f70 ldr r0, [r6] movs r2, 0x80 @@ -426315,17 +426315,17 @@ _080E06C0: ldr r0, [r6] movs r1, 0xC0 lsls r1, 5 -_080E06E2: +@080E06E2: adds r0, r1 adds r3, r7, 0 adds r3, 0x8 adds r1, r5, 0 adds r2, r4, 0 bl sub_80E0734 - b _080E0728 + b @080E0728 .align 2, 0 .pool -_080E06F8: +@080E06F8: ldr r6, =0x02039f70 ldr r0, [r6] movs r2, 0x80 @@ -426348,7 +426348,7 @@ _080E06F8: adds r1, r5, 0 adds r2, r4, 0 bl sub_80E0734 -_080E0728: +@080E0728: pop {r4-r7} pop {r0} bx r0 @@ -426357,7 +426357,7 @@ _080E0728: thumb_func_end sub_80E0670 thumb_func_start sub_80E0734 -sub_80E0734: @ 80E0734 +sub_80E0734: ; 80E0734 lsls r1, 16 asrs r1, 16 lsls r2, 16 @@ -426380,7 +426380,7 @@ sub_80E0734: @ 80E0734 thumb_func_end sub_80E0734 thumb_func_start sub_80E075C -sub_80E075C: @ 80E075C +sub_80E075C: ; 80E075C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -426398,7 +426398,7 @@ sub_80E075C: @ 80E075C ldr r5, =0x02039f70 ldr r3, =0x00002010 movs r2, 0x10 -_080E0780: +@080E0780: ldr r1, [r5] lsls r0, r7, 2 adds r0, r7 @@ -426410,18 +426410,18 @@ _080E0780: lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0xF - bls _080E0780 + bls @080E0780 movs r7, 0 str r4, [sp, 0x8] ldr r1, =0x02039f70 mov r9, r1 mov r2, sp str r2, [sp, 0x4] -_080E07A4: +@080E07A4: movs r3, 0 adds r4, r7, 0x1 str r4, [sp, 0xC] -_080E07AA: +@080E07AA: ldr r1, =0x0000fffc adds r0, r3, r1 ldr r2, [sp, 0x4] @@ -426442,7 +426442,7 @@ _080E07AA: lsrs r6, r0, 24 ldr r3, [sp, 0x10] cmp r6, 0x10 - beq _080E08C2 + beq @080E08C2 mov r4, r9 ldr r1, [r4] mov r0, r8 @@ -426496,43 +426496,43 @@ _080E07AA: lsrs r0, 28 ldr r3, [sp, 0x10] cmp r0, 0x2 - beq _080E0884 + beq @080E0884 cmp r0, 0x2 - bgt _080E0870 + bgt @080E0870 cmp r0, 0x1 - beq _080E0876 - b _080E08A4 + beq @080E0876 + b @080E08A4 .align 2, 0 .pool -_080E0870: +@080E0870: cmp r0, 0x3 - beq _080E0894 - b _080E08A4 -_080E0876: + beq @080E0894 + b @080E08A4 +@080E0876: ldr r4, =0x00002016 adds r0, r2, r4 adds r0, r5 mov r1, r10 - b _080E08B6 + b @080E08B6 .align 2, 0 .pool -_080E0884: +@080E0884: ldr r4, =0x00002016 adds r0, r2, r4 adds r0, r5 movs r1, 0x1 - b _080E08B6 + b @080E08B6 .align 2, 0 .pool -_080E0894: +@080E0894: ldr r1, =0x00002016 adds r0, r2, r1 adds r0, r5 movs r1, 0x2 - b _080E08B6 + b @080E08B6 .align 2, 0 .pool -_080E08A4: +@080E08A4: mov r2, r9 ldr r0, [r2] mov r2, r8 @@ -426542,28 +426542,28 @@ _080E08A4: adds r0, r4 adds r0, r1 movs r1, 0x3 -_080E08B6: +@080E08B6: strh r1, [r0] mov r0, r8 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r8, r0 -_080E08C2: +@080E08C2: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x6 - bhi _080E08CE - b _080E07AA -_080E08CE: + bhi @080E08CE + b @080E07AA +@080E08CE: ldr r1, [sp, 0xC] lsls r0, r1, 24 lsrs r7, r0, 24 cmp r7, 0x4 - bhi _080E08DA - b _080E07A4 -_080E08DA: + bhi @080E08DA + b @080E07A4 +@080E08DA: add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -426577,7 +426577,7 @@ _080E08DA: thumb_func_end sub_80E075C thumb_func_start sub_80E08F0 -sub_80E08F0: @ 80E08F0 +sub_80E08F0: ; 80E08F0 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -426591,7 +426591,7 @@ sub_80E08F0: @ 80E08F0 mov r10, r1 ldr r2, =0x02020630 mov r9, r2 -_080E090A: +@080E090A: mov r3, r8 ldr r0, [r3] lsls r1, r7, 2 @@ -426603,7 +426603,7 @@ _080E090A: movs r2, 0 ldrsh r0, [r1, r2] cmp r0, 0x10 - beq _080E09D8 + beq @080E09D8 adds r1, r0, 0 lsls r0, r1, 3 adds r0, r1 @@ -426662,7 +426662,7 @@ _080E090A: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080E09C0 + bne @080E09C0 lsls r2, r4, 4 adds r2, r4 lsls r2, 2 @@ -426680,7 +426680,7 @@ _080E090A: movs r1, 0x40 orrs r0, r1 strb r0, [r2] -_080E09C0: +@080E09C0: lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -426692,12 +426692,12 @@ _080E09C0: adds r1, r5 ldrb r1, [r1] bl obj_anim_image_start -_080E09D8: +@080E09D8: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0xF - bls _080E090A + bls @080E090A add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -426711,7 +426711,7 @@ _080E09D8: thumb_func_end sub_80E08F0 thumb_func_start sub_80E0A14 -sub_80E0A14: @ 80E0A14 +sub_80E0A14: ; 80E0A14 push {r4,lr} adds r4, r0, 0 movs r1, 0x2 @@ -426722,23 +426722,23 @@ sub_80E0A14: @ 80E0A14 bl sub_80E0A88 lsls r0, 24 cmp r0, 0 - bne _080E0A38 + bne @080E0A38 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080E0A38 + beq @080E0A38 movs r0, 0x1 - b _080E0A3A -_080E0A38: + b @080E0A3A +@080E0A38: movs r0, 0 -_080E0A3A: +@080E0A3A: pop {r4} pop {r1} bx r1 thumb_func_end sub_80E0A14 thumb_func_start sub_80E0A40 -sub_80E0A40: @ 80E0A40 +sub_80E0A40: ; 80E0A40 push {r4-r6,lr} ldr r0, =0x02039f70 ldr r0, [r0] @@ -426750,24 +426750,24 @@ sub_80E0A40: @ 80E0A40 ldr r0, =0x0000c3e3 adds r6, r0, 0 ldr r5, =0x000003ff -_080E0A56: +@080E0A56: lsls r0, r1, 16 asrs r2, r0, 16 lsls r1, r2, 1 adds r0, r1, r3 ldrh r0, [r0] cmp r0, 0 - beq _080E0A6A + beq @080E0A6A adds r1, r4 adds r0, r6 strh r0, [r1] -_080E0A6A: +@080E0A6A: adds r0, r2, 0x1 lsls r0, 16 lsrs r1, r0, 16 asrs r0, 16 cmp r0, r5 - ble _080E0A56 + ble @080E0A56 pop {r4-r6} pop {r0} bx r0 @@ -426776,7 +426776,7 @@ _080E0A6A: thumb_func_end sub_80E0A40 thumb_func_start sub_80E0A88 -sub_80E0A88: @ 80E0A88 +sub_80E0A88: ; 80E0A88 push {lr} ldr r2, =0x02039f70 ldr r2, [r2] @@ -426787,33 +426787,33 @@ sub_80E0A88: @ 80E0A88 adds r1, r2 ldrh r0, [r1] cmp r0, 0 - bne _080E0AC0 + bne @080E0AC0 adds r0, r1, 0 adds r0, 0x40 ldrh r0, [r0] cmp r0, 0 - bne _080E0AC0 + bne @080E0AC0 ldrh r0, [r1, 0x2] cmp r0, 0 - bne _080E0AC0 + bne @080E0AC0 adds r0, r1, 0 adds r0, 0x42 ldrh r0, [r0] cmp r0, 0 - bne _080E0AC0 + bne @080E0AC0 movs r0, 0x1 - b _080E0AC2 + b @080E0AC2 .align 2, 0 .pool -_080E0AC0: +@080E0AC0: movs r0, 0 -_080E0AC2: +@080E0AC2: pop {r1} bx r1 thumb_func_end sub_80E0A88 thumb_func_start sub_80E0AC8 -sub_80E0AC8: @ 80E0AC8 +sub_80E0AC8: ; 80E0AC8 push {r4-r7,lr} mov r7, r8 push {r7} @@ -426829,9 +426829,9 @@ sub_80E0AC8: @ 80E0AC8 movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080E0AEA - b _080E0C8E -_080E0AEA: + beq @080E0AEA + b @080E0C8E +@080E0AEA: ldrb r0, [r4, 0xE] bl sub_81AE604 adds r5, r0, 0 @@ -426846,20 +426846,20 @@ _080E0AEA: movs r0, 0x2 negs r0, r0 cmp r5, r0 - beq _080E0B24 + beq @080E0B24 adds r0, 0x1 cmp r5, r0 - bne _080E0B32 - b _080E0C8E + bne @080E0B32 + b @080E0C8E .align 2, 0 .pool -_080E0B24: +@080E0B24: movs r0, 0x5 bl audio_play adds r0, r6, 0 bl sub_80E1168 - b _080E0C8E -_080E0B32: + b @080E0C8E +@080E0B32: movs r0, 0x5 bl audio_play strh r5, [r4, 0xA] @@ -426872,7 +426872,7 @@ _080E0B32: ldr r0, =0x02039f60 ldrb r0, [r0, 0xF] cmp r0, 0 - bne _080E0B80 + bne @080E0B80 lsls r0, r5, 16 lsrs r0, 16 bl itemid_get_market_price @@ -426889,10 +426889,10 @@ _080E0B32: lsrs r0, 24 asrs r4, r0 str r4, [r1] - b _080E0B92 + b @080E0B92 .align 2, 0 .pool -_080E0B80: +@080E0B80: ldr r1, [r7] movs r3, 0x80 lsls r3, 6 @@ -426902,7 +426902,7 @@ _080E0B80: adds r0, r2 ldrh r0, [r0, 0x14] str r0, [r1] -_080E0B92: +@080E0B92: ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x92 @@ -426918,17 +426918,17 @@ _080E0B92: bl is_money_greater_than lsls r0, 24 cmp r0, 0 - bne _080E0BD0 + bne @080E0BD0 ldr r1, =0x085e9539 ldr r2, =sub_80E10A0 + 1 - b _080E0C28 + b @080E0C28 .align 2, 0 .pool -_080E0BD0: +@080E0BD0: ldr r4, =0x02039f60 ldrb r0, [r4, 0xF] cmp r0, 0 - bne _080E0C38 + bne @080E0C38 lsls r0, r5, 16 lsrs r5, r0, 16 ldr r1, =0x02021cc4 @@ -426939,7 +426939,7 @@ _080E0BD0: lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bne _080E0C24 + bne @080E0C24 ldr r4, =0x02021dc4 adds r0, r5, 0 bl sub_81B6CFC @@ -426952,20 +426952,20 @@ _080E0BD0: adds r0, r4, 0 bl gf_strcpy ldr r1, =0x085e9417 - b _080E0C26 + b @080E0C26 .align 2, 0 .pool -_080E0C24: +@080E0C24: ldr r1, =0x085e93ef -_080E0C26: +@080E0C26: ldr r2, =sub_80E0CA4 + 1 -_080E0C28: +@080E0C28: adds r0, r6, 0 bl sub_80E04E8 - b _080E0C8E + b @080E0C8E .align 2, 0 .pool -_080E0C38: +@080E0C38: ldr r0, =0x02021cc4 lsls r1, r5, 5 ldr r2, =0x085a5c09 @@ -426981,23 +426981,23 @@ _080E0C38: bl decimal_int_to_string ldrb r0, [r4, 0xF] cmp r0, 0x1 - bne _080E0C7C + bne @080E0C7C ldr r0, =0x02021fc4 ldr r1, =0x085e9468 bl ExpandTextCodes - b _080E0C84 + b @080E0C84 .align 2, 0 .pool -_080E0C7C: +@080E0C7C: ldr r0, =0x02021fc4 ldr r1, =0x085e9493 bl ExpandTextCodes -_080E0C84: +@080E0C84: ldr r1, =0x02021fc4 ldr r2, =sub_80E0EAC + 1 adds r0, r6, 0 bl sub_80E04E8 -_080E0C8E: +@080E0C8E: pop {r3} mov r8, r3 pop {r4-r7} @@ -427008,7 +427008,7 @@ _080E0C8E: thumb_func_end sub_80E0AC8 thumb_func_start sub_80E0CA4 -sub_80E0CA4: @ 80E0CA4 +sub_80E0CA4: ; 80E0CA4 push {r4-r6,lr} sub sp, 0x8 lsls r0, 24 @@ -427072,19 +427072,19 @@ sub_80E0CA4: @ 80E0CA4 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x63 - bls _080E0D60 + bls @080E0D60 ldr r0, =0x0000200a adds r1, r4, r0 movs r0, 0x63 strb r0, [r1] - b _080E0D66 + b @080E0D66 .align 2, 0 .pool -_080E0D60: +@080E0D60: ldr r2, =0x0000200a adds r0, r4, r2 strb r1, [r0] -_080E0D66: +@080E0D66: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -427101,7 +427101,7 @@ _080E0D66: thumb_func_end sub_80E0CA4 thumb_func_start sub_80E0D88 -sub_80E0D88: @ 80E0D88 +sub_80E0D88: ; 80E0D88 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 @@ -427121,7 +427121,7 @@ sub_80E0D88: @ 80E0D88 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080E0DF0 + bne @080E0DF0 ldrh r0, [r5, 0xA] bl itemid_get_market_price adds r4, r0, 0 @@ -427142,16 +427142,16 @@ sub_80E0D88: @ 80E0D88 str r0, [r1] adds r0, r6, 0 bl sub_80E10EC - b _080E0EA4 + b @080E0EA4 .align 2, 0 .pool -_080E0DF0: +@080E0DF0: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080E0E74 + beq @080E0E74 movs r0, 0x5 bl audio_play movs r0, 0x4 @@ -427188,14 +427188,14 @@ _080E0DF0: ldr r2, =sub_80E0EAC + 1 adds r0, r6, 0 bl sub_80E04E8 - b _080E0EA4 + b @080E0EA4 .align 2, 0 .pool -_080E0E74: +@080E0E74: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080E0EA4 + beq @080E0EA4 movs r0, 0x5 bl audio_play movs r0, 0x4 @@ -427210,14 +427210,14 @@ _080E0E74: bl Window_FillTileMap adds r0, r4, 0 bl sub_80E10A0 -_080E0EA4: +@080E0EA4: pop {r4-r7} pop {r0} bx r0 thumb_func_end sub_80E0D88 thumb_func_start sub_80E0EAC -sub_80E0EAC: @ 80E0EAC +sub_80E0EAC: ; 80E0EAC push {lr} sub sp, 0x10 lsls r0, 24 @@ -427242,7 +427242,7 @@ sub_80E0EAC: @ 80E0EAC thumb_func_end sub_80E0EAC thumb_func_start sub_80E0EDC -sub_80E0EDC: @ 80E0EDC +sub_80E0EDC: ; 80E0EDC push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -427257,58 +427257,58 @@ sub_80E0EDC: @ 80E0EDC ldr r6, =0x02039f60 ldrb r0, [r6, 0xF] cmp r0, 0 - bne _080E0F40 + bne @080E0F40 ldrh r0, [r4, 0xA] ldrh r1, [r4, 0x2] bl bag_add_item lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080E0F30 + bne @080E0F30 ldr r1, =0x085e94c5 ldr r2, =sub_80E0F88 + 1 adds r0, r5, 0 bl sub_80E04E8 adds r0, r5, 0 bl sub_80E1204 - b _080E0F7A + b @080E0F7A .align 2, 0 .pool -_080E0F30: +@080E0F30: ldr r1, =0x085e9558 ldr r2, =sub_80E10A0 + 1 - b _080E0F60 + b @080E0F60 .align 2, 0 .pool -_080E0F40: +@080E0F40: ldrb r0, [r4, 0xA] bl sub_8161960 lsls r0, 24 cmp r0, 0 - beq _080E0F70 + beq @080E0F70 ldrb r0, [r6, 0xF] cmp r0, 0x1 - bne _080E0F5C + bne @080E0F5C ldr r1, =0x085e94e7 - b _080E0F5E + b @080E0F5E .align 2, 0 .pool -_080E0F5C: +@080E0F5C: ldr r1, =0x085e9510 -_080E0F5E: +@080E0F5E: ldr r2, =sub_80E0F88 + 1 -_080E0F60: +@080E0F60: adds r0, r5, 0 bl sub_80E04E8 - b _080E0F7A + b @080E0F7A .align 2, 0 .pool -_080E0F70: +@080E0F70: ldr r1, =0x085e957f ldr r2, =sub_80E10A0 + 1 adds r0, r7, 0 bl sub_80E04E8 -_080E0F7A: +@080E0F7A: pop {r4-r7} pop {r0} bx r0 @@ -427317,7 +427317,7 @@ _080E0F7A: thumb_func_end sub_80E0EDC thumb_func_start sub_80E0F88 -sub_80E0F88: @ 80E0F88 +sub_80E0F88: ; 80E0F88 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 @@ -427347,24 +427347,24 @@ sub_80E0F88: @ 80E0F88 ldr r0, =0x02039f60 ldrb r0, [r0, 0xF] cmp r0, 0 - bne _080E0FF0 + bne @080E0FF0 ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 ldr r0, =sub_80E100C + 1 - b _080E0FFC + b @080E0FFC .align 2, 0 .pool -_080E0FF0: +@080E0FF0: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 ldr r0, =sub_80E1078 + 1 -_080E0FFC: +@080E0FFC: str r0, [r1] pop {r4-r6} pop {r0} @@ -427374,7 +427374,7 @@ _080E0FFC: thumb_func_end sub_80E0F88 thumb_func_start sub_80E100C -sub_80E100C: @ 80E100C +sub_80E100C: ; 80E100C push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -427388,42 +427388,42 @@ sub_80E100C: @ 80E100C movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _080E1072 + beq @080E1072 movs r0, 0x5 bl audio_play movs r1, 0xA ldrsh r0, [r5, r1] cmp r0, 0x4 - bne _080E106C + bne @080E106C movs r1, 0x2 ldrsh r0, [r5, r1] cmp r0, 0x9 - ble _080E106C + ble @080E106C movs r0, 0xC movs r1, 0x1 bl bag_add_item lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080E106C + bne @080E106C ldr r1, =0x085e95ea ldr r2, =sub_80E10A0 + 1 adds r0, r4, 0 bl sub_80E04E8 - b _080E1072 + b @080E1072 .align 2, 0 .pool -_080E106C: +@080E106C: adds r0, r4, 0 bl sub_80E10A0 -_080E1072: +@080E1072: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_80E100C thumb_func_start sub_80E1078 -sub_80E1078: @ 80E1078 +sub_80E1078: ; 80E1078 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -427432,12 +427432,12 @@ sub_80E1078: @ 80E1078 movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _080E1096 + beq @080E1096 movs r0, 0x5 bl audio_play adds r0, r4, 0 bl sub_80E10A0 -_080E1096: +@080E1096: pop {r4} pop {r0} bx r0 @@ -427446,7 +427446,7 @@ _080E1096: thumb_func_end sub_80E1078 thumb_func_start sub_80E10A0 -sub_80E10A0: @ 80E10A0 +sub_80E10A0: ; 80E10A0 push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 @@ -427480,7 +427480,7 @@ sub_80E10A0: @ 80E10A0 thumb_func_end sub_80E10A0 thumb_func_start sub_80E10EC -sub_80E10EC: @ 80E10EC +sub_80E10EC: ; 80E10EC push {r4,lr} sub sp, 0x8 lsls r0, 24 @@ -427532,7 +427532,7 @@ sub_80E10EC: @ 80E10EC thumb_func_end sub_80E10EC thumb_func_start sub_80E1168 -sub_80E1168: @ 80E1168 +sub_80E1168: ; 80E1168 push {r4,lr} sub sp, 0x4 adds r4, r0, 0 @@ -427564,7 +427564,7 @@ sub_80E1168: @ 80E1168 thumb_func_end sub_80E1168 thumb_func_start sub_80E11B0 -sub_80E11B0: @ 80E11B0 +sub_80E11B0: ; 80E11B0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -427573,14 +427573,14 @@ sub_80E11B0: @ 80E11B0 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080E11D6 + bne @080E11D6 bl sub_80E53F4 bl FreeShopItemNames ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 adds r0, r4, 0 bl remove_task -_080E11D6: +@080E11D6: pop {r4} pop {r0} bx r0 @@ -427589,7 +427589,7 @@ _080E11D6: thumb_func_end sub_80E11B0 thumb_func_start sub_80E11E4 -sub_80E11E4: @ 80E11E4 +sub_80E11E4: ; 80E11E4 push {lr} ldr r0, =0x02039f7c movs r1, 0 @@ -427605,7 +427605,7 @@ sub_80E11E4: @ 80E11E4 thumb_func_end sub_80E11E4 thumb_func_start sub_80E1204 -sub_80E1204: @ 80E1204 +sub_80E1204: ; 80E1204 push {r4-r7,lr} lsls r0, 24 lsrs r0, 24 @@ -427617,43 +427617,43 @@ sub_80E1204: @ 80E1204 movs r3, 0 ldr r5, =0x02039f80 adds r6, r5, 0 -_080E121A: +@080E121A: lsls r0, r3, 2 adds r2, r0, r6 ldrh r1, [r2] movs r7, 0xA ldrsh r0, [r4, r7] cmp r1, r0 - bne _080E1250 + bne @080E1250 ldrh r0, [r2, 0x2] cmp r0, 0 - beq _080E1250 + beq @080E1250 adds r1, r0, 0 movs r3, 0x2 ldrsh r0, [r4, r3] adds r0, r1, r0 cmp r0, 0xFF - ble _080E1248 + ble @080E1248 movs r0, 0xFF strh r0, [r2, 0x2] - b _080E127A + b @080E127A .align 2, 0 .pool -_080E1248: +@080E1248: ldrh r0, [r4, 0x2] adds r0, r1, r0 strh r0, [r2, 0x2] - b _080E127A -_080E1250: + b @080E127A +@080E1250: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x2 - bls _080E121A + bls @080E121A ldr r2, =0x02039f7c ldrb r0, [r2] cmp r0, 0x2 - bhi _080E127A + bhi @080E127A lsls r0, 2 adds r0, r5 ldrh r1, [r4, 0xA] @@ -427666,7 +427666,7 @@ _080E1250: ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] -_080E127A: +@080E127A: pop {r4-r7} pop {r0} bx r0 @@ -427675,7 +427675,7 @@ _080E127A: thumb_func_end sub_80E1204 thumb_func_start sub_80E1284 -sub_80E1284: @ 80E1284 +sub_80E1284: ; 80E1284 push {r4,lr} adds r4, r0, 0 movs r0, 0 @@ -427693,7 +427693,7 @@ sub_80E1284: @ 80E1284 thumb_func_end sub_80E1284 thumb_func_start sub_80E12A8 -sub_80E12A8: @ 80E12A8 +sub_80E12A8: ; 80E12A8 push {r4,lr} adds r4, r0, 0 movs r0, 0x1 @@ -427710,7 +427710,7 @@ sub_80E12A8: @ 80E12A8 thumb_func_end sub_80E12A8 thumb_func_start sub_80E12C8 -sub_80E12C8: @ 80E12C8 +sub_80E12C8: ; 80E12C8 push {r4,lr} adds r4, r0, 0 movs r0, 0x2 @@ -427727,7 +427727,7 @@ sub_80E12C8: @ 80E12C8 thumb_func_end sub_80E12C8 thumb_func_start sub_80E12E8 -sub_80E12E8: @ 80E12E8 +sub_80E12E8: ; 80E12E8 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -427757,7 +427757,7 @@ sub_80E12E8: @ 80E12E8 movs r2, 0xC ldrsh r0, [r1, r2] cmp r0, 0 - bne _080E13AC + bne @080E13AC movs r2, 0 lsls r5, 16 str r5, [sp, 0xC] @@ -427770,14 +427770,14 @@ sub_80E12E8: @ 80E12E8 lsls r0, r1, 1 mov r1, r9 adds r7, r0, r1 -_080E133C: +@080E133C: movs r4, 0 lsls r2, 16 mov r8, r2 asrs r0, r2, 16 ldr r2, [sp] adds r6, r2, r0 -_080E1348: +@080E1348: ldr r0, [sp, 0xC] asrs r1, r0, 16 lsls r4, 16 @@ -427791,20 +427791,20 @@ _080E1348: lsls r0, 16 asrs r0, 16 cmp r1, r0 - bne _080E1390 + bne @080E1390 ldr r0, [sp, 0x4] cmp r0, 0x2 - beq _080E1380 + beq @080E1380 ldrh r0, [r7, 0x2] mov r2, r10 orrs r2, r0 adds r0, r5, 0 adds r1, r6, 0 bl setmaptile_0 - b _080E1390 + b @080E1390 .align 2, 0 .pool -_080E1380: +@080E1380: mov r1, r9 ldrh r0, [r1] mov r2, r10 @@ -427812,22 +427812,22 @@ _080E1380: adds r0, r5, 0 adds r1, r6, 0 bl setmaptile_0 -_080E1390: +@080E1390: movs r2, 0x80 lsls r2, 9 adds r0, r4, r2 lsrs r4, r0, 16 asrs r0, 16 cmp r0, 0x2 - ble _080E1348 + ble @080E1348 adds r0, r2, 0 add r0, r8 lsrs r2, r0, 16 asrs r0, 16 cmp r0, 0x2 - ble _080E133C - b _080E1434 -_080E13AC: + ble @080E133C + b @080E1434 +@080E13AC: movs r2, 0 lsls r5, 16 str r5, [sp, 0xC] @@ -427836,14 +427836,14 @@ _080E13AC: asrs r0, 16 str r0, [sp, 0x8] asrs r7, r1, 16 -_080E13BC: +@080E13BC: movs r4, 0 lsls r2, 16 mov r8, r2 asrs r0, r2, 16 ldr r1, [sp, 0x8] adds r6, r1, r0 -_080E13C8: +@080E13C8: ldr r2, [sp, 0xC] asrs r1, r2, 16 lsls r4, 16 @@ -427861,9 +427861,9 @@ _080E13C8: lsls r0, 16 asrs r0, 16 cmp r1, r0 - bne _080E141A + bne @080E141A cmp r7, 0x2 - beq _080E140A + beq @080E140A movs r0, 0x1 subs r0, r7 lsls r0, 1 @@ -427874,8 +427874,8 @@ _080E13C8: adds r0, r5, 0 adds r1, r6, 0 bl setmaptile_0 - b _080E141A -_080E140A: + b @080E141A +@080E140A: mov r1, r9 ldrh r0, [r1, 0x4] mov r2, r10 @@ -427883,21 +427883,21 @@ _080E140A: adds r0, r5, 0 adds r1, r6, 0 bl setmaptile_0 -_080E141A: +@080E141A: movs r2, 0x80 lsls r2, 9 adds r0, r4, r2 lsrs r4, r0, 16 asrs r0, 16 cmp r0, 0x2 - ble _080E13C8 + ble @080E13C8 adds r0, r2, 0 add r0, r8 lsrs r2, r0, 16 asrs r0, 16 cmp r0, 0x2 - ble _080E13BC -_080E1434: + ble @080E13BC +@080E1434: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -427909,7 +427909,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 @@ -427923,68 +427923,68 @@ sub_80E1444: @ 80E1444 movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0x6 - bhi _080E14DE + bhi @080E14DE lsls r0, 2 - ldr r1, =_080E1474 + ldr r1, =@080E1474 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080E1474: - .4byte _080E1490 - .4byte _080E1498 - .4byte _080E14A0 - .4byte _080E14A8 - .4byte _080E14B0 - .4byte _080E14C4 - .4byte _080E14D4 -_080E1490: +@080E1474: + .4byte @080E1490 + .4byte @080E1498 + .4byte @080E14A0 + .4byte @080E14A8 + .4byte @080E14B0 + .4byte @080E14C4 + .4byte @080E14D4 +@080E1490: ldr r1, =0x08589aba - b _080E14C6 + b @080E14C6 .align 2, 0 .pool -_080E1498: +@080E1498: ldr r1, =0x08589ac0 - b _080E14C6 + b @080E14C6 .align 2, 0 .pool -_080E14A0: +@080E14A0: ldr r1, =0x08589ac6 - b _080E14B2 + b @080E14B2 .align 2, 0 .pool -_080E14A8: +@080E14A8: ldr r1, =0x08589acc - b _080E14C6 + b @080E14C6 .align 2, 0 .pool -_080E14B0: +@080E14B0: ldr r1, =0x08589ad2 -_080E14B2: +@080E14B2: movs r2, 0xC0 lsls r2, 4 adds r0, r3, 0 bl sub_80E12E8 - b _080E14DE + b @080E14DE .align 2, 0 .pool -_080E14C4: +@080E14C4: ldr r1, =0x08589ad8 -_080E14C6: +@080E14C6: adds r0, r3, 0 movs r2, 0 bl sub_80E12E8 - b _080E14DE + b @080E14DE .align 2, 0 .pool -_080E14D4: +@080E14D4: ldr r1, =0x08589ade adds r0, r3, 0 movs r2, 0 bl sub_80E12E8 -_080E14DE: +@080E14DE: ldrh r0, [r4] adds r0, 0x1 movs r1, 0x7 @@ -427992,7 +427992,7 @@ _080E14DE: strh r0, [r4] adds r5, r0, 0 cmp r5, 0 - bne _080E1502 + bne @080E1502 bl cur_mapdata_full_redraw movs r1, 0x2 ldrsh r0, [r4, r1] @@ -428001,7 +428001,7 @@ _080E14DE: bl __modsi3 strh r0, [r4, 0x2] strh r5, [r4, 0x6] -_080E1502: +@080E1502: pop {r4,r5} pop {r0} bx r0 @@ -428010,7 +428010,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 @@ -428047,7 +428047,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 @@ -428061,7 +428061,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] @@ -428073,7 +428073,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 @@ -428085,24 +428085,24 @@ sub_80E1584: @ 80E1584 movs r2, 0xE ldrsh r0, [r1, r2] cmp r0, 0 - bne _080E15B0 + bne @080E15B0 movs r2, 0xA ldrsh r0, [r1, r2] cmp r0, 0x2 - bne _080E15B0 + bne @080E15B0 movs r0, 0 - b _080E15B2 + b @080E15B2 .align 2, 0 .pool -_080E15B0: +@080E15B0: movs r0, 0x1 -_080E15B2: +@080E15B2: pop {r1} bx r1 thumb_func_end sub_80E1584 thumb_func_start sub_80E15B8 -sub_80E15B8: @ 80E15B8 +sub_80E15B8: ; 80E15B8 push {lr} sub sp, 0x4 mov r1, sp @@ -428123,7 +428123,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 @@ -428131,14 +428131,14 @@ sub_80E15E4: @ 80E15E4 ldr r1, =0x000031f8 adds r3, r0, r1 movs r2, 0 -_080E15F2: +@080E15F2: adds r0, r3, r2 adds r1, r4, r2 ldrb r1, [r1] strb r1, [r0] adds r2, 0x1 cmp r2, 0x33 - bls _080E15F2 + bls @080E15F2 pop {r4} pop {r0} bx r0 @@ -428147,25 +428147,25 @@ _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 movs r1, 0 -_080E1618: +@080E1618: adds r0, r3, r1 ldrb r0, [r0] adds r2, r0 adds r1, 0x1 cmp r1, 0x2F - bls _080E1618 + bls @080E1618 adds r0, r2, 0 pop {r1} bx r1 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] @@ -428173,12 +428173,12 @@ sub_80E162C: @ 80E162C adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080E1674 + beq @080E1674 ldr r2, =0x00003202 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080E1674 + beq @080E1674 ldr r2, =0x000031f8 adds r0, r1, r2 bl sub_80E1610 @@ -428187,48 +428187,48 @@ sub_80E162C: @ 80E162C adds r1, r2 ldr r1, [r1] cmp r0, r1 - bne _080E1674 + bne @080E1674 movs r0, 0x1 - b _080E1676 + b @080E1676 .align 2, 0 .pool -_080E1674: +@080E1674: movs r0, 0 -_080E1676: +@080E1676: pop {r4} pop {r1} bx r1 thumb_func_end sub_80E162C thumb_func_start sub_80E167C -sub_80E167C: @ 80E167C +sub_80E167C: ; 80E167C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2B - bne _080E16A0 + bne @080E16A0 bl sub_80E162C cmp r0, 0 - beq _080E16A0 + beq @080E16A0 ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000031f8 - b _080E16B4 + b @080E16B4 .align 2, 0 .pool -_080E16A0: +@080E16A0: subs r0, r4, 0x1 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2A - bls _080E16AC + bls @080E16AC movs r4, 0x1 -_080E16AC: +@080E16AC: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 ldr r1, =0x0858a654 -_080E16B4: +@080E16B4: adds r0, r1 pop {r4} pop {r1} @@ -428238,7 +428238,7 @@ _080E16B4: thumb_func_end sub_80E167C thumb_func_start sub_80E16C0 -sub_80E16C0: @ 80E16C0 +sub_80E16C0: ; 80E16C0 lsls r0, 24 ldr r1, =0x03005d8c lsrs r0, 21 @@ -428253,7 +428253,7 @@ sub_80E16C0: @ 80E16C0 thumb_func_end sub_80E16C0 thumb_func_start sub_80E16DC -sub_80E16DC: @ 80E16DC +sub_80E16DC: ; 80E16DC push {lr} ldr r0, =0x03005df0 ldrb r0, [r0] @@ -428266,56 +428266,56 @@ sub_80E16DC: @ 80E16DC lsls r0, 25 lsrs r0, 25 cmp r0, 0x2 - beq _080E1718 + beq @080E1718 cmp r0, 0x2 - bgt _080E1708 + bgt @080E1708 cmp r0, 0x1 - beq _080E1712 - b _080E172E + beq @080E1712 + b @080E172E .align 2, 0 .pool -_080E1708: +@080E1708: cmp r0, 0x3 - beq _080E171E + beq @080E171E cmp r0, 0x4 - beq _080E1724 - b _080E172E -_080E1712: + beq @080E1724 + b @080E172E +@080E1712: ldrb r0, [r2, 0x5] movs r1, 0x10 - b _080E1728 -_080E1718: + b @080E1728 +@080E1718: ldrb r0, [r2, 0x5] movs r1, 0x20 - b _080E1728 -_080E171E: + b @080E1728 +@080E171E: ldrb r0, [r2, 0x5] movs r1, 0x40 - b _080E1728 -_080E1724: + b @080E1728 +@080E1724: ldrb r0, [r2, 0x5] movs r1, 0x80 -_080E1728: +@080E1728: orrs r0, r1 strb r0, [r2, 0x5] - b _080E1732 -_080E172E: + b @080E1732 +@080E172E: movs r0, 0 - b _080E1734 -_080E1732: + b @080E1734 +@080E1732: movs r0, 0x1 -_080E1734: +@080E1734: pop {r1} bx r1 thumb_func_end sub_80E16DC thumb_func_start sub_80E1738 -sub_80E1738: @ 80E1738 +sub_80E1738: ; 80E1738 push {lr} bl sub_809D280 ldr r1, =0x082742f9 cmp r0, r1 - bne _080E1768 + bne @080E1768 ldr r0, =0x03005df0 ldrb r0, [r0] bl sub_808F110 @@ -428324,40 +428324,40 @@ sub_80E1738: @ 80E1738 bl sub_80E19C8 lsls r0, 24 cmp r0, 0 - bne _080E1768 + bne @080E1768 movs r0, 0x1 - b _080E176A + b @080E176A .align 2, 0 .pool -_080E1768: +@080E1768: movs r0, 0 -_080E176A: +@080E176A: pop {r1} bx r1 thumb_func_end sub_80E1738 thumb_func_start sub_80E1770 -sub_80E1770: @ 80E1770 +sub_80E1770: ; 80E1770 push {lr} bl sub_809D280 ldr r1, =0x082742f9 cmp r0, r1 - bne _080E178C + bne @080E178C bl sub_80E16DC lsls r0, 24 lsrs r0, 24 - b _080E178E + b @080E178E .align 2, 0 .pool -_080E178C: +@080E178C: movs r0, 0 -_080E178E: +@080E178E: pop {r1} bx r1 thumb_func_end sub_80E1770 thumb_func_start sub_80E1794 -sub_80E1794: @ 80E1794 +sub_80E1794: ; 80E1794 push {r4-r6,lr} movs r2, 0 ldr r6, =0x03005d8c @@ -428365,7 +428365,7 @@ sub_80E1794: @ 80E1794 ldr r0, =0x0858abd0 ldr r3, [r0] ldr r4, [r0, 0x4] -_080E17A2: +@080E17A2: ldr r0, [r6] lsls r1, r2, 3 adds r0, r1 @@ -428374,7 +428374,7 @@ _080E17A2: str r4, [r0, 0x4] adds r2, 0x1 cmp r2, 0x7F - ble _080E17A2 + ble @080E17A2 pop {r4-r6} pop {r0} bx r0 @@ -428383,42 +428383,42 @@ _080E17A2: thumb_func_end sub_80E1794 thumb_func_start sub_80E17C8 -sub_80E17C8: @ 80E17C8 +sub_80E17C8: ; 80E17C8 push {r4,lr} adds r4, r0, 0 ldrb r1, [r4, 0x1] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080E17DA -_080E17D6: + beq @080E17DA +@080E17D6: movs r0, 0 - b _080E1866 -_080E17DA: + b @080E1866 +@080E17DA: lsls r0, r1, 25 lsrs r0, 25 cmp r0, 0x5 - bhi _080E1864 + bhi @080E1864 lsls r0, 2 - ldr r1, =_080E17F0 + ldr r1, =@080E17F0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080E17F0: - .4byte _080E17D6 - .4byte _080E1810 - .4byte _080E1810 - .4byte _080E1810 - .4byte _080E1808 - .4byte _080E1828 -_080E1808: +@080E17F0: + .4byte @080E17D6 + .4byte @080E1810 + .4byte @080E1810 + .4byte @080E1810 + .4byte @080E1808 + .4byte @080E1828 +@080E1808: adds r0, r4, 0 bl sub_80E1B38 strb r0, [r4, 0x4] -_080E1810: +@080E1810: ldrb r2, [r4, 0x1] lsls r1, r2, 25 lsrs r1, 25 @@ -428430,8 +428430,8 @@ _080E1810: ands r0, r2 orrs r0, r1 strb r0, [r4, 0x1] - b _080E1864 -_080E1828: + b @080E1864 +@080E1828: ldrb r0, [r4, 0x5] movs r1, 0x11 negs r1, r1 @@ -428456,15 +428456,15 @@ _080E1828: ands r1, r0 strb r1, [r4, 0x5] cmp r1, 0xA - bne _080E1864 + bne @080E1864 ldr r0, =0x0858abd0 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [r4] str r1, [r4, 0x4] -_080E1864: +@080E1864: movs r0, 0x1 -_080E1866: +@080E1866: pop {r4} pop {r1} bx r1 @@ -428473,11 +428473,11 @@ _080E1866: thumb_func_end sub_80E17C8 thumb_func_start sub_80E1870 -sub_80E1870: @ 80E1870 +sub_80E1870: ; 80E1870 push {r4-r7,lr} adds r6, r0, 0 movs r2, 0 -_080E1876: +@080E1876: ldr r1, =0x03005d8c lsls r0, r2, 3 ldr r3, =0x0000169c @@ -428487,16 +428487,16 @@ _080E1876: ldrb r0, [r4] adds r7, r2, 0x1 cmp r0, 0 - beq _080E1910 + beq @080E1910 ldrb r1, [r4, 0x1] movs r0, 0x7F ands r0, r1 cmp r0, 0 - beq _080E1910 + beq @080E1910 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080E1910 + bne @080E1910 ldrb r0, [r4] bl sub_80E1B7C lsls r0, 16 @@ -428506,25 +428506,25 @@ _080E1876: lsls r1, 3 subs r1, r0 cmp r6, r1 - blt _080E18CC + blt @080E18CC ldr r0, =0x0858abd0 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [r4] str r1, [r4, 0x4] - b _080E1910 + b @080E1910 .align 2, 0 .pool -_080E18CC: +@080E18CC: adds r5, r6, 0 cmp r5, 0 - beq _080E1910 + beq @080E1910 ldrh r1, [r4, 0x2] cmp r1, r5 - ble _080E18DC + ble @080E18DC subs r0, r1, r5 - b _080E190E -_080E18DC: + b @080E190E +@080E18DC: subs r5, r1 ldrb r0, [r4] bl sub_80E1B7C @@ -428532,36 +428532,36 @@ _080E18DC: adds r0, r4, 0 bl sub_80E17C8 cmp r0, 0 - beq _080E1910 + beq @080E1910 ldrb r1, [r4, 0x1] movs r0, 0x7F ands r0, r1 cmp r0, 0x5 - bne _080E1900 + bne @080E1900 ldrh r0, [r4, 0x2] lsls r0, 2 strh r0, [r4, 0x2] -_080E1900: +@080E1900: cmp r5, 0 - beq _080E1910 + beq @080E1910 ldrh r0, [r4, 0x2] adds r1, r0, 0 cmp r0, r5 - ble _080E18DC + ble @080E18DC subs r0, r5 -_080E190E: +@080E190E: strh r0, [r4, 0x2] -_080E1910: +@080E1910: adds r2, r7, 0 cmp r2, 0x7F - ble _080E1876 + ble @080E1876 pop {r4-r7} pop {r0} bx r0 thumb_func_end sub_80E1870 thumb_func_start sub_80E191C -sub_80E191C: @ 80E191C +sub_80E191C: ; 80E191C push {r4-r7,lr} adds r4, r1, 0 adds r5, r2, 0 @@ -428593,21 +428593,21 @@ sub_80E191C: @ 80E191C orrs r0, r1 strb r0, [r6, 0x1] cmp r5, 0x5 - bne _080E196E + bne @080E196E adds r0, r6, 0 bl sub_80E1B38 strb r0, [r6, 0x4] ldrh r0, [r6, 0x2] lsls r0, 2 strh r0, [r6, 0x2] -_080E196E: +@080E196E: cmp r7, 0 - bne _080E197A + bne @080E197A ldrb r0, [r6, 0x1] movs r1, 0x80 orrs r0, r1 strb r0, [r6, 0x1] -_080E197A: +@080E197A: pop {r4-r7} pop {r0} bx r0 @@ -428616,7 +428616,7 @@ _080E197A: thumb_func_end sub_80E191C thumb_func_start sub_80E1984 -sub_80E1984: @ 80E1984 +sub_80E1984: ; 80E1984 lsls r0, 24 ldr r1, =0x03005d8c ldr r2, [r1] @@ -428635,7 +428635,7 @@ sub_80E1984: @ 80E1984 thumb_func_end sub_80E1984 thumb_func_start sub_80E19AC -sub_80E19AC: @ 80E19AC +sub_80E19AC: ; 80E19AC lsls r0, 24 ldr r1, =0x03005d8c ldr r1, [r1] @@ -428650,7 +428650,7 @@ sub_80E19AC: @ 80E19AC thumb_func_end sub_80E19AC thumb_func_start sub_80E19C8 -sub_80E19C8: @ 80E19C8 +sub_80E19C8: ; 80E19C8 lsls r0, 24 ldr r1, =0x03005d8c ldr r1, [r1] @@ -428667,7 +428667,7 @@ sub_80E19C8: @ 80E19C8 thumb_func_end sub_80E19C8 thumb_func_start berryid_from_itemid -berryid_from_itemid: @ 80E19E8 +berryid_from_itemid: ; 80E19E8 push {lr} lsls r0, 16 lsrs r1, r0, 16 @@ -428675,23 +428675,23 @@ berryid_from_itemid: @ 80E19E8 adds r0, r2 lsrs r0, 16 cmp r0, 0x2A - bhi _080E1A08 + bhi @080E1A08 adds r0, r1, 0 adds r0, 0x7C lsls r0, 24 lsrs r0, 24 - b _080E1A0A + b @080E1A0A .align 2, 0 .pool -_080E1A08: +@080E1A08: movs r0, 0x1 -_080E1A0A: +@080E1A0A: pop {r1} bx r1 thumb_func_end berryid_from_itemid thumb_func_start sub_80E1A10 -sub_80E1A10: @ 80E1A10 +sub_80E1A10: ; 80E1A10 push {lr} lsls r0, 16 lsrs r1, r0, 16 @@ -428699,23 +428699,23 @@ sub_80E1A10: @ 80E1A10 adds r0, r2 lsrs r0, 16 cmp r0, 0x2A - bhi _080E1A30 + bhi @080E1A30 adds r0, r1, 0 adds r0, 0x84 lsls r0, 16 lsrs r0, 16 - b _080E1A32 + b @080E1A32 .align 2, 0 .pool -_080E1A30: +@080E1A30: movs r0, 0x85 -_080E1A32: +@080E1A32: pop {r1} bx r1 thumb_func_end sub_80E1A10 thumb_func_start sub_80E1A38 -sub_80E1A38: @ 80E1A38 +sub_80E1A38: ; 80E1A38 push {r4,lr} adds r4, r1, 0 lsls r0, 24 @@ -428733,7 +428733,7 @@ sub_80E1A38: @ 80E1A38 thumb_func_end sub_80E1A38 thumb_func_start sub_80E1A58 -sub_80E1A58: @ 80E1A58 +sub_80E1A58: ; 80E1A58 push {r4,r5,lr} adds r4, r1, 0 adds r5, r2, 0 @@ -428750,7 +428750,7 @@ sub_80E1A58: @ 80E1A58 thumb_func_end sub_80E1A58 thumb_func_start sub_80E1A78 -sub_80E1A78: @ 80E1A78 +sub_80E1A78: ; 80E1A78 push {lr} lsls r0, 24 lsrs r0, 24 @@ -428764,7 +428764,7 @@ sub_80E1A78: @ 80E1A78 thumb_func_end sub_80E1A78 thumb_func_start sub_80E1A90 -sub_80E1A90: @ 80E1A90 +sub_80E1A90: ; 80E1A90 push {lr} ldrb r2, [r0, 0x5] movs r0, 0x10 @@ -428776,32 +428776,32 @@ sub_80E1A90: @ 80E1A90 movs r0, 0x20 ands r0, r2 cmp r0, 0 - beq _080E1AAA + beq @080E1AAA adds r1, 0x1 -_080E1AAA: +@080E1AAA: movs r0, 0x40 ands r0, r2 cmp r0, 0 - beq _080E1AB8 + beq @080E1AB8 adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 -_080E1AB8: +@080E1AB8: movs r0, 0x80 ands r0, r2 cmp r0, 0 - beq _080E1AC6 + beq @080E1AC6 adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 -_080E1AC6: +@080E1AC6: adds r0, r1, 0 pop {r1} bx r1 thumb_func_end sub_80E1A90 thumb_func_start sub_80E1ACC -sub_80E1ACC: @ 80E1ACC +sub_80E1ACC: ; 80E1ACC push {lr} lsls r0, 24 lsrs r0, 24 @@ -428814,7 +428814,7 @@ sub_80E1ACC: @ 80E1ACC thumb_func_end sub_80E1ACC thumb_func_start sub_80E1AE4 -sub_80E1AE4: @ 80E1AE4 +sub_80E1AE4: ; 80E1AE4 push {r4-r6,lr} lsls r0, 16 lsrs r0, 16 @@ -428823,10 +428823,10 @@ sub_80E1AE4: @ 80E1AE4 lsls r2, 24 lsrs r2, 24 cmp r2, 0 - bne _080E1AFA + bne @080E1AFA lsls r0, r6, 24 - b _080E1B2E -_080E1AFA: + b @080E1B2E +@080E1AFA: subs r1, r0, r6 subs r0, r2, 0x1 adds r5, r1, 0 @@ -428844,16 +428844,16 @@ _080E1AFA: movs r0, 0x3 ands r0, r5 cmp r0, 0x1 - bls _080E1B28 + bls @080E1B28 lsrs r0, r5, 2 adds r0, 0x1 - b _080E1B2A -_080E1B28: + b @080E1B2A +@080E1B28: lsrs r0, r5, 2 -_080E1B2A: +@080E1B2A: adds r0, r6 lsls r0, 24 -_080E1B2E: +@080E1B2E: lsrs r0, 24 pop {r4-r6} pop {r1} @@ -428861,7 +428861,7 @@ _080E1B2E: thumb_func_end sub_80E1AE4 thumb_func_start sub_80E1B38 -sub_80E1B38: @ 80E1B38 +sub_80E1B38: ; 80E1B38 push {r4-r6,lr} adds r4, r0, 0 ldrb r0, [r4] @@ -428884,7 +428884,7 @@ sub_80E1B38: @ 80E1B38 thumb_func_end sub_80E1B38 thumb_func_start sub_80E1B64 -sub_80E1B64: @ 80E1B64 +sub_80E1B64: ; 80E1B64 lsls r0, 24 ldr r1, =0x03005d8c ldr r1, [r1] @@ -428900,7 +428900,7 @@ sub_80E1B64: @ 80E1B64 thumb_func_end sub_80E1B64 thumb_func_start sub_80E1B7C -sub_80E1B7C: @ 80E1B7C +sub_80E1B7C: ; 80E1B7C push {lr} lsls r0, 24 lsrs r0, 24 @@ -428915,7 +428915,7 @@ sub_80E1B7C: @ 80E1B7C thumb_func_end sub_80E1B7C thumb_func_start sub_80E1B94 -sub_80E1B94: @ 80E1B94 +sub_80E1B94: ; 80E1B94 push {r4-r6,lr} ldr r0, =0x03005df0 ldrb r0, [r0] @@ -428937,21 +428937,21 @@ sub_80E1B94: @ 80E1B94 bl sub_8092E9C lsls r0, 24 cmp r0, 0 - beq _080E1BE0 + beq @080E1BE0 ldr r1, =0x020375e0 movs r0, 0xFF strh r0, [r1] - b _080E1BEE + b @080E1BEE .align 2, 0 .pool -_080E1BE0: +@080E1BE0: ldr r4, =0x020375e0 adds r0, r5, 0 bl sub_80E19C8 lsls r0, 24 lsrs r0, 24 strh r0, [r4] -_080E1BEE: +@080E1BEE: ldr r4, =0x020375e2 adds r0, r5, 0 bl sub_80E1ACC @@ -428976,7 +428976,7 @@ _080E1BEE: thumb_func_end sub_80E1B94 thumb_func_start sub_80E1C2C -sub_80E1C2C: @ 80E1C2C +sub_80E1C2C: ; 80E1C2C push {lr} ldr r0, =0x03005df0 ldrb r0, [r0] @@ -428995,7 +428995,7 @@ sub_80E1C2C: @ 80E1C2C thumb_func_end sub_80E1C2C thumb_func_start sub_80E1C54 -sub_80E1C54: @ 80E1C54 +sub_80E1C54: ; 80E1C54 push {r4,r5,lr} ldr r0, =0x03005df0 ldrb r0, [r0] @@ -429024,7 +429024,7 @@ sub_80E1C54: @ 80E1C54 thumb_func_end sub_80E1C54 thumb_func_start sub_80E1C94 -sub_80E1C94: @ 80E1C94 +sub_80E1C94: ; 80E1C94 push {lr} ldr r0, =c2_810A554 + 1 bl set_callback2 @@ -429035,7 +429035,7 @@ sub_80E1C94: @ 80E1C94 thumb_func_end sub_80E1C94 thumb_func_start sub_80E1CA4 -sub_80E1CA4: @ 80E1CA4 +sub_80E1CA4: ; 80E1CA4 push {r4,lr} ldr r0, =0x0203ce7c ldrh r0, [r0] @@ -429061,7 +429061,7 @@ sub_80E1CA4: @ 80E1CA4 thumb_func_end sub_80E1CA4 thumb_func_start sub_80E1CDC -sub_80E1CDC: @ 80E1CDC +sub_80E1CDC: ; 80E1CDC push {r4-r6,lr} ldr r0, =0x03005df0 ldrb r0, [r0] @@ -429096,7 +429096,7 @@ sub_80E1CDC: @ 80E1CDC thumb_func_end sub_80E1CDC thumb_func_start sub_80E1D28 -sub_80E1D28: @ 80E1D28 +sub_80E1D28: ; 80E1D28 push {lr} ldr r0, =0x03005df0 ldrb r0, [r0] @@ -429118,7 +429118,7 @@ sub_80E1D28: @ 80E1D28 thumb_func_end sub_80E1D28 thumb_func_start sub_80E1D5C -sub_80E1D5C: @ 80E1D5C +sub_80E1D5C: ; 80E1D5C push {lr} movs r0, 0x4 bl sub_80D66EC @@ -429129,7 +429129,7 @@ sub_80E1D5C: @ 80E1D5C thumb_func_end sub_80E1D5C thumb_func_start sub_80E1D6C -sub_80E1D6C: @ 80E1D6C +sub_80E1D6C: ; 80E1D6C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -429163,14 +429163,14 @@ sub_80E1D6C: @ 80E1D6C mov r8, r3 asrs r7, r1, 16 movs r6, 0xF -_080E1DB0: +@080E1DB0: ldrb r0, [r4] lsls r0, 31 cmp r0, 0 - beq _080E1DEC + beq @080E1DEC ldrb r0, [r4, 0x6] cmp r0, 0xC - bne _080E1DEC + bne @080E1DEC ldrh r0, [r4, 0x10] strh r0, [r5] ldrh r0, [r4, 0x12] @@ -429179,25 +429179,25 @@ _080E1DB0: movs r2, 0 ldrsh r1, [r5, r2] cmp r9, r1 - bgt _080E1DEC + bgt @080E1DEC cmp r1, r8 - bgt _080E1DEC + bgt @080E1DEC lsls r0, 16 asrs r1, r0, 16 cmp r7, r1 - bgt _080E1DEC + bgt @080E1DEC mov r2, r10 lsls r0, r2, 16 asrs r0, 16 cmp r1, r0 - bgt _080E1DEC + bgt @080E1DEC ldrb r0, [r4, 0x1D] bl sub_80E1A78 -_080E1DEC: +@080E1DEC: adds r4, 0x24 subs r6, 0x1 cmp r6, 0 - bge _080E1DB0 + bge @080E1DB0 add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -429211,7 +429211,7 @@ _080E1DEC: thumb_func_end sub_80E1D6C thumb_func_start sub_80E1E08 -sub_80E1E08: @ 80E1E08 +sub_80E1E08: ; 80E1E08 push {r4-r7,lr} sub sp, 0x4 lsls r0, 24 @@ -429227,7 +429227,7 @@ sub_80E1E08: @ 80E1E08 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080E1E4C + beq @080E1E4C ldr r0, =0x020375f0 movs r1, 0xFF strh r1, [r0] @@ -429239,12 +429239,12 @@ sub_80E1E08: @ 80E1E08 adds r3, r4, 0 bl sub_80E1EFC movs r0, 0x1 - b _080E1E4E + b @080E1E4E .align 2, 0 .pool -_080E1E4C: +@080E1E4C: movs r0, 0 -_080E1E4E: +@080E1E4E: add sp, 0x4 pop {r4-r7} pop {r1} @@ -429252,7 +429252,7 @@ _080E1E4E: thumb_func_end sub_80E1E08 thumb_func_start sub_80E1E58 -sub_80E1E58: @ 80E1E58 +sub_80E1E58: ; 80E1E58 push {r4-r7,lr} mov r7, r8 push {r7} @@ -429274,7 +429274,7 @@ sub_80E1E58: @ 80E1E58 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080E1EA8 + beq @080E1EA8 ldr r1, =0x020375f0 movs r0, 0xFF strh r0, [r1] @@ -429285,12 +429285,12 @@ sub_80E1E58: @ 80E1E58 adds r3, r5, 0 bl sub_80E1EFC movs r0, 0x1 - b _080E1EAA + b @080E1EAA .align 2, 0 .pool -_080E1EA8: +@080E1EA8: movs r0, 0 -_080E1EAA: +@080E1EAA: add sp, 0x4 pop {r3} mov r8, r3 @@ -429300,18 +429300,18 @@ _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 - b _080E1EEC -_080E1EC0: + b @080E1EEC +@080E1EC0: cmp r1, 0xFD - bne _080E1EE4 + bne @080E1EE4 adds r4, 0x1 ldrb r0, [r4] cmp r0, 0x1 - bne _080E1EEC + bne @080E1EEC ldr r0, =0x03005d90 ldr r0, [r0] bl sub_8008C24 @@ -429319,19 +429319,19 @@ _080E1EC0: lsls r0, 16 lsrs r5, r0, 16 adds r4, 0x1 - b _080E1EEC + b @080E1EEC .align 2, 0 .pool -_080E1EE4: +@080E1EE4: adds r4, 0x1 adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 -_080E1EEC: +@080E1EEC: ldrb r1, [r4] adds r0, r1, 0 cmp r0, 0xFF - bne _080E1EC0 + bne @080E1EC0 adds r0, r5, 0 pop {r4,r5} pop {r1} @@ -429339,7 +429339,7 @@ _080E1EEC: thumb_func_end sub_80E1EB8 thumb_func_start sub_80E1EFC -sub_80E1EFC: @ 80E1EFC +sub_80E1EFC: ; 80E1EFC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -429369,18 +429369,18 @@ sub_80E1EFC: @ 80E1EFC mov r8, r0 movs r1, 0 cmp r1, r6 - bge _080E1F4C + bge @080E1F4C mov r5, r8 adds r4, r6, 0 -_080E1F3C: +@080E1F3C: ldr r0, [r5] bl display_text_and_get_width adds r1, r0, 0 adds r5, 0x8 subs r4, 0x1 cmp r4, 0 - bne _080E1F3C -_080E1F4C: + bne @080E1F3C +@080E1F4C: adds r0, r1, 0 bl convert_pixel_width_to_tile_width adds r4, r0, 0 @@ -429431,7 +429431,7 @@ _080E1F4C: thumb_func_end sub_80E1EFC thumb_func_start sub_80E1FBC -sub_80E1FBC: @ 80E1FBC +sub_80E1FBC: ; 80E1FBC push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -429453,18 +429453,18 @@ sub_80E1FBC: @ 80E1FBC ldr r6, =sub_80E2058 + 1 ldr r5, =0x0858bb68 movs r3, 0xC -_080E1FE6: +@080E1FE6: adds r0, r2, r5 ldrb r0, [r0] cmp r0, r4 - bne _080E1FF0 + bne @080E1FF0 strb r3, [r1] -_080E1FF0: +@080E1FF0: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x5 - bls _080E1FE6 + bls @080E1FE6 adds r0, r6, 0 movs r1, 0x50 bl AddTask @@ -429478,14 +429478,14 @@ _080E1FF0: mov r0, r8 strh r0, [r1, 0x10] cmp r7, 0x3 - bls _080E202C + bls @080E202C movs r0, 0x1 - b _080E202E + b @080E202E .align 2, 0 .pool -_080E202C: +@080E202C: movs r0, 0 -_080E202E: +@080E202E: strh r0, [r1, 0x12] ldr r1, =0x03005e00 lsls r0, r2, 2 @@ -429508,7 +429508,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 @@ -429522,26 +429522,26 @@ sub_80E2058: @ 80E2058 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080E20FC + bne @080E20FC ldr r1, =0x02039f90 ldrb r0, [r1] cmp r0, 0 - beq _080E2090 + beq @080E2090 subs r0, 0x1 strb r0, [r1] - b _080E20FC + b @080E20FC .align 2, 0 .pool -_080E2090: +@080E2090: movs r1, 0xA ldrsh r0, [r5, r1] cmp r0, 0 - bne _080E209E + bne @080E209E bl ProcessMenuInputNoWrapAround - b _080E20A2 -_080E209E: + b @080E20A2 +@080E209E: bl ProcessMenuInput -_080E20A2: +@080E20A2: lsls r0, 24 lsrs r4, r0, 24 ldr r0, =0x030022c0 @@ -429549,41 +429549,41 @@ _080E20A2: movs r0, 0xC0 ands r0, r1 cmp r0, 0 - beq _080E20B8 + beq @080E20B8 ldrb r0, [r5, 0xE] bl sub_80E2A94 -_080E20B8: +@080E20B8: lsls r0, r4, 24 asrs r1, r0, 24 movs r0, 0x2 negs r0, r0 cmp r1, r0 - beq _080E20FC + beq @080E20FC adds r0, 0x1 cmp r1, r0 - bne _080E20E8 + bne @080E20E8 movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0 - bne _080E20FC + bne @080E20FC movs r0, 0x5 bl audio_play ldr r1, =0x020375f0 movs r0, 0x7F strh r0, [r1] - b _080E20EC + b @080E20EC .align 2, 0 .pool -_080E20E8: +@080E20E8: ldr r0, =0x020375f0 strh r1, [r0] -_080E20EC: +@080E20EC: ldrb r0, [r5, 0xC] bl sub_80E2A78 adds r0, r6, 0 bl remove_task bl script_env_2_enable_and_set_ctx_running -_080E20FC: +@080E20FC: pop {r4-r6} pop {r0} bx r0 @@ -429592,7 +429592,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 + 1 adds r0, r4, 0 @@ -429600,7 +429600,7 @@ yes_no_box: @ 80E2108 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080E2138 + beq @080E2138 ldr r1, =0x020375f0 movs r0, 0xFF strh r0, [r1] @@ -429609,37 +429609,37 @@ yes_no_box: @ 80E2108 movs r1, 0x50 bl AddTask movs r0, 0x1 - b _080E213A + b @080E213A .align 2, 0 .pool -_080E2138: +@080E2138: movs r0, 0 -_080E213A: +@080E213A: pop {r4} pop {r1} bx r1 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] cmp r0, 0xFF - beq _080E2154 + beq @080E2154 movs r0, 0x1 - b _080E2156 + b @080E2156 .align 2, 0 .pool -_080E2154: +@080E2154: movs r0, 0 -_080E2156: +@080E2156: pop {r1} bx r1 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 @@ -429652,49 +429652,49 @@ task_yes_no_maybe: @ 80E215C movs r3, 0xC ldrsh r0, [r1, r3] cmp r0, 0x4 - bgt _080E2180 + bgt @080E2180 adds r0, r2, 0x1 strh r0, [r1, 0xC] - b _080E21C4 + b @080E21C4 .align 2, 0 .pool -_080E2180: +@080E2180: bl sub_8198C58 lsls r0, 24 asrs r1, r0, 24 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _080E21A4 + beq @080E21A4 cmp r1, r0 - bgt _080E219C + bgt @080E219C subs r0, 0x1 cmp r1, r0 - beq _080E21C4 - b _080E21BA -_080E219C: + beq @080E21C4 + b @080E21BA +@080E219C: cmp r1, 0 - beq _080E21B4 + beq @080E21B4 cmp r1, 0x1 - bne _080E21BA -_080E21A4: + bne @080E21BA +@080E21A4: movs r0, 0x5 bl audio_play ldr r1, =0x020375f0 movs r0, 0 - b _080E21B8 + b @080E21B8 .align 2, 0 .pool -_080E21B4: +@080E21B4: ldr r1, =0x020375f0 movs r0, 0x1 -_080E21B8: +@080E21B8: strh r0, [r1] -_080E21BA: +@080E21BA: adds r0, r4, 0 bl remove_task bl script_env_2_enable_and_set_ctx_running -_080E21C4: +@080E21C4: pop {r4} pop {r0} bx r0 @@ -429703,7 +429703,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 @@ -429729,12 +429729,12 @@ sub_80E21D0: @ 80E21D0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080E2210 + bne @080E2210 movs r0, 0 - b _080E22E8 + b @080E22E8 .align 2, 0 .pool -_080E2210: +@080E2210: ldr r0, =0x020375f0 movs r1, 0xFF strh r1, [r0] @@ -429746,9 +429746,9 @@ _080E2210: str r5, [sp, 0xC] ldrb r0, [r0, 0x4] cmp r2, r0 - bge _080E2246 + bge @080E2246 mov r8, r1 -_080E222A: +@080E222A: mov r0, r8 adds r4, r5, r0 ldr r1, [r4] @@ -429761,8 +429761,8 @@ _080E222A: adds r6, 0x1 ldrb r4, [r4, 0x4] cmp r6, r4 - blt _080E222A -_080E2246: + blt @080E222A +@080E2246: adds r0, r2, 0 bl convert_pixel_width_to_tile_width adds r5, r0, 0 @@ -429835,7 +429835,7 @@ _080E2246: movs r1, 0x3 bl Window_CopyToVram movs r0, 0x1 -_080E22E8: +@080E22E8: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -429849,7 +429849,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 @@ -429864,32 +429864,32 @@ sub_80E2308: @ 80E2308 movs r0, 0x2 negs r0, r0 cmp r1, r0 - beq _080E2360 + beq @080E2360 adds r0, 0x1 cmp r1, r0 - bne _080E234C + bne @080E234C movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0 - bne _080E2360 + bne @080E2360 movs r0, 0x5 bl audio_play ldr r1, =0x020375f0 movs r0, 0x7F strh r0, [r1] - b _080E2350 + b @080E2350 .align 2, 0 .pool -_080E234C: +@080E234C: ldr r0, =0x020375f0 strh r1, [r0] -_080E2350: +@080E2350: ldrb r0, [r5, 0xC] bl sub_80E2A78 adds r0, r4, 0 bl remove_task bl script_env_2_enable_and_set_ctx_running -_080E2360: +@080E2360: pop {r4,r5} pop {r0} bx r0 @@ -429898,32 +429898,32 @@ _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 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080E2394 + beq @080E2394 ldr r1, =0x020375f0 movs r0, 0xFF strh r0, [r1] bl CreatePCMenu movs r0, 0x1 - b _080E2396 + b @080E2396 .align 2, 0 .pool -_080E2394: +@080E2394: movs r0, 0 -_080E2396: +@080E2396: pop {r1} bx r1 thumb_func_end sp109_CreatePCMenu thumb_func_start CreatePCMenu -CreatePCMenu: @ 80E239C +CreatePCMenu: ; 80E239C push {r4-r7,lr} mov r7, r8 push {r7} @@ -429932,25 +429932,25 @@ CreatePCMenu: @ 80E239C movs r5, 0 movs r4, 0 ldr r6, =0x0858bb70 -_080E23AC: +@080E23AC: ldm r6!, {r0} adds r1, r5, 0 bl display_text_and_get_width adds r5, r0, 0 adds r4, 0x1 cmp r4, 0x3 - bls _080E23AC + bls @080E23AC ldr r6, =0x00000864 adds r0, r6, 0 bl flag_check lsls r0, 24 cmp r0, 0 - beq _080E23D4 + beq @080E23D4 ldr r0, =0x085eb18b adds r1, r5, 0 bl display_text_and_get_width adds r5, r0, 0 -_080E23D4: +@080E23D4: adds r0, r5, 0 bl convert_pixel_width_to_tile_width lsls r0, 24 @@ -429960,7 +429960,7 @@ _080E23D4: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - beq _080E2448 + beq @080E2448 movs r0, 0x4 mov r8, r0 movs r0, 0 @@ -429993,10 +429993,10 @@ _080E23D4: movs r1, 0x1 adds r3, r7, 0 bl Print - b _080E247A + b @080E247A .align 2, 0 .pool -_080E2448: +@080E2448: movs r0, 0x3 mov r8, r0 movs r0, 0 @@ -430019,13 +430019,13 @@ _080E2448: movs r1, 0x1 adds r3, r7, 0 bl Print -_080E247A: +@080E247A: ldr r0, =0x000008ab bl flag_check lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq _080E24B0 + beq @080E24B0 ldr r2, =0x085eb176 movs r0, 0x1 str r0, [sp] @@ -430037,10 +430037,10 @@ _080E247A: movs r1, 0x1 adds r3, r7, 0 bl Print - b _080E24C6 + b @080E24C6 .align 2, 0 .pool -_080E24B0: +@080E24B0: ldr r2, =0x085eb169 movs r0, 0x1 str r0, [sp] @@ -430051,7 +430051,7 @@ _080E24B0: movs r1, 0x1 adds r3, r7, 0 bl Print -_080E24C6: +@080E24C6: ldr r4, =0x02021fc4 ldr r1, =0x085eb183 adds r0, r4, 0 @@ -430084,7 +430084,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 @@ -430111,31 +430111,31 @@ 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 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080E2570 + beq @080E2570 ldr r1, =0x020375f0 movs r0, 0xFF strh r0, [r1] bl sub_80E2578 movs r0, 0x1 - b _080E2572 + b @080E2572 .align 2, 0 .pool -_080E2570: +@080E2570: movs r0, 0 -_080E2572: +@080E2572: pop {r1} bx r1 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 @@ -430145,7 +430145,7 @@ sub_80E2578: @ 80E2578 movs r4, 0 ldr r3, =0x03001124 movs r2, 0xFF -_080E258A: +@080E258A: adds r0, r4, r3 ldrb r1, [r0] orrs r1, r2 @@ -430154,14 +430154,14 @@ _080E258A: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x6 - bls _080E258A + bls @080E258A movs r0, 0x1 movs r1, 0 bl fbox_get_field ldr r0, =0x020375e0 ldrh r1, [r0] cmp r1, 0 - bne _080E25D2 + bne @080E25D2 ldr r4, =0x03001124 adds r0, r5, r4 strb r1, [r0] @@ -430174,30 +430174,30 @@ _080E258A: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x1 - bne _080E25D2 + bne @080E25D2 adds r0, r5, r4 strb r1, [r0] adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_080E25D2: +@080E25D2: ldr r0, =0x00000113 movs r1, 0x1 bl sub_80D6724 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080E2630 + bne @080E2630 ldr r0, =0x000008b3 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080E2630 + bne @080E2630 ldr r2, =0x020375e0 ldrh r0, [r2] cmp r0, 0 - bne _080E2606 + bne @080E2606 ldr r0, =0x03001124 adds r0, r5, r0 movs r1, 0x2 @@ -430205,17 +430205,17 @@ _080E25D2: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_080E2606: +@080E2606: ldrh r0, [r2] cmp r0, 0x1 - bne _080E2630 + bne @080E2630 movs r4, 0xD7 lsls r4, 1 adds r0, r4, 0 bl flag_check lsls r0, 24 cmp r0, 0 - bne _080E2630 + bne @080E2630 ldr r0, =0x03001124 adds r0, r5, r0 movs r1, 0x2 @@ -430225,7 +430225,7 @@ _080E2606: lsrs r5, r0, 24 adds r0, r4, 0 bl flag_set -_080E2630: +@080E2630: movs r0, 0xB9 lsls r0, 1 movs r1, 0x1 @@ -430233,18 +430233,18 @@ _080E2630: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080E2690 + bne @080E2690 movs r0, 0x8E lsls r0, 4 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080E2690 + bne @080E2690 ldr r2, =0x020375e0 ldrh r0, [r2] cmp r0, 0 - bne _080E2668 + bne @080E2668 ldr r0, =0x03001124 adds r0, r5, r0 movs r1, 0x3 @@ -430252,16 +430252,16 @@ _080E2630: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_080E2668: +@080E2668: ldrh r0, [r2] cmp r0, 0x1 - bne _080E2690 + bne @080E2690 ldr r4, =0x000001db adds r0, r4, 0 bl flag_check lsls r0, 24 cmp r0, 0 - bne _080E2690 + bne @080E2690 ldr r0, =0x03001124 adds r0, r5, r0 movs r1, 0x3 @@ -430271,24 +430271,24 @@ _080E2668: lsrs r5, r0, 24 adds r0, r4, 0 bl flag_set -_080E2690: +@080E2690: ldr r0, =0x00000173 movs r1, 0x1 bl sub_80D6724 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080E26EC + bne @080E26EC ldr r0, =0x000008d5 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080E26EC + bne @080E26EC ldr r2, =0x020375e0 ldrh r0, [r2] cmp r0, 0 - bne _080E26C4 + bne @080E26C4 ldr r0, =0x03001124 adds r0, r5, r0 movs r1, 0x4 @@ -430296,16 +430296,16 @@ _080E2690: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_080E26C4: +@080E26C4: ldrh r0, [r2] cmp r0, 0x1 - bne _080E26EC + bne @080E26EC ldr r4, =0x000001af adds r0, r4, 0 bl flag_check lsls r0, 24 cmp r0, 0 - bne _080E26EC + bne @080E26EC ldr r0, =0x03001124 adds r0, r5, r0 movs r1, 0x4 @@ -430315,7 +430315,7 @@ _080E26C4: lsrs r5, r0, 24 adds r0, r4, 0 bl flag_set -_080E26EC: +@080E26EC: movs r0, 0xBC lsls r0, 1 movs r1, 0x1 @@ -430323,17 +430323,17 @@ _080E26EC: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080E274C + bne @080E274C ldr r0, =0x000008d6 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080E274C + bne @080E274C ldr r2, =0x020375e0 ldrh r0, [r2] cmp r0, 0 - bne _080E2722 + bne @080E2722 ldr r0, =0x03001124 adds r0, r5, r0 movs r1, 0x5 @@ -430341,17 +430341,17 @@ _080E26EC: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_080E2722: +@080E2722: ldrh r0, [r2] cmp r0, 0x1 - bne _080E274C + bne @080E274C movs r4, 0xD8 lsls r4, 1 adds r0, r4, 0 bl flag_check lsls r0, 24 cmp r0, 0 - bne _080E274C + bne @080E274C ldr r0, =0x03001124 adds r0, r5, r0 movs r1, 0x5 @@ -430361,7 +430361,7 @@ _080E2722: lsrs r5, r0, 24 adds r0, r4, 0 bl flag_set -_080E274C: +@080E274C: ldr r0, =0x03001124 adds r0, r5, r0 movs r1, 0x6 @@ -430372,45 +430372,45 @@ _080E274C: ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 - bne _080E276E + bne @080E276E movs r0, 0xE8 lsls r0, 1 bl flag_check lsls r0, 24 lsrs r0, 24 -_080E276E: +@080E276E: adds r7, r5, 0 cmp r7, 0x7 - bne _080E27A4 + bne @080E27A4 ldr r1, =0x020375e0 movs r0, 0xB strh r0, [r1] bl sub_813A128 - b _080E2860 + b @080E2860 .align 2, 0 .pool -_080E27A4: +@080E27A4: movs r1, 0 movs r4, 0 lsls r6, r7, 25 subs r0, r7, 0x1 mov r9, r0 ldr r5, =0x0858bb80 -_080E27B0: +@080E27B0: ldr r0, =0x03001124 adds r0, r4, r0 ldrb r0, [r0] cmp r0, 0xFF - beq _080E27C6 + beq @080E27C6 lsls r0, 2 adds r0, r5 ldr r0, [r0] bl display_text_and_get_width adds r1, r0, 0 -_080E27C6: +@080E27C6: adds r4, 0x1 cmp r4, 0x6 - bls _080E27B0 + bls @080E27B0 adds r0, r1, 0 bl convert_pixel_width_to_tile_width adds r2, r0, 0 @@ -430435,12 +430435,12 @@ _080E27C6: movs r4, 0 ldr r0, =0x0858bb80 mov r8, r0 -_080E2802: +@080E2802: ldr r0, =0x03001124 adds r1, r4, r0 ldrb r0, [r1] cmp r0, 0xFF - beq _080E2834 + beq @080E2834 lsls r0, 2 add r0, r8 ldr r2, [r0] @@ -430460,12 +430460,12 @@ _080E2802: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_080E2834: +@080E2834: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x6 - bls _080E2802 + bls @080E2802 mov r0, r9 lsls r2, r0, 24 lsrs r2, 24 @@ -430480,7 +430480,7 @@ _080E2834: adds r2, r6, 0 movs r3, 0x8 bl sub_80E1FBC -_080E2860: +@080E2860: add sp, 0xC pop {r3,r4} mov r8, r3 @@ -430493,18 +430493,18 @@ _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] cmp r0, 0x7F - beq _080E288C + beq @080E288C ldr r0, =0x03001124 ldrh r1, [r2] adds r1, r0 ldrb r0, [r1] strh r0, [r2] -_080E288C: +@080E288C: pop {r0} bx r0 .align 2, 0 @@ -430512,7 +430512,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 @@ -430524,21 +430524,21 @@ task_picbox: @ 80E2898 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080E28F8 + beq @080E28F8 cmp r0, 0x1 - bgt _080E28C0 + bgt @080E28C0 cmp r0, 0 - beq _080E28DE - b _080E28F8 + beq @080E28DE + b @080E28F8 .align 2, 0 .pool -_080E28C0: +@080E28C0: cmp r0, 0x2 - beq _080E28CA + beq @080E28CA cmp r0, 0x3 - beq _080E28EC - b _080E28F8 -_080E28CA: + beq @080E28EC + b @080E28F8 +@080E28CA: movs r0, 0xC ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -430548,26 +430548,26 @@ _080E28CA: adds r0, r1 ldrb r1, [r4, 0xC] bl sub_80B6070 -_080E28DE: +@080E28DE: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080E28F8 + b @080E28F8 .align 2, 0 .pool -_080E28EC: +@080E28EC: ldrb r0, [r4, 0x12] bl sub_80E2A78 adds r0, r5, 0 bl remove_task -_080E28F8: +@080E28F8: pop {r4,r5} pop {r0} bx r0 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} @@ -430584,7 +430584,7 @@ sub_80E2900: @ 80E2900 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _080E29B8 + bne @080E29B8 lsls r1, r7, 19 movs r0, 0xA0 lsls r0, 14 @@ -430644,12 +430644,12 @@ sub_80E2900: @ 80E2900 movs r0, 0 bl schedule_bg_copy_tilemap_to_vram movs r0, 0x1 - b _080E29BA + b @080E29BA .align 2, 0 .pool -_080E29B8: +@080E29B8: movs r0, 0 -_080E29BA: +@080E29BA: pop {r3} mov r8, r3 pop {r4-r7} @@ -430658,14 +430658,14 @@ _080E29BA: thumb_func_end sub_80E2900 thumb_func_start picbox_close -picbox_close: @ 80E29C4 +picbox_close: ; 80E29C4 push {lr} ldr r0, =task_picbox + 1 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq _080E29F4 + beq @080E29F4 ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -430675,38 +430675,38 @@ picbox_close: @ 80E29C4 adds r0, 0x1 strh r0, [r1, 0x8] ldr r0, =sub_80E29FC + 1 - b _080E29F6 + b @080E29F6 .align 2, 0 .pool -_080E29F4: +@080E29F4: movs r0, 0 -_080E29F6: +@080E29F6: pop {r1} bx r1 thumb_func_end picbox_close thumb_func_start sub_80E29FC -sub_80E29FC: @ 80E29FC +sub_80E29FC: ; 80E29FC push {lr} ldr r0, =task_picbox + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _080E2A14 + beq @080E2A14 movs r0, 0 - b _080E2A16 + b @080E2A16 .align 2, 0 .pool -_080E2A14: +@080E2A14: movs r0, 0x1 -_080E2A16: +@080E2A16: pop {r1} bx r1 thumb_func_end sub_80E29FC thumb_func_start CreateWindowFromRect -CreateWindowFromRect: @ 80E2A1C +CreateWindowFromRect: ; 80E2A1C push {r4,r5,lr} sub sp, 0x20 adds r4, r0, 0 @@ -430753,7 +430753,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 @@ -430769,67 +430769,67 @@ 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 lsrs r0, 24 subs r0, 0x4A cmp r0, 0x5 - bhi _080E2B70 + bhi @080E2B70 lsls r0, 2 - ldr r1, =_080E2AB0 + ldr r1, =@080E2AB0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080E2AB0: - .4byte _080E2B40 - .4byte _080E2B08 - .4byte _080E2AD8 - .4byte _080E2AC8 - .4byte _080E2AE8 - .4byte _080E2AF8 -_080E2AC8: +@080E2AB0: + .4byte @080E2B40 + .4byte @080E2B08 + .4byte @080E2AD8 + .4byte @080E2AC8 + .4byte @080E2AE8 + .4byte @080E2AF8 +@080E2AC8: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels ldr r4, =0x0858bbac - b _080E2B12 + b @080E2B12 .align 2, 0 .pool -_080E2AD8: +@080E2AD8: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels ldr r4, =0x0858bb9c - b _080E2B12 + b @080E2B12 .align 2, 0 .pool -_080E2AE8: +@080E2AE8: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels ldr r4, =0x0858bbbc - b _080E2B12 + b @080E2B12 .align 2, 0 .pool -_080E2AF8: +@080E2AF8: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels ldr r4, =0x0858bbcc - b _080E2B12 + b @080E2B12 .align 2, 0 .pool -_080E2B08: +@080E2B08: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels ldr r4, =0x0858bbec -_080E2B12: +@080E2B12: bl GetMenuCursorPos lsls r0, 24 lsrs r0, 22 @@ -430847,10 +430847,10 @@ _080E2B12: movs r1, 0x1 movs r3, 0 bl text_box_related_one - b _080E2B70 + b @080E2B70 .align 2, 0 .pool -_080E2B40: +@080E2B40: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels @@ -430872,7 +430872,7 @@ _080E2B40: movs r1, 0x1 movs r3, 0 bl text_box_related_one -_080E2B70: +@080E2B70: add sp, 0x10 pop {r4} pop {r0} @@ -430882,31 +430882,31 @@ _080E2B70: thumb_func_end sub_80E2A94 thumb_func_start sp106_CreateStartMenu -sp106_CreateStartMenu: @ 80E2B7C +sp106_CreateStartMenu: ; 80E2B7C push {lr} ldr r0, =sub_80E2058 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080E2BA4 + beq @080E2BA4 ldr r1, =0x020375f0 movs r0, 0xFF strh r0, [r1] bl CreateStartMenu movs r0, 0x1 - b _080E2BA6 + b @080E2BA6 .align 2, 0 .pool -_080E2BA4: +@080E2BA4: movs r0, 0 -_080E2BA6: +@080E2BA6: pop {r1} bx r1 thumb_func_end sp106_CreateStartMenu thumb_func_start CreateStartMenu -CreateStartMenu: @ 80E2BAC +CreateStartMenu: ; 80E2BAC push {r4-r6,lr} sub sp, 0xC movs r0, 0x15 @@ -431022,7 +431022,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 @@ -431059,7 +431059,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 @@ -431075,59 +431075,59 @@ 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 cmp r0, r4 - bge _080E2D3A + bge @080E2D3A adds r0, r4, 0 -_080E2D3A: +@080E2D3A: pop {r4} pop {r1} bx r1 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 cmp r0, 0 - bge _080E2D4C + bge @080E2D4C adds r0, 0x7 -_080E2D4C: +@080E2D4C: asrs r0, 3 adds r0, 0x1 cmp r0, 0x1C - ble _080E2D56 + ble @080E2D56 movs r0, 0x1C -_080E2D56: +@080E2D56: pop {r1} bx r1 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 cmp r0, 0x1C - ble _080E2D70 + ble @080E2D70 movs r0, 0x1C subs r2, r0, r1 cmp r2, 0 - bge _080E2D70 + bge @080E2D70 movs r2, 0 -_080E2D70: +@080E2D70: adds r0, r2, 0 pop {r1} bx r1 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} @@ -431144,13 +431144,13 @@ do_choose_name_or_words_screen: @ 80E2D78 bl malloc str r0, [r4] cmp r0, 0 - bne _080E2DA8 + bne @080E2DA8 ldr r0, [sp, 0x1C] bl set_callback2 - b _080E2DE2 + b @080E2DE2 .align 2, 0 .pool -_080E2DA8: +@080E2DA8: ldr r1, =0x00001e2c adds r0, r1 strb r7, [r0] @@ -431174,12 +431174,12 @@ _080E2DA8: ldr r2, [sp, 0x1C] str r2, [r0] cmp r7, 0 - bne _080E2DDC + bne @080E2DDC bl start_timer1 -_080E2DDC: +@080E2DDC: ldr r0, =c2_choose_name_or_words_screen + 1 bl set_callback2 -_080E2DE2: +@080E2DE2: pop {r3} mov r8, r3 pop {r4-r7} @@ -431190,7 +431190,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 @@ -431198,52 +431198,52 @@ c2_choose_name_or_words_screen: @ 80E2E04 adds r0, r1 ldrb r0, [r0] cmp r0, 0x7 - bhi _080E2E9C + bhi @080E2E9C lsls r0, 2 - ldr r1, =_080E2E28 + ldr r1, =@080E2E28 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080E2E28: - .4byte _080E2E48 - .4byte _080E2E52 - .4byte _080E2E58 - .4byte _080E2E5E - .4byte _080E2E68 - .4byte _080E2E6E - .4byte _080E2E74 - .4byte _080E2E7A -_080E2E48: +@080E2E28: + .4byte @080E2E48 + .4byte @080E2E52 + .4byte @080E2E58 + .4byte @080E2E5E + .4byte @080E2E68 + .4byte @080E2E6E + .4byte @080E2E74 + .4byte @080E2E7A +@080E2E48: bl sub_80E4F70 bl choose_name_or_words_screen_setup - b _080E2E86 -_080E2E52: + b @080E2E86 +@080E2E52: bl choose_name_or_words_screen_init_bgs - b _080E2E86 -_080E2E58: + b @080E2E86 +@080E2E58: bl sub_80A1A74 - b _080E2E86 -_080E2E5E: + b @080E2E86 +@080E2E5E: bl reset_all_obj_data bl gpu_pal_allocator_reset - b _080E2E86 -_080E2E68: + b @080E2E86 +@080E2E68: bl clear_tasks - b _080E2E86 -_080E2E6E: + b @080E2E86 +@080E2E6E: bl choose_name_or_words_screen_apply_bg_pals - b _080E2E86 -_080E2E74: + b @080E2E86 +@080E2E74: bl choose_name_or_words_screen_load_bg_tile_patterns - b _080E2E86 -_080E2E7A: + b @080E2E86 +@080E2E7A: bl sub_80E3CC8 bl fade_and_return_progress_probably bl sub_80E501C -_080E2E86: +@080E2E86: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -431251,20 +431251,20 @@ _080E2E86: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _080E2EA4 + b @080E2EA4 .align 2, 0 .pool -_080E2E9C: +@080E2E9C: bl sub_80E4CB8 bl sub_80E3194 -_080E2EA4: +@080E2EA4: pop {r0} bx r0 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] @@ -431327,11 +431327,11 @@ choose_name_or_words_screen_setup: @ 80E2EA8 adds r2, r4 ldrb r0, [r2] cmp r0, 0x4 - bne _080E2F2C + bne @080E2F2C adds r0, r3, 0 adds r0, 0x11 strh r0, [r1] -_080E2F2C: +@080E2F2C: ldr r0, [r5] ldr r4, =0x030022b0 ldrh r1, [r4] @@ -431350,7 +431350,7 @@ _080E2F2C: ldr r0, [r0] ldrb r0, [r0] cmp r0, 0 - beq _080E2F64 + beq @080E2F64 movs r7, 0xC0 lsls r7, 5 adds r0, r1, r7 @@ -431358,7 +431358,7 @@ _080E2F2C: adds r1, r2 ldr r1, [r1] bl gf_strcpy -_080E2F64: +@080E2F64: movs r0, 0x10 strh r0, [r4] pop {r4-r7} @@ -431369,13 +431369,13 @@ _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 movs r5, 0x5 negs r5, r5 -_080E2FAE: +@080E2FAE: lsls r0, r3, 4 adds r0, r3 lsls r0, 2 @@ -431385,16 +431385,16 @@ _080E2FAE: ldrb r1, [r2] lsls r0, r1, 31 cmp r0, 0 - beq _080E2FC8 + beq @080E2FC8 adds r0, r5, 0 ands r0, r1 strb r0, [r2] -_080E2FC8: +@080E2FC8: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3F - bls _080E2FAE + bls @080E2FAE movs r0, 0 bl sub_80E3E3C pop {r4,r5} @@ -431405,7 +431405,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} @@ -431425,7 +431425,7 @@ choose_name_or_words_screen_init_bgs: @ 80E2FE4 movs r0, 0x81 lsls r0, 24 mov r12, r0 -_080E300A: +@080E300A: strh r6, [r2] add r0, sp, 0x8 str r0, [r1] @@ -431435,7 +431435,7 @@ _080E300A: adds r3, r5 subs r4, r5 cmp r4, r5 - bhi _080E300A + bhi @080E300A strh r6, [r2] add r2, sp, 0x8 str r2, [r1] @@ -431516,7 +431516,7 @@ _080E300A: bl bg_change_y_offset bl sub_81971D0 bl sub_8197200 -_080E30D8: +@080E30D8: lsls r0, r4, 3 ldr r1, =0x0858be10 adds r0, r1 @@ -431531,7 +431531,7 @@ _080E30D8: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 - bls _080E30D8 + bls @080E30D8 movs r1, 0x82 lsls r1, 5 movs r0, 0 @@ -431591,7 +431591,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 + 1 movs r1, 0x2 @@ -431605,7 +431605,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] @@ -431613,63 +431613,63 @@ sub_80E31B0: @ 80E31B0 adds r0, r1 ldrb r0, [r0] cmp r0, 0x9 - bhi _080E3240 + bhi @080E3240 lsls r0, 2 - ldr r1, =_080E31D8 + ldr r1, =@080E31D8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080E31D8: - .4byte _080E3200 - .4byte _080E320E - .4byte _080E3218 - .4byte _080E3214 - .4byte _080E321E - .4byte _080E3224 - .4byte _080E322A - .4byte _080E3230 - .4byte _080E3236 - .4byte _080E323C -_080E3200: +@080E31D8: + .4byte @080E3200 + .4byte @080E320E + .4byte @080E3218 + .4byte @080E3214 + .4byte @080E321E + .4byte @080E3224 + .4byte @080E322A + .4byte @080E3230 + .4byte @080E3236 + .4byte @080E323C +@080E3200: bl sub_80E3294 bl sub_80E2FA4 bl sub_80E4F84 - b _080E3240 -_080E320E: + b @080E3240 +@080E320E: bl sub_80E335C - b _080E3240 -_080E3214: + b @080E3240 +@080E3214: bl sub_80E33A8 -_080E3218: +@080E3218: bl sub_80E3398 - b _080E3240 -_080E321E: + b @080E3240 +@080E321E: bl sub_80E3640 - b _080E3240 -_080E3224: + b @080E3240 +@080E3224: bl sub_80E3680 - b _080E3240 -_080E322A: + b @080E3240 +@080E322A: bl pokemon_store - b _080E3240 -_080E3230: + b @080E3240 +@080E3230: bl sub_80E3604 - b _080E3240 -_080E3236: + b @080E3240 +@080E3236: bl sub_80E3448 - b _080E3240 -_080E323C: + b @080E3240 +@080E323C: bl sub_80E347C -_080E3240: +@080E3240: pop {r0} bx r0 thumb_func_end sub_80E31B0 thumb_func_start sub_80E3244 -sub_80E3244: @ 80E3244 +sub_80E3244: ; 80E3244 lsls r0, 24 lsrs r0, 24 ldr r1, =0x0858bebb @@ -431681,7 +431681,7 @@ sub_80E3244: @ 80E3244 thumb_func_end sub_80E3244 thumb_func_start sub_80E3254 -sub_80E3254: @ 80E3254 +sub_80E3254: ; 80E3254 ldr r1, =0x0858bebe ldr r0, =0x02039f94 ldr r0, [r0] @@ -431696,7 +431696,7 @@ sub_80E3254: @ 80E3254 thumb_func_end sub_80E3254 thumb_func_start sub_80E3274 -sub_80E3274: @ 80E3274 +sub_80E3274: ; 80E3274 ldr r1, =0x0858bec1 ldr r0, =0x02039f94 ldr r0, [r0] @@ -431711,7 +431711,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, =0x08dd4544 @@ -431785,14 +431785,14 @@ 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] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080E3384 + bne @080E3384 movs r0, 0x1 bl sub_80E4630 movs r0, 0x1 @@ -431804,7 +431804,7 @@ sub_80E335C: @ 80E335C ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_080E3384: +@080E3384: movs r0, 0 pop {r1} bx r1 @@ -431813,7 +431813,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 @@ -431823,12 +431823,12 @@ 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 cmp r0, 0 - beq _080E33CA + beq @080E33CA movs r0, 0x1 bl sub_80E4630 bl sub_80E3E28 @@ -431838,7 +431838,7 @@ sub_80E33A8: @ 80E33A8 adds r0, r1 movs r1, 0x2 strb r1, [r0] -_080E33CA: +@080E33CA: movs r0, 0 pop {r1} bx r1 @@ -431847,7 +431847,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 @@ -431864,12 +431864,12 @@ pokemon_store: @ 80E33D8 adds r0, r1 ldrb r0, [r0] cmp r0, 0x2 - bne _080E342C + bne @080E342C bl calc_player_party_count lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 - bls _080E342C + bls @080E342C bl pokemon_transfer_to_pc_with_message ldr r0, [r4] ldr r1, =0x00001e10 @@ -431877,10 +431877,10 @@ pokemon_store: @ 80E33D8 movs r1, 0x7 strb r1, [r0] movs r0, 0 - b _080E343A + b @080E343A .align 2, 0 .pool -_080E342C: +@080E342C: ldr r0, =0x02039f94 ldr r0, [r0] ldr r1, =0x00001e10 @@ -431888,7 +431888,7 @@ _080E342C: movs r1, 0x8 strb r1, [r0] movs r0, 0x1 -_080E343A: +@080E343A: pop {r4} pop {r1} bx r1 @@ -431897,7 +431897,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 @@ -431923,7 +431923,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] @@ -431932,16 +431932,16 @@ sub_80E347C: @ 80E347C lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _080E34C6 + bne @080E34C6 ldr r4, =0x02039f94 ldr r0, [r4] ldr r1, =0x00001e2c adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _080E34A0 + bne @080E34A0 bl set_rand_seed_and_trainer_id_hi -_080E34A0: +@080E34A0: ldr r0, [r4] ldr r1, =0x00001e3c adds r0, r1 @@ -431956,7 +431956,7 @@ _080E34A0: ldr r0, [r4] bl free str r5, [r4] -_080E34C6: +@080E34C6: movs r0, 0 pop {r4,r5} pop {r1} @@ -431966,14 +431966,14 @@ _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 bl sub_813B260 lsls r0, 24 cmp r0, 0 - bne _080E3534 + bne @080E3534 ldr r4, =0x02021cc4 ldr r0, =0x00004036 bl var_get @@ -431990,10 +431990,10 @@ pokemon_transfer_to_pc_with_message: @ 80E34E4 adds r1, r2 ldr r1, [r1] bl gf_strcpy - b _080E3574 + b @080E3574 .align 2, 0 .pool -_080E3534: +@080E3534: ldr r4, =0x02021cc4 ldr r0, =0x00004036 bl var_get @@ -432019,16 +432019,16 @@ _080E3534: adds r0, r4, 0 bl gf_strcpy movs r5, 0x2 -_080E3574: +@080E3574: ldr r0, =0x000008ab bl flag_check lsls r0, 24 cmp r0, 0 - beq _080E3586 + beq @080E3586 adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_080E3586: +@080E3586: ldr r4, =0x02021fc4 ldr r1, =0x0858bdb8 lsls r0, r5, 2 @@ -432072,27 +432072,27 @@ _080E3586: thumb_func_end pokemon_transfer_to_pc_with_message thumb_func_start sub_80E3604 -sub_80E3604: @ 80E3604 +sub_80E3604: ; 80E3604 push {lr} bl run_remoboxes movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _080E362E + bne @080E362E ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080E362E + beq @080E362E ldr r0, =0x02039f94 ldr r0, [r0] ldr r1, =0x00001e10 adds r0, r1 movs r1, 0x8 strb r1, [r0] -_080E362E: +@080E362E: movs r0, 0 pop {r1} bx r1 @@ -432101,7 +432101,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 @@ -432129,13 +432129,13 @@ 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 lsls r0, 24 cmp r0, 0 - beq _080E3732 + beq @080E3732 mov r4, sp adds r4, 0x2 mov r0, sp @@ -432150,9 +432150,9 @@ sub_80E3680: @ 80E3680 lsrs r0, 24 adds r6, r4, 0 cmp r1, r0 - bne _080E36B2 + bne @080E36B2 movs r5, 0x1 -_080E36B2: +@080E36B2: ldr r2, =0x02039f94 ldr r0, [r2] ldr r1, =0x00001e10 @@ -432172,15 +432172,15 @@ _080E36B2: bl __umodsi3 strb r0, [r4] cmp r5, 0 - beq _080E36F4 + beq @080E36F4 mov r4, sp bl sub_80E3F70 lsls r0, 24 lsrs r0, 24 - b _080E3712 + b @080E3712 .align 2, 0 .pool -_080E36F4: +@080E36F4: mov r0, sp movs r2, 0 ldrsh r4, [r0, r2] @@ -432188,15 +432188,15 @@ _080E36F4: lsls r0, 24 lsrs r0, 24 cmp r4, r0 - blt _080E3714 + blt @080E3714 mov r4, sp bl sub_80E3F70 lsls r0, 24 lsrs r0, 24 subs r0, 0x1 -_080E3712: +@080E3712: strh r0, [r4] -_080E3714: +@080E3714: mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -432208,7 +432208,7 @@ _080E3714: bl sub_80E4630 movs r0, 0 bl sub_80E3E3C -_080E3732: +@080E3732: movs r0, 0 add sp, 0x4 pop {r4-r6} @@ -432217,7 +432217,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 + 1 adds r0, r4, 0 @@ -432234,7 +432234,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 @@ -432244,7 +432244,7 @@ sub_80E375C: @ 80E375C adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_080E376E: +@080E376E: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -432254,7 +432254,7 @@ _080E376E: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _080E376E + bne @080E376E pop {r4,r5} pop {r0} bx r0 @@ -432263,27 +432263,27 @@ _080E376E: thumb_func_end sub_80E375C thumb_func_start sub_80E3794 -sub_80E3794: @ 80E3794 +sub_80E3794: ; 80E3794 push {lr} ldr r0, =sub_80E375C + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _080E37AC + beq @080E37AC movs r0, 0 - b _080E37AE + b @080E37AE .align 2, 0 .pool -_080E37AC: +@080E37AC: movs r0, 0x1 -_080E37AE: +@080E37AE: pop {r1} bx r1 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 @@ -432303,7 +432303,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 @@ -432348,7 +432348,7 @@ sub_80E37DC: @ 80E37DC movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0x3F - ble _080E3852 + ble @080E3852 ldr r0, [r5] ldr r1, =0x00001e1c adds r2, r0, r1 @@ -432361,7 +432361,7 @@ sub_80E37DC: @ 80E37DC ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080E3852: +@080E3852: movs r0, 0 add sp, 0x8 pop {r4,r5} @@ -432372,7 +432372,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 @@ -432417,7 +432417,7 @@ sub_80E3870: @ 80E3870 movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0x7F - ble _080E38EA + ble @080E38EA ldr r0, [r5] movs r2, 0xF1 lsls r2, 5 @@ -432432,7 +432432,7 @@ sub_80E3870: @ 80E3870 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080E38EA: +@080E38EA: movs r0, 0 add sp, 0x8 pop {r4,r5} @@ -432443,7 +432443,7 @@ _080E38EA: thumb_func_end sub_80E3870 thumb_func_start sub_80E3904 -sub_80E3904: @ 80E3904 +sub_80E3904: ; 80E3904 push {lr} ldr r0, =sub_80E375C + 1 bl get_task_id_by_function @@ -432458,7 +432458,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 + 1 movs r1, 0x3 @@ -432479,7 +432479,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 @@ -432499,46 +432499,46 @@ sub_80E3948: @ 80E3948 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r5, r0 - bne _080E3988 + bne @080E3988 cmp r6, 0 - bne _080E3988 + bne @080E3988 strh r7, [r4, 0xA] movs r0, 0x1 strh r0, [r4, 0xC] - b _080E39B4 + b @080E39B4 .align 2, 0 .pool -_080E3988: +@080E3988: cmp r5, 0x3 - bne _080E3998 + bne @080E3998 movs r2, 0xA ldrsh r0, [r4, r2] cmp r0, 0 - bne _080E3998 + bne @080E3998 cmp r6, 0 - beq _080E39B4 -_080E3998: + beq @080E39B4 +@080E3998: ldrh r1, [r4, 0x8] movs r2, 0x8 ldrsh r0, [r4, r2] cmp r0, 0x3 - beq _080E39AA + beq @080E39AA lsls r0, r1, 24 lsrs r0, 24 bl sub_80E3AE8 -_080E39AA: +@080E39AA: adds r0, r4, 0 adds r1, r5, 0 adds r2, r7, 0 bl sub_80E3B10 -_080E39B4: +@080E39B4: pop {r4-r7} pop {r0} bx r0 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 @@ -432551,11 +432551,11 @@ c3_0809E58C: @ 80E39BC movs r2, 0x8 ldrsh r0, [r4, r2] cmp r0, 0x3 - beq _080E3A6E + beq @080E3A6E movs r3, 0xC ldrsh r0, [r4, r3] cmp r0, 0 - beq _080E3A6E + beq @080E3A6E lsls r0, r1, 24 lsrs r0, 24 bl sub_80E3A74 @@ -432569,76 +432569,76 @@ c3_0809E58C: @ 80E39BC movs r2, 0x12 ldrsh r0, [r4, r2] cmp r0, 0 - beq _080E3A08 + beq @080E3A08 subs r0, r1, 0x1 strh r0, [r4, 0x12] lsls r0, 16 cmp r0, 0 - bne _080E3A6E -_080E3A08: + bne @080E3A6E +@080E3A08: movs r0, 0x2 strh r0, [r4, 0x12] ldrh r1, [r4, 0x10] movs r3, 0x10 ldrsh r0, [r4, r3] cmp r0, 0 - blt _080E3A32 + blt @080E3A32 ldrh r2, [r4, 0xE] movs r3, 0xE ldrsh r0, [r4, r3] cmp r0, 0xD - bgt _080E3A28 + bgt @080E3A28 adds r0, r2, r1 - b _080E3A36 + b @080E3A36 .align 2, 0 .pool -_080E3A28: +@080E3A28: movs r0, 0x10 strh r0, [r4, 0xE] ldrh r0, [r4, 0x14] adds r0, 0x1 - b _080E3A3C -_080E3A32: + b @080E3A3C +@080E3A32: ldrh r3, [r4, 0xE] adds r0, r1, r3 -_080E3A36: +@080E3A36: strh r0, [r4, 0xE] ldrh r2, [r4, 0x14] adds r0, r1, r2 -_080E3A3C: +@080E3A3C: strh r0, [r4, 0x14] movs r3, 0xE ldrsh r0, [r4, r3] ldrh r1, [r4, 0xE] cmp r0, 0x10 - bne _080E3A5C + bne @080E3A5C movs r2, 0x14 ldrsh r0, [r4, r2] cmp r0, 0x16 - bne _080E3A5C + bne @080E3A5C ldr r0, =0x0000fffc strh r0, [r4, 0x10] - b _080E3A6E + b @080E3A6E .align 2, 0 .pool -_080E3A5C: +@080E3A5C: lsls r0, r1, 16 asrs r1, r0, 16 cmp r1, 0 - bne _080E3A6E + bne @080E3A6E ldrh r0, [r4, 0xA] strh r0, [r4, 0xC] movs r0, 0x2 strh r0, [r4, 0x10] strh r1, [r4, 0x14] -_080E3A6E: +@080E3A6E: pop {r4} pop {r0} bx r0 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 @@ -432695,7 +432695,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 @@ -432715,7 +432715,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 @@ -432735,7 +432735,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 @@ -432743,11 +432743,11 @@ sub_80E3B30: @ 80E3B30 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080E3B48 + beq @080E3B48 adds r0, r5, 0 movs r1, 0 bl obj_anim_image_start -_080E3B48: +@080E3B48: ldrh r0, [r5, 0x36] movs r1, 0xFF ands r1, r0 @@ -432768,49 +432768,49 @@ _080E3B48: lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bne _080E3B7C + bne @080E3B7C ldrb r0, [r6] movs r1, 0x4 orrs r0, r1 strb r0, [r6] -_080E3B7C: +@080E3B7C: ldrb r1, [r6] movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne _080E3BAC + bne @080E3BAC movs r1, 0x36 ldrsh r0, [r5, r1] movs r1, 0xFF lsls r1, 8 ands r0, r1 cmp r0, 0 - beq _080E3BAC + beq @080E3BAC movs r2, 0x2E ldrsh r1, [r5, r2] movs r2, 0x32 ldrsh r0, [r5, r2] cmp r1, r0 - bne _080E3BAC + bne @080E3BAC movs r0, 0x30 ldrsh r1, [r5, r0] movs r2, 0x34 ldrsh r0, [r5, r2] cmp r1, r0 - beq _080E3BB6 -_080E3BAC: + beq @080E3BB6 +@080E3BAC: movs r0, 0 strh r0, [r5, 0x38] movs r0, 0x2 strh r0, [r5, 0x3A] strh r0, [r5, 0x3C] -_080E3BB6: +@080E3BB6: ldrh r0, [r5, 0x3C] subs r0, 0x1 strh r0, [r5, 0x3C] lsls r0, 16 cmp r0, 0 - bne _080E3BDE + bne @080E3BDE ldrh r1, [r5, 0x3A] ldrh r2, [r5, 0x38] adds r0, r1, r2 @@ -432818,23 +432818,23 @@ _080E3BB6: lsls r0, 16 asrs r0, 16 cmp r0, 0x10 - beq _080E3BD6 + beq @080E3BD6 cmp r0, 0 - bne _080E3BDA -_080E3BD6: + bne @080E3BDA +@080E3BD6: negs r0, r1 strh r0, [r5, 0x3A] -_080E3BDA: +@080E3BDA: movs r0, 0x2 strh r0, [r5, 0x3C] -_080E3BDE: +@080E3BDE: movs r1, 0x36 ldrsh r0, [r5, r1] movs r1, 0xFF lsls r1, 8 ands r0, r1 cmp r0, 0 - beq _080E3C14 + beq @080E3C14 ldrh r4, [r5, 0x38] lsls r5, r4, 24 lsrs r5, 24 @@ -432853,7 +432853,7 @@ _080E3BDE: adds r2, r5, 0 adds r3, r5, 0 bl sub_80B609C -_080E3C14: +@080E3C14: pop {r4-r6} pop {r0} bx r0 @@ -432862,7 +432862,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 @@ -432874,13 +432874,13 @@ sub_80E3C20: @ 80E3C20 movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0 - beq _080E3C44 + beq @080E3C44 subs r0, r1, 0x1 strh r0, [r4, 0x2E] lsls r0, 16 cmp r0, 0 - bne _080E3C52 -_080E3C44: + bne @080E3C52 +@080E3C44: movs r0, 0x8 strh r0, [r4, 0x2E] ldrh r0, [r4, 0x30] @@ -432888,7 +432888,7 @@ _080E3C44: movs r1, 0x3 ands r0, r1 strh r0, [r4, 0x30] -_080E3C52: +@080E3C52: movs r1, 0x30 ldrsh r0, [r4, r1] lsls r0, 1 @@ -432904,7 +432904,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 @@ -432917,14 +432917,14 @@ sub_80E3C6C: @ 80E3C6C ldrh r1, [r4, 0x2E] lsls r1, 24 cmp r0, r1 - beq _080E3C98 + beq @080E3C98 movs r0, 0 strh r0, [r4, 0x26] strh r0, [r4, 0x30] - b _080E3CBE + b @080E3CBE .align 2, 0 .pool -_080E3C98: +@080E3C98: movs r1, 0x30 ldrsh r0, [r4, r1] lsls r0, 1 @@ -432937,16 +432937,16 @@ _080E3C98: lsls r0, 16 asrs r0, 16 cmp r0, 0x8 - ble _080E3CC0 + ble @080E3CC0 ldrh r0, [r4, 0x30] adds r0, 0x1 movs r1, 0x3 ands r0, r1 strh r0, [r4, 0x30] movs r0, 0 -_080E3CBE: +@080E3CBE: strh r0, [r4, 0x32] -_080E3CC0: +@080E3CC0: add sp, 0x8 pop {r4} pop {r0} @@ -432954,7 +432954,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 @@ -432966,7 +432966,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, =0x0858c138 movs r1, 0x26 @@ -433034,7 +433034,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} @@ -433061,7 +433061,7 @@ sub_80E3D78: @ 80E3D78 adds r0, r4 ldrb r0, [r0] cmp r6, r0 - bge _080E3DD8 + bge @080E3DD8 bl sub_80E3274 ldr r1, =0x0858bea3 lsls r0, 24 @@ -433070,12 +433070,12 @@ sub_80E3D78: @ 80E3D78 adds r0, r1 ldrb r0, [r0] adds r0, 0x26 - b _080E3DDA + b @080E3DDA .align 2, 0 .pool -_080E3DD8: +@080E3DD8: movs r0, 0 -_080E3DDA: +@080E3DDA: strh r0, [r5, 0x20] lsls r0, r7, 16 asrs r0, 12 @@ -433096,7 +433096,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 @@ -433117,7 +433117,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 @@ -433129,7 +433129,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 @@ -433170,7 +433170,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 @@ -433204,7 +433204,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] @@ -433225,7 +433225,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] @@ -433246,7 +433246,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 @@ -433261,18 +433261,18 @@ sub_80E3F30: @ 80E3F30 lsls r0, 24 lsrs r0, 24 cmp r4, r0 - blt _080E3F64 + blt @080E3F64 ldr r0, =0x0858bee4 movs r2, 0 ldrsh r1, [r5, r2] adds r1, r0 ldrb r0, [r1] - b _080E3F66 + b @080E3F66 .align 2, 0 .pool -_080E3F64: +@080E3F64: movs r0, 0 -_080E3F66: +@080E3F66: add sp, 0x4 pop {r4,r5} pop {r1} @@ -433280,7 +433280,7 @@ _080E3F66: thumb_func_end sub_80E3F30 thumb_func_start sub_80E3F70 -sub_80E3F70: @ 80E3F70 +sub_80E3F70: ; 80E3F70 push {r4,lr} ldr r4, =0x0858bea0 bl sub_80E3274 @@ -433296,7 +433296,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} @@ -433378,7 +433378,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 @@ -433401,11 +433401,11 @@ 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, =0x0858bee8 -_080E408A: +@080E408A: movs r1, 0x2E ldrsh r0, [r4, r1] lsls r0, 2 @@ -433415,7 +433415,7 @@ _080E408A: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _080E408A + bne @080E408A pop {r4,r5} pop {r0} bx r0 @@ -433424,7 +433424,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 @@ -433463,13 +433463,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 @@ -433491,7 +433491,7 @@ sub_80E4104: @ 80E4104 lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - ble _080E4168 + ble @080E4168 ldrh r0, [r3, 0x2E] adds r0, 0x1 strh r0, [r3, 0x2E] @@ -433517,7 +433517,7 @@ sub_80E4104: @ 80E4104 adds r1, r4, 0 adds r2, r5, 0 bl sub_80E41B8 -_080E4168: +@080E4168: movs r0, 0 pop {r4,r5} pop {r1} @@ -433527,7 +433527,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 @@ -433549,12 +433549,12 @@ sub_80E4178: @ 80E4178 strh r0, [r2, 0x26] lsls r0, 16 cmp r0, 0 - blt _080E41AC + blt @080E41AC movs r0, 0 strh r0, [r2, 0x26] movs r0, 0x1 strh r0, [r4, 0x2E] -_080E41AC: +@080E41AC: movs r0, 0 pop {r4} pop {r1} @@ -433564,7 +433564,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} @@ -433612,7 +433612,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} @@ -433666,7 +433666,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] @@ -433705,9 +433705,9 @@ sub_80E4290: @ 80E4290 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r5, r0 - bcs _080E4334 + bcs @080E4334 adds r6, r3, 0 -_080E42E2: +@080E42E2: lsls r1, 16 asrs r4, r1, 16 movs r0, 0xC0 @@ -433747,8 +433747,8 @@ _080E42E2: ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r5, r0 - bcc _080E42E2 -_080E4334: + bcc @080E42E2 +@080E4334: pop {r4-r6} pop {r0} bx r0 @@ -433757,7 +433757,7 @@ _080E4334: thumb_func_end sub_80E4290 thumb_func_start sub_80E4354 -sub_80E4354: @ 80E4354 +sub_80E4354: ; 80E4354 push {lr} ldr r1, =0x0858bf04 ldr r0, =0x02039f94 @@ -433777,12 +433777,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 @@ -433822,7 +433822,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, =0x0858c180 movs r1, 0x38 @@ -433851,7 +433851,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 @@ -433891,7 +433891,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, =nullsub_12 + 1 @@ -433923,7 +433923,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 @@ -433933,41 +433933,41 @@ sub_80E44BC: @ 80E44BC lsls r0, 24 lsrs r0, 24 cmp r4, 0x8 - bne _080E44DA + bne @080E44DA bl sub_80E45E0 - b _080E44F6 -_080E44DA: + b @080E44F6 +@080E44DA: cmp r4, 0x6 - bne _080E44E4 + bne @080E44E4 bl sub_80E4AF8 - b _080E4504 -_080E44E4: + b @080E4504 +@080E44E4: cmp r5, 0x9 - beq _080E4500 + beq @080E4500 ldr r1, =0x0858bf18 lsls r0, 2 adds r0, r1 ldr r1, [r0] adds r0, r5, 0 bl _call_via_r1 -_080E44F6: +@080E44F6: lsls r0, 24 lsrs r0, 24 - b _080E4506 + b @080E4506 .align 2, 0 .pool -_080E4500: +@080E4500: bl sub_80E3E28 -_080E4504: +@080E4504: movs r0, 0 -_080E4506: +@080E4506: pop {r4,r5} pop {r1} bx r1 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 @@ -433977,14 +433977,14 @@ sub_80E450C: @ 80E450C movs r2, 0 bl sub_80E3948 cmp r4, 0x5 - bne _080E4546 + bne @080E4546 bl sub_80E4B54 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 bl sub_80E3ED8 cmp r4, 0 - beq _080E4546 + beq @080E4546 movs r0, 0x2 bl sub_80E4630 ldr r0, =0x02039f94 @@ -433993,7 +433993,7 @@ sub_80E450C: @ 80E450C adds r0, r1 movs r1, 0x3 strb r1, [r0] -_080E4546: +@080E4546: movs r0, 0 pop {r4} pop {r1} @@ -434003,7 +434003,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 @@ -434013,21 +434013,21 @@ sub_80E4558: @ 80E4558 movs r2, 0 bl sub_80E3948 cmp r4, 0x5 - beq _080E4572 + beq @080E4572 movs r0, 0 - b _080E457A -_080E4572: + b @080E457A +@080E4572: bl sub_80E45E0 lsls r0, 24 lsrs r0, 24 -_080E457A: +@080E457A: pop {r4} pop {r1} bx r1 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 @@ -434037,9 +434037,9 @@ sub_80E4580: @ 80E4580 movs r2, 0 bl sub_80E3948 cmp r4, 0x5 - bne _080E459A + bne @080E459A bl sub_80E4AF8 -_080E459A: +@080E459A: movs r0, 0 pop {r4} pop {r1} @@ -434047,7 +434047,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 @@ -434057,10 +434057,10 @@ sub_80E45A4: @ 80E45A4 movs r2, 0 bl sub_80E3948 cmp r4, 0x5 - beq _080E45BE + beq @080E45BE movs r0, 0 - b _080E45D2 -_080E45BE: + b @080E45D2 +@080E45BE: movs r0, 0x5 bl audio_play ldr r0, =0x02039f94 @@ -434070,7 +434070,7 @@ _080E45BE: movs r1, 0x6 strb r1, [r0] movs r0, 0x1 -_080E45D2: +@080E45D2: pop {r4} pop {r1} bx r1 @@ -434079,7 +434079,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 @@ -434093,7 +434093,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 + 1 movs r1, 0x1 @@ -434105,7 +434105,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 + 1 bl get_task_id_by_function @@ -434124,7 +434124,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 @@ -434147,7 +434147,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 @@ -434171,14 +434171,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 @@ -434188,53 +434188,53 @@ sub_80E4692: @ 80E4692 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080E46B4 + beq @080E46B4 movs r0, 0x5 strh r0, [r2, 0xA] - b _080E46E4 + b @080E46E4 .align 2, 0 .pool -_080E46B4: +@080E46B4: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080E46C2 + beq @080E46C2 movs r0, 0x6 strh r0, [r2, 0xA] - b _080E46E4 -_080E46C2: + b @080E46E4 +@080E46C2: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080E46D0 + beq @080E46D0 movs r0, 0x8 strh r0, [r2, 0xA] - b _080E46E4 -_080E46D0: + b @080E46E4 +@080E46D0: movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _080E46DE + beq @080E46DE movs r0, 0x9 strh r0, [r2, 0xA] - b _080E46E4 -_080E46DE: + b @080E46E4 +@080E46DE: adds r0, r2, 0 bl sub_80E46F0 -_080E46E4: +@080E46E4: pop {r0} bx r0 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 @@ -434283,21 +434283,21 @@ sub_80E46F0: @ 80E46F0 ands r0, r2 adds r6, r4, 0 cmp r0, 0 - beq _080E475E + beq @080E475E movs r1, 0x2 -_080E475E: +@080E475E: movs r0, 0x20 ands r0, r2 cmp r0, 0 - beq _080E4768 + beq @080E4768 movs r1, 0x3 -_080E4768: +@080E4768: movs r0, 0x10 ands r0, r2 cmp r0, 0 - beq _080E4772 + beq @080E4772 movs r1, 0x4 -_080E4772: +@080E4772: ldrh r0, [r6] mov r8, r0 lsls r1, 1 @@ -434314,33 +434314,33 @@ _080E4772: movs r2, 0 ldrsh r0, [r6, r2] cmp r0, 0 - bge _080E479E + bge @080E479E bl sub_80E3F70 lsls r0, 24 lsrs r0, 24 strh r0, [r6] -_080E479E: +@080E479E: movs r0, 0 ldrsh r4, [r6, r0] bl sub_80E3F70 lsls r0, 24 lsrs r0, 24 cmp r4, r0 - ble _080E47B2 + ble @080E47B2 movs r0, 0 strh r0, [r6] -_080E47B2: +@080E47B2: movs r1, 0 ldrsh r0, [r7, r1] cmp r0, 0 - beq _080E481E + beq @080E481E movs r2, 0 ldrsh r4, [r6, r2] bl sub_80E3F70 lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bne _080E47F0 + bne @080E47F0 ldrh r0, [r5] mov r1, r9 strh r0, [r1, 0xC] @@ -434349,10 +434349,10 @@ _080E47B2: lsls r0, 1 ldr r1, [sp, 0x2C] adds r0, r1, r0 - b _080E481A + b @080E481A .align 2, 0 .pool -_080E47F0: +@080E47F0: mov r2, r8 lsls r4, r2, 16 asrs r4, 16 @@ -434360,75 +434360,75 @@ _080E47F0: lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bne _080E481E + bne @080E481E movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0x1 - bne _080E4810 + bne @080E4810 mov r2, r9 ldrh r0, [r2, 0xC] - b _080E481C -_080E4810: + b @080E481C +@080E4810: movs r1, 0 ldrsh r0, [r5, r1] lsls r0, 1 ldr r2, [sp, 0x30] adds r0, r2, r0 -_080E481A: +@080E481A: ldrh r0, [r0] -_080E481C: +@080E481C: strh r0, [r5] -_080E481E: +@080E481E: movs r0, 0 ldrsh r4, [r6, r0] bl sub_80E3F70 lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bne _080E4860 + bne @080E4860 movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0 - bge _080E483A + bge @080E483A movs r0, 0x2 strh r0, [r5] -_080E483A: +@080E483A: movs r2, 0 ldrsh r0, [r5, r2] cmp r0, 0x2 - ble _080E4846 + ble @080E4846 movs r0, 0 strh r0, [r5] -_080E4846: +@080E4846: movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0 - bne _080E4856 + bne @080E4856 movs r0, 0x1 mov r2, r9 strh r0, [r2, 0xC] - b _080E4878 -_080E4856: + b @080E4878 +@080E4856: cmp r0, 0x2 - bne _080E4878 + bne @080E4878 mov r1, r9 strh r0, [r1, 0xC] - b _080E4878 -_080E4860: + b @080E4878 +@080E4860: movs r2, 0 ldrsh r0, [r5, r2] cmp r0, 0 - bge _080E486C + bge @080E486C movs r0, 0x3 strh r0, [r5] -_080E486C: +@080E486C: movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0x3 - ble _080E4878 + ble @080E4878 movs r0, 0 strh r0, [r5] -_080E4878: +@080E4878: movs r2, 0 ldrsh r0, [r6, r2] movs r2, 0 @@ -434445,7 +434445,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 @@ -434483,7 +434483,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 @@ -434536,7 +434536,7 @@ sub_80E48E8: @ 80E48E8 thumb_func_end sub_80E48E8 thumb_func_start sub_80E4964 -sub_80E4964: @ 80E4964 +sub_80E4964: ; 80E4964 push {lr} ldr r1, =0x0858bf58 ldr r0, =0x02039f94 @@ -434555,7 +434555,7 @@ sub_80E4964: @ 80E4964 thumb_func_end sub_80E4964 thumb_func_start sub_80E498C -sub_80E498C: @ 80E498C +sub_80E498C: ; 80E498C push {lr} ldr r1, =0x0858bf6c ldr r0, =0x02039f94 @@ -434575,12 +434575,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 @@ -434593,14 +434593,14 @@ sub_80E49BC: @ 80E49BC adds r0, r1 ldrh r0, [r0] cmp r0, 0xFF - beq _080E4A0C + beq @080E4A0C cmp r0, 0xFE - bne _080E49E6 + bne @080E49E6 ldr r1, =0x085e8d4b add r0, sp, 0xC bl gf_strcpy movs r4, 0x1 -_080E49E6: +@080E49E6: ldr r0, [r5] ldr r1, =0x00001e13 adds r0, r1 @@ -434619,7 +434619,7 @@ _080E49E6: movs r2, 0x68 movs r3, 0x1 bl box_print -_080E4A0C: +@080E4A0C: add sp, 0x10 pop {r4,r5} pop {r0} @@ -434629,7 +434629,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 @@ -434657,7 +434657,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 @@ -434668,26 +434668,26 @@ sub_80E4A60: @ 80E4A60 ldrb r3, [r1, 0x1] adds r5, r0, 0 cmp r2, r3 - bcs _080E4A9A + bcs @080E4A9A movs r0, 0xC0 lsls r0, 5 adds r1, r4, r0 -_080E4A7C: +@080E4A7C: adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0xFF - bne _080E4A90 + bne @080E4A90 adds r0, r2, 0 - b _080E4AAA + b @080E4AAA .align 2, 0 .pool -_080E4A90: +@080E4A90: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, r3 - bcc _080E4A7C -_080E4A9A: + bcc @080E4A7C +@080E4A9A: ldr r0, [r5] ldr r1, =0x00001e28 adds r0, r1 @@ -434696,7 +434696,7 @@ _080E4A9A: subs r0, 0x1 lsls r0, 24 lsrs r0, 24 -_080E4AAA: +@080E4AAA: pop {r4,r5} pop {r1} bx r1 @@ -434705,7 +434705,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] @@ -434716,34 +434716,34 @@ sub_80E4AB4: @ 80E4AB4 subs r0, 0x1 lsls r1, r0, 24 cmp r1, 0 - ble _080E4AF0 + ble @080E4AF0 movs r0, 0xC0 lsls r0, 5 adds r3, r2, r0 -_080E4AD0: +@080E4AD0: asrs r2, r1, 24 adds r0, r3, r2 ldrb r0, [r0] cmp r0, 0xFF - beq _080E4AE8 + beq @080E4AE8 lsrs r0, r1, 24 - b _080E4AF2 + b @080E4AF2 .align 2, 0 .pool -_080E4AE8: +@080E4AE8: subs r0, r2, 0x1 lsls r1, r0, 24 cmp r1, 0 - bgt _080E4AD0 -_080E4AF0: + bgt @080E4AD0 +@080E4AF0: movs r0, 0 -_080E4AF2: +@080E4AF2: pop {r1} bx r1 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 @@ -434769,15 +434769,15 @@ sub_80E4AF8: @ 80E4AF8 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _080E4B38 + beq @080E4B38 cmp r0, 0x2 - bne _080E4B42 -_080E4B38: + bne @080E4B42 +@080E4B38: movs r0, 0x1 movs r1, 0 movs r2, 0x1 bl sub_80E3948 -_080E4B42: +@080E4B42: movs r0, 0x17 bl audio_play pop {r4-r6} @@ -434788,7 +434788,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 @@ -434821,14 +434821,14 @@ sub_80E4B54: @ 80E4B54 ldrb r1, [r1, 0x1] subs r1, 0x1 cmp r0, r1 - bne _080E4BB0 + bne @080E4BB0 movs r0, 0x1 - b _080E4BB2 + b @080E4BB2 .align 2, 0 .pool -_080E4BB0: +@080E4BB0: movs r0, 0 -_080E4BB2: +@080E4BB2: add sp, 0x4 pop {r4} pop {r1} @@ -434836,7 +434836,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 @@ -434859,7 +434859,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 @@ -434868,10 +434868,10 @@ sub_80E4BE4: @ 80E4BE4 adds r0, r4 ldr r0, [r0] adds r5, r1, 0 - b _080E4C44 + b @080E4C44 .align 2, 0 .pool -_080E4C00: +@080E4C00: ldr r1, [r1] movs r0, 0xC0 lsls r0, 5 @@ -434879,9 +434879,9 @@ _080E4C00: adds r0, r3, r2 ldrb r0, [r0] cmp r0, 0 - beq _080E4C34 + beq @080E4C34 cmp r0, 0xFF - beq _080E4C34 + beq @080E4C34 ldr r2, =0x00001e30 adds r0, r1, r2 ldr r0, [r0] @@ -434893,10 +434893,10 @@ _080E4C00: lsrs r2, 24 adds r1, r3, 0 bl gf_strncpy - b _080E4C4A + b @080E4C4A .align 2, 0 .pool -_080E4C34: +@080E4C34: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 @@ -434905,11 +434905,11 @@ _080E4C34: ldr r4, =0x00001e28 adds r0, r4 ldr r0, [r0] -_080E4C44: +@080E4C44: ldrb r0, [r0, 0x1] cmp r2, r0 - bcc _080E4C00 -_080E4C4A: + bcc @080E4C00 +@080E4C4A: pop {r4,r5} pop {r0} bx r0 @@ -434918,7 +434918,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, =0x08dd3838 ldr r6, =0x02039f94 @@ -434958,7 +434958,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 @@ -434967,7 +434967,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, =0x08dd3778 movs r1, 0 @@ -434989,7 +434989,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 @@ -435001,12 +435001,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 @@ -435033,13 +435033,13 @@ sub_80E4D10: @ 80E4D10 bl Window_FastFillPixels movs r4, 0 cmp r4, r6 - bcs _080E4DA6 + bcs @080E4DA6 add r5, sp, 0xC mov r10, r4 ldr r0, =0x085e8218 ldrb r0, [r0] mov r8, r0 -_080E4D52: +@080E4D52: ldr r0, [r7] movs r1, 0xC0 lsls r1, 5 @@ -435055,9 +435055,9 @@ _080E4D52: lsrs r0, 24 movs r1, 0 cmp r0, 0x1 - bne _080E4D76 + bne @080E4D76 movs r1, 0x2 -_080E4D76: +@080E4D76: ldr r0, [r7] ldr r2, =0x00001e13 adds r0, r2 @@ -435080,8 +435080,8 @@ _080E4D76: lsls r0, 24 lsrs r4, r0, 24 cmp r4, r6 - bcc _080E4D52 -_080E4DA6: + bcc @080E4D52 +@080E4DA6: bl sub_80E498C ldr r5, =0x02039f94 ldr r0, [r5] @@ -435107,7 +435107,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} @@ -435128,7 +435128,7 @@ sub_80E4DE4: @ 80E4DE4 ldr r7, [r0] ldr r0, =0x0858c198 mov r8, r0 -_080E4E0E: +@080E4E0E: lsls r3, r4, 4 adds r3, 0x1 lsls r3, 24 @@ -435150,7 +435150,7 @@ _080E4E0E: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _080E4E0E + bls @080E4E0E adds r0, r6, 0 bl Window_WriteStandardTileMap add sp, 0xC @@ -435164,7 +435164,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 lcd_io_get @@ -435175,22 +435175,22 @@ sub_80E4E5C: @ 80E4E5C bl lcd_io_get ands r0, r5 cmp r4, r0 - bls _080E4E8C + bls @080E4E8C movs r5, 0x1 movs r6, 0x1 ldr r1, =0x02039f94 ldr r0, [r1] ldr r2, =0x00001e11 - b _080E4E96 + b @080E4E96 .align 2, 0 .pool -_080E4E8C: +@080E4E8C: movs r5, 0x2 movs r6, 0x2 ldr r1, =0x02039f94 ldr r0, [r1] ldr r2, =0x00001e12 -_080E4E96: +@080E4E96: adds r0, r2 ldrb r4, [r0] adds r0, r1, 0 @@ -435226,7 +435226,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, =0x0858bfa4 @@ -435271,7 +435271,7 @@ sub_80E4EF0: @ 80E4EF0 thumb_func_end sub_80E4EF0 thumb_func_start sub_80E4F58 -sub_80E4F58: @ 80E4F58 +sub_80E4F58: ; 80E4F58 push {lr} bl run_active_tasks bl call_obj_callbacks @@ -435282,7 +435282,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 @@ -435293,7 +435293,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 + 1 bl SetVBlankCallback @@ -435304,7 +435304,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 copy_super_sprites_to_oam bl copy_queue_process @@ -435355,7 +435355,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 gpu_sync_bg_show @@ -435370,7 +435370,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 @@ -435379,21 +435379,21 @@ sub_80E503C: @ 80E503C ldrb r1, [r0] adds r3, r0, 0 cmp r1, 0xFF - beq _080E5066 + beq @080E5066 adds r1, r3, 0 -_080E5050: +@080E5050: adds r0, r2, r1 ldrb r0, [r0] cmp r4, r0 - beq _080E5066 + beq @080E5066 adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 adds r0, r2, r3 ldrb r0, [r0] cmp r0, 0xFF - bne _080E5050 -_080E5066: + bne @080E5050 +@080E5066: movs r0, 0 pop {r4} pop {r1} @@ -435403,7 +435403,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 @@ -435424,7 +435424,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 @@ -435445,7 +435445,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 @@ -435466,7 +435466,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 @@ -435487,8 +435487,8 @@ sub_80E50EC: @ 80E50EC thumb_func_end sub_80E50EC thumb_func_start decrypt_money -@ int decrypt_money(int *money_ptr) -decrypt_money: @ 80E5114 +; int decrypt_money(int *money_ptr) +decrypt_money: ; 80E5114 ldr r1, =0x03005d90 ldr r1, [r1] adds r1, 0xAC @@ -435501,8 +435501,8 @@ decrypt_money: @ 80E5114 thumb_func_end decrypt_money thumb_func_start encrypt_money -@ void encrypt_money(int *money_ptr, int value) -encrypt_money: @ 80E5128 +; void encrypt_money(int *money_ptr, int value) +encrypt_money: ; 80E5128 ldr r2, =0x03005d90 ldr r2, [r2] adds r2, 0xAC @@ -435515,26 +435515,26 @@ encrypt_money: @ 80E5128 thumb_func_end encrypt_money thumb_func_start is_money_greater_than -@ int is_money_greater_than(int *money_ptr, int amount) -is_money_greater_than: @ 80E513C +; int is_money_greater_than(int *money_ptr, int amount) +is_money_greater_than: ; 80E513C push {r4,lr} adds r4, r1, 0 bl decrypt_money cmp r0, r4 - bcs _080E514C + bcs @080E514C movs r0, 0 - b _080E514E -_080E514C: + b @080E514E +@080E514C: movs r0, 0x1 -_080E514E: +@080E514E: pop {r4} pop {r1} bx r1 thumb_func_end is_money_greater_than 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 @@ -435544,14 +435544,14 @@ add_money: @ 80E5154 ldr r5, =0x000f423f adds r4, r5, 0 cmp r0, r5 - bhi _080E5178 + bhi @080E5178 adds r5, r0, 0 adds r0, r6, 0 bl decrypt_money cmp r5, r0 - bcs _080E5178 + bcs @080E5178 adds r5, r4, 0 -_080E5178: +@080E5178: adds r0, r6, 0 adds r1, r5, 0 bl encrypt_money @@ -435563,20 +435563,20 @@ _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 bl decrypt_money adds r1, r0, 0 cmp r1, r4 - bcs _080E51A0 + bcs @080E51A0 movs r1, 0 - b _080E51A2 -_080E51A0: + b @080E51A2 +@080E51A0: subs r1, r4 -_080E51A2: +@080E51A2: adds r0, r5, 0 bl encrypt_money pop {r4,r5} @@ -435585,7 +435585,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] @@ -435604,7 +435604,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] @@ -435621,8 +435621,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 @@ -435640,8 +435640,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} @@ -435672,16 +435672,16 @@ PrintMoneyAmount: @ 80E5214 adds r0, r1, 0 subs r1, 0x1 cmp r0, 0 - ble _080E5264 + ble @080E5264 movs r3, 0x77 -_080E5258: +@080E5258: strb r3, [r2] adds r2, 0x1 adds r0, r1, 0 subs r1, 0x1 cmp r0, 0 - bgt _080E5258 -_080E5264: + bgt @080E5258 +@080E5264: ldr r1, =0x085e969c adds r0, r2, 0 bl ExpandTextCodes @@ -435705,8 +435705,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} @@ -435737,7 +435737,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 @@ -435751,8 +435751,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} @@ -435824,7 +435824,7 @@ sub_80E52EC: @ 80E52EC thumb_func_end sub_80E52EC thumb_func_start sub_80E5384 -sub_80E5384: @ 80E5384 +sub_80E5384: ; 80E5384 push {r4,lr} bl sub_80E53F4 ldr r4, =0x02039f98 @@ -435844,7 +435844,7 @@ sub_80E5384: @ 80E5384 thumb_func_end sub_80E5384 thumb_func_start AddMoneyTextObject -AddMoneyTextObject: @ 80E53AC +AddMoneyTextObject: ; 80E53AC push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -435875,7 +435875,7 @@ AddMoneyTextObject: @ 80E53AC thumb_func_end AddMoneyTextObject thumb_func_start sub_80E53F4 -sub_80E53F4: @ 80E53F4 +sub_80E53F4: ; 80E53F4 push {lr} ldr r0, =0x02039f99 ldrb r1, [r0] @@ -435892,7 +435892,7 @@ sub_80E53F4: @ 80E53F4 thumb_func_end sub_80E53F4 thumb_func_start sub_80E5414 -sub_80E5414: @ 80E5414 +sub_80E5414: ; 80E5414 push {r4,lr} sub sp, 0x4 lsls r0, 16 @@ -435915,31 +435915,31 @@ sub_80E5414: @ 80E5414 ldrb r1, [r1, 0x6] strb r1, [r0, 0x3] cmp r4, 0 - beq _080E5470 + beq @080E5470 mov r0, sp ldrb r0, [r0] cmp r4, r0 - beq _080E545E + beq @080E545E mov r0, sp ldrb r0, [r0, 0x1] cmp r4, r0 - beq _080E545E + beq @080E545E mov r0, sp ldrb r0, [r0, 0x2] cmp r4, r0 - beq _080E545E + beq @080E545E cmp r4, r1 - bne _080E5470 -_080E545E: + bne @080E5470 +@080E545E: ldr r0, =0x0858ce8c adds r0, r4, r0 ldrb r0, [r0] - b _080E5472 + b @080E5472 .align 2, 0 .pool -_080E5470: +@080E5470: movs r0, 0 -_080E5472: +@080E5472: add sp, 0x4 pop {r4} pop {r1} @@ -435947,12 +435947,12 @@ _080E5472: thumb_func_end sub_80E5414 thumb_func_start nullsub_99 -nullsub_99: @ 80E547C +nullsub_99: ; 80E547C bx lr thumb_func_end nullsub_99 thumb_func_start sub_80E5480 -sub_80E5480: @ 80E5480 +sub_80E5480: ; 80E5480 push {lr} ldr r3, =0x02039f34 ldr r1, [r3] @@ -435979,7 +435979,7 @@ sub_80E5480: @ 80E5480 thumb_func_end sub_80E5480 thumb_func_start sub_80E54B0 -sub_80E54B0: @ 80E54B0 +sub_80E54B0: ; 80E54B0 push {lr} ldr r3, =0x02039f34 ldr r1, [r3] @@ -436006,7 +436006,7 @@ sub_80E54B0: @ 80E54B0 thumb_func_end sub_80E54B0 thumb_func_start sub_80E54E0 -sub_80E54E0: @ 80E54E0 +sub_80E54E0: ; 80E54E0 ldr r3, =0x02039f34 ldr r1, [r3] ldr r0, [r1, 0x8] @@ -436052,7 +436052,7 @@ sub_80E54E0: @ 80E54E0 thumb_func_end sub_80E54E0 thumb_func_start sub_80E5534 -sub_80E5534: @ 80E5534 +sub_80E5534: ; 80E5534 push {lr} ldr r3, =0x02039f34 ldr r1, [r3] @@ -436077,7 +436077,7 @@ sub_80E5534: @ 80E5534 thumb_func_end sub_80E5534 thumb_func_start sub_80E5560 -sub_80E5560: @ 80E5560 +sub_80E5560: ; 80E5560 push {lr} ldr r3, =0x02039f34 ldr r1, [r3] @@ -436104,7 +436104,7 @@ sub_80E5560: @ 80E5560 thumb_func_end sub_80E5560 thumb_func_start sub_80E5590 -sub_80E5590: @ 80E5590 +sub_80E5590: ; 80E5590 push {lr} ldr r3, =0x02039f34 ldr r1, [r3] @@ -436129,7 +436129,7 @@ sub_80E5590: @ 80E5590 thumb_func_end sub_80E5590 thumb_func_start sub_80E55BC -sub_80E55BC: @ 80E55BC +sub_80E55BC: ; 80E55BC push {lr} ldr r3, =0x02039f34 ldr r1, [r3] @@ -436156,7 +436156,7 @@ sub_80E55BC: @ 80E55BC thumb_func_end sub_80E55BC thumb_func_start sub_80E55EC -sub_80E55EC: @ 80E55EC +sub_80E55EC: ; 80E55EC push {r4,r5,lr} movs r2, 0 ldr r5, =0x02039f34 @@ -436166,16 +436166,16 @@ sub_80E55EC: @ 80E55EC adds r3, r1, r4 ldrb r0, [r3] cmp r0, 0 - beq _080E563A + beq @080E563A subs r0, 0x1 ldrb r1, [r1] cmp r0, r1 - beq _080E5622 + beq @080E5622 adds r3, r5, 0 -_080E560A: +@080E560A: adds r2, 0x1 cmp r2, 0x3 - bgt _080E5622 + bgt @080E5622 ldr r0, [r3] ldr r1, [r0, 0x8] adds r0, r1, r4 @@ -436184,8 +436184,8 @@ _080E560A: adds r1, r2 ldrb r1, [r1] cmp r0, r1 - bne _080E560A -_080E5622: + bne @080E560A +@080E5622: ldr r1, =0x02039f34 ldr r0, [r1] ldr r0, [r0, 0x8] @@ -436197,16 +436197,16 @@ _080E5622: bl sub_80E6A2C lsls r0, 24 lsrs r2, r0, 24 -_080E563A: +@080E563A: cmp r2, 0 - bne _080E564C + bne @080E564C ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x36 bl sub_80DD3F0 -_080E564C: +@080E564C: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] @@ -436221,7 +436221,7 @@ _080E564C: thumb_func_end sub_80E55EC thumb_func_start c3_080493E4 -c3_080493E4: @ 80E5664 +c3_080493E4: ; 80E5664 push {r4-r6,lr} movs r1, 0 ldr r2, =0x02039f34 @@ -436231,11 +436231,11 @@ c3_080493E4: @ 80E5664 adds r0, r5 ldrb r0, [r0] cmp r0, 0 - beq _080E56B4 + beq @080E56B4 movs r3, 0 movs r4, 0 adds r6, r2, 0 -_080E567E: +@080E567E: ldr r0, [r6] ldr r2, [r0, 0x8] adds r0, r2, r5 @@ -436243,16 +436243,16 @@ _080E567E: ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bls _080E5698 + bls @080E5698 adds r0, r2, 0 adds r0, 0x8 adds r0, r4 strb r3, [r0] adds r4, 0x1 -_080E5698: +@080E5698: adds r3, 0x1 cmp r3, 0x3 - ble _080E567E + ble @080E567E ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] @@ -436263,16 +436263,16 @@ _080E5698: bl sub_80E6A2C lsls r0, 24 lsrs r1, r0, 24 -_080E56B4: +@080E56B4: cmp r1, 0 - bne _080E56C6 + bne @080E56C6 ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x36 bl sub_80DD3F0 -_080E56C6: +@080E56C6: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] @@ -436287,7 +436287,7 @@ _080E56C6: thumb_func_end c3_080493E4 thumb_func_start sub_80E56E0 -sub_80E56E0: @ 80E56E0 +sub_80E56E0: ; 80E56E0 push {lr} bl GenerateRandomNumber lsls r0, 16 @@ -436298,12 +436298,12 @@ sub_80E56E0: @ 80E56E0 lsrs r0, 24 movs r1, 0x14 cmp r0, 0x1 - bls _080E5702 + bls @080E5702 movs r1, 0x3C cmp r0, 0x7 - bhi _080E5702 + bhi @080E5702 movs r1, 0x28 -_080E5702: +@080E5702: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] @@ -436316,7 +436316,7 @@ _080E5702: thumb_func_end sub_80E56E0 thumb_func_start sub_80E5718 -sub_80E5718: @ 80E5718 +sub_80E5718: ; 80E5718 push {r4-r7,lr} mov r7, r8 push {r7} @@ -436329,10 +436329,10 @@ sub_80E5718: @ 80E5718 ldrb r0, [r0] mov r8, r1 cmp r0, 0 - beq _080E579E + beq @080E579E movs r4, 0 mov r6, r8 -_080E5736: +@080E5736: ldr r0, [r6] ldr r2, [r0, 0x8] adds r0, r2, r5 @@ -436340,7 +436340,7 @@ _080E5736: ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bls _080E5798 + bls @080E5798 strb r4, [r2, 0x8] ldr r0, [r6] ldr r1, [r0, 0x8] @@ -436355,36 +436355,36 @@ _080E5736: lsrs r0, 24 movs r1, 0 cmp r0, 0 - beq _080E5782 + beq @080E5782 movs r1, 0xA cmp r0, 0x2 - bls _080E5782 + bls @080E5782 movs r1, 0x14 cmp r0, 0x4 - bls _080E5782 + bls @080E5782 movs r1, 0x1E cmp r0, 0x6 - bls _080E5782 + bls @080E5782 movs r1, 0x3C cmp r0, 0x8 - bhi _080E5782 + bhi @080E5782 movs r1, 0x28 -_080E5782: +@080E5782: ldr r0, [r6] ldr r0, [r0, 0x8] strh r1, [r0, 0x4] bl sub_80E6A2C lsls r0, 24 cmp r0, 0 - beq _080E5798 + beq @080E5798 adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 -_080E5798: +@080E5798: adds r4, 0x1 cmp r4, 0x3 - ble _080E5736 -_080E579E: + ble @080E5736 +@080E579E: mov r1, r8 ldr r0, [r1] ldr r0, [r0, 0x8] @@ -436392,14 +436392,14 @@ _080E579E: movs r1, 0x30 bl sub_80DD3D4 cmp r7, 0 - bne _080E57BE + bne @080E57BE mov r1, r8 ldr r0, [r1] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x36 bl sub_80DD3F0 -_080E57BE: +@080E57BE: pop {r3} mov r8, r3 pop {r4-r7} @@ -436410,7 +436410,7 @@ _080E57BE: thumb_func_end sub_80E5718 thumb_func_start sub_80E57CC -sub_80E57CC: @ 80E57CC +sub_80E57CC: ; 80E57CC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -436427,11 +436427,11 @@ sub_80E57CC: @ 80E57CC ldrb r0, [r0] mov r10, r1 cmp r0, 0 - beq _080E5858 + beq @080E5858 movs r6, 0 mov r7, r10 movs r5, 0 -_080E57F4: +@080E57F4: ldr r2, [r7] ldr r0, [r2, 0x8] mov r3, r8 @@ -436440,21 +436440,21 @@ _080E57F4: ldrb r1, [r1] ldrb r0, [r0] cmp r1, r0 - bls _080E5850 + bls @080E5850 ldr r0, [r2, 0x4] adds r0, r5, r0 ldrb r1, [r0, 0x15] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080E5850 + beq @080E5850 lsls r0, r6, 24 lsrs r4, r0, 24 adds r0, r4, 0 bl sub_80E69C8 lsls r0, 24 cmp r0, 0 - beq _080E5850 + beq @080E5850 ldr r0, [r7] ldr r2, [r0, 0x4] adds r2, r5, r2 @@ -436476,12 +436476,12 @@ _080E57F4: bl sub_80DD3D4 movs r0, 0x1 mov r9, r0 -_080E5850: +@080E5850: adds r5, 0x1C adds r6, 0x1 cmp r6, 0x3 - ble _080E57F4 -_080E5858: + ble @080E57F4 +@080E5858: mov r1, r10 ldr r0, [r1] ldr r0, [r0, 0x8] @@ -436490,14 +436490,14 @@ _080E5858: bl sub_80DD3D4 mov r2, r9 cmp r2, 0 - bne _080E587A + bne @080E587A mov r3, r10 ldr r0, [r3] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x36 bl sub_80DD3F0 -_080E587A: +@080E587A: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -436510,7 +436510,7 @@ _080E587A: thumb_func_end sub_80E57CC thumb_func_start sub_80E588C -sub_80E588C: @ 80E588C +sub_80E588C: ; 80E588C push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -436525,11 +436525,11 @@ sub_80E588C: @ 80E588C ldrb r0, [r0] adds r4, r1, 0 cmp r0, 0 - beq _080E590A + beq @080E590A movs r5, 0 movs r6, 0 mov r8, r4 -_080E58B0: +@080E58B0: ldr r3, [r4] ldr r2, [r3, 0x8] adds r0, r2, r7 @@ -436537,21 +436537,21 @@ _080E58B0: ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bls _080E5900 + bls @080E5900 ldr r0, [r3, 0x4] adds r0, r6, r0 ldrb r1, [r0, 0x15] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080E58D8 + beq @080E58D8 movs r0, 0x32 - b _080E58DA + b @080E58DA .align 2, 0 .pool -_080E58D8: +@080E58D8: movs r0, 0xA -_080E58DA: +@080E58DA: strh r0, [r2, 0x4] mov r1, r8 ldr r0, [r1] @@ -436564,19 +436564,19 @@ _080E58DA: bl sub_80E6A2C lsls r0, 24 cmp r0, 0 - beq _080E5900 + beq @080E5900 mov r0, r9 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r9, r0 -_080E5900: +@080E5900: adds r6, 0x1C adds r5, 0x1 ldr r4, =0x02039f34 cmp r5, 0x3 - ble _080E58B0 -_080E590A: + ble @080E58B0 +@080E590A: ldr r0, [r4] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -436584,13 +436584,13 @@ _080E590A: bl sub_80DD3D4 mov r0, r9 cmp r0, 0 - bne _080E5928 + bne @080E5928 ldr r0, [r4] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x36 bl sub_80DD3F0 -_080E5928: +@080E5928: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -436602,7 +436602,7 @@ _080E5928: thumb_func_end sub_80E588C thumb_func_start sub_80E5938 -sub_80E5938: @ 80E5938 +sub_80E5938: ; 80E5938 push {r4,lr} ldr r4, =0x02039f34 ldr r1, [r4] @@ -436631,7 +436631,7 @@ sub_80E5938: @ 80E5938 thumb_func_end sub_80E5938 thumb_func_start sub_80E5970 -sub_80E5970: @ 80E5970 +sub_80E5970: ; 80E5970 push {r4,lr} ldr r4, =0x02039f34 ldr r1, [r4] @@ -436663,7 +436663,7 @@ sub_80E5970: @ 80E5970 thumb_func_end sub_80E5970 thumb_func_start sub_80E59B0 -sub_80E59B0: @ 80E59B0 +sub_80E59B0: ; 80E59B0 push {lr} movs r0, 0 bl sub_80E6934 @@ -436680,7 +436680,7 @@ sub_80E59B0: @ 80E59B0 thumb_func_end sub_80E59B0 thumb_func_start sub_80E59D0 -sub_80E59D0: @ 80E59D0 +sub_80E59D0: ; 80E59D0 push {lr} movs r0, 0x1 bl sub_80E6934 @@ -436697,7 +436697,7 @@ sub_80E59D0: @ 80E59D0 thumb_func_end sub_80E59D0 thumb_func_start sub_80E59F0 -sub_80E59F0: @ 80E59F0 +sub_80E59F0: ; 80E59F0 push {lr} movs r0, 0x2 bl sub_80E6934 @@ -436714,7 +436714,7 @@ sub_80E59F0: @ 80E59F0 thumb_func_end sub_80E59F0 thumb_func_start sub_80E5A10 -sub_80E5A10: @ 80E5A10 +sub_80E5A10: ; 80E5A10 push {lr} movs r0, 0x3 bl sub_80E6934 @@ -436731,7 +436731,7 @@ sub_80E5A10: @ 80E5A10 thumb_func_end sub_80E5A10 thumb_func_start sub_80E5A30 -sub_80E5A30: @ 80E5A30 +sub_80E5A30: ; 80E5A30 push {lr} movs r0, 0x4 bl sub_80E6934 @@ -436748,7 +436748,7 @@ sub_80E5A30: @ 80E5A30 thumb_func_end sub_80E5A30 thumb_func_start sub_80E5A50 -sub_80E5A50: @ 80E5A50 +sub_80E5A50: ; 80E5A50 push {r4-r6,lr} movs r4, 0 ldr r2, =0x02039f34 @@ -436759,9 +436759,9 @@ sub_80E5A50: @ 80E5A50 ldrb r0, [r0] adds r6, r2, 0 cmp r0, 0x3 - beq _080E5AB0 + beq @080E5AB0 movs r5, 0 -_080E5A68: +@080E5A68: ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0x8] @@ -436772,52 +436772,52 @@ _080E5A68: adds r1, r5 ldrb r1, [r1] cmp r0, r1 - bne _080E5AAA + bne @080E5AAA lsls r0, r5, 24 lsrs r4, r0, 24 adds r0, r4, 0 bl sub_80E69C8 lsls r0, 24 cmp r0, 0 - beq _080E5AA0 + beq @080E5AA0 adds r0, r4, 0 bl sub_80DD560 adds r0, r4, 0 movs r1, 0xA - b _080E5AA4 + b @080E5AA4 .align 2, 0 .pool -_080E5AA0: +@080E5AA0: adds r0, r4, 0 movs r1, 0x3C -_080E5AA4: +@080E5AA4: bl sub_80DD3D4 movs r4, 0x1 -_080E5AAA: +@080E5AAA: adds r5, 0x1 cmp r5, 0x3 - ble _080E5A68 -_080E5AB0: + ble @080E5A68 +@080E5AB0: ldr r0, [r6] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x9 bl sub_80DD3D4 cmp r4, 0 - bne _080E5ACC + bne @080E5ACC ldr r0, [r6] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x36 bl sub_80DD3F0 -_080E5ACC: +@080E5ACC: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_80E5A50 thumb_func_start sub_80E5AD4 -sub_80E5AD4: @ 80E5AD4 +sub_80E5AD4: ; 80E5AD4 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -436839,7 +436839,7 @@ sub_80E5AD4: @ 80E5AD4 add r3, sp, 0x8 mov r10, r3 movs r6, 0 -_080E5B00: +@080E5B00: ldr r0, =0x02039f34 ldr r2, [r0] ldr r1, [r2, 0x8] @@ -436849,70 +436849,70 @@ _080E5B00: ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bcs _080E5B38 + bcs @080E5B38 ldr r0, [r2, 0x4] adds r0, r6, r0 ldrb r1, [r0, 0xC] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080E5B38 + bne @080E5B38 lsls r0, r5, 24 lsrs r0, 24 bl sub_80DBCA8 lsls r0, 24 cmp r0, 0 - bne _080E5B38 + bne @080E5B38 mov r1, sp adds r0, r1, r4 strb r5, [r0] adds r4, 0x1 -_080E5B38: +@080E5B38: adds r6, 0x1C adds r5, 0x1 cmp r5, 0x3 - ble _080E5B00 + ble @080E5B00 cmp r4, 0x1 - bne _080E5B50 + bne @080E5B50 movs r0, 0x3C mov r2, r8 strh r0, [r2] - b _080E5B7E + b @080E5B7E .align 2, 0 .pool -_080E5B50: +@080E5B50: cmp r4, 0x2 - bne _080E5B5E + bne @080E5B5E movs r0, 0x1E mov r3, r8 strh r0, [r3] strh r0, [r3, 0x2] - b _080E5B7E -_080E5B5E: + b @080E5B7E +@080E5B5E: cmp r4, 0x3 - bne _080E5B6E + bne @080E5B6E movs r0, 0x14 mov r6, r8 strh r0, [r6] strh r0, [r6, 0x2] strh r0, [r6, 0x4] - b _080E5B7E -_080E5B6E: + b @080E5B7E +@080E5B6E: mov r1, r8 movs r2, 0 mov r0, r8 adds r0, 0x6 -_080E5B76: +@080E5B76: strh r2, [r0] subs r0, 0x2 cmp r0, r1 - bge _080E5B76 -_080E5B7E: + bge @080E5B76 +@080E5B7E: movs r5, 0 ldr r7, =0x02039f34 movs r6, 0 mov r4, r10 -_080E5B86: +@080E5B86: ldr r0, [r7] ldr r0, [r0, 0x4] adds r0, r6, r0 @@ -436920,13 +436920,13 @@ _080E5B86: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080E5BD0 + beq @080E5BD0 lsls r0, r5, 24 lsrs r0, 24 bl sub_80DE1E8 lsls r0, 24 cmp r0, 0 - beq _080E5BD0 + beq @080E5BD0 ldr r0, [r7] ldr r0, [r0, 0x4] adds r0, r6, r0 @@ -436941,12 +436941,12 @@ _080E5B86: lsls r0, r1, 2 adds r0, r1 lsls r0, 1 - b _080E5BD2 + b @080E5BD2 .align 2, 0 .pool -_080E5BD0: +@080E5BD0: movs r0, 0 -_080E5BD2: +@080E5BD2: strh r0, [r4] ldr r0, [r7] ldr r0, [r0, 0x4] @@ -436968,19 +436968,19 @@ _080E5BD2: adds r4, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble _080E5B86 + ble @080E5B86 mov r3, r8 movs r6, 0 ldrsh r0, [r3, r6] cmp r0, 0 - beq _080E5CA0 + beq @080E5CA0 movs r5, 0 mov r0, sp ldrb r0, [r0] cmp r0, 0xFF - beq _080E5CA0 + beq @080E5CA0 mov r4, sp -_080E5C16: +@080E5C16: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -436999,12 +436999,12 @@ _080E5C16: ldrsh r1, [r1, r6] adds r2, r1 cmp r0, r2 - bge _080E5C66 + bge @080E5C66 adds r0, r3, 0 bl sub_80E69C8 lsls r0, 24 cmp r0, 0 - beq _080E5C70 + beq @080E5C70 ldrb r0, [r4] bl sub_80DD560 ldrb r0, [r4] @@ -437015,15 +437015,15 @@ _080E5C16: lsls r0, 24 lsrs r0, 24 mov r9, r0 - b _080E5C6A -_080E5C66: + b @080E5C6A +@080E5C66: movs r0, 0x1 str r0, [sp, 0x18] -_080E5C6A: +@080E5C6A: ldr r1, [sp, 0x18] cmp r1, 0 - beq _080E5C86 -_080E5C70: + beq @080E5C86 +@080E5C70: movs r2, 0 str r2, [sp, 0x18] ldrb r0, [r4] @@ -437034,7 +437034,7 @@ _080E5C70: lsls r0, 24 lsrs r0, 24 mov r9, r0 -_080E5C86: +@080E5C86: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] @@ -437047,8 +437047,8 @@ _080E5C86: adds r5, 0x1 ldrb r0, [r4] cmp r0, 0xFF - bne _080E5C16 -_080E5CA0: + bne @080E5C16 +@080E5CA0: ldr r6, =0x02039f34 ldr r0, [r6] ldr r0, [r0, 0x8] @@ -437057,13 +437057,13 @@ _080E5CA0: bl sub_80DD3D4 mov r0, r9 cmp r0, 0 - bne _080E5CC0 + bne @080E5CC0 ldr r0, [r6] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x36 bl sub_80DD3F0 -_080E5CC0: +@080E5CC0: add sp, 0x1C pop {r3-r5} mov r8, r3 @@ -437077,7 +437077,7 @@ _080E5CC0: thumb_func_end sub_80E5AD4 thumb_func_start sub_80E5CD4 -sub_80E5CD4: @ 80E5CD4 +sub_80E5CD4: ; 80E5CD4 push {r4-r7,lr} mov r7, r8 push {r7} @@ -437086,7 +437086,7 @@ sub_80E5CD4: @ 80E5CD4 movs r6, 0 ldr r7, =0x02039f34 movs r5, 0 -_080E5CE4: +@080E5CE4: ldr r2, [r7] ldr r0, [r2, 0x8] ldrb r1, [r0, 0x11] @@ -437095,21 +437095,21 @@ _080E5CE4: ldrb r1, [r1] ldrb r0, [r0] cmp r1, r0 - bls _080E5D46 + bls @080E5D46 ldr r0, [r2, 0x4] adds r0, r5, r0 ldrb r0, [r0, 0xD] lsls r0, 24 asrs r0, 24 cmp r0, 0 - ble _080E5D46 + ble @080E5D46 lsls r0, r6, 24 lsrs r4, r0, 24 adds r0, r4, 0 bl sub_80E69C8 lsls r0, 24 cmp r0, 0 - beq _080E5D46 + beq @080E5D46 ldr r0, [r7] ldr r0, [r0, 0x4] adds r0, r5, r0 @@ -437134,11 +437134,11 @@ _080E5CE4: lsls r0, 24 lsrs r0, 24 mov r8, r0 -_080E5D46: +@080E5D46: adds r5, 0x1C adds r6, 0x1 cmp r6, 0x3 - ble _080E5CE4 + ble @080E5CE4 ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0, 0x8] @@ -437147,13 +437147,13 @@ _080E5D46: bl sub_80DD3D4 mov r0, r8 cmp r0, 0 - bne _080E5D6E + bne @080E5D6E ldr r0, [r4] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x39 bl sub_80DD3F0 -_080E5D6E: +@080E5D6E: pop {r3} mov r8, r3 pop {r4-r7} @@ -437164,13 +437164,13 @@ _080E5D6E: thumb_func_end sub_80E5CD4 thumb_func_start sub_80E5D7C -sub_80E5D7C: @ 80E5D7C +sub_80E5D7C: ; 80E5D7C push {r4-r7,lr} movs r7, 0 movs r4, 0 ldr r5, =0x02039f34 movs r6, 0 -_080E5D86: +@080E5D86: ldr r3, [r5] ldr r2, [r3, 0x8] ldrb r0, [r2, 0x11] @@ -437179,21 +437179,21 @@ _080E5D86: ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bls _080E5DD2 + bls @080E5DD2 ldr r0, [r3, 0x4] adds r0, r6, r0 ldrb r0, [r0, 0xD] lsls r0, 24 asrs r0, 24 cmp r0, 0 - ble _080E5DB0 + ble @080E5DB0 movs r0, 0x28 - b _080E5DB2 + b @080E5DB2 .align 2, 0 .pool -_080E5DB0: +@080E5DB0: movs r0, 0xA -_080E5DB2: +@080E5DB2: strh r0, [r2, 0x4] ldr r0, [r5] ldr r0, [r0, 0x8] @@ -437205,15 +437205,15 @@ _080E5DB2: bl sub_80E6A2C lsls r0, 24 cmp r0, 0 - beq _080E5DD2 + beq @080E5DD2 adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 -_080E5DD2: +@080E5DD2: adds r6, 0x1C adds r4, 0x1 cmp r4, 0x3 - ble _080E5D86 + ble @080E5D86 ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0, 0x8] @@ -437221,13 +437221,13 @@ _080E5DD2: movs r1, 0xE bl sub_80DD3D4 cmp r7, 0 - bne _080E5DF8 + bne @080E5DF8 ldr r0, [r4] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x39 bl sub_80DD3F0 -_080E5DF8: +@080E5DF8: pop {r4-r7} pop {r0} bx r0 @@ -437236,7 +437236,7 @@ _080E5DF8: thumb_func_end sub_80E5D7C thumb_func_start sub_80E5E04 -sub_80E5E04: @ 80E5E04 +sub_80E5E04: ; 80E5E04 push {r4,lr} ldr r1, =0x02039f26 ldr r0, =0x02039f34 @@ -437246,7 +437246,7 @@ sub_80E5E04: @ 80E5E04 adds r1, r2, r1 ldrb r0, [r1] cmp r0, 0 - bne _080E5E46 + bne @080E5E46 ldr r0, [r4, 0x4] lsls r1, r2, 3 subs r1, r2 @@ -437269,7 +437269,7 @@ sub_80E5E04: @ 80E5E04 ldrb r0, [r0, 0x11] movs r1, 0xF bl sub_80DD3D4 -_080E5E46: +@080E5E46: pop {r4} pop {r0} bx r0 @@ -437278,7 +437278,7 @@ _080E5E46: thumb_func_end sub_80E5E04 thumb_func_start sub_80E5E5C -sub_80E5E5C: @ 80E5E5C +sub_80E5E5C: ; 80E5E5C push {r4,lr} ldr r1, =0x02039f26 ldr r0, =0x02039f34 @@ -437288,7 +437288,7 @@ sub_80E5E5C: @ 80E5E5C adds r1, r2, r1 ldrb r0, [r1] cmp r0, 0x3 - bne _080E5E9E + bne @080E5E9E ldr r0, [r4, 0x4] lsls r1, r2, 3 subs r1, r2 @@ -437311,7 +437311,7 @@ sub_80E5E5C: @ 80E5E5C ldrb r0, [r0, 0x11] movs r1, 0x10 bl sub_80DD3D4 -_080E5E9E: +@080E5E9E: pop {r4} pop {r0} bx r0 @@ -437320,7 +437320,7 @@ _080E5E9E: thumb_func_end sub_80E5E5C thumb_func_start sub_80E5EB4 -sub_80E5EB4: @ 80E5EB4 +sub_80E5EB4: ; 80E5EB4 push {r4-r7,lr} movs r1, 0 movs r5, 0 @@ -437331,25 +437331,25 @@ sub_80E5EB4: @ 80E5EB4 adds r0, r2, r0 ldrb r6, [r0] movs r3, 0 -_080E5EC8: +@080E5EC8: adds r0, r2, r1 ldrb r0, [r0] cmp r6, r0 - bls _080E5EDA + bls @080E5EDA ldr r0, [r4, 0x4] adds r0, r3, r0 movs r7, 0x2 ldrsh r0, [r0, r7] adds r5, r0 -_080E5EDA: +@080E5EDA: adds r3, 0x1C adds r1, 0x1 cmp r1, 0x3 - ble _080E5EC8 + ble @080E5EC8 cmp r5, 0 - bge _080E5EE8 + bge @080E5EE8 movs r5, 0 -_080E5EE8: +@080E5EE8: ldr r0, =0x02039f34 ldr r3, [r0] ldr r0, [r3, 0x8] @@ -437357,17 +437357,17 @@ _080E5EE8: adds r0, r2 ldrb r0, [r0] cmp r0, 0 - beq _080E5EFC + beq @080E5EFC cmp r5, 0 - bne _080E5F0C -_080E5EFC: + bne @080E5F0C +@080E5EFC: adds r0, r2, 0 movs r1, 0x12 bl sub_80DD3D4 - b _080E5F2C + b @080E5F2C .align 2, 0 .pool -_080E5F0C: +@080E5F0C: ldr r0, [r3, 0x4] lsls r1, r2, 3 subs r1, r2 @@ -437383,7 +437383,7 @@ _080E5F0C: ldrb r0, [r0, 0x11] movs r1, 0x11 bl sub_80DD3D4 -_080E5F2C: +@080E5F2C: ldr r4, =0x02039f34 ldr r1, [r4] ldr r0, [r1, 0x8] @@ -437413,7 +437413,7 @@ _080E5F2C: thumb_func_end sub_80E5EB4 thumb_func_start sub_80E5F64 -sub_80E5F64: @ 80E5F64 +sub_80E5F64: ; 80E5F64 push {r4-r7,lr} movs r6, 0 ldr r0, =0x02039f34 @@ -437424,47 +437424,47 @@ sub_80E5F64: @ 80E5F64 ldrb r1, [r3] adds r7, r0, 0 cmp r1, 0 - beq _080E5FB2 + beq @080E5FB2 movs r1, 0 adds r5, r4, 0 adds r4, r2, 0 ldrb r0, [r3] subs r3, r0, 0x1 movs r2, 0 -_080E5F86: +@080E5F86: adds r0, r4, r1 ldrb r0, [r0] cmp r3, r0 - bne _080E5F94 + bne @080E5F94 ldr r0, [r5, 0x4] adds r0, r2, r0 ldrh r6, [r0, 0x2] -_080E5F94: +@080E5F94: adds r2, 0x1C adds r1, 0x1 cmp r1, 0x3 - ble _080E5F86 + ble @080E5F86 ldr r3, [r7] ldr r0, [r3, 0x8] ldrb r2, [r0, 0x11] adds r0, r2 ldrb r0, [r0] cmp r0, 0 - beq _080E5FB2 + beq @080E5FB2 lsls r0, r6, 16 asrs r4, r0, 16 cmp r4, 0 - bgt _080E5FC4 -_080E5FB2: + bgt @080E5FC4 +@080E5FB2: ldr r0, [r7] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x14 bl sub_80DD3D4 - b _080E5FDE + b @080E5FDE .align 2, 0 .pool -_080E5FC4: +@080E5FC4: ldr r1, [r3, 0x4] lsls r0, r2, 3 subs r0, r2 @@ -437477,14 +437477,14 @@ _080E5FC4: ldrb r0, [r0, 0x11] movs r1, 0x13 bl sub_80DD3D4 -_080E5FDE: +@080E5FDE: pop {r4-r7} pop {r0} bx r0 thumb_func_end sub_80E5F64 thumb_func_start sub_80E5FE4 -sub_80E5FE4: @ 80E5FE4 +sub_80E5FE4: ; 80E5FE4 push {r4,r5,lr} ldr r1, =0x02039f34 ldr r3, [r1] @@ -437494,17 +437494,17 @@ sub_80E5FE4: @ 80E5FE4 ldrb r4, [r0] adds r5, r1, 0 cmp r4, 0 - bne _080E600C + bne @080E600C ldr r0, [r3, 0x4] lsls r1, r2, 3 subs r1, r2 lsls r1, 2 adds r1, r0 movs r0, 0xA - b _080E601C + b @080E601C .align 2, 0 .pool -_080E600C: +@080E600C: ldr r0, [r3, 0x4] lsls r1, r2, 3 subs r1, r2 @@ -437513,48 +437513,48 @@ _080E600C: lsls r0, r4, 2 adds r0, r4 lsls r0, 2 -_080E601C: +@080E601C: strh r0, [r1, 0x2] cmp r4, 0 - bne _080E6030 + bne @080E6030 ldr r0, [r5] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x15 bl sub_80DD3D4 - b _080E6060 -_080E6030: + b @080E6060 +@080E6030: cmp r4, 0x1 - bne _080E6042 + bne @080E6042 ldr r0, [r5] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x16 bl sub_80DD3D4 - b _080E6060 -_080E6042: + b @080E6060 +@080E6042: cmp r4, 0x2 - bne _080E6054 + bne @080E6054 ldr r0, [r5] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x17 bl sub_80DD3D4 - b _080E6060 -_080E6054: + b @080E6060 +@080E6054: ldr r0, [r5] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x18 bl sub_80DD3D4 -_080E6060: +@080E6060: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_80E5FE4 thumb_func_start sub_80E6068 -sub_80E6068: @ 80E6068 +sub_80E6068: ; 80E6068 push {r4,lr} bl GenerateRandomNumber lsls r0, 16 @@ -437565,7 +437565,7 @@ sub_80E6068: @ 80E6068 lsrs r0, 24 adds r1, r0, 0 cmp r0, 0x2 - bhi _080E6098 + bhi @080E6098 movs r4, 0xA ldr r0, =0x02039f34 ldr r0, [r0] @@ -437573,12 +437573,12 @@ sub_80E6068: @ 80E6068 ldrb r0, [r0, 0x11] movs r1, 0x1A bl sub_80DD3D4 - b _080E60FC + b @080E60FC .align 2, 0 .pool -_080E6098: +@080E6098: cmp r0, 0x5 - bhi _080E60B4 + bhi @080E60B4 movs r4, 0x14 ldr r0, =0x02039f34 ldr r0, [r0] @@ -437586,12 +437586,12 @@ _080E6098: ldrb r0, [r0, 0x11] movs r1, 0x1B bl sub_80DD3D4 - b _080E60FC + b @080E60FC .align 2, 0 .pool -_080E60B4: +@080E60B4: cmp r0, 0x7 - bhi _080E60D0 + bhi @080E60D0 movs r4, 0x28 ldr r0, =0x02039f34 ldr r0, [r0] @@ -437599,12 +437599,12 @@ _080E60B4: ldrb r0, [r0, 0x11] movs r1, 0x1C bl sub_80DD3D4 - b _080E60FC + b @080E60FC .align 2, 0 .pool -_080E60D0: +@080E60D0: cmp r1, 0x8 - bhi _080E60EC + bhi @080E60EC movs r4, 0x3C ldr r0, =0x02039f34 ldr r0, [r0] @@ -437612,10 +437612,10 @@ _080E60D0: ldrb r0, [r0, 0x11] movs r1, 0x1D bl sub_80DD3D4 - b _080E60FC + b @080E60FC .align 2, 0 .pool -_080E60EC: +@080E60EC: movs r4, 0x50 ldr r0, =0x02039f34 ldr r0, [r0] @@ -437623,7 +437623,7 @@ _080E60EC: ldrb r0, [r0, 0x11] movs r1, 0x1E bl sub_80DD3D4 -_080E60FC: +@080E60FC: ldr r0, =0x02039f34 ldr r1, [r0] ldr r0, [r1, 0x8] @@ -437642,7 +437642,7 @@ _080E60FC: thumb_func_end sub_80E6068 thumb_func_start sub_80E611C -sub_80E611C: @ 80E611C +sub_80E611C: ; 80E611C push {r4-r7,lr} mov r7, r8 push {r7} @@ -437658,18 +437658,18 @@ sub_80E611C: @ 80E611C lsrs r4, r0, 24 mov r8, r2 cmp r1, 0 - beq _080E61F8 + beq @080E61F8 mov r7, r8 ldrb r6, [r3] -_080E6140: +@080E6140: movs r2, 0 lsls r0, r4, 24 asrs r1, r0, 24 adds r5, r0, 0 cmp r6, r1 - beq _080E616A + beq @080E616A ldr r4, =0x02039f34 -_080E614E: +@080E614E: lsls r0, r2, 24 movs r2, 0x80 lsls r2, 17 @@ -437677,14 +437677,14 @@ _080E614E: lsrs r2, r0, 24 asrs r3, r0, 24 cmp r3, 0x3 - bgt _080E616A + bgt @080E616A ldr r0, [r4] ldr r0, [r0, 0x8] adds r0, r3 ldrb r0, [r0] cmp r0, r1 - bne _080E614E -_080E616A: + bne @080E614E +@080E616A: ldr r0, [r7] lsls r3, r2, 24 asrs r1, r3, 24 @@ -437698,23 +437698,23 @@ _080E616A: ands r0, r1 mov r12, r3 cmp r0, 0 - bne _080E6190 + bne @080E6190 ldrb r1, [r2, 0xC] movs r0, 0x7 ands r0, r1 cmp r0, 0 - beq _080E61A4 -_080E6190: + beq @080E61A4 +@080E6190: movs r1, 0xFF lsls r1, 24 adds r0, r5, r1 lsrs r4, r0, 24 cmp r0, 0 - blt _080E61F8 - b _080E6140 + blt @080E61F8 + b @080E6140 .align 2, 0 .pool -_080E61A4: +@080E61A4: mov r2, r8 ldr r6, [r2] ldr r0, [r6, 0x8] @@ -437742,7 +437742,7 @@ _080E61A4: ldrb r0, [r0, 0x1] lsls r0, 29 cmp r2, r0 - bne _080E61F8 + bne @080E61F8 ldr r1, =0x0858cdcc ldrb r0, [r7] lsls r0, 2 @@ -437756,7 +437756,7 @@ _080E61A4: ldrb r0, [r0, 0x11] movs r1, 0x1F bl sub_80DD3D4 -_080E61F8: +@080E61F8: pop {r3} mov r8, r3 pop {r4-r7} @@ -437767,7 +437767,7 @@ _080E61F8: thumb_func_end sub_80E611C thumb_func_start sub_80E620C -sub_80E620C: @ 80E620C +sub_80E620C: ; 80E620C push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -437780,7 +437780,7 @@ sub_80E620C: @ 80E620C ldrb r1, [r1] mov r9, r0 cmp r1, 0 - beq _080E62AC + beq @080E62AC ldr r1, [r3, 0x4] lsls r0, r2, 3 subs r0, r2 @@ -437792,7 +437792,7 @@ sub_80E620C: @ 80E620C ldr r0, =0x0858c2b4 mov r12, r0 movs r7, 0 -_080E623C: +@080E623C: mov r1, r9 ldr r4, [r1] ldr r0, [r4, 0x8] @@ -437803,7 +437803,7 @@ _080E623C: adds r0, r6 ldrb r0, [r0] cmp r1, r0 - bne _080E62A4 + bne @080E62A4 mov r1, r8 lsls r0, r1, 3 mov r1, r12 @@ -437818,7 +437818,7 @@ _080E623C: ldrb r0, [r0, 0x1] lsls r0, 29 cmp r1, r0 - beq _080E62A4 + beq @080E62A4 lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -437836,15 +437836,15 @@ _080E623C: ldrb r0, [r0, 0x11] movs r1, 0x20 bl sub_80DD3D4 - b _080E62AC + b @080E62AC .align 2, 0 .pool -_080E62A4: +@080E62A4: adds r7, 0x1C adds r6, 0x1 cmp r6, 0x3 - ble _080E623C -_080E62AC: + ble @080E623C +@080E62AC: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -437854,7 +437854,7 @@ _080E62AC: thumb_func_end sub_80E620C thumb_func_start sub_80E62B8 -sub_80E62B8: @ 80E62B8 +sub_80E62B8: ; 80E62B8 push {r4-r7,lr} ldr r0, =0x02039f34 ldr r0, [r0] @@ -437863,10 +437863,10 @@ sub_80E62B8: @ 80E62B8 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _080E632E + beq @080E632E movs r5, 0 movs r6, 0 -_080E62CE: +@080E62CE: ldr r0, =0x02039f34 ldr r4, [r0] ldr r1, [r4, 0x8] @@ -437877,7 +437877,7 @@ _080E62CE: adds r1, r5 ldrb r1, [r1] cmp r0, r1 - bne _080E6326 + bne @080E6326 ldr r1, [r4, 0x4] lsls r0, r2, 3 subs r0, r2 @@ -437889,7 +437889,7 @@ _080E62CE: movs r7, 0x2 ldrsh r0, [r1, r7] cmp r2, r0 - ble _080E6314 + ble @080E6314 adds r0, r2, 0 lsls r0, 1 strh r0, [r3, 0x2] @@ -437897,31 +437897,31 @@ _080E62CE: ldrb r0, [r0, 0x11] movs r1, 0x21 bl sub_80DD3D4 - b _080E6326 + b @080E6326 .align 2, 0 .pool -_080E6314: +@080E6314: cmp r2, r0 - bge _080E6326 + bge @080E6326 movs r0, 0 strh r0, [r3, 0x2] ldr r0, [r4, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x22 bl sub_80DD3D4 -_080E6326: +@080E6326: adds r6, 0x1C adds r5, 0x1 cmp r5, 0x3 - ble _080E62CE -_080E632E: + ble @080E62CE +@080E632E: pop {r4-r7} pop {r0} bx r0 thumb_func_end sub_80E62B8 thumb_func_start sub_80E6334 -sub_80E6334: @ 80E6334 +sub_80E6334: ; 80E6334 push {r4,lr} ldr r4, =0x02039f34 ldr r1, [r4] @@ -437936,7 +437936,7 @@ sub_80E6334: @ 80E6334 movs r0, 0xD ldrsb r0, [r1, r0] cmp r0, 0x1D - bgt _080E6388 + bgt @080E6388 adds r0, r3, 0 adds r0, 0xA strb r0, [r1, 0xD] @@ -437960,21 +437960,21 @@ sub_80E6334: @ 80E6334 ldrb r0, [r0, 0x11] movs r1, 0x23 bl sub_80DD3D4 - b _080E6390 + b @080E6390 .align 2, 0 .pool -_080E6388: +@080E6388: adds r0, r2, 0 movs r1, 0x3A bl sub_80DD3D4 -_080E6390: +@080E6390: pop {r4} pop {r0} bx r0 thumb_func_end sub_80E6334 thumb_func_start sub_80E6398 -sub_80E6398: @ 80E6398 +sub_80E6398: ; 80E6398 push {lr} ldr r3, =0x02039f34 ldr r1, [r3] @@ -438001,24 +438001,24 @@ sub_80E6398: @ 80E6398 lsls r0, 24 asrs r0, 24 cmp r0, 0 - beq _080E63DC + beq @080E63DC adds r0, r2, 0 movs r1, 0x24 bl sub_80DD3D4 - b _080E63E4 + b @080E63E4 .align 2, 0 .pool -_080E63DC: +@080E63DC: adds r0, r2, 0 movs r1, 0x3B bl sub_80DD3D4 -_080E63E4: +@080E63E4: pop {r0} bx r0 thumb_func_end sub_80E6398 thumb_func_start sub_80E63E8 -sub_80E63E8: @ 80E63E8 +sub_80E63E8: ; 80E63E8 push {r4-r7,lr} sub sp, 0x4 ldr r0, =0x02039f34 @@ -438027,12 +438027,12 @@ sub_80E63E8: @ 80E63E8 ldrb r1, [r1, 0x1] mov r12, r0 cmp r1, 0x4 - bne _080E63FC - b _080E6518 -_080E63FC: + bne @080E63FC + b @080E6518 +@080E63FC: movs r6, 0 adds r4, r2, 0 -_080E6400: +@080E6400: lsls r1, r6, 24 asrs r1, 24 mov r0, sp @@ -438049,7 +438049,7 @@ _080E6400: lsrs r6, r1, 24 asrs r1, 24 cmp r1, 0x3 - ble _080E6400 + ble @080E6400 mov r1, r12 ldr r0, [r1] ldr r0, [r0, 0x8] @@ -438061,22 +438061,22 @@ _080E6400: movs r6, 0 mov r3, r12 ldr r7, [r3] -_080E6438: +@080E6438: movs r5, 0 -_080E643A: +@080E643A: lsls r0, r5, 24 asrs r2, r0, 24 ldr r0, [r7, 0x8] ldrb r0, [r0, 0x11] cmp r2, r0 - beq _080E6474 + beq @080E6474 lsls r0, r6, 24 asrs r3, r0, 24 mov r0, sp adds r4, r0, r2 ldrb r1, [r4] cmp r3, r1 - bne _080E6474 + bne @080E6474 ldr r0, [r7, 0x4] lsls r1, r2, 3 subs r1, r2 @@ -438086,13 +438086,13 @@ _080E643A: lsrs r0, 24 ldrb r1, [r1, 0x19] cmp r0, r1 - bne _080E6474 + bne @080E6474 adds r0, r3, 0x1 strb r0, [r4] - b _080E6484 + b @080E6484 .align 2, 0 .pool -_080E6474: +@080E6474: lsls r0, r5, 24 movs r2, 0x80 lsls r2, 17 @@ -438100,10 +438100,10 @@ _080E6474: lsrs r5, r0, 24 asrs r0, 24 cmp r0, 0x3 - ble _080E643A -_080E6484: + ble @080E643A +@080E6484: cmp r5, 0x4 - beq _080E6498 + beq @080E6498 lsls r0, r6, 24 movs r3, 0x80 lsls r3, 17 @@ -438111,8 +438111,8 @@ _080E6484: lsrs r6, r0, 24 asrs r0, 24 cmp r0, 0x3 - ble _080E6438 -_080E6498: + ble @080E6438 +@080E6498: mov r4, r12 ldr r1, [r4] ldr r0, [r1, 0x8] @@ -438136,7 +438136,7 @@ _080E6498: strb r1, [r0, 0x10] movs r6, 0 mov r3, r12 -_080E64C6: +@080E64C6: ldr r0, [r3] lsls r1, r6, 24 asrs r1, 24 @@ -438154,7 +438154,7 @@ _080E64C6: lsrs r6, r1, 24 asrs r1, 24 cmp r1, 0x3 - ble _080E64C6 + ble @080E64C6 mov r0, r12 ldr r1, [r0] ldr r0, [r1, 0x8] @@ -438177,7 +438177,7 @@ _080E64C6: ldrb r0, [r0, 0x11] movs r1, 0x25 bl sub_80DD3D4 -_080E6518: +@080E6518: add sp, 0x4 pop {r4-r7} pop {r0} @@ -438185,7 +438185,7 @@ _080E6518: thumb_func_end sub_80E63E8 thumb_func_start sub_80E6520 -sub_80E6520: @ 80E6520 +sub_80E6520: ; 80E6520 push {r4-r7,lr} mov r7, r8 push {r7} @@ -438196,12 +438196,12 @@ sub_80E6520: @ 80E6520 ldrb r1, [r1, 0x1] mov r12, r0 cmp r1, 0x4 - bne _080E6538 - b _080E6658 -_080E6538: + bne @080E6538 + b @080E6658 +@080E6538: movs r6, 0 adds r4, r2, 0 -_080E653C: +@080E653C: lsls r1, r6, 24 asrs r1, 24 mov r0, sp @@ -438218,7 +438218,7 @@ _080E653C: lsrs r6, r1, 24 asrs r1, 24 cmp r1, 0x3 - ble _080E653C + ble @080E653C mov r1, r12 ldr r0, [r1] ldr r0, [r0, 0x8] @@ -438233,22 +438233,22 @@ _080E653C: movs r4, 0x1 negs r4, r4 mov r8, r4 -_080E657A: +@080E657A: movs r5, 0 -_080E657C: +@080E657C: lsls r0, r5, 24 asrs r2, r0, 24 ldr r0, [r7, 0x8] ldrb r0, [r0, 0x11] cmp r2, r0 - beq _080E65B4 + beq @080E65B4 lsls r0, r6, 24 asrs r3, r0, 24 mov r0, sp adds r4, r0, r2 ldrb r1, [r4] cmp r3, r1 - bne _080E65B4 + bne @080E65B4 ldr r0, [r7, 0x4] lsls r1, r2, 3 subs r1, r2 @@ -438258,13 +438258,13 @@ _080E657C: lsrs r0, 24 ldrb r1, [r1, 0x19] cmp r0, r1 - bne _080E65B4 + bne @080E65B4 subs r0, r3, 0x1 strb r0, [r4] - b _080E65C4 + b @080E65C4 .align 2, 0 .pool -_080E65B4: +@080E65B4: lsls r0, r5, 24 movs r2, 0x80 lsls r2, 17 @@ -438272,10 +438272,10 @@ _080E65B4: lsrs r5, r0, 24 asrs r0, 24 cmp r0, 0x3 - ble _080E657C -_080E65C4: + ble @080E657C +@080E65C4: cmp r5, 0x4 - beq _080E65D8 + beq @080E65D8 lsls r0, r6, 24 movs r3, 0xFF lsls r3, 24 @@ -438283,8 +438283,8 @@ _080E65C4: lsrs r6, r0, 24 asrs r0, 24 cmp r0, r8 - bgt _080E657A -_080E65D8: + bgt @080E657A +@080E65D8: mov r4, r12 ldr r1, [r4] ldr r0, [r1, 0x8] @@ -438308,7 +438308,7 @@ _080E65D8: strb r1, [r0, 0x10] movs r6, 0 mov r3, r12 -_080E6606: +@080E6606: ldr r0, [r3] lsls r1, r6, 24 asrs r1, 24 @@ -438326,7 +438326,7 @@ _080E6606: lsrs r6, r1, 24 asrs r1, 24 cmp r1, 0x3 - ble _080E6606 + ble @080E6606 mov r0, r12 ldr r1, [r0] ldr r0, [r1, 0x8] @@ -438349,7 +438349,7 @@ _080E6606: ldrb r0, [r0, 0x11] movs r1, 0x26 bl sub_80DD3D4 -_080E6658: +@080E6658: add sp, 0x4 pop {r3} mov r8, r3 @@ -438359,12 +438359,12 @@ _080E6658: thumb_func_end sub_80E6520 thumb_func_start nullsub_100 -nullsub_100: @ 80E6664 +nullsub_100: ; 80E6664 bx lr thumb_func_end nullsub_100 thumb_func_start sub_80E6668 -sub_80E6668: @ 80E6668 +sub_80E6668: ; 80E6668 push {r4-r7,lr} sub sp, 0x8 ldr r0, =0x02039f34 @@ -438372,12 +438372,12 @@ sub_80E6668: @ 80E6668 ldr r0, [r1] ldrb r0, [r0, 0x1] cmp r0, 0x4 - beq _080E676C + beq @080E676C movs r6, 0 add r5, sp, 0x4 adds r4, r1, 0 adds r7, r5, 0 -_080E6680: +@080E6680: lsls r1, r6, 24 asrs r1, 24 mov r0, sp @@ -438396,10 +438396,10 @@ _080E6680: lsrs r6, r1, 24 asrs r1, 24 cmp r1, 0x3 - ble _080E6680 + ble @080E6680 movs r6, 0 adds r7, r5, 0 -_080E66AA: +@080E66AA: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -438411,37 +438411,37 @@ _080E66AA: lsls r0, 24 lsrs r4, r0, 24 movs r1, 0 -_080E66C4: +@080E66C4: lsls r0, r1, 24 asrs r2, r0, 24 adds r3, r7, r2 ldrb r1, [r3] adds r5, r0, 0 cmp r1, 0xFF - beq _080E66EE + beq @080E66EE cmp r4, 0 - bne _080E66E8 + bne @080E66E8 mov r1, sp adds r0, r1, r2 strb r6, [r0] movs r0, 0xFF strb r0, [r3] - b _080E66FC + b @080E66FC .align 2, 0 .pool -_080E66E8: +@080E66E8: subs r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_080E66EE: +@080E66EE: movs r1, 0x80 lsls r1, 17 adds r0, r5, r1 lsrs r1, r0, 24 asrs r0, 24 cmp r0, 0x3 - ble _080E66C4 -_080E66FC: + ble @080E66C4 +@080E66FC: lsls r0, r6, 24 movs r6, 0x80 lsls r6, 17 @@ -438449,11 +438449,11 @@ _080E66FC: lsrs r6, r0, 24 asrs r0, 24 cmp r0, 0x3 - ble _080E66AA + ble @080E66AA movs r6, 0 ldr r5, =0x02039f34 adds r4, r5, 0 -_080E6712: +@080E6712: ldr r0, [r4] lsls r3, r6, 24 asrs r3, 24 @@ -438480,7 +438480,7 @@ _080E6712: lsrs r6, r3, 24 asrs r3, 24 cmp r3, 0x3 - ble _080E6712 + ble @080E6712 ldr r1, [r5] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -438498,7 +438498,7 @@ _080E6712: ldrb r0, [r0, 0x11] movs r1, 0x27 bl sub_80DD3D4 -_080E676C: +@080E676C: add sp, 0x8 pop {r4-r7} pop {r0} @@ -438508,7 +438508,7 @@ _080E676C: thumb_func_end sub_80E6668 thumb_func_start sub_80E6778 -sub_80E6778: @ 80E6778 +sub_80E6778: ; 80E6778 push {lr} ldr r3, =0x0858c2b4 ldr r0, =0x02039f34 @@ -438529,12 +438529,12 @@ sub_80E6778: @ 80E6778 lsrs r0, 29 ldrh r1, [r1] cmp r0, r1 - beq _080E67AA + beq @080E67AA ldrb r0, [r2, 0x11] movs r1, 0x10 orrs r0, r1 strb r0, [r2, 0x11] -_080E67AA: +@080E67AA: pop {r0} bx r0 .align 2, 0 @@ -438542,7 +438542,7 @@ _080E67AA: thumb_func_end sub_80E6778 thumb_func_start sub_80E67BC -sub_80E67BC: @ 80E67BC +sub_80E67BC: ; 80E67BC push {r4-r7,lr} mov r7, r8 push {r7} @@ -438551,7 +438551,7 @@ sub_80E67BC: @ 80E67BC movs r4, 0 ldr r5, =0x02039f34 movs r6, 0 -_080E67CC: +@080E67CC: ldr r3, [r5] ldr r2, [r3, 0x8] ldrb r0, [r2, 0x11] @@ -438560,13 +438560,13 @@ _080E67CC: ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bls _080E682E + bls @080E682E ldr r0, [r3, 0x4] adds r1, r6, r0 movs r7, 0x2 ldrsh r0, [r1, r7] cmp r0, 0 - ble _080E6808 + ble @080E6808 lsrs r1, r0, 31 adds r0, r1 asrs r0, 1 @@ -438578,13 +438578,13 @@ _080E67CC: ldr r1, [r5] ldr r1, [r1, 0x8] strh r0, [r1, 0x4] - b _080E680C + b @080E680C .align 2, 0 .pool -_080E6808: +@080E6808: movs r0, 0xA strh r0, [r2, 0x4] -_080E680C: +@080E680C: ldr r0, [r5] ldr r0, [r0, 0x8] strb r4, [r0, 0x8] @@ -438595,27 +438595,27 @@ _080E680C: bl sub_80E6A2C lsls r0, 24 cmp r0, 0 - beq _080E682E + beq @080E682E mov r0, r8 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r8, r0 -_080E682E: +@080E682E: adds r6, 0x1C adds r4, 0x1 cmp r4, 0x3 - ble _080E67CC + ble @080E67CC mov r7, r8 cmp r7, 0 - bne _080E684A + bne @080E684A ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x36 bl sub_80DD3F0 -_080E684A: +@080E684A: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] @@ -438632,7 +438632,7 @@ _080E684A: thumb_func_end sub_80E67BC thumb_func_start sub_80E6868 -sub_80E6868: @ 80E6868 +sub_80E6868: ; 80E6868 push {r4,lr} ldr r0, =0x02039f34 ldr r1, [r0] @@ -438641,49 +438641,49 @@ sub_80E6868: @ 80E6868 lsls r0, 24 asrs r0, 24 cmp r0, 0 - bne _080E688C + bne @080E688C movs r4, 0xA ldr r0, [r1, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x1A bl sub_80DD3D4 - b _080E68CE + b @080E68CE .align 2, 0 .pool -_080E688C: +@080E688C: cmp r0, 0x1 - bne _080E689E + bne @080E689E movs r4, 0x14 ldr r0, [r1, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x1B bl sub_80DD3D4 - b _080E68CE -_080E689E: + b @080E68CE +@080E689E: cmp r0, 0x2 - bne _080E68B0 + bne @080E68B0 movs r4, 0x1E ldr r0, [r1, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x1C bl sub_80DD3D4 - b _080E68CE -_080E68B0: + b @080E68CE +@080E68B0: cmp r0, 0x3 - bne _080E68C2 + bne @080E68C2 movs r4, 0x32 ldr r0, [r1, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x1D bl sub_80DD3D4 - b _080E68CE -_080E68C2: + b @080E68CE +@080E68C2: movs r4, 0x3C ldr r0, [r1, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x1E bl sub_80DD3D4 -_080E68CE: +@080E68CE: ldr r0, =0x02039f34 ldr r1, [r0] ldr r0, [r1, 0x8] @@ -438702,7 +438702,7 @@ _080E68CE: thumb_func_end sub_80E6868 thumb_func_start sub_80E68EC -sub_80E68EC: @ 80E68EC +sub_80E68EC: ; 80E68EC push {r4,lr} ldr r4, =0x02039f34 ldr r0, [r4] @@ -438711,7 +438711,7 @@ sub_80E68EC: @ 80E68EC movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080E692A + bne @080E692A movs r0, 0x1 orrs r0, r1 strb r0, [r2, 0x1] @@ -438733,7 +438733,7 @@ sub_80E68EC: @ 80E68EC ldrb r0, [r0, 0x11] movs r1, 0x3D bl sub_80DD3D4 -_080E692A: +@080E692A: pop {r4} pop {r0} bx r0 @@ -438742,7 +438742,7 @@ _080E692A: thumb_func_end sub_80E68EC thumb_func_start sub_80E6934 -sub_80E6934: @ 80E6934 +sub_80E6934: ; 80E6934 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -438756,7 +438756,7 @@ sub_80E6934: @ 80E6934 ldr r0, =0x0858c2b4 mov r9, r0 movs r5, 0 -_080E694E: +@080E694E: ldr r3, [r6] ldr r2, [r3, 0x8] ldrb r0, [r2, 0x11] @@ -438765,7 +438765,7 @@ _080E694E: ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bls _080E699E + bls @080E699E ldr r0, [r3, 0x4] adds r0, r5, r0 ldrh r0, [r0, 0x6] @@ -438775,14 +438775,14 @@ _080E694E: lsls r0, 29 lsrs r0, 29 cmp r8, r0 - bne _080E6980 + bne @080E6980 movs r0, 0x28 - b _080E6982 + b @080E6982 .align 2, 0 .pool -_080E6980: +@080E6980: movs r0, 0xA -_080E6982: +@080E6982: strh r0, [r2, 0x4] ldr r0, [r6] ldr r0, [r0, 0x8] @@ -438794,22 +438794,22 @@ _080E6982: bl sub_80E6A2C lsls r0, 24 cmp r0, 0 - beq _080E699E + beq @080E699E adds r7, 0x1 -_080E699E: +@080E699E: adds r5, 0x1C adds r4, 0x1 cmp r4, 0x3 - ble _080E694E + ble @080E694E cmp r7, 0 - bne _080E69B8 + bne @080E69B8 ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x36 bl sub_80DD3F0 -_080E69B8: +@080E69B8: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -438821,7 +438821,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 @@ -438842,44 +438842,44 @@ sub_80E69C8: @ 80E69C8 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080E69FC + beq @080E69FC adds r0, r3, 0 movs r1, 0x2D - b _080E6A22 + b @080E6A22 .align 2, 0 .pool -_080E69FC: +@080E69FC: ldrb r0, [r2, 0x12] cmp r0, 0 - bne _080E6A1A + bne @080E6A1A ldrb r1, [r2, 0xB] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080E6A26 + bne @080E6A26 ldrb r1, [r2, 0xC] movs r0, 0x6 ands r0, r1 cmp r0, 0 - bne _080E6A26 + bne @080E6A26 movs r0, 0x1 - b _080E6A28 -_080E6A1A: + b @080E6A28 +@080E6A1A: subs r0, 0x1 strb r0, [r2, 0x12] adds r0, r3, 0 movs r1, 0x2C -_080E6A22: +@080E6A22: bl sub_80DD3D4 -_080E6A26: +@080E6A26: movs r0, 0 -_080E6A28: +@080E6A28: pop {r1} bx r1 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} @@ -438894,9 +438894,9 @@ sub_80E6A2C: @ 80E6A2C ldr r0, [r0, 0x8] ldrb r0, [r0, 0x8] cmp r0, 0xFF - beq _080E6B10 + beq @080E6B10 mov r8, r4 -_080E6A4E: +@080E6A4E: mov r1, r8 ldr r0, [r1] ldr r0, [r0, 0x8] @@ -438908,7 +438908,7 @@ _080E6A4E: bl sub_80E69C8 lsls r0, 24 cmp r0, 0 - beq _080E6AFE + beq @080E6AFE ldr r2, [r4] ldr r1, [r2, 0x8] ldrh r0, [r1, 0x4] @@ -438922,13 +438922,13 @@ _080E6A4E: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080E6A8E + beq @080E6A8E ldr r1, [r2, 0x8] movs r2, 0x6 ldrsh r0, [r1, r2] lsls r0, 1 strh r0, [r1, 0x6] -_080E6A8E: +@080E6A8E: mov r0, r8 ldr r3, [r0] ldr r0, [r3, 0x4] @@ -438937,17 +438937,17 @@ _080E6A8E: movs r4, 0x1 ands r4, r0 cmp r4, 0 - beq _080E6AB4 + beq @080E6AB4 ldr r1, [r3, 0x8] movs r0, 0xA strh r0, [r1, 0x6] adds r0, r5, 0 movs r1, 0x2F bl sub_80DD3D4 - b _080E6AFE + b @080E6AFE .align 2, 0 .pool -_080E6AB4: +@080E6AB4: ldr r2, [r3, 0x8] ldrb r1, [r1, 0xF] ldrh r0, [r2, 0x6] @@ -438958,13 +438958,13 @@ _080E6AB4: movs r3, 0x6 ldrsh r0, [r2, r3] cmp r0, 0 - bgt _080E6AD6 + bgt @080E6AD6 strh r4, [r2, 0x6] adds r0, r5, 0 movs r1, 0x2E bl sub_80DD3D4 - b _080E6AFE -_080E6AD6: + b @080E6AFE +@080E6AD6: lsls r1, 24 lsrs r1, 24 adds r0, r6, 0 @@ -438983,7 +438983,7 @@ _080E6AD6: ldr r0, [r0, 0x8] ldrh r0, [r0, 0x6] strh r0, [r1] -_080E6AFE: +@080E6AFE: adds r7, 0x1 ldr r4, =0x02039f34 ldr r0, [r4] @@ -438992,26 +438992,26 @@ _080E6AFE: adds r0, r7 ldrb r0, [r0] cmp r0, 0xFF - bne _080E6A4E -_080E6B10: + bne @080E6A4E +@080E6B10: movs r7, 0 mov r1, sp -_080E6B14: +@080E6B14: movs r2, 0 ldrsh r0, [r1, r2] cmp r0, 0 - beq _080E6B24 + beq @080E6B24 movs r0, 0x1 - b _080E6B2E + b @080E6B2E .align 2, 0 .pool -_080E6B24: +@080E6B24: adds r1, 0x2 adds r7, 0x1 cmp r7, 0x3 - ble _080E6B14 + ble @080E6B14 movs r0, 0 -_080E6B2E: +@080E6B2E: add sp, 0x8 pop {r3} mov r8, r3 @@ -439021,7 +439021,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 @@ -439050,38 +439050,38 @@ 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 asrs r4, r0, 16 adds r0, r4, 0 cmp r4, 0 - bge _080E6B80 + bge @080E6B80 negs r0, r4 -_080E6B80: +@080E6B80: movs r1, 0xA bl __modsi3 lsls r0, 16 lsrs r0, 16 cmp r4, 0 - bge _080E6B9E + bge @080E6B9E lsls r0, 16 asrs r1, r0, 16 cmp r1, 0 - beq _080E6BA8 + beq @080E6BA8 adds r0, r4, 0 subs r0, 0xA adds r0, r1, r0 - b _080E6BA4 -_080E6B9E: + b @080E6BA4 +@080E6B9E: lsls r0, 16 asrs r0, 16 subs r0, r4, r0 -_080E6BA4: +@080E6BA4: lsls r0, 16 lsrs r5, r0, 16 -_080E6BA8: +@080E6BA8: lsls r0, r5, 16 asrs r0, 16 pop {r4,r5} @@ -439090,28 +439090,28 @@ _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 asrs r4, r0, 16 adds r0, r4, 0 cmp r4, 0 - bge _080E6BC4 + bge @080E6BC4 negs r0, r4 -_080E6BC4: +@080E6BC4: movs r1, 0xA bl __modsi3 lsls r0, 16 asrs r1, r0, 16 cmp r1, 0 - beq _080E6BDC + beq @080E6BDC adds r0, r4, 0 adds r0, 0xA subs r0, r1 lsls r0, 16 lsrs r5, r0, 16 -_080E6BDC: +@080E6BDC: lsls r0, r5, 16 asrs r0, 16 pop {r4,r5} @@ -439120,7 +439120,7 @@ _080E6BDC: thumb_func_end sub_80E6BB4 thumb_func_start sub_80E6BE8 -sub_80E6BE8: @ 80E6BE8 +sub_80E6BE8: ; 80E6BE8 push {lr} ldr r0, =sub_80E715C + 1 bl sub_80B37D4 @@ -439131,7 +439131,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 @@ -439181,7 +439181,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 @@ -439229,12 +439229,12 @@ sub_80E6CA0: @ 80E6CA0 bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - bne _080E6D1C + bne @080E6D1C bl sub_81539D4 ldr r2, =0x000011c8 adds r1, r5, r2 strh r0, [r1] -_080E6D1C: +@080E6D1C: pop {r4,r5} pop {r0} bx r0 @@ -439243,7 +439243,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 @@ -439302,12 +439302,12 @@ sub_80E6D54: @ 80E6D54 bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - bne _080E6DEE + bne @080E6DEE bl sub_81539D4 ldr r2, =0x000011c8 adds r1, r5, r2 strh r0, [r1] -_080E6DEE: +@080E6DEE: pop {r4,r5} pop {r0} bx r0 @@ -439316,31 +439316,31 @@ _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 bl sub_80E6BF8 bl sub_800A064 cmp r0, 0 - beq _080E6E60 + beq @080E6E60 bl sub_800A03C cmp r0, 0 - bne _080E6E50 + bne @080E6E50 ldr r0, =0x0203a018 ldr r0, [r0] bl sub_80E6CA0 - b _080E6F12 + b @080E6F12 .align 2, 0 .pool -_080E6E50: +@080E6E50: ldr r0, =0x0203a018 ldr r0, [r0] bl sub_80E6D54 - b _080E6F12 + b @080E6F12 .align 2, 0 .pool -_080E6E60: +@080E6E60: ldr r5, =0x0203a018 ldr r0, [r5] ldr r1, =0x03001134 @@ -439401,13 +439401,13 @@ _080E6E60: bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - bne _080E6EFA + bne @080E6EFA bl sub_81539D4 ldr r1, [r5] ldr r2, =0x00001210 adds r1, r2 strh r0, [r1] -_080E6EFA: +@080E6EFA: ldr r0, [r5] ldr r1, =0x00001254 adds r0, r1 @@ -439418,7 +439418,7 @@ _080E6EFA: ldr r2, =0x000012dc adds r0, r2 bl sub_80E8260 -_080E6F12: +@080E6F12: pop {r4,r5} pop {r0} bx r0 @@ -439427,14 +439427,14 @@ _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} adds r4, r0, 0 bl sub_800A064 cmp r0, 0 - beq _080E7014 + beq @080E7014 ldr r5, =0x0203a014 ldr r0, [r5] movs r1, 0xC8 @@ -439490,10 +439490,10 @@ sub_80E6F60: @ 80E6F60 adds r0, r1 adds r1, r4, 0 bl sub_80E7F68 - b _080E70BE + b @080E70BE .align 2, 0 .pool -_080E7014: +@080E7014: ldr r5, =0x0203a014 ldr r0, [r5] movs r1, 0xC8 @@ -439567,7 +439567,7 @@ _080E7014: adds r1, r6, 0 adds r2, r4, 0 bl sub_80E89AC -_080E70BE: +@080E70BE: pop {r3} mov r8, r3 pop {r4-r6} @@ -439578,7 +439578,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 @@ -439604,7 +439604,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 @@ -439619,12 +439619,12 @@ sub_80E7128: @ 80E7128 lsls r0, 16 asrs r0, 16 cmp r0, 0x32 - bne _080E7150 + bne @080E7150 movs r0, 0xE2 bl audio_play movs r0, 0 strh r0, [r4, 0x8] -_080E7150: +@080E7150: pop {r4} pop {r0} bx r0 @@ -439633,7 +439633,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 @@ -439645,25 +439645,25 @@ sub_80E715C: @ 80E715C movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0x5 - bls _080E7176 - b _080E730A -_080E7176: + bls @080E7176 + b @080E730A +@080E7176: lsls r0, 2 - ldr r1, =_080E7188 + ldr r1, =@080E7188 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080E7188: - .4byte _080E71A0 - .4byte _080E7218 - .4byte _080E724C - .4byte _080E726C - .4byte _080E72AC - .4byte _080E72C0 -_080E71A0: +@080E7188: + .4byte @080E71A0 + .4byte @080E7218 + .4byte @080E724C + .4byte @080E726C + .4byte @080E72AC + .4byte @080E72C0 +@080E71A0: ldr r4, =0x0203a018 ldr r0, =0x00001444 bl malloc @@ -439698,10 +439698,10 @@ _080E71A0: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x1E] - b _080E730A + b @080E730A .align 2, 0 .pool -_080E7218: +@080E7218: ldr r2, =0x03005e00 movs r0, 0x14 ldrsh r1, [r5, r0] @@ -439711,7 +439711,7 @@ _080E7218: adds r0, r2 ldrb r0, [r0, 0x4] cmp r0, 0 - bne _080E730A + bne @080E730A movs r0, 0x2 strh r0, [r5] ldr r0, =0x00000894 @@ -439719,10 +439719,10 @@ _080E7218: bl sub_80FB074 ldrb r0, [r5, 0x1E] bl remove_task - b _080E730A + b @080E730A .align 2, 0 .pool -_080E724C: +@080E724C: ldr r0, =sub_80E7FF8 + 1 movs r1, 0xA bl AddTask @@ -439733,10 +439733,10 @@ _080E724C: strh r0, [r5] movs r0, 0xE0 bl audio_play - b _080E730A + b @080E730A .align 2, 0 .pool -_080E726C: +@080E726C: ldr r2, =0x03005e00 movs r0, 0x14 ldrsh r1, [r5, r0] @@ -439746,36 +439746,36 @@ _080E726C: adds r0, r2 ldrb r4, [r0, 0x4] cmp r4, 0 - bne _080E730A + bne @080E730A movs r0, 0x4 strh r0, [r5] ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - bne _080E7296 + bne @080E7296 bl sub_80B3050 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x14] -_080E7296: +@080E7296: ldr r0, =0x085eea8e bl sub_80E70F4 strh r4, [r5, 0x10] - b _080E730A + b @080E730A .align 2, 0 .pool -_080E72AC: +@080E72AC: ldrh r0, [r5, 0x10] adds r0, 0x1 strh r0, [r5, 0x10] lsls r0, 16 asrs r0, 16 cmp r0, 0x3C - ble _080E730A + ble @080E730A movs r0, 0x5 strh r0, [r5] - b _080E730A -_080E72C0: + b @080E730A +@080E72C0: ldr r2, =0x03005e00 movs r0, 0x14 ldrsh r1, [r5, r0] @@ -439785,7 +439785,7 @@ _080E72C0: adds r0, r2 ldrb r0, [r0, 0x4] cmp r0, 0 - bne _080E730A + bne @080E730A ldr r0, =0x0203a014 ldr r0, [r0] bl free @@ -439796,18 +439796,18 @@ _080E72C0: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _080E72F8 + beq @080E72F8 ldr r0, =sub_80AF2B4 + 1 movs r1, 0xA bl AddTask -_080E72F8: +@080E72F8: movs r0, 0 movs r1, 0x1 bl sub_8197434 adds r0, r4, 0 bl remove_task bl script_env_2_enable_and_set_ctx_running -_080E730A: +@080E730A: pop {r4,r5} pop {r0} bx r0 @@ -439816,7 +439816,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 @@ -439828,49 +439828,49 @@ sub_80E7324: @ 80E7324 movs r0, 0x8 ldrsh r1, [r5, r0] cmp r1, 0x64 - beq _080E73A0 + beq @080E73A0 cmp r1, 0x64 - bgt _080E7362 + bgt @080E7362 cmp r1, 0x1 - bne _080E7346 - b _080E7464 -_080E7346: + bne @080E7346 + b @080E7464 +@080E7346: cmp r1, 0x1 - bgt _080E7354 + bgt @080E7354 cmp r1, 0 - beq _080E7384 - b _080E7566 + beq @080E7384 + b @080E7566 .align 2, 0 .pool -_080E7354: +@080E7354: cmp r1, 0x2 - bne _080E735A - b _080E7490 -_080E735A: + bne @080E735A + b @080E7490 +@080E735A: cmp r1, 0x5 - bne _080E7360 - b _080E7550 -_080E7360: - b _080E7566 -_080E7362: + bne @080E7360 + b @080E7550 +@080E7360: + b @080E7566 +@080E7362: cmp r1, 0xC9 - beq _080E73F8 + beq @080E73F8 cmp r1, 0xC9 - bgt _080E7370 + bgt @080E7370 cmp r1, 0x65 - beq _080E73B8 - b _080E7566 -_080E7370: + beq @080E73B8 + b @080E7566 +@080E7370: ldr r0, =0x0000012d cmp r1, r0 - beq _080E7432 + beq @080E7432 adds r0, 0x63 cmp r1, r0 - beq _080E744A - b _080E7566 + beq @080E744A + b @080E7566 .align 2, 0 .pool -_080E7384: +@080E7384: ldr r0, =0x085eea7e bl sub_80E70F4 movs r0, 0xE1 @@ -439880,24 +439880,24 @@ _080E7384: lsls r0, 1 strh r0, [r5, 0x8] bl sub_8009FAC - b _080E7566 + b @080E7566 .align 2, 0 .pool -_080E73A0: +@080E73A0: ldrh r0, [r5, 0x20] adds r0, 0x1 strh r0, [r5, 0x20] lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - bgt _080E73B0 - b _080E7566 -_080E73B0: + bgt @080E73B0 + b @080E7566 +@080E73B0: movs r0, 0 strh r0, [r5, 0x20] movs r0, 0x65 - b _080E7564 -_080E73B8: + b @080E7564 +@080E73B8: bl sub_800ABAC lsls r0, 24 lsrs r4, r0, 24 @@ -439905,38 +439905,38 @@ _080E73B8: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080E73EA + bne @080E73EA bl sub_800AA48 lsls r0, 24 lsrs r0, 24 cmp r4, r0 - beq _080E73DA - b _080E7566 -_080E73DA: + beq @080E73DA + b @080E7566 +@080E73DA: movs r0, 0x15 bl audio_play movs r1, 0 movs r0, 0xC9 strh r0, [r5, 0x8] strh r1, [r5, 0x20] - b _080E7566 -_080E73EA: + b @080E7566 +@080E73EA: movs r0, 0x16 bl audio_play ldr r0, =0x0000012d - b _080E7564 + b @080E7564 .align 2, 0 .pool -_080E73F8: +@080E73F8: bl sub_800AA48 adds r4, r0, 0 bl sub_800ABAC lsls r4, 24 lsls r0, 24 cmp r4, r0 - beq _080E740C - b _080E7566 -_080E740C: + beq @080E740C + b @080E7566 +@080E740C: ldrh r4, [r5, 0x20] adds r4, 0x1 strh r4, [r5, 0x20] @@ -439949,46 +439949,46 @@ _080E740C: subs r1, r0 lsls r1, 1 cmp r4, r1 - bgt _080E742A - b _080E7566 -_080E742A: + bgt @080E742A + b @080E7566 +@080E742A: bl sub_800A620 movs r0, 0x1 - b _080E7564 -_080E7432: + b @080E7564 +@080E7432: bl sub_800AA48 adds r4, r0, 0 bl sub_800ABAC lsls r4, 24 lsls r0, 24 cmp r4, r0 - beq _080E7446 - b _080E7566 -_080E7446: + beq @080E7446 + b @080E7566 +@080E7446: movs r0, 0x1 - b _080E7564 -_080E744A: + b @080E7564 +@080E744A: ldrh r0, [r5, 0x20] adds r0, 0x1 strh r0, [r5, 0x20] lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - bgt _080E745A - b _080E7566 -_080E745A: + bgt @080E745A + b @080E7566 +@080E745A: movs r0, 0x1 strh r0, [r5, 0x8] movs r0, 0 strh r0, [r5, 0x20] - b _080E7566 -_080E7464: + b @080E7566 +@080E7464: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _080E746E - b _080E7566 -_080E746E: + bne @080E746E + b @080E7566 +@080E746E: ldr r4, =0x02021cc4 bl sub_80E7810 adds r1, r0, 0 @@ -439999,10 +439999,10 @@ _080E746E: movs r3, 0x2 bl decimal_int_to_string movs r0, 0x5 - b _080E7564 + b @080E7564 .align 2, 0 .pool -_080E7490: +@080E7490: bl sub_800ABAC lsls r0, 24 lsrs r0, 24 @@ -440017,7 +440017,7 @@ _080E7490: str r0, [r5] bl sub_800A064 cmp r0, 0 - beq _080E7504 + beq @080E7504 ldr r0, =0x0203a018 ldr r0, [r0] adds r1, r5, 0 @@ -440042,10 +440042,10 @@ _080E7490: ldr r1, =0x0300115c ldr r0, =0x00001230 str r0, [r1] - b _080E7566 + b @080E7566 .align 2, 0 .pool -_080E7504: +@080E7504: ldr r0, =0x0203a018 ldr r0, [r0] adds r1, r5, 0 @@ -440070,30 +440070,30 @@ _080E7504: ldr r1, =0x0300115c ldr r0, =0x00001444 str r0, [r1] - b _080E7566 + b @080E7566 .align 2, 0 .pool -_080E7550: +@080E7550: ldrh r0, [r5, 0x1C] adds r0, 0x1 strh r0, [r5, 0x1C] lsls r0, 16 asrs r0, 16 cmp r0, 0x3C - ble _080E7566 + ble @080E7566 movs r0, 0 strh r0, [r5, 0x1C] movs r0, 0x2 -_080E7564: +@080E7564: strh r0, [r5, 0x8] -_080E7566: +@080E7566: pop {r4-r6} pop {r0} bx r0 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 @@ -440106,22 +440106,22 @@ sub_80E756C: @ 80E756C ldrsh r1, [r5, r2] adds r2, r0, 0 cmp r1, 0x4 - bhi _080E7624 + bhi @080E7624 lsls r0, r1, 2 - ldr r1, =_080E7598 + ldr r1, =@080E7598 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080E7598: - .4byte _080E75AC - .4byte _080E75D0 - .4byte _080E7624 - .4byte _080E75E2 - .4byte _080E760E -_080E75AC: +@080E7598: + .4byte @080E75AC + .4byte @080E75D0 + .4byte @080E7624 + .4byte @080E75E2 + .4byte @080E760E +@080E75AC: adds r0, r5, 0 adds r0, 0xC bl sub_80E77FC @@ -440134,18 +440134,18 @@ _080E75AC: ldr r0, =0x020228c4 movs r2, 0xC8 bl memcpy - b _080E75FC + b @080E75FC .align 2, 0 .pool -_080E75D0: +@080E75D0: bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - bne _080E75FC + bne @080E75FC movs r0, 0x1 bl sub_800A4D8 - b _080E75FC -_080E75E2: + b @080E75FC +@080E75E2: ldrh r0, [r5, 0x10] adds r0, 0x1 strh r0, [r5, 0x10] @@ -440157,19 +440157,19 @@ _080E75E2: bl __udivsi3 adds r0, 0x1 cmp r4, r0 - bne _080E7608 -_080E75FC: + bne @080E7608 +@080E75FC: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] - b _080E7624 + b @080E7624 .align 2, 0 .pool -_080E7608: +@080E7608: movs r0, 0 strh r0, [r5, 0x8] - b _080E7624 -_080E760E: + b @080E7624 +@080E760E: movs r1, 0x1C ldrsh r0, [r5, r1] lsls r1, r0, 2 @@ -440178,10 +440178,10 @@ _080E760E: adds r1, r2 ldrb r0, [r1, 0x4] cmp r0, 0 - bne _080E7624 + bne @080E7624 ldr r0, =sub_80E77D4 + 1 str r0, [r5] -_080E7624: +@080E7624: pop {r4,r5} pop {r0} bx r0 @@ -440190,7 +440190,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 @@ -440218,13 +440218,13 @@ sub_80E7630: @ 80E7630 lsrs r0, 24 ldr r3, [sp, 0x4] cmp r3, r0 - bne _080E773E + bne @080E773E movs r4, 0 mov r8, r4 - b _080E771C + b @080E771C .align 2, 0 .pool -_080E7678: +@080E7678: ldr r1, [sp, 0x4] mov r0, r8 asrs r1, r0 @@ -440234,7 +440234,7 @@ _080E7678: add r2, r8 mov r9, r2 cmp r1, 0 - beq _080E7714 + beq @080E7714 mov r0, r10 adds r0, 0x12 bl sub_80E77FC @@ -440264,19 +440264,19 @@ _080E7678: ldr r4, =0x0300115c ldr r3, [r4] cmp r0, r3 - bls _080E76DC + bls @080E76DC muls r2, r7 subs r2, r3, r2 adds r0, r6, 0 bl memcpy - b _080E76E4 + b @080E76E4 .align 2, 0 .pool -_080E76DC: +@080E76DC: adds r0, r6, 0 movs r2, 0xC8 bl memcpy -_080E76E4: +@080E76E4: mov r0, r8 bl sub_800A5EC mov r0, r9 @@ -440293,23 +440293,23 @@ _080E76E4: bl __udivsi3 adds r0, 0x1 cmp r4, r0 - bne _080E7714 + bne @080E7714 ldr r0, [sp, 0x8] adds r0, 0x1 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x8] -_080E7714: +@080E7714: mov r4, r9 lsls r0, r4, 24 lsrs r0, 24 mov r8, r0 -_080E771C: +@080E771C: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r8, r0 - bcc _080E7678 + bcc @080E7678 ldr r2, =0x03005e00 mov r0, r10 movs r3, 0x8 @@ -440321,16 +440321,16 @@ _080E771C: ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] -_080E773E: +@080E773E: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 ldr r4, [sp, 0x8] cmp r4, r0 - bne _080E7752 + bne @080E7752 ldr r0, [sp] bl remove_task -_080E7752: +@080E7752: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -440344,7 +440344,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 @@ -440361,10 +440361,10 @@ sub_80E776C: @ 80E776C adds r0, r2 ldrb r0, [r0, 0x4] cmp r0, 0 - bne _080E7794 + bne @080E7794 adds r0, r3, 0 bl remove_task -_080E7794: +@080E7794: pop {r4} pop {r0} bx r0 @@ -440373,7 +440373,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 @@ -440387,11 +440387,11 @@ sub_80E77A0: @ 80E77A0 ldr r0, =0x03001130 ldrb r0, [r0] cmp r0, 0x1 - bne _080E77C4 + bne @080E77C4 movs r2, 0x12 ldrsh r0, [r1, r2] bl sub_80E6F60 -_080E77C4: +@080E77C4: pop {r0} bx r0 .align 2, 0 @@ -440399,7 +440399,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 @@ -440418,7 +440418,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] @@ -440428,7 +440428,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] @@ -440436,7 +440436,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 @@ -440446,7 +440446,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 @@ -440457,38 +440457,38 @@ 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 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - beq _080E7868 + beq @080E7868 cmp r0, 0x3 - bhi _080E784A + bhi @080E784A cmp r0, 0x2 - beq _080E7850 - b _080E78B8 -_080E784A: + beq @080E7850 + b @080E78B8 +@080E784A: cmp r0, 0x4 - beq _080E7894 - b _080E78B8 -_080E7850: + beq @080E7894 + b @080E78B8 +@080E7850: movs r3, 0 ldr r2, =0x0858cf8c adds r1, r4, 0 -_080E7856: +@080E7856: adds r0, r3, r2 ldrb r0, [r0] stm r1!, {r0} adds r3, 0x1 cmp r3, 0x1 - bls _080E7856 - b _080E78B8 + bls @080E7856 + b @080E78B8 .align 2, 0 .pool -_080E7868: +@080E7868: movs r0, 0 bl sub_800A2A4 adds r2, r0, 0 @@ -440500,17 +440500,17 @@ _080E7868: adds r0, r2 adds r1, r0, r1 adds r2, r4, 0 -_080E7880: +@080E7880: ldrb r0, [r1] stm r2!, {r0} adds r1, 0x1 adds r3, 0x1 cmp r3, 0x2 - bls _080E7880 - b _080E78B8 + bls @080E7880 + b @080E78B8 .align 2, 0 .pool -_080E7894: +@080E7894: movs r0, 0 bl sub_800A2A4 movs r1, 0x9 @@ -440521,14 +440521,14 @@ _080E7894: lsls r0, r2, 2 adds r1, r0, r1 adds r2, r4, 0 -_080E78AC: +@080E78AC: ldrb r0, [r1] stm r2!, {r0} adds r1, 0x1 adds r3, 0x1 cmp r3, 0x3 - bls _080E78AC -_080E78B8: + bls @080E78AC +@080E78B8: pop {r4} pop {r0} bx r0 @@ -440537,7 +440537,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 @@ -440565,20 +440565,20 @@ sub_80E78C4: @ 80E78C4 ldrh r5, [r0, 0x1A] bl sub_800A064 cmp r0, 0 - beq _080E7910 + beq @080E7910 adds r0, r6, 0 adds r1, r4, 0 adds r2, r5, 0 bl sub_8120D34 - b _080E791A + b @080E791A .align 2, 0 .pool -_080E7910: +@080E7910: adds r0, r6, 0 adds r1, r4, 0 adds r2, r5, 0 bl sub_8120CD0 -_080E791A: +@080E791A: ldr r0, =0x03001140 ldr r0, [r0] lsls r1, r7, 2 @@ -440603,7 +440603,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 @@ -440617,7 +440617,7 @@ sub_80E7948: @ 80E7948 bl sub_80E7830 bl sub_800A064 cmp r0, 0 - beq _080E79AC + beq @080E79AC lsls r0, r6, 2 mov r1, sp adds r5, r1, r0 @@ -440632,7 +440632,7 @@ sub_80E7948: @ 80E7948 bl sub_816587C mov r9, r4 cmp r0, 0x1 - bne _080E79FE + bne @080E79FE adds r7, r6, 0 ldr r2, =0x020229e8 ldr r1, [r5] @@ -440646,10 +440646,10 @@ sub_80E7948: @ 80E7948 strb r1, [r0] adds r0, r7, 0 bl sub_8164F70 - b _080E79FE + b @080E79FE .align 2, 0 .pool -_080E79AC: +@080E79AC: adds r5, r7, 0 muls r5, r6 mov r0, r8 @@ -440666,30 +440666,30 @@ _080E79AC: adds r7, r4, 0 movs r6, 0 mov r9, r5 -_080E79CE: +@080E79CE: movs r0, 0x2C muls r0, r6 adds r0, 0x34 adds r1, r7, r0 ldrh r0, [r1] cmp r0, 0 - beq _080E79F2 + beq @080E79F2 adds r4, r1, 0 adds r4, 0x20 adds r0, r4, 0 bl sub_8009228 cmp r0, 0 - beq _080E79F2 + beq @080E79F2 adds r0, r4, 0 movs r1, 0x1 bl sub_8009308 -_080E79F2: +@080E79F2: adds r6, 0x1 cmp r6, 0x3 - ble _080E79CE + ble @080E79CE adds r0, r7, 0 bl sub_8164F70 -_080E79FE: +@080E79FE: mov r0, r8 add r0, r9 bl sub_81628A0 @@ -440703,7 +440703,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} @@ -440724,21 +440724,21 @@ sub_80E7A14: @ 80E7A14 bl sub_818D9AC lsls r0, 24 cmp r0, 0 - bne _080E7A60 + bne @080E7A60 movs r0, 0x40 bl malloc adds r4, r0, 0 cmp r4, 0 - beq _080E7A8A + beq @080E7A8A ldr r1, [r6] movs r2, 0x40 bl memcpy - b _080E7A62 + b @080E7A62 .align 2, 0 .pool -_080E7A60: +@080E7A60: movs r4, 0 -_080E7A62: +@080E7A62: ldr r0, =0x03001150 ldr r0, [r0] lsls r1, r5, 2 @@ -440750,12 +440750,12 @@ _080E7A62: bl memcpy bl sub_818DA78 cmp r4, 0 - beq _080E7A8A + beq @080E7A8A adds r0, r4, 0 bl sub_818E570 adds r0, r4, 0 bl free -_080E7A8A: +@080E7A8A: add sp, 0x10 pop {r3} mov r8, r3 @@ -440767,7 +440767,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 @@ -440775,7 +440775,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 @@ -440844,13 +440844,13 @@ 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 movs r1, 0 ldr r4, =0x03001160 -_080E7B36: +@080E7B36: adds r0, r3, r1 ldrb r0, [r0] adds r0, r2, r0 @@ -440858,7 +440858,7 @@ _080E7B36: lsrs r2, r0, 24 adds r1, 0x1 cmp r1, 0xFF - ble _080E7B36 + ble @080E7B36 strb r2, [r4] pop {r4} pop {r0} @@ -440868,7 +440868,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 @@ -440877,7 +440877,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 @@ -440915,7 +440915,7 @@ sub_80E7B60: @ 80E7B60 movs r2, 0 adds r6, r1, 0 ldr r5, [sp, 0x50] -_080E7BB0: +@080E7BB0: mov r1, sp add r1, r8 adds r1, 0x4 @@ -440936,7 +440936,7 @@ _080E7BB0: lsrs r0, 16 mov r8, r0 cmp r0, 0x3 - bls _080E7BB0 + bls @080E7BB0 bl sub_800A064 str r0, [sp, 0x3C] movs r2, 0 @@ -440947,10 +440947,10 @@ _080E7BB0: mov r3, r9 muls r3, r0 str r3, [sp, 0x44] - b _080E7D04 + b @080E7D04 .align 2, 0 .pool -_080E7BF8: +@080E7BF8: ldr r1, [sp, 0x30] mov r0, r8 muls r0, r1 @@ -440969,21 +440969,21 @@ _080E7BF8: movs r6, 0 ldr r0, [r7, 0x70] cmp r6, r0 - bcs _080E7CFA + bcs @080E7CFA movs r2, 0x10 negs r2, r2 mov r10, r2 -_080E7C24: +@080E7C24: lsls r0, r6, 3 subs r0, r6 lsls r0, 3 adds r5, r7, r0 ldrh r0, [r5, 0x20] cmp r0, 0 - beq _080E7CEE + beq @080E7CEE ldr r3, [sp, 0x3C] cmp r3, 0 - beq _080E7C9A + beq @080E7C9A adds r4, r5, 0 adds r4, 0x24 adds r0, r4, 0 @@ -440991,34 +440991,34 @@ _080E7C24: lsls r0, 16 lsrs r0, 16 cmp r0, 0x5 - bhi _080E7C54 + bhi @080E7C54 movs r4, 0x1 - b _080E7C5C + b @080E7C5C .align 2, 0 .pool -_080E7C54: +@080E7C54: adds r0, r4, 0 bl sub_8009370 mov r4, r9 -_080E7C5C: +@080E7C5C: ldrh r1, [r5, 0x2C] ldr r0, =0x000015fc cmp r1, r0 - bne _080E7C74 + bne @080E7C74 adds r0, r5, 0 adds r0, 0x2C bl sub_8009370 movs r1, 0x1 - b _080E7C76 + b @080E7C76 .align 2, 0 .pool -_080E7C74: +@080E7C74: mov r1, r9 -_080E7C76: +@080E7C76: ldr r0, [sp, 0x40] subs r0, 0x1 cmp r0, 0x1 - bhi _080E7CEE + bhi @080E7CEE adds r2, r5, 0 adds r2, 0x37 movs r0, 0xF @@ -441032,31 +441032,31 @@ _080E7C76: ands r0, r3 orrs r0, r1 strb r0, [r2] - b _080E7CEE -_080E7C9A: + b @080E7CEE +@080E7C9A: mov r0, r9 cmp r0, 0x1 - bne _080E7CEE + bne @080E7CEE adds r0, r5, 0 adds r0, 0x24 bl sub_8009228 cmp r0, 0 - beq _080E7CBA + beq @080E7CBA adds r0, r5, 0 adds r0, 0x37 ldrb r1, [r0] mov r2, r10 ands r1, r2 movs r2, 0x1 - b _080E7CC6 -_080E7CBA: + b @080E7CC6 +@080E7CBA: adds r0, r5, 0 adds r0, 0x37 ldrb r1, [r0] mov r3, r10 ands r1, r3 movs r2, 0x2 -_080E7CC6: +@080E7CC6: orrs r1, r2 strb r1, [r0] adds r4, r0, 0 @@ -441064,41 +441064,41 @@ _080E7CC6: adds r0, 0x2C bl sub_8009228 cmp r0, 0 - beq _080E7CE2 + beq @080E7CE2 ldrb r0, [r4] movs r1, 0xF ands r1, r0 movs r0, 0x10 - b _080E7CEA -_080E7CE2: + b @080E7CEA +@080E7CE2: ldrb r0, [r4] movs r1, 0xF ands r1, r0 movs r0, 0x20 -_080E7CEA: +@080E7CEA: orrs r1, r0 strb r1, [r4] -_080E7CEE: +@080E7CEE: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 ldr r0, [r7, 0x70] cmp r6, r0 - bcc _080E7C24 -_080E7CFA: + bcc @080E7C24 +@080E7CFA: mov r0, r8 adds r0, 0x1 lsls r0, 16 lsrs r0, 16 mov r8, r0 -_080E7D04: +@080E7D04: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r8, r0 - bcs _080E7D12 - b _080E7BF8 -_080E7D12: + bcs @080E7D12 + b @080E7BF8 +@080E7D12: movs r0, 0 str r0, [sp, 0x34] mov r8, r0 @@ -441106,9 +441106,9 @@ _080E7D12: lsrs r0, r1, 16 ldr r2, [sp, 0x34] cmp r2, r0 - bcs _080E7D70 + bcs @080E7D70 adds r5, r0, 0 -_080E7D24: +@080E7D24: ldr r3, [sp, 0x30] mov r0, r8 muls r0, r3 @@ -441116,52 +441116,52 @@ _080E7D24: adds r7, r1, r0 ldr r0, [r7, 0x70] cmp r0, 0 - beq _080E7D62 + beq @080E7D62 movs r6, 0 cmp r6, r0 - bcs _080E7D62 + bcs @080E7D62 adds r3, r7, 0 adds r3, 0x74 ldr r2, [sp, 0x4C] mov r0, r8 lsls r1, r0, 1 movs r4, 0x1 -_080E7D46: +@080E7D46: lsls r0, r6, 1 adds r0, r3, r0 ldrh r0, [r0] cmp r0, 0 - bne _080E7D56 + bne @080E7D56 adds r0, r6, r1 adds r0, r2, r0 strb r4, [r0] -_080E7D56: +@080E7D56: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 ldr r0, [r7, 0x70] cmp r6, r0 - bcc _080E7D46 -_080E7D62: + bcc @080E7D46 +@080E7D62: mov r0, r8 adds r0, 0x1 lsls r0, 16 lsrs r0, 16 mov r8, r0 cmp r8, r5 - bcc _080E7D24 -_080E7D70: + bcc @080E7D24 +@080E7D70: movs r6, 0 mov r8, r6 ldr r1, [sp, 0x54] cmp r1, 0 - beq _080E7E64 + beq @080E7E64 add r2, sp, 0x24 mov r10, r2 movs r3, 0x25 add r3, sp mov r9, r3 -_080E7D84: +@080E7D84: ldr r1, [sp, 0x30] mov r0, r8 muls r0, r1 @@ -441173,30 +441173,30 @@ _080E7D84: adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x1 - beq _080E7DA6 + beq @080E7DA6 ldr r3, [sp, 0x50] adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _080E7DB0 -_080E7DA6: + bne @080E7DB0 +@080E7DA6: ldr r0, [sp, 0x34] adds r0, 0x1 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x34] -_080E7DB0: +@080E7DB0: ldr r2, [sp, 0x4C] adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _080E7DD4 + bne @080E7DD4 ldr r3, [sp, 0x50] adds r0, r3, r1 ldrb r2, [r0] cmp r2, 0 - bne _080E7DD4 -_080E7DC4: + bne @080E7DD4 +@080E7DC4: lsls r1, r6, 1 mov r3, r10 adds r0, r3, r1 @@ -441204,29 +441204,29 @@ _080E7DC4: strb r3, [r0] add r1, r9 strb r2, [r1] - b _080E7E4E -_080E7DD4: + b @080E7E4E +@080E7DD4: ldr r2, [sp, 0x4C] adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 - bne _080E7DE8 + bne @080E7DE8 ldr r3, [sp, 0x50] adds r0, r3, r1 ldrb r2, [r0] cmp r2, 0x1 - beq _080E7DC4 -_080E7DE8: + beq @080E7DC4 +@080E7DE8: ldr r2, [sp, 0x4C] adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _080E7E54 + bne @080E7E54 ldr r3, [sp, 0x50] adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _080E7E54 + bne @080E7E54 lsls r5, r6, 1 mov r1, r10 adds r0, r1, r5 @@ -441243,18 +441243,18 @@ _080E7DE8: lsls r0, 24 lsrs r1, r0, 24 cmp r4, 0 - bne _080E7E30 + bne @080E7E30 cmp r1, 0 - beq _080E7E34 + beq @080E7E34 mov r3, r9 adds r1, r3, r5 movs r0, 0x1 strb r0, [r1] - b _080E7E4E -_080E7E30: + b @080E7E4E +@080E7E30: cmp r1, 0 - beq _080E7E48 -_080E7E34: + beq @080E7E48 +@080E7E34: bl GenerateRandomNumber2 mov r1, r9 adds r2, r1, r5 @@ -441263,16 +441263,16 @@ _080E7E34: movs r1, 0x1 ands r0, r1 strb r0, [r2] - b _080E7E4E -_080E7E48: + b @080E7E4E +@080E7E48: mov r2, r9 adds r0, r2, r5 strb r1, [r0] -_080E7E4E: +@080E7E4E: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 -_080E7E54: +@080E7E54: mov r0, r8 adds r0, 0x1 lsls r0, 16 @@ -441280,8 +441280,8 @@ _080E7E54: mov r8, r3 ldr r1, [sp, 0x54] cmp r0, r1 - bcc _080E7D84 -_080E7E64: + bcc @080E7D84 +@080E7E64: movs r2, 0 mov r8, r2 ldr r3, [sp, 0x44] @@ -441291,7 +441291,7 @@ _080E7E64: ldr r1, [sp, 0x2C] adds r7, r1, r0 ldr r1, [sp, 0x48] -_080E7E76: +@080E7E76: mov r2, r8 lsls r0, r2, 2 adds r0, r1, r0 @@ -441302,7 +441302,7 @@ _080E7E76: lsrs r0, 16 mov r8, r0 cmp r0, 0x3 - bls _080E7E76 + bls @080E7E76 bl sub_80E7B54 lsls r0, 24 lsrs r0, 24 @@ -441312,18 +441312,18 @@ _080E7E76: lsrs r1, r0, 24 ldr r3, [sp, 0x34] cmp r3, 0x3 - beq _080E7EC8 + beq @080E7EC8 cmp r3, 0x3 - bgt _080E7EAE + bgt @080E7EAE cmp r3, 0x2 - beq _080E7EB6 - b _080E7F1C -_080E7EAE: + beq @080E7EB6 + b @080E7F1C +@080E7EAE: ldr r0, [sp, 0x34] cmp r0, 0x4 - beq _080E7EE8 - b _080E7F1C -_080E7EB6: + beq @080E7EE8 + b @080E7F1C +@080E7EB6: add r2, sp, 0x24 movs r0, 0x1 str r0, [sp] @@ -441331,8 +441331,8 @@ _080E7EB6: ldr r1, [sp, 0x30] movs r3, 0 bl sub_80E7AA4 - b _080E7F1C -_080E7EC8: + b @080E7F1C +@080E7EC8: ldr r0, =0x0858cfb8 lsls r1, 1 adds r2, r1, r0 @@ -441345,10 +441345,10 @@ _080E7EC8: ldr r0, [sp, 0x2C] ldr r1, [sp, 0x30] bl sub_80E7AA4 - b _080E7F1C + b @080E7F1C .align 2, 0 .pool -_080E7EE8: +@080E7EE8: add r6, sp, 0x24 ldr r4, =0x0858cfbe lsls r5, r1, 2 @@ -441373,7 +441373,7 @@ _080E7EE8: ldr r1, [sp, 0x30] adds r2, r6, 0 bl sub_80E7AA4 -_080E7F1C: +@080E7F1C: ldr r1, [sp, 0x2C] ldr r2, [sp, 0x44] adds r7, r1, r2 @@ -441407,38 +441407,38 @@ _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 cmp r1, 0 - beq _080E7FEC + beq @080E7FEC ldrh r0, [r4] cmp r0, 0 - beq _080E7FEC + beq @080E7FEC bl sub_80D6C68 lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 - bne _080E7FEC + bne @080E7FEC ldrh r0, [r4] movs r1, 0x1 bl sub_80D6724 lsls r0, 24 cmp r0, 0 - bne _080E7FE4 + bne @080E7FE4 ldrh r0, [r4] movs r1, 0x1 bl sub_80D6D1C lsls r0, 24 cmp r0, 0 - bne _080E7FE4 + bne @080E7FE4 ldrh r0, [r4] movs r1, 0x1 bl bag_add_item lsls r0, 24 cmp r0, 0 - beq _080E7FE4 + beq @080E7FE4 ldr r0, =0x00004001 ldrh r1, [r4] bl var_set @@ -441448,17 +441448,17 @@ sub_80E7F68: @ 80E7F68 ldrh r1, [r4] ldr r0, =0x00000113 cmp r1, r0 - bne _080E7FEC + bne @080E7FEC ldr r0, =0x000008b3 bl flag_set - b _080E7FEC + b @080E7FEC .align 2, 0 .pool -_080E7FE4: +@080E7FE4: ldr r0, =0x00004001 movs r1, 0 bl var_set -_080E7FEC: +@080E7FEC: pop {r4} pop {r0} bx r0 @@ -441467,7 +441467,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 @@ -441479,125 +441479,125 @@ sub_80E7FF8: @ 80E7FF8 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x9 - bls _080E8012 - b _080E810A -_080E8012: + bls @080E8012 + b @080E810A +@080E8012: lsls r0, 2 - ldr r1, =_080E8024 + ldr r1, =@080E8024 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080E8024: - .4byte _080E80F2 - .4byte _080E804C - .4byte _080E805A - .4byte _080E8064 - .4byte _080E807C - .4byte _080E8090 - .4byte _080E80A4 - .4byte _080E80C0 - .4byte _080E80EE - .4byte _080E80FA -_080E804C: +@080E8024: + .4byte @080E80F2 + .4byte @080E804C + .4byte @080E805A + .4byte @080E8064 + .4byte @080E807C + .4byte @080E8090 + .4byte @080E80A4 + .4byte @080E80C0 + .4byte @080E80EE + .4byte @080E80FA +@080E804C: bl sub_800A064 cmp r0, 0 - bne _080E80F2 + bne @080E80F2 movs r0, 0x6 strh r0, [r4, 0x8] - b _080E810A -_080E805A: + b @080E810A +@080E805A: bl sub_8076D5C bl sub_8153430 - b _080E80F2 -_080E8064: + b @080E80F2 +@080E8064: bl sub_8153474 lsls r0, 24 cmp r0, 0 - beq _080E810A + beq @080E810A bl sav2_gender2_inplace_and_xFE movs r1, 0 movs r0, 0x4 strh r0, [r4, 0x8] strh r1, [r4, 0xA] - b _080E810A -_080E807C: + b @080E810A +@080E807C: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0xA - ble _080E810A + ble @080E810A bl sub_800AC34 - b _080E80F2 -_080E8090: + b @080E80F2 +@080E8090: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _080E810A + bne @080E810A adds r0, r5, 0 bl remove_task - b _080E810A + b @080E810A .align 2, 0 .pool -_080E80A4: +@080E80A4: movs r0, 0 bl sub_801048C lsls r0, 24 cmp r0, 0 - bne _080E810A + bne @080E810A ldr r0, =sub_8153688 + 1 movs r1, 0x5 bl AddTask - b _080E80F2 + b @080E80F2 .align 2, 0 .pool -_080E80C0: +@080E80C0: ldr r0, =sub_8153688 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _080E810A + bne @080E810A ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _080E80E8 + beq @080E80E8 movs r0, 0x1 bl sub_801048C movs r0, 0x8 strh r0, [r4, 0x8] - b _080E810A + b @080E810A .align 2, 0 .pool -_080E80E8: +@080E80E8: movs r0, 0x4 strh r0, [r4, 0x8] - b _080E810A -_080E80EE: + b @080E810A +@080E80EE: bl sub_800ADF8 -_080E80F2: +@080E80F2: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080E810A -_080E80FA: + b @080E810A +@080E80FA: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080E810A + beq @080E810A adds r0, r5, 0 bl remove_task -_080E810A: +@080E810A: pop {r4,r5} pop {r0} bx r0 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 @@ -441629,7 +441629,7 @@ sub_80E8110: @ 80E8110 movs r7, 0 ldr r0, =0x03005d90 mov r9, r0 -_080E8150: +@080E8150: mov r1, r9 ldr r0, [r1] adds r0, 0xB2 @@ -441649,7 +441649,7 @@ _080E8150: adds r0, 0x38 ldrb r0, [r0] cmp r0, 0xFF - beq _080E81B8 + beq @080E81B8 adds r5, r1, 0 adds r5, 0x34 adds r0, r5, 0 @@ -441660,11 +441660,11 @@ _080E8150: adds r0, 0xA bl sub_80842DC cmp r4, r0 - beq _080E819A + beq @080E819A movs r2, 0x1 add r8, r2 str r6, [sp, 0x4] -_080E819A: +@080E819A: adds r0, r5, 0 bl sub_80842DC adds r4, r0, 0 @@ -441673,46 +441673,46 @@ _080E819A: adds r0, 0xA bl sub_80842DC cmp r4, r0 - bne _080E81B8 + bne @080E81B8 ldr r2, [sp, 0xC] adds r2, 0x1 str r2, [sp, 0xC] str r6, [sp, 0x8] -_080E81B8: +@080E81B8: adds r7, 0x1 cmp r7, 0x1 - ble _080E8150 + ble @080E8150 mov r0, r8 cmp r0, 0 - bne _080E81D0 + bne @080E81D0 ldr r1, [sp, 0xC] cmp r1, 0 - beq _080E81D0 + beq @080E81D0 mov r8, r1 ldr r2, [sp, 0x8] str r2, [sp, 0x4] -_080E81D0: +@080E81D0: mov r0, r8 cmp r0, 0x1 - beq _080E81E0 + beq @080E81E0 cmp r0, 0x2 - beq _080E81EC - b _080E824C + beq @080E81EC + b @080E824C .align 2, 0 .pool -_080E81E0: +@080E81E0: ldr r2, [sp, 0x4] lsls r1, r2, 4 adds r1, r2 lsls r1, 2 add r1, r10 - b _080E820E -_080E81EC: + b @080E820E +@080E81EC: bl GenerateRandomNumber2 lsls r0, 16 ldr r1, =0x33330000 cmp r0, r1 - bls _080E8224 + bls @080E8224 ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB2 @@ -441724,15 +441724,15 @@ _080E81EC: lsls r1, 2 add r1, r10 adds r1, 0x44 -_080E820E: +@080E820E: ldr r0, [sp] adds r0, 0x44 movs r2, 0x44 bl memcpy - b _080E824C + b @080E824C .align 2, 0 .pool -_080E8224: +@080E8224: ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB2 @@ -441751,7 +441751,7 @@ _080E8224: adds r0, 0x44 movs r2, 0x44 bl memcpy -_080E824C: +@080E824C: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -441765,7 +441765,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 @@ -441776,7 +441776,7 @@ sub_80E8260: @ 80E8260 movs r6, 0 ldr r0, =0x03005d90 mov r10, r0 -_080E8274: +@080E8274: movs r7, 0 lsls r0, r6, 5 adds r6, 0x1 @@ -441786,7 +441786,7 @@ _080E8274: adds r0, 0x6 adds r6, r1, r0 adds r5, r4, 0 -_080E8286: +@080E8286: mov r2, r10 ldr r1, [r2] adds r1, 0xA @@ -441803,10 +441803,10 @@ _080E8286: adds r5, 0x10 adds r7, 0x1 cmp r7, 0x1 - ble _080E8286 + ble @080E8286 mov r6, r9 cmp r6, 0x8 - ble _080E8274 + ble @080E8274 ldr r1, =0x03005d90 mov r10, r1 ldr r2, =0x00000ee1 @@ -441827,7 +441827,7 @@ _080E8286: lsls r5, 1 add r5, r8 movs r7, 0x1 -_080E82DA: +@080E82DA: movs r0, 0x2 strb r0, [r4, 0x8] mov r2, r10 @@ -441864,7 +441864,7 @@ _080E82DA: adds r5, 0x1C subs r7, 0x1 cmp r7, 0 - bge _080E82DA + bge @080E82DA movs r6, 0 ldr r0, =0x03005d90 ldr r3, [r0] @@ -441886,7 +441886,7 @@ _080E82DA: mov r10, r4 ldr r2, =0x00000cf4 adds r5, r3, r2 -_080E8356: +@080E8356: lsls r2, r6, 1 ldr r1, [sp] ldrh r0, [r1] @@ -441956,7 +441956,7 @@ _080E8356: adds r5, 0x2 adds r6, 0x1 cmp r6, 0x1 - ble _080E8356 + ble @080E8356 add sp, 0xC pop {r3-r5} mov r8, r3 @@ -441970,7 +441970,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} @@ -441980,7 +441980,7 @@ sub_80E841C: @ 80E841C adds r6, r1, 0 adds r6, 0x34 adds r5, r1, 0 -_080E842E: +@080E842E: adds r0, r7, 0 adds r0, 0x34 bl sub_80842DC @@ -441988,23 +441988,23 @@ _080E842E: adds r0, r6, 0 bl sub_80842DC cmp r4, r0 - bne _080E844E + bne @080E844E ldrb r0, [r7, 0x2] ldrb r1, [r5, 0x2] cmp r0, r1 - bne _080E844E + bne @080E844E movs r0, 0x1 - b _080E845E -_080E844E: + b @080E845E +@080E844E: adds r6, 0x44 adds r5, 0x44 movs r0, 0x1 add r8, r0 mov r1, r8 cmp r1, 0x3 - ble _080E842E + ble @080E842E movs r0, 0 -_080E845E: +@080E845E: pop {r3} mov r8, r3 pop {r4-r7} @@ -442013,7 +442013,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} @@ -442036,10 +442036,10 @@ sub_80E8468: @ 80E8468 adds r6, r3, 0 adds r6, 0x38 adds r4, r3, 0 -_080E8496: +@080E8496: ldrb r0, [r6] cmp r0, 0xFF - beq _080E84B4 + beq @080E84B4 ldr r0, =0x03005d90 ldr r1, [r0] adds r1, 0xDC @@ -442048,23 +442048,23 @@ _080E8496: bl sub_80E841C ldr r3, [sp, 0x10] cmp r0, 0 - bne _080E84B4 + bne @080E84B4 adds r7, 0x1 mov r8, r5 -_080E84B4: +@080E84B4: adds r6, 0x44 adds r4, 0x44 adds r5, 0x1 cmp r5, 0x1 - ble _080E8496 + ble @080E8496 cmp r7, 0x1 - beq _080E84CC + beq @080E84CC cmp r7, 0x2 - beq _080E8508 - b _080E8566 + beq @080E8508 + b @080E8566 .align 2, 0 .pool -_080E84CC: +@080E84CC: ldr r4, =0x03005d90 ldr r0, [r4] adds r1, r0, 0 @@ -442091,13 +442091,13 @@ _080E84CC: lsls r0, r5, 27 lsrs r0, 30 adds r0, 0x1 - b _080E8550 + b @080E8550 .align 2, 0 .pool -_080E8508: +@080E8508: movs r5, 0 adds r6, r3, 0 -_080E850C: +@080E850C: movs r0, 0x1 eors r0, r5 ldr r7, =0x03005d90 @@ -442123,14 +442123,14 @@ _080E850C: adds r6, 0x44 adds r5, 0x1 cmp r5, 0x1 - ble _080E850C + ble @080E850C ldr r4, [r7] adds r4, 0xB2 ldrb r5, [r4] lsls r0, r5, 27 lsrs r0, 30 adds r0, 0x2 -_080E8550: +@080E8550: movs r1, 0x3 bl __modsi3 movs r1, 0x3 @@ -442141,7 +442141,7 @@ _080E8550: ands r1, r5 orrs r1, r0 strb r1, [r4] -_080E8566: +@080E8566: add sp, 0x14 pop {r3} mov r8, r3 @@ -442153,7 +442153,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 @@ -442167,33 +442167,33 @@ sub_80E8578: @ 80E8578 movs r5, 0 str r5, [sp, 0x4] ldr r4, =0x03001168 - b _080E85A0 + b @080E85A0 .align 2, 0 .pool -_080E8598: +@080E8598: adds r1, r2 ldr r6, [sp, 0x4] adds r6, 0x1 str r6, [sp, 0x4] -_080E85A0: +@080E85A0: ldr r5, [sp, 0x4] cmp r5, r0 - bge _080E85B6 + bge @080E85B6 cmp r5, r3 - beq _080E85B0 + beq @080E85B0 stm r4!, {r1} movs r6, 0x1 add r8, r6 -_080E85B0: +@080E85B0: mov r5, r8 cmp r5, 0x3 - bne _080E8598 -_080E85B6: + bne @080E8598 +@080E85B6: movs r6, 0 str r6, [sp, 0x4] subs r0, 0x1 str r0, [sp, 0x24] -_080E85BE: +@080E85BE: movs r0, 0 str r0, [sp, 0x8] ldr r1, [sp, 0x4] @@ -442209,7 +442209,7 @@ _080E85BE: str r4, [sp, 0x44] movs r5, 0 str r5, [sp, 0x48] -_080E85DC: +@080E85DC: movs r6, 0 mov r8, r6 ldr r0, =0x03005d90 @@ -442224,7 +442224,7 @@ _080E85DC: adds r0, r4, r0 ldr r5, [sp] adds r2, r0, r5 -_080E85F8: +@080E85F8: adds r0, r2, 0 movs r6, 0x87 lsls r6, 2 @@ -442239,12 +442239,12 @@ _080E85F8: add r8, r0 mov r1, r8 cmp r1, 0x2 - ble _080E85F8 + ble @080E85F8 movs r2, 0 mov r8, r2 ldr r3, [sp, 0x24] cmp r8, r3 - bge _080E86DC + bge @080E86DC ldr r4, [sp, 0x4] lsls r4, 5 mov r9, r4 @@ -442266,7 +442266,7 @@ _080E85F8: adds r0, r2 adds r0, 0x30 mov r10, r0 -_080E864A: +@080E864A: movs r5, 0 str r5, [sp, 0xC] movs r3, 0 @@ -442281,7 +442281,7 @@ _080E864A: ldr r0, =0x03001168 adds r0, r6, r0 str r0, [sp, 0x50] -_080E8666: +@080E8666: lsls r0, r3, 4 ldr r6, [sp, 0x1C] adds r0, r6, r0 @@ -442295,7 +442295,7 @@ _080E8666: bl sub_80842DC ldr r3, [sp, 0x4C] cmp r4, r0 - bne _080E86A8 + bne @080E86A8 ldr r2, [sp, 0xC] adds r2, 0x1 str r2, [sp, 0xC] @@ -442307,20 +442307,20 @@ _080E8666: ldrh r0, [r5, 0x4] ldrh r2, [r1, 0x4] cmp r0, r2 - bcs _080E86A8 + bcs @080E86A8 adds r0, r5, 0 ldm r1!, {r2,r4,r6} stm r0!, {r2,r4,r6} ldr r1, [r1] str r1, [r0] -_080E86A8: +@080E86A8: adds r5, 0x10 adds r3, 0x1 cmp r3, 0x2 - ble _080E8666 + ble @080E8666 ldr r3, [sp, 0xC] cmp r3, 0 - bne _080E86CE + bne @080E86CE ldr r0, =0x03001168 ldr r4, [sp, 0x38] adds r0, r4, r0 @@ -442333,15 +442333,15 @@ _080E86A8: stm r1!, {r2,r3,r6} ldr r0, [r0] str r0, [r1] -_080E86CE: +@080E86CE: movs r4, 0x10 add r10, r4 movs r5, 0x1 add r8, r5 ldr r6, [sp, 0x24] cmp r8, r6 - blt _080E864A -_080E86DC: + blt @080E864A +@080E86DC: ldr r0, [sp, 0x44] adds r0, 0x60 str r0, [sp, 0x44] @@ -442352,18 +442352,18 @@ _080E86DC: adds r2, 0x1 str r2, [sp, 0x8] cmp r2, 0x1 - bgt _080E86F4 - b _080E85DC -_080E86F4: + bgt @080E86F4 + b @080E85DC +@080E86F4: ldr r3, [sp, 0x28] str r3, [sp, 0x4] cmp r3, 0x8 - bgt _080E86FE - b _080E85BE -_080E86FE: + bgt @080E86FE + b @080E85BE +@080E86FE: movs r4, 0 str r4, [sp, 0x8] -_080E8702: +@080E8702: ldr r5, [sp, 0x8] adds r5, 0x1 str r5, [sp, 0x2C] @@ -442379,7 +442379,7 @@ _080E8702: adds r2, r0, r1 movs r4, 0x2 mov r8, r4 -_080E8720: +@080E8720: movs r5, 0xD8 lsls r5, 3 adds r0, r2, r5 @@ -442398,14 +442398,14 @@ _080E8720: add r8, r0 mov r1, r8 cmp r1, 0 - bge _080E8720 + bge @080E8720 movs r2, 0 mov r8, r2 ldr r3, [sp, 0x24] cmp r8, r3 - blt _080E8752 - b _080E885A -_080E8752: + blt @080E8752 + b @080E885A +@080E8752: ldr r4, [sp, 0x8] lsls r1, r4, 3 movs r0, 0xA8 @@ -442416,7 +442416,7 @@ _080E8752: subs r1, r4 lsls r1, 2 mov r10, r1 -_080E8766: +@080E8766: movs r6, 0 str r6, [sp, 0xC] mov r0, r8 @@ -442437,7 +442437,7 @@ _080E8766: adds r7, r5, r0 str r6, [sp, 0x40] movs r3, 0x2 -_080E878E: +@080E878E: ldr r1, [sp, 0x20] movs r2, 0xD8 lsls r2, 3 @@ -442459,7 +442459,7 @@ _080E878E: bl sub_80842DC ldr r3, [sp, 0x4C] cmp r4, r0 - bne _080E8808 + bne @080E8808 adds r0, r5, 0x4 bl sub_80842DC adds r4, r0, 0 @@ -442470,7 +442470,7 @@ _080E878E: bl sub_80842DC ldr r3, [sp, 0x4C] cmp r4, r0 - bne _080E8808 + bne @080E8808 ldr r4, [sp, 0xC] adds r4, 0x1 str r4, [sp, 0xC] @@ -442484,7 +442484,7 @@ _080E878E: ldrh r0, [r7, 0x8] ldrh r1, [r1] cmp r0, r1 - bcs _080E8808 + bcs @080E8808 adds r0, r7, 0 movs r4, 0x90 lsls r4, 1 @@ -442495,17 +442495,17 @@ _080E878E: stm r0!, {r4-r6} ldr r1, [r1] str r1, [r0] -_080E8808: +@080E8808: adds r7, 0x1C ldr r0, [sp, 0x40] adds r0, 0x1C str r0, [sp, 0x40] subs r3, 0x1 cmp r3, 0 - bge _080E878E + bge @080E878E ldr r1, [sp, 0xC] cmp r1, 0 - bne _080E8850 + bne @080E8850 mov r0, r8 adds r0, 0x3 lsls r1, r0, 3 @@ -442532,19 +442532,19 @@ _080E8808: stm r1!, {r2,r5,r6} ldr r0, [r0] str r0, [r1] -_080E8850: +@080E8850: ldr r3, [sp, 0x30] mov r8, r3 ldr r4, [sp, 0x24] cmp r8, r4 - blt _080E8766 -_080E885A: + blt @080E8766 +@080E885A: ldr r5, [sp, 0x2C] str r5, [sp, 0x8] cmp r5, 0x1 - bgt _080E8864 - b _080E8702 -_080E8864: + bgt @080E8864 + b @080E8702 +@080E8864: add sp, 0x54 pop {r3-r5} mov r8, r3 @@ -442558,31 +442558,31 @@ _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 movs r5, 0 -_080E8888: +@080E8888: movs r2, 0 movs r4, 0x1 negs r4, r4 movs r1, 0 adds r6, r5, 0x1 adds r3, r7, 0 -_080E8894: +@080E8894: ldrh r0, [r3, 0x4] cmp r0, r2 - ble _080E889E + ble @080E889E adds r4, r1, 0 adds r2, r0, 0 -_080E889E: +@080E889E: adds r3, 0x10 adds r1, 0x1 cmp r1, 0x5 - ble _080E8894 + ble @080E8894 cmp r4, 0 - blt _080E88C0 + blt @080E88C0 lsls r1, r5, 4 lsls r2, r4, 4 adds r2, r7 @@ -442594,41 +442594,41 @@ _080E889E: str r0, [r1] movs r0, 0 strh r0, [r2, 0x4] -_080E88C0: +@080E88C0: adds r5, r6, 0 cmp r5, 0x2 - ble _080E8888 + ble @080E8888 pop {r4-r7} pop {r0} bx r0 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 movs r5, 0 -_080E88D4: +@080E88D4: movs r3, 0 movs r4, 0x1 negs r4, r4 movs r2, 0 adds r7, r5, 0x1 adds r1, r6, 0 -_080E88E0: +@080E88E0: ldrh r0, [r1, 0x8] cmp r0, r3 - ble _080E88EA + ble @080E88EA adds r4, r2, 0 adds r3, r0, 0 -_080E88EA: +@080E88EA: adds r1, 0x1C adds r2, 0x1 cmp r2, 0x5 - ble _080E88E0 + ble @080E88E0 cmp r4, 0 - blt _080E8918 + blt @080E8918 lsls r1, r5, 3 subs r1, r5 lsls r1, 2 @@ -442646,17 +442646,17 @@ _080E88EA: str r0, [r1] movs r0, 0 strh r0, [r2, 0x8] -_080E8918: +@080E8918: adds r5, r7, 0 cmp r5, 0x2 - ble _080E88D4 + ble @080E88D4 pop {r4-r7} pop {r0} bx r0 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 @@ -442666,7 +442666,7 @@ sub_80E8924: @ 80E8924 movs r0, 0 ldr r1, =0x03005d90 mov r10, r1 -_080E8936: +@080E8936: lsls r1, r0, 1 adds r2, r0, 0x1 mov r8, r2 @@ -442680,7 +442680,7 @@ _080E8936: adds r4, r0, r1 movs r6, 0 movs r5, 0x1 -_080E8950: +@080E8950: mov r1, r10 ldr r0, [r1] adds r0, r7 @@ -442691,13 +442691,13 @@ _080E8950: adds r6, 0x30 subs r5, 0x1 cmp r5, 0 - bge _080E8950 + bge @080E8950 mov r0, r8 cmp r0, 0x8 - ble _080E8936 + ble @080E8936 movs r5, 0 ldr r4, =0x03005d90 -_080E8972: +@080E8972: movs r0, 0x54 adds r1, r5, 0 muls r1, r0 @@ -442714,7 +442714,7 @@ _080E8972: bl sub_80E88CC adds r5, 0x1 cmp r5, 0x1 - ble _080E8972 + ble @080E8972 pop {r3-r5} mov r8, r3 mov r9, r4 @@ -442727,7 +442727,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 @@ -442763,7 +442763,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 @@ -442800,7 +442800,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 @@ -442810,7 +442810,7 @@ sub_80E8A54: @ 80E8A54 mov r9, r0 ldr r0, [r5, 0x70] cmp r9, r0 - bcs _080E8AAE + bcs @080E8AAE adds r4, r5, 0 adds r4, 0x2C movs r0, 0x24 @@ -442819,24 +442819,24 @@ sub_80E8A54: @ 80E8A54 adds r7, r5, 0 adds r7, 0x37 adds r6, r5, 0 -_080E8A78: +@080E8A78: ldrh r0, [r6, 0x20] cmp r0, 0 - beq _080E8A9A + beq @080E8A9A ldrb r1, [r4, 0xB] movs r0, 0xF ands r0, r1 cmp r0, 0x1 - beq _080E8A90 + beq @080E8A90 mov r0, r8 movs r1, 0xFC bl sub_81DB4DC -_080E8A90: +@080E8A90: ldrb r1, [r7] lsrs r1, 4 adds r0, r4, 0 bl sub_8009308 -_080E8A9A: +@080E8A9A: adds r4, 0x38 movs r0, 0x38 add r8, r0 @@ -442846,8 +442846,8 @@ _080E8A9A: add r9, r0 ldr r0, [r5, 0x70] cmp r9, r0 - bcc _080E8A78 -_080E8AAE: + bcc @080E8A78 +@080E8AAE: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -442857,30 +442857,30 @@ _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 -_080E8AC6: +@080E8AC6: movs r0, 0x2C muls r0, r4 adds r0, 0x34 adds r1, r5, r0 ldrh r0, [r1] cmp r0, 0 - beq _080E8ADC + beq @080E8ADC adds r0, r1, 0 adds r0, 0x20 bl sub_8009370 -_080E8ADC: +@080E8ADC: adds r4, 0x1 cmp r4, 0x3 - ble _080E8AC6 + ble @080E8AC6 adds r0, r5, 0 bl sub_8164F70 pop {r4,r5} @@ -442889,7 +442889,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 @@ -442902,7 +442902,7 @@ sub_80E8AF0: @ 80E8AF0 movs r2, 0 adds r4, 0x2 movs r3, 0xFF -_080E8B0A: +@080E8B0A: adds r0, r4, r2 ldrb r1, [r0] orrs r1, r3 @@ -442911,7 +442911,7 @@ _080E8B0A: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x6 - bls _080E8B0A + bls @080E8B0A add sp, 0x4 pop {r4} pop {r0} @@ -442921,11 +442921,11 @@ _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 -_080E8B2E: +@080E8B2E: lsls r1, r4, 2 adds r1, r4 lsls r1, 5 @@ -442938,7 +442938,7 @@ _080E8B2E: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x13 - bls _080E8B2E + bls @080E8B2E pop {r4,r5} pop {r0} bx r0 @@ -442947,7 +442947,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] @@ -442958,23 +442958,23 @@ 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 strh r1, [r0] movs r3, 0 adds r4, r0, 0 - b _080E8B86 + b @080E8B86 .align 2, 0 .pool -_080E8B80: +@080E8B80: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 -_080E8B86: +@080E8B86: cmp r3, 0x13 - bhi _080E8BB0 + bhi @080E8BB0 ldr r2, =0x0203a01c ldr r0, =0x03005d8c ldr r1, [r0] @@ -442987,13 +442987,13 @@ _080E8B86: ldrb r0, [r2] ldrb r1, [r1] cmp r0, r1 - bne _080E8B80 + bne @080E8B80 movs r0, 0x1 strh r0, [r4] ldr r0, =0x00004054 adds r1, r3, 0 bl var_set -_080E8BB0: +@080E8BB0: pop {r4} pop {r0} bx r0 @@ -443002,7 +443002,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] @@ -443010,17 +443010,17 @@ sub_80E8BC8: @ 80E8BC8 adds r0, r1 ldrb r1, [r0] cmp r1, 0 - beq _080E8BEC + beq @080E8BEC ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] - b _080E8BF0 + b @080E8BF0 .align 2, 0 .pool -_080E8BEC: +@080E8BEC: ldr r0, =0x020375f0 strh r1, [r0] -_080E8BF0: +@080E8BF0: pop {r0} bx r0 .align 2, 0 @@ -443028,7 +443028,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 @@ -443051,64 +443051,64 @@ sub_80E8BF8: @ 80E8BF8 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bhi _080E8C34 + bhi @080E8C34 movs r0, 0x1 - b _080E8C8E + b @080E8C8E .align 2, 0 .pool -_080E8C34: +@080E8C34: adds r0, r1, 0 subs r0, 0x92 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bhi _080E8C44 + bhi @080E8C44 movs r0, 0x2 - b _080E8C8E -_080E8C44: + b @080E8C8E +@080E8C44: adds r0, r1, 0 subs r0, 0x9A lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bhi _080E8C54 + bhi @080E8C54 movs r0, 0x3 - b _080E8C8E -_080E8C54: + b @080E8C8E +@080E8C54: adds r0, r1, 0 subs r0, 0x94 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bhi _080E8C64 + bhi @080E8C64 movs r0, 0x4 - b _080E8C8E -_080E8C64: + b @080E8C8E +@080E8C64: adds r0, r1, 0 subs r0, 0x96 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bls _080E8C78 + bls @080E8C78 cmp r1, 0x9C - beq _080E8C78 + beq @080E8C78 cmp r1, 0x9D - bne _080E8C7C -_080E8C78: + bne @080E8C7C +@080E8C78: movs r0, 0x5 - b _080E8C8E -_080E8C7C: + b @080E8C8E +@080E8C7C: adds r0, r1, 0 subs r0, 0x98 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bls _080E8C8C + bls @080E8C8C movs r0, 0 - b _080E8C8E -_080E8C8C: + b @080E8C8E +@080E8C8C: movs r0, 0x6 -_080E8C8E: +@080E8C8E: add sp, 0x4 pop {r4} pop {r1} @@ -443116,7 +443116,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 @@ -443131,7 +443131,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 @@ -443151,14 +443151,14 @@ sub_80E8CB0: @ 80E8CB0 mov r1, r8 ldr r0, [r1, 0x4] cmp r12, r0 - bge _080E8D3C + bge @080E8D3C ldr r4, [r1] -_080E8CDA: +@080E8CDA: movs r2, 0 mov r0, r12 lsls r7, r0, 16 cmp r2, r4 - bge _080E8D28 + bge @080E8D28 asrs r0, r7, 16 adds r6, r0, 0 muls r6, r4 @@ -443166,7 +443166,7 @@ _080E8CDA: ldr r5, [r1, 0xC] ldr r0, =0x000003ff mov r9, r0 -_080E8CF2: +@080E8CF2: lsls r0, r2, 16 asrs r3, r0, 16 adds r0, r6, r3 @@ -443176,23 +443176,23 @@ _080E8CF2: mov r0, r9 ands r0, r1 cmp r0, r10 - bne _080E8D1C + bne @080E8D1C ldr r1, [sp] strh r2, [r1] mov r0, r12 ldr r2, [sp, 0x4] strh r0, [r2] - b _080E8D3C + b @080E8D3C .align 2, 0 .pool -_080E8D1C: +@080E8D1C: adds r0, r3, 0x1 lsls r0, 16 lsrs r2, r0, 16 asrs r0, 16 cmp r0, r4 - blt _080E8CF2 -_080E8D28: + blt @080E8CF2 +@080E8D28: movs r2, 0x80 lsls r2, 9 adds r1, r7, r2 @@ -443202,8 +443202,8 @@ _080E8D28: mov r2, r8 ldr r0, [r2, 0x4] cmp r1, r0 - blt _080E8CDA -_080E8D3C: + blt @080E8CDA +@080E8D3C: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -443215,7 +443215,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} @@ -443240,44 +443240,44 @@ sub_80E8D4C: @ 80E8D4C adds r7, r0, 0 mov r4, sp mov r6, r12 -_080E8D80: +@080E8D80: ldr r0, =0x0858cfcc lsls r1, r5, 2 adds r2, r1, r0 ldrh r0, [r2] cmp r0, r3 - bne _080E8D9C + bne @080E8D9C movs r3, 0 ldrsh r0, [r4, r3] movs r5, 0 ldrsh r1, [r6, r5] ldrh r3, [r2, 0x2] - b _080E8DC4 + b @080E8DC4 .align 2, 0 .pool -_080E8D9C: +@080E8D9C: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x6 - bls _080E8D80 + bls @080E8D80 movs r5, 0 mov r4, sp mov r6, r12 -_080E8DAC: +@080E8DAC: lsls r0, r5, 2 mov r1, r8 adds r3, r0, r1 ldrh r1, [r3, 0x2] asrs r0, r7, 16 cmp r1, r0 - bne _080E8DDE + bne @080E8DDE movs r2, 0 ldrsh r0, [r4, r2] movs r5, 0 ldrsh r1, [r6, r5] ldrh r3, [r3] -_080E8DC4: +@080E8DC4: movs r5, 0xC0 lsls r5, 4 adds r2, r5, 0 @@ -443288,14 +443288,14 @@ _080E8DC4: movs r2, 0 ldrsh r1, [r6, r2] bl cur_mapdata_draw_block_at - b _080E8DE8 -_080E8DDE: + b @080E8DE8 +@080E8DDE: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x6 - bls _080E8DAC -_080E8DE8: + bls @080E8DAC +@080E8DE8: add sp, 0x4 pop {r3} mov r8, r3 @@ -443305,31 +443305,31 @@ _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 -_080E8DFA: +@080E8DFA: adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0xFF - bne _080E8E06 + bne @080E8E06 adds r0, r1, 0 - b _080E8E12 -_080E8E06: + b @080E8E12 +@080E8E06: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x6 - bls _080E8DFA + bls @080E8DFA movs r0, 0x7 -_080E8E12: +@080E8E12: pop {r1} bx r1 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} @@ -443343,7 +443343,7 @@ sub_80E8E18: @ 80E8E18 movs r3, 0 ldr r5, =0x00001aa5 ldr r4, =0x03005d90 -_080E8E32: +@080E8E32: ldr r1, [r2] adds r1, r5 adds r1, r3 @@ -443356,7 +443356,7 @@ _080E8E32: lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x3 - bls _080E8E32 + bls @080E8E32 ldr r0, =0x00004054 movs r1, 0 bl var_set @@ -443409,15 +443409,15 @@ _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 push {r6,r7} mov r8, r0 movs r5, 0 - b _080E8F8A -_080E8EEE: + b @080E8F8A +@080E8EEE: mov r0, r8 ldr r1, [r0, 0x10] lsls r2, r5, 1 @@ -443429,10 +443429,10 @@ _080E8EEE: adds r1, r5, 0x1 mov r9, r1 cmp r0, 0x8 - bne _080E8F82 + bne @080E8F82 movs r4, 0 ldr r7, =0x03005d8c -_080E8F0A: +@080E8F0A: ldr r1, [r7] lsls r0, r4, 2 adds r0, r4 @@ -443446,7 +443446,7 @@ _080E8F0A: adds r3, r0, r6 ldr r0, [r3, 0x8] cmp r1, r0 - bne _080E8F78 + bne @080E8F78 ldrh r5, [r3] adds r5, 0x7 ldrh r4, [r3, 0x2] @@ -443460,12 +443460,12 @@ _080E8F0A: lsls r0, 16 asrs r1, r0, 16 ldr r6, =0x0858cfcc -_080E8F42: +@080E8F42: lsls r0, r3, 2 adds r2, r0, r6 ldrh r0, [r2] cmp r0, r1 - bne _080E8F6C + bne @080E8F6C ldrh r0, [r2, 0x2] movs r1, 0xC0 lsls r1, 4 @@ -443474,31 +443474,31 @@ _080E8F42: asrs r0, r5, 16 asrs r1, r4, 16 bl setmaptile_0 - b _080E8F82 + b @080E8F82 .align 2, 0 .pool -_080E8F6C: +@080E8F6C: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x6 - bls _080E8F42 - b _080E8F82 -_080E8F78: + bls @080E8F42 + b @080E8F82 +@080E8F78: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x13 - bls _080E8F0A -_080E8F82: + bls @080E8F0A +@080E8F82: mov r1, r9 lsls r0, r1, 16 lsrs r5, r0, 16 mov r0, r8 -_080E8F8A: +@080E8F8A: ldrb r0, [r0, 0x3] cmp r5, r0 - bcc _080E8EEE + bcc @080E8EEE pop {r3,r4} mov r8, r3 mov r9, r4 @@ -443508,7 +443508,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] @@ -443534,7 +443534,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 @@ -443546,25 +443546,25 @@ sub_80E8FD0: @ 80E8FD0 movs r1, 0x8 ldrsh r0, [r2, r1] cmp r0, 0 - beq _080E8FF4 + beq @080E8FF4 cmp r0, 0x1 - beq _080E900C - b _080E904A + beq @080E900C + b @080E904A .align 2, 0 .pool -_080E8FF4: +@080E8FF4: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080E904A + bne @080E904A movs r0, 0x1 strh r0, [r2, 0x8] - b _080E904A + b @080E904A .align 2, 0 .pool -_080E900C: +@080E900C: ldr r0, =0x00004054 bl var_get lsls r0, 16 @@ -443579,10 +443579,10 @@ _080E900C: adds r2, r0 ldrb r0, [r2] cmp r0, 0xFE - bhi _080E9030 + bhi @080E9030 adds r0, 0x1 strb r0, [r2] -_080E9030: +@080E9030: bl sub_80E8F9C bl warp_in ldr r0, =0x03005dac @@ -443592,7 +443592,7 @@ _080E9030: bl set_callback2 adds r0, r4, 0 bl remove_task -_080E904A: +@080E904A: pop {r4} pop {r0} bx r0 @@ -443601,7 +443601,7 @@ _080E904A: thumb_func_end sub_80E8FD0 thumb_func_start sub_80E9068 -sub_80E9068: @ 80E9068 +sub_80E9068: ; 80E9068 push {lr} ldr r0, =sub_80E8FD0 + 1 movs r1, 0 @@ -443626,30 +443626,30 @@ 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] cmp r0, 0x9 - bne _080E90C0 + bne @080E90C0 ldr r0, =0x00004097 bl var_get lsls r0, 16 cmp r0, 0 - bne _080E90C0 + bne @080E90C0 movs r0, 0 - b _080E90C2 + b @080E90C2 .align 2, 0 .pool -_080E90C0: +@080E90C0: movs r0, 0x1 -_080E90C2: +@080E90C2: pop {r1} bx r1 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 @@ -443666,11 +443666,11 @@ sub_80E90C8: @ 80E90C8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080E90F8 + bne @080E90F8 bl script_env_2_enable_and_set_ctx_running adds r0, r4, 0 bl remove_task -_080E90F8: +@080E90F8: pop {r4} pop {r0} bx r0 @@ -443679,7 +443679,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 @@ -443726,7 +443726,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 @@ -443736,7 +443736,7 @@ sub_80E916C: @ 80E916C movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080E91D4 + bne @080E91D4 ldr r0, =0x0203a01c ldrb r0, [r0] movs r1, 0xA @@ -443774,7 +443774,7 @@ sub_80E916C: @ 80E916C bl set_callback2 adds r0, r6, 0 bl remove_task -_080E91D4: +@080E91D4: add sp, 0x4 pop {r4-r6} pop {r0} @@ -443784,7 +443784,7 @@ _080E91D4: thumb_func_end sub_80E916C thumb_func_start sub_80E91F8 -sub_80E91F8: @ 80E91F8 +sub_80E91F8: ; 80E91F8 push {lr} ldr r0, =sub_80E916C + 1 movs r1, 0 @@ -443799,30 +443799,30 @@ sub_80E91F8: @ 80E91F8 thumb_func_end sub_80E91F8 thumb_func_start sub_80E9214 -sub_80E9214: @ 80E9214 +sub_80E9214: ; 80E9214 push {lr} ldr r0, =0x03005d8c ldr r1, [r0] movs r0, 0x4 ldrsb r0, [r1, r0] cmp r0, 0x19 - bne _080E9230 + bne @080E9230 ldrb r0, [r1, 0x5] cmp r0, 0x17 - bhi _080E9230 + bhi @080E9230 movs r0, 0x1 - b _080E9232 + b @080E9232 .align 2, 0 .pool -_080E9230: +@080E9230: movs r0, 0 -_080E9232: +@080E9232: pop {r1} bx r1 thumb_func_end sub_80E9214 thumb_func_start sub_80E9238 -sub_80E9238: @ 80E9238 +sub_80E9238: ; 80E9238 push {r4-r7,lr} mov r7, r8 push {r7} @@ -443833,7 +443833,7 @@ sub_80E9238: @ 80E9238 bl sub_80E9214 lsls r0, 24 cmp r0, 0 - beq _080E9328 + beq @080E9328 ldr r0, =0x00004054 bl var_get lsls r0, 16 @@ -443854,7 +443854,7 @@ sub_80E9238: @ 80E9238 mov r0, sp strh r1, [r0] mov r4, sp -_080E927A: +@080E927A: ldrh r2, [r4] adds r1, r7, r2 ldrb r0, [r1] @@ -443862,14 +443862,14 @@ _080E927A: lsls r0, 24 lsrs r0, 24 cmp r0, 0x77 - bhi _080E92AC + bhi @080E92AC ldr r0, =0x085a5c08 ldrb r3, [r1] lsls r1, r3, 5 adds r1, r0 ldrb r0, [r1, 0x11] cmp r0, 0x4 - beq _080E92AC + beq @080E92AC adds r0, r6, r2 ldrb r2, [r0] lsrs r0, r2, 4 @@ -443879,16 +443879,16 @@ _080E927A: adds r1, 0x7 adds r2, r3, 0 bl sub_8127D38 -_080E92AC: +@080E92AC: ldrh r0, [r4] adds r0, 0x1 lsls r0, 16 lsrs r0, 16 strh r0, [r4] cmp r0, 0xF - bls _080E927A + bls @080E927A cmp r5, 0 - beq _080E92F4 + beq @080E92F4 mov r4, sp adds r4, 0x2 movs r2, 0x88 @@ -443903,19 +443903,19 @@ _080E92AC: adds r1, 0x7 ldr r2, =0x00000e21 bl setmaptile_0 - b _080E9328 + b @080E9328 .align 2, 0 .pool -_080E92F4: +@080E92F4: mov r0, r8 cmp r0, 0x1 - bne _080E9328 + bne @080E9328 ldr r0, =0x00004089 bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bne _080E9328 + bne @080E9328 mov r4, sp adds r4, 0x2 movs r2, 0x88 @@ -443930,7 +443930,7 @@ _080E92F4: adds r1, 0x7 ldr r2, =0x00000e0a bl setmaptile_0 -_080E9328: +@080E9328: add sp, 0x4 pop {r3} mov r8, r3 @@ -443942,7 +443942,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 @@ -443952,7 +443952,7 @@ sub_80E933C: @ 80E933C bl sub_80E9214 lsls r0, 24 cmp r0, 0 - bne _080E9374 + bne @080E9374 ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x0000271c @@ -443963,10 +443963,10 @@ sub_80E933C: @ 80E933C str r2, [sp, 0x8] movs r3, 0xC str r3, [sp, 0x10] - b _080E939C + b @080E939C .align 2, 0 .pool -_080E9374: +@080E9374: ldr r0, =0x00004054 bl var_get lsls r0, 16 @@ -443986,12 +443986,12 @@ _080E9374: str r0, [sp, 0x8] movs r2, 0x10 str r2, [sp, 0x10] -_080E939C: +@080E939C: movs r6, 0 - b _080E955A + b @080E955A .align 2, 0 .pool -_080E93AC: +@080E93AC: ldr r4, [sp, 0x4] adds r0, r4, r6 ldrb r1, [r0] @@ -443999,9 +443999,9 @@ _080E93AC: adds r0, r6, 0x1 str r0, [sp, 0x14] cmp r1, 0 - bne _080E93BE - b _080E9554 -_080E93BE: + bne @080E93BE + b @080E9554 +@080E93BE: mov r1, r10 ldrb r0, [r1] lsls r0, 5 @@ -444011,16 +444011,16 @@ _080E93BE: ldrb r0, [r0, 0x13] str r0, [sp, 0xC] cmp r1, 0x4 - beq _080E93D4 - b _080E9554 -_080E93D4: + beq @080E93D4 + b @080E9554 +@080E93D4: movs r5, 0 ldr r0, =0x02037318 ldr r3, [r0, 0x4] ldrb r4, [r3] mov r9, r0 cmp r5, r4 - bcs _080E9412 + bcs @080E9412 ldr r0, [r3, 0x4] ldrh r2, [r0, 0x14] ldr r1, =0x020375e0 @@ -444028,14 +444028,14 @@ _080E93D4: adds r0, 0xAE adds r7, r1, 0 cmp r2, r0 - beq _080E9412 + beq @080E9412 adds r2, r4, 0 -_080E93F4: +@080E93F4: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, r2 - bcs _080E9412 + bcs @080E9412 ldr r1, [r3, 0x4] lsls r0, r5, 1 adds r0, r5 @@ -444045,15 +444045,15 @@ _080E93F4: ldrh r0, [r7] adds r0, 0xAE cmp r1, r0 - bne _080E93F4 -_080E9412: + bne @080E93F4 +@080E9412: mov r3, r9 ldr r0, [r3, 0x4] ldrb r0, [r0] cmp r5, r0 - bne _080E941E - b _080E9554 -_080E941E: + bne @080E941E + b @080E9554 +@080E941E: ldr r4, =0x020375e4 mov r8, r4 ldr r0, [sp, 0x8] @@ -444078,14 +444078,14 @@ _080E941E: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080E9462 + beq @080E9462 adds r0, r4, 0 bl sub_8089364 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080E9554 -_080E9462: + bne @080E9554 +@080E9462: ldr r6, =0x020375f0 mov r1, r9 ldr r0, [r1, 0x4] @@ -444148,49 +444148,49 @@ _080E9462: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080E954C + bne @080E954C ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 - beq _080E954C + beq @080E954C ldr r0, [sp, 0xC] cmp r0, 0x6 - bne _080E9538 + bne @080E9538 ldrb r0, [r6] ldr r2, [r5] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] movs r3, 0x6 bl sub_808F28C - b _080E954C + b @080E954C .align 2, 0 .pool -_080E9538: +@080E9538: ldr r1, [sp, 0xC] cmp r1, 0x7 - bne _080E954C + bne @080E954C ldrb r0, [r6] ldr r2, [r5] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] movs r3, 0x7 bl sub_808F28C -_080E954C: +@080E954C: ldr r1, =0x020375e0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_080E9554: +@080E9554: ldr r2, [sp, 0x14] lsls r0, r2, 24 lsrs r6, r0, 24 -_080E955A: +@080E955A: ldr r3, [sp, 0x10] cmp r6, r3 - bcs _080E9562 - b _080E93AC -_080E9562: + bcs @080E9562 + b @080E93AC +@080E9562: add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -444204,16 +444204,16 @@ _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 ldr r0, [r1, 0x4] ldrb r0, [r0] cmp r5, r0 - bcs _080E95C4 + bcs @080E95C4 adds r6, r1, 0 -_080E9588: +@080E9588: ldr r0, [r6, 0x4] ldr r1, [r0, 0x4] lsls r0, r5, 1 @@ -444226,7 +444226,7 @@ _080E9588: lsls r0, 16 lsrs r0, 16 cmp r0, 0xD - bhi _080E95B6 + bhi @080E95B6 ldrb r0, [r1] ldr r1, =0x03005d8c ldr r2, [r1] @@ -444235,15 +444235,15 @@ _080E9588: bl npc_hide_by_local_id_and_map adds r0, r4, 0 bl flag_set -_080E95B6: +@080E95B6: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 ldr r0, [r6, 0x4] ldrb r0, [r0] cmp r5, r0 - bcc _080E9588 -_080E95C4: + bcc @080E9588 +@080E95C4: pop {r4-r6} pop {r0} bx r0 @@ -444252,7 +444252,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, =0x0858d060 @@ -444275,16 +444275,16 @@ 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 movs r3, 0 ldrb r0, [r4, 0x3] cmp r3, r0 - bge _080E9660 + bge @080E9660 ldr r6, =0x0203a01c -_080E9618: +@080E9618: lsls r3, 16 asrs r1, r3, 16 ldr r2, [r4, 0x10] @@ -444294,25 +444294,25 @@ _080E9618: adds r2, r0, r2 ldrb r0, [r2, 0x5] cmp r0, 0x8 - bne _080E9650 + bne @080E9650 movs r0, 0 ldrsh r1, [r5, r0] ldrh r0, [r2] adds r0, 0x7 cmp r1, r0 - bne _080E9650 + bne @080E9650 movs r0, 0x2 ldrsh r1, [r5, r0] ldrh r0, [r2, 0x2] adds r0, 0x7 cmp r1, r0 - bne _080E9650 + bne @080E9650 ldr r0, [r2, 0x8] strb r0, [r6] - b _080E9660 + b @080E9660 .align 2, 0 .pool -_080E9650: +@080E9650: movs r1, 0x80 lsls r1, 9 adds r0, r3, r1 @@ -444320,15 +444320,15 @@ _080E9650: asrs r0, 16 ldrb r1, [r4, 0x3] cmp r0, r1 - blt _080E9618 -_080E9660: + blt @080E9618 +@080E9660: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_80E9608 thumb_func_start sub_80E9668 -sub_80E9668: @ 80E9668 +sub_80E9668: ; 80E9668 push {lr} bl sub_80E9608 bl sub_80E8B6C @@ -444341,27 +444341,27 @@ 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 ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x1 - beq _080E969C + beq @080E969C movs r0, 0x1 - b _080E969E + b @080E969E .align 2, 0 .pool -_080E969C: +@080E969C: movs r0, 0 -_080E969E: +@080E969E: pop {r1} bx r1 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 @@ -444373,36 +444373,36 @@ sub_80E96A4: @ 80E96A4 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080E96DC + beq @080E96DC cmp r0, 0x1 - bgt _080E96CC + bgt @080E96CC cmp r0, 0 - beq _080E96D2 - b _080E9714 + beq @080E96D2 + b @080E9714 .align 2, 0 .pool -_080E96CC: +@080E96CC: cmp r0, 0x2 - beq _080E96F4 - b _080E9714 -_080E96D2: + beq @080E96F4 + b @080E9714 +@080E96D2: bl script_env_2_enable movs r0, 0x1 strh r0, [r4, 0x8] - b _080E9714 -_080E96DC: + b @080E9714 +@080E96DC: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080E9714 + bne @080E9714 movs r0, 0x2 strh r0, [r4, 0x8] - b _080E9714 + b @080E9714 .align 2, 0 .pool -_080E96F4: +@080E96F4: movs r0, 0x7E bl copy_saved_warp2_bank_and_enter_x_to_warp1 bl warp_in @@ -444414,7 +444414,7 @@ _080E96F4: bl script_env_2_disable adds r0, r5, 0 bl remove_task -_080E9714: +@080E9714: pop {r4,r5} pop {r0} bx r0 @@ -444423,7 +444423,7 @@ _080E9714: thumb_func_end sub_80E96A4 thumb_func_start sub_80E9728 -sub_80E9728: @ 80E9728 +sub_80E9728: ; 80E9728 push {lr} ldr r0, =sub_80E96A4 + 1 movs r1, 0 @@ -444438,7 +444438,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] @@ -444448,16 +444448,16 @@ sub_80E9744: @ 80E9744 ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - beq _080E9770 + beq @080E9770 ldr r1, =0x020375f0 movs r0, 0x1 - b _080E9774 + b @080E9774 .align 2, 0 .pool -_080E9770: +@080E9770: ldr r1, =0x020375f0 movs r0, 0 -_080E9774: +@080E9774: strh r0, [r1] pop {r0} bx r0 @@ -444466,7 +444466,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} @@ -444513,7 +444513,7 @@ sub_80E9780: @ 80E9780 thumb_func_end sub_80E9780 thumb_func_start sub_80E97EC -sub_80E97EC: @ 80E97EC +sub_80E97EC: ; 80E97EC push {r4,lr} adds r4, r0, 0 ldr r0, =0x00004054 @@ -444531,7 +444531,7 @@ sub_80E97EC: @ 80E97EC thumb_func_end sub_80E97EC thumb_func_start sub_80E980C -sub_80E980C: @ 80E980C +sub_80E980C: ; 80E980C push {r4-r6,lr} mov r6, r8 push {r6} @@ -444577,7 +444577,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 @@ -444592,20 +444592,20 @@ sub_80E9878: @ 80E9878 ldrb r0, [r2] lsrs r0, 6 cmp r0, 0 - bne _080E98A4 + bne @080E98A4 movs r0, 0 - b _080E98A6 + b @080E98A6 .align 2, 0 .pool -_080E98A4: +@080E98A4: movs r0, 0x1 -_080E98A6: +@080E98A6: pop {r1} bx r1 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 @@ -444654,7 +444654,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 @@ -444672,9 +444672,9 @@ sub_80E9914: @ 80E9914 adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 - bne _080E993A - b _080E9A60 -_080E993A: + bne @080E993A + b @080E9A60 +@080E993A: movs r6, 0 ldr r7, =0x00001ae8 adds r7, r1, r7 @@ -444692,7 +444692,7 @@ _080E993A: adds r7, r1, r7 str r7, [sp, 0x1C] mov r9, r6 -_080E995C: +@080E995C: movs r4, 0 lsls r5, r6, 2 lsls r3, r6, 1 @@ -444702,7 +444702,7 @@ _080E995C: str r1, [sp, 0x4] adds r2, r5, 0 ldr r1, [sp, 0x14] -_080E996E: +@080E996E: adds r0, r2, r4 lsls r0, 1 adds r0, r1, r0 @@ -444712,7 +444712,7 @@ _080E996E: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x3 - bls _080E996E + bls @080E996E ldr r1, [sp, 0xC] adds r0, r1, r3 mov r2, r9 @@ -444740,12 +444740,12 @@ _080E996E: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _080E9A54 + beq @080E9A54 adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _080E9A54 + bne @080E9A54 movs r4, 0 mov r7, r10 lsls r7, 2 @@ -444755,7 +444755,7 @@ _080E996E: adds r0, 0x1 str r0, [sp, 0x8] ldr r2, =0x020244ec -_080E99DA: +@080E99DA: adds r1, r4, 0 adds r1, 0xD adds r0, r5, r2 @@ -444772,7 +444772,7 @@ _080E99DA: lsrs r4, r0, 16 ldr r2, [sp, 0x20] cmp r4, 0x3 - bls _080E99DA + bls @080E99DA movs r0, 0x64 adds r4, r6, 0 muls r4, r0 @@ -444811,14 +444811,14 @@ _080E99DA: lsls r0, r7, 16 lsrs r0, 16 mov r10, r0 -_080E9A54: +@080E9A54: ldr r1, [sp, 0x4] lsls r0, r1, 16 lsrs r6, r0, 16 cmp r6, 0x5 - bhi _080E9A60 - b _080E995C -_080E9A60: + bhi @080E9A60 + b @080E995C +@080E9A60: add sp, 0x24 pop {r3-r5} mov r8, r3 @@ -444832,7 +444832,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] @@ -444854,7 +444854,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 @@ -444864,15 +444864,15 @@ 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] movs r6, 0 - b _080E9B62 + b @080E9B62 .align 2, 0 .pool -_080E9AE0: +@080E9AE0: ldr r2, [r4, 0x10] lsls r1, r6, 1 adds r0, r1, r6 @@ -444881,7 +444881,7 @@ _080E9AE0: ldrb r0, [r2, 0x5] adds r7, r1, 0 cmp r0, 0x8 - bne _080E9B5C + bne @080E9B5C ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00001a9c @@ -444889,7 +444889,7 @@ _080E9AE0: ldrb r1, [r0] ldr r0, [r2, 0x8] cmp r1, r0 - bne _080E9B5C + bne @080E9B5C ldrh r0, [r2] adds r0, 0x7 ldrh r1, [r2, 0x2] @@ -444899,23 +444899,23 @@ _080E9AE0: ldr r5, =0x0858cfcc lsls r0, 16 asrs r2, r0, 16 -_080E9B16: +@080E9B16: lsls r0, r1, 2 adds r3, r0, r5 ldrh r0, [r3, 0x2] cmp r0, r2 - beq _080E9B3C + beq @080E9B3C adds r0, r1, 0x1 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x6 - bls _080E9B16 -_080E9B2A: + bls @080E9B16 +@080E9B2A: bl cur_mapdata_full_redraw - b _080E9B68 + b @080E9B68 .align 2, 0 .pool -_080E9B3C: +@080E9B3C: ldr r0, [r4, 0x10] adds r1, r7, r6 lsls r1, 2 @@ -444930,23 +444930,23 @@ _080E9B3C: adds r2, r4, 0 orrs r2, r3 bl setmaptile_0 - b _080E9B2A -_080E9B5C: + b @080E9B2A +@080E9B5C: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 -_080E9B62: +@080E9B62: ldrb r0, [r4, 0x3] cmp r6, r0 - bcc _080E9AE0 -_080E9B68: + bcc @080E9AE0 +@080E9B68: pop {r4-r7} pop {r0} bx r0 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 @@ -444970,22 +444970,22 @@ 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 -_080E9BAE: +@080E9BAE: lsls r0, r4, 24 lsrs r0, 24 bl sub_80E9878 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080E9BC4 + bne @080E9BC4 adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_080E9BC4: +@080E9BC4: lsls r0, r4, 16 movs r1, 0x80 lsls r1, 9 @@ -444993,7 +444993,7 @@ _080E9BC4: lsrs r4, r0, 16 asrs r0, 16 cmp r0, 0x13 - ble _080E9BAE + ble @080E9BAE adds r0, r5, 0 pop {r4,r5} pop {r1} @@ -445001,7 +445001,7 @@ _080E9BC4: thumb_func_end sub_80E9BA8 thumb_func_start sub_80E9BDC -sub_80E9BDC: @ 80E9BDC +sub_80E9BDC: ; 80E9BDC push {lr} ldr r0, =0x00004054 bl var_get @@ -445011,29 +445011,29 @@ sub_80E9BDC: @ 80E9BDC lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x1 - bne _080E9C04 + bne @080E9C04 ldr r0, =0x020375f0 strh r1, [r0] - b _080E9C22 + b @080E9C22 .align 2, 0 .pool -_080E9C04: +@080E9C04: bl sub_80E9BA8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x9 - bls _080E9C1C + bls @080E9C1C ldr r1, =0x020375f0 movs r0, 0x2 - b _080E9C20 + b @080E9C20 .align 2, 0 .pool -_080E9C1C: +@080E9C1C: ldr r1, =0x020375f0 movs r0, 0 -_080E9C20: +@080E9C20: strh r0, [r1] -_080E9C22: +@080E9C22: pop {r0} bx r0 .align 2, 0 @@ -445041,7 +445041,7 @@ _080E9C22: thumb_func_end sub_80E9BDC thumb_func_start sub_80E9C2C -sub_80E9C2C: @ 80E9C2C +sub_80E9C2C: ; 80E9C2C push {lr} ldr r0, =0x00004054 bl var_get @@ -445074,7 +445074,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 + 1 movs r1, 0 @@ -445086,7 +445086,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 + 1 movs r1, 0 @@ -445098,7 +445098,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} @@ -445116,7 +445116,7 @@ sub_80E9C9C: @ 80E9C9C lsrs r0, 24 strh r0, [r5] cmp r0, 0 - beq _080E9D10 + beq @080E9D10 movs r0, 0 strh r0, [r5, 0x2] strh r0, [r5, 0x4] @@ -445140,15 +445140,15 @@ sub_80E9C9C: @ 80E9C9C adds r0, r7, r0 ldr r1, =sub_80E9E90 + 1 str r1, [r0] - b _080E9D1A + b @080E9D1A .align 2, 0 .pool -_080E9D10: +@080E9D10: ldr r1, =0x085ea785 ldr r2, =task_pc_turn_off + 1 adds r0, r6, 0 bl sub_81978EC -_080E9D1A: +@080E9D1A: pop {r3} mov r8, r3 pop {r4-r7} @@ -445159,7 +445159,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} @@ -445174,12 +445174,12 @@ game_continue: @ 80E9D2C movs r5, 0x1 ldr r0, =0x0203a020 mov r8, r0 -_080E9D48: +@080E9D48: adds r0, r5, 0 bl sub_80E9878 lsls r0, 24 cmp r0, 0 - beq _080E9D7C + beq @080E9D7C lsls r4, r6, 5 adds r4, 0x58 mov r1, r8 @@ -445199,12 +445199,12 @@ _080E9D48: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_080E9D7C: +@080E9D7C: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x13 - bls _080E9D48 + bls @080E9D48 ldr r4, =0x0203a020 ldr r1, [r4] lsls r3, r6, 3 @@ -445221,15 +445221,15 @@ _080E9D7C: lsls r0, r2, 16 asrs r0, 16 cmp r0, 0x7 - bgt _080E9DB8 + bgt @080E9DB8 strh r2, [r7, 0x6] - b _080E9DBC + b @080E9DBC .align 2, 0 .pool -_080E9DB8: +@080E9DB8: movs r0, 0x8 strh r0, [r7, 0x6] -_080E9DBC: +@080E9DBC: ldr r2, =0x03006310 adds r1, r2, 0 ldr r0, =0x0858d07c @@ -445255,21 +445255,21 @@ _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 cmp r1, 0x1 - beq _080E9DFC + beq @080E9DFC movs r0, 0x5 bl audio_play -_080E9DFC: +@080E9DFC: pop {r0} bx r0 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 @@ -445301,7 +445301,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 @@ -445339,7 +445339,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 @@ -445358,14 +445358,14 @@ sub_80E9E90: @ 80E9E90 movs r0, 0x2 negs r0, r0 cmp r5, r0 - beq _080E9EC8 + beq @080E9EC8 adds r0, 0x1 cmp r5, r0 - bne _080E9F0C - b _080E9F1A + bne @080E9F0C + b @080E9F1A .align 2, 0 .pool -_080E9EC8: +@080E9EC8: movs r0, 0x5 bl audio_play ldrb r0, [r4, 0xA] @@ -445388,23 +445388,23 @@ _080E9EC8: bl free adds r0, r6, 0 bl task_pc_turn_off - b _080E9F1A + b @080E9F1A .align 2, 0 .pool -_080E9F0C: +@080E9F0C: movs r0, 0x5 bl audio_play strh r5, [r4, 0x8] adds r0, r6, 0 bl sub_80E9F20 -_080E9F1A: +@080E9F1A: pop {r4-r6} pop {r0} bx r0 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} @@ -445465,7 +445465,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 @@ -445476,16 +445476,16 @@ sub_80E9FB0: @ 80E9FB0 movs r0, 0x2 negs r0, r0 cmp r4, r0 - beq _080E9FF2 + beq @080E9FF2 adds r0, 0x1 cmp r4, r0 - bne _080E9FDC + bne @080E9FDC movs r0, 0x5 bl audio_play adds r0, r5, 0 bl sub_80EA18C - b _080E9FF2 -_080E9FDC: + b @080E9FF2 +@080E9FDC: movs r0, 0x5 bl audio_play ldr r0, =0x0858d048 @@ -445495,7 +445495,7 @@ _080E9FDC: ldr r1, [r1] adds r0, r6, 0 bl _call_via_r1 -_080E9FF2: +@080E9FF2: pop {r4-r6} pop {r0} bx r0 @@ -445504,7 +445504,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 @@ -445547,7 +445547,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 @@ -445564,7 +445564,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 @@ -445631,7 +445631,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 @@ -445645,7 +445645,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} @@ -445684,7 +445684,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 @@ -445715,7 +445715,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 @@ -445723,16 +445723,16 @@ task_pc_turn_off: @ 80EA1D0 bl var_get lsls r0, 16 cmp r0, 0 - bne _080EA1F4 + bne @080EA1F4 ldr r0, =0x0823b4e8 bl script_env_1_execute_new_script - b _080EA1FA + b @080EA1FA .align 2, 0 .pool -_080EA1F4: +@080EA1F4: ldr r0, =0x0823b5e9 bl script_env_1_execute_new_script -_080EA1FA: +@080EA1FA: adds r0, r4, 0 bl remove_task pop {r4} @@ -445743,7 +445743,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 @@ -445776,7 +445776,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 var_get @@ -445787,70 +445787,70 @@ sub_80EA250: @ 80EA250 lsrs r0, 24 adds r1, r0, 0 cmp r0, 0 - bne _080EA278 + bne @080EA278 ldr r0, =0x08274966 - b _080EA2DA + b @080EA2DA .align 2, 0 .pool -_080EA278: +@080EA278: cmp r0, 0x1 - bne _080EA284 + bne @080EA284 ldr r0, =0x08274d13 - b _080EA2DA + b @080EA2DA .align 2, 0 .pool -_080EA284: +@080EA284: cmp r0, 0x2 - bne _080EA290 + bne @080EA290 ldr r0, =0x08274ffe - b _080EA2DA + b @080EA2DA .align 2, 0 .pool -_080EA290: +@080EA290: cmp r0, 0x3 - bne _080EA29C + bne @080EA29C ldr r0, =0x08275367 - b _080EA2DA + b @080EA2DA .align 2, 0 .pool -_080EA29C: +@080EA29C: cmp r0, 0x4 - bne _080EA2A8 + bne @080EA2A8 ldr r0, =0x082756c7 - b _080EA2DA + b @080EA2DA .align 2, 0 .pool -_080EA2A8: +@080EA2A8: cmp r0, 0x5 - bne _080EA2B4 + bne @080EA2B4 ldr r0, =0x08274b24 - b _080EA2DA + b @080EA2DA .align 2, 0 .pool -_080EA2B4: +@080EA2B4: cmp r0, 0x6 - bne _080EA2C0 + bne @080EA2C0 ldr r0, =0x08274e75 - b _080EA2DA + b @080EA2DA .align 2, 0 .pool -_080EA2C0: +@080EA2C0: cmp r0, 0x7 - bne _080EA2CC + bne @080EA2CC ldr r0, =0x082751e1 - b _080EA2DA + b @080EA2DA .align 2, 0 .pool -_080EA2CC: +@080EA2CC: cmp r1, 0x8 - beq _080EA2D8 + beq @080EA2D8 ldr r0, =0x082758cc - b _080EA2DA + b @080EA2DA .align 2, 0 .pool -_080EA2D8: +@080EA2D8: ldr r0, =0x082754f6 -_080EA2DA: +@080EA2DA: pop {r1} bx r1 .align 2, 0 @@ -445858,7 +445858,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 @@ -445877,7 +445877,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 var_get @@ -445909,7 +445909,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 var_get @@ -445919,13 +445919,13 @@ sub_80EA354: @ 80EA354 bl flag_check lsls r0, 24 cmp r0, 0 - bne _080EA39A + bne @080EA39A movs r3, 0 ldr r7, =0x03005d8c ldr r4, =0x00001a9d movs r6, 0x21 negs r6, r6 -_080EA376: +@080EA376: ldr r1, [r7] lsls r0, r3, 2 adds r0, r3 @@ -445940,10 +445940,10 @@ _080EA376: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x13 - bls _080EA376 + bls @080EA376 ldr r0, =0x00000922 bl flag_set -_080EA39A: +@080EA39A: ldr r4, =0x020375e0 lsls r0, r5, 24 lsrs r0, 24 @@ -445972,7 +445972,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 @@ -445985,44 +445985,44 @@ sub_80EA3E4: @ 80EA3E4 movs r1, 0x2 ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _080EA448 + beq @080EA448 cmp r0, 0x1 - bgt _080EA40C + bgt @080EA40C cmp r0, 0 - beq _080EA414 - b _080EA820 + beq @080EA414 + b @080EA820 .align 2, 0 .pool -_080EA40C: +@080EA40C: cmp r0, 0x2 - bne _080EA412 - b _080EA810 -_080EA412: - b _080EA820 -_080EA414: + bne @080EA412 + b @080EA810 +@080EA412: + b @080EA820 +@080EA414: ldr r0, =0x00004054 bl var_get lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - beq _080EA434 + beq @080EA434 ldr r1, =0x0203a01d movs r0, 0x1 strb r0, [r1] - b _080EA438 + b @080EA438 .align 2, 0 .pool -_080EA434: +@080EA434: ldr r0, =0x0203a01d strb r1, [r0] -_080EA438: +@080EA438: adds r0, r5, 0x4 adds r1, r5, 0x6 bl player_get_pos_to - b _080EA81C + b @080EA81C .align 2, 0 .pool -_080EA448: +@080EA448: mov r4, sp adds r4, 0x2 mov r0, sp @@ -446036,15 +446036,15 @@ _080EA448: ldrsh r0, [r5, r3] adds r6, r4, 0 cmp r1, r0 - bne _080EA474 + bne @080EA474 movs r0, 0 ldrsh r1, [r6, r0] movs r3, 0x6 ldrsh r0, [r5, r3] cmp r1, r0 - bne _080EA474 - b _080EA820 -_080EA474: + bne @080EA474 + b @080EA820 +@080EA474: strh r2, [r5, 0x4] ldrh r0, [r6] strh r0, [r5, 0x6] @@ -446076,103 +446076,103 @@ _080EA474: movs r0, 0x8D lsls r0, 2 cmp r4, r0 - beq _080EA4C2 + beq @080EA4C2 adds r0, 0x8 cmp r4, r0 - bne _080EA4E8 -_080EA4C2: + bne @080EA4E8 +@080EA4C2: ldr r0, =0x0203a01d ldrb r0, [r0] cmp r0, 0x1 - beq _080EA4CC - b _080EA820 -_080EA4CC: + beq @080EA4CC + b @080EA820 +@080EA4CC: ldr r4, =0x000040ef adds r0, r4, 0 bl var_get adds r1, r0, 0 movs r0, 0x20 - b _080EA7FA + b @080EA7FA .align 2, 0 .pool -_080EA4E8: +@080EA4E8: ldr r3, =0xfffffd48 adds r0, r4, r3 lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - bls _080EA51A + bls @080EA51A movs r0, 0xB0 lsls r0, 2 cmp r4, r0 - beq _080EA51A + beq @080EA51A adds r0, 0x1 cmp r4, r0 - beq _080EA51A + beq @080EA51A adds r0, 0x1 cmp r4, r0 - beq _080EA51A + beq @080EA51A adds r0, 0x6 cmp r4, r0 - beq _080EA51A + beq @080EA51A adds r0, 0x1 cmp r4, r0 - beq _080EA51A + beq @080EA51A adds r0, 0x1 cmp r4, r0 - bne _080EA540 -_080EA51A: + bne @080EA540 +@080EA51A: ldr r0, =0x0203a01d ldrb r0, [r0] cmp r0, 0x1 - beq _080EA524 - b _080EA820 -_080EA524: + beq @080EA524 + b @080EA820 +@080EA524: ldr r4, =0x000040ee adds r0, r4, 0 bl var_get adds r1, r0, 0 movs r0, 0x1 - b _080EA7FA + b @080EA7FA .align 2, 0 .pool -_080EA540: +@080EA540: ldr r0, =0x00000239 cmp r4, r0 - beq _080EA558 + beq @080EA558 adds r0, 0x8 cmp r4, r0 - beq _080EA558 + beq @080EA558 adds r0, 0x10 cmp r4, r0 - beq _080EA558 + beq @080EA558 adds r0, 0x8 cmp r4, r0 - bne _080EA57C -_080EA558: + bne @080EA57C +@080EA558: ldr r0, =0x0203a01d ldrb r0, [r0] cmp r0, 0x1 - beq _080EA562 - b _080EA820 -_080EA562: + beq @080EA562 + b @080EA820 +@080EA562: ldr r4, =0x000040ee adds r0, r4, 0 bl var_get adds r1, r0, 0 movs r0, 0x4 - b _080EA7FA + b @080EA7FA .align 2, 0 .pool -_080EA57C: +@080EA57C: cmp r5, 0x34 - bne _080EA586 + bne @080EA586 ldr r0, =0x0000026d cmp r4, r0 - beq _080EA59E -_080EA586: + beq @080EA59E +@080EA586: cmp r5, 0x35 - bne _080EA5CC + bne @080EA5CC mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -446181,14 +446181,14 @@ _080EA586: bl cur_mapdata_get_blockid_at ldr r1, =0x0000026a cmp r0, r1 - bne _080EA5CC -_080EA59E: + bne @080EA5CC +@080EA59E: ldr r0, =0x0203a01d ldrb r0, [r0] cmp r0, 0x1 - beq _080EA5A8 - b _080EA820 -_080EA5A8: + beq @080EA5A8 + b @080EA820 +@080EA5A8: ldr r4, =0x000040ef adds r0, r4, 0 bl var_get @@ -446196,21 +446196,21 @@ _080EA5A8: movs r3, 0x80 lsls r3, 2 adds r0, r3, 0 - b _080EA7FA + b @080EA7FA .align 2, 0 .pool -_080EA5CC: +@080EA5CC: cmp r5, 0xC1 - bne _080EA618 + bne @080EA618 ldr r0, =0x0000023d cmp r4, r0 - bne _080EA618 + bne @080EA618 ldr r0, =0x0203a01d ldrb r0, [r0] cmp r0, 0x1 - beq _080EA5E0 - b _080EA820 -_080EA5E0: + beq @080EA5E0 + b @080EA820 +@080EA5E0: ldr r4, =0x000040ef adds r0, r4, 0 bl var_get @@ -446229,21 +446229,21 @@ _080EA5E0: movs r3, 0x80 lsls r3, 6 adds r0, r3, 0 - b _080EA7FA + b @080EA7FA .align 2, 0 .pool -_080EA618: +@080EA618: cmp r5, 0x47 - bne _080EA668 + bne @080EA668 ldr r0, =0x0000023e cmp r4, r0 - bne _080EA668 + bne @080EA668 ldr r0, =0x0203a01d ldrb r0, [r0] cmp r0, 0x1 - beq _080EA62C - b _080EA820 -_080EA62C: + beq @080EA62C + b @080EA820 +@080EA62C: ldr r4, =0x000040ef adds r0, r4, 0 bl var_get @@ -446263,37 +446263,37 @@ _080EA62C: lsls r3, 6 adds r0, r3, 0 eors r1, r0 - b _080EA7FC + b @080EA7FC .align 2, 0 .pool -_080EA668: +@080EA668: adds r0, r5, 0 bl sub_80893C8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080EA698 + bne @080EA698 ldr r0, =0x0203a01d ldrb r0, [r0] cmp r0, 0x1 - beq _080EA680 - b _080EA820 -_080EA680: + beq @080EA680 + b @080EA820 +@080EA680: ldr r4, =0x000040ef adds r0, r4, 0 bl var_get adds r1, r0, 0 movs r0, 0x80 - b _080EA7FA + b @080EA7FA .align 2, 0 .pool -_080EA698: +@080EA698: adds r0, r5, 0 bl sub_808938C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080EA72C + bne @080EA72C mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -446311,9 +446311,9 @@ _080EA698: ldr r0, =0x0203a01d ldrb r0, [r0] cmp r0, 0x1 - beq _080EA6D0 - b _080EA820 -_080EA6D0: + beq @080EA6D0 + b @080EA820 +@080EA6D0: mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -446324,31 +446324,31 @@ _080EA6D0: movs r0, 0xCE lsls r0, 2 cmp r1, r0 - beq _080EA70C + beq @080EA70C cmp r1, r0 - bgt _080EA6FC + bgt @080EA6FC movs r0, 0x8A lsls r0, 2 cmp r1, r0 - beq _080EA714 - b _080EA820 + beq @080EA714 + b @080EA820 .align 2, 0 .pool -_080EA6FC: +@080EA6FC: movs r0, 0xCF lsls r0, 2 cmp r1, r0 - beq _080EA70C + beq @080EA70C adds r0, 0x4 cmp r1, r0 - beq _080EA70C - b _080EA820 -_080EA70C: + beq @080EA70C + b @080EA820 +@080EA70C: ldr r4, =0x000040ee - b _080EA7F0 + b @080EA7F0 .align 2, 0 .pool -_080EA714: +@080EA714: ldr r4, =0x000040ee adds r0, r4, 0 bl var_get @@ -446356,20 +446356,20 @@ _080EA714: movs r3, 0x80 lsls r3, 1 adds r0, r3, 0 - b _080EA7FA + b @080EA7FA .align 2, 0 .pool -_080EA72C: +@080EA72C: adds r0, r5, 0 bl sub_80893A0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080EA778 + bne @080EA778 ldr r0, =0x0203a01d ldrb r0, [r0] cmp r0, 0x1 - bne _080EA75E + bne @080EA75E ldr r4, =0x000040ef adds r0, r4, 0 bl var_get @@ -446382,27 +446382,27 @@ _080EA72C: lsrs r1, 16 adds r0, r4, 0 bl var_set -_080EA75E: +@080EA75E: mov r0, sp movs r3, 0 ldrsh r0, [r0, r3] movs r2, 0 ldrsh r1, [r6, r2] bl sub_80FA794 - b _080EA820 + b @080EA820 .align 2, 0 .pool -_080EA778: +@080EA778: adds r0, r5, 0 bl sub_80893B4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080EA7A8 + bne @080EA7A8 ldr r0, =0x0203a01d ldrb r0, [r0] cmp r0, 0x1 - bne _080EA820 + bne @080EA820 ldr r4, =0x000040ee adds r0, r4, 0 bl var_get @@ -446410,20 +446410,20 @@ _080EA778: movs r3, 0x80 lsls r3, 8 adds r0, r3, 0 - b _080EA7FA + b @080EA7FA .align 2, 0 .pool -_080EA7A8: +@080EA7A8: adds r0, r5, 0 bl sub_8089848 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080EA7D8 + bne @080EA7D8 ldr r0, =0x0203a01d ldrb r0, [r0] cmp r0, 0x1 - bne _080EA820 + bne @080EA820 ldr r4, =0x000040ef adds r0, r4, 0 bl var_get @@ -446431,46 +446431,46 @@ _080EA7A8: movs r2, 0x80 lsls r2, 7 adds r0, r2, 0 - b _080EA7FA + b @080EA7FA .align 2, 0 .pool -_080EA7D8: +@080EA7D8: adds r0, r5, 0 bl sub_808985C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080EA820 + bne @080EA820 ldr r0, =0x0203a01d ldrb r0, [r0] cmp r0, 0x1 - bne _080EA820 + bne @080EA820 ldr r4, =0x000040ef -_080EA7F0: +@080EA7F0: adds r0, r4, 0 bl var_get adds r1, r0, 0 movs r0, 0x2 -_080EA7FA: +@080EA7FA: orrs r1, r0 -_080EA7FC: +@080EA7FC: lsls r1, 16 lsrs r1, 16 adds r0, r4, 0 bl var_set - b _080EA820 + b @080EA820 .align 2, 0 .pool -_080EA810: +@080EA810: ldrb r0, [r5, 0x8] bl oe_active_list_contains lsls r0, 24 cmp r0, 0 - bne _080EA820 -_080EA81C: + bne @080EA820 +@080EA81C: movs r0, 0x1 strh r0, [r5, 0x2] -_080EA820: +@080EA820: add sp, 0x4 pop {r4-r6} pop {r0} @@ -446478,7 +446478,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 @@ -446510,19 +446510,19 @@ sub_80EA828: @ 80EA828 strb r0, [r2] subs r0, r7, 0x1 cmp r0, 0x1 - bhi _080EA876 + bhi @080EA876 ldr r0, [r6] adds r0, r4 ldr r1, =0x00001aa9 adds r0, r1 movs r1, 0x2 strb r1, [r0] -_080EA876: +@080EA876: cmp r7, 0x3 - bne _080EA8B8 + bne @080EA8B8 mov r2, r8 cmp r2, 0x1 - bne _080EA8B8 + bne @080EA8B8 mov r1, r9 adds r0, r4, r1 ldr r1, [r6] @@ -446531,18 +446531,18 @@ _080EA876: movs r3, 0 ldrb r0, [r1, 0x2] cmp r0, 0xFF - beq _080EA8A0 -_080EA892: + beq @080EA8A0 +@080EA892: adds r3, 0x1 cmp r3, 0x6 - bgt _080EA8A0 + bgt @080EA8A0 adds r0, r2, r3 ldrb r0, [r0] cmp r0, 0xFF - bne _080EA892 -_080EA8A0: + bne @080EA892 +@080EA8A0: cmp r3, 0x5 - ble _080EA8B8 + ble @080EA8B8 ldr r0, =0x03005d8c ldr r1, [r0] lsls r0, r5, 2 @@ -446553,7 +446553,7 @@ _080EA8A0: adds r1, r2 movs r0, 0x2 strb r0, [r1] -_080EA8B8: +@080EA8B8: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -446565,48 +446565,48 @@ _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 adds r4, 0x9 adds r3, r1, 0 adds r3, 0x9 -_080EA8E0: +@080EA8E0: adds r0, r4, r2 adds r1, r3, r2 ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - beq _080EA8F0 + beq @080EA8F0 movs r0, 0 - b _080EA8FC -_080EA8F0: + b @080EA8FC +@080EA8F0: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls _080EA8E0 + bls @080EA8E0 movs r0, 0x1 -_080EA8FC: +@080EA8FC: pop {r4} pop {r1} bx r1 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 movs r3, 0 ldrb r0, [r6, 0x2] cmp r0, 0xFF - bne _080EA918 + bne @080EA918 ldrb r0, [r5, 0x2] cmp r0, 0xFF - beq _080EA946 -_080EA918: + beq @080EA946 +@080EA918: adds r2, r6, 0x2 adds r0, r2, r3 adds r4, r5, 0x2 @@ -446614,33 +446614,33 @@ _080EA918: ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - beq _080EA92C + beq @080EA92C movs r0, 0 - b _080EA948 -_080EA92C: + b @080EA948 +@080EA92C: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x6 - bhi _080EA946 + bhi @080EA946 adds r0, r2, r3 ldrb r0, [r0] cmp r0, 0xFF - bne _080EA918 + bne @080EA918 adds r0, r4, r3 ldrb r0, [r0] cmp r0, 0xFF - bne _080EA918 -_080EA946: + bne @080EA918 +@080EA946: movs r0, 0x1 -_080EA948: +@080EA948: pop {r4-r6} pop {r1} bx r1 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 @@ -446651,31 +446651,31 @@ sub_80EA950: @ 80EA950 ldrb r2, [r5, 0x1] ands r0, r2 cmp r1, r0 - bne _080EA986 + bne @080EA986 adds r0, r4, 0 adds r1, r5, 0 bl sub_80EA8D4 lsls r0, 24 cmp r0, 0 - beq _080EA986 + beq @080EA986 adds r0, r4, 0 adds r1, r5, 0 bl sub_80EA904 lsls r0, 24 cmp r0, 0 - beq _080EA986 + beq @080EA986 movs r0, 0x1 - b _080EA988 -_080EA986: + b @080EA988 +@080EA986: movs r0, 0 -_080EA988: +@080EA988: pop {r4,r5} pop {r1} bx r1 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 @@ -446683,7 +446683,7 @@ sub_80EA990: @ 80EA990 ldr r0, =0x03005d8c ldr r2, [r0] ldr r4, =0x00001a9c -_080EA99E: +@080EA99E: lsls r0, r1, 16 asrs r1, r0, 16 lsls r0, r1, 2 @@ -446693,34 +446693,34 @@ _080EA99E: adds r0, r4 ldrb r0, [r0] cmp r0, r3 - bne _080EA9C0 + bne @080EA9C0 adds r0, r1, 0 - b _080EA9D0 + b @080EA9D0 .align 2, 0 .pool -_080EA9C0: +@080EA9C0: adds r0, r1, 0x1 lsls r0, 16 lsrs r1, r0, 16 asrs r0, 16 cmp r0, 0x13 - ble _080EA99E + ble @080EA99E movs r0, 0x1 negs r0, r0 -_080EA9D0: +@080EA9D0: pop {r4} pop {r1} bx r1 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 ldr r3, [r0] ldr r4, =0x00001a9c -_080EA9E2: +@080EA9E2: lsls r0, r2, 16 asrs r1, r0, 16 lsls r0, r1, 2 @@ -446730,33 +446730,33 @@ _080EA9E2: adds r0, r4 ldrb r0, [r0] cmp r0, 0 - bne _080EAA04 + bne @080EAA04 lsls r0, r2, 24 lsrs r0, 24 - b _080EAA12 + b @080EAA12 .align 2, 0 .pool -_080EAA04: +@080EAA04: adds r0, r1, 0x1 lsls r0, 16 lsrs r2, r0, 16 asrs r0, 16 cmp r0, 0x13 - ble _080EA9E2 + ble @080EA9E2 movs r0, 0 -_080EAA12: +@080EAA12: pop {r4} pop {r1} bx r1 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 ldr r4, [r0] -_080EAA20: +@080EAA20: lsls r2, r3, 16 asrs r1, r2, 16 lsls r0, r1, 2 @@ -446768,50 +446768,50 @@ _080EAA20: ldrb r1, [r0] lsrs r0, r1, 6 cmp r0, 0 - bne _080EAA4C + bne @080EAA4C lsls r0, r1, 28 cmp r0, 0 - bne _080EAA4C + bne @080EAA4C lsls r0, r3, 24 lsrs r0, 24 - b _080EAA5C + b @080EAA5C .align 2, 0 .pool -_080EAA4C: +@080EAA4C: movs r1, 0x80 lsls r1, 9 adds r0, r2, r1 lsrs r3, r0, 16 asrs r0, 16 cmp r0, 0x13 - ble _080EAA20 + ble @080EAA20 movs r0, 0 -_080EAA5C: +@080EAA5C: pop {r4} pop {r1} bx r1 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 adds r7, r2, 0 ldrb r0, [r5] cmp r0, 0 - beq _080EAAEC + beq @080EAAEC ldrb r0, [r5] bl sub_80EA990 lsls r0, 16 lsrs r4, r0, 16 asrs r2, r0, 16 cmp r2, 0 - beq _080EAAEC + beq @080EAAEC movs r0, 0x1 negs r0, r0 cmp r2, r0 - beq _080EAAC4 + beq @080EAAC4 ldr r0, =0x03005d8c ldr r1, [r0] lsls r0, r2, 2 @@ -446824,50 +446824,50 @@ sub_80EAA64: @ 80EAA64 lsls r0, r1, 28 lsrs r0, 28 cmp r0, 0x1 - beq _080EAAEC + beq @080EAAEC lsrs r0, r1, 6 cmp r0, 0x2 - bne _080EAAB4 + bne @080EAAB4 ldrb r1, [r5, 0x1] movs r0, 0xF ands r0, r1 cmp r0, 0x1 - bne _080EAAEC -_080EAAB4: + bne @080EAAEC +@080EAAB4: lsls r4, 24 lsrs r4, 24 - b _080EAADC + b @080EAADC .align 2, 0 .pool -_080EAAC4: +@080EAAC4: bl sub_80EA9D8 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _080EAADC + bne @080EAADC bl sub_80EAA18 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq _080EAAEC -_080EAADC: + beq @080EAAEC +@080EAADC: adds r0, r4, 0 adds r1, r5, 0 adds r2, r6, 0 adds r3, r7, 0 bl sub_80EA828 adds r0, r4, 0 - b _080EAAEE -_080EAAEC: + b @080EAAEE +@080EAAEC: movs r0, 0 -_080EAAEE: +@080EAAEE: pop {r4-r7} pop {r1} bx r1 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 @@ -446878,25 +446878,25 @@ sub_80EAAF4: @ 80EAAF4 ldr r1, =0x00001a9c adds r7, r0, r1 movs r2, 0x1 -_080EAB08: +@080EAB08: adds r1, r2, 0x1 lsls r0, r1, 24 lsrs r5, r0, 24 mov r9, r1 cmp r5, 0x13 - bhi _080EAB84 + bhi @080EAB84 lsls r0, r2, 2 adds r0, r2 lsls r0, 5 adds r6, r0, r7 movs r0, 0xC0 mov r8, r0 -_080EAB20: +@080EAB20: ldrb r0, [r6, 0x1] mov r3, r8 ands r3, r0 cmp r3, 0 - bne _080EAB3E + bne @080EAB3E lsls r2, r5, 2 adds r0, r2, r5 lsls r0, 5 @@ -446906,10 +446906,10 @@ _080EAB20: ands r0, r1 adds r4, r2, 0 cmp r0, 0x40 - beq _080EAB56 -_080EAB3E: + beq @080EAB56 +@080EAB3E: cmp r3, 0x80 - bne _080EAB7A + bne @080EAB7A lsls r2, r5, 2 adds r0, r2, r5 lsls r0, 5 @@ -446919,8 +446919,8 @@ _080EAB3E: ands r0, r1 adds r4, r2, 0 cmp r0, 0x80 - beq _080EAB7A -_080EAB56: + beq @080EAB7A +@080EAB56: mov r0, sp adds r1, r6, 0 movs r2, 0xA0 @@ -446936,18 +446936,18 @@ _080EAB56: mov r1, sp movs r2, 0xA0 bl memcpy -_080EAB7A: +@080EAB7A: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x13 - bls _080EAB20 -_080EAB84: + bls @080EAB20 +@080EAB84: mov r1, r9 lsls r0, r1, 24 lsrs r2, r0, 24 cmp r2, 0x12 - bls _080EAB08 + bls @080EAB08 add sp, 0xA0 pop {r3,r4} mov r8, r3 @@ -446960,13 +446960,13 @@ _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 lsrs r6, r1, 24 movs r4, 0x1 -_080EABAE: +@080EABAE: ldr r0, [r5] lsls r1, r4, 2 adds r1, r4 @@ -446975,29 +446975,29 @@ _080EABAE: ldrb r0, [r3, 0x1] lsrs r0, 6 cmp r0, r6 - bne _080EABCA + bne @080EABCA ldr r1, [r5, 0x4] ldr r2, [r5, 0x8] adds r0, r3, 0 bl sub_80EAA64 -_080EABCA: +@080EABCA: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x13 - bls _080EABAE + bls @080EABAE pop {r4-r6} pop {r0} bx r0 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] cmp r0, 0 - beq _080EABF8 + beq @080EABF8 ldrb r0, [r5, 0x1] lsls r0, 27 ldr r1, =0x03005d90 @@ -447006,36 +447006,36 @@ sub_80EABDC: @ 80EABDC adds r6, r1, 0 ldrb r1, [r3, 0x8] cmp r0, r1 - beq _080EAC00 -_080EABF8: + beq @080EAC00 +@080EABF8: movs r0, 0 - b _080EAC56 + b @080EAC56 .align 2, 0 .pool -_080EAC00: +@080EAC00: movs r2, 0 adds r4, r5, 0 adds r4, 0x9 adds r3, 0xA -_080EAC08: +@080EAC08: adds r0, r4, r2 adds r1, r3, r2 ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bne _080EABF8 + bne @080EABF8 adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls _080EAC08 + bls @080EAC08 movs r2, 0 ldrb r0, [r5, 0x2] cmp r0, 0xFF - bne _080EAC2A + bne @080EAC2A ldr r0, [r6] - b _080EAC4E -_080EAC2A: + b @080EAC4E +@080EAC2A: adds r3, r5, 0x2 adds r0, r3, r2 ldr r4, [r6] @@ -447043,31 +447043,31 @@ _080EAC2A: ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bne _080EABF8 + bne @080EABF8 adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x6 - bhi _080EAC54 + bhi @080EAC54 adds r0, r3, r2 ldrb r0, [r0] cmp r0, 0xFF - bne _080EAC2A + bne @080EAC2A adds r0, r4, r2 -_080EAC4E: +@080EAC4E: ldrb r0, [r0] cmp r0, 0xFF - bne _080EAC2A -_080EAC54: + bne @080EAC2A +@080EAC54: movs r0, 0x1 -_080EAC56: +@080EAC56: pop {r4-r6} pop {r1} bx r1 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 @@ -447078,11 +447078,11 @@ sub_80EAC5C: @ 80EAC5C mov r8, r2 movs r5, 0 movs r6, 0 -_080EAC70: +@080EAC70: movs r0, 0x1 ands r0, r5 cmp r0, 0 - bne _080EAC9A + bne @080EAC9A lsls r0, r6, 2 adds r0, r6 lsls r0, 5 @@ -447093,17 +447093,17 @@ _080EAC70: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080EAC9A + bne @080EAC9A adds r0, r4, 0 bl sub_80E8AF0 movs r0, 0x1 orrs r5, r0 -_080EAC9A: +@080EAC9A: movs r7, 0x2 movs r0, 0x2 ands r0, r5 cmp r0, 0 - bne _080EACC8 + bne @080EACC8 lsls r0, r6, 2 adds r0, r6 lsls r0, 5 @@ -447114,18 +447114,18 @@ _080EAC9A: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080EACC8 + bne @080EACC8 adds r0, r4, 0 bl sub_80E8AF0 orrs r5, r7 lsls r0, r5, 24 lsrs r5, r0, 24 -_080EACC8: +@080EACC8: movs r7, 0x4 movs r0, 0x4 ands r0, r5 cmp r0, 0 - bne _080EACF6 + bne @080EACF6 lsls r0, r6, 2 adds r0, r6 lsls r0, 5 @@ -447136,21 +447136,21 @@ _080EACC8: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080EACF6 + bne @080EACF6 adds r0, r4, 0 bl sub_80E8AF0 orrs r5, r7 lsls r0, r5, 24 lsrs r5, r0, 24 -_080EACF6: +@080EACF6: cmp r5, 0x7 - beq _080EAD04 + beq @080EAD04 adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x13 - bls _080EAC70 -_080EAD04: + bls @080EAC70 +@080EAD04: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -447161,7 +447161,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} @@ -447170,7 +447170,7 @@ sub_80EAD14: @ 80EAD14 lsls r2, 24 lsrs r7, r2, 24 movs r5, 0 -_080EAD24: +@080EAD24: lsls r0, r5, 2 adds r0, r5 lsls r0, 5 @@ -447178,28 +447178,28 @@ _080EAD24: adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0 - beq _080EAD7E + beq @080EAD7E adds r0, r6, 0 adds r1, r4, 0 bl sub_80EA950 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080EAD7E + bne @080EAD7E cmp r7, 0 - bne _080EAD50 + bne @080EAD50 adds r0, r4, 0 bl sub_80E8AF0 - b _080EAD88 -_080EAD50: + b @080EAD88 +@080EAD50: ldrh r0, [r6, 0xE] ldrh r3, [r4, 0xE] cmp r0, r3 - bls _080EAD60 + bls @080EAD60 adds r0, r4, 0 bl sub_80E8AF0 - b _080EAD88 -_080EAD60: + b @080EAD88 +@080EAD60: ldrb r0, [r6, 0x1] lsls r0, 28 lsrs r0, 28 @@ -447213,16 +447213,16 @@ _080EAD60: adds r0, r6, 0 bl sub_80E8AF0 movs r0, 0x1 - b _080EAD8A -_080EAD7E: + b @080EAD8A +@080EAD7E: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x13 - bls _080EAD24 -_080EAD88: + bls @080EAD24 +@080EAD88: movs r0, 0 -_080EAD8A: +@080EAD8A: pop {r3} mov r8, r3 pop {r4-r7} @@ -447231,7 +447231,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 @@ -447241,7 +447241,7 @@ sub_80EAD94: @ 80EAD94 mov r8, r2 adds r6, r3, 0 movs r5, 0x1 -_080EADA6: +@080EADA6: lsls r0, r5, 2 adds r0, r5 lsls r0, 5 @@ -447249,12 +447249,12 @@ _080EADA6: adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0 - beq _080EADF8 + beq @080EADF8 ldrb r1, [r4, 0x1] movs r0, 0xC0 ands r0, r1 cmp r0, 0x40 - bne _080EADCE + bne @080EADCE movs r2, 0x10 negs r2, r2 adds r0, r2, 0 @@ -447262,40 +447262,40 @@ _080EADA6: movs r1, 0x1 orrs r0, r1 strb r0, [r4, 0x1] -_080EADCE: +@080EADCE: adds r0, r4, 0 adds r1, r7, 0 adds r2, r5, 0 bl sub_80EAD14 lsls r0, 24 cmp r0, 0 - bne _080EADF8 + bne @080EADF8 adds r0, r4, 0 mov r1, r8 adds r2, r5, 0 bl sub_80EAD14 lsls r0, 24 cmp r0, 0 - bne _080EADF8 + bne @080EADF8 adds r0, r4, 0 adds r1, r6, 0 adds r2, r5, 0 bl sub_80EAD14 -_080EADF8: +@080EADF8: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x13 - bls _080EADA6 + bls @080EADA6 movs r5, 0 -_080EAE04: +@080EAE04: lsls r0, r5, 2 adds r0, r5 lsls r0, 5 adds r4, r0, r7 ldrb r0, [r4] cmp r0, 0 - beq _080EAE38 + beq @080EAE38 ldrb r0, [r4, 0x1] movs r2, 0x21 negs r2, r2 @@ -447308,22 +447308,22 @@ _080EAE04: bl sub_80EAD14 lsls r0, 24 cmp r0, 0 - bne _080EAE38 + bne @080EAE38 adds r0, r4, 0 adds r1, r6, 0 adds r2, r5, 0 bl sub_80EAD14 -_080EAE38: +@080EAE38: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x13 - bls _080EAE04 + bls @080EAE04 movs r5, 0 movs r0, 0x21 negs r0, r0 adds r7, r0, 0 -_080EAE4A: +@080EAE4A: lsls r0, r5, 2 adds r0, r5 lsls r4, r0, 5 @@ -447331,7 +447331,7 @@ _080EAE4A: adds r1, r4, r2 ldrb r0, [r1] cmp r0, 0 - beq _080EAE6A + beq @080EAE6A ldrb r0, [r1, 0x1] ands r0, r7 strb r0, [r1, 0x1] @@ -447339,20 +447339,20 @@ _080EAE4A: adds r1, r6, 0 adds r2, r5, 0 bl sub_80EAD14 -_080EAE6A: +@080EAE6A: adds r1, r4, r6 ldrb r0, [r1] cmp r0, 0 - beq _080EAE78 + beq @080EAE78 ldrb r0, [r1, 0x1] ands r0, r7 strb r0, [r1, 0x1] -_080EAE78: +@080EAE78: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x13 - bls _080EAE4A + bls @080EAE4A pop {r3,r4} mov r8, r3 mov r9, r4 @@ -447362,7 +447362,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 @@ -447370,24 +447370,24 @@ sub_80EAE90: @ 80EAE90 movs r0, 0xF ands r0, r1 cmp r0, 0x1 - bne _080EAEAE + bne @080EAEAE adds r0, r4, 0 adds r1, r3, 0 bl sub_80EAA64 adds r0, r4, 0 bl sub_80E8AF0 -_080EAEAE: +@080EAEAE: pop {r4} pop {r0} bx r0 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 -_080EAEBA: +@080EAEBA: lsls r4, r6, 2 adds r4, r6 lsls r4, 5 @@ -447410,14 +447410,14 @@ _080EAEBA: lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x13 - bls _080EAEBA + bls @080EAEBA pop {r4-r6} pop {r0} bx r0 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] @@ -447476,7 +447476,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 @@ -447487,18 +447487,18 @@ sub_80EAF80: @ 80EAF80 bl flag_check lsls r0, 24 cmp r0, 0 - bne _080EAF9A - b _080EB16A -_080EAF9A: + bne @080EAF9A + b @080EB16A +@080EAF9A: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - beq _080EAFAC + beq @080EAFAC cmp r0, 0x3 - beq _080EAFC8 - b _080EAFD6 -_080EAFAC: + beq @080EAFC8 + b @080EAFD6 +@080EAFAC: lsls r4, r5, 1 adds r0, r6, r4 movs r1, 0 @@ -447510,29 +447510,29 @@ _080EAFAC: movs r1, 0 adds r2, r5, 0 bl memset - b _080EAFD6 -_080EAFC8: + b @080EAFD6 +@080EAFC8: lsls r0, r5, 1 adds r0, r5 adds r0, r6, r0 movs r1, 0 adds r2, r5, 0 bl memset -_080EAFD6: +@080EAFD6: cmp r7, 0x1 - beq _080EB030 + beq @080EB030 cmp r7, 0x1 - bgt _080EAFE4 + bgt @080EAFE4 cmp r7, 0 - beq _080EAFEE - b _080EB0D4 -_080EAFE4: + beq @080EAFEE + b @080EB0D4 +@080EAFE4: cmp r7, 0x2 - beq _080EB074 + beq @080EB074 cmp r7, 0x3 - beq _080EB0A8 - b _080EB0D4 -_080EAFEE: + beq @080EB0A8 + b @080EB0D4 +@080EAFEE: adds r0, r6, r5 str r0, [sp] ldr r4, =0x020229e8 @@ -447563,10 +447563,10 @@ _080EAFEE: adds r0, r4, 0 adds r0, 0x6E ldrh r0, [r0] - b _080EB0D2 + b @080EB0D2 .align 2, 0 .pool -_080EB030: +@080EB030: lsls r2, r5, 1 adds r0, r6, r2 str r0, [sp] @@ -447598,10 +447598,10 @@ _080EB030: ands r1, r0 str r1, [sp, 0x1C] ldrh r0, [r4, 0x1A] - b _080EB0D2 + b @080EB0D2 .align 2, 0 .pool -_080EB074: +@080EB074: lsls r0, r5, 1 adds r0, r5 adds r0, r6, r0 @@ -447625,10 +447625,10 @@ _080EB074: ldrb r0, [r1, 0x1C] str r0, [sp, 0x1C] ldrh r0, [r1, 0x36] - b _080EB0D2 + b @080EB0D2 .align 2, 0 .pool -_080EB0A8: +@080EB0A8: str r6, [sp] ldr r1, =0x020229e8 ldrb r0, [r1] @@ -447650,16 +447650,16 @@ _080EB0A8: str r2, [sp, 0x1C] adds r1, 0x52 ldrh r0, [r1] -_080EB0D2: +@080EB0D2: str r0, [sp, 0x20] -_080EB0D4: +@080EB0D4: mov r0, sp bl sub_80EAEF4 movs r3, 0x1 ldr r6, =0x03005d8c movs r7, 0x10 negs r7, r7 -_080EB0E2: +@080EB0E2: ldr r0, [r6] lsls r1, r3, 2 adds r1, r3 @@ -447671,7 +447671,7 @@ _080EB0E2: lsls r0, r1, 28 lsrs r0, 28 cmp r0, 0x1 - bne _080EB112 + bne @080EB112 movs r0, 0x3F ands r0, r1 movs r1, 0x40 @@ -447684,19 +447684,19 @@ _080EB0E2: adds r0, r7, 0 ands r0, r2 strb r0, [r1] -_080EB112: +@080EB112: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x13 - bls _080EB0E2 + bls @080EB0E2 bl sub_80EAAF4 movs r3, 0x1 ldr r7, =0x03005d8c adds r6, r7, 0 adds r4, r5, 0 movs r5, 0x3F -_080EB12A: +@080EB12A: ldr r0, [r6] lsls r1, r3, 2 adds r1, r3 @@ -447706,31 +447706,31 @@ _080EB12A: ldrb r1, [r2] lsrs r0, r1, 6 cmp r0, 0x2 - bne _080EB144 + bne @080EB144 adds r0, r5, 0 ands r0, r1 strb r0, [r2] -_080EB144: +@080EB144: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x13 - bls _080EB12A + bls @080EB12A ldr r1, [r7] ldr r2, =0x00001a9c adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _080EB16A + beq @080EB16A ldr r0, =0x00001aaa adds r2, r1, r0 ldrh r1, [r2] ldr r0, =0x0000ffff cmp r1, r0 - beq _080EB16A + beq @080EB16A adds r0, r1, 0x1 strh r0, [r2] -_080EB16A: +@080EB16A: add sp, 0x24 pop {r4-r7} pop {r0} @@ -447740,28 +447740,28 @@ _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 -_080EB192: +@080EB192: ldrb r0, [r4, 0xD] cmp r0, 0x1 - bne _080EB19E + bne @080EB19E adds r0, r4, 0 bl sub_80E8AF0 -_080EB19E: +@080EB19E: adds r4, 0xA0 adds r5, 0x1 cmp r5, 0x13 - bls _080EB192 + bls @080EB192 pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_80EB18C thumb_func_start sub_80EB1AC -sub_80EB1AC: @ 80EB1AC +sub_80EB1AC: ; 80EB1AC push {lr} ldr r0, =0x000040ec movs r1, 0 @@ -447779,18 +447779,18 @@ sub_80EB1AC: @ 80EB1AC bl var_get lsls r0, 16 cmp r0, 0 - beq _080EB1FC + beq @080EB1FC ldr r0, =0x000040f0 movs r1, 0x1 bl var_set - b _080EB204 + b @080EB204 .align 2, 0 .pool -_080EB1FC: +@080EB1FC: ldr r0, =0x000040f0 movs r1, 0 bl var_set -_080EB204: +@080EB204: ldr r1, =0x0203a01d movs r0, 0 strb r0, [r1] @@ -447801,23 +447801,23 @@ _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 bl var_get lsls r0, 16 cmp r0, 0 - beq _080EB272 + beq @080EB272 ldr r6, =0x0203a01d ldrb r0, [r6] cmp r0, 0x1 - bne _080EB272 + bne @080EB272 bl sub_80E9214 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _080EB272 + bne @080EB272 adds r0, r5, 0 movs r1, 0 bl var_set @@ -447838,7 +447838,7 @@ sub_80EB218: @ 80EB218 adds r0, r5, 0 movs r1, 0 bl var_set -_080EB272: +@080EB272: pop {r4-r6} pop {r0} bx r0 @@ -447847,13 +447847,13 @@ _080EB272: thumb_func_end sub_80EB218 thumb_func_start sub_80EB290 -sub_80EB290: @ 80EB290 +sub_80EB290: ; 80EB290 push {r4,lr} ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 - beq _080EB2BA + beq @080EB2BA ldr r4, =0x000040ef adds r0, r4, 0 bl var_get @@ -447866,7 +447866,7 @@ sub_80EB290: @ 80EB290 lsrs r1, 16 adds r0, r4, 0 bl var_set -_080EB2BA: +@080EB2BA: pop {r4} pop {r0} bx r0 @@ -447875,13 +447875,13 @@ _080EB2BA: thumb_func_end sub_80EB290 thumb_func_start sub_80EB2C8 -sub_80EB2C8: @ 80EB2C8 +sub_80EB2C8: ; 80EB2C8 push {r4,lr} ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 - beq _080EB2F2 + beq @080EB2F2 ldr r4, =0x000040ee adds r0, r4, 0 bl var_get @@ -447894,7 +447894,7 @@ sub_80EB2C8: @ 80EB2C8 lsrs r1, 16 adds r0, r4, 0 bl var_set -_080EB2F2: +@080EB2F2: pop {r4} pop {r0} bx r0 @@ -447903,13 +447903,13 @@ _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 var_get lsls r0, 16 cmp r0, 0 - beq _080EB34C + beq @080EB34C ldr r5, =0x000040ee adds r0, r5, 0 bl var_get @@ -447935,7 +447935,7 @@ sub_80EB300: @ 80EB300 lsrs r1, 16 adds r0, r5, 0 bl var_set -_080EB34C: +@080EB34C: pop {r4,r5} pop {r0} bx r0 @@ -447944,13 +447944,13 @@ _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 var_get lsls r0, 16 cmp r0, 0 - beq _080EB3B4 + beq @080EB3B4 ldr r5, =0x000040ee adds r0, r5, 0 bl var_get @@ -447976,7 +447976,7 @@ sub_80EB368: @ 80EB368 lsrs r1, 16 adds r0, r5, 0 bl var_set -_080EB3B4: +@080EB3B4: pop {r4,r5} pop {r0} bx r0 @@ -447985,13 +447985,13 @@ _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 var_get lsls r0, 16 cmp r0, 0 - beq _080EB41C + beq @080EB41C ldr r5, =0x000040ee adds r0, r5, 0 bl var_get @@ -448017,7 +448017,7 @@ sub_80EB3D0: @ 80EB3D0 lsrs r1, 16 adds r0, r5, 0 bl var_set -_080EB41C: +@080EB41C: pop {r4,r5} pop {r0} bx r0 @@ -448026,13 +448026,13 @@ _080EB41C: thumb_func_end sub_80EB3D0 thumb_func_start sub_80EB438 -sub_80EB438: @ 80EB438 +sub_80EB438: ; 80EB438 push {r4,lr} ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 - beq _080EB480 + beq @080EB480 ldr r4, =0x000040ee adds r0, r4, 0 bl var_get @@ -448056,7 +448056,7 @@ sub_80EB438: @ 80EB438 lsrs r1, 16 adds r0, r4, 0 bl var_set -_080EB480: +@080EB480: pop {r4} pop {r0} bx r0 @@ -448065,7 +448065,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 @@ -448082,47 +448082,47 @@ sub_80EB498: @ 80EB498 ldr r1, =0xfffffce4 adds r0, r1 cmp r0, 0x18 - bhi _080EB55C + bhi @080EB55C lsls r0, 2 - ldr r1, =_080EB4D0 + ldr r1, =@080EB4D0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080EB4D0: - .4byte _080EB534 - .4byte _080EB534 - .4byte _080EB534 - .4byte _080EB534 - .4byte _080EB55C - .4byte _080EB55C - .4byte _080EB55C - .4byte _080EB55C - .4byte _080EB534 - .4byte _080EB534 - .4byte _080EB534 - .4byte _080EB534 - .4byte _080EB55C - .4byte _080EB55C - .4byte _080EB55C - .4byte _080EB55C - .4byte _080EB534 - .4byte _080EB534 - .4byte _080EB55C - .4byte _080EB55C - .4byte _080EB534 - .4byte _080EB534 - .4byte _080EB534 - .4byte _080EB534 - .4byte _080EB534 -_080EB534: +@080EB4D0: + .4byte @080EB534 + .4byte @080EB534 + .4byte @080EB534 + .4byte @080EB534 + .4byte @080EB55C + .4byte @080EB55C + .4byte @080EB55C + .4byte @080EB55C + .4byte @080EB534 + .4byte @080EB534 + .4byte @080EB534 + .4byte @080EB534 + .4byte @080EB55C + .4byte @080EB55C + .4byte @080EB55C + .4byte @080EB55C + .4byte @080EB534 + .4byte @080EB534 + .4byte @080EB55C + .4byte @080EB55C + .4byte @080EB534 + .4byte @080EB534 + .4byte @080EB534 + .4byte @080EB534 + .4byte @080EB534 +@080EB534: ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 - beq _080EB55C + beq @080EB55C ldr r4, =0x000040ee adds r0, r4, 0 bl var_get @@ -448135,7 +448135,7 @@ _080EB534: lsrs r1, 16 adds r0, r4, 0 bl var_set -_080EB55C: +@080EB55C: add sp, 0x4 pop {r4} pop {r0} @@ -448145,7 +448145,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 @@ -448162,274 +448162,274 @@ sub_80EB56C: @ 80EB56C ldr r1, =0xfffffdd4 adds r0, r1 cmp r0, 0xCF - bls _080EB594 - b _080EB9D0 -_080EB594: + bls @080EB594 + b @080EB9D0 +@080EB594: lsls r0, 2 - ldr r1, =_080EB5A8 + ldr r1, =@080EB5A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080EB5A8: - .4byte _080EB930 - .4byte _080EB97C - .4byte _080EB97C - .4byte _080EB97C - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB930 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9AC - .4byte _080EB954 - .4byte _080EB954 - .4byte _080EB8E8 - .4byte _080EB8E8 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9AC - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9AC - .4byte _080EB9AC - .4byte _080EB9AC - .4byte _080EB9AC - .4byte _080EB9AC - .4byte _080EB9AC - .4byte _080EB9AC - .4byte _080EB9AC - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9AC - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9AC - .4byte _080EB9AC - .4byte _080EB9AC - .4byte _080EB9D0 - .4byte _080EB9AC - .4byte _080EB9AC - .4byte _080EB9AC - .4byte _080EB9AC - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9AC - .4byte _080EB9AC - .4byte _080EB9AC - .4byte _080EB9AC - .4byte _080EB9AC - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB90C - .4byte _080EB90C - .4byte _080EB90C - .4byte _080EB90C - .4byte _080EB90C - .4byte _080EB90C - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB90C - .4byte _080EB90C - .4byte _080EB90C - .4byte _080EB90C - .4byte _080EB90C - .4byte _080EB90C - .4byte _080EB90C - .4byte _080EB90C - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB9D0 - .4byte _080EB90C - .4byte _080EB90C - .4byte _080EB90C - .4byte _080EB90C -_080EB8E8: +@080EB5A8: + .4byte @080EB930 + .4byte @080EB97C + .4byte @080EB97C + .4byte @080EB97C + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB930 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9AC + .4byte @080EB954 + .4byte @080EB954 + .4byte @080EB8E8 + .4byte @080EB8E8 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9AC + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9AC + .4byte @080EB9AC + .4byte @080EB9AC + .4byte @080EB9AC + .4byte @080EB9AC + .4byte @080EB9AC + .4byte @080EB9AC + .4byte @080EB9AC + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9AC + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9AC + .4byte @080EB9AC + .4byte @080EB9AC + .4byte @080EB9D0 + .4byte @080EB9AC + .4byte @080EB9AC + .4byte @080EB9AC + .4byte @080EB9AC + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9AC + .4byte @080EB9AC + .4byte @080EB9AC + .4byte @080EB9AC + .4byte @080EB9AC + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB90C + .4byte @080EB90C + .4byte @080EB90C + .4byte @080EB90C + .4byte @080EB90C + .4byte @080EB90C + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB90C + .4byte @080EB90C + .4byte @080EB90C + .4byte @080EB90C + .4byte @080EB90C + .4byte @080EB90C + .4byte @080EB90C + .4byte @080EB90C + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB9D0 + .4byte @080EB90C + .4byte @080EB90C + .4byte @080EB90C + .4byte @080EB90C +@080EB8E8: ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 - beq _080EB9D0 + beq @080EB9D0 ldr r4, =0x000040ee adds r0, r4, 0 bl var_get adds r1, r0, 0 movs r0, 0x40 - b _080EB994 + b @080EB994 .align 2, 0 .pool -_080EB90C: +@080EB90C: ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 - beq _080EB9D0 + beq @080EB9D0 ldr r4, =0x000040ee adds r0, r4, 0 bl var_get adds r1, r0, 0 movs r0, 0x8 - b _080EB994 + b @080EB994 .align 2, 0 .pool -_080EB930: +@080EB930: ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 - beq _080EB9D0 + beq @080EB9D0 ldr r4, =0x000040ef adds r0, r4, 0 bl var_get adds r1, r0, 0 movs r0, 0x40 - b _080EB994 + b @080EB994 .align 2, 0 .pool -_080EB954: +@080EB954: ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 - beq _080EB9D0 + beq @080EB9D0 ldr r4, =0x000040ef adds r0, r4, 0 bl var_get @@ -448437,35 +448437,35 @@ _080EB954: movs r2, 0x80 lsls r2, 1 adds r0, r2, 0 - b _080EB994 + b @080EB994 .align 2, 0 .pool -_080EB97C: +@080EB97C: ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 - beq _080EB9D0 + beq @080EB9D0 ldr r4, =0x000040ef adds r0, r4, 0 bl var_get adds r1, r0, 0 movs r0, 0x10 -_080EB994: +@080EB994: orrs r1, r0 lsls r1, 16 lsrs r1, 16 adds r0, r4, 0 bl var_set - b _080EB9D0 + b @080EB9D0 .align 2, 0 .pool -_080EB9AC: +@080EB9AC: ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 - beq _080EB9D0 + beq @080EB9D0 ldr r4, =0x000040ef adds r0, r4, 0 bl var_get @@ -448476,7 +448476,7 @@ _080EB9AC: lsrs r1, 16 adds r0, r4, 0 bl var_set -_080EB9D0: +@080EB9D0: add sp, 0x4 pop {r4} pop {r0} @@ -448486,7 +448486,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 @@ -448503,78 +448503,78 @@ sub_80EB9E0: @ 80EB9E0 ldr r1, =0xfffffd6f adds r0, r1 cmp r0, 0x35 - bls _080EBA08 - b _080EBB18 -_080EBA08: + bls @080EBA08 + b @080EBB18 +@080EBA08: lsls r0, 2 - ldr r1, =_080EBA1C + ldr r1, =@080EBA1C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080EBA1C: - .4byte _080EBAF4 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBAF4 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBAF4 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBAF4 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBAF4 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBAF4 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBAF4 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBAF4 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBAF4 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBAF4 - .4byte _080EBB18 - .4byte _080EBB18 - .4byte _080EBAF4 -_080EBAF4: +@080EBA1C: + .4byte @080EBAF4 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBAF4 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBAF4 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBAF4 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBAF4 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBAF4 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBAF4 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBAF4 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBAF4 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBAF4 + .4byte @080EBB18 + .4byte @080EBB18 + .4byte @080EBAF4 +@080EBAF4: ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 - beq _080EBB18 + beq @080EBB18 ldr r4, =0x000040ef adds r0, r4, 0 bl var_get @@ -448585,7 +448585,7 @@ _080EBAF4: lsrs r1, 16 adds r0, r4, 0 bl var_set -_080EBB18: +@080EBB18: add sp, 0x4 pop {r4} pop {r0} @@ -448595,7 +448595,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 @@ -448612,201 +448612,201 @@ sub_80EBB28: @ 80EBB28 ldr r1, =0xfffffddb adds r0, r1 cmp r0, 0xA2 - bls _080EBB50 - b _080EBE6C -_080EBB50: + bls @080EBB50 + b @080EBE6C +@080EBB50: lsls r0, 2 - ldr r1, =_080EBB64 + ldr r1, =@080EBB64 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080EBB64: - .4byte _080EBE48 - .4byte _080EBE48 - .4byte _080EBE48 - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE14 - .4byte _080EBE14 - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBDF0 - .4byte _080EBE6C - .4byte _080EBDF0 - .4byte _080EBDF0 - .4byte _080EBE6C - .4byte _080EBDF0 - .4byte _080EBDF0 - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBDF0 - .4byte _080EBE6C - .4byte _080EBDF0 - .4byte _080EBDF0 - .4byte _080EBDF0 - .4byte _080EBE6C - .4byte _080EBDF0 - .4byte _080EBDF0 - .4byte _080EBDF0 - .4byte _080EBE6C - .4byte _080EBDF0 - .4byte _080EBE6C - .4byte _080EBDF0 - .4byte _080EBE6C - .4byte _080EBDF0 - .4byte _080EBDF0 - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBDF0 - .4byte _080EBDF0 - .4byte _080EBE6C - .4byte _080EBDF0 - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBE6C - .4byte _080EBDF0 - .4byte _080EBDF0 - .4byte _080EBE6C - .4byte _080EBDF0 -_080EBDF0: +@080EBB64: + .4byte @080EBE48 + .4byte @080EBE48 + .4byte @080EBE48 + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE14 + .4byte @080EBE14 + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBDF0 + .4byte @080EBE6C + .4byte @080EBDF0 + .4byte @080EBDF0 + .4byte @080EBE6C + .4byte @080EBDF0 + .4byte @080EBDF0 + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBDF0 + .4byte @080EBE6C + .4byte @080EBDF0 + .4byte @080EBDF0 + .4byte @080EBDF0 + .4byte @080EBE6C + .4byte @080EBDF0 + .4byte @080EBDF0 + .4byte @080EBDF0 + .4byte @080EBE6C + .4byte @080EBDF0 + .4byte @080EBE6C + .4byte @080EBDF0 + .4byte @080EBE6C + .4byte @080EBDF0 + .4byte @080EBDF0 + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBDF0 + .4byte @080EBDF0 + .4byte @080EBE6C + .4byte @080EBDF0 + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBE6C + .4byte @080EBDF0 + .4byte @080EBDF0 + .4byte @080EBE6C + .4byte @080EBDF0 +@080EBDF0: ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 - beq _080EBE6C + beq @080EBE6C ldr r4, =0x000040ef adds r0, r4, 0 bl var_get adds r1, r0, 0 movs r0, 0x8 - b _080EBE30 + b @080EBE30 .align 2, 0 .pool -_080EBE14: +@080EBE14: ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 - beq _080EBE6C + beq @080EBE6C ldr r4, =0x000040ef adds r0, r4, 0 bl var_get @@ -448814,21 +448814,21 @@ _080EBE14: movs r2, 0x80 lsls r2, 1 adds r0, r2, 0 -_080EBE30: +@080EBE30: orrs r1, r0 lsls r1, 16 lsrs r1, 16 adds r0, r4, 0 bl var_set - b _080EBE6C + b @080EBE6C .align 2, 0 .pool -_080EBE48: +@080EBE48: ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 - beq _080EBE6C + beq @080EBE6C ldr r4, =0x000040ef adds r0, r4, 0 bl var_get @@ -448839,7 +448839,7 @@ _080EBE48: lsrs r1, 16 adds r0, r4, 0 bl var_set -_080EBE6C: +@080EBE6C: add sp, 0x4 pop {r4} pop {r0} @@ -448849,7 +448849,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 @@ -448866,15 +448866,15 @@ sub_80EBE7C: @ 80EBE7C adds r1, r0, 0 ldr r0, =0x0000028e cmp r1, r0 - bgt _080EBECC + bgt @080EBECC subs r0, 0x1 cmp r1, r0 - blt _080EBECC + blt @080EBECC ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 - beq _080EBECC + beq @080EBECC ldr r4, =0x000040ef adds r0, r4, 0 bl var_get @@ -448885,7 +448885,7 @@ sub_80EBE7C: @ 80EBE7C lsrs r1, 16 adds r0, r4, 0 bl var_set -_080EBECC: +@080EBECC: add sp, 0x4 pop {r4} pop {r0} @@ -448895,13 +448895,13 @@ _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 movs r5, 0 ldr r7, =0x000027ce -_080EBEEA: +@080EBEEA: ldr r0, [r6] lsls r1, r3, 3 adds r1, r3 @@ -448918,7 +448918,7 @@ _080EBEEA: movs r2, 0 adds r4, r3, 0x1 adds r3, r1, 0 -_080EBF0A: +@080EBF0A: ldr r0, [r6] adds r1, r2, r3 adds r0, r7 @@ -448928,11 +448928,11 @@ _080EBF0A: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x21 - bls _080EBF0A + bls @080EBF0A lsls r0, r4, 24 lsrs r3, r0, 24 cmp r3, 0x18 - bls _080EBEEA + bls @080EBEEA bl sub_80EEE5C pop {r4-r7} pop {r0} @@ -448942,7 +448942,7 @@ _080EBF0A: thumb_func_end sub_80EBEE0 thumb_func_start sub_80EBF3C -sub_80EBF3C: @ 80EBF3C +sub_80EBF3C: ; 80EBF3C push {r4-r7,lr} movs r4, 0x5 ldr r1, =0x03005d8c @@ -448952,15 +448952,15 @@ sub_80EBF3C: @ 80EBF3C adds r0, r2 ldrb r0, [r0] cmp r0, 0 - beq _080EBF70 + beq @080EBF70 adds r3, r1, 0 subs r2, 0xB4 -_080EBF54: +@080EBF54: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x17 - bhi _080EBF70 + bhi @080EBF70 ldr r0, [r3] lsls r1, r4, 3 adds r1, r4 @@ -448969,8 +448969,8 @@ _080EBF54: adds r0, r2 ldrb r0, [r0] cmp r0, 0 - bne _080EBF54 -_080EBF70: + bne @080EBF54 +@080EBF70: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -448980,7 +448980,7 @@ _080EBF70: lsrs r5, r0, 24 adds r7, r5, 0 ldr r6, =0x03005d8c -_080EBF86: +@080EBF86: ldr r1, [r6] lsls r0, r5, 3 adds r0, r5 @@ -448993,68 +448993,68 @@ _080EBF86: lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - beq _080EBFBC + beq @080EBFBC ldr r0, [r6] adds r0, r4 ldr r1, =0x000027cd adds r0, r1 ldrb r0, [r0] - b _080EBFCC + b @080EBFCC .align 2, 0 .pool -_080EBFBC: +@080EBFBC: ldr r2, =0x000027cc adds r0, r4, r2 ldr r1, [r6] adds r1, r0 ldrh r0, [r1, 0x16] cmp r0, 0 - bne _080EBFD8 + bne @080EBFD8 ldrb r0, [r1, 0x1] -_080EBFCC: +@080EBFCC: cmp r0, 0x1 - bne _080EBFD8 + bne @080EBFD8 adds r0, r5, 0 - b _080EBFEC + b @080EBFEC .align 2, 0 .pool -_080EBFD8: +@080EBFD8: cmp r5, 0 - bne _080EBFE0 + bne @080EBFE0 movs r5, 0x17 - b _080EBFE6 -_080EBFE0: + b @080EBFE6 +@080EBFE0: subs r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_080EBFE6: +@080EBFE6: cmp r5, r7 - bne _080EBF86 + bne @080EBF86 movs r0, 0xFF -_080EBFEC: +@080EBFEC: pop {r4-r7} pop {r1} bx r1 thumb_func_end sub_80EBF3C thumb_func_start sub_80EBFF4 -sub_80EBFF4: @ 80EBFF4 +sub_80EBFF4: ; 80EBFF4 push {lr} bl sub_80EBF3C lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xFF - bne _080EC006 + bne @080EC006 movs r0, 0xFF - b _080EC03E -_080EC006: + b @080EC03E +@080EC006: ldr r0, =0x03005d8c ldr r2, [r0] ldr r3, =0x00002b90 adds r0, r2, r3 ldrh r0, [r0] cmp r0, 0 - beq _080EC03C + beq @080EC03C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 @@ -449063,22 +449063,22 @@ _080EC006: adds r0, r2 ldrb r0, [r0] cmp r0, 0x29 - bne _080EC03C + bne @080EC03C bl sub_80EC18C lsls r0, 24 lsrs r0, 24 - b _080EC03E + b @080EC03E .align 2, 0 .pool -_080EC03C: +@080EC03C: adds r0, r1, 0 -_080EC03E: +@080EC03E: pop {r1} bx r1 thumb_func_end sub_80EBFF4 thumb_func_start per_step_2 -per_step_2: @ 80EC044 +per_step_2: ; 80EC044 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -449088,50 +449088,50 @@ per_step_2: @ 80EC044 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080EC06A + beq @080EC06A cmp r0, 0x2 - beq _080EC0BE + beq @080EC0BE ldr r0, =0x03005d8c ldr r0, [r0] ldrh r0, [r0, 0x4] cmp r0, 0xD - bne _080EC080 -_080EC06A: + bne @080EC080 +@080EC06A: adds r0, r4, 0 adds r1, r5, 0 movs r2, 0x3 bl sub_80EC0CC - b _080EC0BE + b @080EC0BE .align 2, 0 .pool -_080EC080: +@080EC080: ldr r0, =0x00000892 bl flag_check lsls r0, 24 cmp r0, 0 - beq _080EC0BE + beq @080EC0BE bl sub_80EBFF4 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _080EC0AE + bne @080EC0AE bl sub_80EEF20 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _080EC0AE + bne @080EC0AE bl is_tile_XX_prevent_per_step_scripts lsls r0, 24 cmp r0, 0 - beq _080EC0BE -_080EC0AE: + beq @080EC0BE +@080EC0AE: ldr r0, =0x00000891 bl flag_clear adds r0, r4, 0 adds r1, r5, 0 movs r2, 0x3 bl sub_80EC0CC -_080EC0BE: +@080EC0BE: pop {r4,r5} pop {r0} bx r0 @@ -449140,7 +449140,7 @@ _080EC0BE: thumb_func_end per_step_2 thumb_func_start sub_80EC0CC -sub_80EC0CC: @ 80EC0CC +sub_80EC0CC: ; 80EC0CC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -449152,7 +449152,7 @@ sub_80EC0CC: @ 80EC0CC lsrs r2, 16 movs r5, 0 cmp r5, r10 - bge _080EC120 + bge @080EC120 movs r1, 0xC0 lsls r1, 4 adds r0, r1, 0 @@ -449160,32 +449160,32 @@ sub_80EC0CC: @ 80EC0CC mov r1, r8 orrs r1, r0 mov r8, r1 -_080EC0F2: +@080EC0F2: movs r4, 0 adds r7, r5, 0x1 cmp r4, r9 - bge _080EC11A + bge @080EC11A mov r0, r8 lsls r6, r0, 16 -_080EC0FE: +@080EC0FE: adds r0, r4, 0 adds r1, r5, 0 bl cur_mapdata_block_get_role_at cmp r0, 0x86 - bne _080EC114 + bne @080EC114 adds r0, r4, 0 adds r1, r5, 0 lsrs r2, r6, 16 bl setmaptile_0 -_080EC114: +@080EC114: adds r4, 0x1 cmp r4, r9 - blt _080EC0FE -_080EC11A: + blt @080EC0FE +@080EC11A: adds r5, r7, 0 cmp r5, r10 - blt _080EC0F2 -_080EC120: + blt @080EC0F2 +@080EC120: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -449196,7 +449196,7 @@ _080EC120: thumb_func_end sub_80EC0CC thumb_func_start sub_80EC130 -sub_80EC130: @ 80EC130 +sub_80EC130: ; 80EC130 push {lr} ldr r1, =0x03005dc0 ldr r0, [r1] @@ -449211,7 +449211,7 @@ sub_80EC130: @ 80EC130 thumb_func_end sub_80EC130 thumb_func_start cut -cut: @ 80EC14C +cut: ; 80EC14C push {lr} ldr r1, =0x03005dc0 ldr r0, [r1] @@ -449226,7 +449226,7 @@ cut: @ 80EC14C thumb_func_end cut thumb_func_start sub_80EC168 -sub_80EC168: @ 80EC168 +sub_80EC168: ; 80EC168 ldr r0, =0x03005d8c ldr r1, [r0] ldr r0, =0x020375e0 @@ -449244,12 +449244,12 @@ sub_80EC168: @ 80EC168 thumb_func_end sub_80EC168 thumb_func_start sub_80EC18C -sub_80EC18C: @ 80EC18C +sub_80EC18C: ; 80EC18C push {r4,lr} movs r2, 0 ldr r0, =0x03005d8c ldr r3, [r0] -_080EC194: +@080EC194: lsls r0, r2, 3 adds r0, r2 lsls r0, 2 @@ -449258,33 +449258,33 @@ _080EC194: adds r0, r1, r4 ldrb r0, [r0] cmp r0, 0 - beq _080EC1C0 + beq @080EC1C0 cmp r0, 0x29 - beq _080EC1C0 + beq @080EC1C0 adds r4, 0x1 adds r0, r1, r4 ldrb r0, [r0] cmp r0, 0x1 - bne _080EC1C0 + bne @080EC1C0 adds r0, r2, 0 - b _080EC1CC + b @080EC1CC .align 2, 0 .pool -_080EC1C0: +@080EC1C0: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x17 - bls _080EC194 + bls @080EC194 movs r0, 0xFF -_080EC1CC: +@080EC1CC: pop {r4} pop {r1} bx r1 thumb_func_end sub_80EC18C thumb_func_start sub_80EC1D4 -sub_80EC1D4: @ 80EC1D4 +sub_80EC1D4: ; 80EC1D4 push {lr} ldr r3, =0x03005d8c ldr r2, =0x020375e0 @@ -449298,27 +449298,27 @@ sub_80EC1D4: @ 80EC1D4 adds r0, r3, r0 ldrb r0, [r0] cmp r0, 0x29 - bne _080EC214 + bne @080EC214 ldr r1, =0x00002b90 adds r0, r3, r1 ldrh r0, [r0] cmp r0, 0 - beq _080EC214 + beq @080EC214 bl sub_80EC18C lsls r0, 24 lsrs r0, 24 - b _080EC216 + b @080EC216 .align 2, 0 .pool -_080EC214: +@080EC214: ldrb r0, [r2] -_080EC216: +@080EC216: pop {r1} bx r1 thumb_func_end sub_80EC1D4 thumb_func_start sub_80EC21C -sub_80EC21C: @ 80EC21C +sub_80EC21C: ; 80EC21C push {r4-r6,lr} mov r6, r10 mov r5, r9 @@ -449437,7 +449437,7 @@ sub_80EC21C: @ 80EC21C thumb_func_end sub_80EC21C thumb_func_start sub_80EC31C -sub_80EC31C: @ 80EC31C +sub_80EC31C: ; 80EC31C push {r4,lr} ldr r3, =0x03005d8c ldr r2, [r3] @@ -449463,10 +449463,10 @@ sub_80EC31C: @ 80EC31C adds r0, r1, 0 adds r4, r3, 0 cmp r0, 0xFF - beq _080EC354 + beq @080EC354 adds r0, r1, 0x1 strb r0, [r2] -_080EC354: +@080EC354: ldr r2, [r4] mov r0, r12 ldrb r1, [r0, 0x5] @@ -449483,17 +449483,17 @@ _080EC354: mov r1, r12 ldrb r0, [r1] cmp r0, 0 - beq _080EC398 + beq @080EC398 ldr r0, [r4] ldr r1, =0x00002bae adds r0, r1 ldrb r1, [r0] movs r2, 0x2 orrs r1, r2 - b _080EC3A6 + b @080EC3A6 .align 2, 0 .pool -_080EC398: +@080EC398: ldr r0, [r4] ldr r1, =0x00002bae adds r0, r1 @@ -449501,22 +449501,22 @@ _080EC398: movs r1, 0x3 negs r1, r1 ands r1, r2 -_080EC3A6: +@080EC3A6: strb r1, [r0] mov r1, r12 ldrb r0, [r1, 0x3] cmp r0, 0 - beq _080EC3C4 + beq @080EC3C4 ldr r0, [r4] ldr r1, =0x00002bae adds r0, r1 ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 - b _080EC3D2 + b @080EC3D2 .align 2, 0 .pool -_080EC3C4: +@080EC3C4: ldr r0, [r4] ldr r1, =0x00002bae adds r0, r1 @@ -449524,48 +449524,48 @@ _080EC3C4: movs r1, 0x5 negs r1, r1 ands r1, r2 -_080EC3D2: +@080EC3D2: strb r1, [r0] mov r0, r12 ldrb r1, [r0, 0x5] movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _080EC410 + bne @080EC410 movs r1, 0 mov r0, r12 adds r0, 0x36 ldrb r0, [r0] cmp r0, 0 - bne _080EC410 -_080EC3EC: + bne @080EC410 +@080EC3EC: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xA - bhi _080EC41E + bhi @080EC41E mov r0, r12 adds r0, 0x36 adds r0, r1, r0 ldrb r0, [r0] cmp r0, 0 - beq _080EC3EC + beq @080EC3EC ldr r0, [r4] ldr r4, =0x00002bae adds r0, r4 - b _080EC416 + b @080EC416 .align 2, 0 .pool -_080EC410: +@080EC410: ldr r0, [r4] ldr r1, =0x00002bae adds r0, r1 -_080EC416: +@080EC416: ldrb r1, [r0] movs r2, 0x8 orrs r1, r2 strb r1, [r0] -_080EC41E: +@080EC41E: bl sub_80EC4E8 ldr r0, =0x03005d8c ldr r0, [r0] @@ -449573,10 +449573,10 @@ _080EC41E: adds r0, r4 ldrh r0, [r0] cmp r0, 0 - bne _080EC436 + bne @080EC436 movs r0, 0x1 bl flag_set -_080EC436: +@080EC436: pop {r4} pop {r0} bx r0 @@ -449585,7 +449585,7 @@ _080EC436: thumb_func_end sub_80EC31C thumb_func_start sub_80EC448 -sub_80EC448: @ 80EC448 +sub_80EC448: ; 80EC448 push {r4-r6,lr} ldr r5, =0x03005d8c ldr r2, [r5] @@ -449660,7 +449660,7 @@ sub_80EC448: @ 80EC448 thumb_func_end sub_80EC448 thumb_func_start sub_80EC4E8 -sub_80EC4E8: @ 80EC4E8 +sub_80EC4E8: ; 80EC4E8 ldr r0, =0x03005d8c ldr r1, [r0] ldr r0, =0x00002bae @@ -449676,7 +449676,7 @@ sub_80EC4E8: @ 80EC4E8 thumb_func_end sub_80EC4E8 thumb_func_start sub_80EC504 -sub_80EC504: @ 80EC504 +sub_80EC504: ; 80EC504 push {lr} ldr r0, =0x03005d8c ldr r0, [r0] @@ -449684,14 +449684,14 @@ sub_80EC504: @ 80EC504 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0x5 - bls _080EC522 + bls @080EC522 ldrb r0, [r1] movs r1, 0x3 bl __umodsi3 adds r0, 0x6 lsls r0, 24 lsrs r0, 24 -_080EC522: +@080EC522: pop {r1} bx r1 .align 2, 0 @@ -449699,7 +449699,7 @@ _080EC522: thumb_func_end sub_80EC504 thumb_func_start is_tile_XX_prevent_per_step_scripts -is_tile_XX_prevent_per_step_scripts: @ 80EC530 +is_tile_XX_prevent_per_step_scripts: ; 80EC530 ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00002bae @@ -449713,7 +449713,7 @@ is_tile_XX_prevent_per_step_scripts: @ 80EC530 thumb_func_end is_tile_XX_prevent_per_step_scripts thumb_func_start sub_80EC548 -sub_80EC548: @ 80EC548 +sub_80EC548: ; 80EC548 push {r4,r5,lr} ldr r5, =0x03005d8c ldr r0, [r5] @@ -449722,7 +449722,7 @@ sub_80EC548: @ 80EC548 ldrh r0, [r1] ldr r4, =0x0000ffff cmp r0, r4 - beq _080EC584 + beq @080EC584 ldr r0, =0x02021cc4 ldrh r1, [r1] bl sub_811EBBC @@ -449734,19 +449734,19 @@ sub_80EC548: @ 80EC548 orrs r0, r2 strh r0, [r1] movs r0, 0x1 - b _080EC586 + b @080EC586 .align 2, 0 .pool -_080EC584: +@080EC584: movs r0, 0 -_080EC586: +@080EC586: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_80EC548 thumb_func_start sub_80EC58C -sub_80EC58C: @ 80EC58C +sub_80EC58C: ; 80EC58C push {lr} ldr r0, =0x03005d8c ldr r0, [r0] @@ -449756,137 +449756,137 @@ sub_80EC58C: @ 80EC58C movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080EC5AC + bne @080EC5AC movs r0, 0x1 - b _080EC5D2 + b @080EC5D2 .align 2, 0 .pool -_080EC5AC: +@080EC5AC: movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _080EC5B8 + beq @080EC5B8 movs r0, 0x2 - b _080EC5D2 -_080EC5B8: + b @080EC5D2 +@080EC5B8: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080EC5C4 + beq @080EC5C4 movs r0, 0x3 - b _080EC5D2 -_080EC5C4: + b @080EC5D2 +@080EC5C4: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _080EC5D0 + bne @080EC5D0 movs r0, 0 - b _080EC5D2 -_080EC5D0: + b @080EC5D2 +@080EC5D0: movs r0, 0x4 -_080EC5D2: +@080EC5D2: pop {r1} bx r1 thumb_func_end sub_80EC58C thumb_func_start sub_80EC5D8 -sub_80EC5D8: @ 80EC5D8 +sub_80EC5D8: ; 80EC5D8 push {lr} bl sub_80EC504 lsls r0, 24 lsrs r0, 24 subs r0, 0x1 cmp r0, 0x7 - bhi _080EC6B0 + bhi @080EC6B0 lsls r0, 2 - ldr r1, =_080EC5F8 + ldr r1, =@080EC5F8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080EC5F8: - .4byte _080EC618 - .4byte _080EC62C - .4byte _080EC640 - .4byte _080EC654 - .4byte _080EC668 - .4byte _080EC67C - .4byte _080EC690 - .4byte _080EC6A4 -_080EC618: +@080EC5F8: + .4byte @080EC618 + .4byte @080EC62C + .4byte @080EC640 + .4byte @080EC654 + .4byte @080EC668 + .4byte @080EC67C + .4byte @080EC690 + .4byte @080EC6A4 +@080EC618: ldr r1, =0x020375e0 movs r0, 0xE strh r0, [r1] ldr r1, =0x020375e2 movs r0, 0xD - b _080EC6AE + b @080EC6AE .align 2, 0 .pool -_080EC62C: +@080EC62C: ldr r1, =0x020375e0 movs r0, 0x5 strh r0, [r1] ldr r1, =0x020375e2 movs r0, 0x6 - b _080EC6AE + b @080EC6AE .align 2, 0 .pool -_080EC640: +@080EC640: ldr r1, =0x020375e0 movs r0, 0x12 strh r0, [r1] ldr r1, =0x020375e2 movs r0, 0x11 - b _080EC6AE + b @080EC6AE .align 2, 0 .pool -_080EC654: +@080EC654: ldr r1, =0x020375e0 movs r0, 0x15 strh r0, [r1] ldr r1, =0x020375e2 movs r0, 0x16 - b _080EC6AE + b @080EC6AE .align 2, 0 .pool -_080EC668: +@080EC668: ldr r1, =0x020375e0 movs r0, 0x8 strh r0, [r1] ldr r1, =0x020375e2 movs r0, 0x9 - b _080EC6AE + b @080EC6AE .align 2, 0 .pool -_080EC67C: +@080EC67C: ldr r1, =0x020375e0 movs r0, 0x13 strh r0, [r1] ldr r1, =0x020375e2 movs r0, 0x14 - b _080EC6AE + b @080EC6AE .align 2, 0 .pool -_080EC690: +@080EC690: ldr r1, =0x020375e0 movs r0, 0x17 strh r0, [r1] ldr r1, =0x020375e2 movs r0, 0x18 - b _080EC6AE + b @080EC6AE .align 2, 0 .pool -_080EC6A4: +@080EC6A4: ldr r1, =0x020375e0 movs r0, 0xA strh r0, [r1] ldr r1, =0x020375e2 movs r0, 0xB -_080EC6AE: +@080EC6AE: strh r0, [r1] -_080EC6B0: +@080EC6B0: pop {r0} bx r0 .align 2, 0 @@ -449894,57 +449894,57 @@ _080EC6B0: thumb_func_end sub_80EC5D8 thumb_func_start sub_80EC6BC -sub_80EC6BC: @ 80EC6BC +sub_80EC6BC: ; 80EC6BC push {lr} ldr r0, =0x020375e2 ldrh r0, [r0] subs r0, 0x1 cmp r0, 0x7 - bhi _080EC724 + bhi @080EC724 lsls r0, 2 - ldr r1, =_080EC6DC + ldr r1, =@080EC6DC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080EC6DC: - .4byte _080EC6FC - .4byte _080EC702 - .4byte _080EC708 - .4byte _080EC70E - .4byte _080EC724 - .4byte _080EC714 - .4byte _080EC71A - .4byte _080EC720 -_080EC6FC: +@080EC6DC: + .4byte @080EC6FC + .4byte @080EC702 + .4byte @080EC708 + .4byte @080EC70E + .4byte @080EC724 + .4byte @080EC714 + .4byte @080EC71A + .4byte @080EC720 +@080EC6FC: bl sub_80ED548 - b _080EC724 -_080EC702: + b @080EC724 +@080EC702: bl sub_80ED5B8 - b _080EC724 -_080EC708: + b @080EC724 +@080EC708: bl sub_80ED610 - b _080EC724 -_080EC70E: + b @080EC724 +@080EC70E: bl nullsub_45 - b _080EC724 -_080EC714: + b @080EC724 +@080EC714: bl sub_80ECF5C - b _080EC724 -_080EC71A: + b @080EC724 +@080EC71A: bl sub_80ED164 - b _080EC724 -_080EC720: + b @080EC724 +@080EC720: bl sub_80ECA38 -_080EC724: +@080EC724: pop {r0} bx r0 thumb_func_end sub_80EC6BC thumb_func_start sub_80EC728 -sub_80EC728: @ 80EC728 +sub_80EC728: ; 80EC728 push {r4-r7,lr} mov r7, r8 push {r7} @@ -449954,20 +449954,20 @@ sub_80EC728: @ 80EC728 ldr r5, =0x03005d10 ldrh r0, [r5, 0x28] cmp r0, 0 - bne _080EC74C + bne @080EC74C bl sub_80EC8FC - b _080EC888 + b @080EC888 .align 2, 0 .pool -_080EC74C: +@080EC74C: bl sub_80EC8A4 ldr r0, =0x0000ffff bl sub_80EFB38 lsls r0, 24 cmp r0, 0 - beq _080EC75E - b _080EC888 -_080EC75E: + beq @080EC75E + b @080EC888 +@080EC75E: ldrh r1, [r5, 0x28] movs r0, 0xB muls r0, r1 @@ -449977,9 +449977,9 @@ _080EC75E: adds r1, 0x2A bl sub_8008C44 cmp r0, 0 - bne _080EC776 - b _080EC888 -_080EC776: + bne @080EC776 + b @080EC888 +@080EC776: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000027cc @@ -449992,18 +449992,18 @@ _080EC776: movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080EC888 + beq @080EC888 movs r0, 0x15 movs r1, 0 bl sub_80EF46C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080EC888 + beq @080EC888 movs r2, 0 adds r1, r5, 0 adds r1, 0x36 -_080EC7A8: +@080EC7A8: adds r0, r2, r1 ldrb r0, [r0] adds r0, r4, r0 @@ -450013,15 +450013,15 @@ _080EC7A8: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xA - bls _080EC7A8 + bls @080EC7A8 cmp r4, 0 - bne _080EC7CA + bne @080EC7CA ldrb r1, [r5, 0x5] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080EC888 -_080EC7CA: + beq @080EC888 +@080EC7CA: movs r4, 0 ldr r2, =0x03005d8c ldr r0, =0x030060bc @@ -450041,7 +450041,7 @@ _080EC7CA: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080EC81C + beq @080EC81C movs r4, 0x1 movs r0, 0x1 adds r3, r6, 0 @@ -450049,10 +450049,10 @@ _080EC7CA: ldr r1, =0x03005d90 mov r8, r1 adds r7, r6, 0x4 - b _080EC84E + b @080EC84E .align 2, 0 .pool -_080EC81C: +@080EC81C: movs r2, 0 ldr r0, =0x02024208 mov r12, r0 @@ -450063,7 +450063,7 @@ _080EC81C: adds r7, r6, 0x4 adds r1, r5, 0 adds r1, 0x36 -_080EC830: +@080EC830: adds r0, r2, r1 ldrb r0, [r0] adds r0, r4, r0 @@ -450073,14 +450073,14 @@ _080EC830: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xA - bls _080EC830 + bls @080EC830 cmp r4, 0xFF - bls _080EC84A + bls @080EC84A movs r4, 0xFF -_080EC84A: +@080EC84A: mov r1, r12 ldrh r0, [r1] -_080EC84E: +@080EC84E: strb r4, [r6, 0x12] strb r0, [r6, 0xF] mov r0, r8 @@ -450105,7 +450105,7 @@ _080EC84E: ldrb r0, [r0] strb r0, [r6, 0x2] strb r5, [r6, 0x3] -_080EC888: +@080EC888: pop {r3} mov r8, r3 pop {r4-r7} @@ -450116,7 +450116,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] @@ -450124,7 +450124,7 @@ sub_80EC8A4: @ 80EC8A4 adds r4, r1, r0 ldrb r0, [r4] cmp r0, 0x19 - beq _080EC8CA + beq @080EC8CA ldr r2, =0x000027cc adds r0, r1, r2 movs r1, 0x18 @@ -450134,7 +450134,7 @@ sub_80EC8A4: @ 80EC8A4 strh r0, [r4, 0x6] movs r0, 0x19 strb r0, [r4] -_080EC8CA: +@080EC8CA: ldrh r0, [r4, 0x2] adds r0, 0x1 strh r0, [r4, 0x2] @@ -450154,7 +450154,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} @@ -450162,11 +450162,11 @@ sub_80EC8FC: @ 80EC8FC bl sub_80EFB38 lsls r0, 24 cmp r0, 0 - bne _080EC9B4 + bne @080EC9B4 movs r1, 0 movs r5, 0 ldr r2, =0x03005d46 -_080EC914: +@080EC914: adds r0, r1, r2 ldrb r0, [r0] adds r0, r5, r0 @@ -450176,21 +450176,21 @@ _080EC914: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xA - bls _080EC914 + bls @080EC914 cmp r5, 0xFF - bls _080EC92E + bls @080EC92E movs r5, 0xFF -_080EC92E: +@080EC92E: cmp r5, 0x2 - bls _080EC9B4 + bls @080EC9B4 ldr r0, =0x0202433a mov r8, r0 ldrb r0, [r0] cmp r0, 0x6 - beq _080EC940 + beq @080EC940 cmp r0, 0x1 - bne _080EC9B4 -_080EC940: + bne @080EC9B4 +@080EC940: ldr r7, =0x03005d8c ldr r0, [r7] ldr r6, =0x000027cc @@ -450203,14 +450203,14 @@ _080EC940: movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080EC9B4 + beq @080EC9B4 movs r0, 0x17 movs r1, 0 bl sub_80EF46C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080EC9B4 + beq @080EC9B4 movs r1, 0 ldrsb r1, [r4, r1] lsls r0, r1, 3 @@ -450245,7 +450245,7 @@ _080EC940: ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x2] -_080EC9B4: +@080EC9B4: pop {r3} mov r8, r3 pop {r4-r7} @@ -450256,7 +450256,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 @@ -450279,7 +450279,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 @@ -450301,7 +450301,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} @@ -450312,7 +450312,7 @@ sub_80ECA38: @ 80ECA38 adds r6, r7, r1 ldrb r1, [r6] cmp r1, 0x8 - bne _080ECACE + bne @080ECACE ldr r0, =0x030060bc ldrb r0, [r0] lsls r0, 24 @@ -450372,7 +450372,7 @@ sub_80ECA38: @ 80ECA38 adds r0, r5 movs r1, 0x18 bl sub_80EF910 -_080ECACE: +@080ECACE: pop {r3} mov r8, r3 pop {r4-r7} @@ -450383,7 +450383,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 @@ -450413,13 +450413,13 @@ sub_80ECB00: @ 80ECB00 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080ECBEC + beq @080ECBEC movs r0, 0xA bl sub_80EF550 ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x1 - beq _080ECBEC + beq @080ECBEC movs r1, 0 ldrsb r1, [r4, r1] lsls r0, r1, 3 @@ -450441,20 +450441,20 @@ sub_80ECB00: @ 80ECB00 movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _080ECBA0 + bne @080ECBA0 adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _080ECBA2 + beq @080ECBA2 strb r5, [r4, 0x18] - b _080ECBA4 + b @080ECBA4 .align 2, 0 .pool -_080ECBA0: +@080ECBA0: movs r0, 0x2 -_080ECBA2: +@080ECBA2: strb r0, [r4, 0x18] -_080ECBA4: +@080ECBA4: mov r0, r10 strh r0, [r4, 0x14] mov r0, r9 @@ -450480,16 +450480,16 @@ _080ECBA4: ldrb r0, [r0] strb r0, [r4, 0x19] cmp r0, 0x1 - beq _080ECBE8 + beq @080ECBE8 adds r0, r6, r5 ldrh r0, [r0, 0x12] cmp r0, 0x1 - bne _080ECBEA -_080ECBE8: + bne @080ECBEA +@080ECBE8: movs r0, 0x1 -_080ECBEA: +@080ECBEA: strb r0, [r4, 0x1A] -_080ECBEC: +@080ECBEC: add sp, 0x20 pop {r3-r5} mov r8, r3 @@ -450503,7 +450503,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 @@ -450535,19 +450535,19 @@ sub_80ECC04: @ 80ECC04 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080ECC54 + beq @080ECC54 movs r0, 0x9 bl sub_80EF550 ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x1 - bne _080ECC68 -_080ECC54: + bne @080ECC68 +@080ECC54: movs r0, 0 - b _080ECCEE + b @080ECCEE .align 2, 0 .pool -_080ECC68: +@080ECC68: movs r1, 0 ldrsb r1, [r4, r1] lsls r0, r1, 3 @@ -450596,21 +450596,21 @@ _080ECC68: ldrb r0, [r0] strb r0, [r4, 0x14] cmp r0, 0x1 - beq _080ECCDA + beq @080ECCDA mov r1, r9 cmp r1, 0x1 - bne _080ECCE8 -_080ECCDA: + bne @080ECCE8 +@080ECCDA: strb r7, [r4, 0x15] - b _080ECCEC + b @080ECCEC .align 2, 0 .pool -_080ECCE8: +@080ECCE8: mov r2, r9 strb r2, [r4, 0x15] -_080ECCEC: +@080ECCEC: movs r0, 0x1 -_080ECCEE: +@080ECCEE: add sp, 0x24 pop {r3-r5} mov r8, r3 @@ -450622,7 +450622,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 @@ -450668,21 +450668,21 @@ sub_80ECD00: @ 80ECD00 ldrb r0, [r0] strb r0, [r4, 0x17] cmp r0, 0x1 - beq _080ECD74 + beq @080ECD74 ldr r0, [r6] ldr r1, =0x000031a0 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _080ECD98 -_080ECD74: + bne @080ECD98 +@080ECD74: strb r5, [r4, 0x18] - b _080ECD9A + b @080ECD9A .align 2, 0 .pool -_080ECD98: +@080ECD98: strb r0, [r4, 0x18] -_080ECD9A: +@080ECD9A: add sp, 0x20 pop {r4-r6} pop {r0} @@ -450690,7 +450690,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 @@ -450710,14 +450710,14 @@ sub_80ECDA4: @ 80ECDA4 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080ECDDC + beq @080ECDDC ldr r0, [r5] ldr r1, =0x00002b2c adds r0, r1 strb r6, [r0, 0xD] movs r1, 0x8 strb r1, [r0] -_080ECDDC: +@080ECDDC: pop {r4-r6} pop {r0} bx r0 @@ -450726,7 +450726,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 @@ -450744,9 +450744,9 @@ sub_80ECDF4: @ 80ECDF4 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080ECE1C + beq @080ECE1C strb r5, [r4, 0xE] -_080ECE1C: +@080ECE1C: pop {r4,r5} pop {r0} bx r0 @@ -450755,7 +450755,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 @@ -450773,9 +450773,9 @@ sub_80ECE34: @ 80ECE34 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080ECE5C + beq @080ECE5C strb r5, [r4, 0xF] -_080ECE5C: +@080ECE5C: pop {r4,r5} pop {r0} bx r0 @@ -450784,7 +450784,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 @@ -450802,9 +450802,9 @@ sub_80ECE74: @ 80ECE74 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080ECE9C + beq @080ECE9C strh r5, [r4, 0x10] -_080ECE9C: +@080ECE9C: pop {r4,r5} pop {r0} bx r0 @@ -450813,7 +450813,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 @@ -450833,7 +450833,7 @@ sub_80ECEB4: @ 80ECEB4 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080ECF4C + beq @080ECF4C ldr r2, =0x02039e00 lsls r1, r6, 6 adds r0, r1, r2 @@ -450852,17 +450852,17 @@ sub_80ECEB4: @ 80ECEB4 ldr r0, =0x02039f30 ldrb r0, [r0] cmp r1, r0 - ble _080ECF30 + ble @080ECF30 ldr r0, =0x020229e8 ldrh r0, [r0, 0x1A] - b _080ECF4A + b @080ECF4A .align 2, 0 .pool -_080ECF30: +@080ECF30: ldr r0, =gUnknown_82E9531 ldrb r0, [r0] cmp r0, 0x1 - beq _080ECF48 + beq @080ECF48 ldr r1, =0x020229e8 lsls r0, r6, 3 subs r0, r6 @@ -450870,12 +450870,12 @@ _080ECF30: adds r0, r1 ldrh r0, [r0, 0x1A] cmp r0, 0x1 - bne _080ECF4A -_080ECF48: + bne @080ECF4A +@080ECF48: movs r0, 0x1 -_080ECF4A: +@080ECF4A: strb r0, [r5, 0x1E] -_080ECF4C: +@080ECF4C: pop {r4-r7} pop {r0} bx r0 @@ -450884,7 +450884,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] @@ -450892,7 +450892,7 @@ sub_80ECF5C: @ 80ECF5C adds r5, r6, r0 ldrb r2, [r5] cmp r2, 0x6 - bne _080ED02C + bne @080ED02C ldr r0, =0x030060bc movs r1, 0 ldrsb r1, [r0, r1] @@ -450957,25 +450957,25 @@ sub_80ECF5C: @ 80ECF5C ldrb r0, [r0] strb r0, [r4, 0x1E] cmp r0, 0x1 - beq _080ECFFA + beq @080ECFFA ldrb r0, [r5, 0x1F] cmp r0, 0x1 - bne _080ED01C -_080ECFFA: + bne @080ED01C +@080ECFFA: strb r7, [r4, 0x1F] - b _080ED01E + b @080ED01E .align 2, 0 .pool -_080ED01C: +@080ED01C: strb r0, [r4, 0x1F] -_080ED01E: +@080ED01E: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000027cc adds r0, r1 movs r1, 0x18 bl sub_80EF910 -_080ED02C: +@080ED02C: pop {r4-r7} pop {r0} bx r0 @@ -450984,7 +450984,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 @@ -451004,7 +451004,7 @@ sub_80ED03C: @ 80ED03C movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080ED07A + beq @080ED07A ldr r0, [r4] ldr r1, =0x000027cc adds r0, r1 @@ -451013,7 +451013,7 @@ sub_80ED03C: @ 80ED03C strh r6, [r5, 0x14] movs r0, 0x6 strb r0, [r5] -_080ED07A: +@080ED07A: pop {r4-r6} pop {r0} bx r0 @@ -451022,7 +451022,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} @@ -451042,7 +451042,7 @@ sub_80ED090: @ 80ED090 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080ED134 + beq @080ED134 movs r3, 0x3 adds r0, r5, 0 ands r0, r3 @@ -451100,7 +451100,7 @@ sub_80ED090: @ 80ED090 movs r1, 0x3 bl pokemon_getattr strb r0, [r7, 0x1F] -_080ED134: +@080ED134: pop {r3} mov r8, r3 pop {r4-r7} @@ -451111,7 +451111,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 @@ -451162,14 +451162,14 @@ sub_80ED164: @ 80ED164 adds r0, r5 ldrb r0, [r0] cmp r0, 0 - bne _080ED1F4 + bne @080ED1F4 movs r0, 0x32 - b _080ED1F6 + b @080ED1F6 .align 2, 0 .pool -_080ED1F4: +@080ED1F4: movs r0, 0x64 -_080ED1F6: +@080ED1F6: strb r0, [r6, 0x1A] ldr r0, =0x020375e0 ldrh r0, [r0] @@ -451180,17 +451180,17 @@ _080ED1F6: ldrb r0, [r0] strb r0, [r6, 0x1D] cmp r0, 0x1 - beq _080ED21C + beq @080ED21C ldr r0, =0x03005d90 ldr r0, [r0] ldr r2, =0x00000beb adds r0, r2 ldrb r0, [r0] cmp r0, 0x1 - bne _080ED21E -_080ED21C: + bne @080ED21E +@080ED21C: movs r0, 0x1 -_080ED21E: +@080ED21E: strb r0, [r6, 0x1E] pop {r4-r6} pop {r0} @@ -451200,23 +451200,23 @@ _080ED21E: thumb_func_end sub_80ED164 thumb_func_start sub_80ED238 -sub_80ED238: @ 80ED238 +sub_80ED238: ; 80ED238 push {r4-r7,lr} ldr r5, =0x03005d8c ldr r0, [r5] ldrh r1, [r0, 0x4] ldr r0, =0x00003c1a cmp r1, r0 - beq _080ED2F2 + beq @080ED2F2 ldr r0, =0x0000371a cmp r1, r0 - beq _080ED2F2 + beq @080ED2F2 ldr r0, =0x00005555 bl sub_80EFB38 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _080ED2F2 + bne @080ED2F2 ldr r0, [r5] ldr r7, =0x000027cc adds r0, r7 @@ -451228,19 +451228,19 @@ sub_80ED238: @ 80ED238 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080ED2F2 + beq @080ED2F2 movs r0, 0x16 movs r1, 0 bl sub_80EF46C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080ED2F2 + beq @080ED2F2 bl sub_80EF500 ldr r2, =0x02039f80 ldrh r0, [r2, 0x2] cmp r0, 0x13 - bls _080ED2F2 + bls @080ED2F2 movs r1, 0 ldrsb r1, [r6, r1] lsls r0, r1, 3 @@ -451260,7 +451260,7 @@ sub_80ED238: @ 80ED238 mov r12, r2 adds r6, r5, 0 adds r6, 0xC -_080ED2B6: +@080ED2B6: lsls r2, r4, 1 adds r3, r7, r2 lsls r1, r4, 2 @@ -451274,7 +451274,7 @@ _080ED2B6: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _080ED2B6 + bls @080ED2B6 movs r0, 0x1 bl sub_80EF038 strb r0, [r5, 0x2] @@ -451288,7 +451288,7 @@ _080ED2B6: ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r5, 0x3] -_080ED2F2: +@080ED2F2: pop {r4-r7} pop {r0} bx r0 @@ -451297,7 +451297,7 @@ _080ED2F2: thumb_func_end sub_80ED238 thumb_func_start sub_80ED320 -sub_80ED320: @ 80ED320 +sub_80ED320: ; 80ED320 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -451306,7 +451306,7 @@ sub_80ED320: @ 80ED320 ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x1 - beq _080ED400 + beq @080ED400 ldr r0, =0x020375e0 mov r8, r0 ldrh r0, [r0] @@ -451325,13 +451325,13 @@ sub_80ED320: @ 80ED320 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bls _080ED400 + bls @080ED400 adds r0, r4, 0 bl sub_8008C24 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bls _080ED400 + bls @080ED400 ldr r2, =0x03005d8c ldr r0, =0x030060bc movs r1, 0 @@ -451396,7 +451396,7 @@ sub_80ED320: @ 80ED320 movs r1, 0x3 bl pokemon_getattr strb r0, [r4, 0x1F] -_080ED400: +@080ED400: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -451408,7 +451408,7 @@ _080ED400: thumb_func_end sub_80ED320 thumb_func_start sub_80ED430 -sub_80ED430: @ 80ED430 +sub_80ED430: ; 80ED430 push {r4,r5,lr} ldr r4, =0x03005d8c ldr r0, =0x020375e0 @@ -451486,13 +451486,13 @@ sub_80ED430: @ 80ED430 thumb_func_end sub_80ED430 thumb_func_start sub_80ED4DC -sub_80ED4DC: @ 80ED4DC +sub_80ED4DC: ; 80ED4DC push {r4,lr} bl sub_80EFA88 ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x1 - beq _080ED532 + beq @080ED532 ldr r2, =0x03005d8c ldr r0, =0x030060bc movs r1, 0 @@ -451524,7 +451524,7 @@ sub_80ED4DC: @ 80ED4DC strb r0, [r4, 0x16] adds r0, r4, 0 bl sub_80ECA10 -_080ED532: +@080ED532: pop {r4} pop {r0} bx r0 @@ -451533,7 +451533,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 @@ -451578,7 +451578,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 @@ -451615,7 +451615,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} @@ -451693,7 +451693,7 @@ sub_80ED610: @ 80ED610 ldrb r0, [r0] strb r0, [r5, 0xD] cmp r0, 0x1 - beq _080ED6D4 + beq @080ED6D4 bl sub_8139688 lsls r0, 24 lsrs r0, 24 @@ -451702,13 +451702,13 @@ sub_80ED610: @ 80ED610 movs r1, 0x3 bl pokemon_getattr cmp r0, 0x1 - bne _080ED6F4 -_080ED6D4: + bne @080ED6F4 +@080ED6D4: mov r0, r8 - b _080ED706 + b @080ED706 .align 2, 0 .pool -_080ED6F4: +@080ED6F4: bl sub_8139688 lsls r0, 24 lsrs r0, 24 @@ -451716,7 +451716,7 @@ _080ED6F4: adds r0, r6 movs r1, 0x3 bl pokemon_getattr -_080ED706: +@080ED706: strb r0, [r5, 0xE] pop {r3} mov r8, r3 @@ -451726,23 +451726,23 @@ _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 flag_check lsls r0, 24 cmp r0, 0 - beq _080ED7E4 + beq @080ED7E4 movs r1, 0 ldr r0, =0x03005d8c ldr r2, [r0] ldr r3, =0x000027cc -_080ED72E: +@080ED72E: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 @@ -451750,18 +451750,18 @@ _080ED72E: adds r0, r3 ldrb r0, [r0] cmp r0, 0x29 - beq _080ED7E4 + beq @080ED7E4 adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x17 - bls _080ED72E + bls @080ED72E ldr r0, =0x00000147 bl sub_80EFB38 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _080ED7E4 + bne @080ED7E4 ldr r6, =0x03005d8c ldr r0, [r6] ldr r1, =0x000027cc @@ -451774,7 +451774,7 @@ _080ED72E: movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080ED7E4 + beq @080ED7E4 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -451829,7 +451829,7 @@ _080ED72E: ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x18] -_080ED7E4: +@080ED7E4: pop {r4-r6} pop {r0} bx r0 @@ -451838,7 +451838,7 @@ _080ED7E4: thumb_func_end sub_80ED718 thumb_func_start sub_80ED808 -sub_80ED808: @ 80ED808 +sub_80ED808: ; 80ED808 push {r4,r5,lr} ldr r3, =0x03005d8c ldr r0, [r3] @@ -451897,7 +451897,7 @@ sub_80ED808: @ 80ED808 thumb_func_end sub_80ED808 thumb_func_start sub_80ED888 -sub_80ED888: @ 80ED888 +sub_80ED888: ; 80ED888 push {r4,lr} adds r4, r0, 0 lsls r4, 16 @@ -451918,7 +451918,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 @@ -451929,10 +451929,10 @@ sub_80ED8B4: @ 80ED8B4 ldrh r0, [r0] mov r12, r1 cmp r0, 0 - bne _080ED91C + bne @080ED91C movs r1, 0 ldr r6, =0x000027cc -_080ED8CE: +@080ED8CE: mov r7, r12 ldr r4, [r7] lsls r0, r1, 3 @@ -451942,40 +451942,40 @@ _080ED8CE: adds r0, r2, r6 ldrb r0, [r0] cmp r0, 0x29 - bne _080ED912 + bne @080ED912 ldr r7, =0x000027cd adds r0, r2, r7 ldrb r0, [r0] cmp r0, 0x1 - bne _080ED912 + bne @080ED912 adds r0, r3, r6 adds r1, r4, r0 ldrh r0, [r1, 0x16] cmp r0, r5 - bcs _080ED90C + bcs @080ED90C movs r0, 0 strh r0, [r1, 0x16] - b _080ED91C + b @080ED91C .align 2, 0 .pool -_080ED90C: +@080ED90C: subs r0, r5 strh r0, [r1, 0x16] - b _080ED91C -_080ED912: + b @080ED91C +@080ED912: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x17 - bls _080ED8CE -_080ED91C: + bls @080ED8CE +@080ED91C: pop {r4-r7} pop {r0} bx r0 thumb_func_end sub_80ED8B4 thumb_func_start sub_80ED924 -sub_80ED924: @ 80ED924 +sub_80ED924: ; 80ED924 push {lr} lsls r0, 16 lsrs r2, r0, 16 @@ -451985,47 +451985,47 @@ sub_80ED924: @ 80ED924 adds r1, r0, r3 ldrh r0, [r1] cmp r0, r2 - bhi _080ED948 + bhi @080ED948 bl sub_80ED808 - b _080ED94C + b @080ED94C .align 2, 0 .pool -_080ED948: +@080ED948: subs r0, r2 strh r0, [r1] -_080ED94C: +@080ED94C: pop {r0} bx r0 thumb_func_end sub_80ED924 thumb_func_start sub_80ED950 -sub_80ED950: @ 80ED950 +sub_80ED950: ; 80ED950 push {r4,lr} lsls r0, 24 cmp r0, 0 - beq _080ED978 + beq @080ED978 ldr r4, =0x0203a026 ldrh r0, [r4] lsrs r0, 8 cmp r0, 0x4 - bls _080ED966 + bls @080ED966 bl sub_80ED9A8 -_080ED966: +@080ED966: ldrb r0, [r4] strh r0, [r4] cmp r0, 0xFF - beq _080ED99C + beq @080ED99C adds r0, 0x1 - b _080ED99A + b @080ED99A .align 2, 0 .pool -_080ED978: +@080ED978: ldr r4, =0x0203a026 ldrb r0, [r4] cmp r0, 0x4 - bls _080ED984 + bls @080ED984 bl sub_80ED9A8 -_080ED984: +@080ED984: ldrh r0, [r4] movs r1, 0xFF lsls r1, 8 @@ -452033,13 +452033,13 @@ _080ED984: strh r1, [r4] lsrs r0, r1, 8 cmp r0, 0xFF - beq _080ED99C + beq @080ED99C movs r2, 0x80 lsls r2, 1 adds r0, r1, r2 -_080ED99A: +@080ED99A: strh r0, [r4] -_080ED99C: +@080ED99C: pop {r4} pop {r0} bx r0 @@ -452048,7 +452048,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] @@ -452062,14 +452062,14 @@ sub_80ED9A8: @ 80ED9A8 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080EDA18 + beq @080EDA18 movs r0, 0x18 movs r1, 0 bl sub_80EF46C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080EDA18 + beq @080EDA18 movs r1, 0 ldrsb r1, [r4, r1] lsls r0, r1, 3 @@ -452101,7 +452101,7 @@ sub_80ED9A8: @ 80ED9A8 ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x6] -_080EDA18: +@080EDA18: pop {r4-r6} pop {r0} bx r0 @@ -452110,7 +452110,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 @@ -452119,7 +452119,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] @@ -452127,18 +452127,18 @@ sub_80EDA48: @ 80EDA48 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0x19 - bne _080EDA6E + bne @080EDA6E ldrh r0, [r1, 0x2] cmp r0, 0x13 - bls _080EDA62 + bls @080EDA62 bl sub_80EDA80 -_080EDA62: +@080EDA62: ldr r0, [r4] ldr r1, =0x000027cc adds r0, r1 movs r1, 0x18 bl sub_80EF910 -_080EDA6E: +@080EDA6E: pop {r4} pop {r0} bx r0 @@ -452147,7 +452147,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} @@ -452160,7 +452160,7 @@ sub_80EDA80: @ 80EDA80 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - bne _080EDB1C + bne @080EDB1C ldr r0, [r7] ldr r1, =0x000027cc mov r8, r1 @@ -452173,14 +452173,14 @@ sub_80EDA80: @ 80EDA80 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080EDB1C + beq @080EDB1C movs r0, 0x19 movs r1, 0 bl sub_80EF46C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080EDB1C + beq @080EDB1C movs r1, 0 ldrsb r1, [r4, r1] lsls r0, r1, 3 @@ -452219,7 +452219,7 @@ sub_80EDA80: @ 80EDA80 add r0, r8 movs r1, 0x18 bl sub_80EF910 -_080EDB1C: +@080EDB1C: pop {r3} mov r8, r3 pop {r4-r7} @@ -452230,7 +452230,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 @@ -452247,7 +452247,7 @@ sub_80EDB44: @ 80EDB44 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080EDC40 + beq @080EDC40 movs r1, 0 ldrsb r1, [r2, r1] lsls r0, r1, 3 @@ -452263,34 +452263,34 @@ sub_80EDB44: @ 80EDB44 strb r1, [r4, 0x1] ldr r6, =0x00000867 movs r5, 0 -_080EDB88: +@080EDB88: lsls r0, r6, 16 lsrs r0, 16 bl flag_check lsls r0, 24 cmp r0, 0 - beq _080EDB9C + beq @080EDB9C adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_080EDB9C: +@080EDB9C: adds r6, 0x1 ldr r0, =0x0000086e cmp r6, r0 - bls _080EDB88 + bls @080EDB88 strb r5, [r4, 0x4] bl sub_809D42C cmp r0, 0 - beq _080EDBCC + beq @080EDBCC movs r0, 0x1 bl pokedex_count - b _080EDBD2 + b @080EDBD2 .align 2, 0 .pool -_080EDBCC: +@080EDBCC: movs r0, 0x1 bl sub_80C0844 -_080EDBD2: +@080EDBD2: strh r0, [r4, 0x2] ldr r1, =0x02037318 ldrb r0, [r1, 0x14] @@ -452303,7 +452303,7 @@ _080EDBD2: movs r6, 0 adds r7, r4, 0 adds r7, 0x13 -_080EDBEA: +@080EDBEA: ldr r0, =0x0858d0de lsls r5, r6, 1 adds r0, r5, r0 @@ -452312,11 +452312,11 @@ _080EDBEA: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080EDC04 + bne @080EDC04 ldrb r0, [r4, 0x5] adds r0, 0x1 strb r0, [r4, 0x5] -_080EDC04: +@080EDC04: ldr r0, =0x0858d0d0 adds r0, r5, r0 ldrh r0, [r0] @@ -452324,14 +452324,14 @@ _080EDC04: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080EDC1C + bne @080EDC1C ldrb r0, [r4, 0x6] adds r0, 0x1 strb r0, [r4, 0x6] -_080EDC1C: +@080EDC1C: adds r6, 0x1 cmp r6, 0x6 - bls _080EDBEA + bls @080EDBEA ldr r0, =0x03005d90 ldr r1, [r0] ldr r2, =0x00000eb8 @@ -452345,7 +452345,7 @@ _080EDC1C: ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0xC] -_080EDC40: +@080EDC40: pop {r4-r7} pop {r0} bx r0 @@ -452354,7 +452354,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 @@ -452369,14 +452369,14 @@ sub_80EDC60: @ 80EDC60 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080EDCCE + beq @080EDCCE movs r0, 0x1B movs r1, 0 bl sub_80EF46C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080EDCCE + beq @080EDCCE movs r1, 0 ldrsb r1, [r4, r1] lsls r0, r1, 3 @@ -452406,7 +452406,7 @@ sub_80EDC60: @ 80EDC60 ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x9] -_080EDCCE: +@080EDCCE: pop {r4-r7} pop {r0} bx r0 @@ -452415,7 +452415,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] @@ -452429,14 +452429,14 @@ sub_80EDCE8: @ 80EDCE8 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080EDD56 + beq @080EDD56 movs r0, 0x1C movs r1, 0 bl sub_80EF46C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080EDD56 + beq @080EDD56 movs r1, 0 ldrsb r1, [r4, r1] lsls r0, r1, 3 @@ -452467,7 +452467,7 @@ sub_80EDCE8: @ 80EDCE8 ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x5] -_080EDD56: +@080EDD56: pop {r4-r6} pop {r0} bx r0 @@ -452476,7 +452476,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 @@ -452492,65 +452492,65 @@ sub_80EDD78: @ 80EDD78 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080EDE54 + beq @080EDE54 movs r0, 0x1D movs r1, 0 bl sub_80EF46C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080EDE54 + beq @080EDE54 movs r5, 0 ldr r0, =0x0203a02a ldrb r1, [r0] adds r6, r0, 0 cmp r1, 0 - beq _080EDDCC + beq @080EDDCC cmp r1, 0x1 - beq _080EDDEE - b _080EDE54 + beq @080EDDEE + b @080EDE54 .align 2, 0 .pool -_080EDDCC: +@080EDDCC: ldr r0, =0x0203a028 ldrh r1, [r0] adds r0, r1, 0 adds r0, 0xC8 cmp r4, r0 - blt _080EDDE4 + blt @080EDDE4 movs r5, 0x1 subs r0, r4, r1 - b _080EDE12 + b @080EDE12 .align 2, 0 .pool -_080EDDE4: +@080EDDE4: cmp r1, 0x63 - bls _080EDE54 + bls @080EDE54 adds r0, r1, 0 subs r0, 0x64 - b _080EDE0C -_080EDDEE: + b @080EDE0C +@080EDDEE: ldr r0, =0x0203a028 ldrh r1, [r0] adds r0, r1, 0 adds r0, 0x32 cmp r4, r0 - blt _080EDE04 + blt @080EDE04 movs r5, 0x1 subs r0, r4, r1 - b _080EDE12 + b @080EDE12 .align 2, 0 .pool -_080EDE04: +@080EDE04: cmp r1, 0x31 - bls _080EDE54 + bls @080EDE54 adds r0, r1, 0 subs r0, 0x32 -_080EDE0C: +@080EDE0C: cmp r4, r0 - bgt _080EDE54 + bgt @080EDE54 subs r0, r1, r4 -_080EDE12: +@080EDE12: lsls r0, 16 lsrs r3, r0, 16 ldr r2, =0x03005d8c @@ -452582,7 +452582,7 @@ _080EDE12: ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x8] -_080EDE54: +@080EDE54: pop {r4-r6} pop {r0} bx r0 @@ -452591,7 +452591,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] @@ -452603,7 +452603,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] @@ -452615,7 +452615,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 @@ -452626,17 +452626,17 @@ sub_80EDE98: @ 80EDE98 ldr r7, =0x03005d8c adds r2, r6, 0 movs r1, 0 -_080EDEAC: +@080EDEAC: adds r0, r3, r2 strb r1, [r0] adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0xF - bls _080EDEAC + bls @080EDEAC movs r3, 0 movs r5, 0 -_080EDEBE: +@080EDEBE: ldr r0, [r7] ldr r1, =0x00001aae adds r0, r1 @@ -452644,67 +452644,67 @@ _080EDEBE: ldrb r4, [r0] adds r3, 0x1 cmp r4, 0 - beq _080EDF0A + beq @080EDF0A movs r1, 0 ldrb r0, [r6] cmp r0, 0 - bne _080EDEE8 + bne @080EDEE8 strb r4, [r6] - b _080EDF04 + b @080EDF04 .align 2, 0 .pool -_080EDEE8: +@080EDEE8: adds r0, r1, r6 ldrb r0, [r0] cmp r0, r4 - beq _080EDF0A + beq @080EDF0A adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xF - bhi _080EDF0A + bhi @080EDF0A adds r2, r1, r6 ldrb r0, [r2] cmp r0, 0 - bne _080EDEE8 + bne @080EDEE8 strb r4, [r2] -_080EDF04: +@080EDF04: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_080EDF0A: +@080EDF0A: lsls r0, r3, 24 lsrs r3, r0, 24 cmp r3, 0xF - bls _080EDEBE + bls @080EDEBE cmp r5, 0x4 - bls _080EDF1E + bls @080EDF1E movs r0, 0x4 mov r1, r8 strb r0, [r1, 0x3] - b _080EDF22 -_080EDF1E: + b @080EDF22 +@080EDF1E: mov r0, r8 strb r5, [r0, 0x3] -_080EDF22: +@080EDF22: mov r1, r8 ldrb r0, [r1, 0x3] cmp r0, 0 - beq _080EDFA4 + beq @080EDFA4 cmp r0, 0x1 - bne _080EDF34 + bne @080EDF34 ldrb r0, [r6] strb r0, [r1, 0x4] - b _080EDFA4 -_080EDF34: + b @080EDFA4 +@080EDF34: movs r6, 0 adds r7, r5, 0 muls r7, r5 cmp r6, r7 - bge _080EDF7E + bge @080EDF7E ldr r0, =0x030060d0 mov r9, r0 -_080EDF42: +@080EDF42: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -452730,17 +452730,17 @@ _080EDF42: lsls r0, 16 lsrs r6, r0, 16 cmp r6, r7 - blt _080EDF42 -_080EDF7E: + blt @080EDF42 +@080EDF7E: movs r3, 0 mov r1, r8 ldrb r1, [r1, 0x3] cmp r3, r1 - bcs _080EDFA4 + bcs @080EDFA4 mov r2, r8 adds r2, 0x4 ldr r4, =0x030060d0 -_080EDF8E: +@080EDF8E: adds r1, r2, r3 adds r0, r3, r4 ldrb r0, [r0] @@ -452751,8 +452751,8 @@ _080EDF8E: mov r0, r8 ldrb r0, [r0, 0x3] cmp r3, r0 - bcc _080EDF8E -_080EDFA4: + bcc @080EDF8E +@080EDFA4: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -452764,7 +452764,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 @@ -452776,7 +452776,7 @@ sub_80EDFB4: @ 80EDFB4 mov r9, r0 ldr r1, =0x030060c0 mov r8, r1 -_080EDFCA: +@080EDFCA: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 @@ -452786,12 +452786,12 @@ _080EDFCA: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _080EE094 + beq @080EE094 adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _080EE094 + bne @080EE094 adds r0, r4, 0 movs r1, 0x38 bl pokemon_getattr @@ -452811,53 +452811,53 @@ _080EDFCA: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - beq _080EE020 + beq @080EE020 mov r0, r8 strh r1, [r0] movs r5, 0x1 -_080EE020: +@080EE020: adds r0, r4, 0 movs r1, 0xE bl pokemon_getattr lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - beq _080EE03C + beq @080EE03C lsls r0, r5, 1 add r0, r8 strh r1, [r0] adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_080EE03C: +@080EE03C: adds r0, r4, 0 movs r1, 0xF bl pokemon_getattr lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - beq _080EE058 + beq @080EE058 lsls r0, r5, 1 add r0, r8 strh r1, [r0] adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_080EE058: +@080EE058: adds r0, r4, 0 movs r1, 0x10 bl pokemon_getattr lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - beq _080EE074 + beq @080EE074 lsls r0, r5, 1 add r0, r8 strh r1, [r0] adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_080EE074: +@080EE074: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -452872,18 +452872,18 @@ _080EE074: lsls r0, 24 lsrs r0, 24 mov r9, r0 -_080EE094: +@080EE094: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x5 - bls _080EDFCA + bls @080EDFCA movs r7, 0 movs r1, 0 cmp r1, r9 - bcs _080EE0BE + bcs @080EE0BE ldr r2, =0x030060e0 -_080EE0A8: +@080EE0A8: lsls r0, r7, 3 adds r0, r2 ldrb r0, [r0] @@ -452894,8 +452894,8 @@ _080EE0A8: lsls r0, 24 lsrs r7, r0, 24 cmp r7, r9 - bcc _080EE0A8 -_080EE0BE: + bcc @080EE0A8 +@080EE0BE: adds r0, r1, 0 mov r1, r9 bl __divsi3 @@ -452927,7 +452927,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 @@ -452944,7 +452944,7 @@ sub_80EE104: @ 80EE104 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080EE168 + beq @080EE168 movs r1, 0 ldrsb r1, [r2, r1] lsls r0, r1, 3 @@ -452972,7 +452972,7 @@ sub_80EE104: @ 80EE104 ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0xC] -_080EE168: +@080EE168: pop {r4} pop {r0} bx r0 @@ -452981,7 +452981,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] @@ -452995,18 +452995,18 @@ sub_80EE184: @ 80EE184 movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _080EE1A4 - b _080EE2C2 -_080EE1A4: + bne @080EE1A4 + b @080EE2C2 +@080EE1A4: movs r0, 0x1E movs r1, 0 bl sub_80EF46C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080EE1B6 - b _080EE2C2 -_080EE1B6: + bne @080EE1B6 + b @080EE2C2 +@080EE1B6: movs r1, 0 ldrsb r1, [r4, r1] lsls r0, r1, 3 @@ -453025,7 +453025,7 @@ _080EE1B6: ldr r7, =0x03005d90 adds r2, r6, 0 adds r2, 0x36 -_080EE1DA: +@080EE1DA: adds r0, r1, r2 ldrb r0, [r0] adds r0, r5, r0 @@ -453035,16 +453035,16 @@ _080EE1DA: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xA - bls _080EE1DA + bls @080EE1DA ldrb r1, [r6, 0x5] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080EE1FE + beq @080EE1FE adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 -_080EE1FE: +@080EE1FE: ldrb r0, [r3, 0x14] strb r0, [r4, 0x4] adds r0, r4, 0 @@ -453057,80 +453057,80 @@ _080EE1FE: ldrb r0, [r0] subs r0, 0x1 cmp r0, 0x9 - bhi _080EE282 + bhi @080EE282 lsls r0, 2 - ldr r1, =_080EE244 + ldr r1, =@080EE244 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080EE244: - .4byte _080EE276 - .4byte _080EE26C - .4byte _080EE26C - .4byte _080EE27A - .4byte _080EE27A - .4byte _080EE27E - .4byte _080EE272 - .4byte _080EE27A - .4byte _080EE282 - .4byte _080EE27E -_080EE26C: +@080EE244: + .4byte @080EE276 + .4byte @080EE26C + .4byte @080EE26C + .4byte @080EE27A + .4byte @080EE27A + .4byte @080EE27E + .4byte @080EE272 + .4byte @080EE27A + .4byte @080EE282 + .4byte @080EE27E +@080EE26C: movs r0, 0 strb r0, [r4] - b _080EE2C2 -_080EE272: + b @080EE2C2 +@080EE272: movs r0, 0 - b _080EE280 -_080EE276: + b @080EE280 +@080EE276: movs r0, 0x1 - b _080EE280 -_080EE27A: + b @080EE280 +@080EE27A: movs r0, 0x2 - b _080EE280 -_080EE27E: + b @080EE280 +@080EE27E: movs r0, 0x3 -_080EE280: +@080EE280: strb r0, [r4, 0x5] -_080EE282: +@080EE282: ldr r1, =0x03005d10 ldrh r0, [r1, 0x20] strh r0, [r4, 0x2] ldrb r0, [r4, 0x5] cmp r0, 0x1 - beq _080EE2B2 + beq @080EE2B2 cmp r0, 0x1 - bgt _080EE2B6 + bgt @080EE2B6 cmp r0, 0 - bne _080EE2B6 + bne @080EE2B6 ldrb r1, [r1, 0x5] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080EE2A8 + beq @080EE2A8 movs r0, 0x1 - b _080EE2AC + b @080EE2AC .align 2, 0 .pool -_080EE2A8: +@080EE2A8: lsls r0, r1, 26 lsrs r0, 28 -_080EE2AC: +@080EE2AC: strh r0, [r4, 0x6] strh r5, [r4, 0x8] - b _080EE2B6 -_080EE2B2: + b @080EE2B6 +@080EE2B2: ldrh r0, [r1, 0x22] strh r0, [r4, 0xC] -_080EE2B6: +@080EE2B6: adds r0, r4, 0 bl sub_80EC9E8 ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0xE] -_080EE2C2: +@080EE2C2: pop {r4-r7} pop {r0} bx r0 @@ -453139,7 +453139,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] @@ -453153,14 +453153,14 @@ sub_80EE2CC: @ 80EE2CC movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080EE33A + beq @080EE33A movs r0, 0x20 movs r1, 0 bl sub_80EF46C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080EE33A + beq @080EE33A movs r1, 0 ldrsb r1, [r4, r1] lsls r0, r1, 3 @@ -453191,7 +453191,7 @@ sub_80EE2CC: @ 80EE2CC ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x5] -_080EE33A: +@080EE33A: pop {r4-r6} pop {r0} bx r0 @@ -453200,7 +453200,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 @@ -453233,14 +453233,14 @@ sub_80EE35C: @ 80EE35C movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080EE426 + beq @080EE426 movs r0, 0x21 movs r1, 0 bl sub_80EF46C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080EE426 + beq @080EE426 movs r1, 0 ldrsb r1, [r4, r1] lsls r0, r1, 3 @@ -453271,26 +453271,26 @@ sub_80EE35C: @ 80EE35C movs r3, 0 adds r5, r4, 0 adds r5, 0x8 -_080EE3EE: +@080EE3EE: cmp r2, r6 - beq _080EE408 + beq @080EE408 lsls r0, r2, 1 adds r0, r7 ldrh r1, [r0] cmp r1, 0 - beq _080EE408 + beq @080EE408 lsls r0, r3, 1 adds r0, r5, r0 strh r1, [r0] adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 -_080EE408: +@080EE408: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls _080EE3EE + bls @080EE3EE strb r3, [r4, 0x10] mov r2, sp ldrh r2, [r2] @@ -453300,7 +453300,7 @@ _080EE408: ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x11] -_080EE426: +@080EE426: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -453314,7 +453314,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} @@ -453335,14 +453335,14 @@ sub_80EE44C: @ 80EE44C movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080EE4BE + beq @080EE4BE movs r0, 0x27 movs r1, 0 bl sub_80EF46C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080EE4BE + beq @080EE4BE movs r1, 0 ldrsb r1, [r4, r1] lsls r0, r1, 3 @@ -453368,7 +453368,7 @@ sub_80EE44C: @ 80EE44C ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x4] -_080EE4BE: +@080EE4BE: pop {r3} mov r8, r3 pop {r4-r7} @@ -453379,7 +453379,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} @@ -453399,14 +453399,14 @@ sub_80EE4DC: @ 80EE4DC movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080EE59A + beq @080EE59A movs r0, 0x23 movs r1, 0 bl sub_80EF46C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080EE59A + beq @080EE59A movs r1, 0 ldrsb r1, [r4, r1] lsls r0, r1, 3 @@ -453443,24 +453443,24 @@ sub_80EE4DC: @ 80EE4DC ldrb r0, [r0] strb r0, [r5, 0xF] cmp r0, 0x1 - beq _080EE578 + beq @080EE578 adds r0, r6, 0 movs r1, 0x3 bl pokemon_getattr cmp r0, 0x1 - bne _080EE590 -_080EE578: + bne @080EE590 +@080EE578: movs r0, 0x1 - b _080EE598 + b @080EE598 .align 2, 0 .pool -_080EE590: +@080EE590: adds r0, r6, 0 movs r1, 0x3 bl pokemon_getattr -_080EE598: +@080EE598: strb r0, [r5, 0x10] -_080EE59A: +@080EE59A: pop {r3} mov r8, r3 pop {r4-r7} @@ -453469,7 +453469,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 @@ -453580,101 +453580,101 @@ 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 cmp r0, 0x43 - beq _080EE722 + beq @080EE722 cmp r0, 0x32 - bne _080EE6AE + bne @080EE6AE movs r0, 0x1 - b _080EE728 -_080EE6AE: + b @080EE728 +@080EE6AE: cmp r0, 0x33 - bne _080EE6B6 + bne @080EE6B6 movs r0, 0x5 - b _080EE728 -_080EE6B6: + b @080EE728 +@080EE6B6: cmp r0, 0x34 - bne _080EE6BE + bne @080EE6BE movs r0, 0x9 - b _080EE728 -_080EE6BE: + b @080EE728 +@080EE6BE: cmp r0, 0x35 - bne _080EE6C6 + bne @080EE6C6 movs r0, 0xD - b _080EE728 -_080EE6C6: + b @080EE728 +@080EE6C6: cmp r0, 0x36 - bne _080EE6CE + bne @080EE6CE movs r0, 0x11 - b _080EE728 -_080EE6CE: + b @080EE728 +@080EE6CE: cmp r0, 0x44 - bne _080EE6D6 + bne @080EE6D6 movs r0, 0x15 - b _080EE728 -_080EE6D6: + b @080EE728 +@080EE6D6: cmp r0, 0x45 - bne _080EE6DE + bne @080EE6DE movs r0, 0x16 - b _080EE728 -_080EE6DE: + b @080EE728 +@080EE6DE: cmp r0, 0x46 - bne _080EE6E6 + bne @080EE6E6 movs r0, 0x17 - b _080EE728 -_080EE6E6: + b @080EE728 +@080EE6E6: cmp r0, 0x47 - bne _080EE6EE + bne @080EE6EE movs r0, 0x18 - b _080EE728 -_080EE6EE: + b @080EE728 +@080EE6EE: cmp r0, 0x48 - bne _080EE6F6 + bne @080EE6F6 movs r0, 0x19 - b _080EE728 -_080EE6F6: + b @080EE728 +@080EE6F6: cmp r0, 0x49 - bne _080EE6FE + bne @080EE6FE movs r0, 0x1A - b _080EE728 -_080EE6FE: + b @080EE728 +@080EE6FE: cmp r0, 0x4A - bne _080EE706 + bne @080EE706 movs r0, 0x1B - b _080EE728 -_080EE706: + b @080EE728 +@080EE706: cmp r0, 0x4B - bne _080EE70E + bne @080EE70E movs r0, 0x1C - b _080EE728 -_080EE70E: + b @080EE728 +@080EE70E: cmp r0, 0x4C - bne _080EE716 + bne @080EE716 movs r0, 0x1D - b _080EE728 -_080EE716: + b @080EE728 +@080EE716: cmp r0, 0x4D - bne _080EE71E + bne @080EE71E movs r0, 0x1E - b _080EE728 -_080EE71E: + b @080EE728 +@080EE71E: cmp r0, 0x4E - beq _080EE726 -_080EE722: + beq @080EE726 +@080EE722: movs r0, 0 - b _080EE728 -_080EE726: + b @080EE728 +@080EE726: movs r0, 0x1F -_080EE728: +@080EE728: pop {r1} bx r1 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] @@ -453688,14 +453688,14 @@ sub_80EE72C: @ 80EE72C movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080EE79C + beq @080EE79C movs r0, 0x22 movs r1, 0 bl sub_80EF46C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080EE79C + beq @080EE79C movs r1, 0 ldrsb r1, [r4, r1] lsls r0, r1, 3 @@ -453727,7 +453727,7 @@ sub_80EE72C: @ 80EE72C ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x8] -_080EE79C: +@080EE79C: pop {r4-r6} pop {r0} bx r0 @@ -453736,7 +453736,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] @@ -453750,33 +453750,33 @@ sub_80EE7C0: @ 80EE7C0 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080EE810 + beq @080EE810 movs r0, 0xB bl sub_80EF550 ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x1 - beq _080EE810 + beq @080EE810 ldr r0, [r4] ldr r1, =0x00003150 adds r0, r1 ldrb r0, [r0] cmp r0, 0xFF - beq _080EE810 + beq @080EE810 movs r0, 0 - b _080EE812 + b @080EE812 .align 2, 0 .pool -_080EE810: +@080EE810: movs r0, 0x1 -_080EE812: +@080EE812: pop {r4} pop {r1} bx r1 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 @@ -453784,7 +453784,7 @@ sub_80EE818: @ 80EE818 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080EE870 + bne @080EE870 ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000027cc @@ -453793,14 +453793,14 @@ sub_80EE818: @ 80EE818 adds r4, r0, 0 movs r6, 0x5 lsrs r5, r4, 8 -_080EE83C: +@080EE83C: lsls r0, r6, 3 adds r0, r6 lsls r0, 2 adds r1, r0, r7 ldrb r0, [r1] cmp r0, 0x24 - bne _080EE866 + bne @080EE866 movs r3, 0xFF adds r0, r4, 0 ands r0, r3 @@ -453808,20 +453808,20 @@ _080EE83C: adds r2, 0x22 ldrb r2, [r2] cmp r0, r2 - bne _080EE866 + bne @080EE866 adds r0, r5, 0 ands r0, r3 adds r1, 0x23 ldrb r1, [r1] cmp r0, r1 - beq _080EE89C -_080EE866: + beq @080EE89C +@080EE866: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x17 - bls _080EE83C -_080EE870: + bls @080EE83C +@080EE870: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000027cc @@ -453834,12 +453834,12 @@ _080EE870: movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080EE8C0 + beq @080EE8C0 movs r0, 0x1 - b _080EE8C2 + b @080EE8C2 .align 2, 0 .pool -_080EE89C: +@080EE89C: ldr r5, =0x03005d8c ldr r0, [r5] ldr r4, =0x000027cc @@ -453850,19 +453850,19 @@ _080EE89C: adds r0, r4 bl sub_80EF93C movs r0, 0x1 - b _080EE8C2 + b @080EE8C2 .align 2, 0 .pool -_080EE8C0: +@080EE8C0: movs r0, 0 -_080EE8C2: +@080EE8C2: pop {r4-r7} pop {r1} bx r1 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} @@ -453882,9 +453882,9 @@ sub_80EE8C8: @ 80EE8C8 movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _080EE8F4 - b _080EEA52 -_080EE8F4: + bne @080EE8F4 + b @080EEA52 +@080EE8F4: movs r1, 0 ldrsb r1, [r2, r1] lsls r0, r1, 3 @@ -453907,32 +453907,32 @@ _080EE8F4: strb r4, [r7, 0xD] subs r0, r4, 0x1 cmp r0, 0xC - bls _080EE926 - b _080EEA46 -_080EE926: + bls @080EE926 + b @080EEA46 +@080EE926: lsls r0, 2 - ldr r1, =_080EE944 + ldr r1, =@080EE944 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080EE944: - .4byte _080EE978 - .4byte _080EE9A8 - .4byte _080EE9E8 - .4byte _080EEA00 - .4byte _080EE978 - .4byte _080EE978 - .4byte _080EE978 - .4byte _080EE978 - .4byte _080EE978 - .4byte _080EE978 - .4byte _080EE978 - .4byte _080EE978 - .4byte _080EE978 -_080EE978: +@080EE944: + .4byte @080EE978 + .4byte @080EE9A8 + .4byte @080EE9E8 + .4byte @080EEA00 + .4byte @080EE978 + .4byte @080EE978 + .4byte @080EE978 + .4byte @080EE978 + .4byte @080EE978 + .4byte @080EE978 + .4byte @080EE978 + .4byte @080EE978 + .4byte @080EE978 +@080EE978: ldr r4, =0x020244ec adds r0, r4, 0 movs r1, 0xB @@ -453951,10 +453951,10 @@ _080EE978: movs r2, 0 bl pokemon_getattr strh r0, [r7, 0x8] - b _080EEA46 + b @080EEA46 .align 2, 0 .pool -_080EE9A8: +@080EE9A8: ldr r4, =0x020244ec adds r0, r4, 0 movs r1, 0xB @@ -453980,10 +453980,10 @@ _080EE9A8: movs r2, 0 bl pokemon_getattr strh r0, [r7, 0xA] - b _080EEA46 + b @080EEA46 .align 2, 0 .pool -_080EE9E8: +@080EE9E8: ldr r4, =0x020244ec adds r0, r4, 0 movs r1, 0xB @@ -453992,10 +453992,10 @@ _080EE9E8: strh r0, [r7, 0x4] adds r4, 0x64 adds r0, r4, 0 - b _080EEA3C + b @080EEA3C .align 2, 0 .pool -_080EEA00: +@080EEA00: ldr r2, =0x03005d8c mov r8, r2 ldr r6, =0x03005d90 @@ -454025,18 +454025,18 @@ _080EEA00: mov r2, r8 ldr r0, [r2] adds r0, r1 -_080EEA3C: +@080EEA3C: movs r1, 0xB movs r2, 0 bl pokemon_getattr strh r0, [r7, 0x6] -_080EEA46: +@080EEA46: adds r0, r7, 0 bl sub_80EC9E8 ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r7, 0xC] -_080EEA52: +@080EEA52: pop {r3} mov r8, r3 pop {r4-r7} @@ -454047,7 +454047,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 @@ -454056,9 +454056,9 @@ sub_80EEA70: @ 80EEA70 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080EEA86 - b _080EEB8C -_080EEA86: + bne @080EEA86 + b @080EEB8C +@080EEA86: ldr r7, =0x03005d8c ldr r0, [r7] ldr r1, =0x000027cc @@ -454071,7 +454071,7 @@ _080EEA86: movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080EEB8C + beq @080EEB8C movs r1, 0 ldrsb r1, [r2, r1] lsls r0, r1, 3 @@ -454121,7 +454121,7 @@ _080EEA86: ldrb r0, [r0] strb r0, [r5, 0x1B] cmp r0, 0x1 - beq _080EEB3A + beq @080EEB3A ldr r4, [r7] ldr r6, =0x00004054 adds r0, r6, 0 @@ -454136,13 +454136,13 @@ _080EEA86: adds r4, r0 ldrb r0, [r4] cmp r0, 0x1 - bne _080EEB70 -_080EEB3A: + bne @080EEB70 +@080EEB3A: movs r0, 0x1 - b _080EEB8A + b @080EEB8A .align 2, 0 .pool -_080EEB70: +@080EEB70: adds r0, r6, 0 bl var_get ldr r2, [r7] @@ -454155,9 +454155,9 @@ _080EEB70: ldr r1, =0x00001aa9 adds r2, r1 ldrb r0, [r2] -_080EEB8A: +@080EEB8A: strb r0, [r5, 0x1C] -_080EEB8C: +@080EEB8C: add sp, 0x20 pop {r4-r7} pop {r0} @@ -454167,21 +454167,21 @@ _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, =0x0858d0ec adds r7, r6, 0x2 - b _080EEBAE + b @080EEBAE .align 2, 0 .pool -_080EEBA8: +@080EEBA8: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_080EEBAE: +@080EEBAE: cmp r5, 0x6 - bhi _080EEBCE + bhi @080EEBCE lsls r4, r5, 2 adds r0, r4, r6 ldrh r0, [r0] @@ -454191,13 +454191,13 @@ _080EEBAE: lsrs r0, 16 ldrh r4, [r4] cmp r0, r4 - bcc _080EEBA8 + bcc @080EEBA8 adds r0, r5, 0 bl sub_80EEBF4 -_080EEBCE: +@080EEBCE: movs r5, 0 ldr r4, =0x0858d0ec -_080EEBD2: +@080EEBD2: lsls r0, r5, 2 adds r0, r4 ldrh r0, [r0] @@ -454207,7 +454207,7 @@ _080EEBD2: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x6 - bls _080EEBD2 + bls @080EEBD2 pop {r4-r7} pop {r0} bx r0 @@ -454216,7 +454216,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 @@ -454235,7 +454235,7 @@ sub_80EEBF4: @ 80EEBF4 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080EEC60 + beq @080EEC60 movs r1, 0 ldrsb r1, [r2, r1] lsls r0, r1, 3 @@ -454266,7 +454266,7 @@ sub_80EEBF4: @ 80EEBF4 ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x5] -_080EEC60: +@080EEC60: pop {r4,r5} pop {r0} bx r0 @@ -454275,7 +454275,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 @@ -454294,7 +454294,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 @@ -454313,7 +454313,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 @@ -454332,7 +454332,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 @@ -454351,7 +454351,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 @@ -454370,7 +454370,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 @@ -454391,7 +454391,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 @@ -454413,13 +454413,13 @@ 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 flag_check lsls r0, 24 cmp r0, 0 - beq _080EEE0C + beq @080EEE0C ldr r6, =0x03005d8c ldr r0, [r6] ldr r7, =0x00002b50 @@ -454432,13 +454432,13 @@ sub_80EED88: @ 80EED88 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080EEE0C + beq @080EEE0C ldr r0, =0x0000028f bl sub_80EFB38 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080EEE0C + beq @080EEE0C bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -454450,7 +454450,7 @@ sub_80EED88: @ 80EED88 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080EEE0C + beq @080EEE0C ldr r1, [r6] movs r0, 0 ldrsb r0, [r5, r0] @@ -454475,7 +454475,7 @@ sub_80EED88: @ 80EED88 adds r2, r0 movs r0, 0x1 strb r0, [r2] -_080EEE0C: +@080EEE0C: pop {r4-r7} pop {r0} bx r0 @@ -454484,53 +454484,53 @@ _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 -_080EEE36: +@080EEE36: lsls r0, r1, 24 asrs r1, r0, 24 lsls r0, r1, 2 adds r0, r2 ldrb r0, [r0] cmp r0, 0 - bne _080EEE48 + bne @080EEE48 adds r0, r1, 0 - b _080EEE58 -_080EEE48: + b @080EEE58 +@080EEE48: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 asrs r0, 24 cmp r0, 0xF - ble _080EEE36 + ble @080EEE36 movs r0, 0x1 negs r0, r0 -_080EEE58: +@080EEE58: pop {r1} bx r1 thumb_func_end sub_80EEE30 thumb_func_start sub_80EEE5C -sub_80EEE5C: @ 80EEE5C +sub_80EEE5C: ; 80EEE5C push {r4,lr} movs r4, 0 -_080EEE60: +@080EEE60: adds r0, r4, 0 bl sub_80EEE78 adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bls _080EEE60 + bls @080EEE60 pop {r4} pop {r0} bx r0 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 @@ -454559,11 +454559,11 @@ 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 -_080EEEBE: +@080EEEBE: ldr r0, =0x03005d8c ldr r0, [r0] lsls r1, r2, 2 @@ -454573,12 +454573,12 @@ _080EEEBE: ldrb r0, [r0] adds r5, r2, 0x1 cmp r0, 0 - bne _080EEF12 + bne @080EEF12 lsls r0, r5, 24 - b _080EEF0C + b @080EEF0C .align 2, 0 .pool -_080EEEE0: +@080EEEE0: ldr r3, [r6] lsls r4, r2, 2 adds r0, r3, r4 @@ -454586,7 +454586,7 @@ _080EEEE0: adds r0, r7 ldrb r0, [r0] cmp r0, 0 - beq _080EEF08 + beq @080EEF08 adds r0, r3, r7 adds r1, r0, r1 adds r0, r4 @@ -454594,81 +454594,81 @@ _080EEEE0: str r0, [r1] adds r0, r2, 0 bl sub_80EEE78 - b _080EEF12 + b @080EEF12 .align 2, 0 .pool -_080EEF08: +@080EEF08: adds r0, r2, 0x1 lsls r0, 24 -_080EEF0C: +@080EEF0C: lsrs r2, r0, 24 cmp r2, 0xF - bls _080EEEE0 -_080EEF12: + bls @080EEEE0 +@080EEF12: lsls r0, r5, 24 lsrs r2, r0, 24 cmp r2, 0xE - bls _080EEEBE + bls @080EEEBE pop {r4-r7} pop {r0} bx r0 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 ldr r3, [r0] -_080EEF28: +@080EEF28: lsls r0, r2, 2 adds r1, r3, r0 ldr r4, =0x00002b50 adds r0, r1, r4 ldrb r0, [r0] cmp r0, 0 - beq _080EEF58 + beq @080EEF58 adds r4, 0x1 adds r0, r1, r4 ldrb r0, [r0] cmp r0, 0x1 - bne _080EEF58 + bne @080EEF58 adds r4, 0x1 adds r0, r1, r4 ldrh r0, [r0] cmp r0, 0x2 - bhi _080EEF58 + bhi @080EEF58 adds r0, r2, 0 - b _080EEF64 + b @080EEF64 .align 2, 0 .pool -_080EEF58: +@080EEF58: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xF - bls _080EEF28 + bls @080EEF28 movs r0, 0xFF -_080EEF64: +@080EEF64: pop {r4} pop {r1} bx r1 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 lsrs r2, r0, 24 cmp r2, 0xFF - bne _080EEF84 + bne @080EEF84 ldr r1, =0x020375f0 movs r0, 0 - b _080EF01A + b @080EF01A .align 2, 0 .pool -_080EEF84: +@080EEF84: ldr r5, =0x03005d8c ldr r0, [r5] lsls r4, r2, 2 @@ -454677,7 +454677,7 @@ _080EEF84: adds r2, r1, r0 ldrh r0, [r2] cmp r0, 0 - bne _080EEFE8 + bne @080EEFE8 ldr r2, =0x00002b51 adds r1, r2 movs r0, 0x2 @@ -454687,30 +454687,30 @@ _080EEF84: lsls r0, 24 asrs r0, 24 cmp r0, 0x13 - bgt _080EEFC8 + bgt @080EEFC8 ldr r1, =0x0858d11c ldr r0, [r5] adds r0, r4 subs r2, 0x1 - b _080EEFD0 + b @080EEFD0 .align 2, 0 .pool -_080EEFC8: +@080EEFC8: ldr r1, =0x0858d130 ldr r0, [r5] adds r0, r4 ldr r2, =0x00002b50 -_080EEFD0: +@080EEFD0: adds r0, r2 ldrb r0, [r0] lsls r0, 2 adds r0, r1 ldr r0, [r0] bl box_related_two__2 - b _080EF016 + b @080EF016 .align 2, 0 .pool -_080EEFE8: +@080EEFE8: ldrh r1, [r2] ldr r0, =0x02021cc4 movs r2, 0 @@ -454732,10 +454732,10 @@ _080EEFE8: adds r0, r1 ldr r0, [r0] bl box_related_two__2 -_080EF016: +@080EF016: ldr r1, =0x020375f0 movs r0, 0x1 -_080EF01A: +@080EF01A: strh r0, [r1] pop {r4,r5} pop {r0} @@ -454745,20 +454745,20 @@ _080EF01A: thumb_func_end sub_80EEF6C thumb_func_start sub_80EF038 -sub_80EF038: @ 80EF038 +sub_80EF038: ; 80EF038 push {r4,r5,lr} lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - bne _080EF048 - b _080EF08A -_080EF044: + bne @080EF048 + b @080EF08A +@080EF044: movs r0, 0x1 - b _080EF08C -_080EF048: + b @080EF08C +@080EF048: movs r2, 0 ldr r4, =0x03005d8c -_080EF04C: +@080EF04C: ldr r1, [r4] lsls r0, r2, 2 adds r1, r0 @@ -454766,71 +454766,71 @@ _080EF04C: adds r0, r1, r5 ldrb r0, [r0] cmp r0, r3 - bne _080EF080 + bne @080EF080 ldr r2, =0x00002b51 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x2 - bne _080EF08A + bne @080EF08A adds r0, r3, 0 bl sub_80EF094 lsls r0, 24 cmp r0, 0 - bne _080EF044 - b _080EF08A + bne @080EF044 + b @080EF08A .align 2, 0 .pool -_080EF080: +@080EF080: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xF - bls _080EF04C -_080EF08A: + bls @080EF04C +@080EF08A: movs r0, 0 -_080EF08C: +@080EF08C: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_80EF038 thumb_func_start sub_80EF094 -sub_80EF094: @ 80EF094 +sub_80EF094: ; 80EF094 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080EF0A6 + beq @080EF0A6 cmp r0, 0x3 - beq _080EF0C8 -_080EF0A2: + beq @080EF0C8 +@080EF0A2: movs r0, 0x1 - b _080EF0D6 -_080EF0A6: + b @080EF0D6 +@080EF0A6: ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] movs r0, 0x80 lsls r0, 1 cmp r1, r0 - bne _080EF0D4 + bne @080EF0D4 ldr r0, =0x020375f2 ldrh r0, [r0] cmp r0, 0x19 - beq _080EF0A2 - b _080EF0D4 + beq @080EF0A2 + b @080EF0D4 .align 2, 0 .pool -_080EF0C8: +@080EF0C8: ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] ldr r0, =0x0000150d cmp r1, r0 - beq _080EF0A2 -_080EF0D4: + beq @080EF0A2 +@080EF0D4: movs r0, 0 -_080EF0D6: +@080EF0D6: pop {r1} bx r1 .align 2, 0 @@ -454838,34 +454838,34 @@ _080EF0D6: thumb_func_end sub_80EF094 thumb_func_start sub_80EF0E4 -sub_80EF0E4: @ 80EF0E4 +sub_80EF0E4: ; 80EF0E4 push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - bne _080EF0F2 -_080EF0EE: + bne @080EF0F2 +@080EF0EE: movs r0, 0x1 - b _080EF112 -_080EF0F2: + b @080EF112 +@080EF0F2: movs r1, 0 ldr r0, =0x03005d8c ldr r3, [r0] ldr r4, =0x00002b50 -_080EF0FA: +@080EF0FA: lsls r0, r1, 2 adds r0, r3, r0 adds r0, r4 ldrb r0, [r0] cmp r0, r2 - beq _080EF0EE + beq @080EF0EE adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xF - bls _080EF0FA + bls @080EF0FA movs r0, 0 -_080EF112: +@080EF112: pop {r4} pop {r1} bx r1 @@ -454874,7 +454874,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} @@ -454883,7 +454883,7 @@ sub_80EF120: @ 80EF120 movs r6, 0 ldr r0, =0x03005d8c mov r8, r0 -_080EF130: +@080EF130: mov r1, r8 ldr r0, [r1] lsls r1, r6, 2 @@ -454893,35 +454893,35 @@ _080EF130: ldrb r0, [r0] adds r4, r1, 0 cmp r0, 0 - beq _080EF196 + beq @080EF196 ldr r1, =0x00002b52 adds r0, r2, r1 ldrh r0, [r0] cmp r0, r7 - bcs _080EF164 + bcs @080EF164 adds r0, r6, 0 bl sub_80EEE78 - b _080EF196 + b @080EF196 .align 2, 0 .pool -_080EF164: +@080EF164: ldr r5, =0x00002b51 adds r0, r2, r5 ldrb r0, [r0] cmp r0, 0 - bne _080EF186 + bne @080EF186 ldr r0, =0x00000864 bl flag_check lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x1 - bne _080EF186 + bne @080EF186 mov r2, r8 ldr r0, [r2] adds r0, r4 adds r0, r5 strb r1, [r0] -_080EF186: +@080EF186: mov r3, r8 ldr r1, [r3] adds r1, r4 @@ -454930,12 +454930,12 @@ _080EF186: ldrh r0, [r1] subs r0, r7 strh r0, [r1] -_080EF196: +@080EF196: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0xF - bls _080EF130 + bls @080EF130 bl sub_80EEEB8 pop {r3} mov r8, r3 @@ -454947,7 +454947,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 @@ -454955,19 +454955,19 @@ sub_80EF1BC: @ 80EF1BC lsrs r1, 24 adds r2, r1, 0 cmp r1, 0x1 - beq _080EF1FC + beq @080EF1FC cmp r1, 0x1 - bgt _080EF1D6 + bgt @080EF1D6 cmp r1, 0 - beq _080EF1E0 - b _080EF244 -_080EF1D6: + beq @080EF1E0 + b @080EF244 +@080EF1D6: cmp r2, 0x2 - beq _080EF218 + beq @080EF218 cmp r2, 0x3 - beq _080EF234 - b _080EF244 -_080EF1E0: + beq @080EF234 + b @080EF244 +@080EF1E0: ldr r1, =0x0858d144 lsls r0, 2 adds r0, r1 @@ -454975,10 +454975,10 @@ _080EF1E0: ldr r1, =0x0858baf0 ldr r1, [r1, 0x14] bl gf_strcpy - b _080EF244 + b @080EF244 .align 2, 0 .pool -_080EF1FC: +@080EF1FC: ldr r1, =0x0858d144 lsls r0, 2 adds r0, r1 @@ -454986,10 +454986,10 @@ _080EF1FC: ldr r1, =0x0858baf0 ldr r1, [r1, 0x18] bl gf_strcpy - b _080EF244 + b @080EF244 .align 2, 0 .pool -_080EF218: +@080EF218: ldr r1, =0x0858d144 lsls r0, 2 adds r0, r1 @@ -454997,10 +454997,10 @@ _080EF218: ldr r1, =0x0858baf0 ldr r1, [r1, 0x1C] bl gf_strcpy - b _080EF244 + b @080EF244 .align 2, 0 .pool -_080EF234: +@080EF234: ldr r1, =0x0858d144 lsls r0, 2 adds r0, r1 @@ -455008,7 +455008,7 @@ _080EF234: ldr r1, =0x0858baf0 ldr r1, [r1, 0x20] bl gf_strcpy -_080EF244: +@080EF244: pop {r0} bx r0 .align 2, 0 @@ -455016,29 +455016,29 @@ _080EF244: thumb_func_end sub_80EF1BC thumb_func_start sub_80EF250 -sub_80EF250: @ 80EF250 +sub_80EF250: ; 80EF250 push {lr} lsls r0, 24 lsrs r2, r0, 24 lsls r1, 24 lsrs r0, r1, 24 cmp r0, 0x4 - bhi _080EF300 + bhi @080EF300 lsls r0, 2 - ldr r1, =_080EF26C + ldr r1, =@080EF26C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080EF26C: - .4byte _080EF280 - .4byte _080EF29C - .4byte _080EF2B8 - .4byte _080EF2D4 - .4byte _080EF2F0 -_080EF280: +@080EF26C: + .4byte @080EF280 + .4byte @080EF29C + .4byte @080EF2B8 + .4byte @080EF2D4 + .4byte @080EF2F0 +@080EF280: ldr r1, =0x0858d144 lsls r0, r2, 2 adds r0, r1 @@ -455046,10 +455046,10 @@ _080EF280: ldr r1, =0x0858baf0 ldr r1, [r1] bl gf_strcpy - b _080EF300 + b @080EF300 .align 2, 0 .pool -_080EF29C: +@080EF29C: ldr r1, =0x0858d144 lsls r0, r2, 2 adds r0, r1 @@ -455057,10 +455057,10 @@ _080EF29C: ldr r1, =0x0858baf0 ldr r1, [r1, 0x4] bl gf_strcpy - b _080EF300 + b @080EF300 .align 2, 0 .pool -_080EF2B8: +@080EF2B8: ldr r1, =0x0858d144 lsls r0, r2, 2 adds r0, r1 @@ -455068,10 +455068,10 @@ _080EF2B8: ldr r1, =0x0858baf0 ldr r1, [r1, 0x8] bl gf_strcpy - b _080EF300 + b @080EF300 .align 2, 0 .pool -_080EF2D4: +@080EF2D4: ldr r1, =0x0858d144 lsls r0, r2, 2 adds r0, r1 @@ -455079,10 +455079,10 @@ _080EF2D4: ldr r1, =0x0858baf0 ldr r1, [r1, 0xC] bl gf_strcpy - b _080EF300 + b @080EF300 .align 2, 0 .pool -_080EF2F0: +@080EF2F0: ldr r1, =0x0858d144 lsls r0, r2, 2 adds r0, r1 @@ -455090,7 +455090,7 @@ _080EF2F0: ldr r1, =0x0858baf0 ldr r1, [r1, 0x10] bl gf_strcpy -_080EF300: +@080EF300: pop {r0} bx r0 .align 2, 0 @@ -455098,7 +455098,7 @@ _080EF300: thumb_func_end sub_80EF250 thumb_func_start sub_80EF30C -sub_80EF30C: @ 80EF30C +sub_80EF30C: ; 80EF30C push {lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -455122,7 +455122,7 @@ sub_80EF30C: @ 80EF30C thumb_func_end sub_80EF30C thumb_func_start sub_80EF340 -sub_80EF340: @ 80EF340 +sub_80EF340: ; 80EF340 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -455148,90 +455148,90 @@ 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 bl __divsi3 cmp r0, 0 - beq _080EF3FC + beq @080EF3FC adds r0, r4, 0 movs r1, 0x64 bl __divsi3 cmp r0, 0 - bne _080EF38E + bne @080EF38E movs r0, 0x2 - b _080EF406 -_080EF38E: + b @080EF406 +@080EF38E: movs r1, 0xFA lsls r1, 2 adds r0, r4, 0 bl __divsi3 cmp r0, 0 - bne _080EF3A0 + bne @080EF3A0 movs r0, 0x3 - b _080EF406 -_080EF3A0: + b @080EF406 +@080EF3A0: ldr r1, =0x00002710 adds r0, r4, 0 bl __divsi3 cmp r0, 0 - bne _080EF3B4 + bne @080EF3B4 movs r0, 0x4 - b _080EF406 + b @080EF406 .align 2, 0 .pool -_080EF3B4: +@080EF3B4: ldr r1, =0x000186a0 adds r0, r4, 0 bl __divsi3 cmp r0, 0 - bne _080EF3C8 + bne @080EF3C8 movs r0, 0x5 - b _080EF406 + b @080EF406 .align 2, 0 .pool -_080EF3C8: +@080EF3C8: ldr r1, =0x000f4240 adds r0, r4, 0 bl __divsi3 cmp r0, 0 - bne _080EF3DC + bne @080EF3DC movs r0, 0x6 - b _080EF406 + b @080EF406 .align 2, 0 .pool -_080EF3DC: +@080EF3DC: ldr r1, =0x00989680 adds r0, r4, 0 bl __divsi3 cmp r0, 0 - bne _080EF3F0 + bne @080EF3F0 movs r0, 0x7 - b _080EF406 + b @080EF406 .align 2, 0 .pool -_080EF3F0: +@080EF3F0: ldr r1, =0x05f5e100 adds r0, r4, 0 bl __divsi3 cmp r0, 0 - beq _080EF404 -_080EF3FC: + beq @080EF404 +@080EF3FC: movs r0, 0x1 - b _080EF406 + b @080EF406 .align 2, 0 .pool -_080EF404: +@080EF404: movs r0, 0x8 -_080EF406: +@080EF406: pop {r4} pop {r1} bx r1 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} @@ -455241,13 +455241,13 @@ sub_80EF40C: @ 80EF40C mov r8, r0 movs r7, 0 movs r5, 0 -_080EF41E: +@080EF41E: lsls r4, r5, 1 adds r0, r6, 0x6 adds r1, r0, r4 ldrh r0, [r1] cmp r0, 0 - beq _080EF43E + beq @080EF43E bl itemid_get_market_price lsls r0, 16 lsrs r0, 16 @@ -455257,24 +455257,24 @@ _080EF41E: ldrh r1, [r1] muls r0, r1 adds r7, r0 -_080EF43E: +@080EF43E: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x2 - bls _080EF41E + bls @080EF41E ldrb r0, [r6, 0x2] cmp r0, 0x1 - bne _080EF458 + bne @080EF458 asrs r1, r7, 1 mov r0, r8 bl sub_80EF340 - b _080EF460 -_080EF458: + b @080EF460 +@080EF458: mov r0, r8 adds r1, r7, 0 bl sub_80EF340 -_080EF460: +@080EF460: pop {r3} mov r8, r3 pop {r4-r7} @@ -455283,7 +455283,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 @@ -455303,7 +455303,7 @@ sub_80EF46C: @ 80EF46C bl sub_80F0020 adds r7, r0, 0 movs r6, 0x5 -_080EF494: +@080EF494: lsls r0, r6, 3 adds r0, r6 lsls r0, 2 @@ -455311,7 +455311,7 @@ _080EF494: adds r1, r0, r2 ldrb r0, [r1] cmp r0, r10 - bne _080EF4E4 + bne @080EF4E4 movs r3, 0xFF adds r0, r7, 0 ands r0, r3 @@ -455319,16 +455319,16 @@ _080EF494: adds r2, 0x22 ldrb r2, [r2] cmp r0, r2 - bne _080EF4E4 + bne @080EF4E4 lsrs r0, r7, 8 ands r0, r3 adds r1, 0x23 ldrb r1, [r1] cmp r0, r1 - bne _080EF4E4 + bne @080EF4E4 mov r0, r9 cmp r0, 0x1 - bne _080EF4D8 + bne @080EF4D8 ldr r0, [r5] adds r0, r4 adds r1, r6, 0 @@ -455336,19 +455336,19 @@ _080EF494: ldr r0, [r5] adds r0, r4 bl sub_80EF93C -_080EF4D8: +@080EF4D8: movs r0, 0x1 - b _080EF4F0 + b @080EF4F0 .align 2, 0 .pool -_080EF4E4: +@080EF4E4: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x17 - bls _080EF494 + bls @080EF494 movs r0, 0 -_080EF4F0: +@080EF4F0: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -455359,26 +455359,26 @@ _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: +@080EF504: adds r1, r2, 0x1 lsls r0, r1, 24 lsrs r5, r0, 24 adds r7, r1, 0 cmp r5, 0x2 - bhi _080EF53C + bhi @080EF53C ldr r6, =0x02039f80 lsls r0, r2, 2 adds r4, r0, r6 -_080EF516: +@080EF516: lsls r0, r5, 2 adds r3, r0, r6 ldrh r0, [r4, 0x2] ldrh r1, [r3, 0x2] cmp r0, r1 - bcs _080EF532 + bcs @080EF532 ldrh r1, [r4] adds r2, r0, 0 ldrh r0, [r3] @@ -455387,17 +455387,17 @@ _080EF516: strh r0, [r4, 0x2] strh r1, [r3] strh r2, [r3, 0x2] -_080EF532: +@080EF532: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x2 - bls _080EF516 -_080EF53C: + bls @080EF516 +@080EF53C: lsls r0, r7, 24 lsrs r2, r0, 24 cmp r2, 0x1 - bls _080EF504 + bls @080EF504 pop {r4-r7} pop {r0} bx r0 @@ -455406,14 +455406,14 @@ _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 movs r1, 0 ldr r5, =0x03005d8c ldr r4, =0x000027cc -_080EF55C: +@080EF55C: ldr r3, [r5] lsls r0, r1, 3 adds r0, r1 @@ -455422,40 +455422,40 @@ _080EF55C: adds r0, r2, r4 ldrb r0, [r0] cmp r0, r6 - bne _080EF5A4 + bne @080EF5A4 ldr r6, =0x000027cd adds r0, r2, r6 ldrb r2, [r0] cmp r2, 0x1 - bne _080EF590 + bne @080EF590 ldr r0, =0x020375f0 strh r2, [r0] - b _080EF5B2 + b @080EF5B2 .align 2, 0 .pool -_080EF590: +@080EF590: adds r0, r3, r4 bl sub_80EF910 ldr r0, [r5] adds r0, r4 bl sub_80EF93C bl sub_80EFA88 - b _080EF5B2 -_080EF5A4: + b @080EF5B2 +@080EF5A4: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x4 - bls _080EF55C + bls @080EF55C bl sub_80EFA88 -_080EF5B2: +@080EF5B2: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_80EF550 thumb_func_start sub_80EF5B8 -sub_80EF5B8: @ 80EF5B8 +sub_80EF5B8: ; 80EF5B8 push {lr} ldr r1, =0x020375f0 movs r0, 0 @@ -455464,70 +455464,70 @@ sub_80EF5B8: @ 80EF5B8 ldrh r0, [r0] subs r0, 0x1 cmp r0, 0xA - bhi _080EF646 + bhi @080EF646 lsls r0, 2 - ldr r1, =_080EF5E0 + ldr r1, =@080EF5E0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080EF5E0: - .4byte _080EF60C - .4byte _080EF612 - .4byte _080EF618 - .4byte _080EF61E - .4byte _080EF624 - .4byte _080EF62A - .4byte _080EF630 - .4byte _080EF636 - .4byte _080EF63C - .4byte _080EF646 - .4byte _080EF642 -_080EF60C: +@080EF5E0: + .4byte @080EF60C + .4byte @080EF612 + .4byte @080EF618 + .4byte @080EF61E + .4byte @080EF624 + .4byte @080EF62A + .4byte @080EF630 + .4byte @080EF636 + .4byte @080EF63C + .4byte @080EF646 + .4byte @080EF642 +@080EF60C: bl sub_80EF64C - b _080EF646 -_080EF612: + b @080EF646 +@080EF612: bl sub_80EF6C4 - b _080EF646 -_080EF618: + b @080EF646 +@080EF618: bl sub_80EF704 - b _080EF646 -_080EF61E: + b @080EF646 +@080EF61E: bl sub_80EF79C - b _080EF646 -_080EF624: + b @080EF646 +@080EF624: bl sub_80EF7A8 - b _080EF646 -_080EF62A: + b @080EF646 +@080EF62A: bl sub_80EF7B4 - b _080EF646 -_080EF630: + b @080EF646 +@080EF630: bl sub_80EF80C - b _080EF646 -_080EF636: + b @080EF646 +@080EF636: bl sub_80EF7F4 - b _080EF646 -_080EF63C: + b @080EF646 +@080EF63C: bl sub_80EF800 - b _080EF646 -_080EF642: + b @080EF646 +@080EF642: bl sub_80EF84C -_080EF646: +@080EF646: pop {r0} bx r0 thumb_func_end sub_80EF5B8 thumb_func_start sub_80EF64C -sub_80EF64C: @ 80EF64C +sub_80EF64C: ; 80EF64C push {r4,lr} movs r0, 0x1 bl sub_80EF550 ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 - bne _080EF6A0 + bne @080EF6A0 ldr r4, =0x02021cc4 bl sub_8139688 lsls r0, 24 @@ -455558,7 +455558,7 @@ sub_80EF64C: @ 80EF64C adds r0, r1 movs r1, 0x6 bl sub_811F88C -_080EF6A0: +@080EF6A0: pop {r4} pop {r0} bx r0 @@ -455567,14 +455567,14 @@ _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 ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 - bne _080EF6F0 + bne @080EF6F0 ldr r2, =0x03005d8c ldr r0, =0x030060bc movs r1, 0 @@ -455588,7 +455588,7 @@ sub_80EF6C4: @ 80EF6C4 adds r0, r1 movs r1, 0x6 bl sub_811F88C -_080EF6F0: +@080EF6F0: pop {r0} bx r0 .align 2, 0 @@ -455596,14 +455596,14 @@ _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 ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 - bne _080EF774 + bne @080EF774 ldr r6, =0x02021cc4 bl sub_8139688 lsls r0, 24 @@ -455645,7 +455645,7 @@ sub_80EF704: @ 80EF704 adds r0, r1 movs r1, 0x2 bl sub_811F88C -_080EF774: +@080EF774: pop {r4-r6} pop {r0} bx r0 @@ -455654,7 +455654,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] @@ -455664,7 +455664,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 @@ -455673,14 +455673,14 @@ 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 ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 - bne _080EF7E0 + bne @080EF7E0 ldr r2, =0x03005d8c ldr r0, =0x030060bc movs r1, 0 @@ -455694,7 +455694,7 @@ sub_80EF7B4: @ 80EF7B4 adds r0, r1 movs r1, 0x2 bl sub_811F88C -_080EF7E0: +@080EF7E0: pop {r0} bx r0 .align 2, 0 @@ -455702,7 +455702,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 @@ -455711,7 +455711,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 @@ -455720,14 +455720,14 @@ 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 ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 - bne _080EF838 + bne @080EF838 ldr r2, =0x03005d8c ldr r0, =0x030060bc movs r1, 0 @@ -455741,7 +455741,7 @@ sub_80EF80C: @ 80EF80C adds r0, r1 movs r1, 0x1 bl sub_811F88C -_080EF838: +@080EF838: pop {r0} bx r0 .align 2, 0 @@ -455749,14 +455749,14 @@ _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 ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 - bne _080EF878 + bne @080EF878 ldr r2, =0x03005d8c ldr r0, =0x030060bc movs r1, 0 @@ -455770,7 +455770,7 @@ sub_80EF84C: @ 80EF84C adds r0, r1 movs r1, 0x1 bl sub_811F88C -_080EF878: +@080EF878: pop {r0} bx r0 .align 2, 0 @@ -455778,7 +455778,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 @@ -455801,7 +455801,7 @@ sub_80EF88C: @ 80EF88C lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _080EF8EC + bne @080EF8EC adds r0, r5, 0 movs r1, 0xB movs r2, 0 @@ -455813,14 +455813,14 @@ sub_80EF88C: @ 80EF88C adds r1, r6, 0 bl sub_8008C44 cmp r0, 0 - bne _080EF8EC + bne @080EF8EC movs r0, 0 - b _080EF8EE + b @080EF8EE .align 2, 0 .pool -_080EF8EC: +@080EF8EC: movs r0, 0x1 -_080EF8EE: +@080EF8EE: add sp, 0x4 pop {r4-r6} pop {r1} @@ -455828,7 +455828,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 @@ -455841,7 +455841,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 @@ -455855,41 +455855,41 @@ sub_80EF910: @ 80EF910 movs r1, 0 adds r2, 0x2 movs r3, 0 -_080EF92A: +@080EF92A: adds r0, r2, r1 strb r3, [r0] adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x21 - bls _080EF92A + bls @080EF92A pop {r0} bx r0 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 -_080EF942: +@080EF942: lsls r0, r5, 3 adds r0, r5 lsls r1, r0, 2 adds r0, r1, r4 ldrb r0, [r0] cmp r0, 0 - bne _080EF986 + bne @080EF986 adds r0, r5, 0x1 - b _080EF97E -_080EF954: + b @080EF97E +@080EF954: lsls r0, r2, 3 adds r0, r2 lsls r0, 2 adds r3, r0, r4 ldrb r0, [r3] cmp r0, 0 - beq _080EF97C + beq @080EF97C adds r1, r4 adds r0, r3, 0 ldm r0!, {r3,r6,r7} @@ -455901,22 +455901,22 @@ _080EF954: adds r0, r4, 0 adds r1, r2, 0 bl sub_80EF910 - b _080EF986 -_080EF97C: + b @080EF986 +@080EF97C: adds r0, r2, 0x1 -_080EF97E: +@080EF97E: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x4 - bls _080EF954 -_080EF986: + bls @080EF954 +@080EF986: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _080EF942 + bls @080EF942 movs r5, 0x5 -_080EF992: +@080EF992: lsls r0, r5, 3 adds r0, r5 lsls r1, r0, 2 @@ -455924,17 +455924,17 @@ _080EF992: ldrb r0, [r0] adds r5, 0x1 cmp r0, 0 - bne _080EF9D8 + bne @080EF9D8 lsls r0, r5, 24 - b _080EF9D2 -_080EF9A6: + b @080EF9D2 +@080EF9A6: lsls r0, r2, 3 adds r0, r2 lsls r0, 2 adds r3, r0, r4 ldrb r0, [r3] cmp r0, 0 - beq _080EF9CE + beq @080EF9CE adds r1, r4 adds r0, r3, 0 ldm r0!, {r3,r6,r7} @@ -455946,26 +455946,26 @@ _080EF9A6: adds r0, r4, 0 adds r1, r2, 0 bl sub_80EF910 - b _080EF9D8 -_080EF9CE: + b @080EF9D8 +@080EF9CE: adds r0, r2, 0x1 lsls r0, 24 -_080EF9D2: +@080EF9D2: lsrs r2, r0, 24 cmp r2, 0x17 - bls _080EF9A6 -_080EF9D8: + bls @080EF9A6 +@080EF9D8: lsls r0, r5, 24 lsrs r5, r0, 24 cmp r5, 0x17 - bls _080EF992 + bls @080EF992 pop {r4-r7} pop {r0} bx r0 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 @@ -455995,7 +455995,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 @@ -456008,26 +456008,26 @@ sub_80EFA24: @ 80EFA24 lsls r0, 16 lsrs r4, r0, 16 adds r6, r4, 0 - b _080EFA62 + b @080EFA62 .align 2, 0 .pool -_080EFA48: +@080EFA48: cmp r4, 0x1 - bne _080EFA54 + bne @080EFA54 ldr r4, =0x0000019b - b _080EFA5A + b @080EFA5A .align 2, 0 .pool -_080EFA54: +@080EFA54: subs r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 -_080EFA5A: +@080EFA5A: cmp r4, r6 - bne _080EFA62 + bne @080EFA62 adds r4, r5, 0 - b _080EFA7E -_080EFA62: + b @080EFA7E +@080EFA62: adds r0, r4, 0 bl SpeciesToNationalPokedexNum lsls r0, 16 @@ -456037,10 +456037,10 @@ _080EFA62: lsls r0, 24 asrs r0, 24 cmp r0, 0x1 - bne _080EFA48 + bne @080EFA48 cmp r4, r5 - beq _080EFA48 -_080EFA7E: + beq @080EFA48 +@080EFA7E: adds r0, r4, 0 pop {r4-r6} pop {r1} @@ -456048,7 +456048,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] @@ -456067,16 +456067,16 @@ sub_80EFA88: @ 80EFA88 movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _080EFACC + bne @080EFACC ldr r1, =0x020375f0 movs r0, 0x1 - b _080EFAD0 + b @080EFAD0 .align 2, 0 .pool -_080EFACC: +@080EFACC: ldr r1, =0x020375f0 movs r0, 0 -_080EFAD0: +@080EFAD0: strh r0, [r1] pop {r0} bx r0 @@ -456085,40 +456085,40 @@ _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 -_080EFAE2: +@080EFAE2: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 adds r0, r2 ldrb r0, [r0] cmp r0, 0 - bne _080EFAF6 + bne @080EFAF6 lsls r0, r1, 24 asrs r0, 24 - b _080EFB04 -_080EFAF6: + b @080EFB04 +@080EFAF6: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x4 - bls _080EFAE2 + bls @080EFAE2 movs r0, 0x1 negs r0, r0 -_080EFB04: +@080EFB04: pop {r1} bx r1 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 -_080EFB0E: +@080EFB0E: lsls r0, r1, 24 asrs r1, r0, 24 lsls r0, r1, 3 @@ -456127,25 +456127,25 @@ _080EFB0E: adds r0, r2 ldrb r0, [r0] cmp r0, 0 - bne _080EFB24 + bne @080EFB24 adds r0, r1, 0 - b _080EFB34 -_080EFB24: + b @080EFB34 +@080EFB24: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 asrs r0, 24 cmp r0, 0x17 - ble _080EFB0E + ble @080EFB0E movs r0, 0x1 negs r0, r0 -_080EFB34: +@080EFB34: pop {r1} bx r1 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 @@ -456154,19 +456154,19 @@ sub_80EFB38: @ 80EFB38 lsls r0, 16 lsrs r0, 16 cmp r0, r4 - bls _080EFB50 + bls @080EFB50 movs r0, 0x1 - b _080EFB52 -_080EFB50: + b @080EFB52 +@080EFB50: movs r0, 0 -_080EFB52: +@080EFB52: pop {r4} pop {r1} bx r1 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 @@ -456178,24 +456178,24 @@ sub_80EFB58: @ 80EFB58 lsrs r2, r0, 24 adds r5, r4, 0x4 ldr r6, =0x0000ffff - b _080EFB7E + b @080EFB7E .align 2, 0 .pool -_080EFB78: +@080EFB78: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 -_080EFB7E: +@080EFB7E: cmp r2, 0x6 - bne _080EFB84 + bne @080EFB84 movs r2, 0 -_080EFB84: +@080EFB84: lsls r1, r2, 1 adds r0, r5, r1 ldrh r0, [r0] adds r3, r4, 0x4 cmp r0, r6 - beq _080EFB78 + beq @080EFB78 ldr r0, =0x02021ec4 adds r1, r3, r1 ldrh r1, [r1] @@ -456208,16 +456208,16 @@ _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 movs r1, 0 ldrb r0, [r2, 0x4] cmp r0, 0xFF - beq _080EFBD0 + beq @080EFBD0 adds r2, 0x4 -_080EFBB4: +@080EFBB4: adds r0, r2, r1 ldrb r0, [r0] adds r0, r3, r0 @@ -456227,12 +456227,12 @@ _080EFBB4: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xA - bhi _080EFBD0 + bhi @080EFBD0 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0xFF - bne _080EFBB4 -_080EFBD0: + bne @080EFBB4 +@080EFBD0: movs r0, 0x7 ands r3, r0 adds r0, r3, 0 @@ -456241,7 +456241,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 @@ -456263,7 +456263,7 @@ sub_80EFBDC: @ 80EFBDC lsrs r4, 16 movs r2, 0 movs r7, 0xFF -_080EFC06: +@080EFC06: mov r1, sp adds r0, r1, r2 ldrb r1, [r0] @@ -456273,9 +456273,9 @@ _080EFC06: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x2 - bls _080EFC06 + bls @080EFC06 cmp r3, 0 - bne _080EFC72 + bne @080EFC72 mov r4, r8 adds r4, 0xF adds r0, r4, 0 @@ -456283,30 +456283,30 @@ _080EFC06: lsls r0, 16 lsrs r2, r0, 16 cmp r6, 0 - bne _080EFC36 + bne @080EFC36 mov r0, sp adds r1, r4, r5 - b _080EFC40 -_080EFC36: + b @080EFC40 +@080EFC36: cmp r6, 0x1 - bne _080EFC46 + bne @080EFC46 mov r0, sp subs r1, r2, r5 adds r1, r4, r1 -_080EFC40: +@080EFC40: ldrb r1, [r1] strb r1, [r0] - b _080EFC6C -_080EFC46: + b @080EFC6C +@080EFC46: cmp r6, 0x2 - bne _080EFC56 + bne @080EFC56 mov r1, sp adds r0, r4, r5 ldrb r0, [r0] strb r0, [r1] adds r0, r5, 0x1 - b _080EFC66 -_080EFC56: + b @080EFC66 +@080EFC56: mov r1, sp subs r0, r2, 0x2 subs r0, r5 @@ -456315,17 +456315,17 @@ _080EFC56: strb r0, [r1] subs r0, r2, 0x1 subs r0, r5 -_080EFC66: +@080EFC66: adds r0, r4, r0 ldrb r0, [r0] strb r0, [r1, 0x1] -_080EFC6C: +@080EFC6C: mov r2, r8 ldrb r1, [r2, 0x1E] - b _080EFCC8 -_080EFC72: + b @080EFCC8 +@080EFC72: cmp r3, 0x1 - bne _080EFCD0 + bne @080EFCD0 mov r4, r8 adds r4, 0x4 adds r0, r4, 0 @@ -456333,30 +456333,30 @@ _080EFC72: lsls r0, 16 lsrs r2, r0, 16 cmp r6, 0 - bne _080EFC8E + bne @080EFC8E mov r0, sp adds r1, r4, r5 - b _080EFC98 -_080EFC8E: + b @080EFC98 +@080EFC8E: cmp r6, 0x1 - bne _080EFC9E + bne @080EFC9E mov r0, sp subs r1, r2, r5 adds r1, r4, r1 -_080EFC98: +@080EFC98: ldrb r1, [r1] strb r1, [r0] - b _080EFCC4 -_080EFC9E: + b @080EFCC4 +@080EFC9E: cmp r6, 0x2 - bne _080EFCAE + bne @080EFCAE mov r1, sp adds r0, r4, r5 ldrb r0, [r0] strb r0, [r1] adds r0, r5, 0x1 - b _080EFCBE -_080EFCAE: + b @080EFCBE +@080EFCAE: mov r1, sp subs r0, r2, 0x2 subs r0, r5 @@ -456365,18 +456365,18 @@ _080EFCAE: strb r0, [r1] subs r0, r2, 0x1 subs r0, r5 -_080EFCBE: +@080EFCBE: adds r0, r4, r0 ldrb r0, [r0] strb r0, [r1, 0x1] -_080EFCC4: +@080EFCC4: mov r5, r8 ldrb r1, [r5, 0x1F] -_080EFCC8: +@080EFCC8: mov r0, sp bl sub_8009308 - b _080EFD30 -_080EFCD0: + b @080EFD30 +@080EFCD0: movs r0, 0xB muls r4, r0 ldr r7, =0x083185c8 @@ -456385,26 +456385,26 @@ _080EFCD0: lsls r0, 16 lsrs r2, r0, 16 cmp r6, 0 - bne _080EFCF0 + bne @080EFCF0 mov r0, sp adds r1, r5, r4 - b _080EFCFA + b @080EFCFA .align 2, 0 .pool -_080EFCF0: +@080EFCF0: cmp r6, 0x1 - bne _080EFD02 + bne @080EFD02 mov r0, sp subs r1, r2, r5 adds r1, r4 -_080EFCFA: +@080EFCFA: adds r1, r7 ldrb r1, [r1] strb r1, [r0] - b _080EFD30 -_080EFD02: + b @080EFD30 +@080EFD02: cmp r6, 0x2 - bne _080EFD16 + bne @080EFD16 mov r1, sp adds r0, r5, r4 adds r0, r7 @@ -456412,8 +456412,8 @@ _080EFD02: strb r0, [r1] adds r0, r4, 0x1 adds r0, r5, r0 - b _080EFD2A -_080EFD16: + b @080EFD2A +@080EFD16: mov r1, sp subs r0, r2, 0x2 subs r0, r5 @@ -456424,11 +456424,11 @@ _080EFD16: subs r0, r2, 0x1 subs r0, r5 adds r0, r4 -_080EFD2A: +@080EFD2A: adds r0, r7 ldrb r0, [r0] strb r0, [r1, 0x1] -_080EFD30: +@080EFD30: ldr r0, =0x0858d144 mov r2, r9 lsls r1, r2, 2 @@ -456448,7 +456448,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 @@ -456456,7 +456456,7 @@ sub_80EFD54: @ 80EFD54 ldr r0, =0x020375e0 ldrh r2, [r0] ldr r4, =0x000027cc -_080EFD62: +@080EFD62: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 @@ -456464,26 +456464,26 @@ _080EFD62: adds r0, r4 ldrb r0, [r0] cmp r0, r2 - bne _080EFD84 + bne @080EFD84 movs r0, 0x1 - b _080EFD90 + b @080EFD90 .align 2, 0 .pool -_080EFD84: +@080EFD84: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x4 - bls _080EFD62 + bls @080EFD62 movs r0, 0 -_080EFD90: +@080EFD90: pop {r4} pop {r1} bx r1 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] @@ -456499,22 +456499,22 @@ sub_80EFD98: @ 80EFD98 adds r1, r4, 0 bl sub_8008C44 cmp r0, 0 - beq _080EFDD4 + beq @080EFDD4 bl sub_80ED320 movs r0, 0x1 - b _080EFDD6 + b @080EFDD6 .align 2, 0 .pool -_080EFDD4: +@080EFDD4: movs r0, 0 -_080EFDD6: +@080EFDD6: pop {r4} pop {r1} bx r1 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 @@ -456597,7 +456597,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] @@ -456616,7 +456616,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} @@ -456671,7 +456671,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] @@ -456687,7 +456687,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] @@ -456709,7 +456709,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 @@ -456723,16 +456723,16 @@ sub_80EFF9C: @ 80EFF9C movs r2, 0 bl pokemon_getattr cmp r4, r0 - bne _080EFFD0 + bne @080EFFD0 ldr r1, =0x020375f0 movs r0, 0 - b _080EFFD4 + b @080EFFD4 .align 2, 0 .pool -_080EFFD0: +@080EFFD0: ldr r1, =0x020375f0 movs r0, 0x1 -_080EFFD4: +@080EFFD4: strh r0, [r1] pop {r4} pop {r0} @@ -456742,48 +456742,48 @@ _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 adds r2, r1, 0 cmp r1, 0 - beq _080F0016 + beq @080F0016 subs r0, r1, 0x1 lsls r0, 24 lsrs r0, 24 cmp r0, 0x13 - bhi _080EFFFA + bhi @080EFFFA movs r0, 0x2 - b _080F001C -_080EFFFA: + b @080F001C +@080EFFFA: adds r0, r1, 0 subs r0, 0x15 lsls r0, 24 lsrs r0, 24 cmp r0, 0x13 - bhi _080F000A + bhi @080F000A movs r0, 0x3 - b _080F001C -_080F000A: + b @080F001C +@080F000A: adds r0, r2, 0 subs r0, 0x29 lsls r0, 24 lsrs r0, 24 cmp r0, 0x13 - bls _080F001A -_080F0016: + bls @080F001A +@080F0016: movs r0, 0 - b _080F001C -_080F001A: + b @080F001C +@080F001A: movs r0, 0x4 -_080F001C: +@080F001C: pop {r1} bx r1 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] @@ -456802,117 +456802,117 @@ sub_80F0020: @ 80F0020 thumb_func_end sub_80F0020 thumb_func_start sub_80F0040 -sub_80F0040: @ 80F0040 +sub_80F0040: ; 80F0040 push {lr} ldr r0, =0x03005d8c ldr r1, [r0] movs r0, 0x4 ldrsb r0, [r1, r0] cmp r0, 0x1 - bne _080F0060 + bne @080F0060 ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - bne _080F006C + bne @080F006C movs r0, 0x5 ldrsb r0, [r1, r0] cmp r0, 0 - beq _080F0074 -_080F0060: + beq @080F0074 +@080F0060: movs r0, 0 - b _080F009E + b @080F009E .align 2, 0 .pool -_080F006C: +@080F006C: movs r0, 0x5 ldrsb r0, [r1, r0] cmp r0, 0x2 - bne _080F0060 -_080F0074: + bne @080F0060 +@080F0074: ldr r0, =0x000008bd bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080F0092 + beq @080F0092 movs r0, 0x89 lsls r0, 4 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080F009C -_080F0092: + beq @080F009C +@080F0092: movs r0, 0x1 - b _080F009E + b @080F009E .align 2, 0 .pool -_080F009C: +@080F009C: movs r0, 0x2 -_080F009E: +@080F009E: pop {r1} bx r1 thumb_func_end sub_80F0040 thumb_func_start sub_80F00A4 -sub_80F00A4: @ 80F00A4 +sub_80F00A4: ; 80F00A4 push {r4,lr} ldr r0, =0x03005d8c ldr r1, [r0] movs r0, 0x4 ldrsb r0, [r1, r0] cmp r0, 0x1 - bne _080F0104 + bne @080F0104 ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - bne _080F00EC + bne @080F00EC movs r0, 0x5 ldrsb r0, [r1, r0] cmp r0, 0 - bne _080F0104 + bne @080F0104 ldr r0, =0x02021cc4 ldr r1, =0x085ead08 bl gf_strcpy ldr r0, =0x00004003 movs r1, 0x1 bl var_set - b _080F0104 + b @080F0104 .align 2, 0 .pool -_080F00EC: +@080F00EC: movs r0, 0x5 ldrsb r0, [r1, r0] cmp r0, 0x2 - bne _080F0104 + bne @080F0104 ldr r0, =0x02021cc4 ldr r1, =0x085ead08 bl gf_strcpy ldr r0, =0x00004003 movs r1, 0x1 bl var_set -_080F0104: +@080F0104: ldr r4, =0x00004003 adds r0, r4, 0 bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - beq _080F0142 + beq @080F0142 adds r0, r4, 0 bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - beq _080F0158 + beq @080F0158 adds r0, r4, 0 bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - bls _080F016C + bls @080F016C adds r0, r4, 0 bl var_get lsls r0, 16 @@ -456920,46 +456920,46 @@ _080F0104: movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _080F0158 -_080F0142: + bne @080F0158 +@080F0142: ldr r0, =0x02021cc4 ldr r1, =0x085ead08 bl gf_strcpy - b _080F01A8 + b @080F01A8 .align 2, 0 .pool -_080F0158: +@080F0158: ldr r0, =0x02021cc4 ldr r1, =0x085ead04 bl gf_strcpy - b _080F01A8 + b @080F01A8 .align 2, 0 .pool -_080F016C: +@080F016C: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _080F0198 + beq @080F0198 ldr r0, =0x02021cc4 ldr r1, =0x085ead08 bl gf_strcpy adds r0, r4, 0 movs r1, 0x1 bl var_set - b _080F01A8 + b @080F01A8 .align 2, 0 .pool -_080F0198: +@080F0198: ldr r0, =0x02021cc4 ldr r1, =0x085ead04 bl gf_strcpy adds r0, r4, 0 movs r1, 0x2 bl var_set -_080F01A8: +@080F01A8: pop {r4} pop {r0} bx r0 @@ -456968,7 +456968,7 @@ _080F01A8: thumb_func_end sub_80F00A4 thumb_func_start start_menu_append_item -start_menu_append_item: @ 80F01B8 +start_menu_append_item: ; 80F01B8 push {lr} ldr r0, =0x000040bc movs r1, 0 @@ -456988,7 +456988,7 @@ start_menu_append_item: @ 80F01B8 thumb_func_end start_menu_append_item thumb_func_start sub_80F01E8 -sub_80F01E8: @ 80F01E8 +sub_80F01E8: ; 80F01E8 push {r4-r7,lr} mov r7, r8 push {r7} @@ -457001,11 +457001,11 @@ sub_80F01E8: @ 80F01E8 bl malloc mov r8, r0 cmp r0, 0 - bne _080F0206 - b _080F0344 -_080F0206: + bne @080F0206 + b @080F0344 +@080F0206: movs r4, 0 -_080F0208: +@080F0208: lsls r0, r4, 3 subs r0, r4 lsls r0, 5 @@ -457022,14 +457022,14 @@ _080F0208: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _080F0208 + bls @080F0208 mov r5, r8 movs r4, 0 ldr r7, =0x020229e8 - b _080F0276 + b @080F0276 .align 2, 0 .pool -_080F0238: +@080F0238: lsls r0, r4, 3 subs r2, r0, r4 lsls r0, r2, 2 @@ -457039,48 +457039,48 @@ _080F0238: lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bhi _080F025A + bhi @080F025A lsls r0, r2, 5 adds r0, r4 lsls r0, 2 adds r0, r5, r0 bl sub_80F1254 - b _080F0270 -_080F025A: + b @080F0270 +@080F025A: cmp r1, 0x3 - bne _080F0270 + bne @080F0270 ldrh r0, [r3, 0x1A] cmp r0, 0x1 - bne _080F0270 + bne @080F0270 lsls r0, r2, 5 adds r0, r4 lsls r0, 2 adds r0, r5, r0 bl sub_80F12A4 -_080F0270: +@080F0270: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_080F0276: +@080F0276: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bcc _080F0238 + bcc @080F0238 cmp r6, 0x1 - beq _080F02C4 + beq @080F02C4 cmp r6, 0x1 - bgt _080F0290 + bgt @080F0290 cmp r6, 0 - beq _080F029A - b _080F031E -_080F0290: + beq @080F029A + b @080F031E +@080F0290: cmp r6, 0x2 - beq _080F02DC + beq @080F02DC cmp r6, 0x3 - beq _080F0304 - b _080F031E -_080F029A: + beq @080F0304 + b @080F031E +@080F029A: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000027cc @@ -457094,10 +457094,10 @@ _080F029A: ldr r4, =0x00000a8c adds r3, r5, r4 bl sub_80F0358 - b _080F031E + b @080F031E .align 2, 0 .pool -_080F02C4: +@080F02C4: ldr r0, =0x03005d8c ldr r1, [r0] ldr r0, =0x000027cc @@ -457105,10 +457105,10 @@ _080F02C4: movs r3, 0xE1 lsls r3, 3 adds r2, r5, r3 - b _080F02EA + b @080F02EA .align 2, 0 .pool -_080F02DC: +@080F02DC: movs r0, 0xE1 lsls r0, 2 adds r1, r5, r0 @@ -457116,15 +457116,15 @@ _080F02DC: ldr r2, [r0] ldr r3, =0x000027cc adds r2, r3 -_080F02EA: +@080F02EA: ldr r4, =0x00000a8c adds r3, r5, r4 adds r0, r5, 0 bl sub_80F0358 - b _080F031E + b @080F031E .align 2, 0 .pool -_080F0304: +@080F0304: movs r0, 0xE1 lsls r0, 2 adds r1, r5, r0 @@ -457137,7 +457137,7 @@ _080F0304: adds r3, r4 adds r0, r5, 0 bl sub_80F0358 -_080F031E: +@080F031E: ldr r5, =0x03005d8c ldr r0, [r5] ldr r4, =0x000027cc @@ -457151,7 +457151,7 @@ _080F031E: bl sub_80F0B64 mov r0, r8 bl free -_080F0344: +@080F0344: pop {r3} mov r8, r3 pop {r4-r7} @@ -457162,7 +457162,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 @@ -457184,19 +457184,19 @@ sub_80F0358: @ 80F0358 bl sub_8009FCC ldr r1, =0x03001174 strb r0, [r1] -_080F0384: +@080F0384: movs r6, 0 ldr r0, =0x03001174 ldrb r1, [r0] cmp r6, r1 - bcs _080F0384 + bcs @080F0384 mov r10, r0 -_080F0390: +@080F0390: cmp r6, 0 - bne _080F0398 + bne @080F0398 ldr r2, =0x0203a02c strb r6, [r2] -_080F0398: +@080F0398: lsls r4, r6, 2 mov r3, sp adds r0, r3, r4 @@ -457211,7 +457211,7 @@ _080F0398: negs r1, r1 adds r7, r4, 0 cmp r0, r1 - bne _080F03E0 + bne @080F03E0 ldr r1, =0x0203a02c ldrb r0, [r1] adds r0, 0x1 @@ -457221,13 +457221,13 @@ _080F0398: mov r2, r10 ldrb r2, [r2] cmp r0, r2 - beq _080F048C + beq @080F048C adds r6, 0x1 mov r9, r6 - b _080F0470 + b @080F0470 .align 2, 0 .pool -_080F03E0: +@080F03E0: movs r5, 0 mov r3, r10 ldrb r0, [r3] @@ -457235,10 +457235,10 @@ _080F03E0: adds r2, r6, 0x1 mov r9, r2 cmp r5, r0 - bge _080F0456 + bge @080F0456 ldr r3, =0x03001174 mov r8, r3 -_080F03F4: +@080F03F4: adds r0, r6, r5 adds r4, r0, 0x1 mov r0, r8 @@ -457257,7 +457257,7 @@ _080F03F4: movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080F0446 + beq @080F0446 mov r2, r8 ldrb r1, [r2] adds r0, r4, 0 @@ -457275,8 +457275,8 @@ _080F03F4: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080F0456 -_080F0446: + beq @080F0456 +@080F0446: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -457284,13 +457284,13 @@ _080F0446: ldrb r0, [r1] subs r0, 0x1 cmp r5, r0 - blt _080F03F4 -_080F0456: + blt @080F03F4 +@080F0456: mov r2, r10 ldrb r0, [r2] subs r0, 0x1 cmp r5, r0 - bne _080F0470 + bne @080F0470 mov r3, sp adds r0, r3, r7 ldr r0, [r0] @@ -457298,18 +457298,18 @@ _080F0456: ldr r1, =0x03001176 ldrb r1, [r1] bl sub_80EF910 -_080F0470: +@080F0470: mov r1, r9 lsls r0, r1, 24 lsrs r6, r0, 24 mov r2, r10 ldrb r2, [r2] cmp r6, r2 - bcc _080F0390 - b _080F0384 + bcc @080F0390 + b @080F0384 .align 2, 0 .pool -_080F048C: +@080F048C: add sp, 0x20 pop {r3-r5} mov r8, r3 @@ -457321,7 +457321,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 @@ -457344,19 +457344,19 @@ sub_80F049C: @ 80F049C adds r1, r0, 0 ldr r2, [sp] cmp r0, 0x3 - beq _080F050C + beq @080F050C cmp r0, 0x3 - bgt _080F04DC + bgt @080F04DC cmp r0, 0x2 - beq _080F04E2 - b _080F055A + beq @080F04E2 + b @080F055A .align 2, 0 .pool -_080F04DC: +@080F04DC: cmp r1, 0x4 - beq _080F0534 - b _080F055A -_080F04E2: + beq @080F0534 + b @080F055A +@080F04E2: ldr r0, =0x030060bc movs r1, 0 ldrsb r1, [r0, r1] @@ -457373,10 +457373,10 @@ _080F04E2: adds r1, r6, r1 adds r2, r7, 0 bl sub_80F0580 - b _080F0556 + b @080F0556 .align 2, 0 .pool -_080F050C: +@080F050C: ldr r0, =0x030060bc movs r1, 0 ldrsb r1, [r0, r1] @@ -457393,10 +457393,10 @@ _080F050C: adds r1, r6, r1 adds r2, r7, 0 bl sub_80F05E8 - b _080F0556 + b @080F0556 .align 2, 0 .pool -_080F0534: +@080F0534: ldr r0, =0x030060bc movs r1, 0 ldrsb r1, [r0, r1] @@ -457413,23 +457413,23 @@ _080F0534: adds r1, r6, r1 adds r2, r7, 0 bl sub_80F0668 -_080F0556: +@080F0556: lsls r0, 24 lsrs r5, r0, 24 -_080F055A: +@080F055A: cmp r5, 0x1 - beq _080F0568 + beq @080F0568 movs r0, 0 - b _080F0574 + b @080F0574 .align 2, 0 .pool -_080F0568: +@080F0568: ldr r0, =0x03001176 ldrb r1, [r0] adds r0, r6, 0 bl sub_80EF910 movs r0, 0x1 -_080F0574: +@080F0574: add sp, 0x4 pop {r4-r7} pop {r1} @@ -457439,7 +457439,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 @@ -457453,17 +457453,17 @@ sub_80F0580: @ 80F0580 adds r1, 0x22 ldrb r1, [r1] cmp r0, r1 - bne _080F05B0 + bne @080F05B0 lsrs r0, r5, 8 ands r0, r2 adds r1, r4, 0 adds r1, 0x23 ldrb r1, [r1] cmp r0, r1 - bne _080F05B0 + bne @080F05B0 movs r0, 0 - b _080F05E0 -_080F05B0: + b @080F05E0 +@080F05B0: adds r1, r4, 0 adds r1, 0x20 ldrb r0, [r1] @@ -457488,14 +457488,14 @@ _080F05B0: stm r1!, {r2-r4} movs r0, 0x1 strb r0, [r6, 0x1] -_080F05E0: +@080F05E0: pop {r4-r6} pop {r1} bx r1 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 @@ -457509,15 +457509,15 @@ sub_80F05E8: @ 80F05E8 adds r1, 0x20 ldrb r1, [r1] cmp r0, r1 - bne _080F0614 + bne @080F0614 lsrs r0, r2, 8 ands r0, r3 adds r1, r4, 0 adds r1, 0x21 ldrb r1, [r1] cmp r0, r1 - beq _080F0634 -_080F0614: + beq @080F0634 +@080F0614: movs r3, 0xFF adds r0, r2, 0 ands r0, r3 @@ -457526,18 +457526,18 @@ _080F0614: lsrs r5, r2, 8 ldrb r1, [r1] cmp r0, r1 - bne _080F0638 + bne @080F0638 adds r0, r5, 0 ands r0, r3 adds r1, r4, 0 adds r1, 0x23 ldrb r1, [r1] cmp r0, r1 - bne _080F0638 -_080F0634: + bne @080F0638 +@080F0634: movs r0, 0 - b _080F0660 -_080F0638: + b @080F0660 +@080F0638: ldrb r1, [r4, 0x1E] adds r0, r4, 0 adds r0, 0x20 @@ -457558,14 +457558,14 @@ _080F0638: stm r1!, {r2-r4} movs r0, 0x1 strb r0, [r6, 0x1] -_080F0660: +@080F0660: pop {r4-r6} pop {r1} bx r1 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 @@ -457579,17 +457579,17 @@ sub_80F0668: @ 80F0668 adds r1, 0x22 ldrb r1, [r1] cmp r0, r1 - bne _080F0698 + bne @080F0698 lsrs r0, r5, 8 ands r0, r2 adds r1, r4, 0 adds r1, 0x23 ldrb r1, [r1] cmp r0, r1 - bne _080F0698 + bne @080F0698 movs r0, 0 - b _080F06CA -_080F0698: + b @080F06CA +@080F0698: adds r1, r4, 0 adds r1, 0x20 ldrb r0, [r1] @@ -457615,49 +457615,49 @@ _080F0698: movs r0, 0x1 strb r0, [r6, 0x1] strh r0, [r6, 0x16] -_080F06CA: +@080F06CA: pop {r4-r6} pop {r1} bx r1 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 -_080F06D6: +@080F06D6: lsls r0, r2, 3 adds r0, r2 lsls r0, 2 adds r1, r0, r3 ldrb r0, [r1, 0x1] cmp r0, 0 - bne _080F06F6 + bne @080F06F6 ldrb r0, [r1] subs r0, 0x1 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3B - bhi _080F06F6 + bhi @080F06F6 lsls r0, r2, 24 asrs r0, 24 - b _080F0704 -_080F06F6: + b @080F0704 +@080F06F6: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x17 - bls _080F06D6 + bls @080F06D6 movs r0, 0x1 negs r0, r0 -_080F0704: +@080F0704: pop {r1} bx r1 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 @@ -457665,7 +457665,7 @@ sub_80F0708: @ 80F0708 sub sp, 0x8 movs r0, 0 mov r9, r0 -_080F0716: +@080F0716: ldr r3, =0x03005d8c ldr r1, [r3] mov r4, r9 @@ -457678,61 +457678,61 @@ _080F0716: ldrb r0, [r1] adds r7, r2, 0 cmp r0, 0x29 - bls _080F0732 - b _080F0AD8 -_080F0732: + bls @080F0732 + b @080F0AD8 +@080F0732: lsls r0, 2 - ldr r1, =_080F0748 + ldr r1, =@080F0748 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F0748: - .4byte _080F0AE2 - .4byte _080F0848 - .4byte _080F0AE2 - .4byte _080F0860 - .4byte _080F0878 - .4byte _080F0890 - .4byte _080F08BC - .4byte _080F08D4 - .4byte _080F07F0 - .4byte _080F0AE2 - .4byte _080F081C - .4byte _080F0AE2 - .4byte _080F0AE2 - .4byte _080F0AD8 - .4byte _080F0AD8 - .4byte _080F0AD8 - .4byte _080F0AD8 - .4byte _080F0AD8 - .4byte _080F0AD8 - .4byte _080F0AD8 - .4byte _080F0AD8 - .4byte _080F0900 - .4byte _080F0AE2 - .4byte _080F0918 - .4byte _080F0944 - .4byte _080F095C - .4byte _080F0AE2 - .4byte _080F0AE2 - .4byte _080F0AE2 - .4byte _080F0AE2 - .4byte _080F0974 - .4byte _080F09A0 - .4byte _080F0AE2 - .4byte _080F09C0 - .4byte _080F0AE2 - .4byte _080F0AE2 - .4byte _080F09F4 - .4byte _080F0AE2 - .4byte _080F0AE2 - .4byte _080F0AE2 - .4byte _080F0AD8 - .4byte _080F0AE2 -_080F07F0: +@080F0748: + .4byte @080F0AE2 + .4byte @080F0848 + .4byte @080F0AE2 + .4byte @080F0860 + .4byte @080F0878 + .4byte @080F0890 + .4byte @080F08BC + .4byte @080F08D4 + .4byte @080F07F0 + .4byte @080F0AE2 + .4byte @080F081C + .4byte @080F0AE2 + .4byte @080F0AE2 + .4byte @080F0AD8 + .4byte @080F0AD8 + .4byte @080F0AD8 + .4byte @080F0AD8 + .4byte @080F0AD8 + .4byte @080F0AD8 + .4byte @080F0AD8 + .4byte @080F0AD8 + .4byte @080F0900 + .4byte @080F0AE2 + .4byte @080F0918 + .4byte @080F0944 + .4byte @080F095C + .4byte @080F0AE2 + .4byte @080F0AE2 + .4byte @080F0AE2 + .4byte @080F0AE2 + .4byte @080F0974 + .4byte @080F09A0 + .4byte @080F0AE2 + .4byte @080F09C0 + .4byte @080F0AE2 + .4byte @080F0AE2 + .4byte @080F09F4 + .4byte @080F0AE2 + .4byte @080F0AE2 + .4byte @080F0AE2 + .4byte @080F0AD8 + .4byte @080F0AE2 +@080F07F0: ldr r0, [r3] mov r1, r9 adds r4, r7, r1 @@ -457751,10 +457751,10 @@ _080F07F0: adds r4, r0 adds r4, r6 ldrh r0, [r4, 0x2] - b _080F09E6 + b @080F09E6 .align 2, 0 .pool -_080F081C: +@080F081C: ldr r0, [r3] mov r2, r9 adds r4, r7, r2 @@ -457773,10 +457773,10 @@ _080F081C: adds r4, r0 adds r4, r6 ldrh r0, [r4, 0x2] - b _080F09E6 + b @080F09E6 .align 2, 0 .pool -_080F0848: +@080F0848: ldr r0, [r3] mov r4, r9 adds r1, r7, r4 @@ -457785,10 +457785,10 @@ _080F0848: ldr r0, =0x000027cc adds r1, r0 ldrh r0, [r1, 0x2] - b _080F09B0 + b @080F09B0 .align 2, 0 .pool -_080F0860: +@080F0860: ldr r0, [r3] mov r2, r9 adds r1, r7, r2 @@ -457798,10 +457798,10 @@ _080F0860: adds r1, r4 ldrh r0, [r1, 0x2] lsls r1, r2, 24 - b _080F09B2 + b @080F09B2 .align 2, 0 .pool -_080F0878: +@080F0878: ldr r0, [r3] mov r2, r9 adds r1, r7, r2 @@ -457811,10 +457811,10 @@ _080F0878: adds r1, r4 ldrh r0, [r1, 0x6] lsls r1, r2, 24 - b _080F09B2 + b @080F09B2 .align 2, 0 .pool -_080F0890: +@080F0890: ldr r0, [r3] mov r1, r9 adds r4, r7, r1 @@ -457833,10 +457833,10 @@ _080F0890: adds r4, r0 adds r4, r6 ldrh r0, [r4, 0x1C] - b _080F09E6 + b @080F09E6 .align 2, 0 .pool -_080F08BC: +@080F08BC: ldr r0, [r3] mov r2, r9 adds r1, r7, r2 @@ -457846,10 +457846,10 @@ _080F08BC: adds r1, r4 ldrh r0, [r1, 0x2] lsls r1, r2, 24 - b _080F09B2 + b @080F09B2 .align 2, 0 .pool -_080F08D4: +@080F08D4: ldr r0, [r3] mov r1, r9 adds r4, r7, r1 @@ -457868,10 +457868,10 @@ _080F08D4: adds r4, r0 adds r4, r6 ldrh r0, [r4, 0x14] - b _080F09E6 + b @080F09E6 .align 2, 0 .pool -_080F0900: +@080F0900: ldr r0, [r3] mov r2, r9 adds r1, r7, r2 @@ -457881,10 +457881,10 @@ _080F0900: adds r1, r4 ldrh r0, [r1, 0x10] lsls r1, r2, 24 - b _080F09B2 + b @080F09B2 .align 2, 0 .pool -_080F0918: +@080F0918: ldr r0, [r3] mov r1, r9 adds r4, r7, r1 @@ -457903,10 +457903,10 @@ _080F0918: adds r4, r0 adds r4, r6 ldrh r0, [r4, 0xE] - b _080F09E6 + b @080F09E6 .align 2, 0 .pool -_080F0944: +@080F0944: ldr r0, [r3] mov r2, r9 adds r1, r7, r2 @@ -457916,10 +457916,10 @@ _080F0944: adds r1, r4 ldrh r0, [r1, 0x4] lsls r1, r2, 24 - b _080F09B2 + b @080F09B2 .align 2, 0 .pool -_080F095C: +@080F095C: ldr r0, [r3] mov r1, r9 adds r4, r7, r1 @@ -457928,10 +457928,10 @@ _080F095C: ldr r6, =0x000027cc adds r0, r6 ldrh r0, [r0, 0x8] - b _080F09D0 + b @080F09D0 .align 2, 0 .pool -_080F0974: +@080F0974: ldr r0, [r3] mov r2, r9 adds r4, r7, r2 @@ -457950,10 +457950,10 @@ _080F0974: adds r4, r0 adds r4, r6 ldrh r0, [r4, 0xA] - b _080F09E6 + b @080F09E6 .align 2, 0 .pool -_080F09A0: +@080F09A0: ldr r0, [r3] mov r4, r9 adds r1, r7, r4 @@ -457962,15 +457962,15 @@ _080F09A0: ldr r0, =0x000027cc adds r1, r0 ldrh r0, [r1, 0x8] -_080F09B0: +@080F09B0: lsls r1, r4, 24 -_080F09B2: +@080F09B2: lsrs r1, 24 bl sub_80F0B24 - b _080F0AE2 + b @080F0AE2 .align 2, 0 .pool -_080F09C0: +@080F09C0: ldr r0, [r3] mov r1, r9 adds r4, r7, r1 @@ -457979,7 +457979,7 @@ _080F09C0: ldr r6, =0x000027cc adds r0, r6 ldrh r0, [r0, 0x6] -_080F09D0: +@080F09D0: lsls r5, r1, 24 lsrs r5, 24 adds r1, r5, 0 @@ -457990,13 +457990,13 @@ _080F09D0: adds r4, r0 adds r4, r6 ldrh r0, [r4, 0x4] -_080F09E6: +@080F09E6: adds r1, r5, 0 bl sub_80F0B24 - b _080F0AE2 + b @080F0AE2 .align 2, 0 .pool -_080F09F4: +@080F09F4: ldr r0, [r3] mov r2, r9 adds r4, r7, r2 @@ -458026,30 +458026,30 @@ _080F09F4: subs r0, 0x1 mov r6, r8 cmp r0, 0xC - bhi _080F0AE2 + bhi @080F0AE2 lsls r0, 2 - ldr r1, =_080F0A48 + ldr r1, =@080F0A48 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F0A48: - .4byte _080F0A7C - .4byte _080F0AA0 - .4byte _080F0AE2 - .4byte _080F0AE2 - .4byte _080F0A7C - .4byte _080F0A7C - .4byte _080F0A7C - .4byte _080F0A7C - .4byte _080F0A7C - .4byte _080F0A7C - .4byte _080F0A7C - .4byte _080F0A7C - .4byte _080F0A7C -_080F0A7C: +@080F0A48: + .4byte @080F0A7C + .4byte @080F0AA0 + .4byte @080F0AE2 + .4byte @080F0AE2 + .4byte @080F0A7C + .4byte @080F0A7C + .4byte @080F0A7C + .4byte @080F0A7C + .4byte @080F0A7C + .4byte @080F0A7C + .4byte @080F0A7C + .4byte @080F0A7C + .4byte @080F0A7C +@080F0A7C: ldr r0, =0x03005d8c ldr r1, [r0] mov r4, r9 @@ -458061,10 +458061,10 @@ _080F0A7C: ldrh r0, [r0, 0x8] lsrs r1, r6, 24 bl sub_80F0B24 - b _080F0AE2 + b @080F0AE2 .align 2, 0 .pool -_080F0AA0: +@080F0AA0: ldr r2, =0x03005d8c ldr r0, [r2] mov r1, r9 @@ -458085,24 +458085,24 @@ _080F0AA0: ldrh r0, [r4, 0xA] adds r1, r6, 0 bl sub_80F0B24 - b _080F0AE2 + b @080F0AE2 .align 2, 0 .pool -_080F0AD8: +@080F0AD8: mov r2, r9 lsls r0, r2, 24 lsrs r0, 24 bl sub_80F0B00 -_080F0AE2: +@080F0AE2: mov r0, r9 adds r0, 0x1 lsls r0, 16 lsrs r0, 16 mov r9, r0 cmp r0, 0x17 - bhi _080F0AF2 - b _080F0716 -_080F0AF2: + bhi @080F0AF2 + b @080F0716 +@080F0AF2: add sp, 0x8 pop {r3,r4} mov r8, r3 @@ -458113,7 +458113,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 @@ -458132,7 +458132,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 @@ -458146,7 +458146,7 @@ sub_80F0B24: @ 80F0B24 lsls r0, 24 asrs r2, r0, 24 cmp r2, 0 - bne _080F0B56 + bne @080F0B56 ldr r0, =0x03005d8c ldr r1, [r0] lsls r0, r4, 3 @@ -458156,7 +458156,7 @@ sub_80F0B24: @ 80F0B24 ldr r0, =0x000027cd adds r1, r0 strb r2, [r1] -_080F0B56: +@080F0B56: pop {r4} pop {r0} bx r0 @@ -458165,19 +458165,19 @@ _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 flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080F0BA2 + beq @080F0BA2 movs r2, 0 ldr r4, =0x000027cd movs r3, 0 ldr r5, =0x03005d8c -_080F0B7C: +@080F0B7C: ldr r0, [r5] lsls r1, r2, 3 adds r1, r2 @@ -458187,19 +458187,19 @@ _080F0B7C: adds r0, r1, r6 ldrb r0, [r0] cmp r0, 0x7 - beq _080F0B94 + beq @080F0B94 cmp r0, 0x29 - bne _080F0B98 -_080F0B94: + bne @080F0B98 +@080F0B94: adds r0, r1, r4 strb r3, [r0] -_080F0B98: +@080F0B98: adds r0, r2, 0x1 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x17 - bls _080F0B7C -_080F0BA2: + bls @080F0B7C +@080F0BA2: pop {r4-r6} pop {r0} bx r0 @@ -458208,11 +458208,11 @@ _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 -_080F0BBE: +@080F0BBE: ldr r1, [r6] lsls r0, r5, 3 adds r0, r5 @@ -458225,19 +458225,19 @@ _080F0BBE: lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _080F0BE6 + bne @080F0BE6 ldr r0, [r6] adds r0, r4 ldr r1, =0x000027cd adds r0, r1 movs r1, 0 strb r1, [r0] -_080F0BE6: +@080F0BE6: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x4 - bls _080F0BBE + bls @080F0BBE pop {r4-r6} pop {r0} bx r0 @@ -458246,14 +458246,14 @@ _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 ldr r0, =0x03005d8c ldr r4, [r0] ldr r5, =0x000027cc -_080F0C10: +@080F0C10: lsls r0, r2, 24 asrs r1, r0, 24 lsls r0, r1, 3 @@ -458263,28 +458263,28 @@ _080F0C10: adds r0, r5 ldrb r0, [r0] cmp r0, 0 - bne _080F0C2E + bne @080F0C2E lsls r0, r3, 24 movs r2, 0x80 lsls r2, 17 adds r0, r2 lsrs r3, r0, 24 -_080F0C2E: +@080F0C2E: adds r0, r1, 0x1 lsls r0, 24 lsrs r2, r0, 24 asrs r0, 24 cmp r0, 0x17 - ble _080F0C10 + ble @080F0C10 movs r2, 0 lsls r0, r3, 24 asrs r0, 24 movs r1, 0x5 subs r0, r1, r0 cmp r2, r0 - bge _080F0C6E + bge @080F0C6E adds r5, r0, 0 -_080F0C4A: +@080F0C4A: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000027cc @@ -458301,8 +458301,8 @@ _080F0C4A: lsrs r2, r4, 24 asrs r4, 24 cmp r4, r5 - blt _080F0C4A -_080F0C6E: + blt @080F0C4A +@080F0C6E: pop {r4,r5} pop {r0} bx r0 @@ -458311,7 +458311,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} @@ -458324,9 +458324,9 @@ sub_80F0C7C: @ 80F0C7C bl malloc adds r5, r0, 0 cmp r5, 0 - beq _080F0D4C + beq @080F0D4C movs r4, 0 -_080F0C9A: +@080F0C9A: lsls r0, r4, 6 adds r0, r5 adds r1, r4, 0 @@ -458338,21 +458338,21 @@ _080F0C9A: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _080F0C9A + bls @080F0C9A cmp r6, 0x1 - beq _080F0CF0 + beq @080F0CF0 cmp r6, 0x1 - bgt _080F0CC2 + bgt @080F0CC2 cmp r6, 0 - beq _080F0CCC - b _080F0D3E -_080F0CC2: + beq @080F0CCC + b @080F0D3E +@080F0CC2: cmp r6, 0x2 - beq _080F0D08 + beq @080F0D08 cmp r6, 0x3 - beq _080F0D28 - b _080F0D3E -_080F0CCC: + beq @080F0D28 + b @080F0D3E +@080F0CCC: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00002b50 @@ -458364,35 +458364,35 @@ _080F0CCC: adds r3, r5, 0 adds r3, 0xC0 bl sub_80F0D60 - b _080F0D3E + b @080F0D3E .align 2, 0 .pool -_080F0CF0: +@080F0CF0: ldr r0, =0x03005d8c ldr r1, [r0] ldr r0, =0x00002b50 adds r1, r0 adds r2, r5, 0 adds r2, 0x80 - b _080F0D14 + b @080F0D14 .align 2, 0 .pool -_080F0D08: +@080F0D08: adds r1, r5, 0 adds r1, 0x40 ldr r0, =0x03005d8c ldr r2, [r0] ldr r0, =0x00002b50 adds r2, r0 -_080F0D14: +@080F0D14: adds r3, r5, 0 adds r3, 0xC0 adds r0, r5, 0 bl sub_80F0D60 - b _080F0D3E + b @080F0D3E .align 2, 0 .pool -_080F0D28: +@080F0D28: adds r1, r5, 0 adds r1, 0x40 adds r2, r5, 0 @@ -458403,12 +458403,12 @@ _080F0D28: adds r3, r0 adds r0, r5, 0 bl sub_80F0D60 -_080F0D3E: +@080F0D3E: bl sub_80F0EEC bl sub_80F0F24 adds r0, r5, 0 bl free -_080F0D4C: +@080F0D4C: pop {r3} mov r8, r3 pop {r4-r7} @@ -458419,7 +458419,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 @@ -458443,15 +458443,15 @@ sub_80F0D60: @ 80F0D60 strb r0, [r1] movs r0, 0 mov r10, r0 -_080F0D90: +@080F0D90: movs r7, 0 mov r1, r10 adds r1, 0x1 str r1, [sp, 0x20] - b _080F0E28 + b @080F0E28 .align 2, 0 .pool -_080F0DA0: +@080F0DA0: lsls r4, r7, 2 mov r1, sp adds r0, r1, r4 @@ -458469,15 +458469,15 @@ _080F0DA0: movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080F0E22 + beq @080F0E22 movs r5, 0 ldr r1, =0x03001175 ldrb r0, [r1] subs r0, 0x1 cmp r5, r0 - bge _080F0E22 + bge @080F0E22 adds r6, r1, 0 -_080F0DD4: +@080F0DD4: adds r0, r7, r5 adds r4, r0, 0x1 ldrb r1, [r6] @@ -458495,7 +458495,7 @@ _080F0DD4: movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _080F0E14 + beq @080F0E14 ldrb r1, [r6] adds r0, r4, 0 bl __modsi3 @@ -458506,29 +458506,29 @@ _080F0DD4: add r1, r8 ldr r1, [r1] bl sub_80F0E58 -_080F0E14: +@080F0E14: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 ldrb r0, [r6] subs r0, 0x1 cmp r5, r0 - blt _080F0DD4 -_080F0E22: + blt @080F0DD4 +@080F0E22: mov r1, r9 lsls r0, r1, 24 lsrs r7, r0, 24 -_080F0E28: +@080F0E28: ldr r0, =0x03001175 ldrb r0, [r0] cmp r7, r0 - bcc _080F0DA0 + bcc @080F0DA0 ldr r1, [sp, 0x20] lsls r0, r1, 24 lsrs r0, 24 mov r10, r0 cmp r0, 0xF - bls _080F0D90 + bls @080F0D90 add sp, 0x24 pop {r3-r5} mov r8, r3 @@ -458542,7 +458542,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] @@ -458564,7 +458564,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 @@ -458573,25 +458573,25 @@ sub_80F0E84: @ 80F0E84 ldrb r3, [r5] adds r0, r3, 0 cmp r0, 0 - bne _080F0E9A -_080F0E96: + bne @080F0E9A +@080F0E96: movs r0, 0 - b _080F0EC6 -_080F0E9A: + b @080F0EC6 +@080F0E9A: movs r1, 0 adds r2, r3, 0 adds r3, r0, 0 -_080F0EA0: +@080F0EA0: lsls r0, r1, 2 adds r0, r4 ldrb r0, [r0] cmp r0, r3 - beq _080F0E96 + beq @080F0E96 adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xF - bls _080F0EA0 + bls @080F0EA0 lsls r0, r6, 24 asrs r0, 22 adds r0, r4 @@ -458601,14 +458601,14 @@ _080F0EA0: ldrh r1, [r5, 0x2] strh r1, [r0, 0x2] movs r0, 0x1 -_080F0EC6: +@080F0EC6: pop {r4-r6} pop {r1} bx r1 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 @@ -458616,23 +458616,23 @@ sub_80F0ECC: @ 80F0ECC adds r1, r0 ldrb r0, [r1] cmp r0, 0 - beq _080F0EE2 + beq @080F0EE2 lsls r0, r2, 24 asrs r0, 24 - b _080F0EE6 -_080F0EE2: + b @080F0EE6 +@080F0EE2: movs r0, 0x1 negs r0, r0 -_080F0EE6: +@080F0EE6: pop {r1} bx r1 thumb_func_end sub_80F0ECC thumb_func_start sub_80F0EEC -sub_80F0EEC: @ 80F0EEC +sub_80F0EEC: ; 80F0EEC push {r4,lr} movs r4, 0 -_080F0EF0: +@080F0EF0: ldr r0, =0x03005d8c ldr r0, [r0] lsls r1, r4, 2 @@ -458641,15 +458641,15 @@ _080F0EF0: adds r0, r1 ldrb r0, [r0] cmp r0, 0x4 - bls _080F0F08 + bls @080F0F08 adds r0, r4, 0 bl sub_80EEE78 -_080F0F08: +@080F0F08: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bls _080F0EF0 + bls @080F0EF0 bl sub_80EEEB8 pop {r4} pop {r0} @@ -458659,19 +458659,19 @@ _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 flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080F0F50 + beq @080F0F50 movs r2, 0 ldr r5, =0x03005d8c ldr r4, =0x00002b51 movs r3, 0 -_080F0F3C: +@080F0F3C: ldr r0, [r5] lsls r1, r2, 2 adds r0, r1 @@ -458681,8 +458681,8 @@ _080F0F3C: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xF - bls _080F0F3C -_080F0F50: + bls @080F0F3C +@080F0F50: pop {r4,r5} pop {r0} bx r0 @@ -458691,7 +458691,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 @@ -458699,7 +458699,7 @@ sub_80F0F64: @ 80F0F64 bl malloc_and_clear adds r4, r0, 0 movs r7, 0 -_080F0F74: +@080F0F74: lsls r0, r7, 3 adds r1, r0, r7 lsls r1, 2 @@ -458708,60 +458708,60 @@ _080F0F74: subs r1, 0x1 adds r2, r0, 0 cmp r1, 0x28 - bls _080F0F88 - b _080F11F4 -_080F0F88: + bls @080F0F88 + b @080F11F4 +@080F0F88: lsls r0, r1, 2 - ldr r1, =_080F0F98 + ldr r1, =@080F0F98 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F0F98: - .4byte _080F103C - .4byte _080F103C - .4byte _080F105A - .4byte _080F11F4 - .4byte _080F1152 - .4byte _080F111E - .4byte _080F10E6 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F1092 - .4byte _080F10C6 - .4byte _080F118A - .4byte _080F11AA - .4byte _080F11CA - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11F4 - .4byte _080F11EA -_080F103C: +@080F0F98: + .4byte @080F103C + .4byte @080F103C + .4byte @080F105A + .4byte @080F11F4 + .4byte @080F1152 + .4byte @080F111E + .4byte @080F10E6 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F1092 + .4byte @080F10C6 + .4byte @080F118A + .4byte @080F11AA + .4byte @080F11CA + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11F4 + .4byte @080F11EA +@080F103C: adds r0, r2, r7 lsls r0, 2 adds r0, r6, r0 @@ -458769,15 +458769,15 @@ _080F103C: adds r0, 0x10 bl sub_8009228 cmp r0, 0 - beq _080F1056 + beq @080F1056 ldr r1, [r4] movs r0, 0x1 strb r0, [r1, 0x18] - b _080F11F4 -_080F1056: + b @080F11F4 +@080F1056: ldr r0, [r4] - b _080F11F2 -_080F105A: + b @080F11F2 +@080F105A: adds r0, r2, r7 lsls r0, 2 adds r0, r6, r0 @@ -458785,29 +458785,29 @@ _080F105A: adds r0, 0x5 bl sub_8009228 cmp r0, 0 - beq _080F1074 + beq @080F1074 ldr r1, [r4, 0x4] movs r0, 0x1 strb r0, [r1, 0xD] - b _080F1078 -_080F1074: + b @080F1078 +@080F1074: ldr r0, [r4, 0x4] strb r5, [r0, 0xD] -_080F1078: +@080F1078: ldr r0, [r4, 0x4] adds r0, 0x10 bl sub_8009228 cmp r0, 0 - beq _080F108C + beq @080F108C ldr r1, [r4, 0x4] movs r0, 0x1 strb r0, [r1, 0xE] - b _080F11F4 -_080F108C: + b @080F11F4 +@080F108C: ldr r0, [r4, 0x4] strb r5, [r0, 0xE] - b _080F11F4 -_080F1092: + b @080F11F4 +@080F1092: adds r0, r2, r7 lsls r0, 2 adds r0, r6, r0 @@ -458815,27 +458815,27 @@ _080F1092: adds r0, 0x13 bl sub_8009228 cmp r0, 0 - beq _080F10AC + beq @080F10AC ldr r1, [r4, 0x18] movs r0, 0x1 strb r0, [r1, 0x2] - b _080F10B0 -_080F10AC: + b @080F10B0 +@080F10AC: ldr r0, [r4, 0x18] strb r5, [r0, 0x2] -_080F10B0: +@080F10B0: ldr r0, [r4, 0x18] adds r0, 0x4 bl sub_8009228 cmp r0, 0 - beq _080F10C0 + beq @080F10C0 ldr r1, [r4, 0x18] - b _080F10DA -_080F10C0: + b @080F10DA +@080F10C0: ldr r0, [r4, 0x18] strb r5, [r0, 0x3] - b _080F11F4 -_080F10C6: + b @080F11F4 +@080F10C6: adds r0, r2, r7 lsls r0, 2 adds r0, r6, r0 @@ -458843,17 +458843,17 @@ _080F10C6: adds r0, 0x13 bl sub_8009228 cmp r0, 0 - beq _080F10E0 + beq @080F10E0 ldr r1, [r4, 0x1C] -_080F10DA: +@080F10DA: movs r0, 0x1 strb r0, [r1, 0x3] - b _080F11F4 -_080F10E0: + b @080F11F4 +@080F10E0: ldr r0, [r4, 0x1C] strb r5, [r0, 0x3] - b _080F11F4 -_080F10E6: + b @080F11F4 +@080F10E6: adds r0, r2, r7 lsls r0, 2 adds r0, r6, r0 @@ -458861,29 +458861,29 @@ _080F10E6: adds r0, 0x2 bl sub_8009228 cmp r0, 0 - beq _080F1100 + beq @080F1100 ldr r1, [r4, 0x14] movs r0, 0x1 strb r0, [r1, 0x1D] - b _080F1104 -_080F1100: + b @080F1104 +@080F1100: ldr r0, [r4, 0x14] strb r5, [r0, 0x1D] -_080F1104: +@080F1104: ldr r0, [r4, 0x14] adds r0, 0xC bl sub_8009228 cmp r0, 0 - beq _080F1118 + beq @080F1118 ldr r1, [r4, 0x14] movs r0, 0x1 strb r0, [r1, 0x1E] - b _080F11F4 -_080F1118: + b @080F11F4 +@080F1118: ldr r0, [r4, 0x14] strb r5, [r0, 0x1E] - b _080F11F4 -_080F111E: + b @080F11F4 +@080F111E: adds r0, r2, r7 lsls r0, 2 adds r0, r6, r0 @@ -458891,27 +458891,27 @@ _080F111E: adds r0, 0x16 bl sub_8009228 cmp r0, 0 - beq _080F1138 + beq @080F1138 ldr r1, [r4, 0x10] movs r0, 0x1 strb r0, [r1, 0x1E] - b _080F113C -_080F1138: + b @080F113C +@080F1138: ldr r0, [r4, 0x10] strb r5, [r0, 0x1E] -_080F113C: +@080F113C: ldr r0, [r4, 0x10] adds r0, 0x8 bl sub_8009228 cmp r0, 0 - beq _080F114C + beq @080F114C ldr r1, [r4, 0x10] - b _080F117E -_080F114C: + b @080F117E +@080F114C: ldr r0, [r4, 0x10] strb r5, [r0, 0x1F] - b _080F11F4 -_080F1152: + b @080F11F4 +@080F1152: adds r0, r2, r7 lsls r0, 2 adds r0, r6, r0 @@ -458919,30 +458919,30 @@ _080F1152: adds r0, 0xF bl sub_8009228 cmp r0, 0 - beq _080F116C + beq @080F116C ldr r1, [r4, 0xC] movs r0, 0x1 strb r0, [r1, 0x1E] - b _080F1170 -_080F116C: + b @080F1170 +@080F116C: ldr r0, [r4, 0xC] strb r5, [r0, 0x1E] -_080F1170: +@080F1170: ldr r0, [r4, 0xC] adds r0, 0x4 bl sub_8009228 cmp r0, 0 - beq _080F1184 + beq @080F1184 ldr r1, [r4, 0xC] -_080F117E: +@080F117E: movs r0, 0x1 strb r0, [r1, 0x1F] - b _080F11F4 -_080F1184: + b @080F11F4 +@080F1184: ldr r0, [r4, 0xC] strb r5, [r0, 0x1F] - b _080F11F4 -_080F118A: + b @080F11F4 +@080F118A: adds r0, r2, r7 lsls r0, 2 adds r0, r6, r0 @@ -458950,16 +458950,16 @@ _080F118A: adds r0, 0x13 bl sub_8009228 cmp r0, 0 - beq _080F11A4 + beq @080F11A4 ldr r1, [r4, 0x8] movs r0, 0x1 strb r0, [r1, 0x2] - b _080F11F4 -_080F11A4: + b @080F11F4 +@080F11A4: ldr r0, [r4, 0x8] strb r5, [r0, 0x2] - b _080F11F4 -_080F11AA: + b @080F11F4 +@080F11AA: adds r0, r2, r7 lsls r0, 2 adds r0, r6, r0 @@ -458967,16 +458967,16 @@ _080F11AA: adds r0, 0x13 bl sub_8009228 cmp r0, 0 - beq _080F11C4 + beq @080F11C4 ldr r1, [r4, 0x20] movs r0, 0x1 strb r0, [r1, 0x6] - b _080F11F4 -_080F11C4: + b @080F11F4 +@080F11C4: ldr r0, [r4, 0x20] strb r5, [r0, 0x6] - b _080F11F4 -_080F11CA: + b @080F11F4 +@080F11CA: adds r0, r2, r7 lsls r0, 2 adds r0, r6, r0 @@ -458984,28 +458984,28 @@ _080F11CA: adds r0, 0x13 bl sub_8009228 cmp r0, 0 - beq _080F11E4 + beq @080F11E4 ldr r1, [r4, 0x24] movs r0, 0x1 strb r0, [r1, 0xB] - b _080F11F4 -_080F11E4: + b @080F11F4 +@080F11E4: ldr r0, [r4, 0x24] strb r5, [r0, 0xB] - b _080F11F4 -_080F11EA: + b @080F11F4 +@080F11EA: adds r0, r2, r7 lsls r0, 2 adds r0, r6, r0 str r0, [r4, 0x28] -_080F11F2: +@080F11F2: strb r5, [r0, 0x18] -_080F11F4: +@080F11F4: adds r7, 0x1 cmp r7, 0x17 - bgt _080F11FC - b _080F0F74 -_080F11FC: + bgt @080F11FC + b @080F0F74 +@080F11FC: adds r0, r4, 0 bl free pop {r4-r7} @@ -459014,7 +459014,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 @@ -459023,42 +459023,42 @@ sub_80F1208: @ 80F1208 lsls r1, 2 adds r0, r4, r1 cmp r4, r0 - bcs _080F124C -_080F121C: + bcs @080F124C +@080F121C: ldrb r0, [r4] cmp r0, 0x7 - bne _080F1240 + bne @080F1240 ldrb r0, [r4, 0x1D] cmp r0, 0x1 - bne _080F1230 + bne @080F1230 ldrb r0, [r4, 0x1E] cmp r0, 0x1 - bne _080F1236 - b _080F1240 -_080F1230: + bne @080F1236 + b @080F1240 +@080F1230: ldrb r0, [r4, 0x1E] cmp r0, 0x1 - bne _080F1240 -_080F1236: + bne @080F1240 +@080F1236: adds r0, r4, 0 movs r1, 0 movs r2, 0x24 bl memset -_080F1240: +@080F1240: adds r4, 0x24 movs r1, 0xD8 lsls r1, 2 adds r0, r5, r1 cmp r4, r0 - bcc _080F121C -_080F124C: + bcc @080F121C +@080F124C: pop {r4,r5} pop {r0} bx r0 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 @@ -459066,51 +459066,51 @@ sub_80F1254: @ 80F1254 lsls r1, 2 adds r0, r4, r1 cmp r4, r0 - bcs _080F128A -_080F1264: + bcs @080F128A +@080F1264: ldrb r0, [r4] cmp r0, 0x7 - bne _080F127E + bne @080F127E adds r0, r4, 0 adds r0, 0xC bl sub_8009228 cmp r0, 0 - beq _080F127A + beq @080F127A movs r0, 0x1 - b _080F127C -_080F127A: + b @080F127C +@080F127A: movs r0, 0x2 -_080F127C: +@080F127C: strb r0, [r4, 0x1E] -_080F127E: +@080F127E: adds r4, 0x24 movs r1, 0xD8 lsls r1, 2 adds r0, r5, r1 cmp r4, r0 - bcc _080F1264 -_080F128A: + bcc @080F1264 +@080F128A: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_80F1254 thumb_func_start sub_80F1290 -sub_80F1290: @ 80F1290 +sub_80F1290: ; 80F1290 push {lr} bl sub_8009228 movs r1, 0x2 cmp r0, 0 - beq _080F129E + beq @080F129E movs r1, 0x1 -_080F129E: +@080F129E: adds r0, r1, 0 pop {r1} bx r1 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 @@ -459118,122 +459118,122 @@ sub_80F12A4: @ 80F12A4 lsls r1, 2 adds r0, r4, r1 cmp r4, r0 - bcc _080F12B6 - b _080F14F0 -_080F12B6: + bcc @080F12B6 + b @080F14F0 +@080F12B6: ldrb r0, [r4] subs r0, 0x1 cmp r0, 0x28 - bls _080F12C0 - b _080F14E2 -_080F12C0: + bls @080F12C0 + b @080F14E2 +@080F12C0: lsls r0, 2 - ldr r1, =_080F12D0 + ldr r1, =@080F12D0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F12D0: - .4byte _080F1374 - .4byte _080F137A - .4byte _080F1380 - .4byte _080F138E - .4byte _080F139A - .4byte _080F13A8 - .4byte _080F13BE - .4byte _080F13CC - .4byte _080F13E0 - .4byte _080F13F4 - .4byte _080F1408 - .4byte _080F1416 - .4byte _080F14E2 - .4byte _080F14E2 - .4byte _080F14E2 - .4byte _080F14E2 - .4byte _080F14E2 - .4byte _080F14E2 - .4byte _080F14E2 - .4byte _080F14E2 - .4byte _080F142A - .4byte _080F1438 - .4byte _080F1444 - .4byte _080F1450 - .4byte _080F145C - .4byte _080F14AC - .4byte _080F1468 - .4byte _080F14B8 - .4byte _080F148C - .4byte _080F1474 - .4byte _080F14AC - .4byte _080F14B8 - .4byte _080F1480 - .4byte _080F148C - .4byte _080F1498 - .4byte _080F14AC - .4byte _080F14B8 - .4byte _080F14C4 - .4byte _080F14D8 - .4byte _080F14E2 - .4byte _080F14E2 -_080F1374: +@080F12D0: + .4byte @080F1374 + .4byte @080F137A + .4byte @080F1380 + .4byte @080F138E + .4byte @080F139A + .4byte @080F13A8 + .4byte @080F13BE + .4byte @080F13CC + .4byte @080F13E0 + .4byte @080F13F4 + .4byte @080F1408 + .4byte @080F1416 + .4byte @080F14E2 + .4byte @080F14E2 + .4byte @080F14E2 + .4byte @080F14E2 + .4byte @080F14E2 + .4byte @080F14E2 + .4byte @080F14E2 + .4byte @080F14E2 + .4byte @080F142A + .4byte @080F1438 + .4byte @080F1444 + .4byte @080F1450 + .4byte @080F145C + .4byte @080F14AC + .4byte @080F1468 + .4byte @080F14B8 + .4byte @080F148C + .4byte @080F1474 + .4byte @080F14AC + .4byte @080F14B8 + .4byte @080F1480 + .4byte @080F148C + .4byte @080F1498 + .4byte @080F14AC + .4byte @080F14B8 + .4byte @080F14C4 + .4byte @080F14D8 + .4byte @080F14E2 + .4byte @080F14E2 +@080F1374: adds r0, r4, 0 adds r0, 0x10 - b _080F1422 -_080F137A: + b @080F1422 +@080F137A: adds r0, r4, 0 adds r0, 0x10 - b _080F1422 -_080F1380: + b @080F1422 +@080F1380: adds r0, r4, 0x5 bl sub_80F1290 strb r0, [r4, 0xD] adds r0, r4, 0 adds r0, 0x10 - b _080F1478 -_080F138E: + b @080F1478 +@080F138E: adds r0, r4, 0 adds r0, 0xB bl sub_80F1290 strb r0, [r4, 0x17] - b _080F14E2 -_080F139A: + b @080F14E2 +@080F139A: adds r0, r4, 0 adds r0, 0xF bl sub_80F1290 strb r0, [r4, 0x1E] adds r0, r4, 0x4 - b _080F13B6 -_080F13A8: + b @080F13B6 +@080F13A8: adds r0, r4, 0 adds r0, 0x16 bl sub_80F1290 strb r0, [r4, 0x1E] adds r0, r4, 0 adds r0, 0x8 -_080F13B6: +@080F13B6: bl sub_80F1290 strb r0, [r4, 0x1F] - b _080F14E2 -_080F13BE: + b @080F14E2 +@080F13BE: adds r0, r4, 0x2 bl sub_80F1290 strb r0, [r4, 0x1D] adds r0, r4, 0 adds r0, 0xC - b _080F13D8 -_080F13CC: + b @080F13D8 +@080F13CC: adds r0, r4, 0 adds r0, 0x14 bl sub_80F1290 strb r0, [r4, 0x1D] adds r0, r4, 0x4 -_080F13D8: +@080F13D8: bl sub_80F1290 strb r0, [r4, 0x1E] - b _080F14E2 -_080F13E0: + b @080F14E2 +@080F13E0: adds r0, r4, 0 adds r0, 0xC bl sub_80F1290 @@ -459241,8 +459241,8 @@ _080F13E0: adds r0, r4, 0x4 bl sub_80F1290 strb r0, [r4, 0x15] - b _080F14E2 -_080F13F4: + b @080F14E2 +@080F13F4: adds r0, r4, 0x4 bl sub_80F1290 strb r0, [r4, 0x19] @@ -459250,82 +459250,82 @@ _080F13F4: adds r0, 0xC bl sub_80F1290 strb r0, [r4, 0x1A] - b _080F14E2 -_080F1408: + b @080F14E2 +@080F1408: adds r0, r4, 0x2 bl sub_80F1290 strb r0, [r4, 0x17] adds r0, r4, 0 adds r0, 0xC - b _080F1422 -_080F1416: + b @080F1422 +@080F1416: adds r0, r4, 0x2 bl sub_80F1290 strb r0, [r4, 0x17] adds r0, r4, 0 adds r0, 0xB -_080F1422: +@080F1422: bl sub_80F1290 strb r0, [r4, 0x18] - b _080F14E2 -_080F142A: + b @080F14E2 +@080F142A: adds r0, r4, 0 adds r0, 0x13 bl sub_80F1290 strb r0, [r4, 0x2] adds r0, r4, 0x4 - b _080F143C -_080F1438: + b @080F143C +@080F1438: adds r0, r4, 0 adds r0, 0x13 -_080F143C: +@080F143C: bl sub_80F1290 strb r0, [r4, 0x3] - b _080F14E2 -_080F1444: + b @080F14E2 +@080F1444: adds r0, r4, 0 adds r0, 0x13 bl sub_80F1290 strb r0, [r4, 0x2] - b _080F14E2 -_080F1450: + b @080F14E2 +@080F1450: adds r0, r4, 0 adds r0, 0x13 bl sub_80F1290 strb r0, [r4, 0x6] - b _080F14E2 -_080F145C: + b @080F14E2 +@080F145C: adds r0, r4, 0 adds r0, 0x13 bl sub_80F1290 strb r0, [r4, 0xB] - b _080F14E2 -_080F1468: + b @080F14E2 +@080F1468: adds r0, r4, 0 adds r0, 0x13 bl sub_80F1290 strb r0, [r4, 0x9] - b _080F14E2 -_080F1474: + b @080F14E2 +@080F1474: adds r0, r4, 0 adds r0, 0x13 -_080F1478: +@080F1478: bl sub_80F1290 strb r0, [r4, 0xE] - b _080F14E2 -_080F1480: + b @080F14E2 +@080F1480: adds r0, r4, 0 adds r0, 0x13 bl sub_80F1290 strb r0, [r4, 0x11] - b _080F14E2 -_080F148C: + b @080F14E2 +@080F148C: adds r0, r4, 0 adds r0, 0x13 bl sub_80F1290 strb r0, [r4, 0x8] - b _080F14E2 -_080F1498: + b @080F14E2 +@080F1498: adds r0, r4, 0 adds r0, 0x13 bl sub_80F1290 @@ -459333,20 +459333,20 @@ _080F1498: adds r0, r4, 0x4 bl sub_80F1290 strb r0, [r4, 0x10] - b _080F14E2 -_080F14AC: + b @080F14E2 +@080F14AC: adds r0, r4, 0 adds r0, 0x13 bl sub_80F1290 strb r0, [r4, 0xC] - b _080F14E2 -_080F14B8: + b @080F14E2 +@080F14B8: adds r0, r4, 0 adds r0, 0x13 bl sub_80F1290 strb r0, [r4, 0x5] - b _080F14E2 -_080F14C4: + b @080F14E2 +@080F14C4: adds r0, r4, 0 adds r0, 0x13 bl sub_80F1290 @@ -459354,67 +459354,67 @@ _080F14C4: adds r0, r4, 0x4 bl sub_80F1290 strb r0, [r4, 0x1C] - b _080F14E2 -_080F14D8: + b @080F14E2 +@080F14D8: adds r0, r4, 0 adds r0, 0x13 bl sub_80F1290 strb r0, [r4, 0x4] -_080F14E2: +@080F14E2: adds r4, 0x24 movs r1, 0xD8 lsls r1, 2 adds r0, r5, r1 cmp r4, r0 - bcs _080F14F0 - b _080F12B6 -_080F14F0: + bcs @080F14F0 + b @080F12B6 +@080F14F0: pop {r4,r5} pop {r0} bx r0 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 movs r6, 0x17 -_080F1500: +@080F1500: ldrb r0, [r4] cmp r0, 0x17 - beq _080F151C + beq @080F151C cmp r0, 0x19 - bne _080F152C + bne @080F152C ldrb r0, [r4, 0xA] cmp r0, 0x58 - bls _080F152C + bls @080F152C adds r0, r5, 0 movs r1, 0 movs r2, 0x24 bl memset - b _080F152C -_080F151C: + b @080F152C +@080F151C: ldrb r0, [r4, 0x12] cmp r0, 0x58 - bls _080F152C + bls @080F152C adds r0, r5, 0 movs r1, 0 movs r2, 0x24 bl memset -_080F152C: +@080F152C: adds r4, 0x24 adds r5, 0x24 subs r6, 0x1 cmp r6, 0 - bge _080F1500 + bge @080F1500 pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_80F14F8 thumb_func_start sub_80F153C -sub_80F153C: @ 80F153C +sub_80F153C: ; 80F153C push {lr} ldr r0, =0x03005d8c ldr r2, [r0] @@ -459428,169 +459428,169 @@ sub_80F153C: @ 80F153C adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 - bne _080F155A - b _080F16E6 -_080F155A: + bne @080F155A + b @080F16E6 +@080F155A: subs r1, 0x1 adds r0, r2, r1 ldrb r0, [r0] subs r0, 0x1 cmp r0, 0x28 - bls _080F1568 - b _080F16E6 -_080F1568: + bls @080F1568 + b @080F16E6 +@080F1568: lsls r0, 2 - ldr r1, =_080F1584 + ldr r1, =@080F1584 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F1584: - .4byte _080F1628 - .4byte _080F162E - .4byte _080F1634 - .4byte _080F163A - .4byte _080F165E - .4byte _080F1646 - .4byte _080F164C - .4byte _080F1664 - .4byte _080F1670 - .4byte _080F166A - .4byte _080F16B8 - .4byte _080F16E2 - .4byte _080F16E6 - .4byte _080F16E6 - .4byte _080F16E6 - .4byte _080F16E6 - .4byte _080F16E6 - .4byte _080F16E6 - .4byte _080F16E6 - .4byte _080F16E6 - .4byte _080F1652 - .4byte _080F1658 - .4byte _080F1676 - .4byte _080F167C - .4byte _080F1682 - .4byte _080F1688 - .4byte _080F168E - .4byte _080F1694 - .4byte _080F169A - .4byte _080F16A0 - .4byte _080F16A6 - .4byte _080F16AC - .4byte _080F16B2 - .4byte _080F16BE - .4byte _080F16C4 - .4byte _080F16CA - .4byte _080F16D0 - .4byte _080F16D6 - .4byte _080F16DC - .4byte _080F16E6 - .4byte _080F1640 -_080F1628: +@080F1584: + .4byte @080F1628 + .4byte @080F162E + .4byte @080F1634 + .4byte @080F163A + .4byte @080F165E + .4byte @080F1646 + .4byte @080F164C + .4byte @080F1664 + .4byte @080F1670 + .4byte @080F166A + .4byte @080F16B8 + .4byte @080F16E2 + .4byte @080F16E6 + .4byte @080F16E6 + .4byte @080F16E6 + .4byte @080F16E6 + .4byte @080F16E6 + .4byte @080F16E6 + .4byte @080F16E6 + .4byte @080F16E6 + .4byte @080F1652 + .4byte @080F1658 + .4byte @080F1676 + .4byte @080F167C + .4byte @080F1682 + .4byte @080F1688 + .4byte @080F168E + .4byte @080F1694 + .4byte @080F169A + .4byte @080F16A0 + .4byte @080F16A6 + .4byte @080F16AC + .4byte @080F16B2 + .4byte @080F16BE + .4byte @080F16C4 + .4byte @080F16CA + .4byte @080F16D0 + .4byte @080F16D6 + .4byte @080F16DC + .4byte @080F16E6 + .4byte @080F1640 +@080F1628: bl sub_80F24D8 - b _080F16E6 -_080F162E: + b @080F16E6 +@080F162E: bl sub_80F2708 - b _080F16E6 -_080F1634: + b @080F16E6 +@080F1634: bl sub_80F28A4 - b _080F16E6 -_080F163A: + b @080F16E6 +@080F163A: bl nullsub_46 - b _080F16E6 -_080F1640: + b @080F16E6 +@080F1640: bl sub_80F29A0 - b _080F16E6 -_080F1646: + b @080F16E6 +@080F1646: bl sub_80F16EC - b _080F16E6 -_080F164C: + b @080F16E6 +@080F164C: bl sub_80F1974 - b _080F16E6 -_080F1652: + b @080F16E6 +@080F1652: bl sub_80F211C - b _080F16E6 -_080F1658: + b @080F16E6 +@080F1658: bl sub_80F1C0C - b _080F16E6 -_080F165E: + b @080F16E6 +@080F165E: bl sub_80F1E48 - b _080F16E6 -_080F1664: + b @080F16E6 +@080F1664: bl sub_80F2A10 - b _080F16E6 -_080F166A: + b @080F16E6 +@080F166A: bl sub_80F3140 - b _080F16E6 -_080F1670: + b @080F16E6 +@080F1670: bl sub_80F3388 - b _080F16E6 -_080F1676: + b @080F16E6 +@080F1676: bl sub_80F2370 - b _080F16E6 -_080F167C: + b @080F16E6 +@080F167C: bl sub_80F3828 - b _080F16E6 -_080F1682: + b @080F16E6 +@080F1682: bl sub_80F3904 - b _080F16E6 -_080F1688: + b @080F16E6 +@080F1688: bl sub_80F39E4 - b _080F16E6 -_080F168E: + b @080F16E6 +@080F168E: bl sub_80F3C04 - b _080F16E6 -_080F1694: + b @080F16E6 +@080F1694: bl sub_80F3D74 - b _080F16E6 -_080F169A: + b @080F16E6 +@080F169A: bl sub_80F3E7C - b _080F16E6 -_080F16A0: + b @080F16E6 +@080F16A0: bl sub_80F4028 - b _080F16E6 -_080F16A6: + b @080F16E6 +@080F16A6: bl sub_80F4360 - b _080F16E6 -_080F16AC: + b @080F16E6 +@080F16AC: bl sub_80F45A0 - b _080F16E6 -_080F16B2: + b @080F16E6 +@080F16B2: bl sub_80F466C - b _080F16E6 -_080F16B8: + b @080F16E6 +@080F16B8: bl sub_80F487C - b _080F16E6 -_080F16BE: + b @080F16E6 +@080F16BE: bl sub_80F49BC - b _080F16E6 -_080F16C4: + b @080F16E6 +@080F16C4: bl sub_80F4B5C - b _080F16E6 -_080F16CA: + b @080F16E6 +@080F16CA: bl sub_80F4D9C - b _080F16E6 -_080F16D0: + b @080F16E6 +@080F16D0: bl sub_80F5030 - b _080F16E6 -_080F16D6: + b @080F16E6 +@080F16D6: bl sub_80F51EC - b _080F16E6 -_080F16DC: + b @080F16E6 +@080F16DC: bl sub_80F5548 - b _080F16E6 -_080F16E2: + b @080F16E6 +@080F16E2: bl sub_80F56D4 -_080F16E6: +@080F16E6: pop {r0} bx r0 thumb_func_end sub_80F153C thumb_func_start sub_80F16EC -sub_80F16EC: @ 80F16EC +sub_80F16EC: ; 80F16EC push {r4,r5,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -459608,28 +459608,28 @@ sub_80F16EC: @ 80F16EC ldr r0, =0x0203a030 ldrb r5, [r0] cmp r5, 0x8 - bls _080F1712 - b _080F1952 -_080F1712: + bls @080F1712 + b @080F1952 +@080F1712: lsls r0, r5, 2 - ldr r1, =_080F1734 + ldr r1, =@080F1734 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F1734: - .4byte _080F1758 - .4byte _080F17B0 - .4byte _080F17E8 - .4byte _080F1818 - .4byte _080F184C - .4byte _080F1880 - .4byte _080F18C4 - .4byte _080F190C - .4byte _080F193C -_080F1758: +@080F1734: + .4byte @080F1758 + .4byte @080F17B0 + .4byte @080F17E8 + .4byte @080F1818 + .4byte @080F184C + .4byte @080F1880 + .4byte @080F18C4 + .4byte @080F190C + .4byte @080F193C +@080F1758: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x16 @@ -459654,19 +459654,19 @@ _080F1758: adds r1, 0x8 bl sub_8008C44 cmp r0, 0 - bne _080F17A4 + bne @080F17A4 ldr r1, =0x0203a030 movs r0, 0x8 - b _080F1950 + b @080F1950 .align 2, 0 .pool -_080F17A4: +@080F17A4: ldr r1, =0x0203a030 movs r0, 0x1 - b _080F1950 + b @080F1950 .align 2, 0 .pool -_080F17B0: +@080F17B0: ldr r0, =0x02021cc4 ldrh r2, [r4, 0x2] movs r1, 0xB @@ -459684,10 +459684,10 @@ _080F17B0: lsrs r1, 29 movs r0, 0x2 bl sub_80EF250 - b _080F194C + b @080F194C .align 2, 0 .pool -_080F17E8: +@080F17E8: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x16 @@ -459697,19 +459697,19 @@ _080F17E8: movs r0, 0x60 ands r0, r1 cmp r0, 0 - bne _080F180C + bne @080F180C ldr r1, =0x0203a030 movs r0, 0x3 - b _080F1950 + b @080F1950 .align 2, 0 .pool -_080F180C: +@080F180C: ldr r1, =0x0203a030 movs r0, 0x4 - b _080F1950 + b @080F1950 .align 2, 0 .pool -_080F1818: +@080F1818: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x16 @@ -459726,10 +459726,10 @@ _080F1818: bl sub_80EF340 ldr r1, =0x0203a030 movs r0, 0x5 - b _080F1950 + b @080F1950 .align 2, 0 .pool -_080F184C: +@080F184C: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x16 @@ -459746,10 +459746,10 @@ _080F184C: bl sub_80EF340 ldr r1, =0x0203a030 movs r0, 0x5 - b _080F1950 + b @080F1950 .align 2, 0 .pool -_080F1880: +@080F1880: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x16 @@ -459765,19 +459765,19 @@ _080F1880: bl sub_811EBBC ldrh r0, [r4, 0x14] cmp r0, 0 - beq _080F18B8 + beq @080F18B8 ldr r1, =0x0203a030 movs r0, 0x6 - b _080F1950 + b @080F1950 .align 2, 0 .pool -_080F18B8: +@080F18B8: ldr r1, =0x0203a030 movs r0, 0x7 - b _080F1950 + b @080F1950 .align 2, 0 .pool -_080F18C4: +@080F18C4: ldr r0, =0x02021cc4 ldrh r2, [r4, 0x2] movs r1, 0xB @@ -459797,10 +459797,10 @@ _080F18C4: bl sub_811EBBC ldr r1, =0x0203a030 movs r0, 0x7 - b _080F1950 + b @080F1950 .align 2, 0 .pool -_080F190C: +@080F190C: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x16 @@ -459814,10 +459814,10 @@ _080F190C: adds r1, r2 bl gf_strcpy bl sub_80F577C - b _080F1952 + b @080F1952 .align 2, 0 .pool -_080F193C: +@080F193C: ldr r0, =0x02021cc4 ldrh r2, [r4, 0x2] movs r1, 0xB @@ -459825,12 +459825,12 @@ _080F193C: ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy -_080F194C: +@080F194C: ldr r1, =0x0203a030 movs r0, 0x2 -_080F1950: +@080F1950: strb r0, [r1] -_080F1952: +@080F1952: ldr r0, =0x0858d204 lsls r1, r5, 2 adds r1, r0 @@ -459844,7 +459844,7 @@ _080F1952: thumb_func_end sub_80F16EC thumb_func_start sub_80F1974 -sub_80F1974: @ 80F1974 +sub_80F1974: ; 80F1974 push {r4,r5,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -459863,34 +459863,34 @@ sub_80F1974: @ 80F1974 ldrb r5, [r0] adds r2, r0, 0 cmp r5, 0xE - bls _080F199C - b _080F1BEA -_080F199C: + bls @080F199C + b @080F1BEA +@080F199C: lsls r0, r5, 2 - ldr r1, =_080F19C0 + ldr r1, =@080F19C0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F19C0: - .4byte _080F19FC - .4byte _080F1A40 - .4byte _080F1A90 - .4byte _080F1AB4 - .4byte _080F1AE0 - .4byte _080F1B28 - .4byte _080F1B38 - .4byte _080F1B48 - .4byte _080F1B4E - .4byte _080F1B4E - .4byte _080F1B4E - .4byte _080F1B68 - .4byte _080F1B94 - .4byte _080F1B94 - .4byte _080F1BCC -_080F19FC: +@080F19C0: + .4byte @080F19FC + .4byte @080F1A40 + .4byte @080F1A90 + .4byte @080F1AB4 + .4byte @080F1AE0 + .4byte @080F1B28 + .4byte @080F1B38 + .4byte @080F1B48 + .4byte @080F1B4E + .4byte @080F1B4E + .4byte @080F1B4E + .4byte @080F1B68 + .4byte @080F1B94 + .4byte @080F1B94 + .4byte @080F1BCC +@080F19FC: ldr r0, =0x02021cc4 adds r1, r4, 0x2 ldrb r2, [r4, 0x1D] @@ -459904,55 +459904,55 @@ _080F19FC: bl gf_strcpy ldrh r0, [r4, 0x16] cmp r0, 0x6 - bls _080F1A34 + bls @080F1A34 ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b _080F1BEA + b @080F1BEA .align 2, 0 .pool -_080F1A34: +@080F1A34: ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b _080F1BEA + b @080F1BEA .align 2, 0 .pool -_080F1A40: +@080F1A40: ldrb r0, [r4, 0x1A] cmp r0, 0x32 - bne _080F1A58 + bne @080F1A58 ldr r0, =0x02021cc4 ldr r1, =0x085eaeb1 bl gf_strcpy - b _080F1A60 + b @080F1A60 .align 2, 0 .pool -_080F1A58: +@080F1A58: ldr r0, =0x02021cc4 ldr r1, =0x085eaeb8 bl gf_strcpy -_080F1A60: +@080F1A60: ldrh r1, [r4, 0x16] movs r0, 0x1 bl sub_80EF340 ldrb r0, [r4, 0x1C] cmp r0, 0x1 - bne _080F1A84 + bne @080F1A84 ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b _080F1BEA + b @080F1BEA .align 2, 0 .pool -_080F1A84: +@080F1A84: ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b _080F1BEA + b @080F1BEA .align 2, 0 .pool -_080F1A90: +@080F1A90: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC @@ -459962,14 +459962,14 @@ _080F1A90: adds r1, 0x1 movs r0, 0x1 bl sub_80EF340 -_080F1AA6: +@080F1AA6: ldrb r0, [r4, 0x1B] cmp r0, 0 - beq _080F1B02 - b _080F1B1C + beq @080F1B02 + b @080F1B1C .align 2, 0 .pool -_080F1AB4: +@080F1AB4: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC @@ -459982,10 +459982,10 @@ _080F1AB4: ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - b _080F1AA6 + b @080F1AA6 .align 2, 0 .pool -_080F1AE0: +@080F1AE0: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC @@ -460000,74 +460000,74 @@ _080F1AE0: bl gf_strcpy ldrb r0, [r4, 0x1B] cmp r0, 0 - bne _080F1B1C -_080F1B02: + bne @080F1B1C +@080F1B02: ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] - b _080F1BEA + b @080F1BEA .align 2, 0 .pool -_080F1B1C: +@080F1B1C: ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b _080F1BEA + b @080F1BEA .align 2, 0 .pool -_080F1B28: +@080F1B28: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x1E] - b _080F1B54 + b @080F1B54 .align 2, 0 .pool -_080F1B38: +@080F1B38: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x1E] - b _080F1B54 + b @080F1B54 .align 2, 0 .pool -_080F1B48: +@080F1B48: movs r0, 0xB strb r0, [r2] - b _080F1BEA -_080F1B4E: + b @080F1BEA +@080F1B4E: ldr r0, =0x02021cc4 adds r1, r4, 0x2 ldrb r2, [r4, 0x1D] -_080F1B54: +@080F1B54: bl sub_81DB5E8 ldr r1, =0x0203a030 movs r0, 0xB strb r0, [r1] - b _080F1BEA + b @080F1BEA .align 2, 0 .pool -_080F1B68: +@080F1B68: ldr r0, =0x02021cc4 ldrh r1, [r4, 0x18] bl sub_811EBBC ldrb r0, [r4, 0x1B] cmp r0, 0 - bne _080F1B88 + bne @080F1B88 ldr r1, =0x0203a030 movs r0, 0xC strb r0, [r1] - b _080F1BEA + b @080F1BEA .align 2, 0 .pool -_080F1B88: +@080F1B88: ldr r1, =0x0203a030 movs r0, 0xD strb r0, [r1] - b _080F1BEA + b @080F1BEA .align 2, 0 .pool -_080F1B94: +@080F1B94: ldr r0, =0x02021cc4 ldrh r1, [r4, 0x18] bl sub_811EBBC @@ -460083,10 +460083,10 @@ _080F1B94: ldr r1, =0x0203a030 movs r0, 0xE strb r0, [r1] - b _080F1BEA + b @080F1BEA .align 2, 0 .pool -_080F1BCC: +@080F1BCC: ldr r0, =0x02021cc4 adds r1, r4, 0x2 ldrb r2, [r4, 0x1D] @@ -460099,7 +460099,7 @@ _080F1BCC: adds r1, r2 bl gf_strcpy bl sub_80F577C -_080F1BEA: +@080F1BEA: ldr r0, =0x0858d240 lsls r1, r5, 2 adds r1, r0 @@ -460113,7 +460113,7 @@ _080F1BEA: thumb_func_end sub_80F1974 thumb_func_start sub_80F1C0C -sub_80F1C0C: @ 80F1C0C +sub_80F1C0C: ; 80F1C0C push {r4-r6,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -460132,32 +460132,32 @@ sub_80F1C0C: @ 80F1C0C ldrb r6, [r0] adds r2, r0, 0 cmp r6, 0xC - bls _080F1C34 - b _080F1E2C -_080F1C34: + bls @080F1C34 + b @080F1E2C +@080F1C34: lsls r0, r6, 2 - ldr r1, =_080F1C58 + ldr r1, =@080F1C58 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F1C58: - .4byte _080F1C8C - .4byte _080F1CC8 - .4byte _080F1D10 - .4byte _080F1D22 - .4byte _080F1D10 - .4byte _080F1D10 - .4byte _080F1D4C - .4byte _080F1D7C - .4byte _080F1DAC - .4byte _080F1DB8 - .4byte _080F1DC6 - .4byte _080F1DD8 - .4byte _080F1E1C -_080F1C8C: +@080F1C58: + .4byte @080F1C8C + .4byte @080F1CC8 + .4byte @080F1D10 + .4byte @080F1D22 + .4byte @080F1D10 + .4byte @080F1D10 + .4byte @080F1D4C + .4byte @080F1D7C + .4byte @080F1DAC + .4byte @080F1DB8 + .4byte @080F1DC6 + .4byte @080F1DD8 + .4byte @080F1E1C +@080F1C8C: ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 @@ -460169,21 +460169,21 @@ _080F1C8C: bl GetMapName ldrh r0, [r5, 0xC] cmp r0, 0xFE - bls _080F1CBC + bls @080F1CBC ldr r1, =0x0203a030 movs r0, 0xB strb r0, [r1] - b _080F1E2C + b @080F1E2C .align 2, 0 .pool -_080F1CBC: +@080F1CBC: ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b _080F1E2C + b @080F1E2C .align 2, 0 .pool -_080F1CC8: +@080F1CC8: ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 @@ -460208,42 +460208,42 @@ _080F1CC8: ands r0, r1 adds r0, r2 strb r0, [r4] - b _080F1E2C + b @080F1E2C .align 2, 0 .pool -_080F1D10: +@080F1D10: ldrh r0, [r5, 0x8] cmp r0, 0 - beq _080F1D1C + beq @080F1D1C movs r0, 0x6 strb r0, [r2] - b _080F1E2C -_080F1D1C: + b @080F1E2C +@080F1D1C: movs r0, 0xA strb r0, [r2] - b _080F1E2C -_080F1D22: + b @080F1E2C +@080F1D22: ldrh r1, [r5, 0xC] adds r1, 0x1 movs r0, 0x2 bl sub_80EF340 ldrh r0, [r5, 0x8] cmp r0, 0 - beq _080F1D40 + beq @080F1D40 ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b _080F1E2C + b @080F1E2C .align 2, 0 .pool -_080F1D40: +@080F1D40: ldr r1, =0x0203a030 movs r0, 0xA strb r0, [r1] - b _080F1E2C + b @080F1E2C .align 2, 0 .pool -_080F1D4C: +@080F1D4C: ldr r4, =0x02021dc4 ldrh r0, [r5, 0x8] bl itemid_get_item @@ -460255,14 +460255,14 @@ _080F1D4C: bl sub_80EF340 ldrh r0, [r5, 0xA] cmp r0, 0 - beq _080F1D94 + beq @080F1D94 ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] - b _080F1E2C + b @080F1E2C .align 2, 0 .pool -_080F1D7C: +@080F1D7C: ldr r4, =0x02021dc4 ldrh r0, [r5, 0xA] bl itemid_get_item @@ -460272,41 +460272,41 @@ _080F1D7C: ldrh r1, [r5, 0x10] movs r0, 0x2 bl sub_80EF340 -_080F1D94: +@080F1D94: ldrb r0, [r5, 0x2] cmp r0, 0x1 - beq _080F1DFA + beq @080F1DFA ldr r1, =0x0203a030 movs r0, 0x9 strb r0, [r1] - b _080F1E2C + b @080F1E2C .align 2, 0 .pool -_080F1DAC: +@080F1DAC: ldrh r0, [r5, 0xC] cmp r0, 0xFE - bls _080F1DD2 + bls @080F1DD2 movs r0, 0xC strb r0, [r2] - b _080F1E2C -_080F1DB8: + b @080F1E2C +@080F1DB8: movs r0, 0x1 adds r1, r5, 0 bl sub_80EF40C bl sub_80F577C - b _080F1E2C -_080F1DC6: + b @080F1E2C +@080F1DC6: ldrb r0, [r5, 0x2] cmp r0, 0x1 - bne _080F1DD2 + bne @080F1DD2 movs r0, 0x8 strb r0, [r2] - b _080F1E2C -_080F1DD2: + b @080F1E2C +@080F1DD2: movs r0, 0x9 strb r0, [r2] - b _080F1E2C -_080F1DD8: + b @080F1E2C +@080F1DD8: ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 @@ -460320,29 +460320,29 @@ _080F1DD8: bl gf_strcpy ldrb r0, [r5, 0x2] cmp r0, 0x1 - bne _080F1E10 -_080F1DFA: + bne @080F1E10 +@080F1DFA: ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] - b _080F1E2C + b @080F1E2C .align 2, 0 .pool -_080F1E10: +@080F1E10: ldr r1, =0x0203a030 movs r0, 0xC strb r0, [r1] - b _080F1E2C + b @080F1E2C .align 2, 0 .pool -_080F1E1C: +@080F1E1C: ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x3] bl sub_81DB5E8 bl sub_80F577C -_080F1E2C: +@080F1E2C: ldr r0, =0x0858d1d0 lsls r1, r6, 2 adds r1, r0 @@ -460356,7 +460356,7 @@ _080F1E2C: thumb_func_end sub_80F1C0C thumb_func_start sub_80F1E48 -sub_80F1E48: @ 80F1E48 +sub_80F1E48: ; 80F1E48 push {r4-r6,lr} sub sp, 0x8 ldr r2, =0x03005d8c @@ -460376,38 +460376,38 @@ sub_80F1E48: @ 80F1E48 ldrb r6, [r0] adds r2, r0, 0 cmp r6, 0x12 - bls _080F1E72 - b _080F20FE -_080F1E72: + bls @080F1E72 + b @080F20FE +@080F1E72: lsls r0, r6, 2 - ldr r1, =_080F1E94 + ldr r1, =@080F1E94 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F1E94: - .4byte _080F1EE0 - .4byte _080F1F28 - .4byte _080F1F4A - .4byte _080F1F28 - .4byte _080F1F28 - .4byte _080F1F28 - .4byte _080F1F28 - .4byte _080F1F28 - .4byte _080F1F28 - .4byte _080F1F90 - .4byte _080F1F90 - .4byte _080F1F90 - .4byte _080F20EC - .4byte _080F1FCC - .4byte _080F200C - .4byte _080F202C - .4byte _080F2074 - .4byte _080F20A4 - .4byte _080F20F0 -_080F1EE0: +@080F1E94: + .4byte @080F1EE0 + .4byte @080F1F28 + .4byte @080F1F4A + .4byte @080F1F28 + .4byte @080F1F28 + .4byte @080F1F28 + .4byte @080F1F28 + .4byte @080F1F28 + .4byte @080F1F28 + .4byte @080F1F90 + .4byte @080F1F90 + .4byte @080F1F90 + .4byte @080F20EC + .4byte @080F1FCC + .4byte @080F200C + .4byte @080F202C + .4byte @080F2074 + .4byte @080F20A4 + .4byte @080F20F0 +@080F1EE0: ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0xF @@ -460429,31 +460429,31 @@ _080F1EE0: bl sub_80EFBA4 adds r0, 0x1 strb r0, [r4] - b _080F20FE + b @080F20FE .align 2, 0 .pool -_080F1F28: +@080F1F28: ldrb r0, [r5, 0x1A] cmp r0, 0 - bne _080F1F34 + bne @080F1F34 movs r0, 0x9 strb r0, [r2] - b _080F20FE -_080F1F34: + b @080F20FE +@080F1F34: cmp r0, 0x1 - bne _080F1F3E + bne @080F1F3E movs r0, 0xA strb r0, [r2] - b _080F20FE -_080F1F3E: + b @080F20FE +@080F1F3E: cmp r0, 0x2 - beq _080F1F44 - b _080F20FE -_080F1F44: + beq @080F1F44 + b @080F20FE +@080F1F44: movs r0, 0xB strb r0, [r2] - b _080F20FE -_080F1F4A: + b @080F20FE +@080F1F4A: ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0xF @@ -460461,34 +460461,34 @@ _080F1F4A: bl sub_81DB5E8 ldrb r0, [r5, 0x1A] cmp r0, 0 - bne _080F1F6C + bne @080F1F6C ldr r1, =0x0203a030 movs r0, 0x9 strb r0, [r1] - b _080F20FE + b @080F20FE .align 2, 0 .pool -_080F1F6C: +@080F1F6C: cmp r0, 0x1 - bne _080F1F7C + bne @080F1F7C ldr r1, =0x0203a030 movs r0, 0xA strb r0, [r1] - b _080F20FE + b @080F20FE .align 2, 0 .pool -_080F1F7C: +@080F1F7C: cmp r0, 0x2 - beq _080F1F82 - b _080F20FE -_080F1F82: + beq @080F1F82 + b @080F20FE +@080F1F82: ldr r1, =0x0203a030 movs r0, 0xB strb r0, [r1] - b _080F20FE + b @080F20FE .align 2, 0 .pool -_080F1F90: +@080F1F90: ldr r0, =0x02021cc4 adds r1, r5, 0x4 ldrb r2, [r5, 0x1F] @@ -460511,10 +460511,10 @@ _080F1F90: ldr r1, =0x0203a030 movs r0, 0xC strb r0, [r1] - b _080F20FE + b @080F20FE .align 2, 0 .pool -_080F1FCC: +@080F1FCC: ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0xF @@ -460538,10 +460538,10 @@ _080F1FCC: ldr r1, =0x0203a030 movs r0, 0xE strb r0, [r1] - b _080F20FE + b @080F20FE .align 2, 0 .pool -_080F200C: +@080F200C: movs r4, 0 str r4, [sp] str r5, [sp, 0x4] @@ -460556,8 +460556,8 @@ _080F200C: movs r1, 0 movs r2, 0x3 movs r3, 0 - b _080F20D2 -_080F202C: + b @080F20D2 +@080F202C: movs r0, 0 str r0, [sp] str r5, [sp, 0x4] @@ -460583,10 +460583,10 @@ _080F202C: ldr r1, =0x0203a030 movs r0, 0x10 strb r0, [r1] - b _080F20FE + b @080F20FE .align 2, 0 .pool -_080F2074: +@080F2074: ldrh r0, [r5, 0x2] str r0, [sp] str r5, [sp, 0x4] @@ -460606,10 +460606,10 @@ _080F2074: ldr r1, =0x0203a030 movs r0, 0x11 strb r0, [r1] - b _080F20FE + b @080F20FE .align 2, 0 .pool -_080F20A4: +@080F20A4: movs r0, 0 str r0, [sp] str r5, [sp, 0x4] @@ -460631,24 +460631,24 @@ _080F20A4: movs r1, 0 movs r2, 0x3 movs r3, 0x2 -_080F20D2: +@080F20D2: bl sub_80EFBDC ldr r1, =0x0203a030 movs r0, 0x12 strb r0, [r1] - b _080F20FE + b @080F20FE .align 2, 0 .pool -_080F20EC: +@080F20EC: movs r6, 0x12 strb r6, [r2] -_080F20F0: +@080F20F0: ldr r0, =0x02021cc4 adds r1, r5, 0x4 ldrb r2, [r5, 0x1F] bl sub_81DB5E8 bl sub_80F577C -_080F20FE: +@080F20FE: ldr r0, =0x0858d338 lsls r1, r6, 2 adds r1, r0 @@ -460663,7 +460663,7 @@ _080F20FE: thumb_func_end sub_80F1E48 thumb_func_start sub_80F211C -sub_80F211C: @ 80F211C +sub_80F211C: ; 80F211C push {r4-r6,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -460682,31 +460682,31 @@ sub_80F211C: @ 80F211C ldrb r6, [r0] adds r2, r0, 0 cmp r6, 0xB - bls _080F2144 - b _080F2358 -_080F2144: + bls @080F2144 + b @080F2358 +@080F2144: lsls r0, r6, 2 - ldr r1, =_080F2168 + ldr r1, =@080F2168 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F2168: - .4byte _080F2198 - .4byte _080F21EC - .4byte _080F21F2 - .4byte _080F222C - .4byte _080F2264 - .4byte _080F226A - .4byte _080F22A0 - .4byte _080F22F4 - .4byte _080F22F4 - .4byte _080F2324 - .4byte _080F2324 - .4byte _080F2354 -_080F2198: +@080F2168: + .4byte @080F2198 + .4byte @080F21EC + .4byte @080F21F2 + .4byte @080F222C + .4byte @080F2264 + .4byte @080F226A + .4byte @080F22A0 + .4byte @080F22F4 + .4byte @080F22F4 + .4byte @080F2324 + .4byte @080F2324 + .4byte @080F2354 +@080F2198: ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 @@ -460725,25 +460725,25 @@ _080F2198: bl sub_81DB5E8 ldrb r0, [r5, 0xF] cmp r0, 0x1 - bne _080F21E0 + bne @080F21E0 ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] - b _080F2358 + b @080F2358 .align 2, 0 .pool -_080F21E0: +@080F21E0: ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b _080F2358 + b @080F2358 .align 2, 0 .pool -_080F21EC: +@080F21EC: movs r0, 0x2 strb r0, [r2] - b _080F2358 -_080F21F2: + b @080F2358 +@080F21F2: ldr r4, =0x02021dc4 ldrb r0, [r5, 0xF] bl itemid_get_item @@ -460755,21 +460755,21 @@ _080F21F2: bl sub_80EF340 ldrb r0, [r5, 0x12] cmp r0, 0x3 - bhi _080F2220 + bhi @080F2220 ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b _080F2358 + b @080F2358 .align 2, 0 .pool -_080F2220: +@080F2220: ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b _080F2358 + b @080F2358 .align 2, 0 .pool -_080F222C: +@080F222C: ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 @@ -460786,14 +460786,14 @@ _080F222C: adds r1, r5, 0x4 ldrb r2, [r5, 0x3] bl sub_81DB5E8 - b _080F2286 + b @080F2286 .align 2, 0 .pool -_080F2264: +@080F2264: movs r0, 0x6 strb r0, [r2] - b _080F2358 -_080F226A: + b @080F2358 +@080F226A: ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 @@ -460806,14 +460806,14 @@ _080F226A: ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy -_080F2286: +@080F2286: ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b _080F2358 + b @080F2358 .align 2, 0 .pool -_080F22A0: +@080F22A0: ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 @@ -460840,10 +460840,10 @@ _080F22A0: ands r0, r1 adds r0, r2 strb r0, [r4] - b _080F2358 + b @080F2358 .align 2, 0 .pool -_080F22F4: +@080F22F4: ldr r0, =0x02021cc4 ldrh r1, [r5, 0x10] movs r4, 0xB @@ -460858,10 +460858,10 @@ _080F22F4: ldrh r1, [r5, 0x10] movs r0, 0x2 bl sub_80EF9E8 - b _080F233E + b @080F233E .align 2, 0 .pool -_080F2324: +@080F2324: ldr r0, =0x02021cc4 ldrh r1, [r5, 0x10] movs r4, 0xB @@ -460873,15 +460873,15 @@ _080F2324: adds r1, r5, 0x4 ldrb r2, [r5, 0x3] bl sub_81DB5E8 -_080F233E: +@080F233E: ldr r0, =0x0203a030 strb r4, [r0] - b _080F2358 + b @080F2358 .align 2, 0 .pool -_080F2354: +@080F2354: bl sub_80F577C -_080F2358: +@080F2358: ldr r0, =0x0858d1a0 lsls r1, r6, 2 adds r1, r0 @@ -460895,7 +460895,7 @@ _080F2358: thumb_func_end sub_80F211C thumb_func_start sub_80F2370 -sub_80F2370: @ 80F2370 +sub_80F2370: ; 80F2370 push {r4,r5,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -460913,26 +460913,26 @@ sub_80F2370: @ 80F2370 ldr r0, =0x0203a030 ldrb r5, [r0] cmp r5, 0x6 - bls _080F2396 - b _080F24C0 -_080F2396: + bls @080F2396 + b @080F24C0 +@080F2396: lsls r0, r5, 2 - ldr r1, =_080F23B8 + ldr r1, =@080F23B8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F23B8: - .4byte _080F23D4 - .4byte _080F2408 - .4byte _080F245C - .4byte _080F245C - .4byte _080F24A0 - .4byte _080F24A0 - .4byte _080F24BC -_080F23D4: +@080F23B8: + .4byte @080F23D4 + .4byte @080F2408 + .4byte @080F245C + .4byte @080F245C + .4byte @080F24A0 + .4byte @080F24A0 + .4byte @080F24BC +@080F23D4: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -460948,10 +460948,10 @@ _080F23D4: ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b _080F24C0 + b @080F24C0 .align 2, 0 .pool -_080F2408: +@080F2408: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -460970,21 +460970,21 @@ _080F2408: bl gf_strcpy ldrb r0, [r4, 0x11] cmp r0, 0x1 - bne _080F2450 + bne @080F2450 ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b _080F24C0 + b @080F24C0 .align 2, 0 .pool -_080F2450: +@080F2450: ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b _080F24C0 + b @080F24C0 .align 2, 0 .pool -_080F245C: +@080F245C: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -461000,21 +461000,21 @@ _080F245C: bl __umodsi3 lsls r0, 16 cmp r0, 0 - bne _080F2494 + bne @080F2494 ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] - b _080F24C0 + b @080F24C0 .align 2, 0 .pool -_080F2494: +@080F2494: ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b _080F24C0 + b @080F24C0 .align 2, 0 .pool -_080F24A0: +@080F24A0: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -461023,12 +461023,12 @@ _080F24A0: ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b _080F24C0 + b @080F24C0 .align 2, 0 .pool -_080F24BC: +@080F24BC: bl sub_80F577C -_080F24C0: +@080F24C0: ldr r0, =0x0858d394 lsls r1, r5, 2 adds r1, r0 @@ -461042,7 +461042,7 @@ _080F24C0: thumb_func_end sub_80F2370 thumb_func_start sub_80F24D8 -sub_80F24D8: @ 80F24D8 +sub_80F24D8: ; 80F24D8 push {r4-r7,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -461061,71 +461061,71 @@ sub_80F24D8: @ 80F24D8 ldrb r7, [r0] adds r6, r0, 0 cmp r7, 0x33 - bls _080F2500 - b _080F26F0 -_080F2500: + bls @080F2500 + b @080F26F0 +@080F2500: lsls r0, r7, 2 - ldr r1, =_080F2524 + ldr r1, =@080F2524 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F2524: - .4byte _080F25F4 - .4byte _080F2628 - .4byte _080F2654 - .4byte _080F265A - .4byte _080F2672 - .4byte _080F2672 - .4byte _080F2672 - .4byte _080F2684 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26F0 - .4byte _080F26A6 - .4byte _080F26CC -_080F25F4: +@080F2524: + .4byte @080F25F4 + .4byte @080F2628 + .4byte @080F2654 + .4byte @080F265A + .4byte @080F2672 + .4byte @080F2672 + .4byte @080F2672 + .4byte @080F2684 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26F0 + .4byte @080F26A6 + .4byte @080F26CC +@080F25F4: ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x10 @@ -461141,10 +461141,10 @@ _080F25F4: ldr r1, =0x0203a030 movs r0, 0x32 strb r0, [r1] - b _080F26F0 + b @080F26F0 .align 2, 0 .pool -_080F2628: +@080F2628: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -461152,25 +461152,25 @@ _080F2628: ands r0, r1 adds r2, r0, 0x1 cmp r2, 0x1 - bne _080F2648 + bne @080F2648 ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b _080F26F0 + b @080F26F0 .align 2, 0 .pool -_080F2648: +@080F2648: ldr r1, =0x0203a030 adds r0, r2, 0x2 strb r0, [r1] - b _080F26F0 + b @080F26F0 .align 2, 0 .pool -_080F2654: +@080F2654: movs r0, 0x33 strb r0, [r6] - b _080F26F0 -_080F265A: + b @080F26F0 +@080F265A: bl GenerateRandomNumber ldrb r4, [r6] adds r4, 0x1 @@ -461180,17 +461180,17 @@ _080F265A: bl __umodsi3 adds r0, r4 strb r0, [r6] - b _080F26F0 -_080F2672: + b @080F26F0 +@080F2672: adds r0, r5, 0 bl sub_80EFB58 ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] - b _080F26F0 + b @080F26F0 .align 2, 0 .pool -_080F2684: +@080F2684: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -461203,8 +461203,8 @@ _080F2684: adds r1, r2, 0 bl sub_80EF340 bl sub_80F577C - b _080F26F0 -_080F26A6: + b @080F26F0 +@080F26A6: ldr r4, =0x02021fc4 adds r1, r5, 0x4 adds r0, r4, 0 @@ -461216,10 +461216,10 @@ _080F26A6: ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b _080F26FC + b @080F26FC .align 2, 0 .pool -_080F26CC: +@080F26CC: ldr r4, =0x02021fc4 adds r1, r5, 0x4 adds r0, r4, 0 @@ -461231,16 +461231,16 @@ _080F26CC: ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b _080F26FC + b @080F26FC .align 2, 0 .pool -_080F26F0: +@080F26F0: ldr r0, =0x0858d150 lsls r1, r7, 2 adds r1, r0 ldr r0, [r1] bl box_related_two__2 -_080F26FC: +@080F26FC: pop {r4-r7} pop {r0} bx r0 @@ -461249,7 +461249,7 @@ _080F26FC: thumb_func_end sub_80F24D8 thumb_func_start sub_80F2708 -sub_80F2708: @ 80F2708 +sub_80F2708: ; 80F2708 push {r4-r7,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -461268,70 +461268,70 @@ sub_80F2708: @ 80F2708 ldrb r6, [r0] adds r7, r0, 0 cmp r6, 0x32 - bls _080F2730 - b _080F288C -_080F2730: + bls @080F2730 + b @080F288C +@080F2730: lsls r0, r6, 2 - ldr r1, =_080F2754 + ldr r1, =@080F2754 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F2754: - .4byte _080F2820 - .4byte _080F2844 - .4byte _080F285C - .4byte _080F285C - .4byte _080F285C - .4byte _080F2862 - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F288C - .4byte _080F2868 -_080F2820: +@080F2754: + .4byte @080F2820 + .4byte @080F2844 + .4byte @080F285C + .4byte @080F285C + .4byte @080F285C + .4byte @080F2862 + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F288C + .4byte @080F2868 +@080F2820: ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x10 @@ -461342,10 +461342,10 @@ _080F2820: ldr r1, =0x0203a030 movs r0, 0x32 strb r0, [r1] - b _080F288C + b @080F288C .align 2, 0 .pool -_080F2844: +@080F2844: bl GenerateRandomNumber ldrb r4, [r7] adds r4, 0x1 @@ -461355,15 +461355,15 @@ _080F2844: bl __umodsi3 adds r0, r4 strb r0, [r7] - b _080F288C -_080F285C: + b @080F288C +@080F285C: movs r0, 0x5 strb r0, [r7] - b _080F288C -_080F2862: + b @080F288C +@080F2862: bl sub_80F577C - b _080F288C -_080F2868: + b @080F288C +@080F2868: ldr r4, =0x02021fc4 adds r1, r5, 0x4 adds r0, r4, 0 @@ -461375,16 +461375,16 @@ _080F2868: ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b _080F2898 + b @080F2898 .align 2, 0 .pool -_080F288C: +@080F288C: ldr r0, =0x0858d170 lsls r1, r6, 2 adds r1, r0 ldr r0, [r1] bl box_related_two__2 -_080F2898: +@080F2898: pop {r4-r7} pop {r0} bx r0 @@ -461393,7 +461393,7 @@ _080F2898: thumb_func_end sub_80F2708 thumb_func_start sub_80F28A4 -sub_80F28A4: @ 80F28A4 +sub_80F28A4: ; 80F28A4 push {r4-r6,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -461411,19 +461411,19 @@ sub_80F28A4: @ 80F28A4 ldr r6, =0x0203a030 ldrb r5, [r6] cmp r5, 0x3 - bgt _080F28E8 + bgt @080F28E8 cmp r5, 0x1 - bge _080F2930 + bge @080F2930 cmp r5, 0 - beq _080F28EE - b _080F297E + beq @080F28EE + b @080F297E .align 2, 0 .pool -_080F28E8: +@080F28E8: cmp r5, 0x4 - beq _080F2968 - b _080F297E -_080F28EE: + beq @080F2968 + b @080F297E +@080F28EE: ldr r0, =0x02021cc4 adds r1, r4, 0x5 ldrb r2, [r4, 0xD] @@ -461444,10 +461444,10 @@ _080F28EE: lsrs r0, 4 adds r0, 0x1 strb r0, [r6] - b _080F297E + b @080F297E .align 2, 0 .pool -_080F2930: +@080F2930: ldr r0, =0x02021cc4 adds r1, r4, 0x5 ldrb r2, [r4, 0xD] @@ -461464,10 +461464,10 @@ _080F2930: bl sub_811EBBC movs r0, 0x4 strb r0, [r6] - b _080F297E + b @080F297E .align 2, 0 .pool -_080F2968: +@080F2968: ldr r0, =0x02021cc4 adds r1, r4, 0x5 ldrb r2, [r4, 0xD] @@ -461476,7 +461476,7 @@ _080F2968: ldrh r1, [r4, 0x1E] bl sub_811EBBC bl sub_80F577C -_080F297E: +@080F297E: ldr r0, =0x0858d188 lsls r1, r5, 2 adds r1, r0 @@ -461490,12 +461490,12 @@ _080F297E: thumb_func_end sub_80F28A4 thumb_func_start nullsub_46 -nullsub_46: @ 80F299C +nullsub_46: ; 80F299C bx lr thumb_func_end nullsub_46 thumb_func_start sub_80F29A0 -sub_80F29A0: @ 80F29A0 +sub_80F29A0: ; 80F29A0 push {r4,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -461535,7 +461535,7 @@ sub_80F29A0: @ 80F29A0 thumb_func_end sub_80F29A0 thumb_func_start sub_80F2A10 -sub_80F2A10: @ 80F2A10 +sub_80F2A10: ; 80F2A10 push {r4-r7,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -461554,52 +461554,52 @@ sub_80F2A10: @ 80F2A10 ldrb r7, [r0] adds r2, r0, 0 cmp r7, 0x20 - bls _080F2A38 - b _080F311C -_080F2A38: + bls @080F2A38 + b @080F311C +@080F2A38: lsls r0, r7, 2 - ldr r1, =_080F2A5C + ldr r1, =@080F2A5C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F2A5C: - .4byte _080F2AE0 - .4byte _080F2B54 - .4byte _080F2BA2 - .4byte _080F2BC8 - .4byte _080F2BF4 - .4byte _080F2D2C - .4byte _080F2D40 - .4byte _080F2D54 - .4byte _080F2D68 - .4byte _080F2DE8 - .4byte _080F2DFC - .4byte _080F2E10 - .4byte _080F2E24 - .4byte _080F2E38 - .4byte _080F2E4C - .4byte _080F2ECC - .4byte _080F2EE0 - .4byte _080F2EF4 - .4byte _080F2F08 - .4byte _080F2F1C - .4byte _080F2F30 - .4byte _080F2F44 - .4byte _080F2F58 - .4byte _080F2F94 - .4byte _080F3064 - .4byte _080F3080 - .4byte _080F30E0 - .4byte _080F30E0 - .4byte _080F30A8 - .4byte _080F30AE - .4byte _080F30E0 - .4byte _080F30E0 - .4byte _080F30FC -_080F2AE0: +@080F2A5C: + .4byte @080F2AE0 + .4byte @080F2B54 + .4byte @080F2BA2 + .4byte @080F2BC8 + .4byte @080F2BF4 + .4byte @080F2D2C + .4byte @080F2D40 + .4byte @080F2D54 + .4byte @080F2D68 + .4byte @080F2DE8 + .4byte @080F2DFC + .4byte @080F2E10 + .4byte @080F2E24 + .4byte @080F2E38 + .4byte @080F2E4C + .4byte @080F2ECC + .4byte @080F2EE0 + .4byte @080F2EF4 + .4byte @080F2F08 + .4byte @080F2F1C + .4byte @080F2F30 + .4byte @080F2F44 + .4byte @080F2F58 + .4byte @080F2F94 + .4byte @080F3064 + .4byte @080F3080 + .4byte @080F30E0 + .4byte @080F30E0 + .4byte @080F30A8 + .4byte @080F30AE + .4byte @080F30E0 + .4byte @080F30E0 + .4byte @080F30FC +@080F2AE0: ldr r0, =0x02021cc4 ldrb r1, [r6, 0x1C] bl sub_818E868 @@ -461618,39 +461618,39 @@ _080F2AE0: ldrb r0, [r6, 0xD] ldrb r1, [r6, 0xE] cmp r0, r1 - bne _080F2B38 + bne @080F2B38 cmp r0, 0 - bne _080F2B2C + bne @080F2B2C ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F2B2C: +@080F2B2C: ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F2B38: +@080F2B38: cmp r0, r1 - bls _080F2B48 + bls @080F2B48 ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F2B48: +@080F2B48: ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F2B54: +@080F2B54: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB @@ -461660,42 +461660,42 @@ _080F2B54: bl gf_strcpy ldrb r1, [r6, 0xF] cmp r1, 0x8 - bne _080F2B6C - b _080F2CF0 -_080F2B6C: + bne @080F2B6C + b @080F2CF0 +@080F2B6C: cmp r1, 0x8 - bgt _080F2B88 -_080F2B70: + bgt @080F2B88 +@080F2B70: cmp r1, 0x2 - bne _080F2B76 - b _080F2CD8 -_080F2B76: + bne @080F2B76 + b @080F2CD8 +@080F2B76: cmp r1, 0x2 - bgt _080F2B7C - b _080F2C96 -_080F2B7C: - b _080F2CAC + bgt @080F2B7C + b @080F2C96 +@080F2B7C: + b @080F2CAC .align 2, 0 .pool -_080F2B88: +@080F2B88: cmp r1, 0x20 - bne _080F2B8E - b _080F2D08 -_080F2B8E: + bne @080F2B8E + b @080F2D08 +@080F2B8E: cmp r1, 0x20 - bgt _080F2B94 - b _080F2CBA -_080F2B94: + bgt @080F2B94 + b @080F2CBA +@080F2B94: cmp r1, 0x40 - bne _080F2B9A - b _080F2D14 -_080F2B9A: + bne @080F2B9A + b @080F2D14 +@080F2B9A: cmp r1, 0x80 - beq _080F2BA0 - b _080F311C -_080F2BA0: - b _080F2D20 -_080F2BA2: + beq @080F2BA0 + b @080F311C +@080F2BA0: + b @080F2D20 +@080F2BA2: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB @@ -461703,18 +461703,18 @@ _080F2BA2: ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy -_080F2BB2: +@080F2BB2: ldrb r1, [r6, 0xF] cmp r1, 0x8 - bne _080F2BBA - b _080F2CF0 -_080F2BBA: + bne @080F2BBA + b @080F2CF0 +@080F2BBA: cmp r1, 0x8 - ble _080F2B70 - b _080F2B88 + ble @080F2B70 + b @080F2B88 .align 2, 0 .pool -_080F2BC8: +@080F2BC8: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB @@ -461727,60 +461727,60 @@ _080F2BC8: adds r1, 0x14 ldrb r2, [r6, 0x1D] bl sub_81DB5E8 - b _080F2BB2 + b @080F2BB2 .align 2, 0 .pool -_080F2BF4: +@080F2BF4: ldrb r0, [r6, 0x1C] cmp r0, 0x4 - bhi _080F2C74 + bhi @080F2C74 lsls r0, 2 - ldr r1, =_080F2C08 + ldr r1, =@080F2C08 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F2C08: - .4byte _080F2C1C - .4byte _080F2C30 - .4byte _080F2C44 - .4byte _080F2C58 - .4byte _080F2C6C -_080F2C1C: +@080F2C08: + .4byte @080F2C1C + .4byte @080F2C30 + .4byte @080F2C44 + .4byte @080F2C58 + .4byte @080F2C6C +@080F2C1C: ldr r0, =0x02021cc4 ldr r1, =0x085eb0e8 bl gf_strcpy - b _080F2C74 + b @080F2C74 .align 2, 0 .pool -_080F2C30: +@080F2C30: ldr r0, =0x02021cc4 ldr r1, =0x085eb0ed bl gf_strcpy - b _080F2C74 + b @080F2C74 .align 2, 0 .pool -_080F2C44: +@080F2C44: ldr r0, =0x02021cc4 ldr r1, =0x085eb0f4 bl gf_strcpy - b _080F2C74 + b @080F2C74 .align 2, 0 .pool -_080F2C58: +@080F2C58: ldr r0, =0x02021cc4 ldr r1, =0x085eb0f9 bl gf_strcpy - b _080F2C74 + b @080F2C74 .align 2, 0 .pool -_080F2C6C: +@080F2C6C: ldr r0, =0x02021cc4 ldr r1, =0x085eb0ff bl gf_strcpy -_080F2C74: +@080F2C74: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB @@ -461790,122 +461790,122 @@ _080F2C74: bl gf_strcpy ldrb r1, [r6, 0xF] cmp r1, 0x8 - beq _080F2CF0 + beq @080F2CF0 cmp r1, 0x8 - bgt _080F2CB2 + bgt @080F2CB2 cmp r1, 0x2 - beq _080F2CD8 + beq @080F2CD8 cmp r1, 0x2 - bgt _080F2CAC -_080F2C96: + bgt @080F2CAC +@080F2C96: cmp r1, 0x1 - beq _080F2CCA - b _080F311C + beq @080F2CCA + b @080F311C .align 2, 0 .pool -_080F2CAC: +@080F2CAC: cmp r1, 0x4 - beq _080F2CE4 - b _080F311C -_080F2CB2: + beq @080F2CE4 + b @080F311C +@080F2CB2: cmp r1, 0x20 - beq _080F2D08 + beq @080F2D08 cmp r1, 0x20 - bgt _080F2CC0 -_080F2CBA: + bgt @080F2CC0 +@080F2CBA: cmp r1, 0x10 - beq _080F2CFC - b _080F311C -_080F2CC0: + beq @080F2CFC + b @080F311C +@080F2CC0: cmp r1, 0x40 - beq _080F2D14 + beq @080F2D14 cmp r1, 0x80 - beq _080F2D20 - b _080F311C -_080F2CCA: + beq @080F2D20 + b @080F311C +@080F2CCA: ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F2CD8: +@080F2CD8: ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F2CE4: +@080F2CE4: ldr r1, =0x0203a030 movs r0, 0xE strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F2CF0: +@080F2CF0: ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F2CFC: +@080F2CFC: ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F2D08: +@080F2D08: ldr r1, =0x0203a030 movs r0, 0x14 strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F2D14: +@080F2D14: ldr r1, =0x0203a030 movs r0, 0x15 strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F2D20: +@080F2D20: ldr r1, =0x0203a030 movs r0, 0x16 strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F2D2C: +@080F2D2C: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =0x083185c8 - b _080F2F72 + b @080F2F72 .align 2, 0 .pool -_080F2D40: +@080F2D40: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =0x083185c8 - b _080F2F72 + b @080F2F72 .align 2, 0 .pool -_080F2D54: +@080F2D54: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =0x083185c8 - b _080F2F72 + b @080F2F72 .align 2, 0 .pool -_080F2D68: +@080F2D68: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB @@ -461915,104 +461915,104 @@ _080F2D68: bl gf_strcpy ldrb r0, [r6, 0x1C] cmp r0, 0x4 - bls _080F2D80 - b _080F311C -_080F2D80: + bls @080F2D80 + b @080F311C +@080F2D80: lsls r0, 2 - ldr r1, =_080F2D98 + ldr r1, =@080F2D98 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F2D98: - .4byte _080F2DAC - .4byte _080F2DB8 - .4byte _080F2DC4 - .4byte _080F2DD0 - .4byte _080F2DDC -_080F2DAC: +@080F2D98: + .4byte @080F2DAC + .4byte @080F2DB8 + .4byte @080F2DC4 + .4byte @080F2DD0 + .4byte @080F2DDC +@080F2DAC: ldr r1, =0x0203a030 movs r0, 0x9 strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F2DB8: +@080F2DB8: ldr r1, =0x0203a030 movs r0, 0xA strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F2DC4: +@080F2DC4: ldr r1, =0x0203a030 movs r0, 0xB strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F2DD0: +@080F2DD0: ldr r1, =0x0203a030 movs r0, 0xC strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F2DDC: +@080F2DDC: ldr r1, =0x0203a030 movs r0, 0xD strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F2DE8: +@080F2DE8: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =0x083185c8 - b _080F2F72 + b @080F2F72 .align 2, 0 .pool -_080F2DFC: +@080F2DFC: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =0x083185c8 - b _080F2F72 + b @080F2F72 .align 2, 0 .pool -_080F2E10: +@080F2E10: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =0x083185c8 - b _080F2F72 + b @080F2F72 .align 2, 0 .pool -_080F2E24: +@080F2E24: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =0x083185c8 - b _080F2F72 + b @080F2F72 .align 2, 0 .pool -_080F2E38: +@080F2E38: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =0x083185c8 - b _080F2F72 + b @080F2F72 .align 2, 0 .pool -_080F2E4C: +@080F2E4C: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB @@ -462022,122 +462022,122 @@ _080F2E4C: bl gf_strcpy ldrb r0, [r6, 0x1C] cmp r0, 0x4 - bls _080F2E64 - b _080F311C -_080F2E64: + bls @080F2E64 + b @080F311C +@080F2E64: lsls r0, 2 - ldr r1, =_080F2E7C + ldr r1, =@080F2E7C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F2E7C: - .4byte _080F2E90 - .4byte _080F2E9C - .4byte _080F2EA8 - .4byte _080F2EB4 - .4byte _080F2EC0 -_080F2E90: +@080F2E7C: + .4byte @080F2E90 + .4byte @080F2E9C + .4byte @080F2EA8 + .4byte @080F2EB4 + .4byte @080F2EC0 +@080F2E90: ldr r1, =0x0203a030 movs r0, 0xF strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F2E9C: +@080F2E9C: ldr r1, =0x0203a030 movs r0, 0x10 strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F2EA8: +@080F2EA8: ldr r1, =0x0203a030 movs r0, 0x11 strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F2EB4: +@080F2EB4: ldr r1, =0x0203a030 movs r0, 0x12 strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F2EC0: +@080F2EC0: ldr r1, =0x0203a030 movs r0, 0x13 strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F2ECC: +@080F2ECC: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =0x083185c8 - b _080F2F72 + b @080F2F72 .align 2, 0 .pool -_080F2EE0: +@080F2EE0: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =0x083185c8 - b _080F2F72 + b @080F2F72 .align 2, 0 .pool -_080F2EF4: +@080F2EF4: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =0x083185c8 - b _080F2F72 + b @080F2F72 .align 2, 0 .pool -_080F2F08: +@080F2F08: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =0x083185c8 - b _080F2F72 + b @080F2F72 .align 2, 0 .pool -_080F2F1C: +@080F2F1C: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =0x083185c8 - b _080F2F72 + b @080F2F72 .align 2, 0 .pool -_080F2F30: +@080F2F30: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =0x083185c8 - b _080F2F72 + b @080F2F72 .align 2, 0 .pool -_080F2F44: +@080F2F44: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =0x083185c8 - b _080F2F72 + b @080F2F72 .align 2, 0 .pool -_080F2F58: +@080F2F58: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB @@ -462150,16 +462150,16 @@ _080F2F58: movs r1, 0xD muls r1, r2 ldr r2, =0x0831977c -_080F2F72: +@080F2F72: adds r1, r2 bl gf_strcpy ldr r1, =0x0203a030 movs r0, 0x17 strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F2F94: +@080F2F94: ldr r0, =0x02021cc4 ldrh r1, [r6, 0x12] movs r5, 0xB @@ -462178,93 +462178,93 @@ _080F2F94: bl gf_strcpy ldrb r0, [r6, 0xC] cmp r0, 0x8 - beq _080F3028 + beq @080F3028 cmp r0, 0x8 - bgt _080F2FEA + bgt @080F2FEA cmp r0, 0x2 - beq _080F3010 + beq @080F3010 cmp r0, 0x2 - bgt _080F2FE4 + bgt @080F2FE4 cmp r0, 0x1 - beq _080F3002 - b _080F311C + beq @080F3002 + b @080F311C .align 2, 0 .pool -_080F2FE4: +@080F2FE4: cmp r0, 0x4 - beq _080F301C - b _080F311C -_080F2FEA: + beq @080F301C + b @080F311C +@080F2FEA: cmp r0, 0x20 - beq _080F3040 + beq @080F3040 cmp r0, 0x20 - bgt _080F2FF8 + bgt @080F2FF8 cmp r0, 0x10 - beq _080F3034 - b _080F311C -_080F2FF8: + beq @080F3034 + b @080F311C +@080F2FF8: cmp r0, 0x40 - beq _080F304C + beq @080F304C cmp r0, 0x80 - beq _080F3058 - b _080F311C -_080F3002: + beq @080F3058 + b @080F311C +@080F3002: ldr r1, =0x0203a030 movs r0, 0x1F strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F3010: +@080F3010: ldr r1, =0x0203a030 movs r0, 0x1E strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F301C: +@080F301C: ldr r1, =0x0203a030 movs r0, 0x1D strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F3028: +@080F3028: ldr r1, =0x0203a030 movs r0, 0x1C strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F3034: +@080F3034: ldr r1, =0x0203a030 movs r0, 0x1B strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F3040: +@080F3040: ldr r1, =0x0203a030 movs r0, 0x1A strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F304C: +@080F304C: ldr r1, =0x0203a030 movs r0, 0x19 strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F3058: +@080F3058: ldr r1, =0x0203a030 movs r0, 0x18 strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F3064: +@080F3064: ldr r0, =0x02021cc4 ldrh r2, [r6, 0x2] movs r1, 0xB @@ -462272,10 +462272,10 @@ _080F3064: ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - b _080F30EA + b @080F30EA .align 2, 0 .pool -_080F3080: +@080F3080: ldr r0, =0x02021cc4 adds r1, r6, 0x4 ldrb r2, [r6, 0x1E] @@ -462287,14 +462287,14 @@ _080F3080: ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - b _080F30EA + b @080F30EA .align 2, 0 .pool -_080F30A8: +@080F30A8: movs r0, 0x20 strb r0, [r2] - b _080F311C -_080F30AE: + b @080F311C +@080F30AE: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x14 @@ -462308,23 +462308,23 @@ _080F30AE: adds r1, r2 bl gf_strcpy ldr r0, =0x02021ec4 - b _080F30E2 + b @080F30E2 .align 2, 0 .pool -_080F30E0: +@080F30E0: ldr r0, =0x02021cc4 -_080F30E2: +@080F30E2: adds r1, r6, 0x4 ldrb r2, [r6, 0x1E] bl sub_81DB5E8 -_080F30EA: +@080F30EA: ldr r1, =0x0203a030 movs r0, 0x20 strb r0, [r1] - b _080F311C + b @080F311C .align 2, 0 .pool -_080F30FC: +@080F30FC: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x14 @@ -462338,7 +462338,7 @@ _080F30FC: adds r1, r2 bl gf_strcpy bl sub_80F577C -_080F311C: +@080F311C: ldr r0, =0x0858d27c lsls r1, r7, 2 adds r1, r0 @@ -462352,7 +462352,7 @@ _080F311C: thumb_func_end sub_80F2A10 thumb_func_start sub_80F3140 -sub_80F3140: @ 80F3140 +sub_80F3140: ; 80F3140 push {r4,r5,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -462371,46 +462371,46 @@ sub_80F3140: @ 80F3140 ldrb r5, [r0] adds r2, r0, 0 cmp r5, 0x7 - bls _080F3168 - b _080F3362 -_080F3168: + bls @080F3168 + b @080F3362 +@080F3168: lsls r0, r5, 2 - ldr r1, =_080F318C + ldr r1, =@080F318C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F318C: - .4byte _080F31AC - .4byte _080F31CA - .4byte _080F321C - .4byte _080F3268 - .4byte _080F329C - .4byte _080F32C0 - .4byte _080F32EC - .4byte _080F3338 -_080F31AC: +@080F318C: + .4byte @080F31AC + .4byte @080F31CA + .4byte @080F321C + .4byte @080F3268 + .4byte @080F329C + .4byte @080F32C0 + .4byte @080F32EC + .4byte @080F3338 +@080F31AC: ldrb r1, [r4, 0x18] cmp r1, 0 - bge _080F31B4 - b _080F3362 -_080F31B4: + bge @080F31B4 + b @080F3362 +@080F31B4: cmp r1, 0x1 - ble _080F31BE + ble @080F31BE cmp r1, 0x2 - beq _080F31C4 - b _080F3362 -_080F31BE: + beq @080F31C4 + b @080F3362 +@080F31BE: movs r0, 0x1 strb r0, [r2] - b _080F3362 -_080F31C4: + b @080F3362 +@080F31C4: movs r0, 0x5 strb r0, [r2] - b _080F3362 -_080F31CA: + b @080F3362 +@080F31CA: ldr r0, =0x02021cc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x19] @@ -462422,25 +462422,25 @@ _080F31CA: bl sub_81DB5E8 ldrb r0, [r4, 0x18] cmp r0, 0 - bne _080F3200 + bne @080F3200 ldr r0, =0x02021ec4 ldr r1, =0x085ecb64 bl gf_strcpy - b _080F3208 + b @080F3208 .align 2, 0 .pool -_080F3200: +@080F3200: ldr r0, =0x02021ec4 ldr r1, =0x085ecb6b bl gf_strcpy -_080F3208: +@080F3208: ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b _080F3362 + b @080F3362 .align 2, 0 .pool -_080F321C: +@080F321C: ldr r0, =0x02021cc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x19] @@ -462462,10 +462462,10 @@ _080F321C: ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b _080F3362 + b @080F3362 .align 2, 0 .pool -_080F3268: +@080F3268: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC @@ -462481,10 +462481,10 @@ _080F3268: ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b _080F3362 + b @080F3362 .align 2, 0 .pool -_080F329C: +@080F329C: ldr r0, =0x02021cc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x19] @@ -462495,10 +462495,10 @@ _080F329C: ldrb r2, [r4, 0x1A] bl sub_81DB5E8 bl sub_80F577C - b _080F3362 + b @080F3362 .align 2, 0 .pool -_080F32C0: +@080F32C0: ldr r0, =0x02021cc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x19] @@ -462511,10 +462511,10 @@ _080F32C0: ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b _080F3362 + b @080F3362 .align 2, 0 .pool -_080F32EC: +@080F32EC: ldr r0, =0x02021cc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x19] @@ -462536,10 +462536,10 @@ _080F32EC: ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] - b _080F3362 + b @080F3362 .align 2, 0 .pool -_080F3338: +@080F3338: ldr r0, =0x02021cc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x19] @@ -462557,7 +462557,7 @@ _080F3338: adds r1, r2 bl gf_strcpy bl sub_80F577C -_080F3362: +@080F3362: ldr r0, =0x0858d300 lsls r1, r5, 2 adds r1, r0 @@ -462571,7 +462571,7 @@ _080F3362: thumb_func_end sub_80F3140 thumb_func_start sub_80F3388 -sub_80F3388: @ 80F3388 +sub_80F3388: ; 80F3388 push {r4,r5,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -462589,25 +462589,25 @@ sub_80F3388: @ 80F3388 ldr r0, =0x0203a030 ldrb r5, [r0] cmp r5, 0x5 - bls _080F33AE - b _080F3624 -_080F33AE: + bls @080F33AE + b @080F3624 +@080F33AE: lsls r0, r5, 2 - ldr r1, =_080F33D0 + ldr r1, =@080F33D0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F33D0: - .4byte _080F33E8 - .4byte _080F3418 - .4byte _080F3500 - .4byte _080F350C - .4byte _080F35F4 - .4byte _080F3620 -_080F33E8: +@080F33D0: + .4byte @080F33E8 + .4byte @080F3418 + .4byte @080F3500 + .4byte @080F350C + .4byte @080F35F4 + .4byte @080F3620 +@080F33E8: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC @@ -462615,96 +462615,96 @@ _080F33E8: bl sub_81DB5E8 ldrb r0, [r4, 0x2] cmp r0, 0x14 - bls _080F340C + bls @080F340C ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b _080F3624 + b @080F3624 .align 2, 0 .pool -_080F340C: +@080F340C: ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b _080F3624 + b @080F3624 .align 2, 0 .pool -_080F3418: +@080F3418: ldrb r0, [r4, 0x3] lsls r0, 29 lsrs r0, 29 cmp r0, 0x4 - bhi _080F349C + bhi @080F349C lsls r0, 2 - ldr r1, =_080F3430 + ldr r1, =@080F3430 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F3430: - .4byte _080F3444 - .4byte _080F3458 - .4byte _080F346C - .4byte _080F3480 - .4byte _080F3494 -_080F3444: +@080F3430: + .4byte @080F3444 + .4byte @080F3458 + .4byte @080F346C + .4byte @080F3480 + .4byte @080F3494 +@080F3444: ldr r0, =0x02021cc4 ldr r1, =0x085ecb48 bl gf_strcpy - b _080F349C + b @080F349C .align 2, 0 .pool -_080F3458: +@080F3458: ldr r0, =0x02021cc4 ldr r1, =0x085ecb4e bl gf_strcpy - b _080F349C + b @080F349C .align 2, 0 .pool -_080F346C: +@080F346C: ldr r0, =0x02021cc4 ldr r1, =0x085ecb52 bl gf_strcpy - b _080F349C + b @080F349C .align 2, 0 .pool -_080F3480: +@080F3480: ldr r0, =0x02021cc4 ldr r1, =0x085ecb58 bl gf_strcpy - b _080F349C + b @080F349C .align 2, 0 .pool -_080F3494: +@080F3494: ldr r0, =0x02021cc4 ldr r1, =0x085ecb5f bl gf_strcpy -_080F349C: +@080F349C: ldrb r0, [r4, 0x2] cmp r0, 0x18 - bls _080F34BC + bls @080F34BC ldr r0, =0x02021dc4 ldr r1, =0x085ecb2a bl gf_strcpy - b _080F34DC + b @080F34DC .align 2, 0 .pool -_080F34BC: +@080F34BC: cmp r0, 0x16 - bls _080F34D4 + bls @080F34D4 ldr r0, =0x02021dc4 ldr r1, =0x085ecb20 bl gf_strcpy - b _080F34DC + b @080F34DC .align 2, 0 .pool -_080F34D4: +@080F34D4: ldr r0, =0x02021dc4 ldr r1, =0x085ecb1b bl gf_strcpy -_080F34DC: +@080F34DC: ldr r0, =0x02021ec4 adds r1, r4, 0 adds r1, 0xC @@ -462713,92 +462713,92 @@ _080F34DC: ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b _080F3624 + b @080F3624 .align 2, 0 .pool -_080F3500: +@080F3500: ldr r0, =0x02021cc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x15] - b _080F3606 + b @080F3606 .align 2, 0 .pool -_080F350C: +@080F350C: ldrb r0, [r4, 0x3] lsls r0, 29 lsrs r0, 29 cmp r0, 0x4 - bhi _080F3590 + bhi @080F3590 lsls r0, 2 - ldr r1, =_080F3524 + ldr r1, =@080F3524 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F3524: - .4byte _080F3538 - .4byte _080F354C - .4byte _080F3560 - .4byte _080F3574 - .4byte _080F3588 -_080F3538: +@080F3524: + .4byte @080F3538 + .4byte @080F354C + .4byte @080F3560 + .4byte @080F3574 + .4byte @080F3588 +@080F3538: ldr r0, =0x02021cc4 ldr r1, =0x085ecb48 bl gf_strcpy - b _080F3590 + b @080F3590 .align 2, 0 .pool -_080F354C: +@080F354C: ldr r0, =0x02021cc4 ldr r1, =0x085ecb4e bl gf_strcpy - b _080F3590 + b @080F3590 .align 2, 0 .pool -_080F3560: +@080F3560: ldr r0, =0x02021cc4 ldr r1, =0x085ecb52 bl gf_strcpy - b _080F3590 + b @080F3590 .align 2, 0 .pool -_080F3574: +@080F3574: ldr r0, =0x02021cc4 ldr r1, =0x085ecb58 bl gf_strcpy - b _080F3590 + b @080F3590 .align 2, 0 .pool -_080F3588: +@080F3588: ldr r0, =0x02021cc4 ldr r1, =0x085ecb5f bl gf_strcpy -_080F3590: +@080F3590: ldrb r0, [r4, 0x2] cmp r0, 0x10 - bls _080F35B0 + bls @080F35B0 ldr r0, =0x02021dc4 ldr r1, =0x085ecb34 bl gf_strcpy - b _080F35D0 + b @080F35D0 .align 2, 0 .pool -_080F35B0: +@080F35B0: cmp r0, 0xD - bls _080F35C8 + bls @080F35C8 ldr r0, =0x02021dc4 ldr r1, =0x085ecb3a bl gf_strcpy - b _080F35D0 + b @080F35D0 .align 2, 0 .pool -_080F35C8: +@080F35C8: ldr r0, =0x02021dc4 ldr r1, =0x085ecb3e bl gf_strcpy -_080F35D0: +@080F35D0: ldr r0, =0x02021ec4 adds r1, r4, 0 adds r1, 0xC @@ -462807,10 +462807,10 @@ _080F35D0: ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b _080F3624 + b @080F3624 .align 2, 0 .pool -_080F35F4: +@080F35F4: ldr r0, =0x02021cc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x15] @@ -462819,17 +462819,17 @@ _080F35F4: adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x14] -_080F3606: +@080F3606: bl sub_81DB5E8 ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] - b _080F3624 + b @080F3624 .align 2, 0 .pool -_080F3620: +@080F3620: bl sub_80F577C -_080F3624: +@080F3624: ldr r0, =0x0858d228 lsls r1, r5, 2 adds r1, r0 @@ -462843,7 +462843,7 @@ _080F3624: thumb_func_end sub_80F3388 thumb_func_start sub_80F363C -sub_80F363C: @ 80F363C +sub_80F363C: ; 80F363C push {r4-r7,lr} ldr r0, =0x020375f0 movs r1, 0 @@ -462852,28 +462852,28 @@ sub_80F363C: @ 80F363C ldrb r7, [r0] adds r2, r0, 0 cmp r7, 0x8 - bls _080F3650 - b _080F37EA -_080F3650: + bls @080F3650 + b @080F37EA +@080F3650: lsls r0, r7, 2 - ldr r1, =_080F3668 + ldr r1, =@080F3668 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F3668: - .4byte _080F368C - .4byte _080F36D4 - .4byte _080F36DA - .4byte _080F372C - .4byte _080F379C - .4byte _080F379C - .4byte _080F379C - .4byte _080F379C - .4byte _080F37A2 -_080F368C: +@080F3668: + .4byte @080F368C + .4byte @080F36D4 + .4byte @080F36DA + .4byte @080F372C + .4byte @080F379C + .4byte @080F379C + .4byte @080F379C + .4byte @080F379C + .4byte @080F37A2 +@080F368C: ldr r0, =0x02021cc4 ldr r4, =0x03005d8c ldr r1, [r4] @@ -462887,25 +462887,25 @@ _080F368C: adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - bls _080F36C8 + bls @080F36C8 ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b _080F37EA + b @080F37EA .align 2, 0 .pool -_080F36C8: +@080F36C8: ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b _080F37EA + b @080F37EA .align 2, 0 .pool -_080F36D4: +@080F36D4: movs r0, 0x2 strb r0, [r2] - b _080F37EA -_080F36DA: + b @080F37EA +@080F36DA: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00002bae @@ -462914,41 +462914,41 @@ _080F36DA: movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080F36FC + bne @080F36FC movs r0, 0x4 strb r0, [r2] - b _080F37EA + b @080F37EA .align 2, 0 .pool -_080F36FC: +@080F36FC: movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _080F370A + beq @080F370A movs r0, 0x5 strb r0, [r2] - b _080F37EA -_080F370A: + b @080F37EA +@080F370A: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080F3718 + beq @080F3718 movs r0, 0x6 strb r0, [r2] - b _080F37EA -_080F3718: + b @080F37EA +@080F3718: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080F3726 + beq @080F3726 movs r0, 0x7 strb r0, [r2] - b _080F37EA -_080F3726: + b @080F37EA +@080F3726: movs r0, 0x3 strb r0, [r2] - b _080F37EA -_080F372C: + b @080F37EA +@080F372C: ldr r0, =0x02021cc4 ldr r4, =0x03005d8c ldr r1, [r4] @@ -462981,14 +462981,14 @@ _080F372C: ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] - b _080F37EA + b @080F37EA .align 2, 0 .pool -_080F379C: +@080F379C: movs r0, 0x8 strb r0, [r2] - b _080F37EA -_080F37A2: + b @080F37EA +@080F37A2: ldr r0, =0x02021cc4 ldr r4, =0x03005d8c ldr r1, [r4] @@ -463021,7 +463021,7 @@ _080F37A2: movs r0, 0 strb r0, [r1] bl sub_80EC4E8 -_080F37EA: +@080F37EA: ldr r0, =0x0858d66c lsls r1, r7, 2 adds r1, r0 @@ -463035,7 +463035,7 @@ _080F37EA: thumb_func_end sub_80F363C thumb_func_start sub_80F3828 -sub_80F3828: @ 80F3828 +sub_80F3828: ; 80F3828 push {r4,r5,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -463053,27 +463053,27 @@ sub_80F3828: @ 80F3828 ldrb r0, [r4, 0x2] ldrb r2, [r4, 0x3] cmp r0, r2 - bcs _080F3868 + bcs @080F3868 ldr r0, =0x0203a030 strb r1, [r0] - b _080F3870 + b @080F3870 .align 2, 0 .pool -_080F3868: +@080F3868: ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] adds r0, r1, 0 -_080F3870: +@080F3870: ldrb r5, [r0] cmp r5, 0 - beq _080F3880 + beq @080F3880 cmp r5, 0x1 - beq _080F38B8 - b _080F38E0 + beq @080F38B8 + b @080F38E0 .align 2, 0 .pool -_080F3880: +@080F3880: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -463090,10 +463090,10 @@ _080F3880: movs r0, 0x2 bl sub_80EF340 bl sub_80F577C - b _080F38E0 + b @080F38E0 .align 2, 0 .pool -_080F38B8: +@080F38B8: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -463110,7 +463110,7 @@ _080F38B8: movs r0, 0x2 bl sub_80EF340 bl sub_80F577C -_080F38E0: +@080F38E0: ldr r0, =0x0858d3b0 lsls r1, r5, 2 adds r1, r0 @@ -463124,7 +463124,7 @@ _080F38E0: thumb_func_end sub_80F3828 thumb_func_start sub_80F3904 -sub_80F3904: @ 80F3904 +sub_80F3904: ; 80F3904 push {r4-r6,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -463142,19 +463142,19 @@ sub_80F3904: @ 80F3904 ldr r6, =0x0203a030 ldrb r5, [r6] cmp r5, 0x1 - beq _080F3974 + beq @080F3974 cmp r5, 0x1 - bgt _080F3948 + bgt @080F3948 cmp r5, 0 - beq _080F394E - b _080F39BE + beq @080F394E + b @080F39BE .align 2, 0 .pool -_080F3948: +@080F3948: cmp r5, 0x2 - beq _080F3994 - b _080F39BE -_080F394E: + beq @080F3994 + b @080F39BE +@080F394E: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -463168,10 +463168,10 @@ _080F394E: bl sub_80EF340 movs r0, 0x1 strb r0, [r6] - b _080F39BE + b @080F39BE .align 2, 0 .pool -_080F3974: +@080F3974: ldr r0, =0x02021cc4 ldrh r2, [r4, 0x8] movs r1, 0xB @@ -463181,10 +463181,10 @@ _080F3974: bl gf_strcpy movs r0, 0x2 strb r0, [r6] - b _080F39BE + b @080F39BE .align 2, 0 .pool -_080F3994: +@080F3994: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -463202,7 +463202,7 @@ _080F3994: adds r1, r2 bl gf_strcpy bl sub_80F577C -_080F39BE: +@080F39BE: ldr r0, =0x0858d3b8 lsls r1, r5, 2 adds r1, r0 @@ -463216,7 +463216,7 @@ _080F39BE: thumb_func_end sub_80F3904 thumb_func_start sub_80F39E4 -sub_80F39E4: @ 80F39E4 +sub_80F39E4: ; 80F39E4 push {r4,r5,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -463235,60 +463235,60 @@ sub_80F39E4: @ 80F39E4 ldrb r5, [r0] adds r2, r0, 0 cmp r5, 0xA - bls _080F3A0C - b _080F3BE8 -_080F3A0C: + bls @080F3A0C + b @080F3BE8 +@080F3A0C: lsls r0, r5, 2 - ldr r1, =_080F3A30 + ldr r1, =@080F3A30 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F3A30: - .4byte _080F3A5C - .4byte _080F3B30 - .4byte _080F3B58 - .4byte _080F3B90 - .4byte _080F3BA2 - .4byte _080F3BC4 - .4byte _080F3BD8 - .4byte _080F3A92 - .4byte _080F3AC0 - .4byte _080F3ADC - .4byte _080F3AF8 -_080F3A5C: +@080F3A30: + .4byte @080F3A5C + .4byte @080F3B30 + .4byte @080F3B58 + .4byte @080F3B90 + .4byte @080F3BA2 + .4byte @080F3BC4 + .4byte @080F3BD8 + .4byte @080F3A92 + .4byte @080F3AC0 + .4byte @080F3ADC + .4byte @080F3AF8 +@080F3A5C: ldrb r0, [r4, 0x7] cmp r0, 0x56 - beq _080F3A6C + beq @080F3A6C cmp r0, 0x57 - beq _080F3A72 + beq @080F3A72 movs r0, 0x7 strb r0, [r2] - b _080F3BE8 -_080F3A6C: + b @080F3BE8 +@080F3A6C: movs r0, 0x8 strb r0, [r2] - b _080F3BE8 -_080F3A72: + b @080F3BE8 +@080F3A72: ldrh r1, [r4, 0xA] ldr r0, =0x00000117 cmp r1, r0 - bgt _080F3A8C + bgt @080F3A8C subs r0, 0x2 cmp r1, r0 - blt _080F3A8C + blt @080F3A8C movs r0, 0xA strb r0, [r2] - b _080F3BE8 + b @080F3BE8 .align 2, 0 .pool -_080F3A8C: +@080F3A8C: movs r0, 0x9 strb r0, [r2] - b _080F3BE8 -_080F3A92: + b @080F3BE8 +@080F3A92: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -463301,14 +463301,14 @@ _080F3A92: ldrb r1, [r4, 0x7] movs r2, 0 bl GetMapName -_080F3AB0: +@080F3AB0: ldrb r0, [r4, 0x4] cmp r0, 0 - bne _080F3B12 - b _080F3B24 + bne @080F3B12 + b @080F3B24 .align 2, 0 .pool -_080F3AC0: +@080F3AC0: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -463317,10 +463317,10 @@ _080F3AC0: ldrh r1, [r4, 0x2] movs r0, 0x1 bl sub_80EF340 - b _080F3AB0 + b @080F3AB0 .align 2, 0 .pool -_080F3ADC: +@080F3ADC: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -463329,10 +463329,10 @@ _080F3ADC: ldrh r1, [r4, 0x2] movs r0, 0x1 bl sub_80EF340 - b _080F3AB0 + b @080F3AB0 .align 2, 0 .pool -_080F3AF8: +@080F3AF8: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -463343,22 +463343,22 @@ _080F3AF8: bl sub_80EF340 ldrb r0, [r4, 0x4] cmp r0, 0 - beq _080F3B24 -_080F3B12: + beq @080F3B24 +@080F3B12: ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b _080F3BE8 + b @080F3BE8 .align 2, 0 .pool -_080F3B24: +@080F3B24: ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b _080F3BE8 + b @080F3BE8 .align 2, 0 .pool -_080F3B30: +@080F3B30: ldrb r1, [r4, 0x4] movs r0, 0 bl sub_80EF340 @@ -463366,52 +463366,52 @@ _080F3B30: bl flag_check lsls r0, 24 cmp r0, 0 - beq _080F3BCC + beq @080F3BCC ldr r0, [r4, 0x4] ldr r1, =0x00ffff00 ands r0, r1 cmp r0, 0 - bne _080F3B6E - b _080F3B84 + bne @080F3B6E + b @080F3B84 .align 2, 0 .pool -_080F3B58: +@080F3B58: ldr r0, =0x000008a8 bl flag_check lsls r0, 24 cmp r0, 0 - beq _080F3BCC + beq @080F3BCC ldr r0, [r4, 0x4] ldr r1, =0x00ffff00 ands r0, r1 cmp r0, 0 - beq _080F3B84 -_080F3B6E: + beq @080F3B84 +@080F3B6E: ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b _080F3BE8 + b @080F3BE8 .align 2, 0 .pool -_080F3B84: +@080F3B84: ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b _080F3BE8 + b @080F3BE8 .align 2, 0 .pool -_080F3B90: +@080F3B90: ldrh r0, [r4, 0x8] cmp r0, 0 - bne _080F3B9C + bne @080F3B9C movs r0, 0x6 strb r0, [r2] - b _080F3BE8 -_080F3B9C: + b @080F3BE8 +@080F3B9C: movs r0, 0x5 strb r0, [r2] - b _080F3BE8 -_080F3BA2: + b @080F3BE8 +@080F3BA2: ldrb r1, [r4, 0x6] movs r0, 0 bl sub_80EF340 @@ -463420,32 +463420,32 @@ _080F3BA2: bl sub_80EF340 ldrh r0, [r4, 0x8] cmp r0, 0 - beq _080F3BCC + beq @080F3BCC ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] - b _080F3BE8 + b @080F3BE8 .align 2, 0 .pool -_080F3BC4: +@080F3BC4: ldrh r1, [r4, 0x8] movs r0, 0 bl sub_80EF340 -_080F3BCC: +@080F3BCC: ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b _080F3BE8 + b @080F3BE8 .align 2, 0 .pool -_080F3BD8: +@080F3BD8: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0xC] bl sub_81DB5E8 bl sub_80F577C -_080F3BE8: +@080F3BE8: ldr r0, =0x0858d3c4 lsls r1, r5, 2 adds r1, r0 @@ -463459,7 +463459,7 @@ _080F3BE8: thumb_func_end sub_80F39E4 thumb_func_start sub_80F3C04 -sub_80F3C04: @ 80F3C04 +sub_80F3C04: ; 80F3C04 push {r4,r5,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -463477,26 +463477,26 @@ sub_80F3C04: @ 80F3C04 ldr r0, =0x0203a030 ldrb r5, [r0] cmp r5, 0x6 - bls _080F3C2A - b _080F3D54 -_080F3C2A: + bls @080F3C2A + b @080F3D54 +@080F3C2A: lsls r0, r5, 2 - ldr r1, =_080F3C4C + ldr r1, =@080F3C4C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F3C4C: - .4byte _080F3C68 - .4byte _080F3CA0 - .4byte _080F3CA0 - .4byte _080F3CD4 - .4byte _080F3D0C - .4byte _080F3D0C - .4byte _080F3D40 -_080F3C68: +@080F3C4C: + .4byte @080F3C68 + .4byte @080F3CA0 + .4byte @080F3CA0 + .4byte @080F3CD4 + .4byte @080F3D0C + .4byte @080F3D0C + .4byte @080F3D40 +@080F3C68: ldr r0, =0x02021cc4 ldrh r1, [r4, 0x4] bl sub_811EBBC @@ -463505,21 +463505,21 @@ _080F3C68: bl sub_811EBBC ldrb r0, [r4, 0x8] cmp r0, 0 - bne _080F3C94 + bne @080F3C94 ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b _080F3D54 + b @080F3D54 .align 2, 0 .pool -_080F3C94: +@080F3C94: ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b _080F3D54 + b @080F3D54 .align 2, 0 .pool -_080F3CA0: +@080F3CA0: ldr r0, =0x02021cc4 ldrh r1, [r4, 0x4] bl sub_811EBBC @@ -463534,10 +463534,10 @@ _080F3CA0: ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b _080F3D54 + b @080F3D54 .align 2, 0 .pool -_080F3CD4: +@080F3CD4: ldr r0, =0x02021cc4 ldrh r1, [r4, 0x4] bl sub_811EBBC @@ -463546,21 +463546,21 @@ _080F3CD4: bl sub_811EBBC ldrb r0, [r4, 0x8] cmp r0, 0 - bne _080F3D00 + bne @080F3D00 ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b _080F3D54 + b @080F3D54 .align 2, 0 .pool -_080F3D00: +@080F3D00: ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] - b _080F3D54 + b @080F3D54 .align 2, 0 .pool -_080F3D0C: +@080F3D0C: ldr r0, =0x02021cc4 ldrh r1, [r4, 0x4] bl sub_811EBBC @@ -463575,10 +463575,10 @@ _080F3D0C: ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b _080F3D54 + b @080F3D54 .align 2, 0 .pool -_080F3D40: +@080F3D40: ldr r0, =0x02021cc4 ldrh r1, [r4, 0x4] bl sub_811EBBC @@ -463586,7 +463586,7 @@ _080F3D40: ldrh r1, [r4, 0x6] bl sub_811EBBC bl sub_80F577C -_080F3D54: +@080F3D54: ldr r0, =0x0858d3f0 lsls r1, r5, 2 adds r1, r0 @@ -463600,7 +463600,7 @@ _080F3D54: thumb_func_end sub_80F3C04 thumb_func_start sub_80F3D74 -sub_80F3D74: @ 80F3D74 +sub_80F3D74: ; 80F3D74 push {r4-r7,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -463618,19 +463618,19 @@ sub_80F3D74: @ 80F3D74 ldr r7, =0x0203a030 ldrb r6, [r7] cmp r6, 0x1 - beq _080F3E02 + beq @080F3E02 cmp r6, 0x1 - bgt _080F3DB8 + bgt @080F3DB8 cmp r6, 0 - beq _080F3DBE - b _080F3E5C + beq @080F3DBE + b @080F3E5C .align 2, 0 .pool -_080F3DB8: +@080F3DB8: cmp r6, 0x2 - beq _080F3E3C - b _080F3E5C -_080F3DBE: + beq @080F3E3C + b @080F3E5C +@080F3DBE: ldr r4, =0x02021cc4 ldrh r0, [r5, 0x2] bl itemid_get_item @@ -463639,31 +463639,31 @@ _080F3DBE: bl gf_strcpy ldrb r0, [r5, 0x4] cmp r0, 0x57 - bne _080F3DFC + bne @080F3DFC ldrh r1, [r5, 0x6] ldr r0, =0x00000117 cmp r1, r0 - bgt _080F3DF0 + bgt @080F3DF0 subs r0, 0x2 cmp r1, r0 - blt _080F3DF0 + blt @080F3DF0 movs r0, 0x2 strb r0, [r7] - b _080F3E5C + b @080F3E5C .align 2, 0 .pool -_080F3DF0: +@080F3DF0: ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b _080F3E5C + b @080F3E5C .align 2, 0 .pool -_080F3DFC: +@080F3DFC: movs r0, 0x1 strb r0, [r7] - b _080F3E5C -_080F3E02: + b @080F3E5C +@080F3E02: ldr r4, =0x02021cc4 ldrh r0, [r5, 0x2] bl itemid_get_item @@ -463680,10 +463680,10 @@ _080F3E02: movs r2, 0 bl GetMapName bl sub_80F577C - b _080F3E5C + b @080F3E5C .align 2, 0 .pool -_080F3E3C: +@080F3E3C: ldr r4, =0x02021cc4 ldrh r0, [r5, 0x2] bl itemid_get_item @@ -463696,7 +463696,7 @@ _080F3E3C: ldrb r2, [r5, 0x5] bl sub_81DB5E8 bl sub_80F577C -_080F3E5C: +@080F3E5C: ldr r0, =0x0858d40c lsls r1, r6, 2 adds r1, r0 @@ -463710,7 +463710,7 @@ _080F3E5C: thumb_func_end sub_80F3D74 thumb_func_start sub_80F3E7C -sub_80F3E7C: @ 80F3E7C +sub_80F3E7C: ; 80F3E7C push {r4,r5,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -463728,23 +463728,23 @@ sub_80F3E7C: @ 80F3E7C ldr r0, =0x0203a030 ldrb r5, [r0] cmp r5, 0x1 - beq _080F3F28 + beq @080F3F28 cmp r5, 0x1 - bgt _080F3EC0 + bgt @080F3EC0 cmp r5, 0 - beq _080F3ECC - b _080F4008 + beq @080F3ECC + b @080F4008 .align 2, 0 .pool -_080F3EC0: +@080F3EC0: cmp r5, 0x2 - beq _080F3F78 + beq @080F3F78 cmp r5, 0x3 - bne _080F3ECA - b _080F3FCC -_080F3ECA: - b _080F4008 -_080F3ECC: + bne @080F3ECA + b @080F3FCC +@080F3ECA: + b @080F4008 +@080F3ECC: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -463752,40 +463752,40 @@ _080F3ECC: bl sub_81DB5E8 ldrb r0, [r4, 0x3] cmp r0, 0 - beq _080F3EE8 + beq @080F3EE8 cmp r0, 0x1 - beq _080F3EFC - b _080F3F04 + beq @080F3EFC + b @080F3F04 .align 2, 0 .pool -_080F3EE8: +@080F3EE8: ldr r0, =0x02021dc4 ldr r1, =0x085ecb0c bl gf_strcpy - b _080F3F04 + b @080F3F04 .align 2, 0 .pool -_080F3EFC: +@080F3EFC: ldr r0, =0x02021dc4 ldr r1, =0x085ecb12 bl gf_strcpy -_080F3F04: +@080F3F04: ldrb r1, [r4, 0x2] cmp r1, 0x1 - bne _080F3F1C + bne @080F3F1C ldr r0, =0x0203a030 strb r1, [r0] - b _080F4008 + b @080F4008 .align 2, 0 .pool -_080F3F1C: +@080F3F1C: ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b _080F4008 + b @080F4008 .align 2, 0 .pool -_080F3F28: +@080F3F28: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -463793,32 +463793,32 @@ _080F3F28: bl sub_81DB5E8 ldrb r0, [r4, 0x3] cmp r0, 0 - beq _080F3F44 + beq @080F3F44 cmp r0, 0x1 - beq _080F3F58 - b _080F3F60 + beq @080F3F58 + b @080F3F60 .align 2, 0 .pool -_080F3F44: +@080F3F44: ldr r0, =0x02021dc4 ldr r1, =0x085ecb0c bl gf_strcpy - b _080F3F60 + b @080F3F60 .align 2, 0 .pool -_080F3F58: +@080F3F58: ldr r0, =0x02021dc4 ldr r1, =0x085ecb12 bl gf_strcpy -_080F3F60: +@080F3F60: ldrh r1, [r4, 0x4] movs r0, 0x2 bl sub_80EF340 bl sub_80F577C - b _080F4008 + b @080F4008 .align 2, 0 .pool -_080F3F78: +@080F3F78: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -463826,34 +463826,34 @@ _080F3F78: bl sub_81DB5E8 ldrb r0, [r4, 0x3] cmp r0, 0 - beq _080F3F94 + beq @080F3F94 cmp r0, 0x1 - beq _080F3FA8 - b _080F3FB0 + beq @080F3FA8 + b @080F3FB0 .align 2, 0 .pool -_080F3F94: +@080F3F94: ldr r0, =0x02021dc4 ldr r1, =0x085ecb0c bl gf_strcpy - b _080F3FB0 + b @080F3FB0 .align 2, 0 .pool -_080F3FA8: +@080F3FA8: ldr r0, =0x02021dc4 ldr r1, =0x085ecb12 bl gf_strcpy -_080F3FB0: +@080F3FB0: ldrh r1, [r4, 0x4] movs r0, 0x2 bl sub_80EF340 ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b _080F4008 + b @080F4008 .align 2, 0 .pool -_080F3FCC: +@080F3FCC: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -463861,26 +463861,26 @@ _080F3FCC: bl sub_81DB5E8 ldrb r1, [r4, 0x3] cmp r1, 0 - beq _080F3FE8 + beq @080F3FE8 cmp r1, 0x1 - beq _080F3FFC - b _080F4004 + beq @080F3FFC + b @080F4004 .align 2, 0 .pool -_080F3FE8: +@080F3FE8: ldr r0, =0x02021dc4 ldr r1, =0x085ecb12 bl gf_strcpy - b _080F4004 + b @080F4004 .align 2, 0 .pool -_080F3FFC: +@080F3FFC: ldr r0, =0x02021dc4 ldr r1, =0x085ecb0c bl gf_strcpy -_080F4004: +@080F4004: bl sub_80F577C -_080F4008: +@080F4008: ldr r0, =0x0858d418 lsls r1, r5, 2 adds r1, r0 @@ -463894,7 +463894,7 @@ _080F4008: thumb_func_end sub_80F3E7C thumb_func_start sub_80F4028 -sub_80F4028: @ 80F4028 +sub_80F4028: ; 80F4028 push {r4-r7,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -463913,43 +463913,43 @@ sub_80F4028: @ 80F4028 ldrb r7, [r0] adds r2, r0, 0 cmp r7, 0xC - bls _080F4050 - b _080F4344 -_080F4050: + bls @080F4050 + b @080F4344 +@080F4050: lsls r0, r7, 2 - ldr r1, =_080F4074 + ldr r1, =@080F4074 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F4074: - .4byte _080F40A8 - .4byte _080F40BA - .4byte _080F40FC - .4byte _080F4140 - .4byte _080F4168 - .4byte _080F418C - .4byte _080F41D0 - .4byte _080F4254 - .4byte _080F42C8 - .4byte _080F42F4 - .4byte _080F42F4 - .4byte _080F4334 - .4byte _080F4284 -_080F40A8: +@080F4074: + .4byte @080F40A8 + .4byte @080F40BA + .4byte @080F40FC + .4byte @080F4140 + .4byte @080F4168 + .4byte @080F418C + .4byte @080F41D0 + .4byte @080F4254 + .4byte @080F42C8 + .4byte @080F42F4 + .4byte @080F42F4 + .4byte @080F4334 + .4byte @080F4284 +@080F40A8: ldrb r0, [r6, 0x5] cmp r0, 0 - bne _080F40B4 + bne @080F40B4 movs r0, 0x1 strb r0, [r2] - b _080F4344 -_080F40B4: + b @080F4344 +@080F40B4: movs r0, 0x5 strb r0, [r2] - b _080F4344 -_080F40BA: + b @080F4344 +@080F40BA: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 @@ -463969,10 +463969,10 @@ _080F40BA: ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b _080F4344 + b @080F4344 .align 2, 0 .pool -_080F40FC: +@080F40FC: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 @@ -463993,10 +463993,10 @@ _080F40FC: ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b _080F4344 + b @080F4344 .align 2, 0 .pool -_080F4140: +@080F4140: ldrh r1, [r6, 0x8] movs r0, 0 bl sub_80EF340 @@ -464009,10 +464009,10 @@ _080F4140: ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b _080F4344 + b @080F4344 .align 2, 0 .pool -_080F4168: +@080F4168: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 @@ -464023,10 +464023,10 @@ _080F4168: movs r2, 0 bl GetMapName bl sub_80F577C - b _080F4344 + b @080F4344 .align 2, 0 .pool -_080F418C: +@080F418C: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 @@ -464046,10 +464046,10 @@ _080F418C: ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b _080F4344 + b @080F4344 .align 2, 0 .pool -_080F41D0: +@080F41D0: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 @@ -464069,50 +464069,50 @@ _080F41D0: bl gf_strcpy ldrb r0, [r6, 0x5] cmp r0, 0x2 - beq _080F423C + beq @080F423C cmp r0, 0x2 - bgt _080F4218 + bgt @080F4218 cmp r0, 0x1 - beq _080F421E - b _080F4344 + beq @080F421E + b @080F4344 .align 2, 0 .pool -_080F4218: +@080F4218: cmp r0, 0x3 - beq _080F4248 - b _080F4344 -_080F421E: + beq @080F4248 + b @080F4344 +@080F421E: ldrh r0, [r6, 0xC] cmp r0, 0 - bne _080F4230 + bne @080F4230 ldr r1, =0x0203a030 movs r0, 0xC strb r0, [r1] - b _080F4344 + b @080F4344 .align 2, 0 .pool -_080F4230: +@080F4230: ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] - b _080F4344 + b @080F4344 .align 2, 0 .pool -_080F423C: +@080F423C: ldr r1, =0x0203a030 movs r0, 0x9 strb r0, [r1] - b _080F4344 + b @080F4344 .align 2, 0 .pool -_080F4248: +@080F4248: ldr r1, =0x0203a030 movs r0, 0xA strb r0, [r1] - b _080F4344 + b @080F4344 .align 2, 0 .pool -_080F4254: +@080F4254: ldr r0, =0x02021cc4 ldrh r2, [r6, 0xC] movs r1, 0xD @@ -464126,10 +464126,10 @@ _080F4254: muls r1, r2 ldr r2, =0x083185c8 adds r1, r2 - b _080F42A8 + b @080F42A8 .align 2, 0 .pool -_080F4284: +@080F4284: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 @@ -464146,15 +464146,15 @@ _080F4284: ldrh r1, [r6, 0xA] muls r1, r5 adds r1, r4 -_080F42A8: +@080F42A8: bl gf_strcpy ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] - b _080F4344 + b @080F4344 .align 2, 0 .pool -_080F42C8: +@080F42C8: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 @@ -464167,10 +464167,10 @@ _080F42C8: ldr r1, =0x0203a030 movs r0, 0xB strb r0, [r1] - b _080F4344 + b @080F4344 .align 2, 0 .pool -_080F42F4: +@080F42F4: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 @@ -464189,17 +464189,17 @@ _080F42F4: bl GetMapName ldr r0, =0x0203a030 strb r4, [r0] - b _080F4344 + b @080F4344 .align 2, 0 .pool -_080F4334: +@080F4334: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 ldrb r2, [r6, 0xE] bl sub_81DB5E8 bl sub_80F577C -_080F4344: +@080F4344: ldr r0, =0x0858d428 lsls r1, r7, 2 adds r1, r0 @@ -464213,7 +464213,7 @@ _080F4344: thumb_func_end sub_80F4028 thumb_func_start sub_80F4360 -sub_80F4360: @ 80F4360 +sub_80F4360: ; 80F4360 push {r4-r6,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -464232,33 +464232,33 @@ sub_80F4360: @ 80F4360 ldrb r6, [r0] adds r2, r0, 0 cmp r6, 0xD - bls _080F4388 - b _080F4588 -_080F4388: + bls @080F4388 + b @080F4588 +@080F4388: lsls r0, r6, 2 - ldr r1, =_080F43AC + ldr r1, =@080F43AC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F43AC: - .4byte _080F43E4 - .4byte _080F4414 - .4byte _080F44E4 - .4byte _080F4448 - .4byte _080F44E4 - .4byte _080F449C - .4byte _080F44C0 - .4byte _080F44E4 - .4byte _080F44EA - .4byte _080F4538 - .4byte _080F4538 - .4byte _080F4538 - .4byte _080F4538 - .4byte _080F4584 -_080F43E4: +@080F43AC: + .4byte @080F43E4 + .4byte @080F4414 + .4byte @080F44E4 + .4byte @080F4448 + .4byte @080F44E4 + .4byte @080F449C + .4byte @080F44C0 + .4byte @080F44E4 + .4byte @080F44EA + .4byte @080F4538 + .4byte @080F4538 + .4byte @080F4538 + .4byte @080F4538 + .4byte @080F4584 +@080F43E4: ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 @@ -464266,21 +464266,21 @@ _080F43E4: bl sub_81DB5E8 ldrb r0, [r5, 0x3] cmp r0, 0 - bne _080F4408 + bne @080F4408 ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b _080F4588 + b @080F4588 .align 2, 0 .pool -_080F4408: +@080F4408: ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b _080F4588 + b @080F4588 .align 2, 0 .pool -_080F4414: +@080F4414: ldr r0, =0x02021dc4 ldrb r1, [r5, 0x4] lsls r1, 5 @@ -464289,21 +464289,21 @@ _080F4414: bl gf_strcpy ldrb r0, [r5, 0x3] cmp r0, 0x1 - bne _080F443C + bne @080F443C ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b _080F4588 + b @080F4588 .align 2, 0 .pool -_080F443C: +@080F443C: ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b _080F4588 + b @080F4588 .align 2, 0 .pool -_080F4448: +@080F4448: ldr r0, =0x02021dc4 ldrb r1, [r5, 0x5] lsls r1, 5 @@ -464312,40 +464312,40 @@ _080F4448: bl gf_strcpy ldrb r1, [r5, 0x3] cmp r1, 0x3 - beq _080F4484 + beq @080F4484 cmp r1, 0x3 - bgt _080F4470 + bgt @080F4470 cmp r1, 0x2 - beq _080F4476 - b _080F4588 + beq @080F4476 + b @080F4588 .align 2, 0 .pool -_080F4470: +@080F4470: cmp r1, 0x4 - beq _080F4490 - b _080F4588 -_080F4476: + beq @080F4490 + b @080F4588 +@080F4476: ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] - b _080F4588 + b @080F4588 .align 2, 0 .pool -_080F4484: +@080F4484: ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b _080F4588 + b @080F4588 .align 2, 0 .pool -_080F4490: +@080F4490: ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] - b _080F4588 + b @080F4588 .align 2, 0 .pool -_080F449C: +@080F449C: ldr r0, =0x02021dc4 ldrb r1, [r5, 0x6] lsls r1, 5 @@ -464356,28 +464356,28 @@ _080F449C: ldrb r1, [r5, 0x7] lsls r1, 5 adds r1, r4 - b _080F44CA + b @080F44CA .align 2, 0 .pool -_080F44C0: +@080F44C0: ldr r0, =0x02021dc4 ldrb r1, [r5, 0x6] lsls r1, 5 ldr r2, =0x085a5c09 adds r1, r2 -_080F44CA: +@080F44CA: bl gf_strcpy ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] - b _080F4588 + b @080F4588 .align 2, 0 .pool -_080F44E4: +@080F44E4: movs r0, 0x8 strb r0, [r2] - b _080F4588 -_080F44EA: + b @080F4588 +@080F44EA: ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 @@ -464385,39 +464385,39 @@ _080F44EA: bl sub_81DB5E8 ldrb r1, [r5, 0x2] cmp r1, 0x18 - bhi _080F450C + bhi @080F450C ldr r1, =0x0203a030 movs r0, 0xC strb r0, [r1] - b _080F4588 + b @080F4588 .align 2, 0 .pool -_080F450C: +@080F450C: cmp r1, 0x31 - bhi _080F451C + bhi @080F451C ldr r1, =0x0203a030 movs r0, 0xB strb r0, [r1] - b _080F4588 + b @080F4588 .align 2, 0 .pool -_080F451C: +@080F451C: cmp r1, 0x45 - bhi _080F452C + bhi @080F452C ldr r1, =0x0203a030 movs r0, 0xA strb r0, [r1] - b _080F4588 + b @080F4588 .align 2, 0 .pool -_080F452C: +@080F452C: ldr r1, =0x0203a030 movs r0, 0x9 strb r0, [r1] - b _080F4588 + b @080F4588 .align 2, 0 .pool -_080F4538: +@080F4538: ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 @@ -464439,12 +464439,12 @@ _080F4538: bl gf_strcpy ldr r0, =0x0203a030 strb r4, [r0] - b _080F4588 + b @080F4588 .align 2, 0 .pool -_080F4584: +@080F4584: bl sub_80F577C -_080F4588: +@080F4588: ldr r0, =0x0858d45c lsls r1, r6, 2 adds r1, r0 @@ -464458,7 +464458,7 @@ _080F4588: thumb_func_end sub_80F4360 thumb_func_start sub_80F45A0 -sub_80F45A0: @ 80F45A0 +sub_80F45A0: ; 80F45A0 push {r4-r6,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -464482,36 +464482,36 @@ sub_80F45A0: @ 80F45A0 bl sub_81DB5E8 ldrb r0, [r5, 0x4] cmp r0, 0 - bne _080F45FC + bne @080F45FC ldr r0, =0x02021dc4 ldr r1, =0x085ecb72 bl gf_strcpy - b _080F4634 + b @080F4634 .align 2, 0 .pool -_080F45FC: +@080F45FC: cmp r0, 0x1 - bne _080F4614 + bne @080F4614 ldr r0, =0x02021dc4 ldr r1, =0x085ecb7a bl gf_strcpy - b _080F4634 + b @080F4634 .align 2, 0 .pool -_080F4614: +@080F4614: cmp r0, 0x2 - bne _080F462C + bne @080F462C ldr r0, =0x02021dc4 ldr r1, =0x085ecb80 bl gf_strcpy - b _080F4634 + b @080F4634 .align 2, 0 .pool -_080F462C: +@080F462C: ldr r0, =0x02021dc4 ldr r1, =0x085ecb87 bl gf_strcpy -_080F4634: +@080F4634: ldr r4, =0x02021ec4 ldrh r0, [r5, 0x2] bl itemid_get_item @@ -464532,7 +464532,7 @@ _080F4634: thumb_func_end sub_80F45A0 thumb_func_start sub_80F466C -sub_80F466C: @ 80F466C +sub_80F466C: ; 80F466C push {r4-r7,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -464550,26 +464550,26 @@ sub_80F466C: @ 80F466C ldr r0, =0x0203a030 ldrb r7, [r0] cmp r7, 0x6 - bls _080F4692 - b _080F4858 -_080F4692: + bls @080F4692 + b @080F4858 +@080F4692: lsls r0, r7, 2 - ldr r1, =_080F46B4 + ldr r1, =@080F46B4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F46B4: - .4byte _080F46D0 - .4byte _080F4714 - .4byte _080F4760 - .4byte _080F47B4 - .4byte _080F47EC - .4byte _080F4814 - .4byte _080F4838 -_080F46D0: +@080F46B4: + .4byte @080F46D0 + .4byte @080F4714 + .4byte @080F4760 + .4byte @080F47B4 + .4byte @080F47EC + .4byte @080F4814 + .4byte @080F4838 +@080F46D0: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 @@ -464590,10 +464590,10 @@ _080F46D0: ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b _080F4858 + b @080F4858 .align 2, 0 .pool -_080F4714: +@080F4714: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 @@ -464616,10 +464616,10 @@ _080F4714: ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b _080F4858 + b @080F4858 .align 2, 0 .pool -_080F4760: +@080F4760: ldr r0, =0x02021cc4 ldrh r2, [r6, 0x6] movs r1, 0xB @@ -464629,39 +464629,39 @@ _080F4760: bl gf_strcpy ldrb r1, [r6, 0x10] cmp r1, 0x2 - beq _080F479C + beq @080F479C cmp r1, 0x2 - bgt _080F4788 + bgt @080F4788 cmp r1, 0x1 - beq _080F478E - b _080F4824 + beq @080F478E + b @080F4824 .align 2, 0 .pool -_080F4788: +@080F4788: cmp r1, 0x3 - beq _080F47A8 - b _080F4824 -_080F478E: + beq @080F47A8 + b @080F4824 +@080F478E: ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] - b _080F4858 + b @080F4858 .align 2, 0 .pool -_080F479C: +@080F479C: ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b _080F4858 + b @080F4858 .align 2, 0 .pool -_080F47A8: +@080F47A8: ldr r0, =0x0203a030 strb r1, [r0] - b _080F4858 + b @080F4858 .align 2, 0 .pool -_080F47B4: +@080F47B4: ldr r0, =0x02021cc4 ldrh r1, [r6, 0x8] movs r5, 0xD @@ -464678,10 +464678,10 @@ _080F47B4: ldrh r1, [r6, 0xC] muls r1, r5 adds r1, r4 - b _080F4820 + b @080F4820 .align 2, 0 .pool -_080F47EC: +@080F47EC: ldr r0, =0x02021cc4 ldrh r1, [r6, 0x8] movs r5, 0xD @@ -464693,26 +464693,26 @@ _080F47EC: ldrh r1, [r6, 0xA] muls r1, r5 adds r1, r4 - b _080F4820 + b @080F4820 .align 2, 0 .pool -_080F4814: +@080F4814: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x8] movs r1, 0xD muls r1, r2 ldr r2, =0x0831977c adds r1, r2 -_080F4820: +@080F4820: bl gf_strcpy -_080F4824: +@080F4824: ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b _080F4858 + b @080F4858 .align 2, 0 .pool -_080F4838: +@080F4838: ldr r0, =0x02021cc4 ldrh r1, [r6, 0xE] movs r5, 0xD @@ -464726,7 +464726,7 @@ _080F4838: adds r1, r4 bl gf_strcpy bl sub_80F577C -_080F4858: +@080F4858: ldr r0, =0x0858d498 lsls r1, r7, 2 adds r1, r0 @@ -464740,7 +464740,7 @@ _080F4858: thumb_func_end sub_80F466C thumb_func_start sub_80F487C -sub_80F487C: @ 80F487C +sub_80F487C: ; 80F487C push {r4,r5,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -464758,25 +464758,25 @@ sub_80F487C: @ 80F487C ldr r0, =0x0203a030 ldrb r5, [r0] cmp r5, 0x5 - bls _080F48A2 - b _080F499A -_080F48A2: + bls @080F48A2 + b @080F499A +@080F48A2: lsls r0, r5, 2 - ldr r1, =_080F48C4 + ldr r1, =@080F48C4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F48C4: - .4byte _080F48DC - .4byte _080F4944 - .4byte _080F4944 - .4byte _080F4944 - .4byte _080F4944 - .4byte _080F4978 -_080F48DC: +@080F48C4: + .4byte @080F48DC + .4byte @080F4944 + .4byte @080F4944 + .4byte @080F4944 + .4byte @080F4944 + .4byte @080F4978 +@080F48DC: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC @@ -464791,39 +464791,39 @@ _080F48DC: bl sub_811EBBC ldrb r1, [r4, 0x16] cmp r1, 0x59 - bls _080F4918 + bls @080F4918 ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b _080F499A + b @080F499A .align 2, 0 .pool -_080F4918: +@080F4918: cmp r1, 0x45 - bls _080F4928 + bls @080F4928 ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b _080F499A + b @080F499A .align 2, 0 .pool -_080F4928: +@080F4928: cmp r1, 0x1D - bls _080F4938 + bls @080F4938 ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b _080F499A + b @080F499A .align 2, 0 .pool -_080F4938: +@080F4938: ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b _080F499A + b @080F499A .align 2, 0 .pool -_080F4944: +@080F4944: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC @@ -464839,10 +464839,10 @@ _080F4944: ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] - b _080F499A + b @080F499A .align 2, 0 .pool -_080F4978: +@080F4978: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC @@ -464856,7 +464856,7 @@ _080F4978: ldrh r1, [r4, 0x14] bl sub_811EBBC bl sub_80F577C -_080F499A: +@080F499A: ldr r0, =0x0858d320 lsls r1, r5, 2 adds r1, r0 @@ -464870,7 +464870,7 @@ _080F499A: thumb_func_end sub_80F487C thumb_func_start sub_80F49BC -sub_80F49BC: @ 80F49BC +sub_80F49BC: ; 80F49BC push {r4,r5,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -464889,31 +464889,31 @@ sub_80F49BC: @ 80F49BC ldrb r5, [r0] adds r2, r0, 0 cmp r5, 0xB - bls _080F49E4 - b _080F4B3A -_080F49E4: + bls @080F49E4 + b @080F4B3A +@080F49E4: lsls r0, r5, 2 - ldr r1, =_080F4A08 + ldr r1, =@080F4A08 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F4A08: - .4byte _080F4A38 - .4byte _080F4B14 - .4byte _080F4B14 - .4byte _080F4B14 - .4byte _080F4B14 - .4byte _080F4B14 - .4byte _080F4B14 - .4byte _080F4B14 - .4byte _080F4B14 - .4byte _080F4B14 - .4byte _080F4B14 - .4byte _080F4B1A -_080F4A38: +@080F4A08: + .4byte @080F4A38 + .4byte @080F4B14 + .4byte @080F4B14 + .4byte @080F4B14 + .4byte @080F4B14 + .4byte @080F4B14 + .4byte @080F4B14 + .4byte @080F4B14 + .4byte @080F4B14 + .4byte @080F4B14 + .4byte @080F4B14 + .4byte @080F4B1A +@080F4A38: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -464930,103 +464930,103 @@ _080F4A38: movs r1, 0xA bl __umodsi3 cmp r0, 0x9 - bls _080F4A60 - b _080F4B3A -_080F4A60: + bls @080F4A60 + b @080F4B3A +@080F4A60: lsls r0, 2 - ldr r1, =_080F4A74 + ldr r1, =@080F4A74 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F4A74: - .4byte _080F4A9C - .4byte _080F4AA8 - .4byte _080F4AB4 - .4byte _080F4AC0 - .4byte _080F4ACC - .4byte _080F4AD8 - .4byte _080F4AE4 - .4byte _080F4AF0 - .4byte _080F4AFC - .4byte _080F4B08 -_080F4A9C: +@080F4A74: + .4byte @080F4A9C + .4byte @080F4AA8 + .4byte @080F4AB4 + .4byte @080F4AC0 + .4byte @080F4ACC + .4byte @080F4AD8 + .4byte @080F4AE4 + .4byte @080F4AF0 + .4byte @080F4AFC + .4byte @080F4B08 +@080F4A9C: ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b _080F4B3A + b @080F4B3A .align 2, 0 .pool -_080F4AA8: +@080F4AA8: ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b _080F4B3A + b @080F4B3A .align 2, 0 .pool -_080F4AB4: +@080F4AB4: ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b _080F4B3A + b @080F4B3A .align 2, 0 .pool -_080F4AC0: +@080F4AC0: ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b _080F4B3A + b @080F4B3A .align 2, 0 .pool -_080F4ACC: +@080F4ACC: ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] - b _080F4B3A + b @080F4B3A .align 2, 0 .pool -_080F4AD8: +@080F4AD8: ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b _080F4B3A + b @080F4B3A .align 2, 0 .pool -_080F4AE4: +@080F4AE4: ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] - b _080F4B3A + b @080F4B3A .align 2, 0 .pool -_080F4AF0: +@080F4AF0: ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] - b _080F4B3A + b @080F4B3A .align 2, 0 .pool -_080F4AFC: +@080F4AFC: ldr r1, =0x0203a030 movs r0, 0x9 strb r0, [r1] - b _080F4B3A + b @080F4B3A .align 2, 0 .pool -_080F4B08: +@080F4B08: ldr r1, =0x0203a030 movs r0, 0xA strb r0, [r1] - b _080F4B3A + b @080F4B3A .align 2, 0 .pool -_080F4B14: +@080F4B14: movs r0, 0xB strb r0, [r2] - b _080F4B3A -_080F4B1A: + b @080F4B3A +@080F4B1A: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -465039,7 +465039,7 @@ _080F4B1A: ldrh r1, [r4, 0x6] bl sub_811EBBC bl sub_80F577C -_080F4B3A: +@080F4B3A: ldr r0, =0x0858d4b4 lsls r1, r5, 2 adds r1, r0 @@ -465053,7 +465053,7 @@ _080F4B3A: thumb_func_end sub_80F49BC thumb_func_start sub_80F4B5C -sub_80F4B5C: @ 80F4B5C +sub_80F4B5C: ; 80F4B5C push {r4,r5,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -465071,35 +465071,35 @@ sub_80F4B5C: @ 80F4B5C ldr r0, =0x0203a030 ldrb r5, [r0] cmp r5, 0xF - bls _080F4B82 - b _080F4D84 -_080F4B82: + bls @080F4B82 + b @080F4D84 +@080F4B82: lsls r0, r5, 2 - ldr r1, =_080F4BA4 + ldr r1, =@080F4BA4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F4BA4: - .4byte _080F4BE4 - .4byte _080F4C30 - .4byte _080F4C30 - .4byte _080F4C30 - .4byte _080F4C64 - .4byte _080F4D64 - .4byte _080F4D64 - .4byte _080F4D64 - .4byte _080F4D64 - .4byte _080F4D64 - .4byte _080F4D64 - .4byte _080F4D64 - .4byte _080F4D64 - .4byte _080F4D64 - .4byte _080F4D64 - .4byte _080F4D80 -_080F4BE4: +@080F4BA4: + .4byte @080F4BE4 + .4byte @080F4C30 + .4byte @080F4C30 + .4byte @080F4C30 + .4byte @080F4C64 + .4byte @080F4D64 + .4byte @080F4D64 + .4byte @080F4D64 + .4byte @080F4D64 + .4byte @080F4D64 + .4byte @080F4D64 + .4byte @080F4D64 + .4byte @080F4D64 + .4byte @080F4D64 + .4byte @080F4D64 + .4byte @080F4D80 +@080F4BE4: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -465111,30 +465111,30 @@ _080F4BE4: bl sub_81DB5E8 ldrb r1, [r4, 0x2] cmp r1, 0x9 - bhi _080F4C14 + bhi @080F4C14 ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b _080F4D84 + b @080F4D84 .align 2, 0 .pool -_080F4C14: +@080F4C14: cmp r1, 0x13 - bhi _080F4C24 + bhi @080F4C24 ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b _080F4D84 + b @080F4D84 .align 2, 0 .pool -_080F4C24: +@080F4C24: ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b _080F4D84 + b @080F4D84 .align 2, 0 .pool -_080F4C30: +@080F4C30: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -465150,124 +465150,124 @@ _080F4C30: ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b _080F4D84 + b @080F4D84 .align 2, 0 .pool -_080F4C64: +@080F4C64: ldr r0, =0x02021dc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x10] bl sub_81DB5E8 ldrb r0, [r4, 0x3] cmp r0, 0x18 - bls _080F4C76 - b _080F4D84 -_080F4C76: + bls @080F4C76 + b @080F4D84 +@080F4C76: lsls r0, 2 - ldr r1, =_080F4C88 + ldr r1, =@080F4C88 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F4C88: - .4byte _080F4CEC - .4byte _080F4CF8 - .4byte _080F4CF8 - .4byte _080F4CF8 - .4byte _080F4CF8 - .4byte _080F4D04 - .4byte _080F4D04 - .4byte _080F4D04 - .4byte _080F4D04 - .4byte _080F4D10 - .4byte _080F4D10 - .4byte _080F4D10 - .4byte _080F4D10 - .4byte _080F4D1C - .4byte _080F4D1C - .4byte _080F4D1C - .4byte _080F4D1C - .4byte _080F4D28 - .4byte _080F4D28 - .4byte _080F4D28 - .4byte _080F4D28 - .4byte _080F4D34 - .4byte _080F4D40 - .4byte _080F4D4C - .4byte _080F4D58 -_080F4CEC: +@080F4C88: + .4byte @080F4CEC + .4byte @080F4CF8 + .4byte @080F4CF8 + .4byte @080F4CF8 + .4byte @080F4CF8 + .4byte @080F4D04 + .4byte @080F4D04 + .4byte @080F4D04 + .4byte @080F4D04 + .4byte @080F4D10 + .4byte @080F4D10 + .4byte @080F4D10 + .4byte @080F4D10 + .4byte @080F4D1C + .4byte @080F4D1C + .4byte @080F4D1C + .4byte @080F4D1C + .4byte @080F4D28 + .4byte @080F4D28 + .4byte @080F4D28 + .4byte @080F4D28 + .4byte @080F4D34 + .4byte @080F4D40 + .4byte @080F4D4C + .4byte @080F4D58 +@080F4CEC: ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] - b _080F4D84 + b @080F4D84 .align 2, 0 .pool -_080F4CF8: +@080F4CF8: ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b _080F4D84 + b @080F4D84 .align 2, 0 .pool -_080F4D04: +@080F4D04: ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] - b _080F4D84 + b @080F4D84 .align 2, 0 .pool -_080F4D10: +@080F4D10: ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] - b _080F4D84 + b @080F4D84 .align 2, 0 .pool -_080F4D1C: +@080F4D1C: ldr r1, =0x0203a030 movs r0, 0x9 strb r0, [r1] - b _080F4D84 + b @080F4D84 .align 2, 0 .pool -_080F4D28: +@080F4D28: ldr r1, =0x0203a030 movs r0, 0xA strb r0, [r1] - b _080F4D84 + b @080F4D84 .align 2, 0 .pool -_080F4D34: +@080F4D34: ldr r1, =0x0203a030 movs r0, 0xB strb r0, [r1] - b _080F4D84 + b @080F4D84 .align 2, 0 .pool -_080F4D40: +@080F4D40: ldr r1, =0x0203a030 movs r0, 0xC strb r0, [r1] - b _080F4D84 + b @080F4D84 .align 2, 0 .pool -_080F4D4C: +@080F4D4C: ldr r1, =0x0203a030 movs r0, 0xD strb r0, [r1] - b _080F4D84 + b @080F4D84 .align 2, 0 .pool -_080F4D58: +@080F4D58: ldr r1, =0x0203a030 movs r0, 0xE strb r0, [r1] - b _080F4D84 + b @080F4D84 .align 2, 0 .pool -_080F4D64: +@080F4D64: ldr r0, =0x02021dc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x10] @@ -465275,12 +465275,12 @@ _080F4D64: ldr r1, =0x0203a030 movs r0, 0xF strb r0, [r1] - b _080F4D84 + b @080F4D84 .align 2, 0 .pool -_080F4D80: +@080F4D80: bl sub_80F577C -_080F4D84: +@080F4D84: ldr r0, =0x0858d4e4 lsls r1, r5, 2 adds r1, r0 @@ -465294,7 +465294,7 @@ _080F4D84: thumb_func_end sub_80F4B5C thumb_func_start sub_80F4D9C -sub_80F4D9C: @ 80F4D9C +sub_80F4D9C: ; 80F4D9C push {r4-r7,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -465313,119 +465313,119 @@ sub_80F4D9C: @ 80F4D9C ldrb r7, [r0] adds r2, r0, 0 cmp r7, 0x12 - bls _080F4DC4 - b _080F5014 -_080F4DC4: + bls @080F4DC4 + b @080F5014 +@080F4DC4: lsls r0, r7, 2 - ldr r1, =_080F4DE8 + ldr r1, =@080F4DE8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F4DE8: - .4byte _080F4E34 - .4byte _080F4F18 - .4byte _080F4ECE - .4byte _080F4EF4 - .4byte _080F4EF4 - .4byte _080F4F18 - .4byte _080F4F18 - .4byte _080F4F18 - .4byte _080F4F18 - .4byte _080F4F18 - .4byte _080F4F18 - .4byte _080F4F18 - .4byte _080F4F18 - .4byte _080F4F18 - .4byte _080F4F3C - .4byte _080F4F74 - .4byte _080F4F9C - .4byte _080F4FE0 - .4byte _080F5004 -_080F4E34: +@080F4DE8: + .4byte @080F4E34 + .4byte @080F4F18 + .4byte @080F4ECE + .4byte @080F4EF4 + .4byte @080F4EF4 + .4byte @080F4F18 + .4byte @080F4F18 + .4byte @080F4F18 + .4byte @080F4F18 + .4byte @080F4F18 + .4byte @080F4F18 + .4byte @080F4F18 + .4byte @080F4F18 + .4byte @080F4F18 + .4byte @080F4F3C + .4byte @080F4F74 + .4byte @080F4F9C + .4byte @080F4FE0 + .4byte @080F5004 +@080F4E34: ldrb r0, [r6, 0xD] subs r0, 0x1 cmp r0, 0xC - bls _080F4E3E - b _080F5014 -_080F4E3E: + bls @080F4E3E + b @080F5014 +@080F4E3E: lsls r0, 2 - ldr r1, =_080F4E4C + ldr r1, =@080F4E4C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F4E4C: - .4byte _080F4E80 - .4byte _080F4E86 - .4byte _080F4E8C - .4byte _080F4E92 - .4byte _080F4E98 - .4byte _080F4E9E - .4byte _080F4EA4 - .4byte _080F4EAA - .4byte _080F4EB0 - .4byte _080F4EB6 - .4byte _080F4EBC - .4byte _080F4EC2 - .4byte _080F4EC8 -_080F4E80: +@080F4E4C: + .4byte @080F4E80 + .4byte @080F4E86 + .4byte @080F4E8C + .4byte @080F4E92 + .4byte @080F4E98 + .4byte @080F4E9E + .4byte @080F4EA4 + .4byte @080F4EAA + .4byte @080F4EB0 + .4byte @080F4EB6 + .4byte @080F4EBC + .4byte @080F4EC2 + .4byte @080F4EC8 +@080F4E80: movs r0, 0x1 strb r0, [r2] - b _080F5014 -_080F4E86: + b @080F5014 +@080F4E86: movs r0, 0x2 strb r0, [r2] - b _080F5014 -_080F4E8C: + b @080F5014 +@080F4E8C: movs r0, 0x3 strb r0, [r2] - b _080F5014 -_080F4E92: + b @080F5014 +@080F4E92: movs r0, 0x4 strb r0, [r2] - b _080F5014 -_080F4E98: + b @080F5014 +@080F4E98: movs r0, 0x5 strb r0, [r2] - b _080F5014 -_080F4E9E: + b @080F5014 +@080F4E9E: movs r0, 0x6 strb r0, [r2] - b _080F5014 -_080F4EA4: + b @080F5014 +@080F4EA4: movs r0, 0x7 strb r0, [r2] - b _080F5014 -_080F4EAA: + b @080F5014 +@080F4EAA: movs r0, 0x8 strb r0, [r2] - b _080F5014 -_080F4EB0: + b @080F5014 +@080F4EB0: movs r0, 0x9 strb r0, [r2] - b _080F5014 -_080F4EB6: + b @080F5014 +@080F4EB6: movs r0, 0xA strb r0, [r2] - b _080F5014 -_080F4EBC: + b @080F5014 +@080F4EBC: movs r0, 0xB strb r0, [r2] - b _080F5014 -_080F4EC2: + b @080F5014 +@080F4EC2: movs r0, 0xC strb r0, [r2] - b _080F5014 -_080F4EC8: + b @080F5014 +@080F4EC8: movs r0, 0xD strb r0, [r2] - b _080F5014 -_080F4ECE: + b @080F5014 +@080F4ECE: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 @@ -465437,10 +465437,10 @@ _080F4ECE: ldr r1, =0x0203a030 movs r0, 0x10 strb r0, [r1] - b _080F5014 + b @080F5014 .align 2, 0 .pool -_080F4EF4: +@080F4EF4: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 @@ -465452,10 +465452,10 @@ _080F4EF4: ldr r1, =0x0203a030 movs r0, 0xF strb r0, [r1] - b _080F5014 + b @080F5014 .align 2, 0 .pool -_080F4F18: +@080F4F18: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 @@ -465467,10 +465467,10 @@ _080F4F18: ldr r1, =0x0203a030 movs r0, 0xE strb r0, [r1] - b _080F5014 + b @080F5014 .align 2, 0 .pool -_080F4F3C: +@080F4F3C: ldr r0, =0x02021cc4 ldrh r1, [r6, 0x4] movs r5, 0xB @@ -465487,10 +465487,10 @@ _080F4F3C: ldrh r1, [r6, 0x8] muls r1, r5 adds r1, r4 - b _080F4FEC + b @080F4FEC .align 2, 0 .pool -_080F4F74: +@080F4F74: ldr r0, =0x02021cc4 ldrh r1, [r6, 0x4] movs r5, 0xB @@ -465502,10 +465502,10 @@ _080F4F74: ldrh r1, [r6, 0x6] muls r1, r5 adds r1, r4 - b _080F4FEC + b @080F4FEC .align 2, 0 .pool -_080F4F9C: +@080F4F9C: ldr r0, =0x02021cc4 ldrh r1, [r6, 0x4] movs r5, 0xB @@ -465526,32 +465526,32 @@ _080F4F9C: ldr r1, =0x0203a030 movs r0, 0x11 strb r0, [r1] - b _080F5014 + b @080F5014 .align 2, 0 .pool -_080F4FE0: +@080F4FE0: ldr r0, =0x02021cc4 ldrh r2, [r6, 0xA] movs r1, 0xB muls r1, r2 ldr r2, =0x083185c8 adds r1, r2 -_080F4FEC: +@080F4FEC: bl gf_strcpy ldr r1, =0x0203a030 movs r0, 0x12 strb r0, [r1] - b _080F5014 + b @080F5014 .align 2, 0 .pool -_080F5004: +@080F5004: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 ldrb r2, [r6, 0xC] bl sub_81DB5E8 bl sub_80F577C -_080F5014: +@080F5014: ldr r0, =0x0858d524 lsls r1, r7, 2 adds r1, r0 @@ -465565,7 +465565,7 @@ _080F5014: thumb_func_end sub_80F4D9C thumb_func_start sub_80F5030 -sub_80F5030: @ 80F5030 +sub_80F5030: ; 80F5030 push {r4,r5,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -465583,28 +465583,28 @@ sub_80F5030: @ 80F5030 ldr r0, =0x0203a030 ldrb r5, [r0] cmp r5, 0x8 - bls _080F5056 - b _080F5164 -_080F5056: + bls @080F5056 + b @080F5164 +@080F5056: lsls r0, r5, 2 - ldr r1, =_080F5078 + ldr r1, =@080F5078 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F5078: - .4byte _080F509C - .4byte _080F5130 - .4byte _080F5130 - .4byte _080F5130 - .4byte _080F5130 - .4byte _080F5130 - .4byte _080F5130 - .4byte _080F5130 - .4byte _080F5154 -_080F509C: +@080F5078: + .4byte @080F509C + .4byte @080F5130 + .4byte @080F5130 + .4byte @080F5130 + .4byte @080F5130 + .4byte @080F5130 + .4byte @080F5130 + .4byte @080F5130 + .4byte @080F5154 +@080F509C: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -465612,73 +465612,73 @@ _080F509C: bl sub_81DB5E8 ldrb r0, [r4, 0x4] cmp r0, 0x6 - bhi _080F5164 + bhi @080F5164 lsls r0, 2 - ldr r1, =_080F50C0 + ldr r1, =@080F50C0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F50C0: - .4byte _080F50DC - .4byte _080F50E8 - .4byte _080F50F4 - .4byte _080F5100 - .4byte _080F510C - .4byte _080F5118 - .4byte _080F5124 -_080F50DC: +@080F50C0: + .4byte @080F50DC + .4byte @080F50E8 + .4byte @080F50F4 + .4byte @080F5100 + .4byte @080F510C + .4byte @080F5118 + .4byte @080F5124 +@080F50DC: ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b _080F5164 + b @080F5164 .align 2, 0 .pool -_080F50E8: +@080F50E8: ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b _080F5164 + b @080F5164 .align 2, 0 .pool -_080F50F4: +@080F50F4: ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b _080F5164 + b @080F5164 .align 2, 0 .pool -_080F5100: +@080F5100: ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b _080F5164 + b @080F5164 .align 2, 0 .pool -_080F510C: +@080F510C: ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] - b _080F5164 + b @080F5164 .align 2, 0 .pool -_080F5118: +@080F5118: ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b _080F5164 + b @080F5164 .align 2, 0 .pool -_080F5124: +@080F5124: ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] - b _080F5164 + b @080F5164 .align 2, 0 .pool -_080F5130: +@080F5130: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -465690,17 +465690,17 @@ _080F5130: ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] - b _080F5164 + b @080F5164 .align 2, 0 .pool -_080F5154: +@080F5154: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x5] bl sub_81DB5E8 bl sub_80F577C -_080F5164: +@080F5164: ldr r0, =0x0858d570 lsls r1, r5, 2 adds r1, r0 @@ -465714,27 +465714,27 @@ _080F5164: thumb_func_end sub_80F5030 thumb_func_start sub_80F5180 -sub_80F5180: @ 80F5180 +sub_80F5180: ; 80F5180 push {r4,lr} movs r1, 0 movs r2, 0 ldr r3, [r0, 0xC] movs r4, 0x1 -_080F518A: +@080F518A: adds r0, r3, 0 lsrs r0, r1 ands r0, r4 cmp r0, 0 - beq _080F519A + beq @080F519A adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 -_080F519A: +@080F519A: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x1F - bls _080F518A + bls @080F518A adds r0, r2, 0 pop {r4} pop {r1} @@ -465742,7 +465742,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 @@ -465751,38 +465751,38 @@ sub_80F51AC: @ 80F51AC ldr r1, [r0, 0xC] movs r5, 0x1 ldr r6, =0x0858d690 -_080F51BC: +@080F51BC: adds r0, r1, 0 lsrs r0, r2 ands r0, r5 cmp r0, 0 - beq _080F51DA + beq @080F51DA cmp r3, r4 - bne _080F51D4 + bne @080F51D4 adds r0, r2, r6 ldrb r0, [r0] - b _080F51E6 + b @080F51E6 .align 2, 0 .pool -_080F51D4: +@080F51D4: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 -_080F51DA: +@080F51DA: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x1F - bls _080F51BC + bls @080F51BC movs r0, 0 -_080F51E6: +@080F51E6: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_80F51AC thumb_func_start sub_80F51EC -sub_80F51EC: @ 80F51EC +sub_80F51EC: ; 80F51EC push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -465806,63 +465806,63 @@ sub_80F51EC: @ 80F51EC adds r2, r0, 0 mov r0, r9 cmp r0, 0x2B - bls _080F521E - b _080F552A -_080F521E: + bls @080F521E + b @080F552A +@080F521E: lsls r0, 2 - ldr r1, =_080F5240 + ldr r1, =@080F5240 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F5240: - .4byte _080F52F0 - .4byte _080F5348 - .4byte _080F53C4 - .4byte _080F5444 - .4byte _080F5498 - .4byte _080F5498 - .4byte _080F5498 - .4byte _080F54C4 - .4byte _080F54E8 - .4byte _080F54EC - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F54F0 - .4byte _080F5510 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 - .4byte _080F5526 -_080F52F0: +@080F5240: + .4byte @080F52F0 + .4byte @080F5348 + .4byte @080F53C4 + .4byte @080F5444 + .4byte @080F5498 + .4byte @080F5498 + .4byte @080F5498 + .4byte @080F54C4 + .4byte @080F54E8 + .4byte @080F54EC + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F54F0 + .4byte @080F5510 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 + .4byte @080F5526 +@080F52F0: ldr r0, =0x02021cc4 adds r1, r5, 0x4 ldrb r2, [r5, 0x1C] @@ -465877,14 +465877,14 @@ _080F52F0: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - bne _080F5328 + bne @080F5328 ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] - b _080F552A + b @080F552A .align 2, 0 .pool -_080F5328: +@080F5328: movs r0, 0x1 strb r0, [r5, 0x12] bl GenerateRandomNumber @@ -465895,10 +465895,10 @@ _080F5328: bl __modsi3 strb r0, [r4] ldrb r1, [r4] - b _080F542A + b @080F542A .align 2, 0 .pool -_080F5348: +@080F5348: ldr r0, =0x02021dc4 adds r1, r5, 0 adds r1, 0x13 @@ -465909,29 +465909,29 @@ _080F5348: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x1 - beq _080F53DE + beq @080F53DE cmp r6, 0x2 - beq _080F5370 + beq @080F5370 movs r4, 0 - b _080F538A + b @080F538A .align 2, 0 .pool -_080F5370: +@080F5370: strb r6, [r5, 0x12] ldr r0, =0x0203a031 ldrb r0, [r0] cmp r0, 0 - bne _080F5384 + bne @080F5384 adds r0, r5, 0 movs r1, 0x1 - b _080F542C + b @080F542C .align 2, 0 .pool -_080F5384: +@080F5384: adds r0, r5, 0 movs r1, 0 - b _080F542C -_080F538A: + b @080F542C +@080F538A: bl GenerateRandomNumber ldr r7, =0x0203a031 lsls r0, 16 @@ -465943,21 +465943,21 @@ _080F538A: lsrs r0, 24 ldrb r1, [r7] cmp r0, r1 - bne _080F53B2 + bne @080F53B2 adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 ldr r0, =0x0000fffe cmp r4, r0 - bls _080F538A -_080F53B2: + bls @080F538A +@080F53B2: movs r0, 0x2 strb r0, [r5, 0x12] ldrb r1, [r7, 0x1] - b _080F542A + b @080F542A .align 2, 0 .pool -_080F53C4: +@080F53C4: ldr r0, =0x02021dc4 adds r1, r5, 0 adds r1, 0x13 @@ -465968,20 +465968,20 @@ _080F53C4: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x2 - bne _080F53F0 -_080F53DE: + bne @080F53F0 +@080F53DE: ldr r1, =0x0203a030 movs r0, 0x9 strb r0, [r1] - b _080F552A + b @080F552A .align 2, 0 .pool -_080F53F0: +@080F53F0: movs r4, 0 ldr r7, =0x0203a031 ldr r2, =0x0000fffe mov r8, r2 -_080F53F8: +@080F53F8: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -465992,31 +465992,31 @@ _080F53F8: lsrs r0, 24 ldrb r1, [r7] cmp r0, r1 - beq _080F5418 + beq @080F5418 ldrb r2, [r7, 0x1] cmp r0, r2 - bne _080F5422 -_080F5418: + bne @080F5422 +@080F5418: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, r8 - bls _080F53F8 -_080F5422: + bls @080F53F8 +@080F5422: movs r0, 0x3 strb r0, [r5, 0x12] ldr r0, =0x0203a031 ldrb r1, [r0, 0x2] -_080F542A: +@080F542A: adds r0, r5, 0 -_080F542C: +@080F542C: bl sub_80F51AC ldr r1, =0x0203a030 strb r0, [r1] - b _080F552A + b @080F552A .align 2, 0 .pool -_080F5444: +@080F5444: ldr r0, =0x02021cc4 adds r1, r5, 0x4 ldrb r2, [r5, 0x1C] @@ -466031,30 +466031,30 @@ _080F5444: bl sub_80EF340 ldrh r0, [r5, 0x2] cmp r0, 0x1E - bhi _080F547C + bhi @080F547C ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b _080F552A + b @080F552A .align 2, 0 .pool -_080F547C: +@080F547C: cmp r0, 0x64 - bhi _080F548C + bhi @080F548C ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] - b _080F552A + b @080F552A .align 2, 0 .pool -_080F548C: +@080F548C: ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b _080F552A + b @080F552A .align 2, 0 .pool -_080F5498: +@080F5498: ldr r0, =0x02021cc4 adds r1, r5, 0x4 ldrb r2, [r5, 0x1C] @@ -466067,10 +466067,10 @@ _080F5498: ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] - b _080F552A + b @080F552A .align 2, 0 .pool -_080F54C4: +@080F54C4: ldr r0, =0x02021cc4 adds r1, r5, 0x4 ldrb r2, [r5, 0x1C] @@ -466081,16 +466081,16 @@ _080F54C4: ldrb r2, [r5, 0x1B] bl sub_81DB5E8 bl sub_80F577C - b _080F552A + b @080F552A .align 2, 0 .pool -_080F54E8: +@080F54E8: movs r0, 0x3 - b _080F5528 -_080F54EC: + b @080F5528 +@080F54EC: movs r0, 0x3 - b _080F5528 -_080F54F0: + b @080F5528 +@080F54F0: ldr r4, =0x02021dc4 ldrh r0, [r5, 0x10] bl itemid_get_item @@ -466100,27 +466100,27 @@ _080F54F0: ldr r1, =0x0203a030 ldrb r0, [r5, 0x12] strb r0, [r1] - b _080F552A + b @080F552A .align 2, 0 .pool -_080F5510: +@080F5510: adds r0, r5, 0 adds r0, 0x22 ldrb r1, [r0] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080F5522 + beq @080F5522 movs r0, 0x16 - b _080F5528 -_080F5522: + b @080F5528 +@080F5522: movs r0, 0x15 - b _080F5528 -_080F5526: + b @080F5528 +@080F5526: ldrb r0, [r5, 0x12] -_080F5528: +@080F5528: strb r0, [r2] -_080F552A: +@080F552A: ldr r0, =0x0858d594 mov r2, r9 lsls r1, r2, 2 @@ -466138,7 +466138,7 @@ _080F552A: thumb_func_end sub_80F51EC thumb_func_start sub_80F5548 -sub_80F5548: @ 80F5548 +sub_80F5548: ; 80F5548 push {r4,r5,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -466157,47 +466157,47 @@ sub_80F5548: @ 80F5548 ldrb r5, [r0] adds r2, r0, 0 cmp r5, 0xA - bls _080F5570 - b _080F56BC -_080F5570: + bls @080F5570 + b @080F56BC +@080F5570: lsls r0, r5, 2 - ldr r1, =_080F5594 + ldr r1, =@080F5594 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F5594: - .4byte _080F55C0 - .4byte _080F55DC - .4byte _080F5614 - .4byte _080F5628 - .4byte _080F569A - .4byte _080F562E - .4byte _080F5650 - .4byte _080F5680 - .4byte _080F5694 - .4byte _080F569A - .4byte _080F56B8 -_080F55C0: +@080F5594: + .4byte @080F55C0 + .4byte @080F55DC + .4byte @080F5614 + .4byte @080F5628 + .4byte @080F569A + .4byte @080F562E + .4byte @080F5650 + .4byte @080F5680 + .4byte @080F5694 + .4byte @080F569A + .4byte @080F56B8 +@080F55C0: ldrb r1, [r4, 0x2] cmp r1, 0 - bne _080F55CC + bne @080F55CC movs r0, 0x6 strb r0, [r2] - b _080F56BC -_080F55CC: + b @080F56BC +@080F55CC: cmp r1, 0x3 - bhi _080F55D6 + bhi @080F55D6 movs r0, 0x5 strb r0, [r2] - b _080F56BC -_080F55D6: + b @080F56BC +@080F55D6: movs r0, 0x1 strb r0, [r2] - b _080F56BC -_080F55DC: + b @080F56BC +@080F55DC: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -466208,35 +466208,35 @@ _080F55DC: bl sub_80EF340 ldrb r0, [r4, 0x3] cmp r0, 0 - bne _080F5608 + bne @080F5608 ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b _080F56BC + b @080F56BC .align 2, 0 .pool -_080F5608: +@080F5608: ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b _080F56BC + b @080F56BC .align 2, 0 .pool -_080F5614: +@080F5614: ldrb r1, [r4, 0x3] movs r0, 0x1 bl sub_80EF340 ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b _080F56BC + b @080F56BC .align 2, 0 .pool -_080F5628: +@080F5628: movs r0, 0x4 strb r0, [r2] - b _080F56BC -_080F562E: + b @080F56BC +@080F562E: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -466247,11 +466247,11 @@ _080F562E: bl sub_80EF340 ldrb r0, [r4, 0x3] cmp r0, 0 - beq _080F5662 - b _080F5674 + beq @080F5662 + b @080F5674 .align 2, 0 .pool -_080F5650: +@080F5650: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -466259,36 +466259,36 @@ _080F5650: bl sub_81DB5E8 ldrb r0, [r4, 0x3] cmp r0, 0 - bne _080F5674 -_080F5662: + bne @080F5674 +@080F5662: ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] - b _080F56BC + b @080F56BC .align 2, 0 .pool -_080F5674: +@080F5674: ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] - b _080F56BC + b @080F56BC .align 2, 0 .pool -_080F5680: +@080F5680: ldrb r1, [r4, 0x3] movs r0, 0x1 bl sub_80EF340 ldr r1, =0x0203a030 movs r0, 0x9 strb r0, [r1] - b _080F56BC + b @080F56BC .align 2, 0 .pool -_080F5694: +@080F5694: movs r0, 0x9 strb r0, [r2] - b _080F56BC -_080F569A: + b @080F56BC +@080F569A: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -466297,12 +466297,12 @@ _080F569A: ldr r1, =0x0203a030 movs r0, 0xA strb r0, [r1] - b _080F56BC + b @080F56BC .align 2, 0 .pool -_080F56B8: +@080F56B8: bl sub_80F577C -_080F56BC: +@080F56BC: ldr r0, =0x0858d640 lsls r1, r5, 2 adds r1, r0 @@ -466316,7 +466316,7 @@ _080F56BC: thumb_func_end sub_80F5548 thumb_func_start sub_80F56D4 -sub_80F56D4: @ 80F56D4 +sub_80F56D4: ; 80F56D4 push {r4-r6,lr} ldr r2, =0x03005d8c ldr r0, =0x020375e0 @@ -466334,52 +466334,52 @@ sub_80F56D4: @ 80F56D4 ldr r6, =0x0203a030 ldrb r5, [r6] cmp r5, 0x2 - bgt _080F5718 + bgt @080F5718 cmp r5, 0x1 - bge _080F5744 + bge @080F5744 cmp r5, 0 - beq _080F571E - b _080F575E + beq @080F571E + b @080F575E .align 2, 0 .pool -_080F5718: +@080F5718: cmp r5, 0x3 - beq _080F574E - b _080F575E -_080F571E: + beq @080F574E + b @080F575E +@080F571E: ldr r0, =0x02021cc4 ldrb r1, [r4, 0xA] bl sub_818E868 ldrb r1, [r4, 0x16] cmp r1, 0x1 - bne _080F5734 + bne @080F5734 strb r1, [r6] - b _080F575E + b @080F575E .align 2, 0 .pool -_080F5734: +@080F5734: cmp r1, 0 - bne _080F573E + bne @080F573E movs r0, 0x2 strb r0, [r6] - b _080F575E -_080F573E: + b @080F575E +@080F573E: movs r0, 0x3 strb r0, [r6] - b _080F575E -_080F5744: + b @080F575E +@080F5744: ldr r0, =0x02021ec4 adds r1, r4, 0x2 ldrb r2, [r4, 0x17] bl sub_81DB5E8 -_080F574E: +@080F574E: ldr r0, =0x02021dc4 adds r1, r4, 0 adds r1, 0xB ldrb r2, [r4, 0x18] bl sub_81DB5E8 bl sub_80F577C -_080F575E: +@080F575E: ldr r0, =0x0858d384 lsls r1, r5, 2 adds r1, r0 @@ -466393,7 +466393,7 @@ _080F575E: thumb_func_end sub_80F56D4 thumb_func_start sub_80F577C -sub_80F577C: @ 80F577C +sub_80F577C: ; 80F577C ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] @@ -466418,7 +466418,7 @@ sub_80F577C: @ 80F577C thumb_func_end sub_80F577C thumb_func_start sub_80F57B8 -sub_80F57B8: @ 80F57B8 +sub_80F57B8: ; 80F57B8 ldr r1, =0x0203a030 movs r0, 0 strb r0, [r1] @@ -466428,7 +466428,7 @@ sub_80F57B8: @ 80F57B8 thumb_func_end sub_80F57B8 thumb_func_start sub_80F57C4 -sub_80F57C4: @ 80F57C4 +sub_80F57C4: ; 80F57C4 push {r4,lr} movs r0, 0 movs r1, 0x40 @@ -466440,7 +466440,7 @@ sub_80F57C4: @ 80F57C4 movs r2, 0x4 bl bg_vram_setup movs r4, 0 -_080F57E0: +@080F57E0: lsls r0, r4, 24 lsrs r0, 24 ldr r1, =0x0203a034 @@ -466452,7 +466452,7 @@ _080F57E0: bl bg_set_tilemap adds r4, 0x1 cmp r4, 0x3 - ble _080F57E0 + ble @080F57E0 ldr r0, =0x0858d898 bl Window_InitFromTemplates bl TextBox_ResetSomeField @@ -466547,7 +466547,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 @@ -466586,7 +466586,7 @@ sub_80F591C: @ 80F591C movs r7, 0 movs r0, 0x1 mov r8, r0 -_080F5976: +@080F5976: lsls r5, r7, 24 lsrs r5, 24 adds r0, r5, 0 @@ -466614,32 +466614,32 @@ _080F5976: mov r9, r0 adds r1, 0x5 lsls r7, r1, 24 -_080F59B0: +@080F59B0: ldr r1, =0x000060b2 cmp r6, r10 - bge _080F59B8 + bge @080F59B8 adds r1, 0x2 -_080F59B8: +@080F59B8: ldr r4, [sp, 0x8] lsls r0, r4, 24 asrs r0, 24 adds r2, r0, 0 cmp r0, 0 - bge _080F59C6 + bge @080F59C6 negs r2, r0 -_080F59C6: +@080F59C6: cmp r6, r2 - bge _080F59F4 + bge @080F59F4 ldr r5, =0x000060a4 cmp r0, 0 - bge _080F59F6 + bge @080F59F6 adds r5, 0x2 - b _080F59F6 + b @080F59F6 .align 2, 0 .pool -_080F59F4: +@080F59F4: ldr r5, =0x000060a2 -_080F59F6: +@080F59F6: adds r4, r6, 0 adds r4, 0x13 lsls r4, 24 @@ -466662,10 +466662,10 @@ _080F59F6: bl bg_fill_tilemap_rect adds r6, 0x1 cmp r6, 0x9 - ble _080F59B0 + ble @080F59B0 ldr r7, [sp, 0xC] cmp r7, 0x3 - ble _080F5976 + ble @080F5976 movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x1 @@ -466695,7 +466695,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 @@ -466707,12 +466707,12 @@ sub_80F5A74: @ 80F5A74 ldr r0, =0x02039f25 ldrb r0, [r0] cmp r5, r0 - bne _080F5A96 + bne @080F5A96 ldr r1, =0x085ed21e adds r0, r6, 0 bl gf_strcpy adds r6, r0, 0 -_080F5A96: +@080F5A96: adds r1, r7, 0x2 adds r0, r6, 0 bl gf_strcpy @@ -466740,16 +466740,16 @@ _080F5A96: thumb_func_end sub_80F5A74 thumb_func_start sub_80F5AE0 -sub_80F5AE0: @ 80F5AE0 +sub_80F5AE0: ; 80F5AE0 push {r4,lr} movs r4, 0 -_080F5AE4: +@080F5AE4: lsls r0, r4, 24 lsrs r0, 24 bl sub_80F5A74 adds r4, 0x1 cmp r4, 0x3 - ble _080F5AE4 + ble @080F5AE4 movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram pop {r4} @@ -466758,7 +466758,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 @@ -466829,18 +466829,18 @@ sub_80F5B00: @ 80F5B00 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080F5BE4 + beq @080F5BE4 ldrb r0, [r5, 0x8] orrs r0, r6 strb r0, [r5, 0x8] - b _080F5BEC + b @080F5BEC .align 2, 0 .pool -_080F5BE4: +@080F5BE4: movs r0, 0xDF lsls r0, 1 bl song_play_for_text -_080F5BEC: +@080F5BEC: ldr r0, =sub_80F5C24 + 1 bl SetVBlankCallback add sp, 0x4 @@ -466852,7 +466852,7 @@ _080F5BEC: thumb_func_end sub_80F5B00 thumb_func_start sub_80F5C00 -sub_80F5C00: @ 80F5C00 +sub_80F5C00: ; 80F5C00 push {lr} bl call_obj_callbacks bl obj_sync_something @@ -466867,7 +466867,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] @@ -466928,7 +466928,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 @@ -466937,9 +466937,9 @@ sub_80F5CE4: @ 80F5CE4 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080F5CF8 - b _080F5E2E -_080F5CF8: + bne @080F5CF8 + b @080F5E2E +@080F5CF8: ldr r2, =0x03005e00 lsls r1, r6, 2 adds r0, r1, r6 @@ -466949,21 +466949,21 @@ _080F5CF8: ldrsh r0, [r4, r2] adds r7, r1, 0 cmp r0, 0x1 - beq _080F5DE0 + beq @080F5DE0 cmp r0, 0x1 - bgt _080F5D20 + bgt @080F5D20 cmp r0, 0 - beq _080F5D2A - b _080F5E2E + beq @080F5D2A + b @080F5E2E .align 2, 0 .pool -_080F5D20: +@080F5D20: cmp r0, 0x2 - beq _080F5DF4 + beq @080F5DF4 cmp r0, 0x3 - beq _080F5E0A - b _080F5E2E -_080F5D2A: + beq @080F5E0A + b @080F5E2E +@080F5D2A: bl sub_80DBED4 ldr r1, =0x02039f20 ldr r0, =0x02039f25 @@ -466971,7 +466971,7 @@ _080F5D2A: adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _080F5D58 + bne @080F5D58 movs r0, 0x23 bl sav12_xor_increment ldr r1, =0x020375e2 @@ -466981,9 +466981,9 @@ _080F5D2A: ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x1 - beq _080F5D58 + beq @080F5D58 bl sub_80EC6BC -_080F5D58: +@080F5D58: movs r0, 0x2 bl sub_813BADC ldr r0, =0x02039f2e @@ -467022,10 +467022,10 @@ _080F5D58: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _080F5E2E + b @080F5E2E .align 2, 0 .pool -_080F5DE0: +@080F5DE0: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -467033,25 +467033,25 @@ _080F5DE0: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _080F5E2E + bne @080F5E2E movs r0, 0x64 - b _080F5E2C -_080F5DF4: + b @080F5E2C +@080F5DF4: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080F5EBA + beq @080F5EBA bl sub_800ADF8 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080F5EBA -_080F5E0A: + b @080F5EBA +@080F5E0A: bl sub_800A520 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080F5EBA + bne @080F5EBA movs r0, 0xDF lsls r0, 1 bl song_play_for_text @@ -467062,9 +467062,9 @@ _080F5E0A: strb r0, [r2, 0x8] ldrh r0, [r4, 0x8] adds r0, 0x1 -_080F5E2C: +@080F5E2C: strh r0, [r4, 0x8] -_080F5E2E: +@080F5E2E: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -467072,7 +467072,7 @@ _080F5E2E: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - bne _080F5EBA + bne @080F5EBA ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 @@ -467085,14 +467085,14 @@ _080F5E2E: adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _080F5E78 + beq @080F5E78 ldr r0, =0x085ed207 bl sub_80F707C ldr r0, =sub_80F5ED8 + 1 - b _080F5EB8 + b @080F5EB8 .align 2, 0 .pool -_080F5E78: +@080F5E78: movs r0, 0x24 bl sav12_xor_increment ldr r1, =0x02039f20 @@ -467101,10 +467101,10 @@ _080F5E78: adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _080F5E92 + bne @080F5E92 movs r0, 0x25 bl sav12_xor_increment -_080F5E92: +@080F5E92: ldr r0, =0x02039f2e ldrb r0, [r0] bl sub_80DEDA8 @@ -467120,9 +467120,9 @@ _080F5E92: movs r0, 0x2 bl sub_813BADC ldr r0, =sub_80F5F74 + 1 -_080F5EB8: +@080F5EB8: str r0, [r4] -_080F5EBA: +@080F5EBA: pop {r4-r7} pop {r0} bx r0 @@ -467131,14 +467131,14 @@ _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 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _080F5EFC + beq @080F5EFC ldr r0, =sub_80F5F14 + 1 movs r1, 0 bl AddTask @@ -467149,7 +467149,7 @@ sub_80F5ED8: @ 80F5ED8 adds r0, r1 ldr r1, =nullsub_4 + 1 str r1, [r0] -_080F5EFC: +@080F5EFC: pop {r4} pop {r0} bx r0 @@ -467158,7 +467158,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 @@ -467172,14 +467172,14 @@ 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 bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080F5F60 + beq @080F5F60 adds r0, r4, 0 bl remove_task ldr r2, =0x03005e00 @@ -467194,7 +467194,7 @@ sub_80F5F30: @ 80F5F30 ldr r1, =sub_80F5F74 + 1 str r1, [r0] bl sub_80F7144 -_080F5F60: +@080F5F60: pop {r4} pop {r0} bx r0 @@ -467203,7 +467203,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 @@ -467216,7 +467216,7 @@ sub_80F5F74: @ 80F5F74 movs r2, 0x8 ldrsh r0, [r4, r2] cmp r0, 0 - bne _080F5FC4 + bne @080F5FC4 ldr r0, =sub_80F68F0 + 1 movs r1, 0x14 bl AddTask @@ -467232,40 +467232,40 @@ sub_80F5F74: @ 80F5F74 lsls r3, 3 movs r1, 0x90 movs r2, 0x78 - b _080F6016 + b @080F6016 .align 2, 0 .pool -_080F5FC4: +@080F5FC4: cmp r0, 0x1 - bne _080F5FDC + bne @080F5FDC ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r0, 0 - bne _080F6048 - b _080F5FF0 + bne @080F6048 + b @080F5FF0 .align 2, 0 .pool -_080F5FDC: +@080F5FDC: cmp r0, 0x2 - bne _080F5FF8 + bne @080F5FF8 ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x15 - bne _080F6048 + bne @080F6048 movs r0, 0 -_080F5FF0: +@080F5FF0: strh r0, [r4, 0xA] adds r0, r1, 0x1 strh r0, [r4, 0x8] - b _080F6048 -_080F5FF8: + b @080F6048 +@080F5FF8: cmp r0, 0x3 - bne _080F6030 + bne @080F6030 ldr r0, =0x085ed1d0 ldr r1, =0x0203a034 ldr r1, [r1] @@ -467278,28 +467278,28 @@ _080F5FF8: movs r3, 0x88 lsls r3, 3 movs r1, 0x90 -_080F6016: +@080F6016: bl sub_80F6E9C ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080F6048 + b @080F6048 .align 2, 0 .pool -_080F6030: +@080F6030: cmp r0, 0x4 - bne _080F6048 + bne @080F6048 ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r0, 0x2 - bne _080F6048 + bne @080F6048 movs r0, 0 strh r0, [r4, 0x8] ldr r0, =sub_80F6058 + 1 str r0, [r4] -_080F6048: +@080F6048: pop {r4} pop {r0} bx r0 @@ -467308,7 +467308,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 @@ -467320,25 +467320,25 @@ sub_80F6058: @ 80F6058 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080F60C0 + beq @080F60C0 cmp r0, 0x1 - bgt _080F6080 + bgt @080F6080 cmp r0, 0 - beq _080F6086 - b _080F60E6 + beq @080F6086 + b @080F60E6 .align 2, 0 .pool -_080F6080: +@080F6080: cmp r0, 0x2 - beq _080F60D4 - b _080F60E6 -_080F6086: + beq @080F60D4 + b @080F60E6 +@080F6086: ldr r5, =0x0203a034 ldr r0, [r5] ldr r0, [r0] ldrb r0, [r0, 0xA] cmp r0, 0 - bne _080F60E6 + bne @080F60E6 ldrh r1, [r4, 0xC] adds r0, r1, 0x1 strh r0, [r4, 0xC] @@ -467350,29 +467350,29 @@ _080F6086: ldr r0, [r0] ldrb r0, [r0, 0x14] cmp r0, 0 - bne _080F60B8 + bne @080F60B8 movs r0, 0x2 strh r0, [r4, 0x8] - b _080F60E6 + b @080F60E6 .align 2, 0 .pool -_080F60B8: +@080F60B8: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080F60E6 -_080F60C0: + b @080F60E6 +@080F60C0: ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, 0x14] cmp r0, 0 - bne _080F60E6 + bne @080F60E6 strh r0, [r4, 0x8] - b _080F60E6 + b @080F60E6 .align 2, 0 .pool -_080F60D4: +@080F60D4: movs r0, 0x88 lsls r0, 3 bl sub_80F6EF4 @@ -467381,7 +467381,7 @@ _080F60D4: strh r0, [r4, 0xC] ldr r0, =sub_80F60F0 + 1 str r0, [r4] -_080F60E6: +@080F60E6: pop {r4,r5} pop {r0} bx r0 @@ -467390,7 +467390,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 @@ -467400,7 +467400,7 @@ sub_80F60F0: @ 80F60F0 ldr r0, [r5] ldrb r3, [r0, 0x4] cmp r3, 0 - bne _080F614C + bne @080F614C ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 @@ -467412,7 +467412,7 @@ sub_80F60F0: @ 80F60F0 lsls r0, 16 asrs r0, 16 cmp r0, 0x15 - bne _080F615E + bne @080F615E strh r3, [r1, 0xA] ldr r0, =0x085ed1e9 ldr r1, [r5] @@ -467425,12 +467425,12 @@ sub_80F60F0: @ 80F60F0 lsls r3, 3 movs r1, 0x90 bl sub_80F6E9C - b _080F615E + b @080F615E .align 2, 0 .pool -_080F614C: +@080F614C: cmp r3, 0x2 - bne _080F615E + bne @080F615E ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -467438,7 +467438,7 @@ _080F614C: adds r1, r0 ldr r0, =sub_80F616C + 1 str r0, [r1] -_080F615E: +@080F615E: pop {r4,r5} pop {r0} bx r0 @@ -467447,7 +467447,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 @@ -467459,25 +467459,25 @@ sub_80F616C: @ 80F616C movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080F61D4 + beq @080F61D4 cmp r0, 0x1 - bgt _080F6194 + bgt @080F6194 cmp r0, 0 - beq _080F619A - b _080F61F8 + beq @080F619A + b @080F61F8 .align 2, 0 .pool -_080F6194: +@080F6194: cmp r0, 0x2 - beq _080F61E8 - b _080F61F8 -_080F619A: + beq @080F61E8 + b @080F61F8 +@080F619A: ldr r5, =0x0203a034 ldr r0, [r5] ldr r0, [r0] ldrb r0, [r0, 0xA] cmp r0, 0 - bne _080F61F8 + bne @080F61F8 ldrh r1, [r4, 0xC] adds r0, r1, 0x1 strh r0, [r4, 0xC] @@ -467489,29 +467489,29 @@ _080F619A: ldr r0, [r0] ldrb r0, [r0, 0x14] cmp r0, 0 - bne _080F61CC + bne @080F61CC movs r0, 0x2 strh r0, [r4, 0x8] - b _080F61F8 + b @080F61F8 .align 2, 0 .pool -_080F61CC: +@080F61CC: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080F61F8 -_080F61D4: + b @080F61F8 +@080F61D4: ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, 0x14] cmp r0, 0 - bne _080F61F8 + bne @080F61F8 strh r0, [r4, 0x8] - b _080F61F8 + b @080F61F8 .align 2, 0 .pool -_080F61E8: +@080F61E8: movs r0, 0x88 lsls r0, 3 bl sub_80F6EF4 @@ -467519,7 +467519,7 @@ _080F61E8: strh r0, [r4, 0x8] ldr r0, =sub_80F6204 + 1 str r0, [r4] -_080F61F8: +@080F61F8: pop {r4,r5} pop {r0} bx r0 @@ -467528,7 +467528,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} @@ -467544,33 +467544,33 @@ sub_80F6204: @ 80F6204 ldrsh r0, [r0, r2] adds r2, r1, 0 cmp r0, 0x5 - bls _080F6226 - b _080F63F4 -_080F6226: + bls @080F6226 + b @080F63F4 +@080F6226: lsls r0, 2 - ldr r1, =_080F6238 + ldr r1, =@080F6238 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F6238: - .4byte _080F6250 - .4byte _080F6274 - .4byte _080F6292 - .4byte _080F62CC - .4byte _080F6334 - .4byte _080F63E4 -_080F6250: +@080F6238: + .4byte @080F6250 + .4byte @080F6274 + .4byte @080F6292 + .4byte @080F62CC + .4byte @080F6334 + .4byte @080F63E4 +@080F6250: ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r0, 0 - beq _080F625E - b _080F63F4 -_080F625E: + beq @080F625E + b @080F63F4 +@080F625E: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -467578,10 +467578,10 @@ _080F625E: ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b _080F63F4 + b @080F63F4 .align 2, 0 .pool -_080F6274: +@080F6274: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -467592,17 +467592,17 @@ _080F6274: lsls r0, 16 asrs r0, 16 cmp r0, 0x1F - beq _080F628C - b _080F63F4 -_080F628C: + beq @080F628C + b @080F63F4 +@080F628C: movs r0, 0 strh r0, [r1, 0xA] - b _080F63BC -_080F6292: + b @080F63BC +@080F6292: movs r4, 0 lsls r6, r5, 2 ldr r7, =0x03005e00 -_080F6298: +@080F6298: ldr r0, =sub_80F73DC + 1 movs r1, 0xA bl AddTask @@ -467619,19 +467619,19 @@ _080F6298: strh r4, [r1, 0xA] adds r4, 0x1 cmp r4, 0x3 - ble _080F6298 - b _080F63B4 + ble @080F6298 + b @080F63B4 .align 2, 0 .pool -_080F62CC: +@080F62CC: ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, 0x5] cmp r0, 0x4 - beq _080F62DA - b _080F63F4 -_080F62DA: + beq @080F62DA + b @080F63F4 +@080F62DA: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -467642,9 +467642,9 @@ _080F62DA: lsls r0, 16 asrs r0, 16 cmp r0, 0x1F - beq _080F62F2 - b _080F63F4 -_080F62F2: + beq @080F62F2 + b @080F63F4 +@080F62F2: movs r0, 0 strh r0, [r4, 0xA] ldr r0, =sub_80F74BC + 1 @@ -467657,24 +467657,24 @@ _080F62F2: ldr r1, =0x02039f20 ldrb r0, [r1] cmp r0, 0 - beq _080F631C -_080F630E: + beq @080F631C +@080F630E: adds r4, 0x1 cmp r4, 0x3 - bgt _080F631C + bgt @080F631C adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0 - bne _080F630E -_080F631C: + bne @080F630E +@080F631C: lsls r0, r4, 24 lsrs r0, 24 movs r1, 0xE bl sub_80F77E0 - b _080F63F4 + b @080F63F4 .align 2, 0 .pool -_080F6334: +@080F6334: lsls r1, r5, 2 adds r0, r1, r5 lsls r0, 3 @@ -467686,7 +467686,7 @@ _080F6334: asrs r0, 16 adds r6, r1, 0 cmp r0, 0x15 - bne _080F63F4 + bne @080F63F4 movs r0, 0 strh r0, [r2, 0xA] movs r4, 0 @@ -467696,16 +467696,16 @@ _080F6334: ldr r2, =0x02039e0d mov r8, r2 cmp r0, 0 - beq _080F636E -_080F6360: + beq @080F636E +@080F6360: adds r4, 0x1 cmp r4, 0x3 - bgt _080F636E + bgt @080F636E adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0 - bne _080F6360 -_080F636E: + bne @080F6360 +@080F636E: lsls r4, 6 mov r0, r8 adds r1, r4, r0 @@ -467735,19 +467735,19 @@ _080F636E: lsls r3, 3 movs r1, 0x90 bl sub_80F6E9C -_080F63B4: +@080F63B4: ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 adds r1, r0 -_080F63BC: +@080F63BC: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _080F63F4 + b @080F63F4 .align 2, 0 .pool -_080F63E4: +@080F63E4: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -467756,7 +467756,7 @@ _080F63E4: strh r1, [r0, 0x8] ldr r1, =sub_80F6404 + 1 str r1, [r0] -_080F63F4: +@080F63F4: add sp, 0x64 pop {r3} mov r8, r3 @@ -467768,7 +467768,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 @@ -467785,25 +467785,25 @@ sub_80F6404: @ 80F6404 ldrsh r0, [r0, r2] adds r4, r1, 0 cmp r0, 0x5 - bls _080F6428 - b _080F669C -_080F6428: + bls @080F6428 + b @080F669C +@080F6428: lsls r0, 2 - ldr r1, =_080F643C + ldr r1, =@080F643C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F643C: - .4byte _080F6454 - .4byte _080F658C - .4byte _080F65DC - .4byte _080F65F0 - .4byte _080F6638 - .4byte _080F667C -_080F6454: +@080F643C: + .4byte @080F6454 + .4byte @080F658C + .4byte @080F65DC + .4byte @080F65F0 + .4byte @080F6638 + .4byte @080F667C +@080F6454: ldr r1, =0x02022e24 movs r0, 0xF0 strh r0, [r1] @@ -467824,16 +467824,16 @@ _080F6454: ldr r4, =0x020244d4 mov r8, r4 cmp r0, 0 - beq _080F648C -_080F647E: + beq @080F648C +@080F647E: adds r2, 0x1 cmp r2, 0x3 - bgt _080F648C + bgt @080F648C adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 - bne _080F647E -_080F648C: + bne @080F647E +@080F648C: lsls r1, r2, 6 adds r0, r1, r3 ldrh r6, [r0] @@ -467848,7 +467848,7 @@ _080F648C: mov r0, r9 ldrb r0, [r0] cmp r2, r0 - bne _080F64E0 + bne @080F64E0 lsls r0, r6, 3 add r0, r12 mov r2, r8 @@ -467857,10 +467857,10 @@ _080F648C: adds r2, r6, 0 adds r3, r4, 0 bl help_system_enable_unless_flashback__sp199 - b _080F64F2 + b @080F64F2 .align 2, 0 .pool -_080F64E0: +@080F64E0: lsls r0, r6, 3 add r0, r12 mov r3, r8 @@ -467869,7 +467869,7 @@ _080F64E0: adds r2, r6, 0 adds r3, r4, 0 bl sub_8034B50 -_080F64F2: +@080F64F2: adds r0, r6, 0 adds r1, r5, 0 adds r2, r4, 0 @@ -467923,10 +467923,10 @@ _080F64F2: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _080F669C + b @080F669C .align 2, 0 .pool -_080F658C: +@080F658C: lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -467937,9 +467937,9 @@ _080F658C: lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - beq _080F65A4 - b _080F669C -_080F65A4: + beq @080F65A4 + b @080F669C +@080F65A4: movs r0, 0 strh r0, [r4, 0xE] ldrh r0, [r4, 0xC] @@ -467948,10 +467948,10 @@ _080F65A4: lsls r0, 16 asrs r0, 16 cmp r0, 0x20 - ble _080F65BA + ble @080F65BA movs r0, 0x20 strh r0, [r4, 0xC] -_080F65BA: +@080F65BA: ldrb r2, [r4, 0xC] ldr r3, =0x02022e26 movs r0, 0x50 @@ -467962,24 +467962,24 @@ _080F65BA: orrs r0, r1 strh r0, [r3] cmp r2, 0x20 - bne _080F669C + bne @080F669C ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080F669C + b @080F669C .align 2, 0 .pool -_080F65DC: +@080F65DC: ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, 0x6] cmp r0, 0x1 - bne _080F669C - b _080F6664 + bne @080F669C + b @080F6664 .align 2, 0 .pool -_080F65F0: +@080F65F0: lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -467990,7 +467990,7 @@ _080F65F0: lsls r0, 16 asrs r0, 16 cmp r0, 0x79 - bne _080F669C + bne @080F669C movs r0, 0 strh r0, [r3, 0xA] ldr r2, =0x02020630 @@ -468008,16 +468008,16 @@ _080F65F0: ldrh r0, [r3, 0x8] adds r0, 0x1 strh r0, [r3, 0x8] - b _080F669C + b @080F669C .align 2, 0 .pool -_080F6638: +@080F6638: ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, 0x6] cmp r0, 0x2 - bne _080F669C + bne @080F669C ldr r3, =0x02022e26 ldrh r0, [r3] lsrs r2, r0, 8 @@ -468025,17 +468025,17 @@ _080F6638: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x50 - bls _080F6656 + bls @080F6656 movs r2, 0x50 -_080F6656: +@080F6656: lsls r1, r2, 8 movs r0, 0xA0 subs r0, r2 orrs r1, r0 strh r1, [r3] cmp r2, 0x50 - bne _080F669C -_080F6664: + bne @080F669C +@080F6664: lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -468043,16 +468043,16 @@ _080F6664: ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b _080F669C + b @080F669C .align 2, 0 .pool -_080F667C: +@080F667C: ldr r0, =0x0203a034 ldr r0, [r0] ldr r2, [r0] ldrb r0, [r2, 0x6] cmp r0, 0x2 - bne _080F669C + bne @080F669C movs r1, 0 movs r0, 0x1 strb r0, [r2, 0x9] @@ -468063,7 +468063,7 @@ _080F667C: strh r1, [r0, 0x8] ldr r1, =sub_80F66B4 + 1 str r1, [r0] -_080F669C: +@080F669C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -468076,7 +468076,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 @@ -468086,17 +468086,17 @@ sub_80F66B4: @ 80F66B4 adds r0, r2, 0 ands r0, r1 cmp r0, 0 - beq _080F6702 + beq @080F6702 ldr r0, =0x02039f2a ldrb r1, [r0] adds r0, r2, 0 ands r0, r1 lsls r6, r7, 2 cmp r0, 0 - bne _080F66F2 + bne @080F66F2 ldr r5, =0x02039e00 movs r4, 0x3 -_080F66DA: +@080F66DA: ldrh r0, [r5] bl SpeciesToNationalPokedexNum lsls r0, 16 @@ -468106,8 +468106,8 @@ _080F66DA: adds r5, 0x40 subs r4, 0x1 cmp r4, 0 - bge _080F66DA -_080F66F2: + bge @080F66DA +@080F66F2: ldr r1, =0x03005e00 adds r0, r6, r7 lsls r0, 3 @@ -468116,7 +468116,7 @@ _080F66F2: strh r1, [r0, 0x1C] ldr r1, =sub_80F671C + 1 str r1, [r0] -_080F6702: +@080F6702: pop {r4-r7} pop {r0} bx r0 @@ -468125,7 +468125,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 @@ -468134,7 +468134,7 @@ sub_80F671C: @ 80F671C movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080F6760 + beq @080F6760 ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -468143,16 +468143,16 @@ sub_80F671C: @ 80F671C movs r1, 0x1C ldrsh r0, [r4, r1] cmp r0, 0 - bne _080F676E + bne @080F676E ldr r0, =0x085ed207 bl sub_80F707C bl sub_800AC34 ldr r0, =sub_80F677C + 1 str r0, [r4] - b _080F676E + b @080F676E .align 2, 0 .pool -_080F6760: +@080F6760: ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -468160,7 +468160,7 @@ _080F6760: adds r1, r0 ldr r0, =task_repel + 1 str r0, [r1] -_080F676E: +@080F676E: pop {r4} pop {r0} bx r0 @@ -468169,22 +468169,22 @@ _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 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _080F67AC + bne @080F67AC ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080F679A + beq @080F679A bl sub_800E084 -_080F679A: +@080F679A: bl sub_80F7144 ldr r0, =0x03005e00 lsls r1, r4, 2 @@ -468193,7 +468193,7 @@ _080F679A: adds r1, r0 ldr r0, =task_repel + 1 str r0, [r1] -_080F67AC: +@080F67AC: pop {r4} pop {r0} bx r0 @@ -468202,7 +468202,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 @@ -468212,14 +468212,14 @@ task_repel: @ 80F67C4 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080F67E6 + bne @080F67E6 ldr r1, =0x02039f20 ldr r0, =0x02039f25 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] bl sub_80ED090 -_080F67E6: +@080F67E6: movs r0, 0 str r0, [sp] movs r0, 0xFF @@ -468243,7 +468243,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 @@ -468253,7 +468253,7 @@ sub_80F6820: @ 80F6820 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080F68A8 + bne @080F68A8 ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 @@ -468262,31 +468262,31 @@ sub_80F6820: @ 80F6820 movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0 - bne _080F6868 + bne @080F6868 ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, 0x3] bl remove_task ldr r0, =0x0000ffff - b _080F686E + b @080F686E .align 2, 0 .pool -_080F6868: +@080F6868: cmp r0, 0x1 - bne _080F6884 + bne @080F6884 ldr r0, =0xffff0000 -_080F686E: +@080F686E: movs r1, 0x10 movs r2, 0 bl sub_80A2A20 ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] - b _080F68A8 + b @080F68A8 .align 2, 0 .pool -_080F6884: +@080F6884: movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -468299,7 +468299,7 @@ _080F6884: ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 bl sub_80F7E64 -_080F68A8: +@080F68A8: pop {r4,r5} pop {r0} bx r0 @@ -468308,7 +468308,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] @@ -468321,19 +468321,19 @@ sub_80F68B4: @ 80F68B4 lsls r0, 16 lsrs r0, 16 cmp r0, 0xFF - bls _080F68D4 + bls @080F68D4 adds r0, r3, 0 subs r0, 0xFD strh r0, [r2] -_080F68D4: +@080F68D4: lsls r0, r1, 16 lsrs r0, 16 cmp r0, 0xFF - bls _080F68E2 + bls @080F68E2 adds r0, r5, 0 subs r0, 0xFE strh r0, [r4] -_080F68E2: +@080F68E2: pop {r4,r5} pop {r0} bx r0 @@ -468342,7 +468342,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 @@ -468357,22 +468357,22 @@ sub_80F68F0: @ 80F68F0 lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - bne _080F6972 + bne @080F6972 movs r0, 0 strh r0, [r2, 0x8] movs r3, 0xC ldrsh r0, [r2, r3] cmp r0, 0 - bne _080F6924 + bne @080F6924 ldrh r0, [r2, 0xA] adds r0, 0x1 - b _080F6928 + b @080F6928 .align 2, 0 .pool -_080F6924: +@080F6924: ldrh r0, [r2, 0xA] subs r0, 0x1 -_080F6928: +@080F6928: strh r0, [r2, 0xA] lsls r0, r5, 2 adds r0, r5 @@ -468381,15 +468381,15 @@ _080F6928: movs r2, 0xA ldrsh r0, [r1, r2] cmp r0, 0x10 - bne _080F693E + bne @080F693E movs r0, 0x1 - b _080F6942 -_080F693E: + b @080F6942 +@080F693E: cmp r0, 0 - bne _080F6944 -_080F6942: + bne @080F6944 +@080F6942: strh r0, [r1, 0xC] -_080F6944: +@080F6944: ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 @@ -468410,7 +468410,7 @@ _080F6944: movs r0, 0x6E movs r1, 0x1 bl pal_fade_1 -_080F6972: +@080F6972: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -468419,21 +468419,21 @@ _080F6972: movs r3, 0xA ldrsh r4, [r0, r3] cmp r4, 0 - bne _080F69A4 + bne @080F69A4 ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] strb r4, [r0, 0xA] - b _080F69AE + b @080F69AE .align 2, 0 .pool -_080F69A4: +@080F69A4: ldr r0, =0x0203a034 ldr r0, [r0] ldr r1, [r0] movs r0, 0x1 strb r0, [r1, 0xA] -_080F69AE: +@080F69AE: pop {r4,r5} pop {r0} bx r0 @@ -468442,7 +468442,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} @@ -468460,9 +468460,9 @@ sub_80F69B8: @ 80F69B8 movs r2, 0 ldrb r0, [r0] cmp r4, r0 - bne _080F69DE + bne @080F69DE movs r2, 0x1 -_080F69DE: +@080F69DE: adds r0, r7, 0 ldr r1, [sp, 0x28] bl sub_80D2EDC @@ -468471,7 +468471,7 @@ _080F69DE: adds r0, 0x80 adds r3, r0 cmp r6, 0 - beq _080F6A40 + beq @080F6A40 lsls r1, r4, 9 ldr r0, =0x06004000 adds r1, r0 @@ -468504,10 +468504,10 @@ _080F69DE: str r0, [sp, 0xC] movs r2, 0x3 bl bg_write_sequence_to_wram_tile_map_rect - b _080F6A54 + b @080F6A54 .align 2, 0 .pool -_080F6A40: +@080F6A40: mov r0, r8 lsls r1, r0, 9 ldr r2, =0x06004000 @@ -468517,7 +468517,7 @@ _080F6A40: adds r0, r3, 0 movs r3, 0x1 bl RequestDma3Copy -_080F6A54: +@080F6A54: add sp, 0x10 pop {r3} mov r8, r3 @@ -468529,7 +468529,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 @@ -468538,7 +468538,7 @@ sub_80F6A64: @ 80F6A64 lsrs r6, r1, 24 movs r5, 0 ldr r4, =0x02039e00 -_080F6A74: +@080F6A74: ldrh r0, [r4] lsls r1, r5, 24 lsrs r1, 24 @@ -468550,7 +468550,7 @@ _080F6A74: adds r4, 0x40 adds r5, 0x1 cmp r5, 0x3 - ble _080F6A74 + ble @080F6A74 add sp, 0x4 pop {r4-r7} pop {r0} @@ -468560,13 +468560,13 @@ _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, =0x0857c388 movs r5, 0xA0 lsls r5, 16 -_080F6AA6: +@080F6AA6: ldr r1, =0x02039e00 lsls r0, r4, 6 adds r0, r1 @@ -468588,7 +468588,7 @@ _080F6AA6: adds r5, r0 adds r4, 0x1 cmp r4, 0x3 - ble _080F6AA6 + ble @080F6AA6 pop {r4-r6} pop {r0} bx r0 @@ -468597,14 +468597,14 @@ _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] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080F6B58 + beq @080F6B58 bl sub_800E0E8 movs r0, 0x8 movs r1, 0x8 @@ -468649,7 +468649,7 @@ sub_80F6AE8: @ 80F6AE8 movs r2, 0x8 orrs r0, r2 strb r0, [r1, 0x1] -_080F6B58: +@080F6B58: pop {r4} pop {r0} bx r0 @@ -468658,7 +468658,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 @@ -468691,16 +468691,16 @@ sub_80F6B78: @ 80F6B78 adds r2, r0, 0 adds r2, 0x9 cmp r2, 0 - bge _080F6BC4 + bge @080F6BC4 adds r2, 0x7 -_080F6BC4: +@080F6BC4: asrs r2, 3 mov r10, r2 cmp r2, 0x1E - ble _080F6BD0 + ble @080F6BD0 movs r1, 0x1E mov r10, r1 -_080F6BD0: +@080F6BD0: mov r1, r10 lsls r2, r1, 3 subs r2, r0 @@ -468749,7 +468749,7 @@ _080F6BD0: adds r6, r1, 0 adds r6, 0x2E movs r4, 0x2 -_080F6C34: +@080F6C34: adds r0, r6, r5 movs r7, 0 ldrsh r1, [r0, r7] @@ -468769,7 +468769,7 @@ _080F6C34: adds r5, 0x2 subs r4, 0x1 cmp r4, 0 - bge _080F6C34 + bge @080F6C34 mov r7, r8 adds r7, 0x80 mov r2, r8 @@ -468786,7 +468786,7 @@ _080F6C34: add r5, sp, 0xC movs r6, 0 movs r4, 0x3 -_080F6C7C: +@080F6C7C: str r6, [sp, 0x1C] ldm r5!, {r1} ldr r0, [sp, 0x2C] @@ -468794,7 +468794,7 @@ _080F6C7C: bl CpuSet subs r4, 0x1 cmp r4, 0 - bge _080F6C7C + bge @080F6C7C ldr r5, [sp, 0xC] ldr r6, =0x04000008 mov r0, r8 @@ -468821,16 +468821,16 @@ _080F6C7C: bl CpuSet movs r4, 0 cmp r4, r10 - bge _080F6D32 + bge @080F6D32 adds r7, r6, 0 -_080F6CCE: +@080F6CCE: adds r6, r4, 0x1 adds r0, r6, 0 cmp r6, 0 - bge _080F6CDA + bge @080F6CDA adds r0, r4, 0 adds r0, 0x8 -_080F6CDA: +@080F6CDA: asrs r0, 3 lsls r1, r0, 2 add r1, sp @@ -468870,15 +468870,15 @@ _080F6CDA: add r9, r1 adds r4, r6, 0 cmp r4, r10 - blt _080F6CCE -_080F6D32: + blt @080F6CCE +@080F6D32: adds r2, r4, 0x1 adds r0, r2, 0 cmp r2, 0 - bge _080F6D3E + bge @080F6D3E adds r0, r4, 0 adds r0, 0x8 -_080F6D3E: +@080F6D3E: asrs r0, 3 lsls r1, r0, 2 add r1, sp @@ -468932,7 +468932,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 @@ -468944,18 +468944,18 @@ sub_80F6DC0: @ 80F6DC0 add r5, sp, 0x18 ldr r6, =0x0858d810 movs r4, 0x7 -_080F6DD6: +@080F6DD6: adds r0, r6, 0 bl gpu_tile_obj_alloc_tag_and_copy_to_vram adds r6, 0x8 subs r4, 0x1 cmp r4, 0 - bge _080F6DD6 + bge @080F6DD6 ldr r0, =0x0858d850 bl gpu_pal_obj_alloc_tag_and_apply movs r4, 0 mov r6, sp -_080F6DEE: +@080F6DEE: mov r0, sp movs r1, 0x88 lsls r1, 1 @@ -468969,7 +468969,7 @@ _080F6DEE: strh r0, [r6] adds r4, 0x1 cmp r4, 0x7 - ble _080F6DEE + ble @080F6DEE ldr r2, =0x02020630 ldrb r1, [r5] lsls r0, r1, 4 @@ -469036,7 +469036,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} @@ -469080,7 +469080,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] @@ -469117,7 +469117,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 @@ -469139,7 +469139,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] @@ -469159,15 +469159,15 @@ sub_80F6F68: @ 80F6F68 movs r4, 0x36 ldrsh r1, [r3, r4] cmp r0, r1 - bge _080F6F92 + bge @080F6F92 strh r2, [r3, 0x20] -_080F6F92: +@080F6F92: movs r4, 0 ldr r6, =0x02020630 movs r5, 0x40 adds r2, r3, 0 adds r2, 0x2E -_080F6F9C: +@080F6F9C: movs r7, 0 ldrsh r0, [r2, r7] lsls r1, r0, 4 @@ -469183,16 +469183,16 @@ _080F6F9C: adds r2, 0x2 adds r4, 0x1 cmp r4, 0x2 - ble _080F6F9C + ble @080F6F9C movs r0, 0x20 ldrsh r1, [r3, r0] movs r2, 0x36 ldrsh r0, [r3, r2] cmp r1, r0 - bne _080F6FCC + bne @080F6FCC ldr r0, =sub_80F6FDC + 1 str r0, [r3, 0x1C] -_080F6FCC: +@080F6FCC: pop {r4-r7} pop {r0} bx r0 @@ -469201,7 +469201,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 @@ -469213,17 +469213,17 @@ sub_80F6FDC: @ 80F6FDC ldr r1, =0xffff0000 lsrs r0, r1, 16 cmp r3, r0 - beq _080F7008 + beq @080F7008 subs r0, r3, 0x1 strh r0, [r2, 0x38] lsls r0, 16 asrs r0, 16 asrs r1, 16 cmp r0, r1 - bne _080F7008 + bne @080F7008 ldrh r0, [r2, 0x3A] bl sub_80F6EF4 -_080F7008: +@080F7008: pop {r0} bx r0 .align 2, 0 @@ -469231,7 +469231,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] @@ -469250,7 +469250,7 @@ sub_80F7014: @ 80F7014 movs r5, 0x40 adds r2, r3, 0 adds r2, 0x2E -_080F7038: +@080F7038: movs r1, 0 ldrsh r0, [r2, r1] lsls r1, r0, 4 @@ -469266,7 +469266,7 @@ _080F7038: adds r2, 0x2 adds r4, 0x1 cmp r4, 0x2 - ble _080F7038 + ble @080F7038 movs r1, 0x20 ldrsh r0, [r3, r1] movs r2, 0x24 @@ -469275,10 +469275,10 @@ _080F7038: movs r1, 0xE0 negs r1, r1 cmp r0, r1 - bge _080F7070 + bge @080F7070 adds r0, r3, 0 bl sub_80F6F40 -_080F7070: +@080F7070: pop {r4-r7} pop {r0} bx r0 @@ -469287,7 +469287,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] @@ -469320,7 +469320,7 @@ sub_80F707C: @ 80F707C adds r6, r3, 0 mov r12, r2 movs r3, 0x40 -_080F70BE: +@080F70BE: lsls r0, r5, 1 adds r2, r4, 0 adds r2, 0x2E @@ -469358,7 +469358,7 @@ _080F70BE: adds r3, 0x40 adds r5, 0x1 cmp r5, 0x2 - ble _080F70BE + ble @080F70BE ldr r1, =0x02022e24 movs r0, 0xF0 strh r0, [r1] @@ -469381,7 +469381,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] @@ -469406,7 +469406,7 @@ sub_80F7144: @ 80F7144 movs r4, 0x4 adds r2, 0x2E movs r3, 0x2 -_080F7174: +@080F7174: movs r1, 0 ldrsh r0, [r2, r1] lsls r1, r0, 4 @@ -469420,7 +469420,7 @@ _080F7174: adds r2, 0x2 subs r3, 0x1 cmp r3, 0 - bge _080F7174 + bge @080F7174 movs r0, 0 strh r0, [r7] strh r0, [r6] @@ -469441,7 +469441,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 @@ -469451,7 +469451,7 @@ sub_80F71C8: @ 80F71C8 adds r0, r4, 0 ands r0, r1 cmp r0, 0 - beq _080F71F8 + beq @080F71F8 ldr r1, =0x08dc6498 str r5, [sp] movs r0, 0x2 @@ -469460,69 +469460,69 @@ sub_80F71C8: @ 80F71C8 movs r3, 0x1 bl gpu_copy_to_iwram_tile_map_rect movs r5, 0xA - b _080F7240 + b @080F7240 .align 2, 0 .pool -_080F71F8: +@080F71F8: ldr r0, =0x02039f2e ldrh r2, [r0] cmp r2, 0 - bne _080F720C + bne @080F720C ldr r1, =0x08dc63f8 - b _080F722E + b @080F722E .align 2, 0 .pool -_080F720C: +@080F720C: cmp r2, 0x1 - bne _080F7218 + bne @080F7218 ldr r1, =0x08dc6420 - b _080F722E + b @080F722E .align 2, 0 .pool -_080F7218: +@080F7218: cmp r2, 0x2 - bne _080F722C + bne @080F722C ldr r1, =0x08dc6448 movs r0, 0xA str r0, [sp] str r2, [sp, 0x4] movs r0, 0x2 - b _080F7236 + b @080F7236 .align 2, 0 .pool -_080F722C: +@080F722C: ldr r1, =0x08dc6470 -_080F722E: +@080F722E: movs r0, 0xA str r0, [sp] movs r0, 0x2 str r0, [sp, 0x4] -_080F7236: +@080F7236: movs r2, 0x5 movs r3, 0x1 bl gpu_copy_to_iwram_tile_map_rect movs r5, 0xF -_080F7240: +@080F7240: ldr r0, =0x02039f2c ldrh r0, [r0] cmp r0, 0 - bne _080F725C + bne @080F725C movs r6, 0 ldr r1, =0x08dc64ac - b _080F7298 + b @080F7298 .align 2, 0 .pool -_080F725C: +@080F725C: cmp r0, 0x1 - bne _080F726C + bne @080F726C movs r6, 0x1 ldr r1, =0x08dc64c0 - b _080F7298 + b @080F7298 .align 2, 0 .pool -_080F726C: +@080F726C: cmp r0, 0x2 - bne _080F7290 + bne @080F7290 movs r6, 0x2 ldr r1, =0x08dc64d4 lsls r2, r5, 24 @@ -469534,15 +469534,15 @@ _080F726C: str r6, [sp, 0x4] movs r0, 0x2 bl gpu_copy_to_iwram_tile_map_rect - b _080F72CC + b @080F72CC .align 2, 0 .pool -_080F7290: +@080F7290: cmp r0, 0x3 - bne _080F72B4 + bne @080F72B4 movs r6, 0x3 ldr r1, =0x08dc64e8 -_080F7298: +@080F7298: lsls r2, r5, 24 lsrs r2, 24 lsls r4, 24 @@ -469552,10 +469552,10 @@ _080F7298: movs r0, 0x2 str r0, [sp, 0x4] bl gpu_copy_to_iwram_tile_map_rect - b _080F72CC + b @080F72CC .align 2, 0 .pool -_080F72B4: +@080F72B4: movs r6, 0x4 ldr r1, =0x08dc64fc lsls r2, r5, 24 @@ -469567,7 +469567,7 @@ _080F72B4: movs r0, 0x2 str r0, [sp, 0x4] bl gpu_copy_to_iwram_tile_map_rect -_080F72CC: +@080F72CC: adds r5, 0x5 ldr r1, =0x08dc6510 lsls r2, r5, 24 @@ -469599,7 +469599,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 @@ -469617,24 +469617,24 @@ sub_80F7310: @ 80F7310 ldr r0, =0x0000ffff ands r0, r1 cmp r0, 0 - beq _080F733C + beq @080F733C movs r0, 0x80 lsls r0, 9 adds r1, r0 -_080F733C: +@080F733C: lsrs r1, 16 cmp r1, 0 - bne _080F7348 + bne @080F7348 cmp r4, 0 - beq _080F7348 + beq @080F7348 movs r1, 0x1 -_080F7348: +@080F7348: cmp r5, 0 - beq _080F7352 + beq @080F7352 cmp r1, 0xA - bls _080F7352 + bls @080F7352 movs r1, 0xA -_080F7352: +@080F7352: lsls r0, r1, 24 lsrs r0, 24 pop {r4,r5} @@ -469645,7 +469645,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 @@ -469658,9 +469658,9 @@ sub_80F7364: @ 80F7364 ldrsh r0, [r0, r2] adds r7, r1, 0 cmp r0, 0 - bge _080F7380 + bge @080F7380 negs r0, r0 -_080F7380: +@080F7380: lsls r4, r0, 16 adds r0, r4, 0 movs r1, 0x50 @@ -469669,38 +469669,38 @@ _080F7380: ldr r0, =0x0000ffff ands r0, r2 cmp r0, 0 - beq _080F739A + beq @080F739A movs r0, 0x80 lsls r0, 9 adds r2, r0 -_080F739A: +@080F739A: lsrs r2, 16 cmp r2, 0 - bne _080F73A6 + bne @080F73A6 cmp r4, 0 - beq _080F73A6 + beq @080F73A6 movs r2, 0x1 -_080F73A6: +@080F73A6: cmp r6, 0 - beq _080F73B0 + beq @080F73B0 cmp r2, 0xA - bls _080F73B0 + bls @080F73B0 movs r2, 0xA -_080F73B0: +@080F73B0: lsls r0, r5, 1 adds r0, r7 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bge _080F73CC + bge @080F73CC negs r0, r2 lsls r0, 24 - b _080F73CE + b @080F73CE .align 2, 0 .pool -_080F73CC: +@080F73CC: lsls r0, r2, 24 -_080F73CE: +@080F73CE: lsrs r0, 24 lsls r0, 24 asrs r0, 24 @@ -469710,7 +469710,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 @@ -469728,7 +469728,7 @@ sub_80F73DC: @ 80F73DC movs r0, 0x1C ldrsh r6, [r7, r0] cmp r6, 0 - bne _080F741C + bne @080F741C movs r1, 0x8 ldrsh r0, [r7, r1] movs r1, 0x3 @@ -469739,12 +469739,12 @@ sub_80F73DC: @ 80F73DC strh r0, [r7, 0x1E] adds r0, r2, 0x1 strh r0, [r7, 0x1C] - b _080F74A4 + b @080F74A4 .align 2, 0 .pool -_080F741C: +@080F741C: cmp r6, 0x1 - bne _080F74A4 + bne @080F74A4 ldrh r0, [r7, 0x1E] subs r0, 0x1 strh r0, [r7, 0x1E] @@ -469753,7 +469753,7 @@ _080F741C: movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _080F74A4 + bne @080F74A4 movs r2, 0x8 ldrsh r4, [r7, r2] lsls r4, 17 @@ -469807,7 +469807,7 @@ _080F741C: bl remove_task movs r0, 0x18 bl audio_play -_080F74A4: +@080F74A4: add sp, 0x10 pop {r3,r4} mov r8, r3 @@ -469820,7 +469820,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 @@ -469830,16 +469830,16 @@ sub_80F74BC: @ 80F74BC ldrb r0, [r1] ldr r6, =0x0203a034 cmp r0, 0 - beq _080F74DE -_080F74D0: + beq @080F74DE +@080F74D0: adds r4, 0x1 cmp r4, 0x3 - bgt _080F74DE + bgt @080F74DE adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0 - bne _080F74D0 -_080F74DE: + bne @080F74D0 +@080F74DE: ldr r1, [r6] lsls r3, r4, 1 adds r3, r4 @@ -469883,7 +469883,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 @@ -469898,7 +469898,7 @@ sub_80F753C: @ 80F753C lsls r0, 16 asrs r5, r0, 16 cmp r5, 0x1 - bne _080F75A0 + bne @080F75A0 movs r0, 0 strh r0, [r4, 0x1E] ldrh r2, [r4, 0x20] @@ -469911,55 +469911,55 @@ sub_80F753C: @ 80F753C movs r1, 0x22 ldrsh r0, [r4, r1] cmp r0, 0 - bne _080F7590 + bne @080F7590 ldrh r0, [r4, 0x20] adds r0, 0x1 strh r0, [r4, 0x20] lsls r0, 16 asrs r0, 16 cmp r0, 0x10 - bne _080F75A0 + bne @080F75A0 strh r5, [r4, 0x22] - b _080F75A0 + b @080F75A0 .align 2, 0 .pool -_080F7590: +@080F7590: ldrh r0, [r4, 0x20] subs r0, 0x1 strh r0, [r4, 0x20] lsls r0, 16 asrs r0, 16 cmp r0, 0 - bne _080F75A0 + bne @080F75A0 strh r0, [r4, 0x22] -_080F75A0: +@080F75A0: pop {r4,r5} pop {r0} bx r0 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] movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0x9 - bgt _080F75D0 + bgt @080F75D0 adds r0, r1, 0x1 strh r0, [r4, 0x2E] lsls r0, 16 asrs r0, 16 cmp r0, 0xA - bne _080F7610 + bne @080F7610 ldrh r0, [r4, 0x30] movs r1, 0 bl cry_related movs r0, 0 strh r0, [r4, 0x30] - b _080F7610 -_080F75D0: + b @080F7610 +@080F75D0: movs r0, 0xC0 lsls r0, 3 adds r2, r0, 0 @@ -469976,14 +469976,14 @@ _080F75D0: lsls r0, 16 asrs r0, 16 cmp r0, 0x77 - bgt _080F75F6 + bgt @080F75F6 movs r0, 0x78 strh r0, [r4, 0x20] -_080F75F6: +@080F75F6: movs r2, 0x20 ldrsh r0, [r4, r2] cmp r0, 0x78 - bne _080F7610 + bne @080F7610 ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] movs r0, 0 @@ -469993,7 +469993,7 @@ _080F75F6: ldr r1, [r0] movs r0, 0x1 strb r0, [r1, 0x6] -_080F7610: +@080F7610: pop {r4} pop {r0} bx r0 @@ -470002,7 +470002,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 @@ -470023,7 +470023,7 @@ sub_80F7620: @ 80F7620 movs r1, 0x20 negs r1, r1 cmp r0, r1 - bge _080F7664 + bge @080F7664 ldr r0, =nullsub_12 + 1 str r0, [r3, 0x1C] adds r2, r3, 0 @@ -470037,7 +470037,7 @@ sub_80F7620: @ 80F7620 ldr r1, [r0] movs r0, 0x2 strb r0, [r1, 0x6] -_080F7664: +@080F7664: pop {r0} bx r0 .align 2, 0 @@ -470045,7 +470045,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} @@ -470062,7 +470062,7 @@ sub_80F7670: @ 80F7670 lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - bne _080F7732 + bne @080F7732 movs r0, 0 strh r0, [r1, 0x8] ldr r0, =0x0203a034 @@ -470071,7 +470071,7 @@ sub_80F7670: @ 80F7670 ldr r0, [r0] ldrb r0, [r0, 0x7] cmp r0, 0x27 - bhi _080F7732 + bhi @080F7732 ldr r4, =0x0858d860 bl GenerateRandomNumber lsls r0, 16 @@ -470134,16 +470134,16 @@ sub_80F7670: @ 80F7670 ldrb r0, [r1, 0x7] adds r0, 0x1 strb r0, [r1, 0x7] -_080F7732: +@080F7732: ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, 0x9] cmp r0, 0 - beq _080F7744 + beq @080F7744 adds r0, r7, 0 bl remove_task -_080F7744: +@080F7744: pop {r3} mov r8, r3 pop {r4-r7} @@ -470154,7 +470154,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] @@ -470186,23 +470186,23 @@ sub_80F7768: @ 80F7768 ldr r0, [r0] ldrb r0, [r0, 0x9] cmp r0, 0 - beq _080F77B6 + beq @080F77B6 adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 strb r0, [r2] -_080F77B6: +@080F77B6: movs r1, 0x20 ldrsh r0, [r4, r1] cmp r0, 0xF8 - bgt _080F77C6 + bgt @080F77C6 movs r2, 0x22 ldrsh r0, [r4, r2] cmp r0, 0x74 - ble _080F77D6 -_080F77C6: + ble @080F77D6 +@080F77C6: adds r0, r4, 0 bl obj_delete_and_free_tiles ldr r0, [r5] @@ -470210,7 +470210,7 @@ _080F77C6: ldrb r0, [r1, 0x7] subs r0, 0x1 strb r0, [r1, 0x7] -_080F77D6: +@080F77D6: pop {r4,r5} pop {r0} bx r0 @@ -470219,7 +470219,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 @@ -470252,7 +470252,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 @@ -470271,7 +470271,7 @@ sub_80F7824: @ 80F7824 movs r2, 0xA ldrsh r1, [r4, r2] cmp r0, r1 - bne _080F786E + bne @080F786E movs r0, 0 strh r0, [r4, 0x1C] ldrh r0, [r4, 0xC] @@ -470289,7 +470289,7 @@ sub_80F7824: @ 80F7824 movs r1, 0x1 eors r0, r1 strh r0, [r4, 0x1E] -_080F786E: +@080F786E: add sp, 0x4 pop {r4,r5} pop {r0} @@ -470299,7 +470299,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 @@ -470312,39 +470312,39 @@ sub_80F7880: @ 80F7880 adds r3, r4, 0x2 movs r0, 0x2 mov r8, r0 -_080F7898: +@080F7898: lsls r0, r2, 16 asrs r0, 16 movs r5, 0 ldrsh r1, [r3, r5] cmp r0, r1 - bge _080F78A6 + bge @080F78A6 ldrh r2, [r3] -_080F78A6: +@080F78A6: adds r3, 0x2 movs r0, 0x1 negs r0, r0 add r8, r0 mov r1, r8 cmp r1, 0 - bge _080F7898 + bge @080F7898 lsls r0, r2, 16 str r0, [sp] cmp r0, 0 - bge _080F78E4 + bge @080F78E4 ldrh r2, [r4] adds r3, r4, 0x2 movs r4, 0x2 mov r8, r4 -_080F78C4: +@080F78C4: lsls r0, r2, 16 asrs r0, 16 movs r5, 0 ldrsh r1, [r3, r5] cmp r0, r1 - ble _080F78D2 + ble @080F78D2 ldrh r2, [r3] -_080F78D2: +@080F78D2: adds r3, 0x2 movs r0, 0x1 negs r0, r0 @@ -470353,12 +470353,12 @@ _080F78D2: str r1, [sp] mov r4, r8 cmp r4, 0 - bge _080F78C4 -_080F78E4: + bge @080F78C4 +@080F78E4: movs r5, 0 mov r8, r5 mov r10, r5 -_080F78EA: +@080F78EA: ldr r0, =0x02039f00 mov r1, r8 lsls r7, r1, 1 @@ -470374,17 +470374,17 @@ _080F78EA: asrs r5, r4, 16 adds r1, r5, 0 cmp r5, 0 - bge _080F790C + bge @080F790C negs r1, r5 -_080F790C: +@080F790C: bl __divsi3 adds r4, r0, 0 movs r1, 0xA bl __modsi3 cmp r0, 0x4 - ble _080F791E + ble @080F791E adds r4, 0xA -_080F791E: +@080F791E: ldr r0, =0x0203a034 mov r9, r0 ldr r0, [r0] @@ -470400,9 +470400,9 @@ _080F791E: movs r2, 0 ldrsh r1, [r7, r2] cmp r1, 0 - bge _080F7942 + bge @080F7942 negs r1, r1 -_080F7942: +@080F7942: lsls r0, r1, 5 subs r0, r1 lsls r0, 2 @@ -470410,17 +470410,17 @@ _080F7942: lsls r0, 3 adds r1, r5, 0 cmp r1, 0 - bge _080F7954 + bge @080F7954 negs r1, r1 -_080F7954: +@080F7954: bl __divsi3 adds r4, r0, 0 movs r1, 0xA bl __modsi3 cmp r0, 0x4 - ble _080F7966 + ble @080F7966 adds r4, 0xA -_080F7966: +@080F7966: adds r0, r4, 0 movs r1, 0xA bl __divsi3 @@ -470428,10 +470428,10 @@ _080F7966: movs r4, 0 ldrsh r0, [r7, r4] cmp r0, 0 - bge _080F797C + bge @080F797C movs r0, 0x1 strb r0, [r6, 0x10] -_080F797C: +@080F797C: mov r5, r9 ldr r0, [r5] ldr r0, [r0, 0x4] @@ -470449,11 +470449,11 @@ _080F797C: movs r5, 0xFF ands r0, r5 cmp r0, 0x7F - bls _080F79A8 + bls @080F79A8 movs r2, 0x80 lsls r2, 1 adds r1, r2 -_080F79A8: +@080F79A8: lsrs r0, r1, 8 str r0, [r4, 0x8] ldr r1, [r4, 0x4] @@ -470467,11 +470467,11 @@ _080F79A8: adds r1, r0, 0 ands r0, r5 cmp r0, 0x7F - bls _080F79CC + bls @080F79CC movs r5, 0x80 lsls r5, 1 adds r1, r5 -_080F79CC: +@080F79CC: lsrs r0, r1, 8 str r0, [r4, 0xC] mov r0, r8 @@ -470495,15 +470495,15 @@ _080F79CC: lsls r0, 24 asrs r0, 24 cmp r0, 0 - bge _080F7A02 + bge @080F7A02 negs r0, r0 -_080F7A02: +@080F7A02: strb r0, [r1, 0x12] ldr r0, =0x02039f20 add r0, r8 ldrb r0, [r0] cmp r0, 0 - beq _080F7A60 + beq @080F7A60 mov r5, r9 ldr r0, [r5] ldr r0, [r0, 0x4] @@ -470515,40 +470515,40 @@ _080F7A02: ldrh r2, [r1, 0xC] ldrb r0, [r1, 0x10] cmp r0, 0 - beq _080F7A2C + beq @080F7A2C lsls r0, r2, 16 negs r0, r0 lsrs r2, r0, 16 -_080F7A2C: +@080F7A2C: lsls r0, r3, 16 asrs r3, r0, 16 lsls r0, r2, 16 asrs r2, r0, 16 adds r0, r3, r2 cmp r0, 0x58 - bne _080F7A60 + bne @080F7A60 cmp r2, 0 - ble _080F7A58 + ble @080F7A58 subs r0, r4, 0x1 str r0, [r1, 0xC] - b _080F7A60 + b @080F7A60 .align 2, 0 .pool -_080F7A58: +@080F7A58: cmp r3, 0 - ble _080F7A60 + ble @080F7A60 subs r0, r5, 0x1 str r0, [r1, 0x8] -_080F7A60: +@080F7A60: movs r4, 0x14 add r10, r4 movs r5, 0x1 add r8, r5 mov r0, r8 cmp r0, 0x3 - bgt _080F7A70 - b _080F78EA -_080F7A70: + bgt @080F7A70 + b @080F78EA +@080F7A70: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -470560,7 +470560,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 @@ -470576,21 +470576,21 @@ sub_80F7A80: @ 80F7A80 movs r3, 0 str r3, [sp, 0xC] cmp r0, 0 - bne _080F7B5C + bne @080F7B5C mov r9, r3 ldr r4, =0x0203a034 mov r10, r4 movs r7, 0xA0 lsls r7, 19 movs r6, 0 -_080F7AAC: +@080F7AAC: mov r1, r10 ldr r0, [r1] ldr r0, [r0, 0x4] adds r0, r6, r0 ldrb r2, [r0, 0x11] cmp r8, r2 - bcs _080F7B2E + bcs @080F7B2E adds r2, 0x13 mov r3, r8 subs r2, r3 @@ -470624,11 +470624,11 @@ _080F7AAC: ands r0, r3 ldr r1, =0x00007fff cmp r0, r1 - bls _080F7B0A + bls @080F7B0A movs r1, 0x80 lsls r1, 9 adds r3, r1 -_080F7B0A: +@080F7B0A: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -470647,7 +470647,7 @@ _080F7B0A: lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x8] -_080F7B2E: +@080F7B2E: movs r3, 0xC0 lsls r3, 18 adds r7, r3 @@ -470656,18 +470656,18 @@ _080F7B2E: add r9, r4 mov r0, r9 cmp r0, 0x3 - ble _080F7AAC - b _080F7C7E + ble @080F7AAC + b @080F7C7E .align 2, 0 .pool -_080F7B5C: +@080F7B5C: movs r1, 0 mov r9, r1 mov r10, r1 movs r3, 0xC0 lsls r3, 19 str r3, [sp, 0x10] -_080F7B68: +@080F7B68: ldr r4, =0x0203a034 ldr r0, [r4] ldr r0, [r0, 0x4] @@ -470676,13 +470676,13 @@ _080F7B68: ldrb r0, [r0, 0x10] ldr r1, =0x000060a3 cmp r0, 0 - beq _080F7B7C + beq @080F7B7C adds r1, 0x2 -_080F7B7C: +@080F7B7C: lsls r0, r2, 24 asrs r0, 24 cmp r8, r0 - bge _080F7C64 + bge @080F7C64 mov r3, r8 lsls r2, r3, 24 asrs r2, 24 @@ -470719,11 +470719,11 @@ _080F7B7C: ands r0, r3 ldr r1, =0x00007fff cmp r0, r1 - bls _080F7BDA + bls @080F7BDA movs r1, 0x80 lsls r1, 9 adds r3, r1 -_080F7BDA: +@080F7BDA: ldr r1, =0x03005e00 lsls r2, r5, 2 adds r0, r2, r5 @@ -470736,23 +470736,23 @@ _080F7BDA: ldrb r0, [r0, 0x10] adds r6, r1, 0 cmp r0, 0 - beq _080F7C1C + beq @080F7C1C strh r7, [r4, 0xC] ldr r0, [sp, 0xC] adds r0, 0x1 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0xC] - b _080F7C26 + b @080F7C26 .align 2, 0 .pool -_080F7C1C: +@080F7C1C: ldr r0, [sp, 0x8] adds r0, 0x1 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x8] -_080F7C26: +@080F7C26: ldr r1, =0x0203a034 ldr r0, [r1] ldr r0, [r0, 0x4] @@ -470761,31 +470761,31 @@ _080F7C26: ldrb r0, [r1, 0x10] ldr r4, =0x0203a034 cmp r0, 0 - beq _080F7C4C + beq @080F7C4C adds r0, r2, r5 lsls r0, 3 adds r0, r6 lsrs r2, r3, 16 ldr r1, [r1, 0x8] subs r1, r2 - b _080F7C58 + b @080F7C58 .align 2, 0 .pool -_080F7C4C: +@080F7C4C: adds r0, r2, r5 lsls r0, 3 adds r0, r6 lsrs r2, r3, 16 ldr r1, [r1, 0x8] adds r1, r2 -_080F7C58: +@080F7C58: strh r1, [r0, 0xA] ldr r0, [r4] ldr r1, [r0] ldrb r0, [r1, 0x14] adds r0, 0x1 strb r0, [r1, 0x14] -_080F7C64: +@080F7C64: movs r0, 0x14 add r10, r0 ldr r1, [sp, 0x10] @@ -470797,21 +470797,21 @@ _080F7C64: add r9, r4 mov r0, r9 cmp r0, 0x3 - bgt _080F7C7E - b _080F7B68 -_080F7C7E: + bgt @080F7C7E + b @080F7B68 +@080F7C7E: ldr r1, [sp, 0xC] cmp r1, 0 - beq _080F7C8A + beq @080F7C8A movs r0, 0x16 bl audio_play -_080F7C8A: +@080F7C8A: ldr r3, [sp, 0x8] cmp r3, 0 - beq _080F7C96 + beq @080F7C96 movs r0, 0x15 bl audio_play -_080F7C96: +@080F7C96: add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -470823,7 +470823,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 @@ -470846,7 +470846,7 @@ sub_80F7CA8: @ 80F7CA8 movs r2, 0xC ldrsh r0, [r0, r2] cmp r0, 0 - beq _080F7CF8 + beq @080F7CF8 ldr r2, =0x0203a034 ldr r0, [r2] ldr r0, [r0] @@ -470857,11 +470857,11 @@ sub_80F7CA8: @ 80F7CA8 ldrsh r0, [r0, r3] adds r5, r1, 0 cmp r0, 0 - bgt _080F7D10 - b _080F7D0E + bgt @080F7D10 + b @080F7D0E .align 2, 0 .pool -_080F7CF8: +@080F7CF8: ldr r2, =0x0203a034 ldr r0, [r2] ldr r0, [r0] @@ -470872,10 +470872,10 @@ _080F7CF8: ldrsh r0, [r0, r3] adds r5, r1, 0 cmp r0, 0x57 - ble _080F7D10 -_080F7D0E: + ble @080F7D10 +@080F7D0E: movs r4, 0x1 -_080F7D10: +@080F7D10: ldr r0, [r2] ldr r0, [r0] adds r0, 0xC @@ -470886,37 +470886,37 @@ _080F7D10: lsls r0, r7, 16 asrs r0, 16 cmp r1, r0 - bne _080F7D2A + bne @080F7D2A movs r1, 0x1 mov r9, r1 -_080F7D2A: +@080F7D2A: mov r0, r9 cmp r0, 0 - bne _080F7D4A + bne @080F7D4A cmp r4, 0 - beq _080F7D3C + beq @080F7D3C strh r7, [r2] - b _080F7D4A + b @080F7D4A .align 2, 0 .pool -_080F7D3C: +@080F7D3C: mov r1, r12 cmp r1, 0 - beq _080F7D46 + beq @080F7D46 subs r0, r3, 0x1 - b _080F7D48 -_080F7D46: + b @080F7D48 +@080F7D46: adds r0, r3, 0x1 -_080F7D48: +@080F7D48: strh r0, [r2] -_080F7D4A: +@080F7D4A: cmp r4, 0 - bne _080F7DC4 + bne @080F7DC4 mov r2, r9 cmp r2, 0 - bne _080F7DCA + bne @080F7DCA movs r2, 0 -_080F7D56: +@080F7D56: ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] @@ -470928,38 +470928,38 @@ _080F7D56: lsls r1, r0, 3 adds r4, r0, 0 cmp r3, r1 - blt _080F7D78 + blt @080F7D78 movs r0, 0x8 - b _080F7D94 + b @080F7D94 .align 2, 0 .pool -_080F7D78: +@080F7D78: lsls r0, r2, 3 cmp r3, r0 - blt _080F7D92 + blt @080F7D92 adds r0, r3, 0 cmp r3, 0 - bge _080F7D86 + bge @080F7D86 adds r0, r3, 0x7 -_080F7D86: +@080F7D86: asrs r0, 3 lsls r0, 3 subs r0, r3, r0 lsls r0, 24 lsrs r0, 24 - b _080F7D94 -_080F7D92: + b @080F7D94 +@080F7D92: movs r0, 0 -_080F7D94: +@080F7D94: cmp r0, 0x3 - bhi _080F7DA0 + bhi @080F7DA0 ldr r3, =0x0000504c - b _080F7DA2 + b @080F7DA2 .align 2, 0 .pool -_080F7DA0: +@080F7DA0: ldr r3, =0x00005057 -_080F7DA2: +@080F7DA2: adds r1, r0, r3 adds r2, 0x7 lsls r2, 24 @@ -470975,12 +470975,12 @@ _080F7DA2: bl bg_fill_tilemap_rect adds r2, r4, 0 cmp r2, 0xA - ble _080F7D56 -_080F7DC4: + ble @080F7D56 +@080F7DC4: mov r0, r9 cmp r0, 0 - beq _080F7DDC -_080F7DCA: + beq @080F7DDC +@080F7DCA: ldr r0, =0x0203a034 ldr r0, [r0] ldr r1, [r0] @@ -470989,7 +470989,7 @@ _080F7DCA: strb r0, [r1, 0x14] mov r0, r8 bl remove_task -_080F7DDC: +@080F7DDC: add sp, 0x8 pop {r3,r4} mov r8, r3 @@ -471002,7 +471002,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 @@ -471052,7 +471052,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] @@ -471100,7 +471100,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 @@ -471149,7 +471149,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] @@ -471162,7 +471162,7 @@ sub_80F7F30: @ 80F7F30 lsrs r0, 24 adds r5, r0, 0 cmp r5, 0 - beq _080F7F5E + beq @080F7F5E ldr r4, =0x02039f2c ldrb r0, [r4] ldr r1, =0x02039f2e @@ -471170,7 +471170,7 @@ sub_80F7F30: @ 80F7F30 bl sub_80DAB8C ldrb r0, [r4] bl sub_80DB09C -_080F7F5E: +@080F7F5E: ldr r0, =0x020375f0 strh r5, [r0] pop {r4,r5} @@ -471181,7 +471181,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 @@ -471193,48 +471193,48 @@ sub_80F7F7C: @ 80F7F7C ldr r0, =0x02039f2c ldrh r0, [r0] cmp r0, 0x4 - bhi _080F7FEE + bhi @080F7FEE lsls r0, 2 - ldr r1, =_080F7FB0 + ldr r1, =@080F7FB0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F7FB0: - .4byte _080F7FC4 - .4byte _080F7FCA - .4byte _080F7FD0 - .4byte _080F7FD6 - .4byte _080F7FDC -_080F7FC4: +@080F7FB0: + .4byte @080F7FC4 + .4byte @080F7FCA + .4byte @080F7FD0 + .4byte @080F7FD6 + .4byte @080F7FDC +@080F7FC4: adds r0, r2, 0 movs r1, 0x32 - b _080F7FE0 -_080F7FCA: + b @080F7FE0 +@080F7FCA: adds r0, r2, 0 movs r1, 0x33 - b _080F7FE0 -_080F7FD0: + b @080F7FE0 +@080F7FD0: adds r0, r2, 0 movs r1, 0x34 - b _080F7FE0 -_080F7FD6: + b @080F7FE0 +@080F7FD6: adds r0, r2, 0 movs r1, 0x35 - b _080F7FE0 -_080F7FDC: + b @080F7FE0 +@080F7FDC: adds r0, r2, 0 movs r1, 0x36 -_080F7FE0: +@080F7FE0: bl pokemon_getattr ldr r1, =0x02039f2e ldrh r1, [r1] cmp r0, r1 - bls _080F7FEE + bls @080F7FEE movs r4, 0x1 -_080F7FEE: +@080F7FEE: adds r0, r4, 0 pop {r4} pop {r1} @@ -471244,7 +471244,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 @@ -471253,30 +471253,30 @@ sub_80F7FFC: @ 80F7FFC adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _080F8010 - b _080F8250 -_080F8010: + beq @080F8010 + b @080F8250 +@080F8010: ldr r0, =0x02039f2c ldrh r0, [r0] cmp r0, 0x4 - bls _080F801A - b _080F8250 -_080F801A: + bls @080F801A + b @080F8250 +@080F801A: lsls r0, 2 - ldr r1, =_080F8034 + ldr r1, =@080F8034 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F8034: - .4byte _080F8048 - .4byte _080F80B8 - .4byte _080F8124 - .4byte _080F8190 - .4byte _080F81F8 -_080F8048: +@080F8034: + .4byte @080F8048 + .4byte @080F80B8 + .4byte @080F8124 + .4byte @080F8190 + .4byte @080F81F8 +@080F8048: ldr r6, =0x02039f24 ldrb r0, [r6] movs r5, 0x64 @@ -471292,14 +471292,14 @@ _080F8048: ldr r0, =0x02039f2e ldrh r0, [r0] cmp r1, r0 - bls _080F806C - b _080F8250 -_080F806C: + bls @080F806C + b @080F8250 +@080F806C: adds r0, r1, 0 cmp r0, 0x3 - bls _080F8074 - b _080F8250 -_080F8074: + bls @080F8074 + b @080F8250 +@080F8074: adds r1, r0, 0x1 mov r0, sp strb r1, [r0] @@ -471316,18 +471316,18 @@ _080F8074: lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bhi _080F809C - b _080F8250 -_080F809C: + bhi @080F809C + b @080F8250 +@080F809C: ldrb r0, [r6] muls r0, r5 adds r0, r4 movs r1, 0x32 bl sub_80EE4DC - b _080F8250 + b @080F8250 .align 2, 0 .pool -_080F80B8: +@080F80B8: mov r4, sp ldr r7, =0x02039f24 ldrb r0, [r7] @@ -471343,13 +471343,13 @@ _080F80B8: ldr r0, =0x02039f2e ldrh r0, [r0] cmp r2, r0 - bls _080F80DC - b _080F8250 -_080F80DC: + bls @080F80DC + b @080F8250 +@080F80DC: cmp r2, 0x3 - bls _080F80E2 - b _080F8250 -_080F80E2: + bls @080F80E2 + b @080F8250 +@080F80E2: mov r1, sp adds r0, r2, 0x1 strb r0, [r1] @@ -471366,18 +471366,18 @@ _080F80E2: lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bhi _080F810A - b _080F8250 -_080F810A: + bhi @080F810A + b @080F8250 +@080F810A: ldrb r0, [r7] muls r0, r6 adds r0, r5 movs r1, 0x33 bl sub_80EE4DC - b _080F8250 + b @080F8250 .align 2, 0 .pool -_080F8124: +@080F8124: mov r4, sp ldr r7, =0x02039f24 ldrb r0, [r7] @@ -471393,13 +471393,13 @@ _080F8124: ldr r0, =0x02039f2e ldrh r0, [r0] cmp r2, r0 - bls _080F8148 - b _080F8250 -_080F8148: + bls @080F8148 + b @080F8250 +@080F8148: cmp r2, 0x3 - bls _080F814E - b _080F8250 -_080F814E: + bls @080F814E + b @080F8250 +@080F814E: mov r1, sp adds r0, r2, 0x1 strb r0, [r1] @@ -471416,16 +471416,16 @@ _080F814E: lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bls _080F8250 + bls @080F8250 ldrb r0, [r7] muls r0, r6 adds r0, r5 movs r1, 0x34 bl sub_80EE4DC - b _080F8250 + b @080F8250 .align 2, 0 .pool -_080F8190: +@080F8190: mov r4, sp ldr r7, =0x02039f24 ldrb r0, [r7] @@ -471441,9 +471441,9 @@ _080F8190: ldr r0, =0x02039f2e ldrh r0, [r0] cmp r2, r0 - bhi _080F8250 + bhi @080F8250 cmp r2, 0x3 - bhi _080F8250 + bhi @080F8250 mov r1, sp adds r0, r2, 0x1 strb r0, [r1] @@ -471460,16 +471460,16 @@ _080F8190: lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bls _080F8250 + bls @080F8250 ldrb r0, [r7] muls r0, r6 adds r0, r5 movs r1, 0x35 bl sub_80EE4DC - b _080F8250 + b @080F8250 .align 2, 0 .pool -_080F81F8: +@080F81F8: mov r4, sp ldr r7, =0x02039f24 ldrb r0, [r7] @@ -471485,9 +471485,9 @@ _080F81F8: ldr r0, =0x02039f2e ldrh r0, [r0] cmp r2, r0 - bhi _080F8250 + bhi @080F8250 cmp r2, 0x3 - bhi _080F8250 + bhi @080F8250 mov r1, sp adds r0, r2, 0x1 strb r0, [r1] @@ -471504,13 +471504,13 @@ _080F81F8: lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bls _080F8250 + bls @080F8250 ldrb r0, [r7] muls r0, r6 adds r0, r5 movs r1, 0x36 bl sub_80EE4DC -_080F8250: +@080F8250: add sp, 0x4 pop {r4-r7} pop {r0} @@ -471520,7 +471520,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 @@ -471540,7 +471540,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 @@ -471556,7 +471556,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 @@ -471568,22 +471568,22 @@ sub_80F82B4: @ 80F82B4 adds r0, r4 movs r6, 0 ldrsh r3, [r0, r6] -_080F82CA: +@080F82CA: lsls r0, r1, 1 adds r0, r4 movs r6, 0 ldrsh r0, [r0, r6] cmp r3, r0 - bge _080F82DC + bge @080F82DC adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 -_080F82DC: +@080F82DC: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x3 - bls _080F82CA + bls @080F82CA strh r2, [r5] pop {r4-r6} pop {r0} @@ -471593,7 +471593,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 @@ -471608,25 +471608,25 @@ 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 ldrb r0, [r2] ldr r3, =0x020375e2 cmp r0, 0 - beq _080F833C -_080F832A: + beq @080F833C +@080F832A: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x3 - bhi _080F833C + bhi @080F833C adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - bne _080F832A -_080F833C: + bne @080F832A +@080F833C: strh r1, [r3] pop {r0} bx r0 @@ -471635,7 +471635,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 @@ -471643,18 +471643,18 @@ sub_80F834C: @ 80F834C ldr r4, =0x02021ec4 ldr r3, =0x02039e0d cmp r0, 0 - beq _080F836E -_080F835C: + beq @080F836E +@080F835C: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x3 - bhi _080F836E + bhi @080F836E adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - bne _080F835C -_080F836E: + bne @080F835C +@080F836E: lsls r1, 6 adds r1, r3 adds r0, r4, 0 @@ -471669,7 +471669,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 @@ -471677,18 +471677,18 @@ sub_80F8390: @ 80F8390 ldr r4, =0x02021cc4 ldr r3, =0x02039e02 cmp r0, 0 - beq _080F83B2 -_080F83A0: + beq @080F83B2 +@080F83A0: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x3 - bhi _080F83B2 + bhi @080F83B2 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - bne _080F83A0 -_080F83B2: + bne @080F83A0 +@080F83B2: lsls r1, 6 adds r1, r3 adds r0, r4, 0 @@ -471701,7 +471701,7 @@ _080F83B2: thumb_func_end sub_80F8390 thumb_func_start sub_80F83D0 -sub_80F83D0: @ 80F83D0 +sub_80F83D0: ; 80F83D0 push {lr} ldr r0, =sub_80D7B24 + 1 bl set_callback2 @@ -471712,7 +471712,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 @@ -471721,12 +471721,12 @@ sub_80F83E0: @ 80F83E0 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080F83FE + bne @080F83FE adds r0, r2, 0 bl remove_task ldr r0, =sub_80F83D0 + 1 bl set_callback2 -_080F83FE: +@080F83FE: pop {r0} bx r0 .align 2, 0 @@ -471734,7 +471734,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 @@ -471756,7 +471756,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 @@ -471771,7 +471771,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 @@ -471780,12 +471780,12 @@ sub_80F8458: @ 80F8458 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080F8476 + bne @080F8476 adds r0, r2, 0 bl remove_task ldr r0, =sub_80F5B00 + 1 bl set_callback2 -_080F8476: +@080F8476: pop {r0} bx r0 .align 2, 0 @@ -471793,7 +471793,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 @@ -471815,7 +471815,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] @@ -471826,7 +471826,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 @@ -471857,7 +471857,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 @@ -471866,7 +471866,7 @@ sub_80F8508: @ 80F8508 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080F8540 + beq @080F8540 ldr r0, =0x02039f24 ldrb r0, [r0] bl sub_80DA8C8 @@ -471874,10 +471874,10 @@ sub_80F8508: @ 80F8508 ldr r2, =sub_80F8568 + 1 adds r0, r4, 0 bl set_task_function_and_args_14_15 - b _080F8556 + b @080F8556 .align 2, 0 .pool -_080F8540: +@080F8540: ldr r0, =0x02039f24 ldrb r0, [r0] bl sub_80DA8C8 @@ -471888,7 +471888,7 @@ _080F8540: adds r0, r1 ldr r1, =sub_81D9DE4 + 1 str r1, [r0] -_080F8556: +@080F8556: pop {r4} pop {r0} bx r0 @@ -471897,7 +471897,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 @@ -471911,7 +471911,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 @@ -471925,7 +471925,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 @@ -471939,7 +471939,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 @@ -471959,12 +471959,12 @@ sub_80F85BC: @ 80F85BC mov r8, r1 ldrb r0, [r5] cmp r3, r0 - bcs _080F8606 + bcs @080F8606 lsls r0, r6, 2 adds r0, r6 lsls r4, r0, 3 ldr r7, =0x03005e08 -_080F85EC: +@080F85EC: mov r1, sp adds r2, r1, r3 adds r1, r3, 0x1 @@ -471977,52 +471977,52 @@ _080F85EC: lsrs r3, r1, 24 ldrb r0, [r5] cmp r3, r0 - bcc _080F85EC -_080F8606: + bcc @080F85EC +@080F8606: movs r3, 0 mov r1, r12 ldrb r0, [r1] cmp r3, r0 - bcs _080F862A + bcs @080F862A adds r4, r0, 0 mov r2, sp -_080F8614: +@080F8614: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, r4 - bcs _080F862A + bcs @080F862A mov r0, sp adds r1, r0, r3 ldrb r0, [r2] ldrb r1, [r1] cmp r0, r1 - beq _080F8614 -_080F862A: + beq @080F8614 +@080F862A: mov r1, r12 ldrb r1, [r1] cmp r3, r1 - bne _080F8644 + bne @080F8644 movs r0, 0 - b _080F8646 + b @080F8646 .align 2, 0 .pool -_080F8644: +@080F8644: movs r0, 0x1 -_080F8646: +@080F8646: mov r1, r9 strh r0, [r1] movs r3, 0 mov r4, r12 ldrb r0, [r4] cmp r3, r0 - bcs _080F8678 + bcs @080F8678 mov r5, r8 lsls r0, r6, 2 adds r0, r6 lsls r2, r0, 3 ldr r7, =0x03005e08 -_080F865E: +@080F865E: adds r1, r5, r3 adds r0, r3, 0x5 lsls r0, 1 @@ -472035,8 +472035,8 @@ _080F865E: lsrs r3, r0, 24 ldrb r1, [r4] cmp r3, r1 - bcc _080F865E -_080F8678: + bcc @080F865E +@080F8678: mov r0, r8 bl sub_80F86E0 ldr r1, =0x02039f2b @@ -472060,7 +472060,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 @@ -472079,7 +472079,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 @@ -472087,22 +472087,22 @@ sub_80F86E0: @ 80F86E0 ldr r0, =0x02039f30 ldrb r0, [r0] cmp r2, r0 - bge _080F8708 + bge @080F8708 adds r5, r0, 0 -_080F86F2: +@080F86F2: adds r0, r3, r4 adds r1, r3, r2 ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bcs _080F8702 + bcs @080F8702 lsls r0, r2, 24 lsrs r4, r0, 24 -_080F8702: +@080F8702: adds r2, 0x1 cmp r2, r5 - blt _080F86F2 -_080F8708: + blt @080F86F2 +@080F8708: adds r0, r4, 0 pop {r4,r5} pop {r1} @@ -472112,18 +472112,18 @@ _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 ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0x1 - bne _080F8748 + bne @080F8748 bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080F877E + beq @080F877E ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -472131,19 +472131,19 @@ sub_80F8714: @ 80F8714 adds r1, r0 ldr r0, =sub_80F878C + 1 str r0, [r1] - b _080F877E + b @080F877E .align 2, 0 .pool -_080F8748: +@080F8748: ldr r5, =0x02039e02 movs r4, 0x3 -_080F874C: +@080F874C: adds r0, r5, 0 bl get_end_of_string_ptr_limit_10_chars adds r5, 0x40 subs r4, 0x1 cmp r4, 0 - bge _080F874C + bge @080F874C adds r0, r6, 0 bl remove_task ldr r0, =0x03005d8c @@ -472158,7 +472158,7 @@ _080F874C: bl saved_warp2_set bl script_env_2_disable bl script_env_2_enable_and_set_ctx_running -_080F877E: +@080F877E: pop {r4-r6} pop {r0} bx r0 @@ -472167,7 +472167,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 @@ -472188,19 +472188,19 @@ 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 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _080F87D0 + bne @080F87D0 adds r0, r1, 0 bl remove_task bl script_env_2_disable bl script_env_2_enable_and_set_ctx_running -_080F87D0: +@080F87D0: pop {r0} bx r0 .align 2, 0 @@ -472208,7 +472208,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] @@ -472237,36 +472237,36 @@ 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] adds r1, r0, 0 cmp r0, 0x1 - beq _080F883A + beq @080F883A cmp r0, 0x1 - bgt _080F8830 + bgt @080F8830 cmp r0, 0 - beq _080F8836 - b _080F8842 + beq @080F8836 + b @080F8842 .align 2, 0 .pool -_080F8830: +@080F8830: cmp r1, 0x2 - beq _080F883E - b _080F8842 -_080F8836: + beq @080F883E + b @080F8842 +@080F8836: movs r1, 0x3 - b _080F8844 -_080F883A: + b @080F8844 +@080F883A: movs r1, 0x4 - b _080F8844 -_080F883E: + b @080F8844 +@080F883E: movs r1, 0x5 - b _080F8844 -_080F8842: + b @080F8844 +@080F8842: movs r1, 0x64 -_080F8844: +@080F8844: ldr r0, =0x020375e0 strh r1, [r0] pop {r0} @@ -472276,7 +472276,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 @@ -472286,41 +472286,41 @@ 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] cmp r0, 0x4 - bhi _080F88A4 + bhi @080F88A4 lsls r0, 2 - ldr r1, =_080F8880 + ldr r1, =@080F8880 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F8880: - .4byte _080F8894 - .4byte _080F8898 - .4byte _080F889C - .4byte _080F88A0 - .4byte _080F88A4 -_080F8894: +@080F8880: + .4byte @080F8894 + .4byte @080F8898 + .4byte @080F889C + .4byte @080F88A0 + .4byte @080F88A4 +@080F8894: movs r1, 0x8 - b _080F88A6 -_080F8898: + b @080F88A6 +@080F8898: movs r1, 0x9 - b _080F88A6 -_080F889C: + b @080F88A6 +@080F889C: movs r1, 0xA - b _080F88A6 -_080F88A0: + b @080F88A6 +@080F88A0: movs r1, 0xB - b _080F88A6 -_080F88A4: + b @080F88A6 +@080F88A4: movs r1, 0xC -_080F88A6: +@080F88A6: ldr r0, =0x03005d8c ldr r0, [r0] lsls r1, 5 @@ -472329,17 +472329,17 @@ _080F88A6: adds r0, r1 ldrh r1, [r0] cmp r1, 0 - bne _080F88CC + bne @080F88CC ldr r0, =0x020375e0 strh r1, [r0] - b _080F88D2 + b @080F88D2 .align 2, 0 .pool -_080F88CC: +@080F88CC: ldr r1, =0x020375e0 movs r0, 0x1 strh r0, [r1] -_080F88D2: +@080F88D2: pop {r0} bx r0 .align 2, 0 @@ -472347,7 +472347,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 @@ -472356,7 +472356,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 @@ -472364,11 +472364,11 @@ sub_80F88E8: @ 80F88E8 adds r0, r2, r0 ldrb r0, [r0] cmp r0, 0 - bne _080F8930 + bne @080F8930 ldr r0, =0x02039f2e ldrh r0, [r0] cmp r0, 0x3 - bne _080F8930 + bne @080F8930 ldr r1, =0x02039f08 lsls r0, r2, 1 adds r0, r1 @@ -472376,16 +472376,16 @@ sub_80F88E8: @ 80F88E8 ldrsh r1, [r0, r2] ldr r0, =0x0000031f cmp r1, r0 - ble _080F8930 + ble @080F8930 ldr r1, =0x020375e0 movs r0, 0x1 - b _080F8934 + b @080F8934 .align 2, 0 .pool -_080F8930: +@080F8930: ldr r1, =0x020375e0 movs r0, 0 -_080F8934: +@080F8934: strh r0, [r1] pop {r0} bx r0 @@ -472394,7 +472394,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 @@ -472402,18 +472402,18 @@ sub_80F8940: @ 80F8940 ldr r2, =0x00002f98 adds r1, r0, r2 movs r2, 0x4 -_080F894E: +@080F894E: ldrh r0, [r1] cmp r0, 0 - beq _080F895A + beq @080F895A adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 -_080F895A: +@080F895A: adds r1, 0x20 subs r2, 0x1 cmp r2, 0 - bge _080F894E + bge @080F894E adds r0, r3, 0 pop {r1} bx r1 @@ -472422,7 +472422,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 @@ -472438,20 +472438,20 @@ sub_80F8970: @ 80F8970 mov r2, r12 mov r1, sp movs r6, 0x3 -_080F898E: +@080F898E: ldrh r0, [r2] strh r0, [r1] adds r2, 0x2 adds r1, 0x2 subs r6, 0x1 cmp r6, 0 - bge _080F898E + bge @080F898E movs r6, 0 -_080F899E: +@080F899E: movs r1, 0x3 cmp r1, r6 - ble _080F89C8 -_080F89A4: + ble @080F89C8 +@080F89A4: subs r5, r1, 0x1 lsls r0, r5, 1 mov r4, sp @@ -472464,17 +472464,17 @@ _080F89A4: movs r7, 0 ldrsh r0, [r2, r7] cmp r1, r0 - bge _080F89C2 + bge @080F89C2 strh r4, [r2] strh r0, [r3] -_080F89C2: +@080F89C2: adds r1, r5, 0 cmp r1, r6 - bgt _080F89A4 -_080F89C8: + bgt @080F89A4 +@080F89C8: adds r6, 0x1 cmp r6, 0x2 - ble _080F899E + ble @080F899E mov r2, r9 ldrh r0, [r2] lsls r0, 1 @@ -472488,11 +472488,11 @@ _080F89C8: adds r3, r0, 0 mov r1, sp mov r5, r9 -_080F89E8: +@080F89E8: movs r7, 0 ldrsh r0, [r1, r7] cmp r0, r4 - bne _080F8A02 + bne @080F8A02 lsls r0, r2, 24 movs r2, 0x80 lsls r2, 17 @@ -472500,13 +472500,13 @@ _080F89E8: lsrs r2, r0, 24 ldrh r7, [r5] cmp r6, r7 - bne _080F8A02 + bne @080F8A02 mov r8, r2 -_080F8A02: +@080F8A02: adds r1, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble _080F89E8 + ble @080F89E8 movs r6, 0 mov r0, sp movs r1, 0 @@ -472515,19 +472515,19 @@ _080F8A02: lsls r2, 24 mov r9, r2 cmp r0, r1 - beq _080F8A30 + beq @080F8A30 adds r2, r1, 0 mov r1, sp -_080F8A20: +@080F8A20: adds r1, 0x2 adds r6, 0x1 cmp r6, 0x3 - bgt _080F8A30 + bgt @080F8A30 movs r4, 0 ldrsh r0, [r1, r4] cmp r0, r2 - bne _080F8A20 -_080F8A30: + bne @080F8A20 +@080F8A30: lsls r0, r6, 24 lsrs r7, r0, 24 mov r2, r8 @@ -472536,28 +472536,28 @@ _080F8A30: mov r5, r12 movs r4, 0 ldrsh r0, [r5, r4] - b _080F8A66 + b @080F8A66 .align 2, 0 .pool -_080F8A50: +@080F8A50: subs r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 -_080F8A56: +@080F8A56: adds r6, 0x1 cmp r6, 0x3 - bgt _080F8A6E + bgt @080F8A6E lsls r0, r6, 1 add r0, r12 asrs r1, r3, 16 movs r5, 0 ldrsh r0, [r0, r5] -_080F8A66: +@080F8A66: cmp r1, r0 - bne _080F8A56 + bne @080F8A56 cmp r2, 0x1 - bne _080F8A50 -_080F8A6E: + bne @080F8A50 +@080F8A6E: lsls r4, r6, 6 mov r0, r10 adds r1, r4, r0 @@ -472575,20 +472575,20 @@ _080F8A6E: mov r1, r9 asrs r0, r1, 24 cmp r0, 0x1 - beq _080F8A9C + beq @080F8A9C cmp r8, r0 - bne _080F8AB0 -_080F8A9C: + bne @080F8AB0 +@080F8A9C: ldr r0, =0x020375e4 strh r7, [r0] - b _080F8AB6 + b @080F8AB6 .align 2, 0 .pool -_080F8AB0: +@080F8AB0: ldr r1, =0x020375e4 adds r0, r7, 0x4 strh r0, [r1] -_080F8AB6: +@080F8AB6: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -472602,7 +472602,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 + 1 bl set_callback2 @@ -472613,7 +472613,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 + 1 bl set_callback2 @@ -472627,47 +472627,47 @@ 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] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080F8B7C + beq @080F8B7C movs r3, 0 ldr r0, =0x02039f30 adds r4, r0, 0 ldr r5, =0x02039e00 ldrb r0, [r4] cmp r3, r0 - bge _080F8B50 + bge @080F8B50 adds r2, r5, 0 ldr r1, =0x020229e8 -_080F8B1C: +@080F8B1C: ldrb r0, [r1] subs r0, 0x1 cmp r0, 0x1 - bhi _080F8B44 + bhi @080F8B44 ldrb r0, [r1, 0x13] cmp r0, 0 - bne _080F8B40 + bne @080F8B40 movs r0, 0xEB - b _080F8B42 + b @080F8B42 .align 2, 0 .pool -_080F8B40: +@080F8B40: movs r0, 0xEC -_080F8B42: +@080F8B42: strb r0, [r2, 0x15] -_080F8B44: +@080F8B44: adds r2, 0x40 adds r1, 0x1C adds r3, 0x1 ldrb r0, [r4] cmp r3, r0 - blt _080F8B1C -_080F8B50: + blt @080F8B1C +@080F8B50: ldr r0, =0x00004010 ldrb r1, [r5, 0x15] bl var_set @@ -472686,7 +472686,7 @@ _080F8B50: adds r1, 0xD5 ldrb r1, [r1] bl var_set -_080F8B7C: +@080F8B7C: pop {r4,r5} pop {r0} bx r0 @@ -472695,7 +472695,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 @@ -472705,17 +472705,17 @@ sub_80F8B94: @ 80F8B94 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080F8C6E + beq @080F8C6E movs r5, 0 ldr r0, =0x02039f30 ldrb r0, [r0] cmp r5, r0 - bge _080F8C6E + bge @080F8C6E movs r7, 0 movs r6, 0x60 movs r4, 0xB0 lsls r4, 17 -_080F8BBA: +@080F8BBA: ldr r0, =0x0858d8ec adds r0, r5, r0 ldrb r0, [r0] @@ -472747,39 +472747,39 @@ _080F8BBA: ldrb r0, [r1] subs r0, 0x1 cmp r0, 0x1 - bhi _080F8C38 + bhi @080F8C38 ldrb r0, [r1, 0x13] cmp r0, 0 - bne _080F8C2C + bne @080F8C2C lsrs r1, r4, 16 ldr r0, =0x08499a18 - b _080F8C42 + b @080F8C42 .align 2, 0 .pool -_080F8C2C: +@080F8C2C: lsrs r1, r4, 16 ldr r0, =0x084a54b8 - b _080F8C42 + b @080F8C42 .align 2, 0 .pool -_080F8C38: +@080F8C38: ldrb r0, [r1, 0x13] cmp r0, 0 - bne _080F8C50 + bne @080F8C50 lsrs r1, r4, 16 ldr r0, =0x084987f8 -_080F8C42: +@080F8C42: movs r2, 0x20 bl gpu_pal_apply - b _080F8C5A + b @080F8C5A .align 2, 0 .pool -_080F8C50: +@080F8C50: lsrs r1, r4, 16 ldr r0, =0x084a4278 movs r2, 0x20 bl gpu_pal_apply -_080F8C5A: +@080F8C5A: movs r0, 0x80 lsls r0, 13 adds r4, r0 @@ -472789,8 +472789,8 @@ _080F8C5A: ldr r0, =0x02039f30 ldrb r0, [r0] cmp r5, r0 - blt _080F8BBA -_080F8C6E: + blt @080F8BBA +@080F8C6E: pop {r4-r7} pop {r0} bx r0 @@ -472799,7 +472799,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 @@ -472815,18 +472815,18 @@ sub_80F8C7C: @ 80F8C7C mov r1, sp strb r0, [r1] cmp r0, 0 - bne _080F8D18 + bne @080F8D18 ldr r0, =0x02039f20 ldr r1, =0x02039f25 ldrb r2, [r1] adds r0, r2, r0 ldrb r0, [r0] cmp r0, 0 - bne _080F8D18 + bne @080F8D18 ldr r0, =0x02039f2e ldrh r0, [r0] cmp r0, 0x3 - bne _080F8D18 + bne @080F8D18 ldr r1, =0x02039f08 lsls r0, r2, 1 adds r0, r1 @@ -472834,7 +472834,7 @@ sub_80F8C7C: @ 80F8C7C ldrsh r1, [r0, r2] ldr r0, =0x0000031f cmp r1, r0 - ble _080F8D18 + ble @080F8D18 movs r1, 0x1 mov r0, sp strb r1, [r0] @@ -472851,20 +472851,20 @@ sub_80F8C7C: @ 80F8C7C lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bls _080F8CF6 + bls @080F8CF6 ldrb r0, [r6] muls r0, r5 adds r0, r4 movs r1, 0x46 bl sub_80EE4DC -_080F8CF6: +@080F8CF6: movs r0, 0x1 - b _080F8D1A + b @080F8D1A .align 2, 0 .pool -_080F8D18: +@080F8D18: movs r0, 0 -_080F8D1A: +@080F8D1A: add sp, 0x4 pop {r4-r6} pop {r1} @@ -472872,13 +472872,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 @@ -472890,9 +472890,9 @@ sub_80F8D28: @ 80F8D28 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _080F8D44 - b _080F8E9C -_080F8D44: + beq @080F8D44 + b @080F8E9C +@080F8D44: bl init_uns_table_pokemon_copy movs r0, 0xA mov r9, r0 @@ -472929,7 +472929,7 @@ _080F8D44: ldrh r0, [r4] ldrb r1, [r1] cmp r0, r1 - bne _080F8DC4 + bne @080F8DC4 lsls r0, r6, 3 ldr r1, =0x0830a18c adds r0, r1 @@ -472939,10 +472939,10 @@ _080F8D44: adds r2, r6, 0 adds r3, r5, 0 bl help_system_enable_unless_flashback__sp199 - b _080F8DD8 + b @080F8DD8 .align 2, 0 .pool -_080F8DC4: +@080F8DC4: lsls r0, r6, 3 ldr r1, =0x0830a18c adds r0, r1 @@ -472952,7 +472952,7 @@ _080F8DC4: adds r2, r6, 0 adds r3, r5, 0 bl sub_8034B50 -_080F8DD8: +@080F8DD8: adds r0, r6, 0 mov r1, r8 adds r2, r5, 0 @@ -472987,12 +472987,12 @@ _080F8DD8: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080F8E58 + beq @080F8E58 movs r0, 0x4 ands r0, r1 lsls r4, r5, 4 cmp r0, 0 - bne _080F8E6C + bne @080F8E6C adds r0, r4, r5 lsls r0, 2 ldr r1, =0x02020630 @@ -473001,10 +473001,10 @@ _080F8DD8: movs r2, 0 movs r3, 0 bl sub_806ED40 - b _080F8E6C + b @080F8E6C .align 2, 0 .pool -_080F8E58: +@080F8E58: lsls r4, r5, 4 adds r0, r4, r5 lsls r0, 2 @@ -473014,7 +473014,7 @@ _080F8E58: movs r2, 0 movs r3, 0 bl sub_806ED40 -_080F8E6C: +@080F8E6C: ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 @@ -473039,7 +473039,7 @@ _080F8E6C: negs r0, r0 ands r0, r2 strb r0, [r1, 0x5] -_080F8E9C: +@080F8E9C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -473052,14 +473052,14 @@ _080F8E9C: thumb_func_end sub_80F8D28 thumb_func_start sub_80F8EB8 -sub_80F8EB8: @ 80F8EB8 +sub_80F8EB8: ; 80F8EB8 push {lr} ldr r0, =sub_80F8EE8 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq _080F8EDC + beq @080F8EDC ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -473069,7 +473069,7 @@ sub_80F8EB8: @ 80F8EB8 adds r0, 0x1 strh r0, [r1, 0x8] bl sub_805F094 -_080F8EDC: +@080F8EDC: pop {r0} bx r0 .align 2, 0 @@ -473077,7 +473077,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 @@ -473090,22 +473090,22 @@ sub_80F8EE8: @ 80F8EE8 ldrsh r0, [r5, r2] adds r2, r1, 0 cmp r0, 0x4 - bhi _080F8F98 + bhi @080F8F98 lsls r0, 2 - ldr r1, =_080F8F14 + ldr r1, =@080F8F14 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080F8F14: - .4byte _080F8F78 - .4byte _080F8F28 - .4byte _080F8F98 - .4byte _080F8F42 - .4byte _080F8F84 -_080F8F28: +@080F8F14: + .4byte @080F8F78 + .4byte @080F8F28 + .4byte @080F8F98 + .4byte @080F8F42 + .4byte @080F8F84 +@080F8F28: movs r0, 0xA movs r1, 0x3 movs r2, 0x8 @@ -473116,8 +473116,8 @@ _080F8F28: strh r0, [r5, 0x12] movs r1, 0x1 bl SetStandardWindowBorderStyle - b _080F8F78 -_080F8F42: + b @080F8F78 +@080F8F42: movs r0, 0xC ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -473134,22 +473134,22 @@ _080F8F42: ldrb r0, [r4, 0x1] lsls r0, 30 cmp r0, 0 - beq _080F8F72 + beq @080F8F72 ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 bl rotscale_free_entry -_080F8F72: +@080F8F72: adds r0, r4, 0 bl obj_delete_and_free_tiles -_080F8F78: +@080F8F78: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] - b _080F8F98 + b @080F8F98 .align 2, 0 .pool -_080F8F84: +@080F8F84: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -473158,42 +473158,42 @@ _080F8F84: bl sub_80E2A78 adds r0, r4, 0 bl remove_task -_080F8F98: +@080F8F98: pop {r4,r5} pop {r0} bx r0 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] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080F8FD8 + beq @080F8FD8 ldr r0, =0x02039f30 ldrb r0, [r0] cmp r0, 0x4 - bne _080F8FD8 + bne @080F8FD8 movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _080F8FD8 + bne @080F8FD8 ldr r4, =0x020375f0 bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 strh r0, [r4] - b _080F8FDE + b @080F8FDE .align 2, 0 .pool -_080F8FD8: +@080F8FD8: ldr r1, =0x020375f0 movs r0, 0x4 strh r0, [r1] -_080F8FDE: +@080F8FDE: pop {r4} pop {r0} bx r0 @@ -473202,14 +473202,14 @@ _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] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _080F9020 + beq @080F9020 ldr r2, =0x030060b8 ldr r1, [r2] ldr r0, =0x41c64e6d @@ -473219,15 +473219,15 @@ sub_80F8FE8: @ 80F8FE8 str r0, [r2] lsrs r0, 16 ldr r4, =0x020375f0 - b _080F902A + b @080F902A .align 2, 0 .pool -_080F9020: +@080F9020: ldr r4, =0x020375f0 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 -_080F902A: +@080F902A: ldrh r1, [r4] bl __umodsi3 strh r0, [r4] @@ -473239,7 +473239,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 @@ -473254,24 +473254,24 @@ 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] movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _080F9074 + bne @080F9074 movs r0, 0 - b _080F907E + b @080F907E .align 2, 0 .pool -_080F9074: +@080F9074: ldr r0, =sub_80F9088 + 1 movs r1, 0x5 bl AddTask movs r0, 0x1 -_080F907E: +@080F907E: pop {r1} bx r1 .align 2, 0 @@ -473279,7 +473279,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 @@ -473291,54 +473291,54 @@ sub_80F9088: @ 80F9088 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080F90C0 + beq @080F90C0 cmp r0, 0x1 - beq _080F90CE + beq @080F90CE bl sub_800A520 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080F90D4 + bne @080F90D4 bl script_env_2_enable_and_set_ctx_running adds r0, r5, 0 bl remove_task - b _080F90D4 + b @080F90D4 .align 2, 0 .pool -_080F90C0: +@080F90C0: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080F90D4 + beq @080F90D4 bl sub_800ADF8 -_080F90CE: +@080F90CE: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080F90D4: +@080F90D4: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_80F9088 thumb_func_start sub_80F90DC -sub_80F90DC: @ 80F90DC +sub_80F90DC: ; 80F90DC push {lr} ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080F90FE + beq @080F90FE ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _080F90FE + beq @080F90FE bl sub_800E0E8 movs r0, 0x8 movs r1, 0x8 bl sub_800DFB4 -_080F90FE: +@080F90FE: pop {r0} bx r0 .align 2, 0 @@ -473346,20 +473346,20 @@ _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] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080F9126 + beq @080F9126 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _080F9126 + beq @080F9126 bl sub_800E084 -_080F9126: +@080F9126: pop {r0} bx r0 .align 2, 0 @@ -473367,27 +473367,27 @@ _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] movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne _080F914C + bne @080F914C movs r0, 0 - b _080F914E + b @080F914E .align 2, 0 .pool -_080F914C: +@080F914C: movs r0, 0x1 -_080F914E: +@080F914E: pop {r1} bx r1 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] @@ -473397,27 +473397,27 @@ 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] movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _080F9178 + bne @080F9178 movs r0, 0 - b _080F917A + b @080F917A .align 2, 0 .pool -_080F9178: +@080F9178: movs r0, 0x1 -_080F917A: +@080F917A: pop {r1} bx r1 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 @@ -473429,11 +473429,11 @@ sp000_heal_pokemon: @ 80F9180 ldr r0, =0x020244e9 ldrb r0, [r0] cmp r8, r0 - bcs _080F922C + bcs @080F922C ldr r1, =0x020244ec mov r10, r1 mov r6, sp -_080F919E: +@080F919E: movs r0, 0x64 mov r4, r8 muls r4, r0 @@ -473458,7 +473458,7 @@ _080F919E: movs r1, 0x1 add r1, r8 mov r9, r1 -_080F91D4: +@080F91D4: adds r1, r5, 0 adds r1, 0xD adds r0, r4, 0 @@ -473478,7 +473478,7 @@ _080F91D4: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _080F91D4 + bls @080F91D4 movs r0, 0 strb r0, [r6] strb r0, [r6, 0x1] @@ -473498,8 +473498,8 @@ _080F91D4: ldr r0, =0x020244e9 ldrb r0, [r0] cmp r8, r0 - bcc _080F919E -_080F922C: + bcc @080F919E +@080F922C: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -473513,8 +473513,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} @@ -473558,16 +473558,16 @@ sub_80F9244: @ 80F9244 lsls r0, 16 lsrs r5, r0, 16 cmp r4, 0x1 - bgt _080F92B8 + bgt @080F92B8 cmp r4, 0 - blt _080F92B8 + blt @080F92B8 adds r0, r5, 0 movs r1, 0x2 bl pokedex_flag_operation adds r0, r5, 0 movs r1, 0x3 bl pokedex_flag_operation -_080F92B8: +@080F92B8: adds r0, r4, 0 add sp, 0x78 pop {r3} @@ -473578,7 +473578,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 @@ -473603,25 +473603,25 @@ 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 lsrs r1, r0, 24 cmp r1, 0x1 - beq _080F9314 + beq @080F9314 cmp r1, 0x1 - bgt _080F9310 + bgt @080F9310 cmp r1, 0 - beq _080F9314 - b _080F9318 -_080F9310: + beq @080F9314 + b @080F9318 +@080F9310: cmp r1, 0x2 - bne _080F9318 -_080F9314: + bne @080F9318 +@080F9314: ldr r0, =0x020375f0 strh r1, [r0] -_080F9318: +@080F9318: pop {r0} bx r0 .align 2, 0 @@ -473629,14 +473629,14 @@ _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 movs r5, 0 movs r7, 0xCE lsls r7, 1 -_080F932C: +@080F932C: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -473648,31 +473648,31 @@ _080F932C: lsls r0, 16 lsrs r0, 16 cmp r0, 0 - beq _080F9360 + beq @080F9360 cmp r0, r7 - beq _080F9360 + beq @080F9360 adds r0, r4, 0 movs r1, 0xC bl pokemon_getattr cmp r0, r6 - bne _080F9360 + bne @080F9360 movs r0, 0x1 - b _080F9368 + b @080F9368 .align 2, 0 .pool -_080F9360: +@080F9360: adds r5, 0x1 cmp r5, 0x5 - ble _080F932C + ble @080F932C movs r0, 0 -_080F9368: +@080F9368: pop {r4-r7} pop {r1} bx r1 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 @@ -473680,14 +473680,14 @@ sub_80F9370: @ 80F9370 lsrs r0, 24 adds r4, r0, 0 cmp r4, 0x1 - bne _080F9392 + bne @080F9392 movs r0, 0xAF bl berryid_from_itemid lsls r0, 24 lsrs r0, 24 ldr r1, =0x02021cc4 bl sub_80E1A38 -_080F9392: +@080F9392: adds r0, r4, 0 pop {r4} pop {r1} @@ -473697,7 +473697,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} @@ -473724,7 +473724,7 @@ sub_80F93A0: @ 80F93A0 movs r3, 0x20 bl create_pokemon_set_level cmp r6, 0 - beq _080F93EE + beq @080F93EE add r0, sp, 0x10 strb r6, [r0] adds r1, r0, 0 @@ -473734,7 +473734,7 @@ sub_80F93A0: @ 80F93A0 movs r1, 0xC add r2, sp, 0x10 bl pokemon_setattr -_080F93EE: +@080F93EE: add sp, 0x14 pop {r3} mov r8, r3 @@ -473746,7 +473746,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 @@ -473755,13 +473755,13 @@ sub_80F9400: @ 80F9400 lsls r2, 24 lsrs r2, 24 cmp r3, 0x6 - bls _080F941C + bls @080F941C ldr r0, =0x020244e9 ldrb r0, [r0] subs r0, 0x1 lsls r0, 24 lsrs r3, r0, 24 -_080F941C: +@080F941C: movs r0, 0x64 muls r0, r3 ldr r1, =0x020244ec @@ -473776,7 +473776,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 + 1 @@ -473793,22 +473793,22 @@ 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] cmp r1, 0 - bne _080F9478 + bne @080F9478 ldr r0, =0x020375f0 strh r1, [r0] - b _080F947E + b @080F947E .align 2, 0 .pool -_080F9478: +@080F9478: ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] -_080F947E: +@080F947E: ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 pop {r0} @@ -473818,7 +473818,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 + 1 @@ -473836,22 +473836,22 @@ 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] cmp r1, 0 - bne _080F94D0 + bne @080F94D0 ldr r0, =0x020375f0 strh r1, [r0] - b _080F94D6 + b @080F94D6 .align 2, 0 .pool -_080F94D0: +@080F94D0: ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] -_080F94D6: +@080F94D6: ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 pop {r0} @@ -473861,7 +473861,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 @@ -473874,12 +473874,12 @@ sub_80F94E8: @ 80F94E8 movs r7, 0x64 ldr r6, =0x020244ec mov r4, sp -_080F9502: +@080F9502: ldr r0, =0x0203cef8 adds r1, r5, r0 ldrb r0, [r1] cmp r0, 0 - beq _080F951C + beq @080F951C subs r0, 0x1 adds r1, r0, 0 muls r1, r7 @@ -473887,11 +473887,11 @@ _080F9502: adds r0, r4, 0 movs r2, 0x64 bl memcpy -_080F951C: +@080F951C: adds r4, 0x64 adds r5, 0x1 cmp r5, 0x3 - ble _080F9502 + ble @080F9502 add r0, sp, 0x194 movs r1, 0 str r1, [r0] @@ -473901,7 +473901,7 @@ _080F951C: bl CpuSet mov r5, sp add r6, sp, 0x12C -_080F9538: +@080F9538: adds r0, r4, 0 adds r1, r5, 0 movs r2, 0x64 @@ -473909,7 +473909,7 @@ _080F9538: adds r5, 0x64 adds r4, 0x64 cmp r5, r6 - ble _080F9538 + ble @080F9538 bl calc_player_party_count add sp, 0x198 pop {r4-r7} @@ -473920,61 +473920,61 @@ _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 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - beq _080F9580 + beq @080F9580 movs r0, 0xCE lsls r0, 1 cmp r1, r0 - bne _080F9584 -_080F9580: + bne @080F9584 +@080F9580: movs r0, 0 - b _080F9586 -_080F9584: + b @080F9586 +@080F9584: movs r0, 0x1 -_080F9586: +@080F9586: pop {r1} bx r1 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 -_080F9592: +@080F9592: adds r0, r4, 0 bl sub_80F9568 cmp r0, 0 - beq _080F95B0 + beq @080F95B0 adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _080F95B0 + beq @080F95B0 movs r0, 0 - b _080F95BA + b @080F95BA .align 2, 0 .pool -_080F95B0: +@080F95B0: adds r5, 0x1 adds r4, 0x64 cmp r5, 0x5 - ble _080F9592 + ble @080F9592 movs r0, 0x1 -_080F95BA: +@080F95BA: pop {r4,r5} pop {r1} bx r1 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 @@ -474009,7 +474009,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 @@ -474020,12 +474020,12 @@ sub_80F960C: @ 80F960C adds r0, r4, 0 bl sub_80F9568 cmp r0, 0 - beq _080F964C + beq @080F964C adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - bne _080F964C + bne @080F964C adds r0, r4, 0 movs r1, 0x37 bl pokemon_getattr @@ -474033,21 +474033,21 @@ sub_80F960C: @ 80F960C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080F964C + bne @080F964C movs r0, 0x1 - b _080F964E + b @080F964E .align 2, 0 .pool -_080F964C: +@080F964C: movs r0, 0 -_080F964E: +@080F964E: pop {r4} pop {r1} bx r1 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 @@ -474059,30 +474059,30 @@ sub_80F9654: @ 80F9654 movs r0, 0 ldrsh r5, [r4, r0] cmp r5, 0x1 - beq _080F96AE + beq @080F96AE cmp r5, 0x1 - bgt _080F967C + bgt @080F967C cmp r5, 0 - beq _080F9682 - b _080F9722 + beq @080F9682 + b @080F9722 .align 2, 0 .pool -_080F967C: +@080F967C: cmp r5, 0x2 - beq _080F96C0 - b _080F9722 -_080F9682: + beq @080F96C0 + b @080F9722 +@080F9682: ldrh r1, [r4, 0x2] movs r2, 0x2 ldrsh r0, [r4, r2] cmp r0, 0x5 - bgt _080F96A8 -_080F968C: + bgt @080F96A8 +@080F968C: lsls r0, r1, 24 lsrs r0, 24 bl sub_80F960C cmp r0, 0 - bne _080F96FC + bne @080F96FC ldrh r0, [r4, 0x2] adds r0, 0x1 strh r0, [r4, 0x2] @@ -474090,50 +474090,50 @@ _080F968C: lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - ble _080F968C -_080F96A8: + ble @080F968C +@080F96A8: movs r0, 0x2 strh r0, [r4] - b _080F9722 -_080F96AE: + b @080F9722 +@080F96AE: bl sub_809833C lsls r0, 24 cmp r0, 0 - beq _080F9722 + beq @080F9722 ldrh r0, [r4] subs r0, 0x1 strh r0, [r4] - b _080F9722 -_080F96C0: + b @080F9722 +@080F96C0: bl sub_80F958C adds r1, r0, 0 cmp r1, 0 - beq _080F9714 + beq @080F9714 bl sub_81A9E40 adds r4, r0, 0 bl sub_81A80A8 orrs r4, r0 lsls r4, 24 cmp r4, 0 - bne _080F96E6 + bne @080F96E6 bl sub_81D5C18 lsls r0, 24 cmp r0, 0 - beq _080F96F0 -_080F96E6: + beq @080F96F0 +@080F96E6: ldr r0, =0x020375f0 strh r5, [r0] - b _080F9718 + b @080F9718 .align 2, 0 .pool -_080F96F0: +@080F96F0: ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] - b _080F9718 + b @080F9718 .align 2, 0 .pool -_080F96FC: +@080F96FC: ldrb r0, [r4, 0x2] bl sub_80F95C0 ldr r0, =0x085ecf5d @@ -474141,17 +474141,17 @@ _080F96FC: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - b _080F9722 + b @080F9722 .align 2, 0 .pool -_080F9714: +@080F9714: ldr r0, =0x020375f0 strh r1, [r0] -_080F9718: +@080F9718: bl script_env_2_enable_and_set_ctx_running adds r0, r6, 0 bl remove_task -_080F9722: +@080F9722: pop {r4-r6} pop {r0} bx r0 @@ -474160,7 +474160,7 @@ _080F9722: thumb_func_end sub_80F9654 thumb_func_start sub_80F972C -sub_80F972C: @ 80F972C +sub_80F972C: ; 80F972C push {lr} ldr r0, =sub_80F9654 + 1 movs r1, 0x50 @@ -474173,19 +474173,19 @@ 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 movs r7, 0 movs r6, 0 movs r5, 0x5 -_080F9750: +@080F9750: adds r0, r4, 0 movs r1, 0x5 bl pokemon_getattr cmp r0, 0 - beq _080F9794 + beq @080F9794 adds r0, r4, 0 movs r1, 0x37 bl pokemon_getattr @@ -474193,51 +474193,51 @@ _080F9750: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080F9794 + bne @080F9794 adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr str r0, [sp] cmp r0, 0 - beq _080F9786 + beq @080F9786 subs r0, 0x1 str r0, [sp] cmp r0, 0 - bne _080F9788 -_080F9786: + bne @080F9788 +@080F9786: adds r6, 0x1 -_080F9788: +@080F9788: adds r0, r4, 0 movs r1, 0x39 mov r2, sp bl pokemon_setattr adds r7, 0x1 -_080F9794: +@080F9794: adds r4, 0x64 subs r5, 0x1 cmp r5, 0 - bge _080F9750 + bge @080F9750 cmp r6, 0 - bne _080F97A4 + bne @080F97A4 cmp r7, 0 - beq _080F97A8 -_080F97A4: + beq @080F97A8 +@080F97A4: bl overworld_posion_effect -_080F97A8: +@080F97A8: cmp r6, 0 - beq _080F97B4 + beq @080F97B4 movs r0, 0x2 - b _080F97BE + b @080F97BE .align 2, 0 .pool -_080F97B4: +@080F97B4: cmp r7, 0 - bne _080F97BC + bne @080F97BC movs r0, 0 - b _080F97BE -_080F97BC: + b @080F97BE +@080F97BC: movs r0, 0x1 -_080F97BE: +@080F97BE: add sp, 0x4 pop {r4-r7} pop {r1} @@ -474245,7 +474245,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 @@ -474324,38 +474324,38 @@ 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 movs r1, 0x1 ldr r3, =0x0858d8f0 -_080F9876: +@080F9876: lsls r0, r1, 3 adds r0, r3 ldrh r0, [r0, 0x4] cmp r2, r0 - bcs _080F988C + bcs @080F988C subs r0, r1, 0x1 lsls r0, 24 lsrs r0, 24 - b _080F9898 + b @080F9898 .align 2, 0 .pool -_080F988C: +@080F988C: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xE - bls _080F9876 + bls @080F9876 adds r0, r1, 0 -_080F9898: +@080F9898: pop {r1} bx r1 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 @@ -474410,7 +474410,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 @@ -474419,13 +474419,13 @@ sub_80F9910: @ 80F9910 adds r0, r4, 0 bl __floatsidf cmp r4, 0 - bge _080F992C - ldr r3, _080F9974 - ldr r2, _080F9970 + bge @080F992C + ldr r3, @080F9974 + ldr r2, @080F9970 bl __adddf3 -_080F992C: - ldr r2, _080F9978 - ldr r3, _080F997C +@080F992C: + ldr r2, @080F9978 + ldr r3, @080F997C bl __divdf3 bl __fixunsdfsi adds r4, r0, 0 @@ -474437,7 +474437,7 @@ _080F992C: movs r3, 0x8 bl decimal_int_to_string adds r5, r0, 0 - ldr r1, _080F9980 + ldr r1, @080F9980 bl gf_strcat adds r5, r0, 0 adds r0, r4, 0 @@ -474452,15 +474452,15 @@ _080F992C: pop {r0} bx r0 .align 2, 0 -_080F9970: .4byte 0x41f00000 -_080F9974: .4byte 0x00000000 -_080F9978: .4byte 0x40396666 -_080F997C: .4byte 0x66666666 -_080F9980: .4byte 0x085eed24 +@080F9970: .4byte 0x41f00000 +@080F9974: .4byte 0x00000000 +@080F9978: .4byte 0x40396666 +@080F997C: .4byte 0x66666666 +@080F9980: .4byte 0x085eed24 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 @@ -474469,12 +474469,12 @@ sub_80F9984: @ 80F9984 ldr r1, =0x020375f0 ldrh r0, [r1] cmp r0, 0xFF - bne _080F99A0 + bne @080F99A0 movs r0, 0 - b _080F9A0A + b @080F9A0A .align 2, 0 .pool -_080F99A0: +@080F99A0: ldrh r1, [r1] movs r0, 0x64 muls r1, r0 @@ -474484,18 +474484,18 @@ _080F99A0: movs r1, 0x2D bl pokemon_getattr cmp r0, 0x1 - beq _080F99C2 + beq @080F99C2 adds r0, r5, 0 movs r1, 0xB bl pokemon_getattr cmp r0, r6 - beq _080F99CC -_080F99C2: + beq @080F99CC +@080F99C2: movs r0, 0x1 - b _080F9A0A + b @080F9A0A .align 2, 0 .pool -_080F99CC: +@080F99CC: mov r4, sp adds r0, r5, 0 bl sub_80F97C8 @@ -474513,17 +474513,17 @@ _080F99CC: adds r1, r5, 0 bl sub_80F9910 cmp r5, r4 - bls _080F9A08 + bls @080F9A08 mov r0, sp ldrh r0, [r0] strh r0, [r7] movs r0, 0x3 - b _080F9A0A + b @080F9A0A .align 2, 0 .pool -_080F9A08: +@080F9A08: movs r0, 0x2 -_080F9A0A: +@080F9A0A: add sp, 0x4 pop {r4-r7} pop {r1} @@ -474531,7 +474531,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 @@ -474553,19 +474553,19 @@ sub_80F9A14: @ 80F9A14 movs r0, 0x80 lsls r0, 8 cmp r1, r0 - bne _080F9A64 + bne @080F9A64 ldr r0, =0x02021dc4 ldr r1, =0x085ecf6b bl gf_strcpy - b _080F9A6E + b @080F9A6E .align 2, 0 .pool -_080F9A64: +@080F9A64: ldr r0, =0x02021dc4 ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy -_080F9A6E: +@080F9A6E: pop {r4,r5} pop {r0} bx r0 @@ -474574,7 +474574,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 @@ -474587,7 +474587,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 var_get_pointer @@ -474602,7 +474602,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 var_get_pointer @@ -474622,7 +474622,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 @@ -474635,7 +474635,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 var_get_pointer @@ -474649,7 +474649,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 var_get_pointer @@ -474668,7 +474668,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} @@ -474687,9 +474687,9 @@ sub_80F9B30: @ 80F9B30 bl memcpy mov r8, r4 cmp r6, 0xA - bhi _080F9BAC + bhi @080F9BAC cmp r5, 0x40 - bhi _080F9BAC + bhi @080F9BAC ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000031a8 @@ -474697,7 +474697,7 @@ sub_80F9B30: @ 80F9B30 adds r0, r6 strb r5, [r0] movs r5, 0 -_080F9B6A: +@080F9B6A: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -474707,12 +474707,12 @@ _080F9B6A: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _080F9B9C + beq @080F9B9C adds r0, r4, 0 movs r1, 0x6 bl pokemon_getattr cmp r0, 0 - bne _080F9B9C + bne @080F9B9C mov r1, sp adds r0, r1, r6 ldrb r1, [r0] @@ -474720,15 +474720,15 @@ _080F9B6A: mov r2, r8 bl pokemon_setattr movs r7, 0x1 -_080F9B9C: +@080F9B9C: adds r5, 0x1 cmp r5, 0x5 - ble _080F9B6A + ble @080F9B6A cmp r7, 0 - beq _080F9BAC + beq @080F9BAC ldr r0, =0x0000089b bl flag_set -_080F9BAC: +@080F9BAC: add sp, 0xC pop {r3} mov r8, r3 @@ -474740,7 +474740,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 @@ -474763,7 +474763,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 @@ -474786,7 +474786,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 + 1 bl is_function_an_active_task @@ -474799,7 +474799,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 + 1 bl is_function_an_active_task @@ -474812,7 +474812,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 @@ -474833,15 +474833,15 @@ sub_80F9C44: @ 80F9C44 strh r0, [r1, 0x8] movs r0, 0x10 cmp r4, 0 - beq _080F9C72 + beq @080F9C72 adds r0, r4, 0 -_080F9C72: +@080F9C72: strh r0, [r1, 0xA] movs r0, 0x14 cmp r5, 0 - beq _080F9C7C + beq @080F9C7C adds r0, r5, 0 -_080F9C7C: +@080F9C7C: strh r0, [r1, 0xC] ldr r1, [r1] adds r0, r2, 0 @@ -474854,7 +474854,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 @@ -474866,21 +474866,21 @@ sub_80F9C90: @ 80F9C90 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080F9D10 + beq @080F9D10 cmp r0, 0x1 - bgt _080F9CB8 + bgt @080F9CB8 cmp r0, 0 - beq _080F9CC2 - b _080F9DDE + beq @080F9CC2 + b @080F9DDE .align 2, 0 .pool -_080F9CB8: +@080F9CB8: cmp r0, 0x2 - beq _080F9D32 + beq @080F9D32 cmp r0, 0x3 - beq _080F9D94 - b _080F9DDE -_080F9CC2: + beq @080F9D94 + b @080F9DDE +@080F9CC2: movs r0, 0x78 strh r0, [r4, 0xE] strh r0, [r4, 0x10] @@ -474914,8 +474914,8 @@ _080F9CC2: movs r0, 0x4A movs r1, 0 bl lcd_io_set - b _080F9DEE -_080F9D10: + b @080F9DEE +@080F9D10: movs r0, 0x50 bl lcd_io_get strh r0, [r4, 0x16] @@ -474928,8 +474928,8 @@ _080F9D10: movs r0, 0x54 movs r1, 0x10 bl lcd_io_set - b _080F9DEE -_080F9D32: + b @080F9DEE +@080F9D32: ldrh r0, [r4, 0xE] ldrh r1, [r4, 0xA] subs r0, r1 @@ -474940,12 +474940,12 @@ _080F9D32: strh r1, [r4, 0x10] lsls r0, 16 cmp r0, 0 - ble _080F9D50 + ble @080F9D50 lsls r0, r1, 16 asrs r0, 16 cmp r0, 0xEF - ble _080F9D76 -_080F9D50: + ble @080F9D76 +@080F9D50: strh r5, [r4, 0xE] movs r0, 0xF0 strh r0, [r4, 0x10] @@ -474962,7 +474962,7 @@ _080F9D50: bl sub_80A2A20 ldr r0, =0x02037b14 strh r5, [r0] -_080F9D76: +@080F9D76: ldrh r1, [r4, 0xE] lsls r1, 8 ldrh r0, [r4, 0x10] @@ -474973,10 +474973,10 @@ _080F9D76: bl lcd_io_set movs r1, 0xE ldrsh r0, [r4, r1] - b _080F9DD8 + b @080F9DD8 .align 2, 0 .pool -_080F9D94: +@080F9D94: ldrh r0, [r4, 0x12] ldrh r1, [r4, 0xC] subs r0, r1 @@ -474986,12 +474986,12 @@ _080F9D94: strh r1, [r4, 0x14] lsls r0, 16 cmp r0, 0 - ble _080F9DB0 + ble @080F9DB0 lsls r0, r1, 16 asrs r0, 16 cmp r0, 0x9F - ble _080F9DC2 -_080F9DB0: + ble @080F9DC2 +@080F9DB0: movs r0, 0 strh r0, [r4, 0x12] movs r0, 0xA0 @@ -475000,7 +475000,7 @@ _080F9DB0: lsls r1, 6 movs r0, 0 bl lcd_io_clear_bits -_080F9DC2: +@080F9DC2: ldrh r1, [r4, 0x12] lsls r1, 8 ldrh r0, [r4, 0x14] @@ -475011,29 +475011,29 @@ _080F9DC2: bl lcd_io_set movs r1, 0x12 ldrsh r0, [r4, r1] -_080F9DD8: +@080F9DD8: cmp r0, 0 - bne _080F9DF4 - b _080F9DEE -_080F9DDE: + bne @080F9DF4 + b @080F9DEE +@080F9DDE: ldrh r1, [r4, 0x16] movs r0, 0x50 bl lcd_io_set adds r0, r5, 0 bl remove_task - b _080F9DF4 -_080F9DEE: + b @080F9DF4 +@080F9DEE: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080F9DF4: +@080F9DF4: pop {r4,r5} pop {r0} bx r0 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 @@ -475045,27 +475045,27 @@ sub_80F9DFC: @ 80F9DFC movs r0, 0x8 ldrsh r1, [r4, r0] cmp r1, 0x1 - beq _080F9E38 + beq @080F9E38 cmp r1, 0x1 - bgt _080F9E24 + bgt @080F9E24 cmp r1, 0 - beq _080F9E2E - b _080F9F2C + beq @080F9E2E + b @080F9F2C .align 2, 0 .pool -_080F9E24: +@080F9E24: cmp r1, 0x2 - beq _080F9E86 + beq @080F9E86 cmp r1, 0x3 - beq _080F9ED8 - b _080F9F2C -_080F9E2E: + beq @080F9ED8 + b @080F9F2C +@080F9E2E: ldr r0, =0x02037b14 strh r1, [r0] - b _080F9F4E + b @080F9F4E .align 2, 0 .pool -_080F9E38: +@080F9E38: movs r1, 0 strh r1, [r4, 0xE] movs r0, 0xF0 @@ -475099,8 +475099,8 @@ _080F9E38: movs r0, 0x4A movs r1, 0 bl lcd_io_set - b _080F9F4E -_080F9E86: + b @080F9F4E +@080F9E86: ldrh r0, [r4, 0xC] ldrh r2, [r4, 0x12] adds r1, r0, r2 @@ -475111,12 +475111,12 @@ _080F9E86: lsls r1, 16 asrs r1, 16 cmp r1, 0x4F - bgt _080F9EA4 + bgt @080F9EA4 lsls r0, 16 asrs r0, 16 cmp r0, 0x51 - bgt _080F9EBC -_080F9EA4: + bgt @080F9EBC +@080F9EA4: movs r0, 0x50 strh r0, [r4, 0x12] movs r0, 0x51 @@ -475127,7 +475127,7 @@ _080F9EA4: movs r0, 0x54 movs r1, 0x10 bl lcd_io_set -_080F9EBC: +@080F9EBC: ldrh r1, [r4, 0x12] lsls r1, 8 ldrh r0, [r4, 0x14] @@ -475139,9 +475139,9 @@ _080F9EBC: movs r1, 0x12 ldrsh r0, [r4, r1] cmp r0, 0x50 - bne _080F9F54 - b _080F9F4E -_080F9ED8: + bne @080F9F54 + b @080F9F4E +@080F9ED8: ldrh r0, [r4, 0xA] ldrh r2, [r4, 0xE] adds r1, r0, r2 @@ -475152,12 +475152,12 @@ _080F9ED8: lsls r1, 16 asrs r1, 16 cmp r1, 0x77 - bgt _080F9EF6 + bgt @080F9EF6 lsls r0, 16 asrs r0, 16 cmp r0, 0x78 - bgt _080F9F0C -_080F9EF6: + bgt @080F9F0C +@080F9EF6: movs r0, 0x78 strh r0, [r4, 0xE] strh r0, [r4, 0x10] @@ -475168,7 +475168,7 @@ _080F9EF6: ldr r1, =0x02037b14 movs r0, 0 strh r0, [r1] -_080F9F0C: +@080F9F0C: ldrh r1, [r4, 0xE] lsls r1, 8 ldrh r0, [r4, 0x10] @@ -475180,11 +475180,11 @@ _080F9F0C: movs r1, 0xE ldrsh r0, [r4, r1] cmp r0, 0x78 - bne _080F9F54 - b _080F9F4E + bne @080F9F54 + b @080F9F4E .align 2, 0 .pool -_080F9F2C: +@080F9F2C: movs r1, 0x80 lsls r1, 6 movs r0, 0 @@ -475197,19 +475197,19 @@ _080F9F2C: bl lcd_io_set adds r0, r5, 0 bl remove_task - b _080F9F54 -_080F9F4E: + b @080F9F54 +@080F9F4E: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080F9F54: +@080F9F54: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_80F9DFC thumb_func_start sub_80F9F5C -sub_80F9F5C: @ 80F9F5C +sub_80F9F5C: ; 80F9F5C push {lr} ldr r0, =0x0203ab40 ldr r1, =0x02037318 @@ -475223,102 +475223,102 @@ 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] movs r0, 0x6 ands r0, r1 cmp r0, 0 - beq _080F9FC0 + beq @080F9FC0 ldr r1, =0x02038c08 ldr r0, [r1, 0x4] cmp r0, 0x2 - beq _080F9FAE + beq @080F9FAE cmp r0, 0x2 - bgt _080F9FA0 + bgt @080F9FA0 cmp r0, 0x1 - beq _080F9FA6 - b _080F9FFE + beq @080F9FA6 + b @080F9FFE .align 2, 0 .pool -_080F9FA0: +@080F9FA0: cmp r0, 0x3 - beq _080F9FB6 - b _080F9FDC -_080F9FA6: + beq @080F9FB6 + b @080F9FDC +@080F9FA6: movs r0, 0x10 str r0, [r1, 0x14] movs r0, 0x28 - b _080F9FFC -_080F9FAE: + b @080F9FFC +@080F9FAE: movs r0, 0x10 str r0, [r1, 0x14] movs r0, 0x8 - b _080F9FFC -_080F9FB6: + b @080F9FFC +@080F9FB6: movs r0, 0x8 negs r0, r0 str r0, [r1, 0x14] movs r0, 0x18 - b _080F9FFC -_080F9FC0: + b @080F9FFC +@080F9FC0: ldr r1, =0x02038c08 ldr r0, [r1, 0x4] cmp r0, 0x2 - beq _080F9FEA + beq @080F9FEA cmp r0, 0x2 - bgt _080F9FD8 + bgt @080F9FD8 cmp r0, 0x1 - beq _080F9FE2 - b _080F9FFE + beq @080F9FE2 + b @080F9FFE .align 2, 0 .pool -_080F9FD8: +@080F9FD8: cmp r0, 0x3 - beq _080F9FEE -_080F9FDC: + beq @080F9FEE +@080F9FDC: cmp r0, 0x4 - beq _080F9FF8 - b _080F9FFE -_080F9FE2: + beq @080F9FF8 + b @080F9FFE +@080F9FE2: movs r0, 0x8 str r0, [r1, 0x14] movs r0, 0x28 - b _080F9FFC -_080F9FEA: + b @080F9FFC +@080F9FEA: movs r0, 0x8 - b _080F9FFA -_080F9FEE: + b @080F9FFA +@080F9FEE: movs r0, 0x8 negs r0, r0 str r0, [r1, 0x14] movs r0, 0x18 - b _080F9FFC -_080F9FF8: + b @080F9FFC +@080F9FF8: movs r0, 0x18 -_080F9FFA: +@080F9FFA: str r0, [r1, 0x14] -_080F9FFC: +@080F9FFC: str r0, [r1, 0x18] -_080F9FFE: +@080F9FFE: pop {r0} bx r0 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 ldrh r0, [r0] cmp r0, 0x1 - beq _080FA0AE + beq @080FA0AE bl player_get_direction__sp1AA lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _080FA0AE + bne @080FA0AE ldr r4, =0x0203ab40 adds r1, r4, 0x2 adds r0, r4, 0 @@ -475335,53 +475335,53 @@ sub_80FA004: @ 80FA004 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080FA070 + bne @080FA070 bl sub_80F9F5C ldr r1, =0x03005db0 ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] ldr r1, =0x0203ceec ldr r0, =sub_80FA0DC + 1 - b _080FA0C0 + b @080FA0C0 .align 2, 0 .pool -_080FA070: +@080FA070: adds r0, r4, 0 bl sub_808925C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080FA0A0 + bne @080FA0A0 bl sub_80F9F5C ldr r1, =0x03005db0 ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] ldr r1, =0x0203ceec ldr r0, =sub_80FA1E8 + 1 - b _080FA0C0 + b @080FA0C0 .align 2, 0 .pool -_080FA0A0: +@080FA0A0: adds r0, r4, 0 bl is_tile_x98 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080FA0B2 -_080FA0AE: + beq @080FA0B2 +@080FA0AE: movs r0, 0 - b _080FA0C4 -_080FA0B2: + b @080FA0C4 +@080FA0B2: bl sub_80F9F5C ldr r1, =0x03005db0 ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] ldr r1, =0x0203ceec ldr r0, =sub_80FA34C + 1 -_080FA0C0: +@080FA0C0: str r0, [r1] movs r0, 0x1 -_080FA0C4: +@080FA0C4: pop {r4} pop {r1} bx r1 @@ -475390,7 +475390,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 @@ -475406,7 +475406,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 @@ -475428,7 +475428,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 oe_active_list_remove @@ -475439,7 +475439,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, =0x0858e600 @@ -475474,7 +475474,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 @@ -475491,28 +475491,28 @@ 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] movs r3, 0x2E ldrsh r0, [r1, r3] cmp r0, 0x27 - bgt _080FA1C8 + bgt @080FA1C8 adds r0, r2, 0x1 strh r0, [r1, 0x2E] lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - bne _080FA1D0 + bne @080FA1D0 bl sub_80E8D4C - b _080FA1D0 -_080FA1C8: + b @080FA1D0 +@080FA1C8: movs r0, 0 strh r0, [r1, 0x2E] ldr r0, =sub_80FA1D8 + 1 str r0, [r1, 0x1C] -_080FA1D0: +@080FA1D0: pop {r0} bx r0 .align 2, 0 @@ -475520,7 +475520,7 @@ _080FA1D0: thumb_func_end sub_80FA1A8 thumb_func_start sub_80FA1D8 -sub_80FA1D8: @ 80FA1D8 +sub_80FA1D8: ; 80FA1D8 push {lr} movs r1, 0x37 bl oe_stop @@ -475530,7 +475530,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 @@ -475546,7 +475546,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 @@ -475568,7 +475568,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 oe_active_list_remove @@ -475579,7 +475579,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 @@ -475592,17 +475592,17 @@ sub_80FA248: @ 80FA248 adds r0, r1, 0 ands r2, r0 cmp r2, 0x96 - bne _080FA26A + bne @080FA26A ldr r1, =0x02038c08 movs r0, 0 str r0, [r1, 0x1C] -_080FA26A: +@080FA26A: cmp r2, 0x9C - bne _080FA274 + bne @080FA274 ldr r1, =0x02038c08 movs r0, 0x2 str r0, [r1, 0x1C] -_080FA274: +@080FA274: bl sub_80F9F78 ldr r0, =0x0858e618 ldr r3, =0x02020630 @@ -475629,12 +475629,12 @@ _080FA274: bl obj_add_from_template_forward_search ldr r0, [r4, 0x1C] cmp r0, 0x1 - beq _080FA2B2 + beq @080FA2B2 cmp r0, 0x3 - bne _080FA2B6 -_080FA2B2: + bne @080FA2B6 +@080FA2B2: bl sub_80E8D4C -_080FA2B6: +@080FA2B6: movs r0, 0 pop {r4} pop {r1} @@ -475644,7 +475644,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 @@ -475666,7 +475666,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] @@ -475675,21 +475675,21 @@ sub_80FA304: @ 80FA304 lsls r0, 16 asrs r0, 16 cmp r0, 0x27 - ble _080FA32E + ble @080FA32E ldr r0, =0x02038c08 ldr r0, [r0, 0x1C] cmp r0, 0 - beq _080FA322 + beq @080FA322 cmp r0, 0x2 - bne _080FA326 -_080FA322: + bne @080FA326 +@080FA322: bl sub_80E8D4C -_080FA326: +@080FA326: movs r0, 0 strh r0, [r4, 0x2E] ldr r0, =sub_80FA33C + 1 str r0, [r4, 0x1C] -_080FA32E: +@080FA32E: pop {r4} pop {r0} bx r0 @@ -475698,7 +475698,7 @@ _080FA32E: thumb_func_end sub_80FA304 thumb_func_start sub_80FA33C -sub_80FA33C: @ 80FA33C +sub_80FA33C: ; 80FA33C push {lr} movs r1, 0x38 bl oe_stop @@ -475708,7 +475708,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 @@ -475724,7 +475724,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 @@ -475746,7 +475746,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 oe_active_list_remove @@ -475757,7 +475757,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, =0x0858e630 @@ -475792,7 +475792,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 @@ -475809,28 +475809,28 @@ 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] movs r3, 0x2E ldrsh r0, [r1, r3] cmp r0, 0x27 - bgt _080FA438 + bgt @080FA438 adds r0, r2, 0x1 strh r0, [r1, 0x2E] lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - bne _080FA440 + bne @080FA440 bl sub_80E8D4C - b _080FA440 -_080FA438: + b @080FA440 +@080FA438: movs r0, 0 strh r0, [r1, 0x2E] ldr r0, =sub_80FA448 + 1 str r0, [r1, 0x1C] -_080FA440: +@080FA440: pop {r0} bx r0 .align 2, 0 @@ -475838,7 +475838,7 @@ _080FA440: thumb_func_end sub_80FA418 thumb_func_start sub_80FA448 -sub_80FA448: @ 80FA448 +sub_80FA448: ; 80FA448 push {lr} movs r1, 0x39 bl oe_stop @@ -475848,7 +475848,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 @@ -475883,7 +475883,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 @@ -475897,57 +475897,57 @@ sub_80FA4A0: @ 80FA4A0 lsls r0, 16 asrs r0, 16 cmp r0, 0x10 - bhi _080FA56E + bhi @080FA56E lsls r0, 2 - ldr r1, =_080FA4D0 + ldr r1, =@080FA4D0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080FA4D0: - .4byte _080FA514 - .4byte _080FA56E - .4byte _080FA56E - .4byte _080FA56E - .4byte _080FA522 - .4byte _080FA56E - .4byte _080FA56E - .4byte _080FA56E - .4byte _080FA514 - .4byte _080FA56E - .4byte _080FA56E - .4byte _080FA56E - .4byte _080FA522 - .4byte _080FA56E - .4byte _080FA56E - .4byte _080FA56E - .4byte _080FA540 -_080FA514: +@080FA4D0: + .4byte @080FA514 + .4byte @080FA56E + .4byte @080FA56E + .4byte @080FA56E + .4byte @080FA522 + .4byte @080FA56E + .4byte @080FA56E + .4byte @080FA56E + .4byte @080FA514 + .4byte @080FA56E + .4byte @080FA56E + .4byte @080FA56E + .4byte @080FA522 + .4byte @080FA56E + .4byte @080FA56E + .4byte @080FA56E + .4byte @080FA540 +@080FA514: movs r1, 0 ldrsh r0, [r4, r1] movs r2, 0x2 ldrsh r1, [r4, r2] movs r2, 0x89 lsls r2, 2 - b _080FA52E -_080FA522: + b @080FA52E +@080FA522: movs r1, 0 ldrsh r0, [r4, r1] movs r2, 0x2 ldrsh r1, [r4, r2] movs r2, 0x88 lsls r2, 2 -_080FA52E: +@080FA52E: bl setmaptile_0 movs r1, 0 ldrsh r0, [r4, r1] movs r2, 0x2 ldrsh r1, [r4, r2] bl cur_mapdata_draw_block_at - b _080FA56E -_080FA540: + b @080FA56E +@080FA540: movs r1, 0 ldrsh r0, [r4, r1] movs r2, 0x2 @@ -475965,19 +475965,19 @@ _080FA540: bl script_env_2_enable_and_set_ctx_running adds r0, r5, 0 bl remove_task - b _080FA574 -_080FA56E: + b @080FA574 +@080FA56E: ldrh r0, [r4, 0x4] adds r0, 0x1 strh r0, [r4, 0x4] -_080FA574: +@080FA574: pop {r4,r5} pop {r0} bx r0 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 @@ -475991,7 +475991,7 @@ sub_80FA57C: @ 80FA57C bl var_get lsls r0, 16 cmp r0, 0 - bne _080FA5B8 + bne @080FA5B8 mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -476000,10 +476000,10 @@ sub_80FA57C: @ 80FA57C movs r2, 0xE2 lsls r2, 4 bl setmaptile_0 - b _080FA5C8 + b @080FA5C8 .align 2, 0 .pool -_080FA5B8: +@080FA5B8: mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -476011,7 +476011,7 @@ _080FA5B8: ldrsh r1, [r4, r2] ldr r2, =0x00000e21 bl setmaptile_0 -_080FA5C8: +@080FA5C8: mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -476027,7 +476027,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 @@ -476063,7 +476063,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 @@ -476076,27 +476076,27 @@ sub_80FA62C: @ 80FA62C movs r2, 0x6 ldrsh r0, [r4, r2] cmp r0, 0x6 - bne _080FA650 + bne @080FA650 movs r0, 0 - b _080FA652 + b @080FA652 .align 2, 0 .pool -_080FA650: +@080FA650: adds r0, r1, 0x1 -_080FA652: +@080FA652: strh r0, [r4, 0x6] movs r3, 0x6 ldrsh r0, [r4, r3] cmp r0, 0 - bne _080FA6A4 + bne @080FA6A4 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x2 - bne _080FA66C + bne @080FA66C movs r2, 0 ldrsh r0, [r4, r2] bl sub_80FA6AC -_080FA66C: +@080FA66C: movs r3, 0x2 ldrsh r0, [r4, r3] movs r2, 0x4 @@ -476116,78 +476116,78 @@ _080FA66C: movs r3, 0x8 ldrsh r0, [r4, r3] cmp r0, 0x3 - bne _080FA6A0 + bne @080FA6A0 adds r0, r5, 0 bl remove_task - b _080FA6A4 -_080FA6A0: + b @080FA6A4 +@080FA6A0: adds r0, r1, 0x1 strh r0, [r4, 0x8] -_080FA6A4: +@080FA6A4: pop {r4,r5} pop {r0} bx r0 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 movs r0, 0xCE lsls r0, 2 cmp r1, r0 - beq _080FA6D8 + beq @080FA6D8 cmp r1, r0 - bgt _080FA6C8 + bgt @080FA6C8 movs r0, 0x8A lsls r0, 2 cmp r1, r0 - beq _080FA6F0 - b _080FA6F6 -_080FA6C8: + beq @080FA6F0 + b @080FA6F6 +@080FA6C8: movs r0, 0xCF lsls r0, 2 cmp r1, r0 - beq _080FA6E0 + beq @080FA6E0 adds r0, 0x4 cmp r1, r0 - beq _080FA6E8 - b _080FA6F6 -_080FA6D8: + beq @080FA6E8 + b @080FA6F6 +@080FA6D8: movs r0, 0x4A bl audio_play - b _080FA6F6 -_080FA6E0: + b @080FA6F6 +@080FA6E0: movs r0, 0x4B bl audio_play - b _080FA6F6 -_080FA6E8: + b @080FA6F6 +@080FA6E8: movs r0, 0x4C bl audio_play - b _080FA6F6 -_080FA6F0: + b @080FA6F6 +@080FA6F0: movs r0, 0x4E bl audio_play -_080FA6F6: +@080FA6F6: pop {r0} bx r0 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 @@ -476224,7 +476224,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 @@ -476237,7 +476237,7 @@ sub_80FA754: @ 80FA754 movs r3, 0x8 ldrsh r0, [r1, r3] cmp r0, 0x7 - bne _080FA788 + bne @080FA788 movs r2, 0xA ldrsh r0, [r1, r2] movs r3, 0xC @@ -476245,20 +476245,20 @@ sub_80FA754: @ 80FA754 bl sub_80FA704 adds r0, r4, 0 bl remove_task - b _080FA78C + b @080FA78C .align 2, 0 .pool -_080FA788: +@080FA788: adds r0, r2, 0x1 strh r0, [r1, 0x8] -_080FA78C: +@080FA78C: pop {r4} pop {r0} bx r0 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 @@ -476270,16 +476270,16 @@ sub_80FA794: @ 80FA794 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080FA7BC + bne @080FA7BC lsls r0, r5, 16 asrs r0, 16 lsls r1, r4, 16 asrs r1, 16 bl sub_80FA704 - b _080FA7DE -_080FA7BC: + b @080FA7DE +@080FA7BC: cmp r0, 0x2 - bne _080FA7DE + bne @080FA7DE ldr r0, =sub_80FA754 + 1 movs r1, 0x5 bl AddTask @@ -476294,7 +476294,7 @@ _080FA7BC: strh r0, [r1, 0x8] strh r7, [r1, 0xA] strh r6, [r1, 0xC] -_080FA7DE: +@080FA7DE: pop {r4-r7} pop {r0} bx r0 @@ -476303,7 +476303,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 @@ -476316,9 +476316,9 @@ sub_80FA7EC: @ 80FA7EC movs r3, 0xA ldrsh r0, [r1, r3] cmp r0, 0x7 - beq _080FA808 - b _080FA966 -_080FA808: + beq @080FA808 + b @080FA966 +@080FA808: ldr r2, =0xfffffd88 adds r0, r2, 0 ldrh r1, [r1, 0x8] @@ -476326,124 +476326,124 @@ _080FA808: lsls r0, 16 asrs r0, 16 cmp r0, 0x3B - bls _080FA81A - b _080FA95E -_080FA81A: + bls @080FA81A + b @080FA95E +@080FA81A: lsls r0, 2 - ldr r1, =_080FA830 + ldr r1, =@080FA830 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080FA830: - .4byte _080FA920 - .4byte _080FA928 - .4byte _080FA930 - .4byte _080FA938 - .4byte _080FA940 - .4byte _080FA948 - .4byte _080FA950 - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA95E - .4byte _080FA958 -_080FA920: +@080FA830: + .4byte @080FA920 + .4byte @080FA928 + .4byte @080FA930 + .4byte @080FA938 + .4byte @080FA940 + .4byte @080FA948 + .4byte @080FA950 + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA95E + .4byte @080FA958 +@080FA920: movs r0, 0x3E bl audio_play - b _080FA95E -_080FA928: + b @080FA95E +@080FA928: movs r0, 0x3F bl audio_play - b _080FA95E -_080FA930: + b @080FA95E +@080FA930: movs r0, 0x40 bl audio_play - b _080FA95E -_080FA938: + b @080FA95E +@080FA938: movs r0, 0x41 bl audio_play - b _080FA95E -_080FA940: + b @080FA95E +@080FA940: movs r0, 0x42 bl audio_play - b _080FA95E -_080FA948: + b @080FA95E +@080FA948: movs r0, 0x43 bl audio_play - b _080FA95E -_080FA950: + b @080FA95E +@080FA950: movs r0, 0x44 bl audio_play - b _080FA95E -_080FA958: + b @080FA95E +@080FA958: movs r0, 0x45 bl audio_play -_080FA95E: +@080FA95E: adds r0, r4, 0 bl remove_task - b _080FA96A -_080FA966: + b @080FA96A +@080FA966: adds r0, r2, 0x1 strh r0, [r1, 0xA] -_080FA96A: +@080FA96A: pop {r4} pop {r0} bx r0 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 @@ -476469,7 +476469,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] @@ -476478,24 +476478,24 @@ sub_80FA9A4: @ 80FA9A4 lsls r0, 16 asrs r0, 16 cmp r0, 0x8 - bne _080FA9BC + bne @080FA9BC movs r0, 0xC3 bl audio_play -_080FA9BC: +@080FA9BC: movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0x1F - ble _080FA9CA + ble @080FA9CA adds r0, r4, 0 bl obj_delete_and_free_tiles -_080FA9CA: +@080FA9CA: pop {r4} pop {r0} bx r0 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 @@ -476534,7 +476534,7 @@ sub_80FA9D0: @ 80FA9D0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _080FAA5E + beq @080FAA5E ldr r3, =0x02020630 lsls r2, r0, 4 adds r2, r0 @@ -476565,7 +476565,7 @@ sub_80FA9D0: @ 80FA9D0 str r0, [r2] movs r0, 0 strh r0, [r4, 0x2E] -_080FAA5E: +@080FAA5E: add sp, 0x4 pop {r4} pop {r0} @@ -476575,7 +476575,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 @@ -476596,21 +476596,21 @@ sub_80FAA7C: @ 80FAA7C lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - beq _080FAAFC + beq @080FAAFC cmp r0, 0x2 - bgt _080FAABC + bgt @080FAABC cmp r0, 0x1 - beq _080FAAC6 - b _080FAB8C + beq @080FAAC6 + b @080FAB8C .align 2, 0 .pool -_080FAABC: +@080FAABC: cmp r0, 0x3 - beq _080FAB2C + beq @080FAB2C cmp r0, 0x4 - beq _080FAB64 - b _080FAB8C -_080FAAC6: + beq @080FAB64 + b @080FAB8C +@080FAAC6: ldr r0, =0x0858e68c ldr r3, =0x02020630 ldr r1, =0x02037590 @@ -476630,10 +476630,10 @@ _080FAAC6: adds r2, 0x20 movs r3, 0 bl obj_add_from_template_forward_search - b _080FAB8C + b @080FAB8C .align 2, 0 .pool -_080FAAFC: +@080FAAFC: ldr r0, =0x0858e68c ldr r3, =0x02020630 ldr r1, =0x02037590 @@ -476650,10 +476650,10 @@ _080FAAFC: adds r1, r3 asrs r1, 16 ldrb r2, [r2] - b _080FAB4C + b @080FAB4C .align 2, 0 .pool -_080FAB2C: +@080FAB2C: ldr r0, =0x0858e68c ldr r3, =0x02020630 ldr r1, =0x02037590 @@ -476670,13 +476670,13 @@ _080FAB2C: asrs r1, 16 ldrb r2, [r2] adds r2, 0x10 -_080FAB4C: +@080FAB4C: movs r3, 0x94 bl obj_add_from_template_forward_search - b _080FAB8C + b @080FAB8C .align 2, 0 .pool -_080FAB64: +@080FAB64: ldr r0, =0x0858e68c ldr r3, =0x02020630 ldr r1, =0x02037590 @@ -476696,7 +476696,7 @@ _080FAB64: adds r2, 0x10 movs r3, 0x94 bl obj_add_from_template_forward_search -_080FAB8C: +@080FAB8C: movs r0, 0 add sp, 0x4 pop {r4} @@ -476707,7 +476707,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 @@ -476719,23 +476719,23 @@ door_restore_tilemap: @ 80FABA4 bl cur_mapdata_get_blockid_at ldr r1, =0x00000286 cmp r0, r1 - bne _080FABDC + bne @080FABDC ldr r0, [r4, 0x14] ldr r1, [r4, 0x18] subs r1, 0x1 ldr r2, =0x00000e02 bl setmaptile_0 - b _080FABEA + b @080FABEA .align 2, 0 .pool -_080FABDC: +@080FABDC: ldr r0, [r4, 0x14] ldr r1, [r4, 0x18] subs r1, 0x1 movs r2, 0xA1 lsls r2, 2 bl setmaptile_0 -_080FABEA: +@080FABEA: ldr r4, =0x02038c08 ldr r0, [r4, 0x14] ldr r1, [r4, 0x18] @@ -476760,18 +476760,18 @@ _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] movs r2, 0x2E ldrsh r0, [r5, r2] cmp r0, 0x11 - bgt _080FAC38 + bgt @080FAC38 adds r0, r1, 0x1 strh r0, [r5, 0x2E] - b _080FAC54 -_080FAC38: + b @080FAC54 +@080FAC38: ldr r4, =0x02038c08 ldr r0, [r4, 0x14] ldr r1, [r4, 0x18] @@ -476784,7 +476784,7 @@ _080FAC38: strh r0, [r5, 0x2E] ldr r0, =sub_80FAC68 + 1 str r0, [r5, 0x1C] -_080FAC54: +@080FAC54: pop {r4,r5} pop {r0} bx r0 @@ -476793,7 +476793,7 @@ _080FAC54: thumb_func_end sub_80FAC24 thumb_func_start sub_80FAC68 -sub_80FAC68: @ 80FAC68 +sub_80FAC68: ; 80FAC68 push {lr} movs r1, 0x34 bl oe_stop @@ -476803,7 +476803,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 @@ -476820,27 +476820,27 @@ sub_80FAC78: @ 80FAC78 adds r1, r0, 0 ldr r0, =0x000002f5 cmp r1, r0 - beq _080FAD6C + beq @080FAD6C cmp r1, r0 - bgt _080FACB4 + bgt @080FACB4 subs r0, 0x17 cmp r1, r0 - beq _080FAD14 + beq @080FAD14 adds r0, 0x16 cmp r1, r0 - beq _080FAD60 - b _080FADCE + beq @080FAD60 + b @080FADCE .align 2, 0 .pool -_080FACB4: +@080FACB4: ldr r0, =0x000002f6 cmp r1, r0 - beq _080FADA4 + beq @080FADA4 adds r0, 0x40 cmp r1, r0 - beq _080FACC2 - b _080FADCE -_080FACC2: + beq @080FACC2 + b @080FADCE +@080FACC2: ldr r0, =0x02021cc4 movs r1, 0x64 movs r2, 0 @@ -476856,16 +476856,16 @@ _080FACC2: bl var_get lsls r0, 16 cmp r0, 0 - beq _080FADCE + beq @080FADCE ldr r4, =0x000040ee adds r0, r4, 0 bl var_get adds r1, r0, 0 movs r0, 0x10 - b _080FAD8A + b @080FAD8A .align 2, 0 .pool -_080FAD14: +@080FAD14: ldr r0, =0x02021cc4 movs r1, 0x32 movs r2, 0 @@ -476881,46 +476881,46 @@ _080FAD14: bl var_get lsls r0, 16 cmp r0, 0 - beq _080FADCE + beq @080FADCE ldr r4, =0x000040ee adds r0, r4, 0 bl var_get adds r1, r0, 0 movs r0, 0x20 - b _080FAD8A + b @080FAD8A .align 2, 0 .pool -_080FAD60: +@080FAD60: ldr r1, =0x020375f0 movs r0, 0x1 - b _080FAD70 + b @080FAD70 .align 2, 0 .pool -_080FAD6C: +@080FAD6C: ldr r1, =0x020375f0 movs r0, 0x2 -_080FAD70: +@080FAD70: strh r0, [r1] ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 - beq _080FADCE + beq @080FADCE ldr r4, =0x000040ee adds r0, r4, 0 bl var_get adds r1, r0, 0 movs r0, 0x80 -_080FAD8A: +@080FAD8A: orrs r1, r0 lsls r1, 16 lsrs r1, 16 adds r0, r4, 0 bl var_set - b _080FADCE + b @080FADCE .align 2, 0 .pool -_080FADA4: +@080FADA4: ldr r1, =0x020375f0 movs r0, 0x3 strh r0, [r1] @@ -476928,7 +476928,7 @@ _080FADA4: bl var_get lsls r0, 16 cmp r0, 0 - beq _080FADCE + beq @080FADCE ldr r4, =0x000040ee adds r0, r4, 0 bl var_get @@ -476939,7 +476939,7 @@ _080FADA4: lsrs r1, 16 adds r0, r4, 0 bl var_set -_080FADCE: +@080FADCE: add sp, 0x4 pop {r4} pop {r0} @@ -476949,7 +476949,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 @@ -476959,33 +476959,33 @@ sub_80FADE4: @ 80FADE4 bl sub_80E9214 lsls r0, 24 cmp r0, 0 - beq _080FAE28 + beq @080FAE28 cmp r5, 0 - bne _080FAE1C + bne @080FAE1C ldr r1, =0xfffffd7b adds r0, r4, r1 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bls _080FAE10 + bls @080FAE10 ldr r0, =0x00000237 cmp r4, r0 - bne _080FAE28 -_080FAE10: + bne @080FAE28 +@080FAE10: movs r0, 0x1 - b _080FAE2A + b @080FAE2A .align 2, 0 .pool -_080FAE1C: +@080FAE1C: ldr r0, =0x0000028d cmp r4, r0 - beq _080FAE10 + beq @080FAE10 ldr r0, =0x0000023f cmp r6, r0 - beq _080FAE10 -_080FAE28: + beq @080FAE10 +@080FAE28: movs r0, 0 -_080FAE2A: +@080FAE2A: pop {r4-r6} pop {r1} bx r1 @@ -476994,7 +476994,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 @@ -477006,44 +477006,44 @@ task50_overworld_posion_effect: @ 80FAE38 movs r3, 0 ldrsh r0, [r1, r3] cmp r0, 0x1 - beq _080FAE76 + beq @080FAE76 cmp r0, 0x1 - bgt _080FAE60 + bgt @080FAE60 cmp r0, 0 - beq _080FAE66 - b _080FAE92 + beq @080FAE66 + b @080FAE92 .align 2, 0 .pool -_080FAE60: +@080FAE60: cmp r0, 0x2 - beq _080FAE8A - b _080FAE92 -_080FAE66: + beq @080FAE8A + b @080FAE92 +@080FAE66: ldrh r0, [r1, 0x2] adds r0, 0x2 strh r0, [r1, 0x2] lsls r0, 16 asrs r0, 16 cmp r0, 0x8 - ble _080FAE92 - b _080FAE82 -_080FAE76: + ble @080FAE92 + b @080FAE82 +@080FAE76: ldrh r0, [r1, 0x2] subs r0, 0x2 strh r0, [r1, 0x2] lsls r0, 16 cmp r0, 0 - bne _080FAE92 -_080FAE82: + bne @080FAE92 +@080FAE82: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _080FAE92 -_080FAE8A: + b @080FAE92 +@080FAE8A: adds r0, r2, 0 bl remove_task - b _080FAEA2 -_080FAE92: + b @080FAEA2 +@080FAE92: ldrh r0, [r1, 0x2] lsls r1, r0, 4 orrs r1, r0 @@ -477051,13 +477051,13 @@ _080FAE92: lsrs r1, 16 movs r0, 0x4C bl lcd_io_set -_080FAEA2: +@080FAEA2: pop {r0} bx r0 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 @@ -477071,7 +477071,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 + 1 bl is_function_an_active_task @@ -477084,7 +477084,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 @@ -477100,7 +477100,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 @@ -477115,13 +477115,13 @@ sub_80FAEF0: @ 80FAEF0 bl npc_is_visible_or_is_x40 lsls r0, 24 cmp r0, 0 - beq _080FAF1C + beq @080FAF1C adds r0, r4, 0 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _080FAF4E -_080FAF1C: + beq @080FAF4E +@080FAF1C: bl player_get_direction__sp1AA lsls r0, 24 lsrs r0, 24 @@ -477142,7 +477142,7 @@ _080FAF1C: adds r0, r1 ldr r1, =sub_80FAF64 + 1 str r1, [r0] -_080FAF4E: +@080FAF4E: pop {r4,r5} pop {r0} bx r0 @@ -477151,7 +477151,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 @@ -477166,7 +477166,7 @@ sub_80FAF64: @ 80FAF64 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _080FAFC8 + beq @080FAFC8 ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -477178,7 +477178,7 @@ sub_80FAF64: @ 80FAF64 lsls r0, 16 asrs r0, 16 cmp r0, 0x9 - bgt _080FAFC4 + bgt @080FAFC4 bl player_get_direction__sp1AA lsls r0, 24 lsrs r0, 24 @@ -477188,13 +477188,13 @@ sub_80FAF64: @ 80FAF64 lsrs r1, 24 adds r0, r5, 0 bl npc_set_state_2 - b _080FAFC8 + b @080FAFC8 .align 2, 0 .pool -_080FAFC4: +@080FAFC4: ldr r0, =sub_80FAFD4 + 1 str r0, [r2] -_080FAFC8: +@080FAFC8: pop {r4,r5} pop {r0} bx r0 @@ -477203,7 +477203,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 @@ -477221,7 +477221,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 + 1 movs r1, 0x50 @@ -477233,7 +477233,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, =0x0858e864 bl gpu_pal_obj_alloc_tag_and_apply @@ -477245,7 +477245,7 @@ sub_80FB00C: @ 80FB00C lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 - beq _080FB06C + beq @080FB06C lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -477271,42 +477271,42 @@ sub_80FB00C: @ 80FB00C adds r0, 0x2 strh r0, [r4, 0x22] adds r0, r5, 0 - b _080FB06E + b @080FB06E .align 2, 0 .pool -_080FB06C: +@080FB06C: movs r0, 0x40 -_080FB06E: +@080FB06E: pop {r4,r5} pop {r1} bx r1 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 movs r6, 0 movs r5, 0x3F -_080FB07E: +@080FB07E: adds r0, r7, 0 adds r0, 0x14 adds r0, r6, r0 ldr r1, [r0] ldr r0, =0x0858e880 cmp r1, r0 - bne _080FB098 + bne @080FB098 adds r0, r4, 0 bl obj_free_pal adds r0, r4, 0 bl obj_delete_and_free_tiles -_080FB098: +@080FB098: adds r4, 0x44 adds r6, 0x44 subs r5, 0x1 cmp r5, 0 - bge _080FB07E + bge @080FB07E pop {r4-r7} pop {r0} bx r0 @@ -477315,52 +477315,52 @@ _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 bl __modsi3 cmp r0, 0 - bne _080FB0C4 + bne @080FB0C4 movs r0, 0x1 negs r0, r0 - b _080FB0D6 -_080FB0C4: + b @080FB0D6 +@080FB0C4: adds r0, r4, 0 movs r1, 0xA bl __modsi3 cmp r0, 0x4 - ble _080FB0D4 + ble @080FB0D4 movs r0, 0 - b _080FB0D6 -_080FB0D4: + b @080FB0D6 +@080FB0D4: movs r0, 0x1 -_080FB0D6: +@080FB0D6: pop {r4} pop {r1} bx r1 thumb_func_end sub_80FB0B0 thumb_func_start sub_80FB0DC -sub_80FB0DC: @ 80FB0DC +sub_80FB0DC: ; 80FB0DC push {lr} adds r0, 0x78 movs r1, 0xB4 bl __modsi3 cmp r0, 0 - beq _080FB0EE + beq @080FB0EE movs r0, 0 - b _080FB0F2 -_080FB0EE: + b @080FB0F2 +@080FB0EE: movs r0, 0x1 negs r0, r0 -_080FB0F2: +@080FB0F2: pop {r1} bx r1 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 @@ -477421,9 +477421,9 @@ sub_80FB0F8: @ 80FB0F8 lsls r0, 16 ldr r1, =0x75300000 cmp r0, r1 - bne _080FB180 + bne @080FB180 strh r4, [r5] -_080FB180: +@080FB180: movs r3, 0 ldrsh r0, [r5, r3] bl sub_80FB0B0 @@ -477441,7 +477441,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 @@ -477460,22 +477460,22 @@ sub_80FB1AC: @ 80FB1AC lsls r1, 16 asrs r1, 16 cmp r1, 0x5 - ble _080FB1DC + ble @080FB1DC movs r0, 0 strh r0, [r7] ldrh r0, [r7, 0x2] adds r0, 0x1 strh r0, [r7, 0x2] -_080FB1DC: +@080FB1DC: ldrh r0, [r7, 0x2] cmp r0, 0x13 - bne _080FB1F0 + bne @080FB1F0 adds r0, r2, 0 bl remove_task - b _080FB2A8 + b @080FB2A8 .align 2, 0 .pool -_080FB1F0: +@080FB1F0: ldr r2, =0x0858e898 movs r1, 0x2 ldrsh r0, [r7, r1] @@ -477484,13 +477484,13 @@ _080FB1F0: lsls r0, 24 asrs r0, 24 cmp r0, 0x2 - bne _080FB20C + bne @080FB20C adds r0, r4, 0 subs r0, 0x8 adds r0, r3, r0 ldr r1, =sub_80FB2C0 + 1 str r1, [r0] -_080FB20C: +@080FB20C: movs r4, 0x2 ldrsh r0, [r7, r4] adds r0, r2 @@ -477561,7 +477561,7 @@ _080FB20C: str r0, [sp] movs r0, 0x3 bl sub_808E82C -_080FB2A8: +@080FB2A8: add sp, 0x4 pop {r4-r7} pop {r0} @@ -477571,7 +477571,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} @@ -477590,22 +477590,22 @@ sub_80FB2C0: @ 80FB2C0 lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - ble _080FB2F0 + ble @080FB2F0 movs r0, 0 strh r0, [r2] ldrh r0, [r2, 0x2] adds r0, 0x1 strh r0, [r2, 0x2] -_080FB2F0: +@080FB2F0: ldrh r0, [r2, 0x2] cmp r0, 0x13 - bne _080FB304 + bne @080FB304 adds r0, r3, 0 bl remove_task - b _080FB358 + b @080FB358 .align 2, 0 .pool -_080FB304: +@080FB304: ldr r1, =0x0858e898 movs r3, 0x2 ldrsh r0, [r2, r3] @@ -477644,7 +477644,7 @@ _080FB304: movs r0, 0x3 adds r3, r4, 0 bl sub_808E82C -_080FB358: +@080FB358: add sp, 0x4 pop {r3} mov r8, r3 @@ -477656,7 +477656,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 @@ -477668,34 +477668,34 @@ sub_80FB36C: @ 80FB36C movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0x5 - bls _080FB386 - b _080FB4D8 -_080FB386: + bls @080FB386 + b @080FB4D8 +@080FB386: lsls r0, 2 - ldr r1, =_080FB398 + ldr r1, =@080FB398 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080FB398: - .4byte _080FB3B0 - .4byte _080FB3E8 - .4byte _080FB404 - .4byte _080FB450 - .4byte _080FB474 - .4byte _080FB492 -_080FB3B0: +@080FB398: + .4byte @080FB3B0 + .4byte @080FB3E8 + .4byte @080FB404 + .4byte @080FB450 + .4byte @080FB474 + .4byte @080FB492 +@080FB3B0: ldrh r0, [r4, 0x2] adds r0, 0x1 strh r0, [r4, 0x2] lsls r0, 16 asrs r0, 16 cmp r0, 0x5A - beq _080FB3C0 - b _080FB4D8 -_080FB3C0: + beq @080FB3C0 + b @080FB4D8 +@080FB3C0: movs r0, 0 bl sub_808A2C0 movs r0, 0 @@ -477710,24 +477710,24 @@ _080FB3C0: strh r0, [r4] movs r0, 0x31 bl audio_play - b _080FB4D8 + b @080FB4D8 .align 2, 0 .pool -_080FB3E8: +@080FB3E8: ldrh r0, [r4, 0x2] adds r0, 0x1 strh r0, [r4, 0x2] lsls r0, 16 asrs r0, 16 cmp r0, 0x96 - bne _080FB4D8 + bne @080FB4D8 bl pal_fill_black movs r0, 0 strh r0, [r4, 0x2] movs r0, 0x2 strh r0, [r4] - b _080FB4D8 -_080FB404: + b @080FB4D8 +@080FB404: ldrh r0, [r4, 0x2] adds r3, r0, 0x1 strh r3, [r4, 0x2] @@ -477738,12 +477738,12 @@ _080FB404: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - bne _080FB4D8 + bne @080FB4D8 lsls r1, r3, 16 movs r0, 0x96 lsls r0, 17 cmp r1, r0 - ble _080FB4D8 + ble @080FB4D8 strh r2, [r4, 0x2] ldrb r0, [r4, 0x4] bl remove_task @@ -477757,10 +477757,10 @@ _080FB404: strh r0, [r4] movs r0, 0x32 bl audio_play - b _080FB4D8 + b @080FB4D8 .align 2, 0 .pool -_080FB450: +@080FB450: ldr r2, =0x03005e00 movs r0, 0x6 ldrsh r1, [r4, r0] @@ -477770,37 +477770,37 @@ _080FB450: adds r0, r2 ldrb r5, [r0, 0x4] cmp r5, 0 - bne _080FB4D8 + bne @080FB4D8 bl sub_808A2E4 strh r5, [r4, 0x2] movs r0, 0x4 strh r0, [r4] - b _080FB4D8 + b @080FB4D8 .align 2, 0 .pool -_080FB474: +@080FB474: ldrh r0, [r4, 0x2] adds r0, 0x1 strh r0, [r4, 0x2] lsls r0, 16 asrs r0, 16 cmp r0, 0x5A - bne _080FB4D8 + bne @080FB4D8 movs r0, 0x33 bl audio_play movs r0, 0 strh r0, [r4, 0x2] movs r0, 0x5 strh r0, [r4] - b _080FB4D8 -_080FB492: + b @080FB4D8 +@080FB492: ldrh r0, [r4, 0x2] adds r0, 0x1 strh r0, [r4, 0x2] lsls r0, 16 asrs r0, 16 cmp r0, 0x78 - bne _080FB4D8 + bne @080FB4D8 movs r2, 0x82 lsls r2, 2 movs r0, 0xB @@ -477822,14 +477822,14 @@ _080FB492: adds r0, r5, 0 bl remove_task bl script_env_2_disable -_080FB4D8: +@080FB4D8: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_80FB36C thumb_func_start sub_80FB4E0 -sub_80FB4E0: @ 80FB4E0 +sub_80FB4E0: ; 80FB4E0 push {lr} sub sp, 0x4 ldr r2, =0x0000020d @@ -477863,7 +477863,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 + 1 @@ -477871,7 +477871,7 @@ sub_80FB540: @ 80FB540 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - bne _080FB58A + bne @080FB58A ldr r4, =0x03005d8c ldr r0, [r4] ldrb r1, [r0, 0x5] @@ -477897,7 +477897,7 @@ sub_80FB540: @ 80FB540 movs r0, 0x3 adds r3, r5, 0 bl sub_808E82C -_080FB58A: +@080FB58A: add sp, 0x4 pop {r4-r6} pop {r0} @@ -477907,7 +477907,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 @@ -477922,7 +477922,7 @@ sub_80FB59C: @ 80FB59C bl sub_8137FFC lsls r0, 24 cmp r0, 0 - bne _080FB5DE + bne @080FB5DE add r0, sp, 0x4 ldrb r0, [r0] lsls r0, 24 @@ -477938,10 +477938,10 @@ sub_80FB59C: @ 80FB59C str r4, [sp] bl warp1_set movs r0, 0x1 - b _080FB5E0 -_080FB5DE: + b @080FB5E0 +@080FB5DE: movs r0, 0 -_080FB5E0: +@080FB5E0: add sp, 0xC pop {r4-r6} pop {r1} @@ -477949,7 +477949,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 @@ -477967,100 +477967,100 @@ sub_80FB5E8: @ 80FB5E8 movs r0, 0 ldrsh r2, [r4, r0] cmp r2, 0x1 - beq _080FB648 + beq @080FB648 cmp r2, 0x1 - bgt _080FB624 + bgt @080FB624 cmp r2, 0 - beq _080FB62E - b _080FB6E2 + beq @080FB62E + b @080FB6E2 .align 2, 0 .pool -_080FB624: +@080FB624: cmp r2, 0x2 - beq _080FB68A + beq @080FB68A cmp r2, 0x3 - beq _080FB6C4 - b _080FB6E2 -_080FB62E: + beq @080FB6C4 + b @080FB6E2 +@080FB62E: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080FB6E2 + bne @080FB6E2 strh r2, [r4, 0x2] movs r0, 0x2 strh r0, [r4] - b _080FB6E2 + b @080FB6E2 .align 2, 0 .pool -_080FB648: +@080FB648: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] adds r0, r2, 0 ands r0, r1 cmp r0, 0 - beq _080FB656 + beq @080FB656 strh r2, [r4, 0x2] -_080FB656: +@080FB656: ldrb r1, [r6, 0x1] ldrb r2, [r3, 0x4] movs r0, 0xFF bl sub_80D3340 lsls r0, 24 cmp r0, 0 - beq _080FB6E2 + beq @080FB6E2 movs r0, 0x1 bl sub_8137FC0 cmp r0, 0x1 - bne _080FB686 + bne @080FB686 ldrh r0, [r7] cmp r0, 0x2 - bne _080FB680 + bne @080FB680 movs r0, 0x9 - b _080FB682 + b @080FB682 .align 2, 0 .pool -_080FB680: +@080FB680: movs r0, 0xA -_080FB682: +@080FB682: strh r0, [r7] - b _080FB692 -_080FB686: + b @080FB692 +@080FB686: movs r0, 0x2 strh r0, [r4] -_080FB68A: +@080FB68A: movs r1, 0x2 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080FB698 -_080FB692: + beq @080FB698 +@080FB692: movs r0, 0x3 strh r0, [r4] - b _080FB6E2 -_080FB698: + b @080FB6E2 +@080FB698: ldrh r0, [r7] cmp r0, 0x2 - bne _080FB6AC + bne @080FB6AC ldrb r1, [r6, 0x1] ldrb r2, [r6] ldr r3, =0x0858e8ab - b _080FB6B2 + b @080FB6B2 .align 2, 0 .pool -_080FB6AC: +@080FB6AC: ldrb r1, [r6, 0x1] ldrb r2, [r6] ldr r3, =0x0858e8ad -_080FB6B2: +@080FB6B2: movs r0, 0xFF bl exec_movement movs r0, 0x1 strh r0, [r4] - b _080FB6E2 + b @080FB6E2 .align 2, 0 .pool -_080FB6C4: +@080FB6C4: ldr r0, =0x00004001 bl flag_clear movs r0, 0x80 @@ -478071,7 +478071,7 @@ _080FB6C4: bl sp13E_warp_to_last_warp adds r0, r5, 0 bl remove_task -_080FB6E2: +@080FB6E2: pop {r4-r7} pop {r0} bx r0 @@ -478080,7 +478080,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, =nullsub_12 + 1 @@ -478109,7 +478109,7 @@ sub_80FB6EC: @ 80FB6EC lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - bne _080FB74C + bne @080FB74C movs r0, 0x4 bl npc_direction_to_obj_anim_image_number adds r1, r0, 0 @@ -478117,10 +478117,10 @@ sub_80FB6EC: @ 80FB6EC lsrs r1, 24 adds r0, r4, 0 bl obj_anim_image_start - b _080FB75E + b @080FB75E .align 2, 0 .pool -_080FB74C: +@080FB74C: movs r0, 0x3 bl npc_direction_to_obj_anim_image_number adds r1, r0, 0 @@ -478128,7 +478128,7 @@ _080FB74C: lsrs r1, 24 adds r0, r4, 0 bl obj_anim_image_start -_080FB75E: +@080FB75E: add sp, 0x4 pop {r4} pop {r0} @@ -478136,7 +478136,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 @@ -478162,7 +478162,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 flag_set @@ -478190,7 +478190,7 @@ sub_80FB7A4: @ 80FB7A4 thumb_func_end sub_80FB7A4 thumb_func_start sub_80FB7E8 -sub_80FB7E8: @ 80FB7E8 +sub_80FB7E8: ; 80FB7E8 push {lr} ldr r0, =0x03005d8c ldr r0, [r0] @@ -478198,28 +478198,28 @@ sub_80FB7E8: @ 80FB7E8 movs r0, 0x86 lsls r0, 1 cmp r1, r0 - bne _080FB800 + bne @080FB800 movs r0, 0x1 - b _080FB812 + b @080FB812 .align 2, 0 .pool -_080FB800: +@080FB800: ldr r0, =0x0000081d cmp r1, r0 - beq _080FB810 + beq @080FB810 movs r0, 0 - b _080FB812 + b @080FB812 .align 2, 0 .pool -_080FB810: +@080FB810: movs r0, 0x2 -_080FB812: +@080FB812: pop {r1} bx r1 thumb_func_end sub_80FB7E8 thumb_func_start sub_80FB818 -sub_80FB818: @ 80FB818 +sub_80FB818: ; 80FB818 push {r4-r6,lr} movs r0, 0x80 lsls r0, 7 @@ -478229,9 +478229,9 @@ sub_80FB818: @ 80FB818 ldr r4, =0x0203a048 ldrb r0, [r4] cmp r3, r0 - bge _080FB844 + bge @080FB844 ldr r6, =0x0203a044 -_080FB830: +@080FB830: adds r2, r5, r3 ldr r1, [r6] lsls r0, r3, 3 @@ -478241,8 +478241,8 @@ _080FB830: adds r3, 0x1 ldrb r0, [r4] cmp r3, r0 - blt _080FB830 -_080FB844: + blt @080FB830 +@080FB844: pop {r4-r6} pop {r0} bx r0 @@ -478251,7 +478251,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 @@ -478267,7 +478267,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 @@ -478286,7 +478286,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 @@ -478296,24 +478296,24 @@ sub_80FB890: @ 80FB890 lsls r0, 24 lsrs r1, r0, 24 cmp r4, 0x1 - bne _080FB8B4 + bne @080FB8B4 cmp r1, 0 - beq _080FB8B0 + beq @080FB8B0 subs r0, r1, 0x1 lsls r0, 24 - b _080FB8BE -_080FB8B0: + b @080FB8BE +@080FB8B0: movs r1, 0x3 - b _080FB8C0 -_080FB8B4: + b @080FB8C0 +@080FB8B4: adds r1, 0x1 lsls r1, 24 movs r0, 0xC0 lsls r0, 18 ands r0, r1 -_080FB8BE: +@080FB8BE: lsrs r1, r0, 24 -_080FB8C0: +@080FB8C0: adds r0, r5, 0 bl sub_80FB870 pop {r4,r5} @@ -478322,43 +478322,43 @@ _080FB8C0: thumb_func_end sub_80FB890 thumb_func_start sub_80FB8CC -sub_80FB8CC: @ 80FB8CC +sub_80FB8CC: ; 80FB8CC push {lr} bl sub_80FB7E8 cmp r0, 0x1 - beq _080FB8E0 + beq @080FB8E0 cmp r0, 0x1 - ble _080FB914 + ble @080FB914 cmp r0, 0x2 - beq _080FB8F8 - b _080FB914 -_080FB8E0: + beq @080FB8F8 + b @080FB914 +@080FB8E0: ldr r1, =0x0203a044 ldr r0, =0x0858e8b0 str r0, [r1] ldr r1, =0x0203a048 movs r0, 0x8 - b _080FB902 + b @080FB902 .align 2, 0 .pool -_080FB8F8: +@080FB8F8: ldr r1, =0x0203a044 ldr r0, =0x0858e8f0 str r0, [r1] ldr r1, =0x0203a048 movs r0, 0xB -_080FB902: +@080FB902: strb r0, [r1] movs r1, 0 ldr r3, =0x0203a038 movs r2, 0x40 -_080FB90A: +@080FB90A: adds r0, r1, r3 strb r2, [r0] adds r1, 0x1 cmp r1, 0xA - bls _080FB90A -_080FB914: + bls @080FB90A +@080FB914: pop {r0} bx r0 .align 2, 0 @@ -478366,7 +478366,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 @@ -478401,12 +478401,12 @@ sub_80FB928: @ 80FB928 ldr r0, =0x0203a048 ldrb r0, [r0] cmp r5, r0 - bcs _080FB9DA + bcs @080FB9DA lsls r0, r2, 16 asrs r7, r0, 16 lsls r0, r3, 16 asrs r6, r0, 16 -_080FB976: +@080FB976: ldr r0, =0x0203a044 ldr r0, [r0] lsls r1, r5, 3 @@ -478420,26 +478420,26 @@ _080FB976: lsls r0, 16 asrs r1, r0, 16 cmp r7, r1 - bgt _080FB9CC + bgt @080FB9CC mov r3, r8 lsls r0, r3, 16 asrs r0, 16 cmp r0, r1 - blt _080FB9CC + blt @080FB9CC lsls r0, r2, 16 asrs r1, r0, 16 cmp r6, r1 - bgt _080FB9CC + bgt @080FB9CC mov r2, r9 lsls r0, r2, 16 asrs r0, 16 cmp r0, r1 - blt _080FB9CC + blt @080FB9CC ldr r0, =0x0203a038 adds r4, r5, r0 ldrb r0, [r4] cmp r0, 0x40 - bne _080FB9CC + bne @080FB9CC ldr r3, [sp] lsls r1, r3, 16 mov r0, r10 @@ -478449,15 +478449,15 @@ _080FB976: asrs r2, 16 bl sub_80FB9FC strb r0, [r4] -_080FB9CC: +@080FB9CC: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 ldr r0, =0x0203a048 ldrb r0, [r0] cmp r5, r0 - bcc _080FB976 -_080FB9DA: + bcc @080FB976 +@080FB9DA: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -478471,7 +478471,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} @@ -478489,19 +478489,19 @@ sub_80FB9FC: @ 80FB9FC adds r4, r0, r1 ldrb r0, [r4, 0x4] cmp r0, 0 - beq _080FBA24 + beq @080FBA24 cmp r0, 0x4 - bne _080FBA34 -_080FBA24: + bne @080FBA34 +@080FBA24: mov r1, sp ldr r0, =0x08591fe0 - b _080FBA38 + b @080FBA38 .align 2, 0 .pool -_080FBA34: +@080FBA34: mov r1, sp ldr r0, =0x08591fc8 -_080FBA38: +@080FBA38: ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} ldm r0!, {r2,r3,r5} @@ -478521,7 +478521,7 @@ _080FBA38: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 - beq _080FBAD4 + beq @080FBAD4 ldrh r0, [r4] adds r0, 0x7 ldrh r1, [r4, 0x2] @@ -478570,12 +478570,12 @@ _080FBA38: adds r0, r4, 0 bl sub_8008258 adds r0, r5, 0 - b _080FBAD6 + b @080FBAD6 .align 2, 0 .pool -_080FBAD4: +@080FBAD4: movs r0, 0x40 -_080FBAD6: +@080FBAD6: add sp, 0x18 pop {r3} mov r8, r3 @@ -478585,7 +478585,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] @@ -478598,7 +478598,7 @@ sub_80FBAE4: @ 80FBAE4 adds r0, r6, 0 bl sub_80FBB64 cmp r5, 0x1 - bne _080FBB2A + bne @080FBB2A adds r0, r4, 0x4 lsls r0, 24 lsrs r4, r0, 24 @@ -478606,21 +478606,21 @@ sub_80FBAE4: @ 80FBAE4 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - beq _080FBB1A + beq @080FBB1A adds r0, r4, 0 adds r0, 0x8 lsls r0, 24 lsrs r4, r0, 24 -_080FBB1A: +@080FBB1A: movs r0, 0x30 bl audio_play adds r0, r6, 0 adds r1, r4, 0 bl sub_8008258 - b _080FBB58 -_080FBB2A: + b @080FBB58 +@080FBB2A: cmp r5, 0x2 - bne _080FBB58 + bne @080FBB58 adds r0, r7, 0 adds r0, 0x8 lsls r0, 24 @@ -478629,18 +478629,18 @@ _080FBB2A: lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - beq _080FBB4A + beq @080FBB4A adds r0, r4, 0 adds r0, 0x8 lsls r0, 24 lsrs r4, r0, 24 -_080FBB4A: +@080FBB4A: movs r0, 0x30 bl audio_play adds r0, r6, 0 adds r1, r4, 0 bl sub_8008258 -_080FBB58: +@080FBB58: movs r0, 0 strh r0, [r6, 0x30] pop {r4-r7} @@ -478649,7 +478649,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 @@ -478694,37 +478694,37 @@ sub_80FBB64: @ 80FBB64 lsrs r3, r0, 16 asrs r2, 16 cmp r2, 0xFF - bgt _080FBBCA + bgt @080FBBCA lsls r0, r1, 16 asrs r0, 16 movs r1, 0x10 negs r1, r1 cmp r0, r1 - bge _080FBBD2 -_080FBBCA: + bge @080FBBD2 +@080FBBCA: movs r1, 0x4 adds r0, r5, 0 orrs r0, r1 strb r0, [r4] -_080FBBD2: +@080FBBD2: lsls r0, r6, 16 asrs r0, 16 cmp r0, 0xAF - bgt _080FBBE6 + bgt @080FBBE6 lsls r0, r3, 16 asrs r0, 16 movs r1, 0x10 negs r1, r1 cmp r0, r1 - bge _080FBBF2 -_080FBBE6: + bge @080FBBF2 +@080FBBE6: mov r0, r12 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_080FBBF2: +@080FBBF2: pop {r4-r6} pop {r0} bx r0 @@ -478733,8 +478733,8 @@ _080FBBF2: thumb_func_end sub_80FBB64 thumb_func_start overworld_free_bgmaps -@ void overworld_free_bgmaps() -overworld_free_bgmaps: @ 80FBC00 +; void overworld_free_bgmaps() +overworld_free_bgmaps: ; 80FBC00 push {lr} ldr r0, =0x08591d58 bl gpu_tile_obj_alloc_and_load_multiple @@ -478745,7 +478745,7 @@ overworld_free_bgmaps: @ 80FBC00 thumb_func_end overworld_free_bgmaps thumb_func_start sub_80FBC10 -sub_80FBC10: @ 80FBC10 +sub_80FBC10: ; 80FBC10 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -478771,10 +478771,10 @@ sub_80FBC10: @ 80FBC10 lsls r1, 16 lsrs r7, r1, 16 movs r6, 0 - b _080FBCB6 + b @080FBCB6 .align 2, 0 .pool -_080FBC48: +@080FBC48: ldr r0, =0x0203a044 ldr r0, [r0] lsls r1, r6, 3 @@ -478791,29 +478791,29 @@ _080FBC48: adds r0, r6, r0 ldrb r0, [r0] cmp r0, 0x40 - beq _080FBCB4 + beq @080FBCB4 lsls r0, r2, 16 mov r2, r10 lsls r1, r2, 16 asrs r2, r0, 16 cmp r0, r1 - blt _080FBC94 + blt @080FBC94 mov r1, r9 lsls r0, r1, 16 asrs r0, 16 cmp r2, r0 - bgt _080FBC94 + bgt @080FBC94 lsls r0, r3, 16 mov r2, r8 lsls r1, r2, 16 asrs r2, r0, 16 cmp r0, r1 - blt _080FBC94 + blt @080FBC94 lsls r0, r7, 16 asrs r0, 16 cmp r2, r0 - ble _080FBCB4 -_080FBC94: + ble @080FBCB4 +@080FBC94: ldr r0, =0x0203a038 adds r5, r6, r0 ldrb r0, [r5] @@ -478828,13 +478828,13 @@ _080FBC94: bl obj_delete_and_free_tiles movs r0, 0x40 strb r0, [r5] -_080FBCB4: +@080FBCB4: adds r6, 0x1 -_080FBCB6: +@080FBCB6: ldr r0, =0x0203a048 ldrb r0, [r0] cmp r6, r0 - blt _080FBC48 + blt @080FBC48 pop {r3-r5} mov r8, r3 mov r9, r4 @@ -478847,7 +478847,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 @@ -478857,22 +478857,22 @@ sub_80FBCDC: @ 80FBCDC lsls r0, 24 lsrs r4, r0, 24 cmp r1, 0x1 - bne _080FBCFC + bne @080FBCFC ldr r0, =0x08592058 mov r10, r0 - b _080FBD08 + b @080FBD08 .align 2, 0 .pool -_080FBCFC: +@080FBCFC: cmp r1, 0x2 - beq _080FBD04 -_080FBD00: + beq @080FBD04 +@080FBD00: movs r0, 0 - b _080FBD98 -_080FBD04: + b @080FBD98 +@080FBD04: ldr r1, =0x08592038 mov r10, r1 -_080FBD08: +@080FBD08: adds r0, r4, 0 bl sub_80FB854 lsls r0, 24 @@ -478896,7 +478896,7 @@ _080FBD08: lsls r0, 16 asrs r0, 16 mov r8, r0 -_080FBD38: +@080FBD38: movs r6, 0 ldr r2, [sp] adds r7, r2, r3 @@ -478906,12 +478906,12 @@ _080FBD38: adds r0, r1 ldr r2, =0x08592078 adds r4, r0, r2 -_080FBD4A: +@080FBD4A: adds r0, r5, 0 cmp r5, 0 - bge _080FBD52 + bge @080FBD52 adds r0, r7, 0x3 -_080FBD52: +@080FBD52: asrs r0, 2 lsls r0, 2 subs r0, r5, r0 @@ -478921,7 +478921,7 @@ _080FBD52: lsrs r1, r0, 24 ldrb r0, [r4] cmp r0, 0 - beq _080FBD88 + beq @080FBD88 lsls r1, 2 add r1, r10 movs r0, 0 @@ -478937,17 +478937,17 @@ _080FBD52: lsrs r0, 24 ldr r3, [sp, 0x8] cmp r0, 0x1 - beq _080FBD00 -_080FBD88: + beq @080FBD00 +@080FBD88: adds r4, 0x1 adds r6, 0x1 cmp r6, 0x1 - ble _080FBD4A + ble @080FBD4A adds r3, 0x1 cmp r3, 0x3 - ble _080FBD38 + ble @080FBD38 movs r0, 0x1 -_080FBD98: +@080FBD98: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -478961,7 +478961,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 @@ -478978,9 +478978,9 @@ sub_80FBDB4: @ 80FBDB4 adds r1, r4, 0x4 adds r0, r1, 0 cmp r1, 0 - bge _080FBDDA + bge @080FBDDA adds r0, r4, 0x7 -_080FBDDA: +@080FBDDA: asrs r0, 2 lsls r0, 2 subs r0, r1, r0 @@ -479005,7 +479005,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 @@ -479013,7 +479013,7 @@ sub_80FBE08: @ 80FBE08 adds r2, r3, r0 ldrb r0, [r2] cmp r0, 0x40 - beq _080FBE2C + beq @080FBE2C lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -479023,7 +479023,7 @@ sub_80FBE08: @ 80FBE08 adds r0, r3, 0 bl sub_80FB854 strh r0, [r4, 0x32] -_080FBE2C: +@080FBE2C: pop {r4} pop {r0} bx r0 @@ -479032,7 +479032,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 @@ -479042,33 +479042,33 @@ sub_80FBE3C: @ 80FBE3C lsls r2, 16 lsrs r2, 16 cmp r0, 0x2 - bne _080FBE58 + bne @080FBE58 ldr r3, =0x08591ff8 - b _080FBE7A + b @080FBE7A .align 2, 0 .pool -_080FBE58: +@080FBE58: cmp r0, 0x1 - bne _080FBE64 + bne @080FBE64 ldr r3, =0x08592008 - b _080FBE7A + b @080FBE7A .align 2, 0 .pool -_080FBE64: +@080FBE64: cmp r0, 0x3 - bne _080FBE70 + bne @080FBE70 ldr r3, =0x08592018 - b _080FBE7A + b @080FBE7A .align 2, 0 .pool -_080FBE70: +@080FBE70: cmp r3, 0x4 - beq _080FBE78 + beq @080FBE78 movs r0, 0xFF - b _080FBE88 -_080FBE78: + b @080FBE88 +@080FBE78: ldr r3, =0x08592028 -_080FBE7A: +@080FBE7A: lsls r0, r2, 16 lsls r1, 16 asrs r1, 16 @@ -479076,7 +479076,7 @@ _080FBE7A: adds r0, r1 adds r0, r3, r0 ldrb r0, [r0] -_080FBE88: +@080FBE88: pop {r1} bx r1 .align 2, 0 @@ -479084,20 +479084,20 @@ _080FBE88: thumb_func_end sub_80FBE3C thumb_func_start sub_80FBE90 -sub_80FBE90: @ 80FBE90 +sub_80FBE90: ; 80FBE90 push {lr} bl sub_80FB7E8 cmp r0, 0 - beq _080FBEA2 + beq @080FBEA2 bl sub_80FB8CC bl sub_80FB818 -_080FBEA2: +@080FBEA2: pop {r0} bx r0 thumb_func_end sub_80FBE90 thumb_func_start sub_80FBEA8 -sub_80FBEA8: @ 80FBEA8 +sub_80FBEA8: ; 80FBEA8 push {r4,r5,lr} lsls r0, 16 lsrs r4, r0, 16 @@ -479105,37 +479105,37 @@ sub_80FBEA8: @ 80FBEA8 lsrs r5, r1, 16 bl sub_80FB7E8 cmp r0, 0 - beq _080FBECA + beq @080FBECA lsls r0, r4, 16 asrs r0, 16 lsls r1, r5, 16 asrs r1, 16 bl sub_80FB928 bl sub_80FBC10 -_080FBECA: +@080FBECA: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_80FBEA8 thumb_func_start sub_80FBED0 -sub_80FBED0: @ 80FBED0 +sub_80FBED0: ; 80FBED0 push {lr} bl sub_80FB7E8 cmp r0, 0 - beq _080FBEEA + beq @080FBEEA bl overworld_free_bgmaps bl sub_80FB8CC movs r0, 0 movs r1, 0 bl sub_80FB928 -_080FBEEA: +@080FBEEA: pop {r0} bx r0 thumb_func_end sub_80FBED0 thumb_func_start sub_80FBEF0 -sub_80FBEF0: @ 80FBEF0 +sub_80FBEF0: ; 80FBEF0 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -479150,25 +479150,25 @@ sub_80FBEF0: @ 80FBEF0 mov r8, r2 bl sub_80FB7E8 cmp r0, 0 - bne _080FBF24 - b _080FBFC2 -_080FBF12: + bne @080FBF24 + b @080FBFC2 +@080FBF12: adds r0, r4, 0 adds r1, r5, 0 bl sub_80FBE08 adds r0, r4, 0 adds r1, r5, 0 bl sub_80FB890 - b _080FBFC2 -_080FBF24: + b @080FBFC2 +@080FBF24: movs r6, 0 ldr r0, =0x0203a048 ldrb r0, [r0] cmp r6, r0 - bge _080FBFC2 + bge @080FBFC2 lsls r0, r4, 16 asrs r7, r0, 16 -_080FBF32: +@080FBF32: ldr r0, =0x0203a044 ldr r1, [r0] lsls r0, r6, 3 @@ -479183,10 +479183,10 @@ _080FBF32: asrs r4, r1, 16 subs r0, r4, 0x2 cmp r0, r7 - bgt _080FBFB8 + bgt @080FBFB8 adds r0, r4, 0x1 cmp r7, r0 - bgt _080FBFB8 + bgt @080FBFB8 lsls r0, r2, 16 asrs r3, r0, 16 subs r1, r3, 0x2 @@ -479194,10 +479194,10 @@ _080FBF32: lsls r0, r2, 16 asrs r2, r0, 16 cmp r1, r2 - bgt _080FBFB8 + bgt @080FBFB8 adds r0, r3, 0x1 cmp r2, r0 - bgt _080FBFB8 + bgt @080FBFB8 subs r1, r7, r4 adds r1, 0x2 subs r2, r3 @@ -479211,7 +479211,7 @@ _080FBF32: lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _080FBFB8 + beq @080FBFB8 lsrs r5, r0, 4 movs r1, 0xF ands r1, r0 @@ -479220,25 +479220,25 @@ _080FBF32: adds r0, r4, 0 bl sub_80FBDB4 cmp r0, 0 - beq _080FBFB8 + beq @080FBFB8 adds r0, r4, 0 adds r1, r5, 0 bl sub_80FBCDC cmp r0, 0 - bne _080FBF12 + bne @080FBF12 movs r0, 0x1 - b _080FBFC4 + b @080FBFC4 .align 2, 0 .pool -_080FBFB8: +@080FBFB8: adds r6, 0x1 ldr r0, =0x0203a048 ldrb r0, [r0] cmp r6, r0 - blt _080FBF32 -_080FBFC2: + blt @080FBF32 +@080FBFC2: movs r0, 0 -_080FBFC4: +@080FBFC4: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -479250,7 +479250,7 @@ _080FBFC4: thumb_func_end sub_80FBEF0 thumb_func_start sub_80FBFD4 -sub_80FBFD4: @ 80FBFD4 +sub_80FBFD4: ; 80FBFD4 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -479265,20 +479265,20 @@ sub_80FBFD4: @ 80FBFD4 mov r8, r2 bl sub_80FB7E8 cmp r0, 0 - bne _080FBFFA - b _080FC08A -_080FBFF6: + bne @080FBFFA + b @080FC08A +@080FBFF6: movs r0, 0x1 - b _080FC08C -_080FBFFA: + b @080FC08C +@080FBFFA: movs r6, 0 ldr r0, =0x0203a048 ldrb r0, [r0] cmp r6, r0 - bge _080FC08A + bge @080FC08A lsls r0, r4, 16 asrs r7, r0, 16 -_080FC008: +@080FC008: ldr r0, =0x0203a044 ldr r1, [r0] lsls r0, r6, 3 @@ -479293,10 +479293,10 @@ _080FC008: asrs r4, r1, 16 subs r0, r4, 0x2 cmp r0, r7 - bgt _080FC080 + bgt @080FC080 adds r0, r4, 0x1 cmp r7, r0 - bgt _080FC080 + bgt @080FC080 lsls r0, r2, 16 asrs r3, r0, 16 subs r1, r3, 0x2 @@ -479304,10 +479304,10 @@ _080FC008: lsls r0, r2, 16 asrs r2, r0, 16 cmp r1, r2 - bgt _080FC080 + bgt @080FC080 adds r0, r3, 0x1 cmp r2, r0 - bgt _080FC080 + bgt @080FC080 subs r1, r7, r4 adds r1, 0x2 subs r2, r3 @@ -479321,7 +479321,7 @@ _080FC008: lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _080FC080 + beq @080FC080 lsrs r5, r0, 4 movs r1, 0xF ands r1, r0 @@ -479330,21 +479330,21 @@ _080FC008: adds r0, r4, 0 bl sub_80FBDB4 cmp r0, 0 - beq _080FC080 + beq @080FC080 adds r0, r4, 0 adds r1, r5, 0 bl sub_80FBCDC cmp r0, 0 - beq _080FBFF6 -_080FC080: + beq @080FBFF6 +@080FC080: adds r6, 0x1 ldr r0, =0x0203a048 ldrb r0, [r0] cmp r6, r0 - blt _080FC008 -_080FC08A: + blt @080FC008 +@080FC08A: movs r0, 0 -_080FC08C: +@080FC08C: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -479356,7 +479356,7 @@ _080FC08C: thumb_func_end sub_80FBFD4 thumb_func_start flag_check_is_in_safari_zone -flag_check_is_in_safari_zone: @ 80FC0A0 +flag_check_is_in_safari_zone: ; 80FC0A0 push {lr} ldr r0, =0x0000088c bl flag_check @@ -479369,7 +479369,7 @@ flag_check_is_in_safari_zone: @ 80FC0A0 thumb_func_end flag_check_is_in_safari_zone thumb_func_start sub_80FC0B4 -sub_80FC0B4: @ 80FC0B4 +sub_80FC0B4: ; 80FC0B4 push {lr} ldr r0, =0x0000088c bl flag_set @@ -479380,7 +479380,7 @@ sub_80FC0B4: @ 80FC0B4 thumb_func_end sub_80FC0B4 thumb_func_start flag_clear_is_in_safari_zone -flag_clear_is_in_safari_zone: @ 80FC0C4 +flag_clear_is_in_safari_zone: ; 80FC0C4 push {lr} ldr r0, =0x0000088c bl flag_clear @@ -479391,7 +479391,7 @@ flag_clear_is_in_safari_zone: @ 80FC0C4 thumb_func_end flag_clear_is_in_safari_zone thumb_func_start sub_80FC0D4 -sub_80FC0D4: @ 80FC0D4 +sub_80FC0D4: ; 80FC0D4 push {lr} movs r0, 0x11 bl sav12_xor_increment @@ -479417,7 +479417,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] @@ -479439,11 +479439,11 @@ sub_80FC114: @ 80FC114 thumb_func_end sub_80FC114 thumb_func_start safari_step -safari_step: @ 80FC14C +safari_step: ; 80FC14C push {lr} bl flag_check_is_in_safari_zone cmp r0, 0 - beq _080FC168 + beq @080FC168 bl sub_80FC480 ldr r1, =0x0203a04e ldrh r0, [r1] @@ -479451,17 +479451,17 @@ safari_step: @ 80FC14C strh r0, [r1] lsls r0, 16 cmp r0, 0 - beq _080FC170 -_080FC168: + beq @080FC170 +@080FC168: movs r0, 0 - b _080FC178 + b @080FC178 .align 2, 0 .pool -_080FC170: +@080FC170: ldr r0, =0x082a4b8a bl script_env_1_execute_new_script movs r0, 0x1 -_080FC178: +@080FC178: pop {r1} bx r1 .align 2, 0 @@ -479469,7 +479469,7 @@ _080FC178: thumb_func_end safari_step thumb_func_start sub_80FC180 -sub_80FC180: @ 80FC180 +sub_80FC180: ; 80FC180 push {lr} ldr r0, =0x082a4b6f bl script_env_1_execute_new_script @@ -479480,7 +479480,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 @@ -479491,25 +479491,25 @@ sub_80FC190: @ 80FC190 ldr r2, =0x0202433a ldrb r0, [r2] cmp r0, 0x7 - bne _080FC1AE + bne @080FC1AE ldr r1, =0x0203a050 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_080FC1AE: +@080FC1AE: ldr r0, =0x0203a04c ldrb r0, [r0] cmp r0, 0 - beq _080FC1D8 + beq @080FC1D8 ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 - b _080FC21C + b @080FC21C .align 2, 0 .pool -_080FC1D8: +@080FC1D8: ldrb r0, [r2] cmp r0, 0x8 - bne _080FC208 + bne @080FC208 ldr r0, =0x082a4b4c bl script_env_2_execute_new_script bl warp_in @@ -479518,18 +479518,18 @@ _080FC1D8: str r0, [r1] ldr r0, =c2_load_new_map + 1 bl set_callback2 - b _080FC21C + b @080FC21C .align 2, 0 .pool -_080FC208: +@080FC208: cmp r0, 0x7 - bne _080FC21C + bne @080FC21C ldr r0, =0x082a4b9b bl script_env_1_execute_new_script bl script_env_2_set_ctx_paused ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 -_080FC21C: +@080FC21C: pop {r0} bx r0 .align 2, 0 @@ -479537,7 +479537,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 @@ -479553,7 +479553,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 @@ -479566,7 +479566,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 @@ -479575,7 +479575,7 @@ sub_80FC258: @ 80FC258 adds r1, r4, 0 bl player_get_pos_to_plus_one_step_in_direction_player_is_facing movs r5, 0 -_080FC26A: +@080FC26A: ldr r0, =0x03005d8c ldr r2, [r0] ldr r1, =0x0203a054 @@ -479586,20 +479586,20 @@ _080FC26A: movs r0, 0x4 ldrsb r0, [r3, r0] cmp r1, r0 - bne _080FC2C4 + bne @080FC2C4 mov r0, sp movs r2, 0 ldrsh r1, [r3, r2] movs r2, 0 ldrsh r0, [r0, r2] cmp r1, r0 - bne _080FC2C4 + bne @080FC2C4 movs r0, 0x2 ldrsh r1, [r3, r0] movs r2, 0 ldrsh r0, [r4, r2] cmp r1, r0 - bne _080FC2C4 + bne @080FC2C4 ldr r0, =0x020375f0 strh r5, [r0] ldr r1, =0x085b262c @@ -479609,20 +479609,20 @@ _080FC26A: ldr r1, [r0] ldr r0, =0x02021cc4 bl gf_strcpy - b _080FC2D6 + b @080FC2D6 .align 2, 0 .pool -_080FC2C4: +@080FC2C4: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x9 - bls _080FC26A + bls @080FC26A ldr r1, =0x020375f0 ldr r2, =0x0000ffff adds r0, r2, 0 strh r0, [r1] -_080FC2D6: +@080FC2D6: add sp, 0x4 pop {r4,r5} pop {r0} @@ -479632,7 +479632,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 @@ -479647,7 +479647,7 @@ sub_80FC2E8: @ 80FC2E8 mov r4, sp ldr r0, =0x0203a054 mov r12, r0 -_080FC306: +@080FC306: lsls r0, r5, 4 mov r1, r12 adds r3, r0, r1 @@ -479656,7 +479656,7 @@ _080FC306: movs r0, 0x4 ldrsb r0, [r3, r0] cmp r1, r0 - bne _080FC364 + bne @080FC364 ldrh r0, [r4] ldrh r1, [r3] subs r0, r1 @@ -479669,40 +479669,40 @@ _080FC306: movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0 - bge _080FC336 + bge @080FC336 negs r0, r0 strh r0, [r4] -_080FC336: +@080FC336: movs r1, 0 ldrsh r0, [r2, r1] cmp r0, 0 - bge _080FC342 + bge @080FC342 negs r0, r0 strh r0, [r2] -_080FC342: +@080FC342: movs r2, 0 ldrsh r0, [r4, r2] movs r2, 0 ldrsh r1, [r6, r2] adds r0, r1 cmp r0, 0x5 - bgt _080FC364 + bgt @080FC364 ldr r0, =0x020375f0 strh r5, [r0] - b _080FC376 + b @080FC376 .align 2, 0 .pool -_080FC364: +@080FC364: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x9 - bls _080FC306 + bls @080FC306 ldr r1, =0x020375f0 ldr r2, =0x0000ffff adds r0, r2, 0 strh r0, [r1] -_080FC376: +@080FC376: add sp, 0x4 pop {r4-r7} pop {r0} @@ -479712,53 +479712,53 @@ _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 ldrh r1, [r2] ldr r0, =0x0000ffff cmp r1, r0 - beq _080FC3B0 + beq @080FC3B0 adds r0, r1, 0 lsls r0, 4 ldr r1, =0x0203a05c adds r0, r1 - b _080FC3B2 + b @080FC3B2 .align 2, 0 .pool -_080FC3B0: +@080FC3B0: movs r0, 0 -_080FC3B2: +@080FC3B2: pop {r1} bx r1 thumb_func_end sub_80FC388 thumb_func_start sub_80FC3B8 -sub_80FC3B8: @ 80FC3B8 +sub_80FC3B8: ; 80FC3B8 push {lr} bl sub_80FC2E8 ldr r2, =0x020375f0 ldrh r1, [r2] ldr r0, =0x0000ffff cmp r1, r0 - beq _080FC3E0 + beq @080FC3E0 adds r0, r1, 0 lsls r0, 4 ldr r1, =0x0203a05c adds r0, r1 - b _080FC3E2 + b @080FC3E2 .align 2, 0 .pool -_080FC3E0: +@080FC3E0: movs r0, 0 -_080FC3E2: +@080FC3E2: pop {r1} bx r1 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 @@ -479775,21 +479775,21 @@ sub_80FC3E8: @ 80FC3E8 adds r0, r2 mov r9, r0 ldr r7, =0x03005d8c -_080FC408: +@080FC408: lsls r5, r1, 4 adds r4, r5, r2 movs r0, 0x4 ldrsb r0, [r4, r0] cmp r0, 0 - bne _080FC468 + bne @080FC468 movs r3, 0 ldrsh r0, [r4, r3] cmp r0, 0 - bne _080FC468 + bne @080FC468 movs r3, 0x2 ldrsh r0, [r4, r3] cmp r0, 0 - bne _080FC468 + bne @080FC468 mov r0, sp adds r1, r6, 0 bl player_get_pos_to_plus_one_step_in_direction_player_is_facing @@ -479815,16 +479815,16 @@ _080FC408: strh r0, [r4] ldrh r0, [r6] strh r0, [r4, 0x2] - b _080FC472 + b @080FC472 .align 2, 0 .pool -_080FC468: +@080FC468: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x9 - bls _080FC408 -_080FC472: + bls @080FC408 +@080FC472: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -479835,29 +479835,29 @@ _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 -_080FC486: +@080FC486: lsls r0, r4, 4 adds r1, r0, r5 ldrb r0, [r1, 0x5] cmp r0, 0 - beq _080FC4A0 + beq @080FC4A0 subs r0, 0x1 strb r0, [r1, 0x5] lsls r0, 24 cmp r0, 0 - bne _080FC4A0 + bne @080FC4A0 adds r0, r4, 0 bl sub_80FC228 -_080FC4A0: +@080FC4A0: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x9 - bls _080FC486 + bls @080FC486 pop {r4,r5} pop {r0} bx r0 @@ -479866,14 +479866,14 @@ _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 ldrh r1, [r3] ldr r0, =0x0000ffff cmp r1, r0 - beq _080FC4EC + beq @080FC4EC ldr r0, =0x02021dc4 ldr r2, =0x0203a054 lsls r1, 4 @@ -479883,18 +479883,18 @@ sub_80FC4B4: @ 80FC4B4 movs r3, 0x3 bl decimal_int_to_string movs r0, 0x1 - b _080FC4EE + b @080FC4EE .align 2, 0 .pool -_080FC4EC: +@080FC4EC: movs r0, 0 -_080FC4EE: +@080FC4EE: pop {r1} bx r1 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 @@ -479912,21 +479912,21 @@ sub_80FC4F4: @ 80FC4F4 bl link_0800A448 lsls r0, 24 cmp r0, 0 - bne _080FC528 + bne @080FC528 movs r0, 0 - b _080FC52A + b @080FC52A .align 2, 0 .pool -_080FC528: +@080FC528: movs r0, 0x1 -_080FC52A: +@080FC52A: pop {r4,r5} pop {r1} bx r1 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 @@ -479937,21 +479937,21 @@ sub_80FC530: @ 80FC530 bl sub_800A550 ands r4, r0 cmp r4, 0 - beq _080FC552 + beq @080FC552 adds r0, r5, 0 bl sub_800A5EC movs r0, 0x1 - b _080FC554 -_080FC552: + b @080FC554 +@080FC552: movs r0, 0 -_080FC554: +@080FC554: pop {r4,r5} pop {r1} bx r1 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 @@ -479959,20 +479959,20 @@ sub_80FC55C: @ 80FC55C lsls r4, 24 lsls r0, 24 cmp r4, r0 - beq _080FC574 + beq @080FC574 movs r0, 0 - b _080FC57A -_080FC574: + b @080FC57A +@080FC574: bl sub_800A5B4 movs r0, 0x1 -_080FC57A: +@080FC57A: pop {r4} pop {r1} bx r1 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 @@ -479981,7 +479981,7 @@ sub_80FC580: @ 80FC580 ldr r6, =sub_80FC5C0 + 1 ldr r4, =0x020223c4 movs r3, 0xFF -_080FC590: +@080FC590: lsls r0, r1, 8 adds r0, r4 strh r3, [r0] @@ -479989,7 +479989,7 @@ _080FC590: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x3 - bls _080FC590 + bls @080FC590 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -480005,7 +480005,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 @@ -480021,14 +480021,14 @@ 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 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _080FC650 + beq @080FC650 bl link_get_multiplayer_id ldr r1, =0x02039f25 strb r0, [r1] @@ -480041,47 +480041,47 @@ sub_80FC5DC: @ 80FC5DC ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 - bne _080FC60C + bne @080FC60C movs r0, 0x3 strb r0, [r1] -_080FC60C: +@080FC60C: movs r3, 0 ldrb r2, [r4] cmp r3, r2 - bge _080FC64A + bge @080FC64A ldr r1, =0x020229e8 ldrb r0, [r1] subs r0, 0x1 adds r6, r4, 0 cmp r0, 0x1 - bls _080FC63A + bls @080FC63A adds r4, r2, 0 adds r2, r1, 0 movs r5, 0xFF -_080FC626: +@080FC626: adds r2, 0x1C adds r3, 0x1 cmp r3, r4 - bge _080FC64A + bge @080FC64A ldrh r1, [r2] adds r0, r5, 0 ands r0, r1 subs r0, 0x1 cmp r0, 0x1 - bhi _080FC626 -_080FC63A: + bhi @080FC626 +@080FC63A: ldrb r6, [r6] cmp r3, r6 - bge _080FC64A + bge @080FC64A ldr r0, =0x02039f2a ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_080FC64A: +@080FC64A: adds r0, r7, 0 bl set_task_function_to_args_14_15 -_080FC650: +@080FC650: pop {r4-r7} pop {r0} bx r0 @@ -480090,7 +480090,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 @@ -480098,43 +480098,43 @@ sub_80FC670: @ 80FC670 movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne _080FC698 + bne @080FC698 movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080FC6A0 + beq @080FC6A0 cmp r0, 0x1 - beq _080FC6AE + beq @080FC6AE bl sub_800A520 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080FC6B4 -_080FC698: + bne @080FC6B4 +@080FC698: movs r0, 0x1 - b _080FC6B6 + b @080FC6B6 .align 2, 0 .pool -_080FC6A0: +@080FC6A0: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080FC6B4 + beq @080FC6B4 bl sub_800ADF8 -_080FC6AE: +@080FC6AE: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -_080FC6B4: +@080FC6B4: movs r0, 0 -_080FC6B6: +@080FC6B6: pop {r4} pop {r1} bx r1 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} @@ -480148,36 +480148,36 @@ sub_80FC6BC: @ 80FC6BC adds r0, 0x18 bl sub_80FC670 cmp r0, 0 - bne _080FC6DC - b _080FC7F4 -_080FC6DC: + bne @080FC6DC + b @080FC7F4 +@080FC6DC: adds r0, r5, 0 subs r0, 0x8 adds r4, r0 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080FC758 + beq @080FC758 cmp r0, 0x1 - bgt _080FC6F8 + bgt @080FC6F8 cmp r0, 0 - beq _080FC6FE - b _080FC7DC + beq @080FC6FE + b @080FC7DC .align 2, 0 .pool -_080FC6F8: +@080FC6F8: cmp r0, 0xA - beq _080FC7C0 - b _080FC7DC -_080FC6FE: + beq @080FC7C0 + b @080FC7DC +@080FC6FE: bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - bne _080FC738 + bne @080FC738 bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080FC7F4 + beq @080FC7F4 ldr r0, =0x020228c4 ldr r1, =0x02039f25 ldrb r1, [r1] @@ -480188,10 +480188,10 @@ _080FC6FE: bl memcpy movs r0, 0xA strh r0, [r4, 0x8] - b _080FC7F4 + b @080FC7F4 .align 2, 0 .pool -_080FC738: +@080FC738: ldr r0, =0x020228c4 ldr r1, =0x02039f25 ldrb r1, [r1] @@ -480200,22 +480200,22 @@ _080FC738: adds r1, r2 movs r2, 0x40 bl memcpy - b _080FC7D6 + b @080FC7D6 .align 2, 0 .pool -_080FC758: +@080FC758: bl sub_80FC55C lsls r0, 24 cmp r0, 0 - beq _080FC7F4 + beq @080FC7F4 movs r5, 0 ldr r0, =0x02039f30 mov r8, r6 ldrb r0, [r0] cmp r5, r0 - bge _080FC798 + bge @080FC798 ldr r6, =0x020229e8 -_080FC770: +@080FC770: lsls r4, r5, 6 ldr r0, =0x02039e00 adds r4, r0 @@ -480233,8 +480233,8 @@ _080FC770: ldr r0, =0x02039f30 ldrb r0, [r0] cmp r5, r0 - blt _080FC770 -_080FC798: + blt @080FC770 +@080FC798: ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 @@ -480243,10 +480243,10 @@ _080FC798: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _080FC7F4 + b @080FC7F4 .align 2, 0 .pool -_080FC7C0: +@080FC7C0: ldrh r0, [r4, 0x1E] adds r0, 0x1 strh r0, [r4, 0x1E] @@ -480254,14 +480254,14 @@ _080FC7C0: movs r1, 0x96 lsls r1, 17 cmp r0, r1 - ble _080FC7F4 + ble @080FC7F4 movs r0, 0x2 bl sub_800A4D8 -_080FC7D6: +@080FC7D6: movs r0, 0x1 strh r0, [r4, 0x8] - b _080FC7F4 -_080FC7DC: + b @080FC7F4 +@080FC7DC: ldr r0, =0x03005e00 lsls r1, r7, 2 adds r1, r7 @@ -480273,7 +480273,7 @@ _080FC7DC: strh r0, [r1, 0x20] adds r0, r7, 0 bl set_task_function_to_args_14_15 -_080FC7F4: +@080FC7F4: pop {r3} mov r8, r3 pop {r4-r7} @@ -480284,7 +480284,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 @@ -480296,39 +480296,39 @@ sub_80FC804: @ 80FC804 movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0 - beq _080FC830 + beq @080FC830 cmp r0, 0x1 - beq _080FC858 + beq @080FC858 movs r0, 0 strh r0, [r5, 0x8] adds r0, r2, 0 bl set_task_function_to_args_14_15 - b _080FC880 + b @080FC880 .align 2, 0 .pool -_080FC830: +@080FC830: bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - bne _080FC87A + bne @080FC87A bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080FC880 + beq @080FC880 ldr r0, =0x03005d80 movs r1, 0x4 bl sub_80FC4F4 cmp r0, 0x1 - bne _080FC880 - b _080FC87A + bne @080FC880 + b @080FC87A .align 2, 0 .pool -_080FC858: +@080FC858: movs r0, 0 bl sub_80FC530 lsls r0, 24 cmp r0, 0 - beq _080FC880 + beq @080FC880 ldr r0, =0x03005d80 ldr r4, =0x020223c4 adds r1, r4, 0 @@ -480338,11 +480338,11 @@ _080FC858: adds r1, r4, 0 movs r2, 0x4 bl memcpy -_080FC87A: +@080FC87A: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] -_080FC880: +@080FC880: pop {r4,r5} pop {r0} bx r0 @@ -480351,7 +480351,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 @@ -480367,7 +480367,7 @@ sub_80FC894: @ 80FC894 adds r0, 0x18 bl sub_80FC670 cmp r0, 0 - beq _080FC986 + beq @080FC986 movs r1, 0x8 negs r1, r1 adds r1, r7 @@ -480376,56 +480376,56 @@ sub_80FC894: @ 80FC894 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080FC90C + beq @080FC90C cmp r0, 0x1 - bgt _080FC8D8 + bgt @080FC8D8 cmp r0, 0 - beq _080FC8DE - b _080FC96E + beq @080FC8DE + b @080FC96E .align 2, 0 .pool -_080FC8D8: +@080FC8D8: cmp r0, 0xA - beq _080FC954 - b _080FC96E -_080FC8DE: + beq @080FC954 + b @080FC96E +@080FC8DE: ldr r1, =0x020228c4 ldrh r0, [r4, 0x1A] strb r0, [r1] bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - bne _080FC904 + bne @080FC904 bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080FC986 + beq @080FC986 movs r0, 0xA strh r0, [r4, 0x8] - b _080FC986 + b @080FC986 .align 2, 0 .pool -_080FC904: +@080FC904: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080FC986 -_080FC90C: + b @080FC986 +@080FC90C: bl sub_80FC55C lsls r0, 24 cmp r0, 0 - beq _080FC986 + beq @080FC986 movs r3, 0 ldr r1, =0x02039f30 ldrb r0, [r1] cmp r3, r0 - bge _080FC93A + bge @080FC93A ldr r4, =0x020223c4 adds r0, r7, 0x2 adds r2, r5, r0 movs r5, 0x80 lsls r5, 1 -_080FC92A: +@080FC92A: ldrh r0, [r4] strh r0, [r2] adds r4, r5 @@ -480433,8 +480433,8 @@ _080FC92A: adds r3, 0x1 ldrb r0, [r1] cmp r3, r0 - blt _080FC92A -_080FC93A: + blt @080FC92A +@080FC93A: mov r0, r8 adds r1, r0, r6 lsls r1, 3 @@ -480442,23 +480442,23 @@ _080FC93A: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _080FC986 + b @080FC986 .align 2, 0 .pool -_080FC954: +@080FC954: ldrh r0, [r4, 0x1E] adds r0, 0x1 strh r0, [r4, 0x1E] lsls r0, 16 asrs r0, 16 cmp r0, 0xA - ble _080FC986 + ble @080FC986 movs r0, 0x2 bl sub_800A4D8 movs r0, 0x1 strh r0, [r4, 0x8] - b _080FC986 -_080FC96E: + b @080FC986 +@080FC96E: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -480470,7 +480470,7 @@ _080FC96E: strh r0, [r1, 0x20] adds r0, r6, 0 bl set_task_function_to_args_14_15 -_080FC986: +@080FC986: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -480482,7 +480482,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 @@ -480494,46 +480494,46 @@ sub_80FC998: @ 80FC998 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080FC9C4 + beq @080FC9C4 cmp r0, 0x1 - beq _080FC9E0 + beq @080FC9E0 movs r0, 0 strh r0, [r4, 0x8] adds r0, r2, 0 bl set_task_function_to_args_14_15 - b _080FC9F0 + b @080FC9F0 .align 2, 0 .pool -_080FC9C4: +@080FC9C4: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080FC9F0 + beq @080FC9F0 ldr r0, =0x02039f25 movs r1, 0x1 bl sub_80FC4F4 cmp r0, 0x1 - bne _080FC9F0 - b _080FC9EA + bne @080FC9F0 + b @080FC9EA .align 2, 0 .pool -_080FC9E0: +@080FC9E0: bl sub_80FC55C lsls r0, 24 cmp r0, 0 - beq _080FC9F0 -_080FC9EA: + beq @080FC9F0 +@080FC9EA: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080FC9F0: +@080FC9F0: pop {r4} pop {r0} bx r0 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 @@ -480550,21 +480550,21 @@ sub_80FC9F8: @ 80FC9F8 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080FCA30 + beq @080FCA30 cmp r0, 0x1 - beq _080FCA68 + beq @080FCA68 movs r0, 0 strh r0, [r4, 0x8] adds r0, r5, 0 bl set_task_function_to_args_14_15 - b _080FCAB2 + b @080FCAB2 .align 2, 0 .pool -_080FCA30: +@080FCA30: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080FCAB2 + beq @080FCAB2 ldr r0, =0x02039f34 ldr r2, [r0] ldr r0, =0x02039f25 @@ -480578,32 +480578,32 @@ _080FCA30: movs r1, 0x2 bl sub_80FC4F4 cmp r0, 0x1 - bne _080FCAB2 + bne @080FCAB2 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080FCAB2 + b @080FCAB2 .align 2, 0 .pool -_080FCA68: +@080FCA68: bl sub_80FC55C lsls r0, 24 cmp r0, 0 - beq _080FCAB2 + beq @080FCAB2 movs r2, 0 ldr r6, =0x02039f30 mov r9, r8 mov r12, r7 ldrb r0, [r6] cmp r2, r0 - bge _080FCAA4 + bge @080FCAA4 ldr r1, =0x02039f34 mov r8, r1 ldr r4, =0x020223c4 movs r3, 0 movs r7, 0x80 lsls r7, 1 -_080FCA8C: +@080FCA8C: mov r1, r8 ldr r0, [r1] ldr r0, [r0, 0x4] @@ -480615,8 +480615,8 @@ _080FCA8C: adds r2, 0x1 ldrb r0, [r6] cmp r2, r0 - blt _080FCA8C -_080FCAA4: + blt @080FCA8C +@080FCAA4: mov r0, r12 adds r1, r0, r5 lsls r1, 3 @@ -480624,7 +480624,7 @@ _080FCAA4: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_080FCAB2: +@080FCAB2: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -480636,7 +480636,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 @@ -480649,49 +480649,49 @@ sub_80FCACC: @ 80FCACC ldrsh r0, [r2, r3] adds r3, r1, 0 cmp r0, 0xB - bls _080FCAE8 - b _080FCC78 -_080FCAE8: + bls @080FCAE8 + b @080FCC78 +@080FCAE8: lsls r0, 2 - ldr r1, =_080FCAFC + ldr r1, =@080FCAFC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080FCAFC: - .4byte _080FCB2C - .4byte _080FCB44 - .4byte _080FCB6C - .4byte _080FCB90 - .4byte _080FCBA4 - .4byte _080FCB6C - .4byte _080FCBCC - .4byte _080FCBE0 - .4byte _080FCB6C - .4byte _080FCC08 - .4byte _080FCC38 - .4byte _080FCB6C -_080FCB2C: +@080FCAFC: + .4byte @080FCB2C + .4byte @080FCB44 + .4byte @080FCB6C + .4byte @080FCB90 + .4byte @080FCBA4 + .4byte @080FCB6C + .4byte @080FCBCC + .4byte @080FCBE0 + .4byte @080FCB6C + .4byte @080FCC08 + .4byte @080FCC38 + .4byte @080FCB6C +@080FCB2C: bl sub_800A520 lsls r0, 24 cmp r0, 0 - bne _080FCB38 - b _080FCC82 -_080FCB38: + bne @080FCB38 + b @080FCC82 +@080FCB38: ldr r0, =0x02039f08 movs r1, 0x8 - b _080FCC16 + b @080FCC16 .align 2, 0 .pool -_080FCB44: +@080FCB44: bl sub_80FC55C lsls r0, 24 cmp r0, 0 - bne _080FCB50 - b _080FCC82 -_080FCB50: + bne @080FCB50 + b @080FCC82 +@080FCB50: ldr r0, =0x02039f08 ldr r1, =0x02039f2b ldrb r1, [r1] @@ -480699,10 +480699,10 @@ _080FCB50: ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x8 - b _080FCC50 + b @080FCC50 .align 2, 0 .pool -_080FCB6C: +@080FCB6C: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -480713,30 +480713,30 @@ _080FCB6C: lsls r0, 16 asrs r0, 16 cmp r0, 0xA - bgt _080FCB84 - b _080FCC82 -_080FCB84: + bgt @080FCB84 + b @080FCC82 +@080FCB84: movs r0, 0 strh r0, [r2, 0xA] ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] - b _080FCC82 -_080FCB90: + b @080FCC82 +@080FCB90: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080FCC82 + beq @080FCC82 ldr r0, =0x02039f10 movs r1, 0x8 - b _080FCC16 + b @080FCC16 .align 2, 0 .pool -_080FCBA4: +@080FCBA4: bl sub_80FC55C lsls r0, 24 cmp r0, 0 - beq _080FCC82 + beq @080FCC82 ldr r0, =0x02039f10 ldr r1, =0x02039f2b ldrb r1, [r1] @@ -480744,24 +480744,24 @@ _080FCBA4: ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x8 - b _080FCC50 + b @080FCC50 .align 2, 0 .pool -_080FCBCC: +@080FCBCC: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080FCC82 + beq @080FCC82 ldr r0, =0x02039f18 movs r1, 0x8 - b _080FCC16 + b @080FCC16 .align 2, 0 .pool -_080FCBE0: +@080FCBE0: bl sub_80FC55C lsls r0, 24 cmp r0, 0 - beq _080FCC82 + beq @080FCC82 ldr r0, =0x02039f18 ldr r1, =0x02039f2b ldrb r1, [r1] @@ -480769,20 +480769,20 @@ _080FCBE0: ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x8 - b _080FCC50 + b @080FCC50 .align 2, 0 .pool -_080FCC08: +@080FCC08: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080FCC82 + beq @080FCC82 ldr r0, =0x02039f20 movs r1, 0x4 -_080FCC16: +@080FCC16: bl sub_80FC4F4 cmp r0, 0x1 - bne _080FCC82 + bne @080FCC82 ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -480791,14 +480791,14 @@ _080FCC16: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _080FCC82 + b @080FCC82 .align 2, 0 .pool -_080FCC38: +@080FCC38: bl sub_80FC55C lsls r0, 24 cmp r0, 0 - beq _080FCC82 + beq @080FCC82 ldr r0, =0x02039f20 ldr r1, =0x02039f2b ldrb r1, [r1] @@ -480806,7 +480806,7 @@ _080FCC38: ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x4 -_080FCC50: +@080FCC50: bl memcpy ldr r1, =0x03005e00 lsls r0, r4, 2 @@ -480816,22 +480816,22 @@ _080FCC50: ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b _080FCC82 + b @080FCC82 .align 2, 0 .pool -_080FCC78: +@080FCC78: movs r0, 0 strh r0, [r2, 0x8] adds r0, r4, 0 bl set_task_function_to_args_14_15 -_080FCC82: +@080FCC82: pop {r4} pop {r0} bx r0 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 @@ -480844,51 +480844,51 @@ sub_80FCC88: @ 80FCC88 ldrsh r0, [r2, r3] adds r3, r1, 0 cmp r0, 0xB - bls _080FCCA4 - b _080FCE38 -_080FCCA4: + bls @080FCCA4 + b @080FCE38 +@080FCCA4: lsls r0, 2 - ldr r1, =_080FCCB8 + ldr r1, =@080FCCB8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080FCCB8: - .4byte _080FCCE8 - .4byte _080FCD04 - .4byte _080FCD30 - .4byte _080FCD54 - .4byte _080FCD6C - .4byte _080FCD30 - .4byte _080FCD98 - .4byte _080FCDB0 - .4byte _080FCD30 - .4byte _080FCDC8 - .4byte _080FCDF8 - .4byte _080FCD30 -_080FCCE8: +@080FCCB8: + .4byte @080FCCE8 + .4byte @080FCD04 + .4byte @080FCD30 + .4byte @080FCD54 + .4byte @080FCD6C + .4byte @080FCD30 + .4byte @080FCD98 + .4byte @080FCDB0 + .4byte @080FCD30 + .4byte @080FCDC8 + .4byte @080FCDF8 + .4byte @080FCD30 +@080FCCE8: bl sub_800A520 lsls r0, 24 cmp r0, 0 - bne _080FCCF4 - b _080FCE42 -_080FCCF4: + bne @080FCCF4 + b @080FCE42 +@080FCCF4: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x4] movs r1, 0x70 - b _080FCDD6 + b @080FCDD6 .align 2, 0 .pool -_080FCD04: +@080FCD04: bl sub_80FC55C lsls r0, 24 cmp r0, 0 - bne _080FCD10 - b _080FCE42 -_080FCD10: + bne @080FCD10 + b @080FCE42 +@080FCD10: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x4] @@ -480898,10 +480898,10 @@ _080FCD10: ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x70 - b _080FCE10 + b @080FCE10 .align 2, 0 .pool -_080FCD30: +@080FCD30: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -480912,32 +480912,32 @@ _080FCD30: lsls r0, 16 asrs r0, 16 cmp r0, 0xA - bgt _080FCD48 - b _080FCE42 -_080FCD48: + bgt @080FCD48 + b @080FCE42 +@080FCD48: movs r0, 0 strh r0, [r2, 0xA] ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] - b _080FCE42 -_080FCD54: + b @080FCE42 +@080FCD54: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080FCE42 + beq @080FCE42 ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] movs r1, 0x14 - b _080FCDD6 + b @080FCDD6 .align 2, 0 .pool -_080FCD6C: +@080FCD6C: bl sub_80FC55C lsls r0, 24 cmp r0, 0 - beq _080FCE42 + beq @080FCE42 ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] @@ -480947,43 +480947,43 @@ _080FCD6C: ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x14 - b _080FCE10 + b @080FCE10 .align 2, 0 .pool -_080FCD98: +@080FCD98: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080FCE42 + beq @080FCE42 ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x10] - b _080FCDD4 + b @080FCDD4 .align 2, 0 .pool -_080FCDB0: +@080FCDB0: bl sub_80FC55C lsls r0, 24 cmp r0, 0 - beq _080FCE42 + beq @080FCE42 ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x10] - b _080FCE04 + b @080FCE04 .align 2, 0 .pool -_080FCDC8: +@080FCDC8: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080FCE42 + beq @080FCE42 ldr r0, =0x02039f26 -_080FCDD4: +@080FCDD4: movs r1, 0x4 -_080FCDD6: +@080FCDD6: bl sub_80FC4F4 cmp r0, 0x1 - bne _080FCE42 + bne @080FCE42 ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -480992,23 +480992,23 @@ _080FCDD6: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _080FCE42 + b @080FCE42 .align 2, 0 .pool -_080FCDF8: +@080FCDF8: bl sub_80FC55C lsls r0, 24 cmp r0, 0 - beq _080FCE42 + beq @080FCE42 ldr r0, =0x02039f26 -_080FCE04: +@080FCE04: ldr r1, =0x02039f2b ldrb r1, [r1] lsls r1, 8 ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x4 -_080FCE10: +@080FCE10: bl memcpy ldr r1, =0x03005e00 lsls r0, r4, 2 @@ -481018,22 +481018,22 @@ _080FCE10: ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b _080FCE42 + b @080FCE42 .align 2, 0 .pool -_080FCE38: +@080FCE38: movs r0, 0 strh r0, [r2, 0x8] adds r0, r4, 0 bl set_task_function_to_args_14_15 -_080FCE42: +@080FCE42: pop {r4} pop {r0} bx r0 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 @@ -481049,7 +481049,7 @@ sub_80FCE48: @ 80FCE48 adds r0, 0x18 bl sub_80FC670 cmp r0, 0 - beq _080FCF2E + beq @080FCF2E movs r1, 0x8 negs r1, r1 adds r1, r7 @@ -481058,45 +481058,45 @@ sub_80FCE48: @ 80FCE48 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _080FCEC0 + beq @080FCEC0 cmp r0, 0x1 - bgt _080FCE8C + bgt @080FCE8C cmp r0, 0 - beq _080FCE92 - b _080FCF16 + beq @080FCE92 + b @080FCF16 .align 2, 0 .pool -_080FCE8C: +@080FCE8C: cmp r0, 0xA - beq _080FCEFC - b _080FCF16 -_080FCE92: + beq @080FCEFC + b @080FCF16 +@080FCE92: ldr r1, =0x020228c4 movs r0, 0x6E strb r0, [r1] bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - bne _080FCEB8 + bne @080FCEB8 bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080FCF2E + beq @080FCF2E movs r0, 0xA strh r0, [r4, 0x8] - b _080FCF2E + b @080FCF2E .align 2, 0 .pool -_080FCEB8: +@080FCEB8: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _080FCF2E -_080FCEC0: + b @080FCF2E +@080FCEC0: bl sub_80FC55C lsls r0, 24 cmp r0, 0 - beq _080FCF2E + beq @080FCF2E mov r1, r8 mov r8, r9 ldr r4, =0x020223c4 @@ -481106,37 +481106,37 @@ _080FCEC0: movs r5, 0x80 lsls r5, 1 movs r3, 0x3 -_080FCEDC: +@080FCEDC: ldrh r0, [r4] strh r0, [r2] adds r4, r5 adds r2, 0x2 subs r3, 0x1 cmp r3, 0 - bge _080FCEDC + bge @080FCEDC adds r1, r6 lsls r1, 3 add r1, r8 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _080FCF2E + b @080FCF2E .align 2, 0 .pool -_080FCEFC: +@080FCEFC: ldrh r0, [r4, 0x1E] adds r0, 0x1 strh r0, [r4, 0x1E] lsls r0, 16 asrs r0, 16 cmp r0, 0xA - ble _080FCF2E + ble @080FCF2E movs r0, 0x2 bl sub_800A4D8 movs r0, 0x1 strh r0, [r4, 0x8] - b _080FCF2E -_080FCF16: + b @080FCF2E +@080FCF16: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -481148,7 +481148,7 @@ _080FCF16: strh r0, [r1, 0x20] adds r0, r6, 0 bl set_task_function_to_args_14_15 -_080FCF2E: +@080FCF2E: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -481160,7 +481160,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 @@ -481172,42 +481172,42 @@ sub_80FCF40: @ 80FCF40 adds r0, 0x18 bl sub_80FC670 cmp r0, 0 - beq _080FCFBE + beq @080FCFBE adds r0, r6, 0 subs r0, 0x8 adds r4, r0 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080FCF80 + beq @080FCF80 cmp r0, 0x1 - beq _080FCF9C + beq @080FCF9C movs r0, 0 strh r0, [r4, 0x8] strh r0, [r4, 0x20] adds r0, r5, 0 bl set_task_function_to_args_14_15 - b _080FCFBE + b @080FCFBE .align 2, 0 .pool -_080FCF80: +@080FCF80: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080FCFBE + beq @080FCFBE ldr r0, =0x02039f00 movs r1, 0x8 bl sub_80FC4F4 cmp r0, 0x1 - bne _080FCFBE - b _080FCFB8 + bne @080FCFBE + b @080FCFB8 .align 2, 0 .pool -_080FCF9C: +@080FCF9C: bl sub_80FC55C lsls r0, 24 cmp r0, 0 - beq _080FCFBE + beq @080FCFBE ldr r0, =0x02039f00 ldr r1, =0x02039f2b ldrb r1, [r1] @@ -481216,11 +481216,11 @@ _080FCF9C: adds r1, r2 movs r2, 0x8 bl memcpy -_080FCFB8: +@080FCFB8: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080FCFBE: +@080FCFBE: pop {r4-r6} pop {r0} bx r0 @@ -481229,7 +481229,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 @@ -481241,42 +481241,42 @@ sub_80FCFD0: @ 80FCFD0 adds r0, 0x18 bl sub_80FC670 cmp r0, 0 - beq _080FD04E + beq @080FD04E adds r0, r6, 0 subs r0, 0x8 adds r4, r0 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080FD010 + beq @080FD010 cmp r0, 0x1 - beq _080FD02C + beq @080FD02C movs r0, 0 strh r0, [r4, 0x8] strh r0, [r4, 0x20] adds r0, r5, 0 bl set_task_function_to_args_14_15 - b _080FD04E + b @080FD04E .align 2, 0 .pool -_080FD010: +@080FD010: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _080FD04E + beq @080FD04E ldr r0, =0x02039f26 movs r1, 0x4 bl sub_80FC4F4 cmp r0, 0x1 - bne _080FD04E - b _080FD048 + bne @080FD04E + b @080FD048 .align 2, 0 .pool -_080FD02C: +@080FD02C: bl sub_80FC55C lsls r0, 24 cmp r0, 0 - beq _080FD04E + beq @080FD04E ldr r0, =0x02039f26 ldr r1, =0x02039f2b ldrb r1, [r1] @@ -481285,11 +481285,11 @@ _080FD02C: adds r1, r2 movs r2, 0x4 bl memcpy -_080FD048: +@080FD048: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080FD04E: +@080FD04E: pop {r4-r6} pop {r0} bx r0 @@ -481298,34 +481298,34 @@ _080FD04E: thumb_func_end sub_80FCFD0 thumb_func_start sub_80FD060 -sub_80FD060: @ 80FD060 +sub_80FD060: ; 80FD060 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 ldr r1, =0x0203ce7c ldrh r0, [r1] cmp r0, 0xAF - bne _080FD084 + bne @080FD084 ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 ldrb r0, [r1, 0x10] - b _080FD08A + b @080FD08A .align 2, 0 .pool -_080FD084: +@080FD084: ldrh r0, [r1] bl itemid_get_type -_080FD08A: +@080FD08A: subs r0, 0x1 lsls r0, 24 lsrs r4, r0, 24 bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _080FD0B8 + bne @080FD0B8 ldr r0, =0x0203ce54 ldr r2, [r0] ldr r1, =0x085920d8 @@ -481335,10 +481335,10 @@ _080FD08A: str r0, [r2] adds r0, r5, 0 bl task_close_bag_menu_1 - b _080FD0CC + b @080FD0CC .align 2, 0 .pool -_080FD0B8: +@080FD0B8: ldr r0, =0x0203cf2c ldr r2, [r0] ldr r1, =0x085920d8 @@ -481348,7 +481348,7 @@ _080FD0B8: str r0, [r2] adds r0, r5, 0 bl sub_81C5B14 -_080FD0CC: +@080FD0CC: pop {r4,r5} pop {r0} bx r0 @@ -481357,7 +481357,7 @@ _080FD0CC: thumb_func_end sub_80FD060 thumb_func_start run_eventually_start -run_eventually_start: @ 80FD0DC +run_eventually_start: ; 80FD0DC push {lr} lsls r0, 24 lsrs r2, r0, 24 @@ -481369,21 +481369,21 @@ run_eventually_start: @ 80FD0DC movs r1, 0xE ldrsh r0, [r0, r1] cmp r0, 0x1 - beq _080FD110 + beq @080FD110 ldr r1, =0x03005dac ldr r0, =sub_80FD124 + 1 str r0, [r1] adds r0, r2, 0 bl sub_80FD060 - b _080FD11A + b @080FD11A .align 2, 0 .pool -_080FD110: +@080FD110: ldr r0, =0x0203a0f4 ldr r1, [r0] adds r0, r2, 0 bl _call_via_r1 -_080FD11A: +@080FD11A: pop {r0} bx r0 .align 2, 0 @@ -481391,7 +481391,7 @@ _080FD11A: thumb_func_end run_eventually_start thumb_func_start sub_80FD124 -sub_80FD124: @ 80FD124 +sub_80FD124: ; 80FD124 push {lr} bl pal_fill_black ldr r0, =sub_80FD13C + 1 @@ -481404,7 +481404,7 @@ sub_80FD124: @ 80FD124 thumb_func_end sub_80FD124 thumb_func_start sub_80FD13C -sub_80FD13C: @ 80FD13C +sub_80FD13C: ; 80FD13C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -481412,12 +481412,12 @@ sub_80FD13C: @ 80FD13C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080FD158 + bne @080FD158 ldr r0, =0x0203a0f4 ldr r1, [r0] adds r0, r4, 0 bl _call_via_r1 -_080FD158: +@080FD158: pop {r4} pop {r0} bx r0 @@ -481426,7 +481426,7 @@ _080FD158: thumb_func_end sub_80FD13C thumb_func_start sub_80FD164 -sub_80FD164: @ 80FD164 +sub_80FD164: ; 80FD164 push {r4-r6,lr} adds r4, r1, 0 adds r1, r2, 0 @@ -481438,33 +481438,33 @@ sub_80FD164: @ 80FD164 adds r0, r6, 0 bl ExpandTextCodes cmp r4, 0 - bne _080FD1B4 + bne @080FD1B4 bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _080FD1A0 + bne @080FD1A0 ldr r3, =sub_81ABBBC + 1 adds r0, r5, 0 movs r1, 0x1 adds r2, r6, 0 bl sub_81ABB4C - b _080FD1BE + b @080FD1BE .align 2, 0 .pool -_080FD1A0: +@080FD1A0: ldr r1, =0x085e8f31 ldr r2, =sub_81C6714 + 1 adds r0, r5, 0 bl sub_81C6DD8 - b _080FD1BE + b @080FD1BE .align 2, 0 .pool -_080FD1B4: +@080FD1B4: ldr r2, =sub_80FD1F8 + 1 adds r0, r5, 0 adds r1, r6, 0 bl sub_81978EC -_080FD1BE: +@080FD1BE: pop {r4-r6} pop {r0} bx r0 @@ -481473,7 +481473,7 @@ _080FD1BE: thumb_func_end sub_80FD164 thumb_func_start display_dads_advice_cannot_use_item_str -display_dads_advice_cannot_use_item_str: @ 80FD1C8 +display_dads_advice_cannot_use_item_str: ; 80FD1C8 push {lr} lsls r0, 24 lsrs r0, 24 @@ -481488,7 +481488,7 @@ display_dads_advice_cannot_use_item_str: @ 80FD1C8 thumb_func_end display_dads_advice_cannot_use_item_str thumb_func_start display_cannot_dismount_bike_here_str -display_cannot_dismount_bike_here_str: @ 80FD1E0 +display_cannot_dismount_bike_here_str: ; 80FD1E0 push {lr} lsls r0, 24 lsrs r0, 24 @@ -481503,7 +481503,7 @@ display_cannot_dismount_bike_here_str: @ 80FD1E0 thumb_func_end display_cannot_dismount_bike_here_str thumb_func_start sub_80FD1F8 -sub_80FD1F8: @ 80FD1F8 +sub_80FD1F8: ; 80FD1F8 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -481521,7 +481521,7 @@ sub_80FD1F8: @ 80FD1F8 thumb_func_end sub_80FD1F8 thumb_func_start sub_80FD21C -sub_80FD21C: @ 80FD21C +sub_80FD21C: ; 80FD21C push {r4,lr} lsls r0, 16 lsrs r4, r0, 16 @@ -481529,31 +481529,31 @@ sub_80FD21C: @ 80FD21C bl itemid_get_overworld_function ldr r1, =sub_80FDF48 + 1 cmp r0, r1 - bne _080FD238 + bne @080FD238 movs r0, 0x1 - b _080FD24E + b @080FD24E .align 2, 0 .pool -_080FD238: +@080FD238: adds r0, r4, 0 bl itemid_get_overworld_function ldr r1, =sub_80FE378 + 1 cmp r0, r1 - beq _080FD24C + beq @080FD24C movs r0, 0 - b _080FD24E + b @080FD24E .align 2, 0 .pool -_080FD24C: +@080FD24C: movs r0, 0x2 -_080FD24E: +@080FD24E: pop {r4} pop {r1} bx r1 thumb_func_end sub_80FD21C thumb_func_start sub_80FD254 -sub_80FD254: @ 80FD254 +sub_80FD254: ; 80FD254 push {lr} sub sp, 0x24 mov r1, sp @@ -481572,7 +481572,7 @@ sub_80FD254: @ 80FD254 thumb_func_end sub_80FD254 thumb_func_start sub_80FD278 -sub_80FD278: @ 80FD278 +sub_80FD278: ; 80FD278 push {lr} lsls r0, 24 lsrs r0, 24 @@ -481588,8 +481588,8 @@ sub_80FD278: @ 80FD278 thumb_func_end sub_80FD278 thumb_func_start item_field_func_bike -@ void item_field_func_bike(int task_id) -item_field_func_bike: @ 80FD298 +; void item_field_func_bike(int task_id) +item_field_func_bike: ; 80FD298 push {r4-r6,lr} sub sp, 0x4 lsls r0, 24 @@ -481617,59 +481617,59 @@ item_field_func_bike: @ 80FD298 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080FD30E + beq @080FD30E adds r0, r4, 0 bl sub_8089990 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080FD30E + beq @080FD30E adds r0, r4, 0 bl sub_80899A4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080FD30E + beq @080FD30E adds r0, r4, 0 bl sub_8089968 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080FD30E + beq @080FD30E adds r0, r4, 0 bl sub_808997C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080FD320 -_080FD30E: + bne @080FD320 +@080FD30E: ldrb r1, [r6, 0x6] adds r0, r5, 0 bl display_cannot_dismount_bike_here_str - b _080FD350 + b @080FD350 .align 2, 0 .pool -_080FD320: +@080FD320: bl sav1_map_is_biking_allowed cmp r0, 0x1 - bne _080FD348 + bne @080FD348 bl sub_8119FF8 lsls r0, 24 cmp r0, 0 - bne _080FD348 + bne @080FD348 ldr r1, =0x0203a0f4 ldr r0, =sub_80FD358 + 1 str r0, [r1] adds r0, r5, 0 bl run_eventually_start - b _080FD350 + b @080FD350 .align 2, 0 .pool -_080FD348: +@080FD348: ldrb r1, [r6, 0x6] adds r0, r5, 0 bl display_dads_advice_cannot_use_item_str -_080FD350: +@080FD350: add sp, 0x4 pop {r4-r6} pop {r0} @@ -481677,7 +481677,7 @@ _080FD350: thumb_func_end item_field_func_bike thumb_func_start sub_80FD358 -sub_80FD358: @ 80FD358 +sub_80FD358: ; 80FD358 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -481686,16 +481686,16 @@ sub_80FD358: @ 80FD358 bl itemid_get_x28 lsls r0, 24 cmp r0, 0 - bne _080FD378 + bne @080FD378 movs r0, 0x2 bl sub_811A080 - b _080FD37E + b @080FD37E .align 2, 0 .pool -_080FD378: +@080FD378: movs r0, 0x4 bl sub_811A080 -_080FD37E: +@080FD37E: bl sub_80984F4 bl script_env_2_disable adds r0, r4, 0 @@ -481706,7 +481706,7 @@ _080FD37E: thumb_func_end sub_80FD358 thumb_func_start sub_80FD394 -sub_80FD394: @ 80FD394 +sub_80FD394: ; 80FD394 push {r4-r6,lr} sub sp, 0x4 mov r4, sp @@ -481728,30 +481728,30 @@ sub_80FD394: @ 80FD394 bl is_tile_x13_waterfall lsls r0, 24 cmp r0, 0 - bne _080FD41C + bne @080FD41C movs r0, 0x10 bl walkrun_bitfield_and_r0 lsls r0, 24 cmp r0, 0 - bne _080FD41C + bne @080FD41C movs r0, 0x8 bl walkrun_bitfield_and_r0 lsls r0, 24 cmp r0, 0 - bne _080FD3EC + bne @080FD3EC bl sub_808BE74 lsls r0, 24 cmp r0, 0 - beq _080FD41C -_080FD3E8: + beq @080FD41C +@080FD3E8: movs r0, 0x1 - b _080FD41E -_080FD3EC: + b @080FD41E +@080FD3EC: adds r0, r5, 0 bl is_tile_grass_maybe lsls r0, 24 cmp r0, 0 - beq _080FD40C + beq @080FD40C mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -481760,18 +481760,18 @@ _080FD3EC: bl cur_mapdata_get_middle2bit_at lsls r0, 24 cmp r0, 0 - beq _080FD3E8 -_080FD40C: + beq @080FD3E8 +@080FD40C: lsls r0, r6, 24 lsrs r0, 24 bl sub_8089510 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080FD3E8 -_080FD41C: + beq @080FD3E8 +@080FD41C: movs r0, 0 -_080FD41E: +@080FD41E: add sp, 0x4 pop {r4-r6} pop {r1} @@ -481779,22 +481779,22 @@ _080FD41E: thumb_func_end sub_80FD394 thumb_func_start rod -rod: @ 80FD428 +rod: ; 80FD428 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 bl sub_80FD394 cmp r0, 0x1 - bne _080FD44C + bne @080FD44C ldr r1, =0x0203a0f4 ldr r0, =sub_80FD468 + 1 str r0, [r1] adds r0, r4, 0 bl run_eventually_start - b _080FD45E + b @080FD45E .align 2, 0 .pool -_080FD44C: +@080FD44C: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -481803,7 +481803,7 @@ _080FD44C: ldrb r1, [r1, 0xE] adds r0, r4, 0 bl display_dads_advice_cannot_use_item_str -_080FD45E: +@080FD45E: pop {r4} pop {r0} bx r0 @@ -481812,7 +481812,7 @@ _080FD45E: thumb_func_end rod thumb_func_start sub_80FD468 -sub_80FD468: @ 80FD468 +sub_80FD468: ; 80FD468 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -481833,7 +481833,7 @@ sub_80FD468: @ 80FD468 thumb_func_end sub_80FD468 thumb_func_start it_itemfinder -it_itemfinder: @ 80FD490 +it_itemfinder: ; 80FD490 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -481853,7 +481853,7 @@ it_itemfinder: @ 80FD490 thumb_func_end it_itemfinder thumb_func_start sub_80FD4B8 -sub_80FD4B8: @ 80FD4B8 +sub_80FD4B8: ; 80FD4B8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -481864,7 +481864,7 @@ sub_80FD4B8: @ 80FD4B8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080FD4EC + bne @080FD4EC ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -481872,15 +481872,15 @@ sub_80FD4B8: @ 80FD4B8 adds r1, r0 ldr r0, =sub_80FD504 + 1 str r0, [r1] - b _080FD4F6 + b @080FD4F6 .align 2, 0 .pool -_080FD4EC: +@080FD4EC: ldr r1, =0x085e9002 ldr r2, =sub_80FD5CC + 1 adds r0, r4, 0 bl sub_81978EC -_080FD4F6: +@080FD4F6: pop {r4} pop {r0} bx r0 @@ -481889,7 +481889,7 @@ _080FD4F6: thumb_func_end sub_80FD4B8 thumb_func_start sub_80FD504 -sub_80FD504: @ 80FD504 +sub_80FD504: ; 80FD504 push {r4-r7,lr} mov r7, r8 push {r7} @@ -481904,11 +481904,11 @@ sub_80FD504: @ 80FD504 movs r1, 0x6 ldrsh r0, [r4, r1] cmp r0, 0 - bne _080FD5B8 + bne @080FD5B8 movs r2, 0x8 ldrsh r0, [r4, r2] cmp r0, 0x4 - bne _080FD5AC + bne @080FD5AC movs r1, 0 ldrsh r0, [r4, r1] movs r2, 0x2 @@ -481917,7 +481917,7 @@ sub_80FD504: @ 80FD504 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _080FD564 + beq @080FD564 ldr r1, =0x085920e4 subs r0, 0x1 adds r0, r1 @@ -481928,10 +481928,10 @@ sub_80FD504: @ 80FD504 adds r0, r7, r0 ldr r1, =sub_80FDA94 + 1 str r1, [r0] - b _080FD5C2 + b @080FD5C2 .align 2, 0 .pool -_080FD564: +@080FD564: bl player_get_direction__sp1AA lsls r0, 24 lsrs r2, r0, 24 @@ -481939,20 +481939,20 @@ _080FD564: adds r3, r6, 0 ldr r7, =0x085920e4 movs r6, 0x3 -_080FD574: +@080FD574: adds r0, r1, r7 adds r1, 0x1 ldrb r0, [r0] cmp r2, r0 - bne _080FD584 + bne @080FD584 adds r0, r1, 0 ands r0, r6 strh r0, [r4, 0xA] -_080FD584: +@080FD584: lsls r0, r1, 24 lsrs r1, r0, 24 cmp r1, 0x3 - bls _080FD574 + bls @080FD574 ldr r1, =0x03005e00 adds r0, r3, r5 lsls r0, 3 @@ -481962,22 +481962,22 @@ _080FD584: movs r0, 0 strh r0, [r4, 0x6] strh r0, [r4, 0x4] - b _080FD5C2 + b @080FD5C2 .align 2, 0 .pool -_080FD5AC: +@080FD5AC: movs r0, 0x48 bl audio_play ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_080FD5B8: +@080FD5B8: ldrh r0, [r4, 0x6] adds r0, 0x1 movs r1, 0x1F ands r0, r1 strh r0, [r4, 0x6] -_080FD5C2: +@080FD5C2: pop {r3} mov r8, r3 pop {r4-r7} @@ -481986,7 +481986,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 @@ -482004,7 +482004,7 @@ sub_80FD5CC: @ 80FD5CC thumb_func_end sub_80FD5CC thumb_func_start sub_80FD5F0 -sub_80FD5F0: @ 80FD5F0 +sub_80FD5F0: ; 80FD5F0 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -482029,10 +482029,10 @@ sub_80FD5F0: @ 80FD5F0 mov r9, r4 ldrb r0, [r5, 0x3] cmp r3, r0 - bge _080FD6A4 + bge @080FD6A4 subs r1, 0x5 mov r8, r1 -_080FD628: +@080FD628: lsls r3, 16 asrs r1, r3, 16 ldr r2, [r5, 0x10] @@ -482043,7 +482043,7 @@ _080FD628: ldrb r0, [r1, 0x5] adds r7, r3, 0 cmp r0, 0x7 - bne _080FD694 + bne @080FD694 movs r2, 0xFA lsls r2, 1 adds r0, r2, 0 @@ -482054,7 +482054,7 @@ _080FD628: bl flag_check lsls r0, 24 cmp r0, 0 - bne _080FD694 + bne @080FD694 ldr r1, [r5, 0x10] adds r1, r4, r1 ldrh r2, [r1] @@ -482076,16 +482076,16 @@ _080FD628: adds r2, r3 lsrs r2, 16 cmp r2, 0xE - bhi _080FD694 + bhi @080FD694 lsls r0, 16 asrs r2, r0, 16 cmp r2, r8 - blt _080FD694 + blt @080FD694 cmp r2, 0x5 - bgt _080FD694 + bgt @080FD694 adds r0, r6, 0 bl sub_80FD8E0 -_080FD694: +@080FD694: movs r1, 0x80 lsls r1, 9 adds r0, r7, r1 @@ -482093,8 +482093,8 @@ _080FD694: asrs r0, 16 ldrb r2, [r5, 0x3] cmp r0, r2 - blt _080FD628 -_080FD6A4: + blt @080FD628 +@080FD6A4: adds r0, r6, 0 bl sub_80FD7C8 ldr r0, =0x03005e00 @@ -482105,14 +482105,14 @@ _080FD6A4: movs r3, 0xC ldrsh r0, [r1, r3] cmp r0, 0x1 - beq _080FD6C4 + beq @080FD6C4 movs r0, 0 - b _080FD6C6 + b @080FD6C6 .align 2, 0 .pool -_080FD6C4: +@080FD6C4: movs r0, 0x1 -_080FD6C6: +@080FD6C6: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -482123,7 +482123,7 @@ _080FD6C6: thumb_func_end sub_80FD5F0 thumb_func_start sub_80FD6D4 -sub_80FD6D4: @ 80FD6D4 +sub_80FD6D4: ; 80FD6D4 push {r4-r6,lr} lsls r1, 16 lsrs r3, r1, 16 @@ -482133,22 +482133,22 @@ sub_80FD6D4: @ 80FD6D4 ldr r5, [r0, 0x10] movs r1, 0 cmp r1, r2 - bge _080FD728 + bge @080FD728 lsls r0, r3, 16 asrs r6, r0, 16 lsls r0, r4, 16 asrs r4, r0, 16 adds r3, r5, 0 -_080FD6F2: +@080FD6F2: ldrb r0, [r3, 0x5] cmp r0, 0x7 - bne _080FD720 + bne @080FD720 ldrh r0, [r3] cmp r6, r0 - bne _080FD720 + bne @080FD720 ldrh r0, [r3, 0x2] cmp r4, r0 - bne _080FD720 + bne @080FD720 movs r1, 0xFA lsls r1, 1 adds r0, r1, 0 @@ -482159,24 +482159,24 @@ _080FD6F2: bl flag_check lsls r0, 24 cmp r0, 0 - bne _080FD728 + bne @080FD728 movs r0, 0x1 - b _080FD72A -_080FD720: + b @080FD72A +@080FD720: adds r3, 0xC adds r1, 0x1 cmp r1, r2 - blt _080FD6F2 -_080FD728: + blt @080FD6F2 +@080FD728: movs r0, 0 -_080FD72A: +@080FD72A: pop {r4-r6} pop {r1} bx r1 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 @@ -482185,19 +482185,19 @@ sub_80FD730: @ 80FD730 adds r3, r0, 0 ldrb r0, [r4] cmp r0, 0x2 - beq _080FD758 + beq @080FD758 cmp r0, 0x2 - bgt _080FD74E + bgt @080FD74E cmp r0, 0x1 - beq _080FD76C - b _080FD7AC -_080FD74E: + beq @080FD76C + b @080FD7AC +@080FD74E: cmp r0, 0x3 - beq _080FD784 + beq @080FD784 cmp r0, 0x4 - beq _080FD78E - b _080FD7AC -_080FD758: + beq @080FD78E + b @080FD7AC +@080FD758: ldr r0, [r4, 0x4] adds r0, 0x7 subs r0, r5, r0 @@ -482207,8 +482207,8 @@ _080FD758: ldr r0, [r0, 0x4] subs r0, 0x7 adds r0, r6 - b _080FD7A2 -_080FD76C: + b @080FD7A2 +@080FD76C: ldr r0, [r4, 0x4] adds r0, 0x7 subs r0, r5, r0 @@ -482217,38 +482217,38 @@ _080FD76C: ldr r0, =0x02037318 ldr r0, [r0] ldr r0, [r0, 0x4] - b _080FD79E + b @080FD79E .align 2, 0 .pool -_080FD784: +@080FD784: ldr r0, [r3] ldr r0, [r0] subs r0, 0x7 adds r0, r5 - b _080FD798 -_080FD78E: + b @080FD798 +@080FD78E: ldr r0, =0x02037318 ldr r0, [r0] ldr r0, [r0] adds r0, 0x7 subs r0, r5, r0 -_080FD798: +@080FD798: lsls r0, 16 lsrs r1, r0, 16 ldr r0, [r4, 0x4] -_080FD79E: +@080FD79E: adds r0, 0x7 subs r0, r6, r0 -_080FD7A2: +@080FD7A2: lsls r0, 16 lsrs r2, r0, 16 - b _080FD7B0 + b @080FD7B0 .align 2, 0 .pool -_080FD7AC: +@080FD7AC: movs r0, 0 - b _080FD7C2 -_080FD7B0: + b @080FD7C2 +@080FD7B0: ldr r0, [r3, 0x4] lsls r1, 16 asrs r1, 16 @@ -482257,14 +482257,14 @@ _080FD7B0: bl sub_80FD6D4 lsls r0, 24 lsrs r0, 24 -_080FD7C2: +@080FD7C2: pop {r4-r6} pop {r1} bx r1 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 @@ -482302,8 +482302,8 @@ sub_80FD7C8: @ 80FD7C8 ldrsh r1, [r1, r2] adds r1, 0x7 cmp r0, r1 - bgt _080FD8CC -_080FD816: + bgt @080FD8CC +@080FD816: mov r5, sp ldrh r0, [r5, 0x2] subs r0, 0x5 @@ -482317,32 +482317,32 @@ _080FD816: lsls r3, 16 mov r8, r3 cmp r1, r0 - bgt _080FD8B6 + bgt @080FD8B6 movs r0, 0x7 str r0, [sp, 0x10] mov r1, r8 asrs r1, 16 mov r9, r1 mov r10, r0 -_080FD83E: +@080FD83E: ldr r3, [sp, 0x10] cmp r3, r9 - bgt _080FD860 + bgt @080FD860 ldr r5, [sp, 0x8] lsls r0, r5, 16 asrs r0, 16 cmp r9, r0 - bge _080FD860 + bge @080FD860 asrs r1, r2, 16 cmp r10, r1 - bgt _080FD860 + bgt @080FD860 ldr r6, [sp, 0xC] lsls r0, r6, 16 asrs r0, 16 lsls r7, r4, 16 cmp r1, r0 - blt _080FD89E -_080FD860: + blt @080FD89E +@080FD860: mov r0, r8 asrs r5, r0, 16 lsls r4, 16 @@ -482352,14 +482352,14 @@ _080FD860: bl sub_8088A8C adds r7, r4, 0 cmp r0, 0 - beq _080FD89E + beq @080FD89E adds r1, r5, 0 adds r2, r6, 0 bl sub_80FD730 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080FD89E + bne @080FD89E mov r0, sp ldrh r1, [r0] subs r1, r5, r1 @@ -482371,7 +482371,7 @@ _080FD860: asrs r2, 16 ldr r0, [sp, 0x4] bl sub_80FD8E0 -_080FD89E: +@080FD89E: movs r1, 0x80 lsls r1, 9 adds r0, r7, r1 @@ -482383,8 +482383,8 @@ _080FD89E: ldrsh r0, [r3, r5] adds r0, 0x5 cmp r1, r0 - ble _080FD83E -_080FD8B6: + ble @080FD83E +@080FD8B6: movs r1, 0x80 lsls r1, 9 add r1, r8 @@ -482395,8 +482395,8 @@ _080FD8B6: ldrsh r0, [r0, r6] adds r0, 0x7 cmp r1, r0 - ble _080FD816 -_080FD8CC: + ble @080FD816 +@080FD8CC: add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -482410,7 +482410,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 @@ -482430,63 +482430,63 @@ sub_80FD8E0: @ 80FD8E0 movs r1, 0x4 ldrsh r0, [r3, r1] cmp r0, 0 - bne _080FD918 + bne @080FD918 strh r7, [r3] mov r0, r12 strh r0, [r3, 0x2] movs r0, 0x1 strh r0, [r3, 0x4] - b _080FD9A2 + b @080FD9A2 .align 2, 0 .pool -_080FD918: +@080FD918: movs r1, 0 ldrsh r0, [r3, r1] cmp r0, 0 - bge _080FD928 + bge @080FD928 negs r0, r0 lsls r0, 16 lsrs r4, r0, 16 - b _080FD92A -_080FD928: + b @080FD92A +@080FD928: ldrh r4, [r3] -_080FD92A: +@080FD92A: movs r1, 0x2 ldrsh r0, [r3, r1] ldrh r1, [r3, 0x2] mov r9, r1 cmp r0, 0 - bge _080FD93E + bge @080FD93E negs r0, r0 lsls r0, 16 lsrs r2, r0, 16 - b _080FD940 -_080FD93E: + b @080FD940 +@080FD93E: ldrh r2, [r3, 0x2] -_080FD940: +@080FD940: lsls r1, r7, 16 asrs r0, r1, 16 cmp r0, 0 - bge _080FD950 + bge @080FD950 negs r0, r0 lsls r0, 16 lsrs r6, r0, 16 - b _080FD952 -_080FD950: + b @080FD952 +@080FD950: lsrs r6, r1, 16 -_080FD952: +@080FD952: mov r1, r12 lsls r0, r1, 16 asrs r1, r0, 16 mov r8, r0 cmp r1, 0 - bge _080FD964 + bge @080FD964 negs r0, r1 lsls r0, 16 - b _080FD966 -_080FD964: + b @080FD966 +@080FD964: mov r0, r8 -_080FD966: +@080FD966: lsrs r5, r0, 16 lsls r0, r4, 16 asrs r0, 16 @@ -482499,27 +482499,27 @@ _080FD966: asrs r1, 16 adds r0, r1 cmp r4, r0 - ble _080FD988 + ble @080FD988 strh r7, [r3] mov r1, r12 strh r1, [r3, 0x2] - b _080FD9A2 -_080FD988: + b @080FD9A2 +@080FD988: cmp r4, r0 - bne _080FD9A2 + bne @080FD9A2 cmp r2, r1 - bgt _080FD99C + bgt @080FD99C cmp r2, r1 - bne _080FD9A2 + bne @080FD9A2 mov r1, r9 lsls r0, r1, 16 cmp r0, r8 - bge _080FD9A2 -_080FD99C: + bge @080FD9A2 +@080FD99C: strh r7, [r3] mov r0, r12 strh r0, [r3, 0x2] -_080FD9A2: +@080FD9A2: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -482529,81 +482529,81 @@ _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 lsrs r1, 16 lsrs r2, r0, 16 cmp r0, 0 - bne _080FD9C2 + bne @080FD9C2 cmp r1, 0 - beq _080FDA1C -_080FD9C2: + beq @080FDA1C +@080FD9C2: lsls r0, r2, 16 asrs r2, r0, 16 adds r5, r0, 0 cmp r2, 0 - bge _080FD9D4 + bge @080FD9D4 negs r0, r2 lsls r0, 16 lsrs r4, r0, 16 - b _080FD9D6 -_080FD9D4: + b @080FD9D6 +@080FD9D4: lsrs r4, r5, 16 -_080FD9D6: +@080FD9D6: lsls r0, r1, 16 asrs r2, r0, 16 adds r1, r0, 0 cmp r2, 0 - bge _080FD9E8 + bge @080FD9E8 negs r0, r2 lsls r0, 16 lsrs r3, r0, 16 - b _080FD9EA -_080FD9E8: + b @080FD9EA +@080FD9E8: lsrs r3, r1, 16 -_080FD9EA: +@080FD9EA: lsls r0, r4, 16 asrs r2, r0, 16 lsls r0, r3, 16 asrs r0, 16 cmp r2, r0 - ble _080FDA02 + ble @080FDA02 cmp r5, 0 - bge _080FD9FE + bge @080FD9FE movs r0, 0x4 - b _080FDA1E -_080FD9FE: + b @080FDA1E +@080FD9FE: movs r0, 0x2 - b _080FDA1E -_080FDA02: + b @080FDA1E +@080FDA02: cmp r2, r0 - bge _080FDA0C + bge @080FDA0C cmp r1, 0 - blt _080FDA14 - b _080FDA18 -_080FDA0C: + blt @080FDA14 + b @080FDA18 +@080FDA0C: cmp r2, r0 - bne _080FDA1C + bne @080FDA1C cmp r1, 0 - bge _080FDA18 -_080FDA14: + bge @080FDA18 +@080FDA14: movs r0, 0x1 - b _080FDA1E -_080FDA18: + b @080FDA1E +@080FDA18: movs r0, 0x3 - b _080FDA1E -_080FDA1C: + b @080FDA1E +@080FDA1C: movs r0, 0 -_080FDA1E: +@080FDA1E: pop {r4,r5} pop {r1} bx r1 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 @@ -482655,7 +482655,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 @@ -482675,12 +482675,12 @@ sub_80FDA94: @ 80FDA94 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080FDACA + bne @080FDACA ldr r1, =0x085e8f93 ldr r2, =sub_80FD5CC + 1 adds r0, r4, 0 bl sub_81978EC -_080FDACA: +@080FDACA: pop {r4} pop {r0} bx r0 @@ -482689,7 +482689,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 @@ -482715,12 +482715,12 @@ sub_80FDADC: @ 80FDADC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _080FDB1C + beq @080FDB1C movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0 - bne _080FDB50 -_080FDB1C: + bne @080FDB50 +@080FDB1C: ldr r1, =0x085920e4 movs r2, 0xA ldrsh r0, [r4, r2] @@ -482740,12 +482740,12 @@ _080FDB1C: lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne _080FDB50 + bne @080FDB50 ldr r1, =0x085e8fdb ldr r2, =sub_80FD5CC + 1 adds r0, r5, 0 bl sub_81978EC -_080FDB50: +@080FDB50: pop {r4,r5} pop {r0} bx r0 @@ -482754,7 +482754,7 @@ _080FDB50: thumb_func_end sub_80FDADC thumb_func_start sub_80FDB6C -sub_80FDB6C: @ 80FDB6C +sub_80FDB6C: ; 80FDB6C push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -482762,7 +482762,7 @@ sub_80FDB6C: @ 80FDB6C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080FDB98 + bne @080FDB98 ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -482771,10 +482771,10 @@ sub_80FDB6C: @ 80FDB6C ldrb r1, [r1, 0xE] adds r0, r4, 0 bl display_dads_advice_cannot_use_item_str - b _080FDBDA + b @080FDBDA .align 2, 0 .pool -_080FDB98: +@080FDB98: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -482783,17 +482783,17 @@ _080FDB98: movs r1, 0xE ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _080FDBC8 + beq @080FDBC8 ldr r0, =0x0203ce54 ldr r1, [r0] ldr r0, =sub_80FDBEC + 1 str r0, [r1] adds r0, r4, 0 bl task_close_bag_menu_1 - b _080FDBDA + b @080FDBDA .align 2, 0 .pool -_080FDBC8: +@080FDBC8: ldr r0, =0x03005dac ldr r1, =sub_80AF6D4 + 1 str r1, [r0] @@ -482802,7 +482802,7 @@ _080FDBC8: bl fade_screen ldr r0, =sub_80FDC00 + 1 str r0, [r5] -_080FDBDA: +@080FDBDA: pop {r4,r5} pop {r0} bx r0 @@ -482811,7 +482811,7 @@ _080FDBDA: thumb_func_end sub_80FDB6C thumb_func_start sub_80FDBEC -sub_80FDBEC: @ 80FDBEC +sub_80FDBEC: ; 80FDBEC push {lr} ldr r1, =sub_81AD40C + 1 movs r0, 0 @@ -482823,7 +482823,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 @@ -482832,14 +482832,14 @@ sub_80FDC00: @ 80FDC00 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080FDC24 + bne @080FDC24 bl overworld_free_bg_tilemaps ldr r1, =c2_exit_to_overworld_2_switch + 1 movs r0, 0 bl sub_81357FC adds r0, r4, 0 bl remove_task -_080FDC24: +@080FDC24: pop {r4} pop {r0} bx r0 @@ -482848,7 +482848,7 @@ _080FDC24: thumb_func_end sub_80FDC00 thumb_func_start sub_80FDC34 -sub_80FDC34: @ 80FDC34 +sub_80FDC34: ; 80FDC34 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -482873,21 +482873,21 @@ sub_80FDC34: @ 80FDC34 movs r1, 0xE ldrsh r0, [r0, r1] cmp r0, 0 - bne _080FDC90 + bne @080FDC90 ldr r3, =sub_81ABBBC + 1 adds r0, r5, 0 movs r1, 0x1 adds r2, r4, 0 bl sub_81ABB4C - b _080FDC9A + b @080FDC9A .align 2, 0 .pool -_080FDC90: +@080FDC90: ldr r2, =sub_80FD1F8 + 1 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC -_080FDC9A: +@080FDC9A: pop {r4,r5} pop {r0} bx r0 @@ -482896,7 +482896,7 @@ _080FDC9A: thumb_func_end sub_80FDC34 thumb_func_start sub_80FDCA4 -sub_80FDCA4: @ 80FDCA4 +sub_80FDCA4: ; 80FDCA4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -482919,21 +482919,21 @@ sub_80FDCA4: @ 80FDCA4 movs r1, 0xE ldrsh r0, [r0, r1] cmp r0, 0 - bne _080FDCFC + bne @080FDCFC ldr r3, =sub_81ABBBC + 1 adds r0, r5, 0 movs r1, 0x1 adds r2, r4, 0 bl sub_81ABB4C - b _080FDD06 + b @080FDD06 .align 2, 0 .pool -_080FDCFC: +@080FDCFC: ldr r2, =sub_80FD1F8 + 1 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC -_080FDD06: +@080FDD06: pop {r4,r5} pop {r0} bx r0 @@ -482942,7 +482942,7 @@ _080FDD06: thumb_func_end sub_80FDCA4 thumb_func_start sub_80FDD10 -sub_80FDD10: @ 80FDD10 +sub_80FDD10: ; 80FDD10 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -482950,7 +482950,7 @@ sub_80FDD10: @ 80FDD10 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080FDD58 + bne @080FDD58 ldr r1, =0x0203a0f4 ldr r0, =sub_80FDD74 + 1 str r0, [r1] @@ -482963,17 +482963,17 @@ sub_80FDD10: @ 80FDD10 str r0, [r1] adds r0, r4, 0 bl task_close_bag_menu_1 - b _080FDD68 + b @080FDD68 .align 2, 0 .pool -_080FDD58: +@080FDD58: ldr r0, =0x0203ce7c ldrh r0, [r0] bl itemid_get_overworld_function adds r1, r0, 0 adds r0, r4, 0 bl _call_via_r1 -_080FDD68: +@080FDD68: pop {r4} pop {r0} bx r0 @@ -482982,7 +482982,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 @@ -483004,7 +483004,7 @@ sub_80FDD74: @ 80FDD74 thumb_func_end sub_80FDD74 thumb_func_start sub_80FDDA4 -sub_80FDDA4: @ 80FDDA4 +sub_80FDDA4: ; 80FDDA4 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -483013,28 +483013,28 @@ sub_80FDDA4: @ 80FDDA4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080FDDC8 + bne @080FDDC8 ldr r1, =0x0203a0f4 ldr r0, =sub_80FDE7C + 1 - b _080FDDD8 + b @080FDDD8 .align 2, 0 .pool -_080FDDC8: +@080FDDC8: bl sub_80E1770 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080FDDEC + bne @080FDDEC ldr r1, =0x0203a0f4 ldr r0, =sub_80FDE08 + 1 -_080FDDD8: +@080FDDD8: str r0, [r1] adds r0, r4, 0 bl run_eventually_start - b _080FDDFE + b @080FDDFE .align 2, 0 .pool -_080FDDEC: +@080FDDEC: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -483043,7 +483043,7 @@ _080FDDEC: ldrb r1, [r1, 0xE] adds r0, r5, 0 bl display_dads_advice_cannot_use_item_str -_080FDDFE: +@080FDDFE: pop {r4,r5} pop {r0} bx r0 @@ -483052,7 +483052,7 @@ _080FDDFE: thumb_func_end sub_80FDDA4 thumb_func_start sub_80FDE08 -sub_80FDE08: @ 80FDE08 +sub_80FDE08: ; 80FDE08 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -483070,7 +483070,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 @@ -483089,7 +483089,7 @@ sub_80FDE2C: @ 80FDE2C lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x10 - beq _080FDE68 + beq @080FDE68 ldr r0, =0x02037350 lsls r1, r2, 3 adds r1, r2 @@ -483097,15 +483097,15 @@ sub_80FDE2C: @ 80FDE2C adds r1, r0 ldrb r0, [r1, 0x5] cmp r0, 0xE4 - beq _080FDE70 -_080FDE68: + beq @080FDE70 +@080FDE68: movs r0, 0 - b _080FDE72 + b @080FDE72 .align 2, 0 .pool -_080FDE70: +@080FDE70: movs r0, 0x1 -_080FDE72: +@080FDE72: add sp, 0x4 pop {r4} pop {r1} @@ -483113,7 +483113,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 @@ -483131,7 +483131,7 @@ sub_80FDE7C: @ 80FDE7C thumb_func_end sub_80FDE7C thumb_func_start item_field_func_recovery_item -item_field_func_recovery_item: @ 80FDEA0 +item_field_func_recovery_item: ; 80FDEA0 push {lr} lsls r0, 24 lsrs r0, 24 @@ -483146,7 +483146,7 @@ item_field_func_recovery_item: @ 80FDEA0 thumb_func_end item_field_func_recovery_item thumb_func_start sub_80FDEBC -sub_80FDEBC: @ 80FDEBC +sub_80FDEBC: ; 80FDEBC push {lr} lsls r0, 24 lsrs r0, 24 @@ -483161,7 +483161,7 @@ sub_80FDEBC: @ 80FDEBC thumb_func_end sub_80FDEBC thumb_func_start item_in_battle_func_sacred_ash -item_in_battle_func_sacred_ash: @ 80FDED8 +item_in_battle_func_sacred_ash: ; 80FDED8 push {lr} lsls r0, 24 lsrs r0, 24 @@ -483176,7 +483176,7 @@ item_in_battle_func_sacred_ash: @ 80FDED8 thumb_func_end item_in_battle_func_sacred_ash thumb_func_start item_field_func_pp_recovery_item -item_field_func_pp_recovery_item: @ 80FDEF4 +item_field_func_pp_recovery_item: ; 80FDEF4 push {lr} lsls r0, 24 lsrs r0, 24 @@ -483191,7 +483191,7 @@ item_field_func_pp_recovery_item: @ 80FDEF4 thumb_func_end item_field_func_pp_recovery_item thumb_func_start sub_80FDF10 -sub_80FDF10: @ 80FDF10 +sub_80FDF10: ; 80FDF10 push {lr} lsls r0, 24 lsrs r0, 24 @@ -483206,7 +483206,7 @@ sub_80FDF10: @ 80FDF10 thumb_func_end sub_80FDF10 thumb_func_start sub_80FDF2C -sub_80FDF2C: @ 80FDF2C +sub_80FDF2C: ; 80FDF2C push {lr} lsls r0, 24 lsrs r0, 24 @@ -483221,7 +483221,7 @@ sub_80FDF2C: @ 80FDF2C thumb_func_end sub_80FDF2C thumb_func_start sub_80FDF48 -sub_80FDF48: @ 80FDF48 +sub_80FDF48: ; 80FDF48 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -483230,22 +483230,22 @@ sub_80FDF48: @ 80FDF48 movs r0, 0xA9 lsls r0, 1 cmp r1, r0 - bls _080FDF74 + bls @080FDF74 ldr r2, =0x085e9047 ldr r3, =sub_80FDF90 + 1 adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C - b _080FDF80 + b @080FDF80 .align 2, 0 .pool -_080FDF74: +@080FDF74: ldr r2, =0x085e9037 ldr r3, =sub_80FDF90 + 1 adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C -_080FDF80: +@080FDF80: pop {r4} pop {r0} bx r0 @@ -483254,7 +483254,7 @@ _080FDF80: thumb_func_end sub_80FDF48 thumb_func_start sub_80FDF90 -sub_80FDF90: @ 80FDF90 +sub_80FDF90: ; 80FDF90 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -483276,7 +483276,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 @@ -483285,7 +483285,7 @@ task08_0809AD8C: @ 80FDFBC movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _080FE000 + beq @080FE000 ldr r4, =0x02021cc4 ldr r0, =0x0203ce7c ldrh r0, [r0] @@ -483307,7 +483307,7 @@ task08_0809AD8C: @ 80FDFBC movs r1, 0x1 adds r2, r4, 0 bl sub_81ABB4C -_080FE000: +@080FE000: pop {r4,r5} pop {r0} bx r0 @@ -483316,7 +483316,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 @@ -483330,7 +483330,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 @@ -483345,7 +483345,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] @@ -483360,7 +483360,7 @@ sub_80FE058: @ 80FE058 bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _080FE0AC + bne @080FE0AC ldrh r0, [r4] bl itemid_get_pocket_number lsls r0, 24 @@ -483371,20 +483371,20 @@ sub_80FE058: @ 80FE058 lsls r0, 24 lsrs r0, 24 bl sub_81ABA88 - b _080FE0B4 + b @080FE0B4 .align 2, 0 .pool -_080FE0AC: +@080FE0AC: bl sub_81C5924 bl sub_81C59BC -_080FE0B4: +@080FE0B4: pop {r4} pop {r0} bx r0 thumb_func_end sub_80FE058 thumb_func_start sub_80FE0BC -sub_80FE0BC: @ 80FE0BC +sub_80FE0BC: ; 80FE0BC push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -483393,7 +483393,7 @@ sub_80FE0BC: @ 80FE0BC bl var_get lsls r0, 16 cmp r0, 0 - bne _080FE0EC + bne @080FE0EC ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -483401,28 +483401,28 @@ sub_80FE0BC: @ 80FE0BC adds r1, r0 ldr r0, =sub_80FE124 + 1 str r0, [r1] - b _080FE116 + b @080FE116 .align 2, 0 .pool -_080FE0EC: +@080FE0EC: bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _080FE10C + bne @080FE10C ldr r2, =0x085e9092 ldr r3, =sub_81ABBBC + 1 adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C - b _080FE116 + b @080FE116 .align 2, 0 .pool -_080FE10C: +@080FE10C: ldr r1, =0x085e9092 ldr r2, =sub_81C6714 + 1 adds r0, r5, 0 bl sub_81C6DD8 -_080FE116: +@080FE116: pop {r4,r5} pop {r0} bx r0 @@ -483431,7 +483431,7 @@ _080FE116: thumb_func_end sub_80FE0BC thumb_func_start sub_80FE124 -sub_80FE124: @ 80FE124 +sub_80FE124: ; 80FE124 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -483446,7 +483446,7 @@ sub_80FE124: @ 80FE124 lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - ble _080FE156 + ble @080FE156 movs r0, 0 strh r0, [r1, 0x10] movs r0, 0x2F @@ -483456,7 +483456,7 @@ sub_80FE124: @ 80FE124 adds r0, r4, r0 ldr r1, =sub_80FE164 + 1 str r1, [r0] -_080FE156: +@080FE156: pop {r4,r5} pop {r0} bx r0 @@ -483465,7 +483465,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 @@ -483473,7 +483473,7 @@ sub_80FE164: @ 80FE164 bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - bne _080FE1C2 + bne @080FE1C2 ldr r4, =0x00004021 ldr r0, =0x0203ce7c ldrh r0, [r0] @@ -483487,21 +483487,21 @@ sub_80FE164: @ 80FE164 bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _080FE1B8 + bne @080FE1B8 ldr r2, =0x02021fc4 ldr r3, =sub_81ABBBC + 1 adds r0, r5, 0 movs r1, 0x1 bl sub_81ABB4C - b _080FE1C2 + b @080FE1C2 .align 2, 0 .pool -_080FE1B8: +@080FE1B8: ldr r1, =0x02021fc4 ldr r2, =sub_81C6714 + 1 adds r0, r6, 0 bl sub_81C6DD8 -_080FE1C2: +@080FE1C2: pop {r4-r6} pop {r0} bx r0 @@ -483510,7 +483510,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 @@ -483526,27 +483526,27 @@ sub_80FE1D0: @ 80FE1D0 lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - ble _080FE226 + ble @080FE226 movs r0, 0x75 bl audio_play bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _080FE21C + bne @080FE21C ldr r2, =0x02021fc4 ldr r3, =sub_81ABBBC + 1 adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C - b _080FE226 + b @080FE226 .align 2, 0 .pool -_080FE21C: +@080FE21C: ldr r1, =0x02021fc4 ldr r2, =sub_81C6714 + 1 adds r0, r5, 0 bl sub_81C6DD8 -_080FE226: +@080FE226: pop {r4,r5} pop {r0} bx r0 @@ -483555,7 +483555,7 @@ _080FE226: thumb_func_end sub_80FE1D0 thumb_func_start item_field_func_black_white_flutes -item_field_func_black_white_flutes: @ 80FE234 +item_field_func_black_white_flutes: ; 80FE234 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -483565,7 +483565,7 @@ item_field_func_black_white_flutes: @ 80FE234 bl itemid_get_name ldrh r0, [r4] cmp r0, 0x2B - bne _080FE278 + bne @080FE278 ldr r0, =0x000008ad bl flag_set ldr r0, =0x000008ae @@ -483573,10 +483573,10 @@ item_field_func_black_white_flutes: @ 80FE234 ldr r0, =0x02021fc4 ldr r1, =0x085e90c6 bl ExpandTextCodes - b _080FE28C + b @080FE28C .align 2, 0 .pool -_080FE278: +@080FE278: ldr r0, =0x000008ae bl flag_set ldr r0, =0x000008ad @@ -483584,7 +483584,7 @@ _080FE278: ldr r0, =0x02021fc4 ldr r1, =0x085e90f4 bl ExpandTextCodes -_080FE28C: +@080FE28C: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -483602,7 +483602,7 @@ _080FE28C: thumb_func_end item_field_func_black_white_flutes thumb_func_start task08_080A1C44 -task08_080A1C44: @ 80FE2BC +task08_080A1C44: ; 80FE2BC push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -483617,7 +483617,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 @@ -483643,27 +483643,27 @@ 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] movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _080FE32C + bne @080FE32C movs r0, 0 - b _080FE32E + b @080FE32E .align 2, 0 .pool -_080FE32C: +@080FE32C: movs r0, 0x1 -_080FE32E: +@080FE32E: pop {r1} bx r1 thumb_func_end sub_80FE314 thumb_func_start sub_80FE334 -sub_80FE334: @ 80FE334 +sub_80FE334: ; 80FE334 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -483671,16 +483671,16 @@ sub_80FE334: @ 80FE334 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080FE35C + bne @080FE35C ldr r1, =0x0203a0f4 ldr r0, =re_escape_rope + 1 str r0, [r1] adds r0, r4, 0 bl run_eventually_start - b _080FE36E + b @080FE36E .align 2, 0 .pool -_080FE35C: +@080FE35C: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -483689,7 +483689,7 @@ _080FE35C: ldrb r1, [r1, 0xE] adds r0, r4, 0 bl display_dads_advice_cannot_use_item_str -_080FE36E: +@080FE36E: pop {r4} pop {r0} bx r0 @@ -483698,7 +483698,7 @@ _080FE36E: thumb_func_end sub_80FE334 thumb_func_start sub_80FE378 -sub_80FE378: @ 80FE378 +sub_80FE378: ; 80FE378 push {lr} lsls r0, 24 lsrs r0, 24 @@ -483713,7 +483713,7 @@ sub_80FE378: @ 80FE378 thumb_func_end sub_80FE378 thumb_func_start item_in_battle_func_pokeball -item_in_battle_func_pokeball: @ 80FE394 +item_in_battle_func_pokeball: ; 80FE394 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -483721,7 +483721,7 @@ item_in_battle_func_pokeball: @ 80FE394 bl sub_806B8B0 lsls r0, 24 cmp r0, 0 - bne _080FE3D0 + bne @080FE3D0 ldr r0, =0x0203ce7c ldrh r0, [r0] movs r1, 0x1 @@ -483729,35 +483729,35 @@ item_in_battle_func_pokeball: @ 80FE394 bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _080FE3C8 + bne @080FE3C8 adds r0, r4, 0 bl task_close_bag_menu_1 - b _080FE3FA + b @080FE3FA .align 2, 0 .pool -_080FE3C8: +@080FE3C8: adds r0, r4, 0 bl sub_81C5B14 - b _080FE3FA -_080FE3D0: + b @080FE3FA +@080FE3D0: bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _080FE3F0 + bne @080FE3F0 ldr r2, =0x085e9125 ldr r3, =sub_81ABBBC + 1 adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C - b _080FE3FA + b @080FE3FA .align 2, 0 .pool -_080FE3F0: +@080FE3F0: ldr r1, =0x085e9125 ldr r2, =sub_81C6714 + 1 adds r0, r5, 0 bl sub_81C6DD8 -_080FE3FA: +@080FE3FA: pop {r4,r5} pop {r0} bx r0 @@ -483766,7 +483766,7 @@ _080FE3FA: thumb_func_end item_in_battle_func_pokeball thumb_func_start sub_80FE408 -sub_80FE408: @ 80FE408 +sub_80FE408: ; 80FE408 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -483776,27 +483776,27 @@ sub_80FE408: @ 80FE408 movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _080FE43A + beq @080FE43A bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _080FE434 + bne @080FE434 adds r0, r4, 0 bl task_close_bag_menu_1 - b _080FE43A + b @080FE43A .align 2, 0 .pool -_080FE434: +@080FE434: adds r0, r5, 0 bl sub_81C5B14 -_080FE43A: +@080FE43A: pop {r4,r5} pop {r0} bx r0 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 @@ -483812,7 +483812,7 @@ sub_80FE440: @ 80FE440 lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - ble _080FE4AC + ble @080FE4AC movs r0, 0x1 bl audio_play ldr r4, =0x0203ce7c @@ -483822,7 +483822,7 @@ sub_80FE440: @ 80FE440 bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _080FE49C + bne @080FE49C ldrh r0, [r4] bl sub_806CF78 adds r2, r0, 0 @@ -483830,17 +483830,17 @@ sub_80FE440: @ 80FE440 adds r0, r5, 0 movs r1, 0x1 bl sub_81ABB4C - b _080FE4AC + b @080FE4AC .align 2, 0 .pool -_080FE49C: +@080FE49C: ldrh r0, [r4] bl sub_806CF78 adds r1, r0, 0 ldr r2, =sub_80FE408 + 1 adds r0, r6, 0 bl sub_81C6DD8 -_080FE4AC: +@080FE4AC: pop {r4-r6} pop {r0} bx r0 @@ -483849,7 +483849,7 @@ _080FE4AC: thumb_func_end sub_80FE440 thumb_func_start status_incr_battle -status_incr_battle: @ 80FE4B8 +status_incr_battle: ; 80FE4B8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -483872,28 +483872,28 @@ status_incr_battle: @ 80FE4B8 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - beq _080FE52C + beq @080FE52C bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _080FE518 + bne @080FE518 ldr r2, =0x085e96f6 ldr r3, =sub_81ABBBC + 1 adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C - b _080FE53C + b @080FE53C .align 2, 0 .pool -_080FE518: +@080FE518: ldr r1, =0x085e96f6 ldr r2, =sub_81C6714 + 1 adds r0, r4, 0 bl sub_81C6DD8 - b _080FE53C + b @080FE53C .align 2, 0 .pool -_080FE52C: +@080FE52C: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -483902,7 +483902,7 @@ _080FE52C: ldr r0, =sub_80FE440 + 1 str r0, [r1] strh r2, [r1, 0x18] -_080FE53C: +@080FE53C: pop {r4} pop {r0} bx r0 @@ -483911,31 +483911,31 @@ _080FE53C: thumb_func_end status_incr_battle thumb_func_start sub_80FE54C -sub_80FE54C: @ 80FE54C +sub_80FE54C: ; 80FE54C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _080FE574 + bne @080FE574 ldr r0, =0x0203ce54 ldr r1, [r0] ldr r0, =sub_81B89F0 + 1 str r0, [r1] adds r0, r4, 0 bl task_close_bag_menu_1 - b _080FE582 + b @080FE582 .align 2, 0 .pool -_080FE574: +@080FE574: ldr r0, =0x0203cf2c ldr r1, [r0] ldr r0, =sub_81B89F0 + 1 str r0, [r1] adds r0, r4, 0 bl sub_81C5B14 -_080FE582: +@080FE582: pop {r4} pop {r0} bx r0 @@ -483944,7 +483944,7 @@ _080FE582: thumb_func_end sub_80FE54C thumb_func_start item_in_battle_func_recovery_item -item_in_battle_func_recovery_item: @ 80FE590 +item_in_battle_func_recovery_item: ; 80FE590 push {lr} lsls r0, 24 lsrs r0, 24 @@ -483959,7 +483959,7 @@ item_in_battle_func_recovery_item: @ 80FE590 thumb_func_end item_in_battle_func_recovery_item thumb_func_start sub_80FE5AC -sub_80FE5AC: @ 80FE5AC +sub_80FE5AC: ; 80FE5AC push {lr} lsls r0, 24 lsrs r0, 24 @@ -483974,7 +483974,7 @@ sub_80FE5AC: @ 80FE5AC thumb_func_end sub_80FE5AC thumb_func_start item_in_battle_func_pp_recovery_item -item_in_battle_func_pp_recovery_item: @ 80FE5C8 +item_in_battle_func_pp_recovery_item: ; 80FE5C8 push {lr} lsls r0, 24 lsrs r0, 24 @@ -483989,7 +483989,7 @@ item_in_battle_func_pp_recovery_item: @ 80FE5C8 thumb_func_end item_in_battle_func_pp_recovery_item thumb_func_start sub_80FE5E4 -sub_80FE5E4: @ 80FE5E4 +sub_80FE5E4: ; 80FE5E4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -483998,29 +483998,29 @@ sub_80FE5E4: @ 80FE5E4 movs r1, 0x8 ands r0, r1 cmp r0, 0 - bne _080FE634 + bne @080FE634 bl sub_80FE058 bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _080FE620 + bne @080FE620 ldr r2, =0x02021fc4 ldr r3, =task_close_bag_menu_1 + 1 adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C - b _080FE646 + b @080FE646 .align 2, 0 .pool -_080FE620: +@080FE620: ldr r1, =0x02021fc4 ldr r2, =sub_81C5B14 + 1 adds r0, r4, 0 bl sub_81C6DD8 - b _080FE646 + b @080FE646 .align 2, 0 .pool -_080FE634: +@080FE634: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -484029,7 +484029,7 @@ _080FE634: ldrb r1, [r1, 0xE] adds r0, r4, 0 bl display_dads_advice_cannot_use_item_str -_080FE646: +@080FE646: pop {r4} pop {r0} bx r0 @@ -484038,7 +484038,7 @@ _080FE646: thumb_func_end sub_80FE5E4 thumb_func_start sub_80FE650 -sub_80FE650: @ 80FE650 +sub_80FE650: ; 80FE650 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -484049,40 +484049,40 @@ sub_80FE650: @ 80FE650 lsrs r0, 24 subs r0, 0x1 cmp r0, 0x14 - bls _080FE66A - b _080FE75C -_080FE66A: + bls @080FE66A + b @080FE75C +@080FE66A: lsls r0, 2 - ldr r1, =_080FE67C + ldr r1, =@080FE67C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080FE67C: - .4byte _080FE708 - .4byte _080FE6D0 - .4byte _080FE6D0 - .4byte _080FE6D0 - .4byte _080FE6D0 - .4byte _080FE6D0 - .4byte _080FE6D0 - .4byte _080FE75C - .4byte _080FE75C - .4byte _080FE6EC - .4byte _080FE6D0 - .4byte _080FE6D0 - .4byte _080FE6D0 - .4byte _080FE6D0 - .4byte _080FE6D0 - .4byte _080FE6D0 - .4byte _080FE6D0 - .4byte _080FE75C - .4byte _080FE724 - .4byte _080FE724 - .4byte _080FE740 -_080FE6D0: +@080FE67C: + .4byte @080FE708 + .4byte @080FE6D0 + .4byte @080FE6D0 + .4byte @080FE6D0 + .4byte @080FE6D0 + .4byte @080FE6D0 + .4byte @080FE6D0 + .4byte @080FE75C + .4byte @080FE75C + .4byte @080FE6EC + .4byte @080FE6D0 + .4byte @080FE6D0 + .4byte @080FE6D0 + .4byte @080FE6D0 + .4byte @080FE6D0 + .4byte @080FE6D0 + .4byte @080FE6D0 + .4byte @080FE75C + .4byte @080FE724 + .4byte @080FE724 + .4byte @080FE740 +@080FE6D0: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -484092,10 +484092,10 @@ _080FE6D0: strh r0, [r1, 0x10] adds r0, r4, 0 bl item_field_func_recovery_item - b _080FE770 + b @080FE770 .align 2, 0 .pool -_080FE6EC: +@080FE6EC: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -484105,10 +484105,10 @@ _080FE6EC: strh r0, [r1, 0x10] adds r0, r4, 0 bl item_in_battle_func_sacred_ash - b _080FE770 + b @080FE770 .align 2, 0 .pool -_080FE708: +@080FE708: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -484118,10 +484118,10 @@ _080FE708: strh r0, [r1, 0x10] adds r0, r4, 0 bl sub_80FDF2C - b _080FE770 + b @080FE770 .align 2, 0 .pool -_080FE724: +@080FE724: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -484131,10 +484131,10 @@ _080FE724: strh r0, [r1, 0x10] adds r0, r4, 0 bl sub_80FDF10 - b _080FE770 + b @080FE770 .align 2, 0 .pool -_080FE740: +@080FE740: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -484144,10 +484144,10 @@ _080FE740: strh r0, [r1, 0x10] adds r0, r4, 0 bl item_field_func_pp_recovery_item - b _080FE770 + b @080FE770 .align 2, 0 .pool -_080FE75C: +@080FE75C: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -484157,7 +484157,7 @@ _080FE75C: strh r0, [r1, 0x10] adds r0, r4, 0 bl item_field_func_cannot_use -_080FE770: +@080FE770: pop {r4} pop {r0} bx r0 @@ -484166,7 +484166,7 @@ _080FE770: thumb_func_end sub_80FE650 thumb_func_start sub_80FE77C -sub_80FE77C: @ 80FE77C +sub_80FE77C: ; 80FE77C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -484176,61 +484176,61 @@ sub_80FE77C: @ 80FE77C lsls r0, 24 lsrs r0, 24 cmp r0, 0x15 - bhi _080FE814 + bhi @080FE814 lsls r0, 2 - ldr r1, =_080FE7A4 + ldr r1, =@080FE7A4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080FE7A4: - .4byte _080FE7FC - .4byte _080FE814 - .4byte _080FE804 - .4byte _080FE804 - .4byte _080FE804 - .4byte _080FE804 - .4byte _080FE804 - .4byte _080FE804 - .4byte _080FE804 - .4byte _080FE804 - .4byte _080FE814 - .4byte _080FE804 - .4byte _080FE814 - .4byte _080FE814 - .4byte _080FE814 - .4byte _080FE814 - .4byte _080FE814 - .4byte _080FE814 - .4byte _080FE814 - .4byte _080FE814 - .4byte _080FE814 - .4byte _080FE80C -_080FE7FC: +@080FE7A4: + .4byte @080FE7FC + .4byte @080FE814 + .4byte @080FE804 + .4byte @080FE804 + .4byte @080FE804 + .4byte @080FE804 + .4byte @080FE804 + .4byte @080FE804 + .4byte @080FE804 + .4byte @080FE804 + .4byte @080FE814 + .4byte @080FE804 + .4byte @080FE814 + .4byte @080FE814 + .4byte @080FE814 + .4byte @080FE814 + .4byte @080FE814 + .4byte @080FE814 + .4byte @080FE814 + .4byte @080FE814 + .4byte @080FE814 + .4byte @080FE80C +@080FE7FC: adds r0, r4, 0 bl status_incr_battle - b _080FE81A -_080FE804: + b @080FE81A +@080FE804: adds r0, r4, 0 bl item_in_battle_func_recovery_item - b _080FE81A -_080FE80C: + b @080FE81A +@080FE80C: adds r0, r4, 0 bl item_in_battle_func_pp_recovery_item - b _080FE81A -_080FE814: + b @080FE81A +@080FE814: adds r0, r4, 0 bl item_field_func_cannot_use -_080FE81A: +@080FE81A: pop {r4} pop {r0} bx r0 thumb_func_end sub_80FE77C thumb_func_start item_field_func_cannot_use -item_field_func_cannot_use: @ 80FE820 +item_field_func_cannot_use: ; 80FE820 push {lr} lsls r0, 24 lsrs r0, 24 @@ -484248,7 +484248,7 @@ item_field_func_cannot_use: @ 80FE820 thumb_func_end item_field_func_cannot_use thumb_func_start sub_80FE840 -sub_80FE840: @ 80FE840 +sub_80FE840: ; 80FE840 push {r4,r5,lr} adds r4, r0, 0 ldr r5, =0x0203841e @@ -484269,15 +484269,15 @@ sub_80FE840: @ 80FE840 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080FE87C + beq @080FE87C ldrh r0, [r5, 0x8] negs r0, r0 - b _080FE87E + b @080FE87E .align 2, 0 .pool -_080FE87C: +@080FE87C: ldrh r0, [r5, 0x8] -_080FE87E: +@080FE87E: strh r0, [r4, 0x34] ldr r0, =0x0203841e ldrh r0, [r0, 0xA] @@ -484292,14 +484292,14 @@ _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] movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0 - ble _080FE8D4 + ble @080FE8D4 subs r0, r1, 0x1 strh r0, [r4, 0x2E] ldrh r1, [r4, 0x32] @@ -484321,18 +484321,18 @@ sub_80FE898: @ 80FE898 movs r1, 0xFF ands r0, r1 strh r0, [r4, 0x38] - b _080FE8DA -_080FE8D4: + b @080FE8DA +@080FE8D4: adds r0, r4, 0 bl move_anim_8072740 -_080FE8DA: +@080FE8DA: pop {r4} pop {r0} bx r0 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 @@ -484366,7 +484366,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 @@ -484403,7 +484403,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 @@ -484444,34 +484444,34 @@ 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 lsls r0, 24 cmp r0, 0 - beq _080FE9FA + beq @080FE9FA adds r0, r4, 0 bl obj_delete_and_free_tiles - b _080FEA4E -_080FE9FA: + b @080FEA4E +@080FE9FA: movs r1, 0x38 ldrsh r0, [r4, r1] cmp r0, 0x7F - ble _080FEA14 + ble @080FEA14 ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A82E4 adds r0, 0x1 - b _080FEA1E + b @080FEA1E .align 2, 0 .pool -_080FEA14: +@080FEA14: ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A82E4 adds r0, 0x6 -_080FEA1E: +@080FEA1E: adds r1, r4, 0 adds r1, 0x43 strb r0, [r1] @@ -484494,7 +484494,7 @@ _080FEA1E: movs r1, 0xFF ands r0, r1 strh r0, [r4, 0x38] -_080FEA4E: +@080FEA4E: pop {r4} pop {r0} bx r0 @@ -484503,7 +484503,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 @@ -484522,7 +484522,7 @@ sub_80FEA58: @ 80FEA58 movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _080FEAB2 + bne @080FEAB2 ldrh r0, [r5, 0xA] adds r0, 0x1 strh r0, [r5, 0xA] @@ -484547,14 +484547,14 @@ sub_80FEA58: @ 80FEA58 movs r1, 0 movs r2, 0 bl obj_add_from_template_call_callback_once -_080FEAB2: +@080FEAB2: movs r1, 0xA ldrsh r0, [r5, r1] cmp r0, 0xF - bne _080FEAC0 + bne @080FEAC0 adds r0, r6, 0 bl move_anim_task_del -_080FEAC0: +@080FEAC0: pop {r4-r6} pop {r0} bx r0 @@ -484563,7 +484563,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 @@ -484598,23 +484598,23 @@ 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 lsls r0, 24 cmp r0, 0 - beq _080FEB3C + beq @080FEB3C adds r0, r4, 0 bl move_anim_8072740 -_080FEB3C: +@080FEB3C: pop {r4} pop {r0} bx r0 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 @@ -484642,16 +484642,16 @@ sub_80FEB44: @ 80FEB44 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080FEB90 + beq @080FEB90 ldrh r0, [r5, 0x20] subs r0, 0x14 - b _080FEB94 + b @080FEB94 .align 2, 0 .pool -_080FEB90: +@080FEB90: ldrh r0, [r5, 0x20] adds r0, 0x14 -_080FEB94: +@080FEB94: strh r0, [r5, 0x20] bl GenerateRandomNumber2 lsls r0, 16 @@ -484699,17 +484699,17 @@ _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 lsls r0, 24 cmp r0, 0 - beq _080FEC12 + beq @080FEC12 adds r0, r4, 0 bl move_anim_8072740 - b _080FEC42 -_080FEC12: + b @080FEC42 +@080FEC12: movs r1, 0x38 ldrsh r0, [r4, r1] movs r1, 0xC @@ -484720,13 +484720,13 @@ _080FEC12: movs r1, 0x38 ldrsh r0, [r4, r1] cmp r0, 0x7E - bgt _080FEC2E + bgt @080FEC2E ldrh r0, [r4, 0x3A] - b _080FEC32 -_080FEC2E: + b @080FEC32 +@080FEC2E: ldrh r0, [r4, 0x3A] adds r0, 0x1 -_080FEC32: +@080FEC32: adds r1, r4, 0 adds r1, 0x43 strb r0, [r1] @@ -484735,14 +484735,14 @@ _080FEC32: movs r1, 0xFF ands r0, r1 strh r0, [r4, 0x38] -_080FEC42: +@080FEC42: pop {r4} pop {r0} bx r0 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 @@ -484752,12 +484752,12 @@ sub_80FEC48: @ 80FEC48 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080FEC68 + beq @080FEC68 ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] -_080FEC68: +@080FEC68: ldr r4, =0x0203841e ldrh r0, [r4, 0x8] strh r0, [r6, 0x2E] @@ -484792,13 +484792,13 @@ _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 lsls r0, 24 cmp r0, 0 - beq _080FECE2 + beq @080FECE2 adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -484812,7 +484812,7 @@ sub_80FECB8: @ 80FECB8 ldr r1, =sub_80FECF0 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 -_080FECE2: +@080FECE2: pop {r4} pop {r0} bx r0 @@ -484821,7 +484821,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 @@ -484849,7 +484849,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 @@ -484861,7 +484861,7 @@ sub_80FED28: @ 80FED28 movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0x1 - bne _080FED52 + bne @080FED52 ldrb r0, [r4, 0x1] movs r1, 0xD negs r1, r1 @@ -484869,7 +484869,7 @@ sub_80FED28: @ 80FED28 movs r0, 0x4 orrs r1, r0 strb r1, [r4, 0x1] -_080FED52: +@080FED52: ldrh r0, [r5, 0x6] strh r0, [r4, 0x2E] ldrh r0, [r5, 0x4] @@ -484886,7 +484886,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 @@ -484911,7 +484911,7 @@ sub_80FED74: @ 80FED74 lsls r0, 16 lsrs r0, 16 cmp r0, 0x7F - bhi _080FEDC8 + bhi @080FEDC8 ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A8328 @@ -484923,10 +484923,10 @@ sub_80FED74: @ 80FED74 negs r0, r0 ands r0, r2 orrs r0, r1 - b _080FEDEC + b @080FEDEC .align 2, 0 .pool -_080FEDC8: +@080FEDC8: ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A8328 @@ -484934,9 +484934,9 @@ _080FEDC8: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls _080FEDDC + bls @080FEDDC movs r2, 0x3 -_080FEDDC: +@080FEDDC: movs r0, 0x3 ands r2, r0 lsls r2, 2 @@ -484945,7 +484945,7 @@ _080FEDDC: negs r0, r0 ands r0, r1 orrs r0, r2 -_080FEDEC: +@080FEDEC: strb r0, [r4, 0x5] ldrh r0, [r4, 0x30] adds r0, 0x2 @@ -484960,10 +484960,10 @@ _080FEDEC: movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _080FEE10 + bne @080FEE10 adds r0, r4, 0 bl move_anim_8072740 -_080FEE10: +@080FEE10: pop {r4} pop {r0} bx r0 @@ -484972,53 +484972,53 @@ _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 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080FEE36 + bne @080FEE36 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - bne _080FEE3E -_080FEE36: + bne @080FEE3E +@080FEE36: adds r0, r4, 0 bl move_anim_task_del - b _080FEE70 -_080FEE3E: + b @080FEE70 +@080FEE3E: ldr r0, =0x02038437 ldrb r0, [r0] bl battle_get_per_side_status_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080FEE60 + bne @080FEE60 movs r0, 0x2 movs r1, 0x4 movs r2, 0x3 bl lcd_bg_operations - b _080FEE6A + b @080FEE6A .align 2, 0 .pool -_080FEE60: +@080FEE60: movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 bl lcd_bg_operations -_080FEE6A: +@080FEE6A: adds r0, r4, 0 bl move_anim_task_del -_080FEE70: +@080FEE70: pop {r4} pop {r0} bx r0 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 @@ -485056,13 +485056,13 @@ 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 lsls r0, 24 cmp r0, 0 - bne _080FEF38 + bne @080FEF38 movs r1, 0x38 ldrsh r0, [r4, r1] movs r1, 0x20 @@ -485083,20 +485083,20 @@ sub_80FEECC: @ 80FEECC lsls r0, 16 lsrs r0, 16 cmp r0, 0x7F - bhi _080FEF18 + bhi @080FEF18 ldr r0, =0x02038436 ldrb r0, [r0] bl sub_80A82E4 subs r0, 0x1 - b _080FEF22 + b @080FEF22 .align 2, 0 .pool -_080FEF18: +@080FEF18: ldr r0, =0x02038436 ldrb r0, [r0] bl sub_80A82E4 adds r0, 0x1 -_080FEF22: +@080FEF22: adds r1, r4, 0 adds r1, 0x43 strb r0, [r1] @@ -485105,20 +485105,20 @@ _080FEF22: movs r1, 0xFF ands r0, r1 strh r0, [r4, 0x38] - b _080FEF3E + b @080FEF3E .align 2, 0 .pool -_080FEF38: +@080FEF38: adds r0, r4, 0 bl move_anim_8072740 -_080FEF3E: +@080FEF3E: pop {r4} pop {r0} bx r0 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 @@ -485156,13 +485156,13 @@ 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 lsls r0, 24 cmp r0, 0 - bne _080FEFF0 + bne @080FEFF0 movs r1, 0x38 ldrsh r0, [r4, r1] movs r1, 0x8 @@ -485176,14 +485176,14 @@ sub_80FEF98: @ 80FEF98 lsls r0, 16 lsrs r0, 16 cmp r0, 0x4 - bls _080FEFD0 + bls @080FEFD0 adds r0, r1, 0 subs r0, 0xBB lsls r0, 16 lsrs r0, 16 cmp r0, 0x4 - bhi _080FEFE4 -_080FEFD0: + bhi @080FEFE4 +@080FEFD0: ldrb r2, [r4, 0x3] lsls r1, r2, 26 lsrs r1, 27 @@ -485194,24 +485194,24 @@ _080FEFD0: ands r0, r2 orrs r0, r1 strb r0, [r4, 0x3] -_080FEFE4: +@080FEFE4: ldrh r0, [r4, 0x38] adds r0, 0x5 movs r1, 0xFF ands r0, r1 strh r0, [r4, 0x38] - b _080FEFF6 -_080FEFF0: + b @080FEFF6 +@080FEFF0: adds r0, r4, 0 bl move_anim_8072740 -_080FEFF6: +@080FEFF6: pop {r4} pop {r0} bx r0 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 @@ -485244,35 +485244,35 @@ 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] movs r2, 0x32 ldrsh r3, [r1, r2] cmp r3, 0 - bne _080FF078 + bne @080FF078 ldrh r0, [r1, 0x30] movs r2, 0x1 ands r2, r0 cmp r2, 0 - beq _080FF066 + beq @080FF066 movs r0, 0x80 strh r0, [r1, 0x2E] strh r3, [r1, 0x30] strh r3, [r1, 0x32] - b _080FF06C -_080FF066: + b @080FF06C +@080FF066: strh r2, [r1, 0x2E] strh r2, [r1, 0x30] strh r2, [r1, 0x32] -_080FF06C: +@080FF06C: ldr r0, =sub_80FF090 + 1 str r0, [r1, 0x1C] - b _080FF08C + b @080FF08C .align 2, 0 .pool -_080FF078: +@080FF078: subs r0, 0x1 strh r0, [r1, 0x32] ldrh r0, [r1, 0x2E] @@ -485283,13 +485283,13 @@ _080FF078: ldrh r2, [r1, 0x22] adds r0, r2 strh r0, [r1, 0x22] -_080FF08C: +@080FF08C: pop {r0} bx r0 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 @@ -485297,21 +485297,21 @@ sub_80FF090: @ 80FF090 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080FF0B4 + beq @080FF0B4 movs r1, 0x2E ldrsh r0, [r4, r1] movs r1, 0x19 bl sine negs r0, r0 - b _080FF0BE + b @080FF0BE .align 2, 0 .pool -_080FF0B4: +@080FF0B4: movs r1, 0x2E ldrsh r0, [r4, r1] movs r1, 0x19 bl sine -_080FF0BE: +@080FF0BE: strh r0, [r4, 0x24] ldrh r0, [r4, 0x2E] adds r0, 0x2 @@ -485324,25 +485324,25 @@ _080FF0BE: movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _080FF0DE + bne @080FF0DE ldrh r0, [r4, 0x26] adds r0, 0x1 strh r0, [r4, 0x26] -_080FF0DE: +@080FF0DE: movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0x50 - ble _080FF0EC + ble @080FF0EC adds r0, r4, 0 bl move_anim_8072740 -_080FF0EC: +@080FF0EC: pop {r4} pop {r0} bx r0 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 @@ -485352,19 +485352,19 @@ sub_80FF0F4: @ 80FF0F4 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080FF114 + beq @080FF114 ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] -_080FF114: +@080FF114: ldr r6, =0x0203841e ldrh r0, [r6, 0x8] strh r0, [r5, 0x2E] movs r1, 0xC ldrsh r0, [r6, r1] cmp r0, 0 - bne _080FF154 + bne @080FF154 ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 @@ -485381,10 +485381,10 @@ _080FF114: lsrs r0, 24 ldrh r6, [r6, 0x6] adds r0, r6 - b _080FF174 + b @080FF174 .align 2, 0 .pool -_080FF154: +@080FF154: ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r5, 0 @@ -485400,7 +485400,7 @@ _080FF154: ldrh r0, [r6, 0x6] ldrh r1, [r5, 0x36] adds r0, r1 -_080FF174: +@080FF174: strh r0, [r5, 0x36] ldr r0, =0x0203841e ldrh r0, [r0, 0xA] @@ -485417,14 +485417,14 @@ _080FF174: lsls r4, 24 lsls r0, 24 cmp r4, r0 - bne _080FF1AC + bne @080FF1AC movs r0, 0x1 - b _080FF1AE + b @080FF1AE .align 2, 0 .pool -_080FF1AC: +@080FF1AC: movs r0, 0 -_080FF1AE: +@080FF1AE: strh r0, [r5, 0x2E] ldr r0, =sub_80FF1C0 + 1 str r0, [r5, 0x1C] @@ -485436,7 +485436,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 @@ -485451,25 +485451,25 @@ sub_80FF1C0: @ 80FF1C0 lsls r4, 16 asrs r4, 16 cmp r4, 0xC8 - ble _080FF1F2 + ble @080FF1F2 lsls r0, 16 asrs r0, 16 cmp r0, 0x37 - bgt _080FF1F2 + bgt @080FF1F2 ldrh r0, [r6, 0x6] cmp r0, 0 - bne _080FF1F8 + bne @080FF1F8 adds r0, 0x1 strh r0, [r6, 0x6] -_080FF1F2: +@080FF1F2: ldrh r0, [r6, 0x6] cmp r0, 0 - beq _080FF22A -_080FF1F8: + beq @080FF22A +@080FF1F8: movs r1, 0x2E ldrsh r0, [r6, r1] cmp r0, 0 - beq _080FF22A + beq @080FF22A adds r3, r6, 0 adds r3, 0x3E ldrb r2, [r3] @@ -485489,9 +485489,9 @@ _080FF1F8: lsls r0, 16 lsrs r0, 16 cmp r0, 0x1E - bne _080FF22A + bne @080FF22A movs r7, 0x1 -_080FF22A: +@080FF22A: movs r2, 0x20 ldrsh r0, [r6, r2] movs r2, 0x24 @@ -485501,40 +485501,40 @@ _080FF22A: movs r1, 0x88 lsls r1, 1 cmp r0, r1 - bhi _080FF254 + bhi @080FF254 movs r0, 0x22 ldrsh r1, [r6, r0] movs r2, 0x26 ldrsh r0, [r6, r2] adds r1, r0 cmp r1, 0xA0 - bgt _080FF254 + bgt @080FF254 movs r0, 0x10 negs r0, r0 cmp r1, r0 - bge _080FF256 -_080FF254: + bge @080FF256 +@080FF254: movs r7, 0x1 -_080FF256: +@080FF256: cmp r7, 0 - beq _080FF260 + beq @080FF260 adds r0, r6, 0 bl move_anim_8072740 -_080FF260: +@080FF260: pop {r4-r7} pop {r0} bx r0 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 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _080FF28A + bne @080FF28A ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r4, 0 @@ -485543,7 +485543,7 @@ sub_80FF268: @ 80FF268 adds r3, 0x22 movs r1, 0x1 bl sub_80A8924 -_080FF28A: +@080FF28A: ldrh r0, [r4, 0x22] adds r0, 0x20 strh r0, [r4, 0x22] @@ -485568,27 +485568,27 @@ _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] movs r2, 0x30 ldrsh r0, [r4, r2] cmp r0, 0xFF - bne _080FF2D2 + bne @080FF2D2 ldrh r0, [r4, 0x22] subs r0, 0x2 strh r0, [r4, 0x22] - b _080FF2E0 -_080FF2D2: + b @080FF2E0 +@080FF2D2: cmp r0, 0 - ble _080FF2E0 + ble @080FF2E0 ldrh r0, [r4, 0x22] subs r0, 0x2 strh r0, [r4, 0x22] subs r0, r1, 0x2 strh r0, [r4, 0x30] -_080FF2E0: +@080FF2E0: ldrh r3, [r4, 0x32] ldrh r5, [r4, 0x38] adds r2, r3, r5 @@ -485598,10 +485598,10 @@ _080FF2E0: movs r5, 0x36 ldrsh r0, [r4, r5] cmp r1, r0 - bge _080FF2F8 + bge @080FF2F8 adds r0, r2, r3 strh r0, [r4, 0x38] -_080FF2F8: +@080FF2F8: ldrh r1, [r4, 0x38] movs r0, 0xFF ands r0, r1 @@ -485620,24 +485620,24 @@ _080FF2F8: movs r1, 0x38 ldrsh r0, [r4, r1] cmp r0, 0x7F - bgt _080FF338 + bgt @080FF338 ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A8328 lsls r0, 24 lsrs r0, 24 subs r0, 0x1 - b _080FF346 + b @080FF346 .align 2, 0 .pool -_080FF338: +@080FF338: ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A8328 lsls r0, 24 lsrs r0, 24 adds r0, 0x1 -_080FF346: +@080FF346: movs r1, 0x3 ands r0, r1 lsls r0, 2 @@ -485652,10 +485652,10 @@ _080FF346: strh r0, [r4, 0x2E] lsls r0, 16 cmp r0, 0 - bne _080FF36A + bne @080FF36A adds r0, r4, 0 bl move_anim_8072740 -_080FF36A: +@080FF36A: pop {r4,r5} pop {r0} bx r0 @@ -485664,7 +485664,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 @@ -485693,14 +485693,14 @@ 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 ldrh r1, [r0, 0xE] ldr r0, =0x0000ffff cmp r1, r0 - bne _080FF3DA + bne @080FF3DA adds r2, r4, 0 adds r2, 0x2C ldrb r1, [r2] @@ -485714,7 +485714,7 @@ sub_80FF3B0: @ 80FF3B0 strh r0, [r4, 0x2E] ldr r0, =sub_80FF3EC + 1 str r0, [r4, 0x1C] -_080FF3DA: +@080FF3DA: pop {r4} pop {r0} bx r0 @@ -485723,7 +485723,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 @@ -485731,14 +485731,14 @@ sub_80FF3EC: @ 80FF3EC movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0 - bne _080FF404 + bne @080FF404 ldrh r0, [r4, 0x2E] adds r0, 0xB - b _080FF408 -_080FF404: + b @080FF408 +@080FF404: ldrh r0, [r4, 0x2E] subs r0, 0xB -_080FF408: +@080FF408: strh r0, [r4, 0x2E] ldrh r0, [r4, 0x30] adds r0, 0x1 @@ -485746,44 +485746,44 @@ _080FF408: lsls r0, 16 asrs r0, 16 cmp r0, 0x6 - bne _080FF424 + bne @080FF424 movs r0, 0 strh r0, [r4, 0x30] ldrh r0, [r4, 0x32] movs r1, 0x1 eors r0, r1 strh r0, [r4, 0x32] -_080FF424: +@080FF424: adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080FF452 + beq @080FF452 ldrh r0, [r4, 0x3C] subs r0, 0x1 strh r0, [r4, 0x3C] lsls r0, 16 cmp r0, 0 - ble _080FF44C + ble @080FF44C ldrh r1, [r4, 0x3A] lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 bl sub_8008258 - b _080FF452 -_080FF44C: + b @080FF452 +@080FF44C: adds r0, r4, 0 bl move_anim_8072740 -_080FF452: +@080FF452: pop {r4} pop {r0} bx r0 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 @@ -485807,13 +485807,13 @@ sub_80FF458: @ 80FF458 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - bge _080FF498 + bge @080FF498 adds r0, r4, 0 bl move_anim_task_del - b _080FF51C + b @080FF51C .align 2, 0 .pool -_080FF498: +@080FF498: adds r0, r1, 0 movs r1, 0x1 bl sub_80A7270 @@ -485876,7 +485876,7 @@ _080FF498: strh r0, [r6, 0x1E] ldr r0, =sub_80FF53C + 1 str r0, [r6] -_080FF51C: +@080FF51C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -485889,7 +485889,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 @@ -485921,11 +485921,11 @@ sub_80FF53C: @ 80FF53C bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _080FF586 + beq @080FF586 ldrh r0, [r5, 0x24] negs r0, r0 strh r0, [r5, 0x24] -_080FF586: +@080FF586: ldrh r0, [r4, 0x1E] adds r0, 0x10 strh r0, [r4, 0x1E] @@ -485943,11 +485943,11 @@ _080FF586: lsls r0, 16 asrs r0, 16 cmp r0, 0 - bne _080FF5B4 + bne @080FF5B4 strh r0, [r4, 0x8] ldr r0, =sub_80FF5CC + 1 str r0, [r4] -_080FF5B4: +@080FF5B4: pop {r4-r6} pop {r0} bx r0 @@ -485956,7 +485956,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 @@ -485964,7 +485964,7 @@ sub_80FF5CC: @ 80FF5CC ldrh r1, [r0, 0xE] ldr r0, =0x0000ffff cmp r1, r0 - bne _080FF660 + bne @080FF660 ldr r0, =0x03005e00 lsls r2, r3, 2 adds r1, r2, r3 @@ -485974,7 +485974,7 @@ sub_80FF5CC: @ 80FF5CC ldrsh r5, [r7, r1] adds r4, r0, 0 cmp r5, 0 - bne _080FF674 + bne @080FF674 movs r0, 0x1 bl obj_id_for_side_relative_to_move adds r4, r0, 0 @@ -486018,10 +486018,10 @@ sub_80FF5CC: @ 80FF5CC ldrh r0, [r7, 0x8] adds r0, 0x1 strh r0, [r7, 0x8] - b _080FF68E + b @080FF68E .align 2, 0 .pool -_080FF660: +@080FF660: ldr r1, =0x03005e00 lsls r2, r3, 2 adds r0, r2, r3 @@ -486031,8 +486031,8 @@ _080FF660: ldrsh r0, [r0, r4] adds r4, r1, 0 cmp r0, 0 - beq _080FF68E -_080FF674: + beq @080FF68E +@080FF674: adds r1, r2, r3 lsls r1, 3 adds r1, r4 @@ -486042,10 +486042,10 @@ _080FF674: lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - bne _080FF68E + bne @080FF68E adds r0, r3, 0 bl move_anim_task_del -_080FF68E: +@080FF68E: pop {r4-r7} pop {r0} bx r0 @@ -486054,29 +486054,29 @@ _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 ldrsh r0, [r5, r1] cmp r0, 0 - beq _080FF6AA + beq @080FF6AA cmp r0, 0x1 - beq _080FF704 - b _080FF756 -_080FF6AA: + beq @080FF704 + b @080FF756 +@080FF6AA: ldr r6, =0x02038437 ldrb r0, [r6] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _080FF6C2 + bne @080FF6C2 ldr r1, =0x0203841e movs r2, 0 ldrsh r0, [r1, r2] negs r0, r0 strh r0, [r1] -_080FF6C2: +@080FF6C2: ldrb r0, [r6] movs r1, 0 bl sub_80A5C6C @@ -486103,10 +486103,10 @@ _080FF6C2: ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] - b _080FF756 + b @080FF756 .align 2, 0 .pool -_080FF704: +@080FF704: adds r2, r5, 0 adds r2, 0x3E ldrb r1, [r2] @@ -486120,7 +486120,7 @@ _080FF704: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080FF756 + beq @080FF756 adds r0, r5, 0 movs r1, 0x1 bl sub_80082B8 @@ -486144,7 +486144,7 @@ _080FF704: ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 -_080FF756: +@080FF756: pop {r4-r6} pop {r0} bx r0 @@ -486153,13 +486153,13 @@ _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 ldrsh r0, [r5, r1] cmp r0, 0 - bne _080FF7D4 + bne @080FF7D4 ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 @@ -486197,7 +486197,7 @@ sub_80FF768: @ 80FF768 ldrsh r1, [r5, r2] adds r0, r1 cmp r0, 0x78 - ble _080FF7D4 + ble @080FF7D4 ldrh r0, [r5, 0x22] adds r1, r0, 0 subs r1, 0x78 @@ -486205,7 +486205,7 @@ sub_80FF768: @ 80FF768 adds r0, r2 adds r1, r0 strh r1, [r5, 0x22] -_080FF7D4: +@080FF7D4: ldr r0, =sub_80FF8DC + 1 str r0, [r5, 0x1C] pop {r4,r5} @@ -486216,7 +486216,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 @@ -486324,7 +486324,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] @@ -486336,7 +486336,7 @@ sub_80FF8DC: @ 80FF8DC ldrsh r0, [r3, r2] subs r0, 0xA cmp r1, r0 - ble _080FF91C + ble @080FF91C movs r0, 0x2E ldrsh r1, [r3, r0] lsrs r0, r1, 31 @@ -486357,28 +486357,28 @@ sub_80FF8DC: @ 80FF8DC orrs r0, r1 mov r1, r12 strb r0, [r1] -_080FF91C: +@080FF91C: movs r2, 0x2E ldrsh r1, [r3, r2] movs r2, 0x32 ldrsh r0, [r3, r2] cmp r1, r0 - ble _080FF92E + ble @080FF92E adds r0, r3, 0 bl move_anim_8072740 -_080FF92E: +@080FF92E: pop {r0} bx r0 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 ldrsh r0, [r6, r1] cmp r0, 0 - bne _080FF974 + bne @080FF974 ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0x2 @@ -486403,7 +486403,7 @@ sub_80FF934: @ 80FF934 strh r0, [r6, 0x32] ldrh r0, [r4, 0x8] strh r0, [r6, 0x34] -_080FF974: +@080FF974: ldrh r0, [r6, 0x2E] adds r0, 0x1 strh r0, [r6, 0x2E] @@ -486426,10 +486426,10 @@ _080FF974: movs r2, 0x34 ldrsh r0, [r6, r2] cmp r1, r0 - ble _080FF9AA + ble @080FF9AA adds r0, r6, 0 bl move_anim_8072740 -_080FF9AA: +@080FF9AA: pop {r4-r6} pop {r0} bx r0 @@ -486438,7 +486438,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] @@ -486462,7 +486462,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 @@ -486488,16 +486488,16 @@ sub_80FF9E0: @ 80FF9E0 movs r3, 0xFF ands r3, r1 cmp r2, 0 - bne _080FFA1A + bne @080FFA1A movs r2, 0x20 negs r2, r2 - b _080FFA22 -_080FFA1A: + b @080FFA22 +@080FFA1A: cmp r2, 0xFF - bne _080FFA22 + bne @080FFA22 movs r2, 0x88 lsls r2, 1 -_080FFA22: +@080FFA22: mov r0, r9 subs r4, r0 lsls r4, 16 @@ -486528,7 +486528,7 @@ _080FFA22: lsrs r3, r5, 16 asrs r5, 16 cmp r5, r7 - beq _080FFA74 + beq @080FFA74 lsls r1, r7, 8 lsls r0, r3, 16 asrs r0, 16 @@ -486536,10 +486536,10 @@ _080FFA22: mov r1, r8 strh r0, [r1, 0x3C] movs r0, 0 - b _080FFA76 -_080FFA74: + b @080FFA76 +@080FFA74: movs r0, 0x1 -_080FFA76: +@080FFA76: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -486550,34 +486550,34 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0xA - bne _080FFA98 + bne @080FFA98 adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 -_080FFA98: +@080FFA98: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] lsls r0, 16 asrs r0, 16 cmp r0, 0x32 - ble _080FFAAC + ble @080FFAAC adds r0, r4, 0 bl move_anim_8072740 -_080FFAAC: +@080FFAAC: pop {r4} pop {r0} bx r0 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 @@ -486593,12 +486593,12 @@ sub_80FFAB4: @ 80FFAB4 lsls r1, 16 asrs r1, 16 cmp r1, 0x7F - ble _080FFADE + ble @080FFADE ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] strh r5, [r4, 0x2E] -_080FFADE: +@080FFADE: ldrh r0, [r4, 0x2E] adds r0, 0x80 lsls r0, 16 @@ -486616,12 +486616,12 @@ _080FFADE: bl sub_80FF9E0 lsls r0, 24 cmp r0, 0 - beq _080FFB0E + beq @080FFB0E strh r5, [r4, 0x26] strh r5, [r4, 0x2E] ldr r0, =sub_80FFA84 + 1 str r0, [r4, 0x1C] -_080FFB0E: +@080FFB0E: pop {r4,r5} pop {r0} bx r0 @@ -486630,7 +486630,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 @@ -486652,7 +486652,7 @@ sub_80FFB18: @ 80FFB18 eors r0, r1 ldrb r4, [r4] cmp r0, r4 - bne _080FFB68 + bne @080FFB68 strh r6, [r5, 0x3A] adds r0, r2, 0 adds r0, 0xA @@ -486661,10 +486661,10 @@ sub_80FFB18: @ 80FFB18 movs r1, 0x3C bl sub_80FF9B8 movs r0, 0x1 - b _080FFB7A + b @080FFB7A .align 2, 0 .pool -_080FFB68: +@080FFB68: strh r6, [r5, 0x3A] adds r0, r2, 0 adds r0, 0xA @@ -486673,7 +486673,7 @@ _080FFB68: movs r1, 0x3C bl sub_80FF9B8 movs r0, 0x3 -_080FFB7A: +@080FFB7A: strh r0, [r5, 0x34] movs r0, 0x3C strh r0, [r5, 0x36] @@ -486687,7 +486687,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 @@ -486703,12 +486703,12 @@ sub_80FFB90: @ 80FFB90 lsls r1, 16 asrs r1, 16 cmp r1, 0x7F - ble _080FFBBA + ble @080FFBBA ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] strh r5, [r4, 0x2E] -_080FFBBA: +@080FFBBA: ldrh r0, [r4, 0x2E] adds r0, 0x80 lsls r0, 16 @@ -486726,19 +486726,19 @@ _080FFBBA: bl sub_80FF9E0 lsls r0, 24 cmp r0, 0 - beq _080FFBEC + beq @080FFBEC strh r5, [r4, 0x26] strh r5, [r4, 0x2E] adds r0, r4, 0 bl move_anim_8072740 -_080FFBEC: +@080FFBEC: pop {r4,r5} pop {r0} bx r0 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 @@ -486752,7 +486752,7 @@ sub_80FFBF4: @ 80FFBF4 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _080FFC38 + bne @080FFC38 strh r0, [r5, 0x3A] adds r0, r6, 0 adds r0, 0xA @@ -486765,10 +486765,10 @@ sub_80FFBF4: @ 80FFBF4 movs r0, 0x3C strh r0, [r5, 0x36] ldr r0, =sub_80FFAB4 + 1 - b _080FFC62 + b @080FFC62 .align 2, 0 .pool -_080FFC38: +@080FFC38: movs r0, 0xFF strh r0, [r5, 0x3A] adds r0, r6, 0 @@ -486777,10 +486777,10 @@ _080FFC38: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _080FFC50 + beq @080FFC50 movs r0, 0 strh r0, [r5, 0x3A] -_080FFC50: +@080FFC50: adds r0, r5, 0 movs r1, 0x28 bl sub_80FF9B8 @@ -486789,7 +486789,7 @@ _080FFC50: movs r0, 0x3C strh r0, [r5, 0x36] ldr r0, =sub_80FFB90 + 1 -_080FFC62: +@080FFC62: str r0, [r5, 0x1C] pop {r4-r6} pop {r0} @@ -486799,20 +486799,20 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _080FFC8A + bne @080FFC8A adds r0, r4, 0 movs r1, 0 bl sub_80A6980 ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r4, 0x30] -_080FFC8A: +@080FFC8A: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] @@ -486825,10 +486825,10 @@ _080FFC8A: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _080FFCAA + beq @080FFCAA adds r0, r4, 0 bl move_anim_8072740 -_080FFCAA: +@080FFCAA: pop {r4} pop {r0} bx r0 @@ -486837,7 +486837,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 @@ -486859,7 +486859,7 @@ sub_80FFCB4: @ 80FFCB4 eors r0, r1 ldrb r4, [r4] cmp r0, r4 - bne _080FFD04 + bne @080FFD04 strh r6, [r5, 0x3A] adds r0, r2, 0 adds r0, 0xA @@ -486868,10 +486868,10 @@ sub_80FFCB4: @ 80FFCB4 movs r1, 0x3C bl sub_80FF9B8 movs r0, 0x1 - b _080FFD16 + b @080FFD16 .align 2, 0 .pool -_080FFD04: +@080FFD04: strh r6, [r5, 0x3A] adds r0, r2, 0 adds r0, 0xA @@ -486880,7 +486880,7 @@ _080FFD04: movs r1, 0x3C bl sub_80FF9B8 movs r0, 0x3 -_080FFD16: +@080FFD16: strh r0, [r5, 0x34] movs r0, 0x3C strh r0, [r5, 0x36] @@ -486894,7 +486894,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 @@ -486910,12 +486910,12 @@ sub_80FFD2C: @ 80FFD2C lsls r1, 16 asrs r1, 16 cmp r1, 0x7F - ble _080FFD56 + ble @080FFD56 ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] strh r5, [r4, 0x2E] -_080FFD56: +@080FFD56: ldrh r0, [r4, 0x2E] adds r0, 0x80 lsls r0, 16 @@ -486931,7 +486931,7 @@ _080FFD56: strh r0, [r4, 0x26] lsls r0, 16 cmp r0, 0 - bne _080FFD8A + bne @080FFD8A movs r0, 0x3F bl sub_80A5178 adds r1, r0, 0 @@ -486939,12 +486939,12 @@ _080FFD56: asrs r1, 24 movs r0, 0x7D bl audio_play_and_stuff -_080FFD8A: +@080FFD8A: adds r0, r4, 0 bl sub_80FF9E0 lsls r0, 24 cmp r0, 0 - beq _080FFDB2 + beq @080FFDB2 strh r5, [r4, 0x26] strh r5, [r4, 0x2E] ldr r0, =sub_80FFA84 + 1 @@ -486957,7 +486957,7 @@ _080FFD8A: asrs r1, 24 movs r0, 0x7D bl audio_play_and_stuff -_080FFDB2: +@080FFDB2: pop {r4,r5} pop {r0} bx r0 @@ -486966,27 +486966,27 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _080FFE50 + bne @080FFE50 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080FFDE4 + bne @080FFDE4 ldr r0, =0x0203841e ldrh r1, [r0, 0x2] strh r1, [r4, 0x30] movs r1, 0x78 strh r1, [r4, 0x20] adds r5, r0, 0 - b _080FFE06 + b @080FFE06 .align 2, 0 .pool -_080FFDE4: +@080FFDE4: ldr r0, =0x0203841e movs r1, 0x2 ldrsh r3, [r0, r1] @@ -486995,17 +486995,17 @@ _080FFDE4: adds r2, r1, 0 adds r5, r0, 0 cmp r1, 0 - bge _080FFDFA + bge @080FFDFA adds r2, r3, 0 adds r2, 0xDF -_080FFDFA: +@080FFDFA: asrs r0, r2, 8 lsls r0, 8 subs r0, r1, r0 strh r0, [r4, 0x30] movs r0, 0x46 strh r0, [r4, 0x20] -_080FFE06: +@080FFE06: ldrh r0, [r5] strh r0, [r4, 0x22] strh r0, [r4, 0x32] @@ -487028,49 +487028,49 @@ _080FFE06: lsls r0, 16 lsrs r0, 16 cmp r0, 0xBE - bhi _080FFE48 + bhi @080FFE48 adds r1, r4, 0 adds r1, 0x43 movs r0, 0x1F - b _080FFE4E + b @080FFE4E .align 2, 0 .pool -_080FFE48: +@080FFE48: adds r1, r4, 0 adds r1, 0x43 movs r0, 0x1D -_080FFE4E: +@080FFE4E: strb r0, [r1] -_080FFE50: +@080FFE50: pop {r4,r5} pop {r0} bx r0 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 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080FFE6A + beq @080FFE6A cmp r0, 0x1 - beq _080FFE9A - b _080FFEBA -_080FFE6A: + beq @080FFE9A + b @080FFEBA +@080FFE6A: ldrh r5, [r4, 0x32] movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0x4E - ble _080FFE82 + ble @080FFE82 movs r0, 0x1 strh r0, [r4, 0x34] adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 - b _080FFEBA -_080FFE82: + b @080FFEBA +@080FFE82: movs r1, 0x36 ldrsh r0, [r4, r1] movs r1, 0xA @@ -487081,25 +487081,25 @@ _080FFE82: adds r1, 0x3 strh r1, [r4, 0x36] strh r0, [r4, 0x22] - b _080FFEBA -_080FFE9A: + b @080FFEBA +@080FFE9A: movs r1, 0x34 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080FFEBA + beq @080FFEBA adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _080FFEBA + beq @080FFEBA movs r0, 0 strh r0, [r4, 0x2E] strh r0, [r4, 0x32] ldr r0, =sub_80FFEC4 + 1 str r0, [r4, 0x1C] -_080FFEBA: +@080FFEBA: pop {r4,r5} pop {r0} bx r0 @@ -487108,7 +487108,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, =0x08592700 @@ -487125,28 +487125,28 @@ sub_80FFEC4: @ 80FFEC4 lsls r0, 24 asrs r0, 24 cmp r1, r0 - bne _080FFF10 + bne @080FFF10 adds r0, r5, 0x2 adds r0, r3, r0 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0x7F - bne _080FFEFC + bne @080FFEFC movs r0, 0 strh r0, [r4, 0x2E] ldr r0, =sub_80FFF7C + 1 str r0, [r4, 0x1C] -_080FFEFC: +@080FFEFC: movs r0, 0 strh r0, [r4, 0x32] ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _080FFF76 + b @080FFF76 .align 2, 0 .pool -_080FFF10: +@080FFF10: adds r0, r2, 0x1 strh r0, [r4, 0x32] movs r0, 0x2E @@ -487170,24 +487170,24 @@ _080FFF10: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _080FFF5E + bne @080FFF5E ldrh r0, [r4, 0x30] subs r0, 0x1 lsls r0, 16 lsrs r0, 16 cmp r0, 0xBE - bhi _080FFF56 + bhi @080FFF56 adds r1, r4, 0 adds r1, 0x43 movs r0, 0x1F - b _080FFF5C -_080FFF56: + b @080FFF5C +@080FFF56: adds r1, r4, 0 adds r1, 0x43 movs r0, 0x1D -_080FFF5C: +@080FFF5C: strb r0, [r1] -_080FFF5E: +@080FFF5E: movs r6, 0x30 ldrsh r0, [r4, r6] movs r1, 0x3C @@ -487198,23 +487198,23 @@ _080FFF5E: movs r1, 0x14 bl sine strh r0, [r4, 0x26] -_080FFF76: +@080FFF76: pop {r4-r6} pop {r0} bx r0 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 ldrsh r0, [r4, r1] cmp r0, 0x14 - ble _080FFF8E + ble @080FFF8E adds r0, r4, 0 bl move_anim_8072740 -_080FFF8E: +@080FFF8E: movs r0, 0x2E ldrsh r1, [r4, r0] lsrs r0, r1, 31 @@ -487242,7 +487242,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 @@ -487287,9 +487287,9 @@ sub_80FFFC0: @ 80FFFC0 negs r2, r2 adds r1, r2, 0 cmp r0, 0x1 - bne _08100028 + bne @08100028 movs r1, 0x1 -_08100028: +@08100028: strh r1, [r5, 0x12] movs r3, 0x12 ldrsh r0, [r5, r3] @@ -487313,10 +487313,10 @@ _08100028: lsrs r0, 24 strh r0, [r5, 0xC] cmp r0, 0x40 - bne _08100060 + bne @08100060 adds r0, r6, 0 bl move_anim_task_del -_08100060: +@08100060: ldr r4, =0x02020630 movs r0, 0xC ldrsh r1, [r5, r0] @@ -487409,7 +487409,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 @@ -487428,35 +487428,35 @@ sub_8100128: @ 8100128 movs r1, 0x8 ldrsh r5, [r6, r1] cmp r5, 0x7 - bne _08100150 - b _08100380 -_08100150: + bne @08100150 + b @08100380 +@08100150: cmp r5, 0x7 - bgt _0810019E + bgt @0810019E cmp r5, 0x3 - bne _0810015A - b _08100272 -_0810015A: + bne @0810015A + b @08100272 +@0810015A: cmp r5, 0x3 - bgt _08100174 + bgt @08100174 cmp r5, 0x1 - beq _08100204 + beq @08100204 cmp r5, 0x1 - bgt _08100254 + bgt @08100254 cmp r5, 0 - beq _081001E6 - b _081004FC + beq @081001E6 + b @081004FC .align 2, 0 .pool -_08100174: +@08100174: cmp r5, 0x5 - bne _0810017A - b _081002E8 -_0810017A: + bne @0810017A + b @081002E8 +@0810017A: cmp r5, 0x5 - ble _08100180 - b _08100362 -_08100180: + ble @08100180 + b @08100362 +@08100180: adds r0, r6, 0 adds r1, r2, 0 bl sub_8100524 @@ -487464,28 +487464,28 @@ _08100180: bl sub_80A6900 lsls r0, 24 cmp r0, 0 - bne _08100196 - b _081004FC -_08100196: + bne @08100196 + b @081004FC +@08100196: movs r0, 0x5 strh r0, [r6, 0x26] movs r0, 0xFF - b _081004FA -_0810019E: + b @081004FA +@0810019E: cmp r5, 0xB - bne _081001A4 - b _08100464 -_081001A4: + bne @081001A4 + b @08100464 +@081001A4: cmp r5, 0xB - bgt _081001D2 + bgt @081001D2 cmp r5, 0x9 - bne _081001AE - b _081003D2 -_081001AE: + bne @081001AE + b @081003D2 +@081001AE: cmp r5, 0x9 - ble _081001B4 - b _08100448 -_081001B4: + ble @081001B4 + b @08100448 +@081001B4: adds r0, r6, 0 adds r1, r2, 0 bl sub_8100524 @@ -487493,28 +487493,28 @@ _081001B4: bl sub_80A6900 lsls r0, 24 cmp r0, 0 - bne _081001CA - b _081004FC -_081001CA: + bne @081001CA + b @081004FC +@081001CA: movs r0, 0x9 strh r0, [r6, 0x26] movs r0, 0xFF - b _081004FA -_081001D2: + b @081004FA +@081001D2: cmp r5, 0xD - bne _081001D8 - b _081004D6 -_081001D8: + bne @081001D8 + b @081004D6 +@081001D8: cmp r5, 0xD - bge _081001DE - b _081004B6 -_081001DE: + bge @081001DE + b @081004B6 +@081001DE: cmp r5, 0xFF - bne _081001E4 - b _081004E6 -_081001E4: - b _081004FC -_081001E6: + bne @081001E4 + b @081004E6 +@081001E4: + b @081004FC +@081001E6: adds r0, r6, 0 adds r1, r2, 0 bl sub_8100524 @@ -487522,14 +487522,14 @@ _081001E6: bl sub_80A6900 lsls r0, 24 cmp r0, 0 - bne _081001FC - b _081004FC -_081001FC: + bne @081001FC + b @081004FC +@081001FC: movs r0, 0x1 strh r0, [r6, 0x26] movs r0, 0xFF - b _081004FA -_08100204: + b @081004FA +@08100204: ldrh r2, [r4, 0x24] ldrh r3, [r4, 0x20] adds r2, r3 @@ -487566,8 +487566,8 @@ _08100204: bl sub_80A68D4 ldrh r0, [r6, 0x8] adds r0, 0x1 - b _081004FA -_08100254: + b @081004FA +@08100254: adds r0, r6, 0 adds r1, r2, 0 bl sub_8100524 @@ -487575,14 +487575,14 @@ _08100254: bl sub_80A6900 lsls r0, 24 cmp r0, 0 - bne _0810026A - b _081004FC -_0810026A: + bne @0810026A + b @081004FC +@0810026A: movs r0, 0x3 strh r0, [r6, 0x26] movs r0, 0xFF - b _081004FA -_08100272: + b @081004FA +@08100272: ldrh r1, [r4, 0x24] ldrh r0, [r4, 0x20] adds r1, r0 @@ -487638,8 +487638,8 @@ _08100272: bl sub_80A68D4 ldrh r0, [r6, 0x8] adds r0, 0x1 - b _081004FA -_081002E8: + b @081004FA +@081002E8: ldrh r1, [r4, 0x24] ldrh r3, [r4, 0x20] adds r1, r3 @@ -487697,8 +487697,8 @@ _081002E8: bl sub_80A68D4 ldrh r0, [r6, 0x8] adds r0, 0x1 - b _081004FA -_08100362: + b @081004FA +@08100362: adds r0, r6, 0 adds r1, r2, 0 bl sub_8100524 @@ -487706,14 +487706,14 @@ _08100362: bl sub_80A6900 lsls r0, 24 cmp r0, 0 - bne _08100378 - b _081004FC -_08100378: + bne @08100378 + b @081004FC +@08100378: movs r0, 0x7 strh r0, [r6, 0x26] movs r0, 0xFF - b _081004FA -_08100380: + b @081004FA +@08100380: ldrh r2, [r4, 0x24] ldrh r3, [r4, 0x20] adds r2, r3 @@ -487751,8 +487751,8 @@ _08100380: bl sub_80A68D4 ldrh r0, [r6, 0x8] adds r0, 0x1 - b _081004FA -_081003D2: + b @081004FA +@081003D2: ldrh r1, [r4, 0x24] ldrh r0, [r4, 0x20] adds r1, r0 @@ -487808,8 +487808,8 @@ _081003D2: bl sub_80A68D4 ldrh r0, [r6, 0x8] adds r0, 0x1 - b _081004FA -_08100448: + b @081004FA +@08100448: adds r0, r6, 0 adds r1, r2, 0 bl sub_8100524 @@ -487817,12 +487817,12 @@ _08100448: bl sub_80A6900 lsls r0, 24 cmp r0, 0 - beq _081004FC + beq @081004FC movs r0, 0xB strh r0, [r6, 0x26] movs r0, 0xFF - b _081004FA -_08100464: + b @081004FA +@08100464: ldrh r2, [r4, 0x24] ldrh r0, [r4, 0x20] adds r2, r0 @@ -487860,8 +487860,8 @@ _08100464: bl sub_80A68D4 ldrh r0, [r6, 0x8] adds r0, 0x1 - b _081004FA -_081004B6: + b @081004FA +@081004B6: adds r0, r6, 0 adds r1, r2, 0 bl sub_8100524 @@ -487869,41 +487869,41 @@ _081004B6: bl sub_80A6900 lsls r0, 24 cmp r0, 0 - beq _081004FC + beq @081004FC adds r0, r4, 0 bl obj_delete_and_free_tiles ldrh r0, [r6, 0x8] adds r0, 0x1 - b _081004FA -_081004D6: + b @081004FA +@081004D6: movs r1, 0x20 ldrsh r0, [r6, r1] cmp r0, 0 - bne _081004FC + bne @081004FC adds r0, r2, 0 bl move_anim_task_del - b _081004FC -_081004E6: + b @081004FC +@081004E6: ldrh r0, [r6, 0xA] adds r0, 0x1 strh r0, [r6, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - ble _081004FC + ble @081004FC movs r0, 0 strh r0, [r6, 0xA] ldrh r0, [r6, 0x26] -_081004FA: +@081004FA: strh r0, [r6, 0x8] -_081004FC: +@081004FC: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_8100128 thumb_func_start sub_8100504 -sub_8100504: @ 8100504 +sub_8100504: ; 8100504 push {lr} movs r2, 0x8 movs r3, 0x36 @@ -487911,11 +487911,11 @@ sub_8100504: @ 8100504 movs r3, 0x22 ldrsh r0, [r0, r3] cmp r1, r0 - bge _0810051A + bge @0810051A negs r0, r2 lsls r0, 16 lsrs r2, r0, 16 -_0810051A: +@0810051A: lsls r0, r2, 16 asrs r0, 16 pop {r1} @@ -487923,7 +487923,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} @@ -487935,7 +487935,7 @@ sub_8100524: @ 8100524 strh r0, [r6, 0x24] lsls r0, 16 cmp r0, 0 - ble _081005BA + ble @081005BA movs r0, 0 strh r0, [r6, 0x24] ldr r0, =0x02020630 @@ -487962,7 +487962,7 @@ sub_8100524: @ 8100524 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _081005BA + beq @081005BA lsls r5, r0, 4 adds r5, r0 lsls r5, 2 @@ -487997,7 +487997,7 @@ sub_8100524: @ 8100524 adds r5, r0 ldr r0, =sub_81005D4 + 1 str r0, [r5] -_081005BA: +@081005BA: pop {r3} mov r8, r3 pop {r4-r7} @@ -488008,7 +488008,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] @@ -488017,7 +488017,7 @@ sub_81005D4: @ 81005D4 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _08100636 + ble @08100636 movs r0, 0 strh r0, [r4, 0x2E] adds r3, r4, 0 @@ -488039,7 +488039,7 @@ sub_81005D4: @ 81005D4 lsls r0, 16 asrs r0, 16 cmp r0, 0x8 - ble _08100636 + ble @08100636 ldr r3, =0x03005e00 movs r0, 0x3C ldrsh r1, [r4, r0] @@ -488057,7 +488057,7 @@ sub_81005D4: @ 81005D4 strh r0, [r1] adds r0, r4, 0 bl obj_delete_and_free_tiles -_08100636: +@08100636: pop {r4} pop {r0} bx r0 @@ -488066,37 +488066,37 @@ _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 movs r1, 0xC ldrsh r0, [r0, r1] cmp r0, 0 - bne _0810065C + bne @0810065C ldr r0, =0x02038436 - b _0810065E + b @0810065E .align 2, 0 .pool -_0810065C: +@0810065C: ldr r0, =0x02038437 -_0810065E: +@0810065E: ldrb r6, [r0] adds r0, r6, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08100688 + beq @08100688 movs r0, 0 strh r0, [r4, 0x36] ldr r1, =0x0203841e ldrh r0, [r1, 0x6] strh r0, [r4, 0x32] ldr r0, =0x0000fff0 - b _08100698 + b @08100698 .align 2, 0 .pool -_08100688: +@08100688: movs r0, 0x1 strh r0, [r4, 0x36] ldr r1, =0x0203841e @@ -488105,7 +488105,7 @@ _08100688: strh r0, [r4, 0x32] movs r0, 0x80 lsls r0, 1 -_08100698: +@08100698: strh r0, [r4, 0x20] adds r7, r1, 0 adds r5, r7, 0 @@ -488118,28 +488118,28 @@ _08100698: movs r1, 0xA ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _081006CE + beq @081006CE cmp r0, 0x1 - bgt _081006C0 + bgt @081006C0 cmp r0, 0 - beq _081006CA - b _08100738 + beq @081006CA + b @08100738 .align 2, 0 .pool -_081006C0: +@081006C0: cmp r0, 0x2 - beq _081006D4 + beq @081006D4 cmp r0, 0x3 - beq _08100700 - b _08100738 -_081006CA: + beq @08100700 + b @08100738 +@081006CA: ldrh r0, [r5] - b _081006E4 -_081006CE: + b @081006E4 +@081006CE: ldrh r0, [r5] strh r0, [r4, 0x22] - b _0810071A -_081006D4: + b @0810071A +@081006D4: adds r0, r6, 0 movs r1, 0x3 bl sub_80A5C6C @@ -488147,7 +488147,7 @@ _081006D4: lsrs r0, 24 ldrh r5, [r5] adds r0, r5 -_081006E4: +@081006E4: strh r0, [r4, 0x22] adds r0, r6, 0 bl sub_80A8328 @@ -488160,8 +488160,8 @@ _081006E4: ands r0, r2 orrs r0, r1 strb r0, [r4, 0x5] - b _08100738 -_08100700: + b @08100738 +@08100700: ldr r0, =0x02038437 ldrb r0, [r0] movs r1, 0x3 @@ -488173,7 +488173,7 @@ _08100700: strh r0, [r4, 0x22] movs r0, 0x1 bl obj_id_for_side_relative_to_move -_0810071A: +@0810071A: adds r0, r6, 0 bl sub_80A8328 lsls r0, 24 @@ -488188,7 +488188,7 @@ _0810071A: ands r1, r2 orrs r1, r0 strb r1, [r4, 0x5] -_08100738: +@08100738: ldr r0, =sub_810074C + 1 str r0, [r4, 0x1C] pop {r4-r7} @@ -488199,7 +488199,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 @@ -488232,18 +488232,18 @@ sub_810074C: @ 810074C movs r1, 0x36 ldrsh r0, [r4, r1] cmp r0, 0 - bne _081007A4 + bne @081007A4 movs r2, 0x24 ldrsh r0, [r4, r2] movs r5, 0x20 ldrsh r1, [r4, r5] adds r0, r1 cmp r0, 0xF7 - ble _081007BC - b _081007B6 + ble @081007BC + b @081007B6 .align 2, 0 .pool -_081007A4: +@081007A4: movs r1, 0x24 ldrsh r0, [r4, r1] movs r2, 0x20 @@ -488252,18 +488252,18 @@ _081007A4: movs r1, 0x10 negs r1, r1 cmp r0, r1 - bgt _081007BC -_081007B6: + bgt @081007BC +@081007B6: adds r0, r4, 0 bl move_anim_8074EE0 -_081007BC: +@081007BC: pop {r4,r5} pop {r0} bx r0 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 @@ -488275,13 +488275,13 @@ sub_81007C4: @ 81007C4 movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0 - beq _081007E8 + beq @081007E8 cmp r0, 0x1 - beq _0810081C - b _08100876 + beq @0810081C + b @08100876 .align 2, 0 .pool -_081007E8: +@081007E8: ldr r0, =0x0000274f bl gpu_pal_tags_index_of lsls r0, 24 @@ -488300,17 +488300,17 @@ _081007E8: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] - b _08100876 + b @08100876 .align 2, 0 .pool -_0810081C: +@0810081C: ldrh r0, [r5, 0x1A] adds r0, 0x1 movs r7, 0 strh r0, [r5, 0x1A] lsls r0, 16 cmp r0, 0 - blt _08100876 + blt @08100876 strh r7, [r5, 0x1A] ldrh r0, [r5, 0x18] ldrb r2, [r5, 0x1C] @@ -488337,7 +488337,7 @@ _0810081C: lsls r0, 16 asrs r0, 16 cmp r0, 0x11 - bne _08100876 + bne @08100876 strh r7, [r5, 0x1C] ldrh r0, [r5, 0x1E] adds r0, 0x1 @@ -488345,19 +488345,19 @@ _0810081C: lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - bne _08100876 + bne @08100876 strh r7, [r5, 0x1E] -_08100876: +@08100876: ldr r0, =0x0203841e movs r2, 0xE ldrsh r1, [r0, r2] movs r0, 0x1 negs r0, r0 cmp r1, r0 - bne _0810088A + bne @0810088A adds r0, r6, 0 bl move_anim_task_del -_0810088A: +@0810088A: pop {r4-r7} pop {r0} bx r0 @@ -488366,7 +488366,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 @@ -488374,24 +488374,24 @@ sub_8100898: @ 8100898 movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0 - bne _081008B4 + bne @081008B4 adds r0, r6, 0 bl move_anim_8072740 - b _0810098E + b @0810098E .align 2, 0 .pool -_081008B4: +@081008B4: movs r3, 0 ldrsh r0, [r1, r3] cmp r0, 0 - bne _081008C4 + bne @081008C4 ldr r4, =0x02038436 - b _081008C6 + b @081008C6 .align 2, 0 .pool -_081008C4: +@081008C4: ldr r4, =0x02038437 -_081008C6: +@081008C6: ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -488409,7 +488409,7 @@ _081008C6: ldrsh r1, [r0, r3] adds r7, r0, 0 cmp r1, 0 - bne _08100908 + bne @08100908 ldrh r0, [r7, 0x4] adds r0, r5 strh r0, [r6, 0x20] @@ -488418,10 +488418,10 @@ _081008C6: strh r0, [r6, 0x22] strh r5, [r6, 0x38] strh r2, [r6, 0x3A] - b _08100918 + b @08100918 .align 2, 0 .pool -_08100908: +@08100908: strh r5, [r6, 0x20] strh r2, [r6, 0x22] ldrh r0, [r7, 0x4] @@ -488430,7 +488430,7 @@ _08100908: ldrh r0, [r7, 0x6] adds r0, r2 strh r0, [r6, 0x3A] -_08100918: +@08100918: ldrh r4, [r6, 0x20] lsls r0, r4, 4 strh r0, [r6, 0x30] @@ -488471,12 +488471,12 @@ _08100918: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _0810097A + beq @0810097A ldr r1, =0xffff8000 adds r0, r4, r1 lsls r0, 16 lsrs r4, r0, 16 -_0810097A: +@0810097A: movs r3, 0x80 lsls r3, 1 str r4, [sp] @@ -488486,7 +488486,7 @@ _0810097A: bl sub_80A73E0 ldr r0, =sub_81009A0 + 1 str r0, [r6, 0x1C] -_0810098E: +@0810098E: add sp, 0x4 pop {r4-r7} pop {r0} @@ -488496,14 +488496,14 @@ _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] movs r1, 0x2E ldrsh r0, [r2, r1] cmp r0, 0 - beq _081009D0 + beq @081009D0 ldrh r0, [r2, 0x34] ldrh r4, [r2, 0x30] adds r0, r4 @@ -488520,18 +488520,18 @@ sub_81009A0: @ 81009A0 strh r1, [r2, 0x22] subs r0, r3, 0x1 strh r0, [r2, 0x2E] - b _081009D6 -_081009D0: + b @081009D6 +@081009D0: adds r0, r2, 0 bl move_anim_8074EE0 -_081009D6: +@081009D6: pop {r4} pop {r0} bx r0 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 @@ -488539,16 +488539,16 @@ sub_81009DC: @ 81009DC movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _081009F2 + beq @081009F2 adds r0, r2, 0 bl move_anim_8072740 -_081009F2: +@081009F2: pop {r0} bx r0 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 @@ -488556,24 +488556,24 @@ sub_81009F8: @ 81009F8 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08100A20 + beq @08100A20 ldr r2, =0x0203841e ldrh r0, [r4, 0x20] ldrh r1, [r2] subs r0, r1 strh r0, [r4, 0x20] ldrh r0, [r2, 0x2] - b _08100A2C + b @08100A2C .align 2, 0 .pool -_08100A20: +@08100A20: ldr r0, =0x0203841e ldrh r1, [r0] ldrh r2, [r4, 0x20] adds r1, r2 strh r1, [r4, 0x20] ldrh r0, [r0, 0x2] -_08100A2C: +@08100A2C: ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] @@ -488590,7 +488590,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 @@ -488598,11 +488598,11 @@ sub_8100A50: @ 8100A50 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08100A6A + bne @08100A6A adds r0, r5, 0 movs r1, 0x1 bl obj_anim_image_start -_08100A6A: +@08100A6A: ldr r0, =sub_81009DC + 1 str r0, [r5, 0x1C] ldr r4, =0x0203841e @@ -488622,7 +488622,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 @@ -488658,7 +488658,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 @@ -488678,11 +488678,11 @@ sub_8100AE0: @ 8100AE0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08100B14 + bne @08100B14 ldrh r0, [r5, 0x22] adds r0, 0x8 strh r0, [r5, 0x22] -_08100B14: +@08100B14: ldr r0, =sub_8100CCC + 1 str r0, [r5, 0x1C] ldr r0, =0x0203841e @@ -488690,15 +488690,15 @@ _08100B14: ldrsh r1, [r0, r2] adds r3, r0, 0 cmp r1, 0 - bne _08100B3C + bne @08100B3C ldrh r0, [r3] ldrh r1, [r5, 0x20] adds r0, r1 strh r0, [r5, 0x20] - b _08100B50 + b @08100B50 .align 2, 0 .pool -_08100B3C: +@08100B3C: ldrh r0, [r5, 0x20] ldrh r1, [r3] subs r0, r1 @@ -488709,7 +488709,7 @@ _08100B3C: movs r1, 0x1 orrs r0, r1 strb r0, [r2] -_08100B50: +@08100B50: ldrh r0, [r3, 0x2] ldrh r2, [r5, 0x22] adds r0, r2 @@ -488730,10 +488730,10 @@ _08100B50: lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - bne _08100B7E + bne @08100B7E negs r0, r1 strh r0, [r5, 0x30] -_08100B7E: +@08100B7E: pop {r4,r5} pop {r0} bx r0 @@ -488742,7 +488742,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} @@ -488751,15 +488751,15 @@ sub_8100B88: @ 8100B88 movs r1, 0x6 ldrsh r0, [r0, r1] cmp r0, 0x1 - beq _08100BA8 + beq @08100BA8 cmp r0, 0x1 - ble _08100C24 + ble @08100C24 cmp r0, 0x2 - beq _08100BC8 - b _08100C24 + beq @08100BC8 + b @08100C24 .align 2, 0 .pool -_08100BA8: +@08100BA8: ldr r5, =0x02038437 ldrb r0, [r5] movs r4, 0x2 @@ -488771,10 +488771,10 @@ _08100BA8: ldrb r0, [r5] eors r4, r0 adds r0, r4, 0 - b _08100C34 + b @08100C34 .align 2, 0 .pool -_08100BC8: +@08100BC8: ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0 @@ -488794,7 +488794,7 @@ _08100BC8: bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _08100C3E + beq @08100C3E ldrb r0, [r5] mov r2, r8 eors r0, r2 @@ -488813,10 +488813,10 @@ _08100BC8: lsrs r0, 24 adds r0, r4 lsrs r4, r0, 1 - b _08100C3E + b @08100C3E .align 2, 0 .pool -_08100C24: +@08100C24: ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0 @@ -488824,12 +488824,12 @@ _08100C24: lsls r0, 24 lsrs r7, r0, 24 ldrb r0, [r4] -_08100C34: +@08100C34: movs r1, 0x1 bl sub_80A5C6C lsls r0, 24 lsrs r4, r0, 24 -_08100C3E: +@08100C3E: strh r7, [r6, 0x20] strh r4, [r6, 0x22] ldr r0, =0x02038437 @@ -488837,11 +488837,11 @@ _08100C3E: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08100C56 + bne @08100C56 ldrh r0, [r6, 0x22] adds r0, 0x8 strh r0, [r6, 0x22] -_08100C56: +@08100C56: ldr r0, =sub_8100CCC + 1 str r0, [r6, 0x1C] ldr r0, =0x0203841e @@ -488849,15 +488849,15 @@ _08100C56: ldrsh r1, [r0, r2] adds r3, r0, 0 cmp r1, 0 - bne _08100C7C + bne @08100C7C ldrh r0, [r3] ldrh r1, [r6, 0x20] adds r0, r1 strh r0, [r6, 0x20] - b _08100C90 + b @08100C90 .align 2, 0 .pool -_08100C7C: +@08100C7C: ldrh r0, [r6, 0x20] ldrh r1, [r3] subs r0, r1 @@ -488868,7 +488868,7 @@ _08100C7C: movs r1, 0x1 orrs r0, r1 strb r0, [r2] -_08100C90: +@08100C90: ldrh r0, [r3, 0x2] ldrh r2, [r6, 0x22] adds r0, r2 @@ -488889,10 +488889,10 @@ _08100C90: lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - bne _08100CBE + bne @08100CBE negs r0, r1 strh r0, [r6, 0x30] -_08100CBE: +@08100CBE: pop {r3} mov r8, r3 pop {r4-r7} @@ -488903,7 +488903,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] @@ -488917,14 +488917,14 @@ sub_8100CCC: @ 8100CCC movs r2, 0x38 ldrsh r0, [r4, r2] cmp r0, 0 - bne _08100CEE + bne @08100CEE adds r0, r1, 0 adds r0, 0x18 - b _08100CF2 -_08100CEE: + b @08100CF2 +@08100CEE: adds r0, r1, 0 subs r0, 0x18 -_08100CF2: +@08100CF2: strh r0, [r4, 0x30] ldrh r0, [r4, 0x32] subs r0, 0x18 @@ -488943,7 +488943,7 @@ _08100CF2: lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - bne _08100D28 + bne @08100D28 ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 @@ -488951,7 +488951,7 @@ _08100CF2: strh r0, [r4, 0x2E] ldr r0, =sub_80A64B0 + 1 str r0, [r4, 0x1C] -_08100D28: +@08100D28: pop {r4} pop {r0} bx r0 @@ -488960,19 +488960,19 @@ _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] movs r2, 0x32 ldrsh r0, [r5, r2] cmp r0, 0x1 - ble _08100DDC + ble @08100DDC ldrh r1, [r5, 0x34] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08100D94 + beq @08100D94 adds r3, r5, 0 adds r3, 0x3E ldrb r1, [r3] @@ -489003,10 +489003,10 @@ sub_8100D38: @ 8100D38 ldrb r1, [r0] ands r2, r1 strb r2, [r0] - b _08100DCA + b @08100DCA .align 2, 0 .pool -_08100D94: +@08100D94: adds r1, r5, 0 adds r1, 0x3E ldrb r0, [r1] @@ -489034,23 +489034,23 @@ _08100D94: ldrb r1, [r0] orrs r1, r2 strb r1, [r0] -_08100DCA: +@08100DCA: movs r0, 0 strh r0, [r5, 0x32] ldrh r0, [r5, 0x34] adds r0, 0x1 strh r0, [r5, 0x34] - b _08100DE0 + b @08100DE0 .align 2, 0 .pool -_08100DDC: +@08100DDC: adds r0, r1, 0x1 strh r0, [r5, 0x32] -_08100DE0: +@08100DE0: movs r1, 0x34 ldrsh r0, [r5, r1] cmp r0, 0xA - bne _08100E10 + bne @08100E10 movs r2, 0x2E ldrsh r1, [r5, r2] lsls r0, r1, 4 @@ -489068,7 +489068,7 @@ _08100DE0: bl obj_delete_and_free_tiles adds r0, r5, 0 bl move_anim_8072740 -_08100E10: +@08100E10: pop {r4,r5} pop {r0} bx r0 @@ -489077,7 +489077,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 @@ -489088,18 +489088,18 @@ sub_8100E1C: @ 8100E1C bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08100E44 + beq @08100E44 ldrh r0, [r5, 0x20] ldrh r1, [r4] subs r0, r1 - b _08100E4A + b @08100E4A .align 2, 0 .pool -_08100E44: +@08100E44: ldrh r0, [r4] ldrh r1, [r5, 0x20] adds r0, r1 -_08100E4A: +@08100E4A: strh r0, [r5, 0x20] ldr r4, =0x0203841e ldrb r1, [r4, 0xA] @@ -489126,7 +489126,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 @@ -489142,16 +489142,16 @@ sub_8100E80: @ 8100E80 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0x7F - bgt _08100EAC + bgt @08100EAC adds r1, r4, 0 adds r1, 0x43 movs r0, 0 - b _08100EB2 -_08100EAC: + b @08100EB2 +@08100EAC: adds r1, r4, 0 adds r1, 0x43 movs r0, 0xE -_08100EB2: +@08100EB2: strb r0, [r1] ldrh r0, [r4, 0x30] ldrh r2, [r4, 0x2E] @@ -489175,28 +489175,28 @@ _08100EB2: movs r2, 0x34 ldrsh r1, [r4, r2] cmp r0, r1 - bne _08100EE8 + bne @08100EE8 adds r0, r4, 0 bl move_anim_8072740 -_08100EE8: +@08100EE8: pop {r4} pop {r0} bx r0 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 lsls r0, 24 cmp r0, 0 - beq _08100F06 + beq @08100F06 ldr r1, =0x0203841e ldrh r0, [r1, 0x2] adds r0, 0x8 strh r0, [r1, 0x2] -_08100F06: +@08100F06: ldr r6, =0x02038436 ldrb r0, [r6] movs r1, 0 @@ -489219,12 +489219,12 @@ _08100F06: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08100F44 + beq @08100F44 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _08100F6C -_08100F44: + beq @08100F6C +@08100F44: ldrb r0, [r6] bl sub_80A8328 lsls r0, 24 @@ -489239,10 +489239,10 @@ _08100F44: ands r1, r2 orrs r1, r0 strb r1, [r5, 0x5] - b _08100F84 + b @08100F84 .align 2, 0 .pool -_08100F6C: +@08100F6C: ldrb r0, [r6] bl sub_80A8328 movs r1, 0x3 @@ -489254,7 +489254,7 @@ _08100F6C: ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] -_08100F84: +@08100F84: ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r5, 0x2E] @@ -489291,7 +489291,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] @@ -489307,7 +489307,7 @@ sub_8100FD4: @ 8100FD4 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _08101032 + ble @08101032 movs r0, 0 strh r0, [r4, 0x30] ldr r1, =0x02037b14 @@ -489320,7 +489320,7 @@ sub_8100FD4: @ 8100FD4 movs r2, 0 adds r6, r1, 0 adds r3, r6, 0 -_0810100C: +@0810100C: movs r1, 0x32 ldrsh r0, [r4, r1] adds r2, 0x1 @@ -489333,30 +489333,30 @@ _0810100C: ldrh r0, [r0] strh r0, [r1] cmp r2, 0x5 - ble _0810100C + ble @0810100C movs r2, 0x32 ldrsh r0, [r4, r2] adds r0, 0x7 lsls r0, 1 adds r0, r6 strh r5, [r0] -_08101032: +@08101032: ldrh r2, [r4, 0x3C] movs r1, 0x3C ldrsh r0, [r4, r1] cmp r0, 0x6 - ble _0810106C + ble @0810106C movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - ble _08101080 + ble @08101080 ldrh r0, [r4, 0x3A] adds r0, 0x1 strh r0, [r4, 0x3A] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0810106C + ble @0810106C movs r0, 0 strh r0, [r4, 0x3A] subs r2, 0x1 @@ -489369,25 +489369,25 @@ _08101032: lsrs r1, 16 movs r0, 0x52 bl lcd_io_set -_0810106C: +@0810106C: ldrh r1, [r4, 0x2E] movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0 - ble _08101080 + ble @08101080 subs r0, r1, 0x1 strh r0, [r4, 0x2E] - b _081010C2 + b @081010C2 .align 2, 0 .pool -_08101080: +@08101080: ldrh r0, [r4, 0x3A] adds r0, 0x1 strh r0, [r4, 0x3A] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _081010C2 + ble @081010C2 movs r0, 0 strh r0, [r4, 0x3A] ldrh r2, [r4, 0x3C] @@ -489404,7 +489404,7 @@ _08101080: movs r1, 0x3C ldrsh r0, [r4, r1] cmp r0, 0x10 - bne _081010C2 + bne @081010C2 adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -489413,7 +489413,7 @@ _08101080: strb r0, [r2] ldr r0, =sub_80A67F4 + 1 str r0, [r4, 0x1C] -_081010C2: +@081010C2: pop {r4-r6} pop {r0} bx r0 @@ -489422,7 +489422,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 @@ -489471,38 +489471,38 @@ 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 ldrsh r0, [r4, r1] cmp r0, 0x4 - bls _08101146 - b _08101290 -_08101146: + bls @08101146 + b @08101290 +@08101146: lsls r0, 2 - ldr r1, =_08101154 + ldr r1, =@08101154 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08101154: - .4byte _08101168 - .4byte _081011CC - .4byte _081011E8 - .4byte _08101266 - .4byte _0810127A -_08101168: +@08101154: + .4byte @08101168 + .4byte @081011CC + .4byte @081011E8 + .4byte @08101266 + .4byte @0810127A +@08101168: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] lsls r0, 16 cmp r0, 0 - bgt _08101176 - b _08101290 -_08101176: + bgt @08101176 + b @08101290 +@08101176: movs r0, 0 strh r0, [r4, 0x32] ldrh r0, [r4, 0x30] @@ -489511,24 +489511,24 @@ _08101176: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08101198 + beq @08101198 ldrh r1, [r4, 0x3A] movs r2, 0x3A ldrsh r0, [r4, r2] cmp r0, 0xF - bgt _081011A6 + bgt @081011A6 adds r0, r1, 0x1 strh r0, [r4, 0x3A] - b _081011A6 -_08101198: + b @081011A6 +@08101198: ldrh r1, [r4, 0x3C] movs r2, 0x3C ldrsh r0, [r4, r2] cmp r0, 0 - ble _081011A6 + ble @081011A6 subs r0, r1, 0x1 strh r0, [r4, 0x3C] -_081011A6: +@081011A6: ldrh r1, [r4, 0x3C] lsls r1, 8 ldrh r0, [r4, 0x3A] @@ -489540,28 +489540,28 @@ _081011A6: movs r1, 0x3A ldrsh r0, [r4, r1] cmp r0, 0x10 - bne _08101290 + bne @08101290 movs r2, 0x3C ldrsh r0, [r4, r2] cmp r0, 0 - bne _08101290 + bne @08101290 strh r0, [r4, 0x30] - b _08101272 -_081011CC: + b @08101272 +@081011CC: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x8 - ble _08101290 + ble @08101290 movs r0, 0 strh r0, [r4, 0x30] adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 - b _08101272 -_081011E8: + b @08101272 +@081011E8: adds r0, r4, 0 movs r1, 0x10 movs r2, 0x4 @@ -489572,41 +489572,41 @@ _081011E8: lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - ble _0810120A + ble @0810120A movs r0, 0 strh r0, [r4, 0x30] ldrh r0, [r4, 0x22] adds r0, 0x1 strh r0, [r4, 0x22] -_0810120A: +@0810120A: ldrh r0, [r4, 0x32] adds r1, r0, 0x1 strh r1, [r4, 0x32] lsls r0, r1, 16 asrs r0, 16 cmp r0, 0x1D - ble _08101290 + ble @08101290 movs r0, 0x1 ands r1, r0 cmp r1, 0 - beq _08101230 + beq @08101230 ldrh r1, [r4, 0x3A] movs r2, 0x3A ldrsh r0, [r4, r2] cmp r0, 0 - ble _0810123E + ble @0810123E subs r0, r1, 0x1 strh r0, [r4, 0x3A] - b _0810123E -_08101230: + b @0810123E +@08101230: ldrh r1, [r4, 0x3C] movs r2, 0x3C ldrsh r0, [r4, r2] cmp r0, 0xF - bgt _0810123E + bgt @0810123E adds r0, r1, 0x1 strh r0, [r4, 0x3C] -_0810123E: +@0810123E: ldrh r1, [r4, 0x3C] lsls r1, 8 ldrh r0, [r4, 0x3A] @@ -489618,27 +489618,27 @@ _0810123E: movs r0, 0x3A ldrsh r1, [r4, r0] cmp r1, 0 - bne _08101290 + bne @08101290 movs r2, 0x3C ldrsh r0, [r4, r2] cmp r0, 0x10 - bne _08101290 + bne @08101290 strh r1, [r4, 0x30] strh r1, [r4, 0x32] - b _08101272 -_08101266: + b @08101272 +@08101266: adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 strb r0, [r2] -_08101272: +@08101272: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _08101290 -_0810127A: + b @08101290 +@0810127A: movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -489647,24 +489647,24 @@ _0810127A: bl lcd_io_set adds r0, r4, 0 bl move_anim_8072740 -_08101290: +@08101290: pop {r4} pop {r0} bx r0 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 ldrsh r0, [r4, r1] cmp r0, 0xB - bgt _081012AA + bgt @081012AA ldrh r0, [r4, 0x36] adds r0, 0x2 strh r0, [r4, 0x36] -_081012AA: +@081012AA: ldrh r5, [r4, 0x34] adds r0, r5, 0 subs r0, 0x12 @@ -489672,19 +489672,19 @@ _081012AA: lsrs r0, 16 adds r1, r5, 0 cmp r0, 0x17 - bhi _081012C0 + bhi @081012C0 ldrh r0, [r4, 0x36] subs r0, 0x2 strh r0, [r4, 0x36] -_081012C0: +@081012C0: lsls r0, r1, 16 asrs r0, 16 cmp r0, 0x2F - ble _081012CE + ble @081012CE ldrh r0, [r4, 0x36] adds r0, 0x2 strh r0, [r4, 0x36] -_081012CE: +@081012CE: movs r1, 0x36 ldrsh r0, [r4, r1] movs r1, 0x9 @@ -489697,38 +489697,38 @@ _081012CE: strh r0, [r4, 0x26] lsls r0, 16 cmp r0, 0 - bge _081012F4 + bge @081012F4 movs r1, 0x26 ldrsh r0, [r4, r1] negs r0, r0 strh r0, [r4, 0x26] -_081012F4: +@081012F4: adds r0, r5, 0x1 strh r0, [r4, 0x34] lsls r0, 16 asrs r0, 16 cmp r0, 0x3B - ble _08101304 + ble @08101304 movs r0, 0 strh r0, [r4, 0x34] -_08101304: +@08101304: pop {r4,r5} pop {r0} bx r0 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 movs r1, 0x4 ldrsh r0, [r5, r1] cmp r0, 0 - bne _08101320 + bne @08101320 adds r0, r4, 0 bl sub_80A6838 -_08101320: +@08101320: movs r0, 0 ldrsh r1, [r5, r0] adds r0, r4, 0 @@ -489756,33 +489756,33 @@ _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 movs r1, 0x4 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08101378 + bne @08101378 ldr r0, =0x02038436 - b _0810137A + b @0810137A .align 2, 0 .pool -_08101378: +@08101378: ldr r0, =0x02038437 -_0810137A: +@0810137A: ldrb r6, [r0] bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _081013C4 + beq @081013C4 movs r1, 0x2 adds r0, r6, 0 eors r0, r1 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _081013C4 + beq @081013C4 ldr r4, =0x0203841e ldrb r1, [r4, 0xC] adds r2, r5, 0 @@ -489799,15 +489799,15 @@ _0810137A: ldrh r1, [r5, 0x22] adds r0, r1 strh r0, [r5, 0x22] - b _08101414 + b @08101414 .align 2, 0 .pool -_081013C4: +@081013C4: ldr r4, =0x0203841e movs r2, 0xC ldrsh r0, [r4, r2] cmp r0, 0 - bne _081013E8 + bne @081013E8 adds r0, r6, 0 movs r1, 0 bl sub_80A5C6C @@ -489816,10 +489816,10 @@ _081013C4: strh r0, [r5, 0x20] adds r0, r6, 0 movs r1, 0x1 - b _081013FA + b @081013FA .align 2, 0 .pool -_081013E8: +@081013E8: adds r0, r6, 0 movs r1, 0x2 bl sub_80A5C6C @@ -489828,7 +489828,7 @@ _081013E8: strh r0, [r5, 0x20] adds r0, r6, 0 movs r1, 0x3 -_081013FA: +@081013FA: bl sub_80A5C6C lsls r0, 24 lsrs r0, 24 @@ -489840,7 +489840,7 @@ _081013FA: ldrsh r1, [r0, r2] adds r0, r5, 0 bl sub_80A6864 -_08101414: +@08101414: ldr r1, =0x0203841e ldrh r0, [r1, 0xA] strh r0, [r5, 0x2E] @@ -489861,7 +489861,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 @@ -489870,7 +489870,7 @@ sub_8101440: @ 8101440 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08101474 + bne @08101474 ldr r0, =0x0203841e ldrh r1, [r0] ldrh r2, [r4, 0x20] @@ -489880,10 +489880,10 @@ sub_8101440: @ 8101440 ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] - b _0810148E + b @0810148E .align 2, 0 .pool -_08101474: +@08101474: ldr r2, =0x0203841e ldrh r0, [r4, 0x20] ldrh r1, [r2] @@ -489896,7 +489896,7 @@ _08101474: adds r0, r4, 0 movs r1, 0x1 bl obj_anim_image_start -_0810148E: +@0810148E: ldr r0, =sub_81014A0 + 1 str r0, [r4, 0x1C] pop {r4} @@ -489907,7 +489907,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] @@ -489916,7 +489916,7 @@ sub_81014A0: @ 81014A0 lsls r0, 16 asrs r0, 16 cmp r0, 0x1E - ble _081014D8 + ble @081014D8 movs r0, 0x2E ldrsh r1, [r4, r0] movs r0, 0x1E @@ -489934,24 +489934,24 @@ sub_81014A0: @ 81014A0 ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] -_081014D8: +@081014D8: adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _081014EC + beq @081014EC adds r0, r4, 0 bl move_anim_8072740 -_081014EC: +@081014EC: pop {r4} pop {r0} bx r0 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 @@ -489960,7 +489960,7 @@ sub_81014F4: @ 81014F4 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0810152C + bne @0810152C ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] @@ -489972,10 +489972,10 @@ sub_81014F4: @ 81014F4 strh r0, [r4, 0x22] movs r0, 0x1 strh r0, [r4, 0x34] - b _0810154A + b @0810154A .align 2, 0 .pool -_0810152C: +@0810152C: ldr r2, =0x0203841e ldrh r0, [r4, 0x20] ldrh r1, [r2] @@ -489990,7 +489990,7 @@ _0810152C: adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 -_0810154A: +@0810154A: ldr r0, =sub_8101560 + 1 str r0, [r4, 0x1C] pop {r4} @@ -490001,7 +490001,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 @@ -490030,17 +490030,17 @@ sub_8101560: @ 8101560 lsls r0, 16 asrs r0, 16 cmp r0, 0x3C - ble _081015A4 + ble @081015A4 adds r0, r4, 0 bl move_anim_8074EE0 -_081015A4: +@081015A4: pop {r4} pop {r0} bx r0 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 @@ -490061,7 +490061,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] @@ -490069,21 +490069,21 @@ sub_81015D4: @ 81015D4 adds r0, r1, 0 ands r0, r6 cmp r0, 0 - beq _081015EA + beq @081015EA cmp r0, 0x1 - beq _08101604 - b _0810166A -_081015EA: + beq @08101604 + b @0810166A +@081015EA: strh r1, [r5, 0x2E] ldr r0, =sub_80A64B0 + 1 str r0, [r5, 0x1C] ldr r1, =sub_81015D4 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 - b _0810166A + b @0810166A .align 2, 0 .pool -_08101604: +@08101604: ldrh r3, [r5, 0x24] ldrh r0, [r5, 0x20] adds r3, r0 @@ -490132,7 +490132,7 @@ _08101604: asrs r1, 24 movs r0, 0xD2 bl audio_play_and_stuff -_0810166A: +@0810166A: ldrh r0, [r5, 0x38] movs r1, 0x1 eors r0, r1 @@ -490145,14 +490145,14 @@ _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] lsls r0, 16 asrs r0, 24 cmp r0, 0x4 - bne _081016AC + bne @081016AC movs r0, 0xA strh r0, [r2, 0x2E] ldr r0, =sub_80A64B0 + 1 @@ -490160,13 +490160,13 @@ sub_8101684: @ 8101684 ldr r1, =sub_81016B8 + 1 adds r0, r2, 0 bl oamt_set_x3A_32 - b _081016B0 + b @081016B0 .align 2, 0 .pool -_081016AC: +@081016AC: ldr r0, =sub_81015D4 + 1 str r0, [r2, 0x1C] -_081016B0: +@081016B0: pop {r0} bx r0 .align 2, 0 @@ -490174,12 +490174,12 @@ _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] cmp r1, 0 - bne _081016E0 + bne @081016E0 movs r0, 0x3 strh r0, [r5, 0x2E] strh r1, [r5, 0x30] @@ -490189,44 +490189,44 @@ sub_81016B8: @ 81016B8 ldr r1, =sub_8101774 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 - b _08101760 + b @08101760 .align 2, 0 .pool -_081016E0: +@081016E0: ldrh r0, [r5, 0x6] cmp r0, 0x2 - beq _08101700 + beq @08101700 cmp r0, 0x2 - bgt _081016F0 + bgt @081016F0 cmp r0, 0x1 - beq _081016F6 - b _08101714 -_081016F0: + beq @081016F6 + b @08101714 +@081016F0: cmp r0, 0x3 - beq _08101708 - b _08101714 -_081016F6: + beq @08101708 + b @08101714 +@081016F6: ldr r6, =0x0000fff8 adds r7, r6, 0 - b _08101718 + b @08101718 .align 2, 0 .pool -_08101700: +@08101700: ldr r7, =0x0000fff8 - b _08101716 + b @08101716 .align 2, 0 .pool -_08101708: +@08101708: movs r7, 0x8 ldr r6, =0x0000fff8 - b _08101718 + b @08101718 .align 2, 0 .pool -_08101714: +@08101714: movs r7, 0x8 -_08101716: +@08101716: movs r6, 0x8 -_08101718: +@08101718: ldrh r0, [r5, 0x24] ldrh r1, [r5, 0x20] adds r0, r1 @@ -490260,7 +490260,7 @@ _08101718: ldr r1, =sub_8101820 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 -_08101760: +@08101760: pop {r4-r7} pop {r0} bx r0 @@ -490269,34 +490269,34 @@ _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 movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08101794 + bne @08101794 ldrh r0, [r4, 0x30] adds r0, 0x3 strh r0, [r4, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x10 - ble _081017A4 + ble @081017A4 movs r0, 0x10 - b _081017A2 -_08101794: + b @081017A2 +@08101794: ldrh r0, [r4, 0x30] subs r0, 0x3 strh r0, [r4, 0x30] lsls r0, 16 cmp r0, 0 - bge _081017A4 + bge @081017A4 movs r0, 0 -_081017A2: +@081017A2: strh r0, [r4, 0x30] -_081017A4: +@081017A4: movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -490315,7 +490315,7 @@ _081017A4: movs r3, 0x30 ldrsh r0, [r4, r3] cmp r0, 0x10 - bne _0810180C + bne @0810180C ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] @@ -490337,15 +490337,15 @@ _081017A4: asrs r1, 24 movs r0, 0xC0 bl audio_play_and_stuff - b _08101814 + b @08101814 .align 2, 0 .pool -_0810180C: +@0810180C: cmp r0, 0 - bne _08101814 + bne @08101814 ldr r0, =sub_8101820 + 1 str r0, [r4, 0x1C] -_08101814: +@08101814: add sp, 0xC pop {r4} pop {r0} @@ -490355,20 +490355,20 @@ _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 ldrh r1, [r0, 0xE] ldr r0, =0x0000ffff cmp r1, r0 - bne _08101838 + bne @08101838 movs r0, 0 strh r0, [r2, 0x30] strh r0, [r2, 0x2E] ldr r0, =sub_8101848 + 1 str r0, [r2, 0x1C] -_08101838: +@08101838: pop {r0} bx r0 .align 2, 0 @@ -490376,7 +490376,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 @@ -490385,7 +490385,7 @@ sub_8101848: @ 8101848 bl __modsi3 lsls r0, 16 cmp r0, 0 - bne _0810187C + bne @0810187C ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] @@ -490402,24 +490402,24 @@ sub_8101848: @ 8101848 ands r0, r2 orrs r0, r1 strb r0, [r3] -_0810187C: +@0810187C: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0x8 - bne _08101890 + bne @08101890 adds r0, r4, 0 bl move_anim_8072740 -_08101890: +@08101890: pop {r4} pop {r0} bx r0 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 @@ -490428,19 +490428,19 @@ sub_8101898: @ 8101898 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - bne _081018BC + bne @081018BC ldrh r0, [r3, 0x20] subs r0, 0x18 strh r0, [r3, 0x20] ldrh r0, [r3, 0x22] subs r0, 0x18 strh r0, [r3, 0x22] - b _0810190E + b @0810190E .align 2, 0 .pool -_081018BC: +@081018BC: cmp r0, 0x2 - bne _081018D8 + bne @081018D8 ldrh r0, [r3, 0x20] subs r0, 0x18 strh r0, [r3, 0x20] @@ -490452,10 +490452,10 @@ _081018BC: negs r0, r0 ands r0, r1 movs r1, 0x20 - b _0810190A -_081018D8: + b @0810190A +@081018D8: cmp r0, 0x3 - bne _081018F4 + bne @081018F4 ldrh r0, [r3, 0x20] adds r0, 0x18 strh r0, [r3, 0x20] @@ -490467,8 +490467,8 @@ _081018D8: negs r0, r0 ands r0, r1 movs r1, 0x10 - b _0810190A -_081018F4: + b @0810190A +@081018F4: ldrh r0, [r3, 0x20] adds r0, 0x18 strh r0, [r3, 0x20] @@ -490480,10 +490480,10 @@ _081018F4: negs r0, r0 ands r0, r1 movs r1, 0x30 -_0810190A: +@0810190A: orrs r0, r1 strb r0, [r3, 0x3] -_0810190E: +@0810190E: ldrh r2, [r3, 0x4] lsls r1, r2, 22 lsrs r1, 22 @@ -490507,7 +490507,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 @@ -490522,36 +490522,36 @@ sub_8101940: @ 8101940 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x1 - beq _0810197C + beq @0810197C cmp r0, 0x1 - bgt _0810196C + bgt @0810196C cmp r0, 0 - beq _08101972 - b _0810198C + beq @08101972 + b @0810198C .align 2, 0 .pool -_0810196C: +@0810196C: cmp r0, 0x2 - beq _08101984 - b _0810198C -_08101972: + beq @08101984 + b @0810198C +@08101972: ldr r0, =sub_8101998 + 1 - b _0810198E + b @0810198E .align 2, 0 .pool -_0810197C: +@0810197C: ldr r0, =sub_8101A74 + 1 - b _0810198E + b @0810198E .align 2, 0 .pool -_08101984: +@08101984: ldr r0, =sub_8101AC4 + 1 - b _0810198E + b @0810198E .align 2, 0 .pool -_0810198C: +@0810198C: ldr r0, =sub_8101B84 + 1 -_0810198E: +@0810198E: str r0, [r3, 0x1C] pop {r0} bx r0 @@ -490560,7 +490560,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 @@ -490573,9 +490573,9 @@ sub_8101998: @ 8101998 negs r2, r2 adds r1, r2, 0 cmp r0, 0 - beq _081019B6 + beq @081019B6 movs r1, 0x2 -_081019B6: +@081019B6: strh r1, [r4, 0x30] movs r0, 0 strh r0, [r4, 0x32] @@ -490597,13 +490597,13 @@ _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 ldrsh r6, [r5, r0] cmp r6, 0 - bne _08101A24 + bne @08101A24 ldr r1, =0x020241e4 ldr r4, =0x02038436 ldrb r0, [r4] @@ -490620,14 +490620,14 @@ sub_81019E8: @ 81019E8 ldr r2, =0xfffffd00 adds r1, r2, 0 cmp r0, 0 - beq _08101A20 + beq @08101A20 movs r0, 0xC0 lsls r0, 2 adds r1, r0, 0 -_08101A20: +@08101A20: strh r1, [r5, 0x36] strh r6, [r5, 0x38] -_08101A24: +@08101A24: ldrh r0, [r5, 0x36] ldrh r1, [r5, 0x38] adds r0, r1 @@ -490650,12 +490650,12 @@ _08101A24: lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble _08101A5E + ble @08101A5E movs r0, 0 strh r0, [r5, 0x2E] ldr r0, =sub_8101B84 + 1 str r0, [r5, 0x1C] -_08101A5E: +@08101A5E: pop {r4-r6} pop {r0} bx r0 @@ -490664,7 +490664,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 @@ -490675,11 +490675,11 @@ sub_8101A74: @ 8101A74 lsls r0, 24 movs r1, 0x3 cmp r0, 0 - beq _08101A92 + beq @08101A92 movs r0, 0x3 negs r0, r0 adds r1, r0, 0 -_08101A92: +@08101A92: strh r1, [r4, 0x30] movs r0, 0 strh r0, [r4, 0x32] @@ -490701,7 +490701,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] @@ -490710,12 +490710,12 @@ sub_8101AC4: @ 8101AC4 lsls r0, 16 asrs r0, 16 cmp r0, 0x8 - ble _08101ADE + ble @08101ADE movs r0, 0 strh r0, [r1, 0x2E] ldr r0, =sub_8101AE8 + 1 str r0, [r1, 0x1C] -_08101ADE: +@08101ADE: pop {r0} bx r0 .align 2, 0 @@ -490723,13 +490723,13 @@ _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 ldrsh r0, [r5, r1] cmp r0, 0 - bne _08101B38 + bne @08101B38 ldr r1, =0x020241e4 ldr r4, =0x02038436 ldrb r0, [r4] @@ -490745,24 +490745,24 @@ sub_8101AE8: @ 8101AE8 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08101B2C + beq @08101B2C movs r0, 0xFC lsls r0, 8 strh r0, [r5, 0x36] movs r0, 0xC0 lsls r0, 4 - b _08101B36 + b @08101B36 .align 2, 0 .pool -_08101B2C: +@08101B2C: movs r0, 0x80 lsls r0, 3 strh r0, [r5, 0x36] movs r0, 0xF4 lsls r0, 8 -_08101B36: +@08101B36: strh r0, [r5, 0x38] -_08101B38: +@08101B38: ldrh r0, [r5, 0x36] ldrh r1, [r5, 0x38] adds r0, r1 @@ -490785,14 +490785,14 @@ _08101B38: lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - ble _08101B78 + ble @08101B78 ldrh r0, [r5, 0x34] lsls r0, 24 lsrs r0, 24 bl sub_80A7344 ldr r0, =sub_8101B84 + 1 str r0, [r5, 0x1C] -_08101B78: +@08101B78: pop {r4,r5} pop {r0} bx r0 @@ -490801,7 +490801,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} @@ -490809,7 +490809,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 + 1 @@ -490820,23 +490820,23 @@ 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 ldrsh r5, [r4, r0] cmp r5, 0x1 - beq _08101BFA + beq @08101BFA cmp r5, 0x1 - bgt _08101BB6 + bgt @08101BB6 cmp r5, 0 - beq _08101BBC - b _08101C8E -_08101BB6: + beq @08101BBC + b @08101C8E +@08101BB6: cmp r5, 0x2 - beq _08101C4C - b _08101C8E -_08101BBC: + beq @08101C4C + b @08101C8E +@08101BBC: strh r5, [r4, 0x30] ldr r1, =0x020241e4 ldr r2, =0x02038436 @@ -490852,11 +490852,11 @@ _08101BBC: ldr r2, =0xfffffe00 adds r1, r2, 0 cmp r0, 0 - beq _08101BE4 + beq @08101BE4 movs r0, 0x80 lsls r0, 2 adds r1, r0, 0 -_08101BE4: +@08101BE4: strh r1, [r4, 0x36] strh r5, [r4, 0x38] ldrh r0, [r4, 0x32] @@ -490867,7 +490867,7 @@ _08101BE4: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] -_08101BFA: +@08101BFA: ldrh r0, [r4, 0x36] ldrh r1, [r4, 0x38] adds r0, r1 @@ -490890,7 +490890,7 @@ _08101BFA: lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble _08101C8E + ble @08101C8E movs r0, 0 strh r0, [r4, 0x30] movs r2, 0x36 @@ -490900,10 +490900,10 @@ _08101BFA: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _08101C8E + b @08101C8E .align 2, 0 .pool -_08101C4C: +@08101C4C: ldrh r0, [r4, 0x36] ldrh r1, [r4, 0x38] adds r0, r1 @@ -490926,21 +490926,21 @@ _08101C4C: lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble _08101C8E + ble @08101C8E ldrh r0, [r4, 0x32] lsls r0, 24 lsrs r0, 24 bl sub_80A7344 adds r0, r4, 0 bl move_anim_8072740 -_08101C8E: +@08101C8E: pop {r4,r5} pop {r0} bx r0 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 @@ -490966,15 +490966,15 @@ sub_8101C94: @ 8101C94 movs r3, 0 ldrsh r1, [r0, r3] cmp r1, 0 - beq _08101CE8 + beq @08101CE8 cmp r1, 0x1 - beq _08101D04 + beq @08101D04 adds r0, r6, 0 bl move_anim_task_del - b _08101D22 + b @08101D22 .align 2, 0 .pool -_08101CE8: +@08101CE8: strh r1, [r5, 0xC] movs r0, 0x8 strh r0, [r5, 0xE] @@ -490982,15 +490982,15 @@ _08101CE8: movs r0, 0x3 strh r0, [r5, 0x12] cmp r2, 0 - bne _08101CFC + bne @08101CFC negs r0, r0 strh r0, [r5, 0x12] -_08101CFC: +@08101CFC: ldr r0, =sub_8101D2C + 1 - b _08101D20 + b @08101D20 .align 2, 0 .pool -_08101D04: +@08101D04: movs r0, 0x8 strh r0, [r5, 0xE] movs r0, 0xC0 @@ -490999,16 +490999,16 @@ _08101D04: movs r1, 0xC0 strh r1, [r5, 0x12] cmp r2, 0 - bne _08101D1E + bne @08101D1E negs r0, r0 strh r0, [r5, 0x10] negs r0, r1 strh r0, [r5, 0x12] -_08101D1E: +@08101D1E: ldr r0, =sub_8101EEC + 1 -_08101D20: +@08101D20: str r0, [r5] -_08101D22: +@08101D22: pop {r4-r6} pop {r0} bx r0 @@ -491017,7 +491017,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 @@ -491029,33 +491029,33 @@ sub_8101D2C: @ 8101D2C movs r1, 0xC ldrsh r0, [r4, r1] cmp r0, 0x4 - bls _08101D46 - b _08101EE6 -_08101D46: + bls @08101D46 + b @08101EE6 +@08101D46: lsls r0, 2 - ldr r1, =_08101D58 + ldr r1, =@08101D58 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08101D58: - .4byte _08101D6C - .4byte _08101D9E - .4byte _08101DF8 - .4byte _08101E70 - .4byte _08101EB4 -_08101D6C: +@08101D58: + .4byte @08101D6C + .4byte @08101D9E + .4byte @08101DF8 + .4byte @08101E70 + .4byte @08101EB4 +@08101D6C: movs r2, 0xE ldrsh r1, [r4, r2] cmp r1, 0 - beq _08101D7C + beq @08101D7C ldrh r2, [r4, 0x12] ldrh r3, [r4, 0x10] adds r2, r3 - b _08101EC2 -_08101D7C: + b @08101EC2 +@08101D7C: movs r0, 0x8 strh r0, [r4, 0xE] strh r1, [r4, 0x10] @@ -491063,21 +491063,21 @@ _08101D7C: ldrsh r0, [r4, r1] movs r1, 0xC0 cmp r0, 0 - bne _08101D92 + bne @08101D92 movs r2, 0xC0 negs r2, r2 adds r1, r2, 0 -_08101D92: +@08101D92: strh r1, [r4, 0x12] ldrb r0, [r4, 0x8] movs r1, 0 bl sub_80A7270 - b _08101EA8 -_08101D9E: + b @08101EA8 +@08101D9E: movs r3, 0xE ldrsh r0, [r4, r3] cmp r0, 0 - beq _08101DC4 + beq @08101DC4 ldrh r0, [r4, 0x12] ldrh r1, [r4, 0x10] adds r0, r1 @@ -491090,8 +491090,8 @@ _08101D9E: bl obj_id_set_rotscale ldrb r0, [r4, 0x8] bl sub_80A73A0 - b _08101ED4 -_08101DC4: + b @08101ED4 +@08101DC4: movs r0, 0x8 strh r0, [r4, 0xE] ldr r2, =0x02020630 @@ -491109,34 +491109,34 @@ _08101DC4: negs r2, r2 adds r1, r2, 0 cmp r0, 0 - bne _08101DEA + bne @08101DEA movs r1, 0x2 -_08101DEA: +@08101DEA: strh r1, [r4, 0x12] movs r0, 0x1 strh r0, [r4, 0x14] - b _08101EA8 + b @08101EA8 .align 2, 0 .pool -_08101DF8: +@08101DF8: ldrh r2, [r4, 0xE] movs r3, 0xE ldrsh r0, [r4, r3] cmp r0, 0 - beq _08101E54 + beq @08101E54 ldrh r1, [r4, 0x14] movs r3, 0x14 ldrsh r0, [r4, r3] cmp r0, 0 - beq _08101E12 + beq @08101E12 subs r0, r1, 0x1 strh r0, [r4, 0x14] - b _08101EE6 -_08101E12: + b @08101EE6 +@08101E12: movs r0, 0x1 ands r0, r2 cmp r0, 0 - beq _08101E34 + beq @08101E34 ldr r2, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] @@ -491147,10 +491147,10 @@ _08101E12: ldrh r1, [r4, 0x12] ldrh r2, [r4, 0x10] adds r1, r2 - b _08101E48 + b @08101E48 .align 2, 0 .pool -_08101E34: +@08101E34: ldr r2, =0x02020630 movs r3, 0x8 ldrsh r1, [r4, r3] @@ -491161,14 +491161,14 @@ _08101E34: ldrh r1, [r4, 0x10] ldrh r2, [r4, 0x12] subs r1, r2 -_08101E48: +@08101E48: strh r1, [r0, 0x24] movs r0, 0x1 strh r0, [r4, 0x14] - b _08101ED4 + b @08101ED4 .align 2, 0 .pool -_08101E54: +@08101E54: ldr r2, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] @@ -491180,19 +491180,19 @@ _08101E54: strh r1, [r0, 0x24] movs r0, 0xC strh r0, [r4, 0xE] - b _08101EA8 + b @08101EA8 .align 2, 0 .pool -_08101E70: +@08101E70: ldrh r1, [r4, 0xE] movs r2, 0xE ldrsh r0, [r4, r2] cmp r0, 0 - beq _08101E80 + beq @08101E80 subs r0, r1, 0x1 strh r0, [r4, 0xE] - b _08101EE6 -_08101E80: + b @08101EE6 +@08101E80: movs r0, 0x3 strh r0, [r4, 0xE] ldr r2, =0x02020630 @@ -491210,26 +491210,26 @@ _08101E80: negs r2, r2 adds r1, r2, 0 cmp r0, 0 - bne _08101EA6 + bne @08101EA6 movs r1, 0x8 -_08101EA6: +@08101EA6: strh r1, [r4, 0x12] -_08101EA8: +@08101EA8: ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] - b _08101EE6 + b @08101EE6 .align 2, 0 .pool -_08101EB4: +@08101EB4: movs r3, 0xE ldrsh r0, [r4, r3] cmp r0, 0 - beq _08101EE0 + beq @08101EE0 ldrh r2, [r4, 0x12] ldrh r0, [r4, 0x10] adds r2, r0 -_08101EC2: +@08101EC2: strh r2, [r4, 0x10] ldr r3, =0x02020630 movs r0, 0x8 @@ -491239,24 +491239,24 @@ _08101EC2: lsls r0, 2 adds r0, r3 strh r2, [r0, 0x24] -_08101ED4: +@08101ED4: ldrh r0, [r4, 0xE] subs r0, 0x1 strh r0, [r4, 0xE] - b _08101EE6 + b @08101EE6 .align 2, 0 .pool -_08101EE0: +@08101EE0: adds r0, r2, 0 bl move_anim_task_del -_08101EE6: +@08101EE6: pop {r4} pop {r0} bx r0 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 @@ -491268,7 +491268,7 @@ sub_8101EEC: @ 8101EEC movs r1, 0xE ldrsh r0, [r4, r1] cmp r0, 0 - beq _08101F2C + beq @08101F2C ldrh r0, [r4, 0x10] ldrh r1, [r4, 0x12] subs r0, r1 @@ -491284,36 +491284,36 @@ sub_8101EEC: @ 8101EEC ldrh r0, [r4, 0xE] subs r0, 0x1 strh r0, [r4, 0xE] - b _08101F38 + b @08101F38 .align 2, 0 .pool -_08101F2C: +@08101F2C: ldrb r0, [r4, 0x8] bl sub_80A7344 adds r0, r5, 0 bl move_anim_task_del -_08101F38: +@08101F38: pop {r4,r5} pop {r0} bx r0 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 movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 - bne _08101F5C + bne @08101F5C ldr r4, =0x02038436 - b _08101F5E + b @08101F5E .align 2, 0 .pool -_08101F5C: +@08101F5C: ldr r4, =0x02038437 -_08101F5E: +@08101F5E: ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -491346,7 +491346,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 @@ -491377,7 +491377,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 @@ -491414,7 +491414,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] @@ -491423,7 +491423,7 @@ sub_8102044: @ 8102044 lsls r0, 16 asrs r0, 16 cmp r0, 0x8 - ble _0810206E + ble @0810206E movs r0, 0xC strh r0, [r4, 0x2E] movs r0, 0x8 @@ -491435,7 +491435,7 @@ sub_8102044: @ 8102044 bl oamt_set_x3A_32 ldr r0, =sub_80A653C + 1 str r0, [r4, 0x1C] -_0810206E: +@0810206E: pop {r4} pop {r0} bx r0 @@ -491444,7 +491444,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] @@ -491456,7 +491456,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] @@ -491465,7 +491465,7 @@ sub_810208C: @ 810208C lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _081020D4 + ble @081020D4 movs r0, 0 strh r0, [r3, 0x2E] movs r0, 0x3E @@ -491489,30 +491489,30 @@ sub_810208C: @ 810208C lsls r0, 16 asrs r0, 16 cmp r0, 0x8 - ble _081020D4 + ble @081020D4 adds r0, r3, 0 bl move_anim_8072740 -_081020D4: +@081020D4: pop {r0} bx r0 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 movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 - bne _081020F4 + bne @081020F4 ldr r4, =0x02038436 - b _081020F6 + b @081020F6 .align 2, 0 .pool -_081020F4: +@081020F4: ldr r4, =0x02038437 -_081020F6: +@081020F6: ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -491544,7 +491544,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] @@ -491555,13 +491555,13 @@ sub_810213C: @ 810213C movs r3, 0x30 ldrsh r1, [r2, r3] cmp r0, r1 - ble _0810215C + ble @0810215C movs r0, 0 strh r0, [r2, 0x2E] ldrh r0, [r2, 0x22] subs r0, 0x1 strh r0, [r2, 0x22] -_0810215C: +@0810215C: ldrh r0, [r2, 0x22] ldrh r1, [r2, 0x2E] subs r0, r1 @@ -491572,16 +491572,16 @@ _0810215C: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08102178 + beq @08102178 adds r0, r2, 0 bl move_anim_8072740 -_08102178: +@08102178: pop {r0} bx r0 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 @@ -491620,7 +491620,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] @@ -491631,7 +491631,7 @@ sub_81021CC: @ 81021CC movs r2, 0x30 ldrsh r1, [r4, r2] cmp r0, r1 - blt _08102238 + blt @08102238 adds r3, r4, 0 adds r3, 0x3E ldrb r2, [r3] @@ -491648,20 +491648,20 @@ sub_81021CC: @ 81021CC movs r1, 0x4 ands r0, r1 cmp r0, 0 - bne _0810221E + bne @0810221E ldrh r0, [r4, 0x36] adds r0, 0x1 strh r0, [r4, 0x36] movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _0810221E + bne @0810221E ldrh r1, [r4, 0x38] lsls r1, 24 asrs r1, 24 movs r0, 0xC2 bl audio_play_and_stuff -_0810221E: +@0810221E: movs r1, 0 strh r1, [r4, 0x2E] ldrh r0, [r4, 0x32] @@ -491670,46 +491670,46 @@ _0810221E: lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _08102238 + ble @08102238 strh r1, [r4, 0x32] ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] -_08102238: +@08102238: adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08102262 + beq @08102262 movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0x10 - ble _08102262 + ble @08102262 adds r0, r4, 0 adds r0, 0x3E ldrb r1, [r0] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08102262 + beq @08102262 adds r0, r4, 0 bl move_anim_8072740 -_08102262: +@08102262: pop {r4} pop {r0} bx r0 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 ldrsh r0, [r6, r1] cmp r0, 0 - bne _081022B2 + bne @081022B2 ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 @@ -491731,23 +491731,23 @@ sub_8102268: @ 8102268 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _081022AC + beq @081022AC ldrh r0, [r6, 0x22] adds r0, 0xA strh r0, [r6, 0x22] -_081022AC: +@081022AC: ldrh r0, [r6, 0x2E] adds r0, 0x1 strh r0, [r6, 0x2E] -_081022B2: +@081022B2: ldr r0, =0x0203841e ldrh r1, [r0, 0xE] ldr r0, =0x0000ffff cmp r1, r0 - bne _081022C2 + bne @081022C2 adds r0, r6, 0 bl move_anim_8072740 -_081022C2: +@081022C2: pop {r4-r6} pop {r0} bx r0 @@ -491756,7 +491756,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 @@ -491768,27 +491768,27 @@ sub_81022D4: @ 81022D4 movs r1, 0xC ldrsh r0, [r4, r1] cmp r0, 0x1 - bne _08102300 + bne @08102300 ldr r1, =0x0203841e ldr r0, =0x0000ffff strh r0, [r1, 0xE] - b _0810233E + b @0810233E .align 2, 0 .pool -_08102300: +@08102300: cmp r0, 0x2 - bne _0810230C + bne @0810230C adds r0, r2, 0 bl move_anim_task_del - b _08102344 -_0810230C: + b @08102344 +@0810230C: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne _08102344 + bne @08102344 movs r0, 0 strh r0, [r4, 0x8] ldrh r2, [r4, 0xA] @@ -491805,19 +491805,19 @@ _0810230C: movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0x10 - bne _08102344 -_0810233E: + bne @08102344 +@0810233E: ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] -_08102344: +@08102344: pop {r4} pop {r0} bx r0 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 @@ -491841,18 +491841,18 @@ 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] movs r2, 0x2E ldrsh r0, [r5, r2] cmp r0, 0 - beq _08102390 + beq @08102390 subs r0, r1, 0x1 strh r0, [r5, 0x2E] - b _081023CC -_08102390: + b @081023CC +@08102390: adds r2, r5, 0 adds r2, 0x2C ldrb r1, [r2] @@ -491880,7 +491880,7 @@ _08102390: ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 -_081023CC: +@081023CC: pop {r4,r5} pop {r0} bx r0 @@ -491889,7 +491889,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 @@ -491904,7 +491904,7 @@ sub_81023E0: @ 81023E0 lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne _08102428 + bne @08102428 movs r0, 0 strh r0, [r4, 0x8] ldrh r1, [r4, 0xA] @@ -491921,10 +491921,10 @@ sub_81023E0: @ 81023E0 movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0x10 - bne _08102428 + bne @08102428 adds r0, r5, 0 bl move_anim_task_del -_08102428: +@08102428: pop {r4,r5} pop {r0} bx r0 @@ -491933,7 +491933,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 @@ -491941,45 +491941,45 @@ sub_8102434: @ 8102434 ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - bcs _08102490 + bcs @08102490 ldr r6, =0x0203841e ldr r5, =0x03005d70 -_08102448: +@08102448: movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0x1 - bne _08102464 + bne @08102464 adds r0, r4, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08102464 + bne @08102464 adds r0, r4, r5 ldrb r0, [r0] bl sub_8072984 -_08102464: +@08102464: movs r1, 0x2 ldrsh r0, [r6, r1] cmp r0, 0x1 - bne _08102482 + bne @08102482 adds r0, r4, 0 bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08102482 + bne @08102482 adds r0, r4, r5 ldrb r0, [r0] bl sub_8072984 -_08102482: +@08102482: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - bcc _08102448 -_08102490: + bcc @08102448 +@08102490: adds r0, r7, 0 bl move_anim_task_del pop {r4-r7} @@ -491990,13 +491990,13 @@ _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 movs r4, 0 - b _081024C2 -_081024B2: + b @081024C2 +@081024B2: ldr r0, =0x03005d70 adds r0, r4, r0 ldrb r0, [r0] @@ -492004,11 +492004,11 @@ _081024B2: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_081024C2: +@081024C2: ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - bcc _081024B2 + bcc @081024B2 adds r0, r5, 0 bl move_anim_task_del pop {r4,r5} @@ -492019,23 +492019,23 @@ _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 lsls r0, 24 cmp r0, 0 - beq _081024F6 + beq @081024F6 movs r0, 0x30 strh r0, [r4, 0x20] movs r0, 0x28 - b _081024FE -_081024F6: + b @081024FE +@081024F6: ldr r0, =0x0203841e ldrh r1, [r0] strh r1, [r4, 0x20] ldrh r0, [r0, 0x2] -_081024FE: +@081024FE: strh r0, [r4, 0x22] ldrb r1, [r4, 0x1] movs r0, 0x3F @@ -492057,22 +492057,22 @@ _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 ldrsh r0, [r1, r2] cmp r0, 0 - beq _0810253A + beq @0810253A adds r0, r1, 0 bl move_anim_8072740 -_0810253A: +@0810253A: pop {r0} bx r0 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 @@ -492104,7 +492104,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] @@ -492113,33 +492113,33 @@ sub_8102584: @ 8102584 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _081025AE + ble @081025AE movs r0, 0 strh r0, [r1, 0x30] ldrh r2, [r1, 0x32] movs r3, 0x32 ldrsh r0, [r1, r3] cmp r0, 0x77 - bgt _081025AE + bgt @081025AE ldrh r0, [r1, 0x22] adds r0, 0x1 strh r0, [r1, 0x22] adds r0, r2, 0x1 strh r0, [r1, 0x32] -_081025AE: +@081025AE: movs r2, 0x2E ldrsh r0, [r1, r2] cmp r0, 0 - beq _081025BC + beq @081025BC adds r0, r1, 0 bl move_anim_8072740 -_081025BC: +@081025BC: pop {r0} bx r0 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 @@ -492241,7 +492241,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} @@ -492256,33 +492256,33 @@ sub_81026A8: @ 81026A8 movs r0, 0x8 ldrsh r1, [r4, r0] cmp r1, 0x1 - beq _08102794 + beq @08102794 cmp r1, 0x1 - bgt _081026D4 + bgt @081026D4 cmp r1, 0 - beq _081026E2 - b _08102832 + beq @081026E2 + b @08102832 .align 2, 0 .pool -_081026D4: +@081026D4: cmp r1, 0x2 - bne _081026DA - b _081027EC -_081026DA: + bne @081026DA + b @081027EC +@081026DA: cmp r1, 0x3 - bne _081026E0 - b _08102820 -_081026E0: - b _08102832 -_081026E2: + bne @081026E0 + b @08102820 +@081026E0: + b @08102832 +@081026E2: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 cmp r0, 0 - bgt _081026F0 - b _08102832 -_081026F0: + bgt @081026F0 + b @08102832 +@081026F0: strh r1, [r4, 0xA] ldrh r0, [r4, 0xC] adds r0, 0x1 @@ -492290,7 +492290,7 @@ _081026F0: lsls r0, 16 asrs r0, 16 cmp r0, 0xF - bgt _0810273C + bgt @0810273C ldrh r0, [r4, 0x16] ldrh r1, [r4, 0x10] adds r0, r1 @@ -492320,18 +492320,18 @@ _081026F0: lsls r0, 16 lsrs r0, 16 mov r12, r0 - b _08102746 -_0810273C: + b @08102746 +@0810273C: ldr r7, =0x00007fbb mov r12, r7 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_08102746: +@08102746: movs r2, 0x1 movs r3, 0 movs r1, 0 -_0810274C: +@0810274C: movs r5, 0xE ldrsh r0, [r4, r5] ands r0, r2 @@ -492341,10 +492341,10 @@ _0810274C: adds r1, 0x1 mov r8, r1 cmp r0, 0 - beq _08102778 + beq @08102778 movs r1, 0x1 ldr r2, =0x02037b14 -_08102764: +@08102764: adds r0, r3, r1 lsls r0, 1 adds r0, r2 @@ -492354,8 +492354,8 @@ _08102764: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0xF - bls _08102764 -_08102778: + bls @08102764 +@08102778: lsrs r2, r5, 16 lsls r0, r6, 16 lsrs r3, r0, 16 @@ -492363,17 +492363,17 @@ _08102778: lsls r0, r1, 16 lsrs r1, r0, 16 cmp r1, 0xF - bls _0810274C - b _08102832 + bls @0810274C + b @08102832 .align 2, 0 .pool -_08102794: +@08102794: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08102832 + bne @08102832 movs r2, 0 ldr r3, =0x02020630 movs r5, 0x14 @@ -492383,7 +492383,7 @@ _08102794: mov r8, r7 ldr r6, =0x08592eec movs r5, 0x1 -_081027B2: +@081027B2: lsls r0, r2, 4 adds r0, r2 lsls r1, r0, 2 @@ -492391,31 +492391,31 @@ _081027B2: adds r0, r1, r7 ldr r0, [r0] cmp r0, r8 - beq _081027C6 + beq @081027C6 cmp r0, r6 - bne _081027CA -_081027C6: + bne @081027CA +@081027C6: adds r0, r1, r3 strh r5, [r0, 0x2E] -_081027CA: +@081027CA: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3F - bls _081027B2 + bls @081027B2 movs r0, 0 strh r0, [r4, 0xA] - b _08102814 + b @08102814 .align 2, 0 .pool -_081027EC: +@081027EC: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x1E - ble _08102832 + ble @08102832 movs r1, 0x24 ldrsh r0, [r4, r1] movs r2, 0x26 @@ -492427,23 +492427,23 @@ _081027EC: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 -_08102814: +@08102814: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _08102832 + b @08102832 .align 2, 0 .pool -_08102820: +@08102820: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08102832 + bne @08102832 adds r0, r2, 0 bl move_anim_task_del -_08102832: +@08102832: add sp, 0x4 pop {r3} mov r8, r3 @@ -492455,24 +492455,24 @@ _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 movs r1, 0x4 ldrsh r0, [r6, r1] cmp r0, 0x1 - bgt _08102856 + bgt @08102856 movs r0, 0x2 strh r0, [r6, 0x4] -_08102856: +@08102856: movs r1, 0x4 ldrsh r0, [r6, r1] cmp r0, 0x7F - ble _08102862 + ble @08102862 movs r0, 0x7F strh r0, [r6, 0x4] -_08102862: +@08102862: movs r0, 0 strh r0, [r5, 0x2E] ldrh r0, [r6, 0x4] @@ -492500,7 +492500,7 @@ _08102862: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _081028D4 + beq @081028D4 ldrb r1, [r5, 0x3] movs r0, 0x3F negs r0, r0 @@ -492519,16 +492519,16 @@ _08102862: movs r0, 0x30 ldrsh r1, [r5, r0] ldr r0, =0xffffec00 - b _081028FA + b @081028FA .align 2, 0 .pool -_081028D4: +@081028D4: ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0810291C + bne @0810291C ldrh r0, [r5, 0x20] subs r0, 0x28 strh r0, [r5, 0x20] @@ -492541,7 +492541,7 @@ _081028D4: ldrsh r1, [r5, r0] movs r0, 0xA0 lsls r0, 5 -_081028FA: +@081028FA: bl __divsi3 strh r0, [r5, 0x34] lsls r4, 7 @@ -492551,10 +492551,10 @@ _081028FA: ldr r0, =0xfffff600 bl __divsi3 strh r0, [r5, 0x38] - b _08102958 + b @08102958 .align 2, 0 .pool -_0810291C: +@0810291C: ldrh r0, [r5, 0x20] adds r0, 0x28 strh r0, [r5, 0x20] @@ -492583,7 +492583,7 @@ _0810291C: movs r1, 0x30 orrs r0, r1 strb r0, [r5, 0x3] -_08102958: +@08102958: ldr r0, =sub_810296C + 1 str r0, [r5, 0x1C] pop {r4-r6} @@ -492594,7 +492594,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] @@ -492617,25 +492617,25 @@ sub_810296C: @ 810296C lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - bne _081029A2 + bne @081029A2 ldrh r0, [r2, 0x3A] strh r0, [r2, 0x20] ldrh r0, [r2, 0x3C] strh r0, [r2, 0x22] -_081029A2: +@081029A2: movs r1, 0x30 ldrsh r0, [r2, r1] cmp r0, 0 - bne _081029B0 + bne @081029B0 adds r0, r2, 0 bl move_anim_8072740 -_081029B0: +@081029B0: pop {r0} bx r0 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 @@ -492678,7 +492678,7 @@ sub_81029B4: @ 81029B4 lsls r4, r0, 4 movs r5, 0x1 ldr r2, =0x02037714 -_08102A0C: +@08102A0C: adds r1, r3, r5 lsls r1, 1 adds r1, r2 @@ -492691,7 +492691,7 @@ _08102A0C: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0xF - bls _08102A0C + bls @08102A0C adds r0, r3, 0 movs r1, 0x10 movs r2, 0xB @@ -492704,10 +492704,10 @@ _08102A0C: movs r1, 0x1C adds r1, r7 mov r9, r1 - b _08102A88 + b @08102A88 .align 2, 0 .pool -_08102A54: +@08102A54: lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -492734,16 +492734,16 @@ _08102A54: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 -_08102A88: +@08102A88: cmp r5, 0x1 - bhi _08102A9A + bhi @08102A9A movs r0, 0 bl duplicate_obj_of_side_rel2move_in_transparent_mode lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _08102A54 -_08102A9A: + bge @08102A54 +@08102A9A: ldr r0, =sub_8102AE0 + 1 str r0, [r6] ldr r0, =0x02038436 @@ -492752,20 +492752,20 @@ _08102A9A: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08102AC8 + bne @08102AC8 movs r1, 0x80 lsls r1, 2 movs r0, 0 bl lcd_io_clear_bits - b _08102AD2 + b @08102AD2 .align 2, 0 .pool -_08102AC8: +@08102AC8: movs r1, 0x80 lsls r1, 3 movs r0, 0 bl lcd_io_clear_bits -_08102AD2: +@08102AD2: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -492775,7 +492775,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 @@ -492787,32 +492787,32 @@ sub_8102AE0: @ 8102AE0 movs r1, 0xE ldrsh r0, [r0, r1] cmp r0, 0 - bne _08102B32 + bne @08102B32 ldr r0, =0x02038436 ldrb r0, [r0] bl battle_get_per_side_status_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08102B1C + bne @08102B1C movs r1, 0x80 lsls r1, 2 movs r0, 0 bl lcd_io_set_bits - b _08102B26 + b @08102B26 .align 2, 0 .pool -_08102B1C: +@08102B1C: movs r1, 0x80 lsls r1, 3 movs r0, 0 bl lcd_io_set_bits -_08102B26: +@08102B26: ldr r0, =0x00002771 bl gpu_pal_free_tag adds r0, r4, 0 bl move_anim_task_del -_08102B32: +@08102B32: pop {r4} pop {r0} bx r0 @@ -492821,7 +492821,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] @@ -492830,17 +492830,17 @@ sub_8102B3C: @ 8102B3C lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _08102B58 + ble @08102B58 movs r0, 0 strh r0, [r5, 0x34] ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] -_08102B58: +@08102B58: movs r1, 0x2E ldrsh r0, [r5, r1] cmp r0, 0x40 - ble _08102B80 + ble @08102B80 ldr r2, =0x03005e00 movs r0, 0x32 ldrsh r1, [r5, r0] @@ -492853,10 +492853,10 @@ _08102B58: strh r1, [r0, 0xE] adds r0, r5, 0 bl obj_delete_but_dont_free_vram - b _08102BC2 + b @08102BC2 .align 2, 0 .pool -_08102B80: +@08102B80: ldr r4, =0x08329f40 movs r1, 0x2E ldrsh r0, [r5, r1] @@ -492887,7 +492887,7 @@ _08102B80: ldrsh r1, [r5, r2] bl sine strh r0, [r5, 0x24] -_08102BC2: +@08102BC2: pop {r4,r5} pop {r0} bx r0 @@ -492896,7 +492896,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 + 1 @@ -492911,7 +492911,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 @@ -492925,7 +492925,7 @@ sub_8102BE8: @ 8102BE8 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0xFF - beq _08102C2C + beq @08102C2C lsls r0, r3, 20 movs r1, 0x80 lsls r1, 17 @@ -492933,7 +492933,7 @@ sub_8102BE8: @ 8102BE8 lsrs r3, r0, 16 movs r2, 0x1 ldr r5, =0x02037b14 -_08102C14: +@08102C14: adds r1, r3, r2 lsls r1, 1 adds r1, r5 @@ -492945,12 +492945,12 @@ _08102C14: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x5 - bls _08102C14 -_08102C2C: + bls @08102C14 +@08102C2C: movs r4, 0x1 ldr r0, =0x08593020 mov r8, r0 -_08102C32: +@08102C32: lsls r0, r4, 1 adds r0, r4 lsls r5, r0, 2 @@ -492963,7 +492963,7 @@ _08102C32: adds r4, 0x1 mov r12, r4 cmp r3, 0xFF - beq _08102C7A + beq @08102C7A lsls r0, r3, 20 movs r1, 0x80 lsls r1, 17 @@ -492973,7 +492973,7 @@ _08102C32: ldr r7, =0x02037b14 ldr r6, =0x08593020 adds r4, r5, 0 -_08102C60: +@08102C60: adds r1, r3, r2 lsls r1, 1 adds r1, r7 @@ -492986,13 +492986,13 @@ _08102C60: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x5 - bls _08102C60 -_08102C7A: + bls @08102C60 +@08102C7A: mov r1, r12 lsls r0, r1, 16 lsrs r4, r0, 16 cmp r4, 0x3 - bls _08102C32 + bls @08102C32 mov r0, r9 bl move_anim_task_del pop {r3,r4} @@ -493006,13 +493006,13 @@ _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 movs r4, 0x1 ldr r6, =0x08593020 -_08102CAA: +@08102CAA: lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -493023,7 +493023,7 @@ _08102CAA: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x3 - bls _08102CAA + bls @08102CAA adds r0, r5, 0 bl move_anim_task_del pop {r4-r6} @@ -493034,7 +493034,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 @@ -493055,14 +493055,14 @@ sub_8102CD4: @ 8102CD4 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _08102D10 + beq @08102D10 lsls r2, r0, 4 ldrb r1, [r5, 0x5] movs r0, 0xF ands r0, r1 orrs r0, r2 strb r0, [r5, 0x5] -_08102D10: +@08102D10: ldrh r0, [r4, 0x2] movs r1, 0 strh r0, [r5, 0x30] @@ -493072,13 +493072,13 @@ _08102D10: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _08102D34 + beq @08102D34 movs r6, 0x30 movs r3, 0x28 - b _08102D4E + b @08102D4E .align 2, 0 .pool -_08102D34: +@08102D34: ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 @@ -493090,7 +493090,7 @@ _08102D34: bl sub_80A5C6C lsls r0, 24 lsrs r3, r0, 24 -_08102D4E: +@08102D4E: ldrh r0, [r5, 0x20] lsls r1, r0, 4 strh r1, [r5, 0x36] @@ -493121,7 +493121,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} @@ -493135,11 +493135,11 @@ sub_8102D8C: @ 8102D8C lsls r0, 16 asrs r2, r0, 16 cmp r2, 0 - bge _08102DAE + bge @08102DAE lsls r0, r1, 24 negs r0, r0 lsrs r1, r0, 24 -_08102DAE: +@08102DAE: lsls r5, r2, 8 lsls r1, 24 asrs r1, 24 @@ -493147,9 +493147,9 @@ _08102DAE: bl __divsi3 adds r4, r0, 0 cmp r4, 0 - bne _08102DC2 + bne @08102DC2 movs r4, 0x1 -_08102DC2: +@08102DC2: adds r0, r5, 0 adds r1, r4, 0 bl __divsi3 @@ -493168,7 +493168,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] @@ -493181,9 +493181,9 @@ sub_8102DE4: @ 8102DE4 adds r1, r0, r1 adds r0, r1, 0 cmp r1, 0 - bge _08102E00 + bge @08102E00 adds r0, 0xFF -_08102E00: +@08102E00: asrs r0, 8 lsls r0, 8 subs r0, r1, r0 @@ -493213,31 +493213,31 @@ _08102E00: movs r1, 0x88 lsls r1, 17 cmp r0, r1 - bhi _08102E4E + bhi @08102E4E lsls r0, r2, 16 asrs r1, r0, 16 movs r0, 0x10 negs r0, r0 cmp r1, r0 - blt _08102E4E + blt @08102E4E cmp r1, 0x80 - ble _08102E56 -_08102E4E: + ble @08102E56 +@08102E4E: adds r0, r4, 0 bl move_anim_8074EE0 - b _08102EA6 -_08102E56: + b @08102EA6 +@08102E56: movs r0, 0x34 ldrsh r1, [r4, r0] cmp r1, 0 - beq _08102EA6 + beq @08102EA6 ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] lsls r0, 16 asrs r0, 16 cmp r0, r1 - ble _08102EA6 + ble @08102EA6 strh r5, [r4, 0x32] ldrh r0, [r4, 0x30] adds r0, 0x1 @@ -493245,9 +493245,9 @@ _08102E56: lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble _08102E7E + ble @08102E7E strh r5, [r4, 0x30] -_08102E7E: +@08102E7E: ldr r2, =0x08593020 movs r3, 0x30 ldrsh r1, [r4, r3] @@ -493260,14 +493260,14 @@ _08102E7E: lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _08102EA6 + beq @08102EA6 lsls r2, r0, 4 ldrb r1, [r4, 0x5] movs r0, 0xF ands r0, r1 orrs r0, r2 strb r0, [r4, 0x5] -_08102EA6: +@08102EA6: pop {r4,r5} pop {r0} bx r0 @@ -493276,7 +493276,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 @@ -493285,13 +493285,13 @@ sub_8102EB0: @ 8102EB0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08102ECE + bne @08102ECE ldr r1, =0x0203841e movs r2, 0x2 ldrsh r0, [r1, r2] negs r0, r0 strh r0, [r1, 0x2] -_08102ECE: +@08102ECE: ldrb r0, [r7] movs r1, 0x2 bl sub_80A5C6C @@ -493343,7 +493343,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] @@ -493363,11 +493363,11 @@ sub_8102F40: @ 8102F40 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0x5 - ble _08102F9E + ble @08102F9E movs r2, 0x34 ldrsh r0, [r4, r2] cmp r0, 0 - bne _08102F9E + bne @08102F9E ldrh r0, [r4, 0x32] adds r0, 0x10 movs r1, 0xFF @@ -493386,34 +493386,34 @@ sub_8102F40: @ 8102F40 movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08102F9E + bne @08102F9E movs r0, 0x1 strh r0, [r4, 0x34] -_08102F9E: +@08102F9E: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] lsls r0, 16 asrs r0, 16 cmp r0, 0x30 - bne _08102FB2 + bne @08102FB2 adds r0, r4, 0 bl move_anim_8074EE0 -_08102FB2: +@08102FB2: pop {r4} pop {r0} bx r0 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 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x1 - bne _08102FDC + bne @08102FDC ldrb r0, [r5, 0x3] movs r1, 0x3F negs r1, r1 @@ -493422,12 +493422,12 @@ sub_8102FB8: @ 8102FB8 orrs r1, r0 strb r1, [r5, 0x3] movs r6, 0x10 - b _08102FDE + b @08102FDE .align 2, 0 .pool -_08102FDC: +@08102FDC: ldr r6, =0x0000fff0 -_08102FDE: +@08102FDE: ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 @@ -493458,7 +493458,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 @@ -493481,21 +493481,21 @@ sub_8103028: @ 8103028 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _08103068 + beq @08103068 lsls r2, r0, 4 ldrb r1, [r4, 0x5] movs r0, 0xF ands r0, r1 orrs r0, r2 strb r0, [r4, 0x5] -_08103068: +@08103068: movs r1, 0 ldrsh r0, [r5, r1] movs r2, 0x20 cmp r0, 0 - bne _08103074 + bne @08103074 ldr r2, =0x0000ffe0 -_08103074: +@08103074: movs r0, 0x28 strh r0, [r4, 0x2E] ldrh r1, [r4, 0x20] @@ -493522,13 +493522,13 @@ _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 lsls r0, 24 cmp r0, 0 - bne _08103100 + bne @08103100 movs r1, 0x38 ldrsh r0, [r4, r1] movs r1, 0x8 @@ -493539,11 +493539,11 @@ sub_81030B0: @ 81030B0 movs r3, 0x24 ldrsh r0, [r4, r3] cmp r0, 0 - bge _081030DC + bge @081030DC lsls r0, r1, 16 negs r0, r0 lsrs r1, r0, 16 -_081030DC: +@081030DC: lsls r0, r1, 16 asrs r0, 16 adds r0, r2 @@ -493560,18 +493560,18 @@ _081030DC: movs r1, 0xFF ands r0, r1 strh r0, [r4, 0x38] - b _08103106 -_08103100: + b @08103106 +@08103100: adds r0, r4, 0 bl move_anim_8072740 -_08103106: +@08103106: pop {r4} pop {r0} bx r0 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 @@ -493580,18 +493580,18 @@ sub_810310C: @ 810310C bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0810312C + bne @0810312C adds r0, r5, 0 movs r1, 0x5 bl sub_80A861C adds r0, 0x8 - b _08103136 -_0810312C: + b @08103136 +@0810312C: adds r0, r5, 0 movs r1, 0x4 bl sub_80A861C subs r0, 0x8 -_08103136: +@08103136: strh r0, [r6, 0x20] adds r0, r5, 0 movs r1, 0x3 @@ -493605,9 +493605,9 @@ _08103136: lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _08103158 + bge @08103158 adds r0, 0x3 -_08103158: +@08103158: asrs r0, 2 subs r0, r4, r0 strh r0, [r6, 0x22] @@ -493617,21 +493617,21 @@ _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 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08103180 + bne @08103180 ldr r0, =0x02038436 - b _08103182 + b @08103182 .align 2, 0 .pool -_08103180: +@08103180: ldr r0, =0x02038437 -_08103182: +@08103182: ldrb r4, [r0] adds r0, r4, 0 adds r1, r5, 0 @@ -493663,7 +493663,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] @@ -493671,7 +493671,7 @@ sub_81031D0: @ 81031D0 strh r0, [r4, 0x2E] lsls r0, 16 cmp r0, 0 - bne _081031F8 + bne @081031F8 ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 @@ -493682,7 +493682,7 @@ sub_81031D0: @ 81031D0 bl obj_anim_image_start ldr r0, =sub_80A67D8 + 1 str r0, [r4, 0x1C] -_081031F8: +@081031F8: pop {r4} pop {r0} bx r0 @@ -493691,21 +493691,21 @@ _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 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08103224 + bne @08103224 ldr r0, =0x02038436 - b _08103226 + b @08103226 .align 2, 0 .pool -_08103224: +@08103224: ldr r0, =0x02038437 -_08103226: +@08103226: ldrb r0, [r0] adds r1, r4, 0 bl sub_810310C @@ -493724,7 +493724,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] @@ -493733,7 +493733,7 @@ sub_8103250: @ 8103250 lsls r0, 16 asrs r0, 16 cmp r0, 0x10 - ble _08103276 + ble @08103276 adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 @@ -493742,7 +493742,7 @@ sub_8103250: @ 8103250 bl oamt_set_x3A_32 ldr r0, =sub_80A67BC + 1 str r0, [r4, 0x1C] -_08103276: +@08103276: pop {r4} pop {r0} bx r0 @@ -493751,21 +493751,21 @@ _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 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _081032A0 + bne @081032A0 ldr r0, =0x02038436 - b _081032A2 + b @081032A2 .align 2, 0 .pool -_081032A0: +@081032A0: ldr r0, =0x02038437 -_081032A2: +@081032A2: ldrb r5, [r0] adds r0, r5, 0 movs r1, 0 @@ -493781,10 +493781,10 @@ _081032A2: lsls r0, 16 asrs r0, 16 cmp r0, 0x9 - bgt _081032CA + bgt @081032CA movs r0, 0xA strh r0, [r4, 0x22] -_081032CA: +@081032CA: movs r0, 0x1 strh r0, [r4, 0x2E] strh r6, [r4, 0x30] @@ -493809,7 +493809,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] @@ -493818,10 +493818,10 @@ sub_8103300: @ 8103300 lsls r0, 16 asrs r0, 16 cmp r0, 0xC - ble _08103316 + ble @08103316 ldr r0, =sub_8103320 + 1 str r0, [r1, 0x1C] -_08103316: +@08103316: pop {r0} bx r0 .align 2, 0 @@ -493829,7 +493829,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] @@ -493838,43 +493838,43 @@ sub_8103320: @ 8103320 lsls r0, r1, 16 asrs r0, 16 cmp r0, 0xFE - ble _08103352 + ble @08103352 ldrh r0, [r2, 0x2E] subs r0, 0x1 strh r0, [r2, 0x2E] lsls r0, 16 asrs r0, 16 cmp r0, 0 - bne _0810334C + bne @0810334C strh r0, [r2, 0x24] ldr r0, =sub_8103250 + 1 str r0, [r2, 0x1C] - b _08103388 + b @08103388 .align 2, 0 .pool -_0810334C: +@0810334C: movs r0, 0xFF ands r1, r0 strh r1, [r2, 0x30] -_08103352: +@08103352: movs r1, 0x30 ldrsh r0, [r2, r1] cmp r0, 0x4F - ble _08103362 + ble @08103362 ldrh r0, [r2, 0x34] adds r1, r2, 0 adds r1, 0x43 strb r0, [r1] -_08103362: +@08103362: movs r3, 0x30 ldrsh r0, [r2, r3] cmp r0, 0x9F - ble _08103372 + ble @08103372 ldrh r0, [r2, 0x32] adds r1, r2, 0 adds r1, 0x43 strb r0, [r1] -_08103372: +@08103372: ldr r1, =0x08329f40 movs r3, 0x30 ldrsh r0, [r2, r3] @@ -493886,7 +493886,7 @@ _08103372: asrs r1, r0, 1 adds r0, r1 strh r0, [r2, 0x24] -_08103388: +@08103388: pop {r0} bx r0 .align 2, 0 @@ -493894,21 +493894,21 @@ _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 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _081033AC + bne @081033AC ldr r0, =0x02038436 - b _081033AE + b @081033AE .align 2, 0 .pool -_081033AC: +@081033AC: ldr r0, =0x02038437 -_081033AE: +@081033AE: ldrb r4, [r0] adds r0, r4, 0 adds r1, r5, 0 @@ -493917,20 +493917,20 @@ _081033AE: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _081033D4 + bne @081033D4 adds r0, r5, 0 movs r1, 0 bl obj_anim_image_start movs r0, 0x2 - b _081033DE + b @081033DE .align 2, 0 .pool -_081033D4: +@081033D4: adds r0, r5, 0 movs r1, 0x1 bl obj_anim_image_start movs r0, 0x3 -_081033DE: +@081033DE: strh r0, [r5, 0x2E] ldr r0, =sub_81033F0 + 1 str r0, [r5, 0x1C] @@ -493942,7 +493942,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] @@ -493951,7 +493951,7 @@ sub_81033F0: @ 81033F0 lsls r0, 16 asrs r0, 16 cmp r0, 0xA - ble _0810341E + ble @0810341E movs r0, 0 strh r0, [r4, 0x30] ldrh r1, [r4, 0x2E] @@ -493964,7 +493964,7 @@ sub_81033F0: @ 81033F0 bl oamt_set_x3A_32 ldr r0, =sub_80A67D8 + 1 str r0, [r4, 0x1C] -_0810341E: +@0810341E: pop {r4} pop {r0} bx r0 @@ -493973,7 +493973,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] @@ -493982,16 +493982,16 @@ sub_810342C: @ 810342C lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - ble _08103444 + ble @08103444 adds r0, r1, 0 bl move_anim_8072740 -_08103444: +@08103444: pop {r0} bx r0 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 @@ -494027,21 +494027,21 @@ 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 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _081034B4 + bne @081034B4 ldr r0, =0x02038436 - b _081034B6 + b @081034B6 .align 2, 0 .pool -_081034B4: +@081034B4: ldr r0, =0x02038437 -_081034B6: +@081034B6: ldrb r0, [r0] adds r1, r4, 0 bl sub_810310C @@ -494058,23 +494058,23 @@ _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 ldrsh r0, [r1, r2] cmp r0, 0x1 - beq _0810350A + beq @0810350A cmp r0, 0x1 - bgt _081034EE + bgt @081034EE cmp r0, 0 - beq _081034F4 - b _08103538 -_081034EE: + beq @081034F4 + b @08103538 +@081034EE: cmp r0, 0x2 - beq _08103524 - b _08103538 -_081034F4: + beq @08103524 + b @08103538 +@081034F4: ldrh r0, [r1, 0x26] subs r0, 0x3 strh r0, [r1, 0x26] @@ -494084,9 +494084,9 @@ _081034F4: lsls r0, 16 asrs r0, 16 cmp r0, 0x6 - bne _08103538 - b _0810351C -_0810350A: + bne @08103538 + b @0810351C +@0810350A: ldrh r0, [r1, 0x26] adds r0, 0x3 strh r0, [r1, 0x26] @@ -494095,29 +494095,29 @@ _0810350A: strh r0, [r1, 0x30] lsls r0, 16 cmp r0, 0 - bne _08103538 -_0810351C: + bne @08103538 +@0810351C: ldrh r0, [r1, 0x2E] adds r0, 0x1 strh r0, [r1, 0x2E] - b _08103538 -_08103524: + b @08103538 +@08103524: ldrh r0, [r1, 0x30] adds r0, 0x1 strh r0, [r1, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x40 - bne _08103538 + bne @08103538 adds r0, r1, 0 bl move_anim_8072740 -_08103538: +@08103538: pop {r0} bx r0 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 @@ -494138,7 +494138,7 @@ sub_810353C: @ 810353C movs r0, 0x2E ldrsh r2, [r4, r0] cmp r2, 0 - bne _0810357A + bne @0810357A movs r0, 0x32 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -494148,7 +494148,7 @@ sub_810353C: @ 810353C strh r2, [r0, 0x24] adds r0, r4, 0 bl move_anim_8074EE0 -_0810357A: +@0810357A: ldrh r0, [r4, 0x2E] subs r0, 0x1 strh r0, [r4, 0x2E] @@ -494160,7 +494160,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 @@ -494185,23 +494185,23 @@ sub_810358C: @ 810358C bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _081035E4 + beq @081035E4 ldr r0, =0x0203841e ldrh r1, [r5, 0x20] ldrh r2, [r0] subs r1, r2 strh r1, [r5, 0x20] adds r1, r0, 0 - b _081035EE + b @081035EE .align 2, 0 .pool -_081035E4: +@081035E4: ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r5, 0x20] adds r0, r2 strh r0, [r5, 0x20] -_081035EE: +@081035EE: ldrh r0, [r1, 0x2] ldrh r2, [r5, 0x22] adds r0, r2 @@ -494227,7 +494227,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 @@ -494252,7 +494252,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] @@ -494272,27 +494272,27 @@ 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] movs r3, 0x38 ldrsh r0, [r1, r3] cmp r0, 0 - bne _08103696 + bne @08103696 adds r0, r1, 0 bl move_anim_8072740 - b _0810369A -_08103696: + b @0810369A +@08103696: subs r0, r2, 0x1 strh r0, [r1, 0x38] -_0810369A: +@0810369A: pop {r0} bx r0 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 @@ -494319,7 +494319,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 @@ -494331,7 +494331,7 @@ sub_81036DC: @ 81036DC bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08103718 + bne @08103718 ldr r1, =0x03005e00 lsls r2, r5, 2 adds r0, r2, r5 @@ -494342,10 +494342,10 @@ sub_81036DC: @ 81036DC lsls r0, 16 lsrs r3, r0, 16 adds r6, r2, 0 - b _08103726 + b @08103726 .align 2, 0 .pool -_08103718: +@08103718: ldr r2, =0x03005e00 lsls r1, r5, 2 adds r0, r1, r5 @@ -494353,7 +494353,7 @@ _08103718: adds r0, r2 ldrh r3, [r0, 0x8] adds r6, r1, 0 -_08103726: +@08103726: movs r2, 0x80 lsls r2, 1 adds r0, r4, 0 @@ -494366,7 +494366,7 @@ _08103726: movs r2, 0xA ldrsh r0, [r1, r2] cmp r0, 0 - bne _08103760 + bne @08103760 ldrh r0, [r1, 0x8] adds r0, 0xB0 strh r0, [r1, 0x8] @@ -494377,22 +494377,22 @@ _08103726: adds r0, r1 ldrh r1, [r0, 0x26] adds r1, 0x1 - b _0810378A + b @0810378A .align 2, 0 .pool -_08103760: +@08103760: cmp r0, 0x1 - bne _08103776 + bne @08103776 ldrh r0, [r1, 0xE] adds r0, 0x1 strh r0, [r1, 0xE] lsls r0, 16 asrs r0, 16 cmp r0, 0x1E - bne _081037D0 + bne @081037D0 movs r0, 0x2 - b _081037CE -_08103776: + b @081037CE +@08103776: ldrh r0, [r1, 0x8] subs r0, 0xB0 strh r0, [r1, 0x8] @@ -494403,7 +494403,7 @@ _08103776: adds r0, r1 ldrh r1, [r0, 0x26] subs r1, 0x1 -_0810378A: +@0810378A: strh r1, [r0, 0x26] adds r0, r4, 0 bl sub_80A73A0 @@ -494416,34 +494416,34 @@ _0810378A: movs r0, 0xF2 lsls r0, 4 cmp r2, r0 - beq _081037AA + beq @081037AA cmp r2, 0 - bne _081037D0 -_081037AA: + bne @081037D0 +@081037AA: ldrh r2, [r1, 0xA] movs r3, 0xA ldrsh r0, [r1, r3] cmp r0, 0x2 - bne _081037CC + bne @081037CC adds r0, r4, 0 bl sub_80A7344 adds r0, r5, 0 bl move_anim_task_del - b _081037D0 + b @081037D0 .align 2, 0 .pool -_081037CC: +@081037CC: adds r0, r2, 0x1 -_081037CE: +@081037CE: strh r0, [r1, 0xA] -_081037D0: +@081037D0: pop {r4-r6} pop {r0} bx r0 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 @@ -494452,24 +494452,24 @@ sub_81037D8: @ 81037D8 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08103804 + beq @08103804 ldr r0, =0x0203841e ldrh r1, [r4, 0x20] ldrh r2, [r0] subs r1, r2 strh r1, [r4, 0x20] adds r5, r0, 0 - b _08103810 + b @08103810 .align 2, 0 .pool -_08103804: +@08103804: ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] adds r0, r2 strh r0, [r4, 0x20] adds r5, r1, 0 -_08103810: +@08103810: ldrh r0, [r5, 0x2] ldrh r1, [r4, 0x22] adds r0, r1 @@ -494479,7 +494479,7 @@ _08103810: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810384C + beq @0810384C adds r3, r4, 0 adds r3, 0x3F ldrb r0, [r3] @@ -494490,25 +494490,25 @@ _08103810: movs r1, 0x4 ldrsh r0, [r5, r1] cmp r0, 0 - beq _08103860 + beq @08103860 movs r0, 0x2 orrs r2, r0 strb r2, [r3] - b _08103860 + b @08103860 .align 2, 0 .pool -_0810384C: +@0810384C: movs r2, 0x4 ldrsh r0, [r5, r2] cmp r0, 0 - beq _08103860 + beq @08103860 adds r2, r4, 0 adds r2, 0x3F ldrb r0, [r2] movs r1, 0x2 orrs r0, r1 strb r0, [r2] -_08103860: +@08103860: ldr r0, =sub_80A67D8 + 1 str r0, [r4, 0x1C] ldr r1, =move_anim_8072740 + 1 @@ -494522,7 +494522,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 @@ -494540,7 +494540,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] @@ -494560,7 +494560,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} @@ -494569,21 +494569,21 @@ sub_81038C8: @ 81038C8 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _081038EC + beq @081038EC ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] - b _0810390E + b @0810390E .align 2, 0 .pool -_081038EC: +@081038EC: ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810390E + beq @0810390E ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 @@ -494594,7 +494594,7 @@ _081038EC: ldrh r0, [r1, 0x6] negs r0, r0 strh r0, [r1, 0x6] -_0810390E: +@0810390E: adds r0, r5, 0 movs r1, 0x1 bl sub_80A69CC @@ -494642,12 +494642,12 @@ _0810390E: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _08103980 + beq @08103980 ldr r2, =0xffffa000 adds r0, r4, r2 lsls r0, 16 lsrs r4, r0, 16 -_08103980: +@08103980: movs r3, 0x80 lsls r3, 1 str r4, [sp] @@ -494676,7 +494676,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] @@ -494684,7 +494684,7 @@ sub_81039CC: @ 81039CC strh r1, [r3, 0x2E] lsls r0, 16 cmp r0, 0 - bgt _081039F6 + bgt @081039F6 ldr r2, =0x03005e00 movs r0, 0x3C ldrsh r1, [r3, r0] @@ -494697,7 +494697,7 @@ sub_81039CC: @ 81039CC strh r1, [r0, 0xA] adds r0, r3, 0 bl obj_delete_and_free_tiles -_081039F6: +@081039F6: pop {r0} bx r0 .align 2, 0 @@ -494705,7 +494705,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 @@ -494720,7 +494720,7 @@ sub_8103A00: @ 8103A00 movs r3, 0x12 ldrsh r0, [r4, r3] cmp r1, r0 - ble _08103A34 + ble @08103A34 ldrh r0, [r2, 0x34] ldrh r1, [r2, 0x38] adds r0, r1 @@ -494728,10 +494728,10 @@ sub_8103A00: @ 8103A00 ldrh r0, [r2, 0x36] ldrh r3, [r2, 0x3A] adds r0, r3 - b _08103A42 + b @08103A42 .align 2, 0 .pool -_08103A34: +@08103A34: ldrh r0, [r2, 0x38] ldrh r1, [r2, 0x34] subs r0, r1 @@ -494739,7 +494739,7 @@ _08103A34: ldrh r0, [r2, 0x3A] ldrh r1, [r2, 0x36] subs r0, r1 -_08103A42: +@08103A42: strh r0, [r2, 0x3A] ldrh r0, [r2, 0x38] ldrh r1, [r2, 0x30] @@ -494753,41 +494753,41 @@ _08103A42: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08103A66 + beq @08103A66 lsls r0, r3, 16 lsrs r0, 24 negs r0, r0 - b _08103A6A -_08103A66: + b @08103A6A +@08103A66: lsls r0, r3, 16 lsrs r0, 24 -_08103A6A: +@08103A6A: strh r0, [r2, 0x24] ldrh r1, [r4, 0x18] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08103A7E + beq @08103A7E ldrh r0, [r2, 0x32] lsrs r0, 8 negs r0, r0 - b _08103A82 -_08103A7E: + b @08103A82 +@08103A7E: ldrh r0, [r2, 0x32] lsrs r0, 8 -_08103A82: +@08103A82: strh r0, [r2, 0x26] ldrh r0, [r2, 0x2E] subs r1, r0, 0x1 strh r1, [r2, 0x2E] lsls r0, 16 cmp r0, 0 - bgt _08103A98 + bgt @08103A98 movs r0, 0x1E strh r0, [r2, 0x2E] ldr r0, =sub_81039CC + 1 str r0, [r2, 0x1C] -_08103A98: +@08103A98: pop {r4} pop {r0} bx r0 @@ -494796,7 +494796,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} @@ -494825,38 +494825,38 @@ sub_8103AA4: @ 8103AA4 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08103AEC + beq @08103AEC lsls r0, r2, 16 lsrs r0, 24 negs r0, r0 - b _08103AF0 + b @08103AF0 .align 2, 0 .pool -_08103AEC: +@08103AEC: lsls r0, r2, 16 lsrs r0, 24 -_08103AF0: +@08103AF0: strh r0, [r7, 0x24] ldrh r1, [r6, 0x18] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08103B04 + beq @08103B04 ldrh r0, [r7, 0x32] lsrs r0, 8 negs r0, r0 - b _08103B08 -_08103B04: + b @08103B08 +@08103B04: ldrh r0, [r7, 0x32] lsrs r0, 8 -_08103B08: +@08103B08: strh r0, [r7, 0x26] ldrh r0, [r7, 0x2E] subs r1, r0, 0x1 strh r1, [r7, 0x2E] lsls r0, 16 cmp r0, 0 - bgt _08103BD4 + bgt @08103BD4 movs r4, 0 movs r0, 0x8 strh r0, [r7, 0x2E] @@ -494883,12 +494883,12 @@ _08103B08: lsls r0, r2, 16 asrs r0, 16 cmp r1, r0 - blt _08103B52 + blt @08103B52 subs r0, r3, r2 - b _08103B54 -_08103B52: + b @08103B54 +@08103B52: subs r0, r2, r3 -_08103B54: +@08103B54: lsls r0, 24 lsrs r4, r0, 16 ldrh r3, [r6, 0x20] @@ -494898,12 +494898,12 @@ _08103B54: movs r6, 0x22 ldrsh r0, [r7, r6] cmp r1, r0 - blt _08103B6C + blt @08103B6C subs r0, r3, r2 - b _08103B6E -_08103B6C: + b @08103B6E +@08103B6C: subs r0, r2, r3 -_08103B6E: +@08103B6E: lsls r0, 24 lsrs r0, 16 mov r8, r0 @@ -494949,7 +494949,7 @@ _08103B6E: strh r0, [r7, 0x36] ldr r0, =sub_8103A00 + 1 str r0, [r7, 0x1C] -_08103BD4: +@08103BD4: pop {r3} mov r8, r3 pop {r4-r7} @@ -494960,7 +494960,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 @@ -494972,10 +494972,10 @@ sub_8103BE4: @ 8103BE4 movs r1, 0xA ldrsh r0, [r0, r1] cmp r0, 0 - bne _08103C02 + bne @08103C02 adds r0, r2, 0 bl move_anim_task_del -_08103C02: +@08103C02: pop {r0} bx r0 .align 2, 0 @@ -494983,7 +494983,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 @@ -494997,7 +494997,7 @@ sub_8103C0C: @ 8103C0C strh r1, [r5, 0x8] lsls r0, 16 cmp r0, 0 - bgt _08103CE0 + bgt @08103CE0 ldr r0, =0x085933b0 movs r2, 0x1A ldrsh r1, [r5, r2] @@ -495020,13 +495020,13 @@ sub_8103C0C: @ 8103C0C movs r1, 0x10 ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _08103C6C + beq @08103C6C cmp r0, 0x2 - beq _08103C82 - b _08103C90 + beq @08103C82 + b @08103C90 .align 2, 0 .pool -_08103C6C: +@08103C6C: ldrb r2, [r6, 0x3] lsls r1, r2, 26 lsrs r1, 27 @@ -495037,8 +495037,8 @@ _08103C6C: ands r0, r2 orrs r0, r1 strb r0, [r6, 0x3] - b _08103C90 -_08103C82: + b @08103C90 +@08103C82: ldrb r0, [r6, 0x3] movs r1, 0x3F negs r1, r1 @@ -495046,7 +495046,7 @@ _08103C82: movs r0, 0x10 orrs r1, r0 strb r1, [r6, 0x3] -_08103C90: +@08103C90: ldr r3, =0x03005e00 lsls r2, r7, 2 adds r2, r7 @@ -495082,10 +495082,10 @@ _08103C90: movs r3, 0xA ldrsh r0, [r4, r3] cmp r0, 0x2 - ble _08103CE0 + ble @08103CE0 ldr r0, =sub_8103BE4 + 1 str r0, [r4] -_08103CE0: +@08103CE0: pop {r4-r7} pop {r0} bx r0 @@ -495094,7 +495094,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 @@ -495116,7 +495116,7 @@ sub_8103CF0: @ 8103CF0 lsls r0, 24 mov r10, r4 cmp r0, 0 - beq _08103D5C + beq @08103D5C ldr r1, =0x03005e00 lsls r2, r7, 2 adds r0, r2, r7 @@ -495133,20 +495133,20 @@ sub_8103CF0: @ 8103CF0 ands r0, r1 mov r8, r2 cmp r0, 0 - beq _08103D54 + beq @08103D54 movs r0, 0x2 negs r0, r0 ands r0, r1 strh r0, [r3, 0x4] - b _08103DB6 + b @08103DB6 .align 2, 0 .pool -_08103D54: +@08103D54: movs r0, 0x1 orrs r0, r1 strh r0, [r3, 0x4] - b _08103DB6 -_08103D5C: + b @08103DB6 +@08103D5C: ldr r1, =0x02024076 ldr r0, =0x02038437 ldrb r0, [r0] @@ -495158,7 +495158,7 @@ _08103D5C: lsls r2, r7, 2 mov r8, r2 cmp r0, 0 - bne _08103DB6 + bne @08103DB6 ldr r1, =0x03005e00 adds r0, r2, r7 lsls r0, 3 @@ -495175,19 +495175,19 @@ _08103D5C: adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _08103DB0 + beq @08103DB0 movs r0, 0x2 negs r0, r0 ands r0, r1 - b _08103DB4 + b @08103DB4 .align 2, 0 .pool -_08103DB0: +@08103DB0: movs r0, 0x1 orrs r0, r1 -_08103DB4: +@08103DB4: strh r0, [r2, 0x4] -_08103DB6: +@08103DB6: ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0 @@ -495213,7 +495213,7 @@ _08103DB6: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08103E20 + beq @08103E20 ldr r4, =0x02038437 ldrb r1, [r4] movs r0, 0x2 @@ -495221,16 +495221,16 @@ _08103DB6: bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _08103E20 + beq @08103E20 ldrb r0, [r4] movs r1, 0 mov r2, sp mov r3, r10 bl sub_80A8924 - b _08103E42 + b @08103E42 .align 2, 0 .pool -_08103E20: +@08103E20: mov r5, sp ldr r4, =0x02038437 ldrb r0, [r4] @@ -495246,7 +495246,7 @@ _08103E20: lsrs r0, 24 mov r1, r10 strh r0, [r1] -_08103E42: +@08103E42: mov r4, sp ldr r0, =0x03005e00 mov r2, r8 @@ -495273,14 +495273,14 @@ _08103E42: ldrsh r0, [r0, r3] adds r1, r6, 0 cmp r0, r1 - blt _08103E88 + blt @08103E88 subs r0, r2, r1 - b _08103E8A + b @08103E8A .align 2, 0 .pool -_08103E88: +@08103E88: subs r0, r1, r2 -_08103E8A: +@08103E8A: lsls r0, 16 lsrs r0, 16 lsls r4, r0, 16 @@ -495317,7 +495317,7 @@ _08103E8A: ldrsh r0, [r2, r3] mov r4, r9 cmp r0, r4 - blt _08103F08 + blt @08103F08 subs r4, r1, r4 lsls r4, 16 asrs r4, 16 @@ -495333,10 +495333,10 @@ _08103E8A: negs r1, r1 ands r1, r0 strh r1, [r6, 0x18] - b _08103F28 + b @08103F28 .align 2, 0 .pool -_08103F08: +@08103F08: subs r4, r1 lsls r4, 16 asrs r4, 16 @@ -495351,7 +495351,7 @@ _08103F08: movs r1, 0x1 orrs r0, r1 strh r0, [r6, 0x18] -_08103F28: +@08103F28: ldr r1, =0x03005e00 mov r3, r8 adds r0, r3, r7 @@ -495364,14 +495364,14 @@ _08103F28: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08103F78 + beq @08103F78 movs r0, 0x80 eors r0, r1 strh r0, [r4, 0x8] lsls r0, 16 asrs r0, 16 cmp r0, 0x3F - ble _08103FA0 + ble @08103FA0 ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A82E4 @@ -495382,14 +495382,14 @@ _08103F28: ldrh r4, [r4, 0x8] adds r1, r4 adds r0, r1 - b _08103FB0 + b @08103FB0 .align 2, 0 .pool -_08103F78: +@08103F78: lsls r0, r1, 16 asrs r0, 16 cmp r0, 0x3F - ble _08103FA0 + ble @08103FA0 ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A82E4 @@ -495400,10 +495400,10 @@ _08103F78: ldrh r4, [r4, 0x8] adds r1, r4 adds r0, r1 - b _08103FB0 + b @08103FB0 .align 2, 0 .pool -_08103FA0: +@08103FA0: ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A82E4 @@ -495411,7 +495411,7 @@ _08103FA0: lsrs r0, 24 ldrh r1, [r4, 0x8] subs r0, r1 -_08103FB0: +@08103FB0: strh r0, [r5, 0xC] ldr r0, =0x03005e00 mov r2, r8 @@ -495421,10 +495421,10 @@ _08103FB0: movs r3, 0xC ldrsh r0, [r1, r3] cmp r0, 0x2 - bgt _08103FC8 + bgt @08103FC8 movs r0, 0x3 strh r0, [r1, 0xC] -_08103FC8: +@08103FC8: ldr r0, =sub_8103C0C + 1 str r0, [r1] add sp, 0x4 @@ -495440,7 +495440,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 @@ -495464,7 +495464,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] @@ -495473,7 +495473,7 @@ sub_8104018: @ 8104018 lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - bne _0810407C + bne @0810407C movs r0, 0 strh r0, [r4, 0x30] ldrh r5, [r4, 0x2E] @@ -495493,14 +495493,14 @@ sub_8104018: @ 8104018 movs r3, 0x7 lsls r1, 1 adds r1, r6 -_08104050: +@08104050: ldrh r0, [r1] strh r0, [r2] adds r1, 0x2 adds r2, 0x2 subs r3, 0x1 cmp r3, 0 - bge _08104050 + bge @08104050 adds r0, r5, 0 adds r0, 0xF lsls r0, 1 @@ -495512,10 +495512,10 @@ _08104050: lsls r0, 16 asrs r0, 16 cmp r0, 0x18 - bne _0810407C + bne @0810407C adds r0, r4, 0 bl move_anim_8072740 -_0810407C: +@0810407C: pop {r4-r7} pop {r0} bx r0 @@ -495524,7 +495524,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 @@ -495551,11 +495551,11 @@ sub_8104088: @ 8104088 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _081040CC + beq @081040CC ldrh r0, [r4, 0x4] negs r0, r0 strh r0, [r4, 0x4] -_081040CC: +@081040CC: lsls r0, r6, 16 asrs r0, 16 ldrh r1, [r4, 0x4] @@ -495604,7 +495604,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] @@ -495618,7 +495618,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] @@ -495632,11 +495632,11 @@ sub_8104154: @ 8104154 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08104178 + bne @08104178 ldrh r0, [r4, 0x24] negs r0, r0 strh r0, [r4, 0x24] -_08104178: +@08104178: movs r1, 0x30 ldrsh r0, [r4, r1] movs r2, 0x32 @@ -495649,7 +495649,7 @@ _08104178: lsls r0, 16 asrs r0, 16 cmp r0, 0x7E - ble _081041B8 + ble @081041B8 movs r0, 0 strh r0, [r4, 0x30] movs r1, 0x32 @@ -495664,10 +495664,10 @@ _08104178: lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - bne _081041B8 + bne @081041B8 adds r0, r4, 0 bl move_anim_8072740 -_081041B8: +@081041B8: pop {r4} pop {r0} bx r0 @@ -495676,7 +495676,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 @@ -495715,7 +495715,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 @@ -495740,12 +495740,12 @@ sub_810421C: @ 810421C movs r1, 0x7 adds r0, r4, 0 adds r0, 0x3C -_08104250: +@08104250: strh r2, [r0] subs r0, 0x2 subs r1, 0x1 cmp r1, 0 - bge _08104250 + bge @08104250 bl GenerateRandomNumber2 lsls r0, 16 lsrs r0, 16 @@ -495778,7 +495778,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] @@ -495791,10 +495791,10 @@ sub_81042A0: @ 81042A0 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081042BE + beq @081042BE negs r0, r2 strh r0, [r4, 0x24] -_081042BE: +@081042BE: movs r1, 0x30 ldrsh r0, [r4, r1] movs r2, 0x3A @@ -495807,7 +495807,7 @@ _081042BE: lsls r0, 16 asrs r0, 16 cmp r0, 0x7E - ble _081042FE + ble @081042FE movs r0, 0 strh r0, [r4, 0x30] movs r1, 0x32 @@ -495822,17 +495822,17 @@ _081042BE: lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - bne _081042FE + bne @081042FE adds r0, r4, 0 bl move_anim_8072740 -_081042FE: +@081042FE: pop {r4} pop {r0} bx r0 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 @@ -495842,11 +495842,11 @@ sub_8104304: @ 8104304 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08104322 + bne @08104322 ldrh r0, [r4, 0x22] adds r0, 0x10 strh r0, [r4, 0x22] -_08104322: +@08104322: ldr r1, =0x0203841e ldrh r0, [r1, 0x8] strh r0, [r4, 0x2E] @@ -495874,7 +495874,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} @@ -495888,7 +495888,7 @@ sub_8104364: @ 8104364 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - beq _08104390 + beq @08104390 adds r7, r4, 0 movs r4, 0x20 mov r8, r6 @@ -495896,7 +495896,7 @@ sub_8104364: @ 8104364 adds r0, r5, 0 movs r1, 0x1 bl obj_anim_image_start -_08104390: +@08104390: lsls r0, r7, 16 asrs r0, 16 ldrh r1, [r5, 0x20] @@ -495939,7 +495939,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 @@ -495947,16 +495947,16 @@ sub_81043F8: @ 81043F8 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0810440E + beq @0810440E adds r0, r2, 0 bl move_anim_8072740 -_0810440E: +@0810440E: pop {r0} bx r0 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 @@ -495973,7 +495973,7 @@ sub_8104414: @ 8104414 movs r2, 0 ldrsh r0, [r7, r2] cmp r0, 0 - beq _08104448 + beq @08104448 mov r8, r4 movs r4, 0x20 mov r9, r6 @@ -495982,7 +495982,7 @@ sub_8104414: @ 8104414 lsrs r1, 24 adds r0, r5, 0 bl obj_anim_image_start -_08104448: +@08104448: mov r0, r8 lsls r1, r0, 16 asrs r1, 16 @@ -496033,20 +496033,20 @@ _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 lsls r0, 24 cmp r0, 0 - beq _08104520 + beq @08104520 adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08104520 + beq @08104520 adds r0, r4, 0 movs r1, 0 bl obj_anim_image_seek @@ -496082,7 +496082,7 @@ sub_81044BC: @ 81044BC strh r2, [r4, 0x34] ldr r0, =sub_8104530 + 1 str r0, [r4, 0x1C] -_08104520: +@08104520: pop {r4} pop {r0} bx r0 @@ -496091,20 +496091,20 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - beq _08104548 + beq @08104548 ldrh r0, [r4, 0x24] negs r0, r0 strh r0, [r4, 0x24] ldrh r0, [r4, 0x26] negs r0, r0 strh r0, [r4, 0x26] -_08104548: +@08104548: ldrh r0, [r4, 0x34] movs r1, 0x1 eors r0, r1 @@ -496116,7 +496116,7 @@ _08104548: lsls r0, 16 asrs r0, 16 cmp r0, 0x33 - bne _0810458A + bne @0810458A strh r1, [r4, 0x26] strh r1, [r4, 0x24] strh r1, [r4, 0x36] @@ -496137,7 +496137,7 @@ _08104548: bl obj_anim_image_start ldr r0, =sub_8104594 + 1 str r0, [r4, 0x1C] -_0810458A: +@0810458A: pop {r4} pop {r0} bx r0 @@ -496146,23 +496146,23 @@ _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 lsls r0, 24 cmp r0, 0 - beq _081045A8 + beq @081045A8 adds r0, r4, 0 bl move_anim_8072740 -_081045A8: +@081045A8: pop {r4} pop {r0} bx r0 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 @@ -496207,7 +496207,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 @@ -496224,7 +496224,7 @@ sub_8104614: @ 8104614 movs r0, 0x1 negs r0, r0 cmp r1, r0 - bne _08104664 + bne @08104664 movs r0, 0x1 bl obj_id_for_side_relative_to_move adds r4, r0, 0 @@ -496244,7 +496244,7 @@ sub_8104614: @ 8104614 bl sub_80A750C adds r0, r5, 0 bl move_anim_task_del -_08104664: +@08104664: pop {r4,r5} pop {r0} bx r0 @@ -496253,7 +496253,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 @@ -496294,7 +496294,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 @@ -496306,38 +496306,38 @@ sub_81046CC: @ 81046CC movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0x5 - bls _081046E6 - b _081047F6 -_081046E6: + bls @081046E6 + b @081047F6 +@081046E6: lsls r0, 2 - ldr r1, =_081046F8 + ldr r1, =@081046F8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081046F8: - .4byte _08104710 - .4byte _08104758 - .4byte _0810478E - .4byte _08104794 - .4byte _081047A4 - .4byte _081047D8 -_08104710: +@081046F8: + .4byte @08104710 + .4byte @08104758 + .4byte @0810478E + .4byte @08104794 + .4byte @081047A4 + .4byte @081047D8 +@08104710: movs r2, 0xC ldrsh r0, [r4, r2] cmp r0, 0 - beq _08104720 + beq @08104720 cmp r0, 0x3 - beq _08104720 + beq @08104720 cmp r0, 0x6 - bne _08104728 -_08104720: + bne @08104728 +@08104720: adds r0, r4, 0 adds r1, r5, 0 bl sub_8104800 -_08104728: +@08104728: ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] @@ -496355,24 +496355,24 @@ _08104728: movs r2, 0xC ldrsh r0, [r4, r2] cmp r0, 0x20 - bne _081047F6 + bne @081047F6 ldrh r0, [r4, 0x12] adds r0, 0x1 strh r0, [r4, 0x12] - b _081047D0 -_08104758: + b @081047D0 +@08104758: movs r1, 0x14 ldrsh r0, [r4, r1] cmp r0, 0 - bne _081047F6 + bne @081047F6 movs r2, 0x12 ldrsh r1, [r4, r2] cmp r1, 0x3 - bne _0810476E + bne @0810476E strh r0, [r4, 0xC] strh r1, [r4, 0xA] - b _081047F6 -_0810476E: + b @081047F6 +@0810476E: strh r0, [r4, 0xC] strh r0, [r4, 0xE] movs r2, 0x80 @@ -496386,21 +496386,21 @@ _0810476E: bl sub_80A7E6C movs r0, 0x2 strh r0, [r4, 0xA] - b _081047F6 -_0810478E: + b @081047F6 +@0810478E: movs r0, 0 strh r0, [r4, 0xA] - b _081047F6 -_08104794: + b @081047F6 +@08104794: ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] lsls r0, 16 asrs r0, 16 cmp r0, 0x20 - ble _081047F6 - b _081047CC -_081047A4: + ble @081047F6 + b @081047CC +@081047A4: ldrh r0, [r4, 0xC] adds r0, 0x2 strh r0, [r4, 0xC] @@ -496418,16 +496418,16 @@ _081047A4: movs r2, 0xC ldrsh r0, [r4, r2] cmp r0, 0x20 - bne _081047F6 -_081047CC: + bne @081047F6 +@081047CC: movs r0, 0 strh r0, [r4, 0xC] -_081047D0: +@081047D0: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] - b _081047F6 -_081047D8: + b @081047F6 +@081047D8: ldrb r0, [r4, 0x8] bl sub_80A7344 ldr r2, =0x02020630 @@ -496441,7 +496441,7 @@ _081047D8: strh r1, [r0, 0x26] adds r0, r5, 0 bl move_anim_task_del -_081047F6: +@081047F6: pop {r4,r5} pop {r0} bx r0 @@ -496450,7 +496450,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 @@ -496467,22 +496467,22 @@ sub_8104800: @ 8104800 lsls r0, 16 asrs r4, r0, 16 cmp r4, 0 - blt _081048DA + blt @081048DA bl rotscale_alloc_entry lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0xFF - bne _08104844 + bne @08104844 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 bl obj_delete_but_dont_free_vram - b _081048DA + b @081048DA .align 2, 0 .pool -_08104844: +@08104844: ldr r5, =0x02020630 lsls r3, r4, 4 adds r3, r4 @@ -496556,7 +496556,7 @@ _08104844: lsrs r3, 30 adds r0, r4, 0 bl oam_center -_081048DA: +@081048DA: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -496568,7 +496568,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] @@ -496576,7 +496576,7 @@ sub_81048F0: @ 81048F0 strh r0, [r4, 0x2E] lsls r0, 16 cmp r0, 0 - bne _0810492E + bne @0810492E ldr r3, =0x03005e00 movs r0, 0x32 ldrsh r1, [r4, r0] @@ -496598,7 +496598,7 @@ sub_81048F0: @ 81048F0 bl rotscale_free_entry adds r0, r4, 0 bl obj_delete_but_dont_free_vram -_0810492E: +@0810492E: pop {r4} pop {r0} bx r0 @@ -496607,7 +496607,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 @@ -496620,13 +496620,13 @@ sub_8104938: @ 8104938 movs r1, 0x2 ldrsh r0, [r5, r1] cmp r0, 0 - bne _08104964 + bne @08104964 adds r0, r2, 0 bl move_anim_task_del - b _0810498A + b @0810498A .align 2, 0 .pool -_08104964: +@08104964: ldrb r0, [r5] bl obj_id_for_side_relative_to_move adds r1, r0, 0 @@ -496644,7 +496644,7 @@ _08104964: bl sub_80A7CFC ldr r0, =sub_8104998 + 1 str r0, [r4] -_0810498A: +@0810498A: pop {r4,r5} pop {r0} bx r0 @@ -496653,7 +496653,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 @@ -496665,21 +496665,21 @@ sub_8104998: @ 8104998 movs r0, 0xA ldrsh r5, [r4, r0] cmp r5, 0x1 - beq _08104A00 + beq @08104A00 cmp r5, 0x1 - bgt _081049C0 + bgt @081049C0 cmp r5, 0 - beq _081049CA - b _08104AA8 + beq @081049CA + b @08104AA8 .align 2, 0 .pool -_081049C0: +@081049C0: cmp r5, 0x2 - beq _08104A34 + beq @08104A34 cmp r5, 0x3 - beq _08104A64 - b _08104AA8 -_081049CA: + beq @08104A64 + b @08104AA8 +@081049CA: adds r0, r4, 0 bl sub_80A7D34 ldrh r2, [r4, 0x10] @@ -496701,12 +496701,12 @@ _081049CA: lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - ble _08104AA8 + ble @08104AA8 strh r5, [r4, 0xE] - b _08104A5C + b @08104A5C .align 2, 0 .pool -_08104A00: +@08104A00: adds r0, r4, 0 bl sub_80A7D34 ldr r2, =0x02020630 @@ -496726,17 +496726,17 @@ _08104A00: lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - ble _08104AA8 + ble @08104AA8 movs r0, 0 strh r0, [r4, 0xE] - b _08104A5C + b @08104A5C .align 2, 0 .pool -_08104A34: +@08104A34: movs r1, 0x10 ldrsh r0, [r4, r1] cmp r0, 0 - beq _08104A5C + beq @08104A5C ldr r2, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] @@ -496750,27 +496750,27 @@ _08104A34: ldrh r0, [r4, 0x10] subs r0, 0x2 strh r0, [r4, 0x10] - b _08104AA8 + b @08104AA8 .align 2, 0 .pool -_08104A5C: +@08104A5C: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] - b _08104AA8 -_08104A64: + b @08104AA8 +@08104A64: adds r0, r4, 0 bl sub_80A7D34 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _08104AA8 + bne @08104AA8 ldrh r0, [r4, 0xC] subs r0, 0x1 strh r0, [r4, 0xC] lsls r0, 16 cmp r0, 0 - bne _08104A9C + bne @08104A9C ldr r2, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] @@ -496781,16 +496781,16 @@ _08104A64: strh r5, [r0, 0x26] adds r0, r6, 0 bl move_anim_task_del - b _08104AA8 + b @08104AA8 .align 2, 0 .pool -_08104A9C: +@08104A9C: ldrb r1, [r4, 0x8] ldr r2, =0x085935e8 adds r0, r4, 0 bl sub_80A7CFC strh r5, [r4, 0xA] -_08104AA8: +@08104AA8: pop {r4-r6} pop {r0} bx r0 @@ -496799,7 +496799,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 @@ -496826,7 +496826,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 @@ -496838,10 +496838,10 @@ sub_8104AF0: @ 8104AF0 bl sub_80A7D34 lsls r0, 24 cmp r0, 0 - bne _08104B10 + bne @08104B10 adds r0, r4, 0 bl move_anim_task_del -_08104B10: +@08104B10: pop {r4} pop {r0} bx r0 @@ -496850,7 +496850,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 @@ -496858,7 +496858,7 @@ sub_8104B1C: @ 8104B1C bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08104B50 + bne @08104B50 adds r0, r4, 0 movs r1, 0 bl obj_anim_image_start @@ -496870,10 +496870,10 @@ sub_8104B1C: @ 8104B1C adds r0, 0x20 strh r0, [r4, 0x20] movs r0, 0x40 - b _08104B6A + b @08104B6A .align 2, 0 .pool -_08104B50: +@08104B50: adds r0, r4, 0 movs r1, 0x1 bl obj_anim_image_start @@ -496885,7 +496885,7 @@ _08104B50: subs r0, 0x20 strh r0, [r4, 0x20] ldr r0, =0x0000ffc0 -_08104B6A: +@08104B6A: strh r0, [r4, 0x30] ldr r0, =0x02038436 ldrb r0, [r0] @@ -496913,34 +496913,34 @@ _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 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08104BC8 + bne @08104BC8 ldr r0, =0x02038436 - b _08104BCA + b @08104BCA .align 2, 0 .pool -_08104BC8: +@08104BC8: ldr r0, =0x02038437 -_08104BCA: +@08104BCA: ldrb r5, [r0] adds r0, r5, 0 bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08104BE4 + bne @08104BE4 ldr r1, =0x0203841e movs r2, 0x2 ldrsh r0, [r1, r2] negs r0, r0 strh r0, [r1, 0x2] -_08104BE4: +@08104BE4: adds r0, r5, 0 movs r1, 0x2 bl sub_80A5C6C @@ -496961,10 +496961,10 @@ _08104BE4: lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - bgt _08104C16 + bgt @08104C16 movs r0, 0x8 strh r0, [r6, 0x22] -_08104C16: +@08104C16: ldr r1, =move_anim_8074EE0 + 1 adds r0, r6, 0 bl oamt_set_x3A_32 @@ -496978,7 +496978,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 @@ -497008,7 +497008,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 @@ -497020,10 +497020,10 @@ sub_8104C78: @ 8104C78 bl sub_80A7D34 lsls r0, 24 cmp r0, 0 - bne _08104C98 + bne @08104C98 adds r0, r4, 0 bl move_anim_task_del -_08104C98: +@08104C98: pop {r4} pop {r0} bx r0 @@ -497032,7 +497032,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 @@ -497079,12 +497079,12 @@ sub_8104CA4: @ 8104CA4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08104D0E + bne @08104D0E movs r1, 0xC ldrsh r0, [r4, r1] negs r0, r0 strh r0, [r4, 0xC] -_08104D0E: +@08104D0E: ldr r0, =sub_8104D28 + 1 str r0, [r4] pop {r4} @@ -497095,7 +497095,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 @@ -497110,7 +497110,7 @@ sub_8104D28: @ 8104D28 lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - ble _08104D8E + ble @08104D8E movs r0, 0 strh r0, [r3, 0x16] ldrh r0, [r3, 0x18] @@ -497119,7 +497119,7 @@ sub_8104D28: @ 8104D28 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08104D78 + beq @08104D78 ldr r2, =0x02020630 movs r0, 0x8 ldrsh r1, [r3, r0] @@ -497130,10 +497130,10 @@ sub_8104D28: @ 8104D28 ldrh r1, [r3, 0x1A] ldrh r2, [r0, 0x22] adds r1, r2 - b _08104D8C + b @08104D8C .align 2, 0 .pool -_08104D78: +@08104D78: ldr r2, =0x02020630 movs r5, 0x8 ldrsh r1, [r3, r5] @@ -497144,25 +497144,25 @@ _08104D78: ldrh r1, [r0, 0x22] ldrh r2, [r3, 0x1A] subs r1, r2 -_08104D8C: +@08104D8C: strh r1, [r0, 0x22] -_08104D8E: +@08104D8E: movs r1, 0xA ldrsh r0, [r3, r1] cmp r0, 0x1 - beq _08104DDC + beq @08104DDC cmp r0, 0x1 - bgt _08104DA4 + bgt @08104DA4 cmp r0, 0 - beq _08104DAA - b _08104E6C + beq @08104DAA + b @08104E6C .align 2, 0 .pool -_08104DA4: +@08104DA4: cmp r0, 0x2 - beq _08104E0C - b _08104E6C -_08104DAA: + beq @08104E0C + b @08104E6C +@08104DAA: ldr r2, =0x02020630 movs r5, 0x8 ldrsh r1, [r3, r5] @@ -497179,15 +497179,15 @@ _08104DAA: strh r0, [r3, 0xE] lsls r0, 16 cmp r0, 0 - bne _08104E6C + bne @08104E6C movs r0, 0xE strh r0, [r3, 0xE] movs r0, 0x1 strh r0, [r3, 0xA] - b _08104E6C + b @08104E6C .align 2, 0 .pool -_08104DDC: +@08104DDC: ldr r2, =0x02020630 movs r5, 0x8 ldrsh r1, [r3, r5] @@ -497204,15 +497204,15 @@ _08104DDC: strh r0, [r3, 0xE] lsls r0, 16 cmp r0, 0 - bne _08104E6C + bne @08104E6C movs r0, 0x7 strh r0, [r3, 0xE] movs r0, 0x2 strh r0, [r3, 0xA] - b _08104E6C + b @08104E6C .align 2, 0 .pool -_08104E0C: +@08104E0C: ldr r2, =0x02020630 movs r0, 0x8 ldrsh r1, [r3, r0] @@ -497230,25 +497230,25 @@ _08104E0C: lsls r0, 16 asrs r1, r0, 16 cmp r1, 0 - bne _08104E6C + bne @08104E6C ldrh r0, [r3, 0x10] subs r0, 0x1 strh r0, [r3, 0x10] lsls r0, 16 cmp r0, 0 - beq _08104E48 + beq @08104E48 movs r0, 0x7 strh r0, [r3, 0xE] strh r1, [r3, 0xA] - b _08104E6C + b @08104E6C .align 2, 0 .pool -_08104E48: +@08104E48: ldrh r1, [r3, 0x18] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08104E66 + beq @08104E66 movs r0, 0x8 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -497259,17 +497259,17 @@ _08104E48: ldrh r2, [r3, 0x1A] subs r1, r2 strh r1, [r0, 0x22] -_08104E66: +@08104E66: adds r0, r4, 0 bl move_anim_task_del -_08104E6C: +@08104E6C: pop {r4,r5} pop {r0} bx r0 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 @@ -497301,20 +497301,20 @@ sub_8104E74: @ 8104E74 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08104ED4 + bne @08104ED4 ldr r0, =0x02022e18 ldrh r0, [r0] strh r0, [r5, 0x14] ldr r0, =0x04000014 - b _08104EDC + b @08104EDC .align 2, 0 .pool -_08104ED4: +@08104ED4: ldr r0, =0x02022e1c ldrh r0, [r0] strh r0, [r5, 0x14] ldr r0, =0x04000018 -_08104EDC: +@08104EDC: str r0, [sp] ldrh r0, [r5, 0x8] adds r1, r0, 0 @@ -497322,15 +497322,15 @@ _08104EDC: lsls r2, r1, 16 lsls r0, 16 cmp r2, r0 - bgt _08104F1A + bgt @08104F1A ldr r4, =0x02038c28 movs r0, 0xF0 lsls r0, 3 adds r6, r4, r0 -_08104EF4: +@08104EF4: asrs r3, r2, 16 cmp r3, 0 - blt _08104F0C + blt @08104F0C lsls r1, r3, 1 adds r2, r1, r4 ldrh r0, [r5, 0x14] @@ -497340,15 +497340,15 @@ _08104EF4: ldrh r0, [r5, 0x14] adds r0, 0xF0 strh r0, [r1] -_08104F0C: +@08104F0C: adds r0, r3, 0x1 lsls r2, r0, 16 asrs r1, r2, 16 movs r3, 0x8 ldrsh r0, [r5, r3] cmp r1, r0 - ble _08104EF4 -_08104F1A: + ble @08104EF4 +@08104F1A: ldr r0, =0xa2600001 str r0, [sp, 0x4] mov r1, sp @@ -497372,7 +497372,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 @@ -497384,32 +497384,32 @@ sub_8104F54: @ 8104F54 movs r1, 0x10 ldrsh r0, [r3, r1] cmp r0, 0 - beq _08104F78 + beq @08104F78 cmp r0, 0x1 - beq _08104F8E - b _0810500E + beq @08104F8E + b @0810500E .align 2, 0 .pool -_08104F78: +@08104F78: ldrh r0, [r3, 0x12] adds r0, 0x1 strh r0, [r3, 0x12] lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - ble _0810500E + ble @0810500E ldrh r0, [r3, 0x10] adds r0, 0x1 strh r0, [r3, 0x10] - b _0810500E -_08104F8E: + b @0810500E +@08104F8E: ldrh r0, [r3, 0xA] adds r0, 0x1 strh r0, [r3, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble _0810500E + ble @0810500E movs r0, 0 strh r0, [r3, 0xA] ldrh r1, [r3, 0xE] @@ -497422,26 +497422,26 @@ _08104F8E: movs r2, 0xC ldrsh r1, [r3, r2] cmp r1, 0x1 - beq _08104FC4 + beq @08104FC4 cmp r1, 0x1 - ble _08104FCC + ble @08104FCC cmp r1, 0x2 - beq _08104FC8 + beq @08104FC8 cmp r1, 0x3 - beq _08104FC8 - b _08104FCC -_08104FC4: + beq @08104FC8 + b @08104FCC +@08104FC4: subs r0, 0x2 - b _08104FCA -_08104FC8: + b @08104FCA +@08104FC8: adds r0, 0x1 -_08104FCA: +@08104FCA: strh r0, [r3, 0x12] -_08104FCC: +@08104FCC: movs r1, 0x12 ldrsh r0, [r3, r1] cmp r0, 0 - blt _08104FF0 + blt @08104FF0 ldr r2, =0x02038c28 lsls r0, 1 adds r0, r2 @@ -497456,7 +497456,7 @@ _08104FCC: adds r0, r2 ldrh r1, [r3, 0x14] strh r1, [r0] -_08104FF0: +@08104FF0: ldrh r0, [r3, 0xE] adds r0, 0x1 strh r0, [r3, 0xE] @@ -497465,13 +497465,13 @@ _08104FF0: movs r2, 0x26 ldrsh r1, [r3, r2] cmp r0, r1 - blt _0810500E + blt @0810500E ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] adds r0, r4, 0 bl move_anim_task_del -_0810500E: +@0810500E: pop {r4} pop {r0} bx r0 @@ -497480,7 +497480,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 @@ -497524,30 +497524,30 @@ 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 ldrsh r1, [r4, r0] cmp r1, 0x1 - beq _081050DC + beq @081050DC cmp r1, 0x1 - bgt _0810508E + bgt @0810508E cmp r1, 0 - beq _08105094 - b _081051BC -_0810508E: + beq @08105094 + b @081051BC +@0810508E: cmp r1, 0x2 - beq _0810516E - b _081051BC -_08105094: + beq @0810516E + b @081051BC +@08105094: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _081050BE + ble @081050BE strh r1, [r4, 0x32] adds r3, r4, 0 adds r3, 0x3E @@ -497562,14 +497562,14 @@ _08105094: ands r0, r2 orrs r0, r1 strb r0, [r3] -_081050BE: +@081050BE: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x10 - ble _081051BC + ble @081051BC adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -497577,22 +497577,22 @@ _081050BE: negs r1, r1 ands r1, r0 strb r1, [r2] - b _08105166 -_081050DC: + b @08105166 +@081050DC: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble _08105122 + ble @08105122 ldrh r2, [r4, 0x32] movs r3, 0x32 ldrsh r1, [r4, r3] movs r3, 0x38 ldrsh r0, [r4, r3] cmp r1, r0 - bge _08105122 + bge @08105122 movs r0, 0 strh r0, [r4, 0x30] ldrh r0, [r4, 0x22] @@ -497606,13 +497606,13 @@ _081050DC: bl __modsi3 lsls r0, 16 cmp r0, 0 - bne _08105122 + bne @08105122 ldrh r1, [r4, 0x3A] lsls r1, 24 asrs r1, 24 movs r0, 0xCD bl audio_play_and_stuff -_08105122: +@08105122: ldrh r0, [r4, 0x34] ldrh r2, [r4, 0x36] adds r1, r0, r2 @@ -497620,25 +497620,25 @@ _08105122: lsls r0, r1, 16 asrs r2, r0, 16 cmp r2, 0x1F - ble _08105136 + ble @08105136 movs r0, 0x40 - b _08105144 -_08105136: + b @08105144 +@08105136: movs r0, 0x20 negs r0, r0 cmp r2, r0 - bgt _08105150 + bgt @08105150 movs r2, 0x40 negs r2, r2 adds r0, r2, 0 -_08105144: +@08105144: subs r0, r1 strh r0, [r4, 0x36] movs r3, 0x34 ldrsh r0, [r4, r3] negs r0, r0 strh r0, [r4, 0x34] -_08105150: +@08105150: ldrh r0, [r4, 0x36] movs r2, 0 strh r0, [r4, 0x24] @@ -497647,22 +497647,22 @@ _08105150: movs r3, 0x32 ldrsh r0, [r4, r3] cmp r1, r0 - bne _081051BC + bne @081051BC strh r2, [r4, 0x30] strh r2, [r4, 0x32] -_08105166: +@08105166: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _081051BC -_0810516E: + b @081051BC +@0810516E: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0810519A + ble @0810519A movs r0, 0 strh r0, [r4, 0x32] adds r3, r4, 0 @@ -497678,14 +497678,14 @@ _0810516E: ands r0, r2 orrs r0, r1 strb r0, [r3] -_0810519A: +@0810519A: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x10 - ble _081051BC + ble @081051BC adds r2, r4, 0 adds r2, 0x3E ldrb r1, [r2] @@ -497695,14 +497695,14 @@ _0810519A: strb r0, [r2] adds r0, r4, 0 bl move_anim_8072740 -_081051BC: +@081051BC: pop {r4} pop {r0} bx r0 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 @@ -497718,14 +497718,14 @@ sub_81051C4: @ 81051C4 adds r7, r1, 0 adds r1, r0, 0 cmp r2, 0 - bne _081051F0 + bne @081051F0 ldr r0, =0x02038436 - b _081051F2 + b @081051F2 .align 2, 0 .pool -_081051F0: +@081051F0: ldr r0, =0x02038437 -_081051F2: +@081051F2: ldrb r5, [r0] ldrb r1, [r1, 0x6] movs r0, 0x1 @@ -497734,30 +497734,30 @@ _081051F2: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _0810526A + beq @0810526A movs r1, 0x2 adds r0, r5, 0 eors r0, r1 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _0810526A + beq @0810526A adds r0, r5, 0 adds r1, r4, 0 mov r2, sp adds r3, r7, 0 bl sub_80A8924 cmp r4, 0 - bne _08105230 + bne @08105230 adds r0, r5, 0 movs r1, 0 - b _08105234 + b @08105234 .align 2, 0 .pool -_08105230: +@08105230: adds r0, r5, 0 movs r1, 0x2 -_08105234: +@08105234: bl sub_80A5C6C lsls r0, 24 lsrs r4, r0, 24 @@ -497765,7 +497765,7 @@ _08105234: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08105260 + beq @08105260 ldr r2, =0x0203841e mov r0, sp ldrh r1, [r0] @@ -497774,16 +497774,16 @@ _08105234: subs r1, r0 subs r0, r1 strh r0, [r2] - b _0810526A + b @0810526A .align 2, 0 .pool -_08105260: +@08105260: ldr r1, =0x0203841e mov r0, sp ldrh r0, [r0] subs r0, r4 strh r0, [r1] -_0810526A: +@0810526A: ldr r1, =sub_80A77C8 + 1 str r1, [r6, 0x1C] adds r0, r6, 0 @@ -497797,25 +497797,25 @@ _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 lsls r0, 24 cmp r0, 0 - beq _0810529E + beq @0810529E adds r0, r4, 0 bl obj_free_rotscale_entry adds r0, r4, 0 bl move_anim_8072740 -_0810529E: +@0810529E: pop {r4} pop {r0} bx r0 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 @@ -497833,43 +497833,43 @@ sub_81052A4: @ 81052A4 movs r2, 0xA ldrsh r0, [r0, r2] cmp r0, 0 - bne _081052DC + bne @081052DC ldr r0, =0x02038436 ldrb r7, [r0] ldr r0, =0x02038437 - b _081052E2 + b @081052E2 .align 2, 0 .pool -_081052DC: +@081052DC: ldr r0, =0x02038437 ldrb r7, [r0] ldr r0, =0x02038436 -_081052E2: +@081052E2: ldrb r0, [r0] mov r8, r0 ldr r0, =0x0203841e movs r3, 0xC ldrsh r0, [r0, r3] cmp r0, 0 - bne _08105308 + bne @08105308 movs r0, 0 mov r10, r0 movs r1, 0x1 str r1, [sp, 0x4] - b _08105310 + b @08105310 .align 2, 0 .pool -_08105308: +@08105308: movs r2, 0x2 mov r10, r2 movs r3, 0x3 str r3, [sp, 0x4] -_08105310: +@08105310: adds r0, r7, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810536C + beq @0810536C adds r0, r7, 0 mov r1, r10 bl sub_80A5C6C @@ -497888,21 +497888,21 @@ _08105310: bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _0810535C + beq @0810535C ldr r2, =0x02020630 ldr r0, =0x020241e4 adds r0, r4, r0 - b _081053EA + b @081053EA .align 2, 0 .pool -_0810535C: +@0810535C: ldr r2, =0x02020630 ldr r0, =0x020241e4 add r0, r8 - b _081053EA + b @081053EA .align 2, 0 .pool -_0810536C: +@0810536C: adds r0, r7, 0 mov r1, r10 bl sub_80A5C6C @@ -497917,7 +497917,7 @@ _0810536C: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _081053E4 + bne @081053E4 movs r0, 0x2 adds r4, r7, 0 eors r4, r0 @@ -497925,7 +497925,7 @@ _0810536C: bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _081053E4 + beq @081053E4 ldr r3, =0x02020630 ldr r2, =0x020241e4 adds r0, r7, r2 @@ -497945,32 +497945,32 @@ _0810536C: movs r3, 0x20 ldrsh r0, [r2, r3] cmp r1, r0 - bge _081053E0 + bge @081053E0 adds r0, r2, 0 adds r0, 0x43 ldrb r0, [r0] adds r0, 0x1 - b _081053FA + b @081053FA .align 2, 0 .pool -_081053E0: +@081053E0: adds r0, r6, 0 - b _081053F4 -_081053E4: + b @081053F4 +@081053E4: ldr r2, =0x02020630 ldr r0, =0x020241e4 adds r0, r7, r0 -_081053EA: +@081053EA: ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r2 -_081053F4: +@081053F4: adds r0, 0x43 ldrb r0, [r0] subs r0, 0x1 -_081053FA: +@081053FA: adds r1, r5, 0 adds r1, 0x43 strb r0, [r1] @@ -497987,24 +497987,24 @@ _081053FA: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0810544C + bne @0810544C movs r1, 0x2 mov r0, r8 eors r0, r1 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _0810544C + beq @0810544C ldrb r1, [r4, 0xC] mov r0, r8 mov r2, sp mov r3, sp adds r3, 0x2 bl sub_80A8924 - b _0810546C + b @0810546C .align 2, 0 .pool -_0810544C: +@0810544C: mov r4, sp mov r0, r8 mov r1, r10 @@ -498019,12 +498019,12 @@ _0810544C: lsrs r0, 24 mov r2, sp strh r0, [r2, 0x2] -_0810546C: +@0810546C: mov r0, r8 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08105490 + beq @08105490 mov r3, sp mov r2, sp ldr r1, =0x0203841e @@ -498033,10 +498033,10 @@ _0810546C: adds r0, r2 strh r0, [r3] adds r2, r1, 0 - b _0810549E + b @0810549E .align 2, 0 .pool -_08105490: +@08105490: mov r3, sp mov r0, sp ldr r2, =0x0203841e @@ -498044,7 +498044,7 @@ _08105490: ldrh r1, [r2, 0x6] subs r0, r1 strh r0, [r3] -_0810549E: +@0810549E: ldrh r1, [r2, 0x8] mov r3, sp ldrh r3, [r3, 0x2] @@ -498080,7 +498080,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 @@ -498088,7 +498088,7 @@ sub_81054E8: @ 81054E8 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _0810550E + beq @0810550E lsls r0, 20 ldr r1, =0x01010000 adds r0, r1 @@ -498098,7 +498098,7 @@ sub_81054E8: @ 81054E8 ldrh r3, [r1, 0x8] movs r1, 0xF bl pal_fade_1 -_0810550E: +@0810550E: adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 @@ -498114,7 +498114,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 @@ -498125,9 +498125,9 @@ sub_8105538: @ 8105538 lsls r0, 24 movs r1, 0xA0 cmp r0, 0 - beq _08105554 + beq @08105554 ldr r1, =0x0000ff60 -_08105554: +@08105554: movs r0, 0xE0 lsls r0, 2 strh r0, [r4, 0x2E] @@ -498145,7 +498145,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] @@ -498167,9 +498167,9 @@ sub_810557C: @ 810557C lsls r0, 24 movs r1, 0xA0 cmp r0, 0 - beq _081055AC + beq @081055AC ldr r1, =0x0000ff60 -_081055AC: +@081055AC: lsls r0, r1, 16 asrs r0, 16 ldrh r1, [r4, 0x30] @@ -498179,7 +498179,7 @@ _081055AC: movs r2, 0x26 ldrsh r0, [r4, r2] cmp r0, 0 - ble _081055E0 + ble @081055E0 ldrh r2, [r4, 0x22] adds r0, r1, r2 strh r0, [r4, 0x22] @@ -498195,7 +498195,7 @@ _081055AC: bl sub_8008258 ldr r0, =sub_81055F4 + 1 str r0, [r4, 0x1C] -_081055E0: +@081055E0: pop {r4,r5} pop {r0} bx r0 @@ -498204,7 +498204,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] @@ -498213,13 +498213,13 @@ sub_81055F4: @ 81055F4 lsls r0, 16 asrs r0, 16 cmp r0, 0x13 - ble _08105612 + ble @08105612 adds r0, r4, 0 movs r1, 0x2 bl sub_8008258 ldr r0, =sub_810561C + 1 str r0, [r4, 0x1C] -_08105612: +@08105612: pop {r4} pop {r0} bx r0 @@ -498228,7 +498228,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 @@ -498236,7 +498236,7 @@ sub_810561C: @ 810561C movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _08105682 + beq @08105682 adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 @@ -498245,7 +498245,7 @@ sub_810561C: @ 810561C movs r1, 0x3C ldrsh r0, [r4, r1] cmp r0, 0 - bne _08105668 + bne @08105668 ldrh r2, [r4, 0x4] lsls r1, r2, 22 lsrs r1, 22 @@ -498258,10 +498258,10 @@ sub_810561C: @ 810561C orrs r0, r1 strh r0, [r4, 0x4] ldr r0, =sub_8105694 + 1 - b _08105680 + b @08105680 .align 2, 0 .pool -_08105668: +@08105668: ldrh r2, [r4, 0x4] lsls r1, r2, 22 lsrs r1, 22 @@ -498274,9 +498274,9 @@ _08105668: orrs r0, r1 strh r0, [r4, 0x4] ldr r0, =sub_810571C + 1 -_08105680: +@08105680: str r0, [r4, 0x1C] -_08105682: +@08105682: pop {r4} pop {r0} bx r0 @@ -498285,7 +498285,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] @@ -498297,7 +498297,7 @@ sub_8105694: @ 8105694 lsls r0, 16 asrs r0, 16 cmp r0, 0x9 - bne _081056CA + bne @081056CA movs r0, 0x10 strh r0, [r4, 0x2E] movs r0, 0 @@ -498311,7 +498311,7 @@ sub_8105694: @ 8105694 bl lcd_io_set ldr r0, =sub_81056D4 + 1 str r0, [r4, 0x1C] -_081056CA: +@081056CA: pop {r4} pop {r0} bx r0 @@ -498320,7 +498320,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] @@ -498332,7 +498332,7 @@ sub_81056D4: @ 81056D4 bl __modsi3 lsls r0, 16 cmp r0, 0 - bne _08105712 + bne @08105712 ldrh r1, [r4, 0x2E] subs r1, 0x1 strh r1, [r4, 0x2E] @@ -498347,10 +498347,10 @@ sub_81056D4: @ 81056D4 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - bne _08105712 + bne @08105712 ldr r0, =sub_810571C + 1 str r0, [r4, 0x1C] -_08105712: +@08105712: pop {r4} pop {r0} bx r0 @@ -498359,14 +498359,14 @@ _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 ldrh r1, [r0, 0xE] ldr r0, =0x0000ffff cmp r1, r0 - bne _08105754 + bne @08105754 adds r2, r3, 0 adds r2, 0x3E ldrb r0, [r2] @@ -498376,16 +498376,16 @@ sub_810571C: @ 810571C movs r1, 0x3C ldrsh r0, [r3, r1] cmp r0, 0 - bne _08105750 + bne @08105750 ldr r0, =sub_810575C + 1 - b _08105752 + b @08105752 .align 2, 0 .pool -_08105750: +@08105750: ldr r0, =move_anim_8072740 + 1 -_08105752: +@08105752: str r0, [r3, 0x1C] -_08105754: +@08105754: pop {r0} bx r0 .align 2, 0 @@ -498393,7 +498393,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 @@ -498410,7 +498410,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 @@ -498438,7 +498438,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 @@ -498452,7 +498452,7 @@ sub_81057B8: @ 81057B8 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - bne _08105802 + bne @08105802 ldr r2, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] @@ -498474,7 +498474,7 @@ sub_81057B8: @ 81057B8 strb r1, [r0] adds r0, r5, 0 bl move_anim_task_del -_08105802: +@08105802: pop {r4,r5} pop {r0} bx r0 @@ -498483,7 +498483,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 @@ -498504,18 +498504,18 @@ sub_8105810: @ 8105810 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08105850 + bne @08105850 ldr r0, =0x0000ffff strh r0, [r4, 0x22] movs r0, 0x8 - b _08105856 + b @08105856 .align 2, 0 .pool -_08105850: +@08105850: movs r0, 0x1 strh r0, [r4, 0x22] ldr r0, =0x0000fff8 -_08105856: +@08105856: strh r0, [r4, 0x24] movs r0, 0x1 bl obj_id_for_side_relative_to_move @@ -498532,7 +498532,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 @@ -498544,21 +498544,21 @@ sub_8105878: @ 8105878 movs r0, 0x8 ldrsh r4, [r3, r0] cmp r4, 0x1 - beq _081058CC + beq @081058CC cmp r4, 0x1 - bgt _081058A0 + bgt @081058A0 cmp r4, 0 - beq _081058AA - b _08105992 + beq @081058AA + b @08105992 .align 2, 0 .pool -_081058A0: +@081058A0: cmp r4, 0x2 - beq _08105948 + beq @08105948 cmp r4, 0x3 - beq _08105962 - b _08105992 -_081058AA: + beq @08105962 + b @08105992 +@081058AA: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r3, r0] @@ -498573,17 +498573,17 @@ _081058AA: strh r4, [r3, 0xA] strh r4, [r3, 0xC] strh r4, [r3, 0xE] - b _0810595A + b @0810595A .align 2, 0 .pool -_081058CC: +@081058CC: ldrh r0, [r3, 0xA] adds r0, 0x1 strh r0, [r3, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _08105992 + ble @08105992 movs r0, 0 strh r0, [r3, 0xA] ldrh r0, [r3, 0xC] @@ -498592,7 +498592,7 @@ _081058CC: ands r0, r4 lsls r0, 16 cmp r0, 0 - beq _08105904 + beq @08105904 ldr r2, =0x02020630 movs r4, 0x26 ldrsh r1, [r3, r4] @@ -498602,10 +498602,10 @@ _081058CC: adds r0, r2 ldrh r1, [r0, 0x24] adds r1, 0x6 - b _08105916 + b @08105916 .align 2, 0 .pool -_08105904: +@08105904: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r3, r0] @@ -498615,7 +498615,7 @@ _08105904: adds r0, r2 ldrh r1, [r0, 0x24] subs r1, 0x6 -_08105916: +@08105916: strh r1, [r0, 0x24] ldrh r0, [r3, 0xE] adds r0, 0x1 @@ -498623,12 +498623,12 @@ _08105916: lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _08105992 + ble @08105992 ldrh r1, [r3, 0xC] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0810595A + beq @0810595A movs r1, 0x26 ldrsh r0, [r3, r1] lsls r1, r0, 4 @@ -498638,25 +498638,25 @@ _08105916: ldrh r0, [r1, 0x24] subs r0, 0x6 strh r0, [r1, 0x24] - b _0810595A + b @0810595A .align 2, 0 .pool -_08105948: +@08105948: ldrh r0, [r3, 0x20] subs r0, 0x1 strh r0, [r3, 0x20] lsls r0, 16 cmp r0, 0 - beq _0810595A + beq @0810595A movs r0, 0 strh r0, [r3, 0x8] - b _08105992 -_0810595A: + b @08105992 +@0810595A: ldrh r0, [r3, 0x8] adds r0, 0x1 strh r0, [r3, 0x8] - b _08105992 -_08105962: + b @08105992 +@08105962: ldr r2, =0x02020630 movs r4, 0x26 ldrsh r1, [r3, r4] @@ -498677,10 +498677,10 @@ _08105962: movs r1, 0x24 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08105992 + bne @08105992 adds r0, r5, 0 bl move_anim_task_del -_08105992: +@08105992: pop {r4,r5} pop {r0} bx r0 @@ -498689,7 +498689,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 @@ -498724,7 +498724,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 @@ -498736,7 +498736,7 @@ sub_81059E0: @ 81059E0 movs r0, 0x8 ldrsh r2, [r4, r0] cmp r2, 0 - bne _08105AA6 + bne @08105AA6 ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] @@ -498745,7 +498745,7 @@ sub_81059E0: @ 81059E0 movs r3, 0x10 ldrsh r1, [r4, r3] cmp r0, r1 - ble _08105AA6 + ble @08105AA6 strh r2, [r4, 0xA] ldrh r0, [r4, 0xC] adds r0, 0x1 @@ -498753,7 +498753,7 @@ sub_81059E0: @ 81059E0 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08105A3C + beq @08105A3C ldr r3, =0x02020630 movs r6, 0x26 ldrsh r1, [r4, r6] @@ -498766,10 +498766,10 @@ sub_81059E0: @ 81059E0 movs r1, 0x5 negs r1, r1 ands r1, r2 - b _08105A52 + b @08105A52 .align 2, 0 .pool -_08105A3C: +@08105A3C: ldr r3, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -498781,7 +498781,7 @@ _08105A3C: ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 -_08105A52: +@08105A52: strb r1, [r0] ldrh r0, [r4, 0xE] adds r0, 0x1 @@ -498792,7 +498792,7 @@ _08105A52: movs r6, 0x22 ldrsh r1, [r4, r6] cmp r0, r1 - blt _08105AA6 + blt @08105AA6 ldrh r0, [r4, 0x10] adds r0, 0x1 strh r0, [r4, 0x10] @@ -498801,14 +498801,14 @@ _08105A52: movs r6, 0x24 ldrsh r1, [r4, r6] cmp r0, r1 - bge _08105A88 + bge @08105A88 strh r2, [r4, 0xA] strh r2, [r4, 0xC] strh r2, [r4, 0xE] - b _08105AA6 + b @08105AA6 .align 2, 0 .pool -_08105A88: +@08105A88: movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -498823,14 +498823,14 @@ _08105A88: strb r1, [r0] adds r0, r5, 0 bl move_anim_task_del -_08105AA6: +@08105AA6: pop {r4-r6} pop {r0} bx r0 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 @@ -498874,7 +498874,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 @@ -498886,26 +498886,26 @@ sub_8105B08: @ 8105B08 movs r0, 0x18 ldrsh r2, [r4, r0] cmp r2, 0x1 - beq _08105B74 + beq @08105B74 cmp r2, 0x1 - bgt _08105B30 + bgt @08105B30 cmp r2, 0 - beq _08105B36 - b _08105B90 + beq @08105B36 + b @08105B90 .align 2, 0 .pool -_08105B30: +@08105B30: cmp r2, 0x2 - beq _08105B8C - b _08105B90 -_08105B36: + beq @08105B8C + b @08105B90 +@08105B36: ldrh r0, [r4, 0x10] adds r0, 0x1 strh r0, [r4, 0x10] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _08105B90 + ble @08105B90 strh r2, [r4, 0x10] ldrh r0, [r4, 0x12] adds r0, 0x1 @@ -498918,20 +498918,20 @@ _08105B36: lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - ble _08105B90 + ble @08105B90 movs r1, 0x16 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08105B6E + bne @08105B6E strh r2, [r4, 0x14] movs r0, 0x1 strh r0, [r4, 0x18] - b _08105B90 -_08105B6E: + b @08105B90 +@08105B6E: movs r0, 0x2 strh r0, [r4, 0x18] - b _08105B90 -_08105B74: + b @08105B90 +@08105B74: movs r1, 0 strh r1, [r4, 0x12] ldrh r0, [r4, 0x10] @@ -498940,29 +498940,29 @@ _08105B74: lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - ble _08105B90 + ble @08105B90 strh r2, [r4, 0x16] strh r1, [r4, 0x18] - b _08105B90 -_08105B8C: + b @08105B90 +@08105B8C: movs r0, 0x1 strh r0, [r4, 0x12] -_08105B90: +@08105B90: movs r2, 0x8 ldrsh r5, [r4, r2] cmp r5, 0 - beq _08105B9E + beq @08105B9E cmp r5, 0x1 - beq _08105C34 - b _08105C42 -_08105B9E: + beq @08105C34 + b @08105C42 +@08105B9E: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _08105C42 + ble @08105C42 strh r5, [r4, 0xA] ldr r0, =0x085938dc movs r3, 0x24 @@ -498974,7 +498974,7 @@ _08105B9E: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq _08105C42 + beq @08105C42 ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 @@ -499010,7 +499010,7 @@ _08105B9E: lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble _08105C42 + ble @08105C42 strh r5, [r4, 0xC] ldrh r0, [r4, 0xE] adds r0, 0x1 @@ -499018,28 +499018,28 @@ _08105B9E: lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - ble _08105C42 + ble @08105C42 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _08105C42 + b @08105C42 .align 2, 0 .pool -_08105C34: +@08105C34: movs r1, 0x22 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08105C42 + bne @08105C42 adds r0, r6, 0 bl move_anim_task_del -_08105C42: +@08105C42: pop {r4-r6} pop {r0} bx r0 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 @@ -499070,7 +499070,7 @@ sub_8105C48: @ 8105C48 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08105CAA + beq @08105CAA movs r0, 0x30 ldrsh r1, [r3, r0] lsls r1, 1 @@ -499088,7 +499088,7 @@ sub_8105C48: @ 8105C48 strh r0, [r1] adds r0, r3, 0 bl obj_delete_and_free_tiles -_08105CAA: +@08105CAA: pop {r4} pop {r0} bx r0 @@ -499097,7 +499097,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 @@ -499109,7 +499109,7 @@ sub_8105CB4: @ 8105CB4 movs r4, 0x1 ldr r0, =0x00002710 adds r5, r0, 0 -_08105CCC: +@08105CCC: subs r0, r5, r4 lsls r0, 16 lsrs r0, 16 @@ -499119,7 +499119,7 @@ _08105CCC: strb r0, [r1] adds r4, 0x1 cmp r4, 0x2 - ble _08105CCC + ble @08105CCC movs r0, 0x80 lsls r0, 6 bl malloc_and_clear @@ -499133,7 +499133,7 @@ _08105CCC: ldr r0, =0x08c22610 bl call_LZZUnCompWram movs r4, 0 -_08105D00: +@08105D00: ldr r5, =0x020244d4 ldr r0, [r5] movs r1, 0xBE @@ -499154,7 +499154,7 @@ _08105D00: bl gpu_pal_apply adds r4, 0x1 cmp r4, 0x2 - ble _08105D00 + ble @08105D00 ldr r0, [r5] movs r4, 0xBE lsls r4, 1 @@ -499176,19 +499176,19 @@ _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 ldr r5, =0x08593950 movs r4, 0x2 -_08105D6A: +@08105D6A: ldrh r0, [r5] bl gpu_pal_free_tag adds r5, 0x2 subs r4, 0x1 cmp r4, 0 - bge _08105D6A + bge @08105D6A adds r0, r6, 0 bl move_anim_task_del pop {r4-r6} @@ -499199,7 +499199,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 @@ -499245,7 +499245,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 @@ -499255,12 +499255,12 @@ sub_8105DE8: @ 8105DE8 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08105E08 + beq @08105E08 ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] -_08105E08: +@08105E08: ldr r4, =0x0203841e ldrh r0, [r4, 0x8] strh r0, [r5, 0x2E] @@ -499297,7 +499297,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] @@ -499306,11 +499306,11 @@ sub_8105E60: @ 8105E60 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - bne _08105E7A + bne @08105E7A adds r0, r4, 0 movs r1, 0 bl sub_80A69CC -_08105E7A: +@08105E7A: movs r1, 0x30 ldrsh r0, [r4, r1] movs r1, 0x8 @@ -499330,17 +499330,17 @@ _08105E7A: movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0x3C - bne _08105EAA + bne @08105EAA adds r0, r4, 0 bl move_anim_8072740 -_08105EAA: +@08105EAA: pop {r4} pop {r0} bx r0 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 @@ -499348,9 +499348,9 @@ sub_8105EB0: @ 8105EB0 lsls r0, 24 movs r6, 0xF0 cmp r0, 0 - beq _08105EC4 + beq @08105EC4 movs r6, 0x98 -_08105EC4: +@08105EC4: movs r5, 0 ldr r1, =0x02022e24 strh r6, [r1] @@ -499392,7 +499392,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 @@ -499412,21 +499412,21 @@ sub_8105F30: @ 8105F30 lsls r1, r4, 16 lsls r0, r2, 16 cmp r1, r0 - blt _08105F70 + blt @08105F70 ldr r0, =0x02022e24 movs r1, 0 strh r1, [r0] ldr r0, =sub_8105F84 + 1 str r0, [r3] - b _08105F78 + b @08105F78 .align 2, 0 .pool -_08105F70: +@08105F70: ldr r1, =0x02022e24 lsls r0, r4, 8 orrs r2, r0 strh r2, [r1] -_08105F78: +@08105F78: pop {r4} pop {r0} bx r0 @@ -499435,7 +499435,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 @@ -499453,7 +499453,7 @@ sub_8105F84: @ 8105F84 lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - bne _08105FD8 + bne @08105FD8 movs r0, 0x88 strh r0, [r1, 0x1E] movs r0, 0x50 @@ -499470,12 +499470,12 @@ sub_8105F84: @ 8105F84 ldr r2, =0x00007fff movs r1, 0x10 bl sub_80A2A20 - b _0810600C + b @0810600C .align 2, 0 .pool -_08105FD8: +@08105FD8: cmp r0, 0x4 - ble _0810600C + ble @0810600C ldr r0, =0x02022e24 strh r4, [r0] ldr r0, =0x02022e26 @@ -499495,7 +499495,7 @@ _08105FD8: bl lcd_io_set adds r0, r5, 0 bl move_anim_task_del -_0810600C: +@0810600C: add sp, 0xC pop {r4,r5} pop {r0} @@ -499505,7 +499505,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 @@ -499525,7 +499525,7 @@ sub_8106020: @ 8106020 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - bne _0810607C + bne @0810607C movs r0, 0x1 bl obj_id_for_side_relative_to_move adds r1, r0, 0 @@ -499541,10 +499541,10 @@ sub_8106020: @ 8106020 adds r0, r1 movs r1, 0x4 strh r1, [r0, 0x24] - b _081060A4 + b @081060A4 .align 2, 0 .pool -_0810607C: +@0810607C: ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 @@ -499558,12 +499558,12 @@ _0810607C: lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _081060A4 + bne @081060A4 strh r0, [r4, 0x24] strh r0, [r4, 0x26] adds r0, r6, 0 bl move_anim_task_del -_081060A4: +@081060A4: pop {r4-r6} pop {r0} bx r0 @@ -499572,7 +499572,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 @@ -499592,7 +499592,7 @@ sub_81060B0: @ 81060B0 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - bne _0810610C + bne @0810610C movs r0, 0 bl obj_id_for_side_relative_to_move adds r1, r0, 0 @@ -499608,10 +499608,10 @@ sub_81060B0: @ 81060B0 adds r0, r1 movs r1, 0x4 strh r1, [r0, 0x24] - b _08106134 + b @08106134 .align 2, 0 .pool -_0810610C: +@0810610C: ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 @@ -499625,12 +499625,12 @@ _0810610C: lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _08106134 + bne @08106134 strh r0, [r4, 0x24] strh r0, [r4, 0x26] adds r0, r6, 0 bl move_anim_task_del -_08106134: +@08106134: pop {r4-r6} pop {r0} bx r0 @@ -499639,7 +499639,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 @@ -499675,13 +499675,13 @@ 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 lsls r0, 24 cmp r0, 0 - bne _081061B6 + bne @081061B6 movs r1, 0x38 ldrsh r0, [r4, r1] movs r1, 0xE @@ -499694,25 +499694,25 @@ sub_810618C: @ 810618C movs r1, 0xFF ands r0, r1 strh r0, [r4, 0x38] - b _081061BC -_081061B6: + b @081061BC +@081061B6: adds r0, r4, 0 bl move_anim_8072740 -_081061BC: +@081061BC: pop {r4} pop {r0} bx r0 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] movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - bne _081061E8 + bne @081061E8 ldr r1, =0x0203841e ldrh r0, [r1] strh r0, [r4, 0x30] @@ -499720,10 +499720,10 @@ sub_81061C4: @ 81061C4 strh r0, [r4, 0x32] adds r0, r2, 0x1 strh r0, [r4, 0x2E] - b _08106244 + b @08106244 .align 2, 0 .pool -_081061E8: +@081061E8: ldrh r0, [r4, 0x30] ldrh r2, [r4, 0x36] adds r0, r2 @@ -499743,7 +499743,7 @@ _081061E8: ands r0, r1 strh r0, [r4, 0x34] cmp r0, 0x64 - ble _08106236 + ble @08106236 movs r0, 0x34 ldrsh r1, [r4, r0] lsrs r0, r1, 31 @@ -499762,21 +499762,21 @@ _081061E8: ands r0, r2 orrs r0, r1 strb r0, [r3] -_08106236: +@08106236: movs r1, 0x34 ldrsh r0, [r4, r1] cmp r0, 0x78 - ble _08106244 + ble @08106244 adds r0, r4, 0 bl move_anim_8072740 -_08106244: +@08106244: pop {r4} pop {r0} bx r0 thumb_func_end sub_81061C4 thumb_func_start sub_810624C -sub_810624C: @ 810624C +sub_810624C: ; 810624C push {lr} ldr r2, =0x0203841e ldrh r1, [r2] @@ -499798,7 +499798,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] @@ -499825,7 +499825,7 @@ sub_810627C: @ 810627C lsls r0, 16 asrs r5, r0, 16 cmp r5, 0x48 - bgt _081062E2 + bgt @081062E2 movs r0, 0x34 ldrsh r1, [r4, r0] lsrs r0, r1, 31 @@ -499845,17 +499845,17 @@ sub_810627C: @ 810627C orrs r0, r1 strb r0, [r3] cmp r5, 0x40 - bgt _081062E2 + bgt @081062E2 adds r0, r4, 0 bl move_anim_8072740 -_081062E2: +@081062E2: pop {r4,r5} pop {r0} bx r0 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 @@ -499878,12 +499878,12 @@ sub_81062E8: @ 81062E8 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0810632A + bne @0810632A movs r0, 0x1 movs r1, 0x3 movs r2, 0x1 bl lcd_bg_operations -_0810632A: +@0810632A: ldr r0, =0x02022e18 movs r1, 0 strh r1, [r0] @@ -499929,7 +499929,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 @@ -499943,24 +499943,24 @@ sub_81063A8: @ 81063A8 ldrsh r0, [r0, r2] adds r2, r1, 0 cmp r0, 0x4 - bls _081063C6 - b _081064F0 -_081063C6: + bls @081063C6 + b @081064F0 +@081063C6: lsls r0, 2 - ldr r1, =_081063D8 + ldr r1, =@081063D8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081063D8: - .4byte _081063EC - .4byte _08106430 - .4byte _08106452 - .4byte _08106496 - .4byte _081064BC -_081063EC: +@081063D8: + .4byte @081063EC + .4byte @08106430 + .4byte @08106452 + .4byte @08106496 + .4byte @081064BC +@081063EC: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -499972,7 +499972,7 @@ _081063EC: lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne _081064F0 + bne @081064F0 strh r5, [r4, 0x1C] ldrh r1, [r4, 0x1E] adds r1, 0x1 @@ -499988,13 +499988,13 @@ _081063EC: movs r1, 0x1E ldrsh r0, [r4, r1] cmp r0, 0x10 - bne _081064F0 + bne @081064F0 ldrh r0, [r4, 0x20] adds r0, 0x1 strh r0, [r4, 0x20] strh r5, [r4, 0x1E] - b _081064F0 -_08106430: + b @081064F0 +@08106430: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -500005,14 +500005,14 @@ _08106430: lsls r0, 16 asrs r0, 16 cmp r0, 0x8D - bne _081064F0 + bne @081064F0 movs r0, 0x10 strh r0, [r1, 0x1E] ldrh r0, [r1, 0x20] adds r0, 0x1 strh r0, [r1, 0x20] - b _081064F0 -_08106452: + b @081064F0 +@08106452: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -500023,7 +500023,7 @@ _08106452: lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne _081064F0 + bne @081064F0 movs r0, 0 strh r0, [r4, 0x1C] ldrh r1, [r4, 0x1E] @@ -500040,13 +500040,13 @@ _08106452: movs r2, 0x1E ldrsh r1, [r4, r2] cmp r1, 0 - bne _081064F0 + bne @081064F0 ldrh r0, [r4, 0x20] adds r0, 0x1 strh r0, [r4, 0x20] strh r1, [r4, 0x1E] - b _081064F0 -_08106496: + b @081064F0 +@08106496: mov r0, sp bl sub_80A6B30 mov r0, sp @@ -500060,19 +500060,19 @@ _08106496: ldrh r1, [r0, 0x20] adds r1, 0x1 strh r1, [r0, 0x20] - b _081064F0 + b @081064F0 .align 2, 0 .pool -_081064BC: +@081064BC: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _081064D0 + bne @081064D0 movs r0, 0x1 movs r1, 0x3 movs r2, 0 bl lcd_bg_operations -_081064D0: +@081064D0: movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -500085,7 +500085,7 @@ _081064D0: bl lcd_bg_operations adds r0, r4, 0 bl move_anim_task_del -_081064F0: +@081064F0: add sp, 0x10 pop {r4,r5} pop {r0} @@ -500093,7 +500093,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 @@ -500116,12 +500116,12 @@ sub_81064F8: @ 81064F8 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0810653A + bne @0810653A movs r0, 0x1 movs r1, 0x3 movs r2, 0x1 bl lcd_bg_operations -_0810653A: +@0810653A: ldr r0, =0x02022e18 movs r1, 0 strh r1, [r0] @@ -500138,33 +500138,33 @@ _0810653A: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _08106578 + beq @08106578 ldr r1, =0x08d93960 - b _0810658A + b @0810658A .align 2, 0 .pool -_08106578: +@08106578: ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0810659C + bne @0810659C ldr r1, =0x08d93598 -_0810658A: +@0810658A: mov r0, sp movs r2, 0 bl sub_80A6D60 - b _081065A6 + b @081065A6 .align 2, 0 .pool -_0810659C: +@0810659C: ldr r1, =0x08d9377c mov r0, sp movs r2, 0 bl sub_80A6D60 -_081065A6: +@081065A6: mov r0, sp ldrb r0, [r0, 0x9] ldr r1, =0x08c249f8 @@ -500193,7 +500193,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 @@ -500207,24 +500207,24 @@ sub_81065EC: @ 81065EC ldrsh r0, [r0, r2] adds r2, r1, 0 cmp r0, 0x4 - bls _0810660A - b _08106730 -_0810660A: + bls @0810660A + b @08106730 +@0810660A: lsls r0, 2 - ldr r1, =_0810661C + ldr r1, =@0810661C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0810661C: - .4byte _08106630 - .4byte _08106674 - .4byte _08106696 - .4byte _081066DA - .4byte _081066FC -_08106630: +@0810661C: + .4byte @08106630 + .4byte @08106674 + .4byte @08106696 + .4byte @081066DA + .4byte @081066FC +@08106630: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -500236,7 +500236,7 @@ _08106630: lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - bne _08106730 + bne @08106730 strh r5, [r4, 0x1C] ldrh r1, [r4, 0x1E] adds r1, 0x1 @@ -500252,13 +500252,13 @@ _08106630: movs r1, 0x1E ldrsh r0, [r4, r1] cmp r0, 0xE - bne _08106730 + bne @08106730 ldrh r0, [r4, 0x20] adds r0, 0x1 strh r0, [r4, 0x20] strh r5, [r4, 0x1E] - b _08106730 -_08106674: + b @08106730 +@08106674: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -500269,14 +500269,14 @@ _08106674: lsls r0, 16 asrs r0, 16 cmp r0, 0x15 - bne _08106730 + bne @08106730 movs r0, 0xE strh r0, [r1, 0x1E] ldrh r0, [r1, 0x20] adds r0, 0x1 strh r0, [r1, 0x20] - b _08106730 -_08106696: + b @08106730 +@08106696: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -500287,7 +500287,7 @@ _08106696: lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - bne _08106730 + bne @08106730 movs r0, 0 strh r0, [r4, 0x1C] ldrh r1, [r4, 0x1E] @@ -500304,13 +500304,13 @@ _08106696: movs r2, 0x1E ldrsh r1, [r4, r2] cmp r1, 0 - bne _08106730 + bne @08106730 ldrh r0, [r4, 0x20] adds r0, 0x1 strh r0, [r4, 0x20] strh r1, [r4, 0x1E] - b _08106730 -_081066DA: + b @08106730 +@081066DA: mov r0, sp bl sub_80A6B30 movs r0, 0x1 @@ -500325,16 +500325,16 @@ _081066DA: ldrh r0, [r1, 0x20] adds r0, 0x1 strh r0, [r1, 0x20] -_081066FC: +@081066FC: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _08106710 + bne @08106710 movs r0, 0x1 movs r1, 0x3 movs r2, 0 bl lcd_bg_operations -_08106710: +@08106710: movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -500347,7 +500347,7 @@ _08106710: bl lcd_bg_operations adds r0, r4, 0 bl move_anim_task_del -_08106730: +@08106730: add sp, 0x10 pop {r4,r5} pop {r0} @@ -500357,7 +500357,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 @@ -500401,7 +500401,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] @@ -500409,14 +500409,14 @@ sub_810679C: @ 810679C lsls r0, 16 lsrs r0, 16 cmp r0, 0x7F - bhi _081067B2 + bhi @081067B2 ldrh r0, [r4, 0x3C] adds r0, 0x1 - b _081067B6 -_081067B2: + b @081067B6 +@081067B2: ldrh r0, [r4, 0x3C] subs r0, 0x1 -_081067B6: +@081067B6: adds r1, r4, 0 adds r1, 0x43 strb r0, [r1] @@ -500442,9 +500442,9 @@ _081067B6: movs r3, 0x38 ldrsh r2, [r4, r3] cmp r2, 0 - beq _08106828 + beq @08106828 cmp r2, 0x1 - bne _08106858 + bne @08106858 ldr r1, =0xfffffc00 adds r0, r1, 0 ldrh r2, [r4, 0x32] @@ -500463,13 +500463,13 @@ _081067B6: movs r2, 0x2E ldrsh r1, [r4, r2] cmp r0, r1 - bne _08106858 + bne @08106858 movs r0, 0x2 strh r0, [r4, 0x38] - b _08106868 + b @08106868 .align 2, 0 .pool -_08106828: +@08106828: movs r3, 0x80 lsls r3, 3 adds r0, r3, 0 @@ -500490,19 +500490,19 @@ _08106828: movs r3, 0x2E ldrsh r1, [r4, r3] cmp r0, r1 - bne _08106858 + bne @08106858 strh r2, [r4, 0x36] movs r0, 0x1 strh r0, [r4, 0x38] -_08106858: +@08106858: ldr r0, =0x0203841e ldrh r1, [r0, 0xE] ldr r0, =0x0000ffff cmp r1, r0 - bne _08106868 + bne @08106868 adds r0, r4, 0 bl move_anim_8072740 -_08106868: +@08106868: pop {r4} pop {r0} bx r0 @@ -500511,7 +500511,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 @@ -500548,7 +500548,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] @@ -500568,28 +500568,28 @@ sub_81068CC: @ 81068CC movs r1, 0x88 lsls r1, 1 cmp r0, r1 - bhi _0810690A + bhi @0810690A movs r0, 0x22 ldrsh r1, [r2, r0] movs r3, 0x26 ldrsh r0, [r2, r3] adds r1, r0 cmp r1, 0xA0 - bgt _0810690A + bgt @0810690A movs r0, 0x10 negs r0, r0 cmp r1, r0 - bge _08106910 -_0810690A: + bge @08106910 +@0810690A: adds r0, r2, 0 bl move_anim_8072740 -_08106910: +@08106910: pop {r0} bx r0 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] @@ -500608,16 +500608,16 @@ sub_8106914: @ 8106914 movs r3, 0x32 ldrsh r1, [r2, r3] cmp r0, r1 - blt _08106940 + blt @08106940 adds r0, r2, 0 bl move_anim_8072740 -_08106940: +@08106940: pop {r0} bx r0 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 @@ -500656,7 +500656,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 @@ -500664,16 +500664,16 @@ sub_810699C: @ 810699C movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _081069B2 + beq @081069B2 adds r0, r2, 0 bl move_anim_8072740 -_081069B2: +@081069B2: pop {r0} bx r0 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 @@ -500688,13 +500688,13 @@ 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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _081069EE + bne @081069EE ldr r0, =0x0203841e ldrh r1, [r0] ldrh r2, [r4, 0x20] @@ -500704,7 +500704,7 @@ sub_81069D0: @ 81069D0 ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] -_081069EE: +@081069EE: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] @@ -500724,7 +500724,7 @@ _081069EE: movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0x4F - bgt _08106A32 + bgt @08106A32 adds r0, r5, 0 movs r1, 0x50 bl cosine @@ -500737,11 +500737,11 @@ _081069EE: asrs r0, 24 adds r1, r0 strh r1, [r4, 0x26] -_08106A32: +@08106A32: movs r0, 0x2E ldrsh r2, [r4, r0] cmp r2, 0x5A - ble _08106A50 + ble @08106A50 ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] @@ -500753,12 +500753,12 @@ _08106A32: ldrh r0, [r4, 0x24] subs r0, r1 strh r0, [r4, 0x24] -_08106A50: +@08106A50: cmp r2, 0x64 - ble _08106A5A + ble @08106A5A adds r0, r4, 0 bl move_anim_8072740 -_08106A5A: +@08106A5A: pop {r4,r5} pop {r0} bx r0 @@ -500767,7 +500767,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] @@ -500792,7 +500792,7 @@ sub_8106A64: @ 8106A64 movs r1, 0x38 ldrsh r0, [r4, r1] cmp r0, 0x14 - ble _08106ABA + ble @08106ABA adds r1, r0, 0 lsrs r0, r1, 31 adds r0, r1, r0 @@ -500810,28 +500810,28 @@ sub_8106A64: @ 8106A64 ands r0, r2 orrs r0, r1 strb r0, [r3] -_08106ABA: +@08106ABA: movs r1, 0x38 ldrsh r0, [r4, r1] cmp r0, 0x1E - ble _08106AC8 + ble @08106AC8 adds r0, r4, 0 bl move_anim_8072740 -_08106AC8: +@08106AC8: pop {r4} pop {r0} bx r0 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] movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - bne _08106AF4 + bne @08106AF4 ldr r1, =0x0203841e ldrh r0, [r1] strh r0, [r4, 0x30] @@ -500839,10 +500839,10 @@ sub_8106AD0: @ 8106AD0 strh r0, [r4, 0x32] adds r0, r2, 0x1 strh r0, [r4, 0x2E] - b _08106B48 + b @08106B48 .align 2, 0 .pool -_08106AF4: +@08106AF4: ldrh r0, [r4, 0x30] ldrh r2, [r4, 0x36] adds r0, r2 @@ -500864,7 +500864,7 @@ _08106AF4: ands r0, r1 strh r0, [r4, 0x34] cmp r0, 0x46 - ble _08106B48 + ble @08106B48 ldr r0, =sub_8106A64 + 1 str r0, [r4, 0x1C] ldrh r0, [r4, 0x24] @@ -500882,7 +500882,7 @@ _08106AF4: movs r1, 0xB4 bl __umodsi3 strh r0, [r4, 0x34] -_08106B48: +@08106B48: pop {r4,r5} pop {r0} bx r0 @@ -500891,13 +500891,13 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08106B8E + bne @08106B8E ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] @@ -500919,7 +500919,7 @@ sub_8106B54: @ 8106B54 strb r0, [r1] movs r0, 0x1 strh r0, [r4, 0x32] -_08106B8E: +@08106B8E: ldrh r0, [r4, 0x32] ldrh r2, [r4, 0x2E] adds r0, r2 @@ -500929,27 +500929,27 @@ _08106B8E: lsls r1, r0, 2 adds r0, r1, 0 cmp r1, 0 - bge _08106BA4 + bge @08106BA4 adds r0, 0xFF -_08106BA4: +@08106BA4: asrs r0, 8 lsls r0, 8 subs r0, r1, r0 strh r0, [r4, 0x30] lsls r0, 16 cmp r0, 0 - bge _08106BB6 + bge @08106BB6 movs r0, 0 strh r0, [r4, 0x30] -_08106BB6: +@08106BB6: movs r0, 0x30 ldrsh r2, [r4, r0] movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - bge _08106BC4 + bge @08106BC4 adds r0, 0x3 -_08106BC4: +@08106BC4: asrs r0, 2 movs r1, 0x1E subs r1, r0 @@ -500961,9 +500961,9 @@ _08106BC4: movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - bge _08106BE0 + bge @08106BE0 adds r0, 0x7 -_08106BE0: +@08106BE0: asrs r0, 3 movs r1, 0xA subs r1, r0 @@ -500973,26 +500973,26 @@ _08106BE0: movs r2, 0x30 ldrsh r0, [r4, r2] cmp r0, 0x80 - ble _08106C04 + ble @08106C04 ldrh r1, [r4, 0x32] movs r2, 0x32 ldrsh r0, [r4, r2] cmp r0, 0 - ble _08106C04 + ble @08106C04 ldr r0, =0x0000ffff strh r0, [r4, 0x32] -_08106C04: +@08106C04: movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08106C18 + bne @08106C18 movs r2, 0x32 ldrsh r0, [r4, r2] cmp r0, 0 - bge _08106C18 + bge @08106C18 movs r0, 0x1 strh r0, [r4, 0x32] -_08106C18: +@08106C18: ldrh r0, [r4, 0x34] adds r1, r0, 0x1 strh r1, [r4, 0x34] @@ -501000,7 +501000,7 @@ _08106C18: lsls r0, 16 lsrs r0, 16 cmp r0, 0x46 - bls _08106C5C + bls @08106C5C movs r0, 0x2E ldrsh r1, [r4, r0] lsrs r0, r1, 31 @@ -501019,10 +501019,10 @@ _08106C18: ands r0, r2 orrs r0, r1 strb r0, [r3] - b _08106C6A + b @08106C6A .align 2, 0 .pool -_08106C5C: +@08106C5C: adds r2, r4, 0 adds r2, 0x3E ldrb r1, [r2] @@ -501030,27 +501030,27 @@ _08106C5C: negs r0, r0 ands r0, r1 strb r0, [r2] -_08106C6A: +@08106C6A: movs r1, 0x34 ldrsh r0, [r4, r1] cmp r0, 0x5A - ble _08106C78 + ble @08106C78 adds r0, r4, 0 bl move_anim_8072740 -_08106C78: +@08106C78: pop {r4} pop {r0} bx r0 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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08106CB4 + bne @08106CB4 ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] @@ -501066,51 +501066,51 @@ sub_8106C80: @ 8106C80 ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _08106CC8 + b @08106CC8 .align 2, 0 .pool -_08106CB4: +@08106CB4: adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08106CC8 + beq @08106CC8 adds r0, r4, 0 bl move_anim_8072740 -_08106CC8: +@08106CC8: pop {r4} pop {r0} bx r0 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 movs r2, 0x4 ldrsh r0, [r1, r2] cmp r0, 0 - bne _08106CEC + bne @08106CEC adds r0, r5, 0 bl move_anim_8072740 - b _08106D50 + b @08106D50 .align 2, 0 .pool -_08106CEC: +@08106CEC: movs r2, 0 ldrsh r0, [r1, r2] cmp r0, 0 - bne _08106CFC + bne @08106CFC ldr r4, =0x02038436 - b _08106CFE + b @08106CFE .align 2, 0 .pool -_08106CFC: +@08106CFC: ldr r4, =0x02038437 -_08106CFE: +@08106CFE: ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -501128,16 +501128,16 @@ _08106CFE: ldrsh r1, [r0, r2] adds r2, r0, 0 cmp r1, 0 - bne _08106D34 + bne @08106D34 ldrh r0, [r5, 0x20] adds r0, 0x20 - b _08106D38 + b @08106D38 .align 2, 0 .pool -_08106D34: +@08106D34: ldrh r0, [r5, 0x20] subs r0, 0x20 -_08106D38: +@08106D38: strh r0, [r5, 0x20] ldrh r0, [r2, 0x4] strh r0, [r5, 0x2E] @@ -501149,7 +501149,7 @@ _08106D38: bl obj_anim_image_start ldr r0, =sub_8106D5C + 1 str r0, [r5, 0x1C] -_08106D50: +@08106D50: pop {r4,r5} pop {r0} bx r0 @@ -501158,7 +501158,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 @@ -501166,29 +501166,29 @@ sub_8106D5C: @ 8106D5C movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08106D8C + beq @08106D8C ldrh r0, [r2, 0x2E] subs r0, 0x1 strh r0, [r2, 0x2E] lsls r0, 16 cmp r0, 0 - beq _08106D86 + beq @08106D86 ldrh r1, [r2, 0x30] lsls r1, 24 lsrs r1, 24 adds r0, r2, 0 bl obj_anim_image_start - b _08106D8C -_08106D86: + b @08106D8C +@08106D86: adds r0, r2, 0 bl move_anim_8072740 -_08106D8C: +@08106D8C: pop {r0} bx r0 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 @@ -501217,7 +501217,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 @@ -501229,10 +501229,10 @@ sub_8106DD4: @ 8106DD4 bl sub_80A7D34 lsls r0, 24 cmp r0, 0 - bne _08106DF4 + bne @08106DF4 adds r0, r4, 0 bl move_anim_task_del -_08106DF4: +@08106DF4: pop {r4} pop {r0} bx r0 @@ -501241,34 +501241,34 @@ _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 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08106E1C + bne @08106E1C ldr r0, =0x02038436 - b _08106E1E + b @08106E1E .align 2, 0 .pool -_08106E1C: +@08106E1C: ldr r0, =0x02038437 -_08106E1E: +@08106E1E: ldrb r6, [r0] adds r0, r6, 0 bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08106E38 + bne @08106E38 ldr r1, =0x0203841e movs r2, 0x2 ldrsh r0, [r1, r2] negs r0, r0 strh r0, [r1, 0x2] -_08106E38: +@08106E38: adds r0, r6, 0 movs r1, 0x2 bl sub_80A5C6C @@ -501297,18 +501297,18 @@ _08106E38: ldrsh r0, [r7, r2] lsls r0, 3 cmp r0, 0 - bge _08106E78 + bge @08106E78 adds r0, 0x7 -_08106E78: +@08106E78: asrs r0, 3 strh r0, [r5, 0x34] movs r3, 0x4 ldrsh r0, [r7, r3] lsls r0, 3 cmp r0, 0 - bge _08106E88 + bge @08106E88 adds r0, 0x7 -_08106E88: +@08106E88: asrs r0, 3 strh r0, [r5, 0x36] ldrh r2, [r5, 0x4] @@ -501335,7 +501335,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] @@ -501358,22 +501358,22 @@ sub_8106EC8: @ 8106EC8 lsls r0, 16 asrs r0, 16 cmp r0, 0x10 - ble _08106EFC + ble @08106EFC adds r0, r2, 0 bl move_anim_8072740 -_08106EFC: +@08106EFC: pop {r0} bx r0 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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08106F22 + bne @08106F22 ldr r0, =0x0203841e ldrh r1, [r0] movs r0, 0x78 @@ -501385,7 +501385,7 @@ sub_8106F00: @ 8106F00 movs r1, 0x4 orrs r0, r1 strb r0, [r2] -_08106F22: +@08106F22: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] @@ -501394,23 +501394,23 @@ _08106F22: movs r2, 0x30 ldrsh r1, [r4, r2] cmp r0, r1 - bne _08106F40 + bne @08106F40 ldrb r0, [r4, 0x5] lsrs r0, 4 adds r0, 0x10 movs r1, 0 bl sub_80A750C -_08106F40: +@08106F40: movs r0, 0x2E ldrsh r1, [r4, r0] movs r2, 0x30 ldrsh r0, [r4, r2] adds r0, 0x50 cmp r1, r0 - bne _08106F54 + bne @08106F54 adds r0, r4, 0 bl move_anim_8072740 -_08106F54: +@08106F54: pop {r4} pop {r0} bx r0 @@ -501419,13 +501419,13 @@ _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 ldrsh r0, [r6, r1] cmp r0, 0 - bne _08106F8E + bne @08106F8E movs r5, 0x78 strh r5, [r6, 0x20] ldr r4, =0x0203841e @@ -501442,7 +501442,7 @@ sub_8106F60: @ 8106F60 strh r5, [r6, 0x38] ldrh r0, [r4, 0x4] strh r0, [r6, 0x34] -_08106F8E: +@08106F8E: ldrh r0, [r6, 0x2E] adds r0, 0x1 movs r5, 0 @@ -501487,7 +501487,7 @@ _08106F8E: movs r2, 0x38 ldrsh r0, [r6, r2] cmp r1, r0 - ble _0810700A + ble @0810700A ldr r0, =sub_8107018 + 1 str r0, [r6, 0x1C] strh r5, [r6, 0x2E] @@ -501500,7 +501500,7 @@ _08106F8E: adds r0, r6, 0 movs r1, 0x1 bl sub_8008258 -_0810700A: +@0810700A: pop {r4-r6} pop {r0} bx r0 @@ -501509,7 +501509,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] @@ -501518,12 +501518,12 @@ sub_8107018: @ 8107018 lsls r0, 16 asrs r0, 16 cmp r0, 0xA - ble _08107032 + ble @08107032 movs r0, 0 strh r0, [r1, 0x2E] ldr r0, =sub_810703C + 1 str r0, [r1, 0x1C] -_08107032: +@08107032: pop {r0} bx r0 .align 2, 0 @@ -501531,7 +501531,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] @@ -501544,20 +501544,20 @@ sub_810703C: @ 810703C lsls r0, 16 asrs r0, 16 cmp r0, 0x30 - ble _08107066 + ble @08107066 lsls r0, r1, 16 cmp r0, 0 - ble _08107066 + ble @08107066 ldrh r0, [r4, 0x36] subs r1, r0, 0x5 strh r1, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x36] -_08107066: +@08107066: movs r1, 0x36 ldrsh r0, [r4, r1] cmp r0, 0x3 - ble _08107098 + ble @08107098 movs r2, 0x32 ldrsh r1, [r4, r2] lsrs r0, r1, 31 @@ -501578,21 +501578,21 @@ _08107066: strb r0, [r3] adds r0, r4, 0 bl move_anim_8072740 -_08107098: +@08107098: movs r1, 0x36 ldrsh r0, [r4, r1] cmp r0, 0x4 - bne _081070A6 + bne @081070A6 adds r0, r4, 0 bl move_anim_8072740 -_081070A6: +@081070A6: pop {r4} pop {r0} bx r0 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 @@ -501600,7 +501600,7 @@ sub_81070AC: @ 81070AC movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _081070F8 + beq @081070F8 ldr r4, =0x02038436 ldrb r1, [r4] movs r0, 0x2 @@ -501608,7 +501608,7 @@ sub_81070AC: @ 81070AC bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _081070F8 + beq @081070F8 ldrb r0, [r4] adds r2, r5, 0 adds r2, 0x20 @@ -501622,10 +501622,10 @@ sub_81070AC: @ 81070AC adds r0, r5, 0 movs r1, 0x1 bl sub_8008258 - b _08107118 + b @08107118 .align 2, 0 .pool -_081070F8: +@081070F8: ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 @@ -501640,7 +501640,7 @@ _081070F8: lsrs r0, 24 adds r0, 0x28 strh r0, [r5, 0x22] -_08107118: +@08107118: movs r0, 0xD strh r0, [r5, 0x2E] ldrh r0, [r5, 0x20] @@ -501661,7 +501661,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 @@ -501680,7 +501680,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 @@ -501697,7 +501697,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 @@ -501710,7 +501710,7 @@ sub_8107188: @ 8107188 movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0 - bne _081071B0 + bne @081071B0 ldr r1, =0x0203841e ldrh r0, [r1] strh r0, [r5, 0xA] @@ -501718,7 +501718,7 @@ sub_8107188: @ 8107188 strh r0, [r5, 0xC] ldrh r0, [r1, 0x4] strh r0, [r5, 0xE] -_081071B0: +@081071B0: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] @@ -501728,7 +501728,7 @@ _081071B0: ldrsh r1, [r5, r2] bl __modsi3 cmp r0, 0x1 - bne _081071F8 + bne @081071F8 bl GenerateRandomNumber2 lsls r0, 16 lsrs r0, 16 @@ -501749,16 +501749,16 @@ _081071B0: adds r1, r4, 0 movs r3, 0x4 bl obj_add_from_template_forward_search -_081071F8: +@081071F8: movs r0, 0x8 ldrsh r1, [r5, r0] movs r2, 0xE ldrsh r0, [r5, r2] cmp r1, r0 - bne _0810720A + bne @0810720A adds r0, r6, 0 bl move_anim_task_del -_0810720A: +@0810720A: pop {r4-r6} pop {r0} bx r0 @@ -501767,7 +501767,7 @@ _0810720A: thumb_func_end sub_8107188 thumb_func_start sub_810721C -sub_810721C: @ 810721C +sub_810721C: ; 810721C ldr r1, =sub_8107228 + 1 str r1, [r0, 0x1C] bx lr @@ -501776,7 +501776,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] @@ -501785,30 +501785,30 @@ sub_8107228: @ 8107228 lsls r0, 16 asrs r0, 16 cmp r0, 0xD - bgt _08107246 + bgt @08107246 ldrh r0, [r2, 0x24] adds r0, 0x1 strh r0, [r2, 0x24] ldrh r0, [r2, 0x26] adds r0, 0x4 strh r0, [r2, 0x26] -_08107246: +@08107246: adds r0, r2, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0810725A + beq @0810725A adds r0, r2, 0 bl obj_delete_and_free_tiles -_0810725A: +@0810725A: pop {r0} bx r0 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 @@ -501816,7 +501816,7 @@ sub_8107260: @ 8107260 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08107290 + beq @08107290 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -501825,10 +501825,10 @@ sub_8107260: @ 8107260 ldr r4, =0x0203841e ldrh r1, [r4] subs r0, r1 - b _081072A2 + b @081072A2 .align 2, 0 .pool -_08107290: +@08107290: ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -501837,7 +501837,7 @@ _08107290: lsrs r0, 24 ldrh r1, [r4] adds r0, r1 -_081072A2: +@081072A2: strh r0, [r6, 0x20] ldrb r0, [r5] movs r1, 0x3 @@ -501858,12 +501858,12 @@ _081072A2: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _081072D8 + beq @081072D8 ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] -_081072D8: +@081072D8: ldr r5, =0x0203841e ldrh r0, [r5, 0xC] strh r0, [r6, 0x2E] @@ -501934,7 +501934,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} @@ -501981,17 +501981,17 @@ sub_8107380: @ 8107380 lsls r4, 24 lsrs r4, 24 cmp r4, 0 - beq _081073EC + beq @081073EC strh r4, [r7, 0x36] - b _081073F6 + b @081073F6 .align 2, 0 .pool -_081073EC: +@081073EC: ldr r0, =sub_8107408 + 1 str r0, [r5, 0x1C] adds r0, r7, 0 bl obj_delete_and_free_tiles -_081073F6: +@081073F6: add sp, 0x4 pop {r3} mov r8, r3 @@ -502003,7 +502003,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 @@ -502023,7 +502023,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] @@ -502038,7 +502038,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 @@ -502048,21 +502048,21 @@ sub_810744C: @ 810744C bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810747C + beq @0810747C ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 lsls r0, 16 lsrs r6, r0, 16 adds r7, r1, 0 - b _08107482 + b @08107482 .align 2, 0 .pool -_0810747C: +@0810747C: ldr r0, =0x0203841e ldrh r6, [r0, 0x4] adds r7, r0, 0 -_08107482: +@08107482: ldrh r0, [r7, 0x8] strh r0, [r5, 0x2E] ldrh r0, [r5, 0x20] @@ -502106,14 +502106,14 @@ _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 ldrh r1, [r0, 0xE] ldr r0, =0x0000ffff cmp r1, r0 - bne _08107506 + bne @08107506 adds r0, r4, 0 movs r1, 0x1 bl obj_anim_image_start @@ -502123,15 +502123,15 @@ sub_81074E4: @ 81074E4 movs r0, 0x7F ands r0, r1 strb r0, [r2] -_08107506: +@08107506: adds r0, r4, 0 bl sub_80A6F3C lsls r0, 24 cmp r0, 0 - beq _08107518 + beq @08107518 adds r0, r4, 0 bl move_anim_8072740 -_08107518: +@08107518: pop {r4} pop {r0} bx r0 @@ -502140,7 +502140,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 @@ -502170,7 +502170,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 @@ -502186,7 +502186,7 @@ sub_810756C: @ 810756C asrs r0, 16 mov r12, r1 cmp r0, 0x3 - bne _081075BE + bne @081075BE movs r0, 0 strh r0, [r2, 0x1C] ldrh r0, [r2, 0xC] @@ -502201,19 +502201,19 @@ sub_810756C: @ 810756C adds r3, r0, 0x2 movs r1, 0x6 adds r2, r0, 0 -_081075A8: +@081075A8: ldrh r0, [r3] strh r0, [r2] adds r3, 0x2 adds r2, 0x2 subs r1, 0x1 cmp r1, 0 - bge _081075A8 + bge @081075A8 adds r0, r5, 0x7 lsls r0, 1 adds r0, r7 strh r6, [r0] -_081075BE: +@081075BE: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -502226,10 +502226,10 @@ _081075BE: movs r2, 0x8 ldrsh r0, [r0, r2] cmp r1, r0 - bne _081075DE + bne @081075DE adds r0, r4, 0 bl move_anim_task_del -_081075DE: +@081075DE: pop {r4-r7} pop {r0} bx r0 @@ -502238,7 +502238,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 @@ -502277,20 +502277,20 @@ sub_81075EC: @ 81075EC movs r3, 0xE ldrsh r0, [r0, r3] cmp r0, 0x7F - ble _0810765C + ble @0810765C adds r0, r1, 0 subs r0, 0x7F lsls r0, 8 strh r0, [r5, 0x3A] negs r0, r2 strh r0, [r5, 0x3C] - b _08107660 + b @08107660 .align 2, 0 .pool -_0810765C: +@0810765C: lsls r0, r1, 8 strh r0, [r5, 0x3A] -_08107660: +@08107660: ldr r1, =sub_8107674 + 1 str r1, [r5, 0x1C] adds r0, r5, 0 @@ -502303,16 +502303,16 @@ _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 lsls r0, 24 cmp r0, 0 - beq _08107688 + beq @08107688 adds r0, r4, 0 bl move_anim_8072740 -_08107688: +@08107688: ldrh r0, [r4, 0x3A] lsls r0, 16 asrs r0, 24 @@ -502329,26 +502329,26 @@ _08107688: adds r0, r1 asrs r0, 8 cmp r0, 0x7F - ble _081076B8 + ble @081076B8 movs r0, 0 strh r0, [r4, 0x3A] ldrh r0, [r4, 0x3C] negs r0, r0 strh r0, [r4, 0x3C] - b _081076C0 -_081076B8: + b @081076C0 +@081076B8: ldrh r0, [r4, 0x38] ldrh r1, [r4, 0x3A] adds r0, r1 strh r0, [r4, 0x3A] -_081076C0: +@081076C0: pop {r4} pop {r0} bx r0 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 @@ -502369,7 +502369,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 @@ -502389,10 +502389,10 @@ sub_81076F4: @ 81076F4 strh r1, [r0, 0x8] lsls r1, 16 cmp r1, 0 - bne _08107722 + bne @08107722 adds r0, r3, 0 bl move_anim_task_del -_08107722: +@08107722: pop {r0} bx r0 .align 2, 0 @@ -502400,7 +502400,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 @@ -502425,26 +502425,26 @@ sub_8107730: @ 8107730 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0810778A + bne @0810778A ldrb r0, [r7] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08107784 + bne @08107784 movs r0, 0xA strh r0, [r4, 0x24] - b _0810778C + b @0810778C .align 2, 0 .pool -_08107784: +@08107784: strh r6, [r4, 0x24] subs r0, r5, 0x2 - b _0810778E -_0810778A: + b @0810778E +@0810778A: strh r6, [r4, 0x24] -_0810778C: +@0810778C: adds r0, r5, 0x2 -_0810778E: +@0810778E: adds r1, r4, 0 adds r1, 0x43 strb r0, [r1] @@ -502458,7 +502458,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 @@ -502466,16 +502466,16 @@ sub_81077A4: @ 81077A4 movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _081077BA + beq @081077BA adds r0, r2, 0 bl move_anim_8072740 -_081077BA: +@081077BA: pop {r0} bx r0 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 @@ -502488,7 +502488,7 @@ sub_81077C0: @ 81077C0 lsls r4, 24 lsls r0, 24 cmp r4, r0 - bne _0810780A + bne @0810780A ldr r4, =0x0203841e movs r1, 0 ldrsh r0, [r4, r1] @@ -502498,19 +502498,19 @@ sub_81077C0: @ 81077C0 bl battle_get_per_side_status lsls r0, 24 cmp r0, 0 - beq _08107802 + beq @08107802 ldrb r0, [r5] bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0810780A -_08107802: + bne @0810780A +@08107802: movs r1, 0 ldrsh r0, [r4, r1] negs r0, r0 strh r0, [r4] -_0810780A: +@0810780A: ldr r5, =0x0203841e movs r1, 0xA ldrsh r0, [r5, r1] @@ -502519,15 +502519,15 @@ _0810780A: ands r0, r1 movs r1, 0 cmp r0, 0 - bne _0810781E + bne @0810781E movs r1, 0x1 -_0810781E: +@0810781E: ldrb r0, [r5, 0xA] movs r7, 0x1 cmp r0, 0 - bne _08107828 + bne @08107828 movs r7, 0x3 -_08107828: +@08107828: adds r0, r6, 0 bl sub_80A69CC ldr r0, =0x02038436 @@ -502535,11 +502535,11 @@ _08107828: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08107842 + beq @08107842 ldrh r0, [r5, 0x4] negs r0, r0 strh r0, [r5, 0x4] -_08107842: +@08107842: ldrh r0, [r5, 0x8] strh r0, [r6, 0x2E] ldr r4, =0x02038437 @@ -502572,7 +502572,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 @@ -502600,25 +502600,25 @@ 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 movs r1, 0x6 ldrsh r0, [r0, r1] cmp r0, 0 - beq _081078EC + beq @081078EC adds r0, r4, 0 movs r1, 0x1 bl sub_80A6980 - b _081078F4 + b @081078F4 .align 2, 0 .pool -_081078EC: +@081078EC: adds r0, r4, 0 movs r1, 0x1 bl sub_80A69CC -_081078F4: +@081078F4: ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r4, 0x3C] @@ -502632,7 +502632,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] @@ -502660,17 +502660,17 @@ sub_810790C: @ 810790C movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _0810794C + bne @0810794C adds r0, r4, 0 bl move_anim_8072740 -_0810794C: +@0810794C: pop {r4} pop {r0} bx r0 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 @@ -502700,7 +502700,7 @@ sub_8107954: @ 8107954 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _081079E0 + bne @081079E0 movs r0, 0x1 movs r1, 0x3 movs r2, 0x1 @@ -502711,28 +502711,28 @@ sub_8107954: @ 8107954 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081079D0 + bne @081079D0 mov r0, sp ldrb r0, [r0, 0x9] ldr r1, =0x08d95e00 bl sub_80A6D48 - b _081079EA + b @081079EA .align 2, 0 .pool -_081079D0: +@081079D0: mov r0, sp ldrb r0, [r0, 0x9] ldr r1, =0x08d960d0 bl sub_80A6D48 - b _081079EA + b @081079EA .align 2, 0 .pool -_081079E0: +@081079E0: ldr r1, =0x08d963a4 mov r0, sp movs r2, 0x1 bl sub_80A6D60 -_081079EA: +@081079EA: mov r0, sp ldrb r0, [r0, 0x9] ldr r1, =0x08d94ab8 @@ -502743,24 +502743,24 @@ _081079EA: movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08107A24 + bne @08107A24 ldr r0, =0x08d95dd8 mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 movs r2, 0x20 bl decompress_palette - b _08107A32 + b @08107A32 .align 2, 0 .pool -_08107A24: +@08107A24: ldr r0, =0x08d8fb9c mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 movs r2, 0x20 bl decompress_palette -_08107A32: +@08107A32: ldr r0, =sub_8107D58 + 1 ldr r4, =0x03005e00 mov r2, r10 @@ -502795,7 +502795,7 @@ _08107A32: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq _08107AB4 + beq @08107AB4 ldr r1, =0x0000ffb0 adds r0, r1, 0 ldr r2, =0x02022e18 @@ -502810,17 +502810,17 @@ _08107A32: strh r0, [r6, 0xA] mov r0, r9 strh r0, [r7, 0xE] - b _08107B0E + b @08107B0E .align 2, 0 .pool -_08107AB4: +@08107AB4: ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x1 - bne _08107AF8 + bne @08107AF8 ldr r2, =0x0000ff20 adds r0, r2, 0 ldr r2, =0x02022e18 @@ -502835,10 +502835,10 @@ _08107AB4: ldr r0, =0x0000ffff strh r0, [r6, 0xA] strh r1, [r7, 0xE] - b _08107B0E + b @08107B0E .align 2, 0 .pool -_08107AF8: +@08107AF8: ldr r0, =0x02022e18 strh r4, [r0] ldr r1, =0x0000ffd0 @@ -502850,7 +502850,7 @@ _08107AF8: movs r0, 0x1 strh r0, [r6, 0xA] strh r4, [r7, 0xE] -_08107B0E: +@08107B0E: ldr r0, =0x02022e18 ldrh r1, [r0] movs r0, 0x14 @@ -502868,17 +502868,17 @@ _08107B0E: movs r2, 0xE ldrsh r0, [r1, r2] cmp r0, 0 - bne _08107B54 + bne @08107B54 movs r0, 0x30 strh r0, [r1, 0x10] movs r0, 0x70 - b _08107B58 + b @08107B58 .align 2, 0 .pool -_08107B54: +@08107B54: movs r0, 0 strh r0, [r1, 0x10] -_08107B58: +@08107B58: strh r0, [r1, 0x12] ldr r1, =0x03005e00 mov r2, r10 @@ -502902,7 +502902,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 @@ -502934,7 +502934,7 @@ sub_8107B84: @ 8107B84 lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne _08107C18 + bne @08107C18 ldr r1, =0x02037b14 mov r0, sp ldrb r0, [r0, 0x8] @@ -502947,7 +502947,7 @@ sub_8107B84: @ 8107B84 adds r7, r1, 0 adds r3, r7, 0 mov r4, sp -_08107BDE: +@08107BDE: ldrb r0, [r4, 0x8] lsls r0, 4 adds r1, r2, 0x1 @@ -502963,7 +502963,7 @@ _08107BDE: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - bne _08107BDE + bne @08107BDE mov r0, sp ldrb r0, [r0, 0x8] lsls r0, 4 @@ -502977,7 +502977,7 @@ _08107BDE: lsls r0, 3 adds r0, r1 strh r2, [r0, 0x12] -_08107C18: +@08107C18: ldr r1, =0x03005e00 lsls r2, r5, 2 adds r0, r2, r5 @@ -502991,7 +502991,7 @@ _08107C18: adds r4, r1, 0 adds r6, r2, 0 cmp r0, 0x1 - ble _08107C86 + ble @08107C86 movs r0, 0 strh r0, [r3, 0x14] ldrh r0, [r3, 0xE] @@ -503000,7 +503000,7 @@ _08107C18: lsls r0, r2, 16 asrs r0, 16 cmp r0, 0xD - bgt _08107C62 + bgt @08107C62 movs r1, 0x26 ldrsh r0, [r3, r1] lsls r1, r0, 2 @@ -503015,11 +503015,11 @@ _08107C18: ldrh r0, [r3, 0x10] adds r0, 0x1 strh r0, [r3, 0x10] -_08107C62: +@08107C62: movs r1, 0xE ldrsh r0, [r3, r1] cmp r0, 0x36 - ble _08107C86 + ble @08107C86 ldrh r2, [r3, 0x10] subs r2, 0x1 strh r2, [r3, 0x10] @@ -503034,7 +503034,7 @@ _08107C62: lsls r0, 8 orrs r2, r0 strh r2, [r1, 0xA] -_08107C86: +@08107C86: adds r0, r6, r5 lsls r0, 3 adds r2, r0, r4 @@ -503048,11 +503048,11 @@ _08107C86: movs r3, 0x1F ands r3, r0 cmp r3, 0 - bne _08107CA8 + bne @08107CA8 strh r3, [r2, 0x8] ldr r0, =sub_8107CC4 + 1 str r0, [r2] -_08107CA8: +@08107CA8: add sp, 0x10 pop {r4-r7} pop {r0} @@ -503062,7 +503062,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} @@ -503080,7 +503080,7 @@ sub_8107CC4: @ 8107CC4 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08107D08 + bne @08107D08 movs r0, 0x1 bl sub_80A6C68 movs r0, 0x2 @@ -503088,19 +503088,19 @@ sub_8107CC4: @ 8107CC4 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _08107D4A + b @08107D4A .align 2, 0 .pool -_08107D08: +@08107D08: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _08107D1C + bne @08107D1C movs r0, 0x1 movs r1, 0x3 movs r2, 0 bl lcd_bg_operations -_08107D1C: +@08107D1C: movs r0, 0 strh r0, [r7] mov r1, r8 @@ -503121,7 +503121,7 @@ _08107D1C: strh r1, [r0, 0x26] adds r0, r5, 0 bl move_anim_task_del -_08107D4A: +@08107D4A: pop {r3} mov r8, r3 pop {r4-r7} @@ -503132,7 +503132,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 @@ -503145,36 +503145,36 @@ sub_8107D58: @ 8107D58 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - bne _08107D74 - b _08107EAC -_08107D74: + bne @08107D74 + b @08107EAC +@08107D74: cmp r0, 0x1 - bgt _08107D84 + bgt @08107D84 cmp r0, 0 - beq _08107D8C - b _08108022 + beq @08107D8C + b @08108022 .align 2, 0 .pool -_08107D84: +@08107D84: cmp r0, 0x2 - bne _08107D8A - b _08107F78 -_08107D8A: - b _08108022 -_08107D8C: + bne @08107D8A + b @08107F78 +@08107D8A: + b @08108022 +@08107D8C: movs r3, 0 movs r2, 0x10 ldrsh r0, [r4, r2] ldr r1, =0x02038c28 mov r12, r1 cmp r3, r0 - bge _08107DCA + bge @08107DCA mov r7, r12 movs r5, 0xF0 lsls r5, 3 add r5, r12 ldr r6, =0x0000ffff -_08107DA4: +@08107DA4: lsls r2, r3, 16 asrs r2, 16 lsls r1, r2, 1 @@ -503193,21 +503193,21 @@ _08107DA4: movs r1, 0x10 ldrsh r0, [r4, r1] cmp r2, r0 - blt _08107DA4 -_08107DCA: + blt @08107DA4 +@08107DCA: ldrh r3, [r4, 0x10] lsls r2, r3, 16 asrs r1, r2, 16 movs r3, 0x12 ldrsh r0, [r4, r3] cmp r1, r0 - bge _08107E04 + bge @08107E04 ldr r5, =0x02038c28 movs r0, 0xF0 lsls r0, 3 adds r6, r5, r0 ldr r7, =0x0000ffff -_08107DE2: +@08107DE2: asrs r2, 16 lsls r1, r2, 1 adds r3, r1, r5 @@ -503224,19 +503224,19 @@ _08107DE2: movs r3, 0x12 ldrsh r0, [r4, r3] cmp r1, r0 - blt _08107DE2 -_08107E04: + blt @08107DE2 +@08107E04: ldrh r3, [r4, 0x12] lsls r2, r3, 16 asrs r0, r2, 16 cmp r0, 0x9F - bgt _08107E3A + bgt @08107E3A ldr r5, =0x02038c28 movs r0, 0xF0 lsls r0, 3 adds r6, r5, r0 ldr r7, =0x0000ffff -_08107E18: +@08107E18: asrs r2, 16 lsls r1, r2, 1 adds r3, r1, r5 @@ -503253,12 +503253,12 @@ _08107E18: lsls r2, r3, 16 asrs r0, r2, 16 cmp r0, 0x9F - ble _08107E18 -_08107E3A: + ble @08107E18 +@08107E3A: movs r1, 0x10 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08107E64 + bne @08107E64 lsls r0, r3, 16 asrs r0, 15 mov r3, r12 @@ -503270,10 +503270,10 @@ _08107E3A: ldrh r1, [r4, 0xA] strh r1, [r0] ldrh r0, [r4, 0xA] - b _08107E7A + b @08107E7A .align 2, 0 .pool -_08107E64: +@08107E64: lsls r0, r3, 16 asrs r0, 15 mov r1, r12 @@ -503285,7 +503285,7 @@ _08107E64: ldrh r1, [r4, 0xC] strh r1, [r0] ldrh r0, [r4, 0xC] -_08107E7A: +@08107E7A: strh r0, [r2] ldr r0, =0x04000052 str r0, [sp] @@ -503304,43 +503304,43 @@ _08107E7A: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _08108022 + b @08108022 .align 2, 0 .pool -_08107EAC: +@08107EAC: movs r2, 0xE ldrsh r1, [r4, r2] cmp r1, 0 - bne _08107EC4 + bne @08107EC4 ldrh r0, [r4, 0x10] subs r0, 0x1 strh r0, [r4, 0x10] lsls r0, 16 cmp r0, 0 - bgt _08107ED8 + bgt @08107ED8 strh r1, [r4, 0x10] - b _08107ED2 -_08107EC4: + b @08107ED2 +@08107EC4: ldrh r0, [r4, 0x12] adds r0, 0x1 strh r0, [r4, 0x12] lsls r0, 16 asrs r0, 16 cmp r0, 0x6F - ble _08107ED8 -_08107ED2: + ble @08107ED8 +@08107ED2: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_08107ED8: +@08107ED8: movs r3, 0 movs r1, 0x10 ldrsh r0, [r4, r1] cmp r3, r0 - bge _08107F0C + bge @08107F0C ldr r6, =0x02038c28 ldr r5, =0x02039b28 -_08107EE6: +@08107EE6: lsls r1, r3, 16 asrs r1, 16 lsls r3, r1, 1 @@ -503359,18 +503359,18 @@ _08107EE6: movs r2, 0x10 ldrsh r0, [r4, r2] cmp r1, r0 - blt _08107EE6 -_08107F0C: + blt @08107EE6 +@08107F0C: ldrh r3, [r4, 0x10] lsls r2, r3, 16 asrs r1, r2, 16 movs r3, 0x12 ldrsh r0, [r4, r3] cmp r1, r0 - bge _08107F40 + bge @08107F40 ldr r6, =0x02038c28 ldr r5, =0x02039b28 -_08107F1E: +@08107F1E: asrs r3, r2, 16 lsls r2, r3, 1 ldrb r1, [r5, 0x14] @@ -503387,16 +503387,16 @@ _08107F1E: movs r3, 0x12 ldrsh r0, [r4, r3] cmp r1, r0 - blt _08107F1E -_08107F40: + blt @08107F1E +@08107F40: ldrh r3, [r4, 0x12] lsls r1, r3, 16 asrs r0, r1, 16 cmp r0, 0x9F - bgt _08108022 + bgt @08108022 ldr r6, =0x02038c28 ldr r5, =0x02039b28 -_08107F4E: +@08107F4E: asrs r3, r1, 16 lsls r2, r3, 1 ldrb r1, [r5, 0x14] @@ -503411,19 +503411,19 @@ _08107F4E: lsls r1, r3, 16 asrs r0, r1, 16 cmp r0, 0x9F - ble _08107F4E - b _08108022 + ble @08107F4E + b @08108022 .align 2, 0 .pool -_08107F78: +@08107F78: movs r3, 0 movs r1, 0x10 ldrsh r0, [r4, r1] cmp r3, r0 - bge _08107FAC + bge @08107FAC ldr r6, =0x02038c28 ldr r5, =0x02039b28 -_08107F86: +@08107F86: lsls r1, r3, 16 asrs r1, 16 lsls r3, r1, 1 @@ -503442,18 +503442,18 @@ _08107F86: movs r2, 0x10 ldrsh r0, [r4, r2] cmp r1, r0 - blt _08107F86 -_08107FAC: + blt @08107F86 +@08107FAC: ldrh r3, [r4, 0x10] lsls r2, r3, 16 asrs r1, r2, 16 movs r3, 0x12 ldrsh r0, [r4, r3] cmp r1, r0 - bge _08107FE0 + bge @08107FE0 ldr r6, =0x02038c28 ldr r5, =0x02039b28 -_08107FBE: +@08107FBE: asrs r3, r2, 16 lsls r2, r3, 1 ldrb r1, [r5, 0x14] @@ -503470,16 +503470,16 @@ _08107FBE: movs r3, 0x12 ldrsh r0, [r4, r3] cmp r1, r0 - blt _08107FBE -_08107FE0: + blt @08107FBE +@08107FE0: ldrh r3, [r4, 0x12] lsls r1, r3, 16 asrs r0, r1, 16 cmp r0, 0x9F - bgt _0810800C + bgt @0810800C ldr r6, =0x02038c28 ldr r5, =0x02039b28 -_08107FEE: +@08107FEE: asrs r3, r1, 16 lsls r2, r3, 1 ldrb r1, [r5, 0x14] @@ -503494,18 +503494,18 @@ _08107FEE: lsls r1, r3, 16 asrs r0, r1, 16 cmp r0, 0x9F - ble _08107FEE -_0810800C: + ble @08107FEE +@0810800C: movs r0, 0x26 ldrsh r1, [r4, r0] movs r0, 0x1 negs r0, r0 cmp r1, r0 - bne _08108022 + bne @08108022 bl remove_some_task adds r0, r7, 0 bl remove_task -_08108022: +@08108022: add sp, 0xC pop {r4-r7} pop {r0} @@ -503515,7 +503515,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] @@ -503544,11 +503544,11 @@ sub_8108034: @ 8108034 ands r1, r0 adds r0, r1, 0 cmp r0, 0xFF - ble _0810807A + ble @0810807A subs r0, r6, r0 lsls r0, 16 lsrs r1, r0, 16 -_0810807A: +@0810807A: strh r5, [r4, 0x30] strh r1, [r4, 0x32] ldr r0, =sub_8108098 + 1 @@ -503561,7 +503561,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] @@ -503575,15 +503575,15 @@ sub_8108098: @ 8108098 movs r1, 0x1 ands r1, r0 cmp r1, 0 - beq _081080BC + beq @081080BC lsls r0, r3, 16 asrs r0, 24 negs r0, r0 - b _081080C0 -_081080BC: + b @081080C0 +@081080BC: lsls r0, r3, 16 asrs r0, 24 -_081080C0: +@081080C0: strh r0, [r2, 0x24] ldrh r0, [r2, 0x36] lsls r0, 16 @@ -503595,17 +503595,17 @@ _081080C0: lsls r0, 16 asrs r0, 16 cmp r0, 0x15 - bne _081080DE + bne @081080DE adds r0, r2, 0 bl move_anim_8072740 -_081080DE: +@081080DE: pop {r4} pop {r0} bx r0 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 @@ -503647,7 +503647,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 @@ -503660,27 +503660,27 @@ sub_8108140: @ 8108140 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x7 - bls _0810815C - b _0810837A -_0810815C: + bls @0810815C + b @0810837A +@0810815C: lsls r0, 2 - ldr r1, =_08108170 + ldr r1, =@08108170 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08108170: - .4byte _08108190 - .4byte _081081B6 - .4byte _08108248 - .4byte _0810827E - .4byte _08108292 - .4byte _081082A0 - .4byte _08108320 - .4byte _0810836C -_08108190: +@08108170: + .4byte @08108190 + .4byte @081081B6 + .4byte @08108248 + .4byte @0810827E + .4byte @08108292 + .4byte @081082A0 + .4byte @08108320 + .4byte @0810836C +@08108190: ldrh r1, [r4, 0x26] lsls r1, 24 lsrs r1, 24 @@ -503699,14 +503699,14 @@ _08108190: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_081081B6: +@081081B6: ldrh r0, [r4, 0xE] adds r0, 0x1 strh r0, [r4, 0xE] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _08108212 + ble @08108212 movs r0, 0 strh r0, [r4, 0xE] ldrh r0, [r4, 0x10] @@ -503715,7 +503715,7 @@ _081081B6: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08108200 + beq @08108200 ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -503734,10 +503734,10 @@ _081081B6: ldrh r1, [r0, 0x22] adds r1, 0x1 strh r1, [r0, 0x22] - b _08108212 + b @08108212 .align 2, 0 .pool -_08108200: +@08108200: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -503747,15 +503747,15 @@ _08108200: adds r0, r2 ldr r1, =0x0000fffd strh r1, [r0, 0x24] -_08108212: +@08108212: adds r0, r4, 0 bl sub_80A80C8 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - beq _08108222 - b _0810837A -_08108222: + beq @08108222 + b @0810837A +@08108222: ldrh r0, [r4, 0x26] lsls r0, 24 lsrs r0, 24 @@ -503769,19 +503769,19 @@ _08108222: adds r0, r2 strh r5, [r0, 0x24] strh r5, [r4, 0xE] - b _0810835C + b @0810835C .align 2, 0 .pool -_08108248: +@08108248: ldrh r0, [r4, 0xE] adds r0, 0x1 strh r0, [r4, 0xE] lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bgt _08108258 - b _0810837A -_08108258: + bgt @08108258 + b @0810837A +@08108258: ldrh r1, [r4, 0x26] lsls r1, 24 lsrs r1, 24 @@ -503799,32 +503799,32 @@ _08108258: bl sub_80A805C movs r0, 0 strh r0, [r4, 0xE] - b _0810835E -_0810827E: + b @0810835E +@0810827E: adds r0, r4, 0 bl sub_80A80C8 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _0810837A + bne @0810837A strh r0, [r4, 0xE] strh r0, [r4, 0x10] - b _0810835E -_08108292: + b @0810835E +@08108292: adds r0, r4, 0 adds r1, r2, 0 bl sub_8108408 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_081082A0: +@081082A0: ldrh r0, [r4, 0xE] adds r0, 0x1 strh r0, [r4, 0xE] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0810837A + ble @0810837A movs r0, 0 strh r0, [r4, 0xE] ldrh r0, [r4, 0x10] @@ -503833,7 +503833,7 @@ _081082A0: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _081082D8 + beq @081082D8 ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -503843,10 +503843,10 @@ _081082A0: adds r0, r2 ldrh r1, [r0, 0x26] adds r1, 0x2 - b _081082EA + b @081082EA .align 2, 0 .pool -_081082D8: +@081082D8: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -503856,12 +503856,12 @@ _081082D8: adds r0, r2 ldrh r1, [r0, 0x26] subs r1, 0x2 -_081082EA: +@081082EA: strh r1, [r0, 0x26] movs r1, 0x10 ldrsh r0, [r4, r1] cmp r0, 0xA - bne _0810837A + bne @0810837A ldrh r1, [r4, 0x26] lsls r1, 24 lsrs r1, 24 @@ -503879,10 +503879,10 @@ _081082EA: movs r0, 0 strh r0, [r4, 0xE] strh r0, [r4, 0x10] - b _0810835E + b @0810835E .align 2, 0 .pool -_08108320: +@08108320: ldr r6, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -503898,7 +503898,7 @@ _08108320: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _0810837A + bne @0810837A ldrh r0, [r4, 0x26] lsls r0, 24 lsrs r0, 24 @@ -503911,23 +503911,23 @@ _08108320: adds r0, r6 ldrh r1, [r4, 0x12] strh r1, [r0, 0x22] -_0810835C: +@0810835C: strh r5, [r4, 0x10] -_0810835E: +@0810835E: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0810837A + b @0810837A .align 2, 0 .pool -_0810836C: +@0810836C: movs r1, 0xC ldrsh r0, [r4, r1] cmp r0, 0 - bne _0810837A + bne @0810837A adds r0, r2, 0 bl move_anim_task_del -_0810837A: +@0810837A: add sp, 0xC pop {r4-r6} pop {r0} @@ -503935,14 +503935,14 @@ _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] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _081083B8 + bne @081083B8 ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 @@ -503951,13 +503951,13 @@ sub_8108384: @ 8108384 movs r0, 0x64 muls r1, r0 ldr r0, =0x020244ec - b _081083C8 + b @081083C8 .align 2, 0 .pool -_081083B4: +@081083B4: adds r0, r2, 0 - b _081083FA -_081083B8: + b @081083FA +@081083B8: ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 @@ -503966,7 +503966,7 @@ _081083B8: movs r0, 0x64 muls r1, r0 ldr r0, =0x02024744 -_081083C8: +@081083C8: adds r5, r1, r0 adds r0, r5, 0 movs r1, 0x3A @@ -503980,18 +503980,18 @@ _081083C8: lsrs r3, r0, 16 lsrs r4, 18 movs r2, 0 -_081083E6: +@081083E6: adds r1, r2, 0x1 adds r0, r4, 0 muls r0, r1 cmp r3, r0 - blt _081083B4 + blt @081083B4 lsls r0, r1, 24 lsrs r2, r0, 24 cmp r2, 0x2 - bls _081083E6 + bls @081083E6 movs r0, 0x3 -_081083FA: +@081083FA: pop {r4,r5} pop {r1} bx r1 @@ -504000,7 +504000,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 @@ -504036,9 +504036,9 @@ sub_8108408: @ 8108408 lsls r0, 16 lsrs r1, r0, 16 cmp r0, 0 - bgt _08108458 + bgt @08108458 movs r1, 0x1 -_08108458: +@08108458: movs r0, 0 str r0, [sp, 0x4] lsls r0, r1, 16 @@ -504052,7 +504052,7 @@ _08108458: str r1, [sp, 0x10] asrs r0, 16 mov r8, r0 -_08108472: +@08108472: ldr r0, =0x08595268 mov r1, r10 mov r2, r9 @@ -504062,7 +504062,7 @@ _08108472: lsrs r2, r0, 24 lsls r6, r5, 16 cmp r2, 0x40 - beq _081084DA + beq @081084DA ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -504095,14 +504095,14 @@ _08108472: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081084D4 + beq @081084D4 adds r0, r5, 0 bl sub_810851C -_081084D4: +@081084D4: ldrh r0, [r7, 0xC] adds r0, 0x1 strh r0, [r7, 0xC] -_081084DA: +@081084DA: mov r1, r8 lsls r0, r1, 1 asrs r1, r6, 16 @@ -504121,7 +504121,7 @@ _081084DA: str r1, [sp, 0x4] asrs r0, 16 cmp r0, 0x13 - ble _08108472 + ble @08108472 add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -504135,17 +504135,17 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - beq _0810852E + beq @0810852E cmp r0, 0x1 - beq _08108564 - b _081085BE -_0810852E: + beq @08108564 + b @081085BE +@0810852E: movs r2, 0x30 ldrsh r0, [r4, r2] movs r1, 0x6 @@ -504171,7 +504171,7 @@ _0810852E: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] -_08108564: +@08108564: ldrh r0, [r4, 0x36] ldrh r1, [r4, 0x32] adds r0, r1 @@ -504191,15 +504191,15 @@ _08108564: movs r1, 0x80 lsls r1, 17 cmp r0, r1 - bhi _0810859A + bhi @0810859A adds r1, r2, 0 movs r0, 0x8 negs r0, r0 cmp r1, r0 - blt _0810859A + blt @0810859A cmp r1, 0x78 - ble _081085BE -_0810859A: + ble @081085BE +@0810859A: ldr r3, =0x03005e00 movs r0, 0x3C ldrsh r1, [r4, r0] @@ -504217,7 +504217,7 @@ _0810859A: strh r0, [r1] adds r0, r4, 0 bl obj_delete_and_free_tiles -_081085BE: +@081085BE: pop {r4} pop {r0} bx r0 @@ -504226,7 +504226,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 @@ -504244,18 +504244,18 @@ sub_81085C8: @ 81085C8 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08108600 + bne @08108600 movs r0, 0x88 strh r0, [r4, 0x10] movs r0, 0x28 - b _08108606 + b @08108606 .align 2, 0 .pool -_08108600: +@08108600: movs r0, 0x10 strh r0, [r4, 0x10] movs r0, 0x50 -_08108606: +@08108606: strh r0, [r4, 0x14] movs r0, 0x62 strh r0, [r4, 0x12] @@ -504278,7 +504278,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} @@ -504292,32 +504292,32 @@ sub_810862C: @ 810862C movs r0, 0x8 ldrsh r2, [r4, r0] cmp r2, 0 - beq _08108654 + beq @08108654 cmp r2, 0x1 - beq _08108704 - b _08108712 + beq @08108704 + b @08108712 .align 2, 0 .pool -_08108654: +@08108654: ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - ble _0810866A + ble @0810866A strh r2, [r4, 0xC] adds r0, r4, 0 bl sub_810871C -_0810866A: +@0810866A: movs r1, 0x1C ldrsh r0, [r4, r1] cmp r0, 0 - beq _081086E4 + beq @081086E4 movs r2, 0x22 ldrsh r0, [r4, r2] cmp r0, 0 - bne _081086E4 + bne @081086E4 ldr r5, =0x0203841e movs r1, 0x1 mov r8, r1 @@ -504333,7 +504333,7 @@ _0810866A: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq _081086B4 + beq @081086B4 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -504345,7 +504345,7 @@ _0810866A: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_081086B4: +@081086B4: movs r0, 0x3 strh r0, [r5] adds r0, r6, 0 @@ -504354,7 +504354,7 @@ _081086B4: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq _081086E0 + beq @081086E0 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -504366,30 +504366,30 @@ _081086B4: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_081086E0: +@081086E0: mov r0, r8 strh r0, [r4, 0x22] -_081086E4: +@081086E4: movs r2, 0x1E ldrsh r1, [r4, r2] movs r2, 0x20 ldrsh r0, [r4, r2] cmp r1, r0 - blt _08108712 + blt @08108712 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _08108712 + b @08108712 .align 2, 0 .pool -_08108704: +@08108704: movs r2, 0x1A ldrsh r0, [r4, r2] cmp r0, 0 - bne _08108712 + bne @08108712 adds r0, r1, 0 bl move_anim_task_del -_08108712: +@08108712: pop {r3} mov r8, r3 pop {r4-r7} @@ -504398,7 +504398,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 @@ -504425,7 +504425,7 @@ sub_810871C: @ 810871C lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq _08108776 + beq @08108776 ldr r3, =0x02020630 lsls r0, r1, 4 adds r0, r1 @@ -504443,7 +504443,7 @@ sub_810871C: @ 810871C ldrh r0, [r4, 0x1A] adds r0, 0x1 strh r0, [r4, 0x1A] -_08108776: +@08108776: ldrh r0, [r4, 0x1E] adds r0, 0x1 strh r0, [r4, 0x1E] @@ -504472,13 +504472,13 @@ _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 ldrsh r0, [r5, r1] cmp r0, 0 - bne _08108856 + bne @08108856 ldrh r0, [r5, 0x22] adds r0, 0x8 strh r0, [r5, 0x22] @@ -504487,7 +504487,7 @@ sub_81087C0: @ 81087C0 movs r2, 0x38 ldrsh r1, [r5, r2] cmp r0, r1 - blt _08108856 + blt @08108856 ldr r2, =0x03005e00 movs r3, 0x3A ldrsh r1, [r5, r3] @@ -504508,7 +504508,7 @@ sub_81087C0: @ 81087C0 lsrs r0, 24 strh r0, [r5, 0x30] cmp r0, 0x40 - beq _08108850 + beq @08108850 movs r0, 0x30 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -504543,10 +504543,10 @@ sub_81087C0: @ 81087C0 adds r0, r4 ldr r1, =sub_810886C + 1 str r1, [r0] -_08108850: +@08108850: adds r0, r5, 0 bl obj_delete_and_free_tiles -_08108856: +@08108856: pop {r4,r5} pop {r0} bx r0 @@ -504555,7 +504555,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] @@ -504564,7 +504564,7 @@ sub_810886C: @ 810886C lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _081088D8 + ble @081088D8 movs r0, 0 strh r0, [r4, 0x30] adds r3, r4, 0 @@ -504586,7 +504586,7 @@ sub_810886C: @ 810886C lsls r0, 16 asrs r0, 16 cmp r0, 0xC - bne _081088D8 + bne @081088D8 ldr r3, =0x03005e00 movs r0, 0x3C ldrsh r1, [r4, r0] @@ -504608,7 +504608,7 @@ sub_810886C: @ 810886C bl rotscale_free_entry adds r0, r4, 0 bl obj_delete_and_free_tiles -_081088D8: +@081088D8: pop {r4} pop {r0} bx r0 @@ -504617,7 +504617,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 @@ -504647,19 +504647,19 @@ sub_81088E4: @ 81088E4 negs r2, r2 adds r1, r2, 0 cmp r0, 0 - bne _08108928 + bne @08108928 movs r1, 0x1 -_08108928: +@08108928: strh r1, [r5, 0x16] bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _0810893C + beq @0810893C movs r1, 0x16 ldrsh r0, [r5, r1] negs r0, r0 strh r0, [r5, 0x16] -_0810893C: +@0810893C: movs r2, 0x16 ldrsh r0, [r5, r2] lsls r0, 3 @@ -504686,7 +504686,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 @@ -504698,34 +504698,34 @@ sub_8108978: @ 8108978 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x6 - bls _08108992 - b _08108AB2 -_08108992: + bls @08108992 + b @08108AB2 +@08108992: lsls r0, 2 - ldr r1, =_081089A4 + ldr r1, =@081089A4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081089A4: - .4byte _081089C0 - .4byte _081089D0 - .4byte _081089EA - .4byte _08108A2C - .4byte _08108A4E - .4byte _08108A7C - .4byte _08108AA2 -_081089C0: +@081089A4: + .4byte @081089C0 + .4byte @081089D0 + .4byte @081089EA + .4byte @08108A2C + .4byte @08108A4E + .4byte @08108A7C + .4byte @08108AA2 +@081089C0: adds r0, r4, 0 bl sub_8108AC0 movs r1, 0x1C ldrsh r0, [r4, r1] cmp r0, 0 - beq _08108AB8 - b _08108AAA -_081089D0: + beq @08108AB8 + b @08108AAA +@081089D0: adds r0, r4, 0 bl sub_8108AC0 ldrh r0, [r4, 0xA] @@ -504734,11 +504734,11 @@ _081089D0: lsls r0, 16 asrs r0, 16 cmp r0, 0x10 - ble _08108AB8 + ble @08108AB8 movs r0, 0 strh r0, [r4, 0xA] - b _08108AAA -_081089EA: + b @08108AAA +@081089EA: adds r0, r4, 0 bl sub_8108AC0 movs r1, 0x16 @@ -504755,24 +504755,24 @@ _081089EA: movs r0, 0x88 lsls r0, 17 cmp r1, r0 - bls _08108AB8 + bls @08108AB8 ldrh r0, [r4, 0x20] adds r0, 0x1 strh r0, [r4, 0x20] lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - ble _08108A28 + ble @08108A28 movs r0, 0x1 strh r0, [r4, 0x22] movs r0, 0x6 strh r0, [r4, 0x8] strh r2, [r4, 0xA] - b _08108AB8 -_08108A28: + b @08108AB8 +@08108A28: strh r2, [r4, 0xA] - b _08108AAA -_08108A2C: + b @08108AAA +@08108A2C: adds r0, r4, 0 bl sub_8108AC0 movs r0, 0x16 @@ -504787,9 +504787,9 @@ _08108A2C: lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - ble _08108AB8 - b _08108AAA -_08108A4E: + ble @08108AB8 + b @08108AAA +@08108A4E: adds r0, r4, 0 bl sub_8108AC0 movs r1, 0x16 @@ -504805,14 +504805,14 @@ _08108A4E: movs r1, 0x88 lsls r1, 17 cmp r0, r1 - bls _08108AB8 + bls @08108AB8 ldrh r0, [r4, 0x20] adds r0, 0x1 strh r0, [r4, 0x20] movs r0, 0 strh r0, [r4, 0xA] - b _08108AAA -_08108A7C: + b @08108AAA +@08108A7C: adds r0, r4, 0 bl sub_8108AC0 movs r0, 0x16 @@ -504827,31 +504827,31 @@ _08108A7C: lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - ble _08108AB8 + ble @08108AB8 movs r0, 0x2 strh r0, [r4, 0x8] - b _08108AB8 -_08108AA2: + b @08108AB8 +@08108AA2: movs r1, 0x18 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08108AB8 -_08108AAA: + bne @08108AB8 +@08108AAA: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _08108AB8 -_08108AB2: + b @08108AB8 +@08108AB2: adds r0, r2, 0 bl move_anim_task_del -_08108AB8: +@08108AB8: pop {r4} pop {r0} bx r0 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] @@ -504860,7 +504860,7 @@ sub_8108AC0: @ 8108AC0 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _08108B1A + ble @08108B1A movs r0, 0 strh r0, [r6, 0xC] ldr r0, =0x08595268 @@ -504873,7 +504873,7 @@ sub_8108AC0: @ 8108AC0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _08108B1A + beq @08108B1A ldr r5, =0x02020630 lsls r4, r0, 4 adds r4, r0 @@ -504895,7 +504895,7 @@ sub_8108AC0: @ 8108AC0 ldrh r0, [r6, 0x18] adds r0, 0x1 strh r0, [r6, 0x18] -_08108B1A: +@08108B1A: pop {r4-r6} pop {r0} bx r0 @@ -504904,13 +504904,13 @@ _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 lsls r0, 24 cmp r0, 0 - beq _08108B86 + beq @08108B86 ldrh r0, [r6, 0x24] ldrh r1, [r6, 0x20] adds r0, r1 @@ -504945,7 +504945,7 @@ sub_8108B2C: @ 8108B2C bl sub_80A68D4 ldr r0, =sub_8108B94 + 1 str r0, [r6, 0x1C] -_08108B86: +@08108B86: pop {r4-r6} pop {r0} bx r0 @@ -504954,16 +504954,16 @@ _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 lsls r0, 24 cmp r0, 0 - beq _08108BD0 + beq @08108BD0 movs r4, 0 ldr r6, =0x03005e00 -_08108BA6: +@08108BA6: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -504971,7 +504971,7 @@ _08108BA6: ldr r1, [r2] ldr r0, =sub_8108978 + 1 cmp r1, r0 - bne _08108BC6 + bne @08108BC6 movs r0, 0x1 strh r0, [r2, 0x1C] ldrh r0, [r2, 0x18] @@ -504979,13 +504979,13 @@ _08108BA6: strh r0, [r2, 0x18] adds r0, r5, 0 bl obj_delete_and_free_tiles -_08108BC6: +@08108BC6: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0xF - bls _08108BA6 -_08108BD0: + bls @08108BA6 +@08108BD0: pop {r4-r6} pop {r0} bx r0 @@ -504994,7 +504994,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] @@ -505016,7 +505016,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] @@ -505045,17 +505045,17 @@ sub_8108C08: @ 8108C08 strh r0, [r4, 0x34] lsls r0, 16 cmp r0, 0 - bne _08108C4C + bne @08108C4C adds r0, r4, 0 bl move_anim_8072740 -_08108C4C: +@08108C4C: pop {r4} pop {r0} bx r0 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] @@ -505077,19 +505077,19 @@ sub_8108C54: @ 8108C54 strh r0, [r4, 0x2E] lsls r0, 16 cmp r0, 0 - bne _08108C8C + bne @08108C8C adds r0, r4, 0 bl obj_free_rotscale_entry adds r0, r4, 0 bl obj_delete_and_free_tiles -_08108C8C: +@08108C8C: pop {r4} pop {r0} bx r0 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 @@ -505122,7 +505122,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 @@ -505157,23 +505157,23 @@ sub_8108CDC: @ 8108CDC movs r2, 0x36 ldrsh r1, [r4, r2] cmp r0, r1 - bne _08108D34 + bne @08108D34 movs r0, 0 strh r0, [r4, 0x38] adds r0, r4, 0 adds r1, r6, 0 adds r2, r5, 0 bl sub_8108D54 -_08108D34: +@08108D34: movs r0, 0x34 ldrsh r1, [r4, r0] movs r2, 0x2E ldrsh r0, [r4, r2] cmp r1, r0 - bne _08108D46 + bne @08108D46 adds r0, r4, 0 bl move_anim_8072740 -_08108D46: +@08108D46: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] @@ -505183,7 +505183,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 @@ -505251,7 +505251,7 @@ sub_8108D54: @ 8108D54 adds r1, r0 lsls r1, 16 mov r10, r1 -_08108DE2: +@08108DE2: ldr r0, =0x08595310 mov r2, r8 asrs r1, r2, 16 @@ -505278,23 +505278,23 @@ _08108DE2: adds r1, 0x43 strb r0, [r1] cmp r5, 0 - bge _08108E30 + bge @08108E30 mov r1, sp ldrh r1, [r1, 0x4] strh r1, [r4, 0x32] - b _08108E32 + b @08108E32 .align 2, 0 .pool -_08108E30: +@08108E30: strh r7, [r4, 0x32] -_08108E32: +@08108E32: lsls r0, r6, 16 movs r2, 0x80 lsls r2, 9 adds r0, r2 lsrs r6, r0, 16 cmp r0, 0 - ble _08108DE2 + ble @08108DE2 movs r6, 0 ldr r3, [sp, 0xC] asrs r1, r3, 16 @@ -505307,7 +505307,7 @@ _08108E32: subs r1, r0 lsls r1, 16 mov r10, r1 -_08108E58: +@08108E58: ldr r0, =0x08595310 mov r2, r8 asrs r1, r2, 16 @@ -505334,23 +505334,23 @@ _08108E58: adds r1, 0x43 strb r0, [r1] cmp r5, 0 - ble _08108EA8 + ble @08108EA8 mov r1, sp ldrh r1, [r1, 0x8] strh r1, [r4, 0x32] - b _08108EAA + b @08108EAA .align 2, 0 .pool -_08108EA8: +@08108EA8: strh r7, [r4, 0x32] -_08108EAA: +@08108EAA: lsls r0, r6, 16 movs r2, 0x80 lsls r2, 9 adds r0, r2 lsrs r6, r0, 16 cmp r0, 0 - ble _08108E58 + ble @08108E58 add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -505362,7 +505362,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 @@ -505392,7 +505392,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 @@ -505423,7 +505423,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 @@ -505432,7 +505432,7 @@ sub_8108F4C: @ 8108F4C bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08108F88 + beq @08108F88 ldr r2, =0x0203841e ldrh r0, [r4, 0x20] ldrh r1, [r2] @@ -505446,10 +505446,10 @@ sub_8108F4C: @ 8108F4C negs r0, r0 strh r0, [r4, 0x32] adds r1, r2, 0 - b _08108F9E + b @08108F9E .align 2, 0 .pool -_08108F88: +@08108F88: ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] @@ -505461,7 +505461,7 @@ _08108F88: strh r0, [r4, 0x22] ldrh r0, [r1, 0x8] strh r0, [r4, 0x32] -_08108F9E: +@08108F9E: ldrh r0, [r1, 0x4] strh r0, [r4, 0x30] ldrh r0, [r1, 0x6] @@ -505478,7 +505478,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 @@ -505486,7 +505486,7 @@ sub_8108FBC: @ 8108FBC bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08108FF0 + beq @08108FF0 ldr r2, =0x0203841e ldrh r0, [r4, 0x20] ldrh r1, [r2] @@ -505499,10 +505499,10 @@ sub_8108FBC: @ 8108FBC ldrh r0, [r2, 0x8] strh r0, [r4, 0x32] adds r1, r2, 0 - b _08109008 + b @08109008 .align 2, 0 .pool -_08108FF0: +@08108FF0: ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] @@ -505515,7 +505515,7 @@ _08108FF0: ldrh r0, [r1, 0x8] negs r0, r0 strh r0, [r4, 0x32] -_08109008: +@08109008: ldrh r0, [r1, 0x4] strh r0, [r4, 0x30] ldrh r0, [r1, 0x6] @@ -505532,7 +505532,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] @@ -505543,7 +505543,7 @@ sub_8109028: @ 8109028 movs r3, 0x36 ldrsh r1, [r2, r3] cmp r0, r1 - bge _0810904E + bge @0810904E ldrh r0, [r2, 0x32] ldrh r1, [r2, 0x24] adds r0, r1 @@ -505552,22 +505552,22 @@ sub_8109028: @ 8109028 ldrh r3, [r2, 0x26] adds r0, r3 strh r0, [r2, 0x26] -_0810904E: +@0810904E: movs r0, 0x2E ldrsh r1, [r2, r0] movs r3, 0x30 ldrsh r0, [r2, r3] cmp r1, r0 - bne _08109060 + bne @08109060 adds r0, r2, 0 bl move_anim_8074EE0 -_08109060: +@08109060: pop {r0} bx r0 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 @@ -505576,16 +505576,16 @@ sub_8109064: @ 8109064 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08109090 + beq @08109090 ldr r0, =0x0203841e ldrh r1, [r4, 0x20] ldrh r2, [r0] subs r1, r2 strh r1, [r4, 0x20] - b _081090A2 + b @081090A2 .align 2, 0 .pool -_08109090: +@08109090: ldr r0, =0x0203841e ldrh r1, [r0] ldrh r2, [r4, 0x20] @@ -505595,7 +505595,7 @@ _08109090: adds r2, 0x43 movs r1, 0x8 strb r1, [r2] -_081090A2: +@081090A2: adds r2, r0, 0 ldrh r0, [r2, 0x2] ldrh r1, [r4, 0x22] @@ -505623,23 +505623,23 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - beq _08109160 + beq @08109160 movs r2, 0x38 ldrsh r1, [r4, r2] ldr r0, =0x00002710 cmp r1, r0 - ble _081090F6 + ble @081090F6 adds r1, r4, 0 adds r1, 0x43 movs r0, 0x1 strb r0, [r1] -_081090F6: +@081090F6: movs r1, 0x2E ldrsh r0, [r4, r1] ldrh r1, [r4, 0x38] @@ -505673,35 +505673,35 @@ _081090F6: lsls r0, r1, 16 asrs r0, 16 cmp r0, 0xFF - ble _0810914C + ble @0810914C ldr r2, =0xffffff00 - b _08109154 + b @08109154 .align 2, 0 .pool -_0810914C: +@0810914C: cmp r0, 0 - bge _08109158 + bge @08109158 movs r2, 0x80 lsls r2, 1 -_08109154: +@08109154: adds r0, r1, r2 strh r0, [r4, 0x2E] -_08109158: +@08109158: ldrh r0, [r4, 0x34] subs r0, 0x1 strh r0, [r4, 0x34] - b _08109166 -_08109160: + b @08109166 +@08109160: adds r0, r4, 0 bl move_anim_8074EE0 -_08109166: +@08109166: pop {r4} pop {r0} bx r0 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] @@ -505723,7 +505723,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 @@ -505736,27 +505736,27 @@ sub_8109198: @ 8109198 lsls r4, 24 lsls r0, 24 cmp r4, r0 - bne _081091DE + bne @081091DE movs r0, 0x2 bl battle_get_side_with_given_state ldrb r1, [r5] lsls r0, 24 lsrs r0, 24 cmp r1, r0 - beq _081091D6 + beq @081091D6 movs r0, 0x3 bl battle_get_side_with_given_state ldrb r1, [r5] lsls r0, 24 lsrs r0, 24 cmp r1, r0 - bne _081091DE -_081091D6: + bne @081091DE +@081091D6: ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] -_081091DE: +@081091DE: ldr r1, =sub_80A7938 + 1 str r1, [r6, 0x1C] adds r0, r6, 0 @@ -505769,7 +505769,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 @@ -505785,7 +505785,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 @@ -505805,7 +505805,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 @@ -505815,7 +505815,7 @@ sub_8109244: @ 8109244 lsls r0, 16 asrs r0, 16 cmp r0, 0x12 - bne _0810928E + bne @0810928E movs r0, 0x19 strh r0, [r5, 0x2E] ldrh r0, [r5, 0x20] @@ -505839,7 +505839,7 @@ sub_8109244: @ 8109244 bl obj_translate_based_on_private_1_2_3_4 ldr r0, =sub_810929C + 1 str r0, [r5, 0x1C] -_0810928E: +@0810928E: pop {r4,r5} pop {r0} bx r0 @@ -505848,13 +505848,13 @@ _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 lsls r0, 24 cmp r0, 0 - beq _081092E4 + beq @081092E4 movs r4, 0 strh r4, [r6, 0x2E] ldr r5, =0x02038437 @@ -505876,10 +505876,10 @@ sub_810929C: @ 810929C str r1, [r6, 0x1C] adds r0, r6, 0 bl _call_via_r1 - b _0810930E + b @0810930E .align 2, 0 .pool -_081092E4: +@081092E4: movs r1, 0x3C ldrsh r0, [r6, r1] movs r1, 0x1C @@ -505899,14 +505899,14 @@ _081092E4: movs r1, 0xFF ands r0, r1 strh r0, [r6, 0x3C] -_0810930E: +@0810930E: pop {r4-r6} pop {r0} bx r0 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 @@ -505916,17 +505916,17 @@ sub_8109314: @ 8109314 lsls r0, 16 asrs r0, 16 cmp r0, 0x1F - bne _08109330 + bne @08109330 adds r0, r4, 0 bl move_anim_8072740 -_08109330: +@08109330: pop {r4} pop {r0} bx r0 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 @@ -505950,7 +505950,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 @@ -505981,7 +505981,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 @@ -506010,7 +506010,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 @@ -506033,7 +506033,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 @@ -506066,17 +506066,17 @@ sub_810940C: @ 810940C movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _08109458 + bne @08109458 adds r0, r4, 0 bl move_anim_8072740 -_08109458: +@08109458: pop {r4} pop {r0} bx r0 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 @@ -506126,7 +506126,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 @@ -506139,26 +506139,26 @@ sub_81094D0: @ 81094D0 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x6 - bls _081094EC - b _081097AA -_081094EC: + bls @081094EC + b @081097AA +@081094EC: lsls r0, 2 - ldr r1, =_08109500 + ldr r1, =@08109500 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08109500: - .4byte _0810951C - .4byte _08109542 - .4byte _081095F4 - .4byte _08109654 - .4byte _08109672 - .4byte _08109748 - .4byte _0810979C -_0810951C: +@08109500: + .4byte @0810951C + .4byte @08109542 + .4byte @081095F4 + .4byte @08109654 + .4byte @08109672 + .4byte @08109748 + .4byte @0810979C +@0810951C: ldrh r1, [r4, 0x26] lsls r1, 24 lsrs r1, 24 @@ -506177,14 +506177,14 @@ _0810951C: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_08109542: +@08109542: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0810958A + ble @0810958A movs r0, 0 strh r0, [r4, 0xA] ldrh r0, [r4, 0xC] @@ -506193,7 +506193,7 @@ _08109542: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08109578 + beq @08109578 ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -506202,10 +506202,10 @@ _08109542: lsls r0, 2 adds r0, r2 movs r1, 0x3 - b _08109588 + b @08109588 .align 2, 0 .pool -_08109578: +@08109578: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -506214,20 +506214,20 @@ _08109578: lsls r0, 2 adds r0, r2 ldr r1, =0x0000fffd -_08109588: +@08109588: strh r1, [r0, 0x24] -_0810958A: +@0810958A: movs r1, 0x12 ldrsh r0, [r4, r1] cmp r0, 0 - beq _081095B8 + beq @081095B8 ldrh r0, [r4, 0xE] adds r0, 0x1 strh r0, [r4, 0xE] lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _081095B8 + ble @081095B8 movs r0, 0 strh r0, [r4, 0xE] ldr r2, =0x02020630 @@ -506240,15 +506240,15 @@ _0810958A: ldrh r1, [r0, 0x22] adds r1, 0x1 strh r1, [r0, 0x22] -_081095B8: +@081095B8: adds r0, r4, 0 bl sub_80A80C8 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - beq _081095C8 - b _081097AA -_081095C8: + beq @081095C8 + b @081097AA +@081095C8: ldrh r0, [r4, 0x26] lsls r0, 24 lsrs r0, 24 @@ -506264,23 +506264,23 @@ _081095C8: strh r5, [r4, 0xA] strh r5, [r4, 0xC] strh r5, [r4, 0xE] - b _08109790 + b @08109790 .align 2, 0 .pool -_081095F4: +@081095F4: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bgt _08109604 - b _081097AA -_08109604: + bgt @08109604 + b @081097AA +@08109604: movs r1, 0x12 ldrsh r0, [r4, r1] cmp r0, 0 - beq _0810962E + beq @0810962E ldrh r1, [r4, 0x26] lsls r1, 24 lsrs r1, 24 @@ -506296,8 +506296,8 @@ _08109604: adds r0, r4, 0 movs r2, 0xE0 bl sub_80A805C - b _0810964E -_0810962E: + b @0810964E +@0810962E: ldrh r1, [r4, 0x26] lsls r1, 24 lsrs r1, 24 @@ -506313,33 +506313,33 @@ _0810962E: adds r0, r4, 0 movs r2, 0xE0 bl sub_80A805C -_0810964E: +@0810964E: movs r0, 0 strh r0, [r4, 0xA] - b _08109790 -_08109654: + b @08109790 +@08109654: adds r0, r4, 0 bl sub_80A80C8 lsls r0, 24 cmp r0, 0 - beq _08109662 - b _081097AA -_08109662: + beq @08109662 + b @081097AA +@08109662: ldrh r0, [r4, 0x26] lsls r0, 24 lsrs r0, 24 adds r1, r5, 0 movs r2, 0x6 bl sub_81097B4 - b _08109790 -_08109672: + b @08109790 +@08109672: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _081096C0 + ble @081096C0 movs r0, 0 strh r0, [r4, 0xA] ldrh r0, [r4, 0xC] @@ -506348,7 +506348,7 @@ _08109672: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _081096AC + beq @081096AC ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -506358,10 +506358,10 @@ _08109672: adds r0, r2 ldrh r1, [r0, 0x26] adds r1, 0x3 - b _081096BE + b @081096BE .align 2, 0 .pool -_081096AC: +@081096AC: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -506371,20 +506371,20 @@ _081096AC: adds r0, r2 ldrh r1, [r0, 0x26] subs r1, 0x3 -_081096BE: +@081096BE: strh r1, [r0, 0x26] -_081096C0: +@081096C0: ldrh r0, [r4, 0xE] adds r0, 0x1 strh r0, [r4, 0xE] lsls r0, 16 asrs r0, 16 cmp r0, 0x18 - ble _081097AA + ble @081097AA movs r1, 0x12 ldrsh r0, [r4, r1] cmp r0, 0 - beq _081096FC + beq @081096FC ldrh r1, [r4, 0x26] lsls r1, 24 lsrs r1, 24 @@ -506399,10 +506399,10 @@ _081096C0: adds r0, r4, 0 movs r3, 0xF0 bl sub_80A805C - b _0810971A + b @0810971A .align 2, 0 .pool -_081096FC: +@081096FC: ldrh r1, [r4, 0x26] lsls r1, 24 lsrs r1, 24 @@ -506417,12 +506417,12 @@ _081096FC: adds r0, r4, 0 movs r3, 0xC0 bl sub_80A805C -_0810971A: +@0810971A: ldrh r1, [r4, 0xC] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08109738 + beq @08109738 ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -506433,19 +506433,19 @@ _0810971A: ldrh r1, [r0, 0x26] subs r1, 0x3 strh r1, [r0, 0x26] -_08109738: +@08109738: movs r0, 0 strh r0, [r4, 0xA] strh r0, [r4, 0xC] strh r0, [r4, 0xE] - b _08109790 + b @08109790 .align 2, 0 .pool -_08109748: +@08109748: movs r1, 0x12 ldrsh r0, [r4, r1] cmp r0, 0 - beq _08109764 + beq @08109764 ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -506456,13 +506456,13 @@ _08109748: ldrh r1, [r0, 0x22] subs r1, 0x1 strh r1, [r0, 0x22] -_08109764: +@08109764: adds r0, r4, 0 bl sub_80A80C8 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _081097AA + bne @081097AA ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -506477,21 +506477,21 @@ _08109764: lsrs r0, 24 bl sub_80A7344 strh r5, [r4, 0xC] -_08109790: +@08109790: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _081097AA + b @081097AA .align 2, 0 .pool -_0810979C: +@0810979C: movs r1, 0x14 ldrsh r0, [r4, r1] cmp r0, 0 - bne _081097AA + bne @081097AA adds r0, r5, 0 bl move_anim_task_del -_081097AA: +@081097AA: add sp, 0xC pop {r4,r5} pop {r0} @@ -506499,7 +506499,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 @@ -506530,22 +506530,22 @@ sub_81097B4: @ 81097B4 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0810980C + bne @0810980C adds r0, r4, 0 subs r0, 0xC lsls r0, 16 lsrs r4, r0, 16 movs r0, 0x1 - b _08109816 + b @08109816 .align 2, 0 .pool -_0810980C: +@0810980C: adds r0, r4, 0 adds r0, 0x10 lsls r0, 16 lsrs r4, r0, 16 movs r0, 0xFF -_08109816: +@08109816: movs r6, 0 movs r5, 0 lsls r4, 16 @@ -506561,7 +506561,7 @@ _08109816: mov r3, r8 lsls r3, 1 mov r10, r3 -_08109834: +@08109834: ldr r0, =0x085955b4 ldr r2, [sp, 0x8] asrs r1, r2, 16 @@ -506572,7 +506572,7 @@ _08109834: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq _081098B6 + beq @081098B6 ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -506596,9 +506596,9 @@ _08109834: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x4 - bls _0810987E + bls @0810987E movs r5, 0 -_0810987E: +@0810987E: lsls r2, r6, 2 mov r1, r9 adds r0, r2, r1 @@ -506626,12 +506626,12 @@ _0810987E: ldrh r1, [r0] adds r1, 0x1 strh r1, [r0] -_081098B6: +@081098B6: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x6 - bls _08109834 + bls @08109834 add sp, 0xC pop {r3-r5} mov r8, r3 @@ -506645,7 +506645,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 @@ -506655,7 +506655,7 @@ sub_81098EC: @ 81098EC movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08109926 + beq @08109926 ldr r3, =0x03005e00 movs r0, 0x3C ldrsh r1, [r4, r0] @@ -506673,7 +506673,7 @@ sub_81098EC: @ 81098EC strh r0, [r1] adds r0, r4, 0 bl obj_delete_and_free_tiles -_08109926: +@08109926: pop {r4} pop {r0} bx r0 @@ -506682,7 +506682,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 @@ -506705,18 +506705,18 @@ sub_8109930: @ 8109930 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08109970 + bne @08109970 lsls r0, r4, 16 movs r1, 0x94 lsls r1, 15 - b _08109976 + b @08109976 .align 2, 0 .pool -_08109970: +@08109970: lsls r0, r4, 16 movs r1, 0xB0 lsls r1, 14 -_08109976: +@08109976: adds r0, r1 lsrs r4, r0, 16 adds r0, r4, 0 @@ -506726,7 +506726,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] @@ -506744,7 +506744,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] @@ -506753,7 +506753,7 @@ sub_81099A0: @ 81099A0 lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - ble _081099CA + ble @081099CA movs r0, 0 strh r0, [r2, 0x2E] ldrh r0, [r2, 0x30] @@ -506766,7 +506766,7 @@ sub_81099A0: @ 81099A0 ldrh r3, [r2, 0x34] adds r0, r3 strh r0, [r2, 0x34] -_081099CA: +@081099CA: ldrh r0, [r2, 0x36] ldrh r1, [r2, 0x32] adds r0, r1 @@ -506786,28 +506786,28 @@ _081099CA: movs r1, 0x80 lsls r1, 17 cmp r0, r1 - bhi _08109A00 + bhi @08109A00 adds r1, r3, 0 movs r0, 0x8 negs r0, r0 cmp r1, r0 - blt _08109A00 + blt @08109A00 cmp r1, 0x78 - ble _08109A0C -_08109A00: + ble @08109A0C +@08109A00: adds r0, r2, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_08109A0C: +@08109A0C: pop {r0} bx r0 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] @@ -506846,36 +506846,36 @@ 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 ldrsh r0, [r2, r1] cmp r0, 0x1 - beq _08109A96 + beq @08109A96 cmp r0, 0x1 - bgt _08109A7A + bgt @08109A7A cmp r0, 0 - beq _08109A80 - b _08109AF4 -_08109A7A: + beq @08109A80 + b @08109AF4 +@08109A7A: cmp r0, 0x2 - beq _08109AB4 - b _08109AF4 -_08109A80: + beq @08109AB4 + b @08109AF4 +@08109A80: ldrh r1, [r2, 0x3A] movs r3, 0x3A ldrsh r0, [r2, r3] cmp r0, 0 - beq _08109A90 + beq @08109A90 subs r0, r1, 0x1 strh r0, [r2, 0x3A] - b _08109AF4 -_08109A90: + b @08109AF4 +@08109A90: ldrh r0, [r2, 0x2E] adds r0, 0x1 strh r0, [r2, 0x2E] -_08109A96: +@08109A96: ldrh r0, [r2, 0x22] adds r0, 0x8 strh r0, [r2, 0x22] @@ -506885,20 +506885,20 @@ _08109A96: movs r4, 0x3C ldrsh r1, [r2, r4] cmp r0, r1 - blt _08109AF4 + blt @08109AF4 strh r3, [r2, 0x22] ldrh r0, [r2, 0x2E] adds r0, 0x1 strh r0, [r2, 0x2E] - b _08109AF4 -_08109AB4: + b @08109AF4 +@08109AB4: ldrh r0, [r2, 0x30] adds r0, 0x1 strh r0, [r2, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _08109AE0 + ble @08109AE0 movs r0, 0 strh r0, [r2, 0x30] ldrh r0, [r2, 0x32] @@ -506907,49 +506907,49 @@ _08109AB4: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08109ADC + beq @08109ADC ldr r0, =0x0000fffd - b _08109ADE + b @08109ADE .align 2, 0 .pool -_08109ADC: +@08109ADC: movs r0, 0x3 -_08109ADE: +@08109ADE: strh r0, [r2, 0x26] -_08109AE0: +@08109AE0: ldrh r0, [r2, 0x34] adds r0, 0x1 strh r0, [r2, 0x34] lsls r0, 16 asrs r0, 16 cmp r0, 0x10 - ble _08109AF4 + ble @08109AF4 adds r0, r2, 0 bl move_anim_8072740 -_08109AF4: +@08109AF4: pop {r4} pop {r0} bx r0 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 ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _08109B70 + beq @08109B70 cmp r0, 0x1 - bgt _08109B12 + bgt @08109B12 cmp r0, 0 - beq _08109B18 - b _08109C3E -_08109B12: + beq @08109B18 + b @08109C3E +@08109B12: cmp r0, 0x2 - beq _08109BCE - b _08109C3E -_08109B18: + beq @08109BCE + b @08109C3E +@08109B18: adds r0, r5, 0 movs r1, 0 bl sub_80A69CC @@ -506964,14 +506964,14 @@ _08109B18: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08109B48 + beq @08109B48 movs r0, 0x4 - b _08109B4A + b @08109B4A .align 2, 0 .pool -_08109B48: +@08109B48: ldr r0, =0x0000fffc -_08109B4A: +@08109B4A: strh r0, [r5, 0x36] ldr r0, =0x02038437 ldrb r0, [r0] @@ -506985,10 +506985,10 @@ _08109B4A: ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] - b _08109BC6 + b @08109BC6 .align 2, 0 .pool -_08109B70: +@08109B70: ldrh r0, [r5, 0x30] adds r0, 0xC0 strh r0, [r5, 0x30] @@ -506997,19 +506997,19 @@ _08109B70: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08109B94 + beq @08109B94 ldrh r0, [r5, 0x30] lsls r0, 16 asrs r0, 24 negs r0, r0 - b _08109B9A + b @08109B9A .align 2, 0 .pool -_08109B94: +@08109B94: ldrh r0, [r5, 0x30] lsls r0, 16 asrs r0, 24 -_08109B9A: +@08109B9A: strh r0, [r5, 0x26] movs r2, 0x32 ldrsh r0, [r5, r2] @@ -507028,15 +507028,15 @@ _08109B9A: lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - bne _08109C3E + bne @08109C3E movs r0, 0 strh r0, [r5, 0x34] -_08109BC6: +@08109BC6: ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] - b _08109C3E -_08109BCE: + b @08109C3E +@08109BCE: movs r1, 0x32 ldrsh r0, [r5, r1] movs r2, 0x36 @@ -507056,7 +507056,7 @@ _08109BCE: lsls r0, 16 asrs r0, 16 cmp r0, 0x1F - bne _08109C3E + bne @08109C3E ldrh r0, [r5, 0x20] adds r1, r2, r0 strh r1, [r5, 0x20] @@ -507089,7 +507089,7 @@ _08109BCE: bl sub_80A6FD4 ldr r0, =sub_8109C4C + 1 str r0, [r5, 0x1C] -_08109C3E: +@08109C3E: pop {r4,r5} pop {r0} bx r0 @@ -507098,13 +507098,13 @@ _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 lsls r0, 24 cmp r0, 0 - bne _08109CA4 + bne @08109CA4 movs r1, 0x38 ldrsh r0, [r4, r1] movs r1, 0x10 @@ -507121,49 +507121,49 @@ sub_8109C4C: @ 8109C4C lsls r2, 16 asrs r2, 16 cmp r2, 0 - beq _08109C82 + beq @08109C82 cmp r2, 0xC4 - ble _08109CAA -_08109C82: + ble @08109CAA +@08109C82: lsls r0, 16 cmp r0, 0 - ble _08109CAA + ble @08109CAA movs r1, 0x3C ldrsh r0, [r4, r1] cmp r0, 0 - bne _08109CAA + bne @08109CAA ldr r0, =0x02038440 movs r1, 0 ldrsb r1, [r0, r1] movs r0, 0x90 bl audio_play_and_stuff - b _08109CAA + b @08109CAA .align 2, 0 .pool -_08109CA4: +@08109CA4: adds r0, r4, 0 bl move_anim_8072740 -_08109CAA: +@08109CAA: pop {r4} pop {r0} bx r0 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] movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0 - bne _08109CC8 + bne @08109CC8 ldr r0, =0x0203841e ldrh r0, [r0] strh r0, [r4, 0x30] adds r0, r1, 0x1 strh r0, [r4, 0x2E] -_08109CC8: +@08109CC8: movs r0, 0xC0 lsls r0, 1 adds r1, r0, 0 @@ -507194,13 +507194,13 @@ _08109CC8: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _08109D64 + bne @08109D64 ldrh r0, [r4, 0x30] subs r0, 0x40 lsls r0, 16 lsrs r0, 16 cmp r0, 0x83 - bls _08109D3C + bls @08109D3C ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A8328 @@ -507213,10 +507213,10 @@ _08109CC8: ands r0, r2 orrs r0, r1 strb r0, [r4, 0x5] - b _08109D80 + b @08109D80 .align 2, 0 .pool -_08109D3C: +@08109D3C: ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A8328 @@ -507232,34 +507232,34 @@ _08109D3C: ands r1, r2 orrs r1, r0 strb r1, [r4, 0x5] - b _08109D80 + b @08109D80 .align 2, 0 .pool -_08109D64: +@08109D64: ldrh r0, [r4, 0x30] subs r0, 0x40 lsls r0, 16 lsrs r0, 16 cmp r0, 0x83 - bls _08109D78 + bls @08109D78 adds r1, r4, 0 adds r1, 0x43 movs r0, 0x1D - b _08109D7E -_08109D78: + b @08109D7E +@08109D78: adds r1, r4, 0 adds r1, 0x43 movs r0, 0x1F -_08109D7E: +@08109D7E: strb r0, [r1] -_08109D80: +@08109D80: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - ble _08109DA8 + ble @08109DA8 adds r3, r4, 0 adds r3, 0x3E ldrb r2, [r3] @@ -507273,21 +507273,21 @@ _08109D80: ands r0, r2 orrs r0, r1 strb r0, [r3] -_08109DA8: +@08109DA8: movs r2, 0x32 ldrsh r0, [r4, r2] cmp r0, 0x1E - bne _08109DB6 + bne @08109DB6 adds r0, r4, 0 bl move_anim_8072740 -_08109DB6: +@08109DB6: pop {r4} pop {r0} bx r0 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 @@ -507304,9 +507304,9 @@ sub_8109DBC: @ 8109DBC negs r2, r2 adds r1, r2, 0 cmp r0, 0 - bne _08109DE2 + bne @08109DE2 movs r1, 0x1 -_08109DE2: +@08109DE2: strh r1, [r4, 0x20] ldr r0, =0x02038437 ldrb r1, [r0] @@ -507337,7 +507337,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 @@ -507349,25 +507349,25 @@ sub_8109E2C: @ 8109E2C movs r0, 0x8 ldrsh r3, [r2, r0] cmp r3, 0x1 - beq _08109EF4 + beq @08109EF4 cmp r3, 0x1 - bgt _08109E54 + bgt @08109E54 cmp r3, 0 - beq _08109E62 - b _0810A054 + beq @08109E62 + b @0810A054 .align 2, 0 .pool -_08109E54: +@08109E54: cmp r3, 0x2 - bne _08109E5A - b _08109F7C -_08109E5A: + bne @08109E5A + b @08109F7C +@08109E5A: cmp r3, 0x3 - bne _08109E60 - b _0810A010 -_08109E60: - b _0810A054 -_08109E62: + bne @08109E60 + b @0810A010 +@08109E60: + b @0810A054 +@08109E62: movs r1, 0x20 ldrsh r0, [r2, r1] lsls r0, 1 @@ -507380,7 +507380,7 @@ _08109E62: lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _08109E94 + ble @08109E94 strh r3, [r2, 0xA] ldrh r0, [r2, 0xC] adds r0, 0x1 @@ -507388,24 +507388,24 @@ _08109E62: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08109E90 + beq @08109E90 movs r0, 0x2 - b _08109E92 -_08109E90: + b @08109E92 +@08109E90: ldr r0, =0x0000fffe -_08109E92: +@08109E92: strh r0, [r2, 0x1E] -_08109E94: +@08109E94: movs r1, 0 strh r1, [r2, 0xE] movs r7, 0x22 ldrsh r0, [r2, r7] cmp r1, r0 - bge _08109ED6 + bge @08109ED6 ldr r4, =0x02020630 adds r3, r2, 0 adds r3, 0x8 -_08109EA6: +@08109EA6: movs r1, 0xE ldrsh r0, [r2, r1] adds r0, 0xE @@ -507429,30 +507429,30 @@ _08109EA6: movs r5, 0x22 ldrsh r1, [r2, r5] cmp r0, r1 - blt _08109EA6 -_08109ED6: + blt @08109EA6 +@08109ED6: ldrh r0, [r2, 0x1A] adds r0, 0x1 strh r0, [r2, 0x1A] lsls r0, 16 asrs r0, 16 cmp r0, 0x10 - beq _08109EE6 - b _0810A054 -_08109EE6: + beq @08109EE6 + b @0810A054 +@08109EE6: movs r0, 0 strh r0, [r2, 0x1A] - b _0810A000 + b @0810A000 .align 2, 0 .pool -_08109EF4: +@08109EF4: ldrh r0, [r2, 0xA] adds r0, 0x1 strh r0, [r2, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _08109F1C + ble @08109F1C movs r0, 0 strh r0, [r2, 0xA] ldrh r0, [r2, 0xC] @@ -507461,24 +507461,24 @@ _08109EF4: ands r0, r3 lsls r0, 16 cmp r0, 0 - beq _08109F18 + beq @08109F18 movs r0, 0x2 - b _08109F1A -_08109F18: + b @08109F1A +@08109F18: ldr r0, =0x0000fffe -_08109F1A: +@08109F1A: strh r0, [r2, 0x1E] -_08109F1C: +@08109F1C: movs r1, 0 strh r1, [r2, 0xE] movs r7, 0x22 ldrsh r0, [r2, r7] cmp r1, r0 - bge _08109F5E + bge @08109F5E ldr r4, =0x02020630 adds r3, r2, 0 adds r3, 0x8 -_08109F2E: +@08109F2E: movs r1, 0xE ldrsh r0, [r2, r1] adds r0, 0xE @@ -507502,21 +507502,21 @@ _08109F2E: movs r5, 0x22 ldrsh r1, [r2, r5] cmp r0, r1 - blt _08109F2E -_08109F5E: + blt @08109F2E +@08109F5E: ldrh r0, [r2, 0x1A] adds r0, 0x1 strh r0, [r2, 0x1A] lsls r0, 16 asrs r0, 16 cmp r0, 0x60 - bne _0810A054 + bne @0810A054 movs r0, 0 strh r0, [r2, 0x1A] - b _0810A000 + b @0810A000 .align 2, 0 .pool -_08109F7C: +@08109F7C: movs r7, 0x20 ldrsh r1, [r2, r7] lsls r1, 1 @@ -507529,7 +507529,7 @@ _08109F7C: lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _08109FB0 + ble @08109FB0 movs r0, 0 strh r0, [r2, 0xA] ldrh r0, [r2, 0xC] @@ -507538,23 +507538,23 @@ _08109F7C: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08109FAC + beq @08109FAC strh r3, [r2, 0x1E] - b _08109FB0 -_08109FAC: + b @08109FB0 +@08109FAC: ldr r0, =0x0000fffe strh r0, [r2, 0x1E] -_08109FB0: +@08109FB0: movs r1, 0 strh r1, [r2, 0xE] movs r3, 0x22 ldrsh r0, [r2, r3] cmp r1, r0 - bge _08109FF2 + bge @08109FF2 ldr r4, =0x02020630 adds r3, r2, 0 adds r3, 0x8 -_08109FC2: +@08109FC2: movs r5, 0xE ldrsh r0, [r2, r5] adds r0, 0xE @@ -507578,34 +507578,34 @@ _08109FC2: movs r7, 0x22 ldrsh r1, [r2, r7] cmp r0, r1 - blt _08109FC2 -_08109FF2: + blt @08109FC2 +@08109FF2: ldrh r0, [r2, 0x1A] adds r0, 0x1 strh r0, [r2, 0x1A] lsls r0, 16 asrs r0, 16 cmp r0, 0x10 - bne _0810A054 -_0810A000: + bne @0810A054 +@0810A000: ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] - b _0810A054 + b @0810A054 .align 2, 0 .pool -_0810A010: +@0810A010: movs r1, 0 strh r1, [r2, 0xE] movs r3, 0x22 ldrsh r0, [r2, r3] cmp r1, r0 - bge _0810A04E + bge @0810A04E ldr r6, =0x02020630 adds r3, r2, 0 adds r3, 0x8 movs r5, 0 -_0810A024: +@0810A024: movs r7, 0xE ldrsh r0, [r2, r7] adds r0, 0xE @@ -507626,11 +507626,11 @@ _0810A024: movs r7, 0x22 ldrsh r1, [r2, r7] cmp r0, r1 - blt _0810A024 -_0810A04E: + blt @0810A024 +@0810A04E: adds r0, r4, 0 bl move_anim_task_del -_0810A054: +@0810A054: pop {r4-r7} pop {r0} bx r0 @@ -507639,7 +507639,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 @@ -507666,7 +507666,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 @@ -507685,7 +507685,7 @@ sub_810A094: @ 810A094 ldr r4, =0x0203841e mov r8, r4 cmp r0, 0 - bne _0810A0CA + bne @0810A0CA ldrh r0, [r4] strh r0, [r2, 0xA] ldrh r0, [r4, 0x2] @@ -507694,7 +507694,7 @@ sub_810A094: @ 810A094 strh r0, [r2, 0xE] ldrh r0, [r4, 0x6] strh r0, [r2, 0x10] -_0810A0CA: +@0810A0CA: ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] @@ -507706,18 +507706,18 @@ _0810A0CA: movs r5, 0x10 ldrsh r0, [r2, r5] cmp r0, 0 - bne _0810A100 + bne @0810A100 ldr r4, =0x08595684 movs r1, 0x8 ldrsh r0, [r2, r1] - b _0810A106 + b @0810A106 .align 2, 0 .pool -_0810A100: +@0810A100: ldr r4, =0x08595694 movs r3, 0x8 ldrsh r0, [r2, r3] -_0810A106: +@0810A106: movs r1, 0xA bl __modsi3 lsls r0, 16 @@ -507732,7 +507732,7 @@ _0810A106: ldrsh r1, [r1, r4] mov r12, r0 cmp r1, 0x1 - bne _0810A154 + bne @0810A154 ldr r2, =0x02020630 lsls r3, r6, 4 adds r0, r3, r6 @@ -507746,15 +507746,15 @@ _0810A106: asrs r0, 24 muls r0, r1 cmp r0, 0 - bge _0810A144 + bge @0810A144 negs r0, r0 -_0810A144: +@0810A144: mov r5, r10 strh r0, [r5, 0x26] - b _0810A16E + b @0810A16E .align 2, 0 .pool -_0810A154: +@0810A154: ldr r3, =0x02020630 lsls r4, r6, 4 adds r2, r4, r6 @@ -507768,7 +507768,7 @@ _0810A154: strh r0, [r2, 0x24] adds r2, r3, 0 adds r3, r4, 0 -_0810A16E: +@0810A16E: mov r1, r12 adds r0, r1, r7 lsls r0, 3 @@ -507778,7 +507778,7 @@ _0810A16E: movs r5, 0xA ldrsh r0, [r0, r5] cmp r1, r0 - bne _0810A194 + bne @0810A194 adds r0, r3, r6 lsls r0, 2 adds r0, r2 @@ -507787,7 +507787,7 @@ _0810A16E: strh r1, [r0, 0x26] adds r0, r7, 0 bl move_anim_task_del -_0810A194: +@0810A194: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -507800,7 +507800,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 @@ -507808,23 +507808,23 @@ sub_810A1A8: @ 810A1A8 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810A1D0 + beq @0810A1D0 ldr r0, =0x0203841e ldrh r1, [r4, 0x20] ldrh r2, [r0] subs r1, r2 strh r1, [r4, 0x20] - b _0810A1DC + b @0810A1DC .align 2, 0 .pool -_0810A1D0: +@0810A1D0: ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] adds r0, r2 strh r0, [r4, 0x20] adds r0, r1, 0 -_0810A1DC: +@0810A1DC: ldrh r0, [r0, 0x2] ldrh r1, [r4, 0x22] adds r0, r1 @@ -507839,7 +507839,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 @@ -507847,16 +507847,16 @@ sub_810A1F8: @ 810A1F8 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0810A20E + beq @0810A20E adds r0, r2, 0 bl move_anim_8072740 -_0810A20E: +@0810A20E: pop {r0} bx r0 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 @@ -507864,22 +507864,22 @@ sub_810A214: @ 810A214 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810A23C + beq @0810A23C ldr r0, =0x0203841e ldrh r1, [r4, 0x20] ldrh r0, [r0] subs r1, r0 strh r1, [r4, 0x20] - b _0810A246 + b @0810A246 .align 2, 0 .pool -_0810A23C: +@0810A23C: ldr r0, =0x0203841e ldrh r0, [r0] ldrh r1, [r4, 0x20] adds r0, r1 strh r0, [r4, 0x20] -_0810A246: +@0810A246: ldr r0, =sub_810A258 + 1 str r0, [r4, 0x1C] pop {r4} @@ -507890,7 +507890,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 @@ -507898,16 +507898,16 @@ sub_810A258: @ 810A258 movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0810A26E + beq @0810A26E adds r0, r2, 0 bl move_anim_8074EE0 -_0810A26E: +@0810A26E: pop {r0} bx r0 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 @@ -507928,7 +507928,7 @@ sub_810A274: @ 810A274 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810A2C4 + beq @0810A2C4 ldr r2, =0x0203841e ldrh r0, [r5, 0x20] ldrh r1, [r2] @@ -507938,10 +507938,10 @@ sub_810A274: @ 810A274 ldrh r1, [r2, 0x2] subs r0, r1 strh r0, [r5, 0x22] - b _0810A2D8 + b @0810A2D8 .align 2, 0 .pool -_0810A2C4: +@0810A2C4: ldr r0, =0x0203841e ldrh r1, [r0] ldrh r2, [r5, 0x20] @@ -507952,7 +507952,7 @@ _0810A2C4: adds r1, r2 strh r1, [r5, 0x22] adds r2, r0, 0 -_0810A2D8: +@0810A2D8: movs r0, 0 strh r0, [r5, 0x2E] ldrh r0, [r2, 0x4] @@ -507974,33 +507974,33 @@ _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 movs r1, 0x8 ldrsh r0, [r0, r1] cmp r0, 0x1 - beq _0810A380 + beq @0810A380 cmp r0, 0x1 - bgt _0810A324 + bgt @0810A324 cmp r0, 0 - beq _0810A32E - b _0810A380 + beq @0810A32E + b @0810A380 .align 2, 0 .pool -_0810A324: +@0810A324: cmp r0, 0x2 - beq _0810A338 + beq @0810A338 cmp r0, 0x3 - beq _0810A35C - b _0810A380 -_0810A32E: + beq @0810A35C + b @0810A380 +@0810A32E: ldr r0, =0x02038436 - b _0810A382 + b @0810A382 .align 2, 0 .pool -_0810A338: +@0810A338: ldr r4, =0x02038436 ldrb r0, [r4] movs r6, 0x2 @@ -508008,17 +508008,17 @@ _0810A338: bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - bne _0810A354 + bne @0810A354 ldrb r4, [r4] - b _0810A384 + b @0810A384 .align 2, 0 .pool -_0810A354: +@0810A354: ldrb r0, [r4] adds r4, r6, 0 eors r4, r0 - b _0810A384 -_0810A35C: + b @0810A384 +@0810A35C: ldr r0, =0x02038436 ldrb r0, [r0] movs r4, 0x2 @@ -508026,23 +508026,23 @@ _0810A35C: bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _0810A380 + beq @0810A380 ldr r0, =0x02038437 ldrb r0, [r0] eors r4, r0 - b _0810A384 + b @0810A384 .align 2, 0 .pool -_0810A380: +@0810A380: ldr r0, =0x02038437 -_0810A382: +@0810A382: ldrb r4, [r0] -_0810A384: +@0810A384: ldr r0, =0x0203841e movs r2, 0xA ldrsh r0, [r0, r2] cmp r0, 0 - bne _0810A3AC + bne @0810A3AC adds r0, r4, 0 movs r1, 0 bl sub_80A5C6C @@ -508051,10 +508051,10 @@ _0810A384: strh r0, [r5, 0x20] adds r0, r4, 0 movs r1, 0x1 - b _0810A3BE + b @0810A3BE .align 2, 0 .pool -_0810A3AC: +@0810A3AC: adds r0, r4, 0 movs r1, 0x2 bl sub_80A5C6C @@ -508063,7 +508063,7 @@ _0810A3AC: strh r0, [r5, 0x20] adds r0, r4, 0 movs r1, 0x3 -_0810A3BE: +@0810A3BE: bl sub_80A5C6C lsls r0, 24 lsrs r0, 24 @@ -508097,7 +508097,7 @@ _0810A3BE: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0810A422 + beq @0810A422 adds r0, r4, 0 bl sub_80A8328 lsls r0, 24 @@ -508112,7 +508112,7 @@ _0810A3BE: ands r1, r2 orrs r1, r0 strb r1, [r5, 0x5] -_0810A422: +@0810A422: ldrb r2, [r5, 0x3] lsls r2, 26 lsrs r2, 27 @@ -508147,7 +508147,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 @@ -508206,13 +508206,13 @@ 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 lsls r0, 24 cmp r0, 0 - bne _0810A55E + bne @0810A55E movs r1, 0x3C ldrsh r0, [r4, r1] movs r2, 0x38 @@ -508241,7 +508241,7 @@ sub_810A4F4: @ 810A4F4 bl __modsi3 lsls r0, 16 cmp r0, 0 - bne _0810A564 + bne @0810A564 adds r3, r4, 0 adds r3, 0x3E ldrb r2, [r3] @@ -508255,18 +508255,18 @@ sub_810A4F4: @ 810A4F4 ands r0, r2 orrs r0, r1 strb r0, [r3] - b _0810A564 -_0810A55E: + b @0810A564 +@0810A55E: adds r0, r4, 0 bl move_anim_8072740 -_0810A564: +@0810A564: pop {r4} pop {r0} bx r0 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] @@ -508277,7 +508277,7 @@ sub_810A56C: @ 810A56C movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _0810A5A4 + bne @0810A5A4 movs r0, 0x3E adds r0, r3 mov r12, r0 @@ -508295,40 +508295,40 @@ sub_810A56C: @ 810A56C strb r0, [r1] ldrh r0, [r3, 0x36] strh r0, [r3, 0x38] -_0810A5A4: +@0810A5A4: ldrh r0, [r3, 0x34] subs r1, r0, 0x1 strh r1, [r3, 0x34] lsls r0, 16 cmp r0, 0 - bgt _0810A5B6 + bgt @0810A5B6 adds r0, r3, 0 bl move_anim_8072740 -_0810A5B6: +@0810A5B6: pop {r0} bx r0 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 lsls r0, 24 cmp r0, 0 - bne _0810A5D8 + bne @0810A5D8 ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0810A5E0 -_0810A5D8: + bne @0810A5E0 +@0810A5D8: ldr r1, =0x0203841e ldrh r0, [r1, 0x2] negs r0, r0 strh r0, [r1, 0x2] -_0810A5E0: +@0810A5E0: ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 @@ -508362,7 +508362,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 @@ -508374,30 +508374,30 @@ sub_810A628: @ 810A628 lsls r1, 8 ands r0, r1 cmp r0, 0 - beq _0810A64C + beq @0810A64C ldr r0, =0x02038437 - b _0810A64E + b @0810A64E .align 2, 0 .pool -_0810A64C: +@0810A64C: ldr r0, =0x02038436 -_0810A64E: +@0810A64E: ldrb r6, [r0] bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0810A666 + bne @0810A666 adds r0, r6, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0810A66E -_0810A666: + bne @0810A66E +@0810A666: ldr r1, =0x0203841e ldrh r0, [r1] negs r0, r0 strh r0, [r1] -_0810A66E: +@0810A66E: adds r0, r6, 0 movs r1, 0x2 bl sub_80A5C6C @@ -508451,7 +508451,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 @@ -508478,7 +508478,7 @@ sub_810A6EC: @ 810A6EC ldrsh r1, [r4, r2] bl __modsi3 cmp r0, 0 - bne _0810A742 + bne @0810A742 adds r3, r4, 0 adds r3, 0x3E ldrb r2, [r3] @@ -508492,23 +508492,23 @@ sub_810A6EC: @ 810A6EC ands r0, r2 orrs r0, r1 strb r0, [r3] -_0810A742: +@0810A742: ldrh r0, [r4, 0x2E] subs r1, r0, 0x1 strh r1, [r4, 0x2E] lsls r0, 16 cmp r0, 0 - bgt _0810A754 + bgt @0810A754 adds r0, r4, 0 bl move_anim_8072740 -_0810A754: +@0810A754: pop {r4} pop {r0} bx r0 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 @@ -508531,27 +508531,27 @@ sub_810A75C: @ 810A75C movs r1, 0x6 ldrsh r0, [r3, r1] cmp r0, 0x1 - bne _0810A7A4 + bne @0810A7A4 ldrb r0, [r4, 0x3] movs r1, 0x3F negs r1, r1 ands r1, r0 movs r0, 0x10 - b _0810A7B2 + b @0810A7B2 .align 2, 0 .pool -_0810A7A4: +@0810A7A4: cmp r0, 0x2 - bne _0810A7B6 + bne @0810A7B6 ldrb r0, [r4, 0x3] movs r1, 0x3F negs r1, r1 ands r1, r0 movs r0, 0x20 -_0810A7B2: +@0810A7B2: orrs r1, r0 strb r1, [r4, 0x3] -_0810A7B6: +@0810A7B6: ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r4, 0x2E] @@ -508568,7 +508568,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 @@ -508608,7 +508608,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 @@ -508633,22 +508633,22 @@ sub_810A834: @ 810A834 ldrsh r0, [r0, r3] mov r10, r1 cmp r0, 0 - bne _0810A878 + bne @0810A878 movs r0, 0 mov r8, r0 movs r2, 0x1 movs r1, 0x10 mov r12, r1 - b _0810A882 + b @0810A882 .align 2, 0 .pool -_0810A878: +@0810A878: movs r2, 0x10 mov r12, r2 movs r3, 0x8 mov r8, r3 movs r2, 0x4 -_0810A882: +@0810A882: mov r0, r9 lsls r1, r0, 2 adds r0, r1, r0 @@ -508658,28 +508658,28 @@ _0810A882: ldrsh r0, [r0, r3] mov r10, r1 cmp r0, 0xA - bhi _0810A978 + bhi @0810A978 lsls r0, 2 - ldr r1, =_0810A8A4 + ldr r1, =@0810A8A4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0810A8A4: - .4byte _0810A8D0 - .4byte _0810A978 - .4byte _0810A8E4 - .4byte _0810A978 - .4byte _0810A904 - .4byte _0810A978 - .4byte _0810A91A - .4byte _0810A978 - .4byte _0810A93C - .4byte _0810A978 - .4byte _0810A970 -_0810A8D0: +@0810A8A4: + .4byte @0810A8D0 + .4byte @0810A978 + .4byte @0810A8E4 + .4byte @0810A978 + .4byte @0810A904 + .4byte @0810A978 + .4byte @0810A91A + .4byte @0810A978 + .4byte @0810A93C + .4byte @0810A978 + .4byte @0810A970 +@0810A8D0: ldr r0, =0x08595828 lsls r1, r4, 16 asrs r1, 16 @@ -508687,10 +508687,10 @@ _0810A8D0: asrs r2, 16 mov r4, r12 lsls r3, r4, 16 - b _0810A952 + b @0810A952 .align 2, 0 .pool -_0810A8E4: +@0810A8E4: mov r0, r12 lsls r3, r0, 17 mov r1, r8 @@ -508703,10 +508703,10 @@ _0810A8E4: asrs r1, 16 lsls r2, r6, 16 asrs r2, 16 - b _0810A952 + b @0810A952 .align 2, 0 .pool -_0810A904: +@0810A904: mov r3, r12 lsls r0, r3, 16 asrs r0, 16 @@ -508717,8 +508717,8 @@ _0810A904: lsls r0, 16 lsrs r0, 16 mov r8, r0 - b _0810A946 -_0810A91A: + b @0810A946 +@0810A91A: mov r0, r12 lsls r3, r0, 18 lsls r0, r2, 1 @@ -508732,23 +508732,23 @@ _0810A91A: asrs r1, 16 lsls r2, r6, 16 asrs r2, 16 - b _0810A952 + b @0810A952 .align 2, 0 .pool -_0810A93C: +@0810A93C: mov r1, r12 lsls r0, r1, 16 asrs r0, 16 lsls r3, r0, 2 adds r3, r0 -_0810A946: +@0810A946: ldr r0, =0x08595828 lsls r1, r4, 16 asrs r1, 16 lsls r2, r6, 16 asrs r2, 16 lsls r3, 16 -_0810A952: +@0810A952: asrs r3, 16 adds r2, r3 lsls r2, 16 @@ -508760,16 +508760,16 @@ _0810A952: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 - b _0810A978 + b @0810A978 .align 2, 0 .pool -_0810A970: +@0810A970: mov r0, r9 bl move_anim_task_del - b _0810A9BC -_0810A978: + b @0810A9BC +@0810A978: cmp r7, 0 - beq _0810A9AC + beq @0810A9AC ldr r4, =0x02020630 lsls r3, r5, 4 adds r3, r5 @@ -508793,7 +508793,7 @@ _0810A978: adds r3, r4 ldr r1, [r3] bl _call_via_r1 -_0810A9AC: +@0810A9AC: ldr r0, =0x03005e00 mov r1, r10 add r1, r9 @@ -508802,7 +508802,7 @@ _0810A9AC: ldrh r0, [r1, 0x1C] adds r0, 0x1 strh r0, [r1, 0x1C] -_0810A9BC: +@0810A9BC: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -508816,13 +508816,13 @@ _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 ldrsh r0, [r3, r1] cmp r0, 0 - bne _0810A9FE + bne @0810A9FE ldrb r1, [r3, 0x1] movs r2, 0x3F adds r0, r2, 0 @@ -508833,8 +508833,8 @@ sub_810A9DC: @ 810A9DC ldrb r0, [r3, 0x3] ands r2, r0 strb r2, [r3, 0x3] - b _0810AA12 -_0810A9FE: + b @0810AA12 +@0810A9FE: ldrb r2, [r3, 0x1] movs r1, 0x3F adds r0, r1, 0 @@ -508845,23 +508845,23 @@ _0810A9FE: movs r0, 0x40 orrs r1, r0 strb r1, [r3, 0x3] -_0810AA12: +@0810AA12: ldrh r0, [r3, 0x30] adds r0, 0x1 strh r0, [r3, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0xF - bne _0810AA26 + bne @0810AA26 adds r0, r3, 0 bl obj_delete_and_free_tiles -_0810AA26: +@0810AA26: pop {r0} bx r0 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 @@ -508918,7 +508918,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] @@ -508927,7 +508927,7 @@ sub_810AAB0: @ 810AAB0 lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - bne _0810AAE4 + bne @0810AAE4 movs r0, 0 strh r0, [r3, 0x2E] movs r0, 0x3E @@ -508945,23 +508945,23 @@ sub_810AAB0: @ 810AAB0 orrs r0, r1 mov r1, r12 strb r0, [r1] -_0810AAE4: +@0810AAE4: ldrh r0, [r3, 0x30] adds r0, 0x1 strh r0, [r3, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x33 - bne _0810AAF8 + bne @0810AAF8 adds r0, r3, 0 bl move_anim_8072740 -_0810AAF8: +@0810AAF8: pop {r0} bx r0 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 @@ -508974,14 +508974,14 @@ sub_810AAFC: @ 810AAFC movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _0810AB28 + bne @0810AB28 ldr r4, =0x02038436 - b _0810AB2A + b @0810AB2A .align 2, 0 .pool -_0810AB28: +@0810AB28: ldr r4, =0x02038437 -_0810AB2A: +@0810AB2A: ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -509017,7 +509017,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 @@ -509030,7 +509030,7 @@ sub_810AB78: @ 810AB78 movs r1, 0x14 ldrsh r0, [r5, r1] cmp r0, 0 - beq _0810AC78 + beq @0810AC78 ldrh r0, [r5, 0x20] adds r0, 0x1 movs r7, 0 @@ -509040,7 +509040,7 @@ sub_810AB78: @ 810AB78 movs r2, 0x22 ldrsh r1, [r5, r2] cmp r0, r1 - ble _0810AC86 + ble @0810AC86 strh r7, [r5, 0x20] ldr r0, =0x085958a8 movs r3, 0x24 @@ -509052,7 +509052,7 @@ sub_810AB78: @ 810AB78 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _0810AC86 + beq @0810AC86 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -509105,9 +509105,9 @@ sub_810AB78: @ 810AB78 lsls r0, 16 asrs r0, 16 cmp r0, 0xF - ble _0810AC30 + ble @0810AC30 strh r7, [r5, 0x1A] -_0810AC30: +@0810AC30: ldrh r0, [r5, 0x1C] adds r0, 0x1 strh r0, [r5, 0x1C] @@ -509116,46 +509116,46 @@ _0810AC30: movs r2, 0x1E ldrsh r1, [r5, r2] cmp r0, r1 - blt _0810AC52 + blt @0810AC52 strh r7, [r5, 0x1C] ldrh r1, [r5, 0x18] movs r3, 0x18 ldrsh r0, [r5, r3] cmp r0, 0x5 - bgt _0810AC52 + bgt @0810AC52 adds r0, r1, 0x1 strh r0, [r5, 0x18] -_0810AC52: +@0810AC52: ldrh r0, [r5, 0x16] adds r0, 0x1 strh r0, [r5, 0x16] ldrh r0, [r5, 0x14] subs r0, 0x1 strh r0, [r5, 0x14] - b _0810AC86 + b @0810AC86 .align 2, 0 .pool -_0810AC78: +@0810AC78: movs r1, 0x16 ldrsh r0, [r5, r1] cmp r0, 0 - bne _0810AC86 + bne @0810AC86 adds r0, r2, 0 bl move_anim_task_del -_0810AC86: +@0810AC86: pop {r4-r7} pop {r0} bx r0 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 lsls r0, 24 cmp r0, 0 - beq _0810ACB4 + beq @0810ACB4 ldr r2, =0x03005e00 movs r0, 0x38 ldrsh r1, [r4, r0] @@ -509168,7 +509168,7 @@ sub_810AC8C: @ 810AC8C strh r1, [r0, 0x16] adds r0, r4, 0 bl obj_delete_and_free_tiles -_0810ACB4: +@0810ACB4: pop {r4} pop {r0} bx r0 @@ -509177,7 +509177,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 @@ -509192,21 +509192,21 @@ 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 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _0810ACF4 + bne @0810ACF4 ldr r4, =0x02038436 - b _0810ACF6 + b @0810ACF6 .align 2, 0 .pool -_0810ACF4: +@0810ACF4: ldr r4, =0x02038437 -_0810ACF6: +@0810ACF6: ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -509232,21 +509232,21 @@ _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 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _0810AD4C + bne @0810AD4C ldr r4, =0x02038436 - b _0810AD4E + b @0810AD4E .align 2, 0 .pool -_0810AD4C: +@0810AD4C: ldr r4, =0x02038437 -_0810AD4E: +@0810AD4E: ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -509277,7 +509277,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 @@ -509307,12 +509307,12 @@ sub_810AD98: @ 810AD98 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0810ADE6 + bne @0810ADE6 movs r1, 0x3C ldrsh r0, [r5, r1] negs r0, r0 strh r0, [r5, 0x3C] -_0810ADE6: +@0810ADE6: ldr r0, =sub_810ADF8 + 1 str r0, [r5, 0x1C] pop {r4,r5} @@ -509323,29 +509323,29 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - beq _0810AE0A + beq @0810AE0A cmp r0, 0x1 - beq _0810AE20 - b _0810AE50 -_0810AE0A: + beq @0810AE20 + b @0810AE50 +@0810AE0A: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x28 - ble _0810AE50 + ble @0810AE50 ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _0810AE50 -_0810AE20: + b @0810AE50 +@0810AE20: ldrh r2, [r4, 0x3C] ldrh r1, [r4, 0x20] adds r0, r2, r1 @@ -509366,10 +509366,10 @@ _0810AE20: movs r1, 0xC8 lsls r1, 17 cmp r0, r1 - bls _0810AE50 + bls @0810AE50 adds r0, r4, 0 bl move_anim_8074EE0 -_0810AE50: +@0810AE50: pop {r4} pop {r0} bx r0 @@ -509378,7 +509378,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 @@ -509390,23 +509390,23 @@ sub_810AE5C: @ 810AE5C movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _0810AEF0 + beq @0810AEF0 cmp r0, 0x1 - bgt _0810AE84 + bgt @0810AE84 cmp r0, 0 - beq _0810AE90 - b _0810AFC0 + beq @0810AE90 + b @0810AFC0 .align 2, 0 .pool -_0810AE84: +@0810AE84: cmp r0, 0x2 - beq _0810AF4C + beq @0810AF4C cmp r0, 0x3 - bne _0810AE8E - b _0810AFA0 -_0810AE8E: - b _0810AFC0 -_0810AE90: + bne @0810AE8E + b @0810AFA0 +@0810AE8E: + b @0810AFC0 +@0810AE90: movs r0, 0 bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -509424,18 +509424,18 @@ _0810AE90: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0810AECC + bne @0810AECC ldr r0, =0x0000ffe0 strh r0, [r5, 0x24] movs r0, 0x2 - b _0810AED2 + b @0810AED2 .align 2, 0 .pool -_0810AECC: +@0810AECC: movs r0, 0x20 strh r0, [r5, 0x24] ldr r0, =0x0000fffe -_0810AED2: +@0810AED2: strh r0, [r5, 0x22] ldr r2, =0x02020630 movs r0, 0x26 @@ -509446,17 +509446,17 @@ _0810AED2: adds r0, r2 ldrh r1, [r5, 0x24] strh r1, [r0, 0x24] - b _0810AF92 + b @0810AF92 .align 2, 0 .pool -_0810AEF0: +@0810AEF0: ldrh r0, [r5, 0xA] adds r0, 0x1 strh r0, [r5, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0810AFC0 + ble @0810AFC0 movs r0, 0 strh r0, [r5, 0xA] ldr r4, =0x02020630 @@ -509482,7 +509482,7 @@ _0810AEF0: movs r2, 0x24 ldrsh r0, [r5, r2] cmp r0, 0 - beq _0810AF92 + beq @0810AF92 ldrh r2, [r5, 0x22] adds r2, r1, r2 strh r2, [r5, 0x24] @@ -509493,17 +509493,17 @@ _0810AEF0: lsls r0, 2 adds r0, r4 strh r2, [r0, 0x24] - b _0810AFC0 + b @0810AFC0 .align 2, 0 .pool -_0810AF4C: +@0810AF4C: ldrh r0, [r5, 0xA] adds r0, 0x1 strh r0, [r5, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0810AFC0 + ble @0810AFC0 movs r0, 0 strh r0, [r5, 0xA] ldr r1, =0x02020630 @@ -509531,15 +509531,15 @@ _0810AF4C: lsls r0, 16 asrs r0, 16 cmp r0, 0x8 - bne _0810AFC0 -_0810AF92: + bne @0810AFC0 +@0810AF92: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] - b _0810AFC0 + b @0810AFC0 .align 2, 0 .pool -_0810AFA0: +@0810AFA0: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r5, r0] @@ -509555,7 +509555,7 @@ _0810AFA0: strb r1, [r0] adds r0, r3, 0 bl move_anim_task_del -_0810AFC0: +@0810AFC0: pop {r4-r6} pop {r0} bx r0 @@ -509564,7 +509564,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 @@ -509576,23 +509576,23 @@ sub_810AFCC: @ 810AFCC movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0x1 - bne _0810AFE6 - b _0810B10C -_0810AFE6: + bne @0810AFE6 + b @0810B10C +@0810AFE6: cmp r0, 0x1 - bgt _0810AFF4 + bgt @0810AFF4 cmp r0, 0 - beq _0810AFFC - b _0810B14E + beq @0810AFFC + b @0810B14E .align 2, 0 .pool -_0810AFF4: +@0810AFF4: cmp r0, 0x2 - bne _0810AFFA - b _0810B140 -_0810AFFA: - b _0810B14E -_0810AFFC: + bne @0810AFFA + b @0810B140 +@0810AFFA: + b @0810B14E +@0810AFFC: ldr r4, =0x02038436 ldrb r0, [r4] bl battle_side_get_owner @@ -509601,9 +509601,9 @@ _0810AFFC: negs r2, r2 adds r1, r2, 0 cmp r0, 0 - bne _0810B012 + bne @0810B012 movs r1, 0x1 -_0810B012: +@0810B012: movs r6, 0 strh r1, [r5, 0xA] ldr r0, =0x0203841e @@ -509611,22 +509611,22 @@ _0810B012: ldrsh r2, [r0, r1] adds r3, r0, 0 cmp r2, 0 - beq _0810B048 + beq @0810B048 cmp r2, 0x4 - beq _0810B070 + beq @0810B070 ldrh r1, [r3] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0810B0A8 + beq @0810B0A8 movs r0, 0x80 lsls r0, 1 strh r0, [r5, 0xE] ldr r0, =0x0000fff0 - b _0810B0B0 + b @0810B0B0 .align 2, 0 .pool -_0810B048: +@0810B048: ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -509644,8 +509644,8 @@ _0810B048: lsls r0, 7 adds r0, 0x78 strh r0, [r5, 0x10] - b _0810B0E6 -_0810B070: + b @0810B0E6 +@0810B070: movs r0, 0xA ldrsh r1, [r5, r0] lsls r1, 7 @@ -509669,20 +509669,20 @@ _0810B070: lsls r1, 5 subs r0, r1 strh r0, [r5, 0x10] - b _0810B0E6 + b @0810B0E6 .align 2, 0 .pool -_0810B0A8: +@0810B0A8: ldr r0, =0x0000fff0 strh r0, [r5, 0xE] movs r0, 0x80 lsls r0, 1 -_0810B0B0: +@0810B0B0: strh r0, [r5, 0x10] movs r1, 0xA ldrsh r0, [r5, r1] cmp r0, 0x1 - bne _0810B0D0 + bne @0810B0D0 movs r2, 0 ldrsh r0, [r3, r2] lsls r1, r0, 2 @@ -509691,10 +509691,10 @@ _0810B0B0: movs r0, 0x50 subs r0, r1 strh r0, [r5, 0x12] - b _0810B0E6 + b @0810B0E6 .align 2, 0 .pool -_0810B0D0: +@0810B0D0: movs r0, 0 ldrsh r1, [r3, r0] lsls r0, r1, 2 @@ -509706,33 +509706,33 @@ _0810B0D0: ldrh r0, [r5, 0x10] strh r0, [r5, 0xE] strh r1, [r5, 0x10] -_0810B0E6: +@0810B0E6: movs r2, 0xE ldrsh r1, [r5, r2] movs r2, 0x10 ldrsh r0, [r5, r2] cmp r1, r0 - bge _0810B0FC + bge @0810B0FC movs r1, 0 movs r0, 0x1 strh r0, [r5, 0xA] strh r1, [r5, 0x14] - b _0810B138 -_0810B0FC: + b @0810B138 +@0810B0FC: ldr r0, =0x0000ffff strh r0, [r5, 0xA] movs r0, 0x3 strh r0, [r5, 0x14] - b _0810B138 + b @0810B138 .align 2, 0 .pool -_0810B10C: +@0810B10C: ldrh r0, [r5, 0xC] adds r0, 0x1 strh r0, [r5, 0xC] lsls r0, 16 cmp r0, 0 - ble _0810B14E + ble @0810B14E movs r0, 0 strh r0, [r5, 0xC] adds r0, r5, 0 @@ -509740,33 +509740,33 @@ _0810B10C: bl sub_810B154 lsls r0, 24 cmp r0, 0 - bne _0810B138 + bne @0810B138 adds r0, r5, 0 adds r1, r4, 0 bl sub_810B154 lsls r0, 24 cmp r0, 0 - beq _0810B14E -_0810B138: + beq @0810B14E +@0810B138: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] - b _0810B14E -_0810B140: + b @0810B14E +@0810B140: movs r1, 0x16 ldrsh r0, [r5, r1] cmp r0, 0 - bne _0810B14E + bne @0810B14E adds r0, r4, 0 bl move_anim_task_del -_0810B14E: +@0810B14E: pop {r4-r6} pop {r0} bx r0 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 @@ -509781,7 +509781,7 @@ sub_810B154: @ 810B154 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq _0810B18A + beq @0810B18A ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -509793,24 +509793,24 @@ sub_810B154: @ 810B154 ldrh r0, [r4, 0x16] adds r0, 0x1 strh r0, [r4, 0x16] -_0810B18A: +@0810B18A: ldrh r1, [r4, 0xA] ldrh r5, [r4, 0x14] adds r0, r1, r5 strh r0, [r4, 0x14] lsls r0, 16 cmp r0, 0 - bge _0810B19C + bge @0810B19C movs r0, 0x3 strh r0, [r4, 0x14] -_0810B19C: +@0810B19C: movs r2, 0x14 ldrsh r0, [r4, r2] cmp r0, 0x3 - ble _0810B1A8 + ble @0810B1A8 movs r0, 0 strh r0, [r4, 0x14] -_0810B1A8: +@0810B1A8: movs r3, 0xA ldrsh r0, [r4, r3] lsls r0, 4 @@ -509820,39 +509820,39 @@ _0810B1A8: lsls r0, r1, 16 asrs r3, r0, 16 cmp r3, 0x1 - bne _0810B1C8 + bne @0810B1C8 lsls r0, r2, 16 asrs r0, 16 movs r5, 0x10 ldrsh r1, [r4, r5] cmp r0, r1 - bge _0810B1DC -_0810B1C8: + bge @0810B1DC +@0810B1C8: movs r0, 0x1 negs r0, r0 cmp r3, r0 - bne _0810B1E8 + bne @0810B1E8 lsls r0, r2, 16 asrs r0, 16 movs r2, 0x10 ldrsh r1, [r4, r2] cmp r0, r1 - bgt _0810B1E8 -_0810B1DC: + bgt @0810B1E8 +@0810B1DC: movs r0, 0x1 - b _0810B1EA + b @0810B1EA .align 2, 0 .pool -_0810B1E8: +@0810B1E8: movs r0, 0 -_0810B1EA: +@0810B1EA: pop {r4,r5} pop {r1} bx r1 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] @@ -509861,7 +509861,7 @@ sub_810B1F0: @ 810B1F0 lsls r0, 16 asrs r0, 16 cmp r0, 0xC - ble _0810B230 + ble @0810B230 ldr r3, =0x03005e00 movs r0, 0x3C ldrsh r1, [r4, r0] @@ -509883,7 +509883,7 @@ sub_810B1F0: @ 810B1F0 bl rotscale_free_entry adds r0, r4, 0 bl obj_delete_and_free_tiles -_0810B230: +@0810B230: pop {r4} pop {r0} bx r0 @@ -509892,17 +509892,17 @@ _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 ldrsh r0, [r5, r1] cmp r0, 0 - beq _0810B24E + beq @0810B24E cmp r0, 0x1 - beq _0810B280 - b _0810B294 -_0810B24E: + beq @0810B280 + b @0810B294 +@0810B24E: ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 @@ -509922,27 +509922,27 @@ _0810B24E: ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] - b _0810B294 + b @0810B294 .align 2, 0 .pool -_0810B280: +@0810B280: adds r0, r5, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0810B294 + beq @0810B294 adds r0, r5, 0 bl move_anim_8074EE0 -_0810B294: +@0810B294: pop {r4,r5} pop {r0} bx r0 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 @@ -509954,24 +509954,24 @@ sub_810B29C: @ 810B29C movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0x4 - bls _0810B2B6 - b _0810B428 -_0810B2B6: + bls @0810B2B6 + b @0810B428 +@0810B2B6: lsls r0, 2 - ldr r1, =_0810B2C8 + ldr r1, =@0810B2C8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0810B2C8: - .4byte _0810B2DC - .4byte _0810B36C - .4byte _0810B3A8 - .4byte _0810B404 - .4byte _0810B414 -_0810B2DC: +@0810B2C8: + .4byte @0810B2DC + .4byte @0810B36C + .4byte @0810B3A8 + .4byte @0810B404 + .4byte @0810B414 +@0810B2DC: ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 @@ -510030,16 +510030,16 @@ _0810B2DC: strh r0, [r5, 0x26] ldrh r0, [r5, 0x8] adds r0, 0x1 - b _0810B426 + b @0810B426 .align 2, 0 .pool -_0810B36C: +@0810B36C: ldrh r0, [r5, 0xA] adds r0, 0x1 strh r0, [r5, 0xA] lsls r0, 16 cmp r0, 0 - ble _0810B39C + ble @0810B39C movs r0, 0 strh r0, [r5, 0xA] adds r0, r5, 0 @@ -510047,34 +510047,34 @@ _0810B36C: bl sub_810B430 lsls r0, 24 cmp r0, 0 - beq _0810B39C + beq @0810B39C movs r1, 0xC ldrsh r0, [r5, r1] cmp r0, 0x5 - bne _0810B396 + bne @0810B396 movs r0, 0x3 - b _0810B39A -_0810B396: + b @0810B39A +@0810B396: ldrh r0, [r5, 0x8] adds r0, 0x1 -_0810B39A: +@0810B39A: strh r0, [r5, 0x8] -_0810B39C: +@0810B39C: ldrh r1, [r5, 0x1E] movs r2, 0x1E ldrsh r0, [r5, r2] cmp r0, 0 - beq _0810B428 - b _0810B41E -_0810B3A8: + beq @0810B428 + b @0810B41E +@0810B3A8: ldrh r1, [r5, 0x1E] movs r2, 0x1E ldrsh r0, [r5, r2] cmp r0, 0 - beq _0810B3B6 + beq @0810B3B6 subs r0, r1, 0x1 strh r0, [r5, 0x1E] -_0810B3B6: +@0810B3B6: ldrh r0, [r5, 0xA] adds r0, 0x1 movs r3, 0 @@ -510082,22 +510082,22 @@ _0810B3B6: lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _0810B428 + ble @0810B428 strh r3, [r5, 0xA] ldrh r1, [r5, 0xC] movs r2, 0x1 adds r0, r2, 0 ands r0, r1 cmp r0, 0 - beq _0810B3E2 + beq @0810B3E2 movs r0, 0x4 strh r0, [r5, 0x16] movs r0, 0x44 strh r0, [r5, 0x18] strh r3, [r5, 0x10] strh r2, [r5, 0x12] - b _0810B3F2 -_0810B3E2: + b @0810B3F2 +@0810B3E2: movs r0, 0x44 strh r0, [r5, 0x16] movs r0, 0x4 @@ -510106,45 +510106,45 @@ _0810B3E2: strh r0, [r5, 0x10] ldr r0, =0x0000ffff strh r0, [r5, 0x12] -_0810B3F2: +@0810B3F2: movs r1, 0x1E ldrsh r0, [r5, r1] cmp r0, 0 - beq _0810B424 + beq @0810B424 movs r0, 0x4 - b _0810B426 + b @0810B426 .align 2, 0 .pool -_0810B404: +@0810B404: movs r1, 0xE ldrsh r0, [r5, r1] cmp r0, 0 - bne _0810B428 + bne @0810B428 adds r0, r2, 0 bl move_anim_task_del - b _0810B428 -_0810B414: + b @0810B428 +@0810B414: ldrh r1, [r5, 0x1E] movs r2, 0x1E ldrsh r0, [r5, r2] cmp r0, 0 - beq _0810B424 -_0810B41E: + beq @0810B424 +@0810B41E: subs r0, r1, 0x1 strh r0, [r5, 0x1E] - b _0810B428 -_0810B424: + b @0810B428 +@0810B424: movs r0, 0x1 -_0810B426: +@0810B426: strh r0, [r5, 0x8] -_0810B428: +@0810B428: pop {r4,r5} pop {r0} bx r0 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 @@ -510159,7 +510159,7 @@ sub_810B430: @ 810B430 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq _0810B49C + beq @0810B49C ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -510183,32 +510183,32 @@ sub_810B430: @ 810B430 strh r0, [r4, 0x10] lsls r0, 16 cmp r0, 0 - bge _0810B484 + bge @0810B484 movs r0, 0x7 strh r0, [r4, 0x10] -_0810B484: +@0810B484: movs r2, 0x10 ldrsh r0, [r4, r2] cmp r0, 0x7 - ble _0810B490 + ble @0810B490 movs r0, 0 strh r0, [r4, 0x10] -_0810B490: +@0810B490: strh r5, [r3, 0x3A] movs r0, 0x3 strh r0, [r3, 0x3C] ldrh r0, [r4, 0xE] adds r0, 0x1 strh r0, [r4, 0xE] -_0810B49C: +@0810B49C: movs r3, 0x10 ldrsh r0, [r4, r3] cmp r0, 0 - bne _0810B4BE + bne @0810B4BE movs r5, 0x12 ldrsh r0, [r4, r5] cmp r0, 0 - ble _0810B4BE + ble @0810B4BE ldrh r1, [r4, 0x26] ldrh r6, [r4, 0x24] adds r1, r6 @@ -510217,28 +510217,28 @@ _0810B49C: asrs r1, 24 movs r0, 0x76 bl audio_play_and_stuff -_0810B4BE: +@0810B4BE: movs r0, 0x12 ldrsh r3, [r4, r0] ldrh r2, [r4, 0x16] cmp r3, 0 - bge _0810B4D4 + bge @0810B4D4 lsls r0, r2, 16 asrs r0, 16 movs r5, 0x18 ldrsh r1, [r4, r5] cmp r0, r1 - ble _0810B4E4 -_0810B4D4: + ble @0810B4E4 +@0810B4D4: cmp r3, 0 - ble _0810B508 + ble @0810B508 lsls r0, r2, 16 asrs r0, 16 movs r6, 0x18 ldrsh r1, [r4, r6] cmp r0, r1 - blt _0810B508 -_0810B4E4: + blt @0810B508 +@0810B4E4: ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] @@ -510247,24 +510247,24 @@ _0810B4E4: adds r0, r1 strh r0, [r4, 0x14] movs r0, 0x1 - b _0810B514 + b @0810B514 .align 2, 0 .pool -_0810B508: +@0810B508: movs r3, 0x12 ldrsh r0, [r4, r3] lsls r0, 3 adds r0, r2, r0 strh r0, [r4, 0x16] movs r0, 0 -_0810B514: +@0810B514: pop {r4-r6} pop {r1} bx r1 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] @@ -510273,7 +510273,7 @@ sub_810B51C: @ 810B51C lsls r0, 16 asrs r0, 16 cmp r0, 0xC - ble _0810B552 + ble @0810B552 ldr r3, =0x03005e00 movs r0, 0x3C ldrsh r1, [r4, r0] @@ -510291,7 +510291,7 @@ sub_810B51C: @ 810B51C strh r0, [r1] adds r0, r4, 0 bl obj_delete_and_free_tiles -_0810B552: +@0810B552: pop {r4} pop {r0} bx r0 @@ -510300,7 +510300,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 @@ -510312,19 +510312,19 @@ sub_810B55C: @ 810B55C movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _0810B5D8 + beq @0810B5D8 cmp r0, 0x1 - bgt _0810B584 + bgt @0810B584 cmp r0, 0 - beq _0810B58A - b _0810B60E + beq @0810B58A + b @0810B60E .align 2, 0 .pool -_0810B584: +@0810B584: cmp r0, 0x2 - beq _0810B600 - b _0810B60E -_0810B58A: + beq @0810B600 + b @0810B60E +@0810B58A: ldr r0, =0x02038437 ldrb r0, [r0] movs r1, 0x1 @@ -510335,18 +510335,18 @@ _0810B58A: strh r0, [r5, 0x26] strh r0, [r5, 0x24] cmp r0, 0x10 - ble _0810B5B4 + ble @0810B5B4 adds r2, r0, 0 -_0810B5A4: +@0810B5A4: adds r1, r2, 0 subs r1, 0x20 adds r2, r1, 0 lsls r0, r1, 16 asrs r0, 16 cmp r0, 0x10 - bgt _0810B5A4 + bgt @0810B5A4 strh r1, [r5, 0x24] -_0810B5B4: +@0810B5B4: ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 @@ -510360,17 +510360,17 @@ _0810B5B4: lsrs r0, 24 subs r0, 0x2 strh r0, [r5, 0x20] - b _0810B5F8 + b @0810B5F8 .align 2, 0 .pool -_0810B5D8: +@0810B5D8: ldrh r0, [r5, 0xA] adds r0, 0x1 strh r0, [r5, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0810B60E + ble @0810B60E movs r0, 0 strh r0, [r5, 0xA] adds r0, r5, 0 @@ -510378,27 +510378,27 @@ _0810B5D8: bl sub_810B614 lsls r0, 24 cmp r0, 0 - beq _0810B60E -_0810B5F8: + beq @0810B60E +@0810B5F8: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] - b _0810B60E -_0810B600: + b @0810B60E +@0810B600: movs r1, 0x1C ldrsh r0, [r5, r1] cmp r0, 0 - bne _0810B60E + bne @0810B60E adds r0, r2, 0 bl move_anim_task_del -_0810B60E: +@0810B60E: pop {r4,r5} pop {r0} bx r0 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 @@ -510415,7 +510415,7 @@ sub_810B614: @ 810B614 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq _0810B658 + beq @0810B658 ldr r3, =0x02020630 lsls r0, r1, 4 adds r0, r1 @@ -510432,31 +510432,31 @@ sub_810B614: @ 810B614 ldrh r0, [r4, 0x1C] adds r0, 0x1 strh r0, [r4, 0x1C] -_0810B658: +@0810B658: ldrh r2, [r4, 0x24] movs r0, 0x24 ldrsh r1, [r4, r0] movs r3, 0x26 ldrsh r0, [r4, r3] cmp r1, r0 - bge _0810B67C + bge @0810B67C adds r0, r2, 0 adds r0, 0x20 strh r0, [r4, 0x24] movs r0, 0 - b _0810B67E + b @0810B67E .align 2, 0 .pool -_0810B67C: +@0810B67C: movs r0, 0x1 -_0810B67E: +@0810B67E: pop {r4,r5} pop {r1} bx r1 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 @@ -510464,7 +510464,7 @@ sub_810B684: @ 810B684 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0810B6B8 + beq @0810B6B8 ldr r3, =0x03005e00 movs r0, 0x3C ldrsh r1, [r4, r0] @@ -510482,7 +510482,7 @@ sub_810B684: @ 810B684 strh r0, [r1] adds r0, r4, 0 bl obj_delete_and_free_tiles -_0810B6B8: +@0810B6B8: pop {r4} pop {r0} bx r0 @@ -510491,7 +510491,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 @@ -510561,16 +510561,16 @@ sub_810B6C4: @ 810B6C4 mov r12, r0 ldr r3, [sp] cmp r4, r12 - bhi _0810B79E + bhi @0810B79E adds r0, r7, 0 adds r0, 0x20 ldrh r1, [r5, 0x30] ldrh r2, [r5, 0x32] cmp r0, 0xE0 - bhi _0810B79E + bhi @0810B79E adds r4, r1, 0 mov r10, r12 -_0810B76A: +@0810B76A: mov r7, r9 lsls r1, r7, 16 asrs r1, 16 @@ -510590,14 +510590,14 @@ _0810B76A: adds r1, r7 lsrs r1, 16 cmp r1, r10 - bhi _0810B79E + bhi @0810B79E mov r1, r8 lsls r0, r1, 16 adds r0, r7 lsrs r0, 16 cmp r0, 0xE0 - bls _0810B76A -_0810B79E: + bls @0810B76A +@0810B79E: ldrh r0, [r5, 0x30] negs r7, r0 strh r7, [r5, 0x30] @@ -510615,15 +510615,15 @@ _0810B79E: ldr r1, =0x0203841e mov r10, r1 cmp r0, r12 - bhi _0810B80A + bhi @0810B80A lsls r1, r6, 16 movs r2, 0x80 lsls r2, 14 adds r0, r1, r2 - b _0810B802 + b @0810B802 .align 2, 0 .pool -_0810B7E0: +@0810B7E0: lsls r1, r3, 16 asrs r1, 16 adds r1, r7 @@ -510638,15 +510638,15 @@ _0810B7E0: adds r1, r0 lsrs r1, 16 cmp r1, r12 - bhi _0810B80A + bhi @0810B80A lsls r1, r6, 16 adds r0, r1, r0 -_0810B802: +@0810B802: lsrs r0, 16 adds r2, r1, 0 cmp r0, 0xE0 - bls _0810B7E0 -_0810B80A: + bls @0810B7E0 +@0810B80A: strh r3, [r5, 0x20] strh r6, [r5, 0x22] mov r1, r10 @@ -510680,13 +510680,13 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - beq _0810B8A0 + beq @0810B8A0 ldrh r1, [r4, 0x30] ldrh r2, [r4, 0x38] adds r1, r2 @@ -510722,18 +510722,18 @@ sub_810B848: @ 810B848 ldrh r0, [r4, 0x2E] subs r0, 0x1 strh r0, [r4, 0x2E] - b _0810B8A6 -_0810B8A0: + b @0810B8A6 +@0810B8A0: adds r0, r4, 0 bl move_anim_8072740 -_0810B8A6: +@0810B8A6: pop {r4} pop {r0} bx r0 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 @@ -510763,7 +510763,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 @@ -510780,22 +510780,22 @@ sub_810B8EC: @ 810B8EC bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810B92C + beq @0810B92C ldr r0, =0x0203841e ldrh r1, [r4, 0x32] ldrh r0, [r0, 0x4] subs r1, r0 strh r1, [r4, 0x32] - b _0810B936 + b @0810B936 .align 2, 0 .pool -_0810B92C: +@0810B92C: ldr r0, =0x0203841e ldrh r0, [r0, 0x4] ldrh r1, [r4, 0x32] adds r0, r1 strh r0, [r4, 0x32] -_0810B936: +@0810B936: ldr r0, =0x02038437 ldrb r0, [r0] movs r1, 0x3 @@ -510821,21 +510821,21 @@ _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 movs r1, 0x4 ldrsh r0, [r5, r1] cmp r0, 0 - bne _0810B990 + bne @0810B990 adds r0, r4, 0 movs r1, 0x1 bl sub_80A6980 - b _0810B9C6 + b @0810B9C6 .align 2, 0 .pool -_0810B990: +@0810B990: ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r4, 0 @@ -510849,11 +510849,11 @@ _0810B990: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810B9B6 + beq @0810B9B6 ldrh r0, [r5] negs r0, r0 strh r0, [r5] -_0810B9B6: +@0810B9B6: ldrh r0, [r5] ldrh r1, [r4, 0x20] adds r0, r1 @@ -510862,7 +510862,7 @@ _0810B9B6: ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] -_0810B9C6: +@0810B9C6: ldr r1, =sub_810B9E8 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 @@ -510876,7 +510876,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 @@ -510900,16 +510900,16 @@ sub_810B9E8: @ 810B9E8 lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - bne _0810BA1E + bne @0810BA1E adds r0, r3, 0 bl move_anim_8074EE0 -_0810BA1E: +@0810BA1E: pop {r0} bx r0 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 @@ -510925,7 +510925,7 @@ sub_810BA24: @ 810BA24 movs r1, 0xA ldrsh r0, [r6, r1] cmp r0, 0 - bne _0810BA74 + bne @0810BA74 ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 @@ -510941,10 +510941,10 @@ sub_810BA24: @ 810BA24 ldrh r6, [r6, 0x6] adds r0, r6 strh r0, [r5, 0x36] - b _0810BA86 + b @0810BA86 .align 2, 0 .pool -_0810BA74: +@0810BA74: ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r5, 0 @@ -510953,41 +510953,41 @@ _0810BA74: adds r3, 0x36 movs r1, 0x1 bl sub_80A8924 -_0810BA86: +@0810BA86: ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810BAAC + beq @0810BAAC ldr r0, =0x0203841e ldrh r1, [r5, 0x32] ldrh r0, [r0, 0x4] subs r1, r0 strh r1, [r5, 0x32] - b _0810BAB6 + b @0810BAB6 .align 2, 0 .pool -_0810BAAC: +@0810BAAC: ldr r0, =0x0203841e ldrh r0, [r0, 0x4] ldrh r2, [r5, 0x32] adds r0, r2 strh r0, [r5, 0x32] -_0810BAB6: +@0810BAB6: adds r7, r5, 0 adds r7, 0x2E adds r2, r7, 0 mov r1, sp movs r4, 0x7 -_0810BAC0: +@0810BAC0: ldrh r0, [r2] strh r0, [r1] adds r2, 0x2 adds r1, 0x2 subs r4, 0x1 cmp r4, 0 - bge _0810BAC0 + bge @0810BAC0 adds r0, r5, 0 bl sub_80A7160 ldrh r0, [r5, 0x30] @@ -510997,7 +510997,7 @@ _0810BAC0: ldrh r0, [r5, 0x32] eors r0, r1 strh r0, [r5, 0x32] -_0810BAE2: +@0810BAE2: movs r0, 0x1 strh r0, [r5, 0x2E] adds r0, r5, 0 @@ -511011,19 +511011,19 @@ _0810BAE2: movs r0, 0x88 lsls r0, 1 cmp r1, r0 - bhi _0810BB16 + bhi @0810BB16 movs r0, 0x22 ldrsh r1, [r5, r0] movs r2, 0x26 ldrsh r0, [r5, r2] adds r1, r0 cmp r1, 0xA0 - bgt _0810BB16 + bgt @0810BB16 movs r0, 0x10 negs r0, r0 cmp r1, r0 - bge _0810BAE2 -_0810BB16: + bge @0810BAE2 +@0810BB16: ldrh r0, [r5, 0x24] ldrh r1, [r5, 0x20] adds r0, r1 @@ -511040,14 +511040,14 @@ _0810BB16: mov r3, sp adds r2, r7, 0 movs r4, 0x7 -_0810BB36: +@0810BB36: ldrh r0, [r3] strh r0, [r2] adds r3, 0x2 adds r2, 0x2 subs r4, 0x1 cmp r4, 0 - bge _0810BB36 + bge @0810BB36 str r6, [r5, 0x1C] adds r0, r5, 0 bl oamt_set_x3A_32 @@ -511060,7 +511060,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] @@ -511082,9 +511082,9 @@ sub_810BB60: @ 810BB60 lsls r0, 24 ldr r1, =0x0000ffec cmp r0, 0 - beq _0810BB90 + beq @0810BB90 movs r1, 0x14 -_0810BB90: +@0810BB90: movs r2, 0x2E ldrsh r0, [r4, r2] lsls r1, 16 @@ -511109,7 +511109,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 @@ -511118,13 +511118,13 @@ sub_810BBC8: @ 810BBC8 lsls r0, 24 ldr r1, =0x0000ffec cmp r0, 0 - beq _0810BBDE + beq @0810BBDE movs r1, 0x14 -_0810BBDE: +@0810BBDE: movs r2, 0x38 ldrsh r0, [r4, r2] cmp r0, 0x1F - bgt _0810BC24 + bgt @0810BC24 movs r2, 0x2E ldrsh r0, [r4, r2] lsls r1, 16 @@ -511148,10 +511148,10 @@ _0810BBDE: ldrh r0, [r4, 0x38] adds r0, 0x1 strh r0, [r4, 0x38] - b _0810BC42 + b @0810BC42 .align 2, 0 .pool -_0810BC24: +@0810BC24: ldrh r0, [r4, 0x24] ldrh r2, [r4, 0x20] adds r0, r2 @@ -511167,7 +511167,7 @@ _0810BC24: strh r1, [r4, 0x34] ldr r0, =sub_810BC4C + 1 str r0, [r4, 0x1C] -_0810BC42: +@0810BC42: pop {r4} pop {r0} bx r0 @@ -511176,7 +511176,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 @@ -511192,7 +511192,7 @@ sub_810BC4C: @ 810BC4C movs r1, 0x88 lsls r1, 1 cmp r0, r1 - bhi _0810BC88 + bhi @0810BC88 movs r1, 0x22 ldrsh r0, [r4, r1] movs r2, 0x26 @@ -511201,22 +511201,22 @@ sub_810BC4C: @ 810BC4C movs r0, 0x80 lsls r0, 1 cmp r1, r0 - bgt _0810BC88 + bgt @0810BC88 movs r0, 0x10 negs r0, r0 cmp r1, r0 - bge _0810BC8E -_0810BC88: + bge @0810BC8E +@0810BC88: adds r0, r4, 0 bl move_anim_8072740 -_0810BC8E: +@0810BC8E: pop {r4} pop {r0} bx r0 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 @@ -511232,7 +511232,7 @@ sub_810BC94: @ 810BC94 movs r2, 0xE ldrsh r0, [r1, r2] cmp r0, 0 - bne _0810BCE0 + bne @0810BCE0 ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 @@ -511246,10 +511246,10 @@ sub_810BC94: @ 810BC94 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] - b _0810BCF2 + b @0810BCF2 .align 2, 0 .pool -_0810BCE0: +@0810BCE0: ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r5, 0 @@ -511258,29 +511258,29 @@ _0810BCE0: adds r3, 0x36 movs r1, 0x1 bl sub_80A8924 -_0810BCF2: +@0810BCF2: ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810BD1C + beq @0810BD1C ldr r0, =0x0203841e ldrh r1, [r5, 0x32] ldrh r2, [r0, 0x4] subs r1, r2 strh r1, [r5, 0x32] adds r1, r0, 0 - b _0810BD26 + b @0810BD26 .align 2, 0 .pool -_0810BD1C: +@0810BD1C: ldr r1, =0x0203841e ldrh r0, [r1, 0x4] ldrh r2, [r5, 0x32] adds r0, r2 strh r0, [r5, 0x32] -_0810BD26: +@0810BD26: ldrh r0, [r1, 0x6] ldrh r1, [r5, 0x36] adds r0, r1 @@ -511292,14 +511292,14 @@ _0810BD26: adds r2, r7, 0 mov r1, sp movs r4, 0x7 -_0810BD3E: +@0810BD3E: ldrh r0, [r2] strh r0, [r1] adds r2, 0x2 adds r1, 0x2 subs r4, 0x1 cmp r4, 0 - bge _0810BD3E + bge @0810BD3E ldrh r0, [r5, 0x30] movs r1, 0x1 eors r0, r1 @@ -511307,7 +511307,7 @@ _0810BD3E: ldrh r0, [r5, 0x32] eors r0, r1 strh r0, [r5, 0x32] -_0810BD5A: +@0810BD5A: movs r0, 0x1 strh r0, [r5, 0x2E] adds r0, r5, 0 @@ -511321,19 +511321,19 @@ _0810BD5A: movs r0, 0x88 lsls r0, 1 cmp r1, r0 - bhi _0810BD8E + bhi @0810BD8E movs r0, 0x22 ldrsh r1, [r5, r0] movs r2, 0x26 ldrsh r0, [r5, r2] adds r1, r0 cmp r1, 0xA0 - bgt _0810BD8E + bgt @0810BD8E movs r0, 0x10 negs r0, r0 cmp r1, r0 - bge _0810BD5A -_0810BD8E: + bge @0810BD5A +@0810BD8E: ldrh r0, [r5, 0x24] ldrh r1, [r5, 0x20] adds r0, r1 @@ -511350,14 +511350,14 @@ _0810BD8E: mov r3, sp adds r2, r7, 0 movs r4, 0x7 -_0810BDAE: +@0810BDAE: ldrh r0, [r3] strh r0, [r2] adds r3, 0x2 adds r2, 0x2 subs r4, 0x1 cmp r4, 0 - bge _0810BDAE + bge @0810BDAE ldrh r0, [r1, 0xA] strh r0, [r5, 0x38] ldrh r0, [r1, 0xC] @@ -511372,17 +511372,17 @@ _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 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - bne _0810BDEC + bne @0810BDEC movs r0, 0x1 strh r0, [r4, 0x2E] -_0810BDEC: +@0810BDEC: movs r2, 0x3C ldrsh r0, [r4, r2] movs r2, 0x38 @@ -511400,7 +511400,7 @@ _0810BDEC: movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0x1 - bne _0810BE42 + bne @0810BE42 movs r2, 0x20 ldrsh r0, [r4, r2] movs r2, 0x24 @@ -511410,47 +511410,47 @@ _0810BDEC: movs r1, 0x88 lsls r1, 1 cmp r0, r1 - bhi _0810BE3C + bhi @0810BE3C movs r0, 0x22 ldrsh r1, [r4, r0] movs r2, 0x26 ldrsh r0, [r4, r2] adds r1, r0 cmp r1, 0xA0 - bgt _0810BE3C + bgt @0810BE3C movs r0, 0x10 negs r0, r0 cmp r1, r0 - bge _0810BE42 -_0810BE3C: + bge @0810BE42 +@0810BE3C: adds r0, r4, 0 bl move_anim_8072740 -_0810BE42: +@0810BE42: pop {r4} pop {r0} bx r0 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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0810BEB4 + bne @0810BEB4 ldr r5, =0x0203841e movs r1, 0x4 ldrsh r0, [r5, r1] cmp r0, 0 - bne _0810BE6C + bne @0810BE6C adds r0, r4, 0 movs r1, 0 bl sub_80A6980 - b _0810BEA2 + b @0810BEA2 .align 2, 0 .pool -_0810BE6C: +@0810BE6C: ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r4, 0 @@ -511464,11 +511464,11 @@ _0810BE6C: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810BE92 + beq @0810BE92 ldrh r0, [r5] negs r0, r0 strh r0, [r5] -_0810BE92: +@0810BE92: ldrh r0, [r5] ldrh r1, [r4, 0x20] adds r0, r1 @@ -511477,49 +511477,49 @@ _0810BE92: ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] -_0810BEA2: +@0810BEA2: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _0810BEC8 + b @0810BEC8 .align 2, 0 .pool -_0810BEB4: +@0810BEB4: adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0810BEC8 + beq @0810BEC8 adds r0, r4, 0 bl move_anim_8072740 -_0810BEC8: +@0810BEC8: pop {r4,r5} pop {r0} bx r0 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 movs r1, 0x8 ldrsh r0, [r6, r1] cmp r0, 0 - bne _0810BF40 + bne @0810BF40 movs r1, 0xA ldrsh r0, [r6, r1] cmp r0, 0 - bne _0810BEF4 + bne @0810BEF4 adds r0, r5, 0 movs r1, 0 bl sub_80A69CC - b _0810BF32 + b @0810BF32 .align 2, 0 .pool -_0810BEF4: +@0810BEF4: ldr r4, =0x02038436 ldrb r0, [r4] adds r2, r5, 0 @@ -511532,39 +511532,39 @@ _0810BEF4: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810BF20 + beq @0810BF20 ldrh r0, [r5, 0x20] ldrh r1, [r6] subs r0, r1 - b _0810BF26 + b @0810BF26 .align 2, 0 .pool -_0810BF20: +@0810BF20: ldrh r0, [r6] ldrh r1, [r5, 0x20] adds r0, r1 -_0810BF26: +@0810BF26: strh r0, [r5, 0x20] ldr r0, =0x0203841e ldrh r0, [r0, 0x2] ldrh r1, [r5, 0x22] adds r0, r1 strh r0, [r5, 0x22] -_0810BF32: +@0810BF32: ldr r0, =0x02038436 - b _0810BF90 + b @0810BF90 .align 2, 0 .pool -_0810BF40: +@0810BF40: movs r1, 0xA ldrsh r0, [r6, r1] cmp r0, 0 - bne _0810BF52 + bne @0810BF52 adds r0, r5, 0 movs r1, 0 bl sub_80A6980 - b _0810BF8E -_0810BF52: + b @0810BF8E +@0810BF52: ldr r4, =0x02038437 ldrb r0, [r4] adds r2, r5, 0 @@ -511577,57 +511577,57 @@ _0810BF52: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810BF7C + beq @0810BF7C ldrh r0, [r5, 0x20] ldrh r1, [r6] subs r0, r1 - b _0810BF82 + b @0810BF82 .align 2, 0 .pool -_0810BF7C: +@0810BF7C: ldrh r0, [r6] ldrh r1, [r5, 0x20] adds r0, r1 -_0810BF82: +@0810BF82: strh r0, [r5, 0x20] ldr r0, =0x0203841e ldrh r0, [r0, 0x2] ldrh r1, [r5, 0x22] adds r0, r1 strh r0, [r5, 0x22] -_0810BF8E: +@0810BF8E: ldr r0, =0x02038437 -_0810BF90: +@0810BF90: ldrb r0, [r0] strh r0, [r5, 0x3C] ldr r0, =0x0203841e movs r1, 0xA ldrsh r0, [r0, r1] cmp r0, 0 - beq _0810BFA8 + beq @0810BFA8 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - bne _0810BFB4 -_0810BFA8: + bne @0810BFB4 +@0810BFA8: movs r0, 0x20 - b _0810BFB6 + b @0810BFB6 .align 2, 0 .pool -_0810BFB4: +@0810BFB4: movs r0, 0x40 -_0810BFB6: +@0810BFB6: strh r0, [r5, 0x3A] ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0810BFCC + bne @0810BFCC ldrh r0, [r5, 0x22] adds r0, 0x8 strh r0, [r5, 0x22] -_0810BFCC: +@0810BFCC: ldr r1, =0x0203841e ldrh r0, [r1, 0x6] strh r0, [r5, 0x2E] @@ -511655,13 +511655,13 @@ _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 lsls r0, 24 cmp r0, 0 - bne _0810C092 + bne @0810C092 movs r1, 0x38 ldrsh r0, [r4, r1] movs r2, 0x3A @@ -511683,7 +511683,7 @@ sub_810C008: @ 810C008 lsls r0, 16 lsrs r0, 16 cmp r0, 0x7F - bhi _0810C064 + bhi @0810C064 ldrh r0, [r4, 0x3C] lsls r0, 24 lsrs r0, 24 @@ -511697,8 +511697,8 @@ sub_810C008: @ 810C008 ands r0, r2 orrs r0, r1 strb r0, [r4, 0x5] - b _0810C086 -_0810C064: + b @0810C086 +@0810C064: ldrh r0, [r4, 0x3C] lsls r0, 24 lsrs r0, 24 @@ -511715,24 +511715,24 @@ _0810C064: ands r1, r2 orrs r1, r0 strb r1, [r4, 0x5] -_0810C086: +@0810C086: ldrh r0, [r4, 0x38] adds r0, 0x3 movs r1, 0xFF ands r0, r1 strh r0, [r4, 0x38] - b _0810C098 -_0810C092: + b @0810C098 +@0810C092: adds r0, r4, 0 bl move_anim_8072740 -_0810C098: +@0810C098: pop {r4} pop {r0} bx r0 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 @@ -511755,12 +511755,12 @@ sub_810C0A0: @ 810C0A0 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0810C0E2 + bne @0810C0E2 movs r0, 0x1 movs r1, 0x3 movs r2, 0x1 bl lcd_bg_operations -_0810C0E2: +@0810C0E2: ldr r0, =0x02022e18 movs r1, 0 strh r1, [r0] @@ -511808,7 +511808,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 @@ -511828,24 +511828,24 @@ sub_810C164: @ 810C164 ldrsh r0, [r0, r2] adds r2, r1, 0 cmp r0, 0x4 - bls _0810C18E - b _0810C2DA -_0810C18E: + bls @0810C18E + b @0810C2DA +@0810C18E: lsls r0, 2 - ldr r1, =_0810C1A8 + ldr r1, =@0810C1A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0810C1A8: - .4byte _0810C1BC - .4byte _0810C214 - .4byte _0810C236 - .4byte _0810C27A - .4byte _0810C29C -_0810C1BC: +@0810C1A8: + .4byte @0810C1BC + .4byte @0810C214 + .4byte @0810C236 + .4byte @0810C27A + .4byte @0810C29C +@0810C1BC: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -511857,9 +511857,9 @@ _0810C1BC: lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - beq _0810C1D6 - b _0810C2DA -_0810C1D6: + beq @0810C1D6 + b @0810C2DA +@0810C1D6: strh r5, [r4, 0x1C] ldrh r0, [r4, 0x1A] adds r0, 0x1 @@ -511881,15 +511881,15 @@ _0810C1D6: movs r1, 0x1E ldrsh r0, [r4, r1] cmp r0, 0x9 - bne _0810C2DA + bne @0810C2DA ldrh r0, [r4, 0x20] adds r0, 0x1 strh r0, [r4, 0x20] strh r5, [r4, 0x1E] - b _0810C2DA + b @0810C2DA .align 2, 0 .pool -_0810C214: +@0810C214: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -511900,14 +511900,14 @@ _0810C214: lsls r0, 16 asrs r0, 16 cmp r0, 0x51 - bne _0810C2DA + bne @0810C2DA movs r0, 0x9 strh r0, [r1, 0x1E] ldrh r0, [r1, 0x20] adds r0, 0x1 strh r0, [r1, 0x20] - b _0810C2DA -_0810C236: + b @0810C2DA +@0810C236: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -511918,7 +511918,7 @@ _0810C236: lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne _0810C2DA + bne @0810C2DA movs r0, 0 strh r0, [r4, 0x1C] ldrh r1, [r4, 0x1E] @@ -511935,13 +511935,13 @@ _0810C236: movs r2, 0x1E ldrsh r1, [r4, r2] cmp r1, 0 - bne _0810C2DA + bne @0810C2DA ldrh r0, [r4, 0x20] adds r0, 0x1 strh r0, [r4, 0x20] strh r1, [r4, 0x1E] - b _0810C2DA -_0810C27A: + b @0810C2DA +@0810C27A: mov r0, sp bl sub_80A6B30 movs r0, 0x1 @@ -511956,16 +511956,16 @@ _0810C27A: ldrh r0, [r1, 0x20] adds r0, 0x1 strh r0, [r1, 0x20] -_0810C29C: +@0810C29C: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0810C2B0 + bne @0810C2B0 movs r0, 0x1 movs r1, 0x3 movs r2, 0 bl lcd_bg_operations -_0810C2B0: +@0810C2B0: ldr r0, =0x02022e18 movs r1, 0 strh r1, [r0] @@ -511983,7 +511983,7 @@ _0810C2B0: bl lcd_bg_operations adds r0, r4, 0 bl move_anim_task_del -_0810C2DA: +@0810C2DA: add sp, 0x10 pop {r4,r5} pop {r0} @@ -511993,7 +511993,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 @@ -512019,7 +512019,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 @@ -512042,12 +512042,12 @@ sub_810C324: @ 810C324 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0810C366 + bne @0810C366 movs r0, 0x1 movs r1, 0x3 movs r2, 0x1 bl lcd_bg_operations -_0810C366: +@0810C366: ldr r0, =0x02022e18 movs r1, 0 strh r1, [r0] @@ -512097,7 +512097,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 @@ -512115,24 +512115,24 @@ sub_810C3F0: @ 810C3F0 movs r2, 0x20 ldrsh r0, [r1, r2] cmp r0, 0x4 - bls _0810C416 - b _0810C54A -_0810C416: + bls @0810C416 + b @0810C54A +@0810C416: lsls r0, 2 - ldr r1, =_0810C42C + ldr r1, =@0810C42C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0810C42C: - .4byte _0810C440 - .4byte _0810C484 - .4byte _0810C4A6 - .4byte _0810C4EA - .4byte _0810C50C -_0810C440: +@0810C42C: + .4byte @0810C440 + .4byte @0810C484 + .4byte @0810C4A6 + .4byte @0810C4EA + .4byte @0810C50C +@0810C440: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -512157,16 +512157,16 @@ _0810C440: movs r1, 0x1E ldrsh r0, [r4, r1] cmp r0, 0x5 - bne _0810C54A + bne @0810C54A ldrh r0, [r4, 0x20] adds r0, 0x1 strh r0, [r4, 0x20] movs r0, 0 strh r0, [r4, 0x1E] - b _0810C54A + b @0810C54A .align 2, 0 .pool -_0810C484: +@0810C484: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -512177,14 +512177,14 @@ _0810C484: lsls r0, 16 asrs r0, 16 cmp r0, 0x51 - bne _0810C54A + bne @0810C54A movs r0, 0x5 strh r0, [r1, 0x1E] ldrh r0, [r1, 0x20] adds r0, 0x1 strh r0, [r1, 0x20] - b _0810C54A -_0810C4A6: + b @0810C54A +@0810C4A6: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -512195,7 +512195,7 @@ _0810C4A6: lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne _0810C54A + bne @0810C54A movs r0, 0 strh r0, [r4, 0x1C] ldrh r1, [r4, 0x1E] @@ -512212,13 +512212,13 @@ _0810C4A6: movs r2, 0x1E ldrsh r1, [r4, r2] cmp r1, 0 - bne _0810C54A + bne @0810C54A ldrh r0, [r4, 0x20] adds r0, 0x1 strh r0, [r4, 0x20] strh r1, [r4, 0x1E] - b _0810C54A -_0810C4EA: + b @0810C54A +@0810C4EA: mov r0, sp bl sub_80A6B30 movs r0, 0x1 @@ -512233,16 +512233,16 @@ _0810C4EA: ldrh r0, [r1, 0x20] adds r0, 0x1 strh r0, [r1, 0x20] -_0810C50C: +@0810C50C: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0810C520 + bne @0810C520 movs r0, 0x1 movs r1, 0x3 movs r2, 0 bl lcd_bg_operations -_0810C520: +@0810C520: ldr r0, =0x02022e18 movs r1, 0 strh r1, [r0] @@ -512260,7 +512260,7 @@ _0810C520: bl lcd_bg_operations adds r0, r4, 0 bl move_anim_task_del -_0810C54A: +@0810C54A: add sp, 0x10 pop {r4,r5} pop {r0} @@ -512270,7 +512270,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} @@ -512291,11 +512291,11 @@ sub_810C560: @ 810C560 lsls r4, 24 lsls r0, 24 cmp r4, r0 - bcs _0810C594 + bcs @0810C594 movs r0, 0x80 lsls r0, 8 strh r0, [r5, 0x3C] -_0810C594: +@0810C594: ldr r3, =0x02024076 ldrb r0, [r7] adds r0, r3 @@ -512304,7 +512304,7 @@ _0810C594: adds r0, r2, 0 ands r0, r1 cmp r0, 0 - bne _0810C5F4 + bne @0810C5F4 ldrh r0, [r6, 0x2] negs r0, r0 strh r0, [r6, 0x2] @@ -512317,7 +512317,7 @@ _0810C594: lsls r1, 8 ands r0, r1 cmp r0, 0 - beq _0810C5F0 + beq @0810C5F0 mov r1, r8 ldrb r0, [r1] adds r0, r3 @@ -512325,7 +512325,7 @@ _0810C594: adds r0, r2, 0 ands r0, r1 cmp r0, 0 - bne _0810C5F0 + bne @0810C5F0 movs r0, 0x1 bl obj_id_for_side_relative_to_move ldr r2, =0x02020630 @@ -512341,10 +512341,10 @@ _0810C594: adds r1, r5, 0 adds r1, 0x43 strb r0, [r1] -_0810C5F0: +@0810C5F0: movs r0, 0x1 strh r0, [r5, 0x3A] -_0810C5F4: +@0810C5F4: ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 @@ -512362,7 +512362,7 @@ _0810C5F4: movs r1, 0xE ldrsh r0, [r6, r1] cmp r0, 0 - beq _0810C65C + beq @0810C65C ldrh r0, [r6, 0x2] ldrh r1, [r5, 0x20] adds r0, r1 @@ -512382,10 +512382,10 @@ _0810C5F4: strh r0, [r5, 0x34] ldrb r0, [r4] movs r1, 0x3 - b _0810C684 + b @0810C684 .align 2, 0 .pool -_0810C65C: +@0810C65C: ldrh r0, [r6, 0x2] ldrh r1, [r5, 0x20] adds r0, r1 @@ -512405,7 +512405,7 @@ _0810C65C: strh r0, [r5, 0x34] ldrb r0, [r4] movs r1, 0x1 -_0810C684: +@0810C684: bl sub_80A5C6C lsls r0, 24 lsrs r0, 24 @@ -512422,14 +512422,14 @@ _0810C684: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _0810C6B8 + beq @0810C6B8 movs r0, 0x1 strh r0, [r5, 0x3A] adds r1, r5, 0 adds r1, 0x43 movs r0, 0x80 strb r0, [r1] -_0810C6B8: +@0810C6B8: adds r0, r5, 0 bl obj_translate_based_on_private_1_2_3_4 ldr r0, =sub_810C6D4 + 1 @@ -512444,7 +512444,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] @@ -512452,19 +512452,19 @@ sub_810C6D4: @ 810C6D4 movs r1, 0xFF ands r1, r0 cmp r1, 0x1 - beq _0810C7BC + beq @0810C7BC cmp r1, 0x1 - bgt _0810C6EE + bgt @0810C6EE cmp r1, 0 - beq _0810C6F6 - b _0810C90C -_0810C6EE: + beq @0810C6F6 + b @0810C90C +@0810C6EE: cmp r1, 0x2 - bne _0810C6F4 - b _0810C8D0 -_0810C6F4: - b _0810C90C -_0810C6F6: + bne @0810C6F4 + b @0810C8D0 +@0810C6F4: + b @0810C90C +@0810C6F6: adds r0, r4, 0 bl sub_80A6F3C ldr r1, =0x08329f40 @@ -512481,24 +512481,24 @@ _0810C6F6: movs r1, 0x3A ldrsh r0, [r4, r1] cmp r0, 0 - beq _0810C724 + beq @0810C724 ldrh r0, [r4, 0x38] subs r0, 0x8 - b _0810C728 + b @0810C728 .align 2, 0 .pool -_0810C724: +@0810C724: ldrh r0, [r4, 0x38] adds r0, 0x8 -_0810C728: +@0810C728: ands r0, r5 strh r0, [r4, 0x38] movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0 - ble _0810C736 - b _0810C90C -_0810C736: + ble @0810C736 + b @0810C90C +@0810C736: movs r5, 0x50 strh r5, [r4, 0x2E] ldr r6, =0x02038437 @@ -512523,7 +512523,7 @@ _0810C736: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0810C78C + bne @0810C78C ldr r1, =0x02024076 ldrb r0, [r6] adds r0, r1 @@ -512531,15 +512531,15 @@ _0810C736: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0810C78C + beq @0810C78C movs r0, 0xCC strh r0, [r4, 0x38] - b _0810C78E + b @0810C78E .align 2, 0 .pool -_0810C78C: +@0810C78C: strh r5, [r4, 0x38] -_0810C78E: +@0810C78E: movs r0, 0 strh r0, [r4, 0x26] ldr r1, =0x08329f40 @@ -512558,10 +512558,10 @@ _0810C78E: strh r0, [r4, 0x38] adds r0, r4, 0 bl obj_translate_based_on_private_1_2_3_4 - b _0810C90C + b @0810C90C .align 2, 0 .pool -_0810C7BC: +@0810C7BC: adds r0, r4, 0 bl sub_80A6F3C ldr r1, =0x08329f40 @@ -512592,7 +512592,7 @@ _0810C7BC: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0810C83A + bne @0810C83A ldrh r1, [r4, 0x38] adds r0, r1, 0 subs r0, 0x40 @@ -512600,19 +512600,19 @@ _0810C7BC: lsrs r0, 16 adds r3, r1, 0 cmp r0, 0x7F - bhi _0810C81C + bhi @0810C81C ldrh r1, [r4, 0x3C] lsls r1, 16 asrs r1, 24 - b _0810C824 + b @0810C824 .align 2, 0 .pool -_0810C81C: +@0810C81C: ldrh r1, [r4, 0x3C] lsls r1, 16 asrs r1, 24 adds r1, 0x1 -_0810C824: +@0810C824: movs r0, 0x3 ands r1, r0 lsls r1, 2 @@ -512623,34 +512623,34 @@ _0810C824: orrs r0, r1 strb r0, [r4, 0x5] adds r0, r3, 0x4 - b _0810C85A -_0810C83A: + b @0810C85A +@0810C83A: ldrh r0, [r4, 0x38] subs r0, 0x40 lsls r0, 16 lsrs r0, 16 cmp r0, 0x7F - bhi _0810C84E + bhi @0810C84E adds r1, r4, 0 adds r1, 0x43 movs r0, 0x80 - b _0810C854 -_0810C84E: + b @0810C854 +@0810C84E: adds r1, r4, 0 adds r1, 0x43 movs r0, 0x8C -_0810C854: +@0810C854: strb r0, [r1] ldrh r0, [r4, 0x38] subs r0, 0x4 -_0810C85A: +@0810C85A: movs r1, 0xFF ands r0, r1 strh r0, [r4, 0x38] movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0 - bgt _0810C90C + bgt @0810C90C movs r5, 0 movs r0, 0xC0 lsls r0, 2 @@ -512670,7 +512670,7 @@ _0810C85A: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0810C8B4 + bne @0810C8B4 ldr r1, =0x02024076 ldr r0, =0x02038437 ldrb r0, [r0] @@ -512679,15 +512679,15 @@ _0810C85A: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0810C8B4 + beq @0810C8B4 movs r0, 0x80 lsls r0, 1 - b _0810C8B6 + b @0810C8B6 .align 2, 0 .pool -_0810C8B4: +@0810C8B4: ldr r0, =0x0000fff0 -_0810C8B6: +@0810C8B6: strh r0, [r4, 0x32] ldrh r0, [r4, 0x3C] adds r0, 0x1 @@ -512697,22 +512697,22 @@ _0810C8B6: strh r1, [r4, 0x24] adds r0, r4, 0 bl sub_80A6FD4 - b _0810C90C + b @0810C90C .align 2, 0 .pool -_0810C8D0: +@0810C8D0: adds r0, r4, 0 bl sub_80A6F3C lsls r0, 24 cmp r0, 0 - beq _0810C90C + beq @0810C90C ldrb r0, [r4, 0x1] lsls r0, 30 lsrs r0, 30 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0810C8FE + beq @0810C8FE ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 @@ -512722,14 +512722,14 @@ _0810C8D0: negs r0, r0 ands r0, r1 strb r0, [r4, 0x1] -_0810C8FE: +@0810C8FE: adds r0, r4, 0 bl obj_delete_and_free_tiles ldr r1, =0x020383fe ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] -_0810C90C: +@0810C90C: pop {r4-r6} pop {r0} bx r0 @@ -512738,7 +512738,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 @@ -512754,7 +512754,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 @@ -512766,93 +512766,93 @@ sub_810C934: @ 810C934 movs r0, 0x8 ldrsh r5, [r4, r0] cmp r5, 0x1 - beq _0810C978 + beq @0810C978 cmp r5, 0x1 - bgt _0810C95C + bgt @0810C95C cmp r5, 0 - beq _0810C962 - b _0810C9DC + beq @0810C962 + b @0810C9DC .align 2, 0 .pool -_0810C95C: +@0810C95C: cmp r5, 0x2 - beq _0810C9CE - b _0810C9DC -_0810C962: + beq @0810C9CE + b @0810C9DC +@0810C962: ldrh r0, [r4, 0x10] adds r0, 0x1 strh r0, [r4, 0x10] lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - ble _0810C9DC + ble @0810C9DC strh r5, [r4, 0x10] strh r5, [r4, 0x12] strh r5, [r4, 0xC] - b _0810C9B4 -_0810C978: + b @0810C9B4 +@0810C978: ldrh r1, [r4, 0x12] movs r3, 0x12 ldrsh r0, [r4, r3] cmp r0, 0 - bne _0810C9C8 + bne @0810C9C8 ldrb r0, [r4, 0xE] ldrb r1, [r4, 0xC] movs r3, 0x1 bl sub_810C9E4 lsls r0, 24 cmp r0, 0 - beq _0810C998 + beq @0810C998 ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] -_0810C998: +@0810C998: ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - bne _0810C9C4 + bne @0810C9C4 ldrh r0, [r4, 0xE] adds r0, 0x1 strh r0, [r4, 0xE] lsls r0, 16 asrs r0, 16 cmp r0, 0xA - bne _0810C9BC -_0810C9B4: + bne @0810C9BC +@0810C9B4: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0810C9DC -_0810C9BC: + b @0810C9DC +@0810C9BC: ldrh r0, [r4, 0x8] subs r0, 0x1 strh r0, [r4, 0x8] - b _0810C9DC -_0810C9C4: + b @0810C9DC +@0810C9C4: strh r5, [r4, 0x12] - b _0810C9DC -_0810C9C8: + b @0810C9DC +@0810C9C8: subs r0, r1, 0x1 strh r0, [r4, 0x12] - b _0810C9DC -_0810C9CE: + b @0810C9DC +@0810C9CE: movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0 - bne _0810C9DC + bne @0810C9DC adds r0, r2, 0 bl move_anim_task_del -_0810C9DC: +@0810C9DC: pop {r4,r5} pop {r0} bx r0 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 @@ -512879,7 +512879,7 @@ sub_810C9E4: @ 810C9E4 asrs r0, 28 mov r8, r0 cmp r0, 0x2 - beq _0810CAD0 + beq @0810CAD0 ldrh r0, [r4, 0x2] lsls r0, 20 lsrs r0, 24 @@ -512890,7 +512890,7 @@ sub_810C9E4: @ 810C9E4 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _0810CAD0 + beq @0810CAD0 movs r0, 0x1 str r0, [sp, 0x4] adds r0, r5, 0 @@ -512905,13 +512905,13 @@ sub_810C9E4: @ 810C9E4 lsrs r6, r0, 24 mov r1, r8 cmp r1, 0 - beq _0810CA60 + beq @0810CA60 cmp r1, 0x1 - beq _0810CA96 - b _0810CAE2 + beq @0810CA96 + b @0810CAE2 .align 2, 0 .pool -_0810CA60: +@0810CA60: adds r0, r5, 0 movs r1, 0x1 bl sub_80A861C @@ -512934,8 +512934,8 @@ _0810CA60: lsls r1, r6, 16 asrs r1, 16 subs r1, r0 - b _0810CACA -_0810CA96: + b @0810CACA +@0810CA96: adds r0, r5, 0 movs r1, 0x1 bl sub_80A861C @@ -512958,11 +512958,11 @@ _0810CA96: lsls r1, r6, 16 asrs r1, 16 adds r1, r0 -_0810CACA: +@0810CACA: lsls r1, 16 lsrs r6, r1, 16 - b _0810CAE2 -_0810CAD0: + b @0810CAE2 +@0810CAD0: ldrh r0, [r4] lsls r0, 22 asrs r0, 6 @@ -512972,7 +512972,7 @@ _0810CAD0: asrs r0, 22 lsls r0, 16 lsrs r6, r0, 16 -_0810CAE2: +@0810CAE2: lsls r0, r6, 16 asrs r0, 16 adds r0, 0x8 @@ -512992,7 +512992,7 @@ _0810CAE2: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 - beq _0810CB44 + beq @0810CB44 lsls r4, r5, 4 adds r4, r5 lsls r4, 2 @@ -513014,12 +513014,12 @@ _0810CAE2: mov r1, r10 strh r1, [r4, 0x3C] movs r0, 0x1 - b _0810CB46 + b @0810CB46 .align 2, 0 .pool -_0810CB44: +@0810CB44: movs r0, 0 -_0810CB46: +@0810CB46: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -513031,7 +513031,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] @@ -513046,22 +513046,22 @@ sub_810CB58: @ 810CB58 movs r3, 0x34 ldrsh r1, [r4, r3] cmp r0, r1 - bge _0810CB82 + bge @0810CB82 lsls r0, r2, 16 asrs r0, 16 movs r2, 0x36 ldrsh r1, [r4, r2] cmp r0, r1 - blt _0810CC32 -_0810CB82: + blt @0810CC32 +@0810CB82: movs r3, 0x2E ldrsh r0, [r4, r3] cmp r0, 0x1 - bne _0810CC04 + bne @0810CC04 movs r1, 0x38 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0810CC04 + bne @0810CC04 ldr r0, =0x08595b68 movs r2, 0x34 ldrsh r1, [r4, r2] @@ -513075,7 +513075,7 @@ _0810CB82: lsrs r0, 24 strh r0, [r4, 0x2E] cmp r0, 0x40 - beq _0810CBE6 + beq @0810CBE6 ldr r2, =0x02020630 movs r0, 0x2E ldrsh r1, [r4, r0] @@ -513103,17 +513103,17 @@ _0810CB82: adds r0, r2 ldrh r1, [r4, 0x3C] strh r1, [r0, 0x3C] -_0810CBE6: +@0810CBE6: ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 bl rotscale_free_entry adds r0, r4, 0 bl obj_delete_and_free_tiles - b _0810CC32 + b @0810CC32 .align 2, 0 .pool -_0810CC04: +@0810CC04: ldr r3, =0x03005e00 movs r2, 0x3C ldrsh r1, [r4, r2] @@ -513135,7 +513135,7 @@ _0810CC04: bl rotscale_free_entry adds r0, r4, 0 bl obj_delete_and_free_tiles -_0810CC32: +@0810CC32: pop {r4} pop {r0} bx r0 @@ -513144,7 +513144,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] @@ -513153,7 +513153,7 @@ sub_810CC3C: @ 810CC3C lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - bne _0810CC7C + bne @0810CC7C ldr r3, =0x03005e00 movs r0, 0x3C ldrsh r1, [r4, r0] @@ -513175,7 +513175,7 @@ sub_810CC3C: @ 810CC3C bl rotscale_free_entry adds r0, r4, 0 bl obj_delete_and_free_tiles -_0810CC7C: +@0810CC7C: pop {r4} pop {r0} bx r0 @@ -513184,7 +513184,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 @@ -513198,9 +513198,9 @@ unc_080B06FC: @ 810CC88 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x4 - bls _0810CCA6 + bls @0810CCA6 movs r1, 0x4 -_0810CCA6: +@0810CCA6: adds r0, r5, 0 bl sub_8008258 adds r0, r5, 0 @@ -513214,11 +513214,11 @@ _0810CCA6: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810CCCE + beq @0810CCCE ldrh r0, [r6, 0x4] negs r0, r0 strh r0, [r6, 0x4] -_0810CCCE: +@0810CCCE: ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 @@ -513250,13 +513250,13 @@ _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 lsls r0, 24 cmp r0, 0 - beq _0810CD3E + beq @0810CD3E adds r0, r4, 0 movs r1, 0x1 bl obj_anim_image_start @@ -513265,7 +513265,7 @@ sub_810CD1C: @ 810CD1C ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 -_0810CD3E: +@0810CD3E: pop {r4} pop {r0} bx r0 @@ -513274,7 +513274,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] @@ -513303,11 +513303,11 @@ sub_810CD4C: @ 810CD4C ands r1, r0 adds r0, r1, 0 cmp r0, 0xFF - ble _0810CD92 + ble @0810CD92 subs r0, r6, r0 lsls r0, 16 lsrs r1, r0, 16 -_0810CD92: +@0810CD92: strh r5, [r4, 0x30] strh r1, [r4, 0x32] ldr r0, =sub_810CDB0 + 1 @@ -513320,7 +513320,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] @@ -513334,15 +513334,15 @@ sub_810CDB0: @ 810CDB0 movs r1, 0x1 ands r1, r0 cmp r1, 0 - beq _0810CDD4 + beq @0810CDD4 lsls r0, r3, 16 asrs r0, 24 negs r0, r0 - b _0810CDD8 -_0810CDD4: + b @0810CDD8 +@0810CDD4: lsls r0, r3, 16 asrs r0, 24 -_0810CDD8: +@0810CDD8: strh r0, [r2, 0x24] ldrh r0, [r2, 0x36] lsls r0, 16 @@ -513354,17 +513354,17 @@ _0810CDD8: lsls r0, 16 asrs r0, 16 cmp r0, 0x15 - bne _0810CDF6 + bne @0810CDF6 adds r0, r2, 0 bl move_anim_8072740 -_0810CDF6: +@0810CDF6: pop {r4} pop {r0} bx r0 thumb_func_end sub_810CDB0 thumb_func_start sub_810CDFC -sub_810CDFC: @ 810CDFC +sub_810CDFC: ; 810CDFC push {lr} lsls r0, 24 lsrs r0, 24 @@ -513389,7 +513389,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 @@ -513416,27 +513416,27 @@ 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 movs r1, 0xE ldrsh r0, [r4, r1] cmp r0, 0x1 - bne _0810CE90 + bne @0810CE90 ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810CE90 + beq @0810CE90 ldrh r0, [r4, 0x2] negs r0, r0 strh r0, [r4, 0x2] ldrh r0, [r4, 0x6] negs r0, r0 strh r0, [r4, 0x6] -_0810CE90: +@0810CE90: ldr r4, =0x0203841e ldrb r1, [r4, 0xC] adds r0, r5, 0 @@ -513453,13 +513453,13 @@ _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 lsls r0, 24 cmp r0, 0 - beq _0810CED0 + beq @0810CED0 ldr r0, =0x0203841e ldrh r1, [r0, 0x2] negs r1, r1 @@ -513467,7 +513467,7 @@ sub_810CEB4: @ 810CEB4 ldrh r1, [r0, 0x6] negs r1, r1 strh r1, [r0, 0x6] -_0810CED0: +@0810CED0: adds r0, r4, 0 bl sub_810CE68 pop {r4} @@ -513478,7 +513478,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 @@ -513487,18 +513487,18 @@ sub_810CEE0: @ 810CEE0 movs r1, 0x6 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0810CF04 + bne @0810CF04 adds r0, r5, 0 movs r1, 0x1 bl sub_80A69CC - b _0810CF0C + b @0810CF0C .align 2, 0 .pool -_0810CF04: +@0810CF04: adds r0, r5, 0 movs r1, 0x1 bl sub_80A6980 -_0810CF0C: +@0810CF0C: ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r5, 0x2E] @@ -513515,7 +513515,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 @@ -513526,28 +513526,28 @@ sub_810CF30: @ 810CF30 ldrsh r1, [r0, r2] mov r9, r0 cmp r1, 0 - bne _0810CF54 + bne @0810CF54 ldr r0, =0x02038436 - b _0810CF56 + b @0810CF56 .align 2, 0 .pool -_0810CF54: +@0810CF54: ldr r0, =0x02038437 -_0810CF56: +@0810CF56: ldrb r0, [r0] mov r8, r0 mov r4, r9 movs r3, 0x4 ldrsh r0, [r4, r3] cmp r0, 0 - bge _0810CF74 + bge @0810CF74 bl GenerateRandomNumber2 lsls r0, 16 lsrs r0, 16 movs r1, 0x5 bl __umodsi3 strh r0, [r4, 0x4] -_0810CF74: +@0810CF74: ldrb r1, [r4, 0x4] adds r0, r5, 0 bl obj_anim_image_start @@ -513578,9 +513578,9 @@ _0810CF74: lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _0810CFBE + bge @0810CFBE adds r0, 0x3 -_0810CFBE: +@0810CFBE: lsls r4, r0, 14 lsrs r4, 16 bl GenerateRandomNumber2 @@ -513605,32 +513605,32 @@ _0810CFBE: adds r1, r7, 0 ands r1, r0 cmp r1, 0 - beq _0810D000 + beq @0810D000 lsls r0, r6, 16 negs r0, r0 lsrs r6, r0, 16 -_0810D000: +@0810D000: bl GenerateRandomNumber2 adds r1, r7, 0 ands r1, r0 cmp r1, 0 - beq _0810D012 + beq @0810D012 lsls r0, r4, 16 negs r0, r0 lsrs r4, r0, 16 -_0810D012: +@0810D012: ldr r0, =0x02024076 add r0, r8 ldrb r1, [r0] adds r0, r7, 0 ands r0, r1 cmp r0, 0 - bne _0810D028 + bne @0810D028 lsls r0, r4, 16 ldr r1, =0xfff00000 adds r0, r1 lsrs r4, r0, 16 -_0810D028: +@0810D028: lsls r0, r6, 16 asrs r0, 16 ldrh r2, [r5, 0x20] @@ -513660,7 +513660,7 @@ _0810D028: lsrs r0, 24 strh r0, [r5, 0x3C] cmp r0, 0x40 - beq _0810D08C + beq @0810D08C movs r0, 0x3C ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -513679,7 +513679,7 @@ _0810D028: adds r0, r4 ldr r1, =nullsub_12 + 1 str r1, [r0] -_0810D08C: +@0810D08C: ldr r0, =sub_810D0B8 + 1 str r0, [r5, 0x1C] pop {r3,r4} @@ -513693,18 +513693,18 @@ _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] movs r2, 0x2E ldrsh r0, [r5, r2] cmp r0, 0 - bne _0810D100 + bne @0810D100 movs r1, 0x3C ldrsh r0, [r5, r1] cmp r0, 0x40 - beq _0810D0F4 + beq @0810D0F4 ldr r4, =0x02020630 adds r1, r0, 0 lsls r0, r1, 4 @@ -513722,23 +513722,23 @@ sub_810D0B8: @ 810D0B8 lsls r0, 2 adds r0, r4 bl obj_delete_and_free_tiles -_0810D0F4: +@0810D0F4: adds r0, r5, 0 bl move_anim_8072740 - b _0810D104 + b @0810D104 .align 2, 0 .pool -_0810D100: +@0810D100: subs r0, r1, 0x1 strh r0, [r5, 0x2E] -_0810D104: +@0810D104: pop {r4,r5} pop {r0} bx r0 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 @@ -513749,14 +513749,14 @@ sub_810D10C: @ 810D10C movs r1, 0x4 ldrsh r0, [r0, r1] cmp r0, 0 - bne _0810D130 + bne @0810D130 ldrh r0, [r4, 0x20] subs r0, 0x14 strh r0, [r4, 0x32] - b _0810D142 + b @0810D142 .align 2, 0 .pool -_0810D130: +@0810D130: ldrh r0, [r4, 0x20] adds r0, 0x14 strh r0, [r4, 0x32] @@ -513766,7 +513766,7 @@ _0810D130: movs r1, 0x1 orrs r0, r1 strb r0, [r2] -_0810D142: +@0810D142: ldrh r0, [r4, 0x22] subs r0, 0x14 strh r0, [r4, 0x36] @@ -513783,7 +513783,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] @@ -513793,7 +513793,7 @@ sub_810D164: @ 810D164 lsls r0, 16 asrs r0, 16 cmp r0, 0xB - bne _0810D1A4 + bne @0810D1A4 ldrh r2, [r5, 0x20] ldrh r4, [r5, 0x24] subs r0, r2, r4 @@ -513815,7 +513815,7 @@ sub_810D164: @ 810D164 ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 -_0810D1A4: +@0810D1A4: pop {r4-r6} pop {r0} bx r0 @@ -513824,7 +513824,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 @@ -513834,19 +513834,19 @@ sub_810D1B4: @ 810D1B4 eors r0, r1 ldrb r1, [r2] cmp r0, r1 - bne _0810D1E0 + bne @0810D1E0 ldrb r0, [r2] bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _0810D1E0 + bhi @0810D1E0 ldr r1, =0x0203841e movs r2, 0 ldrsh r0, [r1, r2] negs r0, r0 strh r0, [r1] -_0810D1E0: +@0810D1E0: adds r0, r6, 0 movs r1, 0x1 bl sub_80A6980 @@ -513855,12 +513855,12 @@ _0810D1E0: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810D1FE + beq @0810D1FE ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] -_0810D1FE: +@0810D1FE: ldr r4, =0x0203841e ldrh r0, [r4, 0x6] movs r5, 0 @@ -513890,13 +513890,13 @@ _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 lsls r0, 24 cmp r0, 0 - bne _0810D26C + bne @0810D26C ldrh r0, [r4, 0x3C] lsls r0, 16 asrs r0, 24 @@ -513910,18 +513910,18 @@ sub_810D240: @ 810D240 ldrh r2, [r4, 0x3C] adds r0, r2 strh r0, [r4, 0x3C] - b _0810D272 -_0810D26C: + b @0810D272 +@0810D26C: adds r0, r4, 0 bl move_anim_8072740 -_0810D272: +@0810D272: pop {r4} pop {r0} bx r0 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 @@ -513945,7 +513945,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 @@ -513971,7 +513971,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 @@ -513989,7 +513989,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] @@ -514000,7 +514000,7 @@ sub_810D308: @ 810D308 movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _0810D34C + bne @0810D34C movs r0, 0x6 strh r0, [r5, 0x2E] ldr r4, =0x02038437 @@ -514021,7 +514021,7 @@ sub_810D308: @ 810D308 ldr r1, =sub_810D360 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 -_0810D34C: +@0810D34C: pop {r4,r5} pop {r0} bx r0 @@ -514030,7 +514030,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] @@ -514045,13 +514045,13 @@ 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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0810D3A8 + bne @0810D3A8 adds r0, r4, 0 movs r1, 0x1 bl sub_80A6980 @@ -514063,10 +514063,10 @@ sub_810D37C: @ 810D37C ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _0810D404 + b @0810D404 .align 2, 0 .pool -_0810D3A8: +@0810D3A8: ldrh r0, [r4, 0x30] ldrh r2, [r4, 0x36] adds r0, r2 @@ -514086,7 +514086,7 @@ _0810D3A8: ands r0, r1 strh r0, [r4, 0x34] cmp r0, 0x64 - ble _0810D3F6 + ble @0810D3F6 movs r0, 0x34 ldrsh r1, [r4, r0] lsrs r0, r1, 31 @@ -514105,35 +514105,35 @@ _0810D3A8: ands r0, r2 orrs r0, r1 strb r0, [r3] -_0810D3F6: +@0810D3F6: movs r1, 0x34 ldrsh r0, [r4, r1] cmp r0, 0x78 - ble _0810D404 + ble @0810D404 adds r0, r4, 0 bl move_anim_8072740 -_0810D404: +@0810D404: pop {r4} pop {r0} bx r0 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 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _0810D428 + bne @0810D428 ldr r4, =0x02038436 - b _0810D42A + b @0810D42A .align 2, 0 .pool -_0810D428: +@0810D428: ldr r4, =0x02038437 -_0810D42A: +@0810D42A: ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -514172,43 +514172,43 @@ _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 ldrsh r2, [r1, r0] cmp r2, 0 - beq _0810D48E + beq @0810D48E cmp r2, 0x1 - beq _0810D4B2 - b _0810D4EC -_0810D48E: + beq @0810D4B2 + b @0810D4EC +@0810D48E: ldrh r0, [r1, 0x30] subs r0, 0x1 strh r0, [r1, 0x30] lsls r0, 16 cmp r0, 0 - bne _0810D4EC + bne @0810D4EC movs r2, 0x32 ldrsh r0, [r1, r2] cmp r0, 0 - bne _0810D4AA + bne @0810D4AA adds r0, r1, 0 bl move_anim_8072740 - b _0810D4EC -_0810D4AA: + b @0810D4EC +@0810D4AA: ldrh r0, [r1, 0x2E] adds r0, 0x1 strh r0, [r1, 0x2E] - b _0810D4EC -_0810D4B2: + b @0810D4EC +@0810D4B2: ldrh r0, [r1, 0x30] adds r0, 0x1 strh r0, [r1, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0810D4DA + ble @0810D4DA movs r0, 0 strh r0, [r1, 0x30] ldrh r0, [r1, 0x34] @@ -514217,23 +514217,23 @@ _0810D4B2: ands r0, r2 lsls r0, 16 cmp r0, 0 - beq _0810D4D6 + beq @0810D4D6 movs r0, 0x2 - b _0810D4D8 -_0810D4D6: + b @0810D4D8 +@0810D4D6: ldr r0, =0x0000fffe -_0810D4D8: +@0810D4D8: strh r0, [r1, 0x24] -_0810D4DA: +@0810D4DA: ldrh r0, [r1, 0x32] subs r0, 0x1 strh r0, [r1, 0x32] lsls r0, 16 cmp r0, 0 - bne _0810D4EC + bne @0810D4EC adds r0, r1, 0 bl move_anim_8072740 -_0810D4EC: +@0810D4EC: pop {r0} bx r0 .align 2, 0 @@ -514241,14 +514241,14 @@ _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 movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 - bne _0810D520 + bne @0810D520 ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 @@ -514257,10 +514257,10 @@ sub_810D4F4: @ 810D4F4 lsrs r0, 24 ldrh r2, [r6, 0x4] adds r0, r2 - b _0810D532 + b @0810D532 .align 2, 0 .pool -_0810D520: +@0810D520: ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0 @@ -514269,7 +514269,7 @@ _0810D520: lsrs r0, 24 ldrh r1, [r6, 0x4] adds r0, r1 -_0810D532: +@0810D532: strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x1 @@ -514300,53 +514300,53 @@ _0810D532: movs r2, 0x2 ldrsh r0, [r3, r2] cmp r0, 0x1 - beq _0810D5A0 + beq @0810D5A0 cmp r0, 0x1 - bgt _0810D58C + bgt @0810D58C cmp r0, 0 - beq _0810D596 - b _0810D5C6 + beq @0810D596 + b @0810D5C6 .align 2, 0 .pool -_0810D58C: +@0810D58C: cmp r0, 0x2 - beq _0810D5B0 + beq @0810D5B0 cmp r0, 0x3 - beq _0810D5C0 - b _0810D5C6 -_0810D596: + beq @0810D5C0 + b @0810D5C6 +@0810D596: ldr r0, =0x0000fffd - b _0810D5C0 + b @0810D5C0 .align 2, 0 .pool -_0810D5A0: +@0810D5A0: movs r0, 0x3 strh r0, [r5, 0x3A] ldr r0, =0x0000fffd strh r0, [r5, 0x3C] - b _0810D5CE + b @0810D5CE .align 2, 0 .pool -_0810D5B0: +@0810D5B0: ldr r0, =0x0000fffd strh r0, [r5, 0x3A] movs r0, 0x3 strh r0, [r5, 0x3C] - b _0810D5CE + b @0810D5CE .align 2, 0 .pool -_0810D5C0: +@0810D5C0: strh r0, [r5, 0x3A] strh r0, [r5, 0x3C] - b _0810D5CE -_0810D5C6: + b @0810D5CE +@0810D5C6: adds r0, r5, 0 bl move_anim_8072740 - b _0810D5D2 -_0810D5CE: + b @0810D5D2 +@0810D5CE: ldr r0, =sub_810D5DC + 1 str r0, [r5, 0x1C] -_0810D5D2: +@0810D5D2: pop {r4-r6} pop {r0} bx r0 @@ -514355,7 +514355,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] @@ -514372,23 +514372,23 @@ sub_810D5DC: @ 810D5DC lsls r0, 16 asrs r0, 16 cmp r0, 0x28 - ble _0810D604 + ble @0810D604 adds r0, r1, 0 bl move_anim_8072740 -_0810D604: +@0810D604: pop {r0} bx r0 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 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _0810D664 + bne @0810D664 ldr r4, =0x0202420b ldrb r0, [r4] movs r1, 0x2 @@ -514415,10 +514415,10 @@ sub_810D608: @ 810D608 orrs r0, r1 strb r0, [r5, 0x5] ldr r0, =0x02038437 - b _0810D680 + b @0810D680 .align 2, 0 .pool -_0810D664: +@0810D664: ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A8328 @@ -514432,7 +514432,7 @@ _0810D664: orrs r0, r1 strb r0, [r5, 0x5] ldr r0, =0x02038436 -_0810D680: +@0810D680: ldrb r0, [r0] strh r0, [r5, 0x3C] movs r0, 0 @@ -514451,7 +514451,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] @@ -514460,7 +514460,7 @@ sub_810D6A8: @ 810D6A8 lsls r0, 16 asrs r0, 16 cmp r0, 0xB4 - bne _0810D704 + bne @0810D704 movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -514493,7 +514493,7 @@ sub_810D6A8: @ 810D6A8 bl oamt_set_x3A_32 ldr r0, =sub_80A6F98 + 1 str r0, [r4, 0x1C] -_0810D704: +@0810D704: pop {r4} pop {r0} bx r0 @@ -514502,7 +514502,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 @@ -514544,7 +514544,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} @@ -514552,7 +514552,7 @@ sub_810D770: @ 810D770 movs r1, 0x2E ldrsh r0, [r7, r1] cmp r0, 0 - beq _0810D7C2 + beq @0810D7C2 movs r2, 0x36 ldrsh r0, [r7, r2] movs r2, 0x38 @@ -514575,16 +514575,16 @@ sub_810D770: @ 810D770 movs r0, 0x8 negs r0, r0 cmp r4, r0 - bge _0810D7BA + bge @0810D7BA adds r0, r7, 0 bl move_anim_8072740 - b _0810D818 -_0810D7BA: + b @0810D818 +@0810D7BA: ldrh r0, [r7, 0x2E] subs r0, 0x1 strh r0, [r7, 0x2E] - b _0810D818 -_0810D7C2: + b @0810D818 +@0810D7C2: ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 @@ -514624,7 +514624,7 @@ _0810D7C2: strh r0, [r7, 0x34] ldr r0, =sub_810D830 + 1 str r0, [r7, 0x1C] -_0810D818: +@0810D818: pop {r3} mov r8, r3 pop {r4-r7} @@ -514635,7 +514635,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] @@ -514657,31 +514657,31 @@ sub_810D830: @ 810D830 movs r1, 0x80 lsls r1, 17 cmp r0, r1 - bhi _0810D86A + bhi @0810D86A adds r1, r3, 0 movs r0, 0x8 negs r0, r0 cmp r1, r0 - blt _0810D86A + blt @0810D86A cmp r1, 0x78 - ble _0810D870 -_0810D86A: + ble @0810D870 +@0810D86A: adds r0, r2, 0 bl move_anim_8072740 -_0810D870: +@0810D870: pop {r0} bx r0 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 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _0810D8B8 + bne @0810D8B8 ldr r4, =0x0202420b ldrb r0, [r4] movs r1, 0x2 @@ -514698,14 +514698,14 @@ sub_810D874: @ 810D874 ldr r0, =0x02038437 ldrb r4, [r0] ldr r0, =0x02038436 - b _0810D8BE + b @0810D8BE .align 2, 0 .pool -_0810D8B8: +@0810D8B8: ldr r0, =0x02038436 ldrb r4, [r0] ldr r0, =0x02038437 -_0810D8BE: +@0810D8BE: ldrb r0, [r0] bl sub_80A8328 movs r1, 0x3 @@ -514720,7 +514720,7 @@ _0810D8BE: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _0810D8F8 + beq @0810D8F8 ldrb r2, [r5, 0x3] lsls r1, r2, 26 lsrs r1, 27 @@ -514728,15 +514728,15 @@ _0810D8BE: orrs r1, r0 lsls r1, 1 subs r0, 0x47 - b _0810D912 + b @0810D912 .align 2, 0 .pool -_0810D8F8: +@0810D8F8: adds r0, r4, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0810D918 + bne @0810D918 ldrb r2, [r5, 0x3] lsls r1, r2, 26 lsrs r1, 27 @@ -514744,11 +514744,11 @@ _0810D8F8: orrs r1, r0 lsls r1, 1 subs r0, 0x57 -_0810D912: +@0810D912: ands r0, r2 orrs r0, r1 strb r0, [r5, 0x3] -_0810D918: +@0810D918: movs r0, 0x10 strh r0, [r5, 0x2E] ldrh r0, [r5, 0x20] @@ -514782,7 +514782,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 @@ -514790,10 +514790,10 @@ sub_810D960: @ 810D960 movs r2, 0x36 ldrsh r0, [r4, r2] cmp r1, r0 - bne _0810D976 + bne @0810D976 adds r0, r4, 0 bl move_anim_8072740 -_0810D976: +@0810D976: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] @@ -514803,7 +514803,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 @@ -514834,22 +514834,22 @@ sub_810D984: @ 810D984 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0810D9CE + bne @0810D9CE adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_0810D9CE: +@0810D9CE: movs r0, 0x1 ands r6, r0 cmp r6, 0 - beq _0810D9E2 + beq @0810D9E2 ldrh r0, [r5, 0x32] negs r0, r0 strh r0, [r5, 0x32] ldrh r0, [r5, 0x30] adds r0, 0x1 strh r0, [r5, 0x30] -_0810D9E2: +@0810D9E2: ldrh r1, [r5, 0x30] lsls r1, 24 lsrs r1, 24 @@ -514869,44 +514869,44 @@ _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 movs r1, 0x4 ldrsh r0, [r0, r1] cmp r0, 0 - bne _0810DA2C + bne @0810DA2C adds r0, r4, 0 movs r1, 0 bl sub_80A69CC - b _0810DA34 + b @0810DA34 .align 2, 0 .pool -_0810DA2C: +@0810DA2C: adds r0, r4, 0 movs r1, 0 bl sub_80A6980 -_0810DA34: +@0810DA34: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _0810DA48 + beq @0810DA48 adds r0, r4, 0 movs r1, 0x2 bl obj_anim_image_start - b _0810DA5E -_0810DA48: + b @0810DA5E +@0810DA48: ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810DA5E + beq @0810DA5E adds r0, r4, 0 movs r1, 0x1 bl obj_anim_image_start -_0810DA5E: +@0810DA5E: ldr r0, =sub_80A67D8 + 1 str r0, [r4, 0x1C] ldr r1, =move_anim_8072740 + 1 @@ -514920,7 +514920,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 @@ -514928,7 +514928,7 @@ sub_810DA7C: @ 810DA7C movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0810DAB6 + beq @0810DAB6 ldrh r0, [r4, 0x30] adds r0, 0x28 movs r1, 0xFF @@ -514945,17 +514945,17 @@ sub_810DA7C: @ 810DA7C lsls r0, 16 asrs r0, 16 cmp r0, 0x28 - ble _0810DAB6 + ble @0810DAB6 adds r0, r4, 0 bl move_anim_8072740 -_0810DAB6: +@0810DAB6: pop {r4} pop {r0} bx r0 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 @@ -514967,20 +514967,20 @@ sub_810DABC: @ 810DABC movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _0810DAF4 + beq @0810DAF4 cmp r0, 0x1 - bgt _0810DB0E + bgt @0810DB0E cmp r0, 0 - bne _0810DB0E + bne @0810DB0E movs r0, 0 bl sub_80A6DAC ldr r0, =0x0203841e ldrh r0, [r0] strh r0, [r4, 0x18] - b _0810DB06 + b @0810DB06 .align 2, 0 .pool -_0810DAF4: +@0810DAF4: ldrh r0, [r4, 0x18] subs r0, 0x1 strh r0, [r4, 0x18] @@ -514989,20 +514989,20 @@ _0810DAF4: movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _0810DB1A -_0810DB06: + bne @0810DB1A +@0810DB06: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0810DB1A -_0810DB0E: + b @0810DB1A +@0810DB0E: movs r2, 0xA0 lsls r2, 3 adds r0, r2, 0 ldrh r1, [r4, 0x1A] adds r0, r1 strh r0, [r4, 0x1A] -_0810DB1A: +@0810DB1A: movs r2, 0xB0 lsls r2, 4 adds r0, r2, 0 @@ -515014,7 +515014,7 @@ _0810DB1A: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0810DB50 + bne @0810DB50 ldr r1, =0x02022e20 ldrh r0, [r4, 0x1A] lsls r0, 16 @@ -515023,10 +515023,10 @@ _0810DB1A: adds r0, r2 strh r0, [r1] adds r7, r1, 0 - b _0810DB60 + b @0810DB60 .align 2, 0 .pool -_0810DB50: +@0810DB50: ldr r2, =0x02022e20 ldrh r1, [r4, 0x1A] lsls r1, 16 @@ -515035,7 +515035,7 @@ _0810DB50: subs r0, r1 strh r0, [r2] adds r7, r2, 0 -_0810DB60: +@0810DB60: ldr r3, =0x02022e22 ldrh r2, [r4, 0x1C] lsls r0, r2, 16 @@ -515055,14 +515055,14 @@ _0810DB60: movs r0, 0x1 negs r0, r0 cmp r1, r0 - bne _0810DB98 + bne @0810DB98 strh r5, [r7] strh r5, [r3] movs r0, 0x1 bl sub_80A6DAC adds r0, r6, 0 bl move_anim_task_del -_0810DB98: +@0810DB98: pop {r4-r7} pop {r0} bx r0 @@ -515071,18 +515071,18 @@ _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 movs r1, 0x6 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0810DBC2 + bne @0810DBC2 adds r0, r5, 0 movs r1, 0x2 bl obj_anim_image_start -_0810DBC2: +@0810DBC2: adds r0, r5, 0 movs r1, 0x1 bl sub_80A69CC @@ -515115,23 +515115,23 @@ _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 lsls r0, 24 cmp r0, 0 - beq _0810DC24 + beq @0810DC24 adds r0, r4, 0 bl move_anim_8072740 -_0810DC24: +@0810DC24: pop {r4} pop {r0} bx r0 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 @@ -515139,11 +515139,11 @@ sub_810DC2C: @ 810DC2C movs r1, 0x6 ldrsh r0, [r5, r1] cmp r0, 0 - bne _0810DC44 + bne @0810DC44 adds r0, r4, 0 movs r1, 0x2 bl obj_anim_image_start -_0810DC44: +@0810DC44: adds r0, r4, 0 movs r1, 0x1 bl sub_80A69CC @@ -515160,11 +515160,11 @@ _0810DC44: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810DC72 + beq @0810DC72 ldrh r0, [r5, 0x8] negs r0, r0 strh r0, [r5, 0x8] -_0810DC72: +@0810DC72: ldrh r0, [r5, 0x4] strh r0, [r4, 0x2E] mov r1, sp @@ -515191,23 +515191,23 @@ _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 lsls r0, 24 cmp r0, 0 - beq _0810DCC8 + beq @0810DCC8 adds r0, r4, 0 bl move_anim_8072740 -_0810DCC8: +@0810DCC8: pop {r4} pop {r0} bx r0 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 @@ -515247,7 +515247,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 @@ -515262,17 +515262,17 @@ sub_810DD24: @ 810DD24 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - bne _0810DD4A + bne @0810DD4A adds r0, r4, 0 bl move_anim_8072740 -_0810DD4A: +@0810DD4A: pop {r4} pop {r0} bx r0 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 @@ -515288,12 +515288,12 @@ sub_810DD50: @ 810DD50 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810DD7C + beq @0810DD7C ldr r1, =0x0203841e ldrh r0, [r1] negs r0, r0 strh r0, [r1] -_0810DD7C: +@0810DD7C: ldr r0, =0x0203841e ldrh r2, [r0] ldrh r1, [r4, 0x20] @@ -515323,21 +515323,21 @@ _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 movs r1, 0x4 ldrsh r0, [r5, r1] cmp r0, 0 - bne _0810DDE0 + bne @0810DDE0 adds r0, r4, 0 movs r1, 0x1 bl sub_80A6980 - b _0810DE16 + b @0810DE16 .align 2, 0 .pool -_0810DDE0: +@0810DDE0: ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r4, 0 @@ -515351,11 +515351,11 @@ _0810DDE0: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810DE06 + beq @0810DE06 ldrh r0, [r5] negs r0, r0 strh r0, [r5] -_0810DE06: +@0810DE06: ldrh r0, [r5] ldrh r1, [r4, 0x20] adds r0, r1 @@ -515364,7 +515364,7 @@ _0810DE06: ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] -_0810DE16: +@0810DE16: ldr r0, =sub_810DE2C + 1 str r0, [r4, 0x1C] pop {r4,r5} @@ -515375,7 +515375,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] @@ -515401,17 +515401,17 @@ sub_810DE2C: @ 810DE2C movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0810DE68 + beq @0810DE68 adds r0, r4, 0 bl move_anim_8072740 -_0810DE68: +@0810DE68: pop {r4} pop {r0} bx r0 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 @@ -515433,7 +515433,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 @@ -515457,17 +515457,17 @@ sub_810DE98: @ 810DE98 lsls r0, 16 asrs r0, 16 cmp r0, 0x47 - bne _0810DED2 + bne @0810DED2 adds r0, r4, 0 bl move_anim_8072740 -_0810DED2: +@0810DED2: pop {r4} pop {r0} bx r0 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 @@ -515496,7 +515496,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 @@ -515514,7 +515514,7 @@ sub_810DF18: @ 810DF18 ldrsh r1, [r3, r4] adds r7, r2, 0 cmp r0, r1 - bne _0810DF76 + bne @0810DF76 movs r0, 0 strh r0, [r3, 0x1C] ldrb r0, [r3, 0xC] @@ -515532,20 +515532,20 @@ sub_810DF18: @ 810DF18 add r0, r12 lsls r0, 1 adds r3, r0, r2 -_0810DF5E: +@0810DF5E: ldrh r0, [r3] strh r0, [r1] subs r3, 0x2 subs r1, 0x2 subs r4, 0x1 cmp r4, 0 - bgt _0810DF5E + bgt @0810DF5E ldr r0, =0x00000101 add r0, r12 lsls r0, 1 adds r0, r2 strh r6, [r0] -_0810DF76: +@0810DF76: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -515555,10 +515555,10 @@ _0810DF76: strh r1, [r0, 0x8] lsls r1, 16 cmp r1, 0 - bne _0810DF90 + bne @0810DF90 adds r0, r5, 0 bl move_anim_task_del -_0810DF90: +@0810DF90: pop {r4-r7} pop {r0} bx r0 @@ -515567,7 +515567,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 @@ -515577,12 +515577,12 @@ sub_810DFA8: @ 810DFA8 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810DFC8 + beq @0810DFC8 ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] -_0810DFC8: +@0810DFC8: ldr r4, =0x0203841e ldrh r0, [r4, 0x8] strh r0, [r6, 0x2E] @@ -515622,23 +515622,23 @@ _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 lsls r0, 24 cmp r0, 0 - beq _0810E03C + beq @0810E03C adds r0, r4, 0 bl move_anim_8072740 -_0810E03C: +@0810E03C: pop {r4} pop {r0} bx r0 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 @@ -515646,7 +515646,7 @@ sub_810E044: @ 810E044 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810E070 + beq @0810E070 ldr r1, =0x0203841e ldrh r0, [r1] negs r0, r0 @@ -515660,11 +515660,11 @@ sub_810E044: @ 810E044 ldrh r0, [r1, 0x6] negs r0, r0 strh r0, [r1, 0x6] -_0810E070: +@0810E070: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _0810E088 + beq @0810E088 ldr r0, =0x0203841e ldrh r1, [r0, 0x2] negs r1, r1 @@ -515672,7 +515672,7 @@ _0810E070: ldrh r1, [r0, 0x6] negs r1, r1 strh r1, [r0, 0x6] -_0810E088: +@0810E088: ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -515697,7 +515697,7 @@ _0810E088: movs r3, 0xC ldrsh r0, [r2, r3] cmp r0, 0 - bne _0810E0EC + bne @0810E0EC ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 @@ -515711,10 +515711,10 @@ _0810E088: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] - b _0810E0FE + b @0810E0FE .align 2, 0 .pool -_0810E0EC: +@0810E0EC: ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r5, 0 @@ -515723,7 +515723,7 @@ _0810E0EC: adds r3, 0x36 movs r1, 0x1 bl sub_80A8924 -_0810E0FE: +@0810E0FE: ldr r4, =0x0203841e ldrh r0, [r4, 0x4] ldrh r1, [r5, 0x32] @@ -515749,7 +515749,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 @@ -515783,18 +515783,18 @@ 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] movs r3, 0x2E ldrsh r0, [r2, r3] cmp r0, 0 - ble _0810E198 + ble @0810E198 subs r0, r1, 0x1 strh r0, [r2, 0x2E] - b _0810E1AA -_0810E198: + b @0810E1AA +@0810E198: ldrh r0, [r2, 0x30] ldrh r1, [r2, 0x32] adds r0, r1 @@ -515804,7 +515804,7 @@ _0810E198: ldrh r1, [r2, 0x26] subs r1, r0 strh r1, [r2, 0x26] -_0810E1AA: +@0810E1AA: movs r3, 0x22 ldrsh r0, [r2, r3] movs r3, 0x26 @@ -515813,16 +515813,16 @@ _0810E1AA: movs r1, 0x20 negs r1, r1 cmp r0, r1 - bge _0810E1C2 + bge @0810E1C2 adds r0, r2, 0 bl move_anim_8072740 -_0810E1C2: +@0810E1C2: pop {r0} bx r0 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 @@ -515830,7 +515830,7 @@ sub_810E1C8: @ 810E1C8 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810E1F8 + beq @0810E1F8 movs r0, 0x88 lsls r0, 1 strh r0, [r5, 0x20] @@ -515839,14 +515839,14 @@ sub_810E1C8: @ 810E1C8 adds r0, r5, 0 movs r1, 0x1 bl sub_8008258 - b _0810E1FE + b @0810E1FE .align 2, 0 .pool -_0810E1F8: +@0810E1F8: ldr r0, =0x0000ffe0 strh r0, [r5, 0x20] strh r0, [r5, 0x22] -_0810E1FE: +@0810E1FE: ldr r0, =0x0203841e ldrh r0, [r0] strh r0, [r5, 0x2E] @@ -515879,7 +515879,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 @@ -515889,7 +515889,7 @@ sub_810E24C: @ 810E24C ldrh r1, [r4, 0x34] lsrs r0, r1, 8 cmp r0, 0xC8 - bls _0810E274 + bls @0810E274 ldrh r0, [r4, 0x24] ldrh r2, [r4, 0x20] adds r0, r2 @@ -515899,7 +515899,7 @@ sub_810E24C: @ 810E24C movs r0, 0xFF ands r0, r1 strh r0, [r4, 0x34] -_0810E274: +@0810E274: movs r1, 0x20 ldrsh r0, [r4, r1] movs r2, 0x24 @@ -515909,15 +515909,15 @@ _0810E274: movs r1, 0x98 lsls r1, 1 cmp r0, r1 - bhi _0810E296 + bhi @0810E296 movs r1, 0x22 ldrsh r0, [r4, r1] movs r2, 0x26 ldrsh r1, [r4, r2] adds r0, r1 cmp r0, 0xA0 - ble _0810E2BC -_0810E296: + ble @0810E2BC +@0810E296: movs r0, 0 bl obj_id_for_side_relative_to_move ldr r2, =0x02020630 @@ -515935,7 +515935,7 @@ _0810E296: strb r0, [r1] adds r0, r4, 0 bl move_anim_8072740 -_0810E2BC: +@0810E2BC: pop {r4} pop {r0} bx r0 @@ -515944,7 +515944,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] @@ -515952,14 +515952,14 @@ sub_810E2C8: @ 810E2C8 strh r1, [r4, 0x2E] lsls r0, 16 cmp r0, 0 - bgt _0810E308 + bgt @0810E308 ldrb r0, [r4, 0x1] lsls r0, 30 lsrs r0, 30 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0810E2FA + beq @0810E2FA ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 @@ -515969,14 +515969,14 @@ sub_810E2C8: @ 810E2C8 negs r0, r0 ands r0, r1 strb r0, [r4, 0x1] -_0810E2FA: +@0810E2FA: adds r0, r4, 0 bl obj_delete_and_free_tiles ldr r1, =0x020383fe ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] -_0810E308: +@0810E308: pop {r4} pop {r0} bx r0 @@ -515985,7 +515985,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} @@ -515998,25 +515998,25 @@ sub_810E314: @ 810E314 lsls r0, 1 ands r0, r1 cmp r0, 0 - beq _0810E33C + beq @0810E33C ldr r0, =0x02038436 - b _0810E33E + b @0810E33E .align 2, 0 .pool -_0810E33C: +@0810E33C: ldr r0, =0x02038437 -_0810E33E: +@0810E33E: ldrb r6, [r0] adds r0, r6, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0810E354 + bne @0810E354 ldr r1, =0x0203841e ldrh r0, [r1] negs r0, r0 strh r0, [r1] -_0810E354: +@0810E354: adds r0, r6, 0 movs r1, 0 bl sub_80A5C6C @@ -516066,11 +516066,11 @@ _0810E354: lsls r1, 16 lsrs r1, 16 cmp r1, 0x7F - bhi _0810E44A + bhi @0810E44A bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0810E3F0 + bne @0810E3F0 adds r0, r6, 0 bl sub_80A8328 lsls r0, 24 @@ -516085,10 +516085,10 @@ _0810E354: ands r1, r2 orrs r1, r0 strb r1, [r7, 0x5] - b _0810E408 + b @0810E408 .align 2, 0 .pool -_0810E3F0: +@0810E3F0: adds r0, r6, 0 bl sub_80A8328 movs r1, 0x3 @@ -516100,7 +516100,7 @@ _0810E3F0: ands r0, r2 orrs r0, r1 strb r0, [r7, 0x5] -_0810E408: +@0810E408: ldrb r1, [r5, 0xE] movs r4, 0x2 negs r4, r4 @@ -516113,7 +516113,7 @@ _0810E408: lsls r1, 8 ands r0, r1 cmp r0, 0 - bne _0810E4AA + bne @0810E4AA adds r3, r7, 0 adds r3, 0x3F ldrb r2, [r3] @@ -516133,8 +516133,8 @@ _0810E408: ldrb r0, [r3] movs r1, 0x4 orrs r0, r1 - b _0810E4A2 -_0810E44A: + b @0810E4A2 +@0810E44A: adds r0, r6, 0 bl sub_80A8328 movs r1, 0x3 @@ -516156,7 +516156,7 @@ _0810E44A: lsls r1, 8 ands r0, r1 cmp r0, 0 - beq _0810E4AA + beq @0810E4AA adds r3, r7, 0 adds r3, 0x3F ldrb r2, [r3] @@ -516178,12 +516178,12 @@ _0810E44A: ldrb r0, [r3] mov r2, r8 orrs r0, r2 -_0810E4A2: +@0810E4A2: movs r1, 0x11 negs r1, r1 ands r0, r1 strb r0, [r3] -_0810E4AA: +@0810E4AA: ldrh r1, [r5, 0x2] lsrs r1, 6 lsls r1, 4 @@ -516242,7 +516242,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 @@ -516257,60 +516257,60 @@ sub_810E520: @ 810E520 mov r9, r0 ands r0, r2 cmp r0, 0 - beq _0810E55A + beq @0810E55A ldrb r0, [r4, 0x1] adds r1, r0, 0 adds r1, 0xFF strb r1, [r4, 0x1] lsls r0, 24 cmp r0, 0 - beq _0810E54E - b _0810EA36 -_0810E54E: + beq @0810E54E + b @0810EA36 +@0810E54E: movs r0, 0x2 negs r0, r0 ands r0, r2 strb r0, [r4] strb r6, [r4, 0x1] - b _0810EA36 -_0810E55A: + b @0810EA36 +@0810E55A: ldrh r0, [r4, 0x2] lsrs r1, r0, 6 mov r12, r0 cmp r1, 0x1 - bne _0810E566 - b _0810E68A -_0810E566: + bne @0810E566 + b @0810E68A +@0810E566: cmp r1, 0x1 - bgt _0810E570 + bgt @0810E570 cmp r1, 0 - beq _0810E57E - b _0810E97C -_0810E570: + beq @0810E57E + b @0810E97C +@0810E570: cmp r1, 0x2 - bne _0810E576 - b _0810E77E -_0810E576: + bne @0810E576 + b @0810E77E +@0810E576: cmp r1, 0x3 - bne _0810E57C - b _0810E872 -_0810E57C: - b _0810E97C -_0810E57E: + bne @0810E57C + b @0810E872 +@0810E57C: + b @0810E97C +@0810E57E: lsls r1, r2, 24 lsrs r0, r1, 28 cmp r0, 0x1 - bne _0810E592 + bne @0810E592 movs r0, 0x8 orrs r0, r2 orrs r0, r7 strb r0, [r4] strb r6, [r4, 0x1] - b _0810E680 -_0810E592: + b @0810E680 +@0810E592: lsrs r0, r1, 28 cmp r0, 0x3 - bne _0810E5B4 + bne @0810E5B4 lsls r0, r2, 30 lsrs r0, 31 movs r1, 0x1 @@ -516324,12 +516324,12 @@ _0810E592: orrs r1, r7 strb r1, [r4] strb r6, [r4, 0x1] - b _0810E680 -_0810E5B4: + b @0810E680 +@0810E5B4: movs r0, 0x8 ands r0, r2 cmp r0, 0 - beq _0810E680 + beq @0810E680 adds r3, r5, 0 adds r3, 0x3F ldrb r2, [r3] @@ -516360,16 +516360,16 @@ _0810E5B4: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0810E672 + beq @0810E672 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0810E642 + bne @0810E642 ldrb r1, [r4, 0xE] mov r0, r9 ands r0, r1 cmp r0, 0 - bne _0810E628 + bne @0810E628 ldrb r2, [r5, 0x5] lsls r1, r2, 28 lsrs r1, 30 @@ -516382,8 +516382,8 @@ _0810E5B4: ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] - b _0810E660 -_0810E628: + b @0810E660 +@0810E628: ldrb r2, [r5, 0x5] lsls r1, r2, 28 lsrs r1, 30 @@ -516396,26 +516396,26 @@ _0810E628: ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] - b _0810E660 -_0810E642: + b @0810E660 +@0810E642: ldrb r1, [r4, 0xE] mov r0, r9 ands r0, r1 cmp r0, 0 - bne _0810E656 + bne @0810E656 adds r1, r5, 0 adds r1, 0x43 ldrb r0, [r1] subs r0, 0xC - b _0810E65E -_0810E656: + b @0810E65E +@0810E656: adds r1, r5, 0 adds r1, 0x43 ldrb r0, [r1] adds r0, 0xC -_0810E65E: +@0810E65E: strb r0, [r1] -_0810E660: +@0810E660: ldrb r2, [r4, 0xE] lsls r0, r2, 31 lsrs r0, 31 @@ -516425,7 +516425,7 @@ _0810E660: ands r1, r2 orrs r1, r0 strb r1, [r4, 0xE] -_0810E672: +@0810E672: ldrb r1, [r4] movs r0, 0x9 negs r0, r0 @@ -516433,35 +516433,35 @@ _0810E672: strb r0, [r4] ldrh r1, [r4, 0x2] mov r12, r1 -_0810E680: +@0810E680: ldrb r1, [r4] movs r0, 0xF ands r0, r1 strb r0, [r4] - b _0810E97C -_0810E68A: + b @0810E97C +@0810E68A: lsls r1, r2, 24 lsrs r0, r1, 28 cmp r0, 0 - bne _0810E698 + bne @0810E698 movs r0, 0x8 orrs r0, r2 - b _0810E6A0 -_0810E698: + b @0810E6A0 +@0810E698: lsrs r0, r1, 28 cmp r0, 0x2 - bne _0810E6A8 + bne @0810E6A8 adds r0, r2, 0 -_0810E6A0: +@0810E6A0: orrs r0, r7 strb r0, [r4] strb r6, [r4, 0x1] - b _0810E774 -_0810E6A8: + b @0810E774 +@0810E6A8: movs r0, 0x8 ands r0, r2 cmp r0, 0 - beq _0810E774 + beq @0810E774 adds r3, r5, 0 adds r3, 0x3F ldrb r2, [r3] @@ -516492,16 +516492,16 @@ _0810E6A8: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0810E766 + beq @0810E766 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0810E736 + bne @0810E736 ldrb r1, [r4, 0xE] mov r0, r9 ands r0, r1 cmp r0, 0 - bne _0810E71C + bne @0810E71C ldrb r2, [r5, 0x5] lsls r1, r2, 28 lsrs r1, 30 @@ -516514,8 +516514,8 @@ _0810E6A8: ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] - b _0810E754 -_0810E71C: + b @0810E754 +@0810E71C: ldrb r2, [r5, 0x5] lsls r1, r2, 28 lsrs r1, 30 @@ -516528,26 +516528,26 @@ _0810E71C: ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] - b _0810E754 -_0810E736: + b @0810E754 +@0810E736: ldrb r1, [r4, 0xE] mov r0, r9 ands r0, r1 cmp r0, 0 - bne _0810E74A + bne @0810E74A adds r1, r5, 0 adds r1, 0x43 ldrb r0, [r1] subs r0, 0xC - b _0810E752 -_0810E74A: + b @0810E752 +@0810E74A: adds r1, r5, 0 adds r1, 0x43 ldrb r0, [r1] adds r0, 0xC -_0810E752: +@0810E752: strb r0, [r1] -_0810E754: +@0810E754: ldrb r2, [r4, 0xE] lsls r0, r2, 31 lsrs r0, 31 @@ -516557,7 +516557,7 @@ _0810E754: ands r1, r2 orrs r1, r0 strb r1, [r4, 0xE] -_0810E766: +@0810E766: ldrb r1, [r4] movs r0, 0x9 negs r0, r0 @@ -516565,35 +516565,35 @@ _0810E766: strb r0, [r4] ldrh r1, [r4, 0x2] mov r12, r1 -_0810E774: +@0810E774: ldrb r0, [r4] movs r1, 0xF ands r1, r0 movs r0, 0x10 - b _0810E978 -_0810E77E: + b @0810E978 +@0810E77E: lsls r1, r2, 24 lsrs r0, r1, 28 cmp r0, 0x3 - bne _0810E78C + bne @0810E78C movs r0, 0x8 orrs r0, r2 - b _0810E794 -_0810E78C: + b @0810E794 +@0810E78C: lsrs r0, r1, 28 cmp r0, 0x1 - bne _0810E79C + bne @0810E79C adds r0, r2, 0 -_0810E794: +@0810E794: orrs r0, r7 strb r0, [r4] strb r6, [r4, 0x1] - b _0810E868 -_0810E79C: + b @0810E868 +@0810E79C: movs r0, 0x8 ands r0, r2 cmp r0, 0 - beq _0810E868 + beq @0810E868 adds r3, r5, 0 adds r3, 0x3F ldrb r2, [r3] @@ -516624,16 +516624,16 @@ _0810E79C: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0810E85A + beq @0810E85A bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0810E82A + bne @0810E82A ldrb r1, [r4, 0xE] mov r0, r9 ands r0, r1 cmp r0, 0 - bne _0810E810 + bne @0810E810 ldrb r2, [r5, 0x5] lsls r1, r2, 28 lsrs r1, 30 @@ -516646,8 +516646,8 @@ _0810E79C: ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] - b _0810E848 -_0810E810: + b @0810E848 +@0810E810: ldrb r2, [r5, 0x5] lsls r1, r2, 28 lsrs r1, 30 @@ -516660,26 +516660,26 @@ _0810E810: ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] - b _0810E848 -_0810E82A: + b @0810E848 +@0810E82A: ldrb r1, [r4, 0xE] mov r0, r9 ands r0, r1 cmp r0, 0 - bne _0810E83E + bne @0810E83E adds r1, r5, 0 adds r1, 0x43 ldrb r0, [r1] subs r0, 0xC - b _0810E846 -_0810E83E: + b @0810E846 +@0810E83E: adds r1, r5, 0 adds r1, 0x43 ldrb r0, [r1] adds r0, 0xC -_0810E846: +@0810E846: strb r0, [r1] -_0810E848: +@0810E848: ldrb r2, [r4, 0xE] lsls r0, r2, 31 lsrs r0, 31 @@ -516689,7 +516689,7 @@ _0810E848: ands r1, r2 orrs r1, r0 strb r1, [r4, 0xE] -_0810E85A: +@0810E85A: ldrb r1, [r4] movs r0, 0x9 negs r0, r0 @@ -516697,25 +516697,25 @@ _0810E85A: strb r0, [r4] ldrh r1, [r4, 0x2] mov r12, r1 -_0810E868: +@0810E868: ldrb r0, [r4] movs r1, 0xF ands r1, r0 movs r0, 0x20 - b _0810E978 -_0810E872: + b @0810E978 +@0810E872: lsls r1, r2, 24 lsrs r0, r1, 28 cmp r0, 0x2 - bne _0810E882 + bne @0810E882 movs r0, 0x8 orrs r0, r2 strb r0, [r4] - b _0810E970 -_0810E882: + b @0810E970 +@0810E882: lsrs r0, r1, 28 cmp r0, 0 - bne _0810E8A4 + bne @0810E8A4 lsls r0, r2, 30 lsrs r0, 31 movs r1, 0x1 @@ -516729,12 +516729,12 @@ _0810E882: orrs r1, r7 strb r1, [r4] strb r6, [r4, 0x1] - b _0810E970 -_0810E8A4: + b @0810E970 +@0810E8A4: movs r0, 0x8 ands r0, r2 cmp r0, 0 - beq _0810E970 + beq @0810E970 adds r3, r5, 0 adds r3, 0x3F ldrb r2, [r3] @@ -516765,16 +516765,16 @@ _0810E8A4: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0810E962 + beq @0810E962 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0810E932 + bne @0810E932 ldrb r1, [r4, 0xE] mov r0, r9 ands r0, r1 cmp r0, 0 - bne _0810E918 + bne @0810E918 ldrb r2, [r5, 0x5] lsls r1, r2, 28 lsrs r1, 30 @@ -516787,8 +516787,8 @@ _0810E8A4: ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] - b _0810E950 -_0810E918: + b @0810E950 +@0810E918: ldrb r2, [r5, 0x5] lsls r1, r2, 28 lsrs r1, 30 @@ -516801,26 +516801,26 @@ _0810E918: ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] - b _0810E950 -_0810E932: + b @0810E950 +@0810E932: ldrb r1, [r4, 0xE] mov r0, r9 ands r0, r1 cmp r0, 0 - bne _0810E946 + bne @0810E946 adds r1, r5, 0 adds r1, 0x43 ldrb r0, [r1] subs r0, 0xC - b _0810E94E -_0810E946: + b @0810E94E +@0810E946: adds r1, r5, 0 adds r1, 0x43 ldrb r0, [r1] adds r0, 0xC -_0810E94E: +@0810E94E: strb r0, [r1] -_0810E950: +@0810E950: ldrb r2, [r4, 0xE] lsls r0, r2, 31 lsrs r0, 31 @@ -516830,7 +516830,7 @@ _0810E950: ands r1, r2 orrs r1, r0 strb r1, [r4, 0xE] -_0810E962: +@0810E962: ldrb r1, [r4] movs r0, 0x9 negs r0, r0 @@ -516838,15 +516838,15 @@ _0810E962: strb r0, [r4] ldrh r1, [r4, 0x2] mov r12, r1 -_0810E970: +@0810E970: ldrb r0, [r4] movs r1, 0xF ands r1, r0 movs r0, 0x30 -_0810E978: +@0810E978: orrs r1, r0 strb r1, [r4] -_0810E97C: +@0810E97C: ldrb r1, [r4] lsls r1, 30 lsrs r1, 31 @@ -516904,7 +516904,7 @@ _0810E97C: lsls r1, 8 ands r0, r1 cmp r0, 0 - beq _0810EA0C + beq @0810EA0C ldrh r0, [r4, 0x4] subs r1, 0x1 ands r1, r0 @@ -516913,10 +516913,10 @@ _0810E97C: movs r1, 0xFF ands r0, r1 strh r0, [r4, 0x2] - b _0810EA1C + b @0810EA1C .align 2, 0 .pool -_0810EA0C: +@0810EA0C: ldrh r0, [r4, 0x4] ldr r1, =0x00007fff ands r1, r0 @@ -516925,7 +516925,7 @@ _0810EA0C: movs r0, 0xFF ands r1, r0 strh r1, [r4, 0x2] -_0810EA1C: +@0810EA1C: movs r0, 0x22 ldrsh r1, [r5, r0] movs r2, 0x26 @@ -516934,12 +516934,12 @@ _0810EA1C: ldrh r0, [r4, 0xE] lsrs r0, 1 cmp r1, r0 - blt _0810EA36 + blt @0810EA36 movs r0, 0 strh r0, [r5, 0x2E] ldr r0, =sub_810E2C8 + 1 str r0, [r5, 0x1C] -_0810EA36: +@0810EA36: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -516951,7 +516951,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 @@ -516989,52 +516989,52 @@ 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 movs r1, 0x4 ldrsh r0, [r0, r1] cmp r0, 0 - bne _0810EABC + bne @0810EABC adds r0, r5, 0 movs r1, 0 bl sub_80A69CC - b _0810EAC4 + b @0810EAC4 .align 2, 0 .pool -_0810EABC: +@0810EABC: adds r0, r5, 0 movs r1, 0 bl sub_80A6980 -_0810EAC4: +@0810EAC4: ldr r4, =0x0203841e movs r2, 0x4 ldrsh r0, [r4, r2] cmp r0, 0 - bne _0810EADC + bne @0810EADC ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810EAF2 -_0810EADC: + beq @0810EAF2 +@0810EADC: movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0x1 - bne _0810EAF8 + bne @0810EAF8 ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0810EAF8 -_0810EAF2: + bne @0810EAF8 +@0810EAF2: ldrh r0, [r5, 0x20] adds r0, 0x8 strh r0, [r5, 0x20] -_0810EAF8: +@0810EAF8: ldr r4, =0x0203841e ldrb r1, [r4, 0x8] adds r0, r5, 0 @@ -517065,7 +517065,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] @@ -517081,12 +517081,12 @@ sub_810EB40: @ 810EB40 lsls r0, 16 asrs r0, 16 cmp r0, 0x6 - bne _0810EB6A + bne @0810EB6A strh r1, [r4, 0x2E] strh r1, [r4, 0x24] adds r0, r4, 0 bl obj_anim_image_start -_0810EB6A: +@0810EB6A: ldrh r0, [r4, 0x3C] subs r0, 0x1 strh r0, [r4, 0x3C] @@ -517095,17 +517095,17 @@ _0810EB6A: movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _0810EB82 + bne @0810EB82 adds r0, r4, 0 bl move_anim_8072740 -_0810EB82: +@0810EB82: pop {r4} pop {r0} bx r0 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} @@ -517121,7 +517121,7 @@ sub_810EB88: @ 810EB88 movs r1, 0x1F ands r0, r1 cmp r0, 0 - bne _0810EC02 + bne @0810EC02 ldr r1, =0x020383fe ldrb r0, [r1] adds r0, 0x1 @@ -517162,17 +517162,17 @@ sub_810EB88: @ 810EB88 adds r1, r4, 0 movs r3, 0x3 bl obj_add_from_template_call_callback_once -_0810EC02: +@0810EC02: ldrh r0, [r7, 0x8] adds r0, 0x8 strh r0, [r7, 0x8] lsls r0, 16 asrs r0, 16 cmp r0, 0xFF - ble _0810EC16 + ble @0810EC16 adds r0, r6, 0 bl move_anim_task_del -_0810EC16: +@0810EC16: pop {r3} mov r8, r3 pop {r4-r7} @@ -517183,17 +517183,17 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - beq _0810EC46 + beq @0810EC46 cmp r0, 0x1 - beq _0810EC78 - b _0810EC8C -_0810EC46: + beq @0810EC78 + b @0810EC8C +@0810EC46: adds r0, r4, 0 movs r1, 0x1 bl sub_80A69CC @@ -517214,43 +517214,43 @@ _0810EC46: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _0810EC8C + b @0810EC8C .align 2, 0 .pool -_0810EC78: +@0810EC78: adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0810EC8C + beq @0810EC8C adds r0, r4, 0 bl move_anim_8072740 -_0810EC8C: +@0810EC8C: pop {r4} pop {r0} bx r0 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 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _0810ECCC + beq @0810ECCC cmp r0, 0x1 - bgt _0810ECAA + bgt @0810ECAA cmp r0, 0 - beq _0810ECB0 - b _0810ED1E -_0810ECAA: + beq @0810ECB0 + b @0810ED1E +@0810ECAA: cmp r0, 0x2 - beq _0810ECE0 - b _0810ED1E -_0810ECB0: + beq @0810ECE0 + b @0810ED1E +@0810ECB0: ldr r0, =0x02038437 ldrb r0, [r0] movs r1, 0x1 @@ -517261,22 +517261,22 @@ _0810ECB0: negs r0, r0 subs r0, 0x20 strh r0, [r4, 0x26] - b _0810ECD8 + b @0810ECD8 .align 2, 0 .pool -_0810ECCC: +@0810ECCC: ldrh r0, [r4, 0x26] adds r0, 0xA strh r0, [r4, 0x26] lsls r0, 16 cmp r0, 0 - blt _0810ED1E -_0810ECD8: + blt @0810ED1E +@0810ECD8: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _0810ED1E -_0810ECE0: + b @0810ED1E +@0810ECE0: ldrh r0, [r4, 0x26] subs r0, 0xA strh r0, [r4, 0x26] @@ -517288,7 +517288,7 @@ _0810ECE0: movs r1, 0x20 negs r1, r1 cmp r0, r1 - bge _0810ED1E + bge @0810ED1E movs r0, 0 bl obj_id_for_side_relative_to_move ldr r2, =0x02020630 @@ -517306,7 +517306,7 @@ _0810ECE0: strb r0, [r1] adds r0, r4, 0 bl move_anim_8072740 -_0810ED1E: +@0810ED1E: pop {r4} pop {r0} bx r0 @@ -517315,7 +517315,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 @@ -517349,18 +517349,18 @@ 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] movs r3, 0x2E ldrsh r0, [r2, r3] cmp r0, 0 - ble _0810ED84 + ble @0810ED84 subs r0, r1, 0x1 strh r0, [r2, 0x2E] - b _0810EDC8 -_0810ED84: + b @0810EDC8 +@0810ED84: movs r1, 0x22 ldrsh r0, [r2, r1] movs r3, 0x26 @@ -517369,7 +517369,7 @@ _0810ED84: movs r1, 0x20 negs r1, r1 cmp r0, r1 - ble _0810EDAA + ble @0810EDAA ldrh r0, [r2, 0x30] ldrh r1, [r2, 0x32] adds r0, r1 @@ -517379,8 +517379,8 @@ _0810ED84: ldrh r1, [r2, 0x26] subs r1, r0 strh r1, [r2, 0x26] - b _0810EDC8 -_0810EDAA: + b @0810EDC8 +@0810EDAA: adds r3, r2, 0 adds r3, 0x3E ldrb r0, [r3] @@ -517393,10 +517393,10 @@ _0810EDAA: lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - ble _0810EDC8 + ble @0810EDC8 ldr r0, =sub_810EDD0 + 1 str r0, [r2, 0x1C] -_0810EDC8: +@0810EDC8: pop {r0} bx r0 .align 2, 0 @@ -517404,7 +517404,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] @@ -517421,7 +517421,7 @@ sub_810EDD0: @ 810EDD0 movs r1, 0x20 negs r1, r1 cmp r0, r1 - ble _0810EE00 + ble @0810EE00 adds r3, r2, 0 adds r3, 0x3E ldrb r1, [r3] @@ -517429,43 +517429,43 @@ sub_810EDD0: @ 810EDD0 negs r0, r0 ands r0, r1 strb r0, [r3] -_0810EE00: +@0810EE00: movs r1, 0x26 ldrsh r0, [r2, r1] cmp r0, 0 - ble _0810EE0E + ble @0810EE0E adds r0, r2, 0 bl move_anim_8072740 -_0810EE0E: +@0810EE0E: pop {r0} bx r0 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 movs r1, 0x2E ldrsh r0, [r5, r1] cmp r0, 0 - beq _0810EE28 + beq @0810EE28 cmp r0, 0x1 - beq _0810EE80 - b _0810EEEC -_0810EE28: + beq @0810EE80 + b @0810EEEC +@0810EE28: ldr r0, =0x0203841e movs r2, 0 ldrsh r0, [r0, r2] cmp r0, 0 - bne _0810EE40 + bne @0810EE40 ldr r4, =0x02038436 - b _0810EE42 + b @0810EE42 .align 2, 0 .pool -_0810EE40: +@0810EE40: ldr r4, =0x02038437 -_0810EE42: +@0810EE42: ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -517491,21 +517491,21 @@ _0810EE42: ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] - b _0810EEEC + b @0810EEEC .align 2, 0 .pool -_0810EE80: +@0810EE80: movs r1, 0x32 ldrsh r0, [r5, r1] cmp r0, 0xB - bgt _0810EE8E + bgt @0810EE8E ldrh r0, [r5, 0x30] subs r0, 0x28 - b _0810EE92 -_0810EE8E: + b @0810EE92 +@0810EE8E: ldrh r0, [r5, 0x30] adds r0, 0x28 -_0810EE92: +@0810EE92: strh r0, [r5, 0x30] ldrh r0, [r5, 0x32] adds r0, 0x1 @@ -517531,9 +517531,9 @@ _0810EE92: bl __divsi3 adds r1, r0, 0x1 cmp r1, 0x80 - ble _0810EECC + ble @0810EECC movs r1, 0x80 -_0810EECC: +@0810EECC: movs r0, 0x40 subs r0, r1 lsrs r1, r0, 31 @@ -517543,12 +517543,12 @@ _0810EECC: movs r1, 0x32 ldrsh r0, [r5, r1] cmp r0, 0x18 - bne _0810EEEC + bne @0810EEEC adds r0, r5, 0 bl sub_80A749C adds r0, r5, 0 bl move_anim_8072740 -_0810EEEC: +@0810EEEC: add sp, 0x4 pop {r4,r5} pop {r0} @@ -517558,7 +517558,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 @@ -517570,42 +517570,42 @@ sub_810EEF8: @ 810EEF8 movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _0810EF20 + beq @0810EF20 movs r2, 0xB8 lsls r2, 2 adds r0, r4, r2 - b _0810EF28 + b @0810EF28 .align 2, 0 .pool -_0810EF20: +@0810EF20: movs r2, 0xB8 lsls r2, 2 adds r0, r2, 0 subs r0, r4 -_0810EF28: +@0810EF28: strh r0, [r5, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0810EF3C + beq @0810EF3C movs r2, 0xE0 lsls r2, 2 adds r0, r2, 0 adds r0, r1, r0 - b _0810EF44 -_0810EF3C: + b @0810EF44 +@0810EF3C: movs r2, 0xE0 lsls r2, 2 adds r0, r2, 0 subs r0, r1 -_0810EF44: +@0810EF44: strh r0, [r5, 0x30] ldr r2, =0x0203841e ldrh r0, [r2] strh r0, [r5, 0x32] lsls r0, 16 cmp r0, 0 - beq _0810EF60 + beq @0810EF60 ldrb r0, [r5, 0x3] movs r1, 0x3F negs r1, r1 @@ -517613,18 +517613,18 @@ _0810EF44: movs r0, 0x10 orrs r1, r0 strb r1, [r5, 0x3] -_0810EF60: +@0810EF60: movs r1, 0x2 ldrsh r0, [r2, r1] cmp r0, 0 - bne _0810EF74 + bne @0810EF74 ldr r4, =0x02038436 - b _0810EF76 + b @0810EF76 .align 2, 0 .pool -_0810EF74: +@0810EF74: ldr r4, =0x02038437 -_0810EF76: +@0810EF76: ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -517648,26 +517648,26 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0810EFC0 + bne @0810EFC0 ldrh r3, [r4, 0x2E] lsls r0, r3, 16 asrs r0, 24 ldrh r1, [r4, 0x24] adds r0, r1 - b _0810EFCA -_0810EFC0: + b @0810EFCA +@0810EFC0: ldrh r3, [r4, 0x2E] lsls r1, r3, 16 asrs r1, 24 ldrh r0, [r4, 0x24] subs r0, r1 -_0810EFCA: +@0810EFCA: strh r0, [r4, 0x24] ldrh r2, [r4, 0x30] lsls r1, r2, 16 @@ -517681,27 +517681,27 @@ _0810EFCA: strh r0, [r4, 0x30] lsls r0, r3, 16 cmp r0, 0 - bge _0810EFEA + bge @0810EFEA movs r0, 0 strh r0, [r4, 0x2E] -_0810EFEA: +@0810EFEA: ldrh r0, [r4, 0x34] adds r0, 0x1 strh r0, [r4, 0x34] lsls r0, 16 asrs r0, 16 cmp r0, 0x1F - bne _0810EFFE + bne @0810EFFE adds r0, r4, 0 bl move_anim_8072740 -_0810EFFE: +@0810EFFE: pop {r4} pop {r0} bx r0 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 @@ -517714,24 +517714,24 @@ 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 ldrsh r1, [r3, r0] cmp r1, 0 - beq _0810F02A + beq @0810F02A cmp r1, 0x1 - beq _0810F078 - b _0810F07E -_0810F02A: + beq @0810F078 + b @0810F07E +@0810F02A: ldrh r0, [r3, 0x30] adds r0, 0x1 strh r0, [r3, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x8 - ble _0810F07E + ble @0810F07E strh r1, [r3, 0x30] movs r1, 0x3E adds r1, r3 @@ -517754,26 +517754,26 @@ _0810F02A: lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - ble _0810F07E + ble @0810F07E ldrb r1, [r1] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0810F07E + beq @0810F07E ldrh r0, [r3, 0x2E] adds r0, 0x1 strh r0, [r3, 0x2E] - b _0810F07E -_0810F078: + b @0810F07E +@0810F078: adds r0, r3, 0 bl move_anim_8072740 -_0810F07E: +@0810F07E: pop {r0} bx r0 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 @@ -517862,7 +517862,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] @@ -517884,24 +517884,24 @@ sub_810F140: @ 810F140 movs r1, 0xA5 lsls r1, 17 cmp r0, r1 - bhi _0810F17A + bhi @0810F17A adds r1, r3, 0 cmp r1, 0x9D - bgt _0810F17A + bgt @0810F17A movs r0, 0x2D negs r0, r0 cmp r1, r0 - bge _0810F180 -_0810F17A: + bge @0810F180 +@0810F17A: adds r0, r2, 0 bl move_anim_8074EE0 -_0810F180: +@0810F180: pop {r0} bx r0 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 @@ -517909,7 +517909,7 @@ sub_810F184: @ 810F184 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _0810F1BC + bne @0810F1BC movs r0, 0 bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -517923,10 +517923,10 @@ sub_810F184: @ 810F184 ldrb r0, [r1] movs r2, 0x4 orrs r0, r2 - b _0810F1DA + b @0810F1DA .align 2, 0 .pool -_0810F1BC: +@0810F1BC: movs r0, 0 bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -517941,7 +517941,7 @@ _0810F1BC: movs r0, 0x5 negs r0, r0 ands r0, r2 -_0810F1DA: +@0810F1DA: strb r0, [r1] adds r0, r4, 0 bl move_anim_task_del @@ -517953,7 +517953,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} @@ -517967,11 +517967,11 @@ sub_810F1EC: @ 810F1EC bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810F212 + beq @0810F212 mov r0, r8 cmp r0, 0 - beq _0810F22E -_0810F212: + beq @0810F22E +@0810F212: ldrb r1, [r5, 0x5] movs r0, 0xD negs r0, r0 @@ -517985,8 +517985,8 @@ _0810F212: strb r0, [r1] mov r1, r8 cmp r1, 0 - bne _0810F2B8 -_0810F22E: + bne @0810F2B8 +@0810F22E: movs r0, 0x1 bl battle_get_side_with_given_state lsls r0, 24 @@ -518005,12 +518005,12 @@ _0810F22E: bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _0810F264 + beq @0810F264 adds r0, r4, 0 adds r1, r6, 0 movs r2, 0 bl sub_80A438C -_0810F264: +@0810F264: movs r0, 0x2 adds r4, r0, 0 eors r4, r7 @@ -518018,50 +518018,50 @@ _0810F264: bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _0810F284 + beq @0810F284 movs r0, 0x1 eors r6, r0 adds r0, r4, 0 adds r1, r6, 0 movs r2, 0 bl sub_80A438C -_0810F284: +@0810F284: mov r0, r8 cmp r0, 0 - bne _0810F2B8 + bne @0810F2B8 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _0810F2B8 + beq @0810F2B8 ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0810F2B0 + bne @0810F2B0 movs r0, 0x48 strh r0, [r5, 0x20] movs r0, 0x50 - b _0810F2F2 + b @0810F2F2 .align 2, 0 .pool -_0810F2B0: +@0810F2B0: movs r0, 0xB0 strh r0, [r5, 0x20] movs r0, 0x28 - b _0810F2F2 -_0810F2B8: + b @0810F2F2 +@0810F2B8: ldr r6, =0x02038436 ldrb r0, [r6] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810F2CE + beq @0810F2CE ldr r1, =0x0203841e ldrh r0, [r1] negs r0, r0 strh r0, [r1] -_0810F2CE: +@0810F2CE: ldrb r0, [r6] movs r1, 0 bl sub_80A5C6C @@ -518078,7 +518078,7 @@ _0810F2CE: lsrs r0, 24 ldrh r4, [r4, 0x2] adds r0, r4 -_0810F2F2: +@0810F2F2: strh r0, [r5, 0x22] ldr r0, =0x0203841e ldrh r0, [r0, 0x4] @@ -518091,7 +518091,7 @@ _0810F2F2: strh r0, [r5, 0x2E] mov r0, r8 cmp r0, 0 - beq _0810F32C + beq @0810F32C ldrh r0, [r5, 0x22] adds r0, 0x9 strh r0, [r5, 0x22] @@ -518099,13 +518099,13 @@ _0810F2F2: str r1, [r5, 0x1C] adds r0, r5, 0 bl _call_via_r1 - b _0810F330 + b @0810F330 .align 2, 0 .pool -_0810F32C: +@0810F32C: ldr r0, =sub_810F340 + 1 str r0, [r5, 0x1C] -_0810F330: +@0810F330: pop {r3} mov r8, r3 pop {r4-r7} @@ -518116,7 +518116,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 @@ -518126,16 +518126,16 @@ sub_810F340: @ 810F340 movs r1, 0x3C ldrsh r0, [r5, r1] cmp r0, 0 - bne _0810F35C + bne @0810F35C movs r0, 0x1 strh r0, [r5, 0x3C] - b _0810F3B6 -_0810F35C: + b @0810F3B6 +@0810F35C: adds r0, r4, 0 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _0810F382 + beq @0810F382 ldr r2, =0x02020630 ldr r0, =0x020241e4 adds r0, r4, r0 @@ -518149,14 +518149,14 @@ _0810F35C: movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_0810F382: +@0810F382: movs r0, 0x2 eors r4, r0 adds r0, r4, 0 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _0810F3AC + beq @0810F3AC ldr r2, =0x02020630 ldr r0, =0x020241e4 adds r0, r4, r0 @@ -518170,12 +518170,12 @@ _0810F382: movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_0810F3AC: +@0810F3AC: ldr r1, =sub_810F3C8 + 1 str r1, [r5, 0x1C] adds r0, r5, 0 bl _call_via_r1 -_0810F3B6: +@0810F3B6: pop {r4,r5} pop {r0} bx r0 @@ -518184,7 +518184,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] @@ -518200,23 +518200,23 @@ sub_810F3C8: @ 810F3C8 movs r2, 0x34 ldrsh r0, [r4, r2] cmp r0, 0xD - bne _0810F3F4 + bne @0810F3F4 ldr r0, =sub_810F400 + 1 str r0, [r4, 0x1C] - b _0810F3F8 + b @0810F3F8 .align 2, 0 .pool -_0810F3F4: +@0810F3F4: adds r0, r1, 0x1 strh r0, [r4, 0x34] -_0810F3F8: +@0810F3F8: pop {r4} pop {r0} bx r0 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] @@ -518225,7 +518225,7 @@ sub_810F400: @ 810F400 lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - bne _0810F45E + bne @0810F45E movs r0, 0 strh r0, [r3, 0x30] ldrh r4, [r3, 0x2E] @@ -518244,14 +518244,14 @@ sub_810F400: @ 810F400 adds r2, 0x10 lsls r1, 1 adds r1, r6 -_0810F436: +@0810F436: ldrh r0, [r1] strh r0, [r2] subs r1, 0x2 subs r2, 0x2 subs r5, 0x1 cmp r5, 0 - bgt _0810F436 + bgt @0810F436 adds r0, r4, 0x1 lsls r0, 1 adds r0, r6 @@ -518262,10 +518262,10 @@ _0810F436: lsls r0, 16 asrs r0, 16 cmp r0, 0x10 - bne _0810F45E + bne @0810F45E ldr r0, =sub_810F46C + 1 str r0, [r3, 0x1C] -_0810F45E: +@0810F45E: pop {r4-r7} pop {r0} bx r0 @@ -518274,7 +518274,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] @@ -518294,11 +518294,11 @@ sub_810F46C: @ 810F46C movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _0810F512 + bne @0810F512 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0810F502 + bne @0810F502 movs r0, 0x1 bl battle_get_side_with_given_state lsls r0, 24 @@ -518308,7 +518308,7 @@ sub_810F46C: @ 810F46C bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _0810F4D4 + beq @0810F4D4 ldr r2, =0x02020630 ldr r0, =0x020241e4 adds r0, r4, r0 @@ -518323,7 +518323,7 @@ sub_810F46C: @ 810F46C negs r1, r1 ands r1, r2 strb r1, [r0] -_0810F4D4: +@0810F4D4: movs r0, 0x2 adds r4, r0, 0 eors r4, r6 @@ -518331,7 +518331,7 @@ _0810F4D4: bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _0810F502 + beq @0810F502 ldr r2, =0x02020630 ldr r0, =0x020241e4 adds r0, r4, r0 @@ -518346,7 +518346,7 @@ _0810F4D4: negs r1, r1 ands r1, r2 strb r1, [r0] -_0810F502: +@0810F502: adds r2, r5, 0 adds r2, 0x3E ldrb r0, [r2] @@ -518355,7 +518355,7 @@ _0810F502: strb r0, [r2] ldr r0, =sub_810F524 + 1 str r0, [r5, 0x1C] -_0810F512: +@0810F512: pop {r4-r6} pop {r0} bx r0 @@ -518364,13 +518364,13 @@ _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 lsls r0, 24 cmp r0, 0 - bne _0810F57C + bne @0810F57C movs r0, 0x1 bl battle_get_side_with_given_state lsls r0, 24 @@ -518388,22 +518388,22 @@ sub_810F524: @ 810F524 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _0810F562 + beq @0810F562 adds r0, r5, 0 bl sub_80A477C -_0810F562: +@0810F562: movs r0, 0x2 eors r4, r0 adds r0, r4, 0 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _0810F57C + beq @0810F57C movs r0, 0x1 eors r5, r0 adds r0, r5, 0 bl sub_80A477C -_0810F57C: +@0810F57C: ldr r0, =move_anim_8072740 + 1 str r0, [r6, 0x1C] pop {r4-r6} @@ -518414,35 +518414,35 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0810F618 + bne @0810F618 ldr r5, =0x0203841e movs r1, 0x6 ldrsh r0, [r5, r1] movs r6, 0 cmp r0, 0 - bne _0810F5A6 + bne @0810F5A6 movs r6, 0x1 -_0810F5A6: +@0810F5A6: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0810F5EE + bne @0810F5EE bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _0810F5EE + beq @0810F5EE ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0810F5E0 + bne @0810F5E0 ldrh r0, [r5] movs r1, 0x48 subs r1, r0 @@ -518450,56 +518450,56 @@ _0810F5A6: ldrh r0, [r5, 0x2] adds r0, 0x50 strh r0, [r4, 0x22] - b _0810F610 + b @0810F610 .align 2, 0 .pool -_0810F5E0: +@0810F5E0: ldrh r0, [r5] adds r0, 0xB0 strh r0, [r4, 0x20] ldrh r0, [r5, 0x2] adds r0, 0x28 strh r0, [r4, 0x22] - b _0810F610 -_0810F5EE: + b @0810F610 +@0810F5EE: ldr r0, =0x0203841e movs r1, 0x4 ldrsh r0, [r0, r1] cmp r0, 0 - bne _0810F608 + bne @0810F608 adds r0, r4, 0 adds r1, r6, 0 bl sub_80A69CC - b _0810F610 + b @0810F610 .align 2, 0 .pool -_0810F608: +@0810F608: adds r0, r4, 0 adds r1, r6, 0 bl sub_80A6980 -_0810F610: +@0810F610: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _0810F62C -_0810F618: + b @0810F62C +@0810F618: adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x30 ands r0, r1 cmp r0, 0 - beq _0810F62C + beq @0810F62C adds r0, r4, 0 bl move_anim_8074EE0 -_0810F62C: +@0810F62C: pop {r4-r6} pop {r0} bx r0 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 @@ -518519,7 +518519,7 @@ sub_810F634: @ 810F634 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0810F684 + beq @0810F684 adds r0, r5, 0 movs r1, 0x1 bl obj_anim_image_start @@ -518530,10 +518530,10 @@ sub_810F634: @ 810F634 adds r0, 0xA strh r0, [r5, 0x22] ldr r0, =0x0000ffff - b _0810F692 + b @0810F692 .align 2, 0 .pool -_0810F684: +@0810F684: ldrh r0, [r5, 0x20] adds r0, 0x28 strh r0, [r5, 0x20] @@ -518541,7 +518541,7 @@ _0810F684: subs r0, 0xA strh r0, [r5, 0x22] movs r0, 0x1 -_0810F692: +@0810F692: strh r0, [r5, 0x30] ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 @@ -518556,7 +518556,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 @@ -518585,11 +518585,11 @@ sub_810F6B0: @ 810F6B0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0810F6F6 + bne @0810F6F6 lsls r0, r4, 16 negs r0, r0 lsrs r4, r0, 16 -_0810F6F6: +@0810F6F6: ldrb r0, [r6] movs r1, 0x2 bl sub_80A5C6C @@ -518607,10 +518607,10 @@ _0810F6F6: lsls r0, 16 asrs r0, 16 cmp r0, 0xF - bgt _0810F722 + bgt @0810F722 movs r0, 0x10 strh r0, [r5, 0x22] -_0810F722: +@0810F722: ldr r1, =sub_810F740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 @@ -518624,7 +518624,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] @@ -518650,24 +518650,24 @@ 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 ldrsh r0, [r4, r1] cmp r0, 0 - beq _0810F786 + beq @0810F786 cmp r0, 0x1 - beq _0810F7B4 - b _0810F7CC -_0810F786: + beq @0810F7B4 + b @0810F7CC +@0810F786: adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0810F7CC + beq @0810F7CC ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 @@ -518682,8 +518682,8 @@ _0810F786: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _0810F7CC -_0810F7B4: + b @0810F7CC +@0810F7B4: ldrh r0, [r4, 0x30] subs r0, 0x1 strh r0, [r4, 0x30] @@ -518692,17 +518692,17 @@ _0810F7B4: movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _0810F7CC + bne @0810F7CC adds r0, r4, 0 bl move_anim_8072740 -_0810F7CC: +@0810F7CC: pop {r4} pop {r0} bx r0 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 @@ -518730,7 +518730,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 @@ -518742,10 +518742,10 @@ sub_810F810: @ 810F810 bl sub_80A7D34 lsls r0, 24 cmp r0, 0 - bne _0810F830 + bne @0810F830 adds r0, r4, 0 bl move_anim_task_del -_0810F830: +@0810F830: pop {r4} pop {r0} bx r0 @@ -518754,7 +518754,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 @@ -518777,9 +518777,9 @@ sub_810F83C: @ 810F83C lsls r0, 24 movs r1, 0x8 cmp r0, 0 - beq _0810F870 + beq @0810F870 movs r1, 0x4 -_0810F870: +@0810F870: strh r1, [r4, 0xE] ldrb r1, [r4, 0x8] ldr r2, =0x0859677c @@ -518795,7 +518795,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 @@ -518807,13 +518807,13 @@ sub_810F898: @ 810F898 movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0 - beq _0810F8BC + beq @0810F8BC cmp r0, 0x1 - beq _0810F8D8 - b _0810F936 + beq @0810F8D8 + b @0810F936 .align 2, 0 .pool -_0810F8BC: +@0810F8BC: adds r0, r4, 0 bl sub_80A7D34 ldrh r0, [r4, 0xC] @@ -518822,16 +518822,16 @@ _0810F8BC: lsls r0, 16 asrs r0, 16 cmp r0, 0x13 - ble _0810F936 + ble @0810F936 ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] - b _0810F936 -_0810F8D8: + b @0810F936 +@0810F8D8: movs r1, 0xE ldrsh r0, [r4, r1] cmp r0, 0 - beq _0810F900 + beq @0810F900 ldr r2, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] @@ -518845,10 +518845,10 @@ _0810F8D8: ldrh r0, [r4, 0xE] subs r0, 0x1 strh r0, [r4, 0xE] - b _0810F936 + b @0810F936 .align 2, 0 .pool -_0810F900: +@0810F900: ldr r3, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] @@ -518874,7 +518874,7 @@ _0810F900: bl sub_80A7344 adds r0, r5, 0 bl move_anim_task_del -_0810F936: +@0810F936: pop {r4,r5} pop {r0} bx r0 @@ -518883,7 +518883,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 @@ -518929,9 +518929,9 @@ sub_810F940: @ 810F940 lsrs r0, 16 adds r1, r0, 0 cmp r0, r6 - bcs _0810F9AA + bcs @0810F9AA adds r1, r6, 0 -_0810F9AA: +@0810F9AA: strh r1, [r5, 0x20] movs r1, 0xFD lsls r1, 6 @@ -518950,7 +518950,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 @@ -518962,34 +518962,34 @@ sub_810F9D4: @ 810F9D4 movs r0, 0x8 ldrsh r1, [r4, r0] cmp r1, 0x1 - beq _0810FAD4 + beq @0810FAD4 cmp r1, 0x1 - bgt _0810F9FC + bgt @0810F9FC cmp r1, 0 - beq _0810FA0A - b _0810FB5A + beq @0810FA0A + b @0810FB5A .align 2, 0 .pool -_0810F9FC: +@0810F9FC: cmp r1, 0x2 - bne _0810FA02 - b _0810FB36 -_0810FA02: + bne @0810FA02 + b @0810FB36 +@0810FA02: cmp r1, 0x3 - bne _0810FA08 - b _0810FB44 -_0810FA08: - b _0810FB5A -_0810FA0A: + bne @0810FA08 + b @0810FB44 +@0810FA08: + b @0810FB5A +@0810FA0A: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x8 - bgt _0810FA1A - b _0810FB5A -_0810FA1A: + bgt @0810FA1A + b @0810FB5A +@0810FA1A: strh r1, [r4, 0xA] ldr r0, =0x08596794 movs r2, 0x22 @@ -519009,35 +519009,35 @@ _0810FA1A: adds r0, r1 strh r2, [r0] cmp r2, 0x40 - beq _0810FABE + beq @0810FABE movs r1, 0xC ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _0810FA78 + beq @0810FA78 cmp r0, 0x1 - bgt _0810FA5C + bgt @0810FA5C cmp r0, 0 - beq _0810FA66 - b _0810FABE + beq @0810FA66 + b @0810FABE .align 2, 0 .pool -_0810FA5C: +@0810FA5C: cmp r0, 0x2 - beq _0810FA90 + beq @0810FA90 cmp r0, 0x3 - beq _0810FAA8 - b _0810FABE -_0810FA66: + beq @0810FAA8 + b @0810FABE +@0810FA66: ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 lsls r1, 2 adds r1, r0 ldrh r0, [r4, 0x20] - b _0810FAB6 + b @0810FAB6 .align 2, 0 .pool -_0810FA78: +@0810FA78: ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 @@ -519047,10 +519047,10 @@ _0810FA78: negs r0, r0 strh r0, [r1, 0x24] ldrh r0, [r4, 0x20] - b _0810FABC + b @0810FABC .align 2, 0 .pool -_0810FA90: +@0810FA90: ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -519060,10 +519060,10 @@ _0810FA90: strh r1, [r0, 0x24] ldrh r1, [r4, 0x20] strh r1, [r0, 0x26] - b _0810FABE + b @0810FABE .align 2, 0 .pool -_0810FAA8: +@0810FAA8: ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 @@ -519071,37 +519071,37 @@ _0810FAA8: adds r1, r0 ldrh r0, [r4, 0x20] negs r0, r0 -_0810FAB6: +@0810FAB6: strh r0, [r1, 0x24] ldrh r0, [r4, 0x20] negs r0, r0 -_0810FABC: +@0810FABC: strh r0, [r1, 0x26] -_0810FABE: +@0810FABE: ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - bne _0810FB5A - b _0810FB36 + bne @0810FB5A + b @0810FB36 .align 2, 0 .pool -_0810FAD4: +@0810FAD4: ldrh r0, [r4, 0xA] ands r1, r0 cmp r1, 0 - beq _0810FAE4 + beq @0810FAE4 ldrh r0, [r4, 0xE] subs r0, 0x1 strh r0, [r4, 0xE] - b _0810FAEA -_0810FAE4: + b @0810FAEA +@0810FAE4: ldrh r0, [r4, 0x10] adds r0, 0x1 strh r0, [r4, 0x10] -_0810FAEA: +@0810FAEA: ldrh r1, [r4, 0x10] lsls r1, 8 ldrh r0, [r4, 0xE] @@ -519116,17 +519116,17 @@ _0810FAEA: lsls r0, 16 asrs r0, 16 cmp r0, 0x20 - bne _0810FB5A + bne @0810FB5A movs r5, 0x8 adds r6, r4, 0 adds r6, 0x8 -_0810FB10: +@0810FB10: lsls r0, r5, 1 adds r1, r6, r0 movs r2, 0 ldrsh r0, [r1, r2] cmp r0, 0x40 - beq _0810FB2C + beq @0810FB2C adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -519134,20 +519134,20 @@ _0810FB10: ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles -_0810FB2C: +@0810FB2C: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0xC - bls _0810FB10 -_0810FB36: + bls @0810FB10 +@0810FB36: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0810FB5A + b @0810FB5A .align 2, 0 .pool -_0810FB44: +@0810FB44: movs r0, 0x52 movs r1, 0 bl lcd_io_set @@ -519156,14 +519156,14 @@ _0810FB44: bl lcd_io_set adds r0, r5, 0 bl move_anim_task_del -_0810FB5A: +@0810FB5A: pop {r4-r6} pop {r0} bx r0 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 @@ -519172,7 +519172,7 @@ sub_810FB60: @ 810FB60 ldrsh r0, [r4, r2] subs r0, 0xA cmp r1, r0 - ble _0810FB8A + ble @0810FB8A ldrh r0, [r4, 0x30] movs r1, 0x1 ands r1, r0 @@ -519185,16 +519185,16 @@ sub_810FB60: @ 810FB60 ands r0, r2 orrs r0, r1 strb r0, [r3] -_0810FB8A: +@0810FB8A: movs r0, 0x30 ldrsh r1, [r4, r0] movs r2, 0x2E ldrsh r0, [r4, r2] cmp r1, r0 - bne _0810FB9C + bne @0810FB9C adds r0, r4, 0 bl move_anim_8072740 -_0810FB9C: +@0810FB9C: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] @@ -519204,14 +519204,14 @@ _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 movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 - bne _0810FBD4 + bne @0810FBD4 ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 @@ -519225,7 +519225,7 @@ sub_810FBA8: @ 810FBA8 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] -_0810FBD4: +@0810FBD4: ldrh r0, [r6, 0x2] strh r0, [r5, 0x2E] ldr r0, =sub_810FB60 + 1 @@ -519238,7 +519238,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 @@ -519250,12 +519250,12 @@ sub_810FBF0: @ 810FBF0 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _0810FC94 + beq @0810FC94 ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x1 - bne _0810FC60 + bne @0810FC60 ldr r0, =0x0000fff6 strh r0, [r5, 0x1C] ldr r4, =0x02038437 @@ -519279,10 +519279,10 @@ sub_810FBF0: @ 810FBF0 movs r1, 0x2 bl sub_80A861C adds r0, 0x8 - b _0810FD1E + b @0810FD1E .align 2, 0 .pool -_0810FC60: +@0810FC60: movs r0, 0xA strh r0, [r5, 0x1C] ldr r4, =0x02038436 @@ -519301,15 +519301,15 @@ _0810FC60: movs r1, 0x4 bl sub_80A861C adds r0, 0x8 - b _0810FD12 + b @0810FD12 .align 2, 0 .pool -_0810FC94: +@0810FC94: ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x1 - bne _0810FCE8 + bne @0810FCE8 ldr r0, =0x0000fff6 strh r0, [r5, 0x1C] ldr r4, =0x02038437 @@ -519333,10 +519333,10 @@ _0810FC94: movs r1, 0x2 bl sub_80A861C adds r0, 0x8 - b _0810FD1E + b @0810FD1E .align 2, 0 .pool -_0810FCE8: +@0810FCE8: movs r0, 0xA strh r0, [r5, 0x1C] ldr r4, =0x02038436 @@ -519355,13 +519355,13 @@ _0810FCE8: movs r1, 0x5 bl sub_80A861C subs r0, 0x8 -_0810FD12: +@0810FD12: strh r0, [r5, 0x22] ldrb r0, [r4] movs r1, 0x3 bl sub_80A861C subs r0, 0x8 -_0810FD1E: +@0810FD1E: strh r0, [r5, 0x24] movs r0, 0x6 strh r0, [r5, 0xA] @@ -519375,7 +519375,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 @@ -519387,20 +519387,20 @@ sub_810FD3C: @ 810FD3C movs r0, 0x8 ldrsh r1, [r5, r0] cmp r1, 0 - beq _0810FD60 + beq @0810FD60 cmp r1, 0x1 - beq _0810FDD4 - b _0810FDE8 + beq @0810FDD4 + b @0810FDE8 .align 2, 0 .pool -_0810FD60: +@0810FD60: ldrh r0, [r5, 0xA] adds r0, 0x1 strh r0, [r5, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x6 - ble _0810FDE8 + ble @0810FDE8 strh r1, [r5, 0xA] ldr r0, =0x08596864 movs r2, 0x1E @@ -519412,7 +519412,7 @@ _0810FD60: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq _0810FDB4 + beq @0810FDB4 ldr r0, =0x02020630 lsls r4, r1, 4 adds r4, r1 @@ -519433,58 +519433,58 @@ _0810FD60: ands r1, r0 adds r0, r4, 0 bl sub_8008258 -_0810FDB4: +@0810FDB4: ldrh r0, [r5, 0xC] adds r0, 0x1 strh r0, [r5, 0xC] lsls r0, 16 asrs r0, 16 cmp r0, 0xC - bne _0810FDE8 + bne @0810FDE8 ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] - b _0810FDE8 + b @0810FDE8 .align 2, 0 .pool -_0810FDD4: +@0810FDD4: ldrh r0, [r5, 0xA] adds r0, 0x1 strh r0, [r5, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x11 - ble _0810FDE8 + ble @0810FDE8 adds r0, r2, 0 bl move_anim_task_del -_0810FDE8: +@0810FDE8: pop {r4,r5} pop {r0} bx r0 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 lsls r0, 24 cmp r0, 0 - beq _0810FE0E + beq @0810FE0E ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 bl rotscale_free_entry adds r0, r4, 0 bl obj_delete_and_free_tiles -_0810FE0E: +@0810FE0E: pop {r4} pop {r0} bx r0 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 @@ -519506,70 +519506,70 @@ sub_810FE14: @ 810FE14 movs r2, 0 ldrsh r0, [r0, r2] cmp r0, 0x1 - beq _0810FE6A + beq @0810FE6A cmp r0, 0x1 - bgt _0810FE58 + bgt @0810FE58 cmp r0, 0 - beq _0810FE5E - b _0810FE86 + beq @0810FE5E + b @0810FE86 .align 2, 0 .pool -_0810FE58: +@0810FE58: cmp r0, 0x2 - beq _0810FE76 - b _0810FE86 -_0810FE5E: + beq @0810FE76 + b @0810FE86 +@0810FE5E: movs r0, 0x2 strh r0, [r4, 0x1E] movs r0, 0x5 strh r0, [r4, 0x20] movs r0, 0x40 - b _0810FE7E -_0810FE6A: + b @0810FE7E +@0810FE6A: movs r0, 0x2 strh r0, [r4, 0x1E] movs r0, 0x5 strh r0, [r4, 0x20] movs r0, 0xC0 - b _0810FE7E -_0810FE76: + b @0810FE7E +@0810FE76: movs r0, 0x4 strh r0, [r4, 0x1E] strh r0, [r4, 0x20] movs r0, 0 -_0810FE7E: +@0810FE7E: strh r0, [r4, 0x22] adds r0, r1, 0 adds r0, 0x20 strh r0, [r4, 0x26] -_0810FE86: +@0810FE86: movs r1, 0x24 ldrsh r0, [r4, r1] cmp r0, 0 - bge _0810FE92 + bge @0810FE92 movs r0, 0 strh r0, [r4, 0x24] -_0810FE92: +@0810FE92: ldr r0, =0x02038437 ldrb r0, [r0] bl battle_get_per_side_status_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0810FEB8 + bne @0810FEB8 ldr r0, =0x02022e18 ldrh r0, [r0] strh r0, [r4, 0x1C] ldr r0, =0x04000014 - b _0810FEC0 + b @0810FEC0 .align 2, 0 .pool -_0810FEB8: +@0810FEB8: ldr r0, =0x02022e1c ldrh r0, [r0] strh r0, [r4, 0x1C] ldr r0, =0x04000018 -_0810FEC0: +@0810FEC0: str r0, [sp] ldrh r1, [r4, 0x24] lsls r3, r1, 16 @@ -519578,12 +519578,12 @@ _0810FEC0: ldrsh r0, [r4, r2] adds r0, 0x40 cmp r1, r0 - bgt _0810FEFA + bgt @0810FEFA ldr r5, =0x02038c28 movs r0, 0xF0 lsls r0, 3 adds r6, r5, r0 -_0810FEDA: +@0810FEDA: asrs r3, 16 lsls r1, r3, 1 adds r2, r1, r5 @@ -519599,8 +519599,8 @@ _0810FEDA: ldrsh r0, [r4, r2] adds r0, 0x40 cmp r1, r0 - ble _0810FEDA -_0810FEFA: + ble @0810FEDA +@0810FEFA: ldr r0, =0xa2600001 str r0, [sp, 0x4] mov r1, sp @@ -519624,7 +519624,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 @@ -519639,19 +519639,19 @@ sub_810FF34: @ 810FF34 movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _0811000E + beq @0811000E cmp r0, 0x1 - bgt _0810FF60 + bgt @0810FF60 cmp r0, 0 - beq _0810FF66 - b _08110026 + beq @0810FF66 + b @08110026 .align 2, 0 .pool -_0810FF60: +@0810FF60: cmp r0, 0x2 - beq _08110020 - b _08110026 -_0810FF66: + beq @08110020 + b @08110026 +@0810FF66: ldrh r3, [r5, 0x22] ldrh r4, [r5, 0x24] movs r2, 0x24 @@ -519659,7 +519659,7 @@ _0810FF66: movs r2, 0x26 ldrsh r0, [r5, r2] cmp r1, r0 - bgt _0810FFFE + bgt @0810FFFE ldr r0, =0x08329f40 mov r9, r0 movs r7, 0x3 @@ -519669,7 +519669,7 @@ _0810FF66: lsls r2, 3 add r2, r12 mov r8, r2 -_0810FF88: +@0810FF88: lsls r2, r3, 16 asrs r0, r2, 15 add r0, r9 @@ -519683,25 +519683,25 @@ _0810FF88: asrs r3, r0, 16 adds r6, r2, 0 cmp r3, 0 - ble _0810FFB8 + ble @0810FFB8 ldrh r1, [r5, 0xA] adds r0, r7, 0 ands r0, r1 adds r0, r3, r0 - b _0810FFC4 + b @0810FFC4 .align 2, 0 .pool -_0810FFB8: +@0810FFB8: cmp r3, 0 - bge _0810FFC8 + bge @0810FFC8 ldrh r1, [r5, 0xA] adds r0, r7, 0 ands r0, r1 subs r0, r3, r0 -_0810FFC4: +@0810FFC4: lsls r0, 16 lsrs r1, r0, 16 -_0810FFC8: +@0810FFC8: lsls r2, r4, 16 asrs r2, 16 lsls r3, r2, 1 @@ -519728,31 +519728,31 @@ _0810FFC8: movs r1, 0x26 ldrsh r0, [r5, r1] cmp r2, r0 - ble _0810FF88 -_0810FFFE: + ble @0810FF88 +@0810FFFE: ldrh r0, [r5, 0xA] adds r0, 0x1 strh r0, [r5, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x17 - ble _08110026 - b _08110014 -_0811000E: + ble @08110026 + b @08110014 +@0811000E: ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] -_08110014: +@08110014: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] - b _08110026 + b @08110026 .align 2, 0 .pool -_08110020: +@08110020: adds r0, r2, 0 bl move_anim_task_del -_08110026: +@08110026: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -519762,7 +519762,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 @@ -519782,13 +519782,13 @@ sub_8110034: @ 8110034 mov r10, r5 adds r6, r5, 0 cmp r6, 0xFF - bne _0811006C + bne @0811006C adds r0, r4, 0 bl move_anim_task_del - b _08110116 + b @08110116 .align 2, 0 .pool -_0811006C: +@0811006C: ldr r1, =0x0203841e ldrb r0, [r1] bl duplicate_obj_of_side_rel2move_in_transparent_mode @@ -519797,15 +519797,15 @@ _0811006C: mov r9, r1 asrs r0, 16 cmp r0, 0 - bge _08110094 + bge @08110094 adds r0, r5, 0 bl rotscale_free_entry mov r0, r8 bl move_anim_task_del - b _08110116 + b @08110116 .align 2, 0 .pool -_08110094: +@08110094: ldr r2, =0x02020630 lsls r4, r0, 4 adds r4, r0 @@ -519868,7 +519868,7 @@ _08110094: strh r1, [r7, 0x26] ldr r0, =sub_8110134 + 1 str r0, [r7] -_08110116: +@08110116: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -519881,7 +519881,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 @@ -519893,21 +519893,21 @@ sub_8110134: @ 8110134 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _081101B8 + beq @081101B8 cmp r0, 0x1 - bgt _0811015C + bgt @0811015C cmp r0, 0 - beq _08110166 - b _08110238 + beq @08110166 + b @08110238 .align 2, 0 .pool -_0811015C: +@0811015C: cmp r0, 0x2 - beq _08110208 + beq @08110208 cmp r0, 0x3 - beq _08110228 - b _08110238 -_08110166: + beq @08110228 + b @08110238 +@08110166: ldrh r0, [r4, 0xA] adds r0, 0x4 strh r0, [r4, 0xA] @@ -519942,11 +519942,11 @@ _08110166: movs r2, 0xA ldrsh r0, [r4, r2] cmp r0, 0x30 - bne _08110238 - b _0811021A + bne @08110238 + b @0811021A .align 2, 0 .pool -_081101B8: +@081101B8: ldrh r0, [r4, 0xA] subs r0, 0x4 strh r0, [r4, 0xA] @@ -519981,11 +519981,11 @@ _081101B8: movs r2, 0xA ldrsh r0, [r4, r2] cmp r0, 0 - bne _08110238 - b _0811021A + bne @08110238 + b @0811021A .align 2, 0 .pool -_08110208: +@08110208: movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -519994,46 +519994,46 @@ _08110208: ldr r1, =0x02020630 adds r0, r1 bl obj_delete_but_dont_free_vram -_0811021A: +@0811021A: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _08110238 + b @08110238 .align 2, 0 .pool -_08110228: +@08110228: ldrh r0, [r4, 0x24] lsls r0, 24 lsrs r0, 24 bl rotscale_free_entry adds r0, r5, 0 bl move_anim_task_del -_08110238: +@08110238: pop {r4,r5} pop {r0} bx r0 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 ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _081102B8 + beq @081102B8 cmp r0, 0x1 - bgt _08110256 + bgt @08110256 cmp r0, 0 - beq _08110260 - b _08110360 -_08110256: + beq @08110260 + b @08110360 +@08110256: cmp r0, 0x2 - beq _081102EA + beq @081102EA cmp r0, 0x3 - beq _0811034A - b _08110360 -_08110260: + beq @0811034A + b @08110360 +@08110260: ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 @@ -520050,11 +520050,11 @@ _08110260: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _0811028E + beq @0811028E ldrh r0, [r5, 0x22] adds r0, 0xC strh r0, [r5, 0x22] -_0811028E: +@0811028E: movs r0, 0x8 strh r0, [r5, 0x30] movs r1, 0xFD @@ -520070,17 +520070,17 @@ _0811028E: lsrs r1, 16 movs r0, 0x52 bl lcd_io_set - b _081102E2 + b @081102E2 .align 2, 0 .pool -_081102B8: +@081102B8: adds r0, r5, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _08110360 + beq @08110360 movs r0, 0x40 negs r0, r0 bl sub_80A5178 @@ -520092,19 +520092,19 @@ _081102B8: adds r0, r5, 0 movs r1, 0x1 bl sub_80082B8 -_081102E2: +@081102E2: ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] - b _08110360 -_081102EA: + b @08110360 +@081102EA: ldrh r0, [r5, 0x32] adds r1, r0, 0x1 strh r1, [r5, 0x32] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0811032E + ble @0811032E movs r0, 0 strh r0, [r5, 0x32] ldrh r1, [r5, 0x30] @@ -520121,7 +520121,7 @@ _081102EA: movs r1, 0x30 ldrsh r0, [r5, r1] cmp r0, 0 - bne _0811032E + bne @0811032E ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] @@ -520131,7 +520131,7 @@ _081102EA: movs r1, 0x4 orrs r0, r1 strb r0, [r2] -_0811032E: +@0811032E: movs r0, 0xE0 lsls r0, 2 adds r2, r0, 0 @@ -520145,8 +520145,8 @@ _0811032E: movs r0, 0xFF ands r2, r0 strh r2, [r5, 0x34] - b _08110360 -_0811034A: + b @08110360 +@0811034A: movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -520155,20 +520155,20 @@ _0811034A: bl lcd_io_set adds r0, r5, 0 bl move_anim_8072740 -_08110360: +@08110360: pop {r4,r5} pop {r0} bx r0 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 lsls r0, 24 cmp r0, 0 - beq _08110394 + beq @08110394 adds r0, r6, 0 movs r1, 0x2 bl sub_8008258 @@ -520179,16 +520179,16 @@ sub_8110368: @ 8110368 ldrh r1, [r0] negs r1, r1 strh r1, [r0] - b _081103C4 + b @081103C4 .align 2, 0 .pool -_08110394: +@08110394: ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _081103C4 + bne @081103C4 adds r0, r6, 0 movs r1, 0x1 bl sub_8008258 @@ -520205,7 +520205,7 @@ _08110394: ldrh r0, [r1] negs r0, r0 strh r0, [r1] -_081103C4: +@081103C4: ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 @@ -520255,13 +520255,13 @@ _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 lsls r0, 24 cmp r0, 0 - beq _0811045C + beq @0811045C ldr r1, =0x0203841e ldrh r0, [r1] negs r0, r0 @@ -520269,16 +520269,16 @@ sub_8110438: @ 8110438 adds r0, r6, 0 movs r1, 0x2 bl sub_8008258 - b _08110478 + b @08110478 .align 2, 0 .pool -_0811045C: +@0811045C: ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08110478 + bne @08110478 ldr r0, =0x0203841e ldrh r1, [r0, 0x2] negs r1, r1 @@ -520286,7 +520286,7 @@ _0811045C: ldrh r1, [r0] negs r1, r1 strh r1, [r0] -_08110478: +@08110478: ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 @@ -520332,13 +520332,13 @@ _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 lsls r0, 24 cmp r0, 0 - beq _08110500 + beq @08110500 ldr r0, =0x0203841e movs r2, 0x4 ldrsh r1, [r0, r2] @@ -520346,7 +520346,7 @@ sub_81104E4: @ 81104E4 adds r1, r2 asrs r1, 1 strh r1, [r0, 0x4] -_08110500: +@08110500: adds r0, r5, 0 movs r1, 0x1 bl sub_80A69CC @@ -520360,7 +520360,7 @@ _08110500: movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0 - bne _08110548 + bne @08110548 ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 @@ -520374,10 +520374,10 @@ _08110500: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] - b _0811055A + b @0811055A .align 2, 0 .pool -_08110548: +@08110548: ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r5, 0 @@ -520386,7 +520386,7 @@ _08110548: adds r3, 0x36 movs r1, 0x1 bl sub_80A8924 -_0811055A: +@0811055A: adds r0, r5, 0 bl sub_80A6FD4 ldr r0, =0x0203841e @@ -520402,17 +520402,17 @@ _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 lsls r0, 24 cmp r0, 0 - beq _08110592 + beq @08110592 adds r0, r4, 0 bl move_anim_8072740 - b _081105AE -_08110592: + b @081105AE +@08110592: movs r1, 0x3A ldrsh r0, [r4, r1] movs r2, 0x38 @@ -520426,14 +520426,14 @@ _08110592: movs r1, 0xFF ands r0, r1 strh r0, [r4, 0x3A] -_081105AE: +@081105AE: pop {r4} pop {r0} bx r0 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 @@ -520449,23 +520449,23 @@ sub_81105B4: @ 81105B4 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _081105F0 + beq @081105F0 ldr r0, =0x0203841e ldrh r1, [r4, 0x20] ldrh r2, [r0] subs r1, r2 strh r1, [r4, 0x20] - b _081105FC + b @081105FC .align 2, 0 .pool -_081105F0: +@081105F0: ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] adds r0, r2 strh r0, [r4, 0x20] adds r0, r1, 0 -_081105FC: +@081105FC: ldrh r0, [r0, 0x2] ldrh r1, [r4, 0x22] adds r0, r1 @@ -520475,11 +520475,11 @@ _081105FC: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08110618 + bne @08110618 ldrh r0, [r4, 0x22] adds r0, 0x8 strh r0, [r4, 0x22] -_08110618: +@08110618: ldr r0, =sub_8110630 + 1 str r0, [r4, 0x1C] pop {r4} @@ -520490,7 +520490,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] @@ -520499,7 +520499,7 @@ sub_8110630: @ 8110630 lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - bne _08110664 + bne @08110664 movs r0, 0 strh r0, [r3, 0x2E] movs r0, 0x3E @@ -520517,23 +520517,23 @@ sub_8110630: @ 8110630 orrs r0, r1 mov r1, r12 strb r0, [r1] -_08110664: +@08110664: ldrh r0, [r3, 0x30] adds r0, 0x1 strh r0, [r3, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x33 - bne _08110678 + bne @08110678 adds r0, r3, 0 bl move_anim_8072740 -_08110678: +@08110678: pop {r0} bx r0 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 @@ -520555,25 +520555,25 @@ 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] movs r2, 0x32 ldrsh r0, [r4, r2] cmp r0, 0x13 - bgt _081106B8 + bgt @081106B8 adds r0, r1, 0x1 strh r0, [r4, 0x32] - b _081106F6 -_081106B8: + b @081106F6 +@081106B8: ldrh r1, [r4, 0x30] adds r0, r1, 0x1 strh r0, [r4, 0x30] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081106F6 + beq @081106F6 ldrh r1, [r4, 0x2E] subs r1, 0x1 strh r1, [r4, 0x2E] @@ -520588,7 +520588,7 @@ _081106B8: movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - bne _081106F6 + bne @081106F6 adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -520597,7 +520597,7 @@ _081106B8: strb r0, [r2] ldr r0, =sub_8110700 + 1 str r0, [r4, 0x1C] -_081106F6: +@081106F6: pop {r4} pop {r0} bx r0 @@ -520606,7 +520606,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 @@ -520623,28 +520623,28 @@ 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 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _08110740 + beq @08110740 ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] - b _08110762 + b @08110762 .align 2, 0 .pool -_08110740: +@08110740: ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08110762 + beq @08110762 ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 @@ -520655,11 +520655,11 @@ _08110740: ldrh r0, [r1, 0x6] negs r0, r0 strh r0, [r1, 0x6] -_08110762: +@08110762: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _081107B2 + bne @081107B2 ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner @@ -520670,19 +520670,19 @@ _08110762: lsls r4, 24 lsls r0, 24 cmp r4, r0 - bne _081107B2 + bne @081107B2 ldrb r0, [r5] bl battle_get_per_side_status lsls r0, 24 cmp r0, 0 - beq _081107A0 + beq @081107A0 ldrb r0, [r5] bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081107B2 -_081107A0: + bne @081107B2 +@081107A0: ldr r0, =0x0203841e movs r2, 0x4 ldrsh r1, [r0, r2] @@ -520692,7 +520692,7 @@ _081107A0: ldrsh r1, [r0, r2] negs r1, r1 strh r1, [r0] -_081107B2: +@081107B2: adds r0, r7, 0 movs r1, 0x1 bl sub_80A69CC @@ -520760,7 +520760,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 @@ -520770,12 +520770,12 @@ sub_8110850: @ 8110850 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08110870 + beq @08110870 ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] -_08110870: +@08110870: ldr r4, =0x0203841e ldrh r0, [r4, 0x8] strh r0, [r6, 0x2E] @@ -520816,7 +520816,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} @@ -520833,11 +520833,11 @@ sub_81108CC: @ 81108CC bl sub_80A6900 lsls r0, 24 cmp r0, 0 - beq _081108F8 + beq @081108F8 adds r0, r4, 0 bl move_anim_8072740 - b _08110988 -_081108F8: + b @08110988 +@081108F8: movs r0, 0x2E adds r0, r4 mov r8, r0 @@ -520849,14 +520849,14 @@ _081108F8: mov r2, r8 add r1, sp, 0x4 movs r3, 0x7 -_0811090E: +@0811090E: ldrh r0, [r2] strh r0, [r1] adds r2, 0x2 adds r1, 0x2 subs r3, 0x1 cmp r3, 0 - bge _0811090E + bge @0811090E adds r0, r7, r5 lsls r0, 16 lsrs r5, r0, 16 @@ -520868,7 +520868,7 @@ _0811090E: bl sub_80A6900 lsls r0, 24 cmp r0, 0 - bne _08110988 + bne @08110988 ldrh r0, [r4, 0x24] ldrh r1, [r4, 0x20] adds r0, r1 @@ -520901,15 +520901,15 @@ _0811090E: add r2, sp, 0x4 mov r1, r8 movs r3, 0x7 -_0811097A: +@0811097A: ldrh r0, [r2] strh r0, [r1] adds r2, 0x2 adds r1, 0x2 subs r3, 0x1 cmp r3, 0 - bge _0811097A -_08110988: + bge @0811097A +@08110988: add sp, 0x14 pop {r3} mov r8, r3 @@ -520919,21 +520919,21 @@ _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 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _081109B0 + bne @081109B0 ldr r4, =0x02038436 - b _081109B2 + b @081109B2 .align 2, 0 .pool -_081109B0: +@081109B0: ldr r4, =0x02038437 -_081109B2: +@081109B2: ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -520960,14 +520960,14 @@ _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 movs r1, 0x6 ldrsh r0, [r6, r1] cmp r0, 0 - beq _08110A10 + beq @08110A10 ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r5, 0 @@ -520976,7 +520976,7 @@ sub_81109F0: @ 81109F0 adds r3, 0x22 movs r1, 0 bl sub_80A8924 -_08110A10: +@08110A10: ldrh r0, [r6] ldrh r1, [r5, 0x20] adds r0, r1 @@ -521015,7 +521015,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] @@ -521046,7 +521046,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 @@ -521059,18 +521059,18 @@ sub_8110AB4: @ 8110AB4 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08110AE4 + beq @08110AE4 ldrh r0, [r5, 0x20] ldrh r1, [r4] subs r0, r1 - b _08110AEA + b @08110AEA .align 2, 0 .pool -_08110AE4: +@08110AE4: ldrh r0, [r4] ldrh r1, [r5, 0x20] adds r0, r1 -_08110AEA: +@08110AEA: strh r0, [r5, 0x20] ldr r3, =0x0203841e ldrh r2, [r3, 0x2] @@ -521106,25 +521106,25 @@ _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 movs r1, 0xC ldrsh r0, [r0, r1] cmp r0, 0 - bne _08110B54 + bne @08110B54 adds r0, r4, 0 movs r1, 0 bl sub_80A69CC - b _08110B5C + b @08110B5C .align 2, 0 .pool -_08110B54: +@08110B54: adds r0, r4, 0 movs r1, 0 bl sub_80A6980 -_08110B5C: +@08110B5C: ldr r1, =0x0203841e ldrh r0, [r1, 0x6] strh r0, [r4, 0x2E] @@ -521144,7 +521144,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] @@ -521175,17 +521175,17 @@ sub_8110B80: @ 8110B80 movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _08110BC6 + bne @08110BC6 adds r0, r4, 0 bl move_anim_8072740 -_08110BC6: +@08110BC6: pop {r4} pop {r0} bx r0 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 @@ -521209,12 +521209,12 @@ sub_8110BCC: @ 8110BCC bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _08110C10 + bne @08110C10 movs r0, 0x1 movs r1, 0x3 movs r2, 0x1 bl lcd_bg_operations -_08110C10: +@08110C10: ldr r0, =0x02022e18 strh r5, [r0] ldr r4, =0x02022e1a @@ -521247,15 +521247,15 @@ _08110C10: movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - beq _08110C6E + beq @08110C6E ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08110C6E + beq @08110C6E movs r5, 0x1 -_08110C6E: +@08110C6E: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -521273,7 +521273,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 @@ -521287,20 +521287,20 @@ sub_8110CB0: @ 8110CB0 ldrsh r0, [r0, r2] adds r2, r1, 0 cmp r0, 0 - bne _08110CE4 + bne @08110CE4 ldr r1, =0x02022e18 ldr r3, =0x0000fffa adds r0, r3, 0 ldrh r3, [r1] adds r0, r3 - b _08110CEA + b @08110CEA .align 2, 0 .pool -_08110CE4: +@08110CE4: ldr r1, =0x02022e18 ldrh r0, [r1] adds r0, 0x6 -_08110CEA: +@08110CEA: strh r0, [r1] ldr r1, =0x02022e1a ldr r3, =0x0000ffff @@ -521316,24 +521316,24 @@ _08110CEA: ldrsh r0, [r0, r3] adds r4, r1, 0 cmp r0, 0x4 - bls _08110D0C - b _08110E3A -_08110D0C: + bls @08110D0C + b @08110E3A +@08110D0C: lsls r0, 2 - ldr r1, =_08110D28 + ldr r1, =@08110D28 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08110D28: - .4byte _08110D3C - .4byte _08110D7E - .4byte _08110D98 - .4byte _08110DDA - .4byte _08110DFC -_08110D3C: +@08110D28: + .4byte @08110D3C + .4byte @08110D7E + .4byte @08110D98 + .4byte @08110DDA + .4byte @08110DFC +@08110D3C: adds r0, r4, r5 lsls r0, 3 adds r4, r0, r2 @@ -521344,7 +521344,7 @@ _08110D3C: lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne _08110E3A + bne @08110E3A strh r5, [r4, 0x1C] ldrh r1, [r4, 0x1E] adds r1, 0x1 @@ -521360,13 +521360,13 @@ _08110D3C: movs r1, 0x1E ldrsh r0, [r4, r1] cmp r0, 0x7 - bne _08110E3A + bne @08110E3A ldrh r0, [r4, 0x20] adds r0, 0x1 strh r0, [r4, 0x20] strh r5, [r4, 0x1E] - b _08110E3A -_08110D7E: + b @08110E3A +@08110D7E: adds r0, r4, r5 lsls r0, 3 adds r1, r0, r2 @@ -521376,11 +521376,11 @@ _08110D7E: lsls r0, 16 asrs r0, 16 cmp r0, 0x65 - bne _08110E3A + bne @08110E3A movs r0, 0x7 strh r0, [r1, 0x1E] - b _08110DF0 -_08110D98: + b @08110DF0 +@08110D98: adds r0, r4, r5 lsls r0, 3 adds r4, r0, r2 @@ -521390,7 +521390,7 @@ _08110D98: lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne _08110E3A + bne @08110E3A movs r0, 0 strh r0, [r4, 0x1C] ldrh r1, [r4, 0x1E] @@ -521407,13 +521407,13 @@ _08110D98: movs r2, 0x1E ldrsh r1, [r4, r2] cmp r1, 0 - bne _08110E3A + bne @08110E3A ldrh r0, [r4, 0x20] adds r0, 0x1 strh r0, [r4, 0x20] strh r1, [r4, 0x1E] - b _08110E3A -_08110DDA: + b @08110E3A +@08110DDA: mov r0, sp bl sub_80A6B30 mov r0, sp @@ -521423,23 +521423,23 @@ _08110DDA: adds r1, r4, r5 lsls r1, 3 adds r1, r0 -_08110DF0: +@08110DF0: ldrh r0, [r1, 0x20] adds r0, 0x1 strh r0, [r1, 0x20] - b _08110E3A + b @08110E3A .align 2, 0 .pool -_08110DFC: +@08110DFC: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _08110E10 + bne @08110E10 movs r0, 0x1 movs r1, 0x3 movs r2, 0 bl lcd_bg_operations -_08110E10: +@08110E10: ldr r0, =0x02022e18 movs r1, 0 strh r1, [r0] @@ -521457,7 +521457,7 @@ _08110E10: bl lcd_bg_operations adds r0, r5, 0 bl move_anim_task_del -_08110E3A: +@08110E3A: add sp, 0x10 pop {r4,r5} pop {r0} @@ -521467,24 +521467,24 @@ _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 ldrsh r0, [r5, r1] cmp r0, 0 - bne _08110EC8 + bne @08110EC8 ldr r4, =0x0203841e movs r2, 0x6 ldrsh r0, [r4, r2] cmp r0, 0 - beq _08110E98 + beq @08110E98 ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08110E98 + beq @08110E98 movs r0, 0x98 lsls r0, 1 strh r0, [r5, 0x20] @@ -521499,13 +521499,13 @@ sub_8110E4C: @ 8110E4C movs r1, 0x10 orrs r0, r1 strb r0, [r5, 0x3] - b _08110E9C + b @08110E9C .align 2, 0 .pool -_08110E98: +@08110E98: ldr r0, =0x0000ffc0 strh r0, [r5, 0x20] -_08110E9C: +@08110E9C: ldr r4, =0x0203841e ldrh r0, [r4] strh r0, [r5, 0x22] @@ -521519,10 +521519,10 @@ _08110E9C: ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] - b _08110F24 + b @08110F24 .align 2, 0 .pool -_08110EC8: +@08110EC8: ldrh r1, [r5, 0x30] ldrh r3, [r5, 0x34] adds r1, r3 @@ -521547,7 +521547,7 @@ _08110EC8: movs r1, 0x38 ldrsh r0, [r5, r1] cmp r0, 0 - bne _08110F0E + bne @08110F0E movs r2, 0x20 ldrsh r0, [r5, r2] movs r3, 0x24 @@ -521556,9 +521556,9 @@ _08110EC8: movs r1, 0x88 lsls r1, 1 cmp r0, r1 - ble _08110F24 - b _08110F20 -_08110F0E: + ble @08110F24 + b @08110F20 +@08110F0E: movs r1, 0x20 ldrsh r0, [r5, r1] movs r2, 0x24 @@ -521567,11 +521567,11 @@ _08110F0E: movs r1, 0x20 negs r1, r1 cmp r0, r1 - bge _08110F24 -_08110F20: + bge @08110F24 +@08110F20: ldr r0, =move_anim_8072740 + 1 str r0, [r5, 0x1C] -_08110F24: +@08110F24: pop {r4,r5} pop {r0} bx r0 @@ -521580,7 +521580,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 @@ -521610,7 +521610,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 @@ -521661,23 +521661,23 @@ sub_8110F74: @ 8110F74 eors r0, r1 ldrb r4, [r4] cmp r0, r4 - bne _08110FE4 + bne @08110FE4 mov r8, r7 -_08110FE4: +@08110FE4: bl sub_811135C lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x1 - bne _08111000 + bne @08111000 movs r0, 0x20 - b _08111006 + b @08111006 .align 2, 0 .pool -_08111000: +@08111000: lsls r1, r5, 3 movs r0, 0x30 subs r0, r1 -_08111006: +@08111006: strh r0, [r6, 0x18] movs r4, 0 strh r4, [r6, 0x8] @@ -521688,9 +521688,9 @@ _08111006: movs r1, 0x18 ldrsh r0, [r6, r1] cmp r0, 0 - bge _0811101E + bge @0811101E adds r0, 0x7 -_0811101E: +@0811101E: asrs r0, 3 subs r0, 0x1 strh r0, [r6, 0x1C] @@ -521754,7 +521754,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 @@ -521766,24 +521766,24 @@ sub_81110A4: @ 81110A4 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x4 - bls _081110BE - b _0811120C -_081110BE: + bls @081110BE + b @0811120C +@081110BE: lsls r0, 2 - ldr r1, =_081110D0 + ldr r1, =@081110D0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081110D0: - .4byte _081110E4 - .4byte _08111148 - .4byte _08111150 - .4byte _081111AC - .4byte _081111FE -_081110E4: +@081110D0: + .4byte @081110E4 + .4byte @08111148 + .4byte @08111150 + .4byte @081111AC + .4byte @081111FE +@081110E4: ldrh r2, [r4, 0x14] ldrh r0, [r4, 0x10] subs r2, r0 @@ -521818,34 +521818,34 @@ _081110E4: lsls r0, 16 asrs r0, 16 cmp r0, 0xA - bne _08111134 + bne @08111134 movs r0, 0x14 strh r0, [r4, 0x1E] ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_08111134: +@08111134: ldrh r1, [r4, 0x22] lsls r1, 24 asrs r1, 24 movs r0, 0xA2 bl audio_play_and_stuff - b _0811120C + b @0811120C .align 2, 0 .pool -_08111148: +@08111148: ldrh r0, [r4, 0x1E] subs r0, 0x1 strh r0, [r4, 0x1E] - b _081111F0 -_08111150: + b @081111F0 +@08111150: ldrh r0, [r4, 0x1A] subs r0, 0x1 strh r0, [r4, 0x1A] lsls r0, 16 asrs r0, 16 cmp r0, 0 - beq _08111170 + beq @08111170 ldrh r0, [r4, 0x10] ldrh r2, [r4, 0x14] adds r0, r2 @@ -521854,14 +521854,14 @@ _08111150: ldrh r1, [r4, 0x16] adds r0, r1 strh r0, [r4, 0x16] - b _0811117A -_08111170: + b @0811117A +@08111170: strh r0, [r4, 0x14] strh r0, [r4, 0x16] ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_0811117A: +@0811117A: ldr r2, =0x02020630 movs r1, 0x26 ldrsh r0, [r4, r1] @@ -521883,10 +521883,10 @@ _0811117A: lsls r0, 16 asrs r0, 19 strh r0, [r1, 0x26] - b _0811120C + b @0811120C .align 2, 0 .pool -_081111AC: +@081111AC: ldrh r0, [r4, 0x10] ldrh r2, [r4, 0xC] adds r0, r2 @@ -521903,7 +521903,7 @@ _081111AC: movs r2, 0x1C ldrsh r1, [r4, r2] cmp r0, r1 - blt _081111EA + blt @081111EA movs r0, 0 strh r0, [r4, 0x1A] adds r0, r4, 0 @@ -521916,33 +521916,33 @@ _081111AC: asrs r1, 24 movs r0, 0xAF bl audio_play_and_stuff -_081111EA: +@081111EA: ldrh r0, [r4, 0x18] subs r0, 0x1 strh r0, [r4, 0x18] -_081111F0: +@081111F0: lsls r0, 16 cmp r0, 0 - bne _0811120C + bne @0811120C ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0811120C -_081111FE: + b @0811120C +@081111FE: movs r1, 0x1E ldrsh r0, [r4, r1] cmp r0, 0 - bne _0811120C + bne @0811120C adds r0, r2, 0 bl move_anim_task_del -_0811120C: +@0811120C: pop {r4} pop {r0} bx r0 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] @@ -521950,43 +521950,43 @@ sub_8111214: @ 8111214 lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bhi _08111304 + bhi @08111304 lsls r0, 2 - ldr r1, =_08111234 + ldr r1, =@08111234 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08111234: - .4byte _08111248 - .4byte _08111254 - .4byte _08111254 - .4byte _08111260 - .4byte _0811126C -_08111248: +@08111234: + .4byte @08111248 + .4byte @08111254 + .4byte @08111254 + .4byte @08111260 + .4byte @0811126C +@08111248: ldr r3, =0x08596c28 movs r5, 0 - b _08111270 + b @08111270 .align 2, 0 .pool -_08111254: +@08111254: ldr r3, =0x08596c40 movs r5, 0x50 - b _08111270 + b @08111270 .align 2, 0 .pool -_08111260: +@08111260: ldr r3, =0x08596c40 movs r5, 0x40 - b _08111270 + b @08111270 .align 2, 0 .pool -_0811126C: +@0811126C: ldr r3, =0x08596c40 movs r5, 0x30 -_08111270: +@08111270: ldrh r1, [r4, 0xC] lsls r1, 16 asrs r1, 19 @@ -522011,7 +522011,7 @@ _08111270: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq _081112FC + beq @081112FC ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -522055,12 +522055,12 @@ _08111270: ldrh r0, [r4, 0x1E] adds r0, 0x1 strh r0, [r4, 0x1E] -_081112FC: +@081112FC: movs r6, 0x20 ldrsh r0, [r4, r6] negs r0, r0 strh r0, [r4, 0x20] -_08111304: +@08111304: pop {r4-r7} pop {r0} bx r0 @@ -522069,19 +522069,19 @@ _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 lsls r0, 24 cmp r0, 0 - beq _0811134E + beq @0811134E ldr r0, =sub_81110A4 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq _08111348 + beq @08111348 ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -522090,10 +522090,10 @@ sub_811131C: @ 811131C ldrh r0, [r1, 0x1E] subs r0, 0x1 strh r0, [r1, 0x1E] -_08111348: +@08111348: adds r0, r4, 0 bl obj_delete_and_free_tiles -_0811134E: +@0811134E: pop {r4} pop {r0} bx r0 @@ -522102,7 +522102,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] @@ -522118,9 +522118,9 @@ sub_811135C: @ 811135C adds r0, r2 lsrs r0, 24 cmp r0, 0x4 - bls _0811137E + bls @0811137E movs r1, 0x1 -_0811137E: +@0811137E: adds r0, r1, 0 pop {r1} bx r1 @@ -522129,7 +522129,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 @@ -522162,7 +522162,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 @@ -522176,7 +522176,7 @@ sub_81113C8: @ 81113C8 movs r3, 0x34 ldrsh r0, [r2, r3] cmp r0, 0 - beq _08111400 + beq @08111400 ldrh r3, [r2, 0x32] adds r0, r1, r3 strh r0, [r2, 0x26] @@ -522187,26 +522187,26 @@ sub_81113C8: @ 81113C8 strh r0, [r2, 0x2E] lsls r1, 16 cmp r1, 0 - ble _08111412 + ble @08111412 movs r0, 0 strh r0, [r2, 0x34] - b _08111412 -_08111400: + b @08111412 +@08111400: ldrh r0, [r2, 0x30] subs r0, 0x1 strh r0, [r2, 0x30] lsls r0, 16 cmp r0, 0 - bne _08111412 + bne @08111412 adds r0, r2, 0 bl move_anim_8072740 -_08111412: +@08111412: pop {r0} bx r0 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 @@ -522215,11 +522215,11 @@ sub_8111418: @ 8111418 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08111434 + bne @08111434 adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 -_08111434: +@08111434: adds r0, r4, 0 bl sub_80A7820 pop {r4} @@ -522230,7 +522230,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 @@ -522270,7 +522270,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] @@ -522302,43 +522302,43 @@ sub_811149C: @ 811149C movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0x8C - ble _081114E6 + ble @081114E6 adds r0, r4, 0 bl move_anim_8072740 -_081114E6: +@081114E6: pop {r4} pop {r0} bx r0 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 ldr r2, =0x02038404 ldr r0, [r2] cmp r0, 0x20 - bgt _08111500 + bgt @08111500 ldr r1, =0x0203841e movs r0, 0 strh r0, [r1, 0xE] -_08111500: +@08111500: ldr r2, [r2] adds r0, r2, 0 subs r0, 0x21 cmp r0, 0x20 - bhi _08111510 + bhi @08111510 ldr r1, =0x0203841e movs r0, 0x1 strh r0, [r1, 0xE] -_08111510: +@08111510: cmp r2, 0x41 - ble _0811151A + ble @0811151A ldr r1, =0x0203841e movs r0, 0x2 strh r0, [r1, 0xE] -_0811151A: +@0811151A: adds r0, r3, 0 bl move_anim_task_del pop {r0} @@ -522348,7 +522348,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 @@ -522360,12 +522360,12 @@ sub_811152C: @ 811152C movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0 - bne _0811154E + bne @0811154E movs r0, 0 bl sub_80A6DAC movs r0, 0xC8 strh r0, [r5, 0xA] -_0811154E: +@0811154E: ldr r4, =0x02022e22 movs r1, 0xA ldrsh r0, [r5, r1] @@ -522380,12 +522380,12 @@ _0811154E: movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0x78 - bne _0811157A + bne @0811157A movs r0, 0x1 bl sub_80A6DAC adds r0, r6, 0 bl move_anim_task_del -_0811157A: +@0811157A: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] @@ -522397,7 +522397,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 @@ -522410,7 +522410,7 @@ sub_8111590: @ 8111590 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - bne _081115BC + bne @081115BC movs r0, 0 bl sub_80A6DAC ldrh r0, [r4, 0x8] @@ -522419,7 +522419,7 @@ sub_8111590: @ 8111590 ldr r0, =0x02022e22 ldrh r0, [r0] strh r0, [r4, 0xC] -_081115BC: +@081115BC: ldrh r0, [r4, 0xA] adds r0, 0x50 movs r1, 0xFF @@ -522438,14 +522438,14 @@ _081115BC: ldrsh r1, [r0, r2] ldr r0, =0x00000fff cmp r1, r0 - bne _081115F4 + bne @081115F4 movs r0, 0 strh r0, [r6] movs r0, 0x1 bl sub_80A6DAC adds r0, r5, 0 bl move_anim_task_del -_081115F4: +@081115F4: pop {r4-r6} pop {r0} bx r0 @@ -522454,7 +522454,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 @@ -522500,7 +522500,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 @@ -522508,13 +522508,13 @@ sub_8111674: @ 8111674 bl sub_80A6F3C lsls r0, 24 cmp r0, 0 - beq _08111694 + beq @08111694 ldr r0, =sub_81116E8 + 1 str r0, [r4, 0x1C] - b _081116DE + b @081116DE .align 2, 0 .pool -_08111694: +@08111694: movs r1, 0x38 ldrsh r0, [r4, r1] movs r1, 0xA @@ -522538,19 +522538,19 @@ _08111694: lsls r2, 16 asrs r2, 16 cmp r2, 0 - beq _081116CC + beq @081116CC cmp r2, 0xC4 - ble _081116DE -_081116CC: + ble @081116DE +@081116CC: lsls r0, 16 cmp r0, 0 - ble _081116DE + ble @081116DE ldr r0, =0x02038440 movs r1, 0 ldrsb r1, [r0, r1] movs r0, 0xC4 bl audio_play_and_stuff -_081116DE: +@081116DE: pop {r4} pop {r0} bx r0 @@ -522559,7 +522559,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 @@ -522589,20 +522589,20 @@ sub_81116E8: @ 81116E8 lsls r2, 16 asrs r2, 16 cmp r2, 0 - beq _0811172E + beq @0811172E cmp r2, 0xC4 - ble _0811173A -_0811172E: + ble @0811173A +@0811172E: lsls r0, 16 cmp r0, 0 - ble _0811173A + ble @0811173A movs r0, 0xC4 bl audio_play -_0811173A: +@0811173A: movs r1, 0x3A ldrsh r0, [r4, r1] cmp r0, 0 - bne _08111758 + bne @08111758 adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -522611,45 +522611,45 @@ _0811173A: strb r0, [r2] ldr r0, =sub_80A67F4 + 1 str r0, [r4, 0x1C] - b _0811175E + b @0811175E .align 2, 0 .pool -_08111758: +@08111758: adds r0, r4, 0 bl sub_8111764 -_0811175E: +@0811175E: pop {r4} pop {r0} bx r0 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] movs r1, 0x3A ldrsh r0, [r4, r1] cmp r0, 0xFF - ble _08111788 + ble @08111788 adds r0, r2, 0x1 strh r0, [r4, 0x3A] lsls r0, 16 ldr r1, =0x010d0000 cmp r0, r1 - bne _081117EE + bne @081117EE movs r0, 0 - b _081117EC + b @081117EC .align 2, 0 .pool -_08111788: +@08111788: ldrh r1, [r4, 0x3C] adds r3, r1, 0x1 strh r3, [r4, 0x3C] movs r0, 0xFF ands r0, r1 cmp r0, 0 - bne _081117EE + bne @081117EE ldr r1, =0xffffff00 ands r1, r3 strh r1, [r4, 0x3C] @@ -522657,14 +522657,14 @@ _08111788: lsls r0, 1 ands r0, r1 cmp r0, 0 - beq _081117B0 + beq @081117B0 adds r0, r2, 0x1 - b _081117B2 + b @081117B2 .align 2, 0 .pool -_081117B0: +@081117B0: subs r0, r2, 0x1 -_081117B2: +@081117B2: strh r0, [r4, 0x3A] ldrh r0, [r4, 0x3A] movs r1, 0x10 @@ -522678,33 +522678,33 @@ _081117B2: movs r2, 0x3A ldrsh r0, [r4, r2] cmp r0, 0 - beq _081117D4 + beq @081117D4 cmp r0, 0x10 - bne _081117E0 -_081117D4: + bne @081117E0 +@081117D4: ldrh r0, [r4, 0x3C] movs r2, 0x80 lsls r2, 1 adds r1, r2, 0 eors r0, r1 strh r0, [r4, 0x3C] -_081117E0: +@081117E0: movs r1, 0x3A ldrsh r0, [r4, r1] cmp r0, 0 - bne _081117EE + bne @081117EE movs r0, 0x80 lsls r0, 1 -_081117EC: +@081117EC: strh r0, [r4, 0x3A] -_081117EE: +@081117EE: pop {r4} pop {r0} bx r0 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 @@ -522721,7 +522721,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 @@ -522739,20 +522739,20 @@ sub_8111814: @ 8111814 lsls r0, 16 lsrs r0, 16 cmp r0, 0x82 - bhi _08111848 + bhi @08111848 ldrb r0, [r4, 0x5] movs r1, 0xD negs r1, r1 ands r1, r0 movs r0, 0x8 - b _08111852 -_08111848: + b @08111852 +@08111848: ldrb r0, [r4, 0x5] movs r1, 0xD negs r1, r1 ands r1, r0 movs r0, 0x4 -_08111852: +@08111852: orrs r1, r0 strb r1, [r4, 0x5] ldrh r0, [r4, 0x2E] @@ -522774,17 +522774,17 @@ _08111852: lsls r0, 16 asrs r0, 16 cmp r0, 0x3D - bne _08111884 + bne @08111884 adds r0, r4, 0 bl move_anim_8072740 -_08111884: +@08111884: pop {r4} pop {r0} bx r0 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 @@ -522845,7 +522845,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 @@ -522860,7 +522860,7 @@ sub_8111914: @ 8111914 lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - bne _0811195C + bne @0811195C movs r0, 0 strh r0, [r4, 0x1C] ldrh r1, [r4, 0xC] @@ -522878,10 +522878,10 @@ sub_8111914: @ 8111914 movs r1, 0xC ldrsh r0, [r4, r1] cmp r0, 0x9 - bne _0811195C + bne @0811195C ldr r0, =sub_811196C + 1 str r0, [r4] -_0811195C: +@0811195C: pop {r4} pop {r0} bx r0 @@ -522890,7 +522890,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 @@ -522904,13 +522904,13 @@ sub_811196C: @ 811196C movs r2, 0xA ldrsh r0, [r4, r2] cmp r0, 0 - ble _08111994 + ble @08111994 subs r0, r1, 0x1 strh r0, [r4, 0xA] - b _081119D8 + b @081119D8 .align 2, 0 .pool -_08111994: +@08111994: movs r0, 0 bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -522921,15 +522921,15 @@ _08111994: lsls r0, 16 asrs r0, 16 cmp r0, 0xFF - bgt _081119BC + bgt @081119BC movs r0, 0x8 ldrsh r2, [r4, r0] adds r0, r1, 0 adds r1, r2, 0 movs r3, 0 bl obj_id_set_rotscale - b _081119D8 -_081119BC: + b @081119D8 +@081119BC: adds r0, r1, 0 bl sub_80A7344 adds r0, r5, 0 @@ -522940,14 +522940,14 @@ _081119BC: movs r0, 0x52 movs r1, 0 bl lcd_io_set -_081119D8: +@081119D8: pop {r4,r5} pop {r0} bx r0 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 @@ -523027,25 +523027,25 @@ 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 ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _08111AD2 + beq @08111AD2 cmp r0, 0x1 - bgt _08111A9E + bgt @08111A9E cmp r0, 0 - beq _08111AA8 - b _08111B96 -_08111A9E: + beq @08111AA8 + b @08111B96 +@08111A9E: cmp r0, 0x2 - beq _08111B3C + beq @08111B3C cmp r0, 0x3 - beq _08111B90 - b _08111B96 -_08111AA8: + beq @08111B90 + b @08111B96 +@08111AA8: ldrh r0, [r5, 0x3A] ldrh r2, [r5, 0x36] adds r0, r2 @@ -523065,15 +523065,15 @@ _08111AA8: strh r0, [r5, 0x30] lsls r0, 16 cmp r0, 0 - bgt _08111B96 - b _08111B82 -_08111AD2: + bgt @08111B96 + b @08111B82 +@08111AD2: ldrh r0, [r5, 0x32] subs r0, 0x1 strh r0, [r5, 0x32] lsls r0, 16 cmp r0, 0 - bgt _08111B96 + bgt @08111B96 ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 @@ -523113,10 +523113,10 @@ _08111AD2: ldrsh r1, [r5, r2] bl __divsi3 strh r0, [r5, 0x3C] - b _08111B82 + b @08111B82 .align 2, 0 .pool -_08111B3C: +@08111B3C: ldrh r0, [r5, 0x3A] ldrh r1, [r5, 0x36] adds r0, r1 @@ -523136,7 +523136,7 @@ _08111B3C: strh r0, [r5, 0x34] lsls r0, 16 cmp r0, 0 - bgt _08111B96 + bgt @08111B96 ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 @@ -523150,24 +523150,24 @@ _08111B3C: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] -_08111B82: +@08111B82: ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] - b _08111B96 + b @08111B96 .align 2, 0 .pool -_08111B90: +@08111B90: adds r0, r5, 0 bl move_anim_8074EE0 -_08111B96: +@08111B96: pop {r4,r5} pop {r0} bx r0 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 @@ -523182,7 +523182,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 @@ -523192,7 +523192,7 @@ sub_8111BB4: @ 8111BB4 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08111C4A + beq @08111C4A adds r1, r3, 0 adds r1, 0x3E ldrb r2, [r1] @@ -523200,35 +523200,35 @@ sub_8111BB4: @ 8111BB4 ands r0, r2 adds r4, r1, 0 cmp r0, 0 - bne _08111BDE + bne @08111BDE movs r0, 0x4 orrs r0, r2 strb r0, [r4] -_08111BDE: +@08111BDE: movs r1, 0x2E ldrsh r0, [r3, r1] cmp r0, 0 - beq _08111BEE + beq @08111BEE cmp r0, 0x1 - beq _08111BF8 + beq @08111BF8 movs r6, 0x1 - b _08111C02 -_08111BEE: + b @08111C02 +@08111BEE: movs r1, 0x30 ldrsh r0, [r3, r1] cmp r0, 0x2 - bne _08111C02 - b _08111C06 -_08111BF8: + bne @08111C02 + b @08111C06 +@08111BF8: movs r1, 0x30 ldrsh r0, [r3, r1] cmp r0, 0x4 - bne _08111C02 + bne @08111C02 movs r5, 0x1 -_08111C02: +@08111C02: cmp r5, 0 - beq _08111C38 -_08111C06: + beq @08111C38 +@08111C06: ldrb r2, [r4] lsls r0, r2, 29 lsrs r0, 31 @@ -523248,30 +523248,30 @@ _08111C06: lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - bne _08111C4A + bne @08111C4A strh r1, [r3, 0x32] ldrh r0, [r3, 0x2E] adds r0, 0x1 strh r0, [r3, 0x2E] - b _08111C4A -_08111C38: + b @08111C4A +@08111C38: cmp r6, 0 - beq _08111C44 + beq @08111C44 adds r0, r3, 0 bl move_anim_8072740 - b _08111C4A -_08111C44: + b @08111C4A +@08111C44: ldrh r0, [r3, 0x30] adds r0, 0x1 strh r0, [r3, 0x30] -_08111C4A: +@08111C4A: pop {r4-r6} pop {r0} bx r0 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 @@ -523287,13 +523287,13 @@ sub_8111C50: @ 8111C50 strh r0, [r5, 0x8] lsls r0, 16 cmp r0, 0 - bge _08111C80 + bge @08111C80 adds r0, r4, 0 bl move_anim_task_del - b _08111D5C + b @08111D5C .align 2, 0 .pool -_08111C80: +@08111C80: strh r1, [r5, 0xA] movs r0, 0xF strh r0, [r5, 0xC] @@ -523326,7 +523326,7 @@ _08111C80: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08111CF4 + bne @08111CF4 movs r0, 0x8 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -523342,10 +523342,10 @@ _08111C80: lsls r0, 2 adds r0, r4 movs r1, 0x70 - b _08111D12 + b @08111D12 .align 2, 0 .pool -_08111CF4: +@08111CF4: movs r0, 0x8 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -523361,7 +523361,7 @@ _08111CF4: lsls r0, 2 adds r0, r4 ldr r1, =0x0000ff90 -_08111D12: +@08111D12: strh r1, [r0, 0x32] ldr r4, =0x02020630 movs r0, 0x8 @@ -523398,7 +523398,7 @@ _08111D12: str r1, [r0] ldr r0, =sub_8111D78 + 1 str r0, [r5] -_08111D5C: +@08111D5C: pop {r4-r6} pop {r0} bx r0 @@ -523407,7 +523407,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 @@ -523419,19 +523419,19 @@ sub_8111D78: @ 8111D78 movs r1, 0x10 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _08111E1C + beq @08111E1C cmp r0, 0x1 - bgt _08111DA0 + bgt @08111DA0 cmp r0, 0 - beq _08111DA6 - b _08111E48 + beq @08111DA6 + b @08111E48 .align 2, 0 .pool -_08111DA0: +@08111DA0: cmp r0, 0x2 - beq _08111E42 - b _08111E48 -_08111DA6: + beq @08111E42 + b @08111E48 +@08111DA6: ldrh r1, [r4, 0xA] adds r1, 0x1 strh r1, [r4, 0xA] @@ -523439,27 +523439,27 @@ _08111DA6: ands r0, r1 strh r0, [r4, 0x12] cmp r0, 0x1 - bne _08111DC4 + bne @08111DC4 ldrh r1, [r4, 0xC] movs r2, 0xC ldrsh r0, [r4, r2] cmp r0, 0 - ble _08111DC4 + ble @08111DC4 subs r0, r1, 0x1 strh r0, [r4, 0xC] -_08111DC4: +@08111DC4: movs r1, 0x12 ldrsh r0, [r4, r1] cmp r0, 0x3 - bne _08111DDA + bne @08111DDA ldrh r1, [r4, 0xE] movs r2, 0xE ldrsh r0, [r4, r2] cmp r0, 0xF - bgt _08111DDA + bgt @08111DDA adds r0, r1, 0x1 strh r0, [r4, 0xE] -_08111DDA: +@08111DDA: ldrh r1, [r4, 0xE] lsls r1, 8 ldrh r0, [r4, 0xC] @@ -523472,11 +523472,11 @@ _08111DDA: movs r0, 0x80 lsls r0, 13 cmp r1, r0 - bne _08111E48 + bne @08111E48 movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0x50 - ble _08111E48 + ble @08111E48 movs r2, 0x8 ldrsh r1, [r4, r2] lsls r0, r1, 4 @@ -523487,17 +523487,17 @@ _08111DDA: bl obj_delete_but_dont_free_vram movs r0, 0x1 strh r0, [r4, 0x10] - b _08111E48 + b @08111E48 .align 2, 0 .pool -_08111E1C: +@08111E1C: ldrh r0, [r4, 0x14] adds r0, 0x1 strh r0, [r4, 0x14] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _08111E48 + ble @08111E48 movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -523507,18 +523507,18 @@ _08111E1C: ldrh r0, [r4, 0x10] adds r0, 0x1 strh r0, [r4, 0x10] - b _08111E48 -_08111E42: + b @08111E48 +@08111E42: adds r0, r2, 0 bl move_anim_task_del -_08111E48: +@08111E48: pop {r4} pop {r0} bx r0 thumb_func_end sub_8111D78 thumb_func_start sub_8111E50 -sub_8111E50: @ 8111E50 +sub_8111E50: ; 8111E50 push {lr} lsls r0, 24 lsrs r0, 24 @@ -523539,7 +523539,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} @@ -523559,24 +523559,24 @@ sub_8111E78: @ 8111E78 movs r1, 0x26 ldrsh r0, [r5, r1] cmp r0, 0x4 - bls _08111EA4 - b _081120C6 -_08111EA4: + bls @08111EA4 + b @081120C6 +@08111EA4: lsls r0, 2 - ldr r1, =_08111EBC + ldr r1, =@08111EBC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08111EBC: - .4byte _08111ED0 - .4byte _08111FD0 - .4byte _08112014 - .4byte _0811207C - .4byte _081120A8 -_08111ED0: +@08111EBC: + .4byte @08111ED0 + .4byte @08111FD0 + .4byte @08112014 + .4byte @0811207C + .4byte @081120A8 +@08111ED0: ldr r7, =0x00002771 adds r0, r7, 0 bl gpu_pal_alloc_new @@ -523586,24 +523586,24 @@ _08111ED0: mov r8, r2 strh r0, [r5, 0x24] cmp r0, 0xFF - beq _08111EFE + beq @08111EFE cmp r0, 0xF - beq _08111EFE + beq @08111EFE movs r0, 0x1 bl duplicate_obj_of_side_rel2move_in_transparent_mode strh r0, [r5, 0x8] lsls r0, 16 cmp r0, 0 - bge _08111F0C + bge @08111F0C adds r0, r7, 0 bl gpu_pal_free_tag -_08111EFE: +@08111EFE: adds r0, r4, 0 bl move_anim_task_del - b _081120CC + b @081120CC .align 2, 0 .pool -_08111F0C: +@08111F0C: ldr r4, =0x02020630 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -523685,20 +523685,20 @@ _08111F0C: lsls r0, 4 strh r0, [r5, 0x10] cmp r6, 0x1 - bne _08111FC4 + bne @08111FC4 movs r1, 0x80 lsls r1, 2 - b _08111FC8 + b @08111FC8 .align 2, 0 .pool -_08111FC4: +@08111FC4: movs r1, 0x80 lsls r1, 3 -_08111FC8: +@08111FC8: movs r0, 0 bl lcd_io_clear_bits - b _081120C6 -_08111FD0: + b @081120C6 +@08111FD0: movs r1, 0x24 ldrsh r0, [r5, r1] adds r0, 0x10 @@ -523721,10 +523721,10 @@ _08111FD0: movs r1, 0x10 movs r2, 0xA bl pal_fade_1 - b _081120C6 + b @081120C6 .align 2, 0 .pool -_08112014: +@08112014: ldr r2, =0x02020630 movs r0, 0x22 ldrsh r1, [r5, r0] @@ -523739,11 +523739,11 @@ _08112014: lsls r1, 16 lsrs r2, r1, 16 cmp r1, 0 - bge _08112034 + bge @08112034 movs r2, 0 -_08112034: +@08112034: cmp r6, 0x1 - bne _08112054 + bne @08112054 lsls r0, r2, 24 lsrs r0, 24 adds r1, r2, 0 @@ -523755,10 +523755,10 @@ _08112034: movs r2, 0x4 str r2, [sp, 0x4] str r6, [sp, 0x8] - b _0811206C + b @0811206C .align 2, 0 .pool -_08112054: +@08112054: lsls r0, r2, 24 lsrs r0, 24 adds r1, r2, 0 @@ -523771,56 +523771,56 @@ _08112054: str r2, [sp, 0x4] movs r2, 0x1 str r2, [sp, 0x8] -_0811206C: +@0811206C: movs r2, 0x2 movs r3, 0x6 bl sub_80BA384 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x1C] - b _081120C6 -_0811207C: + b @081120C6 +@0811207C: cmp r6, 0x1 - bne _08112090 + bne @08112090 ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set - b _08112098 + b @08112098 .align 2, 0 .pool -_08112090: +@08112090: ldr r1, =0x00003f44 movs r0, 0x50 bl lcd_io_set -_08112098: +@08112098: movs r1, 0x80 lsls r1, 5 movs r0, 0x52 bl lcd_io_set - b _081120C6 + b @081120C6 .align 2, 0 .pool -_081120A8: +@081120A8: cmp r6, 0x1 - bne _081120B8 + bne @081120B8 movs r1, 0x80 lsls r1, 2 movs r0, 0 bl lcd_io_set_bits - b _081120C2 -_081120B8: + b @081120C2 +@081120B8: movs r1, 0x80 lsls r1, 3 movs r0, 0 bl lcd_io_set_bits -_081120C2: +@081120C2: ldr r0, =sub_81120DC + 1 str r0, [r5] -_081120C6: +@081120C6: ldrh r0, [r5, 0x26] adds r0, 0x1 strh r0, [r5, 0x26] -_081120CC: +@081120CC: add sp, 0xC pop {r3} mov r8, r3 @@ -523832,7 +523832,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 @@ -523849,7 +523849,7 @@ sub_81120DC: @ 81120DC ands r0, r1 strh r0, [r4, 0x12] cmp r0, 0 - bne _08112114 + bne @08112114 ldr r1, =0x08329f40 movs r2, 0xA ldrsh r0, [r4, r2] @@ -523860,11 +523860,11 @@ sub_81120DC: @ 81120DC movs r1, 0x12 bl __divsi3 strh r0, [r4, 0xC] -_08112114: +@08112114: movs r2, 0x12 ldrsh r0, [r4, r2] cmp r0, 0x1 - bne _08112136 + bne @08112136 ldr r1, =0x08329f40 movs r2, 0xA ldrsh r0, [r4, r2] @@ -523877,7 +523877,7 @@ _08112114: movs r1, 0x10 subs r1, r0 strh r1, [r4, 0xE] -_08112136: +@08112136: ldrh r1, [r4, 0xE] lsls r1, 8 ldrh r0, [r4, 0xC] @@ -523889,14 +523889,14 @@ _08112136: movs r2, 0xA ldrsh r0, [r4, r2] cmp r0, 0x80 - bne _0811215E + bne @0811215E movs r0, 0 strh r0, [r4, 0x26] ldr r1, =sub_8112170 + 1 str r1, [r4] adds r0, r5, 0 bl _call_via_r1 -_0811215E: +@0811215E: pop {r4,r5} pop {r0} bx r0 @@ -523905,7 +523905,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 @@ -523922,19 +523922,19 @@ sub_8112170: @ 8112170 movs r1, 0x26 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _081121DC + beq @081121DC cmp r0, 0x1 - bgt _081121A8 + bgt @081121A8 cmp r0, 0 - beq _081121AE - b _08112258 + beq @081121AE + b @08112258 .align 2, 0 .pool -_081121A8: +@081121A8: cmp r0, 0x2 - beq _081121F0 - b _08112258 -_081121AE: + beq @081121F0 + b @08112258 +@081121AE: ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] @@ -523944,29 +523944,29 @@ _081121AE: lsrs r0, 24 strh r0, [r4, 0x24] cmp r6, 0x1 - bne _081121D0 + bne @081121D0 movs r1, 0x80 lsls r1, 2 - b _081121D4 + b @081121D4 .align 2, 0 .pool -_081121D0: +@081121D0: movs r1, 0x80 lsls r1, 3 -_081121D4: +@081121D4: movs r0, 0 bl lcd_io_clear_bits - b _08112258 -_081121DC: + b @08112258 +@081121DC: ldrh r0, [r4, 0x10] ldr r3, =0x00003c0d movs r1, 0x10 movs r2, 0 bl pal_fade_1 - b _08112258 + b @08112258 .align 2, 0 .pool -_081121F0: +@081121F0: ldr r3, =0x02020630 movs r0, 0x24 ldrsh r1, [r4, r0] @@ -523995,23 +523995,23 @@ _081121F0: movs r1, 0 bl lcd_io_set cmp r6, 0x1 - bne _08112248 + bne @08112248 movs r1, 0x80 lsls r1, 2 movs r0, 0 bl lcd_io_set_bits - b _08112252 + b @08112252 .align 2, 0 .pool -_08112248: +@08112248: movs r1, 0x80 lsls r1, 3 movs r0, 0 bl lcd_io_set_bits -_08112252: +@08112252: adds r0, r5, 0 bl move_anim_task_del -_08112258: +@08112258: ldrh r0, [r4, 0x26] adds r0, 0x1 strh r0, [r4, 0x26] @@ -524021,7 +524021,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 @@ -524032,7 +524032,7 @@ sub_8112264: @ 8112264 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _081122AC + bne @081122AC ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 @@ -524049,10 +524049,10 @@ sub_8112264: @ 8112264 adds r0, r2 lsrs r5, r0, 16 ldr r4, =0x02038437 - b _081122D0 + b @081122D0 .align 2, 0 .pool -_081122AC: +@081122AC: ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0 @@ -524069,7 +524069,7 @@ _081122AC: adds r0, r2 lsrs r5, r0, 16 ldr r4, =0x02038436 -_081122D0: +@081122D0: ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -524152,14 +524152,14 @@ _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] movs r1, 0x36 ldrsh r0, [r2, r1] cmp r0, 0 - beq _081123BC + beq @081123BC ldrh r0, [r2, 0x32] ldrh r4, [r2, 0x2E] adds r0, r4 @@ -524179,16 +524179,16 @@ sub_8112384: @ 8112384 lsls r0, 16 asrs r0, 16 cmp r0, 0 - bne _081123BC + bne @081123BC strh r0, [r2, 0x2E] -_081123BC: +@081123BC: pop {r4} pop {r0} bx r0 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 @@ -524238,29 +524238,29 @@ sub_81123C4: @ 81123C4 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _08112434 - b _08112530 -_08112434: + beq @08112434 + b @08112530 +@08112434: movs r4, 0 -_08112436: +@08112436: lsls r1, r4, 16 asrs r3, r1, 16 ldr r0, =0x02038436 ldrb r2, [r0] str r1, [sp, 0x10] cmp r3, r2 - beq _08112502 + beq @08112502 movs r0, 0x2 eors r2, r0 cmp r3, r2 - beq _08112502 + beq @08112502 lsls r0, r4, 24 lsrs r4, r0, 24 adds r0, r4, 0 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _08112502 + beq @08112502 ldr r6, [sp, 0x4] ldr r3, [sp, 0x8] lsls r0, r3, 16 @@ -524274,7 +524274,7 @@ _08112436: lsrs r0, 24 mov r8, r0 cmp r0, 0x40 - beq _08112502 + beq @08112502 adds r0, r4, 0 movs r1, 0x2 bl sub_80A5C6C @@ -524339,7 +524339,7 @@ _08112436: ldrh r0, [r2, 0x20] adds r0, 0x1 strh r0, [r2, 0x20] -_08112502: +@08112502: ldr r2, [sp, 0x10] movs r3, 0x80 lsls r3, 9 @@ -524347,11 +524347,11 @@ _08112502: lsrs r4, r0, 16 asrs r0, 16 cmp r0, 0x3 - ble _08112436 - b _081125B4 + ble @08112436 + b @081125B4 .align 2, 0 .pool -_08112530: +@08112530: ldr r0, =0x08596db8 ldr r7, [sp, 0x4] ldr r2, [sp, 0x8] @@ -524366,7 +524366,7 @@ _08112530: lsrs r0, 24 mov r8, r0 cmp r0, 0x40 - beq _081125B4 + beq @081125B4 movs r3, 0x30 mov r10, r3 movs r0, 0x28 @@ -524415,7 +524415,7 @@ _08112530: movs r0, 0x1 ldr r2, [sp] strh r0, [r2, 0x20] -_081125B4: +@081125B4: ldr r0, =sub_81125E0 + 1 ldr r3, [sp] str r0, [r3] @@ -524432,7 +524432,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 @@ -524444,36 +524444,36 @@ sub_81125E0: @ 81125E0 movs r0, 0x8 ldrsh r1, [r4, r0] cmp r1, 0x1 - beq _08112696 + beq @08112696 cmp r1, 0x1 - bgt _08112608 + bgt @08112608 cmp r1, 0 - beq _08112616 - b _08112752 + beq @08112616 + b @08112752 .align 2, 0 .pool -_08112608: +@08112608: cmp r1, 0x2 - bne _0811260E - b _08112728 -_0811260E: + bne @0811260E + b @08112728 +@0811260E: cmp r1, 0x3 - bne _08112614 - b _0811273C -_08112614: - b _08112752 -_08112616: + bne @08112614 + b @0811273C +@08112614: + b @08112752 +@08112616: movs r2, 0x14 ldrsh r0, [r4, r2] cmp r0, 0 - bne _0811267C + bne @0811267C ldrh r0, [r4, 0x12] adds r0, 0x1 strh r0, [r4, 0x12] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0811267C + ble @0811267C strh r1, [r4, 0x12] ldrh r0, [r4, 0x16] adds r0, 0x1 @@ -524481,24 +524481,24 @@ _08112616: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0811264C + beq @0811264C ldrh r1, [r4, 0x18] movs r2, 0x18 ldrsh r0, [r4, r2] cmp r0, 0xF - bgt _0811265A + bgt @0811265A adds r0, r1, 0x1 strh r0, [r4, 0x18] - b _0811265A -_0811264C: + b @0811265A +@0811264C: ldrh r1, [r4, 0x1A] movs r2, 0x1A ldrsh r0, [r4, r2] cmp r0, 0 - beq _0811265A + beq @0811265A subs r0, r1, 0x1 strh r0, [r4, 0x1A] -_0811265A: +@0811265A: ldrh r1, [r4, 0x1A] lsls r1, 8 ldrh r0, [r4, 0x18] @@ -524510,34 +524510,34 @@ _0811265A: movs r1, 0x16 ldrsh r0, [r4, r1] cmp r0, 0x17 - ble _0811267C + ble @0811267C movs r0, 0 strh r0, [r4, 0x16] movs r0, 0x1 strh r0, [r4, 0x14] -_0811267C: +@0811267C: ldrh r1, [r4, 0x1C] movs r2, 0x1C ldrsh r0, [r4, r2] cmp r0, 0 - beq _0811268C + beq @0811268C subs r0, r1, 0x1 strh r0, [r4, 0x1C] - b _08112752 -_0811268C: + b @08112752 +@0811268C: movs r1, 0x14 ldrsh r0, [r4, r1] cmp r0, 0 - beq _08112752 - b _08112734 -_08112696: + beq @08112752 + b @08112734 +@08112696: ldrh r0, [r4, 0x12] adds r0, 0x1 strh r0, [r4, 0x12] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _08112752 + ble @08112752 movs r0, 0 strh r0, [r4, 0x12] ldrh r0, [r4, 0x16] @@ -524546,24 +524546,24 @@ _08112696: ands r0, r1 lsls r0, 16 cmp r0, 0 - beq _081126C6 + beq @081126C6 ldrh r1, [r4, 0x18] movs r2, 0x18 ldrsh r0, [r4, r2] cmp r0, 0 - beq _081126D4 + beq @081126D4 subs r0, r1, 0x1 strh r0, [r4, 0x18] - b _081126D4 -_081126C6: + b @081126D4 +@081126C6: ldrh r1, [r4, 0x1A] movs r2, 0x1A ldrsh r0, [r4, r2] cmp r0, 0xF - bgt _081126D4 + bgt @081126D4 adds r0, r1, 0x1 strh r0, [r4, 0x1A] -_081126D4: +@081126D4: ldrh r1, [r4, 0x1A] lsls r1, 8 ldrh r0, [r4, 0x18] @@ -524576,10 +524576,10 @@ _081126D4: movs r0, 0x80 lsls r0, 13 cmp r1, r0 - bne _08112752 + bne @08112752 movs r5, 0 - b _08112718 -_081126F4: + b @08112718 +@081126F4: adds r1, r5, 0 adds r1, 0xD lsls r1, 1 @@ -524597,27 +524597,27 @@ _081126F4: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 -_08112718: +@08112718: movs r1, 0x20 ldrsh r0, [r4, r1] cmp r5, r0 - blt _081126F4 - b _08112734 + blt @081126F4 + b @08112734 .align 2, 0 .pool -_08112728: +@08112728: ldrh r0, [r4, 0x12] adds r0, 0x1 strh r0, [r4, 0x12] lsls r0, 16 cmp r0, 0 - ble _08112752 -_08112734: + ble @08112752 +@08112734: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _08112752 -_0811273C: + b @08112752 +@0811273C: movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -524626,14 +524626,14 @@ _0811273C: bl lcd_io_set adds r0, r5, 0 bl move_anim_task_del -_08112752: +@08112752: pop {r4,r5} pop {r0} bx r0 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 @@ -524659,19 +524659,19 @@ sub_8112758: @ 8112758 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _081127A0 + bne @081127A0 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _081127B8 -_081127A0: + beq @081127B8 +@081127A0: movs r6, 0x28 - b _081127BA + b @081127BA .align 2, 0 .pool -_081127B8: +@081127B8: movs r6, 0xC8 -_081127BA: +@081127BA: ldr r1, =0x02022e24 lsls r3, r6, 16 asrs r2, r3, 16 @@ -524707,7 +524707,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 @@ -524736,9 +524736,9 @@ sub_811280C: @ 811280C lsls r1, 16 asrs r6, r1, 16 cmp r6, 0xF - ble _08112848 - b _08112938 -_08112848: + ble @08112848 + b @08112938 +@08112848: lsls r0, 16 asrs r0, 16 bl __floatsidf @@ -524829,10 +524829,10 @@ _08112848: bl __fixunsdfsi lsls r0, 16 lsrs r5, r0, 16 - b _08112966 + b @08112966 .align 2, 0 .pool -_08112938: +@08112938: movs r2, 0 mov r9, r2 movs r7, 0xF0 @@ -524854,7 +524854,7 @@ _08112938: bl sub_80A1AD4 ldr r0, =sub_8112994 + 1 str r0, [r4] -_08112966: +@08112966: ldr r1, =0x02022e24 mov r2, r9 lsls r0, r2, 8 @@ -524877,7 +524877,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 @@ -524888,7 +524888,7 @@ sub_8112994: @ 8112994 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _081129DA + bne @081129DA ldr r0, =0x02022e24 strh r1, [r0] ldr r0, =0x02022e26 @@ -524908,7 +524908,7 @@ sub_8112994: @ 8112994 bl lcd_io_set adds r0, r5, 0 bl move_anim_task_del -_081129DA: +@081129DA: pop {r4,r5} pop {r0} bx r0 @@ -524917,7 +524917,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 @@ -524927,7 +524927,7 @@ sub_81129F0: @ 81129F0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08112A24 + bne @08112A24 movs r2, 0x18 ldr r3, =0x0000fffe ldrb r0, [r4, 0x3] @@ -524937,13 +524937,13 @@ sub_81129F0: @ 81129F0 movs r0, 0x10 orrs r1, r0 strb r1, [r4, 0x3] - b _08112A28 + b @08112A28 .align 2, 0 .pool -_08112A24: +@08112A24: ldr r2, =0x0000ffe8 movs r3, 0x2 -_08112A28: +@08112A28: lsls r0, r2, 16 asrs r0, 16 ldrh r1, [r4, 0x20] @@ -524962,17 +524962,17 @@ _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] movs r2, 0x2E ldrsh r0, [r3, r2] cmp r0, 0 - ble _08112A5E + ble @08112A5E subs r0, r1, 0x1 - b _08112AC2 -_08112A5E: + b @08112AC2 +@08112A5E: ldrh r0, [r3, 0x30] ldrh r4, [r3, 0x24] adds r1, r0, r4 @@ -524981,7 +524981,7 @@ _08112A5E: lsls r0, 16 lsrs r0, 16 cmp r0, 0xE - bls _08112AC4 + bls @08112AC4 ldrh r0, [r3, 0x20] adds r0, r1 strh r0, [r3, 0x20] @@ -525004,7 +525004,7 @@ _08112A5E: lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - bne _08112AC0 + bne @08112AC0 movs r0, 0x1E strh r0, [r3, 0x2E] ldr r0, =sub_80A64B0 + 1 @@ -525012,27 +525012,27 @@ _08112A5E: ldr r1, =sub_8112ACC + 1 adds r0, r3, 0 bl oamt_set_x3A_32 - b _08112AC4 + b @08112AC4 .align 2, 0 .pool -_08112AC0: +@08112AC0: movs r0, 0x28 -_08112AC2: +@08112AC2: strh r0, [r3, 0x2E] -_08112AC4: +@08112AC4: pop {r4} pop {r0} bx r0 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 ldrsh r5, [r4, r0] cmp r5, 0 - bne _08112AF6 + bne @08112AF6 movs r1, 0xFD lsls r1, 6 movs r0, 0x50 @@ -525045,17 +525045,17 @@ sub_8112ACC: @ 8112ACC strh r0, [r4, 0x2E] strh r5, [r4, 0x30] strh r5, [r4, 0x32] - b _08112B3A -_08112AF6: + b @08112B3A +@08112AF6: ldrh r1, [r4, 0x30] movs r2, 0x30 ldrsh r0, [r4, r2] cmp r0, 0x1 - bgt _08112B06 + bgt @08112B06 adds r0, r1, 0x1 strh r0, [r4, 0x30] - b _08112B3A -_08112B06: + b @08112B3A +@08112B06: movs r0, 0 strh r0, [r4, 0x30] ldrh r0, [r4, 0x32] @@ -525072,7 +525072,7 @@ _08112B06: movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0x10 - bne _08112B3A + bne @08112B3A adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -525081,7 +525081,7 @@ _08112B06: strb r0, [r2] ldr r0, =sub_8112B44 + 1 str r0, [r4, 0x1C] -_08112B3A: +@08112B3A: pop {r4,r5} pop {r0} bx r0 @@ -525090,7 +525090,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 @@ -525114,7 +525114,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 @@ -525127,11 +525127,11 @@ sub_8112B78: @ 8112B78 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08112B9C + beq @08112B9C ldrh r0, [r5, 0x24] negs r0, r0 strh r0, [r5, 0x24] -_08112B9C: +@08112B9C: ldrh r0, [r5, 0x2E] adds r0, 0x6 movs r1, 0xFF @@ -525153,7 +525153,7 @@ _08112B9C: lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - bne _08112BE8 + bne @08112BE8 ldr r0, =0x0000050b strh r0, [r5, 0x3A] movs r1, 0xFD @@ -525163,12 +525163,12 @@ _08112B9C: ldrh r1, [r5, 0x3A] movs r0, 0x52 bl lcd_io_set - b _08112C40 + b @08112C40 .align 2, 0 .pool -_08112BE8: +@08112BE8: cmp r0, 0x1E - ble _08112C40 + ble @08112C40 ldrh r0, [r5, 0x32] adds r0, 0x1 strh r0, [r5, 0x32] @@ -525183,16 +525183,16 @@ _08112BE8: adds r0, r1 lsrs r7, r0, 16 cmp r7, 0x10 - bls _08112C0C + bls @08112C0C movs r7, 0x10 -_08112C0C: +@08112C0C: subs r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r0, 0 - bge _08112C18 + bge @08112C18 movs r6, 0 -_08112C18: +@08112C18: lsls r4, r7, 8 orrs r4, r6 lsls r1, r4, 16 @@ -525201,9 +525201,9 @@ _08112C18: bl lcd_io_set strh r4, [r5, 0x3A] cmp r7, 0x10 - bne _08112C40 + bne @08112C40 cmp r6, 0 - bne _08112C40 + bne @08112C40 adds r2, r5, 0 adds r2, 0x3E ldrb r0, [r2] @@ -525212,7 +525212,7 @@ _08112C18: strb r0, [r2] ldr r0, =sub_8112C4C + 1 str r0, [r5, 0x1C] -_08112C40: +@08112C40: pop {r4-r7} pop {r0} bx r0 @@ -525221,7 +525221,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 @@ -525238,7 +525238,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} @@ -525313,7 +525313,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 @@ -525325,27 +525325,27 @@ sub_8112D10: @ 8112D10 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x5 - bls _08112D2A - b _08112E96 -_08112D2A: + bls @08112D2A + b @08112E96 +@08112D2A: lsls r0, 2 - ldr r1, =_08112D3C + ldr r1, =@08112D3C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08112D3C: - .4byte _08112D54 - .4byte _08112DC4 - .4byte _08112E06 - .4byte _08112E1A - .4byte _08112E70 - .4byte _08112E80 -_08112D54: +@08112D3C: + .4byte @08112D54 + .4byte @08112DC4 + .4byte @08112E06 + .4byte @08112E1A + .4byte @08112E70 + .4byte @08112E80 +@08112D54: movs r6, 0 -_08112D56: +@08112D56: movs r2, 0x1A ldrsh r1, [r4, r2] movs r0, 0x1C @@ -525356,7 +525356,7 @@ _08112D56: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq _08112DAA + beq @08112DAA ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -525369,9 +525369,9 @@ _08112D56: movs r1, 0 lsls r0, 24 cmp r0, 0 - bne _08112D8C + bne @08112D8C movs r1, 0x1 -_08112D8C: +@08112D8C: strh r1, [r5, 0x30] movs r0, 0x2A muls r0, r6 @@ -525387,120 +525387,120 @@ _08112D8C: ldrh r0, [r4, 0x16] adds r0, 0x1 strh r0, [r4, 0x16] -_08112DAA: +@08112DAA: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x5 - bls _08112D56 - b _08112E78 + bls @08112D56 + b @08112E78 .align 2, 0 .pool -_08112DC4: +@08112DC4: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08112DE2 + beq @08112DE2 ldrh r1, [r4, 0xE] movs r2, 0xE ldrsh r0, [r4, r2] cmp r0, 0xD - bgt _08112DF0 + bgt @08112DF0 adds r0, r1, 0x1 strh r0, [r4, 0xE] - b _08112DF0 -_08112DE2: + b @08112DF0 +@08112DE2: ldrh r1, [r4, 0x10] movs r2, 0x10 ldrsh r0, [r4, r2] cmp r0, 0x4 - ble _08112DF0 + ble @08112DF0 subs r0, r1, 0x1 strh r0, [r4, 0x10] -_08112DF0: +@08112DF0: movs r1, 0xE ldrsh r0, [r4, r1] ldrh r2, [r4, 0xE] ldrh r1, [r4, 0x10] cmp r0, 0xE - bne _08112E60 + bne @08112E60 cmp r1, 0x4 - bne _08112E60 + bne @08112E60 movs r0, 0 strh r0, [r4, 0xA] - b _08112E5A -_08112E06: + b @08112E5A +@08112E06: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x1E - ble _08112E96 + ble @08112E96 movs r0, 0 strh r0, [r4, 0xA] - b _08112E78 -_08112E1A: + b @08112E78 +@08112E1A: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08112E38 + beq @08112E38 ldrh r1, [r4, 0xE] movs r2, 0xE ldrsh r0, [r4, r2] cmp r0, 0 - ble _08112E46 + ble @08112E46 subs r0, r1, 0x1 strh r0, [r4, 0xE] - b _08112E46 -_08112E38: + b @08112E46 +@08112E38: ldrh r1, [r4, 0x10] movs r2, 0x10 ldrsh r0, [r4, r2] cmp r0, 0xF - bgt _08112E46 + bgt @08112E46 adds r0, r1, 0x1 strh r0, [r4, 0x10] -_08112E46: +@08112E46: movs r1, 0xE ldrsh r0, [r4, r1] ldrh r2, [r4, 0xE] ldrh r1, [r4, 0x10] cmp r0, 0 - bne _08112E60 + bne @08112E60 cmp r1, 0x10 - bne _08112E60 + bne @08112E60 movs r0, 0x1 strh r0, [r4, 0x18] -_08112E5A: +@08112E5A: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_08112E60: +@08112E60: lsls r1, 8 orrs r1, r2 lsls r1, 16 lsrs r1, 16 movs r0, 0x52 bl lcd_io_set - b _08112E96 -_08112E70: + b @08112E96 +@08112E70: movs r2, 0x16 ldrsh r0, [r4, r2] cmp r0, 0 - bne _08112E96 -_08112E78: + bne @08112E96 +@08112E78: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _08112E96 -_08112E80: + b @08112E96 +@08112E80: movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -525509,27 +525509,27 @@ _08112E80: bl lcd_io_set adds r0, r7, 0 bl move_anim_task_del -_08112E96: +@08112E96: pop {r4-r7} pop {r0} bx r0 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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08112EAE + bne @08112EAE ldrh r0, [r4, 0x32] adds r0, 0x2 - b _08112EB2 -_08112EAE: + b @08112EB2 +@08112EAE: ldrh r0, [r4, 0x32] subs r0, 0x2 -_08112EB2: +@08112EB2: strh r0, [r4, 0x32] ldrh r1, [r4, 0x32] movs r0, 0xFF @@ -525546,7 +525546,7 @@ _08112EB2: lsls r0, 16 lsrs r0, 16 cmp r0, 0x7E - bhi _08112EF4 + bhi @08112EF4 ldr r2, =0x03005e00 movs r0, 0x2E ldrsh r1, [r4, r0] @@ -525558,10 +525558,10 @@ _08112EB2: adds r1, 0x1 movs r0, 0x3 ands r1, r0 - b _08112F08 + b @08112F08 .align 2, 0 .pool -_08112EF4: +@08112EF4: ldr r2, =0x03005e00 movs r0, 0x2E ldrsh r1, [r4, r0] @@ -525572,7 +525572,7 @@ _08112EF4: movs r2, 0x3 ldrb r1, [r0, 0x12] ands r1, r2 -_08112F08: +@08112F08: lsls r1, 2 ldrb r2, [r4, 0x5] movs r0, 0xD @@ -525604,13 +525604,13 @@ _08112F08: movs r2, 0x18 ldrsh r0, [r1, r2] cmp r0, 0 - beq _08112F56 + beq @08112F56 ldrh r0, [r1, 0x16] subs r0, 0x1 strh r0, [r1, 0x16] adds r0, r4, 0 bl obj_delete_and_free_tiles -_08112F56: +@08112F56: pop {r4} pop {r0} bx r0 @@ -525619,7 +525619,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] @@ -525659,14 +525659,14 @@ 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] movs r1, 0x34 ldrsh r3, [r5, r1] cmp r3, 0 - beq _08113020 + beq @08113020 subs r0, 0x1 strh r0, [r5, 0x34] movs r2, 0x2E @@ -525701,14 +525701,14 @@ sub_8112FB8: @ 8112FB8 lsls r0, r1, 16 asrs r0, 16 cmp r0, 0xFF - ble _08113054 + ble @08113054 ldr r2, =0xffffff00 adds r0, r1, r2 strh r0, [r5, 0x2E] - b _08113054 + b @08113054 .align 2, 0 .pool -_08113020: +@08113020: ldr r2, =0x02020630 movs r0, 0x38 ldrsh r1, [r5, r0] @@ -525735,7 +525735,7 @@ _08113020: strh r1, [r0, 0x22] ldr r0, =move_anim_8074EE0 + 1 str r0, [r5, 0x1C] -_08113054: +@08113054: pop {r4,r5} pop {r0} bx r0 @@ -525744,7 +525744,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 @@ -525764,7 +525764,7 @@ sub_8113064: @ 8113064 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _081130B4 + beq @081130B4 ldr r2, =0x0203841e ldrh r0, [r5, 0x20] ldrh r1, [r2] @@ -525777,16 +525777,16 @@ sub_8113064: @ 8113064 negs r0, r0 strh r0, [r2, 0x8] adds r1, r2, 0 - b _081130BE + b @081130BE .align 2, 0 .pool -_081130B4: +@081130B4: ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r5, 0x20] adds r0, r2 strh r0, [r5, 0x20] -_081130BE: +@081130BE: ldrh r0, [r1, 0x2] ldrh r2, [r5, 0x22] adds r0, r2 @@ -525818,7 +525818,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 @@ -525840,7 +525840,7 @@ sub_8113100: @ 8113100 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08113164 + beq @08113164 ldr r2, =0x0203841e ldrh r0, [r5, 0x20] ldrh r1, [r2, 0x2] @@ -525857,10 +525857,10 @@ sub_8113100: @ 8113100 ldrh r1, [r5, 0x36] adds r0, r1 strh r0, [r5, 0x36] - b _0811318E + b @0811318E .align 2, 0 .pool -_08113164: +@08113164: ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r5, 0x20] @@ -525881,7 +525881,7 @@ _08113164: adds r0, r5, 0 movs r1, 0x1 bl obj_anim_image_start -_0811318E: +@0811318E: ldr r0, =0x0203841e ldrh r0, [r0, 0x8] strh r0, [r5, 0x2E] @@ -525898,21 +525898,21 @@ _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 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _081131D0 + bne @081131D0 ldr r4, =0x02038436 - b _081131D2 + b @081131D2 .align 2, 0 .pool -_081131D0: +@081131D0: ldr r4, =0x02038437 -_081131D2: +@081131D2: ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -525947,7 +525947,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 @@ -525955,11 +525955,11 @@ sub_8113224: @ 8113224 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0811323E + beq @0811323E adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 -_0811323E: +@0811323E: adds r0, r4, 0 bl sub_8113100 pop {r4} @@ -525970,7 +525970,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 @@ -526005,14 +526005,14 @@ sub_8113250: @ 8113250 lsls r1, r0, 16 lsrs r0, r1, 16 cmp r5, r0 - bls _081132B0 + bls @081132B0 lsrs r0, r7, 17 - b _081132B2 + b @081132B2 .align 2, 0 .pool -_081132B0: +@081132B0: lsrs r0, r1, 17 -_081132B2: +@081132B2: strh r0, [r6, 0x3C] movs r1, 0x3A ldrsh r0, [r6, r1] @@ -526036,17 +526036,17 @@ _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 ldrsh r5, [r4, r0] cmp r5, 0 - beq _081132F2 + beq @081132F2 cmp r5, 0x1 - beq _0811335E - b _081133E2 -_081132F2: + beq @0811335E + b @081133E2 +@081132F2: ldrh r0, [r4, 0x3A] ldrh r1, [r4, 0x38] subs r0, r1 @@ -526071,36 +526071,36 @@ _081132F2: lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - ble _08113344 + ble @08113344 strh r5, [r4, 0x36] ldrh r1, [r4, 0x38] movs r2, 0x38 ldrsh r0, [r4, r2] cmp r0, 0xF - bgt _08113344 + bgt @08113344 adds r0, r1, 0x1 strh r0, [r4, 0x38] lsls r0, 16 asrs r0, 16 cmp r0, 0xF - ble _08113344 + ble @08113344 movs r0, 0x10 strh r0, [r4, 0x38] -_08113344: +@08113344: ldrh r0, [r4, 0x34] adds r0, 0x1 strh r0, [r4, 0x34] lsls r0, 16 asrs r0, 16 cmp r0, 0x3C - ble _081133E2 + ble @081133E2 movs r0, 0 strh r0, [r4, 0x34] ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _081133E2 -_0811335E: + b @081133E2 +@0811335E: ldrh r0, [r4, 0x3A] ldrh r1, [r4, 0x38] subs r0, r1 @@ -526111,17 +526111,17 @@ _0811335E: movs r2, 0x3C ldrsh r0, [r4, r2] cmp r0, 0x95 - bgt _08113386 + bgt @08113386 adds r0, r1, 0 adds r0, 0x8 strh r0, [r4, 0x3C] lsls r0, 16 asrs r0, 16 cmp r0, 0x95 - ble _08113386 + ble @08113386 movs r0, 0x96 strh r0, [r4, 0x3C] -_08113386: +@08113386: movs r1, 0x3A ldrsh r0, [r4, r1] movs r2, 0x3C @@ -526140,40 +526140,40 @@ _08113386: lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - ble _081133CE + ble @081133CE movs r0, 0 strh r0, [r4, 0x36] ldrh r1, [r4, 0x38] movs r2, 0x38 ldrsh r0, [r4, r2] cmp r0, 0xF - bgt _081133CE + bgt @081133CE adds r0, r1, 0x1 strh r0, [r4, 0x38] lsls r0, 16 asrs r0, 16 cmp r0, 0xF - ble _081133CE + ble @081133CE movs r0, 0x10 strh r0, [r4, 0x38] -_081133CE: +@081133CE: ldrh r0, [r4, 0x34] adds r0, 0x1 strh r0, [r4, 0x34] lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - ble _081133E2 + ble @081133E2 adds r0, r4, 0 bl move_anim_8072740 -_081133E2: +@081133E2: pop {r4,r5} pop {r0} bx r0 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 @@ -526189,18 +526189,18 @@ sub_81133E8: @ 81133E8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08113424 + bne @08113424 ldr r0, =0x04000014 str r0, [sp] ldr r0, =0x02022e18 - b _0811342A + b @0811342A .align 2, 0 .pool -_08113424: +@08113424: ldr r0, =0x04000018 str r0, [sp] ldr r0, =0x02022e1c -_0811342A: +@0811342A: ldrh r0, [r0] strh r0, [r4, 0xC] ldr r0, =0xa2600001 @@ -526222,19 +526222,19 @@ _0811342A: adds r0, 0x20 strh r0, [r4, 0x10] cmp r1, 0 - bge _0811345A + bge @0811345A strh r5, [r4, 0xE] -_0811345A: +@0811345A: ldrh r3, [r4, 0xE] movs r1, 0x10 ldrsh r0, [r4, r1] cmp r3, r0 - bgt _08113488 + bgt @08113488 ldr r5, =0x02038c28 movs r0, 0xF0 lsls r0, 3 adds r6, r5, r0 -_0811346C: +@0811346C: lsls r1, r3, 1 adds r2, r1, r5 ldrh r0, [r4, 0xC] @@ -526248,8 +526248,8 @@ _0811346C: movs r1, 0x10 ldrsh r0, [r4, r1] cmp r3, r0 - ble _0811346C -_08113488: + ble @0811346C +@08113488: ldr r0, [sp] ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] @@ -526265,7 +526265,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 @@ -526277,29 +526277,29 @@ sub_81134B8: @ 81134B8 movs r1, 0x8 ldrsh r0, [r2, r1] cmp r0, 0x4 - bhi _0811356E + bhi @0811356E lsls r0, 2 - ldr r1, =_081134E4 + ldr r1, =@081134E4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081134E4: - .4byte _081134F8 - .4byte _0811351A - .4byte _0811352A - .4byte _08113556 - .4byte _08113568 -_081134F8: +@081134E4: + .4byte @081134F8 + .4byte @0811351A + .4byte @0811352A + .4byte @08113556 + .4byte @08113568 +@081134F8: ldrh r0, [r2, 0x16] adds r0, 0x1 strh r0, [r2, 0x16] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0811354E + ble @0811354E movs r0, 0 strh r0, [r2, 0x16] ldrh r0, [r2, 0x14] @@ -526308,25 +526308,25 @@ _081134F8: lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - bne _0811354E - b _08113548 -_0811351A: + bne @0811354E + b @08113548 +@0811351A: ldrh r0, [r2, 0xA] adds r0, 0x1 strh r0, [r2, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x3C - ble _0811354E - b _08113548 -_0811352A: + ble @0811354E + b @08113548 +@0811352A: ldrh r0, [r2, 0x16] adds r0, 0x1 strh r0, [r2, 0x16] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0811354E + ble @0811354E movs r0, 0 strh r0, [r2, 0x16] ldrh r0, [r2, 0x14] @@ -526334,35 +526334,35 @@ _0811352A: strh r0, [r2, 0x14] lsls r0, 16 cmp r0, 0 - bne _0811354E -_08113548: + bne @0811354E +@08113548: ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] -_0811354E: +@0811354E: adds r0, r2, 0 bl sub_8113574 - b _0811356E -_08113556: + b @0811356E +@08113556: ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] - b _0811356E + b @0811356E .align 2, 0 .pool -_08113568: +@08113568: adds r0, r3, 0 bl move_anim_task_del -_0811356E: +@0811356E: pop {r0} bx r0 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} @@ -526372,13 +526372,13 @@ sub_8113574: @ 8113574 movs r1, 0x10 ldrsh r0, [r5, r1] cmp r4, r0 - bgt _081135CA + bgt @081135CA ldr r7, =0x02038c28 mov r12, r7 ldr r0, =0x08329f40 mov r8, r0 ldr r6, =0x02039b28 -_08113592: +@08113592: lsls r2, r4, 1 ldrb r1, [r6, 0x14] lsls r0, r1, 4 @@ -526406,8 +526406,8 @@ _08113592: movs r7, 0x10 ldrsh r0, [r5, r7] cmp r4, r0 - ble _08113592 -_081135CA: + ble @08113592 +@081135CA: ldrh r0, [r5, 0x12] adds r0, 0x9 movs r1, 0xFF @@ -526423,7 +526423,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} @@ -526487,14 +526487,14 @@ sub_81135EC: @ 81135EC adds r4, 0x2E ldr r2, =0x0203a100 movs r1, 0x6 -_08113674: +@08113674: ldrh r0, [r4] strh r0, [r2] adds r4, 0x2 adds r2, 0x2 subs r1, 0x1 cmp r1, 0 - bge _08113674 + bge @08113674 pop {r3} mov r8, r3 pop {r4-r6} @@ -526505,7 +526505,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] @@ -526534,17 +526534,17 @@ sub_811369C: @ 811369C movs r2, 0x34 ldrsh r1, [r4, r2] cmp r0, r1 - ble _081136E0 + ble @081136E0 adds r0, r4, 0 bl move_anim_8072740 -_081136E0: +@081136E0: pop {r4} pop {r0} bx r0 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 @@ -526567,18 +526567,18 @@ sub_81136E8: @ 81136E8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08113734 + bne @08113734 ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set - b _0811373C + b @0811373C .align 2, 0 .pool -_08113734: +@08113734: ldr r1, =0x00003f44 movs r0, 0x50 bl lcd_io_set -_0811373C: +@0811373C: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -526594,7 +526594,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 @@ -526611,7 +526611,7 @@ sub_811375C: @ 811375C ldrsh r0, [r6, r2] ldrb r2, [r6, 0x8] cmp r0, r2 - bne _081137D8 + bne @081137D8 adds r4, 0x1 lsls r4, 24 lsrs r4, 24 @@ -526627,7 +526627,7 @@ sub_811375C: @ 811375C bl lcd_io_set strh r5, [r6, 0xC] cmp r4, 0x10 - bne _081137DE + bne @081137DE ldr r2, =0x02020630 ldr r1, =0x020241e4 ldr r0, =0x02038436 @@ -526645,21 +526645,21 @@ sub_811375C: @ 811375C strb r1, [r0] adds r0, r7, 0 bl move_anim_task_del - b _081137DE + b @081137DE .align 2, 0 .pool -_081137D8: +@081137D8: ldrh r0, [r6, 0xC] adds r0, 0x1 strh r0, [r6, 0xC] -_081137DE: +@081137DE: pop {r4-r7} pop {r0} bx r0 thumb_func_end sub_811375C thumb_func_start sub_81137E4 -sub_81137E4: @ 81137E4 +sub_81137E4: ; 81137E4 push {lr} lsls r0, 24 lsrs r0, 24 @@ -526685,7 +526685,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 @@ -526702,7 +526702,7 @@ sub_811381C: @ 811381C ldrsh r0, [r6, r2] ldrb r2, [r6, 0x8] cmp r0, r2 - bne _0811387C + bne @0811387C subs r4, 0x1 lsls r4, 24 lsrs r4, 24 @@ -526718,7 +526718,7 @@ sub_811381C: @ 811381C bl lcd_io_set strh r5, [r6, 0xC] cmp r4, 0 - bne _08113882 + bne @08113882 movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -526727,21 +526727,21 @@ sub_811381C: @ 811381C bl lcd_io_set adds r0, r7, 0 bl move_anim_task_del - b _08113882 + b @08113882 .align 2, 0 .pool -_0811387C: +@0811387C: ldrh r0, [r6, 0xC] adds r0, 0x1 strh r0, [r6, 0xC] -_08113882: +@08113882: pop {r4-r7} pop {r0} bx r0 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 @@ -526755,18 +526755,18 @@ sub_8113888: @ 8113888 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081138BC + bne @081138BC ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set - b _081138C4 + b @081138C4 .align 2, 0 .pool -_081138BC: +@081138BC: ldr r1, =0x00003f44 movs r0, 0x50 bl lcd_io_set -_081138C4: +@081138C4: adds r0, r4, 0 bl move_anim_task_del pop {r4} @@ -526777,7 +526777,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 @@ -526830,7 +526830,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] @@ -526850,7 +526850,7 @@ sub_8113950: @ 8113950 movs r6, 0x3C ldrsh r0, [r4, r6] cmp r0, 0 - bne _08113992 + bne @08113992 adds r0, r2, r5 strh r0, [r4, 0x34] adds r1, r3 @@ -526864,7 +526864,7 @@ sub_8113950: @ 8113950 ldrh r0, [r4, 0x2E] subs r0, 0x1 strh r0, [r4, 0x2E] -_08113992: +@08113992: movs r1, 0x38 ldrsh r0, [r4, r1] movs r2, 0x3A @@ -526879,7 +526879,7 @@ _08113992: ands r0, r1 strh r0, [r4, 0x38] cmp r0, 0x7F - ble _081139C2 + ble @081139C2 movs r0, 0 strh r0, [r4, 0x38] ldrh r0, [r4, 0x3A] @@ -526888,23 +526888,23 @@ _08113992: ldrh r0, [r4, 0x3C] adds r0, 0x1 strh r0, [r4, 0x3C] -_081139C2: +@081139C2: ldrh r0, [r4, 0x2E] subs r0, 0x1 strh r0, [r4, 0x2E] lsls r0, 16 cmp r0, 0 - bne _081139D4 + bne @081139D4 adds r0, r4, 0 bl move_anim_8072740 -_081139D4: +@081139D4: pop {r4-r6} pop {r0} bx r0 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 @@ -526935,7 +526935,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] @@ -526960,10 +526960,10 @@ sub_8113A18: @ 8113A18 movs r3, 0x32 ldrsh r1, [r2, r3] cmp r0, r1 - bne _08113A4E + bne @08113A4E ldr r0, =sub_8113A58 + 1 str r0, [r2, 0x1C] -_08113A4E: +@08113A4E: pop {r0} bx r0 .align 2, 0 @@ -526971,7 +526971,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] @@ -526993,16 +526993,16 @@ sub_8113A58: @ 8113A58 strh r0, [r3, 0x34] lsls r0, 16 cmp r0, 0 - bne _08113A8A + bne @08113A8A adds r0, r3, 0 bl move_anim_8074EE0 -_08113A8A: +@08113A8A: pop {r0} bx r0 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 @@ -527010,14 +527010,14 @@ sub_8113A90: @ 8113A90 ldrsh r1, [r0, r2] adds r3, r0, 0 cmp r1, 0 - bne _08113AAC + bne @08113AAC ldr r0, =0x02038436 - b _08113AAE + b @08113AAE .align 2, 0 .pool -_08113AAC: +@08113AAC: ldr r0, =0x02038437 -_08113AAE: +@08113AAE: ldrb r5, [r0] movs r6, 0x14 ldrh r2, [r4, 0x4] @@ -527034,21 +527034,21 @@ _08113AAE: movs r1, 0x2 ldrsh r0, [r3, r1] cmp r0, 0x1 - beq _08113B0C + beq @08113B0C cmp r0, 0x1 - bgt _08113AE8 + bgt @08113AE8 cmp r0, 0 - beq _08113AF2 - b _08113B60 + beq @08113AF2 + b @08113B60 .align 2, 0 .pool -_08113AE8: +@08113AE8: cmp r0, 0x2 - beq _08113B26 + beq @08113B26 cmp r0, 0x3 - beq _08113B3E - b _08113B60 -_08113AF2: + beq @08113B3E + b @08113B60 +@08113AF2: adds r0, r5, 0 movs r1, 0x5 bl sub_80A861C @@ -527059,8 +527059,8 @@ _08113AF2: bl sub_80A861C adds r0, 0x8 strh r0, [r4, 0x22] - b _08113B60 -_08113B0C: + b @08113B60 +@08113B0C: adds r0, r5, 0 movs r1, 0x5 bl sub_80A861C @@ -527071,8 +527071,8 @@ _08113B0C: bl sub_80A861C adds r0, 0x10 strh r0, [r4, 0x22] - b _08113B60 -_08113B26: + b @08113B60 +@08113B26: adds r0, r5, 0 movs r1, 0x4 bl sub_80A861C @@ -527082,8 +527082,8 @@ _08113B26: movs r1, 0x2 bl sub_80A861C adds r0, 0x8 - b _08113B54 -_08113B3E: + b @08113B54 +@08113B3E: adds r0, r5, 0 movs r1, 0x4 bl sub_80A861C @@ -527093,13 +527093,13 @@ _08113B3E: movs r1, 0x2 bl sub_80A861C adds r0, 0x10 -_08113B54: +@08113B54: strh r0, [r4, 0x22] adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 movs r6, 0xEC -_08113B60: +@08113B60: movs r0, 0x20 strh r0, [r4, 0x2E] lsls r0, r6, 24 @@ -527124,23 +527124,23 @@ _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 lsls r0, 24 cmp r0, 0 - beq _08113BA4 + beq @08113BA4 adds r0, r4, 0 bl move_anim_8074EE0 -_08113BA4: +@08113BA4: pop {r4} pop {r0} bx r0 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 @@ -527184,14 +527184,14 @@ sub_8113BAC: @ 8113BAC bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08113C1C + bne @08113C1C ldr r0, =0x0000fff4 - b _08113C1E + b @08113C1E .align 2, 0 .pool -_08113C1C: +@08113C1C: ldr r0, =0x0000ffc0 -_08113C1E: +@08113C1E: strh r0, [r5, 0x18] ldr r0, =0x02038436 ldrb r0, [r0] @@ -527200,7 +527200,7 @@ _08113C1E: lsrs r0, 24 strh r0, [r5, 0xE] cmp r0, 0x1 - bne _08113C80 + bne @08113C80 add r4, sp, 0xC adds r0, r4, 0 bl sub_80A6B30 @@ -527221,12 +527221,12 @@ _08113C1E: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _08113CB0 + bne @08113CB0 ldr r1, =0x02022e1c - b _08113CAA + b @08113CAA .align 2, 0 .pool -_08113C80: +@08113C80: ldr r0, =0x02022e1e ldrh r0, [r0] strh r0, [r5, 0x1C] @@ -527243,13 +527243,13 @@ _08113C80: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _08113CB0 + bne @08113CB0 ldr r1, =0x02022e18 -_08113CAA: +@08113CAA: ldrh r0, [r1] adds r0, 0xF0 strh r0, [r1] -_08113CB0: +@08113CB0: ldr r0, =0xa2600001 str r0, [sp, 0x4] mov r2, sp @@ -527271,7 +527271,7 @@ _08113CB0: movs r0, 0xF0 lsls r0, 3 adds r6, r4, r0 -_08113CDC: +@08113CDC: lsls r1, r3, 1 adds r2, r1, r4 ldrh r0, [r5, 0x1C] @@ -527283,7 +527283,7 @@ _08113CDC: lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x6F - bls _08113CDC + bls @08113CDC ldr r0, [sp] ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] @@ -527320,7 +527320,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 @@ -527332,31 +527332,31 @@ sub_8113D60: @ 8113D60 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x4 - bls _08113D7A - b _08113E72 -_08113D7A: + bls @08113D7A + b @08113E72 +@08113D7A: lsls r0, 2 - ldr r1, =_08113D8C + ldr r1, =@08113D8C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08113D8C: - .4byte _08113DA0 - .4byte _08113E02 - .4byte _08113E1C - .4byte _08113E58 - .4byte _08113E6C -_08113DA0: +@08113D8C: + .4byte @08113DA0 + .4byte @08113E02 + .4byte @08113E1C + .4byte @08113E58 + .4byte @08113E6C +@08113DA0: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _08113E72 + ble @08113E72 movs r0, 0 strh r0, [r4, 0xA] ldrh r0, [r4, 0xC] @@ -527365,24 +527365,24 @@ _08113DA0: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08113DD0 + beq @08113DD0 ldrh r1, [r4, 0x1E] movs r2, 0x1E ldrsh r0, [r4, r2] cmp r0, 0xC - beq _08113DDE + beq @08113DDE adds r0, r1, 0x1 strh r0, [r4, 0x1E] - b _08113DDE -_08113DD0: + b @08113DDE +@08113DD0: ldrh r1, [r4, 0x20] movs r2, 0x20 ldrsh r0, [r4, r2] cmp r0, 0x8 - beq _08113DDE + beq @08113DDE subs r0, r1, 0x1 strh r0, [r4, 0x20] -_08113DDE: +@08113DDE: ldrh r1, [r4, 0x20] lsls r1, 8 ldrh r0, [r4, 0x1E] @@ -527394,13 +527394,13 @@ _08113DDE: movs r1, 0x1E ldrsh r0, [r4, r1] cmp r0, 0xC - bne _08113E72 + bne @08113E72 movs r2, 0x20 ldrsh r0, [r4, r2] cmp r0, 0x8 - bne _08113E72 - b _08113E5E -_08113E02: + bne @08113E72 + b @08113E5E +@08113E02: ldrh r0, [r4, 0x10] subs r0, 0x8 strh r0, [r4, 0x10] @@ -527411,9 +527411,9 @@ _08113E02: movs r2, 0x18 ldrsh r0, [r4, r2] cmp r1, r0 - bge _08113E72 - b _08113E5E -_08113E1C: + bge @08113E72 + b @08113E5E +@08113E1C: ldrh r0, [r4, 0x10] subs r0, 0x8 strh r0, [r4, 0x10] @@ -527428,9 +527428,9 @@ _08113E1C: lsls r1, 16 lsls r0, r2, 16 cmp r1, r0 - blt _08113E3E + blt @08113E3E strh r2, [r4, 0x24] -_08113E3E: +@08113E3E: ldr r3, =0x02022e24 ldrh r2, [r4, 0x24] lsls r0, r2, 8 @@ -527440,32 +527440,32 @@ _08113E3E: lsls r2, 16 lsls r1, 16 cmp r2, r1 - bne _08113E72 - b _08113E5E + bne @08113E72 + b @08113E5E .align 2, 0 .pool -_08113E58: +@08113E58: ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] -_08113E5E: +@08113E5E: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _08113E72 + b @08113E72 .align 2, 0 .pool -_08113E6C: +@08113E6C: adds r0, r2, 0 bl move_anim_task_del -_08113E72: +@08113E72: pop {r4} pop {r0} bx r0 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 @@ -527478,29 +527478,29 @@ sub_8113E78: @ 8113E78 movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0x4 - bls _08113E94 - b _081140A6 -_08113E94: + bls @08113E94 + b @081140A6 +@08113E94: lsls r0, 2 - ldr r1, =_08113EA8 + ldr r1, =@08113EA8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08113EA8: - .4byte _08113EBC - .4byte _08113F40 - .4byte _08113F84 - .4byte _08113FF0 - .4byte _08114058 -_08113EBC: +@08113EA8: + .4byte @08113EBC + .4byte @08113F40 + .4byte @08113F84 + .4byte @08113FF0 + .4byte @08114058 +@08113EBC: bl sub_80A4DF0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08113EF8 + bne @08113EF8 ldr r0, =0x02022e24 movs r1, 0 strh r1, [r0] @@ -527515,10 +527515,10 @@ _08113EBC: bl lcd_io_set adds r0, r6, 0 bl move_anim_task_del - b _081140A6 + b @081140A6 .align 2, 0 .pool -_08113EF8: +@08113EF8: ldr r0, =0x02038437 ldrb r0, [r0] bl battle_get_per_side_status_permutated @@ -527526,31 +527526,31 @@ _08113EF8: lsrs r0, 24 strh r0, [r5, 0xE] cmp r0, 0x1 - bne _08113F24 + bne @08113F24 ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set ldr r1, =0x02022e1c - b _08113F2E + b @08113F2E .align 2, 0 .pool -_08113F24: +@08113F24: ldr r1, =0x00003f44 movs r0, 0x50 bl lcd_io_set ldr r1, =0x02022e18 -_08113F2E: +@08113F2E: ldrh r0, [r1] adds r0, 0xF0 strh r0, [r1] - b _08114044 + b @08114044 .align 2, 0 .pool -_08113F40: +@08113F40: movs r1, 0xE ldrsh r0, [r5, r1] cmp r0, 0x1 - bne _08113F68 + bne @08113F68 mov r0, sp bl sub_80A6B30 ldr r0, =0x02022e1a @@ -527562,10 +527562,10 @@ _08113F40: movs r0, 0 movs r2, 0x20 bl rboxid_80040B8 - b _08113F78 + b @08113F78 .align 2, 0 .pool -_08113F68: +@08113F68: ldr r0, =0x02022e1e ldrh r0, [r0] strh r0, [r5, 0x1C] @@ -527573,13 +527573,13 @@ _08113F68: movs r1, 0x90 movs r2, 0x20 bl rboxid_80040B8 -_08113F78: +@08113F78: movs r0, 0x3 bl sub_8114374 - b _08114044 + b @08114044 .align 2, 0 .pool -_08113F84: +@08113F84: ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x1 @@ -527611,14 +527611,14 @@ _08113F84: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08113FD8 + bne @08113FD8 ldr r0, =0x0000fff4 - b _08113FDA + b @08113FDA .align 2, 0 .pool -_08113FD8: +@08113FD8: ldr r0, =0x0000ffc0 -_08113FDA: +@08113FDA: strh r0, [r5, 0x18] ldrh r0, [r5, 0x18] strh r0, [r5, 0x10] @@ -527627,21 +527627,21 @@ _08113FDA: strh r0, [r5, 0x1E] movs r0, 0x8 strh r0, [r5, 0x20] - b _08114044 + b @08114044 .align 2, 0 .pool -_08113FF0: +@08113FF0: movs r1, 0xE ldrsh r0, [r5, r1] cmp r0, 0x1 - bne _08114000 + bne @08114000 ldr r0, =0x04000016 - b _08114002 + b @08114002 .align 2, 0 .pool -_08114000: +@08114000: ldr r0, =0x0400001a -_08114002: +@08114002: str r0, [sp, 0x10] movs r3, 0 add r4, sp, 0x10 @@ -527649,7 +527649,7 @@ _08114002: movs r0, 0xF0 lsls r0, 3 adds r7, r6, r0 -_08114010: +@08114010: lsls r1, r3, 1 adds r2, r1, r6 ldrh r0, [r5, 0x1C] @@ -527665,7 +527665,7 @@ _08114010: lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x6F - bls _08114010 + bls @08114010 ldr r1, =0xa2600001 str r1, [r4, 0x4] movs r2, 0 @@ -527675,29 +527675,29 @@ _08114010: ldr r0, [sp, 0x10] ldr r2, [r4, 0x8] bl sub_80BA038 -_08114044: +@08114044: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] - b _081140A6 + b @081140A6 .align 2, 0 .pool -_08114058: +@08114058: movs r1, 0xE ldrsh r0, [r5, r1] cmp r0, 0x1 - bne _08114070 + bne @08114070 ldr r1, =0x00003f3d movs r0, 0x4A bl lcd_io_set - b _08114078 + b @08114078 .align 2, 0 .pool -_08114070: +@08114070: ldr r1, =0x00003f3b movs r0, 0x4A bl lcd_io_set -_08114078: +@08114078: ldr r1, =0x00003f3f movs r0, 0x48 bl lcd_io_set @@ -527719,7 +527719,7 @@ _08114078: bl lcd_io_set ldr r0, =sub_81140C8 + 1 str r0, [r5] -_081140A6: +@081140A6: add sp, 0x1C pop {r4-r7} pop {r0} @@ -527729,7 +527729,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 @@ -527741,24 +527741,24 @@ sub_81140C8: @ 81140C8 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x4 - bls _081140E2 - b _08114232 -_081140E2: + bls @081140E2 + b @08114232 +@081140E2: lsls r0, 2 - ldr r1, =_081140F4 + ldr r1, =@081140F4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081140F4: - .4byte _08114108 - .4byte _08114134 - .4byte _0811419C - .4byte _081141FE - .4byte _08114210 -_08114108: +@081140F4: + .4byte @08114108 + .4byte @08114134 + .4byte @0811419C + .4byte @081141FE + .4byte @08114210 +@08114108: ldrh r0, [r4, 0x12] adds r0, 0x8 strh r0, [r4, 0x12] @@ -527768,9 +527768,9 @@ _08114108: movs r3, 0x16 ldrsh r1, [r4, r3] cmp r0, r1 - blt _0811411E + blt @0811411E strh r2, [r4, 0x12] -_0811411E: +@0811411E: adds r0, r4, 0 bl sub_8114244 movs r0, 0x12 @@ -527778,29 +527778,29 @@ _0811411E: movs r2, 0x16 ldrsh r0, [r4, r2] cmp r1, r0 - beq _08114132 - b _08114232 -_08114132: - b _08114204 -_08114134: + beq @08114132 + b @08114232 +@08114132: + b @08114204 +@08114134: movs r3, 0x26 ldrsh r0, [r4, r3] movs r2, 0x24 ldrsh r1, [r4, r2] subs r0, r1 cmp r0, 0x3F - bgt _08114150 + bgt @08114150 ldrh r0, [r4, 0x24] subs r0, 0x4 strh r0, [r4, 0x24] ldrh r0, [r4, 0x26] adds r0, 0x4 strh r0, [r4, 0x26] - b _08114154 -_08114150: + b @08114154 +@08114150: movs r0, 0x1 strh r0, [r4, 0xA] -_08114154: +@08114154: ldr r2, =0x02022e24 ldrh r0, [r4, 0x24] lsls r0, 8 @@ -527816,9 +527816,9 @@ _08114154: movs r3, 0x14 ldrsh r1, [r4, r3] cmp r0, r1 - blt _08114176 + blt @08114176 strh r2, [r4, 0x10] -_08114176: +@08114176: adds r0, r4, 0 bl sub_8114244 movs r0, 0x10 @@ -527826,24 +527826,24 @@ _08114176: movs r2, 0x14 ldrsh r0, [r4, r2] cmp r1, r0 - bne _08114232 + bne @08114232 movs r3, 0xA ldrsh r0, [r4, r3] cmp r0, 0 - beq _08114232 + beq @08114232 movs r0, 0 strh r0, [r4, 0xA] - b _08114204 + b @08114204 .align 2, 0 .pool -_0811419C: +@0811419C: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _08114232 + ble @08114232 movs r0, 0 strh r0, [r4, 0xA] ldrh r0, [r4, 0xC] @@ -527852,24 +527852,24 @@ _0811419C: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _081141CC + beq @081141CC ldrh r1, [r4, 0x1E] movs r2, 0x1E ldrsh r0, [r4, r2] cmp r0, 0 - beq _081141DA + beq @081141DA subs r0, r1, 0x1 strh r0, [r4, 0x1E] - b _081141DA -_081141CC: + b @081141DA +@081141CC: ldrh r1, [r4, 0x20] movs r3, 0x20 ldrsh r0, [r4, r3] cmp r0, 0xF - bgt _081141DA + bgt @081141DA adds r0, r1, 0x1 strh r0, [r4, 0x20] -_081141DA: +@081141DA: ldrh r1, [r4, 0x20] lsls r1, 8 ldrh r0, [r4, 0x1E] @@ -527881,24 +527881,24 @@ _081141DA: movs r1, 0x1E ldrsh r0, [r4, r1] cmp r0, 0 - bne _08114232 + bne @08114232 movs r2, 0x20 ldrsh r0, [r4, r2] cmp r0, 0x10 - bne _08114232 - b _08114204 -_081141FE: + bne @08114232 + b @08114204 +@081141FE: ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] -_08114204: +@08114204: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _08114232 + b @08114232 .align 2, 0 .pool -_08114210: +@08114210: ldr r0, =0x02022e24 movs r1, 0 strh r1, [r0] @@ -527913,7 +527913,7 @@ _08114210: bl lcd_io_set adds r0, r5, 0 bl move_anim_task_del -_08114232: +@08114232: pop {r4,r5} pop {r0} bx r0 @@ -527922,7 +527922,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} @@ -527933,7 +527933,7 @@ sub_8114244: @ 8114244 lsls r0, 16 asrs r1, r0, 16 cmp r1, 0 - beq _08114338 + beq @08114338 movs r2, 0x22 ldrsh r0, [r6, r2] bl __divsi3 @@ -527944,11 +527944,11 @@ sub_8114244: @ 8114244 lsls r0, r4, 16 movs r4, 0 cmp r0, 0 - ble _081142A4 + ble @081142A4 ldr r0, =0x02038c28 mov r12, r0 ldr r7, =0x02039b28 -_08114278: +@08114278: lsls r2, r4, 16 asrs r2, 16 lsls r3, r2, 1 @@ -527970,22 +527970,22 @@ _08114278: movs r1, 0x10 ldrsh r0, [r6, r1] cmp r2, r0 - blt _08114278 -_081142A4: + blt @08114278 +@081142A4: ldrh r4, [r6, 0x10] lsls r3, r4, 16 asrs r1, r3, 16 movs r2, 0x12 ldrsh r0, [r6, r2] cmp r1, r0 - bgt _081142EE + bgt @081142EE ldr r0, =0x02038c28 mov r12, r0 ldr r7, =0x02039b28 -_081142B8: +@081142B8: asrs r4, r3, 16 cmp r4, 0 - blt _081142DA + blt @081142DA asrs r1, r5, 8 subs r1, r4 lsls r3, r4, 1 @@ -528000,7 +528000,7 @@ _081142B8: ldrh r2, [r6, 0x1C] adds r1, r2 strh r1, [r3] -_081142DA: +@081142DA: add r5, r8 adds r0, r4, 0x1 lsls r0, 16 @@ -528010,8 +528010,8 @@ _081142DA: movs r2, 0x12 ldrsh r0, [r6, r2] cmp r1, r0 - ble _081142B8 -_081142EE: + ble @081142B8 +@081142EE: movs r3, 0x1C ldrsh r0, [r6, r3] adds r0, 0x9F @@ -528021,13 +528021,13 @@ _081142EE: movs r3, 0x16 ldrsh r0, [r6, r3] cmp r1, r0 - bge _08114366 + bge @08114366 ldr r7, =0x02038c28 ldr r4, =0x02039b28 -_08114306: +@08114306: asrs r3, r2, 16 cmp r3, 0 - blt _0811431E + blt @0811431E lsls r2, r3, 1 ldrb r1, [r4, 0x14] lsls r0, r1, 4 @@ -528037,18 +528037,18 @@ _08114306: adds r2, r7 strh r5, [r2] subs r5, 0x1 -_0811431E: +@0811431E: adds r0, r3, 0x1 lsls r2, r0, 16 asrs r1, r2, 16 movs r3, 0x16 ldrsh r0, [r6, r3] cmp r1, r0 - blt _08114306 - b _08114366 + blt @08114306 + b @08114366 .align 2, 0 .pool -_08114338: +@08114338: movs r1, 0x1C ldrsh r0, [r6, r1] adds r5, r0, 0 @@ -528058,7 +528058,7 @@ _08114338: movs r2, 0xF0 lsls r2, 3 adds r6, r3, r2 -_0811434A: +@0811434A: lsls r0, r4, 16 asrs r0, 16 lsls r2, r0, 1 @@ -528072,8 +528072,8 @@ _0811434A: lsrs r4, r0, 16 asrs r0, 16 cmp r0, 0x6F - ble _0811434A -_08114366: + ble @0811434A +@08114366: pop {r3} mov r8, r3 pop {r4-r7} @@ -528084,7 +528084,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 @@ -528096,14 +528096,14 @@ sub_8114374: @ 8114374 movs r0, 0xD negs r0, r0 adds r6, r0, 0 -_0811438A: +@0811438A: lsls r0, r4, 24 lsrs r0, 24 bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _081143AA + beq @081143AA lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -528112,12 +528112,12 @@ _0811438A: ands r0, r6 orrs r0, r5 strb r0, [r1, 0x5] -_081143AA: +@081143AA: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x3 - bls _0811438A + bls @0811438A pop {r4-r7} pop {r0} bx r0 @@ -528126,7 +528126,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 @@ -528173,7 +528173,7 @@ sub_81143C0: @ 81143C0 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _0811444E + beq @0811444E ldrb r0, [r6] eors r0, r5 movs r1, 0x1 @@ -528194,7 +528194,7 @@ sub_81143C0: @ 81143C0 adds r1, r7, 0 ands r1, r2 strb r1, [r0] -_0811444E: +@0811444E: mov r0, r10 bl move_anim_task_del pop {r3-r5} @@ -528209,7 +528209,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 @@ -528231,12 +528231,12 @@ sub_8114470: @ 8114470 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _081144AC + beq @081144AC movs r0, 0x1 eors r5, r0 adds r0, r5, 0 bl sub_80A477C -_081144AC: +@081144AC: adds r0, r6, 0 bl move_anim_task_del pop {r4-r6} @@ -528247,7 +528247,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 @@ -528275,7 +528275,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 @@ -528312,33 +528312,33 @@ sub_81144F8: @ 81144F8 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0811455C + bne @0811455C movs r0, 0x1 movs r1, 0x3 movs r2, 0x1 bl lcd_bg_operations -_0811455C: +@0811455C: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _081145D6 + beq @081145D6 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _081145D6 + bne @081145D6 ldr r4, =0x02038436 ldrb r0, [r4] bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - beq _0811458C + beq @0811458C ldrb r0, [r4] bl battle_get_per_side_status lsls r0, 24 cmp r0, 0 - bne _081145D6 -_0811458C: + bne @081145D6 +@0811458C: ldrb r0, [r4] movs r5, 0x2 eors r0, r5 @@ -528346,7 +528346,7 @@ _0811458C: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081145D6 + bne @081145D6 ldr r3, =0x02020630 ldr r1, =0x020241e4 ldrb r0, [r4] @@ -528374,25 +528374,25 @@ _0811458C: movs r2, 0x1 bl lcd_bg_operations movs r6, 0x1 -_081145D6: +@081145D6: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _08114614 + beq @08114614 ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r5, [r0] - b _0811465C + b @0811465C .align 2, 0 .pool -_08114614: +@08114614: ldr r4, =0x02038436 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08114640 + beq @08114640 ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 @@ -528401,10 +528401,10 @@ _08114614: movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 - b _08114650 + b @08114650 .align 2, 0 .pool -_08114640: +@08114640: ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 @@ -528413,13 +528413,13 @@ _08114640: movs r0, 0x64 muls r0, r1 ldr r1, =0x020244ec -_08114650: +@08114650: adds r0, r1 movs r1, 0xB bl pokemon_getattr lsls r0, 16 lsrs r5, r0, 16 -_0811465C: +@0811465C: movs r0, 0 bl obj_id_for_side_relative_to_move adds r4, r0, 0 @@ -528473,20 +528473,20 @@ _0811465C: movs r3, 0x2 ldrsh r0, [r2, r3] cmp r0, 0 - bne _08114708 + bne @08114708 adds r0, r1, 0 movs r1, 0 bl sub_80A750C - b _08114714 + b @08114714 .align 2, 0 .pool -_08114708: +@08114708: lsls r0, r1, 4 ldrh r3, [r2, 0x4] movs r1, 0x10 movs r2, 0xB bl pal_fade_1 -_08114714: +@08114714: ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 @@ -528512,7 +528512,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 @@ -528534,9 +528534,9 @@ sub_8114748: @ 8114748 lsls r0, 16 asrs r0, 16 cmp r0, 0x80 - beq _08114776 - b _08114886 -_08114776: + beq @08114776 + b @08114886 +@08114776: strh r5, [r4, 0x1C] adds r0, r3, 0 adds r0, 0x7C @@ -528547,7 +528547,7 @@ _08114776: lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - bne _08114824 + bne @08114824 movs r0, 0 bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -528564,11 +528564,11 @@ _08114776: movs r2, 0xA ldrsh r0, [r4, r2] cmp r0, 0 - bne _081147B8 + bne @081147B8 adds r0, r1, 0 movs r1, 0x1 bl sub_80A750C -_081147B8: +@081147B8: movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -528584,7 +528584,7 @@ _081147B8: movs r1, 0x14 ldrsh r0, [r4, r1] cmp r0, 0x1 - bne _08114886 + bne @08114886 ldr r2, =0x020241e4 ldr r0, =0x02038436 ldrb r1, [r0] @@ -528608,12 +528608,12 @@ _081147B8: ands r0, r3 orrs r0, r1 strb r0, [r2, 0x5] - b _08114886 + b @08114886 .align 2, 0 .pool -_08114824: +@08114824: cmp r0, 0x3 - bne _08114886 + bne @08114886 ldr r0, =0x02022e24 strh r5, [r0] ldr r0, =0x02022e26 @@ -528628,12 +528628,12 @@ _08114824: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _08114856 + bne @08114856 movs r0, 0x1 movs r1, 0x3 movs r2, 0 bl lcd_bg_operations -_08114856: +@08114856: movs r0, 0 bl lcd_io_get adds r1, r0, 0 @@ -528653,7 +528653,7 @@ _08114856: bl lcd_io_set adds r0, r6, 0 bl move_anim_task_del -_08114886: +@08114886: add sp, 0x10 pop {r4-r6} pop {r0} @@ -528663,7 +528663,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 @@ -528673,49 +528673,49 @@ sub_811489C: @ 811489C ldrsh r1, [r0, r2] adds r2, r0, 0 cmp r1, 0x7 - bhi _08114900 + bhi @08114900 lsls r0, r1, 2 - ldr r1, =_081148C4 + ldr r1, =@081148C4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081148C4: - .4byte _081148E4 - .4byte _081148E4 - .4byte _081148E4 - .4byte _081148E4 - .4byte _081148F0 - .4byte _081148F4 - .4byte _081148F8 - .4byte _081148FC -_081148E4: +@081148C4: + .4byte @081148E4 + .4byte @081148E4 + .4byte @081148E4 + .4byte @081148E4 + .4byte @081148F0 + .4byte @081148F4 + .4byte @081148F8 + .4byte @081148FC +@081148E4: ldrb r0, [r2] bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r2, r0, 24 - b _08114902 -_081148F0: + b @08114902 +@081148F0: movs r4, 0 - b _08114908 -_081148F4: + b @08114908 +@081148F4: movs r4, 0x2 - b _08114908 -_081148F8: + b @08114908 +@081148F8: movs r4, 0x1 - b _08114908 -_081148FC: + b @08114908 +@081148FC: movs r4, 0x3 - b _08114908 -_08114900: + b @08114908 +@08114900: movs r2, 0xFF -_08114902: +@08114902: movs r0, 0 cmp r0, 0 - beq _0811492E -_08114908: + beq @0811492E +@08114908: adds r0, r4, 0 bl battle_get_side_with_given_state lsls r0, 24 @@ -528724,18 +528724,18 @@ _08114908: bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _0811492C + beq @0811492C ldr r0, =0x020241e4 adds r0, r4, r0 ldrb r2, [r0] - b _0811492E + b @0811492E .align 2, 0 .pool -_0811492C: +@0811492C: movs r2, 0xFF -_0811492E: +@0811492E: cmp r2, 0xFF - beq _0811494A + beq @0811494A ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -528747,7 +528747,7 @@ _0811492E: ldr r1, =0x0203841e ldrb r1, [r1, 0x2] bl sub_80A750C -_0811494A: +@0811494A: adds r0, r5, 0 bl move_anim_task_del pop {r4,r5} @@ -528758,25 +528758,25 @@ _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 ldr r2, =0x02038432 ldrb r0, [r2] cmp r0, 0x1 - bhi _08114974 + bhi @08114974 ldr r1, =0x0203841e movs r0, 0 strh r0, [r1, 0xE] -_08114974: +@08114974: ldrb r0, [r2] cmp r0, 0x2 - bne _08114980 + bne @08114980 ldr r1, =0x0203841e movs r0, 0x1 strh r0, [r1, 0xE] -_08114980: +@08114980: adds r0, r3, 0 bl move_anim_task_del pop {r0} @@ -528786,7 +528786,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 @@ -528831,13 +528831,13 @@ 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 lsls r0, 24 cmp r0, 0 - beq _08114A50 + beq @08114A50 ldrh r0, [r5, 0x24] ldrh r1, [r5, 0x20] adds r0, r1 @@ -528870,7 +528870,7 @@ sub_81149FC: @ 81149FC bl sub_80A68D4 ldr r0, =sub_8114A60 + 1 str r0, [r5, 0x1C] -_08114A50: +@08114A50: pop {r4,r5} pop {r0} bx r0 @@ -528879,23 +528879,23 @@ _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 lsls r0, 24 cmp r0, 0 - beq _08114A74 + beq @08114A74 adds r0, r4, 0 bl move_anim_8072740 -_08114A74: +@08114A74: pop {r4} pop {r0} bx r0 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 @@ -528905,12 +528905,12 @@ sub_8114A7C: @ 8114A7C bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08114A9C + beq @08114A9C ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] -_08114A9C: +@08114A9C: ldr r4, =0x0203841e ldrh r0, [r4, 0x8] strh r0, [r6, 0x2E] @@ -528944,7 +528944,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} @@ -528971,21 +528971,21 @@ sub_8114AF0: @ 8114AF0 ands r4, r0 adds r1, r5, 0 cmp r1, 0x10 - ble _08114B38 + ble @08114B38 movs r0, 0x10 subs r0, r1 lsls r0, 16 lsrs r5, r0, 16 -_08114B38: +@08114B38: lsls r0, r4, 16 asrs r1, r0, 16 cmp r1, 0x10 - ble _08114B48 + ble @08114B48 movs r0, 0x10 subs r0, r1 lsls r0, 16 lsrs r4, r0, 16 -_08114B48: +@08114B48: ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r6, 0x2E] @@ -529009,7 +529009,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] @@ -529027,7 +529027,7 @@ sub_8114B80: @ 8114B80 movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 - bne _08114BF4 + bne @08114BF4 ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 @@ -529051,15 +529051,15 @@ sub_8114B80: @ 8114B80 negs r2, r2 adds r1, r2, 0 cmp r0, 0 - ble _08114BDA + ble @08114BDA movs r1, 0x1 -_08114BDA: +@08114BDA: strh r1, [r5, 0x2E] ldr r0, =sub_8114C10 + 1 - b _08114C02 + b @08114C02 .align 2, 0 .pool -_08114BF4: +@08114BF4: ldrh r0, [r6, 0x2] strh r0, [r5, 0x20] ldrh r0, [r6, 0x4] @@ -529067,7 +529067,7 @@ _08114BF4: negs r0, r0 strh r0, [r5, 0x26] ldr r0, =sub_8114C4C + 1 -_08114C02: +@08114C02: str r0, [r5, 0x1C] pop {r4-r6} pop {r0} @@ -529077,7 +529077,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] @@ -529086,14 +529086,14 @@ sub_8114C10: @ 8114C10 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _08114C2E + ble @08114C2E movs r0, 0 strh r0, [r2, 0x30] ldrh r0, [r2, 0x2E] ldrh r1, [r2, 0x20] adds r0, r1 strh r0, [r2, 0x20] -_08114C2E: +@08114C2E: ldrh r0, [r2, 0x22] subs r0, 0x4 strh r0, [r2, 0x22] @@ -529102,44 +529102,44 @@ _08114C2E: movs r1, 0x4 negs r1, r1 cmp r0, r1 - bge _08114C46 + bge @08114C46 adds r0, r2, 0 bl move_anim_8072740 -_08114C46: +@08114C46: pop {r0} bx r0 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 ldrsh r1, [r3, r0] cmp r1, 0 - beq _08114C5E + beq @08114C5E cmp r1, 0x1 - beq _08114C74 - b _08114CB6 -_08114C5E: + beq @08114C74 + b @08114CB6 +@08114C5E: ldrh r0, [r3, 0x26] adds r0, 0x4 strh r0, [r3, 0x26] lsls r0, 16 cmp r0, 0 - blt _08114CB6 + blt @08114CB6 strh r1, [r3, 0x26] ldrh r0, [r3, 0x2E] adds r0, 0x1 strh r0, [r3, 0x2E] - b _08114CB6 -_08114C74: + b @08114CB6 +@08114C74: ldrh r0, [r3, 0x30] adds r0, 0x1 strh r0, [r3, 0x30] lsls r0, 16 cmp r0, 0 - ble _08114CB6 + ble @08114CB6 movs r0, 0 strh r0, [r3, 0x30] movs r1, 0x3E @@ -529163,16 +529163,16 @@ _08114C74: lsls r0, 16 asrs r0, 16 cmp r0, 0xA - bne _08114CB6 + bne @08114CB6 adds r0, r3, 0 bl move_anim_8072740 -_08114CB6: +@08114CB6: pop {r0} bx r0 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 @@ -529185,14 +529185,14 @@ sub_8114CBC: @ 8114CBC movs r3, 0 ldrsh r0, [r0, r3] cmp r0, 0 - bne _08114CE8 + bne @08114CE8 ldr r0, =sub_8114CFC + 1 - b _08114CEA + b @08114CEA .align 2, 0 .pool -_08114CE8: +@08114CE8: ldr r0, =sub_8114EB4 + 1 -_08114CEA: +@08114CEA: str r0, [r1] ldr r1, [r1] adds r0, r2, 0 @@ -529204,7 +529204,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 @@ -529216,24 +529216,24 @@ sub_8114CFC: @ 8114CFC movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x4 - bls _08114D16 - b _08114EAA -_08114D16: + bls @08114D16 + b @08114EAA +@08114D16: lsls r0, 2 - ldr r1, =_08114D28 + ldr r1, =@08114D28 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08114D28: - .4byte _08114D3C - .4byte _08114DC4 - .4byte _08114DD4 - .4byte _08114E78 - .4byte _08114E8C -_08114D3C: +@08114D28: + .4byte @08114D3C + .4byte @08114DC4 + .4byte @08114DD4 + .4byte @08114E78 + .4byte @08114E8C +@08114D3C: movs r0, 0 bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -529246,20 +529246,20 @@ _08114D3C: lsrs r0, 24 strh r0, [r4, 0x1E] cmp r0, 0x1 - bne _08114D70 + bne @08114D70 ldr r0, =0x02022e18 ldrh r0, [r0] strh r0, [r4, 0x20] ldr r0, =0x02022e1a - b _08114D78 + b @08114D78 .align 2, 0 .pool -_08114D70: +@08114D70: ldr r0, =0x02022e1c ldrh r0, [r0] strh r0, [r4, 0x20] ldr r0, =0x02022e1e -_08114D78: +@08114D78: ldrh r0, [r0] strh r0, [r4, 0x22] ldr r0, =0x02038436 @@ -529273,10 +529273,10 @@ _08114D78: adds r0, 0x20 strh r0, [r4, 0x26] cmp r1, 0 - bge _08114D9A + bge @08114D9A movs r0, 0 strh r0, [r4, 0x24] -_08114D9A: +@08114D9A: ldr r2, =0x02020630 movs r3, 0x1C ldrsh r1, [r4, r3] @@ -529289,18 +529289,18 @@ _08114D9A: movs r2, 0x4 orrs r1, r2 strb r1, [r0] - b _08114E7E + b @08114E7E .align 2, 0 .pool -_08114DC4: +@08114DC4: ldrb r0, [r4, 0x1E] movs r2, 0x24 ldrsh r1, [r4, r2] movs r3, 0x26 ldrsh r2, [r4, r3] bl sub_81150E0 - b _08114E7E -_08114DD4: + b @08114E7E +@08114DD4: ldrh r0, [r4, 0xC] adds r0, 0x6 movs r1, 0x7F @@ -529312,13 +529312,13 @@ _08114DD4: lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - ble _08114DF6 + ble @08114DF6 movs r0, 0 strh r0, [r4, 0x10] ldrh r0, [r4, 0xE] adds r0, 0x1 strh r0, [r4, 0xE] -_08114DF6: +@08114DF6: ldr r1, =0x08329f40 movs r2, 0xC ldrsh r0, [r4, r2] @@ -529333,21 +529333,21 @@ _08114DF6: movs r1, 0x1E ldrsh r0, [r4, r1] cmp r0, 0x1 - bne _08114E20 + bne @08114E20 ldr r1, =0x02022e1a - b _08114E22 + b @08114E22 .align 2, 0 .pool -_08114E20: +@08114E20: ldr r1, =0x02022e1e -_08114E22: +@08114E22: ldrh r0, [r4, 0x22] subs r0, r2 strh r0, [r1] movs r2, 0x12 ldrsh r0, [r4, r2] cmp r0, 0x3F - ble _08114EAA + ble @08114EAA ldrh r0, [r4, 0x24] movs r1, 0x78 subs r2, r1, r0 @@ -529355,14 +529355,14 @@ _08114E22: movs r3, 0x1E ldrsh r0, [r4, r3] cmp r0, 0x1 - bne _08114E4C + bne @08114E4C ldr r1, =0x02022e1a - b _08114E4E + b @08114E4E .align 2, 0 .pool -_08114E4C: +@08114E4C: ldr r1, =0x02022e1e -_08114E4E: +@08114E4E: ldrh r0, [r4, 0x22] subs r0, r2 strh r0, [r1] @@ -529379,21 +529379,21 @@ _08114E4E: adds r0, r3, 0 subs r0, r2 strh r0, [r1, 0x24] - b _08114E7E + b @08114E7E .align 2, 0 .pool -_08114E78: +@08114E78: ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] -_08114E7E: +@08114E7E: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _08114EAA + b @08114EAA .align 2, 0 .pool -_08114E8C: +@08114E8C: adds r0, r2, 0 bl move_anim_task_del ldr r2, =0x02020630 @@ -529408,7 +529408,7 @@ _08114E8C: movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_08114EAA: +@08114EAA: pop {r4} pop {r0} bx r0 @@ -529417,7 +529417,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 @@ -529445,14 +529445,14 @@ sub_8114EB4: @ 8114EB4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08114F00 + bne @08114F00 ldr r0, =0x02022e1a - b _08114F02 + b @08114F02 .align 2, 0 .pool -_08114F00: +@08114F00: ldr r0, =0x02022e1e -_08114F02: +@08114F02: strh r4, [r0] adds r0, r5, 0 bl move_anim_task_del @@ -529464,7 +529464,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 @@ -529477,14 +529477,14 @@ sub_8114F14: @ 8114F14 movs r3, 0 ldrsh r0, [r0, r3] cmp r0, 0 - bne _08114F40 + bne @08114F40 ldr r0, =sub_8114F54 + 1 - b _08114F42 + b @08114F42 .align 2, 0 .pool -_08114F40: +@08114F40: ldr r0, =sub_8114FD8 + 1 -_08114F42: +@08114F42: str r0, [r1] ldr r1, [r1] adds r0, r2, 0 @@ -529496,7 +529496,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 @@ -529508,13 +529508,13 @@ sub_8114F54: @ 8114F54 movs r0, 0x8 ldrsh r5, [r4, r0] cmp r5, 0 - beq _08114F78 + beq @08114F78 cmp r5, 0x1 - beq _08114FCC - b _08114FD2 + beq @08114FCC + b @08114FD2 .align 2, 0 .pool -_08114F78: +@08114F78: movs r0, 0 bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -529553,20 +529553,20 @@ _08114F78: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _08114FD2 + b @08114FD2 .align 2, 0 .pool -_08114FCC: +@08114FCC: adds r0, r2, 0 bl move_anim_task_del -_08114FD2: +@08114FD2: pop {r4,r5} pop {r0} bx r0 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 @@ -529578,22 +529578,22 @@ sub_8114FD8: @ 8114FD8 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x4 - bhi _081150DA + bhi @081150DA lsls r0, 2 - ldr r1, =_08115004 + ldr r1, =@08115004 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08115004: - .4byte _08115018 - .4byte _0811506C - .4byte _0811507A - .4byte _08115094 - .4byte _081150D4 -_08115018: +@08115004: + .4byte @08115018 + .4byte @0811506C + .4byte @0811507A + .4byte @08115094 + .4byte @081150D4 +@08115018: movs r0, 0 bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -529606,14 +529606,14 @@ _08115018: lsrs r0, 24 strh r0, [r4, 0x1E] cmp r0, 0x1 - bne _08115044 + bne @08115044 ldr r0, =0x02022e18 - b _08115046 + b @08115046 .align 2, 0 .pool -_08115044: +@08115044: ldr r0, =0x02022e1c -_08115046: +@08115046: ldrh r0, [r0] strh r0, [r4, 0x20] ldr r0, =0x02038436 @@ -529626,17 +529626,17 @@ _08115046: strh r1, [r4, 0x24] adds r0, 0x20 strh r0, [r4, 0x26] - b _081150C2 + b @081150C2 .align 2, 0 .pool -_0811506C: +@0811506C: ldrb r0, [r4, 0x1E] movs r1, 0x26 ldrsh r2, [r4, r1] movs r1, 0 bl sub_81150E0 - b _081150C2 -_0811507A: + b @081150C2 +@0811507A: ldr r2, =0x02020630 movs r0, 0x1C ldrsh r1, [r4, r0] @@ -529646,10 +529646,10 @@ _0811507A: adds r0, r2 movs r1, 0x60 strh r1, [r0, 0x26] - b _081150C2 + b @081150C2 .align 2, 0 .pool -_08115094: +@08115094: ldr r2, =0x02020630 movs r0, 0x1C ldrsh r1, [r4, r0] @@ -529669,28 +529669,28 @@ _08115094: movs r1, 0x26 ldrsh r0, [r0, r1] cmp r0, 0 - bne _081150DA + bne @081150DA ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] -_081150C2: +@081150C2: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _081150DA + b @081150DA .align 2, 0 .pool -_081150D4: +@081150D4: adds r0, r2, 0 bl move_anim_task_del -_081150DA: +@081150DA: pop {r4} pop {r0} bx r0 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 @@ -529700,34 +529700,34 @@ sub_81150E0: @ 81150E0 lsls r2, 16 lsrs r4, r2, 16 cmp r0, 0x1 - bne _08115104 + bne @08115104 ldr r0, =0x02022e18 ldrh r3, [r0] ldr r0, =0x04000014 - b _0811510A + b @0811510A .align 2, 0 .pool -_08115104: +@08115104: ldr r0, =0x02022e1c ldrh r3, [r0] ldr r0, =0x04000018 -_0811510A: +@0811510A: str r0, [sp] lsls r0, r1, 16 cmp r0, 0 - bge _08115114 + bge @08115114 movs r1, 0 -_08115114: +@08115114: lsls r2, r1, 16 lsls r0, r4, 16 asrs r4, r0, 16 cmp r2, r0 - bge _08115140 + bge @08115140 ldr r5, =0x02038c28 movs r0, 0xF0 lsls r0, 3 adds r6, r5, r0 -_08115126: +@08115126: asrs r2, 16 lsls r1, r2, 1 adds r0, r1, r5 @@ -529740,12 +529740,12 @@ _08115126: lsls r2, r1, 16 asrs r0, r2, 16 cmp r0, r4 - blt _08115126 -_08115140: + blt @08115126 +@08115140: lsls r1, 16 asrs r0, r1, 16 cmp r0, 0x9F - bgt _0811516E + bgt @0811516E ldr r4, =0x02038c28 lsls r0, r3, 16 asrs r0, 16 @@ -529754,7 +529754,7 @@ _08115140: movs r0, 0xF0 lsls r0, 3 adds r5, r4, r0 -_08115158: +@08115158: asrs r2, r1, 16 lsls r1, r2, 1 adds r0, r1, r4 @@ -529765,8 +529765,8 @@ _08115158: lsls r1, r2, 16 asrs r0, r1, 16 cmp r0, 0x9F - ble _08115158 -_0811516E: + ble @08115158 +@0811516E: ldr r0, =0xa2600001 str r0, [sp, 0x4] mov r1, sp @@ -529788,7 +529788,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 @@ -529796,21 +529796,21 @@ sub_81151A0: @ 81151A0 ldrsh r1, [r0, r2] adds r7, r0, 0 cmp r1, 0 - bne _081151BC + bne @081151BC ldr r0, =0x02038436 - b _081151BE + b @081151BE .align 2, 0 .pool -_081151BC: +@081151BC: ldr r0, =0x02038437 -_081151BE: +@081151BE: ldrb r4, [r0] movs r6, 0x18 adds r1, r7, 0 movs r2, 0x2 ldrsh r0, [r1, r2] cmp r0, 0x1 - bne _081151DA + bne @081151DA negs r0, r6 lsls r0, 16 lsrs r6, r0, 16 @@ -529818,7 +529818,7 @@ _081151BE: ldrsh r0, [r1, r2] negs r0, r0 strh r0, [r1, 0x4] -_081151DA: +@081151DA: adds r0, r4, 0 movs r1, 0x2 bl sub_80A5C6C @@ -529855,37 +529855,37 @@ _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 lsls r0, 24 cmp r0, 0 - beq _0811523C + beq @0811523C adds r0, r4, 0 bl move_anim_8072740 -_0811523C: +@0811523C: pop {r4} pop {r0} bx r0 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 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08115260 + bne @08115260 ldr r0, =0x02038436 - b _08115262 + b @08115262 .align 2, 0 .pool -_08115260: +@08115260: ldr r0, =0x02038437 -_08115262: +@08115262: ldrb r5, [r0] adds r0, r5, 0 movs r1, 0 @@ -529935,7 +529935,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 @@ -529950,18 +529950,18 @@ sub_81152DC: @ 81152DC ldrsh r1, [r0, r3] adds r6, r0, 0 cmp r1, 0 - beq _08115308 + beq @08115308 adds r0, r2, 0x3 - b _08115314 + b @08115314 .align 2, 0 .pool -_08115308: +@08115308: ldr r0, =0x02038408 ldrh r0, [r0] movs r1, 0xA bl __udivsi3 adds r0, 0x3 -_08115314: +@08115314: strh r0, [r4, 0x26] strh r0, [r4, 0x24] adds r1, r6, 0 @@ -529970,27 +529970,27 @@ _08115314: movs r2, 0 ldrsh r0, [r1, r2] cmp r0, 0x4 - beq _08115340 + beq @08115340 cmp r0, 0x5 - bne _08115380 + bne @08115380 ldr r0, =0x02022e20 ldrh r0, [r0] strh r0, [r4, 0x22] ldr r0, =sub_81153AC + 1 - b _0811539E + b @0811539E .align 2, 0 .pool -_08115340: +@08115340: movs r0, 0 strh r0, [r4, 0x22] movs r5, 0 -_08115346: +@08115346: lsls r0, r5, 24 lsrs r0, 24 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _08115370 + beq @08115370 movs r3, 0x22 ldrsh r0, [r4, r3] adds r0, 0x9 @@ -530005,34 +530005,34 @@ _08115346: ldrh r0, [r4, 0x22] adds r0, 0x1 strh r0, [r4, 0x22] -_08115370: +@08115370: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x3 - bls _08115346 - b _0811539C + bls @08115346 + b @0811539C .align 2, 0 .pool -_08115380: +@08115380: ldrb r0, [r6] bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1A] cmp r0, 0xFF - bne _08115398 + bne @08115398 adds r0, r5, 0 bl move_anim_task_del - b _081153A0 -_08115398: + b @081153A0 +@08115398: movs r0, 0x1 strh r0, [r4, 0x22] -_0811539C: +@0811539C: ldr r0, =sub_81154A4 + 1 -_0811539E: +@0811539E: str r0, [r4] -_081153A0: +@081153A0: pop {r4-r6} pop {r0} bx r0 @@ -530041,7 +530041,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 @@ -530053,47 +530053,47 @@ sub_81153AC: @ 81153AC movs r0, 0x8 ldrsh r1, [r3, r0] cmp r1, 0x1 - beq _08115430 + beq @08115430 cmp r1, 0x1 - bgt _081153D4 + bgt @081153D4 cmp r1, 0 - beq _081153DA - b _0811549C + beq @081153DA + b @0811549C .align 2, 0 .pool -_081153D4: +@081153D4: cmp r1, 0x2 - beq _08115490 - b _0811549C -_081153DA: + beq @08115490 + b @0811549C +@081153DA: ldrh r0, [r3, 0xA] adds r0, 0x1 strh r0, [r3, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0811549C + ble @0811549C strh r1, [r3, 0xA] ldrh r1, [r3, 0xC] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _08115404 + bne @08115404 ldr r1, =0x02022e20 ldrh r0, [r3, 0x26] ldrh r2, [r3, 0x22] adds r0, r2 strh r0, [r1] - b _0811540E + b @0811540E .align 2, 0 .pool -_08115404: +@08115404: ldr r0, =0x02022e20 ldrh r1, [r3, 0x22] ldrh r2, [r3, 0x26] subs r1, r2 strh r1, [r0] -_0811540E: +@0811540E: ldrh r0, [r3, 0xC] adds r0, 0x1 strh r0, [r3, 0xC] @@ -530102,51 +530102,51 @@ _0811540E: movs r2, 0xE ldrsh r1, [r3, r2] cmp r0, r1 - bne _0811549C + bne @0811549C movs r0, 0 strh r0, [r3, 0xC] ldrh r0, [r3, 0x24] subs r0, 0x1 strh r0, [r3, 0x24] - b _08115484 + b @08115484 .align 2, 0 .pool -_08115430: +@08115430: ldrh r0, [r3, 0xA] adds r0, 0x1 strh r0, [r3, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0811549C + ble @0811549C movs r0, 0 strh r0, [r3, 0xA] ldrh r0, [r3, 0xC] ands r1, r0 cmp r1, 0 - bne _0811545C + bne @0811545C ldr r1, =0x02022e20 ldrh r0, [r3, 0x24] ldrh r2, [r3, 0x22] adds r0, r2 strh r0, [r1] - b _08115466 + b @08115466 .align 2, 0 .pool -_0811545C: +@0811545C: ldr r0, =0x02022e20 ldrh r1, [r3, 0x22] ldrh r2, [r3, 0x24] subs r1, r2 strh r1, [r0] -_08115466: +@08115466: ldrh r0, [r3, 0xC] adds r0, 0x1 strh r0, [r3, 0xC] lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne _0811549C + bne @0811549C movs r0, 0 strh r0, [r3, 0xC] ldrh r0, [r3, 0x24] @@ -530154,21 +530154,21 @@ _08115466: strh r0, [r3, 0x24] lsls r0, 16 cmp r0, 0 - bne _0811549C -_08115484: + bne @0811549C +@08115484: ldrh r0, [r3, 0x8] adds r0, 0x1 strh r0, [r3, 0x8] - b _0811549C + b @0811549C .align 2, 0 .pool -_08115490: +@08115490: ldr r1, =0x02022e20 ldrh r0, [r3, 0x22] strh r0, [r1] adds r0, r2, 0 bl move_anim_task_del -_0811549C: +@0811549C: pop {r0} bx r0 .align 2, 0 @@ -530176,7 +530176,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 @@ -530188,26 +530188,26 @@ sub_81154A4: @ 81154A4 movs r0, 0x8 ldrsh r5, [r4, r0] cmp r5, 0x1 - beq _08115504 + beq @08115504 cmp r5, 0x1 - bgt _081154CC + bgt @081154CC cmp r5, 0 - beq _081154D2 - b _0811557E + beq @081154D2 + b @0811557E .align 2, 0 .pool -_081154CC: +@081154CC: cmp r5, 0x2 - beq _08115540 - b _0811557E -_081154D2: + beq @08115540 + b @0811557E +@081154D2: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0811557E + ble @0811557E strh r5, [r4, 0xA] adds r0, r4, 0 bl sub_8115588 @@ -530219,13 +530219,13 @@ _081154D2: movs r2, 0xE ldrsh r1, [r4, r2] cmp r0, r1 - bne _0811557E + bne @0811557E strh r5, [r4, 0xC] ldrh r0, [r4, 0x24] subs r0, 0x1 strh r0, [r4, 0x24] - b _08115538 -_08115504: + b @08115538 +@08115504: ldrh r0, [r4, 0xA] adds r0, 0x1 movs r5, 0 @@ -530233,7 +530233,7 @@ _08115504: lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0811557E + ble @0811557E strh r5, [r4, 0xA] adds r0, r4, 0 bl sub_8115588 @@ -530243,31 +530243,31 @@ _08115504: lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne _0811557E + bne @0811557E strh r5, [r4, 0xC] ldrh r0, [r4, 0x24] subs r0, 0x1 strh r0, [r4, 0x24] lsls r0, 16 cmp r0, 0 - bne _0811557E -_08115538: + bne @0811557E +@08115538: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0811557E -_08115540: + b @0811557E +@08115540: movs r2, 0 movs r7, 0x22 ldrsh r0, [r4, r7] cmp r2, r0 - bge _08115578 + bge @08115578 ldr r0, =0x02020630 mov r12, r0 adds r5, r4, 0 adds r5, 0x8 movs r6, 0 -_08115554: +@08115554: adds r0, r2, 0 adds r0, 0x9 lsls r0, 1 @@ -530285,11 +530285,11 @@ _08115554: movs r1, 0x22 ldrsh r0, [r4, r1] cmp r2, r0 - blt _08115554 -_08115578: + blt @08115554 +@08115578: adds r0, r3, 0 bl move_anim_task_del -_0811557E: +@0811557E: pop {r4-r7} pop {r0} bx r0 @@ -530298,7 +530298,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] @@ -530306,7 +530306,7 @@ sub_8115588: @ 8115588 adds r0, r4, 0 ands r0, r1 cmp r0, 0 - bne _081155B0 + bne @081155B0 movs r0, 0x24 ldrsh r1, [r3, r0] lsrs r0, r1, 31 @@ -530318,8 +530318,8 @@ sub_8115588: @ 8115588 adds r1, r0 lsls r1, 16 lsrs r4, r1, 16 - b _081155C0 -_081155B0: + b @081155C0 +@081155B0: movs r1, 0x24 ldrsh r0, [r3, r1] lsrs r1, r0, 31 @@ -530328,16 +530328,16 @@ _081155B0: negs r0, r0 lsls r0, 16 lsrs r4, r0, 16 -_081155C0: +@081155C0: movs r2, 0 movs r7, 0x22 ldrsh r0, [r3, r7] cmp r2, r0 - bge _081155F4 + bge @081155F4 ldr r6, =0x02020630 adds r5, r3, 0 adds r5, 0x8 -_081155D0: +@081155D0: adds r0, r2, 0 adds r0, 0x9 lsls r0, 1 @@ -530355,8 +530355,8 @@ _081155D0: movs r1, 0x22 ldrsh r0, [r3, r1] cmp r2, r0 - blt _081155D0 -_081155F4: + blt @081155D0 +@081155F4: pop {r4-r7} pop {r0} bx r0 @@ -530365,7 +530365,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 @@ -530374,9 +530374,9 @@ sub_8115600: @ 8115600 ldr r0, =0x02038408 ldrh r0, [r0] cmp r0, 0x63 - bls _08115614 + bls @08115614 movs r2, 0x1 -_08115614: +@08115614: strh r2, [r3, 0x1E] adds r0, r1, 0 bl move_anim_task_del @@ -530387,7 +530387,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 @@ -530397,23 +530397,23 @@ sub_8115628: @ 8115628 ands r0, r1 adds r6, r2, 0 cmp r0, 0 - beq _08115648 + beq @08115648 ldr r0, =0x02038437 - b _0811564A + b @0811564A .align 2, 0 .pool -_08115648: +@08115648: ldr r0, =0x02038436 -_0811564A: +@0811564A: ldrb r0, [r0] adds r5, r0, 0 movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0x1 - ble _0811565A + ble @0811565A movs r0, 0x2 eors r5, r0 -_0811565A: +@0811565A: ldr r0, =sub_81156D0 + 1 ldrb r1, [r6, 0x2] bl AddTask @@ -530462,7 +530462,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 @@ -530477,7 +530477,7 @@ sub_81156D0: @ 81156D0 movs r4, 0xE ldrsh r0, [r2, r4] cmp r1, r0 - bne _08115710 + bne @08115710 ldr r0, =0x02022e20 movs r1, 0 strh r1, [r0] @@ -530485,17 +530485,17 @@ sub_81156D0: @ 81156D0 strh r1, [r0] adds r0, r3, 0 bl remove_task - b _0811571C + b @0811571C .align 2, 0 .pool -_08115710: +@08115710: ldr r1, =0x02022e20 ldrh r0, [r2, 0xA] strh r0, [r1] ldr r1, =0x02022e22 ldrh r0, [r2, 0xC] strh r0, [r1] -_0811571C: +@0811571C: pop {r4} pop {r0} bx r0 @@ -530504,7 +530504,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 @@ -530524,23 +530524,23 @@ sub_811572C: @ 811572C lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq _0811576C + beq @0811576C ldrh r0, [r5, 0x6] negs r0, r0 strh r0, [r4, 0x30] movs r0, 0x1 strh r0, [r4, 0x36] - b _0811577A + b @0811577A .align 2, 0 .pool -_0811576C: +@0811576C: ldrh r0, [r5, 0x6] strh r0, [r4, 0x30] strh r1, [r4, 0x36] adds r0, r4, 0 movs r1, 0x1 bl obj_anim_image_start -_0811577A: +@0811577A: ldr r0, =0x0203841e ldrh r0, [r0, 0x8] strh r0, [r4, 0x34] @@ -530556,7 +530556,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 @@ -530571,7 +530571,7 @@ sub_8115798: @ 8115798 strh r0, [r4, 0x26] ldrh r0, [r4, 0x2E] cmp r0, 0x7F - bhi _081157CA + bhi @081157CA ldrb r0, [r4, 0x5] movs r1, 0xD negs r1, r1 @@ -530579,13 +530579,13 @@ sub_8115798: @ 8115798 movs r0, 0x4 orrs r1, r0 strb r1, [r4, 0x5] - b _081157D2 -_081157CA: + b @081157D2 +@081157CA: ldrb r0, [r4, 0x5] movs r1, 0xC orrs r0, r1 strb r0, [r4, 0x5] -_081157D2: +@081157D2: ldrh r0, [r4, 0x30] ldrh r1, [r4, 0x2E] adds r0, r1 @@ -530600,17 +530600,17 @@ _081157D2: movs r2, 0x34 ldrsh r1, [r4, r2] cmp r0, r1 - bne _081157F6 + bne @081157F6 adds r0, r4, 0 bl move_anim_8072740 -_081157F6: +@081157F6: pop {r4} pop {r0} bx r0 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 @@ -530642,7 +530642,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} @@ -530681,7 +530681,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 @@ -530689,10 +530689,10 @@ sub_8115884: @ 8115884 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0811589A + bne @0811589A adds r0, r2, 0 bl move_anim_8072740 -_0811589A: +@0811589A: pop {r0} bx r0 .align 2, 0 @@ -530700,7 +530700,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 @@ -530741,34 +530741,34 @@ 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] movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0 - ble _0811590C + ble @0811590C subs r0, r1, 0x1 strh r0, [r4, 0x2E] - b _0811597C -_0811590C: + b @0811597C +@0811590C: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0811597C + bne @0811597C movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08115930 + bne @08115930 ldr r0, =sub_8115984 + 1 str r0, [r4, 0x1C] - b _0811597C + b @0811597C .align 2, 0 .pool -_08115930: +@08115930: movs r2, 0x3C ldrsh r0, [r4, r2] bl sub_811583C @@ -530778,22 +530778,22 @@ _08115930: lsls r0, 1 ands r0, r1 cmp r0, 0 - beq _08115956 + beq @08115956 ldrh r1, [r4, 0x36] lsls r1, 24 lsrs r1, 24 ldrh r2, [r4, 0x34] adds r0, r3, 0 bl sub_80A2A20 - b _08115964 -_08115956: + b @08115964 +@08115956: ldrh r1, [r4, 0x3A] lsls r1, 24 lsrs r1, 24 ldrh r2, [r4, 0x38] adds r0, r3, 0 bl sub_80A2A20 -_08115964: +@08115964: ldrh r0, [r4, 0x30] movs r2, 0x80 lsls r2, 1 @@ -530806,14 +530806,14 @@ _08115964: ldrh r0, [r4, 0x32] subs r0, 0x1 strh r0, [r4, 0x32] -_0811597C: +@0811597C: pop {r4} pop {r0} bx r0 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 @@ -530821,7 +530821,7 @@ sub_8115984: @ 8115984 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081159AA + bne @081159AA movs r1, 0x3C ldrsh r0, [r4, r1] bl sub_811583C @@ -530830,7 +530830,7 @@ sub_8115984: @ 8115984 bl sub_80A2A20 adds r0, r4, 0 bl move_anim_8072740 -_081159AA: +@081159AA: pop {r4} pop {r0} bx r0 @@ -530839,7 +530839,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 @@ -530877,7 +530877,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 @@ -530915,7 +530915,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 @@ -530957,7 +530957,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 @@ -530967,7 +530967,7 @@ sub_8115AA4: @ 8115AA4 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08115B06 + bne @08115B06 ldr r1, =0x03005e00 lsls r2, r3, 2 adds r0, r2, r3 @@ -530978,43 +530978,43 @@ sub_8115AA4: @ 8115AA4 adds r6, r1, 0 adds r5, r2, 0 cmp r0, 0 - ble _08115B00 + ble @08115B00 movs r1, 0x18 ldrsh r0, [r3, r1] cmp r0, 0 - bne _08115AE4 + bne @08115AE4 ldrb r1, [r3, 0xE] ldrb r2, [r3, 0x10] - b _08115AE8 + b @08115AE8 .align 2, 0 .pool -_08115AE4: +@08115AE4: ldrb r1, [r3, 0x10] ldrb r2, [r3, 0xE] -_08115AE8: +@08115AE8: adds r0, r5, r4 lsls r0, 3 adds r0, r6 movs r3, 0xC ldrsh r0, [r0, r3] cmp r0, 0x1 - bne _08115AF8 + bne @08115AF8 movs r2, 0 -_08115AF8: +@08115AF8: adds r0, r4, 0 bl sub_8115A54 - b _08115B06 -_08115B00: + b @08115B06 +@08115B00: adds r0, r4, 0 bl move_anim_task_del -_08115B06: +@08115B06: pop {r4-r6} pop {r0} bx r0 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 @@ -531047,37 +531047,37 @@ sub_8115B0C: @ 8115B0C mov r9, r3 mov r8, r2 cmp r5, r1 - bge _08115B74 + bge @08115B74 ldr r0, =0x02038436 ldrb r3, [r0] ldr r7, =0x02038437 movs r0, 0x1 mov r12, r0 adds r2, r1, 0 -_08115B5A: +@08115B5A: cmp r4, r3 - beq _08115B6E + beq @08115B6E ldrb r1, [r7] cmp r4, r1 - beq _08115B6E + beq @08115B6E adds r1, r4, 0 adds r1, 0x10 mov r0, r12 lsls r0, r1 orrs r5, r0 -_08115B6E: +@08115B6E: adds r4, 0x1 cmp r4, r2 - blt _08115B5A -_08115B74: + blt @08115B5A +@08115B74: mov r2, r8 movs r1, 0 ldrsh r0, [r2, r1] cmp r0, 0x1 - bne _08115B82 + bne @08115B82 movs r0, 0xE orrs r5, r0 -_08115B82: +@08115B82: lsls r4, r6, 2 adds r4, r6 lsls r4, 3 @@ -531104,7 +531104,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 @@ -531146,7 +531146,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 @@ -531156,7 +531156,7 @@ sub_8115C18: @ 8115C18 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08115C7A + bne @08115C7A ldr r1, =0x03005e00 lsls r2, r3, 2 adds r0, r2, r3 @@ -531167,43 +531167,43 @@ sub_8115C18: @ 8115C18 adds r6, r1, 0 adds r5, r2, 0 cmp r0, 0 - ble _08115C74 + ble @08115C74 movs r1, 0x18 ldrsh r0, [r3, r1] cmp r0, 0 - bne _08115C58 + bne @08115C58 ldrb r1, [r3, 0xE] ldrb r2, [r3, 0x10] - b _08115C5C + b @08115C5C .align 2, 0 .pool -_08115C58: +@08115C58: ldrb r1, [r3, 0x10] ldrb r2, [r3, 0xE] -_08115C5C: +@08115C5C: adds r0, r5, r4 lsls r0, 3 adds r0, r6 movs r3, 0xC ldrsh r0, [r0, r3] cmp r0, 0x1 - bne _08115C6C + bne @08115C6C movs r2, 0 -_08115C6C: +@08115C6C: adds r0, r4, 0 bl sub_8115BC8 - b _08115C7A -_08115C74: + b @08115C7A +@08115C74: adds r0, r4, 0 bl move_anim_task_del -_08115C7A: +@08115C7A: pop {r4-r6} pop {r0} bx r0 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 @@ -531241,7 +531241,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 @@ -531288,7 +531288,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 @@ -531298,7 +531298,7 @@ sub_8115D2C: @ 8115D2C movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08115D8E + bne @08115D8E ldr r1, =0x03005e00 lsls r2, r3, 2 adds r0, r2, r3 @@ -531309,43 +531309,43 @@ sub_8115D2C: @ 8115D2C adds r6, r1, 0 adds r5, r2, 0 cmp r0, 0 - ble _08115D88 + ble @08115D88 movs r1, 0x18 ldrsh r0, [r3, r1] cmp r0, 0 - bne _08115D6C + bne @08115D6C ldrb r1, [r3, 0xE] ldrb r2, [r3, 0x10] - b _08115D70 + b @08115D70 .align 2, 0 .pool -_08115D6C: +@08115D6C: ldrb r1, [r3, 0x10] ldrb r2, [r3, 0xE] -_08115D70: +@08115D70: adds r0, r5, r4 lsls r0, 3 adds r0, r6 movs r3, 0xC ldrsh r0, [r0, r3] cmp r0, 0x1 - bne _08115D80 + bne @08115D80 movs r2, 0 -_08115D80: +@08115D80: adds r0, r4, 0 bl sub_8115CD0 - b _08115D8E -_08115D88: + b @08115D8E +@08115D88: adds r0, r4, 0 bl move_anim_task_del -_08115D8E: +@08115D8E: pop {r4-r6} pop {r0} bx r0 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 @@ -531397,7 +531397,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 @@ -531411,29 +531411,29 @@ sub_8115E00: @ 8115E00 movs r2, 0x8 ldrsh r0, [r4, r2] cmp r0, 0 - ble _08115E28 + ble @08115E28 subs r0, r1, 0x1 strh r0, [r4, 0x8] - b _08115EAC + b @08115EAC .align 2, 0 .pool -_08115E28: +@08115E28: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08115EAC + bne @08115EAC movs r3, 0xC ldrsh r0, [r4, r3] cmp r0, 0 - bne _08115E4C + bne @08115E4C ldr r0, =sub_8115EB8 + 1 str r0, [r4] - b _08115EAC + b @08115EAC .align 2, 0 .pool -_08115E4C: +@08115E4C: ldrh r0, [r4, 0x16] bl gpu_pal_tags_index_of lsls r0, 24 @@ -531446,7 +531446,7 @@ _08115E4C: lsls r0, 1 ands r0, r1 cmp r0, 0 - beq _08115E7A + beq @08115E7A ldrb r3, [r4, 0x10] ldrh r0, [r4, 0xE] str r0, [sp] @@ -531454,8 +531454,8 @@ _08115E4C: movs r1, 0 adds r2, r3, 0 bl sub_80A1AD4 - b _08115E8A -_08115E7A: + b @08115E8A +@08115E7A: ldrb r3, [r4, 0x14] ldrh r0, [r4, 0x12] str r0, [sp] @@ -531463,7 +531463,7 @@ _08115E7A: movs r1, 0 adds r2, r3, 0 bl sub_80A1AD4 -_08115E8A: +@08115E8A: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -531481,7 +531481,7 @@ _08115E8A: ldrh r0, [r1, 0xC] subs r0, 0x1 strh r0, [r1, 0xC] -_08115EAC: +@08115EAC: add sp, 0x4 pop {r4,r5} pop {r0} @@ -531491,7 +531491,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 @@ -531503,7 +531503,7 @@ sub_8115EB8: @ 8115EB8 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _08115EFE + bne @08115EFE ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -531524,7 +531524,7 @@ sub_8115EB8: @ 8115EB8 bl sub_80A1AD4 adds r0, r4, 0 bl move_anim_task_del -_08115EFE: +@08115EFE: add sp, 0x4 pop {r4,r5} pop {r0} @@ -531534,7 +531534,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} @@ -531554,7 +531554,7 @@ sub_8115F10: @ 8115F10 adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _08115F4A + beq @08115F4A str r2, [sp] str r2, [sp, 0x4] str r2, [sp, 0x8] @@ -531563,27 +531563,27 @@ sub_8115F10: @ 8115F10 movs r3, 0 bl sub_80A75AC adds r2, r0, 0 -_08115F4A: +@08115F4A: ldrh r1, [r4, 0x2] adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _08115F5C + beq @08115F5C movs r0, 0x80 lsls r0, 9 lsls r0, r6 orrs r2, r0 -_08115F5C: +@08115F5C: ldrh r1, [r4, 0x4] adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _08115F6E + beq @08115F6E movs r0, 0x80 lsls r0, 9 lsls r0, r7 orrs r2, r0 -_08115F6E: +@08115F6E: adds r0, r2, 0 bl sub_80A2218 mov r0, r8 @@ -531599,7 +531599,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 @@ -531617,7 +531617,7 @@ sub_8115F94: @ 8115F94 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08115FD6 + bne @08115FD6 ldr r1, =0x0203841e ldrh r0, [r1] strh r0, [r4, 0xC] @@ -531633,7 +531633,7 @@ sub_8115F94: @ 8115F94 strh r0, [r4, 0x14] ldrh r0, [r1, 0xC] strh r0, [r4, 0x16] -_08115FD6: +@08115FD6: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -531649,14 +531649,14 @@ _08115FD6: adds r0, r7, 0 ands r0, r1 cmp r0, 0 - beq _08115FF8 + beq @08115FF8 ldr r5, =0x0000ffff -_08115FF8: +@08115FF8: movs r6, 0x1 adds r0, r6, 0 ands r0, r1 cmp r0, 0 - beq _08116028 + beq @08116028 ldr r2, =0x02020630 ldr r0, =0x03005d70 add r0, r9 @@ -531675,29 +531675,29 @@ _08115FF8: lsls r1, r0 lsls r1, 16 orrs r5, r1 -_08116028: +@08116028: ldrh r1, [r4, 0xE] adds r0, r7, 0 ands r0, r1 cmp r0, 0 - beq _0811603C + beq @0811603C adds r0, r6, 0 mov r2, r9 lsls r0, r2 lsls r0, 16 orrs r5, r0 -_0811603C: +@0811603C: ldrh r1, [r4, 0x10] adds r0, r7, 0 ands r0, r1 cmp r0, 0 - beq _08116050 + beq @08116050 adds r0, r6, 0 mov r1, r10 lsls r0, r1 lsls r0, 16 orrs r5, r0 -_08116050: +@08116050: movs r1, 0x12 ldrsb r1, [r4, r1] movs r2, 0x14 @@ -531711,12 +531711,12 @@ _08116050: movs r2, 0xA ldrsh r0, [r4, r2] cmp r1, r0 - bne _0811607A + bne @0811607A adds r0, r5, 0 bl sub_80A2334 mov r0, r8 bl move_anim_task_del -_0811607A: +@0811607A: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -531729,7 +531729,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 @@ -531750,41 +531750,41 @@ sub_81160A4: @ 81160A4 movs r2, 0x6 ldrsh r0, [r1, r2] cmp r0, 0x1 - beq _081160EC + beq @081160EC cmp r0, 0x1 - bgt _081160DC + bgt @081160DC cmp r0, 0 - beq _081160E2 - b _08116104 + beq @081160E2 + b @08116104 .align 2, 0 .pool -_081160DC: +@081160DC: cmp r0, 0x2 - beq _081160F4 - b _08116104 -_081160E2: + beq @081160F4 + b @08116104 +@081160E2: ldr r1, =0x02022e20 - b _081160F6 + b @081160F6 .align 2, 0 .pool -_081160EC: +@081160EC: ldr r1, =0x02022e22 - b _081160F6 + b @081160F6 .align 2, 0 .pool -_081160F4: +@081160F4: ldr r1, =0x02021bbc -_081160F6: +@081160F6: adds r0, r4, 0 bl oamt_set_x3A_32 - b _0811610C + b @0811610C .align 2, 0 .pool -_08116104: +@08116104: ldr r1, =0x02021bbe adds r0, r4, 0 bl oamt_set_x3A_32 -_0811610C: +@0811610C: movs r0, 0x3A ldrsh r1, [r4, r0] movs r2, 0x3C @@ -531800,9 +531800,9 @@ _0811610C: lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bhi _08116130 + bhi @08116130 bl sub_81161F4 -_08116130: +@08116130: ldr r0, =sub_8116148 + 1 str r0, [r4, 0x1C] pop {r4} @@ -531813,25 +531813,25 @@ _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] movs r2, 0x34 ldrsh r0, [r3, r2] cmp r0, 0 - ble _0811618A + ble @0811618A subs r0, r1, 0x1 strh r0, [r3, 0x34] ldrh r1, [r3, 0x30] movs r2, 0x30 ldrsh r0, [r3, r2] cmp r0, 0 - ble _0811616A + ble @0811616A subs r0, r1, 0x1 strh r0, [r3, 0x30] - b _081161E2 -_0811616A: + b @081161E2 +@0811616A: ldrh r0, [r3, 0x32] strh r0, [r3, 0x30] movs r0, 0x3A @@ -531847,8 +531847,8 @@ _0811616A: ldrh r0, [r3, 0x2E] negs r0, r0 strh r0, [r3, 0x2E] - b _081161E2 -_0811618A: + b @081161E2 +@0811618A: movs r0, 0x3A ldrsh r1, [r3, r0] movs r2, 0x3C @@ -531862,18 +531862,18 @@ _0811618A: lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bhi _081161DC + bhi @081161DC movs r4, 0 ldr r5, =0x0202406c ldrb r0, [r5] cmp r4, r0 - bcs _081161DC + bcs @081161DC ldr r2, =0x02020630 mov r12, r2 ldr r6, =0x020241e4 movs r7, 0x3 negs r7, r7 -_081161BA: +@081161BA: adds r0, r4, r6 ldrb r0, [r0] lsls r1, r0, 4 @@ -531890,11 +531890,11 @@ _081161BA: lsrs r4, r0, 24 ldrb r0, [r5] cmp r4, r0 - bcc _081161BA -_081161DC: + bcc @081161BA +@081161DC: adds r0, r3, 0 bl move_anim_8072740 -_081161E2: +@081161E2: pop {r4-r7} pop {r0} bx r0 @@ -531903,7 +531903,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 @@ -531938,7 +531938,7 @@ sub_81161F4: @ 81161F4 movs r1, 0x8 ldrsh r0, [r0, r1] cmp r0, 0x2 - bne _0811627C + bne @0811627C ldrb r0, [r5] adds r0, r4 ldrb r1, [r0] @@ -531960,17 +531960,17 @@ sub_81161F4: @ 81161F4 adds r0, r6 adds r0, 0x3E ldrb r1, [r0] - b _08116298 + b @08116298 .align 2, 0 .pool -_0811627C: +@0811627C: cmp r0, 0 - bne _08116284 + bne @08116284 ldrb r0, [r5] - b _08116286 -_08116284: + b @08116286 +@08116284: ldrb r0, [r3] -_08116286: +@08116286: adds r0, r4 ldrb r1, [r0] lsls r0, r1, 4 @@ -531980,7 +531980,7 @@ _08116286: adds r0, 0x3E ldrb r1, [r0] movs r2, 0x2 -_08116298: +@08116298: orrs r1, r2 strb r1, [r0] pop {r4-r6} @@ -531989,7 +531989,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 @@ -532026,7 +532026,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 @@ -532040,22 +532040,22 @@ sub_81162F8: @ 81162F8 ldrsh r0, [r3, r4] mov r12, r1 cmp r0, 0 - bne _0811637E + bne @0811637E ldr r0, =0x02022e20 ldrh r2, [r0] movs r7, 0x8 ldrsh r1, [r3, r7] adds r6, r0, 0 cmp r2, r1 - bne _08116330 + bne @08116330 ldrh r0, [r3, 0x8] negs r0, r0 - b _08116332 + b @08116332 .align 2, 0 .pool -_08116330: +@08116330: ldrh r0, [r3, 0x8] -_08116332: +@08116332: strh r0, [r6] ldr r2, =0x02022e22 ldrh r3, [r2] @@ -532067,15 +532067,15 @@ _08116332: movs r7, 0xA ldrsh r0, [r4, r7] cmn r3, r0 - bne _08116354 + bne @08116354 movs r0, 0 - b _08116358 + b @08116358 .align 2, 0 .pool -_08116354: +@08116354: ldrh r0, [r4, 0xA] negs r0, r0 -_08116358: +@08116358: strh r0, [r2] adds r0, r1, r5 lsls r0, 3 @@ -532088,23 +532088,23 @@ _08116358: lsls r1, 16 asrs r1, 16 cmp r1, 0 - bne _08116382 + bne @08116382 strh r1, [r6] strh r1, [r2] adds r0, r5, 0 bl move_anim_task_del - b _08116382 -_0811637E: + b @08116382 +@0811637E: subs r0, r2, 0x1 strh r0, [r3, 0xE] -_08116382: +@08116382: pop {r4-r7} pop {r0} bx r0 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 @@ -532113,18 +532113,18 @@ sub_8116388: @ 8116388 movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0 - bne _081163AC + bne @081163AC adds r0, r5, 0 movs r1, 0x1 bl sub_80A69CC - b _081163B4 + b @081163B4 .align 2, 0 .pool -_081163AC: +@081163AC: adds r0, r5, 0 movs r1, 0x1 bl sub_80A6980 -_081163B4: +@081163B4: ldr r0, =sub_80A67BC + 1 str r0, [r5, 0x1C] ldr r1, =move_anim_8072740 + 1 @@ -532138,7 +532138,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 @@ -532147,18 +532147,18 @@ sub_81163D0: @ 81163D0 movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0 - bne _081163F4 + bne @081163F4 adds r0, r5, 0 movs r1, 0x1 bl sub_80A69CC - b _081163FC + b @081163FC .align 2, 0 .pool -_081163F4: +@081163F4: adds r0, r5, 0 movs r1, 0x1 bl sub_80A6980 -_081163FC: +@081163FC: ldr r0, =0x0203841e ldrh r0, [r0, 0x8] strh r0, [r5, 0x2E] @@ -532175,7 +532175,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 @@ -532183,16 +532183,16 @@ sub_8116420: @ 8116420 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08116444 + beq @08116444 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _08116444 + bne @08116444 ldr r1, =0x0203841e ldrh r0, [r1, 0x2] negs r0, r0 strh r0, [r1, 0x2] -_08116444: +@08116444: adds r0, r4, 0 bl sub_8116388 pop {r4} @@ -532203,7 +532203,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 @@ -532212,30 +532212,30 @@ sub_8116458: @ 8116458 movs r0, 0x1 negs r0, r0 cmp r1, r0 - bne _08116474 + bne @08116474 bl GenerateRandomNumber2 movs r1, 0x3 ands r1, r0 strh r1, [r5, 0x2] -_08116474: +@08116474: ldrb r1, [r5, 0x2] adds r0, r4, 0 bl sub_8008258 movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0 - bne _08116494 + bne @08116494 adds r0, r4, 0 movs r1, 0 bl sub_80A69CC - b _0811649C + b @0811649C .align 2, 0 .pool -_08116494: +@08116494: adds r0, r4, 0 movs r1, 0 bl sub_80A6980 -_0811649C: +@0811649C: bl GenerateRandomNumber2 lsls r0, 16 lsrs r0, 16 @@ -532269,7 +532269,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 @@ -532319,25 +532319,25 @@ 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 movs r1, 0x4 ldrsh r0, [r0, r1] cmp r0, 0 - bne _0811657C + bne @0811657C adds r0, r4, 0 movs r1, 0x1 bl sub_80A69CC - b _08116584 + b @08116584 .align 2, 0 .pool -_0811657C: +@0811657C: adds r0, r4, 0 movs r1, 0x1 bl sub_80A6980 -_08116584: +@08116584: ldr r0, =0x0203841e ldrh r0, [r0, 0x6] strh r0, [r4, 0x2E] @@ -532354,7 +532354,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 @@ -532363,18 +532363,18 @@ sub_81165A8: @ 81165A8 movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0 - bne _081165CC + bne @081165CC adds r0, r5, 0 movs r1, 0x1 bl sub_80A69CC - b _081165D4 + b @081165D4 .align 2, 0 .pool -_081165CC: +@081165CC: adds r0, r5, 0 movs r1, 0x1 bl sub_80A6980 -_081165D4: +@081165D4: ldr r0, =sub_81165E4 + 1 str r0, [r5, 0x1C] pop {r4,r5} @@ -532385,7 +532385,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 @@ -532409,16 +532409,16 @@ sub_81165E4: @ 81165E4 lsls r0, 16 asrs r0, 16 cmp r0, 0xC - ble _0811661A + ble @0811661A adds r0, r3, 0 bl move_anim_8072740 -_0811661A: +@0811661A: pop {r0} bx r0 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 @@ -532452,7 +532452,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 @@ -532467,44 +532467,44 @@ sub_8116664: @ 8116664 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x7 - bhi _0811670E + bhi @0811670E lsls r0, 2 - ldr r1, =_08116698 + ldr r1, =@08116698 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08116698: - .4byte _081166BA - .4byte _081166C6 - .4byte _081166B8 - .4byte _081166C4 - .4byte _081166D4 - .4byte _081166EC - .4byte _081166F4 - .4byte _08116700 -_081166B8: +@08116698: + .4byte @081166BA + .4byte @081166C6 + .4byte @081166B8 + .4byte @081166C4 + .4byte @081166D4 + .4byte @081166EC + .4byte @081166F4 + .4byte @08116700 +@081166B8: movs r5, 0 -_081166BA: +@081166BA: mov r0, sp ldr r1, =0x02038436 - b _081166CA + b @081166CA .align 2, 0 .pool -_081166C4: +@081166C4: movs r5, 0 -_081166C6: +@081166C6: mov r0, sp ldr r1, =0x02038437 -_081166CA: +@081166CA: ldrb r1, [r1] strb r1, [r0] - b _0811670E + b @0811670E .align 2, 0 .pool -_081166D4: +@081166D4: mov r1, sp ldr r0, =0x02038436 ldrb r0, [r0] @@ -532512,45 +532512,45 @@ _081166D4: ldr r0, =0x02038437 ldrb r0, [r0] strb r0, [r1, 0x1] - b _0811670E + b @0811670E .align 2, 0 .pool -_081166EC: +@081166EC: mov r1, sp movs r0, 0xFF strb r0, [r1] - b _0811670E -_081166F4: + b @0811670E +@081166F4: movs r5, 0 mov r2, sp ldr r0, =0x02038436 - b _08116706 + b @08116706 .align 2, 0 .pool -_08116700: +@08116700: movs r5, 0 mov r2, sp ldr r0, =0x02038437 -_08116706: +@08116706: ldrb r0, [r0] movs r1, 0x2 eors r0, r1 strb r0, [r2] -_0811670E: +@0811670E: movs r4, 0 mov r6, sp -_08116712: +@08116712: ldrb r0, [r6] cmp r4, r0 - beq _0811673C + beq @0811673C ldrb r0, [r6, 0x1] cmp r4, r0 - beq _0811673C + beq @0811673C adds r0, r4, 0 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _0811673C + beq @0811673C adds r0, r4, 0 bl sub_80A77AC lsls r0, 24 @@ -532559,12 +532559,12 @@ _08116712: lsls r1, 9 lsls r1, r0 orrs r5, r1 -_0811673C: +@0811673C: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _08116712 + bls @08116712 adds r0, r7, 0 adds r1, r5, 0 bl sub_8116874 @@ -532577,7 +532577,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 @@ -532589,82 +532589,82 @@ sub_811675C: @ 811675C ldr r0, =0x02022ff0 ldrb r0, [r0] cmp r0, 0x9 - bhi _08116832 + bhi @08116832 lsls r0, 2 - ldr r1, =_0811678C + ldr r1, =@0811678C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0811678C: - .4byte _081167B4 - .4byte _081167C4 - .4byte _081167D0 - .4byte _081167E0 - .4byte _081167EC - .4byte _081167FC - .4byte _0811680C - .4byte _0811681C - .4byte _0811682C - .4byte _0811682C -_081167B4: +@0811678C: + .4byte @081167B4 + .4byte @081167C4 + .4byte @081167D0 + .4byte @081167E0 + .4byte @081167EC + .4byte @081167FC + .4byte @0811680C + .4byte @0811681C + .4byte @0811682C + .4byte @0811682C +@081167B4: ldr r1, =0x0203841e ldr r0, =0x00000b0c - b _08116830 + b @08116830 .align 2, 0 .pool -_081167C4: +@081167C4: ldr r1, =0x0203841e movs r0, 0x9E lsls r0, 4 - b _08116830 + b @08116830 .align 2, 0 .pool -_081167D0: +@081167D0: ldr r1, =0x0203841e ldr r0, =0x00002f1e - b _08116830 + b @08116830 .align 2, 0 .pool -_081167E0: +@081167E0: ldr r1, =0x0203841e movs r0, 0x90 lsls r0, 7 - b _08116830 + b @08116830 .align 2, 0 .pool -_081167EC: +@081167EC: ldr r1, =0x0203841e ldr r0, =0x00007ecb - b _08116830 + b @08116830 .align 2, 0 .pool -_081167FC: +@081167FC: ldr r1, =0x0203841e ldr r0, =0x00007ecb - b _08116830 + b @08116830 .align 2, 0 .pool -_0811680C: +@0811680C: ldr r1, =0x0203841e ldr r0, =0x00002a16 - b _08116830 + b @08116830 .align 2, 0 .pool -_0811681C: +@0811681C: ldr r1, =0x0203841e ldr r0, =0x00000d2e - b _08116830 + b @08116830 .align 2, 0 .pool -_0811682C: +@0811682C: ldr r1, =0x0203841e ldr r0, =0x00007fff -_08116830: +@08116830: strh r0, [r1, 0x8] -_08116832: +@08116832: adds r0, r4, 0 adds r1, r2, 0 bl sub_8116874 @@ -532676,7 +532676,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 @@ -532699,7 +532699,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 @@ -532732,7 +532732,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 @@ -532753,7 +532753,7 @@ sub_81168B8: @ 81168B8 ldrsh r0, [r3, r4] mov r9, r2 cmp r1, r0 - bne _0811694E + bne @0811694E strh r6, [r3, 0x1A] movs r0, 0x8 ldrsh r4, [r3, r0] @@ -532763,27 +532763,27 @@ sub_81168B8: @ 81168B8 orrs r4, r0 mov r8, r5 cmp r4, 0 - beq _0811691A + beq @0811691A adds r5, r3, 0 -_081168F8: +@081168F8: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _0811690C + beq @0811690C ldrb r2, [r5, 0x1C] ldrh r3, [r5, 0x12] adds r0, r6, 0 movs r1, 0x10 bl pal_fade_1 -_0811690C: +@0811690C: adds r0, r6, 0 adds r0, 0x10 lsls r0, 16 lsrs r6, r0, 16 lsrs r4, 1 cmp r4, 0 - bne _081168F8 -_0811691A: + bne @081168F8 +@0811691A: mov r4, r8 adds r0, r4, r7 lsls r0, 3 @@ -532795,27 +532795,27 @@ _0811691A: movs r4, 0x10 ldrsh r1, [r2, r4] cmp r3, r1 - bge _0811693C + bge @0811693C adds r0, 0x1 strh r0, [r2, 0x1C] - b _08116954 + b @08116954 .align 2, 0 .pool -_0811693C: +@0811693C: cmp r3, r1 - ble _08116946 + ble @08116946 subs r0, 0x1 strh r0, [r2, 0x1C] - b _08116954 -_08116946: + b @08116954 +@08116946: adds r0, r7, 0 bl move_anim_task_del - b _08116954 -_0811694E: + b @08116954 +@0811694E: mov r0, r8 adds r0, 0x1 strh r0, [r3, 0x1A] -_08116954: +@08116954: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -532825,7 +532825,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 @@ -532855,7 +532855,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 @@ -532864,10 +532864,10 @@ sub_81169A0: @ 81169A0 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081169B8 + bne @081169B8 adds r0, r2, 0 bl move_anim_task_del -_081169B8: +@081169B8: pop {r0} bx r0 .align 2, 0 @@ -532875,7 +532875,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 @@ -532903,7 +532903,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 @@ -532916,24 +532916,24 @@ sub_81169F8: @ 81169F8 movs r1, 0x10 ldrsh r0, [r4, r1] cmp r0, 0 - beq _08116ABC + beq @08116ABC ldrh r1, [r4, 0xA] movs r2, 0xA ldrsh r0, [r4, r2] cmp r0, 0 - beq _08116A28 + beq @08116A28 subs r0, r1, 0x1 strh r0, [r4, 0xA] - b _08116ACA + b @08116ACA .align 2, 0 .pool -_08116A28: +@08116A28: ldrb r0, [r4, 0x8] bl duplicate_obj_of_side_rel2move_in_transparent_mode strh r0, [r4, 0x14] lsls r0, 16 cmp r0, 0 - blt _08116AA6 + blt @08116AA6 ldr r6, =0x02020630 movs r1, 0x14 ldrsh r0, [r4, r1] @@ -532945,9 +532945,9 @@ _08116A28: ldrsh r0, [r4, r2] movs r2, 0x2 cmp r0, 0 - beq _08116A50 + beq @08116A50 movs r2, 0x1 -_08116A50: +@08116A50: lsls r2, 2 ldrb r1, [r3, 0x5] movs r0, 0xD @@ -532991,41 +532991,41 @@ _08116A50: ldrh r0, [r4, 0x12] adds r0, 0x1 strh r0, [r4, 0x12] -_08116AA6: +@08116AA6: ldrh r0, [r4, 0x10] subs r0, 0x1 strh r0, [r4, 0x10] ldrh r0, [r4, 0xC] strh r0, [r4, 0xA] - b _08116ACA + b @08116ACA .align 2, 0 .pool -_08116ABC: +@08116ABC: movs r1, 0x12 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08116ACA + bne @08116ACA adds r0, r2, 0 bl move_anim_task_del -_08116ACA: +@08116ACA: pop {r4-r6} pop {r0} bx r0 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] movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0 - beq _08116AE4 + beq @08116AE4 subs r0, r1, 0x1 strh r0, [r4, 0x2E] - b _08116B08 -_08116AE4: + b @08116B08 +@08116AE4: ldr r3, =0x03005e00 movs r0, 0x32 ldrsh r1, [r4, r0] @@ -533043,7 +533043,7 @@ _08116AE4: strh r0, [r1] adds r0, r4, 0 bl obj_delete_but_dont_free_vram -_08116B08: +@08116B08: pop {r4} pop {r0} bx r0 @@ -533052,7 +533052,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 @@ -533104,7 +533104,7 @@ sub_8116B14: @ 8116B14 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _08116BA2 + bne @08116BA2 ldrb r1, [r4] movs r0, 0xD negs r0, r0 @@ -533115,28 +533115,28 @@ sub_8116B14: @ 8116B14 ldrh r1, [r4] movs r0, 0xA bl lcd_io_set -_08116BA2: +@08116BA2: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _08116C26 + beq @08116C26 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _08116C26 + bne @08116C26 ldr r5, =0x02038436 ldrb r0, [r5] bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - beq _08116BD2 + beq @08116BD2 ldrb r0, [r5] bl battle_get_per_side_status lsls r0, 24 cmp r0, 0 - bne _08116C26 -_08116BD2: + bne @08116C26 +@08116BD2: ldrb r0, [r5] movs r6, 0x2 eors r0, r6 @@ -533144,7 +533144,7 @@ _08116BD2: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08116C26 + bne @08116C26 ldr r3, =0x02020630 ldr r1, =0x020241e4 ldrb r0, [r5] @@ -533177,25 +533177,25 @@ _08116BD2: movs r0, 0xA bl lcd_io_set movs r7, 0x1 -_08116C26: +@08116C26: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _08116C64 + beq @08116C64 ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r5, [r0] - b _08116CAC + b @08116CAC .align 2, 0 .pool -_08116C64: +@08116C64: ldr r4, =0x02038436 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08116C90 + beq @08116C90 ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 @@ -533204,10 +533204,10 @@ _08116C64: movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 - b _08116CA0 + b @08116CA0 .align 2, 0 .pool -_08116C90: +@08116C90: ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 @@ -533216,13 +533216,13 @@ _08116C90: movs r0, 0x64 muls r0, r1 ldr r1, =0x020244ec -_08116CA0: +@08116CA0: adds r0, r1 movs r1, 0xB bl pokemon_getattr lsls r0, 16 lsrs r5, r0, 16 -_08116CAC: +@08116CAC: movs r0, 0 bl obj_id_for_side_relative_to_move adds r4, r0, 0 @@ -533292,7 +533292,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} @@ -533317,7 +533317,7 @@ sub_8116D64: @ 8116D64 lsls r0, 16 asrs r0, 16 cmp r0, 0x40 - bne _08116E86 + bne @08116E86 mov r0, r8 strh r0, [r5, 0x1C] adds r0, r2, 0 @@ -533329,7 +533329,7 @@ sub_8116D64: @ 8116D64 lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne _08116E86 + bne @08116E86 movs r0, 0 bl sub_80A477C ldr r0, =0x02022e24 @@ -533347,7 +533347,7 @@ sub_8116D64: @ 8116D64 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _08116DF6 + bne @08116DF6 movs r0, 0xA bl lcd_io_get add r1, sp, 0x10 @@ -533360,7 +533360,7 @@ sub_8116D64: @ 8116D64 ldrh r1, [r1] movs r0, 0xA bl lcd_io_set -_08116DF6: +@08116DF6: movs r0, 0 bl lcd_io_get adds r1, r0, 0 @@ -533396,7 +533396,7 @@ _08116DF6: movs r1, 0x14 ldrsh r0, [r5, r1] cmp r0, 0x1 - bne _08116E7C + bne @08116E7C ldr r2, =0x020241e4 ldr r0, =0x02038436 ldrb r1, [r0] @@ -533420,12 +533420,12 @@ _08116DF6: ands r0, r3 orrs r0, r1 strb r0, [r2, 0x5] -_08116E7C: +@08116E7C: mov r2, r8 strh r2, [r7] adds r0, r6, 0 bl move_anim_task_del -_08116E86: +@08116E86: add sp, 0x14 pop {r3} mov r8, r3 @@ -533437,7 +533437,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 @@ -533447,7 +533447,7 @@ sub_8116EB4: @ 8116EB4 str r0, [r4] movs r2, 0 ldr r3, =0x0203841e -_08116EC8: +@08116EC8: ldr r1, [r4] lsls r0, r2, 1 adds r1, 0x4 @@ -533459,7 +533459,7 @@ _08116EC8: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x7 - bls _08116EC8 + bls @08116EC8 ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -533475,7 +533475,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 @@ -533484,14 +533484,14 @@ sub_8116F04: @ 8116F04 movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0 - bne _08116F24 + bne @08116F24 ldr r0, =0x02038436 - b _08116F26 + b @08116F26 .align 2, 0 .pool -_08116F24: +@08116F24: ldr r0, =0x02038437 -_08116F26: +@08116F26: ldrb r0, [r0] strb r0, [r1] ldr r4, =0x0203a110 @@ -533503,22 +533503,22 @@ _08116F26: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _08116F56 + bne @08116F56 ldr r1, [r4] movs r2, 0xA ldrsh r0, [r1, r2] cmp r0, 0 - beq _08116F5C + beq @08116F5C ldrb r0, [r1, 0x1] bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - bne _08116F5C -_08116F56: + bne @08116F5C +@08116F56: ldr r1, [r4] movs r0, 0 strh r0, [r1, 0xA] -_08116F5C: +@08116F5C: ldr r0, =0x02022e24 movs r1, 0 strh r1, [r0] @@ -533552,42 +533552,42 @@ _08116F5C: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _08116FBA + bne @08116FBA movs r0, 0x1 movs r1, 0x3 movs r2, 0x1 bl lcd_bg_operations -_08116FBA: +@08116FBA: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _08117036 + beq @08117036 ldr r4, =0x0203a110 ldr r1, [r4] movs r2, 0xA ldrsh r0, [r1, r2] cmp r0, 0 - bne _08117036 + bne @08117036 ldrb r0, [r1] bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - beq _08116FEC + beq @08116FEC ldr r0, [r4] ldrb r0, [r0] bl battle_get_per_side_status lsls r0, 24 cmp r0, 0 - bne _08117036 -_08116FEC: + bne @08117036 +@08116FEC: ldr r0, [r4] ldrb r0, [r0, 0x1] bl b_side_obj__get_some_boolean lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x1 - bne _08117036 + bne @08117036 ldr r3, =0x02020630 ldr r1, =0x020241e4 ldr r0, [r4] @@ -533616,28 +533616,28 @@ _08116FEC: bl lcd_bg_operations ldr r0, [r4] strb r5, [r0, 0x2] -_08117036: +@08117036: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _08117078 + beq @08117078 ldr r0, =0x0203a110 ldr r1, [r0] ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r0, [r0] - b _081170C4 + b @081170C4 .align 2, 0 .pool -_08117078: +@08117078: ldr r4, =0x0203a110 ldr r0, [r4] ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _081170A8 + beq @081170A8 ldr r1, =0x0202406e ldr r0, [r4] ldrb r0, [r0] @@ -533647,10 +533647,10 @@ _08117078: movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 - b _081170BA + b @081170BA .align 2, 0 .pool -_081170A8: +@081170A8: ldr r1, =0x0202406e ldr r0, [r4] ldrb r0, [r0] @@ -533660,12 +533660,12 @@ _081170A8: movs r0, 0x64 muls r0, r1 ldr r1, =0x020244ec -_081170BA: +@081170BA: adds r0, r1 movs r1, 0xB bl pokemon_getattr ldr r1, [r4] -_081170C4: +@081170C4: strh r0, [r1, 0x14] ldr r0, =0x03005e00 lsls r1, r6, 2 @@ -533682,7 +533682,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} @@ -533705,7 +533705,7 @@ sub_81170EC: @ 81170EC movs r1, 0xA ldrsh r0, [r2, r1] cmp r0, 0 - beq _0811712E + beq @0811712E ldrb r0, [r2, 0x1] adds r1, r0, r6 ldrb r1, [r1] @@ -533714,27 +533714,27 @@ sub_81170EC: @ 81170EC lsls r0, 24 lsrs r0, 24 mov r8, r0 -_0811712E: +@0811712E: mov r0, sp bl sub_80A6B30 ldr r0, [r4] movs r4, 0x4 ldrsh r0, [r0, r4] cmp r0, 0 - bne _08117158 + bne @08117158 ldr r1, =0x08c2d930 mov r0, sp movs r2, 0 bl sub_80A6D60 - b _08117162 + b @08117162 .align 2, 0 .pool -_08117158: +@08117158: ldr r1, =0x08c2da4c mov r0, sp movs r2, 0 bl sub_80A6D60 -_08117162: +@08117162: mov r0, sp ldrb r0, [r0, 0x9] ldr r1, =0x08c2d720 @@ -533746,72 +533746,72 @@ _08117162: movs r1, 0x6 ldrsh r0, [r0, r1] cmp r0, 0x6 - bhi _081171F8 + bhi @081171F8 lsls r0, 2 - ldr r1, =_08117198 + ldr r1, =@08117198 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08117198: - .4byte _081171B4 - .4byte _081171BC - .4byte _081171C4 - .4byte _081171CC - .4byte _081171D4 - .4byte _081171DC - .4byte _081171E4 -_081171B4: +@08117198: + .4byte @081171B4 + .4byte @081171BC + .4byte @081171C4 + .4byte @081171CC + .4byte @081171D4 + .4byte @081171DC + .4byte @081171E4 +@081171B4: ldr r0, =0x08c2db88 - b _081171E6 + b @081171E6 .align 2, 0 .pool -_081171BC: +@081171BC: ldr r0, =0x08c2db68 - b _081171E6 + b @081171E6 .align 2, 0 .pool -_081171C4: +@081171C4: ldr r0, =0x08c2dba8 - b _081171E6 + b @081171E6 .align 2, 0 .pool -_081171CC: +@081171CC: ldr r0, =0x08c2dbc8 - b _081171E6 + b @081171E6 .align 2, 0 .pool -_081171D4: +@081171D4: ldr r0, =0x08c2dc08 - b _081171E6 + b @081171E6 .align 2, 0 .pool -_081171DC: +@081171DC: ldr r0, =0x08c2dc28 - b _081171E6 + b @081171E6 .align 2, 0 .pool -_081171E4: +@081171E4: ldr r0, =0x08c2dc48 -_081171E6: +@081171E6: mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 movs r2, 0x20 bl decompress_palette - b _08117206 + b @08117206 .align 2, 0 .pool -_081171F8: +@081171F8: ldr r0, =0x08c2dbe8 mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 movs r2, 0x20 bl decompress_palette -_08117206: +@08117206: ldr r3, =0x02022e18 movs r2, 0 strh r2, [r3] @@ -533823,7 +533823,7 @@ _08117206: ldrsh r0, [r0, r4] adds r4, r1, 0 cmp r0, 0x1 - bne _08117248 + bne @08117248 movs r0, 0x40 strh r0, [r3] ldr r2, =0x03005e00 @@ -533832,40 +533832,40 @@ _08117206: lsls r0, 3 adds r0, r2 ldr r1, =0x0000fffd - b _08117254 + b @08117254 .align 2, 0 .pool -_08117248: +@08117248: ldr r2, =0x03005e00 lsls r3, r5, 2 adds r0, r3, r5 lsls r0, 3 adds r0, r2 movs r1, 0x3 -_08117254: +@08117254: strh r1, [r0, 0xA] ldr r0, [r4] movs r1, 0xC ldrsh r0, [r0, r1] cmp r0, 0 - bne _08117274 + bne @08117274 adds r0, r3, r5 lsls r0, 3 adds r0, r2 movs r1, 0xA strh r1, [r0, 0x10] movs r1, 0x14 - b _08117280 + b @08117280 .align 2, 0 .pool -_08117274: +@08117274: adds r0, r3, r5 lsls r0, 3 adds r0, r2 movs r1, 0xD strh r1, [r0, 0x10] movs r1, 0x1E -_08117280: +@08117280: strh r1, [r0, 0x12] adds r1, r3, r5 lsls r1, 3 @@ -533888,7 +533888,7 @@ _08117280: movs r1, 0x4 ldrsh r0, [r3, r1] cmp r0, 0 - bne _081172CC + bne @081172CC movs r0, 0x40 negs r0, r0 bl sub_80A5278 @@ -533897,10 +533897,10 @@ _08117280: asrs r1, 24 movs r0, 0xEF bl audio_play_and_stuff - b _081172E0 + b @081172E0 .align 2, 0 .pool -_081172CC: +@081172CC: movs r0, 0x40 negs r0, r0 bl sub_80A5278 @@ -533909,7 +533909,7 @@ _081172CC: asrs r1, 24 movs r0, 0xF5 bl audio_play_and_stuff -_081172E0: +@081172E0: add sp, 0x10 pop {r3} mov r8, r3 @@ -533919,7 +533919,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 @@ -533936,29 +533936,29 @@ sub_81172EC: @ 81172EC movs r0, 0x26 ldrsh r2, [r5, r0] cmp r2, 0x1 - beq _08117362 + beq @08117362 cmp r2, 0x1 - bgt _08117320 + bgt @08117320 cmp r2, 0 - beq _0811732A - b _08117478 + beq @0811732A + b @08117478 .align 2, 0 .pool -_08117320: +@08117320: cmp r2, 0x2 - beq _08117378 + beq @08117378 cmp r2, 0x3 - beq _081173B6 - b _08117478 -_0811732A: + beq @081173B6 + b @08117478 +@0811732A: ldrh r0, [r5, 0x1E] adds r1, r0, 0x1 strh r1, [r5, 0x1E] lsls r0, 16 cmp r0, 0 - bgt _08117338 - b _08117478 -_08117338: + bgt @08117338 + b @08117478 +@08117338: strh r2, [r5, 0x1E] ldrh r1, [r5, 0x20] adds r1, 0x1 @@ -533976,11 +533976,11 @@ _08117338: movs r2, 0x10 ldrsh r0, [r5, r2] cmp r1, r0 - beq _08117360 - b _08117478 -_08117360: - b _081173AE -_08117362: + beq @08117360 + b @08117478 +@08117360: + b @081173AE +@08117362: ldrh r0, [r5, 0x1C] adds r0, 0x1 strh r0, [r5, 0x1C] @@ -533989,17 +533989,17 @@ _08117362: movs r2, 0x12 ldrsh r1, [r5, r2] cmp r0, r1 - beq _08117376 - b _08117478 -_08117376: - b _081173AE -_08117378: + beq @08117376 + b @08117478 +@08117376: + b @081173AE +@08117378: ldrh r0, [r5, 0x1E] adds r1, r0, 0x1 strh r1, [r5, 0x1E] lsls r0, 16 cmp r0, 0 - ble _08117478 + ble @08117478 movs r0, 0 strh r0, [r5, 0x1E] ldrh r1, [r5, 0x20] @@ -534016,15 +534016,15 @@ _08117378: movs r1, 0x20 ldrsh r0, [r5, r1] cmp r0, 0 - bne _08117478 + bne @08117478 movs r0, 0 bl sub_80A477C -_081173AE: +@081173AE: ldrh r0, [r5, 0x26] adds r0, 0x1 strh r0, [r5, 0x26] - b _08117478 -_081173B6: + b @08117478 +@081173B6: ldr r0, =0x02022e24 movs r1, 0 strh r1, [r0] @@ -534040,12 +534040,12 @@ _081173B6: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _081173E6 + bne @081173E6 movs r0, 0x1 movs r1, 0x3 movs r2, 0 bl lcd_bg_operations -_081173E6: +@081173E6: movs r0, 0 bl lcd_io_get adds r1, r0, 0 @@ -534074,7 +534074,7 @@ _081173E6: movs r1, 0xC ldrsh r0, [r5, r1] cmp r0, 0 - beq _0811743A + beq @0811743A movs r2, 0xE ldrsh r1, [r5, r2] lsls r0, r1, 4 @@ -534082,11 +534082,11 @@ _081173E6: lsls r0, 2 adds r0, r4 bl obj_delete_and_free_tiles -_0811743A: +@0811743A: movs r1, 0x14 ldrsh r0, [r5, r1] cmp r0, 0x1 - bne _08117466 + bne @08117466 movs r2, 0x16 ldrsh r0, [r5, r2] lsls r2, r0, 4 @@ -534105,7 +534105,7 @@ _0811743A: ands r0, r3 orrs r0, r1 strb r0, [r2, 0x5] -_08117466: +@08117466: ldr r4, =0x0203a110 ldr r0, [r4] bl free @@ -534113,7 +534113,7 @@ _08117466: str r0, [r4] adds r0, r6, 0 bl move_anim_task_del -_08117478: +@08117478: pop {r4-r6} pop {r0} bx r0 @@ -534122,7 +534122,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 @@ -534171,7 +534171,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 @@ -534183,38 +534183,38 @@ sub_8117500: @ 8117500 movs r0, 0x8 ldrsh r1, [r4, r0] cmp r1, 0x1 - beq _08117544 + beq @08117544 cmp r1, 0x1 - bgt _08117528 + bgt @08117528 cmp r1, 0 - beq _0811752E - b _081175BE + beq @0811752E + b @081175BE .align 2, 0 .pool -_08117528: +@08117528: cmp r1, 0x2 - beq _081175B8 - b _081175BE -_0811752E: + beq @081175B8 + b @081175BE +@0811752E: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x6 - ble _081175BE + ble @081175BE strh r1, [r4, 0xA] movs r0, 0x10 strh r0, [r4, 0xC] - b _081175AC -_08117544: + b @081175AC +@08117544: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _081175BE + ble @081175BE movs r0, 0 strh r0, [r4, 0xA] ldrh r0, [r4, 0xC] @@ -534222,26 +534222,26 @@ _08117544: strh r0, [r4, 0xC] movs r5, 0 movs r6, 0x1 -_08117560: +@08117560: movs r1, 0x26 ldrsh r0, [r4, r1] asrs r0, r5 ands r0, r6 cmp r0, 0 - beq _0811757A + beq @0811757A lsls r0, r5, 20 lsrs r0, 16 ldrb r2, [r4, 0xC] movs r1, 0x10 ldr r3, =0x0000ffff bl pal_fade_1 -_0811757A: +@0811757A: movs r1, 0x24 ldrsh r0, [r4, r1] asrs r0, r5 ands r0, r6 cmp r0, 0 - beq _0811759A + beq @0811759A lsls r0, r5, 20 movs r1, 0x80 lsls r1, 17 @@ -534251,55 +534251,55 @@ _0811757A: movs r1, 0x10 movs r3, 0 bl pal_fade_1 -_0811759A: +@0811759A: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0xF - bls _08117560 + bls @08117560 movs r1, 0xC ldrsh r0, [r4, r1] cmp r0, 0 - bne _081175BE -_081175AC: + bne @081175BE +@081175AC: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _081175BE + b @081175BE .align 2, 0 .pool -_081175B8: +@081175B8: adds r0, r2, 0 bl move_anim_task_del -_081175BE: +@081175BE: pop {r4-r6} pop {r0} bx r0 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 lsrs r6, r1, 16 movs r2, 0 -_081175CE: +@081175CE: movs r0, 0x1 ands r0, r3 lsrs r4, r3, 1 adds r5, r2, 0x1 cmp r0, 0 - beq _081175FA + beq @081175FA lsls r0, r2, 20 lsrs r2, r0, 16 adds r0, r2, 0 adds r0, 0x10 cmp r2, r0 - bge _081175FA + bge @081175FA ldr r1, =0x02037b14 adds r3, r0, 0 -_081175EA: +@081175EA: lsls r0, r2, 1 adds r0, r1 strh r6, [r0] @@ -534307,13 +534307,13 @@ _081175EA: lsls r0, 16 lsrs r2, r0, 16 cmp r2, r3 - blt _081175EA -_081175FA: + blt @081175EA +@081175FA: adds r3, r4, 0 lsls r0, r5, 16 lsrs r2, r0, 16 cmp r2, 0x1F - bls _081175CE + bls @081175CE pop {r4-r6} pop {r0} bx r0 @@ -534322,7 +534322,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 @@ -534331,29 +534331,29 @@ sub_8117610: @ 8117610 ldr r0, =0x02038436 ldrb r3, [r0] movs r5, 0x1 -_08117620: +@08117620: cmp r3, r2 - beq _0811762E + beq @0811762E adds r1, r2, 0 adds r1, 0x10 adds r0, r5, 0 lsls r0, r1 orrs r4, r0 -_0811762E: +@0811762E: adds r2, 0x1 cmp r2, 0x3 - bls _08117620 + bls @08117620 movs r2, 0x5 ldr r0, =0x0203841e adds r1, r0, 0 adds r1, 0x8 -_0811763C: +@0811763C: ldrh r0, [r1] strh r0, [r1, 0x2] subs r1, 0x2 subs r2, 0x1 cmp r2, 0 - bne _0811763C + bne @0811763C adds r0, r6, 0 adds r1, r4, 0 bl sub_8116874 @@ -534365,7 +534365,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 @@ -534380,20 +534380,20 @@ sub_8117660: @ 8117660 movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0 - beq _0811769C + beq @0811769C ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0811769C + beq @0811769C ldrh r0, [r4] negs r0, r0 strh r0, [r4] ldrh r0, [r4, 0x2] negs r0, r0 strh r0, [r4, 0x2] -_0811769C: +@0811769C: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -534419,7 +534419,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 @@ -534461,7 +534461,7 @@ sub_81176D8: @ 81176D8 movs r7, 0xE ldrsh r0, [r1, r7] cmp r2, r0 - bne _0811773E + bne @0811773E mov r0, r12 strh r0, [r6] strh r0, [r4] @@ -534469,7 +534469,7 @@ sub_81176D8: @ 81176D8 bl sub_80A6DAC adds r0, r5, 0 bl remove_task -_0811773E: +@0811773E: pop {r4-r7} pop {r0} bx r0 @@ -534478,7 +534478,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 @@ -534500,7 +534500,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 @@ -534522,7 +534522,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 @@ -534535,9 +534535,9 @@ sub_81177AC: @ 81177AC eors r0, r2 ldrb r1, [r1] cmp r0, r1 - bne _081177C8 + bne @081177C8 movs r4, 0x1 -_081177C8: +@081177C8: strh r4, [r5, 0xE] adds r0, r3, 0 bl move_anim_task_del @@ -534549,23 +534549,23 @@ _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 movs r4, 0 ldr r6, =0x02020630 -_081177EE: +@081177EE: ldr r0, =0x02038436 ldrb r0, [r0] cmp r4, r0 - beq _0811782C + beq @0811782C lsls r0, r4, 24 lsrs r0, 24 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _0811782C + beq @0811782C ldr r0, =0x020241e4 adds r0, r4, r0 ldrb r0, [r0] @@ -534586,12 +534586,12 @@ _081177EE: ands r0, r1 orrs r0, r3 strb r0, [r2] -_0811782C: +@0811782C: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x3 - bls _081177EE + bls @081177EE adds r0, r5, 0 bl move_anim_task_del pop {r4-r7} @@ -534602,7 +534602,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 @@ -534641,19 +534641,19 @@ sub_8117854: @ 8117854 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _081178B6 + bne @081178B6 mov r1, r8 cmp r1, 0 - beq _081178BA + beq @081178BA adds r0, r6, 0 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - bne _081178BA -_081178B6: + bne @081178BA +@081178B6: movs r2, 0 mov r8, r2 -_081178BA: +@081178BA: ldr r0, =0x02022e24 movs r1, 0 strh r1, [r0] @@ -534698,7 +534698,7 @@ _081178BA: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _08117930 + bne @08117930 ldrb r0, [r4] movs r1, 0xD negs r1, r1 @@ -534706,27 +534706,27 @@ _081178BA: movs r0, 0x4 orrs r1, r0 strb r1, [r4] -_08117930: +@08117930: ldrh r1, [r4] movs r0, 0xA bl lcd_io_set bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _08117964 + beq @08117964 ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r4, [r0] - b _081179A2 + b @081179A2 .align 2, 0 .pool -_08117964: +@08117964: adds r0, r7, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08117988 + beq @08117988 ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 @@ -534734,10 +534734,10 @@ _08117964: movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 - b _08117996 + b @08117996 .align 2, 0 .pool -_08117988: +@08117988: ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 @@ -534745,13 +534745,13 @@ _08117988: movs r0, 0x64 muls r0, r1 ldr r1, =0x020244ec -_08117996: +@08117996: adds r0, r1 movs r1, 0xB bl pokemon_getattr lsls r0, 16 lsrs r4, r0, 16 -_081179A2: +@081179A2: ldr r5, =0x020241e4 adds r0, r7, r5 ldrb r1, [r0] @@ -534762,7 +534762,7 @@ _081179A2: lsrs r7, r0, 24 mov r0, r8 cmp r0, 0 - beq _081179CC + beq @081179CC adds r0, r6, r5 ldrb r1, [r0] adds r0, r6, 0 @@ -534771,7 +534771,7 @@ _081179A2: lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x20] -_081179CC: +@081179CC: mov r0, sp bl sub_80A6B30 mov r0, sp @@ -534833,7 +534833,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 @@ -534847,33 +534847,33 @@ sub_8117A60: @ 8117A60 ldrsh r2, [r3, r0] adds r5, r1, 0 cmp r2, 0 - bge _08117A7E + bge @08117A7E negs r2, r2 -_08117A7E: +@08117A7E: ldrh r0, [r3, 0x22] adds r4, r0, r2 strh r4, [r3, 0x22] movs r1, 0xA ldrsh r0, [r3, r1] cmp r0, 0 - bge _08117AA4 + bge @08117AA4 ldr r2, =0x02022e1a lsls r1, r4, 16 asrs r1, 24 ldrh r0, [r2] subs r0, r1 strh r0, [r2] - b _08117AB0 + b @08117AB0 .align 2, 0 .pool -_08117AA4: +@08117AA4: ldr r1, =0x02022e1a lsls r0, r4, 16 asrs r0, 24 ldrh r2, [r1] adds r0, r2 strh r0, [r1] -_08117AB0: +@08117AB0: lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -534886,19 +534886,19 @@ _08117AB0: movs r3, 0x26 ldrsh r0, [r5, r3] cmp r0, 0x1 - beq _08117B1A + beq @08117B1A cmp r0, 0x1 - bgt _08117AD8 + bgt @08117AD8 cmp r0, 0 - beq _08117ADE - b _08117C0C + beq @08117ADE + b @08117C0C .align 2, 0 .pool -_08117AD8: +@08117AD8: cmp r0, 0x2 - beq _08117B34 - b _08117C0C -_08117ADE: + beq @08117B34 + b @08117C0C +@08117ADE: ldrh r0, [r5, 0x1E] adds r1, r0, 0x1 strh r1, [r5, 0x1E] @@ -534907,9 +534907,9 @@ _08117ADE: movs r3, 0x14 ldrsh r1, [r5, r3] cmp r0, r1 - bge _08117AF2 - b _08117C0C -_08117AF2: + bge @08117AF2 + b @08117C0C +@08117AF2: strh r2, [r5, 0x1E] ldrh r1, [r5, 0x20] adds r1, 0x1 @@ -534927,9 +534927,9 @@ _08117AF2: movs r2, 0x10 ldrsh r0, [r5, r2] cmp r1, r0 - bne _08117C0C - b _08117B2C -_08117B1A: + bne @08117C0C + b @08117B2C +@08117B1A: ldrh r0, [r5, 0x1C] adds r0, 0x1 strh r0, [r5, 0x1C] @@ -534938,13 +534938,13 @@ _08117B1A: movs r3, 0x12 ldrsh r1, [r5, r3] cmp r0, r1 - bne _08117C0C -_08117B2C: + bne @08117C0C +@08117B2C: ldrh r0, [r5, 0x26] adds r0, 0x1 strh r0, [r5, 0x26] - b _08117C0C -_08117B34: + b @08117C0C +@08117B34: ldrh r0, [r5, 0x1E] adds r1, r0, 0x1 strh r1, [r5, 0x1E] @@ -534953,7 +534953,7 @@ _08117B34: movs r3, 0x14 ldrsh r1, [r5, r3] cmp r0, r1 - blt _08117C0C + blt @08117C0C strh r2, [r5, 0x1E] ldrh r1, [r5, 0x20] subs r1, 0x1 @@ -534969,7 +534969,7 @@ _08117B34: movs r0, 0x20 ldrsh r4, [r5, r0] cmp r4, 0 - bne _08117C0C + bne @08117C0C movs r0, 0 bl sub_80A477C ldr r0, =0x02022e24 @@ -534986,7 +534986,7 @@ _08117B34: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _08117BB2 + bne @08117BB2 movs r0, 0xA bl lcd_io_get mov r1, sp @@ -535001,7 +535001,7 @@ _08117B34: ldrh r1, [r0] movs r0, 0xA bl lcd_io_set -_08117BB2: +@08117BB2: movs r0, 0 bl lcd_io_get adds r1, r0, 0 @@ -535030,7 +535030,7 @@ _08117BB2: movs r1, 0xC ldrsh r0, [r5, r1] cmp r0, 0 - beq _08117C06 + beq @08117C06 movs r2, 0xE ldrsh r1, [r5, r2] lsls r0, r1, 4 @@ -535038,10 +535038,10 @@ _08117BB2: lsls r0, 2 adds r0, r4 bl obj_delete_and_free_tiles -_08117C06: +@08117C06: adds r0, r6, 0 bl move_anim_task_del -_08117C0C: +@08117C0C: add sp, 0x4 pop {r4-r6} pop {r0} @@ -535051,7 +535051,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 @@ -535067,7 +535067,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 @@ -535091,7 +535091,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 @@ -535117,7 +535117,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 @@ -535127,7 +535127,7 @@ sub_8117CA0: @ 8117CA0 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08117CE4 + bne @08117CE4 str r4, [sp] str r4, [sp, 0x4] str r4, [sp, 0x8] @@ -535140,34 +535140,34 @@ sub_8117CA0: @ 8117CA0 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _08117CFC + bne @08117CFC movs r2, 0x1 -_08117CD2: +@08117CD2: lsrs r1, 1 adds r4, 0x1 adds r0, r1, 0 ands r0, r2 cmp r0, 0 - beq _08117CD2 - b _08117CFC + beq @08117CD2 + b @08117CFC .align 2, 0 .pool -_08117CE4: +@08117CE4: cmp r0, 0x1 - bne _08117CF0 + bne @08117CF0 ldr r0, =0x02038436 - b _08117CF6 + b @08117CF6 .align 2, 0 .pool -_08117CF0: +@08117CF0: cmp r0, 0x2 - bne _08117CFC + bne @08117CFC ldr r0, =0x02038437 -_08117CF6: +@08117CF6: ldrb r0, [r0] adds r4, r0, 0 adds r4, 0x10 -_08117CFC: +@08117CFC: ldr r0, =0x020244d4 ldr r1, [r0] ldr r0, =0x0203841e @@ -535195,7 +535195,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 @@ -535205,7 +535205,7 @@ sub_8117D3C: @ 8117D3C movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08117D80 + bne @08117D80 str r4, [sp] str r4, [sp, 0x4] str r4, [sp, 0x8] @@ -535218,34 +535218,34 @@ sub_8117D3C: @ 8117D3C movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _08117D98 + bne @08117D98 movs r2, 0x1 -_08117D6E: +@08117D6E: lsrs r1, 1 adds r4, 0x1 adds r0, r1, 0 ands r0, r2 cmp r0, 0 - beq _08117D6E - b _08117D98 + beq @08117D6E + b @08117D98 .align 2, 0 .pool -_08117D80: +@08117D80: cmp r0, 0x1 - bne _08117D8C + bne @08117D8C ldr r0, =0x02038436 - b _08117D92 + b @08117D92 .align 2, 0 .pool -_08117D8C: +@08117D8C: cmp r0, 0x2 - bne _08117D98 + bne @08117D98 ldr r0, =0x02038437 -_08117D92: +@08117D92: ldrb r0, [r0] adds r4, r0, 0 adds r4, 0x10 -_08117D98: +@08117D98: lsls r0, r4, 5 ldr r1, =0x02037714 adds r0, r1 @@ -535273,7 +535273,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 @@ -535283,7 +535283,7 @@ sub_8117DD8: @ 8117DD8 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08117E1C + bne @08117E1C str r4, [sp] str r4, [sp, 0x4] str r4, [sp, 0x8] @@ -535296,34 +535296,34 @@ sub_8117DD8: @ 8117DD8 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _08117E34 + bne @08117E34 movs r2, 0x1 -_08117E0A: +@08117E0A: lsrs r1, 1 adds r4, 0x1 adds r0, r1, 0 ands r0, r2 cmp r0, 0 - beq _08117E0A - b _08117E34 + beq @08117E0A + b @08117E34 .align 2, 0 .pool -_08117E1C: +@08117E1C: cmp r0, 0x1 - bne _08117E28 + bne @08117E28 ldr r0, =0x02038436 - b _08117E2E + b @08117E2E .align 2, 0 .pool -_08117E28: +@08117E28: cmp r0, 0x2 - bne _08117E34 + bne @08117E34 ldr r0, =0x02038437 -_08117E2E: +@08117E2E: ldrb r0, [r0] adds r4, r0, 0 adds r4, 0x10 -_08117E34: +@08117E34: lsls r1, r4, 5 ldr r0, =0x02037714 adds r0, r1, r0 @@ -535342,7 +535342,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 @@ -535350,17 +535350,17 @@ sub_8117E60: @ 8117E60 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq _08117E80 + beq @08117E80 ldr r1, =0x0203841e movs r0, 0x1 strh r0, [r1, 0xE] - b _08117E84 + b @08117E84 .align 2, 0 .pool -_08117E80: +@08117E80: ldr r0, =0x0203841e strh r1, [r0, 0xE] -_08117E84: +@08117E84: adds r0, r4, 0 bl move_anim_task_del pop {r4} @@ -535371,7 +535371,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 @@ -535391,7 +535391,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 @@ -535405,16 +535405,16 @@ sub_8117EC4: @ 8117EC4 lsls r4, 24 lsls r0, 24 cmp r4, r0 - bne _08117EF8 + bne @08117EF8 ldr r1, =0x0203841e movs r0, 0x1 - b _08117EFC + b @08117EFC .align 2, 0 .pool -_08117EF8: +@08117EF8: ldr r1, =0x0203841e movs r0, 0 -_08117EFC: +@08117EFC: strh r0, [r1, 0xE] adds r0, r5, 0 bl move_anim_task_del @@ -535426,7 +535426,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 @@ -535442,7 +535442,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 @@ -535462,18 +535462,18 @@ 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 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _08117F78 + beq @08117F78 adds r0, r4, 0 bl move_anim_task_del - b _08117FB4 -_08117F78: + b @08117FB4 +@08117F78: ldr r0, =0x03005e00 lsls r3, r4, 2 adds r3, r4 @@ -535504,7 +535504,7 @@ _08117F78: ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] -_08117FB4: +@08117FB4: pop {r4} pop {r0} bx r0 @@ -535513,7 +535513,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 @@ -535523,7 +535523,7 @@ sub_8117FD0: @ 8117FD0 movs r0, 0x80 lsls r0, 5 cmp r1, r0 - bne _08118014 + bne @08118014 ldr r0, =0x020244d0 ldr r1, [r0] ldr r0, =0x02038436 @@ -535547,7 +535547,7 @@ sub_8117FD0: @ 8117FD0 strb r0, [r3] adds r0, r4, 0 bl remove_task -_08118014: +@08118014: pop {r4} pop {r0} bx r0 @@ -535556,7 +535556,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 @@ -535565,9 +535565,9 @@ lcd_bg_operations: @ 811802C lsls r2, 24 lsrs r4, r2, 24 cmp r6, 0x3 - bls _08118040 - b _08118132 -_08118040: + bls @08118040 + b @08118132 +@08118040: ldr r0, =0x0859741a adds r0, r6, r0 ldrb r0, [r0] @@ -535575,24 +535575,24 @@ _08118040: ldr r1, =0x0203a114 strh r0, [r1] cmp r5, 0x6 - bhi _08118124 + bhi @08118124 lsls r0, r5, 2 - ldr r1, =_08118068 + ldr r1, =@08118068 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08118068: - .4byte _08118084 - .4byte _08118098 - .4byte _081180B0 - .4byte _081180C8 - .4byte _081180E0 - .4byte _081180FC - .4byte _08118110 -_08118084: +@08118068: + .4byte @08118084 + .4byte @08118098 + .4byte @081180B0 + .4byte @081180C8 + .4byte @081180E0 + .4byte @081180FC + .4byte @08118110 +@08118084: ldr r2, =0x0203a114 lsls r3, r4, 6 ldrb r1, [r2, 0x1] @@ -535600,10 +535600,10 @@ _08118084: ands r0, r1 orrs r0, r3 strb r0, [r2, 0x1] - b _08118124 + b @08118124 .align 2, 0 .pool -_08118098: +@08118098: ldr r3, =0x0203a114 movs r0, 0x1 adds r1, r4, 0 @@ -535612,10 +535612,10 @@ _08118098: ldrb r2, [r3, 0x1] movs r0, 0x21 negs r0, r0 - b _0811811E + b @0811811E .align 2, 0 .pool -_081180B0: +@081180B0: ldr r3, =0x0203a114 movs r0, 0x1 adds r1, r4, 0 @@ -535624,10 +535624,10 @@ _081180B0: ldrb r2, [r3] movs r0, 0x41 negs r0, r0 - b _081180EE + b @081180EE .align 2, 0 .pool -_081180C8: +@081180C8: ldr r3, =0x0203a114 movs r0, 0x3 adds r1, r4, 0 @@ -535636,10 +535636,10 @@ _081180C8: ldrb r2, [r3] movs r0, 0xD negs r0, r0 - b _081180EE + b @081180EE .align 2, 0 .pool -_081180E0: +@081180E0: ldr r3, =0x0203a114 movs r0, 0x3 adds r1, r4, 0 @@ -535647,14 +535647,14 @@ _081180E0: ldrb r2, [r3] movs r0, 0x4 negs r0, r0 -_081180EE: +@081180EE: ands r0, r2 orrs r0, r1 strb r0, [r3] - b _08118124 + b @08118124 .align 2, 0 .pool -_081180FC: +@081180FC: ldr r2, =0x0203a114 lsls r3, r4, 7 ldrb r1, [r2] @@ -535662,10 +535662,10 @@ _081180FC: ands r0, r1 orrs r0, r3 strb r0, [r2] - b _08118124 + b @08118124 .align 2, 0 .pool -_08118110: +@08118110: ldr r3, =0x0203a114 movs r0, 0x1F adds r1, r4, 0 @@ -535673,18 +535673,18 @@ _08118110: ldrb r2, [r3, 0x1] movs r0, 0x20 negs r0, r0 -_0811811E: +@0811811E: ands r0, r2 orrs r0, r1 strb r0, [r3, 0x1] -_08118124: +@08118124: ldr r0, =0x0859741a adds r0, r6, r0 ldrb r0, [r0] ldr r1, =0x0203a114 ldrh r1, [r1] bl lcd_io_set -_08118132: +@08118132: pop {r4-r6} pop {r0} bx r0 @@ -535693,7 +535693,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 @@ -535701,7 +535701,7 @@ sub_8118140: @ 8118140 lsls r1, 24 lsrs r4, r1, 24 cmp r2, 0x3 - bhi _081181C8 + bhi @081181C8 ldr r0, =0x0859741e adds r0, r2, r0 ldrb r0, [r0] @@ -535709,61 +535709,61 @@ sub_8118140: @ 8118140 mov r1, sp strh r0, [r1] cmp r4, 0x6 - bhi _081181C8 + bhi @081181C8 lsls r0, r4, 2 - ldr r1, =_08118174 + ldr r1, =@08118174 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08118174: - .4byte _08118190 - .4byte _08118198 - .4byte _081181A0 - .4byte _081181A8 - .4byte _081181B0 - .4byte _081181B8 - .4byte _081181C0 -_08118190: +@08118174: + .4byte @08118190 + .4byte @08118198 + .4byte @081181A0 + .4byte @081181A8 + .4byte @081181B0 + .4byte @081181B8 + .4byte @081181C0 +@08118190: ldr r0, [sp] lsls r0, 16 lsrs r0, 30 - b _081181CA -_08118198: + b @081181CA +@08118198: ldr r0, [sp] lsls r0, 18 lsrs r0, 31 - b _081181CA -_081181A0: + b @081181CA +@081181A0: ldr r0, [sp] lsls r0, 25 lsrs r0, 31 - b _081181CA -_081181A8: + b @081181CA +@081181A8: ldr r0, [sp] lsls r0, 28 lsrs r0, 30 - b _081181CA -_081181B0: + b @081181CA +@081181B0: ldr r0, [sp] lsls r0, 30 lsrs r0, 30 - b _081181CA -_081181B8: + b @081181CA +@081181B8: ldr r0, [sp] lsls r0, 24 lsrs r0, 31 - b _081181CA -_081181C0: + b @081181CA +@081181C0: ldr r0, [sp] lsls r0, 19 lsrs r0, 27 - b _081181CA -_081181C8: + b @081181CA +@081181C8: movs r0, 0 -_081181CA: +@081181CA: add sp, 0x4 pop {r4} pop {r1} @@ -535771,7 +535771,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 @@ -535781,56 +535781,56 @@ battle_intro_launch: @ 81181D4 lsls r1, 15 ands r0, r1 cmp r0, 0 - beq _08118208 + beq @08118208 ldr r0, =0x02038bce ldrh r1, [r0] ldr r0, =0x00000c03 cmp r1, r0 - beq _08118208 + beq @08118208 ldr r0, =sub_8118D68 + 1 - b _08118258 + b @08118258 .align 2, 0 .pool -_08118208: +@08118208: ldr r2, [r2] movs r0, 0x2 ands r0, r2 cmp r0, 0 - beq _0811821C + beq @0811821C ldr r0, =task00_battle_intro_wireless + 1 - b _08118258 + b @08118258 .align 2, 0 .pool -_0811821C: +@0811821C: ldr r0, =0x003f0100 ands r0, r2 cmp r0, 0 - beq _08118230 + beq @08118230 ldr r0, =task_battle_intro_anim + 1 - b _08118258 + b @08118258 .align 2, 0 .pool -_08118230: +@08118230: movs r0, 0x80 lsls r0, 5 ands r2, r0 cmp r2, 0 - beq _08118250 + beq @08118250 ldr r0, =gUnknown_82E9530 ldrb r0, [r0] cmp r0, 0x2 - beq _08118250 + beq @08118250 movs r4, 0x3 ldr r0, =task00_battle_intro_80BC6C8 + 1 - b _08118258 + b @08118258 .align 2, 0 .pool -_08118250: +@08118250: ldr r1, =0x08597424 lsls r0, r4, 2 adds r0, r1 ldr r0, [r0] -_08118258: +@08118258: movs r1, 0 bl AddTask lsls r0, 24 @@ -535856,7 +535856,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 @@ -535894,7 +535894,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 @@ -535915,51 +535915,51 @@ task_battle_intro_80BC47C: @ 81182EC ldrsh r0, [r0, r2] mov r8, r1 cmp r0, 0x4 - bls _08118318 - b _0811852A -_08118318: + bls @08118318 + b @0811852A +@08118318: lsls r0, 2 - ldr r1, =_08118330 + ldr r1, =@08118330 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08118330: - .4byte _08118344 - .4byte _08118374 - .4byte _0811839C - .4byte _081183E4 - .4byte _08118524 -_08118344: +@08118330: + .4byte @08118344 + .4byte @08118374 + .4byte @0811839C + .4byte @081183E4 + .4byte @08118524 +@08118344: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _08118360 + beq @08118360 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 add r0, r8 movs r1, 0x10 - b _0811836A + b @0811836A .align 2, 0 .pool -_08118360: +@08118360: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 add r0, r8 movs r1, 0x1 -_0811836A: +@0811836A: strh r1, [r0, 0xC] ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b _0811852A -_08118374: + b @0811852A +@08118374: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -535970,17 +535970,17 @@ _08118374: strh r0, [r1, 0xC] lsls r0, 16 cmp r0, 0 - beq _0811838C - b _0811852A -_0811838C: + beq @0811838C + b @0811852A +@0811838C: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] movs r0, 0x48 movs r1, 0x3F bl lcd_io_set - b _0811852A -_0811839C: + b @0811852A +@0811839C: ldr r1, =0x02022e26 ldrh r0, [r1] subs r0, 0xFF @@ -535991,9 +535991,9 @@ _0811839C: movs r1, 0xC0 lsls r1, 6 cmp r0, r1 - beq _081183B4 - b _0811852A -_081183B4: + beq @081183B4 + b @0811852A +@081183B4: lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -536010,10 +536010,10 @@ _081183B4: ldr r0, =0x0000fffe ands r0, r1 strh r0, [r2] - b _0811852A + b @0811852A .align 2, 0 .pool -_081183E4: +@081183E4: lsls r0, r4, 2 adds r1, r0, r4 lsls r1, 3 @@ -536024,45 +536024,45 @@ _081183E4: ldrsh r1, [r2, r5] mov r12, r0 cmp r1, 0 - beq _08118400 + beq @08118400 subs r0, r3, 0x1 strh r0, [r2, 0xE] - b _0811842E -_08118400: + b @0811842E +@08118400: movs r1, 0xA ldrsh r0, [r2, r1] cmp r0, 0x1 - bne _08118420 + bne @08118420 ldr r2, =0x02022e1a ldrh r1, [r2] ldr r0, =0x0000ffb0 cmp r1, r0 - beq _0811842E + beq @0811842E subs r0, r1, 0x2 - b _0811842C + b @0811842C .align 2, 0 .pool -_08118420: +@08118420: ldr r2, =0x02022e1a ldrh r1, [r2] ldr r0, =0x0000ffc8 cmp r1, r0 - beq _0811842E + beq @0811842E subs r0, r1, 0x1 -_0811842C: +@0811842C: strh r0, [r2] -_0811842E: +@0811842E: ldr r2, =0x02022e26 ldrh r1, [r2] movs r0, 0xFF lsls r0, 8 ands r0, r1 cmp r0, 0 - beq _08118442 + beq @08118442 ldr r3, =0xfffffc04 adds r0, r1, r3 strh r0, [r2] -_08118442: +@08118442: mov r5, r12 adds r0, r5, r4 lsls r0, 3 @@ -536072,17 +536072,17 @@ _08118442: movs r3, 0xC ldrsh r0, [r1, r3] cmp r0, 0 - beq _0811845A + beq @0811845A subs r0, r2, 0x2 strh r0, [r1, 0xC] -_0811845A: +@0811845A: movs r3, 0 ldr r5, =0x02039b28 mov r9, r5 ldr r7, =0x02038c28 mov r6, r9 adds r5, r1, 0 -_08118466: +@08118466: lsls r2, r3, 1 ldrb r1, [r6, 0x14] lsls r0, r1, 4 @@ -536094,9 +536094,9 @@ _08118466: strh r0, [r2] adds r3, 0x1 cmp r3, 0x4F - ble _08118466 + ble @08118466 cmp r3, 0x9F - bgt _081184AA + bgt @081184AA ldr r7, =0x02038c28 ldr r6, =0x02039b28 ldr r1, =0x03005e00 @@ -536104,7 +536104,7 @@ _08118466: adds r0, r2, r4 lsls r0, 3 adds r5, r0, r1 -_08118490: +@08118490: lsls r2, r3, 1 ldrb r1, [r6, 0x14] lsls r0, r1, 4 @@ -536117,8 +536117,8 @@ _08118490: strh r0, [r2] adds r3, 0x1 cmp r3, 0x9F - ble _08118490 -_081184AA: + ble @08118490 +@081184AA: mov r3, r12 adds r0, r3, r4 lsls r0, 3 @@ -536127,7 +536127,7 @@ _081184AA: movs r0, 0xC ldrsh r2, [r1, r0] cmp r2, 0 - bne _0811852A + bne @0811852A movs r0, 0x3 mov r3, r9 strb r0, [r3, 0x15] @@ -536155,13 +536155,13 @@ _081184AA: lsls r1, 7 movs r0, 0xC bl lcd_io_set - b _0811852A + b @0811852A .align 2, 0 .pool -_08118524: +@08118524: adds r0, r4, 0 bl sub_811828C -_0811852A: +@0811852A: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -536172,7 +536172,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} @@ -536188,31 +536188,31 @@ task00_battle_intro_80BC6C8: @ 8118538 ldrsh r0, [r0, r2] adds r2, r1, 0 cmp r0, 0x3 - beq _08118578 + beq @08118578 cmp r0, 0x3 - bgt _08118568 + bgt @08118568 cmp r0, 0x2 - beq _0811856C - b _08118580 + beq @0811856C + b @08118580 .align 2, 0 .pool -_08118568: +@08118568: cmp r0, 0x4 - bne _08118580 -_0811856C: + bne @08118580 +@0811856C: ldr r1, =0x02022e18 ldrh r0, [r1] adds r0, 0x8 - b _0811857E + b @0811857E .align 2, 0 .pool -_08118578: +@08118578: ldr r1, =0x02022e18 ldrh r0, [r1] adds r0, 0x6 -_0811857E: +@0811857E: strh r0, [r1] -_08118580: +@08118580: lsls r0, r5, 2 adds r1, r0, r5 lsls r1, 3 @@ -536221,17 +536221,17 @@ _08118580: ldrsh r1, [r4, r3] adds r6, r0, 0 cmp r1, 0x4 - bne _081185E4 + bne @081185E4 ldr r7, =0x02022e1a ldrh r0, [r4, 0x14] bl cosine2 lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _081185A6 + bge @081185A6 ldr r1, =0x000001ff adds r0, r1 -_081185A6: +@081185A6: asrs r0, 9 subs r0, 0x8 strh r0, [r7] @@ -536239,14 +536239,14 @@ _081185A6: movs r2, 0x14 ldrsh r0, [r4, r2] cmp r0, 0xB3 - bgt _081185C8 + bgt @081185C8 adds r0, r1, 0x4 - b _081185CA + b @081185CA .align 2, 0 .pool -_081185C8: +@081185C8: adds r0, r1, 0x6 -_081185CA: +@081185CA: strh r0, [r4, 0x14] ldr r2, =0x03005e00 adds r0, r6, r5 @@ -536257,34 +536257,34 @@ _081185CA: movs r0, 0xB4 lsls r0, 1 cmp r1, r0 - bne _081185E4 + bne @081185E4 movs r0, 0 strh r0, [r3, 0x14] -_081185E4: +@081185E4: adds r0, r6, r5 lsls r0, 3 adds r0, r2 movs r1, 0x8 ldrsh r0, [r0, r1] cmp r0, 0x4 - bls _081185F4 - b _0811881A -_081185F4: + bls @081185F4 + b @0811881A +@081185F4: lsls r0, 2 - ldr r1, =_08118608 + ldr r1, =@08118608 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08118608: - .4byte _0811861C - .4byte _0811864C - .4byte _08118678 - .4byte _081186C8 - .4byte _08118814 -_0811861C: +@08118608: + .4byte @0811861C + .4byte @0811864C + .4byte @08118678 + .4byte @081186C8 + .4byte @08118814 +@0811861C: ldr r1, =0x03005e00 adds r0, r6, r5 lsls r0, 3 @@ -536296,20 +536296,20 @@ _0811861C: movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _08118640 + beq @08118640 strh r3, [r2, 0xC] - b _08118644 + b @08118644 .align 2, 0 .pool -_08118640: +@08118640: movs r0, 0x1 strh r0, [r2, 0xC] -_08118644: +@08118644: ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] - b _0811881A -_0811864C: + b @0811881A +@0811864C: ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 @@ -536319,19 +536319,19 @@ _0811864C: strh r0, [r1, 0xC] lsls r0, 16 cmp r0, 0 - beq _08118662 - b _0811881A -_08118662: + beq @08118662 + b @0811881A +@08118662: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] movs r0, 0x48 movs r1, 0x3F bl lcd_io_set - b _0811881A + b @0811881A .align 2, 0 .pool -_08118678: +@08118678: ldr r1, =0x02022e26 ldrh r0, [r1] subs r0, 0xFF @@ -536342,9 +536342,9 @@ _08118678: movs r1, 0xC0 lsls r1, 6 cmp r0, r1 - beq _08118690 - b _0811881A -_08118690: + beq @08118690 + b @0811881A +@08118690: ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 @@ -536363,10 +536363,10 @@ _08118690: ldr r0, =0x0000fffe ands r0, r1 strh r0, [r2] - b _0811881A + b @0811881A .align 2, 0 .pool -_081186C8: +@081186C8: ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 @@ -536375,12 +536375,12 @@ _081186C8: movs r3, 0xE ldrsh r0, [r1, r3] cmp r0, 0 - beq _08118708 + beq @08118708 subs r0, r2, 0x1 strh r0, [r1, 0xE] lsls r0, 16 cmp r0, 0 - bne _08118728 + bne @08118728 ldr r1, =0x00001842 movs r0, 0x50 bl lcd_io_set @@ -536390,38 +536390,38 @@ _081186C8: movs r0, 0x54 movs r1, 0 bl lcd_io_set - b _08118728 + b @08118728 .align 2, 0 .pool -_08118708: +@08118708: ldrh r2, [r1, 0x10] movs r0, 0x1F ands r0, r2 cmp r0, 0 - beq _08118728 + beq @08118728 ldrh r0, [r1, 0x12] subs r0, 0x1 strh r0, [r1, 0x12] lsls r0, 16 cmp r0, 0 - bne _08118728 + bne @08118728 adds r0, r2, 0 adds r0, 0xFF strh r0, [r1, 0x10] movs r0, 0x4 strh r0, [r1, 0x12] -_08118728: +@08118728: ldr r2, =0x02022e26 ldrh r1, [r2] movs r0, 0xFF lsls r0, 8 ands r0, r1 cmp r0, 0 - beq _0811873C + beq @0811873C ldr r3, =0xfffffc04 adds r0, r1, r3 strh r0, [r2] -_0811873C: +@0811873C: ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 @@ -536430,10 +536430,10 @@ _0811873C: movs r3, 0xC ldrsh r0, [r1, r3] cmp r0, 0 - beq _08118752 + beq @08118752 subs r0, r2, 0x2 strh r0, [r1, 0xC] -_08118752: +@08118752: movs r3, 0 ldr r0, =0x02039b28 mov r8, r0 @@ -536441,7 +536441,7 @@ _08118752: mov r12, r2 mov r7, r8 adds r4, r1, 0 -_08118760: +@08118760: lsls r2, r3, 1 ldrb r1, [r7, 0x14] lsls r0, r1, 4 @@ -536453,9 +536453,9 @@ _08118760: strh r0, [r2] adds r3, 0x1 cmp r3, 0x4F - ble _08118760 + ble @08118760 cmp r3, 0x9F - bgt _081187A4 + bgt @081187A4 ldr r0, =0x02038c28 mov r12, r0 ldr r7, =0x02039b28 @@ -536463,7 +536463,7 @@ _08118760: adds r0, r6, r5 lsls r0, 3 adds r4, r0, r1 -_0811878A: +@0811878A: lsls r2, r3, 1 ldrb r1, [r7, 0x14] lsls r0, r1, 4 @@ -536476,8 +536476,8 @@ _0811878A: strh r0, [r2] adds r3, 0x1 cmp r3, 0x9F - ble _0811878A -_081187A4: + ble @0811878A +@081187A4: ldr r1, =0x03005e00 adds r0, r6, r5 lsls r0, 3 @@ -536485,7 +536485,7 @@ _081187A4: movs r3, 0xC ldrsh r2, [r1, r3] cmp r2, 0 - bne _0811881A + bne @0811881A movs r0, 0x3 mov r3, r8 strb r0, [r3, 0x15] @@ -536513,13 +536513,13 @@ _081187A4: lsls r1, 7 movs r0, 0xC bl lcd_io_set - b _0811881A + b @0811881A .align 2, 0 .pool -_08118814: +@08118814: adds r0, r5, 0 bl sub_811828C -_0811881A: +@0811881A: ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 @@ -536527,11 +536527,11 @@ _0811881A: movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0x4 - beq _08118832 + beq @08118832 ldrh r1, [r1, 0x10] movs r0, 0x52 bl lcd_io_set -_08118832: +@08118832: add sp, 0x4 pop {r3} mov r8, r3 @@ -536543,7 +536543,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} @@ -536563,24 +536563,24 @@ task_battle_intro_anim: @ 8118844 ldrsh r0, [r0, r2] adds r4, r1, 0 cmp r0, 0x4 - bls _0811886E - b _08118A96 -_0811886E: + bls @0811886E + b @08118A96 +@0811886E: lsls r0, 2 - ldr r1, =_08118884 + ldr r1, =@08118884 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08118884: - .4byte _08118898 - .4byte _081188F0 - .4byte _0811891C - .4byte _0811896C - .4byte _08118A90 -_08118898: +@08118884: + .4byte @08118898 + .4byte @081188F0 + .4byte @0811891C + .4byte @0811896C + .4byte @08118A90 +@08118898: ldr r1, =0x00001842 movs r0, 0x50 bl lcd_io_set @@ -536602,20 +536602,20 @@ _08118898: ldr r1, =0x02000002 ands r0, r1 cmp r0, 0 - beq _081188E4 + beq @081188E4 movs r0, 0x10 - b _081188E6 + b @081188E6 .align 2, 0 .pool -_081188E4: +@081188E4: movs r0, 0x1 -_081188E6: +@081188E6: strh r0, [r2, 0xC] ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] - b _08118A96 -_081188F0: + b @08118A96 +@081188F0: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -536626,19 +536626,19 @@ _081188F0: strh r0, [r1, 0xC] lsls r0, 16 cmp r0, 0 - beq _08118908 - b _08118A96 -_08118908: + beq @08118908 + b @08118A96 +@08118908: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] movs r0, 0x48 movs r1, 0x3F bl lcd_io_set - b _08118A96 + b @08118A96 .align 2, 0 .pool -_0811891C: +@0811891C: ldr r1, =0x02022e26 ldrh r0, [r1] subs r0, 0xFF @@ -536649,9 +536649,9 @@ _0811891C: movs r1, 0xC0 lsls r1, 6 cmp r0, r1 - beq _08118934 - b _08118A96 -_08118934: + beq @08118934 + b @08118A96 +@08118934: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -536671,10 +536671,10 @@ _08118934: ldr r0, =0x0000fffe ands r0, r1 strh r0, [r2] - b _08118A96 + b @08118A96 .align 2, 0 .pool -_0811896C: +@0811896C: lsls r0, r5, 2 adds r1, r0, r5 lsls r1, 3 @@ -536684,39 +536684,39 @@ _0811896C: ldrsh r1, [r2, r6] mov r12, r0 cmp r1, 0 - beq _08118986 + beq @08118986 subs r0, r3, 0x1 strh r0, [r2, 0xE] - b _081189A6 -_08118986: + b @081189A6 +@08118986: ldrh r1, [r2, 0x10] movs r0, 0xF ands r0, r1 cmp r0, 0 - beq _081189A6 + beq @081189A6 ldrh r0, [r2, 0x12] subs r0, 0x1 strh r0, [r2, 0x12] lsls r0, 16 cmp r0, 0 - bne _081189A6 + bne @081189A6 adds r0, r1, 0 adds r0, 0xFF strh r0, [r2, 0x10] movs r0, 0x6 strh r0, [r2, 0x12] -_081189A6: +@081189A6: ldr r2, =0x02022e26 ldrh r1, [r2] movs r0, 0xFF lsls r0, 8 ands r0, r1 cmp r0, 0 - beq _081189BA + beq @081189BA ldr r3, =0xfffffc04 adds r0, r1, r3 strh r0, [r2] -_081189BA: +@081189BA: mov r6, r12 adds r0, r6, r5 lsls r0, 3 @@ -536725,16 +536725,16 @@ _081189BA: movs r3, 0xC ldrsh r0, [r1, r3] cmp r0, 0 - beq _081189D0 + beq @081189D0 subs r0, r2, 0x2 strh r0, [r1, 0xC] -_081189D0: +@081189D0: movs r3, 0 ldr r6, =0x02039b28 mov r8, r6 ldr r7, =0x02038c28 adds r4, r1, 0 -_081189DA: +@081189DA: lsls r2, r3, 1 ldrb r1, [r6, 0x14] lsls r0, r1, 4 @@ -536746,9 +536746,9 @@ _081189DA: strh r0, [r2] adds r3, 0x1 cmp r3, 0x4F - ble _081189DA + ble @081189DA cmp r3, 0x9F - bgt _08118A1E + bgt @08118A1E ldr r7, =0x02038c28 ldr r6, =0x02039b28 ldr r1, =0x03005e00 @@ -536756,7 +536756,7 @@ _081189DA: adds r0, r2, r5 lsls r0, 3 adds r4, r0, r1 -_08118A04: +@08118A04: lsls r2, r3, 1 ldrb r1, [r6, 0x14] lsls r0, r1, 4 @@ -536769,8 +536769,8 @@ _08118A04: strh r0, [r2] adds r3, 0x1 cmp r3, 0x9F - ble _08118A04 -_08118A1E: + ble @08118A04 +@08118A1E: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -536779,7 +536779,7 @@ _08118A1E: movs r3, 0xC ldrsh r2, [r1, r3] cmp r2, 0 - bne _08118A96 + bne @08118A96 movs r0, 0x3 mov r6, r8 strb r0, [r6, 0x15] @@ -536807,13 +536807,13 @@ _08118A1E: lsls r1, 7 movs r0, 0xC bl lcd_io_set - b _08118A96 + b @08118A96 .align 2, 0 .pool -_08118A90: +@08118A90: adds r0, r5, 0 bl sub_811828C -_08118A96: +@08118A96: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -536822,11 +536822,11 @@ _08118A96: movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0x4 - beq _08118AB0 + beq @08118AB0 ldrh r1, [r1, 0x10] movs r0, 0x52 bl lcd_io_set -_08118AB0: +@08118AB0: add sp, 0x4 pop {r3} mov r8, r3 @@ -536838,7 +536838,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 @@ -536854,11 +536854,11 @@ task00_battle_intro_wireless: @ 8118AC0 movs r1, 0x8 ldrsh r0, [r7, r1] cmp r0, 0x1 - ble _08118B36 + ble @08118B36 movs r2, 0x10 ldrsh r0, [r7, r2] cmp r0, 0 - bne _08118B36 + bne @08118B36 ldr r2, =0x02022e18 ldrh r1, [r2] movs r0, 0x80 @@ -536867,20 +536867,20 @@ task00_battle_intro_wireless: @ 8118AC0 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - bne _08118AFE + bne @08118AFE cmp r1, 0x4F - bhi _08118B18 -_08118AFE: + bhi @08118B18 +@08118AFE: adds r0, r1, 0x3 strh r0, [r2] ldr r1, =0x02022e1c ldrh r0, [r1] subs r0, 0x3 strh r0, [r1] - b _08118B36 + b @08118B36 .align 2, 0 .pool -_08118B18: +@08118B18: str r5, [sp] ldr r1, =0x0600e000 ldr r4, =0x05000200 @@ -536894,7 +536894,7 @@ _08118B18: bl CpuSet movs r0, 0x1 strh r0, [r7, 0x10] -_08118B36: +@08118B36: ldr r0, =0x03005e00 lsls r2, r6, 2 adds r1, r2, r6 @@ -536905,24 +536905,24 @@ _08118B36: mov r9, r0 adds r5, r2, 0 cmp r1, 0x4 - bls _08118B4E - b _08118D5A -_08118B4E: + bls @08118B4E + b @08118D5A +@08118B4E: lsls r0, r1, 2 - ldr r1, =_08118B6C + ldr r1, =@08118B6C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08118B6C: - .4byte _08118B80 - .4byte _08118B92 - .4byte _08118C38 - .4byte _08118C7C - .4byte _08118D54 -_08118B80: +@08118B6C: + .4byte @08118B80 + .4byte @08118B92 + .4byte @08118C38 + .4byte @08118C7C + .4byte @08118D54 +@08118B80: adds r0, r5, r6 lsls r0, 3 add r0, r9 @@ -536931,8 +536931,8 @@ _08118B80: ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b _08118D5A -_08118B92: + b @08118D5A +@08118B92: adds r0, r5, r6 lsls r0, 3 mov r2, r9 @@ -536942,9 +536942,9 @@ _08118B92: strh r0, [r1, 0xC] lsls r0, 16 cmp r0, 0 - beq _08118BA8 - b _08118D5A -_08118BA8: + beq @08118BA8 + b @08118D5A +@08118BA8: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] @@ -537005,10 +537005,10 @@ _08118BA8: ldr r1, =0x00003f06 movs r0, 0x4A bl lcd_io_set - b _08118D5A + b @08118D5A .align 2, 0 .pool -_08118C38: +@08118C38: ldr r1, =0x02022e26 ldrh r0, [r1] subs r0, 0xFF @@ -537019,9 +537019,9 @@ _08118C38: movs r1, 0xC0 lsls r1, 6 cmp r0, r1 - beq _08118C50 - b _08118D5A -_08118C50: + beq @08118C50 + b @08118D5A +@08118C50: adds r1, r5, r6 lsls r1, 3 add r1, r9 @@ -537037,21 +537037,21 @@ _08118C50: ldr r0, =0x0000fffe ands r0, r1 strh r0, [r2] - b _08118D5A + b @08118D5A .align 2, 0 .pool -_08118C7C: +@08118C7C: ldr r2, =0x02022e26 ldrh r1, [r2] movs r0, 0xFF lsls r0, 8 ands r0, r1 cmp r0, 0 - beq _08118C90 + beq @08118C90 ldr r3, =0xfffffc04 adds r0, r1, r3 strh r0, [r2] -_08118C90: +@08118C90: adds r0, r5, r6 lsls r0, 3 mov r2, r9 @@ -537060,10 +537060,10 @@ _08118C90: movs r3, 0xC ldrsh r0, [r1, r3] cmp r0, 0 - beq _08118CA6 + beq @08118CA6 subs r0, r2, 0x2 strh r0, [r1, 0xC] -_08118CA6: +@08118CA6: movs r3, 0 ldr r0, =0x02039b28 mov r12, r0 @@ -537071,7 +537071,7 @@ _08118CA6: mov r8, r2 mov r7, r12 adds r4, r1, 0 -_08118CB4: +@08118CB4: lsls r2, r3, 1 ldrb r1, [r7, 0x14] lsls r0, r1, 4 @@ -537083,9 +537083,9 @@ _08118CB4: strh r0, [r2] adds r3, 0x1 cmp r3, 0x4F - ble _08118CB4 + ble @08118CB4 cmp r3, 0x9F - bgt _08118CF8 + bgt @08118CF8 ldr r0, =0x02038c28 mov r8, r0 ldr r7, =0x02039b28 @@ -537093,7 +537093,7 @@ _08118CB4: adds r0, r5, r6 lsls r0, 3 adds r4, r0, r1 -_08118CDE: +@08118CDE: lsls r2, r3, 1 ldrb r1, [r7, 0x14] lsls r0, r1, 4 @@ -537106,8 +537106,8 @@ _08118CDE: strh r0, [r2] adds r3, 0x1 cmp r3, 0x9F - ble _08118CDE -_08118CF8: + ble @08118CDE +@08118CF8: adds r0, r5, r6 lsls r0, 3 mov r2, r9 @@ -537115,7 +537115,7 @@ _08118CF8: movs r3, 0xC ldrsh r0, [r1, r3] cmp r0, 0 - bne _08118D5A + bne @08118D5A movs r0, 0x3 mov r2, r12 strb r0, [r2, 0x15] @@ -537138,13 +537138,13 @@ _08118CF8: lsls r1, 7 movs r0, 0xC bl lcd_io_set - b _08118D5A + b @08118D5A .align 2, 0 .pool -_08118D54: +@08118D54: adds r0, r6, 0 bl sub_811828C -_08118D5A: +@08118D5A: add sp, 0x8 pop {r3,r4} mov r8, r3 @@ -537155,7 +537155,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 @@ -537169,33 +537169,33 @@ sub_8118D68: @ 8118D68 ldrsh r0, [r0, r2] adds r6, r1, 0 cmp r0, 0x5 - bls _08118D86 - b _08118FB2 -_08118D86: + bls @08118D86 + b @08118FB2 +@08118D86: lsls r0, 2 - ldr r1, =_08118D98 + ldr r1, =@08118D98 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08118D98: - .4byte _08118DB0 - .4byte _08118DBE - .4byte _08118E4C - .4byte _08118EA8 - .4byte _08118F00 - .4byte _08118FAC -_08118DB0: +@08118D98: + .4byte @08118DB0 + .4byte @08118DBE + .4byte @08118E4C + .4byte @08118EA8 + .4byte @08118F00 + .4byte @08118FAC +@08118DB0: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r6 movs r1, 0x1 strh r1, [r0, 0xC] - b _08118F84 -_08118DBE: + b @08118F84 +@08118DBE: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -537205,9 +537205,9 @@ _08118DBE: strh r0, [r1, 0xC] lsls r0, 16 cmp r0, 0 - beq _08118DD4 - b _08118FB2 -_08118DD4: + beq @08118DD4 + b @08118FB2 +@08118DD4: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] @@ -537245,10 +537245,10 @@ _08118DD4: subs r2, 0xC0 adds r0, r2, 0 strh r0, [r1] - b _08118FB2 + b @08118FB2 .align 2, 0 .pool -_08118E4C: +@08118E4C: ldr r2, =0x02022e26 ldrh r3, [r2] movs r1, 0x80 @@ -537262,20 +537262,20 @@ _08118E4C: lsls r0, 16 lsrs r0, 16 cmp r1, r0 - beq _08118E6E + beq @08118E6E adds r0, r3, 0 adds r0, 0xFF strh r0, [r2] -_08118E6E: +@08118E6E: ldrh r0, [r2] adds r1, r5, 0 ands r1, r0 movs r0, 0x80 lsls r0, 6 cmp r1, r0 - beq _08118E7E - b _08118FB2 -_08118E7E: + beq @08118E7E + b @08118FB2 +@08118E7E: lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -537290,10 +537290,10 @@ _08118E7E: ldr r0, =0x0000fffe ands r0, r1 strh r0, [r2] - b _08118FB2 + b @08118FB2 .align 2, 0 .pool -_08118EA8: +@08118EA8: ldr r3, =0x02022e26 ldrh r2, [r3] movs r0, 0xFF @@ -537302,12 +537302,12 @@ _08118EA8: movs r1, 0x98 lsls r1, 7 cmp r0, r1 - beq _08118EC2 + beq @08118EC2 movs r1, 0xFF lsls r1, 2 adds r0, r2, r1 strh r0, [r3] -_08118EC2: +@08118EC2: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -537316,10 +537316,10 @@ _08118EC2: movs r2, 0xC ldrsh r0, [r3, r2] cmp r0, 0 - beq _08118ED8 + beq @08118ED8 subs r0, r1, 0x2 strh r0, [r3, 0xC] -_08118ED8: +@08118ED8: ldr r1, =0x02022e18 ldrh r0, [r3, 0xC] strh r0, [r1] @@ -537328,14 +537328,14 @@ _08118ED8: strh r1, [r2] lsls r0, 16 cmp r0, 0 - bne _08118FB2 + bne @08118FB2 ldrh r0, [r3, 0x8] adds r0, 0x1 strh r0, [r3, 0x8] - b _08118FB2 + b @08118FB2 .align 2, 0 .pool -_08118F00: +@08118F00: ldr r1, =0x02022e16 ldrh r0, [r1] adds r3, r0, 0x2 @@ -537352,15 +537352,15 @@ _08118F00: movs r1, 0xA0 lsls r1, 7 cmp r0, r1 - beq _08118F28 + beq @08118F28 adds r0, r2, 0 adds r0, 0xFF strh r0, [r5] -_08118F28: +@08118F28: lsls r0, r3, 16 lsrs r0, 16 cmp r0, 0 - bne _08118FB2 + bne @08118FB2 str r0, [sp] ldr r1, =0x0600e000 ldr r2, =0x05000800 @@ -537396,17 +537396,17 @@ _08118F28: adds r0, r4 lsls r0, 3 adds r0, r1 -_08118F84: +@08118F84: ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b _08118FB2 + b @08118FB2 .align 2, 0 .pool -_08118FAC: +@08118FAC: adds r0, r4, 0 bl sub_811828C -_08118FB2: +@08118FB2: add sp, 0x4 pop {r4-r6} pop {r0} @@ -537414,7 +537414,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 @@ -537471,24 +537471,24 @@ sub_8118FBC: @ 8118FBC adds r0, r6, 0 adds r0, 0x8 cmp r6, r0 - bge _08119068 + bge @08119068 mov r12, r0 mov r2, r8 lsls r7, r2, 1 -_0811903A: +@0811903A: mov r1, r8 adds r2, r1, 0 adds r2, 0x8 adds r4, r6, 0x1 cmp r1, r2 - bge _08119062 + bge @08119062 mov r0, r10 lsls r3, r0, 12 lsls r0, r6, 6 add r0, r9 adds r6, r7, r0 subs r1, r2, r1 -_08119052: +@08119052: adds r0, r5, 0 orrs r0, r3 strh r0, [r6] @@ -537496,12 +537496,12 @@ _08119052: adds r6, 0x2 subs r1, 0x1 cmp r1, 0 - bne _08119052 -_08119062: + bne @08119052 +@08119062: adds r6, r4, 0 cmp r6, r12 - blt _0811903A -_08119068: + blt @0811903A +@08119068: ldr r1, [sp] lsls r0, r1, 24 lsrs r0, 24 @@ -537523,7 +537523,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 @@ -537579,20 +537579,20 @@ sub_8119094: @ 8119094 adds r1, r0, 0 adds r1, 0x8 cmp r0, r1 - bge _08119148 + bge @08119148 mov r9, r1 mov r7, r12 lsls r7, 1 mov r8, r7 lsls r5, 11 str r5, [sp] -_08119110: +@08119110: mov r2, r12 adds r3, r2, 0 adds r3, 0x8 adds r5, r0, 0x1 cmp r2, r3 - bge _08119142 + bge @08119142 mov r1, r10 lsls r6, r1, 12 lsls r0, 6 @@ -537604,7 +537604,7 @@ _08119110: mov r7, r8 adds r1, r7, r0 subs r2, r3, r2 -_08119132: +@08119132: adds r0, r4, 0 orrs r0, r6 strh r0, [r1] @@ -537612,12 +537612,12 @@ _08119132: adds r1, 0x2 subs r2, 0x1 cmp r2, 0 - bne _08119132 -_08119142: + bne @08119132 +@08119142: adds r0, r5, 0 cmp r0, r9 - blt _08119110 -_08119148: + blt @08119110 +@08119148: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -537631,8 +537631,8 @@ _08119148: thumb_func_end sub_8119094 thumb_func_start dp04_initiate_movement -@ void dp04_initiate_movement(int dpad_direction, int buttons_new, int buttons_held) -dp04_initiate_movement: @ 8119164 +; void dp04_initiate_movement(int dpad_direction, int buttons_new, int buttons_held) +dp04_initiate_movement: ; 8119164 push {r4,lr} lsls r0, 24 lsrs r3, r0, 24 @@ -537645,25 +537645,25 @@ dp04_initiate_movement: @ 8119164 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0811918C + beq @0811918C adds r0, r3, 0 adds r1, r4, 0 bl invoke_player_npc_state_changer_chooser - b _08119194 + b @08119194 .align 2, 0 .pool -_0811918C: +@0811918C: adds r0, r3, 0 adds r1, r4, 0 bl sub_81193C8 -_08119194: +@08119194: pop {r4} pop {r0} bx r0 thumb_func_end dp04_initiate_movement thumb_func_start invoke_player_npc_state_changer_chooser -invoke_player_npc_state_changer_chooser: @ 811919C +invoke_player_npc_state_changer_chooser: ; 811919C push {r4,lr} sub sp, 0x4 mov r1, sp @@ -537688,7 +537688,7 @@ invoke_player_npc_state_changer_chooser: @ 811919C thumb_func_end invoke_player_npc_state_changer_chooser thumb_func_start sub_81191CC -sub_81191CC: @ 81191CC +sub_81191CC: ; 81191CC push {r4,lr} adds r4, r0, 0 bl player_get_direction_upper_4bits @@ -537697,50 +537697,50 @@ sub_81191CC: @ 81191CC adds r3, r0, 0 ldrb r1, [r4] cmp r1, 0 - bne _081191F4 + bne @081191F4 strb r0, [r4] ldr r2, =0x02037590 ldrb r0, [r2, 0xB] cmp r0, 0 - bne _08119208 + bne @08119208 strb r1, [r2, 0x2] movs r0, 0 - b _0811921C + b @0811921C .align 2, 0 .pool -_081191F4: +@081191F4: ldr r2, =0x02037590 cmp r1, r3 - beq _08119218 + beq @08119218 ldrb r0, [r2, 0x2] cmp r0, 0x2 - beq _08119218 + beq @08119218 ldrb r0, [r2, 0xB] cmp r0, 0 - beq _08119214 + beq @08119214 strb r3, [r4] -_08119208: +@08119208: movs r0, 0x2 strb r0, [r2, 0x2] movs r0, 0x3 - b _0811921C + b @0811921C .align 2, 0 .pool -_08119214: +@08119214: movs r0, 0x1 - b _0811921A -_08119218: + b @0811921A +@08119218: movs r0, 0x2 -_0811921A: +@0811921A: strb r0, [r2, 0x2] -_0811921C: +@0811921C: pop {r4} pop {r1} bx r1 thumb_func_end sub_81191CC thumb_func_start sub_8119224 -sub_8119224: @ 8119224 +sub_8119224: ; 8119224 push {lr} lsls r0, 24 lsrs r0, 24 @@ -537751,7 +537751,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 @@ -537767,26 +537767,26 @@ sub_8119238: @ 8119238 bl sub_8119F74 lsls r0, 24 cmp r0, 0 - beq _08119270 + beq @08119270 adds r0, r5, 0 bl sub_808B828 bl sub_811A128 - b _0811927A + b @0811927A .align 2, 0 .pool -_08119270: +@08119270: ldrb r0, [r4, 0x18] lsls r0, 28 lsrs r0, 28 bl sub_8119224 -_0811927A: +@0811927A: pop {r4,r5} pop {r0} bx r0 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 @@ -537803,22 +537803,22 @@ sub_8119280: @ 8119280 bl sub_8119F74 lsls r0, 24 cmp r0, 0 - bne _081192C6 + bne @081192C6 ldrb r0, [r6, 0xB] cmp r0, 0 - beq _081192BC + beq @081192BC ldrb r0, [r4, 0x18] lsrs r0, 4 bl npc_state_reaction_to_tile - b _0811933A + b @0811933A .align 2, 0 .pool -_081192BC: +@081192BC: ldrb r0, [r4, 0x18] lsrs r0, 4 bl sub_8119224 - b _0811933A -_081192C6: + b @0811933A +@081192C6: adds r0, r5, 0 bl sub_8119E38 lsls r0, 24 @@ -537828,34 +537828,34 @@ _081192C6: adds r0, r1 lsrs r0, 24 cmp r0, 0xA - bhi _08119316 + bhi @08119316 cmp r4, 0x6 - bne _081192E8 + bne @081192E8 adds r0, r5, 0 bl npc_use_some_d2s_and_sound - b _0811933A -_081192E8: + b @0811933A +@081192E8: bl sub_811A128 cmp r4, 0x4 - bne _08119304 + bne @08119304 adds r0, r5, 0 bl sub_808B324 lsls r0, 24 cmp r0, 0 - beq _08119304 + beq @08119304 adds r0, r5, 0 bl sub_808B7BC - b _0811933A -_08119304: + b @0811933A +@08119304: subs r0, r4, 0x5 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bls _0811933A + bls @0811933A adds r0, r7, 0 bl tile_sound_react - b _0811933A -_08119316: + b @0811933A +@08119316: ldr r1, =0x0859745c ldrb r0, [r6, 0xA] lsls r0, 2 @@ -537870,10 +537870,10 @@ _08119316: adds r0, r2, r0 strb r0, [r6, 0xB] cmp r1, 0x1 - bhi _0811933A + bhi @0811933A adds r0, r2, 0x1 strb r0, [r6, 0xA] -_0811933A: +@0811933A: pop {r4-r7} pop {r0} bx r0 @@ -537882,7 +537882,7 @@ _0811933A: thumb_func_end sub_8119280 thumb_func_start npc_state_reaction_to_tile -npc_state_reaction_to_tile: @ 8119344 +npc_state_reaction_to_tile: ; 8119344 push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -537890,11 +537890,11 @@ npc_state_reaction_to_tile: @ 8119344 ldr r6, =0x02037590 ldrb r0, [r6, 0xB] cmp r0, 0 - beq _0811935A + beq @0811935A subs r0, 0x1 strb r0, [r6, 0xB] strb r0, [r6, 0xA] -_0811935A: +@0811935A: adds r0, r5, 0 bl sub_8119E38 lsls r0, 24 @@ -537904,36 +537904,36 @@ _0811935A: adds r0, r1 lsrs r0, 24 cmp r0, 0xA - bhi _081193AE + bhi @081193AE cmp r4, 0x6 - bne _08119380 + bne @08119380 adds r0, r5, 0 bl npc_use_some_d2s_and_sound - b _081193BE + b @081193BE .align 2, 0 .pool -_08119380: +@08119380: bl sub_811A128 cmp r4, 0x4 - bne _0811939C + bne @0811939C adds r0, r5, 0 bl sub_808B324 lsls r0, 24 cmp r0, 0 - beq _0811939C + beq @0811939C adds r0, r5, 0 bl sub_808B7BC - b _081193BE -_0811939C: + b @081193BE +@0811939C: subs r0, r4, 0x5 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bls _081193BE + bls @081193BE adds r0, r7, 0 bl tile_sound_react - b _081193BE -_081193AE: + b @081193BE +@081193AE: ldr r0, =0x0859745c ldrb r1, [r6, 0xA] lsls r1, 2 @@ -537941,7 +537941,7 @@ _081193AE: ldr r1, [r1] adds r0, r7, 0 bl _call_via_r1 -_081193BE: +@081193BE: pop {r4-r7} pop {r0} bx r0 @@ -537950,8 +537950,8 @@ _081193BE: thumb_func_end npc_state_reaction_to_tile thumb_func_start sub_81193C8 -@ void sub_81193C8(int dpad_direction, int buttons_new, int buttons_held) -sub_81193C8: @ 81193C8 +; void sub_81193C8(int dpad_direction, int buttons_new, int buttons_held) +sub_81193C8: ; 81193C8 push {r4,lr} sub sp, 0x4 mov r3, sp @@ -537980,7 +537980,7 @@ sub_81193C8: @ 81193C8 thumb_func_end sub_81193C8 thumb_func_start sub_8119400 -sub_8119400: @ 8119400 +sub_8119400: ; 8119400 push {r4,lr} lsls r1, 16 lsrs r1, 16 @@ -538003,7 +538003,7 @@ sub_8119400: @ 8119400 thumb_func_end sub_8119400 thumb_func_start sub_811942C -sub_811942C: @ 811942C +sub_811942C: ; 811942C push {r4-r6,lr} adds r4, r0, 0 lsls r1, 16 @@ -538018,51 +538018,51 @@ sub_811942C: @ 811942C strb r0, [r2, 0xA] ldrb r1, [r4] cmp r1, 0 - bne _0811946C + bne @0811946C movs r0, 0x2 ands r0, r6 cmp r0, 0 - beq _08119464 + beq @08119464 strb r3, [r4] strb r1, [r2, 0x2] movs r0, 0x2 strb r0, [r2, 0x8] movs r0, 0x3 - b _081194C0 + b @081194C0 .align 2, 0 .pool -_08119464: +@08119464: strb r3, [r4] strb r1, [r2, 0x2] movs r0, 0 - b _081194C0 -_0811946C: + b @081194C0 +@0811946C: cmp r1, r3 - bne _08119492 + bne @08119492 movs r0, 0x2 ands r0, r5 cmp r0, 0 - beq _0811948A + beq @0811948A ldrb r0, [r2, 0xB] cmp r0, 0 - bne _0811948A + bne @0811948A adds r0, 0x1 strb r0, [r2, 0xB] movs r0, 0x4 strb r0, [r2, 0x8] movs r0, 0xB - b _081194C0 -_0811948A: + b @081194C0 +@0811948A: ldrb r0, [r4] ldr r2, =0x02037590 cmp r0, r3 - beq _081194BC -_08119492: + beq @081194BC +@08119492: ldr r0, =0x02037590 ldrb r1, [r0, 0x2] adds r2, r0, 0 cmp r1, 0x2 - beq _081194BC + beq @081194BC movs r1, 0 movs r0, 0x1 strb r0, [r2, 0x8] @@ -538075,20 +538075,20 @@ _08119492: bl sub_8119400 lsls r0, 24 lsrs r0, 24 - b _081194C0 + b @081194C0 .align 2, 0 .pool -_081194BC: +@081194BC: movs r0, 0x2 strb r0, [r2, 0x2] -_081194C0: +@081194C0: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_811942C thumb_func_start sub_81194C8 -sub_81194C8: @ 81194C8 +sub_81194C8: ; 81194C8 push {r4-r6,lr} adds r5, r0, 0 ldr r4, =0x02037590 @@ -538100,17 +538100,17 @@ sub_81194C8: @ 81194C8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x6 - bls _081194F4 + bls @081194F4 movs r0, 0x1 strb r0, [r4, 0x2] movs r0, 0 strb r0, [r4, 0x8] bl sub_811A128 movs r0, 0x1 - b _0811953A + b @0811953A .align 2, 0 .pool -_081194F4: +@081194F4: bl player_get_direction_upper_4bits lsls r0, 24 lsrs r6, r0, 24 @@ -538119,7 +538119,7 @@ _081194F4: lsls r0, 24 lsrs r0, 24 cmp r1, r0 - bne _08119536 + bne @08119536 bl sub_811A128 movs r0, 0x1 strb r0, [r4, 0xB] @@ -538129,29 +538129,29 @@ _081194F4: lsls r0, 24 lsrs r0, 24 cmp r1, r0 - bne _0811952A + bne @0811952A movs r0, 0x6 strb r0, [r4, 0x8] movs r0, 0x9 - b _0811953A -_0811952A: + b @0811953A +@0811952A: movs r0, 0x2 strb r0, [r4, 0x2] movs r0, 0x5 strb r0, [r4, 0x8] movs r0, 0x8 - b _0811953A -_08119536: + b @0811953A +@08119536: strb r6, [r5] movs r0, 0 -_0811953A: +@0811953A: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_81194C8 thumb_func_start sub_8119540 -sub_8119540: @ 8119540 +sub_8119540: ; 8119540 push {r4-r7,lr} adds r7, r0, 0 lsls r4, r2, 16 @@ -538173,67 +538173,67 @@ sub_8119540: @ 8119540 lsls r4, 16 lsrs r4, 16 cmp r4, 0 - bne _08119594 + bne @08119594 strb r4, [r5, 0xA] ldrb r0, [r1, 0x1E] bl sub_8089954 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _0811959A + bne @0811959A strb r6, [r7] strb r0, [r5, 0x8] bl sub_811A128 movs r0, 0x4 - b _081195D8 + b @081195D8 .align 2, 0 .pool -_08119594: +@08119594: ldrb r0, [r5, 0xA] adds r0, 0x1 strb r0, [r5, 0xA] -_0811959A: +@0811959A: ldr r1, =0x02037590 ldrb r0, [r1, 0xA] cmp r0, 0x27 - bls _081195B4 + bls @081195B4 strb r6, [r7] movs r0, 0x3 strb r0, [r1, 0x8] bl sub_811A128 movs r0, 0x6 - b _081195D8 + b @081195D8 .align 2, 0 .pool -_081195B4: +@081195B4: ldrb r0, [r7] cmp r0, r6 - bne _081195CA + bne @081195CA movs r0, 0x2 strb r0, [r1, 0x2] movs r0, 0x4 strb r0, [r1, 0x8] bl sub_811A128 movs r0, 0xA - b _081195D8 -_081195CA: + b @081195D8 +@081195CA: cmp r0, 0 - beq _081195D4 + beq @081195D4 movs r0, 0x1 strb r0, [r1, 0x2] - b _081195D6 -_081195D4: + b @081195D6 +@081195D4: strb r6, [r7] -_081195D6: +@081195D6: movs r0, 0x5 -_081195D8: +@081195D8: pop {r4-r7} pop {r1} bx r1 thumb_func_end sub_8119540 thumb_func_start sub_81195E0 -sub_81195E0: @ 81195E0 +sub_81195E0: ; 81195E0 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -538260,14 +538260,14 @@ sub_81195E0: @ 81195E0 mov r1, r8 ands r0, r1 cmp r0, 0 - bne _08119652 + bne @08119652 bl sub_811A128 ldrb r0, [r7, 0x1E] bl sub_8089954 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _08119648 + beq @08119648 movs r0, 0x2 strb r0, [r4, 0x8] adds r0, r6, 0 @@ -538276,38 +538276,38 @@ sub_81195E0: @ 81195E0 bl sub_8119400 lsls r0, 24 lsrs r0, 24 - b _08119676 + b @08119676 .align 2, 0 .pool -_08119648: +@08119648: strb r5, [r6] strb r0, [r4, 0x2] strb r0, [r4, 0x8] movs r0, 0x4 - b _08119676 -_08119652: + b @08119676 +@08119652: ldrb r0, [r6] cmp r0, 0 - bne _0811965C + bne @0811965C strb r5, [r6] - b _08119668 -_0811965C: + b @08119668 +@0811965C: cmp r0, r2 - beq _0811966E + beq @0811966E ldrb r0, [r4, 0x2] cmp r0, 0x2 - beq _0811966E + beq @0811966E movs r0, 0x1 -_08119668: +@08119668: strb r0, [r4, 0x2] movs r0, 0x6 - b _08119676 -_0811966E: + b @08119676 +@0811966E: ldr r1, =0x02037590 movs r0, 0x2 strb r0, [r1, 0x2] movs r0, 0x7 -_08119676: +@08119676: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -538319,7 +538319,7 @@ _08119676: thumb_func_end sub_81195E0 thumb_func_start sub_8119688 -sub_8119688: @ 8119688 +sub_8119688: ; 8119688 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -538349,41 +538349,41 @@ sub_8119688: @ 8119688 mov r1, r8 ands r0, r1 cmp r0, 0 - bne _08119720 + bne @08119720 bl sub_811A128 ldrb r0, [r7, 0x1E] bl sub_8089954 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _0811970C + bne @0811970C strb r1, [r4, 0x8] ldrb r0, [r6] cmp r0, 0 - bne _081196EC + bne @081196EC strb r5, [r6] - b _081196F6 + b @081196F6 .align 2, 0 .pool -_081196EC: +@081196EC: cmp r0, r5 - beq _081196FC + beq @081196FC ldrb r0, [r4, 0x2] cmp r0, 0x2 - beq _081196FC -_081196F6: + beq @081196FC +@081196F6: strb r1, [r4, 0x2] movs r0, 0x4 - b _08119750 -_081196FC: + b @08119750 +@081196FC: ldr r1, =0x02037590 movs r0, 0x2 strb r0, [r1, 0x2] movs r0, 0xC - b _08119750 + b @08119750 .align 2, 0 .pool -_0811970C: +@0811970C: mov r0, r9 strb r0, [r4, 0x8] adds r0, r6, 0 @@ -538392,34 +538392,34 @@ _0811970C: bl sub_8119400 lsls r0, 24 lsrs r0, 24 - b _08119750 -_08119720: + b @08119750 +@08119720: ldrb r0, [r6] cmp r0, 0 - bne _08119736 + bne @08119736 strb r5, [r6] mov r1, r9 strb r1, [r4, 0x8] strb r0, [r4, 0x2] bl sub_811A128 movs r0, 0x5 - b _08119750 -_08119736: + b @08119750 +@08119736: cmp r2, r0 - beq _08119748 + beq @08119748 ldrb r0, [r4, 0x2] cmp r0, 0x2 - beq _08119748 + beq @08119748 movs r0, 0 strb r0, [r4, 0x2] movs r0, 0x5 - b _08119750 -_08119748: + b @08119750 +@08119748: ldr r1, =0x02037590 movs r0, 0x2 strb r0, [r1, 0x2] movs r0, 0xA -_08119750: +@08119750: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -538432,7 +538432,7 @@ _08119750: thumb_func_end sub_8119688 thumb_func_start sub_8119764 -sub_8119764: @ 8119764 +sub_8119764: ; 8119764 push {r4-r6,lr} mov r6, r8 push {r6} @@ -538477,7 +538477,7 @@ sub_8119764: @ 8119764 thumb_func_end sub_8119764 thumb_func_start sub_81197C0 -sub_81197C0: @ 81197C0 +sub_81197C0: ; 81197C0 push {r4,lr} lsls r1, 16 lsrs r1, 16 @@ -538497,7 +538497,7 @@ sub_81197C0: @ 81197C0 thumb_func_end sub_81197C0 thumb_func_start sub_81197E4 -sub_81197E4: @ 81197E4 +sub_81197E4: ; 81197E4 push {lr} lsls r0, 24 lsrs r0, 24 @@ -538507,7 +538507,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 @@ -538523,10 +538523,10 @@ sub_81197F4: @ 81197F4 bl sub_8119F74 lsls r0, 24 cmp r0, 0 - bne _0811981A + bne @0811981A ldrb r0, [r5, 0x18] lsrs r4, r0, 4 -_0811981A: +@0811981A: adds r0, r4, 0 bl player_npc_use_look1 pop {r4,r5} @@ -538537,7 +538537,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 @@ -538554,14 +538554,14 @@ sub_8119830: @ 8119830 bl sub_8119F74 lsls r0, 24 cmp r0, 0 - bne _08119868 + bne @08119868 ldrb r0, [r4, 0x18] lsrs r0, 4 bl sub_81197E4 - b _081198BA + b @081198BA .align 2, 0 .pool -_08119868: +@08119868: adds r0, r5, 0 bl sub_8119E38 lsls r0, 24 @@ -538571,43 +538571,43 @@ _08119868: adds r0, r1 lsrs r0, 24 cmp r0, 0xA - bhi _081198B4 + bhi @081198B4 cmp r4, 0x6 - bne _0811988A + bne @0811988A adds r0, r5, 0 bl npc_use_some_d2s_and_sound - b _081198BA -_0811988A: + b @081198BA +@0811988A: cmp r4, 0x4 - bne _081198A2 + bne @081198A2 adds r0, r5, 0 bl sub_808B324 lsls r0, 24 cmp r0, 0 - beq _081198A2 + beq @081198A2 adds r0, r5, 0 bl sub_808B7BC - b _081198BA -_081198A2: + b @081198BA +@081198A2: subs r0, r4, 0x5 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bls _081198BA + bls @081198BA adds r0, r6, 0 bl tile_sound_react - b _081198BA -_081198B4: + b @081198BA +@081198B4: adds r0, r6, 0 bl sub_808B750 -_081198BA: +@081198BA: pop {r4-r6} pop {r0} bx r0 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 @@ -538623,10 +538623,10 @@ sub_81198C0: @ 81198C0 bl sub_8119F74 lsls r0, 24 cmp r0, 0 - bne _081198E6 + bne @081198E6 ldrb r0, [r5, 0x18] lsrs r4, r0, 4 -_081198E6: +@081198E6: adds r0, r4, 0 bl sub_808B8C0 pop {r4,r5} @@ -538637,7 +538637,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 @@ -538653,10 +538653,10 @@ sub_81198FC: @ 81198FC bl sub_8119F74 lsls r0, 24 cmp r0, 0 - bne _08119922 + bne @08119922 ldrb r0, [r5, 0x18] lsrs r4, r0, 4 -_08119922: +@08119922: adds r0, r4, 0 bl sub_808B8D8 pop {r4,r5} @@ -538667,7 +538667,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 @@ -538683,10 +538683,10 @@ sub_8119938: @ 8119938 bl sub_8119F74 lsls r0, 24 cmp r0, 0 - bne _0811995E + bne @0811995E ldrb r0, [r5, 0x18] lsrs r4, r0, 4 -_0811995E: +@0811995E: adds r0, r4, 0 bl sub_808B8A8 pop {r4,r5} @@ -538697,7 +538697,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 @@ -538713,10 +538713,10 @@ sub_8119974: @ 8119974 bl sub_8119F74 lsls r0, 24 cmp r0, 0 - bne _0811999A + bne @0811999A ldrb r0, [r5, 0x18] lsrs r4, r0, 4 -_0811999A: +@0811999A: adds r0, r4, 0 bl sub_808B8F0 pop {r4,r5} @@ -538727,7 +538727,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 @@ -538743,49 +538743,49 @@ sub_81199B0: @ 81199B0 bl sub_8119F74 lsls r0, 24 cmp r0, 0 - bne _081199E4 + bne @081199E4 ldrb r0, [r5, 0x18] lsrs r0, 4 bl sub_8119974 - b _08119A1E + b @08119A1E .align 2, 0 .pool -_081199E4: +@081199E4: adds r0, r4, 0 bl sub_8119E38 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq _08119A18 + beq @08119A18 cmp r1, 0x9 - beq _08119A18 + beq @08119A18 cmp r1, 0x6 - bne _08119A02 + bne @08119A02 adds r0, r4, 0 bl sub_808B938 - b _08119A1E -_08119A02: + b @08119A1E +@08119A02: subs r0, r1, 0x5 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bls _08119A1E + bls @08119A1E cmp r1, 0xB - bhi _08119A18 + bhi @08119A18 adds r0, r4, 0 bl sub_8119974 - b _08119A1E -_08119A18: + b @08119A1E +@08119A18: adds r0, r4, 0 bl sub_808B914 -_08119A1E: +@08119A1E: pop {r4,r5} pop {r0} bx r0 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 @@ -538795,22 +538795,22 @@ sub_8119A24: @ 8119A24 lsrs r0, 24 adds r1, r0, 0 cmp r0, 0 - beq _08119A58 + beq @08119A58 cmp r0, 0x7 - beq _08119A84 + beq @08119A84 cmp r0, 0x9 - bls _08119A50 + bls @08119A50 adds r0, r1, 0 adds r1, r5, 0 bl sub_8119FC4 lsls r0, 24 cmp r0, 0 - bne _08119A58 -_08119A50: + bne @08119A58 +@08119A50: adds r0, r5, 0 bl sub_81197F4 - b _08119A84 -_08119A58: + b @08119A84 +@08119A58: ldr r0, =0x02037590 ldrb r0, [r0, 0x5] lsls r4, r0, 3 @@ -538830,7 +538830,7 @@ _08119A58: lsrs r0, 24 movs r1, 0x2 bl player_npc_set_state_and_x22_etc -_08119A84: +@08119A84: pop {r4,r5} pop {r0} bx r0 @@ -538839,7 +538839,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 @@ -538849,7 +538849,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 @@ -538866,14 +538866,14 @@ sub_8119AA4: @ 8119AA4 bl sub_8119F74 lsls r0, 24 cmp r0, 0 - bne _08119ADC + bne @08119ADC ldrb r0, [r5, 0x18] lsrs r0, 4 bl sub_808B8A8 - b _08119B2C + b @08119B2C .align 2, 0 .pool -_08119ADC: +@08119ADC: adds r0, r4, 0 bl sub_8119E38 lsls r0, 24 @@ -538883,43 +538883,43 @@ _08119ADC: adds r0, r2 lsrs r0, 24 cmp r0, 0xA - bhi _08119B22 + bhi @08119B22 cmp r1, 0x6 - bne _08119AFE + bne @08119AFE adds r0, r4, 0 bl sub_808B938 - b _08119B2C -_08119AFE: + b @08119B2C +@08119AFE: cmp r1, 0x9 - beq _08119B12 + beq @08119B12 cmp r1, 0x4 - bhi _08119B2C + bhi @08119B2C ldrb r0, [r5, 0x1E] bl sub_8089954 lsls r0, 24 cmp r0, 0 - beq _08119B1A -_08119B12: + beq @08119B1A +@08119B12: adds r0, r4, 0 bl sub_808B8A8 - b _08119B2C -_08119B1A: + b @08119B2C +@08119B1A: adds r0, r4, 0 bl sub_808B980 - b _08119B2C -_08119B22: + b @08119B2C +@08119B22: adds r0, r6, 0 bl sub_808B9BC movs r0, 0x2 strb r0, [r7, 0x2] -_08119B2C: +@08119B2C: pop {r4-r7} pop {r0} bx r0 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 @@ -538936,14 +538936,14 @@ sub_8119B34: @ 8119B34 bl sub_8119F74 lsls r0, 24 cmp r0, 0 - bne _08119B6C + bne @08119B6C ldrb r0, [r5, 0x18] lsrs r0, 4 bl sub_808B8C0 - b _08119BBC + b @08119BBC .align 2, 0 .pool -_08119B6C: +@08119B6C: adds r0, r4, 0 bl sub_8119E38 lsls r0, 24 @@ -538953,43 +538953,43 @@ _08119B6C: adds r0, r2 lsrs r0, 24 cmp r0, 0xA - bhi _08119BB2 + bhi @08119BB2 cmp r1, 0x6 - bne _08119B8E + bne @08119B8E adds r0, r4, 0 bl sub_808B938 - b _08119BBC -_08119B8E: + b @08119BBC +@08119B8E: cmp r1, 0x9 - beq _08119BA2 + beq @08119BA2 cmp r1, 0x4 - bhi _08119BBC + bhi @08119BBC ldrb r0, [r5, 0x1E] bl sub_8089954 lsls r0, 24 cmp r0, 0 - beq _08119BAA -_08119BA2: + beq @08119BAA +@08119BA2: adds r0, r4, 0 bl sub_808B8A8 - b _08119BBC -_08119BAA: + b @08119BBC +@08119BAA: adds r0, r4, 0 bl sub_808B980 - b _08119BBC -_08119BB2: + b @08119BBC +@08119BB2: adds r0, r6, 0 bl sub_808B9A4 movs r0, 0x2 strb r0, [r7, 0x2] -_08119BBC: +@08119BBC: pop {r4-r7} pop {r0} bx r0 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 @@ -539006,14 +539006,14 @@ sub_8119BC4: @ 8119BC4 bl sub_8119F74 lsls r0, 24 cmp r0, 0 - bne _08119BFC + bne @08119BFC ldrb r0, [r5, 0x18] lsrs r0, 4 bl sub_808B8D8 - b _08119C36 + b @08119C36 .align 2, 0 .pool -_08119BFC: +@08119BFC: adds r0, r4, 0 bl sub_8119E38 lsls r0, 24 @@ -539023,33 +539023,33 @@ _08119BFC: adds r0, r2 lsrs r0, 24 cmp r0, 0xA - bhi _08119C30 + bhi @08119C30 cmp r1, 0x6 - bne _08119C1E + bne @08119C1E adds r0, r4, 0 bl npc_use_some_d2s_and_sound - b _08119C36 -_08119C1E: + b @08119C36 +@08119C1E: subs r0, r1, 0x5 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bls _08119C36 + bls @08119C36 adds r0, r4, 0 bl sub_808B8D8 - b _08119C36 -_08119C30: + b @08119C36 +@08119C30: adds r0, r6, 0 bl npc_use_some_d2s -_08119C36: +@08119C36: pop {r4-r6} pop {r0} bx r0 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 @@ -539060,11 +539060,11 @@ sub_8119C3C: @ 8119C3C movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08119C5A + beq @08119C5A adds r0, r3, 0 adds r1, r2, 0 bl sub_8119C64 -_08119C5A: +@08119C5A: pop {r0} bx r0 .align 2, 0 @@ -539072,8 +539072,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 @@ -539086,21 +539086,21 @@ sub_8119C64: @ 8119C64 movs r1, 0xF ands r0, r1 cmp r2, r0 - bne _08119C90 + bne @08119C90 ldrb r0, [r4, 0x14] cmp r0, 0xFE - bhi _08119C9A + bhi @08119C9A adds r0, 0x1 strb r0, [r4, 0x14] - b _08119C9A + b @08119C9A .align 2, 0 .pool -_08119C90: +@08119C90: adds r0, r2, 0 bl sub_8119D80 movs r0, 0 strb r0, [r4, 0xB] -_08119C9A: +@08119C9A: movs r0, 0xF adds r2, r5, 0 ands r2, r0 @@ -539109,90 +539109,90 @@ _08119C9A: movs r1, 0xF ands r0, r1 cmp r2, r0 - bne _08119CBC + bne @08119CBC ldrb r0, [r4, 0x1C] cmp r0, 0xFE - bhi _08119CC6 + bhi @08119CC6 adds r0, 0x1 strb r0, [r4, 0x1C] - b _08119CC6 + b @08119CC6 .align 2, 0 .pool -_08119CBC: +@08119CBC: adds r0, r2, 0 bl sub_8119DBC movs r0, 0 strb r0, [r4, 0xB] -_08119CC6: +@08119CC6: pop {r4,r5} pop {r0} bx r0 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 movs r2, 0 ldrb r0, [r3] cmp r0, 0 - beq _08119CF6 + beq @08119CF6 ldr r5, =0x020375a4 -_08119CDC: +@08119CDC: adds r0, r2, r5 adds r1, r3, r2 ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bhi _08119D0C + bhi @08119D0C adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 adds r0, r3, r2 ldrb r0, [r0] cmp r0, 0 - bne _08119CDC -_08119CF6: + bne @08119CDC +@08119CF6: movs r2, 0 ldrb r0, [r4] cmp r0, 0 - beq _08119D26 + beq @08119D26 ldr r3, =0x020375ac -_08119D00: +@08119D00: adds r0, r2, r3 adds r1, r4, r2 ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bls _08119D18 -_08119D0C: + bls @08119D18 +@08119D0C: movs r0, 0 - b _08119D28 + b @08119D28 .align 2, 0 .pool -_08119D18: +@08119D18: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 adds r0, r4, r2 ldrb r0, [r0] cmp r0, 0 - bne _08119D00 -_08119D26: + bne @08119D00 +@08119D26: movs r0, 0x1 -_08119D28: +@08119D28: pop {r4,r5} pop {r1} bx r1 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 -_08119D36: +@08119D36: ldr r0, =0x085974c0 adds r4, r5, r0 ldr r0, =0x02037590 @@ -539204,34 +539204,34 @@ _08119D36: ands r2, r0 ldr r0, [r4] cmp r1, r0 - bne _08119D70 + bne @08119D70 ldr r0, [r4, 0x4] cmp r2, r0 - bne _08119D70 + bne @08119D70 ldr r0, [r4, 0x10] ldr r1, [r4, 0x14] bl sub_8119CCC lsls r0, 24 cmp r0, 0 - beq _08119D70 + beq @08119D70 ldrb r0, [r4, 0x18] - b _08119D7A + b @08119D7A .align 2, 0 .pool -_08119D70: +@08119D70: adds r5, 0x1C adds r6, 0x1 cmp r6, 0x3 - bls _08119D36 + bls @08119D36 movs r0, 0 -_08119D7A: +@08119D7A: pop {r4-r6} pop {r1} bx r1 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 @@ -539246,7 +539246,7 @@ sub_8119D80: @ 8119D80 movs r1, 0x7 adds r4, r3, 0 adds r3, 0x14 -_08119D9C: +@08119D9C: adds r2, r1, r3 subs r1, 0x1 adds r0, r1, r3 @@ -539255,7 +539255,7 @@ _08119D9C: lsls r1, 24 lsrs r1, 24 cmp r1, 0 - bne _08119D9C + bne @08119D9C movs r0, 0x1 strb r0, [r4, 0x14] pop {r4} @@ -539266,7 +539266,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 @@ -539281,7 +539281,7 @@ sub_8119DBC: @ 8119DBC movs r1, 0x7 adds r4, r3, 0 adds r3, 0x1C -_08119DD8: +@08119DD8: adds r2, r1, r3 subs r1, 0x1 adds r0, r1, r3 @@ -539290,7 +539290,7 @@ _08119DD8: lsls r1, 24 lsrs r1, 24 cmp r1, 0 - bne _08119DD8 + bne @08119DD8 movs r0, 0x1 strb r0, [r4, 0x1C] pop {r4} @@ -539301,7 +539301,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 @@ -539309,39 +539309,39 @@ sub_8119DF8: @ 8119DF8 movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _08119E0C + beq @08119E0C movs r0, 0x2 - b _08119E32 -_08119E0C: + b @08119E32 +@08119E0C: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08119E18 + beq @08119E18 movs r0, 0x1 - b _08119E32 -_08119E18: + b @08119E32 +@08119E18: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _08119E24 + beq @08119E24 movs r0, 0x3 - b _08119E32 -_08119E24: + b @08119E32 +@08119E24: movs r0, 0x10 ands r2, r0 cmp r2, 0 - bne _08119E30 + bne @08119E30 movs r0, 0 - b _08119E32 -_08119E30: + b @08119E32 +@08119E30: movs r0, 0x4 -_08119E32: +@08119E32: pop {r1} bx r1 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 @@ -539393,7 +539393,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] @@ -539411,21 +539411,21 @@ sub_8119EA4: @ 8119EA4 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 - bhi _08119EE4 + bhi @08119EE4 cmp r4, 0 - bne _08119EE0 + bne @08119EE0 adds r0, r5, 0 bl sub_8119F18 lsls r0, 24 cmp r0, 0 - beq _08119EDC + beq @08119EDC movs r4, 0x2 -_08119EDC: +@08119EDC: cmp r4, 0 - beq _08119EE4 -_08119EE0: + beq @08119EE4 +@08119EE0: bl sub_8119F50 -_08119EE4: +@08119EE4: adds r0, r4, 0 add sp, 0x4 pop {r4,r5} @@ -539434,32 +539434,32 @@ _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 bl sub_8119F18 lsls r0, 24 cmp r0, 0 - bne _08119F08 + bne @08119F08 ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x8 - bne _08119F10 -_08119F08: + bne @08119F10 +@08119F08: movs r0, 0x1 - b _08119F12 + b @08119F12 .align 2, 0 .pool -_08119F10: +@08119F10: movs r0, 0 -_08119F12: +@08119F12: pop {r1} bx r1 thumb_func_end sub_8119EF0 thumb_func_start sub_8119F18 -sub_8119F18: @ 8119F18 +sub_8119F18: ; 8119F18 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -539467,42 +539467,42 @@ sub_8119F18: @ 8119F18 bl sub_80899D0 lsls r0, 24 cmp r0, 0 - bne _08119F42 + bne @08119F42 adds r0, r4, 0 bl sub_8089750 lsls r0, 24 cmp r0, 0 - beq _08119F46 + beq @08119F46 bl player_get_height movs r1, 0x1 ands r1, r0 cmp r1, 0 - bne _08119F46 -_08119F42: + bne @08119F46 +@08119F42: movs r0, 0x1 - b _08119F48 -_08119F46: + b @08119F48 +@08119F46: movs r0, 0 -_08119F48: +@08119F48: pop {r4} pop {r1} bx r1 thumb_func_end sub_8119F18 thumb_func_start sub_8119F50 -sub_8119F50: @ 8119F50 +sub_8119F50: ; 8119F50 push {lr} ldr r0, =0x0203ab54 ldrb r0, [r0] cmp r0, 0 - beq _08119F66 + beq @08119F66 ldr r1, =0x0203ab55 ldrb r0, [r1] cmp r0, 0x63 - bhi _08119F66 + bhi @08119F66 adds r0, 0x1 strb r0, [r1] -_08119F66: +@08119F66: pop {r0} bx r0 .align 2, 0 @@ -539510,7 +539510,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 @@ -539521,40 +539521,40 @@ sub_8119F74: @ 8119F74 adds r0, r1 lsrs r0, 24 cmp r0, 0x1 - bhi _08119F9E + bhi @08119F9E adds r0, r4, 0 bl sub_8089968 lsls r0, 24 cmp r0, 0 - bne _08119FB6 + bne @08119FB6 adds r0, r4, 0 bl sub_8089990 - b _08119FB0 -_08119F9E: + b @08119FB0 +@08119F9E: adds r0, r5, 0 bl sub_808997C lsls r0, 24 cmp r0, 0 - bne _08119FB6 + bne @08119FB6 adds r0, r5, 0 bl sub_80899A4 -_08119FB0: +@08119FB0: lsls r0, 24 cmp r0, 0 - beq _08119FBA -_08119FB6: + beq @08119FBA +@08119FB6: movs r0, 0 - b _08119FBC -_08119FBA: + b @08119FBC +@08119FBA: movs r0, 0x1 -_08119FBC: +@08119FBC: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_8119F74 thumb_func_start sub_8119FC4 -sub_8119FC4: @ 8119FC4 +sub_8119FC4: ; 8119FC4 push {lr} lsls r0, 24 lsrs r0, 24 @@ -539565,29 +539565,29 @@ sub_8119FC4: @ 8119FC4 adds r1, r3 lsrs r1, 24 cmp r1, 0x1 - bhi _08119FE4 + bhi @08119FE4 cmp r0, 0xA - beq _08119FEC + beq @08119FEC cmp r0, 0xC - bne _08119FF0 - b _08119FEC -_08119FE4: + bne @08119FF0 + b @08119FEC +@08119FE4: cmp r2, 0xB - beq _08119FEC + beq @08119FEC cmp r2, 0xD - bne _08119FF0 -_08119FEC: + bne @08119FF0 +@08119FEC: movs r0, 0 - b _08119FF2 -_08119FF0: + b @08119FF2 +@08119FF0: movs r0, 0x1 -_08119FF2: +@08119FF2: pop {r1} bx r1 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 @@ -539595,7 +539595,7 @@ sub_8119FF8: @ 8119FF8 movs r0, 0x18 ands r0, r1 cmp r0, 0 - bne _0811A038 + bne @0811A038 mov r4, sp adds r4, 0x2 mov r0, sp @@ -539612,14 +539612,14 @@ sub_8119FF8: @ 8119FF8 bl sub_8119F18 lsls r0, 24 cmp r0, 0 - bne _0811A038 + bne @0811A038 movs r0, 0 - b _0811A03A + b @0811A03A .align 2, 0 .pool -_0811A038: +@0811A038: movs r0, 0x1 -_0811A03A: +@0811A03A: add sp, 0x4 pop {r4} pop {r1} @@ -539627,13 +539627,13 @@ _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 walkrun_bitfield_and_r0 lsls r0, 24 cmp r0, 0 - beq _0811A078 + beq @0811A078 ldr r2, =0x02037350 ldr r0, =0x02037590 ldrb r1, [r0, 0x5] @@ -539645,20 +539645,20 @@ player_should_look_direction_be_enforced_upon_movement: @ 811A044 bl sub_8089954 lsls r0, 24 cmp r0, 0 - beq _0811A078 + beq @0811A078 movs r0, 0 - b _0811A07A + b @0811A07A .align 2, 0 .pool -_0811A078: +@0811A078: movs r0, 0x1 -_0811A07A: +@0811A07A: pop {r1} bx r1 thumb_func_end player_should_look_direction_be_enforced_upon_movement thumb_func_start sub_811A080 -sub_811A080: @ 811A080 +sub_811A080: ; 811A080 push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 @@ -539670,15 +539670,15 @@ sub_811A080: @ 811A080 movs r0, 0x6 ands r0, r1 cmp r0, 0 - beq _0811A0B0 + beq @0811A0B0 movs r0, 0x1 bl walkrun_set_bike_bits bl sav1_reset_x2C bl sub_8085784 - b _0811A0C4 + b @0811A0C4 .align 2, 0 .pool -_0811A0B0: +@0811A0B0: adds r0, r2, 0 bl walkrun_set_bike_bits ldr r4, =0x00000193 @@ -539686,7 +539686,7 @@ _0811A0B0: bl sav1_set_x2C adds r0, r4, 0 bl sub_80858C4 -_0811A0C4: +@0811A0C4: pop {r4} pop {r0} bx r0 @@ -539695,7 +539695,7 @@ _0811A0C4: thumb_func_end sub_811A080 thumb_func_start sub_811A0D0 -sub_811A0D0: @ 811A0D0 +sub_811A0D0: ; 811A0D0 push {lr} ldr r2, =0x02037590 movs r3, 0 @@ -539707,25 +539707,25 @@ sub_811A0D0: @ 811A0D0 str r1, [r2, 0x10] movs r1, 0 adds r2, 0x14 -_0811A0E6: +@0811A0E6: adds r0, r1, r2 strb r3, [r0] adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x7 - bls _0811A0E6 + bls @0811A0E6 movs r1, 0 ldr r3, =0x020375ac movs r2, 0 -_0811A0FA: +@0811A0FA: adds r0, r1, r3 strb r2, [r0] adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x7 - bls _0811A0FA + bls @0811A0FA pop {r0} bx r0 .align 2, 0 @@ -539733,7 +539733,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 @@ -539747,7 +539747,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] @@ -539758,7 +539758,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, =0x085974b8 @@ -539770,39 +539770,39 @@ sub_811A138: @ 811A138 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0811A168 + beq @0811A168 ldrb r0, [r2, 0xA] lsls r0, 1 add r0, sp movs r1, 0 ldrsh r0, [r0, r1] - b _0811A182 + b @0811A182 .align 2, 0 .pool -_0811A168: +@0811A168: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0811A174 + beq @0811A174 movs r0, 0x3 - b _0811A182 -_0811A174: + b @0811A182 +@0811A174: movs r0, 0x88 ands r0, r1 cmp r0, 0 - bne _0811A180 + bne @0811A180 movs r0, 0x1 - b _0811A182 -_0811A180: + b @0811A182 +@0811A180: movs r0, 0x2 -_0811A182: +@0811A182: add sp, 0x8 pop {r1} bx r1 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 @@ -539810,7 +539810,7 @@ sub_811A188: @ 811A188 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0811A1D0 + beq @0811A1D0 mov r4, sp adds r4, 0x2 mov r0, sp @@ -539827,14 +539827,14 @@ sub_811A188: @ 811A188 bl sub_8089954 lsls r0, 24 cmp r0, 0 - beq _0811A1D0 + beq @0811A1D0 movs r0, 0x2 strb r0, [r5, 0x8] bl player_get_direction_upper_4bits lsls r0, 24 lsrs r0, 24 bl sub_808C1B4 -_0811A1D0: +@0811A1D0: add sp, 0x4 pop {r4,r5} pop {r0} @@ -539844,7 +539844,7 @@ _0811A1D0: thumb_func_end sub_811A188 thumb_func_start is_tile_to_run_on -is_tile_to_run_on: @ 811A1DC +is_tile_to_run_on: ; 811A1DC push {lr} lsls r0, 24 lsrs r2, r0, 24 @@ -539853,27 +539853,27 @@ is_tile_to_run_on: @ 811A1DC movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0811A1FC + beq @0811A1FC adds r0, r2, 0 bl sub_8119F18 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0811A204 -_0811A1FC: + bne @0811A204 +@0811A1FC: movs r0, 0x1 - b _0811A206 + b @0811A206 .align 2, 0 .pool -_0811A204: +@0811A204: movs r0, 0 -_0811A206: +@0811A206: pop {r1} bx r1 thumb_func_end is_tile_to_run_on thumb_func_start sub_811A20C -sub_811A20C: @ 811A20C +sub_811A20C: ; 811A20C push {r4-r6,lr} mov r6, r9 mov r5, r8 @@ -539921,7 +539921,7 @@ sub_811A20C: @ 811A20C thumb_func_end sub_811A20C thumb_func_start sub_811A278 -sub_811A278: @ 811A278 +sub_811A278: ; 811A278 push {lr} bl run_active_tasks bl call_obj_callbacks @@ -539932,7 +539932,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 copy_super_sprites_to_oam @@ -539942,7 +539942,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 @@ -539959,32 +539959,32 @@ 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 bl is_c1_link_related_active cmp r0, 0 - bne _0811A2DC -_0811A2CE: + bne @0811A2DC +@0811A2CE: adds r0, r4, 0 bl sub_811A428 lsls r0, 24 cmp r0, 0 - bne _0811A2CE - b _0811A2EA -_0811A2DC: + bne @0811A2CE + b @0811A2EA +@0811A2DC: adds r0, r4, 0 bl sub_811A428 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0811A2F2 -_0811A2EA: + beq @0811A2F2 +@0811A2EA: ldr r1, =sub_811A2FC + 1 adds r0, r4, 0 bl sub_811A2A4 -_0811A2F2: +@0811A2F2: pop {r4} pop {r0} bx r0 @@ -539993,7 +539993,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 @@ -540006,25 +540006,25 @@ sub_811A2FC: @ 811A2FC movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0x5 - bls _0811A318 - b _0811A41C -_0811A318: + bls @0811A318 + b @0811A41C +@0811A318: lsls r0, 2 - ldr r1, =_0811A32C + ldr r1, =@0811A32C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0811A32C: - .4byte _0811A344 - .4byte _0811A370 - .4byte _0811A3CC - .4byte _0811A3D4 - .4byte _0811A3EC - .4byte _0811A40C -_0811A344: +@0811A32C: + .4byte @0811A344 + .4byte @0811A370 + .4byte @0811A3CC + .4byte @0811A3D4 + .4byte @0811A3EC + .4byte @0811A40C +@0811A344: ldr r0, =sub_811A290 + 1 bl SetVBlankCallback movs r4, 0x1 @@ -540041,10 +540041,10 @@ _0811A344: movs r3, 0 bl sub_80A1AD4 movs r0, 0x5 - b _0811A41A + b @0811A41A .align 2, 0 .pool -_0811A370: +@0811A370: bl sub_811AAAC lsls r0, 16 lsrs r4, r0, 16 @@ -540052,7 +540052,7 @@ _0811A370: adds r0, r4, 0 bl sub_811A88C cmp r0, 0 - beq _0811A39E + beq @0811A39E movs r0, 0x1 negs r0, r0 movs r1, 0x2 @@ -540064,10 +540064,10 @@ _0811A370: movs r0, 0x3 strh r0, [r5] strh r4, [r5, 0xC] - b _0811A41C -_0811A39E: + b @0811A41C +@0811A39E: cmp r4, 0x18 - bne _0811A3B6 + bne @0811A3B6 movs r1, 0x1 negs r1, r1 str r0, [sp] @@ -540076,59 +540076,59 @@ _0811A39E: movs r3, 0x10 bl sub_80A1AD4 movs r0, 0x4 - b _0811A41A -_0811A3B6: + b @0811A41A +@0811A3B6: cmp r6, 0 - beq _0811A41C + beq @0811A41C movs r0, 0x5 bl audio_play adds r0, r6, 0 bl sub_811C158 ldrh r0, [r5] adds r0, 0x1 - b _0811A41A -_0811A3CC: + b @0811A41A +@0811A3CC: bl sub_811C170 lsls r0, 24 - b _0811A414 -_0811A3D4: + b @0811A414 +@0811A3D4: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0811A41C + bne @0811A41C ldrh r0, [r5, 0xC] bl sub_811A8A4 - b _0811A41C + b @0811A41C .align 2, 0 .pool -_0811A3EC: +@0811A3EC: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0811A41C + bne @0811A41C adds r0, r2, 0 movs r1, 0x4 bl get_word_task_arg bl sub_811A4D0 - b _0811A41C + b @0811A41C .align 2, 0 .pool -_0811A40C: +@0811A40C: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 -_0811A414: +@0811A414: cmp r0, 0 - bne _0811A41C + bne @0811A41C movs r0, 0x1 -_0811A41A: +@0811A41A: strh r0, [r5] -_0811A41C: +@0811A41C: add sp, 0x4 pop {r4-r6} pop {r0} @@ -540138,7 +540138,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 @@ -540150,32 +540150,32 @@ sub_811A428: @ 811A428 movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0x4 - bhi _0811A4BC + bhi @0811A4BC lsls r0, 2 - ldr r1, =_0811A454 + ldr r1, =@0811A454 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0811A454: - .4byte _0811A468 - .4byte _0811A47C - .4byte _0811A482 - .4byte _0811A498 - .4byte _0811A4B0 -_0811A468: +@0811A454: + .4byte @0811A468 + .4byte @0811A47C + .4byte @0811A482 + .4byte @0811A498 + .4byte @0811A4B0 +@0811A468: movs r0, 0 bl SetVBlankCallback bl reset_all_obj_data bl gpu_pal_allocator_reset bl sub_80A1A74 - b _0811A4C0 -_0811A47C: + b @0811A4C0 +@0811A47C: bl sub_811F28C - b _0811A49C -_0811A482: + b @0811A49C +@0811A482: ldrb r4, [r6, 0x2] adds r0, r5, 0 movs r1, 0x2 @@ -540184,41 +540184,41 @@ _0811A482: ldrb r2, [r6, 0xE] adds r0, r4, 0 bl sub_811A95C - b _0811A49C -_0811A498: + b @0811A49C +@0811A498: bl sub_811BF8C -_0811A49C: +@0811A49C: lsls r0, 24 cmp r0, 0 - bne _0811A4C0 + bne @0811A4C0 adds r0, r5, 0 movs r1, 0x4 bl get_word_task_arg bl sub_811A4D0 - b _0811A4C0 -_0811A4B0: + b @0811A4C0 +@0811A4B0: bl sub_811BFA4 lsls r0, 24 cmp r0, 0 - beq _0811A4C0 - b _0811A4C6 -_0811A4BC: + beq @0811A4C0 + b @0811A4C6 +@0811A4BC: movs r0, 0 - b _0811A4C8 -_0811A4C0: + b @0811A4C8 +@0811A4C0: ldrh r0, [r6] adds r0, 0x1 strh r0, [r6] -_0811A4C6: +@0811A4C6: movs r0, 0x1 -_0811A4C8: +@0811A4C8: pop {r4-r6} pop {r1} bx r1 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 @@ -540233,78 +540233,78 @@ sub_811A4D0: @ 811A4D0 thumb_func_end sub_811A4D0 thumb_func_start sub_811A4F0 -sub_811A4F0: @ 811A4F0 +sub_811A4F0: ; 811A4F0 push {r4,r5,lr} movs r5, 0x3 ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0x14 - bls _0811A4FE - b _0811A7D4 -_0811A4FE: + bls @0811A4FE + b @0811A7D4 +@0811A4FE: lsls r0, 2 - ldr r1, =_0811A510 + ldr r1, =@0811A510 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0811A510: - .4byte _0811A564 - .4byte _0811A578 - .4byte _0811A58C - .4byte _0811A5A0 - .4byte _0811A5B4 - .4byte _0811A604 - .4byte _0811A5D8 - .4byte _0811A630 - .4byte _0811A664 - .4byte _0811A688 - .4byte _0811A6B4 - .4byte _0811A6D4 - .4byte _0811A708 - .4byte _0811A72C - .4byte _0811A73C - .4byte _0811A770 - .4byte _0811A7D4 - .4byte _0811A784 - .4byte _0811A798 - .4byte _0811A7AC - .4byte _0811A7BC -_0811A564: +@0811A510: + .4byte @0811A564 + .4byte @0811A578 + .4byte @0811A58C + .4byte @0811A5A0 + .4byte @0811A5B4 + .4byte @0811A604 + .4byte @0811A5D8 + .4byte @0811A630 + .4byte @0811A664 + .4byte @0811A688 + .4byte @0811A6B4 + .4byte @0811A6D4 + .4byte @0811A708 + .4byte @0811A72C + .4byte @0811A73C + .4byte @0811A770 + .4byte @0811A7D4 + .4byte @0811A784 + .4byte @0811A798 + .4byte @0811A7AC + .4byte @0811A7BC +@0811A564: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00002bb0 adds r4, r0, r1 - b _0811A7C2 + b @0811A7C2 .align 2, 0 .pool -_0811A578: +@0811A578: ldr r0, =0x03005d8c ldr r0, [r0] ldr r2, =0x00002bbc adds r4, r0, r2 - b _0811A7C2 + b @0811A7C2 .align 2, 0 .pool -_0811A58C: +@0811A58C: ldr r0, =0x03005d8c ldr r0, [r0] ldr r3, =0x00002bc8 adds r4, r0, r3 - b _0811A7C2 + b @0811A7C2 .align 2, 0 .pool -_0811A5A0: +@0811A5A0: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00002bd4 adds r4, r0, r1 - b _0811A7C2 + b @0811A7C2 .align 2, 0 .pool -_0811A5B4: +@0811A5B4: ldr r2, =0x03005d8c ldr r0, =0x020375e2 ldrh r1, [r0] @@ -540315,10 +540315,10 @@ _0811A5B4: adds r0, r3 ldr r1, [r2] adds r4, r1, r0 - b _0811A7C2 + b @0811A7C2 .align 2, 0 .pool -_0811A5D8: +@0811A5D8: ldr r0, =0x03005d8c ldr r0, [r0] ldr r2, =0x00002e36 @@ -540326,18 +540326,18 @@ _0811A5D8: ldr r3, =0x00002e2a adds r2, r0, r3 movs r3, 0x5 -_0811A5E6: +@0811A5E6: ldrh r0, [r2] strh r0, [r2, 0xC] adds r2, 0x2 subs r3, 0x1 cmp r3, 0 - bge _0811A5E6 + bge @0811A5E6 adds r4, r1, 0 - b _0811A7C2 + b @0811A7C2 .align 2, 0 .pool -_0811A604: +@0811A604: ldr r2, =0x03005d8c ldr r0, =0x020375e2 ldrh r1, [r0] @@ -540350,10 +540350,10 @@ _0811A604: adds r4, r0, r1 ldr r0, =0x020375e4 ldrb r5, [r0] - b _0811A7C2 + b @0811A7C2 .align 2, 0 .pool -_0811A630: +@0811A630: ldr r2, =0x03005d8c ldr r0, =0x020375e2 ldrh r1, [r0] @@ -540370,10 +540370,10 @@ _0811A630: adds r0, 0x1C adds r4, r1, r0 movs r5, 0x1 - b _0811A7C2 + b @0811A7C2 .align 2, 0 .pool -_0811A664: +@0811A664: ldr r2, =0x03005d8c ldr r0, =0x020375e2 ldrh r1, [r0] @@ -540385,10 +540385,10 @@ _0811A664: ldr r1, =0x000027ce adds r4, r0, r1 movs r5, 0 - b _0811A7C2 + b @0811A7C2 .align 2, 0 .pool -_0811A688: +@0811A688: ldr r4, =0x02021ec4 ldr r1, =0x03005d8c ldr r0, [r1] @@ -540401,10 +540401,10 @@ _0811A688: adds r0, r3 ldrh r0, [r0] strh r0, [r4, 0x2] - b _0811A7C2 + b @0811A7C2 .align 2, 0 .pool -_0811A6B4: +@0811A6B4: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00002baa @@ -540413,10 +540413,10 @@ _0811A6B4: adds r0, r2, 0 strh r0, [r4] movs r5, 0x1 - b _0811A7C2 + b @0811A7C2 .align 2, 0 .pool -_0811A6D4: +@0811A6D4: ldr r2, =0x03005d8c ldr r0, =0x020375e2 ldrh r1, [r0] @@ -540433,10 +540433,10 @@ _0811A6D4: adds r0, 0x4 adds r4, r1, r0 movs r5, 0 - b _0811A7C2 + b @0811A7C2 .align 2, 0 .pool -_0811A708: +@0811A708: ldr r2, =0x03005d8c ldr r0, =0x020375e2 ldrh r1, [r0] @@ -540448,18 +540448,18 @@ _0811A708: ldr r1, =0x000027e4 adds r4, r0, r1 movs r5, 0x1 - b _0811A7C2 + b @0811A7C2 .align 2, 0 .pool -_0811A72C: +@0811A72C: ldr r4, =0x02021ec4 adds r0, r4, 0 movs r1, 0x2 bl sub_811F88C - b _0811A7C2 + b @0811A7C2 .align 2, 0 .pool -_0811A73C: +@0811A73C: ldr r2, =0x03005d8c ldr r0, =0x020375e2 ldrh r1, [r0] @@ -540476,46 +540476,46 @@ _0811A73C: adds r0, r2, 0 strh r0, [r1, 0x14] movs r5, 0x2 - b _0811A7C2 + b @0811A7C2 .align 2, 0 .pool -_0811A770: +@0811A770: ldr r0, =0x03005d8c ldr r0, [r0] ldr r3, =0x00003b6e adds r4, r0, r3 - b _0811A7C2 + b @0811A7C2 .align 2, 0 .pool -_0811A784: +@0811A784: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00003b5a adds r4, r0, r1 - b _0811A7C2 + b @0811A7C2 .align 2, 0 .pool -_0811A798: +@0811A798: ldr r0, =0x03005d8c ldr r0, [r0] ldr r2, =0x00003b6c adds r4, r0, r2 - b _0811A7C2 + b @0811A7C2 .align 2, 0 .pool -_0811A7AC: +@0811A7AC: ldr r0, =0x03005d90 ldr r0, [r0] movs r3, 0x82 lsls r3, 1 adds r4, r0, r3 - b _0811A7C2 + b @0811A7C2 .align 2, 0 .pool -_0811A7BC: +@0811A7BC: bl sub_801B058 adds r4, r0, 0 -_0811A7C2: +@0811A7C2: bl overworld_free_bg_tilemaps ldr r0, =0x020375e0 ldrb r0, [r0] @@ -540523,7 +540523,7 @@ _0811A7C2: adds r1, r4, 0 adds r3, r5, 0 bl sub_811A20C -_0811A7D4: +@0811A7D4: pop {r4,r5} pop {r0} bx r0 @@ -540532,7 +540532,7 @@ _0811A7D4: thumb_func_end sub_811A4F0 thumb_func_start sub_811A7E4 -sub_811A7E4: @ 811A7E4 +sub_811A7E4: ; 811A7E4 push {lr} bl fade_and_return_progress_probably ldr r0, =0x030022c0 @@ -540541,24 +540541,24 @@ sub_811A7E4: @ 811A7E4 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _0811A804 + beq @0811A804 cmp r0, 0x1 - beq _0811A80E - b _0811A840 + beq @0811A80E + b @0811A840 .align 2, 0 .pool -_0811A804: +@0811A804: movs r0, 0x1 movs r1, 0 bl fade_screen - b _0811A840 -_0811A80E: + b @0811A840 +@0811A80E: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0811A84E + bne @0811A84E ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00003b58 @@ -540567,10 +540567,10 @@ _0811A80E: strh r1, [r0, 0x16] bl overworld_free_bg_tilemaps bl sub_811A8F0 - b _0811A84E + b @0811A84E .align 2, 0 .pool -_0811A840: +@0811A840: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -540578,7 +540578,7 @@ _0811A840: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_0811A84E: +@0811A84E: pop {r0} bx r0 .align 2, 0 @@ -540586,7 +540586,7 @@ _0811A84E: thumb_func_end sub_811A7E4 thumb_func_start sub_811A858 -sub_811A858: @ 811A858 +sub_811A858: ; 811A858 push {lr} ldr r0, =sub_811A7E4 + 1 bl set_callback2 @@ -540597,23 +540597,23 @@ 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 movs r0, 0 ldr r1, =0x08597530 -_0811A872: +@0811A872: ldrh r3, [r1] cmp r2, r3 - beq _0811A884 + beq @0811A884 adds r1, 0x8 adds r0, 0x1 cmp r0, 0x3 - bls _0811A872 + bls @0811A872 movs r0, 0x1 negs r0, r0 -_0811A884: +@0811A884: pop {r1} bx r1 .align 2, 0 @@ -540621,7 +540621,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 @@ -540636,7 +540636,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 @@ -540657,7 +540657,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] @@ -540674,7 +540674,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] @@ -540691,7 +540691,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] @@ -540708,7 +540708,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] @@ -540725,7 +540725,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} @@ -540739,12 +540739,12 @@ sub_811A95C: @ 811A95C bl malloc str r0, [r4] cmp r0, 0 - bne _0811A984 + bne @0811A984 movs r0, 0 - b _0811AA7E + b @0811AA7E .align 2, 0 .pool -_0811A984: +@0811A984: movs r7, 0 strb r5, [r0] ldr r0, [r4] @@ -540764,7 +540764,7 @@ _0811A984: lsls r0, 24 lsrs r6, r0, 24 cmp r5, 0x10 - bne _0811A9C6 + bne @0811A9C6 ldr r0, [r4] adds r0, 0x14 bl sub_811BDF0 @@ -540775,8 +540775,8 @@ _0811A984: movs r1, 0x7 strb r1, [r0, 0x4] lsls r0, r6, 1 - b _0811A9DE -_0811A9C6: + b @0811A9DE +@0811A9C6: ldr r0, [r4] strb r7, [r0, 0x4] ldr r3, [r4] @@ -540789,7 +540789,7 @@ _0811A9C6: ldr r0, [r0] str r0, [r3, 0x34] adds r0, r2, 0 -_0811A9DE: +@0811A9DE: ldr r3, =0x0203a118 ldr r2, [r3] ldr r1, =0x08597550 @@ -540814,32 +540814,32 @@ _0811A9DE: ldrb r0, [r1, 0x7] adds r4, r3, 0 cmp r0, 0x9 - bls _0811AA14 + bls @0811AA14 movs r0, 0x9 strb r0, [r1, 0x7] -_0811AA14: +@0811AA14: mov r0, r8 cmp r0, 0 - beq _0811AA34 + beq @0811AA34 ldr r0, [r4] adds r1, r0, 0 adds r1, 0x3C ldrb r2, [r0, 0x7] mov r0, r8 bl CpuSet - b _0811AA64 + b @0811AA64 .align 2, 0 .pool -_0811AA34: +@0811AA34: movs r3, 0 ldr r0, [r4] ldrb r0, [r0, 0x7] cmp r3, r0 - bge _0811AA5C + bge @0811AA5C adds r6, r4, 0 ldr r1, =0x0000ffff adds r5, r1, 0 -_0811AA44: +@0811AA44: ldr r2, [r6] lsls r0, r3, 1 adds r1, r2, 0 @@ -540851,13 +540851,13 @@ _0811AA44: adds r3, 0x1 ldrb r2, [r2, 0x7] cmp r3, r2 - blt _0811AA44 -_0811AA5C: + blt @0811AA44 +@0811AA5C: ldr r1, [r4] adds r0, r1, 0 adds r0, 0x3C str r0, [r1, 0x38] -_0811AA64: +@0811AA64: bl sub_811F3AC ldr r1, =0x0203a118 ldr r2, [r1] @@ -540870,7 +540870,7 @@ _0811AA64: adds r0, 0x1 strb r0, [r2, 0xD] movs r0, 0x1 -_0811AA7E: +@0811AA7E: pop {r3} mov r8, r3 pop {r4-r7} @@ -540881,16 +540881,16 @@ _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] cmp r0, 0 - beq _0811AAA2 + beq @0811AAA2 bl free movs r0, 0 str r0, [r4] -_0811AAA2: +@0811AAA2: pop {r4} pop {r0} bx r0 @@ -540899,109 +540899,109 @@ _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] ldrb r0, [r0, 0x4] cmp r0, 0xA - bhi _0811AB3E + bhi @0811AB3E lsls r0, 2 - ldr r1, =_0811AACC + ldr r1, =@0811AACC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0811AACC: - .4byte _0811AAF8 - .4byte _0811AAFE - .4byte _0811AB04 - .4byte _0811AB0A - .4byte _0811AB10 - .4byte _0811AB16 - .4byte _0811AB1C - .4byte _0811AB22 - .4byte _0811AB28 - .4byte _0811AB2E - .4byte _0811AB34 -_0811AAF8: +@0811AACC: + .4byte @0811AAF8 + .4byte @0811AAFE + .4byte @0811AB04 + .4byte @0811AB0A + .4byte @0811AB10 + .4byte @0811AB16 + .4byte @0811AB1C + .4byte @0811AB22 + .4byte @0811AB28 + .4byte @0811AB2E + .4byte @0811AB34 +@0811AAF8: bl sub_811AB68 - b _0811AB38 -_0811AAFE: + b @0811AB38 +@0811AAFE: bl sub_811ACDC - b _0811AB38 -_0811AB04: + b @0811AB38 +@0811AB04: bl sub_811AE44 - b _0811AB38 -_0811AB0A: + b @0811AB38 +@0811AB0A: bl sub_811AF00 - b _0811AB38 -_0811AB10: + b @0811AB38 +@0811AB10: bl sub_811AF8C - b _0811AB38 -_0811AB16: + b @0811AB38 +@0811AB16: bl sub_811B040 - b _0811AB38 -_0811AB1C: + b @0811AB38 +@0811AB1C: bl sub_811AFEC - b _0811AB38 -_0811AB22: + b @0811AB38 +@0811AB22: bl sub_811B08C - b _0811AB38 -_0811AB28: + b @0811AB38 +@0811AB28: bl sub_811B0BC - b _0811AB38 -_0811AB2E: + b @0811AB38 +@0811AB2E: bl sub_811B0E8 - b _0811AB38 -_0811AB34: + b @0811AB38 +@0811AB34: bl sub_811B0F8 -_0811AB38: +@0811AB38: lsls r0, 16 lsrs r0, 16 - b _0811AB40 -_0811AB3E: + b @0811AB40 +@0811AB3E: movs r0, 0 -_0811AB40: +@0811AB40: pop {r1} bx r1 thumb_func_end sub_811AAAC thumb_func_start sub_811AB44 -sub_811AB44: @ 811AB44 +sub_811AB44: ; 811AB44 push {lr} bl sub_811BA68 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - beq _0811AB5E + beq @0811AB5E cmp r0, 0x2 - blt _0811AB62 + blt @0811AB62 cmp r0, 0x8 - bgt _0811AB62 + bgt @0811AB62 cmp r0, 0x7 - blt _0811AB62 -_0811AB5E: + blt @0811AB62 +@0811AB5E: movs r0, 0x1 - b _0811AB64 -_0811AB62: + b @0811AB64 +@0811AB62: movs r0, 0 -_0811AB64: +@0811AB64: pop {r1} bx r1 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] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0811ABB8 + beq @0811ABB8 bl sub_811BF78 ldr r1, =0x0203a118 ldr r3, [r1] @@ -541015,44 +541015,44 @@ sub_811AB68: @ 811AB68 ldr r0, [r1] strb r2, [r0, 0xC] movs r0, 0x9 - b _0811ACCC + b @0811ACCC .align 2, 0 .pool -_0811AB9C: +@0811AB9C: movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _0811AC68 + bne @0811AC68 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0811AC58 + bne @0811AC58 movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _0811AC48 + bne @0811AC48 movs r0, 0 - b _0811ACCC -_0811ABB8: + b @0811ACCC +@0811ABB8: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _0811AC78 + bne @0811AC78 movs r0, 0x8 ands r0, r1 cmp r0, 0 - bne _0811AC7E + bne @0811AC7E movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0811AB9C + beq @0811AB9C ldr r2, =0x0203a118 ldr r1, [r2] ldrb r0, [r1, 0x6] subs r0, 0x1 -_0811ABD8: +@0811ABD8: strb r0, [r1, 0x6] -_0811ABDA: +@0811ABDA: adds r7, r2, 0 adds r4, r7, 0 ldr r2, [r4] @@ -541060,7 +541060,7 @@ _0811ABDA: ldrsb r0, [r2, r0] ldr r6, =0x08597550 cmp r0, 0 - bge _0811ABF8 + bge @0811ABF8 ldrb r0, [r2, 0x1] lsls r1, r0, 1 adds r1, r0 @@ -541068,7 +541068,7 @@ _0811ABDA: adds r1, r6 ldrb r0, [r1, 0x2] strb r0, [r2, 0x6] -_0811ABF8: +@0811ABF8: ldr r3, [r4] movs r2, 0x6 ldrsb r2, [r3, r2] @@ -541080,10 +541080,10 @@ _0811ABF8: adds r0, r5 ldrb r0, [r0, 0x2] cmp r2, r0 - ble _0811AC14 + ble @0811AC14 movs r0, 0 strb r0, [r3, 0x6] -_0811AC14: +@0811AC14: ldr r3, [r4] movs r2, 0x6 ldrsb r2, [r3, r2] @@ -541094,65 +541094,65 @@ _0811AC14: adds r1, r0, r5 ldrb r0, [r1, 0x2] cmp r2, r0 - bne _0811AC88 + bne @0811AC88 movs r0, 0x5 ldrsb r0, [r3, r0] cmp r0, 0x2 - ble _0811AC36 + ble @0811AC36 movs r0, 0x2 strb r0, [r3, 0x5] -_0811AC36: +@0811AC36: ldr r1, [r4] movs r0, 0x1 strb r0, [r1, 0x4] movs r0, 0x3 - b _0811ACCC + b @0811ACCC .align 2, 0 .pool -_0811AC48: +@0811AC48: ldr r2, =0x0203a118 ldr r1, [r2] ldrb r0, [r1, 0x5] adds r0, 0x1 strb r0, [r1, 0x5] - b _0811ABDA + b @0811ABDA .align 2, 0 .pool -_0811AC58: +@0811AC58: ldr r2, =0x0203a118 ldr r1, [r2] ldrb r0, [r1, 0x6] adds r0, 0x1 - b _0811ABD8 + b @0811ABD8 .align 2, 0 .pool -_0811AC68: +@0811AC68: ldr r2, =0x0203a118 ldr r1, [r2] ldrb r0, [r1, 0x5] subs r0, 0x1 strb r0, [r1, 0x5] - b _0811ABDA + b @0811ABDA .align 2, 0 .pool -_0811AC78: +@0811AC78: bl sub_811B150 - b _0811AC82 -_0811AC7E: + b @0811AC82 +@0811AC7E: bl sub_811B1B4 -_0811AC82: +@0811AC82: lsls r0, 16 lsrs r0, 16 - b _0811ACCC -_0811AC88: + b @0811ACCC +@0811AC88: movs r0, 0x5 ldrsb r0, [r3, r0] cmp r0, 0 - bge _0811AC96 + bge @0811AC96 ldrb r0, [r1, 0x1] subs r0, 0x1 strb r0, [r3, 0x5] -_0811AC96: +@0811AC96: ldr r3, [r4] movs r2, 0x5 ldrsb r2, [r3, r2] @@ -541163,25 +541163,25 @@ _0811AC96: adds r0, r6 ldrb r0, [r0, 0x1] cmp r2, r0 - blt _0811ACB0 + blt @0811ACB0 movs r0, 0 strb r0, [r3, 0x5] -_0811ACB0: +@0811ACB0: bl sub_811AB44 cmp r0, 0 - beq _0811ACCA + beq @0811ACCA ldr r2, [r7] ldr r0, [r2, 0x4] ldr r1, =0x00ffff00 ands r0, r1 ldr r1, =0x00040100 cmp r0, r1 - bne _0811ACCA + bne @0811ACCA movs r0, 0 strb r0, [r2, 0x5] -_0811ACCA: +@0811ACCA: movs r0, 0x2 -_0811ACCC: +@0811ACCC: pop {r4-r7} pop {r1} bx r1 @@ -541190,84 +541190,84 @@ _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] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0811AD4A + beq @0811AD4A ldr r0, =0x0203a118 ldr r0, [r0] ldrb r0, [r0, 0x5] lsls r0, 24 asrs r0, 24 cmp r0, 0x1 - beq _0811AD3E - b _0811AD24 + beq @0811AD3E + b @0811AD24 .align 2, 0 .pool -_0811AD04: +@0811AD04: movs r0, 0x20 ands r0, r2 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0 - bne _0811ADE0 + bne @0811ADE0 movs r0, 0x80 ands r0, r2 cmp r0, 0 - bne _0811ADD0 + bne @0811ADD0 movs r0, 0x10 ands r0, r2 cmp r0, 0 - bne _0811ADC0 + bne @0811ADC0 movs r0, 0 - b _0811AE32 -_0811AD24: + b @0811AE32 +@0811AD24: cmp r0, 0x1 - bgt _0811AD2E + bgt @0811AD2E cmp r0, 0 - beq _0811AD38 - b _0811AD4A -_0811AD2E: + beq @0811AD38 + b @0811AD4A +@0811AD2E: cmp r0, 0x2 - beq _0811ADF6 + beq @0811ADF6 cmp r0, 0x3 - beq _0811AD44 - b _0811AD4A -_0811AD38: + beq @0811AD44 + b @0811AD4A +@0811AD38: bl sub_811B184 - b _0811ADFA -_0811AD3E: + b @0811ADFA +@0811AD3E: bl sub_811B150 - b _0811ADFA -_0811AD44: + b @0811ADFA +@0811AD44: bl sub_811B264 - b _0811ADFA -_0811AD4A: + b @0811ADFA +@0811AD4A: ldrh r2, [r2, 0x2E] movs r0, 0x2 ands r0, r2 cmp r0, 0 - bne _0811ADF0 + bne @0811ADF0 movs r0, 0x8 ands r0, r2 cmp r0, 0 - bne _0811ADF6 + bne @0811ADF6 movs r0, 0x40 ands r0, r2 cmp r0, 0 - beq _0811AD04 + beq @0811AD04 ldr r2, =0x0203a118 ldr r1, [r2] ldrb r0, [r1, 0x6] subs r0, 0x1 strb r0, [r1, 0x6] -_0811AD6E: +@0811AD6E: adds r6, r2, 0 -_0811AD70: +@0811AD70: adds r5, r6, 0 ldr r4, [r5] movs r3, 0x6 @@ -541280,96 +541280,96 @@ _0811AD70: adds r1, r0, r2 ldrb r0, [r1, 0x2] cmp r3, r0 - bne _0811AE00 + bne @0811AE00 bl sub_811BA3C movs r2, 0x3 cmp r0, 0 - beq _0811AD96 + beq @0811AD96 movs r2, 0x4 -_0811AD96: +@0811AD96: ldr r1, [r5] movs r0, 0x5 ldrsb r0, [r1, r0] cmp r0, 0 - bge _0811ADA4 + bge @0811ADA4 subs r0, r2, 0x1 strb r0, [r1, 0x5] -_0811ADA4: +@0811ADA4: ldr r1, [r5] movs r0, 0x5 ldrsb r0, [r1, r0] cmp r0, r2 - blt _0811ADB2 + blt @0811ADB2 movs r0, 0 strb r0, [r1, 0x5] -_0811ADB2: +@0811ADB2: movs r0, 0x3 - b _0811AE32 + b @0811AE32 .align 2, 0 .pool -_0811ADC0: +@0811ADC0: ldr r2, =0x0203a118 ldr r1, [r2] ldrb r0, [r1, 0x5] adds r0, 0x1 strb r0, [r1, 0x5] - b _0811AD6E + b @0811AD6E .align 2, 0 .pool -_0811ADD0: +@0811ADD0: ldr r1, =0x0203a118 ldr r0, [r1] strb r3, [r0, 0x6] adds r6, r1, 0 - b _0811AD70 + b @0811AD70 .align 2, 0 .pool -_0811ADE0: +@0811ADE0: ldr r2, =0x0203a118 ldr r1, [r2] ldrb r0, [r1, 0x5] subs r0, 0x1 strb r0, [r1, 0x5] - b _0811AD6E + b @0811AD6E .align 2, 0 .pool -_0811ADF0: +@0811ADF0: bl sub_811B150 - b _0811ADFA -_0811ADF6: + b @0811ADFA +@0811ADF6: bl sub_811B1B4 -_0811ADFA: +@0811ADFA: lsls r0, 16 lsrs r0, 16 - b _0811AE32 -_0811AE00: + b @0811AE32 +@0811AE00: movs r0, 0x5 ldrsb r0, [r4, r0] ldrb r1, [r1, 0x1] cmp r0, r1 - blt _0811AE0E + blt @0811AE0E subs r0, r1, 0x1 strb r0, [r4, 0x5] -_0811AE0E: +@0811AE0E: bl sub_811AB44 cmp r0, 0 - beq _0811AE28 + beq @0811AE28 ldr r2, [r6] ldr r0, [r2, 0x4] ldr r1, =0x00ffff00 ands r0, r1 ldr r1, =0x00040100 cmp r0, r1 - bne _0811AE28 + bne @0811AE28 movs r0, 0 strb r0, [r2, 0x5] -_0811AE28: +@0811AE28: ldr r0, =0x0203a118 ldr r1, [r0] movs r0, 0 strb r0, [r1, 0x4] movs r0, 0x2 -_0811AE32: +@0811AE32: pop {r4-r6} pop {r1} bx r1 @@ -541378,7 +541378,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] @@ -541386,16 +541386,16 @@ sub_811AE44: @ 811AE44 ands r0, r2 adds r3, r1, 0 cmp r0, 0 - beq _0811AE60 + beq @0811AE60 bl sub_811B32C - b _0811AEF6 + b @0811AEF6 .align 2, 0 .pool -_0811AE60: +@0811AE60: movs r0, 0x1 ands r0, r2 cmp r0, 0 - beq _0811AEAE + beq @0811AEAE ldr r0, =0x0203a118 ldr r2, [r0] movs r1, 0xA @@ -541403,190 +541403,190 @@ _0811AE60: movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _0811AE84 + beq @0811AE84 bl sub_811B2B0 - b _0811AEF6 + b @0811AEF6 .align 2, 0 .pool -_0811AE84: +@0811AE84: movs r0, 0xB ldrsb r0, [r2, r0] cmp r0, 0x1 - beq _0811AEA2 + beq @0811AEA2 cmp r0, 0x1 - bgt _0811AE96 + bgt @0811AE96 cmp r0, 0 - beq _0811AE9C - b _0811AEAE -_0811AE96: + beq @0811AE9C + b @0811AEAE +@0811AE96: cmp r0, 0x2 - beq _0811AEA8 - b _0811AEAE -_0811AE9C: + beq @0811AEA8 + b @0811AEAE +@0811AE9C: bl sub_811B33C - b _0811AEF6 -_0811AEA2: + b @0811AEF6 +@0811AEA2: bl sub_811B368 - b _0811AEF6 -_0811AEA8: + b @0811AEF6 +@0811AEA8: bl sub_811B32C - b _0811AEF6 -_0811AEAE: + b @0811AEF6 +@0811AEAE: ldrh r1, [r3, 0x2E] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0811AEBE + beq @0811AEBE bl sub_811B33C - b _0811AEF6 -_0811AEBE: + b @0811AEF6 +@0811AEBE: ldrh r1, [r3, 0x30] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0811AECC + beq @0811AECC movs r0, 0x2 - b _0811AEF2 -_0811AECC: + b @0811AEF2 +@0811AECC: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0811AED8 + beq @0811AED8 movs r0, 0x3 - b _0811AEF2 -_0811AED8: + b @0811AEF2 +@0811AED8: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0811AEE4 + beq @0811AEE4 movs r0, 0x1 - b _0811AEF2 -_0811AEE4: + b @0811AEF2 +@0811AEE4: movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _0811AEF0 + bne @0811AEF0 movs r0, 0 - b _0811AEFA -_0811AEF0: + b @0811AEFA +@0811AEF0: movs r0, 0 -_0811AEF2: +@0811AEF2: bl sub_811B528 -_0811AEF6: +@0811AEF6: lsls r0, 16 lsrs r0, 16 -_0811AEFA: +@0811AEFA: pop {r1} bx r1 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] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0811AF24 + beq @0811AF24 ldr r0, =0x0203a118 ldr r1, [r0] movs r0, 0x2 strb r0, [r1, 0x4] movs r0, 0xE - b _0811AF86 + b @0811AF86 .align 2, 0 .pool -_0811AF24: +@0811AF24: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0811AF32 + beq @0811AF32 bl sub_811B394 - b _0811AF82 -_0811AF32: + b @0811AF82 +@0811AF32: movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _0811AF3E + beq @0811AF3E movs r0, 0x4 - b _0811AF7E -_0811AF3E: + b @0811AF7E +@0811AF3E: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0811AF4A + beq @0811AF4A movs r0, 0x5 - b _0811AF7E -_0811AF4A: + b @0811AF7E +@0811AF4A: ldrh r1, [r2, 0x30] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0811AF58 + beq @0811AF58 movs r0, 0x2 - b _0811AF7E -_0811AF58: + b @0811AF7E +@0811AF58: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0811AF64 + beq @0811AF64 movs r0, 0x3 - b _0811AF7E -_0811AF64: + b @0811AF7E +@0811AF64: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0811AF70 + beq @0811AF70 movs r0, 0x1 - b _0811AF7E -_0811AF70: + b @0811AF7E +@0811AF70: movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _0811AF7C + bne @0811AF7C movs r0, 0 - b _0811AF86 -_0811AF7C: + b @0811AF86 +@0811AF7C: movs r0, 0 -_0811AF7E: +@0811AF7E: bl sub_811B794 -_0811AF82: +@0811AF82: lsls r0, 16 lsrs r0, 16 -_0811AF86: +@0811AF86: pop {r1} bx r1 thumb_func_end sub_811AF00 thumb_func_start sub_811AF8C -sub_811AF8C: @ 811AF8C +sub_811AF8C: ; 811AF8C push {lr} bl sub_8198C58 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _0811AFC0 + beq @0811AFC0 cmp r1, 0 - bgt _0811AFA8 + bgt @0811AFA8 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _0811AFAC - b _0811AFE4 -_0811AFA8: + beq @0811AFAC + b @0811AFE4 +@0811AFA8: cmp r1, 0x1 - bne _0811AFE4 -_0811AFAC: + bne @0811AFE4 +@0811AFAC: bl sub_811B2A4 ldr r1, =0x0203a118 ldr r1, [r1] strb r0, [r1, 0x4] movs r0, 0x7 - b _0811AFE6 + b @0811AFE6 .align 2, 0 .pool -_0811AFC0: +@0811AFC0: ldr r0, =0x020375f0 strh r1, [r0] ldr r0, =0x0203a118 @@ -541596,158 +541596,158 @@ _0811AFC0: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _0811AFD8 + bhi @0811AFD8 bl sub_811B3E4 -_0811AFD8: +@0811AFD8: movs r0, 0x18 - b _0811AFE6 + b @0811AFE6 .align 2, 0 .pool -_0811AFE4: +@0811AFE4: movs r0, 0 -_0811AFE6: +@0811AFE6: pop {r1} bx r1 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 asrs r1, r0, 24 cmp r1, 0 - beq _0811B020 + beq @0811B020 cmp r1, 0 - bgt _0811B008 + bgt @0811B008 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _0811B00C - b _0811B038 -_0811B008: + beq @0811B00C + b @0811B038 +@0811B008: cmp r1, 0x1 - bne _0811B038 -_0811B00C: + bne @0811B038 +@0811B00C: bl sub_811B2A4 ldr r1, =0x0203a118 ldr r1, [r1] strb r0, [r1, 0x4] movs r0, 0x7 - b _0811B03A + b @0811B03A .align 2, 0 .pool -_0811B020: +@0811B020: bl sub_811BE9C ldr r4, =0x020375f0 bl sub_811B4EC strh r0, [r4] bl sub_811B3E4 movs r0, 0x18 - b _0811B03A + b @0811B03A .align 2, 0 .pool -_0811B038: +@0811B038: movs r0, 0 -_0811B03A: +@0811B03A: pop {r4} pop {r1} bx r1 thumb_func_end sub_811AFEC thumb_func_start sub_811B040 -sub_811B040: @ 811B040 +sub_811B040: ; 811B040 push {lr} bl sub_8198C58 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _0811B070 + beq @0811B070 cmp r1, 0 - bgt _0811B05C + bgt @0811B05C movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _0811B060 - b _0811B084 -_0811B05C: + beq @0811B060 + b @0811B084 +@0811B05C: cmp r1, 0x1 - bne _0811B084 -_0811B060: + bne @0811B084 +@0811B060: ldr r0, =0x0203a118 ldr r1, [r0] movs r0, 0x1 strb r0, [r1, 0x4] movs r0, 0x7 - b _0811B086 + b @0811B086 .align 2, 0 .pool -_0811B070: +@0811B070: bl sub_811B418 ldr r0, =0x0203a118 ldr r1, [r0] movs r0, 0x1 strb r0, [r1, 0x4] movs r0, 0x8 - b _0811B086 + b @0811B086 .align 2, 0 .pool -_0811B084: +@0811B084: movs r0, 0 -_0811B086: +@0811B086: pop {r1} bx r1 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] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0811B0A4 + beq @0811B0A4 movs r0, 0x1A - b _0811B0B8 + b @0811B0B8 .align 2, 0 .pool -_0811B0A4: +@0811B0A4: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _0811B0B0 + bne @0811B0B0 movs r0, 0 - b _0811B0B8 -_0811B0B0: + b @0811B0B8 +@0811B0B0: bl sub_811B150 lsls r0, 16 lsrs r0, 16 -_0811B0B8: +@0811B0B8: pop {r1} bx r1 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] movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne _0811B0D4 + bne @0811B0D4 movs r0, 0 - b _0811B0E0 + b @0811B0E0 .align 2, 0 .pool -_0811B0D4: +@0811B0D4: bl sub_811B2A4 ldr r1, =0x0203a118 ldr r1, [r1] strb r0, [r1, 0x4] movs r0, 0x7 -_0811B0E0: +@0811B0E0: pop {r1} bx r1 .align 2, 0 @@ -541755,7 +541755,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 @@ -541767,24 +541767,24 @@ 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 asrs r1, r0, 24 cmp r1, 0 - beq _0811B134 + beq @0811B134 cmp r1, 0 - bgt _0811B114 + bgt @0811B114 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _0811B118 - b _0811B148 -_0811B114: + beq @0811B118 + b @0811B148 +@0811B114: cmp r1, 0x1 - bne _0811B148 -_0811B118: + bne @0811B148 +@0811B118: bl sub_811B454 ldr r2, =0x0203a118 ldr r1, [r2] @@ -541794,60 +541794,60 @@ _0811B118: movs r0, 0x8 strb r0, [r1, 0x4] movs r0, 0x1F - b _0811B14A + b @0811B14A .align 2, 0 .pool -_0811B134: +@0811B134: ldr r4, =0x020375f0 bl sub_811B4EC strh r0, [r4] bl sub_811B3E4 movs r0, 0x18 - b _0811B14A + b @0811B14A .align 2, 0 .pool -_0811B148: +@0811B148: movs r0, 0 -_0811B14A: +@0811B14A: pop {r4} pop {r1} bx r1 thumb_func_end sub_811B0F8 thumb_func_start sub_811B150 -sub_811B150: @ 811B150 +sub_811B150: ; 811B150 push {lr} ldr r1, =0x0203a118 ldr r2, [r1] ldrb r0, [r2] cmp r0, 0x13 - beq _0811B160 + beq @0811B160 cmp r0, 0xB - bne _0811B174 -_0811B160: + bne @0811B174 +@0811B160: ldrb r0, [r2, 0x4] strb r0, [r2, 0x8] ldr r1, [r1] movs r0, 0x8 strb r0, [r1, 0x4] movs r0, 0x22 - b _0811B180 + b @0811B180 .align 2, 0 .pool -_0811B174: +@0811B174: ldrb r0, [r2, 0x4] strb r0, [r2, 0x8] ldr r1, [r1] movs r0, 0x4 strb r0, [r1, 0x4] movs r0, 0x5 -_0811B180: +@0811B180: pop {r1} bx r1 thumb_func_end sub_811B150 thumb_func_start sub_811B184 -sub_811B184: @ 811B184 +sub_811B184: ; 811B184 push {lr} ldr r2, =0x0203a118 ldr r0, [r2] @@ -541856,27 +541856,27 @@ sub_811B184: @ 811B184 ldr r1, [r2] ldrb r0, [r1] cmp r0, 0x6 - bne _0811B1A8 + bne @0811B1A8 ldrb r0, [r1, 0x4] strb r0, [r1, 0x8] ldr r1, [r2] movs r0, 0x8 strb r0, [r1, 0x4] movs r0, 0x20 - b _0811B1AE + b @0811B1AE .align 2, 0 .pool -_0811B1A8: +@0811B1A8: movs r0, 0x5 strb r0, [r1, 0x4] movs r0, 0x4 -_0811B1AE: +@0811B1AE: pop {r1} bx r1 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] @@ -541885,94 +541885,94 @@ sub_811B1B4: @ 811B1B4 ldr r1, [r4] ldrb r0, [r1] cmp r0, 0x11 - bne _0811B1DC + bne @0811B1DC bl sub_811BD64 cmp r0, 0 - bne _0811B1FA + bne @0811B1FA bl sub_811BDB0 cmp r0, 0 - bne _0811B1E8 - b _0811B256 + bne @0811B1E8 + b @0811B256 .align 2, 0 .pool -_0811B1DC: +@0811B1DC: cmp r0, 0x12 - bne _0811B204 + bne @0811B204 bl sub_811BDB0 cmp r0, 0 - beq _0811B1F2 -_0811B1E8: + beq @0811B1F2 +@0811B1E8: ldr r1, [r4] movs r0, 0x8 strb r0, [r1, 0x4] movs r0, 0x1E - b _0811B25C -_0811B1F2: + b @0811B25C +@0811B1F2: bl sub_811BD64 cmp r0, 0 - beq _0811B256 -_0811B1FA: + beq @0811B256 +@0811B1FA: ldr r1, [r4] movs r0, 0x8 strb r0, [r1, 0x4] movs r0, 0x1D - b _0811B25C -_0811B204: + b @0811B25C +@0811B204: cmp r0, 0x9 - beq _0811B20C + beq @0811B20C cmp r0, 0xD - bne _0811B21E -_0811B20C: + bne @0811B21E +@0811B20C: bl sub_811BD2C cmp r0, 0 - bne _0811B256 + bne @0811B256 ldr r1, [r4] movs r0, 0x8 strb r0, [r1, 0x4] movs r0, 0x21 - b _0811B25C -_0811B21E: + b @0811B25C +@0811B21E: cmp r0, 0x13 - beq _0811B226 + beq @0811B226 cmp r0, 0xB - bne _0811B238 -_0811B226: + bne @0811B238 +@0811B226: bl sub_811BCF4 cmp r0, 0 - beq _0811B256 + beq @0811B256 ldr r1, [r4] movs r0, 0x8 strb r0, [r1, 0x4] movs r0, 0x22 - b _0811B25C -_0811B238: + b @0811B25C +@0811B238: cmp r0, 0x14 - beq _0811B258 + beq @0811B258 bl sub_811BCF4 cmp r0, 0x1 - beq _0811B24C + beq @0811B24C bl sub_811B4EC cmp r0, 0 - bne _0811B256 -_0811B24C: + bne @0811B256 +@0811B24C: ldr r1, [r4] movs r0, 0x4 strb r0, [r1, 0x4] movs r0, 0x5 - b _0811B25C -_0811B256: + b @0811B25C +@0811B256: ldr r1, [r4] -_0811B258: +@0811B258: movs r0, 0x6 strb r0, [r1, 0x4] -_0811B25C: +@0811B25C: pop {r4} pop {r1} bx r1 thumb_func_end sub_811B1B4 thumb_func_start sub_811B264 -sub_811B264: @ 811B264 +sub_811B264: ; 811B264 push {lr} ldr r2, =0x0203a118 ldr r1, [r2] @@ -541981,38 +541981,38 @@ sub_811B264: @ 811B264 ldr r0, [r2] ldrb r0, [r0] cmp r0, 0x11 - beq _0811B28E + beq @0811B28E cmp r0, 0x11 - bgt _0811B284 + bgt @0811B284 cmp r0, 0xF - beq _0811B28A - b _0811B29E + beq @0811B28A + b @0811B29E .align 2, 0 .pool -_0811B284: +@0811B284: cmp r0, 0x12 - beq _0811B296 - b _0811B29E -_0811B28A: + beq @0811B296 + b @0811B29E +@0811B28A: movs r0, 0x19 - b _0811B2A0 -_0811B28E: + b @0811B2A0 +@0811B28E: bl sub_811B3E4 movs r0, 0x1C - b _0811B2A0 -_0811B296: + b @0811B2A0 +@0811B296: bl sub_811B3E4 movs r0, 0x1B - b _0811B2A0 -_0811B29E: + b @0811B2A0 +@0811B29E: movs r0, 0 -_0811B2A0: +@0811B2A0: pop {r1} bx r1 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] @@ -542022,13 +542022,13 @@ 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] ldrb r0, [r0, 0x9] cmp r0, 0 - bne _0811B2DC + bne @0811B2DC bl sub_811B8E8 lsls r0, 24 lsrs r0, 24 @@ -542038,22 +542038,22 @@ sub_811B2B0: @ 811B2B0 lsrs r1, 24 movs r0, 0 bl sub_811F548 - b _0811B2EC + b @0811B2EC .align 2, 0 .pool -_0811B2DC: +@0811B2DC: bl sub_811B908 adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 movs r0, 0x1 bl sub_811F548 -_0811B2EC: +@0811B2EC: bl sub_811F5B0 lsls r0, 16 lsrs r0, 16 cmp r0, 0 - beq _0811B324 + beq @0811B324 ldr r2, =0x0203a118 ldr r3, [r2] subs r0, 0x1 @@ -542072,18 +542072,18 @@ _0811B2EC: movs r0, 0x3 strb r0, [r1, 0x4] movs r0, 0xB - b _0811B326 + b @0811B326 .align 2, 0 .pool -_0811B324: +@0811B324: movs r0, 0 -_0811B326: +@0811B326: pop {r1} bx r1 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 @@ -542095,7 +542095,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] @@ -542108,45 +542108,45 @@ sub_811B33C: @ 811B33C ldr r1, [r1] ldrb r0, [r1, 0x9] cmp r0, 0 - bne _0811B360 + bne @0811B360 movs r0, 0x1 strb r0, [r1, 0x9] - b _0811B362 + b @0811B362 .align 2, 0 .pool -_0811B360: +@0811B360: strb r2, [r1, 0x9] -_0811B362: +@0811B362: movs r0, 0x17 pop {r1} bx r1 thumb_func_end sub_811B33C thumb_func_start sub_811B368 -sub_811B368: @ 811B368 +sub_811B368: ; 811B368 push {lr} ldr r0, =0x0203a118 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x6 - beq _0811B388 + beq @0811B388 ldr r0, =0x0000ffff bl sub_811B488 movs r0, 0x1 - b _0811B390 + b @0811B390 .align 2, 0 .pool -_0811B388: +@0811B388: movs r0, 0x20 bl audio_play movs r0, 0 -_0811B390: +@0811B390: pop {r1} bx r1 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 @@ -542158,45 +542158,45 @@ sub_811B394: @ 811B394 bl sub_811BF88 adds r5, r0, 0 cmp r5, 0 - beq _0811B3BC + beq @0811B3BC movs r0, 0x20 bl audio_play movs r0, 0 - b _0811B3DC -_0811B3BC: + b @0811B3DC +@0811B3BC: adds r0, r4, 0 bl sub_811B488 ldr r0, =0x0203a118 ldr r1, [r0] ldrb r0, [r1] cmp r0, 0x6 - bne _0811B3D8 + bne @0811B3D8 movs r0, 0x9 strb r0, [r1, 0x4] movs r0, 0xD - b _0811B3DC + b @0811B3DC .align 2, 0 .pool -_0811B3D8: +@0811B3D8: strb r5, [r1, 0x4] movs r0, 0xC -_0811B3DC: +@0811B3DC: pop {r4,r5} pop {r1} bx r1 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 ldr r0, [r3] ldrb r0, [r0, 0x7] cmp r4, r0 - bge _0811B40E + bge @0811B40E adds r5, r3, 0 -_0811B3F4: +@0811B3F4: ldr r3, [r5] ldr r1, [r3, 0x38] lsls r2, r4, 1 @@ -542209,8 +542209,8 @@ _0811B3F4: adds r4, 0x1 ldrb r3, [r3, 0x7] cmp r4, r3 - blt _0811B3F4 -_0811B40E: + blt @0811B3F4 +@0811B40E: pop {r4,r5} pop {r0} bx r0 @@ -542219,18 +542219,18 @@ _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 ldr r0, [r2] ldrb r0, [r0, 0x7] cmp r3, r0 - bge _0811B444 + bge @0811B444 adds r5, r2, 0 ldr r0, =0x0000ffff adds r4, r0, 0 -_0811B42C: +@0811B42C: ldr r2, [r5] lsls r0, r3, 1 adds r1, r2, 0 @@ -542242,8 +542242,8 @@ _0811B42C: adds r3, 0x1 ldrb r2, [r2, 0x7] cmp r3, r2 - blt _0811B42C -_0811B444: + blt @0811B42C +@0811B444: pop {r4,r5} pop {r0} bx r0 @@ -542252,16 +542252,16 @@ _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 ldr r0, [r3] ldrb r0, [r0, 0x7] cmp r4, r0 - bge _0811B47E + bge @0811B47E adds r5, r3, 0 -_0811B464: +@0811B464: ldr r3, [r5] lsls r1, r4, 1 adds r2, r3, 0 @@ -542274,8 +542274,8 @@ _0811B464: adds r4, 0x1 ldrb r3, [r3, 0x7] cmp r4, r3 - blt _0811B464 -_0811B47E: + blt @0811B464 +@0811B47E: pop {r4,r5} pop {r0} bx r0 @@ -542284,7 +542284,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 @@ -542305,46 +542305,46 @@ 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 ldr r0, [r0] ldrb r1, [r0, 0x7] cmp r2, r1 - bcs _0811B4E2 + bcs @0811B4E2 adds r5, r1, 0 adds r4, r0, 0 adds r4, 0x3C ldr r3, [r0, 0x38] -_0811B4C2: +@0811B4C2: lsls r0, r2, 1 adds r1, r4, r0 adds r0, r3 ldrh r1, [r1] ldrh r0, [r0] cmp r1, r0 - beq _0811B4D8 + beq @0811B4D8 movs r0, 0x1 - b _0811B4E4 + b @0811B4E4 .align 2, 0 .pool -_0811B4D8: +@0811B4D8: adds r0, r2, 0x1 lsls r0, 16 lsrs r2, r0, 16 cmp r2, r5 - bcc _0811B4C2 -_0811B4E2: + bcc @0811B4C2 +@0811B4E2: movs r0, 0 -_0811B4E4: +@0811B4E4: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_811B4AC thumb_func_start sub_811B4EC -sub_811B4EC: @ 811B4EC +sub_811B4EC: ; 811B4EC push {lr} ldr r0, =0x0203a118 ldr r0, [r0] @@ -542353,32 +542353,32 @@ sub_811B4EC: @ 811B4EC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _0811B51C + bhi @0811B51C bl sub_811BD64 cmp r0, 0 - bne _0811B50E + bne @0811B50E bl sub_811BDB0 cmp r0, 0 - beq _0811B518 -_0811B50E: + beq @0811B518 +@0811B50E: movs r0, 0 - b _0811B524 + b @0811B524 .align 2, 0 .pool -_0811B518: +@0811B518: movs r0, 0x1 - b _0811B524 -_0811B51C: + b @0811B524 +@0811B51C: bl sub_811B4AC lsls r0, 24 lsrs r0, 24 -_0811B524: +@0811B524: pop {r1} bx r1 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 @@ -542388,23 +542388,23 @@ sub_811B528: @ 811B528 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _0811B558 + beq @0811B558 ldrb r0, [r3, 0x9] cmp r0, 0 - bne _0811B550 + bne @0811B550 adds r0, r2, 0 bl sub_811B568 - b _0811B55E + b @0811B55E .align 2, 0 .pool -_0811B550: +@0811B550: adds r0, r2, 0 bl sub_811B634 - b _0811B55E -_0811B558: + b @0811B55E +@0811B558: adds r0, r2, 0 bl sub_811B6C4 -_0811B55E: +@0811B55E: lsls r0, 16 lsrs r0, 16 pop {r1} @@ -542412,41 +542412,41 @@ _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 + beq @0811B5DE cmp r0, 0x1 - bcc _0811B5FE + bcc @0811B5FE cmp r0, 0x2 - beq _0811B57C + beq @0811B57C cmp r0, 0x3 - beq _0811B5A4 - b _0811B62A -_0811B57C: + beq @0811B5A4 + b @0811B62A +@0811B57C: ldr r0, =0x0203a118 ldr r1, [r0] movs r0, 0xB ldrsb r0, [r1, r0] ldrb r3, [r1, 0xC] cmn r0, r3 - beq _0811B62A + beq @0811B62A ldrb r2, [r1, 0xB] cmp r0, 0 - beq _0811B59C + beq @0811B59C subs r0, r2, 0x1 strb r0, [r1, 0xB] -_0811B594: +@0811B594: movs r0, 0xF - b _0811B62C + b @0811B62C .align 2, 0 .pool -_0811B59C: +@0811B59C: subs r0, r3, 0x1 strb r0, [r1, 0xC] movs r0, 0x11 - b _0811B62C -_0811B5A4: + b @0811B62C +@0811B5A4: ldr r0, =0x0203a118 ldr r2, [r0] movs r1, 0xB @@ -542456,118 +542456,118 @@ _0811B5A4: ldrb r0, [r2, 0xD] subs r0, 0x1 cmp r1, r0 - bge _0811B62A + bge @0811B62A ldrb r1, [r2, 0xB] movs r0, 0xB ldrsb r0, [r2, r0] cmp r0, 0x2 - bgt _0811B5D0 + bgt @0811B5D0 adds r0, r1, 0x1 strb r0, [r2, 0xB] movs r4, 0xF - b _0811B5D6 + b @0811B5D6 .align 2, 0 .pool -_0811B5D0: +@0811B5D0: adds r0, r3, 0x1 strb r0, [r2, 0xC] movs r4, 0x10 -_0811B5D6: +@0811B5D6: bl sub_811B978 adds r0, r4, 0 - b _0811B62C -_0811B5DE: + b @0811B62C +@0811B5DE: ldr r0, =0x0203a118 ldr r1, [r0] ldrb r2, [r1, 0xA] movs r0, 0xA ldrsb r0, [r1, r0] cmp r0, 0 - beq _0811B5F8 + beq @0811B5F8 subs r0, r2, 0x1 strb r0, [r1, 0xA] - b _0811B594 + b @0811B594 .align 2, 0 .pool -_0811B5F8: +@0811B5F8: bl sub_811B744 - b _0811B594 -_0811B5FE: + b @0811B594 +@0811B5FE: ldr r0, =0x0203a118 ldr r1, [r0] ldrb r2, [r1, 0xA] movs r0, 0xA ldrsb r0, [r1, r0] cmp r0, 0 - bgt _0811B624 + bgt @0811B624 adds r0, r2, 0x1 strb r0, [r1, 0xA] bl sub_811B9C8 lsls r0, 24 cmp r0, 0 - beq _0811B594 + beq @0811B594 bl sub_811B744 - b _0811B594 + b @0811B594 .align 2, 0 .pool -_0811B624: +@0811B624: bl sub_811B744 - b _0811B594 -_0811B62A: + b @0811B594 +@0811B62A: movs r0, 0 -_0811B62C: +@0811B62C: pop {r4} pop {r1} bx r1 thumb_func_end sub_811B568 thumb_func_start sub_811B634 -sub_811B634: @ 811B634 +sub_811B634: ; 811B634 push {lr} cmp r0, 0x1 - beq _0811B6A0 + beq @0811B6A0 cmp r0, 0x1 - bcc _0811B684 + bcc @0811B684 cmp r0, 0x2 - beq _0811B64A + beq @0811B64A cmp r0, 0x3 - beq _0811B66A + beq @0811B66A movs r0, 0 - b _0811B6BC -_0811B64A: + b @0811B6BC +@0811B64A: ldr r0, =0x0203a118 ldr r1, [r0] ldrb r2, [r1, 0xB] movs r0, 0xB ldrsb r0, [r1, r0] cmp r0, 0 - ble _0811B660 + ble @0811B660 subs r0, r2, 0x1 - b _0811B662 + b @0811B662 .align 2, 0 .pool -_0811B660: +@0811B660: movs r0, 0x3 -_0811B662: +@0811B662: strb r0, [r1, 0xB] bl sub_811B978 - b _0811B6BA -_0811B66A: + b @0811B6BA +@0811B66A: ldr r0, =0x0203a118 ldr r1, [r0] ldrb r2, [r1, 0xB] movs r0, 0xB ldrsb r0, [r1, r0] cmp r0, 0x2 - bgt _0811B680 + bgt @0811B680 adds r0, r2, 0x1 - b _0811B662 + b @0811B662 .align 2, 0 .pool -_0811B680: +@0811B680: movs r0, 0 - b _0811B662 -_0811B684: + b @0811B662 +@0811B684: ldr r0, =0x0203a118 ldr r1, [r0] ldrb r0, [r1, 0xA] @@ -542576,11 +542576,11 @@ _0811B684: bl sub_811B9C8 lsls r0, 24 cmp r0, 0 - beq _0811B6BA - b _0811B6B6 + beq @0811B6BA + b @0811B6B6 .align 2, 0 .pool -_0811B6A0: +@0811B6A0: ldr r2, =0x0203a118 ldr r1, [r2] ldrb r0, [r1, 0xA] @@ -542591,12 +542591,12 @@ _0811B6A0: lsls r0, 24 asrs r0, 24 cmp r0, 0 - bge _0811B6BA -_0811B6B6: + bge @0811B6BA +@0811B6B6: bl sub_811B744 -_0811B6BA: +@0811B6BA: movs r0, 0xF -_0811B6BC: +@0811B6BC: pop {r1} bx r1 .align 2, 0 @@ -542604,60 +542604,60 @@ _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 - beq _0811B714 + beq @0811B714 cmp r2, 0x1 - bcc _0811B728 + bcc @0811B728 cmp r2, 0x2 - beq _0811B6DC + beq @0811B6DC cmp r2, 0x3 - beq _0811B6F8 + beq @0811B6F8 movs r0, 0 - b _0811B73A -_0811B6DC: + b @0811B73A +@0811B6DC: ldr r0, =0x0203a118 ldr r1, [r0] ldrb r3, [r1, 0xB] movs r0, 0xB ldrsb r0, [r1, r0] cmp r0, 0 - beq _0811B6F4 + beq @0811B6F4 subs r0, r3, 0x1 - b _0811B736 + b @0811B736 .align 2, 0 .pool -_0811B6F4: +@0811B6F4: strb r2, [r1, 0xB] - b _0811B738 -_0811B6F8: + b @0811B738 +@0811B6F8: ldr r0, =0x0203a118 ldr r1, [r0] ldrb r2, [r1, 0xB] movs r0, 0xB ldrsb r0, [r1, r0] cmp r0, 0x1 - bgt _0811B710 + bgt @0811B710 adds r0, r2, 0x1 - b _0811B736 + b @0811B736 .align 2, 0 .pool -_0811B710: +@0811B710: movs r0, 0 - b _0811B736 -_0811B714: + b @0811B736 +@0811B714: ldr r0, =0x0203a118 ldr r1, [r0] ldrb r0, [r1, 0xB] adds r0, 0x1 strb r0, [r1, 0xB] bl sub_811B768 - b _0811B738 + b @0811B738 .align 2, 0 .pool -_0811B728: +@0811B728: ldr r2, =0x0203a118 ldr r1, [r2] movs r0, 0 @@ -542665,11 +542665,11 @@ _0811B728: ldr r1, [r2] ldrb r0, [r1, 0xB] adds r0, 0x1 -_0811B736: +@0811B736: strb r0, [r1, 0xB] -_0811B738: +@0811B738: movs r0, 0xF -_0811B73A: +@0811B73A: pop {r1} bx r1 .align 2, 0 @@ -542677,7 +542677,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] @@ -542688,10 +542688,10 @@ sub_811B744: @ 811B744 movs r0, 0xB ldrsb r0, [r2, r0] cmp r0, 0 - beq _0811B75E + beq @0811B75E subs r0, r1, 0x1 strb r0, [r2, 0xB] -_0811B75E: +@0811B75E: pop {r0} bx r0 .align 2, 0 @@ -542699,53 +542699,53 @@ _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] ldrb r0, [r1, 0x9] cmp r0, 0 - bne _0811B784 + bne @0811B784 movs r0, 0x1 strb r0, [r1, 0xA] bl sub_811B978 - b _0811B78E + b @0811B78E .align 2, 0 .pool -_0811B784: +@0811B784: ldrb r0, [r1, 0xB] bl sub_811B960 ldr r1, [r4] strb r0, [r1, 0xA] -_0811B78E: +@0811B78E: pop {r4} pop {r0} bx r0 thumb_func_end sub_811B768 thumb_func_start sub_811B794 -sub_811B794: @ 811B794 +sub_811B794: ; 811B794 push {r4,lr} cmp r0, 0x5 - bls _0811B79C - b _0811B8C0 -_0811B79C: + bls @0811B79C + b @0811B8C0 +@0811B79C: lsls r0, 2 - ldr r1, =_0811B7AC + ldr r1, =@0811B7AC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0811B7AC: - .4byte _0811B848 - .4byte _0811B826 - .4byte _0811B7C4 - .4byte _0811B7F0 - .4byte _0811B870 - .4byte _0811B890 -_0811B7C4: +@0811B7AC: + .4byte @0811B848 + .4byte @0811B826 + .4byte @0811B7C4 + .4byte @0811B7F0 + .4byte @0811B870 + .4byte @0811B890 +@0811B7C4: ldr r0, =0x0203a118 ldr r1, [r0] movs r0, 0x11 @@ -542753,24 +542753,24 @@ _0811B7C4: ldrb r3, [r1, 0xE] adds r0, r3 cmp r0, 0 - bgt _0811B7D6 - b _0811B8C0 -_0811B7D6: + bgt @0811B7D6 + b @0811B8C0 +@0811B7D6: ldrb r2, [r1, 0x11] movs r0, 0x11 ldrsb r0, [r1, r0] cmp r0, 0 - ble _0811B7E8 + ble @0811B7E8 subs r0, r2, 0x1 - b _0811B80E + b @0811B80E .align 2, 0 .pool -_0811B7E8: +@0811B7E8: subs r0, r3, 0x1 strb r0, [r1, 0xE] movs r4, 0x13 - b _0811B81E -_0811B7F0: + b @0811B81E +@0811B7F0: ldr r0, =0x0203a118 ldr r1, [r0] movs r0, 0x11 @@ -542779,95 +542779,95 @@ _0811B7F0: adds r0, r3 ldrb r2, [r1, 0xF] cmp r0, r2 - bge _0811B8C0 + bge @0811B8C0 ldrb r2, [r1, 0x11] movs r0, 0x11 ldrsb r0, [r1, r0] cmp r0, 0x2 - bgt _0811B818 + bgt @0811B818 adds r0, r2, 0x1 -_0811B80E: +@0811B80E: strb r0, [r1, 0x11] movs r4, 0x12 - b _0811B81E + b @0811B81E .align 2, 0 .pool -_0811B818: +@0811B818: adds r0, r3, 0x1 strb r0, [r1, 0xE] movs r4, 0x14 -_0811B81E: +@0811B81E: bl sub_811B9A0 adds r0, r4, 0 - b _0811B8C2 -_0811B826: + b @0811B8C2 +@0811B826: ldr r0, =0x0203a118 ldr r1, [r0] ldrb r2, [r1, 0x10] movs r0, 0x10 ldrsb r0, [r1, r0] cmp r0, 0 - ble _0811B83C + ble @0811B83C subs r0, r2, 0x1 - b _0811B83E + b @0811B83E .align 2, 0 .pool -_0811B83C: +@0811B83C: movs r0, 0x1 -_0811B83E: +@0811B83E: strb r0, [r1, 0x10] bl sub_811B9A0 -_0811B844: +@0811B844: movs r0, 0x12 - b _0811B8C2 -_0811B848: + b @0811B8C2 +@0811B848: ldr r4, =0x0203a118 ldr r1, [r4] ldrb r2, [r1, 0x10] movs r0, 0x10 ldrsb r0, [r1, r0] cmp r0, 0 - bgt _0811B866 + bgt @0811B866 adds r0, r2, 0x1 strb r0, [r1, 0x10] bl sub_811BA1C lsls r0, 24 cmp r0, 0 - beq _0811B844 + beq @0811B844 ldr r1, [r4] -_0811B866: +@0811B866: movs r0, 0 strb r0, [r1, 0x10] - b _0811B844 + b @0811B844 .align 2, 0 .pool -_0811B870: +@0811B870: ldr r0, =0x0203a118 ldr r2, [r0] ldrb r0, [r2, 0xE] adds r1, r0, 0 cmp r1, 0 - beq _0811B8C0 + beq @0811B8C0 cmp r1, 0x3 - bls _0811B888 + bls @0811B888 subs r0, 0x4 - b _0811B88A + b @0811B88A .align 2, 0 .pool -_0811B888: +@0811B888: movs r0, 0 -_0811B88A: +@0811B88A: strb r0, [r2, 0xE] movs r0, 0x15 - b _0811B8C2 -_0811B890: + b @0811B8C2 +@0811B890: ldr r3, =0x0203a118 ldr r1, [r3] ldrb r2, [r1, 0xE] ldrb r0, [r1, 0xF] subs r0, 0x4 cmp r2, r0 - bgt _0811B8C0 + bgt @0811B8C0 adds r0, r2, 0x4 strb r0, [r1, 0xE] ldr r2, [r3] @@ -542875,26 +542875,26 @@ _0811B890: ldrb r3, [r2, 0xF] subs r0, r3, 0x3 cmp r1, r0 - ble _0811B8B4 + ble @0811B8B4 adds r0, r3, 0 adds r0, 0xFD strb r0, [r2, 0xE] -_0811B8B4: +@0811B8B4: bl sub_811B9A0 movs r0, 0x16 - b _0811B8C2 + b @0811B8C2 .align 2, 0 .pool -_0811B8C0: +@0811B8C0: movs r0, 0 -_0811B8C2: +@0811B8C2: pop {r4} pop {r1} bx r1 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 @@ -542913,7 +542913,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 @@ -542933,24 +542933,24 @@ 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] ldrb r0, [r1, 0xA] movs r3, 0 cmp r0, 0x6 - bhi _0811B91A + bhi @0811B91A movs r3, 0xA ldrsb r3, [r1, r3] -_0811B91A: +@0811B91A: ldrb r0, [r1, 0xB] movs r2, 0 cmp r0, 0x3 - bhi _0811B926 + bhi @0811B926 movs r2, 0xB ldrsb r2, [r1, r2] -_0811B926: +@0811B926: ldr r0, =0x08597748 lsls r1, r2, 3 subs r1, r2 @@ -542964,7 +542964,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 @@ -542984,44 +542984,44 @@ 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 cmp r0, 0 - beq _0811B96E + beq @0811B96E cmp r0, 0x1 - beq _0811B972 -_0811B96E: + beq @0811B972 +@0811B96E: movs r0, 0x6 - b _0811B974 -_0811B972: + b @0811B974 +@0811B972: movs r0, 0x5 -_0811B974: +@0811B974: pop {r1} bx r1 thumb_func_end sub_811B960 thumb_func_start sub_811B978 -sub_811B978: @ 811B978 +sub_811B978: ; 811B978 push {lr} - b _0811B98E -_0811B97C: + b @0811B98E +@0811B97C: ldr r0, =0x0203a118 ldr r1, [r0] ldrb r2, [r1, 0xA] movs r0, 0xA ldrsb r0, [r1, r0] cmp r0, 0 - beq _0811B998 + beq @0811B998 subs r0, r2, 0x1 strb r0, [r1, 0xA] -_0811B98E: +@0811B98E: bl sub_811B9C8 lsls r0, 24 cmp r0, 0 - bne _0811B97C -_0811B998: + bne @0811B97C +@0811B998: pop {r0} bx r0 .align 2, 0 @@ -543029,25 +543029,25 @@ _0811B998: thumb_func_end sub_811B978 thumb_func_start sub_811B9A0 -sub_811B9A0: @ 811B9A0 +sub_811B9A0: ; 811B9A0 push {lr} - b _0811B9B6 -_0811B9A4: + b @0811B9B6 +@0811B9A4: ldr r0, =0x0203a118 ldr r1, [r0] ldrb r2, [r1, 0x10] movs r0, 0x10 ldrsb r0, [r1, r0] cmp r0, 0 - beq _0811B9C0 + beq @0811B9C0 subs r0, r2, 0x1 strb r0, [r1, 0x10] -_0811B9B6: +@0811B9B6: bl sub_811BA1C lsls r0, 24 cmp r0, 0 - bne _0811B9A4 -_0811B9C0: + bne @0811B9A4 +@0811B9C0: pop {r0} bx r0 .align 2, 0 @@ -543055,13 +543055,13 @@ _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] ldrb r0, [r1, 0x9] cmp r0, 0 - bne _0811B9F8 + bne @0811B9F8 bl sub_811B8E8 adds r4, r0, 0 bl sub_811F3AC @@ -543071,14 +543071,14 @@ sub_811B9C8: @ 811B9C8 lsrs r4, 16 lsrs r0, 24 cmp r4, r0 - bcc _0811B9EE + bcc @0811B9EE movs r1, 0x1 -_0811B9EE: +@0811B9EE: adds r0, r1, 0 - b _0811BA14 + b @0811BA14 .align 2, 0 .pool -_0811B9F8: +@0811B9F8: ldrb r0, [r1, 0xB] bl sub_811B960 movs r2, 0 @@ -543089,18 +543089,18 @@ _0811B9F8: lsls r0, 24 lsrs r0, 24 cmp r1, r0 - ble _0811BA12 + ble @0811BA12 movs r2, 0x1 -_0811BA12: +@0811BA12: adds r0, r2, 0 -_0811BA14: +@0811BA14: pop {r4} pop {r1} bx r1 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 @@ -543109,9 +543109,9 @@ sub_811BA1C: @ 811BA1C lsls r4, 16 lsls r0, 16 cmp r4, r0 - bcc _0811BA34 + bcc @0811BA34 movs r1, 0x1 -_0811BA34: +@0811BA34: adds r0, r1, 0 pop {r4} pop {r1} @@ -543119,7 +543119,7 @@ _0811BA34: thumb_func_end sub_811BA1C thumb_func_start sub_811BA3C -sub_811BA3C: @ 811BA3C +sub_811BA3C: ; 811BA3C ldr r2, =0x08597550 ldr r0, =0x0203a118 ldr r0, [r0] @@ -543136,7 +543136,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] @@ -543146,7 +543146,7 @@ sub_811BA5C: @ 811BA5C thumb_func_end sub_811BA5C thumb_func_start sub_811BA68 -sub_811BA68: @ 811BA68 +sub_811BA68: ; 811BA68 ldr r2, =0x08597550 ldr r0, =0x0203a118 ldr r0, [r0] @@ -543164,7 +543164,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] @@ -543174,7 +543174,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 @@ -543184,7 +543184,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] @@ -543194,7 +543194,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] @@ -543204,7 +543204,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] @@ -543214,7 +543214,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] @@ -543224,7 +543224,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, =0x08597550 ldr r2, =0x0203a118 @@ -543254,7 +543254,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, =0x08597550 ldr r2, =0x0203a118 @@ -543284,37 +543284,37 @@ 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 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x4 - bne _0811BB5C + bne @0811BB5C ldr r0, =0x085ec3b4 - b _0811BB7A + b @0811BB7A .align 2, 0 .pool -_0811BB5C: +@0811BB5C: cmp r0, 0x4 - blt _0811BB78 + blt @0811BB78 cmp r0, 0x10 - bgt _0811BB78 + bgt @0811BB78 cmp r0, 0xF - blt _0811BB78 + blt @0811BB78 ldr r0, =0x085ec706 str r0, [r2] ldr r0, =0x085ec727 - b _0811BB7E + b @0811BB7E .align 2, 0 .pool -_0811BB78: +@0811BB78: ldr r0, =0x085ec3a6 -_0811BB7A: +@0811BB7A: str r0, [r2] movs r0, 0 -_0811BB7E: +@0811BB7E: str r0, [r1] pop {r0} bx r0 @@ -543323,7 +543323,7 @@ _0811BB7E: thumb_func_end sub_811BB40 thumb_func_start sub_811BB88 -sub_811BB88: @ 811BB88 +sub_811BB88: ; 811BB88 ldr r2, =0x085ec410 str r2, [r0] ldr r0, =0x085ec42f @@ -543334,7 +543334,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] @@ -543347,7 +543347,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] @@ -543357,7 +543357,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] @@ -543367,7 +543367,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] @@ -543380,7 +543380,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] @@ -543390,7 +543390,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] @@ -543400,86 +543400,86 @@ 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] ldrb r0, [r1, 0x4] cmp r0, 0x2 - beq _0811BC10 + beq @0811BC10 cmp r0, 0x3 - beq _0811BC1A - b _0811BC24 + beq @0811BC1A + b @0811BC24 .align 2, 0 .pool -_0811BC10: +@0811BC10: ldrb r0, [r1, 0x9] cmp r0, 0 - bne _0811BC24 + bne @0811BC24 ldrb r0, [r1, 0xC] - b _0811BC1C -_0811BC1A: + b @0811BC1C +@0811BC1A: ldrb r0, [r1, 0xE] -_0811BC1C: +@0811BC1C: cmp r0, 0 - beq _0811BC24 + beq @0811BC24 movs r0, 0x1 - b _0811BC26 -_0811BC24: + b @0811BC26 +@0811BC24: movs r0, 0 -_0811BC26: +@0811BC26: pop {r1} bx r1 thumb_func_end sub_811BBF8 thumb_func_start sub_811BC2C -sub_811BC2C: @ 811BC2C +sub_811BC2C: ; 811BC2C push {lr} ldr r0, =0x0203a118 ldr r2, [r0] ldrb r0, [r2, 0x4] cmp r0, 0x2 - beq _0811BC44 + beq @0811BC44 cmp r0, 0x3 - beq _0811BC5A - b _0811BC68 + beq @0811BC5A + b @0811BC68 .align 2, 0 .pool -_0811BC44: +@0811BC44: ldrb r0, [r2, 0x9] cmp r0, 0 - bne _0811BC68 + bne @0811BC68 ldrb r1, [r2, 0xC] adds r1, 0x4 ldrb r0, [r2, 0xD] subs r0, 0x1 cmp r1, r0 - bgt _0811BC68 + bgt @0811BC68 movs r0, 0x1 - b _0811BC6A -_0811BC5A: + b @0811BC6A +@0811BC5A: ldrb r0, [r2, 0xE] adds r0, 0x4 ldrb r2, [r2, 0xF] cmp r0, r2 - bgt _0811BC68 + bgt @0811BC68 movs r0, 0x1 - b _0811BC6A -_0811BC68: + b @0811BC6A +@0811BC68: movs r0, 0 -_0811BC6A: +@0811BC6A: pop {r1} bx r1 thumb_func_end sub_811BC2C thumb_func_start sub_811BC70 -sub_811BC70: @ 811BC70 +sub_811BC70: ; 811BC70 push {lr} bl sub_811BA3C pop {r1} @@ -543487,46 +543487,46 @@ 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 lsrs r3, r1, 24 movs r2, 0 cmp r2, r3 - bcs _0811BCB2 + bcs @0811BCB2 ldr r0, =0x0203a118 ldr r0, [r0] adds r4, r0, 0 adds r4, 0x3C -_0811BC92: +@0811BC92: lsls r0, r2, 1 adds r1, r0, r5 adds r0, r4, r0 ldrh r1, [r1] ldrh r0, [r0] cmp r1, r0 - beq _0811BCA8 + beq @0811BCA8 movs r0, 0x1 - b _0811BCB4 + b @0811BCB4 .align 2, 0 .pool -_0811BCA8: +@0811BCA8: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, r3 - bcc _0811BC92 -_0811BCB2: + bcc @0811BC92 +@0811BCB2: movs r0, 0 -_0811BCB4: +@0811BCB4: pop {r4,r5} pop {r1} bx r1 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] @@ -543536,132 +543536,132 @@ 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 movs r1, 0 ldr r2, =0x08597550 -_0811BCD2: +@0811BCD2: ldrb r0, [r2] cmp r0, r3 - bne _0811BCE4 + bne @0811BCE4 lsls r0, r1, 24 lsrs r0, 24 - b _0811BCEE + b @0811BCEE .align 2, 0 .pool -_0811BCE4: +@0811BCE4: adds r2, 0x18 adds r1, 0x1 cmp r1, 0x14 - bls _0811BCD2 + bls @0811BCD2 movs r0, 0 -_0811BCEE: +@0811BCEE: pop {r1} bx r1 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 ldr r0, [r0] ldrb r1, [r0, 0x7] cmp r2, r1 - bge _0811BD24 + bge @0811BD24 ldr r4, =0x0000ffff adds r3, r1, 0 adds r1, r0, 0 adds r1, 0x3C -_0811BD0A: +@0811BD0A: ldrh r0, [r1] cmp r0, r4 - beq _0811BD1C + beq @0811BD1C movs r0, 0 - b _0811BD26 + b @0811BD26 .align 2, 0 .pool -_0811BD1C: +@0811BD1C: adds r1, 0x2 adds r2, 0x1 cmp r2, r3 - blt _0811BD0A -_0811BD24: + blt @0811BD0A +@0811BD24: movs r0, 0x1 -_0811BD26: +@0811BD26: pop {r4} pop {r1} bx r1 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 ldr r0, [r0] ldrb r1, [r0, 0x7] cmp r2, r1 - bge _0811BD5C + bge @0811BD5C ldr r4, =0x0000ffff adds r3, r1, 0 adds r1, r0, 0 adds r1, 0x3C -_0811BD42: +@0811BD42: ldrh r0, [r1] cmp r0, r4 - bne _0811BD54 + bne @0811BD54 movs r0, 0 - b _0811BD5E + b @0811BD5E .align 2, 0 .pool -_0811BD54: +@0811BD54: adds r1, 0x2 adds r2, 0x1 cmp r2, r3 - blt _0811BD42 -_0811BD5C: + blt @0811BD42 +@0811BD5C: movs r0, 0x1 -_0811BD5E: +@0811BD5E: pop {r4} pop {r1} bx r1 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] ldrb r0, [r0] cmp r0, 0x11 - bne _0811BD80 + bne @0811BD80 bl sub_811BCF4 - b _0811BD9C + b @0811BD9C .align 2, 0 .pool -_0811BD7C: +@0811BD7C: movs r0, 0 - b _0811BD9C -_0811BD80: + b @0811BD9C +@0811BD80: ldr r0, =0x03005d8c ldr r0, [r0] movs r2, 0 ldr r3, =0x0000ffff ldr r4, =0x00003b5a adds r1, r0, r4 -_0811BD8C: +@0811BD8C: ldrh r0, [r1] cmp r0, r3 - bne _0811BD7C + bne @0811BD7C adds r1, 0x2 adds r2, 0x1 cmp r2, 0x8 - ble _0811BD8C + ble @0811BD8C movs r0, 0x1 -_0811BD9C: +@0811BD9C: pop {r4} pop {r1} bx r1 @@ -543670,18 +543670,18 @@ _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] ldrb r0, [r0] cmp r0, 0x12 - bne _0811BDC8 + bne @0811BDC8 bl sub_811BCF4 - b _0811BDDE + b @0811BDDE .align 2, 0 .pool -_0811BDC8: +@0811BDC8: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00003b58 @@ -543690,11 +543690,11 @@ _0811BDC8: ldrh r1, [r0, 0x14] ldr r0, =0x0000ffff cmp r1, r0 - bne _0811BDDC + bne @0811BDDC movs r2, 0x1 -_0811BDDC: +@0811BDDC: adds r0, r2, 0 -_0811BDDE: +@0811BDDE: pop {r1} bx r1 .align 2, 0 @@ -543702,7 +543702,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 @@ -543715,7 +543715,7 @@ sub_811BDF0: @ 811BDF0 bl sub_8008C24 lsls r0, 16 cmp r0, 0 - beq _0811BE34 + beq @0811BE34 ldr r1, =0x00003b85 adds r0, r4, r1 ldrb r2, [r0] @@ -543725,14 +543725,14 @@ sub_811BDF0: @ 811BDF0 movs r0, 0 mov r1, sp bl sub_81AFC0C - b _0811BE3C + b @0811BE3C .align 2, 0 .pool -_0811BE34: +@0811BE34: ldr r1, =0x085ec6b2 movs r0, 0 bl sub_81AFC0C -_0811BE3C: +@0811BE3C: ldr r1, =0x085ec6a8 adds r0, r6, 0 bl sub_81AFC28 @@ -543745,7 +543745,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] @@ -543753,10 +543753,10 @@ sub_811BE54: @ 811BE54 adds r4, 0x3C ldr r2, =0x02021dc4 movs r5, 0 - b _0811BE86 + b @0811BE86 .align 2, 0 .pool -_0811BE6C: +@0811BE6C: ldrh r1, [r4] adds r0, r2, 0 movs r2, 0 @@ -543769,10 +543769,10 @@ _0811BE6C: adds r5, 0x1 ldr r0, =0x0203a118 ldr r0, [r0] -_0811BE86: +@0811BE86: ldrb r0, [r0, 0x7] cmp r5, r0 - blt _0811BE6C + blt @0811BE6C subs r2, 0x1 movs r0, 0xFF strb r0, [r2] @@ -543784,49 +543784,49 @@ _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] ldrb r0, [r0] cmp r0, 0x9 - beq _0811BEF0 + beq @0811BEF0 cmp r0, 0x9 - bgt _0811BEB8 + bgt @0811BEB8 cmp r0, 0 - beq _0811BEC2 - b _0811BF14 + beq @0811BEC2 + b @0811BF14 .align 2, 0 .pool -_0811BEB8: +@0811BEB8: cmp r0, 0xD - beq _0811BF0C + beq @0811BF0C cmp r0, 0x14 - beq _0811BED0 - b _0811BF14 -_0811BEC2: + beq @0811BED0 + b @0811BF14 +@0811BEC2: ldr r0, =0x00000865 bl flag_set - b _0811BF14 + b @0811BF14 .align 2, 0 .pool -_0811BED0: +@0811BED0: bl sub_811BF20 adds r1, r0, 0 cmp r1, 0 - beq _0811BEE4 + beq @0811BEE4 ldr r1, =0x020375e0 movs r0, 0x2 - b _0811BF12 + b @0811BF12 .align 2, 0 .pool -_0811BEE4: +@0811BEE4: ldr r0, =0x020375e0 strh r1, [r0] - b _0811BF14 + b @0811BF14 .align 2, 0 .pool -_0811BEF0: +@0811BEF0: bl sub_811BE54 ldr r4, =0x020375e0 ldr r0, [r5] @@ -543835,15 +543835,15 @@ _0811BEF0: lsls r0, 24 lsrs r0, 24 strh r0, [r4] - b _0811BF14 + b @0811BF14 .align 2, 0 .pool -_0811BF0C: +@0811BF0C: bl sub_811BF40 ldr r1, =0x020375e0 -_0811BF12: +@0811BF12: strh r0, [r1] -_0811BF14: +@0811BF14: pop {r4,r5} pop {r0} bx r0 @@ -543852,7 +543852,7 @@ _0811BF14: thumb_func_end sub_811BE9C thumb_func_start sub_811BF20 -sub_811BF20: @ 811BF20 +sub_811BF20: ; 811BF20 push {lr} ldr r0, =0x08597764 movs r1, 0x4 @@ -543860,9 +543860,9 @@ sub_811BF20: @ 811BF20 movs r1, 0 lsls r0, 24 cmp r0, 0 - bne _0811BF34 + bne @0811BF34 movs r1, 0x1 -_0811BF34: +@0811BF34: adds r0, r1, 0 pop {r1} bx r1 @@ -543871,12 +543871,12 @@ _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 lsls r5, 9 -_0811BF48: +@0811BF48: lsls r0, r4, 2 ldr r1, =0x0859776c adds r0, r1 @@ -543884,27 +543884,27 @@ _0811BF48: bl sub_811BC7C lsls r0, 24 cmp r0, 0 - bne _0811BF64 + bne @0811BF64 lsrs r0, r5, 16 - b _0811BF72 + b @0811BF72 .align 2, 0 .pool -_0811BF64: +@0811BF64: movs r0, 0x80 lsls r0, 9 adds r5, r0 adds r4, 0x1 cmp r4, 0x4 - ble _0811BF48 + ble @0811BF48 movs r0, 0 -_0811BF72: +@0811BF72: pop {r4,r5} pop {r1} bx r1 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 @@ -543915,54 +543915,54 @@ 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 cmp r0, 0 - beq _0811BF9C + beq @0811BF9C movs r0, 0x1 - b _0811BF9E -_0811BF9C: + b @0811BF9E +@0811BF9C: movs r0, 0 -_0811BF9E: +@0811BF9E: pop {r1} bx r1 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 ldr r0, [r0] ldrh r0, [r0] cmp r0, 0x5 - bls _0811BFB4 - b _0811C120 -_0811BFB4: + bls @0811BFB4 + b @0811C120 +@0811BFB4: lsls r0, 2 - ldr r1, =_0811BFC8 + ldr r1, =@0811BFC8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0811BFC8: - .4byte _0811BFE0 - .4byte _0811C044 - .4byte _0811C090 - .4byte _0811C0AC - .4byte _0811C0BE - .4byte _0811C0D4 -_0811BFE0: +@0811BFC8: + .4byte @0811BFE0 + .4byte @0811C044 + .4byte @0811C090 + .4byte @0811C0AC + .4byte @0811C0BE + .4byte @0811C0D4 +@0811BFE0: movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags ldr r1, =0x08597c54 @@ -543994,10 +543994,10 @@ _0811BFE0: ldr r2, =0x01000100 add r0, sp, 0x4 bl CpuFastSet - b _0811C124 + b @0811C124 .align 2, 0 .pool -_0811C044: +@0811C044: ldr r1, =0x08dcbdd0 movs r0, 0 str r0, [sp] @@ -544021,10 +544021,10 @@ _0811C044: bl sub_811E948 movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - b _0811C124 + b @0811C124 .align 2, 0 .pool -_0811C090: +@0811C090: ldr r1, =0x08597b54 movs r0, 0 str r0, [sp] @@ -544034,29 +544034,29 @@ _0811C090: bl copy_decompressed_tile_data_to_vram_autofree movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram - b _0811C124 + b @0811C124 .align 2, 0 .pool -_0811C0AC: +@0811C0AC: bl sub_811CFCC bl sub_811D0BC bl sub_811D2C8 bl sub_811D684 - b _0811C124 -_0811C0BE: + b @0811C124 +@0811C0BE: bl sub_811DE90 bl sub_811BA5C lsls r0, 24 lsrs r0, 24 cmp r0, 0x10 - beq _0811C124 + beq @0811C124 bl sub_811DEC4 - b _0811C124 -_0811C0D4: + b @0811C124 +@0811C0D4: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0811C12E + bne @0811C12E movs r0, 0 movs r1, 0 movs r2, 0 @@ -544079,19 +544079,19 @@ _0811C0D4: bl sub_811E5D4 bl sub_811E720 bl sub_811E828 - b _0811C124 -_0811C120: + b @0811C124 +@0811C120: movs r0, 0 - b _0811C130 -_0811C124: + b @0811C130 +@0811C124: ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_0811C12E: +@0811C12E: movs r0, 0x1 -_0811C130: +@0811C130: add sp, 0x8 pop {r4} pop {r1} @@ -544101,16 +544101,16 @@ _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] cmp r0, 0 - beq _0811C14E + beq @0811C14E bl free movs r0, 0 str r0, [r4] -_0811C14E: +@0811C14E: pop {r4} pop {r0} bx r0 @@ -544119,7 +544119,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] @@ -544134,191 +544134,191 @@ 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] ldrh r0, [r0, 0x4] cmp r0, 0x22 - bls _0811C17E - b _0811C2CE -_0811C17E: + bls @0811C17E + b @0811C2CE +@0811C17E: lsls r0, 2 - ldr r1, =_0811C190 + ldr r1, =@0811C190 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0811C190: - .4byte _0811C2CE - .4byte _0811C21C - .4byte _0811C222 - .4byte _0811C228 - .4byte _0811C22E - .4byte _0811C234 - .4byte _0811C23A - .4byte _0811C240 - .4byte _0811C246 - .4byte _0811C24C - .4byte _0811C252 - .4byte _0811C258 - .4byte _0811C25E - .4byte _0811C264 - .4byte _0811C26A - .4byte _0811C270 - .4byte _0811C276 - .4byte _0811C27C - .4byte _0811C282 - .4byte _0811C288 - .4byte _0811C28E - .4byte _0811C294 - .4byte _0811C29A - .4byte _0811C2A0 - .4byte _0811C2CE - .4byte _0811C2CE - .4byte _0811C2CE - .4byte _0811C2CE - .4byte _0811C2CE - .4byte _0811C2A6 - .4byte _0811C2AC - .4byte _0811C2B2 - .4byte _0811C2B8 - .4byte _0811C2BE - .4byte _0811C2C4 -_0811C21C: +@0811C190: + .4byte @0811C2CE + .4byte @0811C21C + .4byte @0811C222 + .4byte @0811C228 + .4byte @0811C22E + .4byte @0811C234 + .4byte @0811C23A + .4byte @0811C240 + .4byte @0811C246 + .4byte @0811C24C + .4byte @0811C252 + .4byte @0811C258 + .4byte @0811C25E + .4byte @0811C264 + .4byte @0811C26A + .4byte @0811C270 + .4byte @0811C276 + .4byte @0811C27C + .4byte @0811C282 + .4byte @0811C288 + .4byte @0811C28E + .4byte @0811C294 + .4byte @0811C29A + .4byte @0811C2A0 + .4byte @0811C2CE + .4byte @0811C2CE + .4byte @0811C2CE + .4byte @0811C2CE + .4byte @0811C2CE + .4byte @0811C2A6 + .4byte @0811C2AC + .4byte @0811C2B2 + .4byte @0811C2B8 + .4byte @0811C2BE + .4byte @0811C2C4 +@0811C21C: bl sub_811C2D4 - b _0811C2C8 -_0811C222: + b @0811C2C8 +@0811C222: bl sub_811C30C - b _0811C2C8 -_0811C228: + b @0811C2C8 +@0811C228: bl sub_811C3E4 - b _0811C2C8 -_0811C22E: + b @0811C2C8 +@0811C22E: bl sub_811C48C - b _0811C2C8 -_0811C234: + b @0811C2C8 +@0811C234: bl sub_811C404 - b _0811C2C8 -_0811C23A: + b @0811C2C8 +@0811C23A: bl sub_811C448 - b _0811C2C8 -_0811C240: + b @0811C2C8 +@0811C240: bl sub_811C4D0 - b _0811C2C8 -_0811C246: + b @0811C2C8 +@0811C246: bl sub_811C518 - b _0811C2C8 -_0811C24C: + b @0811C2C8 +@0811C24C: bl sub_811C554 - b _0811C2C8 -_0811C252: + b @0811C2C8 +@0811C252: bl sub_811C620 - b _0811C2C8 -_0811C258: + b @0811C2C8 +@0811C258: bl sub_811C830 - b _0811C2C8 -_0811C25E: + b @0811C2C8 +@0811C25E: bl sub_811C8F0 - b _0811C2C8 -_0811C264: + b @0811C2C8 +@0811C264: bl sub_811C99C - b _0811C2C8 -_0811C26A: + b @0811C2C8 +@0811C26A: bl sub_811CA5C - b _0811C2C8 -_0811C270: + b @0811C2C8 +@0811C270: bl sub_811C780 - b _0811C2C8 -_0811C276: + b @0811C2C8 +@0811C276: bl sub_811C78C - b _0811C2C8 -_0811C27C: + b @0811C2C8 +@0811C27C: bl sub_811C7D4 - b _0811C2C8 -_0811C282: + b @0811C2C8 +@0811C282: bl sub_811CB18 - b _0811C2C8 -_0811C288: + b @0811C2C8 +@0811C288: bl sub_811CB98 - b _0811C2C8 -_0811C28E: + b @0811C2C8 +@0811C28E: bl sub_811CB24 - b _0811C2C8 -_0811C294: + b @0811C2C8 +@0811C294: bl sub_811CC90 - b _0811C2C8 -_0811C29A: + b @0811C2C8 +@0811C29A: bl sub_811CC08 - b _0811C2C8 -_0811C2A0: + b @0811C2C8 +@0811C2A0: bl sub_811C6C0 - b _0811C2C8 -_0811C2A6: + b @0811C2C8 +@0811C2A6: bl sub_811CD14 - b _0811C2C8 -_0811C2AC: + b @0811C2C8 +@0811C2AC: bl sub_811CD54 - b _0811C2C8 -_0811C2B2: + b @0811C2C8 +@0811C2B2: bl sub_811CD94 - b _0811C2C8 -_0811C2B8: + b @0811C2C8 +@0811C2B8: bl sub_811CDD4 - b _0811C2C8 -_0811C2BE: + b @0811C2C8 +@0811C2BE: bl sub_811CE14 - b _0811C2C8 -_0811C2C4: + b @0811C2C8 +@0811C2C4: bl sub_811CE54 -_0811C2C8: +@0811C2C8: lsls r0, 24 lsrs r0, 24 - b _0811C2D0 -_0811C2CE: + b @0811C2D0 +@0811C2CE: movs r0, 0 -_0811C2D0: +@0811C2D0: pop {r1} bx r1 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] ldrh r0, [r0] cmp r0, 0 - beq _0811C2EC + beq @0811C2EC cmp r0, 0x1 - beq _0811C2FA - b _0811C304 + beq @0811C2FA + b @0811C304 .align 2, 0 .pool -_0811C2EC: +@0811C2EC: bl sub_811D2C8 ldr r1, [r4] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0811C304 -_0811C2FA: + b @0811C304 +@0811C2FA: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 - b _0811C306 -_0811C304: + b @0811C306 +@0811C304: movs r0, 0x1 -_0811C306: +@0811C306: pop {r4} pop {r1} bx r1 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 @@ -544359,18 +544359,18 @@ sub_811C30C: @ 811C30C lsrs r6, r0, 16 movs r5, 0 cmp r5, r7 - bcs _0811C3AA + bcs @0811C3AA ldr r2, =0x0000ffff mov r8, r2 -_0811C36C: +@0811C36C: ldrh r0, [r4] cmp r0, r8 - bne _0811C380 + bne @0811C380 movs r0, 0x48 - b _0811C392 + b @0811C392 .align 2, 0 .pool -_0811C380: +@0811C380: ldrh r1, [r4] mov r0, sp bl sub_811EBBC @@ -544378,7 +544378,7 @@ _0811C380: mov r1, sp movs r2, 0 bl font_get_width_of_string -_0811C392: +@0811C392: adds r0, 0x11 lsls r1, r6, 16 asrs r1, 16 @@ -544390,8 +544390,8 @@ _0811C392: lsls r0, 24 lsrs r5, r0, 24 cmp r5, r7 - bcc _0811C36C -_0811C3AA: + bcc @0811C36C +@0811C3AA: ldr r1, =0x08597c30 mov r2, r10 lsls r0, r2, 2 @@ -544423,7 +544423,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 @@ -544439,19 +544439,19 @@ 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] ldrh r0, [r0] cmp r0, 0 - beq _0811C41C + beq @0811C41C cmp r0, 0x1 - beq _0811C436 - b _0811C440 + beq @0811C436 + b @0811C440 .align 2, 0 .pool -_0811C41C: +@0811C41C: bl sub_811DF90 movs r0, 0x2 bl sub_811D104 @@ -544461,34 +544461,34 @@ _0811C41C: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0811C440 -_0811C436: + b @0811C440 +@0811C436: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 - b _0811C442 -_0811C440: + b @0811C442 +@0811C440: movs r0, 0x1 -_0811C442: +@0811C442: pop {r4} pop {r1} bx r1 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] ldrh r0, [r0] cmp r0, 0 - beq _0811C460 + beq @0811C460 cmp r0, 0x1 - beq _0811C47A - b _0811C484 + beq @0811C47A + b @0811C484 .align 2, 0 .pool -_0811C460: +@0811C460: bl sub_811DF90 movs r0, 0x3 bl sub_811D104 @@ -544498,34 +544498,34 @@ _0811C460: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0811C484 -_0811C47A: + b @0811C484 +@0811C47A: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 - b _0811C486 -_0811C484: + b @0811C486 +@0811C484: movs r0, 0x1 -_0811C486: +@0811C486: pop {r4} pop {r1} bx r1 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] ldrh r0, [r0] cmp r0, 0 - beq _0811C4A4 + beq @0811C4A4 cmp r0, 0x1 - beq _0811C4BE - b _0811C4C8 + beq @0811C4BE + b @0811C4C8 .align 2, 0 .pool -_0811C4A4: +@0811C4A4: bl sub_811DF90 movs r0, 0x1 bl sub_811D104 @@ -544535,34 +544535,34 @@ _0811C4A4: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0811C4C8 -_0811C4BE: + b @0811C4C8 +@0811C4BE: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 - b _0811C4CA -_0811C4C8: + b @0811C4CA +@0811C4C8: movs r0, 0x1 -_0811C4CA: +@0811C4CA: pop {r4} pop {r1} bx r1 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] ldrh r0, [r0] cmp r0, 0 - beq _0811C4E8 + beq @0811C4E8 cmp r0, 0x1 - beq _0811C506 - b _0811C510 + beq @0811C506 + b @0811C510 .align 2, 0 .pool -_0811C4E8: +@0811C4E8: bl sub_811DFB0 movs r0, 0 bl sub_811D104 @@ -544573,35 +544573,35 @@ _0811C4E8: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0811C510 -_0811C506: + b @0811C510 +@0811C506: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 - b _0811C512 -_0811C510: + b @0811C512 +@0811C510: movs r0, 0x1 -_0811C512: +@0811C512: pop {r4} pop {r1} bx r1 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] ldrh r0, [r0] cmp r0, 0 - beq _0811C530 + beq @0811C530 cmp r0, 0x1 - beq _0811C546 + beq @0811C546 movs r0, 0x1 - b _0811C54E + b @0811C54E .align 2, 0 .pool -_0811C530: +@0811C530: bl sub_811DFB0 movs r0, 0 bl sub_811D104 @@ -544610,39 +544610,39 @@ _0811C530: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_0811C546: +@0811C546: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 -_0811C54E: +@0811C54E: pop {r4} pop {r1} bx r1 thumb_func_end sub_811C518 thumb_func_start sub_811C554 -sub_811C554: @ 811C554 +sub_811C554: ; 811C554 push {lr} ldr r0, =0x0203a11c ldr r0, [r0] ldrh r0, [r0] cmp r0, 0x4 - bhi _0811C60E + bhi @0811C60E lsls r0, 2 - ldr r1, =_0811C574 + ldr r1, =@0811C574 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0811C574: - .4byte _0811C588 - .4byte _0811C5A4 - .4byte _0811C5B6 - .4byte _0811C5CC - .4byte _0811C5EC -_0811C588: +@0811C574: + .4byte @0811C588 + .4byte @0811C5A4 + .4byte @0811C5B6 + .4byte @0811C5CC + .4byte @0811C5EC +@0811C588: bl sub_811DF90 movs r0, 0 bl gpu_sync_bg_hide @@ -544652,45 +544652,45 @@ _0811C588: movs r3, 0 bl sub_811DE5C bl sub_811D6D4 - b _0811C5DA -_0811C5A4: + b @0811C5DA +@0811C5A4: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0811C618 + bne @0811C618 movs r0, 0 bl sub_811D9CC - b _0811C5DA -_0811C5B6: + b @0811C5DA +@0811C5B6: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0811C618 + bne @0811C618 bl sub_811DAA4 lsls r0, 24 cmp r0, 0 - bne _0811C618 - b _0811C5DA -_0811C5CC: + bne @0811C618 + b @0811C5DA +@0811C5CC: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0811C618 + bne @0811C618 bl sub_811E3AC -_0811C5DA: +@0811C5DA: ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0811C618 + b @0811C618 .align 2, 0 .pool -_0811C5EC: +@0811C5EC: bl sub_811E418 lsls r0, 24 cmp r0, 0 - bne _0811C618 + bne @0811C618 bl sub_811DFC8 movs r0, 0 bl sub_811E6E0 @@ -544700,51 +544700,51 @@ _0811C5EC: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_0811C60E: +@0811C60E: movs r0, 0 - b _0811C61A + b @0811C61A .align 2, 0 .pool -_0811C618: +@0811C618: movs r0, 0x1 -_0811C61A: +@0811C61A: pop {r1} bx r1 thumb_func_end sub_811C554 thumb_func_start sub_811C620 -sub_811C620: @ 811C620 +sub_811C620: ; 811C620 push {lr} ldr r0, =0x0203a11c ldr r0, [r0] ldrh r0, [r0] cmp r0, 0x4 - bhi _0811C6B8 + bhi @0811C6B8 lsls r0, 2 - ldr r1, =_0811C640 + ldr r1, =@0811C640 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0811C640: - .4byte _0811C654 - .4byte _0811C662 - .4byte _0811C67E - .4byte _0811C690 - .4byte _0811C6B4 -_0811C654: +@0811C640: + .4byte @0811C654 + .4byte @0811C662 + .4byte @0811C67E + .4byte @0811C690 + .4byte @0811C6B4 +@0811C654: bl sub_811E050 bl sub_811E4AC bl sub_811E6B0 - b _0811C6A4 -_0811C662: + b @0811C6A4 +@0811C662: bl sub_811E4D0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0811C6B8 + beq @0811C6B8 movs r0, 0x1 bl sub_811D9CC ldr r0, =0x0203a11c @@ -544752,107 +544752,107 @@ _0811C662: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_0811C67E: +@0811C67E: bl sub_811DAA4 lsls r0, 24 cmp r0, 0 - bne _0811C6B8 - b _0811C6A4 + bne @0811C6B8 + b @0811C6A4 .align 2, 0 .pool -_0811C690: +@0811C690: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0811C6B8 + bne @0811C6B8 bl sub_811DFB0 movs r0, 0 bl gpu_sync_bg_show -_0811C6A4: +@0811C6A4: ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0811C6B8 + b @0811C6B8 .align 2, 0 .pool -_0811C6B4: +@0811C6B4: movs r0, 0 - b _0811C6BA -_0811C6B8: + b @0811C6BA +@0811C6B8: movs r0, 0x1 -_0811C6BA: +@0811C6BA: pop {r1} bx r1 thumb_func_end sub_811C620 thumb_func_start sub_811C6C0 -sub_811C6C0: @ 811C6C0 +sub_811C6C0: ; 811C6C0 push {lr} ldr r0, =0x0203a11c ldr r0, [r0] ldrh r0, [r0] cmp r0, 0x4 - bhi _0811C778 + bhi @0811C778 lsls r0, 2 - ldr r1, =_0811C6E0 + ldr r1, =@0811C6E0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0811C6E0: - .4byte _0811C6F4 - .4byte _0811C708 - .4byte _0811C722 - .4byte _0811C748 - .4byte _0811C76E -_0811C6F4: +@0811C6E0: + .4byte @0811C6F4 + .4byte @0811C708 + .4byte @0811C722 + .4byte @0811C748 + .4byte @0811C76E +@0811C6F4: bl sub_811E050 bl sub_811E6B0 bl sub_811E55C movs r0, 0x5 bl sub_811D9CC - b _0811C736 -_0811C708: + b @0811C736 +@0811C708: bl sub_811DAA4 lsls r0, 24 cmp r0, 0 - bne _0811C778 + bne @0811C778 bl sub_811E5B8 lsls r0, 24 cmp r0, 0 - bne _0811C778 + bne @0811C778 bl sub_811D6D4 - b _0811C736 -_0811C722: + b @0811C736 +@0811C722: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0811C778 + bne @0811C778 movs r0, 0x6 bl sub_811D9CC bl sub_811E578 -_0811C736: +@0811C736: ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0811C778 + b @0811C778 .align 2, 0 .pool -_0811C748: +@0811C748: bl sub_811DAA4 lsls r0, 24 cmp r0, 0 - bne _0811C778 + bne @0811C778 bl sub_811E5B8 lsls r0, 24 cmp r0, 0 - bne _0811C778 + bne @0811C778 bl sub_811E64C bl sub_811DFC8 ldr r0, =0x0203a11c @@ -544860,20 +544860,20 @@ _0811C748: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_0811C76E: +@0811C76E: movs r0, 0 - b _0811C77A + b @0811C77A .align 2, 0 .pool -_0811C778: +@0811C778: movs r0, 0x1 -_0811C77A: +@0811C77A: pop {r1} bx r1 thumb_func_end sub_811C6C0 thumb_func_start sub_811C780 -sub_811C780: @ 811C780 +sub_811C780: ; 811C780 push {lr} bl sub_811E088 movs r0, 0 @@ -544882,19 +544882,19 @@ 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] ldrh r0, [r0] cmp r0, 0 - beq _0811C7A4 + beq @0811C7A4 cmp r0, 0x1 - beq _0811C7B4 - b _0811C7CA + beq @0811C7B4 + b @0811C7CA .align 2, 0 .pool -_0811C7A4: +@0811C7A4: movs r0, 0x1 movs r1, 0x4 bl sub_811DDAC @@ -544902,43 +544902,43 @@ _0811C7A4: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_0811C7B4: +@0811C7B4: bl sub_811DE10 lsls r0, 24 cmp r0, 0 - bne _0811C7CA + bne @0811C7CA bl sub_811E088 bl sub_811E64C movs r0, 0 - b _0811C7CC -_0811C7CA: + b @0811C7CC +@0811C7CA: movs r0, 0x1 -_0811C7CC: +@0811C7CC: pop {r4} pop {r1} bx r1 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] ldrh r0, [r0] cmp r0, 0x1 - beq _0811C808 + beq @0811C808 cmp r0, 0x1 - bgt _0811C7F0 + bgt @0811C7F0 cmp r0, 0 - beq _0811C7F6 - b _0811C828 + beq @0811C7F6 + b @0811C828 .align 2, 0 .pool -_0811C7F0: +@0811C7F0: cmp r0, 0x2 - beq _0811C820 - b _0811C828 -_0811C7F6: + beq @0811C820 + b @0811C828 +@0811C7F6: movs r0, 0x1 negs r0, r0 movs r1, 0x4 @@ -544947,94 +544947,94 @@ _0811C7F6: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_0811C808: +@0811C808: bl sub_811DE10 lsls r0, 24 cmp r0, 0 - bne _0811C828 + bne @0811C828 bl sub_811E64C ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_0811C820: +@0811C820: movs r0, 0 - b _0811C82A + b @0811C82A .align 2, 0 .pool -_0811C828: +@0811C828: movs r0, 0x1 -_0811C82A: +@0811C82A: pop {r4} pop {r1} bx r1 thumb_func_end sub_811C7D4 thumb_func_start sub_811C830 -sub_811C830: @ 811C830 +sub_811C830: ; 811C830 push {lr} ldr r0, =0x0203a11c ldr r0, [r0] ldrh r0, [r0] cmp r0, 0x5 - bhi _0811C8E8 + bhi @0811C8E8 lsls r0, 2 - ldr r1, =_0811C850 + ldr r1, =@0811C850 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0811C850: - .4byte _0811C868 - .4byte _0811C876 - .4byte _0811C886 - .4byte _0811C898 - .4byte _0811C8B8 - .4byte _0811C8DE -_0811C868: +@0811C850: + .4byte @0811C868 + .4byte @0811C876 + .4byte @0811C886 + .4byte @0811C898 + .4byte @0811C8B8 + .4byte @0811C8DE +@0811C868: bl sub_811E050 bl sub_811E4AC bl sub_811E6B0 - b _0811C8A8 -_0811C876: + b @0811C8A8 +@0811C876: bl sub_811E4D0 lsls r0, 24 cmp r0, 0 - bne _0811C8E8 + bne @0811C8E8 bl sub_811D9B4 - b _0811C8A8 -_0811C886: + b @0811C8A8 +@0811C886: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0811C8E8 + bne @0811C8E8 movs r0, 0x2 bl sub_811D9CC - b _0811C8A8 -_0811C898: + b @0811C8A8 +@0811C898: bl sub_811DAA4 lsls r0, 24 cmp r0, 0 - bne _0811C8E8 + bne @0811C8E8 movs r0, 0x2 bl sub_811D698 -_0811C8A8: +@0811C8A8: ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0811C8E8 + b @0811C8E8 .align 2, 0 .pool -_0811C8B8: +@0811C8B8: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0811C8E8 + bne @0811C8E8 bl sub_811E288 movs r0, 0x1 bl sub_811E6E0 @@ -545045,248 +545045,248 @@ _0811C8B8: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_0811C8DE: +@0811C8DE: movs r0, 0 - b _0811C8EA + b @0811C8EA .align 2, 0 .pool -_0811C8E8: +@0811C8E8: movs r0, 0x1 -_0811C8EA: +@0811C8EA: pop {r1} bx r1 thumb_func_end sub_811C830 thumb_func_start sub_811C8F0 -sub_811C8F0: @ 811C8F0 +sub_811C8F0: ; 811C8F0 push {lr} ldr r0, =0x0203a11c ldr r0, [r0] ldrh r0, [r0] cmp r0, 0x5 - bhi _0811C994 + bhi @0811C994 lsls r0, 2 - ldr r1, =_0811C910 + ldr r1, =@0811C910 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0811C910: - .4byte _0811C928 - .4byte _0811C92E - .4byte _0811C940 - .4byte _0811C952 - .4byte _0811C974 - .4byte _0811C98C -_0811C928: +@0811C910: + .4byte @0811C928 + .4byte @0811C92E + .4byte @0811C940 + .4byte @0811C952 + .4byte @0811C974 + .4byte @0811C98C +@0811C928: bl sub_811D2C8 - b _0811C962 -_0811C92E: + b @0811C962 +@0811C92E: bl sub_811E380 bl sub_811E6B0 bl sub_811E7F8 bl sub_811D9B4 - b _0811C962 -_0811C940: + b @0811C962 +@0811C940: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0811C994 + bne @0811C994 movs r0, 0x3 bl sub_811D9CC - b _0811C962 -_0811C952: + b @0811C962 +@0811C952: bl sub_811DAA4 lsls r0, 24 cmp r0, 0 - bne _0811C994 + bne @0811C994 movs r0, 0 bl gpu_sync_bg_show -_0811C962: +@0811C962: ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0811C994 + b @0811C994 .align 2, 0 .pool -_0811C974: +@0811C974: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0811C994 + bne @0811C994 bl sub_811DFB0 ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_0811C98C: +@0811C98C: movs r0, 0 - b _0811C996 + b @0811C996 .align 2, 0 .pool -_0811C994: +@0811C994: movs r0, 0x1 -_0811C996: +@0811C996: pop {r1} bx r1 thumb_func_end sub_811C8F0 thumb_func_start sub_811C99C -sub_811C99C: @ 811C99C +sub_811C99C: ; 811C99C push {lr} ldr r0, =0x0203a11c ldr r0, [r0] ldrh r0, [r0] cmp r0, 0x6 - bhi _0811CA54 + bhi @0811CA54 lsls r0, 2 - ldr r1, =_0811C9BC + ldr r1, =@0811C9BC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0811C9BC: - .4byte _0811C9D8 - .4byte _0811C9DE - .4byte _0811C9F0 - .4byte _0811CA02 - .4byte _0811CA14 - .4byte _0811CA34 - .4byte _0811CA4C -_0811C9D8: +@0811C9BC: + .4byte @0811C9D8 + .4byte @0811C9DE + .4byte @0811C9F0 + .4byte @0811CA02 + .4byte @0811CA14 + .4byte @0811CA34 + .4byte @0811CA4C +@0811C9D8: bl sub_811D2C8 - b _0811CA24 -_0811C9DE: + b @0811CA24 +@0811C9DE: bl sub_811E380 bl sub_811E6B0 bl sub_811E7F8 bl sub_811D9B4 - b _0811CA24 -_0811C9F0: + b @0811CA24 +@0811C9F0: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0811CA54 + bne @0811CA54 movs r0, 0x3 bl sub_811D9CC - b _0811CA24 -_0811CA02: + b @0811CA24 +@0811CA02: bl sub_811DAA4 lsls r0, 24 cmp r0, 0 - bne _0811CA54 + bne @0811CA54 movs r0, 0x3 bl sub_811D104 - b _0811CA24 -_0811CA14: + b @0811CA24 +@0811CA14: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0811CA54 + bne @0811CA54 movs r0, 0 bl gpu_sync_bg_show -_0811CA24: +@0811CA24: ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0811CA54 + b @0811CA54 .align 2, 0 .pool -_0811CA34: +@0811CA34: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0811CA54 + bne @0811CA54 bl sub_811DFB0 ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_0811CA4C: +@0811CA4C: movs r0, 0 - b _0811CA56 + b @0811CA56 .align 2, 0 .pool -_0811CA54: +@0811CA54: movs r0, 0x1 -_0811CA56: +@0811CA56: pop {r1} bx r1 thumb_func_end sub_811C99C thumb_func_start sub_811CA5C -sub_811CA5C: @ 811CA5C +sub_811CA5C: ; 811CA5C push {lr} ldr r0, =0x0203a11c ldr r0, [r0] ldrh r0, [r0] cmp r0, 0x4 - bhi _0811CB10 + bhi @0811CB10 lsls r0, 2 - ldr r1, =_0811CA7C + ldr r1, =@0811CA7C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0811CA7C: - .4byte _0811CA90 - .4byte _0811CAA2 - .4byte _0811CAB4 - .4byte _0811CAC4 - .4byte _0811CAE4 -_0811CA90: +@0811CA7C: + .4byte @0811CA90 + .4byte @0811CAA2 + .4byte @0811CAB4 + .4byte @0811CAC4 + .4byte @0811CAE4 +@0811CA90: bl sub_811E380 bl sub_811E6B0 bl sub_811E7F8 bl sub_811D9B4 - b _0811CAD2 -_0811CAA2: + b @0811CAD2 +@0811CAA2: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0811CB10 + bne @0811CB10 movs r0, 0x4 bl sub_811D9CC - b _0811CAD2 -_0811CAB4: + b @0811CAD2 +@0811CAB4: bl sub_811DAA4 lsls r0, 24 cmp r0, 0 - bne _0811CB10 + bne @0811CB10 bl sub_811D6D4 - b _0811CAD2 -_0811CAC4: + b @0811CAD2 +@0811CAC4: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0811CB10 + bne @0811CB10 bl sub_811E3AC -_0811CAD2: +@0811CAD2: ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0811CB10 + b @0811CB10 .align 2, 0 .pool -_0811CAE4: +@0811CAE4: bl sub_811E418 lsls r0, 24 cmp r0, 0 - bne _0811CB10 + bne @0811CB10 bl sub_811DFC8 movs r0, 0 bl sub_811E6E0 @@ -545297,18 +545297,18 @@ _0811CAE4: adds r0, 0x1 strh r0, [r1] movs r0, 0 - b _0811CB12 + b @0811CB12 .align 2, 0 .pool -_0811CB10: +@0811CB10: movs r0, 0x1 -_0811CB12: +@0811CB12: pop {r1} bx r1 thumb_func_end sub_811CA5C thumb_func_start sub_811CB18 -sub_811CB18: @ 811CB18 +sub_811CB18: ; 811CB18 push {lr} bl sub_811E30C movs r0, 0 @@ -545317,48 +545317,48 @@ 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] ldrh r0, [r0] cmp r0, 0x1 - beq _0811CB50 + beq @0811CB50 cmp r0, 0x1 - bgt _0811CB40 + bgt @0811CB40 cmp r0, 0 - beq _0811CB4A - b _0811CB8E + beq @0811CB4A + b @0811CB8E .align 2, 0 .pool -_0811CB40: +@0811CB40: cmp r0, 0x2 - beq _0811CB6C + beq @0811CB6C cmp r0, 0x3 - beq _0811CB8A - b _0811CB8E -_0811CB4A: + beq @0811CB8A + b @0811CB8E +@0811CB4A: bl sub_811D7A4 - b _0811CB62 -_0811CB50: + b @0811CB62 +@0811CB50: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0811CB8E + bne @0811CB8E movs r0, 0x1 movs r1, 0x4 bl sub_811DDAC -_0811CB62: +@0811CB62: ldr r1, [r4] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0811CB8E -_0811CB6C: + b @0811CB8E +@0811CB6C: bl sub_811DE10 lsls r0, 24 cmp r0, 0 - bne _0811CB8E + bne @0811CB8E bl sub_811E30C bl sub_811E64C bl sub_811E794 @@ -545366,107 +545366,107 @@ _0811CB6C: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_0811CB8A: +@0811CB8A: movs r0, 0 - b _0811CB90 -_0811CB8E: + b @0811CB90 +@0811CB8E: movs r0, 0x1 -_0811CB90: +@0811CB90: pop {r4} pop {r1} bx r1 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] ldrh r0, [r0] cmp r0, 0x1 - beq _0811CBC4 + beq @0811CBC4 cmp r0, 0x1 - bgt _0811CBB4 + bgt @0811CBB4 cmp r0, 0 - beq _0811CBBE - b _0811CC00 + beq @0811CBBE + b @0811CC00 .align 2, 0 .pool -_0811CBB4: +@0811CBB4: cmp r0, 0x2 - beq _0811CBE2 + beq @0811CBE2 cmp r0, 0x3 - beq _0811CBFC - b _0811CC00 -_0811CBBE: + beq @0811CBFC + b @0811CC00 +@0811CBBE: bl sub_811D7C8 - b _0811CBD8 -_0811CBC4: + b @0811CBD8 +@0811CBC4: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0811CC00 + bne @0811CC00 movs r0, 0x1 negs r0, r0 movs r1, 0x4 bl sub_811DDAC -_0811CBD8: +@0811CBD8: ldr r1, [r4] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0811CC00 -_0811CBE2: + b @0811CC00 +@0811CBE2: bl sub_811DE10 lsls r0, 24 cmp r0, 0 - bne _0811CC00 + bne @0811CC00 bl sub_811E64C bl sub_811E794 ldr r1, [r4] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_0811CBFC: +@0811CBFC: movs r0, 0 - b _0811CC02 -_0811CC00: + b @0811CC02 +@0811CC00: movs r0, 0x1 -_0811CC02: +@0811CC02: pop {r4} pop {r1} bx r1 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] ldrh r0, [r0] cmp r0, 0x1 - beq _0811CC34 + beq @0811CC34 cmp r0, 0x1 - bgt _0811CC24 + bgt @0811CC24 cmp r0, 0 - beq _0811CC2E - b _0811CC86 + beq @0811CC2E + b @0811CC86 .align 2, 0 .pool -_0811CC24: +@0811CC24: cmp r0, 0x2 - beq _0811CC64 + beq @0811CC64 cmp r0, 0x3 - beq _0811CC82 - b _0811CC86 -_0811CC2E: + beq @0811CC82 + b @0811CC86 +@0811CC2E: bl sub_811D7EC - b _0811CC5A -_0811CC34: + b @0811CC5A +@0811CC34: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0811CC86 + bne @0811CC86 bl sub_811BBDC adds r4, r0, 0 bl sub_811DE48 @@ -545478,17 +545478,17 @@ _0811CC34: adds r0, r4, 0 movs r1, 0x8 bl sub_811DDAC -_0811CC5A: +@0811CC5A: ldr r1, [r5] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0811CC86 -_0811CC64: + b @0811CC86 +@0811CC64: bl sub_811DE10 lsls r0, 24 cmp r0, 0 - bne _0811CC86 + bne @0811CC86 bl sub_811E30C bl sub_811E64C bl sub_811E794 @@ -545496,46 +545496,46 @@ _0811CC64: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_0811CC82: +@0811CC82: movs r0, 0 - b _0811CC88 -_0811CC86: + b @0811CC88 +@0811CC86: movs r0, 0x1 -_0811CC88: +@0811CC88: pop {r4,r5} pop {r1} bx r1 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] ldrh r0, [r0] cmp r0, 0x1 - beq _0811CCBC + beq @0811CCBC cmp r0, 0x1 - bgt _0811CCAC + bgt @0811CCAC cmp r0, 0 - beq _0811CCB6 - b _0811CD0A + beq @0811CCB6 + b @0811CD0A .align 2, 0 .pool -_0811CCAC: +@0811CCAC: cmp r0, 0x2 - beq _0811CCEC + beq @0811CCEC cmp r0, 0x3 - beq _0811CD06 - b _0811CD0A -_0811CCB6: + beq @0811CD06 + b @0811CD0A +@0811CCB6: bl sub_811D830 - b _0811CCE2 -_0811CCBC: + b @0811CCE2 +@0811CCBC: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0811CD0A + bne @0811CD0A bl sub_811BBDC adds r4, r0, 0 bl sub_811DE48 @@ -545547,48 +545547,48 @@ _0811CCBC: adds r0, r4, 0 movs r1, 0x8 bl sub_811DDAC -_0811CCE2: +@0811CCE2: ldr r1, [r5] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0811CD0A -_0811CCEC: + b @0811CD0A +@0811CCEC: bl sub_811DE10 lsls r0, 24 cmp r0, 0 - bne _0811CD0A + bne @0811CD0A bl sub_811E64C bl sub_811E794 ldr r1, [r5] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_0811CD06: +@0811CD06: movs r0, 0 - b _0811CD0C -_0811CD0A: + b @0811CD0C +@0811CD0A: movs r0, 0x1 -_0811CD0C: +@0811CD0C: pop {r4,r5} pop {r1} bx r1 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] ldrh r0, [r0] cmp r0, 0 - beq _0811CD2C + beq @0811CD2C cmp r0, 0x1 - beq _0811CD40 - b _0811CD4A + beq @0811CD40 + b @0811CD4A .align 2, 0 .pool -_0811CD2C: +@0811CD2C: bl sub_811DF90 movs r0, 0x4 bl sub_811D104 @@ -545596,34 +545596,34 @@ _0811CD2C: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0811CD4A -_0811CD40: + b @0811CD4A +@0811CD40: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 - b _0811CD4C -_0811CD4A: + b @0811CD4C +@0811CD4A: movs r0, 0x1 -_0811CD4C: +@0811CD4C: pop {r4} pop {r1} bx r1 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] ldrh r0, [r0] cmp r0, 0 - beq _0811CD6C + beq @0811CD6C cmp r0, 0x1 - beq _0811CD80 - b _0811CD8A + beq @0811CD80 + b @0811CD8A .align 2, 0 .pool -_0811CD6C: +@0811CD6C: bl sub_811DF90 movs r0, 0x5 bl sub_811D104 @@ -545631,34 +545631,34 @@ _0811CD6C: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0811CD8A -_0811CD80: + b @0811CD8A +@0811CD80: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 - b _0811CD8C -_0811CD8A: + b @0811CD8C +@0811CD8A: movs r0, 0x1 -_0811CD8C: +@0811CD8C: pop {r4} pop {r1} bx r1 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] ldrh r0, [r0] cmp r0, 0 - beq _0811CDAC + beq @0811CDAC cmp r0, 0x1 - beq _0811CDC0 - b _0811CDCA + beq @0811CDC0 + b @0811CDCA .align 2, 0 .pool -_0811CDAC: +@0811CDAC: bl sub_811DF90 movs r0, 0x6 bl sub_811D104 @@ -545666,34 +545666,34 @@ _0811CDAC: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0811CDCA -_0811CDC0: + b @0811CDCA +@0811CDC0: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 - b _0811CDCC -_0811CDCA: + b @0811CDCC +@0811CDCA: movs r0, 0x1 -_0811CDCC: +@0811CDCC: pop {r4} pop {r1} bx r1 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] ldrh r0, [r0] cmp r0, 0 - beq _0811CDEC + beq @0811CDEC cmp r0, 0x1 - beq _0811CE00 - b _0811CE0A + beq @0811CE00 + b @0811CE0A .align 2, 0 .pool -_0811CDEC: +@0811CDEC: bl sub_811DF90 movs r0, 0x7 bl sub_811D104 @@ -545701,34 +545701,34 @@ _0811CDEC: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0811CE0A -_0811CE00: + b @0811CE0A +@0811CE00: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 - b _0811CE0C -_0811CE0A: + b @0811CE0C +@0811CE0A: movs r0, 0x1 -_0811CE0C: +@0811CE0C: pop {r4} pop {r1} bx r1 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] ldrh r0, [r0] cmp r0, 0 - beq _0811CE2C + beq @0811CE2C cmp r0, 0x1 - beq _0811CE40 - b _0811CE4A + beq @0811CE40 + b @0811CE4A .align 2, 0 .pool -_0811CE2C: +@0811CE2C: bl sub_811DF90 movs r0, 0x8 bl sub_811D104 @@ -545736,34 +545736,34 @@ _0811CE2C: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0811CE4A -_0811CE40: + b @0811CE4A +@0811CE40: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 - b _0811CE4C -_0811CE4A: + b @0811CE4C +@0811CE4A: movs r0, 0x1 -_0811CE4C: +@0811CE4C: pop {r4} pop {r1} bx r1 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] ldrh r0, [r0] cmp r0, 0 - beq _0811CE6C + beq @0811CE6C cmp r0, 0x1 - beq _0811CE80 - b _0811CE8A + beq @0811CE80 + b @0811CE8A .align 2, 0 .pool -_0811CE6C: +@0811CE6C: bl sub_811DF90 movs r0, 0x9 bl sub_811D104 @@ -545771,22 +545771,22 @@ _0811CE6C: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _0811CE8A -_0811CE80: + b @0811CE8A +@0811CE80: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 - b _0811CE8C -_0811CE8A: + b @0811CE8C +@0811CE8A: movs r0, 0x1 -_0811CE8C: +@0811CE8C: pop {r4} pop {r1} bx r1 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 @@ -545795,7 +545795,7 @@ sub_811CE94: @ 811CE94 adds r2, r0, 0 str r2, [r4] cmp r2, 0 - beq _0811CEFC + beq @0811CEFC movs r1, 0 strh r1, [r2] movs r3, 0xB6 @@ -545833,19 +545833,19 @@ sub_811CE94: @ 811CE94 ldr r1, [r4] strb r0, [r1, 0xA] movs r0, 0x1 - b _0811CEFE + b @0811CEFE .align 2, 0 .pool -_0811CEFC: +@0811CEFC: movs r0, 0 -_0811CEFE: +@0811CEFE: pop {r4} pop {r1} bx r1 thumb_func_end sub_811CE94 thumb_func_start sub_811CF04 -sub_811CF04: @ 811CF04 +sub_811CF04: ; 811CF04 push {lr} movs r0, 0x3 movs r1, 0 @@ -545888,7 +545888,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, =0x08dcbdb0 @@ -545928,13 +545928,13 @@ 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 adds r5, r0, 0 cmp r5, 0 - beq _0811D020 + beq @0811D020 movs r0, 0x1 adds r1, r5, 0 movs r2, 0x90 @@ -545965,7 +545965,7 @@ sub_811CFCC: @ 811CFCC movs r0, 0 movs r1, 0x3 bl Window_CopyToVram -_0811D020: +@0811D020: add sp, 0x14 pop {r4,r5} pop {r0} @@ -545973,7 +545973,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] @@ -546000,7 +546000,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 @@ -546053,7 +546053,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 @@ -546087,7 +546087,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 @@ -546096,90 +546096,90 @@ sub_811D104: @ 811D104 str r0, [sp, 0x10] str r0, [sp, 0xC] cmp r1, 0x9 - bhi _0811D1BC + bhi @0811D1BC lsls r0, r1, 2 - ldr r1, =_0811D124 + ldr r1, =@0811D124 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0811D124: - .4byte _0811D14C - .4byte _0811D16A - .4byte _0811D156 - .4byte _0811D160 - .4byte _0811D174 - .4byte _0811D180 - .4byte _0811D18C - .4byte _0811D19C - .4byte _0811D1A8 - .4byte _0811D1B4 -_0811D14C: +@0811D124: + .4byte @0811D14C + .4byte @0811D16A + .4byte @0811D156 + .4byte @0811D160 + .4byte @0811D174 + .4byte @0811D180 + .4byte @0811D18C + .4byte @0811D19C + .4byte @0811D1A8 + .4byte @0811D1B4 +@0811D14C: add r1, sp, 0x10 add r0, sp, 0xC bl sub_811BAD0 - b _0811D1BC -_0811D156: + b @0811D1BC +@0811D156: add r1, sp, 0x10 add r0, sp, 0xC bl sub_811BB40 - b _0811D1BC -_0811D160: + b @0811D1BC +@0811D160: add r1, sp, 0x10 add r0, sp, 0xC bl sub_811BB08 - b _0811D1BC -_0811D16A: + b @0811D1BC +@0811D16A: add r1, sp, 0x10 add r0, sp, 0xC bl sub_811BB88 - b _0811D1BC -_0811D174: + b @0811D1BC +@0811D174: ldr r0, =0x085ec743 str r0, [sp, 0xC] - b _0811D1BC + b @0811D1BC .align 2, 0 .pool -_0811D180: +@0811D180: ldr r0, =0x085ec752 str r0, [sp, 0xC] - b _0811D1BC + b @0811D1BC .align 2, 0 .pool -_0811D18C: +@0811D18C: ldr r0, =0x085ec4c9 str r0, [sp, 0xC] ldr r0, =0x085ec4e9 - b _0811D1BA + b @0811D1BA .align 2, 0 .pool -_0811D19C: +@0811D19C: ldr r0, =0x085ec765 str r0, [sp, 0xC] - b _0811D1BC + b @0811D1BC .align 2, 0 .pool -_0811D1A8: +@0811D1A8: ldr r0, =0x085ec520 str r0, [sp, 0xC] - b _0811D1BC + b @0811D1BC .align 2, 0 .pool -_0811D1B4: +@0811D1B4: ldr r0, =0x085ec672 str r0, [sp, 0xC] ldr r0, =0x085ec688 -_0811D1BA: +@0811D1BA: str r0, [sp, 0x10] -_0811D1BC: +@0811D1BC: movs r0, 0x1 movs r1, 0x11 bl Window_FastFillPixels ldr r2, [sp, 0xC] cmp r2, 0 - beq _0811D1E0 + beq @0811D1E0 movs r0, 0x1 str r0, [sp] movs r0, 0xFF @@ -546190,10 +546190,10 @@ _0811D1BC: movs r1, 0x1 movs r3, 0 bl sub_811D028 -_0811D1E0: +@0811D1E0: ldr r2, [sp, 0x10] cmp r2, 0 - beq _0811D1FC + beq @0811D1FC movs r0, 0x11 str r0, [sp] movs r0, 0xFF @@ -546204,7 +546204,7 @@ _0811D1E0: movs r1, 0x1 movs r3, 0 bl sub_811D028 -_0811D1FC: +@0811D1FC: movs r0, 0x1 movs r1, 0x3 bl Window_CopyToVram @@ -546216,7 +546216,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 @@ -546232,7 +546232,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 @@ -546296,7 +546296,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 @@ -546319,10 +546319,10 @@ sub_811D2C8: @ 811D2C8 movs r0, 0 mov r8, r0 cmp r6, 0x7 - bne _0811D302 + bne @0811D302 movs r1, 0x1 mov r8, r1 -_0811D302: +@0811D302: ldr r0, =0x0203a11c ldr r0, [r0] ldrb r0, [r0, 0x2] @@ -546331,19 +546331,19 @@ _0811D302: movs r7, 0 ldr r0, [sp, 0x14] cmp r7, r0 - bge _0811D402 -_0811D316: + bge @0811D402 +@0811D316: add r0, sp, 0xC ldr r1, =0x08597c8c movs r2, 0x4 bl memcpy mov r1, r8 cmp r1, 0 - beq _0811D32C + beq @0811D32C add r1, sp, 0xC movs r0, 0x6 strb r0, [r1, 0x2] -_0811D32C: +@0811D32C: ldr r0, =0x0203a11c ldr r1, [r0] adds r2, r1, 0 @@ -546359,27 +546359,27 @@ _0811D32C: mov r9, r0 adds r1, r7, 0x1 mov r10, r1 - b _0811D3CE + b @0811D3CE .align 2, 0 .pool -_0811D358: +@0811D358: ldrh r0, [r4] ldr r1, =0x0000ffff cmp r0, r1 - beq _0811D374 + beq @0811D374 adds r1, r0, 0 adds r0, r2, 0 bl sub_811EBBC adds r2, r0, 0 adds r4, 0x2 - b _0811D3A2 + b @0811D3A2 .align 2, 0 .pool -_0811D374: +@0811D374: adds r4, 0x2 mov r0, r8 cmp r0, 0 - bne _0811D3A8 + bne @0811D3A8 adds r0, r2, 0 movs r1, 0 movs r2, 0x4 @@ -546387,48 +546387,48 @@ _0811D374: adds r2, r0, 0 movs r1, 0xAE movs r0, 0xB -_0811D38C: +@0811D38C: strb r1, [r2] adds r2, 0x1 subs r0, 0x1 cmp r0, 0 - bge _0811D38C + bge @0811D38C adds r0, r2, 0 movs r1, 0 movs r2, 0x2 bl sub_80091EC adds r2, r0, 0 -_0811D3A2: +@0811D3A2: mov r1, r8 cmp r1, 0 - beq _0811D3AE -_0811D3A8: + beq @0811D3AE +@0811D3A8: add r1, sp, 0xC movs r0, 0x3 strb r0, [r1, 0x2] -_0811D3AE: +@0811D3AE: adds r0, r2, 0 add r1, sp, 0xC bl gf_strcat adds r2, r0, 0 cmp r6, 0x2 - beq _0811D3C4 + beq @0811D3C4 cmp r6, 0x7 - beq _0811D3C4 + beq @0811D3C4 cmp r6, 0x8 - bne _0811D3CC -_0811D3C4: + bne @0811D3CC +@0811D3C4: cmp r5, 0 - bne _0811D3CC + bne @0811D3CC cmp r7, 0x4 - beq _0811D3D4 -_0811D3CC: + beq @0811D3D4 +@0811D3CC: adds r5, 0x1 -_0811D3CE: +@0811D3CE: ldr r0, [sp, 0x10] cmp r5, r0 - blt _0811D358 -_0811D3D4: + blt @0811D358 +@0811D3D4: movs r0, 0xFF strb r0, [r2] ldr r0, =0x0203a11c @@ -546450,8 +546450,8 @@ _0811D3D4: mov r7, r10 ldr r1, [sp, 0x14] cmp r7, r1 - blt _0811D316 -_0811D402: + blt @0811D316 +@0811D402: ldr r0, =0x0203a11c ldr r0, [r0] ldrb r0, [r0, 0x2] @@ -546470,7 +546470,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 @@ -546488,10 +546488,10 @@ sub_811D424: @ 811D424 mov r1, r8 bl CpuFastSet cmp r6, 0x2 - beq _0811D450 + beq @0811D450 cmp r6, 0x8 - bne _0811D4D4 -_0811D450: + bne @0811D4D4 +@0811D450: ldr r0, =0x08597c30 lsls r2, r6, 2 adds r2, r0 @@ -546507,11 +546507,11 @@ _0811D450: mov r12, r2 adds r6, r0, 0 cmp r6, r12 - blt _0811D472 - b _0811D5D6 -_0811D472: + blt @0811D472 + b @0811D5D6 +@0811D472: mov r9, r3 -_0811D474: +@0811D474: mov r0, r9 lsrs r3, r0, 27 subs r7, r3, 0x1 @@ -546526,7 +546526,7 @@ _0811D474: adds r3, r2, 0 adds r4, r6, 0x1 cmp r7, r5 - bge _0811D4AE + bge @0811D4AE movs r0, 0x80 lsls r0, 5 adds r2, r0, 0 @@ -546535,14 +546535,14 @@ _0811D474: add r0, r8 adds r0, r1, r0 subs r7, r5, r7 -_0811D4A2: +@0811D4A2: strh r2, [r0] adds r0, 0x2 subs r7, 0x1 cmp r7, 0 - bne _0811D4A2 + bne @0811D4A2 adds r7, r5, 0 -_0811D4AE: +@0811D4AE: adds r0, r3, r7 lsls r0, 1 add r0, r8 @@ -546551,11 +546551,11 @@ _0811D4AE: strh r1, [r0] adds r6, r4, 0 cmp r6, r12 - blt _0811D474 - b _0811D5D6 + blt @0811D474 + b @0811D5D6 .align 2, 0 .pool -_0811D4D4: +@0811D4D4: ldr r4, =0x08597c30 mov r10, r4 lsls r6, 2 @@ -546585,7 +546585,7 @@ _0811D4D4: strh r1, [r0] adds r7, r4, 0 cmp r7, r5 - bge _0811D52A + bge @0811D52A ldr r4, =0x00001002 adds r2, r4, 0 lsls r1, r7, 1 @@ -546593,14 +546593,14 @@ _0811D4D4: add r0, r8 adds r1, r0 subs r7, r5, r7 -_0811D51E: +@0811D51E: strh r2, [r1] adds r1, 0x2 subs r7, 0x1 cmp r7, 0 - bne _0811D51E + bne @0811D51E adds r7, r5, 0 -_0811D52A: +@0811D52A: lsls r0, r6, 5 adds r0, r7 lsls r0, 1 @@ -546610,12 +546610,12 @@ _0811D52A: strh r1, [r0] adds r6, 0x1 cmp r6, r12 - bge _0811D590 + bge @0811D590 ldr r0, =0x08597c30 add r0, r9 ldrb r0, [r0] lsls r3, r0, 27 -_0811D546: +@0811D546: lsrs r0, r3, 27 subs r7, r0, 0x1 lsls r1, r6, 5 @@ -546628,7 +546628,7 @@ _0811D546: adds r7, r0, 0 adds r4, r6, 0x1 cmp r7, r5 - bge _0811D57C + bge @0811D57C movs r0, 0x80 lsls r0, 5 adds r2, r0, 0 @@ -546637,14 +546637,14 @@ _0811D546: add r0, r8 adds r1, r0 subs r7, r5, r7 -_0811D570: +@0811D570: strh r2, [r1] adds r1, 0x2 subs r7, 0x1 cmp r7, 0 - bne _0811D570 + bne @0811D570 adds r7, r5, 0 -_0811D57C: +@0811D57C: lsls r0, r6, 5 adds r0, r7 lsls r0, 1 @@ -546654,8 +546654,8 @@ _0811D57C: strh r1, [r0] adds r6, r4, 0 cmp r6, r12 - blt _0811D546 -_0811D590: + blt @0811D546 +@0811D590: mov r0, r9 add r0, r10 ldrb r2, [r0] @@ -546671,7 +546671,7 @@ _0811D590: strh r1, [r0] adds r7, r2, 0 cmp r7, r5 - bge _0811D5CA + bge @0811D5CA ldr r0, =0x0000100a adds r2, r0, 0 lsls r1, r7, 1 @@ -546679,21 +546679,21 @@ _0811D590: add r0, r8 adds r0, r1, r0 subs r7, r5, r7 -_0811D5BE: +@0811D5BE: strh r2, [r0] adds r0, 0x2 subs r7, 0x1 cmp r7, 0 - bne _0811D5BE + bne @0811D5BE adds r7, r5, 0 -_0811D5CA: +@0811D5CA: adds r0, r3, r7 lsls r0, 1 add r0, r8 ldr r2, =0x0000100b adds r1, r2, 0 strh r1, [r0] -_0811D5D6: +@0811D5D6: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -546707,7 +546707,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 @@ -546720,27 +546720,27 @@ sub_811D60C: @ 811D60C adds r0, r1 ldrb r1, [r0, 0x3] cmp r1, 0x2 - beq _0811D63E + beq @0811D63E cmp r1, 0x2 - bgt _0811D638 + bgt @0811D638 cmp r1, 0x1 - beq _0811D64C - b _0811D67C + beq @0811D64C + b @0811D67C .align 2, 0 .pool -_0811D638: +@0811D638: cmp r1, 0x3 - beq _0811D668 - b _0811D67C -_0811D63E: + beq @0811D668 + b @0811D67C +@0811D63E: movs r0, 0xA8 lsls r0, 3 adds r4, r0 movs r0, 0x20 str r0, [sp] str r1, [sp, 0x4] - b _0811D65A -_0811D64C: + b @0811D65A +@0811D64C: movs r0, 0xC0 lsls r0, 3 adds r4, r0 @@ -546748,14 +546748,14 @@ _0811D64C: str r0, [sp] movs r0, 0x2 str r0, [sp, 0x4] -_0811D65A: +@0811D65A: movs r0, 0x3 adds r1, r4, 0 movs r2, 0 movs r3, 0xB bl gpu_copy_to_iwram_tile_map_rect - b _0811D67C -_0811D668: + b @0811D67C +@0811D668: movs r0, 0x20 str r0, [sp] movs r0, 0x4 @@ -546765,7 +546765,7 @@ _0811D668: movs r2, 0 movs r3, 0xA bl gpu_copy_to_iwram_tile_map_rect -_0811D67C: +@0811D67C: add sp, 0x8 pop {r4} pop {r0} @@ -546773,7 +546773,7 @@ _0811D67C: thumb_func_end sub_811D60C thumb_func_start sub_811D684 -sub_811D684: @ 811D684 +sub_811D684: ; 811D684 push {lr} movs r0, 0x2 bl Window_WriteStandardTileMap @@ -546784,7 +546784,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 @@ -546792,21 +546792,21 @@ sub_811D698: @ 811D698 movs r1, 0x11 bl Window_FastFillPixels cmp r4, 0x1 - beq _0811D6BC + beq @0811D6BC cmp r4, 0x1 - bcc _0811D6B6 + bcc @0811D6B6 cmp r4, 0x2 - beq _0811D6C2 - b _0811D6C6 -_0811D6B6: + beq @0811D6C2 + b @0811D6C6 +@0811D6B6: bl sub_811D6F4 - b _0811D6C6 -_0811D6BC: + b @0811D6C6 +@0811D6BC: bl sub_811D758 - b _0811D6C6 -_0811D6C2: + b @0811D6C6 +@0811D6C2: bl sub_811D794 -_0811D6C6: +@0811D6C6: movs r0, 0x2 movs r1, 0x2 bl Window_CopyToVram @@ -546816,34 +546816,34 @@ _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 cmp r0, 0 - bne _0811D6E8 + bne @0811D6E8 movs r0, 0 bl sub_811D698 - b _0811D6EE -_0811D6E8: + b @0811D6EE +@0811D6E8: movs r0, 0x1 bl sub_811D698 -_0811D6EE: +@0811D6EE: pop {r0} bx r0 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 movs r7, 0x61 -_0811D6FC: +@0811D6FC: movs r4, 0 lsls r0, r7, 24 lsrs r6, r0, 24 -_0811D702: +@0811D702: lsls r0, r5, 24 lsrs r0, 24 adds r5, 0x1 @@ -546851,7 +546851,7 @@ _0811D702: lsls r0, 24 lsrs r0, 24 cmp r0, 0x16 - beq _0811D742 + beq @0811D742 bl sub_811F424 adds r2, r0, 0 movs r0, 0x54 @@ -546870,10 +546870,10 @@ _0811D702: bl sub_811D028 adds r4, 0x1 cmp r4, 0x1 - ble _0811D702 + ble @0811D702 adds r7, 0x10 - b _0811D6FC -_0811D742: + b @0811D6FC +@0811D742: bl sub_811BBBC lsls r0, 24 lsrs r0, 24 @@ -546886,14 +546886,14 @@ _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 movs r4, 0xC2 lsls r4, 23 ldr r6, =0x08597c90 -_0811D764: +@0811D764: ldm r6!, {r2} lsrs r0, r4, 24 str r0, [sp] @@ -546910,7 +546910,7 @@ _0811D764: adds r4, r0 adds r5, 0x1 cmp r5, 0x3 - bls _0811D764 + bls @0811D764 add sp, 0xC pop {r4-r6} pop {r0} @@ -546920,7 +546920,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 @@ -546930,7 +546930,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 @@ -546949,7 +546949,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 @@ -546967,7 +546967,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 @@ -546981,11 +546981,11 @@ sub_811D7EC: @ 811D7EC lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bls _0811D80E + bls @0811D80E adds r4, r0, 0 -_0811D80E: +@0811D80E: cmp r5, r4 - bcs _0811D828 + bcs @0811D828 subs r4, r5 lsls r4, 24 lsrs r4, 24 @@ -546995,14 +546995,14 @@ _0811D80E: adds r0, r5, 0 adds r1, r4, 0 bl sub_811D864 -_0811D828: +@0811D828: pop {r4,r5} pop {r0} bx r0 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 @@ -547011,7 +547011,7 @@ sub_811D830: @ 811D830 lsls r0, 24 lsrs r0, 24 cmp r5, r0 - bcs _0811D85C + bcs @0811D85C subs r4, r0, r5 lsls r4, 24 lsrs r4, 24 @@ -547021,14 +547021,14 @@ sub_811D830: @ 811D830 adds r0, r5, 0 adds r1, r4, 0 bl sub_811D864 -_0811D85C: +@0811D85C: pop {r4,r5} pop {r0} bx r0 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 @@ -547049,8 +547049,8 @@ sub_811D864: @ 811D864 ands r1, r0 adds r1, 0x1 movs r0, 0 - b _0811D930 -_0811D88E: + b @0811D930 +@0811D88E: movs r6, 0 movs r2, 0x10 adds r2, r1 @@ -547059,7 +547059,7 @@ _0811D88E: mov r10, r0 lsls r0, r1, 24 lsrs r7, r0, 24 -_0811D89E: +@0811D89E: mov r1, r8 lsls r0, r1, 16 lsrs r0, 16 @@ -547070,7 +547070,7 @@ _0811D89E: lsrs r4, r0, 16 ldr r0, =0x0000ffff cmp r4, r0 - beq _0811D926 + beq @0811D926 ldr r5, =0x0203a11c ldr r0, [r5] adds r0, 0xCC @@ -547081,7 +547081,7 @@ _0811D89E: bl sub_811BF88 adds r1, r0, 0 cmp r1, 0 - bne _0811D8FC + bne @0811D8FC ldr r2, [r5] adds r2, 0xCC movs r0, 0xD @@ -547097,10 +547097,10 @@ _0811D89E: movs r0, 0x2 movs r1, 0x1 bl sub_811D028 - b _0811D926 + b @0811D926 .align 2, 0 .pool -_0811D8FC: +@0811D8FC: ldr r2, [r5] adds r2, 0xCC movs r0, 0xD @@ -547121,16 +547121,16 @@ _0811D8FC: movs r0, 0x2 movs r1, 0x1 bl sub_811D058 -_0811D926: +@0811D926: adds r6, 0x1 cmp r6, 0x1 - ble _0811D89E + ble @0811D89E mov r1, r9 mov r0, r10 -_0811D930: +@0811D930: ldr r2, [sp, 0x14] cmp r0, r2 - blt _0811D88E + blt @0811D88E movs r0, 0x2 movs r1, 0x2 bl Window_CopyToVram @@ -547145,7 +547145,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 @@ -547158,18 +547158,18 @@ sub_811D950: @ 811D950 lsrs r0, r1, 20 adds r1, r3, r0 cmp r1, 0xFF - ble _0811D97C + ble @0811D97C ldr r0, =0xffffff00 adds r4, r1, r0 movs r0, 0x80 lsls r0, 1 subs r0, r3 - b _0811D97E + b @0811D97E .align 2, 0 .pool -_0811D97C: +@0811D97C: movs r4, 0 -_0811D97E: +@0811D97E: movs r5, 0xE0 str r5, [sp] lsls r0, 16 @@ -547180,7 +547180,7 @@ _0811D97E: movs r2, 0 bl Window_FillPixelRect cmp r4, 0 - beq _0811D9AA + beq @0811D9AA str r5, [sp] lsls r0, r4, 16 lsrs r0, 16 @@ -547190,7 +547190,7 @@ _0811D97E: movs r2, 0 movs r3, 0 bl Window_FillPixelRect -_0811D9AA: +@0811D9AA: add sp, 0x8 pop {r4,r5} pop {r0} @@ -547198,7 +547198,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 @@ -547211,97 +547211,97 @@ 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 - bhi _0811DA86 + bhi @0811DA86 lsls r0, 2 - ldr r1, =_0811D9E8 + ldr r1, =@0811D9E8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0811D9E8: - .4byte _0811DA04 - .4byte _0811DA18 - .4byte _0811DA28 - .4byte _0811DA3C - .4byte _0811DA50 - .4byte _0811DA64 - .4byte _0811DA78 -_0811DA04: +@0811D9E8: + .4byte @0811DA04 + .4byte @0811DA18 + .4byte @0811DA28 + .4byte @0811DA3C + .4byte @0811DA50 + .4byte @0811DA64 + .4byte @0811DA78 +@0811DA04: ldr r1, =0x0203a11c ldr r2, [r1] movs r0, 0 strb r0, [r2, 0x6] ldr r2, [r1] movs r0, 0xA - b _0811DA84 + b @0811DA84 .align 2, 0 .pool -_0811DA18: +@0811DA18: ldr r1, =0x0203a11c ldr r2, [r1] movs r3, 0 movs r0, 0x9 - b _0811DA44 + b @0811DA44 .align 2, 0 .pool -_0811DA28: +@0811DA28: ldr r1, =0x0203a11c ldr r2, [r1] movs r0, 0xB strb r0, [r2, 0x6] ldr r2, [r1] movs r0, 0x11 - b _0811DA84 + b @0811DA84 .align 2, 0 .pool -_0811DA3C: +@0811DA3C: ldr r1, =0x0203a11c ldr r2, [r1] movs r3, 0 movs r0, 0x11 -_0811DA44: +@0811DA44: strb r0, [r2, 0x6] ldr r0, [r1] strb r3, [r0, 0x7] - b _0811DA86 + b @0811DA86 .align 2, 0 .pool -_0811DA50: +@0811DA50: ldr r1, =0x0203a11c ldr r2, [r1] movs r0, 0x11 strb r0, [r2, 0x6] ldr r2, [r1] movs r0, 0xA - b _0811DA84 + b @0811DA84 .align 2, 0 .pool -_0811DA64: +@0811DA64: ldr r1, =0x0203a11c ldr r2, [r1] movs r0, 0x12 strb r0, [r2, 0x6] ldr r2, [r1] movs r0, 0x16 - b _0811DA84 + b @0811DA84 .align 2, 0 .pool -_0811DA78: +@0811DA78: ldr r1, =0x0203a11c ldr r2, [r1] movs r0, 0x16 strb r0, [r2, 0x6] ldr r2, [r1] movs r0, 0x12 -_0811DA84: +@0811DA84: strb r0, [r2, 0x7] -_0811DA86: +@0811DA86: ldr r1, [r1] ldrb r0, [r1, 0x6] movs r3, 0x1 @@ -547309,9 +547309,9 @@ _0811DA86: adds r2, r3, 0 ldrb r3, [r1, 0x7] cmp r0, r3 - bcs _0811DA98 + bcs @0811DA98 movs r2, 0x1 -_0811DA98: +@0811DA98: strb r2, [r1, 0x8] pop {r0} bx r0 @@ -547320,14 +547320,14 @@ _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] ldrb r2, [r1, 0x6] ldrb r0, [r1, 0x7] cmp r2, r0 - beq _0811DAD4 + beq @0811DAD4 ldrb r0, [r1, 0x8] adds r0, r2, r0 strb r0, [r1, 0x6] @@ -547341,19 +547341,19 @@ sub_811DAA4: @ 811DAA4 negs r0, r1 orrs r0, r1 lsrs r0, 31 - b _0811DAD6 + b @0811DAD6 .align 2, 0 .pool -_0811DAD4: +@0811DAD4: movs r0, 0 -_0811DAD6: +@0811DAD6: pop {r4} pop {r1} bx r1 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 @@ -547368,145 +547368,145 @@ sub_811DADC: @ 811DADC movs r3, 0xA bl bg_fill_tilemap_rect cmp r4, 0x16 - bls _0811DAFE - b _0811DC1A -_0811DAFE: + bls @0811DAFE + b @0811DC1A +@0811DAFE: lsls r0, r4, 2 - ldr r1, =_0811DB0C + ldr r1, =@0811DB0C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0811DB0C: - .4byte _0811DC1A - .4byte _0811DB68 - .4byte _0811DB70 - .4byte _0811DB78 - .4byte _0811DB80 - .4byte _0811DB88 - .4byte _0811DB90 - .4byte _0811DC00 - .4byte _0811DBF2 - .4byte _0811DBE4 - .4byte _0811DBD6 - .4byte _0811DB9E - .4byte _0811DBA6 - .4byte _0811DBAE - .4byte _0811DBB6 - .4byte _0811DBBE - .4byte _0811DBC6 - .4byte _0811DBCE - .4byte _0811DBD6 - .4byte _0811DBE4 - .4byte _0811DBF2 - .4byte _0811DC00 - .4byte _0811DC0E -_0811DB68: +@0811DB0C: + .4byte @0811DC1A + .4byte @0811DB68 + .4byte @0811DB70 + .4byte @0811DB78 + .4byte @0811DB80 + .4byte @0811DB88 + .4byte @0811DB90 + .4byte @0811DC00 + .4byte @0811DBF2 + .4byte @0811DBE4 + .4byte @0811DBD6 + .4byte @0811DB9E + .4byte @0811DBA6 + .4byte @0811DBAE + .4byte @0811DBB6 + .4byte @0811DBBE + .4byte @0811DBC6 + .4byte @0811DBCE + .4byte @0811DBD6 + .4byte @0811DBE4 + .4byte @0811DBF2 + .4byte @0811DC00 + .4byte @0811DC0E +@0811DB68: movs r0, 0xB movs r1, 0xE movs r2, 0x3 - b _0811DB96 -_0811DB70: + b @0811DB96 +@0811DB70: movs r0, 0x9 movs r1, 0xE movs r2, 0x7 - b _0811DB96 -_0811DB78: + b @0811DB96 +@0811DB78: movs r0, 0x7 movs r1, 0xE movs r2, 0xB - b _0811DB96 -_0811DB80: + b @0811DB96 +@0811DB80: movs r0, 0x5 movs r1, 0xE movs r2, 0xF - b _0811DB96 -_0811DB88: + b @0811DB96 +@0811DB88: movs r0, 0x3 movs r1, 0xE movs r2, 0x13 - b _0811DB96 -_0811DB90: + b @0811DB96 +@0811DB90: movs r0, 0x1 movs r1, 0xE movs r2, 0x17 -_0811DB96: +@0811DB96: movs r3, 0x2 bl sub_811DC28 - b _0811DC1A -_0811DB9E: + b @0811DC1A +@0811DB9E: movs r0, 0x1 movs r1, 0xA movs r2, 0x18 - b _0811DBDC -_0811DBA6: + b @0811DBDC +@0811DBA6: movs r0, 0x1 movs r1, 0xA movs r2, 0x19 - b _0811DBDC -_0811DBAE: + b @0811DBDC +@0811DBAE: movs r0, 0x1 movs r1, 0xA movs r2, 0x1A - b _0811DBDC -_0811DBB6: + b @0811DBDC +@0811DBB6: movs r0, 0x1 movs r1, 0xA movs r2, 0x1B - b _0811DBDC -_0811DBBE: + b @0811DBDC +@0811DBBE: movs r0, 0x1 movs r1, 0xA movs r2, 0x1C - b _0811DBDC -_0811DBC6: + b @0811DBDC +@0811DBC6: movs r0, 0x1 movs r1, 0xA movs r2, 0x1D - b _0811DBDC -_0811DBCE: + b @0811DBDC +@0811DBCE: movs r0, 0 movs r1, 0xA movs r2, 0x1E - b _0811DBDC -_0811DBD6: + b @0811DBDC +@0811DBD6: movs r0, 0x1 movs r1, 0xA movs r2, 0x17 -_0811DBDC: +@0811DBDC: movs r3, 0xA bl sub_811DC28 - b _0811DC1A -_0811DBE4: + b @0811DC1A +@0811DBE4: movs r0, 0x1 movs r1, 0xB movs r2, 0x17 movs r3, 0x8 bl sub_811DC28 - b _0811DC1A -_0811DBF2: + b @0811DC1A +@0811DBF2: movs r0, 0x1 movs r1, 0xC movs r2, 0x17 movs r3, 0x6 bl sub_811DC28 - b _0811DC1A -_0811DC00: + b @0811DC1A +@0811DC00: movs r0, 0x1 movs r1, 0xD movs r2, 0x17 movs r3, 0x4 bl sub_811DC28 - b _0811DC1A -_0811DC0E: + b @0811DC1A +@0811DC0E: movs r0, 0x1 movs r1, 0xE movs r2, 0x17 movs r3, 0x2 bl sub_811DC28 -_0811DC1A: +@0811DC1A: movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram add sp, 0x8 @@ -547516,7 +547516,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 @@ -547549,7 +547549,7 @@ sub_811DC28: @ 811DC28 strh r1, [r0] adds r2, 0x1 cmp r2, r5 - bge _0811DC84 + bge @0811DC84 ldr r0, =0x00004002 adds r4, r0, 0 lsls r1, r2, 1 @@ -547557,14 +547557,14 @@ sub_811DC28: @ 811DC28 adds r0, r6 adds r1, r0 subs r2, r5, r2 -_0811DC78: +@0811DC78: strh r4, [r1] adds r1, 0x2 subs r2, 0x1 cmp r2, 0 - bne _0811DC78 + bne @0811DC78 adds r2, r5, 0 -_0811DC84: +@0811DC84: lsls r0, r3, 5 adds r0, r2 lsls r0, 1 @@ -547584,10 +547584,10 @@ _0811DC84: negs r2, r2 add r10, r2 cmp r3, r8 - bge _0811DCF4 + bge @0811DCF4 lsls r7, r4, 1 mov r9, r7 -_0811DCB0: +@0811DCB0: lsls r0, r3, 5 add r0, r12 lsls r0, 1 @@ -547598,7 +547598,7 @@ _0811DCB0: adds r2, r4, 0 adds r7, r3, 0x1 cmp r4, r5 - bge _0811DCE0 + bge @0811DCE0 movs r0, 0x80 lsls r0, 7 adds r1, r0, 0 @@ -547606,14 +547606,14 @@ _0811DCB0: adds r0, r6 add r0, r9 subs r2, r5, r4 -_0811DCD4: +@0811DCD4: strh r1, [r0] adds r0, 0x2 subs r2, 0x1 cmp r2, 0 - bne _0811DCD4 + bne @0811DCD4 adds r2, r5, 0 -_0811DCE0: +@0811DCE0: lsls r0, r3, 5 adds r0, r2 lsls r0, 1 @@ -547623,8 +547623,8 @@ _0811DCE0: strh r1, [r0] adds r3, r7, 0 cmp r3, r8 - blt _0811DCB0 -_0811DCF4: + blt @0811DCB0 +@0811DCF4: lsls r0, r3, 5 mov r7, r12 adds r1, r0, r7 @@ -547636,7 +547636,7 @@ _0811DCF4: adds r2, r4, 0 mov r12, r0 cmp r4, r5 - bge _0811DD26 + bge @0811DD26 ldr r0, =0x0000400a adds r7, r0, 0 lsls r1, r4, 1 @@ -547644,14 +547644,14 @@ _0811DCF4: adds r0, r6 adds r0, r1, r0 subs r2, r5, r4 -_0811DD1A: +@0811DD1A: strh r7, [r0] adds r0, 0x2 subs r2, 0x1 cmp r2, 0 - bne _0811DD1A + bne @0811DD1A adds r2, r5, 0 -_0811DD26: +@0811DD26: mov r1, r12 adds r0, r1, r2 lsls r0, 1 @@ -547684,7 +547684,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 @@ -547704,7 +547704,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 @@ -547726,7 +547726,7 @@ sub_811DDAC: @ 811DDAC lsls r0, r4, 8 adds r2, r0 cmp r5, 0 - beq _0811DE00 + beq @0811DE00 movs r1, 0xB4 lsls r1, 2 adds r0, r3, r1 @@ -547737,25 +547737,25 @@ sub_811DDAC: @ 811DDAC lsls r0, r5, 8 str r0, [r1] cmp r4, 0 - bge _0811DE0A + bge @0811DE0A negs r0, r0 str r0, [r1] - b _0811DE0A + b @0811DE0A .align 2, 0 .pool -_0811DE00: +@0811DE00: movs r0, 0x2 adds r1, r2, 0 movs r2, 0 bl bg_change_y_offset -_0811DE0A: +@0811DE0A: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_811DDAC thumb_func_start sub_811DE10 -sub_811DE10: @ 811DE10 +sub_811DE10: ; 811DE10 push {lr} movs r0, 0x2 bl bg_get_y_offset @@ -547766,7 +547766,7 @@ sub_811DE10: @ 811DE10 adds r1, r2, r3 ldr r1, [r1] cmp r0, r1 - beq _0811DE40 + beq @0811DE40 movs r1, 0xB5 lsls r1, 2 adds r0, r2, r1 @@ -547775,18 +547775,18 @@ sub_811DE10: @ 811DE10 movs r2, 0x1 bl bg_change_y_offset movs r0, 0x1 - b _0811DE42 + b @0811DE42 .align 2, 0 .pool -_0811DE40: +@0811DE40: movs r0, 0 -_0811DE42: +@0811DE42: pop {r1} bx r1 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 @@ -547798,7 +547798,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 @@ -547826,7 +547826,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, =0x08597ca0 bl gpu_tile_obj_alloc_and_load_multiple @@ -547834,13 +547834,13 @@ sub_811DE90: @ 811DE90 bl gpu_pal_obj_alloc_and_load_multiple movs r5, 0 ldr r4, =0x08597ce8 -_0811DEA2: +@0811DEA2: adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load adds r4, 0x8 adds r5, 0x1 cmp r5, 0x3 - bls _0811DEA2 + bls @0811DEA2 pop {r4,r5} pop {r0} bx r0 @@ -547849,7 +547849,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 @@ -547894,20 +547894,20 @@ 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 ldrsh r0, [r1, r2] cmp r0, 0 - beq _0811DF56 + beq @0811DF56 ldrh r0, [r1, 0x2E] adds r0, 0x1 strh r0, [r1, 0x2E] lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - ble _0811DF56 + ble @0811DF56 movs r0, 0 strh r0, [r1, 0x2E] ldrh r0, [r1, 0x24] @@ -547915,10 +547915,10 @@ sub_811DF28: @ 811DF28 strh r0, [r1, 0x24] lsls r0, 16 cmp r0, 0 - ble _0811DF56 + ble @0811DF56 ldr r0, =0x0000fffa strh r0, [r1, 0x24] -_0811DF56: +@0811DF56: pop {r0} bx r0 .align 2, 0 @@ -547926,7 +547926,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 @@ -547954,7 +547954,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 @@ -547973,7 +547973,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 @@ -547988,7 +547988,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} @@ -548050,7 +548050,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] @@ -548079,7 +548079,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 @@ -548089,12 +548089,12 @@ sub_811E088: @ 811E088 adds r0, r1, r2 ldr r0, [r0] cmp r0, 0 - beq _0811E0E4 + beq @0811E0E4 adds r2, 0x4 adds r0, r1, r2 ldr r0, [r0] cmp r0, 0 - beq _0811E0E4 + beq @0811E0E4 mov r4, sp adds r4, 0x1 mov r0, sp @@ -548103,7 +548103,7 @@ sub_811E088: @ 811E088 bl sub_811BBB0 lsls r0, 24 cmp r0, 0 - bne _0811E0D4 + bne @0811E0D4 mov r0, sp ldrb r0, [r0] lsls r0, 24 @@ -548111,10 +548111,10 @@ sub_811E088: @ 811E088 movs r1, 0 ldrsb r1, [r4, r1] bl sub_811E0EC - b _0811E0E4 + b @0811E0E4 .align 2, 0 .pool -_0811E0D4: +@0811E0D4: mov r0, sp ldrb r0, [r0] lsls r0, 24 @@ -548122,7 +548122,7 @@ _0811E0D4: movs r1, 0 ldrsb r1, [r4, r1] bl sub_811E1A4 -_0811E0E4: +@0811E0E4: add sp, 0x4 pop {r4} pop {r0} @@ -548130,7 +548130,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} @@ -548141,7 +548141,7 @@ sub_811E0EC: @ 811E0EC movs r0, 0x1 negs r0, r0 cmp r5, r0 - beq _0811E150 + beq @0811E150 ldr r0, =0x0203a11c mov r8, r0 ldr r0, [r0] @@ -548175,10 +548175,10 @@ sub_811E0EC: @ 811E0EC adds r0, r6 ldr r1, [r0] strh r5, [r1, 0x20] - b _0811E192 + b @0811E192 .align 2, 0 .pool -_0811E150: +@0811E150: ldr r6, =0x0203a11c ldr r0, [r6] movs r4, 0xB7 @@ -548210,7 +548210,7 @@ _0811E150: ldr r1, [r0] mov r2, r8 strh r2, [r1, 0x20] -_0811E192: +@0811E192: ldr r0, [r0] strh r4, [r0, 0x22] pop {r3} @@ -548223,7 +548223,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} @@ -548235,7 +548235,7 @@ sub_811E1A4: @ 811E1A4 movs r0, 0x1 negs r0, r0 cmp r2, r0 - beq _0811E234 + beq @0811E234 lsls r0, r5, 24 asrs r1, r0, 24 lsls r0, r1, 4 @@ -548243,26 +548243,26 @@ sub_811E1A4: @ 811E1A4 mov r8, r0 movs r7, 0x20 cmp r2, 0x6 - bne _0811E1D6 + bne @0811E1D6 cmp r1, 0 - bne _0811E1D6 + bne @0811E1D6 movs r7, 0x9E movs r6, 0x2 - b _0811E1EC -_0811E1D6: + b @0811E1EC +@0811E1D6: ldr r3, =0x08597d08 lsls r1, r4, 24 lsrs r0, r1, 24 movs r2, 0 cmp r0, 0x6 - bhi _0811E1E4 + bhi @0811E1E4 asrs r2, r1, 24 -_0811E1E4: +@0811E1E4: adds r0, r2, r3 ldrb r0, [r0] adds r7, r0 movs r6, 0x3 -_0811E1EC: +@0811E1EC: ldr r5, =0x0203a11c ldr r0, [r5] movs r4, 0xB7 @@ -548291,10 +548291,10 @@ _0811E1EC: ldr r0, [r0] mov r1, r8 strh r1, [r0, 0x22] - b _0811E27A + b @0811E27A .align 2, 0 .pool -_0811E234: +@0811E234: ldr r6, =0x0203a11c ldr r0, [r6] movs r4, 0xB7 @@ -548328,7 +548328,7 @@ _0811E234: strh r2, [r1, 0x20] ldr r0, [r0] strh r4, [r0, 0x22] -_0811E27A: +@0811E27A: pop {r3} mov r8, r3 pop {r4-r7} @@ -548339,7 +548339,7 @@ _0811E27A: thumb_func_end sub_811E1A4 thumb_func_start sub_811E288 -sub_811E288: @ 811E288 +sub_811E288: ; 811E288 push {lr} ldr r0, =0x08597d18 movs r1, 0 @@ -548376,7 +548376,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] @@ -548385,7 +548385,7 @@ sub_811E2DC: @ 811E2DC lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - ble _0811E302 + ble @0811E302 movs r0, 0 strh r0, [r1, 0x2E] ldrh r0, [r1, 0x24] @@ -548393,10 +548393,10 @@ sub_811E2DC: @ 811E2DC strh r0, [r1, 0x24] lsls r0, 16 cmp r0, 0 - ble _0811E302 + ble @0811E302 ldr r0, =0x0000fffa strh r0, [r1, 0x24] -_0811E302: +@0811E302: pop {r0} bx r0 .align 2, 0 @@ -548404,7 +548404,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 @@ -548437,7 +548437,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 @@ -548450,7 +548450,7 @@ sub_811E34C: @ 811E34C adds r2, r0, r1 ldr r0, [r2] cmp r0, 0 - beq _0811E376 + beq @0811E376 movs r1, 0 strh r3, [r0, 0x20] ldr r0, [r2] @@ -548459,7 +548459,7 @@ sub_811E34C: @ 811E34C strh r1, [r0, 0x24] ldr r0, [r2] strh r1, [r0, 0x2E] -_0811E376: +@0811E376: pop {r4} pop {r0} bx r0 @@ -548468,7 +548468,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] @@ -548477,7 +548477,7 @@ sub_811E380: @ 811E380 adds r0, r1 ldr r0, [r0] cmp r0, 0 - beq _0811E3A2 + beq @0811E3A2 bl obj_delete_and_free_tiles ldr r0, [r4] movs r1, 0xB9 @@ -548485,7 +548485,7 @@ sub_811E380: @ 811E380 adds r0, r1 movs r1, 0 str r1, [r0] -_0811E3A2: +@0811E3A2: pop {r4} pop {r0} bx r0 @@ -548494,7 +548494,7 @@ _0811E3A2: thumb_func_end sub_811E380 thumb_func_start sub_811E3AC -sub_811E3AC: @ 811E3AC +sub_811E3AC: ; 811E3AC push {r4-r6,lr} ldr r0, =0x08597df0 movs r1, 0xD0 @@ -548542,20 +548542,20 @@ 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] ldrb r3, [r2, 0x9] cmp r3, 0 - beq _0811E430 + beq @0811E430 cmp r3, 0x1 - beq _0811E488 + beq @0811E488 movs r0, 0 - b _0811E4A6 + b @0811E4A6 .align 2, 0 .pool -_0811E430: +@0811E430: movs r0, 0xBA lsls r0, 2 adds r2, r0 @@ -548567,12 +548567,12 @@ _0811E430: movs r1, 0x24 ldrsh r0, [r2, r1] cmp r0, 0 - blt _0811E4A4 + blt @0811E4A4 strh r3, [r2, 0x24] bl sub_811BBB0 lsls r0, 24 cmp r0, 0 - bne _0811E466 + bne @0811E466 ldr r0, [r4] movs r1, 0xBB lsls r1, 2 @@ -548580,8 +548580,8 @@ _0811E430: ldr r0, [r0] movs r1, 0x1 bl obj_anim_image_start - b _0811E476 -_0811E466: + b @0811E476 +@0811E466: ldr r0, [r4] movs r1, 0xBB lsls r1, 2 @@ -548589,16 +548589,16 @@ _0811E466: ldr r0, [r0] movs r1, 0x2 bl obj_anim_image_start -_0811E476: +@0811E476: ldr r0, =0x0203a11c ldr r1, [r0] ldrb r0, [r1, 0x9] adds r0, 0x1 strb r0, [r1, 0x9] - b _0811E4A4 + b @0811E4A4 .align 2, 0 .pool -_0811E488: +@0811E488: movs r1, 0xBB lsls r1, 2 adds r0, r2, r1 @@ -548608,21 +548608,21 @@ _0811E488: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0811E4A4 + beq @0811E4A4 movs r0, 0x2 strb r0, [r2, 0x9] movs r0, 0 - b _0811E4A6 -_0811E4A4: + b @0811E4A6 +@0811E4A4: movs r0, 0x1 -_0811E4A6: +@0811E4A6: pop {r4} pop {r1} bx r1 thumb_func_end sub_811E418 thumb_func_start sub_811E4AC -sub_811E4AC: @ 811E4AC +sub_811E4AC: ; 811E4AC push {lr} ldr r2, =0x0203a11c ldr r1, [r2] @@ -548642,20 +548642,20 @@ 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] ldrb r0, [r3, 0x9] cmp r0, 0 - beq _0811E4E8 + beq @0811E4E8 cmp r0, 0x1 - beq _0811E502 + beq @0811E502 movs r0, 0 - b _0811E554 + b @0811E554 .align 2, 0 .pool -_0811E4E8: +@0811E4E8: movs r1, 0xBB lsls r1, 2 adds r0, r3, r1 @@ -548665,11 +548665,11 @@ _0811E4E8: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0811E552 + beq @0811E552 movs r0, 0x1 strb r0, [r3, 0x9] - b _0811E552 -_0811E502: + b @0811E552 +@0811E502: movs r0, 0xBA lsls r0, 2 adds r2, r3, r0 @@ -548684,7 +548684,7 @@ _0811E502: movs r0, 0x40 negs r0, r0 cmp r1, r0 - bgt _0811E552 + bgt @0811E552 movs r4, 0xBB lsls r4, 2 adds r0, r3, r4 @@ -548707,17 +548707,17 @@ _0811E502: adds r0, 0x1 strb r0, [r1, 0x9] movs r0, 0 - b _0811E554 -_0811E552: + b @0811E554 +@0811E552: movs r0, 0x1 -_0811E554: +@0811E554: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_811E4D0 thumb_func_start sub_811E55C -sub_811E55C: @ 811E55C +sub_811E55C: ; 811E55C push {lr} ldr r0, =0x0203a11c ldr r0, [r0] @@ -548734,12 +548734,12 @@ 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 cmp r0, 0 - bne _0811E59C + bne @0811E59C ldr r0, =0x0203a11c ldr r0, [r0] movs r1, 0xBB @@ -548748,10 +548748,10 @@ sub_811E578: @ 811E578 ldr r0, [r0] movs r1, 0x1 bl obj_anim_image_start - b _0811E5AE + b @0811E5AE .align 2, 0 .pool -_0811E59C: +@0811E59C: ldr r0, =0x0203a11c ldr r0, [r0] movs r1, 0xBB @@ -548760,7 +548760,7 @@ _0811E59C: ldr r0, [r0] movs r1, 0x2 bl obj_anim_image_start -_0811E5AE: +@0811E5AE: pop {r0} bx r0 .align 2, 0 @@ -548768,7 +548768,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 @@ -548786,7 +548786,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, =0x08597e48 adds r0, r4, 0 @@ -548797,7 +548797,7 @@ sub_811E5D4: @ 811E5D4 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq _0811E602 + beq @0811E602 ldr r0, =0x0203a11c ldr r2, [r0] movs r0, 0xBC @@ -548809,7 +548809,7 @@ sub_811E5D4: @ 811E5D4 ldr r1, =0x02020630 adds r0, r1 str r0, [r2] -_0811E602: +@0811E602: adds r0, r4, 0 movs r1, 0x60 movs r2, 0x9C @@ -548818,7 +548818,7 @@ _0811E602: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq _0811E636 + beq @0811E636 ldr r0, =0x0203a11c ldr r2, [r0] movs r0, 0xBD @@ -548835,7 +548835,7 @@ _0811E602: movs r2, 0x2 orrs r1, r2 strb r1, [r0] -_0811E636: +@0811E636: bl sub_811E6B0 pop {r4} pop {r0} @@ -548845,7 +548845,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 @@ -548856,9 +548856,9 @@ sub_811E64C: @ 811E64C ldr r1, [r1] movs r2, 0 cmp r0, 0 - bne _0811E666 + bne @0811E666 movs r2, 0x1 -_0811E666: +@0811E666: adds r3, r1, 0 adds r3, 0x3E movs r4, 0x1 @@ -548878,9 +548878,9 @@ _0811E666: ldr r1, [r1] movs r2, 0 cmp r0, 0 - bne _0811E692 + bne @0811E692 movs r2, 0x1 -_0811E692: +@0811E692: adds r3, r1, 0 adds r3, 0x3E adds r1, r4, 0 @@ -548899,7 +548899,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 @@ -548926,10 +548926,10 @@ 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 + bne @0811E6FC ldr r0, =0x0203a11c ldr r2, [r0] movs r1, 0xBC @@ -548937,10 +548937,10 @@ sub_811E6E0: @ 811E6E0 adds r0, r2, r1 ldr r0, [r0] movs r1, 0x60 - b _0811E70A + b @0811E70A .align 2, 0 .pool -_0811E6FC: +@0811E6FC: ldr r0, =0x0203a11c ldr r2, [r0] movs r1, 0xBC @@ -548948,7 +548948,7 @@ _0811E6FC: adds r0, r2, r1 ldr r0, [r0] movs r1, 0x78 -_0811E70A: +@0811E70A: strh r1, [r0, 0x20] movs r3, 0xBD lsls r3, 2 @@ -548962,7 +548962,7 @@ _0811E70A: thumb_func_end sub_811E6E0 thumb_func_start sub_811E720 -sub_811E720: @ 811E720 +sub_811E720: ; 811E720 push {r4,lr} ldr r4, =0x08597e30 adds r0, r4, 0 @@ -548973,7 +548973,7 @@ sub_811E720: @ 811E720 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq _0811E74E + beq @0811E74E ldr r0, =0x0203a11c ldr r2, [r0] movs r0, 0xBE @@ -548985,7 +548985,7 @@ sub_811E720: @ 811E720 ldr r1, =0x02020630 adds r0, r1 str r0, [r2] -_0811E74E: +@0811E74E: adds r0, r4, 0 movs r1, 0xDC movs r2, 0x9C @@ -548994,7 +548994,7 @@ _0811E74E: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq _0811E77E + beq @0811E77E ldr r0, =0x0203a11c ldr r2, [r0] movs r0, 0xBF @@ -549008,7 +549008,7 @@ _0811E74E: str r0, [r2] movs r1, 0x1 bl obj_anim_image_start -_0811E77E: +@0811E77E: bl sub_811E7F8 pop {r4} pop {r0} @@ -549018,7 +549018,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 @@ -549029,9 +549029,9 @@ sub_811E794: @ 811E794 ldr r1, [r1] movs r2, 0 cmp r0, 0 - bne _0811E7AE + bne @0811E7AE movs r2, 0x1 -_0811E7AE: +@0811E7AE: adds r3, r1, 0 adds r3, 0x3E movs r4, 0x1 @@ -549051,9 +549051,9 @@ _0811E7AE: ldr r1, [r1] movs r2, 0 cmp r0, 0 - bne _0811E7DA + bne @0811E7DA movs r2, 0x1 -_0811E7DA: +@0811E7DA: adds r3, r1, 0 adds r3, 0x3E adds r1, r4, 0 @@ -549072,7 +549072,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 @@ -549099,37 +549099,37 @@ 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 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0811E84C + beq @0811E84C cmp r0, 0x1 - bgt _0811E842 + bgt @0811E842 cmp r0, 0 - beq _0811E848 - b _0811E8D0 -_0811E842: + beq @0811E848 + b @0811E8D0 +@0811E842: cmp r0, 0x2 - beq _0811E850 - b _0811E8D0 -_0811E848: + beq @0811E850 + b @0811E8D0 +@0811E848: movs r4, 0x43 - b _0811E852 -_0811E84C: + b @0811E852 +@0811E84C: movs r4, 0x44 - b _0811E852 -_0811E850: + b @0811E852 +@0811E850: movs r4, 0x7 -_0811E852: +@0811E852: bl sub_811BA68 lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bne _0811E8D0 + bne @0811E8D0 adds r0, r4, 0 ldr r5, =nullsub_12 + 1 movs r4, 0 @@ -549141,7 +549141,7 @@ _0811E852: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq _0811E892 + beq @0811E892 ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -549154,15 +549154,15 @@ _0811E852: strb r1, [r0, 0x5] movs r1, 0x2 bl obj_anim_image_start -_0811E892: +@0811E892: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] movs r1, 0x69 cmp r0, 0 - bne _0811E8A0 + bne @0811E8A0 movs r1, 0x64 -_0811E8A0: +@0811E8A0: str r4, [sp] adds r0, r1, 0 adds r1, r5, 0 @@ -549172,7 +549172,7 @@ _0811E8A0: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq _0811E8D0 + beq @0811E8D0 ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -549185,7 +549185,7 @@ _0811E8A0: strb r1, [r0, 0x5] movs r1, 0x3 bl obj_anim_image_start -_0811E8D0: +@0811E8D0: add sp, 0x4 pop {r4,r5} pop {r0} @@ -549195,7 +549195,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 @@ -549204,52 +549204,52 @@ sub_811E8E4: @ 811E8E4 adds r0, r1 ldrb r0, [r0, 0x3] cmp r0, 0x1 - beq _0811E90E + beq @0811E90E cmp r0, 0x1 - bgt _0811E908 + bgt @0811E908 cmp r0, 0 - beq _0811E916 - b _0811E91A + beq @0811E916 + b @0811E91A .align 2, 0 .pool -_0811E908: +@0811E908: cmp r0, 0x2 - beq _0811E912 - b _0811E91A -_0811E90E: + beq @0811E912 + b @0811E91A +@0811E90E: movs r0, 0x1 - b _0811E91C -_0811E912: + b @0811E91C +@0811E912: movs r0, 0x2 - b _0811E91C -_0811E916: + b @0811E91C +@0811E916: movs r0, 0 - b _0811E91C -_0811E91A: + b @0811E91C +@0811E91A: movs r0, 0x3 -_0811E91C: +@0811E91C: pop {r1} bx r1 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 adds r1, r0, 0 cmp r1, 0x2 - ble _0811E932 + ble @0811E932 movs r0, 0 - b _0811E93E -_0811E932: + b @0811E93E +@0811E932: ldr r0, =0x08597e60 lsls r1, 2 adds r1, r4, r1 adds r1, r0 ldrb r0, [r1] adds r0, 0x4 -_0811E93E: +@0811E93E: pop {r4} pop {r1} bx r1 @@ -549258,7 +549258,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 @@ -549268,7 +549268,7 @@ sub_811E948: @ 811E948 bl sub_811E8E4 mov r8, r0 cmp r0, 0x3 - beq _0811E9FA + beq @0811E9FA ldr r3, =0xffffff00 ldr r0, [sp, 0xC] ands r0, r3 @@ -549319,11 +549319,11 @@ sub_811E948: @ 811E948 ldr r1, =0x08597e60 mov r10, r1 mov r9, r4 -_0811E9C6: +@0811E9C6: ldr r2, [r5] lsls r4, r7, 24 cmp r2, 0 - beq _0811E9EC + beq @0811E9EC mov r1, r8 lsls r0, r1, 2 adds r0, r6, r0 @@ -549338,14 +549338,14 @@ _0811E9C6: lsrs r0, r1, 24 movs r1, 0x1 bl sub_811D028 -_0811E9EC: +@0811E9EC: adds r5, 0x4 adds r6, 0x1 cmp r6, 0x3 - ble _0811E9C6 + ble @0811E9C6 lsrs r0, r4, 24 bl Window_WriteStandardTileMap -_0811E9FA: +@0811E9FA: add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -549359,71 +549359,71 @@ _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 adds r1, r0, 0 cmp r0, 0x14 - beq _0811EA4E + beq @0811EA4E cmp r0, 0x14 - bgt _0811EA48 + bgt @0811EA48 cmp r0, 0x11 - blt _0811EA66 + blt @0811EA66 ldr r0, =0x00000864 bl flag_check - b _0811EA60 + b @0811EA60 .align 2, 0 .pool -_0811EA48: +@0811EA48: cmp r1, 0x15 - beq _0811EA5C - b _0811EA66 -_0811EA4E: + beq @0811EA5C + b @0811EA66 +@0811EA4E: ldr r0, =0x00000866 bl flag_check - b _0811EA60 + b @0811EA60 .align 2, 0 .pool -_0811EA5C: +@0811EA5C: bl sub_811F0F8 -_0811EA60: +@0811EA60: lsls r0, 24 lsrs r0, 24 - b _0811EA68 -_0811EA66: + b @0811EA68 +@0811EA66: movs r0, 0x1 -_0811EA68: +@0811EA68: pop {r1} bx r1 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 adds r4, r0, 0 cmp r0, 0 - bne _0811EA84 + bne @0811EA84 movs r0, 0 bl pokedex_count lsls r0, 16 lsrs r0, 16 - b _0811EA9A -_0811EA84: + b @0811EA9A +@0811EA84: bl sub_811EA28 lsls r0, 24 cmp r0, 0 - bne _0811EA92 + bne @0811EA92 movs r0, 0 - b _0811EA9A -_0811EA92: + b @0811EA9A +@0811EA92: ldr r0, =0x0859d004 lsls r1, r4, 3 adds r1, r0 ldrh r0, [r1, 0x6] -_0811EA9A: +@0811EA9A: pop {r4} pop {r1} bx r1 @@ -549432,150 +549432,150 @@ _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 ldr r0, =0x0000ffff cmp r1, r0 - beq _0811EB04 + beq @0811EB04 lsrs r3, r2, 25 ldr r5, =0x000001ff ands r5, r1 cmp r3, 0x15 - bhi _0811EB08 + bhi @0811EB08 ldr r0, =0x0859d004 lsls r2, r3, 3 adds r1, r2, r0 ldrh r4, [r1, 0x4] cmp r3, 0x13 - bgt _0811EADC + bgt @0811EADC cmp r3, 0x12 - bge _0811EAE0 + bge @0811EAE0 cmp r3, 0 - beq _0811EAE0 - b _0811EB00 + beq @0811EAE0 + b @0811EB00 .align 2, 0 .pool -_0811EADC: +@0811EADC: cmp r3, 0x15 - bne _0811EB00 -_0811EAE0: + bne @0811EB00 +@0811EAE0: adds r0, r2, r0 ldr r2, [r0] movs r1, 0 cmp r1, r4 - bcs _0811EB08 -_0811EAEA: + bcs @0811EB08 +@0811EAEA: lsls r0, r1, 1 adds r0, r2 ldrh r0, [r0] cmp r5, r0 - beq _0811EB04 + beq @0811EB04 adds r0, r1, 0x1 lsls r0, 16 lsrs r1, r0, 16 cmp r1, r4 - bcc _0811EAEA - b _0811EB08 -_0811EB00: + bcc @0811EAEA + b @0811EB08 +@0811EB00: cmp r5, r4 - bcs _0811EB08 -_0811EB04: + bcs @0811EB08 +@0811EB04: movs r0, 0 - b _0811EB0A -_0811EB08: + b @0811EB0A +@0811EB08: movs r0, 0x1 -_0811EB0A: +@0811EB0A: pop {r4,r5} pop {r1} bx r1 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 lsls r0, 7 lsrs r3, r0, 23 cmp r2, 0x15 - bhi _0811EB5C + bhi @0811EB5C cmp r2, 0x13 - bgt _0811EB2C + bgt @0811EB2C cmp r2, 0x12 - bge _0811EB3C + bge @0811EB3C cmp r2, 0 - beq _0811EB30 - b _0811EB48 -_0811EB2C: + beq @0811EB30 + b @0811EB48 +@0811EB2C: cmp r2, 0x15 - bne _0811EB48 -_0811EB30: + bne @0811EB48 +@0811EB30: ldr r0, =0x085f5490 ldrh r0, [r0] - b _0811EB50 + b @0811EB50 .align 2, 0 .pool -_0811EB3C: +@0811EB3C: ldr r0, =0x085fa1d4 ldrh r0, [r0] - b _0811EB50 + b @0811EB50 .align 2, 0 .pool -_0811EB48: +@0811EB48: ldr r1, =0x0859d004 lsls r0, r2, 3 adds r0, r1 ldrh r0, [r0, 0x4] -_0811EB50: +@0811EB50: cmp r0, r3 - bls _0811EB5C + bls @0811EB5C movs r0, 0 - b _0811EB5E + b @0811EB5E .align 2, 0 .pool -_0811EB5C: +@0811EB5C: movs r0, 0x1 -_0811EB5E: +@0811EB5E: pop {r1} bx r1 thumb_func_end sub_811EB10 thumb_func_start sub_811EB64 -sub_811EB64: @ 811EB64 +sub_811EB64: ; 811EB64 push {lr} lsls r0, 24 lsrs r0, 24 lsls r1, 16 lsrs r2, r1, 16 cmp r0, 0x13 - bgt _0811EB7C + bgt @0811EB7C cmp r0, 0x12 - bge _0811EB90 + bge @0811EB90 cmp r0, 0 - beq _0811EB80 - b _0811EBA0 -_0811EB7C: + beq @0811EB80 + b @0811EBA0 +@0811EB7C: cmp r0, 0x15 - bne _0811EBA0 -_0811EB80: + bne @0811EBA0 +@0811EB80: movs r0, 0xB muls r0, r2 ldr r1, =0x083185c8 adds r0, r1 - b _0811EBB2 + b @0811EBB2 .align 2, 0 .pool -_0811EB90: +@0811EB90: movs r0, 0xD muls r0, r2 ldr r1, =0x0831977c adds r0, r1 - b _0811EBB2 + b @0811EBB2 .align 2, 0 .pool -_0811EBA0: +@0811EBA0: ldr r1, =0x0859d004 lsls r0, 3 adds r0, r1 @@ -549585,7 +549585,7 @@ _0811EBA0: lsls r0, 2 adds r0, r1 ldr r0, [r0] -_0811EBB2: +@0811EBB2: pop {r1} bx r1 .align 2, 0 @@ -549593,7 +549593,7 @@ _0811EBB2: thumb_func_end sub_811EB64 thumb_func_start sub_811EBBC -sub_811EBBC: @ 811EBBC +sub_811EBBC: ; 811EBBC push {r4-r6,lr} adds r5, r0, 0 lsls r6, r1, 16 @@ -549602,38 +549602,38 @@ sub_811EBBC: @ 811EBBC bl sub_811EAA4 lsls r0, 24 cmp r0, 0 - beq _0811EBD8 + beq @0811EBD8 ldr r1, =0x085eea42 - b _0811EBEA + b @0811EBEA .align 2, 0 .pool -_0811EBD8: +@0811EBD8: ldr r0, =0x0000ffff cmp r4, r0 - beq _0811EBFC + beq @0811EBFC ldr r1, =0x000001ff ands r1, r4 lsrs r0, r6, 25 bl sub_811EB64 adds r1, r0, 0 -_0811EBEA: +@0811EBEA: adds r0, r5, 0 bl gf_strcpy - b _0811EC02 + b @0811EC02 .align 2, 0 .pool -_0811EBFC: +@0811EBFC: movs r0, 0xFF strb r0, [r5] adds r0, r5, 0 -_0811EC02: +@0811EC02: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_811EBBC thumb_func_start sub_811EC08 -sub_811EC08: @ 811EC08 +sub_811EC08: ; 811EC08 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -549650,15 +549650,15 @@ sub_811EC08: @ 811EC08 lsrs r7, r2, 16 movs r0, 0 cmp r0, r9 - bcs _0811EC78 -_0811EC2A: + bcs @0811EC78 +@0811EC2A: movs r6, 0 adds r0, 0x1 mov r8, r0 cmp r6, r7 - bcs _0811EC5C + bcs @0811EC5C ldr r2, =0x0000ffff -_0811EC36: +@0811EC36: ldrh r1, [r5] adds r0, r4, 0 str r2, [sp] @@ -549667,18 +549667,18 @@ _0811EC36: ldrh r0, [r5] ldr r2, [sp] cmp r0, r2 - beq _0811EC50 + beq @0811EC50 movs r0, 0 strb r0, [r4] adds r4, 0x1 -_0811EC50: +@0811EC50: adds r5, 0x2 adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, r7 - bcc _0811EC36 -_0811EC5C: + bcc @0811EC36 +@0811EC5C: ldrh r1, [r5] adds r5, 0x2 adds r0, r4, 0 @@ -549691,8 +549691,8 @@ _0811EC5C: lsls r0, r1, 16 lsrs r0, 16 cmp r0, r9 - bcc _0811EC2A -_0811EC78: + bcc @0811EC2A +@0811EC78: subs r4, 0x1 movs r0, 0xFF strb r0, [r4] @@ -549709,7 +549709,7 @@ _0811EC78: thumb_func_end sub_811EC08 thumb_func_start sub_811EC98 -sub_811EC98: @ 811EC98 +sub_811EC98: ; 811EC98 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -549733,46 +549733,46 @@ sub_811EC98: @ 811EC98 mov r8, r0 movs r0, 0 cmp r0, r3 - bcs _0811ED62 -_0811ECC8: + bcs @0811ED62 +@0811ECC8: adds r3, r5, 0 movs r2, 0 movs r1, 0 adds r0, 0x1 mov r10, r0 cmp r2, r7 - bcs _0811ECEE + bcs @0811ECEE ldr r6, =0x0000ffff -_0811ECD8: +@0811ECD8: lsls r0, r1, 1 adds r0, r3 ldrh r0, [r0] cmp r0, r6 - beq _0811ECE4 + beq @0811ECE4 movs r2, 0x1 -_0811ECE4: +@0811ECE4: adds r0, r1, 0x1 lsls r0, 16 lsrs r1, r0, 16 cmp r1, r7 - bcc _0811ECD8 -_0811ECEE: + bcc @0811ECD8 +@0811ECEE: cmp r2, 0 - bne _0811ECFC + bne @0811ECFC lsls r0, r7, 1 adds r5, r0 - b _0811ED56 + b @0811ED56 .align 2, 0 .pool -_0811ECFC: +@0811ECFC: movs r6, 0 ldr r1, [sp, 0x4] adds r1, 0x1 mov r9, r1 cmp r6, r8 - bcs _0811ED30 + bcs @0811ED30 ldr r2, =0x0000ffff -_0811ED0A: +@0811ED0A: ldrh r1, [r5] adds r0, r4, 0 str r2, [sp, 0x8] @@ -549781,18 +549781,18 @@ _0811ED0A: ldrh r0, [r5] ldr r2, [sp, 0x8] cmp r0, r2 - beq _0811ED24 + beq @0811ED24 movs r0, 0 strb r0, [r4] adds r4, 0x1 -_0811ED24: +@0811ED24: adds r5, 0x2 adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, r8 - bcc _0811ED0A -_0811ED30: + bcc @0811ED0A +@0811ED30: ldrh r1, [r5] adds r5, 0x2 adds r0, r4, 0 @@ -549800,26 +549800,26 @@ _0811ED30: adds r4, r0, 0 ldr r0, [sp, 0x4] cmp r0, 0 - bne _0811ED4C + bne @0811ED4C movs r0, 0xFE - b _0811ED4E + b @0811ED4E .align 2, 0 .pool -_0811ED4C: +@0811ED4C: movs r0, 0xFA -_0811ED4E: +@0811ED4E: strb r0, [r4] adds r4, 0x1 mov r1, r9 str r1, [sp, 0x4] -_0811ED56: +@0811ED56: mov r1, r10 lsls r0, r1, 16 lsrs r0, 16 ldr r1, [sp] cmp r0, r1 - bcc _0811ECC8 -_0811ED62: + bcc @0811ECC8 +@0811ED62: subs r4, 0x1 movs r0, 0xFF strb r0, [r4] @@ -549835,38 +549835,38 @@ _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 adds r4, r0, 0 ldr r0, =0x0000ffff cmp r4, r0 - bne _0811ED94 + bne @0811ED94 movs r0, 0 - b _0811EDBA + b @0811EDBA .align 2, 0 .pool -_0811ED94: +@0811ED94: adds r0, r4, 0 bl sub_811EAA4 lsls r0, 24 cmp r0, 0 - bne _0811EDB0 + bne @0811EDB0 ldr r1, =0x000001ff ands r1, r4 lsrs r0, r5, 25 bl sub_811EB64 - b _0811EDB2 + b @0811EDB2 .align 2, 0 .pool -_0811EDB0: +@0811EDB0: ldr r0, =0x085eea42 -_0811EDB2: +@0811EDB2: bl sub_8008C24 lsls r0, 16 lsrs r0, 16 -_0811EDBA: +@0811EDBA: pop {r4,r5} pop {r1} bx r1 @@ -549875,7 +549875,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 @@ -549893,17 +549893,17 @@ sub_811EDC4: @ 811EDC4 mov r10, r3 movs r7, 0 cmp r7, r8 - bcs _0811EE26 + bcs @0811EE26 subs r0, r1, 0x1 lsls r0, 16 mov r9, r0 -_0811EDEE: +@0811EDEE: mov r0, r9 lsrs r4, r0, 16 movs r5, 0 cmp r5, r1 - bcs _0811EE14 -_0811EDF8: + bcs @0811EE14 +@0811EDF8: ldrh r0, [r6] adds r6, 0x2 str r1, [sp] @@ -549916,21 +549916,21 @@ _0811EDF8: lsrs r5, r0, 24 ldr r1, [sp] cmp r5, r1 - bcc _0811EDF8 -_0811EE14: + bcc @0811EDF8 +@0811EE14: cmp r4, r10 - bls _0811EE1C + bls @0811EE1C movs r0, 0x1 - b _0811EE28 -_0811EE1C: + b @0811EE28 +@0811EE1C: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 cmp r7, r8 - bcc _0811EDEE -_0811EE26: + bcc @0811EDEE +@0811EE26: movs r0, 0 -_0811EE28: +@0811EE28: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -549942,7 +549942,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 @@ -549957,14 +549957,14 @@ sub_811EE38: @ 811EE38 lsls r0, 16 lsrs r2, r0, 16 cmp r4, 0 - beq _0811EE66 + beq @0811EE66 cmp r4, 0x15 - beq _0811EE66 + beq @0811EE66 cmp r4, 0x12 - beq _0811EE66 + beq @0811EE66 cmp r4, 0x13 - bne _0811EE74 -_0811EE66: + bne @0811EE74 +@0811EE66: ldr r1, =0x0859d004 lsls r0, r4, 3 adds r0, r1 @@ -549972,7 +549972,7 @@ _0811EE66: lsls r0, r2, 1 adds r0, r1 ldrh r2, [r0] -_0811EE74: +@0811EE74: movs r0, 0x7F ands r0, r4 lsls r0, 9 @@ -549987,7 +549987,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 @@ -549997,58 +549997,58 @@ sub_811EE90: @ 811EE90 bl sub_811EA28 lsls r0, 24 cmp r0, 0 - bne _0811EEB0 + bne @0811EEB0 ldr r0, =0x0000ffff - b _0811EEC4 + b @0811EEC4 .align 2, 0 .pool -_0811EEB0: +@0811EEB0: cmp r4, 0 - beq _0811EEBC + beq @0811EEBC adds r0, r4, 0 bl sub_811EE38 - b _0811EEC0 -_0811EEBC: + b @0811EEC0 +@0811EEBC: bl sub_811F108 -_0811EEC0: +@0811EEC0: lsls r0, 16 lsrs r0, 16 -_0811EEC4: +@0811EEC4: pop {r4} pop {r1} bx r1 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] cmp r0, 0x1 - beq _0811EF04 + beq @0811EF04 cmp r0, 0x1 - bgt _0811EEE4 + bgt @0811EEE4 cmp r0, 0 - beq _0811EEEE - b _0811EF58 + beq @0811EEEE + b @0811EF58 .align 2, 0 .pool -_0811EEE4: +@0811EEE4: cmp r0, 0x2 - beq _0811EF2C + beq @0811EF2C cmp r0, 0x3 - beq _0811EF3C - b _0811EF58 -_0811EEEE: + beq @0811EF3C + b @0811EF58 +@0811EEEE: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00002bb0 adds r5, r0, r1 movs r2, 0x2 - b _0811EF46 + b @0811EF46 .align 2, 0 .pool -_0811EF04: +@0811EF04: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00002bbc @@ -550060,37 +550060,37 @@ _0811EF04: bl sub_811EDC4 lsls r0, 24 cmp r0, 0 - beq _0811EF44 + beq @0811EF44 movs r2, 0x2 movs r3, 0x3 - b _0811EF48 + b @0811EF48 .align 2, 0 .pool -_0811EF2C: +@0811EF2C: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00002bc8 - b _0811EF42 + b @0811EF42 .align 2, 0 .pool -_0811EF3C: +@0811EF3C: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00002bd4 -_0811EF42: +@0811EF42: adds r5, r0, r1 -_0811EF44: +@0811EF44: movs r2, 0x3 -_0811EF46: +@0811EF46: movs r3, 0x2 -_0811EF48: +@0811EF48: ldr r4, =0x02021fc4 adds r0, r4, 0 adds r1, r5, 0 bl sub_811EC08 adds r0, r4, 0 bl box_related_two__3 -_0811EF58: +@0811EF58: pop {r4,r5} pop {r0} bx r0 @@ -550099,16 +550099,16 @@ _0811EF58: thumb_func_end sub_811EECC thumb_func_start sub_811EF6C -sub_811EF6C: @ 811EF6C +sub_811EF6C: ; 811EF6C push {lr} bl GenerateRandomNumber movs r1, 0x1 ands r1, r0 movs r0, 0xC cmp r1, 0 - beq _0811EF7E + beq @0811EF7E movs r0, 0xD -_0811EF7E: +@0811EF7E: bl sub_811EE90 adds r1, r0, 0 lsls r1, 16 @@ -550122,7 +550122,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 @@ -550144,12 +550144,12 @@ 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 cmp r1, 0x20 - bhi _0811EFE4 + bhi @0811EFE4 lsrs r3, r0, 27 movs r2, 0x7 ands r2, r1 @@ -550163,7 +550163,7 @@ sub_811EFC0: @ 811EFC0 ldrb r2, [r1] orrs r0, r2 strb r0, [r1] -_0811EFE4: +@0811EFE4: pop {r0} bx r0 .align 2, 0 @@ -550171,25 +550171,25 @@ _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 -_0811EFF6: +@0811EFF6: adds r0, r4, 0 bl sub_811EF98 lsls r0, 24 cmp r0, 0 - beq _0811F008 + beq @0811F008 adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_0811F008: +@0811F008: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x20 - bls _0811EFF6 + bls @0811EFF6 adds r0, r5, 0 pop {r4,r5} pop {r1} @@ -550197,15 +550197,15 @@ _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 lsrs r4, r0, 24 cmp r4, 0x21 - bne _0811F048 - b _0811F082 -_0811F02C: + bne @0811F048 + b @0811F082 +@0811F02C: adds r0, r5, 0 bl sub_811EFC0 ldr r0, =0x000001ff @@ -550215,10 +550215,10 @@ _0811F02C: adds r0, r1, 0 orrs r4, r0 adds r0, r4, 0 - b _0811F084 + b @0811F084 .align 2, 0 .pool -_0811F048: +@0811F048: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -550228,28 +550228,28 @@ _0811F048: lsls r0, 16 lsrs r6, r0, 16 movs r4, 0 -_0811F05E: +@0811F05E: lsls r0, r4, 24 lsrs r5, r0, 24 adds r0, r5, 0 bl sub_811EF98 lsls r0, 24 cmp r0, 0 - bne _0811F078 + bne @0811F078 cmp r6, 0 - beq _0811F02C + beq @0811F02C subs r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 -_0811F078: +@0811F078: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x20 - bls _0811F05E -_0811F082: + bls @0811F05E +@0811F082: ldr r0, =0x0000ffff -_0811F084: +@0811F084: pop {r4-r6} pop {r1} bx r1 @@ -550258,15 +550258,15 @@ _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 lsrs r5, r0, 24 cmp r5, 0 - bne _0811F0B4 - b _0811F0EA -_0811F0A0: + bne @0811F0B4 + b @0811F0EA +@0811F0A0: ldr r0, =0x000001ff ands r4, r0 movs r1, 0xA0 @@ -550274,10 +550274,10 @@ _0811F0A0: adds r0, r1, 0 orrs r4, r0 adds r0, r4, 0 - b _0811F0EC + b @0811F0EC .align 2, 0 .pool -_0811F0B4: +@0811F0B4: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -550286,27 +550286,27 @@ _0811F0B4: lsls r0, 16 lsrs r5, r0, 16 movs r4, 0 -_0811F0C8: +@0811F0C8: lsls r0, r4, 24 lsrs r0, 24 bl sub_811EF98 lsls r0, 24 cmp r0, 0 - beq _0811F0E0 + beq @0811F0E0 cmp r5, 0 - beq _0811F0A0 + beq @0811F0A0 subs r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 -_0811F0E0: +@0811F0E0: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x20 - bls _0811F0C8 -_0811F0EA: + bls @0811F0C8 +@0811F0EA: ldr r0, =0x0000ffff -_0811F0EC: +@0811F0EC: pop {r4,r5} pop {r1} bx r1 @@ -550315,7 +550315,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 @@ -550325,23 +550325,23 @@ 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 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - bne _0811F128 - b _0811F172 -_0811F11A: + bne @0811F128 + b @0811F172 +@0811F11A: ldrh r1, [r5] ldr r0, =0x000001ff ands r0, r1 - b _0811F174 + b @0811F174 .align 2, 0 .pool -_0811F128: +@0811F128: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -550354,8 +550354,8 @@ _0811F128: ldrh r7, [r0, 0x4] movs r6, 0 cmp r6, r7 - bcs _0811F172 -_0811F146: + bcs @0811F172 +@0811F146: ldrh r0, [r5] bl SpeciesToNationalPokedexNum lsls r0, 16 @@ -550364,22 +550364,22 @@ _0811F146: bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - beq _0811F166 + beq @0811F166 cmp r4, 0 - beq _0811F11A + beq @0811F11A subs r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 -_0811F166: +@0811F166: adds r5, 0x2 adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, r7 - bcc _0811F146 -_0811F172: + bcc @0811F146 +@0811F172: ldr r0, =0x0000ffff -_0811F174: +@0811F174: pop {r4-r7} pop {r1} bx r1 @@ -550388,13 +550388,13 @@ _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 ldr r4, =0x00002bb0 ldr r3, =0x0859e62c -_0811F18E: +@0811F18E: ldr r1, [r5] lsls r0, r2, 1 adds r1, r4 @@ -550406,12 +550406,12 @@ _0811F18E: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x3 - bls _0811F18E + bls @0811F18E movs r2, 0 ldr r5, =0x03005d8c ldr r4, =0x00002bbc ldr r3, =0x0859e634 -_0811F1AE: +@0811F1AE: ldr r1, [r5] lsls r0, r2, 1 adds r1, r4 @@ -550423,12 +550423,12 @@ _0811F1AE: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x5 - bls _0811F1AE + bls @0811F1AE movs r2, 0 ldr r5, =0x03005d8c ldr r4, =0x00002bc8 ldr r3, =0x0859e640 -_0811F1CE: +@0811F1CE: ldr r1, [r5] lsls r0, r2, 1 adds r1, r4 @@ -550440,12 +550440,12 @@ _0811F1CE: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x5 - bls _0811F1CE + bls @0811F1CE movs r2, 0 ldr r5, =0x03005d8c ldr r4, =0x00002bd4 ldr r3, =0x0859e64c -_0811F1EE: +@0811F1EE: ldr r1, [r5] lsls r0, r2, 1 adds r1, r4 @@ -550457,18 +550457,18 @@ _0811F1EE: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x5 - bls _0811F1EE + bls @0811F1EE movs r2, 0 ldr r7, =0x03005d8c ldr r6, =0x00002be0 ldr r0, =0x0000ffff adds r5, r0, 0 -_0811F210: +@0811F210: movs r3, 0 lsls r0, r2, 3 adds r0, r2 lsls r4, r0, 2 -_0811F218: +@0811F218: ldr r1, [r7] lsls r0, r3, 1 adds r0, r4 @@ -550481,17 +550481,17 @@ _0811F218: lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x8 - bls _0811F218 + bls @0811F218 adds r0, r2, 0x1 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0xF - bls _0811F210 + bls @0811F210 movs r2, 0 ldr r4, =0x03005d8c ldr r3, =0x00002e20 movs r1, 0 -_0811F244: +@0811F244: ldr r0, [r4] adds r0, r3 adds r0, r2 @@ -550500,7 +550500,7 @@ _0811F244: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x3F - bls _0811F244 + bls @0811F244 pop {r4-r7} pop {r0} bx r0 @@ -550509,39 +550509,39 @@ _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 bl malloc str r0, [r4] cmp r0, 0 - beq _0811F2B0 + beq @0811F2B0 bl sub_811F2D4 bl sub_811F46C movs r0, 0x1 - b _0811F2B2 + b @0811F2B2 .align 2, 0 .pool -_0811F2B0: +@0811F2B0: movs r0, 0 -_0811F2B2: +@0811F2B2: pop {r4} pop {r1} bx r1 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] cmp r0, 0 - beq _0811F2CA + beq @0811F2CA bl free movs r0, 0 str r0, [r4] -_0811F2CA: +@0811F2CA: pop {r4} pop {r0} bx r0 @@ -550550,7 +550550,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] @@ -550560,7 +550560,7 @@ sub_811F2D4: @ 811F2D4 bl pokedex_count lsls r0, 16 cmp r0, 0 - beq _0811F2FC + beq @0811F2FC ldr r0, [r4] ldrh r1, [r0] adds r2, r1, 0x1 @@ -550570,9 +550570,9 @@ sub_811F2D4: @ 811F2D4 adds r0, 0x2 adds r0, r1 strh r5, [r0] -_0811F2FC: +@0811F2FC: movs r3, 0x1 -_0811F2FE: +@0811F2FE: ldr r0, [r4] ldrh r2, [r0] adds r1, r2, 0x1 @@ -550584,12 +550584,12 @@ _0811F2FE: strh r3, [r0] adds r3, 0x1 cmp r3, 0x10 - ble _0811F2FE + ble @0811F2FE ldr r0, =0x00000864 bl flag_check lsls r0, 24 cmp r0, 0 - beq _0811F358 + beq @0811F358 ldr r0, =0x0203a120 ldr r2, [r0] ldrh r0, [r2] @@ -550617,12 +550617,12 @@ _0811F2FE: adds r3, r0 movs r0, 0x13 strh r0, [r3] -_0811F358: +@0811F358: ldr r0, =0x00000866 bl flag_check lsls r0, 24 cmp r0, 0 - beq _0811F37A + beq @0811F37A ldr r0, =0x0203a120 ldr r0, [r0] ldrh r1, [r0] @@ -550634,10 +550634,10 @@ _0811F358: adds r0, r1 movs r1, 0x14 strh r1, [r0] -_0811F37A: +@0811F37A: bl sub_809D42C cmp r0, 0 - beq _0811F398 + beq @0811F398 ldr r0, =0x0203a120 ldr r0, [r0] ldrh r1, [r0] @@ -550649,7 +550649,7 @@ _0811F37A: adds r0, r1 movs r1, 0x15 strh r1, [r0] -_0811F398: +@0811F398: pop {r4,r5} pop {r0} bx r0 @@ -550658,7 +550658,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] @@ -550668,7 +550668,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 @@ -550676,23 +550676,23 @@ sub_811F3B8: @ 811F3B8 ldr r1, [r0] ldrh r0, [r1] cmp r2, r0 - bcs _0811F3D8 + bcs @0811F3D8 lsls r0, r2, 1 adds r1, 0x2 adds r1, r0 ldrb r0, [r1] - b _0811F3DA + b @0811F3DA .align 2, 0 .pool -_0811F3D8: +@0811F3D8: movs r0, 0x16 -_0811F3DA: +@0811F3DA: pop {r1} bx r1 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 @@ -550709,17 +550709,17 @@ sub_811F3E0: @ 811F3E0 lsls r4, 16 lsrs r0, r4, 16 cmp r0, r5 - bcs _0811F414 + bcs @0811F414 movs r2, 0 -_0811F406: +@0811F406: strb r2, [r1] adds r1, 0x1 adds r0, 0x1 lsls r0, 16 lsrs r0, 16 cmp r0, r5 - bcc _0811F406 -_0811F414: + bcc @0811F406 +@0811F414: movs r0, 0xFF strb r0, [r1] adds r0, r1, 0 @@ -550731,7 +550731,7 @@ _0811F414: thumb_func_end sub_811F3E0 thumb_func_start sub_811F424 -sub_811F424: @ 811F424 +sub_811F424: ; 811F424 lsls r0, 24 ldr r1, =0x0859e5d4 lsrs r0, 22 @@ -550743,7 +550743,7 @@ sub_811F424: @ 811F424 thumb_func_end sub_811F424 thumb_func_start sub_811F434 -sub_811F434: @ 811F434 +sub_811F434: ; 811F434 push {r4,r5,lr} adds r4, r0, 0 lsls r1, 16 @@ -550756,17 +550756,17 @@ sub_811F434: @ 811F434 lsls r4, 16 lsrs r0, r4, 16 cmp r0, r5 - bcs _0811F460 + bcs @0811F460 movs r2, 0 -_0811F452: +@0811F452: strb r2, [r1] adds r1, 0x1 adds r0, 0x1 lsls r0, 16 lsrs r0, 16 cmp r0, r5 - bcc _0811F452 -_0811F460: + bcc @0811F452 +@0811F460: movs r0, 0xFF strb r0, [r1] adds r0, r1, 0 @@ -550776,7 +550776,7 @@ _0811F460: thumb_func_end sub_811F434 thumb_func_start sub_811F46C -sub_811F46C: @ 811F46C +sub_811F46C: ; 811F46C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -550784,7 +550784,7 @@ sub_811F46C: @ 811F46C push {r5-r7} sub sp, 0x10 movs r3, 0 -_0811F47A: +@0811F47A: ldr r2, =0x0859e46c lsls r1, r3, 3 adds r0, r2, 0x4 @@ -550807,21 +550807,21 @@ _0811F47A: str r0, [sp, 0x8] ldr r2, [sp] cmp r1, r2 - bge _0811F530 -_0811F4A8: + bge @0811F530 +@0811F4A8: ldrh r0, [r7] ldr r2, =0x0000ffff cmp r0, r2 - bne _0811F4FC + bne @0811F4FC adds r7, 0x2 ldrh r4, [r7] adds r7, 0x2 adds r0, r1, 0x1 adds r1, r0, r4 - b _0811F4FE + b @0811F4FE .align 2, 0 .pool -_0811F4C8: +@0811F4C8: ldr r0, =0x0203a120 ldr r2, [r0] mov r0, r10 @@ -550845,42 +550845,42 @@ _0811F4C8: ldrh r0, [r2] adds r0, 0x1 strh r0, [r2] - b _0811F526 + b @0811F526 .align 2, 0 .pool -_0811F4FC: +@0811F4FC: movs r4, 0x1 -_0811F4FE: +@0811F4FE: movs r6, 0 adds r1, 0x1 mov r9, r1 lsls r2, r4, 1 mov r8, r2 cmp r6, r4 - bge _0811F526 + bge @0811F526 adds r5, r7, 0 -_0811F50E: +@0811F50E: ldrh r0, [r5] str r3, [sp, 0xC] bl sub_811F860 lsls r0, 24 ldr r3, [sp, 0xC] cmp r0, 0 - bne _0811F4C8 + bne @0811F4C8 adds r5, 0x2 adds r6, 0x1 cmp r6, r4 - blt _0811F50E -_0811F526: + blt @0811F50E +@0811F526: add r7, r8 mov r1, r9 ldr r0, [sp] cmp r1, r0 - blt _0811F4A8 -_0811F530: + blt @0811F4A8 +@0811F530: ldr r3, [sp, 0x8] cmp r3, 0x1A - ble _0811F47A + ble @0811F47A add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -550892,19 +550892,19 @@ _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 cmp r0, 0 - bne _0811F55A + bne @0811F55A adds r0, r1, 0 bl sub_811F5C4 - b _0811F560 -_0811F55A: + b @0811F560 +@0811F55A: adds r0, r1, 0 bl sub_811F6B8 -_0811F560: +@0811F560: ldr r1, =0x0203a120 ldr r1, [r1] ldr r2, =0x00003ba0 @@ -550917,7 +550917,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 @@ -550927,18 +550927,18 @@ sub_811F578: @ 811F578 adds r0, r1, r3 ldrh r0, [r0] cmp r2, r0 - bcs _0811F5A4 + bcs @0811F5A4 lsls r0, r2, 1 ldr r2, =0x00003984 adds r1, r2 adds r1, r0 ldrh r0, [r1] - b _0811F5A6 + b @0811F5A6 .align 2, 0 .pool -_0811F5A4: +@0811F5A4: ldr r0, =0x0000ffff -_0811F5A6: +@0811F5A6: pop {r1} bx r1 .align 2, 0 @@ -550946,7 +550946,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 @@ -550958,7 +550958,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 @@ -550972,34 +550972,34 @@ sub_811F5C4: @ 811F5C4 ldrh r3, [r0, 0x4] mov r8, r3 cmp r2, 0 - beq _0811F5EC + beq @0811F5EC cmp r2, 0x15 - beq _0811F5EC + beq @0811F5EC cmp r2, 0x12 - beq _0811F5EC + beq @0811F5EC cmp r2, 0x13 - bne _0811F64C -_0811F5EC: + bne @0811F64C +@0811F5EC: lsls r0, r2, 3 adds r0, r1 ldr r1, [r0] movs r7, 0 movs r5, 0 cmp r5, r8 - bcs _0811F698 + bcs @0811F698 movs r0, 0x7F ands r0, r2 lsls r0, 9 mov r9, r0 adds r4, r1, 0 lsls r6, r2, 24 -_0811F606: +@0811F606: ldrh r0, [r4] lsrs r1, r6, 24 bl sub_811F764 lsls r0, 24 cmp r0, 0 - beq _0811F630 + beq @0811F630 ldr r0, =0x0203a120 ldr r2, [r0] lsls r0, r5, 1 @@ -551014,20 +551014,20 @@ _0811F606: orrs r0, r1 strh r0, [r2] adds r5, 0x1 -_0811F630: +@0811F630: adds r4, 0x2 adds r7, 0x1 cmp r7, r8 - bcc _0811F606 - b _0811F698 + bcc @0811F606 + b @0811F698 .align 2, 0 .pool -_0811F64C: +@0811F64C: ldr r1, [r0] movs r7, 0 movs r5, 0 cmp r5, r8 - bcs _0811F698 + bcs @0811F698 movs r0, 0x7F ands r0, r2 lsls r0, 9 @@ -551035,7 +551035,7 @@ _0811F64C: adds r6, r1, 0 lsls r2, 24 mov r9, r2 -_0811F664: +@0811F664: ldrh r4, [r6, 0x4] adds r0, r4, 0 mov r2, r9 @@ -551043,7 +551043,7 @@ _0811F664: bl sub_811F764 lsls r0, 24 cmp r0, 0 - beq _0811F690 + beq @0811F690 ldr r0, =0x0203a120 ldr r1, [r0] lsls r0, r5, 1 @@ -551057,12 +551057,12 @@ _0811F664: orrs r4, r3 strh r4, [r1] adds r5, 0x1 -_0811F690: +@0811F690: adds r6, 0xC adds r7, 0x1 cmp r7, r8 - bcc _0811F664 -_0811F698: + bcc @0811F664 +@0811F698: lsls r0, r5, 16 lsrs r0, 16 pop {r3-r5} @@ -551077,7 +551077,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} @@ -551092,7 +551092,7 @@ sub_811F6B8: @ 811F6B8 adds r0, r5 ldrh r0, [r0] cmp r6, r0 - bcs _0811F718 + bcs @0811F718 mov r8, r3 lsls r0, r1, 4 adds r0, r1 @@ -551101,7 +551101,7 @@ sub_811F6B8: @ 811F6B8 lsls r7, r0, 2 ldr r0, =0x00003984 mov r12, r0 -_0811F6E6: +@0811F6E6: mov r0, r8 ldr r3, [r0] adds r1, r6, 0 @@ -551126,8 +551126,8 @@ _0811F6E6: adds r3, r5 ldrh r3, [r3] cmp r4, r3 - bcc _0811F6E6 -_0811F718: + bcc @0811F6E6 +@0811F718: adds r0, r6, 0 pop {r3} mov r8, r3 @@ -551139,7 +551139,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 @@ -551148,72 +551148,72 @@ sub_811F72C: @ 811F72C ldr r0, [r0] ldrh r1, [r0] cmp r2, r1 - bge _0811F75C + bge @0811F75C adds r4, r3, 0 adds r3, r1, 0 adds r1, r0, 0x2 -_0811F744: +@0811F744: ldrh r0, [r1] cmp r0, r4 - bne _0811F754 + bne @0811F754 movs r0, 0x1 - b _0811F75E + b @0811F75E .align 2, 0 .pool -_0811F754: +@0811F754: adds r1, 0x2 adds r2, 0x1 cmp r2, r3 - blt _0811F744 -_0811F75C: + blt @0811F744 +@0811F75C: movs r0, 0 -_0811F75E: +@0811F75E: pop {r4} pop {r1} bx r1 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 lsls r1, 24 lsrs r2, r1, 24 cmp r2, 0x15 - bhi _0811F81A + bhi @0811F81A lsls r0, r2, 2 - ldr r1, =_0811F780 + ldr r1, =@0811F780 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0811F780: - .4byte _0811F7D8 - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F808 - .4byte _0811F808 - .4byte _0811F80C - .4byte _0811F7EE -_0811F7D8: +@0811F780: + .4byte @0811F7D8 + .4byte @0811F81A + .4byte @0811F81A + .4byte @0811F81A + .4byte @0811F81A + .4byte @0811F81A + .4byte @0811F81A + .4byte @0811F81A + .4byte @0811F81A + .4byte @0811F81A + .4byte @0811F81A + .4byte @0811F81A + .4byte @0811F81A + .4byte @0811F81A + .4byte @0811F81A + .4byte @0811F81A + .4byte @0811F81A + .4byte @0811F81A + .4byte @0811F808 + .4byte @0811F808 + .4byte @0811F80C + .4byte @0811F7EE +@0811F7D8: adds r0, r4, 0 bl SpeciesToNationalPokedexNum lsls r0, 16 @@ -551222,29 +551222,29 @@ _0811F7D8: bl pokedex_flag_operation lsls r0, 24 lsrs r0, 24 - b _0811F82C -_0811F7EE: + b @0811F82C +@0811F7EE: adds r0, r4, 0 bl sub_811F838 cmp r0, 0 - beq _0811F808 + beq @0811F808 adds r0, r4, 0 bl SpeciesToNationalPokedexNum lsls r0, 16 lsrs r0, 16 movs r1, 0 bl pokedex_flag_operation -_0811F808: +@0811F808: movs r0, 0x1 - b _0811F82C -_0811F80C: + b @0811F82C +@0811F80C: lsls r0, r4, 24 lsrs r0, 24 bl sub_811EF98 lsls r0, 24 lsrs r0, 24 - b _0811F82C -_0811F81A: + b @0811F82C +@0811F81A: ldr r1, =0x0859d004 lsls r0, r2, 3 adds r0, r1 @@ -551254,7 +551254,7 @@ _0811F81A: lsls r0, 2 adds r0, r1 ldrb r0, [r0, 0x8] -_0811F82C: +@0811F82C: pop {r4} pop {r1} bx r1 @@ -551263,33 +551263,33 @@ _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 movs r2, 0 ldr r1, =0x0859e658 -_0811F842: +@0811F842: ldrh r0, [r1] cmp r0, r3 - bne _0811F850 + bne @0811F850 movs r0, 0x1 - b _0811F85A + b @0811F85A .align 2, 0 .pool -_0811F850: +@0811F850: adds r1, 0x2 adds r2, 0x1 cmp r2, 0 - beq _0811F842 + beq @0811F842 movs r0, 0 -_0811F85A: +@0811F85A: pop {r1} bx r1 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 @@ -551299,23 +551299,23 @@ sub_811F860: @ 811F860 bl sub_811F72C lsls r0, 24 cmp r0, 0 - beq _0811F884 + beq @0811F884 adds r0, r4, 0 adds r1, r5, 0 bl sub_811F764 lsls r0, 24 lsrs r0, 24 - b _0811F886 -_0811F884: + b @0811F886 +@0811F884: movs r0, 0 -_0811F886: +@0811F886: pop {r4,r5} pop {r1} bx r1 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 @@ -551324,17 +551324,17 @@ sub_811F88C: @ 811F88C lsrs r0, r1, 16 ldr r1, =0x0000ffff cmp r0, r1 - beq _0811F8AE + beq @0811F8AE adds r3, r1, 0 -_0811F8A0: +@0811F8A0: strh r3, [r2] adds r2, 0x2 subs r0, 0x1 lsls r0, 16 lsrs r0, 16 cmp r0, r1 - bne _0811F8A0 -_0811F8AE: + bne @0811F8A0 +@0811F8AE: pop {r0} bx r0 .align 2, 0 @@ -551342,17 +551342,17 @@ _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 adds r2, r1, 0 adds r1, r0, 0x6 -_0811F8C8: +@0811F8C8: strh r2, [r1] subs r1, 0x2 cmp r1, r0 - bge _0811F8C8 + bge @0811F8C8 pop {r0} bx r0 .align 2, 0 @@ -551360,7 +551360,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 @@ -551371,25 +551371,25 @@ sub_811F8D8: @ 811F8D8 bl sub_811EA28 lsls r0, 24 cmp r0, 0 - beq _0811F904 + beq @0811F904 adds r0, r5, 0 adds r1, r4, 0 bl sub_811F764 lsls r0, 24 lsrs r0, 24 - b _0811F906 + b @0811F906 .align 2, 0 .pool -_0811F904: +@0811F904: movs r0, 0 -_0811F906: +@0811F906: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_811F8D8 thumb_func_start sub_811F90C -sub_811F90C: @ 811F90C +sub_811F90C: ; 811F90C ldr r1, =0x0203a124 str r0, [r1] bx lr @@ -551398,7 +551398,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 @@ -551430,7 +551430,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] @@ -551441,19 +551441,19 @@ sub_811F960: @ 811F960 adds r0, 0x34 adds r5, r1, r0 cmp r2, 0xD - beq _0811FA30 + beq @0811FA30 cmp r2, 0xD - bgt _0811F988 + bgt @0811F988 cmp r2, 0 - beq _0811F98E - b _0811F9D8 + beq @0811F98E + b @0811F9D8 .align 2, 0 .pool -_0811F988: +@0811F988: cmp r2, 0xE - beq _0811FA7C - b _0811F9D8 -_0811F98E: + beq @0811FA7C + b @0811F9D8 +@0811F98E: ldr r0, [r1, 0x2C] adds r1, r5, 0 movs r2, 0x8 @@ -551461,7 +551461,7 @@ _0811F98E: movs r4, 0 adds r7, r5, 0 adds r7, 0xE0 -_0811F99E: +@0811F99E: ldr r6, =0x0203a124 ldr r0, [r6] ldr r0, [r0, 0x2C] @@ -551474,7 +551474,7 @@ _0811F99E: lsls r4, 16 lsrs r4, 16 cmp r4, 0x5 - bls _0811F99E + bls @0811F99E ldr r0, [r6] ldr r0, [r0, 0x2C] adds r0, 0x40 @@ -551484,10 +551484,10 @@ _0811F99E: ldr r1, [r6] ldr r0, =0x000010b4 adds r1, r0 - b _0811FA1E + b @0811FA1E .align 2, 0 .pool -_0811F9D8: +@0811F9D8: ldr r0, =0x0203a124 ldr r0, [r0] ldr r0, [r0, 0x2C] @@ -551498,7 +551498,7 @@ _0811F9D8: movs r4, 0 adds r7, r5, 0 adds r7, 0xE0 -_0811F9EE: +@0811F9EE: ldr r6, =0x0203a124 ldr r0, [r6] ldr r0, [r0, 0x2C] @@ -551511,7 +551511,7 @@ _0811F9EE: lsls r4, 16 lsrs r4, 16 cmp r4, 0x5 - bls _0811F9EE + bls @0811F9EE ldr r0, [r6] ldr r0, [r0, 0x2C] adds r0, 0xA0 @@ -551521,14 +551521,14 @@ _0811F9EE: ldr r1, [r6] ldr r2, =0x000010b4 adds r1, r2 -_0811FA1E: +@0811FA1E: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0811FA88 + b @0811FA88 .align 2, 0 .pool -_0811FA30: +@0811FA30: ldr r0, [r1, 0x2C] adds r0, 0xC0 adds r1, r5, 0 @@ -551537,7 +551537,7 @@ _0811FA30: movs r4, 0 adds r7, r5, 0 adds r7, 0xE0 -_0811FA42: +@0811FA42: ldr r6, =0x0203a124 ldr r0, [r6] ldr r0, [r0, 0x2C] @@ -551550,7 +551550,7 @@ _0811FA42: lsls r4, 16 lsrs r4, 16 cmp r4, 0x5 - bls _0811FA42 + bls @0811FA42 ldr r0, [r6] ldr r0, [r0, 0x2C] movs r1, 0x80 @@ -551565,34 +551565,34 @@ _0811FA42: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_0811FA7C: +@0811FA7C: movs r0, 0 - b _0811FA8A + b @0811FA8A .align 2, 0 .pool -_0811FA88: +@0811FA88: movs r0, 0x1 -_0811FA8A: +@0811FA8A: pop {r4-r7} pop {r1} bx r1 thumb_func_end sub_811F960 thumb_func_start sub_811FA90 -sub_811FA90: @ 811FA90 +sub_811FA90: ; 811FA90 push {lr} bl sub_811F918 -_0811FA96: +@0811FA96: bl sub_811F960 lsls r0, 24 cmp r0, 0 - bne _0811FA96 + bne @0811FA96 pop {r0} bx r0 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 @@ -551608,7 +551608,7 @@ sub_811FAA4: @ 811FAA4 adds r7, r2, 0 adds r4, r7, 0 movs r2, 0x1 -_0811FAC2: +@0811FAC2: ldr r0, [r4] adds r1, r0, 0x6 adds r1, r3 @@ -551620,7 +551620,7 @@ _0811FAC2: lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x3 - bls _0811FAC2 + bls @0811FAC2 lsls r0, r5, 16 asrs r0, 16 lsls r1, r6, 16 @@ -551637,11 +551637,11 @@ _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 -_0811FAFE: +@0811FAFE: ldr r0, [r4] ldrh r0, [r0] adds r0, r5, r0 @@ -551658,17 +551658,17 @@ _0811FAFE: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x1 - bls _0811FAFE + bls @0811FAFE movs r5, 0 ldr r6, =0x0203a124 -_0811FB28: +@0811FB28: ldr r0, [r6] lsls r4, r5, 2 adds r0, 0xC adds r0, r4 ldr r0, [r0] cmp r0, 0 - beq _0811FB9A + beq @0811FB9A bl obj_delete_and_free_tiles ldr r0, [r6] adds r0, 0xC @@ -551679,17 +551679,17 @@ _0811FB28: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x1 - bls _0811FB28 + bls @0811FB28 movs r5, 0 ldr r6, =0x0203a124 -_0811FB52: +@0811FB52: ldr r0, [r6] lsls r4, r5, 2 adds r0, 0x14 adds r0, r4 ldr r0, [r0] cmp r0, 0 - beq _0811FB9A + beq @0811FB9A bl obj_delete_and_free_tiles ldr r0, [r6] adds r0, 0x14 @@ -551700,24 +551700,24 @@ _0811FB52: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x3 - bls _0811FB52 + bls @0811FB52 ldr r4, =0x0203a124 ldr r0, [r4] ldr r0, [r0, 0x24] cmp r0, 0 - beq _0811FB8A + beq @0811FB8A bl obj_delete_and_free_tiles ldr r0, [r4] str r7, [r0, 0x24] -_0811FB8A: +@0811FB8A: ldr r0, [r4] ldr r0, [r0, 0x28] cmp r0, 0 - beq _0811FB9A + beq @0811FB9A bl obj_delete_and_free_tiles ldr r0, [r4] str r7, [r0, 0x28] -_0811FB9A: +@0811FB9A: pop {r4-r7} pop {r0} bx r0 @@ -551726,7 +551726,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] @@ -551735,7 +551735,7 @@ sub_811FBA4: @ 811FBA4 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - beq _0811FBDC + beq @0811FBDC movs r0, 0x5 bl audio_play ldr r2, =0x0203a124 @@ -551745,20 +551745,20 @@ sub_811FBA4: @ 811FBA4 strb r0, [r1, 0x5] lsls r0, 24 cmp r0, 0 - bge _0811FC64 + bge @0811FC64 ldr r1, [r2] movs r0, 0x5 strb r0, [r1, 0x5] - b _0811FC64 + b @0811FC64 .align 2, 0 .pool -_0811FBDC: +@0811FBDC: movs r0, 0x80 ands r0, r1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq _0811FC0C + beq @0811FC0C movs r0, 0x5 bl audio_play ldr r2, =0x0203a124 @@ -551769,17 +551769,17 @@ _0811FBDC: lsls r0, 24 asrs r0, 24 cmp r0, 0x5 - ble _0811FC64 + ble @0811FC64 ldr r0, [r2] strb r5, [r0, 0x5] - b _0811FC64 + b @0811FC64 .align 2, 0 .pool -_0811FC0C: +@0811FC0C: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0811FC68 + beq @0811FC68 movs r0, 0x5 bl audio_play ldr r2, =0x0203a124 @@ -551787,24 +551787,24 @@ _0811FC0C: movs r1, 0x5 ldrsb r1, [r0, r1] cmp r1, 0x4 - beq _0811FC40 + beq @0811FC40 cmp r1, 0x5 - beq _0811FC76 + beq @0811FC76 adds r0, 0x6 adds r1, r0, r1 movs r2, 0 ldrb r0, [r1] cmp r0, 0 - bne _0811FC62 + bne @0811FC62 movs r2, 0x1 - b _0811FC62 + b @0811FC62 .align 2, 0 .pool -_0811FC40: +@0811FC40: strb r4, [r0, 0x4] movs r3, 0 adds r4, r2, 0 -_0811FC46: +@0811FC46: ldr r2, [r4] adds r0, r2, 0x6 adds r0, r3 @@ -551817,30 +551817,30 @@ _0811FC46: lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x3 - bls _0811FC46 - b _0811FC76 -_0811FC62: + bls @0811FC46 + b @0811FC76 +@0811FC62: strb r2, [r1] -_0811FC64: +@0811FC64: movs r0, 0x1 - b _0811FC78 -_0811FC68: + b @0811FC78 +@0811FC68: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0811FC64 + beq @0811FC64 movs r0, 0x5 bl audio_play -_0811FC76: +@0811FC76: movs r0, 0 -_0811FC78: +@0811FC78: pop {r4,r5} pop {r1} bx r1 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 @@ -551943,7 +551943,7 @@ sub_811FC80: @ 811FC80 add r7, r9 mov r3, r9 str r3, [sp, 0x4C] -_0811FD58: +@0811FD58: adds r0, r4, 0 mov r2, r10 asrs r1, r2, 16 @@ -551953,9 +551953,9 @@ _0811FD58: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 - bne _0811FD70 - b _0811FEFC -_0811FD70: + bne @0811FD70 + b @0811FEFC +@0811FD70: ldr r6, =0x0203a124 ldr r2, [r6] lsls r0, r5, 2 @@ -551974,7 +551974,7 @@ _0811FD70: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x1 - bls _0811FD58 + bls @0811FD58 ldr r0, [r6] ldr r1, [r0, 0x10] ldr r3, [sp, 0x4C] @@ -551999,7 +551999,7 @@ _0811FD70: lsls r1, 14 adds r0, r1 mov r9, r0 -_0811FDC8: +@0811FDC8: lsls r2, r5, 4 adds r2, 0x10 ldr r3, [sp, 0x4C] @@ -552016,9 +552016,9 @@ _0811FDC8: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 - bne _0811FDEE - b _0811FF0C -_0811FDEE: + bne @0811FDEE + b @0811FF0C +@0811FDEE: ldr r6, =0x0203a124 ldr r1, [r6] lsls r0, r5, 2 @@ -552035,7 +552035,7 @@ _0811FDEE: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x3 - bls _0811FDC8 + bls @0811FDC8 ldr r0, =nullsub_12 + 1 str r0, [r4, 0x14] adds r0, r4, 0 @@ -552046,7 +552046,7 @@ _0811FDEE: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 - beq _0811FEA8 + beq @0811FEA8 ldr r0, [r6] lsls r1, r3, 4 adds r1, r3 @@ -552084,14 +552084,14 @@ _0811FDEE: movs r2, 0x2 movs r3, 0 bl oam_center - b _0811FEAE + b @0811FEAE .align 2, 0 .pool -_0811FEA8: +@0811FEA8: ldr r1, [r6] movs r0, 0 str r0, [r1, 0x28] -_0811FEAE: +@0811FEAE: ldr r0, =sub_811FF7C + 1 str r0, [r4, 0x14] ldr r0, [sp, 0x48] @@ -552106,7 +552106,7 @@ _0811FEAE: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 - beq _0811FF20 + beq @0811FF20 ldr r0, =0x0203a124 ldr r2, [r0] lsls r1, r3, 4 @@ -552122,35 +552122,35 @@ _0811FEAE: ldr r0, [r2, 0x24] movs r1, 0x8 bl obj_anim_image_start - b _0811FF28 + b @0811FF28 .align 2, 0 .pool -_0811FEFC: +@0811FEFC: ldr r0, =0x0203a124 ldr r0, [r0] lsls r1, r5, 2 adds r0, 0xC - b _0811FF14 + b @0811FF14 .align 2, 0 .pool -_0811FF0C: +@0811FF0C: ldr r0, =0x0203a124 ldr r0, [r0] lsls r1, r5, 2 adds r0, 0x14 -_0811FF14: +@0811FF14: adds r0, r1 movs r1, 0 str r1, [r0] - b _0811FF28 + b @0811FF28 .align 2, 0 .pool -_0811FF20: +@0811FF20: ldr r0, =0x0203a124 ldr r1, [r0] movs r0, 0 str r0, [r1, 0x24] -_0811FF28: +@0811FF28: add sp, 0x50 pop {r3-r5} mov r8, r3 @@ -552164,12 +552164,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 @@ -552180,28 +552180,28 @@ sub_811FF40: @ 811FF40 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _0811FF6C + beq @0811FF6C lsls r1, 1 adds r1, 0x1 lsls r1, 24 lsrs r1, 24 adds r0, r2, 0 bl obj_anim_image_start - b _0811FF76 + b @0811FF76 .align 2, 0 .pool -_0811FF6C: +@0811FF6C: lsls r1, 25 lsrs r1, 24 adds r0, r2, 0 bl obj_anim_image_start -_0811FF76: +@0811FF76: pop {r0} bx r0 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] @@ -552217,16 +552217,16 @@ 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 lsls r1, 16 lsrs r1, 16 cmp r2, 0 - bne _0811FFA4 + bne @0811FFA4 ldr r2, =0x0859e65c -_0811FFA4: +@0811FFA4: movs r3, 0x10 bl sub_811FFD4 pop {r1} @@ -552236,16 +552236,16 @@ _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 lsls r1, 16 lsrs r1, 16 cmp r2, 0 - bne _0811FFC4 + bne @0811FFC4 ldr r2, =0x0859e65c -_0811FFC4: +@0811FFC4: movs r3, 0x1 bl sub_811FFD4 pop {r1} @@ -552255,7 +552255,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} @@ -552311,18 +552311,18 @@ sub_811FFD4: @ 811FFD4 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - bne _08120068 + bne @08120068 movs r0, 0 - b _08120072 + b @08120072 .align 2, 0 .pool -_08120068: +@08120068: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 -_08120072: +@08120072: add sp, 0x28 pop {r3} mov r8, r3 @@ -552334,7 +552334,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 @@ -552350,7 +552350,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] @@ -552370,7 +552370,7 @@ sub_81200A0: @ 81200A0 ldr r0, =0x00002e2a adds r2, r0 ldr r4, =0x0859efe4 -_081200C6: +@081200C6: lsls r0, r3, 1 adds r1, r2, r0 adds r0, r4 @@ -552380,7 +552380,7 @@ _081200C6: lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x5 - bls _081200C6 + bls @081200C6 pop {r4} pop {r0} bx r0 @@ -552389,7 +552389,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 @@ -552407,7 +552407,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} @@ -552415,7 +552415,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 @@ -552435,7 +552435,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} @@ -552443,7 +552443,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] @@ -552456,43 +552456,43 @@ sub_8120160: @ 8120160 lsls r0, 16 lsrs r0, 17 cmp r0, 0x4 - bhi _081201C0 + bhi @081201C0 lsls r0, 2 - ldr r1, =_08120190 + ldr r1, =@08120190 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08120190: - .4byte _081201A4 - .4byte _081201AA - .4byte _081201B0 - .4byte _081201B6 - .4byte _081201BC -_081201A4: +@08120190: + .4byte @081201A4 + .4byte @081201AA + .4byte @081201B0 + .4byte @081201B6 + .4byte @081201BC +@081201A4: bl sub_81200A0 - b _081201C0 -_081201AA: + b @081201C0 +@081201AA: bl sub_81200F8 - b _081201C0 -_081201B0: + b @081201C0 +@081201B0: bl sub_8120154 - b _081201C0 -_081201B6: + b @081201C0 +@081201B6: bl sub_812011C - b _081201C0 -_081201BC: + b @081201C0 +@081201BC: bl sub_8120128 -_081201C0: +@081201C0: bl sub_8120B5C pop {r0} bx r0 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 @@ -552504,7 +552504,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 @@ -552519,7 +552519,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] @@ -552533,7 +552533,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] @@ -552547,7 +552547,7 @@ sub_8120210: @ 8120210 movs r2, 0 ldr r0, =0x00002e4d adds r4, r0 -_0812022C: +@0812022C: adds r1, r4, r2 ldr r0, [r5] adds r0, 0xA @@ -552558,14 +552558,14 @@ _0812022C: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x3 - bls _0812022C + bls @0812022C movs r2, 0 adds r5, r6, 0 adds r5, 0x29 adds r3, r6, 0x2 adds r4, r6, 0 adds r4, 0xE -_0812024E: +@0812024E: lsls r0, r2, 1 adds r1, r3, r0 adds r0, r4, r0 @@ -552575,7 +552575,7 @@ _0812024E: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x5 - bls _0812024E + bls @0812024E movs r0, 0x1 strb r0, [r5] pop {r4-r6} @@ -552586,7 +552586,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] @@ -552595,14 +552595,14 @@ sub_8120280: @ 8120280 ldr r2, =0x00002e36 adds r5, r1, r2 cmp r0, 0 - bne _08120296 + bne @08120296 ldr r0, =0x00002e2a adds r5, r1, r0 -_08120296: +@08120296: ldr r2, =0x02021fc4 adds r4, r2, 0 movs r6, 0 -_0812029C: +@0812029C: ldrh r1, [r5] adds r5, 0x2 adds r0, r2, 0 @@ -552610,18 +552610,18 @@ _0812029C: adds r2, r0, 0 adds r7, r6, 0x1 cmp r2, r4 - beq _081202BE + beq @081202BE movs r1, 0x37 -_081202B0: +@081202B0: ldrb r0, [r4] cmp r0, 0 - bne _081202B8 + bne @081202B8 strb r1, [r4] -_081202B8: +@081202B8: adds r4, 0x1 cmp r2, r4 - bne _081202B0 -_081202BE: + bne @081202B0 +@081202BE: adds r4, 0x1 movs r0, 0 strb r0, [r2] @@ -552632,18 +552632,18 @@ _081202BE: bl sub_811EBBC adds r2, r0, 0 cmp r2, r4 - beq _081202E6 + beq @081202E6 movs r1, 0x37 -_081202D8: +@081202D8: ldrb r0, [r4] cmp r0, 0 - bne _081202E0 + bne @081202E0 strb r1, [r4] -_081202E0: +@081202E0: adds r4, 0x1 cmp r2, r4 - bne _081202D8 -_081202E6: + bne @081202D8 +@081202E6: adds r4, 0x1 movs r0, 0xFE strb r0, [r2] @@ -552654,31 +552654,31 @@ _081202E6: bl sub_811EBBC adds r2, r0, 0 cmp r2, r4 - beq _0812030E + beq @0812030E movs r1, 0x37 -_08120300: +@08120300: ldrb r0, [r4] cmp r0, 0 - bne _08120308 + bne @08120308 strb r1, [r4] -_08120308: +@08120308: adds r4, 0x1 cmp r2, r4 - bne _08120300 -_0812030E: + bne @08120300 +@0812030E: cmp r6, 0 - bne _0812031E + bne @0812031E movs r0, 0xFC strb r0, [r2] adds r2, 0x1 movs r0, 0xF strb r0, [r2] adds r2, 0x1 -_0812031E: +@0812031E: lsls r0, r7, 16 lsrs r6, r0, 16 cmp r6, 0x1 - bls _0812029C + bls @0812029C pop {r4-r7} pop {r0} bx r0 @@ -552687,7 +552687,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] @@ -552700,7 +552700,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] @@ -552714,7 +552714,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 @@ -552727,25 +552727,25 @@ 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 lsrs r1, r0, 16 ldr r0, =0x0000ffff cmp r1, r0 - bne _081203AC + bne @081203AC ldr r1, =0x020375f0 movs r0, 0 - b _081203B6 + b @081203B6 .align 2, 0 .pool -_081203AC: +@081203AC: ldr r0, =0x02021cc4 bl sub_811EBBC ldr r1, =0x020375f0 movs r0, 0x1 -_081203B6: +@081203B6: strh r0, [r1] pop {r0} bx r0 @@ -552754,7 +552754,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] @@ -552762,19 +552762,19 @@ sub_81203C4: @ 81203C4 adds r2, r0, r1 ldrb r0, [r2, 0x1] cmp r0, 0xA - bne _081203EC + bne @081203EC ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] strb r0, [r2, 0x1] - b _081203F2 + b @081203F2 .align 2, 0 .pool -_081203EC: +@081203EC: ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] -_081203F2: +@081203F2: pop {r0} bx r0 .align 2, 0 @@ -552782,7 +552782,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] @@ -552790,9 +552790,9 @@ sub_81203FC: @ 81203FC adds r5, r4, r0 ldrb r0, [r5, 0x1] cmp r0, 0 - bne _08120410 + bne @08120410 bl sub_81204DC -_08120410: +@08120410: ldrb r0, [r5, 0x1] lsls r0, 1 ldr r1, =0x00002e2c @@ -552801,7 +552801,7 @@ _08120410: ldrh r1, [r0] ldr r0, =0x0000ffff cmp r1, r0 - beq _08120480 + beq @08120480 bl GenerateRandomNumber adds r4, r0, 0 lsls r4, 16 @@ -552827,10 +552827,10 @@ _08120410: adds r2, r0, 0 ldr r1, =0x08294301 bl gf_strcpy - b _081204A2 + b @081204A2 .align 2, 0 .pool -_08120480: +@08120480: ldr r0, =0x02021fc4 ldr r3, =0x0859f010 ldrb r2, [r5, 0x2] @@ -552847,7 +552847,7 @@ _08120480: adds r1, r3 ldr r1, [r1] bl gf_strcpy -_081204A2: +@081204A2: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -552855,15 +552855,15 @@ _081204A2: bl __umodsi3 lsls r0, 16 cmp r0, 0 - bne _081204C4 + bne @081204C4 movs r0, 0xA - b _081204C8 + b @081204C8 .align 2, 0 .pool -_081204C4: +@081204C4: ldrb r0, [r5, 0x1] adds r0, 0x1 -_081204C8: +@081204C8: strb r0, [r5, 0x1] ldr r1, =0x020375f0 movs r0, 0x1 @@ -552876,7 +552876,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 @@ -552900,20 +552900,20 @@ sub_81204DC: @ 81204DC lsls r2, 6 adds r3, r4, r2 adds r1, r3, 0 -_0812050C: +@0812050C: adds r0, r3, r5 strb r5, [r0] adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x7 - bls _0812050C + bls @0812050C movs r5, 0 ldr r3, [sp, 0x18] adds r3, 0x4 mov r9, r3 adds r6, r1, 0 -_08120524: +@08120524: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -552931,11 +552931,11 @@ _08120524: lsls r4, 16 lsrs r5, r4, 16 cmp r5, 0x7 - bls _08120524 + bls @08120524 movs r0, 0 mov r10, r0 movs r5, 0 -_08120552: +@08120552: lsls r4, r5, 2 mov r1, sp adds r0, r1, r4 @@ -552951,13 +552951,13 @@ _08120552: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x5 - bls _08120552 + bls @08120552 movs r0, 0 ldr r2, [sp, 0x18] strb r0, [r2, 0x2] movs r7, 0 movs r5, 0 -_0812057E: +@0812057E: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -552966,9 +552966,9 @@ _0812057E: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x2 - bhi _081205BC + bhi @081205BC cmp r7, 0x7 - bhi _081205BC + bhi @081205BC lsls r0, r5, 1 add r0, r9 ldr r1, =0x0000ffff @@ -552977,10 +552977,10 @@ _0812057E: lsls r0, 16 lsrs r7, r0, 16 adds r4, r5, 0x1 - b _0812060E + b @0812060E .align 2, 0 .pool -_081205BC: +@081205BC: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -552992,30 +552992,30 @@ _081205BC: adds r4, r5, 0x1 lsls r6, r5, 1 cmp r5, 0x5 - bhi _081205F8 + bhi @081205F8 mov r3, r8 ldrh r0, [r3] - b _081205EE -_081205DE: + b @081205EE +@081205DE: adds r0, r1, 0x1 lsls r0, 16 lsrs r1, r0, 16 cmp r5, 0x5 - bhi _081205F8 + bhi @081205F8 lsls r0, r1, 2 adds r0, r3, r0 ldrh r0, [r0] -_081205EE: +@081205EE: subs r0, r2, r0 lsls r0, 16 lsrs r2, r0, 16 cmp r0, 0 - bgt _081205DE -_081205F8: + bgt @081205DE +@081205F8: cmp r1, 0x6 - bne _081205FE + bne @081205FE movs r1, 0 -_081205FE: +@081205FE: lsls r0, r1, 2 add r0, sp ldrh r0, [r0] @@ -553023,11 +553023,11 @@ _081205FE: mov r2, r9 adds r1, r2, r6 strh r0, [r1] -_0812060E: +@0812060E: lsls r0, r4, 16 lsrs r5, r0, 16 cmp r5, 0x9 - bls _0812057E + bls @0812057E add sp, 0x1C pop {r3-r5} mov r8, r3 @@ -553039,7 +553039,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 @@ -553052,7 +553052,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 @@ -553065,7 +553065,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} @@ -553073,7 +553073,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} @@ -553081,46 +553081,46 @@ 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 lsrs r0, 24 cmp r0, 0x4 - bhi _081206B6 + bhi @081206B6 lsls r0, 2 - ldr r1, =_0812068C + ldr r1, =@0812068C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0812068C: - .4byte _081206A0 - .4byte _081206A6 - .4byte _081206B2 - .4byte _081206AC - .4byte _081206B6 -_081206A0: +@0812068C: + .4byte @081206A0 + .4byte @081206A6 + .4byte @081206B2 + .4byte @081206AC + .4byte @081206B6 +@081206A0: bl sub_8120628 - b _081206B6 -_081206A6: + b @081206B6 +@081206A6: bl sub_8120640 - b _081206B6 -_081206AC: + b @081206B6 +@081206AC: bl sub_8120664 - b _081206B6 -_081206B2: + b @081206B6 +@081206B2: bl sub_8120658 -_081206B6: +@081206B6: bl sub_8120B5C pop {r0} bx r0 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 @@ -553144,7 +553144,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] @@ -553154,7 +553154,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] @@ -553164,7 +553164,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 @@ -553195,31 +553195,31 @@ 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 ldrsh r0, [r0, r1] cmp r0, 0x5 - bls _08120756 - b _08120938 -_08120756: + bls @08120756 + b @08120938 +@08120756: lsls r0, 2 - ldr r1, =_08120764 + ldr r1, =@08120764 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08120764: - .4byte _0812077C - .4byte _08120938 - .4byte _081207BC - .4byte _081207F8 - .4byte _081207F8 - .4byte _08120938 -_0812077C: +@08120764: + .4byte @0812077C + .4byte @08120938 + .4byte @081207BC + .4byte @081207F8 + .4byte @081207F8 + .4byte @08120938 +@0812077C: ldr r0, =0x03005d8c ldr r2, [r0] ldr r0, =0x020375e0 @@ -553227,28 +553227,28 @@ _0812077C: ldr r3, =0x00002e36 adds r1, r2, r3 cmp r0, 0 - bne _08120790 + bne @08120790 ldr r0, =0x00002e2a adds r1, r2, r0 -_08120790: +@08120790: adds r2, r1, 0 adds r1, r6, 0 adds r1, 0xC movs r3, 0x5 -_08120798: +@08120798: ldrh r0, [r2] strh r0, [r1] adds r2, 0x2 adds r1, 0x2 subs r3, 0x1 cmp r3, 0 - bge _08120798 + bge @08120798 movs r0, 0 strb r0, [r6] - b _08120938 + b @08120938 .align 2, 0 .pool -_081207BC: +@081207BC: ldrb r1, [r6] lsls r1, 1 adds r0, r6, 0 @@ -553272,41 +553272,41 @@ _081207BC: ldr r0, [r6, 0x30] ldrb r0, [r0] cmp r0, 0xFF - beq _081207F4 + beq @081207F4 movs r0, 0 - b _08120936 -_081207F4: + b @08120936 +@081207F4: movs r0, 0x3 - b _0812091A -_081207F8: + b @0812091A +@081207F8: ldrb r3, [r6, 0x1] lsls r1, r3, 3 ldr r0, [r6, 0x30] adds r2, r0, r1 ldrb r1, [r6, 0x3] cmp r1, 0x1 - beq _081208A0 + beq @081208A0 cmp r1, 0x1 - bgt _08120810 + bgt @08120810 cmp r1, 0 - beq _0812081C - b _08120938 -_08120810: + beq @0812081C + b @08120938 +@08120810: cmp r1, 0x2 - beq _08120850 + beq @08120850 cmp r1, 0x3 - bne _0812081A - b _08120922 -_0812081A: - b _08120938 -_0812081C: + bne @0812081A + b @08120922 +@0812081A: + b @08120938 +@0812081C: lsls r0, r3, 2 adds r0, r6, r0 ldrh r0, [r0, 0x18] strb r0, [r6, 0x2] ldrb r0, [r2] cmp r0, 0x32 - bhi _08120844 + bhi @08120844 movs r1, 0x3 bl __udivsi3 adds r1, r0, 0 @@ -553318,19 +553318,19 @@ _0812081C: lsls r1, 2 adds r0, r1 bl m4aSongNumStart -_08120844: +@08120844: movs r0, 0x2 strb r0, [r6, 0x3] ldrb r0, [r6, 0x2] subs r0, 0x1 strb r0, [r6, 0x2] - b _08120938 -_08120850: + b @08120938 +@08120850: movs r0, 0x1 strb r0, [r6, 0x3] ldrb r0, [r2] cmp r0, 0x32 - bhi _08120938 + bhi @08120938 movs r3, 0x4 ldrsh r0, [r2, r3] lsls r0, 4 @@ -553358,29 +553358,29 @@ _08120850: adds r0, r4, 0 adds r1, r5, 0 bl MPlayPitchControl - b _08120938 + b @08120938 .align 2, 0 .pool -_081208A0: +@081208A0: ldrh r2, [r6, 0xA] movs r3, 0xA ldrsh r0, [r6, r3] cmp r0, 0xA - ble _081208B0 + ble @081208B0 ldrh r0, [r6, 0x6] subs r0, 0x2 strh r0, [r6, 0x6] -_081208B0: +@081208B0: ands r1, r2 cmp r1, 0 - beq _081208BC + beq @081208BC ldrh r0, [r6, 0x8] adds r0, 0x40 - b _081208C0 -_081208BC: + b @081208C0 +@081208BC: ldrh r0, [r6, 0x8] subs r0, 0x40 -_081208C0: +@081208C0: strh r0, [r6, 0x8] ldr r4, =0x03007630 ldr r5, =0x0000ffff @@ -553401,45 +553401,45 @@ _081208C0: strb r0, [r6, 0x2] lsls r0, 24 cmp r0, 0 - bne _08120938 + bne @08120938 ldrb r0, [r6, 0x1] adds r0, 0x1 strb r0, [r6, 0x1] lsls r0, 24 lsrs r0, 24 cmp r0, 0x6 - beq _08120918 + beq @08120918 ldrb r0, [r6, 0x1] ldr r1, [r6, 0x30] lsls r0, 3 adds r0, r1 ldrb r0, [r0] cmp r0, 0xFF - beq _08120918 + beq @08120918 movs r0, 0 - b _08120936 + b @08120936 .align 2, 0 .pool -_08120918: +@08120918: movs r0, 0x3 -_0812091A: +@0812091A: strb r0, [r6, 0x3] movs r0, 0x2 strb r0, [r6, 0x2] - b _08120938 -_08120922: + b @08120938 +@08120922: ldrb r0, [r6, 0x2] subs r0, 0x1 strb r0, [r6, 0x2] lsls r0, 24 cmp r0, 0 - bne _08120938 + bne @08120938 ldr r0, =0x03007630 bl MPlayStop_rev01 movs r0, 0x4 -_08120936: +@08120936: strb r0, [r6, 0x3] -_08120938: +@08120938: pop {r4-r6} pop {r0} bx r0 @@ -553448,7 +553448,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 @@ -553463,25 +553463,25 @@ sub_8120944: @ 8120944 movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0x5 - bls _08120966 - b _08120B50 -_08120966: + bls @08120966 + b @08120B50 +@08120966: lsls r0, 2 - ldr r1, =_0812097C + ldr r1, =@0812097C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0812097C: - .4byte _08120994 - .4byte _081209B8 - .4byte _081209C8 - .4byte _08120A7E - .4byte _08120B40 - .4byte _08120A6E -_08120994: +@0812097C: + .4byte @08120994 + .4byte @081209B8 + .4byte @081209C8 + .4byte @08120A7E + .4byte @08120B40 + .4byte @08120A6E +@08120994: bl sub_8120280 ldr r0, =0x02021fc4 bl sub_8120708 @@ -553493,19 +553493,19 @@ _08120994: movs r0, 0x4 bl sub_80A31E8 movs r0, 0x1 - b _08120B4E + b @08120B4E .align 2, 0 .pool -_081209B8: +@081209B8: bl sub_80A3200 lsls r0, 24 cmp r0, 0 - bne _081209C4 - b _08120B50 -_081209C4: + bne @081209C4 + b @08120B50 +@081209C4: movs r0, 0x2 - b _08120B4E -_081209C8: + b @08120B4E +@081209C8: ldr r0, =0x03005d8c ldr r0, [r0] ldr r2, =0x00002e28 @@ -553519,39 +553519,39 @@ _081209C8: ldr r7, =0x03006130 ldrh r2, [r5, 0x12] ldr r6, =0x0203a128 - b _08120A02 + b @08120A02 .align 2, 0 .pool -_081209F8: +@081209F8: adds r1, 0x1 adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 ldrb r0, [r1] -_08120A02: +@08120A02: cmp r0, 0 - beq _08120A12 + beq @08120A12 cmp r0, 0xFE - beq _08120A12 + beq @08120A12 cmp r0, 0xFC - beq _08120A12 + beq @08120A12 cmp r0, 0xFF - bne _081209F8 -_08120A12: + bne @081209F8 +@08120A12: cmp r2, 0 - bne _08120A20 + bne @08120A20 movs r2, 0x10 ldrsh r1, [r5, r2] lsls r1, 1 adds r0, r4, 0x2 - b _08120A2A -_08120A20: + b @08120A2A +@08120A20: movs r0, 0x10 ldrsh r1, [r5, r0] lsls r1, 1 adds r0, r4, 0 adds r0, 0xE -_08120A2A: +@08120A2A: adds r0, r1 ldrh r0, [r0] movs r1, 0x3 @@ -553569,42 +553569,42 @@ _08120A2A: strh r0, [r7, 0x4] lsls r0, 16 cmp r0, 0 - bgt _08120A54 + bgt @08120A54 movs r0, 0x1 strh r0, [r7, 0x4] -_08120A54: +@08120A54: ldrh r0, [r5, 0x10] adds r0, 0x1 strh r0, [r5, 0x10] movs r2, 0xC ldrsh r0, [r5, r2] cmp r0, 0 - bne _08120A66 + bne @08120A66 movs r0, 0x3 - b _08120A68 -_08120A66: + b @08120A68 +@08120A66: movs r0, 0x5 -_08120A68: +@08120A68: strh r0, [r5, 0x8] strh r1, [r5, 0xA] - b _08120B50 -_08120A6E: + b @08120B50 +@08120A6E: ldrh r1, [r5, 0xC] movs r2, 0xC ldrsh r0, [r5, r2] cmp r0, 0 - beq _08120B4C + beq @08120B4C subs r0, r1, 0x1 strh r0, [r5, 0xC] - b _08120B50 -_08120A7E: + b @08120B50 +@08120A7E: ldr r1, =0x02021fc4 movs r2, 0xE ldrsh r0, [r5, r2] adds r0, r1 ldrb r4, [r0] cmp r4, 0xFF - bne _08120AB0 + bne @08120AB0 movs r0, 0x6 bl sub_80A3228 ldr r0, =0x03007630 @@ -553613,12 +553613,12 @@ _08120A7E: bl script_env_2_enable_and_set_ctx_running adds r0, r6, 0 bl remove_task - b _08120B50 + b @08120B50 .align 2, 0 .pool -_08120AB0: +@08120AB0: cmp r4, 0 - bne _08120AC6 + bne @08120AC6 bl sub_81206F0 ldrh r0, [r5, 0xE] adds r0, 0x1 @@ -553626,10 +553626,10 @@ _08120AB0: movs r0, 0x2 strh r0, [r5, 0x8] strh r4, [r5, 0xC] - b _08120B50 -_08120AC6: + b @08120B50 +@08120AC6: cmp r4, 0xFE - bne _08120ADA + bne @08120ADA ldrh r0, [r5, 0xE] adds r0, 0x1 movs r1, 0 @@ -553637,10 +553637,10 @@ _08120AC6: movs r0, 0x2 strh r0, [r5, 0x8] strh r1, [r5, 0xC] - b _08120B50 -_08120ADA: + b @08120B50 +@08120ADA: cmp r4, 0xFC - bne _08120AEE + bne @08120AEE ldrh r0, [r5, 0xE] adds r0, 0x2 strh r0, [r5, 0xE] @@ -553648,10 +553648,10 @@ _08120ADA: strh r0, [r5, 0x8] movs r0, 0x8 strh r0, [r5, 0xC] - b _08120B50 -_08120AEE: + b @08120B50 +@08120AEE: cmp r4, 0x37 - bne _08120B04 + bne @08120B04 movs r4, 0 strb r4, [r0] bl sub_81206F0 @@ -553659,29 +553659,29 @@ _08120AEE: adds r0, 0x1 strh r0, [r5, 0xE] strh r4, [r5, 0xC] - b _08120B50 -_08120B04: + b @08120B50 +@08120B04: movs r1, 0xA ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _08120B20 + beq @08120B20 cmp r0, 0x1 - bgt _08120B16 + bgt @08120B16 cmp r0, 0 - beq _08120B1C - b _08120B50 -_08120B16: + beq @08120B1C + b @08120B50 +@08120B16: cmp r0, 0x2 - beq _08120B28 - b _08120B50 -_08120B1C: + beq @08120B28 + b @08120B50 +@08120B1C: bl sub_81206F0 -_08120B20: +@08120B20: ldrh r0, [r5, 0xA] adds r0, 0x1 strh r0, [r5, 0xA] - b _08120B50 -_08120B28: + b @08120B50 +@08120B28: ldrh r0, [r5, 0xE] adds r0, 0x1 movs r1, 0 @@ -553691,21 +553691,21 @@ _08120B28: ldrh r0, [r0, 0x4] strh r0, [r5, 0xC] movs r0, 0x4 - b _08120B4E + b @08120B4E .align 2, 0 .pool -_08120B40: +@08120B40: ldrh r0, [r5, 0xC] subs r0, 0x1 strh r0, [r5, 0xC] lsls r0, 16 cmp r0, 0 - bne _08120B50 -_08120B4C: + bne @08120B50 +@08120B4C: movs r0, 0x3 -_08120B4E: +@08120B4E: strh r0, [r5, 0x8] -_08120B50: +@08120B50: bl sub_8197224 pop {r4-r7} pop {r0} @@ -553713,7 +553713,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 @@ -553725,48 +553725,48 @@ 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] cmp r1, 0x2 - beq _08120B80 + beq @08120B80 cmp r1, 0x3 - beq _08120BA6 - b _08120C00 -_08120B80: + beq @08120BA6 + b @08120C00 +@08120B80: adds r5, r0, 0 movs r4, 0 -_08120B84: +@08120B84: adds r0, r5, 0 adds r0, 0x32 adds r0, r4 ldrb r0, [r0] cmp r0, 0x1 - bne _08120B9E + bne @08120B9E movs r0, 0xB muls r0, r4 adds r0, 0x5 adds r0, r5, r0 movs r1, 0x1 bl sub_8009308 -_08120B9E: +@08120B9E: adds r4, 0x1 cmp r4, 0x3 - ble _08120B84 - b _08120C00 -_08120BA6: + ble @08120B84 + b @08120C00 +@08120BA6: adds r6, r0, 0 movs r4, 0 mov r7, sp adds r5, r6, 0 adds r5, 0x8 -_08120BB0: +@08120BB0: adds r0, r6, 0x4 adds r0, r4 ldrb r0, [r0] cmp r0, 0 - beq _08120BF8 + beq @08120BF8 mov r0, sp adds r1, r5, 0 movs r2, 0x7 @@ -553776,7 +553776,7 @@ _08120BB0: mov r0, sp bl sub_8009228 cmp r0, 0 - beq _08120BF8 + beq @08120BF8 mov r0, sp movs r1, 0 movs r2, 0x8 @@ -553793,12 +553793,12 @@ _08120BB0: adds r0, r4 movs r1, 0x2 strb r1, [r0] -_08120BF8: +@08120BF8: adds r5, 0x7 adds r4, 0x1 cmp r4, 0x3 - ble _08120BB0 -_08120C00: + ble @08120BB0 +@08120C00: add sp, 0x8 pop {r4-r7} pop {r0} @@ -553808,7 +553808,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} @@ -553817,102 +553817,102 @@ sub_8120C0C: @ 8120C0C adds r7, r2, 0 ldrb r0, [r5] cmp r0, 0x4 - bhi _08120CC4 + bhi @08120CC4 lsls r0, 2 - ldr r1, =_08120C2C + ldr r1, =@08120C2C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08120C2C: - .4byte _08120C92 - .4byte _08120CA2 - .4byte _08120C40 - .4byte _08120C6A - .4byte _08120CB0 -_08120C40: +@08120C2C: + .4byte @08120C92 + .4byte @08120CA2 + .4byte @08120C40 + .4byte @08120C6A + .4byte @08120CB0 +@08120C40: adds r6, r5, 0 movs r5, 0 adds r4, r6, 0 adds r4, 0x32 -_08120C48: +@08120C48: movs r0, 0xB muls r0, r5 adds r0, 0x5 adds r0, r6, r0 bl sub_8009228 cmp r0, 0 - beq _08120C5E + beq @08120C5E mov r0, r8 strb r0, [r4] - b _08120C60 -_08120C5E: + b @08120C60 +@08120C5E: strb r7, [r4] -_08120C60: +@08120C60: adds r4, 0x1 adds r5, 0x1 cmp r5, 0x3 - ble _08120C48 - b _08120CC4 -_08120C6A: + ble @08120C48 + b @08120CC4 +@08120C6A: adds r4, r5, 0 adds r4, 0x34 adds r6, r5, 0 adds r6, 0x8 movs r5, 0x3 -_08120C74: +@08120C74: adds r0, r6, 0 bl sub_8009228 cmp r0, 0 - beq _08120C84 + beq @08120C84 mov r1, r8 strb r1, [r4] - b _08120C86 -_08120C84: + b @08120C86 +@08120C84: strb r7, [r4] -_08120C86: +@08120C86: adds r4, 0x1 adds r6, 0x7 subs r5, 0x1 cmp r5, 0 - bge _08120C74 - b _08120CC4 -_08120C92: + bge @08120C74 + b @08120CC4 +@08120C92: cmp r3, 0x1 - bne _08120C9C + bne @08120C9C adds r0, r5, 0 adds r0, 0x2A - b _08120CB8 -_08120C9C: + b @08120CB8 +@08120C9C: adds r0, r5, 0 adds r0, 0x2A - b _08120CC2 -_08120CA2: + b @08120CC2 +@08120CA2: cmp r3, 0x1 - bne _08120CAC + bne @08120CAC mov r0, r8 strb r0, [r5, 0x2] - b _08120CC4 -_08120CAC: + b @08120CC4 +@08120CAC: strb r7, [r5, 0x2] - b _08120CC4 -_08120CB0: + b @08120CC4 +@08120CB0: cmp r3, 0x1 - bne _08120CBE + bne @08120CBE adds r0, r5, 0 adds r0, 0x20 -_08120CB8: +@08120CB8: mov r1, r8 strb r1, [r0] - b _08120CC4 -_08120CBE: + b @08120CC4 +@08120CBE: adds r0, r5, 0 adds r0, 0x20 -_08120CC2: +@08120CC2: strb r7, [r0] -_08120CC4: +@08120CC4: pop {r3} mov r8, r3 pop {r4-r7} @@ -553921,7 +553921,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} @@ -553929,9 +553929,9 @@ sub_8120CD0: @ 8120CD0 adds r1, r0, 0 ldrb r0, [r1] cmp r0, 0x3 - bne _08120D28 + bne @08120D28 cmp r2, 0x1 - bne _08120D28 + bne @08120D28 adds r7, r1, 0 movs r6, 0 mov r8, sp @@ -553939,12 +553939,12 @@ sub_8120CD0: @ 8120CD0 adds r4, 0x34 adds r5, r7, 0 adds r5, 0x8 -_08120CF2: +@08120CF2: adds r0, r7, 0x4 adds r0, r6 ldrb r0, [r0] cmp r0, 0 - beq _08120D1E + beq @08120D1E mov r0, sp adds r1, r5, 0 movs r2, 0x7 @@ -553955,20 +553955,20 @@ _08120CF2: mov r0, sp bl sub_8009228 cmp r0, 0 - beq _08120D1A + beq @08120D1A movs r0, 0x1 - b _08120D1C -_08120D1A: + b @08120D1C +@08120D1A: movs r0, 0x2 -_08120D1C: +@08120D1C: strb r0, [r4] -_08120D1E: +@08120D1E: adds r4, 0x1 adds r5, 0x7 adds r6, 0x1 cmp r6, 0x3 - ble _08120CF2 -_08120D28: + ble @08120CF2 +@08120D28: add sp, 0x8 pop {r3} mov r8, r3 @@ -553978,128 +553978,128 @@ _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 movs r2, 0 subs r1, 0x1 cmp r1, 0x1 - bhi _08120D44 + bhi @08120D44 movs r2, 0x1 -_08120D44: +@08120D44: ldrb r0, [r3] cmp r0, 0x4 - bhi _08120E02 + bhi @08120E02 lsls r0, 2 - ldr r1, =_08120D58 + ldr r1, =@08120D58 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08120D58: - .4byte _08120DE6 - .4byte _08120DF0 - .4byte _08120D6C - .4byte _08120DC6 - .4byte _08120DF8 -_08120D6C: +@08120D58: + .4byte @08120DE6 + .4byte @08120DF0 + .4byte @08120D6C + .4byte @08120DC6 + .4byte @08120DF8 +@08120D6C: adds r7, r3, 0 cmp r2, 0 - beq _08120DA4 + beq @08120DA4 movs r5, 0 adds r4, r3, 0 adds r4, 0x32 -_08120D78: +@08120D78: movs r0, 0xB muls r0, r5 adds r0, 0x5 adds r1, r7, r0 ldrb r0, [r1] cmp r0, 0xFC - bne _08120D98 + bne @08120D98 ldrb r0, [r1, 0x1] cmp r0, 0x15 - bne _08120D98 + bne @08120D98 adds r0, r1, 0 bl sub_8009370 movs r0, 0x1 strb r0, [r4] - b _08120D9A -_08120D98: + b @08120D9A +@08120D98: strb r6, [r4] -_08120D9A: +@08120D9A: adds r4, 0x1 adds r5, 0x1 cmp r5, 0x3 - ble _08120D78 - b _08120E02 -_08120DA4: + ble @08120D78 + b @08120E02 +@08120DA4: movs r5, 0 adds r4, r3, 0 adds r4, 0x32 -_08120DAA: +@08120DAA: adds r0, r4, r5 ldrb r0, [r0] cmp r0, 0x1 - bne _08120DBE + bne @08120DBE movs r0, 0xB muls r0, r5 adds r0, 0x5 adds r0, r7, r0 bl sub_8009370 -_08120DBE: +@08120DBE: adds r5, 0x1 cmp r5, 0x3 - ble _08120DAA - b _08120E02 -_08120DC6: + ble @08120DAA + b @08120E02 +@08120DC6: cmp r2, 0 - beq _08120E02 + beq @08120E02 movs r1, 0 adds r4, r3, 0x4 adds r2, r3, 0 adds r2, 0x34 -_08120DD2: +@08120DD2: adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0 - beq _08120DDE + beq @08120DDE adds r0, r2, r1 strb r6, [r0] -_08120DDE: +@08120DDE: adds r1, 0x1 cmp r1, 0x3 - ble _08120DD2 - b _08120E02 -_08120DE6: + ble @08120DD2 + b @08120E02 +@08120DE6: cmp r2, 0 - beq _08120E02 + beq @08120E02 adds r0, r3, 0 adds r0, 0x2A - b _08120E00 -_08120DF0: + b @08120E00 +@08120DF0: cmp r2, 0 - beq _08120E02 + beq @08120E02 strb r6, [r3, 0x2] - b _08120E02 -_08120DF8: + b @08120E02 +@08120DF8: cmp r2, 0 - beq _08120E02 + beq @08120E02 adds r0, r3, 0 adds r0, 0x20 -_08120E00: +@08120E00: strb r6, [r0] -_08120E02: +@08120E02: pop {r4-r7} pop {r0} bx r0 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 @@ -554114,7 +554114,7 @@ sub_8120E08: @ 8120E08 strb r3, [r0, 0x1] movs r5, 0 movs r4, 0xFF -_08120E24: +@08120E24: ldr r0, [r2] adds r0, 0x4 adds r0, r3 @@ -554127,7 +554127,7 @@ _08120E24: strb r0, [r1] adds r3, 0x1 cmp r3, 0x3 - ble _08120E24 + ble @08120E24 pop {r4,r5} pop {r0} bx r0 @@ -554136,7 +554136,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] @@ -554154,40 +554154,40 @@ 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 cmp r0, 0x32 - bne _08120E80 + bne @08120E80 movs r0, 0 -_08120E80: +@08120E80: bl sub_80847F8 pop {r1} bx r1 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 ldr r1, =0x0859f048 -_08120E90: +@08120E90: ldrb r0, [r1] cmp r0, r3 - bne _08120EA0 + bne @08120EA0 adds r0, r1, 0 - b _08120EAA + b @08120EAA .align 2, 0 .pool -_08120EA0: +@08120EA0: adds r1, 0x10 adds r2, 0x1 cmp r2, 0x23 - ble _08120E90 + ble @08120E90 ldr r0, =0x0859f278 -_08120EAA: +@08120EAA: pop {r1} bx r1 .align 2, 0 @@ -554195,7 +554195,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] @@ -554204,7 +554204,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] @@ -554213,7 +554213,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] @@ -554222,27 +554222,27 @@ 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 ldr r0, [r2] ldrb r0, [r0, 0x4] cmp r0, 0 - beq _08120EFC -_08120EE6: + beq @08120EFC +@08120EE6: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x3 - bhi _08120EFC + bhi @08120EFC ldr r0, [r2] adds r0, 0x4 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _08120EE6 -_08120EFC: + bne @08120EE6 +@08120EFC: adds r0, r1, 0 pop {r1} bx r1 @@ -554251,7 +554251,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 @@ -554273,7 +554273,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 @@ -554292,7 +554292,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 @@ -554305,21 +554305,21 @@ sub_8120F4C: @ 8120F4C adds r0, r5, 0 bl sub_8120F08 cmp r4, r0 - bhi _08120F74 + bhi @08120F74 movs r0, 0 - b _08120F76 + b @08120F76 .align 2, 0 .pool -_08120F74: +@08120F74: movs r0, 0x1 -_08120F76: +@08120F76: pop {r4,r5} pop {r1} bx r1 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 @@ -554344,7 +554344,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 @@ -554369,7 +554369,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 @@ -554425,24 +554425,24 @@ 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 movs r5, 0 cmp r5, r6 - bge _0812107A -_08121070: + bge @0812107A +@08121070: adds r0, r7, r5 strb r5, [r0] adds r5, 0x1 cmp r5, r6 - blt _08121070 -_0812107A: + blt @08121070 +@0812107A: cmp r6, 0 - ble _081210B0 + ble @081210B0 adds r5, r6, 0 -_08121080: +@08121080: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -554462,15 +554462,15 @@ _08121080: strb r2, [r0] subs r5, 0x1 cmp r5, 0 - bne _08121080 -_081210B0: + bne @08121080 +@081210B0: pop {r4-r7} pop {r0} bx r0 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 @@ -554492,7 +554492,7 @@ sub_81210B8: @ 81210B8 movs r1, 0x24 bl sub_8121064 movs r5, 0 -_081210E4: +@081210E4: ldr r1, =0x0859f048 mov r2, r9 adds r0, r2, r5 @@ -554506,24 +554506,24 @@ _081210E4: ldr r0, [r2] ldrb r0, [r0, 0x4] cmp r0, r4 - beq _08121112 -_08121100: + beq @08121112 +@08121100: adds r1, 0x1 cmp r1, 0x3 - bgt _08121112 + bgt @08121112 ldr r0, [r2] adds r0, 0x4 adds r0, r1 ldrb r0, [r0] cmp r0, r4 - bne _08121100 -_08121112: + bne @08121100 +@08121112: cmp r1, 0x4 - bne _08121162 + bne @08121162 adds r0, r4, 0 bl sub_8120E74 cmp r0, r6 - bcc _08121162 + bcc @08121162 ldr r0, =0x0203a12c ldr r1, [r0] movs r0, 0x1 @@ -554532,29 +554532,29 @@ _08121112: lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bne _08121150 + bne @08121150 ldr r0, =0x03001178 ldrb r0, [r0] adds r1, r4, 0 bl sub_8120FDC - b _0812115E + b @0812115E .align 2, 0 .pool -_08121150: +@08121150: bl sub_8120ED8 lsls r0, 24 lsrs r0, 24 adds r1, r4, 0 bl sub_8120FDC -_0812115E: +@0812115E: movs r0, 0x1 - b _0812116A -_08121162: + b @0812116A +@08121162: adds r5, 0x1 cmp r5, 0x23 - ble _081210E4 + ble @081210E4 movs r0, 0 -_0812116A: +@0812116A: mov sp, r8 pop {r3,r4} mov r8, r3 @@ -554565,7 +554565,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} @@ -554613,7 +554613,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, =0x085eb7ea @@ -554626,28 +554626,28 @@ sub_81211EC: @ 81211EC ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r0, 0 - beq _08121230 -_08121208: + beq @08121230 +@08121208: bl sub_8120EB4 adds r1, r0, 0 movs r0, 0x1 movs r2, 0 bl font_get_width_of_string cmp r0, r5 - ble _0812121C + ble @0812121C adds r5, r0, 0 -_0812121C: +@0812121C: adds r4, 0x1 cmp r4, 0x3 - bgt _08121230 + bgt @08121230 ldr r0, =0x0203a12c ldr r0, [r0] adds r0, 0x4 adds r0, r4 ldrb r0, [r0] cmp r0, 0 - bne _08121208 -_08121230: + bne @08121208 +@08121230: adds r0, r5, 0 bl convert_pixel_width_to_tile_width adds r4, r0, 0 @@ -554674,10 +554674,10 @@ _08121230: ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r0, 0 - beq _081212AA + beq @081212AA movs r5, 0x80 lsls r5, 17 -_08121272: +@08121272: bl sub_8120EB4 adds r2, r0, 0 ldr r0, =0x0203a130 @@ -554696,15 +554696,15 @@ _08121272: adds r5, r0 adds r4, 0x1 cmp r4, 0x3 - bgt _081212AA + bgt @081212AA ldr r0, =0x0203a12c ldr r0, [r0] adds r0, 0x4 adds r0, r4 ldrb r0, [r0] cmp r0, 0 - bne _08121272 -_081212AA: + bne @08121272 +@081212AA: ldr r5, =0x0203a130 ldrb r0, [r5] ldr r2, =0x085eb7ea @@ -554741,7 +554741,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 @@ -554753,54 +554753,54 @@ sub_81212FC: @ 81212FC movs r0, 0x8 ldrsh r5, [r4, r0] cmp r5, 0 - beq _08121320 + beq @08121320 cmp r5, 0x1 - beq _0812132C - b _08121376 + beq @0812132C + b @08121376 .align 2, 0 .pool -_08121320: +@08121320: bl sub_81211EC ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _08121376 -_0812132C: + b @08121376 +@0812132C: bl ProcessMenuInput lsls r0, 24 asrs r4, r0, 24 movs r0, 0x2 negs r0, r0 cmp r4, r0 - beq _08121376 + beq @08121376 adds r0, 0x1 cmp r4, r0 - beq _0812134E + beq @0812134E bl sub_8120ED8 lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bne _0812135C -_0812134E: + bne @0812135C +@0812134E: ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - b _08121364 + b @08121364 .align 2, 0 .pool -_0812135C: +@0812135C: ldr r0, =0x020375f0 strh r5, [r0] ldr r0, =0x03001178 strb r4, [r0] -_08121364: +@08121364: ldr r0, =0x0203a130 ldrb r0, [r0] bl sub_80E2A78 adds r0, r6, 0 bl remove_task bl script_env_2_enable_and_set_ctx_running -_08121376: +@08121376: pop {r4-r6} pop {r0} bx r0 @@ -554809,7 +554809,7 @@ _08121376: thumb_func_end sub_81212FC thumb_func_start sub_8121388 -sub_8121388: @ 8121388 +sub_8121388: ; 8121388 push {lr} ldr r0, =sub_81212FC + 1 movs r1, 0x50 @@ -554821,7 +554821,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] @@ -554833,7 +554833,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 @@ -554851,7 +554851,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 @@ -554867,24 +554867,24 @@ sub_81213D8: @ 81213D8 ldrb r4, [r1] bl sub_8120F4C cmp r0, 0x1 - beq _08121414 + beq @08121414 movs r0, 0 - b _0812141E + b @0812141E .align 2, 0 .pool -_08121414: +@08121414: ldrb r0, [r5] adds r1, r4, 0 bl sub_8120FDC movs r0, 0x1 -_0812141E: +@0812141E: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_81213D8 thumb_func_start sub_8121424 -sub_8121424: @ 8121424 +sub_8121424: ; 8121424 push {lr} ldr r1, =0x0203a12c ldr r0, =0x03005d8c @@ -554894,20 +554894,20 @@ sub_8121424: @ 8121424 str r0, [r1] ldrb r0, [r0, 0x1] cmp r0, 0 - beq _08121448 + beq @08121448 movs r0, 0x1 - b _0812144A + b @0812144A .align 2, 0 .pool -_08121448: +@08121448: movs r0, 0 -_0812144A: +@0812144A: pop {r1} bx r1 thumb_func_end sub_8121424 thumb_func_start sub_8121450 -sub_8121450: @ 8121450 +sub_8121450: ; 8121450 push {lr} ldr r1, =0x0203a12c ldr r0, =0x03005d8c @@ -554925,7 +554925,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 @@ -554962,31 +554962,31 @@ sub_8121478: @ 8121478 lsls r0, 16 lsrs r0, 16 cmp r0, 0xB - bhi _081214E8 + bhi @081214E8 subs r1, 0x79 subs r2, 0x4 adds r0, r4, r2 strb r1, [r0] - b _081214F2 + b @081214F2 .align 2, 0 .pool -_081214E8: +@081214E8: ldr r3, =0x0000021a adds r1, r4, r3 movs r0, 0 strb r0, [r1] movs r6, 0 -_081214F2: +@081214F2: ldr r0, =0x0203a134 ldr r1, [r0] ldr r2, =0x0000021e adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _08121504 + beq @08121504 cmp r0, 0x1 - beq _0812152C -_08121504: + beq @0812152C +@08121504: movs r3, 0x8A lsls r3, 2 adds r2, r1, r3 @@ -554997,10 +554997,10 @@ _08121504: adds r0, r1 lsls r0, 2 ldr r1, =0x0859f3b4 - b _08121540 + b @08121540 .align 2, 0 .pool -_0812152C: +@0812152C: movs r0, 0x8A lsls r0, 2 adds r2, r1, r0 @@ -555011,7 +555011,7 @@ _0812152C: adds r0, r1 lsls r0, 2 ldr r1, =0x0859f458 -_08121540: +@08121540: adds r0, r1 str r0, [r2] ldrh r0, [r5, 0x1E] @@ -555023,7 +555023,7 @@ _08121540: movs r1, 0xCD lsls r1, 17 cmp r0, r1 - bhi _081215AC + bhi @081215AC ldr r1, =0x0203a134 ldr r2, [r1] ldr r3, =0x0000021a @@ -555031,33 +555031,33 @@ _08121540: ldrb r0, [r0] adds r3, r1, 0 cmp r0, 0x6 - beq _0812158C + beq @0812158C cmp r0, 0x9 - beq _0812159C + beq @0812159C ldr r0, =0x0000021b adds r1, r2, r0 movs r0, 0 strb r0, [r1] - b _081215BA + b @081215BA .align 2, 0 .pool -_0812158C: +@0812158C: ldr r0, =0x0000021b adds r1, r2, r0 movs r0, 0x1 strb r0, [r1] - b _081215BA + b @081215BA .align 2, 0 .pool -_0812159C: +@0812159C: ldr r0, =0x0000021b adds r1, r2, r0 movs r0, 0x2 strb r0, [r1] - b _081215BA + b @081215BA .align 2, 0 .pool -_081215AC: +@081215AC: ldr r0, =0x0203a134 ldr r1, [r0] ldr r2, =0x0000021b @@ -555065,7 +555065,7 @@ _081215AC: movs r2, 0 strb r2, [r1] adds r3, r0, 0 -_081215BA: +@081215BA: ldr r1, [r3] movs r3, 0x85 lsls r3, 2 @@ -555089,7 +555089,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 @@ -555098,44 +555098,44 @@ sub_81215EC: @ 81215EC adds r0, r1 ldrb r0, [r0] cmp r0, 0x12 - bls _08121600 - b _081219E2 -_08121600: + bls @08121600 + b @081219E2 +@08121600: lsls r0, 2 - ldr r1, =_08121614 + ldr r1, =@08121614 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08121614: - .4byte _08121660 - .4byte _0812166E - .4byte _08121688 - .4byte _0812168E - .4byte _08121694 - .4byte _0812169A - .4byte _081216F4 - .4byte _08121730 - .4byte _08121740 - .4byte _08121774 - .4byte _08121782 - .4byte _081217D8 - .4byte _081217EC - .4byte _081218B0 - .4byte _081218CC - .4byte _081218EC - .4byte _081218F6 - .4byte _08121910 - .4byte _08121980 -_08121660: +@08121614: + .4byte @08121660 + .4byte @0812166E + .4byte @08121688 + .4byte @0812168E + .4byte @08121694 + .4byte @0812169A + .4byte @081216F4 + .4byte @08121730 + .4byte @08121740 + .4byte @08121774 + .4byte @08121782 + .4byte @081217D8 + .4byte @081217EC + .4byte @081218B0 + .4byte @081218CC + .4byte @081218EC + .4byte @081218F6 + .4byte @08121910 + .4byte @08121980 +@08121660: movs r0, 0 bl SetVBlankCallback bl remove_some_task movs r0, 0 - b _081216EC -_0812166E: + b @081216EC +@0812166E: add r1, sp, 0x8 movs r0, 0 strh r0, [r1] @@ -555144,19 +555144,19 @@ _0812166E: ldr r2, =0x01000200 add r0, sp, 0x8 bl CpuSet - b _081219D4 + b @081219D4 .align 2, 0 .pool -_08121688: +@08121688: bl sub_80A1A74 - b _081219D4 -_0812168E: + b @081219D4 +@0812168E: bl clear_tasks - b _081219D4 -_08121694: + b @081219D4 +@08121694: bl reset_all_obj_data - b _081219D4 -_0812169A: + b @081219D4 +@0812169A: bl gpu_pal_allocator_reset bl reset_temp_tile_data_buffers movs r0, 0x10 @@ -555187,11 +555187,11 @@ _0812169A: movs r1, 0 bl lcd_io_set movs r0, 0x52 -_081216EC: +@081216EC: movs r1, 0 bl lcd_io_set - b _081219D4 -_081216F4: + b @081219D4 +@081216F4: movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags ldr r1, =0x0859f290 @@ -555210,17 +555210,17 @@ _081216F4: adds r1, r0 movs r0, 0x2 bl bg_set_tilemap - b _081219D4 + b @081219D4 .align 2, 0 .pool -_08121730: +@08121730: ldr r0, =0x0859f29c bl Window_InitFromTemplates bl TextBox_ResetSomeField - b _081219D4 + b @081219D4 .align 2, 0 .pool -_08121740: +@08121740: ldr r2, =0x0859f2b8 ldr r0, =0x0203a134 ldr r0, [r0] @@ -555239,18 +555239,18 @@ _08121740: movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - b _081219D4 + b @081219D4 .align 2, 0 .pool -_08121774: +@08121774: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - bne _08121780 - b _081219D4 -_08121780: - b _081219E2 -_08121782: + bne @08121780 + b @081219D4 +@08121780: + b @081219E2 +@08121782: movs r5, 0x1E str r5, [sp] movs r4, 0x14 @@ -555283,18 +555283,18 @@ _08121782: movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map - b _081219D4 + b @081219D4 .align 2, 0 .pool -_081217D8: +@081217D8: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x2 bl gpu_copy_wram_bg_tilemap_to_vram - b _081219D4 -_081217EC: + b @081219D4 +@081217EC: bl sub_8098C64 movs r1, 0xF0 movs r2, 0x20 @@ -555374,10 +555374,10 @@ _081217EC: adds r0, r1 ldrh r0, [r0] strh r0, [r5, 0x16] - b _081219D4 + b @081219D4 .align 2, 0 .pool -_081218B0: +@081218B0: ldr r0, =0x0203a134 ldr r0, [r0] movs r1, 0x86 @@ -555385,14 +555385,14 @@ _081218B0: adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _081218C2 - b _081219D4 -_081218C2: + bne @081218C2 + b @081219D4 +@081218C2: bl sub_8121A1C - b _081219D4 + b @081219D4 .align 2, 0 .pool -_081218CC: +@081218CC: ldr r0, =0x0203a134 ldr r0, [r0] movs r2, 0x86 @@ -555400,20 +555400,20 @@ _081218CC: adds r0, r2 ldrb r0, [r0] cmp r0, 0 - bne _081218DE - b _081219D4 -_081218DE: + bne @081218DE + b @081219D4 +@081218DE: bl sub_8121B1C bl run_remoboxes - b _081219D4 + b @081219D4 .align 2, 0 .pool -_081218EC: +@081218EC: bl sub_8087598 cmp r0, 0x1 - bne _081219D4 - b _081219E2 -_081218F6: + bne @081219D4 + b @081219E2 +@081218F6: ldr r0, =sub_8121C50 + 1 bl SetVBlankCallback ldr r2, =0x02037fd4 @@ -555421,10 +555421,10 @@ _081218F6: movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x8] - b _081219D4 + b @081219D4 .align 2, 0 .pool -_08121910: +@08121910: ldr r5, =0x0203a134 ldr r0, [r5] movs r1, 0x85 @@ -555440,13 +555440,13 @@ _08121910: adds r0, r2 ldrb r0, [r0] cmp r0, 0x1 - beq _08121940 + beq @08121940 cmp r0, 0x2 - beq _08121958 - b _081219D4 + beq @08121958 + b @081219D4 .align 2, 0 .pool -_08121940: +@08121940: adds r0, r4, 0 bl sub_80D2F68 ldr r1, =nullsub_12 + 1 @@ -555455,10 +555455,10 @@ _08121940: str r0, [sp, 0x4] adds r0, r4, 0 movs r2, 0x60 - b _0812196A + b @0812196A .align 2, 0 .pool -_08121958: +@08121958: adds r0, r4, 0 bl sub_80D2F68 ldr r1, =nullsub_12 + 1 @@ -555467,7 +555467,7 @@ _08121958: str r0, [sp, 0x4] adds r0, r4, 0 movs r2, 0x28 -_0812196A: +@0812196A: movs r3, 0x80 bl sub_80D2D78 ldr r1, [r5] @@ -555475,10 +555475,10 @@ _0812196A: lsls r2, 2 adds r1, r2 strb r0, [r1] - b _081219D4 + b @081219D4 .align 2, 0 .pool -_08121980: +@08121980: movs r1, 0x82 lsls r1, 5 movs r0, 0 @@ -555509,10 +555509,10 @@ _08121980: ldr r1, =sub_8121C98 + 1 str r1, [r0] movs r0, 0x1 - b _081219E4 + b @081219E4 .align 2, 0 .pool -_081219D4: +@081219D4: ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 @@ -555520,9 +555520,9 @@ _081219D4: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_081219E2: +@081219E2: movs r0, 0 -_081219E4: +@081219E4: add sp, 0xC pop {r4-r6} pop {r1} @@ -555532,32 +555532,32 @@ _081219E4: thumb_func_end sub_81215EC thumb_func_start sub_81219F0 -sub_81219F0: @ 81219F0 +sub_81219F0: ; 81219F0 push {lr} -_081219F2: +@081219F2: bl sub_81215EC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08121A0C + bne @08121A0C ldr r0, =sub_8121C64 + 1 bl set_callback2 - b _08121A18 + b @08121A18 .align 2, 0 .pool -_08121A0C: +@08121A0C: bl sub_81221AC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081219F2 -_08121A18: + bne @081219F2 +@08121A18: pop {r0} bx r0 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} @@ -555571,10 +555571,10 @@ sub_8121A1C: @ 8121A1C ldr r0, [r0] ldrb r0, [r0] cmp r5, r0 - bcs _08121A8A + bcs @08121A8A mov r8, r2 adds r7, r1, 0 -_08121A3C: +@08121A3C: lsls r0, r5, 6 mov r1, r8 ldr r2, [r1] @@ -555612,8 +555612,8 @@ _08121A3C: lsrs r5, r0, 16 ldrb r1, [r1] cmp r5, r1 - bcc _08121A3C -_08121A8A: + bcc @08121A3C +@08121A8A: ldr r4, =0x0203a134 ldr r1, [r4] movs r2, 0x80 @@ -555631,7 +555631,7 @@ _08121A8A: adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 - bne _08121AF0 + bne @08121AF0 ldr r1, =0x085eea78 adds r0, r2, 0 bl gf_strcpy @@ -555653,10 +555653,10 @@ _08121A8A: ldr r0, =0x00000219 adds r2, r0 strb r1, [r2] - b _08121B0C + b @08121B0C .align 2, 0 .pool -_08121AF0: +@08121AF0: movs r2, 0x80 lsls r2, 2 adds r0, r1, r2 @@ -555670,7 +555670,7 @@ _08121AF0: ldr r2, =0x00000219 adds r0, r2 strb r1, [r0] -_08121B0C: +@08121B0C: pop {r3} mov r8, r3 pop {r4-r7} @@ -555681,7 +555681,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 @@ -555709,19 +555709,19 @@ sub_8121B1C: @ 8121B1C ldr r0, [r0] ldrb r0, [r0] cmp r6, r0 - bcs _08121BCC + bcs @08121BCC mov r9, r1 mov r8, r10 -_08121B60: +@08121B60: mov r0, r9 ldr r1, [r0] lsls r0, r6, 6 adds r5, r1, r0 ldrb r0, [r5] cmp r0, 0xFF - beq _08121BB8 + beq @08121BB8 cmp r0, 0 - beq _08121BB8 + beq @08121BB8 mov r2, r8 adds r0, r1, r2 ldr r1, [r0] @@ -555756,7 +555756,7 @@ _08121B60: adds r0, r7, r0 lsls r0, 24 lsrs r7, r0, 24 -_08121BB8: +@08121BB8: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 @@ -555766,8 +555766,8 @@ _08121BB8: ldr r0, [r0] ldrb r0, [r0] cmp r6, r0 - bcc _08121B60 -_08121BCC: + bcc @08121B60 +@08121BCC: ldr r1, =0x085eea78 add r0, sp, 0xC bl gf_strcpy @@ -555825,7 +555825,7 @@ _08121BCC: thumb_func_end sub_8121B1C thumb_func_start sub_8121C50 -sub_8121C50: @ 8121C50 +sub_8121C50: ; 8121C50 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -555835,7 +555835,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] @@ -555843,10 +555843,10 @@ sub_8121C64: @ 8121C64 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _08121C7C + beq @08121C7C bl call_obj_callbacks bl obj_sync_something -_08121C7C: +@08121C7C: ldr r0, [r4] movs r1, 0x84 lsls r1, 2 @@ -555861,12 +555861,12 @@ _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 cmp r0, 0 - bne _08121CB2 + bne @08121CB2 ldr r0, =0x0203a134 ldr r0, [r0] movs r1, 0x84 @@ -555874,7 +555874,7 @@ sub_8121C98: @ 8121C98 adds r0, r1 ldr r1, =sub_8121CC0 + 1 str r1, [r0] -_08121CB2: +@08121CB2: pop {r0} bx r0 .align 2, 0 @@ -555882,7 +555882,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 @@ -555890,7 +555890,7 @@ sub_8121CC0: @ 8121CC0 movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _08121CEE + beq @08121CEE movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -555905,7 +555905,7 @@ sub_8121CC0: @ 8121CC0 adds r0, r1 ldr r1, =sub_8121D00 + 1 str r1, [r0] -_08121CEE: +@08121CEE: add sp, 0x4 pop {r0} bx r0 @@ -555914,12 +555914,12 @@ _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 cmp r0, 0 - bne _08121D88 + bne @08121D88 ldr r4, =0x0203a134 ldr r0, [r4] movs r1, 0x83 @@ -555932,9 +555932,9 @@ sub_8121D00: @ 8121D00 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x2 - bgt _08121D58 + bgt @08121D58 cmp r0, 0x1 - blt _08121D58 + blt @08121D58 subs r2, 0x7 adds r0, r1, r2 ldr r0, [r0] @@ -555954,7 +555954,7 @@ sub_8121D00: @ 8121D00 ldr r1, =0x02020630 adds r0, r1 bl sub_80D2EF8 -_08121D58: +@08121D58: ldr r4, =0x0203a134 ldr r0, [r4] ldr r2, =0x0000222c @@ -555972,7 +555972,7 @@ _08121D58: bl free movs r0, 0 str r0, [r4] -_08121D88: +@08121D88: pop {r4} pop {r0} bx r0 @@ -555981,7 +555981,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 @@ -556029,7 +556029,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 @@ -556068,7 +556068,7 @@ sub_8121E10: @ 8121E10 thumb_func_end sub_8121E10 thumb_func_start vblank_hblank_handler_set_zero -vblank_hblank_handler_set_zero: @ 8121E68 +vblank_hblank_handler_set_zero: ; 8121E68 push {lr} movs r0, 0 bl SetVBlankCallback @@ -556079,7 +556079,7 @@ vblank_hblank_handler_set_zero: @ 8121E68 thumb_func_end vblank_hblank_handler_set_zero thumb_func_start sub_8121E7C -sub_8121E7C: @ 8121E7C +sub_8121E7C: ; 8121E7C push {r4-r7,lr} mov r7, r8 push {r7} @@ -556108,11 +556108,11 @@ sub_8121E7C: @ 8121E7C ldr r4, =0x02021fc4 ldr r0, [sp, 0x30] cmp r0, r4 - beq _08121EC0 + beq @08121EC0 adds r0, r4, 0 ldr r1, [sp, 0x30] bl ExpandTextCodes -_08121EC0: +@08121EC0: ldr r2, =0x03003014 ldrb r0, [r2] movs r1, 0x1 @@ -556153,7 +556153,7 @@ _08121EC0: thumb_func_end sub_8121E7C thumb_func_start sub_8121F20 -sub_8121F20: @ 8121F20 +sub_8121F20: ; 8121F20 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -556169,7 +556169,7 @@ sub_8121F20: @ 8121F20 thumb_func_end sub_8121F20 thumb_func_start task_show_message -task_show_message: @ 8121F3C +task_show_message: ; 8121F3C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -556178,12 +556178,12 @@ task_show_message: @ 8121F3C bl sub_8121F20 lsls r0, 16 cmp r0, 0 - bne _08121F5A + bne @08121F5A ldr r0, =0x0300117c ldr r1, [r0] adds r0, r4, 0 bl _call_via_r1 -_08121F5A: +@08121F5A: pop {r4} pop {r0} bx r0 @@ -556192,7 +556192,7 @@ _08121F5A: thumb_func_end task_show_message thumb_func_start sub_8121F68 -sub_8121F68: @ 8121F68 +sub_8121F68: ; 8121F68 lsls r0, 24 lsrs r0, 24 ldr r3, =0x0203a138 @@ -556213,7 +556213,7 @@ sub_8121F68: @ 8121F68 thumb_func_end sub_8121F68 thumb_func_start sub_8121F94 -sub_8121F94: @ 8121F94 +sub_8121F94: ; 8121F94 push {r4,r5,lr} adds r4, r0, 0 adds r0, r1, 0 @@ -556248,7 +556248,7 @@ sub_8121F94: @ 8121F94 thumb_func_end sub_8121F94 thumb_func_start sub_8121FDC -sub_8121FDC: @ 8121FDC +sub_8121FDC: ; 8121FDC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -556256,36 +556256,36 @@ sub_8121FDC: @ 8121FDC lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _08122002 + beq @08122002 cmp r1, 0 - bgt _08121FFC + bgt @08121FFC movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _08122018 - b _08122028 -_08121FFC: + beq @08122018 + b @08122028 +@08121FFC: cmp r1, 0x1 - beq _08122018 - b _08122028 -_08122002: + beq @08122018 + b @08122028 +@08122002: movs r0, 0x5 bl audio_play ldr r0, =0x0203a138 ldr r1, [r0] adds r0, r4, 0 bl _call_via_r1 - b _08122028 + b @08122028 .align 2, 0 .pool -_08122018: +@08122018: movs r0, 0x5 bl audio_play ldr r0, =0x0203a138 ldr r1, [r0, 0x4] adds r0, r4, 0 bl _call_via_r1 -_08122028: +@08122028: pop {r4} pop {r0} bx r0 @@ -556294,7 +556294,7 @@ _08122028: thumb_func_end sub_8121FDC thumb_func_start sub_8122034 -sub_8122034: @ 8122034 +sub_8122034: ; 8122034 push {r4-r6,lr} adds r2, r0, 0 lsls r1, 16 @@ -556307,269 +556307,269 @@ sub_8122034: @ 8122034 movs r3, 0xF0 ands r3, r0 cmp r3, 0x40 - bne _0812206C + bne @0812206C adds r0, r4, 0x1 strh r0, [r2] movs r3, 0 ldrsh r0, [r2, r3] cmp r0, r1 - ble _0812205E + ble @0812205E movs r0, 0x1 strh r0, [r2] -_0812205E: +@0812205E: movs r0, 0 ldrsh r1, [r2, r0] -_08122062: +@08122062: lsls r0, r4, 16 - b _081220B6 + b @081220B6 .align 2, 0 .pool -_0812206C: +@0812206C: cmp r3, 0x80 - bne _08122082 + bne @08122082 subs r0, r4, 0x1 strh r0, [r2] lsls r0, 16 cmp r0, 0 - bgt _0812207C + bgt @0812207C strh r1, [r2] -_0812207C: +@0812207C: movs r3, 0 ldrsh r1, [r2, r3] - b _08122062 -_08122082: + b @08122062 +@08122082: cmp r3, 0x10 - bne _0812209C + bne @0812209C adds r0, r4, 0 adds r0, 0xA strh r0, [r2] movs r1, 0 ldrsh r0, [r2, r1] cmp r0, r5 - ble _08122096 + ble @08122096 strh r5, [r2] -_08122096: +@08122096: movs r3, 0 ldrsh r1, [r2, r3] - b _08122062 -_0812209C: + b @08122062 +@0812209C: cmp r3, 0x20 - bne _081220C6 + bne @081220C6 adds r0, r4, 0 subs r0, 0xA strh r0, [r2] lsls r0, 16 cmp r0, 0 - bgt _081220B0 + bgt @081220B0 movs r0, 0x1 strh r0, [r2] -_081220B0: +@081220B0: movs r0, 0 ldrsh r1, [r2, r0] lsls r0, r6, 16 -_081220B6: +@081220B6: asrs r0, 16 cmp r1, r0 - beq _081220C6 + beq @081220C6 movs r0, 0x5 bl audio_play movs r0, 0x1 - b _081220C8 -_081220C6: + b @081220C8 +@081220C6: movs r0, 0 -_081220C8: +@081220C8: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_8122034 thumb_func_start sub_81220D0 -sub_81220D0: @ 81220D0 +sub_81220D0: ; 81220D0 push {lr} ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x1 - bne _08122106 + bne @08122106 ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x80 lsls r0, 2 ands r0, r1 cmp r0, 0 - beq _081220F8 + beq @081220F8 movs r0, 0x1 - b _08122108 + b @08122108 .align 2, 0 .pool -_081220F8: +@081220F8: movs r0, 0x80 lsls r0, 1 ands r0, r1 cmp r0, 0 - beq _08122106 + beq @08122106 movs r0, 0x2 - b _08122108 -_08122106: + b @08122108 +@08122106: movs r0, 0 -_08122108: +@08122108: pop {r1} bx r1 thumb_func_end sub_81220D0 thumb_func_start sub_812210C -sub_812210C: @ 812210C +sub_812210C: ; 812210C push {lr} ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x1 - bne _08122142 + bne @08122142 ldr r0, =0x030022c0 ldrh r1, [r0, 0x30] movs r0, 0x80 lsls r0, 2 ands r0, r1 cmp r0, 0 - beq _08122134 + beq @08122134 movs r0, 0x1 - b _08122144 + b @08122144 .align 2, 0 .pool -_08122134: +@08122134: movs r0, 0x80 lsls r0, 1 ands r0, r1 cmp r0, 0 - beq _08122142 + beq @08122142 movs r0, 0x2 - b _08122144 -_08122142: + b @08122144 +@08122142: movs r0, 0 -_08122144: +@08122144: pop {r1} bx r1 thumb_func_end sub_812210C thumb_func_start sub_8122148 -sub_8122148: @ 8122148 +sub_8122148: ; 8122148 push {lr} lsls r0, 16 lsrs r0, 16 cmp r0, 0xAF - bne _08122174 + bne @08122174 ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] ldr r0, =0x00001919 cmp r1, r0 - beq _08122166 + beq @08122166 bl in_trade_center cmp r0, 0x1 - bne _08122174 -_08122166: + bne @08122174 +@08122166: movs r0, 0 - b _08122176 + b @08122176 .align 2, 0 .pool -_08122174: +@08122174: movs r0, 0x1 -_08122176: +@08122176: pop {r1} bx r1 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 bl is_c1_link_related_active cmp r0, 0x1 - beq _08122192 + beq @08122192 bl in_trade_center cmp r0, 0x1 - bne _081221A4 -_08122192: + bne @081221A4 +@08122192: adds r0, r4, 0 bl itemid_is_mail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081221A4 + bne @081221A4 movs r0, 0 - b _081221A6 -_081221A4: + b @081221A6 +@081221A4: movs r0, 0x1 -_081221A6: +@081221A6: pop {r4} pop {r1} bx r1 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 - beq _081221BE + beq @081221BE ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 - bne _081221C8 -_081221BE: + bne @081221C8 +@081221BE: movs r0, 0x1 - b _081221CA + b @081221CA .align 2, 0 .pool -_081221C8: +@081221C8: movs r0, 0 -_081221CA: +@081221CA: pop {r1} bx r1 thumb_func_end sub_81221AC thumb_func_start sub_81221D0 -sub_81221D0: @ 81221D0 +sub_81221D0: ; 81221D0 push {lr} bl sub_81221AC lsls r0, 24 cmp r0, 0 - beq _081221E6 + beq @081221E6 bl sub_8087598 lsls r0, 24 lsrs r0, 24 - b _081221E8 -_081221E6: + b @081221E8 +@081221E6: movs r0, 0 -_081221E8: +@081221E8: pop {r1} bx r1 thumb_func_end sub_81221D0 thumb_func_start sub_81221EC -sub_81221EC: @ 81221EC +sub_81221EC: ; 81221EC push {lr} bl sub_81221D0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08122202 + beq @08122202 bl sub_800B504 cmp r0, 0x1 - bne _08122206 -_08122202: + bne @08122206 +@08122202: movs r0, 0x1 - b _08122208 -_08122206: + b @08122208 +@08122206: movs r0, 0 -_08122208: +@08122208: pop {r1} bx r1 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] @@ -556582,42 +556582,42 @@ atk2D_jumpifarraynotequal: @ 812220C movs r2, 0 lsrs r1, 24 cmp r2, r1 - bcs _08122240 -_08122226: + bcs @08122240 +@08122226: lsls r0, r2, 2 adds r0, r4 ldrh r0, [r0] cmp r0, 0 - beq _08122236 + beq @08122236 ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] -_08122236: +@08122236: adds r0, r2, 0x1 lsls r0, 16 lsrs r2, r0, 16 cmp r2, r1 - bcc _08122226 -_08122240: + bcc @08122226 +@08122240: ldrb r0, [r3] adds r1, r0, 0x1 strb r1, [r3] lsls r0, r1, 24 lsrs r0, 24 cmp r0, r5 - bls _08122252 + bls @08122252 strb r5, [r6] - b _08122254 -_08122252: + b @08122254 +@08122252: strb r1, [r6] -_08122254: +@08122254: pop {r4-r6} pop {r0} bx r0 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 @@ -556627,33 +556627,33 @@ sub_812225C: @ 812225C lsrs r3, 24 ldrh r0, [r4] cmp r0, 0 - beq _0812227A + beq @0812227A adds r0, r2 cmp r0, r3 - ble _0812227A + ble @0812227A subs r0, r3, r2 strh r0, [r4] -_0812227A: +@0812227A: ldrh r0, [r4] ldrh r1, [r5] adds r0, r1 cmp r0, r3 - blt _08122290 + blt @08122290 cmp r3, 0 - bne _0812228C + bne @0812228C strh r3, [r5] - b _08122290 -_0812228C: + b @08122290 +@0812228C: subs r0, r3, 0x1 strh r0, [r5] -_08122290: +@08122290: pop {r4,r5} pop {r0} bx r0 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 @@ -556667,20 +556667,20 @@ sub_8122298: @ 8122298 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _081222F0 + beq @081222F0 lsrs r2, 25 ldrh r0, [r4] cmp r0, r2 - bcc _08122322 + bcc @08122322 movs r1, 0 subs r0, r2 cmp r1, r0 - bge _08122322 + bge @08122322 ldrh r0, [r5] adds r0, r7 cmp r0, r6 - beq _08122322 -_081222CC: + beq @08122322 +@081222CC: ldrh r0, [r4] subs r0, 0x1 strh r0, [r4] @@ -556693,22 +556693,22 @@ _081222CC: ldrh r0, [r4] subs r0, r2 cmp r1, r0 - bge _08122322 + bge @08122322 ldrh r0, [r5] adds r0, r7 cmp r0, r6 - bne _081222CC - b _08122322 -_081222F0: + bne @081222CC + b @08122322 +@081222F0: ldrh r3, [r4] lsrs r2, 25 adds r0, r2, 0x1 cmp r3, r0 - blt _08122322 + blt @08122322 movs r1, 0 subs r0, r3, r2 - b _08122316 -_08122300: + b @08122316 +@08122300: ldrh r0, [r4] subs r0, 0x1 strh r0, [r4] @@ -556720,21 +556720,21 @@ _08122300: lsrs r1, r0, 24 ldrh r0, [r4] subs r0, r2 -_08122316: +@08122316: cmp r1, r0 - bgt _08122322 + bgt @08122322 ldrh r0, [r5] adds r0, r7 cmp r0, r6 - bne _08122300 -_08122322: + bne @08122300 +@08122322: pop {r4-r7} pop {r0} bx r0 thumb_func_end sub_8122298 thumb_func_start sub_8122328 -sub_8122328: @ 8122328 +sub_8122328: ; 8122328 push {lr} ldr r0, =0x0859f514 bl gpu_tile_obj_decompress_and_load @@ -556747,7 +556747,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} @@ -556756,9 +556756,9 @@ sub_8122344: @ 8122344 lsrs r6, r1, 24 movs r5, 0 cmp r5, r6 - bcs _0812239C + bcs @0812239C ldr r7, =0x02020630 -_08122358: +@08122358: lsls r1, r5, 4 ldr r0, =0x0859f524 movs r2, 0 @@ -556768,7 +556768,7 @@ _08122358: adds r4, r1, r5 strb r0, [r4] cmp r5, 0 - beq _0812237E + beq @0812237E ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -556776,7 +556776,7 @@ _08122358: adds r0, r7 movs r1, 0x1 bl obj_anim_image_start -_0812237E: +@0812237E: ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -556791,8 +556791,8 @@ _0812237E: lsls r0, 24 lsrs r5, r0, 24 cmp r5, r6 - bcc _08122358 -_0812239C: + bcc @08122358 +@0812239C: pop {r3} mov r8, r3 pop {r4-r7} @@ -556803,19 +556803,19 @@ _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 lsrs r5, r1, 24 movs r4, 0 cmp r4, r5 - bcs _081223F6 + bcs @081223F6 ldr r7, =0x02020630 -_081223C0: +@081223C0: subs r0, r5, 0x1 cmp r4, r0 - bne _081223DC + bne @081223DC adds r0, r6, r4 ldrb r1, [r0] lsls r0, r1, 4 @@ -556823,10 +556823,10 @@ _081223C0: lsls r0, 2 adds r0, r7 bl obj_delete_and_free_resources - b _081223EC + b @081223EC .align 2, 0 .pool -_081223DC: +@081223DC: adds r0, r6, r4 ldrb r1, [r0] lsls r0, r1, 4 @@ -556834,20 +556834,20 @@ _081223DC: lsls r0, 2 adds r0, r7 bl obj_delete_and_free_tiles -_081223EC: +@081223EC: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc _081223C0 -_081223F6: + bcc @081223C0 +@081223F6: pop {r4-r7} pop {r0} bx r0 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 @@ -556856,7 +556856,7 @@ sub_81223FC: @ 81223FC lsrs r0, r2, 24 movs r3, 0 cmp r3, r4 - bcs _0812243E + bcs @0812243E ldr r1, =0x02020630 mov r12, r1 movs r1, 0x1 @@ -556864,7 +556864,7 @@ sub_81223FC: @ 81223FC lsls r5, r0, 2 movs r7, 0x5 negs r7, r7 -_0812241C: +@0812241C: adds r0, r6, r3 ldrb r0, [r0] lsls r1, r0, 4 @@ -556881,8 +556881,8 @@ _0812241C: lsls r0, 24 lsrs r3, r0, 24 cmp r3, r4 - bcc _0812241C -_0812243E: + bcc @0812241C +@0812243E: pop {r4-r7} pop {r0} bx r0 @@ -556891,7 +556891,7 @@ _0812243E: thumb_func_end sub_81223FC thumb_func_start sub_8122448 -sub_8122448: @ 8122448 +sub_8122448: ; 8122448 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -556913,19 +556913,19 @@ sub_8122448: @ 8122448 ands r4, r0 movs r3, 0 cmp r3, r4 - bcs _081224C8 + bcs @081224C8 ldr r5, =0x02020630 lsls r0, r7, 16 asrs r0, 16 subs r0, 0x8 mov r12, r0 -_0812247E: +@0812247E: subs r0, r4, 0x1 cmp r3, r0 - bne _081224A0 + bne @081224A0 mov r0, r8 cmp r0, 0 - beq _081224A0 + beq @081224A0 adds r2, r6, r3 ldrb r1, [r2] lsls r0, r1, 4 @@ -556934,10 +556934,10 @@ _0812247E: adds r0, r5 mov r1, r12 strh r1, [r0, 0x24] - b _081224AE + b @081224AE .align 2, 0 .pool -_081224A0: +@081224A0: adds r2, r6, r3 ldrb r1, [r2] lsls r0, r1, 4 @@ -556945,7 +556945,7 @@ _081224A0: lsls r0, 2 adds r0, r5 strh r7, [r0, 0x24] -_081224AE: +@081224AE: ldrb r1, [r2] lsls r0, r1, 4 adds r0, r1 @@ -556958,8 +556958,8 @@ _081224AE: lsls r0, 24 lsrs r3, r0, 24 cmp r3, r4 - bcc _0812247E -_081224C8: + bcc @0812247E +@081224C8: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -556969,11 +556969,11 @@ _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 -_081224DA: +@081224DA: movs r0, 0xA bl sub_811EE38 ldr r1, [r5] @@ -556986,24 +556986,24 @@ _081224DA: movs r1, 0x1 ands r1, r0 cmp r1, 0 - beq _08122514 + beq @08122514 movs r0, 0xC bl sub_811EE38 ldr r1, [r5] adds r1, r4 ldr r7, =0x00002e6e adds r1, r7 - b _08122522 + b @08122522 .align 2, 0 .pool -_08122514: +@08122514: movs r0, 0xD bl sub_811EE38 ldr r1, [r5] adds r1, r4 ldr r2, =0x00002e6e adds r1, r2 -_08122522: +@08122522: strh r0, [r1] bl GenerateRandomNumber ldr r3, [r5] @@ -557029,7 +557029,7 @@ _08122522: lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x4 - bls _081224DA + bls @081224DA ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00002e68 @@ -557045,7 +557045,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 @@ -557055,9 +557055,9 @@ sub_8122580: @ 8122580 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - bne _08122596 - b _081226BE -_08122596: + bne @08122596 + b @081226BE +@08122596: lsls r0, r1, 2 adds r0, r1 str r0, [sp] @@ -557068,7 +557068,7 @@ _08122596: movs r2, 0x80 negs r2, r2 mov r8, r2 -_081225AA: +@081225AA: ldr r2, [sp] mov r3, r10 lsls r0, r3, 3 @@ -557081,14 +557081,14 @@ _081225AA: movs r0, 0x40 ands r0, r6 cmp r0, 0 - bne _08122608 + bne @08122608 ldrb r4, [r5] lsls r3, r4, 25 lsrs r1, r3, 25 lsls r0, r2, 16 lsrs r0, 16 cmp r1, r0 - bcc _081225F8 + bcc @081225F8 adds r0, r1, 0 subs r0, r2 mov r1, r9 @@ -557100,13 +557100,13 @@ _081225AA: movs r0, 0x7F ands r1, r0 cmp r1, 0 - bne _0812269E + bne @0812269E movs r0, 0x40 orrs r0, r6 - b _0812269C + b @0812269C .align 2, 0 .pool -_081225F8: +@081225F8: lsrs r0, r3, 25 subs r2, r0 mov r0, r8 @@ -557115,7 +557115,7 @@ _081225F8: movs r0, 0x40 orrs r0, r6 strb r0, [r5, 0x1] -_08122608: +@08122608: ldrb r7, [r5] lsls r0, r7, 25 lsrs r0, 25 @@ -557126,7 +557126,7 @@ _08122608: lsrs r0, 16 lsrs r1, r6, 25 cmp r0, r1 - bls _08122678 + bls @08122678 adds r0, r4, 0 bl __umodsi3 adds r3, r0, 0 @@ -557150,7 +557150,7 @@ _08122608: ands r0, r1 ldr r3, [sp, 0x4] cmp r0, 0 - beq _08122662 + beq @08122662 adds r1, r3, 0 mov r0, r9 ands r1, r0 @@ -557158,8 +557158,8 @@ _08122608: ands r0, r7 orrs r0, r1 strb r0, [r5] - b _0812269E -_08122662: + b @0812269E +@08122662: ldrh r0, [r5] lsls r0, 18 lsrs r0, 25 @@ -557170,8 +557170,8 @@ _08122662: ands r1, r7 orrs r1, r0 strb r1, [r5] - b _0812269E -_08122678: + b @0812269E +@08122678: mov r2, r9 ands r4, r2 mov r0, r8 @@ -557184,24 +557184,24 @@ _08122678: lsrs r0, 25 lsrs r1, 25 cmp r0, r1 - bne _0812269E + bne @0812269E ldrb r0, [r5, 0x1] movs r3, 0x41 negs r3, r3 adds r1, r3, 0 ands r0, r1 -_0812269C: +@0812269C: strb r0, [r5, 0x1] -_0812269E: +@0812269E: mov r0, r10 adds r0, 0x1 lsls r0, 16 lsrs r0, 16 mov r10, r0 cmp r0, 0x4 - bhi _081226AE - b _081225AA -_081226AE: + bhi @081226AE + b @081225AA +@081226AE: ldr r4, =0x03005d8c ldr r0, [r4] ldr r1, =0x00002e68 @@ -557209,7 +557209,7 @@ _081226AE: movs r1, 0x5 movs r2, 0 bl sub_8122804 -_081226BE: +@081226BE: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -557223,7 +557223,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} @@ -557237,22 +557237,22 @@ sub_81226D8: @ 81226D8 bl sub_8122BB0 lsls r0, 24 cmp r0, 0 - beq _081226F8 - b _081227F2 -_081226F8: + beq @081226F8 + b @081227F2 +@081226F8: ldr r4, =0x00000893 adds r0, r4, 0 bl flag_check lsls r0, 24 cmp r0, 0 - bne _08122744 + bne @08122744 adds r0, r4, 0 bl flag_set ldr r0, =0x00000894 bl flag_check lsls r0, 24 cmp r0, 0 - bne _08122744 + bne @08122744 ldr r0, =0x03005d8c ldr r1, [r0] mov r0, r8 @@ -557266,10 +557266,10 @@ _081226F8: adds r1, r3 strh r0, [r1] movs r0, 0x1 - b _081227F4 + b @081227F4 .align 2, 0 .pool -_08122744: +@08122744: mov r0, r8 ldrh r1, [r0, 0x2] lsls r1, 16 @@ -557284,7 +557284,7 @@ _08122744: mov r0, sp bl sub_8122B28 movs r5, 0 -_08122762: +@08122762: ldr r6, =0x03005d8c lsls r4, r5, 3 ldr r1, =0x00002e68 @@ -557297,13 +557297,13 @@ _08122762: lsls r0, 24 adds r7, r4, 0 cmp r0, 0 - beq _081227D4 + beq @081227D4 movs r2, 0x4 mov r12, r6 cmp r2, r5 - bls _081227A6 + bls @081227A6 ldr r4, =0x00002e68 -_08122788: +@08122788: ldr r0, [r6] lsls r3, r2, 3 adds r0, r4 @@ -557318,8 +557318,8 @@ _08122788: lsls r2, 16 lsrs r2, 16 cmp r2, r5 - bhi _08122788 -_081227A6: + bhi @08122788 +@081227A6: mov r3, r12 ldr r2, [r3] ldr r0, =0x00002e68 @@ -557330,23 +557330,23 @@ _081227A6: str r0, [r2] str r1, [r2, 0x4] cmp r5, 0x4 - bne _081227C2 + bne @081227C2 mov r0, r8 bl sub_80EDC60 -_081227C2: +@081227C2: movs r0, 0 cmp r5, 0 - bne _081227F4 + bne @081227F4 movs r0, 0x1 - b _081227F4 + b @081227F4 .align 2, 0 .pool -_081227D4: +@081227D4: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x4 - bls _08122762 + bls @08122762 ldr r2, [r6] ldr r1, =0x00002e88 adds r2, r1 @@ -557356,9 +557356,9 @@ _081227D4: str r1, [r2, 0x4] mov r0, r8 bl sub_80EDC60 -_081227F2: +@081227F2: movs r0, 0 -_081227F4: +@081227F4: add sp, 0x8 pop {r3} mov r8, r3 @@ -557370,7 +557370,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 @@ -557384,18 +557384,18 @@ sub_8122804: @ 8122804 mov r10, r2 movs r2, 0 cmp r2, r7 - bcs _0812286C -_08122820: + bcs @0812286C +@08122820: adds r1, r2, 0x1 lsls r0, r1, 16 lsrs r5, r0, 16 mov r8, r1 cmp r5, r7 - bcs _08122862 + bcs @08122862 lsls r0, r2, 3 mov r1, r9 adds r6, r1, r0 -_08122832: +@08122832: lsls r0, r5, 3 mov r1, r9 adds r4, r1, r0 @@ -557405,7 +557405,7 @@ _08122832: bl atk90_changetypestoenemyattacktype lsls r0, 24 cmp r0, 0 - beq _08122858 + beq @08122858 ldr r2, [r4] ldr r3, [r4, 0x4] ldr r0, [r6] @@ -557414,19 +557414,19 @@ _08122832: str r1, [r4, 0x4] str r2, [r6] str r3, [r6, 0x4] -_08122858: +@08122858: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, r7 - bcc _08122832 -_08122862: + bcc @08122832 +@08122862: mov r1, r8 lsls r0, r1, 16 lsrs r2, r0, 16 cmp r2, r7 - bcc _08122820 -_0812286C: + bcc @08122820 +@0812286C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -557437,7 +557437,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 @@ -557452,24 +557452,24 @@ sub_812287C: @ 812287C bl malloc mov r10, r0 cmp r0, 0 - beq _08122980 + beq @08122980 adds r0, r4, 0 bl malloc adds r7, r0, 0 cmp r7, 0 - bne _081228B0 + bne @081228B0 mov r0, r10 bl free - b _08122980 -_081228B0: + b @08122980 +@081228B0: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 mov r9, r0 movs r5, 0 cmp r5, r9 - bcs _081228DE -_081228C0: + bcs @081228DE +@081228C0: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -557483,17 +557483,17 @@ _081228C0: lsls r0, 16 lsrs r5, r0, 16 cmp r5, r9 - bcc _081228C0 -_081228DE: + bcc @081228C0 +@081228DE: mov r4, r10 mov r8, r7 movs r3, 0 movs r5, 0 cmp r5, r9 - bcs _08122946 -_081228EA: + bcs @08122946 +@081228EA: movs r6, 0 -_081228EC: +@081228EC: adds r0, r7, 0 adds r1, r4, 0 adds r2, r3, 0 @@ -557503,7 +557503,7 @@ _081228EC: asrs r0, 16 ldr r3, [sp] cmp r0, 0 - bge _08122918 + bge @08122918 ldr r0, [r4] ldr r1, [r4, 0x4] mov r2, r8 @@ -557514,8 +557514,8 @@ _081228EC: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 - b _08122930 -_08122918: + b @08122930 +@08122918: lsls r0, 3 adds r2, r7, r0 ldrb r1, [r2] @@ -557523,24 +557523,24 @@ _08122918: ldrb r0, [r4] lsls r0, 25 cmp r1, r0 - bcs _08122930 + bcs @08122930 ldr r0, [r4] ldr r1, [r4, 0x4] str r0, [r2] str r1, [r2, 0x4] -_08122930: +@08122930: adds r4, 0x8 adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x4 - bls _081228EC + bls @081228EC adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, r9 - bcc _081228EA -_08122946: + bcc @081228EA +@08122946: adds r0, r7, 0 adds r1, r3, 0 movs r2, 0x2 @@ -557552,7 +557552,7 @@ _08122946: adds r1, r0 mov r8, r1 movs r5, 0 -_0812295E: +@0812295E: ldm r4!, {r0,r1} mov r2, r8 adds r2, 0x8 @@ -557563,12 +557563,12 @@ _0812295E: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x4 - bls _0812295E + bls @0812295E mov r0, r10 bl free adds r0, r7, 0 bl free -_08122980: +@08122980: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -557582,7 +557582,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 @@ -557603,7 +557603,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 @@ -557620,7 +557620,7 @@ sub_81229C8: @ 81229C8 lsrs r0, 25 subs r1, r0 cmp r1, 0x1 - bgt _08122A0C + bgt @08122A0C ldr r1, =0x00002e69 adds r0, r3, r1 ldrb r1, [r0] @@ -557628,7 +557628,7 @@ sub_81229C8: @ 81229C8 adds r0, r2, 0 ands r0, r1 cmp r0, 0 - bne _08122A0C + bne @08122A0C ldr r1, =0x00002e71 adds r0, r3, r1 ldrb r1, [r0] @@ -557638,7 +557638,7 @@ sub_81229C8: @ 81229C8 lsrs r0, 24 negs r0, r0 lsrs r4, r0, 31 -_08122A0C: +@08122A0C: ldr r0, =0x020375f0 strh r4, [r0] pop {r4} @@ -557649,7 +557649,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] @@ -557669,7 +557669,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 @@ -557677,25 +557677,25 @@ atk90_changetypestoenemyattacktype: @ 8122A58 lsrs r2, 24 adds r0, r2, 0 cmp r2, 0x1 - beq _08122A9E + beq @08122A9E cmp r2, 0x1 - bgt _08122A72 + bgt @08122A72 cmp r2, 0 - beq _08122A78 - b _08122B1A -_08122A72: + beq @08122A78 + b @08122B1A +@08122A72: cmp r0, 0x2 - beq _08122ACA - b _08122B1A -_08122A78: + beq @08122ACA + b @08122B1A +@08122A78: ldrb r0, [r3] lsls r1, r0, 25 ldrb r0, [r5] lsls r0, 25 cmp r1, r0 - bhi _08122B16 + bhi @08122B16 cmp r1, r0 - bcc _08122AC6 + bcc @08122AC6 ldrh r0, [r3] lsls r3, r0, 18 ldrh r0, [r5] @@ -557703,11 +557703,11 @@ _08122A78: lsrs r1, r3, 25 lsrs r0, r2, 25 cmp r1, r0 - bhi _08122B16 + bhi @08122B16 lsrs r1, r3, 25 lsrs r0, r2, 25 - b _08122AC2 -_08122A9E: + b @08122AC2 +@08122A9E: ldrh r0, [r3] lsls r4, r0, 18 ldrh r0, [r5] @@ -557715,32 +557715,32 @@ _08122A9E: lsrs r1, r4, 25 lsrs r0, r2, 25 cmp r1, r0 - bhi _08122B16 + bhi @08122B16 lsrs r1, r4, 25 lsrs r0, r2, 25 cmp r1, r0 - bcc _08122AC6 + bcc @08122AC6 ldrb r0, [r3] lsls r1, r0, 25 ldrb r0, [r5] lsls r0, 25 cmp r1, r0 - bhi _08122B16 -_08122AC2: + bhi @08122B16 +@08122AC2: cmp r1, r0 - bcs _08122B1A -_08122AC6: + bcs @08122B1A +@08122AC6: movs r0, 0 - b _08122B22 -_08122ACA: + b @08122B22 +@08122ACA: ldrb r0, [r3] lsls r1, r0, 25 ldrb r0, [r5] lsls r0, 25 cmp r1, r0 - bhi _08122B16 + bhi @08122B16 cmp r1, r0 - bcc _08122AC6 + bcc @08122AC6 ldrh r0, [r3] lsls r4, r0, 18 ldrh r0, [r5] @@ -557748,44 +557748,44 @@ _08122ACA: lsrs r1, r4, 25 lsrs r0, r2, 25 cmp r1, r0 - bhi _08122B16 + bhi @08122B16 lsrs r1, r4, 25 lsrs r0, r2, 25 cmp r1, r0 - bcc _08122AC6 + bcc @08122AC6 ldrh r1, [r3, 0x2] ldrh r0, [r5, 0x2] cmp r1, r0 - bhi _08122B16 + bhi @08122B16 cmp r1, r0 - bcc _08122AC6 + bcc @08122AC6 ldrh r1, [r3, 0x4] ldrh r0, [r5, 0x4] cmp r1, r0 - bhi _08122B16 + bhi @08122B16 cmp r1, r0 - bcc _08122AC6 + bcc @08122AC6 ldrh r1, [r3, 0x6] ldrh r0, [r5, 0x6] cmp r1, r0 - bhi _08122B16 + bhi @08122B16 cmp r1, r0 - bcc _08122AC6 -_08122B16: + bcc @08122AC6 +@08122B16: movs r0, 0x1 - b _08122B22 -_08122B1A: + b @08122B22 +@08122B1A: bl GenerateRandomNumber movs r1, 0x1 ands r0, r1 -_08122B22: +@08122B22: pop {r4,r5} pop {r1} bx r1 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 @@ -557796,7 +557796,7 @@ sub_8122B28: @ 8122B28 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x32 - bls _08122B6A + bls @08122B6A bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -557805,7 +557805,7 @@ sub_8122B28: @ 8122B28 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x50 - bls _08122B6A + bls @08122B6A bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -557813,7 +557813,7 @@ sub_8122B28: @ 8122B28 bl __umodsi3 lsls r0, 16 lsrs r4, r0, 16 -_08122B6A: +@08122B6A: adds r1, r4, 0 adds r1, 0x1E movs r0, 0x7F @@ -557848,12 +557848,12 @@ _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 ldr r6, =0x03005d8c -_08122BB8: +@08122BB8: lsls r1, r4, 3 ldr r0, [r6] adds r1, r0 @@ -557863,54 +557863,54 @@ _08122BB8: bl sub_8122BF0 lsls r0, 24 cmp r0, 0 - beq _08122BDC + beq @08122BDC movs r0, 0x1 - b _08122BE8 + b @08122BE8 .align 2, 0 .pool -_08122BDC: +@08122BDC: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x4 - bls _08122BB8 + bls @08122BB8 movs r0, 0 -_08122BE8: +@08122BE8: pop {r4-r6} pop {r1} bx r1 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 movs r4, 0 -_08122BF8: +@08122BF8: ldrh r1, [r3] ldrh r0, [r2] adds r2, 0x2 adds r3, 0x2 cmp r1, r0 - beq _08122C08 + beq @08122C08 movs r0, 0 - b _08122C14 -_08122C08: + b @08122C14 +@08122C08: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x1 - bls _08122BF8 + bls @08122BF8 movs r0, 0x1 -_08122C14: +@08122C14: pop {r4} pop {r1} bx r1 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 @@ -557918,18 +557918,18 @@ sub_8122C1C: @ 8122C1C lsrs r6, r2, 16 movs r4, 0 cmp r4, r6 - bge _08122C52 -_08122C2C: + bge @08122C52 +@08122C2C: adds r1, r5, 0x4 adds r0, r7, 0x4 bl sub_8122BF0 lsls r0, 24 cmp r0, 0 - beq _08122C40 + beq @08122C40 lsls r0, r4, 16 asrs r0, 16 - b _08122C56 -_08122C40: + b @08122C56 +@08122C40: adds r5, 0x8 lsls r0, r4, 16 movs r1, 0x80 @@ -557938,18 +557938,18 @@ _08122C40: lsrs r4, r0, 16 asrs r0, 16 cmp r0, r6 - blt _08122C2C -_08122C52: + blt @08122C2C +@08122C52: movs r0, 0x1 negs r0, r0 -_08122C56: +@08122C56: pop {r4-r7} pop {r1} bx r1 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 @@ -557957,33 +557957,33 @@ sub_8122C5C: @ 8122C5C lsrs r1, 16 movs r3, 0 ldr r2, =0x0859f53c -_08122C6A: +@08122C6A: movs r0, 0 ldrsb r0, [r2, r0] cmp r0, r4 - bne _08122C84 + bne @08122C84 movs r0, 0x1 ldrsb r0, [r2, r0] cmp r0, r1 - bne _08122C84 + bne @08122C84 adds r0, r3, 0x1 - b _08122C8E + b @08122C8E .align 2, 0 .pool -_08122C84: +@08122C84: adds r2, 0x8 adds r3, 0x1 cmp r3, 0x15 - bls _08122C6A + bls @08122C6A movs r0, 0 -_08122C8E: +@08122C8E: pop {r4} pop {r1} bx r1 thumb_func_end sub_8122C5C thumb_func_start sub_8122C94 -sub_8122C94: @ 8122C94 +sub_8122C94: ; 8122C94 push {lr} lsls r0, 16 lsrs r0, 16 @@ -557991,59 +557991,59 @@ sub_8122C94: @ 8122C94 lsrs r1, 16 bl sub_8122C5C cmp r0, 0 - beq _08122CB4 + beq @08122CB4 lsls r0, 3 ldr r1, =0x0859f534 adds r0, r1 - b _08122CB6 + b @08122CB6 .align 2, 0 .pool -_08122CB4: +@08122CB4: movs r0, 0 -_08122CB6: +@08122CB6: pop {r1} bx r1 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 + beq @08122CD4 cmp r0, 0x16 - bhi _08122CD4 + bhi @08122CD4 lsls r0, 3 ldr r1, =0x0859f534 adds r0, r1 - b _08122CD6 + b @08122CD6 .align 2, 0 .pool -_08122CD4: +@08122CD4: movs r0, 0 -_08122CD6: +@08122CD6: pop {r1} bx r1 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 movs r1, 0 bl sub_8122CF8 -_08122CE8: +@08122CE8: bl sub_8122DB0 lsls r0, 24 cmp r0, 0 - bne _08122CE8 + bne @08122CE8 pop {r0} bx r0 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 @@ -558060,17 +558060,17 @@ sub_8122CF8: @ 8122CF8 strb r2, [r0] ldr r1, [r3] cmp r2, 0x1 - bne _08122D28 + bne @08122D28 ldr r0, =sub_8123254 + 1 - b _08122D2A + b @08122D2A .align 2, 0 .pool -_08122D28: +@08122D28: ldr r0, =sub_81230C4 + 1 -_08122D2A: +@08122D2A: str r0, [r1, 0x18] cmp r4, 0 - beq _08122D64 + beq @08122D64 ldr r1, [r3] ldr r0, [r4] lsls r0, 30 @@ -558093,10 +558093,10 @@ _08122D2A: adds r0, 0x83 movs r1, 0x1 strb r1, [r0] - b _08122D80 + b @08122D80 .align 2, 0 .pool -_08122D64: +@08122D64: ldr r0, [r3] adds r0, 0x80 movs r1, 0x2 @@ -558111,14 +558111,14 @@ _08122D64: ldr r0, [r3] adds r0, 0x83 strb r4, [r0] -_08122D80: +@08122D80: pop {r4,r5} pop {r0} bx r0 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] @@ -558141,7 +558141,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 @@ -558149,63 +558149,63 @@ sub_8122DB0: @ 8122DB0 adds r0, 0x79 ldrb r0, [r0] cmp r0, 0x7 - bls _08122DC2 - b _0812300C -_08122DC2: + bls @08122DC2 + b @0812300C +@08122DC2: lsls r0, 2 - ldr r1, =_08122DD4 + ldr r1, =@08122DD4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08122DD4: - .4byte _08122DF4 - .4byte _08122E2C - .4byte _08122E78 - .4byte _08122E94 - .4byte _08122EB0 - .4byte _08122ECC - .4byte _08122F10 - .4byte _08122F8C -_08122DF4: +@08122DD4: + .4byte @08122DF4 + .4byte @08122E2C + .4byte @08122E78 + .4byte @08122E94 + .4byte @08122EB0 + .4byte @08122ECC + .4byte @08122F10 + .4byte @08122F8C +@08122DF4: ldr r0, =0x0203a144 ldr r1, [r0] adds r0, r1, 0 adds r0, 0x83 ldrb r0, [r0] cmp r0, 0 - beq _08122E18 + beq @08122E18 adds r0, r1, 0 adds r0, 0x80 ldrb r0, [r0] ldr r1, =0x0859f77c movs r2, 0 str r2, [sp] - b _08122E52 + b @08122E52 .align 2, 0 .pool -_08122E18: +@08122E18: ldr r0, =0x0859f77c ldr r1, =0x06008000 bl LZ77UnCompVram - b _08123014 + b @08123014 .align 2, 0 .pool -_08122E2C: +@08122E2C: ldr r4, =0x0203a144 ldr r0, [r4] adds r0, 0x83 ldrb r0, [r0] cmp r0, 0 - beq _08122E64 + beq @08122E64 bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - beq _08122E44 - b _08123014 -_08122E44: + beq @08122E44 + b @08123014 +@08122E44: ldr r0, [r4] adds r0, 0x80 ldrb r0, [r0] @@ -558213,34 +558213,34 @@ _08122E44: movs r2, 0x1 str r2, [sp] movs r2, 0 -_08122E52: +@08122E52: movs r3, 0 bl decompress_and_copy_tile_data_to_vram - b _08123014 + b @08123014 .align 2, 0 .pool -_08122E64: +@08122E64: ldr r0, =0x085a04e0 ldr r1, =0x0600e000 bl LZ77UnCompVram - b _08123014 + b @08123014 .align 2, 0 .pool -_08122E78: +@08122E78: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - beq _08122E84 - b _08123014 -_08122E84: + beq @08122E84 + b @08123014 +@08122E84: ldr r0, =0x0859f73c movs r1, 0x70 movs r2, 0x60 bl gpu_pal_apply - b _08123014 + b @08123014 .align 2, 0 .pool -_08122E94: +@08122E94: ldr r0, =0x0859f60c ldr r1, =0x0203a144 ldr r1, [r1] @@ -558248,10 +558248,10 @@ _08122E94: lsls r2, 1 adds r1, r2 bl LZ77UnCompWram - b _08123014 + b @08123014 .align 2, 0 .pool -_08122EB0: +@08122EB0: ldr r0, =0x0859f650 ldr r1, =0x0203a144 ldr r1, [r1] @@ -558259,10 +558259,10 @@ _08122EB0: lsls r5, 2 adds r1, r5 bl LZ77UnCompWram - b _08123014 + b @08123014 .align 2, 0 .pool -_08122ECC: +@08122ECC: bl sub_81238AC ldr r4, =0x0203a144 ldr r2, [r4] @@ -558289,17 +558289,17 @@ _08122ECC: ldrh r1, [r1] movs r2, 0x10 bl GetMapName - b _08123014 + b @08123014 .align 2, 0 .pool -_08122F10: +@08122F10: ldr r0, =0x0203a144 ldr r4, [r0] adds r0, r4, 0 adds r0, 0x78 ldrb r1, [r0] cmp r1, 0 - bne _08122F3C + bne @08122F3C movs r0, 0x80 lsls r0, 1 str r0, [sp] @@ -558310,10 +558310,10 @@ _08122F10: movs r2, 0 movs r3, 0 bl sub_81236C4 - b _08123014 + b @08123014 .align 2, 0 .pool -_08122F3C: +@08122F3C: adds r1, r4, 0 adds r1, 0x54 ldrh r0, [r1] @@ -558352,8 +558352,8 @@ _08122F3C: movs r2, 0x38 movs r3, 0x48 bl sub_81236C4 - b _08123014 -_08122F8C: + b @08123014 +@08122F8C: bl sub_8123FB0 bl sub_81237B4 ldr r4, =0x0203a144 @@ -558371,7 +558371,7 @@ _08122F8C: adds r0, 0x83 ldrb r0, [r0] cmp r0, 0 - beq _08123002 + beq @08123002 adds r0, r1, 0 adds r0, 0x80 ldrb r0, [r0] @@ -558406,18 +558406,18 @@ _08122F8C: movs r1, 0x4 movs r2, 0x1 bl gpu_bg_config_set_field -_08123002: +@08123002: ldr r1, [r4] adds r1, 0x79 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_0812300C: +@0812300C: movs r0, 0 - b _08123022 + b @08123022 .align 2, 0 .pool -_08123014: +@08123014: ldr r0, =0x0203a144 ldr r1, [r0] adds r1, 0x79 @@ -558425,7 +558425,7 @@ _08123014: adds r0, 0x1 strb r0, [r1] movs r0, 0x1 -_08123022: +@08123022: add sp, 0xC pop {r4,r5} pop {r1} @@ -558435,7 +558435,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 @@ -558456,13 +558456,13 @@ 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] ldr r0, [r0, 0x1C] cmp r0, 0 - beq _08123080 + beq @08123080 bl obj_delete_and_free_tiles ldr r0, [r4] adds r0, 0x58 @@ -558472,11 +558472,11 @@ sub_812305C: @ 812305C adds r0, 0x5A ldrh r0, [r0] bl gpu_pal_free_tag -_08123080: +@08123080: ldr r0, [r4] ldr r0, [r0, 0x20] cmp r0, 0 - beq _081230A0 + beq @081230A0 bl obj_delete_and_free_tiles ldr r0, [r4] adds r0, 0x70 @@ -558486,7 +558486,7 @@ _08123080: adds r0, 0x72 ldrh r0, [r0] bl gpu_pal_free_tag -_081230A0: +@081230A0: pop {r4} pop {r0} bx r0 @@ -558495,7 +558495,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] @@ -558510,7 +558510,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 @@ -558525,84 +558525,84 @@ sub_81230C4: @ 81230C4 movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _081230F6 + beq @081230F6 ldr r1, [r2] adds r0, r1, 0 adds r0, 0x56 ldrh r0, [r0] cmp r0, 0x2 - bls _081230F6 + bls @081230F6 adds r1, 0x7C movs r0, 0xFF strb r0, [r1] movs r4, 0x1 -_081230F6: +@081230F6: ldrh r1, [r3, 0x2C] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08123114 + beq @08123114 ldr r1, [r2] adds r0, r1, 0 adds r0, 0x56 ldrh r0, [r0] cmp r0, 0xF - bhi _08123114 + bhi @08123114 adds r1, 0x7C movs r0, 0x1 strb r0, [r1] movs r4, 0x1 -_08123114: +@08123114: ldrh r1, [r3, 0x2C] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _08123132 + beq @08123132 ldr r1, [r2] adds r0, r1, 0 adds r0, 0x54 ldrh r0, [r0] cmp r0, 0x1 - bls _08123132 + bls @08123132 adds r1, 0x7B movs r0, 0xFF strb r0, [r1] movs r4, 0x1 -_08123132: +@08123132: ldrh r1, [r3, 0x2C] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08123150 + beq @08123150 ldr r1, [r2] adds r0, r1, 0 adds r0, 0x54 ldrh r0, [r0] cmp r0, 0x1B - bhi _08123150 + bhi @08123150 adds r1, 0x7B movs r0, 0x1 strb r0, [r1] movs r4, 0x1 -_08123150: +@08123150: ldrh r3, [r3, 0x2E] movs r0, 0x1 ands r0, r3 cmp r0, 0 - beq _08123168 + beq @08123168 movs r4, 0x4 - b _08123172 + b @08123172 .align 2, 0 .pool -_08123168: +@08123168: movs r0, 0x2 ands r0, r3 cmp r0, 0 - beq _08123172 + beq @08123172 movs r4, 0x5 -_08123172: +@08123172: cmp r4, 0x1 - bne _08123184 + bne @08123184 ldr r0, [r2] adds r0, 0x7A movs r1, 0x4 @@ -558610,7 +558610,7 @@ _08123172: ldr r1, [r2] ldr r0, =_swiopen + 1 str r0, [r1, 0x18] -_08123184: +@08123184: adds r0, r4, 0 pop {r4} pop {r1} @@ -558620,7 +558620,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] @@ -558630,24 +558630,24 @@ _swiopen: @ 8123190 lsls r0, 24 asrs r0, 24 cmp r0, 0 - beq _081231AC + beq @081231AC movs r0, 0x2 - b _08123248 + b @08123248 .align 2, 0 .pool -_081231AC: +@081231AC: adds r0, r1, 0 adds r0, 0x7B ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0 - ble _081231C2 + ble @081231C2 adds r1, 0x54 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_081231C2: +@081231C2: ldr r1, [r5] adds r0, r1, 0 adds r0, 0x7B @@ -558655,12 +558655,12 @@ _081231C2: lsls r0, 24 asrs r0, 24 cmp r0, 0 - bge _081231DA + bge @081231DA adds r1, 0x54 ldrh r0, [r1] subs r0, 0x1 strh r0, [r1] -_081231DA: +@081231DA: ldr r1, [r5] adds r0, r1, 0 adds r0, 0x7C @@ -558668,12 +558668,12 @@ _081231DA: lsls r0, 24 asrs r0, 24 cmp r0, 0 - ble _081231F2 + ble @081231F2 adds r1, 0x56 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_081231F2: +@081231F2: ldr r1, [r5] adds r0, r1, 0 adds r0, 0x7C @@ -558681,12 +558681,12 @@ _081231F2: lsls r0, 24 asrs r0, 24 cmp r0, 0 - bge _0812320A + bge @0812320A adds r1, 0x56 ldrh r0, [r1] subs r0, 0x1 strh r0, [r1] -_0812320A: +@0812320A: ldr r1, [r5] adds r0, r1, 0 adds r0, 0x54 @@ -558703,19 +558703,19 @@ _0812320A: ldr r1, [r5] ldrh r0, [r1] cmp r4, r0 - beq _0812323C + beq @0812323C strh r4, [r1] adds r0, r1, 0x4 ldrh r1, [r1] movs r2, 0x10 bl GetMapName -_0812323C: +@0812323C: bl sub_8123FB0 ldr r1, [r5] ldr r0, =sub_81230C4 + 1 str r0, [r1, 0x18] movs r0, 0x3 -_08123248: +@08123248: pop {r4,r5} pop {r1} bx r1 @@ -558724,7 +558724,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 @@ -558742,7 +558742,7 @@ sub_8123254: @ 8123254 adds r6, r3, 0 adds r3, r2, 0 cmp r0, 0 - beq _0812328E + beq @0812328E mov r0, r12 adds r0, 0x5E movs r2, 0 @@ -558750,33 +558750,33 @@ sub_8123254: @ 8123254 movs r0, 0x34 negs r0, r0 cmp r1, r0 - ble _0812328E + ble @0812328E ldr r0, =0x0000ffff strh r0, [r5] movs r4, 0x1 -_0812328E: +@0812328E: ldrh r1, [r3, 0x2C] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081232AE + beq @081232AE ldr r1, [r6] adds r0, r1, 0 adds r0, 0x5E movs r5, 0 ldrsh r0, [r0, r5] cmp r0, 0x3B - bgt _081232AE + bgt @081232AE adds r1, 0x68 movs r0, 0x1 strh r0, [r1] movs r4, 0x1 -_081232AE: +@081232AE: ldrh r1, [r3, 0x2C] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _081232D4 + beq @081232D4 ldr r2, [r6] adds r0, r2, 0 adds r0, 0x5C @@ -558785,52 +558785,52 @@ _081232AE: movs r0, 0x2C negs r0, r0 cmp r1, r0 - ble _081232D4 + ble @081232D4 adds r1, r2, 0 adds r1, 0x6A ldr r0, =0x0000ffff strh r0, [r1] movs r4, 0x1 -_081232D4: +@081232D4: ldrh r1, [r3, 0x2C] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _081232F4 + beq @081232F4 ldr r1, [r6] adds r0, r1, 0 adds r0, 0x5C movs r2, 0 ldrsh r0, [r0, r2] cmp r0, 0xAB - bgt _081232F4 + bgt @081232F4 adds r1, 0x6A movs r0, 0x1 strh r0, [r1] movs r4, 0x1 -_081232F4: +@081232F4: ldrh r2, [r3, 0x2E] movs r0, 0x1 ands r0, r2 cmp r0, 0 - beq _08123300 + beq @08123300 movs r4, 0x4 -_08123300: +@08123300: movs r0, 0x2 ands r0, r2 cmp r0, 0 - beq _0812330A + beq @0812330A movs r4, 0x5 -_0812330A: +@0812330A: cmp r4, 0x1 - bne _0812331A + bne @0812331A ldr r0, [r6] ldr r1, =sub_8123334 + 1 str r1, [r0, 0x18] adds r0, 0x6C movs r1, 0 strh r1, [r0] -_0812331A: +@0812331A: adds r0, r4, 0 pop {r4-r6} pop {r1} @@ -558840,7 +558840,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] @@ -558874,7 +558874,7 @@ sub_8123334: @ 8123334 lsls r0, 16 lsrs r0, 16 cmp r0, 0x8 - bne _08123410 + bne @08123410 adds r0, r2, 0 adds r0, 0x5C movs r3, 0 @@ -558882,9 +558882,9 @@ sub_8123334: @ 8123334 adds r0, r1, 0 adds r0, 0x2C cmp r0, 0 - bge _0812338C + bge @0812338C adds r0, 0x7 -_0812338C: +@0812338C: asrs r0, 3 adds r0, 0x1 lsls r0, 16 @@ -558896,9 +558896,9 @@ _0812338C: adds r0, r1, 0 adds r0, 0x34 cmp r0, 0 - bge _081233A6 + bge @081233A6 adds r0, 0x7 -_081233A6: +@081233A6: asrs r0, 3 adds r0, 0x2 lsls r0, 16 @@ -558909,11 +558909,11 @@ _081233A6: adds r0, 0x66 ldrh r2, [r4] cmp r3, r2 - bne _081233C2 + bne @081233C2 ldrh r2, [r0] cmp r1, r2 - beq _081233F2 -_081233C2: + beq @081233F2 +@081233C2: strh r3, [r4] strh r1, [r0] adds r0, r3, 0 @@ -558927,15 +558927,15 @@ _081233C2: ldr r1, [r5] ldrh r3, [r1] cmp r4, r3 - beq _081233EE + beq @081233EE strh r4, [r1] adds r0, r1, 0x4 ldrh r1, [r1] movs r2, 0x10 bl GetMapName -_081233EE: +@081233EE: bl sub_8123FB0 -_081233F2: +@081233F2: ldr r0, =0x0203a144 ldr r2, [r0] adds r1, r2, 0 @@ -558945,19 +558945,19 @@ _081233F2: ldr r0, =sub_8123254 + 1 str r0, [r2, 0x18] movs r0, 0x3 - b _08123412 + b @08123412 .align 2, 0 .pool -_08123410: +@08123410: movs r0, 0x2 -_08123412: +@08123412: pop {r4,r5} pop {r1} bx r1 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] @@ -558966,7 +558966,7 @@ sub_8123418: @ 8123418 ldrb r3, [r0] adds r5, r1, 0 cmp r3, 0 - bne _0812349C + bne @0812349C subs r0, 0x1A strh r3, [r0] subs r0, 0x2 @@ -558994,18 +558994,18 @@ sub_8123418: @ 8123418 ldrsh r0, [r1, r6] lsls r0, 8 cmp r0, 0 - bge _08123464 + bge @08123464 adds r0, 0xF -_08123464: +@08123464: asrs r0, 4 str r0, [r2, 0x44] movs r1, 0 ldrsh r0, [r3, r1] lsls r0, 8 cmp r0, 0 - bge _08123474 + bge @08123474 adds r0, 0xF -_08123474: +@08123474: asrs r0, 4 str r0, [r2, 0x48] ldrh r1, [r4] @@ -559021,10 +559021,10 @@ _08123474: lsls r0, 9 str r0, [r2, 0x4C] ldr r0, =0xfffff800 - b _081234FA + b @081234FA .align 2, 0 .pool -_0812349C: +@0812349C: adds r0, r2, 0 adds r0, 0x5C movs r6, 0 @@ -559045,17 +559045,17 @@ _0812349C: strh r1, [r0] ldr r0, [r2, 0x3C] cmp r0, 0 - bge _081234C8 + bge @081234C8 adds r0, 0xF -_081234C8: +@081234C8: asrs r0, 4 negs r0, r0 str r0, [r2, 0x44] ldr r0, [r2, 0x40] cmp r0, 0 - bge _081234D6 + bge @081234D6 adds r0, 0xF -_081234D6: +@081234D6: asrs r0, 4 negs r0, r0 str r0, [r2, 0x48] @@ -559074,7 +559074,7 @@ _081234D6: str r0, [r2, 0x4C] movs r0, 0x80 lsls r0, 4 -_081234FA: +@081234FA: str r0, [r2, 0x50] ldr r0, [r5] adds r0, 0x6E @@ -559088,7 +559088,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 @@ -559098,19 +559098,19 @@ sub_8123514: @ 8123514 ldrh r1, [r2] adds r5, r0, 0 cmp r1, 0xF - bls _08123530 + bls @08123530 movs r0, 0 - b _081236B8 + b @081236B8 .align 2, 0 .pool -_08123530: +@08123530: adds r0, r1, 0x1 movs r1, 0 strh r0, [r2] lsls r0, 16 lsrs r0, 16 cmp r0, 0x10 - bne _081235A4 + bne @081235A4 str r1, [r3, 0x44] str r1, [r3, 0x48] adds r0, r3, 0 @@ -559128,17 +559128,17 @@ _08123530: movs r2, 0x80 lsls r2, 9 cmp r0, 0 - bne _08123566 + bne @08123566 movs r2, 0x80 lsls r2, 8 -_08123566: +@08123566: str r2, [r3, 0x4C] movs r2, 0 ldrb r0, [r1] cmp r0, 0 - bne _08123572 + bne @08123572 movs r2, 0x1 -_08123572: +@08123572: strb r2, [r1] ldr r1, [r5] adds r0, r1, 0 @@ -559146,9 +559146,9 @@ _08123572: ldrb r0, [r0] ldr r2, =sub_8123254 + 1 cmp r0, 0 - bne _08123584 + bne @08123584 ldr r2, =sub_81230C4 + 1 -_08123584: +@08123584: str r2, [r1, 0x18] adds r0, r1, 0 adds r0, 0x58 @@ -559158,10 +559158,10 @@ _08123584: bl sub_81240D4 bl sub_81243DC movs r4, 0 - b _08123686 + b @08123686 .align 2, 0 .pool -_081235A4: +@081235A4: ldr r2, [r3, 0x3C] ldr r0, [r3, 0x44] adds r2, r0 @@ -559185,7 +559185,7 @@ _081235A4: str r0, [r3, 0x4C] ldr r2, [r3, 0x44] cmp r2, 0 - bge _081235E4 + bge @081235E4 adds r0, r3, 0 adds r0, 0x60 movs r6, 0 @@ -559193,10 +559193,10 @@ _081235A4: movs r6, 0 ldrsh r0, [r0, r6] cmp r1, r0 - blt _081235F8 -_081235E4: + blt @081235F8 +@081235E4: cmp r2, 0 - ble _08123608 + ble @08123608 adds r0, r3, 0 adds r0, 0x60 movs r2, 0 @@ -559204,8 +559204,8 @@ _081235E4: movs r6, 0 ldrsh r0, [r0, r6] cmp r1, r0 - ble _08123608 -_081235F8: + ble @08123608 +@081235F8: ldr r3, [r5] adds r0, r3, 0 adds r0, 0x60 @@ -559214,11 +559214,11 @@ _081235F8: movs r1, 0 strh r2, [r0] str r1, [r3, 0x44] -_08123608: +@08123608: ldr r2, [r5] ldr r4, [r2, 0x48] cmp r4, 0 - bge _08123624 + bge @08123624 adds r0, r2, 0 adds r0, 0x5E adds r3, r2, 0 @@ -559228,10 +559228,10 @@ _08123608: movs r6, 0 ldrsh r0, [r3, r6] cmp r1, r0 - blt _0812363C -_08123624: + blt @0812363C +@08123624: cmp r4, 0 - ble _0812364E + ble @0812364E adds r1, r2, 0 adds r1, 0x5E adds r0, r2, 0 @@ -559241,8 +559241,8 @@ _08123624: movs r6, 0 ldrsh r0, [r0, r6] cmp r1, r0 - ble _0812364E -_0812363C: + ble @0812364E +@0812363C: ldr r2, [r5] adds r0, r2, 0 adds r0, 0x62 @@ -559252,36 +559252,36 @@ _0812363C: movs r0, 0 strh r1, [r3] str r0, [r2, 0x48] -_0812364E: +@0812364E: ldr r0, =0x0203a144 ldr r2, [r0] adds r0, r2, 0 adds r0, 0x78 ldrb r3, [r0] cmp r3, 0 - bne _08123674 + bne @08123674 ldr r1, [r2, 0x4C] ldr r0, =0x00007fff cmp r1, r0 - bgt _08123684 + bgt @08123684 adds r0, 0x1 str r0, [r2, 0x4C] str r3, [r2, 0x50] - b _08123684 + b @08123684 .align 2, 0 .pool -_08123674: +@08123674: ldr r0, [r2, 0x4C] movs r1, 0x80 lsls r1, 9 cmp r0, r1 - ble _08123684 + ble @08123684 str r1, [r2, 0x4C] movs r0, 0 str r0, [r2, 0x50] -_08123684: +@08123684: movs r4, 0x1 -_08123686: +@08123686: ldr r0, =0x0203a144 ldr r3, [r0] adds r0, r3, 0 @@ -559306,7 +559306,7 @@ _08123686: movs r3, 0x48 bl sub_81236C4 adds r0, r4, 0 -_081236B8: +@081236B8: add sp, 0xC pop {r4-r6} pop {r1} @@ -559316,7 +559316,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 @@ -559417,7 +559417,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 @@ -559441,7 +559441,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] @@ -559449,7 +559449,7 @@ sub_81237B4: @ 81237B4 adds r0, 0x7D ldrb r0, [r0] cmp r0, 0 - beq _0812381A + beq @0812381A ldrh r1, [r1, 0x2C] movs r0, 0x20 bl lcd_io_set @@ -559485,7 +559485,7 @@ sub_81237B4: @ 81237B4 adds r0, 0x7D movs r1, 0 strb r1, [r0] -_0812381A: +@0812381A: pop {r4} pop {r0} bx r0 @@ -559494,7 +559494,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 @@ -559517,13 +559517,13 @@ sub_8123824: @ 8123824 ldr r2, [r0] ldr r1, [r2, 0x20] cmp r1, 0 - beq _08123860 + beq @08123860 negs r0, r4 strh r0, [r1, 0x24] ldr r1, [r2, 0x20] negs r0, r5 strh r0, [r1, 0x26] -_08123860: +@08123860: add sp, 0xC pop {r4,r5} pop {r0} @@ -559533,7 +559533,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 @@ -559542,17 +559542,17 @@ sub_812386C: @ 812386C adds r1, r0 lsrs r2, r1, 16 cmp r2, 0xE - bhi _08123886 + bhi @08123886 cmp r3, 0 - beq _08123886 + beq @08123886 cmp r3, 0x1C - bls _08123890 -_08123886: + bls @08123890 +@08123886: movs r0, 0xD5 - b _081238A4 + b @081238A4 .align 2, 0 .pool -_08123890: +@08123890: subs r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 @@ -559563,7 +559563,7 @@ _08123890: adds r0, r3, r0 adds r0, r1 ldrb r0, [r0] -_081238A4: +@081238A4: pop {r1} bx r1 .align 2, 0 @@ -559571,7 +559571,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 @@ -559584,18 +559584,18 @@ sub_81238AC: @ 81238AC ldrsb r1, [r2, r1] adds r3, r0, 0 cmp r1, 0x19 - bne _081238DC + bne @081238DC ldrb r0, [r2, 0x5] subs r0, 0x29 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bhi _081238DC + bhi @081238DC bl sub_8123C00 - b _08123BEC + b @08123BEC .align 2, 0 .pool -_081238DC: +@081238DC: ldr r1, [r3] movs r0, 0x4 ldrsb r0, [r1, r0] @@ -559607,26 +559607,26 @@ _081238DC: lsrs r0, 24 subs r0, 0x1 cmp r0, 0x8 - bhi _08123928 + bhi @08123928 lsls r0, 2 - ldr r1, =_08123904 + ldr r1, =@08123904 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08123904: - .4byte _08123928 - .4byte _08123928 - .4byte _08123928 - .4byte _0812396C - .4byte _08123928 - .4byte _08123928 - .4byte _0812396C - .4byte _08123A28 - .4byte _081239E4 -_08123928: +@08123904: + .4byte @08123928 + .4byte @08123928 + .4byte @08123928 + .4byte @0812396C + .4byte @08123928 + .4byte @08123928 + .4byte @0812396C + .4byte @08123A28 + .4byte @081239E4 +@08123928: ldr r4, =0x0203a144 ldr r0, [r4] ldr r3, =0x02037318 @@ -559646,24 +559646,24 @@ _08123928: ldr r1, [r4] ldrh r0, [r1] cmp r0, 0x45 - beq _08123956 + beq @08123956 cmp r0, 0xCC - beq _08123956 - b _08123ABE -_08123956: + beq @08123956 + b @08123ABE +@08123956: adds r1, 0x7F movs r0, 0x1 strb r0, [r1] - b _08123ABE + b @08123ABE .align 2, 0 .pool -_0812396C: +@0812396C: ldr r2, =0x02037318 ldrb r1, [r2, 0x1A] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081239C8 + beq @081239C8 ldr r4, =0x03005d8c ldr r1, [r4] adds r0, r1, 0 @@ -559695,10 +559695,10 @@ _0812396C: ldr r0, [r4] ldrh r6, [r0, 0x28] ldrh r3, [r0, 0x2A] - b _08123ABE + b @08123ABE .align 2, 0 .pool -_081239C8: +@081239C8: ldr r0, =0x0203a144 ldr r0, [r0] ldrb r1, [r2, 0x14] @@ -559710,10 +559710,10 @@ _081239C8: mov r9, r2 movs r6, 0x1 movs r3, 0x1 - b _08123ABE + b @08123ABE .align 2, 0 .pool -_081239E4: +@081239E4: ldr r4, =0x03005d8c ldr r1, [r4] movs r0, 0x14 @@ -559741,17 +559741,17 @@ _081239E4: ldr r0, [r4] ldrh r6, [r0, 0x18] ldrh r3, [r0, 0x1A] - b _08123ABE + b @08123ABE .align 2, 0 .pool -_08123A28: +@08123A28: ldr r4, =0x0203a144 ldr r0, [r4] ldr r1, =0x02037318 ldrb r1, [r1, 0x14] strh r1, [r0] cmp r1, 0x57 - beq _08123A64 + beq @08123A64 ldr r0, =0x03005d8c ldr r0, [r0] adds r7, r0, 0 @@ -559766,10 +559766,10 @@ _08123A28: lsrs r1, 16 bl get_mapheader_by_bank_and_number adds r5, r0, 0 - b _08123A8A + b @08123A8A .align 2, 0 .pool -_08123A64: +@08123A64: ldr r0, =0x03005d8c ldr r0, [r0] adds r7, r0, 0 @@ -559788,24 +559788,24 @@ _08123A64: ldr r1, [r4] ldrb r0, [r5, 0x14] strh r0, [r1] -_08123A8A: +@08123A8A: ldr r4, =0x0203a144 ldr r0, [r4] ldrb r0, [r0] bl sub_8123F74 adds r1, r0, 0 cmp r1, 0 - beq _08123AAC + beq @08123AAC ldr r0, [r4] adds r0, 0x7F movs r1, 0x1 - b _08123AB0 + b @08123AB0 .align 2, 0 .pool -_08123AAC: +@08123AAC: ldr r0, [r4] adds r0, 0x7F -_08123AB0: +@08123AB0: strb r1, [r0] ldr r0, [r5] ldrh r2, [r0] @@ -559813,7 +559813,7 @@ _08123AB0: mov r9, r0 ldrh r6, [r7, 0x4] ldrh r3, [r7, 0x6] -_08123ABE: +@08123ABE: str r6, [sp] ldr r5, =0x085a147c ldr r4, =0x0203a144 @@ -559833,9 +559833,9 @@ _08123ABE: lsrs r1, r0, 16 ldr r3, [sp, 0x8] cmp r1, 0 - bne _08123AEA + bne @08123AEA movs r1, 0x1 -_08123AEA: +@08123AEA: adds r0, r6, 0 str r3, [sp, 0x8] bl __udivsi3 @@ -559843,12 +559843,12 @@ _08123AEA: lsrs r6, r0, 16 ldr r3, [sp, 0x8] cmp r6, r8 - bcc _08123B04 + bcc @08123B04 mov r0, r8 subs r0, 0x1 lsls r0, 16 lsrs r6, r0, 16 -_08123B04: +@08123B04: ldr r2, [sp, 0x4] ldrb r4, [r2, 0x3] mov r0, r9 @@ -559859,101 +559859,101 @@ _08123B04: lsrs r1, r0, 16 ldr r3, [sp, 0x8] cmp r1, 0 - bne _08123B1E + bne @08123B1E movs r1, 0x1 -_08123B1E: +@08123B1E: adds r0, r3, 0 bl __udivsi3 lsls r0, 16 lsrs r3, r0, 16 cmp r3, r4 - bcc _08123B32 + bcc @08123B32 subs r0, r4, 0x1 lsls r0, 16 lsrs r3, r0, 16 -_08123B32: +@08123B32: cmp r7, 0x29 - beq _08123B5E + beq @08123B5E cmp r7, 0x29 - bgt _08123B4C + bgt @08123B4C cmp r7, 0x1D - beq _08123B56 + beq @08123B56 cmp r7, 0x24 - beq _08123B94 - b _08123BC6 + beq @08123B94 + b @08123BC6 .align 2, 0 .pool -_08123B4C: +@08123B4C: cmp r7, 0x33 - beq _08123B5E + beq @08123B5E cmp r7, 0xCC - beq _08123BB8 - b _08123BC6 -_08123B56: + beq @08123BB8 + b @08123BC6 +@08123B56: cmp r3, 0 - beq _08123BC6 + beq @08123BC6 movs r6, 0 - b _08123BC6 -_08123B5E: + b @08123BC6 +@08123B5E: movs r6, 0 ldr r0, =0x03005d8c ldr r1, [r0] movs r2, 0 ldrsh r0, [r1, r2] cmp r0, 0x20 - ble _08123B6E + ble @08123B6E movs r6, 0x1 -_08123B6E: +@08123B6E: cmp r0, 0x33 - ble _08123B78 + ble @08123B78 adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 -_08123B78: +@08123B78: movs r3, 0 movs r2, 0x2 ldrsh r0, [r1, r2] cmp r0, 0x25 - ble _08123B84 + ble @08123B84 movs r3, 0x1 -_08123B84: +@08123B84: cmp r0, 0x38 - ble _08123BC6 + ble @08123BC6 adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 - b _08123BC6 + b @08123BC6 .align 2, 0 .pool -_08123B94: +@08123B94: movs r6, 0 ldr r0, [sp] cmp r0, 0xE - bls _08123B9E + bls @08123B9E movs r6, 0x1 -_08123B9E: +@08123B9E: ldr r2, [sp] cmp r2, 0x1C - bls _08123BAA + bls @08123BAA adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 -_08123BAA: +@08123BAA: ldr r0, [sp] cmp r0, 0x36 - bls _08123BC6 + bls @08123BC6 adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 - b _08123BC6 -_08123BB8: + b @08123BC6 +@08123BB8: mov r0, r10 adds r0, 0x54 mov r1, r10 adds r1, 0x56 bl sub_8123F30 - b _08123BEC -_08123BC6: + b @08123BEC +@08123BC6: ldr r0, =0x0203a144 ldr r2, [r0] ldrh r0, [r2] @@ -559973,7 +559973,7 @@ _08123BC6: adds r0, 0x2 adds r2, 0x56 strh r0, [r2] -_08123BEC: +@08123BEC: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -559987,7 +559987,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 @@ -560011,54 +560011,54 @@ sub_8123C00: @ 8123C00 lsrs r0, 24 mov r10, r5 cmp r0, 0x4 - bhi _08123C94 + bhi @08123C94 lsls r0, 2 - ldr r1, =_08123C40 + ldr r1, =@08123C40 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08123C40: - .4byte _08123C94 - .4byte _08123C54 - .4byte _08123C64 - .4byte _08123C74 - .4byte _08123C84 -_08123C54: +@08123C40: + .4byte @08123C94 + .4byte @08123C54 + .4byte @08123C64 + .4byte @08123C74 + .4byte @08123C84 +@08123C54: ldr r2, =0x0203a144 ldr r1, [r2] movs r0, 0x8 strh r0, [r1] - b _08123D10 + b @08123D10 .align 2, 0 .pool -_08123C64: +@08123C64: ldr r2, =0x0203a144 ldr r1, [r2] movs r0, 0xC strh r0, [r1] - b _08123D10 + b @08123D10 .align 2, 0 .pool -_08123C74: +@08123C74: ldr r2, =0x0203a144 ldr r1, [r2] movs r0, 0x27 strh r0, [r1] - b _08123D10 + b @08123D10 .align 2, 0 .pool -_08123C84: +@08123C84: ldr r2, =0x0203a144 ldr r1, [r2] movs r0, 0x2E strh r0, [r1] - b _08123D10 + b @08123D10 .align 2, 0 .pool -_08123C94: +@08123C94: mov r0, sp ldrb r0, [r0] ldrb r1, [r4] @@ -560080,9 +560080,9 @@ _08123C94: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - bne _08123CC6 + bne @08123CC6 movs r1, 0x1 -_08123CC6: +@08123CC6: mov r2, r10 movs r3, 0 ldrsh r0, [r2, r3] @@ -560091,12 +560091,12 @@ _08123CC6: lsrs r0, 16 mov r8, r0 cmp r8, r4 - bcc _08123CE2 + bcc @08123CE2 subs r0, r4, 0x1 lsls r0, 16 lsrs r0, 16 mov r8, r0 -_08123CE2: +@08123CE2: ldrb r4, [r5, 0x3] ldr r0, [r6, 0x4] adds r1, r4, 0 @@ -560104,9 +560104,9 @@ _08123CE2: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - bne _08123CF6 + bne @08123CF6 movs r1, 0x1 -_08123CF6: +@08123CF6: mov r2, sp movs r3, 0x4 ldrsh r0, [r2, r3] @@ -560115,11 +560115,11 @@ _08123CF6: lsrs r7, r0, 16 mov r2, r9 cmp r7, r4 - bcc _08123D10 + bcc @08123D10 subs r0, r4, 0x1 lsls r0, 16 lsrs r7, r0, 16 -_08123D10: +@08123D10: ldr r0, [r2] adds r0, 0x7F movs r1, 0 @@ -560156,162 +560156,162 @@ _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 adds r1, r0, 0 cmp r0, 0x9 - beq _08123E18 + beq @08123E18 cmp r0, 0x9 - bgt _08123D9A + bgt @08123D9A cmp r0, 0x4 - beq _08123DF0 + beq @08123DF0 cmp r0, 0x4 - bgt _08123D88 + bgt @08123D88 cmp r0, 0x1 - beq _08123DD8 + beq @08123DD8 cmp r0, 0x1 - bgt _08123D7E + bgt @08123D7E cmp r0, 0 - beq _08123DD0 - b _08123E94 -_08123D7E: + beq @08123DD0 + b @08123E94 +@08123D7E: cmp r0, 0x2 - beq _08123DDE + beq @08123DDE cmp r0, 0x3 - beq _08123DE8 - b _08123E94 -_08123D88: + beq @08123DE8 + b @08123E94 +@08123D88: cmp r0, 0x6 - beq _08123E00 + beq @08123E00 cmp r0, 0x6 - blt _08123DF8 + blt @08123DF8 cmp r0, 0x7 - beq _08123E08 + beq @08123E08 cmp r0, 0x8 - beq _08123E10 - b _08123E94 -_08123D9A: + beq @08123E10 + b @08123E94 +@08123D9A: cmp r0, 0xE - beq _08123E40 + beq @08123E40 cmp r0, 0xE - bgt _08123DB4 + bgt @08123DB4 cmp r0, 0xB - beq _08123E28 + beq @08123E28 cmp r0, 0xB - blt _08123E20 + blt @08123E20 cmp r0, 0xC - beq _08123E30 + beq @08123E30 cmp r0, 0xD - beq _08123E38 - b _08123E94 -_08123DB4: + beq @08123E38 + b @08123E94 +@08123DB4: cmp r0, 0x3A - beq _08123E60 + beq @08123E60 cmp r0, 0x3A - bgt _08123DC2 + bgt @08123DC2 cmp r0, 0xF - beq _08123E48 - b _08123E94 -_08123DC2: + beq @08123E48 + b @08123E94 +@08123DC2: cmp r1, 0x49 - beq _08123E7C + beq @08123E7C cmp r1, 0xD5 - beq _08123DCC - b _08123E94 -_08123DCC: + beq @08123DCC + b @08123E94 +@08123DCC: movs r0, 0 - b _08123E96 -_08123DD0: + b @08123E96 +@08123DD0: ldr r0, =0x0000086f - b _08123E4A + b @08123E4A .align 2, 0 .pool -_08123DD8: +@08123DD8: movs r0, 0x87 lsls r0, 4 - b _08123E4A -_08123DDE: + b @08123E4A +@08123DDE: ldr r0, =0x00000871 - b _08123E4A + b @08123E4A .align 2, 0 .pool -_08123DE8: +@08123DE8: ldr r0, =0x00000872 - b _08123E4A + b @08123E4A .align 2, 0 .pool -_08123DF0: +@08123DF0: ldr r0, =0x00000873 - b _08123E4A + b @08123E4A .align 2, 0 .pool -_08123DF8: +@08123DF8: ldr r0, =0x00000874 - b _08123E4A + b @08123E4A .align 2, 0 .pool -_08123E00: +@08123E00: ldr r0, =0x00000875 - b _08123E4A + b @08123E4A .align 2, 0 .pool -_08123E08: +@08123E08: ldr r0, =0x00000876 - b _08123E4A + b @08123E4A .align 2, 0 .pool -_08123E10: +@08123E10: ldr r0, =0x00000877 - b _08123E4A + b @08123E4A .align 2, 0 .pool -_08123E18: +@08123E18: ldr r0, =0x00000878 - b _08123E4A + b @08123E4A .align 2, 0 .pool -_08123E20: +@08123E20: ldr r0, =0x00000879 - b _08123E4A + b @08123E4A .align 2, 0 .pool -_08123E28: +@08123E28: ldr r0, =0x0000087a - b _08123E4A + b @08123E4A .align 2, 0 .pool -_08123E30: +@08123E30: ldr r0, =0x0000087b - b _08123E4A + b @08123E4A .align 2, 0 .pool -_08123E38: +@08123E38: ldr r0, =0x0000087c - b _08123E4A + b @08123E4A .align 2, 0 .pool -_08123E40: +@08123E40: ldr r0, =0x0000087d - b _08123E4A + b @08123E4A .align 2, 0 .pool -_08123E48: +@08123E48: ldr r0, =0x0000087e -_08123E4A: +@08123E4A: bl flag_check lsls r0, 24 movs r1, 0x3 cmp r0, 0 - beq _08123E58 + beq @08123E58 movs r1, 0x2 -_08123E58: +@08123E58: adds r0, r1, 0 - b _08123E96 + b @08123E96 .align 2, 0 .pool -_08123E60: +@08123E60: ldr r0, =0x000008a8 bl flag_check adds r1, r0, 0 @@ -560322,10 +560322,10 @@ _08123E60: asrs r0, 31 movs r1, 0x4 ands r0, r1 - b _08123E96 + b @08123E96 .align 2, 0 .pool -_08123E7C: +@08123E7C: ldr r0, =0x000008a9 bl flag_check adds r1, r0, 0 @@ -560334,18 +560334,18 @@ _08123E7C: negs r0, r1 orrs r0, r1 lsrs r0, 31 - b _08123E96 + b @08123E96 .align 2, 0 .pool -_08123E94: +@08123E94: movs r0, 0x1 -_08123E96: +@08123E96: pop {r1} bx r1 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 @@ -560359,55 +560359,55 @@ 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 movs r2, 0 ldr r1, =0x085a1b84 -_08123EBE: +@08123EBE: ldrh r0, [r1] cmp r0, r3 - bne _08123ED4 + bne @08123ED4 bl sub_8123F04 lsls r0, 16 lsrs r0, 16 - b _08123F00 + b @08123F00 .align 2, 0 .pool -_08123ED4: +@08123ED4: adds r1, 0x2 adds r2, 0x1 cmp r2, 0x2 - bls _08123EBE + bls @08123EBE ldr r1, =0x085a1b24 ldrh r0, [r1] cmp r0, 0xD5 - beq _08123EFE + beq @08123EFE adds r2, r1, 0 -_08123EE6: +@08123EE6: ldrh r0, [r2] cmp r0, r3 - bne _08123EF4 + bne @08123EF4 ldrh r0, [r1, 0x2] - b _08123F00 + b @08123F00 .align 2, 0 .pool -_08123EF4: +@08123EF4: adds r1, 0x4 adds r2, 0x4 ldrh r0, [r1] cmp r0, 0xD5 - bne _08123EE6 -_08123EFE: + bne @08123EE6 +@08123EFE: adds r0, r3, 0 -_08123F00: +@08123F00: pop {r1} bx r1 thumb_func_end sub_8123EB4 thumb_func_start sub_8123F04 -sub_8123F04: @ 8123F04 +sub_8123F04: ; 8123F04 push {lr} ldr r0, =0x00004037 bl var_get @@ -560415,9 +560415,9 @@ sub_8123F04: @ 8123F04 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0xF - bls _08123F18 + bls @08123F18 movs r1, 0 -_08123F18: +@08123F18: ldr r0, =0x085a1b8a lsls r1, 16 asrs r1, 15 @@ -560430,7 +560430,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 @@ -560442,9 +560442,9 @@ sub_8123F30: @ 8123F30 adds r0, r2 lsrs r0, 16 cmp r0, 0x7 - bls _08123F4C + bls @08123F4C movs r1, 0x9 -_08123F4C: +@08123F4C: subs r1, 0x9 lsls r1, 16 ldr r0, =0x085a1bac @@ -560464,33 +560464,33 @@ _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 movs r1, 0 ldr r3, =0x085a1bcc -_08123F7E: +@08123F7E: adds r0, r1, r3 ldrb r0, [r0] cmp r0, r2 - bne _08123F90 + bne @08123F90 movs r0, 0x1 - b _08123F98 + b @08123F98 .align 2, 0 .pool -_08123F90: +@08123F90: adds r1, 0x1 cmp r1, 0 - beq _08123F7E + beq @08123F7E movs r0, 0 -_08123F98: +@08123F98: pop {r1} bx r1 thumb_func_end sub_8123F74 thumb_func_start sub_8123F9C -sub_8123F9C: @ 8123F9C +sub_8123F9C: ; 8123F9C push {lr} lsls r0, 16 lsrs r0, 16 @@ -560502,37 +560502,37 @@ 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] ldrh r0, [r1] cmp r0, 0xD5 - bne _08123FC8 + bne @08123FC8 movs r0, 0 strb r0, [r1, 0x3] - b _0812402E + b @0812402E .align 2, 0 .pool -_08123FC8: +@08123FC8: adds r0, r1, 0 adds r0, 0x78 ldrb r0, [r0] cmp r0, 0 - bne _08123FD8 + bne @08123FD8 adds r0, r1, 0 adds r0, 0x54 - b _08123FDC -_08123FD8: + b @08123FDC +@08123FD8: adds r0, r1, 0 adds r0, 0x64 -_08123FDC: +@08123FDC: ldrh r4, [r0] adds r0, 0x2 ldrh r5, [r0] movs r6, 0 - b _08124008 -_08123FE6: + b @08124008 +@08123FE6: subs r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -560545,30 +560545,30 @@ _08123FE6: lsrs r0, 16 ldrh r1, [r1] cmp r0, r1 - bne _08124008 + bne @08124008 adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 -_08124008: +@08124008: cmp r4, 0x1 - bhi _08123FE6 + bhi @08123FE6 adds r0, r5, 0 bl sub_8124038 lsls r0, 24 cmp r0, 0 - beq _08124028 + beq @08124028 subs r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 movs r4, 0x1D - b _08124008 + b @08124008 .align 2, 0 .pool -_08124028: +@08124028: ldr r0, =0x0203a144 ldr r0, [r0] strb r6, [r0, 0x3] -_0812402E: +@0812402E: pop {r4-r6} pop {r0} bx r0 @@ -560577,7 +560577,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 @@ -560585,16 +560585,16 @@ sub_8124038: @ 8124038 lsrs r5, r0, 16 ldr r0, =0x0000ffff cmp r5, r0 - bne _08124058 - b _0812407A + bne @08124058 + b @0812407A .align 2, 0 .pool -_08124054: +@08124054: movs r0, 0x1 - b _0812407C -_08124058: + b @0812407C +@08124058: movs r4, 0x1 -_0812405A: +@0812405A: adds r0, r4, 0 adds r1, r5, 0 bl sub_812386C @@ -560604,15 +560604,15 @@ _0812405A: lsrs r0, 16 ldrh r1, [r1] cmp r0, r1 - beq _08124054 + beq @08124054 adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x1C - bls _0812405A -_0812407A: + bls @0812405A +@0812407A: movs r0, 0 -_0812407C: +@0812407C: pop {r4,r5} pop {r1} bx r1 @@ -560621,7 +560621,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 @@ -560631,7 +560631,7 @@ sub_8124088: @ 8124088 movs r0, 0 ldrsb r0, [r3, r0] cmp r0, 0 - beq _081240C6 + beq @081240C6 adds r0, r1, 0 adds r0, 0x7B ldrb r0, [r0] @@ -560653,7 +560653,7 @@ sub_8124088: @ 8124088 ldrb r0, [r3] subs r0, 0x1 strb r0, [r3] -_081240C6: +@081240C6: pop {r4} pop {r0} bx r0 @@ -560662,12 +560662,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 @@ -560712,7 +560712,7 @@ sub_81240D4: @ 81240D4 ldrb r0, [r0] adds r7, r1, 0 cmp r0, 0 - bne _08124158 + bne @08124158 movs r1, 0xC2 lsls r1, 1 adds r0, r3, r1 @@ -560723,10 +560723,10 @@ sub_81240D4: @ 81240D4 orrs r0, r1 str r0, [r2, 0x4] ldr r0, =sub_8124088 + 1 - b _0812416E + b @0812416E .align 2, 0 .pool -_08124158: +@08124158: movs r3, 0xA1 lsls r3, 2 adds r0, r4, r3 @@ -560738,7 +560738,7 @@ _08124158: orrs r0, r1 str r0, [r2, 0x4] ldr r0, =nullsub_48 + 1 -_0812416E: +@0812416E: str r0, [sp, 0x14] adds r0, r2, 0 bl gpu_tile_obj_alloc_tag_and_copy_to_vram @@ -560752,7 +560752,7 @@ _0812416E: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq _08124228 + beq @08124228 ldr r4, =0x0203a144 ldr r2, [r4] lsls r0, r1, 4 @@ -560764,7 +560764,7 @@ _0812416E: adds r2, 0x78 ldrb r0, [r2] cmp r0, 0x1 - bne _081241DC + bne @081241DC ldrb r1, [r3, 0x3] movs r0, 0x3F ands r0, r1 @@ -560783,10 +560783,10 @@ _0812416E: ldr r0, [r2, 0x1C] movs r1, 0x1 bl obj_anim_image_start - b _08124204 + b @08124204 .align 2, 0 .pool -_081241DC: +@081241DC: ldrb r1, [r3, 0x3] movs r0, 0x3F ands r0, r1 @@ -560807,7 +560807,7 @@ _081241DC: lsls r0, 3 adds r0, 0x4 strh r0, [r2, 0x22] -_08124204: +@08124204: ldr r4, =0x0203a144 ldr r0, [r4] ldr r1, [r0, 0x1C] @@ -560825,7 +560825,7 @@ _08124204: ldr r1, [r1, 0x1C] movs r0, 0x1 strh r0, [r1, 0x34] -_08124228: +@08124228: add sp, 0x28 pop {r4-r7} pop {r0} @@ -560835,13 +560835,13 @@ _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] ldr r0, [r0, 0x1C] cmp r0, 0 - beq _0812425C + beq @0812425C bl obj_delete_and_free_tiles ldr r0, [r4] adds r0, 0x58 @@ -560851,7 +560851,7 @@ sub_8124238: @ 8124238 adds r0, 0x5A ldrh r0, [r0] bl gpu_pal_free_tag -_0812425C: +@0812425C: pop {r4} pop {r0} bx r0 @@ -560860,7 +560860,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] @@ -560872,7 +560872,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] @@ -560884,7 +560884,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 @@ -560922,24 +560922,24 @@ sub_8124288: @ 8124288 ldrb r0, [r0, 0x14] bl sub_8124668 cmp r0, 0 - beq _08124304 + beq @08124304 ldr r0, =0x0203a144 ldr r0, [r0] str r5, [r0, 0x20] - b _081243A4 + b @081243A4 .align 2, 0 .pool -_08124304: +@08124304: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0x1 - bne _08124316 + bne @08124316 ldr r0, =0x085a08ec str r0, [sp, 0x18] ldr r0, =0x085a08cc str r0, [sp, 0x20] -_08124316: +@08124316: adds r0, r6, 0 bl gpu_tile_obj_alloc_tag_and_copy_to_vram adds r0, r4, 0 @@ -560963,7 +560963,7 @@ _08124316: adds r0, 0x78 ldrb r0, [r0] cmp r0, 0 - bne _08124384 + bne @08124384 adds r0, r2, 0 adds r0, 0x74 ldrh r0, [r0] @@ -560979,10 +560979,10 @@ _08124316: strh r0, [r1, 0x22] ldr r1, [r2, 0x20] ldr r0, =sub_81244EC + 1 - b _081243A2 + b @081243A2 .align 2, 0 .pool -_08124384: +@08124384: adds r0, r2, 0 adds r0, 0x74 ldrh r0, [r0] @@ -560998,9 +560998,9 @@ _08124384: strh r0, [r1, 0x22] ldr r1, [r2, 0x20] ldr r0, =sub_812445C + 1 -_081243A2: +@081243A2: str r0, [r1, 0x1C] -_081243A4: +@081243A4: add sp, 0x28 pop {r4-r6} pop {r0} @@ -561010,13 +561010,13 @@ _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] ldr r2, [r0, 0x20] cmp r2, 0 - beq _081243CE + beq @081243CE adds r2, 0x3E ldrb r0, [r2] movs r1, 0x4 @@ -561026,7 +561026,7 @@ sub_81243B0: @ 81243B0 ldr r1, [r0, 0x20] ldr r0, =nullsub_12 + 1 str r0, [r1, 0x1C] -_081243CE: +@081243CE: pop {r0} bx r0 .align 2, 0 @@ -561034,18 +561034,18 @@ _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] ldr r1, [r3, 0x20] cmp r1, 0 - beq _08124452 + beq @08124452 adds r0, r3, 0 adds r0, 0x78 ldrb r0, [r0] cmp r0, 0x1 - bne _0812441C + bne @0812441C adds r0, r3, 0 adds r0, 0x74 ldrh r0, [r0] @@ -561061,10 +561061,10 @@ sub_81243DC: @ 81243DC strh r0, [r1, 0x22] ldr r1, [r3, 0x20] ldr r0, =sub_812445C + 1 - b _08124444 + b @08124444 .align 2, 0 .pool -_0812441C: +@0812441C: adds r0, r3, 0 adds r0, 0x74 ldrh r0, [r0] @@ -561085,7 +561085,7 @@ _0812441C: strh r2, [r0, 0x26] ldr r1, [r3, 0x20] ldr r0, =sub_81244EC + 1 -_08124444: +@08124444: str r0, [r1, 0x1C] adds r1, 0x3E ldrb r2, [r1] @@ -561093,7 +561093,7 @@ _08124444: negs r0, r0 ands r0, r2 strb r0, [r1] -_08124452: +@08124452: pop {r0} bx r0 .align 2, 0 @@ -561101,7 +561101,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 @@ -561141,46 +561141,46 @@ sub_812445C: @ 812445C lsls r0, 16 lsrs r0, 16 cmp r0, 0xB0 - bhi _081244BC + bhi @081244BC lsls r0, r2, 16 asrs r2, r0, 16 movs r0, 0x8 negs r0, r0 cmp r2, r0 - blt _081244BC + blt @081244BC cmp r2, 0xF8 - ble _081244C4 -_081244BC: + ble @081244C4 +@081244BC: movs r0, 0 - b _081244C6 + b @081244C6 .align 2, 0 .pool -_081244C4: +@081244C4: movs r0, 0x1 -_081244C6: +@081244C6: strh r0, [r3, 0x32] movs r1, 0x32 ldrsh r0, [r3, r1] cmp r0, 0x1 - bne _081244D8 + bne @081244D8 adds r0, r3, 0 bl sub_81244F8 - b _081244E4 -_081244D8: + b @081244E4 +@081244D8: adds r0, r3, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_081244E4: +@081244E4: pop {r4} pop {r0} bx r0 thumb_func_end sub_812445C thumb_func_start sub_81244EC -sub_81244EC: @ 81244EC +sub_81244EC: ; 81244EC push {lr} bl sub_81244F8 pop {r0} @@ -561188,7 +561188,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 @@ -561196,14 +561196,14 @@ sub_81244F8: @ 81244F8 adds r0, 0x7E ldrb r0, [r0] cmp r0, 0 - beq _0812453C + beq @0812453C ldrh r0, [r2, 0x3C] adds r0, 0x1 strh r0, [r2, 0x3C] lsls r0, 16 asrs r0, 16 cmp r0, 0x10 - ble _08124548 + ble @08124548 movs r0, 0 strh r0, [r2, 0x3C] adds r3, r2, 0 @@ -561219,23 +561219,23 @@ sub_81244F8: @ 81244F8 ands r0, r2 orrs r0, r1 strb r0, [r3] - b _08124548 + b @08124548 .align 2, 0 .pool -_0812453C: +@0812453C: adds r2, 0x3E ldrb r1, [r2] movs r0, 0x5 negs r0, r0 ands r0, r1 strb r0, [r2] -_08124548: +@08124548: pop {r0} bx r0 thumb_func_end sub_81244F8 thumb_func_start sub_812454C -sub_812454C: @ 812454C +sub_812454C: ; 812454C push {lr} ldr r0, =0x0203a144 ldr r1, [r0] @@ -561243,11 +561243,11 @@ sub_812454C: @ 812454C adds r0, 0x7F ldrb r0, [r0] cmp r0, 0 - beq _08124562 + beq @08124562 adds r1, 0x7E movs r0, 0x1 strb r0, [r1] -_08124562: +@08124562: pop {r0} bx r0 .align 2, 0 @@ -561255,7 +561255,7 @@ _08124562: thumb_func_end sub_812454C thumb_func_start GetMapName -GetMapName: @ 812456C +GetMapName: ; 812456C push {r4,r5,lr} adds r5, r0, 0 lsls r1, 16 @@ -561263,13 +561263,13 @@ GetMapName: @ 812456C lsls r2, 16 lsrs r4, r2, 16 cmp r1, 0x56 - bne _08124584 + bne @08124584 bl sub_80E97EC adds r1, r0, 0 - b _081245B2 -_08124584: + b @081245B2 +@08124584: cmp r1, 0xD4 - bhi _081245A0 + bhi @081245A0 ldr r0, =0x085a147c lsls r1, 3 adds r0, 0x4 @@ -561278,88 +561278,88 @@ _08124584: adds r0, r5, 0 bl gf_strcpy adds r1, r0, 0 - b _081245B2 + b @081245B2 .align 2, 0 .pool -_081245A0: +@081245A0: cmp r4, 0 - bne _081245A6 + bne @081245A6 movs r4, 0x12 -_081245A6: +@081245A6: adds r0, r5, 0 movs r1, 0 adds r2, r4, 0 bl RepeatChar - b _081245D6 -_081245B2: + b @081245D6 +@081245B2: cmp r4, 0 - beq _081245D4 + beq @081245D4 subs r0, r1, r5 lsls r0, 16 lsrs r0, 16 cmp r0, r4 - bcs _081245D0 + bcs @081245D0 movs r2, 0 -_081245C2: +@081245C2: strb r2, [r1] adds r1, 0x1 adds r0, 0x1 lsls r0, 16 lsrs r0, 16 cmp r0, r4 - bcc _081245C2 -_081245D0: + bcc @081245C2 +@081245D0: movs r0, 0xFF strb r0, [r1] -_081245D4: +@081245D4: adds r0, r1, 0 -_081245D6: +@081245D6: pop {r4,r5} pop {r1} bx r1 thumb_func_end GetMapName thumb_func_start sub_81245DC -sub_81245DC: @ 81245DC +sub_81245DC: ; 81245DC push {lr} lsls r1, 16 lsrs r1, 16 cmp r1, 0x56 - beq _081245F8 + beq @081245F8 cmp r1, 0x57 - bne _08124604 + bne @08124604 ldr r1, =0x085ec9d2 bl gf_strcpy - b _0812460A + b @0812460A .align 2, 0 .pool -_081245F8: +@081245F8: ldr r1, =0x085ec9d8 bl gf_strcpy - b _0812460A + b @0812460A .align 2, 0 .pool -_08124604: +@08124604: movs r2, 0 bl GetMapName -_0812460A: +@0812460A: pop {r1} bx r1 thumb_func_end sub_81245DC thumb_func_start sub_8124610 -sub_8124610: @ 8124610 +sub_8124610: ; 8124610 push {lr} lsls r1, 16 lsrs r1, 16 cmp r1, 0x42 - beq _08124620 + beq @08124620 bl sub_81245DC - b _08124626 -_08124620: + b @08124626 +@08124620: ldr r1, =0x085ec9e4 bl gf_strcpy -_08124626: +@08124626: pop {r1} bx r1 .align 2, 0 @@ -561367,7 +561367,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 @@ -561390,7 +561390,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 @@ -561401,33 +561401,33 @@ 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 movs r1, 0 ldr r3, =0x085a1c34 -_08124672: +@08124672: adds r0, r1, r3 ldrb r0, [r0] cmp r2, r0 - bne _08124684 + bne @08124684 movs r0, 0x1 - b _0812468C + b @0812468C .align 2, 0 .pool -_08124684: +@08124684: adds r1, 0x1 cmp r1, 0x2 - bls _08124672 + bls @08124672 movs r0, 0 -_0812468C: +@0812468C: pop {r1} bx r1 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 @@ -561436,30 +561436,30 @@ sub_8124690: @ 8124690 adds r0, r1 ldrb r0, [r0] cmp r0, 0xA - bls _081246A4 - b _081248AA -_081246A4: + bls @081246A4 + b @081248AA +@081246A4: lsls r0, 2 - ldr r1, =_081246B8 + ldr r1, =@081246B8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081246B8: - .4byte _081246E4 - .4byte _08124766 - .4byte _0812477C - .4byte _0812478C - .4byte _0812479C - .4byte _081247E4 - .4byte _081247F8 - .4byte _0812480C - .4byte _0812484C - .4byte _08124852 - .4byte _0812486C -_081246E4: +@081246B8: + .4byte @081246E4 + .4byte @08124766 + .4byte @0812477C + .4byte @0812478C + .4byte @0812479C + .4byte @081247E4 + .4byte @081247F8 + .4byte @0812480C + .4byte @0812484C + .4byte @08124852 + .4byte @0812486C +@081246E4: movs r0, 0 bl SetVBlankCallback movs r0, 0 @@ -561494,43 +561494,43 @@ _081246E4: bl malloc str r0, [r4] cmp r0, 0 - bne _08124754 + bne @08124754 ldr r0, =sub_8086194 + 1 bl set_callback2 - b _081248AA + b @081248AA .align 2, 0 .pool -_08124754: +@08124754: bl sub_80A1A74 bl reset_all_obj_data bl gpu_tile_obj_tags_reset bl gpu_pal_allocator_reset - b _0812489C -_08124766: + b @0812489C +@08124766: movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags ldr r1, =0x085a1ee4 movs r0, 0x1 movs r2, 0x3 bl bg_vram_setup - b _0812489C + b @0812489C .align 2, 0 .pool -_0812477C: +@0812477C: ldr r0, =0x085a1ef0 bl Window_InitFromTemplates bl TextBox_ResetSomeField - b _0812489C + b @0812489C .align 2, 0 .pool -_0812478C: +@0812478C: movs r0, 0 movs r1, 0x65 movs r2, 0xD0 bl sub_809882C bl clear_scheduled_bg_copies_to_vram - b _0812489C -_0812479C: + b @0812489C +@0812479C: ldr r4, =0x0203a148 ldr r0, [r4] adds r0, 0x8 @@ -561554,24 +561554,24 @@ _0812479C: movs r0, 0x1 str r0, [r1] bl sub_8124904 - b _0812489C + b @0812489C .align 2, 0 .pool -_081247E4: +@081247E4: ldr r0, =0x085a1c58 ldr r1, =0x0600c000 bl LZ77UnCompVram - b _0812489C + b @0812489C .align 2, 0 .pool -_081247F8: +@081247F8: ldr r0, =0x085a1c90 ldr r1, =0x0600f000 bl LZ77UnCompVram - b _0812489C + b @0812489C .align 2, 0 .pool -_0812480C: +@0812480C: ldr r0, =0x085a1c38 movs r1, 0x10 movs r2, 0x20 @@ -561593,13 +561593,13 @@ _0812480C: bl Print movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - b _0812489C + b @0812489C .align 2, 0 .pool -_0812484C: +@0812484C: bl sub_8124A70 - b _0812489C -_08124852: + b @0812489C +@08124852: movs r0, 0x1 negs r0, r0 movs r1, 0x10 @@ -561607,10 +561607,10 @@ _08124852: bl sub_80A2A20 ldr r0, =sub_81248C0 + 1 bl SetVBlankCallback - b _0812489C + b @0812489C .align 2, 0 .pool -_0812486C: +@0812486C: movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -561628,7 +561628,7 @@ _0812486C: bl sub_81248F4 ldr r0, =sub_81248D4 + 1 bl set_callback2 -_0812489C: +@0812489C: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -561636,7 +561636,7 @@ _0812489C: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_081248AA: +@081248AA: add sp, 0xC pop {r4} pop {r0} @@ -561646,7 +561646,7 @@ _081248AA: thumb_func_end sub_8124690 thumb_func_start sub_81248C0 -sub_81248C0: @ 81248C0 +sub_81248C0: ; 81248C0 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -561656,7 +561656,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] @@ -561672,7 +561672,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] @@ -561684,7 +561684,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 @@ -561694,16 +561694,16 @@ sub_8124904: @ 8124904 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bls _0812491A - b _08124A2C -_0812491A: + bls @0812491A + b @08124A2C +@0812491A: movs r7, 0 movs r3, 0 ldr r0, =0x085a1edc mov r12, r0 adds r5, r2, 0 movs r6, 0 -_08124926: +@08124926: ldr r0, [r5] lsls r1, r3, 3 mov r2, r12 @@ -561711,12 +561711,12 @@ _08124926: ldrh r0, [r0, 0x8] ldrh r1, [r4, 0x4] cmp r0, r1 - bne _081249C4 + bne @081249C4 ldrh r0, [r4, 0x6] bl flag_check lsls r0, 24 cmp r0, 0 - beq _081249CE + beq @081249CE ldr r0, [r5] ldrb r0, [r0, 0xB] ldr r1, [r4] @@ -561767,22 +561767,22 @@ _08124926: bl schedule_bg_copy_tilemap_to_vram ldr r0, =0x03001180 str r7, [r0] - b _081249CE + b @081249CE .align 2, 0 .pool -_081249C4: +@081249C4: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0 - beq _08124926 -_081249CE: + beq @08124926 +@081249CE: cmp r7, 0 - bne _08124A62 + bne @08124A62 ldr r0, =0x03001180 ldr r0, [r0] cmp r0, 0x1 - bne _081249F4 + bne @081249F4 movs r0, 0x1 movs r1, 0 bl sub_8198070 @@ -561791,14 +561791,14 @@ _081249CE: movs r2, 0x65 movs r3, 0xD bl SetWindowBorderStyle - b _081249FC + b @081249FC .align 2, 0 .pool -_081249F4: +@081249F4: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels -_081249FC: +@081249FC: ldr r0, =0x0203a148 ldr r2, [r0] adds r2, 0xC @@ -561815,14 +561815,14 @@ _081249FC: bl schedule_bg_copy_tilemap_to_vram ldr r0, =0x03001180 str r4, [r0] - b _08124A62 + b @08124A62 .align 2, 0 .pool -_08124A2C: +@08124A2C: ldr r4, =0x03001180 ldr r0, [r4] cmp r0, 0x1 - bne _08124A48 + bne @08124A48 movs r0, 0x1 movs r1, 0 bl sub_8198070 @@ -561831,7 +561831,7 @@ _08124A2C: movs r2, 0x65 movs r3, 0xD bl SetWindowBorderStyle -_08124A48: +@08124A48: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels @@ -561842,7 +561842,7 @@ _08124A48: bl schedule_bg_copy_tilemap_to_vram movs r0, 0 str r0, [r4] -_08124A62: +@08124A62: add sp, 0xC pop {r4-r7} pop {r0} @@ -561852,7 +561852,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, =0x085a1d68 @@ -561891,7 +561891,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 @@ -561913,7 +561913,7 @@ sub_8124AD4: @ 8124AD4 str r0, [sp, 0x10] add r1, sp, 0x4 mov r10, r1 -_08124AFE: +@08124AFE: ldr r2, [sp, 0x18] str r2, [sp] mov r0, r9 @@ -561937,19 +561937,19 @@ _08124AFE: ldr r2, [sp, 0x10] ldrh r0, [r2] cmp r0, 0x2 - bne _08124B38 + bne @08124B38 movs r7, 0x1 - b _08124B44 + b @08124B44 .align 2, 0 .pool -_08124B38: +@08124B38: ldr r3, [sp, 0x18] ldrh r0, [r3] movs r7, 0 cmp r0, 0x2 - bne _08124B44 + bne @08124B44 movs r7, 0x2 -_08124B44: +@08124B44: mov r0, r10 movs r2, 0 ldrsh r1, [r0, r2] @@ -561962,7 +561962,7 @@ _08124B44: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 - beq _08124BB8 + beq @08124BB8 ldr r1, =0x02020630 mov r8, r1 lsls r4, r5, 4 @@ -561979,20 +561979,20 @@ _08124B44: bl flag_check lsls r0, 24 cmp r0, 0 - beq _08124B9C + beq @08124B9C mov r0, r8 adds r0, 0x1C adds r0, r6, r0 ldr r1, =sub_8124CBC + 1 str r1, [r0] - b _08124BA2 + b @08124BA2 .align 2, 0 .pool -_08124B9C: +@08124B9C: adds r0, r7, 0x3 lsls r0, 16 lsrs r7, r0, 16 -_08124BA2: +@08124BA2: adds r4, r5 lsls r4, 2 ldr r0, =0x02020630 @@ -562003,7 +562003,7 @@ _08124BA2: bl obj_anim_image_start mov r2, r9 strh r2, [r4, 0x2E] -_08124BB8: +@08124BB8: ldr r0, [sp, 0xC] adds r0, 0x1 lsls r0, 16 @@ -562015,7 +562015,7 @@ _08124BB8: lsrs r0, 16 mov r9, r0 cmp r0, 0xF - bls _08124AFE + bls @08124AFE add sp, 0x1C pop {r3-r5} mov r8, r3 @@ -562029,7 +562029,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 @@ -562041,7 +562041,7 @@ sub_8124BE4: @ 8124BE4 ldr r6, =0x085a1f18 ldrh r0, [r6, 0x2] cmp r0, 0xD5 - beq _08124C9C + beq @08124C9C mov r5, sp adds r5, 0x6 add r7, sp, 0x4 @@ -562050,7 +562050,7 @@ sub_8124BE4: @ 8124BE4 movs r0, 0x1C add r0, r9 mov r10, r0 -_08124C0C: +@08124C0C: mov r1, r8 lsls r4, r1, 2 adds r0, r4, r6 @@ -562058,7 +562058,7 @@ _08124C0C: bl flag_check lsls r0, 24 cmp r0, 0 - beq _08124C84 + beq @08124C84 adds r0, r6, 0x2 adds r0, r4, r0 ldrh r6, [r0] @@ -562088,7 +562088,7 @@ _08124C0C: lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _08124C84 + beq @08124C84 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -562107,7 +562107,7 @@ _08124C0C: movs r1, 0x6 bl obj_anim_image_start strh r6, [r4, 0x2E] -_08124C84: +@08124C84: mov r0, r8 adds r0, 0x1 lsls r0, 16 @@ -562119,8 +562119,8 @@ _08124C84: adds r0, r1 ldrh r0, [r0] cmp r0, 0xD5 - bne _08124C0C -_08124C9C: + bne @08124C0C +@08124C9C: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -562134,7 +562134,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 @@ -562143,14 +562143,14 @@ sub_8124CBC: @ 8124CBC movs r3, 0x2E ldrsh r0, [r2, r3] cmp r1, r0 - bne _08124D00 + bne @08124D00 ldrh r0, [r2, 0x30] adds r0, 0x1 strh r0, [r2, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x10 - ble _08124D0E + ble @08124D0E movs r0, 0 strh r0, [r2, 0x30] adds r3, r2, 0 @@ -562166,10 +562166,10 @@ sub_8124CBC: @ 8124CBC ands r0, r2 orrs r0, r1 strb r0, [r3] - b _08124D0E + b @08124D0E .align 2, 0 .pool -_08124D00: +@08124D00: movs r0, 0x10 strh r0, [r2, 0x30] adds r2, 0x3E @@ -562177,26 +562177,26 @@ _08124D00: subs r0, 0x15 ands r0, r1 strb r0, [r2] -_08124D0E: +@08124D0E: pop {r0} bx r0 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 ldr r0, [r4] ldrh r1, [r0, 0x4] cmp r1, 0 - beq _08124D2C + beq @08124D2C cmp r1, 0x1 - beq _08124D46 - b _08124D56 + beq @08124D46 + b @08124D56 .align 2, 0 .pool -_08124D2C: +@08124D2C: movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -562208,15 +562208,15 @@ _08124D2C: ldrh r0, [r1, 0x4] adds r0, 0x1 strh r0, [r1, 0x4] - b _08124D56 -_08124D46: + b @08124D56 +@08124D46: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne _08124D56 + bne @08124D56 ldr r0, =sub_8124D64 + 1 bl sub_81248F4 -_08124D56: +@08124D56: add sp, 0x4 pop {r4} pop {r0} @@ -562226,45 +562226,45 @@ _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] ldrh r0, [r0, 0x4] cmp r0, 0 - bne _08124DF8 + bne @08124DF8 bl sub_81230AC lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 - bhi _08124DF8 + bhi @08124DF8 lsls r0, 2 - ldr r1, =_08124D90 + ldr r1, =@08124D90 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08124D90: - .4byte _08124DF8 - .4byte _08124DF8 - .4byte _08124DF8 - .4byte _08124DA8 - .4byte _08124DAE - .4byte _08124DE0 -_08124DA8: +@08124D90: + .4byte @08124DF8 + .4byte @08124DF8 + .4byte @08124DF8 + .4byte @08124DA8 + .4byte @08124DAE + .4byte @08124DE0 +@08124DA8: bl sub_8124904 - b _08124DF8 -_08124DAE: + b @08124DF8 +@08124DAE: ldr r4, =0x0203a148 ldr r0, [r4] ldrb r0, [r0, 0xA] cmp r0, 0x2 - beq _08124DBC + beq @08124DBC cmp r0, 0x4 - bne _08124DF8 -_08124DBC: + bne @08124DF8 +@08124DBC: movs r0, 0x5 bl m4aSongNumStart ldr r0, [r4] @@ -562274,10 +562274,10 @@ _08124DBC: strb r1, [r0] ldr r0, =sub_8124E0C + 1 bl sub_81248F4 - b _08124DF8 + b @08124DF8 .align 2, 0 .pool -_08124DE0: +@08124DE0: movs r0, 0x5 bl m4aSongNumStart ldr r0, =0x0203a148 @@ -562288,7 +562288,7 @@ _08124DE0: strb r1, [r0] ldr r0, =sub_8124E0C + 1 bl sub_81248F4 -_08124DF8: +@08124DF8: pop {r4} pop {r0} bx r0 @@ -562297,20 +562297,20 @@ _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 ldr r0, [r4] ldrh r1, [r0, 0x4] cmp r1, 0 - beq _08124E24 + beq @08124E24 cmp r1, 0x1 - beq _08124E3E - b _08124F1A + beq @08124E3E + b @08124F1A .align 2, 0 .pool -_08124E24: +@08124E24: movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -562322,71 +562322,71 @@ _08124E24: ldrh r0, [r1, 0x4] adds r0, 0x1 strh r0, [r1, 0x4] - b _08124F1A -_08124E3E: + b @08124F1A +@08124E3E: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne _08124F1A + bne @08124F1A bl sub_812305C ldr r1, [r4] ldr r2, =0x00000a72 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq _08124F00 + beq @08124F00 ldrh r0, [r1, 0x8] cmp r0, 0xF - beq _08124E98 + beq @08124E98 cmp r0, 0xF - bgt _08124E6C + bgt @08124E6C cmp r0, 0 - beq _08124E84 - b _08124EBC + beq @08124E84 + b @08124EBC .align 2, 0 .pool -_08124E6C: +@08124E6C: cmp r0, 0x3A - beq _08124E7C + beq @08124E7C cmp r0, 0x49 - bne _08124EBC + bne @08124EBC movs r0, 0x15 bl sub_8084CCC - b _08124EFA -_08124E7C: + b @08124EFA +@08124E7C: movs r0, 0x16 bl sub_8084CCC - b _08124EFA -_08124E84: + b @08124EFA +@08124E84: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] movs r1, 0xD cmp r0, 0 - bne _08124EB0 + bne @08124EB0 movs r1, 0xC - b _08124EB0 + b @08124EB0 .align 2, 0 .pool -_08124E98: +@08124E98: ldr r0, =0x000008b4 bl flag_check lsls r0, 24 movs r1, 0xB cmp r0, 0 - beq _08124EB0 + beq @08124EB0 ldr r0, [r4] ldrb r0, [r0, 0xB] cmp r0, 0 - bne _08124EB0 + bne @08124EB0 movs r1, 0x14 -_08124EB0: +@08124EB0: adds r0, r1, 0 bl sub_8084CCC - b _08124EFA + b @08124EFA .align 2, 0 .pool -_08124EBC: +@08124EBC: ldr r3, =0x085a1e3c ldr r0, =0x0203a148 ldr r0, [r0] @@ -562397,12 +562397,12 @@ _08124EBC: adds r1, r2, r0 ldrb r0, [r1] cmp r0, 0 - beq _08124EE0 + beq @08124EE0 bl sub_8084CCC - b _08124EFA + b @08124EFA .align 2, 0 .pool -_08124EE0: +@08124EE0: adds r0, r2, r3 ldrb r0, [r0] lsls r0, 24 @@ -562415,23 +562415,23 @@ _08124EE0: movs r2, 0x1 negs r2, r2 bl warp1_set_2 -_08124EFA: +@08124EFA: bl sub_80B69DC - b _08124F06 -_08124F00: + b @08124F06 +@08124F00: ldr r0, =sub_81B58A8 + 1 bl set_callback2 -_08124F06: +@08124F06: ldr r4, =0x0203a148 ldr r0, [r4] cmp r0, 0 - beq _08124F16 + beq @08124F16 bl free movs r0, 0 str r0, [r4] -_08124F16: +@08124F16: bl Window_FreeMemory -_08124F1A: +@08124F1A: add sp, 0x4 pop {r4} pop {r0} @@ -562441,7 +562441,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] @@ -562470,99 +562470,99 @@ sub_8124F2C: @ 8124F2C ldrb r0, [r0] subs r0, 0x2 cmp r0, 0x22 - bls _08124F68 - b _081250B4 -_08124F68: + bls @08124F68 + b @081250B4 +@08124F68: lsls r0, 2 - ldr r1, =_08124F98 + ldr r1, =@08124F98 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08124F98: - .4byte _08125024 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _08125084 - .4byte _081250B4 - .4byte _0812502A - .4byte _08125030 - .4byte _08125044 - .4byte _08125056 - .4byte _081250B4 - .4byte _0812506C - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _08125072 - .4byte _08125050 - .4byte _08125078 - .4byte _0812507E - .4byte _081250B4 - .4byte _081250B4 - .4byte _08125090 -_08125024: +@08124F98: + .4byte @08125024 + .4byte @081250B4 + .4byte @081250B4 + .4byte @081250B4 + .4byte @08125084 + .4byte @081250B4 + .4byte @0812502A + .4byte @08125030 + .4byte @08125044 + .4byte @08125056 + .4byte @081250B4 + .4byte @0812506C + .4byte @081250B4 + .4byte @081250B4 + .4byte @081250B4 + .4byte @081250B4 + .4byte @081250B4 + .4byte @081250B4 + .4byte @081250B4 + .4byte @081250B4 + .4byte @081250B4 + .4byte @081250B4 + .4byte @081250B4 + .4byte @081250B4 + .4byte @081250B4 + .4byte @081250B4 + .4byte @081250B4 + .4byte @081250B4 + .4byte @08125072 + .4byte @08125050 + .4byte @08125078 + .4byte @0812507E + .4byte @081250B4 + .4byte @081250B4 + .4byte @08125090 +@08125024: bl sub_8125230 - b _081250B4 -_0812502A: + b @081250B4 +@0812502A: bl sub_81252E8 - b _081250B4 -_08125030: + b @081250B4 +@08125030: bl sub_81254E0 ldr r0, =0x0300617c ldrb r0, [r0] bl sub_81253A4 - b _081250B4 + b @081250B4 .align 2, 0 .pool -_08125044: +@08125044: bl sub_81254E0 bl sub_8125630 bl sub_8125448 -_08125050: +@08125050: bl sub_8125630 - b _081250B4 -_08125056: + b @081250B4 +@08125056: bl sub_81254E0 bl sub_81257F8 bl sub_81257F8 bl sub_81258A0 bl sub_8125448 - b _081250B4 -_0812506C: + b @081250B4 +@0812506C: bl sub_81256C8 - b _081250B4 -_08125072: + b @081250B4 +@08125072: bl sub_81254E0 - b _081250B4 -_08125078: + b @081250B4 +@08125078: bl sub_81257F8 - b _081250B4 -_0812507E: + b @081250B4 +@0812507E: bl sub_81258A0 - b _081250B4 -_08125084: + b @081250B4 +@08125084: bl sub_8125250 movs r0, 0x3 bl sub_81250B8 - b _081250B4 -_08125090: + b @081250B4 +@08125090: bl sub_81254E0 bl sub_81257F8 bl sub_81258A0 @@ -562573,13 +562573,13 @@ _08125090: bl sub_81250B8 movs r0, 0x4 bl sub_8125170 -_081250B4: +@081250B4: pop {r0} bx r0 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 @@ -562592,14 +562592,14 @@ sub_81250B8: @ 81250B8 mov r8, r0 ldrb r0, [r0] cmp r2, r0 - bcs _0812514A + bcs @0812514A ldr r1, =0x03006174 mov r12, r1 ldr r3, =0x03006180 mov r10, r3 ldr r0, =0x03006164 mov r9, r0 -_081250DE: +@081250DE: ldr r1, =0x03006178 ldrb r0, [r1] adds r0, r2 @@ -562619,30 +562619,30 @@ _081250DE: mov r0, r12 ldrb r0, [r0] cmp r4, r0 - bcs _0812513E + bcs @0812513E movs r6, 0x80 lsls r6, 8 -_0812510A: +@0812510A: ldrh r1, [r3] adds r0, r6, 0 ands r0, r1 cmp r0, 0 - bne _0812512E + bne @0812512E movs r0, 0x1F ands r0, r1 adds r0, r7 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x1F - bls _08125124 + bls @08125124 movs r2, 0x1F -_08125124: +@08125124: lsls r0, r2, 10 lsls r1, r2, 5 orrs r0, r1 orrs r0, r2 strh r0, [r3] -_0812512E: +@0812512E: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -562650,15 +562650,15 @@ _0812512E: mov r1, r12 ldrb r1, [r1] cmp r4, r1 - bcc _0812510A -_0812513E: + bcc @0812510A +@0812513E: lsls r0, r5, 24 lsrs r2, r0, 24 mov r3, r8 ldrb r3, [r3] cmp r2, r3 - bcc _081250DE -_0812514A: + bcc @081250DE +@0812514A: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -562671,7 +562671,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 @@ -562684,10 +562684,10 @@ sub_8125170: @ 8125170 ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 - bcs _08125208 + bcs @08125208 ldr r1, =0x03006174 mov r10, r1 -_0812518E: +@0812518E: ldr r3, =0x03006178 ldrb r0, [r3] adds r0, r2 @@ -562707,7 +562707,7 @@ _0812518E: mov r0, r10 ldrb r0, [r0] cmp r5, r0 - bcs _081251FC + bcs @081251FC movs r1, 0x80 lsls r1, 8 mov r9, r1 @@ -562715,29 +562715,29 @@ _0812518E: mov r12, r0 mov r1, r8 subs r6, r0, r1 -_081251C4: +@081251C4: ldrh r1, [r3] mov r0, r9 ands r0, r1 cmp r0, 0 - bne _081251EC + bne @081251EC movs r4, 0x1F mov r2, r12 ands r2, r1 cmp r2, r6 - ble _081251E2 + ble @081251E2 mov r1, r8 lsrs r0, r1, 1 subs r0, r4, r0 lsls r0, 24 lsrs r2, r0, 24 -_081251E2: +@081251E2: lsls r0, r2, 10 lsls r1, r2, 5 orrs r0, r1 orrs r0, r2 strh r0, [r3] -_081251EC: +@081251EC: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -562745,15 +562745,15 @@ _081251EC: mov r0, r10 ldrb r0, [r0] cmp r5, r0 - bcc _081251C4 -_081251FC: + bcc @081251C4 +@081251FC: lsls r0, r7, 24 lsrs r2, r0, 24 ldr r1, =0x0300616c ldrb r1, [r1] cmp r2, r1 - bcc _0812518E -_08125208: + bcc @0812518E +@08125208: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -562766,17 +562766,17 @@ _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 -_08125236: +@08125236: lsls r0, r4, 16 lsrs r0, 16 bl sub_8125954 adds r4, 0x1 cmp r4, r5 - bls _08125236 + bls @08125236 pop {r4,r5} pop {r0} bx r0 @@ -562785,7 +562785,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} @@ -562794,11 +562794,11 @@ sub_8125250: @ 8125250 ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 - bcs _081252C2 + bcs @081252C2 ldr r0, =0x03006168 mov r8, r0 ldr r3, =0x03006174 -_08125268: +@08125268: ldr r0, =0x03006178 ldrb r1, [r0] adds r1, r2 @@ -562817,36 +562817,36 @@ _08125268: adds r6, r2, 0x1 ldrb r0, [r3] cmp r5, r0 - bcs _081252B6 + bcs @081252B6 movs r0, 0x80 lsls r0, 8 adds r7, r0, 0 -_08125294: +@08125294: ldrh r0, [r4] ands r0, r7 cmp r0, 0 - bne _081252A8 + bne @081252A8 adds r0, r4, 0 str r3, [sp] bl sub_8125B28 strh r0, [r4] ldr r3, [sp] -_081252A8: +@081252A8: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 adds r4, 0x2 ldrb r0, [r3] cmp r5, r0 - bcc _08125294 -_081252B6: + bcc @08125294 +@081252B6: lsls r0, r6, 24 lsrs r2, r0, 24 ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 - bcc _08125268 -_081252C2: + bcc @08125268 +@081252C2: add sp, 0x4 pop {r3} mov r8, r3 @@ -562858,7 +562858,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} @@ -562867,11 +562867,11 @@ sub_81252E8: @ 81252E8 ldr r0, =0x03006174 ldrb r0, [r0] cmp r2, r0 - bcs _0812537E + bcs @0812537E ldr r0, =0x03006168 mov r8, r0 ldr r3, =0x03006180 -_08125300: +@08125300: ldr r0, =0x03006178 ldrb r1, [r0] ldrb r0, [r3] @@ -562897,16 +562897,16 @@ _08125300: subs r0, 0x1 adds r7, r2, 0x1 cmp r5, r0 - bge _08125372 + bge @08125372 ldr r6, =0x03006180 -_08125336: +@08125336: ldrh r0, [r4] movs r2, 0x80 lsls r2, 8 adds r1, r2, 0 ands r0, r1 cmp r0, 0 - bne _0812535C + bne @0812535C ldrb r2, [r6] lsls r2, 1 adds r2, r4, r2 @@ -562918,7 +562918,7 @@ _08125336: mov r1, sp strh r0, [r1] ldr r3, [sp, 0x4] -_0812535C: +@0812535C: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -562929,15 +562929,15 @@ _0812535C: ldrb r0, [r0] subs r0, 0x1 cmp r5, r0 - blt _08125336 -_08125372: + blt @08125336 +@08125372: lsls r0, r7, 24 lsrs r2, r0, 24 ldr r0, =0x03006174 ldrb r0, [r0] cmp r2, r0 - bcc _08125300 -_0812537E: + bcc @08125300 +@0812537E: add sp, 0x8 pop {r3} mov r8, r3 @@ -562949,7 +562949,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 @@ -562962,11 +562962,11 @@ sub_81253A4: @ 81253A4 ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 - bcs _08125420 + bcs @08125420 ldr r0, =0x03006168 mov r9, r0 ldr r3, =0x03006174 -_081253C4: +@081253C4: ldr r0, =0x03006178 ldrb r1, [r0] adds r1, r2 @@ -562985,37 +562985,37 @@ _081253C4: adds r6, r2, 0x1 ldrb r0, [r3] cmp r5, r0 - bcs _08125414 + bcs @08125414 movs r0, 0x80 lsls r0, 8 adds r7, r0, 0 -_081253F0: +@081253F0: ldrh r0, [r4] ands r0, r7 cmp r0, 0 - bne _08125406 + bne @08125406 adds r0, r4, 0 mov r1, r8 str r3, [sp] bl sub_8125B5C strh r0, [r4] ldr r3, [sp] -_08125406: +@08125406: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 adds r4, 0x2 ldrb r0, [r3] cmp r5, r0 - bcc _081253F0 -_08125414: + bcc @081253F0 +@08125414: lsls r0, r6, 24 lsrs r2, r0, 24 ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 - bcc _081253C4 -_08125420: + bcc @081253C4 +@08125420: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -563028,7 +563028,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} @@ -563037,11 +563037,11 @@ sub_8125448: @ 8125448 ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 - bcs _081254BA + bcs @081254BA ldr r0, =0x03006168 mov r8, r0 ldr r3, =0x03006174 -_08125460: +@08125460: ldr r0, =0x03006178 ldrb r1, [r0] adds r1, r2 @@ -563060,36 +563060,36 @@ _08125460: adds r6, r2, 0x1 ldrb r0, [r3] cmp r5, r0 - bcs _081254AE + bcs @081254AE movs r0, 0x80 lsls r0, 8 adds r7, r0, 0 -_0812548C: +@0812548C: ldrh r0, [r4] ands r0, r7 cmp r0, 0 - bne _081254A0 + bne @081254A0 adds r0, r4, 0 str r3, [sp] bl sub_8125C68 strh r0, [r4] ldr r3, [sp] -_081254A0: +@081254A0: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 adds r4, 0x2 ldrb r0, [r3] cmp r5, r0 - bcc _0812548C -_081254AE: + bcc @0812548C +@081254AE: lsls r0, r6, 24 lsrs r2, r0, 24 ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 - bcc _08125460 -_081254BA: + bcc @08125460 +@081254BA: add sp, 0x4 pop {r3} mov r8, r3 @@ -563101,7 +563101,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 @@ -563110,10 +563110,10 @@ sub_81254E0: @ 81254E0 ldr r0, =0x0300616c ldrb r0, [r0] cmp r7, r0 - bcs _0812556C + bcs @0812556C ldr r0, =0x03006168 mov r8, r0 -_081254F6: +@081254F6: ldr r0, =0x03006178 ldrb r1, [r0] adds r1, r7 @@ -563140,8 +563140,8 @@ _081254F6: subs r0, 0x1 adds r7, 0x1 cmp r6, r0 - bge _08125556 -_0812552E: + bge @08125556 +@0812552E: adds r4, r5, 0x2 adds r0, r5, 0 adds r1, r4, 0 @@ -563159,8 +563159,8 @@ _0812552E: ldrb r0, [r0] subs r0, 0x1 cmp r6, r0 - blt _0812552E -_08125556: + blt @0812552E +@08125556: subs r1, r5, 0x2 adds r0, r5, 0 bl sub_8125C98 @@ -563170,18 +563170,18 @@ _08125556: ldr r0, =0x0300616c ldrb r0, [r0] cmp r7, r0 - bcc _081254F6 -_0812556C: + bcc @081254F6 +@0812556C: movs r6, 0 ldr r0, =0x03006174 ldrb r0, [r0] cmp r6, r0 - bcs _0812560C + bcs @0812560C ldr r3, =0x03006168 mov r9, r3 ldr r0, =0x03006180 mov r8, r0 -_0812557E: +@0812557E: ldr r0, =0x03006178 ldrb r0, [r0] mov r2, r8 @@ -563211,9 +563211,9 @@ _0812557E: subs r0, 0x1 adds r6, 0x1 cmp r7, r0 - bge _081255F0 + bge @081255F0 ldr r4, =0x03006180 -_081255BE: +@081255BE: ldrb r1, [r4] lsls r1, 1 adds r1, r5, r1 @@ -563236,8 +563236,8 @@ _081255BE: ldrb r0, [r0] subs r0, 0x1 cmp r7, r0 - blt _081255BE -_081255F0: + blt @081255BE +@081255F0: mov r2, r8 ldrb r1, [r2] lsls r1, 1 @@ -563250,8 +563250,8 @@ _081255F0: ldr r0, =0x03006174 ldrb r0, [r0] cmp r6, r0 - bcc _0812557E -_0812560C: + bcc @0812557E +@0812560C: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -563263,7 +563263,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} @@ -563272,11 +563272,11 @@ sub_8125630: @ 8125630 ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 - bcs _081256A2 + bcs @081256A2 ldr r0, =0x03006168 mov r8, r0 ldr r3, =0x03006174 -_08125648: +@08125648: ldr r0, =0x03006178 ldrb r1, [r0] adds r1, r2 @@ -563295,36 +563295,36 @@ _08125648: adds r6, r2, 0x1 ldrb r0, [r3] cmp r5, r0 - bcs _08125696 + bcs @08125696 movs r0, 0x80 lsls r0, 8 adds r7, r0, 0 -_08125674: +@08125674: ldrh r0, [r4] ands r0, r7 cmp r0, 0 - bne _08125688 + bne @08125688 adds r0, r4, 0 str r3, [sp] bl sub_8125CC8 strh r0, [r4] ldr r3, [sp] -_08125688: +@08125688: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 adds r4, 0x2 ldrb r0, [r3] cmp r5, r0 - bcc _08125674 -_08125696: + bcc @08125674 +@08125696: lsls r0, r6, 24 lsrs r2, r0, 24 ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 - bcc _08125648 -_081256A2: + bcc @08125648 +@081256A2: add sp, 0x4 pop {r3} mov r8, r3 @@ -563336,7 +563336,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 @@ -563349,28 +563349,28 @@ sub_81256C8: @ 81256C8 movs r0, 0x80 lsls r0, 8 adds r5, r0, 0 -_081256E0: +@081256E0: movs r7, 0 -_081256E2: +@081256E2: ldrh r0, [r4] ands r0, r5 cmp r0, 0 - bne _081256F2 + bne @081256F2 adds r0, r4, 0 bl sub_8125CC8 strh r0, [r4] -_081256F2: +@081256F2: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 adds r4, 0x2 cmp r7, 0x3F - bls _081256E2 + bls @081256E2 adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x3F - bls _081256E0 + bls @081256E0 movs r7, 0 ldr r1, =0x03006168 mov r10, r1 @@ -563378,7 +563378,7 @@ _081256F2: movs r2, 0x80 lsls r2, 8 mov r9, r2 -_08125716: +@08125716: lsls r0, r7, 1 mov r2, r10 ldr r1, [r2] @@ -563390,13 +563390,13 @@ _08125716: movs r6, 0x1 adds r4, 0x80 adds r5, r0, 0 -_0812572C: +@0812572C: ldrh r0, [r4] movs r2, 0x80 lsls r2, 8 ands r0, r2 cmp r0, 0 - bne _0812574C + bne @0812574C adds r2, r4, 0 adds r2, 0x80 mov r0, sp @@ -563406,13 +563406,13 @@ _0812572C: strh r0, [r4] ldr r3, [sp, 0x4] strh r0, [r3] -_0812574C: +@0812574C: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 adds r4, 0x80 cmp r6, 0x3E - bls _0812572C + bls @0812572C mov r0, r9 strh r0, [r4] mov r1, r10 @@ -563427,14 +563427,14 @@ _0812574C: movs r0, 0x80 lsls r0, 8 mov r8, r0 -_08125774: +@08125774: ldrh r0, [r4] mov r1, r8 ands r0, r1 adds r5, r4, 0 adds r5, 0x80 cmp r0, 0 - bne _08125794 + bne @08125794 mov r0, sp adds r1, r4, 0 adds r2, r5, 0 @@ -563443,49 +563443,49 @@ _08125774: strh r0, [r4] ldr r3, [sp, 0x4] strh r0, [r3] -_08125794: +@08125794: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 adds r4, r5, 0 cmp r6, 0x3E - bls _08125774 + bls @08125774 mov r2, r9 strh r2, [r4] adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x3F - bls _08125716 + bls @08125716 ldr r0, =0x03006168 ldr r4, [r0] movs r6, 0 movs r0, 0x80 lsls r0, 8 mov r8, r0 -_081257BA: +@081257BA: movs r7, 0 adds r5, r6, 0x1 -_081257BE: +@081257BE: ldrh r0, [r4] mov r1, r8 ands r0, r1 cmp r0, 0 - bne _081257D0 + bne @081257D0 adds r0, r4, 0 bl sub_8125CC8 strh r0, [r4] -_081257D0: +@081257D0: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 adds r4, 0x2 cmp r7, 0x3F - bls _081257BE + bls @081257BE lsls r0, r5, 24 lsrs r6, r0, 24 cmp r6, 0x3F - bls _081257BA + bls @081257BA add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -563499,7 +563499,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} @@ -563508,10 +563508,10 @@ sub_81257F8: @ 81257F8 ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 - bcs _0812587A + bcs @0812587A ldr r0, =0x03006168 mov r8, r0 -_0812580E: +@0812580E: ldr r0, =0x03006178 ldrb r1, [r0] adds r1, r2 @@ -563536,22 +563536,22 @@ _0812580E: subs r0, 0x1 adds r6, r2, 0x1 cmp r5, r0 - bge _0812586E + bge @0812586E movs r0, 0x80 lsls r0, 8 adds r7, r0, 0 -_08125846: +@08125846: ldrh r0, [r4] ands r0, r7 cmp r0, 0 - bne _0812585C + bne @0812585C mov r0, sp adds r1, r4, 0 bl sub_8125CF4 strh r0, [r4] mov r1, sp strh r0, [r1] -_0812585C: +@0812585C: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -563560,15 +563560,15 @@ _0812585C: ldrb r0, [r0] subs r0, 0x1 cmp r5, r0 - blt _08125846 -_0812586E: + blt @08125846 +@0812586E: lsls r0, r6, 24 lsrs r2, r0, 24 ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 - bcc _0812580E -_0812587A: + bcc @0812580E +@0812587A: add sp, 0x4 pop {r3} mov r8, r3 @@ -563580,7 +563580,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} @@ -563589,11 +563589,11 @@ sub_81258A0: @ 81258A0 ldr r0, =0x03006174 ldrb r0, [r0] cmp r2, r0 - bcs _0812592E + bcs @0812592E ldr r0, =0x03006168 mov r8, r0 ldr r7, =0x03006180 -_081258B8: +@081258B8: ldr r0, =0x03006178 ldrb r1, [r0] ldrb r0, [r7] @@ -563619,15 +563619,15 @@ _081258B8: subs r0, 0x1 adds r6, r2, 0x1 cmp r5, r0 - bge _08125922 + bge @08125922 movs r0, 0x80 lsls r0, 8 adds r2, r0, 0 -_081258F2: +@081258F2: ldrh r0, [r4] ands r0, r2 cmp r0, 0 - bne _0812590C + bne @0812590C mov r0, sp adds r1, r4, 0 str r2, [sp, 0x4] @@ -563636,7 +563636,7 @@ _081258F2: mov r1, sp strh r0, [r1] ldr r2, [sp, 0x4] -_0812590C: +@0812590C: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -563647,15 +563647,15 @@ _0812590C: ldrb r0, [r0] subs r0, 0x1 cmp r5, r0 - blt _081258F2 -_08125922: + blt @081258F2 +@08125922: lsls r0, r6, 24 lsrs r2, r0, 24 ldr r0, =0x03006174 ldrb r0, [r0] cmp r2, r0 - bcc _081258B8 -_0812592E: + bcc @081258B8 +@0812592E: add sp, 0x8 pop {r3} mov r8, r3 @@ -563667,7 +563667,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 @@ -563707,11 +563707,11 @@ sub_8125954: @ 8125954 movs r4, 0x1 mov r8, r4 cmp r8, r1 - bcs _08125A06 + bcs @08125A06 mov r3, sp -_081259A6: +@081259A6: cmp r5, 0 - bne _081259C4 + bne @081259C4 mov r0, r8 lsls r2, r0, 2 mov r4, sp @@ -563722,10 +563722,10 @@ _081259A6: strb r0, [r1] ldrb r0, [r3, 0x1] add r0, r8 - b _081259D6 + b @081259D6 .align 2, 0 .pool -_081259C4: +@081259C4: mov r0, r8 lsls r2, r0, 2 mov r4, sp @@ -563735,21 +563735,21 @@ _081259C4: strb r0, [r1] ldrb r0, [r3, 0x1] subs r0, 0x1 -_081259D6: +@081259D6: strb r0, [r1, 0x1] add r2, sp ldrb r0, [r2] cmp r0, 0x3F - bhi _081259E6 + bhi @081259E6 ldrb r0, [r2, 0x1] cmp r0, 0x3F - bls _081259EE -_081259E6: + bls @081259EE +@081259E6: mov r0, r8 subs r0, 0x1 strh r0, [r3, 0x2] - b _08125A06 -_081259EE: + b @08125A06 +@081259EE: ldrh r0, [r3, 0x2] mov r1, r8 subs r0, r1 @@ -563761,18 +563761,18 @@ _081259EE: mov r8, r0 ldrh r0, [r3, 0x2] cmp r8, r0 - bcc _081259A6 -_08125A06: + bcc @081259A6 +@08125A06: movs r2, 0 mov r8, r2 mov r0, sp ldrh r0, [r0, 0x2] cmp r8, r0 - bcc _08125A14 - b _08125B16 -_08125A14: + bcc @08125A14 + b @08125B16 +@08125A14: movs r3, 0x1F -_08125A16: +@08125A16: ldr r1, =0x03006168 mov r4, r8 lsls r0, r4, 2 @@ -563791,7 +563791,7 @@ _08125A16: adds r0, r4, 0 ands r0, r1 cmp r0, 0 - bne _08125B02 + bne @08125B02 movs r7, 0x1F ands r7, r1 lsls r0, r1, 16 @@ -563801,11 +563801,11 @@ _08125A16: ands r4, r3 mov r0, r9 cmp r0, 0 - blt _08125AF8 + blt @08125AF8 cmp r0, 0x1 - ble _08125A78 + ble @08125A78 cmp r0, 0x3 - bgt _08125AF8 + bgt @08125AF8 ldrh r0, [r6, 0x2] adds r1, r7, r0 lsls r1, 16 @@ -563817,12 +563817,12 @@ _08125A16: lsls r0, 16 lsrs r4, r0, 16 cmp r7, 0x1F - bls _08125AEC + bls @08125AEC movs r7, 0x1F - b _08125AEC + b @08125AEC .align 2, 0 .pool -_08125A78: +@08125A78: mov r1, r10 lsls r0, r1, 1 add r0, r10 @@ -563842,66 +563842,66 @@ _08125A78: ldr r2, [sp, 0x18] ldr r3, [sp, 0x1C] cmp r0, 0x1 - beq _08125AC8 + beq @08125AC8 cmp r0, 0x1 - bgt _08125AB0 + bgt @08125AB0 cmp r0, 0 - beq _08125AB6 - b _08125AF8 + beq @08125AB6 + b @08125AF8 .align 2, 0 .pool -_08125AB0: +@08125AB0: cmp r0, 0x2 - beq _08125ADA - b _08125AF8 -_08125AB6: + beq @08125ADA + b @08125AF8 +@08125AB6: ldrh r0, [r6, 0x2] cmp r7, r0 - bcc _08125AC4 + bcc @08125AC4 subs r0, r7, r0 lsls r0, 16 lsrs r7, r0, 16 - b _08125AF8 -_08125AC4: + b @08125AF8 +@08125AC4: movs r7, 0 - b _08125AF8 -_08125AC8: + b @08125AF8 +@08125AC8: ldrh r0, [r6, 0x2] cmp r5, r0 - bcc _08125AD6 + bcc @08125AD6 subs r0, r5, r0 lsls r0, 16 lsrs r5, r0, 16 - b _08125AF8 -_08125AD6: + b @08125AF8 +@08125AD6: movs r5, 0 - b _08125AF8 -_08125ADA: + b @08125AF8 +@08125ADA: ldrh r0, [r6, 0x2] cmp r4, r0 - bcc _08125AE8 + bcc @08125AE8 subs r0, r4, r0 lsls r0, 16 lsrs r4, r0, 16 - b _08125AF8 -_08125AE8: + b @08125AF8 +@08125AE8: movs r4, 0 - b _08125AF8 -_08125AEC: + b @08125AF8 +@08125AEC: cmp r5, 0x1F - bls _08125AF2 + bls @08125AF2 movs r5, 0x1F -_08125AF2: +@08125AF2: cmp r4, 0x1F - bls _08125AF8 + bls @08125AF8 movs r4, 0x1F -_08125AF8: +@08125AF8: lsls r0, r4, 10 lsls r1, r5, 5 orrs r0, r1 orrs r7, r0 strh r7, [r2] -_08125B02: +@08125B02: mov r0, r8 adds r0, 0x1 lsls r0, 24 @@ -563910,9 +563910,9 @@ _08125B02: mov r0, sp ldrh r0, [r0, 0x2] cmp r8, r0 - bcs _08125B16 - b _08125A16 -_08125B16: + bcs @08125B16 + b @08125A16 +@08125B16: add sp, 0x20 pop {r3-r5} mov r8, r3 @@ -563924,7 +563924,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 @@ -563954,7 +563954,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 @@ -563968,19 +563968,19 @@ sub_8125B5C: @ 8125B5C lsrs r0, 26 ands r0, r2 cmp r1, 0x10 - bhi _08125B8C + bhi @08125B8C cmp r3, 0x10 - bhi _08125B8C + bhi @08125B8C cmp r0, 0x10 - bhi _08125B8C + bhi @08125B8C adds r0, r4, 0 bl sub_8125B98 lsls r0, 16 lsrs r0, 16 - b _08125B8E -_08125B8C: + b @08125B8E +@08125B8C: ldr r0, =0x00007fff -_08125B8E: +@08125B8E: pop {r4} pop {r1} bx r1 @@ -563989,7 +563989,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} @@ -564015,23 +564015,23 @@ sub_8125B98: @ 8125B98 lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 - bhi _08125C50 + bhi @08125C50 lsls r0, 2 - ldr r1, =_08125BE0 + ldr r1, =@08125BE0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08125BE0: - .4byte _08125BF8 - .4byte _08125C08 - .4byte _08125C18 - .4byte _08125C26 - .4byte _08125C34 - .4byte _08125C42 -_08125BF8: +@08125BE0: + .4byte @08125BF8 + .4byte @08125C08 + .4byte @08125C18 + .4byte @08125C26 + .4byte @08125C34 + .4byte @08125C42 +@08125BF8: movs r0, 0x15 subs r0, r5 lsls r0, 16 @@ -564039,8 +564039,8 @@ _08125BF8: adds r7, r6, 0 movs r1, 0 mov r8, r1 - b _08125C50 -_08125C08: + b @08125C50 +@08125C08: movs r7, 0 movs r0, 0x15 subs r0, r5 @@ -564048,41 +564048,41 @@ _08125C08: lsrs r0, 16 mov r8, r0 mov r6, r8 - b _08125C50 -_08125C18: + b @08125C50 +@08125C18: movs r0, 0x15 subs r0, r5 lsls r0, 16 lsrs r7, r0, 16 movs r6, 0 mov r8, r7 - b _08125C50 -_08125C26: + b @08125C50 +@08125C26: movs r7, 0 movs r6, 0 movs r0, 0x17 subs r0, r5 lsls r0, 16 lsrs r0, 16 - b _08125C4E -_08125C34: + b @08125C4E +@08125C34: movs r0, 0x17 subs r0, r5 lsls r0, 16 lsrs r7, r0, 16 movs r6, 0 mov r8, r6 - b _08125C50 -_08125C42: + b @08125C50 +@08125C42: movs r7, 0 movs r0, 0x17 subs r0, r5 lsls r0, 16 lsrs r6, r0, 16 movs r0, 0 -_08125C4E: +@08125C4E: mov r8, r0 -_08125C50: +@08125C50: lsls r0, r7, 10 lsls r1, r6, 5 orrs r0, r1 @@ -564098,7 +564098,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 @@ -564110,16 +564110,16 @@ sub_8125C68: @ 8125C68 lsrs r0, 26 ands r0, r2 cmp r1, 0x10 - bhi _08125C8C + bhi @08125C8C cmp r3, 0x10 - bhi _08125C8C + bhi @08125C8C cmp r0, 0x10 - bhi _08125C8C + bhi @08125C8C movs r0, 0 - b _08125C8E -_08125C8C: + b @08125C8E +@08125C8C: ldr r0, =0x00007fff -_08125C8E: +@08125C8E: pop {r1} bx r1 .align 2, 0 @@ -564127,38 +564127,38 @@ _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] cmp r3, 0 - beq _08125CC0 + beq @08125CC0 movs r2, 0x80 lsls r2, 8 adds r0, r2, 0 ands r0, r3 cmp r0, 0 - beq _08125CB2 + beq @08125CB2 adds r0, r2, 0 - b _08125CC2 -_08125CB2: + b @08125CC2 +@08125CB2: ldrh r1, [r1] adds r0, r2, 0 ands r0, r1 cmp r0, 0 - bne _08125CC0 + bne @08125CC0 ldrh r0, [r4] - b _08125CC2 -_08125CC0: + b @08125CC2 +@08125CC0: movs r0, 0 -_08125CC2: +@08125CC2: pop {r4} pop {r1} bx r1 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 @@ -564184,7 +564184,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 @@ -564194,7 +564194,7 @@ sub_8125CF4: @ 8125CF4 lsls r0, r5, 16 mov r12, r0 cmp r4, r5 - beq _08125D66 + beq @08125D66 mov r2, sp movs r3, 0x1F movs r1, 0x1F @@ -564221,38 +564221,38 @@ sub_8125CF4: @ 8125CF4 mov r0, sp ldrh r0, [r0] cmp r0, 0x19 - bls _08125D4E + bls @08125D4E mov r0, sp ldrh r0, [r0, 0x2] cmp r0, 0x19 - bls _08125D4E + bls @08125D4E mov r0, sp ldrh r0, [r0, 0x4] cmp r0, 0x19 - bhi _08125D66 -_08125D4E: + bhi @08125D66 +@08125D4E: mov r0, sp ldrh r0, [r0, 0x6] cmp r0, 0x19 - bls _08125D6A + bls @08125D6A mov r0, sp ldrh r0, [r0, 0x8] cmp r0, 0x19 - bls _08125D6A + bls @08125D6A mov r0, sp ldrh r0, [r0, 0xA] cmp r0, 0x19 - bls _08125D6A -_08125D66: + bls @08125D6A +@08125D66: ldrh r0, [r7] - b _08125E10 -_08125D6A: + b @08125E10 +@08125D6A: movs r4, 0 add r6, sp, 0xC mov r7, sp adds r7, 0x6 adds r5, r6, 0 -_08125D74: +@08125D74: lsls r2, r4, 1 mov r1, sp adds r0, r1, r2 @@ -564260,50 +564260,50 @@ _08125D74: ldrh r3, [r0] ldrh r0, [r1] cmp r3, r0 - bls _08125D8A + bls @08125D8A adds r1, r5, r2 subs r0, r3, r0 - b _08125D8E -_08125D8A: + b @08125D8E +@08125D8A: adds r1, r5, r2 subs r0, r3 -_08125D8E: +@08125D8E: strh r0, [r1] adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _08125D74 + bls @08125D74 adds r1, r6, 0 ldrh r0, [r1, 0x2] ldrh r3, [r1] cmp r3, r0 - bcc _08125DB4 + bcc @08125DB4 ldrh r2, [r1, 0x4] cmp r3, r2 - bcc _08125DAE + bcc @08125DAE adds r2, r3, 0 - b _08125DC8 -_08125DAE: + b @08125DC8 +@08125DAE: cmp r0, r2 - bcs _08125DBA - b _08125DC2 -_08125DB4: + bcs @08125DBA + b @08125DC2 +@08125DB4: ldrh r2, [r1, 0x4] cmp r0, r2 - bcc _08125DBE -_08125DBA: + bcc @08125DBE +@08125DBA: ldrh r2, [r1, 0x2] - b _08125DC8 -_08125DBE: + b @08125DC8 +@08125DBE: cmp r2, r3 - bcc _08125DC6 -_08125DC2: + bcc @08125DC6 +@08125DC2: ldrh r2, [r1, 0x4] - b _08125DC8 -_08125DC6: + b @08125DC8 +@08125DC6: ldrh r2, [r6] -_08125DC8: +@08125DC8: mov r0, sp ldrh r1, [r0, 0x6] lsrs r0, r2, 1 @@ -564337,7 +564337,7 @@ _08125DC8: lsls r5, 16 lsrs r5, 16 adds r0, r5, 0 -_08125E10: +@08125E10: add sp, 0x14 pop {r4-r7} pop {r1} @@ -564345,7 +564345,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 @@ -564359,14 +564359,14 @@ sub_8125E18: @ 8125E18 mov r0, r10 ldrh r0, [r0] cmp r1, r0 - bne _08125E40 + bne @08125E40 ldrh r0, [r2] cmp r0, r1 - bne _08125E40 + bne @08125E40 mov r1, r10 ldrh r0, [r1] - b _08125F28 -_08125E40: + b @08125F28 +@08125E40: mov r2, r10 ldrh r0, [r2] movs r1, 0x1F @@ -564423,35 +564423,35 @@ _08125E40: lsls r0, 16 lsrs r1, r0, 16 cmp r7, r6 - bne _08125EC2 + bne @08125EC2 cmp r1, r6 - bne _08125EC2 + bne @08125EC2 mov r3, r10 ldrh r0, [r3] - b _08125F28 -_08125EC2: + b @08125F28 +@08125EC2: cmp r7, r6 - bls _08125ECA + bls @08125ECA subs r0, r7, r6 - b _08125ECC -_08125ECA: + b @08125ECC +@08125ECA: subs r0, r6, r7 -_08125ECC: +@08125ECC: lsls r0, 16 lsrs r2, r0, 16 cmp r1, r6 - bls _08125ED8 + bls @08125ED8 subs r0, r1, r6 - b _08125EDA -_08125ED8: + b @08125EDA +@08125ED8: subs r0, r6, r1 -_08125EDA: +@08125EDA: lsls r0, 16 lsrs r0, 16 cmp r2, r0 - bcc _08125EE4 + bcc @08125EE4 adds r0, r2, 0 -_08125EE4: +@08125EE4: lsrs r0, 1 movs r4, 0x1F subs r4, r0 @@ -564483,7 +564483,7 @@ _08125EE4: orrs r5, r0 lsls r0, r5, 16 lsrs r0, 16 -_08125F28: +@08125F28: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -564495,7 +564495,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 @@ -564509,14 +564509,14 @@ sub_8125F38: @ 8125F38 mov r0, r10 ldrh r0, [r0] cmp r1, r0 - bne _08125F60 + bne @08125F60 ldrh r0, [r2] cmp r0, r1 - bne _08125F60 + bne @08125F60 mov r1, r10 ldrh r0, [r1] - b _08126046 -_08125F60: + b @08126046 +@08125F60: mov r2, r10 ldrh r0, [r2] movs r1, 0x1F @@ -564573,35 +564573,35 @@ _08125F60: lsls r0, 16 lsrs r1, r0, 16 cmp r7, r6 - bne _08125FE2 + bne @08125FE2 cmp r1, r6 - bne _08125FE2 + bne @08125FE2 mov r3, r10 ldrh r0, [r3] - b _08126046 -_08125FE2: + b @08126046 +@08125FE2: cmp r7, r6 - bls _08125FEA + bls @08125FEA subs r0, r7, r6 - b _08125FEC -_08125FEA: + b @08125FEC +@08125FEA: subs r0, r6, r7 -_08125FEC: +@08125FEC: lsls r0, 16 lsrs r2, r0, 16 cmp r1, r6 - bls _08125FF8 + bls @08125FF8 subs r0, r1, r6 - b _08125FFA -_08125FF8: + b @08125FFA +@08125FF8: subs r0, r6, r1 -_08125FFA: +@08125FFA: lsls r0, 16 lsrs r0, 16 cmp r2, r0 - bcc _08126004 + bcc @08126004 adds r0, r2, 0 -_08126004: +@08126004: movs r4, 0x1F subs r4, r0 lsls r4, 16 @@ -564632,7 +564632,7 @@ _08126004: orrs r5, r0 lsls r0, r5, 16 lsrs r0, 16 -_08126046: +@08126046: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -564644,7 +564644,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 @@ -564662,24 +564662,24 @@ sub_8126058: @ 8126058 str r2, [sp, 0x4] ldrh r0, [r0, 0x16] cmp r0, 0x2 - bne _08126108 + bne @08126108 movs r1, 0 ldr r0, [sp, 0x8] cmp r1, r0 - bcc _08126086 - b _08126194 -_08126086: + bcc @08126086 + b @08126194 +@08126086: movs r0, 0 adds r2, r1, 0x1 mov r10, r2 cmp r0, r5 - bcs _081260FA + bcs @081260FA adds r2, r1, 0 muls r2, r5 mov r9, r2 lsls r1, 3 mov r8, r1 -_0812609A: +@0812609A: movs r4, 0 lsls r6, r0, 4 adds r7, r0, 0x1 @@ -564688,7 +564688,7 @@ _0812609A: ldr r1, [sp, 0x4] adds r1, r0 mov r12, r1 -_081260AA: +@081260AA: lsls r0, r4, 3 mov r2, r12 adds r3, r2, r0 @@ -564724,36 +564724,36 @@ _081260AA: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x7 - bls _081260AA + bls @081260AA lsls r0, r7, 16 lsrs r0, 16 cmp r0, r5 - bcc _0812609A -_081260FA: + bcc @0812609A +@081260FA: mov r1, r10 lsls r0, r1, 16 lsrs r1, r0, 16 ldr r2, [sp, 0x8] cmp r1, r2 - bcc _08126086 - b _08126194 -_08126108: + bcc @08126086 + b @08126194 +@08126108: movs r1, 0 ldr r0, [sp, 0x8] cmp r1, r0 - bcs _08126194 -_08126110: + bcs @08126194 +@08126110: movs r0, 0 adds r2, r1, 0x1 mov r10, r2 cmp r0, r5 - bcs _08126188 + bcs @08126188 adds r2, r1, 0 muls r2, r5 mov r9, r2 lsls r1, 3 mov r8, r1 -_08126124: +@08126124: movs r4, 0 lsls r6, r0, 4 adds r7, r0, 0x1 @@ -564762,7 +564762,7 @@ _08126124: ldr r1, [sp, 0x4] adds r1, r0 mov r12, r1 -_08126134: +@08126134: lsls r0, r4, 2 mov r2, r12 adds r3, r2, r0 @@ -564800,19 +564800,19 @@ _08126134: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x7 - bls _08126134 + bls @08126134 lsls r0, r7, 16 lsrs r0, 16 cmp r0, r5 - bcc _08126124 -_08126188: + bcc @08126124 +@08126188: mov r1, r10 lsls r0, r1, 16 lsrs r1, r0, 16 ldr r2, [sp, 0x8] cmp r1, r2 - bcc _08126110 -_08126194: + bcc @08126110 +@08126194: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -564824,7 +564824,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] @@ -564859,52 +564859,52 @@ sub_81261A4: @ 81261A4 strb r1, [r2] ldrh r0, [r0, 0x14] cmp r0, 0x5 - bhi _0812626A + bhi @0812626A lsls r0, 2 - ldr r1, =_0812621C + ldr r1, =@0812621C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0812621C: - .4byte _08126234 - .4byte _0812623C - .4byte _08126244 - .4byte _0812624E - .4byte _08126258 - .4byte _08126262 -_08126234: +@0812621C: + .4byte @08126234 + .4byte @0812623C + .4byte @08126244 + .4byte @0812624E + .4byte @08126258 + .4byte @08126262 +@08126234: movs r0, 0 bl sub_81263A4 - b _0812626A -_0812623C: + b @0812626A +@0812623C: movs r0, 0x1 bl sub_81263A4 - b _0812626A -_08126244: + b @0812626A +@08126244: bl sub_8126270 bl sub_8126714 - b _0812626A -_0812624E: + b @0812626A +@0812624E: bl sub_8126370 bl sub_8126664 - b _0812626A -_08126258: + b @0812626A +@08126258: bl sub_8126334 bl sub_81265B4 - b _0812626A -_08126262: + b @0812626A +@08126262: bl sub_8126318 bl sub_81264FC -_0812626A: +@0812626A: pop {r0} bx r0 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 @@ -564961,7 +564961,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 @@ -564977,7 +564977,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] @@ -564987,7 +564987,7 @@ sub_8126334: @ 8126334 strh r2, [r0, 0x2] movs r4, 0 adds r5, r1, 0 -_08126346: +@08126346: ldr r0, [r5] lsls r2, r4, 1 adds r2, r0 @@ -565002,7 +565002,7 @@ _08126346: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xD - bls _08126346 + bls @08126346 pop {r4,r5} pop {r0} bx r0 @@ -565011,7 +565011,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] @@ -565019,7 +565019,7 @@ sub_8126370: @ 8126370 strh r0, [r1] movs r3, 0 adds r4, r2, 0 -_0812637E: +@0812637E: ldr r0, [r4] lsls r2, r3, 1 adds r2, r0 @@ -565032,7 +565032,7 @@ _0812637E: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x1F - bls _0812637E + bls @0812637E pop {r4} pop {r0} bx r0 @@ -565041,7 +565041,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 @@ -565051,10 +565051,10 @@ sub_81263A4: @ 81263A4 movs r1, 0xDF mov r9, r1 cmp r0, 0 - bne _081263BC + bne @081263BC movs r2, 0xFF mov r9, r2 -_081263BC: +@081263BC: movs r6, 0 ldr r3, =0x03006184 mov r12, r3 @@ -565062,9 +565062,9 @@ _081263BC: lsls r4, r0, 1 ldr r5, =0x0300616c cmp r6, r9 - bcs _081263E0 + bcs @081263E0 movs r2, 0 -_081263CE: +@081263CE: ldr r0, [r3] lsls r1, r6, 1 adds r1, r0 @@ -565073,8 +565073,8 @@ _081263CE: lsls r0, 24 lsrs r6, r0, 24 cmp r6, r9 - bcc _081263CE -_081263E0: + bcc @081263CE +@081263E0: mov r1, r12 ldr r0, [r1] adds r0, r4, r0 @@ -565084,8 +565084,8 @@ _081263E0: movs r3, 0 ldrb r5, [r5] cmp r3, r5 - bcs _081264E4 -_081263F4: + bcs @081264E4 +@081263F4: ldr r2, =0x03006168 ldr r0, =0x03006178 ldrb r1, [r0] @@ -565107,26 +565107,26 @@ _081263F4: mov r10, r3 ldrb r3, [r2] cmp r6, r3 - bcs _081264D6 + bcs @081264D6 ldr r0, =0x03006188 mov r8, r0 -_08126424: +@08126424: ldrh r0, [r4] movs r3, 0x80 lsls r3, 8 adds r1, r3, 0 ands r0, r1 cmp r0, 0 - beq _08126464 + beq @08126464 mov r1, r8 ldrh r0, [r1] strh r0, [r4] adds r6, 0x1 adds r7, r4, 0x2 - b _081264CA + b @081264CA .align 2, 0 .pool -_08126464: +@08126464: adds r0, r4, 0 bl sub_81267C4 lsls r0, 16 @@ -565135,67 +565135,67 @@ _08126464: adds r6, 0x1 adds r7, r4, 0x2 cmp r3, r9 - bcs _081264C0 + bcs @081264C0 ldr r0, =0x03006184 ldr r2, [r0] ldrh r1, [r2, 0x2] mov r12, r0 cmp r1, 0 - bne _08126494 + bne @08126494 strh r5, [r2, 0x2] mov r2, r8 ldrh r0, [r2] adds r0, 0x1 - b _081264BE + b @081264BE .align 2, 0 .pool -_08126494: +@08126494: mov r2, r12 ldr r1, [r2] lsls r0, r3, 1 adds r0, r1 ldrh r0, [r0] cmp r0, r5 - beq _081264B8 + beq @081264B8 adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, r9 - bcs _081264C0 + bcs @081264C0 lsls r0, r3, 1 adds r1, r0, r1 ldrh r0, [r1] cmp r0, 0 - bne _08126494 + bne @08126494 strh r5, [r1] -_081264B8: +@081264B8: mov r1, r8 ldrh r0, [r1] adds r0, r3 -_081264BE: +@081264BE: strh r0, [r4] -_081264C0: +@081264C0: ldr r2, =0x03006174 cmp r3, r9 - bne _081264CA + bne @081264CA mov r3, r9 strh r3, [r4] -_081264CA: +@081264CA: lsls r0, r6, 24 lsrs r6, r0, 24 adds r4, r7, 0 ldrb r0, [r2] cmp r6, r0 - bcc _08126424 -_081264D6: + bcc @08126424 +@081264D6: mov r1, r10 lsls r0, r1, 24 lsrs r3, r0, 24 ldr r0, =0x0300616c ldrb r0, [r0] cmp r3, r0 - bcc _081263F4 -_081264E4: + bcc @081263F4 +@081264E4: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -565208,7 +565208,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} @@ -565216,10 +565216,10 @@ sub_81264FC: @ 81264FC ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 - bcs _081265A0 + bcs @081265A0 ldr r0, =0x03006168 mov r8, r0 -_08126510: +@08126510: ldr r0, =0x03006178 ldrb r1, [r0] adds r1, r2 @@ -565240,52 +565240,52 @@ _08126510: adds r7, r2, 0x1 ldrb r0, [r3] cmp r6, r0 - bcs _08126594 + bcs @08126594 ldr r5, =0x03006188 -_0812653C: +@0812653C: ldrh r0, [r4] movs r2, 0x80 lsls r2, 8 adds r1, r2, 0 ands r0, r1 cmp r0, 0 - beq _0812656C + beq @0812656C ldrh r0, [r5] strh r0, [r4] - b _08126586 + b @08126586 .align 2, 0 .pool -_0812656C: +@0812656C: adds r0, r4, 0 bl sub_8125C68 lsls r0, 16 cmp r0, 0 - bne _0812657E + bne @0812657E ldrh r0, [r5] adds r0, 0x1 - b _08126582 -_0812657E: + b @08126582 +@0812657E: ldrh r0, [r5] adds r0, 0x2 -_08126582: +@08126582: strh r0, [r4] ldr r3, =0x03006174 -_08126586: +@08126586: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 adds r4, 0x2 ldrb r0, [r3] cmp r6, r0 - bcc _0812653C -_08126594: + bcc @0812653C +@08126594: lsls r0, r7, 24 lsrs r2, r0, 24 ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 - bcc _08126510 -_081265A0: + bcc @08126510 +@081265A0: pop {r3} mov r8, r3 pop {r4-r7} @@ -565296,7 +565296,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} @@ -565305,10 +565305,10 @@ sub_81265B4: @ 81265B4 ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 - bcs _08126650 + bcs @08126650 ldr r0, =0x03006168 mov r8, r0 -_081265CA: +@081265CA: ldr r0, =0x03006178 ldrb r1, [r0] adds r1, r2 @@ -565328,22 +565328,22 @@ _081265CA: adds r7, r2, 0x1 ldrb r0, [r0] cmp r5, r0 - bcs _08126644 + bcs @08126644 ldr r6, =0x03006188 movs r0, 0x80 lsls r0, 8 adds r2, r0, 0 -_081265FA: +@081265FA: ldrh r0, [r4] ands r0, r2 cmp r0, 0 - beq _08126624 + beq @08126624 ldrh r0, [r6] strh r0, [r4] - b _08126634 + b @08126634 .align 2, 0 .pool -_08126624: +@08126624: adds r0, r4, 0 str r2, [sp] bl sub_8126908 @@ -565351,7 +565351,7 @@ _08126624: adds r0, r1 strh r0, [r4] ldr r2, [sp] -_08126634: +@08126634: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -565359,15 +565359,15 @@ _08126634: ldr r0, =0x03006174 ldrb r0, [r0] cmp r5, r0 - bcc _081265FA -_08126644: + bcc @081265FA +@08126644: lsls r0, r7, 24 lsrs r2, r0, 24 ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 - bcc _081265CA -_08126650: + bcc @081265CA +@08126650: add sp, 0x4 pop {r3} mov r8, r3 @@ -565379,7 +565379,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} @@ -565388,10 +565388,10 @@ sub_8126664: @ 8126664 ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 - bcs _08126700 + bcs @08126700 ldr r0, =0x03006168 mov r8, r0 -_0812667A: +@0812667A: ldr r0, =0x03006178 ldrb r1, [r0] adds r1, r2 @@ -565411,22 +565411,22 @@ _0812667A: adds r7, r2, 0x1 ldrb r0, [r0] cmp r5, r0 - bcs _081266F4 + bcs @081266F4 ldr r6, =0x03006188 movs r0, 0x80 lsls r0, 8 adds r2, r0, 0 -_081266AA: +@081266AA: ldrh r0, [r4] ands r0, r2 cmp r0, 0 - beq _081266D4 + beq @081266D4 ldrh r0, [r6] strh r0, [r4] - b _081266E4 + b @081266E4 .align 2, 0 .pool -_081266D4: +@081266D4: adds r0, r4, 0 str r2, [sp] bl sub_812693C @@ -565434,7 +565434,7 @@ _081266D4: adds r0, r1 strh r0, [r4] ldr r2, [sp] -_081266E4: +@081266E4: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -565442,15 +565442,15 @@ _081266E4: ldr r0, =0x03006174 ldrb r0, [r0] cmp r5, r0 - bcc _081266AA -_081266F4: + bcc @081266AA +@081266F4: lsls r0, r7, 24 lsrs r2, r0, 24 ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 - bcc _0812667A -_08126700: + bcc @0812667A +@08126700: add sp, 0x4 pop {r3} mov r8, r3 @@ -565462,7 +565462,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} @@ -565471,10 +565471,10 @@ sub_8126714: @ 8126714 ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 - bcs _081267B0 + bcs @081267B0 ldr r0, =0x03006168 mov r8, r0 -_0812672A: +@0812672A: ldr r0, =0x03006178 ldrb r1, [r0] adds r1, r2 @@ -565494,22 +565494,22 @@ _0812672A: adds r7, r2, 0x1 ldrb r0, [r0] cmp r5, r0 - bcs _081267A4 + bcs @081267A4 ldr r6, =0x03006188 movs r0, 0x80 lsls r0, 8 adds r2, r0, 0 -_0812675A: +@0812675A: ldrh r0, [r4] ands r0, r2 cmp r0, 0 - beq _08126784 + beq @08126784 ldrh r0, [r6] strh r0, [r4] - b _08126794 + b @08126794 .align 2, 0 .pool -_08126784: +@08126784: adds r0, r4, 0 str r2, [sp] bl sub_8126838 @@ -565517,7 +565517,7 @@ _08126784: adds r0, r1 strh r0, [r4] ldr r2, [sp] -_08126794: +@08126794: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -565525,15 +565525,15 @@ _08126794: ldr r0, =0x03006174 ldrb r0, [r0] cmp r5, r0 - bcc _0812675A -_081267A4: + bcc @0812675A +@081267A4: lsls r0, r7, 24 lsrs r2, r0, 24 ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 - bcc _0812672A -_081267B0: + bcc @0812672A +@081267B0: add sp, 0x4 pop {r3} mov r8, r3 @@ -565545,7 +565545,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 @@ -565560,51 +565560,51 @@ sub_81267C4: @ 81267C4 adds r0, r4, 0 ands r0, r1 cmp r0, 0 - beq _081267E8 + beq @081267E8 movs r0, 0x1C ands r0, r4 adds r4, r0, 0x4 -_081267E8: +@081267E8: adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _081267F6 + beq @081267F6 movs r0, 0x1C ands r0, r3 adds r3, r0, 0x4 -_081267F6: +@081267F6: adds r0, r2, 0 ands r0, r1 cmp r0, 0 - beq _08126804 + beq @08126804 movs r0, 0x1C ands r0, r2 adds r2, r0, 0x4 -_08126804: +@08126804: cmp r4, 0x5 - bhi _0812680A + bhi @0812680A movs r4, 0x6 -_0812680A: +@0812680A: cmp r4, 0x1E - bls _08126810 + bls @08126810 movs r4, 0x1E -_08126810: +@08126810: cmp r3, 0x5 - bhi _08126816 + bhi @08126816 movs r3, 0x6 -_08126816: +@08126816: cmp r3, 0x1E - bls _0812681C + bls @0812681C movs r3, 0x1E -_0812681C: +@0812681C: cmp r2, 0x5 - bhi _08126822 + bhi @08126822 movs r2, 0x6 -_08126822: +@08126822: cmp r2, 0x1E - bls _08126828 + bls @08126828 movs r2, 0x1E -_08126828: +@08126828: lsls r0, r2, 10 lsls r1, r3, 5 orrs r0, r1 @@ -565616,7 +565616,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 @@ -565628,124 +565628,124 @@ sub_8126838: @ 8126838 lsrs r0, 26 ands r0, r1 cmp r3, 0xB - bhi _0812685C + bhi @0812685C cmp r2, 0xA - bhi _0812685C + bhi @0812685C cmp r0, 0xA - bhi _0812685C + bhi @0812685C movs r0, 0x1 - b _08126902 -_0812685C: + b @08126902 +@0812685C: cmp r3, 0x13 - bls _08126880 + bls @08126880 cmp r2, 0x13 - bls _08126868 + bls @08126868 cmp r0, 0x13 - bhi _0812688C -_08126868: + bhi @0812688C +@08126868: cmp r3, 0x13 - bls _08126880 + bls @08126880 cmp r2, 0x13 - bls _08126876 + bls @08126876 cmp r0, 0xE - bhi _0812688C - b _081268C4 -_08126876: + bhi @0812688C + b @081268C4 +@08126876: cmp r0, 0x13 - bls _08126880 + bls @08126880 cmp r2, 0xE - bhi _0812688C - b _081268A0 -_08126880: + bhi @0812688C + b @081268A0 +@08126880: cmp r2, 0x13 - bls _08126890 + bls @08126890 cmp r0, 0x13 - bls _08126890 + bls @08126890 cmp r3, 0xE - bls _081268E8 -_0812688C: + bls @081268E8 +@0812688C: movs r0, 0x2 - b _08126902 -_08126890: + b @08126902 +@08126890: cmp r3, 0x13 - bls _081268B4 + bls @081268B4 cmp r2, 0xB - bls _081268A8 + bls @081268A8 cmp r0, 0xB - bls _081268A4 + bls @081268A4 cmp r2, r0 - bcs _081268C4 -_081268A0: + bcs @081268C4 +@081268A0: movs r0, 0x8 - b _08126902 -_081268A4: + b @08126902 +@081268A4: movs r0, 0xA - b _08126902 -_081268A8: + b @08126902 +@081268A8: cmp r0, 0xB - bls _081268B0 + bls @081268B0 movs r0, 0xD - b _08126902 -_081268B0: + b @08126902 +@081268B0: movs r0, 0x4 - b _08126902 -_081268B4: + b @08126902 +@081268B4: cmp r2, 0x13 - bls _081268D8 + bls @081268D8 cmp r3, 0xB - bls _081268CC + bls @081268CC cmp r0, 0xB - bls _081268C8 + bls @081268C8 cmp r3, r0 - bcc _081268E8 -_081268C4: + bcc @081268E8 +@081268C4: movs r0, 0x7 - b _08126902 -_081268C8: + b @08126902 +@081268C8: movs r0, 0xB - b _08126902 -_081268CC: + b @08126902 +@081268CC: cmp r0, 0xB - bls _081268D4 + bls @081268D4 movs r0, 0xE - b _08126902 -_081268D4: + b @08126902 +@081268D4: movs r0, 0x5 - b _08126902 -_081268D8: + b @08126902 +@081268D8: cmp r0, 0x13 - bls _08126900 + bls @08126900 cmp r3, 0xB - bls _081268EC + bls @081268EC cmp r2, 0xB - bls _081268F4 + bls @081268F4 cmp r3, r2 - bcs _081268A0 -_081268E8: + bcs @081268A0 +@081268E8: movs r0, 0x9 - b _08126902 -_081268EC: + b @08126902 +@081268EC: cmp r2, 0xB - bls _081268F4 + bls @081268F4 movs r0, 0xC - b _08126902 -_081268F4: + b @08126902 +@081268F4: cmp r0, 0xB - bls _081268FC + bls @081268FC movs r0, 0xF - b _08126902 -_081268FC: + b @08126902 +@081268FC: movs r0, 0x6 - b _08126902 -_08126900: + b @08126902 +@08126900: movs r0, 0x3 -_08126902: +@08126902: pop {r1} bx r1 thumb_func_end sub_8126838 thumb_func_start sub_8126908 -sub_8126908: @ 8126908 +sub_8126908: ; 8126908 push {lr} ldrh r1, [r0] movs r3, 0x1F @@ -565764,18 +565764,18 @@ sub_8126908: @ 8126908 ands r0, r1 lsls r0, 16 cmp r0, 0 - beq _08126934 + beq @08126934 lsrs r0, 17 - b _08126936 -_08126934: + b @08126936 +@08126934: movs r0, 0x1 -_08126936: +@08126936: pop {r1} bx r1 thumb_func_end sub_8126908 thumb_func_start sub_812693C -sub_812693C: @ 812693C +sub_812693C: ; 812693C push {lr} ldrh r1, [r0] movs r3, 0x1F @@ -565800,23 +565800,23 @@ 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] cmp r0, 0x7 - bhi _0812697E + bhi @0812697E ldr r2, =0x0203a14c ldr r1, =0x0203bc40 lsls r0, 3 adds r0, r1 ldr r0, [r0] str r0, [r2] -_0812697E: +@0812697E: ldr r2, =0x0203a17c ldrb r0, [r2, 0x9] cmp r0, 0 - bne _08126996 + bne @08126996 ldr r0, =0x03005d8c ldr r0, [r0] ldr r3, =0x00001aae @@ -565825,10 +565825,10 @@ _0812697E: ldr r1, =0x00001abe adds r0, r1 str r0, [r2, 0x4] -_08126996: +@08126996: ldrb r0, [r2, 0x9] cmp r0, 0x1 - bne _081269AC + bne @081269AC ldr r0, =0x03005d8c ldr r0, [r0] ldr r3, =0x0000271c @@ -565837,7 +565837,7 @@ _08126996: ldr r1, =0x00002728 adds r0, r1 str r0, [r2, 0x4] -_081269AC: +@081269AC: pop {r0} bx r0 .align 2, 0 @@ -565845,7 +565845,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 @@ -565853,7 +565853,7 @@ sub_81269D4: @ 81269D4 ldr r0, =0x0203a188 adds r4, r1, r0 cmp r1, 0 - bne _08126A28 + bne @08126A28 ldr r0, =0x085a6b90 ldr r1, [r0, 0x4] ldr r0, [r0] @@ -565870,23 +565870,23 @@ sub_81269D4: @ 81269D4 str r1, [sp] lsrs r0, r1, 24 cmp r0, 0x12 - bls _08126A14 + bls @08126A14 adds r0, r2, 0 ands r0, r1 movs r1, 0x90 lsls r1, 21 orrs r0, r1 str r0, [sp] -_08126A14: +@08126A14: mov r0, sp - b _08126A2E + b @08126A2E .align 2, 0 .pool -_08126A28: +@08126A28: lsls r0, r1, 3 ldr r1, =0x085a6b90 adds r0, r1 -_08126A2E: +@08126A2E: bl Window_AddFromTemplate strb r0, [r4] ldrb r0, [r4] @@ -565907,7 +565907,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 @@ -565931,7 +565931,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 @@ -565955,7 +565955,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 @@ -565970,7 +565970,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 @@ -566004,7 +566004,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 @@ -566038,7 +566038,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 @@ -566047,7 +566047,7 @@ sub_8126B80: @ 8126B80 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08126C00 + bne @08126C00 bl GetMenuCursorPos lsls r0, 24 lsrs r4, r0, 24 @@ -566057,10 +566057,10 @@ sub_8126B80: @ 8126B80 movs r0, 0x2 negs r0, r0 cmp r1, r0 - beq _08126BD8 + beq @08126BD8 adds r0, 0x1 cmp r1, r0 - beq _08126BF4 + beq @08126BF4 movs r0, 0x5 bl audio_play ldr r1, =0x085a6b48 @@ -566072,10 +566072,10 @@ sub_8126B80: @ 8126B80 ldr r1, [r0] adds r0, r5, 0 bl _call_via_r1 - b _08126C00 + b @08126C00 .align 2, 0 .pool -_08126BD8: +@08126BD8: bl GetMenuCursorPos ldr r1, =0x0203a150 strb r0, [r1] @@ -566083,24 +566083,24 @@ _08126BD8: asrs r0, 24 ldrb r1, [r1] cmp r0, r1 - beq _08126C00 + beq @08126C00 bl sub_8126C08 - b _08126C00 + b @08126C00 .align 2, 0 .pool -_08126BF4: +@08126BF4: movs r0, 0x5 bl audio_play adds r0, r5, 0 bl sub_8126D6C -_08126C00: +@08126C00: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_8126B80 thumb_func_start sub_8126C08 -sub_8126C08: @ 8126C08 +sub_8126C08: ; 8126C08 push {lr} sub sp, 0x10 movs r0, 0 @@ -566132,14 +566132,14 @@ 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 bl sub_8161B10 lsls r0, 24 cmp r0, 0 - bne _08126C7C + bne @08126C7C ldr r4, =0x02021fc4 ldr r1, =0x085ea83d adds r0, r4, 0 @@ -566148,10 +566148,10 @@ sub_8126C48: @ 8126C48 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC - b _08126C96 + b @08126C96 .align 2, 0 .pool -_08126C7C: +@08126C7C: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -566164,7 +566164,7 @@ _08126C7C: strb r2, [r0] adds r0, r5, 0 bl sub_8126DCC -_08126C96: +@08126C96: pop {r4,r5} pop {r0} bx r0 @@ -566173,7 +566173,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 @@ -566181,7 +566181,7 @@ sub_8126CA4: @ 8126CA4 bl sub_81299AC lsls r0, 24 cmp r0, 0 - bne _08126CD8 + bne @08126CD8 ldr r4, =0x02021fc4 ldr r1, =0x085eaaec adds r0, r4, 0 @@ -566190,10 +566190,10 @@ sub_8126CA4: @ 8126CA4 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC - b _08126D00 + b @08126D00 .align 2, 0 .pool -_08126CD8: +@08126CD8: movs r0, 0 bl sub_8126A58 movs r0, 0 @@ -566211,7 +566211,7 @@ _08126CD8: strh r1, [r0, 0xC] ldr r1, =sub_8129ABC + 1 str r1, [r0] -_08126D00: +@08126D00: pop {r4,r5} pop {r0} bx r0 @@ -566220,14 +566220,14 @@ _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 bl sub_8161B10 lsls r0, 24 cmp r0, 0 - bne _08126D44 + bne @08126D44 ldr r4, =0x02021fc4 ldr r1, =0x085ea83d adds r0, r4, 0 @@ -566236,10 +566236,10 @@ sub_8126D10: @ 8126D10 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC - b _08126D5E + b @08126D5E .align 2, 0 .pool -_08126D44: +@08126D44: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -566252,7 +566252,7 @@ _08126D44: strb r2, [r0] adds r0, r5, 0 bl sub_8126DCC -_08126D5E: +@08126D5E: pop {r4,r5} pop {r0} bx r0 @@ -566261,7 +566261,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 @@ -566270,25 +566270,25 @@ sub_8126D6C: @ 8126D6C ldr r0, =0x0203a17c ldrb r0, [r0, 0x9] cmp r0, 0 - bne _08126D98 + bne @08126D98 ldr r0, =0x0823b4e8 bl script_env_1_execute_new_script adds r0, r4, 0 bl remove_task - b _08126D9E + b @08126D9E .align 2, 0 .pool -_08126D98: +@08126D98: adds r0, r4, 0 bl sub_816B060 -_08126D9E: +@08126D9E: pop {r4} pop {r0} bx r0 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 @@ -566309,7 +566309,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 @@ -566333,7 +566333,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 @@ -566365,7 +566365,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 @@ -566396,7 +566396,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 @@ -566416,26 +566416,26 @@ sub_8126E8C: @ 8126E8C movs r2, 0 mov r8, r2 cmp r0, 0x1 - bne _08126EC0 + bne @08126EC0 movs r2, 0x16 ldrsh r0, [r1, r2] cmp r0, 0 - bne _08126EC0 + bne @08126EC0 movs r0, 0x1 mov r8, r0 -_08126EC0: +@08126EC0: movs r4, 0 lsls r2, r6, 2 mov r9, r2 movs r7, 0xFF -_08126EC8: +@08126EC8: mov r0, r8 cmp r0, 0x1 - bne _08126EF8 + bne @08126EF8 cmp r4, 0x6 - beq _08126EF8 + beq @08126EF8 cmp r4, 0x7 - beq _08126EF8 + beq @08126EF8 lsls r3, r4, 28 lsrs r3, 24 str r0, [sp] @@ -566444,10 +566444,10 @@ _08126EC8: adds r1, r4, 0 movs r2, 0x8 bl sub_8126F68 - b _08126F0C + b @08126F0C .align 2, 0 .pool -_08126EF8: +@08126EF8: lsls r3, r4, 28 lsrs r3, 24 movs r0, 0 @@ -566457,12 +566457,12 @@ _08126EF8: adds r1, r4, 0 movs r2, 0x8 bl sub_8126F68 -_08126F0C: +@08126F0C: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bls _08126EC8 + bls @08126EC8 ldr r0, =0x03005e00 mov r2, r9 adds r1, r2, r6 @@ -566472,9 +566472,9 @@ _08126F0C: ldrsh r0, [r1, r2] ldr r2, =0x085e8cf0 cmp r0, 0x2 - bne _08126F2C + bne @08126F2C ldr r2, =0x085eb7ea -_08126F2C: +@08126F2C: lsls r0, r4, 4 adds r0, 0x1 lsls r0, 24 @@ -566501,7 +566501,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 @@ -566528,10 +566528,10 @@ sub_8126F68: @ 8126F68 movs r0, 0x60 str r0, [sp, 0x14] cmp r7, 0x8 - bne _08126FA2 + bne @08126FA2 movs r2, 0x68 str r2, [sp, 0x14] -_08126FA2: +@08126FA2: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -566612,7 +566612,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 @@ -566620,18 +566620,18 @@ sub_8127058: @ 8127058 ldr r1, =0x085ea7c8 bl gf_strcpy cmp r4, 0x1 - bne _08127078 + bne @08127078 movs r0, 0x4 strb r0, [r5, 0x2] movs r0, 0x5 - b _0812707E + b @0812707E .align 2, 0 .pool -_08127078: +@08127078: movs r0, 0x2 strb r0, [r5, 0x2] movs r0, 0x3 -_0812707E: +@0812707E: strb r0, [r5, 0x5] pop {r4,r5} pop {r0} @@ -566639,7 +566639,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 @@ -566648,7 +566648,7 @@ sub_8127088: @ 8127088 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081270DE + bne @081270DE bl ProcessMenuInput lsls r0, 24 lsrs r4, r0, 24 @@ -566656,32 +566656,32 @@ sub_8127088: @ 8127088 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _081270C0 + beq @081270C0 cmp r1, r0 - bgt _081270BC + bgt @081270BC subs r0, 0x1 cmp r1, r0 - beq _081270DE - b _081270CE + beq @081270DE + b @081270CE .align 2, 0 .pool -_081270BC: +@081270BC: cmp r1, 0x8 - bne _081270CE -_081270C0: + bne @081270CE +@081270C0: movs r0, 0x5 bl audio_play adds r0, r5, 0 bl sub_812719C - b _081270DE -_081270CE: + b @081270DE +@081270CE: movs r0, 0x5 bl audio_play ldr r0, =0x0203a173 strb r4, [r0] adds r0, r5, 0 bl sub_81270E8 -_081270DE: +@081270DE: pop {r4,r5} pop {r0} bx r0 @@ -566690,7 +566690,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 @@ -566701,7 +566701,7 @@ sub_81270E8: @ 81270E8 strb r0, [r1] lsls r0, 24 cmp r0, 0 - beq _08127154 + beq @08127154 ldrb r0, [r4] bl sub_8161A38 ldr r2, =0x0203a14c @@ -566725,10 +566725,10 @@ sub_81270E8: @ 81270E8 adds r0, r1 ldr r1, =sub_8127620 + 1 str r1, [r0] - b _0812716E + b @0812716E .align 2, 0 .pool -_08127154: +@08127154: movs r0, 0x1 bl sub_8126A58 ldr r4, =0x02021fc4 @@ -566739,7 +566739,7 @@ _08127154: adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC -_0812716E: +@0812716E: pop {r4,r5} pop {r0} bx r0 @@ -566748,7 +566748,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 @@ -566764,7 +566764,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 @@ -566776,22 +566776,22 @@ sub_812719C: @ 812719C movs r1, 0x1E ldrsh r0, [r0, r1] cmp r0, 0x2 - beq _081271C0 + beq @081271C0 adds r0, r2, 0 bl sub_81271CC - b _081271C6 + b @081271C6 .align 2, 0 .pool -_081271C0: +@081271C0: adds r0, r2, 0 bl sub_8127268 -_081271C6: +@081271C6: pop {r0} bx r0 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 @@ -566818,7 +566818,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 @@ -566850,7 +566850,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, =0x085a6b28 @@ -566865,7 +566865,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 @@ -566880,7 +566880,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] @@ -566895,19 +566895,19 @@ sub_8127284: @ 8127284 adds r1, r0, r1 ldrb r1, [r1] cmp r1, 0x8 - bls _081272B8 + bls @081272B8 ldr r2, =0x00000521 adds r1, r0, r2 movs r0, 0x8 strb r0, [r1] - b _081272BE + b @081272BE .align 2, 0 .pool -_081272B8: +@081272B8: ldr r2, =0x00000521 adds r0, r2 strb r1, [r0] -_081272BE: +@081272BE: pop {r0} bx r0 .align 2, 0 @@ -566915,7 +566915,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 @@ -566936,7 +566936,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 @@ -566961,7 +566961,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 @@ -566976,26 +566976,26 @@ sub_8127330: @ 8127330 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bls _08127378 + bls @08127378 ldr r0, =0x0203a17c ldrb r0, [r0, 0x9] cmp r0, 0x1 - bne _08127378 + bne @08127378 movs r2, 0x16 ldrsh r0, [r1, r2] cmp r0, 0 - bne _08127378 + bne @08127378 ldr r0, =0x02021cc4 movs r1, 0x1 bl sub_8127058 - b _08127380 + b @08127380 .align 2, 0 .pool -_08127378: +@08127378: ldr r0, =0x02021cc4 movs r1, 0 bl sub_8127058 -_08127380: +@08127380: movs r6, 0 ldr r1, =0x0203a18c ldr r0, [r1] @@ -567005,9 +567005,9 @@ _08127380: ldrb r0, [r0] subs r0, 0x1 cmp r6, r0 - bge _081273D6 + bge @081273D6 adds r5, r1, 0 -_08127396: +@08127396: lsls r4, r6, 1 adds r4, r6 lsls r4, 3 @@ -567038,8 +567038,8 @@ _08127396: ldrb r0, [r1] subs r0, 0x1 cmp r6, r0 - blt _08127396 -_081273D6: + blt @08127396 +@081273D6: ldr r5, =0x0203a18c lsls r4, r6, 1 adds r4, r6 @@ -567090,7 +567090,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 @@ -567111,16 +567111,16 @@ 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 lsrs r1, 24 cmp r1, 0x1 - beq _08127492 + beq @08127492 movs r0, 0x5 bl audio_play -_08127492: +@08127492: adds r0, r4, 0 bl sub_8127744 pop {r4} @@ -567129,7 +567129,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} @@ -567142,7 +567142,7 @@ sub_81274A0: @ 81274A0 movs r0, 0x2 negs r0, r0 cmp r1, r0 - beq _081274F6 + beq @081274F6 adds r0, r1, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -567151,26 +567151,26 @@ sub_81274A0: @ 81274A0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081274DC + bne @081274DC adds r3, r5, 0x2 adds r0, r6, 0 movs r1, 0x18 movs r2, 0x5C bl sub_819A2F8 - b _081274F6 -_081274DC: + b @081274F6 +@081274DC: adds r0, r4, 0 bl sub_81277E8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081274F6 + bne @081274F6 adds r3, r7, 0x2 mov r0, r8 movs r1, 0x19 movs r2, 0x5C bl sub_819A2F8 -_081274F6: +@081274F6: pop {r3} mov r8, r3 pop {r4-r7} @@ -567179,7 +567179,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 @@ -567188,7 +567188,7 @@ sub_8127500: @ 8127500 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0xFF - bne _08127540 + bne @08127540 subs r2, 0x2 adds r0, r1, r2 ldrb r0, [r0] @@ -567211,7 +567211,7 @@ sub_8127500: @ 8127500 ldr r2, =0x00000522 adds r1, r2 strb r0, [r1] -_08127540: +@08127540: add sp, 0x10 pop {r4} pop {r0} @@ -567221,7 +567221,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] @@ -567229,14 +567229,14 @@ sub_8127554: @ 8127554 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xFF - beq _08127572 + beq @08127572 bl sub_81AF620 ldr r0, [r4] ldr r1, =0x00000522 adds r0, r1 movs r1, 0xFF strb r1, [r0] -_08127572: +@08127572: pop {r4} pop {r0} bx r0 @@ -567245,7 +567245,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 @@ -567260,7 +567260,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 @@ -567306,7 +567306,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 @@ -567328,7 +567328,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} @@ -567344,7 +567344,7 @@ sub_812764C: @ 812764C movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08127700 + bne @08127700 ldrb r0, [r5, 0x1A] bl sub_81AE604 adds r4, r0, 0 @@ -567358,14 +567358,14 @@ sub_812764C: @ 812764C movs r0, 0x2 negs r0, r0 cmp r4, r0 - beq _081276A4 + beq @081276A4 adds r0, 0x1 cmp r4, r0 - bne _081276C4 - b _08127700 + bne @081276C4 + b @08127700 .align 2, 0 .pool -_081276A4: +@081276A4: movs r0, 0x5 bl audio_play ldr r0, =0x085a6b78 @@ -567377,10 +567377,10 @@ _081276A4: ldr r1, [r1] adds r0, r6, 0 bl _call_via_r1 - b _08127700 + b @08127700 .align 2, 0 .pool -_081276C4: +@081276C4: movs r0, 0x5 bl audio_play ldr r0, =0x0203a172 @@ -567404,7 +567404,7 @@ _081276C4: ldr r1, [r0] adds r0, r6, 0 bl _call_via_r1 -_08127700: +@08127700: pop {r3} mov r8, r3 pop {r4-r7} @@ -567415,7 +567415,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 @@ -567439,7 +567439,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 @@ -567451,12 +567451,12 @@ sub_8127744: @ 8127744 ldr r0, =0x0203a151 ldrb r0, [r0] cmp r4, r0 - bcc _08127770 + bcc @08127770 ldr r2, =0x085e8d62 - b _08127782 + b @08127782 .align 2, 0 .pool -_08127770: +@08127770: ldr r1, =0x085a5c08 ldr r0, =0x0203a14c ldr r0, [r0] @@ -567466,7 +567466,7 @@ _08127770: adds r1, 0x18 adds r0, r1 ldr r2, [r0] -_08127782: +@08127782: movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -567485,7 +567485,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 @@ -567496,63 +567496,63 @@ 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 movs r1, 0 ldr r3, =0x0203a152 -_081277C6: +@081277C6: adds r0, r1, r3 ldrb r0, [r0] cmp r0, r2 - bne _081277D8 + bne @081277D8 movs r0, 0x1 - b _081277E4 + b @081277E4 .align 2, 0 .pool -_081277D8: +@081277D8: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xF - bls _081277C6 + bls @081277C6 movs r0, 0 -_081277E4: +@081277E4: pop {r1} bx r1 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 movs r1, 0 ldr r3, =0x0203a162 -_081277F2: +@081277F2: adds r0, r1, r3 ldrb r0, [r0] cmp r0, r2 - bne _08127804 + bne @08127804 movs r0, 0x1 - b _08127810 + b @08127810 .align 2, 0 .pool -_08127804: +@08127804: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xB - bls _081277F2 + bls @081277F2 movs r0, 0 -_08127810: +@08127810: pop {r1} bx r1 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 @@ -567574,14 +567574,14 @@ sub_8127814: @ 8127814 mov r9, r1 ldr r3, =0x0203a173 mov r8, r3 -_08127842: +@08127842: mov r1, r10 ldr r0, [r1] add r0, r9 adds r0, r6 ldrb r0, [r0] cmp r0, 0 - beq _081278E2 + beq @081278E2 movs r2, 0 mov r3, r8 ldrb r0, [r3] @@ -567590,11 +567590,11 @@ _08127842: adds r0, r1 ldrb r0, [r0, 0x4] cmp r2, r0 - bcs _081278E2 + bcs @081278E2 ldr r7, =0x0203a152 adds r3, r1, 0 mov r12, r3 -_08127868: +@08127868: ldr r0, =0x0203a14c ldr r1, [r0] adds r1, r2 @@ -567606,37 +567606,37 @@ _08127868: adds r4, r2, 0x1 ldrb r0, [r0] cmp r1, r0 - bne _081278D0 + bne @081278D0 movs r1, 0 cmp r1, r5 - bcs _081278A2 + bcs @081278A2 ldrb r0, [r7] cmp r0, r4 - beq _081278A2 + beq @081278A2 ldr r3, =0x0203a152 adds r2, r4, 0 -_08127890: +@08127890: adds r0, r1, 0x1 lsls r0, 16 lsrs r1, r0, 16 cmp r1, r5 - bcs _081278A2 + bcs @081278A2 adds r0, r1, r3 ldrb r0, [r0] cmp r0, r2 - bne _08127890 -_081278A2: + bne @08127890 +@081278A2: cmp r1, r5 - bne _081278D0 + bne @081278D0 adds r0, r5, r7 strb r4, [r0] adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 - b _081278E2 + b @081278E2 .align 2, 0 .pool -_081278D0: +@081278D0: lsls r0, r4, 16 lsrs r2, r0, 16 mov r1, r8 @@ -567645,18 +567645,18 @@ _081278D0: add r0, r12 ldrb r0, [r0, 0x4] cmp r2, r0 - bcc _08127868 -_081278E2: + bcc @08127868 +@081278E2: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0xF - bls _08127842 + bls @08127842 movs r5, 0 movs r6, 0 ldr r3, =0x0203bc40 mov r8, r3 -_081278F4: +@081278F4: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x0000271c @@ -567665,12 +567665,12 @@ _081278F4: ldrb r0, [r0] adds r7, r6, 0x1 cmp r0, 0 - beq _0812799A + beq @0812799A movs r2, 0 - b _0812798C + b @0812798C .align 2, 0 .pool -_08127918: +@08127918: ldr r0, =0x0203a14c ldr r1, [r0] adds r1, r2 @@ -567683,61 +567683,61 @@ _08127918: adds r4, r2, 0x1 ldrb r0, [r0] cmp r1, r0 - bne _08127988 + bne @08127988 lsls r0, r4, 24 lsrs r0, 24 bl sub_81277BC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08127988 + beq @08127988 movs r1, 0 cmp r1, r5 - bcs _08127966 + bcs @08127966 ldr r2, =0x0203a162 ldrb r0, [r2] cmp r0, r4 - beq _08127966 + beq @08127966 adds r3, r2, 0 adds r2, r4, 0 -_08127954: +@08127954: adds r0, r1, 0x1 lsls r0, 16 lsrs r1, r0, 16 cmp r1, r5 - bcs _08127966 + bcs @08127966 adds r0, r1, r3 ldrb r0, [r0] cmp r0, r2 - bne _08127954 -_08127966: + bne @08127954 +@08127966: cmp r1, r5 - bne _08127988 + bne @08127988 ldr r0, =0x0203a162 adds r0, r5, r0 strb r4, [r0] adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 - b _0812799A + b @0812799A .align 2, 0 .pool -_08127988: +@08127988: lsls r0, r4, 16 lsrs r2, r0, 16 -_0812798C: +@0812798C: ldr r0, =0x0203a173 ldrb r0, [r0] lsls r0, 3 add r0, r8 ldrb r0, [r0, 0x4] cmp r2, r0 - bcc _08127918 -_0812799A: + bcc @08127918 +@0812799A: lsls r0, r7, 16 lsrs r6, r0, 16 cmp r6, 0xB - bls _081278F4 + bls @081278F4 pop {r3-r5} mov r8, r3 mov r9, r4 @@ -567750,7 +567750,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 @@ -567760,7 +567760,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 @@ -567771,37 +567771,37 @@ sub_81279C4: @ 81279C4 adds r1, r0, 0x1 ldr r4, =0x0203a152 ldr r3, =0x0203a162 -_081279D8: +@081279D8: adds r0, r2, r4 ldrb r0, [r0] cmp r0, r1 - beq _081279EC + beq @081279EC cmp r2, 0xB - bhi _08127A00 + bhi @08127A00 adds r0, r2, r3 ldrb r0, [r0] cmp r0, r1 - bne _08127A00 -_081279EC: + bne @08127A00 +@081279EC: movs r0, 0 - b _08127A0C + b @08127A0C .align 2, 0 .pool -_08127A00: +@08127A00: adds r0, r2, 0x1 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0xF - bls _081279D8 + bls @081279D8 movs r0, 0x1 -_08127A0C: +@08127A0C: pop {r4} pop {r1} bx r1 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 @@ -567816,7 +567816,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 @@ -567839,7 +567839,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 @@ -567848,7 +567848,7 @@ sub_8127A5C: @ 8127A5C movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _08127A82 + beq @08127A82 movs r0, 0 movs r1, 0 bl sub_8197434 @@ -567856,7 +567856,7 @@ sub_8127A5C: @ 8127A5C bl sub_81269D4 adds r0, r4, 0 bl sub_8127620 -_08127A82: +@08127A82: pop {r4} pop {r0} bx r0 @@ -567865,7 +567865,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 @@ -567894,7 +567894,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 @@ -567922,7 +567922,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 @@ -567960,7 +567960,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 @@ -567968,24 +567968,24 @@ sub_8127B54: @ 8127B54 lsrs r1, 24 ldr r0, =0x0000ffff cmp r2, 0x22 - beq _08127B7C + beq @08127B7C cmp r2, 0x26 - bne _08127B86 + bne @08127B86 ldr r0, =0x085a72e4 adds r0, r1, r0 ldrb r0, [r0] lsls r0, 28 lsrs r0, 16 - b _08127B86 + b @08127B86 .align 2, 0 .pool -_08127B7C: +@08127B7C: ldr r0, =0x085a72ec adds r0, r1, r0 ldrb r0, [r0] lsls r0, 28 lsrs r0, 16 -_08127B86: +@08127B86: pop {r1} bx r1 .align 2, 0 @@ -567993,7 +567993,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 @@ -568019,13 +568019,13 @@ sub_8127B90: @ 8127B90 movs r2, 0 lsls r0, r3, 16 cmp r2, r3 - bcc _08127BC6 - b _08127D28 -_08127BC6: + bcc @08127BC6 + b @08127D28 +@08127BC6: ldr r1, [sp, 0x8] str r1, [sp, 0x28] str r0, [sp, 0x2C] -_08127BCC: +@08127BCC: ldr r3, [sp, 0x4] ldr r4, [sp, 0xC] subs r1, r3, r4 @@ -568042,9 +568042,9 @@ _08127BCC: str r1, [sp, 0x30] ldr r3, [sp, 0x28] cmp r10, r3 - bcc _08127BF0 - b _08127D18 -_08127BF0: + bcc @08127BF0 + b @08127D18 +@08127BF0: ldr r4, [sp, 0x10] lsls r4, 5 str r4, [sp, 0x18] @@ -568058,7 +568058,7 @@ _08127BF0: adds r1, r2, 0 muls r1, r3 str r1, [sp, 0x20] -_08127C0A: +@08127C0A: ldr r0, [sp] add r0, r10 lsls r0, 16 @@ -568084,25 +568084,25 @@ _08127C0A: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08127C50 + beq @08127C50 ldr r3, [sp, 0x24] ldrb r0, [r3, 0x11] cmp r0, 0x1 - beq _08127C60 + beq @08127C60 lsrs r0, r4, 28 cmp r0, 0 - beq _08127C60 -_08127C50: + beq @08127C60 +@08127C50: movs r4, 0xC0 lsls r4, 4 mov r8, r4 - b _08127C64 + b @08127C64 .align 2, 0 .pool -_08127C60: +@08127C60: movs r0, 0 mov r8, r0 -_08127C64: +@08127C64: ldr r1, [sp, 0x24] ldrb r0, [r1, 0x11] lsls r7, r5, 16 @@ -568110,7 +568110,7 @@ _08127C64: lsls r2, 16 mov r9, r2 cmp r0, 0x3 - beq _08127C8E + beq @08127C8E asrs r0, r7, 16 asrs r1, r2, 16 bl cur_mapdata_block_get_role_at @@ -568121,10 +568121,10 @@ _08127C64: lsrs r0, 24 movs r6, 0x1 cmp r0, 0x1 - beq _08127C90 -_08127C8E: + beq @08127C90 +@08127C8E: movs r6, 0 -_08127C90: +@08127C90: ldr r3, [sp, 0x18] ldr r4, =0x085a5c08 adds r0, r3, r4 @@ -568138,7 +568138,7 @@ _08127C90: lsrs r5, r0, 16 ldr r0, =0x0000ffff cmp r5, r0 - beq _08127CE0 + beq @08127CE0 asrs r0, r7, 16 mov r2, r9 asrs r1, r2, 16 @@ -568158,10 +568158,10 @@ _08127C90: lsls r2, r3, 16 lsrs r2, 16 bl sub_8088338 - b _08127D06 + b @08127D06 .align 2, 0 .pool -_08127CE0: +@08127CE0: asrs r0, r7, 16 mov r2, r9 asrs r1, r2, 16 @@ -568180,7 +568180,7 @@ _08127CE0: lsls r2, r3, 16 lsrs r2, 16 bl setmaptile_0 -_08127D06: +@08127D06: mov r0, r10 adds r0, 0x1 lsls r0, 16 @@ -568188,18 +568188,18 @@ _08127D06: mov r10, r0 ldr r4, [sp, 0x28] cmp r10, r4 - bcs _08127D18 - b _08127C0A -_08127D18: + bcs @08127D18 + b @08127C0A +@08127D18: ldr r1, [sp, 0x30] lsls r0, r1, 16 lsrs r2, r0, 16 ldr r3, [sp, 0x2C] lsrs r0, r3, 16 cmp r2, r0 - bcs _08127D28 - b _08127BCC -_08127D28: + bcs @08127D28 + b @08127BCC +@08127D28: add sp, 0x34 pop {r3-r5} mov r8, r3 @@ -568211,7 +568211,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 @@ -568225,99 +568225,99 @@ sub_8127D38: @ 8127D38 adds r0, r1 ldrb r0, [r0, 0x12] cmp r0, 0x9 - bhi _08127E10 + bhi @08127E10 lsls r0, 2 - ldr r1, =_08127D68 + ldr r1, =@08127D68 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08127D68: - .4byte _08127D90 - .4byte _08127D9A - .4byte _08127DA4 - .4byte _08127DB4 - .4byte _08127DBE - .4byte _08127DC8 - .4byte _08127DD8 - .4byte _08127DE2 - .4byte _08127DF2 - .4byte _08127E02 -_08127D90: +@08127D68: + .4byte @08127D90 + .4byte @08127D9A + .4byte @08127DA4 + .4byte @08127DB4 + .4byte @08127DBE + .4byte @08127DC8 + .4byte @08127DD8 + .4byte @08127DE2 + .4byte @08127DF2 + .4byte @08127E02 +@08127D90: str r2, [sp] adds r0, r3, 0 adds r1, r4, 0 movs r2, 0x1 - b _08127DAC -_08127D9A: + b @08127DAC +@08127D9A: str r2, [sp] adds r0, r3, 0 adds r1, r4, 0 movs r2, 0x2 - b _08127DAC -_08127DA4: + b @08127DAC +@08127DA4: str r2, [sp] adds r0, r3, 0 adds r1, r4, 0 movs r2, 0x3 -_08127DAC: +@08127DAC: movs r3, 0x1 bl sub_8127B90 - b _08127E10 -_08127DB4: + b @08127E10 +@08127DB4: str r2, [sp] adds r0, r3, 0 adds r1, r4, 0 movs r2, 0x4 - b _08127DD0 -_08127DBE: + b @08127DD0 +@08127DBE: str r2, [sp] adds r0, r3, 0 adds r1, r4, 0 movs r2, 0x2 - b _08127DD0 -_08127DC8: + b @08127DD0 +@08127DC8: str r2, [sp] adds r0, r3, 0 adds r1, r4, 0 movs r2, 0x1 -_08127DD0: +@08127DD0: movs r3, 0x2 bl sub_8127B90 - b _08127E10 -_08127DD8: + b @08127E10 +@08127DD8: str r2, [sp] adds r0, r3, 0 adds r1, r4, 0 movs r2, 0x1 - b _08127DFA -_08127DE2: + b @08127DFA +@08127DE2: str r2, [sp] adds r0, r3, 0 adds r1, r4, 0 movs r2, 0x2 movs r3, 0x4 bl sub_8127B90 - b _08127E10 -_08127DF2: + b @08127E10 +@08127DF2: str r2, [sp] adds r0, r3, 0 adds r1, r4, 0 movs r2, 0x3 -_08127DFA: +@08127DFA: movs r3, 0x3 bl sub_8127B90 - b _08127E10 -_08127E02: + b @08127E10 +@08127E02: str r2, [sp] adds r0, r3, 0 adds r1, r4, 0 movs r2, 0x3 movs r3, 0x2 bl sub_8127B90 -_08127E10: +@08127E10: add sp, 0x4 pop {r4} pop {r0} @@ -568325,7 +568325,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 @@ -568340,7 +568340,7 @@ sub_8127E18: @ 8127E18 mov r10, r1 ldr r2, =0x03005d8c mov r9, r2 -_08127E34: +@08127E34: adds r5, r6, 0 adds r5, 0xAE adds r4, r5, 0 @@ -568349,28 +568349,28 @@ _08127E34: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08127F1C + bne @08127F1C adds r0, r4, 0 bl flag_clear movs r2, 0 ldr r0, [r7, 0x4] ldrb r4, [r0] cmp r2, r4 - bcs _08127E82 + bcs @08127E82 ldr r0, [r0, 0x4] ldrh r0, [r0, 0x14] cmp r0, r5 - beq _08127E82 + beq @08127E82 ldr r0, =0x02037318 ldr r3, [r0, 0x4] ldrb r6, [r3] adds r4, r5, 0 -_08127E68: +@08127E68: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, r6 - bcs _08127E82 + bcs @08127E82 ldr r0, [r3, 0x4] lsls r1, r2, 1 adds r1, r2 @@ -568378,8 +568378,8 @@ _08127E68: adds r1, r0 ldrh r0, [r1, 0x14] cmp r0, r4 - bne _08127E68 -_08127E82: + bne @08127E68 +@08127E82: ldr r0, [r7, 0x4] ldr r1, [r0, 0x4] lsls r4, r2, 1 @@ -568433,16 +568433,16 @@ _08127E82: ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] bl sub_808F254 - b _08127F26 + b @08127F26 .align 2, 0 .pool -_08127F1C: +@08127F1C: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0xD - bls _08127E34 -_08127F26: + bls @08127E34 +@08127F26: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -568454,51 +568454,51 @@ _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 ldrb r2, [r0, 0x8] cmp r1, r2 - bcs _08127F62 + bcs @08127F62 ldr r3, [r0] -_08127F46: +@08127F46: adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0 - bne _08127F58 + bne @08127F58 movs r0, 0x1 - b _08127F64 + b @08127F64 .align 2, 0 .pool -_08127F58: +@08127F58: adds r0, r1, 0x1 lsls r0, 16 lsrs r1, r0, 16 cmp r1, r2 - bcc _08127F46 -_08127F62: + bcc @08127F46 +@08127F62: movs r0, 0 -_08127F64: +@08127F64: pop {r1} bx r1 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 ldr r0, =0x0203a17c ldrb r0, [r0, 0x9] cmp r0, 0x1 - bne _08127FAC + bne @08127FAC ldr r0, =0x0203a173 ldrb r0, [r0] cmp r0, 0x6 - beq _08127FAC + beq @08127FAC cmp r0, 0x7 - beq _08127FAC + beq @08127FAC ldr r4, =0x02021fc4 ldr r1, =0x085ea9ae adds r0, r4, 0 @@ -568507,20 +568507,20 @@ sub_8127F68: @ 8127F68 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC - b _0812804C + b @0812804C .align 2, 0 .pool -_08127FAC: +@08127FAC: bl sub_81279C4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08128038 + bne @08128038 bl sub_8127F38 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08127FE8 + bne @08127FE8 movs r0, 0x1 movs r1, 0 bl fade_screen @@ -568533,10 +568533,10 @@ _08127FAC: strh r1, [r0, 0xC] ldr r1, =sub_8128060 + 1 str r1, [r0] - b _0812804C + b @0812804C .align 2, 0 .pool -_08127FE8: +@08127FE8: ldr r0, =0x02021cc4 ldr r4, =0x0203a17c ldrb r1, [r4, 0x8] @@ -568545,26 +568545,26 @@ _08127FE8: bl decimal_int_to_string ldrb r0, [r4, 0x9] cmp r0, 0 - bne _08128018 + bne @08128018 ldr r0, =0x02021fc4 ldr r1, =0x085ea8ea bl ExpandTextCodes - b _08128020 + b @08128020 .align 2, 0 .pool -_08128018: +@08128018: ldr r0, =0x02021fc4 ldr r1, =0x085ea931 bl ExpandTextCodes -_08128020: +@08128020: ldr r1, =0x02021fc4 ldr r2, =sub_8127A5C + 1 adds r0, r5, 0 bl sub_81978EC - b _0812804C + b @0812804C .align 2, 0 .pool -_08128038: +@08128038: ldr r4, =0x02021fc4 ldr r1, =0x085ea8d2 adds r0, r4, 0 @@ -568573,7 +568573,7 @@ _08128038: adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC -_0812804C: +@0812804C: pop {r4,r5} pop {r0} bx r0 @@ -568582,7 +568582,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 @@ -568594,33 +568594,33 @@ sub_8128060: @ 8128060 movs r1, 0xC ldrsh r0, [r7, r1] cmp r0, 0x1 - beq _081280AC + beq @081280AC cmp r0, 0x1 - bgt _08128088 + bgt @08128088 cmp r0, 0 - beq _0812808E - b _08128112 + beq @0812808E + b @08128112 .align 2, 0 .pool -_08128088: +@08128088: cmp r0, 0x2 - beq _081280FC - b _08128112 -_0812808E: + beq @081280FC + b @08128112 +@0812808E: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08128112 + bne @08128112 adds r0, r6, 0 bl sub_8127ACC movs r0, 0x1 strh r0, [r7, 0xC] - b _08128112 + b @08128112 .align 2, 0 .pool -_081280AC: +@081280AC: ldr r4, =0x02037fd4 ldrb r0, [r4, 0x8] movs r1, 0x80 @@ -568647,27 +568647,27 @@ _081280AC: strb r0, [r4, 0x8] movs r0, 0x2 strh r0, [r7, 0xC] - b _08128112 + b @08128112 .align 2, 0 .pool -_081280FC: +@081280FC: bl sub_80ABDFC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08128112 + bne @08128112 movs r0, 0 strh r0, [r7, 0x20] adds r0, r6, 0 bl sub_8128FD8 -_08128112: +@08128112: pop {r4-r7} pop {r0} bx r0 thumb_func_end sub_8128060 thumb_func_start sub_8128118 -sub_8128118: @ 8128118 +sub_8128118: ; 8128118 push {r4-r6,lr} adds r6, r0, 0 lsls r1, 24 @@ -568734,7 +568734,7 @@ sub_8128118: @ 8128118 thumb_func_end sub_8128118 thumb_func_start sub_81281A8 -sub_81281A8: @ 81281A8 +sub_81281A8: ; 81281A8 push {r4,lr} sub sp, 0x4 lsls r0, 24 @@ -568759,34 +568759,34 @@ sub_81281A8: @ 81281A8 lsls r0, 24 lsrs r2, r0, 24 cmp r4, 0x2 - beq _081281E2 + beq @081281E2 cmp r4, 0x8 - beq _081281E2 + beq @081281E2 cmp r4, 0x9 - bne _081281EA -_081281E2: + bne @081281EA +@081281E2: adds r0, r2, 0 subs r0, 0x8 lsls r0, 24 lsrs r2, r0, 24 -_081281EA: +@081281EA: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - bne _0812820C + bne @0812820C ldr r1, =nullsub_12 + 1 str r0, [sp] movs r0, 0xC1 - b _08128214 + b @08128214 .align 2, 0 .pool -_0812820C: +@0812820C: ldr r1, =nullsub_12 + 1 movs r0, 0 str r0, [sp] movs r0, 0xC2 -_08128214: +@08128214: movs r3, 0x48 bl sub_808DD68 ldr r1, =0x0203aa39 @@ -568824,7 +568824,7 @@ _08128214: thumb_func_end sub_81281A8 thumb_func_start sub_812826C -sub_812826C: @ 812826C +sub_812826C: ; 812826C push {lr} lsls r0, 24 lsrs r3, r0, 24 @@ -568839,39 +568839,39 @@ sub_812826C: @ 812826C adds r0, r2 ldrb r0, [r0, 0x12] cmp r0, 0x9 - bls _0812828C - b _081283B2 -_0812828C: + bls @0812828C + b @081283B2 +@0812828C: lsls r0, 2 - ldr r1, =_081282A8 + ldr r1, =@081282A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081282A8: - .4byte _081282D0 - .4byte _081282E4 - .4byte _081282FC - .4byte _08128314 - .4byte _08128328 - .4byte _0812833C - .4byte _08128350 - .4byte _08128370 - .4byte _08128388 - .4byte _081283A0 -_081282D0: +@081282A8: + .4byte @081282D0 + .4byte @081282E4 + .4byte @081282FC + .4byte @08128314 + .4byte @08128328 + .4byte @0812833C + .4byte @08128350 + .4byte @08128370 + .4byte @08128388 + .4byte @081283A0 +@081282D0: ldr r0, =0x03005e00 lsls r1, r3, 2 adds r1, r3 lsls r1, 3 adds r1, r0 movs r0, 0x1 - b _08128394 + b @08128394 .align 2, 0 .pool -_081282E4: +@081282E4: ldr r1, =0x03005e00 lsls r0, r3, 2 adds r0, r3 @@ -568880,10 +568880,10 @@ _081282E4: movs r1, 0x2 strh r1, [r0, 0x12] movs r1, 0x1 - b _081283B0 + b @081283B0 .align 2, 0 .pool -_081282FC: +@081282FC: ldr r1, =0x03005e00 lsls r0, r3, 2 adds r0, r3 @@ -568892,40 +568892,40 @@ _081282FC: movs r1, 0x3 strh r1, [r0, 0x12] movs r1, 0x1 - b _081283B0 + b @081283B0 .align 2, 0 .pool -_08128314: +@08128314: ldr r1, =0x03005e00 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 adds r0, r1 movs r1, 0x4 - b _081283AC + b @081283AC .align 2, 0 .pool -_08128328: +@08128328: ldr r0, =0x03005e00 lsls r1, r3, 2 adds r1, r3 lsls r1, 3 adds r1, r0 movs r0, 0x2 - b _08128394 + b @08128394 .align 2, 0 .pool -_0812833C: +@0812833C: ldr r1, =0x03005e00 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 adds r0, r1 movs r1, 0x1 - b _081283AC + b @081283AC .align 2, 0 .pool -_08128350: +@08128350: ldr r0, =0x03005e00 lsls r1, r3, 2 adds r1, r3 @@ -568938,10 +568938,10 @@ _08128350: ldrh r0, [r1, 0xA] adds r0, 0x1 strh r0, [r1, 0xA] - b _081283B2 + b @081283B2 .align 2, 0 .pool -_08128370: +@08128370: ldr r1, =0x03005e00 lsls r0, r3, 2 adds r0, r3 @@ -568950,35 +568950,35 @@ _08128370: movs r1, 0x2 strh r1, [r0, 0x12] movs r1, 0x4 - b _081283B0 + b @081283B0 .align 2, 0 .pool -_08128388: +@08128388: ldr r0, =0x03005e00 lsls r1, r3, 2 adds r1, r3 lsls r1, 3 adds r1, r0 movs r0, 0x3 -_08128394: +@08128394: strh r0, [r1, 0x12] strh r0, [r1, 0x14] - b _081283B2 + b @081283B2 .align 2, 0 .pool -_081283A0: +@081283A0: ldr r1, =0x03005e00 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 adds r0, r1 movs r1, 0x3 -_081283AC: +@081283AC: strh r1, [r0, 0x12] movs r1, 0x2 -_081283B0: +@081283B0: strh r1, [r0, 0x14] -_081283B2: +@081283B2: pop {r0} bx r0 .align 2, 0 @@ -568986,7 +568986,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 @@ -569025,7 +569025,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 @@ -569070,7 +569070,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 @@ -569080,22 +569080,22 @@ sub_8128484: @ 8128484 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0812849E + bne @0812849E cmp r4, 0 - beq _081284A2 -_0812849E: + beq @081284A2 +@0812849E: movs r0, 0 - b _081284A4 -_081284A2: + b @081284A4 +@081284A2: movs r0, 0x1 -_081284A4: +@081284A4: pop {r4} pop {r1} bx r1 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 @@ -569114,30 +569114,30 @@ sub_81284AC: @ 81284AC ldrsh r0, [r2, r3] adds r0, 0x7 cmp r1, r0 - bne _081284EC + bne @081284EC lsls r1, r4, 16 asrs r1, 16 movs r3, 0x10 ldrsh r0, [r2, r3] adds r0, 0x7 cmp r1, r0 - bne _081284EC + bne @081284EC cmp r5, 0 - beq _081284EC + beq @081284EC movs r0, 0 - b _081284EE + b @081284EE .align 2, 0 .pool -_081284EC: +@081284EC: movs r0, 0x1 -_081284EE: +@081284EE: pop {r4,r5} pop {r1} bx r1 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 @@ -569149,36 +569149,36 @@ sub_81284F4: @ 81284F4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08128534 + beq @08128534 ldrb r0, [r5] cmp r0, 0x21 - bne _08128522 + bne @08128522 adds r0, r4, 0 bl sub_8089378 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08128530 -_08128522: + beq @08128530 +@08128522: lsls r0, r6, 24 lsrs r0, 24 bl sub_8089314 lsls r0, 24 cmp r0, 0 - beq _08128534 -_08128530: + beq @08128534 +@08128530: movs r0, 0x1 - b _08128536 -_08128534: + b @08128536 +@08128534: movs r0, 0 -_08128536: +@08128536: pop {r4-r6} pop {r1} bx r1 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 @@ -569202,34 +569202,34 @@ sub_812853C: @ 812853C ldrb r0, [r3, 0x11] adds r2, r1, 0 cmp r0, 0x4 - bls _0812856E - b _0812893C -_0812856E: + bls @0812856E + b @0812893C +@0812856E: lsls r0, 2 - ldr r1, =_08128580 + ldr r1, =@08128580 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08128580: - .4byte _08128594 - .4byte _08128594 - .4byte _08128680 - .4byte _08128834 - .4byte _081288B8 -_08128594: +@08128580: + .4byte @08128594 + .4byte @08128594 + .4byte @08128680 + .4byte @08128834 + .4byte @081288B8 +@08128594: movs r6, 0 ldr r0, [sp, 0x4] cmp r6, r0 - bcc _0812859E - b _0812893C -_0812859E: + bcc @0812859E + b @0812893C +@0812859E: mov r1, r10 lsls r1, 2 str r1, [sp, 0x1C] -_081285A4: +@081285A4: mov r2, r10 lsls r0, r2, 2 add r0, r10 @@ -569246,13 +569246,13 @@ _081285A4: str r6, [sp, 0x14] ldr r0, [sp, 0x8] cmp r7, r0 - bcs _0812866E + bcs @0812866E mov r1, r9 lsls r1, 16 str r1, [sp, 0xC] asrs r1, 16 mov r9, r1 -_081285D0: +@081285D0: ldr r0, [sp, 0x1C] add r0, r10 lsls r0, 3 @@ -569297,9 +569297,9 @@ _081285D0: bl sub_81284F4 lsls r0, 24 cmp r0, 0 - bne _08128632 - b _0812890C -_08128632: + bne @08128632 + b @0812890C +@08128632: mov r0, r10 adds r1, r6, 0 mov r2, r9 @@ -569307,9 +569307,9 @@ _08128632: bl sub_81284AC lsls r0, 24 cmp r0, 0 - bne _08128646 - b _0812890C -_08128646: + bne @08128646 + b @0812890C +@08128646: mov r1, r8 lsrs r0, r1, 16 ldr r2, [sp, 0xC] @@ -569319,28 +569319,28 @@ _08128646: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq _08128662 + beq @08128662 cmp r4, 0x10 - beq _08128662 - b _0812890C -_08128662: + beq @08128662 + b @0812890C +@08128662: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 ldr r3, [sp, 0x8] cmp r7, r3 - bcc _081285D0 -_0812866E: + bcc @081285D0 +@0812866E: ldr r1, [sp, 0x14] lsls r0, r1, 24 lsrs r6, r0, 24 ldr r2, [sp, 0x4] cmp r6, r2 - bcc _081285A4 - b _0812893C + bcc @081285A4 + b @0812893C .align 2, 0 .pool -_08128680: +@08128680: movs r6, 0 mov r3, r10 lsls r3, 2 @@ -569349,12 +569349,12 @@ _08128680: subs r0, 0x1 str r0, [sp, 0x18] cmp r6, r0 - bge _0812876C + bge @0812876C adds r0, r3, 0 add r0, r10 lsls r0, 3 str r0, [sp, 0x10] -_0812869A: +@0812869A: ldr r1, [sp, 0x10] adds r0, r1, r2 ldrh r0, [r0, 0xA] @@ -569367,10 +569367,10 @@ _0812869A: str r6, [sp, 0x14] ldr r3, [sp, 0x8] cmp r7, r3 - bcs _08128760 + bcs @08128760 lsls r0, 16 str r0, [sp, 0x20] -_081286B8: +@081286B8: ldr r1, [sp, 0x10] adds r0, r1, r2 ldrh r0, [r0, 0x8] @@ -569413,15 +569413,15 @@ _081286B8: bl sub_8089314 lsls r0, 24 cmp r0, 0 - bne _08128724 + bne @08128724 adds r0, r4, 0 adds r1, r5, 0 bl sub_8128484 lsls r0, 24 cmp r0, 0 - bne _08128724 - b _0812890C -_08128724: + bne @08128724 + b @0812890C +@08128724: mov r0, r10 adds r1, r6, 0 ldr r3, [sp, 0x20] @@ -569430,9 +569430,9 @@ _08128724: bl sub_81284AC lsls r0, 24 cmp r0, 0 - bne _0812873A - b _0812890C -_0812873A: + bne @0812873A + b @0812890C +@0812873A: mov r1, r8 lsrs r0, r1, 16 ldr r2, [sp, 0x20] @@ -569442,24 +569442,24 @@ _0812873A: lsls r0, 24 lsrs r0, 24 cmp r0, 0x10 - beq _08128752 - b _0812890C -_08128752: + beq @08128752 + b @0812890C +@08128752: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 ldr r2, =0x03005e00 ldr r3, [sp, 0x8] cmp r7, r3 - bcc _081286B8 -_08128760: + bcc @081286B8 +@08128760: ldr r1, [sp, 0x14] lsls r0, r1, 24 lsrs r6, r0, 24 ldr r3, [sp, 0x18] cmp r6, r3 - blt _0812869A -_0812876C: + blt @0812869A +@0812876C: ldr r0, [sp, 0x1C] add r0, r10 lsls r0, 3 @@ -569474,12 +569474,12 @@ _0812876C: movs r7, 0 ldr r3, [sp, 0x8] cmp r7, r3 - bcc _0812878C - b _0812893C -_0812878C: + bcc @0812878C + b @0812893C +@0812878C: lsls r0, 16 str r0, [sp, 0x20] -_08128790: +@08128790: ldr r0, [sp, 0x1C] add r0, r10 lsls r0, 3 @@ -569518,14 +569518,14 @@ _08128790: bl sub_8089314 lsls r0, 24 cmp r0, 0 - bne _081287F2 + bne @081287F2 adds r0, r4, 0 bl sub_8089328 lsls r0, 24 cmp r0, 0 - bne _081287F2 - b _0812890C -_081287F2: + bne @081287F2 + b @0812890C +@081287F2: mov r0, r10 adds r1, r6, 0 ldr r3, [sp, 0x20] @@ -569534,9 +569534,9 @@ _081287F2: bl sub_81284AC lsls r0, 24 cmp r0, 0 - bne _08128808 - b _0812890C -_08128808: + bne @08128808 + b @0812890C +@08128808: mov r1, r8 lsrs r0, r1, 16 ldr r2, [sp, 0x20] @@ -569546,26 +569546,26 @@ _08128808: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq _08128822 + beq @08128822 cmp r4, 0x10 - bne _0812890C -_08128822: + bne @0812890C +@08128822: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 ldr r3, [sp, 0x8] cmp r7, r3 - bcc _08128790 - b _0812893C + bcc @08128790 + b @0812893C .align 2, 0 .pool -_08128834: +@08128834: movs r6, 0 ldr r0, [sp, 0x4] cmp r6, r0 - bcc _0812883E - b _0812893C -_0812883E: + bcc @0812883E + b @0812893C +@0812883E: mov r1, r10 lsls r0, r1, 2 add r0, r10 @@ -569580,14 +569580,14 @@ _0812883E: movs r7, 0 ldr r3, [sp, 0x8] cmp r7, r3 - bcs _081288A4 + bcs @081288A4 adds r0, r2, 0 adds r1, r0 mov r8, r1 mov r1, r9 lsls r0, r1, 16 asrs r5, r0, 16 -_08128868: +@08128868: mov r2, r8 ldrh r0, [r2, 0x8] adds r0, r7 @@ -569601,31 +569601,31 @@ _08128868: bl sub_8089328 lsls r0, 24 cmp r0, 0 - beq _0812890C + beq @0812890C adds r0, r4, 0 adds r1, r5, 0x1 bl cur_mapdata_get_blockid_at movs r1, 0xA3 lsls r1, 2 cmp r0, r1 - beq _0812890C + beq @0812890C adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 ldr r3, [sp, 0x8] cmp r7, r3 - bcc _08128868 -_081288A4: + bcc @08128868 +@081288A4: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 ldr r0, [sp, 0x4] cmp r6, r0 - bcc _0812883E - b _0812893C + bcc @0812883E + b @0812893C .align 2, 0 .pool -_081288B8: +@081288B8: mov r3, r10 lsls r1, r3, 2 adds r0, r1, r3 @@ -569637,12 +569637,12 @@ _081288B8: str r1, [sp, 0x1C] ldr r0, [sp, 0x8] cmp r7, r0 - bcs _0812893C + bcs @0812893C adds r6, r2, 0 mov r1, r9 lsls r1, 16 str r1, [sp, 0x20] -_081288D8: +@081288D8: ldr r0, [sp, 0x1C] add r0, r10 lsls r0, 3 @@ -569661,23 +569661,23 @@ _081288D8: ldr r3, [sp] ldrb r0, [r3, 0x12] cmp r0, 0x5 - bne _08128910 -_08128900: + bne @08128910 +@08128900: adds r0, r4, 0 bl sub_8089364 lsls r0, 24 cmp r0, 0 - bne _0812891C -_0812890C: + bne @0812891C +@0812890C: movs r0, 0 - b _0812893E -_08128910: + b @0812893E +@08128910: adds r0, r4, 0 bl sub_8089350 lsls r0, 24 cmp r0, 0 - beq _08128900 -_0812891C: + beq @08128900 +@0812891C: adds r0, r5, 0 ldr r2, [sp, 0x20] lsrs r1, r2, 16 @@ -569686,16 +569686,16 @@ _0812891C: lsls r0, 24 lsrs r0, 24 cmp r0, 0x10 - bne _0812890C + bne @0812890C adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 ldr r3, [sp, 0x8] cmp r7, r3 - bcc _081288D8 -_0812893C: + bcc @081288D8 +@0812893C: movs r0, 0x1 -_0812893E: +@0812893E: add sp, 0x24 pop {r3-r5} mov r8, r3 @@ -569707,7 +569707,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 @@ -569725,7 +569725,7 @@ sub_8128950: @ 8128950 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081289A4 + bne @081289A4 ldr r4, =0x02021fc4 ldr r1, =0x085ea897 adds r0, r4, 0 @@ -569734,10 +569734,10 @@ sub_8128950: @ 8128950 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC - b _081289BE + b @081289BE .align 2, 0 .pool -_081289A4: +@081289A4: movs r0, 0x20 bl audio_play ldr r4, =0x02021fc4 @@ -569748,7 +569748,7 @@ _081289A4: adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC -_081289BE: +@081289BE: pop {r4,r5} pop {r0} bx r0 @@ -569757,7 +569757,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 @@ -569774,7 +569774,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 @@ -569794,7 +569794,7 @@ sub_81289F0: @ 81289F0 adds r0, r2 ldrb r0, [r0, 0x11] cmp r0, 0x4 - beq _08128A44 + beq @08128A44 ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -569804,10 +569804,10 @@ sub_81289F0: @ 81289F0 ldrh r1, [r1, 0xA] adds r2, r3, 0 bl sub_8127D38 - b _08128A64 + b @08128A64 .align 2, 0 .pool -_08128A44: +@08128A44: ldr r2, =0x0203aa34 ldr r0, =0x03005e00 lsls r1, r4, 2 @@ -569823,7 +569823,7 @@ _08128A44: strh r0, [r2] ldr r0, =0x08275d1f bl script_env_1_execute_new_script -_08128A64: +@08128A64: ldr r2, =0x02020630 ldr r0, =0x0203aa38 ldrb r1, [r0] @@ -569837,9 +569837,9 @@ _08128A64: ldr r0, =0x02037318 ldrb r0, [r0, 0x14] cmp r0, 0x56 - bne _08128A84 + bne @08128A84 bl sub_80EE104 -_08128A84: +@08128A84: adds r0, r4, 0 bl sub_8128BBC pop {r4} @@ -569850,7 +569850,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 @@ -569859,32 +569859,32 @@ sub_8128AAC: @ 8128AAC ldrb r1, [r0, 0x8] adds r5, r0, 0 cmp r3, r1 - bcs _08128AD2 + bcs @08128AD2 ldr r4, [r5] -_08128AC0: +@08128AC0: adds r2, r4, r3 ldrb r0, [r2] cmp r0, 0 - beq _08128AF0 + beq @08128AF0 adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, r1 - bcc _08128AC0 -_08128AD2: + bcc @08128AC0 +@08128AD2: ldrb r0, [r5, 0x9] cmp r0, 0 - bne _08128B3C + bne @08128B3C movs r3, 0 ldr r0, =0x0203a152 ldrb r1, [r0] adds r2, r0, 0 cmp r1, 0 - bne _08128B28 - b _08128B48 + bne @08128B28 + b @08128B48 .align 2, 0 .pool -_08128AF0: +@08128AF0: ldr r0, =0x0203a172 ldrb r1, [r0] ldr r0, =0x0203a14c @@ -569906,51 +569906,51 @@ _08128AF0: subs r1, 0x7 adds r0, r1 strb r0, [r2] - b _08128AD2 + b @08128AD2 .align 2, 0 .pool -_08128B28: +@08128B28: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0xF - bhi _08128B76 + bhi @08128B76 adds r1, r3, r2 ldrb r0, [r1] cmp r0, 0 - bne _08128B28 - b _08128B6E -_08128B3C: + bne @08128B28 + b @08128B6E +@08128B3C: movs r3, 0 ldr r0, =0x0203a162 ldrb r1, [r0] adds r2, r0, 0 cmp r1, 0 - bne _08128B5C -_08128B48: + bne @08128B5C +@08128B48: ldr r0, =0x0203a172 ldrb r0, [r0] adds r0, 0x1 strb r0, [r2] - b _08128B76 + b @08128B76 .align 2, 0 .pool -_08128B5C: +@08128B5C: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0xB - bhi _08128B76 + bhi @08128B76 adds r1, r3, r2 ldrb r0, [r1] cmp r0, 0 - bne _08128B5C -_08128B6E: + bne @08128B5C +@08128B6E: ldr r0, =0x0203a172 ldrb r0, [r0] adds r0, 0x1 strb r0, [r1] -_08128B76: +@08128B76: pop {r4-r6} pop {r0} bx r0 @@ -569959,7 +569959,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 @@ -569976,7 +569976,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 @@ -569992,7 +569992,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 @@ -570017,7 +570017,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 @@ -570029,28 +570029,28 @@ c1_overworld_prev_quest: @ 8128BEC movs r1, 0xC ldrsh r0, [r5, r1] cmp r0, 0 - beq _08128C10 + beq @08128C10 cmp r0, 0x1 - beq _08128C30 - b _08128C4C + beq @08128C30 + b @08128C4C .align 2, 0 .pool -_08128C10: +@08128C10: bl script_env_2_enable ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08128C4C + bne @08128C4C adds r0, r4, 0 bl sub_8127B04 movs r0, 0x1 strh r0, [r5, 0xC] - b _08128C4C + b @08128C4C .align 2, 0 .pool -_08128C30: +@08128C30: bl sub_812A3C8 ldr r0, =0x00000be5 bl gpu_pal_free_tag @@ -570061,7 +570061,7 @@ _08128C30: bl set_callback2 adds r0, r4, 0 bl remove_task -_08128C4C: +@08128C4C: pop {r4,r5} pop {r0} bx r0 @@ -570070,7 +570070,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 @@ -570082,48 +570082,48 @@ sub_8128C64: @ 8128C64 movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _08128C9C + beq @08128C9C cmp r0, 0x1 - bgt _08128C8C + bgt @08128C8C cmp r0, 0 - beq _08128C96 - b _08128CCA + beq @08128C96 + b @08128CCA .align 2, 0 .pool -_08128C8C: +@08128C8C: cmp r0, 0x2 - beq _08128CA8 + beq @08128CA8 cmp r0, 0x3 - beq _08128CB4 - b _08128CCA -_08128C96: + beq @08128CB4 + b @08128CCA +@08128C96: bl sub_80E9578 - b _08128CAC -_08128C9C: + b @08128CAC +@08128C9C: ldr r0, =0x08275d0c bl script_env_1_execute_new_script - b _08128CAC + b @08128CAC .align 2, 0 .pool -_08128CA8: +@08128CA8: bl script_env_2_enable -_08128CAC: +@08128CAC: ldrh r0, [r4, 0x4] adds r0, 0x1 strh r0, [r4, 0x4] - b _08128CCA -_08128CB4: + b @08128CCA +@08128CB4: bl sub_80ABDFC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08128CCA + bne @08128CCA adds r0, r6, 0 subs r0, 0x8 adds r0, r5, r0 ldr r1, =sub_812764C + 1 str r1, [r0] -_08128CCA: +@08128CCA: pop {r4-r6} pop {r0} bx r0 @@ -570132,7 +570132,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 @@ -570159,7 +570159,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 @@ -570172,7 +570172,7 @@ sub_8128D10: @ 8128D10 ldrb r1, [r0] adds r3, r0, 0 cmp r1, 0x1 - bne _08128D48 + bne @08128D48 movs r1, 0x2 ldrsh r0, [r2, r1] movs r4, 0xC @@ -570180,16 +570180,16 @@ sub_8128D10: @ 8128D10 subs r0, r1 subs r0, 0x6 cmp r0, 0 - bge _08128D48 + bge @08128D48 ldrh r0, [r2, 0x2] adds r0, 0x1 - b _08128D62 + b @08128D62 .align 2, 0 .pool -_08128D48: +@08128D48: ldrb r0, [r3] cmp r0, 0x2 - bne _08128D6C + bne @08128D6C movs r0, 0x2 ldrsh r1, [r2, r0] subs r1, 0x7 @@ -570197,31 +570197,31 @@ _08128D48: ldr r0, [r0] ldr r0, [r0, 0x4] cmp r1, r0 - blt _08128D6C + blt @08128D6C ldrh r0, [r2, 0x2] subs r0, 0x1 -_08128D62: +@08128D62: strh r0, [r2, 0x2] movs r0, 0 - b _08128DAE + b @08128DAE .align 2, 0 .pool -_08128D6C: +@08128D6C: ldrb r0, [r3] cmp r0, 0x3 - bne _08128D82 + bne @08128D82 movs r1, 0 ldrsh r0, [r2, r1] subs r0, 0x7 cmp r0, 0 - bge _08128D82 + bge @08128D82 ldrh r0, [r2] adds r0, 0x1 - b _08128DA2 -_08128D82: + b @08128DA2 +@08128D82: ldrb r0, [r3] cmp r0, 0x4 - bne _08128DAC + bne @08128DAC movs r3, 0 ldrsh r1, [r2, r3] movs r4, 0xA @@ -570232,51 +570232,51 @@ _08128D82: ldr r0, [r0] ldr r0, [r0] cmp r1, r0 - blt _08128DAC + blt @08128DAC ldrh r0, [r2] subs r0, 0x1 -_08128DA2: +@08128DA2: strh r0, [r2] movs r0, 0 - b _08128DAE + b @08128DAE .align 2, 0 .pool -_08128DAC: +@08128DAC: movs r0, 0x1 -_08128DAE: +@08128DAE: pop {r4} pop {r1} bx r1 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] movs r1, 0xF0 ands r1, r0 cmp r1, 0x40 - beq _08128DD8 + beq @08128DD8 cmp r1, 0x80 - beq _08128DD8 + beq @08128DD8 cmp r1, 0x20 - beq _08128DD8 + beq @08128DD8 cmp r1, 0x10 - beq _08128DD8 + beq @08128DD8 movs r0, 0 - b _08128DDA + b @08128DDA .align 2, 0 .pool -_08128DD8: +@08128DD8: movs r0, 0x1 -_08128DDA: +@08128DDA: pop {r1} bx r1 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 @@ -570304,7 +570304,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} @@ -570326,44 +570326,44 @@ sub_8128E18: @ 8128E18 movs r1, 0x36 ldrsh r6, [r0, r1] cmp r6, 0 - beq _08128E46 - b _08128F66 -_08128E46: + beq @08128E46 + b @08128F66 +@08128E46: movs r1, 0x14 ldrsh r0, [r4, r1] cmp r0, 0x1 - bne _08128E68 + bne @08128E68 ldr r0, =0x085a72d4 movs r3, 0x18 ldrsh r1, [r4, r3] lsls r1, 3 - b _08128E76 + b @08128E76 .align 2, 0 .pool -_08128E68: +@08128E68: cmp r0, 0x2 - bne _08128E88 + bne @08128E88 ldr r0, =0x085a72d4 movs r3, 0x18 ldrsh r1, [r4, r3] lsls r1, 3 adds r0, 0x4 -_08128E76: +@08128E76: adds r1, r0 ldr r1, [r1] adds r0, r2, 0 bl _call_via_r1 - b _08128FBA + b @08128FBA .align 2, 0 .pool -_08128E88: +@08128E88: ldr r2, =0x030022c0 ldrh r1, [r2, 0x2C] movs r7, 0xF0 adds r0, r7, 0 ands r0, r1 cmp r0, 0x40 - bne _08128EBC + bne @08128EBC ldr r1, =0x0203aa3a movs r0, 0x1 strb r0, [r1] @@ -570383,12 +570383,12 @@ _08128E88: ldrh r0, [r4, 0x2] subs r0, 0x1 strh r0, [r4, 0x2] -_08128EBC: +@08128EBC: ldrh r1, [r2, 0x2C] adds r0, r7, 0 ands r0, r1 cmp r0, 0x80 - bne _08128EEC + bne @08128EEC ldr r1, =0x0203aa3a movs r0, 0x2 strb r0, [r1] @@ -570408,12 +570408,12 @@ _08128EBC: ldrh r0, [r4, 0x2] adds r0, 0x1 strh r0, [r4, 0x2] -_08128EEC: +@08128EEC: ldrh r1, [r2, 0x2C] adds r0, r7, 0 ands r0, r1 cmp r0, 0x20 - bne _08128F1C + bne @08128F1C ldr r1, =0x0203aa3a movs r0, 0x3 strb r0, [r1] @@ -570433,12 +570433,12 @@ _08128EEC: ldrh r0, [r4] subs r0, 0x1 strh r0, [r4] -_08128F1C: +@08128F1C: ldrh r1, [r2, 0x2C] adds r0, r7, 0 ands r0, r1 cmp r0, 0x10 - bne _08128F4C + bne @08128F4C ldr r1, =0x0203aa3a movs r0, 0x4 strb r0, [r1] @@ -570458,23 +570458,23 @@ _08128F1C: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -_08128F4C: +@08128F4C: bl sub_8128DB4 lsls r0, 24 cmp r0, 0 - beq _08128F62 + beq @08128F62 mov r0, r8 bl sub_8128D10 lsls r0, 24 cmp r0, 0 - bne _08128F66 -_08128F62: + bne @08128F66 +@08128F62: bl sub_8128DE0 -_08128F66: +@08128F66: ldr r0, =0x0203aa3a ldrb r0, [r0] cmp r0, 0 - beq _08128F94 + beq @08128F94 ldr r3, =0x02020630 ldr r2, =0x0203aa38 ldrb r1, [r2] @@ -570494,28 +570494,28 @@ _08128F66: movs r0, 0x7 ands r0, r2 strh r0, [r1, 0x36] -_08128F94: +@08128F94: movs r1, 0x14 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08128FBA + bne @08128FBA ldr r3, =0x030022c0 ldrh r1, [r3, 0x2E] movs r2, 0x1 adds r0, r2, 0 ands r0, r1 cmp r0, 0 - beq _08128FAC + beq @08128FAC strh r2, [r4, 0x14] -_08128FAC: +@08128FAC: ldrh r1, [r3, 0x2E] movs r2, 0x2 adds r0, r2, 0 ands r0, r1 cmp r0, 0 - beq _08128FBA + beq @08128FBA strh r2, [r4, 0x14] -_08128FBA: +@08128FBA: pop {r3} mov r8, r3 pop {r4-r7} @@ -570526,7 +570526,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 @@ -570559,7 +570559,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 @@ -570568,15 +570568,15 @@ sub_8129020: @ 8129020 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0812903A + bne @0812903A movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08129040 -_0812903A: + beq @08129040 +@0812903A: adds r0, r2, 0 bl sub_8128FD8 -_08129040: +@08129040: pop {r0} bx r0 .align 2, 0 @@ -570584,7 +570584,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 @@ -570602,7 +570602,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 @@ -570621,7 +570621,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 @@ -570630,10 +570630,10 @@ sub_8129088: @ 8129088 lsrs r4, r1, 26 adds r5, r4, 0 cmp r2, 0 - beq _0812909E + beq @0812909E ldr r0, =0x000003ff ands r2, r0 -_0812909E: +@0812909E: ldr r0, =0x083dfc74 ldr r0, [r0] lsls r1, r2, 5 @@ -570643,30 +570643,30 @@ _0812909E: movs r2, 0x8 bl CpuFastSet cmp r4, 0x1 - beq _081290DE + beq @081290DE cmp r4, 0x1 - bgt _081290C8 + bgt @081290C8 cmp r4, 0 - beq _081290D2 - b _0812919A + beq @081290D2 + b @0812919A .align 2, 0 .pool -_081290C8: +@081290C8: cmp r5, 0x2 - beq _0812913E + beq @0812913E cmp r5, 0x3 - beq _08129176 - b _0812919A -_081290D2: + beq @08129176 + b @0812919A +@081290D2: mov r0, sp adds r1, r7, 0 movs r2, 0x8 bl CpuFastSet - b _0812919A -_081290DE: + b @0812919A +@081290DE: movs r5, 0 movs r6, 0xF -_081290E2: +@081290E2: lsls r4, r5, 2 adds r4, r7 adds r5, 0x1 @@ -570711,12 +570711,12 @@ _081290E2: lsls r5, 16 lsrs r5, 16 cmp r5, 0x7 - bls _081290E2 - b _0812919A -_0812913E: + bls @081290E2 + b @0812919A +@0812913E: movs r5, 0 movs r3, 0x7 -_08129142: +@08129142: lsls r2, r5, 2 adds r2, r7 subs r1, r3, r5 @@ -570741,13 +570741,13 @@ _08129142: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x7 - bls _08129142 - b _0812919A -_08129176: + bls @08129142 + b @0812919A +@08129176: movs r5, 0 movs r4, 0x1F movs r6, 0xF -_0812917C: +@0812917C: adds r3, r7, r5 subs r0, r4, r5 add r0, sp @@ -570762,8 +570762,8 @@ _0812917C: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x1F - bls _0812917C -_0812919A: + bls @0812917C +@0812919A: add sp, 0x20 pop {r4-r7} pop {r0} @@ -570771,11 +570771,11 @@ _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 -_081291AA: +@081291AA: lsls r0, r4, 5 adds r0, 0x84 adds r0, r5, r0 @@ -570788,14 +570788,14 @@ _081291AA: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x3F - bls _081291AA + bls @081291AA pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_81291A4 thumb_func_start sub_81291CC -sub_81291CC: @ 81291CC +sub_81291CC: ; 81291CC lsls r0, 16 ldr r1, =0x083dfc78 ldr r1, [r1] @@ -570811,7 +570811,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} @@ -570824,9 +570824,9 @@ sub_81291E8: @ 81291E8 adds r0, r5, r1 ldrb r0, [r0, 0xC] cmp r6, r0 - bcs _0812924C + bcs @0812924C adds r7, r1, 0 -_08129204: +@08129204: mov r4, r8 ldm r4!, {r1} adds r0, r7, 0x4 @@ -570861,8 +570861,8 @@ _08129204: lsrs r6, r0, 24 ldrb r2, [r2, 0xC] cmp r6, r2 - bcc _08129204 -_0812924C: + bcc @08129204 +@0812924C: pop {r3} mov r8, r3 pop {r4-r7} @@ -570873,7 +570873,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 @@ -570929,7 +570929,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] @@ -570945,52 +570945,52 @@ 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 ldrsh r0, [r2, r1] cmp r0, 0 - bne _08129322 + bne @08129322 movs r1, 0x3A ldrsh r0, [r2, r1] cmp r0, 0xE - bgt _0812930A + bgt @0812930A adds r3, r2, 0 adds r3, 0x3E ldrb r1, [r3] movs r0, 0x5 negs r0, r0 ands r0, r1 - b _08129314 -_0812930A: + b @08129314 +@0812930A: adds r3, r2, 0 adds r3, 0x3E ldrb r0, [r3] movs r1, 0x4 orrs r0, r1 -_08129314: +@08129314: strb r0, [r3] ldrh r0, [r2, 0x3A] adds r0, 0x1 movs r1, 0x1F ands r0, r1 strh r0, [r2, 0x3A] - b _0812932E -_08129322: + b @0812932E +@08129322: adds r2, 0x3E ldrb r1, [r2] movs r0, 0x5 negs r0, r0 ands r0, r1 strb r0, [r2] -_0812932E: +@0812932E: pop {r0} bx r0 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 @@ -571003,7 +571003,7 @@ gpu_pal_decompress_alloc_tag_and_upload: @ 8129334 str r4, [r5] ldrb r0, [r4, 0x11] cmp r0, 0x4 - beq _081293B4 + beq @081293B4 ldr r0, =0x00000be5 bl gpu_pal_free_tag adds r0, r5, 0 @@ -571033,10 +571033,10 @@ gpu_pal_decompress_alloc_tag_and_upload: @ 8129334 movs r2, 0 movs r3, 0 bl obj_add_from_template_forward_search - b _081293C6 + b @081293C6 .align 2, 0 .pool -_081293B4: +@081293B4: ldr r0, [r4, 0x1C] ldrh r0, [r0] ldr r1, =nullsub_12 + 1 @@ -571045,7 +571045,7 @@ _081293B4: movs r2, 0 movs r3, 0 bl sub_808DD68 -_081293C6: +@081293C6: lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -571057,7 +571057,7 @@ _081293C6: thumb_func_end gpu_pal_decompress_alloc_tag_and_upload thumb_func_start sub_81293D8 -sub_81293D8: @ 81293D8 +sub_81293D8: ; 81293D8 push {r4-r7,lr} sub sp, 0x10 lsls r0, 16 @@ -571069,7 +571069,7 @@ sub_81293D8: @ 81293D8 bl sub_81AFDE4 lsls r0, 24 cmp r0, 0 - beq _08129490 + beq @08129490 adds r0, r5, 0 movs r1, 0 bl sub_812949C @@ -571128,12 +571128,12 @@ sub_81293D8: @ 81293D8 adds r0, r5, 0 bl free adds r0, r4, 0 - b _08129492 + b @08129492 .align 2, 0 .pool -_08129490: +@08129490: movs r0, 0x40 -_08129492: +@08129492: add sp, 0x10 pop {r4-r7} pop {r1} @@ -571141,16 +571141,16 @@ _08129492: thumb_func_end sub_81293D8 thumb_func_start sub_812949C -sub_812949C: @ 812949C +sub_812949C: ; 812949C push {lr} lsls r0, 16 lsrs r3, r0, 16 lsls r1, 24 lsrs r0, r1, 24 cmp r3, 0x78 - bls _081294AC + bls @081294AC movs r3, 0 -_081294AC: +@081294AC: ldr r2, =0x085a6be8 lsls r0, 2 lsls r1, r3, 3 @@ -571164,7 +571164,7 @@ _081294AC: thumb_func_end sub_812949C thumb_func_start sub_81294C0 -sub_81294C0: @ 81294C0 +sub_81294C0: ; 81294C0 push {r4-r7,lr} mov r7, r8 push {r7} @@ -571186,7 +571186,7 @@ sub_81294C0: @ 81294C0 str r4, [r6] ldrb r0, [r4, 0x11] cmp r0, 0x4 - beq _081295A4 + beq @081295A4 adds r0, r6, 0 bl sub_81291E8 ldr r0, [r6] @@ -571254,10 +571254,10 @@ sub_81294C0: @ 81294C0 lsrs r5, r0, 24 adds r0, r4, 0 bl free - b _081295BA + b @081295BA .align 2, 0 .pool -_081295A4: +@081295A4: ldr r0, [r4, 0x1C] ldrh r0, [r0] ldr r1, =nullsub_12 + 1 @@ -571268,7 +571268,7 @@ _081295A4: bl sub_808DD68 lsls r0, 24 lsrs r5, r0, 24 -_081295BA: +@081295BA: adds r0, r5, 0 add sp, 0x14 pop {r3} @@ -571281,7 +571281,7 @@ _081295BA: thumb_func_end sub_81294C0 thumb_func_start sub_81295CC -sub_81295CC: @ 81295CC +sub_81295CC: ; 81295CC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -571310,7 +571310,7 @@ sub_81295CC: @ 81295CC lsrs r5, 16 adds r2, r5, 0 cmp r6, 0x78 - bls _08129634 + bls @08129634 adds r0, r4, 0 adds r1, r5, 0 movs r2, 0 @@ -571318,7 +571318,7 @@ sub_81295CC: @ 81295CC lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x40 - beq _08129696 + beq @08129696 ldr r2, =0x02020630 lsls r3, r4, 4 adds r1, r3, r4 @@ -571330,16 +571330,16 @@ sub_81295CC: @ 81295CC adds r0, 0x4 strh r0, [r1, 0x24] lsls r0, r7, 16 - b _081296B2 + b @081296B2 .align 2, 0 .pool -_08129634: +@08129634: ldr r0, =0x085a6be8 lsls r1, r6, 3 adds r1, r0 ldr r0, [r1] cmp r0, 0 - bne _08129684 + bne @08129684 adds r0, r4, 0 adds r1, r5, 0 adds r2, r6, 0 @@ -571347,7 +571347,7 @@ _08129634: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x40 - beq _08129696 + beq @08129696 ldr r1, =0x02020630 lsls r2, r4, 4 adds r0, r2, r4 @@ -571360,18 +571360,18 @@ _08129634: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _08129680 + bhi @08129680 lsls r0, r7, 16 asrs r0, 16 subs r0, 0x4 strh r0, [r5, 0x26] - b _081296BC + b @081296BC .align 2, 0 .pool -_08129680: +@08129680: strh r7, [r5, 0x26] - b _081296BC -_08129684: + b @081296BC +@08129684: adds r0, r3, 0 adds r1, r2, 0 mov r2, r12 @@ -571379,11 +571379,11 @@ _08129684: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x40 - bne _0812969A -_08129696: + bne @0812969A +@08129696: movs r0, 0x40 - b _081296D8 -_0812969A: + b @081296D8 +@0812969A: ldr r2, =0x02020630 lsls r3, r4, 4 adds r1, r3, r4 @@ -571396,13 +571396,13 @@ _0812969A: strh r0, [r1, 0x24] mov r5, r10 lsls r0, r5, 16 -_081296B2: +@081296B2: asrs r0, 16 adds r0, 0x4 strh r0, [r1, 0x26] adds r1, r2, 0 adds r2, r3, 0 -_081296BC: +@081296BC: adds r2, r4 lsls r2, 2 adds r2, r1 @@ -571417,7 +571417,7 @@ _081296BC: orrs r0, r1 strb r0, [r2, 0x5] adds r0, r4, 0 -_081296D8: +@081296D8: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -571431,7 +571431,7 @@ _081296D8: thumb_func_end sub_81295CC thumb_func_start sub_81296EC -sub_81296EC: @ 81296EC +sub_81296EC: ; 81296EC lsls r0, 24 lsrs r0, 24 ldr r3, =0x0203a17c @@ -571448,7 +571448,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 @@ -571460,20 +571460,20 @@ sub_8129708: @ 8129708 ldrh r0, [r4] ldrb r1, [r1] cmp r0, r1 - bne _08129744 + bne @08129744 movs r0, 0x1 strh r0, [r2] - b _08129796 + b @08129796 .align 2, 0 .pool -_08129738: +@08129738: ldr r1, =0x020375e4 ldrb r0, [r2] strh r0, [r1] - b _08129796 + b @08129796 .align 2, 0 .pool -_08129744: +@08129744: ldr r3, =0x085a5c08 ldr r2, =0x0203a17c ldr r1, =0x0203aa44 @@ -571488,7 +571488,7 @@ _08129744: adds r0, r3 ldrb r0, [r0, 0x11] cmp r0, 0x4 - bne _08129796 + bne @08129796 ldrh r0, [r4, 0x4] strh r0, [r6] ldrb r0, [r4] @@ -571498,24 +571498,24 @@ _08129744: ldr r0, [r0, 0x4] ldrb r2, [r0] cmp r1, r2 - bcs _08129796 + bcs @08129796 ldr r5, [r0, 0x4] ldrh r4, [r6] adds r3, r2, 0 -_0812977E: +@0812977E: lsls r0, r1, 1 adds r0, r1 lsls r0, 3 adds r2, r0, r5 ldrh r0, [r2, 0x14] cmp r0, r4 - beq _08129738 + beq @08129738 adds r0, r1, 0x1 lsls r0, 16 lsrs r1, r0, 16 cmp r1, r3 - bcc _0812977E -_08129796: + bcc @0812977E +@08129796: pop {r4-r6} pop {r0} bx r0 @@ -571524,47 +571524,47 @@ _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 ldr r0, [r0, 0x4] ldrb r1, [r0] cmp r2, r1 - bcs _081297F0 + bcs @081297F0 adds r3, r0, 0 ldr r5, [r3, 0x4] ldr r0, =0x020375e0 ldrh r4, [r0] ldr r6, =0x020375e2 -_081297C4: +@081297C4: lsls r0, r2, 1 adds r0, r2 lsls r0, 3 adds r1, r0, r5 ldrh r0, [r1, 0x14] cmp r0, r4 - bne _081297E4 + bne @081297E4 ldrb r0, [r1] strh r0, [r6] - b _081297F0 + b @081297F0 .align 2, 0 .pool -_081297E4: +@081297E4: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 ldrb r0, [r3] cmp r2, r0 - bcc _081297C4 -_081297F0: + bcc @081297C4 +@081297F0: pop {r4-r6} pop {r0} bx r0 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 @@ -571572,8 +571572,8 @@ sub_81297F8: @ 81297F8 push {r5-r7} sub sp, 0xC movs r6, 0 - b _081298BE -_08129808: + b @081298BE +@08129808: ldr r3, =0x0203aa44 lsls r5, r6, 3 adds r4, r5, r3 @@ -571600,25 +571600,25 @@ _08129808: adds r6, 0x1 str r6, [sp, 0x4] cmp r2, 0x4 - beq _081298B8 + beq @081298B8 movs r6, 0 ldrb r4, [r4, 0x2] cmp r6, r4 - bcs _081298AE -_08129846: + bcs @081298AE +@08129846: movs r4, 0 adds r0, r5, r3 adds r2, r6, 0x1 mov r10, r2 ldrb r0, [r0, 0x1] cmp r4, r0 - bcs _0812989C + bcs @0812989C ldr r3, =0x0203aa44 adds r3, r7 mov r9, r3 subs r5, r6, 0x7 str r5, [sp, 0x8] -_0812985E: +@0812985E: adds r0, r4, 0x7 add r0, r8 ldr r1, =0x02037318 @@ -571648,8 +571648,8 @@ _0812985E: mov r5, r9 ldrb r5, [r5, 0x1] cmp r4, r5 - bcc _0812985E -_0812989C: + bcc @0812985E +@0812989C: mov r1, r10 lsls r0, r1, 24 lsrs r6, r0, 24 @@ -571658,21 +571658,21 @@ _0812989C: adds r0, r7, r3 ldrb r0, [r0, 0x2] cmp r6, r0 - bcc _08129846 -_081298AE: + bcc @08129846 +@081298AE: ldr r2, =0x0203aa44 adds r0, r7, r2 ldrb r0, [r0] bl sub_81296EC -_081298B8: +@081298B8: ldr r3, [sp, 0x4] lsls r0, r3, 24 lsrs r6, r0, 24 -_081298BE: +@081298BE: ldr r0, =0x0203aac4 ldrb r0, [r0] cmp r6, r0 - bcc _08129808 + bcc @08129808 add sp, 0xC pop {r3-r5} mov r8, r3 @@ -571686,7 +571686,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 @@ -571698,32 +571698,32 @@ sub_81298EC: @ 81298EC movs r1, 0xC ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _08129928 + beq @08129928 cmp r0, 0x1 - bgt _08129914 + bgt @08129914 cmp r0, 0 - beq _0812991E - b _08129994 + beq @0812991E + b @08129994 .align 2, 0 .pool -_08129914: +@08129914: cmp r0, 0x2 - beq _08129954 + beq @08129954 cmp r0, 0x3 - beq _08129968 - b _08129994 -_0812991E: + beq @08129968 + b @08129994 +@0812991E: bl sub_81297F8 movs r0, 0x1 strh r0, [r4, 0xC] - b _08129994 -_08129928: + b @08129994 +@08129928: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08129994 + bne @08129994 bl cur_mapdata_full_redraw ldr r0, =0x08275d2e bl script_env_1_execute_new_script @@ -571732,23 +571732,23 @@ _08129928: bl sub_8197434 movs r0, 0x2 strh r0, [r4, 0xC] - b _08129994 + b @08129994 .align 2, 0 .pool -_08129954: +@08129954: bl script_env_2_enable adds r0, r5, 0 bl sub_8127814 bl pal_fill_black movs r0, 0x3 strh r0, [r4, 0xC] - b _08129994 -_08129968: + b @08129994 +@08129968: bl sub_80ABDFC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08129994 + bne @08129994 ldr r4, =0x02021fc4 ldr r1, =0x085eaac5 adds r0, r4, 0 @@ -571760,9 +571760,9 @@ _08129968: ldr r0, =0x02037318 ldrb r0, [r0, 0x14] cmp r0, 0x56 - bne _08129994 + bne @08129994 bl sub_80EE104 -_08129994: +@08129994: pop {r4,r5} pop {r0} bx r0 @@ -571771,38 +571771,38 @@ _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 ldrb r2, [r0, 0x8] cmp r1, r2 - bcs _081299D6 + bcs @081299D6 ldr r3, [r0] -_081299BA: +@081299BA: adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0 - beq _081299CC + beq @081299CC movs r0, 0x1 - b _081299D8 + b @081299D8 .align 2, 0 .pool -_081299CC: +@081299CC: adds r0, r1, 0x1 lsls r0, 16 lsrs r1, r0, 16 cmp r1, r2 - bcc _081299BA -_081299D6: + bcc @081299BA +@081299D6: movs r0, 0 -_081299D8: +@081299D8: pop {r1} bx r1 thumb_func_end sub_81299AC thumb_func_start sub_81299DC -sub_81299DC: @ 81299DC +sub_81299DC: ; 81299DC push {r4-r6,lr} mov r6, r8 push {r6} @@ -571831,19 +571831,19 @@ sub_81299DC: @ 81299DC ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - bne _08129A3C + bne @08129A3C ldr r1, =nullsub_12 + 1 str r0, [sp] movs r0, 0xC1 - b _08129A44 + b @08129A44 .align 2, 0 .pool -_08129A3C: +@08129A3C: ldr r1, =nullsub_12 + 1 movs r0, 0 str r0, [sp] movs r0, 0xC2 -_08129A44: +@08129A44: movs r2, 0x88 movs r3, 0x48 bl sub_808DD68 @@ -571897,7 +571897,7 @@ _08129A44: thumb_func_end sub_81299DC thumb_func_start sub_8129ABC -sub_8129ABC: @ 8129ABC +sub_8129ABC: ; 8129ABC push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -571909,57 +571909,57 @@ sub_8129ABC: @ 8129ABC movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _08129B0C + beq @08129B0C cmp r0, 0x1 - bgt _08129AE4 + bgt @08129AE4 cmp r0, 0 - beq _08129AEA - b _08129B2E + beq @08129AEA + b @08129B2E .align 2, 0 .pool -_08129AE4: +@08129AE4: cmp r0, 0x2 - beq _08129B1A - b _08129B2E -_08129AEA: + beq @08129B1A + b @08129B2E +@08129AEA: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08129B2E + bne @08129B2E adds r0, r5, 0 bl sub_8127ACC movs r0, 0x1 strh r0, [r4, 0x4] strh r0, [r4, 0xC] strh r0, [r4, 0xA] - b _08129B2E + b @08129B2E .align 2, 0 .pool -_08129B0C: +@08129B0C: bl sub_81299DC bl pal_fill_black movs r0, 0x2 strh r0, [r4, 0x4] - b _08129B2E -_08129B1A: + b @08129B2E +@08129B1A: bl sub_80ABDFC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08129B2E + bne @08129B2E strh r0, [r4, 0x18] adds r0, r5, 0 bl sub_8129B34 -_08129B2E: +@08129B2E: pop {r4,r5} pop {r0} bx r0 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 @@ -572027,7 +572027,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 @@ -572050,7 +572050,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 @@ -572100,7 +572100,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 @@ -572109,16 +572109,16 @@ sub_8129C74: @ 8129C74 ldr r0, =0x0203aac4 ldrb r0, [r0] cmp r0, 0 - beq _08129CA8 + beq @08129CA8 ldr r4, =0x02021fc4 ldr r1, =0x085eaaa3 adds r0, r4, 0 bl ExpandTextCodes ldr r2, =sub_812A1A0 + 1 - b _08129D14 + b @08129D14 .align 2, 0 .pool -_08129CA8: +@08129CA8: lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -572136,14 +572136,14 @@ _08129CA8: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08129CDE + beq @08129CDE adds r0, r4, 0 bl sub_8089404 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08129D3C -_08129CDE: + bne @08129D3C +@08129CDE: ldr r3, =0x02020630 ldr r4, =0x0203aa38 ldrb r1, [r4] @@ -572170,14 +572170,14 @@ _08129CDE: adds r0, r4, 0 bl ExpandTextCodes ldr r2, =sub_812A1F0 + 1 -_08129D14: +@08129D14: adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC - b _08129D50 + b @08129D50 .align 2, 0 .pool -_08129D3C: +@08129D3C: ldr r4, =0x02021fc4 ldr r1, =0x085eaa81 adds r0, r4, 0 @@ -572186,7 +572186,7 @@ _08129D3C: adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC -_08129D50: +@08129D50: pop {r4,r5} pop {r0} bx r0 @@ -572195,7 +572195,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 @@ -572204,15 +572204,15 @@ sub_8129D64: @ 8129D64 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _08129D7E + bne @08129D7E movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08129D84 -_08129D7E: + beq @08129D84 +@08129D7E: adds r0, r2, 0 bl sub_8129B34 -_08129D84: +@08129D84: pop {r0} bx r0 .align 2, 0 @@ -572220,7 +572220,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 @@ -572229,78 +572229,78 @@ sub_8129D8C: @ 8129D8C adds r0, r1 ldrb r1, [r0, 0x12] cmp r1, 0 - bne _08129DA8 + bne @08129DA8 movs r0, 0x1 strb r0, [r2, 0x1] - b _08129E06 + b @08129E06 .align 2, 0 .pool -_08129DA8: +@08129DA8: cmp r1, 0x1 - bne _08129DB4 + bne @08129DB4 movs r0, 0x2 strb r0, [r2, 0x1] strb r1, [r2, 0x2] - b _08129E08 -_08129DB4: + b @08129E08 +@08129DB4: cmp r1, 0x2 - bne _08129DC0 + bne @08129DC0 movs r0, 0x3 strb r0, [r2, 0x1] movs r0, 0x1 - b _08129E06 -_08129DC0: + b @08129E06 +@08129DC0: cmp r1, 0x3 - bne _08129DC8 + bne @08129DC8 movs r0, 0x4 - b _08129E02 -_08129DC8: + b @08129E02 +@08129DC8: cmp r1, 0x4 - bne _08129DD2 + bne @08129DD2 movs r0, 0x2 strb r0, [r2, 0x1] - b _08129E06 -_08129DD2: + b @08129E06 +@08129DD2: cmp r1, 0x5 - bne _08129DDA + bne @08129DDA movs r0, 0x1 - b _08129E02 -_08129DDA: + b @08129E02 +@08129DDA: cmp r1, 0x6 - bne _08129DE6 + bne @08129DE6 movs r0, 0x1 strb r0, [r2, 0x1] movs r0, 0x3 - b _08129E06 -_08129DE6: + b @08129E06 +@08129DE6: cmp r1, 0x7 - bne _08129DF2 + bne @08129DF2 movs r0, 0x2 strb r0, [r2, 0x1] movs r0, 0x4 - b _08129E06 -_08129DF2: + b @08129E06 +@08129DF2: cmp r1, 0x8 - bne _08129DFC + bne @08129DFC movs r0, 0x3 strb r0, [r2, 0x1] - b _08129E06 -_08129DFC: + b @08129E06 +@08129DFC: cmp r1, 0x9 - bne _08129E08 + bne @08129E08 movs r0, 0x3 -_08129E02: +@08129E02: strb r0, [r2, 0x1] movs r0, 0x2 -_08129E06: +@08129E06: strb r0, [r2, 0x2] -_08129E08: +@08129E08: pop {r0} bx r0 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 @@ -572350,7 +572350,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 @@ -572387,30 +572387,30 @@ sub_8129E74: @ 8129E74 adds r0, r1 ldrb r0, [r0] cmp r0, 0x29 - bne _08129ED4 + bne @08129ED4 adds r0, r5, 0x7 adds r1, r6, 0x7 bl cur_mapdata_get_blockid_at movs r1, 0xA3 lsls r1, 2 cmp r0, r1 - bne _08129ED4 + bne @08129ED4 subs r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_08129ED4: +@08129ED4: cmp r7, r5 - bcc _08129F10 + bcc @08129F10 mov r0, r9 ldrb r2, [r0, 0x1] adds r0, r5, r2 cmp r7, r0 - bge _08129F10 + bge @08129F10 subs r0, r6, r4 cmp r8, r0 - ble _08129F10 + ble @08129F10 cmp r8, r6 - bhi _08129F10 + bhi @08129F10 subs r0, r7, r5 adds r0, 0x1 subs r0, r2, r0 @@ -572422,12 +572422,12 @@ _08129ED4: lsrs r1, 24 bl sub_8129E0C movs r0, 0x1 - b _08129F12 + b @08129F12 .align 2, 0 .pool -_08129F10: +@08129F10: movs r0, 0 -_08129F12: +@08129F12: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -572437,7 +572437,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 @@ -572459,7 +572459,7 @@ sub_8129F20: @ 8129F20 movs r4, 0 ldr r7, =0x03005d8c mov r9, r3 -_08129F4A: +@08129F4A: ldr r1, [r7] lsls r0, r4, 1 adds r0, r4 @@ -572470,20 +572470,20 @@ _08129F4A: movs r2, 0 ldrsh r0, [r0, r2] cmp r0, r8 - bne _08129FB0 + bne @08129FB0 ldr r2, =0x00000c76 adds r0, r1, r2 movs r2, 0 ldrsh r0, [r0, r2] cmp r0, r6 - bne _08129FB0 + bne @08129FB0 ldr r2, =0x00000c84 adds r0, r1, r2 ldrh r0, [r0] bl flag_check lsls r0, 24 cmp r0, 0 - bne _08129FB0 + bne @08129FB0 ldr r0, =0x0203aac4 ldrb r1, [r0] lsls r1, 3 @@ -572494,16 +572494,16 @@ _08129F4A: adds r0, r2 ldrh r0, [r0] strh r0, [r1, 0x4] - b _08129FBA + b @08129FBA .align 2, 0 .pool -_08129FB0: +@08129FB0: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x3F - bls _08129F4A -_08129FBA: + bls @08129F4A +@08129FBA: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -572513,25 +572513,25 @@ _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 movs r6, 0 - b _0812A02A -_08129FD2: + b @0812A02A +@08129FD2: ldr r0, [r0] adds r1, r0, r6 ldrb r0, [r1] cmp r0, 0 - beq _0812A024 + beq @0812A024 ldr r0, =0x085a5c08 ldrb r2, [r1] lsls r1, r2, 5 adds r1, r0 ldrb r0, [r1, 0x11] cmp r0, 0x4 - bne _0812A024 + bne @0812A024 ldr r5, =0x0203aa44 adds r0, r2, 0 adds r1, r5, 0 @@ -572544,26 +572544,26 @@ _08129FD2: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bne _0812A024 + bne @0812A024 strb r6, [r5] bl sub_8129F20 ldr r0, =0x0203aac4 strb r4, [r0] movs r0, 0x1 - b _0812A034 + b @0812A034 .align 2, 0 .pool -_0812A024: +@0812A024: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 -_0812A02A: +@0812A02A: ldr r0, =0x0203a17c ldrb r1, [r0, 0x8] cmp r6, r1 - bcc _08129FD2 + bcc @08129FD2 movs r0, 0 -_0812A034: +@0812A034: pop {r4-r7} pop {r1} bx r1 @@ -572572,7 +572572,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 @@ -572595,10 +572595,10 @@ sub_812A040: @ 812A040 ldr r7, =0x0203a17c ldrb r0, [r7, 0x8] cmp r4, r0 - bcs _0812A0C6 + bcs @0812A0C6 adds r6, r7, 0 ldr r5, =0x0203aac4 -_0812A072: +@0812A072: ldr r0, [r6] adds r0, r4 ldrb r1, [r0] @@ -572609,22 +572609,22 @@ _0812A072: movs r2, 0xF ands r2, r0 cmp r1, 0 - beq _0812A0BA + beq @0812A0BA ldr r0, =0x085a5c08 lsls r1, 5 adds r1, r0 ldrb r0, [r1, 0x11] cmp r0, 0x4 - bne _0812A0BA + bne @0812A0BA ldr r0, [sp] cmp r0, r3 - bhi _0812A0BA + bhi @0812A0BA cmp r10, r2 - bhi _0812A0BA + bhi @0812A0BA cmp r9, r3 - bcc _0812A0BA + bcc @0812A0BA cmp r8, r2 - bcc _0812A0BA + bcc @0812A0BA ldr r0, =0x0203aa44 ldrb r1, [r5] lsls r1, 3 @@ -572634,14 +572634,14 @@ _0812A072: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] -_0812A0BA: +@0812A0BA: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 ldrb r0, [r7, 0x8] cmp r4, r0 - bcc _0812A072 -_0812A0C6: + bcc @0812A072 +@0812A0C6: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -572655,7 +572655,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 @@ -572667,19 +572667,19 @@ sub_812A0E8: @ 812A0E8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0812A18C + beq @0812A18C movs r5, 0 ldr r0, =0x0203a17c ldrb r1, [r0, 0x8] cmp r5, r1 - bcs _0812A15A + bcs @0812A15A adds r7, r4, 0 -_0812A10E: +@0812A10E: ldr r0, [r0] adds r0, r5 ldrb r1, [r0] cmp r1, 0 - beq _0812A14C + beq @0812A14C ldr r4, =0x0203aa44 adds r0, r1, 0 adds r1, r4, 0 @@ -572691,27 +572691,27 @@ _0812A10E: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0812A14C + bne @0812A14C strb r5, [r4] ldrb r0, [r7] adds r0, 0x1 strb r0, [r7] - b _0812A15A + b @0812A15A .align 2, 0 .pool -_0812A14C: +@0812A14C: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 ldr r0, =0x0203a17c ldrb r1, [r0, 0x8] cmp r5, r1 - bcc _0812A10E -_0812A15A: + bcc @0812A10E +@0812A15A: ldr r0, =0x0203aac4 ldrb r0, [r0] cmp r0, 0 - beq _0812A18C + beq @0812A18C ldr r0, =0x0203a17c ldr r2, =0x0203aa44 ldrb r1, [r2] @@ -572732,7 +572732,7 @@ _0812A15A: lsls r2, 24 lsrs r2, 24 bl sub_812A040 -_0812A18C: +@0812A18C: pop {r4-r7} pop {r0} bx r0 @@ -572741,7 +572741,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 @@ -572758,7 +572758,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 @@ -572783,7 +572783,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 @@ -572800,7 +572800,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 @@ -572816,7 +572816,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 @@ -572841,7 +572841,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 @@ -572853,27 +572853,27 @@ sub_812A25C: @ 812A25C movs r1, 0xC ldrsh r0, [r5, r1] cmp r0, 0 - beq _0812A280 + beq @0812A280 cmp r0, 0x1 - beq _0812A29C - b _0812A2B2 + beq @0812A29C + b @0812A2B2 .align 2, 0 .pool -_0812A280: +@0812A280: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0812A2B2 + bne @0812A2B2 adds r0, r4, 0 bl sub_8127B04 movs r0, 0x1 strh r0, [r5, 0xC] - b _0812A2B2 + b @0812A2B2 .align 2, 0 .pool -_0812A29C: +@0812A29C: bl sub_812A3C8 ldr r0, =0x03005dac ldr r1, =sub_812A334 + 1 @@ -572882,7 +572882,7 @@ _0812A29C: bl set_callback2 adds r0, r4, 0 bl remove_task -_0812A2B2: +@0812A2B2: pop {r4,r5} pop {r0} bx r0 @@ -572891,7 +572891,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 @@ -572903,48 +572903,48 @@ sub_812A2C4: @ 812A2C4 movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _0812A2FC + beq @0812A2FC cmp r0, 0x1 - bgt _0812A2EC + bgt @0812A2EC cmp r0, 0 - beq _0812A2F6 - b _0812A32A + beq @0812A2F6 + b @0812A32A .align 2, 0 .pool -_0812A2EC: +@0812A2EC: cmp r0, 0x2 - beq _0812A308 + beq @0812A308 cmp r0, 0x3 - beq _0812A314 - b _0812A32A -_0812A2F6: + beq @0812A314 + b @0812A32A +@0812A2F6: bl sub_80E9578 - b _0812A30C -_0812A2FC: + b @0812A30C +@0812A2FC: ldr r0, =0x08275d0c bl script_env_1_execute_new_script - b _0812A30C + b @0812A30C .align 2, 0 .pool -_0812A308: +@0812A308: bl script_env_2_enable -_0812A30C: +@0812A30C: ldrh r0, [r4, 0x4] adds r0, 0x1 strh r0, [r4, 0x4] - b _0812A32A -_0812A314: + b @0812A32A +@0812A314: bl sub_80ABDFC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0812A32A + bne @0812A32A adds r0, r6, 0 subs r0, 0x8 adds r0, r5, r0 ldr r1, =sub_8126B80 + 1 str r1, [r0] -_0812A32A: +@0812A32A: pop {r4-r6} pop {r0} bx r0 @@ -572953,7 +572953,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 @@ -572979,7 +572979,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] @@ -572988,43 +572988,43 @@ sub_812A36C: @ 812A36C ands r0, r1 strh r0, [r2, 0x2E] cmp r0, 0xF - ble _0812A38C + ble @0812A38C adds r0, r2, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] - b _0812A398 -_0812A38C: + b @0812A398 +@0812A38C: adds r2, 0x3E ldrb r1, [r2] movs r0, 0x5 negs r0, r0 ands r0, r1 strb r0, [r2] -_0812A398: +@0812A398: pop {r0} bx r0 thumb_func_end sub_812A36C thumb_func_start sub_812A39C -sub_812A39C: @ 812A39C +sub_812A39C: ; 812A39C push {lr} ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - bne _0812A3B8 + bne @0812A3B8 ldr r0, =0x085a73d8 bl gpu_pal_obj_alloc_tag_and_apply - b _0812A3BE + b @0812A3BE .align 2, 0 .pool -_0812A3B8: +@0812A3B8: ldr r0, =0x085a73e0 bl gpu_pal_obj_alloc_tag_and_apply -_0812A3BE: +@0812A3BE: pop {r0} bx r0 .align 2, 0 @@ -573032,7 +573032,7 @@ _0812A3BE: thumb_func_end sub_812A39C thumb_func_start sub_812A3C8 -sub_812A3C8: @ 812A3C8 +sub_812A3C8: ; 812A3C8 push {lr} movs r0, 0x8 bl gpu_pal_free_tag @@ -573041,7 +573041,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 @@ -573049,7 +573049,7 @@ sub_812A3D4: @ 812A3D4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0812A430 + bne @0812A430 ldr r0, =0x02021cc4 ldr r1, =0x0203a172 ldrb r2, [r1] @@ -573069,10 +573069,10 @@ sub_812A3D4: @ 812A3D4 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC - b _0812A444 + b @0812A444 .align 2, 0 .pool -_0812A430: +@0812A430: ldr r4, =0x02021fc4 ldr r1, =0x085ea9e0 adds r0, r4, 0 @@ -573081,7 +573081,7 @@ _0812A430: adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC -_0812A444: +@0812A444: pop {r4,r5} pop {r0} bx r0 @@ -573090,7 +573090,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 @@ -573107,7 +573107,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 @@ -573144,7 +573144,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 @@ -573157,13 +573157,13 @@ sub_812A4DC: @ 812A4DC movs r0, 0x8 ldrsh r1, [r4, r0] cmp r1, 0 - beq _0812A500 + beq @0812A500 cmp r1, 0x1 - beq _0812A518 - b _0812A530 + beq @0812A518 + b @0812A530 .align 2, 0 .pool -_0812A500: +@0812A500: movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -573174,19 +573174,19 @@ _0812A500: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0812A530 -_0812A518: + b @0812A530 +@0812A518: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0812A530 + bne @0812A530 ldr r0, =sub_812A588 + 1 bl set_callback2 adds r0, r5, 0 bl remove_task -_0812A530: +@0812A530: add sp, 0x4 pop {r4,r5} pop {r0} @@ -573196,7 +573196,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 @@ -573229,7 +573229,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 @@ -573238,52 +573238,52 @@ sub_812A588: @ 812A588 adds r0, r1 ldrb r0, [r0] cmp r0, 0xB - bhi _0812A666 + bhi @0812A666 lsls r0, 2 - ldr r1, =_0812A5AC + ldr r1, =@0812A5AC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0812A5AC: - .4byte _0812A5DC - .4byte _0812A5E6 - .4byte _0812A5EC - .4byte _0812A5F6 - .4byte _0812A5FC - .4byte _0812A602 - .4byte _0812A608 - .4byte _0812A60E - .4byte _0812A638 - .4byte _0812A63E - .4byte _0812A644 - .4byte _0812A660 -_0812A5DC: +@0812A5AC: + .4byte @0812A5DC + .4byte @0812A5E6 + .4byte @0812A5EC + .4byte @0812A5F6 + .4byte @0812A5FC + .4byte @0812A602 + .4byte @0812A608 + .4byte @0812A60E + .4byte @0812A638 + .4byte @0812A63E + .4byte @0812A644 + .4byte @0812A660 +@0812A5DC: bl sub_812A750 bl sub_812A8C4 - b _0812A64C -_0812A5E6: + b @0812A64C +@0812A5E6: bl sub_812A7BC - b _0812A64C -_0812A5EC: + b @0812A64C +@0812A5EC: bl sub_812A810 bl sub_812A834 - b _0812A64C -_0812A5F6: + b @0812A64C +@0812A5F6: bl sub_812A9AC - b _0812A64C -_0812A5FC: + b @0812A64C +@0812A5FC: bl sub_812A9CC - b _0812A64C -_0812A602: + b @0812A64C +@0812A602: bl sub_812AA48 - b _0812A64C -_0812A608: + b @0812A64C +@0812A608: bl sub_812A79C - b _0812A64C -_0812A60E: + b @0812A64C +@0812A60E: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -573299,17 +573299,17 @@ _0812A60E: bl gpu_sync_bg_show movs r0, 0x3 bl gpu_sync_bg_show - b _0812A64C -_0812A638: + b @0812A64C +@0812A638: bl sub_812FBC4 - b _0812A64C -_0812A63E: + b @0812A64C +@0812A63E: bl sub_812FB14 - b _0812A64C -_0812A644: + b @0812A64C +@0812A644: bl sub_812AA78 bl sub_812AA90 -_0812A64C: +@0812A64C: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -573317,13 +573317,13 @@ _0812A64C: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0812A666 + b @0812A666 .align 2, 0 .pool -_0812A660: +@0812A660: ldr r0, =sub_812A670 + 1 bl set_callback2 -_0812A666: +@0812A666: add sp, 0x4 pop {r0} bx r0 @@ -573332,7 +573332,7 @@ _0812A666: thumb_func_end sub_812A588 thumb_func_start sub_812A670 -sub_812A670: @ 812A670 +sub_812A670: ; 812A670 push {lr} bl run_active_tasks bl call_obj_callbacks @@ -573343,7 +573343,7 @@ sub_812A670: @ 812A670 thumb_func_end sub_812A670 thumb_func_start sub_812A688 -sub_812A688: @ 812A688 +sub_812A688: ; 812A688 push {r4,lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -573377,7 +573377,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 @@ -573406,7 +573406,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 + 1 bl get_task_id_by_function @@ -573433,12 +573433,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 @@ -573469,7 +573469,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 + 1 bl SetVBlankCallback @@ -573486,7 +573486,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 @@ -573502,7 +573502,7 @@ sub_812A7BC: @ 812A7BC movs r0, 0x81 lsls r0, 24 mov r12, r0 -_0812A7DA: +@0812A7DA: strh r6, [r4] mov r0, sp str r0, [r1] @@ -573512,7 +573512,7 @@ _0812A7DA: adds r2, r5 subs r3, r5 cmp r3, r5 - bhi _0812A7DA + bhi @0812A7DA strh r6, [r4] mov r0, sp str r0, [r1] @@ -573531,7 +573531,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 @@ -573551,7 +573551,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 @@ -573608,7 +573608,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} @@ -573661,7 +573661,7 @@ sub_812A8C4: @ 812A8C4 movs r7, 0 ldr r0, =0x085a76b4 mov r8, r0 -_0812A934: +@0812A934: ldr r0, =0x0203ab34 ldr r4, [r0] lsls r6, r7, 1 @@ -573704,7 +573704,7 @@ _0812A934: lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x2 - bls _0812A934 + bls @0812A934 bl sub_8145C30 lsls r0, 16 lsrs r0, 16 @@ -573719,7 +573719,7 @@ _0812A934: thumb_func_end sub_812A8C4 thumb_func_start sub_812A9AC -sub_812A9AC: @ 812A9AC +sub_812A9AC: ; 812A9AC push {lr} bl sub_80A1A74 bl reset_all_obj_data @@ -573735,7 +573735,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 @@ -573780,7 +573780,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 @@ -573802,7 +573802,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 @@ -573813,7 +573813,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 @@ -573824,7 +573824,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 + 1 adds r0, r4, 0 @@ -573841,7 +573841,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 @@ -573850,7 +573850,7 @@ sub_812AAC8: @ 812AAC8 adds r1, r0 lsls r4, r1, 3 ldr r5, =0x03005e00 -_0812AAD8: +@0812AAD8: ldr r0, =0x0203ab34 ldr r0, [r0] ldrb r0, [r0] @@ -573861,7 +573861,7 @@ _0812AAD8: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _0812AAD8 + bne @0812AAD8 pop {r4-r6} pop {r0} bx r0 @@ -573870,7 +573870,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 @@ -573898,20 +573898,20 @@ 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] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0812AB50 + bne @0812AB50 ldr r0, =0x0203ab34 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_0812AB50: +@0812AB50: movs r0, 0 pop {r1} bx r1 @@ -573920,7 +573920,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] @@ -573939,38 +573939,38 @@ sub_812AB60: @ 812AB60 movs r1, 0xC ldrsh r0, [r3, r1] cmp r0, 0 - bgt _0812AB90 + bgt @0812AB90 movs r0, 0x19 strb r0, [r3] - b _0812ABA0 + b @0812ABA0 .align 2, 0 .pool -_0812AB90: +@0812AB90: ldrb r0, [r3, 0xA] cmp r0, 0 - beq _0812ABA0 + beq @0812ABA0 movs r0, 0x3 strb r0, [r3] movs r0, 0x4 bl sub_812DEE4 -_0812ABA0: +@0812ABA0: movs r0, 0x1 pop {r1} bx r1 thumb_func_end sub_812AB60 thumb_func_start sub_812ABA8 -sub_812ABA8: @ 812ABA8 +sub_812ABA8: ; 812ABA8 push {lr} bl sub_812E054 lsls r0, 24 cmp r0, 0 - beq _0812ABBC + beq @0812ABBC ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0x4 strb r0, [r1] -_0812ABBC: +@0812ABBC: movs r0, 0 pop {r1} bx r1 @@ -573979,7 +573979,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 @@ -573992,10 +573992,10 @@ sub_812ABC8: @ 812ABC8 ldrsh r1, [r2, r0] ldr r0, =0x0000270e cmp r1, r0 - ble _0812ABE8 + ble @0812ABE8 movs r0, 0x17 strb r0, [r2] -_0812ABE8: +@0812ABE8: movs r0, 0x1 pop {r1} bx r1 @@ -574004,28 +574004,28 @@ _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] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0812AC1C + beq @0812AC1C movs r0, 0 bl sub_812DC80 ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0x8 - b _0812ACE2 + b @0812ACE2 .align 2, 0 .pool -_0812AC1C: +@0812AC1C: movs r0, 0x80 lsls r0, 1 ands r0, r1 cmp r0, 0 - beq _0812AC82 + beq @0812AC82 ldr r0, =0x0203ab34 ldr r2, [r0] movs r1, 0xC @@ -574035,12 +574035,12 @@ _0812AC1C: ldrsh r1, [r2, r3] adds r0, r1 cmp r0, 0 - blt _0812AC7C + blt @0812AC7C ldrh r4, [r2, 0x12] adds r0, r1, 0 cmp r0, 0x2 - bgt _0812AC5A -_0812AC42: + bgt @0812AC5A +@0812AC42: lsls r0, r4, 24 lsrs r0, 24 bl sub_812CE7C @@ -574051,8 +574051,8 @@ _0812AC42: lsrs r4, r0, 16 asrs r0, 16 cmp r0, 0x2 - ble _0812AC42 -_0812AC5A: + ble @0812AC42 +@0812AC5A: ldr r0, =0x0203ab34 ldr r1, [r0] ldrh r0, [r1, 0xC] @@ -574066,24 +574066,24 @@ _0812AC5A: strb r0, [r1] movs r0, 0x5F bl audio_play - b _0812ACE4 + b @0812ACE4 .align 2, 0 .pool -_0812AC7C: +@0812AC7C: movs r0, 0x6 strb r0, [r2] - b _0812ACE4 -_0812AC82: + b @0812ACE4 +@0812AC82: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0812ACB2 + beq @0812ACB2 ldr r4, =0x0203ab34 ldr r0, [r4] movs r1, 0xC ldrsh r0, [r0, r1] cmp r0, 0 - beq _0812ACB2 + beq @0812ACB2 movs r0, 0x5F bl audio_play ldr r0, [r4] @@ -574096,7 +574096,7 @@ _0812AC82: ldrh r0, [r1, 0x12] adds r0, 0x1 strh r0, [r1, 0x12] -_0812ACB2: +@0812ACB2: ldr r0, =0x0203ab34 ldr r3, [r0] movs r1, 0x12 @@ -574104,28 +574104,28 @@ _0812ACB2: ldr r4, =0x030022c0 adds r5, r0, 0 cmp r2, 0x2 - bgt _0812ACD0 + bgt @0812ACD0 cmp r2, 0 - beq _0812ACD4 + beq @0812ACD4 ldrh r1, [r4, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0812ACD4 -_0812ACD0: + beq @0812ACD4 +@0812ACD0: movs r0, 0x9 strb r0, [r3] -_0812ACD4: +@0812ACD4: ldrh r1, [r4, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0812ACE4 + beq @0812ACE4 ldr r1, [r5] movs r0, 0x15 -_0812ACE2: +@0812ACE2: strb r0, [r1] -_0812ACE4: +@0812ACE4: movs r0, 0 pop {r4,r5} pop {r1} @@ -574135,7 +574135,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 @@ -574166,14 +574166,14 @@ 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] movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _0812AD52 + beq @0812AD52 movs r0, 0 movs r1, 0x1 bl sub_8197434 @@ -574181,7 +574181,7 @@ sub_812AD34: @ 812AD34 ldr r1, [r0] movs r0, 0x5 strb r0, [r1] -_0812AD52: +@0812AD52: movs r0, 0 pop {r1} bx r1 @@ -574190,17 +574190,17 @@ _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 cmp r0, 0 - beq _0812AD74 + beq @0812AD74 ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0x5 strb r0, [r1] -_0812AD74: +@0812AD74: movs r0, 0 pop {r1} bx r1 @@ -574209,7 +574209,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 @@ -574229,19 +574229,19 @@ sub_812AD80: @ 812AD80 movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0812ADC4 + beq @0812ADC4 bl sub_812D4AC ldr r1, [r4] movs r0, 0xA - b _0812ADCE + b @0812ADCE .align 2, 0 .pool -_0812ADC4: +@0812ADC4: movs r0, 0x1 bl sub_812DEE4 ldr r1, [r4] movs r0, 0xB -_0812ADCE: +@0812ADCE: strb r0, [r1] ldr r4, =0x0203ab34 ldr r0, [r4] @@ -574249,11 +574249,11 @@ _0812ADCE: strh r1, [r0, 0x1A] ldrb r0, [r0, 0xA] cmp r0, 0 - beq _0812ADE6 + beq @0812ADE6 bl dp15_jump_random_unknown ldr r1, [r4] strh r0, [r1, 0x1A] -_0812ADE6: +@0812ADE6: movs r0, 0 pop {r4} pop {r1} @@ -574263,12 +574263,12 @@ _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 cmp r0, 0 - beq _0812AE18 + beq @0812AE18 movs r0, 0x1 bl sub_812DEE4 ldr r3, =0x0203ab34 @@ -574280,7 +574280,7 @@ sub_812ADF4: @ 812ADF4 ldr r1, [r3] movs r0, 0xB strb r0, [r1] -_0812AE18: +@0812AE18: movs r0, 0 pop {r1} bx r1 @@ -574289,7 +574289,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 @@ -574297,13 +574297,13 @@ sub_812AE24: @ 812AE24 lsls r1, 16 asrs r1, 16 cmp r1, 0x1D - ble _0812AE40 + ble @0812AE40 bl sub_812B55C ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0xC strb r0, [r1] -_0812AE40: +@0812AE40: movs r0, 0 pop {r1} bx r1 @@ -574312,14 +574312,14 @@ _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] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0812AE78 + beq @0812AE78 movs r0, 0x18 bl audio_play ldr r4, =0x0203ab34 @@ -574332,7 +574332,7 @@ sub_812AE4C: @ 812AE4C ldr r1, [r4] movs r0, 0xD strb r0, [r1] -_0812AE78: +@0812AE78: movs r0, 0 pop {r4} pop {r1} @@ -574342,7 +574342,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] @@ -574350,7 +574350,7 @@ sub_812AE88: @ 812AE88 bl sub_812BF04 lsls r0, 24 cmp r0, 0 - bne _0812AEBC + bne @0812AEBC ldr r1, [r4] ldrh r0, [r1, 0x18] adds r0, 0x1 @@ -574361,24 +574361,24 @@ sub_812AE88: @ 812AE88 movs r2, 0x18 ldrsh r0, [r1, r2] cmp r0, 0x2 - ble _0812AEB4 + ble @0812AEB4 movs r0, 0xE strb r0, [r1] -_0812AEB4: +@0812AEB4: movs r0, 0x1 - b _0812AEBE + b @0812AEBE .align 2, 0 .pool -_0812AEBC: +@0812AEBC: movs r0, 0 -_0812AEBE: +@0812AEBE: pop {r4} pop {r1} bx r1 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] @@ -574390,18 +574390,18 @@ sub_812AEC4: @ 812AEC4 ldr r1, [r4] ldrb r0, [r1, 0xA] cmp r0, 0 - beq _0812AEEA + beq @0812AEEA subs r0, 0x1 strb r0, [r1, 0xA] ldr r1, [r4] ldrb r0, [r1, 0xB] adds r0, 0x1 strb r0, [r1, 0xB] -_0812AEEA: +@0812AEEA: ldr r1, [r4] ldrh r0, [r1, 0x8] cmp r0, 0 - beq _0812AFCC + beq @0812AFCC movs r0, 0xF strb r0, [r1] bl sub_812BABC @@ -574413,43 +574413,43 @@ _0812AEEA: strh r0, [r2, 0x10] lsls r0, 16 cmp r0, 0 - bge _0812AF12 + bge @0812AF12 movs r0, 0 strh r0, [r2, 0x10] -_0812AF12: +@0812AF12: ldr r0, [r4] ldrh r1, [r0, 0x8] movs r0, 0xC0 lsls r0, 1 ands r0, r1 cmp r0, 0 - beq _0812AF38 + beq @0812AF38 ldr r0, =0x00000185 bl fanfare_play movs r0, 0x6 bl sub_812DEE4 - b _0812AF62 + b @0812AF62 .align 2, 0 .pool -_0812AF38: +@0812AF38: movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0812AF54 + beq @0812AF54 ldr r0, =0x00000185 bl fanfare_play movs r0, 0x5 bl sub_812DEE4 - b _0812AF62 + b @0812AF62 .align 2, 0 .pool -_0812AF54: +@0812AF54: movs r0, 0xC3 lsls r0, 1 bl fanfare_play movs r0, 0x2 bl sub_812DEE4 -_0812AF62: +@0812AF62: ldr r2, =0x0203ab34 ldr r3, [r2] ldrh r1, [r3, 0x8] @@ -574457,7 +574457,7 @@ _0812AF62: lsls r0, 1 ands r0, r1 cmp r0, 0 - beq _0812AFA6 + beq @0812AFA6 ldrb r1, [r3, 0x4] movs r0, 0x3F ands r0, r1 @@ -574469,7 +574469,7 @@ _0812AF62: lsls r0, 1 ands r0, r1 cmp r0, 0 - beq _0812AFA6 + beq @0812AFA6 strb r4, [r3, 0xA] ldr r0, [r2] strb r4, [r0, 0xB] @@ -574481,28 +574481,28 @@ _0812AF62: lsls r0, 1 ands r0, r1 cmp r0, 0 - beq _0812AFA6 + beq @0812AFA6 movs r0, 0x1 strb r0, [r3, 0x3] -_0812AFA6: +@0812AFA6: ldr r3, [r2] ldrh r1, [r3, 0x8] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0812AFEE + beq @0812AFEE ldrb r0, [r3, 0x2] cmp r0, 0xF - bhi _0812AFEE + bhi @0812AFEE adds r0, 0x1 strb r0, [r3, 0x2] ldr r0, [r2] ldrb r0, [r0, 0x2] bl sub_812D1A8 - b _0812AFEE + b @0812AFEE .align 2, 0 .pool -_0812AFCC: +@0812AFCC: movs r0, 0x3 bl sub_812DEE4 ldr r1, [r4] @@ -574517,9 +574517,9 @@ _0812AFCC: asrs r0, 16 ldr r2, =0x0000270f cmp r0, r2 - ble _0812AFEE + ble @0812AFEE strh r2, [r1, 0x10] -_0812AFEE: +@0812AFEE: movs r0, 0 pop {r4} pop {r1} @@ -574529,17 +574529,17 @@ _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 cmp r0, 0 - beq _0812B010 + beq @0812B010 ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0x10 strb r0, [r1] -_0812B010: +@0812B010: movs r0, 0 pop {r1} bx r1 @@ -574548,12 +574548,12 @@ _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 cmp r0, 0 - beq _0812B088 + beq @0812B088 ldr r4, =0x0203ab34 ldr r1, [r4] movs r0, 0x13 @@ -574564,46 +574564,46 @@ sub_812B01C: @ 812B01C lsls r0, 1 ands r0, r1 cmp r0, 0 - beq _0812B044 + beq @0812B044 movs r0, 0x1C bl sav12_xor_increment -_0812B044: +@0812B044: ldr r2, [r4] ldrh r1, [r2, 0x8] movs r3, 0x4 adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _0812B05A + beq @0812B05A movs r0, 0 strh r0, [r2, 0x18] movs r0, 0x9 strb r0, [r2] -_0812B05A: +@0812B05A: ldr r2, [r4] ldrh r1, [r2, 0x8] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0812B06A + beq @0812B06A movs r0, 0x11 strb r0, [r2] -_0812B06A: +@0812B06A: ldr r1, [r4] ldrb r0, [r1, 0xA] cmp r0, 0 - beq _0812B088 + beq @0812B088 ldrh r1, [r1, 0x8] adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _0812B088 + beq @0812B088 movs r0, 0x4 bl sub_812DEE4 ldr r1, [r4] movs r0, 0x12 strb r0, [r1] -_0812B088: +@0812B088: movs r0, 0 pop {r4} pop {r1} @@ -574613,12 +574613,12 @@ _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 cmp r0, 0 - bne _0812B0CC + bne @0812B0CC ldr r4, =0x0203ab34 ldr r1, [r4] movs r0, 0x13 @@ -574628,19 +574628,19 @@ sub_812B094: @ 812B094 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0812B0CC + beq @0812B0CC movs r0, 0x9 strb r0, [r2] ldr r0, [r4] ldrb r0, [r0, 0xA] cmp r0, 0 - beq _0812B0CC + beq @0812B0CC movs r0, 0x4 bl sub_812DEE4 ldr r1, [r4] movs r0, 0x12 strb r0, [r1] -_0812B0CC: +@0812B0CC: movs r0, 0 pop {r4} pop {r1} @@ -574650,12 +574650,12 @@ _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 cmp r0, 0 - beq _0812B0FC + beq @0812B0FC ldr r2, =0x0203ab34 ldr r1, [r2] movs r0, 0x13 @@ -574665,10 +574665,10 @@ sub_812B0D8: @ 812B0D8 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0812B0FC + beq @0812B0FC movs r0, 0x9 strb r0, [r2] -_0812B0FC: +@0812B0FC: movs r0, 0 pop {r1} bx r1 @@ -574677,7 +574677,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 @@ -574697,7 +574697,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] @@ -574706,14 +574706,14 @@ sub_812B130: @ 812B130 lsls r0, 16 asrs r0, 16 cmp r0, 0x40 - ble _0812B14E + ble @0812B14E movs r0, 0 strh r0, [r1, 0xA] ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0x13 strb r0, [r1] -_0812B14E: +@0812B14E: movs r0, 0 pop {r1} bx r1 @@ -574722,7 +574722,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 @@ -574764,13 +574764,13 @@ 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 asrs r1, r0, 24 cmp r1, 0 - bne _0812B1EC + bne @0812B1EC movs r0, 0 movs r1, 0x1 bl sub_8197434 @@ -574787,26 +574787,26 @@ sub_812B1B0: @ 812B1B0 adds r0, r2 strh r0, [r1, 0xC] movs r0, 0x1B - b _0812B206 + b @0812B206 .align 2, 0 .pool -_0812B1EC: +@0812B1EC: cmp r1, 0x1 - beq _0812B1F8 + beq @0812B1F8 movs r0, 0x1 negs r0, r0 cmp r1, r0 - bne _0812B208 -_0812B1F8: + bne @0812B208 +@0812B1F8: movs r0, 0 movs r1, 0x1 bl sub_8197434 ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0x5 -_0812B206: +@0812B206: strb r0, [r1] -_0812B208: +@0812B208: movs r0, 0 pop {r1} bx r1 @@ -574815,7 +574815,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 @@ -574846,14 +574846,14 @@ 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] movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _0812B272 + beq @0812B272 movs r0, 0 movs r1, 0x1 bl sub_8197434 @@ -574861,7 +574861,7 @@ sub_812B254: @ 812B254 ldr r1, [r0] movs r0, 0x5 strb r0, [r1] -_0812B272: +@0812B272: movs r0, 0 pop {r1} bx r1 @@ -574870,7 +574870,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 @@ -574901,14 +574901,14 @@ 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] movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _0812B2DE + beq @0812B2DE movs r0, 0 movs r1, 0x1 bl sub_8197434 @@ -574916,7 +574916,7 @@ sub_812B2C0: @ 812B2C0 ldr r1, [r0] movs r0, 0x1B strb r0, [r1] -_0812B2DE: +@0812B2DE: movs r0, 0 pop {r1} bx r1 @@ -574925,7 +574925,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 @@ -574957,7 +574957,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] @@ -574966,9 +574966,9 @@ sub_812B32C: @ 812B32C lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - beq _0812B340 - b _0812B470 -_0812B340: + beq @0812B340 + b @0812B470 +@0812B340: ldr r6, =0x0203ab34 ldr r0, [r6] ldr r0, [r0, 0x64] @@ -575032,31 +575032,31 @@ _0812B340: ldr r4, =0x0203aae4 ldr r0, [r4] cmp r0, 0 - beq _0812B3E4 + beq @0812B3E4 bl free str r5, [r4] -_0812B3E4: +@0812B3E4: ldr r4, =0x0203aae8 ldr r0, [r4] cmp r0, 0 - beq _0812B3F2 + beq @0812B3F2 bl free str r5, [r4] -_0812B3F2: +@0812B3F2: ldr r4, =0x0203aaec ldr r0, [r4] cmp r0, 0 - beq _0812B400 + beq @0812B400 bl free str r5, [r4] -_0812B400: +@0812B400: ldr r4, =0x0203aaf0 ldr r0, [r4] cmp r0, 0 - beq _0812B40E + beq @0812B40E bl free str r5, [r4] -_0812B40E: +@0812B40E: ldr r4, =0x0203aac8 ldr r0, [r4] bl free @@ -575096,7 +575096,7 @@ _0812B40E: ldr r0, [r6] bl free str r5, [r6] -_0812B470: +@0812B470: movs r0, 0 pop {r4-r6} pop {r1} @@ -575106,27 +575106,27 @@ _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] ldrb r0, [r1, 0xA] cmp r0, 0 - bne _0812B54A + bne @0812B54A ldrb r1, [r1, 0x4] movs r0, 0xC0 ands r0, r1 cmp r0, 0 - bne _0812B54A + bne @0812B54A bl sub_812B5B0 lsls r0, 24 cmp r0, 0 - beq _0812B52C + beq @0812B52C bl sub_812B5EC lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3 - beq _0812B52C + beq @0812B52C ldr r2, [r4] ldr r1, =0x085a77fe lsls r0, r3, 1 @@ -575136,13 +575136,13 @@ sub_812B4EC: @ 812B4EC orrs r0, r1 strb r0, [r2, 0x4] cmp r3, 0x1 - bne _0812B54A -_0812B52C: + bne @0812B54A +@0812B52C: bl sub_812B634 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x5 - beq _0812B54A + beq @0812B54A ldr r0, =0x0203ab34 ldr r2, [r0] ldr r1, =0x085a7804 @@ -575152,7 +575152,7 @@ _0812B52C: ldrb r0, [r2, 0x4] orrs r0, r1 strb r0, [r2, 0x4] -_0812B54A: +@0812B54A: pop {r4} pop {r0} bx r0 @@ -575161,7 +575161,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] @@ -575170,10 +575170,10 @@ sub_812B55C: @ 812B55C ldr r2, [r2] ldrb r0, [r2, 0x4] cmp r0, 0 - beq _0812B572 + beq @0812B572 movs r0, 0x1 strb r0, [r2, 0x6] -_0812B572: +@0812B572: pop {r0} bx r0 .align 2, 0 @@ -575181,39 +575181,39 @@ _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 movs r2, 0 movs r3, 0x1 ldr r4, =0x085a77f6 -_0812B588: +@0812B588: adds r0, r1, 0 ands r0, r3 cmp r0, 0 - beq _0812B59C + beq @0812B59C adds r0, r2, r4 ldrb r0, [r0] - b _0812B5AA + b @0812B5AA .align 2, 0 .pool -_0812B59C: +@0812B59C: lsrs r1, 1 adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x7 - bls _0812B588 + bls @0812B588 movs r0, 0 -_0812B5AA: +@0812B5AA: pop {r4} pop {r1} bx r1 thumb_func_end sub_812B57C thumb_func_start sub_812B5B0 -sub_812B5B0: @ 812B5B0 +sub_812B5B0: ; 812B5B0 push {r4,lr} bl GenerateRandomNumber lsls r0, 24 @@ -575231,25 +575231,25 @@ sub_812B5B0: @ 812B5B0 adds r2, r4 ldrb r1, [r2] cmp r1, r0 - bhi _0812B5E4 + bhi @0812B5E4 movs r0, 0 - b _0812B5E6 + b @0812B5E6 .align 2, 0 .pool -_0812B5E4: +@0812B5E4: movs r0, 0x1 -_0812B5E6: +@0812B5E6: pop {r4} pop {r1} bx r1 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, =0x085a76d2 -_0812B5F2: +@0812B5F2: bl GenerateRandomNumber movs r2, 0xFF ldr r1, =0x0203ab34 @@ -575265,14 +575265,14 @@ _0812B5F2: ldrb r1, [r1] ands r2, r0 cmp r1, r2 - bgt _0812B620 + bgt @0812B620 adds r0, r4, 0x1 lsls r0, 16 lsrs r5, r0, 16 asrs r0, 16 cmp r0, 0x2 - ble _0812B5F2 -_0812B620: + ble @0812B5F2 +@0812B620: lsls r0, r5, 24 lsrs r0, 24 pop {r4-r6} @@ -575283,7 +575283,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} @@ -575292,7 +575292,7 @@ sub_812B634: @ 812B634 mov r8, r0 movs r7, 0x80 lsls r7, 17 -_0812B644: +@0812B644: bl GenerateRandomNumber movs r5, 0xFF ands r5, r0 @@ -575308,47 +575308,47 @@ _0812B644: add r0, r8 ldrb r3, [r0] cmp r1, 0 - bne _0812B680 + bne @0812B680 ldrb r0, [r4, 0x3] cmp r0, 0x1 - bne _0812B680 + bne @0812B680 adds r3, 0xA asrs r0, r7, 16 cmp r3, r0 - ble _0812B69E + ble @0812B69E adds r3, r0, 0 - b _0812B69E + b @0812B69E .align 2, 0 .pool -_0812B680: +@0812B680: asrs r0, r2, 16 cmp r0, 0x4 - bne _0812B69E + bne @0812B69E ldr r0, =0x0203ab34 ldr r0, [r0] ldrb r0, [r0, 0x3] cmp r0, 0x1 - bne _0812B69E + bne @0812B69E lsls r0, r3, 16 ldr r1, =0xfff60000 adds r0, r1 lsrs r3, r0, 16 cmp r0, 0 - bge _0812B69E + bge @0812B69E movs r3, 0 -_0812B69E: +@0812B69E: lsls r0, r3, 16 asrs r0, 16 cmp r0, r5 - bgt _0812B6B4 + bgt @0812B6B4 movs r3, 0x80 lsls r3, 9 adds r0, r2, r3 lsrs r6, r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _0812B644 -_0812B6B4: + ble @0812B644 +@0812B6B4: lsls r0, r6, 24 lsrs r0, 24 pop {r3} @@ -575361,7 +575361,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 @@ -575369,14 +575369,14 @@ sub_812B6CC: @ 812B6CC ldr r2, [r0] ldrb r0, [r2, 0x3] cmp r0, 0 - beq _0812B6E8 + beq @0812B6E8 ldr r0, =0x085a7768 - b _0812B6EA + b @0812B6EA .align 2, 0 .pool -_0812B6E8: +@0812B6E8: ldr r0, =0x085a7702 -_0812B6EA: +@0812B6EA: lsls r1, r3, 4 adds r1, r3 ldrb r2, [r2, 0x2] @@ -575390,7 +575390,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] @@ -575404,20 +575404,20 @@ sub_812B700: @ 812B700 lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bcc _0812B754 + bcc @0812B754 movs r6, 0x5 - b _0812B72E + b @0812B72E .align 2, 0 .pool -_0812B728: +@0812B728: subs r0, r5, 0x1 lsls r0, 16 lsrs r6, r0, 16 -_0812B72E: +@0812B72E: lsls r0, r6, 16 asrs r5, r0, 16 cmp r5, 0 - ble _0812B74E + ble @0812B74E bl GenerateRandomNumber lsls r0, 24 lsrs r4, r0, 24 @@ -575427,12 +575427,12 @@ _0812B72E: lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bcs _0812B728 -_0812B74E: + bcs @0812B728 +@0812B74E: ldr r0, =0x0203ab34 ldr r0, [r0] strb r6, [r0, 0x5] -_0812B754: +@0812B754: pop {r4-r6} pop {r0} bx r0 @@ -575441,7 +575441,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 @@ -575454,21 +575454,21 @@ sub_812B760: @ 812B760 adds r4, r0 ldrh r4, [r4] cmp r1, r4 - bcc _0812B784 + bcc @0812B784 movs r0, 0 - b _0812B786 + b @0812B786 .align 2, 0 .pool -_0812B784: +@0812B784: movs r0, 0x1 -_0812B786: +@0812B786: pop {r4} pop {r1} bx r1 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 @@ -575477,26 +575477,26 @@ dp15_jump_random_unknown: @ 812B78C ldrsh r1, [r0, r2] ldr r0, =0x0000012b cmp r1, r0 - ble _0812B7AC + ble @0812B7AC movs r4, 0x4 - b _0812B7C2 + b @0812B7C2 .align 2, 0 .pool -_0812B7AC: +@0812B7AC: cmp r1, 0xF9 - ble _0812B7B4 + ble @0812B7B4 movs r4, 0x3 - b _0812B7C2 -_0812B7B4: + b @0812B7C2 +@0812B7B4: cmp r1, 0xC7 - ble _0812B7BC + ble @0812B7BC movs r4, 0x2 - b _0812B7C2 -_0812B7BC: + b @0812B7C2 +@0812B7BC: cmp r1, 0x95 - ble _0812B7C2 + ble @0812B7C2 movs r4, 0x1 -_0812B7C2: +@0812B7C2: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -575509,12 +575509,12 @@ _0812B7C2: adds r0, r4, r5 ldrb r0, [r0] cmp r1, r0 - bcs _0812B7E8 + bcs @0812B7E8 movs r0, 0x4 - b _0812B822 + b @0812B822 .align 2, 0 .pool -_0812B7E8: +@0812B7E8: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -575534,21 +575534,21 @@ _0812B7E8: adds r1, r2 lsls r1, 24 cmp r0, r1 - bcc _0812B820 + bcc @0812B820 movs r0, 0x8 - b _0812B822 + b @0812B822 .align 2, 0 .pool -_0812B820: +@0812B820: movs r0, 0x2 -_0812B822: +@0812B822: pop {r4,r5} pop {r1} bx r1 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] @@ -575559,16 +575559,16 @@ sub_812B828: @ 812B828 movs r1, 0x12 ldrsh r0, [r0, r1] cmp r0, 0x1 - ble _0812B844 + ble @0812B844 bl sub_812B8D0 -_0812B844: +@0812B844: ldr r0, [r4] movs r1, 0x12 ldrsh r0, [r0, r1] cmp r0, 0x2 - ble _0812B852 + ble @0812B852 bl sub_812B9A0 -_0812B852: +@0812B852: pop {r4} pop {r0} bx r0 @@ -575577,7 +575577,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 @@ -575603,7 +575603,7 @@ sub_812B85C: @ 812B85C lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x9 - beq _0812B8BC + beq @0812B8BC ldr r0, =0x0203ab34 ldr r2, [r0] ldr r0, =0x085a7828 @@ -575621,7 +575621,7 @@ sub_812B85C: @ 812B85C strh r0, [r2, 0x8] movs r0, 0 bl sub_812CF34 -_0812B8BC: +@0812B8BC: pop {r4,r5} pop {r0} bx r0 @@ -575630,7 +575630,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 @@ -575653,11 +575653,11 @@ sub_812B8D0: @ 812B8D0 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x9 - beq _0812B930 + beq @0812B930 cmp r1, 0 - bne _0812B90C + bne @0812B90C movs r1, 0x1 -_0812B90C: +@0812B90C: ldr r0, =0x0203ab34 ldr r2, [r0] ldr r0, =0x085a7828 @@ -575675,7 +575675,7 @@ _0812B90C: strh r0, [r2, 0x8] movs r0, 0x1 bl sub_812CF34 -_0812B930: +@0812B930: movs r0, 0 movs r1, 0x3 bl sub_812BC44 @@ -575697,11 +575697,11 @@ _0812B930: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x9 - beq _0812B98E + beq @0812B98E cmp r1, 0 - bne _0812B96A + bne @0812B96A movs r1, 0x1 -_0812B96A: +@0812B96A: ldr r0, =0x0203ab34 ldr r2, [r0] ldr r0, =0x085a7828 @@ -575719,7 +575719,7 @@ _0812B96A: strh r0, [r2, 0x8] movs r0, 0x2 bl sub_812CF34 -_0812B98E: +@0812B98E: pop {r4,r5} pop {r0} bx r0 @@ -575728,7 +575728,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 @@ -575751,9 +575751,9 @@ sub_812B9A0: @ 812B9A0 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x9 - beq _0812B9FE + beq @0812B9FE cmp r1, 0 - beq _0812B9F8 + beq @0812B9F8 ldr r0, =0x0203ab34 ldr r2, [r0] ldr r0, =0x085a7828 @@ -575769,10 +575769,10 @@ sub_812B9A0: @ 812B9A0 ldrh r1, [r1] orrs r0, r1 strh r0, [r2, 0x8] -_0812B9F8: +@0812B9F8: movs r0, 0x3 bl sub_812CF34 -_0812B9FE: +@0812B9FE: movs r0, 0 movs r1, 0x3 bl sub_812BC44 @@ -575794,9 +575794,9 @@ _0812B9FE: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x9 - beq _0812BA5A + beq @0812BA5A cmp r1, 0 - beq _0812BA54 + beq @0812BA54 ldr r0, =0x0203ab34 ldr r2, [r0] ldr r0, =0x085a7828 @@ -575812,10 +575812,10 @@ _0812B9FE: ldrh r1, [r1] orrs r0, r1 strh r0, [r2, 0x8] -_0812BA54: +@0812BA54: movs r0, 0x4 bl sub_812CF34 -_0812BA5A: +@0812BA5A: pop {r4,r5} pop {r0} bx r0 @@ -575824,7 +575824,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 @@ -575833,46 +575833,46 @@ sub_812BA6C: @ 812BA6C lsls r2, 24 lsrs r2, 24 cmp r3, r1 - bne _0812BA90 + bne @0812BA90 cmp r3, r2 - bne _0812BA90 + bne @0812BA90 ldr r0, =0x085a780e adds r0, r3, r0 ldrb r0, [r0] - b _0812BAB6 + b @0812BAB6 .align 2, 0 .pool -_0812BA90: +@0812BA90: cmp r3, 0 - bne _0812BA9C + bne @0812BA9C cmp r1, 0 - bne _0812BA9C + bne @0812BA9C cmp r2, 0x1 - beq _0812BAA8 -_0812BA9C: + beq @0812BAA8 +@0812BA9C: cmp r3, 0x1 - bne _0812BAAC + bne @0812BAAC cmp r1, 0x1 - bne _0812BAAC + bne @0812BAAC cmp r2, 0 - bne _0812BAAC -_0812BAA8: + bne @0812BAAC +@0812BAA8: movs r0, 0x6 - b _0812BAB6 -_0812BAAC: + b @0812BAB6 +@0812BAAC: cmp r3, 0x4 - beq _0812BAB4 + beq @0812BAB4 movs r0, 0x9 - b _0812BAB6 -_0812BAB4: + b @0812BAB6 +@0812BAB4: movs r0, 0 -_0812BAB6: +@0812BAB6: pop {r1} bx r1 thumb_func_end sub_812BA6C thumb_func_start sub_812BABC -sub_812BABC: @ 812BABC +sub_812BABC: ; 812BABC push {r4,lr} ldr r4, =sub_812BAFC + 1 adds r0, r4, 0 @@ -575889,27 +575889,27 @@ 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 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _0812BAF4 + beq @0812BAF4 movs r0, 0 - b _0812BAF6 + b @0812BAF6 .align 2, 0 .pool -_0812BAF4: +@0812BAF4: movs r0, 0x1 -_0812BAF6: +@0812BAF6: pop {r1} bx r1 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 @@ -575919,7 +575919,7 @@ sub_812BAFC: @ 812BAFC adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_0812BB0E: +@0812BB0E: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -575929,7 +575929,7 @@ _0812BB0E: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _0812BB0E + bne @0812BB0E pop {r4,r5} pop {r0} bx r0 @@ -575938,13 +575938,13 @@ _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 lsls r0, 24 cmp r0, 0 - beq _0812BB60 + beq @0812BB60 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -575953,23 +575953,23 @@ sub_812BB34: @ 812BB34 movs r1, 0xE ldrsh r0, [r0, r1] cmp r0, 0 - bne _0812BB60 + bne @0812BB60 movs r0, 0x2 strh r0, [r4, 0x8] movs r0, 0x1 - b _0812BB62 + b @0812BB62 .align 2, 0 .pool -_0812BB60: +@0812BB60: movs r0, 0 -_0812BB62: +@0812BB62: pop {r4} pop {r1} bx r1 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] @@ -575980,14 +575980,14 @@ sub_812BB68: @ 812BB68 movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _0812BBBC + bne @0812BBBC bl task_is_not_running_overworld_fanfare lsls r0, 24 cmp r0, 0 - beq _0812BB8E + beq @0812BB8E movs r0, 0x15 bl audio_play -_0812BB8E: +@0812BB8E: ldr r0, =0x0203ab34 ldr r2, [r0] ldrh r0, [r2, 0xE] @@ -575998,10 +575998,10 @@ _0812BB8E: ldrsh r1, [r2, r0] ldr r0, =0x0000270e cmp r1, r0 - bgt _0812BBA8 + bgt @0812BBA8 adds r0, r3, 0x1 strh r0, [r2, 0xC] -_0812BBA8: +@0812BBA8: movs r0, 0x8 strh r0, [r4, 0xA] ldr r0, =0x030022c0 @@ -576009,20 +576009,20 @@ _0812BBA8: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0812BBBC + beq @0812BBBC movs r0, 0x4 strh r0, [r4, 0xA] -_0812BBBC: +@0812BBBC: bl task_is_not_running_overworld_fanfare lsls r0, 24 cmp r0, 0 - beq _0812BBF6 + beq @0812BBF6 ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _0812BBF6 + beq @0812BBF6 movs r0, 0x15 bl audio_play ldr r1, =0x0203ab34 @@ -576035,23 +576035,23 @@ _0812BBBC: asrs r0, 16 ldr r3, =0x0000270f cmp r0, r3 - ble _0812BBF0 + ble @0812BBF0 strh r3, [r2, 0xC] -_0812BBF0: +@0812BBF0: ldr r1, [r1] movs r0, 0 strh r0, [r1, 0xE] -_0812BBF6: +@0812BBF6: ldr r0, =0x0203ab34 ldr r0, [r0] movs r1, 0xE ldrsh r0, [r0, r1] cmp r0, 0 - bne _0812BC08 + bne @0812BC08 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_0812BC08: +@0812BC08: movs r0, 0 pop {r4} pop {r1} @@ -576061,18 +576061,18 @@ _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 cmp r0, 0 - beq _0812BC3A + beq @0812BC3A ldr r0, =sub_812BAFC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task -_0812BC3A: +@0812BC3A: movs r0, 0 pop {r1} bx r1 @@ -576081,7 +576081,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 @@ -576102,11 +576102,11 @@ sub_812BC44: @ 812BC44 lsrs r1, r0, 16 asrs r0, 16 cmp r0, 0 - bge _0812BC76 + bge @0812BC76 adds r0, 0x15 lsls r0, 16 lsrs r1, r0, 16 -_0812BC76: +@0812BC76: ldr r2, =0x085a766e lsls r1, 16 asrs r1, 16 @@ -576125,7 +576125,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 @@ -576144,9 +576144,9 @@ sub_812BC98: @ 812BC98 bl __modsi3 lsls r0, 16 cmp r0, 0 - beq _0812BCC2 + beq @0812BCC2 ldr r6, =0x0000ffff -_0812BCC2: +@0812BCC2: lsls r1, r5, 16 asrs r1, 16 lsls r0, r6, 16 @@ -576166,7 +576166,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] @@ -576182,11 +576182,11 @@ sub_812BCE8: @ 812BCE8 lsrs r1, r0, 16 asrs r0, 16 cmp r0, 0 - bge _0812BD10 + bge @0812BD10 adds r0, 0x6 lsls r0, 16 lsrs r1, r0, 16 -_0812BD10: +@0812BD10: ldr r0, =0x085a76ad lsls r1, 16 asrs r1, 16 @@ -576199,7 +576199,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 @@ -576237,7 +576237,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 @@ -576258,13 +576258,13 @@ sub_812BD70: @ 812BD70 lsls r2, r0, 16 asrs r1, r2, 16 cmp r1, 0 - beq _0812BDC4 + beq @0812BDC4 lsls r0, r4, 16 asrs r0, 16 cmp r1, r0 - bge _0812BDA6 + bge @0812BDA6 lsrs r4, r2, 16 -_0812BDA6: +@0812BDA6: lsls r1, r4, 16 asrs r1, 16 adds r0, r5, 0 @@ -576278,7 +576278,7 @@ _0812BDA6: bl __modsi3 lsls r0, 16 lsrs r0, 16 -_0812BDC4: +@0812BDC4: lsls r0, 16 asrs r0, 16 pop {r4-r7} @@ -576289,7 +576289,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] @@ -576318,7 +576318,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 @@ -576333,13 +576333,13 @@ sub_812BE0C: @ 812BE0C lsls r2, r0, 16 asrs r1, r2, 16 cmp r1, 0 - beq _0812BE4E + beq @0812BE4E lsls r0, r4, 16 asrs r0, 16 cmp r1, r0 - bge _0812BE36 + bge @0812BE36 lsrs r4, r2, 16 -_0812BE36: +@0812BE36: lsls r0, r4, 16 asrs r0, 16 bl sub_812BDD4 @@ -576350,7 +576350,7 @@ _0812BE36: bl __modsi3 lsls r0, 16 lsrs r0, 16 -_0812BE4E: +@0812BE4E: lsls r0, 16 asrs r0, 16 pop {r4,r5} @@ -576361,12 +576361,12 @@ _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 + 1 ldr r6, =0x03005e00 -_0812BE64: +@0812BE64: adds r0, r5, 0 movs r1, 0x2 bl AddTask @@ -576387,7 +576387,7 @@ _0812BE64: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _0812BE64 + bls @0812BE64 pop {r4-r6} pop {r0} bx r0 @@ -576396,7 +576396,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 @@ -576426,7 +576426,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 @@ -576447,7 +576447,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 @@ -576469,7 +576469,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 @@ -576479,7 +576479,7 @@ sub_812BF2C: @ 812BF2C adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_0812BF3E: +@0812BF3E: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -576489,7 +576489,7 @@ _0812BF3E: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _0812BF3E + bne @0812BF3E pop {r4,r5} pop {r0} bx r0 @@ -576498,13 +576498,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 @@ -576522,7 +576522,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] @@ -576547,13 +576547,13 @@ sub_812BF88: @ 812BF88 strh r2, [r0] ldrb r0, [r3, 0xA] cmp r0, 0 - bne _0812BFF4 + bne @0812BFF4 ldrb r0, [r3, 0x4] cmp r0, 0 - beq _0812BFDC + beq @0812BFDC ldrb r0, [r3, 0x6] cmp r0, 0 - beq _0812BFDC + beq @0812BFDC ldr r1, =0x085a74e4 movs r2, 0x26 ldrsh r0, [r4, r2] @@ -576563,8 +576563,8 @@ sub_812BF88: @ 812BF88 bl _call_via_r0 lsls r0, 24 cmp r0, 0 - bne _0812BFF4 -_0812BFDC: + bne @0812BFF4 +@0812BFDC: ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0 @@ -576576,7 +576576,7 @@ _0812BFDC: adds r0, r1 ldr r0, [r0] bl _call_via_r0 -_0812BFF4: +@0812BFF4: ldr r0, =0x0203ab34 ldr r1, [r0] movs r2, 0x26 @@ -576595,7 +576595,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 @@ -576618,17 +576618,17 @@ sub_812C01C: @ 812C01C lsls r0, 16 lsrs r2, r0, 16 cmp r0, 0 - beq _0812C068 + beq @0812C068 ldrh r0, [r4, 0x26] lsls r0, 24 lsrs r0, 24 movs r6, 0x1A ldrsh r1, [r5, r6] bl sub_812BD70 - b _0812C0A0 + b @0812C0A0 .align 2, 0 .pool -_0812C068: +@0812C068: adds r0, r5, 0 adds r0, 0x2E adds r1, r0, r6 @@ -576636,7 +576636,7 @@ _0812C068: movs r6, 0 ldrsh r0, [r1, r6] cmp r0, 0 - beq _0812C0A4 + beq @0812C0A4 subs r0, r3, 0x1 strh r0, [r1] ldrh r0, [r4, 0x26] @@ -576655,12 +576655,12 @@ _0812C068: ldrsh r0, [r1, r2] movs r1, 0x18 bl __modsi3 -_0812C0A0: +@0812C0A0: lsls r0, 16 lsrs r2, r0, 16 -_0812C0A4: +@0812C0A4: cmp r2, 0 - bne _0812C0D2 + bne @0812C0D2 ldr r0, =0x0203ab34 ldr r1, [r0] movs r6, 0x26 @@ -576671,7 +576671,7 @@ _0812C0A4: movs r0, 0 ldrsh r1, [r1, r0] cmp r1, 0 - bne _0812C0D2 + bne @0812C0D2 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -576682,7 +576682,7 @@ _0812C0A4: ldrh r0, [r0] strh r0, [r4, 0xA] strh r1, [r4, 0xC] -_0812C0D2: +@0812C0D2: movs r0, 0 add sp, 0xC pop {r4-r7} @@ -576693,7 +576693,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 @@ -576714,15 +576714,15 @@ sub_812C0E0: @ 812C0E0 movs r1, 0x3 ands r0, r1 cmp r0, 0 - bne _0812C110 + bne @0812C110 lsls r0, r3, 16 asrs r0, 17 strh r0, [r2, 0xA] -_0812C110: +@0812C110: movs r0, 0xA ldrsh r3, [r2, r0] cmp r3, 0 - bne _0812C12A + bne @0812C12A strh r3, [r2, 0x8] strh r3, [r2, 0x24] ldr r1, [r4] @@ -576732,7 +576732,7 @@ _0812C110: adds r1, 0x22 adds r1, r0 strh r3, [r1] -_0812C12A: +@0812C12A: movs r0, 0 pop {r4} pop {r1} @@ -576742,7 +576742,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] @@ -576756,10 +576756,10 @@ sub_812C138: @ 812C138 movs r0, 0xC0 ands r0, r1 cmp r0, 0 - beq _0812C15A + beq @0812C15A movs r5, 0 movs r3, 0x1 -_0812C15A: +@0812C15A: ldr r1, =0x085a7508 movs r2, 0x12 ldrsh r0, [r4, r2] @@ -576780,7 +576780,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 @@ -576797,27 +576797,27 @@ sub_812C184: @ 812C184 lsrs r0, 24 adds r1, r0, 0 cmp r0, r4 - beq _0812C1AC + beq @0812C1AC cmp r0, r5 - bne _0812C1BC -_0812C1AC: + bne @0812C1BC +@0812C1AC: ldr r0, =0x0203ab34 ldr r0, [r0] strb r1, [r0, 0x7] movs r0, 0x1 - b _0812C1BE + b @0812C1BE .align 2, 0 .pool -_0812C1BC: +@0812C1BC: movs r0, 0 -_0812C1BE: +@0812C1BE: pop {r4,r5} pop {r1} bx r1 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 @@ -576830,7 +576830,7 @@ sub_812C1C4: @ 812C1C4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - beq _0812C20C + beq @0812C20C movs r1, 0x2 subs r1, r4 lsls r1, 16 @@ -576840,7 +576840,7 @@ sub_812C1C4: @ 812C1C4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - beq _0812C20C + beq @0812C20C movs r1, 0x3 subs r1, r4 lsls r1, 16 @@ -576850,20 +576850,20 @@ sub_812C1C4: @ 812C1C4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bne _0812C210 -_0812C20C: + bne @0812C210 +@0812C20C: movs r0, 0x1 - b _0812C212 -_0812C210: + b @0812C212 +@0812C210: movs r0, 0 -_0812C212: +@0812C212: pop {r4} pop {r1} bx r1 thumb_func_end sub_812C1C4 thumb_func_start sub_812C218 -sub_812C218: @ 812C218 +sub_812C218: ; 812C218 push {lr} ldr r0, =0x0203ab34 ldr r0, [r0] @@ -576871,20 +576871,20 @@ sub_812C218: @ 812C218 movs r0, 0xC2 ands r0, r1 cmp r0, 0 - bne _0812C230 + bne @0812C230 movs r0, 0 - b _0812C232 + b @0812C232 .align 2, 0 .pool -_0812C230: +@0812C230: movs r0, 0x1 -_0812C232: +@0812C232: pop {r1} bx r1 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} @@ -576895,7 +576895,7 @@ sub_812C238: @ 812C238 movs r5, 0 movs r0, 0x2 mov r8, r0 -_0812C24C: +@0812C24C: lsls r0, r5, 16 asrs r4, r0, 16 mov r1, r8 @@ -576907,25 +576907,25 @@ _0812C24C: bl sub_812C184 lsls r0, 24 cmp r0, 0 - beq _0812C278 + beq @0812C278 ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0x2 strh r0, [r1, 0x34] strh r5, [r1, 0x2E] movs r0, 0x1 - b _0812C286 + b @0812C286 .align 2, 0 .pool -_0812C278: +@0812C278: adds r0, r4, 0x1 lsls r0, 16 lsrs r5, r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _0812C24C + ble @0812C24C movs r0, 0 -_0812C286: +@0812C286: pop {r3} mov r8, r3 pop {r4-r7} @@ -576934,7 +576934,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 @@ -576950,16 +576950,16 @@ sub_812C290: @ 812C290 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _0812C2BE + bne @0812C2BE movs r0, 0 bl sub_812C1C4 lsls r0, 24 cmp r0, 0 - bne _0812C2F4 -_0812C2BE: + bne @0812C2F4 +@0812C2BE: movs r7, 0x1 movs r6, 0 -_0812C2C2: +@0812C2C2: lsls r0, r7, 16 asrs r4, r0, 16 adds r0, r4, 0 @@ -576968,37 +576968,37 @@ _0812C2C2: bl sub_812C184 lsls r0, 24 cmp r0, 0 - beq _0812C2E8 + beq @0812C2E8 ldr r0, =0x0203ab34 ldr r0, [r0] strh r7, [r0, 0x34] strh r6, [r0, 0x2E] movs r0, 0x1 - b _0812C390 + b @0812C390 .align 2, 0 .pool -_0812C2E8: +@0812C2E8: adds r0, r4, 0x1 lsls r0, 16 lsrs r7, r0, 16 asrs r0, 16 cmp r0, 0x3 - ble _0812C2C2 -_0812C2F4: + ble @0812C2C2 +@0812C2F4: movs r7, 0x1 adds r6, r5, 0 ldr r0, =0x0203ab34 mov r10, r0 -_0812C2FC: +@0812C2FC: lsls r5, r7, 16 cmp r6, 0 - bne _0812C30E + bne @0812C30E asrs r0, r5, 16 bl sub_812C1C4 lsls r0, 24 cmp r0, 0 - bne _0812C380 -_0812C30E: + bne @0812C380 +@0812C30E: movs r0, 0x1 asrs r4, r5, 16 subs r0, r4 @@ -577009,64 +577009,64 @@ _0812C30E: bl sub_812C184 lsls r0, 24 cmp r0, 0 - beq _0812C380 + beq @0812C380 cmp r4, 0x1 - bne _0812C34C + bne @0812C34C cmp r6, 0 - bne _0812C33A + bne @0812C33A movs r0, 0x3 bl sub_812C1C4 lsls r0, 24 cmp r0, 0 - bne _0812C34C -_0812C33A: + bne @0812C34C +@0812C33A: mov r0, r10 ldr r1, [r0] movs r0, 0x3 strh r0, [r1, 0x34] strh r0, [r1, 0x2E] movs r0, 0x1 - b _0812C390 + b @0812C390 .align 2, 0 .pool -_0812C34C: +@0812C34C: asrs r0, r5, 16 cmp r0, 0x3 - bgt _0812C374 + bgt @0812C374 adds r4, r0, 0x1 cmp r6, 0 - bne _0812C366 + bne @0812C366 lsls r0, r4, 16 asrs r0, 16 bl sub_812C1C4 lsls r0, 24 cmp r0, 0 - bne _0812C374 -_0812C366: + bne @0812C374 +@0812C366: mov r0, r10 ldr r1, [r0] movs r0, 0x2 strh r0, [r1, 0x34] strh r4, [r1, 0x2E] movs r0, 0x1 - b _0812C390 -_0812C374: + b @0812C390 +@0812C374: mov r0, r10 ldr r1, [r0] movs r0, 0x1 strh r0, [r1, 0x34] strh r7, [r1, 0x2E] - b _0812C390 -_0812C380: + b @0812C390 +@0812C380: movs r1, 0x80 lsls r1, 9 adds r0, r5, r1 lsrs r7, r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _0812C2FC + ble @0812C2FC movs r0, 0 -_0812C390: +@0812C390: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -577077,7 +577077,7 @@ _0812C390: thumb_func_end sub_812C290 thumb_func_start sub_812C3A0 -sub_812C3A0: @ 812C3A0 +sub_812C3A0: ; 812C3A0 push {lr} ldr r1, =0x085a7514 ldr r0, =0x0203ab34 @@ -577098,7 +577098,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] @@ -577106,7 +577106,7 @@ sub_812C3C8: @ 812C3C8 ldrh r7, [r0, 0x34] movs r1, 0x34 ldrsh r6, [r0, r1] -_0812C3D6: +@0812C3D6: lsls r0, r5, 16 asrs r4, r0, 16 subs r1, r6, r4 @@ -577120,49 +577120,49 @@ _0812C3D6: lsrs r0, 24 ldrb r2, [r1, 0x7] cmp r0, r2 - bne _0812C400 + bne @0812C400 strh r7, [r1, 0x36] strh r5, [r1, 0x30] movs r0, 0x1 - b _0812C40E + b @0812C40E .align 2, 0 .pool -_0812C400: +@0812C400: adds r0, r4, 0x1 lsls r0, 16 lsrs r5, r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _0812C3D6 + ble @0812C3D6 movs r0, 0 -_0812C40E: +@0812C40E: pop {r4-r7} pop {r1} bx r1 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 cmp r0, 0 - beq _0812C476 + beq @0812C476 ldr r0, =0x0203ab34 ldr r1, [r0] movs r2, 0x34 ldrsh r0, [r1, r2] cmp r0, 0x2 - beq _0812C472 + beq @0812C472 movs r2, 0x30 ldrsh r0, [r1, r2] cmp r0, 0x1 - ble _0812C472 + ble @0812C472 cmp r0, 0x4 - beq _0812C472 + beq @0812C472 movs r5, 0 movs r6, 0x2 -_0812C43C: +@0812C43C: lsls r0, r5, 16 asrs r4, r0, 16 subs r1, r6, r4 @@ -577176,33 +577176,33 @@ _0812C43C: lsrs r0, 24 ldrb r2, [r1, 0x7] cmp r0, r2 - beq _0812C46C + beq @0812C46C adds r0, r4, 0x1 lsls r0, 16 lsrs r5, r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _0812C43C - b _0812C472 + ble @0812C43C + b @0812C472 .align 2, 0 .pool -_0812C46C: +@0812C46C: movs r0, 0x2 strh r0, [r1, 0x36] strh r5, [r1, 0x30] -_0812C472: +@0812C472: movs r0, 0x1 - b _0812C4B2 -_0812C476: + b @0812C4B2 +@0812C476: ldr r0, =0x0203ab34 ldr r0, [r0] movs r1, 0x34 ldrsh r0, [r0, r1] cmp r0, 0x2 - beq _0812C4B0 + beq @0812C4B0 movs r5, 0 movs r6, 0x2 -_0812C486: +@0812C486: lsls r0, r5, 16 asrs r4, r0, 16 subs r1, r6, r4 @@ -577216,16 +577216,16 @@ _0812C486: lsrs r0, 24 ldrb r2, [r1, 0x7] cmp r0, r2 - beq _0812C46C + beq @0812C46C adds r0, r4, 0x1 lsls r0, 16 lsrs r5, r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _0812C486 -_0812C4B0: + ble @0812C486 +@0812C4B0: movs r0, 0 -_0812C4B2: +@0812C4B2: pop {r4-r6} pop {r1} bx r1 @@ -577234,7 +577234,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] @@ -577244,12 +577244,12 @@ sub_812C4BC: @ 812C4BC movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0812C4D8 + beq @0812C4D8 movs r3, 0 cmp r4, 0 - bne _0812C4D8 + bne @0812C4D8 movs r3, 0x1 -_0812C4D8: +@0812C4D8: ldr r1, =0x085a7520 ldr r0, [r2] movs r2, 0x12 @@ -577270,7 +577270,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} @@ -577283,7 +577283,7 @@ sub_812C500: @ 812C500 mov r8, r1 movs r1, 0x36 ldrsh r6, [r0, r1] -_0812C518: +@0812C518: lsls r0, r5, 16 asrs r4, r0, 16 subs r1, r6, r4 @@ -577294,25 +577294,25 @@ _0812C518: lsls r0, 24 lsrs r0, 24 cmp r0, r7 - bne _0812C544 + bne @0812C544 ldr r0, =0x0203ab34 ldr r0, [r0] mov r1, r8 strh r1, [r0, 0x38] strh r5, [r0, 0x32] movs r0, 0x1 - b _0812C552 + b @0812C552 .align 2, 0 .pool -_0812C544: +@0812C544: adds r0, r4, 0x1 lsls r0, 16 lsrs r5, r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _0812C518 + ble @0812C518 movs r0, 0 -_0812C552: +@0812C552: pop {r3} mov r8, r3 pop {r4-r7} @@ -577321,7 +577321,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} @@ -577334,35 +577334,35 @@ sub_812C55C: @ 812C55C movs r2, 0x36 ldrsh r0, [r0, r2] cmp r1, r0 - bne _0812C59C + bne @0812C59C adds r0, r6, 0 bl sub_812C500 lsls r0, 24 lsrs r0, 24 - b _0812C5D2 + b @0812C5D2 .align 2, 0 .pool -_0812C588: +@0812C588: ldr r0, =0x0203ab34 ldr r0, [r0] strh r5, [r0, 0x32] mov r1, r8 strh r1, [r0, 0x38] movs r0, 0x1 - b _0812C5D2 + b @0812C5D2 .align 2, 0 .pool -_0812C59C: +@0812C59C: movs r2, 0x1 mov r8, r2 cmp r1, 0x1 - bne _0812C5A8 + bne @0812C5A8 movs r0, 0x3 mov r8, r0 -_0812C5A8: +@0812C5A8: movs r5, 0 mov r7, r8 -_0812C5AC: +@0812C5AC: lsls r0, r5, 16 asrs r4, r0, 16 subs r1, r7, r4 @@ -577373,15 +577373,15 @@ _0812C5AC: lsls r0, 24 lsrs r0, 24 cmp r0, r6 - beq _0812C588 + beq @0812C588 adds r0, r4, 0x1 lsls r0, 16 lsrs r5, r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _0812C5AC + ble @0812C5AC movs r0, 0 -_0812C5D2: +@0812C5D2: pop {r3} mov r8, r3 pop {r4-r7} @@ -577390,22 +577390,22 @@ _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 -_0812C5E2: + b @0812C5E8 +@0812C5E2: adds r0, r4, 0x1 lsls r0, 16 lsrs r5, r0, 16 -_0812C5E8: +@0812C5E8: lsls r0, r5, 16 asrs r4, r0, 16 adds r0, r4, 0 bl sub_812C1C4 lsls r0, 24 cmp r0, 0 - bne _0812C5E2 + bne @0812C5E2 ldr r0, =0x0203ab34 ldr r0, [r0] strh r5, [r0, 0x2E] @@ -577417,31 +577417,31 @@ _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] cmp r0, 0 - bne _0812C616 + bne @0812C616 movs r0, 0x1 - b _0812C620 -_0812C616: + b @0812C620 +@0812C616: cmp r0, 0x1 - beq _0812C61E + beq @0812C61E movs r0, 0 - b _0812C624 -_0812C61E: + b @0812C624 +@0812C61E: movs r0, 0 -_0812C620: +@0812C620: strb r0, [r1] movs r0, 0x1 -_0812C624: +@0812C624: pop {r1} bx r1 thumb_func_end sub_812C608 thumb_func_start sub_812C628 -sub_812C628: @ 812C628 +sub_812C628: ; 812C628 push {lr} ldr r1, =0x085a752c ldr r0, =0x0203ab34 @@ -577460,7 +577460,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 @@ -577468,12 +577468,12 @@ sub_812C64C: @ 812C64C movs r1, 0x34 ldrsh r0, [r2, r1] cmp r0, 0 - beq _0812C6C4 + beq @0812C6C4 ldrb r1, [r2, 0x4] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0812C6C4 + beq @0812C6C4 ldrh r0, [r2, 0x2E] movs r1, 0x2 subs r1, r0 @@ -577487,11 +577487,11 @@ sub_812C64C: @ 812C64C bl sub_812C608 lsls r0, 24 cmp r0, 0 - beq _0812C6C4 + beq @0812C6C4 movs r5, 0 mov r6, sp movs r7, 0x2 -_0812C68C: +@0812C68C: lsls r0, r5, 16 asrs r4, r0, 16 subs r1, r7, r4 @@ -577503,23 +577503,23 @@ _0812C68C: lsls r0, 24 lsrs r0, 24 cmp r1, r0 - bne _0812C6B8 + bne @0812C6B8 ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0x2 strh r0, [r1, 0x36] strh r5, [r1, 0x30] - b _0812C6C4 + b @0812C6C4 .align 2, 0 .pool -_0812C6B8: +@0812C6B8: adds r0, r4, 0x1 lsls r0, 16 lsrs r5, r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _0812C68C -_0812C6C4: + ble @0812C68C +@0812C6C4: add sp, 0x4 pop {r4-r7} pop {r0} @@ -577527,7 +577527,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 @@ -577536,12 +577536,12 @@ j5_08111E84: @ 812C6CC movs r1, 0x34 ldrsh r0, [r2, r1] cmp r0, 0 - beq _0812C744 + beq @0812C744 ldrb r1, [r2, 0x4] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0812C744 + beq @0812C744 ldrh r1, [r2, 0x2E] subs r1, r3, r1 lsls r1, 16 @@ -577554,11 +577554,11 @@ j5_08111E84: @ 812C6CC bl sub_812C608 lsls r0, 24 cmp r0, 0 - beq _0812C744 + beq @0812C744 movs r5, 0 mov r7, sp adds r6, r4, 0 -_0812C70C: +@0812C70C: ldr r0, [r6] ldrh r1, [r0, 0x34] lsls r0, r5, 16 @@ -577572,22 +577572,22 @@ _0812C70C: lsls r0, 24 lsrs r0, 24 cmp r1, r0 - bne _0812C738 + bne @0812C738 ldr r0, [r6] ldrh r1, [r0, 0x34] strh r1, [r0, 0x36] strh r5, [r0, 0x30] - b _0812C744 + b @0812C744 .align 2, 0 .pool -_0812C738: +@0812C738: adds r0, r4, 0x1 lsls r0, 16 lsrs r5, r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _0812C70C -_0812C744: + ble @0812C70C +@0812C744: add sp, 0x4 pop {r4-r7} pop {r0} @@ -577595,7 +577595,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 @@ -577604,37 +577604,37 @@ sub_812C74C: @ 812C74C movs r0, 0x34 ldrsh r3, [r2, r0] cmp r3, 0 - beq _0812C84A + beq @0812C84A ldrb r1, [r2, 0x4] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0812C84A + beq @0812C84A cmp r3, 0x2 - bne _0812C796 + bne @0812C796 bl j5_08111E84 - b _0812C84A + b @0812C84A .align 2, 0 .pool -_0812C778: +@0812C778: ldr r0, =0x0203ab34 ldr r0, [r0] movs r1, 0 strh r5, [r0, 0x36] strh r1, [r0, 0x30] - b _0812C84A + b @0812C84A .align 2, 0 .pool -_0812C788: +@0812C788: movs r0, 0x2 strh r0, [r1, 0x36] adds r0, r4, 0x1 strh r0, [r1, 0x30] - b _0812C84A -_0812C792: + b @0812C84A +@0812C792: movs r0, 0x3 - b _0812C824 -_0812C796: + b @0812C824 +@0812C796: ldrh r1, [r2, 0x2E] subs r1, r4, r1 lsls r1, 16 @@ -577647,18 +577647,18 @@ _0812C796: bl sub_812C608 lsls r0, 24 cmp r0, 0 - beq _0812C84A + beq @0812C84A movs r5, 0x2 ldr r0, [r6] movs r1, 0x34 ldrsh r0, [r0, r1] cmp r0, 0x3 - bne _0812C7C2 + bne @0812C7C2 movs r5, 0x3 -_0812C7C2: +@0812C7C2: movs r6, 0 mov r7, sp -_0812C7C6: +@0812C7C6: lsls r0, r5, 16 asrs r4, r0, 16 movs r0, 0x1 @@ -577668,7 +577668,7 @@ _0812C7C6: lsls r0, 24 lsrs r0, 24 cmp r1, r0 - beq _0812C778 + beq @0812C778 lsls r1, r6, 16 movs r2, 0x80 lsls r2, 9 @@ -577679,11 +577679,11 @@ _0812C7C6: lsrs r6, r1, 16 asrs r1, 16 cmp r1, 0x1 - ble _0812C7C6 + ble @0812C7C6 movs r5, 0x1 mov r7, sp ldr r6, =0x0203ab34 -_0812C7F8: +@0812C7F8: ldr r0, [r6] ldrh r1, [r0, 0x34] lsls r0, r5, 16 @@ -577697,36 +577697,36 @@ _0812C7F8: lsls r0, 24 lsrs r0, 24 cmp r1, r0 - bne _0812C83E + bne @0812C83E ldr r1, [r6] movs r2, 0x34 ldrsh r0, [r1, r2] cmp r0, 0x1 - bne _0812C830 + bne @0812C830 cmp r4, 0x2 - ble _0812C788 -_0812C824: + ble @0812C788 +@0812C824: strh r0, [r1, 0x36] strh r5, [r1, 0x30] - b _0812C84A + b @0812C84A .align 2, 0 .pool -_0812C830: +@0812C830: cmp r4, 0x2 - ble _0812C792 + ble @0812C792 movs r0, 0x2 strh r0, [r1, 0x36] subs r0, r4, 0x1 strh r0, [r1, 0x30] - b _0812C84A -_0812C83E: + b @0812C84A +@0812C83E: adds r0, r4, 0x1 lsls r0, 16 lsrs r5, r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _0812C7F8 -_0812C84A: + ble @0812C7F8 +@0812C84A: add sp, 0x4 pop {r4-r7} pop {r0} @@ -577734,7 +577734,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 @@ -577742,26 +577742,26 @@ sub_812C854: @ 812C854 lsrs r1, 24 adds r2, r1, 0 cmp r0, 0 - bne _0812C868 + bne @0812C868 cmp r1, 0x1 - beq _0812C870 -_0812C868: + beq @0812C870 +@0812C868: cmp r0, 0x1 - bne _0812C874 + bne @0812C874 cmp r2, 0 - bne _0812C874 -_0812C870: + bne @0812C874 +@0812C870: movs r0, 0x1 - b _0812C876 -_0812C874: + b @0812C876 +@0812C874: movs r0, 0 -_0812C876: +@0812C876: pop {r1} bx r1 thumb_func_end sub_812C854 thumb_func_start sub_812C87C -sub_812C87C: @ 812C87C +sub_812C87C: ; 812C87C push {lr} lsls r0, 24 lsrs r0, 24 @@ -577770,30 +577770,30 @@ sub_812C87C: @ 812C87C lsls r2, 24 lsrs r2, 24 cmp r0, 0 - bne _0812C896 + bne @0812C896 cmp r1, 0x1 - bne _0812C896 + bne @0812C896 cmp r2, 0 - beq _0812C8A2 -_0812C896: + beq @0812C8A2 +@0812C896: cmp r0, 0x1 - bne _0812C8A6 + bne @0812C8A6 cmp r1, 0 - bne _0812C8A6 + bne @0812C8A6 cmp r2, 0x1 - bne _0812C8A6 -_0812C8A2: + bne @0812C8A6 +@0812C8A2: movs r0, 0x1 - b _0812C8A8 -_0812C8A6: + b @0812C8A8 +@0812C8A6: movs r0, 0 -_0812C8A8: +@0812C8A8: pop {r1} bx r1 thumb_func_end sub_812C87C thumb_func_start sub_812C8AC -sub_812C8AC: @ 812C8AC +sub_812C8AC: ; 812C8AC push {lr} lsls r0, 24 lsrs r0, 24 @@ -577802,49 +577802,49 @@ sub_812C8AC: @ 812C8AC lsls r2, 24 lsrs r2, 24 cmp r0, 0 - bne _0812C8C6 + bne @0812C8C6 cmp r1, 0x1 - bne _0812C8C6 + bne @0812C8C6 cmp r2, 0 - beq _0812C8F2 -_0812C8C6: + beq @0812C8F2 +@0812C8C6: cmp r0, 0x1 - bne _0812C8D2 + bne @0812C8D2 cmp r1, 0 - bne _0812C8D2 + bne @0812C8D2 cmp r2, 0x1 - beq _0812C8F2 -_0812C8D2: + beq @0812C8F2 +@0812C8D2: cmp r0, 0 - bne _0812C8DE + bne @0812C8DE cmp r1, 0 - bne _0812C8DE + bne @0812C8DE cmp r2, 0x1 - beq _0812C8F2 -_0812C8DE: + beq @0812C8F2 +@0812C8DE: cmp r0, 0x1 - bne _0812C8EA + bne @0812C8EA cmp r1, 0x1 - bne _0812C8EA + bne @0812C8EA cmp r2, 0 - beq _0812C8F2 -_0812C8EA: + beq @0812C8F2 +@0812C8EA: cmp r0, r1 - bne _0812C8F6 + bne @0812C8F6 cmp r0, r2 - bne _0812C8F6 -_0812C8F2: + bne @0812C8F6 +@0812C8F2: movs r0, 0 - b _0812C8F8 -_0812C8F6: + b @0812C8F8 +@0812C8F6: movs r0, 0x1 -_0812C8F8: +@0812C8F8: pop {r1} bx r1 thumb_func_end sub_812C8AC thumb_func_start sub_812C8FC -sub_812C8FC: @ 812C8FC +sub_812C8FC: ; 812C8FC push {lr} ldr r1, =0x085a7538 ldr r0, =0x0203ab34 @@ -577863,7 +577863,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 @@ -577888,18 +577888,18 @@ sub_812C920: @ 812C920 lsls r0, 24 lsrs r1, r0, 24 cmp r5, r1 - bne _0812C994 + bne @0812C994 movs r4, 0x2 - b _0812C96A + b @0812C96A .align 2, 0 .pool -_0812C960: +@0812C960: lsls r0, r6, 16 movs r1, 0x80 lsls r1, 9 adds r0, r1 lsrs r6, r0, 16 -_0812C96A: +@0812C96A: lsls r1, r6, 16 asrs r1, 16 subs r1, r4, r1 @@ -577910,31 +577910,31 @@ _0812C96A: lsls r0, 24 lsrs r0, 24 cmp r5, r0 - beq _0812C960 + beq @0812C960 cmp r5, 0 - bne _0812C98A + bne @0812C98A cmp r0, 0x1 - beq _0812C960 -_0812C98A: + beq @0812C960 +@0812C98A: cmp r5, 0x1 - bne _0812C9F6 + bne @0812C9F6 cmp r0, 0 - beq _0812C960 - b _0812C9F6 -_0812C994: + beq @0812C960 + b @0812C9F6 +@0812C994: adds r0, r5, 0 bl sub_812C854 lsls r0, 24 cmp r0, 0 - beq _0812C9F6 + beq @0812C9F6 ldr r0, [r7] ldrb r1, [r0, 0x4] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0812C9D2 + beq @0812C9D2 movs r7, 0x2 -_0812C9AE: +@0812C9AE: lsls r0, r6, 16 asrs r4, r0, 16 subs r1, r7, r4 @@ -577945,22 +577945,22 @@ _0812C9AE: lsls r0, 24 lsrs r0, 24 cmp r5, r0 - beq _0812C9F6 + beq @0812C9F6 adds r0, r4, 0x1 lsls r0, 16 lsrs r6, r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _0812C9AE -_0812C9D2: + ble @0812C9AE +@0812C9D2: movs r6, 0 movs r7, 0x2 - b _0812C9DE -_0812C9D8: + b @0812C9DE +@0812C9D8: adds r0, r4, 0x1 lsls r0, 16 lsrs r6, r0, 16 -_0812C9DE: +@0812C9DE: lsls r0, r6, 16 asrs r4, r0, 16 subs r1, r7, r4 @@ -577971,8 +577971,8 @@ _0812C9DE: lsls r0, 24 lsrs r0, 24 cmp r5, r0 - beq _0812C9D8 -_0812C9F6: + beq @0812C9D8 +@0812C9F6: ldr r0, =0x0203ab34 ldr r0, [r0] strh r6, [r0, 0x32] @@ -577984,7 +577984,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 @@ -577998,17 +577998,17 @@ sub_812CA08: @ 812CA08 movs r5, 0x36 ldrsh r1, [r2, r5] cmp r1, 0 - beq _0812CAA4 + beq @0812CAA4 ldrh r3, [r2, 0x34] movs r5, 0x34 ldrsh r0, [r2, r5] cmp r0, r1 - bne _0812CAA4 + bne @0812CAA4 ldrb r1, [r2, 0x4] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0812CAA4 + beq @0812CAA4 ldrh r1, [r2, 0x2E] subs r1, r3, r1 lsls r1, 16 @@ -578032,20 +578032,20 @@ sub_812CA08: @ 812CA08 bl sub_812C854 lsls r0, 24 cmp r0, 0 - beq _0812CAA4 + beq @0812CAA4 movs r5, 0 - b _0812CA7E + b @0812CA7E .align 2, 0 .pool -_0812CA78: +@0812CA78: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 -_0812CA7E: +@0812CA7E: lsls r6, r5, 16 asrs r5, r6, 16 cmp r5, 0x4 - bgt _0812CAA4 + bgt @0812CAA4 ldr r0, =0x0203ab34 ldr r0, [r0] ldrh r1, [r0, 0x36] @@ -578057,20 +578057,20 @@ _0812CA7E: lsls r0, 24 lsrs r4, r0, 24 cmp r7, r4 - bne _0812CA78 + bne @0812CA78 lsrs r6, 16 str r6, [sp] -_0812CAA4: +@0812CAA4: ldr r0, =0x0203ab34 mov r9, r0 -_0812CAA8: +@0812CAA8: movs r5, 0x1 movs r1, 0 mov r8, r1 ldr r2, [sp] lsls r2, 16 mov r10, r2 -_0812CAB4: +@0812CAB4: mov r1, r9 ldr r0, [r1] ldrh r1, [r0, 0x2E] @@ -578109,22 +578109,22 @@ _0812CAB4: bl sub_812C8AC lsls r0, 24 cmp r0, 0 - bne _0812CB3C + bne @0812CB3C adds r0, r7, 0 adds r1, r6, 0 adds r2, r4, 0 bl sub_812C87C lsls r0, 24 cmp r0, 0 - beq _0812CB28 + beq @0812CB28 mov r2, r9 ldr r0, [r2] ldrb r1, [r0, 0x4] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0812CB3C -_0812CB28: + bne @0812CB3C +@0812CB28: mov r5, r8 lsls r0, r5, 16 movs r1, 0x80 @@ -578132,21 +578132,21 @@ _0812CB28: adds r0, r1 lsrs r0, 16 mov r8, r0 - b _0812CB4A + b @0812CB4A .align 2, 0 .pool -_0812CB3C: +@0812CB3C: movs r2, 0x80 lsls r2, 9 adds r0, r5, r2 lsrs r5, r0, 16 asrs r0, 16 cmp r0, 0x3 - ble _0812CAB4 -_0812CB4A: + ble @0812CAB4 +@0812CB4A: mov r5, r8 cmp r5, 0 - beq _0812CB60 + beq @0812CB60 ldr r1, [sp] lsls r0, r1, 16 movs r2, 0x80 @@ -578154,8 +578154,8 @@ _0812CB4A: adds r0, r2 lsrs r0, 16 str r0, [sp] - b _0812CAA8 -_0812CB60: + b @0812CAA8 +@0812CB60: ldr r0, =0x0203ab34 ldr r0, [r0] mov r5, sp @@ -578174,7 +578174,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} @@ -578184,17 +578184,17 @@ sub_812CB80: @ 812CB80 movs r0, 0x36 ldrsh r1, [r2, r0] cmp r1, 0 - beq _0812CC34 + beq @0812CC34 ldrh r3, [r2, 0x34] movs r5, 0x34 ldrsh r0, [r2, r5] cmp r0, r1 - beq _0812CC34 + beq @0812CC34 ldrb r1, [r2, 0x4] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0812CC34 + beq @0812CC34 ldrh r1, [r2, 0x2E] subs r1, r3, r1 lsls r1, 16 @@ -578218,20 +578218,20 @@ sub_812CB80: @ 812CB80 bl sub_812C854 lsls r0, 24 cmp r0, 0 - beq _0812CC34 + beq @0812CC34 movs r1, 0x1 ldr r0, [r4] movs r2, 0x34 ldrsh r0, [r0, r2] cmp r0, 0x1 - bne _0812CBEE + bne @0812CBEE movs r1, 0x3 -_0812CBEE: +@0812CBEE: movs r3, 0 lsls r1, 16 mov r8, r1 adds r7, r4, 0 -_0812CBF6: +@0812CBF6: ldr r0, [r7] ldrh r2, [r0, 0x32] lsls r0, r3, 16 @@ -578247,24 +578247,24 @@ _0812CBF6: lsls r0, 24 lsrs r4, r0, 24 cmp r6, r4 - bne _0812CC28 + bne @0812CC28 ldr r1, [r7] ldrh r0, [r1, 0x32] adds r0, r5, r0 strh r0, [r1, 0x32] - b _0812CC34 + b @0812CC34 .align 2, 0 .pool -_0812CC28: +@0812CC28: adds r0, r5, 0x1 lsls r0, 16 lsrs r3, r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _0812CBF6 -_0812CC34: + ble @0812CBF6 +@0812CC34: ldr r7, =0x0203ab34 -_0812CC36: +@0812CC36: ldr r0, [r7] ldrh r0, [r0, 0x2E] movs r1, 0x1 @@ -578301,31 +578301,31 @@ _0812CC36: bl sub_812C8AC lsls r0, 24 cmp r0, 0 - bne _0812CCB4 + bne @0812CCB4 adds r0, r6, 0 adds r1, r5, 0 adds r2, r4, 0 bl sub_812C87C lsls r0, 24 cmp r0, 0 - beq _0812CCA4 + beq @0812CCA4 ldr r0, [r7] ldrb r1, [r0, 0x4] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0812CCB4 -_0812CCA4: + bne @0812CCB4 +@0812CCA4: ldr r1, [r7] ldrh r0, [r1, 0x32] adds r0, 0x1 strh r0, [r1, 0x32] - b _0812CC36 + b @0812CC36 .align 2, 0 .pool -_0812CCB4: +@0812CCB4: ldr r7, =0x0203ab34 -_0812CCB6: +@0812CCB6: ldr r0, [r7] ldrh r0, [r0, 0x2E] movs r1, 0x3 @@ -578362,29 +578362,29 @@ _0812CCB6: bl sub_812C8AC lsls r0, 24 cmp r0, 0 - bne _0812CD34 + bne @0812CD34 adds r0, r6, 0 adds r1, r5, 0 adds r2, r4, 0 bl sub_812C87C lsls r0, 24 cmp r0, 0 - beq _0812CD24 + beq @0812CD24 ldr r0, [r7] ldrb r1, [r0, 0x4] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0812CD34 -_0812CD24: + bne @0812CD34 +@0812CD24: ldr r1, [r7] ldrh r0, [r1, 0x32] adds r0, 0x1 strh r0, [r1, 0x32] - b _0812CCB6 + b @0812CCB6 .align 2, 0 .pool -_0812CD34: +@0812CD34: pop {r3} mov r8, r3 pop {r4-r7} @@ -578393,7 +578393,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 @@ -578419,7 +578419,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 @@ -578444,7 +578444,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 @@ -578473,7 +578473,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] @@ -578482,17 +578482,17 @@ sub_812CDD8: @ 812CDD8 lsls r0, 16 asrs r0, 16 cmp r0, 0xB - ble _0812CDF0 + ble @0812CDF0 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_0812CDF0: +@0812CDF0: pop {r0} bx r0 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 @@ -578521,7 +578521,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 @@ -578542,7 +578542,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 @@ -578563,7 +578563,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 @@ -578572,11 +578572,11 @@ sub_812CE7C: @ 812CE7C adds r0, r1, r0 ldrb r0, [r0] cmp r4, r0 - bcs _0812CEA8 + bcs @0812CEA8 ldr r7, =0x085a8435 adds r6, r0, 0 lsls r5, r1, 1 -_0812CE94: +@0812CE94: adds r0, r4, r5 adds r0, r7 ldrb r0, [r0] @@ -578585,8 +578585,8 @@ _0812CE94: lsls r0, 24 lsrs r4, r0, 24 cmp r4, r6 - bcc _0812CE94 -_0812CEA8: + bcc @0812CE94 +@0812CEA8: pop {r4-r7} pop {r0} bx r0 @@ -578595,7 +578595,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 @@ -578604,11 +578604,11 @@ sub_812CEB8: @ 812CEB8 adds r0, r1, r0 ldrb r0, [r0] cmp r4, r0 - bcs _0812CEE4 + bcs @0812CEE4 ldr r7, =0x085a8435 adds r6, r0, 0 lsls r5, r1, 1 -_0812CED0: +@0812CED0: adds r0, r4, r5 adds r0, r7 ldrb r0, [r0] @@ -578617,8 +578617,8 @@ _0812CED0: lsls r0, 24 lsrs r4, r0, 24 cmp r4, r6 - bcc _0812CED0 -_0812CEE4: + bcc @0812CED0 +@0812CEE4: pop {r4-r7} pop {r0} bx r0 @@ -578627,11 +578627,11 @@ _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 -_0812CEFA: +@0812CEFA: ldr r0, =sub_812D024 + 1 bl obj_add_empty_with_callback lsls r0, 24 @@ -578650,7 +578650,7 @@ _0812CEFA: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 - bls _0812CEFA + bls @0812CEFA pop {r4,r5} pop {r0} bx r0 @@ -578659,7 +578659,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 @@ -578688,7 +578688,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 @@ -578696,7 +578696,7 @@ sub_812CF6C: @ 812CF6C adds r3, r0, 0 adds r3, 0x44 ldr r4, =0x02020630 -_0812CF7A: +@0812CF7A: adds r0, r3, r2 ldrb r1, [r0] lsls r0, r1, 4 @@ -578706,33 +578706,33 @@ _0812CF7A: movs r5, 0x30 ldrsh r0, [r1, r5] cmp r0, 0 - beq _0812CFA4 + beq @0812CFA4 movs r5, 0x32 ldrsh r0, [r1, r5] cmp r0, 0 - beq _0812CFA4 + beq @0812CFA4 movs r0, 0 - b _0812CFB0 + b @0812CFB0 .align 2, 0 .pool -_0812CFA4: +@0812CFA4: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x4 - bls _0812CF7A + bls @0812CF7A movs r0, 0x1 -_0812CFB0: +@0812CFB0: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_812CF6C thumb_func_start sub_812CFB8 -sub_812CFB8: @ 812CFB8 +sub_812CFB8: ; 812CFB8 push {r4,lr} movs r4, 0 -_0812CFBC: +@0812CFBC: ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x44 @@ -578741,26 +578741,26 @@ _0812CFBC: bl sub_812CFEC lsls r0, 24 cmp r0, 0 - bne _0812CFD8 + bne @0812CFD8 movs r0, 0 - b _0812CFE4 + b @0812CFE4 .align 2, 0 .pool -_0812CFD8: +@0812CFD8: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 - bls _0812CFBC + bls @0812CFBC movs r0, 0x1 -_0812CFE4: +@0812CFE4: pop {r4} pop {r1} bx r1 thumb_func_end sub_812CFB8 thumb_func_start sub_812CFEC -sub_812CFEC: @ 812CFEC +sub_812CFEC: ; 812CFEC push {lr} lsls r0, 24 lsrs r0, 24 @@ -578772,35 +578772,35 @@ sub_812CFEC: @ 812CFEC movs r2, 0x30 ldrsh r0, [r1, r2] cmp r0, 0 - bne _0812D00C + bne @0812D00C movs r0, 0x1 - b _0812D01E + b @0812D01E .align 2, 0 .pool -_0812D00C: +@0812D00C: ldrh r2, [r1, 0x3C] movs r3, 0x3C ldrsh r0, [r1, r3] cmp r0, 0 - beq _0812D01A + beq @0812D01A movs r0, 0 strh r0, [r1, 0x30] -_0812D01A: +@0812D01A: lsls r0, r2, 24 lsrs r0, 24 -_0812D01E: +@0812D01E: pop {r1} bx r1 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 ldrsh r0, [r2, r1] cmp r0, 0 - beq _0812D0A6 + beq @0812D0A6 ldrh r0, [r2, 0x34] subs r0, 0x1 strh r0, [r2, 0x34] @@ -578809,7 +578809,7 @@ sub_812D024: @ 812D024 movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _0812D08E + bne @0812D08E movs r0, 0 strh r0, [r2, 0x3C] movs r6, 0x1 @@ -578823,35 +578823,35 @@ sub_812D024: @ 812D024 movs r7, 0x32 ldrsh r3, [r2, r7] cmp r3, 0 - beq _0812D060 + beq @0812D060 movs r4, 0x8 -_0812D060: +@0812D060: lsls r0, 16 asrs r0, 16 cmp r0, 0 - bgt _0812D078 + bgt @0812D078 strh r6, [r2, 0x3C] negs r0, r1 strh r0, [r2, 0x38] cmp r3, 0 - beq _0812D08E + beq @0812D08E subs r0, r5, 0x1 strh r0, [r2, 0x32] - b _0812D080 -_0812D078: + b @0812D080 +@0812D078: cmp r0, r4 - blt _0812D080 + blt @0812D080 negs r0, r1 strh r0, [r2, 0x38] -_0812D080: +@0812D080: movs r1, 0x32 ldrsh r0, [r2, r1] cmp r0, 0 - beq _0812D08E + beq @0812D08E ldrh r0, [r2, 0x34] lsls r0, 1 strh r0, [r2, 0x34] -_0812D08E: +@0812D08E: ldr r1, =0x085a8430 movs r3, 0x2E ldrsh r0, [r2, r3] @@ -578863,7 +578863,7 @@ _0812D08E: adds r1, r3, 0 adds r2, r3, 0 bl sub_80B6128 -_0812D0A6: +@0812D0A6: pop {r4-r7} pop {r0} bx r0 @@ -578872,7 +578872,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 + 1 adds r0, r4, 0 @@ -578896,7 +578896,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 + 1 bl get_task_id_by_function @@ -578910,12 +578910,12 @@ sub_812D0E0: @ 812D0E0 movs r1, 0xC ldrsh r0, [r0, r1] cmp r0, 0 - beq _0812D10C + beq @0812D10C movs r0, 0 - b _0812D120 + b @0812D120 .align 2, 0 .pool -_0812D10C: +@0812D10C: adds r0, r2, 0 bl remove_task ldr r0, =0x085a84ac @@ -578924,7 +578924,7 @@ _0812D10C: movs r2, 0x20 bl gpu_pal_apply movs r0, 0x1 -_0812D120: +@0812D120: pop {r1} bx r1 .align 2, 0 @@ -578932,7 +578932,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 @@ -578949,7 +578949,7 @@ sub_812D128: @ 812D128 movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _0812D166 + bne @0812D166 movs r0, 0x4 strh r0, [r2, 0xA] ldrh r1, [r2, 0xE] @@ -578959,13 +578959,13 @@ sub_812D128: @ 812D128 lsls r0, 16 asrs r0, 16 cmp r0, 0 - beq _0812D162 + beq @0812D162 cmp r0, 0x2 - bne _0812D166 -_0812D162: + bne @0812D166 +@0812D162: negs r0, r1 strh r0, [r2, 0xE] -_0812D166: +@0812D166: ldr r0, =0x085a84a0 movs r3, 0xC ldrsh r1, [r2, r3] @@ -578982,7 +578982,7 @@ _0812D166: thumb_func_end sub_812D128 thumb_func_start sub_812D188 -sub_812D188: @ 812D188 +sub_812D188: ; 812D188 push {lr} ldr r0, =sub_812D230 + 1 movs r1, 0x8 @@ -578998,7 +578998,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] @@ -579025,7 +579025,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] @@ -579050,7 +579050,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] @@ -579069,7 +579069,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 @@ -579093,12 +579093,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] @@ -579121,7 +579121,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 @@ -579134,7 +579134,7 @@ sub_812D28C: @ 812D28C movs r1, 0x3C ldrsh r0, [r0, r1] cmp r0, 0 - beq _0812D2FC + beq @0812D2FC ldrh r1, [r4, 0xA] adds r0, r1, 0x2 lsls r0, 16 @@ -579144,18 +579144,18 @@ sub_812D28C: @ 812D28C lsls r1, 16 asrs r1, 16 cmp r1, 0x1 - bne _0812D2C4 + bne @0812D2C4 movs r3, 0x1 movs r2, 0x1 - b _0812D2CC + b @0812D2CC .align 2, 0 .pool -_0812D2C4: +@0812D2C4: cmp r1, 0x10 - bne _0812D2CC + bne @0812D2CC movs r3, 0x2 movs r2, 0x2 -_0812D2CC: +@0812D2CC: ldr r0, =0x0203aacc ldr r0, [r0] lsls r1, r2, 1 @@ -579178,7 +579178,7 @@ _0812D2CC: movs r0, 0 strh r0, [r4, 0x8] strh r0, [r4, 0x26] -_0812D2FC: +@0812D2FC: pop {r4,r5} pop {r0} bx r0 @@ -579187,7 +579187,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] @@ -579199,20 +579199,20 @@ sub_812D30C: @ 812D30C lsls r1, 16 asrs r1, 16 cmp r1, 0x1 - bne _0812D32A + bne @0812D32A movs r3, 0x1 movs r2, 0x1 - b _0812D332 -_0812D32A: + b @0812D332 +@0812D32A: cmp r1, 0x10 - bne _0812D332 + bne @0812D332 movs r3, 0x2 movs r2, 0x2 -_0812D332: +@0812D332: movs r1, 0xC ldrsh r0, [r4, r1] cmp r0, 0 - bne _0812D366 + bne @0812D366 ldr r0, =0x0203aacc ldr r0, [r0] lsls r1, r2, 1 @@ -579234,24 +579234,24 @@ _0812D332: ldrh r0, [r4, 0xA] subs r0, 0x1 strh r0, [r4, 0xA] -_0812D366: +@0812D366: ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] lsls r0, 16 asrs r0, 16 cmp r0, 0x13 - ble _0812D378 + ble @0812D378 movs r0, 0 strh r0, [r4, 0xC] -_0812D378: +@0812D378: movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0 - bne _0812D384 + bne @0812D384 strh r0, [r4, 0x8] strh r0, [r4, 0x26] -_0812D384: +@0812D384: pop {r4,r5} pop {r0} bx r0 @@ -579260,13 +579260,13 @@ _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 adds r2, 0x8 movs r3, 0 -_0812D39E: +@0812D39E: lsls r0, r1, 1 adds r0, r2, r0 strh r3, [r0] @@ -579274,39 +579274,39 @@ _0812D39E: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xF - bls _0812D39E + bls @0812D39E pop {r0} bx r0 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 movs r4, 0x3 movs r5, 0 cmp r5, r6 - bge _0812D41E + bge @0812D41E ldr r7, =0x085a7568 -_0812D3C4: +@0812D3C4: movs r3, 0 movs r1, 0 lsls r0, r5, 16 asrs r0, 16 cmp r0, 0 - bne _0812D3DC + bne @0812D3DC movs r3, 0x1 movs r1, 0x1 - b _0812D3E4 + b @0812D3E4 .align 2, 0 .pool -_0812D3DC: +@0812D3DC: cmp r0, 0xF - bne _0812D3E4 + bne @0812D3E4 movs r3, 0x2 movs r1, 0x2 -_0812D3E4: +@0812D3E4: ldr r0, =0x0203aacc ldr r0, [r0] lsls r1, 1 @@ -579334,30 +579334,30 @@ _0812D3E4: lsrs r5, r0, 16 asrs r0, 16 cmp r0, r6 - blt _0812D3C4 -_0812D41E: + blt @0812D3C4 +@0812D41E: lsls r2, r5, 16 asrs r0, r2, 16 cmp r0, 0xF - bgt _0812D484 + bgt @0812D484 ldr r7, =0x085a756a -_0812D428: +@0812D428: movs r3, 0 movs r1, 0x3 asrs r0, r2, 16 cmp r0, 0 - bne _0812D440 + bne @0812D440 movs r3, 0x1 movs r1, 0x1 - b _0812D448 + b @0812D448 .align 2, 0 .pool -_0812D440: +@0812D440: cmp r0, 0xF - bne _0812D448 + bne @0812D448 movs r3, 0x2 movs r1, 0x2 -_0812D448: +@0812D448: ldr r0, =0x0203aacc ldr r0, [r0] lsls r1, 1 @@ -579386,8 +579386,8 @@ _0812D448: lsls r2, r5, 16 asrs r0, r2, 16 cmp r0, 0xF - ble _0812D428 -_0812D484: + ble @0812D428 +@0812D484: ldr r2, =0x03005e00 ldr r0, =0x0203ab34 ldr r0, [r0] @@ -579406,7 +579406,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 + 1 adds r0, r4, 0 @@ -579423,27 +579423,27 @@ 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 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _0812D4E4 + beq @0812D4E4 movs r0, 0 - b _0812D4E6 + b @0812D4E6 .align 2, 0 .pool -_0812D4E4: +@0812D4E4: movs r0, 0x1 -_0812D4E6: +@0812D4E6: pop {r1} bx r1 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 @@ -579467,7 +579467,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] @@ -579515,7 +579515,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 @@ -579539,11 +579539,11 @@ sub_812D594: @ 812D594 movs r1, 0xC ldrsh r0, [r4, r1] cmp r2, r0 - beq _0812D5E2 + beq @0812D5E2 movs r1, 0xE ldrsh r0, [r4, r1] cmp r0, 0x12 - bgt _0812D5E2 + bgt @0812D5E2 strh r5, [r4, 0xC] ldrh r0, [r4, 0xA] lsls r0, 16 @@ -579553,17 +579553,17 @@ sub_812D594: @ 812D594 ldrsh r1, [r4, r0] adds r0, r2, 0 bl sub_812DC08 -_0812D5E2: +@0812D5E2: movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0xC7 - ble _0812D5F4 + ble @0812D5F4 ldrh r0, [r4, 0x8] adds r0, 0x1 movs r1, 0 strh r0, [r4, 0x8] strh r1, [r4, 0xE] -_0812D5F4: +@0812D5F4: ldrh r0, [r4, 0x10] lsls r0, 16 asrs r0, 24 @@ -579576,7 +579576,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] @@ -579589,20 +579589,20 @@ sub_812D60C: @ 812D60C lsls r0, 16 asrs r0, 16 cmp r0, 0x3B - ble _0812D636 + ble @0812D636 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] bl sub_812E934 bl sub_812EAB0 -_0812D636: +@0812D636: pop {r4} pop {r0} bx r0 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} @@ -579661,14 +579661,14 @@ sub_812D63C: @ 812D63C movs r1, 0x80 lsls r1, 1 cmp r0, r1 - bgt _0812D6CC + bgt @0812D6CC ldrh r0, [r7, 0x8] adds r0, 0x1 strh r0, [r7, 0x8] strh r1, [r7, 0x10] movs r0, 0 strh r0, [r7, 0x12] -_0812D6CC: +@0812D6CC: add sp, 0x14 pop {r3} mov r8, r3 @@ -579680,7 +579680,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] @@ -579693,7 +579693,7 @@ sub_812D6EC: @ 812D6EC lsls r0, 16 asrs r0, 16 cmp r0, 0x4F - ble _0812D730 + ble @0812D730 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -579712,7 +579712,7 @@ sub_812D6EC: @ 812D6EC adds r0, r1 movs r1, 0x3 bl obj_anim_image_start_if_different -_0812D730: +@0812D730: pop {r4} pop {r0} bx r0 @@ -579721,7 +579721,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] @@ -579737,20 +579737,20 @@ sub_812D740: @ 812D740 lsls r0, 16 asrs r0, 16 cmp r0, 0x4F - ble _0812D76C + ble @0812D76C ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] movs r0, 0 strh r0, [r4, 0x12] -_0812D76C: +@0812D76C: pop {r4} pop {r0} bx r0 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] @@ -579766,53 +579766,53 @@ sub_812D774: @ 812D774 lsls r0, 16 asrs r0, 16 cmp r0, 0x27 - ble _0812D7DC + ble @0812D7DC movs r0, 0 strh r0, [r4, 0x12] ldr r0, =0x0203ab34 ldr r1, [r0] ldrb r0, [r1, 0x5] cmp r0, 0 - beq _0812D7B8 + beq @0812D7B8 ldrb r1, [r1, 0xA] movs r2, 0x14 ldrsh r0, [r4, r2] cmp r1, r0 - bgt _0812D7D6 + bgt @0812D7D6 ldrh r0, [r4, 0x8] adds r0, 0x1 - b _0812D7D4 + b @0812D7D4 .align 2, 0 .pool -_0812D7B8: +@0812D7B8: movs r1, 0x14 ldrsh r0, [r4, r1] cmp r0, 0x3 - ble _0812D7C6 + ble @0812D7C6 ldrh r0, [r4, 0x8] adds r0, 0x1 - b _0812D7D4 -_0812D7C6: + b @0812D7D4 +@0812D7C6: ldrh r0, [r4, 0x14] bl sub_812B760 lsls r0, 24 cmp r0, 0 - beq _0812D7D6 + beq @0812D7D6 movs r0, 0xE -_0812D7D4: +@0812D7D4: strh r0, [r4, 0x8] -_0812D7D6: +@0812D7D6: ldrh r0, [r4, 0x14] adds r0, 0x1 strh r0, [r4, 0x14] -_0812D7DC: +@0812D7DC: pop {r4} pop {r0} bx r0 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 @@ -579824,15 +579824,15 @@ sub_812D7E4: @ 812D7E4 lsls r0, 16 lsrs r5, r0, 16 cmp r0, 0 - beq _0812D810 + beq @0812D810 ldrh r0, [r4, 0x10] lsls r0, 16 asrs r0, 24 bl sub_812BE0C - b _0812D838 + b @0812D838 .align 2, 0 .pool -_0812D810: +@0812D810: movs r0, 0x1 bl sub_812BCE8 ldr r1, [r6] @@ -579840,7 +579840,7 @@ _0812D810: lsrs r0, 24 ldrb r1, [r1, 0x5] cmp r0, r1 - beq _0812D842 + beq @0812D842 ldrh r0, [r4, 0x10] lsls r0, 16 asrs r0, 24 @@ -579850,17 +579850,17 @@ _0812D810: ldrsh r0, [r0, r1] movs r1, 0x14 bl __modsi3 -_0812D838: +@0812D838: lsls r0, 16 lsrs r5, r0, 16 ldrb r0, [r4, 0x10] adds r0, 0x40 strh r0, [r4, 0x10] -_0812D842: +@0812D842: lsls r0, r5, 16 asrs r5, r0, 16 cmp r5, 0 - bne _0812D866 + bne @0812D866 movs r0, 0x1 bl sub_812BCE8 ldr r1, =0x0203ab34 @@ -579869,12 +579869,12 @@ _0812D842: lsrs r0, 24 ldrb r1, [r1, 0x5] cmp r0, r1 - bne _0812D866 + bne @0812D866 strh r5, [r4, 0x10] ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_0812D866: +@0812D866: pop {r4-r6} pop {r0} bx r0 @@ -579883,7 +579883,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] @@ -579893,7 +579893,7 @@ sub_812D870: @ 812D870 lsls r0, 16 asrs r0, 16 cmp r0, 0x3B - ble _0812D914 + ble @0812D914 bl sub_80A2F30 bl sub_812EA7C bl sub_812EBCC @@ -579904,7 +579904,7 @@ sub_812D870: @ 812D870 ldr r1, [r5] ldrb r0, [r1, 0x5] cmp r0, 0 - bne _0812D8D0 + bne @0812D8D0 movs r0, 0xA0 strh r0, [r4, 0x10] adds r0, r1, 0 @@ -579919,10 +579919,10 @@ sub_812D870: @ 812D870 bl obj_anim_image_start_if_different ldr r0, =0x00000187 bl fanfare_play - b _0812D914 + b @0812D914 .align 2, 0 .pool -_0812D8D0: +@0812D8D0: movs r0, 0xC0 strh r0, [r4, 0x10] adds r0, r1, 0 @@ -579947,15 +579947,15 @@ _0812D8D0: ldr r0, [r5] ldrb r0, [r0, 0x2] cmp r0, 0 - beq _0812D90C + beq @0812D90C bl sub_812D1DC ldr r0, [r5] strb r6, [r0, 0x2] -_0812D90C: +@0812D90C: movs r0, 0xC3 lsls r0, 1 bl fanfare_play -_0812D914: +@0812D914: pop {r4-r6} pop {r0} bx r0 @@ -579964,35 +579964,35 @@ _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] movs r2, 0x10 ldrsh r0, [r4, r2] cmp r0, 0 - beq _0812D938 + beq @0812D938 subs r0, r1, 0x1 strh r0, [r4, 0x10] lsls r0, 16 cmp r0, 0 - bne _0812D948 -_0812D938: + bne @0812D948 +@0812D938: bl sub_812D20C lsls r0, 24 cmp r0, 0 - bne _0812D948 + bne @0812D948 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_0812D948: +@0812D948: pop {r4} pop {r0} bx r0 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 @@ -580019,24 +580019,24 @@ sub_812D950: @ 812D950 lsls r0, 16 asrs r0, 19 cmp r0, 0x19 - bgt _0812D998 + bgt @0812D998 adds r0, r5, 0 bl sub_812DC50 - b _0812D99E + b @0812D99E .align 2, 0 .pool -_0812D998: +@0812D998: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_0812D99E: +@0812D99E: pop {r4,r5} pop {r0} bx r0 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 @@ -580064,16 +580064,16 @@ sub_812D9A4: @ 812D9A4 ldr r0, [r4] ldrb r0, [r0, 0xA] cmp r0, 0 - bne _0812DA04 + bne @0812DA04 ldr r0, =sub_812D4EC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task - b _0812DA1A + b @0812DA1A .align 2, 0 .pool -_0812DA04: +@0812DA04: movs r0, 0x4 bl sub_812DEE4 bl dp15_jump_random_unknown @@ -580083,14 +580083,14 @@ _0812DA04: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] -_0812DA1A: +@0812DA1A: pop {r4-r6} pop {r0} bx r0 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 @@ -580100,51 +580100,51 @@ sub_812DA20: @ 812DA20 movs r2, 0xA ldrsh r0, [r4, r2] cmp r1, r0 - bne _0812DA40 + bne @0812DA40 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0812DA66 + b @0812DA66 .align 2, 0 .pool -_0812DA40: +@0812DA40: movs r1, 0x1C ldrsh r0, [r5, r1] movs r1, 0x18 bl __modsi3 lsls r0, 16 cmp r0, 0 - bne _0812DA66 + bne @0812DA66 ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] movs r1, 0x7 ands r0, r1 cmp r0, 0 - bne _0812DA66 + bne @0812DA66 ldrh r0, [r5, 0x1A] lsls r0, 16 asrs r0, 17 strh r0, [r5, 0x1A] -_0812DA66: +@0812DA66: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_812DA20 thumb_func_start sub_812DA6C -sub_812DA6C: @ 812DA6C +sub_812DA6C: ; 812DA6C push {lr} bl sub_812E054 lsls r0, 24 cmp r0, 0 - beq _0812DA86 + beq @0812DA86 ldr r0, =sub_812D4EC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task -_0812DA86: +@0812DA86: pop {r0} bx r0 .align 2, 0 @@ -580152,7 +580152,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 @@ -580202,7 +580202,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 @@ -580215,27 +580215,27 @@ sub_812DB04: @ 812DB04 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0812DB26 + beq @0812DB26 ldrh r0, [r4, 0x10] negs r0, r0 strh r0, [r4, 0x10] -_0812DB26: +@0812DB26: ldrh r0, [r4, 0x12] adds r0, 0x1 strh r0, [r4, 0x12] movs r1, 0x1F ands r0, r1 cmp r0, 0 - bne _0812DB3C + bne @0812DB3C ldrh r0, [r4, 0x10] lsls r0, 16 asrs r0, 17 strh r0, [r4, 0x10] -_0812DB3C: +@0812DB3C: movs r0, 0x10 ldrsh r5, [r4, r0] cmp r5, 0 - bne _0812DB7A + bne @0812DB7A bl sub_812EC70 bl sub_812EC94 bl sub_812E5A8 @@ -580259,7 +580259,7 @@ _0812DB3C: adds r0, 0x1 strh r0, [r4, 0x8] strh r5, [r4, 0x12] -_0812DB7A: +@0812DB7A: pop {r4,r5} pop {r0} bx r0 @@ -580268,7 +580268,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 @@ -580280,12 +580280,12 @@ sub_812DB8C: @ 812DB8C bl sub_812EEA8 lsls r0, 24 cmp r0, 0 - beq _0812DBB2 + beq @0812DBB2 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] bl sub_812EECC -_0812DBB2: +@0812DBB2: pop {r4} pop {r0} bx r0 @@ -580294,7 +580294,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 @@ -580323,14 +580323,14 @@ 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 asrs r6, r1, 16 lsls r0, 16 asrs r5, r0, 16 -_0812DC14: +@0812DC14: lsls r4, r2, 16 asrs r4, 16 subs r0, r4, 0x4 @@ -580353,7 +580353,7 @@ _0812DC14: lsrs r2, r4, 16 asrs r4, 16 cmp r4, 0xE - ble _0812DC14 + ble @0812DC14 pop {r4-r6} pop {r0} bx r0 @@ -580362,12 +580362,12 @@ _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 asrs r5, r0, 16 -_0812DC58: +@0812DC58: lsls r3, r4, 5 adds r3, r5, r3 lsls r3, 16 @@ -580380,7 +580380,7 @@ _0812DC58: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xE - bls _0812DC58 + bls @0812DC58 pop {r4,r5} pop {r0} bx r0 @@ -580389,7 +580389,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 @@ -580415,27 +580415,27 @@ 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 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _0812DCCC + beq @0812DCCC movs r0, 0 - b _0812DCCE + b @0812DCCE .align 2, 0 .pool -_0812DCCC: +@0812DCCC: movs r0, 0x1 -_0812DCCE: +@0812DCCE: pop {r1} bx r1 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 @@ -580459,7 +580459,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 @@ -580480,7 +580480,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 @@ -580488,11 +580488,11 @@ sub_812DD28: @ 812DD28 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0812DD3E + bne @0812DD3E ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] -_0812DD3E: +@0812DD3E: pop {r0} bx r0 .align 2, 0 @@ -580500,7 +580500,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 @@ -580523,7 +580523,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 @@ -580560,7 +580560,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 @@ -580569,7 +580569,7 @@ sub_812DDC4: @ 812DDC4 movs r0, 0x6 ands r0, r1 cmp r0, 0 - beq _0812DE08 + beq @0812DE08 movs r0, 0x1 movs r1, 0 bl Window_FastFillPixels @@ -580590,7 +580590,7 @@ sub_812DDC4: @ 812DDC4 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_0812DE08: +@0812DE08: add sp, 0x4 pop {r4} pop {r0} @@ -580600,7 +580600,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 @@ -580615,7 +580615,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] @@ -580629,7 +580629,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 @@ -580656,7 +580656,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 + 1 bl get_task_id_by_function @@ -580670,7 +580670,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 + 1 movs r1, 0x3 @@ -580692,7 +580692,7 @@ sub_812DE94: @ 812DE94 adds r2, r0, 0 adds r2, 0x8 movs r3, 0x40 -_0812DEC0: +@0812DEC0: lsls r0, r1, 1 adds r0, r2, r0 strh r3, [r0] @@ -580700,7 +580700,7 @@ _0812DEC0: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xF - bls _0812DEC0 + bls @0812DEC0 pop {r0} bx r0 .align 2, 0 @@ -580708,7 +580708,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} @@ -580733,9 +580733,9 @@ sub_812DEE4: @ 812DEE4 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0xFF - beq _0812DF52 + beq @0812DF52 mov r8, r1 -_0812DF1A: +@0812DF1A: mov r0, r8 adds r4, r5, r0 ldr r0, [r4] @@ -580762,8 +580762,8 @@ _0812DF1A: adds r0, r1 ldrb r0, [r0] cmp r0, 0xFF - bne _0812DF1A -_0812DF52: + bne @0812DF1A +@0812DF52: pop {r3} mov r8, r3 pop {r4-r7} @@ -580774,7 +580774,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} @@ -580798,7 +580798,7 @@ sub_812DF68: @ 812DF68 asrs r6, r4, 16 lsls r2, 16 lsls r3, 16 -_0812DF96: +@0812DF96: lsls r0, r5, 1 mov r1, r12 adds r1, 0x8 @@ -580806,7 +580806,7 @@ _0812DF96: movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0x40 - bne _0812DFC4 + bne @0812DFC4 str r6, [sp] adds r0, r7, 0 mov r1, r8 @@ -580816,16 +580816,16 @@ _0812DF96: lsls r0, 24 lsrs r0, 24 strh r0, [r4] - b _0812DFCE + b @0812DFCE .align 2, 0 .pool -_0812DFC4: +@0812DFC4: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0xF - bls _0812DF96 -_0812DFCE: + bls @0812DF96 +@0812DFCE: add sp, 0x4 pop {r3} mov r8, r3 @@ -580835,7 +580835,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] @@ -580849,7 +580849,7 @@ sub_812DFDC: @ 812DFDC ldrh r1, [r4, 0xA] ldr r0, =0x0000ffff cmp r1, r0 - beq _0812E008 + beq @0812E008 ldr r0, =0x085a7a20 movs r2, 0xA ldrsh r1, [r4, r2] @@ -580857,17 +580857,17 @@ sub_812DFDC: @ 812DFDC adds r1, r0 ldr r0, [r1] bl _call_via_r0 -_0812E008: +@0812E008: movs r5, 0x4 adds r6, r4, 0 adds r6, 0x8 -_0812E00E: +@0812E00E: lsls r0, r5, 1 adds r4, r6, r0 movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0x40 - beq _0812E02E + beq @0812E02E adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -580877,12 +580877,12 @@ _0812E00E: bl obj_delete_and_free_tiles movs r0, 0x40 strh r0, [r4] -_0812E02E: +@0812E02E: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0xF - bls _0812E00E + bls @0812E00E pop {r4-r6} pop {r0} bx r0 @@ -580891,7 +580891,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] @@ -580906,13 +580906,13 @@ sub_812E054: @ 812E054 adds r3, r0, 0 adds r3, 0x8 ldr r4, =0x02020630 -_0812E070: +@0812E070: lsls r0, r2, 1 adds r1, r3, r0 movs r5, 0 ldrsh r0, [r1, r5] cmp r0, 0x40 - beq _0812E09C + beq @0812E09C lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -580920,26 +580920,26 @@ _0812E070: movs r5, 0x3C ldrsh r0, [r1, r5] cmp r0, 0 - beq _0812E09C + beq @0812E09C movs r0, 0 - b _0812E0A8 + b @0812E0A8 .align 2, 0 .pool -_0812E09C: +@0812E09C: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xF - bls _0812E070 + bls @0812E070 movs r0, 0x1 -_0812E0A8: +@0812E0A8: pop {r4,r5} pop {r1} bx r1 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 @@ -580963,20 +580963,20 @@ 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 -_0812E0EA: +@0812E0EA: movs r4, 0 lsls r5, r0, 16 lsls r7, r6, 16 -_0812E0F0: +@0812E0F0: ldr r0, =0x085a7ce0 asrs r1, r5, 16 movs r2, 0 @@ -581004,7 +581004,7 @@ _0812E0F0: lsrs r4, r0, 16 asrs r0, 16 cmp r0, 0x77 - ble _0812E0F0 + ble @0812E0F0 movs r2, 0x80 lsls r2, 9 adds r1, r7, r2 @@ -581015,7 +581015,7 @@ _0812E0F0: lsrs r6, r1, 16 asrs r1, 16 cmp r1, 0x2 - ble _0812E0EA + ble @0812E0EA pop {r4-r7} pop {r0} bx r0 @@ -581024,7 +581024,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 @@ -581081,12 +581081,12 @@ 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 ldr r6, =0x0000270f -_0812E1D0: +@0812E1D0: lsls r4, 16 asrs r4, 16 lsls r5, 16 @@ -581105,11 +581105,11 @@ _0812E1D0: lsrs r5, r0, 16 asrs r0, 16 cmp r0, r6 - ble _0812E1D0 + ble @0812E1D0 movs r4, 0xEB movs r5, 0x1 ldr r6, =0x0000270f -_0812E1FE: +@0812E1FE: lsls r4, 16 asrs r4, 16 lsls r5, 16 @@ -581128,7 +581128,7 @@ _0812E1FE: lsrs r5, r0, 16 asrs r0, 16 cmp r0, r6 - ble _0812E1FE + ble @0812E1FE pop {r4-r6} pop {r0} bx r0 @@ -581137,7 +581137,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} @@ -581195,7 +581195,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 @@ -581204,13 +581204,13 @@ sub_812E2A8: @ 812E2A8 movs r3, 0x2E ldrsh r0, [r4, r3] cmp r0, 0 - beq _0812E2BC + beq @0812E2BC ldrh r2, [r1, 0xE] -_0812E2BC: +@0812E2BC: movs r1, 0x34 ldrsh r0, [r4, r1] cmp r0, r2 - beq _0812E2F6 + beq @0812E2F6 strh r2, [r4, 0x34] ldrh r1, [r4, 0x32] adds r0, r2, 0 @@ -581232,7 +581232,7 @@ _0812E2BC: strh r0, [r1] adds r0, r4, 0 bl sub_8008324 -_0812E2F6: +@0812E2F6: pop {r4} pop {r0} bx r0 @@ -581241,7 +581241,7 @@ _0812E2F6: thumb_func_end sub_812E2A8 thumb_func_start sub_812E300 -sub_812E300: @ 812E300 +sub_812E300: ; 812E300 push {lr} ldr r0, =0x085a7d10 movs r1, 0x58 @@ -581269,17 +581269,17 @@ 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 ldr r0, [r4] cmp r0, 0 - bne _0812E350 + bne @0812E350 movs r0, 0x28 bl malloc_and_clear str r0, [r4] -_0812E350: +@0812E350: ldr r2, [r4] ldr r0, =0x0203aad8 ldr r1, [r0] @@ -581350,7 +581350,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] @@ -581365,11 +581365,11 @@ sub_812E3E8: @ 812E3E8 ldr r4, =0x0203aae4 ldr r0, [r4] cmp r0, 0 - beq _0812E410 + beq @0812E410 bl free movs r0, 0 str r0, [r4] -_0812E410: +@0812E410: pop {r4} pop {r0} bx r0 @@ -581378,7 +581378,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 @@ -581388,7 +581388,7 @@ sub_812E424: @ 812E424 adds r0, 0x2A ldrb r0, [r0] cmp r0, 0x4 - bne _0812E46A + bne @0812E46A movs r0, 0x8 strh r0, [r2, 0x24] strh r0, [r2, 0x26] @@ -581396,27 +581396,27 @@ sub_812E424: @ 812E424 adds r0, 0x2B ldrb r0, [r0] cmp r0, 0 - beq _0812E458 + beq @0812E458 adds r0, r2, 0 adds r0, 0x2C ldrb r1, [r0] movs r0, 0x3F ands r0, r1 cmp r0, 0 - bne _0812E466 - b _0812E46A -_0812E458: + bne @0812E466 + b @0812E46A +@0812E458: adds r0, r2, 0 adds r0, 0x2C ldrb r1, [r0] movs r0, 0x3F ands r0, r1 cmp r0, 0 - bne _0812E46A -_0812E466: + bne @0812E46A +@0812E466: ldr r0, =0x0000fff8 strh r0, [r2, 0x26] -_0812E46A: +@0812E46A: pop {r0} bx r0 .align 2, 0 @@ -581424,7 +581424,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 @@ -581434,11 +581434,11 @@ sub_812E474: @ 812E474 ldr r4, =0x0203aae8 ldr r0, [r4] cmp r0, 0 - bne _0812E490 + bne @0812E490 movs r0, 0x8 bl malloc_and_clear str r0, [r4] -_0812E490: +@0812E490: ldr r2, [r4] ldr r0, =0x0203aad8 mov r10, r0 @@ -581496,11 +581496,11 @@ _0812E490: ldr r4, =0x0203aaec ldr r0, [r4] cmp r0, 0 - bne _0812E510 + bne @0812E510 movs r0, 0x8 bl malloc_and_clear str r0, [r4] -_0812E510: +@0812E510: ldr r2, [r4] mov r3, r10 ldr r0, [r3] @@ -581561,17 +581561,17 @@ _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 ldr r0, [r4] cmp r0, 0 - bne _0812E5BC + bne @0812E5BC movs r0, 0x8 bl malloc_and_clear str r0, [r4] -_0812E5BC: +@0812E5BC: ldr r2, [r4] ldr r0, =0x0203aad8 ldr r0, [r0] @@ -581635,11 +581635,11 @@ _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 -_0812E656: +@0812E656: ldr r0, =0x085a7d88 movs r1, 0xB8 lsls r1, 1 @@ -581684,7 +581684,7 @@ _0812E656: adds r0, r6 lsrs r5, r0, 16 cmp r4, 0x2 - bls _0812E656 + bls @0812E656 pop {r4-r6} pop {r0} bx r0 @@ -581693,7 +581693,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 @@ -581728,7 +581728,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 @@ -581817,7 +581817,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, =0x085a7db8 movs r1, 0xB8 @@ -581860,7 +581860,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] @@ -581873,7 +581873,7 @@ sub_812E82C: @ 812E82C adds r0, r1 bl obj_delete_and_free_tiles movs r4, 0 -_0812E846: +@0812E846: ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x49 @@ -581889,25 +581889,25 @@ _0812E846: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bls _0812E846 + bls @0812E846 ldr r4, =0x0203aae8 ldr r0, [r4] cmp r0, 0 - beq _0812E878 + beq @0812E878 bl free movs r0, 0 str r0, [r4] -_0812E878: +@0812E878: ldr r4, =0x0203aaec ldr r0, [r4] cmp r0, 0 - beq _0812E888 + beq @0812E888 bl free movs r0, 0 str r0, [r4] -_0812E888: +@0812E888: movs r4, 0 -_0812E88A: +@0812E88A: ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x4B @@ -581923,7 +581923,7 @@ _0812E88A: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _0812E88A + bls @0812E88A pop {r4} pop {r0} bx r0 @@ -581932,10 +581932,10 @@ _0812E88A: thumb_func_end sub_812E82C thumb_func_start sub_812E8C4 -sub_812E8C4: @ 812E8C4 +sub_812E8C4: ; 812E8C4 push {r4,lr} movs r4, 0 -_0812E8C8: +@0812E8C8: ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x4E @@ -581951,7 +581951,7 @@ _0812E8C8: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bls _0812E8C8 + bls @0812E8C8 pop {r4} pop {r0} bx r0 @@ -581960,7 +581960,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] @@ -581975,11 +581975,11 @@ sub_812E8F8: @ 812E8F8 ldr r4, =0x0203aaf0 ldr r0, [r4] cmp r0, 0 - beq _0812E920 + beq @0812E920 bl free movs r0, 0 str r0, [r4] -_0812E920: +@0812E920: pop {r4} pop {r0} bx r0 @@ -581988,7 +581988,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 @@ -582074,14 +582074,14 @@ 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] movs r1, 0x2E ldrsh r4, [r2, r1] cmp r4, 0 - beq _0812EA0C + beq @0812EA0C subs r0, 0x1 movs r1, 0 strh r0, [r2, 0x2E] @@ -582092,8 +582092,8 @@ sub_812E9E8: @ 812E9E8 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - b _0812EA3E -_0812EA0C: + b @0812EA3E +@0812EA0C: adds r3, r2, 0 adds r3, 0x3E ldrb r1, [r3] @@ -582115,18 +582115,18 @@ _0812EA0C: lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - ble _0812EA3E + ble @0812EA3E ldrh r0, [r2, 0x3C] strh r0, [r2, 0x2E] strh r4, [r2, 0x34] -_0812EA3E: +@0812EA3E: pop {r4} pop {r0} bx r0 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 @@ -582156,10 +582156,10 @@ 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: +@0812EA80: ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x50 @@ -582175,7 +582175,7 @@ _0812EA80: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bls _0812EA80 + bls @0812EA80 pop {r4} pop {r0} bx r0 @@ -582184,7 +582184,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 @@ -582257,7 +582257,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 @@ -582268,13 +582268,13 @@ sub_812EB48: @ 812EB48 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - beq _0812EB9A + beq @0812EB9A ldrh r0, [r4, 0x3A] subs r0, 0x1 strh r0, [r4, 0x3A] lsls r0, 16 cmp r0, 0 - bgt _0812EB9A + bgt @0812EB9A movs r0, 0x7 bl gpu_pal_tags_index_of lsls r0, 24 @@ -582296,7 +582296,7 @@ sub_812EB48: @ 812EB48 strh r0, [r4, 0x38] ldrh r0, [r4, 0x3C] strh r0, [r4, 0x3A] -_0812EB9A: +@0812EB9A: add sp, 0x4 pop {r4} pop {r0} @@ -582306,7 +582306,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] @@ -582323,7 +582323,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 gpu_pal_tags_index_of @@ -582337,7 +582337,7 @@ sub_812EBCC: @ 812EBCC movs r3, 0 bl sub_80B609C movs r4, 0 -_0812EBEA: +@0812EBEA: ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x52 @@ -582353,7 +582353,7 @@ _0812EBEA: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bls _0812EBEA + bls @0812EBEA pop {r4} pop {r0} bx r0 @@ -582362,7 +582362,7 @@ _0812EBEA: thumb_func_end sub_812EBCC thumb_func_start sub_812EC20 -sub_812EC20: @ 812EC20 +sub_812EC20: ; 812EC20 push {lr} ldr r0, =0x085a7e00 movs r1, 0xA8 @@ -582394,7 +582394,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] @@ -582404,7 +582404,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] @@ -582423,7 +582423,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, =0x085a7616 @@ -582431,7 +582431,7 @@ sub_812EC94: @ 812EC94 movs r2, 0x8 bl memcpy movs r4, 0 -_0812ECA4: +@0812ECA4: ldr r0, =0x02021bbc ldrh r0, [r0] movs r1, 0x50 @@ -582478,7 +582478,7 @@ _0812ECA4: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _0812ECA4 + bls @0812ECA4 add sp, 0x8 pop {r4,r5} pop {r0} @@ -582488,7 +582488,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] @@ -582513,17 +582513,17 @@ sub_812ED20: @ 812ED20 movs r2, 0x2E ldrsh r0, [r5, r2] cmp r0, 0x7F - ble _0812ED5A + ble @0812ED5A movs r0, 0x2 strb r0, [r1] -_0812ED5A: +@0812ED5A: ldrh r0, [r5, 0x30] adds r0, 0x1 strh r0, [r5, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0xF - ble _0812ED84 + ble @0812ED84 adds r3, r5, 0 adds r3, 0x3F ldrb r2, [r3] @@ -582538,17 +582538,17 @@ _0812ED5A: strb r0, [r3] movs r0, 0 strh r0, [r5, 0x30] -_0812ED84: +@0812ED84: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_812ED20 thumb_func_start sub_812ED8C -sub_812ED8C: @ 812ED8C +sub_812ED8C: ; 812ED8C push {r4,lr} movs r4, 0 -_0812ED90: +@0812ED90: ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x54 @@ -582564,7 +582564,7 @@ _0812ED90: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _0812ED90 + bls @0812ED90 pop {r4} pop {r0} bx r0 @@ -582573,7 +582573,7 @@ _0812ED90: thumb_func_end sub_812ED8C thumb_func_start sub_812EDC0 -sub_812EDC0: @ 812EDC0 +sub_812EDC0: ; 812EDC0 push {r4,lr} ldr r0, =0x085a7e30 movs r1, 0xA8 @@ -582612,27 +582612,27 @@ 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] movs r1, 0x2E ldrsh r0, [r3, r1] cmp r0, 0 - bne _0812EE36 + bne @0812EE36 adds r0, r3, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0812EE90 + beq @0812EE90 adds r0, r2, 0x1 strh r0, [r3, 0x2E] - b _0812EE90 -_0812EE36: + b @0812EE90 +@0812EE36: cmp r0, 0x1 - bne _0812EE72 + bne @0812EE72 movs r0, 0x3E adds r0, r3 mov r12, r0 @@ -582654,14 +582654,14 @@ _0812EE36: lsls r0, 16 asrs r0, 16 cmp r0, 0x17 - ble _0812EE90 + ble @0812EE90 ldrh r0, [r3, 0x2E] adds r0, 0x1 strh r0, [r3, 0x2E] movs r0, 0 strh r0, [r3, 0x32] - b _0812EE90 -_0812EE72: + b @0812EE90 +@0812EE72: adds r2, r3, 0 adds r2, 0x3E ldrb r0, [r2] @@ -582674,10 +582674,10 @@ _0812EE72: lsls r0, 16 asrs r0, 16 cmp r0, 0xF - ble _0812EE90 + ble @0812EE90 movs r0, 0x1 strh r0, [r3, 0x3C] -_0812EE90: +@0812EE90: ldrh r0, [r3, 0x30] movs r1, 0xFF ands r1, r0 @@ -582692,7 +582692,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] @@ -582711,7 +582711,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] @@ -582736,7 +582736,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 @@ -582777,7 +582777,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 @@ -582785,16 +582785,16 @@ sub_812EF54: @ 812EF54 movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0812EF68 + beq @0812EF68 movs r0, 0x1 strh r0, [r2, 0x3C] -_0812EF68: +@0812EF68: pop {r0} bx r0 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 @@ -582817,7 +582817,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 @@ -582852,7 +582852,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 @@ -582909,10 +582909,10 @@ sub_812EFDC: @ 812EFDC adds r4, r0 ldr r1, [r4] cmp r1, 0 - beq _0812F056 + beq @0812F056 adds r0, r2, 0 bl obj_set_f18_to_r0_f42_to_40 -_0812F056: +@0812F056: adds r0, r7, 0 add sp, 0x18 pop {r3,r4} @@ -582926,14 +582926,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 @@ -582952,7 +582952,7 @@ sub_812F080: @ 812F080 lsls r0, 16 asrs r0, 16 cmp r0, 0xF - ble _0812F0C6 + ble @0812F0C6 adds r3, r4, 0 adds r3, 0x42 ldrb r2, [r3] @@ -582967,7 +582967,7 @@ sub_812F080: @ 812F080 strb r0, [r3] movs r0, 0 strh r0, [r4, 0x30] -_0812F0C6: +@0812F0C6: movs r0, 0 strh r0, [r4, 0x24] strh r0, [r4, 0x26] @@ -582977,7 +582977,7 @@ _0812F0C6: movs r0, 0x3F ands r0, r1 cmp r0, 0 - beq _0812F0F2 + beq @0812F0F2 movs r1, 0x3A ldrsh r0, [r4, r1] lsls r0, 1 @@ -582990,7 +582990,7 @@ _0812F0C6: adds r0, r5, r0 ldrh r0, [r0] strh r0, [r4, 0x26] -_0812F0F2: +@0812F0F2: add sp, 0x10 pop {r4,r5} pop {r0} @@ -583000,7 +583000,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 @@ -583014,7 +583014,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 @@ -583028,7 +583028,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 @@ -583044,151 +583044,151 @@ 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 ldrsh r0, [r2, r1] cmp r0, 0x1 - beq _0812F184 + beq @0812F184 cmp r0, 0x1 - bgt _0812F166 + bgt @0812F166 cmp r0, 0 - beq _0812F170 - b _0812F1B4 -_0812F166: + beq @0812F170 + b @0812F1B4 +@0812F166: cmp r0, 0x2 - beq _0812F194 + beq @0812F194 cmp r0, 0x3 - beq _0812F1B0 - b _0812F1B4 -_0812F170: + beq @0812F1B0 + b @0812F1B4 +@0812F170: ldrh r0, [r2, 0x20] adds r0, 0x4 strh r0, [r2, 0x20] lsls r0, 16 asrs r0, 16 cmp r0, 0xCF - ble _0812F1B4 + ble @0812F1B4 movs r0, 0xD0 strh r0, [r2, 0x20] - b _0812F1A2 -_0812F184: + b @0812F1A2 +@0812F184: ldrh r0, [r2, 0x30] adds r0, 0x1 strh r0, [r2, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x5A - ble _0812F1B4 - b _0812F1A2 -_0812F194: + ble @0812F1B4 + b @0812F1A2 +@0812F194: ldrh r0, [r2, 0x20] adds r0, 0x4 strh r0, [r2, 0x20] lsls r0, 16 ldr r1, =0x010f0000 cmp r0, r1 - ble _0812F1B4 -_0812F1A2: + ble @0812F1B4 +@0812F1A2: ldrh r0, [r2, 0x2E] adds r0, 0x1 strh r0, [r2, 0x2E] - b _0812F1B4 + b @0812F1B4 .align 2, 0 .pool -_0812F1B0: +@0812F1B0: movs r0, 0 strh r0, [r2, 0x3C] -_0812F1B4: +@0812F1B4: pop {r0} bx r0 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 ldrsh r0, [r1, r2] cmp r0, 0x1 - beq _0812F1EC + beq @0812F1EC cmp r0, 0x1 - bgt _0812F1CE + bgt @0812F1CE cmp r0, 0 - beq _0812F1D8 - b _0812F216 -_0812F1CE: + beq @0812F1D8 + b @0812F216 +@0812F1CE: cmp r0, 0x2 - beq _0812F1FC + beq @0812F1FC cmp r0, 0x3 - beq _0812F212 - b _0812F216 -_0812F1D8: + beq @0812F212 + b @0812F216 +@0812F1D8: ldrh r0, [r1, 0x20] subs r0, 0x4 strh r0, [r1, 0x20] lsls r0, 16 asrs r0, 16 cmp r0, 0xD0 - bgt _0812F216 + bgt @0812F216 movs r0, 0xD0 strh r0, [r1, 0x20] - b _0812F20A -_0812F1EC: + b @0812F20A +@0812F1EC: ldrh r0, [r1, 0x30] adds r0, 0x1 strh r0, [r1, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x5A - ble _0812F216 - b _0812F20A -_0812F1FC: + ble @0812F216 + b @0812F20A +@0812F1FC: ldrh r0, [r1, 0x20] subs r0, 0x4 strh r0, [r1, 0x20] lsls r0, 16 asrs r0, 16 cmp r0, 0x90 - bgt _0812F216 -_0812F20A: + bgt @0812F216 +@0812F20A: ldrh r0, [r1, 0x2E] adds r0, 0x1 strh r0, [r1, 0x2E] - b _0812F216 -_0812F212: + b @0812F216 +@0812F212: movs r0, 0 strh r0, [r1, 0x3C] -_0812F216: +@0812F216: pop {r0} bx r0 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 ldrsh r0, [r4, r1] cmp r0, 0x5 - bhi _0812F2C6 + bhi @0812F2C6 lsls r0, 2 - ldr r1, =_0812F238 + ldr r1, =@0812F238 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0812F238: - .4byte _0812F250 - .4byte _0812F268 - .4byte _0812F288 - .4byte _0812F29C - .4byte _0812F2AC - .4byte _0812F2C2 -_0812F250: +@0812F238: + .4byte @0812F250 + .4byte @0812F268 + .4byte @0812F288 + .4byte @0812F29C + .4byte @0812F2AC + .4byte @0812F2C2 +@0812F250: ldr r0, =0x0203ab34 ldr r0, [r0] ldrb r1, [r0, 0xA] @@ -583200,82 +583200,82 @@ _0812F250: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] -_0812F268: +@0812F268: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble _0812F2C6 + ble @0812F2C6 ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] movs r0, 0 strh r0, [r4, 0x30] - b _0812F2C6 + b @0812F2C6 .align 2, 0 .pool -_0812F288: +@0812F288: ldrh r0, [r4, 0x20] adds r0, 0x4 strh r0, [r4, 0x20] lsls r0, 16 asrs r0, 16 cmp r0, 0xCF - ble _0812F2C6 + ble @0812F2C6 movs r0, 0xD0 strh r0, [r4, 0x20] - b _0812F2BA -_0812F29C: + b @0812F2BA +@0812F29C: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x5A - ble _0812F2C6 - b _0812F2BA -_0812F2AC: + ble @0812F2C6 + b @0812F2BA +@0812F2AC: ldrh r0, [r4, 0x20] adds r0, 0x4 strh r0, [r4, 0x20] lsls r0, 16 asrs r0, 16 cmp r0, 0xF7 - ble _0812F2C6 -_0812F2BA: + ble @0812F2C6 +@0812F2BA: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _0812F2C6 -_0812F2C2: + b @0812F2C6 +@0812F2C2: movs r0, 0 strh r0, [r4, 0x3C] -_0812F2C6: +@0812F2C6: pop {r4} pop {r0} bx r0 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 ldrsh r0, [r3, r1] cmp r0, 0x1 - beq _0812F2FA + beq @0812F2FA cmp r0, 0x1 - bgt _0812F2E2 + bgt @0812F2E2 cmp r0, 0 - beq _0812F2E8 - b _0812F368 -_0812F2E2: + beq @0812F2E8 + b @0812F368 +@0812F2E2: cmp r0, 0x2 - beq _0812F318 - b _0812F368 -_0812F2E8: + beq @0812F318 + b @0812F368 +@0812F2E8: adds r2, r3, 0 adds r2, 0x2C ldrb r0, [r2] @@ -583285,14 +583285,14 @@ _0812F2E8: ldrh r0, [r3, 0x2E] adds r0, 0x1 strh r0, [r3, 0x2E] -_0812F2FA: +@0812F2FA: ldrh r0, [r3, 0x22] adds r0, 0x8 strh r0, [r3, 0x22] lsls r0, 16 asrs r0, 16 cmp r0, 0x6F - ble _0812F368 + ble @0812F368 movs r0, 0x70 strh r0, [r3, 0x22] movs r0, 0x10 @@ -583300,12 +583300,12 @@ _0812F2FA: ldrh r0, [r3, 0x2E] adds r0, 0x1 strh r0, [r3, 0x2E] - b _0812F368 -_0812F318: + b @0812F368 +@0812F318: movs r0, 0x32 ldrsh r2, [r3, r0] cmp r2, 0 - bne _0812F35E + bne @0812F35E ldrh r0, [r3, 0x22] ldrh r1, [r3, 0x30] subs r0, r1 @@ -583318,14 +583318,14 @@ _0812F318: lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0812F35E + ble @0812F35E lsls r0, r1, 16 asrs r0, 18 strh r0, [r3, 0x30] strh r2, [r3, 0x34] adds r1, r0, 0 cmp r1, 0 - bne _0812F35E + bne @0812F35E ldrh r0, [r3, 0x2E] adds r0, 0x1 strh r0, [r3, 0x2E] @@ -583337,48 +583337,48 @@ _0812F318: negs r0, r0 ands r0, r1 strb r0, [r2] -_0812F35E: +@0812F35E: ldrh r0, [r3, 0x32] adds r0, 0x1 movs r1, 0x7 ands r0, r1 strh r0, [r3, 0x32] -_0812F368: +@0812F368: pop {r0} bx r0 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 ldrsh r0, [r1, r2] cmp r0, 0 - beq _0812F37E + beq @0812F37E cmp r0, 0x1 - beq _0812F394 - b _0812F3B0 -_0812F37E: + beq @0812F394 + b @0812F3B0 +@0812F37E: ldrh r0, [r1, 0x30] adds r0, 0x1 strh r0, [r1, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x8 - ble _0812F3B0 + ble @0812F3B0 ldrh r0, [r1, 0x2E] adds r0, 0x1 strh r0, [r1, 0x2E] - b _0812F3B0 -_0812F394: + b @0812F3B0 +@0812F394: ldrh r0, [r1, 0x22] adds r0, 0x2 strh r0, [r1, 0x22] lsls r0, 16 asrs r0, 16 cmp r0, 0x2F - ble _0812F3B0 + ble @0812F3B0 movs r0, 0x30 strh r0, [r1, 0x22] ldrh r0, [r1, 0x2E] @@ -583386,23 +583386,23 @@ _0812F394: strh r0, [r1, 0x2E] movs r0, 0 strh r0, [r1, 0x3C] -_0812F3B0: +@0812F3B0: pop {r0} bx r0 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 ldrsh r0, [r4, r1] cmp r0, 0 - beq _0812F3C6 + beq @0812F3C6 cmp r0, 0x1 - beq _0812F416 - b _0812F468 -_0812F3C6: + beq @0812F416 + b @0812F468 +@0812F3C6: adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -583415,7 +583415,7 @@ _0812F3C6: lsls r0, 16 asrs r0, 16 cmp r0, 0x20 - ble _0812F468 + ble @0812F468 ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] @@ -583440,8 +583440,8 @@ _0812F3C6: lsrs r1, 16 movs r0, 0x4C bl lcd_io_set - b _0812F468 -_0812F416: + b @0812F468 +@0812F416: ldrh r1, [r4, 0x32] lsls r1, 16 asrs r1, 24 @@ -583450,10 +583450,10 @@ _0812F416: strh r0, [r4, 0x30] lsls r0, 16 cmp r0, 0 - bge _0812F42C + bge @0812F42C movs r0, 0 strh r0, [r4, 0x30] -_0812F42C: +@0812F42C: ldrh r0, [r4, 0x30] lsls r1, r0, 4 orrs r1, r0 @@ -583469,7 +583469,7 @@ _0812F42C: movs r0, 0x30 ldrsh r1, [r4, r0] cmp r1, 0 - bne _0812F468 + bne @0812F468 ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] @@ -583482,20 +583482,20 @@ _0812F42C: adds r0, r4, 0 movs r1, 0 bl obj_anim_image_start -_0812F468: +@0812F468: pop {r4} pop {r0} bx r0 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 ldrsh r0, [r5, r1] cmp r0, 0x2 - bgt _0812F4C0 + bgt @0812F4C0 ldr r1, =0x085a8510 lsls r0, 2 adds r0, r1 @@ -583518,16 +583518,16 @@ sub_812F470: @ 812F470 lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble _0812F4FC + ble @0812F4FC ldrh r0, [r5, 0x30] adds r0, 0x1 strh r0, [r5, 0x30] movs r0, 0 strh r0, [r5, 0x32] - b _0812F4FC + b @0812F4FC .align 2, 0 .pool -_0812F4C0: +@0812F4C0: ldr r1, =0x085a8510 movs r2, 0x30 ldrsh r0, [r5, r2] @@ -583553,10 +583553,10 @@ _0812F4C0: lsls r0, 16 asrs r0, 16 cmp r0, 0x18 - ble _0812F4FC + ble @0812F4FC strh r1, [r5, 0x30] strh r1, [r5, 0x32] -_0812F4FC: +@0812F4FC: adds r0, r5, 0 movs r1, 0x1 bl obj_anim_image_start_if_different @@ -583570,7 +583570,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 @@ -583591,19 +583591,19 @@ sub_812F514: @ 812F514 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _0812F58C + beq @0812F58C cmp r0, 0x1 - bgt _0812F55C + bgt @0812F55C cmp r0, 0 - beq _0812F562 - b _0812F5D8 + beq @0812F562 + b @0812F5D8 .align 2, 0 .pool -_0812F55C: +@0812F55C: cmp r0, 0x2 - beq _0812F5A0 - b _0812F5D8 -_0812F562: + beq @0812F5A0 + b @0812F5D8 +@0812F562: movs r2, 0x3A ldrsh r0, [r4, r2] lsls r0, 1 @@ -583625,7 +583625,7 @@ _0812F562: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] -_0812F58C: +@0812F58C: ldrh r0, [r4, 0x30] subs r0, 0x1 strh r0, [r4, 0x30] @@ -583634,45 +583634,45 @@ _0812F58C: movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _0812F5D8 - b _0812F5D2 -_0812F5A0: + bne @0812F5D8 + b @0812F5D2 +@0812F5A0: ldrh r0, [r4, 0x24] movs r2, 0x24 ldrsh r1, [r4, r2] cmp r1, 0 - ble _0812F5AE + ble @0812F5AE subs r0, 0x4 - b _0812F5B4 -_0812F5AE: + b @0812F5B4 +@0812F5AE: cmp r1, 0 - bge _0812F5B6 + bge @0812F5B6 adds r0, 0x4 -_0812F5B4: +@0812F5B4: strh r0, [r4, 0x24] -_0812F5B6: +@0812F5B6: ldrh r0, [r4, 0x26] movs r2, 0x26 ldrsh r1, [r4, r2] cmp r1, 0 - ble _0812F5C4 + ble @0812F5C4 subs r0, 0x4 - b _0812F5CA -_0812F5C4: + b @0812F5CA +@0812F5C4: cmp r1, 0 - bge _0812F5CC + bge @0812F5CC adds r0, 0x4 -_0812F5CA: +@0812F5CA: strh r0, [r4, 0x26] -_0812F5CC: +@0812F5CC: ldr r0, [r4, 0x24] cmp r0, 0 - bne _0812F5D8 -_0812F5D2: + bne @0812F5D8 +@0812F5D2: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] -_0812F5D8: +@0812F5D8: add sp, 0x30 pop {r4-r6} pop {r0} @@ -583680,7 +583680,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 @@ -583692,12 +583692,12 @@ sub_812F5E0: @ 812F5E0 movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0 - bne _0812F602 + bne @0812F602 adds r0, r1, 0x1 strh r0, [r4, 0x2E] movs r0, 0xC strh r0, [r4, 0x30] -_0812F602: +@0812F602: movs r1, 0x3A ldrsh r0, [r4, r1] lsls r0, 1 @@ -583722,10 +583722,10 @@ _0812F602: movs r2, 0x30 ldrsh r0, [r4, r2] cmp r0, 0 - beq _0812F63C + beq @0812F63C subs r0, r1, 0x1 strh r0, [r4, 0x30] -_0812F63C: +@0812F63C: add sp, 0x10 pop {r4} pop {r0} @@ -583735,26 +583735,26 @@ _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 movs r1, 0x2E ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _0812F694 + beq @0812F694 cmp r0, 0x1 - bgt _0812F660 + bgt @0812F660 cmp r0, 0 - beq _0812F66A - b _0812F76C -_0812F660: + beq @0812F66A + b @0812F76C +@0812F660: cmp r0, 0x2 - beq _0812F6E0 + beq @0812F6E0 cmp r0, 0x3 - beq _0812F71C - b _0812F76C -_0812F66A: + beq @0812F71C + b @0812F76C +@0812F66A: ldr r0, =0x0203ab34 ldr r2, [r0] adds r1, r2, 0 @@ -583776,7 +583776,7 @@ _0812F66A: ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] -_0812F694: +@0812F694: ldrh r0, [r5, 0x30] adds r2, r0, 0x2 strh r2, [r5, 0x30] @@ -583788,17 +583788,17 @@ _0812F694: lsls r0, 16 asrs r0, 16 cmp r0, 0xD0 - ble _0812F6B0 + ble @0812F6B0 movs r0, 0xD0 strh r0, [r5, 0x32] -_0812F6B0: +@0812F6B0: movs r1, 0x34 ldrsh r0, [r5, r1] cmp r0, 0xCF - bgt _0812F6BC + bgt @0812F6BC movs r0, 0xD0 strh r0, [r5, 0x34] -_0812F6BC: +@0812F6BC: ldr r0, =0x0203ab34 ldr r2, [r0] ldrh r0, [r5, 0x32] @@ -583811,17 +583811,17 @@ _0812F6BC: movs r1, 0x30 ldrsh r0, [r5, r1] cmp r0, 0x33 - ble _0812F76C - b _0812F75E + ble @0812F76C + b @0812F75E .align 2, 0 .pool -_0812F6E0: +@0812F6E0: ldr r6, =0x0203ab34 ldr r0, [r6] movs r1, 0x12 ldrsh r0, [r0, r1] cmp r0, 0 - beq _0812F76C + beq @0812F76C ldr r1, =nullsub_12 + 1 movs r4, 0 str r4, [sp] @@ -583845,7 +583845,7 @@ _0812F6E0: adds r0, 0x1 strh r0, [r5, 0x2E] strh r4, [r5, 0x30] -_0812F71C: +@0812F71C: ldrh r0, [r5, 0x30] adds r2, r0, 0x2 strh r2, [r5, 0x30] @@ -583857,17 +583857,17 @@ _0812F71C: lsls r0, 16 asrs r0, 16 cmp r0, 0xD0 - ble _0812F738 + ble @0812F738 movs r0, 0xD0 strh r0, [r5, 0x32] -_0812F738: +@0812F738: movs r1, 0x34 ldrsh r0, [r5, r1] cmp r0, 0xCF - bgt _0812F744 + bgt @0812F744 movs r0, 0xD0 strh r0, [r5, 0x34] -_0812F744: +@0812F744: ldr r0, =0x0203ab34 ldr r2, [r0] ldrh r0, [r5, 0x32] @@ -583880,8 +583880,8 @@ _0812F744: movs r1, 0x30 ldrsh r0, [r5, r1] cmp r0, 0xF - ble _0812F76C -_0812F75E: + ble @0812F76C +@0812F75E: ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] @@ -583889,7 +583889,7 @@ _0812F75E: adds r1, 0x5C movs r0, 0x3F strh r0, [r1] -_0812F76C: +@0812F76C: add sp, 0x4 pop {r4-r6} pop {r0} @@ -583899,12 +583899,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 @@ -583914,7 +583914,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, =0x085a8520 ldr r4, [r0] @@ -583938,7 +583938,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 @@ -583960,7 +583960,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 @@ -583986,7 +583986,7 @@ sub_812F7E4: @ 812F7E4 movs r3, 0 ldr r5, =0x085a8334 adds r6, r4, 0 -_0812F822: +@0812F822: ldr r2, [r4] lsls r1, r3, 3 adds r2, r1, r2 @@ -584001,7 +584001,7 @@ _0812F822: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x15 - bls _0812F822 + bls @0812F822 ldr r3, [r6] adds r2, r3, 0 adds r2, 0x88 @@ -584039,7 +584039,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 @@ -584055,10 +584055,10 @@ sub_812F8A0: @ 812F8A0 adds r6, r4, 0 ldr r0, =0x085a83e4 ldr r4, [r0] -_0812F8C2: +@0812F8C2: movs r2, 0 adds r1, 0x1 -_0812F8C6: +@0812F8C6: adds r0, r4, r2 ldrb r0, [r0] strb r0, [r3] @@ -584067,11 +584067,11 @@ _0812F8C6: lsrs r2, r0, 24 adds r3, 0x1 cmp r2, 0x1F - bls _0812F8C6 + bls @0812F8C6 lsls r0, r1, 24 lsrs r1, r0, 24 cmp r1, 0x3F - bls _0812F8C2 + bls @0812F8C2 ldr r0, [r5] ldr r1, [r6] str r1, [r0] @@ -584089,7 +584089,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 @@ -584121,7 +584121,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 @@ -584130,7 +584130,7 @@ sub_812F958: @ 812F958 thumb_func_end sub_812F958 thumb_func_start sub_812F968 -sub_812F968: @ 812F968 +sub_812F968: ; 812F968 push {lr} ldr r1, =0x08dce770 movs r2, 0xA0 @@ -584145,7 +584145,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 @@ -584153,11 +584153,11 @@ sub_812F980: @ 812F980 movs r1, 0x4 ldr r0, =0x0203aad0 mov r8, r0 -_0812F98E: +@0812F98E: movs r0, 0 lsls r1, 16 mov r9, r1 -_0812F994: +@0812F994: mov r2, r8 ldr r1, [r2] mov r2, r9 @@ -584210,7 +584210,7 @@ _0812F994: lsrs r0, r4, 16 asrs r4, 16 cmp r4, 0x3 - ble _0812F994 + ble @0812F994 mov r2, r8 ldr r1, [r2] adds r1, 0x8 @@ -584231,7 +584231,7 @@ _0812F994: movs r2, 0x2 bl gpu_copy_bg_tile_map_to_vram movs r0, 0x7 -_0812FA32: +@0812FA32: mov r2, r8 ldr r1, [r2] adds r1, 0xC @@ -584251,13 +584251,13 @@ _0812FA32: lsrs r0, r4, 16 asrs r4, 16 cmp r4, 0xB - ble _0812FA32 + ble @0812FA32 adds r0, r5, 0x5 lsls r0, 16 lsrs r1, r0, 16 asrs r0, 16 cmp r0, 0x11 - ble _0812F98E + ble @0812F98E pop {r3,r4} mov r8, r3 mov r9, r4 @@ -584269,7 +584269,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] @@ -584327,7 +584327,7 @@ sub_812FA78: @ 812FA78 thumb_func_end sub_812FA78 thumb_func_start sub_812FAF4 -sub_812FAF4: @ 812FAF4 +sub_812FAF4: ; 812FAF4 push {lr} ldr r1, =0x08dcec70 movs r2, 0xA0 @@ -584344,7 +584344,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] @@ -584407,7 +584407,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} @@ -584611,7 +584611,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 @@ -584640,7 +584640,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} @@ -584648,7 +584648,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 run_remoboxes @@ -584658,7 +584658,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] @@ -584687,7 +584687,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 @@ -584697,24 +584697,24 @@ sub_812FE58: @ 812FE58 ldrb r0, [r0] adds r4, r1, 0 cmp r0, 0x4 - bls _0812FE6E - b _0812FFA0 -_0812FE6E: + bls @0812FE6E + b @0812FFA0 +@0812FE6E: lsls r0, 2 - ldr r1, =_0812FE80 + ldr r1, =@0812FE80 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0812FE80: - .4byte _0812FE94 - .4byte _0812FEC8 - .4byte _0812FF14 - .4byte _0812FF2A - .4byte _0812FF54 -_0812FE94: +@0812FE80: + .4byte @0812FE94 + .4byte @0812FEC8 + .4byte @0812FF14 + .4byte @0812FF2A + .4byte @0812FF54 +@0812FE94: bl remove_some_task movs r0, 0 bl SetVBlankCallback @@ -584729,10 +584729,10 @@ _0812FE94: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _0812FF3E + b @0812FF3E .align 2, 0 .pool -_0812FEC8: +@0812FEC8: bl sub_80A1A74 movs r2, 0xC0 lsls r2, 19 @@ -584745,7 +584745,7 @@ _0812FEC8: ldr r6, =0x85000400 movs r7, 0x85 lsls r7, 24 -_0812FEE2: +@0812FEE2: str r5, [sp] mov r0, sp str r0, [r1] @@ -584755,7 +584755,7 @@ _0812FEE2: adds r2, r4 subs r3, r4 cmp r3, r4 - bhi _0812FEE2 + bhi @0812FEE2 str r5, [sp] mov r0, sp str r0, [r1] @@ -584765,10 +584765,10 @@ _0812FEE2: str r0, [r1, 0x8] ldr r0, [r1, 0x8] bl reset_all_obj_data - b _0812FF36 + b @0812FF36 .align 2, 0 .pool -_0812FF14: +@0812FF14: ldrh r0, [r4, 0x20] bl SeedRng bl init_keypad_data @@ -584776,26 +584776,26 @@ _0812FF14: movs r0, 0x87 lsls r0, 3 adds r1, r4, r0 - b _0812FF3E -_0812FF2A: + b @0812FF3E +@0812FF2A: ldr r0, =0x02039f5d ldrb r0, [r0] ldr r1, =0x02039f5c ldrb r1, [r1] bl sub_8130884 -_0812FF36: +@0812FF36: ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 -_0812FF3E: +@0812FF3E: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0812FFA0 + b @0812FFA0 .align 2, 0 .pool -_0812FF54: +@0812FF54: ldr r0, =0x02039f5d ldrb r0, [r0] ldr r1, =0x02039f5c @@ -584828,7 +584828,7 @@ _0812FF54: bl lcd_io_set ldr r0, =sub_812FDF8 + 1 bl set_callback2 -_0812FFA0: +@0812FFA0: add sp, 0x4 pop {r4-r7} pop {r0} @@ -584838,57 +584838,57 @@ _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 ldrb r1, [r3] cmp r1, 0x1 - beq _0813001C + beq @0813001C cmp r1, 0x1 - bgt _0812FFE4 + bgt @0812FFE4 cmp r1, 0 - beq _0812FFEA - b _08130082 + beq @0812FFEA + b @08130082 .align 2, 0 .pool -_0812FFE4: +@0812FFE4: cmp r1, 0x2 - beq _0813005C - b _08130082 -_0812FFEA: + beq @0813005C + b @08130082 +@0812FFEA: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0812FFFA + bne @0812FFFA movs r0, 0x1 strb r0, [r3] -_0812FFFA: +@0812FFFA: ldr r0, =0x030011f6 ldrb r0, [r0] cmp r0, 0 - beq _08130082 + beq @08130082 ldr r1, =0x030011f4 ldrh r0, [r1] cmp r0, 0 - beq _08130082 + beq @08130082 subs r0, 0x1 - b _08130080 + b @08130080 .align 2, 0 .pool -_0813001C: +@0813001C: ldr r0, =0x030022c0 ldrh r2, [r0, 0x2E] ands r1, r2 cmp r1, 0 - bne _0813002E + bne @0813002E movs r0, 0x2 ands r0, r2 cmp r0, 0 - beq _08130040 -_0813002E: + beq @08130040 +@0813002E: movs r0, 0x2 strb r0, [r3] subs r0, 0x3 @@ -584897,38 +584897,38 @@ _0813002E: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 -_08130040: +@08130040: ldr r0, =0x030011f6 ldrb r0, [r0] cmp r0, 0 - beq _08130082 + beq @08130082 ldr r1, =0x030011f4 movs r0, 0 - b _08130080 + b @08130080 .align 2, 0 .pool -_0813005C: +@0813005C: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0813006E + bne @0813006E ldr r0, =sub_812FE0C + 1 bl set_callback2 -_0813006E: +@0813006E: ldr r0, =0x030011f6 ldrb r0, [r0] cmp r0, 0 - beq _08130082 + beq @08130082 ldr r1, =0x030011f4 ldrh r0, [r1] cmp r0, 0x1D - bhi _08130082 + bhi @08130082 adds r0, 0x1 -_08130080: +@08130080: strh r0, [r1] -_08130082: +@08130082: add sp, 0x4 pop {r0} bx r0 @@ -584937,7 +584937,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 gpu_reset_bgs_and_dma3_busy_flags @@ -584982,7 +584982,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 @@ -584990,12 +584990,12 @@ sub_813010C: @ 813010C lsls r1, 24 lsrs r1, 24 cmp r1, 0x1 - beq _081301D4 + beq @081301D4 ldr r6, =0x030061c0 ldr r1, [r6] ldrb r5, [r1, 0xA] cmp r0, 0x7 - bhi _08130190 + bhi @08130190 ldr r4, =0x02021cc4 adds r0, r4, 0 adds r1, r5, 0 @@ -585025,10 +585025,10 @@ sub_813010C: @ 813010C ldr r0, =0x02021fc4 ldr r1, =0x0827ea0c bl ExpandTextCodes - b _081301A6 + b @081301A6 .align 2, 0 .pool -_08130190: +@08130190: ldr r0, =0x02021cc4 adds r1, 0xB bl gf_strcpy @@ -585038,7 +585038,7 @@ _08130190: adds r1, r2 ldr r1, [r1] bl ExpandTextCodes -_081301A6: +@081301A6: ldr r4, =0x02021fc4 movs r0, 0x1 adds r1, r4, 0 @@ -585059,7 +585059,7 @@ _081301A6: bl Print movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram -_081301D4: +@081301D4: add sp, 0xC pop {r4-r6} pop {r0} @@ -585069,7 +585069,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 @@ -585101,22 +585101,22 @@ 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 cmp r1, 0 - bne _0813025C + bne @0813025C ldr r0, =0x030011f6 strb r1, [r0] ldr r0, =0x030011f2 strh r1, [r0] ldr r0, =0x030011f4 strh r1, [r0] - b _0813026E + b @0813026E .align 2, 0 .pool -_0813025C: +@0813025C: ldr r1, =0x030011f6 movs r0, 0x1 strb r0, [r1] @@ -585126,7 +585126,7 @@ _0813025C: ldr r1, =0x030011f4 movs r0, 0x1E strh r0, [r1] -_0813026E: +@0813026E: pop {r0} bx r0 .align 2, 0 @@ -585134,19 +585134,19 @@ _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] cmp r0, 0 - bne _08130298 + bne @08130298 movs r0, 0x4C movs r1, 0 bl lcd_io_set - b _081302C0 + b @081302C0 .align 2, 0 .pool -_08130298: +@08130298: ldr r1, =0x00000a45 movs r0, 0xA bl lcd_io_set @@ -585165,7 +585165,7 @@ _08130298: lsrs r1, 16 movs r0, 0x4C bl lcd_io_set -_081302C0: +@081302C0: pop {r0} bx r0 .align 2, 0 @@ -585173,7 +585173,7 @@ _081302C0: thumb_func_end sub_8130280 thumb_func_start sub_81302D0 -sub_81302D0: @ 81302D0 +sub_81302D0: ; 81302D0 push {lr} bl sub_8130280 bl copy_super_sprites_to_oam @@ -585184,7 +585184,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 @@ -585201,7 +585201,7 @@ sub_81302E8: @ 81302E8 ldr r1, [r7] bl call_LZZUnCompVram cmp r4, 0 - bne _08130348 + bne @08130348 lsls r0, r5, 3 ldr r1, =0x0830a18c adds r0, r1 @@ -585218,10 +585218,10 @@ sub_81302E8: @ 81302E8 ldr r2, =0x03006190 ldr r2, [r2] bl sub_8130380 - b _0813036C + b @0813036C .align 2, 0 .pool -_08130348: +@08130348: lsls r0, r5, 3 ldr r1, =0x083028b8 adds r0, r1 @@ -585238,7 +585238,7 @@ _08130348: ldr r2, =0x03006190 ldr r2, [r2] bl sub_8130380 -_0813036C: +@0813036C: pop {r4-r7} pop {r0} bx r0 @@ -585247,7 +585247,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 @@ -585258,13 +585258,13 @@ sub_8130380: @ 8130380 mov r9, r1 str r2, [sp] movs r0, 0 -_08130394: +@08130394: movs r3, 0 adds r1, r0, 0x1 str r1, [sp, 0x4] lsls r0, 3 str r0, [sp, 0x8] -_0813039E: +@0813039E: movs r1, 0 adds r2, r3, 0x1 mov r8, r2 @@ -585273,7 +585273,7 @@ _0813039E: lsls r0, 5 mov r12, r0 lsls r4, r3, 3 -_081303AE: +@081303AE: movs r3, 0 lsls r0, r1, 2 adds r6, r1, 0x1 @@ -585284,7 +585284,7 @@ _081303AE: lsls r0, 7 ldr r1, [sp] adds r2, r0, r1 -_081303C2: +@081303C2: lsrs r0, r3, 1 adds r0, r5, r0 add r0, r10 @@ -585292,50 +585292,50 @@ _081303C2: movs r0, 0x1 ands r0, r3 cmp r0, 0 - beq _081303D6 + beq @081303D6 lsrs r1, 4 - b _081303DA -_081303D6: + b @081303DA +@081303D6: movs r0, 0xF ands r1, r0 -_081303DA: +@081303DA: cmp r1, 0 - bne _081303EC + bne @081303EC adds r0, r4, r3 lsls r0, 1 adds r0, r2 movs r7, 0x80 lsls r7, 8 adds r1, r7, 0 - b _081303F8 -_081303EC: + b @081303F8 +@081303EC: adds r0, r4, r3 lsls r0, 1 adds r0, r2 lsls r1, 1 add r1, r9 ldrh r1, [r1] -_081303F8: +@081303F8: strh r1, [r0] adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x7 - bls _081303C2 + bls @081303C2 lsls r0, r6, 16 lsrs r1, r0, 16 cmp r1, 0x7 - bls _081303AE + bls @081303AE mov r1, r8 lsls r0, r1, 16 lsrs r3, r0, 16 cmp r3, 0x7 - bls _0813039E + bls @0813039E ldr r2, [sp, 0x4] lsls r0, r2, 16 lsrs r0, 16 cmp r0, 0x7 - bls _08130394 + bls @08130394 add sp, 0xC pop {r3-r5} mov r8, r3 @@ -585347,7 +585347,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 @@ -585360,9 +585360,9 @@ sub_8130430: @ 8130430 movs r1, 0 bl gpu_pal_apply cmp r4, 0x1 - beq _0813044E - b _081305A4 -_0813044E: + beq @0813044E + b @081305A4 +@0813044E: ldr r0, =0x030061c0 ldr r0, [r0] ldrb r0, [r0, 0xA] @@ -585371,62 +585371,62 @@ _0813044E: lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bhi _0813050C + bhi @0813050C lsls r0, 2 - ldr r1, =_08130478 + ldr r1, =@08130478 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08130478: - .4byte _0813048C - .4byte _081304A4 - .4byte _081304BC - .4byte _081304D4 - .4byte _081304F8 -_0813048C: +@08130478: + .4byte @0813048C + .4byte @081304A4 + .4byte @081304BC + .4byte @081304D4 + .4byte @081304F8 +@0813048C: ldr r0, =0x085a9a9c movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram ldr r0, =0x085ae974 - b _081304E0 + b @081304E0 .align 2, 0 .pool -_081304A4: +@081304A4: ldr r0, =0x085aab20 movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram ldr r0, =0x085aee80 - b _081304E0 + b @081304E0 .align 2, 0 .pool -_081304BC: +@081304BC: ldr r0, =0x085ab750 movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram ldr r0, =0x085af38c - b _081304E0 + b @081304E0 .align 2, 0 .pool -_081304D4: +@081304D4: ldr r0, =0x085ac288 movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram ldr r0, =0x085af898 -_081304E0: +@081304E0: ldr r1, =0x03006190 ldr r1, [r1] bl RLUnCompWram - b _0813050C + b @0813050C .align 2, 0 .pool -_081304F8: +@081304F8: ldr r0, =0x085ad240 movs r1, 0xC0 lsls r1, 19 @@ -585435,15 +585435,15 @@ _081304F8: ldr r1, =0x03006190 ldr r1, [r1] bl RLUnCompWram -_0813050C: +@0813050C: movs r1, 0 ldr r5, =0x06006000 ldr r0, =0x00001015 adds r4, r0, 0 -_08130514: +@08130514: movs r3, 0 lsls r2, r1, 5 -_08130518: +@08130518: adds r0, r2, r3 lsls r0, 1 adds r0, r5 @@ -585452,22 +585452,22 @@ _08130518: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x1F - bls _08130518 + bls @08130518 adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x13 - bls _08130514 + bls @08130514 movs r1, 0 ldr r0, =0x0600608c mov r12, r0 ldr r7, =0x03006190 -_0813053C: +@0813053C: movs r3, 0 adds r6, r1, 0x1 lsls r5, r1, 5 lsls r4, r1, 6 -_08130544: +@08130544: adds r2, r5, r3 lsls r2, 1 add r2, r12 @@ -585482,15 +585482,15 @@ _08130544: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x11 - bls _08130544 + bls @08130544 lsls r0, r6, 24 lsrs r1, r0, 24 cmp r1, 0x9 - bls _0813053C + bls @0813053C movs r3, 0 ldr r4, =0x0600608e ldr r2, =0x03006190 -_08130570: +@08130570: lsls r1, r3, 1 adds r1, r4 ldr r0, [r2] @@ -585501,22 +585501,22 @@ _08130570: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0xF - bls _08130570 - b _08130676 + bls @08130570 + b @08130676 .align 2, 0 .pool -_081305A4: +@081305A4: cmp r5, 0x7 - bhi _081305C0 + bhi @081305C0 ldr r0, =0x085ae370 movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram ldr r0, =0x085b02b0 - b _08130650 + b @08130650 .align 2, 0 .pool -_081305C0: +@081305C0: ldr r0, =0x030061c0 ldr r0, [r0] ldrb r0, [r0, 0xA] @@ -585525,61 +585525,61 @@ _081305C0: lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bhi _08130676 + bhi @08130676 lsls r0, 2 - ldr r1, =_081305E8 + ldr r1, =@081305E8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081305E8: - .4byte _081305FC - .4byte _08130614 - .4byte _0813062C - .4byte _08130644 - .4byte _08130664 -_081305FC: +@081305E8: + .4byte @081305FC + .4byte @08130614 + .4byte @0813062C + .4byte @08130644 + .4byte @08130664 +@081305FC: ldr r0, =0x085a9a9c movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram ldr r0, =0x085ae974 - b _08130650 + b @08130650 .align 2, 0 .pool -_08130614: +@08130614: ldr r0, =0x085aab20 movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram ldr r0, =0x085aee80 - b _08130650 + b @08130650 .align 2, 0 .pool -_0813062C: +@0813062C: ldr r0, =0x085ab750 movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram ldr r0, =0x085af38c - b _08130650 + b @08130650 .align 2, 0 .pool -_08130644: +@08130644: ldr r0, =0x085ac288 movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram ldr r0, =0x085af898 -_08130650: +@08130650: ldr r1, =0x06006000 bl RLUnCompVram - b _08130676 + b @08130676 .align 2, 0 .pool -_08130664: +@08130664: ldr r0, =0x085ad240 movs r1, 0xC0 lsls r1, 19 @@ -585587,7 +585587,7 @@ _08130664: ldr r0, =0x085afda4 ldr r1, =0x06006000 bl RLUnCompVram -_08130676: +@08130676: pop {r4-r7} pop {r0} bx r0 @@ -585596,7 +585596,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 @@ -585627,19 +585627,19 @@ 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 cmp r0, 0x7 - bhi _081306E4 + bhi @081306E4 ldr r0, =0x030061c0 ldr r0, [r0] ldrb r0, [r0, 0xA] - b _081306F4 + b @081306F4 .align 2, 0 .pool -_081306E4: +@081306E4: ldr r0, =0x030061c0 ldr r0, [r0] ldrb r0, [r0, 0xA] @@ -585647,44 +585647,44 @@ _081306E4: bl __udivsi3 lsls r0, 24 lsrs r0, 24 -_081306F4: +@081306F4: cmp r0, 0x4 - bhi _08130732 + bhi @08130732 lsls r0, 2 - ldr r1, =_0813070C + ldr r1, =@0813070C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0813070C: - .4byte _08130720 - .4byte _08130724 - .4byte _08130728 - .4byte _0813072C - .4byte _08130730 -_08130720: +@0813070C: + .4byte @08130720 + .4byte @08130724 + .4byte @08130728 + .4byte @0813072C + .4byte @08130730 +@08130720: movs r0, 0x9 - b _08130732 -_08130724: + b @08130732 +@08130724: movs r0, 0xD - b _08130732 -_08130728: + b @08130732 +@08130728: movs r0, 0x2 - b _08130732 -_0813072C: + b @08130732 +@0813072C: movs r0, 0x24 - b _08130732 -_08130730: + b @08130732 +@08130730: movs r0, 0x6 -_08130732: +@08130732: pop {r1} bx r1 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 @@ -585704,7 +585704,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 @@ -585731,57 +585731,57 @@ sub_8130760: @ 8130760 subs r0, r3, 0x2 adds r4, r1, 0 cmp r0, 0x22 - bhi _08130844 + bhi @08130844 lsls r0, 2 - ldr r1, =_081307B4 + ldr r1, =@081307B4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081307B4: - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130840 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130840 -_08130840: +@081307B4: + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130840 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130844 + .4byte @08130840 +@08130840: movs r0, 0x3 - b _08130846 -_08130844: + b @08130846 +@08130844: movs r0, 0x1 -_08130846: +@08130846: strh r0, [r4, 0x14] movs r0, 0x2 strh r0, [r4, 0x16] @@ -585809,7 +585809,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 @@ -585841,7 +585841,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 @@ -585852,21 +585852,21 @@ sub_81308C8: @ 81308C8 mov r12, r1 ldr r2, =0x02022fec movs r1, 0 -_081308DC: +@081308DC: adds r0, r3, r4 strb r1, [r0] adds r4, 0x1 cmp r4, 0x53 - bls _081308DC + bls @081308DC ldr r0, [r2] ldr r1, =0x0a7f098a ands r0, r1 cmp r0, 0x8 - bne _0813092E + bne @0813092E movs r4, 0 ldr r6, =0x02038bca ldr r5, =0x08310040 -_081308F6: +@081308F6: lsls r2, r4, 1 ldrh r1, [r6] lsls r0, r1, 2 @@ -585876,7 +585876,7 @@ _081308F6: adds r2, r5 ldrh r3, [r2] cmp r3, 0 - beq _08130928 + beq @08130928 mov r0, r12 ldr r2, [r0] ldr r1, [r2, 0x18] @@ -585892,11 +585892,11 @@ _081308F6: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_08130928: +@08130928: adds r4, 0x1 cmp r4, 0x3 - ble _081308F6 -_0813092E: + ble @081308F6 +@0813092E: adds r0, r7, 0 bl sub_8130950 pop {r4-r7} @@ -585907,7 +585907,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 @@ -585917,39 +585917,39 @@ sub_8130950: @ 8130950 movs r4, 0 ldr r6, =0x02024064 movs r3, 0 -_08130962: +@08130962: adds r0, r1, r4 strb r3, [r0] adds r4, 0x1 cmp r4, 0x1B - bls _08130962 + bls @08130962 movs r4, 0 ldr r3, =0x020244a8 movs r5, 0x1 -_08130972: +@08130972: adds r1, r2, 0 ands r1, r5 cmp r1, 0 - beq _08130990 + beq @08130990 ldr r0, [r3] ldr r0, [r0, 0x14] adds r0, 0x4 adds r0, r4 movs r1, 0x64 - b _08130998 + b @08130998 .align 2, 0 .pool -_08130990: +@08130990: ldr r0, [r3] ldr r0, [r0, 0x14] adds r0, 0x4 adds r0, r4 -_08130998: +@08130998: strb r1, [r0] lsrs r2, 1 adds r4, 0x1 cmp r4, 0x3 - ble _08130972 + ble @08130972 ldrb r0, [r6] movs r1, 0 movs r2, 0xFF @@ -585958,21 +585958,21 @@ _08130998: lsrs r6, r0, 24 movs r4, 0 ldr r5, =0x020244a8 -_081309B4: +@081309B4: ldr r7, =0x0832a328 lsls r0, r4, 2 adds r0, r7 ldr r0, [r0] ands r0, r6 cmp r0, 0 - beq _081309CE + beq @081309CE ldr r0, [r5] ldr r0, [r0, 0x14] adds r0, 0x4 adds r0, r4 movs r1, 0 strb r1, [r0] -_081309CE: +@081309CE: bl GenerateRandomNumber ldr r1, [r5] ldr r2, [r1, 0x14] @@ -585987,7 +585987,7 @@ _081309CE: strb r1, [r2] adds r4, 0x1 cmp r4, 0x3 - ble _081309B4 + ble @081309B4 ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x1C] @@ -586003,7 +586003,7 @@ _081309CE: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08130A60 + beq @08130A60 ldr r5, =0x0202420c bl GenerateRandomNumber adds r4, r0, 0 @@ -586024,106 +586024,106 @@ _081309CE: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _08130A68 + beq @08130A68 eors r2, r3 strb r2, [r5] - b _08130A68 + b @08130A68 .align 2, 0 .pool -_08130A60: +@08130A60: ldr r0, =0x0202420c movs r1, 0x1 eors r1, r2 strb r1, [r0] -_08130A68: +@08130A68: ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 lsls r0, 17 ands r0, r1 cmp r0, 0 - beq _08130A84 + beq @08130A84 bl sub_8186438 - b _08130AE6 + b @08130AE6 .align 2, 0 .pool -_08130A84: +@08130A84: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08130AA0 + beq @08130AA0 ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] movs r0, 0x80 lsls r0, 23 str r0, [r1, 0xC] - b _08130B72 + b @08130B72 .align 2, 0 .pool -_08130AA0: +@08130AA0: movs r0, 0x80 lsls r0, 3 ands r0, r1 cmp r0, 0 - beq _08130ABC + beq @08130ABC ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] movs r0, 0x80 lsls r0, 22 str r0, [r1, 0xC] - b _08130B72 + b @08130B72 .align 2, 0 .pool -_08130ABC: +@08130ABC: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08130AD8 + beq @08130AD8 ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] movs r0, 0x80 lsls r0, 24 str r0, [r1, 0xC] - b _08130B72 + b @08130B72 .align 2, 0 .pool -_08130AD8: +@08130AD8: movs r0, 0x80 lsls r0, 12 ands r0, r1 cmp r0, 0 - beq _08130AF4 + beq @08130AF4 bl sub_81A6FB4 -_08130AE6: +@08130AE6: ldr r1, =0x020244a8 ldr r1, [r1] ldr r1, [r1, 0x14] str r0, [r1, 0xC] - b _08130B72 + b @08130B72 .align 2, 0 .pool -_08130AF4: +@08130AF4: ldr r0, =0x0c3f0900 ands r0, r1 cmp r0, 0 - beq _08130B10 + beq @08130B10 ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] movs r0, 0x7 str r0, [r1, 0xC] - b _08130B72 + b @08130B72 .align 2, 0 .pool -_08130B10: +@08130B10: movs r0, 0x80 lsls r0, 8 ands r1, r0 cmp r1, 0 - beq _08130B58 + beq @08130B58 ldr r0, =0x020244a8 ldr r0, [r0] ldr r4, [r0, 0x14] @@ -586145,10 +586145,10 @@ _08130B10: ldr r0, [r0] orrs r1, r0 str r1, [r4, 0xC] - b _08130B72 + b @08130B72 .align 2, 0 .pool -_08130B58: +@08130B58: ldr r0, =0x020244a8 ldr r0, [r0] ldr r3, [r0, 0x14] @@ -586162,13 +586162,13 @@ _08130B58: adds r0, r2 ldr r0, [r0] str r0, [r3, 0xC] -_08130B72: +@08130B72: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08130B8C + beq @08130B8C ldr r0, =0x020244a8 ldr r0, [r0] ldr r2, [r0, 0x14] @@ -586176,7 +586176,7 @@ _08130B72: movs r1, 0x80 orrs r0, r1 str r0, [r2, 0xC] -_08130B8C: +@08130B8C: pop {r4-r7} pop {r0} bx r0 @@ -586185,7 +586185,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] @@ -586194,14 +586194,14 @@ sub_8130BA4: @ 8130BA4 movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _08130BC4 + bne @08130BC4 bl sub_8130BDC - b _08130BC8 + b @08130BC8 .align 2, 0 .pool -_08130BC4: +@08130BC4: bl sub_8130CF4 -_08130BC8: +@08130BC8: lsls r0, 24 lsrs r1, r0, 24 ldr r0, =0x020241ea @@ -586215,7 +586215,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} @@ -586226,20 +586226,20 @@ sub_8130BDC: @ 8130BDC ldr r0, [r0, 0x14] ldr r0, [r0, 0xC] cmp r0, 0 - beq _08130C2C + beq @08130C2C adds r4, r1, 0 movs r5, 0 -_08130BF8: +@08130BF8: ldr r0, [r4] ldr r2, [r0, 0x14] ldr r0, [r2, 0xC] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08130C0C + beq @08130C0C strb r5, [r2] bl tai_run_script -_08130C0C: +@08130C0C: ldr r0, [r4] ldr r1, [r0, 0x14] ldr r0, [r1, 0xC] @@ -586255,8 +586255,8 @@ _08130C0C: ldr r0, [r0, 0x14] ldr r0, [r0, 0xC] cmp r0, 0 - bne _08130BF8 -_08130C2C: + bne @08130BF8 +@08130C2C: ldr r1, =0x020244a8 ldr r0, [r1] ldr r3, [r0, 0x14] @@ -586265,21 +586265,21 @@ _08130C2C: ands r0, r2 mov r12, r1 cmp r0, 0 - beq _08130C48 + beq @08130C48 movs r0, 0x4 - b _08130CE0 + b @08130CE0 .align 2, 0 .pool -_08130C48: +@08130C48: movs r0, 0x4 ands r0, r2 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - beq _08130C58 + beq @08130C58 movs r0, 0x5 - b _08130CE0 -_08130C58: + b @08130CE0 +@08130C58: movs r6, 0x1 mov r1, sp ldrb r0, [r3, 0x4] @@ -586298,10 +586298,10 @@ _08130C58: adds r1, r0 adds r4, r1, 0 adds r4, 0xE -_08130C7C: +@08130C7C: ldrh r0, [r4] cmp r0, 0 - beq _08130CC6 + beq @08130CC6 ldrb r1, [r5] mov r2, r12 ldr r0, [r2] @@ -586311,7 +586311,7 @@ _08130C7C: movs r0, 0 ldrsb r0, [r2, r0] cmp r1, r0 - bne _08130CAA + bne @08130CAA mov r0, sp adds r1, r0, r6 ldrb r0, [r2] @@ -586322,7 +586322,7 @@ _08130C7C: lsrs r6, r0, 24 adds r1, r7, r1 strb r3, [r1] -_08130CAA: +@08130CAA: ldrb r1, [r5] mov r2, r12 ldr r0, [r2] @@ -586332,16 +586332,16 @@ _08130CAA: movs r0, 0 ldrsb r0, [r2, r0] cmp r1, r0 - bge _08130CC6 + bge @08130CC6 movs r6, 0x1 ldrb r0, [r2] strb r0, [r5] strb r3, [r7] -_08130CC6: +@08130CC6: adds r4, 0x2 adds r3, 0x1 cmp r3, 0x3 - ble _08130C7C + ble @08130C7C bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -586349,7 +586349,7 @@ _08130CC6: bl __modsi3 add r0, r8 ldrb r0, [r0] -_08130CE0: +@08130CE0: add sp, 0x8 pop {r3} mov r8, r3 @@ -586361,7 +586361,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 @@ -586378,11 +586378,11 @@ sub_8130CF4: @ 8130CF4 str r2, [sp, 0x18] str r1, [sp, 0x20] mov r10, sp -_08130D14: +@08130D14: ldr r0, =0x0203ab3c ldrb r0, [r0] cmp r8, r0 - beq _08130D2E + beq @08130D2E movs r0, 0x58 mov r7, r8 muls r7, r0 @@ -586391,38 +586391,38 @@ _08130D14: adds r0, r1 ldrh r0, [r0, 0x28] cmp r0, 0 - bne _08130D48 -_08130D2E: + bne @08130D48 +@08130D2E: movs r0, 0xFF ldr r2, [sp, 0x20] strb r0, [r2] ldr r0, =0x0000ffff mov r7, r10 strh r0, [r7] - b _08130EAE + b @08130EAE .align 2, 0 .pool -_08130D48: +@08130D48: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 10 ands r0, r1 cmp r0, 0 - beq _08130D70 + beq @08130D70 ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x92 ldrb r0, [r0] lsrs r0, 4 bl sub_8130950 - b _08130D76 + b @08130D76 .align 2, 0 .pool -_08130D70: +@08130D70: movs r0, 0xF bl sub_8130950 -_08130D76: +@08130D76: ldr r0, =0x0202420c mov r1, r8 strb r1, [r0] @@ -586433,9 +586433,9 @@ _08130D76: ldrb r0, [r0] ands r1, r0 cmp r2, r1 - beq _08130D90 + beq @08130D90 bl sub_8131074 -_08130D90: +@08130D90: ldr r2, =0x020244a8 ldr r0, [r2] ldr r0, [r0, 0x14] @@ -586449,19 +586449,19 @@ _08130D90: ldr r4, [r0, 0xC] mov r9, r2 cmp r4, 0 - beq _08130DD8 + beq @08130DD8 mov r5, r9 movs r6, 0 -_08130DB0: +@08130DB0: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _08130DC2 + beq @08130DC2 ldr r0, [r5] ldr r0, [r0, 0x14] strb r6, [r0] bl tai_run_script -_08130DC2: +@08130DC2: asrs r4, 1 ldr r0, [r5] ldr r1, [r0, 0x14] @@ -586472,8 +586472,8 @@ _08130DC2: ldr r0, [r0, 0x14] strb r6, [r0, 0x1] cmp r4, 0 - bne _08130DB0 -_08130DD8: + bne @08130DB0 +@08130DD8: mov r2, r9 ldr r0, [r2] ldr r3, [r0, 0x14] @@ -586481,25 +586481,25 @@ _08130DD8: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08130DFC + beq @08130DFC movs r0, 0x4 ldr r7, [sp, 0x20] strb r0, [r7] - b _08130EAE + b @08130EAE .align 2, 0 .pool -_08130DFC: +@08130DFC: movs r0, 0x4 ands r0, r1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - beq _08130E10 + beq @08130E10 movs r0, 0x5 ldr r1, [sp, 0x20] strb r0, [r1] - b _08130EAE -_08130E10: + b @08130EAE +@08130E10: add r1, sp, 0x10 ldrb r0, [r3, 0x4] strb r0, [r1] @@ -586516,10 +586516,10 @@ _08130E10: adds r0, r2 adds r4, r0, 0x2 add r7, sp, 0x14 -_08130E30: +@08130E30: ldrh r0, [r4] cmp r0, 0 - beq _08130E72 + beq @08130E72 ldrb r1, [r6] mov r2, r9 ldr r0, [r2] @@ -586529,14 +586529,14 @@ _08130E30: movs r0, 0 ldrsb r0, [r2, r0] cmp r1, r0 - bne _08130E56 + bne @08130E56 adds r0, r6, r5 ldrb r1, [r2] strb r1, [r0] adds r0, r7, r5 strb r3, [r0] adds r5, 0x1 -_08130E56: +@08130E56: ldrb r1, [r6] mov r2, r9 ldr r0, [r2] @@ -586546,16 +586546,16 @@ _08130E56: movs r0, 0 ldrsb r0, [r2, r0] cmp r1, r0 - bge _08130E72 + bge @08130E72 ldrb r0, [r2] strb r0, [r6] strb r3, [r7] movs r5, 0x1 -_08130E72: +@08130E72: adds r4, 0x2 adds r3, 0x1 cmp r3, 0x3 - ble _08130E30 + ble @08130E30 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -586574,13 +586574,13 @@ _08130E72: movs r0, 0x2 eors r0, r1 cmp r8, r0 - bne _08130EAE + bne @08130EAE cmp r2, 0x63 - bgt _08130EAE + bgt @08130EAE ldr r0, =0x0000ffff mov r1, r10 strh r0, [r1] -_08130EAE: +@08130EAE: ldr r2, [sp, 0x20] adds r2, 0x1 str r2, [sp, 0x20] @@ -586590,9 +586590,9 @@ _08130EAE: add r8, r0 mov r1, r8 cmp r1, 0x3 - bgt _08130EC4 - b _08130D14 -_08130EC4: + bgt @08130EC4 + b @08130D14 +@08130EC4: mov r0, sp ldrh r5, [r0] movs r0, 0 @@ -586604,33 +586604,33 @@ _08130EC4: ldr r3, [sp, 0x18] mov r1, sp adds r1, 0x2 -_08130EDA: +@08130EDA: lsls r0, r5, 16 asrs r2, r0, 16 movs r7, 0 ldrsh r0, [r1, r7] cmp r2, r0 - bne _08130EEE + bne @08130EEE adds r0, r3, r4 mov r7, r8 strb r7, [r0] adds r4, 0x1 -_08130EEE: +@08130EEE: movs r7, 0 ldrsh r0, [r1, r7] cmp r2, r0 - bge _08130EFE + bge @08130EFE ldrh r5, [r1] mov r0, r8 strb r0, [r3] movs r4, 0x1 -_08130EFE: +@08130EFE: adds r1, 0x2 movs r2, 0x1 add r8, r2 mov r7, r8 cmp r7, 0x3 - ble _08130EDA + ble @08130EDA bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -586657,7 +586657,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 @@ -586668,23 +586668,23 @@ tai_run_script: @ 8130F48 ldrb r0, [r0] adds r6, r7, 0 cmp r0, 0x2 - bne _08130F60 - b _08131066 -_08130F60: + bne @08130F60 + b @08131066 +@08130F60: mov r9, r7 ldr r0, =0x0203ab38 mov r8, r0 -_08130F66: +@08130F66: mov r1, r9 ldr r0, [r1] ldr r2, [r0, 0x14] ldrb r0, [r2] cmp r0, 0x1 - beq _08130FD4 + beq @08130FD4 cmp r0, 0x1 - bgt _0813105A + bgt @0813105A cmp r0, 0 - bne _0813105A + bne @0813105A ldr r1, =0x082dbef8 ldrb r0, [r2, 0x11] lsls r0, 2 @@ -586705,27 +586705,27 @@ _08130F66: adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _08130FB0 + beq @08130FB0 lsls r0, r4, 1 adds r0, r3 adds r1, r5, 0 adds r1, 0xC adds r0, r1 ldrh r0, [r0] -_08130FB0: +@08130FB0: strh r0, [r2, 0x2] ldr r0, [r6] ldr r1, [r0, 0x14] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0813105A + b @0813105A .align 2, 0 .pool -_08130FD4: +@08130FD4: ldrh r1, [r2, 0x2] cmp r1, 0 - beq _08130FF4 + beq @08130FF4 ldr r1, =0x085b083c mov r2, r8 ldr r0, [r2] @@ -586734,10 +586734,10 @@ _08130FD4: adds r0, r1 ldr r0, [r0] bl _call_via_r0 - b _0813100A + b @0813100A .align 2, 0 .pool -_08130FF4: +@08130FF4: adds r0, r2, 0x4 ldrb r2, [r2, 0x1] adds r0, r2 @@ -586749,7 +586749,7 @@ _08130FF4: movs r0, 0x1 orrs r0, r1 strb r0, [r2, 0x10] -_0813100A: +@0813100A: ldr r2, =0x020244a8 ldr r0, [r2] ldr r3, [r0, 0x14] @@ -586758,7 +586758,7 @@ _0813100A: ands r0, r1 adds r6, r2, 0 cmp r0, 0 - beq _0813105A + beq @0813105A ldrb r0, [r3, 0x1] adds r0, 0x1 strb r0, [r3, 0x1] @@ -586766,39 +586766,39 @@ _0813100A: ldr r2, [r0, 0x14] ldrb r0, [r2, 0x1] cmp r0, 0x3 - bhi _08131044 + bhi @08131044 ldrb r1, [r2, 0x10] movs r0, 0x8 ands r0, r1 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _08131044 + bne @08131044 strb r0, [r2] - b _0813104E + b @0813104E .align 2, 0 .pool -_08131044: +@08131044: ldr r0, [r6] ldr r1, [r0, 0x14] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_0813104E: +@0813104E: ldr r0, [r6] ldr r2, [r0, 0x14] ldrb r1, [r2, 0x10] movs r0, 0xFE ands r0, r1 strb r0, [r2, 0x10] -_0813105A: +@0813105A: ldr r0, [r7] ldr r0, [r0, 0x14] ldrb r0, [r0] cmp r0, 0x2 - beq _08131066 - b _08130F66 -_08131066: + beq @08131066 + b @08130F66 +@08131066: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -586808,7 +586808,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} @@ -586828,10 +586828,10 @@ sub_8131074: @ 8131074 mov r12, r3 ldrh r1, [r1] cmp r0, r1 - beq _081310E4 + beq @081310E4 adds r6, r5, 0 movs r5, 0 -_081310A0: +@081310A0: mov r1, r8 ldr r0, [r1] ldr r4, [r0, 0x18] @@ -586842,19 +586842,19 @@ _081310A0: adds r2, r4, r0 ldrh r0, [r2] cmp r0, 0 - bne _081310CC + bne @081310CC lsls r0, r1, 1 adds r0, r6 ldrh r0, [r0] strh r0, [r2] - b _081310E4 + b @081310E4 .align 2, 0 .pool -_081310CC: +@081310CC: adds r5, 0x2 adds r7, 0x1 cmp r7, 0x3 - bgt _081310E4 + bgt @081310E4 adds r0, r5, r3 adds r0, r4, r0 lsls r1, 1 @@ -586862,8 +586862,8 @@ _081310CC: ldrh r0, [r0] ldrh r1, [r1] cmp r0, r1 - bne _081310A0 -_081310E4: + bne @081310A0 +@081310E4: pop {r3} mov r8, r3 pop {r4-r7} @@ -586872,14 +586872,14 @@ _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 movs r3, 0 lsrs r1, r0, 20 movs r2, 0x3 -_081310FC: +@081310FC: ldr r0, [r4] ldr r0, [r0, 0x18] adds r0, r1 @@ -586887,7 +586887,7 @@ _081310FC: adds r1, 0x2 subs r2, 0x1 cmp r2, 0 - bge _081310FC + bge @081310FC pop {r4} pop {r0} bx r0 @@ -586896,7 +586896,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 @@ -586911,7 +586911,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 @@ -586927,7 +586927,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 @@ -586942,7 +586942,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 @@ -586958,7 +586958,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 @@ -586970,7 +586970,7 @@ tai00_unk: @ 8131178 lsrs r1, 16 ldrb r0, [r2, 0x1] cmp r1, r0 - bcs _081311B0 + bcs @081311B0 ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] lsls r0, 8 @@ -586982,19 +586982,19 @@ tai00_unk: @ 8131178 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081311B4 + b @081311B4 .align 2, 0 .pool -_081311B0: +@081311B0: adds r0, r2, 0x6 str r0, [r3] -_081311B4: +@081311B4: pop {r0} bx r0 thumb_func_end tai00_unk thumb_func_start tai01_unk -tai01_unk: @ 81311B8 +tai01_unk: ; 81311B8 push {lr} bl GenerateRandomNumber lsls r0, 16 @@ -587006,7 +587006,7 @@ tai01_unk: @ 81311B8 lsrs r1, 16 ldrb r0, [r2, 0x1] cmp r1, r0 - bls _081311F0 + bls @081311F0 ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] lsls r0, 8 @@ -587018,19 +587018,19 @@ tai01_unk: @ 81311B8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081311F4 + b @081311F4 .align 2, 0 .pool -_081311F0: +@081311F0: adds r0, r2, 0x6 str r0, [r3] -_081311F4: +@081311F4: pop {r0} bx r0 thumb_func_end tai01_unk thumb_func_start tai02_unk -tai02_unk: @ 81311F8 +tai02_unk: ; 81311F8 push {lr} bl GenerateRandomNumber lsls r0, 16 @@ -587042,7 +587042,7 @@ tai02_unk: @ 81311F8 lsrs r1, 16 ldrb r0, [r2, 0x1] cmp r1, r0 - bne _08131230 + bne @08131230 ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] lsls r0, 8 @@ -587054,19 +587054,19 @@ tai02_unk: @ 81311F8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08131234 + b @08131234 .align 2, 0 .pool -_08131230: +@08131230: adds r0, r2, 0x6 str r0, [r3] -_08131234: +@08131234: pop {r0} bx r0 thumb_func_end tai02_unk thumb_func_start tai03_unk -tai03_unk: @ 8131238 +tai03_unk: ; 8131238 push {lr} bl GenerateRandomNumber lsls r0, 16 @@ -587078,7 +587078,7 @@ tai03_unk: @ 8131238 lsrs r1, 16 ldrb r0, [r2, 0x1] cmp r1, r0 - beq _08131270 + beq @08131270 ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] lsls r0, 8 @@ -587090,19 +587090,19 @@ tai03_unk: @ 8131238 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08131274 + b @08131274 .align 2, 0 .pool -_08131270: +@08131270: adds r0, r2, 0x6 str r0, [r3] -_08131274: +@08131274: pop {r0} bx r0 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] @@ -587124,10 +587124,10 @@ tai04_unk: @ 8131278 movs r0, 0 ldrsb r0, [r1, r0] cmp r0, 0 - bge _081312A8 + bge @081312A8 movs r0, 0 strb r0, [r1] -_081312A8: +@081312A8: ldr r0, [r3] adds r0, 0x2 str r0, [r3] @@ -587139,21 +587139,21 @@ _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] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 - bne _081312D8 + bne @081312D8 ldr r0, =0x0203ab3c - b _081312DA + b @081312DA .align 2, 0 .pool -_081312D8: +@081312D8: ldr r0, =0x0202420c -_081312DA: +@081312DA: ldrb r1, [r0] ldr r2, =0x02024084 movs r0, 0x58 @@ -587167,7 +587167,7 @@ _081312DA: ldr r2, [r4] ldrb r1, [r2, 0x2] cmp r0, r1 - bcs _08131318 + bcs @08131318 ldrb r1, [r2, 0x3] ldrb r0, [r2, 0x4] lsls r0, 8 @@ -587179,34 +587179,34 @@ _081312DA: lsls r0, 24 orrs r1, r0 str r1, [r4] - b _0813131C + b @0813131C .align 2, 0 .pool -_08131318: +@08131318: adds r0, r2, 0x7 str r0, [r4] -_0813131C: +@0813131C: pop {r4} pop {r0} bx r0 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] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 - bne _08131340 + bne @08131340 ldr r0, =0x0203ab3c - b _08131342 + b @08131342 .align 2, 0 .pool -_08131340: +@08131340: ldr r0, =0x0202420c -_08131342: +@08131342: ldrb r1, [r0] ldr r2, =0x02024084 movs r0, 0x58 @@ -587220,7 +587220,7 @@ _08131342: ldr r2, [r4] ldrb r1, [r2, 0x2] cmp r0, r1 - bls _08131380 + bls @08131380 ldrb r1, [r2, 0x3] ldrb r0, [r2, 0x4] lsls r0, 8 @@ -587232,34 +587232,34 @@ _08131342: lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08131384 + b @08131384 .align 2, 0 .pool -_08131380: +@08131380: adds r0, r2, 0x7 str r0, [r4] -_08131384: +@08131384: pop {r4} pop {r0} bx r0 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] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 - bne _081313A8 + bne @081313A8 ldr r0, =0x0203ab3c - b _081313AA + b @081313AA .align 2, 0 .pool -_081313A8: +@081313A8: ldr r0, =0x0202420c -_081313AA: +@081313AA: ldrb r1, [r0] ldr r2, =0x02024084 movs r0, 0x58 @@ -587273,7 +587273,7 @@ _081313AA: ldr r2, [r4] ldrb r1, [r2, 0x2] cmp r0, r1 - bne _081313E8 + bne @081313E8 ldrb r1, [r2, 0x3] ldrb r0, [r2, 0x4] lsls r0, 8 @@ -587285,34 +587285,34 @@ _081313AA: lsls r0, 24 orrs r1, r0 str r1, [r4] - b _081313EC + b @081313EC .align 2, 0 .pool -_081313E8: +@081313E8: adds r0, r2, 0x7 str r0, [r4] -_081313EC: +@081313EC: pop {r4} pop {r0} bx r0 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] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 - bne _08131410 + bne @08131410 ldr r0, =0x0203ab3c - b _08131412 + b @08131412 .align 2, 0 .pool -_08131410: +@08131410: ldr r0, =0x0202420c -_08131412: +@08131412: ldrb r1, [r0] ldr r2, =0x02024084 movs r0, 0x58 @@ -587326,7 +587326,7 @@ _08131412: ldr r2, [r4] ldrb r1, [r2, 0x2] cmp r0, r1 - beq _08131450 + beq @08131450 ldrb r1, [r2, 0x3] ldrb r0, [r2, 0x4] lsls r0, 8 @@ -587338,34 +587338,34 @@ _08131412: lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08131454 + b @08131454 .align 2, 0 .pool -_08131450: +@08131450: adds r0, r2, 0x7 str r0, [r4] -_08131454: +@08131454: pop {r4} pop {r0} bx r0 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] ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x1 - bne _08131478 + bne @08131478 ldr r0, =0x0203ab3c - b _0813147A + b @0813147A .align 2, 0 .pool -_08131478: +@08131478: ldr r0, =0x0202420c -_0813147A: +@0813147A: ldrb r4, [r0] ldr r3, [r5] ldrb r2, [r3, 0x2] @@ -587386,7 +587386,7 @@ _0813147A: ldr r0, [r0] ands r0, r2 cmp r0, 0 - beq _081314C4 + beq @081314C4 ldrb r1, [r3, 0x6] ldrb r0, [r3, 0x7] lsls r0, 8 @@ -587398,35 +587398,35 @@ _0813147A: lsls r0, 24 orrs r1, r0 str r1, [r5] - b _081314CA + b @081314CA .align 2, 0 .pool -_081314C4: +@081314C4: adds r0, r3, 0 adds r0, 0xA str r0, [r5] -_081314CA: +@081314CA: pop {r4,r5} pop {r0} bx r0 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] ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x1 - bne _081314EC + bne @081314EC ldr r0, =0x0203ab3c - b _081314EE + b @081314EE .align 2, 0 .pool -_081314EC: +@081314EC: ldr r0, =0x0202420c -_081314EE: +@081314EE: ldrb r4, [r0] ldr r3, [r5] ldrb r2, [r3, 0x2] @@ -587447,7 +587447,7 @@ _081314EE: ldr r0, [r0] ands r0, r2 cmp r0, 0 - bne _08131538 + bne @08131538 ldrb r1, [r3, 0x6] ldrb r0, [r3, 0x7] lsls r0, 8 @@ -587459,35 +587459,35 @@ _081314EE: lsls r0, 24 orrs r1, r0 str r1, [r5] - b _0813153E + b @0813153E .align 2, 0 .pool -_08131538: +@08131538: adds r0, r3, 0 adds r0, 0xA str r0, [r5] -_0813153E: +@0813153E: pop {r4,r5} pop {r0} bx r0 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] ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x1 - bne _08131560 + bne @08131560 ldr r0, =0x0203ab3c - b _08131562 + b @08131562 .align 2, 0 .pool -_08131560: +@08131560: ldr r0, =0x0202420c -_08131562: +@08131562: ldrb r4, [r0] ldr r3, [r5] ldrb r2, [r3, 0x2] @@ -587508,7 +587508,7 @@ _08131562: ldr r0, [r0] ands r0, r2 cmp r0, 0 - beq _081315AC + beq @081315AC ldrb r1, [r3, 0x6] ldrb r0, [r3, 0x7] lsls r0, 8 @@ -587520,35 +587520,35 @@ _08131562: lsls r0, 24 orrs r1, r0 str r1, [r5] - b _081315B2 + b @081315B2 .align 2, 0 .pool -_081315AC: +@081315AC: adds r0, r3, 0 adds r0, 0xA str r0, [r5] -_081315B2: +@081315B2: pop {r4,r5} pop {r0} bx r0 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] ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x1 - bne _081315D4 + bne @081315D4 ldr r0, =0x0203ab3c - b _081315D6 + b @081315D6 .align 2, 0 .pool -_081315D4: +@081315D4: ldr r0, =0x0202420c -_081315D6: +@081315D6: ldrb r4, [r0] ldr r3, [r5] ldrb r2, [r3, 0x2] @@ -587569,7 +587569,7 @@ _081315D6: ldr r0, [r0] ands r0, r2 cmp r0, 0 - bne _08131620 + bne @08131620 ldrb r1, [r3, 0x6] ldrb r0, [r3, 0x7] lsls r0, 8 @@ -587581,35 +587581,35 @@ _081315D6: lsls r0, 24 orrs r1, r0 str r1, [r5] - b _08131626 + b @08131626 .align 2, 0 .pool -_08131620: +@08131620: adds r0, r3, 0 adds r0, 0xA str r0, [r5] -_08131626: +@08131626: pop {r4,r5} pop {r0} bx r0 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] ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x1 - bne _08131648 + bne @08131648 ldr r0, =0x0203ab3c - b _0813164A + b @0813164A .align 2, 0 .pool -_08131648: +@08131648: ldr r0, =0x0202420c -_0813164A: +@0813164A: ldrb r4, [r0] ldr r3, [r5] ldrb r1, [r3, 0x2] @@ -587628,7 +587628,7 @@ _0813164A: ldr r0, [r0] ands r0, r1 cmp r0, 0 - beq _08131690 + beq @08131690 ldrb r1, [r3, 0x6] ldrb r0, [r3, 0x7] lsls r0, 8 @@ -587640,35 +587640,35 @@ _0813164A: lsls r0, 24 orrs r1, r0 str r1, [r5] - b _08131696 + b @08131696 .align 2, 0 .pool -_08131690: +@08131690: adds r0, r3, 0 adds r0, 0xA str r0, [r5] -_08131696: +@08131696: pop {r4,r5} pop {r0} bx r0 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] ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x1 - bne _081316B8 + bne @081316B8 ldr r0, =0x0203ab3c - b _081316BA + b @081316BA .align 2, 0 .pool -_081316B8: +@081316B8: ldr r0, =0x0202420c -_081316BA: +@081316BA: ldrb r4, [r0] ldr r3, [r5] ldrb r1, [r3, 0x2] @@ -587687,7 +587687,7 @@ _081316BA: ldr r0, [r0] ands r0, r1 cmp r0, 0 - bne _08131700 + bne @08131700 ldrb r1, [r3, 0x6] ldrb r0, [r3, 0x7] lsls r0, 8 @@ -587699,34 +587699,34 @@ _081316BA: lsls r0, 24 orrs r1, r0 str r1, [r5] - b _08131706 + b @08131706 .align 2, 0 .pool -_08131700: +@08131700: adds r0, r3, 0 adds r0, 0xA str r0, [r5] -_08131706: +@08131706: pop {r4,r5} pop {r0} bx r0 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] ldrb r0, [r0, 0x1] cmp r0, 0x1 - bne _08131724 + bne @08131724 ldr r0, =0x0203ab3c - b _08131726 + b @08131726 .align 2, 0 .pool -_08131724: +@08131724: ldr r0, =0x0202420c -_08131726: +@08131726: ldrb r0, [r0] bl battle_get_per_side_status movs r2, 0x1 @@ -587749,7 +587749,7 @@ _08131726: ldrh r0, [r2] ands r0, r1 cmp r0, 0 - beq _0813177C + beq @0813177C ldrb r1, [r3, 0x6] ldrb r0, [r3, 0x7] lsls r0, 8 @@ -587761,34 +587761,34 @@ _08131726: lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08131782 + b @08131782 .align 2, 0 .pool -_0813177C: +@0813177C: adds r0, r3, 0 adds r0, 0xA str r0, [r4] -_08131782: +@08131782: pop {r4} pop {r0} bx r0 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] ldrb r0, [r0, 0x1] cmp r0, 0x1 - bne _081317A0 + bne @081317A0 ldr r0, =0x0203ab3c - b _081317A2 + b @081317A2 .align 2, 0 .pool -_081317A0: +@081317A0: ldr r0, =0x0202420c -_081317A2: +@081317A2: ldrb r0, [r0] bl battle_get_per_side_status movs r2, 0x1 @@ -587811,7 +587811,7 @@ _081317A2: ldrh r0, [r2] ands r0, r1 cmp r0, 0 - bne _081317F8 + bne @081317F8 ldrb r1, [r3, 0x6] ldrb r0, [r3, 0x7] lsls r0, 8 @@ -587823,21 +587823,21 @@ _081317A2: lsls r0, 24 orrs r1, r0 str r1, [r4] - b _081317FE + b @081317FE .align 2, 0 .pool -_081317F8: +@081317F8: adds r0, r3, 0 adds r0, 0xA str r0, [r4] -_081317FE: +@081317FE: pop {r4} pop {r0} bx r0 thumb_func_end tai10_unk thumb_func_start tai11_unk -tai11_unk: @ 8131804 +tai11_unk: ; 8131804 push {lr} ldr r0, =0x020244a8 ldr r0, [r0] @@ -587847,7 +587847,7 @@ tai11_unk: @ 8131804 ldr r0, [r0, 0x8] ldrb r1, [r2, 0x1] cmp r0, r1 - bcs _08131838 + bcs @08131838 ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] lsls r0, 8 @@ -587859,19 +587859,19 @@ tai11_unk: @ 8131804 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _0813183C + b @0813183C .align 2, 0 .pool -_08131838: +@08131838: adds r0, r2, 0x6 str r0, [r3] -_0813183C: +@0813183C: pop {r0} bx r0 thumb_func_end tai11_unk thumb_func_start tai12_unk -tai12_unk: @ 8131840 +tai12_unk: ; 8131840 push {lr} ldr r0, =0x020244a8 ldr r0, [r0] @@ -587881,7 +587881,7 @@ tai12_unk: @ 8131840 ldr r0, [r0, 0x8] ldrb r1, [r2, 0x1] cmp r0, r1 - bls _08131874 + bls @08131874 ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] lsls r0, 8 @@ -587893,19 +587893,19 @@ tai12_unk: @ 8131840 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08131878 + b @08131878 .align 2, 0 .pool -_08131874: +@08131874: adds r0, r2, 0x6 str r0, [r3] -_08131878: +@08131878: pop {r0} bx r0 thumb_func_end tai12_unk thumb_func_start tai13_unk -tai13_unk: @ 813187C +tai13_unk: ; 813187C push {lr} ldr r0, =0x020244a8 ldr r0, [r0] @@ -587915,7 +587915,7 @@ tai13_unk: @ 813187C ldr r0, [r0, 0x8] ldrb r1, [r2, 0x1] cmp r0, r1 - bne _081318B0 + bne @081318B0 ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] lsls r0, 8 @@ -587927,19 +587927,19 @@ tai13_unk: @ 813187C lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081318B4 + b @081318B4 .align 2, 0 .pool -_081318B0: +@081318B0: adds r0, r2, 0x6 str r0, [r3] -_081318B4: +@081318B4: pop {r0} bx r0 thumb_func_end tai13_unk thumb_func_start tai14_unk -tai14_unk: @ 81318B8 +tai14_unk: ; 81318B8 push {lr} ldr r0, =0x020244a8 ldr r0, [r0] @@ -587949,7 +587949,7 @@ tai14_unk: @ 81318B8 ldr r0, [r0, 0x8] ldrb r1, [r2, 0x1] cmp r0, r1 - beq _081318EC + beq @081318EC ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] lsls r0, 8 @@ -587961,19 +587961,19 @@ tai14_unk: @ 81318B8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081318F0 + b @081318F0 .align 2, 0 .pool -_081318EC: +@081318EC: adds r0, r2, 0x6 str r0, [r3] -_081318F0: +@081318F0: pop {r0} bx r0 thumb_func_end tai14_unk thumb_func_start tai15_unk -tai15_unk: @ 81318F4 +tai15_unk: ; 81318F4 push {lr} ldr r3, =0x0203ab38 ldr r2, [r3] @@ -587993,7 +587993,7 @@ tai15_unk: @ 81318F4 ldr r0, [r0, 0x8] ldrb r1, [r1] cmp r0, r1 - bcs _0813193C + bcs @0813193C ldrb r1, [r2, 0x5] ldrb r0, [r2, 0x6] lsls r0, 8 @@ -588005,20 +588005,20 @@ tai15_unk: @ 81318F4 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08131942 + b @08131942 .align 2, 0 .pool -_0813193C: +@0813193C: adds r0, r2, 0 adds r0, 0x9 str r0, [r3] -_08131942: +@08131942: pop {r0} bx r0 thumb_func_end tai15_unk thumb_func_start tai16_unk -tai16_unk: @ 8131948 +tai16_unk: ; 8131948 push {lr} ldr r3, =0x0203ab38 ldr r2, [r3] @@ -588038,7 +588038,7 @@ tai16_unk: @ 8131948 ldr r0, [r0, 0x8] ldrb r1, [r1] cmp r0, r1 - bls _08131990 + bls @08131990 ldrb r1, [r2, 0x5] ldrb r0, [r2, 0x6] lsls r0, 8 @@ -588050,20 +588050,20 @@ tai16_unk: @ 8131948 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08131996 + b @08131996 .align 2, 0 .pool -_08131990: +@08131990: adds r0, r2, 0 adds r0, 0x9 str r0, [r3] -_08131996: +@08131996: pop {r0} bx r0 thumb_func_end tai16_unk thumb_func_start tai17_unk -tai17_unk: @ 813199C +tai17_unk: ; 813199C push {lr} ldr r3, =0x0203ab38 ldr r2, [r3] @@ -588083,7 +588083,7 @@ tai17_unk: @ 813199C ldr r0, [r0, 0x8] ldrb r1, [r1] cmp r0, r1 - bne _081319E4 + bne @081319E4 ldrb r1, [r2, 0x5] ldrb r0, [r2, 0x6] lsls r0, 8 @@ -588095,20 +588095,20 @@ tai17_unk: @ 813199C lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081319EA + b @081319EA .align 2, 0 .pool -_081319E4: +@081319E4: adds r0, r2, 0 adds r0, 0x9 str r0, [r3] -_081319EA: +@081319EA: pop {r0} bx r0 thumb_func_end tai17_unk thumb_func_start tai18_unk -tai18_unk: @ 81319F0 +tai18_unk: ; 81319F0 push {lr} ldr r3, =0x0203ab38 ldr r2, [r3] @@ -588128,7 +588128,7 @@ tai18_unk: @ 81319F0 ldr r0, [r0, 0x8] ldrb r1, [r1] cmp r0, r1 - beq _08131A38 + beq @08131A38 ldrb r1, [r2, 0x5] ldrb r0, [r2, 0x6] lsls r0, 8 @@ -588140,20 +588140,20 @@ tai18_unk: @ 81319F0 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08131A3E + b @08131A3E .align 2, 0 .pool -_08131A38: +@08131A38: adds r0, r2, 0 adds r0, 0x9 str r0, [r3] -_08131A3E: +@08131A3E: pop {r0} bx r0 thumb_func_end tai18_unk thumb_func_start tai19_unk -tai19_unk: @ 8131A44 +tai19_unk: ; 8131A44 push {lr} ldr r3, =0x0203ab38 ldr r2, [r3] @@ -588166,7 +588166,7 @@ tai19_unk: @ 8131A44 ldr r0, [r0, 0x14] ldrh r0, [r0, 0x2] cmp r0, r1 - bne _08131A80 + bne @08131A80 ldrb r1, [r2, 0x3] ldrb r0, [r2, 0x4] lsls r0, 8 @@ -588178,19 +588178,19 @@ tai19_unk: @ 8131A44 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08131A84 + b @08131A84 .align 2, 0 .pool -_08131A80: +@08131A80: adds r0, r2, 0x7 str r0, [r3] -_08131A84: +@08131A84: pop {r0} bx r0 thumb_func_end tai19_unk thumb_func_start tai1A_unk -tai1A_unk: @ 8131A88 +tai1A_unk: ; 8131A88 push {lr} ldr r3, =0x0203ab38 ldr r2, [r3] @@ -588203,7 +588203,7 @@ tai1A_unk: @ 8131A88 ldr r0, [r0, 0x14] ldrh r0, [r0, 0x2] cmp r0, r1 - beq _08131AC4 + beq @08131AC4 ldrb r1, [r2, 0x3] ldrb r0, [r2, 0x4] lsls r0, 8 @@ -588215,19 +588215,19 @@ tai1A_unk: @ 8131A88 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08131AC8 + b @08131AC8 .align 2, 0 .pool -_08131AC4: +@08131AC4: adds r0, r2, 0x7 str r0, [r3] -_08131AC8: +@08131AC8: pop {r0} bx r0 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] @@ -588243,16 +588243,16 @@ tai1B_unk: @ 8131ACC orrs r3, r0 ldrb r0, [r3] cmp r0, 0xFF - beq _08131B28 + beq @08131B28 ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] ldr r1, [r0, 0x8] adds r4, r2, 0 -_08131AF6: +@08131AF6: ldrb r0, [r3] cmp r1, r0 - bne _08131B20 + bne @08131B20 ldr r2, [r4] ldrb r1, [r2, 0x5] ldrb r0, [r2, 0x6] @@ -588265,26 +588265,26 @@ _08131AF6: lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08131B2E + b @08131B2E .align 2, 0 .pool -_08131B20: +@08131B20: adds r3, 0x1 ldrb r0, [r3] cmp r0, 0xFF - bne _08131AF6 -_08131B28: + bne @08131AF6 +@08131B28: ldr r0, [r2] adds r0, 0x9 str r0, [r2] -_08131B2E: +@08131B2E: pop {r4} pop {r0} bx r0 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] @@ -588301,28 +588301,28 @@ tai1C_unk: @ 8131B34 ldrb r0, [r3] adds r4, r2, 0 cmp r0, 0xFF - beq _08131B80 + beq @08131B80 ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] ldr r2, [r0, 0x8] adds r1, r4, 0 -_08131B60: +@08131B60: ldrb r0, [r3] cmp r2, r0 - bne _08131B78 + bne @08131B78 ldr r0, [r1] adds r0, 0x9 str r0, [r1] - b _08131B98 + b @08131B98 .align 2, 0 .pool -_08131B78: +@08131B78: adds r3, 0x1 ldrb r0, [r3] cmp r0, 0xFF - bne _08131B60 -_08131B80: + bne @08131B60 +@08131B80: ldr r2, [r4] ldrb r1, [r2, 0x5] ldrb r0, [r2, 0x6] @@ -588335,14 +588335,14 @@ _08131B80: lsls r0, 24 orrs r1, r0 str r1, [r4] -_08131B98: +@08131B98: pop {r4} pop {r0} bx r0 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] @@ -588359,16 +588359,16 @@ tai1D_unk: @ 8131BA0 ldrh r0, [r3] ldr r5, =0x0000ffff cmp r0, r5 - beq _08131C00 + beq @08131C00 ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] ldr r1, [r0, 0x8] adds r4, r2, 0 -_08131BCC: +@08131BCC: ldrh r0, [r3] cmp r1, r0 - bne _08131BF8 + bne @08131BF8 ldr r2, [r4] ldrb r1, [r2, 0x5] ldrb r0, [r2, 0x6] @@ -588381,26 +588381,26 @@ _08131BCC: lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08131C06 + b @08131C06 .align 2, 0 .pool -_08131BF8: +@08131BF8: adds r3, 0x2 ldrh r0, [r3] cmp r0, r5 - bne _08131BCC -_08131C00: + bne @08131BCC +@08131C00: ldr r0, [r2] adds r0, 0x9 str r0, [r2] -_08131C06: +@08131C06: pop {r4,r5} pop {r0} bx r0 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] @@ -588418,28 +588418,28 @@ tai1E_unk: @ 8131C0C ldr r4, =0x0000ffff adds r5, r2, 0 cmp r0, r4 - beq _08131C5C + beq @08131C5C ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] ldr r2, [r0, 0x8] adds r1, r5, 0 -_08131C3A: +@08131C3A: ldrh r0, [r3] cmp r2, r0 - bne _08131C54 + bne @08131C54 ldr r0, [r1] adds r0, 0x9 str r0, [r1] - b _08131C74 + b @08131C74 .align 2, 0 .pool -_08131C54: +@08131C54: adds r3, 0x2 ldrh r0, [r3] cmp r0, r4 - bne _08131C3A -_08131C5C: + bne @08131C3A +@08131C5C: ldr r2, [r5] ldrb r1, [r2, 0x5] ldrb r0, [r2, 0x6] @@ -588452,14 +588452,14 @@ _08131C5C: lsls r0, 24 orrs r1, r0 str r1, [r5] -_08131C74: +@08131C74: pop {r4,r5} pop {r0} bx r0 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 @@ -588471,32 +588471,32 @@ tai1F_unk: @ 8131C7C muls r0, r2 adds r1, 0xC adds r2, r0, r1 -_08131C92: +@08131C92: ldrh r0, [r2] cmp r0, 0 - beq _08131CA6 + beq @08131CA6 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 adds r1, r5 ldrb r0, [r1, 0x1] cmp r0, 0 - bne _08131CAE -_08131CA6: + bne @08131CAE +@08131CA6: adds r2, 0x2 adds r3, 0x1 cmp r3, 0x3 - ble _08131C92 -_08131CAE: + ble @08131C92 +@08131CAE: cmp r3, 0x4 - bne _08131CCC + bne @08131CCC ldr r0, [r4] adds r0, 0x5 str r0, [r4] - b _08131CE4 + b @08131CE4 .align 2, 0 .pool -_08131CCC: +@08131CCC: ldr r2, [r4] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -588509,14 +588509,14 @@ _08131CCC: lsls r0, 24 orrs r1, r0 str r1, [r4] -_08131CE4: +@08131CE4: pop {r4,r5} pop {r0} bx r0 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 @@ -588528,32 +588528,32 @@ tai20_unk: @ 8131CEC muls r0, r2 adds r1, 0xC adds r2, r0, r1 -_08131D02: +@08131D02: ldrh r0, [r2] cmp r0, 0 - beq _08131D16 + beq @08131D16 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 adds r1, r5 ldrb r0, [r1, 0x1] cmp r0, 0 - bne _08131D1E -_08131D16: + bne @08131D1E +@08131D16: adds r2, 0x2 adds r3, 0x1 cmp r3, 0x3 - ble _08131D02 -_08131D1E: + ble @08131D02 +@08131D1E: cmp r3, 0x4 - beq _08131D3C + beq @08131D3C ldr r0, [r4] adds r0, 0x5 str r0, [r4] - b _08131D54 + b @08131D54 .align 2, 0 .pool -_08131D3C: +@08131D3C: ldr r2, [r4] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -588566,14 +588566,14 @@ _08131D3C: lsls r0, 24 orrs r1, r0 str r1, [r4] -_08131D54: +@08131D54: pop {r4,r5} pop {r0} bx r0 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] @@ -588590,29 +588590,29 @@ 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] ldrb r0, [r0, 0x1] adds r4, r1, 0 cmp r0, 0x4 - bhi _08131E5A + bhi @08131E5A lsls r0, 2 - ldr r1, =_08131DA0 + ldr r1, =@08131DA0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08131DA0: - .4byte _08131DD8 - .4byte _08131DB4 - .4byte _08131E20 - .4byte _08131DFC - .4byte _08131E44 -_08131DB4: +@08131DA0: + .4byte @08131DD8 + .4byte @08131DB4 + .4byte @08131E20 + .4byte @08131DFC + .4byte @08131E44 +@08131DB4: ldr r0, =0x020244a8 ldr r0, [r0] ldr r3, [r0, 0x14] @@ -588624,10 +588624,10 @@ _08131DB4: adds r0, r2 adds r0, 0x21 ldrb r0, [r0] - b _08131E58 + b @08131E58 .align 2, 0 .pool -_08131DD8: +@08131DD8: ldr r0, =0x020244a8 ldr r0, [r0] ldr r3, [r0, 0x14] @@ -588639,10 +588639,10 @@ _08131DD8: adds r0, r2 adds r0, 0x21 ldrb r0, [r0] - b _08131E58 + b @08131E58 .align 2, 0 .pool -_08131DFC: +@08131DFC: ldr r0, =0x020244a8 ldr r0, [r0] ldr r3, [r0, 0x14] @@ -588654,10 +588654,10 @@ _08131DFC: adds r0, r2 adds r0, 0x22 ldrb r0, [r0] - b _08131E58 + b @08131E58 .align 2, 0 .pool -_08131E20: +@08131E20: ldr r0, =0x020244a8 ldr r0, [r0] ldr r3, [r0, 0x14] @@ -588669,10 +588669,10 @@ _08131E20: adds r0, r2 adds r0, 0x22 ldrb r0, [r0] - b _08131E58 + b @08131E58 .align 2, 0 .pool -_08131E44: +@08131E44: ldr r0, =0x020244a8 ldr r0, [r0] ldr r3, [r0, 0x14] @@ -588683,9 +588683,9 @@ _08131E44: lsls r0, 2 adds r0, r2 ldrb r0, [r0, 0x2] -_08131E58: +@08131E58: str r0, [r3, 0x8] -_08131E5A: +@08131E5A: ldr r0, [r4] adds r0, 0x2 str r0, [r4] @@ -588697,42 +588697,42 @@ _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 cmp r0, 0x1 - bne _08131E84 + bne @08131E84 ldr r0, =0x0203ab3c ldrb r0, [r0] - b _08131EAC + b @08131EAC .align 2, 0 .pool -_08131E84: +@08131E84: cmp r0, 0x1 - ble _08131E90 + ble @08131E90 cmp r0, 0x2 - beq _08131EA4 + beq @08131EA4 cmp r0, 0x3 - beq _08131E9C -_08131E90: + beq @08131E9C +@08131E90: ldr r0, =0x0202420c ldrb r0, [r0] - b _08131EAC + b @08131EAC .align 2, 0 .pool -_08131E9C: +@08131E9C: ldr r0, =0x0203ab3c - b _08131EA6 + b @08131EA6 .align 2, 0 .pool -_08131EA4: +@08131EA4: ldr r0, =0x0202420c -_08131EA6: +@08131EA6: ldrb r1, [r0] movs r0, 0x2 eors r0, r1 -_08131EAC: +@08131EAC: pop {r1} bx r1 .align 2, 0 @@ -588740,7 +588740,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] @@ -588758,26 +588758,26 @@ tai5F_unk: @ 8131EB4 ldrb r1, [r1] ldrb r2, [r0, 0x2] cmp r1, r2 - beq _08131EE4 + beq @08131EE4 adds r0, r3, 0 adds r0, 0x22 ldrb r0, [r0] cmp r0, r2 - bne _08131EFC -_08131EE4: + bne @08131EFC +@08131EE4: ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] movs r0, 0x1 - b _08131F04 + b @08131F04 .align 2, 0 .pool -_08131EFC: +@08131EFC: ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] movs r0, 0 -_08131F04: +@08131F04: str r0, [r1, 0x8] ldr r1, =0x0203ab38 ldr r0, [r1] @@ -588791,7 +588791,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] @@ -588813,7 +588813,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 @@ -588827,7 +588827,7 @@ dp15_is_most_powerful_move__8: @ 8131F48 ldr r6, =0x0831c898 ldr r2, =0x020244a8 cmp r1, r5 - beq _08131F86 + beq @08131F86 ldr r0, [r2] ldr r0, [r0, 0x14] ldrh r1, [r0, 0x2] @@ -588837,16 +588837,16 @@ dp15_is_most_powerful_move__8: @ 8131F48 adds r0, r6 ldrb r4, [r0] ldr r1, =0x085b09c8 -_08131F76: +@08131F76: ldrh r0, [r1] cmp r4, r0 - beq _08131F86 + beq @08131F86 adds r1, 0x2 adds r3, 0x1 ldrh r0, [r1] cmp r0, r5 - bne _08131F76 -_08131F86: + bne @08131F76 +@08131F86: ldr r0, [r2] ldr r0, [r0, 0x14] ldrh r1, [r0, 0x2] @@ -588856,18 +588856,18 @@ _08131F86: adds r0, r6 ldrb r0, [r0, 0x1] cmp r0, 0x1 - bhi _08131F9C - b _08132126 -_08131F9C: + bhi @08131F9C + b @08132126 +@08131F9C: lsls r0, r3, 1 ldr r1, =0x085b09c8 adds r0, r1 ldrh r3, [r0] ldr r0, =0x0000ffff cmp r3, r0 - beq _08131FAC - b _08132126 -_08131FAC: + beq @08131FAC + b @08132126 +@08131FAC: ldr r0, =0x02024400 movs r1, 0 strh r1, [r0] @@ -588886,7 +588886,7 @@ _08131FAC: ldr r2, =0x085b09c8 ldrh r2, [r2] str r2, [sp, 0x10] -_08131FD0: +@08131FD0: movs r3, 0 ldr r5, =0x02024084 lsls r4, r6, 1 @@ -588897,7 +588897,7 @@ _08131FD0: mov r10, r1 ldr r2, [sp, 0x10] cmp r2, r9 - beq _08132014 + beq @08132014 ldr r2, =0x0831c898 ldrb r1, [r7] movs r0, 0x58 @@ -588913,16 +588913,16 @@ _08131FD0: adds r0, r2 ldrb r2, [r0] ldr r1, =0x085b09c8 -_08132004: +@08132004: ldrh r0, [r1] cmp r2, r0 - beq _08132014 + beq @08132014 adds r1, 0x2 adds r3, 0x1 ldrh r0, [r1] cmp r0, r9 - bne _08132004 -_08132014: + bne @08132004 +@08132014: ldrb r1, [r7] movs r0, 0x58 muls r0, r1 @@ -588932,13 +588932,13 @@ _08132014: adds r1, r0, r1 ldrh r0, [r1] cmp r0, 0 - beq _081320C0 + beq @081320C0 lsls r0, r3, 1 ldr r2, =0x085b09c8 adds r0, r2 ldrh r0, [r0] cmp r0, r9 - bne _081320C0 + bne @081320C0 ldr r0, =0x0831c898 ldrh r2, [r1] lsls r1, r2, 1 @@ -588947,7 +588947,7 @@ _08132014: adds r1, r0 ldrb r0, [r1, 0x1] cmp r0, 0x1 - bls _081320C0 + bls @081320C0 ldr r5, =0x020241ea strh r2, [r5] ldrb r0, [r7] @@ -588973,23 +588973,23 @@ _08132014: bl __divsi3 str r0, [r4] cmp r0, 0 - bne _081320C8 + bne @081320C8 movs r0, 0x1 str r0, [r4] - b _081320C8 + b @081320C8 .align 2, 0 .pool -_081320C0: +@081320C0: mov r1, sp add r1, r8 movs r0, 0 str r0, [r1] -_081320C8: +@081320C8: mov r6, r10 cmp r6, 0x3 - bgt _081320D0 - b _08131FD0 -_081320D0: + bgt @081320D0 + b @08131FD0 +@081320D0: movs r6, 0 ldr r2, =0x020244a8 ldr r0, [r2] @@ -589001,14 +589001,14 @@ _081320D0: ldr r0, [r0] ldr r5, =0x0203ab38 cmp r1, r0 - bgt _08132106 + bgt @08132106 adds r4, r2, 0 mov r3, sp -_081320EC: +@081320EC: adds r3, 0x4 adds r6, 0x1 cmp r6, 0x3 - bgt _08132106 + bgt @08132106 ldr r0, [r4] ldr r0, [r0, 0x14] ldrb r0, [r0, 0x1] @@ -589017,30 +589017,30 @@ _081320EC: ldr r1, [r3] ldr r0, [r0] cmp r1, r0 - ble _081320EC -_08132106: + ble @081320EC +@08132106: cmp r6, 0x4 - bne _0813211C + bne @0813211C ldr r0, [r2] ldr r1, [r0, 0x14] movs r0, 0x2 str r0, [r1, 0x8] - b _08132130 + b @08132130 .align 2, 0 .pool -_0813211C: +@0813211C: ldr r0, [r2] ldr r1, [r0, 0x14] movs r0, 0x1 str r0, [r1, 0x8] - b _08132130 -_08132126: + b @08132130 +@08132126: ldr r0, [r2] ldr r1, [r0, 0x14] movs r0, 0 str r0, [r1, 0x8] ldr r5, =0x0203ab38 -_08132130: +@08132130: ldr r0, [r5] adds r0, 0x1 str r0, [r5] @@ -589057,29 +589057,29 @@ _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] ldrb r1, [r1, 0x1] adds r3, r0, 0 cmp r1, 0x1 - bne _08132178 + bne @08132178 ldr r0, =0x020244a8 ldr r0, [r0] ldr r2, [r0, 0x14] ldr r1, =0x02024248 ldr r0, =0x0203ab3c - b _08132182 + b @08132182 .align 2, 0 .pool -_08132178: +@08132178: ldr r0, =0x020244a8 ldr r0, [r0] ldr r2, [r0, 0x14] ldr r1, =0x02024248 ldr r0, =0x0202420c -_08132182: +@08132182: ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -589095,7 +589095,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] @@ -589105,7 +589105,7 @@ tai26_unk: @ 81321A4 ldr r0, [r0, 0x14] ldr r0, [r0, 0x8] cmp r1, r0 - bne _081321D8 + bne @081321D8 ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] lsls r0, 8 @@ -589117,19 +589117,19 @@ tai26_unk: @ 81321A4 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081321DC + b @081321DC .align 2, 0 .pool -_081321D8: +@081321D8: adds r0, r2, 0x6 str r0, [r3] -_081321DC: +@081321DC: pop {r0} bx r0 thumb_func_end tai26_unk thumb_func_start tai27_unk -tai27_unk: @ 81321E0 +tai27_unk: ; 81321E0 push {lr} ldr r3, =0x0203ab38 ldr r2, [r3] @@ -589139,7 +589139,7 @@ tai27_unk: @ 81321E0 ldr r0, [r0, 0x14] ldr r0, [r0, 0x8] cmp r1, r0 - beq _08132214 + beq @08132214 ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] lsls r0, 8 @@ -589151,19 +589151,19 @@ tai27_unk: @ 81321E0 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08132218 + b @08132218 .align 2, 0 .pool -_08132214: +@08132214: adds r0, r2, 0x6 str r0, [r3] -_08132218: +@08132218: pop {r0} bx r0 thumb_func_end tai27_unk thumb_func_start tai28_unk -tai28_unk: @ 813221C +tai28_unk: ; 813221C push {lr} ldr r0, =0x0203ab3c ldrb r0, [r0] @@ -589177,7 +589177,7 @@ tai28_unk: @ 813221C lsrs r0, 24 ldrb r1, [r2, 0x1] cmp r0, r1 - bne _08132260 + bne @08132260 ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] lsls r0, 8 @@ -589189,19 +589189,19 @@ tai28_unk: @ 813221C lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08132264 + b @08132264 .align 2, 0 .pool -_08132260: +@08132260: adds r0, r2, 0x6 str r0, [r3] -_08132264: +@08132264: pop {r0} bx r0 thumb_func_end tai28_unk thumb_func_start tai29_unk -tai29_unk: @ 8132268 +tai29_unk: ; 8132268 push {lr} ldr r0, =0x0203ab3c ldrb r0, [r0] @@ -589215,7 +589215,7 @@ tai29_unk: @ 8132268 lsrs r0, 24 ldrb r1, [r2, 0x1] cmp r0, r1 - beq _081322AC + beq @081322AC ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] lsls r0, 8 @@ -589227,29 +589227,29 @@ tai29_unk: @ 8132268 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081322B0 + b @081322B0 .align 2, 0 .pool -_081322AC: +@081322AC: adds r0, r2, 0x6 str r0, [r3] -_081322B0: +@081322B0: pop {r0} bx r0 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} @@ -589262,14 +589262,14 @@ tai2C_unk: @ 81322BC ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x1 - bne _081322E8 + bne @081322E8 ldr r0, =0x0203ab3c - b _081322EA + b @081322EA .align 2, 0 .pool -_081322E8: +@081322E8: ldr r0, =0x0202420c -_081322EA: +@081322EA: ldrb r5, [r0] adds r0, r5, 0 bl battle_side_get_owner @@ -589277,16 +589277,16 @@ _081322EA: ldr r1, =0x02024744 mov r8, r1 cmp r0, 0 - bne _08132300 + bne @08132300 ldr r0, =0x020244ec mov r8, r0 -_08132300: +@08132300: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08132344 + beq @08132344 ldr r4, =0x0202406e lsls r0, r5, 1 adds r0, r4 @@ -589302,22 +589302,22 @@ _08132300: lsrs r0, 23 adds r0, r4 ldrb r6, [r0] - b _0813234E + b @0813234E .align 2, 0 .pool -_08132344: +@08132344: ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 ldrb r6, [r0] adds r7, r6, 0 -_0813234E: +@0813234E: movs r5, 0 -_08132350: +@08132350: cmp r5, r7 - beq _08132394 + beq @08132394 cmp r5, r6 - beq _08132394 + beq @08132394 movs r0, 0x64 muls r0, r5 mov r1, r8 @@ -589326,29 +589326,29 @@ _08132350: movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _08132394 + beq @08132394 adds r0, r4, 0 movs r1, 0x41 bl pokemon_getattr cmp r0, 0 - beq _08132394 + beq @08132394 adds r0, r4, 0 movs r1, 0x41 bl pokemon_getattr movs r1, 0xCE lsls r1, 1 cmp r0, r1 - beq _08132394 + beq @08132394 ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] ldr r0, [r1, 0x8] adds r0, 0x1 str r0, [r1, 0x8] -_08132394: +@08132394: adds r5, 0x1 cmp r5, 0x5 - ble _08132350 + ble @08132350 ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x2 @@ -589363,7 +589363,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] @@ -589379,7 +589379,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] @@ -589401,26 +589401,26 @@ 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] ldrb r1, [r1, 0x1] mov r12, r0 cmp r1, 0x1 - bne _0813241C + bne @0813241C ldr r0, =0x0203ab3c - b _0813241E + b @0813241E .align 2, 0 .pool -_0813241C: +@0813241C: ldr r0, =0x0202420c -_0813241E: +@0813241E: ldrb r3, [r0] ldr r0, =0x02024064 ldrb r0, [r0] cmp r0, r3 - beq _081324F0 + beq @081324F0 ldr r7, =0x020244a8 ldr r5, [r7] ldr r0, [r5, 0x18] @@ -589429,13 +589429,13 @@ _0813241E: ldrb r0, [r2] adds r6, r7, 0 cmp r0, 0 - beq _0813244C + beq @0813244C ldr r1, [r5, 0x14] str r0, [r1, 0x8] - b _08132504 + b @08132504 .align 2, 0 .pool -_0813244C: +@0813244C: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r3 @@ -589445,12 +589445,12 @@ _0813244C: ldrb r0, [r0] adds r2, r1, 0 cmp r0, 0x17 - beq _08132468 + beq @08132468 cmp r0, 0x2A - beq _08132468 + beq @08132468 cmp r0, 0x47 - bne _08132480 -_08132468: + bne @08132480 +@08132468: ldr r0, [r6] ldr r1, [r0, 0x14] movs r0, 0x58 @@ -589459,10 +589459,10 @@ _08132468: adds r0, 0x20 ldrb r0, [r0] str r0, [r1, 0x8] - b _08132504 + b @08132504 .align 2, 0 .pool -_08132480: +@08132480: ldr r6, =0x083203cc ldrh r0, [r4] lsls r1, r0, 3 @@ -589471,15 +589471,15 @@ _08132480: adds r2, r1, r6 ldrb r0, [r2, 0x16] cmp r0, 0 - beq _081324E8 + beq @081324E8 ldrb r0, [r2, 0x17] cmp r0, 0 - beq _081324E0 + beq @081324E0 bl GenerateRandomNumber movs r1, 0x1 ands r1, r0 cmp r1, 0 - beq _081324C4 + beq @081324C4 ldr r0, [r7] ldr r2, [r0, 0x14] ldrh r1, [r4] @@ -589491,10 +589491,10 @@ _08132480: str r0, [r2, 0x8] ldr r0, =0x0203ab38 mov r12, r0 - b _08132504 + b @08132504 .align 2, 0 .pool -_081324C4: +@081324C4: ldr r0, [r7] ldr r2, [r0, 0x14] ldrh r1, [r4] @@ -589506,20 +589506,20 @@ _081324C4: str r0, [r2, 0x8] ldr r1, =0x0203ab38 mov r12, r1 - b _08132504 + b @08132504 .align 2, 0 .pool -_081324E0: +@081324E0: ldr r1, [r5, 0x14] ldrb r0, [r2, 0x16] str r0, [r1, 0x8] - b _08132504 -_081324E8: + b @08132504 +@081324E8: ldr r1, [r5, 0x14] ldrb r0, [r2, 0x17] str r0, [r1, 0x8] - b _08132504 -_081324F0: + b @08132504 +@081324F0: ldr r0, =0x020244a8 ldr r0, [r0] ldr r2, [r0, 0x14] @@ -589530,7 +589530,7 @@ _081324F0: adds r0, 0x20 ldrb r0, [r0] str r0, [r2, 0x8] -_08132504: +@08132504: mov r1, r12 ldr r0, [r1] adds r0, 0x2 @@ -589543,7 +589543,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] @@ -589555,10 +589555,10 @@ tai60_unk: @ 813251C ldrb r3, [r0, 0x2] ldrb r0, [r0, 0x1] cmp r0, 0 - beq _0813253A + beq @0813253A cmp r0, 0x2 - bne _081325BC -_0813253A: + bne @081325BC +@0813253A: ldr r0, =0x020244a8 ldr r4, [r0] ldr r1, [r4, 0x18] @@ -589567,14 +589567,14 @@ _0813253A: ldrb r1, [r2] adds r6, r0, 0 cmp r1, 0 - beq _0813255C + beq @0813255C adds r3, r1, 0 ldr r0, [r4, 0x14] str r3, [r0, 0x8] - b _081325CA + b @081325CA .align 2, 0 .pool -_0813255C: +@0813255C: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r5 @@ -589583,21 +589583,21 @@ _0813255C: adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x17 - beq _08132576 + beq @08132576 cmp r0, 0x2A - beq _08132576 + beq @08132576 cmp r0, 0x47 - bne _08132588 -_08132576: + bne @08132588 +@08132576: movs r0, 0x58 muls r0, r5 adds r0, r1 adds r0, 0x20 ldrb r3, [r0] - b _081325CA + b @081325CA .align 2, 0 .pool -_08132588: +@08132588: ldr r2, =0x083203cc ldrh r1, [r4] lsls r0, r1, 3 @@ -589606,26 +589606,26 @@ _08132588: adds r1, r0, r2 ldrb r4, [r1, 0x16] cmp r4, 0 - beq _081325B8 + beq @081325B8 ldrb r2, [r1, 0x17] cmp r2, 0 - beq _081325B4 + beq @081325B4 adds r0, r3, 0 cmp r4, r0 - beq _081325CE + beq @081325CE cmp r2, r0 - beq _081325CE + beq @081325CE adds r3, r4, 0 - b _081325CA + b @081325CA .align 2, 0 .pool -_081325B4: +@081325B4: ldrb r3, [r1, 0x16] - b _081325CA -_081325B8: + b @081325CA +@081325B8: ldrb r3, [r1, 0x17] - b _081325CA -_081325BC: + b @081325CA +@081325BC: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r5 @@ -589633,38 +589633,38 @@ _081325BC: adds r0, 0x20 ldrb r3, [r0] ldr r6, =0x020244a8 -_081325CA: +@081325CA: cmp r3, 0 - bne _081325E8 -_081325CE: + bne @081325E8 +@081325CE: ldr r0, [r6] ldr r1, [r0, 0x14] movs r0, 0x2 str r0, [r1, 0x8] ldr r2, =0x0203ab38 - b _08132608 + b @08132608 .align 2, 0 .pool -_081325E8: +@081325E8: ldr r0, =0x0203ab38 ldr r1, [r0] adds r2, r0, 0 ldrb r1, [r1, 0x2] cmp r3, r1 - bne _08132600 + bne @08132600 ldr r0, [r6] ldr r1, [r0, 0x14] movs r0, 0x1 - b _08132606 + b @08132606 .align 2, 0 .pool -_08132600: +@08132600: ldr r0, [r6] ldr r1, [r0, 0x14] movs r0, 0 -_08132606: +@08132606: str r0, [r1, 0x8] -_08132608: +@08132608: ldr r0, [r2] adds r0, 0x3 str r0, [r2] @@ -589674,7 +589674,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} @@ -589702,7 +589702,7 @@ tai30_unk: @ 8132614 ldr r0, =0x02024090 mov r8, r0 ldr r6, =0x0203ab3c -_0813264A: +@0813264A: movs r0, 0x28 str r0, [r4] lsls r1, r5, 1 @@ -589715,7 +589715,7 @@ _0813264A: strh r0, [r7] lsls r0, 16 cmp r0, 0 - beq _081326B8 + beq @081326B8 ldrh r0, [r7] ldrb r1, [r6] ldr r2, =0x0202420c @@ -589723,49 +589723,49 @@ _0813264A: bl move_effectiveness_something ldr r0, [r4] cmp r0, 0x78 - bne _0813267A + bne @0813267A movs r0, 0x50 str r0, [r4] -_0813267A: +@0813267A: ldr r0, [r4] cmp r0, 0xF0 - bne _08132684 + bne @08132684 movs r0, 0xA0 str r0, [r4] -_08132684: +@08132684: ldr r0, [r4] cmp r0, 0x1E - bne _0813268E + bne @0813268E movs r0, 0x14 str r0, [r4] -_0813268E: +@0813268E: ldr r0, [r4] cmp r0, 0xF - bne _08132698 + bne @08132698 movs r0, 0xA str r0, [r4] -_08132698: +@08132698: ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _081326A8 + beq @081326A8 movs r0, 0 str r0, [r4] -_081326A8: +@081326A8: ldr r0, =0x020244a8 ldr r0, [r0] ldr r2, [r0, 0x14] ldr r0, [r2, 0x8] ldr r1, [r4] cmp r0, r1 - bcs _081326B8 + bcs @081326B8 str r1, [r2, 0x8] -_081326B8: +@081326B8: adds r5, 0x1 cmp r5, 0x3 - ble _0813264A + ble @0813264A ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 @@ -589780,7 +589780,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 @@ -589812,42 +589812,42 @@ dp15_simulate_damage_bonus_jump_if_eq: @ 8132700 bl move_effectiveness_something ldr r0, [r4] cmp r0, 0x78 - bne _08132746 + bne @08132746 movs r0, 0x50 str r0, [r4] -_08132746: +@08132746: ldr r0, [r4] cmp r0, 0xF0 - bne _08132750 + bne @08132750 movs r0, 0xA0 str r0, [r4] -_08132750: +@08132750: ldr r0, [r4] cmp r0, 0x1E - bne _0813275A + bne @0813275A movs r0, 0x14 str r0, [r4] -_0813275A: +@0813275A: ldr r0, [r4] cmp r0, 0xF - bne _08132764 + bne @08132764 movs r0, 0xA str r0, [r4] -_08132764: +@08132764: ldrb r1, [r5] movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _08132772 + beq @08132772 movs r0, 0 str r0, [r4] -_08132772: +@08132772: ldrb r0, [r4] ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] cmp r0, r1 - bne _081327C4 + bne @081327C4 ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] lsls r0, 8 @@ -589859,30 +589859,30 @@ _08132772: lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081327C8 + b @081327C8 .align 2, 0 .pool -_081327C4: +@081327C4: adds r0, r2, 0x6 str r0, [r3] -_081327C8: +@081327C8: pop {r4,r5} pop {r0} bx r0 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 @@ -589892,12 +589892,12 @@ tai34_unk: @ 81327D8 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x1 - bne _08132818 + bne @08132818 ldr r0, =0x0203ab3c - b _0813281A + b @0813281A .align 2, 0 .pool -_081327F8: +@081327F8: ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x6] @@ -589911,22 +589911,22 @@ _081327F8: lsls r0, 24 orrs r1, r0 str r1, [r3] - b _0813289A + b @0813289A .align 2, 0 .pool -_08132818: +@08132818: ldr r0, =0x0202420c -_0813281A: +@0813281A: ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 ldr r1, =0x02024744 mov r9, r1 cmp r0, 0 - bne _0813282E + bne @0813282E ldr r0, =0x020244ec mov r9, r0 -_0813282E: +@0813282E: ldr r0, =0x0203ab38 ldr r1, [r0] ldrb r7, [r1, 0x2] @@ -589944,7 +589944,7 @@ _0813282E: movs r0, 0xCE lsls r0, 1 mov r10, r0 -_08132850: +@08132850: movs r0, 0x64 mov r4, r8 muls r4, r0 @@ -589963,24 +589963,24 @@ _08132850: movs r1, 0x37 bl pokemon_getattr cmp r5, 0 - beq _08132888 + beq @08132888 cmp r5, r10 - beq _08132888 + beq @08132888 cmp r6, 0 - beq _08132888 + beq @08132888 cmp r0, r7 - beq _081327F8 -_08132888: + beq @081327F8 +@08132888: movs r1, 0x1 add r8, r1 mov r0, r8 cmp r0, 0x5 - ble _08132850 + ble @08132850 ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0xA str r0, [r1] -_0813289A: +@0813289A: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -589993,7 +589993,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 @@ -590003,24 +590003,24 @@ tai35_unk: @ 81328B8 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x1 - bne _081328D8 + bne @081328D8 ldr r0, =0x0203ab3c - b _081328DA + b @081328DA .align 2, 0 .pool -_081328D8: +@081328D8: ldr r0, =0x0202420c -_081328DA: +@081328DA: ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 ldr r1, =0x02024744 mov r10, r1 cmp r0, 0 - bne _081328EE + bne @081328EE ldr r0, =0x020244ec mov r10, r0 -_081328EE: +@081328EE: ldr r2, =0x0203ab38 ldr r1, [r2] ldrb r7, [r1, 0x2] @@ -590036,7 +590036,7 @@ _081328EE: movs r1, 0 mov r8, r1 mov r9, r2 -_0813290C: +@0813290C: movs r0, 0x64 mov r4, r8 muls r4, r0 @@ -590055,25 +590055,25 @@ _0813290C: movs r1, 0x37 bl pokemon_getattr cmp r5, 0 - beq _08132950 + beq @08132950 movs r1, 0xCE lsls r1, 1 cmp r5, r1 - beq _08132950 + beq @08132950 cmp r6, 0 - beq _08132950 + beq @08132950 cmp r0, r7 - bne _08132950 + bne @08132950 mov r1, r9 ldr r0, [r1] adds r0, 0xA str r0, [r1] -_08132950: +@08132950: movs r0, 0x1 add r8, r0 mov r1, r8 cmp r1, 0x5 - ble _0813290C + ble @0813290C ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x6] @@ -590099,53 +590099,53 @@ _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] movs r0, 0x7 ands r0, r1 cmp r0, 0 - beq _081329AC + beq @081329AC ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] movs r0, 0x1 str r0, [r1, 0x8] -_081329AC: +@081329AC: ldrh r1, [r2] movs r0, 0x18 ands r0, r1 cmp r0, 0 - beq _081329C0 + beq @081329C0 ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] movs r0, 0x2 str r0, [r1, 0x8] -_081329C0: +@081329C0: ldrh r1, [r2] movs r0, 0x60 ands r0, r1 cmp r0, 0 - beq _081329D4 + beq @081329D4 ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] movs r0, 0 str r0, [r1, 0x8] -_081329D4: +@081329D4: ldrh r1, [r2] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081329E8 + beq @081329E8 ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] movs r0, 0x3 str r0, [r1, 0x8] -_081329E8: +@081329E8: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 @@ -590157,7 +590157,7 @@ _081329E8: thumb_func_end dp15_get_weather__8 thumb_func_start tai37_unk -tai37_unk: @ 8132A00 +tai37_unk: ; 8132A00 push {lr} ldr r2, =0x0831c898 ldr r0, =0x020244a8 @@ -590173,7 +590173,7 @@ tai37_unk: @ 8132A00 ldrb r0, [r0] ldrb r1, [r2, 0x1] cmp r0, r1 - bne _08132A44 + bne @08132A44 ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] lsls r0, 8 @@ -590185,19 +590185,19 @@ tai37_unk: @ 8132A00 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08132A48 + b @08132A48 .align 2, 0 .pool -_08132A44: +@08132A44: adds r0, r2, 0x6 str r0, [r3] -_08132A48: +@08132A48: pop {r0} bx r0 thumb_func_end tai37_unk thumb_func_start tai38_unk -tai38_unk: @ 8132A4C +tai38_unk: ; 8132A4C push {lr} ldr r2, =0x0831c898 ldr r0, =0x020244a8 @@ -590213,7 +590213,7 @@ tai38_unk: @ 8132A4C ldrb r0, [r0] ldrb r1, [r2, 0x1] cmp r0, r1 - beq _08132A90 + beq @08132A90 ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] lsls r0, 8 @@ -590225,33 +590225,33 @@ tai38_unk: @ 8132A4C lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08132A94 + b @08132A94 .align 2, 0 .pool -_08132A90: +@08132A90: adds r0, r2, 0x6 str r0, [r3] -_08132A94: +@08132A94: pop {r0} bx r0 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] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 - bne _08132AB4 + bne @08132AB4 ldr r0, =0x0203ab3c - b _08132AB6 + b @08132AB6 .align 2, 0 .pool -_08132AB4: +@08132AB4: ldr r0, =0x0202420c -_08132AB6: +@08132AB6: ldrb r3, [r0] ldr r1, =0x02024084 ldr r2, [r4] @@ -590266,7 +590266,7 @@ _08132AB6: asrs r0, 24 ldrb r1, [r2, 0x3] cmp r0, r1 - bge _08132AF4 + bge @08132AF4 ldrb r1, [r2, 0x4] ldrb r0, [r2, 0x5] lsls r0, 8 @@ -590278,35 +590278,35 @@ _08132AB6: lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08132AFA + b @08132AFA .align 2, 0 .pool -_08132AF4: +@08132AF4: adds r0, r2, 0 adds r0, 0x8 str r0, [r4] -_08132AFA: +@08132AFA: pop {r4} pop {r0} bx r0 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] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 - bne _08132B1C + bne @08132B1C ldr r0, =0x0203ab3c - b _08132B1E + b @08132B1E .align 2, 0 .pool -_08132B1C: +@08132B1C: ldr r0, =0x0202420c -_08132B1E: +@08132B1E: ldrb r3, [r0] ldr r1, =0x02024084 ldr r2, [r4] @@ -590321,7 +590321,7 @@ _08132B1E: asrs r0, 24 ldrb r1, [r2, 0x3] cmp r0, r1 - ble _08132B5C + ble @08132B5C ldrb r1, [r2, 0x4] ldrb r0, [r2, 0x5] lsls r0, 8 @@ -590333,35 +590333,35 @@ _08132B1E: lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08132B62 + b @08132B62 .align 2, 0 .pool -_08132B5C: +@08132B5C: adds r0, r2, 0 adds r0, 0x8 str r0, [r4] -_08132B62: +@08132B62: pop {r4} pop {r0} bx r0 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] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 - bne _08132B84 + bne @08132B84 ldr r0, =0x0203ab3c - b _08132B86 + b @08132B86 .align 2, 0 .pool -_08132B84: +@08132B84: ldr r0, =0x0202420c -_08132B86: +@08132B86: ldrb r3, [r0] ldr r1, =0x02024084 ldr r2, [r4] @@ -590376,7 +590376,7 @@ _08132B86: asrs r0, 24 ldrb r1, [r2, 0x3] cmp r0, r1 - bne _08132BC4 + bne @08132BC4 ldrb r1, [r2, 0x4] ldrb r0, [r2, 0x5] lsls r0, 8 @@ -590388,35 +590388,35 @@ _08132B86: lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08132BCA + b @08132BCA .align 2, 0 .pool -_08132BC4: +@08132BC4: adds r0, r2, 0 adds r0, 0x8 str r0, [r4] -_08132BCA: +@08132BCA: pop {r4} pop {r0} bx r0 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] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 - bne _08132BEC + bne @08132BEC ldr r0, =0x0203ab3c - b _08132BEE + b @08132BEE .align 2, 0 .pool -_08132BEC: +@08132BEC: ldr r0, =0x0202420c -_08132BEE: +@08132BEE: ldrb r3, [r0] ldr r1, =0x02024084 ldr r2, [r4] @@ -590431,7 +590431,7 @@ _08132BEE: asrs r0, 24 ldrb r1, [r2, 0x3] cmp r0, r1 - beq _08132C2C + beq @08132C2C ldrb r1, [r2, 0x4] ldrb r0, [r2, 0x5] lsls r0, 8 @@ -590443,21 +590443,21 @@ _08132BEE: lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08132C32 + b @08132C32 .align 2, 0 .pool -_08132C2C: +@08132C2C: adds r0, r2, 0 adds r0, 0x8 str r0, [r4] -_08132C32: +@08132C32: pop {r4} pop {r0} bx r0 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} @@ -590473,7 +590473,7 @@ tai3D_unk: @ 8132C38 adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0x1 - bls _08132D1C + bls @08132D1C ldr r0, =0x02024400 movs r1, 0 strh r1, [r0] @@ -590517,9 +590517,9 @@ tai3D_unk: @ 8132C38 bl __divsi3 str r0, [r4] cmp r0, 0 - bne _08132CB8 + bne @08132CB8 str r7, [r4] -_08132CB8: +@08132CB8: ldr r2, =0x02024084 ldrb r1, [r6] movs r0, 0x58 @@ -590528,7 +590528,7 @@ _08132CB8: ldrh r1, [r0, 0x28] ldr r0, [r4] cmp r1, r0 - bgt _08132D1C + bgt @08132D1C ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -590542,15 +590542,15 @@ _08132CB8: lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08132D24 + b @08132D24 .align 2, 0 .pool -_08132D1C: +@08132D1C: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_08132D24: +@08132D24: pop {r3} mov r8, r3 pop {r4-r7} @@ -590561,7 +590561,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, =0x0831c898 ldr r7, =0x020244a8 @@ -590574,7 +590574,7 @@ dp15_determine_move_damage_jump_if_not_fatal: @ 8132D34 adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0x1 - bls _08132E04 + bls @08132E04 ldr r0, =0x02024400 movs r1, 0 strh r1, [r0] @@ -590622,7 +590622,7 @@ dp15_determine_move_damage_jump_if_not_fatal: @ 8132D34 adds r1, r3 ldrh r1, [r1, 0x28] cmp r1, r0 - ble _08132E04 + ble @08132E04 ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -590636,15 +590636,15 @@ dp15_determine_move_damage_jump_if_not_fatal: @ 8132D34 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08132E0C + b @08132E0C .align 2, 0 .pool -_08132E04: +@08132E04: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_08132E0C: +@08132E0C: pop {r4-r7} pop {r0} bx r0 @@ -590653,7 +590653,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] @@ -590661,21 +590661,21 @@ tai3F_unk: @ 8132E18 ldrb r1, [r5, 0x1] adds r6, r0, 0 cmp r1, 0x1 - beq _08132E42 + beq @08132E42 cmp r1, 0x1 - bgt _08132E38 + bgt @08132E38 cmp r1, 0 - beq _08132EDC - b _08132F40 + beq @08132EDC + b @08132F40 .align 2, 0 .pool -_08132E38: +@08132E38: cmp r1, 0x2 - beq _08132EDC + beq @08132EDC cmp r1, 0x3 - beq _08132E84 - b _08132F40 -_08132E42: + beq @08132E84 + b @08132F40 +@08132E42: movs r4, 0 ldr r3, =0x02024084 ldr r2, =0x0203ab3c @@ -590687,12 +590687,12 @@ _08132E42: ldrh r0, [r0] ldrh r5, [r5, 0x2] cmp r0, r5 - beq _08132E74 + beq @08132E74 movs r5, 0x58 -_08132E5C: +@08132E5C: adds r4, 0x1 cmp r4, 0x3 - bgt _08132E74 + bgt @08132E74 lsls r1, r4, 1 ldrb r0, [r2] muls r0, r5 @@ -590701,14 +590701,14 @@ _08132E5C: ldrh r0, [r1] ldrh r1, [r7] cmp r0, r1 - bne _08132E5C -_08132E74: + bne @08132E5C +@08132E74: cmp r4, 0x4 - beq _08132F18 - b _08132F28 + beq @08132F18 + b @08132F28 .align 2, 0 .pool -_08132E84: +@08132E84: ldr r3, =0x02024084 ldr r2, =0x0203ab3c ldrb r1, [r2] @@ -590719,26 +590719,26 @@ _08132E84: adds r0, r1, r3 ldrh r0, [r0, 0x28] cmp r0, 0 - bne _08132EA8 + bne @08132EA8 adds r0, r5, 0 - b _08132F1A + b @08132F1A .align 2, 0 .pool -_08132EA8: +@08132EA8: movs r4, 0 adds r3, 0xC adds r0, r1, r3 ldrh r0, [r0] ldrh r5, [r5, 0x2] cmp r0, r5 - beq _08132E74 + beq @08132E74 mov r12, r3 adds r5, r2, 0 movs r3, 0x2 -_08132EBC: +@08132EBC: adds r4, 0x1 cmp r4, 0x3 - bgt _08132E74 + bgt @08132E74 lsls r1, r4, 1 ldrb r0, [r5] adds r2, r3, 0 @@ -590750,9 +590750,9 @@ _08132EBC: ldrh r0, [r1] ldrh r1, [r7] cmp r0, r1 - bne _08132EBC - b _08132E74 -_08132EDC: + bne @08132EBC + b @08132E74 +@08132EDC: movs r4, 0 ldr r3, =0x020244a8 ldr r0, [r3] @@ -590764,14 +590764,14 @@ _08132EDC: ldrh r0, [r1] ldrh r1, [r7] cmp r0, r1 - beq _08132F14 + beq @08132F14 adds r7, r3, 0 adds r5, r2, 0 adds r3, r1, 0 -_08132EFA: +@08132EFA: adds r4, 0x1 cmp r4, 0x3 - bgt _08132F14 + bgt @08132F14 ldr r0, [r7] ldr r2, [r0, 0x18] lsls r1, r4, 1 @@ -590781,19 +590781,19 @@ _08132EFA: adds r2, r1 ldrh r0, [r2] cmp r0, r3 - bne _08132EFA -_08132F14: + bne @08132EFA +@08132F14: cmp r4, 0x4 - bne _08132F28 -_08132F18: + bne @08132F28 +@08132F18: ldr r0, [r6] -_08132F1A: +@08132F1A: adds r0, 0x8 str r0, [r6] - b _08132F40 + b @08132F40 .align 2, 0 .pool -_08132F28: +@08132F28: ldr r2, [r6] ldrb r1, [r2, 0x4] ldrb r0, [r2, 0x5] @@ -590806,14 +590806,14 @@ _08132F28: lsls r0, 24 orrs r1, r0 str r1, [r6] -_08132F40: +@08132F40: pop {r4-r7} pop {r0} bx r0 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] @@ -590821,20 +590821,20 @@ tai40_unk: @ 8132F48 ldrb r0, [r0, 0x1] adds r5, r1, 0 cmp r0, 0x1 - beq _08132F70 + beq @08132F70 cmp r0, 0x1 - bgt _08132F68 + bgt @08132F68 cmp r0, 0 - beq _08132FB4 - b _08133018 + beq @08132FB4 + b @08133018 .align 2, 0 .pool -_08132F68: +@08132F68: cmp r0, 0x2 - beq _08132FB4 + beq @08132FB4 cmp r0, 0x3 - bne _08133018 -_08132F70: + bne @08133018 +@08132F70: movs r3, 0 ldr r2, =0x02024084 ldr r4, =0x0203ab3c @@ -590846,15 +590846,15 @@ _08132F70: ldrh r0, [r0] ldrh r1, [r6] cmp r0, r1 - beq _08132FA6 + beq @08132FA6 adds r7, r4, 0 movs r6, 0x58 adds r4, r2, 0 adds r2, r1, 0 -_08132F90: +@08132F90: adds r3, 0x1 cmp r3, 0x3 - bgt _08132FA6 + bgt @08132FA6 lsls r1, r3, 1 ldrb r0, [r7] muls r0, r6 @@ -590862,14 +590862,14 @@ _08132F90: adds r1, r4 ldrh r0, [r1] cmp r0, r2 - bne _08132F90 -_08132FA6: + bne @08132F90 +@08132FA6: cmp r3, 0x4 - bne _08132FF0 - b _08133000 + bne @08132FF0 + b @08133000 .align 2, 0 .pool -_08132FB4: +@08132FB4: movs r3, 0 ldr r4, =0x020244a8 ldr r0, [r4] @@ -590881,14 +590881,14 @@ _08132FB4: ldrh r0, [r1] ldrh r1, [r6] cmp r0, r1 - beq _08132FEC + beq @08132FEC adds r7, r4, 0 adds r6, r2, 0 adds r4, r1, 0 -_08132FD2: +@08132FD2: adds r3, 0x1 cmp r3, 0x3 - bgt _08132FEC + bgt @08132FEC ldr r0, [r7] ldr r2, [r0, 0x18] lsls r1, r3, 1 @@ -590898,18 +590898,18 @@ _08132FD2: adds r2, r1 ldrh r0, [r2] cmp r0, r4 - bne _08132FD2 -_08132FEC: + bne @08132FD2 +@08132FEC: cmp r3, 0x4 - beq _08133000 -_08132FF0: + beq @08133000 +@08132FF0: ldr r0, [r5] adds r0, 0x8 str r0, [r5] - b _08133018 + b @08133018 .align 2, 0 .pool -_08133000: +@08133000: ldr r2, [r5] ldrb r1, [r2, 0x4] ldrb r0, [r2, 0x5] @@ -590922,34 +590922,34 @@ _08133000: lsls r0, 24 orrs r1, r0 str r1, [r5] -_08133018: +@08133018: pop {r4-r7} pop {r0} bx r0 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] ldrb r0, [r0, 0x1] adds r5, r1, 0 cmp r0, 0x1 - beq _08133044 + beq @08133044 cmp r0, 0x1 - bgt _0813303C + bgt @0813303C cmp r0, 0 - beq _08133090 - b _08133110 + beq @08133090 + b @08133110 .align 2, 0 .pool -_0813303C: +@0813303C: cmp r0, 0x2 - beq _08133090 + beq @08133090 cmp r0, 0x3 - bne _08133110 -_08133044: + bne @08133110 +@08133044: movs r3, 0 ldr r1, =0x02024084 ldr r0, =0x0203ab3c @@ -590960,10 +590960,10 @@ _08133044: adds r1, 0xC adds r2, r0, r1 ldr r4, =0x0203ab38 -_08133058: +@08133058: ldrh r0, [r2] cmp r0, 0 - beq _08133072 + beq @08133072 adds r1, r0, 0 lsls r0, r1, 1 adds r0, r1 @@ -590973,19 +590973,19 @@ _08133058: ldrb r0, [r0] ldrb r1, [r1, 0x2] cmp r0, r1 - beq _0813307A -_08133072: + beq @0813307A +@08133072: adds r2, 0x2 adds r3, 0x1 cmp r3, 0x3 - ble _08133058 -_0813307A: + ble @08133058 +@0813307A: cmp r3, 0x4 - beq _081330DC - b _081330F8 + beq @081330DC + b @081330F8 .align 2, 0 .pool -_08133090: +@08133090: movs r3, 0 ldr r1, =0x02024084 ldr r0, =0x0203ab3c @@ -590998,11 +590998,11 @@ _08133090: muls r0, r2 adds r1, 0xC adds r4, r0, r1 -_081330A8: +@081330A8: lsls r2, r3, 1 ldrh r0, [r4] cmp r0, 0 - beq _081330D0 + beq @081330D0 ldr r0, [r7] ldr r1, [r0, 0x18] ldrb r0, [r6] @@ -591018,23 +591018,23 @@ _081330A8: ldrb r0, [r0] ldrb r1, [r1, 0x2] cmp r0, r1 - beq _081330D8 -_081330D0: + beq @081330D8 +@081330D0: adds r4, 0x2 adds r3, 0x1 cmp r3, 0x3 - ble _081330A8 -_081330D8: + ble @081330A8 +@081330D8: cmp r3, 0x4 - bne _081330F8 -_081330DC: + bne @081330F8 +@081330DC: ldr r0, [r5] adds r0, 0x7 str r0, [r5] - b _08133110 + b @08133110 .align 2, 0 .pool -_081330F8: +@081330F8: ldr r2, [r5] ldrb r1, [r2, 0x3] ldrb r0, [r2, 0x4] @@ -591047,34 +591047,34 @@ _081330F8: lsls r0, 24 orrs r1, r0 str r1, [r5] -_08133110: +@08133110: pop {r4-r7} pop {r0} bx r0 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] ldrb r0, [r0, 0x1] adds r4, r1, 0 cmp r0, 0x1 - beq _0813313C + beq @0813313C cmp r0, 0x1 - bgt _08133134 + bgt @08133134 cmp r0, 0 - beq _08133188 - b _081331F4 + beq @08133188 + b @081331F4 .align 2, 0 .pool -_08133134: +@08133134: cmp r0, 0x2 - beq _08133188 + beq @08133188 cmp r0, 0x3 - bne _081331F4 -_0813313C: + bne @081331F4 +@0813313C: movs r3, 0 ldr r1, =0x02024084 ldr r0, =0x0203ab3c @@ -591085,10 +591085,10 @@ _0813313C: adds r1, 0xC adds r2, r0, r1 ldr r5, =0x0203ab38 -_08133150: +@08133150: ldrh r0, [r2] cmp r0, 0 - beq _0813316A + beq @0813316A adds r1, r0, 0 lsls r0, r1, 1 adds r0, r1 @@ -591098,19 +591098,19 @@ _08133150: ldrb r0, [r0] ldrb r1, [r1, 0x2] cmp r0, r1 - beq _08133172 -_0813316A: + beq @08133172 +@0813316A: adds r2, 0x2 adds r3, 0x1 cmp r3, 0x3 - ble _08133150 -_08133172: + ble @08133150 +@08133172: cmp r3, 0x4 - bne _081331C2 - b _081331DC + bne @081331C2 + b @081331DC .align 2, 0 .pool -_08133188: +@08133188: movs r3, 0 ldr r0, =0x020244a8 ldr r0, [r0] @@ -591121,10 +591121,10 @@ _08133188: lsls r0, 4 adds r2, r0, r1 ldr r5, =0x0203ab38 -_0813319C: +@0813319C: ldrh r0, [r2] cmp r0, 0 - beq _081331B6 + beq @081331B6 adds r1, r0, 0 lsls r0, r1, 1 adds r0, r1 @@ -591134,23 +591134,23 @@ _0813319C: ldrb r0, [r0] ldrb r1, [r1, 0x2] cmp r0, r1 - beq _081331BE -_081331B6: + beq @081331BE +@081331B6: adds r2, 0x2 adds r3, 0x1 cmp r3, 0x3 - ble _0813319C -_081331BE: + ble @0813319C +@081331BE: cmp r3, 0x4 - beq _081331DC -_081331C2: + beq @081331DC +@081331C2: ldr r0, [r4] adds r0, 0x7 str r0, [r4] - b _081331F4 + b @081331F4 .align 2, 0 .pool -_081331DC: +@081331DC: ldr r2, [r4] ldrb r1, [r2, 0x3] ldrb r0, [r2, 0x4] @@ -591163,34 +591163,34 @@ _081331DC: lsls r0, 24 orrs r1, r0 str r1, [r4] -_081331F4: +@081331F4: pop {r4-r6} pop {r0} bx r0 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] ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x1 - bne _08133218 + bne @08133218 ldr r0, =0x0203ab3c - b _0813321A + b @0813321A .align 2, 0 .pool -_08133218: +@08133218: ldr r0, =0x0202420c -_0813321A: +@0813321A: ldrb r3, [r0] adds r4, r5, 0 ldr r2, [r4] ldrb r0, [r2, 0x2] cmp r0, 0 - bne _08133240 + bne @08133240 ldr r0, =0x020242bc lsls r1, r3, 3 subs r1, r3 @@ -591198,18 +591198,18 @@ _0813321A: adds r1, r0 ldrh r0, [r1, 0x4] cmp r0, 0 - beq _08133244 - b _0813325A + beq @08133244 + b @0813325A .align 2, 0 .pool -_08133240: +@08133240: cmp r0, 0x1 - beq _0813324A -_08133244: + beq @0813324A +@08133244: adds r0, r2, 0x7 str r0, [r4] - b _0813327C -_0813324A: + b @0813327C +@0813324A: ldr r0, =0x020242bc lsls r1, r3, 3 subs r1, r3 @@ -591217,8 +591217,8 @@ _0813324A: adds r1, r0 ldrh r0, [r1, 0x6] cmp r0, 0 - beq _08133278 -_0813325A: + beq @08133278 +@0813325A: ldrb r1, [r2, 0x3] ldrb r0, [r2, 0x4] lsls r0, 8 @@ -591230,32 +591230,32 @@ _0813325A: lsls r0, 24 orrs r1, r0 str r1, [r4] - b _0813327C + b @0813327C .align 2, 0 .pool -_08133278: +@08133278: adds r0, r2, 0x7 str r0, [r5] -_0813327C: +@0813327C: pop {r4,r5} pop {r0} bx r0 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] ldrb r0, [r3, 0x1] cmp r0, 0 - beq _0813329C + beq @0813329C cmp r0, 0x1 - beq _081332C8 - b _08133308 + beq @081332C8 + b @08133308 .align 2, 0 .pool -_0813329C: +@0813329C: ldr r2, =0x020242bc ldr r0, =0x02024064 ldrb r1, [r0] @@ -591269,11 +591269,11 @@ _0813329C: ldrh r0, [r0, 0x4] ldrh r1, [r1, 0x2] cmp r0, r1 - beq _081332E4 - b _08133308 + beq @081332E4 + b @08133308 .align 2, 0 .pool -_081332C8: +@081332C8: ldr r2, =0x020242bc ldr r0, =0x02024064 ldrb r1, [r0] @@ -591287,8 +591287,8 @@ _081332C8: ldrh r0, [r0, 0x6] ldrh r1, [r1, 0x2] cmp r0, r1 - bne _08133308 -_081332E4: + bne @08133308 +@081332E4: ldrb r1, [r3, 0x2] ldrb r0, [r3, 0x3] lsls r0, 8 @@ -591300,20 +591300,20 @@ _081332E4: lsls r0, 24 orrs r1, r0 str r1, [r4] - b _0813330C + b @0813330C .align 2, 0 .pool -_08133308: +@08133308: adds r0, r3, 0x6 str r0, [r4] -_0813330C: +@0813330C: pop {r4} pop {r0} bx r0 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] @@ -591327,7 +591327,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] @@ -591345,7 +591345,7 @@ tai46_unk: @ 8133328 lsls r0, 24 lsrs r0, 24 cmp r0, r4 - bcs _08133374 + bcs @08133374 ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -591359,15 +591359,15 @@ tai46_unk: @ 8133328 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _0813337C + b @0813337C .align 2, 0 .pool -_08133374: +@08133374: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_0813337C: +@0813337C: pop {r4} pop {r0} bx r0 @@ -591376,7 +591376,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] @@ -591390,25 +591390,25 @@ 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] ldrb r0, [r0, 0x1] cmp r0, 0x1 - bne _081333B4 + bne @081333B4 ldr r0, =0x0203ab3c - b _081333B6 + b @081333B6 .align 2, 0 .pool -_081333B4: +@081333B4: ldr r0, =0x0202420c -_081333B6: +@081333B6: ldrb r2, [r0] ldr r0, =0x02024064 ldrb r0, [r0] cmp r0, r2 - beq _081333E0 + beq @081333E0 ldr r4, =0x020244a8 ldr r0, [r4] ldr r0, [r0, 0x18] @@ -591417,10 +591417,10 @@ _081333B6: ldrb r0, [r0] bl itemid_get_x12 ldr r1, [r4] - b _081333F2 + b @081333F2 .align 2, 0 .pool -_081333E0: +@081333E0: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r2 @@ -591429,7 +591429,7 @@ _081333E0: bl itemid_get_x12 ldr r1, =0x020244a8 ldr r1, [r1] -_081333F2: +@081333F2: ldr r1, [r1, 0x14] lsls r0, 24 lsrs r0, 24 @@ -591446,7 +591446,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] @@ -591461,30 +591461,30 @@ tai62_unk: @ 8133414 ands r1, r0 ands r0, r2 cmp r1, r0 - bne _0813344C + bne @0813344C ldr r1, =0x02024084 movs r0, 0x58 muls r0, r3 adds r0, r1 ldrh r3, [r0, 0x2E] - b _08133458 + b @08133458 .align 2, 0 .pool -_0813344C: +@0813344C: ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x18] adds r0, 0x44 adds r0, r3 ldrb r3, [r0] -_08133458: +@08133458: ldr r4, =0x0203ab38 ldr r2, [r4] ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] orrs r0, r1 cmp r0, r3 - bne _08133488 + bne @08133488 ldrb r1, [r2, 0x4] ldrb r0, [r2, 0x5] lsls r0, 8 @@ -591496,34 +591496,34 @@ _08133458: lsls r0, 24 orrs r1, r0 str r1, [r4] - b _0813348E + b @0813348E .align 2, 0 .pool -_08133488: +@08133488: adds r0, r2, 0 adds r0, 0x8 str r0, [r4] -_0813348E: +@0813348E: pop {r4} pop {r0} bx r0 thumb_func_end tai62_unk thumb_func_start tai49_unk -tai49_unk: @ 8133494 +tai49_unk: ; 8133494 push {lr} ldr r0, =0x0203ab38 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x1 - bne _081334AC + bne @081334AC ldr r0, =0x0203ab3c - b _081334AE + b @081334AE .align 2, 0 .pool -_081334AC: +@081334AC: ldr r0, =0x0202420c -_081334AE: +@081334AE: ldrb r1, [r0] ldr r2, =0x02024084 movs r0, 0x58 @@ -591551,21 +591551,21 @@ _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] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 - bne _08133508 + bne @08133508 ldr r0, =0x0203ab3c - b _0813350A + b @0813350A .align 2, 0 .pool -_08133508: +@08133508: ldr r0, =0x0202420c -_0813350A: +@0813350A: ldrb r3, [r0] ldr r0, =0x020244a8 ldr r0, [r0] @@ -591588,21 +591588,21 @@ _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] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 - bne _08133554 + bne @08133554 ldr r0, =0x0203ab3c - b _08133556 + b @08133556 .align 2, 0 .pool -_08133554: +@08133554: ldr r0, =0x0202420c -_08133556: +@08133556: ldrb r3, [r0] ldr r0, =0x020244a8 ldr r0, [r0] @@ -591625,7 +591625,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] @@ -591644,21 +591644,21 @@ 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] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 - bne _081335C8 + bne @081335C8 ldr r0, =0x0203ab3c - b _081335CA + b @081335CA .align 2, 0 .pool -_081335C8: +@081335C8: ldr r0, =0x0202420c -_081335CA: +@081335CA: ldrb r3, [r0] ldr r0, =0x020244a8 ldr r0, [r0] @@ -591681,7 +591681,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] @@ -591703,7 +591703,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] @@ -591725,7 +591725,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] @@ -591747,21 +591747,21 @@ 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] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 - bne _08133698 + bne @08133698 ldr r0, =0x0203ab3c - b _0813369A + b @0813369A .align 2, 0 .pool -_08133698: +@08133698: ldr r0, =0x0202420c -_0813369A: +@0813369A: ldrb r3, [r0] ldr r0, =0x020244a8 ldr r0, [r0] @@ -591784,37 +591784,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] @@ -591840,7 +591840,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] @@ -591860,12 +591860,12 @@ 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 cmp r0, 0 - bne _0813374A + bne @0813374A ldr r0, =0x020244a8 ldr r0, [r0] ldr r2, [r0, 0x14] @@ -591873,7 +591873,7 @@ dp15_return: @ 8133730 movs r0, 0x1 orrs r0, r1 strb r0, [r2, 0x10] -_0813374A: +@0813374A: pop {r0} bx r0 .align 2, 0 @@ -591881,25 +591881,25 @@ _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] ldrb r0, [r4, 0x1] cmp r0, 0x1 - beq _081337A8 + beq @081337A8 cmp r0, 0x1 - bgt _08133770 + bgt @08133770 cmp r0, 0 - beq _08133776 - b _08133824 + beq @08133776 + b @08133824 .align 2, 0 .pool -_08133770: +@08133770: cmp r0, 0x2 - beq _081337D8 - b _08133824 -_08133776: + beq @081337D8 + b @08133824 +@08133776: ldr r3, =0x02024084 ldr r0, =0x0203ab3c ldrb r0, [r0] @@ -591916,11 +591916,11 @@ _08133776: ldrb r1, [r1] ldrb r0, [r0] cmp r1, r0 - bhi _081337FA - b _08133820 + bhi @081337FA + b @08133820 .align 2, 0 .pool -_081337A8: +@081337A8: ldr r3, =0x02024084 ldr r0, =0x0203ab3c ldrb r0, [r0] @@ -591937,11 +591937,11 @@ _081337A8: ldrb r1, [r1] ldrb r0, [r0] cmp r1, r0 - bcc _081337FA - b _08133820 + bcc @081337FA + b @08133820 .align 2, 0 .pool -_081337D8: +@081337D8: ldr r3, =0x02024084 ldr r0, =0x0203ab3c ldrb r0, [r0] @@ -591958,8 +591958,8 @@ _081337D8: ldrb r1, [r1] ldrb r0, [r0] cmp r1, r0 - bne _08133820 -_081337FA: + bne @08133820 +@081337FA: ldrb r1, [r4, 0x2] ldrb r0, [r4, 0x3] lsls r0, 8 @@ -591971,20 +591971,20 @@ _081337FA: lsls r0, 24 orrs r1, r0 str r1, [r5] - b _08133824 + b @08133824 .align 2, 0 .pool -_08133820: +@08133820: adds r0, r4, 0x6 str r0, [r5] -_08133824: +@08133824: pop {r4,r5} pop {r0} bx r0 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 @@ -591996,7 +591996,7 @@ tai5C_unk: @ 813382C ldrb r0, [r0, 0x13] lsls r0, 28 cmp r0, 0 - beq _0813386C + beq @0813386C ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -592010,15 +592010,15 @@ tai5C_unk: @ 813382C lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08133874 + b @08133874 .align 2, 0 .pool -_0813386C: +@0813386C: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_08133874: +@08133874: pop {r0} bx r0 .align 2, 0 @@ -592026,7 +592026,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 @@ -592038,7 +592038,7 @@ tai5D_unk: @ 813387C ldrb r0, [r0, 0x13] lsls r0, 28 cmp r0, 0 - bne _081338BC + bne @081338BC ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -592052,15 +592052,15 @@ tai5D_unk: @ 813387C lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081338C4 + b @081338C4 .align 2, 0 .pool -_081338BC: +@081338BC: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_081338C4: +@081338C4: pop {r0} bx r0 .align 2, 0 @@ -592068,7 +592068,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] @@ -592079,7 +592079,7 @@ tai5E_unk: @ 81338CC ands r1, r3 ands r0, r2 cmp r1, r0 - bne _0813390C + bne @0813390C ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -592093,15 +592093,15 @@ tai5E_unk: @ 81338CC lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08133914 + b @08133914 .align 2, 0 .pool -_0813390C: +@0813390C: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_08133914: +@08133914: pop {r0} bx r0 .align 2, 0 @@ -592109,7 +592109,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] @@ -592125,7 +592125,7 @@ tai61_unk: @ 813391C movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08133960 + beq @08133960 ldr r2, [r4] ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] @@ -592138,21 +592138,21 @@ tai61_unk: @ 813391C lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08133966 + b @08133966 .align 2, 0 .pool -_08133960: +@08133960: ldr r0, [r4] adds r0, 0x6 str r0, [r4] -_08133966: +@08133966: pop {r4} pop {r0} bx r0 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] @@ -592174,7 +592174,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] @@ -592195,7 +592195,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] @@ -592204,12 +592204,12 @@ b_mc_stack_pop_cursor: @ 81339B8 adds r1, 0x20 ldrb r0, [r1] cmp r0, 0 - bne _081339D4 + bne @081339D4 movs r0, 0 - b _081339EE + b @081339EE .align 2, 0 .pool -_081339D4: +@081339D4: subs r0, 0x1 strb r0, [r1] ldr r2, =0x0203ab38 @@ -592223,7 +592223,7 @@ _081339D4: ldr r0, [r1] str r0, [r2] movs r0, 0x1 -_081339EE: +@081339EE: pop {r1} bx r1 .align 2, 0 @@ -592231,7 +592231,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] @@ -592245,7 +592245,7 @@ sub_81339F8: @ 81339F8 strb r2, [r1] movs r4, 0 ldr r6, =0x085b09e4 -_08133A12: +@08133A12: movs r0, 0xB muls r0, r4 adds r0, 0x5 @@ -592269,7 +592269,7 @@ _08133A12: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _08133A12 + bls @08133A12 pop {r4-r6} pop {r0} bx r0 @@ -592278,7 +592278,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 @@ -592291,7 +592291,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 @@ -592327,18 +592327,18 @@ sub_8133A78: @ 8133A78 movs r5, 0 ldr r0, =0x00002e29 adds r4, r0 -_08133AC2: +@08133AC2: mov r0, r9 adds r0, 0x1 adds r1, r0, r5 ldrb r0, [r1] cmp r0, 0x78 - bls _08133AF0 + bls @08133AF0 mov r0, r8 - b _08133B00 + b @08133B00 .align 2, 0 .pool -_08133AF0: +@08133AF0: ldrb r1, [r1] lsls r1, 5 ldr r0, =0x085a5c09 @@ -592346,16 +592346,16 @@ _08133AF0: movs r0, 0x1 movs r2, 0 bl font_get_width_of_string -_08133B00: +@08133B00: cmp r0, r6 - ble _08133B06 + ble @08133B06 adds r6, r0, 0 -_08133B06: +@08133B06: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _08133AC2 + bls @08133AC2 adds r0, r6, 0 bl convert_pixel_width_to_tile_width lsls r0, 24 @@ -592375,11 +592375,11 @@ _08133B06: movs r3, 0xE bl SetWindowBorderStyle movs r5, 0 -_08133B3C: +@08133B3C: adds r1, r4, r5 ldrb r0, [r1] cmp r0, 0x78 - bls _08133B70 + bls @08133B70 ldrb r0, [r7, 0x6] lsls r1, r5, 4 adds r1, 0x1 @@ -592394,10 +592394,10 @@ _08133B3C: ldr r2, =0x085e8d38 movs r3, 0x8 bl Print - b _08133B94 + b @08133B94 .align 2, 0 .pool -_08133B70: +@08133B70: ldrb r0, [r7, 0x6] ldrb r2, [r1] lsls r2, 5 @@ -592415,12 +592415,12 @@ _08133B70: movs r1, 0x1 movs r3, 0x8 bl Print -_08133B94: +@08133B94: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _08133B3C + bls @08133B3C ldrb r0, [r7, 0x6] ldr r2, =0x085eb7ea lsls r1, r5, 4 @@ -592453,7 +592453,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 @@ -592465,18 +592465,18 @@ sub_8133BE4: @ 8133BE4 ldr r1, =0x03005e08 adds r4, r0, r1 cmp r2, 0x78 - bls _08133C14 + bls @08133C14 ldr r1, =0x020375e0 ldr r2, =0x0000ffff adds r0, r2, 0 strh r0, [r1] - b _08133C18 + b @08133C18 .align 2, 0 .pool -_08133C14: +@08133C14: ldr r0, =0x020375e0 strh r2, [r0] -_08133C18: +@08133C18: ldrb r0, [r4, 0x6] movs r1, 0 bl sub_8198070 @@ -592497,7 +592497,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 @@ -592512,26 +592512,26 @@ sub_8133C48: @ 8133C48 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _08133C80 + beq @08133C80 cmp r1, r0 - bgt _08133C7C + bgt @08133C7C subs r0, 0x1 cmp r1, r0 - beq _08133CCA - b _08133C90 + beq @08133CCA + b @08133C90 .align 2, 0 .pool -_08133C7C: +@08133C7C: cmp r1, 0x4 - bne _08133C90 -_08133C80: + bne @08133C90 +@08133C80: movs r0, 0x5 bl audio_play adds r0, r7, 0 movs r1, 0 bl sub_8133BE4 - b _08133CCA -_08133C90: + b @08133CCA +@08133C90: movs r0, 0x5 bl audio_play ldr r0, =0x020375e2 @@ -592557,7 +592557,7 @@ _08133C90: ldrb r1, [r0] adds r0, r7, 0 bl sub_8133BE4 -_08133CCA: +@08133CCA: pop {r4-r7} pop {r0} bx r0 @@ -592566,7 +592566,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 @@ -592580,31 +592580,31 @@ 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 -_08133CFA: +@08133CFA: adds r0, r4, 0 bl sub_8161AD0 lsls r0, 24 cmp r0, 0 - beq _08133D10 + beq @08133D10 movs r0, 0 strh r0, [r5] - b _08133D20 + b @08133D20 .align 2, 0 .pool -_08133D10: +@08133D10: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bls _08133CFA + bls @08133CFA ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] -_08133D20: +@08133D20: pop {r4,r5} pop {r0} bx r0 @@ -592613,7 +592613,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 @@ -592630,7 +592630,7 @@ sub_8133D2C: @ 8133D2C ldrb r1, [r2, 0x13] ldrb r0, [r0, 0x13] cmp r1, r0 - beq _08133D72 + beq @08133D72 adds r0, r1, 0 bl sub_81618D0 lsls r0, 24 @@ -592638,7 +592638,7 @@ sub_8133D2C: @ 8133D2C movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _08133D72 + bne @08133D72 ldr r0, =0x02021dc4 ldrh r1, [r5] lsls r1, 5 @@ -592647,7 +592647,7 @@ sub_8133D2C: @ 8133D2C bl sub_8127250 movs r0, 0x1 strh r0, [r6] -_08133D72: +@08133D72: pop {r4-r6} pop {r0} bx r0 @@ -592656,7 +592656,7 @@ _08133D72: thumb_func_end sub_8133D2C thumb_func_start sub_8133D8C -sub_8133D8C: @ 8133D8C +sub_8133D8C: ; 8133D8C push {lr} ldr r0, =sub_8127208 + 1 movs r1, 0 @@ -592668,7 +592668,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 @@ -592676,7 +592676,7 @@ sub_8133DA0: @ 8133DA0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08133DFC + bne @08133DFC ldr r5, =0x020375e4 ldr r0, =0x0203a172 ldrb r1, [r0] @@ -592697,15 +592697,15 @@ sub_8133DA0: @ 8133DA0 lsls r1, 5 adds r1, r4 bl gf_strcpy - b _08133E04 + b @08133E04 .align 2, 0 .pool -_08133DFC: +@08133DFC: ldr r1, =0x020375e4 ldr r2, =0x0000ffff adds r0, r2, 0 strh r0, [r1] -_08133E04: +@08133E04: adds r0, r6, 0 bl remove_task bl script_env_2_enable_and_set_ctx_running @@ -592717,7 +592717,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 @@ -592733,7 +592733,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} @@ -592785,7 +592785,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 + 1 movs r1, 0 @@ -592800,14 +592800,14 @@ 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 cmp r1, 0x3 - bls _08133EE8 + bls @08133EE8 movs r1, 0 -_08133EE8: +@08133EE8: ldr r0, =0x085b1df8 lsls r1, 1 adds r1, r0 @@ -592819,7 +592819,7 @@ _08133EE8: thumb_func_end sub_8133EDC thumb_func_start sub_8133EF8 -sub_8133EF8: @ 8133EF8 +sub_8133EF8: ; 8133EF8 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -592829,7 +592829,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 @@ -593094,7 +593094,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 run_active_tasks bl call_obj_callbacks @@ -593106,7 +593106,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 @@ -593148,7 +593148,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 @@ -593164,7 +593164,7 @@ sub_813425C: @ 813425C movs r0, 0x1 ands r0, r3 cmp r0, 0 - beq _081342F8 + beq @081342F8 bl sub_8134604 ldr r0, =0x085b1f40 ldr r1, =0x085b1dec @@ -593206,31 +593206,31 @@ sub_813425C: @ 813425C strh r0, [r6, 0xA] ldr r0, =sub_8134340 + 1 str r0, [r6] - b _08134334 + b @08134334 .align 2, 0 .pool -_081342F8: +@081342F8: movs r0, 0x20 ands r0, r3 cmp r0, 0 - beq _08134314 + beq @08134314 cmp r4, 0 - beq _08134314 + beq @08134314 subs r0, r7, 0x1 strh r0, [r6, 0x8] ldr r0, =sub_8134640 + 1 str r0, [r6] - b _08134334 + b @08134334 .align 2, 0 .pool -_08134314: +@08134314: ldrh r1, [r1, 0x2E] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08134334 + beq @08134334 cmp r4, 0x1 - bhi _08134334 + bhi @08134334 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -593240,7 +593240,7 @@ _08134314: strh r1, [r0, 0x8] ldr r1, =sub_8134640 + 1 str r1, [r0] -_08134334: +@08134334: pop {r4-r7} pop {r0} bx r0 @@ -593249,7 +593249,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 @@ -593270,18 +593270,18 @@ sub_8134340: @ 8134340 ldrb r0, [r0] lsls r0, 26 cmp r0, 0 - bge _0813437E + bge @0813437E movs r3, 0x20 ldrsh r0, [r1, r3] cmp r0, 0x78 - bne _0813437E + bne @0813437E movs r3, 0x22 ldrsh r0, [r1, r3] cmp r0, 0x40 - bne _0813437E + bne @0813437E ldr r0, =sub_8134390 + 1 str r0, [r2] -_0813437E: +@0813437E: pop {r0} bx r0 .align 2, 0 @@ -593289,7 +593289,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 @@ -593336,7 +593336,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 @@ -593344,19 +593344,19 @@ sub_8134400: @ 8134400 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _08134426 + beq @08134426 cmp r1, 0 - bgt _08134420 + bgt @08134420 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _08134450 - b _0813449A -_08134420: + beq @08134450 + b @0813449A +@08134420: cmp r1, 0x1 - beq _08134450 - b _0813449A -_08134426: + beq @08134450 + b @0813449A +@08134426: ldr r2, =0x020375f0 ldr r1, =0x03005e00 lsls r0, r4, 2 @@ -593369,10 +593369,10 @@ _08134426: ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 - b _0813449A + b @0813449A .align 2, 0 .pool -_08134450: +@08134450: movs r0, 0x5 bl audio_play ldr r0, =0x03005e00 @@ -593405,7 +593405,7 @@ _08134450: bl obj_delete_and_free_tiles ldr r0, =sub_81344AC + 1 str r0, [r5] -_0813449A: +@0813449A: pop {r4-r6} pop {r0} bx r0 @@ -593414,7 +593414,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 @@ -593430,7 +593430,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 @@ -593566,7 +593566,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] @@ -593594,7 +593594,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 @@ -593615,7 +593615,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 @@ -593636,7 +593636,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 @@ -593675,7 +593675,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, =0x085b1e28 @@ -593723,7 +593723,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 @@ -593738,64 +593738,64 @@ sub_813473C: @ 813473C movs r2, 0x30 ldrsh r0, [r3, r2] cmp r1, r0 - bne _08134768 + bne @08134768 adds r0, r3, 0 movs r1, 0x1 bl obj_anim_image_start_if_different - b _08134770 + b @08134770 .align 2, 0 .pool -_08134768: +@08134768: adds r0, r3, 0 movs r1, 0 bl obj_anim_image_start_if_different -_08134770: +@08134770: pop {r0} bx r0 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] movs r3, 0x20 ldrsh r0, [r1, r3] cmp r0, 0x78 - ble _08134786 + ble @08134786 subs r0, r2, 0x4 strh r0, [r1, 0x20] -_08134786: +@08134786: ldrh r2, [r1, 0x20] movs r3, 0x20 ldrsh r0, [r1, r3] cmp r0, 0x77 - bgt _08134794 + bgt @08134794 adds r0, r2, 0x4 strh r0, [r1, 0x20] -_08134794: +@08134794: ldrh r2, [r1, 0x22] movs r3, 0x22 ldrsh r0, [r1, r3] cmp r0, 0x40 - ble _081347A2 + ble @081347A2 subs r0, r2, 0x2 strh r0, [r1, 0x22] -_081347A2: +@081347A2: ldrh r2, [r1, 0x22] movs r3, 0x22 ldrsh r0, [r1, r3] cmp r0, 0x3F - bgt _081347B0 + bgt @081347B0 adds r0, r2, 0x2 strh r0, [r1, 0x22] -_081347B0: +@081347B0: pop {r0} bx r0 thumb_func_end sub_8134774 thumb_func_start sub_81347B4 -sub_81347B4: @ 81347B4 +sub_81347B4: ; 81347B4 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -593805,7 +593805,7 @@ sub_81347B4: @ 81347B4 thumb_func_end sub_81347B4 thumb_func_start sub_81347C8 -sub_81347C8: @ 81347C8 +sub_81347C8: ; 81347C8 push {r4-r7,lr} mov r7, r8 push {r7} @@ -593874,7 +593874,7 @@ sub_81347C8: @ 81347C8 movs r0, 0x81 lsls r0, 24 mov r12, r0 -_0813486C: +@0813486C: strh r6, [r2] mov r0, sp str r0, [r1] @@ -593884,7 +593884,7 @@ _0813486C: adds r3, r5 subs r4, r5 cmp r4, r5 - bhi _0813486C + bhi @0813486C strh r6, [r2] mov r2, sp str r2, [r1] @@ -593929,20 +593929,20 @@ _0813486C: ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 - bne _081348FC + bne @081348FC ldr r0, =0x08dcc01c movs r1, 0 movs r2, 0x20 bl gpu_pal_apply - b _08134906 + b @08134906 .align 2, 0 .pool -_081348FC: +@081348FC: ldr r0, =0x08dcc03c movs r1, 0 movs r2, 0x20 bl gpu_pal_apply -_08134906: +@08134906: bl sub_8098C64 movs r1, 0xE0 movs r2, 0x20 @@ -593986,7 +593986,7 @@ _08134906: thumb_func_end sub_81347C8 thumb_func_start sub_813498C -sub_813498C: @ 813498C +sub_813498C: ; 813498C push {lr} sub sp, 0x4 movs r0, 0x1 @@ -594029,7 +594029,7 @@ sub_813498C: @ 813498C thumb_func_end sub_813498C thumb_func_start sub_81349F4 -sub_81349F4: @ 81349F4 +sub_81349F4: ; 81349F4 push {r4-r6,lr} mov r6, r10 mov r5, r9 @@ -594171,7 +594171,7 @@ sub_81349F4: @ 81349F4 thumb_func_end sub_81349F4 thumb_func_start sub_8134B44 -sub_8134B44: @ 8134B44 +sub_8134B44: ; 8134B44 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -594197,20 +594197,20 @@ sub_8134B44: @ 8134B44 movs r1, 0x12 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08134B9C + bne @08134B9C movs r2, 0x2D mov r10, r2 movs r0, 0x5A str r0, [sp, 0xC] - b _08134BA4 + b @08134BA4 .align 2, 0 .pool -_08134B9C: +@08134B9C: movs r1, 0x5A mov r10, r1 movs r2, 0x87 str r2, [sp, 0xC] -_08134BA4: +@08134BA4: ldr r0, =0x085b2250 movs r1, 0x78 movs r2, 0x50 @@ -594320,7 +594320,7 @@ _08134BA4: thumb_func_end sub_8134B44 thumb_func_start sub_8134C9C -sub_8134C9C: @ 8134C9C +sub_8134C9C: ; 8134C9C push {lr} bl run_active_tasks bl call_obj_callbacks @@ -594332,7 +594332,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 @@ -594341,7 +594341,7 @@ sub_8134CB8: @ 8134CB8 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08134CD8 + bne @08134CD8 ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -594349,7 +594349,7 @@ sub_8134CB8: @ 8134CB8 adds r1, r0 ldr r0, =sub_8134CE8 + 1 str r0, [r1] -_08134CD8: +@08134CD8: pop {r0} bx r0 .align 2, 0 @@ -594357,7 +594357,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 @@ -594372,16 +594372,16 @@ sub_8134CE8: @ 8134CE8 bl __modsi3 lsls r0, 16 cmp r0, 0 - beq _08134D1C + beq @08134D1C ldrh r0, [r5, 0x8] ldrb r1, [r5, 0x10] ldrb r2, [r5, 0x14] bl sub_8134FFC strh r0, [r5, 0x8] - b _08134DBE + b @08134DBE .align 2, 0 .pool -_08134D1C: +@08134D1C: movs r2, 0xE ldrsh r1, [r5, r2] lsls r0, r1, 1 @@ -594413,42 +594413,42 @@ _08134D1C: adds r1, r3, 0 ands r1, r0 cmp r1, 0 - beq _08134D70 + beq @08134D70 ldr r0, =sub_8134DC4 + 1 str r0, [r5] - b _08134DBE + b @08134DBE .align 2, 0 .pool -_08134D70: +@08134D70: strh r1, [r5, 0x10] ldrh r1, [r2, 0x2C] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _08134D7E + beq @08134D7E strh r3, [r5, 0x10] -_08134D7E: +@08134D7E: ldrh r1, [r2, 0x2C] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08134D8C + beq @08134D8C movs r0, 0x2 strh r0, [r5, 0x10] -_08134D8C: +@08134D8C: ldrh r1, [r5, 0x10] movs r2, 0x10 ldrsh r0, [r5, r2] cmp r0, 0 - beq _08134DBC + beq @08134DBC ldrh r2, [r5, 0x14] movs r3, 0x14 ldrsh r0, [r5, r3] cmp r0, 0xFE - bgt _08134DA4 + bgt @08134DA4 adds r0, r2, 0x1 strh r0, [r5, 0x14] -_08134DA4: +@08134DA4: ldrh r0, [r5, 0x8] lsls r1, 24 lsrs r1, 24 @@ -594458,17 +594458,17 @@ _08134DA4: ldrb r1, [r5, 0x10] adds r0, r6, 0 bl sub_813504C - b _08134DBE -_08134DBC: + b @08134DBE +@08134DBC: strh r0, [r5, 0x14] -_08134DBE: +@08134DBE: pop {r4-r6} pop {r0} bx r0 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 @@ -594515,7 +594515,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 @@ -594523,19 +594523,19 @@ c3_80BF560: @ 8134E30 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _08134E56 + beq @08134E56 cmp r1, 0 - bgt _08134E50 + bgt @08134E50 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _08134E74 - b _08134E96 -_08134E50: + beq @08134E74 + b @08134E96 +@08134E50: cmp r1, 0x1 - beq _08134E74 - b _08134E96 -_08134E56: + beq @08134E74 + b @08134E96 +@08134E56: movs r0, 0x5 bl audio_play ldr r0, =0x03005e00 @@ -594544,10 +594544,10 @@ _08134E56: lsls r1, 3 adds r1, r0 ldr r0, =sub_8134EA4 + 1 - b _08134E94 + b @08134E94 .align 2, 0 .pool -_08134E74: +@08134E74: movs r0, 0x5 bl audio_play movs r0, 0 @@ -594561,9 +594561,9 @@ _08134E74: lsls r1, 3 adds r1, r0 ldr r0, =sub_8134CE8 + 1 -_08134E94: +@08134E94: str r0, [r1] -_08134E96: +@08134E96: pop {r4} pop {r0} bx r0 @@ -594572,7 +594572,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 @@ -594605,19 +594605,19 @@ 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] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08134F02 + bne @08134F02 bl Window_FreeMemory ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 -_08134F02: +@08134F02: pop {r0} bx r0 .align 2, 0 @@ -594625,7 +594625,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 @@ -594634,7 +594634,7 @@ sub_8134F10: @ 8134F10 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08134F30 + bne @08134F30 ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -594642,7 +594642,7 @@ sub_8134F10: @ 8134F10 adds r1, r0 ldr r0, =sub_8134F40 + 1 str r0, [r1] -_08134F30: +@08134F30: pop {r0} bx r0 .align 2, 0 @@ -594650,7 +594650,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 @@ -594661,7 +594661,7 @@ sub_8134F40: @ 8134F40 movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _08134F66 + beq @08134F66 ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -594669,7 +594669,7 @@ sub_8134F40: @ 8134F40 adds r1, r0 ldr r0, =sub_8134F78 + 1 str r0, [r1] -_08134F66: +@08134F66: pop {r4} pop {r0} bx r0 @@ -594678,7 +594678,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 @@ -594707,18 +594707,18 @@ 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] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08134FC6 + bne @08134FC6 ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 -_08134FC6: +@08134FC6: pop {r0} bx r0 .align 2, 0 @@ -594726,34 +594726,34 @@ _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 adds r1, r0, 0 cmp r0, 0x3C - bls _08134FE4 + bls @08134FE4 movs r0, 0x6 - b _08134FF6 -_08134FE4: + b @08134FF6 +@08134FE4: cmp r0, 0x1E - bls _08134FEC + bls @08134FEC movs r0, 0x3 - b _08134FF6 -_08134FEC: + b @08134FF6 +@08134FEC: cmp r1, 0xA - bhi _08134FF4 + bhi @08134FF4 movs r0, 0x1 - b _08134FF6 -_08134FF4: + b @08134FF6 +@08134FF4: movs r0, 0x2 -_08134FF6: +@08134FF6: pop {r1} bx r1 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 @@ -594766,35 +594766,35 @@ sub_8134FFC: @ 8134FFC lsls r0, 24 lsrs r1, r0, 24 cmp r5, 0x1 - beq _0813501E + beq @0813501E cmp r5, 0x2 - beq _08135030 - b _08135044 -_0813501E: + beq @08135030 + b @08135044 +@0813501E: cmp r4, 0 - beq _08135026 + beq @08135026 subs r0, r4, r1 - b _0813503C -_08135026: + b @0813503C +@08135026: movs r2, 0xB4 lsls r2, 1 adds r0, r2, 0 subs r0, r1 - b _0813503C -_08135030: + b @0813503C +@08135030: movs r0, 0xB4 lsls r0, 1 subs r0, r1 cmp r4, r0 - bge _08135042 + bge @08135042 adds r0, r4, r1 -_0813503C: +@0813503C: lsls r0, 16 lsrs r4, r0, 16 - b _08135044 -_08135042: + b @08135044 +@08135042: movs r4, 0 -_08135044: +@08135044: adds r0, r4, 0 pop {r4,r5} pop {r1} @@ -594802,18 +594802,18 @@ _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 lsls r1, 24 lsrs r4, r1, 24 cmp r4, 0x1 - beq _08135060 + beq @08135060 cmp r4, 0x2 - beq _081350A0 - b _081350DE -_08135060: + beq @081350A0 + b @081350DE +@08135060: ldr r0, =0x03005e00 lsls r1, r3, 2 adds r1, r3 @@ -594823,31 +594823,31 @@ _08135060: movs r5, 0xE ldrsh r0, [r1, r5] cmp r0, 0 - ble _08135080 + ble @08135080 subs r0, r2, 0x1 strh r0, [r1, 0xE] - b _081350DE + b @081350DE .align 2, 0 .pool -_08135080: +@08135080: movs r0, 0x3B strh r0, [r1, 0xE] ldrh r2, [r1, 0xC] movs r6, 0xC ldrsh r0, [r1, r6] cmp r0, 0 - ble _08135092 + ble @08135092 subs r0, r2, 0x1 - b _08135094 -_08135092: + b @08135094 +@08135092: movs r0, 0x17 -_08135094: +@08135094: strh r0, [r1, 0xC] adds r0, r3, 0 adds r1, r4, 0 bl sub_81350E8 - b _081350DE -_081350A0: + b @081350DE +@081350A0: ldr r0, =0x03005e00 lsls r1, r3, 2 adds r1, r3 @@ -594857,30 +594857,30 @@ _081350A0: movs r5, 0xE ldrsh r0, [r1, r5] cmp r0, 0x3A - bgt _081350C0 + bgt @081350C0 adds r0, r2, 0x1 strh r0, [r1, 0xE] - b _081350DE + b @081350DE .align 2, 0 .pool -_081350C0: +@081350C0: movs r5, 0 strh r5, [r1, 0xE] ldrh r2, [r1, 0xC] movs r6, 0xC ldrsh r0, [r1, r6] cmp r0, 0x16 - bgt _081350D4 + bgt @081350D4 adds r0, r2, 0x1 strh r0, [r1, 0xC] - b _081350D6 -_081350D4: + b @081350D6 +@081350D4: strh r5, [r1, 0xC] -_081350D6: +@081350D6: adds r0, r3, 0 adds r1, r4, 0 bl sub_81350E8 -_081350DE: +@081350DE: movs r0, 0 pop {r4-r6} pop {r1} @@ -594888,7 +594888,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 @@ -594901,39 +594901,39 @@ sub_81350E8: @ 81350E8 adds r1, r2 ldrb r0, [r1, 0xC] cmp r3, 0x1 - beq _0813510C + beq @0813510C cmp r3, 0x2 - beq _0813511E - b _0813512A + beq @0813511E + b @0813512A .align 2, 0 .pool -_0813510C: +@0813510C: cmp r0, 0xB - beq _08135116 + beq @08135116 cmp r0, 0x17 - beq _0813511A - b _0813512A -_08135116: + beq @0813511A + b @0813512A +@08135116: movs r0, 0 - b _08135128 -_0813511A: + b @08135128 +@0813511A: strh r3, [r1, 0x12] - b _0813512A -_0813511E: + b @0813512A +@0813511E: cmp r0, 0 - beq _08135128 + beq @08135128 cmp r0, 0xC - bne _0813512A + bne @0813512A movs r0, 0x1 -_08135128: +@08135128: strh r0, [r1, 0x12] -_0813512A: +@0813512A: pop {r0} bx r0 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 @@ -594979,14 +594979,14 @@ sub_8135130: @ 8135130 movs r0, 0x2 ldrsb r0, [r5, r0] cmp r0, 0xB - bgt _081351A0 + bgt @081351A0 movs r0, 0 - b _081351A2 + b @081351A2 .align 2, 0 .pool -_081351A0: +@081351A0: movs r0, 0x1 -_081351A2: +@081351A2: strh r0, [r6, 0x12] pop {r4-r6} pop {r0} @@ -594994,7 +594994,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 @@ -595012,9 +595012,9 @@ sub_81351AC: @ 81351AC lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _081351D4 + bge @081351D4 adds r0, 0xF -_081351D4: +@081351D4: lsls r0, 12 lsrs r5, r0, 16 adds r0, r4, 0 @@ -595022,9 +595022,9 @@ _081351D4: lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _081351E8 + bge @081351E8 adds r0, 0xF -_081351E8: +@081351E8: lsls r1, r0, 12 lsrs r1, 16 lsls r3, r5, 16 @@ -595049,19 +595049,19 @@ _081351E8: lsls r0, 16 lsrs r2, r0, 16 cmp r3, 0x80 - bls _08135224 + bls @08135224 movs r1, 0xFF lsls r1, 8 adds r0, r1, 0 orrs r3, r0 -_08135224: +@08135224: cmp r2, 0x80 - bls _08135230 + bls @08135230 movs r1, 0xFF lsls r1, 8 adds r0, r1, 0 orrs r2, r0 -_08135230: +@08135230: strh r3, [r6, 0x24] strh r2, [r6, 0x26] add sp, 0x4 @@ -595073,7 +595073,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 @@ -595091,9 +595091,9 @@ sub_8135244: @ 8135244 lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _0813526C + bge @0813526C adds r0, 0xF -_0813526C: +@0813526C: lsls r0, 12 lsrs r5, r0, 16 adds r0, r4, 0 @@ -595101,9 +595101,9 @@ _0813526C: lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _08135280 + bge @08135280 adds r0, 0xF -_08135280: +@08135280: lsls r1, r0, 12 lsrs r1, 16 lsls r3, r5, 16 @@ -595128,19 +595128,19 @@ _08135280: lsls r0, 16 lsrs r2, r0, 16 cmp r3, 0x80 - bls _081352BC + bls @081352BC movs r1, 0xFF lsls r1, 8 adds r0, r1, 0 orrs r3, r0 -_081352BC: +@081352BC: cmp r2, 0x80 - bls _081352C8 + bls @081352C8 movs r1, 0xFF lsls r1, 8 adds r0, r1, 0 orrs r2, r0 -_081352C8: +@081352C8: strh r3, [r6, 0x24] strh r2, [r6, 0x26] add sp, 0x4 @@ -595152,7 +595152,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 @@ -595165,46 +595165,46 @@ sub_81352DC: @ 81352DC movs r1, 0x12 ldrsh r0, [r0, r1] cmp r0, 0 - beq _0813531C + beq @0813531C ldrh r1, [r4, 0x30] adds r0, r1, 0 subs r0, 0x3C lsls r0, 16 lsrs r0, 16 cmp r0, 0x1D - bhi _08135308 + bhi @08135308 adds r0, r1, 0x5 strh r0, [r4, 0x30] -_08135308: +@08135308: ldrh r1, [r4, 0x30] movs r2, 0x30 ldrsh r0, [r4, r2] cmp r0, 0x3B - bgt _0813533C + bgt @0813533C adds r0, r1, 0x1 - b _0813533A + b @0813533A .align 2, 0 .pool -_0813531C: +@0813531C: ldrh r1, [r4, 0x30] adds r0, r1, 0 subs r0, 0x2E lsls r0, 16 lsrs r0, 16 cmp r0, 0x1D - bhi _0813532E + bhi @0813532E subs r0, r1, 0x5 strh r0, [r4, 0x30] -_0813532E: +@0813532E: ldrh r1, [r4, 0x30] movs r2, 0x30 ldrsh r0, [r4, r2] cmp r0, 0x4B - ble _0813533C + ble @0813533C subs r0, r1, 0x1 -_0813533A: +@0813533A: strh r0, [r4, 0x30] -_0813533C: +@0813533C: ldrh r0, [r4, 0x30] bl cosine2 lsls r0, 16 @@ -595213,10 +595213,10 @@ _0813533C: subs r1, r0 lsls r0, r1, 1 cmp r0, 0 - bge _08135354 + bge @08135354 ldr r1, =0x00000fff adds r0, r1 -_08135354: +@08135354: asrs r0, 12 strh r0, [r4, 0x24] ldrh r0, [r4, 0x30] @@ -595227,10 +595227,10 @@ _08135354: subs r1, r0 lsls r0, r1, 1 cmp r0, 0 - bge _08135370 + bge @08135370 ldr r2, =0x00000fff adds r0, r2 -_08135370: +@08135370: asrs r0, 12 strh r0, [r4, 0x26] pop {r4} @@ -595241,7 +595241,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 @@ -595254,46 +595254,46 @@ sub_8135380: @ 8135380 movs r1, 0x12 ldrsh r0, [r0, r1] cmp r0, 0 - beq _081353C0 + beq @081353C0 ldrh r1, [r4, 0x30] adds r0, r1, 0 subs r0, 0x69 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1D - bhi _081353AC + bhi @081353AC adds r0, r1, 0x5 strh r0, [r4, 0x30] -_081353AC: +@081353AC: ldrh r1, [r4, 0x30] movs r2, 0x30 ldrsh r0, [r4, r2] cmp r0, 0x68 - bgt _081353E0 + bgt @081353E0 adds r0, r1, 0x1 - b _081353DE + b @081353DE .align 2, 0 .pool -_081353C0: +@081353C0: ldrh r1, [r4, 0x30] adds r0, r1, 0 subs r0, 0x5B lsls r0, 16 lsrs r0, 16 cmp r0, 0x1D - bhi _081353D2 + bhi @081353D2 subs r0, r1, 0x5 strh r0, [r4, 0x30] -_081353D2: +@081353D2: ldrh r1, [r4, 0x30] movs r2, 0x30 ldrsh r0, [r4, r2] cmp r0, 0x78 - ble _081353E0 + ble @081353E0 subs r0, r1, 0x1 -_081353DE: +@081353DE: strh r0, [r4, 0x30] -_081353E0: +@081353E0: ldrh r0, [r4, 0x30] bl cosine2 lsls r0, 16 @@ -595302,10 +595302,10 @@ _081353E0: subs r1, r0 lsls r0, r1, 1 cmp r0, 0 - bge _081353F8 + bge @081353F8 ldr r1, =0x00000fff adds r0, r1 -_081353F8: +@081353F8: asrs r0, 12 strh r0, [r4, 0x24] ldrh r0, [r4, 0x30] @@ -595316,10 +595316,10 @@ _081353F8: subs r1, r0 lsls r0, r1, 1 cmp r0, 0 - bge _08135414 + bge @08135414 ldr r2, =0x00000fff adds r0, r2 -_08135414: +@08135414: asrs r0, 12 strh r0, [r4, 0x26] pop {r4} @@ -595330,7 +595330,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 @@ -595354,24 +595354,24 @@ npc_before_player_of_type: @ 8135424 adds r2, r1, r2 ldrb r0, [r2, 0x5] cmp r0, r5 - bne _08135470 + bne @08135470 ldr r1, =0x020375f2 ldrb r0, [r2, 0x8] strh r0, [r1] movs r0, 0x1 - b _08135472 + b @08135472 .align 2, 0 .pool -_08135470: +@08135470: movs r0, 0 -_08135472: +@08135472: pop {r4,r5} pop {r1} bx r1 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 @@ -595388,7 +595388,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 @@ -595407,17 +595407,17 @@ task08_080C9820: @ 813549C bl npc_is_visible_or_is_x40 lsls r0, 24 cmp r0, 0 - beq _081354D2 + beq @081354D2 adds r0, r4, 0 bl sub_8093284 lsls r0, 24 cmp r0, 0 - beq _0813551E -_081354D2: + beq @0813551E +@081354D2: ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x5 - bne _08135504 + bne @08135504 movs r0, 0x3B bl oe_exec ldr r0, =0x03005e00 @@ -595426,10 +595426,10 @@ _081354D2: lsls r1, 3 adds r1, r0 ldr r0, =sub_8135578 + 1 - b _0813551C + b @0813551C .align 2, 0 .pool -_08135504: +@08135504: bl sub_808C114 adds r0, r4, 0 movs r1, 0x39 @@ -595440,9 +595440,9 @@ _08135504: lsls r1, 3 adds r1, r0 ldr r0, =sub_813552C + 1 -_0813551C: +@0813551C: str r0, [r1] -_0813551E: +@0813551E: pop {r4-r6} pop {r0} bx r0 @@ -595451,7 +595451,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 @@ -595466,7 +595466,7 @@ sub_813552C: @ 813552C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08135560 + bne @08135560 movs r0, 0x3B bl oe_exec ldr r0, =0x03005e00 @@ -595476,7 +595476,7 @@ sub_813552C: @ 813552C adds r1, r0 ldr r0, =sub_8135578 + 1 str r0, [r1] -_08135560: +@08135560: pop {r4} pop {r0} bx r0 @@ -595485,7 +595485,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 @@ -595494,32 +595494,32 @@ sub_8135578: @ 8135578 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _081355FC + bne @081355FC bl player_get_direction__sp1AA ldr r6, =0x02038c08 lsls r0, 24 lsrs r0, 24 str r0, [r6, 0x4] cmp r0, 0x1 - bne _0813559E + bne @0813559E str r4, [r6, 0x8] -_0813559E: +@0813559E: ldr r1, [r6, 0x4] cmp r1, 0x2 - bne _081355A8 + bne @081355A8 movs r0, 0x1 str r0, [r6, 0x8] -_081355A8: +@081355A8: cmp r1, 0x3 - bne _081355B0 + bne @081355B0 movs r0, 0x2 str r0, [r6, 0x8] -_081355B0: +@081355B0: cmp r1, 0x4 - bne _081355B8 + bne @081355B8 movs r0, 0x3 str r0, [r6, 0x8] -_081355B8: +@081355B8: ldr r5, =0x02037590 ldrb r0, [r5, 0x5] lsls r4, r0, 3 @@ -595550,7 +595550,7 @@ _081355B8: adds r0, r1 ldr r1, =sub_813561C + 1 str r1, [r0] -_081355FC: +@081355FC: pop {r4-r7} pop {r0} bx r0 @@ -595559,7 +595559,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 @@ -595587,12 +595587,12 @@ 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 cmp r0, 0 - beq _0813568C + beq @0813568C ldr r4, =0x020375f0 bl brm_get_pokemon_selection lsls r0, 24 @@ -595603,28 +595603,28 @@ sub_8135654: @ 8135654 str r0, [r1] ldr r1, =0x0203ceec ldr r0, =sub_8179834 + 1 - b _081356A8 + b @081356A8 .align 2, 0 .pool -_0813568C: +@0813568C: movs r0, 0x56 bl npc_before_player_of_type lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0813569E + beq @0813569E movs r0, 0 - b _081356AC -_0813569E: + b @081356AC +@0813569E: ldr r1, =0x03005db0 ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] ldr r1, =0x0203ceec ldr r0, =sub_81356C4 + 1 -_081356A8: +@081356A8: str r0, [r1] movs r0, 0x1 -_081356AC: +@081356AC: pop {r4} pop {r1} bx r1 @@ -595633,7 +595633,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 @@ -595649,7 +595649,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 @@ -595673,7 +595673,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 @@ -595685,16 +595685,16 @@ 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 lsrs r0, 24 cmp r0, 0x1 - beq _0813573E + beq @0813573E movs r0, 0 - b _0813574C -_0813573E: + b @0813574C +@0813573E: ldr r1, =0x03005db0 ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] @@ -595702,7 +595702,7 @@ _0813573E: ldr r0, =hm2_dig + 1 str r0, [r1] movs r0, 0x1 -_0813574C: +@0813574C: pop {r1} bx r1 .align 2, 0 @@ -595710,7 +595710,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 @@ -595727,7 +595727,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 @@ -595744,10 +595744,10 @@ sub_8135780: @ 8135780 bl sub_81795E8 lsls r0, 24 cmp r0, 0 - bne _081357AC + bne @081357AC movs r0, 0x1 bl walkrun_set_bike_bits -_081357AC: +@081357AC: movs r0, 0 pop {r1} bx r1 @@ -595756,7 +595756,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 oe_active_list_remove @@ -595764,10 +595764,10 @@ sub_81357BC: @ 81357BC lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq _081357D6 + beq @081357D6 bl sub_817963C - b _081357EE -_081357D6: + b @081357EE +@081357D6: ldr r0, =task08_080A1C44 + 1 movs r1, 0x8 bl AddTask @@ -595779,7 +595779,7 @@ _081357D6: lsls r1, 3 adds r1, r2 strh r4, [r1, 0x8] -_081357EE: +@081357EE: pop {r4} pop {r0} bx r0 @@ -595788,7 +595788,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 @@ -595821,19 +595821,19 @@ sub_81357FC: @ 81357FC adds r2, r5, r2 ldrb r2, [r2] cmp r2, 0x2 - beq _08135888 + beq @08135888 cmp r2, 0x2 - bgt _08135864 + bgt @08135864 cmp r2, 0x1 - beq _0813586A - b _081358C0 + beq @0813586A + b @081358C0 .align 2, 0 .pool -_08135864: +@08135864: cmp r2, 0x3 - beq _081358A4 - b _081358C0 -_0813586A: + beq @081358A4 + b @081358C0 +@0813586A: ldr r0, =0x00000804 adds r1, r5, r0 ldr r0, =0x085b269b @@ -595841,10 +595841,10 @@ _0813586A: ldr r4, =0x00000808 adds r1, r5, r4 movs r0, 0x2 - b _081358D2 + b @081358D2 .align 2, 0 .pool -_08135888: +@08135888: ldr r1, =0x00000804 adds r0, r5, r1 ldr r1, =0x085b269d @@ -595852,10 +595852,10 @@ _08135888: ldr r4, =0x00000808 adds r0, r5, r4 strb r2, [r0] - b _081358D4 + b @081358D4 .align 2, 0 .pool -_081358A4: +@081358A4: ldr r0, =0x00000804 adds r1, r5, r0 ldr r0, =0x085b269f @@ -595863,10 +595863,10 @@ _081358A4: ldr r4, =0x00000808 adds r1, r5, r4 movs r0, 0x2 - b _081358D2 + b @081358D2 .align 2, 0 .pool -_081358C0: +@081358C0: ldr r0, =0x0203ab50 ldr r1, [r0] ldr r0, =0x00000804 @@ -595876,9 +595876,9 @@ _081358C0: ldr r4, =0x00000808 adds r1, r4 movs r0, 0x3 -_081358D2: +@081358D2: strb r0, [r1] -_081358D4: +@081358D4: ldr r0, =sub_813594C + 1 bl set_callback2 pop {r4-r6} @@ -595889,7 +595889,7 @@ _081358D4: thumb_func_end sub_81357FC thumb_func_start sub_81358F4 -sub_81358F4: @ 81358F4 +sub_81358F4: ; 81358F4 push {lr} ldr r1, =sub_8059D50 + 1 movs r0, 0x1 @@ -595901,7 +595901,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 + 1 movs r0, 0x2 @@ -595913,7 +595913,7 @@ sub_8135908: @ 8135908 thumb_func_end sub_8135908 thumb_func_start sub_813591C -sub_813591C: @ 813591C +sub_813591C: ; 813591C push {lr} bl run_active_tasks bl call_obj_callbacks @@ -595925,7 +595925,7 @@ sub_813591C: @ 813591C thumb_func_end sub_813591C thumb_func_start sub_8135938 -sub_8135938: @ 8135938 +sub_8135938: ; 8135938 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -595935,31 +595935,31 @@ sub_8135938: @ 8135938 thumb_func_end sub_8135938 thumb_func_start sub_813594C -sub_813594C: @ 813594C +sub_813594C: ; 813594C push {lr} -_0813594E: +@0813594E: bl sub_81221EC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08135972 + beq @08135972 bl sub_8135978 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08135972 + beq @08135972 bl sub_81221AC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0813594E -_08135972: + bne @0813594E +@08135972: pop {r0} bx r0 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 @@ -595968,54 +595968,54 @@ sub_8135978: @ 8135978 adds r0, r1 ldrb r0, [r0] cmp r0, 0x12 - bls _0813598C - b _08135BB8 -_0813598C: + bls @0813598C + b @08135BB8 +@0813598C: lsls r0, 2 - ldr r1, =_081359A0 + ldr r1, =@081359A0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081359A0: - .4byte _081359EC - .4byte _081359F6 - .4byte _08135A08 - .4byte _08135A0E - .4byte _08135A30 - .4byte _08135A36 - .4byte _08135A54 - .4byte _08135A70 - .4byte _08135A8C - .4byte _08135A9A - .4byte _08135AC4 - .4byte _08135ADC - .4byte _08135AFC - .4byte _08135B02 - .4byte _08135B14 - .4byte _08135B1A - .4byte _08135B64 - .4byte _08135B6A - .4byte _08135B84 -_081359EC: +@081359A0: + .4byte @081359EC + .4byte @081359F6 + .4byte @08135A08 + .4byte @08135A0E + .4byte @08135A30 + .4byte @08135A36 + .4byte @08135A54 + .4byte @08135A70 + .4byte @08135A8C + .4byte @08135A9A + .4byte @08135AC4 + .4byte @08135ADC + .4byte @08135AFC + .4byte @08135B02 + .4byte @08135B14 + .4byte @08135B1A + .4byte @08135B64 + .4byte @08135B6A + .4byte @08135B84 +@081359EC: bl vblank_hblank_handler_set_zero bl clear_scheduled_bg_copies_to_vram - b _08135B9E -_081359F6: + b @08135B9E +@081359F6: bl remove_some_task ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _08135BA6 + b @08135BA6 .align 2, 0 .pool -_08135A08: +@08135A08: bl gpu_pal_allocator_reset - b _08135B9E -_08135A0E: + b @08135B9E +@08135A0E: bl sub_80A1A74 ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] @@ -596026,27 +596026,27 @@ _08135A0E: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _08135BA6 + b @08135BA6 .align 2, 0 .pool -_08135A30: +@08135A30: bl reset_all_obj_data - b _08135B9E -_08135A36: + b @08135B9E +@08135A36: ldr r0, =0x0203ab50 ldr r0, [r0] ldr r1, =0x00000809 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _08135A46 - b _08135B9E -_08135A46: + bne @08135A46 + b @08135B9E +@08135A46: bl clear_tasks - b _08135B9E + b @08135B9E .align 2, 0 .pool -_08135A54: +@08135A54: bl sub_8135BDC ldr r0, =0x0203ab50 ldr r0, [r0] @@ -596054,29 +596054,29 @@ _08135A54: adds r0, r1 movs r1, 0 strh r1, [r0] - b _08135B9E + b @08135B9E .align 2, 0 .pool -_08135A70: +@08135A70: bl sub_8135C38 lsls r0, 24 cmp r0, 0 - bne _08135A7C - b _08135BD0 -_08135A7C: + bne @08135A7C + b @08135BD0 +@08135A7C: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _08135BA6 + b @08135BA6 .align 2, 0 .pool -_08135A8C: +@08135A8C: bl sub_813625C bl sub_81362E0 bl sub_8136344 - b _08135B9E -_08135A9A: + b @08135B9E +@08135A9A: movs r0, 0x38 movs r1, 0x40 movs r2, 0 @@ -596090,20 +596090,20 @@ _08135A9A: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _08135BA6 + b @08135BA6 .align 2, 0 .pool -_08135AC4: +@08135AC4: ldr r0, =0x0203ab50 ldr r0, [r0] ldr r1, =0x00000e75 adds r0, r1 movs r1, 0x7 bl sub_8122344 - b _08135B9E + b @08135B9E .align 2, 0 .pool -_08135ADC: +@08135ADC: ldr r0, =0x0203ab48 ldrh r0, [r0, 0x4] ldr r1, =0x00001005 @@ -596112,25 +596112,25 @@ _08135ADC: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _08135BA6 + b @08135BA6 .align 2, 0 .pool -_08135AFC: +@08135AFC: bl sub_8135D24 - b _08135B9E -_08135B02: + b @08135B9E +@08135B02: bl sub_8135E2C ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _08135BA6 + b @08135BA6 .align 2, 0 .pool -_08135B14: +@08135B14: bl sub_81363BC - b _08135B9E -_08135B1A: + b @08135B9E +@08135B1A: ldr r0, =sub_81365C8 + 1 movs r1, 0 bl AddTask @@ -596154,13 +596154,13 @@ _08135B1A: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _08135BA6 + b @08135BA6 .align 2, 0 .pool -_08135B64: +@08135B64: bl sub_8135DAC - b _08135B9E -_08135B6A: + b @08135B9E +@08135B6A: movs r0, 0x1 negs r0, r0 movs r1, 0x10 @@ -596170,10 +596170,10 @@ _08135B6A: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _08135BA6 + b @08135BA6 .align 2, 0 .pool -_08135B84: +@08135B84: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -596186,30 +596186,30 @@ _08135B84: movs r0, 0x7F ands r0, r1 strb r0, [r2, 0x8] -_08135B9E: +@08135B9E: ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 -_08135BA6: +@08135BA6: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08135BD0 + b @08135BD0 .align 2, 0 .pool -_08135BB8: +@08135BB8: ldr r0, =sub_8135938 + 1 bl SetVBlankCallback ldr r0, =sub_813591C + 1 bl set_callback2 movs r0, 0x1 - b _08135BD2 + b @08135BD2 .align 2, 0 .pool -_08135BD0: +@08135BD0: movs r0, 0 -_08135BD2: +@08135BD2: add sp, 0x4 pop {r4} pop {r1} @@ -596217,7 +596217,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 @@ -596253,7 +596253,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 @@ -596263,23 +596263,23 @@ sub_8135C38: @ 8135C38 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x5 - bhi _08135D18 + bhi @08135D18 lsls r0, 2 - ldr r1, =_08135C64 + ldr r1, =@08135C64 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08135C64: - .4byte _08135C7C - .4byte _08135C98 - .4byte _08135CBC - .4byte _08135CCC - .4byte _08135CD8 - .4byte _08135CFC -_08135C7C: +@08135C64: + .4byte @08135C7C + .4byte @08135C98 + .4byte @08135CBC + .4byte @08135CCC + .4byte @08135CD8 + .4byte @08135CFC +@08135C7C: bl reset_temp_tile_data_buffers ldr r1, =0x08d9b2b4 movs r0, 0 @@ -596288,53 +596288,53 @@ _08135C7C: movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - b _08135CDE + b @08135CDE .align 2, 0 .pool -_08135C98: +@08135C98: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08135D18 + beq @08135D18 ldr r0, =0x08d9b7c8 ldr r4, =0x0203ab50 ldr r1, [r4] bl call_LZZUnCompWram ldr r1, [r4] - b _08135CE2 + b @08135CE2 .align 2, 0 .pool -_08135CBC: +@08135CBC: ldr r0, =0x08d9b470 movs r1, 0 movs r2, 0xC0 bl decompress_palette - b _08135CDE + b @08135CDE .align 2, 0 .pool -_08135CCC: +@08135CCC: ldr r0, =0x085b26f4 bl gpu_tile_obj_decompress_and_load - b _08135CDE + b @08135CDE .align 2, 0 .pool -_08135CD8: +@08135CD8: ldr r0, =0x085b26fc bl gpu_pal_obj_decompress_and_apply -_08135CDE: +@08135CDE: ldr r0, =0x0203ab50 ldr r1, [r0] -_08135CE2: +@08135CE2: ldr r0, =0x00000e7e adds r1, r0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _08135D18 + b @08135D18 .align 2, 0 .pool -_08135CFC: +@08135CFC: bl sub_8122328 ldr r0, =0x0203ab50 ldr r0, [r0] @@ -596343,12 +596343,12 @@ _08135CFC: movs r1, 0 strh r1, [r0] movs r0, 0x1 - b _08135D1A + b @08135D1A .align 2, 0 .pool -_08135D18: +@08135D18: movs r0, 0 -_08135D1A: +@08135D1A: add sp, 0x4 pop {r4} pop {r1} @@ -596356,7 +596356,7 @@ _08135D1A: thumb_func_end sub_8135C38 thumb_func_start sub_8135D24 -sub_8135D24: @ 8135D24 +sub_8135D24: ; 8135D24 push {r4,lr} ldr r0, =0x085b2748 bl Window_InitFromTemplates @@ -596374,7 +596374,7 @@ sub_8135D24: @ 8135D24 movs r2, 0x20 bl gpu_pal_apply movs r4, 0 -_08135D50: +@08135D50: adds r0, r4, 0 movs r1, 0 bl Window_FastFillPixels @@ -596382,7 +596382,7 @@ _08135D50: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xA - bls _08135D50 + bls @08135D50 movs r0, 0 bl schedule_bg_copy_tilemap_to_vram movs r0, 0x1 @@ -596395,7 +596395,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 @@ -596421,7 +596421,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 @@ -596455,14 +596455,14 @@ sub_8135DAC: @ 8135DAC movs r2, 0 bl sub_8135D7C movs r4, 0 -_08135DFE: +@08135DFE: adds r0, r4, 0 bl Window_WriteStandardTileMap adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bls _08135DFE + bls @08135DFE pop {r4} pop {r0} bx r0 @@ -596471,7 +596471,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 @@ -596481,9 +596481,9 @@ sub_8135E2C: @ 8135E2C ldrb r0, [r0] subs r0, 0x1 cmp r6, r0 - bge _08135E7C + bge @08135E7C adds r5, r1, 0 -_08135E42: +@08135E42: lsls r4, r6, 5 ldr r3, =0x00000954 adds r4, r3 @@ -596511,8 +596511,8 @@ _08135E42: ldrb r0, [r1] subs r0, 0x1 cmp r6, r0 - blt _08135E42 -_08135E7C: + blt @08135E42 +@08135E7C: ldr r5, =0x0203ab50 lsls r4, r6, 5 ldr r7, =0x00000954 @@ -596568,7 +596568,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 @@ -596614,13 +596614,13 @@ 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 lsrs r1, 24 cmp r1, 0x1 - beq _08135F9C + beq @08135F9C movs r0, 0x5 bl audio_play ldr r2, =0x02020630 @@ -596636,17 +596636,17 @@ sub_8135F70: @ 8135F70 adds r0, r2 ldr r1, =sub_8136470 + 1 str r1, [r0] -_08135F9C: +@08135F9C: ldr r0, =0x0203ab50 ldr r0, [r0] ldr r1, =0x00000e7d adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _08135FB0 + bne @08135FB0 adds r0, r4, 0 bl sub_8135FCC -_08135FB0: +@08135FB0: pop {r4} pop {r0} bx r0 @@ -596655,7 +596655,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} @@ -596667,7 +596667,7 @@ sub_8135FCC: @ 8135FCC movs r0, 0x2 negs r0, r0 cmp r4, r0 - beq _081360A0 + beq @081360A0 ldr r1, =0x03005d8c lsls r0, r4, 3 ldr r2, =0x00000848 @@ -596682,7 +596682,7 @@ sub_8135FCC: @ 8135FCC strh r0, [r1, 0x2] movs r5, 0 adds r6, r1, 0 -_08136002: +@08136002: adds r4, r5, 0x1 lsls r1, r4, 24 lsrs r1, 24 @@ -596691,21 +596691,21 @@ _08136002: lsls r0, 16 adds r7, r4, 0 cmp r0, 0 - ble _0813602C + ble @0813602C lsls r1, r5, 12 adds r0, r1, 0 adds r0, 0x17 strh r0, [r6] adds r1, 0x18 strh r1, [r6, 0x2] - b _08136032 + b @08136032 .align 2, 0 .pool -_0813602C: +@0813602C: movs r0, 0xF strh r0, [r6] strh r0, [r6, 0x2] -_08136032: +@08136032: adds r0, r5, 0 movs r1, 0x3 bl __udivsi3 @@ -596736,7 +596736,7 @@ _08136032: lsls r0, r7, 24 lsrs r5, r0, 24 cmp r5, 0x4 - bls _08136002 + bls @08136002 ldr r4, =0x02021cc4 mov r0, r8 bl sub_8136EDC @@ -596751,16 +596751,16 @@ _08136032: adds r1, r4, 0 movs r2, 0x4 bl sub_8135D7C - b _081360F8 + b @081360F8 .align 2, 0 .pool -_081360A0: +@081360A0: add r0, sp, 0x8 movs r1, 0xF strh r1, [r0] strh r1, [r0, 0x2] movs r5, 0 -_081360AA: +@081360AA: adds r0, r5, 0 movs r1, 0x3 bl __udivsi3 @@ -596792,11 +596792,11 @@ _081360AA: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x4 - bls _081360AA + bls @081360AA movs r0, 0x7 movs r1, 0x2 bl Window_CopyToVram -_081360F8: +@081360F8: movs r0, 0 bl schedule_bg_copy_tilemap_to_vram movs r0, 0x2 @@ -596810,7 +596810,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 @@ -596835,32 +596835,32 @@ 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 push {r6,r7} movs r2, 0 -_0813614A: +@0813614A: adds r1, r2, 0x1 lsls r0, r1, 16 lsrs r6, r0, 16 mov r12, r1 cmp r6, 0x27 - bhi _08136192 + bhi @08136192 ldr r0, =0x03005d8c mov r9, r0 lsls r7, r2, 3 ldr r1, =0x00000848 mov r8, r1 -_08136160: +@08136160: mov r0, r9 ldr r2, [r0] adds r0, r2, r7 add r0, r8 ldrb r0, [r0] cmp r0, 0 - bne _08136188 + bne @08136188 ldr r1, =0x00000848 adds r2, r1 adds r3, r2, r7 @@ -596874,18 +596874,18 @@ _08136160: str r1, [r3, 0x4] str r4, [r2] str r5, [r2, 0x4] -_08136188: +@08136188: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x27 - bls _08136160 -_08136192: + bls @08136160 +@08136192: mov r1, r12 lsls r0, r1, 16 lsrs r2, r0, 16 cmp r2, 0x26 - bls _0813614A + bls @0813614A pop {r3,r4} mov r8, r3 mov r9, r4 @@ -596897,7 +596897,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 @@ -596906,7 +596906,7 @@ sub_81361B0: @ 81361B0 ldr r1, =0x00000848 adds r6, r0, r1 cmp r4, r5 - beq _08136246 + beq @08136246 movs r0, 0x8 bl malloc adds r7, r0, 0 @@ -596917,15 +596917,15 @@ sub_81361B0: @ 81361B0 str r0, [r7] str r1, [r7, 0x4] cmp r5, r4 - bls _0813620C + bls @0813620C subs r5, 0x1 lsls r3, r4, 16 lsls r0, r5, 16 asrs r1, r0, 16 cmp r3, r0 - bge _08136234 + bge @08136234 adds r4, r1, 0 -_081361E8: +@081361E8: asrs r3, 16 lsls r2, r3, 3 adds r2, r6 @@ -596937,18 +596937,18 @@ _081361E8: lsls r3, 16 asrs r0, r3, 16 cmp r0, r4 - blt _081361E8 - b _08136234 + blt @081361E8 + b @08136234 .align 2, 0 .pool -_0813620C: +@0813620C: lsls r3, r4, 16 lsls r0, r5, 16 asrs r1, r0, 16 cmp r3, r0 - ble _08136234 + ble @08136234 adds r4, r1, 0 -_08136218: +@08136218: asrs r3, 16 lsls r2, r3, 3 adds r2, r6 @@ -596962,8 +596962,8 @@ _08136218: lsls r3, 16 asrs r0, r3, 16 cmp r0, r4 - bgt _08136218 -_08136234: + bgt @08136218 +@08136234: lsls r2, r5, 3 adds r2, r6 ldr r0, [r7] @@ -596972,14 +596972,14 @@ _08136234: str r1, [r2, 0x4] adds r0, r7, 0 bl free -_08136246: +@08136246: pop {r4-r7} pop {r0} bx r0 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] @@ -596990,7 +596990,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 @@ -597002,7 +597002,7 @@ sub_813625C: @ 813625C movs r2, 0 ldr r5, =0x03005d8c ldr r4, =0x00000848 -_08136274: +@08136274: ldr r0, [r5] lsls r1, r2, 3 adds r0, r1 @@ -597010,19 +597010,19 @@ _08136274: ldrb r0, [r0] ldr r3, =0x0203ab50 cmp r0, 0 - beq _08136290 + beq @08136290 ldr r1, [r3] ldr r0, =0x0000080a adds r1, r0 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_08136290: +@08136290: adds r0, r2, 0x1 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x27 - bls _08136274 + bls @08136274 ldr r0, [r3] ldr r2, =0x0000080a adds r0, r2 @@ -597033,19 +597033,19 @@ _08136290: adds r2, r0, r2 ldrb r2, [r2] cmp r2, 0x9 - bls _081362D0 + bls @081362D0 ldr r2, =0x0000080b adds r1, r0, r2 movs r0, 0x9 strb r0, [r1] - b _081362D6 + b @081362D6 .align 2, 0 .pool -_081362D0: +@081362D0: ldr r1, =0x0000080b adds r0, r1 strb r2, [r0] -_081362D6: +@081362D6: pop {r4,r5} pop {r0} bx r0 @@ -597054,14 +597054,14 @@ _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] adds r3, r0, 0 ldr r4, =0x0203ab50 cmp r1, 0 - beq _08136308 + beq @08136308 ldrh r0, [r3, 0x6] ldr r1, [r4] ldr r5, =0x0000080b @@ -597072,10 +597072,10 @@ sub_81362E0: @ 81362E0 adds r1, r5 ldrb r1, [r1] cmp r0, r1 - ble _08136308 + ble @08136308 subs r0, r1, r2 strh r0, [r3, 0x6] -_08136308: +@08136308: adds r2, r3, 0 ldrh r1, [r2, 0x6] ldrh r0, [r2, 0x4] @@ -597085,36 +597085,36 @@ _08136308: adds r0, r4 ldrb r0, [r0] cmp r1, r0 - blt _0813633C + blt @0813633C adds r1, r0, 0 cmp r1, 0 - bne _08136338 + bne @08136338 strh r1, [r2, 0x4] - b _0813633C + b @0813633C .align 2, 0 .pool -_08136338: +@08136338: subs r0, 0x1 strh r0, [r3, 0x4] -_0813633C: +@0813633C: pop {r4,r5} pop {r0} bx r0 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] adds r5, r0, 0 cmp r1, 0x4 - bls _081363A4 + bls @081363A4 movs r4, 0 ldrh r0, [r5, 0x4] subs r0, 0x4 cmp r4, r0 - bge _081363A4 + bge @081363A4 ldrh r2, [r5, 0x6] ldr r6, =0x0203ab50 ldr r0, [r6] @@ -597126,9 +597126,9 @@ sub_8136344: @ 8136344 adds r0, r7 ldrb r0, [r0] cmp r2, r0 - beq _081363A4 + beq @081363A4 adds r3, r5, 0 -_08136374: +@08136374: ldrh r0, [r3, 0x4] subs r0, 0x1 strh r0, [r3, 0x4] @@ -597141,7 +597141,7 @@ _08136374: ldrh r0, [r3, 0x4] subs r0, 0x4 cmp r4, r0 - bge _081363A4 + bge @081363A4 ldrh r2, [r5, 0x6] ldr r1, [r6] ldr r7, =0x0000080b @@ -597152,8 +597152,8 @@ _08136374: adds r1, r0 ldrb r1, [r1] cmp r2, r1 - bne _08136374 -_081363A4: + bne @08136374 +@081363A4: pop {r4-r7} pop {r0} bx r0 @@ -597162,7 +597162,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 @@ -597171,7 +597171,7 @@ sub_81363BC: @ 81363BC adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0xFF - bne _081363FC + bne @081363FC ldr r2, =0x0000080a adds r0, r1, r2 ldrb r0, [r0] @@ -597194,7 +597194,7 @@ sub_81363BC: @ 81363BC ldr r2, =0x00000e7c adds r1, r2 strb r0, [r1] -_081363FC: +@081363FC: add sp, 0x10 pop {r4} pop {r0} @@ -597204,7 +597204,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] @@ -597212,14 +597212,14 @@ sub_8136418: @ 8136418 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xFF - beq _08136436 + beq @08136436 bl sub_81AF620 ldr r0, [r4] ldr r1, =0x00000e7c adds r0, r1 movs r1, 0xFF strb r1, [r0] -_08136436: +@08136436: pop {r4} pop {r0} bx r0 @@ -597228,7 +597228,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 @@ -597253,24 +597253,24 @@ 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 ldrsh r0, [r4, r1] cmp r0, 0x1 - ble _08136480 + ble @08136480 movs r0, 0 strh r0, [r4, 0x2E] -_08136480: +@08136480: movs r0, 0x2E ldrsh r5, [r4, r0] cmp r5, 0 - beq _0813648E + beq @0813648E cmp r5, 0x1 - beq _081364B4 - b _081364E0 -_0813648E: + beq @081364B4 + b @081364E0 +@0813648E: ldrb r1, [r4, 0x1] movs r0, 0x4 negs r0, r0 @@ -597285,10 +597285,10 @@ _0813648E: movs r0, 0x1 strh r0, [r4, 0x2E] strh r5, [r4, 0x30] - b _081364E0 + b @081364E0 .align 2, 0 .pool -_081364B4: +@081364B4: ldrh r0, [r4, 0x30] adds r0, 0x1 movs r2, 0 @@ -597296,7 +597296,7 @@ _081364B4: lsls r0, 16 asrs r0, 16 cmp r0, 0xB - ble _081364E0 + ble @081364E0 ldrb r1, [r4, 0x1] movs r0, 0x4 negs r0, r0 @@ -597310,7 +597310,7 @@ _081364B4: bl rotscale_free_entry ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] -_081364E0: +@081364E0: pop {r4,r5} pop {r0} bx r0 @@ -597319,7 +597319,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 @@ -597348,7 +597348,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 @@ -597362,7 +597362,7 @@ sub_8136524: @ 8136524 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081365BE + bne @081365BE ldr r6, =0x0203ab50 ldr r0, [r6] ldr r1, =0x00000809 @@ -597372,11 +597372,11 @@ sub_8136524: @ 8136524 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _0813655A + bhi @0813655A ldr r1, =0x03005dac ldr r0, =sub_80AF168 + 1 str r0, [r1] -_0813655A: +@0813655A: ldrb r0, [r2] ldr r4, =0x0203ab4e subs r2, r4, 0x2 @@ -597391,23 +597391,23 @@ _0813655A: adds r0, r1 ldr r0, [r0] cmp r0, 0 - beq _081365A4 + beq @081365A4 bl set_callback2 - b _081365AC + b @081365AC .align 2, 0 .pool -_081365A4: +@081365A4: subs r0, r4, 0x6 ldr r0, [r0] bl set_callback2 -_081365AC: +@081365AC: bl Window_FreeMemory ldr r0, =0x0203ab50 ldr r0, [r0] bl free adds r0, r5, 0 bl remove_task -_081365BE: +@081365BE: pop {r4-r6} pop {r0} bx r0 @@ -597416,7 +597416,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 @@ -597437,16 +597437,16 @@ sub_81365C8: @ 81365C8 movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081365F4 - b _08136708 -_081365F4: + beq @081365F4 + b @08136708 +@081365F4: bl sub_81221EC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08136602 - b _08136708 -_08136602: + bne @08136602 + b @08136708 +@08136602: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x4 @@ -597455,7 +597455,7 @@ _08136602: lsrs r0, 16 mov r9, r0 cmp r0, 0 - beq _08136688 + beq @08136688 ldrb r0, [r6] ldr r4, =0x0203ab4e subs r2, r4, 0x2 @@ -597472,7 +597472,7 @@ _08136602: ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 - beq _08136708 + beq @08136708 movs r0, 0x5 bl audio_play ldrh r0, [r4, 0x4] @@ -597492,10 +597492,10 @@ _08136602: add r0, r8 ldr r1, =sub_813671C + 1 str r1, [r0] - b _08136708 + b @08136708 .align 2, 0 .pool -_08136688: +@08136688: ldr r5, =0x0203ab48 ldrh r2, [r5, 0x4] mov r8, r2 @@ -597508,25 +597508,25 @@ _08136688: bl get_coro_args_x18_x1A ldrh r0, [r5, 0x4] cmp r8, r0 - beq _081366B6 + beq @081366B6 mov r0, r8 movs r1, 0x5 bl sub_8136110 ldrh r0, [r5, 0x4] ldr r1, =0x00001005 bl sub_8136110 -_081366B6: +@081366B6: movs r0, 0x2 negs r0, r0 cmp r4, r0 - beq _081366D0 + beq @081366D0 adds r0, 0x1 cmp r4, r0 - bne _081366F8 - b _08136708 + bne @081366F8 + b @08136708 .align 2, 0 .pool -_081366D0: +@081366D0: movs r0, 0x5 bl audio_play ldr r0, =0x020375f0 @@ -597538,17 +597538,17 @@ _081366D0: strh r1, [r0] adds r0, r7, 0 bl sub_81364EC - b _08136708 + b @08136708 .align 2, 0 .pool -_081366F8: +@081366F8: movs r0, 0x5 bl audio_play ldr r0, =0x0203ce7c strh r4, [r0] adds r0, r7, 0 bl sub_8136938 -_08136708: +@08136708: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -597561,7 +597561,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 @@ -597578,25 +597578,25 @@ sub_813671C: @ 813671C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08136742 - b _08136848 -_08136742: + bne @08136742 + b @08136848 +@08136742: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0813676C + beq @0813676C movs r0, 0x5 bl audio_play ldrb r0, [r7] ldr r1, =0x0203ab4e subs r2, r1, 0x2 bl get_coro_args_x18_x1A - b _08136822 + b @08136822 .align 2, 0 .pool -_0813676C: +@0813676C: ldr r6, =0x0203ab48 ldrh r4, [r6, 0x6] ldrh r5, [r6, 0x4] @@ -597609,13 +597609,13 @@ _0813676C: bl get_coro_args_x18_x1A ldrh r0, [r6, 0x6] cmp r4, r0 - bne _08136790 + bne @08136790 ldrh r6, [r6, 0x4] cmp r5, r6 - beq _081367CA -_08136790: + beq @081367CA +@08136790: movs r4, 0 -_08136792: +@08136792: ldr r0, =0x0203ab48 ldrh r0, [r0, 0x6] adds r0, r4, r0 @@ -597624,24 +597624,24 @@ _08136792: movs r1, 0x4 ldrsh r0, [r7, r1] cmp r5, r0 - bne _081367B8 + bne @081367B8 adds r0, r4, 0 ldr r1, =0x00002005 bl sub_8136110 - b _081367C0 + b @081367C0 .align 2, 0 .pool -_081367B8: +@081367B8: adds r0, r4, 0 movs r1, 0x5 bl sub_8136110 -_081367C0: +@081367C0: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x8 - bls _08136792 -_081367CA: + bls @08136792 +@081367CA: ldr r5, =0x0203ab50 ldr r0, [r5] ldr r4, =0x00000e75 @@ -597663,14 +597663,14 @@ _081367CA: movs r0, 0x2 negs r0, r0 cmp r9, r0 - beq _08136810 + beq @08136810 adds r0, 0x1 cmp r9, r0 - bne _0813683A - b _08136848 + bne @0813683A + b @08136848 .align 2, 0 .pool -_08136810: +@08136810: movs r0, 0x5 bl audio_play ldr r0, =0x030022c0 @@ -597678,26 +597678,26 @@ _08136810: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08136830 -_08136822: + beq @08136830 +@08136822: mov r0, r8 movs r1, 0 bl sub_8136854 - b _08136848 + b @08136848 .align 2, 0 .pool -_08136830: +@08136830: mov r0, r8 movs r1, 0x1 bl sub_8136854 - b _08136848 -_0813683A: + b @08136848 +@0813683A: movs r0, 0x5 bl audio_play mov r0, r8 movs r1, 0 bl sub_8136854 -_08136848: +@08136848: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -597707,7 +597707,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 @@ -597736,28 +597736,28 @@ sub_8136854: @ 8136854 adds r2, 0x4 bl sub_81AE6C8 cmp r4, 0 - bne _081368AA + bne @081368AA movs r0, 0x4 ldrsh r1, [r6, r0] cmp r1, r5 - beq _081368BA + beq @081368BA subs r0, r5, 0x1 cmp r1, r0 - beq _081368AA + beq @081368AA adds r0, r1, 0 adds r1, r5, 0 bl sub_81361B0 bl sub_8135E2C -_081368AA: +@081368AA: movs r1, 0x4 ldrsh r0, [r6, r1] cmp r0, r5 - bge _081368BA + bge @081368BA ldr r1, =0x0203ab48 ldrh r0, [r1, 0x4] subs r0, 0x1 strh r0, [r1, 0x4] -_081368BA: +@081368BA: ldr r0, =0x03006310 ldr r2, =0x0203ab48 ldrh r1, [r2, 0x6] @@ -597777,7 +597777,7 @@ _081368BA: bl sub_81223FC movs r4, 0 lsls r5, r7, 2 -_081368E6: +@081368E6: adds r0, r4, 0 movs r1, 0x5 bl sub_8136110 @@ -597785,7 +597785,7 @@ _081368E6: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x8 - bls _081368E6 + bls @081368E6 ldr r0, =0x0203ab48 ldrh r0, [r0, 0x4] ldr r1, =0x00001005 @@ -597804,7 +597804,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 @@ -597819,14 +597819,14 @@ sub_8136938: @ 8136938 adds r0, r1 ldrb r0, [r0] cmp r0, 0x3 - bne _08136968 + bne @08136968 movs r0, 0x8 - b _0813696A + b @0813696A .align 2, 0 .pool -_08136968: +@08136968: movs r0, 0x9 -_0813696A: +@0813696A: strh r0, [r6, 0x2] bl sub_8136418 ldrb r0, [r6, 0x2] @@ -597872,7 +597872,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 @@ -597881,23 +597881,23 @@ sub_81369E0: @ 81369E0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08136A3C + beq @08136A3C bl ProcessMenuInputNoWrapAround lsls r0, 24 asrs r4, r0, 24 movs r0, 0x2 negs r0, r0 cmp r4, r0 - beq _08136A3C + beq @08136A3C adds r0, 0x1 cmp r4, r0 - bne _08136A18 + bne @08136A18 movs r0, 0x5 bl audio_play adds r0, r5, 0 bl sub_8136DE8 - b _08136A3C -_08136A18: + b @08136A3C +@08136A18: movs r0, 0x5 bl audio_play ldr r1, =0x085b2668 @@ -597914,7 +597914,7 @@ _08136A18: ldr r1, [r0] adds r0, r6, 0 bl _call_via_r1 -_08136A3C: +@08136A3C: pop {r4-r6} pop {r0} bx r0 @@ -597923,7 +597923,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 @@ -597942,7 +597942,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 @@ -597961,7 +597961,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] @@ -597974,7 +597974,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 @@ -598030,7 +598030,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 @@ -598055,7 +598055,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 @@ -598088,7 +598088,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 @@ -598097,7 +598097,7 @@ sub_8136BC0: @ 8136BC0 movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _08136C36 + beq @08136C36 ldr r0, =0x0203ce7c ldrb r0, [r0] bl sub_8136F68 @@ -598136,7 +598136,7 @@ sub_8136BC0: @ 8136BC0 bl schedule_bg_copy_tilemap_to_vram adds r0, r7, 0 bl sub_8136C54 -_08136C36: +@08136C36: pop {r4-r7} pop {r0} bx r0 @@ -598145,7 +598145,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 @@ -598171,7 +598171,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} @@ -598219,19 +598219,19 @@ sub_8136C8C: @ 8136C8C lsls r4, 16 asrs r4, 16 cmp r4, 0 - bne _08136D10 + bne @08136D10 adds r0, 0x1 - b _08136D1A + b @08136D1A .align 2, 0 .pool -_08136D10: +@08136D10: cmp r4, 0 - ble _08136D18 + ble @08136D18 adds r0, 0x2 - b _08136D1A -_08136D18: + b @08136D1A +@08136D18: adds r0, 0x3 -_08136D1A: +@08136D1A: strh r0, [r7] mov r0, r8 bl sub_81364EC @@ -598243,7 +598243,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 @@ -598283,7 +598283,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 @@ -598319,7 +598319,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 @@ -598346,7 +598346,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 @@ -598395,24 +598395,24 @@ 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: +@08136E8C: adds r0, r4, 0 bl sub_8136E20 adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x27 - bls _08136E8C + bls @08136E8C pop {r4} pop {r0} bx r0 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 @@ -598420,7 +598420,7 @@ sub_8136EA4: @ 8136EA4 lsls r0, 24 lsrs r5, r0, 24 movs r1, 0x1 -_08136EB4: +@08136EB4: adds r0, r1, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -598430,12 +598430,12 @@ _08136EB4: lsls r0, 24 lsrs r0, 24 cmp r5, r0 - bcs _08136ECC + bcs @08136ECC adds r5, r0, 0 -_08136ECC: +@08136ECC: adds r1, r4, 0 cmp r1, 0x4 - bls _08136EB4 + bls @08136EB4 adds r0, r5, 0 pop {r4-r6} pop {r1} @@ -598443,54 +598443,54 @@ _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 lsls r0, 24 lsrs r0, 24 cmp r0, 0x63 - bls _08136EEE + bls @08136EEE movs r0, 0x63 -_08136EEE: +@08136EEE: pop {r1} bx r1 thumb_func_end sub_8136EDC thumb_func_start sub_8136EF4 -sub_8136EF4: @ 8136EF4 +sub_8136EF4: ; 8136EF4 push {lr} movs r1, 0 ldr r0, =0x03005d8c ldr r2, [r0] ldr r3, =0x00000848 -_08136EFE: +@08136EFE: lsls r0, r1, 3 adds r0, r2, r0 adds r0, r3 ldrb r0, [r0] cmp r0, 0 - bne _08136F18 + bne @08136F18 lsls r0, r1, 24 asrs r0, 24 - b _08136F26 + b @08136F26 .align 2, 0 .pool -_08136F18: +@08136F18: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x27 - bls _08136EFE + bls @08136EFE movs r0, 0x1 negs r0, r0 -_08136F26: +@08136F26: pop {r1} bx r1 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 @@ -598499,7 +598499,7 @@ sub_8136F2C: @ 8136F2C movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _08136F60 + beq @08136F60 ldr r0, =0x03005d8c ldr r2, [r0] lsls r0, r1, 3 @@ -598511,19 +598511,19 @@ sub_8136F2C: @ 8136F2C str r0, [r2] str r1, [r2, 0x4] movs r0, 0x1 - b _08136F62 + b @08136F62 .align 2, 0 .pool -_08136F60: +@08136F60: movs r0, 0 -_08136F62: +@08136F62: pop {r4} pop {r1} bx r1 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 @@ -598535,69 +598535,69 @@ sub_8136F68: @ 8136F68 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _08136F94 + beq @08136F94 adds r0, r2, 0 bl sub_8136E20 movs r0, 0x1 - b _08136F96 + b @08136F96 .align 2, 0 .pool -_08136F94: +@08136F94: movs r0, 0 -_08136F96: +@08136F96: pop {r1} bx r1 thumb_func_end sub_8136F68 thumb_func_start sub_8136F9C -sub_8136F9C: @ 8136F9C +sub_8136F9C: ; 8136F9C push {lr} lsls r1, 24 lsrs r1, 24 adds r2, r1, 0 cmp r1, 0 - bne _08136FAC + bne @08136FAC ldrb r0, [r0] - b _08136FDE -_08136FAC: + b @08136FDE +@08136FAC: cmp r1, 0x1 - bne _08136FB4 + bne @08136FB4 ldrb r0, [r0, 0x1] - b _08136FDE -_08136FB4: + b @08136FDE +@08136FB4: cmp r1, 0x2 - bne _08136FBC + bne @08136FBC ldrb r0, [r0, 0x2] - b _08136FDE -_08136FBC: + b @08136FDE +@08136FBC: cmp r1, 0x3 - bne _08136FC4 + bne @08136FC4 ldrb r0, [r0, 0x3] - b _08136FDE -_08136FC4: + b @08136FDE +@08136FC4: cmp r1, 0x4 - bne _08136FCC + bne @08136FCC ldrb r0, [r0, 0x4] - b _08136FDE -_08136FCC: + b @08136FDE +@08136FCC: cmp r1, 0x5 - bne _08136FD4 + bne @08136FD4 ldrb r0, [r0, 0x5] - b _08136FDE -_08136FD4: + b @08136FDE +@08136FD4: cmp r2, 0x6 - beq _08136FDC + beq @08136FDC movs r0, 0 - b _08136FDE -_08136FDC: + b @08136FDE +@08136FDC: ldrb r0, [r0, 0x6] -_08136FDE: +@08136FDE: pop {r1} bx r1 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 @@ -598611,7 +598611,7 @@ sub_8136FE4: @ 8136FE4 mov r9, r1 lsls r1, r0, 2 adds r7, r1, r0 -_08136FFE: +@08136FFE: adds r0, r4, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -598621,7 +598621,7 @@ _08136FFE: lsls r0, 16 asrs r1, r0, 16 cmp r1, 0 - ble _0813702A + ble @0813702A adds r0, r7, r4 add r0, r9 ldrb r0, [r0] @@ -598633,10 +598633,10 @@ _08136FFE: adds r0, r1 lsls r0, 16 lsrs r6, r0, 16 -_0813702A: +@0813702A: adds r4, r5, 0 cmp r4, 0x4 - bls _08136FFE + bls @08136FFE lsls r0, r6, 16 asrs r0, 16 pop {r3,r4} @@ -598650,7 +598650,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 @@ -598670,14 +598670,14 @@ 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 lsrs r5, r0, 24 movs r4, 0 ldr r7, =0x085b262c -_08137074: +@08137074: lsls r1, r4, 3 ldr r0, =0x085b2720 adds r1, r0 @@ -598685,7 +598685,7 @@ _08137074: bl sub_8136FE4 lsls r0, 16 cmp r0, 0 - ble _081370A0 + ble @081370A0 adds r0, r4, 0x1 lsls r0, 2 adds r0, r7 @@ -598693,29 +598693,29 @@ _08137074: adds r0, r6, 0 bl gf_strcpy movs r0, 0x1 - b _081370AC + b @081370AC .align 2, 0 .pool -_081370A0: +@081370A0: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 - bls _08137074 + bls @08137074 movs r0, 0 -_081370AC: +@081370AC: pop {r4-r7} pop {r1} bx r1 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 movs r6, 0 -_081370BC: +@081370BC: adds r1, r7, 0x1 lsls r1, 24 lsrs r1, 24 @@ -598731,16 +598731,16 @@ _081370BC: lsls r0, 16 lsls r1, r6, 16 cmp r4, r0 - bge _081370E2 + bge @081370E2 lsrs r7, r1, 16 -_081370E2: +@081370E2: movs r2, 0x80 lsls r2, 9 adds r0, r1, r2 lsrs r6, r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _081370BC + ble @081370BC lsls r0, r7, 24 lsrs r0, 24 pop {r4-r7} @@ -598749,12 +598749,12 @@ _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 cmp r0, 0 - beq _08137134 + beq @08137134 ldr r4, =0x020375f0 bl brm_get_pokemon_selection lsls r0, 24 @@ -598765,40 +598765,40 @@ sub_81370FC: @ 81370FC str r0, [r1] ldr r1, =0x0203ceec ldr r0, =sub_8179918 + 1 - b _08137152 + b @08137152 .align 2, 0 .pool -_08137134: +@08137134: ldr r0, =0x02037318 ldrb r0, [r0, 0x15] cmp r0, 0x1 - bne _08137170 + bne @08137170 ldr r0, =0x00000888 bl flag_check lsls r0, 24 cmp r0, 0 - bne _08137170 + bne @08137170 ldr r1, =0x03005db0 ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] ldr r1, =0x0203ceec ldr r0, =hm2_flash + 1 -_08137152: +@08137152: str r0, [r1] movs r0, 0x1 - b _08137172 + b @08137172 .align 2, 0 .pool -_08137170: +@08137170: movs r0, 0 -_08137172: +@08137172: pop {r4} pop {r1} bx r1 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 @@ -598826,7 +598826,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 @@ -598841,7 +598841,7 @@ sub_81371B4: @ 81371B4 thumb_func_end sub_81371B4 thumb_func_start sub_81371D4 -sub_81371D4: @ 81371D4 +sub_81371D4: ; 81371D4 push {lr} bl run_active_tasks bl call_obj_callbacks @@ -598852,7 +598852,7 @@ sub_81371D4: @ 81371D4 thumb_func_end sub_81371D4 thumb_func_start sub_81371EC -sub_81371EC: @ 81371EC +sub_81371EC: ; 81371EC push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -598862,7 +598862,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 @@ -598946,11 +598946,11 @@ c2_change_map: @ 8137200 bl sub_8137304 lsls r0, 24 cmp r0, 0 - bne _081372D2 + bne @081372D2 ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 -_081372D2: +@081372D2: add sp, 0x8 pop {r4} pop {r0} @@ -598960,7 +598960,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 @@ -598972,28 +598972,28 @@ sub_8137304: @ 8137304 ldr r4, =0x085b27c8 ldrb r0, [r4] cmp r0, 0 - beq _08137358 + beq @08137358 adds r7, r4, 0 adds r0, r4, 0x4 mov r12, r0 -_08137326: +@08137326: lsls r2, r3, 3 adds r1, r2, r7 ldrb r0, [r1] cmp r0, r6 - bne _08137348 + bne @08137348 ldrb r0, [r1, 0x1] cmp r0, r5 - bne _08137348 + bne @08137348 mov r1, r12 adds r0, r2, r1 ldr r0, [r0] bl _call_via_r0 movs r0, 0x1 - b _0813735A + b @0813735A .align 2, 0 .pool -_08137348: +@08137348: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 @@ -599001,17 +599001,17 @@ _08137348: adds r0, r4 ldrb r0, [r0] cmp r0, 0 - bne _08137326 -_08137358: + bne @08137326 +@08137358: movs r0, 0 -_0813735A: +@0813735A: pop {r4-r7} pop {r1} bx r1 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 @@ -599021,22 +599021,22 @@ sub_8137360: @ 8137360 ldr r1, =0x085b27c8 ldrb r0, [r1] cmp r0, 0 - beq _081373A0 + beq @081373A0 adds r6, r1, 0 -_08137376: +@08137376: lsls r0, r3, 3 adds r2, r0, r6 ldrb r0, [r2] cmp r0, r5 - bne _08137390 + bne @08137390 ldrb r0, [r2, 0x1] cmp r0, r4 - bne _08137390 + bne @08137390 ldrb r0, [r2, 0x2] - b _081373A2 + b @081373A2 .align 2, 0 .pool -_08137390: +@08137390: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 @@ -599044,17 +599044,17 @@ _08137390: adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _08137376 -_081373A0: + bne @08137376 +@081373A0: movs r0, 0 -_081373A2: +@081373A2: pop {r4-r6} pop {r1} bx r1 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 @@ -599064,22 +599064,22 @@ fade_type_for_given_maplight_pair: @ 81373A8 ldr r1, =0x085b27c8 ldrb r0, [r1] cmp r0, 0 - beq _081373E8 + beq @081373E8 adds r6, r1, 0 -_081373BE: +@081373BE: lsls r0, r3, 3 adds r2, r0, r6 ldrb r0, [r2] cmp r0, r5 - bne _081373D8 + bne @081373D8 ldrb r0, [r2, 0x1] cmp r0, r4 - bne _081373D8 + bne @081373D8 ldrb r0, [r2, 0x3] - b _081373EA + b @081373EA .align 2, 0 .pool -_081373D8: +@081373D8: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 @@ -599087,17 +599087,17 @@ _081373D8: adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _081373BE -_081373E8: + bne @081373BE +@081373E8: movs r0, 0 -_081373EA: +@081373EA: pop {r4-r6} pop {r1} bx r1 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 + 1 movs r1, 0 @@ -599109,7 +599109,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 @@ -599125,7 +599125,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 @@ -599182,7 +599182,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 @@ -599200,19 +599200,19 @@ sub_81374C4: @ 81374C4 movs r0, 0x52 bl lcd_io_set cmp r4, 0x10 - bhi _081374F8 + bhi @081374F8 ldrh r0, [r5, 0xA] adds r0, 0x1 strh r0, [r5, 0xA] - b _08137500 + b @08137500 .align 2, 0 .pool -_081374F8: +@081374F8: movs r0, 0 strh r0, [r5, 0xC] ldr r0, =sub_813750C + 1 str r0, [r5] -_08137500: +@08137500: pop {r4,r5} pop {r0} bx r0 @@ -599221,7 +599221,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 @@ -599236,7 +599236,7 @@ sub_813750C: @ 813750C adds r4, r0, r1 ldrh r1, [r4, 0xC] cmp r1, 0x7 - bhi _08137554 + bhi @08137554 adds r0, r1, 0x1 strh r0, [r4, 0xC] lsls r1, 1 @@ -599248,10 +599248,10 @@ sub_813750C: @ 813750C lsrs r2, 16 movs r1, 0xE0 bl gpu_pal_apply - b _08137566 + b @08137566 .align 2, 0 .pool -_08137554: +@08137554: ldr r0, =0x085b2850 movs r1, 0 movs r2, 0x20 @@ -599260,7 +599260,7 @@ _08137554: str r0, [r4] movs r0, 0x8 strh r0, [r4, 0xC] -_08137566: +@08137566: pop {r4} pop {r0} bx r0 @@ -599269,7 +599269,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 @@ -599282,17 +599282,17 @@ sub_8137574: @ 8137574 movs r3, 0xC ldrsh r0, [r1, r3] cmp r0, 0 - beq _08137598 + beq @08137598 subs r0, r2, 0x1 strh r0, [r1, 0xC] - b _081375A0 + b @081375A0 .align 2, 0 .pool -_08137598: +@08137598: ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 -_081375A0: +@081375A0: pop {r0} bx r0 .align 2, 0 @@ -599300,7 +599300,7 @@ _081375A0: thumb_func_end sub_8137574 thumb_func_start sub_81375A8 -sub_81375A8: @ 81375A8 +sub_81375A8: ; 81375A8 push {lr} ldr r0, =sub_81375BC + 1 movs r1, 0 @@ -599312,7 +599312,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 @@ -599328,7 +599328,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 @@ -599386,7 +599386,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 @@ -599397,7 +599397,7 @@ sub_8137678: @ 8137678 adds r4, r1, r2 ldrh r1, [r4, 0xC] cmp r1, 0xF - bhi _081376B4 + bhi @081376B4 adds r2, r1, 0x1 adds r0, r2, 0x1 strh r0, [r4, 0xC] @@ -599410,10 +599410,10 @@ sub_8137678: @ 8137678 lsrs r2, 16 movs r1, 0xE0 bl gpu_pal_apply - b _081376C8 + b @081376C8 .align 2, 0 .pool -_081376B4: +@081376B4: ldr r1, =0x00001010 movs r0, 0x52 bl lcd_io_set @@ -599422,7 +599422,7 @@ _081376B4: bl lcd_io_set ldr r0, =sub_81376DC + 1 str r0, [r4] -_081376C8: +@081376C8: pop {r4} pop {r0} bx r0 @@ -599431,7 +599431,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 @@ -599452,14 +599452,14 @@ sub_81376DC: @ 81376DC movs r0, 0x52 bl lcd_io_set cmp r4, 0 - beq _08137714 + beq @08137714 ldrh r0, [r5, 0xA] adds r0, 0x1 strh r0, [r5, 0xA] - b _08137726 + b @08137726 .align 2, 0 .pool -_08137714: +@08137714: ldr r0, =0x085b2870 movs r1, 0 movs r2, 0x20 @@ -599467,7 +599467,7 @@ _08137714: ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 -_08137726: +@08137726: pop {r4,r5} pop {r0} bx r0 @@ -599476,7 +599476,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} @@ -599488,23 +599488,23 @@ sub_8137734: @ 8137734 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x1 - bne _08137760 + bne @08137760 ldr r0, =0x0203bce4 strb r1, [r0] - b _0813776C + b @0813776C .align 2, 0 .pool -_08137760: +@08137760: ldr r1, =0x0203bce4 movs r0, 0 strb r0, [r1] adds r0, r4, 0 bl flag_set -_0813776C: +@0813776C: movs r0, 0x1 bl sub_80847F8 cmp r0, 0 - bne _0813778E + bne @0813778E ldr r0, =0x03005d90 ldr r2, [r0] ldrh r1, [r2, 0xE] @@ -599516,28 +599516,28 @@ _0813776C: orrs r1, r0 movs r0, 0x1 bl sav12_xor_set -_0813778E: +@0813778E: bl sub_8076D48 ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - bne _081377AC + bne @081377AC movs r0, 0x1 bl sub_8084F6C - b _081377B2 + b @081377B2 .align 2, 0 .pool -_081377AC: +@081377AC: movs r0, 0x2 bl sub_8084F6C -_081377B2: +@081377B2: movs r7, 0 movs r6, 0 add r0, sp, 0x18 mov r8, r0 mov r5, sp -_081377BC: +@081377BC: movs r0, 0x64 adds r1, r6, 0 muls r1, r0 @@ -599550,17 +599550,17 @@ _081377BC: movs r1, 0x5 bl pokemon_getattr cmp r0, 0 - beq _0813780A + beq @0813780A adds r0, r4, 0 movs r1, 0x6 bl pokemon_getattr cmp r0, 0 - bne _0813780A + bne @0813780A adds r0, r4, 0 movs r1, 0x43 bl pokemon_getattr cmp r0, 0 - bne _0813780A + bne @0813780A movs r0, 0x1 mov r1, r8 strb r0, [r1] @@ -599572,13 +599572,13 @@ _081377BC: bl sub_80EE5A4 strb r0, [r5, 0x1] movs r7, 0x1 -_0813780A: +@0813780A: adds r5, 0x4 adds r6, 0x1 cmp r6, 0x5 - ble _081377BC + ble @081377BC cmp r7, 0x1 - bne _0813785A + bne @0813785A movs r0, 0x2A bl sav12_xor_increment ldr r0, =0x0000089b @@ -599586,24 +599586,24 @@ _0813780A: mov r3, sp add r2, sp, 0x4 movs r6, 0x4 -_08137828: +@08137828: ldrb r1, [r3, 0x1] ldrb r0, [r2, 0x1] cmp r0, r1 - bls _08137838 + bls @08137838 ldr r1, [sp] ldr r0, [r2] str r0, [sp] str r1, [r2] -_08137838: +@08137838: adds r2, 0x4 subs r6, 0x1 cmp r6, 0 - bge _08137828 + bge @08137828 mov r0, sp ldrb r0, [r0, 0x1] cmp r0, 0x4 - bls _0813785A + bls @0813785A mov r0, sp ldrb r1, [r0] movs r0, 0x64 @@ -599612,7 +599612,7 @@ _08137838: adds r0, r1 movs r1, 0x43 bl sub_80EE4DC -_0813785A: +@0813785A: ldr r0, =sub_8173694 + 1 bl set_callback2 movs r0, 0 @@ -599627,7 +599627,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 + 1 bl set_callback2 @@ -599639,7 +599639,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 var_get @@ -599661,7 +599661,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 @@ -599680,7 +599680,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 @@ -599697,17 +599697,17 @@ 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 bl sub_8137890 adds r1, r0, 0 cmp r4, 0 - beq _08137928 + beq @08137928 ldr r3, =0x41c64e6d ldr r2, =0x00003039 -_08137918: +@08137918: adds r0, r1, 0 muls r0, r3 adds r1, r0, r2 @@ -599715,8 +599715,8 @@ _08137918: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - bne _08137918 -_08137928: + bne @08137918 +@08137928: adds r0, r1, 0 bl sub_81378BC pop {r4} @@ -599727,12 +599727,12 @@ _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 movs r5, 0 -_08137946: +@08137946: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -599742,31 +599742,31 @@ _08137946: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _08137978 + beq @08137978 adds r0, r4, 0 movs r1, 0 bl pokemon_getattr ldr r1, =0x0000ffff ands r1, r0 cmp r1, r6 - bne _08137978 + bne @08137978 movs r0, 0x1 - b _08137980 + b @08137980 .align 2, 0 .pool -_08137978: +@08137978: adds r5, 0x1 cmp r5, 0x5 - ble _08137946 + ble @08137946 movs r0, 0 -_08137980: +@08137980: pop {r4-r6} pop {r1} bx r1 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 @@ -599774,7 +599774,7 @@ sub_8137988: @ 8137988 bl is_light_level_1_2_3_5_or_6 lsls r0, 24 cmp r0, 0 - beq _081379CE + beq @081379CE bl sub_802F588 ldr r1, =0x085b2b44 ldr r0, =0x03005cf8 @@ -599784,16 +599784,16 @@ sub_8137988: @ 8137988 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _081379C8 + beq @081379C8 ldr r0, =0x0000089a bl flag_set - b _081379CE + b @081379CE .align 2, 0 .pool -_081379C8: +@081379C8: ldr r0, =0x0000089a bl flag_clear -_081379CE: +@081379CE: pop {r0} bx r0 .align 2, 0 @@ -599801,25 +599801,25 @@ _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 bl sub_80AC3BC lsls r0, 24 cmp r0, 0 - beq _081379F2 + beq @081379F2 bl script_env_2_enable_and_set_ctx_running adds r0, r4, 0 bl remove_task -_081379F2: +@081379F2: pop {r4} pop {r0} bx r0 thumb_func_end sub_81379D8 thumb_func_start sub_81379F8 -sub_81379F8: @ 81379F8 +sub_81379F8: ; 81379F8 push {lr} ldr r0, =sub_81379D8 + 1 movs r1, 0x50 @@ -599831,7 +599831,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 var_get_pointer @@ -599844,7 +599844,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 @@ -599867,29 +599867,29 @@ 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] cmp r0, 0 - bne _08137A70 + bne @08137A70 movs r0, 0 bl sub_80C0844 ldr r1, =0x020375e2 strh r0, [r1] movs r0, 0x1 bl sub_80C0844 - b _08137A80 + b @08137A80 .align 2, 0 .pool -_08137A70: +@08137A70: movs r0, 0 bl pokedex_count ldr r1, =0x020375e2 strh r0, [r1] movs r0, 0x1 bl pokedex_count -_08137A80: +@08137A80: ldr r1, =0x020375e4 strh r0, [r1] bl sub_809D42C @@ -599902,144 +599902,144 @@ _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 cmp r0, 0x9 - bhi _08137AA4 - b _08137BFC -_08137AA4: + bhi @08137AA4 + b @08137BFC +@08137AA4: cmp r0, 0x13 - bhi _08137AB0 + bhi @08137AB0 ldr r0, =0x082a5dab - b _08137C06 + b @08137C06 .align 2, 0 .pool -_08137AB0: +@08137AB0: cmp r0, 0x1D - bhi _08137ABC + bhi @08137ABC ldr r0, =0x082a5df1 - b _08137C06 + b @08137C06 .align 2, 0 .pool -_08137ABC: +@08137ABC: cmp r0, 0x27 - bhi _08137AC8 + bhi @08137AC8 ldr r0, =0x082a5e34 - b _08137C06 + b @08137C06 .align 2, 0 .pool -_08137AC8: +@08137AC8: cmp r0, 0x31 - bhi _08137AD4 + bhi @08137AD4 ldr r0, =0x082a5e83 - b _08137C06 + b @08137C06 .align 2, 0 .pool -_08137AD4: +@08137AD4: cmp r0, 0x3B - bhi _08137AE0 + bhi @08137AE0 ldr r0, =0x082a5eb9 - b _08137C06 + b @08137C06 .align 2, 0 .pool -_08137AE0: +@08137AE0: cmp r0, 0x45 - bhi _08137AEC + bhi @08137AEC ldr r0, =0x082a5ef4 - b _08137C06 + b @08137C06 .align 2, 0 .pool -_08137AEC: +@08137AEC: cmp r0, 0x4F - bhi _08137AF8 + bhi @08137AF8 ldr r0, =0x082a5f39 - b _08137C06 + b @08137C06 .align 2, 0 .pool -_08137AF8: +@08137AF8: cmp r0, 0x59 - bhi _08137B04 + bhi @08137B04 ldr r0, =0x082a5f82 - b _08137C06 + b @08137C06 .align 2, 0 .pool -_08137B04: +@08137B04: cmp r0, 0x63 - bhi _08137B10 + bhi @08137B10 ldr r0, =0x082a5fb9 - b _08137C06 + b @08137C06 .align 2, 0 .pool -_08137B10: +@08137B10: cmp r0, 0x6D - bhi _08137B1C + bhi @08137B1C ldr r0, =0x082a6018 - b _08137C06 + b @08137C06 .align 2, 0 .pool -_08137B1C: +@08137B1C: cmp r0, 0x77 - bhi _08137B28 + bhi @08137B28 ldr r0, =0x082a6061 - b _08137C06 + b @08137C06 .align 2, 0 .pool -_08137B28: +@08137B28: cmp r0, 0x81 - bhi _08137B34 + bhi @08137B34 ldr r0, =0x082a609c - b _08137C06 + b @08137C06 .align 2, 0 .pool -_08137B34: +@08137B34: cmp r0, 0x8B - bhi _08137B40 + bhi @08137B40 ldr r0, =0x082a60d5 - b _08137C06 + b @08137C06 .align 2, 0 .pool -_08137B40: +@08137B40: cmp r0, 0x95 - bhi _08137B4C + bhi @08137B4C ldr r0, =0x082a6124 - b _08137C06 + b @08137C06 .align 2, 0 .pool -_08137B4C: +@08137B4C: cmp r0, 0x9F - bhi _08137B58 + bhi @08137B58 ldr r0, =0x082a616f - b _08137C06 + b @08137C06 .align 2, 0 .pool -_08137B58: +@08137B58: cmp r0, 0xA9 - bhi _08137B64 + bhi @08137B64 ldr r0, =0x082a61d6 - b _08137C06 + b @08137C06 .align 2, 0 .pool -_08137B64: +@08137B64: cmp r0, 0xB3 - bhi _08137B70 + bhi @08137B70 ldr r0, =0x082a623a - b _08137C06 + b @08137C06 .align 2, 0 .pool -_08137B70: +@08137B70: cmp r0, 0xBD - bhi _08137B7C + bhi @08137B7C ldr r0, =0x082a6287 - b _08137C06 + b @08137C06 .align 2, 0 .pool -_08137B7C: +@08137B7C: cmp r0, 0xC7 - bls _08137BEA + bls @08137BEA cmp r0, 0xC8 - bne _08137BB8 + bne @08137BB8 ldr r0, =0x00000199 bl SpeciesToNationalPokedexNum lsls r0, 16 @@ -600048,7 +600048,7 @@ _08137B7C: bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - bne _08137BEA + bne @08137BEA movs r0, 0xCD lsls r0, 1 bl SpeciesToNationalPokedexNum @@ -600058,13 +600058,13 @@ _08137B7C: bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - bne _08137BEA - b _08137C04 + bne @08137BEA + b @08137C04 .align 2, 0 .pool -_08137BB8: +@08137BB8: cmp r0, 0xC9 - bne _08137BF8 + bne @08137BF8 ldr r0, =0x00000199 bl SpeciesToNationalPokedexNum lsls r0, 16 @@ -600073,7 +600073,7 @@ _08137BB8: bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - beq _08137C04 + beq @08137C04 movs r0, 0xCD lsls r0, 1 bl SpeciesToNationalPokedexNum @@ -600083,23 +600083,23 @@ _08137BB8: bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - beq _08137C04 -_08137BEA: + beq @08137C04 +@08137BEA: ldr r0, =0x082a62c9 - b _08137C06 + b @08137C06 .align 2, 0 .pool -_08137BF8: +@08137BF8: cmp r0, 0xCA - beq _08137C04 -_08137BFC: + beq @08137C04 +@08137BFC: ldr r0, =0x082a5d6c - b _08137C06 + b @08137C06 .align 2, 0 .pool -_08137C04: +@08137C04: ldr r0, =0x082a6312 -_08137C06: +@08137C06: pop {r1} bx r1 .align 2, 0 @@ -600107,7 +600107,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] @@ -600120,7 +600120,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 + 1 bl set_callback2 @@ -600132,7 +600132,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 + 1 bl set_callback2 @@ -600146,7 +600146,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 @@ -600171,7 +600171,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 @@ -600180,10 +600180,10 @@ sub_8137C94: @ 8137C94 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08137CAC + bne @08137CAC adds r0, r2, 0 bl remove_task -_08137CAC: +@08137CAC: pop {r0} bx r0 .align 2, 0 @@ -600191,7 +600191,7 @@ _08137CAC: thumb_func_end sub_8137C94 thumb_func_start sub_8137CB4 -sub_8137CB4: @ 8137CB4 +sub_8137CB4: ; 8137CB4 push {lr} ldr r0, =sub_8177888 + 1 bl set_callback2 @@ -600203,7 +600203,7 @@ sub_8137CB4: @ 8137CB4 thumb_func_end sub_8137CB4 thumb_func_start sub_8137CC8 -sub_8137CC8: @ 8137CC8 +sub_8137CC8: ; 8137CC8 push {lr} ldr r0, =0x030022c0 ldr r1, =c2_exit_to_overworld_2_switch + 1 @@ -600218,7 +600218,7 @@ sub_8137CC8: @ 8137CC8 thumb_func_end sub_8137CC8 thumb_func_start wild_pokemon_reroll -wild_pokemon_reroll: @ 8137CEC +wild_pokemon_reroll: ; 8137CEC ldr r0, =0x0203ab54 movs r1, 0 strb r1, [r0] @@ -600233,7 +600233,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] @@ -600250,38 +600250,38 @@ 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 walkrun_bitfield_and_r0 lsls r0, 24 cmp r0, 0 - beq _08137D46 + beq @08137D46 movs r0, 0x1 - b _08137D58 -_08137D46: + b @08137D58 +@08137D46: movs r0, 0x2 bl walkrun_bitfield_and_r0 lsls r0, 24 cmp r0, 0 - bne _08137D56 + bne @08137D56 movs r0, 0 - b _08137D58 -_08137D56: + b @08137D58 +@08137D56: movs r0, 0x2 -_08137D58: +@08137D58: pop {r1} bx r1 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 lsrs r6, r1, 24 cmp r6, 0x63 - bhi _08137D88 + bhi @08137D88 ldr r4, =0x02021cc4 adds r0, r4, 0 adds r1, r6, 0 @@ -600291,17 +600291,17 @@ sub_8137D5C: @ 8137D5C ldr r1, =0x085eb5ee adds r0, r4, 0 bl gf_strcat - b _08137D90 + b @08137D90 .align 2, 0 .pool -_08137D88: +@08137D88: ldr r0, =0x02021cc4 ldr r1, =0x085eb5cf bl gf_strcpy -_08137D90: +@08137D90: ldr r0, =0x00000e0f cmp r7, r0 - bhi _08137DF0 + bhi @08137DF0 ldr r4, =0x02021dc4 adds r0, r7, 0 movs r1, 0x3C @@ -600329,71 +600329,71 @@ _08137D90: ldr r1, =0x085eb5e5 adds r0, r4, 0 bl gf_strcat - b _08137DF8 + b @08137DF8 .align 2, 0 .pool -_08137DF0: +@08137DF0: ldr r0, =0x02021dc4 ldr r1, =0x085eb5da bl gf_strcpy -_08137DF8: +@08137DF8: movs r4, 0 cmp r6, 0 - bne _08137E0C + bne @08137E0C movs r4, 0x5 - b _08137E2A + b @08137E2A .align 2, 0 .pool -_08137E0C: +@08137E0C: cmp r6, 0x3 - bhi _08137E14 + bhi @08137E14 movs r4, 0x4 - b _08137E2A -_08137E14: + b @08137E2A +@08137E14: cmp r6, 0x9 - bhi _08137E1C + bhi @08137E1C movs r4, 0x3 - b _08137E2A -_08137E1C: + b @08137E2A +@08137E1C: cmp r6, 0x13 - bhi _08137E24 + bhi @08137E24 movs r4, 0x2 - b _08137E2A -_08137E24: + b @08137E2A +@08137E24: cmp r6, 0x63 - bhi _08137E2A + bhi @08137E2A movs r4, 0x1 -_08137E2A: +@08137E2A: adds r0, r7, 0 movs r1, 0x3C bl __udivsi3 cmp r0, 0xA - bhi _08137E3A + bhi @08137E3A adds r0, r4, 0x5 - b _08137E58 -_08137E3A: + b @08137E58 +@08137E3A: cmp r0, 0xF - bhi _08137E42 + bhi @08137E42 adds r0, r4, 0x4 - b _08137E58 -_08137E42: + b @08137E58 +@08137E42: cmp r0, 0x14 - bhi _08137E4A + bhi @08137E4A adds r0, r4, 0x3 - b _08137E58 -_08137E4A: + b @08137E58 +@08137E4A: cmp r0, 0x28 - bhi _08137E52 + bhi @08137E52 adds r0, r4, 0x2 - b _08137E58 -_08137E52: + b @08137E58 +@08137E52: cmp r0, 0x3B - bhi _08137E5C + bhi @08137E5C adds r0, r4, 0x1 -_08137E58: +@08137E58: lsls r0, 24 lsrs r4, r0, 24 -_08137E5C: +@08137E5C: ldr r0, =0x020375f0 strh r4, [r0] pop {r4-r7} @@ -600404,7 +600404,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 @@ -600426,7 +600426,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} @@ -600446,10 +600446,10 @@ sub_8137E9C: @ 8137E9C lsls r0, 16 adds r4, r0 cmp r4, r5 - bhi _08137ECC + bhi @08137ECC cmp r4, 0 - bne _08137EE6 -_08137ECC: + bne @08137EE6 +@08137ECC: lsls r1, r5, 16 lsrs r1, 16 adds r0, r6, 0 @@ -600460,7 +600460,7 @@ _08137ECC: ldr r0, =0x00004027 mov r1, r8 bl var_set -_08137EE6: +@08137EE6: pop {r3} mov r8, r3 pop {r4-r7} @@ -600471,7 +600471,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 var_get @@ -600483,7 +600483,7 @@ sub_8137EFC: @ 8137EFC lsls r0, 16 adds r4, r0 cmp r4, 0 - beq _08137F3C + beq @08137F3C ldr r0, =0x00004027 bl var_get adds r1, r0, 0 @@ -600492,45 +600492,45 @@ sub_8137EFC: @ 8137EFC adds r0, r4, 0 bl sub_8137D5C movs r0, 0x1 - b _08137F3E + b @08137F3E .align 2, 0 .pool -_08137F3C: +@08137F3C: movs r0, 0 -_08137F3E: +@08137F3E: pop {r4} pop {r1} bx r1 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] ldr r0, =0x00000c1d cmp r1, r0 - beq _08137F7C + beq @08137F7C ldr r4, =0x000040a9 adds r0, r4, 0 bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - beq _08137F6E + beq @08137F6E adds r0, r4, 0 bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x3 - bne _08137F7C -_08137F6E: + bne @08137F7C +@08137F6E: adds r0, r4, 0 movs r1, 0 bl var_set movs r0, 0 bl sav1_set_x2C -_08137F7C: +@08137F7C: pop {r4} pop {r0} bx r0 @@ -600539,7 +600539,7 @@ _08137F7C: thumb_func_end sub_8137F44 thumb_func_start sub_8137F90 -sub_8137F90: @ 8137F90 +sub_8137F90: ; 8137F90 push {lr} ldr r0, =0x0000088d bl flag_set @@ -600554,7 +600554,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 flag_clear @@ -600565,7 +600565,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 @@ -600573,7 +600573,7 @@ sub_8137FC0: @ 8137FC0 bl flag_check lsls r0, 24 cmp r0, 0 - beq _08137FE6 + beq @08137FE6 ldr r0, =0x0000404a bl var_get_pointer ldrh r1, [r0] @@ -600582,22 +600582,22 @@ sub_8137FC0: @ 8137FC0 lsls r1, 16 lsrs r1, 16 cmp r1, 0xCC - bhi _08137FF4 -_08137FE6: + bhi @08137FF4 +@08137FE6: movs r0, 0 - b _08137FF6 + b @08137FF6 .align 2, 0 .pool -_08137FF4: +@08137FF4: movs r0, 0x1 -_08137FF6: +@08137FF6: pop {r4} pop {r1} bx r1 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} @@ -600613,95 +600613,95 @@ sub_8137FFC: @ 8137FFC ldrh r0, [r0] subs r0, 0x1 cmp r0, 0x9 - bhi _081380C2 + bhi @081380C2 lsls r0, 2 - ldr r1, =_08138038 + ldr r1, =@08138038 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08138038: - .4byte _08138060 - .4byte _08138070 - .4byte _08138064 - .4byte _08138068 - .4byte _08138068 - .4byte _0813806C - .4byte _08138098 - .4byte _08138060 - .4byte _08138064 - .4byte _0813806C -_08138060: +@08138038: + .4byte @08138060 + .4byte @08138070 + .4byte @08138064 + .4byte @08138068 + .4byte @08138068 + .4byte @0813806C + .4byte @08138098 + .4byte @08138060 + .4byte @08138064 + .4byte @0813806C +@08138060: movs r0, 0x1 - b _081380CE -_08138064: + b @081380CE +@08138064: movs r0, 0x4 - b _081380CE -_08138068: + b @081380CE +@08138068: movs r0, 0x2 - b _081380CE -_0813806C: + b @081380CE +@0813806C: movs r0, 0x3 - b _081380CE -_08138070: + b @081380CE +@08138070: ldrh r0, [r4] cmp r0, 0x3B - bhi _08138080 + bhi @08138080 movs r0, 0x31 strb r0, [r5] ldrh r0, [r4] adds r0, 0x13 - b _081380C0 -_08138080: + b @081380C0 +@08138080: cmp r0, 0x8B - bhi _0813808E + bhi @0813808E movs r0, 0x30 strb r0, [r5] ldrh r0, [r4] subs r0, 0x3C - b _081380C0 -_0813808E: + b @081380C0 +@0813808E: movs r0, 0x2F strb r0, [r5] ldrh r0, [r4] subs r0, 0x8C - b _081380C0 -_08138098: + b @081380C0 +@08138098: ldrh r0, [r4] cmp r0, 0x41 - bhi _081380A8 + bhi @081380A8 movs r0, 0x2F strb r0, [r5] ldrh r1, [r4] movs r0, 0x41 - b _081380BE -_081380A8: + b @081380BE +@081380A8: cmp r0, 0x91 - bhi _081380B6 + bhi @081380B6 movs r0, 0x30 strb r0, [r5] ldrh r1, [r4] movs r0, 0x91 - b _081380BE -_081380B6: + b @081380BE +@081380B6: movs r0, 0x31 strb r0, [r5] ldrh r1, [r4] movs r0, 0xE0 -_081380BE: +@081380BE: subs r0, r1 -_081380C0: +@081380C0: strh r0, [r6] -_081380C2: +@081380C2: movs r0, 0 mov r1, r8 strb r0, [r1] movs r0, 0x14 strh r0, [r7] movs r0, 0 -_081380CE: +@081380CE: pop {r3} mov r8, r3 pop {r4-r7} @@ -600710,22 +600710,22 @@ _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 flag_check lsls r0, 24 cmp r0, 0 - beq _0813810A + beq @0813810A ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x1 - blt _0813810A + blt @0813810A cmp r0, 0x3 - ble _081380F6 + ble @081380F6 cmp r0, 0x6 - bne _0813810A -_081380F6: + bne @0813810A +@081380F6: ldr r0, =0x000040f2 bl var_get_pointer ldrh r1, [r0] @@ -600734,36 +600734,36 @@ _081380F6: lsls r1, 16 lsrs r1, 16 cmp r1, 0xF9 - bhi _08138118 -_0813810A: + bhi @08138118 +@0813810A: movs r0, 0 - b _0813811A + b @0813811A .align 2, 0 .pool -_08138118: +@08138118: movs r0, 0x1 -_0813811A: +@0813811A: pop {r1} bx r1 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 flag_check lsls r0, 24 cmp r0, 0 - beq _08138152 + beq @08138152 ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x1 - blt _08138152 + blt @08138152 cmp r0, 0x3 - ble _0813813E + ble @0813813E cmp r0, 0x6 - bne _08138152 -_0813813E: + bne @08138152 +@0813813E: ldr r0, =0x000040f3 bl var_get_pointer ldrh r1, [r0] @@ -600772,36 +600772,36 @@ _0813813E: lsls r1, 16 lsrs r1, 16 cmp r1, 0x9 - bhi _08138160 -_08138152: + bhi @08138160 +@08138152: movs r0, 0 - b _08138162 + b @08138162 .align 2, 0 .pool -_08138160: +@08138160: movs r0, 0x1 -_08138162: +@08138162: pop {r1} bx r1 thumb_func_end sub_8138120 thumb_func_start sub_8138168 -sub_8138168: @ 8138168 +sub_8138168: ; 8138168 push {lr} movs r0, 0x72 bl flag_check lsls r0, 24 cmp r0, 0 - beq _0813819A + beq @0813819A ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x1 - blt _0813819A + blt @0813819A cmp r0, 0x3 - ble _08138186 + ble @08138186 cmp r0, 0x6 - bne _0813819A -_08138186: + bne @0813819A +@08138186: ldr r0, =0x000040f5 bl var_get_pointer ldrh r1, [r0] @@ -600810,36 +600810,36 @@ _08138186: lsls r1, 16 lsrs r1, 16 cmp r1, 0x9 - bhi _081381A8 -_0813819A: + bhi @081381A8 +@0813819A: movs r0, 0 - b _081381AA + b @081381AA .align 2, 0 .pool -_081381A8: +@081381A8: movs r0, 0x1 -_081381AA: +@081381AA: pop {r1} bx r1 thumb_func_end sub_8138168 thumb_func_start sub_81381B0 -sub_81381B0: @ 81381B0 +sub_81381B0: ; 81381B0 push {lr} movs r0, 0x80 bl flag_check lsls r0, 24 cmp r0, 0 - beq _081381E2 + beq @081381E2 ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x1 - blt _081381E2 + blt @081381E2 cmp r0, 0x3 - ble _081381CE + ble @081381CE cmp r0, 0x6 - bne _081381E2 -_081381CE: + bne @081381E2 +@081381CE: ldr r0, =0x000040f4 bl var_get_pointer ldrh r1, [r0] @@ -600848,36 +600848,36 @@ _081381CE: lsls r1, 16 lsrs r1, 16 cmp r1, 0xF9 - bhi _081381F0 -_081381E2: + bhi @081381F0 +@081381E2: movs r0, 0 - b _081381F2 + b @081381F2 .align 2, 0 .pool -_081381F0: +@081381F0: movs r0, 0x1 -_081381F2: +@081381F2: pop {r1} bx r1 thumb_func_end sub_81381B0 thumb_func_start sub_81381F8 -sub_81381F8: @ 81381F8 +sub_81381F8: ; 81381F8 push {lr} movs r0, 0x75 bl flag_check lsls r0, 24 cmp r0, 0 - beq _0813822A + beq @0813822A ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x1 - blt _0813822A + blt @0813822A cmp r0, 0x3 - ble _08138216 + ble @08138216 cmp r0, 0x6 - bne _0813822A -_08138216: + bne @0813822A +@08138216: ldr r0, =0x000040f6 bl var_get_pointer ldrh r1, [r0] @@ -600886,21 +600886,21 @@ _08138216: lsls r1, 16 lsrs r1, 16 cmp r1, 0xF9 - bhi _08138238 -_0813822A: + bhi @08138238 +@0813822A: movs r0, 0 - b _0813823A + b @0813823A .align 2, 0 .pool -_08138238: +@08138238: movs r0, 0x1 -_0813823A: +@0813823A: pop {r1} bx r1 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} @@ -600913,12 +600913,12 @@ sub_8138240: @ 8138240 lsrs r5, r0, 24 movs r4, 0 cmp r4, r5 - bcs _0813828A + bcs @0813828A ldr r0, =0x0858d144 mov r8, r0 -_08138262: +@08138262: cmp r7, r4 - beq _08138280 + beq @08138280 lsls r0, r6, 2 add r0, r8 ldr r0, [r0] @@ -600931,13 +600931,13 @@ _08138262: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_08138280: +@08138280: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc _08138262 -_0813828A: + bcc @08138262 +@0813828A: adds r0, r5, 0 pop {r3} mov r8, r3 @@ -600949,7 +600949,7 @@ _0813828A: thumb_func_end sub_8138240 thumb_func_start sub_81382A0 -sub_81382A0: @ 81382A0 +sub_81382A0: ; 81382A0 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -600978,30 +600978,30 @@ sub_81382A0: @ 81382A0 lsrs r0, 24 adds r1, r0, 0 cmp r0, 0x2 - beq _08138310 + beq @08138310 cmp r0, 0x2 - bgt _081382F4 + bgt @081382F4 cmp r0, 0x1 - beq _0813833C - b _08138350 + beq @0813833C + b @08138350 .align 2, 0 .pool -_081382F4: +@081382F4: cmp r1, 0x3 - beq _081382FE + beq @081382FE cmp r1, 0x4 - beq _08138324 - b _08138350 -_081382FE: + beq @08138324 + b @08138350 +@081382FE: movs r7, 0x2 ldr r0, =0x03005d8c ldr r1, [r0] ldrh r0, [r1] subs r0, 0x1 - b _0813832C + b @0813832C .align 2, 0 .pool -_08138310: +@08138310: movs r7, 0x1 ldr r0, =0x03005d8c ldr r0, [r0] @@ -601009,24 +601009,24 @@ _08138310: mov r9, r1 ldrh r0, [r0, 0x2] subs r0, 0x1 - b _0813834A + b @0813834A .align 2, 0 .pool -_08138324: +@08138324: ldr r0, =0x03005d8c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 -_0813832C: +@0813832C: lsls r0, 16 lsrs r0, 16 mov r9, r0 ldrh r1, [r1, 0x2] mov r8, r1 - b _08138350 + b @08138350 .align 2, 0 .pool -_0813833C: +@0813833C: movs r7, 0x3 ldr r0, =0x03005d8c ldr r0, [r0] @@ -601034,18 +601034,18 @@ _0813833C: mov r9, r3 ldrh r0, [r0, 0x2] adds r0, 0x1 -_0813834A: +@0813834A: lsls r0, 16 lsrs r0, 16 mov r8, r0 -_08138350: +@08138350: movs r6, 0 - b _08138410 + b @08138410 .align 2, 0 .pool -_08138358: +@08138358: cmp r10, r6 - beq _0813840A + beq @0813840A ldr r0, =0x020229e8 lsls r2, r6, 3 subs r1, r2, r6 @@ -601054,35 +601054,35 @@ _08138358: ldrb r3, [r1] adds r4, r0, 0 cmp r3, 0x1 - blt _0813838C + blt @0813838C cmp r3, 0x2 - ble _0813837C + ble @0813837C cmp r3, 0x3 - beq _08138388 - b _0813838C + beq @08138388 + b @0813838C .align 2, 0 .pool -_0813837C: +@0813837C: ldrb r0, [r1, 0x13] movs r5, 0xEC cmp r0, 0 - bne _0813839C + bne @0813839C movs r5, 0xEB - b _0813839C -_08138388: + b @0813839C +@08138388: ldrb r0, [r1, 0x13] - b _08138394 -_0813838C: + b @08138394 +@0813838C: subs r0, r2, r6 lsls r0, 2 adds r0, r4 ldrb r0, [r0, 0x13] -_08138394: +@08138394: movs r5, 0x69 cmp r0, 0 - bne _0813839C + bne @0813839C movs r5, 0x64 -_0813839C: +@0813839C: mov r0, sp adds r0, r7 adds r0, 0x8 @@ -601134,17 +601134,17 @@ _0813839C: lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x4 - bne _0813840A + bne @0813840A movs r7, 0 -_0813840A: +@0813840A: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_08138410: +@08138410: ldr r0, =0x020375e0 ldrh r0, [r0] cmp r6, r0 - bcc _08138358 + bcc @08138358 add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -601158,7 +601158,7 @@ _08138410: thumb_func_end sub_81382A0 thumb_func_start sub_813842C -sub_813842C: @ 813842C +sub_813842C: ; 813842C push {r4,r5,lr} lsls r0, 24 lsls r1, 24 @@ -601174,12 +601174,12 @@ sub_813842C: @ 813842C adds r0, r2 lsrs r0, 24 cmp r0, 0x1 - bls _08138454 + bls @08138454 cmp r4, 0x64 - beq _08138454 + beq @08138454 cmp r4, 0x69 - bne _081384E6 -_08138454: + bne @081384E6 +@08138454: ldr r0, =0x03005d8c ldr r0, [r0] ldrb r1, [r0, 0x5] @@ -601189,7 +601189,7 @@ _08138454: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x10 - beq _081384E6 + beq @081384E6 ldr r1, =0x02037350 lsls r0, r2, 3 adds r0, r2 @@ -601208,49 +601208,49 @@ _08138454: orrs r0, r3 strb r0, [r1, 0x5] cmp r4, 0x69 - beq _081384D8 + beq @081384D8 cmp r4, 0x69 - bgt _081384A8 + bgt @081384A8 cmp r4, 0x64 - beq _081384C4 - b _081384E6 + beq @081384C4 + b @081384E6 .align 2, 0 .pool -_081384A8: +@081384A8: cmp r4, 0xEB - beq _081384B2 + beq @081384B2 cmp r4, 0xEC - beq _081384BC - b _081384E6 -_081384B2: + beq @081384BC + b @081384E6 +@081384B2: ldr r0, =0x08499a18 - b _081384C6 + b @081384C6 .align 2, 0 .pool -_081384BC: +@081384BC: ldr r0, =0x084a54b8 - b _081384C6 + b @081384C6 .align 2, 0 .pool -_081384C4: +@081384C4: ldr r0, =0x084987f8 -_081384C6: +@081384C6: movs r2, 0x80 lsls r2, 1 adds r1, r3, r2 movs r2, 0x20 bl gpu_pal_apply - b _081384E6 + b @081384E6 .align 2, 0 .pool -_081384D8: +@081384D8: ldr r0, =0x084a4278 movs r2, 0x80 lsls r2, 1 adds r1, r3, r2 movs r2, 0x20 bl gpu_pal_apply -_081384E6: +@081384E6: pop {r4,r5} pop {r0} bx r0 @@ -601259,37 +601259,37 @@ _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, =0x085b2b68 -_081384F6: +@081384F6: ldr r0, =0x020375e0 ldrh r0, [r0] cmp r4, r0 - bne _0813851C + bne @0813851C lsls r1, r4, 2 adds r1, r5 ldrb r0, [r1] ldrb r1, [r1, 0x1] ldr r2, =0x00000206 bl setmaptile_0 - b _0813852A + b @0813852A .align 2, 0 .pool -_0813851C: +@0813851C: lsls r1, r4, 2 adds r1, r5 ldrb r0, [r1] ldrb r1, [r1, 0x1] ldr r2, =0x00000205 bl setmaptile_0 -_0813852A: +@0813852A: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _081384F6 + bls @081384F6 pop {r4,r5} pop {r0} bx r0 @@ -601298,234 +601298,234 @@ _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: +@08138544: movs r4, 0x7 adds r6, r5, 0x1 -_08138548: +@08138548: adds r0, r4, 0 adds r1, r5, 0 bl cur_mapdata_get_blockid_at ldr r1, =0xfffffde6 adds r0, r1 cmp r0, 0x37 - bls _0813855A - b _08138734 -_0813855A: + bls @0813855A + b @08138734 +@0813855A: lsls r0, 2 - ldr r1, =_0813856C + ldr r1, =@0813856C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0813856C: - .4byte _081386F2 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _0813864C - .4byte _08138652 - .4byte _0813868C - .4byte _08138694 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _0813865C - .4byte _08138662 - .4byte _0813869C - .4byte _081386A4 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _0813866C - .4byte _08138672 - .4byte _081386AC - .4byte _081386B4 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _0813867C - .4byte _08138684 - .4byte _081386BC - .4byte _081386C4 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _081386CC - .4byte _081386DC - .4byte _081386EC - .4byte _08138714 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _081386D4 - .4byte _081386E4 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _0813872A - .4byte _0813871C -_0813864C: +@0813856C: + .4byte @081386F2 + .4byte @08138734 + .4byte @08138734 + .4byte @08138734 + .4byte @08138734 + .4byte @08138734 + .4byte @0813864C + .4byte @08138652 + .4byte @0813868C + .4byte @08138694 + .4byte @08138734 + .4byte @08138734 + .4byte @08138734 + .4byte @08138734 + .4byte @0813865C + .4byte @08138662 + .4byte @0813869C + .4byte @081386A4 + .4byte @08138734 + .4byte @08138734 + .4byte @08138734 + .4byte @08138734 + .4byte @0813866C + .4byte @08138672 + .4byte @081386AC + .4byte @081386B4 + .4byte @08138734 + .4byte @08138734 + .4byte @08138734 + .4byte @08138734 + .4byte @0813867C + .4byte @08138684 + .4byte @081386BC + .4byte @081386C4 + .4byte @08138734 + .4byte @08138734 + .4byte @08138734 + .4byte @08138734 + .4byte @081386CC + .4byte @081386DC + .4byte @081386EC + .4byte @08138714 + .4byte @08138734 + .4byte @08138734 + .4byte @08138734 + .4byte @08138734 + .4byte @081386D4 + .4byte @081386E4 + .4byte @08138734 + .4byte @08138734 + .4byte @08138734 + .4byte @08138734 + .4byte @08138734 + .4byte @08138734 + .4byte @0813872A + .4byte @0813871C +@0813864C: movs r2, 0x8C lsls r2, 2 - b _08138720 -_08138652: + b @08138720 +@08138652: ldr r2, =0x00000231 - b _08138720 + b @08138720 .align 2, 0 .pool -_0813865C: +@0813865C: movs r2, 0x8E lsls r2, 2 - b _08138720 -_08138662: + b @08138720 +@08138662: ldr r2, =0x00000239 - b _08138720 + b @08138720 .align 2, 0 .pool -_0813866C: +@0813866C: movs r2, 0x88 lsls r2, 2 - b _08138720 -_08138672: + b @08138720 +@08138672: ldr r2, =0x00000221 - b _08138720 + b @08138720 .align 2, 0 .pool -_0813867C: +@0813867C: ldr r2, =0x00000e28 - b _08138720 + b @08138720 .align 2, 0 .pool -_08138684: +@08138684: ldr r2, =0x00000e29 - b _08138720 + b @08138720 .align 2, 0 .pool -_0813868C: +@0813868C: ldr r2, =0x00000232 - b _08138720 + b @08138720 .align 2, 0 .pool -_08138694: +@08138694: ldr r2, =0x00000233 - b _08138720 + b @08138720 .align 2, 0 .pool -_0813869C: +@0813869C: ldr r2, =0x0000023a - b _08138720 + b @08138720 .align 2, 0 .pool -_081386A4: +@081386A4: ldr r2, =0x0000023b - b _08138720 + b @08138720 .align 2, 0 .pool -_081386AC: +@081386AC: ldr r2, =0x00000222 - b _08138720 + b @08138720 .align 2, 0 .pool -_081386B4: +@081386B4: ldr r2, =0x00000223 - b _08138720 + b @08138720 .align 2, 0 .pool -_081386BC: +@081386BC: ldr r2, =0x00000e2a - b _08138720 + b @08138720 .align 2, 0 .pool -_081386C4: +@081386C4: ldr r2, =0x00000e2b - b _08138720 + b @08138720 .align 2, 0 .pool -_081386CC: +@081386CC: ldr r2, =0x00000e42 - b _08138720 + b @08138720 .align 2, 0 .pool -_081386D4: +@081386D4: ldr r2, =0x0000021a - b _08138720 + b @08138720 .align 2, 0 .pool -_081386DC: +@081386DC: ldr r2, =0x00000e43 - b _08138720 + b @08138720 .align 2, 0 .pool -_081386E4: +@081386E4: ldr r2, =0x0000021a - b _08138720 + b @08138720 .align 2, 0 .pool -_081386EC: +@081386EC: movs r2, 0xE4 lsls r2, 4 - b _08138720 -_081386F2: + b @08138720 +@081386F2: subs r1, r5, 0x1 adds r0, r4, 0 bl cur_mapdata_get_blockid_at movs r1, 0x90 lsls r1, 2 cmp r0, r1 - bne _0813870C + bne @0813870C ldr r2, =0x00000e48 - b _08138720 + b @08138720 .align 2, 0 .pool -_0813870C: +@0813870C: ldr r2, =0x00000e49 - b _08138720 + b @08138720 .align 2, 0 .pool -_08138714: +@08138714: ldr r2, =0x00000e41 - b _08138720 + b @08138720 .align 2, 0 .pool -_0813871C: +@0813871C: movs r2, 0xE5 lsls r2, 4 -_08138720: +@08138720: adds r0, r4, 0 adds r1, r5, 0 bl setmaptile_0 - b _08138734 -_0813872A: + b @08138734 +@0813872A: ldr r2, =0x00000251 adds r0, r4, 0 adds r1, r5, 0 bl setmaptile_0 -_08138734: +@08138734: adds r4, 0x1 cmp r4, 0xF - bgt _0813873C - b _08138548 -_0813873C: + bgt @0813873C + b @08138548 +@0813873C: adds r5, r6, 0 cmp r5, 0x17 - bgt _08138744 - b _08138544 -_08138744: + bgt @08138744 + b @08138544 +@08138744: pop {r4-r6} pop {r0} bx r0 @@ -601534,11 +601534,11 @@ _08138744: thumb_func_end sub_8138540 thumb_func_start sub_8138750 -sub_8138750: @ 8138750 +sub_8138750: ; 8138750 push {r4-r6,lr} ldr r4, =0x085b2b68 movs r5, 0x3 -_08138756: +@08138756: ldrb r0, [r4] ldrb r1, [r4, 0x1] ldr r2, =0x00000206 @@ -601546,152 +601546,152 @@ _08138756: adds r4, 0x4 subs r5, 0x1 cmp r5, 0 - bge _08138756 + bge @08138756 movs r5, 0xC -_0813876A: +@0813876A: movs r4, 0x7 adds r6, r5, 0x1 -_0813876E: +@0813876E: adds r0, r4, 0 adds r1, r5, 0 bl cur_mapdata_get_blockid_at ldr r1, =0xfffffde0 adds r0, r1 cmp r0, 0x30 - bls _08138780 - b _081388CA -_08138780: + bls @08138780 + b @081388CA +@08138780: lsls r0, 2 - ldr r1, =_0813879C + ldr r1, =@0813879C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0813879C: - .4byte _08138860 - .4byte _08138866 - .4byte _08138880 - .4byte _08138888 - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _08138870 - .4byte _08138876 - .4byte _08138890 - .4byte _08138898 - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388A0 - .4byte _081388A8 - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388B0 - .4byte _081388B0 - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388C0 -_08138860: +@0813879C: + .4byte @08138860 + .4byte @08138866 + .4byte @08138880 + .4byte @08138888 + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @08138870 + .4byte @08138876 + .4byte @08138890 + .4byte @08138898 + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388A0 + .4byte @081388A8 + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388B0 + .4byte @081388B0 + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388CA + .4byte @081388C0 +@08138860: movs r2, 0x8C lsls r2, 2 - b _081388B2 -_08138866: + b @081388B2 +@08138866: ldr r2, =0x00000231 - b _081388B2 + b @081388B2 .align 2, 0 .pool -_08138870: +@08138870: movs r2, 0x8E lsls r2, 2 - b _081388B2 -_08138876: + b @081388B2 +@08138876: ldr r2, =0x00000239 - b _081388B2 + b @081388B2 .align 2, 0 .pool -_08138880: +@08138880: ldr r2, =0x00000232 - b _081388B2 + b @081388B2 .align 2, 0 .pool -_08138888: +@08138888: ldr r2, =0x00000233 - b _081388B2 + b @081388B2 .align 2, 0 .pool -_08138890: +@08138890: ldr r2, =0x0000023a - b _081388B2 + b @081388B2 .align 2, 0 .pool -_08138898: +@08138898: ldr r2, =0x0000023b - b _081388B2 + b @081388B2 .align 2, 0 .pool -_081388A0: +@081388A0: ldr r2, =0x00000e42 - b _081388B2 + b @081388B2 .align 2, 0 .pool -_081388A8: +@081388A8: ldr r2, =0x00000e43 - b _081388B2 + b @081388B2 .align 2, 0 .pool -_081388B0: +@081388B0: ldr r2, =0x0000021a -_081388B2: +@081388B2: adds r0, r4, 0 adds r1, r5, 0 bl setmaptile_0 - b _081388CA + b @081388CA .align 2, 0 .pool -_081388C0: +@081388C0: ldr r2, =0x00000251 adds r0, r4, 0 adds r1, r5, 0 bl setmaptile_0 -_081388CA: +@081388CA: adds r4, 0x1 cmp r4, 0xF - bgt _081388D2 - b _0813876E -_081388D2: + bgt @081388D2 + b @0813876E +@081388D2: adds r5, r6, 0 cmp r5, 0x17 - bgt _081388DA - b _0813876A -_081388DA: + bgt @081388DA + b @0813876A +@081388DA: pop {r4-r6} pop {r0} bx r0 @@ -601700,7 +601700,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 @@ -601719,7 +601719,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 @@ -601731,7 +601731,7 @@ sub_8138910: @ 8138910 ldrb r2, [r4] ldrb r0, [r0] cmp r0, r2 - bne _0813896C + bne @0813896C ldr r0, =0x020375e0 ldrb r0, [r0] ldr r2, =0x085b2b7e @@ -601747,24 +601747,24 @@ sub_8138910: @ 8138910 lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 - bne _08138970 + bne @08138970 adds r0, r6, 0 bl remove_task bl script_env_2_enable_and_set_ctx_running - b _08138970 + b @08138970 .align 2, 0 .pool -_0813896C: +@0813896C: adds r0, r2, 0x1 strb r0, [r4] -_08138970: +@08138970: pop {r4-r6} pop {r0} bx r0 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 @@ -601777,25 +601777,25 @@ sub_8138978: @ 8138978 movs r7, 0 subs r0, 0x1 cmp r0, 0x7 - bhi _08138A40 + bhi @08138A40 lsls r0, 2 - ldr r1, =_081389A0 + ldr r1, =@081389A0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081389A0: - .4byte _081389C0 - .4byte _081389D2 - .4byte _081389E4 - .4byte _081389F6 - .4byte _08138A04 - .4byte _08138A1A - .4byte _08138A26 - .4byte _08138A34 -_081389C0: +@081389A0: + .4byte @081389C0 + .4byte @081389D2 + .4byte @081389E4 + .4byte @081389F6 + .4byte @08138A04 + .4byte @08138A1A + .4byte @08138A26 + .4byte @08138A34 +@081389C0: movs r7, 0x2 mov r1, sp movs r0, 0x1 @@ -601804,8 +601804,8 @@ _081389C0: strh r0, [r1, 0x2] add r1, sp, 0x8 movs r0, 0x68 - b _08138A14 -_081389D2: + b @08138A14 +@081389D2: movs r7, 0x2 mov r1, sp movs r0, 0x1 @@ -601814,8 +601814,8 @@ _081389D2: strh r0, [r1, 0x2] add r1, sp, 0x8 movs r0, 0x4E - b _08138A14 -_081389E4: + b @08138A14 +@081389E4: movs r7, 0x2 mov r1, sp movs r0, 0x1 @@ -601824,16 +601824,16 @@ _081389E4: strh r0, [r1, 0x2] add r1, sp, 0x8 movs r0, 0x5B - b _08138A14 -_081389F6: + b @08138A14 +@081389F6: movs r7, 0x1 mov r1, sp movs r0, 0x7 strh r0, [r1] add r1, sp, 0x8 movs r0, 0x27 - b _08138A3E -_08138A04: + b @08138A3E +@08138A04: movs r7, 0x2 mov r1, sp movs r0, 0x1 @@ -601842,37 +601842,37 @@ _08138A04: strh r0, [r1, 0x2] add r1, sp, 0x8 movs r0, 0x34 -_08138A14: +@08138A14: strh r0, [r1] strh r0, [r1, 0x2] - b _08138A40 -_08138A1A: + b @08138A40 +@08138A1A: movs r7, 0x1 mov r0, sp strh r7, [r0] add r1, sp, 0x8 movs r0, 0x41 - b _08138A3E -_08138A26: + b @08138A3E +@08138A26: movs r7, 0x1 mov r1, sp movs r0, 0x7 strh r0, [r1] add r1, sp, 0x8 movs r0, 0xD - b _08138A3E -_08138A34: + b @08138A3E +@08138A34: movs r7, 0x1 mov r0, sp strh r7, [r0] add r1, sp, 0x8 movs r0, 0x1A -_08138A3E: +@08138A3E: strh r0, [r1] -_08138A40: +@08138A40: movs r6, 0 cmp r6, r7 - bcs _08138A92 + bcs @08138A92 movs r1, 0xC0 lsls r1, 4 adds r0, r1, 0 @@ -601885,7 +601885,7 @@ _08138A40: orrs r1, r0 lsls r1, 16 mov r8, r1 -_08138A5E: +@08138A5E: lsls r1, r6, 1 mov r3, sp adds r5, r3, r1 @@ -601909,8 +601909,8 @@ _08138A5E: lsls r0, 24 lsrs r6, r0, 24 cmp r6, r7 - bcc _08138A5E -_08138A92: + bcc @08138A5E +@08138A92: bl cur_mapdata_full_redraw add sp, 0x10 pop {r3,r4} @@ -601922,7 +601922,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] @@ -601936,7 +601936,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 @@ -601947,7 +601947,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] @@ -601962,7 +601962,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] @@ -601981,24 +601981,24 @@ 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] ldrb r0, [r0, 0x8] cmp r0, 0 - bne _08138B34 + bne @08138B34 ldr r0, =0x02021cc4 ldr r1, =0x085eb5f9 bl gf_strcpy - b _08138B3C + b @08138B3C .align 2, 0 .pool -_08138B34: +@08138B34: ldr r0, =0x02021cc4 ldr r1, =0x085eb601 bl gf_strcpy -_08138B3C: +@08138B3C: pop {r0} bx r0 .align 2, 0 @@ -602006,24 +602006,24 @@ _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] ldrb r0, [r0, 0x8] cmp r0, 0 - bne _08138B6C + bne @08138B6C ldr r0, =0x02021cc4 ldr r1, =0x085eb60e bl gf_strcpy - b _08138B74 + b @08138B74 .align 2, 0 .pool -_08138B6C: +@08138B6C: ldr r0, =0x02021cc4 ldr r1, =0x085eb60a bl gf_strcpy -_08138B74: +@08138B74: pop {r0} bx r0 .align 2, 0 @@ -602031,7 +602031,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 @@ -602040,13 +602040,13 @@ 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 ldrh r0, [r0] cmp r0, 0 - beq _08138BB0 + beq @08138BB0 movs r2, 0x1 negs r2, r2 movs r0, 0x4 @@ -602055,10 +602055,10 @@ sub_8138B8C: @ 8138B8C movs r1, 0 movs r3, 0x6 bl warp1_set - b _08138BC2 + b @08138BC2 .align 2, 0 .pool -_08138BB0: +@08138BB0: movs r2, 0x1 negs r2, r2 movs r0, 0x4 @@ -602067,14 +602067,14 @@ _08138BB0: movs r1, 0x1 movs r3, 0x6 bl warp1_set -_08138BC2: +@08138BC2: add sp, 0x4 pop {r0} bx r0 thumb_func_end sub_8138B8C thumb_func_start sub_8138BC8 -sub_8138BC8: @ 8138BC8 +sub_8138BC8: ; 8138BC8 push {lr} ldr r0, =0x020375e0 ldrh r0, [r0] @@ -602086,7 +602086,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 @@ -602097,9 +602097,9 @@ sub_8138BDC: @ 8138BDC lsrs r0, 16 ldr r1, =0x0000270f cmp r0, r1 - bls _08138BF6 + bls @08138BF6 adds r0, r1, 0 -_08138BF6: +@08138BF6: pop {r1} bx r1 .align 2, 0 @@ -602107,7 +602107,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 @@ -602120,61 +602120,61 @@ sub_8138C04: @ 8138C04 movs r1, 0x20 bl pokemon_getattr cmp r0, 0xFF - bne _08138C2C + bne @08138C2C movs r0, 0x6 - b _08138C7E + b @08138C7E .align 2, 0 .pool -_08138C2C: +@08138C2C: adds r0, r4, 0 movs r1, 0x20 bl pokemon_getattr cmp r0, 0xC7 - bls _08138C3C + bls @08138C3C movs r0, 0x5 - b _08138C7E -_08138C3C: + b @08138C7E +@08138C3C: adds r0, r4, 0 movs r1, 0x20 bl pokemon_getattr cmp r0, 0x95 - bls _08138C4C + bls @08138C4C movs r0, 0x4 - b _08138C7E -_08138C4C: + b @08138C7E +@08138C4C: adds r0, r4, 0 movs r1, 0x20 bl pokemon_getattr cmp r0, 0x63 - bls _08138C5C + bls @08138C5C movs r0, 0x3 - b _08138C7E -_08138C5C: + b @08138C7E +@08138C5C: adds r0, r4, 0 movs r1, 0x20 bl pokemon_getattr cmp r0, 0x31 - bls _08138C6C + bls @08138C6C movs r0, 0x2 - b _08138C7E -_08138C6C: + b @08138C7E +@08138C6C: adds r0, r4, 0 movs r1, 0x20 bl pokemon_getattr cmp r0, 0 - bne _08138C7C + bne @08138C7C movs r0, 0 - b _08138C7E -_08138C7C: + b @08138C7E +@08138C7C: movs r0, 0x1 -_08138C7E: +@08138C7E: pop {r4} pop {r1} bx r1 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 + 1 bl sub_817018C @@ -602185,7 +602185,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 + 1 bl set_callback2 @@ -602196,7 +602196,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 + 1 adds r0, r4, 0 @@ -602204,7 +602204,7 @@ sp0D9_ComputerRelated: @ 8138CA4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08138CD8 + beq @08138CD8 adds r0, r4, 0 movs r1, 0x8 bl AddTask @@ -602221,7 +602221,7 @@ sp0D9_ComputerRelated: @ 8138CA4 strh r2, [r1, 0xC] strh r2, [r1, 0xE] strh r2, [r1, 0x10] -_08138CD8: +@08138CD8: pop {r4} pop {r0} bx r0 @@ -602230,7 +602230,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 @@ -602242,10 +602242,10 @@ sub_8138CE8: @ 8138CE8 movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0 - bne _08138D06 + bne @08138D06 adds r0, r1, 0 bl sub_8138D10 -_08138D06: +@08138D06: pop {r0} bx r0 .align 2, 0 @@ -602253,7 +602253,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 @@ -602261,34 +602261,34 @@ sub_8138D10: @ 8138D10 movs r1, 0xE ldrsh r0, [r4, r1] cmp r0, 0x6 - bne _08138D7C + bne @08138D7C strh r5, [r4, 0xE] bl player_get_direction__sp1AA lsls r0, 24 lsrs r0, 24 adds r1, r0, 0 cmp r0, 0x3 - beq _08138D44 + beq @08138D44 cmp r0, 0x3 - bgt _08138D3A + bgt @08138D3A cmp r0, 0x2 - beq _08138D40 - b _08138D4C -_08138D3A: + beq @08138D40 + b @08138D4C +@08138D3A: cmp r1, 0x4 - beq _08138D48 - b _08138D4C -_08138D40: + beq @08138D48 + b @08138D4C +@08138D40: movs r6, 0 - b _08138D4A -_08138D44: + b @08138D4A +@08138D44: movs r6, 0xFF - b _08138D4A -_08138D48: + b @08138D4A +@08138D48: movs r6, 0x1 -_08138D4A: +@08138D4A: movs r5, 0xFF -_08138D4C: +@08138D4C: movs r1, 0x10 ldrsh r0, [r4, r1] lsls r1, r6, 24 @@ -602307,10 +602307,10 @@ _08138D4C: lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - bne _08138D7C + bne @08138D7C ldrb r0, [r4, 0xA] bl remove_task -_08138D7C: +@08138D7C: ldrh r0, [r4, 0xE] adds r0, 0x1 strh r0, [r4, 0xE] @@ -602320,7 +602320,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 @@ -602329,50 +602329,50 @@ sub_8138D88: @ 8138D88 movs r3, 0 lsls r0, 16 cmp r0, 0 - beq _08138DC4 + beq @08138DC4 ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 - bne _08138DAC + bne @08138DAC movs r3, 0x4 - b _08138DE6 + b @08138DE6 .align 2, 0 .pool -_08138DAC: +@08138DAC: cmp r0, 0x1 - bne _08138DB8 + bne @08138DB8 ldr r3, =0x0000025a - b _08138DE6 + b @08138DE6 .align 2, 0 .pool -_08138DB8: +@08138DB8: cmp r0, 0x2 - bne _08138DE6 + bne @08138DE6 ldr r3, =0x00000259 - b _08138DE6 + b @08138DE6 .align 2, 0 .pool -_08138DC4: +@08138DC4: ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 - bne _08138DD4 + bne @08138DD4 movs r3, 0x5 - b _08138DE6 + b @08138DE6 .align 2, 0 .pool -_08138DD4: +@08138DD4: cmp r0, 0x1 - bne _08138DE0 + bne @08138DE0 ldr r3, =0x0000027f - b _08138DE6 + b @08138DE6 .align 2, 0 .pool -_08138DE0: +@08138DE0: cmp r0, 0x2 - bne _08138DE6 + bne @08138DE6 ldr r3, =0x0000027e -_08138DE6: +@08138DE6: ldr r0, =0x03005d8c ldr r2, [r0] movs r5, 0 @@ -602401,7 +602401,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} @@ -602409,7 +602409,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 @@ -602419,47 +602419,47 @@ sub_8138E2C: @ 8138E2C lsrs r0, 24 adds r1, r0, 0 cmp r0, 0x3 - beq _08138E56 + beq @08138E56 cmp r0, 0x3 - bgt _08138E4C + bgt @08138E4C cmp r0, 0x2 - beq _08138E52 - b _08138E5E -_08138E4C: + beq @08138E52 + b @08138E5E +@08138E4C: cmp r1, 0x4 - beq _08138E5A - b _08138E5E -_08138E52: + beq @08138E5A + b @08138E5E +@08138E52: movs r6, 0 - b _08138E5C -_08138E56: + b @08138E5C +@08138E56: movs r6, 0xFF - b _08138E5C -_08138E5A: + b @08138E5C +@08138E5A: movs r6, 0x1 -_08138E5C: +@08138E5C: movs r5, 0xFF -_08138E5E: +@08138E5E: ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 - bne _08138E70 + bne @08138E70 movs r4, 0x4 - b _08138E82 + b @08138E82 .align 2, 0 .pool -_08138E70: +@08138E70: cmp r0, 0x1 - bne _08138E7C + bne @08138E7C ldr r4, =0x0000025a - b _08138E82 + b @08138E82 .align 2, 0 .pool -_08138E7C: +@08138E7C: cmp r0, 0x2 - bne _08138E82 + bne @08138E82 ldr r4, =0x00000259 -_08138E82: +@08138E82: ldr r0, =0x03005d8c ldr r2, [r0] movs r1, 0 @@ -602489,7 +602489,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 + 1 adds r0, r4, 0 @@ -602497,7 +602497,7 @@ sub_8138EC0: @ 8138EC0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08138EF4 + beq @08138EF4 adds r0, r4, 0 movs r1, 0x8 bl AddTask @@ -602514,7 +602514,7 @@ sub_8138EC0: @ 8138EC0 strh r2, [r1, 0xC] strh r2, [r1, 0xE] strh r2, [r1, 0x10] -_08138EF4: +@08138EF4: pop {r4} pop {r0} bx r0 @@ -602523,7 +602523,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 @@ -602535,10 +602535,10 @@ sub_8138F04: @ 8138F04 movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0 - bne _08138F22 + bne @08138F22 adds r0, r1, 0 bl sub_8138F2C -_08138F22: +@08138F22: pop {r0} bx r0 .align 2, 0 @@ -602546,19 +602546,19 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0x6 - bne _08138F9A + bne @08138F9A movs r0, 0 strh r0, [r4, 0xE] movs r1, 0x10 ldrsh r0, [r4, r1] cmp r0, 0 - beq _08138F64 + beq @08138F64 ldr r2, =0x00000e9d movs r0, 0x12 movs r1, 0x8 @@ -602567,10 +602567,10 @@ sub_8138F2C: @ 8138F2C movs r0, 0x12 movs r1, 0x9 bl setmaptile_0 - b _08138F7A + b @08138F7A .align 2, 0 .pool -_08138F64: +@08138F64: ldr r2, =0x00000e58 movs r0, 0x12 movs r1, 0x8 @@ -602580,7 +602580,7 @@ _08138F64: movs r0, 0x12 movs r1, 0x9 bl setmaptile_0 -_08138F7A: +@08138F7A: bl cur_mapdata_full_redraw ldrh r0, [r4, 0x10] movs r1, 0x1 @@ -602592,10 +602592,10 @@ _08138F7A: lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - bne _08138F9A + bne @08138F9A ldrb r0, [r4, 0xA] bl remove_task -_08138F9A: +@08138F9A: ldrh r0, [r4, 0xE] adds r0, 0x1 strh r0, [r4, 0xE] @@ -602607,7 +602607,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 @@ -602625,7 +602625,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 @@ -602638,7 +602638,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 @@ -602651,7 +602651,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 @@ -602663,20 +602663,20 @@ sub_8139004: @ 8139004 movs r1, 0x16 bl pokemon_getattr cmp r0, 0xC7 - bls _08139028 + bls @08139028 movs r0, 0x1 - b _0813902A + b @0813902A .align 2, 0 .pool -_08139028: +@08139028: movs r0, 0 -_0813902A: +@0813902A: pop {r1} bx r1 thumb_func_end sub_8139004 thumb_func_start sub_8139030 -sub_8139030: @ 8139030 +sub_8139030: ; 8139030 push {lr} bl sub_8139688 lsls r0, 24 @@ -602688,20 +602688,20 @@ sub_8139030: @ 8139030 movs r1, 0x17 bl pokemon_getattr cmp r0, 0xC7 - bls _08139054 + bls @08139054 movs r0, 0x1 - b _08139056 + b @08139056 .align 2, 0 .pool -_08139054: +@08139054: movs r0, 0 -_08139056: +@08139056: pop {r1} bx r1 thumb_func_end sub_8139030 thumb_func_start sub_813905C -sub_813905C: @ 813905C +sub_813905C: ; 813905C push {lr} bl sub_8139688 lsls r0, 24 @@ -602713,20 +602713,20 @@ sub_813905C: @ 813905C movs r1, 0x18 bl pokemon_getattr cmp r0, 0xC7 - bls _08139080 + bls @08139080 movs r0, 0x1 - b _08139082 + b @08139082 .align 2, 0 .pool -_08139080: +@08139080: movs r0, 0 -_08139082: +@08139082: pop {r1} bx r1 thumb_func_end sub_813905C thumb_func_start sub_8139088 -sub_8139088: @ 8139088 +sub_8139088: ; 8139088 push {lr} bl sub_8139688 lsls r0, 24 @@ -602738,20 +602738,20 @@ sub_8139088: @ 8139088 movs r1, 0x21 bl pokemon_getattr cmp r0, 0xC7 - bls _081390AC + bls @081390AC movs r0, 0x1 - b _081390AE + b @081390AE .align 2, 0 .pool -_081390AC: +@081390AC: movs r0, 0 -_081390AE: +@081390AE: pop {r1} bx r1 thumb_func_end sub_8139088 thumb_func_start sub_81390B4 -sub_81390B4: @ 81390B4 +sub_81390B4: ; 81390B4 push {lr} bl sub_8139688 lsls r0, 24 @@ -602763,24 +602763,24 @@ sub_81390B4: @ 81390B4 movs r1, 0x2F bl pokemon_getattr cmp r0, 0xC7 - bls _081390D8 + bls @081390D8 movs r0, 0x1 - b _081390DA + b @081390DA .align 2, 0 .pool -_081390D8: +@081390D8: movs r0, 0 -_081390DA: +@081390DA: pop {r1} bx r1 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, =0x083203cc -_081390E6: +@081390E6: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -602790,12 +602790,12 @@ _081390E6: movs r1, 0x5 bl pokemon_getattr cmp r0, 0 - beq _0813913C + beq @0813913C adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _0813913C + bne @0813913C adds r0, r4, 0 movs r1, 0xB bl pokemon_getattr @@ -602807,25 +602807,25 @@ _081390E6: adds r1, r6 ldrb r0, [r1, 0x6] cmp r0, 0xC - beq _08139128 + beq @08139128 ldrb r0, [r1, 0x7] cmp r0, 0xC - bne _0813913C -_08139128: + bne @0813913C +@08139128: ldr r1, =0x020375f0 movs r0, 0x1 - b _0813914A + b @0813914A .align 2, 0 .pool -_0813913C: +@0813913C: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls _081390E6 + bls @081390E6 ldr r1, =0x020375f0 movs r0, 0 -_0813914A: +@0813914A: strh r0, [r1] pop {r4-r6} pop {r0} @@ -602835,7 +602835,7 @@ _0813914A: thumb_func_end sub_81390E0 thumb_func_start sub_8139158 -sub_8139158: @ 8139158 +sub_8139158: ; 8139158 push {lr} sub sp, 0x8 ldr r0, =0x03005d8c @@ -602876,7 +602876,7 @@ sub_8139158: @ 8139158 thumb_func_end sub_8139158 thumb_func_start sp114_080CAA88 -sp114_080CAA88: @ 81391AC +sp114_080CAA88: ; 81391AC push {lr} bl sub_808BCDC lsls r0, 24 @@ -602895,7 +602895,7 @@ sp114_080CAA88: @ 81391AC thumb_func_end sp114_080CAA88 thumb_func_start sub_81391D0 -sub_81391D0: @ 81391D0 +sub_81391D0: ; 81391D0 push {lr} bl sub_8139688 lsls r0, 24 @@ -602918,7 +602918,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 @@ -602937,7 +602937,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 @@ -602948,7 +602948,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 @@ -602959,7 +602959,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] @@ -602982,14 +602982,14 @@ sub_8139248: @ 8139248 bl sub_80EF038 lsls r0, 24 cmp r0, 0 - bne _08139294 + bne @08139294 ldr r4, =0x085b2b94 - b _08139296 + b @08139296 .align 2, 0 .pool -_08139294: +@08139294: ldr r4, =0x085b2ba0 -_08139296: +@08139296: adds r0, r5, 0 movs r1, 0xC bl __umodsi3 @@ -603003,7 +603003,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 @@ -603011,20 +603011,20 @@ sub_81392AC: @ 81392AC bl flag_check lsls r0, 24 cmp r0, 0 - beq _081392CC + beq @081392CC movs r0, 0x1 - b _081392CE + b @081392CE .align 2, 0 .pool -_081392CC: +@081392CC: movs r0, 0 -_081392CE: +@081392CE: pop {r1} bx r1 thumb_func_end sub_81392AC thumb_func_start sub_81392D4 -sub_81392D4: @ 81392D4 +sub_81392D4: ; 81392D4 push {lr} ldr r1, =0x020375e0 movs r0, 0x85 @@ -603033,20 +603033,20 @@ sub_81392D4: @ 81392D4 bl flag_check lsls r0, 24 cmp r0, 0 - beq _081392F0 + beq @081392F0 movs r0, 0x1 - b _081392F2 + b @081392F2 .align 2, 0 .pool -_081392F0: +@081392F0: movs r0, 0 -_081392F2: +@081392F2: pop {r1} bx r1 thumb_func_end sub_81392D4 thumb_func_start sub_81392F8 -sub_81392F8: @ 81392F8 +sub_81392F8: ; 81392F8 push {lr} ldr r1, =0x020375e0 ldr r0, =0x00000215 @@ -603054,20 +603054,20 @@ sub_81392F8: @ 81392F8 bl flag_check lsls r0, 24 cmp r0, 0 - beq _08139318 + beq @08139318 movs r0, 0x1 - b _0813931A + b @0813931A .align 2, 0 .pool -_08139318: +@08139318: movs r0, 0 -_0813931A: +@0813931A: pop {r1} bx r1 thumb_func_end sub_81392F8 thumb_func_start sub_8139320 -sub_8139320: @ 8139320 +sub_8139320: ; 8139320 push {lr} ldr r1, =0x020375e0 ldr r0, =0x00000216 @@ -603075,20 +603075,20 @@ sub_8139320: @ 8139320 bl flag_check lsls r0, 24 cmp r0, 0 - beq _08139340 + beq @08139340 movs r0, 0x1 - b _08139342 + b @08139342 .align 2, 0 .pool -_08139340: +@08139340: movs r0, 0 -_08139342: +@08139342: pop {r1} bx r1 thumb_func_end sub_8139320 thumb_func_start sub_8139348 -sub_8139348: @ 8139348 +sub_8139348: ; 8139348 push {lr} bl sub_8139688 lsls r0, 24 @@ -603109,7 +603109,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 @@ -603135,11 +603135,11 @@ sub_8139370: @ 8139370 lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bls _081393B6 + bls @081393B6 adds r0, r4, 0 movs r1, 0x47 bl sub_80EE4DC -_081393B6: +@081393B6: add sp, 0x4 pop {r4} pop {r0} @@ -603149,7 +603149,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 @@ -603162,67 +603162,67 @@ sub_81393C8: @ 81393C8 lsls r0, 16 ldr r1, =0x01fd0000 cmp r0, r1 - bhi _081393F4 + bhi @081393F4 movs r0, 0 - b _081393F6 + b @081393F6 .align 2, 0 .pool -_081393F4: +@081393F4: movs r0, 0x1 -_081393F6: +@081393F6: pop {r1} bx r1 thumb_func_end sub_81393C8 thumb_func_start sub_81393FC -sub_81393FC: @ 81393FC +sub_81393FC: ; 81393FC push {lr} movs r0, 0xC7 bl flag_check lsls r0, 24 cmp r0, 0 - bne _08139454 + bne @08139454 ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] movs r0, 0x83 lsls r0, 3 cmp r1, r0 - bne _08139454 + bne @08139454 subs r0, 0x75 bl flag_check lsls r0, 24 cmp r0, 0 - beq _08139434 + beq @08139434 ldr r0, =0x0000409a movs r1, 0x4 - b _08139446 + b @08139446 .align 2, 0 .pool -_08139434: +@08139434: movs r0, 0xE9 lsls r0, 2 bl flag_check lsls r0, 24 cmp r0, 0 - beq _08139454 + beq @08139454 ldr r0, =0x0000409a movs r1, 0x5 -_08139446: +@08139446: bl var_set movs r0, 0x1 - b _08139456 + b @08139456 .align 2, 0 .pool -_08139454: +@08139454: movs r0, 0 -_08139456: +@08139456: pop {r1} bx r1 thumb_func_end sub_81393FC thumb_func_start sub_813945C -sub_813945C: @ 813945C +sub_813945C: ; 813945C push {lr} ldr r0, =0x000008bf bl flag_set @@ -603233,7 +603233,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 @@ -603285,7 +603285,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 var_get @@ -603299,8 +603299,8 @@ sub_81394D8: @ 81394D8 lsrs r5, r0, 24 movs r4, 0 cmp r4, r5 - bcs _08139526 -_081394FA: + bcs @08139526 +@081394FA: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -603309,27 +603309,27 @@ _081394FA: movs r2, 0 bl pokemon_getattr cmp r0, r6 - bne _0813951C + bne @0813951C movs r0, 0x1 - b _08139528 + b @08139528 .align 2, 0 .pool -_0813951C: +@0813951C: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc _081394FA -_08139526: + bcc @081394FA +@08139526: movs r0, 0 -_08139528: +@08139528: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_81394D8 thumb_func_start sub_8139530 -sub_8139530: @ 8139530 +sub_8139530: ; 8139530 push {lr} bl sub_80D2218 lsls r0, 24 @@ -603339,27 +603339,27 @@ 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 bl sub_806DD7C lsls r0, 24 cmp r0, 0 - beq _08139558 + beq @08139558 movs r0, 0x1 - b _0813955A + b @0813955A .align 2, 0 .pool -_08139558: +@08139558: movs r0, 0 -_0813955A: +@0813955A: pop {r1} bx r1 thumb_func_end sub_8139540 thumb_func_start sub_8139560 -sub_8139560: @ 8139560 +sub_8139560: ; 8139560 push {lr} ldr r0, =sub_81395BC + 1 movs r1, 0x9 @@ -603396,7 +603396,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 @@ -603414,7 +603414,7 @@ sub_81395BC: @ 81395BC ldrsh r1, [r4, r2] bl __modsi3 cmp r0, 0 - bne _08139614 + bne @08139614 strh r0, [r4, 0x2] ldrh r0, [r4, 0x4] subs r0, 0x1 @@ -603433,11 +603433,11 @@ sub_81395BC: @ 81395BC movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08139614 + bne @08139614 adds r0, r5, 0 bl sub_8139620 bl sub_808A2E4 -_08139614: +@08139614: pop {r4,r5} pop {r0} bx r0 @@ -603446,7 +603446,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 @@ -603457,7 +603457,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 @@ -603469,7 +603469,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 @@ -603478,16 +603478,16 @@ sub_8139648: @ 8139648 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08139664 + beq @08139664 movs r0, 0x14 bl sub_80AED7C -_08139664: +@08139664: pop {r0} bx r0 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 @@ -603496,24 +603496,24 @@ sub_8139668: @ 8139668 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08139684 + beq @08139684 movs r0, 0x15 bl sub_80AED7C -_08139684: +@08139684: pop {r0} bx r0 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 lsrs r6, r0, 24 movs r5, 0 cmp r5, r6 - bcs _081396D6 -_08139698: + bcs @081396D6 +@08139698: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -603526,33 +603526,33 @@ _08139698: movs r1, 0xCE lsls r1, 1 cmp r0, r1 - beq _081396CC + beq @081396CC adds r0, r4, 0 movs r1, 0x41 movs r2, 0 bl pokemon_getattr cmp r0, 0 - beq _081396CC + beq @081396CC adds r0, r5, 0 - b _081396D8 + b @081396D8 .align 2, 0 .pool -_081396CC: +@081396CC: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, r6 - bcc _08139698 -_081396D6: + bcc @08139698 +@081396D6: movs r0, 0 -_081396D8: +@081396D8: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_8139688 thumb_func_start sub_81396E0 -sub_81396E0: @ 81396E0 +sub_81396E0: ; 81396E0 push {lr} ldr r0, =0x020375e0 ldrh r1, [r0] @@ -603572,12 +603572,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 var_get @@ -603589,33 +603589,33 @@ sub_813970C: @ 813970C ldrsh r0, [r2, r1] subs r0, r3 cmp r0, 0x6 - ble _08139734 + ble @08139734 movs r0, 0 - b _0813974C + b @0813974C .align 2, 0 .pool -_08139734: +@08139734: ldrh r1, [r2] movs r4, 0 ldrsh r0, [r2, r4] cmp r0, 0 - blt _0813974A + blt @0813974A subs r1, r3 movs r0, 0x7 subs r0, r1 lsls r0, 16 lsrs r0, 16 - b _0813974C -_0813974A: + b @0813974C +@0813974A: movs r0, 0x8 -_0813974C: +@0813974C: pop {r4} pop {r1} bx r1 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 @@ -603630,7 +603630,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] @@ -603641,7 +603641,7 @@ sub_8139770: @ 8139770 movs r1, 0x3 bl pokemon_getattr cmp r0, 0x2 - bne _081397A6 + bne @081397A6 ldrh r0, [r6] muls r0, r5 adds r0, r4 @@ -603654,65 +603654,65 @@ sub_8139770: @ 8139770 adds r1, r4, 0 bl sub_8008C44 cmp r0, 0 - beq _081397BC -_081397A6: + beq @081397BC +@081397A6: movs r0, 0x1 - b _081397BE + b @081397BE .align 2, 0 .pool -_081397BC: +@081397BC: movs r0, 0 -_081397BE: +@081397BE: pop {r4-r6} pop {r1} bx r1 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] ldr r0, =0x0000270f cmp r1, r0 - bls _081397E0 + bls @081397E0 movs r0, 0 bl sub_80EF340 - b _08139862 + b @08139862 .align 2, 0 .pool -_081397E0: +@081397E0: ldr r0, =0x000003e7 cmp r1, r0 - bls _081397F8 + bls @081397F8 ldr r4, =0x02021cc4 movs r0, 0xA1 strb r0, [r4] adds r4, 0x1 - b _0813981C + b @0813981C .align 2, 0 .pool -_081397F8: +@081397F8: cmp r1, 0x63 - bls _0813980C + bls @0813980C ldr r4, =0x02021cc4 movs r0, 0xA1 strb r0, [r4] strb r0, [r4, 0x1] adds r4, 0x2 - b _0813981C + b @0813981C .align 2, 0 .pool -_0813980C: +@0813980C: cmp r1, 0x9 - bls _0813983C + bls @0813983C ldr r4, =0x02021cc4 movs r0, 0xA1 strb r0, [r4] strb r0, [r4, 0x1] strb r0, [r4, 0x2] adds r4, 0x3 -_0813981C: +@0813981C: ldrh r5, [r2] adds r0, r5, 0 bl sub_80EF370 @@ -603723,10 +603723,10 @@ _0813981C: adds r1, r5, 0 movs r2, 0 bl decimal_int_to_string - b _08139862 + b @08139862 .align 2, 0 .pool -_0813983C: +@0813983C: ldr r4, =0x02021cc4 movs r0, 0xA1 strb r0, [r4] @@ -603744,7 +603744,7 @@ _0813983C: adds r1, r5, 0 movs r2, 0 bl decimal_int_to_string -_08139862: +@08139862: pop {r4,r5} pop {r0} bx r0 @@ -603753,54 +603753,54 @@ _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] cmp r0, 0x4 - bhi _081398B8 + bhi @081398B8 lsls r0, 2 - ldr r1, =_08139888 + ldr r1, =@08139888 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08139888: - .4byte _0813989C - .4byte _081398A0 - .4byte _081398A4 - .4byte _081398A8 - .4byte _081398AC -_0813989C: +@08139888: + .4byte @0813989C + .4byte @081398A0 + .4byte @081398A4 + .4byte @081398A8 + .4byte @081398AC +@0813989C: movs r0, 0x3 - b _081398AE -_081398A0: + b @081398AE +@081398A0: movs r0, 0x4 - b _081398AE -_081398A4: + b @081398AE +@081398A4: movs r0, 0 - b _081398AE -_081398A8: + b @081398AE +@081398A8: movs r0, 0x1 - b _081398AE -_081398AC: + b @081398AE +@081398AC: movs r0, 0x2 -_081398AE: +@081398AE: bl mevent_081445C0 lsls r0, 16 lsrs r0, 16 - b _081398BA -_081398B8: + b @081398BA +@081398B8: movs r0, 0 -_081398BA: +@081398BA: pop {r1} bx r1 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 @@ -603810,12 +603810,12 @@ sub_81398C0: @ 81398C0 lsls r0, 16 lsrs r0, 16 cmp r0, 0x39 - bls _081398E0 + bls @081398E0 movs r0, 0 - b _081398FC + b @081398FC .align 2, 0 .pool -_081398E0: +@081398E0: ldr r4, =0x02021dc4 ldrh r0, [r1] bl sub_81B6CFC @@ -603828,7 +603828,7 @@ _081398E0: adds r0, r4, 0 bl gf_strcpy movs r0, 0x1 -_081398FC: +@081398FC: pop {r4} pop {r1} bx r1 @@ -603837,15 +603837,15 @@ _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 lsrs r5, r0, 24 movs r4, 0 cmp r4, r5 - bcs _08139942 -_0813991C: + bcs @08139942 +@0813991C: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -603853,53 +603853,53 @@ _0813991C: movs r1, 0x4 bl pokemon_getattr cmp r0, 0x1 - bne _08139938 + bne @08139938 movs r0, 0x1 - b _08139944 + b @08139944 .align 2, 0 .pool -_08139938: +@08139938: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc _0813991C -_08139942: + bcc @0813991C +@08139942: movs r0, 0 -_08139944: +@08139944: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_813990C thumb_func_start sub_813994C -sub_813994C: @ 813994C +sub_813994C: ; 813994C push {lr} ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] ldr r0, =0x00000f1a cmp r1, r0 - bne _08139978 + bne @08139978 ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - bne _08139978 + bne @08139978 movs r0, 0x1 - b _0813997A + b @0813997A .align 2, 0 .pool -_08139978: +@08139978: movs r0, 0 -_0813997A: +@0813997A: pop {r1} bx r1 thumb_func_end sub_813994C thumb_func_start sub_8139980 -sub_8139980: @ 8139980 +sub_8139980: ; 8139980 push {lr} movs r0, 0 bl sub_808A2C0 @@ -603911,7 +603911,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] @@ -603920,40 +603920,40 @@ sub_8139994: @ 8139994 lsls r0, 24 asrs r0, 24 cmp r0, 0x5 - bhi _081399E4 + bhi @081399E4 lsls r0, 2 - ldr r1, =_081399B8 + ldr r1, =@081399B8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081399B8: - .4byte _081399E4 - .4byte _081399D0 - .4byte _081399D4 - .4byte _081399D8 - .4byte _081399DC - .4byte _081399E0 -_081399D0: +@081399B8: + .4byte @081399E4 + .4byte @081399D0 + .4byte @081399D4 + .4byte @081399D8 + .4byte @081399DC + .4byte @081399E0 +@081399D0: movs r1, 0x5 - b _081399E6 -_081399D4: + b @081399E6 +@081399D4: movs r1, 0x6 - b _081399E6 -_081399D8: + b @081399E6 +@081399D8: movs r1, 0x7 - b _081399E6 -_081399DC: + b @081399E6 +@081399DC: movs r1, 0x8 - b _081399E6 -_081399E0: + b @081399E6 +@081399E0: movs r1, 0xF - b _081399E6 -_081399E4: + b @081399E6 +@081399E4: movs r1, 0x4 -_081399E6: +@081399E6: ldr r0, =0x00004043 bl var_set pop {r0} @@ -603963,7 +603963,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 @@ -603976,53 +603976,53 @@ sub_81399F4: @ 81399F4 ldrsb r0, [r3, r0] adds r4, r1, 0 cmp r0, 0xD - bne _08139A6E + bne @08139A6E ldrb r0, [r3, 0x15] subs r0, 0x10 lsls r0, 24 asrs r0, 24 cmp r0, 0x4 - bhi _08139A6E + bhi @08139A6E lsls r0, 2 - ldr r1, =_08139A34 + ldr r1, =@08139A34 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08139A34: - .4byte _08139A66 - .4byte _08139A5E - .4byte _08139A56 - .4byte _08139A4E - .4byte _08139A48 -_08139A48: +@08139A34: + .4byte @08139A66 + .4byte @08139A5E + .4byte @08139A56 + .4byte @08139A4E + .4byte @08139A48 +@08139A48: movs r0, 0 strh r0, [r2] - b _08139A6C -_08139A4E: + b @08139A6C +@08139A4E: movs r0, 0 strh r0, [r2] movs r0, 0x1 - b _08139A6C -_08139A56: + b @08139A6C +@08139A56: movs r0, 0 strh r0, [r2] movs r0, 0x2 - b _08139A6C -_08139A5E: + b @08139A6C +@08139A5E: movs r0, 0 strh r0, [r2] movs r0, 0x3 - b _08139A6C -_08139A66: + b @08139A6C +@08139A66: movs r0, 0 strh r0, [r2] movs r0, 0x4 -_08139A6C: +@08139A6C: strh r0, [r4] -_08139A6E: +@08139A6E: ldrh r0, [r4] pop {r4} pop {r1} @@ -604030,7 +604030,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 + 1 movs r1, 0x9 @@ -604052,24 +604052,24 @@ sub_8139A78: @ 8139A78 ldrh r2, [r0] ldrh r0, [r1] cmp r2, r0 - bls _08139AC0 + bls @08139AC0 subs r0, r2, r0 lsls r0, 16 lsrs r5, r0, 16 strh r6, [r4, 0xC] - b _08139AC8 + b @08139AC8 .align 2, 0 .pool -_08139AC0: +@08139AC0: subs r0, r2 lsls r0, 16 lsrs r5, r0, 16 strh r3, [r4, 0xC] -_08139AC8: +@08139AC8: cmp r5, 0x8 - bls _08139ACE + bls @08139ACE movs r5, 0x8 -_08139ACE: +@08139ACE: ldr r0, =0x085b2c18 adds r0, r5, r0 ldrb r0, [r0] @@ -604089,7 +604089,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 @@ -604108,7 +604108,7 @@ sub_8139AF4: @ 8139AF4 lsls r0, 16 asrs r0, 16 cmp r0, 0 - bne _08139B54 + bne @08139B54 strh r0, [r4, 0x2] ldrh r0, [r4, 0x4] adds r0, 0x1 @@ -604125,14 +604125,14 @@ sub_8139AF4: @ 8139AF4 movs r2, 0xA ldrsh r0, [r4, r2] cmp r1, r0 - bne _08139B54 + bne @08139B54 movs r0, 0x49 bl audio_play adds r0, r5, 0 bl remove_task bl script_env_2_enable_and_set_ctx_running bl sub_808A2E4 -_08139B54: +@08139B54: pop {r4,r5} pop {r0} bx r0 @@ -604141,7 +604141,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 @@ -604216,7 +604216,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] @@ -604232,7 +604232,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 @@ -604244,7 +604244,7 @@ sub_8139C2C: @ 8139C2C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08139C6C + beq @08139C6C adds r0, r4, 0 movs r1, 0x8 bl AddTask @@ -604263,7 +604263,7 @@ sub_8139C2C: @ 8139C2C adds r0, r6, r0 ldrb r0, [r0] strh r0, [r1, 0xE] -_08139C6C: +@08139C6C: pop {r4-r6} pop {r0} bx r0 @@ -604272,7 +604272,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 @@ -604291,18 +604291,18 @@ sub_8139C80: @ 8139C80 movs r2, 0x2 ldrsh r0, [r6, r2] cmp r0, 0x6 - bne _08139D7C + bne @08139D7C ldrh r0, [r6] adds r0, 0x1 strh r0, [r6] movs r1, 0x4 ldrsh r0, [r6, r1] cmp r0, 0 - bne _08139D10 + bne @08139D10 movs r1, 0 ldr r2, =0x085b2bf4 mov r10, r2 -_08139CBA: +@08139CBA: movs r5, 0 adds r7, r1, 0x7 lsls r0, r1, 1 @@ -604311,7 +604311,7 @@ _08139CBA: adds r0, r1 lsls r0, 1 mov r9, r0 -_08139CCA: +@08139CCA: adds r4, r5, 0 adds r4, 0x8 movs r1, 0 @@ -604334,20 +604334,20 @@ _08139CCA: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x2 - bls _08139CCA + bls @08139CCA mov r2, r8 lsls r0, r2, 24 lsrs r1, r0, 24 cmp r1, 0x2 - bls _08139CBA - b _08139D62 + bls @08139CBA + b @08139D62 .align 2, 0 .pool -_08139D10: +@08139D10: movs r1, 0 ldr r0, =0x085b2c06 mov r10, r0 -_08139D16: +@08139D16: movs r5, 0 adds r7, r1, 0x7 lsls r0, r1, 1 @@ -604356,7 +604356,7 @@ _08139D16: adds r0, r1 lsls r0, 1 mov r9, r0 -_08139D26: +@08139D26: adds r4, r5, 0 adds r4, 0x8 movs r1, 0 @@ -604379,13 +604379,13 @@ _08139D26: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x2 - bls _08139D26 + bls @08139D26 mov r2, r8 lsls r0, r2, 24 lsrs r1, r0, 24 cmp r1, 0x2 - bls _08139D16 -_08139D62: + bls @08139D16 +@08139D62: bl cur_mapdata_full_redraw movs r0, 0 strh r0, [r6, 0x2] @@ -604394,10 +604394,10 @@ _08139D62: movs r2, 0x6 ldrsh r0, [r6, r2] cmp r1, r0 - bne _08139D7C + bne @08139D7C ldr r0, [sp] bl remove_task -_08139D7C: +@08139D7C: ldrh r0, [r6, 0x2] adds r0, 0x1 strh r0, [r6, 0x2] @@ -604414,7 +604414,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 @@ -604461,7 +604461,7 @@ sub_8139D98: @ 8139D98 strh r0, [r1] movs r4, 0 adds r2, r1, 0 -_08139E00: +@08139E00: lsls r0, r4, 2 add r0, sp ldr r1, [r0] @@ -604472,7 +604472,7 @@ _08139E00: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls _08139E00 + bls @08139E00 ldr r2, =0x020375e4 movs r0, 0 strh r0, [r2] @@ -604482,7 +604482,7 @@ _08139E00: movs r4, 0x1 adds r6, r2, 0 adds r7, r1, 0 -_08139E28: +@08139E28: ldrh r0, [r6] lsls r0, 2 mov r2, sp @@ -604492,31 +604492,31 @@ _08139E28: ldr r1, [r1] ldr r0, [r5] cmp r1, r0 - bcs _08139E54 + bcs @08139E54 strh r4, [r6] - b _08139E6C + b @08139E6C .align 2, 0 .pool -_08139E54: +@08139E54: cmp r1, r0 - bne _08139E6E + bne @08139E6E bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08139E6E + beq @08139E6E strh r4, [r6] ldr r0, [r5] -_08139E6C: +@08139E6C: strh r0, [r7] -_08139E6E: +@08139E6E: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls _08139E28 + bls @08139E28 add sp, 0x18 pop {r4-r7} pop {r0} @@ -604524,7 +604524,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 @@ -604540,53 +604540,53 @@ warp0_in_pokecenter: @ 8139E80 ldrh r0, [r2] ldr r1, =0x0000ffff cmp r0, r1 - beq _08139EC6 + beq @08139EC6 adds r4, r1, 0 adds r1, r2, 0 -_08139EA4: +@08139EA4: ldrh r0, [r2] cmp r0, r3 - bne _08139EBC + bne @08139EBC movs r0, 0x1 - b _08139EC8 + b @08139EC8 .align 2, 0 .pool -_08139EBC: +@08139EBC: adds r1, 0x2 adds r2, 0x2 ldrh r0, [r1] cmp r0, r4 - bne _08139EA4 -_08139EC6: + bne @08139EA4 +@08139EC6: movs r0, 0 -_08139EC8: +@08139EC8: pop {r4} pop {r1} bx r1 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] ldrh r1, [r0, 0x4] ldr r0, =0x00003c1a cmp r1, r0 - beq _08139EEC + beq @08139EEC movs r0, 0x1 - b _08139EEE + b @08139EEE .align 2, 0 .pool -_08139EEC: +@08139EEC: movs r0, 0 -_08139EEE: +@08139EEE: pop {r1} bx r1 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 @@ -604609,7 +604609,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 @@ -604617,11 +604617,11 @@ sub_8139F20: @ 8139F20 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x9 - bls _08139F34 - b _0813A03A -_08139F34: + bls @08139F34 + b @0813A03A +@08139F34: lsls r0, r6, 2 - ldr r1, =_08139F48 + ldr r1, =@08139F48 adds r1, r0, r1 ldr r1, [r1] adds r2, r0, 0 @@ -604629,18 +604629,18 @@ _08139F34: .align 2, 0 .pool .align 2, 0 -_08139F48: - .4byte _08139F70 - .4byte _08139F70 - .4byte _08139F70 - .4byte _08139F70 - .4byte _08139F94 - .4byte _08139FB4 - .4byte _08139FCC - .4byte _08139FE4 - .4byte _08139FFC - .4byte _0813A014 -_08139F70: +@08139F48: + .4byte @08139F70 + .4byte @08139F70 + .4byte @08139F70 + .4byte @08139F70 + .4byte @08139F94 + .4byte @08139FB4 + .4byte @08139FCC + .4byte @08139FE4 + .4byte @08139FFC + .4byte @0813A014 +@08139F70: ldr r0, =0x03005d90 ldr r0, [r0] movs r3, 0xCE @@ -604653,62 +604653,62 @@ _08139F70: ldrh r0, [r3] ldrh r2, [r1] cmp r0, r2 - bcs _0813A028 - b _0813A038 + bcs @0813A028 + b @0813A038 .align 2, 0 .pool -_08139F94: +@08139F94: ldr r0, =0x03005d90 ldr r0, [r0] ldr r3, =0x00000d0c adds r2, r0, r3 adds r3, 0x2 -_08139F9E: +@08139F9E: adds r1, r0, r3 ldrh r0, [r2] ldrh r3, [r1] cmp r0, r3 - bcs _0813A028 - b _0813A038 + bcs @0813A028 + b @0813A038 .align 2, 0 .pool -_08139FB4: +@08139FB4: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000de2 adds r2, r0, r1 ldr r3, =0x00000de4 - b _08139F9E + b @08139F9E .align 2, 0 .pool -_08139FCC: +@08139FCC: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000dc8 adds r2, r0, r1 ldr r3, =0x00000dca - b _08139F9E + b @08139F9E .align 2, 0 .pool -_08139FE4: +@08139FE4: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000dda adds r2, r0, r1 ldr r3, =0x00000ddc - b _08139F9E + b @08139F9E .align 2, 0 .pool -_08139FFC: +@08139FFC: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000e04 adds r2, r0, r1 ldr r3, =0x00000e06 - b _08139F9E + b @08139F9E .align 2, 0 .pool -_0813A014: +@0813A014: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000e1a @@ -604718,15 +604718,15 @@ _0813A014: ldrh r0, [r2] ldrh r3, [r1] cmp r0, r3 - bcc _0813A038 -_0813A028: + bcc @0813A038 +@0813A028: adds r4, r0, 0 - b _0813A03A + b @0813A03A .align 2, 0 .pool -_0813A038: +@0813A038: ldrh r4, [r1] -_0813A03A: +@0813A03A: movs r2, 0 ldr r5, =0x085b2cc8 lsls r0, r6, 1 @@ -604735,20 +604735,20 @@ _0813A03A: adds r3, r0, 0 ldr r7, =0x085b2c50 cmp r1, r4 - bcs _0813A062 + bcs @0813A062 adds r1, r3, 0 -_0813A04E: +@0813A04E: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x1 - bhi _0813A062 + bhi @0813A062 adds r0, r2, r1 adds r0, r5 ldrb r0, [r0] cmp r0, r4 - bcc _0813A04E -_0813A062: + bcc @0813A04E +@0813A062: adds r0, r3, r6 adds r0, r2 lsls r0, 2 @@ -604763,7 +604763,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 var_get @@ -604777,28 +604777,28 @@ sub_813A080: @ 813A080 lsls r0, 30 lsrs r4, r0, 30 cmp r5, 0x2 - bne _0813A0D8 + bne @0813A0D8 movs r0, 0xA9 lsls r0, 1 bl flag_check lsls r0, 24 cmp r0, 0 - bne _0813A0D8 + bne @0813A0D8 ldr r1, =0x020375e2 movs r0, 0x5 strh r0, [r1] ldr r1, =0x020375e4 movs r0, 0x4 strh r0, [r1] - b _0813A110 + b @0813A110 .align 2, 0 .pool -_0813A0D0: +@0813A0D0: movs r0, 0x4 strh r0, [r6] adds r0, r3, 0x5 - b _0813A10E -_0813A0D8: + b @0813A10E +@0813A0D8: movs r3, 0 ldr r6, =0x020375e2 ldr r7, =0x020375e4 @@ -604813,23 +604813,23 @@ _0813A0D8: adds r0, r2 adds r0, r1 ldrh r1, [r0] -_0813A0F4: +@0813A0F4: lsls r0, r3, 1 adds r0, r4 ldrh r0, [r0] cmp r0, r1 - bhi _0813A0D0 + bhi @0813A0D0 adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x8 - bls _0813A0F4 + bls @0813A0F4 movs r0, 0x4 strh r0, [r6] movs r0, 0xC -_0813A10E: +@0813A10E: strh r0, [r7] -_0813A110: +@0813A110: pop {r4-r7} pop {r0} bx r0 @@ -604838,7 +604838,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 + 1 movs r1, 0x8 @@ -604855,40 +604855,40 @@ sub_813A128: @ 813A128 strh r0, [r3, 0x1E] ldrh r0, [r1] cmp r0, 0xC - bls _0813A14E - b _0813A2C6 -_0813A14E: + bls @0813A14E + b @0813A2C6 +@0813A14E: lsls r0, 2 - ldr r1, =_0813A168 + ldr r1, =@0813A168 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0813A168: - .4byte _0813A19C - .4byte _0813A1AA - .4byte _0813A1C2 - .4byte _0813A1D6 - .4byte _0813A1F0 - .4byte _0813A208 - .4byte _0813A222 - .4byte _0813A23C - .4byte _0813A25A - .4byte _0813A274 - .4byte _0813A274 - .4byte _0813A28E - .4byte _0813A2A8 -_0813A19C: +@0813A168: + .4byte @0813A19C + .4byte @0813A1AA + .4byte @0813A1C2 + .4byte @0813A1D6 + .4byte @0813A1F0 + .4byte @0813A208 + .4byte @0813A222 + .4byte @0813A23C + .4byte @0813A25A + .4byte @0813A274 + .4byte @0813A274 + .4byte @0813A28E + .4byte @0813A2A8 +@0813A19C: movs r1, 0 movs r0, 0x1 strh r0, [r3, 0x8] strh r0, [r3, 0xA] strh r0, [r3, 0xC] strh r0, [r3, 0xE] - b _0813A2BC -_0813A1AA: + b @0813A2BC +@0813A1AA: movs r1, 0 movs r0, 0x5 strh r0, [r3, 0x8] @@ -604900,8 +604900,8 @@ _0813A1AA: movs r0, 0x9 strh r0, [r3, 0x10] movs r0, 0xA - b _0813A2BE -_0813A1C2: + b @0813A2BE +@0813A1C2: movs r2, 0 movs r0, 0x6 strh r0, [r3, 0x8] @@ -604911,8 +604911,8 @@ _0813A1C2: strh r0, [r3, 0xC] strh r0, [r3, 0xE] movs r0, 0x7 - b _0813A250 -_0813A1D6: + b @0813A250 +@0813A1D6: movs r1, 0 movs r0, 0x6 strh r0, [r3, 0x8] @@ -604925,8 +604925,8 @@ _0813A1D6: movs r0, 0xF strh r0, [r3, 0x10] movs r0, 0xC - b _0813A2BE -_0813A1F0: + b @0813A2BE +@0813A1F0: movs r1, 0 movs r0, 0x6 strh r0, [r3, 0x8] @@ -604938,8 +604938,8 @@ _0813A1F0: movs r0, 0xF strh r0, [r3, 0x10] movs r0, 0xC - b _0813A2BE -_0813A208: + b @0813A2BE +@0813A208: movs r1, 0 movs r0, 0x6 strh r0, [r3, 0x8] @@ -604952,8 +604952,8 @@ _0813A208: movs r0, 0xF strh r0, [r3, 0x10] movs r0, 0xC - b _0813A2BE -_0813A222: + b @0813A2BE +@0813A222: movs r1, 0 movs r0, 0x6 strh r0, [r3, 0x8] @@ -604966,8 +604966,8 @@ _0813A222: movs r0, 0xF strh r0, [r3, 0x10] movs r0, 0xC - b _0813A2BE -_0813A23C: + b @0813A2BE +@0813A23C: movs r2, 0 movs r0, 0x6 strh r0, [r3, 0x8] @@ -604978,13 +604978,13 @@ _0813A23C: movs r0, 0x1 strh r0, [r3, 0xE] movs r0, 0xE -_0813A250: +@0813A250: strh r0, [r3, 0x10] strh r1, [r3, 0x12] strh r2, [r3, 0x14] strh r4, [r3, 0x26] - b _0813A2D2 -_0813A25A: + b @0813A2D2 +@0813A25A: movs r1, 0 movs r0, 0x6 strh r0, [r3, 0x8] @@ -604997,8 +604997,8 @@ _0813A25A: movs r0, 0xB strh r0, [r3, 0x10] movs r0, 0xC - b _0813A2BE -_0813A274: + b @0813A2BE +@0813A274: movs r1, 0 movs r0, 0x6 strh r0, [r3, 0x8] @@ -605011,8 +605011,8 @@ _0813A274: movs r0, 0xE strh r0, [r3, 0x10] movs r0, 0xC - b _0813A2BE -_0813A28E: + b @0813A2BE +@0813A28E: movs r1, 0 movs r0, 0x6 strh r0, [r3, 0x8] @@ -605025,8 +605025,8 @@ _0813A28E: movs r0, 0xA strh r0, [r3, 0x10] movs r0, 0xC - b _0813A2BE -_0813A2A8: + b @0813A2BE +@0813A2A8: movs r1, 0 movs r0, 0x6 strh r0, [r3, 0x8] @@ -605037,20 +605037,20 @@ _0813A2A8: movs r0, 0x1 strh r0, [r3, 0xE] movs r0, 0xC -_0813A2BC: +@0813A2BC: strh r0, [r3, 0x10] -_0813A2BE: +@0813A2BE: strh r0, [r3, 0x12] strh r1, [r3, 0x14] strh r4, [r3, 0x26] - b _0813A2D2 -_0813A2C6: + b @0813A2D2 +@0813A2C6: ldr r1, =0x020375f0 movs r0, 0x7F strh r0, [r1] adds r0, r4, 0 bl remove_task -_0813A2D2: +@0813A2D2: pop {r4} pop {r0} bx r0 @@ -605059,7 +605059,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} @@ -605100,9 +605100,9 @@ sub_813A2DC: @ 813A2DC add r1, sp, 0x18 mov r8, r1 cmp r3, r0 - bge _0813A36A + bge @0813A36A ldr r5, =0x085b2cf0 -_0813A33A: +@0813A33A: lsls r1, r4, 2 ldr r0, =0x020375e0 ldrh r0, [r0] @@ -605125,8 +605125,8 @@ _0813A33A: movs r2, 0xA ldrsh r0, [r6, r2] cmp r4, r0 - blt _0813A33A -_0813A36A: + blt @0813A33A +@0813A36A: adds r0, r3, 0 bl convert_pixel_width_to_tile_width strh r0, [r6, 0x10] @@ -605136,15 +605136,15 @@ _0813A36A: ldrsh r1, [r6, r2] adds r0, r1 cmp r0, 0x1D - ble _0813A38C + ble @0813A38C movs r0, 0x1D subs r0, r1 cmp r0, 0 - bge _0813A38A + bge @0813A38A movs r0, 0 -_0813A38A: +@0813A38A: strh r0, [r6, 0xC] -_0813A38C: +@0813A38C: ldrb r2, [r6, 0xC] ldrb r3, [r6, 0xE] ldrb r0, [r6, 0x10] @@ -605205,7 +605205,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] @@ -605237,7 +605237,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 @@ -605247,7 +605247,7 @@ sub_813A46C: @ 813A46C lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _0813A4D4 + beq @0813A4D4 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -605283,7 +605283,7 @@ sub_813A46C: @ 813A46C mov r0, sp ldrh r0, [r0] strh r0, [r5] -_0813A4D4: +@0813A4D4: add sp, 0x4 pop {r4,r5} pop {r0} @@ -605293,7 +605293,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 @@ -605310,23 +605310,23 @@ sub_813A4EC: @ 813A4EC movs r0, 0x2 negs r0, r0 cmp r4, r0 - beq _0813A51C + beq @0813A51C adds r0, 0x1 cmp r4, r0 - bne _0813A530 - b _0813A566 + bne @0813A530 + b @0813A566 .align 2, 0 .pool -_0813A51C: +@0813A51C: ldr r1, =0x020375f0 movs r0, 0x7F strh r0, [r1] movs r0, 0x5 bl audio_play - b _0813A54C + b @0813A54C .align 2, 0 .pool -_0813A530: +@0813A530: ldr r0, =0x020375f0 strh r4, [r0] movs r0, 0x5 @@ -605334,25 +605334,25 @@ _0813A530: movs r1, 0x14 ldrsh r0, [r6, r1] cmp r0, 0 - beq _0813A54C + beq @0813A54C movs r1, 0xA ldrsh r0, [r6, r1] subs r0, 0x1 cmp r4, r0 - bne _0813A558 -_0813A54C: + bne @0813A558 +@0813A54C: adds r0, r5, 0 bl sub_813A570 - b _0813A566 + b @0813A566 .align 2, 0 .pool -_0813A558: +@0813A558: adds r0, r5, 0 bl sub_813A738 ldr r0, =sub_813A600 + 1 str r0, [r6] bl script_env_2_enable_and_set_ctx_running -_0813A566: +@0813A566: pop {r4-r6} pop {r0} bx r0 @@ -605361,7 +605361,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 @@ -605423,7 +605423,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 @@ -605435,14 +605435,14 @@ sub_813A600: @ 813A600 movs r2, 0x14 ldrsh r0, [r1, r2] cmp r0, 0x1 - beq _0813A624 + beq @0813A624 cmp r0, 0x2 - bne _0813A624 + bne @0813A624 movs r0, 0x1 strh r0, [r1, 0x14] ldr r0, =sub_813A664 + 1 str r0, [r1] -_0813A624: +@0813A624: pop {r0} bx r0 .align 2, 0 @@ -605450,19 +605450,19 @@ _0813A624: thumb_func_end sub_813A600 thumb_func_start sub_813A630 -sub_813A630: @ 813A630 +sub_813A630: ; 813A630 push {lr} ldr r0, =sub_813A600 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - bne _0813A64C + bne @0813A64C bl script_env_2_enable_and_set_ctx_running - b _0813A65C + b @0813A65C .align 2, 0 .pool -_0813A64C: +@0813A64C: ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -605471,7 +605471,7 @@ _0813A64C: ldrh r0, [r1, 0x14] adds r0, 0x1 strh r0, [r1, 0x14] -_0813A65C: +@0813A65C: pop {r0} bx r0 .align 2, 0 @@ -605479,7 +605479,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 @@ -605502,7 +605502,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 @@ -605523,7 +605523,7 @@ sub_813A694: @ 813A694 movs r2, 0xA ldrsh r0, [r4, r2] cmp r1, r0 - beq _0813A724 + beq @0813A724 mov r2, sp movs r3, 0x10 ldrsh r1, [r4, r3] @@ -605574,7 +605574,7 @@ sub_813A694: @ 813A694 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x20] -_0813A724: +@0813A724: add sp, 0x10 pop {r4,r5} pop {r0} @@ -605584,7 +605584,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 @@ -605598,12 +605598,12 @@ sub_813A738: @ 813A738 movs r3, 0xA ldrsh r0, [r2, r3] cmp r1, r0 - beq _0813A75E + beq @0813A75E ldrh r0, [r2, 0x20] lsls r0, 24 lsrs r0, 24 bl sub_81AF620 -_0813A75E: +@0813A75E: pop {r0} bx r0 .align 2, 0 @@ -605611,60 +605611,60 @@ _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 ldr r0, =0x0000401f adds r5, r0, 0 -_0813A776: +@0813A776: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 adds r0, r6 ldrb r0, [r0, 0x13] cmp r0, 0 - bne _0813A79C + bne @0813A79C subs r0, r5, r4 lsls r0, 16 lsrs r0, 16 movs r1, 0 bl var_set - b _0813A7A8 + b @0813A7A8 .align 2, 0 .pool -_0813A79C: +@0813A79C: subs r0, r5, r4 lsls r0, 16 lsrs r0, 16 movs r1, 0x69 bl var_set -_0813A7A8: +@0813A7A8: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bls _0813A776 + bls @0813A776 pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_813A76C thumb_func_start sub_813A7B8 -sub_813A7B8: @ 813A7B8 +sub_813A7B8: ; 813A7B8 push {lr} ldr r1, =0x020375e0 ldrh r0, [r1] cmp r0, 0x5 - bls _0813A7C6 + bls @0813A7C6 movs r0, 0 strh r0, [r1] -_0813A7C6: +@0813A7C6: ldrh r1, [r1] movs r0, 0x64 muls r0, r1 @@ -605684,7 +605684,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 @@ -605707,7 +605707,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 var_get @@ -605730,7 +605730,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, =0x085b30d4 ldr r0, =0x00004031 @@ -605748,7 +605748,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} @@ -605773,7 +605773,7 @@ sub_813A878: @ 813A878 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bne _0813A8F0 + bne @0813A8F0 ldr r1, =0x085b3104 lsls r0, r6, 1 adds r0, r1 @@ -605781,21 +605781,21 @@ sub_813A878: @ 813A878 lsls r0, r5, 8 adds r0, r7 cmp r1, r0 - bne _0813A8F0 + bne @0813A8F0 mov r0, r8 cmp r0, 0 - beq _0813A8E8 + beq @0813A8E8 adds r0, r4, 0 movs r1, 0x2 bl var_set - b _0813A8F0 + b @0813A8F0 .align 2, 0 .pool -_0813A8E8: +@0813A8E8: adds r0, r4, 0 movs r1, 0x3 bl var_set -_0813A8F0: +@0813A8F0: pop {r3} mov r8, r3 pop {r4-r7} @@ -605804,7 +605804,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 @@ -605843,7 +605843,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, =0x085b311c @@ -605864,7 +605864,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] @@ -605880,7 +605880,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] @@ -605890,21 +605890,21 @@ sub_813A9A4: @ 813A9A4 ldrh r2, [r1] ldrh r0, [r0] cmp r2, r0 - bcs _0813A9C8 + bcs @0813A9C8 movs r0, 0 - b _0813A9CA + b @0813A9CA .align 2, 0 .pool -_0813A9C8: +@0813A9C8: subs r0, r2, r0 -_0813A9CA: +@0813A9CA: strh r0, [r1] pop {r0} bx r0 thumb_func_end sub_813A9A4 thumb_func_start sub_813A9D0 -sub_813A9D0: @ 813A9D0 +sub_813A9D0: ; 813A9D0 push {lr} ldr r0, =0x03005d90 ldr r0, [r0] @@ -605916,20 +605916,20 @@ sub_813A9D0: @ 813A9D0 adds r1, r0 ldr r0, =0x0000270f cmp r1, r0 - ble _0813A9FC + ble @0813A9FC strh r0, [r2] - b _0813A9FE + b @0813A9FE .align 2, 0 .pool -_0813A9FC: +@0813A9FC: strh r1, [r2] -_0813A9FE: +@0813A9FE: pop {r0} bx r0 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 @@ -605941,7 +605941,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, =0x085b3124 @@ -605961,7 +605961,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] @@ -605977,7 +605977,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 @@ -605988,9 +605988,9 @@ sub_813AA60: @ 813AA60 adds r0, r1 lsrs r0, 16 cmp r0, 0x3 - bls _0813AA78 - b _0813ABC2 -_0813AA78: + bls @0813AA78 + b @0813ABC2 +@0813AA78: movs r0, 0xD8 str r0, [sp] movs r0, 0x20 @@ -606001,21 +606001,21 @@ _0813AA78: movs r3, 0 bl Window_FillPixelRect cmp r4, 0x4 - beq _0813AAE8 + beq @0813AAE8 cmp r4, 0x4 - bgt _0813AAA0 + bgt @0813AAA0 cmp r4, 0x3 - beq _0813AAAA - b _0813ABC2 + beq @0813AAAA + b @0813ABC2 .align 2, 0 .pool -_0813AAA0: +@0813AAA0: cmp r4, 0x5 - beq _0813AB5C + beq @0813AB5C cmp r4, 0x6 - beq _0813AB94 - b _0813ABC2 -_0813AAAA: + beq @0813AB94 + b @0813ABC2 +@0813AAAA: ldr r1, =0x085b3170 lsls r0, r5, 2 adds r0, r1 @@ -606037,11 +606037,11 @@ _0813AAAA: ldrh r5, [r1] ldr r0, =0x0000ffff cmp r5, r0 - beq _0813AB18 - b _0813AB2C + beq @0813AB18 + b @0813AB2C .align 2, 0 .pool -_0813AAE8: +@0813AAE8: ldr r1, =0x085b319c lsls r0, r5, 2 adds r0, r1 @@ -606064,14 +606064,14 @@ _0813AAE8: ldrh r5, [r1] ldr r0, =0x0000ffff cmp r5, r0 - bne _0813AB2C -_0813AB18: + bne @0813AB2C +@0813AB18: ldrh r0, [r1] bl sub_813ABD4 - b _0813ABC2 + b @0813ABC2 .align 2, 0 .pool -_0813AB2C: +@0813AB2C: ldr r4, =0x0000157c adds r0, r4, 0 bl gpu_tile_obj_free_by_tag @@ -606087,10 +606087,10 @@ _0813AB2C: bl sub_81295CC ldr r1, =0x0203ab6c strb r0, [r1] - b _0813ABC2 + b @0813ABC2 .align 2, 0 .pool -_0813AB5C: +@0813AB5C: ldr r1, =0x085b31b4 lsls r0, r5, 2 adds r0, r1 @@ -606112,10 +606112,10 @@ _0813AB5C: adds r0, r1 ldrh r0, [r0] bl sub_813ABD4 - b _0813ABC2 + b @0813ABC2 .align 2, 0 .pool -_0813AB94: +@0813AB94: ldr r1, =0x085b31d0 lsls r0, r5, 2 adds r0, r1 @@ -606137,7 +606137,7 @@ _0813AB94: adds r0, r1 ldrh r0, [r0] bl sub_813ABD4 -_0813ABC2: +@0813ABC2: add sp, 0x10 pop {r4,r5} pop {r0} @@ -606147,7 +606147,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 @@ -606166,7 +606166,7 @@ sub_813ABD4: @ 813ABD4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _0813AC32 + beq @0813AC32 ldr r3, =0x02020630 ldrb r0, [r4] lsls r1, r0, 4 @@ -606192,7 +606192,7 @@ sub_813ABD4: @ 813ABD4 adds r0, r3 movs r1, 0x5C strh r1, [r0, 0x22] -_0813AC32: +@0813AC32: pop {r4,r5} pop {r0} bx r0 @@ -606201,18 +606201,18 @@ _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 ldr r2, =0x0203ab6c ldrb r0, [r2] cmp r0, 0x40 - beq _0813AC70 + beq @0813AC70 cmp r1, 0x6 - bgt _0813AC6A + bgt @0813AC6A cmp r1, 0x3 - blt _0813AC6A + blt @0813AC6A adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -606220,11 +606220,11 @@ sub_813AC44: @ 813AC44 ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_resources -_0813AC6A: +@0813AC6A: ldr r1, =0x0203ab6c movs r0, 0x40 strb r0, [r1] -_0813AC70: +@0813AC70: pop {r0} bx r0 .align 2, 0 @@ -606232,12 +606232,12 @@ _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] cmp r0, 0 - beq _0813ACB8 + beq @0813ACB8 ldr r0, =0x02021cc4 ldr r2, =0x085b320c ldr r1, =0x020375e0 @@ -606250,10 +606250,10 @@ sub_813AC7C: @ 813AC7C ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy - b _0813ACD2 + b @0813ACD2 .align 2, 0 .pool -_0813ACB8: +@0813ACB8: ldr r0, =0x02021cc4 ldr r2, =0x085b31f8 ldr r1, =0x020375e0 @@ -606266,7 +606266,7 @@ _0813ACB8: ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy -_0813ACD2: +@0813ACD2: pop {r0} bx r0 .align 2, 0 @@ -606274,7 +606274,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 @@ -606285,11 +606285,11 @@ sub_813ACE8: @ 813ACE8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _0813AD20 + bhi @0813AD20 ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0 - bne _0813AD18 + bne @0813AD18 ldr r4, =0x0203ab5e ldr r0, =0x085b3220 bl Window_AddFromTemplate @@ -606297,11 +606297,11 @@ sub_813ACE8: @ 813ACE8 ldrb r0, [r4] movs r1, 0 bl SetStandardWindowBorderStyle -_0813AD18: +@0813AD18: adds r0, r5, 0 adds r1, r6, 0 bl sub_813AD34 -_0813AD20: +@0813AD20: pop {r4-r6} pop {r0} bx r0 @@ -606310,7 +606310,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 @@ -606323,7 +606323,7 @@ sub_813AD34: @ 813AD34 adds r0, r1 lsrs r0, 24 cmp r0, 0x1 - bhi _0813ADAC + bhi @0813ADAC ldr r4, =0x0203ab5e ldrb r0, [r4] movs r1, 0x60 @@ -606335,7 +606335,7 @@ sub_813AD34: @ 813AD34 movs r3, 0 bl Window_FillPixelRect cmp r6, 0xA - bne _0813AD90 + bne @0813AD90 ldrb r0, [r4] ldr r2, =0x085b3254 lsls r1, r5, 2 @@ -606349,10 +606349,10 @@ sub_813AD34: @ 813AD34 movs r1, 0x1 movs r3, 0 bl Print - b _0813ADAC + b @0813ADAC .align 2, 0 .pool -_0813AD90: +@0813AD90: ldrb r0, [r4] ldr r2, =0x085b3228 lsls r1, r7, 2 @@ -606366,7 +606366,7 @@ _0813AD90: movs r1, 0x1 movs r3, 0 bl Print -_0813ADAC: +@0813ADAC: add sp, 0xC pop {r4-r7} pop {r0} @@ -606376,7 +606376,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] @@ -606392,7 +606392,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 @@ -606403,7 +606403,7 @@ sub_813ADD4: @ 813ADD4 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xFF - beq _0813AE90 + beq @0813AE90 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -606427,7 +606427,7 @@ sub_813ADD4: @ 813ADD4 ldr r0, =0x085b2cf0 mov r8, r0 movs r4, 0 -_0813AE1E: +@0813AE1E: ldrh r0, [r6, 0x22] lsls r0, 24 lsrs r0, 24 @@ -606456,7 +606456,7 @@ _0813AE1E: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls _0813AE1E + bls @0813AE1E ldrh r0, [r6, 0x22] lsls r0, 24 lsrs r0, 24 @@ -606481,7 +606481,7 @@ _0813AE1E: lsrs r0, 24 movs r1, 0x3 bl Window_CopyToVram -_0813AE90: +@0813AE90: add sp, 0x18 pop {r3,r4} mov r8, r3 @@ -606494,7 +606494,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 @@ -606509,52 +606509,52 @@ sub_813AEB4: @ 813AEB4 lsls r0, 16 lsrs r1, r0, 16 cmp r4, 0 - beq _0813AF18 + beq @0813AF18 movs r2, 0 lsls r1, 1 ldr r3, =0x0861500c ldr r0, =0x085b320c adds r0, r1, r0 ldrh r1, [r0] -_0813AEE2: +@0813AEE2: lsls r0, r2, 1 adds r0, r3 ldrh r0, [r0] cmp r0, r1 - beq _0813AF0C + beq @0813AF0C adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x1D - bls _0813AEE2 - b _0813AF38 + bls @0813AEE2 + b @0813AF38 .align 2, 0 .pool -_0813AF0C: +@0813AF0C: ldr r0, =0x020375e2 strh r2, [r0] - b _0813AF38 + b @0813AF38 .align 2, 0 .pool -_0813AF18: +@0813AF18: movs r2, 0 lsls r1, 1 ldr r3, =0x0861500c ldr r0, =0x085b31f8 adds r0, r1, r0 ldrh r1, [r0] -_0813AF24: +@0813AF24: lsls r0, r2, 1 adds r0, r3 ldrh r0, [r0] cmp r0, r1 - beq _0813AF0C + beq @0813AF0C adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x1D - bls _0813AF24 -_0813AF38: + bls @0813AF24 +@0813AF38: pop {r4} pop {r0} bx r0 @@ -606563,14 +606563,14 @@ _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 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0xFF - beq _0813AFB6 + beq @0813AFB6 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -606610,7 +606610,7 @@ sub_813AF48: @ 813AF48 bl Window_Remove adds r0, r5, 0 bl remove_task -_0813AFB6: +@0813AFB6: pop {r4,r5} pop {r0} bx r0 @@ -606619,7 +606619,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 + 1 movs r1, 0x8 @@ -606631,7 +606631,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} @@ -606642,13 +606642,13 @@ task_deoxys_sound: @ 813AFDC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0813B004 + bne @0813B004 ldr r1, =0x020375f0 movs r0, 0x3 - b _0813B06A + b @0813B06A .align 2, 0 .pool -_0813B004: +@0813B004: ldr r0, =0x00004035 mov r8, r0 bl var_get @@ -606663,13 +606663,13 @@ _0813B004: movs r1, 0 bl var_set cmp r5, 0 - beq _0813B05C + beq @0813B05C ldr r0, =0x085b33f6 subs r1, r5, 0x1 adds r1, r0 ldrb r0, [r1] cmp r0, r6 - bcs _0813B05C + bcs @0813B05C movs r0, 0 bl sub_813B0B4 mov r0, r8 @@ -606678,26 +606678,26 @@ _0813B004: ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - b _0813B070 + b @0813B070 .align 2, 0 .pool -_0813B05C: +@0813B05C: cmp r5, 0xA - bne _0813B080 + bne @0813B080 ldr r0, =0x000008d4 bl flag_set ldr r1, =0x020375f0 movs r0, 0x2 -_0813B06A: +@0813B06A: strh r0, [r1] bl script_env_2_enable_and_set_ctx_running -_0813B070: +@0813B070: adds r0, r7, 0 bl remove_task - b _0813B0A2 + b @0813B0A2 .align 2, 0 .pool -_0813B080: +@0813B080: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 @@ -606712,7 +606712,7 @@ _0813B080: strh r0, [r1] adds r0, r7, 0 bl remove_task -_0813B0A2: +@0813B0A2: pop {r3} mov r8, r3 pop {r4-r7} @@ -606723,7 +606723,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 @@ -606743,17 +606743,17 @@ sub_813B0B4: @ 813B0B4 mov r3, sp bl npc_id_by_local_id_and_map_ret_success cmp r4, 0 - bne _0813B0F0 + bne @0813B0F0 movs r0, 0xC4 bl audio_play - b _0813B0F8 + b @0813B0F8 .align 2, 0 .pool -_0813B0F0: +@0813B0F0: movs r0, 0x82 lsls r0, 1 bl audio_play -_0813B0F8: +@0813B0F8: ldr r0, =sub_813B160 + 1 movs r1, 0x8 bl AddTask @@ -606775,14 +606775,14 @@ _0813B0F8: str r0, [r3, 0x10] adds r5, r2, 0 cmp r4, 0 - bne _0813B138 + bne @0813B138 movs r0, 0x3C - b _0813B13A + b @0813B13A .align 2, 0 .pool -_0813B138: +@0813B138: movs r0, 0x5 -_0813B13A: +@0813B13A: str r0, [r3, 0x14] movs r0, 0x42 bl oe_exec @@ -606803,7 +606803,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 @@ -606811,18 +606811,18 @@ sub_813B160: @ 813B160 bl oe_active_list_contains lsls r0, 24 cmp r0, 0 - bne _0813B17C + bne @0813B17C bl script_env_2_enable_and_set_ctx_running adds r0, r4, 0 bl remove_task -_0813B17C: +@0813B17C: pop {r4} pop {r0} bx r0 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 @@ -606834,30 +606834,30 @@ increment_var_x4026_on_birth_island_modulo_100: @ 813B184 ldrh r1, [r0, 0x4] ldr r0, =0x00003a1a cmp r1, r0 - bne _0813B1C8 + bne @0813B1C8 adds r0, r2, 0x1 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x63 - bls _0813B1C0 + bls @0813B1C0 adds r0, r4, 0 movs r1, 0 bl var_set - b _0813B1C8 + b @0813B1C8 .align 2, 0 .pool -_0813B1C0: +@0813B1C0: adds r0, r4, 0 adds r1, r2, 0 bl var_set -_0813B1C8: +@0813B1C8: pop {r4} pop {r0} bx r0 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 var_get @@ -606881,8 +606881,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 @@ -606891,7 +606891,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 @@ -606900,14 +606900,14 @@ 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 bl flag_check lsls r0, 24 cmp r0, 0 - bne _0813B258 + bne @0813B258 bl get_preferred_box adds r4, r0, 0 lsls r4, 24 @@ -606917,23 +606917,23 @@ sub_813B21C: @ 813B21C lsls r0, 16 lsrs r0, 16 cmp r4, r0 - beq _0813B258 + beq @0813B258 adds r0, r5, 0 bl flag_set movs r0, 0x1 - b _0813B25A + b @0813B25A .align 2, 0 .pool -_0813B258: +@0813B258: movs r0, 0 -_0813B25A: +@0813B25A: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_813B21C thumb_func_start sub_813B260 -sub_813B260: @ 813B260 +sub_813B260: ; 813B260 push {r4-r7,lr} ldr r0, =0x00004036 bl var_get @@ -606943,11 +606943,11 @@ sub_813B260: @ 813B260 bl get_preferred_box lsls r0, 24 lsrs r4, r0, 24 -_0813B278: +@0813B278: movs r5, 0 lsls r6, r4, 24 lsls r7, r4, 16 -_0813B27E: +@0813B27E: lsls r1, r5, 24 lsrs r1, 24 lsrs r0, r6, 24 @@ -606956,47 +606956,47 @@ _0813B27E: movs r2, 0 bl pokemon_getattr_encrypted cmp r0, 0 - bne _0813B2C0 + bne @0813B2C0 bl get_unknown_box_id lsls r0, 16 lsrs r0, 16 cmp r0, r4 - beq _0813B2A6 + beq @0813B2A6 ldr r0, =0x000008d7 bl flag_clear -_0813B2A6: +@0813B2A6: ldr r0, =0x00004036 lsrs r1, r7, 16 bl var_set bl sub_813B21C lsls r0, 24 lsrs r0, 24 - b _0813B2DC + b @0813B2DC .align 2, 0 .pool -_0813B2C0: +@0813B2C0: adds r5, 0x1 cmp r5, 0x1D - ble _0813B27E + ble @0813B27E adds r4, 0x1 cmp r4, 0xE - bne _0813B2CE + bne @0813B2CE movs r4, 0 -_0813B2CE: +@0813B2CE: bl get_preferred_box lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bne _0813B278 + bne @0813B278 movs r0, 0 -_0813B2DC: +@0813B2DC: pop {r4-r7} pop {r1} bx r1 thumb_func_end sub_813B260 thumb_func_start sub_813B2E4 -sub_813B2E4: @ 813B2E4 +sub_813B2E4: ; 813B2E4 push {r4,lr} bl GenerateRandomNumber lsls r0, 16 @@ -607010,40 +607010,40 @@ sub_813B2E4: @ 813B2E4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0813B340 + beq @0813B340 ldr r0, =0x000001bf bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0813B330 + bne @0813B330 ldr r0, =0x00004037 movs r1, 0x7 ands r4, r1 adds r1, r4, 0 adds r1, 0x9 bl var_set - b _0813B36A + b @0813B36A .align 2, 0 .pool -_0813B330: +@0813B330: movs r0, 0x1 ands r4, r0 cmp r4, 0 - bne _0813B354 + bne @0813B354 bl GenerateRandomNumber lsls r0, 16 lsrs r4, r0, 16 -_0813B340: +@0813B340: ldr r0, =0x00004037 movs r1, 0x7 ands r4, r1 adds r1, r4, 0x1 bl var_set - b _0813B36A + b @0813B36A .align 2, 0 .pool -_0813B354: +@0813B354: bl GenerateRandomNumber lsls r0, 16 lsrs r4, r0, 16 @@ -607053,7 +607053,7 @@ _0813B354: adds r1, r4, 0 adds r1, 0x9 bl var_set -_0813B36A: +@0813B36A: pop {r4} pop {r0} bx r0 @@ -607062,7 +607062,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 var_get @@ -607077,21 +607077,21 @@ sub_813B374: @ 813B374 movs r2, 0 bl GetMapName cmp r4, 0x8 - bls _0813B3A8 + bls @0813B3A8 movs r0, 0x1 - b _0813B3AA + b @0813B3AA .align 2, 0 .pool -_0813B3A8: +@0813B3A8: movs r0, 0 -_0813B3AA: +@0813B3AA: pop {r4} pop {r1} bx r1 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 @@ -607103,13 +607103,13 @@ sub_813B3B0: @ 813B3B0 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0 - beq _0813B47C + beq @0813B47C adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 ldr r0, =0x000003e7 cmp r4, r0 - bls _0813B474 + bls @0813B474 adds r0, r5, 0 movs r1, 0 bl var_set @@ -607118,43 +607118,43 @@ sub_813B3B0: @ 813B3B0 movs r0, 0x4 ldrsb r0, [r1, r0] cmp r0, 0x18 - bne _0813B414 + bne @0813B414 movs r0, 0x5 ldrsb r0, [r1, r0] cmp r0, 0x69 - bgt _0813B414 + bgt @0813B414 cmp r0, 0x65 - blt _0813B414 + blt @0813B414 ldr r0, =0x00004039 movs r1, 0x1 - b _0813B478 + b @0813B478 .align 2, 0 .pool -_0813B414: +@0813B414: ldr r0, =0x03005d8c ldr r2, [r0] movs r1, 0x4 ldrsb r1, [r2, r1] adds r3, r0, 0 cmp r1, 0 - bne _0813B444 + bne @0813B444 movs r0, 0x5 ldrsb r0, [r2, r0] cmp r0, 0x34 - beq _0813B436 + beq @0813B436 cmp r0, 0x34 - blt _0813B444 + blt @0813B444 cmp r0, 0x38 - bgt _0813B444 + bgt @0813B444 cmp r0, 0x36 - blt _0813B444 -_0813B436: + blt @0813B444 +@0813B436: ldr r0, =0x00004039 movs r1, 0x1 - b _0813B478 + b @0813B478 .align 2, 0 .pool -_0813B444: +@0813B444: ldr r3, [r3] movs r2, 0x5 ldrsb r2, [r3, r2] @@ -607163,36 +607163,36 @@ _0813B444: adds r0, r1 ldrb r0, [r0] cmp r2, r0 - bne _0813B468 + bne @0813B468 movs r0, 0x4 ldrsb r0, [r3, r0] cmp r0, 0 - bne _0813B468 + bne @0813B468 movs r0, 0x1 - b _0813B47E + b @0813B47E .align 2, 0 .pool -_0813B468: +@0813B468: ldr r0, =0x00004037 movs r1, 0 - b _0813B478 + b @0813B478 .align 2, 0 .pool -_0813B474: +@0813B474: adds r0, r5, 0 adds r1, r4, 0 -_0813B478: +@0813B478: bl var_set -_0813B47C: +@0813B47C: movs r0, 0 -_0813B47E: +@0813B47E: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_813B3B0 thumb_func_start sub_813B484 -sub_813B484: @ 813B484 +sub_813B484: ; 813B484 push {lr} movs r0, 0x2 bl sub_80AB104 @@ -607201,7 +607201,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 @@ -607212,46 +607212,46 @@ sub_813B490: @ 813B490 adds r0, r5, 0x2 mov r12, r0 adds r7, r5, 0x1 -_0813B4A4: +@0813B4A4: lsls r0, r3, 1 adds r2, r0, r3 adds r0, r2, r5 ldrb r0, [r0] cmp r6, r0 - bne _0813B4CC + bne @0813B4CC movs r1, 0x5 ldrsb r1, [r4, r1] adds r0, r2, r7 ldrb r0, [r0] cmp r1, r0 - bne _0813B4CC + bne @0813B4CC mov r1, r12 adds r0, r2, r1 ldrb r0, [r0] - b _0813B4D8 + b @0813B4D8 .align 2, 0 .pool -_0813B4CC: +@0813B4CC: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0xB - bls _0813B4A4 + bls @0813B4A4 movs r0, 0x1 -_0813B4D8: +@0813B4D8: pop {r4-r7} pop {r1} bx r1 thumb_func_end sub_813B490 thumb_func_start sub_813B4E0 -sub_813B4E0: @ 813B4E0 +sub_813B4E0: ; 813B4E0 push {lr} ldr r0, =0x020375e0 ldrh r0, [r0] bl sub_81D15CC cmp r0, 0 - blt _0813B50C + blt @0813B50C movs r1, 0xAE lsls r1, 1 adds r0, r1 @@ -607261,39 +607261,39 @@ sub_813B4E0: @ 813B4E0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0813B50C + bne @0813B50C movs r0, 0x1 - b _0813B50E + b @0813B50E .align 2, 0 .pool -_0813B50C: +@0813B50C: movs r0, 0 -_0813B50E: +@0813B50E: pop {r1} bx r1 thumb_func_end sub_813B4E0 thumb_func_start sub_813B514 -sub_813B514: @ 813B514 +sub_813B514: ; 813B514 push {lr} ldr r0, =0x0000403f bl var_get lsls r0, 16 cmp r0, 0 - beq _0813B52C + beq @0813B52C movs r0, 0x1 - b _0813B52E + b @0813B52E .align 2, 0 .pool -_0813B52C: +@0813B52C: movs r0, 0 -_0813B52E: +@0813B52E: pop {r1} bx r1 thumb_func_end sub_813B514 thumb_func_start sub_813B534 -sub_813B534: @ 813B534 +sub_813B534: ; 813B534 push {lr} ldr r2, =0x0203ab70 ldr r1, =0x02022fec @@ -607304,11 +607304,11 @@ sub_813B534: @ 813B534 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _0813B552 + bne @0813B552 ldr r0, =sub_80B3AF8 + 1 movs r1, 0x5 bl AddTask -_0813B552: +@0813B552: pop {r0} bx r0 .align 2, 0 @@ -607316,7 +607316,7 @@ _0813B552: thumb_func_end sub_813B534 thumb_func_start sub_813B568 -sub_813B568: @ 813B568 +sub_813B568: ; 813B568 push {lr} ldr r0, =sub_813B57C + 1 movs r1, 0x5 @@ -607328,7 +607328,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 @@ -607340,76 +607340,76 @@ sub_813B57C: @ 813B57C movs r1, 0x8 ldrsh r0, [r0, r1] cmp r0, 0x9 - bls _0813B596 - b _0813B7C6 -_0813B596: + bls @0813B596 + b @0813B7C6 +@0813B596: lsls r0, 2 - ldr r1, =_0813B5A8 + ldr r1, =@0813B5A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0813B5A8: - .4byte _0813B5D0 - .4byte _0813B5E4 - .4byte _0813B614 - .4byte _0813B6B4 - .4byte _0813B6E4 - .4byte _0813B728 - .4byte _0813B764 - .4byte _0813B772 - .4byte _0813B784 - .4byte _0813B7A8 -_0813B5D0: +@0813B5A8: + .4byte @0813B5D0 + .4byte @0813B5E4 + .4byte @0813B614 + .4byte @0813B6B4 + .4byte @0813B6E4 + .4byte @0813B728 + .4byte @0813B764 + .4byte @0813B772 + .4byte @0813B784 + .4byte @0813B7A8 +@0813B5D0: ldr r0, =sub_80B3AF8 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - beq _0813B5DE - b _0813B7C6 -_0813B5DE: - b _0813B790 + beq @0813B5DE + b @0813B7C6 +@0813B5DE: + b @0813B790 .align 2, 0 .pool -_0813B5E4: +@0813B5E4: bl sub_800A520 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0813B5F2 - b _0813B7C6 -_0813B5F2: + beq @0813B5F2 + b @0813B7C6 +@0813B5F2: bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - bne _0813B5FE - b _0813B790 -_0813B5FE: + bne @0813B5FE + b @0813B790 +@0813B5FE: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 ldr r1, =0x020375e0 movs r2, 0x2 bl link_0800A448 - b _0813B708 + b @0813B708 .align 2, 0 .pool -_0813B614: +@0813B614: bl sub_800A550 movs r1, 0x2 ands r1, r0 cmp r1, 0 - bne _0813B622 - b _0813B7C6 -_0813B622: + bne @0813B622 + b @0813B7C6 +@0813B622: bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - beq _0813B62E - b _0813B790 -_0813B62E: + beq @0813B62E + b @0813B790 +@0813B62E: ldr r5, =0x020375e2 ldr r0, =0x020223c4 movs r1, 0x80 @@ -607422,89 +607422,89 @@ _0813B62E: ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0x1 - bne _0813B668 + bne @0813B668 ldrh r1, [r5] cmp r1, 0x1 - bne _0813B668 + bne @0813B668 ldr r0, =0x020375f0 strh r1, [r0] - b _0813B790 + b @0813B790 .align 2, 0 .pool -_0813B668: +@0813B668: ldr r0, =0x020375e0 ldrh r1, [r0] adds r2, r0, 0 cmp r1, 0 - bne _0813B68C + bne @0813B68C ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x1 - bne _0813B68C + bne @0813B68C ldr r1, =0x020375f0 movs r0, 0x2 - b _0813B6AC + b @0813B6AC .align 2, 0 .pool -_0813B68C: +@0813B68C: ldrh r0, [r2] cmp r0, 0x1 - bne _0813B6A8 + bne @0813B6A8 ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0 - bne _0813B6A8 + bne @0813B6A8 ldr r1, =0x020375f0 movs r0, 0x3 - b _0813B6AC + b @0813B6AC .align 2, 0 .pool -_0813B6A8: +@0813B6A8: ldr r1, =0x020375f0 movs r0, 0 -_0813B6AC: +@0813B6AC: strh r0, [r1] - b _0813B790 + b @0813B790 .align 2, 0 .pool -_0813B6B4: +@0813B6B4: bl sub_800A520 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0813B6C2 - b _0813B7C6 -_0813B6C2: + beq @0813B6C2 + b @0813B7C6 +@0813B6C2: bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - bne _0813B790 + bne @0813B790 bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 ldr r1, =0x020375f0 movs r2, 0x2 bl link_0800A448 - b _0813B708 + b @0813B708 .align 2, 0 .pool -_0813B6E4: +@0813B6E4: bl sub_800A550 movs r1, 0x1 ands r1, r0 cmp r1, 0 - beq _0813B7C6 + beq @0813B7C6 bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - beq _0813B790 + beq @0813B790 ldr r1, =0x020375f0 ldr r0, =0x020223c4 ldrh r0, [r0] strh r0, [r1] movs r0, 0 bl sub_800A5EC -_0813B708: +@0813B708: ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -607513,55 +607513,55 @@ _0813B708: ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b _0813B7C6 + b @0813B7C6 .align 2, 0 .pool -_0813B728: +@0813B728: bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - bne _0813B74C + bne @0813B74C ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x2 - bne _0813B790 + bne @0813B790 ldr r0, =0x0824979b bl box_related_two__3 - b _0813B790 + b @0813B790 .align 2, 0 .pool -_0813B74C: +@0813B74C: ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x3 - bne _0813B790 + bne @0813B790 ldr r0, =0x0824979b bl box_related_two__3 - b _0813B790 + b @0813B790 .align 2, 0 .pool -_0813B764: +@0813B764: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _0813B7C6 - b _0813B790 -_0813B772: + bne @0813B7C6 + b @0813B790 +@0813B772: bl sub_800A520 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0813B7C6 + bne @0813B7C6 bl sub_800ADF8 - b _0813B790 -_0813B784: + b @0813B790 +@0813B784: bl sub_800A520 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0813B7C6 -_0813B790: + bne @0813B7C6 +@0813B790: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -607570,16 +607570,16 @@ _0813B790: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _0813B7C6 + b @0813B7C6 .align 2, 0 .pool -_0813B7A8: +@0813B7A8: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - bne _0813B7B4 + bne @0813B7B4 bl sub_800AC34 -_0813B7B4: +@0813B7B4: ldr r0, =0x02022fec ldr r1, =0x0203ab70 ldr r1, [r1] @@ -607587,7 +607587,7 @@ _0813B7B4: bl script_env_2_enable_and_set_ctx_running adds r0, r4, 0 bl remove_task -_0813B7C6: +@0813B7C6: pop {r4,r5} pop {r0} bx r0 @@ -607596,25 +607596,25 @@ _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] cmp r0, 0 - bne _0813B7F8 + bne @0813B7F8 ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 movs r0, 0 movs r1, 0x1 bl sub_81D6720 - b _0813B802 + b @0813B802 .align 2, 0 .pool -_0813B7F8: +@0813B7F8: ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 movs r0, 0x1 movs r1, 0 bl sub_81D6720 -_0813B802: +@0813B802: pop {r0} bx r0 .align 2, 0 @@ -607622,7 +607622,7 @@ _0813B802: thumb_func_end sub_813B7D8 thumb_func_start sub_813B80C -sub_813B80C: @ 813B80C +sub_813B80C: ; 813B80C push {lr} ldr r0, =sub_813B824 + 1 movs r1, 0x8 @@ -607636,7 +607636,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 @@ -607654,7 +607654,7 @@ sub_813B824: @ 813B824 ldr r0, =0x020375e2 ldrh r0, [r0] cmp r1, r0 - bne _0813B858 + bne @0813B858 ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] @@ -607662,17 +607662,17 @@ sub_813B824: @ 813B824 strh r0, [r4, 0x2] movs r0, 0x9D bl audio_play -_0813B858: +@0813B858: movs r0, 0 ldrsh r1, [r4, r0] ldr r0, =0x020375e0 ldrh r0, [r0] subs r0, 0x1 cmp r1, r0 - bne _0813B86C + bne @0813B86C adds r0, r5, 0 bl remove_task -_0813B86C: +@0813B86C: pop {r4,r5} pop {r0} bx r0 @@ -607681,7 +607681,7 @@ _0813B86C: thumb_func_end sub_813B824 thumb_func_start sub_813B880 -sub_813B880: @ 813B880 +sub_813B880: ; 813B880 push {lr} ldr r0, =_fwalk + 1 movs r1, 0x8 @@ -607706,7 +607706,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 @@ -607734,15 +607734,15 @@ _fwalk: @ 813B8B0 movs r2, 0 ldrsh r0, [r0, r2] cmp r0, 0 - bne _0813B94E + bne @0813B94E movs r6, 0 -_0813B8EA: +@0813B8EA: movs r4, 0 lsls r3, r6, 3 mov r10, r3 adds r7, r6, 0x1 mov r8, r7 -_0813B8F4: +@0813B8F4: ldr r0, =0x03005d8c ldr r1, [r0] movs r2, 0 @@ -607767,12 +607767,12 @@ _0813B8F4: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _0813B8F4 + bls @0813B8F4 mov r1, r8 lsls r0, r1, 24 lsrs r6, r0, 24 cmp r6, 0x3 - bls _0813B8EA + bls @0813B8EA bl cur_mapdata_full_redraw ldrh r0, [r5, 0x6] adds r0, 0x1 @@ -607780,11 +607780,11 @@ _0813B8F4: lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - bne _0813B94E + bne @0813B94E mov r0, r9 bl remove_task bl script_env_2_enable_and_set_ctx_running -_0813B94E: +@0813B94E: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -607797,7 +607797,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 @@ -607824,7 +607824,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] @@ -607832,10 +607832,10 @@ sub_813B9A0: @ 813B9A0 movs r0, 0xB0 lsls r0, 4 cmp r1, r0 - bne _0813B9B6 + bne @0813B9B6 movs r0, 0x3 bl sub_8084D1C -_0813B9B6: +@0813B9B6: pop {r0} bx r0 .align 2, 0 @@ -607843,7 +607843,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] @@ -607860,33 +607860,33 @@ sub_813B9C0: @ 813B9C0 ldrh r0, [r2] ldr r1, =0x0000ffff cmp r0, r1 - beq _0813BA06 + beq @0813BA06 adds r4, r1, 0 adds r1, r2, 0 -_0813B9E6: +@0813B9E6: ldrh r0, [r2] cmp r0, r3 - bne _0813B9FC + bne @0813B9FC movs r0, 0x1 - b _0813BA08 + b @0813BA08 .align 2, 0 .pool -_0813B9FC: +@0813B9FC: adds r1, 0x2 adds r2, 0x2 ldrh r0, [r1] cmp r0, r4 - bne _0813B9E6 -_0813BA06: + bne @0813B9E6 +@0813BA06: movs r0, 0 -_0813BA08: +@0813BA08: pop {r4} pop {r1} bx r1 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 @@ -607903,12 +607903,12 @@ 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 cmp r0, 0 - beq _0813BA52 + beq @0813BA52 bl sub_813BCE8 ldr r0, =0x03005d8c ldr r1, [r0] @@ -607919,7 +607919,7 @@ sub_813BA30: @ 813BA30 lsls r2, 5 adds r1, r2 strh r0, [r1] -_0813BA52: +@0813BA52: pop {r0} bx r0 .align 2, 0 @@ -607927,7 +607927,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] @@ -607938,7 +607938,7 @@ sub_813BA60: @ 813BA60 movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _0813BAB6 + bne @0813BAB6 bl sub_813BF60 bl sub_813BD84 ldr r1, [r4] @@ -607963,7 +607963,7 @@ sub_813BA60: @ 813BA60 ldr r0, =0x00004095 movs r1, 0x1 bl var_set -_0813BAB6: +@0813BAB6: pop {r4} pop {r0} bx r0 @@ -607972,7 +607972,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 @@ -607981,7 +607981,7 @@ sub_813BADC: @ 813BADC lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - bne _0813BB58 + bne @0813BB58 ldr r4, =0x03005d8c ldr r0, [r4] ldr r5, =0x0000141e @@ -607994,12 +607994,12 @@ sub_813BADC: @ 813BADC ldrb r0, [r0] adds r1, r0 cmp r1, 0x13 - ble _0813BB54 + ble @0813BB54 bl sub_813BCA8 lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - bhi _0813BB3C + bhi @0813BB3C bl sub_813BB74 ldr r0, [r4] adds r0, r5 @@ -608007,10 +608007,10 @@ sub_813BADC: @ 813BADC ldr r1, =0x0000ff80 ands r1, r2 strh r1, [r0] - b _0813BB58 + b @0813BB58 .align 2, 0 .pool -_0813BB3C: +@0813BB3C: ldr r2, [r4] adds r2, r5 ldrh r1, [r2] @@ -608019,13 +608019,13 @@ _0813BB3C: movs r1, 0x14 orrs r0, r1 strh r0, [r2] - b _0813BB58 + b @0813BB58 .align 2, 0 .pool -_0813BB54: +@0813BB54: adds r0, r2, r0 strh r0, [r3] -_0813BB58: +@0813BB58: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x0000141e @@ -608041,7 +608041,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 @@ -608049,7 +608049,7 @@ sub_813BB74: @ 813BB74 ldr r7, =0x03005d8c ldr r2, =0x0000141e movs r6, 0x1 -_0813BB82: +@0813BB82: ldr r0, [r7] adds r0, r2 ldrh r1, [r0] @@ -608059,7 +608059,7 @@ _0813BB82: asrs r1, r4 ands r1, r6 cmp r1, 0 - bne _0813BBC8 + bne @0813BBC8 adds r3, r5, 0 str r2, [sp] str r3, [sp, 0x4] @@ -608069,7 +608069,7 @@ _0813BB82: ldr r2, [sp] ldr r3, [sp, 0x4] cmp r1, 0 - beq _0813BBC8 + beq @0813BBC8 ldr r0, [r7] adds r0, r2 adds r1, r6, 0 @@ -608077,15 +608077,15 @@ _0813BB82: ldrh r2, [r0] orrs r1, r2 strh r1, [r0] - b _0813BBEA + b @0813BBEA .align 2, 0 .pool -_0813BBC8: +@0813BBC8: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x7 - bls _0813BB82 + bls @0813BB82 ldr r0, =0x03005d8c ldr r2, [r0] ldr r0, =0x0000141e @@ -608098,7 +608098,7 @@ _0813BBC8: ldrh r1, [r2] orrs r0, r1 strh r0, [r2] -_0813BBEA: +@0813BBEA: adds r0, r3, 0 add sp, 0x8 pop {r4-r7} @@ -608109,7 +608109,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 @@ -608121,10 +608121,10 @@ sub_813BC00: @ 813BC00 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bne _0813BC2E + bne @0813BC2E movs r0, 0 - b _0813BC8E -_0813BC1E: + b @0813BC8E +@0813BC1E: mov r1, r8 ldr r0, [r1] add r0, r9 @@ -608132,15 +608132,15 @@ _0813BC1E: ldrh r1, [r0] eors r4, r1 strh r4, [r0] - b _0813BC8C -_0813BC2E: + b @0813BC8C +@0813BC2E: movs r5, 0 ldr r2, =0x03005d8c mov r8, r2 ldr r0, =0x0000141e mov r9, r0 movs r4, 0x1 -_0813BC3A: +@0813BC3A: mov r1, r8 ldr r0, [r1] add r0, r9 @@ -608151,19 +608151,19 @@ _0813BC3A: asrs r1, r6 ands r1, r4 cmp r1, 0 - beq _0813BC5E + beq @0813BC5E mov r10, r5 bl GenerateRandomNumber adds r1, r4, 0 ands r1, r0 cmp r1, 0 - bne _0813BC1E -_0813BC5E: + bne @0813BC1E +@0813BC5E: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x7 - bls _0813BC3A + bls @0813BC3A ldr r0, =0x03005d8c ldr r0, [r0] ldr r2, =0x0000141e @@ -608177,14 +608177,14 @@ _0813BC5E: movs r3, 0x1 ands r0, r3 cmp r0, 0 - beq _0813BC8C + beq @0813BC8C adds r0, r3, 0 lsls r0, r2 eors r1, r0 strh r1, [r4] -_0813BC8C: +@0813BC8C: mov r0, r10 -_0813BC8E: +@0813BC8E: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -608197,7 +608197,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 @@ -608207,23 +608207,23 @@ sub_813BCA8: @ 813BCA8 adds r0, r1 ldrh r4, [r0] movs r5, 0x1 -_0813BCBA: +@0813BCBA: adds r1, r2, 0 adds r1, 0x8 adds r0, r4, 0 asrs r0, r1 ands r0, r5 cmp r0, 0 - beq _0813BCCE + beq @0813BCCE adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 -_0813BCCE: +@0813BCCE: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x7 - bls _0813BCBA + bls @0813BCBA adds r0, r3, 0 pop {r4,r5} pop {r1} @@ -608233,7 +608233,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 @@ -608241,12 +608241,12 @@ sub_813BCE8: @ 813BCE8 ldrh r1, [r0, 0xE] ldr r0, =0x000003e6 cmp r1, r0 - bhi _0813BD58 + bhi @0813BD58 adds r6, r2, 0 - b _0813BD32 + b @0813BD32 .align 2, 0 .pool -_0813BD04: +@0813BD04: ldr r0, [r6] ldrh r1, [r0, 0xE] ldr r4, =0x03005d8c @@ -608257,7 +608257,7 @@ _0813BD04: ldrh r0, [r0] subs r1, r0 cmp r1, 0xB - ble _0813BD58 + ble @0813BD58 bl sub_813BC00 ldr r0, [r4] movs r1, 0xA1 @@ -608269,12 +608269,12 @@ _0813BD04: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_0813BD32: +@0813BD32: bl sub_813BCA8 lsls r0, 16 lsrs r0, 16 cmp r0, 0x4 - bhi _0813BD54 + bhi @0813BD54 ldr r0, =0x03005d8c ldr r1, [r0] ldr r0, [r6] @@ -608283,20 +608283,20 @@ _0813BD32: lsls r2, 5 adds r1, r2 strh r0, [r1] - b _0813BD58 + b @0813BD58 .align 2, 0 .pool -_0813BD54: +@0813BD54: cmp r5, 0x8 - bne _0813BD04 -_0813BD58: + bne @0813BD04 +@0813BD58: pop {r4-r6} pop {r0} bx r0 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 @@ -608313,7 +608313,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 @@ -608338,7 +608338,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 @@ -608346,44 +608346,44 @@ sub_813BDB4: @ 813BDB4 ldrh r0, [r0] subs r0, 0x8 cmp r0, 0x7 - bhi _0813BE14 + bhi @0813BE14 lsls r0, 2 - ldr r1, =_0813BDD8 + ldr r1, =@0813BDD8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0813BDD8: - .4byte _0813BE14 - .4byte _0813BE14 - .4byte _0813BDF8 - .4byte _0813BDFE - .4byte _0813BE04 - .4byte _0813BE0A - .4byte _0813BE10 - .4byte _0813BE14 -_0813BDF8: +@0813BDD8: + .4byte @0813BE14 + .4byte @0813BE14 + .4byte @0813BDF8 + .4byte @0813BDFE + .4byte @0813BE04 + .4byte @0813BE0A + .4byte @0813BE10 + .4byte @0813BE14 +@0813BDF8: movs r3, 0 movs r2, 0x3 - b _0813BE14 -_0813BDFE: + b @0813BE14 +@0813BDFE: movs r3, 0 movs r2, 0x1 - b _0813BE14 -_0813BE04: + b @0813BE14 +@0813BE04: movs r3, 0x1 movs r2, 0 - b _0813BE14 -_0813BE0A: + b @0813BE14 +@0813BE0A: movs r3, 0 movs r2, 0x4 - b _0813BE14 -_0813BE10: + b @0813BE14 +@0813BE10: movs r3, 0x1 movs r2, 0x5 -_0813BE14: +@0813BE14: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00003150 @@ -608397,7 +608397,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 @@ -608408,67 +608408,67 @@ sub_813BE30: @ 813BE30 adds r1, r6, r0 ldrb r0, [r1] cmp r0, 0xFF - bne _0813BEE8 + bne @0813BEE8 cmp r2, 0x5 - bhi _0813BED4 + bhi @0813BED4 lsls r0, r2, 2 - ldr r1, =_0813BE58 + ldr r1, =@0813BE58 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0813BE58: - .4byte _0813BED4 - .4byte _0813BE70 - .4byte _0813BE84 - .4byte _0813BE98 - .4byte _0813BEAC - .4byte _0813BEC0 -_0813BE70: +@0813BE58: + .4byte @0813BED4 + .4byte @0813BE70 + .4byte @0813BE84 + .4byte @0813BE98 + .4byte @0813BEAC + .4byte @0813BEC0 +@0813BE70: ldr r0, =0x02021cc4 ldr r1, =0x085ead14 bl gf_strcpy - b _0813BF04 + b @0813BF04 .align 2, 0 .pool -_0813BE84: +@0813BE84: ldr r0, =0x02021cc4 ldr r1, =0x085ead1b bl gf_strcpy - b _0813BF04 + b @0813BF04 .align 2, 0 .pool -_0813BE98: +@0813BE98: ldr r0, =0x02021cc4 ldr r1, =0x085ead22 bl gf_strcpy - b _0813BF04 + b @0813BF04 .align 2, 0 .pool -_0813BEAC: +@0813BEAC: ldr r0, =0x02021cc4 ldr r1, =0x085ead29 bl gf_strcpy - b _0813BF04 + b @0813BF04 .align 2, 0 .pool -_0813BEC0: +@0813BEC0: ldr r0, =0x02021cc4 ldr r1, =0x085ead30 bl gf_strcpy - b _0813BF04 + b @0813BF04 .align 2, 0 .pool -_0813BED4: +@0813BED4: ldr r0, =0x02021cc4 ldr r1, =0x085ead0c bl gf_strcpy - b _0813BF04 + b @0813BF04 .align 2, 0 .pool -_0813BEE8: +@0813BEE8: ldr r4, =0x02021cc4 adds r0, r4, 0 movs r2, 0x7 @@ -608481,7 +608481,7 @@ _0813BEE8: ldrb r1, [r0] adds r0, r4, 0 bl sub_8009308 -_0813BF04: +@0813BF04: pop {r4-r6} pop {r0} bx r0 @@ -608490,32 +608490,32 @@ _0813BF04: thumb_func_end sub_813BE30 thumb_func_start sub_813BF10 -sub_813BF10: @ 813BF10 +sub_813BF10: ; 813BF10 push {lr} ldr r0, =0x00004095 bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - bne _0813BF40 + bne @0813BF40 bl sub_813BA30 ldr r0, =0x0202433a ldrb r0, [r0] cmp r0, 0x1 - bne _0813BF3C + bne @0813BF3C bl sub_813BB74 - b _0813BF40 + b @0813BF40 .align 2, 0 .pool -_0813BF3C: +@0813BF3C: bl sub_813BC00 -_0813BF40: +@0813BF40: pop {r0} bx r0 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 @@ -608530,7 +608530,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 @@ -608545,7 +608545,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] @@ -608559,7 +608559,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 @@ -608586,17 +608586,17 @@ 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 -_0813BFCA: +@0813BFCA: adds r0, r4, 0 bl sub_813BF94 adds r4, 0x10 subs r5, 0x1 cmp r5, 0 - bge _0813BFCA + bge @0813BFCA movs r0, 0x17 movs r1, 0 bl sav12_xor_set @@ -608612,7 +608612,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] @@ -608623,39 +608623,39 @@ 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 lsrs r6, r2, 16 movs r5, 0 adds r4, r0, 0 -_0813C014: +@0813C014: adds r0, r4, 0 adds r1, r7, 0 movs r2, 0x7 bl sub_8008C68 cmp r0, 0 - bne _0813C02C + bne @0813C02C ldrh r0, [r4, 0x8] cmp r0, r6 - bne _0813C02C + bne @0813C02C adds r0, r5, 0 - b _0813C036 -_0813C02C: + b @0813C036 +@0813C02C: adds r4, 0x10 adds r5, 0x1 cmp r5, 0x4 - ble _0813C014 + ble @0813C014 movs r0, 0x5 -_0813C036: +@0813C036: pop {r4-r7} pop {r1} bx r1 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 @@ -608664,11 +608664,11 @@ sub_813C03C: @ 813C03C sub sp, 0x18 mov r10, r0 movs r1, 0x4 -_0813C04C: +@0813C04C: subs r3, r1, 0x1 adds r6, r3, 0 cmp r3, 0 - blt _0813C0BA + blt @0813C0BA lsls r0, r1, 4 add r0, r10 str r0, [sp, 0x14] @@ -608680,7 +608680,7 @@ _0813C04C: mov r9, r4 add r1, r9 mov r8, r1 -_0813C06A: +@0813C06A: ldr r0, [sp, 0x14] str r3, [sp, 0x10] bl sub_813BFF8 @@ -608689,7 +608689,7 @@ _0813C06A: bl sub_813BFF8 ldr r3, [sp, 0x10] cmp r4, r0 - ble _0813C0B2 + ble @0813C0B2 mov r1, sp ldr r0, [sp, 0x14] ldm r0!, {r2,r4,r7} @@ -608715,15 +608715,15 @@ _0813C06A: ldrb r0, [r1] strb r0, [r7] strb r2, [r1] -_0813C0B2: +@0813C0B2: subs r5, 0x10 subs r6, 0x1 cmp r6, 0 - bge _0813C06A -_0813C0BA: + bge @0813C06A +@0813C0BA: adds r1, r3, 0 cmp r1, 0 - bgt _0813C04C + bgt @0813C04C add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -608735,21 +608735,21 @@ _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 - beq _0813C100 + beq @0813C100 cmp r1, 0x2 - bgt _0813C0E2 + bgt @0813C0E2 cmp r1, 0x1 - beq _0813C0E8 - b _0813C12A -_0813C0E2: + beq @0813C0E8 + b @0813C12A +@0813C0E2: cmp r1, 0x3 - beq _0813C118 - b _0813C12A -_0813C0E8: + beq @0813C118 + b @0813C12A +@0813C0E8: ldrh r0, [r2, 0xA] adds r0, 0x1 strh r0, [r2, 0xA] @@ -608757,12 +608757,12 @@ _0813C0E8: lsrs r0, 16 ldr r1, =0x0000270f cmp r0, r1 - bls _0813C12A + bls @0813C12A strh r1, [r2, 0xA] - b _0813C12A + b @0813C12A .align 2, 0 .pool -_0813C100: +@0813C100: ldrh r0, [r2, 0xC] adds r0, 0x1 strh r0, [r2, 0xC] @@ -608770,12 +608770,12 @@ _0813C100: lsrs r0, 16 ldr r1, =0x0000270f cmp r0, r1 - bls _0813C12A + bls @0813C12A strh r1, [r2, 0xC] - b _0813C12A + b @0813C12A .align 2, 0 .pool -_0813C118: +@0813C118: ldrh r0, [r2, 0xE] adds r0, 0x1 strh r0, [r2, 0xE] @@ -608783,9 +608783,9 @@ _0813C118: lsrs r0, 16 ldr r1, =0x0000270f cmp r0, r1 - bls _0813C12A + bls @0813C12A strh r1, [r2, 0xE] -_0813C12A: +@0813C12A: pop {r0} bx r0 .align 2, 0 @@ -608793,36 +608793,36 @@ _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 + beq @0813C14E cmp r0, 0x2 - bgt _0813C144 + bgt @0813C144 cmp r0, 0x1 - beq _0813C14A - b _0813C166 -_0813C144: + beq @0813C14A + b @0813C166 +@0813C144: cmp r0, 0x3 - beq _0813C152 - b _0813C166 -_0813C14A: + beq @0813C152 + b @0813C166 +@0813C14A: movs r4, 0x17 - b _0813C154 -_0813C14E: + b @0813C154 +@0813C14E: movs r4, 0x18 - b _0813C154 -_0813C152: + b @0813C154 +@0813C152: movs r4, 0x19 -_0813C154: +@0813C154: adds r0, r4, 0 bl sub_80847F8 ldr r1, =0x0000270e cmp r0, r1 - bhi _0813C166 + bhi @0813C166 adds r0, r4, 0 bl sav12_xor_increment -_0813C166: +@0813C166: pop {r4} pop {r0} bx r0 @@ -608831,7 +608831,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 @@ -608856,7 +608856,7 @@ sub_813C170: @ 813C170 bl sub_813C008 adds r5, r0, 0 cmp r5, 0x5 - bne _0813C1D4 + bne @0813C1D4 movs r5, 0x4 adds r4, r6, 0 adds r4, 0x40 @@ -608877,7 +608877,7 @@ sub_813C170: @ 813C170 adds r0, r1 ldrh r0, [r0, 0x1A] strb r0, [r2] -_0813C1D4: +@0813C1D4: lsls r0, r5, 4 adds r0, r6, r0 mov r1, r10 @@ -608896,7 +608896,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] @@ -608910,7 +608910,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 @@ -608923,9 +608923,9 @@ sub_813C214: @ 813C214 lsrs r0, 16 ldr r2, =0x0000270f cmp r0, r2 - bls _0813C230 + bls @0813C230 strh r2, [r1] -_0813C230: +@0813C230: pop {r0} bx r0 .align 2, 0 @@ -608933,7 +608933,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 @@ -608946,9 +608946,9 @@ sub_813C23C: @ 813C23C lsrs r0, 16 ldr r2, =0x0000270f cmp r0, r2 - bls _0813C258 + bls @0813C258 strh r2, [r1] -_0813C258: +@0813C258: pop {r0} bx r0 .align 2, 0 @@ -608956,44 +608956,44 @@ _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 ldrb r0, [r0] cmp r0, 0x1 - beq _0813C27C + beq @0813C27C cmp r0, 0x2 - beq _0813C28A - b _0813C298 + beq @0813C28A + b @0813C298 .align 2, 0 .pool -_0813C27C: +@0813C27C: eors r0, r4 bl sub_813C214 adds r0, r4, 0 bl sub_813C23C - b _0813C298 -_0813C28A: + b @0813C298 +@0813C28A: movs r0, 0x1 eors r0, r4 bl sub_813C23C adds r0, r4, 0 bl sub_813C214 -_0813C298: +@0813C298: pop {r4} pop {r0} bx r0 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 bl in_trade_center cmp r0, 0x1 - beq _0813C2DA + beq @0813C2DA adds r0, r4, 0 bl sub_813C264 ldr r0, =0x03005d8c @@ -609014,7 +609014,7 @@ sub_813C2A0: @ 813C2A0 lsrs r4, 24 str r4, [sp] bl sub_813C170 -_0813C2DA: +@0813C2DA: add sp, 0x4 pop {r4} pop {r0} @@ -609024,7 +609024,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 @@ -609081,7 +609081,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} @@ -609092,10 +609092,10 @@ sub_813C384: @ 813C384 lsrs r4, r1, 24 ldrh r0, [r6, 0xA] cmp r0, 0 - bne _0813C40C + bne @0813C40C ldr r7, [r6, 0xC] cmp r7, 0 - bne _0813C40C + bne @0813C40C ldr r0, =0x0203ab74 mov r8, r0 ldrb r0, [r0] @@ -609138,10 +609138,10 @@ sub_813C384: @ 813C384 adds r2, r5, 0 movs r3, 0xB0 bl Print - b _0813C4A8 + b @0813C4A8 .align 2, 0 .pool -_0813C40C: +@0813C40C: ldr r0, =0x02021cc4 movs r1, 0x8 bl sub_800917C @@ -609210,7 +609210,7 @@ _0813C40C: ldr r2, =0x02021cc4 movs r3, 0xB0 bl Print -_0813C4A8: +@0813C4A8: add sp, 0xC pop {r3} mov r8, r3 @@ -609222,7 +609222,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 @@ -609280,7 +609280,7 @@ sub_813C4BC: @ 813C4BC movs r6, 0xE0 lsls r6, 19 mov r5, r9 -_0813C540: +@0813C540: ldr r2, [r7] adds r0, r2, r5 lsrs r1, r6, 24 @@ -609295,7 +609295,7 @@ _0813C540: adds r5, 0x10 adds r4, 0x1 cmp r4, 0x4 - ble _0813C540 + ble @0813C540 ldr r4, =0x0203ab74 ldrb r0, [r4] bl Window_WriteStandardTileMap @@ -609314,7 +609314,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] @@ -609330,7 +609330,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 @@ -609339,7 +609339,7 @@ sub_813C5BC: @ 813C5BC movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0813C5DC + bne @0813C5DC ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -609347,7 +609347,7 @@ sub_813C5BC: @ 813C5BC adds r1, r0 ldr r0, =sub_813C5EC + 1 str r0, [r1] -_0813C5DC: +@0813C5DC: pop {r0} bx r0 .align 2, 0 @@ -609355,7 +609355,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 @@ -609369,17 +609369,17 @@ sub_813C5EC: @ 813C5EC movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0813C610 + bne @0813C610 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0813C61A -_0813C610: + beq @0813C61A +@0813C610: movs r0, 0x5 bl audio_play ldr r0, =sub_813C62C + 1 str r0, [r4] -_0813C61A: +@0813C61A: pop {r4} pop {r0} bx r0 @@ -609388,7 +609388,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 @@ -609417,7 +609417,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 @@ -609426,7 +609426,7 @@ sub_813C664: @ 813C664 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0813C694 + bne @0813C694 ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 ldr r0, =0x0203ab78 @@ -609437,7 +609437,7 @@ sub_813C664: @ 813C664 bl Window_FreeMemory adds r0, r4, 0 bl remove_task -_0813C694: +@0813C694: pop {r4} pop {r0} bx r0 @@ -609446,7 +609446,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 @@ -609467,7 +609467,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} @@ -609487,7 +609487,7 @@ sub_813C6D4: @ 813C6D4 movs r0, 0x81 lsls r0, 24 mov r12, r0 -_0813C6FA: +@0813C6FA: strh r6, [r2] mov r0, sp str r0, [r1] @@ -609497,7 +609497,7 @@ _0813C6FA: adds r3, r5 subs r4, r5 cmp r4, r5 - bhi _0813C6FA + bhi @0813C6FA strh r6, [r2] mov r2, sp str r2, [r1] @@ -609606,7 +609606,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 @@ -609618,7 +609618,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 @@ -609657,7 +609657,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 @@ -609668,7 +609668,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 @@ -609700,7 +609700,7 @@ sub_813C890: @ 813C890 thumb_func_end sub_813C890 thumb_func_start sub_813C8D8 -sub_813C8D8: @ 813C8D8 +sub_813C8D8: ; 813C8D8 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -609710,7 +609710,7 @@ sub_813C8D8: @ 813C8D8 thumb_func_end sub_813C8D8 thumb_func_start sub_813C8EC -sub_813C8EC: @ 813C8EC +sub_813C8EC: ; 813C8EC push {lr} bl run_active_tasks bl call_obj_callbacks @@ -609721,7 +609721,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 @@ -609734,7 +609734,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 @@ -609743,35 +609743,35 @@ sub_813C91C: @ 813C91C adds r0, r1 ldrb r0, [r0] cmp r0, 0x7 - bls _0813C930 - b _0813CA3C -_0813C930: + bls @0813C930 + b @0813CA3C +@0813C930: lsls r0, 2 - ldr r1, =_0813C944 + ldr r1, =@0813C944 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0813C944: - .4byte _0813C964 - .4byte _0813C970 - .4byte _0813C976 - .4byte _0813C9A8 - .4byte _0813C9BE - .4byte _0813C9DE - .4byte _0813C9F0 - .4byte _0813CA14 -_0813C964: +@0813C944: + .4byte @0813C964 + .4byte @0813C970 + .4byte @0813C976 + .4byte @0813C9A8 + .4byte @0813C9BE + .4byte @0813C9DE + .4byte @0813C9F0 + .4byte @0813CA14 +@0813C964: movs r0, 0 bl SetVBlankCallback bl sub_813C6D4 - b _0813CA00 -_0813C970: + b @0813CA00 +@0813C970: bl sub_813C80C - b _0813CA00 -_0813C976: + b @0813CA00 +@0813C976: ldr r4, =0x0203ab78 movs r0, 0x80 lsls r0, 4 @@ -609787,10 +609787,10 @@ _0813C976: movs r0, 0x3 bl bg_set_tilemap bl sub_813C828 - b _0813CA00 + b @0813CA00 .align 2, 0 .pool -_0813C9A8: +@0813C9A8: movs r0, 0x3 bl sub_813C890 movs r0, 0 @@ -609798,28 +609798,28 @@ _0813C9A8: movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply - b _0813CA00 -_0813C9BE: + b @0813CA00 +@0813C9BE: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0813CA3C + beq @0813CA3C movs r0, 0 bl gpu_sync_bg_show movs r0, 0x3 bl gpu_sync_bg_show movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - b _0813CA00 -_0813C9DE: + b @0813CA00 +@0813C9DE: ldr r0, =0x085b3d6c bl Window_InitFromTemplates bl TextBox_ResetSomeField - b _0813CA00 + b @0813CA00 .align 2, 0 .pool -_0813C9F0: +@0813C9F0: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -609827,7 +609827,7 @@ _0813C9F0: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 -_0813CA00: +@0813CA00: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -609835,10 +609835,10 @@ _0813CA00: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0813CA3C + b @0813CA3C .align 2, 0 .pool -_0813CA14: +@0813CA14: bl sub_813C880 ldr r0, =sub_813C8D8 + 1 bl SetVBlankCallback @@ -609854,7 +609854,7 @@ _0813CA14: adds r0, r1 movs r1, 0 strb r1, [r0] -_0813CA3C: +@0813CA3C: add sp, 0x4 pop {r4} pop {r0} @@ -609864,7 +609864,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 @@ -609878,7 +609878,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 @@ -609888,33 +609888,33 @@ sub_813CA68: @ 813CA68 adds r0, r1 ldrh r0, [r0] cmp r0, 0x4 - bhi _0813CB20 + bhi @0813CB20 lsls r0, 2 - ldr r1, =_0813CA90 + ldr r1, =@0813CA90 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0813CA90: - .4byte _0813CAA4 - .4byte _0813CAB4 - .4byte _0813CABA - .4byte _0813CAEC - .4byte _0813CB10 -_0813CAA4: +@0813CA90: + .4byte @0813CAA4 + .4byte @0813CAB4 + .4byte @0813CABA + .4byte @0813CAEC + .4byte @0813CB10 +@0813CAA4: ldr r0, =0x0203ab7c ldr r0, [r0] ldrh r0, [r0, 0xE] bl sub_813CB40 - b _0813CB24 + b @0813CB24 .align 2, 0 .pool -_0813CAB4: +@0813CAB4: bl sub_813CF0C - b _0813CB24 -_0813CABA: + b @0813CB24 +@0813CABA: ldr r1, =0x085b3db4 movs r0, 0 str r0, [sp] @@ -609932,33 +609932,33 @@ _0813CABA: movs r0, 0x2 movs r3, 0 bl gpu_copy_bg_tile_map_to_vram - b _0813CB24 + b @0813CB24 .align 2, 0 .pool -_0813CAEC: +@0813CAEC: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - bne _0813CB34 + bne @0813CB34 ldr r0, =0x085b3d94 ldr r1, =0x02037854 ldr r2, =0x04000008 bl CpuSet - b _0813CB24 + b @0813CB24 .align 2, 0 .pool -_0813CB10: +@0813CB10: ldr r1, =0xfffff800 movs r0, 0x2 movs r2, 0 bl bg_change_y_offset - b _0813CB24 + b @0813CB24 .align 2, 0 .pool -_0813CB20: +@0813CB20: movs r0, 0 - b _0813CB36 -_0813CB24: + b @0813CB36 +@0813CB24: ldr r0, =0x0203ab7c ldr r1, [r0] movs r0, 0x8A @@ -609967,9 +609967,9 @@ _0813CB24: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_0813CB34: +@0813CB34: movs r0, 0x1 -_0813CB36: +@0813CB36: add sp, 0x4 pop {r1} bx r1 @@ -609978,7 +609978,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 @@ -610000,18 +610000,18 @@ sub_813CB40: @ 813CB40 lsls r0, 16 lsrs r0, 16 cmp r0, 0x8 - bls _0813CB70 + bls @0813CB70 strh r4, [r1] -_0813CB70: +@0813CB70: ldr r0, =0x03005d8c ldr r0, [r0] ldr r3, =0x000031dc adds r0, r3 ldrh r1, [r0, 0x8] cmp r7, r1 - bne _0813CB80 - b _0813CCB8 -_0813CB80: + bne @0813CB80 + b @0813CCB8 +@0813CB80: ldr r1, [r5] movs r2, 0x88 lsls r2, 1 @@ -610023,30 +610023,30 @@ _0813CB80: strh r4, [r0] movs r6, 0 ldr r1, =0x085b3ee8 -_0813CB96: +@0813CB96: lsls r0, r6, 1 adds r0, r1 ldrh r0, [r0] cmp r0, r7 - bne _0813CBA2 - b _0813CCF8 -_0813CBA2: + bne @0813CBA2 + b @0813CCF8 +@0813CBA2: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0 - beq _0813CB96 + beq @0813CB96 movs r6, 0 ldr r4, =0x085b3ef0 ldrh r0, [r4] movs r1, 0xCE lsls r1, 1 cmp r0, r1 - beq _0813CC44 + beq @0813CC44 mov r8, r4 adds r5, r4, 0x4 mov r9, r1 -_0813CBC0: +@0813CBC0: lsls r0, r6, 1 adds r1, r0, r6 lsls r2, r1, 1 @@ -610055,30 +610055,30 @@ _0813CBC0: adds r3, r0, 0 ldrh r1, [r1] cmp r7, r1 - bne _0813CC2E + bne @0813CC2E adds r0, r4, 0x2 adds r0, r2, r0 ldrh r0, [r0] cmp r0, 0x18 - beq _0813CC1A + beq @0813CC1A cmp r0, 0x18 - bgt _0813CC08 + bgt @0813CC08 cmp r0, 0 - beq _0813CC0E - b _0813CC2E + beq @0813CC0E + b @0813CC2E .align 2, 0 .pool -_0813CC08: +@0813CC08: cmp r0, 0x1A - beq _0813CC1A - b _0813CC2E -_0813CC0E: + beq @0813CC1A + b @0813CC2E +@0813CC0E: adds r0, r2, r5 ldrh r1, [r0] movs r0, 0 bl sub_813CD04 - b _0813CC2E -_0813CC1A: + b @0813CC2E +@0813CC1A: adds r1, r3, r6 lsls r1, 1 mov r0, r8 @@ -610088,7 +610088,7 @@ _0813CC1A: adds r1, r5 ldrh r1, [r1] bl sub_813CD64 -_0813CC2E: +@0813CC2E: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 @@ -610099,14 +610099,14 @@ _0813CC2E: adds r0, r4 ldrh r0, [r0] cmp r0, r9 - bne _0813CBC0 -_0813CC44: + bne @0813CBC0 +@0813CC44: movs r6, 0 ldr r1, =0x08552d48 ldrb r0, [r1] cmp r0, 0xFF - beq _0813CCF8 -_0813CC4E: + beq @0813CCF8 +@0813CC4E: lsls r4, r6, 2 adds r0, r4, r6 lsls r0, 2 @@ -610116,27 +610116,27 @@ _0813CC4E: bl sub_813CE48 lsls r0, 24 cmp r0, 0 - beq _0813CC9C + beq @0813CC9C ldrb r0, [r5] cmp r0, 0x18 - beq _0813CC8C + beq @0813CC8C cmp r0, 0x18 - bgt _0813CC7C + bgt @0813CC7C cmp r0, 0 - beq _0813CC82 - b _0813CC9C + beq @0813CC82 + b @0813CC9C .align 2, 0 .pool -_0813CC7C: +@0813CC7C: cmp r0, 0x1A - beq _0813CC8C - b _0813CC9C -_0813CC82: + beq @0813CC8C + b @0813CC9C +@0813CC82: ldrb r1, [r5, 0x1] movs r0, 0 bl sub_813CD04 - b _0813CC9C -_0813CC8C: + b @0813CC9C +@0813CC8C: ldr r0, =0x08552d48 adds r1, r4, r6 lsls r1, 2 @@ -610144,7 +610144,7 @@ _0813CC8C: ldrb r0, [r1] ldrb r1, [r1, 0x1] bl sub_813CD64 -_0813CC9C: +@0813CC9C: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 @@ -610155,11 +610155,11 @@ _0813CC9C: adds r0, r1 ldrb r0, [r0] cmp r0, 0xFF - bne _0813CC4E - b _0813CCF8 + bne @0813CC4E + b @0813CCF8 .align 2, 0 .pool -_0813CCB8: +@0813CCB8: ldr r2, [r5] movs r3, 0x89 lsls r3, 1 @@ -610167,7 +610167,7 @@ _0813CCB8: strh r4, [r1] ldrb r1, [r0, 0x13] cmp r1, 0 - beq _0813CCF0 + beq @0813CCF0 adds r0, r2, 0 adds r0, 0x10 adds r1, r2, 0 @@ -610185,13 +610185,13 @@ _0813CCB8: adds r1, r0 movs r0, 0x1 strh r0, [r1] - b _0813CCF8 -_0813CCF0: + b @0813CCF8 +@0813CCF0: movs r3, 0x88 lsls r3, 1 adds r0, r2, r3 strh r1, [r0] -_0813CCF8: +@0813CCF8: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -610201,7 +610201,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 @@ -610214,7 +610214,7 @@ sub_813CD04: @ 813CD04 adds r1, r2, r0 ldrh r0, [r1] cmp r0, 0x3F - bhi _0813CD58 + bhi @0813CD58 lsls r0, 2 adds r0, r2, r0 strb r5, [r0, 0x10] @@ -610242,7 +610242,7 @@ sub_813CD04: @ 813CD04 ldrh r0, [r3] adds r0, 0x1 strh r0, [r3] -_0813CD58: +@0813CD58: pop {r4,r5} pop {r0} bx r0 @@ -610251,7 +610251,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 @@ -610264,7 +610264,7 @@ sub_813CD64: @ 813CD64 adds r0, r3 ldrh r0, [r0] cmp r0, 0x1F - bhi _0813CE22 + bhi @0813CE22 lsls r0, r2, 24 lsrs r0, 24 lsls r1, 24 @@ -610273,42 +610273,42 @@ sub_813CD64: @ 813CD64 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0xD4 - bhi _0813CE22 + bhi @0813CE22 movs r3, 0 ldr r0, =0x085b3eea -_0813CD96: +@0813CD96: ldrh r4, [r0] cmp r5, r4 - beq _0813CE22 + beq @0813CE22 adds r0, 0x2 adds r3, 0x1 cmp r3, 0x2 - bls _0813CD96 + bls @0813CD96 ldr r1, =0x085b3efc ldrh r0, [r1] cmp r0, 0xD5 - beq _0813CDD2 + beq @0813CDD2 adds r4, r1, 0 adds r7, r4, 0 movs r6, 0 -_0813CDB2: +@0813CDB2: ldrh r0, [r4] cmp r5, r0 - bne _0813CDC8 + bne @0813CDC8 adds r0, r7, 0x2 adds r0, r6, r0 ldrh r0, [r0] bl flag_check lsls r0, 24 cmp r0, 0 - beq _0813CE22 -_0813CDC8: + beq @0813CE22 +@0813CDC8: adds r4, 0x4 adds r6, 0x4 ldrh r0, [r4] cmp r0, 0xD5 - bne _0813CDB2 -_0813CDD2: + bne @0813CDB2 +@0813CDD2: movs r3, 0 ldr r0, =0x0203ab7c ldr r2, [r0] @@ -610318,30 +610318,30 @@ _0813CDD2: ldrh r4, [r1] adds r1, r0, 0 cmp r3, r4 - bge _0813CE02 + bge @0813CE02 movs r6, 0xC4 lsls r6, 3 adds r0, r2, r6 ldrh r0, [r0] cmp r0, r5 - beq _0813CE02 + beq @0813CE02 adds r2, r6 -_0813CDF4: +@0813CDF4: adds r2, 0x2 adds r3, 0x1 cmp r3, r4 - bge _0813CE02 + bge @0813CE02 ldrh r0, [r2] cmp r0, r5 - bne _0813CDF4 -_0813CE02: + bne @0813CDF4 +@0813CE02: ldr r1, [r1] movs r0, 0x89 lsls r0, 1 adds r2, r1, r0 ldrh r4, [r2] cmp r3, r4 - bne _0813CE22 + bne @0813CE22 lsls r0, r3, 1 movs r6, 0xC4 lsls r6, 3 @@ -610351,7 +610351,7 @@ _0813CE02: ldrh r0, [r2] adds r0, 0x1 strh r0, [r2] -_0813CE22: +@0813CE22: pop {r4-r7} pop {r0} bx r0 @@ -610360,7 +610360,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 @@ -610373,7 +610373,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 @@ -610384,7 +610384,7 @@ sub_813CE48: @ 813CE48 lsls r0, 16 lsrs r0, 16 cmp r0, 0xD2 - bne _0813CE7C + bne @0813CE7C ldr r0, =0x0203ab7c ldr r2, [r0] ldr r0, =0x000006e2 @@ -610398,86 +610398,86 @@ sub_813CE48: @ 813CE48 ldrh r0, [r2] adds r0, 0x1 cmp r1, r0 - bne _0813CEBC -_0813CE7C: + bne @0813CEBC +@0813CE7C: ldr r0, [r4, 0x4] adds r1, r5, 0 movs r2, 0xC bl sub_813CED4 lsls r0, 24 cmp r0, 0 - bne _0813CECC + bne @0813CECC ldr r0, [r4, 0x8] adds r1, r5, 0 movs r2, 0x5 bl sub_813CED4 lsls r0, 24 cmp r0, 0 - bne _0813CECC + bne @0813CECC ldr r0, [r4, 0x10] adds r1, r5, 0 movs r2, 0xC bl sub_813CED4 lsls r0, 24 cmp r0, 0 - bne _0813CECC + bne @0813CECC ldr r0, [r4, 0xC] adds r1, r5, 0 movs r2, 0x5 bl sub_813CED4 lsls r0, 24 cmp r0, 0 - bne _0813CECC -_0813CEBC: + bne @0813CECC +@0813CEBC: movs r0, 0 - b _0813CECE + b @0813CECE .align 2, 0 .pool -_0813CECC: +@0813CECC: movs r0, 0x1 -_0813CECE: +@0813CECE: pop {r4,r5} pop {r1} bx r1 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 lsls r2, 16 lsrs r2, 16 cmp r0, 0 - beq _0813CF02 + beq @0813CF02 movs r3, 0 cmp r3, r2 - bcs _0813CF02 + bcs @0813CF02 ldr r1, [r0, 0x4] -_0813CEEA: +@0813CEEA: lsls r0, r3, 2 adds r0, r1 ldrh r0, [r0, 0x2] cmp r0, r4 - bne _0813CEF8 + bne @0813CEF8 movs r0, 0x1 - b _0813CF04 -_0813CEF8: + b @0813CF04 +@0813CEF8: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, r2 - bcc _0813CEEA -_0813CF02: + bcc @0813CEEA +@0813CF02: movs r0, 0 -_0813CF04: +@0813CF04: pop {r4} pop {r1} bx r1 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 @@ -610491,7 +610491,7 @@ sub_813CF0C: @ 813CF0C lsls r6, 1 movs r5, 0 ldr r3, =0x0000027f -_0813CF26: +@0813CF26: ldr r0, [r7] lsls r1, r4, 1 adds r0, r6 @@ -610501,7 +610501,7 @@ _0813CF26: lsls r0, 16 lsrs r4, r0, 16 cmp r4, r3 - bls _0813CF26 + bls @0813CF26 movs r4, 0 ldr r0, [r2] movs r1, 0x88 @@ -610509,18 +610509,18 @@ _0813CF26: adds r0, r1 ldrh r0, [r0] cmp r4, r0 - bcs _0813CFB2 + bcs @0813CFB2 adds r3, r2, 0 -_0813CF4C: +@0813CF4C: movs r5, 0 movs r6, 0 adds r2, r4, 0x1 mov r8, r2 lsls r4, 2 mov r9, r4 -_0813CF58: +@0813CF58: movs r4, 0 -_0813CF5A: +@0813CF5A: adds r0, r4, 0 adds r1, r6, 0 str r3, [sp] @@ -610533,7 +610533,7 @@ _0813CF5A: lsrs r0, 16 ldrh r1, [r1, 0x12] cmp r0, r1 - bne _0813CF84 + bne @0813CF84 lsls r0, r5, 1 movs r7, 0x8B lsls r7, 1 @@ -610541,7 +610541,7 @@ _0813CF5A: adds r1, r0 ldr r0, =0x0000ffff strh r0, [r1] -_0813CF84: +@0813CF84: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 @@ -610549,12 +610549,12 @@ _0813CF84: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x1F - bls _0813CF5A + bls @0813CF5A adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x13 - bls _0813CF58 + bls @0813CF58 mov r1, r8 lsls r0, r1, 16 lsrs r4, r0, 16 @@ -610564,8 +610564,8 @@ _0813CF84: adds r0, r2 ldrh r0, [r0] cmp r4, r0 - bcc _0813CF4C -_0813CFB2: + bcc @0813CF4C +@0813CFB2: movs r5, 0 movs r6, 0 ldr r7, =0x0203ab7c @@ -610573,11 +610573,11 @@ _0813CFB2: movs r7, 0x8B lsls r7, 1 ldr r3, =0x0000ffff -_0813CFC0: +@0813CFC0: movs r4, 0 adds r1, r6, 0x1 mov r9, r1 -_0813CFC6: +@0813CFC6: mov r2, r12 ldr r0, [r2] lsls r1, r5, 1 @@ -610587,23 +610587,23 @@ _0813CFC6: adds r1, r5, 0x1 mov r8, r1 cmp r0, r3 - bne _0813D0D2 + bne @0813D0D2 cmp r4, 0 - beq _0813CFF0 + beq @0813CFF0 subs r0, r5, 0x1 lsls r0, 1 adds r1, r2, r0 ldrh r2, [r1] cmp r2, r3 - beq _0813CFF0 + beq @0813CFF0 movs r0, 0x2 orrs r0, r2 strh r0, [r1] -_0813CFF0: +@0813CFF0: adds r2, r5, 0x1 mov r8, r2 cmp r4, 0x1F - beq _0813D00E + beq @0813D00E mov r1, r12 ldr r0, [r1] lsls r1, r2, 1 @@ -610611,13 +610611,13 @@ _0813CFF0: adds r2, r0, r1 ldrh r1, [r2] cmp r1, r3 - beq _0813D00E + beq @0813D00E movs r0, 0x1 orrs r0, r1 strh r0, [r2] -_0813D00E: +@0813D00E: cmp r6, 0 - beq _0813D02C + beq @0813D02C mov r2, r12 ldr r1, [r2] adds r0, r5, 0 @@ -610627,13 +610627,13 @@ _0813D00E: adds r1, r0 ldrh r2, [r1] cmp r2, r3 - beq _0813D02C + beq @0813D02C movs r0, 0x8 orrs r0, r2 strh r0, [r1] -_0813D02C: +@0813D02C: cmp r6, 0x13 - beq _0813D04A + beq @0813D04A mov r0, r12 ldr r1, [r0] adds r0, r5, 0 @@ -610643,15 +610643,15 @@ _0813D02C: adds r1, r0 ldrh r2, [r1] cmp r2, r3 - beq _0813D04A + beq @0813D04A movs r0, 0x4 orrs r0, r2 strh r0, [r1] -_0813D04A: +@0813D04A: cmp r4, 0 - beq _0813D06C + beq @0813D06C cmp r6, 0 - beq _0813D06C + beq @0813D06C mov r2, r12 ldr r1, [r2] adds r0, r5, 0 @@ -610661,15 +610661,15 @@ _0813D04A: adds r1, r0 ldrh r2, [r1] cmp r2, r3 - beq _0813D06C + beq @0813D06C movs r0, 0x10 orrs r0, r2 strh r0, [r1] -_0813D06C: +@0813D06C: cmp r4, 0x1F - beq _0813D08E + beq @0813D08E cmp r6, 0 - beq _0813D08E + beq @0813D08E mov r0, r12 ldr r1, [r0] adds r0, r5, 0 @@ -610679,15 +610679,15 @@ _0813D06C: adds r1, r0 ldrh r2, [r1] cmp r2, r3 - beq _0813D08E + beq @0813D08E movs r0, 0x40 orrs r0, r2 strh r0, [r1] -_0813D08E: +@0813D08E: cmp r4, 0 - beq _0813D0B0 + beq @0813D0B0 cmp r6, 0x13 - beq _0813D0B0 + beq @0813D0B0 mov r2, r12 ldr r1, [r2] adds r0, r5, 0 @@ -610697,15 +610697,15 @@ _0813D08E: adds r1, r0 ldrh r2, [r1] cmp r2, r3 - beq _0813D0B0 + beq @0813D0B0 movs r0, 0x20 orrs r0, r2 strh r0, [r1] -_0813D0B0: +@0813D0B0: cmp r4, 0x1F - beq _0813D0D2 + beq @0813D0D2 cmp r6, 0x13 - beq _0813D0D2 + beq @0813D0D2 mov r0, r12 ldr r1, [r0] adds r0, r5, 0 @@ -610715,11 +610715,11 @@ _0813D0B0: adds r1, r0 ldrh r2, [r1] cmp r2, r3 - beq _0813D0D2 + beq @0813D0D2 movs r0, 0x80 orrs r0, r2 strh r0, [r1] -_0813D0D2: +@0813D0D2: mov r1, r8 lsls r0, r1, 16 lsrs r5, r0, 16 @@ -610727,16 +610727,16 @@ _0813D0D2: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x1F - bhi _0813D0E4 - b _0813CFC6 -_0813D0E4: + bhi @0813D0E4 + b @0813CFC6 +@0813D0E4: mov r2, r9 lsls r0, r2, 16 lsrs r6, r0, 16 cmp r6, 0x13 - bhi _0813D0F0 - b _0813CFC0 -_0813D0F0: + bhi @0813D0F0 + b @0813CFC0 +@0813D0F0: movs r4, 0 ldr r6, =0x0203ab7c movs r5, 0x8B @@ -610749,7 +610749,7 @@ _0813D0F0: ldr r7, =0x0000a010 ldr r1, =0x0000ffcf mov r8, r1 -_0813D108: +@0813D108: ldr r0, [r6] lsls r3, r4, 1 adds r0, r5 @@ -610757,22 +610757,22 @@ _0813D108: ldrh r1, [r2] adds r0, r1, 0 cmp r0, r12 - bne _0813D130 + bne @0813D130 strh r7, [r2] - b _0813D198 + b @0813D198 .align 2, 0 .pool -_0813D130: +@0813D130: cmp r0, 0 - beq _0813D198 + beq @0813D198 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0813D142 + beq @0813D142 mov r0, r8 ands r0, r1 strh r0, [r2] -_0813D142: +@0813D142: ldr r0, [r6] adds r0, r5 adds r2, r0, r3 @@ -610780,11 +610780,11 @@ _0813D142: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0813D158 + beq @0813D158 ldr r0, =0x0000ff3f ands r0, r1 strh r0, [r2] -_0813D158: +@0813D158: ldr r0, [r6] adds r0, r5 adds r2, r0, r3 @@ -610792,11 +610792,11 @@ _0813D158: movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _0813D16E + beq @0813D16E ldr r0, =0x0000ffaf ands r0, r1 strh r0, [r2] -_0813D16E: +@0813D16E: ldr r0, [r6] adds r0, r5 adds r2, r0, r3 @@ -610804,11 +610804,11 @@ _0813D16E: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0813D184 + beq @0813D184 ldr r0, =0x0000ff5f ands r0, r1 strh r0, [r2] -_0813D184: +@0813D184: ldr r1, [r6] adds r1, r5 adds r1, r3 @@ -610819,13 +610819,13 @@ _0813D184: mov r2, r9 orrs r0, r2 strh r0, [r1] -_0813D198: +@0813D198: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 ldr r0, =0x0000027f cmp r4, r0 - bls _0813D108 + bls @0813D108 add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -610839,7 +610839,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] @@ -610849,27 +610849,27 @@ sub_813D1C8: @ 813D1C8 ldrh r0, [r0] adds r3, r1, 0 cmp r0, 0 - beq _0813D1FC + beq @0813D1FC movs r1, 0x88 lsls r1, 1 adds r0, r2, r1 ldrh r0, [r0] cmp r0, 0 - bne _0813D1FC + bne @0813D1FC ldr r0, =0x0000061e adds r1, r2, r0 movs r0, 0x1 strb r0, [r1] - b _0813D206 + b @0813D206 .align 2, 0 .pool -_0813D1FC: +@0813D1FC: ldr r0, [r3] ldr r1, =0x0000061e adds r0, r1 movs r1, 0 strb r1, [r0] -_0813D206: +@0813D206: ldr r1, [r3] ldr r2, =0x00000616 adds r0, r1, r2 @@ -610905,7 +610905,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} @@ -610916,12 +610916,12 @@ sub_813D25C: @ 813D25C ldrb r1, [r1] adds r7, r0, 0 cmp r1, 0 - bne _0813D32A + bne @0813D32A ldr r0, =0x00000616 adds r1, r2, r0 ldrh r0, [r1] cmp r0, 0 - bne _0813D324 + bne @0813D324 movs r1, 0xC3 lsls r1, 3 adds r0, r2, r1 @@ -610931,16 +610931,16 @@ sub_813D25C: @ 813D25C movs r0, 0x1 ands r1, r0 cmp r1, 0 - beq _0813D2A4 + beq @0813D2A4 subs r3, 0x4 adds r0, r2, r3 - b _0813D2A8 + b @0813D2A8 .align 2, 0 .pool -_0813D2A4: +@0813D2A4: ldr r1, =0x0000061c adds r0, r2, r1 -_0813D2A8: +@0813D2A8: ldrh r1, [r0] adds r1, 0x4 movs r2, 0x7F @@ -610980,25 +610980,25 @@ _0813D2A8: adds r2, r1, r0 ldrh r0, [r2] cmp r0, 0x40 - bne _0813D3C6 + bne @0813D3C6 strh r3, [r2] movs r2, 0x89 lsls r2, 1 adds r0, r1, r2 ldrh r0, [r0] cmp r0, 0 - beq _0813D3C6 + beq @0813D3C6 ldr r3, =0x0000061e adds r1, r3 movs r0, 0x1 - b _0813D3C4 + b @0813D3C4 .align 2, 0 .pool -_0813D324: +@0813D324: subs r0, 0x1 strh r0, [r1] - b _0813D3C6 -_0813D32A: + b @0813D3C6 +@0813D32A: ldr r0, =0x00000616 adds r1, r2, r0 ldrh r0, [r1] @@ -611007,7 +611007,7 @@ _0813D32A: lsls r0, 16 lsrs r0, 16 cmp r0, 0xC - bls _0813D3C6 + bls @0813D3C6 movs r0, 0 strh r0, [r1] ldr r3, =0x0000061f @@ -611022,14 +611022,14 @@ _0813D32A: adds r0, r6 ldrh r0, [r0] cmp r4, r0 - bcs _0813D3A0 + bcs @0813D3A0 adds r5, r7, 0 movs r0, 0x1 mov r12, r0 movs r1, 0x5 negs r1, r1 mov r8, r1 -_0813D366: +@0813D366: ldr r1, [r5] lsls r2, r4, 2 movs r3, 0xCC @@ -611058,14 +611058,14 @@ _0813D366: adds r0, r6 ldrh r0, [r0] cmp r4, r0 - bcc _0813D366 -_0813D3A0: + bcc @0813D366 +@0813D3A0: ldr r0, [r7] ldr r3, =0x0000061f adds r1, r0, r3 ldrb r0, [r1] cmp r0, 0x4 - bls _0813D3C6 + bls @0813D3C6 movs r0, 0x1 strb r0, [r1] ldr r1, [r7] @@ -611074,13 +611074,13 @@ _0813D3A0: adds r0, r1, r2 ldrh r0, [r0] cmp r0, 0 - beq _0813D3C6 + beq @0813D3C6 subs r3, 0x1 adds r1, r3 movs r0, 0 -_0813D3C4: +@0813D3C4: strb r0, [r1] -_0813D3C6: +@0813D3C6: pop {r3} mov r8, r3 pop {r4-r7} @@ -611091,7 +611091,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 @@ -611128,7 +611128,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 @@ -611142,31 +611142,31 @@ sub_813D42C: @ 813D42C ldrsh r0, [r0, r2] adds r2, r1, 0 cmp r0, 0xB - bls _0813D44A - b _0813D584 -_0813D44A: + bls @0813D44A + b @0813D584 +@0813D44A: lsls r0, 2 - ldr r1, =_0813D45C + ldr r1, =@0813D45C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0813D45C: - .4byte _0813D48C - .4byte _0813D4A8 - .4byte _0813D4D4 - .4byte _0813D4E6 - .4byte _0813D4EC - .4byte _0813D4F8 - .4byte _0813D520 - .4byte _0813D526 - .4byte _0813D52C - .4byte _0813D532 - .4byte _0813D544 - .4byte _0813D56C -_0813D48C: +@0813D45C: + .4byte @0813D48C + .4byte @0813D4A8 + .4byte @0813D4D4 + .4byte @0813D4E6 + .4byte @0813D4EC + .4byte @0813D4F8 + .4byte @0813D520 + .4byte @0813D526 + .4byte @0813D52C + .4byte @0813D532 + .4byte @0813D544 + .4byte @0813D56C +@0813D48C: bl reset_all_obj_data bl gpu_pal_allocator_reset movs r0, 0x3 @@ -611175,8 +611175,8 @@ _0813D48C: bl gpu_sync_bg_hide movs r0, 0 bl gpu_sync_bg_hide - b _0813D584 -_0813D4A8: + b @0813D584 +@0813D4A8: movs r0, 0x3 movs r1, 0x1 movs r2, 0x3 @@ -611191,27 +611191,27 @@ _0813D4A8: movs r1, 0 movs r2, 0x10 bl RepeatChar - b _0813D584 + b @0813D584 .align 2, 0 .pool -_0813D4D4: +@0813D4D4: bl sub_81C4E90 cmp r0, 0x1 - beq _0813D594 + beq @0813D594 movs r0, 0x8 negs r0, r0 bl sub_81C4ED0 - b _0813D584 -_0813D4E6: + b @0813D584 +@0813D4E6: bl sub_813CA54 - b _0813D584 -_0813D4EC: + b @0813D584 +@0813D4EC: bl sub_813CA68 lsls r0, 24 cmp r0, 0 - bne _0813D594 - b _0813D584 -_0813D4F8: + bne @0813D594 + b @0813D584 +@0813D4F8: ldr r0, =0x0203ab7c ldr r0, [r0] ldr r2, =0x000006ec @@ -611224,19 +611224,19 @@ _0813D4F8: negs r1, r1 movs r0, 0 bl sub_8123824 - b _0813D584 + b @0813D584 .align 2, 0 .pool -_0813D520: +@0813D520: bl sub_813D6D0 - b _0813D584 -_0813D526: + b @0813D584 +@0813D526: bl sub_813D8A8 - b _0813D584 -_0813D52C: + b @0813D584 +@0813D52C: bl sub_813D8E8 - b _0813D584 -_0813D532: + b @0813D584 +@0813D532: movs r0, 0x15 negs r0, r0 movs r1, 0 @@ -611244,8 +611244,8 @@ _0813D532: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - b _0813D584 -_0813D544: + b @0813D584 +@0813D544: ldr r1, =0x00003f41 movs r0, 0x50 bl lcd_io_set @@ -611258,10 +611258,10 @@ _0813D544: lsls r1, 5 movs r0, 0 bl lcd_io_set_bits - b _0813D584 + b @0813D584 .align 2, 0 .pool -_0813D56C: +@0813D56C: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -611270,10 +611270,10 @@ _0813D56C: str r1, [r0] movs r1, 0 strh r1, [r0, 0x8] - b _0813D594 + b @0813D594 .align 2, 0 .pool -_0813D584: +@0813D584: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -611282,7 +611282,7 @@ _0813D584: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_0813D594: +@0813D594: add sp, 0x4 pop {r4} pop {r0} @@ -611292,7 +611292,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 @@ -611306,20 +611306,20 @@ sub_813D5A0: @ 813D5A0 movs r0, 0x8 ldrsh r1, [r6, r0] cmp r1, 0x1 - beq _0813D5F8 + beq @0813D5F8 cmp r1, 0x1 - bgt _0813D5CC + bgt @0813D5CC cmp r1, 0 - beq _0813D5E2 - b _0813D5D4 + beq @0813D5E2 + b @0813D5D4 .align 2, 0 .pool -_0813D5CC: +@0813D5CC: cmp r1, 0x2 - beq _0813D640 + beq @0813D640 cmp r1, 0x3 - beq _0813D652 -_0813D5D4: + beq @0813D652 +@0813D5D4: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -611327,53 +611327,53 @@ _0813D5D4: adds r1, r0 movs r0, 0 strh r0, [r1, 0x8] -_0813D5E2: +@0813D5E2: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0813D6A8 - b _0813D698 + bne @0813D6A8 + b @0813D698 .align 2, 0 .pool -_0813D5F8: +@0813D5F8: ldr r0, =0x030022c0 ldrh r2, [r0, 0x2E] movs r3, 0x2 adds r0, r3, 0 ands r0, r2 cmp r0, 0 - beq _0813D614 + beq @0813D614 strh r1, [r6, 0xA] movs r0, 0x3 bl audio_play - b _0813D698 + b @0813D698 .align 2, 0 .pool -_0813D614: +@0813D614: movs r0, 0x10 ands r0, r2 cmp r0, 0 - bne _0813D630 + bne @0813D630 movs r0, 0x80 lsls r0, 1 ands r0, r2 cmp r0, 0 - beq _0813D6A8 + beq @0813D6A8 ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x1 - bne _0813D6A8 -_0813D630: + bne @0813D6A8 +@0813D630: strh r3, [r6, 0xA] movs r0, 0x6D bl audio_play - b _0813D698 + b @0813D698 .align 2, 0 .pool -_0813D640: +@0813D640: movs r0, 0x15 negs r0, r0 movs r1, 0 @@ -611381,8 +611381,8 @@ _0813D640: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - b _0813D698 -_0813D652: + b @0813D698 +@0813D652: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -611390,7 +611390,7 @@ _0813D652: lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0 - bne _0813D6A8 + bne @0813D6A8 bl sub_813D824 ldr r4, =0x0203ab7c ldr r0, [r4] @@ -611407,10 +611407,10 @@ _0813D652: ldr r0, [r4] bl free str r7, [r4] - b _0813D6A8 + b @0813D6A8 .align 2, 0 .pool -_0813D698: +@0813D698: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -611419,7 +611419,7 @@ _0813D698: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_0813D6A8: +@0813D6A8: add sp, 0x4 pop {r4-r7} pop {r0} @@ -611429,7 +611429,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 @@ -611444,7 +611444,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 @@ -611466,7 +611466,7 @@ sub_813D6D0: @ 813D6D0 adds r0, r3 ldrh r0, [r0] cmp r0, 0 - beq _0813D7D8 + beq @0813D7D8 ldr r5, =0x03001202 mov r10, r1 adds r7, r2, 0 @@ -611475,7 +611475,7 @@ sub_813D6D0: @ 813D6D0 ldr r6, =0x085a147c ldr r1, =0x030011fe mov r8, r1 -_0813D710: +@0813D710: mov r2, r10 ldr r1, [r2] movs r3, 0 @@ -611537,7 +611537,7 @@ _0813D710: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq _0813D7BE + beq @0813D7BE ldr r0, =0x02020630 lsls r2, r1, 4 adds r2, r1 @@ -611562,7 +611562,7 @@ _0813D710: adds r3, r0 adds r3, r1 str r2, [r3] -_0813D7BE: +@0813D7BE: ldrh r0, [r7] adds r0, 0x1 strh r0, [r7] @@ -611575,8 +611575,8 @@ _0813D7BE: adds r0, r2 ldrh r0, [r0] cmp r1, r0 - blt _0813D710 -_0813D7D8: + blt @0813D710 +@0813D7D8: ldr r0, =0x0203ab7c ldr r0, [r0] ldr r1, =0x03001204 @@ -611597,7 +611597,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 gpu_tile_obj_free_by_tag @@ -611611,9 +611611,9 @@ sub_813D824: @ 813D824 adds r0, r2 ldrh r0, [r0] cmp r4, r0 - bcs _0813D86C + bcs @0813D86C adds r5, r1, 0 -_0813D846: +@0813D846: ldr r0, [r5] lsls r1, r4, 2 movs r2, 0xCC @@ -611631,14 +611631,14 @@ _0813D846: adds r0, r1 ldrh r0, [r0] cmp r4, r0 - bcc _0813D846 -_0813D86C: + bcc @0813D846 +@0813D86C: movs r0, 0x3 bl gpu_tile_obj_free_by_tag movs r0, 0x3 bl gpu_pal_free_tag movs r4, 0 -_0813D87A: +@0813D87A: ldr r0, =0x0203ab7c ldr r0, [r0] lsls r1, r4, 2 @@ -611648,14 +611648,14 @@ _0813D87A: adds r0, r1 ldr r0, [r0] cmp r0, 0 - beq _0813D892 + beq @0813D892 bl obj_delete_and_free_tiles -_0813D892: +@0813D892: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x2 - bls _0813D87A + bls @0813D87A pop {r4,r5} pop {r0} bx r0 @@ -611664,7 +611664,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 @@ -611688,7 +611688,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] @@ -611697,13 +611697,13 @@ sub_813D8E8: @ 813D8E8 adds r0, r2 ldr r0, [r0] cmp r0, 0 - beq _0813D920 + beq @0813D920 movs r4, 0 adds r5, r1, 0 movs r3, 0xFB lsls r3, 4 movs r2, 0 -_0813D904: +@0813D904: ldr r0, [r5] lsls r1, r4, 2 adds r0, r3 @@ -611713,14 +611713,14 @@ _0813D904: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x2 - bls _0813D904 - b _0813D9A4 + bls @0813D904 + b @0813D9A4 .align 2, 0 .pool -_0813D920: +@0813D920: movs r4, 0 ldr r5, =0x02020630 -_0813D924: +@0813D924: lsls r1, r4, 21 movs r6, 0xA0 lsls r6, 16 @@ -611733,7 +611733,7 @@ _0813D924: lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _0813D988 + beq @0813D988 lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -611759,10 +611759,10 @@ _0813D924: adds r0, r2 adds r0, r1 str r3, [r0] - b _0813D99A + b @0813D99A .align 2, 0 .pool -_0813D988: +@0813D988: ldr r0, =0x0203ab7c ldr r1, [r0] lsls r0, r4, 2 @@ -611772,13 +611772,13 @@ _0813D988: adds r1, r0 movs r0, 0 str r0, [r1] -_0813D99A: +@0813D99A: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x2 - bls _0813D924 -_0813D9A4: + bls @0813D924 +@0813D9A4: pop {r4-r6} pop {r0} bx r0 @@ -611787,7 +611787,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 run_active_tasks @@ -611796,7 +611796,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 @@ -611810,13 +611810,13 @@ sub_813D9C0: @ 813D9C0 movs r1, 0x8 ldrsh r0, [r6, r1] cmp r0, 0 - beq _0813D9E8 + beq @0813D9E8 cmp r0, 0x1 - beq _0813DA00 - b _0813DA30 + beq @0813DA00 + b @0813DA30 .align 2, 0 .pool -_0813D9E8: +@0813D9E8: movs r0, 0x1 negs r0, r0 str r7, [sp] @@ -611827,14 +611827,14 @@ _0813D9E8: ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] - b _0813DA30 -_0813DA00: + b @0813DA30 +@0813DA00: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0813DA30 + bne @0813DA30 movs r0, 0x1C ldrsh r1, [r6, r0] movs r0, 0x64 @@ -611851,7 +611851,7 @@ _0813DA00: adds r2, r5, 0 adds r3, r6, 0 bl evolution_cutscene -_0813DA30: +@0813DA30: add sp, 0x4 pop {r4-r7} pop {r0} @@ -611861,7 +611861,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 @@ -611897,7 +611897,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 @@ -612181,7 +612181,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 @@ -612359,7 +612359,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 @@ -612383,27 +612383,27 @@ sub_813DF70: @ 813DF70 adds r0, r3 ldrb r0, [r0] cmp r0, 0x7 - bls _0813DFA2 - b _0813E1C8 -_0813DFA2: + bls @0813DFA2 + b @0813E1C8 +@0813DFA2: lsls r0, 2 - ldr r1, =_0813DFC0 + ldr r1, =@0813DFC0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0813DFC0: - .4byte _0813DFE0 - .4byte _0813E050 - .4byte _0813E078 - .4byte _0813E07E - .4byte _0813E0A8 - .4byte _0813E0F0 - .4byte _0813E160 - .4byte _0813E198 -_0813DFE0: +@0813DFC0: + .4byte @0813DFE0 + .4byte @0813E050 + .4byte @0813E078 + .4byte @0813E07E + .4byte @0813E0A8 + .4byte @0813E0F0 + .4byte @0813E160 + .4byte @0813E198 +@0813DFE0: movs r0, 0 movs r1, 0 bl lcd_io_set @@ -612436,10 +612436,10 @@ _0813DFE0: strh r0, [r2] ldr r0, =0x02022e22 strh r1, [r0] - b _0813E180 + b @0813E180 .align 2, 0 .pool -_0813E050: +@0813E050: bl sub_80A1A74 ldr r0, =nullsub_83 + 1 bl SetHBlankCallback @@ -612449,13 +612449,13 @@ _0813E050: movs r3, 0x87 lsls r3, 3 adds r1, r3 - b _0813E188 + b @0813E188 .align 2, 0 .pool -_0813E078: +@0813E078: bl sub_807F19C - b _0813E180 -_0813E07E: + b @0813E180 +@0813E07E: movs r0, 0x20 str r0, [sp] str r0, [sp, 0x4] @@ -612472,10 +612472,10 @@ _0813E07E: movs r3, 0x87 lsls r3, 3 adds r1, r3 - b _0813E188 + b @0813E188 .align 2, 0 .pool -_0813E0A8: +@0813E0A8: adds r0, r4, 0 movs r1, 0x1 bl pokemon_getattr @@ -612501,10 +612501,10 @@ _0813E0A8: lsls r1, 1 movs r2, 0x20 bl decompress_palette - b _0813E180 + b @0813E180 .align 2, 0 .pool -_0813E0F0: +@0813E0F0: adds r0, r6, 0 movs r1, 0x1 bl sub_806A068 @@ -612544,37 +612544,37 @@ _0813E0F0: adds r0, 0x1 strb r0, [r1] bl sub_807B154 - b _0813E1C8 + b @0813E1C8 .align 2, 0 .pool -_0813E160: +@0813E160: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _0813E174 + beq @0813E174 bl sub_800E0E8 movs r0, 0 movs r1, 0 bl sub_800DFB4 -_0813E174: +@0813E174: movs r0, 0x1 negs r0, r0 movs r1, 0x10 movs r2, 0 bl sub_80A2A20 -_0813E180: +@0813E180: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 -_0813E188: +@0813E188: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0813E1C8 + b @0813E1C8 .align 2, 0 .pool -_0813E198: +@0813E198: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -612593,7 +612593,7 @@ _0813E198: lsls r1, 5 movs r0, 0 bl lcd_io_set -_0813E1C8: +@0813E1C8: add sp, 0xC pop {r4-r6} pop {r0} @@ -612603,7 +612603,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 @@ -612776,7 +612776,7 @@ sub_813E1D4: @ 813E1D4 thumb_func_end sub_813E1D4 thumb_func_start sub_813E3A4 -sub_813E3A4: @ 813E3A4 +sub_813E3A4: ; 813E3A4 push {lr} bl call_obj_callbacks bl obj_sync_something @@ -612788,7 +612788,7 @@ sub_813E3A4: @ 813E3A4 thumb_func_end sub_813E3A4 thumb_func_start sub_813E3C0 -sub_813E3C0: @ 813E3C0 +sub_813E3C0: ; 813E3C0 push {lr} bl call_obj_callbacks bl obj_sync_something @@ -612800,7 +612800,7 @@ sub_813E3C0: @ 813E3C0 thumb_func_end sub_813E3C0 thumb_func_start sub_813E3DC -sub_813E3DC: @ 813E3DC +sub_813E3DC: ; 813E3DC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -612823,15 +612823,15 @@ sub_813E3DC: @ 813E3DC mov r8, r1 ldrh r0, [r1] cmp r0, 0xD - beq _0813E40C - b _0813E546 -_0813E40C: + beq @0813E40C + b @0813E546 +@0813E40C: ldr r6, =0x020244e9 ldrb r0, [r6] cmp r0, 0x5 - bls _0813E416 - b _0813E546 -_0813E416: + bls @0813E416 + b @0813E546 +@0813E416: movs r5, 0x64 muls r0, r5 ldr r4, =0x020244ec @@ -612881,7 +612881,7 @@ _0813E416: ldr r0, [sp, 0x8] mov r8, r0 adds r5, r6, 0 -_0813E484: +@0813E484: ldrb r1, [r5] movs r0, 0x64 muls r0, r1 @@ -612892,10 +612892,10 @@ _0813E484: bl pokemon_setattr adds r4, 0x1 cmp r4, 0x36 - ble _0813E484 + ble @0813E484 movs r4, 0x43 ldr r7, =0x020244e9 -_0813E4A0: +@0813E4A0: ldrb r0, [r7] movs r6, 0x64 muls r0, r6 @@ -612906,7 +612906,7 @@ _0813E4A0: bl pokemon_setattr adds r4, 0x1 cmp r4, 0x4F - ble _0813E4A0 + ble @0813E4A0 ldr r4, =0x020244e9 ldrb r0, [r4] muls r0, r6 @@ -612949,24 +612949,24 @@ _0813E4A0: bl pokemon_getattr ldr r1, =0x0000012f cmp r0, r1 - bne _0813E546 + bne @0813E546 mov r0, r9 movs r1, 0x3 bl pokemon_getattr cmp r0, 0x1 - bne _0813E546 + bne @0813E546 ldr r0, [sp, 0x4] movs r1, 0xB bl pokemon_getattr movs r1, 0x97 lsls r1, 1 cmp r0, r1 - bne _0813E546 + bne @0813E546 ldr r2, =0x085b58c4 mov r0, r9 movs r1, 0x2 bl pokemon_setattr -_0813E546: +@0813E546: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -612980,7 +612980,7 @@ _0813E546: thumb_func_end sub_813E3DC thumb_func_start sub_813E570 -sub_813E570: @ 813E570 +sub_813E570: ; 813E570 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -613005,11 +613005,11 @@ sub_813E570: @ 813E570 adds r5, r2, 0 adds r6, r0, 0 cmp r1, 0x2 - bne _0813E5F0 + bne @0813E5F0 movs r1, 0x8 ldrsh r0, [r3, r1] cmp r0, 0x8 - bne _0813E5F0 + bne @0813E5F0 ldr r4, =0x02024332 ldrb r0, [r4, 0x2] lsls r1, r0, 2 @@ -613018,13 +613018,13 @@ sub_813E570: @ 813E570 adds r1, r5 ldrb r0, [r1, 0x4] cmp r0, 0 - beq _0813E5F0 + beq @0813E5F0 ldrh r1, [r3, 0xE] movs r2, 0x1 adds r0, r2, 0 ands r0, r1 cmp r0, 0 - beq _0813E5F0 + beq @0813E5F0 movs r0, 0x11 strh r0, [r3, 0x8] ldrb r1, [r4, 0x2] @@ -613034,10 +613034,10 @@ sub_813E570: @ 813E570 adds r0, r5 strh r2, [r0, 0x18] bl sub_8140134 - bl _0813F1A4 + bl @0813F1A4 .align 2, 0 .pool -_0813E5F0: +@0813E5F0: lsls r1, r7, 2 adds r0, r1, r7 lsls r0, 3 @@ -613046,42 +613046,42 @@ _0813E5F0: ldrsh r0, [r0, r2] mov r8, r1 cmp r0, 0x16 - bls _0813E606 - bl _0813F1A4 -_0813E606: + bls @0813E606 + bl @0813F1A4 +@0813E606: lsls r0, 2 - ldr r1, =_0813E614 + ldr r1, =@0813E614 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0813E614: - .4byte _0813E670 - .4byte _0813E6D4 - .4byte _0813E714 - .4byte _0813E740 - .4byte _0813E770 - .4byte _0813E7B0 - .4byte _0813E7E8 - .4byte _0813E828 - .4byte _0813E860 - .4byte _0813E8A4 - .4byte _0813E8C0 - .4byte _0813E8EC - .4byte _0813E918 - .4byte _0813E964 - .4byte _0813E990 - .4byte _0813EA1C - .4byte _0813EAC8 - .4byte _0813EB34 - .4byte _0813EB74 - .4byte _0813EBA8 - .4byte _0813EC10 - .4byte _0813EC6C - .4byte _0813ECA8 -_0813E670: +@0813E614: + .4byte @0813E670 + .4byte @0813E6D4 + .4byte @0813E714 + .4byte @0813E740 + .4byte @0813E770 + .4byte @0813E7B0 + .4byte @0813E7E8 + .4byte @0813E828 + .4byte @0813E860 + .4byte @0813E8A4 + .4byte @0813E8C0 + .4byte @0813E8EC + .4byte @0813E918 + .4byte @0813E964 + .4byte @0813E990 + .4byte @0813EA1C + .4byte @0813EAC8 + .4byte @0813EB34 + .4byte @0813EB74 + .4byte @0813EBA8 + .4byte @0813EC10 + .4byte @0813EC6C + .4byte @0813ECA8 +@0813E670: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -613119,18 +613119,18 @@ _0813E670: bl gpu_sync_bg_show movs r0, 0x3 bl gpu_sync_bg_show - bl _0813F1A4 + bl @0813F1A4 .align 2, 0 .pool -_0813E6D4: +@0813E6D4: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0813E6E4 - bl _0813F1A4 -_0813E6E4: + beq @0813E6E4 + bl @0813F1A4 +@0813E6E4: ldr r4, =0x02021fc4 ldr r1, =0x085cc990 adds r0, r4, 0 @@ -613143,17 +613143,17 @@ _0813E6E4: adds r1, r2, r7 lsls r1, 3 adds r1, r0 - b _0813EC52 + b @0813EC52 .align 2, 0 .pool -_0813E714: +@0813E714: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - beq _0813E724 - bl _0813F1A4 -_0813E724: + beq @0813E724 + bl @0813F1A4 +@0813E724: ldr r0, =0x0203ab80 ldr r0, [r0] ldrb r0, [r0] @@ -613162,18 +613162,18 @@ _0813E724: adds r4, r3, r7 lsls r4, 3 adds r4, r1 - b _0813EB90 + b @0813EB90 .align 2, 0 .pool -_0813E740: +@0813E740: ldr r0, =0x0203ab80 ldr r0, [r0] ldrb r0, [r0] bl sub_8140208 cmp r0, 0 - bne _0813E752 - bl _0813F1A4 -_0813E752: + bne @0813E752 + bl @0813F1A4 +@0813E752: movs r0, 0xBC lsls r0, 1 bl audio_play @@ -613182,17 +613182,17 @@ _0813E752: adds r1, r2, r7 lsls r1, 3 adds r1, r0 - b _0813EC52 + b @0813EC52 .align 2, 0 .pool -_0813E770: +@0813E770: bl mplay_has_finished_maybe lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq _0813E780 - bl _0813F1A4 -_0813E780: + beq @0813E780 + bl @0813F1A4 +@0813E780: ldr r0, =0x00000179 bl current_map_music_set ldr r0, =0x03005e00 @@ -613209,18 +613209,18 @@ _0813E780: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - bl _0813F1A4 + bl @0813F1A4 .align 2, 0 .pool -_0813E7B0: +@0813E7B0: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0813E7C0 - bl _0813F1A4 -_0813E7C0: + beq @0813E7C0 + bl @0813F1A4 +@0813E7C0: movs r0, 0 bl sub_8140000 movs r0, 0x11 @@ -613232,10 +613232,10 @@ _0813E7C0: adds r1, r2, r7 lsls r1, 3 adds r1, r0 - b _0813EC52 + b @0813EC52 .align 2, 0 .pool -_0813E7E8: +@0813E7E8: ldr r4, =0x02024332 ldrb r0, [r4, 0x2] lsls r1, r0, 2 @@ -613244,9 +613244,9 @@ _0813E7E8: adds r1, r5 ldrb r0, [r1, 0x4] cmp r0, 0 - beq _0813E7FE - bl _0813F1A4 -_0813E7FE: + beq @0813E7FE + bl @0813F1A4 +@0813E7FE: mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -613260,10 +613260,10 @@ _0813E7FE: strb r0, [r1, 0x3] bl sub_817BFB4 strb r0, [r4, 0x2] - bl _0813F1A4 + bl @0813F1A4 .align 2, 0 .pool -_0813E828: +@0813E828: ldr r4, =0x02024332 ldrb r0, [r4, 0x2] lsls r1, r0, 2 @@ -613272,9 +613272,9 @@ _0813E828: adds r1, r5 ldrb r0, [r1, 0x4] cmp r0, 0 - beq _0813E83E - bl _0813F1A4 -_0813E83E: + beq @0813E83E + bl @0813F1A4 +@0813E83E: ldr r0, =0x0203ab80 ldr r1, [r0] ldrb r0, [r1] @@ -613285,10 +613285,10 @@ _0813E83E: adds r1, r0, r7 lsls r1, 3 adds r1, r5 - b _0813EC52 + b @0813EC52 .align 2, 0 .pool -_0813E860: +@0813E860: ldr r2, =0x0203ab80 ldr r1, [r2] ldrb r0, [r1, 0x3] @@ -613296,9 +613296,9 @@ _0813E860: strb r0, [r1, 0x3] lsls r0, 24 cmp r0, 0 - beq _0813E874 - bl _0813F1A4 -_0813E874: + beq @0813E874 + bl @0813F1A4 +@0813E874: ldr r1, [r2] movs r0, 0x3 strb r0, [r1, 0x3] @@ -613310,17 +613310,17 @@ _0813E874: adds r0, r5 ldrb r0, [r0, 0x4] cmp r0, 0 - beq _0813E890 - bl _0813F1A4 -_0813E890: + beq @0813E890 + bl @0813F1A4 +@0813E890: mov r2, r8 adds r1, r2, r7 lsls r1, 3 adds r1, r5 - b _0813EC52 + b @0813EC52 .align 2, 0 .pool -_0813E8A4: +@0813E8A4: bl sub_817C068 ldr r1, =0x02024332 strb r0, [r1, 0x2] @@ -613329,10 +613329,10 @@ _0813E8A4: adds r1, r3, r7 lsls r1, 3 adds r1, r0 - b _0813EC52 + b @0813EC52 .align 2, 0 .pool -_0813E8C0: +@0813E8C0: ldr r6, =0x02024332 ldrb r0, [r6, 0x2] lsls r1, r0, 2 @@ -613341,9 +613341,9 @@ _0813E8C0: adds r1, r5 ldrb r0, [r1, 0x4] cmp r0, 0 - beq _0813E8D6 - bl _0813F1A4 -_0813E8D6: + beq @0813E8D6 + bl @0813F1A4 +@0813E8D6: mov r0, r8 adds r4, r0, r7 lsls r4, 3 @@ -613351,10 +613351,10 @@ _0813E8D6: ldrh r0, [r4, 0xC] bl sub_817C144 strb r0, [r6, 0x2] - b _0813EB96 + b @0813EB96 .align 2, 0 .pool -_0813E8EC: +@0813E8EC: ldr r0, =0x02024332 ldrb r1, [r0, 0x2] lsls r0, r1, 2 @@ -613363,25 +613363,25 @@ _0813E8EC: adds r0, r5 ldrb r0, [r0, 0x4] cmp r0, 0 - beq _0813E902 - bl _0813F1A4 -_0813E902: + beq @0813E902 + bl @0813F1A4 +@0813E902: movs r0, 0x21 bl audio_play mov r2, r8 adds r1, r2, r7 lsls r1, 3 adds r1, r5 - b _0813EC52 + b @0813EC52 .align 2, 0 .pool -_0813E918: +@0813E918: bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - bne _0813E926 - bl _0813F1A4 -_0813E926: + bne @0813E926 + bl @0813F1A4 +@0813E926: bl m4aMPlayAllStop ldr r0, =0x02037754 ldr r1, =0x0203ab80 @@ -613402,18 +613402,18 @@ _0813E926: adds r1, r3, r7 lsls r1, 3 adds r1, r0 - b _0813EC52 + b @0813EC52 .align 2, 0 .pool -_0813E964: +@0813E964: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0813E974 - bl _0813F1A4 -_0813E974: + beq @0813E974 + bl @0813F1A4 +@0813E974: ldr r0, =0x0203ab80 ldr r0, [r0] ldrb r0, [r0, 0x1] @@ -613422,16 +613422,16 @@ _0813E974: lsls r4, 3 adds r4, r5 ldrh r1, [r4, 0xC] - b _0813EB92 + b @0813EB92 .align 2, 0 .pool -_0813E990: +@0813E990: bl sub_80A3678 lsls r0, 24 cmp r0, 0 - bne _0813E99E - bl _0813F1A4 -_0813E99E: + bne @0813E99E + bl @0813F1A4 +@0813E99E: ldr r4, =0x02021fc4 ldr r1, =0x085cc9a6 adds r0, r4, 0 @@ -613474,17 +613474,17 @@ _0813E99E: bl pokedex_flag_operation movs r0, 0xE bl sav12_xor_increment - b _0813F1A4 + b @0813F1A4 .align 2, 0 .pool -_0813EA1C: +@0813EA1C: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - beq _0813EA2A - b _0813F1A4 -_0813EA2A: + beq @0813EA2A + b @0813F1A4 +@0813EA2A: ldr r1, =0x03005e00 mov r2, r8 adds r0, r2, r7 @@ -613496,19 +613496,19 @@ _0813EA2A: lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0 - beq _0813EAA8 + beq @0813EAA8 movs r3, 0x1A ldrsh r5, [r4, r3] cmp r5, 0 - bne _0813EAA8 + bne @0813EAA8 ldrh r1, [r4, 0xE] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0813EA5E + bne @0813EA5E bl sub_80A2F30 bl sub_8085784 -_0813EA5E: +@0813EA5E: ldrh r0, [r4, 0xE] movs r1, 0x80 orrs r0, r1 @@ -613524,24 +613524,24 @@ _0813EA5E: bl strcpy_limit_10_chars ldr r0, =0x0000ffff cmp r6, r0 - bne _0813EA94 + bne @0813EA94 movs r0, 0x16 strh r0, [r4, 0x8] - b _0813F1A4 + b @0813F1A4 .align 2, 0 .pool -_0813EA94: +@0813EA94: ldr r0, =0x0000fffe cmp r6, r0 - bne _0813EA9C - b _0813F1A4 -_0813EA9C: + bne @0813EA9C + b @0813F1A4 +@0813EA9C: movs r0, 0x14 strh r0, [r4, 0x8] - b _0813F1A4 + b @0813F1A4 .align 2, 0 .pool -_0813EAA8: +@0813EAA8: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -613554,10 +613554,10 @@ _0813EAA8: adds r1, r2, r7 lsls r1, 3 adds r1, r0 - b _0813EC52 + b @0813EC52 .align 2, 0 .pool -_0813EAC8: +@0813EAC8: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r2, 0x80 @@ -613566,9 +613566,9 @@ _0813EAC8: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - beq _0813EADC - b _0813F1A4 -_0813EADC: + beq @0813EADC + b @0813F1A4 +@0813EADC: mov r3, r8 adds r0, r3, r7 lsls r0, 3 @@ -613577,18 +613577,18 @@ _0813EADC: adds r0, r2, 0 ands r0, r1 cmp r0, 0 - bne _0813EAF6 + bne @0813EAF6 bl sub_80A2F30 bl sub_8085784 -_0813EAF6: +@0813EAF6: movs r1, 0x1A ldrsh r0, [r4, r1] cmp r0, 0 - bne _0813EB06 + bne @0813EB06 ldrh r0, [r4, 0xA] mov r1, r9 bl sub_813E3DC -_0813EB06: +@0813EB06: adds r0, r7, 0 bl remove_task bl sub_805F094 @@ -613600,10 +613600,10 @@ _0813EB06: ldr r0, =0x030061e8 ldr r0, [r0] bl set_callback2 - b _0813F1A4 + b @0813F1A4 .align 2, 0 .pool -_0813EB34: +@0813EB34: ldr r0, =0x02024332 ldrb r1, [r0, 0x2] lsls r0, r1, 2 @@ -613612,9 +613612,9 @@ _0813EB34: adds r0, r5 ldrb r0, [r0, 0x4] cmp r0, 0 - beq _0813EB48 - b _0813F1A4 -_0813EB48: + beq @0813EB48 + b @0813F1A4 +@0813EB48: bl m4aMPlayAllStop ldr r0, =0x0006001c ldr r1, =0x00007fff @@ -613627,18 +613627,18 @@ _0813EB48: adds r1, r2, r7 lsls r1, 3 adds r1, r5 - b _0813EC52 + b @0813EC52 .align 2, 0 .pool -_0813EB74: +@0813EB74: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0813EB82 - b _0813F1A4 -_0813EB82: + beq @0813EB82 + b @0813F1A4 +@0813EB82: ldr r0, =0x0203ab80 ldr r0, [r0] ldrb r0, [r0] @@ -613646,26 +613646,26 @@ _0813EB82: adds r4, r3, r7 lsls r4, 3 adds r4, r5 -_0813EB90: +@0813EB90: ldrh r1, [r4, 0xA] -_0813EB92: +@0813EB92: bl sub_81401E0 -_0813EB96: +@0813EB96: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0813F1A4 + b @0813F1A4 .align 2, 0 .pool -_0813EBA8: +@0813EBA8: ldr r0, =0x0203ab80 ldr r0, [r0] ldrb r0, [r0] bl sub_8140208 cmp r0, 0 - bne _0813EBB8 - b _0813F1A4 -_0813EBB8: + bne @0813EBB8 + b @0813F1A4 +@0813EBB8: ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 @@ -613674,18 +613674,18 @@ _0813EBB8: movs r3, 0x1A ldrsh r0, [r1, r3] cmp r0, 0 - beq _0813EBE4 + beq @0813EBE4 ldr r0, =0x02021fc4 ldr r1, =0x085cc9ee bl ExpandTextCodes - b _0813EBEC + b @0813EBEC .align 2, 0 .pool -_0813EBE4: +@0813EBE4: ldr r0, =0x02021fc4 ldr r1, =0x085cc9d3 bl ExpandTextCodes -_0813EBEC: +@0813EBEC: ldr r0, =0x02021fc4 movs r1, 0 bl battle_show_message_maybe @@ -613696,23 +613696,23 @@ _0813EBEC: adds r0, r1 movs r1, 0x1 strh r1, [r0, 0x1A] - b _0813F16E + b @0813F16E .align 2, 0 .pool -_0813EC10: +@0813EC10: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - beq _0813EC1E - b _0813F1A4 -_0813EC1E: + beq @0813EC1E + b @0813F1A4 +@0813EC1E: bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - beq _0813EC2A - b _0813F1A4 -_0813EC2A: + beq @0813EC2A + b @0813F1A4 +@0813EC2A: bl sub_804F574 ldr r0, =0x0000016f bl fanfare_play @@ -613729,27 +613729,27 @@ _0813EC2A: adds r1, r0 movs r0, 0x40 strh r0, [r1, 0x10] -_0813EC52: +@0813EC52: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _0813F1A4 + b @0813F1A4 .align 2, 0 .pool -_0813EC6C: +@0813EC6C: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - beq _0813EC7A - b _0813F1A4 -_0813EC7A: + beq @0813EC7A + b @0813F1A4 +@0813EC7A: bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - beq _0813EC86 - b _0813F1A4 -_0813EC86: + beq @0813EC86 + b @0813F1A4 +@0813EC86: ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 @@ -613760,15 +613760,15 @@ _0813EC86: strh r0, [r1, 0x10] lsls r0, 16 cmp r0, 0 - beq _0813EC9E - b _0813F1A4 -_0813EC9E: + beq @0813EC9E + b @0813F1A4 +@0813EC9E: movs r0, 0xF strh r0, [r1, 0x8] - b _0813F1A4 + b @0813F1A4 .align 2, 0 .pool -_0813ECA8: +@0813ECA8: mov r3, r8 adds r0, r3, r7 lsls r0, 3 @@ -613776,45 +613776,45 @@ _0813ECA8: movs r1, 0x14 ldrsh r0, [r0, r1] cmp r0, 0xC - bls _0813ECBA - b _0813F1A4 -_0813ECBA: + bls @0813ECBA + b @0813F1A4 +@0813ECBA: lsls r0, 2 - ldr r1, =_0813ECC8 + ldr r1, =@0813ECC8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0813ECC8: - .4byte _0813ECFC - .4byte _0813ED48 - .4byte _0813ED90 - .4byte _0813EDCE - .4byte _0813EE34 - .4byte _0813EF30 - .4byte _0813EF88 - .4byte _0813F05C - .4byte _0813F090 - .4byte _0813F0D8 - .4byte _0813F120 - .4byte _0813F154 - .4byte _0813F180 -_0813ECFC: +@0813ECC8: + .4byte @0813ECFC + .4byte @0813ED48 + .4byte @0813ED90 + .4byte @0813EDCE + .4byte @0813EE34 + .4byte @0813EF30 + .4byte @0813EF88 + .4byte @0813F05C + .4byte @0813F090 + .4byte @0813F0D8 + .4byte @0813F120 + .4byte @0813F154 + .4byte @0813F180 +@0813ECFC: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - beq _0813ED0A - b _0813F1A4 -_0813ED0A: + beq @0813ED0A + b @0813F1A4 +@0813ED0A: bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - beq _0813ED16 - b _0813F1A4 -_0813ED16: + beq @0813ED16 + b @0813F1A4 +@0813ED16: bl sub_804F574 ldr r0, =0x085cc270 ldr r0, [r0, 0x10] @@ -613829,23 +613829,23 @@ _0813ED16: adds r1, r0 ldrh r0, [r1, 0x14] adds r0, 0x1 - b _0813F1A2 + b @0813F1A2 .align 2, 0 .pool -_0813ED48: +@0813ED48: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - beq _0813ED56 - b _0813F1A4 -_0813ED56: + beq @0813ED56 + b @0813F1A4 +@0813ED56: bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - beq _0813ED62 - b _0813F1A4 -_0813ED62: + beq @0813ED62 + b @0813F1A4 +@0813ED62: ldr r0, =0x085cc270 ldr r0, [r0, 0x14] bl sub_814E6F0 @@ -613859,19 +613859,19 @@ _0813ED62: adds r1, r0 ldrh r0, [r1, 0x14] adds r0, 0x1 - b _0813F1A2 + b @0813F1A2 .align 2, 0 .pool -_0813ED90: +@0813ED90: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _0813EDCE + bne @0813EDCE bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - bne _0813EDCE + bne @0813EDCE ldr r0, =0x085cc270 ldr r0, [r0, 0x18] bl sub_814E6F0 @@ -613890,21 +613890,21 @@ _0813ED90: ldrh r0, [r1, 0x14] adds r0, 0x1 strh r0, [r1, 0x14] -_0813EDCE: +@0813EDCE: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - beq _0813EDDC - b _0813F1A4 -_0813EDDC: + beq @0813EDDC + b @0813F1A4 +@0813EDDC: bl mplay_has_finished_maybe lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _0813EDEA - b _0813F1A4 -_0813EDEA: + beq @0813EDEA + b @0813F1A4 +@0813EDEA: str r0, [sp] movs r0, 0x18 movs r1, 0x8 @@ -613927,20 +613927,20 @@ _0813EDEA: strb r2, [r0, 0x1] movs r0, 0 bl sub_8056B74 - b _0813F1A4 + b @0813F1A4 .align 2, 0 .pool -_0813EE34: +@0813EE34: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0813EE5C + beq @0813EE5C ldr r4, =0x02024332 ldrb r0, [r4, 0x1] cmp r0, 0 - beq _0813EE5C + beq @0813EE5C movs r0, 0x5 bl audio_play ldrb r0, [r4, 0x1] @@ -613948,17 +613948,17 @@ _0813EE34: movs r0, 0 strb r0, [r4, 0x1] bl sub_8056B74 -_0813EE5C: +@0813EE5C: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0813EE84 + beq @0813EE84 ldr r4, =0x02024332 ldrb r0, [r4, 0x1] cmp r0, 0 - bne _0813EE84 + bne @0813EE84 movs r0, 0x5 bl audio_play ldrb r0, [r4, 0x1] @@ -613966,14 +613966,14 @@ _0813EE5C: movs r0, 0x1 strb r0, [r4, 0x1] bl sub_8056B74 -_0813EE84: +@0813EE84: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r2, 0x1 adds r0, r2, 0 ands r0, r1 cmp r0, 0 - beq _0813EEF2 + beq @0813EEF2 str r2, [sp] movs r0, 0x18 movs r1, 0x8 @@ -613985,7 +613985,7 @@ _0813EE84: ldr r0, =0x02024332 ldrb r2, [r0, 0x1] cmp r2, 0 - beq _0813EECC + beq @0813EECC ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 @@ -613993,10 +613993,10 @@ _0813EE84: adds r1, r0 ldrh r0, [r1, 0x18] strh r0, [r1, 0x14] - b _0813EEF2 + b @0813EEF2 .align 2, 0 .pool -_0813EECC: +@0813EECC: ldr r0, =0x03005e00 mov r3, r8 adds r1, r3, r7 @@ -614007,7 +614007,7 @@ _0813EECC: lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - bne _0813EEF2 + bne @0813EEF2 movs r0, 0x1 negs r0, r0 str r2, [sp] @@ -614015,15 +614015,15 @@ _0813EECC: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 -_0813EEF2: +@0813EEF2: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _0813EF00 - b _0813F1A4 -_0813EF00: + bne @0813EF00 + b @0813F1A4 +@0813EF00: movs r0, 0x1 str r0, [sp] movs r0, 0x18 @@ -614040,18 +614040,18 @@ _0813EF00: adds r0, r1 ldrh r1, [r0, 0x18] strh r1, [r0, 0x14] - b _0813F1A4 + b @0813F1A4 .align 2, 0 .pool -_0813EF30: +@0813EF30: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0813EF3E - b _0813F1A4 -_0813EF3E: + beq @0813EF3E + b @0813F1A4 +@0813EF3E: bl Window_FreeMemory ldr r0, =0x020244ec ldr r1, =0x03005e00 @@ -614073,39 +614073,39 @@ _0813EF3E: ldrh r0, [r5, 0x14] adds r0, 0x1 strh r0, [r5, 0x14] - b _0813F1A4 + b @0813F1A4 .align 2, 0 .pool -_0813EF88: +@0813EF88: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0813EF96 - b _0813F1A4 -_0813EF96: + beq @0813EF96 + b @0813F1A4 +@0813EF96: ldr r1, [r6, 0x4] ldr r0, =sub_813E3A4 + 1 cmp r1, r0 - beq _0813EFA0 - b _0813F1A4 -_0813EFA0: + beq @0813EFA0 + b @0813F1A4 +@0813EFA0: bl sub_81C1B94 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x4 - bne _0813EFC8 + bne @0813EFC8 ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 adds r1, r0 movs r0, 0xA - b _0813F1A2 + b @0813F1A2 .align 2, 0 .pool -_0813EFC8: +@0813EFC8: adds r1, r6, 0 adds r1, 0xD mov r0, r9 @@ -614115,7 +614115,7 @@ _0813EFC8: adds r0, r4, 0 bl sub_806E804 cmp r0, 0 - beq _0813F014 + beq @0813F014 ldr r0, =0x085cc270 ldr r3, =0x000004cc adds r0, r3 @@ -614131,10 +614131,10 @@ _0813EFC8: adds r0, r1 movs r1, 0xC strh r1, [r0, 0x14] - b _0813F1A4 + b @0813F1A4 .align 2, 0 .pool -_0813F014: +@0813F014: ldr r1, =0x02022f68 movs r0, 0xFD strb r0, [r1] @@ -614162,10 +614162,10 @@ _0813F014: adds r1, r0 ldrh r0, [r1, 0x14] adds r0, 0x1 - b _0813F1A2 + b @0813F1A2 .align 2, 0 .pool -_0813F05C: +@0813F05C: ldr r0, =0x085cc270 movs r1, 0xCF lsls r1, 2 @@ -614182,23 +614182,23 @@ _0813F05C: adds r1, r0 ldrh r0, [r1, 0x14] adds r0, 0x1 - b _0813F1A2 + b @0813F1A2 .align 2, 0 .pool -_0813F090: +@0813F090: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - beq _0813F09E - b _0813F1A4 -_0813F09E: + beq @0813F09E + b @0813F1A4 +@0813F09E: bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - beq _0813F0AA - b _0813F1A4 -_0813F0AA: + beq @0813F0AA + b @0813F1A4 +@0813F0AA: ldr r0, =0x085cc270 ldr r0, [r0, 0x1C] bl sub_814E6F0 @@ -614212,19 +614212,19 @@ _0813F0AA: adds r1, r0 ldrh r0, [r1, 0x14] adds r0, 0x1 - b _0813F1A2 + b @0813F1A2 .align 2, 0 .pool -_0813F0D8: +@0813F0D8: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _0813F1A4 + bne @0813F1A4 bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - bne _0813F1A4 + bne @0813F1A4 ldr r0, =0x085cc270 movs r1, 0xD0 lsls r1, 2 @@ -614241,10 +614241,10 @@ _0813F0D8: adds r0, r1 movs r1, 0x14 strh r1, [r0, 0x8] - b _0813F1A4 + b @0813F1A4 .align 2, 0 .pool -_0813F120: +@0813F120: ldr r0, =0x085cc270 ldr r0, [r0, 0x20] bl sub_814E6F0 @@ -614262,10 +614262,10 @@ _0813F120: strh r2, [r0, 0x18] movs r1, 0x3 strh r1, [r0, 0x14] - b _0813F1A4 + b @0813F1A4 .align 2, 0 .pool -_0813F154: +@0813F154: ldr r0, =0x085cc270 ldr r0, [r0, 0x24] bl sub_814E6F0 @@ -614277,31 +614277,31 @@ _0813F154: adds r0, r2, r7 lsls r0, 3 adds r0, r1 -_0813F16E: +@0813F16E: movs r1, 0xF strh r1, [r0, 0x8] - b _0813F1A4 + b @0813F1A4 .align 2, 0 .pool -_0813F180: +@0813F180: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _0813F1A4 + bne @0813F1A4 bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - bne _0813F1A4 + bne @0813F1A4 ldr r0, =0x03005e00 mov r3, r8 adds r1, r3, r7 lsls r1, 3 adds r1, r0 movs r0, 0x5 -_0813F1A2: +@0813F1A2: strh r0, [r1, 0x14] -_0813F1A4: +@0813F1A4: add sp, 0x18 pop {r3,r4} mov r8, r3 @@ -614314,7 +614314,7 @@ _0813F1A4: thumb_func_end sub_813E570 thumb_func_start sub_813F1B8 -sub_813F1B8: @ 813F1B8 +sub_813F1B8: ; 813F1B8 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -614338,40 +614338,40 @@ sub_813F1B8: @ 813F1B8 ldrsh r0, [r0, r2] adds r5, r3, 0 cmp r0, 0x14 - bls _0813F1EC - bl _0813FCC4 -_0813F1EC: + bls @0813F1EC + bl @0813FCC4 +@0813F1EC: lsls r0, 2 - ldr r1, =_0813F204 + ldr r1, =@0813F204 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0813F204: - .4byte _0813F258 - .4byte _0813F284 - .4byte _0813F2AC - .4byte _0813F2DC - .4byte _0813F314 - .4byte _0813F380 - .4byte _0813F3C0 - .4byte _0813F3F0 - .4byte _0813F42C - .4byte _0813F448 - .4byte _0813F474 - .4byte _0813F498 - .4byte _0813F4E4 - .4byte _0813F570 - .4byte _0813F624 - .4byte _0813F668 - .4byte _0813F6D0 - .4byte _0813F704 - .4byte _0813F748 - .4byte _0813F7A4 - .4byte _0813F7E4 -_0813F258: +@0813F204: + .4byte @0813F258 + .4byte @0813F284 + .4byte @0813F2AC + .4byte @0813F2DC + .4byte @0813F314 + .4byte @0813F380 + .4byte @0813F3C0 + .4byte @0813F3F0 + .4byte @0813F42C + .4byte @0813F448 + .4byte @0813F474 + .4byte @0813F498 + .4byte @0813F4E4 + .4byte @0813F570 + .4byte @0813F624 + .4byte @0813F668 + .4byte @0813F6D0 + .4byte @0813F704 + .4byte @0813F748 + .4byte @0813F7A4 + .4byte @0813F7E4 +@0813F258: ldr r4, =0x02021fc4 ldr r1, =0x085cc990 adds r0, r4, 0 @@ -614385,17 +614385,17 @@ _0813F258: adds r0, r7 lsls r0, 3 adds r0, r1 - b _0813F6B4 + b @0813F6B4 .align 2, 0 .pool -_0813F284: +@0813F284: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - beq _0813F294 - bl _0813FCC4 -_0813F294: + beq @0813F294 + bl @0813FCC4 +@0813F294: ldr r0, =0x03005e00 lsls r4, r7, 2 adds r4, r7 @@ -614404,16 +614404,16 @@ _0813F294: ldrh r0, [r4, 0xA] movs r1, 0 bl cry_related - b _0813F6F2 + b @0813F6F2 .align 2, 0 .pool -_0813F2AC: +@0813F2AC: bl sub_80A3678 lsls r0, 24 cmp r0, 0 - bne _0813F2BA - bl _0813FCC4 -_0813F2BA: + bne @0813F2BA + bl @0813FCC4 +@0813F2BA: ldr r0, =0x00000179 bl m4aSongNumStop movs r0, 0xBC @@ -614424,17 +614424,17 @@ _0813F2BA: adds r0, r7 lsls r0, 3 adds r0, r1 - b _0813F6B4 + b @0813F6B4 .align 2, 0 .pool -_0813F2DC: +@0813F2DC: bl mplay_has_finished_maybe lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - beq _0813F2EC - bl _0813FCC4 -_0813F2EC: + beq @0813F2EC + bl @0813FCC4 +@0813F2EC: ldr r0, =0x00000179 bl song_play_for_text ldr r1, =0x03005e00 @@ -614448,18 +614448,18 @@ _0813F2EC: str r5, [sp] movs r0, 0x1C movs r1, 0x4 - b _0813F9C8 + b @0813F9C8 .align 2, 0 .pool -_0813F314: +@0813F314: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0813F324 - bl _0813FCC4 -_0813F324: + beq @0813F324 + bl @0813FCC4 +@0813F324: movs r0, 0x1 bl sub_8140000 ldr r2, =0x02020630 @@ -614489,10 +614489,10 @@ _0813F324: ldr r1, =0x00000603 movs r0, 0xE bl lcd_io_set - bl _0813FCC4 + bl @0813FCC4 .align 2, 0 .pool -_0813F380: +@0813F380: ldr r4, =0x02024332 ldrb r0, [r4, 0x2] lsls r1, r0, 2 @@ -614501,9 +614501,9 @@ _0813F380: adds r1, r5 ldrb r0, [r1, 0x4] cmp r0, 0 - beq _0813F396 - bl _0813FCC4 -_0813F396: + beq @0813F396 + bl @0813FCC4 +@0813F396: lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -614517,10 +614517,10 @@ _0813F396: strb r0, [r1, 0x3] bl sub_817BFB4 strb r0, [r4, 0x2] - bl _0813FCC4 + bl @0813FCC4 .align 2, 0 .pool -_0813F3C0: +@0813F3C0: ldr r4, =0x02024332 ldrb r0, [r4, 0x2] lsls r1, r0, 2 @@ -614529,19 +614529,19 @@ _0813F3C0: adds r1, r5 ldrb r0, [r1, 0x4] cmp r0, 0 - beq _0813F3D6 - bl _0813FCC4 -_0813F3D6: + beq @0813F3D6 + bl @0813FCC4 +@0813F3D6: ldr r0, =0x0203ab80 ldr r1, [r0] ldrb r0, [r1] ldrb r1, [r1, 0x1] bl sub_817C3A0 strb r0, [r4, 0x2] - b _0813F6AC + b @0813F6AC .align 2, 0 .pool -_0813F3F0: +@0813F3F0: ldr r2, =0x0203ab80 ldr r1, [r2] ldrb r0, [r1, 0x3] @@ -614549,9 +614549,9 @@ _0813F3F0: strb r0, [r1, 0x3] lsls r0, 24 cmp r0, 0 - beq _0813F404 - bl _0813FCC4 -_0813F404: + beq @0813F404 + bl @0813FCC4 +@0813F404: ldr r1, [r2] movs r0, 0x3 strb r0, [r1, 0x3] @@ -614563,13 +614563,13 @@ _0813F404: adds r0, r5 ldrb r0, [r0, 0x4] cmp r0, 0 - beq _0813F420 - bl _0813FCC4 -_0813F420: - b _0813F6AC + beq @0813F420 + bl @0813FCC4 +@0813F420: + b @0813F6AC .align 2, 0 .pool -_0813F42C: +@0813F42C: bl sub_817C068 ldr r1, =0x02024332 strb r0, [r1, 0x2] @@ -614578,10 +614578,10 @@ _0813F42C: adds r0, r7 lsls r0, 3 adds r0, r1 - b _0813F6B4 + b @0813F6B4 .align 2, 0 .pool -_0813F448: +@0813F448: ldr r6, =0x02024332 ldrb r0, [r6, 0x2] lsls r1, r0, 2 @@ -614590,9 +614590,9 @@ _0813F448: adds r1, r5 ldrb r0, [r1, 0x4] cmp r0, 0 - beq _0813F45E - bl _0813FCC4 -_0813F45E: + beq @0813F45E + bl @0813FCC4 +@0813F45E: lsls r4, r7, 2 adds r4, r7 lsls r4, 3 @@ -614600,10 +614600,10 @@ _0813F45E: ldrh r0, [r4, 0xC] bl sub_817C280 strb r0, [r6, 0x2] - b _0813F6F2 + b @0813F6F2 .align 2, 0 .pool -_0813F474: +@0813F474: ldr r0, =0x02024332 ldrb r1, [r0, 0x2] lsls r0, r1, 2 @@ -614612,21 +614612,21 @@ _0813F474: adds r0, r5 ldrb r0, [r0, 0x4] cmp r0, 0 - beq _0813F48A - bl _0813FCC4 -_0813F48A: + beq @0813F48A + bl @0813FCC4 +@0813F48A: movs r0, 0x21 bl audio_play - b _0813F6AC + b @0813F6AC .align 2, 0 .pool -_0813F498: +@0813F498: bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - bne _0813F4A6 - bl _0813FCC4 -_0813F4A6: + bne @0813F4A6 + bl @0813FCC4 +@0813F4A6: ldr r0, =0x0203ab84 ldr r0, [r0] bl free @@ -614645,16 +614645,16 @@ _0813F4A6: adds r1, 0x4 movs r2, 0x60 bl memcpy - b _0813F6F2 + b @0813F6F2 .align 2, 0 .pool -_0813F4E4: +@0813F4E4: bl sub_80A3678 lsls r0, 24 cmp r0, 0 - bne _0813F4F2 - bl _0813FCC4 -_0813F4F2: + bne @0813F4F2 + bl @0813FCC4 +@0813F4F2: ldr r4, =0x02021fc4 ldr r1, =0x085cc9a6 adds r0, r4, 0 @@ -614698,24 +614698,24 @@ _0813F4F2: bl pokedex_flag_operation movs r0, 0xE bl sav12_xor_increment - b _0813FCC4 + b @0813FCC4 .align 2, 0 .pool -_0813F570: +@0813F570: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - beq _0813F57E - b _0813FCC4 -_0813F57E: + beq @0813F57E + b @0813FCC4 +@0813F57E: bl task_is_not_running_overworld_fanfare lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0813F58C - b _0813FCC4 -_0813F58C: + beq @0813F58C + b @0813FCC4 +@0813F58C: ldr r1, =0x03005e00 lsls r4, r7, 2 adds r0, r4, r7 @@ -614728,11 +614728,11 @@ _0813F58C: lsrs r6, r0, 16 mov r8, r4 cmp r6, 0 - beq _0813F5FC + beq @0813F5FC movs r0, 0x1A ldrsh r2, [r5, r0] cmp r2, 0 - bne _0813F5FC + bne @0813F5FC ldrh r1, [r5, 0xE] movs r0, 0x80 orrs r0, r1 @@ -614748,24 +614748,24 @@ _0813F58C: bl strcpy_limit_10_chars ldr r0, =0x0000ffff cmp r6, r0 - bne _0813F5E8 + bne @0813F5E8 movs r0, 0x14 strh r0, [r5, 0x8] - b _0813FCC4 + b @0813FCC4 .align 2, 0 .pool -_0813F5E8: +@0813F5E8: ldr r0, =0x0000fffe cmp r6, r0 - bne _0813F5F0 - b _0813FCC4 -_0813F5F0: + bne @0813F5F0 + b @0813FCC4 +@0813F5F0: movs r0, 0x12 strh r0, [r5, 0x8] - b _0813FCC4 + b @0813FCC4 .align 2, 0 .pool -_0813F5FC: +@0813F5FC: ldr r0, =0x00000179 bl song_play_for_text ldr r1, =0x085ef6d2 @@ -614777,18 +614777,18 @@ _0813F5FC: adds r1, r2, r7 lsls r1, 3 adds r1, r0 - b _0813F78C + b @0813F78C .align 2, 0 .pool -_0813F624: +@0813F624: movs r0, 0 bl a_pressed_maybe lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - beq _0813F634 - b _0813FCC4 -_0813F634: + beq @0813F634 + b @0813FCC4 +@0813F634: adds r0, r7, 0 bl remove_task ldr r4, =0x0203ab80 @@ -614804,10 +614804,10 @@ _0813F634: ldr r0, =0x030061e8 ldr r0, [r0] bl set_callback2 - b _0813FCC4 + b @0813FCC4 .align 2, 0 .pool -_0813F668: +@0813F668: ldr r0, =0x02024332 ldrb r1, [r0, 0x2] lsls r0, r1, 2 @@ -614816,9 +614816,9 @@ _0813F668: adds r0, r5 ldrb r0, [r0, 0x4] cmp r0, 0 - beq _0813F67C - b _0813FCC4 -_0813F67C: + beq @0813F67C + b @0813FCC4 +@0813F67C: bl m4aMPlayAllStop ldr r2, =0x02020630 ldr r0, =0x0203ab80 @@ -614841,27 +614841,27 @@ _0813F67C: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 -_0813F6AC: +@0813F6AC: lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r5 -_0813F6B4: +@0813F6B4: ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b _0813FCC4 + b @0813FCC4 .align 2, 0 .pool -_0813F6D0: +@0813F6D0: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0813F6DE - b _0813FCC4 -_0813F6DE: + beq @0813F6DE + b @0813FCC4 +@0813F6DE: ldr r0, =0x0203ab80 ldr r0, [r0] ldrb r0, [r0] @@ -614871,22 +614871,22 @@ _0813F6DE: adds r4, r5 ldrh r1, [r4, 0xA] bl sub_81401E0 -_0813F6F2: +@0813F6F2: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0813FCC4 + b @0813FCC4 .align 2, 0 .pool -_0813F704: +@0813F704: ldr r0, =0x0203ab80 ldr r0, [r0] ldrb r0, [r0] bl sub_8140208 cmp r0, 0 - bne _0813F714 - b _0813FCC4 -_0813F714: + bne @0813F714 + b @0813FCC4 +@0813F714: ldr r4, =0x02021fc4 ldr r1, =0x085cc9ee adds r0, r4, 0 @@ -614902,23 +614902,23 @@ _0813F714: adds r0, r1 movs r1, 0x1 strh r1, [r0, 0x1A] - b _0813FC8C + b @0813FC8C .align 2, 0 .pool -_0813F748: +@0813F748: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - beq _0813F756 - b _0813FCC4 -_0813F756: + beq @0813F756 + b @0813FCC4 +@0813F756: bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - beq _0813F762 - b _0813FCC4 -_0813F762: + beq @0813F762 + b @0813FCC4 +@0813F762: bl sub_804F574 ldr r0, =0x0000016f bl fanfare_play @@ -614936,28 +614936,28 @@ _0813F762: adds r1, r0 movs r0, 0x40 strh r0, [r1, 0x10] -_0813F78C: +@0813F78C: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _0813FCC4 + b @0813FCC4 .align 2, 0 .pool -_0813F7A4: +@0813F7A4: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - beq _0813F7B2 - b _0813FCC4 -_0813F7B2: + beq @0813F7B2 + b @0813FCC4 +@0813F7B2: bl task_is_not_running_overworld_fanfare lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0813F7C0 - b _0813FCC4 -_0813F7C0: + beq @0813F7C0 + b @0813FCC4 +@0813F7C0: ldr r0, =0x03005e00 lsls r1, r7, 2 adds r1, r7 @@ -614968,15 +614968,15 @@ _0813F7C0: strh r0, [r1, 0x10] lsls r0, 16 cmp r0, 0 - beq _0813F7D8 - b _0813FCC4 -_0813F7D8: + beq @0813F7D8 + b @0813FCC4 +@0813F7D8: movs r0, 0xD strh r0, [r1, 0x8] - b _0813FCC4 + b @0813FCC4 .align 2, 0 .pool -_0813F7E4: +@0813F7E4: lsls r1, r7, 2 adds r0, r1, r7 lsls r0, 3 @@ -614985,44 +614985,44 @@ _0813F7E4: ldrsh r0, [r0, r2] mov r8, r1 cmp r0, 0xB - bls _0813F7F8 - b _0813FCC4 -_0813F7F8: + bls @0813F7F8 + b @0813FCC4 +@0813F7F8: lsls r0, 2 - ldr r1, =_0813F808 + ldr r1, =@0813F808 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0813F808: - .4byte _0813F838 - .4byte _0813F884 - .4byte _0813F8CC - .4byte _0813F90C - .4byte _0813F96C - .4byte _0813FA24 - .4byte _0813FAA8 - .4byte _0813FBA4 - .4byte _0813FBEC - .4byte _0813FC38 - .4byte _0813FC70 - .4byte _0813FCA0 -_0813F838: +@0813F808: + .4byte @0813F838 + .4byte @0813F884 + .4byte @0813F8CC + .4byte @0813F90C + .4byte @0813F96C + .4byte @0813FA24 + .4byte @0813FAA8 + .4byte @0813FBA4 + .4byte @0813FBEC + .4byte @0813FC38 + .4byte @0813FC70 + .4byte @0813FCA0 +@0813F838: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - beq _0813F846 - b _0813FCC4 -_0813F846: + beq @0813F846 + b @0813FCC4 +@0813F846: bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - beq _0813F852 - b _0813FCC4 -_0813F852: + beq @0813F852 + b @0813FCC4 +@0813F852: bl sub_804F574 ldr r0, =0x085cc270 ldr r0, [r0, 0x10] @@ -615038,23 +615038,23 @@ _0813F852: adds r1, r0 ldrh r0, [r1, 0x14] adds r0, 0x1 - b _0813FCC2 + b @0813FCC2 .align 2, 0 .pool -_0813F884: +@0813F884: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - beq _0813F892 - b _0813FCC4 -_0813F892: + beq @0813F892 + b @0813FCC4 +@0813F892: bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - beq _0813F89E - b _0813FCC4 -_0813F89E: + beq @0813F89E + b @0813FCC4 +@0813F89E: ldr r0, =0x085cc270 ldr r0, [r0, 0x14] bl sub_814E6F0 @@ -615069,19 +615069,19 @@ _0813F89E: adds r1, r0 ldrh r0, [r1, 0x14] adds r0, 0x1 - b _0813FCC2 + b @0813FCC2 .align 2, 0 .pool -_0813F8CC: +@0813F8CC: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _0813F90C + bne @0813F90C bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - bne _0813F90C + bne @0813F90C ldr r0, =0x085cc270 ldr r0, [r0, 0x18] bl sub_814E6F0 @@ -615101,21 +615101,21 @@ _0813F8CC: ldrh r0, [r1, 0x14] adds r0, 0x1 strh r0, [r1, 0x14] -_0813F90C: +@0813F90C: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - beq _0813F91A - b _0813FCC4 -_0813F91A: + beq @0813F91A + b @0813FCC4 +@0813F91A: bl mplay_has_finished_maybe lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq _0813F928 - b _0813FCC4 -_0813F928: + beq @0813F928 + b @0813FCC4 +@0813F928: movs r0, 0 movs r1, 0xA8 movs r2, 0xE0 @@ -615137,27 +615137,27 @@ _0813F928: movs r2, 0 strh r0, [r1, 0x14] strb r2, [r3, 0x1] - b _0813FCC4 + b @0813FCC4 .align 2, 0 .pool -_0813F96C: +@0813F96C: bl sub_8198C58 lsls r0, 24 asrs r6, r0, 24 cmp r6, 0 - beq _0813F98C + beq @0813F98C cmp r6, 0 - bgt _0813F986 + bgt @0813F986 movs r0, 0x1 negs r0, r0 cmp r6, r0 - beq _0813F9E4 - b _0813FCC4 -_0813F986: + beq @0813F9E4 + b @0813FCC4 +@0813F986: cmp r6, 0x1 - beq _0813F9E4 - b _0813FCC4 -_0813F98C: + beq @0813F9E4 + b @0813FCC4 +@0813F98C: ldr r0, =0x02024332 strb r6, [r0, 0x1] ldr r0, =0x085cc270 @@ -615180,21 +615180,21 @@ _0813F98C: lsls r1, 16 asrs r1, 16 cmp r1, 0x5 - beq _0813F9C0 - b _0813FCC4 -_0813F9C0: + beq @0813F9C0 + b @0813FCC4 +@0813F9C0: movs r0, 0x1 negs r0, r0 str r6, [sp] movs r1, 0 -_0813F9C8: +@0813F9C8: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - b _0813FCC4 + b @0813FCC4 .align 2, 0 .pool -_0813F9E4: +@0813F9E4: ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x1] @@ -615215,24 +615215,24 @@ _0813F9E4: adds r0, r1 ldrh r1, [r0, 0x18] strh r1, [r0, 0x14] - b _0813FCC4 + b @0813FCC4 .align 2, 0 .pool -_0813FA24: +@0813FA24: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0813FA32 - b _0813FCC4 -_0813FA32: + beq @0813FA32 + b @0813FCC4 +@0813FA32: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _0813FA3E + beq @0813FA3E bl sub_800E084 -_0813FA3E: +@0813FA3E: movs r0, 0x3 bl bg_get_tilemap bl free @@ -615263,40 +615263,40 @@ _0813FA3E: ldrh r0, [r5, 0x14] adds r0, 0x1 strh r0, [r5, 0x14] - b _0813FCC4 + b @0813FCC4 .align 2, 0 .pool -_0813FAA8: +@0813FAA8: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0813FAB6 - b _0813FCC4 -_0813FAB6: + beq @0813FAB6 + b @0813FCC4 +@0813FAB6: ldr r0, =0x030022c0 ldr r1, [r0, 0x4] ldr r0, =sub_813E3C0 + 1 cmp r1, r0 - beq _0813FAC2 - b _0813FCC4 -_0813FAC2: + beq @0813FAC2 + b @0813FCC4 +@0813FAC2: bl sub_81C1B94 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x4 - bne _0813FAEC + bne @0813FAEC ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 adds r1, r0 movs r0, 0x9 - b _0813FCC2 + b @0813FCC2 .align 2, 0 .pool -_0813FAEC: +@0813FAEC: adds r1, r6, 0 adds r1, 0xD mov r0, r9 @@ -615306,7 +615306,7 @@ _0813FAEC: adds r0, r4, 0 bl sub_806E804 cmp r0, 0 - beq _0813FB3C + beq @0813FB3C ldr r0, =0x085cc270 ldr r1, =0x000004cc adds r0, r1 @@ -615323,10 +615323,10 @@ _0813FAEC: adds r0, r1 movs r1, 0xB strh r1, [r0, 0x14] - b _0813FCC4 + b @0813FCC4 .align 2, 0 .pool -_0813FB3C: +@0813FB3C: ldr r1, =0x02022f68 movs r0, 0xFD strb r0, [r1] @@ -615364,23 +615364,23 @@ _0813FB3C: adds r1, r0 ldrh r0, [r1, 0x14] adds r0, 0x1 - b _0813FCC2 + b @0813FCC2 .align 2, 0 .pool -_0813FBA4: +@0813FBA4: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - beq _0813FBB2 - b _0813FCC4 -_0813FBB2: + beq @0813FBB2 + b @0813FCC4 +@0813FBB2: bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - beq _0813FBBE - b _0813FCC4 -_0813FBBE: + beq @0813FBBE + b @0813FCC4 +@0813FBBE: ldr r0, =0x085cc270 ldr r0, [r0, 0x1C] bl sub_814E6F0 @@ -615395,19 +615395,19 @@ _0813FBBE: adds r1, r0 ldrh r0, [r1, 0x14] adds r0, 0x1 - b _0813FCC2 + b @0813FCC2 .align 2, 0 .pool -_0813FBEC: +@0813FBEC: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _0813FCC4 + bne @0813FCC4 bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - bne _0813FCC4 + bne @0813FCC4 ldr r0, =0x085cc270 movs r1, 0xD0 lsls r1, 2 @@ -615425,10 +615425,10 @@ _0813FBEC: adds r0, r1 movs r1, 0x12 strh r1, [r0, 0x8] - b _0813FCC4 + b @0813FCC4 .align 2, 0 .pool -_0813FC38: +@0813FC38: ldr r0, =0x085cc270 ldr r0, [r0, 0x20] bl sub_814E6F0 @@ -615447,10 +615447,10 @@ _0813FC38: strh r2, [r0, 0x18] movs r1, 0x3 strh r1, [r0, 0x14] - b _0813FCC4 + b @0813FCC4 .align 2, 0 .pool -_0813FC70: +@0813FC70: ldr r0, =0x085cc270 ldr r0, [r0, 0x24] bl sub_814E6F0 @@ -615463,31 +615463,31 @@ _0813FC70: adds r0, r2, r7 lsls r0, 3 adds r0, r1 -_0813FC8C: +@0813FC8C: movs r1, 0xD strh r1, [r0, 0x8] - b _0813FCC4 + b @0813FCC4 .align 2, 0 .pool -_0813FCA0: +@0813FCA0: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _0813FCC4 + bne @0813FCC4 bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - bne _0813FCC4 + bne @0813FCC4 ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 adds r1, r0 movs r0, 0x5 -_0813FCC2: +@0813FCC2: strh r0, [r1, 0x14] -_0813FCC4: +@0813FCC4: add sp, 0x18 pop {r3,r4} mov r8, r3 @@ -615500,12 +615500,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] @@ -615550,7 +615550,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] @@ -615595,7 +615595,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 @@ -615607,14 +615607,14 @@ sub_813FDEC: @ 813FDEC movs r0, 0xC ldrsh r5, [r4, r0] cmp r5, 0 - bne _0813FE9A + bne @0813FE9A ldrh r0, [r4, 0xA] adds r1, r0, 0x1 strh r1, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x13 - ble _0813FE9A + ble @0813FE9A ldrh r1, [r4] adds r0, r1, 0x1 strh r0, [r4] @@ -615628,14 +615628,14 @@ sub_813FDEC: @ 813FDEC adds r0, r2, r0 ldrb r0, [r0] cmp r1, r0 - ble _0813FE8C + ble @0813FE8C adds r0, r3, 0x1 adds r0, r2, r0 ldrb r0, [r0] movs r2, 0x2 ldrsh r1, [r4, r2] cmp r0, r1 - bne _0813FE74 + bne @0813FE74 ldrh r0, [r4, 0x6] adds r0, 0x1 strh r0, [r4, 0x6] @@ -615648,21 +615648,21 @@ sub_813FDEC: @ 813FDEC adds r0, r1 ldrb r0, [r0] cmp r2, r0 - bne _0813FE5E + bne @0813FE5E strh r5, [r4, 0x6] ldrh r0, [r4, 0x4] adds r0, 0x1 strh r0, [r4, 0x4] -_0813FE5E: +@0813FE5E: movs r2, 0x4 ldrsh r0, [r4, r2] lsls r0, 2 adds r0, r3 ldrb r0, [r0] - b _0813FE8A + b @0813FE8A .align 2, 0 .pool -_0813FE74: +@0813FE74: ldr r0, =0x0203ab84 lsls r1, 5 ldr r0, [r0] @@ -615673,16 +615673,16 @@ _0813FE74: strh r5, [r4] ldrh r0, [r4, 0x2] adds r0, 0x1 -_0813FE8A: +@0813FE8A: strh r0, [r4, 0x2] -_0813FE8C: +@0813FE8C: movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0x4 - bne _0813FE9A + bne @0813FE9A adds r0, r6, 0 bl remove_task -_0813FE9A: +@0813FE9A: pop {r4-r6} pop {r0} bx r0 @@ -615691,7 +615691,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 @@ -615701,17 +615701,17 @@ sub_813FEA4: @ 813FEA4 lsls r0, 24 lsrs r2, r0, 24 cmp r4, 0 - bne _0813FED0 + bne @0813FED0 ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 adds r0, r1 strh r4, [r0, 0xC] - b _0813FEDE + b @0813FEDE .align 2, 0 .pool -_0813FED0: +@0813FED0: ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -615719,7 +615719,7 @@ _0813FED0: adds r1, r0 movs r0, 0x1 strh r0, [r1, 0xC] -_0813FEDE: +@0813FEDE: pop {r4} pop {r0} bx r0 @@ -615728,7 +615728,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 @@ -615747,16 +615747,16 @@ sub_813FEE8: @ 813FEE8 movs r2, 0xC ldrsh r0, [r0, r2] cmp r0, 0 - bne _0813FF28 + bne @0813FF28 ldr r7, =0x02022e1c ldr r6, =0x02022e1e - b _0813FF2C + b @0813FF2C .align 2, 0 .pool -_0813FF28: +@0813FF28: ldr r7, =0x02022e20 ldr r6, =0x02022e22 -_0813FF2C: +@0813FF2C: lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -615800,7 +615800,7 @@ _0813FF2C: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _0813FFA6 + bne @0813FFA6 adds r0, r5, 0 bl remove_task mov r0, r8 @@ -615812,7 +615812,7 @@ _0813FF2C: adds r0, r2, 0 strh r0, [r7] strh r4, [r6] -_0813FFA6: +@0813FFA6: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -615824,20 +615824,20 @@ _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 ldr r5, =0x085b5884 ldr r7, =0x085b58d9 -_0813FFCA: +@0813FFCA: lsls r0, r1, 4 adds r4, r1, 0x1 adds r2, r0, r7 lsls r0, r1, 5 adds r1, r0, r6 movs r3, 0xF -_0813FFD6: +@0813FFD6: ldrb r0, [r2] lsls r0, 1 adds r0, r5 @@ -615847,10 +615847,10 @@ _0813FFD6: adds r1, 0x2 subs r3, 0x1 cmp r3, 0 - bge _0813FFD6 + bge @0813FFD6 adds r1, r4, 0 cmp r1, 0x31 - ble _0813FFCA + ble @0813FFCA pop {r4-r7} pop {r0} bx r0 @@ -615859,7 +615859,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 @@ -615871,16 +615871,16 @@ sub_8140000: @ 8140000 str r0, [r4] bl sub_813FFC0 cmp r5, 0 - bne _08140028 + bne @08140028 movs r6, 0x1 movs r4, 0x2 - b _0814002C + b @0814002C .align 2, 0 .pool -_08140028: +@08140028: movs r6, 0x1 movs r4, 0x3 -_0814002C: +@0814002C: ldr r0, =0x085b51e4 movs r1, 0xA0 movs r2, 0x20 @@ -615907,7 +615907,7 @@ _0814002C: adds r0, r4, 0 bl gpu_copy_wram_bg_tilemap_to_vram cmp r5, 0 - bne _081400C4 + bne @081400C4 ldr r1, =0x00000442 movs r0, 0x50 bl lcd_io_set @@ -615930,10 +615930,10 @@ _0814002C: bl gpu_sync_bg_show movs r0, 0x2 bl gpu_sync_bg_show - b _081400DE + b @081400DE .align 2, 0 .pool -_081400C4: +@081400C4: ldr r1, =0x00000842 movs r0, 0x50 bl lcd_io_set @@ -615944,7 +615944,7 @@ _081400C4: lsls r1, 5 movs r0, 0 bl lcd_io_set -_081400DE: +@081400DE: ldr r0, =sub_813FDEC + 1 movs r1, 0x5 bl AddTask @@ -615959,14 +615959,14 @@ _081400DE: thumb_func_end sub_8140000 thumb_func_start sub_8140100 -sub_8140100: @ 8140100 +sub_8140100: ; 8140100 push {lr} ldr r0, =sub_813FDEC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq _0814011E + beq @0814011E ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -615974,7 +615974,7 @@ sub_8140100: @ 8140100 adds r1, r0 movs r0, 0x1 strh r0, [r1, 0x14] -_0814011E: +@0814011E: movs r0, 0 movs r1, 0xA0 movs r2, 0x20 @@ -615986,24 +615986,24 @@ _0814011E: thumb_func_end sub_8140100 thumb_func_start sub_8140134 -sub_8140134: @ 8140134 +sub_8140134: ; 8140134 push {lr} ldr r0, =sub_813FDEC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _08140148 + beq @08140148 bl remove_task -_08140148: +@08140148: ldr r0, =sub_813FEE8 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _0814015A + beq @0814015A bl remove_task -_0814015A: +@0814015A: movs r0, 0 movs r1, 0xA0 movs r2, 0x20 @@ -616016,7 +616016,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 @@ -616060,7 +616060,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 @@ -616082,7 +616082,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 @@ -616095,20 +616095,20 @@ sub_8140208: @ 8140208 ldr r1, [r1] ldr r0, =nullsub_12 + 1 cmp r1, r0 - beq _08140230 + beq @08140230 movs r0, 0 - b _08140232 + b @08140232 .align 2, 0 .pool -_08140230: +@08140230: movs r0, 0x1 -_08140232: +@08140232: pop {r1} bx r1 thumb_func_end sub_8140208 thumb_func_start sub_8140238 -sub_8140238: @ 8140238 +sub_8140238: ; 8140238 push {lr} bl run_active_tasks bl call_obj_callbacks @@ -616119,10 +616119,10 @@ sub_8140238: @ 8140238 adds r1, 0xB8 ldrb r0, [r1] cmp r0, 0 - beq _0814025A + beq @0814025A adds r0, r1, 0 bl task_tutorial_controls_fadein -_0814025A: +@0814025A: pop {r0} bx r0 .align 2, 0 @@ -616130,7 +616130,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 copy_super_sprites_to_oam @@ -616151,16 +616151,16 @@ sub_8140264: @ 8140264 ldr r1, [r4] ldrb r0, [r1, 0x1] cmp r0, 0 - beq _081402A0 + beq @081402A0 ldrh r1, [r1, 0x34] movs r0, 0x52 bl lcd_io_set -_081402A0: +@081402A0: ldr r2, [r4] movs r3, 0x2A ldrsh r0, [r2, r3] cmp r0, 0 - beq _081402C0 + beq @081402C0 ldr r1, =0x040000d4 ldr r3, =0x0000133c adds r0, r2, r3 @@ -616172,22 +616172,22 @@ _081402A0: ldr r0, [r1, 0x8] movs r0, 0 strh r0, [r2, 0x2A] -_081402C0: +@081402C0: ldr r0, [r4] movs r2, 0x28 ldrsh r1, [r0, r2] cmp r1, 0x1 - beq _081402EC + beq @081402EC cmp r1, 0x1 - ble _08140374 + ble @08140374 cmp r1, 0x2 - beq _08140324 + beq @08140324 cmp r1, 0xFF - beq _08140348 - b _08140374 + beq @08140348 + b @08140374 .align 2, 0 .pool -_081402EC: +@081402EC: movs r0, 0 movs r1, 0x1 movs r2, 0 @@ -616207,10 +616207,10 @@ _081402EC: ldr r0, [r1, 0x8] movs r0, 0x2 strh r0, [r2, 0x28] - b _08140374 + b @08140374 .align 2, 0 .pool -_08140324: +@08140324: ldr r1, =0x040000d4 movs r2, 0xCF lsls r2, 2 @@ -616221,10 +616221,10 @@ _08140324: ldr r0, =0x800001a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] - b _08140374 + b @08140374 .align 2, 0 .pool -_08140348: +@08140348: movs r0, 0 movs r1, 0x1 movs r2, 0x2 @@ -616245,7 +616245,7 @@ _08140348: ldr r1, [r4] movs r0, 0 strh r0, [r1, 0x28] -_08140374: +@08140374: add sp, 0x4 pop {r4} pop {r0} @@ -616255,7 +616255,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 @@ -616308,7 +616308,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] @@ -616345,7 +616345,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, =0x085b6418 @@ -616368,13 +616368,13 @@ sub_8140470: @ 8140470 movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081404AA + beq @081404AA ldr r0, [r5] ldrb r1, [r0, 0x4] movs r2, 0x80 orrs r1, r2 strb r1, [r0, 0x4] -_081404AA: +@081404AA: ldr r1, [r5] ldr r2, =0x085b6348 ldrb r0, [r1, 0x4] @@ -616413,20 +616413,20 @@ _081404AA: ldr r0, [r5] ldrb r0, [r0, 0x19] cmp r0, 0x1 - bne _08140520 + bne @08140520 ldr r4, =0x02037714 ldr r3, =0x02037b14 mov r0, sp ldrh r2, [r0] - b _08140528 + b @08140528 .align 2, 0 .pool -_08140520: +@08140520: ldr r4, =0x02037714 ldr r3, =0x02037b14 mov r0, sp ldrh r2, [r0, 0x2] -_08140528: +@08140528: adds r0, r3, 0 adds r0, 0xA2 strh r2, [r0] @@ -616445,7 +616445,7 @@ _08140528: adds r0, 0xB8 bl sub_8151678 movs r4, 0 -_0814054E: +@0814054E: ldr r5, =0x0203ab88 ldr r0, [r5] adds r0, 0xB8 @@ -616458,9 +616458,9 @@ _0814054E: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xC - bls _0814054E + bls @0814054E movs r4, 0 -_0814056C: +@0814056C: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -616471,29 +616471,29 @@ _0814056C: movs r0, 0x98 lsls r0, 1 cmp r1, r0 - beq _081405AC + beq @081405AC adds r0, 0x2 cmp r1, r0 - bne _081405B6 + bne @081405B6 ldr r0, [r5] ldrb r1, [r0, 0x2] movs r2, 0x1 - b _081405B2 + b @081405B2 .align 2, 0 .pool -_081405AC: +@081405AC: ldr r0, [r5] ldrb r1, [r0, 0x2] movs r2, 0x2 -_081405B2: +@081405B2: orrs r1, r2 strb r1, [r0, 0x2] -_081405B6: +@081405B6: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls _0814056C + bls @0814056C bl sub_802F588 add sp, 0x8 pop {r4-r6} @@ -616502,7 +616502,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 @@ -616511,36 +616511,36 @@ sub_81405CC: @ 81405CC adds r0, r1 ldrb r0, [r0] cmp r0, 0x8 - bls _081405E0 - b _081407F8 -_081405E0: + bls @081405E0 + b @081407F8 +@081405E0: lsls r0, 2 - ldr r1, =_081405F4 + ldr r1, =@081405F4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081405F4: - .4byte _08140618 - .4byte _08140630 - .4byte _08140650 - .4byte _08140662 - .4byte _0814069C - .4byte _081406C0 - .4byte _081406E0 - .4byte _08140750 - .4byte _0814077A -_08140618: +@081405F4: + .4byte @08140618 + .4byte @08140630 + .4byte @08140650 + .4byte @08140662 + .4byte @0814069C + .4byte @081406C0 + .4byte @081406E0 + .4byte @08140750 + .4byte @0814077A +@08140618: movs r0, 0 bl SetVBlankCallback bl remove_some_task bl vblank_hblank_handler_set_zero bl sub_8121DA0 bl sub_8121E10 - b _081407F8 -_08140630: + b @081407F8 +@08140630: bl sub_8140388 bl TextBox_ResetSomeField movs r1, 0x90 @@ -616550,16 +616550,16 @@ _08140630: ldr r1, =0x0000060a movs r0, 0x52 bl lcd_io_set - b _081407F8 + b @081407F8 .align 2, 0 .pool -_08140650: +@08140650: bl sub_80A1A74 bl reset_all_obj_data bl clear_tasks bl reset_temp_tile_data_buffers - b _081407F8 -_08140662: + b @081407F8 +@08140662: ldr r0, =0x085b5bfc movs r2, 0xE0 lsls r2, 1 @@ -616578,26 +616578,26 @@ _08140662: movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - b _081407F8 + b @081407F8 .align 2, 0 .pool -_0814069C: +@0814069C: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - beq _081406A8 - b _08140806 -_081406A8: + beq @081406A8 + b @08140806 +@081406A8: bl sub_8140470 ldr r1, =0x085b5fa0 movs r0, 0x2 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map - b _081407F8 + b @081407F8 .align 2, 0 .pool -_081406C0: +@081406C0: movs r0, 0 bl sub_8142C0C bl sub_81439C8 @@ -616606,8 +616606,8 @@ _081406C0: bl sub_8142CD0 bl sub_8142F7C bl sub_81431E4 - b _081407F8 -_081406E0: + b @081407F8 +@081406E0: bl call_obj_callbacks bl obj_sync_something bl sub_8145C30 @@ -616645,10 +616645,10 @@ _081406E0: strh r0, [r1] ldr r0, =0x02021bbe strh r5, [r0] - b _081407F8 + b @081407F8 .align 2, 0 .pool -_08140750: +@08140750: movs r1, 0x82 lsls r1, 5 movs r0, 0 @@ -616663,8 +616663,8 @@ _08140750: bl gpu_sync_bg_show movs r0, 0x2 bl gpu_sync_bg_show - b _081407F8 -_0814077A: + b @081407F8 +@0814077A: movs r0, 0x1 bl enable_irqs ldr r0, =sub_8140264 + 1 @@ -616706,10 +616706,10 @@ _0814077A: strb r0, [r1] ldr r0, =sub_8140238 + 1 bl set_callback2 - b _08140806 + b @08140806 .align 2, 0 .pool -_081407F8: +@081407F8: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -616717,7 +616717,7 @@ _081407F8: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_08140806: +@08140806: add sp, 0xC pop {r4,r5} pop {r0} @@ -616727,7 +616727,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] @@ -616743,7 +616743,7 @@ sub_8140814: @ 8140814 adds r6, r3, 0 ldrb r0, [r0] cmp r2, r0 - bne _0814085A + bne @0814085A adds r1, 0x21 movs r0, 0 strb r0, [r1] @@ -616756,14 +616756,14 @@ sub_8140814: @ 8140814 strh r0, [r2, 0x24] lsls r0, 16 cmp r0, 0 - bge _0814085A + bge @0814085A ldrb r1, [r3] movs r3, 0xB4 lsls r3, 1 adds r0, r3, 0 subs r0, r1 strh r0, [r2, 0x24] -_0814085A: +@0814085A: adds r4, r6, 0 ldr r0, [r4] ldrh r0, [r0, 0x24] @@ -616778,18 +616778,18 @@ _0814085A: lsls r0, r5, 16 asrs r0, 16 cmp r0, 0 - bge _0814087E + bge @0814087E adds r0, 0xF -_0814087E: +@0814087E: lsls r0, 12 lsrs r5, r0, 16 ldr r3, [r6] lsls r0, r1, 16 asrs r0, 16 cmp r0, 0 - bge _0814088E + bge @0814088E adds r0, 0xF -_0814088E: +@0814088E: asrs r0, 4 strh r0, [r3, 0x32] strh r0, [r3, 0x2C] @@ -616806,7 +616806,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 @@ -616814,7 +616814,7 @@ sub_81408A8: @ 81408A8 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _081408FE + bne @081408FE movs r1, 0x90 lsls r1, 6 movs r0, 0x50 @@ -616841,7 +616841,7 @@ sub_81408A8: @ 81408A8 adds r0, r4, 0 movs r3, 0x3 bl sub_8141F7C -_081408FE: +@081408FE: pop {r4,r5} pop {r0} bx r0 @@ -616850,7 +616850,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 @@ -616887,7 +616887,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 @@ -616910,7 +616910,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 @@ -616930,7 +616930,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} @@ -616938,35 +616938,35 @@ sub_81409B8: @ 81409B8 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bls _081409CA - b _08140AE8 -_081409CA: + bls @081409CA + b @08140AE8 +@081409CA: lsls r0, r4, 2 - ldr r1, =_081409D8 + ldr r1, =@081409D8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081409D8: - .4byte _08140A18 - .4byte _08140A3C - .4byte _08140A3C - .4byte _08140A3C - .4byte _08140A3C - .4byte _08140A90 - .4byte _08140AE8 - .4byte _08140AE8 - .4byte _08140AE8 - .4byte _08140AE8 - .4byte _08140A90 - .4byte _08140AE8 - .4byte _08140AE8 - .4byte _08140AE8 - .4byte _08140AE8 - .4byte _08140A90 -_08140A18: +@081409D8: + .4byte @08140A18 + .4byte @08140A3C + .4byte @08140A3C + .4byte @08140A3C + .4byte @08140A3C + .4byte @08140A90 + .4byte @08140AE8 + .4byte @08140AE8 + .4byte @08140AE8 + .4byte @08140AE8 + .4byte @08140A90 + .4byte @08140AE8 + .4byte @08140AE8 + .4byte @08140AE8 + .4byte @08140AE8 + .4byte @08140A90 +@08140A18: ldr r0, =0x0203ab88 ldr r0, [r0] movs r1, 0xBE @@ -616980,10 +616980,10 @@ _08140A18: movs r2, 0xE movs r3, 0x7 bl sub_8152008 - b _08140B4E + b @08140B4E .align 2, 0 .pool -_08140A3C: +@08140A3C: lsls r0, r4, 1 adds r0, r4 adds r0, 0xE @@ -617017,10 +617017,10 @@ _08140A3C: mov r2, r8 movs r3, 0x7 bl sub_8152058 - b _08140B4E + b @08140B4E .align 2, 0 .pool -_08140A90: +@08140A90: subs r0, r4, 0x1 movs r1, 0x5 bl __divsi3 @@ -617057,10 +617057,10 @@ _08140A90: movs r2, 0xE adds r3, r7, 0 bl sub_8152058 - b _08140B4E + b @08140B4E .align 2, 0 .pool -_08140AE8: +@08140AE8: adds r0, r4, 0 movs r1, 0x5 bl __umodsi3 @@ -617108,7 +617108,7 @@ _08140AE8: mov r2, r8 adds r3, r7, 0 bl sub_8152058 -_08140B4E: +@08140B4E: add sp, 0x8 pop {r3} mov r8, r3 @@ -617120,7 +617120,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 @@ -617141,7 +617141,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 @@ -617174,7 +617174,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 @@ -617184,7 +617184,7 @@ sub_8140BD0: @ 8140BD0 movs r0, 0x20 ands r0, r2 cmp r0, 0 - beq _08140C30 + beq @08140C30 movs r3, 0xB ldr r5, =0x085b6154 adds r0, r5, 0 @@ -617195,10 +617195,10 @@ sub_8140BD0: @ 8140BD0 mov r12, r0 lsls r7, r6, 2 cmp r2, 0 - beq _08140C6E + beq @08140C6E adds r4, r1, 0 adds r5, 0x8 -_08140BFE: +@08140BFE: lsls r0, r3, 16 movs r1, 0x80 lsls r1, 9 @@ -617206,7 +617206,7 @@ _08140BFE: lsrs r3, r0, 16 asrs r2, r0, 16 cmp r2, 0xD - bgt _08140C6E + bgt @08140C6E ldr r1, [r4] lsls r0, r2, 2 adds r0, r2 @@ -617216,11 +617216,11 @@ _08140BFE: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _08140BFE - b _08140C6E + bne @08140BFE + b @08140C6E .align 2, 0 .pool -_08140C30: +@08140C30: movs r3, 0x6 ldr r5, =0x085b6154 adds r0, r5, 0 @@ -617231,10 +617231,10 @@ _08140C30: mov r12, r0 lsls r7, r6, 2 cmp r2, 0 - beq _08140C6E + beq @08140C6E adds r4, r1, 0 adds r5, 0x8 -_08140C4A: +@08140C4A: lsls r0, r3, 16 movs r1, 0x80 lsls r1, 9 @@ -617242,7 +617242,7 @@ _08140C4A: lsrs r3, r0, 16 asrs r2, r0, 16 cmp r2, 0x9 - bgt _08140C6E + bgt @08140C6E ldr r1, [r4] lsls r0, r2, 2 adds r0, r2 @@ -617252,8 +617252,8 @@ _08140C4A: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _08140C4A -_08140C6E: + bne @08140C4A +@08140C6E: adds r4, r7, r6 lsls r4, 3 add r4, r12 @@ -617278,7 +617278,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} @@ -617295,9 +617295,9 @@ sub_8140CA8: @ 8140CA8 ldrb r0, [r4] mov r8, r0 cmp r5, 0 - blt _08140D1C + blt @08140D1C cmp r5, 0x1 - bgt _08140CF4 + bgt @08140CF4 movs r1, 0 ldrsh r0, [r4, r1] movs r1, 0x5 @@ -617309,14 +617309,14 @@ sub_8140CA8: @ 8140CA8 adds r1, r0, r2 lsrs r7, r1, 24 cmp r0, 0 - bne _08140D1C + bne @08140D1C movs r6, 0x5 - b _08140D1C + b @08140D1C .align 2, 0 .pool -_08140CF4: +@08140CF4: cmp r5, 0x3 - bgt _08140D1C + bgt @08140D1C movs r1, 0 ldrsh r0, [r4, r1] movs r1, 0x5 @@ -617332,9 +617332,9 @@ _08140CF4: adds r0, r1, r2 lsrs r7, r0, 24 cmp r1, 0 - bne _08140D1C + bne @08140D1C movs r6, 0x1 -_08140D1C: +@08140D1C: mov r1, sp adds r0, r1, r5 ldrb r0, [r0] @@ -617349,29 +617349,29 @@ _08140D1C: asrs r0, 16 lsls r2, r7, 24 cmp r0, r3 - bge _08140D3E + bge @08140D3E asrs r0, r2, 24 strh r0, [r4] -_08140D3E: +@08140D3E: movs r0, 0 ldrsh r1, [r4, r0] asrs r0, r2, 24 cmp r1, r0 - ble _08140D4A + ble @08140D4A strh r3, [r4] -_08140D4A: +@08140D4A: mov r1, r8 lsls r0, r1, 24 movs r2, 0 ldrsh r1, [r4, r2] asrs r0, 24 cmp r1, r0 - bne _08140D5C + bne @08140D5C movs r0, 0 - b _08140D5E -_08140D5C: + b @08140D5E +@08140D5C: movs r0, 0x1 -_08140D5E: +@08140D5E: add sp, 0x4 pop {r3} mov r8, r3 @@ -617381,7 +617381,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 @@ -617397,7 +617397,7 @@ sub_8140D6C: @ 8140D6C movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _08140DA8 + beq @08140DA8 movs r5, 0x1 lsls r0, r7, 2 adds r0, r7 @@ -617409,14 +617409,14 @@ sub_8140D6C: @ 8140D6C bl sub_8140CA8 lsls r0, 24 cmp r0, 0 - bne _08140DA8 - b _08140F3A -_08140DA8: + bne @08140DA8 + b @08140F3A +@08140DA8: ldrh r1, [r4, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08140DCE + beq @08140DCE movs r5, 0x1 lsls r0, r7, 2 adds r0, r7 @@ -617428,14 +617428,14 @@ _08140DA8: bl sub_8140CA8 lsls r0, 24 cmp r0, 0 - bne _08140DCE - b _08140F3A -_08140DCE: + bne @08140DCE + b @08140F3A +@08140DCE: ldrh r1, [r4, 0x2E] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _08140DF4 + beq @08140DF4 movs r5, 0x1 lsls r0, r7, 2 adds r0, r7 @@ -617447,14 +617447,14 @@ _08140DCE: bl sub_8140CA8 lsls r0, 24 cmp r0, 0 - bne _08140DF4 - b _08140F3A -_08140DF4: + bne @08140DF4 + b @08140F3A +@08140DF4: ldrh r1, [r4, 0x2E] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08140E1A + beq @08140E1A movs r5, 0x1 lsls r0, r7, 2 adds r0, r7 @@ -617466,13 +617466,13 @@ _08140DF4: bl sub_8140CA8 lsls r0, 24 cmp r0, 0 - bne _08140E1A - b _08140F3A -_08140E1A: + bne @08140E1A + b @08140F3A +@08140E1A: cmp r5, 0 - bne _08140E20 - b _08140F3A -_08140E20: + bne @08140E20 + b @08140F3A +@08140E20: ldr r0, =0x03005e00 lsls r6, r7, 2 adds r4, r6, r7 @@ -617522,7 +617522,7 @@ _08140E20: movs r2, 0x8 add r2, r12 mov r10, r2 -_08140E8C: +@08140E8C: ldr r0, =0x0203ab88 ldr r5, [r0] adds r0, r4, 0 @@ -617557,7 +617557,7 @@ _08140E8C: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _08140E8C + bls @08140E8C ldr r0, =0x03005e00 mov r2, r9 adds r1, r2, r7 @@ -617568,7 +617568,7 @@ _08140E8C: lsls r0, 16 lsrs r0, 16 cmp r0, 0x3 - bhi _08140F3A + bhi @08140F3A ldr r2, =0x085b6154 movs r0, 0x10 ldrsh r1, [r1, r0] @@ -617581,7 +617581,7 @@ _08140E8C: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _08140F3A + bne @08140F3A subs r0, r3, 0x1 lsls r0, 24 lsrs r0, 24 @@ -617610,7 +617610,7 @@ _08140E8C: ands r0, r2 orrs r0, r1 strh r0, [r3, 0x4] -_08140F3A: +@08140F3A: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -617623,7 +617623,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 @@ -617634,18 +617634,18 @@ sub_8140F6C: @ 8140F6C strh r0, [r1, 0x28] ldrb r2, [r1, 0x19] cmp r2, 0x1 - bne _08140F90 + bne @08140F90 adds r0, r1, 0 adds r0, 0x23 strb r2, [r0] - b _08140F96 + b @08140F96 .align 2, 0 .pool -_08140F90: +@08140F90: adds r1, 0x23 movs r0, 0 strb r0, [r1] -_08140F96: +@08140F96: ldr r0, =0x0203ab88 ldr r0, [r0] adds r0, 0x21 @@ -617668,7 +617668,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 @@ -617712,10 +617712,10 @@ sub_8140FC4: @ 8140FC4 strh r0, [r5, 0x22] lsls r0, 16 cmp r0, 0 - bge _08141024 + bge @08141024 movs r0, 0 strh r0, [r5, 0x22] -_08141024: +@08141024: ldrh r0, [r5, 0x22] bl sub_8143514 ldr r0, =sub_8140F6C + 1 @@ -617728,7 +617728,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 @@ -617742,34 +617742,34 @@ sub_8141040: @ 8141040 movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0x1E - beq _08141076 + beq @08141076 cmp r0, 0x1E - bgt _0814106C + bgt @0814106C cmp r0, 0 - beq _08141072 - b _0814108A + beq @08141072 + b @0814108A .align 2, 0 .pool -_0814106C: +@0814106C: cmp r0, 0x3B - beq _08141084 - b _0814108A -_08141072: + beq @08141084 + b @0814108A +@08141072: ldrb r0, [r4, 0x10] - b _08141078 -_08141076: + b @08141078 +@08141076: movs r0, 0 -_08141078: +@08141078: bl sub_81409B8 ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] - b _0814109A -_08141084: + b @0814109A +@08141084: movs r0, 0 strh r0, [r4, 0xA] - b _0814109A -_0814108A: + b @0814109A +@0814108A: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -617778,13 +617778,13 @@ _0814108A: ldrh r0, [r1, 0xA] adds r0, 0x1 strh r0, [r1, 0xA] -_0814109A: +@0814109A: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081410F2 + beq @081410F2 ldr r0, =0x0203ab88 ldr r3, [r0] ldr r2, =0x085b6154 @@ -617804,18 +617804,18 @@ _0814109A: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _081410E8 + beq @081410E8 movs r0, 0x16 bl audio_play - b _081410F2 + b @081410F2 .align 2, 0 .pool -_081410E8: +@081410E8: movs r0, 0x5F bl m4aSongNumStart ldr r0, =sub_8140FC4 + 1 str r0, [r4] -_081410F2: +@081410F2: pop {r4,r5} pop {r0} bx r0 @@ -617824,7 +617824,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 @@ -617838,16 +617838,16 @@ sub_81410FC: @ 81410FC strh r1, [r4, 0xA] lsls r0, 16 cmp r0, 0 - ble _08141168 + ble @08141168 lsls r0, r1, 16 asrs r0, 16 cmp r0, 0x2 - ble _08141128 + ble @08141128 ldr r1, =0x02021bbc ldrh r0, [r1] adds r0, 0x2 strh r0, [r1] -_08141128: +@08141128: ldr r0, =0x0203ab88 ldr r1, [r0] ldrh r0, [r1, 0x26] @@ -617856,7 +617856,7 @@ _08141128: lsls r0, 16 asrs r0, 16 cmp r0, 0x68 - bne _08141180 + bne @08141180 ldr r2, =0x02020630 adds r0, r1, 0 adds r0, 0x55 @@ -617868,10 +617868,10 @@ _08141128: adds r0, r2 ldr r1, =nullsub_12 + 1 str r1, [r0] - b _08141180 + b @08141180 .align 2, 0 .pool -_08141168: +@08141168: movs r0, 0x1 movs r1, 0xFF bl sub_8142E70 @@ -617882,7 +617882,7 @@ _08141168: str r0, [r4] movs r0, 0 strh r0, [r4, 0xA] -_08141180: +@08141180: pop {r4} pop {r0} bx r0 @@ -617891,7 +617891,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 @@ -617902,31 +617902,31 @@ sub_814118C: @ 814118C ldrb r2, [r3, 0x2] adds r5, r0, 0 cmp r2, 0x2 - bgt _081411AC + bgt @081411AC cmp r2, 0x1 - bge _081411B2 - b _08141280 + bge @081411B2 + b @08141280 .align 2, 0 .pool -_081411AC: +@081411AC: cmp r2, 0x3 - beq _08141214 - b _08141280 -_081411B2: + beq @08141214 + b @08141280 +@081411B2: ldr r0, =0x03005cf8 ldrb r0, [r0, 0x2] subs r0, 0x4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 - bhi _081411E4 + bhi @081411E4 cmp r4, 0xB - bls _081411CC + bls @081411CC movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08141296 -_081411CC: + beq @08141296 +@081411CC: ldr r0, =0x085b6348 ldrb r1, [r3, 0x4] lsls r1, 30 @@ -617934,14 +617934,14 @@ _081411CC: adds r1, r0 ldrb r0, [r1, 0x2] lsrs r0, 1 - b _0814133A + b @0814133A .align 2, 0 .pool -_081411E4: +@081411E4: movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne _08141200 + bne @08141200 ldr r0, =0x085b6348 ldrb r1, [r3, 0x4] lsls r1, 30 @@ -617949,34 +617949,34 @@ _081411E4: adds r1, r0 ldrb r0, [r1, 0x2] lsrs r0, 1 - b _0814133A + b @0814133A .align 2, 0 .pool -_08141200: +@08141200: ldr r0, =0x085b6348 ldrb r1, [r3, 0x4] lsls r1, 30 lsrs r1, 25 adds r1, r0 ldrb r0, [r1, 0x2] - b _0814133A + b @0814133A .align 2, 0 .pool -_08141214: +@08141214: ldr r0, =0x03005cf8 ldrb r0, [r0, 0x2] subs r0, 0x4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x6 - bhi _08141248 + bhi @08141248 cmp r4, 0x5 - bls _0814122E + bls @0814122E movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08141296 -_0814122E: + beq @08141296 +@0814122E: ldr r0, =0x085b6348 ldrb r1, [r3, 0x4] lsls r1, 30 @@ -617984,16 +617984,16 @@ _0814122E: adds r1, r0 ldrb r0, [r1, 0x2] lsrs r0, 1 - b _0814133A + b @0814133A .align 2, 0 .pool -_08141248: +@08141248: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08141268 + beq @08141268 cmp r4, 0x6 - bls _08141268 + bls @08141268 ldr r0, =0x085b6348 ldrb r1, [r3, 0x4] lsls r1, 30 @@ -618001,10 +618001,10 @@ _08141248: adds r1, r0 ldrb r0, [r1, 0x2] lsrs r0, 2 - b _0814133A + b @0814133A .align 2, 0 .pool -_08141268: +@08141268: ldr r1, =0x085b6348 ldr r0, [r5] ldrb r0, [r0, 0x4] @@ -618013,27 +618013,27 @@ _08141268: adds r0, r1 ldrb r0, [r0, 0x2] lsrs r0, 1 - b _0814133A + b @0814133A .align 2, 0 .pool -_08141280: +@08141280: ldr r0, =0x03005cf8 ldrb r0, [r0, 0x2] subs r0, 0x4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 - bhi _081412B8 + bhi @081412B8 movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne _081412A0 -_08141296: + bne @081412A0 +@08141296: movs r0, 0x1 - b _0814133A + b @0814133A .align 2, 0 .pool -_081412A0: +@081412A0: ldr r1, =0x085b6348 ldr r0, [r5] ldrb r0, [r0, 0x4] @@ -618042,16 +618042,16 @@ _081412A0: adds r0, r1 ldrb r0, [r0, 0x2] lsrs r0, 1 - b _0814133A + b @0814133A .align 2, 0 .pool -_081412B8: +@081412B8: movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne _081412F0 + bne @081412F0 cmp r4, 0xC - bls _081412DC + bls @081412DC ldr r1, =0x085b6348 ldr r0, [r5] ldrb r0, [r0, 0x4] @@ -618060,10 +618060,10 @@ _081412B8: adds r0, r1 ldrb r0, [r0, 0x2] lsrs r0, 1 - b _0814133A + b @0814133A .align 2, 0 .pool -_081412DC: +@081412DC: ldr r1, =0x085b6348 ldr r0, [r5] ldrb r0, [r0, 0x4] @@ -618071,17 +618071,17 @@ _081412DC: lsrs r0, 25 adds r0, r1 ldrb r0, [r0, 0x2] - b _0814133A + b @0814133A .align 2, 0 .pool -_081412F0: +@081412F0: movs r0, 0x80 lsls r0, 8 ands r0, r1 cmp r0, 0 - beq _08141328 + beq @08141328 cmp r4, 0xC - bls _08141314 + bls @08141314 ldr r1, =0x085b6348 ldr r0, [r5] ldrb r0, [r0, 0x4] @@ -618089,10 +618089,10 @@ _081412F0: lsrs r0, 25 adds r0, r1 ldrb r0, [r0, 0x2] - b _0814133A + b @0814133A .align 2, 0 .pool -_08141314: +@08141314: ldr r1, =0x085b6348 ldr r0, [r5] ldrb r0, [r0, 0x4] @@ -618100,10 +618100,10 @@ _08141314: lsrs r0, 25 adds r0, r1 ldrb r0, [r0, 0x1] - b _0814133A + b @0814133A .align 2, 0 .pool -_08141328: +@08141328: ldr r1, =0x085b6348 ldr r0, [r5] ldrb r0, [r0, 0x4] @@ -618113,7 +618113,7 @@ _08141328: ldrb r0, [r0, 0x1] lsls r0, 25 lsrs r0, 24 -_0814133A: +@0814133A: pop {r4,r5} pop {r1} bx r1 @@ -618122,7 +618122,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 @@ -618182,22 +618182,22 @@ sub_8141344: @ 8141344 asrs r0, 24 movs r5, 0x1 cmp r0, 0xC - bgt _081413C8 + bgt @081413C8 movs r5, 0 -_081413C8: +@081413C8: cmp r6, 0x4F - bhi _081413E0 + bhi @081413E0 lsls r0, r5, 25 - b _081413EA + b @081413EA .align 2, 0 .pool -_081413E0: +@081413E0: lsls r1, r5, 24 asrs r1, 24 movs r0, 0x1 subs r0, r1 lsls r0, 25 -_081413EA: +@081413EA: lsrs r5, r0, 24 ldr r0, =0x0203ab88 ldr r6, [r0] @@ -618218,10 +618218,10 @@ _081413EA: adds r0, r4, 0 bl __floatsisf cmp r4, 0 - bge _0814141C + bge @0814141C ldr r1, =0x47800000 bl __addsf3 -_0814141C: +@0814141C: ldr r1, =0x40a00000 bl __divsf3 bl __fixunssfsi @@ -618253,10 +618253,10 @@ _0814141C: adds r0, r4, 0 bl __floatsisf cmp r4, 0 - bge _08141468 + bge @08141468 ldr r1, =0x47800000 bl __addsf3 -_08141468: +@08141468: mov r2, r9 str r0, [r2] adds r7, r6, 0 @@ -618272,11 +618272,11 @@ _08141468: bl __floatsisf adds r5, r0, 0 cmp r4, 0 - bge _08141492 + bge @08141492 ldr r1, =0x47800000 bl __addsf3 adds r5, r0, 0 -_08141492: +@08141492: str r5, [r7] adds r7, r6, 0 adds r7, 0x90 @@ -618293,11 +618293,11 @@ _08141492: bl __floatsisf adds r2, r0, 0 cmp r4, 0 - bge _081414C2 + bge @081414C2 ldr r1, =0x47800000 bl __addsf3 adds r2, r0, 0 -_081414C2: +@081414C2: adds r0, r5, 0 adds r1, r2, 0 bl __divsf3 @@ -618318,11 +618318,11 @@ _081414C2: bl __floatsisf adds r2, r0, 0 cmp r4, 0 - bge _081414F8 + bge @081414F8 ldr r1, =0x47800000 bl __addsf3 adds r2, r0, 0 -_081414F8: +@081414F8: ldr r0, =0x41000000 adds r1, r2, 0 bl __divsf3 @@ -618353,7 +618353,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 @@ -618407,7 +618407,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 @@ -618417,16 +618417,16 @@ sub_81415D4: @ 81415D4 adds r0, 0x7D ldrb r0, [r0] cmp r0, 0 - beq _081416C6 + beq @081416C6 ldrb r1, [r3, 0x3] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _08141614 + beq @08141614 movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _081416C6 + beq @081416C6 movs r0, 0x41 negs r0, r0 ands r0, r1 @@ -618437,10 +618437,10 @@ sub_81415D4: @ 81415D4 negs r0, r0 ands r0, r1 strb r0, [r2, 0x3] - b _081416C6 + b @081416C6 .align 2, 0 .pool -_08141614: +@08141614: ldr r2, =0x03005e00 lsls r1, r4, 2 adds r0, r1, r4 @@ -618450,7 +618450,7 @@ _08141614: ldrsh r0, [r5, r2] adds r7, r1, 0 cmp r0, 0 - bne _08141660 + bne @08141660 adds r0, r3, 0 adds r0, 0x7E ldrb r1, [r0] @@ -618470,13 +618470,13 @@ _08141614: lsrs r0, 24 strh r0, [r5, 0x12] cmp r0, 0x1 - bne _08141660 + bne @08141660 ldr r0, [r6] adds r0, 0xB8 movs r1, 0x80 lsls r1, 5 bl sub_8151A48 -_08141660: +@08141660: ldr r0, =0x03005e00 adds r1, r7, r4 lsls r1, 3 @@ -618484,23 +618484,23 @@ _08141660: movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0x3C - bgt _08141690 + bgt @08141690 ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08141680 + beq @08141680 movs r0, 0x3C strh r0, [r4, 0xA] -_08141680: +@08141680: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] - b _081416C6 + b @081416C6 .align 2, 0 .pool -_08141690: +@08141690: ldr r0, =0x0203ab88 ldr r1, [r0] ldrb r0, [r1, 0x1A] @@ -618525,7 +618525,7 @@ _08141690: strh r0, [r4, 0xA] ldr r0, =sub_81416D4 + 1 str r0, [r4] -_081416C6: +@081416C6: pop {r4-r7} pop {r0} bx r0 @@ -618534,7 +618534,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 @@ -618548,16 +618548,16 @@ sub_81416D4: @ 81416D4 strh r1, [r4, 0xA] lsls r0, 16 cmp r0, 0 - ble _08141740 + ble @08141740 lsls r0, r1, 16 asrs r0, 16 cmp r0, 0x2 - ble _08141700 + ble @08141700 ldr r1, =0x02021bbc ldrh r0, [r1] subs r0, 0x2 strh r0, [r1] -_08141700: +@08141700: ldr r0, =0x0203ab88 ldr r1, [r0] ldrh r0, [r1, 0x26] @@ -618566,7 +618566,7 @@ _08141700: lsls r0, 16 asrs r0, 16 cmp r0, 0x68 - bne _08141768 + bne @08141768 ldr r2, =0x02020630 adds r0, r1, 0 adds r0, 0x55 @@ -618578,10 +618578,10 @@ _08141700: adds r0, r2 ldr r1, =sub_814390C + 1 str r1, [r0] - b _08141768 + b @08141768 .align 2, 0 .pool -_08141740: +@08141740: ldrh r0, [r4, 0x20] lsls r0, 24 lsrs r0, 24 @@ -618589,12 +618589,12 @@ _08141740: movs r1, 0x12 ldrsh r0, [r4, r1] cmp r0, 0x1 - bne _08141756 + bne @08141756 movs r0, 0x79 - b _08141758 -_08141756: + b @08141758 +@08141756: movs r0, 0x3D -_08141758: +@08141758: strh r0, [r4, 0xA] ldr r0, =0x03005e00 lsls r1, r5, 2 @@ -618603,7 +618603,7 @@ _08141758: adds r1, r0 ldr r0, =sub_8141778 + 1 str r0, [r1] -_08141768: +@08141768: pop {r4,r5} pop {r0} bx r0 @@ -618612,7 +618612,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 @@ -618627,33 +618627,33 @@ sub_8141778: @ 8141778 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _081417E8 + ble @081417E8 movs r0, 0xA ldrsh r1, [r4, r0] adds r0, r1, 0 cmp r1, 0 - bge _081417A2 + bge @081417A2 adds r0, 0xF -_081417A2: +@081417A2: asrs r0, 4 lsls r0, 4 subs r0, r1, r0 lsls r0, 16 asrs r0, 16 cmp r0, 0 - beq _081417CC + beq @081417CC cmp r0, 0x8 - bne _081417F4 + bne @081417F4 movs r0, 0 movs r1, 0xFF bl sub_8142E70 movs r0, 0 movs r1, 0xFF bl sub_8143038 - b _081417F4 + b @081417F4 .align 2, 0 .pool -_081417CC: +@081417CC: ldrh r1, [r4, 0x20] lsls r1, 24 lsrs r1, 24 @@ -618665,14 +618665,14 @@ _081417CC: lsrs r1, 24 movs r0, 0 bl sub_8143038 - b _081417F4 -_081417E8: + b @081417F4 +@081417E8: ldr r1, =sub_814189C + 1 adds r0, r2, 0 movs r2, 0x1E movs r3, 0 bl sub_8141F7C -_081417F4: +@081417F4: pop {r4} pop {r0} bx r0 @@ -618681,7 +618681,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 @@ -618693,15 +618693,15 @@ sub_8141800: @ 8141800 movs r1, 0x12 ldrsh r0, [r4, r1] cmp r0, 0 - beq _08141864 + beq @08141864 cmp r0, 0 - blt _08141864 + blt @08141864 cmp r0, 0x2 - bgt _08141864 + bgt @08141864 bl task_is_not_running_overworld_fanfare lsls r0, 24 cmp r0, 0 - beq _08141888 + beq @08141888 movs r0, 0x1D bl sub_80847F8 ldrh r1, [r4, 0x1E] @@ -618710,26 +618710,26 @@ sub_8141800: @ 8141800 lsls r1, 16 asrs r1, 16 cmp r0, r1 - bcs _08141848 + bcs @08141848 movs r0, 0x1E ldrsh r1, [r4, r0] movs r0, 0x1D bl sav12_xor_set -_08141848: +@08141848: ldr r1, =sub_8141A18 + 1 ldr r2, =0x0000ffff adds r0, r5, 0 movs r3, 0x3 bl sub_8141F7C - b _08141888 + b @08141888 .align 2, 0 .pool -_08141864: +@08141864: bl mplay_has_finished_maybe lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - bne _08141888 + bne @08141888 ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -618741,7 +618741,7 @@ _08141864: adds r0, r5, 0 movs r3, 0x3 bl sub_8141F7C -_08141888: +@08141888: pop {r4,r5} pop {r0} bx r0 @@ -618750,7 +618750,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 @@ -618763,15 +618763,15 @@ sub_814189C: @ 814189C movs r2, 0x12 ldrsh r1, [r0, r2] cmp r1, 0 - beq _08141928 + beq @08141928 cmp r1, 0 - blt _08141928 + blt @08141928 cmp r1, 0x2 - bgt _08141928 + bgt @08141928 movs r1, 0xC ldrsh r0, [r0, r1] cmp r0, 0xC - bne _081418EC + bne @081418EC ldr r0, =0x00000185 bl fanfare_play ldr r4, =0x0203ab8c @@ -618780,10 +618780,10 @@ sub_814189C: @ 814189C bl sub_81973FC ldrb r0, [r4] ldr r2, =0x082a5bd7 - b _08141902 + b @08141902 .align 2, 0 .pool -_081418EC: +@081418EC: movs r0, 0xC3 lsls r0, 1 bl fanfare_play @@ -618793,7 +618793,7 @@ _081418EC: bl sub_81973FC ldrb r0, [r4] ldr r2, =0x082a5bcb -_08141902: +@08141902: movs r1, 0x1 str r1, [sp] movs r1, 0xFF @@ -618806,10 +618806,10 @@ _08141902: ldrb r0, [r4] movs r1, 0x3 bl Window_CopyToVram - b _08141958 + b @08141958 .align 2, 0 .pool -_08141928: +@08141928: movs r0, 0x20 bl m4aSongNumStart ldr r4, =0x0203ab8c @@ -618830,7 +618830,7 @@ _08141928: ldrb r0, [r4] movs r1, 0x3 bl Window_CopyToVram -_08141958: +@08141958: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -618849,7 +618849,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 @@ -618861,15 +618861,15 @@ sub_8141984: @ 8141984 movs r0, 0x16 ldrsh r5, [r4, r0] cmp r5, 0 - beq _081419AC + beq @081419AC cmp r5, 0x3 - beq _081419DC + beq @081419DC ldrh r0, [r4, 0x16] adds r0, 0x1 - b _081419E4 + b @081419E4 .align 2, 0 .pool -_081419AC: +@081419AC: ldrh r0, [r4, 0x22] adds r0, 0x1 strh r0, [r4, 0x22] @@ -618881,25 +618881,25 @@ _081419AC: ldrsh r1, [r4, r2] ldr r0, =0x0000270e cmp r1, r0 - ble _081419D0 + ble @081419D0 strh r5, [r4, 0xA] - b _081419E6 + b @081419E6 .align 2, 0 .pool -_081419D0: +@081419D0: ldrh r0, [r4, 0xA] subs r0, 0x1 strh r0, [r4, 0xA] ldrh r0, [r4, 0x16] adds r0, 0x1 - b _081419E4 -_081419DC: + b @081419E4 +@081419DC: movs r0, 0x15 bl m4aSongNumStop movs r0, 0 -_081419E4: +@081419E4: strh r0, [r4, 0x16] -_081419E6: +@081419E6: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -618908,13 +618908,13 @@ _081419E6: movs r2, 0xA ldrsh r0, [r1, r2] cmp r0, 0 - bne _08141A04 + bne @08141A04 ldr r1, =sub_8141AC0 + 1 ldr r2, =0x0000ffff adds r0, r6, 0 movs r3, 0x3 bl sub_8141F7C -_08141A04: +@08141A04: pop {r4-r6} pop {r0} bx r0 @@ -618923,7 +618923,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 @@ -618994,7 +618994,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 @@ -619063,7 +619063,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} @@ -619107,7 +619107,7 @@ sub_8141B58: @ 8141B58 mov r12, r0 ldr r1, =0xfffffc00 mov r8, r1 -_08141BB0: +@08141BB0: ldr r0, =0x0203ab88 ldr r4, [r0] adds r0, r4, r5 @@ -619137,7 +619137,7 @@ _08141BB0: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _08141BB0 + bls @08141BB0 ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -619147,11 +619147,11 @@ _08141BB0: ldrsh r0, [r2, r1] ldrb r4, [r4, 0x19] cmp r0, r4 - blt _08141CBC + blt @08141CBC movs r1, 0x14 ldrsh r0, [r2, r1] cmp r0, 0x6 - bne _08141C58 + bne @08141C58 ldr r4, =0x0203ab8c ldrb r0, [r4] movs r1, 0 @@ -619171,15 +619171,15 @@ _08141BB0: movs r1, 0x3 bl Window_CopyToVram ldr r1, =dp01t_12_3_battle_menu + 1 - b _08141C8E + b @08141C8E .align 2, 0 .pool -_08141C58: +@08141C58: movs r0, 0x22 ldrsh r1, [r2, r0] ldr r0, =0x0000270f cmp r1, r0 - bne _08141CB0 + bne @08141CB0 ldr r4, =0x0203ab8c ldrb r0, [r4] movs r1, 0 @@ -619199,21 +619199,21 @@ _08141C58: movs r1, 0x3 bl Window_CopyToVram ldr r1, =sub_8140914 + 1 -_08141C8E: +@08141C8E: ldr r2, =0x0000ffff adds r0, r6, 0 movs r3, 0x3 bl sub_8141F7C - b _08141CF2 + b @08141CF2 .align 2, 0 .pool -_08141CB0: +@08141CB0: ldr r0, =sub_8140914 + 1 str r0, [r2] - b _08141CF2 + b @08141CF2 .align 2, 0 .pool -_08141CBC: +@08141CBC: ldr r4, =0x0203ab8c ldrb r0, [r4] movs r1, 0 @@ -619237,7 +619237,7 @@ _08141CBC: movs r2, 0x3C movs r3, 0x3 bl sub_8141F7C -_08141CF2: +@08141CF2: add sp, 0xC pop {r3} mov r8, r3 @@ -619249,7 +619249,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 @@ -619273,7 +619273,7 @@ dp01t_12_3_battle_menu: @ 8141D0C ldr r3, =0x0203ab88 movs r6, 0x5 negs r6, r6 -_08141D44: +@08141D44: ldr r0, [r3] adds r0, r4 adds r0, 0x43 @@ -619291,7 +619291,7 @@ _08141D44: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xB - bls _08141D44 + bls @08141D44 ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -619301,7 +619301,7 @@ _08141D44: ldrsh r1, [r2, r0] ldr r0, =0x0000270f cmp r1, r0 - bne _08141DD4 + bne @08141DD4 ldr r4, =0x0203ab8c ldrb r0, [r4] movs r1, 0 @@ -619325,13 +619325,13 @@ _08141D44: adds r0, r5, 0 movs r3, 0x3 bl sub_8141F7C - b _08141DD8 + b @08141DD8 .align 2, 0 .pool -_08141DD4: +@08141DD4: ldr r0, =sub_8140914 + 1 str r0, [r2] -_08141DD8: +@08141DD8: add sp, 0xC pop {r4-r7} pop {r0} @@ -619341,7 +619341,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 @@ -619367,16 +619367,16 @@ sub_8141DE4: @ 8141DE4 lsrs r0, 16 ldrb r1, [r1, 0x19] cmp r0, r1 - bcs _08141E38 + bcs @08141E38 ldr r1, =0x020375e0 movs r0, 0x1 - b _08141E3C + b @08141E3C .align 2, 0 .pool -_08141E38: +@08141E38: ldr r1, =0x020375e0 movs r0, 0 -_08141E3C: +@08141E3C: strh r0, [r1] bl sub_8145C30 lsls r0, 16 @@ -619405,7 +619405,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 @@ -619413,7 +619413,7 @@ sub_8141E7C: @ 8141E7C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _08141EDE + bne @08141EDE movs r0, 0 bl SetVBlankCallback ldr r1, =0x02021bbc @@ -619442,7 +619442,7 @@ sub_8141E7C: @ 8141E7C bl set_callback2 adds r0, r5, 0 bl remove_task -_08141EDE: +@08141EDE: pop {r4,r5} pop {r0} bx r0 @@ -619451,7 +619451,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 @@ -619462,7 +619462,7 @@ sub_8141EF8: @ 8141EF8 ldrh r0, [r0] adds r5, r1, 0 cmp r0, 0 - beq _08141F1E + beq @08141F1E ldr r0, =0x030022c0 adds r2, r3, 0 adds r2, 0xAA @@ -619470,8 +619470,8 @@ sub_8141EF8: @ 8141EF8 ldrh r0, [r2] ands r0, r1 cmp r0, 0 - beq _08141F52 -_08141F1E: + beq @08141F52 +@08141F1E: ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -619485,10 +619485,10 @@ _08141F1E: adds r0, 0xAA ldrh r0, [r0] cmp r0, 0 - beq _08141F40 + beq @08141F40 movs r0, 0x5 bl audio_play -_08141F40: +@08141F40: ldr r2, [r5] adds r0, r2, 0 adds r0, 0xAC @@ -619498,17 +619498,17 @@ _08141F40: strh r1, [r0] subs r0, 0x2 strh r1, [r0] -_08141F52: +@08141F52: ldr r0, [r5] adds r1, r0, 0 adds r1, 0xA8 ldrh r2, [r1] ldr r0, =0x0000ffff cmp r2, r0 - beq _08141F64 + beq @08141F64 subs r0, r2, 0x1 strh r0, [r1] -_08141F64: +@08141F64: pop {r4,r5} pop {r0} bx r0 @@ -619517,7 +619517,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 @@ -619540,9 +619540,9 @@ sub_8141F7C: @ 8141F7C str r0, [r3] adds r3, r1, 0 cmp r5, 0 - bne _08141FAC + bne @08141FAC adds r5, r0, 0 -_08141FAC: +@08141FAC: mov r0, r12 adds r0, 0xAC str r5, [r0] @@ -619550,22 +619550,22 @@ _08141FAC: strh r4, [r0] ldr r0, =0x0000ffff cmp r4, r0 - bne _08141FD8 + bne @08141FD8 cmp r7, 0 - bne _08141FD8 + bne @08141FD8 mov r1, r12 adds r1, 0xAA ldrh r0, [r1] orrs r4, r0 strh r4, [r1] - b _08141FDE + b @08141FDE .align 2, 0 .pool -_08141FD8: +@08141FD8: ldr r0, [r2] adds r0, 0xAA strh r7, [r0] -_08141FDE: +@08141FDE: lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -619580,7 +619580,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 @@ -619614,7 +619614,7 @@ sub_8141FF4: @ 8141FF4 ldr r6, =0x03005e00 adds r2, r3, 0 movs r1, 0 -_08142036: +@08142036: ldr r0, [r2] adds r0, 0x1B adds r0, r4 @@ -619623,7 +619623,7 @@ _08142036: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls _08142036 + bls @08142036 ldr r2, [r3] ldrb r1, [r2, 0x1A] movs r0, 0x10 @@ -619644,7 +619644,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] @@ -619652,7 +619652,7 @@ sub_8142070: @ 8142070 str r0, [r1, 0x8] movs r1, 0 movs r3, 0 -_0814207E: +@0814207E: ldr r0, [r2] adds r0, 0xC adds r0, r1 @@ -619661,11 +619661,11 @@ _0814207E: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x5 - bls _0814207E + bls @0814207E movs r1, 0 ldr r3, =0x0203ab88 movs r2, 0 -_08142096: +@08142096: ldr r0, [r3] adds r0, 0x12 adds r0, r1 @@ -619674,11 +619674,11 @@ _08142096: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x3 - bls _08142096 + bls @08142096 movs r1, 0 ldr r3, =0x0203ab88 movs r2, 0 -_081420AE: +@081420AE: ldr r0, [r3] adds r0, 0x16 adds r0, r1 @@ -619687,7 +619687,7 @@ _081420AE: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x2 - bls _081420AE + bls @081420AE movs r0, 0x1 movs r1, 0xFF bl sub_8143038 @@ -619698,7 +619698,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 @@ -619721,12 +619721,12 @@ sub_81420D0: @ 81420D0 stm r1!, {r3,r6,r7} mov r8, r2 cmp r5, 0xB - bls _0814210C + bls @0814210C movs r0, 0 - b _081421C8 + b @081421C8 .align 2, 0 .pool -_0814210C: +@0814210C: ldr r6, =0x0203ab88 ldr r3, [r6] ldr r1, =0x03005e00 @@ -619755,79 +619755,79 @@ _0814210C: mov r9, r4 mov r12, r5 adds r5, r0, 0 -_08142144: +@08142144: lsls r0, r3, 2 mov r1, sp adds r4, r1, r0 ldr r0, [r4] ands r0, r5 cmp r0, 0 - beq _0814215E + beq @0814215E ldr r1, [r6] adds r1, 0x12 adds r1, r3 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_0814215E: +@0814215E: ldr r2, [r6] adds r0, r2, 0 adds r0, 0x12 adds r0, r3 ldrb r0, [r0] cmp r0, 0x2 - bls _08142174 + bls @08142174 ldr r0, [r2, 0x8] ldr r1, [r4] orrs r0, r1 str r0, [r2, 0x8] -_08142174: +@08142174: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3 - bls _08142144 + bls @08142144 movs r6, 0 ldr r0, =0x085b62e8 add r0, r12 ldr r7, [r0] ldr r4, =0x0203ab88 mov r5, r8 -_0814218A: +@0814218A: lsls r0, r6, 2 adds r2, r5, r0 ldr r0, [r2] ands r0, r7 cmp r0, 0 - beq _081421A2 + beq @081421A2 ldr r1, [r4] adds r1, 0x16 adds r1, r6 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_081421A2: +@081421A2: ldr r3, [r4] adds r0, r3, 0 adds r0, 0x16 adds r0, r6 ldrb r0, [r0] cmp r0, 0x3 - bls _081421B8 + bls @081421B8 ldr r0, [r3, 0x8] ldr r1, [r2] orrs r0, r1 str r0, [r3, 0x8] -_081421B8: +@081421B8: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x2 - bls _0814218A + bls @0814218A mov r0, r12 add r0, r9 ldrb r0, [r0, 0x2] -_081421C8: +@081421C8: add sp, 0x1C pop {r3,r4} mov r8, r3 @@ -619840,7 +619840,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 @@ -619851,70 +619851,70 @@ sub_81421E8: @ 81421E8 adds r0, r1 lsrs r0, 24 cmp r0, 0x12 - bhi _0814227C + bhi @0814227C cmp r2, 0xF - bhi _08142278 + bhi @08142278 lsls r0, r2, 2 - ldr r1, =_08142210 + ldr r1, =@08142210 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08142210: - .4byte _08142250 - .4byte _08142254 - .4byte _08142254 - .4byte _08142254 - .4byte _08142254 - .4byte _08142268 - .4byte _08142278 - .4byte _08142278 - .4byte _08142278 - .4byte _08142278 - .4byte _08142268 - .4byte _08142278 - .4byte _08142278 - .4byte _08142278 - .4byte _08142278 - .4byte _08142268 -_08142250: +@08142210: + .4byte @08142250 + .4byte @08142254 + .4byte @08142254 + .4byte @08142254 + .4byte @08142254 + .4byte @08142268 + .4byte @08142278 + .4byte @08142278 + .4byte @08142278 + .4byte @08142278 + .4byte @08142268 + .4byte @08142278 + .4byte @08142278 + .4byte @08142278 + .4byte @08142278 + .4byte @08142268 +@08142250: movs r0, 0x3 - b _0814227E -_08142254: + b @0814227E +@08142254: adds r0, r2, 0x5 cmp r3, r0 - beq _08142274 + beq @08142274 adds r0, 0x5 cmp r3, r0 - beq _08142274 + beq @08142274 adds r0, 0x5 cmp r3, r0 - bne _0814227C - b _08142274 -_08142268: + bne @0814227C + b @08142274 +@08142268: adds r0, r2, 0x1 cmp r3, r0 - blt _0814227C + blt @0814227C adds r0, r2, 0x4 cmp r3, r0 - bgt _0814227C -_08142274: + bgt @0814227C +@08142274: movs r0, 0x1 - b _0814227E -_08142278: + b @0814227E +@08142278: cmp r3, r2 - beq _08142274 -_0814227C: + beq @08142274 +@0814227C: movs r0, 0 -_0814227E: +@0814227E: pop {r1} bx r1 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 @@ -619926,16 +619926,16 @@ sub_8142284: @ 8142284 movs r0, 0 str r0, [sp, 0x18] cmp r7, 0xA - beq _081422AA + beq @081422AA cmp r7, 0xA - bgt _081422A6 + bgt @081422A6 cmp r7, 0x5 - beq _081422AA - b _0814230C -_081422A6: + beq @081422AA + b @0814230C +@081422A6: cmp r7, 0xF - bne _0814230C -_081422AA: + bne @0814230C +@081422AA: adds r0, r7, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -619943,13 +619943,13 @@ _081422AA: ldr r1, =0x0203ab88 mov r12, r1 cmp r4, r2 - bge _081422E8 + bge @081422E8 ldr r0, [r1] ldr r3, =0x085b6154 ldr r5, [r0, 0x8] adds r6, r3, 0 adds r6, 0x8 -_081422C4: +@081422C4: lsls r0, r4, 2 adds r0, r4 lsls r1, r0, 2 @@ -619957,19 +619957,19 @@ _081422C4: ldr r0, [r0] ands r0, r5 cmp r0, 0 - bne _081422DE + bne @081422DE adds r0, r1, r3 ldrh r0, [r0, 0x10] ldr r1, [sp, 0x18] orrs r1, r0 str r1, [sp, 0x18] -_081422DE: +@081422DE: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r2 - blt _081422C4 -_081422E8: + blt @081422C4 +@081422E8: mov r2, r12 ldr r0, [r2] adds r0, 0xB8 @@ -619979,10 +619979,10 @@ _081422E8: str r3, [sp, 0x18] adds r1, r3, 0 bl sub_8151A48 - b _081424E2 + b @081424E2 .align 2, 0 .pool -_0814230C: +@0814230C: mov r0, sp ldr r1, =0x085b63f0 ldm r1!, {r2,r4,r5} @@ -619995,10 +619995,10 @@ _0814230C: movs r1, 0x1 mov r9, r1 cmp r0, 0x3 - bhi _0814232A + bhi @0814232A movs r2, 0x3 mov r9, r2 -_0814232A: +@0814232A: adds r0, r7, 0 movs r1, 0x5 bl __udivsi3 @@ -620014,56 +620014,56 @@ _0814232A: lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - beq _08142390 + beq @08142390 cmp r0, 0x2 - bgt _08142368 + bgt @08142368 cmp r0, 0x1 - beq _0814237C + beq @0814237C ldr r4, =0x0203ab88 mov r12, r4 - b _081423D4 + b @081423D4 .align 2, 0 .pool -_08142368: +@08142368: cmp r0, 0x3 - beq _081423A4 + beq @081423A4 cmp r0, 0x4 - beq _081423B8 + beq @081423B8 ldr r5, =0x0203ab88 mov r12, r5 - b _081423D4 + b @081423D4 .align 2, 0 .pool -_0814237C: +@0814237C: ldr r3, =0x02020630 ldr r2, =0x0203ab88 ldr r0, [r2] adds r0, 0x43 - b _081423C0 + b @081423C0 .align 2, 0 .pool -_08142390: +@08142390: ldr r3, =0x02020630 ldr r2, =0x0203ab88 ldr r0, [r2] adds r0, 0x44 - b _081423C0 + b @081423C0 .align 2, 0 .pool -_081423A4: +@081423A4: ldr r3, =0x02020630 ldr r2, =0x0203ab88 ldr r0, [r2] adds r0, 0x45 - b _081423C0 + b @081423C0 .align 2, 0 .pool -_081423B8: +@081423B8: ldr r3, =0x02020630 ldr r2, =0x0203ab88 ldr r0, [r2] adds r0, 0x46 -_081423C0: +@081423C0: ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 @@ -620074,10 +620074,10 @@ _081423C0: lsls r0, 4 mov r8, r0 mov r12, r2 -_081423D4: +@081423D4: mov r0, r9 cmp r0, 0x1 - bne _08142430 + bne @08142430 mov r1, r12 ldr r4, [r1] ldr r1, =0x085b6154 @@ -620091,7 +620091,7 @@ _081423D4: ands r1, r0 str r2, [sp, 0x1C] cmp r1, 0 - bne _081424E2 + bne @081424E2 adds r0, r7, 0 movs r1, 0x5 bl __udivsi3 @@ -620112,16 +620112,16 @@ _081423D4: adds r0, r1, 0 movs r1, 0xD bl sub_815168C - b _081424C4 + b @081424C4 .align 2, 0 .pool -_08142430: +@08142430: movs r4, 0 lsls r5, r7, 2 str r5, [sp, 0x1C] ldr r0, =0x085b6154 mov r10, r0 -_0814243A: +@0814243A: lsls r0, r4, 2 adds r0, r4 adds r0, r7, r0 @@ -620140,7 +620140,7 @@ _0814243A: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _081424B0 + bne @081424B0 adds r0, r3, 0 movs r1, 0x5 bl __udivsi3 @@ -620167,12 +620167,12 @@ _0814243A: bl sub_815168C mov r0, r9 cmp r0, 0x3 - bne _081424A2 + bne @081424A2 mov r1, r10 adds r0, r6, r1 ldrh r0, [r0, 0x10] str r0, [sp, 0x18] -_081424A2: +@081424A2: mov r0, r9 subs r0, 0x1 lsls r0, 24 @@ -620180,18 +620180,18 @@ _081424A2: mov r9, r0 ldr r2, =0x0203ab88 mov r12, r2 -_081424B0: +@081424B0: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _0814243A + bls @0814243A mov r3, r9 cmp r3, 0x2 - beq _081424C4 + beq @081424C4 movs r4, 0 str r4, [sp, 0x18] -_081424C4: +@081424C4: ldr r0, =0x0203ab88 ldr r0, [r0] adds r0, 0xB8 @@ -620206,7 +620206,7 @@ _081424C4: str r2, [sp, 0x18] adds r1, r2, 0 bl sub_8151A48 -_081424E2: +@081424E2: add sp, 0x20 pop {r3-r5} mov r8, r3 @@ -620220,7 +620220,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 @@ -620250,33 +620250,33 @@ sub_81424FC: @ 81424FC movs r3, 0x7 bl sub_8152058 cmp r5, 0xF - bhi _081425FC + bhi @081425FC lsls r0, r5, 2 - ldr r1, =_08142558 + ldr r1, =@08142558 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08142558: - .4byte _08142738 - .4byte _08142598 - .4byte _08142598 - .4byte _08142598 - .4byte _08142598 - .4byte _081425CC - .4byte _081425FC - .4byte _081425FC - .4byte _081425FC - .4byte _081425FC - .4byte _081425CC - .4byte _081425FC - .4byte _081425FC - .4byte _081425FC - .4byte _081425FC - .4byte _081425CC -_08142598: +@08142558: + .4byte @08142738 + .4byte @08142598 + .4byte @08142598 + .4byte @08142598 + .4byte @08142598 + .4byte @081425CC + .4byte @081425FC + .4byte @081425FC + .4byte @081425FC + .4byte @081425FC + .4byte @081425CC + .4byte @081425FC + .4byte @081425FC + .4byte @081425FC + .4byte @081425FC + .4byte @081425CC +@08142598: movs r0, 0x4 str r0, [sp, 0x18] add r1, sp, 0x8 @@ -620285,10 +620285,10 @@ _08142598: adds r0, r1, 0 ldrb r0, [r0] cmp r0, 0x3 - bhi _08142604 + bhi @08142604 add r4, sp, 0x10 adds r3, r1, 0 -_081425AE: +@081425AE: ldrb r2, [r3] adds r2, r4 ldrb r1, [r3] @@ -620302,9 +620302,9 @@ _081425AE: ldrb r0, [r3] ldr r1, [sp, 0x18] cmp r0, r1 - bcc _081425AE - b _08142604 -_081425CC: + bcc @081425AE + b @08142604 +@081425CC: movs r2, 0x5 str r2, [sp, 0x18] add r1, sp, 0x8 @@ -620313,10 +620313,10 @@ _081425CC: adds r0, r1, 0 ldrb r0, [r0] cmp r0, 0x4 - bhi _08142604 + bhi @08142604 add r3, sp, 0x10 adds r2, r1, 0 -_081425E2: +@081425E2: ldrb r1, [r2] adds r1, r3 ldrb r0, [r2] @@ -620328,14 +620328,14 @@ _081425E2: ldrb r0, [r2] ldr r1, [sp, 0x18] cmp r0, r1 - bcc _081425E2 - b _08142604 -_081425FC: + bcc @081425E2 + b @08142604 +@081425FC: movs r2, 0x1 str r2, [sp, 0x18] add r0, sp, 0x10 strb r5, [r0] -_08142604: +@08142604: add r1, sp, 0x8 movs r0, 0 strb r0, [r1] @@ -620343,9 +620343,9 @@ _08142604: ldrb r0, [r0] ldr r1, [sp, 0x18] cmp r0, r1 - bcc _08142616 - b _08142738 -_08142616: + bcc @08142616 + b @08142738 +@08142616: mov r2, sp adds r2, 0xE str r2, [sp, 0x1C] @@ -620355,7 +620355,7 @@ _08142616: mov r9, r1 subs r2, 0x4 str r2, [sp, 0x20] -_08142628: +@08142628: mov r1, r9 ldrb r0, [r1] add r0, r10 @@ -620386,14 +620386,14 @@ _08142628: strb r0, [r7] ldrb r0, [r7] cmp r0, 0x2 - bhi _08142726 + bhi @08142726 add r6, sp, 0xC mov r8, r2 ldr r0, [sp, 0x1C] mov r12, r0 ldr r1, =0x0203ab88 str r1, [sp, 0x28] -_08142672: +@08142672: mov r2, r9 ldrb r0, [r2] add r0, r10 @@ -620483,8 +620483,8 @@ _08142672: ldr r1, [sp, 0x24] ldrb r0, [r1] cmp r0, 0x2 - bls _08142672 -_08142726: + bls @08142672 +@08142726: mov r2, r9 ldrb r0, [r2] adds r0, 0x1 @@ -620492,9 +620492,9 @@ _08142726: ldrb r0, [r2] ldr r1, [sp, 0x18] cmp r0, r1 - bcs _08142738 - b _08142628 -_08142738: + bcs @08142738 + b @08142628 +@08142738: add sp, 0x2C pop {r3-r5} mov r8, r3 @@ -620508,7 +620508,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 @@ -620518,9 +620518,9 @@ sub_8142758: @ 8142758 movs r2, 0x5 bl memcpy cmp r4, 0x13 - bls _08142770 + bls @08142770 movs r4, 0 -_08142770: +@08142770: ldr r3, =0x085b6154 lsls r0, r4, 2 adds r0, r4 @@ -620530,19 +620530,19 @@ _08142770: lsls r0, 28 lsrs r0, 28 cmp r0, 0x4 - beq _081427C4 + beq @081427C4 cmp r0, 0x4 - bgt _08142798 + bgt @08142798 cmp r0, 0x3 - beq _0814279E - b _08142808 + beq @0814279E + b @08142808 .align 2, 0 .pool -_08142798: +@08142798: cmp r0, 0xC - beq _081427E8 - b _08142808 -_0814279E: + beq @081427E8 + b @08142808 +@0814279E: adds r0, r4, 0 movs r1, 0x5 bl __udivsi3 @@ -620555,13 +620555,13 @@ _0814279E: adds r1, r0, r4 ldrb r0, [r1] cmp r0, 0x3 - bhi _08142808 + bhi @08142808 ldrb r0, [r1] adds r0, 0x1 - b _081427DC + b @081427DC .align 2, 0 .pool -_081427C4: +@081427C4: subs r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -620571,16 +620571,16 @@ _081427C4: adds r1, r0, r4 ldrb r0, [r1] cmp r0, 0x2 - bhi _08142808 + bhi @08142808 ldrb r0, [r1] adds r0, 0x2 -_081427DC: +@081427DC: add r0, sp ldrb r0, [r0] - b _0814280A + b @0814280A .align 2, 0 .pool -_081427E8: +@081427E8: ldr r0, =0x0203ab88 ldr r1, [r0] adds r0, r3, 0 @@ -620590,15 +620590,15 @@ _081427E8: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _08142808 + bne @08142808 mov r0, sp ldrb r0, [r0, 0x4] - b _0814280A + b @0814280A .align 2, 0 .pool -_08142808: +@08142808: movs r0, 0 -_0814280A: +@0814280A: add sp, 0x8 pop {r4} pop {r1} @@ -620606,7 +620606,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] @@ -620683,7 +620683,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 @@ -620700,7 +620700,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 @@ -620709,14 +620709,14 @@ sub_81428E4: @ 81428E4 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08142908 + bne @08142908 movs r0, 0 bl SetVBlankCallback ldr r0, =sub_81405CC + 1 bl set_callback2 adds r0, r4, 0 bl remove_task -_08142908: +@08142908: pop {r4} pop {r0} bx r0 @@ -620725,7 +620725,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 @@ -620770,7 +620770,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 @@ -620788,7 +620788,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 @@ -620805,7 +620805,7 @@ sub_81429A0: @ 81429A0 movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _081429DE + beq @081429DE ldr r1, =0x020375e0 movs r0, 0x1 strh r0, [r1] @@ -620816,7 +620816,7 @@ sub_81429A0: @ 81429A0 bl script_env_2_disable adds r0, r4, 0 bl remove_task -_081429DE: +@081429DE: pop {r4} pop {r0} bx r0 @@ -620825,7 +620825,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 @@ -620835,7 +620835,7 @@ sub_81429F0: @ 81429F0 movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _08142A60 + beq @08142A60 ldr r2, =0x085b6344 ldr r0, =0x020375e0 ldrh r1, [r0] @@ -620877,7 +620877,7 @@ sub_81429F0: @ 81429F0 adds r0, r1 ldr r1, =sub_81428C4 + 1 str r1, [r0] -_08142A60: +@08142A60: add sp, 0xC pop {r4-r6} pop {r0} @@ -620887,7 +620887,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} @@ -620922,17 +620922,17 @@ sub_8142A88: @ 8142A88 movs r1, 0x22 ldrsh r0, [r6, r1] cmp r0, r4 - blt _08142B78 + blt @08142B78 mov r0, r8 ldrh r1, [r0] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08142B28 + beq @08142B28 adds r0, r7, 0 ands r0, r1 cmp r0, 0 - beq _08142B28 + beq @08142B28 movs r0, 0 movs r1, 0 bl sub_81973FC @@ -620950,10 +620950,10 @@ sub_8142A88: @ 8142A88 bl Window_CopyToVram ldr r0, =sub_81429F0 + 1 str r0, [r6] - b _08142BB0 + b @08142BB0 .align 2, 0 .pool -_08142B28: +@08142B28: ldr r4, =0x02021fc4 ldr r1, =0x082a5b12 adds r0, r4, 0 @@ -620981,10 +620981,10 @@ _08142B28: adds r0, r1 ldr r1, =sub_81428C4 + 1 str r1, [r0] - b _08142BB0 + b @08142BB0 .align 2, 0 .pool -_08142B78: +@08142B78: ldr r5, =0x02021fc4 ldr r1, =0x082a5b4e adds r0, r5, 0 @@ -621009,7 +621009,7 @@ _08142B78: str r0, [r6] strh r4, [r6, 0x22] strh r4, [r6, 0x8] -_08142BB0: +@08142BB0: add sp, 0xC pop {r3} mov r8, r3 @@ -621021,7 +621021,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 sub_8145C30 @@ -621051,11 +621051,11 @@ 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 - bne _08142C44 + bne @08142C44 bl gpu_pal_allocator_reset ldr r0, =0x085b7384 bl gpu_pal_obj_alloc_and_load_multiple @@ -621065,10 +621065,10 @@ sub_8142C0C: @ 8142C0C bl gpu_tile_obj_decompress_and_load ldr r0, =0x085b7a40 bl gpu_tile_obj_decompress_and_load - b _08142C5A + b @08142C5A .align 2, 0 .pool -_08142C44: +@08142C44: movs r0, 0xE bl gpu_tile_obj_free_by_tag movs r0, 0xD @@ -621076,13 +621076,13 @@ _08142C44: movs r0, 0xC bl gpu_tile_obj_free_by_tag bl gpu_pal_allocator_reset -_08142C5A: +@08142C5A: pop {r0} bx r0 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 @@ -621124,11 +621124,11 @@ sub_8142C60: @ 8142C60 lsls r0, 16 ldr r1, =0x01670000 cmp r0, r1 - bls _08142CBC + bls @08142CBC ldr r1, =0xfffffeb6 adds r0, r2, r1 strh r0, [r6] -_08142CBC: +@08142CBC: adds r0, r5, 0 pop {r4-r6} pop {r1} @@ -621138,7 +621138,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} @@ -621171,14 +621171,14 @@ sub_8142CD0: @ 8142CD0 movs r6, 0 ldr r0, =0x02020630 mov r8, r0 -_08142D18: +@08142D18: lsls r0, r6, 1 adds r0, r6 lsls r0, 27 lsrs r4, r0, 24 movs r5, 0 lsls r7, r6, 2 -_08142D24: +@08142D24: lsls r1, r5, 1 adds r1, r5 lsls r1, 3 @@ -621213,22 +621213,22 @@ _08142D24: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x47 - bls _08142D6E + bls @08142D6E movs r4, 0 -_08142D6E: +@08142D6E: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _08142D24 + bls @08142D24 adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x2 - bls _08142D18 + bls @08142D18 movs r6, 0 ldr r4, =0x02020630 -_08142D86: +@08142D86: lsls r1, r6, 1 adds r1, r6 lsls r1, 3 @@ -621260,10 +621260,10 @@ _08142D86: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x3 - bls _08142D86 + bls @08142D86 movs r6, 0 ldr r4, =0x02020630 -_08142DCC: +@08142DCC: lsls r2, r6, 1 adds r2, r6 lsls r2, 3 @@ -621295,7 +621295,7 @@ _08142DCC: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x2 - bls _08142DCC + bls @08142DCC add sp, 0x8 pop {r3} mov r8, r3 @@ -621307,10 +621307,10 @@ _08142DCC: thumb_func_end sub_8142CD0 thumb_func_start sub_8142E3C -sub_8142E3C: @ 8142E3C +sub_8142E3C: ; 8142E3C push {r4,lr} movs r4, 0 -_08142E40: +@08142E40: ldr r0, =0x0203ab88 ldr r0, [r0] adds r0, r4 @@ -621326,7 +621326,7 @@ _08142E40: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xB - bls _08142E40 + bls @08142E40 pop {r4} pop {r0} bx r0 @@ -621335,7 +621335,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 @@ -621346,14 +621346,14 @@ sub_8142E70: @ 8142E70 lsrs r1, 24 mov r12, r1 cmp r0, 0 - beq _08142EC0 + beq @08142EC0 cmp r0, 0x1 - bne _08142F66 + bne @08142F66 movs r4, 0 ldr r5, =0x02020630 ldr r3, =0x0203ab88 movs r2, 0x4 -_08142E92: +@08142E92: ldr r0, [r3] adds r0, r4 adds r0, 0x59 @@ -621370,11 +621370,11 @@ _08142E92: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x12 - bls _08142E92 - b _08142F66 + bls @08142E92 + b @08142F66 .align 2, 0 .pool -_08142EC0: +@08142EC0: movs r4, 0 ldr r0, =0x0203ab88 mov r9, r0 @@ -621384,7 +621384,7 @@ _08142EC0: ldr r5, =0x02020630 movs r6, 0x5 negs r6, r6 -_08142ED2: +@08142ED2: mov r0, r9 ldr r2, [r0] lsls r3, r4, 3 @@ -621394,11 +621394,11 @@ _08142ED2: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _08142F14 + beq @08142F14 adds r0, r3, r7 ldrb r0, [r0, 0x2] cmp r0, r12 - beq _08142F14 + beq @08142F14 adds r0, r2, r4 adds r0, 0x59 ldrb r1, [r0] @@ -621411,10 +621411,10 @@ _08142ED2: movs r2, 0x4 orrs r1, r2 strb r1, [r0] - b _08142F2C + b @08142F2C .align 2, 0 .pool -_08142F14: +@08142F14: adds r0, r2, r4 adds r0, 0x59 ldrb r0, [r0] @@ -621427,19 +621427,19 @@ _08142F14: adds r0, r6, 0 ands r0, r2 strb r0, [r1] -_08142F2C: +@08142F2C: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xB - bls _08142ED2 + bls @08142ED2 cmp r4, 0x12 - bhi _08142F66 + bhi @08142F66 ldr r6, =0x02020630 ldr r3, =0x0203ab88 movs r5, 0x5 negs r5, r5 -_08142F42: +@08142F42: ldr r0, [r3] adds r0, r4 adds r0, 0x59 @@ -621457,8 +621457,8 @@ _08142F42: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x12 - bls _08142F42 -_08142F66: + bls @08142F42 +@08142F66: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -621470,7 +621470,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} @@ -621479,7 +621479,7 @@ sub_8142F7C: @ 8142F7C ldr r4, =0x02020630 movs r0, 0x4 mov r8, r0 -_08142F8C: +@08142F8C: ldr r0, =0x085b7928 movs r1, 0x74 movs r2, 0x14 @@ -621550,7 +621550,7 @@ _08142F8C: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls _08142F8C + bls @08142F8C pop {r3} mov r8, r3 pop {r4-r7} @@ -621561,7 +621561,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 @@ -621573,11 +621573,11 @@ sub_8143038: @ 8143038 mov r9, r1 movs r6, 0 cmp r0, 0 - beq _08143084 + beq @08143084 ldr r4, =0x02020630 ldr r3, =0x0203ab88 movs r2, 0x4 -_08143056: +@08143056: ldr r0, [r3] adds r0, r6 adds r0, 0x6D @@ -621594,11 +621594,11 @@ _08143056: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x5 - bls _08143056 - b _08143142 + bls @08143056 + b @08143142 .align 2, 0 .pool -_08143084: +@08143084: ldr r0, =0x0203ab88 mov r8, r0 ldr r7, =0x02020630 @@ -621607,7 +621607,7 @@ _08143084: movs r0, 0x5 negs r0, r0 mov r10, r0 -_08143094: +@08143094: mov r0, r8 ldr r1, [r0] adds r0, r1, 0 @@ -621615,10 +621615,10 @@ _08143094: adds r0, r6 ldrb r0, [r0] cmp r0, 0 - beq _081430A8 + beq @081430A8 cmp r6, r9 - bne _081430D0 -_081430A8: + bne @081430D0 +@081430A8: adds r0, r1, r6 adds r0, 0x6D ldrb r1, [r0] @@ -621631,10 +621631,10 @@ _081430A8: movs r2, 0x4 orrs r1, r2 strb r1, [r0] - b _08143138 + b @08143138 .align 2, 0 .pool -_081430D0: +@081430D0: adds r5, r6, 0 adds r5, 0x31 adds r0, r1, 0 @@ -621687,13 +621687,13 @@ _081430D0: lsls r0, 3 adds r0, 0x3 strh r0, [r2, 0x22] -_08143138: +@08143138: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x5 - bls _08143094 -_08143142: + bls @08143094 +@08143142: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -621704,12 +621704,12 @@ _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 cmp r5, 0 - bne _08143180 + bne @08143180 ldr r2, =0x02020630 ldr r0, =0x0203ab88 ldr r0, [r0] @@ -621724,10 +621724,10 @@ sub_8143150: @ 8143150 movs r2, 0x4 orrs r1, r2 strb r1, [r0] - b _081431D0 + b @081431D0 .align 2, 0 .pool -_08143180: +@08143180: ldr r4, =0x02020630 ldr r3, =0x0203ab88 ldr r0, [r3] @@ -621768,7 +621768,7 @@ _08143180: adds r0, 0x2 lsls r0, 3 strh r0, [r1, 0x22] -_081431D0: +@081431D0: pop {r4,r5} pop {r0} bx r0 @@ -621777,7 +621777,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, =0x085b741c @@ -621798,11 +621798,11 @@ sub_81431E4: @ 81431E4 strh r1, [r0] movs r0, 0 ldr r7, =0x02020630 -_08143210: +@08143210: movs r4, 0 adds r6, r0, 0x1 lsls r5, r0, 2 -_08143216: +@08143216: adds r1, r5, r4 lsls r0, r1, 1 adds r0, r1 @@ -621836,11 +621836,11 @@ _08143216: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _08143216 + bls @08143216 lsls r0, r6, 24 lsrs r0, 24 cmp r0, 0x2 - bls _08143210 + bls @08143210 add sp, 0xC pop {r4-r7} pop {r0} @@ -621850,7 +621850,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 @@ -621863,12 +621863,12 @@ sub_8143280: @ 8143280 asrs r1, r0, 16 ldr r0, =0x00000167 cmp r1, r0 - ble _081432A2 + ble @081432A2 ldr r2, =0xfffffe98 adds r0, r1, r2 lsls r0, 16 lsrs r4, r0, 16 -_081432A2: +@081432A2: adds r0, r4, 0 bl sine2 lsls r0, 16 @@ -621894,9 +621894,9 @@ _081432A2: lsls r0, 26 lsrs r3, r0, 27 cmp r2, 0 - bge _081432DC + bge @081432DC adds r2, 0xF -_081432DC: +@081432DC: lsls r0, r2, 12 lsrs r5, r0, 16 ldr r1, =0x02021bc0 @@ -621904,9 +621904,9 @@ _081432DC: adds r1, r0, r1 adds r0, r4, 0 cmp r0, 0 - bge _081432EE + bge @081432EE adds r0, 0xF -_081432EE: +@081432EE: asrs r0, 4 strh r0, [r1, 0x6] strh r0, [r1] @@ -621923,7 +621923,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} @@ -621931,7 +621931,7 @@ sub_8143314: @ 8143314 movs r5, 0 ldr r7, =0x0201c000 mov r6, sp -_08143322: +@08143322: ldr r0, =0x085b7750 lsls r4, r5, 3 adds r4, r0 @@ -621957,7 +621957,7 @@ _08143322: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x4 - bls _08143322 + bls @08143322 ldr r0, =0x085b77e4 movs r1, 0xD0 movs r2, 0x10 @@ -621982,7 +621982,7 @@ _08143322: strb r1, [r0] movs r5, 0 adds r7, r3, 0 -_0814338C: +@0814338C: lsls r1, r5, 19 movs r0, 0xC4 lsls r0, 16 @@ -622028,7 +622028,7 @@ _0814338C: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _0814338C + bls @0814338C ldr r0, =0x085b7814 movs r1, 0x78 movs r2, 0x44 @@ -622053,7 +622053,7 @@ _0814338C: movs r5, 0 adds r4, r2, 0 adds r7, r3, 0 -_0814341C: +@0814341C: lsls r1, r5, 20 movs r2, 0xC0 lsls r2, 16 @@ -622101,7 +622101,7 @@ _0814341C: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x2 - bls _0814341C + bls @0814341C ldr r0, =0x085b7844 movs r1, 0x98 movs r2, 0x60 @@ -622159,7 +622159,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 @@ -622176,7 +622176,7 @@ sub_8143514: @ 8143514 mov r9, r1 ldr r0, =0x0203ab88 mov r10, r0 -_08143534: +@08143534: adds r0, r7, 0 mov r1, r8 bl __udivsi3 @@ -622200,12 +622200,12 @@ _08143534: orrs r1, r2 strb r1, [r0] cmp r5, 0 - bne _0814356E + bne @0814356E cmp r4, 0 - bne _0814356E + bne @0814356E cmp r6, 0x3 - bne _081435CC -_0814356E: + bne @081435CC +@0814356E: mov r4, r10 ldr r0, [r4] adds r0, 0x3C @@ -622253,7 +622253,7 @@ _0814356E: orrs r0, r2 strh r0, [r3, 0x4] movs r4, 0x1 -_081435CC: +@081435CC: adds r0, r7, 0 mov r1, r8 bl __umodsi3 @@ -622269,7 +622269,7 @@ _081435CC: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x3 - bls _08143534 + bls @08143534 pop {r3-r5} mov r8, r3 mov r9, r4 @@ -622282,7 +622282,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 @@ -622292,9 +622292,9 @@ sub_8143614: @ 8143614 movs r2, 0x5 bl memcpy cmp r4, 0x13 - bls _0814362C + bls @0814362C movs r4, 0 -_0814362C: +@0814362C: ldr r3, =0x085b6154 lsls r0, r4, 2 adds r0, r4 @@ -622304,19 +622304,19 @@ _0814362C: lsls r0, 28 lsrs r0, 28 cmp r0, 0x4 - beq _08143680 + beq @08143680 cmp r0, 0x4 - bgt _08143654 + bgt @08143654 cmp r0, 0x3 - beq _0814365A - b _081436C4 + beq @0814365A + b @081436C4 .align 2, 0 .pool -_08143654: +@08143654: cmp r0, 0xC - beq _081436A4 - b _081436C4 -_0814365A: + beq @081436A4 + b @081436C4 +@0814365A: adds r0, r4, 0 movs r1, 0x5 bl __udivsi3 @@ -622329,13 +622329,13 @@ _0814365A: adds r1, r0, r4 ldrb r0, [r1] cmp r0, 0x3 - bhi _081436C4 + bhi @081436C4 ldrb r0, [r1] adds r0, 0x1 - b _08143698 + b @08143698 .align 2, 0 .pool -_08143680: +@08143680: subs r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -622345,16 +622345,16 @@ _08143680: adds r1, r0, r4 ldrb r0, [r1] cmp r0, 0x2 - bhi _081436C4 + bhi @081436C4 ldrb r0, [r1] adds r0, 0x2 -_08143698: +@08143698: add r0, sp ldrb r0, [r0] - b _081436C6 + b @081436C6 .align 2, 0 .pool -_081436A4: +@081436A4: ldr r0, =0x0203ab88 ldr r1, [r0] adds r0, r3, 0 @@ -622364,15 +622364,15 @@ _081436A4: ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _081436C4 + bne @081436C4 mov r0, sp ldrb r0, [r0, 0x4] - b _081436C6 + b @081436C6 .align 2, 0 .pool -_081436C4: +@081436C4: movs r0, 0 -_081436C6: +@081436C6: add sp, 0x8 pop {r4} pop {r1} @@ -622380,7 +622380,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 @@ -622423,7 +622423,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} @@ -622435,30 +622435,30 @@ sub_814372C: @ 814372C ldrb r0, [r0, 0x19] adds r5, r1, 0 cmp r0, 0x1 - bne _08143746 + bne @08143746 movs r6, 0x2 -_08143746: +@08143746: cmp r2, 0x6 - bls _0814374C - b _081438A8 -_0814374C: + bls @0814374C + b @081438A8 +@0814374C: lsls r0, r2, 2 - ldr r1, =_08143760 + ldr r1, =@08143760 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08143760: - .4byte _081438A8 - .4byte _08143864 - .4byte _0814383C - .4byte _08143830 - .4byte _08143808 - .4byte _081437FC - .4byte _0814377C -_0814377C: +@08143760: + .4byte @081438A8 + .4byte @08143864 + .4byte @0814383C + .4byte @08143830 + .4byte @08143808 + .4byte @081437FC + .4byte @0814377C +@0814377C: movs r4, 0 ldr r5, =0x02020630 ldr r6, =0x0203ab88 @@ -622469,7 +622469,7 @@ _0814377C: adds r7, 0x8 ldr r2, =0xfffffc00 mov r8, r2 -_08143790: +@08143790: ldr r0, [r6] adds r3, r4, 0 adds r3, 0x1A @@ -622513,18 +622513,18 @@ _08143790: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _08143790 - b _081438F4 + bls @08143790 + b @081438F4 .align 2, 0 .pool -_081437FC: +@081437FC: ldr r2, =0x02020630 ldr r0, [r5] adds r0, 0x58 - b _0814386A + b @0814386A .align 2, 0 .pool -_08143808: +@08143808: ldr r2, =0x02020630 ldr r0, [r5] adds r0, 0x58 @@ -622542,17 +622542,17 @@ _08143808: lsls r0, r6, 2 adds r0, r1 ldrh r1, [r0, 0x8] - b _08143886 + b @08143886 .align 2, 0 .pool -_08143830: +@08143830: ldr r2, =0x02020630 ldr r0, [r5] adds r0, 0x57 - b _0814386A + b @0814386A .align 2, 0 .pool -_0814383C: +@0814383C: ldr r2, =0x02020630 ldr r0, [r5] adds r0, 0x57 @@ -622570,14 +622570,14 @@ _0814383C: lsls r0, r6, 2 adds r0, r1 ldrh r1, [r0, 0x8] - b _08143886 + b @08143886 .align 2, 0 .pool -_08143864: +@08143864: ldr r2, =0x02020630 ldr r0, [r5] adds r0, 0x56 -_0814386A: +@0814386A: ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 @@ -622592,7 +622592,7 @@ _0814386A: lsls r0, r6, 2 adds r0, r1 ldrh r1, [r0, 0x4] -_08143886: +@08143886: ldrh r4, [r4] adds r1, r4 ldr r2, =0x000003ff @@ -622603,10 +622603,10 @@ _08143886: ands r0, r2 orrs r0, r1 strh r0, [r3, 0x4] - b _081438F4 + b @081438F4 .align 2, 0 .pool -_081438A8: +@081438A8: movs r4, 0 lsls r7, r6, 2 ldr r6, =0x02020630 @@ -622615,7 +622615,7 @@ _081438A8: mov r12, r0 ldr r2, =0xfffffc00 mov r8, r2 -_081438B8: +@081438B8: ldr r0, [r5] adds r0, r4 adds r0, 0x56 @@ -622645,8 +622645,8 @@ _081438B8: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _081438B8 -_081438F4: + bls @081438B8 +@081438F4: pop {r3} mov r8, r3 pop {r4-r7} @@ -622657,7 +622657,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] @@ -622668,7 +622668,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, =0x085b7948 @@ -622724,7 +622724,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 @@ -622747,12 +622747,12 @@ 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 ldr r6, =0x02020630 -_081439D0: +@081439D0: movs r3, 0x39 subs r3, r4 lsls r3, 24 @@ -622770,7 +622770,7 @@ _081439D0: adds r1, r0, r4 ldrb r0, [r1] cmp r0, 0x40 - beq _08143A24 + beq @08143A24 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -622794,12 +622794,12 @@ _081439D0: movs r2, 0x2 orrs r1, r2 strb r1, [r0] -_08143A24: +@08143A24: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls _081439D0 + bls @081439D0 pop {r4-r6} pop {r0} bx r0 @@ -622808,7 +622808,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 @@ -622827,7 +622827,7 @@ sub_8143A40: @ 8143A40 adds r1, r7 mov r9, r1 mov r8, r6 -_08143A64: +@08143A64: lsls r4, r5, 4 adds r4, r5 lsls r4, 2 @@ -622847,7 +622847,7 @@ _08143A64: movs r1, 0 adds r2, r5, 0x1 adds r3, r6, 0x1 -_08143A8C: +@08143A8C: lsls r0, r1, 1 adds r0, r4 add r0, r9 @@ -622857,13 +622857,13 @@ _08143A8C: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x7 - bls _08143A8C + bls @08143A8C lsls r0, r2, 24 lsrs r5, r0, 24 lsls r0, r3, 24 lsrs r6, r0, 24 cmp r6, 0x5 - bls _08143A64 + bls @08143A64 pop {r3-r5} mov r8, r3 mov r9, r4 @@ -622876,7 +622876,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 @@ -622888,7 +622888,7 @@ sub_8143AC8: @ 8143AC8 movs r5, 0x34 ldrsh r0, [r3, r5] cmp r1, r0 - ble _08143B04 + ble @08143B04 movs r1, 0xB4 lsls r1, 1 adds r0, r2, r1 @@ -622897,17 +622897,17 @@ sub_8143AC8: @ 8143AC8 lsls r1, r2, 16 ldr r0, =0x01670000 cmp r1, r0 - ble _08143B08 + ble @08143B08 ldr r5, =0xfffffe98 adds r0, r2, r5 - b _08143B06 + b @08143B06 .align 2, 0 .pool -_08143B04: +@08143B04: subs r0, r2, r4 -_08143B06: +@08143B06: strh r0, [r3, 0x3A] -_08143B08: +@08143B08: movs r1, 0x3A ldrsh r0, [r3, r1] pop {r4,r5} @@ -622916,7 +622916,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 @@ -622940,7 +622940,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 @@ -622951,32 +622951,32 @@ sub_8143B48: @ 8143B48 lsls r0, 16 asrs r1, r0, 16 cmp r1, 0xE - bne _08143B68 + bne @08143B68 movs r0, 0 strh r0, [r4, 0x32] - b _08143B7E -_08143B68: + b @08143B7E +@08143B68: cmp r1, 0xD - bgt _08143B70 + bgt @08143B70 movs r0, 0xE - b _08143B72 -_08143B70: + b @08143B72 +@08143B70: movs r0, 0x2B -_08143B72: +@08143B72: subs r0, r1 lsls r0, 16 lsrs r0, 16 strh r0, [r4, 0x32] lsls r0, 16 asrs r0, 16 -_08143B7E: +@08143B7E: pop {r4} pop {r1} bx r1 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} @@ -623003,25 +623003,25 @@ sub_8143B84: @ 8143B84 mov r1, r8 bl __gesf2 cmp r0, 0 - blt _08143BD4 + blt @08143BD4 adds r0, r6, 0 mov r1, r8 bl __subsf3 - b _08143BE8 + b @08143BE8 .align 2, 0 .pool -_08143BD4: +@08143BD4: ldr r1, =0x00000000 adds r0, r6, 0 bl __ltsf2 cmp r0, 0 - bge _08143BEA + bge @08143BEA adds r0, r6, 0 mov r1, r8 bl __addsf3 -_08143BE8: +@08143BE8: str r0, [r4] -_08143BEA: +@08143BEA: ldr r5, [r5] adds r0, r5, 0 adds r0, 0x88 @@ -623068,7 +623068,7 @@ _08143BEA: bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - beq _08143C74 + beq @08143C74 ldr r0, =0x030075f0 ldr r4, =0x0000ffff ldrh r2, [r7, 0x24] @@ -623082,7 +623082,7 @@ _08143BEA: asrs r2, 24 adds r1, r4, 0 bl MPlayPanpotControl -_08143C74: +@08143C74: pop {r3} mov r8, r3 pop {r4-r7} @@ -623093,7 +623093,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 @@ -623105,11 +623105,11 @@ sub_8143C90: @ 8143C90 lsls r1, r2, 16 ldr r0, =0x01670000 cmp r1, r0 - ble _08143CAE + ble @08143CAE ldr r1, =0xfffffe98 adds r0, r2, r1 strh r0, [r5, 0x34] -_08143CAE: +@08143CAE: ldrh r0, [r5, 0x34] bl sine2 adds r4, r0, 0 @@ -623143,7 +623143,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 @@ -623155,30 +623155,30 @@ sub_8143CFC: @ 8143CFC lsls r0, 16 lsrs r0, 16 cmp r0, 0xD4 - bls _08143D22 + bls @08143D22 adds r2, r5, 0 adds r2, 0x3E ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 - b _08143D2E -_08143D22: + b @08143D2E +@08143D22: adds r2, r5, 0 adds r2, 0x3E ldrb r1, [r2] movs r0, 0x5 negs r0, r0 ands r0, r1 -_08143D2E: +@08143D2E: strb r0, [r2] movs r1, 0x32 ldrsh r0, [r5, r1] cmp r0, 0x1D - ble _08143DF8 + ble @08143DF8 movs r1, 0x2E ldrsh r0, [r5, r1] cmp r0, 0 - bne _08143D6C + bne @08143D6C ldr r7, =0x0203ab88 ldr r6, [r7] adds r4, r6, 0 @@ -623192,11 +623192,11 @@ _08143D2E: ldr r0, [r4] bl __lesf2 cmp r0, 0 - bgt _08143DF8 - b _08143D8C + bgt @08143DF8 + b @08143D8C .align 2, 0 .pool -_08143D6C: +@08143D6C: ldr r7, =0x0203ab88 ldr r6, [r7] adds r4, r6, 0 @@ -623210,8 +623210,8 @@ _08143D6C: ldr r0, [r4] bl __gesf2 cmp r0, 0 - blt _08143DF8 -_08143D8C: + blt @08143DF8 +@08143D8C: adds r1, r6, 0 adds r1, 0x7D movs r0, 0xFF @@ -623261,7 +623261,7 @@ _08143D8C: subs r1, 0xC ldr r0, =0xbf800000 str r0, [r1] -_08143DF8: +@08143DF8: pop {r4-r7} pop {r0} bx r0 @@ -623270,7 +623270,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 @@ -623281,17 +623281,17 @@ sub_8143E14: @ 8143E14 movs r1, 0x34 ldrsh r0, [r7, r1] cmp r0, 0 - beq _08143E32 + beq @08143E32 cmp r0, 0xB4 - beq _08143E9C - b _08143F80 -_08143E32: + beq @08143E9C + b @08143F80 +@08143E32: movs r1, 0x2E ldrsh r0, [r7, r1] cmp r0, 0x1 - bne _08143E3C - b _08143F80 -_08143E3C: + bne @08143E3C + b @08143F80 +@08143E3C: movs r1, 0x3C ldrsh r0, [r7, r1] bl __floatsisf @@ -623327,14 +623327,14 @@ _08143E3C: adds r1, r0, 0 mov r0, r9 bl __divsf3 - b _08143EFC + b @08143EFC .align 2, 0 .pool -_08143E9C: +@08143E9C: movs r1, 0x2E ldrsh r0, [r7, r1] cmp r0, 0 - beq _08143F80 + beq @08143F80 movs r1, 0x3C ldrsh r0, [r7, r1] bl __floatsisf @@ -623371,7 +623371,7 @@ _08143E9C: mov r0, r9 bl __divsf3 bl __negsf2 -_08143EFC: +@08143EFC: adds r2, r0, 0 mov r0, r8 ldr r6, [r0] @@ -623432,7 +623432,7 @@ _08143EFC: ldr r0, =sub_8143CFC + 1 str r0, [r7, 0x1C] strh r2, [r7, 0x32] -_08143F80: +@08143F80: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -623445,7 +623445,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 @@ -623466,10 +623466,10 @@ sub_8143FA4: @ 8143FA4 lsls r0, 16 asrs r0, 16 cmp r0, 0x1D - ble _0814403E + ble @0814403E lsls r0, r1, 16 cmp r0, 0 - blt _0814403E + blt @0814403E ldr r4, =0x0203ab88 ldr r0, [r4] adds r0, 0x7D @@ -623514,7 +623514,7 @@ sub_8143FA4: @ 8143FA4 movs r1, 0x40 orrs r0, r1 strb r0, [r2, 0x3] -_0814403E: +@0814403E: pop {r4,r5} pop {r0} bx r0 @@ -623523,7 +623523,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] @@ -623532,14 +623532,14 @@ sub_8144050: @ 8144050 lsls r0, 16 asrs r0, 16 cmp r0, 0x2C - bgt _08144098 + bgt @08144098 ldrh r4, [r3, 0x26] subs r0, r4, 0x1 strh r0, [r3, 0x26] lsls r0, r1, 16 asrs r0, 16 cmp r0, 0x2D - bne _0814411E + bne @0814411E ldr r2, =0x02020630 ldr r0, =0x0203ab88 ldr r0, [r0] @@ -623552,18 +623552,18 @@ sub_8144050: @ 8144050 adds r0, 0x2B ldrb r0, [r0] cmp r0, 0x1 - bne _0814411E + bne @0814411E strh r4, [r3, 0x26] - b _0814411E + b @0814411E .align 2, 0 .pool -_08144098: +@08144098: lsls r0, r1, 16 asrs r0, 16 movs r2, 0x3C ldrsh r1, [r3, r2] cmp r0, r1 - bge _081440E4 + bge @081440E4 ldr r2, =0x02020630 ldr r0, =0x0203ab88 ldr r0, [r0] @@ -623578,24 +623578,24 @@ _08144098: ldrb r0, [r0] lsls r0, 26 cmp r0, 0 - bne _0814411E + bne @0814411E adds r0, r1, 0 adds r0, 0x2B ldrb r0, [r0] cmp r0, 0x1 - bne _081440DC + bne @081440DC ldrh r0, [r3, 0x26] adds r0, 0x1 strh r0, [r3, 0x26] - b _0814411E + b @0814411E .align 2, 0 .pool -_081440DC: +@081440DC: ldrh r0, [r3, 0x26] subs r0, 0x1 strh r0, [r3, 0x26] - b _0814411E -_081440E4: + b @0814411E +@081440E4: adds r2, r3, 0 adds r2, 0x2C ldrb r1, [r2] @@ -623624,7 +623624,7 @@ _081440E4: str r0, [r3, 0x1C] movs r0, 0x3D bl m4aSongNumStart -_0814411E: +@0814411E: pop {r4} pop {r0} bx r0 @@ -623633,36 +623633,36 @@ _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 movs r0, 0x34 ldrsh r1, [r4, r0] cmp r1, 0x5A - beq _08144142 + beq @08144142 movs r0, 0x87 lsls r0, 1 cmp r1, r0 - beq _0814414C - b _0814415C -_08144142: + beq @0814414C + b @0814415C +@08144142: movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _0814415C - b _08144154 -_0814414C: + beq @0814415C + b @08144154 +@0814414C: movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - beq _0814415C -_08144154: + beq @0814415C +@08144154: ldr r0, =sub_8144050 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x32] -_0814415C: +@0814415C: pop {r4} pop {r0} bx r0 @@ -623671,7 +623671,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 @@ -623681,21 +623681,21 @@ sub_8144168: @ 8144168 lsls r0, 27 lsrs r0, 27 cmp r0, 0 - beq _08144182 + beq @08144182 cmp r0, 0x1 - beq _08144194 -_08144182: + beq @08144194 +@08144182: adds r0, r4, 0 bl sub_81446DC ldr r0, =sub_8143E14 + 1 - b _0814419C + b @0814419C .align 2, 0 .pool -_08144194: +@08144194: adds r0, r4, 0 bl sub_81448B8 ldr r0, =sub_8144128 + 1 -_0814419C: +@0814419C: str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -623705,7 +623705,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 @@ -623715,7 +623715,7 @@ prev_quest_read_x24_hm_usage: @ 81441A8 lsls r0, 16 asrs r0, 16 cmp r0, 0xF - bne _081441CE + bne @081441CE ldr r0, =0x0203ab88 ldr r4, [r0] adds r4, 0x98 @@ -623723,15 +623723,15 @@ prev_quest_read_x24_hm_usage: @ 81441A8 ldr r1, =0xbf800000 bl __mulsf3 str r0, [r4] -_081441CE: +@081441CE: movs r1, 0x32 ldrsh r0, [r5, r1] cmp r0, 0 - bne _0814425C + bne @0814425C movs r1, 0x2E ldrsh r0, [r5, r1] cmp r0, 0 - bne _08144244 + bne @08144244 ldr r2, =0x0203ab88 ldr r0, [r2] adds r0, 0x7D @@ -623771,10 +623771,10 @@ _081441CE: str r0, [r5, 0x1C] movs r0, 0x47 bl m4aSongNumStartOrChange - b _0814425C + b @0814425C .align 2, 0 .pool -_08144244: +@08144244: adds r0, r5, 0 adds r0, 0x2C ldrb r1, [r0] @@ -623785,14 +623785,14 @@ _08144244: bl m4aSongNumStart adds r0, r5, 0 bl sub_8144A24 -_0814425C: +@0814425C: pop {r4,r5} pop {r0} bx r0 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} @@ -623815,7 +623815,7 @@ sub_8144264: @ 8144264 ldr r1, [r2, 0x8] ands r0, r1 cmp r0, 0 - bne _081442FC + bne @081442FC adds r1, r2, 0 adds r1, 0x7D movs r0, 0xFF @@ -623854,10 +623854,10 @@ sub_8144264: @ 8144264 str r0, [r6, 0x1C] movs r0, 0x47 bl m4aSongNumStartOrChange - b _081443F8 + b @081443F8 .align 2, 0 .pool -_081442FC: +@081442FC: movs r0, 0x38 bl m4aSongNumStart bl GenerateRandomNumber @@ -623866,7 +623866,7 @@ _081442FC: ands r1, r0 mov r8, r1 cmp r1, 0 - beq _08144340 + beq @08144340 ldr r4, [r4] adds r1, r4, 0 adds r1, 0x8C @@ -623884,10 +623884,10 @@ _081442FC: adds r1, 0x7F strb r0, [r1] ldr r5, =0x085b6348 - b _08144378 + b @08144378 .align 2, 0 .pool -_08144340: +@08144340: ldr r7, [r4] adds r4, r7, 0 adds r4, 0x8C @@ -623914,7 +623914,7 @@ _08144340: adds r0, r7, 0 adds r0, 0x7F strb r4, [r0] -_08144378: +@08144378: ldr r0, =0x085b62e4 lsls r1, r2, 3 adds r0, 0x4 @@ -623925,7 +623925,7 @@ _08144378: ldr r0, [r3, 0x8] ands r1, r0 cmp r1, 0 - beq _081443AC + beq @081443AC movs r0, 0x1 strh r0, [r6, 0x2E] ldrb r0, [r3, 0x4] @@ -623934,23 +623934,23 @@ _08144378: adds r0, r5 ldrb r0, [r0, 0x2] strh r0, [r6, 0x32] - b _081443E8 + b @081443E8 .align 2, 0 .pool -_081443AC: +@081443AC: strh r1, [r6, 0x2E] ldrb r1, [r3, 0x4] movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _081443C4 + beq @081443C4 lsls r0, r1, 30 lsrs r0, 25 adds r0, r5 ldrb r0, [r0, 0x1] strh r0, [r6, 0x32] - b _081443E8 -_081443C4: + b @081443E8 +@081443C4: lsls r0, r1, 30 lsrs r0, 25 adds r0, r5 @@ -623958,20 +623958,20 @@ _081443C4: strh r0, [r6, 0x32] mov r0, r8 cmp r0, 0 - beq _081443E0 + beq @081443E0 adds r1, r3, 0 adds r1, 0x8C ldr r0, =0x3f000000 - b _081443E6 + b @081443E6 .align 2, 0 .pool -_081443E0: +@081443E0: adds r1, r3, 0 adds r1, 0x8C ldr r0, =0xbfc00000 -_081443E6: +@081443E6: str r0, [r1] -_081443E8: +@081443E8: ldr r0, [r2] adds r0, 0x98 ldr r1, =0x3dae147b @@ -623980,7 +623980,7 @@ _081443E8: str r0, [r6, 0x1C] movs r0, 0x5 strh r0, [r6, 0x30] -_081443F8: +@081443F8: pop {r3} mov r8, r3 pop {r4-r7} @@ -623991,7 +623991,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 @@ -624005,14 +624005,14 @@ sub_8144410: @ 8144410 ldr r1, =0x3f000000 bl __gtsf2 cmp r0, 0 - bgt _081444FA + bgt @081444FA adds r0, r6, 0 bl sub_8143B14 adds r0, r6, 0 bl sub_8143B48 lsls r0, 16 cmp r0, 0 - bne _081444BC + bne @081444BC ldr r2, [r4] adds r1, r2, 0 adds r1, 0x90 @@ -624033,11 +624033,11 @@ sub_8144410: @ 8144410 bl __floatsisf adds r5, r0, 0 cmp r4, 0 - bge _08144476 + bge @08144476 ldr r1, =0x43800000 bl __addsf3 adds r5, r0, 0 -_08144476: +@08144476: lsrs r0, r7, 25 add r0, r9 ldrb r0, [r0, 0x4] @@ -624056,10 +624056,10 @@ _08144476: strh r0, [r6, 0x30] ldr r0, =sub_8144264 + 1 str r0, [r6, 0x1C] - b _081444FA + b @081444FA .align 2, 0 .pool -_081444BC: +@081444BC: ldr r4, [r4] adds r7, r4, 0 adds r7, 0x90 @@ -624068,14 +624068,14 @@ _081444BC: adds r1, r6, 0 bl __nesf2 cmp r0, 0 - beq _081444FA + beq @081444FA adds r5, r4, 0 adds r5, 0x8C ldr r0, [r5] adds r1, r6, 0 bl __ltsf2 cmp r0, 0 - bge _081444FA + bge @081444FA str r6, [r7] str r6, [r5] adds r4, 0x98 @@ -624086,7 +624086,7 @@ _081444BC: bl __divdf3 bl __truncdfsf2 str r0, [r4] -_081444FA: +@081444FA: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -624098,7 +624098,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} @@ -624112,7 +624112,7 @@ sub_8144514: @ 8144514 ldr r1, =0x42200000 bl __gtsf2 cmp r0, 0 - bgt _081445B8 + bgt @081445B8 movs r0, 0x98 adds r0, r5 mov r8, r0 @@ -624124,11 +624124,11 @@ sub_8144514: @ 8144514 bl __floatsisf adds r2, r0, 0 cmp r4, 0 - bge _08144556 + bge @08144556 ldr r1, =0x47800000 bl __addsf3 adds r2, r0, 0 -_08144556: +@08144556: ldr r0, =0x40800000 adds r1, r2, 0 bl __divsf3 @@ -624145,11 +624145,11 @@ _08144556: bl __floatsisf adds r2, r0, 0 cmp r4, 0 - bge _08144586 + bge @08144586 ldr r1, =0x47800000 bl __addsf3 adds r2, r0, 0 -_08144586: +@08144586: ldr r0, [r5] adds r1, r2, 0 bl __divsf3 @@ -624173,7 +624173,7 @@ _08144586: strh r0, [r6, 0x30] ldr r0, =sub_8144410 + 1 str r0, [r6, 0x1C] -_081445B8: +@081445B8: pop {r3} mov r8, r3 pop {r4-r7} @@ -624184,7 +624184,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} @@ -624197,7 +624197,7 @@ sub_81445D8: @ 81445D8 ldr r1, =0x42700000 bl __gtsf2 cmp r0, 0 - bgt _0814468A + bgt @0814468A movs r0, 0x5D bl m4aSongNumStartOrChange ldr r5, [r4] @@ -624212,11 +624212,11 @@ sub_81445D8: @ 81445D8 bl __floatsisf adds r2, r0, 0 cmp r4, 0 - bge _08144620 + bge @08144620 ldr r1, =0x47800000 bl __addsf3 adds r2, r0, 0 -_08144620: +@08144620: ldr r0, =0x41a00000 adds r1, r2, 0 bl __divsf3 @@ -624238,11 +624238,11 @@ _08144620: bl __floatsisf adds r2, r0, 0 cmp r4, 0 - bge _0814465C + bge @0814465C ldr r1, =0x47800000 bl __addsf3 adds r2, r0, 0 -_0814465C: +@0814465C: adds r0, r5, 0 adds r1, r2, 0 bl __divsf3 @@ -624265,7 +624265,7 @@ _0814465C: strh r0, [r6, 0x30] ldr r0, =sub_8144514 + 1 str r0, [r6, 0x1C] -_0814468A: +@0814468A: pop {r3} mov r8, r3 pop {r4-r7} @@ -624276,7 +624276,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 @@ -624302,7 +624302,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 @@ -624379,7 +624379,7 @@ sub_81446DC: @ 81446DC ldr r0, =0x085b6348 mov r12, r0 mov r10, r5 -_0814477C: +@0814477C: ldr r0, [r5] adds r3, r7, 0 adds r3, 0x37 @@ -624499,7 +624499,7 @@ _0814477C: lsrs r7, r0, 24 ldr r2, =0x02020630 cmp r7, 0x2 - bls _0814477C + bls @0814477C mov r3, r10 ldr r0, [r3] adds r0, 0x74 @@ -624529,7 +624529,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 @@ -624635,7 +624635,7 @@ sub_81448B8: @ 81448B8 adds r0, 0x2D adds r2, r0 strh r2, [r7, 0x3C] -_08144992: +@08144992: ldr r0, =0x0203ab88 ldr r4, [r0] mov r1, r8 @@ -624687,7 +624687,7 @@ _08144992: lsrs r0, 24 mov r8, r0 cmp r0, 0x1 - bls _08144992 + bls @08144992 str r7, [r4, 0x38] add sp, 0x8 pop {r3,r4} @@ -624701,7 +624701,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 @@ -624782,16 +624782,16 @@ sub_8144A24: @ 8144A24 mov r5, r9 movs r0, 0x34 ldrsh r2, [r7, r0] -_08144ACA: +@08144ACA: cmp r1, r2 - bge _08144AD6 + bge @08144AD6 adds r0, r1, 0 adds r0, 0x5A cmp r2, r0 - ble _08144B38 -_08144AD6: + ble @08144B38 +@08144AD6: cmp r5, 0x3 - beq _08144B1C + beq @08144B1C adds r0, r1, 0 adds r0, 0x5A lsls r0, 16 @@ -624800,28 +624800,28 @@ _08144AD6: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _08144ACA -_08144AEC: + bls @08144ACA +@08144AEC: ldr r0, =0x0203ab88 ldr r0, [r0] ldrb r1, [r0, 0x3] movs r0, 0x1F ands r0, r1 cmp r0, 0 - beq _08144B64 + beq @08144B64 movs r1, 0x2E ldrsh r0, [r7, r1] cmp r0, 0 - beq _08144B58 + beq @08144B58 movs r0, 0x98 lsls r0, 1 movs r1, 0x3F negs r1, r1 bl cry_related - b _08144B70 + b @08144B70 .align 2, 0 .pool -_08144B1C: +@08144B1C: movs r0, 0x1 strh r0, [r7, 0x2E] ldr r0, =0x0203ab88 @@ -624833,10 +624833,10 @@ _08144B1C: movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x3] - b _08144AEC + b @08144AEC .align 2, 0 .pool -_08144B38: +@08144B38: lsrs r0, r5, 1 strh r0, [r7, 0x2E] ldr r0, =0x0203ab88 @@ -624849,22 +624849,22 @@ _08144B38: ands r0, r2 orrs r0, r1 strb r0, [r3, 0x3] - b _08144AEC + b @08144AEC .align 2, 0 .pool -_08144B58: +@08144B58: movs r0, 0x98 lsls r0, 1 movs r1, 0x3F bl cry_related - b _08144B70 -_08144B64: + b @08144B70 +@08144B64: movs r0, 0x99 lsls r0, 1 movs r1, 0x3F negs r1, r1 bl cry_related -_08144B70: +@08144B70: movs r0, 0x2 mov r10, r0 ldr r4, =0x0203ab88 @@ -624881,30 +624881,30 @@ _08144B70: movs r0, 0x1F ands r0, r1 cmp r0, 0x1 - bne _08144BA8 + bne @08144BA8 ldrb r1, [r5, 0x4] movs r0, 0x3 ands r0, r1 cmp r0, 0x1 - bne _08144BA8 + bne @08144BA8 mov r0, r8 adds r0, 0x6 - b _08144BAC + b @08144BAC .align 2, 0 .pool -_08144BA8: +@08144BA8: mov r0, r8 add r0, r10 -_08144BAC: +@08144BAC: lsls r0, 24 lsrs r0, 24 mov r8, r0 mov r5, r10 cmp r5, r8 - bcs _08144C18 + bcs @08144C18 ldr r1, =0x085b6160 mov r10, r1 -_08144BBC: +@08144BBC: ldr r3, [r4] lsls r0, r6, 3 ldr r1, =0x085b62e8 @@ -624913,7 +624913,7 @@ _08144BBC: ldr r2, [r0] ands r1, r2 cmp r1, 0 - bne _08144C02 + bne @08144C02 mov r0, r9 adds r1, r0, 0x1 lsls r1, 24 @@ -624923,7 +624923,7 @@ _08144BBC: strb r5, [r0] ldr r0, [sp, 0xC] cmp r0, 0 - bne _08144C02 + bne @08144C02 ldrb r1, [r3, 0x1A] lsls r1, 28 lsrs r1, 28 @@ -624938,9 +624938,9 @@ _08144BBC: ldr r0, [r0] ands r2, r0 cmp r2, 0 - beq _08144C02 + beq @08144C02 str r5, [sp, 0xC] -_08144C02: +@08144C02: adds r0, r6, 0x1 movs r1, 0xC bl __modsi3 @@ -624950,8 +624950,8 @@ _08144C02: lsls r0, 24 lsrs r5, r0, 24 cmp r5, r8 - bcc _08144BBC -_08144C18: + bcc @08144BBC +@08144C18: ldr r0, [r4] ldrb r1, [r0, 0x3] lsls r1, 27 @@ -624960,27 +624960,27 @@ _08144C18: ldrb r0, [r0, 0x2] ands r1, r0 cmp r1, 0 - beq _08144C48 + beq @08144C48 ldr r1, [sp, 0xC] cmp r1, 0 - beq _08144C48 + beq @08144C48 movs r0, 0xFF ldr r1, [sp, 0x10] ands r0, r1 cmp r0, 0xBF - bhi _08144C48 + bhi @08144C48 mov r0, sp ldrh r0, [r0, 0xC] - b _08144C54 + b @08144C54 .align 2, 0 .pool -_08144C48: +@08144C48: ldr r0, [sp, 0x10] mov r1, r9 bl __modsi3 add r0, sp ldrb r0, [r0] -_08144C54: +@08144C54: strh r0, [r7, 0x3C] ldr r1, =sub_8144168 + 1 str r1, [r7, 0x1C] @@ -624997,7 +624997,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] @@ -625008,7 +625008,7 @@ sub_8144C70: @ 8144C70 movs r3, 0x34 ldrsh r1, [r2, r3] cmp r0, r1 - blt _08144CC0 + blt @08144CC0 ldrh r0, [r2, 0x20] subs r0, 0x2 strh r0, [r2, 0x20] @@ -625017,18 +625017,18 @@ sub_8144C70: @ 8144C70 movs r1, 0x10 negs r1, r1 cmp r0, r1 - bge _08144CC0 + bge @08144CC0 ldr r4, =0x0203ab88 ldr r3, [r4] ldrb r1, [r3, 0x3] movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _08144CAC + bne @08144CAC movs r0, 0x40 orrs r0, r1 strb r0, [r3, 0x3] -_08144CAC: +@08144CAC: adds r0, r2, 0 bl obj_delete_and_free_tiles ldr r1, [r4] @@ -625038,7 +625038,7 @@ _08144CAC: ldr r0, =0x085b7b1a ldrh r0, [r0] strh r0, [r1, 0x34] -_08144CC0: +@08144CC0: pop {r4} pop {r0} bx r0 @@ -625047,7 +625047,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 @@ -625063,11 +625063,11 @@ sub_8144CD0: @ 8144CD0 movs r3, 0x34 ldrsh r1, [r4, r3] cmp r0, r1 - bge _08144D54 + bge @08144D54 movs r0, 0x1 ands r2, r0 cmp r2, 0 - beq _08144D2E + beq @08144D2E ldr r3, =0x02021bbe movs r0, 0x3C ldrsh r2, [r4, r0] @@ -625088,14 +625088,14 @@ sub_8144CD0: @ 8144CD0 adds r1, r2, 0x1 adds r0, r1, 0 cmp r1, 0 - bge _08144D26 + bge @08144D26 adds r0, r2, 0x4 -_08144D26: +@08144D26: asrs r0, 2 lsls r0, 2 subs r0, r1, r0 strh r0, [r4, 0x3C] -_08144D2E: +@08144D2E: adds r3, r4, 0 adds r3, 0x3E ldrb r2, [r3] @@ -625109,10 +625109,10 @@ _08144D2E: ands r0, r2 orrs r0, r1 strb r0, [r3] - b _08144D7E + b @08144D7E .align 2, 0 .pool -_08144D54: +@08144D54: ldr r1, =0x02021bbe movs r0, 0 strh r0, [r1] @@ -625133,7 +625133,7 @@ _08144D54: strb r1, [r0] adds r0, r4, 0 bl obj_delete_and_free_tiles -_08144D7E: +@08144D7E: add sp, 0x18 pop {r4} pop {r0} @@ -625143,7 +625143,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] @@ -625173,14 +625173,14 @@ sub_8144D94: @ 8144D94 strh r0, [r3, 0x34] ldrb r0, [r3, 0x1] cmp r0, 0x12 - bhi _08144DDC + bhi @08144DDC adds r0, 0x1 strb r0, [r3, 0x1] -_08144DDC: +@08144DDC: movs r1, 0x30 ldrsh r0, [r5, r1] cmp r0, 0x3C - ble _08144E3E + ble @08144E3E movs r0, 0 strh r0, [r5, 0x30] ldr r3, =sub_8144C70 + 1 @@ -625225,7 +625225,7 @@ _08144DDC: str r1, [r0] movs r0, 0xD6 bl m4aSongNumStart -_08144E3E: +@08144E3E: pop {r4,r5} pop {r0} bx r0 @@ -625234,20 +625234,20 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08144EE4 + bne @08144EE4 ldr r0, =0x0203ab88 ldr r3, [r0] ldr r1, [r3, 0x38] movs r2, 0x2E ldrsh r0, [r1, r2] cmp r0, 0 - bne _08144E94 + bne @08144E94 movs r0, 0x34 ldrsh r2, [r1, r0] ldr r1, =0x085b6348 @@ -625256,10 +625256,10 @@ sub_8144E60: @ 8144E60 lsrs r0, 25 adds r0, r1 ldrh r0, [r0, 0x8] - b _08144EA6 + b @08144EA6 .align 2, 0 .pool -_08144E94: +@08144E94: movs r0, 0x34 ldrsh r2, [r1, r0] ldr r1, =0x085b6348 @@ -625269,9 +625269,9 @@ _08144E94: adds r0, r1 ldrh r0, [r0, 0x8] adds r0, 0xB4 -_08144EA6: +@08144EA6: cmp r2, r0 - bne _08144F7C + bne @08144F7C adds r2, r4, 0 adds r2, 0x3E ldrb r1, [r2] @@ -625292,10 +625292,10 @@ _08144EA6: ldr r0, =0x085b7b1a ldrh r0, [r0] strh r0, [r1, 0x34] - b _08144F7C + b @08144F7C .align 2, 0 .pool -_08144EE4: +@08144EE4: ldr r5, =0x0203ab88 ldr r3, [r5] ldr r2, =0x085b7b1a @@ -625310,16 +625310,16 @@ _08144EE4: strh r0, [r3, 0x34] ldrb r0, [r3, 0x1] cmp r0, 0x12 - bhi _08144F06 + bhi @08144F06 adds r0, 0x1 strb r0, [r3, 0x1] -_08144F06: +@08144F06: ldr r3, [r5] ldr r1, [r3, 0x38] movs r2, 0x2E ldrsh r0, [r1, r2] cmp r0, 0 - bne _08144F30 + bne @08144F30 movs r0, 0x34 ldrsh r2, [r1, r0] ldr r1, =0x085b6348 @@ -625328,10 +625328,10 @@ _08144F06: lsrs r0, 25 adds r0, r1 ldrh r0, [r0, 0xA] - b _08144F42 + b @08144F42 .align 2, 0 .pool -_08144F30: +@08144F30: movs r0, 0x34 ldrsh r2, [r1, r0] ldr r1, =0x085b6348 @@ -625341,9 +625341,9 @@ _08144F30: adds r0, r1 ldrh r0, [r0, 0xA] adds r0, 0xB4 -_08144F42: +@08144F42: cmp r2, r0 - bne _08144F7C + bne @08144F7C ldr r2, =0x02020630 movs r0, 0x36 ldrsh r1, [r4, r0] @@ -625371,7 +625371,7 @@ _08144F42: str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3C] -_08144F7C: +@08144F7C: pop {r4,r5} pop {r0} bx r0 @@ -625380,7 +625380,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 @@ -625397,7 +625397,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] @@ -625406,11 +625406,11 @@ sub_8144FB0: @ 8144FB0 movs r0, 0x10 negs r0, r0 cmp r1, r0 - ble _08144FC8 + ble @08144FC8 subs r0, r2, 0x1 strh r0, [r4, 0x22] - b _0814501C -_08144FC8: + b @0814501C +@08144FC8: ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] adds r2, r4, 0 @@ -625449,7 +625449,7 @@ _08144FC8: lsls r0, 2 adds r0, r5 bl obj_delete_and_free_tiles -_0814501C: +@0814501C: pop {r4,r5} pop {r0} bx r0 @@ -625458,14 +625458,14 @@ _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] movs r2, 0x30 ldrsh r0, [r4, r2] cmp r0, 0 - blt _0814505A + blt @0814505A subs r1, 0x1 strh r1, [r4, 0x30] ldrh r0, [r4, 0x22] @@ -625473,19 +625473,19 @@ sub_8145030: @ 8145030 strh r0, [r4, 0x22] lsls r1, 16 cmp r1, 0 - bne _081450C6 + bne @081450C6 adds r0, r4, 0 adds r0, 0x2B ldrb r0, [r0] cmp r0, 0x1 - bne _081450C6 - b _08145080 -_0814505A: + bne @081450C6 + b @08145080 +@0814505A: ldrh r1, [r4, 0x34] movs r2, 0x34 ldrsh r0, [r4, r2] cmp r0, 0 - blt _08145090 + blt @08145090 subs r0, r1, 0x1 strh r0, [r4, 0x34] adds r0, r4, 0 @@ -625494,23 +625494,23 @@ _0814505A: movs r0, 0x3F ands r0, r1 cmp r0, 0 - bne _081450C6 + bne @081450C6 adds r0, r4, 0 adds r0, 0x2B ldrb r0, [r0] cmp r0, 0x1 - bne _08145088 -_08145080: + bne @08145088 +@08145080: ldrh r0, [r4, 0x26] adds r0, 0x1 strh r0, [r4, 0x26] - b _081450C6 -_08145088: + b @081450C6 +@08145088: ldrh r0, [r4, 0x26] subs r0, 0x1 strh r0, [r4, 0x26] - b _081450C6 -_08145090: + b @081450C6 +@08145090: movs r0, 0x2B bl m4aSongNumStart ldr r0, =0x0203ab88 @@ -625536,7 +625536,7 @@ _08145090: movs r1, 0x7F ands r1, r2 strb r1, [r0] -_081450C6: +@081450C6: pop {r4} pop {r0} bx r0 @@ -625545,7 +625545,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 @@ -625564,7 +625564,7 @@ sub_81450D8: @ 81450D8 lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - ble _0814516C + ble @0814516C ldr r0, =0x0203ab88 ldr r0, [r0] ldr r0, [r0, 0x38] @@ -625581,7 +625581,7 @@ sub_81450D8: @ 81450D8 bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - beq _08145208 + beq @08145208 movs r1, 0x20 ldrsh r0, [r4, r1] movs r4, 0x74 @@ -625601,13 +625601,13 @@ sub_81450D8: @ 81450D8 adds r1, r5, 0 adds r2, r4, 0 bl MPlayPanpotControl - b _08145208 + b @08145208 .align 2, 0 .pool -_0814516C: +@0814516C: lsls r0, r1, 16 cmp r0, 0 - blt _081451BC + blt @081451BC ldr r0, =0x0203ab88 ldr r0, [r0] ldr r0, [r0, 0x38] @@ -625642,10 +625642,10 @@ _0814516C: ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] - b _08145208 + b @08145208 .align 2, 0 .pool -_081451BC: +@081451BC: movs r0, 0x5E bl m4aSongNumStartOrChange ldr r0, =0x0203ab88 @@ -625654,21 +625654,21 @@ _081451BC: movs r2, 0x2E ldrsh r0, [r0, r2] cmp r0, 0 - bne _081451E0 + bne @081451E0 movs r0, 0x98 lsls r0, 1 movs r1, 0x3F bl cry_related - b _081451EC + b @081451EC .align 2, 0 .pool -_081451E0: +@081451E0: movs r0, 0x98 lsls r0, 1 movs r1, 0x3F negs r1, r1 bl cry_related -_081451EC: +@081451EC: ldr r0, =0x0203ab88 ldr r0, [r0] ldr r0, [r0, 0x38] @@ -625682,7 +625682,7 @@ _081451EC: strh r0, [r4, 0x30] ldr r0, =sub_8145030 + 1 str r0, [r4, 0x1C] -_08145208: +@08145208: add sp, 0x14 pop {r4,r5} pop {r0} @@ -625692,7 +625692,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 @@ -625705,7 +625705,7 @@ sub_8145218: @ 8145218 strh r1, [r4, 0x30] lsls r0, 16 cmp r0, 0 - blt _08145284 + blt @08145284 ldr r0, =0x0203ab88 ldr r0, [r0] ldr r0, [r0, 0x38] @@ -625738,13 +625738,13 @@ sub_8145218: @ 8145218 ands r0, r3 orrs r0, r1 strb r0, [r2] - b _08145288 + b @08145288 .align 2, 0 .pool -_08145284: +@08145284: ldr r0, =sub_8144F94 + 1 str r0, [r4, 0x1C] -_08145288: +@08145288: add sp, 0x4 pop {r4} pop {r0} @@ -625754,7 +625754,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 @@ -625763,7 +625763,7 @@ sub_8145294: @ 8145294 movs r2, 0x2E ldrsh r0, [r1, r2] cmp r0, 0 - bne _081452DC + bne @081452DC movs r0, 0x34 ldrsh r2, [r1, r0] ldr r1, =0x085b6348 @@ -625774,7 +625774,7 @@ sub_8145294: @ 8145294 ldrh r0, [r0, 0x12] adds r0, 0x5A cmp r2, r0 - bne _0814533E + bne @0814533E ldr r2, =0x02020630 movs r0, 0x3A ldrsh r1, [r4, r0] @@ -625783,10 +625783,10 @@ sub_8145294: @ 8145294 lsls r0, 2 adds r0, r2 movs r3, 0x34 - b _08145306 + b @08145306 .align 2, 0 .pool -_081452DC: +@081452DC: movs r0, 0x34 ldrsh r2, [r1, r0] ldr r1, =0x085b6348 @@ -625799,7 +625799,7 @@ _081452DC: lsls r1, 1 adds r0, r1 cmp r2, r0 - bne _0814533E + bne @0814533E ldr r2, =0x02020630 movs r0, 0x3A ldrsh r1, [r4, r0] @@ -625808,7 +625808,7 @@ _081452DC: lsls r0, 2 adds r0, r2 movs r3, 0x2E -_08145306: +@08145306: strh r3, [r0, 0x30] movs r0, 0x36 ldrsh r1, [r4, r0] @@ -625836,7 +625836,7 @@ _08145306: str r1, [r0] movs r0, 0x2B bl m4aSongNumStart -_0814533E: +@0814533E: pop {r4} pop {r0} bx r0 @@ -625845,7 +625845,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} @@ -625857,23 +625857,23 @@ sub_8145354: @ 8145354 ldr r0, =0x030061ec ldrb r0, [r0] cmp r0, 0x1 - beq _081453F8 + beq @081453F8 cmp r0, 0x1 - bgt _0814537C + bgt @0814537C cmp r0, 0 - beq _08145382 - b _0814544A + beq @08145382 + b @0814544A .align 2, 0 .pool -_0814537C: +@0814537C: cmp r0, 0x2 - beq _08145434 - b _0814544A -_08145382: + beq @08145434 + b @0814544A +@08145382: ldr r5, =0x0203ab90 ldr r0, [r5] cmp r0, 0 - bne _0814539E + bne @0814539E movs r0, 0x1C bl malloc_and_clear str r0, [r5] @@ -625882,7 +625882,7 @@ _08145382: movs r1, 0x7 bl Window_GetField str r0, [r4] -_0814539E: +@0814539E: ldr r1, [r5] ldrh r0, [r6] movs r2, 0 @@ -625908,7 +625908,7 @@ _0814539E: movs r2, 0x1 bl sub_8145824 movs r4, 0 -_081453D2: +@081453D2: adds r0, r7, 0 ldr r1, =0x085b8c10 movs r2, 0x20 @@ -625918,20 +625918,20 @@ _081453D2: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xDF - bls _081453D2 - b _08145420 + bls @081453D2 + b @08145420 .align 2, 0 .pool -_081453F8: +@081453F8: movs r4, 0 ldr r1, =0x0203ab90 ldr r0, [r1] ldrb r0, [r0, 0x16] lsls r0, 3 cmp r8, r0 - bge _08145420 + bge @08145420 adds r5, r1, 0 -_08145408: +@08145408: adds r0, r4, 0 movs r1, 0 bl sub_81456A8 @@ -625942,16 +625942,16 @@ _08145408: ldrb r0, [r0, 0x16] lsls r0, 3 cmp r4, r0 - blt _08145408 -_08145420: + blt @08145408 +@08145420: ldr r1, =0x030061ec ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0814544A + b @0814544A .align 2, 0 .pool -_08145434: +@08145434: adds r0, r7, 0 bl sub_8145814 ldr r0, =0x085b8bf0 @@ -625961,7 +625961,7 @@ _08145434: bl gpu_pal_apply movs r0, 0x1 mov r8, r0 -_0814544A: +@0814544A: mov r0, r8 pop {r3} mov r8, r3 @@ -625973,7 +625973,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 @@ -625986,59 +625986,59 @@ sub_814545C: @ 814545C ldr r1, [r2] ldrb r0, [r1, 0x1B] cmp r0, 0 - beq _0814547E + beq @0814547E subs r0, 0x1 strb r0, [r1, 0x1B] -_0814547E: +@0814547E: ldr r1, [r2] ldrb r0, [r1, 0x1A] cmp r0, 0 - beq _081454A4 + beq @081454A4 subs r0, 0x1 strb r0, [r1, 0x1A] ldr r1, [r2] ldrb r0, [r1, 0x1A] cmp r0, 0 - bne _081454A4 + bne @081454A4 ldrh r0, [r1, 0x18] bl sub_8145588 bl sub_814560C - b _0814552A + b @0814552A .align 2, 0 .pool -_081454A4: +@081454A4: ldr r5, =0x0203ab90 ldr r0, [r5] ldrb r0, [r0, 0x10] cmp r0, 0 - bne _081454B8 + bne @081454B8 bl sub_814560C - b _0814552A + b @0814552A .align 2, 0 .pool -_081454B8: +@081454B8: cmp r0, 0x1 - bne _081454C2 + bne @081454C2 bl sub_81455A8 - b _081454E6 -_081454C2: + b @081454E6 +@081454C2: cmp r0, 0x8 - bls _081454E6 + bls @081454E6 bl sub_80A36EC lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _081454DC + bne @081454DC bl sub_814560C ldr r0, [r5] strb r4, [r0, 0x10] - b _0814552A -_081454DC: + b @0814552A +@081454DC: bl sub_81455A8 ldr r1, [r5] movs r0, 0x1 strb r0, [r1, 0x10] -_081454E6: +@081454E6: ldr r5, =0x0203ab90 ldr r1, [r5] ldrb r4, [r1, 0x10] @@ -626071,7 +626071,7 @@ _081454E6: ldrb r0, [r1, 0x10] adds r0, 0x1 strb r0, [r1, 0x10] -_0814552A: +@0814552A: pop {r4,r5} pop {r0} bx r0 @@ -626080,7 +626080,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 @@ -626088,41 +626088,41 @@ sub_8145534: @ 8145534 ldr r0, =0x03007420 ldr r0, [r0, 0x4] cmp r0, 0 - bge _08145582 + bge @08145582 ldr r6, =0x0203ab90 ldr r1, [r6] ldrb r0, [r1, 0x1A] cmp r0, 0 - bne _08145582 + bne @08145582 ldrb r0, [r1, 0x1B] cmp r0, 0 - bne _08145582 + bne @08145582 movs r0, 0x4 strb r0, [r1, 0x1B] bl sub_80A36EC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0814557C + bne @0814557C bl sub_80A36B4 ldr r1, [r6] strh r4, [r1, 0x18] movs r0, 0x2 strb r0, [r1, 0x1A] - b _08145582 + b @08145582 .align 2, 0 .pool -_0814557C: +@0814557C: adds r0, r5, 0 bl sub_8145588 -_08145582: +@08145582: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_8145534 thumb_func_start sub_8145588 -sub_8145588: @ 8145588 +sub_8145588: ; 8145588 push {lr} lsls r0, 16 lsrs r0, 16 @@ -626141,18 +626141,18 @@ 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 ldrsb r0, [r3, r0] cmp r0, 0x1 - bgt _081455C0 + bgt @081455C0 ldr r0, =0x030066d0 - b _081455D8 + b @081455D8 .align 2, 0 .pool -_081455C0: +@081455C0: ldr r2, =0x03006380 ldrb r1, [r2, 0xB] movs r0, 0 @@ -626165,13 +626165,13 @@ _081455C0: lsls r1, 2 adds r2, r1 adds r0, r2 -_081455D8: +@081455D8: movs r1, 0xC6 lsls r1, 3 adds r3, r0, r1 movs r2, 0 ldr r4, =0x0203ab90 -_081455E2: +@081455E2: ldr r1, [r4] adds r1, r2 lsls r0, r2, 1 @@ -626185,7 +626185,7 @@ _081455E2: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xF - bls _081455E2 + bls @081455E2 pop {r4} pop {r0} bx r0 @@ -626194,7 +626194,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] @@ -626225,7 +626225,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 @@ -626252,7 +626252,7 @@ sub_8145648: @ 8145648 lsls r0, 16 lsrs r5, r0, 16 movs r4, 0 -_0814567E: +@0814567E: lsls r3, r4, 5 adds r3, r5, r3 lsls r3, 16 @@ -626265,7 +626265,7 @@ _0814567E: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x6 - bls _0814567E + bls @0814567E pop {r4-r6} pop {r0} bx r0 @@ -626274,7 +626274,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 @@ -626290,40 +626290,40 @@ sub_81456A8: @ 81456A8 lsrs r1, 16 adds r0, r1, 0 bl __floatsidf - ldr r3, _08145768 - ldr r2, _08145764 + ldr r3, @08145768 + ldr r2, @08145764 bl __divdf3 bl __fixunsdfsi lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x37 - bls _081456DE + bls @081456DE movs r5, 0x37 -_081456DE: +@081456DE: str r5, [sp] movs r6, 0x1 ands r6, r4 - ldr r0, _0814576C + ldr r0, @0814576C ldr r1, [r0] lsrs r7, 27 mov r8, r7 - ldr r0, _08145770 + ldr r0, @08145770 ldrb r1, [r1, 0x12] cmp r5, r1 - bls _08145780 - ldr r3, _08145774 + bls @08145780 + ldr r3, @08145774 adds r0, r6, r0 ldrb r0, [r0] mov r9, r0 movs r7, 0x7 ands r7, r4 -_08145700: +@08145700: lsls r1, r5, 1 lsls r0, r7, 3 adds r0, r7 lsls r0, 4 adds r1, r0 - ldr r2, _08145778 + ldr r2, @08145778 adds r1, r2 mov r4, r8 lsls r0, r4, 5 @@ -626350,7 +626350,7 @@ _08145700: ands r0, r1 lsls r1, r6, 4 adds r0, r1 - ldr r1, _0814577C + ldr r1, @0814577C adds r0, r1 ldrb r1, [r4] ldrb r0, [r0] @@ -626359,37 +626359,37 @@ _08145700: subs r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 - ldr r2, _0814576C + ldr r2, @0814576C ldr r0, [r2] ldr r3, [sp, 0x4] ldrb r0, [r0, 0x12] cmp r5, r0 - bhi _08145700 - b _081457EA + bhi @08145700 + b @081457EA .align 2, 0 -_08145764: .4byte 0x40920000 -_08145768: .4byte 0x00000000 -_0814576C: .4byte 0x0203ab90 -_08145770: .4byte 0x085b8c30 -_08145774: .4byte 0x0203ab94 -_08145778: .4byte 0x085b8770 -_0814577C: .4byte 0x085b8c32 -_08145780: +@08145764: .4byte 0x40920000 +@08145768: .4byte 0x00000000 +@0814576C: .4byte 0x0203ab90 +@08145770: .4byte 0x085b8c30 +@08145774: .4byte 0x0203ab94 +@08145778: .4byte 0x085b8770 +@0814577C: .4byte 0x085b8c32 +@08145780: lsls r3, r6, 4 mov r10, r3 - ldr r7, _08145804 + ldr r7, @08145804 adds r0, r6, r0 ldrb r0, [r0] mov r9, r0 movs r6, 0x7 ands r6, r4 -_08145790: +@08145790: lsls r1, r5, 1 lsls r0, r6, 3 adds r0, r6 lsls r0, 4 adds r1, r0 - ldr r4, _08145808 + ldr r4, @08145808 adds r1, r4 mov r2, r8 lsls r0, r2, 5 @@ -626414,7 +626414,7 @@ _08145790: movs r1, 0xF ands r0, r1 add r0, r10 - ldr r1, _0814580C + ldr r1, @0814580C adds r0, r1 ldrb r1, [r4] ldrb r0, [r0] @@ -626423,13 +626423,13 @@ _08145790: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 - ldr r2, _08145810 + ldr r2, @08145810 ldr r0, [r2] ldrb r0, [r0, 0x12] cmp r5, r0 - bcc _08145790 -_081457EA: - ldr r3, _08145810 + bcc @08145790 +@081457EA: + ldr r3, @08145810 ldr r0, [r3] mov r4, sp ldrb r4, [r4] @@ -626443,14 +626443,14 @@ _081457EA: pop {r0} bx r0 .align 2, 0 -_08145804: .4byte 0x0203ab94 -_08145808: .4byte 0x085b8770 -_0814580C: .4byte 0x085b8c32 -_08145810: .4byte 0x0203ab90 +@08145804: .4byte 0x0203ab94 +@08145808: .4byte 0x085b8770 +@0814580C: .4byte 0x085b8c32 +@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 @@ -626461,7 +626461,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 @@ -626469,7 +626469,7 @@ sub_8145824: @ 8145824 lsrs r4, r1, 16 lsls r2, 24 cmp r2, 0 - bne _08145848 + bne @08145848 movs r1, 0 bl Window_GetField lsls r0, 24 @@ -626478,14 +626478,14 @@ sub_8145824: @ 8145824 asrs r1, 8 movs r2, 0 bl bg_change_x_offset -_08145848: +@08145848: pop {r4} pop {r0} bx r0 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} @@ -626497,21 +626497,21 @@ sub_8145850: @ 8145850 ldr r6, =0x030061ec ldrb r0, [r6] cmp r0, 0 - beq _08145874 + beq @08145874 cmp r0, 0x1 - beq _081458B0 - b _081458F8 + beq @081458B0 + b @081458F8 .align 2, 0 .pool -_08145874: +@08145874: ldr r5, =0x0203ab98 ldr r0, [r5] cmp r0, 0 - bne _08145884 + bne @08145884 movs r0, 0x8 bl malloc_and_clear str r0, [r5] -_08145884: +@08145884: ldr r1, =0x085b8438 adds r0, r7, 0 movs r2, 0 @@ -626525,10 +626525,10 @@ _08145884: ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] - b _081458F8 + b @081458F8 .align 2, 0 .pool -_081458B0: +@081458B0: ldr r0, =0x085b8c80 bl gpu_tile_obj_alloc_and_load_multiple ldr r0, =0x085b8c90 @@ -626562,7 +626562,7 @@ _081458B0: strb r4, [r0, 0x2] movs r0, 0x1 mov r8, r0 -_081458F8: +@081458F8: mov r0, r8 pop {r3} mov r8, r3 @@ -626574,7 +626574,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 @@ -626613,7 +626613,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 @@ -626644,78 +626644,78 @@ sub_814596C: @ 814596C ldr r0, [r0] ldrb r1, [r0, 0x10] cmp r1, 0x2 - beq _081459E8 + beq @081459E8 cmp r1, 0x2 - bgt _081459C0 + bgt @081459C0 cmp r1, 0 - beq _081459C6 - b _08145A2E + beq @081459C6 + b @08145A2E .align 2, 0 .pool -_081459C0: +@081459C0: cmp r1, 0x6 - beq _08145A20 - b _08145A2E -_081459C6: + beq @08145A20 + b @08145A2E +@081459C6: movs r0, 0x20 strb r0, [r2, 0x1] ldr r1, [r4] movs r0, 0 ldrsb r0, [r1, r0] cmp r0, 0 - ble _081459E2 + ble @081459E2 ldrb r0, [r1, 0x2] add r4, sp, 0xC cmp r0, 0x1 - beq _08145A30 + beq @08145A30 subs r0, 0x1 strb r0, [r1, 0x2] - b _08145A30 -_081459E2: + b @08145A30 +@081459E2: movs r0, 0x5 strb r0, [r1, 0x2] - b _08145A2E -_081459E8: + b @08145A2E +@081459E8: movs r3, 0 movs r2, 0 add r4, sp, 0xC adds r5, r0, 0 -_081459F0: +@081459F0: lsls r1, r3, 24 asrs r1, 24 adds r0, r5, r2 ldrb r0, [r0] cmp r1, r0 - bge _081459FE + bge @081459FE adds r3, r0, 0 -_081459FE: +@081459FE: adds r0, r2, 0x1 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0xF - bls _081459F0 + bls @081459F0 lsls r0, r3, 24 asrs r0, 24 movs r1, 0xD0 muls r0, r1 cmp r0, 0 - bge _08145A16 + bge @08145A16 adds r0, 0xFF -_08145A16: +@08145A16: lsls r0, 16 asrs r0, 24 bl sub_8145B24 - b _08145A30 -_08145A20: + b @08145A30 +@08145A20: ldrb r1, [r0, 0xA] movs r0, 0xD0 muls r0, r1 lsls r0, 16 asrs r0, 24 bl sub_8145B24 -_08145A2E: +@08145A2E: add r4, sp, 0xC -_08145A30: +@08145A30: ldr r0, =0x0203ab98 ldr r2, [r0] ldrb r5, [r2] @@ -626725,9 +626725,9 @@ _08145A30: ldrsb r3, [r2, r3] adds r6, r0, 0 cmp r1, r3 - beq _08145A82 + beq @08145A82 cmp r1, r3 - bge _08145A64 + bge @08145A64 ldrb r0, [r2, 0x2] adds r0, r5, r0 strb r0, [r2] @@ -626738,11 +626738,11 @@ _08145A30: movs r0, 0x1 ldrsb r0, [r2, r0] cmp r1, r0 - ble _08145A82 - b _08145A7A + ble @08145A82 + b @08145A7A .align 2, 0 .pool -_08145A64: +@08145A64: ldrb r0, [r2, 0x2] subs r0, r5, r0 strb r0, [r2] @@ -626753,13 +626753,13 @@ _08145A64: movs r0, 0x1 ldrsb r0, [r2, r0] cmp r1, r0 - bge _08145A82 -_08145A7A: + bge @08145A82 +@08145A7A: strb r3, [r2] ldr r1, [r6] movs r0, 0 strb r0, [r1, 0x1] -_08145A82: +@08145A82: ldr r2, =0xffff0000 ldr r0, [sp, 0x4] ands r0, r2 @@ -626785,7 +626785,7 @@ _08145A82: adds r1, r4, 0 movs r2, 0x1 movs r3, 0x2 - bl _082E709C + bl ObjAffineSet add r0, sp, 0xC ldrh r1, [r0] ldrh r2, [r4, 0x2] @@ -626814,9 +626814,9 @@ _08145A82: adds r0, r1 lsls r0, 3 cmp r0, 0 - bge _08145AF6 + bge @08145AF6 adds r0, 0xFF -_08145AF6: +@08145AF6: asrs r0, 8 strh r0, [r7, 0x24] lsls r1, r2, 16 @@ -626825,9 +626825,9 @@ _08145AF6: adds r0, r1 lsls r0, 3 cmp r0, 0 - bge _08145B0A + bge @08145B0A adds r0, 0xFF -_08145B0A: +@08145B0A: asrs r0, 8 strh r0, [r7, 0x26] add sp, 0x14 @@ -626839,7 +626839,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 @@ -626852,9 +626852,9 @@ sub_8145B24: @ 8145B24 lsls r0, 16 lsrs r0, 16 cmp r0, 0xBE - bhi _08145B40 + bhi @08145B40 movs r2, 0xE0 -_08145B40: +@08145B40: ldr r1, =0x0203ab98 ldr r0, [r1] strb r2, [r0, 0x1] @@ -626868,7 +626868,7 @@ _08145B40: thumb_func_end sub_8145B24 thumb_func_start sub_8145B54 -sub_8145B54: @ 8145B54 +sub_8145B54: ; 8145B54 push {r4,lr} sub sp, 0xC adds r1, r0, 0 @@ -626906,7 +626906,7 @@ sub_8145B54: @ 8145B54 thumb_func_end sub_8145B54 thumb_func_start sub_8145BAC -sub_8145BAC: @ 8145BAC +sub_8145BAC: ; 8145BAC push {r4,r5,lr} sub sp, 0x18 adds r5, r0, 0 @@ -626954,7 +626954,7 @@ sub_8145BAC: @ 8145BAC thumb_func_end sub_8145BAC thumb_func_start sub_8145C14 -sub_8145C14: @ 8145C14 +sub_8145C14: ; 8145C14 push {r4,lr} ldr r4, =0x0203ab9c ldrb r0, [r4] @@ -626970,7 +626970,7 @@ sub_8145C14: @ 8145C14 thumb_func_end sub_8145C14 thumb_func_start sub_8145C30 -sub_8145C30: @ 8145C30 +sub_8145C30: ; 8145C30 ldr r0, =0x03005d8c ldr r1, [r0] ldr r0, =0x00000494 @@ -626989,7 +626989,7 @@ sub_8145C30: @ 8145C30 thumb_func_end sub_8145C30 thumb_func_start sub_8145C58 -sub_8145C58: @ 8145C58 +sub_8145C58: ; 8145C58 lsls r0, 16 lsrs r0, 16 ldr r1, =0x03005d8c @@ -627008,7 +627008,7 @@ sub_8145C58: @ 8145C58 thumb_func_end sub_8145C58 thumb_func_start sub_8145C80 -sub_8145C80: @ 8145C80 +sub_8145C80: ; 8145C80 push {r4,lr} lsls r0, 16 lsrs r4, r0, 16 @@ -627017,32 +627017,32 @@ sub_8145C80: @ 8145C80 lsrs r1, r0, 16 ldr r0, =0x0000270e cmp r1, r0 - bls _08145C9C + bls @08145C9C movs r0, 0 - b _08145CC0 + b @08145CC0 .align 2, 0 .pool -_08145C9C: +@08145C9C: adds r0, r1, r4 cmp r1, r0 - ble _08145CAC + ble @08145CAC ldr r0, =0x0000270f - b _08145CBA + b @08145CBA .align 2, 0 .pool -_08145CAC: +@08145CAC: lsls r0, 16 lsrs r1, r0, 16 ldr r0, =0x0000270f cmp r1, r0 - bls _08145CB8 + bls @08145CB8 adds r1, r0, 0 -_08145CB8: +@08145CB8: adds r0, r1, 0 -_08145CBA: +@08145CBA: bl sub_8145C58 movs r0, 0x1 -_08145CC0: +@08145CC0: pop {r4} pop {r1} bx r1 @@ -627051,7 +627051,7 @@ _08145CC0: thumb_func_end sub_8145C80 thumb_func_start sub_8145CCC -sub_8145CCC: @ 8145CCC +sub_8145CCC: ; 8145CCC push {r4,lr} lsls r0, 16 lsrs r4, r0, 16 @@ -627059,23 +627059,23 @@ sub_8145CCC: @ 8145CCC lsls r0, 16 lsrs r0, 16 cmp r0, r4 - bcs _08145CE2 + bcs @08145CE2 movs r0, 0 - b _08145CEE -_08145CE2: + b @08145CEE +@08145CE2: subs r0, r4 lsls r0, 16 lsrs r0, 16 bl sub_8145C58 movs r0, 0x1 -_08145CEE: +@08145CEE: pop {r4} pop {r1} bx r1 thumb_func_end sub_8145CCC thumb_func_start sub_8145CF4 -sub_8145CF4: @ 8145CF4 +sub_8145CF4: ; 8145CF4 push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 @@ -627086,47 +627086,47 @@ sub_8145CF4: @ 8145CF4 bl sub_8145D48 adds r4, r0, 0 cmp r4, 0 - bne _08145D10 -_08145D0C: + bne @08145D10 +@08145D0C: movs r0, 0 - b _08145D42 -_08145D10: + b @08145D42 +@08145D10: ldr r6, =0x0000ffff - b _08145D26 + b @08145D26 .align 2, 0 .pool -_08145D18: +@08145D18: subs r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_08145D1E: +@08145D1E: adds r4, 0x4 ldr r0, [r4] cmp r0, 0 - beq _08145D0C -_08145D26: + beq @08145D0C +@08145D26: ldr r1, [r4] ldrh r0, [r1, 0x4] cmp r0, r6 - beq _08145D3A + beq @08145D3A bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08145D1E -_08145D3A: + bne @08145D1E +@08145D3A: cmp r5, 0 - bne _08145D18 + bne @08145D18 ldr r0, [r4] ldr r0, [r0] -_08145D42: +@08145D42: pop {r4-r6} pop {r1} bx r1 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 @@ -627137,16 +627137,16 @@ sub_8145D48: @ 8145D48 ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0xD5 - beq _08145DB8 + beq @08145DB8 adds r1, r4, 0 -_08145D60: +@08145D60: lsls r0, r2, 3 adds r0, r1 ldrb r0, [r0] cmp r0, r3 - bhi _08145DB8 + bhi @08145DB8 cmp r0, r3 - beq _08145D7E + beq @08145D7E adds r0, r2, 0x1 lsls r0, 16 lsrs r2, r0, 16 @@ -627154,31 +627154,31 @@ _08145D60: adds r0, r1 ldrb r0, [r0] cmp r0, 0xD5 - bne _08145D60 -_08145D7E: + bne @08145D60 +@08145D7E: lsls r0, r2, 3 adds r0, r1 ldrb r0, [r0] cmp r0, 0xD5 - bne _08145D98 - b _08145DB8 + bne @08145D98 + b @08145DB8 .align 2, 0 .pool -_08145D90: +@08145D90: adds r0, r4, 0x4 adds r0, r1, r0 ldr r0, [r0] - b _08145DBA -_08145D98: + b @08145DBA +@08145D98: cmp r0, r3 - bne _08145DB8 + bne @08145DB8 ldr r5, =0x085b91b8 -_08145D9E: +@08145D9E: lsls r1, r2, 3 adds r0, r1, r5 ldrb r0, [r0, 0x1] cmp r0, r6 - beq _08145D90 + beq @08145D90 adds r0, r2, 0x1 lsls r0, 16 lsrs r2, r0, 16 @@ -627186,10 +627186,10 @@ _08145D9E: adds r0, r4 ldrb r0, [r0] cmp r0, r3 - beq _08145D9E -_08145DB8: + beq @08145D9E +@08145DB8: movs r0, 0 -_08145DBA: +@08145DBA: pop {r4-r6} pop {r1} bx r1 @@ -627198,17 +627198,17 @@ _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 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08145DD8 + beq @08145DD8 movs r0, 0 - b _08145DF2 -_08145DD8: + b @08145DF2 +@08145DD8: ldr r4, =0x020375f0 bl brm_get_pokemon_selection lsls r0, 24 @@ -627221,7 +627221,7 @@ _08145DD8: ldr r0, =sub_8145E0C + 1 str r0, [r1] movs r0, 0x1 -_08145DF2: +@08145DF2: pop {r4} pop {r1} bx r1 @@ -627230,7 +627230,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 @@ -627246,7 +627246,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 @@ -627276,7 +627276,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 oe_active_list_remove @@ -627286,37 +627286,37 @@ 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] cmp r0, 0 - beq _08145E98 + beq @08145E98 cmp r0, 0x1 - beq _08145EAC - b _08145EC0 + beq @08145EAC + b @08145EC0 .align 2, 0 .pool -_08145E98: +@08145E98: ldr r0, =0x0300120a ldrb r0, [r0] bl sub_8145F6C ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b _08145EC0 + b @08145EC0 .align 2, 0 .pool -_08145EAC: +@08145EAC: bl sub_8145F20 lsls r0, 24 cmp r0, 0 - beq _08145EC0 + beq @08145EC0 movs r0, 0 strb r0, [r4] ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 -_08145EC0: +@08145EC0: bl run_active_tasks bl call_obj_callbacks bl obj_sync_something @@ -627329,7 +627329,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] @@ -627342,7 +627342,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 @@ -627357,7 +627357,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 @@ -627367,7 +627367,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 + 1 bl get_task_id_by_function @@ -627381,12 +627381,12 @@ sub_8145F20: @ 8145F20 movs r1, 0x26 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08145F4C + bne @08145F4C movs r0, 0 - b _08145F60 + b @08145F60 .align 2, 0 .pool -_08145F4C: +@08145F4C: adds r0, r2, 0 bl remove_task ldr r4, =0x0203aba0 @@ -627395,7 +627395,7 @@ _08145F4C: movs r0, 0 str r0, [r4] movs r0, 0x1 -_08145F60: +@08145F60: pop {r4} pop {r1} bx r1 @@ -627404,7 +627404,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 @@ -627432,7 +627432,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 @@ -627442,7 +627442,7 @@ sub_8145FA8: @ 8145FA8 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_08145FBA: +@08145FBA: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -627452,7 +627452,7 @@ _08145FBA: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _08145FBA + bne @08145FBA pop {r4,r5} pop {r0} bx r0 @@ -627461,7 +627461,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 @@ -627476,28 +627476,28 @@ sub_8145FE0: @ 8145FE0 adds r0, r1 ldr r0, [r0] cmp r0, 0 - bne _0814601C + bne @0814601C movs r0, 0x2 strh r0, [r4, 0x8] movs r0, 0x1 - b _0814602A + b @0814602A .align 2, 0 .pool -_0814601C: +@0814601C: movs r1, 0x4 bl AddTask ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] movs r0, 0 -_0814602A: +@0814602A: pop {r4} pop {r1} bx r1 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, =0x085c8948 @@ -627510,24 +627510,24 @@ sub_8146030: @ 8146030 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _08146054 + beq @08146054 movs r0, 0 - b _0814605C + b @0814605C .align 2, 0 .pool -_08146054: +@08146054: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] movs r0, 0x1 -_0814605C: +@0814605C: pop {r4} pop {r1} bx r1 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, =0x085c89f0 @@ -627550,7 +627550,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 @@ -627565,10 +627565,10 @@ sub_814608C: @ 814608C lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _081460B0 + bne @081460B0 movs r0, 0x1 strh r0, [r4, 0x26] -_081460B0: +@081460B0: movs r0, 0 pop {r4} pop {r1} @@ -627578,7 +627578,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 @@ -627593,7 +627593,7 @@ sub_81460BC: @ 81460BC movs r3, 0x8 ldrsh r0, [r1, r3] cmp r0, 0 - bne _081460F4 + bne @081460F4 adds r0, r2, 0x1 strh r0, [r1, 0x8] movs r0, 0x2 @@ -627603,17 +627603,17 @@ sub_81460BC: @ 81460BC movs r2, 0x3 movs r3, 0x2 bl sub_8149D78 - b _08146104 + b @08146104 .align 2, 0 .pool -_081460F4: +@081460F4: bl sub_8149DDC lsls r0, 24 cmp r0, 0 - beq _08146104 + beq @08146104 adds r0, r4, 0 bl remove_task -_08146104: +@08146104: add sp, 0x4 pop {r4} pop {r0} @@ -627621,7 +627621,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 @@ -627631,7 +627631,7 @@ sub_814610C: @ 814610C adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_0814611E: +@0814611E: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -627641,7 +627641,7 @@ _0814611E: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _0814611E + bne @0814611E pop {r4,r5} pop {r0} bx r0 @@ -627650,7 +627650,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 @@ -627675,7 +627675,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 @@ -627683,11 +627683,11 @@ sub_8146178: @ 8146178 movs r1, 0xA ldrsh r2, [r4, r1] cmp r2, 0 - beq _0814618E + beq @0814618E subs r0, 0x1 strh r0, [r4, 0xA] - b _081461CE -_0814618E: + b @081461CE +@0814618E: movs r0, 0x4 strh r0, [r4, 0xA] ldrh r0, [r4, 0xC] @@ -627696,7 +627696,7 @@ _0814618E: lsls r0, 16 asrs r0, 16 cmp r0, 0xA - bne _081461B0 + bne @081461B0 movs r1, 0x1 negs r1, r1 str r2, [sp] @@ -627704,7 +627704,7 @@ _0814618E: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 -_081461B0: +@081461B0: ldrh r1, [r4, 0xC] movs r0, 0xF ands r0, r1 @@ -627715,11 +627715,11 @@ _081461B0: movs r1, 0xC ldrsh r0, [r4, r1] cmp r0, 0xE - ble _081461CE + ble @081461CE ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_081461CE: +@081461CE: movs r0, 0 add sp, 0x4 pop {r4} @@ -627728,20 +627728,20 @@ _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] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081461F4 + bne @081461F4 ldr r0, =sub_814610C + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task -_081461F4: +@081461F4: movs r0, 0 pop {r1} bx r1 @@ -627750,7 +627750,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 @@ -627760,7 +627760,7 @@ sub_8146204: @ 8146204 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_08146216: +@08146216: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -627770,7 +627770,7 @@ _08146216: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _08146216 + bne @08146216 pop {r4,r5} pop {r0} bx r0 @@ -627779,7 +627779,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 @@ -627823,7 +627823,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 @@ -627856,13 +627856,13 @@ sub_81462A8: @ 81462A8 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081462FA + bne @081462FA ldr r0, =sub_8146204 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task -_081462FA: +@081462FA: ldr r0, [r4] ldrb r1, [r0] adds r1, 0x1 @@ -627878,14 +627878,14 @@ _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 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0 - beq _08146344 + beq @08146344 ldr r1, =0x040000d4 ldr r0, =0x02038c28 str r0, [r1] @@ -627896,7 +627896,7 @@ sub_8146320: @ 8146320 ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] -_08146344: +@08146344: pop {r0} bx r0 .align 2, 0 @@ -627904,7 +627904,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] @@ -627926,7 +627926,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 @@ -627936,7 +627936,7 @@ sub_8146384: @ 8146384 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_08146396: +@08146396: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -627946,7 +627946,7 @@ _08146396: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _08146396 + bne @08146396 pop {r4,r5} pop {r0} bx r0 @@ -627955,7 +627955,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 @@ -627996,7 +627996,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] @@ -628017,7 +628017,7 @@ sub_8146420: @ 8146420 strh r2, [r0, 0xC] movs r5, 0 lsls r7, r3, 16 -_08146448: +@08146448: lsrs r0, r4, 8 asrs r1, r7, 16 bl sine @@ -628038,19 +628038,19 @@ _08146448: lsls r0, 16 lsrs r4, r0, 16 cmp r5, 0x9F - bls _08146448 + bls @08146448 ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0814648E + bne @0814648E ldr r0, =sub_8146384 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task -_0814648E: +@0814648E: ldr r0, [r6] ldrb r1, [r0] adds r1, 0x1 @@ -628065,14 +628065,14 @@ _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 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0 - beq _081464D4 + beq @081464D4 ldr r1, =0x040000d4 ldr r0, =0x02038c28 str r0, [r1] @@ -628083,7 +628083,7 @@ sub_81464B0: @ 81464B0 ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] -_081464D4: +@081464D4: pop {r0} bx r0 .align 2, 0 @@ -628091,7 +628091,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] @@ -628113,7 +628113,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 @@ -628123,7 +628123,7 @@ sub_8146514: @ 8146514 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_08146526: +@08146526: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -628133,7 +628133,7 @@ _08146526: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _08146526 + bne @08146526 pop {r4,r5} pop {r0} bx r0 @@ -628142,7 +628142,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 @@ -628152,7 +628152,7 @@ sub_814654C: @ 814654C adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_0814655E: +@0814655E: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -628162,7 +628162,7 @@ _0814655E: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _0814655E + bne @0814655E pop {r4,r5} pop {r0} bx r0 @@ -628171,7 +628171,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 @@ -628181,7 +628181,7 @@ sub_8146584: @ 8146584 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_08146596: +@08146596: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -628191,7 +628191,7 @@ _08146596: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _08146596 + bne @08146596 pop {r4,r5} pop {r0} bx r0 @@ -628200,7 +628200,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 @@ -628210,7 +628210,7 @@ sub_81465BC: @ 81465BC adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_081465CE: +@081465CE: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -628220,7 +628220,7 @@ _081465CE: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _081465CE + bne @081465CE pop {r4,r5} pop {r0} bx r0 @@ -628229,7 +628229,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 @@ -628239,7 +628239,7 @@ sub_81465F4: @ 81465F4 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_08146606: +@08146606: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -628249,7 +628249,7 @@ _08146606: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _08146606 + bne @08146606 pop {r4,r5} pop {r0} bx r0 @@ -628258,7 +628258,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 @@ -628268,7 +628268,7 @@ sub_814662C: @ 814662C adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_0814663E: +@0814663E: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -628278,7 +628278,7 @@ _0814663E: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _0814663E + bne @0814663E pop {r4,r5} pop {r0} bx r0 @@ -628287,7 +628287,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 @@ -628297,7 +628297,7 @@ sub_8146664: @ 8146664 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_08146676: +@08146676: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -628307,7 +628307,7 @@ _08146676: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _08146676 + bne @08146676 pop {r4,r5} pop {r0} bx r0 @@ -628316,7 +628316,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 @@ -628350,12 +628350,12 @@ sub_814669C: @ 814669C movs r1, 0x9F ldr r3, =0x000008be adds r0, r3 -_081466E2: +@081466E2: strh r2, [r0] subs r0, 0x2 subs r1, 0x1 cmp r1, 0 - bge _081466E2 + bge @081466E2 ldr r0, =sub_8146F3C + 1 bl SetVBlankCallback pop {r4} @@ -628366,7 +628366,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 @@ -628403,7 +628403,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 @@ -628440,7 +628440,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 @@ -628475,7 +628475,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 @@ -628512,7 +628512,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 @@ -628531,11 +628531,11 @@ sub_8146854: @ 8146854 movs r0, 0xF0 lsls r0, 8 mov r12, r0 -_0814687A: +@0814687A: movs r0, 0 lsls r3, r1, 16 asrs r4, r3, 11 -_08146880: +@08146880: lsls r2, r0, 16 asrs r2, 16 adds r1, r4, r2 @@ -628551,14 +628551,14 @@ _08146880: lsrs r0, r2, 16 asrs r2, 16 cmp r2, 0x1D - ble _08146880 + ble @08146880 movs r1, 0x80 lsls r1, 9 adds r0, r3, r1 lsrs r1, r0, 16 asrs r0, 16 cmp r0, 0x13 - ble _0814687A + ble @0814687A movs r6, 0x10 ldrsh r2, [r7, r6] movs r1, 0x12 @@ -628586,7 +628586,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 @@ -628620,7 +628620,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 @@ -628654,7 +628654,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 @@ -628694,7 +628694,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 @@ -628734,7 +628734,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 @@ -628774,7 +628774,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 @@ -628807,7 +628807,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 @@ -628817,7 +628817,7 @@ sub_8146AC8: @ 8146AC8 bl __modsi3 lsls r0, 16 cmp r0, 0 - bne _08146B00 + bne @08146B00 adds r0, r5, 0 movs r1, 0x1E bl __modsi3 @@ -628832,20 +628832,20 @@ sub_8146AC8: @ 8146AC8 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply -_08146B00: +@08146B00: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x3A - ble _08146B18 + ble @08146B18 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] movs r0, 0 strh r0, [r4, 0xA] -_08146B18: +@08146B18: movs r0, 0 pop {r4,r5} pop {r1} @@ -628855,7 +628855,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 @@ -628865,7 +628865,7 @@ sub_8146B24: @ 8146B24 bl __modsi3 lsls r0, 16 cmp r0, 0 - bne _08146B52 + bne @08146B52 adds r0, r5, 0 movs r1, 0x5 bl __divsi3 @@ -628876,14 +628876,14 @@ sub_8146B24: @ 8146B24 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply -_08146B52: +@08146B52: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x44 - ble _08146B6E + ble @08146B6E ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -628891,7 +628891,7 @@ _08146B52: strh r0, [r4, 0xA] movs r0, 0x1E strh r0, [r4, 0x18] -_08146B6E: +@08146B6E: movs r0, 0 pop {r4,r5} pop {r1} @@ -628901,7 +628901,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 @@ -628925,7 +628925,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 @@ -628933,7 +628933,7 @@ sub_8146BA8: @ 8146BA8 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08146BDE + bne @08146BDE ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] ldr r0, =0x0000c5ff @@ -628950,7 +628950,7 @@ sub_8146BA8: @ 8146BA8 lsls r0, 24 lsrs r0, 24 bl remove_task -_08146BDE: +@08146BDE: movs r0, 0 pop {r4} pop {r1} @@ -628960,7 +628960,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 @@ -628974,19 +628974,19 @@ sub_8146BF8: @ 8146BF8 ldrsh r0, [r3, r4] adds r4, r2, 0 cmp r0, 0 - beq _08146C1E + beq @08146C1E subs r0, r1, 0x1 strh r0, [r3, 0xE] lsls r0, 16 cmp r0, 0 - bne _08146C28 -_08146C1E: + bne @08146C28 +@08146C1E: ldrh r0, [r3, 0xC] adds r0, 0x1 strh r0, [r3, 0xC] movs r0, 0x2 strh r0, [r3, 0xE] -_08146C28: +@08146C28: ldr r2, [r4] ldrh r0, [r3, 0xA] lsls r0, 8 @@ -628996,11 +628996,11 @@ _08146C28: movs r5, 0xC ldrsh r0, [r3, r5] cmp r0, 0xF - ble _08146C42 + ble @08146C42 ldrh r0, [r3, 0x8] adds r0, 0x1 strh r0, [r3, 0x8] -_08146C42: +@08146C42: ldrh r0, [r3, 0x10] adds r0, 0x8 strh r0, [r3, 0x10] @@ -629035,7 +629035,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 @@ -629049,19 +629049,19 @@ sub_8146C8C: @ 8146C8C ldrsh r0, [r3, r4] adds r4, r2, 0 cmp r0, 0 - beq _08146CB2 + beq @08146CB2 subs r0, r1, 0x1 strh r0, [r3, 0xE] lsls r0, 16 cmp r0, 0 - bne _08146CBC -_08146CB2: + bne @08146CBC +@08146CB2: ldrh r0, [r3, 0xA] subs r0, 0x1 strh r0, [r3, 0xA] movs r0, 0x2 strh r0, [r3, 0xE] -_08146CBC: +@08146CBC: ldr r2, [r4] ldrh r0, [r3, 0xA] lsls r0, 8 @@ -629071,11 +629071,11 @@ _08146CBC: movs r5, 0xA ldrsh r0, [r3, r5] cmp r0, 0 - bne _08146CD6 + bne @08146CD6 ldrh r0, [r3, 0x8] adds r0, 0x1 strh r0, [r3, 0x8] -_08146CD6: +@08146CD6: ldrh r0, [r3, 0x10] adds r0, 0x8 strh r0, [r3, 0x10] @@ -629110,7 +629110,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 @@ -629141,7 +629141,7 @@ sub_8146D20: @ 8146D20 movs r1, 0x12 ldrsh r0, [r4, r1] cmp r0, 0 - bgt _08146D70 + bgt @08146D70 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -629150,7 +629150,7 @@ sub_8146D20: @ 8146D20 lsls r0, 1 strh r0, [r4, 0xC] strh r6, [r4, 0xE] -_08146D70: +@08146D70: ldr r0, [r7] ldrb r1, [r0] adds r1, 0x1 @@ -629166,7 +629166,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] @@ -629174,18 +629174,18 @@ sub_8146D90: @ 8146D90 strh r0, [r1, 0x18] lsls r0, 16 cmp r0, 0 - bne _08146DA6 + bne @08146DA6 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_08146DA6: +@08146DA6: movs r0, 0 pop {r1} bx r1 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 @@ -629209,7 +629209,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 @@ -629217,11 +629217,11 @@ sub_8146DD8: @ 8146DD8 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08146DEE + bne @08146DEE ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] -_08146DEE: +@08146DEE: movs r0, 0 pop {r1} bx r1 @@ -629230,7 +629230,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 @@ -629243,16 +629243,16 @@ sub_8146DF8: @ 8146DF8 ldrsh r1, [r4, r0] ldr r0, =0x000003ff cmp r1, r0 - bgt _08146E18 + bgt @08146E18 adds r0, r2, 0 adds r0, 0x80 strh r0, [r4, 0xC] -_08146E18: +@08146E18: ldrh r1, [r4, 0xA] movs r2, 0xA ldrsh r0, [r4, r2] cmp r0, 0 - beq _08146E34 + beq @08146E34 ldrh r0, [r4, 0xC] lsls r0, 16 asrs r0, 24 @@ -629260,9 +629260,9 @@ _08146E18: strh r0, [r4, 0xA] lsls r0, 16 cmp r0, 0 - bge _08146E34 + bge @08146E34 strh r3, [r4, 0xA] -_08146E34: +@08146E34: ldr r0, =0x02038c28 movs r1, 0xA ldrsh r3, [r4, r1] @@ -629272,7 +629272,7 @@ _08146E34: movs r2, 0xA ldrsh r0, [r4, r2] cmp r0, 0 - bne _08146E90 + bne @08146E90 movs r0, 0 bl SetVBlankCallback ldr r1, =0x040000b0 @@ -629291,27 +629291,27 @@ _08146E34: lsls r0, 24 lsrs r0, 24 bl remove_task - b _08146EB0 + b @08146EB0 .align 2, 0 .pool -_08146E90: +@08146E90: ldrh r1, [r4, 0xE] movs r2, 0xE ldrsh r0, [r4, r2] cmp r0, 0 - bne _08146EA4 + bne @08146EA4 adds r0, r1, 0x1 strh r0, [r4, 0xE] ldr r0, =sub_8146F68 + 1 bl SetVBlankCallback -_08146EA4: +@08146EA4: ldr r0, =0x0203aba0 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 ldrb r2, [r1] strb r0, [r1] -_08146EB0: +@08146EB0: movs r0, 0 pop {r4} pop {r1} @@ -629321,7 +629321,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] @@ -629338,7 +629338,7 @@ sub_8146EC0: @ 8146EC0 ldr r0, [r2] ldrb r0, [r0] cmp r0, 0 - beq _08146EF8 + beq @08146EF8 ldr r1, =0x040000d4 ldr r0, =0x02038c28 str r0, [r1] @@ -629349,7 +629349,7 @@ sub_8146EC0: @ 8146EC0 ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] -_08146EF8: +@08146EF8: ldr r1, =0x04000048 ldr r2, [r2] ldrh r0, [r2, 0x2] @@ -629373,7 +629373,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 @@ -629391,7 +629391,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 @@ -629409,7 +629409,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 @@ -629419,7 +629419,7 @@ sub_8146F94: @ 8146F94 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_08146FA6: +@08146FA6: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -629429,7 +629429,7 @@ _08146FA6: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _08146FA6 + bne @08146FA6 pop {r4,r5} pop {r0} bx r0 @@ -629438,7 +629438,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 @@ -629472,7 +629472,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} @@ -629493,7 +629493,7 @@ sub_8147018: @ 8147018 movs r1, 0 mov r8, r4 ldr r6, =0x02038c08 -_08147046: +@08147046: lsls r5, 16 asrs r5, 16 lsls r0, r5, 1 @@ -629523,7 +629523,7 @@ _08147046: lsrs r1, r4, 16 asrs r4, 16 cmp r4, 0x4 - ble _08147046 + ble @08147046 ldrh r0, [r7, 0x8] adds r0, 0x1 strh r0, [r7, 0x8] @@ -629539,20 +629539,20 @@ _08147046: thumb_func_end sub_8147018 thumb_func_start sub_81470A4 -sub_81470A4: @ 81470A4 +sub_81470A4: ; 81470A4 push {lr} movs r0, 0x2D bl oe_active_list_contains lsls r0, 24 cmp r0, 0 - bne _081470C4 + bne @081470C4 bl sub_8149F84 ldr r0, =sub_8146F94 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task -_081470C4: +@081470C4: movs r0, 0 pop {r1} bx r1 @@ -629561,7 +629561,7 @@ _081470C4: thumb_func_end sub_81470A4 thumb_func_start sub_81470D0 -sub_81470D0: @ 81470D0 +sub_81470D0: ; 81470D0 push {r4,r5,lr} ldr r0, =0x085c8e68 ldr r5, =0x02038c08 @@ -629610,7 +629610,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 @@ -629622,18 +629622,18 @@ sub_814713C: @ 814713C movs r2, 0x30 ldrsh r0, [r4, r2] cmp r0, 0 - beq _08147160 + beq @08147160 subs r0, r1, 0x1 strh r0, [r4, 0x30] - b _081471F2 + b @081471F2 .align 2, 0 .pool -_08147160: +@08147160: ldrh r0, [r4, 0x20] lsls r1, r0, 16 lsrs r0, r1, 16 cmp r0, 0xF0 - bhi _081471CE + bhi @081471CE asrs r0, r1, 19 lsls r0, 16 ldrh r1, [r4, 0x22] @@ -629646,7 +629646,7 @@ _08147160: movs r3, 0x32 ldrsh r0, [r4, r3] cmp r5, r0 - beq _081471CE + beq @081471CE strh r2, [r4, 0x32] ldr r0, =0x04000008 ldrh r2, [r0] @@ -629684,7 +629684,7 @@ _08147160: lsls r1, 1 adds r1, r2 strh r3, [r1] -_081471CE: +@081471CE: movs r1, 0x2E ldrsh r0, [r4, r1] lsls r0, 1 @@ -629698,11 +629698,11 @@ _081471CE: movs r1, 0x87 lsls r1, 17 cmp r0, r1 - bls _081471F2 + bls @081471F2 adds r0, r4, 0 movs r1, 0x2D bl oe_stop -_081471F2: +@081471F2: add sp, 0x4 pop {r4-r6} pop {r0} @@ -629712,7 +629712,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 @@ -629722,7 +629722,7 @@ sub_8147204: @ 8147204 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_08147216: +@08147216: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -629732,7 +629732,7 @@ _08147216: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _08147216 + bne @08147216 pop {r4,r5} pop {r0} bx r0 @@ -629741,7 +629741,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 @@ -629759,7 +629759,7 @@ sub_814723C: @ 814723C movs r1, 0 ldr r3, =0x020393a8 ldr r2, =0x0000f3f4 -_08147262: +@08147262: lsls r0, r1, 1 adds r0, r3 strh r2, [r0] @@ -629767,7 +629767,7 @@ _08147262: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x9F - bls _08147262 + bls @08147262 ldr r0, =sub_8147688 + 1 bl SetVBlankCallback ldr r0, =0x0203aba0 @@ -629786,7 +629786,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 @@ -629810,7 +629810,7 @@ sub_81472A4: @ 81472A4 movs r2, 0x50 bl sub_814A1AC ldr r5, =0x02038c28 -_081472D4: +@081472D4: ldr r4, =0x0203aba0 ldr r0, [r4] movs r7, 0x2A @@ -629830,7 +629830,7 @@ _081472D4: bl sub_814A228 lsls r0, 24 cmp r0, 0 - beq _081472D4 + beq @081472D4 ldr r1, [r4] ldrh r0, [r1, 0x2C] adds r0, 0x10 @@ -629838,13 +629838,13 @@ _081472D4: lsls r0, 16 asrs r0, 16 cmp r0, 0xEF - ble _08147318 + ble @08147318 movs r0, 0 strh r0, [r1, 0x2E] ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] -_08147318: +@08147318: ldr r0, [r4] ldrb r1, [r0] adds r1, 0x1 @@ -629860,7 +629860,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 @@ -629891,7 +629891,7 @@ sub_8147334: @ 8147334 mov r9, r4 mov r7, r9 add r5, sp, 0xC -_08147372: +@08147372: movs r1, 0x78 ldr r3, [r7] ldrh r0, [r3, 0x28] @@ -629901,10 +629901,10 @@ _08147372: movs r2, 0x2E ldrsh r0, [r3, r2] cmp r0, 0x4F - ble _0814738A + ble @0814738A ldrh r1, [r3, 0x28] movs r4, 0xF0 -_0814738A: +@0814738A: ldr r6, =0x02038c28 movs r0, 0x2A ldrsh r2, [r3, r0] @@ -629918,17 +629918,17 @@ _0814738A: strh r4, [r2] ldrb r0, [r5] cmp r0, 0 - bne _081473C0 + bne @081473C0 adds r0, r3, 0 adds r0, 0x24 movs r1, 0x1 movs r2, 0x1 bl sub_814A228 strb r0, [r5] - b _08147372 + b @08147372 .align 2, 0 .pool -_081473C0: +@081473C0: ldr r1, [r7] ldrh r0, [r1, 0x2E] adds r0, 0x8 @@ -629936,22 +629936,22 @@ _081473C0: lsls r0, 16 asrs r2, r0, 16 cmp r2, 0x9F - ble _081473DE + ble @081473DE movs r0, 0xF0 strh r0, [r1, 0x2C] mov r1, r8 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _08147406 -_081473DE: + b @08147406 +@081473DE: movs r3, 0x2A ldrsh r0, [r1, r3] cmp r0, r2 - bge _08147406 + bge @08147406 adds r3, r4, 0 ldr r5, =0x0203aba0 -_081473EA: +@081473EA: ldr r2, [r5] ldrh r0, [r2, 0x2A] adds r0, 0x1 @@ -629965,8 +629965,8 @@ _081473EA: movs r4, 0x2E ldrsh r0, [r2, r4] cmp r1, r0 - blt _081473EA -_08147406: + blt @081473EA +@08147406: mov r1, r9 ldr r0, [r1] ldrb r1, [r0] @@ -629986,7 +629986,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 @@ -630009,7 +630009,7 @@ sub_8147428: @ 8147428 movs r2, 0x50 bl sub_814A1AC ldr r5, =0x02038c28 -_08147456: +@08147456: ldr r4, =0x0203aba0 ldr r0, [r4] movs r1, 0x2A @@ -630027,20 +630027,20 @@ _08147456: bl sub_814A228 lsls r0, 24 cmp r0, 0 - beq _08147456 + beq @08147456 ldr r1, [r4] ldrh r0, [r1, 0x2C] subs r0, 0x10 strh r0, [r1, 0x2C] lsls r0, 16 cmp r0, 0 - bgt _08147494 + bgt @08147494 movs r0, 0xA0 strh r0, [r1, 0x2E] ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] -_08147494: +@08147494: ldr r0, [r4] ldrb r1, [r0] adds r1, 0x1 @@ -630056,7 +630056,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 @@ -630090,7 +630090,7 @@ sub_81474B0: @ 81474B0 ldr r0, =0x0203aba0 mov r8, r0 add r6, sp, 0xC -_081474F4: +@081474F4: mov r1, r8 ldr r4, [r1] movs r2, 0x2A @@ -630104,10 +630104,10 @@ _081474F4: movs r7, 0x2E ldrsh r0, [r4, r7] cmp r0, 0x50 - bgt _08147514 + bgt @08147514 movs r2, 0x78 adds r1, r3, 0 -_08147514: +@08147514: lsls r0, r2, 16 asrs r0, 8 lsls r1, 16 @@ -630117,17 +630117,17 @@ _08147514: strh r1, [r5] ldrb r0, [r6] cmp r0, 0 - bne _08147540 + bne @08147540 adds r0, r4, 0 adds r0, 0x24 movs r1, 0x1 movs r2, 0x1 bl sub_814A228 strb r0, [r6] - b _081474F4 + b @081474F4 .align 2, 0 .pool -_08147540: +@08147540: mov r0, r8 ldr r2, [r0] ldrh r0, [r2, 0x2E] @@ -630136,22 +630136,22 @@ _08147540: lsls r0, 16 asrs r3, r0, 16 cmp r3, 0 - bgt _0814755E + bgt @0814755E strh r7, [r2, 0x2C] mov r1, r9 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _08147588 -_0814755E: + b @08147588 +@0814755E: movs r4, 0x2A ldrsh r0, [r2, r4] cmp r0, r3 - ble _08147588 + ble @08147588 ldr r6, =0x02038c28 adds r3, r1, 0 ldr r5, =0x0203aba0 -_0814756C: +@0814756C: ldr r2, [r5] ldrh r0, [r2, 0x2A] subs r0, 0x1 @@ -630165,8 +630165,8 @@ _0814756C: movs r4, 0x2E ldrsh r0, [r2, r4] cmp r1, r0 - bgt _0814756C -_08147588: + bgt @0814756C +@08147588: ldr r7, =0x0203aba0 ldr r0, [r7] ldrb r1, [r0] @@ -630187,7 +630187,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 @@ -630209,7 +630209,7 @@ sub_81475B0: @ 81475B0 movs r2, 0x50 bl sub_814A1AC ldr r6, =0x02038c28 -_081475DC: +@081475DC: movs r2, 0x78 ldr r5, =0x0203aba0 ldr r3, [r5] @@ -630217,10 +630217,10 @@ _081475DC: movs r1, 0x28 ldrsh r0, [r3, r1] cmp r0, 0x77 - ble _081475F0 + ble @081475F0 movs r2, 0 movs r4, 0xF0 -_081475F0: +@081475F0: movs r0, 0x2A ldrsh r1, [r3, r0] lsls r1, 1 @@ -630237,7 +630237,7 @@ _081475F0: bl sub_814A228 lsls r0, 24 cmp r0, 0 - beq _081475DC + beq @081475DC ldr r0, [r5] ldrh r1, [r0, 0x2C] adds r1, 0x10 @@ -630245,11 +630245,11 @@ _081475F0: movs r1, 0x28 ldrsh r0, [r0, r1] cmp r0, 0x78 - ble _0814762A + ble @0814762A ldrh r0, [r7, 0x8] adds r0, 0x1 strh r0, [r7, 0x8] -_0814762A: +@0814762A: ldr r0, [r5] ldrb r1, [r0] adds r1, 0x1 @@ -630265,7 +630265,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] @@ -630291,7 +630291,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] @@ -630308,7 +630308,7 @@ sub_8147688: @ 8147688 ldr r0, [r3] ldrb r0, [r0] cmp r0, 0 - beq _081476C0 + beq @081476C0 ldr r1, =0x040000d4 ldr r0, =0x02038c28 str r0, [r1] @@ -630319,7 +630319,7 @@ sub_8147688: @ 8147688 ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] -_081476C0: +@081476C0: ldr r2, =0x04000048 ldr r1, [r3] ldrh r0, [r1, 0x2] @@ -630350,7 +630350,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 @@ -630360,7 +630360,7 @@ sub_8147718: @ 8147718 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_0814772A: +@0814772A: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -630370,7 +630370,7 @@ _0814772A: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _0814772A + bne @0814772A pop {r4,r5} pop {r0} bx r0 @@ -630379,7 +630379,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 @@ -630387,7 +630387,7 @@ sub_8147750: @ 8147750 movs r2, 0 ldr r4, =0x020393a8 ldr r3, =0x0203aba0 -_08147762: +@08147762: lsls r1, r2, 1 adds r1, r4 ldr r0, [r3] @@ -630397,7 +630397,7 @@ _08147762: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x9F - bls _08147762 + bls @08147762 ldr r0, =sub_8147888 + 1 bl SetVBlankCallback ldr r0, =sub_81478C0 + 1 @@ -630416,7 +630416,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} @@ -630442,15 +630442,15 @@ sub_81477A8: @ 81477A8 strh r0, [r6, 0xA] ldr r0, =0x1fff0000 cmp r1, r0 - bgt _081477E4 + bgt @081477E4 movs r1, 0xC0 lsls r1, 1 adds r0, r2, r1 strh r0, [r6, 0xC] -_081477E4: +@081477E4: movs r5, 0 lsls r7, r3, 16 -_081477E8: +@081477E8: lsrs r0, r4, 8 asrs r1, r7, 16 bl sine @@ -630470,14 +630470,14 @@ _081477E8: lsls r0, 16 lsrs r4, r0, 16 cmp r5, 0x9F - bls _081477E8 + bls @081477E8 ldrh r0, [r6, 0xE] adds r0, 0x1 strh r0, [r6, 0xE] lsls r0, 16 asrs r0, 16 cmp r0, 0x51 - bne _08147838 + bne @08147838 ldrh r0, [r6, 0x10] adds r0, 0x1 strh r0, [r6, 0x10] @@ -630489,23 +630489,23 @@ _081477E8: str r2, [sp] movs r3, 0x10 bl sub_80A1AD4 -_08147838: +@08147838: movs r5, 0x10 ldrsh r0, [r6, r5] cmp r0, 0 - beq _0814785A + beq @0814785A ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0814785A + bne @0814785A ldr r0, =sub_8147718 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task -_0814785A: +@0814785A: ldr r0, =0x0203aba0 ldr r1, [r0] ldrb r0, [r1] @@ -630524,14 +630524,14 @@ _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 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0 - beq _081478AC + beq @081478AC ldr r1, =0x040000d4 ldr r0, =0x02038c28 str r0, [r1] @@ -630542,7 +630542,7 @@ sub_8147888: @ 8147888 ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] -_081478AC: +@081478AC: pop {r0} bx r0 .align 2, 0 @@ -630550,7 +630550,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] @@ -630572,7 +630572,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 @@ -630582,7 +630582,7 @@ sub_81478EC: @ 81478EC adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_081478FE: +@081478FE: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -630592,7 +630592,7 @@ _081478FE: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _081478FE + bne @081478FE pop {r4,r5} pop {r0} bx r0 @@ -630601,7 +630601,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 @@ -630619,7 +630619,7 @@ sub_8147924: @ 8147924 movs r1, 0 ldr r3, =0x020393a8 movs r2, 0xF2 -_0814794A: +@0814794A: lsls r0, r1, 1 adds r0, r3 strh r2, [r0] @@ -630627,7 +630627,7 @@ _0814794A: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x9F - bls _0814794A + bls @0814794A ldr r0, =sub_8147A58 + 1 bl SetVBlankCallback ldrh r0, [r4, 0x8] @@ -630642,7 +630642,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} @@ -630663,7 +630663,7 @@ sub_814797C: @ 814797C movs r6, 0 movs r0, 0x1 mov r8, r0 -_081479A4: +@081479A4: adds r0, r5, 0 movs r1, 0x28 bl sine @@ -630672,15 +630672,15 @@ _081479A4: lsls r0, 16 lsrs r1, r0, 16 cmp r0, 0 - bge _081479BA + bge @081479BA movs r1, 0 -_081479BA: +@081479BA: lsls r0, r1, 16 asrs r0, 16 cmp r0, 0xF0 - ble _081479C4 + ble @081479C4 movs r1, 0xF0 -_081479C4: +@081479C4: lsls r0, r1, 16 asrs r0, 16 lsls r1, r0, 8 @@ -630688,10 +630688,10 @@ _081479C4: orrs r1, r2 strh r1, [r7] cmp r0, 0xEF - bgt _081479D8 + bgt @081479D8 movs r0, 0 mov r8, r0 -_081479D8: +@081479D8: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 @@ -630700,14 +630700,14 @@ _081479D8: lsrs r5, r0, 24 adds r7, 0x2 cmp r6, 0x9F - bls _081479A4 + bls @081479A4 mov r1, r8 cmp r1, 0 - beq _081479F6 + beq @081479F6 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_081479F6: +@081479F6: ldr r0, =0x0203aba0 ldr r1, [r0] ldrb r0, [r1] @@ -630725,7 +630725,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] @@ -630751,7 +630751,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] @@ -630768,7 +630768,7 @@ sub_8147A58: @ 8147A58 ldr r0, [r3] ldrb r0, [r0] cmp r0, 0 - beq _08147A90 + beq @08147A90 ldr r1, =0x040000d4 ldr r0, =0x02038c28 str r0, [r1] @@ -630779,7 +630779,7 @@ sub_8147A58: @ 8147A58 ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] -_08147A90: +@08147A90: ldr r2, =0x04000048 ldr r1, [r3] ldrh r0, [r1, 0x2] @@ -630805,7 +630805,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 @@ -630824,7 +630824,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 @@ -630843,7 +630843,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 @@ -630862,7 +630862,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 @@ -630881,7 +630881,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 @@ -630900,7 +630900,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 @@ -630910,7 +630910,7 @@ sub_8147B84: @ 8147B84 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_08147B96: +@08147B96: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -630920,7 +630920,7 @@ _08147B96: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _08147B96 + bne @08147B96 pop {r4,r5} pop {r0} bx r0 @@ -630929,7 +630929,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 @@ -630953,7 +630953,7 @@ sub_8147BBC: @ 8147BBC movs r1, 0 ldr r3, =0x020393a8 ldr r2, =0x0000f0f1 -_08147BF0: +@08147BF0: lsls r0, r1, 1 adds r0, r3 strh r2, [r0] @@ -630961,7 +630961,7 @@ _08147BF0: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x9F - bls _08147BF0 + bls @08147BF0 ldr r0, =sub_81480CC + 1 bl SetVBlankCallback ldrh r0, [r4, 0x8] @@ -630976,7 +630976,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} @@ -631015,11 +631015,11 @@ sub_8147C24: @ 8147C24 movs r0, 0xF0 lsls r0, 8 adds r7, r0, 0 -_08147C78: +@08147C78: movs r0, 0 lsls r3, r1, 16 asrs r4, r3, 11 -_08147C7E: +@08147C7E: lsls r2, r0, 16 asrs r2, 16 adds r1, r4, r2 @@ -631034,14 +631034,14 @@ _08147C7E: lsrs r0, r2, 16 asrs r2, 16 cmp r2, 0x1F - ble _08147C7E + ble @08147C7E movs r1, 0x80 lsls r1, 9 adds r0, r3, r1 lsrs r1, r0, 16 asrs r0, 16 cmp r0, 0x13 - ble _08147C78 + ble @08147C78 movs r0, 0x2 bl enable_irqs ldr r0, =sub_81481E0 + 1 @@ -631062,7 +631062,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 @@ -631076,7 +631076,7 @@ sub_8147CE4: @ 8147CE4 adds r0, 0x10 strh r0, [r4, 0xA] movs r6, 0 -_08147CFE: +@08147CFE: adds r0, r5, 0 movs r1, 0x10 bl sine @@ -631085,15 +631085,15 @@ _08147CFE: lsls r0, 16 lsrs r2, r0, 16 cmp r0, 0 - bge _08147D14 + bge @08147D14 movs r2, 0x1 -_08147D14: +@08147D14: lsls r0, r2, 16 asrs r0, 16 cmp r0, 0xF0 - ble _08147D1E + ble @08147D1E movs r2, 0xF0 -_08147D1E: +@08147D1E: strh r2, [r7] adds r0, r6, 0x1 lsls r0, 24 @@ -631104,10 +631104,10 @@ _08147D1E: lsls r0, 24 lsrs r5, r0, 24 cmp r6, 0x4F - bls _08147CFE + bls @08147CFE cmp r6, 0x9F - bhi _08147D76 -_08147D38: + bhi @08147D76 +@08147D38: adds r0, r5, 0 movs r1, 0x10 bl sine @@ -631116,15 +631116,15 @@ _08147D38: lsls r1, 16 lsrs r2, r1, 16 cmp r1, 0 - bge _08147D4E + bge @08147D4E movs r2, 0 -_08147D4E: +@08147D4E: lsls r0, r2, 16 asrs r0, 16 cmp r0, 0xEF - ble _08147D58 + ble @08147D58 movs r2, 0xEF -_08147D58: +@08147D58: lsls r0, r2, 16 asrs r0, 8 movs r1, 0xF0 @@ -631139,8 +631139,8 @@ _08147D58: lsls r0, 24 lsrs r5, r0, 24 cmp r6, 0x9F - bls _08147D38 -_08147D76: + bls @08147D38 +@08147D76: ldrh r1, [r4, 0xC] adds r1, 0x8 strh r1, [r4, 0xC] @@ -631150,24 +631150,24 @@ _08147D76: lsls r1, 16 asrs r1, 16 cmp r1, 0xF0 - ble _08147D8E + ble @08147D8E movs r0, 0xF0 strh r0, [r4, 0xC] -_08147D8E: +@08147D8E: movs r1, 0xE ldrsh r0, [r4, r1] cmp r0, 0 - bge _08147D9A + bge @08147D9A movs r0, 0 strh r0, [r4, 0xE] -_08147D9A: +@08147D9A: ldr r0, [r4, 0xC] cmp r0, 0xF0 - bne _08147DA6 + bne @08147DA6 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_08147DA6: +@08147DA6: ldr r0, =0x0203aba0 ldr r1, [r0] ldrh r0, [r1, 0x18] @@ -631189,7 +631189,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 @@ -631200,14 +631200,14 @@ sub_8147DD0: @ 8147DD0 ldr r1, =0x02038c28 adds r5, r2, 0 movs r2, 0xF0 -_08147DE4: +@08147DE4: strh r2, [r1] adds r0, 0x1 lsls r0, 24 lsrs r0, 24 adds r1, 0x2 cmp r0, 0x9F - bls _08147DE4 + bls @08147DE4 ldrh r0, [r4, 0x8] adds r0, 0x1 movs r1, 0 @@ -631249,7 +631249,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 @@ -631265,14 +631265,14 @@ sub_8147E4C: @ 8147E4C bl sub_81484B8 lsls r0, 16 cmp r0, 0 - beq _08147E7C + beq @08147E7C ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] movs r1, 0x24 ldrsh r0, [r4, r1] bl sub_814849C -_08147E7C: +@08147E7C: movs r0, 0 pop {r4} pop {r1} @@ -631282,7 +631282,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} @@ -631302,7 +631302,7 @@ sub_8147E88: @ 8147E88 bl sub_81484B8 lsls r0, 16 cmp r0, 0 - beq _08147F1C + beq @08147F1C ldr r1, [r7] ldrb r0, [r1] movs r0, 0 @@ -631350,7 +631350,7 @@ sub_8147E88: @ 8147E88 strh r0, [r1, 0xE] ldr r0, =sub_8148160 + 1 bl SetVBlankCallback -_08147F1C: +@08147F1C: movs r0, 0 pop {r3} mov r8, r3 @@ -631362,7 +631362,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 @@ -631383,17 +631383,17 @@ sub_8147F40: @ 8147F40 ldrsh r0, [r4, r3] mov r12, r2 cmp r0, 0x4F - bgt _08147F6E + bgt @08147F6E adds r0, r1, 0x2 strh r0, [r4, 0x10] -_08147F6E: +@08147F6E: movs r1, 0x10 ldrsh r0, [r4, r1] cmp r0, 0x50 - ble _08147F7A + ble @08147F7A movs r0, 0x50 strh r0, [r4, 0x10] -_08147F7A: +@08147F7A: ldrh r0, [r4, 0xE] adds r0, 0x1 strh r0, [r4, 0xE] @@ -631401,15 +631401,15 @@ _08147F7A: ands r0, r1 ldrh r3, [r4, 0x10] cmp r0, 0 - beq _08147FDC + beq @08147FDC movs r2, 0 lsls r0, r3, 16 movs r6, 0 cmp r0, 0 - blt _08147FDC + blt @08147FDC movs r7, 0x50 ldr r5, =0x02038c28 -_08147F98: +@08147F98: lsls r0, r2, 16 asrs r3, r0, 16 subs r1, r7, r3 @@ -631422,21 +631422,21 @@ _08147F98: adds r1, r5 ldrh r0, [r1] cmp r0, 0xF - bhi _08147FB8 + bhi @08147FB8 movs r6, 0x1 adds r0, 0x1 strh r0, [r1] -_08147FB8: +@08147FB8: lsls r0, r2, 16 asrs r0, 15 adds r1, r0, r5 ldrh r0, [r1] cmp r0, 0xF - bhi _08147FCA + bhi @08147FCA movs r6, 0x1 adds r0, 0x1 strh r0, [r1] -_08147FCA: +@08147FCA: adds r0, r3, 0x1 lsls r0, 16 lsrs r2, r0, 16 @@ -631445,16 +631445,16 @@ _08147FCA: ldrsh r1, [r4, r3] ldrh r3, [r4, 0x10] cmp r0, r1 - ble _08147F98 -_08147FDC: + ble @08147F98 +@08147FDC: cmp r3, 0x50 - bne _08147FEA + bne @08147FEA cmp r6, 0 - bne _08147FEA + bne @08147FEA ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_08147FEA: +@08147FEA: mov r1, r12 ldr r0, [r1] ldrb r1, [r0] @@ -631470,7 +631470,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 @@ -631499,7 +631499,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 @@ -631519,11 +631519,11 @@ sub_8148040: @ 8148040 movs r1, 0xE ldrsh r0, [r4, r1] cmp r0, 0xF - ble _08148070 + ble @08148070 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_08148070: +@08148070: ldr r0, [r5] ldrb r1, [r0] adds r1, 0x1 @@ -631538,7 +631538,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 @@ -631566,7 +631566,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] @@ -631583,7 +631583,7 @@ sub_81480CC: @ 81480CC ldr r0, [r3] ldrb r0, [r0] cmp r0, 0 - beq _08148104 + beq @08148104 ldr r1, =0x040000d4 ldr r0, =0x02038c28 str r0, [r1] @@ -631594,7 +631594,7 @@ sub_81480CC: @ 81480CC ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] -_08148104: +@08148104: ldr r2, =0x04000012 ldr r1, [r3] ldrh r0, [r1, 0x1C] @@ -631623,7 +631623,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] @@ -631640,7 +631640,7 @@ sub_8148160: @ 8148160 ldr r0, [r2] ldrb r0, [r0] cmp r0, 0 - beq _08148198 + beq @08148198 ldr r1, =0x040000d4 ldr r0, =0x02038c28 str r0, [r1] @@ -631651,7 +631651,7 @@ sub_8148160: @ 8148160 ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] -_08148198: +@08148198: ldr r1, =0x04000050 ldr r0, [r2] ldrh r0, [r0, 0xE] @@ -631671,25 +631671,25 @@ _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] cmp r0, 0x4F - bhi _08148200 + bhi @08148200 ldr r1, =0x04000010 ldr r0, =0x0203aba0 ldr r0, [r0] ldrh r0, [r0, 0x18] - b _08148208 + b @08148208 .align 2, 0 .pool -_08148200: +@08148200: ldr r1, =0x04000010 ldr r0, =0x0203aba0 ldr r0, [r0] ldrh r0, [r0, 0x1A] -_08148208: +@08148208: strh r0, [r1] pop {r0} bx r0 @@ -631698,7 +631698,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 @@ -631858,11 +631858,11 @@ 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, =0x085c8c24 -_08148386: +@08148386: movs r1, 0x2E ldrsh r0, [r4, r1] lsls r0, 2 @@ -631872,7 +631872,7 @@ _08148386: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _08148386 + bne @08148386 pop {r4,r5} pop {r0} bx r0 @@ -631881,13 +631881,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 @@ -631925,7 +631925,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] @@ -631935,29 +631935,29 @@ sub_81483F8: @ 81483F8 movs r3, 0x3C ldrsh r0, [r1, r3] cmp r0, 0 - beq _08148416 + beq @08148416 lsls r0, r2, 16 asrs r0, 16 cmp r0, 0x84 - bgt _08148424 - b _0814841E -_08148416: + bgt @08148424 + b @0814841E +@08148416: lsls r0, r2, 16 asrs r0, 16 cmp r0, 0x67 - ble _08148424 -_0814841E: + ble @08148424 +@0814841E: ldrh r0, [r1, 0x2E] adds r0, 0x1 strh r0, [r1, 0x2E] -_08148424: +@08148424: movs r0, 0 pop {r1} bx r1 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] @@ -631969,7 +631969,7 @@ sub_814842C: @ 814842C strh r0, [r2, 0x20] lsls r1, 16 cmp r1, 0 - bne _08148452 + bne @08148452 ldrh r0, [r2, 0x2E] adds r0, 0x1 strh r0, [r2, 0x2E] @@ -631977,14 +631977,14 @@ sub_814842C: @ 814842C strh r0, [r2, 0x32] movs r0, 0x1 strh r0, [r2, 0x3A] -_08148452: +@08148452: movs r0, 0 pop {r1} bx r1 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] @@ -631999,18 +631999,18 @@ sub_8148458: @ 8148458 movs r0, 0x97 lsls r0, 17 cmp r1, r0 - bls _0814847C + bls @0814847C ldrh r0, [r2, 0x2E] adds r0, 0x1 strh r0, [r2, 0x2E] -_0814847C: +@0814847C: movs r0, 0 pop {r1} bx r1 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 @@ -632025,7 +632025,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 @@ -632042,7 +632042,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 @@ -632058,7 +632058,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 @@ -632068,7 +632068,7 @@ sub_81484D0: @ 81484D0 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_081484E2: +@081484E2: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -632078,7 +632078,7 @@ _081484E2: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _081484E2 + bne @081484E2 pop {r4,r5} pop {r0} bx r0 @@ -632087,7 +632087,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 @@ -632111,7 +632111,7 @@ sub_8148508: @ 8148508 ldr r4, =0x020393a8 adds r6, r2, 0 movs r2, 0xF0 -_0814853A: +@0814853A: lsls r1, r3, 1 adds r1, r4 ldr r0, [r6] @@ -632126,7 +632126,7 @@ _0814853A: lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x9F - bls _0814853A + bls @0814853A movs r0, 0x2 bl enable_irqs movs r0, 0x4 @@ -632148,7 +632148,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} @@ -632168,27 +632168,27 @@ sub_8148590: @ 8148590 asrs r0, 16 mov r8, r2 cmp r0, 0xF0 - ble _081485BC + ble @081485BC movs r0, 0xF0 strh r0, [r3, 0xA] -_081485BC: +@081485BC: ldrh r4, [r3, 0xC] movs r0, 0xC ldrsh r1, [r3, r0] ldr r0, =0x00000fff ldrh r2, [r3, 0xE] cmp r1, r0 - bgt _081485CE + bgt @081485CE adds r0, r4, r2 strh r0, [r3, 0xC] -_081485CE: +@081485CE: lsls r0, r2, 16 asrs r0, 16 cmp r0, 0x7F - bgt _081485DA + bgt @081485DA lsls r0, r2, 1 strh r0, [r3, 0xE] -_081485DA: +@081485DA: movs r5, 0 ldr r7, =0x02038c28 movs r1, 0xA0 @@ -632196,7 +632196,7 @@ _081485DA: adds r1, r7 mov r12, r1 mov r6, r8 -_081485E8: +@081485E8: lsls r0, r5, 1 adds r2, r0, r7 mov r1, r12 @@ -632204,7 +632204,7 @@ _081485E8: movs r0, 0x1 ands r0, r5 cmp r0, 0 - beq _08148618 + beq @08148618 ldr r1, [r6] ldrh r0, [r3, 0xA] ldrh r1, [r1, 0x14] @@ -632213,10 +632213,10 @@ _081485E8: ldrh r1, [r3, 0xA] movs r0, 0xF0 subs r0, r1 - b _0814862A + b @0814862A .align 2, 0 .pool -_08148618: +@08148618: ldr r0, [r6] ldrh r0, [r0, 0x14] ldrh r1, [r3, 0xA] @@ -632226,21 +632226,21 @@ _08148618: lsls r0, 8 movs r1, 0xF1 orrs r0, r1 -_0814862A: +@0814862A: strh r0, [r4] adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x9F - bls _081485E8 + bls @081485E8 movs r1, 0xA ldrsh r0, [r3, r1] cmp r0, 0xEF - ble _08148644 + ble @08148644 ldrh r0, [r3, 0x8] adds r0, 0x1 strh r0, [r3, 0x8] -_08148644: +@08148644: mov r1, r8 ldr r0, [r1] ldrb r1, [r0] @@ -632256,7 +632256,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] @@ -632282,7 +632282,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] @@ -632308,7 +632308,7 @@ sub_814869C: @ 814869C strh r0, [r2] ldrb r0, [r1] cmp r0, 0 - beq _081486E6 + beq @081486E6 ldr r1, =0x040000d4 ldr r0, =0x02038c28 str r0, [r1] @@ -632319,7 +632319,7 @@ sub_814869C: @ 814869C ldr r0, =0x80000140 str r0, [r1, 0x8] ldr r0, [r1, 0x8] -_081486E6: +@081486E6: ldr r0, =0x020394e8 str r0, [r4] ldr r0, =0x04000040 @@ -632335,12 +632335,12 @@ _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] cmp r0, 0x9F - bhi _0814874E + bhi @0814874E ldr r1, =0x02038c28 ldrh r0, [r2] lsls r0, 1 @@ -632355,7 +632355,7 @@ sub_8148728: @ 8148728 strh r1, [r0] adds r0, 0x4 strh r1, [r0] -_0814874E: +@0814874E: pop {r0} bx r0 .align 2, 0 @@ -632363,7 +632363,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 @@ -632373,7 +632373,7 @@ sub_8148760: @ 8148760 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_08148772: +@08148772: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -632383,7 +632383,7 @@ _08148772: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _08148772 + bne @08148772 pop {r4,r5} pop {r0} bx r0 @@ -632392,7 +632392,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 @@ -632417,7 +632417,7 @@ sub_8148798: @ 8148798 mov r8, r4 movs r1, 0xF0 mov r9, r1 -_081487CC: +@081487CC: lsls r2, r4, 1 mov r7, r12 adds r1, r2, r7 @@ -632461,7 +632461,7 @@ _081487CC: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x9F - bls _081487CC + bls @081487CC movs r0, 0 strh r0, [r6, 0x10] strh r0, [r6, 0x12] @@ -632488,7 +632488,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 @@ -632517,9 +632517,9 @@ sub_8148864: @ 8148864 ldrsh r0, [r1, r3] ldr r1, [sp, 0x8] cmp r1, r0 - ble _081488A4 - b _08148A68 -_081488A4: + ble @081488A4 + b @08148A68 +@081488A4: movs r7, 0 mov r2, r10 negs r2, r2 @@ -632527,12 +632527,12 @@ _081488A4: mov r3, r10 adds r3, 0x1 str r3, [sp, 0x10] -_081488B2: +@081488B2: movs r6, 0 mov r0, sp adds r0, r7 mov r12, r0 -_081488BA: +@081488BA: lsls r0, r6, 1 add r0, sp adds r0, 0x4 @@ -632548,12 +632548,12 @@ _081488BA: lsrs r5, r0, 16 asrs r0, 16 cmp r0, 0 - blt _08148966 + blt @08148966 cmp r0, 0x4F - bne _081488E2 + bne @081488E2 cmp r7, 0x1 - beq _08148966 -_081488E2: + beq @08148966 +@081488E2: lsls r1, r0, 1 ldr r0, =0x02038ea8 adds r4, r1, r0 @@ -632565,7 +632565,7 @@ _081488E2: adds r1, r0 ldrh r2, [r4] cmp r2, 0xEF - bls _08148920 + bls @08148920 movs r1, 0xF0 strh r1, [r4] ldr r0, [sp, 0x8] @@ -632573,28 +632573,28 @@ _081488E2: lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x8] - b _08148940 + b @08148940 .align 2, 0 .pool -_08148920: +@08148920: ldrh r0, [r3] lsrs r0, 8 adds r0, r2, r0 strh r0, [r4] ldrh r0, [r1] cmp r0, 0x7F - bhi _08148932 + bhi @08148932 lsls r0, 1 strh r0, [r1] -_08148932: +@08148932: ldrh r2, [r3] ldr r0, =0x00000fff cmp r2, r0 - bhi _08148940 + bhi @08148940 ldrh r0, [r1] adds r0, r2, r0 strh r0, [r3] -_08148940: +@08148940: lsls r0, r5, 16 asrs r0, 15 ldr r1, =0x02038c28 @@ -632613,30 +632613,30 @@ _08148940: strh r0, [r3] mov r2, r10 cmp r2, 0 - beq _08148970 -_08148966: + beq @08148970 +@08148966: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x1 - bls _081488BA -_08148970: + bls @081488BA +@08148970: adds r0, r7, 0x1 lsls r0, 16 lsrs r7, r0, 16 cmp r7, 0x1 - bls _081488B2 + bls @081488B2 movs r7, 0 ldr r3, =0x02038ea8 mov r8, r3 -_08148980: +@08148980: movs r6, 0 mov r0, sp adds r0, r7 mov r12, r0 adds r1, r7, 0x1 str r1, [sp, 0x14] -_0814898C: +@0814898C: mov r2, r12 ldrb r1, [r2] adds r1, 0x1 @@ -632653,12 +632653,12 @@ _0814898C: lsrs r5, r1, 16 asrs r1, 16 cmp r1, 0xA0 - bgt _08148A40 + bgt @08148A40 cmp r1, 0x50 - bne _081489B6 + bne @081489B6 cmp r7, 0x1 - beq _08148A40 -_081489B6: + beq @08148A40 +@081489B6: lsls r1, 1 mov r3, r8 adds r4, r1, r3 @@ -632670,7 +632670,7 @@ _081489B6: adds r1, r0 ldrh r2, [r4] cmp r2, 0xEF - bls _081489F8 + bls @081489F8 movs r1, 0xF0 strh r1, [r4] ldr r0, [sp, 0x8] @@ -632678,28 +632678,28 @@ _081489B6: lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x8] - b _08148A18 + b @08148A18 .align 2, 0 .pool -_081489F8: +@081489F8: ldrh r0, [r3] lsrs r0, 8 adds r0, r2, r0 strh r0, [r4] ldrh r0, [r1] cmp r0, 0x7F - bhi _08148A0A + bhi @08148A0A lsls r0, 1 strh r0, [r1] -_08148A0A: +@08148A0A: ldrh r2, [r3] ldr r0, =0x00000fff cmp r2, r0 - bhi _08148A18 + bhi @08148A18 ldrh r0, [r1] adds r0, r2, r0 strh r0, [r3] -_08148A18: +@08148A18: lsls r0, r5, 16 asrs r0, 15 ldr r1, =0x02038c28 @@ -632719,19 +632719,19 @@ _08148A18: strh r0, [r3] mov r2, r10 cmp r2, 0 - beq _08148A4A -_08148A40: + beq @08148A4A +@08148A40: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x1 - bls _0814898C -_08148A4A: + bls @0814898C +@08148A4A: ldr r3, [sp, 0x14] lsls r0, r3, 16 lsrs r7, r0, 16 cmp r7, 0x1 - bls _08148980 + bls @08148980 ldr r1, [sp, 0x10] lsls r0, r1, 16 lsrs r0, 16 @@ -632740,43 +632740,43 @@ _08148A4A: movs r3, 0x12 ldrsh r0, [r2, r3] cmp r10, r0 - bgt _08148A68 - b _081488A4 -_08148A68: + bgt @08148A68 + b @081488A4 +@08148A68: mov r1, r9 ldrh r0, [r1, 0x10] subs r0, 0x1 strh r0, [r1, 0x10] lsls r0, 16 cmp r0, 0 - bge _08148A7A + bge @08148A7A movs r0, 0 strh r0, [r1, 0x10] -_08148A7A: +@08148A7A: mov r2, r9 movs r3, 0x10 ldrsh r0, [r2, r3] cmp r0, 0 - bgt _08148A98 + bgt @08148A98 movs r1, 0x12 ldrsh r0, [r2, r1] adds r0, 0x1 cmp r0, 0x14 - bgt _08148A98 + bgt @08148A98 ldrh r0, [r2, 0x14] strh r0, [r2, 0x10] ldrh r0, [r2, 0x12] adds r0, 0x1 strh r0, [r2, 0x12] -_08148A98: +@08148A98: ldr r2, [sp, 0x8] cmp r2, 0x9F - bls _08148AA6 + bls @08148AA6 mov r3, r9 ldrh r0, [r3, 0x8] adds r0, 0x1 strh r0, [r3, 0x8] -_08148AA6: +@08148AA6: ldr r0, =0x0203aba0 ldr r1, [r0] ldrb r0, [r1] @@ -632797,34 +632797,34 @@ _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 ldr r5, =0x0000ff10 movs r1, 0 ldr r4, =0x020393a8 -_08148AE0: +@08148AE0: lsls r0, r1, 1 adds r0, r4 ldrh r0, [r0] cmp r0, 0xF0 - beq _08148AF0 + beq @08148AF0 cmp r0, r5 - beq _08148AF0 + beq @08148AF0 movs r2, 0 -_08148AF0: +@08148AF0: adds r0, r1, 0x1 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x9F - bls _08148AE0 + bls @08148AE0 cmp r2, 0x1 - bne _08148B04 + bne @08148B04 ldrh r0, [r3, 0x8] adds r0, 0x1 strh r0, [r3, 0x8] -_08148B04: +@08148B04: movs r0, 0 pop {r4,r5} pop {r1} @@ -632834,7 +632834,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] @@ -632860,7 +632860,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 @@ -632870,7 +632870,7 @@ sub_8148B54: @ 8148B54 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_08148B66: +@08148B66: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -632880,7 +632880,7 @@ _08148B66: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _08148B66 + bne @08148B66 pop {r4,r5} pop {r0} bx r0 @@ -632889,7 +632889,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 @@ -632899,7 +632899,7 @@ sub_8148B8C: @ 8148B8C adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_08148B9E: +@08148B9E: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -632909,7 +632909,7 @@ _08148B9E: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _08148B9E + bne @08148B9E pop {r4,r5} pop {r0} bx r0 @@ -632918,7 +632918,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 @@ -632938,12 +632938,12 @@ sub_8148BC4: @ 8148BC4 movs r1, 0x9F ldr r3, =0x000008be adds r0, r3 -_08148BEE: +@08148BEE: strh r2, [r0] subs r0, 0x2 subs r1, 0x1 cmp r1, 0 - bge _08148BEE + bge @08148BEE movs r4, 0 ldr r0, =sub_8146F68 + 1 bl SetVBlankCallback @@ -632964,13 +632964,13 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0x1 - bne _08148C6C + bne @08148C6C ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] ldr r0, =0x0000c5ff @@ -632988,10 +632988,10 @@ sub_8148C28: @ 8148C28 lsls r0, 24 lsrs r0, 24 bl remove_task - b _08148CDE + b @08148CDE .align 2, 0 .pool -_08148C6C: +@08148C6C: ldr r5, =0x0203aba0 ldr r1, [r5] ldrb r0, [r1] @@ -633002,29 +633002,29 @@ _08148C6C: ldrsh r1, [r4, r0] ldr r0, =0x000003ff cmp r1, r0 - bgt _08148C88 + bgt @08148C88 adds r0, r2, 0 adds r0, 0x80 strh r0, [r4, 0xC] -_08148C88: +@08148C88: ldrh r1, [r4, 0xA] movs r2, 0xA ldrsh r0, [r4, r2] cmp r0, 0x9F - bgt _08148C9C + bgt @08148C9C ldrh r0, [r4, 0xC] lsls r0, 16 asrs r0, 24 adds r0, r1, r0 strh r0, [r4, 0xA] -_08148C9C: +@08148C9C: movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0xA0 - ble _08148CA8 + ble @08148CA8 movs r0, 0xA0 strh r0, [r4, 0xA] -_08148CA8: +@08148CA8: ldr r0, =0x02038c28 movs r2, 0xA ldrsh r3, [r4, r2] @@ -633034,20 +633034,20 @@ _08148CA8: movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0xA0 - bne _08148CD4 + bne @08148CD4 movs r0, 0x1 strh r0, [r4, 0x16] bl sub_8149F84 - b _08148CDE + b @08148CDE .align 2, 0 .pool -_08148CD4: +@08148CD4: ldr r0, [r5] ldrb r1, [r0] adds r1, 0x1 ldrb r2, [r0] strb r1, [r0] -_08148CDE: +@08148CDE: movs r0, 0 pop {r4,r5} pop {r1} @@ -633055,7 +633055,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 @@ -633067,13 +633067,13 @@ sub_8148CE8: @ 8148CE8 movs r2, 0x16 ldrsh r0, [r4, r2] cmp r0, 0 - bne _08148D0A + bne @08148D0A adds r0, r1, 0x1 strh r0, [r4, 0x16] movs r0, 0x30 strh r0, [r4, 0xA] strh r5, [r4, 0x14] -_08148D0A: +@08148D0A: ldr r1, =0x085c8c80 movs r2, 0x14 ldrsh r0, [r4, r2] @@ -633101,12 +633101,12 @@ _08148D0A: movs r2, 0xA ldrsh r0, [r4, r2] cmp r0, 0x8 - bgt _08148D4C + bgt @08148D4C ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] strh r5, [r4, 0x16] -_08148D4C: +@08148D4C: ldr r0, [r6] ldrb r1, [r0] adds r1, 0x1 @@ -633121,7 +633121,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 @@ -633133,20 +633133,20 @@ sub_8148D6C: @ 8148D6C movs r2, 0x16 ldrsh r0, [r4, r2] cmp r0, 0 - bne _08148D8E + bne @08148D8E adds r0, r1, 0x1 strh r0, [r4, 0x16] movs r0, 0x2 strh r0, [r4, 0x12] strh r0, [r4, 0x14] -_08148D8E: +@08148D8E: movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0xA0 - ble _08148D9A + ble @08148D9A movs r0, 0xA0 strh r0, [r4, 0xA] -_08148D9A: +@08148D9A: ldr r0, =0x02038c28 movs r2, 0xA ldrsh r3, [r4, r2] @@ -633156,7 +633156,7 @@ _08148D9A: movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0xA0 - bne _08148DD6 + bne @08148DD6 ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] ldr r0, =0x0000c5ff @@ -633173,25 +633173,25 @@ _08148D9A: lsls r0, 24 lsrs r0, 24 bl remove_task -_08148DD6: +@08148DD6: ldrh r2, [r4, 0x12] ldrb r0, [r4, 0x12] cmp r0, 0x80 - bgt _08148DFC + bgt @08148DFC ldrh r1, [r4, 0x14] adds r0, r2, 0 adds r0, 0x8 - b _08148E08 + b @08148E08 .align 2, 0 .pool -_08148DFC: +@08148DFC: ldrh r0, [r4, 0x14] subs r0, 0x1 lsls r0, 16 lsrs r1, r0, 16 adds r0, r2, 0 adds r0, 0x10 -_08148E08: +@08148E08: strh r0, [r4, 0x12] movs r0, 0xFF ands r2, r0 @@ -633204,21 +633204,21 @@ _08148E08: strh r0, [r4, 0xA] lsls r0, 16 cmp r0, 0 - bgt _08148E28 + bgt @08148E28 movs r0, 0x1 strh r0, [r4, 0xA] -_08148E28: +@08148E28: ldrh r0, [r4, 0x12] lsls r1, r0, 16 asrs r0, r1, 16 cmp r0, 0xFE - ble _08148E3C + ble @08148E3C asrs r0, r1, 24 strh r0, [r4, 0x12] ldrh r0, [r4, 0x14] adds r0, 0x1 strh r0, [r4, 0x14] -_08148E3C: +@08148E3C: ldr r0, =0x0203aba0 ldr r1, [r0] ldrb r0, [r1] @@ -633234,7 +633234,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 @@ -633244,7 +633244,7 @@ sub_8148E54: @ 8148E54 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_08148E66: +@08148E66: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -633254,7 +633254,7 @@ _08148E66: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _08148E66 + bne @08148E66 pop {r4,r5} pop {r0} bx r0 @@ -633263,7 +633263,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 @@ -633346,7 +633346,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} @@ -633357,10 +633357,10 @@ sub_8148F4C: @ 8148F4C mov r0, sp bl sub_8149F58 movs r0, 0 -_08148F62: +@08148F62: movs r5, 0 adds r6, r0, 0x1 -_08148F66: +@08148F66: ldr r1, =0x085c8d38 lsrs r0, r5, 1 lsls r0, 2 @@ -633375,13 +633375,13 @@ _08148F66: bl sub_8149048 lsls r0, 16 cmp r0, 0 - beq _08148FCA + beq @08148FCA movs r7, 0 ldrh r2, [r4, 0x2] movs r0, 0x1 ands r0, r5 cmp r0, 0x1 - bne _08148FA0 + bne @08148FA0 ldr r0, =0x0000027d adds r1, r0, 0 lsls r0, r2, 16 @@ -633389,14 +633389,14 @@ _08148F66: subs r1, r0 lsls r1, 16 lsrs r2, r1, 16 -_08148FA0: +@08148FA0: lsls r0, r2, 16 asrs r1, r0, 16 adds r0, r1, 0 cmp r1, 0 - bge _08148FAC + bge @08148FAC adds r0, 0x1F -_08148FAC: +@08148FAC: asrs r2, r0, 5 lsls r0, r2, 5 subs r0, r1, r0 @@ -633412,23 +633412,23 @@ _08148FAC: ldr r2, =0x0000f002 adds r0, r2, 0 strh r0, [r1] -_08148FCA: +@08148FCA: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x3 - bls _08148F66 + bls @08148F66 lsls r0, r6, 24 lsrs r0, 24 cmp r0, 0x1 - bls _08148F62 + bls @08148F62 cmp r7, 0x1 - bne _08148FE8 + bne @08148FE8 mov r1, r8 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_08148FE8: +@08148FE8: movs r0, 0 add sp, 0x8 pop {r3} @@ -633441,7 +633441,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 @@ -633469,7 +633469,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] @@ -633484,7 +633484,7 @@ sub_8149048: @ 8149048 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _081490CE + beq @081490CE ldr r1, =0x03001208 ldrh r0, [r3] strh r0, [r1] @@ -633497,43 +633497,43 @@ sub_8149048: @ 8149048 movs r1, 0 ldrsh r0, [r3, r1] cmp r0, 0x2 - beq _081490A0 + beq @081490A0 cmp r0, 0x2 - bgt _08149090 + bgt @08149090 cmp r0, 0x1 - beq _0814909A - b _081490B2 + beq @0814909A + b @081490B2 .align 2, 0 .pool -_08149090: +@08149090: cmp r0, 0x3 - beq _081490A6 + beq @081490A6 cmp r0, 0x4 - beq _081490AC - b _081490B2 -_0814909A: + beq @081490AC + b @081490B2 +@0814909A: ldrh r0, [r2, 0x2] adds r0, 0x1 - b _081490B0 -_081490A0: + b @081490B0 +@081490A0: ldrh r0, [r2, 0x2] subs r0, 0x1 - b _081490B0 -_081490A6: + b @081490B0 +@081490A6: ldrh r0, [r2, 0x2] subs r0, 0x20 - b _081490B0 -_081490AC: + b @081490B0 +@081490AC: ldrh r0, [r2, 0x2] adds r0, 0x20 -_081490B0: +@081490B0: strh r0, [r2, 0x2] -_081490B2: +@081490B2: movs r4, 0x2 ldrsh r1, [r2, r4] ldr r0, =0x0000027f cmp r1, r0 - bgt _081490CE + bgt @081490CE ldrb r0, [r2, 0x4] lsls r0, 1 adds r0, r3 @@ -633542,20 +633542,20 @@ _081490B2: movs r0, 0x1 negs r0, r0 cmp r1, r0 - bne _081490D8 -_081490CE: + bne @081490D8 +@081490CE: movs r0, 0 - b _08149138 + b @08149138 .align 2, 0 .pool -_081490D8: +@081490D8: ldrb r0, [r2, 0x8] cmp r0, 0 - bne _081490F4 + bne @081490F4 movs r0, 0x2 negs r0, r0 cmp r1, r0 - bne _081490F4 + bne @081490F4 movs r0, 0x1 strb r0, [r2, 0x8] strb r0, [r2, 0x4] @@ -633563,7 +633563,7 @@ _081490D8: strh r0, [r2, 0x2] movs r0, 0x4 strb r0, [r2] -_081490F4: +@081490F4: ldrb r0, [r2, 0x4] lsls r0, 1 adds r0, r3 @@ -633572,43 +633572,43 @@ _081490F4: movs r4, 0 ldrsh r0, [r0, r4] cmp r1, r0 - bne _08149136 + bne @08149136 ldrb r0, [r2] adds r1, r0, 0x1 strb r1, [r2] ldrb r0, [r2, 0x8] cmp r0, 0x1 - bne _08149124 + bne @08149124 lsls r0, r1, 24 lsrs r0, 24 cmp r0, 0x7 - bls _08149136 + bls @08149136 ldrb r0, [r2, 0x4] adds r0, 0x1 strb r0, [r2, 0x4] movs r0, 0x4 - b _08149134 -_08149124: + b @08149134 +@08149124: lsls r0, r1, 24 lsrs r0, 24 cmp r0, 0x3 - bls _08149136 + bls @08149136 ldrb r0, [r2, 0x4] adds r0, 0x1 strb r0, [r2, 0x4] movs r0, 0 -_08149134: +@08149134: strb r0, [r2] -_08149136: +@08149136: movs r0, 0x1 -_08149138: +@08149138: pop {r4} pop {r1} bx r1 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 @@ -633618,7 +633618,7 @@ sub_8149140: @ 8149140 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_08149152: +@08149152: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -633628,7 +633628,7 @@ _08149152: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _08149152 + bne @08149152 pop {r4,r5} pop {r0} bx r0 @@ -633637,7 +633637,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 @@ -633672,7 +633672,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 @@ -633682,7 +633682,7 @@ sub_81491C8: @ 81491C8 bl __modsi3 lsls r0, 16 cmp r0, 0 - bne _08149200 + bne @08149200 adds r0, r5, 0 movs r1, 0x1E bl __modsi3 @@ -633697,20 +633697,20 @@ sub_81491C8: @ 81491C8 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply -_08149200: +@08149200: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x3A - ble _08149218 + ble @08149218 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] movs r0, 0 strh r0, [r4, 0xA] -_08149218: +@08149218: movs r0, 0 pop {r4,r5} pop {r1} @@ -633720,7 +633720,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 @@ -633730,7 +633730,7 @@ sub_8149224: @ 8149224 bl __modsi3 lsls r0, 16 cmp r0, 0 - bne _08149252 + bne @08149252 adds r0, r5, 0 movs r1, 0x5 bl __divsi3 @@ -633741,14 +633741,14 @@ sub_8149224: @ 8149224 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply -_08149252: +@08149252: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x44 - ble _0814926E + ble @0814926E ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -633756,7 +633756,7 @@ _08149252: strh r0, [r4, 0xA] movs r0, 0x1E strh r0, [r4, 0x18] -_0814926E: +@0814926E: movs r0, 0 pop {r4,r5} pop {r1} @@ -633766,7 +633766,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 @@ -633776,7 +633776,7 @@ sub_814927C: @ 814927C adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_0814928E: +@0814928E: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -633786,7 +633786,7 @@ _0814928E: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _0814928E + bne @0814928E pop {r4,r5} pop {r0} bx r0 @@ -633795,7 +633795,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 @@ -633838,7 +633838,7 @@ sub_81492B4: @ 81492B4 adds r5, r3, r0 movs r4, 0x80 lsls r4, 1 -_08149316: +@08149316: lsls r1, r2, 1 adds r0, r1, r3 strh r6, [r0] @@ -633848,7 +633848,7 @@ _08149316: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x9F - bls _08149316 + bls @08149316 ldr r0, =sub_8149508 + 1 bl SetVBlankCallback movs r0, 0 @@ -633861,7 +633861,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 @@ -633886,20 +633886,20 @@ 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] movs r1, 0x3 ands r0, r1 cmp r0, 0 - bne _081493B4 + bne @081493B4 movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0 - bge _081493A0 + bge @081493A0 adds r0, 0x3 -_081493A0: +@081493A0: lsls r0, 14 lsrs r0, 16 adds r0, 0x5 @@ -633909,20 +633909,20 @@ _081493A0: movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply -_081493B4: +@081493B4: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x28 - ble _081493CC + ble @081493CC ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] movs r0, 0 strh r0, [r4, 0xA] -_081493CC: +@081493CC: movs r0, 0 pop {r4} pop {r1} @@ -633932,7 +633932,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 @@ -633943,7 +633943,7 @@ sub_81493D8: @ 81493D8 lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - ble _08149402 + ble @08149402 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] @@ -633953,7 +633953,7 @@ sub_81493D8: @ 81493D8 movs r1, 0x2 movs r3, 0x10 bl sub_80A1AD4 -_08149402: +@08149402: movs r0, 0 add sp, 0x4 pop {r1} @@ -633963,7 +633963,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 @@ -633971,7 +633971,7 @@ sub_8149410: @ 8149410 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0814942E + bne @0814942E ldr r0, =0x0203aba0 ldr r1, [r0] movs r0, 0x1 @@ -633979,7 +633979,7 @@ sub_8149410: @ 8149410 ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] -_0814942E: +@0814942E: movs r0, 0 pop {r1} bx r1 @@ -633988,7 +633988,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 @@ -634011,7 +634011,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 @@ -634021,7 +634021,7 @@ sub_814946C: @ 814946C bl __modsi3 lsls r0, 16 cmp r0, 0 - bne _0814949A + bne @0814949A adds r0, r5, 0 movs r1, 0x3 bl __divsi3 @@ -634032,14 +634032,14 @@ sub_814946C: @ 814946C movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply -_0814949A: +@0814949A: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x27 - ble _081494F0 + ble @081494F0 ldr r0, =0x0203aba0 ldr r1, [r0] movs r0, 0 @@ -634054,7 +634054,7 @@ _0814949A: ldr r5, =sub_8146F68 + 1 ldr r3, =0x020393a8 movs r2, 0 -_081494C4: +@081494C4: lsls r0, r1, 1 adds r0, r3 strh r2, [r0] @@ -634062,7 +634062,7 @@ _081494C4: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x9F - bls _081494C4 + bls @081494C4 adds r0, r5, 0 bl SetVBlankCallback ldrh r0, [r4, 0x8] @@ -634075,7 +634075,7 @@ _081494C4: strh r2, [r4, 0x16] movs r0, 0 bl lcd_io_clear_bits -_081494F0: +@081494F0: movs r0, 0 pop {r4,r5} pop {r1} @@ -634085,7 +634085,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] @@ -634103,19 +634103,19 @@ sub_8149508: @ 8149508 movs r1, 0x20 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08149548 + bne @08149548 ldr r2, =0x02038c28 - b _08149554 + b @08149554 .align 2, 0 .pool -_08149548: +@08149548: ldr r2, =0x02038c28 cmp r0, 0x1 - bne _08149554 + bne @08149554 movs r0, 0xF0 lsls r0, 3 adds r2, r0 -_08149554: +@08149554: ldr r1, =0x040000b0 str r2, [r1] ldr r0, =0x04000012 @@ -634130,7 +634130,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 @@ -634140,7 +634140,7 @@ sub_8149578: @ 8149578 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_0814958A: +@0814958A: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -634150,7 +634150,7 @@ _0814958A: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _0814958A + bne @0814958A pop {r4,r5} pop {r0} bx r0 @@ -634159,7 +634159,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 @@ -634180,7 +634180,7 @@ sub_81495B0: @ 81495B0 ldr r2, =0x020393a8 movs r4, 0 movs r3, 0xF0 -_081495DC: +@081495DC: lsls r0, r1, 1 adds r0, r2 strh r4, [r0] @@ -634193,7 +634193,7 @@ _081495DC: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x9F - bls _081495DC + bls @081495DC movs r0, 0x2 bl enable_irqs ldr r0, =sub_8149840 + 1 @@ -634212,7 +634212,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 @@ -634222,7 +634222,7 @@ sub_8149628: @ 8149628 bl memcpy movs r5, 0 movs r4, 0 -_0814963C: +@0814963C: ldr r0, =sub_8149864 + 1 bl obj_add_empty_with_callback lsls r0, 24 @@ -634251,7 +634251,7 @@ _0814963C: lsrs r5, r1, 16 asrs r1, 16 cmp r1, 0x7 - ble _0814963C + ble @0814963C ldrh r0, [r2, 0x3A] adds r0, 0x1 strh r0, [r2, 0x3A] @@ -634268,7 +634268,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 @@ -634280,7 +634280,7 @@ sub_814969C: @ 814969C movs r1, 0x20 ldrsh r0, [r0, r1] cmp r0, 0x7 - ble _081496C6 + ble @081496C6 movs r0, 0x1 negs r0, r0 ldr r2, =0x00007fff @@ -634289,7 +634289,7 @@ sub_814969C: @ 814969C ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_081496C6: +@081496C6: movs r0, 0 pop {r4} pop {r1} @@ -634299,7 +634299,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 @@ -634343,7 +634343,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] @@ -634353,14 +634353,14 @@ sub_8149740: @ 8149740 lsls r0, 16 lsrs r0, 16 cmp r0, 0x10 - bls _08149766 + bls @08149766 bl sub_8149F84 ldr r0, =sub_8149578 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task -_08149766: +@08149766: movs r0, 0 pop {r1} bx r1 @@ -634369,7 +634369,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] @@ -634398,7 +634398,7 @@ sub_8149774: @ 8149774 strh r0, [r2] ldrb r0, [r1] cmp r0, 0 - beq _081497C4 + beq @081497C4 ldr r1, =0x040000d4 ldr r0, =0x02038c28 str r0, [r1] @@ -634409,7 +634409,7 @@ sub_8149774: @ 8149774 ldr r0, =0x80000140 str r0, [r1, 0x8] ldr r0, [r1, 0x8] -_081497C4: +@081497C4: ldr r0, =0x020394e8 str r0, [r4] ldr r0, =0x04000040 @@ -634425,7 +634425,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 @@ -634455,7 +634455,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 @@ -634473,29 +634473,29 @@ 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] movs r2, 0x38 ldrsh r0, [r3, r2] cmp r0, 0 - beq _08149890 + beq @08149890 subs r0, r1, 0x1 strh r0, [r3, 0x38] movs r1, 0x3A ldrsh r0, [r3, r1] cmp r0, 0 - beq _0814994C + beq @0814994C ldr r0, =0x0203aba0 ldr r1, [r0] ldrb r0, [r1] movs r0, 0x1 strb r0, [r1] - b _0814994C + b @0814994C .align 2, 0 .pool -_08149890: +@08149890: movs r2, 0x22 ldrsh r1, [r3, r2] lsls r1, 1 @@ -634506,7 +634506,7 @@ _08149890: adds r0, r2 adds r5, r1, r0 movs r4, 0 -_081498A4: +@081498A4: lsls r1, r4, 1 adds r2, r1, r6 ldrh r0, [r3, 0x2E] @@ -634522,21 +634522,21 @@ _081498A4: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x13 - bls _081498A4 + bls @081498A4 movs r1, 0x20 ldrsh r0, [r3, r1] ldrh r2, [r3, 0x20] cmp r0, 0 - bne _081498DE + bne @081498DE movs r0, 0x2E ldrsh r1, [r3, r0] movs r0, 0x80 lsls r0, 5 cmp r1, r0 - bne _081498DE + bne @081498DE movs r0, 0x1 strh r0, [r3, 0x30] -_081498DE: +@081498DE: adds r1, r2, 0 subs r1, 0x10 strh r1, [r3, 0x20] @@ -634545,57 +634545,57 @@ _081498DE: strh r0, [r3, 0x2E] lsls r1, 16 cmp r1, 0 - bge _081498F4 + bge @081498F4 movs r0, 0 strh r0, [r3, 0x20] -_081498F4: +@081498F4: movs r1, 0x2E ldrsh r0, [r3, r1] movs r1, 0x80 lsls r1, 5 cmp r0, r1 - ble _08149902 + ble @08149902 strh r1, [r3, 0x2E] -_08149902: +@08149902: movs r2, 0x3A ldrsh r0, [r3, r2] cmp r0, 0 - beq _08149914 + beq @08149914 ldr r0, =0x0203aba0 ldr r1, [r0] ldrb r0, [r1] movs r0, 0x1 strb r0, [r1] -_08149914: +@08149914: movs r1, 0x30 ldrsh r0, [r3, r1] cmp r0, 0 - beq _0814994C + beq @0814994C movs r2, 0x3A ldrsh r0, [r3, r2] ldr r2, =0x0203aba0 cmp r0, 0 - beq _0814993E + beq @0814993E ldr r0, [r2] movs r1, 0x20 ldrsh r0, [r0, r1] cmp r0, 0x6 - ble _0814994C + ble @0814994C ldrh r0, [r3, 0x32] adds r1, r0, 0x1 strh r1, [r3, 0x32] lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - ble _0814994C -_0814993E: + ble @0814994C +@0814993E: ldr r1, [r2] ldrh r0, [r1, 0x20] adds r0, 0x1 strh r0, [r1, 0x20] adds r0, r3, 0 bl obj_delete_and_free_tiles -_0814994C: +@0814994C: pop {r4-r6} pop {r0} bx r0 @@ -634604,7 +634604,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 @@ -634614,7 +634614,7 @@ sub_814995C: @ 814995C adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_0814996E: +@0814996E: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -634624,7 +634624,7 @@ _0814996E: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _0814996E + bne @0814996E pop {r4,r5} pop {r0} bx r0 @@ -634633,7 +634633,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 @@ -634670,14 +634670,14 @@ 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 movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0 - bne _08149A2A + bne @08149A2A mov r0, sp bl sub_8149F40 movs r0, 0x3 @@ -634696,13 +634696,13 @@ sub_81499E8: @ 81499E8 movs r1, 0xC ldrsh r0, [r4, r1] cmp r0, 0xD - ble _08149A2A + ble @08149A2A ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] movs r0, 0x10 strh r0, [r4, 0xA] -_08149A2A: +@08149A2A: ldrh r0, [r4, 0xA] subs r0, 0x1 strh r0, [r4, 0xA] @@ -634716,21 +634716,21 @@ _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 strh r1, [r0, 0xA] lsls r1, 16 cmp r1, 0 - bne _08149A60 + bne @08149A60 bl sub_8149F84 ldr r0, =sub_814995C + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task -_08149A60: +@08149A60: movs r0, 0 pop {r1} bx r1 @@ -634739,7 +634739,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 @@ -634749,7 +634749,7 @@ sub_8149A6C: @ 8149A6C adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_08149A7E: +@08149A7E: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -634759,7 +634759,7 @@ _08149A7E: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _08149A7E + bne @08149A7E pop {r4,r5} pop {r0} bx r0 @@ -634768,7 +634768,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 @@ -634785,7 +634785,7 @@ sub_8149AA4: @ 8149AA4 ldr r2, =0x02038c28 movs r3, 0xF0 adds r4, r2, 0 -_08149AC8: +@08149AC8: lsls r0, r1, 1 adds r0, r2 strh r3, [r0] @@ -634793,7 +634793,7 @@ _08149AC8: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x9F - bls _08149AC8 + bls @08149AC8 movs r0, 0xF0 lsls r0, 3 adds r1, r4, r0 @@ -634814,7 +634814,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} @@ -634876,7 +634876,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 @@ -634891,7 +634891,7 @@ sub_8149B84: @ 8149B84 movs r7, 0 ldr r0, =0x02038c28 mov r9, r0 -_08149BA0: +@08149BA0: ldr r1, =0x02038c28 ldr r0, =0x0203aba0 ldr r2, [r0] @@ -634906,36 +634906,36 @@ _08149BA0: movs r4, 0xC ldrsh r0, [r6, r4] cmp r0, 0 - bne _08149BDC + bne @08149BDC movs r1, 0x28 ldrsh r0, [r2, r1] cmp r3, r0 - bge _08149BC8 + bge @08149BC8 ldrh r3, [r2, 0x28] -_08149BC8: +@08149BC8: lsls r0, r3, 16 lsls r1, r5, 16 cmp r0, r1 - ble _08149BF4 + ble @08149BF4 lsrs r3, r1, 16 - b _08149BF4 + b @08149BF4 .align 2, 0 .pool -_08149BDC: +@08149BDC: lsls r0, r5, 16 asrs r0, 16 movs r4, 0x28 ldrsh r1, [r2, r4] cmp r0, r1 - ble _08149BEA + ble @08149BEA ldrh r5, [r2, 0x28] -_08149BEA: +@08149BEA: lsls r0, r5, 16 lsls r1, r3, 16 cmp r0, r1 - bgt _08149BF4 + bgt @08149BF4 lsrs r5, r1, 16 -_08149BF4: +@08149BF4: ldr r0, =0x0203aba0 ldr r4, [r0] movs r0, 0x2A @@ -634949,14 +634949,14 @@ _08149BF4: orrs r0, r1 strh r0, [r2] cmp r7, 0 - beq _08149C1C + beq @08149C1C ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] - b _08149C40 + b @08149C40 .align 2, 0 .pool -_08149C1C: +@08149C1C: adds r0, r4, 0 adds r0, 0x24 movs r1, 0x1 @@ -634973,8 +634973,8 @@ _08149C1C: mov r8, r4 asrs r0, 16 cmp r0, 0xF - ble _08149BA0 -_08149C40: + ble @08149BA0 +@08149C40: ldr r0, =0x0203aba0 ldr r1, [r0] ldrb r0, [r1] @@ -634993,7 +634993,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] @@ -635002,7 +635002,7 @@ sub_8149C60: @ 8149C60 lsls r0, 16 asrs r0, 16 cmp r0, 0x6 - ble _08149CAC + ble @08149CAC ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] ldr r0, =0x0000c5ff @@ -635020,10 +635020,10 @@ sub_8149C60: @ 8149C60 lsrs r0, 24 bl remove_task movs r0, 0 - b _08149CC4 + b @08149CC4 .align 2, 0 .pool -_08149CAC: +@08149CAC: ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] @@ -635036,7 +635036,7 @@ _08149CAC: ldrh r0, [r0] strh r0, [r2, 0xE] movs r0, 0x1 -_08149CC4: +@08149CC4: pop {r1} bx r1 .align 2, 0 @@ -635044,7 +635044,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] @@ -635052,19 +635052,19 @@ sub_8149CCC: @ 8149CCC strh r0, [r1, 0xE] lsls r0, 16 cmp r0, 0 - beq _08149CE0 + beq @08149CE0 movs r0, 0 - b _08149CE4 -_08149CE0: + b @08149CE4 +@08149CE0: movs r0, 0x1 strh r0, [r1, 0x8] -_08149CE4: +@08149CE4: pop {r1} bx r1 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] @@ -635081,7 +635081,7 @@ sub_8149CE8: @ 8149CE8 ldr r0, [r3] ldrb r0, [r0] cmp r0, 0 - beq _08149D20 + beq @08149D20 ldr r1, =0x040000d4 ldr r0, =0x02038c28 str r0, [r1] @@ -635092,7 +635092,7 @@ sub_8149CE8: @ 8149CE8 ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] -_08149D20: +@08149D20: ldr r2, =0x04000048 ldr r1, [r3] ldrh r0, [r1, 0x2] @@ -635123,7 +635123,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} @@ -635174,27 +635174,27 @@ 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 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _08149DF4 + beq @08149DF4 movs r0, 0 - b _08149DF6 + b @08149DF6 .align 2, 0 .pool -_08149DF4: +@08149DF4: movs r0, 0x1 -_08149DF6: +@08149DF6: pop {r1} bx r1 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 @@ -635204,7 +635204,7 @@ sub_8149DFC: @ 8149DFC adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_08149E0E: +@08149E0E: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -635214,7 +635214,7 @@ _08149E0E: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _08149E0E + bne @08149E0E pop {r4,r5} pop {r0} bx r0 @@ -635223,20 +635223,20 @@ _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] movs r2, 0x14 ldrsh r0, [r4, r2] cmp r0, 0 - beq _08149E4C + beq @08149E4C subs r0, r1, 0x1 strh r0, [r4, 0x14] lsls r0, 16 cmp r0, 0 - bne _08149E70 -_08149E4C: + bne @08149E70 +@08149E4C: ldrh r0, [r4, 0xA] strh r0, [r4, 0x14] ldrh r0, [r4, 0x10] @@ -635246,26 +635246,26 @@ _08149E4C: lsls r0, 16 asrs r0, 16 cmp r0, 0x10 - ble _08149E64 + ble @08149E64 movs r0, 0x10 strh r0, [r4, 0x16] -_08149E64: +@08149E64: movs r0, 0x1 negs r0, r0 ldrb r1, [r4, 0x16] ldr r2, =0x00002d6b bl sub_80A2A20 -_08149E70: +@08149E70: movs r2, 0x16 ldrsh r0, [r4, r2] cmp r0, 0xF - ble _08149E82 + ble @08149E82 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] ldrh r0, [r4, 0xC] strh r0, [r4, 0x14] -_08149E82: +@08149E82: movs r0, 0 pop {r4} pop {r1} @@ -635275,20 +635275,20 @@ _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] movs r2, 0x14 ldrsh r0, [r4, r2] cmp r0, 0 - beq _08149EA8 + beq @08149EA8 subs r0, r1, 0x1 strh r0, [r4, 0x14] lsls r0, 16 cmp r0, 0 - bne _08149ECA -_08149EA8: + bne @08149ECA +@08149EA8: ldrh r0, [r4, 0xC] strh r0, [r4, 0x14] ldrh r0, [r4, 0x16] @@ -635297,39 +635297,39 @@ _08149EA8: strh r0, [r4, 0x16] lsls r0, 16 cmp r0, 0 - bge _08149EBE + bge @08149EBE movs r0, 0 strh r0, [r4, 0x16] -_08149EBE: +@08149EBE: movs r0, 0x1 negs r0, r0 ldrb r1, [r4, 0x16] ldr r2, =0x00002d6b bl sub_80A2A20 -_08149ECA: +@08149ECA: movs r0, 0x16 ldrsh r1, [r4, r0] cmp r1, 0 - bne _08149EFE + bne @08149EFE ldrh r0, [r4, 0xE] subs r0, 0x1 strh r0, [r4, 0xE] lsls r0, 16 cmp r0, 0 - bne _08149EF8 + bne @08149EF8 ldr r0, =sub_8149DFC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task - b _08149EFE + b @08149EFE .align 2, 0 .pool -_08149EF8: +@08149EF8: ldrh r0, [r4, 0xA] strh r0, [r4, 0x14] strh r1, [r4, 0x8] -_08149EFE: +@08149EFE: movs r0, 0 pop {r4} pop {r1} @@ -635337,7 +635337,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] @@ -635357,7 +635357,7 @@ sub_8149F08: @ 8149F08 thumb_func_end sub_8149F08 thumb_func_start sub_8149F2C -sub_8149F2C: @ 8149F2C +sub_8149F2C: ; 8149F2C push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -635367,7 +635367,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 @@ -635383,7 +635383,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] @@ -635408,7 +635408,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 @@ -635420,7 +635420,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 @@ -635441,7 +635441,7 @@ sub_8149F98: @ 8149F98 movs r6, 0 lsrs r5, r4, 16 cmp r4, 0 - ble _0814A000 + ble @0814A000 lsls r0, r7, 16 asrs r0, 16 mov r9, r0 @@ -635449,7 +635449,7 @@ sub_8149F98: @ 8149F98 mov r8, r1 lsls r0, r3, 16 asrs r7, r0, 16 -_08149FD0: +@08149FD0: lsls r4, r2, 16 asrs r4, 16 movs r0, 0xFF @@ -635472,8 +635472,8 @@ _08149FD0: lsrs r2, r4, 16 lsrs r5, r1, 16 cmp r1, 0 - bgt _08149FD0 -_0814A000: + bgt @08149FD0 +@0814A000: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -635486,7 +635486,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 @@ -635514,7 +635514,7 @@ sub_814A014: @ 814A014 lsls r5, 16 asrs r5, 16 str r5, [sp, 0x8] -_0814A04C: +@0814A04C: lsls r5, r1, 16 asrs r0, r5, 16 mov r10, r0 @@ -635549,28 +635549,28 @@ _0814A04C: lsrs r1, r2, 16 str r5, [sp, 0x10] cmp r2, 0 - bge _0814A098 + bge @0814A098 movs r1, 0 -_0814A098: +@0814A098: lsls r0, r6, 16 asrs r0, 16 cmp r0, 0xF0 - ble _0814A0A2 + ble @0814A0A2 movs r6, 0xF0 -_0814A0A2: +@0814A0A2: lsls r0, r7, 16 cmp r0, 0 - bge _0814A0AA + bge @0814A0AA movs r7, 0 -_0814A0AA: +@0814A0AA: mov r2, r8 lsls r0, r2, 16 asrs r0, 16 cmp r0, 0x9F - ble _0814A0B8 + ble @0814A0B8 movs r3, 0x9F mov r8, r3 -_0814A0B8: +@0814A0B8: lsls r0, r1, 24 lsrs r0, 16 orrs r6, r0 @@ -635601,24 +635601,24 @@ _0814A0B8: lsrs r2, r0, 16 lsrs r3, r1, 16 cmp r1, 0 - bge _0814A0FA + bge @0814A0FA movs r3, 0 -_0814A0FA: +@0814A0FA: lsls r0, r2, 16 asrs r0, 16 cmp r0, 0x9F - ble _0814A104 + ble @0814A104 movs r2, 0x9F -_0814A104: +@0814A104: lsls r0, r3, 16 asrs r1, r0, 16 adds r3, r0, 0 lsls r5, r2, 16 ldr r0, [sp, 0xC] cmp r0, r1 - ble _0814A128 + ble @0814A128 adds r2, r1, 0 -_0814A114: +@0814A114: lsls r1, r7, 16 ldr r0, =0xffff0000 adds r1, r0 @@ -635628,14 +635628,14 @@ _0814A114: lsrs r7, r1, 16 asrs r1, 16 cmp r1, r2 - bgt _0814A114 -_0814A128: + bgt @0814A114 +@0814A128: lsls r1, r7, 16 asrs r0, r3, 16 cmp r1, r3 - bge _0814A146 + bge @0814A146 adds r2, r0, 0 -_0814A132: +@0814A132: movs r3, 0x80 lsls r3, 9 adds r0, r1, r3 @@ -635645,13 +635645,13 @@ _0814A132: adds r1, r0, 0 asrs r0, r1, 16 cmp r0, r2 - blt _0814A132 -_0814A146: + blt @0814A132 +@0814A146: asrs r0, r5, 16 cmp r4, r5 - ble _0814A164 + ble @0814A164 adds r1, r0, 0 -_0814A14E: +@0814A14E: ldr r2, =0xffff0000 adds r0, r4, r2 lsrs r3, r0, 16 @@ -635662,15 +635662,15 @@ _0814A14E: lsls r4, r3, 16 asrs r0, r4, 16 cmp r0, r1 - bgt _0814A14E -_0814A164: + bgt @0814A14E +@0814A164: mov r0, r8 lsls r4, r0, 16 asrs r0, r5, 16 cmp r4, r5 - bge _0814A184 + bge @0814A184 adds r2, r0, 0 -_0814A170: +@0814A170: movs r1, 0x80 lsls r1, 9 adds r0, r4, r1 @@ -635680,8 +635680,8 @@ _0814A170: adds r4, r0, 0 asrs r0, r4, 16 cmp r0, r2 - blt _0814A170 -_0814A184: + blt @0814A170 +@0814A184: ldr r2, [sp, 0x10] movs r3, 0x80 lsls r3, 9 @@ -635689,9 +635689,9 @@ _0814A184: lsrs r1, r0, 16 asrs r0, 16 cmp r0, 0x3F - bgt _0814A196 - b _0814A04C -_0814A196: + bgt @0814A196 + b @0814A04C +@0814A196: add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -635705,7 +635705,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] @@ -635740,14 +635740,14 @@ sub_814A1AC: @ 814A1AC strh r3, [r6, 0x10] lsls r0, r3, 16 cmp r0, 0 - bge _0814A1FE + bge @0814A1FE negs r0, r3 strh r0, [r6, 0x10] lsls r0, r5, 16 asrs r0, 16 negs r0, r0 strh r0, [r6, 0xC] -_0814A1FE: +@0814A1FE: lsls r0, r7, 16 asrs r0, 16 lsls r1, r2, 16 @@ -635756,14 +635756,14 @@ _0814A1FE: strh r1, [r6, 0x12] lsls r0, r1, 16 cmp r0, 0 - bge _0814A21C + bge @0814A21C negs r0, r1 strh r0, [r6, 0x12] lsls r0, r4, 16 asrs r0, 16 negs r0, r0 strh r0, [r6, 0xE] -_0814A21C: +@0814A21C: movs r0, 0 strh r0, [r6, 0x14] pop {r4-r7} @@ -635772,7 +635772,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 @@ -635794,7 +635794,7 @@ sub_814A228: @ 814A228 movs r4, 0x12 ldrsh r5, [r3, r4] cmp r6, r5 - ble _0814A278 + ble @0814A278 ldrh r0, [r3, 0xC] ldrh r2, [r3, 0x4] adds r1, r0, r2 @@ -635807,13 +635807,13 @@ sub_814A228: @ 814A228 adds r4, r0, 0 ldrh r7, [r3, 0xE] cmp r1, r6 - ble _0814A29E + ble @0814A29E ldrh r1, [r3, 0x6] adds r0, r7, r1 strh r0, [r3, 0x6] mov r1, r8 - b _0814A29A -_0814A278: + b @0814A29A +@0814A278: ldrh r0, [r3, 0xE] ldrh r2, [r3, 0x6] adds r1, r0, r2 @@ -635826,83 +635826,83 @@ _0814A278: ldrh r4, [r3, 0xC] adds r7, r0, 0 cmp r1, r5 - ble _0814A29E + ble @0814A29E ldrh r1, [r3, 0x4] adds r0, r4, r1 strh r0, [r3, 0x4] mov r1, r12 -_0814A29A: +@0814A29A: subs r0, r2, r1 strh r0, [r3, 0x14] -_0814A29E: +@0814A29E: movs r5, 0 lsls r0, r4, 16 asrs r2, r0, 16 cmp r2, 0 - ble _0814A2B6 + ble @0814A2B6 movs r4, 0x4 ldrsh r1, [r3, r4] movs r4, 0x8 ldrsh r0, [r3, r4] ldrh r4, [r3, 0x8] cmp r1, r0 - bge _0814A2C8 -_0814A2B6: + bge @0814A2C8 +@0814A2B6: cmp r2, 0 - bge _0814A2D6 + bge @0814A2D6 movs r0, 0x4 ldrsh r1, [r3, r0] movs r2, 0x8 ldrsh r0, [r3, r2] ldrh r4, [r3, 0x8] cmp r1, r0 - bgt _0814A2D6 -_0814A2C8: + bgt @0814A2D6 +@0814A2C8: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 mov r0, r9 cmp r0, 0 - beq _0814A2D6 + beq @0814A2D6 strh r4, [r3, 0x4] -_0814A2D6: +@0814A2D6: lsls r0, r7, 16 asrs r2, r0, 16 cmp r2, 0 - ble _0814A2EC + ble @0814A2EC movs r4, 0x6 ldrsh r1, [r3, r4] movs r4, 0xA ldrsh r0, [r3, r4] ldrh r4, [r3, 0xA] cmp r1, r0 - bge _0814A2FE -_0814A2EC: + bge @0814A2FE +@0814A2EC: cmp r2, 0 - bge _0814A30C + bge @0814A30C movs r0, 0x6 ldrsh r1, [r3, r0] movs r2, 0xA ldrsh r0, [r3, r2] ldrh r4, [r3, 0xA] cmp r1, r0 - bgt _0814A30C -_0814A2FE: + bgt @0814A30C +@0814A2FE: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 mov r0, r10 cmp r0, 0 - beq _0814A30C + beq @0814A30C strh r4, [r3, 0x6] -_0814A30C: +@0814A30C: cmp r5, 0x2 - beq _0814A314 + beq @0814A314 movs r0, 0 - b _0814A316 -_0814A314: + b @0814A316 +@0814A314: movs r0, 0x1 -_0814A316: +@0814A316: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -635913,7 +635913,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 @@ -635948,7 +635948,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 @@ -635982,7 +635982,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 @@ -635992,7 +635992,7 @@ sub_814A3BC: @ 814A3BC adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_0814A3CE: +@0814A3CE: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -636002,7 +636002,7 @@ _0814A3CE: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _0814A3CE + bne @0814A3CE pop {r4,r5} pop {r0} bx r0 @@ -636011,7 +636011,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 @@ -636021,7 +636021,7 @@ sub_814A3F4: @ 814A3F4 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_0814A406: +@0814A406: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -636031,7 +636031,7 @@ _0814A406: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _0814A406 + bne @0814A406 pop {r4,r5} pop {r0} bx r0 @@ -636040,7 +636040,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 @@ -636106,7 +636106,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 @@ -636129,14 +636129,14 @@ 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 ldr r6, =sub_814A684 + 1 ldr r4, =0x020393a8 ldr r3, =0x0203aba0 -_0814A50C: +@0814A50C: lsls r1, r2, 1 adds r1, r4 ldr r0, [r3] @@ -636146,7 +636146,7 @@ _0814A50C: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x9F - bls _0814A50C + bls @0814A50C adds r0, r6, 0 bl SetVBlankCallback ldr r0, =sub_814A6CC + 1 @@ -636165,7 +636165,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} @@ -636192,57 +636192,57 @@ sub_814A550: @ 814A550 ldrsh r0, [r4, r5] adds r5, r1, 0 cmp r0, 0x45 - ble _0814A5A2 + ble @0814A5A2 movs r1, 0xC ldrsh r0, [r4, r1] ldr r1, =0xfffffe80 adds r0, r1 cmp r0, 0 - blt _0814A5A0 + blt @0814A5A0 adds r0, r2, r1 strh r0, [r4, 0xC] - b _0814A5A2 + b @0814A5A2 .align 2, 0 .pool -_0814A5A0: +@0814A5A0: strh r3, [r4, 0xC] -_0814A5A2: +@0814A5A2: movs r2, 0xE ldrsh r0, [r4, r2] cmp r0, 0 - blt _0814A5E0 + blt @0814A5E0 movs r1, 0x3 bl __modsi3 lsls r0, 16 cmp r0, 0 - bne _0814A5E0 + bne @0814A5E0 ldrh r1, [r4, 0x12] movs r2, 0x12 ldrsh r0, [r4, r2] cmp r0, 0xF - bgt _0814A5C6 + bgt @0814A5C6 adds r0, r1, 0x1 strh r0, [r4, 0x12] - b _0814A5D4 -_0814A5C6: + b @0814A5D4 +@0814A5C6: ldrh r1, [r4, 0x14] movs r2, 0x14 ldrsh r0, [r4, r2] cmp r0, 0 - ble _0814A5D4 + ble @0814A5D4 subs r0, r1, 0x1 strh r0, [r4, 0x14] -_0814A5D4: +@0814A5D4: ldr r0, [r5] ldrh r1, [r4, 0x14] lsls r1, 8 ldrh r2, [r4, 0x12] orrs r1, r2 strh r1, [r0, 0x10] -_0814A5E0: +@0814A5E0: movs r5, 0 lsls r7, 16 -_0814A5E4: +@0814A5E4: lsrs r0, r6, 8 asrs r1, r7, 16 bl sine @@ -636262,14 +636262,14 @@ _0814A5E4: lsls r0, 16 lsrs r6, r0, 16 cmp r5, 0x9F - bls _0814A5E4 + bls @0814A5E4 ldrh r0, [r4, 0xE] adds r0, 0x1 strh r0, [r4, 0xE] lsls r0, 16 asrs r0, 16 cmp r0, 0x65 - bne _0814A632 + bne @0814A632 ldrh r0, [r4, 0x10] adds r0, 0x1 strh r0, [r4, 0x10] @@ -636280,23 +636280,23 @@ _0814A5E4: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 -_0814A632: +@0814A632: movs r2, 0x10 ldrsh r0, [r4, r2] cmp r0, 0 - beq _0814A654 + beq @0814A654 ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0814A654 + bne @0814A654 ldr r0, =sub_814A3F4 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task -_0814A654: +@0814A654: ldrh r0, [r4, 0x16] subs r0, 0x11 strh r0, [r4, 0x16] @@ -636318,7 +636318,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 @@ -636331,7 +636331,7 @@ sub_814A684: @ 814A684 strh r0, [r2] ldrb r0, [r1] cmp r0, 0 - beq _0814A6B4 + beq @0814A6B4 ldr r1, =0x040000d4 ldr r0, =0x02038c28 str r0, [r1] @@ -636342,7 +636342,7 @@ sub_814A684: @ 814A684 ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] -_0814A6B4: +@0814A6B4: pop {r0} bx r0 .align 2, 0 @@ -636350,7 +636350,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] @@ -636368,7 +636368,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 @@ -636378,7 +636378,7 @@ sub_814A6F0: @ 814A6F0 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_0814A702: +@0814A702: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -636388,7 +636388,7 @@ _0814A702: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _0814A702 + bne @0814A702 pop {r4,r5} pop {r0} bx r0 @@ -636397,7 +636397,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 @@ -636407,7 +636407,7 @@ sub_814A728: @ 814A728 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_0814A73A: +@0814A73A: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -636417,7 +636417,7 @@ _0814A73A: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _0814A73A + bne @0814A73A pop {r4,r5} pop {r0} bx r0 @@ -636426,7 +636426,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 @@ -636436,7 +636436,7 @@ sub_814A760: @ 814A760 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_0814A772: +@0814A772: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -636446,7 +636446,7 @@ _0814A772: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _0814A772 + bne @0814A772 pop {r4,r5} pop {r0} bx r0 @@ -636455,7 +636455,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} @@ -636521,7 +636521,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 @@ -636555,7 +636555,7 @@ sub_814A828: @ 814A828 lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - bne _0814A88A + bne @0814A88A movs r0, 0x1 strh r0, [r4, 0xC] ldrh r0, [r4, 0xE] @@ -636565,11 +636565,11 @@ sub_814A828: @ 814A828 lsls r0, 16 asrs r0, 16 cmp r0, 0x13 - ble _0814A88A + ble @0814A88A ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_0814A88A: +@0814A88A: movs r0, 0 add sp, 0x24 pop {r4,r5} @@ -636580,7 +636580,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 @@ -636595,28 +636595,28 @@ sub_814A898: @ 814A898 movs r2, 0x16 ldrsh r1, [r4, r2] cmp r0, r1 - blt _0814A956 + blt @0814A956 movs r1, 0x12 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _0814A8FC + beq @0814A8FC cmp r0, 0x1 - bgt _0814A8CA + bgt @0814A8CA cmp r0, 0 - beq _0814A8D4 - b _0814A92C -_0814A8CA: + beq @0814A8D4 + b @0814A92C +@0814A8CA: cmp r0, 0x2 - beq _0814A914 + beq @0814A914 cmp r0, 0x3 - beq _0814A91C - b _0814A92C -_0814A8D4: + beq @0814A91C + b @0814A92C +@0814A8D4: movs r2, 0xFA ldr r6, =0x02037714 movs r3, 0 ldr r5, =0x02037b14 -_0814A8DC: +@0814A8DC: lsls r1, r2, 1 adds r0, r1, r6 strh r3, [r0] @@ -636626,33 +636626,33 @@ _0814A8DC: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFE - bls _0814A8DC - b _0814A94C + bls @0814A8DC + b @0814A94C .align 2, 0 .pool -_0814A8FC: +@0814A8FC: ldr r0, =0xffff7fff movs r1, 0x10 movs r2, 0 bl sub_80A2A20 ldr r0, =0x085c86f4 - b _0814A91E + b @0814A91E .align 2, 0 .pool -_0814A914: +@0814A914: ldr r0, =0x085c87f4 - b _0814A91E + b @0814A91E .align 2, 0 .pool -_0814A91C: +@0814A91C: ldr r0, =0x085c88a4 -_0814A91E: +@0814A91E: ldr r1, [sp, 0xC] bl LZ77UnCompVram - b _0814A94C + b @0814A94C .align 2, 0 .pool -_0814A92C: +@0814A92C: movs r0, 0x20 str r0, [sp] str r0, [sp, 0x4] @@ -636666,14 +636666,14 @@ _0814A92C: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0814A956 -_0814A94C: + b @0814A956 +@0814A94C: movs r0, 0 strh r0, [r4, 0x14] ldrh r0, [r4, 0x12] adds r0, 0x1 strh r0, [r4, 0x12] -_0814A956: +@0814A956: movs r0, 0 add sp, 0x10 pop {r4-r6} @@ -636682,7 +636682,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} @@ -636756,7 +636756,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 @@ -636803,11 +636803,11 @@ sub_814AA04: @ 814AA04 strh r0, [r6, 0xC] lsls r0, 16 cmp r0, 0 - bge _0814AA70 + bge @0814AA70 ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] -_0814AA70: +@0814AA70: movs r0, 0 add sp, 0x24 pop {r4-r6} @@ -636818,7 +636818,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 @@ -636845,7 +636845,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} @@ -636857,7 +636857,7 @@ sub_814AAB8: @ 814AAB8 movs r6, 0 strh r0, [r7, 0xE] cmp r0, 0 - beq _0814AB2C + beq @0814AB2C ldr r0, =0x085c8928 mov r8, r0 movs r4, 0x4 @@ -636896,14 +636896,14 @@ sub_814AAB8: @ 814AAB8 movs r2, 0 movs r3, 0 bl bg_copy_tilemap_rect - b _0814AB78 + b @0814AB78 .align 2, 0 .pool -_0814AB2C: +@0814AB2C: movs r1, 0xC ldrsh r0, [r7, r1] cmp r0, 0 - ble _0814AB72 + ble @0814AB72 ldr r1, =0x085c9a30 subs r0, 0x1 adds r0, r1 @@ -636932,19 +636932,19 @@ _0814AB2C: movs r1, 0x1 adds r2, r4, 0 bl Bg_FillWramTileMapRectWithTileAndPalette -_0814AB72: +@0814AB72: ldrh r0, [r7, 0xC] adds r0, 0x1 strh r0, [r7, 0xC] -_0814AB78: +@0814AB78: movs r1, 0xC ldrsh r0, [r7, r1] cmp r0, 0x22 - ble _0814AB86 + ble @0814AB86 ldrh r0, [r7, 0x8] adds r0, 0x1 strh r0, [r7, 0x8] -_0814AB86: +@0814AB86: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0 @@ -636959,7 +636959,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 @@ -636991,7 +636991,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 @@ -637005,7 +637005,7 @@ sub_814ABE4: @ 814ABE4 eors r0, r1 strh r0, [r6, 0xC] cmp r0, 0 - bne _0814AC24 + bne @0814AC24 ldr r5, =0x02022e14 ldrh r1, [r5] movs r0, 0x12 @@ -637022,7 +637022,7 @@ sub_814ABE4: @ 814ABE4 ldrh r1, [r4] adds r0, r1 strh r0, [r4] -_0814AC24: +@0814AC24: pop {r4-r6} pop {r0} bx r0 @@ -637031,7 +637031,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 @@ -637079,19 +637079,19 @@ sub_814AC38: @ 814AC38 ands r1, r0 lsrs r1, 16 cmp r1, 0x1 - beq _0814ACE4 + beq @0814ACE4 cmp r1, 0x1 - bgt _0814ACC8 + bgt @0814ACC8 cmp r1, 0 - beq _0814ACCE - b _0814AD1C + beq @0814ACCE + b @0814AD1C .align 2, 0 .pool -_0814ACC8: +@0814ACC8: cmp r1, 0x2 - beq _0814AD00 - b _0814AD1C -_0814ACCE: + beq @0814AD00 + b @0814AD1C +@0814ACCE: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -637100,10 +637100,10 @@ _0814ACCE: movs r0, 0x1 strh r0, [r1, 0x8] strh r0, [r1, 0xA] - b _0814AD2E + b @0814AD2E .align 2, 0 .pool -_0814ACE4: +@0814ACE4: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -637113,10 +637113,10 @@ _0814ACE4: strh r1, [r0, 0x8] movs r1, 0x1 negs r1, r1 - b _0814AD2C + b @0814AD2C .align 2, 0 .pool -_0814AD00: +@0814AD00: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -637125,10 +637125,10 @@ _0814AD00: movs r1, 0x1 strh r1, [r0, 0x8] ldr r1, =0x0000ffff - b _0814AD2C + b @0814AD2C .align 2, 0 .pool -_0814AD1C: +@0814AD1C: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -637137,9 +637137,9 @@ _0814AD1C: ldr r1, =0x0000ffff strh r1, [r0, 0x8] movs r1, 0x1 -_0814AD2C: +@0814AD2C: strh r1, [r0, 0xA] -_0814AD2E: +@0814AD2E: ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] @@ -637153,7 +637153,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 @@ -637192,11 +637192,11 @@ sub_814AD48: @ 814AD48 lsls r0, 16 asrs r0, 16 cmp r0, 0x3F - ble _0814ADA0 + ble @0814ADA0 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_0814ADA0: +@0814ADA0: movs r0, 0 add sp, 0x24 pop {r4} @@ -637207,7 +637207,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 @@ -637228,7 +637228,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 @@ -637259,7 +637259,7 @@ sub_814ADD8: @ 814ADD8 lsls r0, 16 asrs r0, 16 cmp r0, 0x3F - ble _0814AE2E + ble @0814AE2E ldr r0, =sub_814ABE4 + 1 bl get_task_id_by_function lsls r0, 24 @@ -637268,7 +637268,7 @@ sub_814ADD8: @ 814ADD8 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_0814AE2E: +@0814AE2E: movs r0, 0 add sp, 0xC pop {r4} @@ -637279,7 +637279,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 @@ -637327,12 +637327,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] @@ -637346,7 +637346,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, =0x0832a328 @@ -637358,31 +637358,31 @@ bx_exec_buffer_A_ch0_tbl4: @ 814AECC ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _0814AF18 + beq @0814AF18 ldr r0, =0x02023064 lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] cmp r0, 0x38 - bhi _0814AF14 + bhi @0814AF14 ldr r0, =0x085c9a94 ldrb r1, [r1] lsls r1, 2 adds r1, r0 ldr r0, [r1] bl _call_via_r0 - b _0814AF18 + b @0814AF18 .align 2, 0 .pool -_0814AF14: +@0814AF14: bl dp01_tbl4_exec_completed -_0814AF18: +@0814AF18: pop {r0} bx r0 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 @@ -637398,9 +637398,9 @@ sub_814AF1C: @ 814AF1C ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _0814AF40 + bne @0814AF40 bl dp01_tbl4_exec_completed -_0814AF40: +@0814AF40: pop {r0} bx r0 .align 2, 0 @@ -637408,7 +637408,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 @@ -637425,7 +637425,7 @@ sub_814AF54: @ 814AF54 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _0814AFA4 + bne @0814AFA4 movs r0, 0 bl nullsub_25 ldrb r0, [r4] @@ -637445,7 +637445,7 @@ sub_814AF54: @ 814AF54 adds r0, r6 bl obj_delete_and_free_tiles bl dp01_tbl4_exec_completed -_0814AFA4: +@0814AFA4: pop {r4-r6} pop {r0} bx r0 @@ -637454,7 +637454,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] @@ -637471,7 +637471,7 @@ sub_814AFBC: @ 814AFBC lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _0814AFF4 + bne @0814AFF4 ldr r0, [r4] ldrb r1, [r3] ldr r2, [r0, 0x4] @@ -637482,7 +637482,7 @@ sub_814AFBC: @ 814AFBC movs r1, 0 strb r1, [r0, 0x9] bl dp01_tbl4_exec_completed -_0814AFF4: +@0814AFF4: pop {r4} pop {r0} bx r0 @@ -637491,24 +637491,24 @@ _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 lsls r0, 24 cmp r0, 0 - beq _0814B028 + beq @0814B028 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _0814B05C + beq @0814B05C ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _0814B05C -_0814B028: + beq @0814B05C +@0814B028: ldr r2, =0x02020630 ldr r1, =0x03005d70 ldr r0, =0x02024064 @@ -637523,11 +637523,11 @@ _0814B028: ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _0814B094 - b _0814B092 + bne @0814B094 + b @0814B092 .align 2, 0 .pool -_0814B05C: +@0814B05C: ldr r2, =0x02020630 ldr r5, =0x03005d70 ldr r0, =0x02024064 @@ -637543,7 +637543,7 @@ _0814B05C: ldr r2, [r0] ldr r0, =nullsub_12 + 1 cmp r2, r0 - bne _0814B094 + bne @0814B094 movs r0, 0x2 eors r3, r0 adds r0, r3, r5 @@ -637554,18 +637554,18 @@ _0814B05C: adds r0, r4 ldr r0, [r0] cmp r0, r2 - bne _0814B094 -_0814B092: + bne @0814B094 +@0814B092: movs r6, 0x1 -_0814B094: +@0814B094: bl sub_80A36C8 lsls r0, 24 cmp r0, 0 - beq _0814B0A0 + beq @0814B0A0 movs r6, 0 -_0814B0A0: +@0814B0A0: cmp r6, 0 - beq _0814B0C6 + beq @0814B0C6 ldr r0, =0x020244d0 ldr r0, [r0] ldr r3, =0x02024064 @@ -637583,7 +637583,7 @@ _0814B0A0: adds r0, r1 ldr r1, =sub_814AFBC + 1 str r1, [r0] -_0814B0C6: +@0814B0C6: pop {r4-r6} pop {r0} bx r0 @@ -637592,7 +637592,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 @@ -637613,9 +637613,9 @@ sub_814B0E8: @ 814B0E8 adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _0814B114 - b _0814B252 -_0814B114: + beq @0814B114 + b @0814B252 +@0814B114: movs r1, 0x2 mov r8, r1 adds r1, r2, 0 @@ -637631,9 +637631,9 @@ _0814B114: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - beq _0814B136 - b _0814B252 -_0814B136: + beq @0814B136 + b @0814B252 +@0814B136: ldr r1, =0x02020630 mov r10, r1 ldr r0, =0x03005d7c @@ -637649,7 +637649,7 @@ _0814B136: ldr r3, [r0] ldr r0, =nullsub_12 + 1 cmp r3, r0 - bne _0814B252 + bne @0814B252 ldr r0, =0x020241e4 adds r0, r2, r0 ldrb r1, [r0] @@ -637659,14 +637659,14 @@ _0814B136: adds r0, r5 ldr r0, [r0] cmp r0, r3 - bne _0814B252 + bne @0814B252 ldrb r0, [r4, 0x9] adds r0, 0x1 strb r0, [r4, 0x9] lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0814B252 + beq @0814B252 mov r1, r12 ldr r0, [r1] ldrb r1, [r7] @@ -637679,13 +637679,13 @@ _0814B136: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _0814B1F0 + beq @0814B1F0 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - bne _0814B1F0 + bne @0814B1F0 ldrb r0, [r7] mov r1, r8 eors r0, r1 @@ -637722,7 +637722,7 @@ _0814B136: adds r0, r4 ldrb r0, [r0] bl sub_80729D0 -_0814B1F0: +@0814B1F0: ldr r1, =0x03005d7c ldr r4, =0x02024064 ldrb r0, [r4] @@ -637768,7 +637768,7 @@ _0814B1F0: adds r0, r1 ldr r1, =sub_814B004 + 1 str r1, [r0] -_0814B252: +@0814B252: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -637781,7 +637781,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 @@ -637798,13 +637798,13 @@ sub_814B290: @ 814B290 ldrb r0, [r0] lsls r0, 27 cmp r0, 0 - bge _0814B2BE + bge @0814B2BE movs r2, 0x24 ldrsh r0, [r1, r2] cmp r0, 0 - bne _0814B2BE + bne @0814B2BE bl dp01_tbl4_exec_completed -_0814B2BE: +@0814B2BE: pop {r0} bx r0 .align 2, 0 @@ -637812,7 +637812,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] @@ -637834,16 +637834,16 @@ bx_t4_healthbar_update: @ 814B2D0 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _0814B318 + beq @0814B318 ldrb r0, [r5] adds r0, r6 ldrb r0, [r0] movs r2, 0 bl heathbar_draw_hp - b _0814B332 + b @0814B332 .align 2, 0 .pool -_0814B318: +@0814B318: ldr r2, =0x0202406e ldrb r1, [r5] lsls r0, r1, 1 @@ -637855,7 +637855,7 @@ _0814B318: adds r0, r2 bl sub_805E990 bl dp01_tbl4_exec_completed -_0814B332: +@0814B332: pop {r4-r6} pop {r0} bx r0 @@ -637864,7 +637864,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 @@ -637882,7 +637882,7 @@ sub_814B340: @ 814B340 ldrsh r0, [r0, r3] adds r1, r0 cmp r1, 0xA0 - ble _0814B3BC + ble @0814B3BC ldr r1, =0x0202406e lsls r0, r2, 1 adds r0, r1 @@ -637921,7 +637921,7 @@ sub_814B340: @ 814B340 ldrb r0, [r0] bl sub_8072984 bl dp01_tbl4_exec_completed -_0814B3BC: +@0814B3BC: pop {r4-r6} pop {r0} bx r0 @@ -637930,7 +637930,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] @@ -637945,7 +637945,7 @@ sub_814B3DC: @ 814B3DC movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _0814B430 + bne @0814B430 ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] @@ -637969,7 +637969,7 @@ sub_814B3DC: @ 814B3DC ldrb r0, [r0] bl sub_8072984 bl dp01_tbl4_exec_completed -_0814B430: +@0814B430: pop {r4-r6} pop {r0} bx r0 @@ -637978,21 +637978,21 @@ _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 a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _0814B45E + bne @0814B45E bl dp01_tbl4_exec_completed -_0814B45E: +@0814B45E: pop {r0} bx r0 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 @@ -638007,7 +638007,7 @@ dp01t_0F_4_move_anim: @ 814B464 movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0x20 - bne _0814B4B0 + bne @0814B4B0 movs r3, 0 movs r0, 0 strh r0, [r4, 0x30] @@ -638020,15 +638020,15 @@ dp01t_0F_4_move_anim: @ 814B464 ldr r0, =0x020244b9 strb r3, [r0] bl dp01_tbl4_exec_completed - b _0814B4DA + b @0814B4DA .align 2, 0 .pool -_0814B4B0: +@0814B4B0: ldrh r0, [r4, 0x30] movs r1, 0x3 ands r0, r1 cmp r0, 0 - bne _0814B4D4 + bne @0814B4D4 adds r3, r4, 0 adds r3, 0x3E ldrb r2, [r3] @@ -638042,18 +638042,18 @@ _0814B4B0: ands r0, r2 orrs r0, r1 strb r0, [r3] -_0814B4D4: +@0814B4D4: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] -_0814B4DA: +@0814B4DA: pop {r4} pop {r0} bx r0 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 @@ -638069,7 +638069,7 @@ sub_814B4E0: @ 814B4E0 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _0814B532 + bne @0814B532 adds r0, r3, 0 bl sub_805E408 ldr r0, =0x020244d0 @@ -638082,19 +638082,19 @@ sub_814B4E0: @ 814B4E0 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0814B526 + beq @0814B526 adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x6 bl move_anim_start_t4 -_0814B526: +@0814B526: ldr r0, =0x03005d60 ldrb r1, [r4] lsls r1, 2 adds r1, r0 ldr r0, =sub_814B554 + 1 str r0, [r1] -_0814B532: +@0814B532: pop {r4} pop {r0} bx r0 @@ -638103,7 +638103,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] @@ -638118,7 +638118,7 @@ sub_814B554: @ 814B554 movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _0814B590 + bne @0814B590 ldr r2, =0x02020630 ldr r0, =0x020241e4 adds r0, r3, r0 @@ -638131,9 +638131,9 @@ sub_814B554: @ 814B554 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _0814B590 + bne @0814B590 bl dp01_tbl4_exec_completed -_0814B590: +@0814B590: pop {r0} bx r0 .align 2, 0 @@ -638141,7 +638141,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} @@ -638158,7 +638158,7 @@ sub_814B5A8: @ 814B5A8 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0814B664 + beq @0814B664 ldrb r1, [r2] movs r0, 0x7F ands r0, r1 @@ -638228,7 +638228,7 @@ sub_814B5A8: @ 814B5A8 adds r0, r1 ldr r1, =sub_814B4E0 + 1 str r1, [r0] -_0814B664: +@0814B664: pop {r3} mov r8, r3 pop {r4-r7} @@ -638239,7 +638239,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] @@ -638254,7 +638254,7 @@ sub_814B69C: @ 814B69C movs r0, 0x88 ands r0, r1 cmp r0, 0 - bne _0814B6CE + bne @0814B6CE ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] @@ -638264,7 +638264,7 @@ sub_814B69C: @ 814B69C adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 -_0814B6CE: +@0814B6CE: ldr r5, =0x02020630 ldr r0, =0x03005d7c ldrb r2, [r4] @@ -638279,7 +638279,7 @@ _0814B6CE: ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _0814B714 + bne @0814B714 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -638290,7 +638290,7 @@ _0814B6CE: movs r0, 0x8 ands r0, r1 cmp r0, 0 - bne _0814B714 + bne @0814B714 adds r0, r3, r5 bl obj_delete_and_free_tiles ldr r1, =0x03005d60 @@ -638299,7 +638299,7 @@ _0814B6CE: adds r0, r1 ldr r1, =sub_814B5A8 + 1 str r1, [r0] -_0814B714: +@0814B714: pop {r4-r6} pop {r0} bx r0 @@ -638308,7 +638308,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 @@ -638323,7 +638323,7 @@ dp01_tbl4_exec_completed: @ 814B740 movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _0814B794 + beq @0814B794 bl link_get_multiplayer_id mov r1, sp strb r0, [r1] @@ -638337,10 +638337,10 @@ dp01_tbl4_exec_completed: @ 814B740 adds r0, r1 movs r1, 0x38 strb r1, [r0] - b _0814B7A6 + b @0814B7A6 .align 2, 0 .pool -_0814B794: +@0814B794: ldr r2, =0x02024068 ldr r1, =0x0832a328 ldrb r0, [r4] @@ -638350,7 +638350,7 @@ _0814B794: ldr r0, [r2] bics r0, r1 str r0, [r2] -_0814B7A6: +@0814B7A6: add sp, 0x4 pop {r4} pop {r0} @@ -638360,7 +638360,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] @@ -638375,9 +638375,9 @@ sub_814B7B8: @ 814B7B8 movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _0814B7DA + bne @0814B7DA bl dp01_tbl4_exec_completed -_0814B7DA: +@0814B7DA: pop {r0} bx r0 .align 2, 0 @@ -638385,7 +638385,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] @@ -638400,9 +638400,9 @@ sub_814B7E8: @ 814B7E8 movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _0814B80A + bne @0814B80A bl dp01_tbl4_exec_completed -_0814B80A: +@0814B80A: pop {r0} bx r0 .align 2, 0 @@ -638410,7 +638410,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 @@ -638422,7 +638422,7 @@ dp01t_00_4_getattr: @ 814B818 adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0 - bne _0814B850 + bne @0814B850 ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 @@ -638430,29 +638430,29 @@ dp01t_00_4_getattr: @ 814B818 mov r1, sp bl dp01_getattr_by_ch1_for_player_pokemon__ adds r6, r0, 0 - b _0814B872 + b @0814B872 .align 2, 0 .pool -_0814B850: +@0814B850: ldrb r4, [r1] movs r5, 0 -_0814B854: +@0814B854: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _0814B86A + beq @0814B86A lsls r0, r5, 24 lsrs r0, 24 mov r2, sp adds r1, r2, r6 bl dp01_getattr_by_ch1_for_player_pokemon__ adds r6, r0 -_0814B86A: +@0814B86A: lsrs r4, 1 adds r5, 0x1 cmp r5, 0x5 - ble _0814B854 -_0814B872: + ble @0814B854 +@0814B872: lsls r1, r6, 16 lsrs r1, 16 movs r0, 0x1 @@ -638466,7 +638466,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 @@ -638485,79 +638485,79 @@ dp01_getattr_by_ch1_for_player_pokemon__: @ 814B88C adds r0, r1 ldrb r0, [r0] cmp r0, 0x3B - bls _0814B8B6 - bl _0814C022 -_0814B8B6: + bls @0814B8B6 + bl @0814C022 +@0814B8B6: lsls r0, 2 - ldr r1, =_0814B8CC + ldr r1, =@0814B8CC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0814B8CC: - .4byte _0814B9BC - .4byte _0814BBE0 - .4byte _0814BBF0 - .4byte _0814BC00 - .4byte _0814BC68 - .4byte _0814BC68 - .4byte _0814BC68 - .4byte _0814BC68 - .4byte _0814BC84 - .4byte _0814BCC0 - .4byte _0814BCC0 - .4byte _0814BCC0 - .4byte _0814BCC0 - .4byte _0814C022 - .4byte _0814C022 - .4byte _0814C022 - .4byte _0814C022 - .4byte _0814BCDC - .4byte _0814BCEC - .4byte _0814BD1C - .4byte _0814BD2C - .4byte _0814BD3C - .4byte _0814BD4C - .4byte _0814BD5C - .4byte _0814BD6C - .4byte _0814BD7C - .4byte _0814BD8C - .4byte _0814BD9C - .4byte _0814BDAC - .4byte _0814BDBC - .4byte _0814BDCC - .4byte _0814BDDC - .4byte _0814BE2C - .4byte _0814BE3C - .4byte _0814BE4C - .4byte _0814BE5C - .4byte _0814BE6C - .4byte _0814BE7C - .4byte _0814BE8C - .4byte _0814BE9C - .4byte _0814BEAC - .4byte _0814BEE0 - .4byte _0814BEF0 - .4byte _0814BF00 - .4byte _0814BF10 - .4byte _0814BF20 - .4byte _0814BF30 - .4byte _0814BF40 - .4byte _0814BF50 - .4byte _0814BF70 - .4byte _0814BF80 - .4byte _0814BF90 - .4byte _0814BFA0 - .4byte _0814BFB0 - .4byte _0814BFC0 - .4byte _0814BFD0 - .4byte _0814BFE0 - .4byte _0814BFF0 - .4byte _0814C000 - .4byte _0814C010 -_0814B9BC: +@0814B8CC: + .4byte @0814B9BC + .4byte @0814BBE0 + .4byte @0814BBF0 + .4byte @0814BC00 + .4byte @0814BC68 + .4byte @0814BC68 + .4byte @0814BC68 + .4byte @0814BC68 + .4byte @0814BC84 + .4byte @0814BCC0 + .4byte @0814BCC0 + .4byte @0814BCC0 + .4byte @0814BCC0 + .4byte @0814C022 + .4byte @0814C022 + .4byte @0814C022 + .4byte @0814C022 + .4byte @0814BCDC + .4byte @0814BCEC + .4byte @0814BD1C + .4byte @0814BD2C + .4byte @0814BD3C + .4byte @0814BD4C + .4byte @0814BD5C + .4byte @0814BD6C + .4byte @0814BD7C + .4byte @0814BD8C + .4byte @0814BD9C + .4byte @0814BDAC + .4byte @0814BDBC + .4byte @0814BDCC + .4byte @0814BDDC + .4byte @0814BE2C + .4byte @0814BE3C + .4byte @0814BE4C + .4byte @0814BE5C + .4byte @0814BE6C + .4byte @0814BE7C + .4byte @0814BE8C + .4byte @0814BE9C + .4byte @0814BEAC + .4byte @0814BEE0 + .4byte @0814BEF0 + .4byte @0814BF00 + .4byte @0814BF10 + .4byte @0814BF20 + .4byte @0814BF30 + .4byte @0814BF40 + .4byte @0814BF50 + .4byte @0814BF70 + .4byte @0814BF80 + .4byte @0814BF90 + .4byte @0814BFA0 + .4byte @0814BFB0 + .4byte @0814BFC0 + .4byte @0814BFD0 + .4byte @0814BFE0 + .4byte @0814BFF0 + .4byte @0814C000 + .4byte @0814C010 +@0814B9BC: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -638594,7 +638594,7 @@ _0814B9BC: str r0, [sp, 0x88] mov r8, r4 add r4, sp, 0xC -_0814BA08: +@0814BA08: adds r1, r6, 0 adds r1, 0xD mov r0, r8 @@ -638610,7 +638610,7 @@ _0814BA08: adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble _0814BA08 + ble @0814BA08 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -638788,36 +638788,36 @@ _0814BA08: bl pokemon_getattr mov r2, sp movs r6, 0 -_0814BBC0: +@0814BBC0: adds r0, r7, r6 adds r1, r2, r6 ldrb r1, [r1] strb r1, [r0] adds r6, 0x1 cmp r6, 0x57 - bls _0814BBC0 - b _0814C022 + bls @0814BBC0 + b @0814C022 .align 2, 0 .pool -_0814BBE0: +@0814BBE0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB - b _0814BF5A + b @0814BF5A .align 2, 0 .pool -_0814BBF0: +@0814BBF0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC - b _0814BF5A + b @0814BF5A .align 2, 0 .pool -_0814BC00: +@0814BC00: movs r6, 0 add r2, sp, 0x58 mov r9, r2 @@ -638829,7 +638829,7 @@ _0814BC00: ldr r0, =0x020244ec adds r4, r1, r0 mov r8, r9 -_0814BC16: +@0814BC16: adds r1, r6, 0 adds r1, 0xD adds r0, r4, 0 @@ -638847,7 +638847,7 @@ _0814BC16: add r8, r0 adds r6, 0x1 cmp r6, 0x3 - ble _0814BC16 + ble @0814BC16 movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -638858,18 +638858,18 @@ _0814BC16: strb r0, [r1, 0xC] mov r2, r9 movs r6, 0 -_0814BC54: +@0814BC54: adds r0, r7, r6 adds r1, r2, r6 ldrb r1, [r1] strb r1, [r0] adds r6, 0x1 cmp r6, 0xF - bls _0814BC54 - b _0814C022 + bls @0814BC54 + b @0814C022 .align 2, 0 .pool -_0814BC68: +@0814BC68: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -638880,17 +638880,17 @@ _0814BC68: adds r1, r2 ldrb r1, [r1] adds r1, 0x9 - b _0814BF5A + b @0814BF5A .align 2, 0 .pool -_0814BC84: +@0814BC84: movs r6, 0 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 ldr r2, =0x020244ec mov r8, r2 -_0814BC90: +@0814BC90: adds r1, r6, 0 adds r1, 0x11 mov r2, r8 @@ -638900,7 +638900,7 @@ _0814BC90: strb r0, [r1] adds r6, 0x1 cmp r6, 0x3 - ble _0814BC90 + ble @0814BC90 movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -638910,10 +638910,10 @@ _0814BC90: adds r1, r7, r6 strb r0, [r1] adds r6, 0x1 - b _0814C022 + b @0814C022 .align 2, 0 .pool -_0814BCC0: +@0814BCC0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -638924,25 +638924,25 @@ _0814BCC0: adds r1, r2 ldrb r1, [r1] adds r1, 0x8 - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BCDC: +@0814BCDC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1 - b _0814BCF6 + b @0814BCF6 .align 2, 0 .pool -_0814BCEC: +@0814BCEC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x19 -_0814BCF6: +@0814BCF6: bl pokemon_getattr adds r1, r0, 0 strb r1, [r7] @@ -638957,118 +638957,118 @@ _0814BCF6: lsrs r0, 16 strb r0, [r7, 0x2] movs r6, 0x3 - b _0814C022 + b @0814C022 .align 2, 0 .pool -_0814BD1C: +@0814BD1C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1A - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BD2C: +@0814BD2C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1B - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BD3C: +@0814BD3C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1C - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BD4C: +@0814BD4C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1D - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BD5C: +@0814BD5C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1E - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BD6C: +@0814BD6C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1F - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BD7C: +@0814BD7C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x20 - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BD8C: +@0814BD8C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x22 - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BD9C: +@0814BD9C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x23 - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BDAC: +@0814BDAC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x24 - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BDBC: +@0814BDBC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x25 - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BDCC: +@0814BDCC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x26 - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BDDC: +@0814BDDC: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -639099,88 +639099,88 @@ _0814BDDC: bl pokemon_getattr strb r0, [r7, 0x5] movs r6, 0x6 - b _0814C022 + b @0814C022 .align 2, 0 .pool -_0814BE2C: +@0814BE2C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x27 - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BE3C: +@0814BE3C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x28 - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BE4C: +@0814BE4C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x29 - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BE5C: +@0814BE5C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2A - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BE6C: +@0814BE6C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2B - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BE7C: +@0814BE7C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2C - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BE8C: +@0814BE8C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0 - b _0814BEB6 + b @0814BEB6 .align 2, 0 .pool -_0814BE9C: +@0814BE9C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x9 - b _0814BF5A + b @0814BF5A .align 2, 0 .pool -_0814BEAC: +@0814BEAC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x37 -_0814BEB6: +@0814BEB6: bl pokemon_getattr adds r1, r0, 0 strb r1, [r7] @@ -639197,79 +639197,79 @@ _0814BEB6: lsrs r0, r1, 24 strb r0, [r7, 0x3] movs r6, 0x4 - b _0814C022 + b @0814C022 .align 2, 0 .pool -_0814BEE0: +@0814BEE0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x38 - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BEF0: +@0814BEF0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x39 - b _0814BF5A + b @0814BF5A .align 2, 0 .pool -_0814BF00: +@0814BF00: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3A - b _0814BF5A + b @0814BF5A .align 2, 0 .pool -_0814BF10: +@0814BF10: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3B - b _0814BF5A + b @0814BF5A .align 2, 0 .pool -_0814BF20: +@0814BF20: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3C - b _0814BF5A + b @0814BF5A .align 2, 0 .pool -_0814BF30: +@0814BF30: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3D - b _0814BF5A + b @0814BF5A .align 2, 0 .pool -_0814BF40: +@0814BF40: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3E - b _0814BF5A + b @0814BF5A .align 2, 0 .pool -_0814BF50: +@0814BF50: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3F -_0814BF5A: +@0814BF5A: bl pokemon_getattr lsls r0, 16 lsrs r0, 16 @@ -639277,110 +639277,110 @@ _0814BF5A: lsrs r0, 8 strb r0, [r7, 0x1] movs r6, 0x2 - b _0814C022 + b @0814C022 .align 2, 0 .pool -_0814BF70: +@0814BF70: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x16 - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BF80: +@0814BF80: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x17 - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BF90: +@0814BF90: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x18 - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BFA0: +@0814BFA0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x21 - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BFB0: +@0814BFB0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2F - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BFC0: +@0814BFC0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x30 - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BFD0: +@0814BFD0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x32 - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BFE0: +@0814BFE0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x33 - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814BFF0: +@0814BFF0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x34 - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814C000: +@0814C000: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x35 - b _0814C01A + b @0814C01A .align 2, 0 .pool -_0814C010: +@0814C010: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x36 -_0814C01A: +@0814C01A: bl pokemon_getattr strb r0, [r7] movs r6, 0x1 -_0814C022: +@0814C022: adds r0, r6, 0 add sp, 0x90 pop {r3-r5} @@ -639395,7 +639395,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} @@ -639403,7 +639403,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 @@ -639413,33 +639413,33 @@ sub_814C044: @ 814C044 adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0 - bne _0814C074 + bne @0814C074 ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] bl sub_814C09C - b _0814C092 + b @0814C092 .align 2, 0 .pool -_0814C074: +@0814C074: ldrb r4, [r1] movs r5, 0 -_0814C078: +@0814C078: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _0814C086 + beq @0814C086 adds r0, r5, 0 bl sub_814C09C -_0814C086: +@0814C086: lsrs r4, 1 adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls _0814C078 -_0814C092: + bls @0814C078 +@0814C092: bl dp01_tbl4_exec_completed pop {r4,r5} pop {r0} @@ -639447,7 +639447,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 @@ -639467,79 +639467,79 @@ sub_814C09C: @ 814C09C ldrb r0, [r0] adds r7, r2, 0 cmp r0, 0x3B - bls _0814C0C8 - bl _0814CA62 -_0814C0C8: + bls @0814C0C8 + bl @0814CA62 +@0814C0C8: lsls r0, 2 - ldr r1, =_0814C0E0 + ldr r1, =@0814C0E0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0814C0E0: - .4byte _0814C1D0 - .4byte _0814C368 - .4byte _0814C388 - .4byte _0814C3A8 - .4byte _0814C400 - .4byte _0814C400 - .4byte _0814C400 - .4byte _0814C400 - .4byte _0814C428 - .4byte _0814C48C - .4byte _0814C48C - .4byte _0814C48C - .4byte _0814C48C - .4byte _0814CA62 - .4byte _0814CA62 - .4byte _0814CA62 - .4byte _0814CA62 - .4byte _0814C4BC - .4byte _0814C4DC - .4byte _0814C4FC - .4byte _0814C51C - .4byte _0814C53C - .4byte _0814C55C - .4byte _0814C57C - .4byte _0814C59C - .4byte _0814C5BC - .4byte _0814C5DC - .4byte _0814C5FC - .4byte _0814C61C - .4byte _0814C63C - .4byte _0814C65C - .4byte _0814C67C - .4byte _0814C6EC - .4byte _0814C70C - .4byte _0814C72C - .4byte _0814C74C - .4byte _0814C76C - .4byte _0814C78C - .4byte _0814C7AC - .4byte _0814C7CC - .4byte _0814C7EC - .4byte _0814C80C - .4byte _0814C82C - .4byte _0814C84C - .4byte _0814C86C - .4byte _0814C88C - .4byte _0814C8AC - .4byte _0814C8CC - .4byte _0814C8EC - .4byte _0814C90C - .4byte _0814C92C - .4byte _0814C94C - .4byte _0814C96C - .4byte _0814C98C - .4byte _0814C9AC - .4byte _0814C9CC - .4byte _0814C9EC - .4byte _0814CA0C - .4byte _0814CA2C - .4byte _0814CA4C -_0814C1D0: +@0814C0E0: + .4byte @0814C1D0 + .4byte @0814C368 + .4byte @0814C388 + .4byte @0814C3A8 + .4byte @0814C400 + .4byte @0814C400 + .4byte @0814C400 + .4byte @0814C400 + .4byte @0814C428 + .4byte @0814C48C + .4byte @0814C48C + .4byte @0814C48C + .4byte @0814C48C + .4byte @0814CA62 + .4byte @0814CA62 + .4byte @0814CA62 + .4byte @0814CA62 + .4byte @0814C4BC + .4byte @0814C4DC + .4byte @0814C4FC + .4byte @0814C51C + .4byte @0814C53C + .4byte @0814C55C + .4byte @0814C57C + .4byte @0814C59C + .4byte @0814C5BC + .4byte @0814C5DC + .4byte @0814C5FC + .4byte @0814C61C + .4byte @0814C63C + .4byte @0814C65C + .4byte @0814C67C + .4byte @0814C6EC + .4byte @0814C70C + .4byte @0814C72C + .4byte @0814C74C + .4byte @0814C76C + .4byte @0814C78C + .4byte @0814C7AC + .4byte @0814C7CC + .4byte @0814C7EC + .4byte @0814C80C + .4byte @0814C82C + .4byte @0814C84C + .4byte @0814C86C + .4byte @0814C88C + .4byte @0814C8AC + .4byte @0814C8CC + .4byte @0814C8EC + .4byte @0814C90C + .4byte @0814C92C + .4byte @0814C94C + .4byte @0814C96C + .4byte @0814C98C + .4byte @0814C9AC + .4byte @0814C9CC + .4byte @0814C9EC + .4byte @0814CA0C + .4byte @0814CA2C + .4byte @0814CA4C +@0814C1D0: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -639589,7 +639589,7 @@ _0814C1D0: adds r7, 0x24 adds r4, r6, 0 adds r4, 0xC -_0814C236: +@0814C236: mov r1, r8 adds r1, 0xD mov r0, r9 @@ -639606,7 +639606,7 @@ _0814C236: add r8, r0 mov r0, r8 cmp r0, 0x3 - ble _0814C236 + ble @0814C236 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -639718,10 +639718,10 @@ _0814C236: movs r1, 0x3F ldr r2, [sp, 0x14] bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C368: +@0814C368: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -639732,10 +639732,10 @@ _0814C368: adds r2, r7 movs r1, 0xB bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C388: +@0814C388: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -639746,10 +639746,10 @@ _0814C388: adds r2, r7 movs r1, 0xC bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C3A8: +@0814C3A8: movs r0, 0 mov r8, r0 movs r0, 0xC @@ -639763,7 +639763,7 @@ _0814C3A8: adds r6, r3, 0 adds r6, 0x8 adds r4, r3, 0 -_0814C3C2: +@0814C3C2: mov r1, r8 adds r1, 0xD adds r0, r7, 0 @@ -639780,7 +639780,7 @@ _0814C3C2: add r8, r0 mov r0, r8 cmp r0, 0x3 - ble _0814C3C2 + ble @0814C3C2 movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -639788,10 +639788,10 @@ _0814C3C2: movs r1, 0x15 mov r2, r9 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C400: +@0814C400: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -639804,10 +639804,10 @@ _0814C400: adds r1, r2, r1 ldrb r1, [r1] adds r1, 0x9 - b _0814C4A4 + b @0814C4A4 .align 2, 0 .pool -_0814C428: +@0814C428: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -639848,10 +639848,10 @@ _0814C428: adds r0, r4, 0 movs r1, 0x15 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C48C: +@0814C48C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -639864,14 +639864,14 @@ _0814C48C: adds r1, r2, r1 ldrb r1, [r1] adds r1, 0x8 -_0814C4A4: +@0814C4A4: adds r3, 0x3 adds r2, r3 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C4BC: +@0814C4BC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -639882,10 +639882,10 @@ _0814C4BC: adds r2, r7 movs r1, 0x1 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C4DC: +@0814C4DC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -639896,10 +639896,10 @@ _0814C4DC: adds r2, r7 movs r1, 0x19 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C4FC: +@0814C4FC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -639910,10 +639910,10 @@ _0814C4FC: adds r2, r7 movs r1, 0x1A bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C51C: +@0814C51C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -639924,10 +639924,10 @@ _0814C51C: adds r2, r7 movs r1, 0x1B bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C53C: +@0814C53C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -639938,10 +639938,10 @@ _0814C53C: adds r2, r7 movs r1, 0x1C bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C55C: +@0814C55C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -639952,10 +639952,10 @@ _0814C55C: adds r2, r7 movs r1, 0x1D bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C57C: +@0814C57C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -639966,10 +639966,10 @@ _0814C57C: adds r2, r7 movs r1, 0x1E bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C59C: +@0814C59C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -639980,10 +639980,10 @@ _0814C59C: adds r2, r7 movs r1, 0x1F bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C5BC: +@0814C5BC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -639994,10 +639994,10 @@ _0814C5BC: adds r2, r7 movs r1, 0x20 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C5DC: +@0814C5DC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640008,10 +640008,10 @@ _0814C5DC: adds r2, r7 movs r1, 0x22 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C5FC: +@0814C5FC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640022,10 +640022,10 @@ _0814C5FC: adds r2, r7 movs r1, 0x23 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C61C: +@0814C61C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640036,10 +640036,10 @@ _0814C61C: adds r2, r7 movs r1, 0x24 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C63C: +@0814C63C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640050,10 +640050,10 @@ _0814C63C: adds r2, r7 movs r1, 0x25 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C65C: +@0814C65C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640064,10 +640064,10 @@ _0814C65C: adds r2, r7 movs r1, 0x26 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C67C: +@0814C67C: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -640113,10 +640113,10 @@ _0814C67C: adds r0, r7, 0x5 adds r2, r0 adds r0, r4, 0 - b _0814C79C + b @0814C79C .align 2, 0 .pool -_0814C6EC: +@0814C6EC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640127,10 +640127,10 @@ _0814C6EC: adds r2, r7 movs r1, 0x27 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C70C: +@0814C70C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640141,10 +640141,10 @@ _0814C70C: adds r2, r7 movs r1, 0x28 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C72C: +@0814C72C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640155,10 +640155,10 @@ _0814C72C: adds r2, r7 movs r1, 0x29 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C74C: +@0814C74C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640169,10 +640169,10 @@ _0814C74C: adds r2, r7 movs r1, 0x2A bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C76C: +@0814C76C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640183,10 +640183,10 @@ _0814C76C: adds r2, r7 movs r1, 0x2B bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C78C: +@0814C78C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640195,13 +640195,13 @@ _0814C78C: ldrb r2, [r1] lsls r2, 9 adds r2, r7 -_0814C79C: +@0814C79C: movs r1, 0x2C bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C7AC: +@0814C7AC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640212,10 +640212,10 @@ _0814C7AC: adds r2, r7 movs r1, 0 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C7CC: +@0814C7CC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640226,10 +640226,10 @@ _0814C7CC: adds r2, r7 movs r1, 0x9 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C7EC: +@0814C7EC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640240,10 +640240,10 @@ _0814C7EC: adds r2, r7 movs r1, 0x37 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C80C: +@0814C80C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640254,10 +640254,10 @@ _0814C80C: adds r2, r7 movs r1, 0x38 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C82C: +@0814C82C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640268,10 +640268,10 @@ _0814C82C: adds r2, r7 movs r1, 0x39 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C84C: +@0814C84C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640282,10 +640282,10 @@ _0814C84C: adds r2, r7 movs r1, 0x3A bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C86C: +@0814C86C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640296,10 +640296,10 @@ _0814C86C: adds r2, r7 movs r1, 0x3B bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C88C: +@0814C88C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640310,10 +640310,10 @@ _0814C88C: adds r2, r7 movs r1, 0x3C bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C8AC: +@0814C8AC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640324,10 +640324,10 @@ _0814C8AC: adds r2, r7 movs r1, 0x3D bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C8CC: +@0814C8CC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640338,10 +640338,10 @@ _0814C8CC: adds r2, r7 movs r1, 0x3E bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C8EC: +@0814C8EC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640352,10 +640352,10 @@ _0814C8EC: adds r2, r7 movs r1, 0x3F bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C90C: +@0814C90C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640366,10 +640366,10 @@ _0814C90C: adds r2, r7 movs r1, 0x16 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C92C: +@0814C92C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640380,10 +640380,10 @@ _0814C92C: adds r2, r7 movs r1, 0x17 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C94C: +@0814C94C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640394,10 +640394,10 @@ _0814C94C: adds r2, r7 movs r1, 0x18 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C96C: +@0814C96C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640408,10 +640408,10 @@ _0814C96C: adds r2, r7 movs r1, 0x21 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C98C: +@0814C98C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640422,10 +640422,10 @@ _0814C98C: adds r2, r7 movs r1, 0x2F bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C9AC: +@0814C9AC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640436,10 +640436,10 @@ _0814C9AC: adds r2, r7 movs r1, 0x30 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C9CC: +@0814C9CC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640450,10 +640450,10 @@ _0814C9CC: adds r2, r7 movs r1, 0x32 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814C9EC: +@0814C9EC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640464,10 +640464,10 @@ _0814C9EC: adds r2, r7 movs r1, 0x33 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814CA0C: +@0814CA0C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640478,10 +640478,10 @@ _0814CA0C: adds r2, r7 movs r1, 0x34 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814CA2C: +@0814CA2C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640492,10 +640492,10 @@ _0814CA2C: adds r2, r7 movs r1, 0x35 bl pokemon_setattr - b _0814CA62 + b @0814CA62 .align 2, 0 .pool -_0814CA4C: +@0814CA4C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -640506,7 +640506,7 @@ _0814CA4C: adds r2, r7 movs r1, 0x36 bl pokemon_setattr -_0814CA62: +@0814CA62: ldr r2, =0x0202406e ldr r0, =0x02024064 ldrb r1, [r0] @@ -640531,7 +640531,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 @@ -640555,11 +640555,11 @@ sub_814CA98: @ 814CA98 adds r2, r0 ldrb r2, [r2] cmp r3, r2 - bcs _0814CAF0 + bcs @0814CAF0 adds r6, r4, 0 adds r2, r7, 0 adds r4, r0, 0 -_0814CACE: +@0814CACE: adds r1, r5, r3 ldrb r0, [r2] lsls r0, 9 @@ -640576,8 +640576,8 @@ _0814CACE: adds r0, r4 ldrb r0, [r0] cmp r3, r0 - bcc _0814CACE -_0814CAF0: + bcc @0814CACE +@0814CAF0: bl dp01_tbl4_exec_completed pop {r4-r7} pop {r0} @@ -640587,7 +640587,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} @@ -640705,7 +640705,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] @@ -640752,7 +640752,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 @@ -640916,7 +640916,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 @@ -640926,7 +640926,7 @@ sub_814CE14: @ 814CE14 adds r0, r1 ldrb r3, [r0] cmp r3, 0 - bne _0814CE5C + bne @0814CE5C ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -640941,10 +640941,10 @@ sub_814CE14: @ 814CE14 adds r0, r1 ldr r1, =sub_814CEA4 + 1 str r1, [r0] - b _0814CE92 + b @0814CE92 .align 2, 0 .pool -_0814CE5C: +@0814CE5C: ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] @@ -640968,7 +640968,7 @@ _0814CE5C: ldrb r0, [r0] bl sub_8072984 bl dp01_tbl4_exec_completed -_0814CE92: +@0814CE92: pop {r4-r6} pop {r0} bx r0 @@ -640977,7 +640977,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] @@ -640990,13 +640990,13 @@ sub_814CEA4: @ 814CEA4 adds r3, r0, r1 ldrb r0, [r3, 0x4] cmp r0, 0 - beq _0814CECC + beq @0814CECC cmp r0, 0x1 - beq _0814CEFA - b _0814CF22 + beq @0814CEFA + b @0814CF22 .align 2, 0 .pool -_0814CECC: +@0814CECC: ldr r1, [r4] lsls r0, r2, 2 adds r0, r1 @@ -641004,12 +641004,12 @@ _0814CECC: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0814CEE6 + beq @0814CEE6 adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -_0814CEE6: +@0814CEE6: ldr r0, [r6] ldrb r1, [r5] ldr r2, [r0, 0x4] @@ -641019,15 +641019,15 @@ _0814CEE6: adds r0, r2 movs r1, 0x1 strb r1, [r0, 0x4] - b _0814CF22 -_0814CEFA: + b @0814CF22 +@0814CEFA: ldrb r1, [r3] movs r0, 0x40 ands r0, r1 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _0814CF22 + bne @0814CF22 strb r0, [r3, 0x4] ldrb r2, [r5] adds r0, r2, 0 @@ -641040,7 +641040,7 @@ _0814CEFA: adds r0, r1 ldr r1, =sub_814B3DC + 1 str r1, [r0] -_0814CF22: +@0814CF22: pop {r4-r6} pop {r0} bx r0 @@ -641049,7 +641049,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} @@ -641058,7 +641058,7 @@ sub_814CF30: @ 814CF30 movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _0814CF60 + beq @0814CF60 ldr r0, =0x02024064 ldrb r0, [r0] bl battle_get_per_side_status @@ -641066,14 +641066,14 @@ sub_814CF30: @ 814CF30 ands r1, r0 movs r7, 0x20 cmp r1, 0 - beq _0814CF62 + beq @0814CF62 movs r7, 0x5A - b _0814CF62 + b @0814CF62 .align 2, 0 .pool -_0814CF60: +@0814CF60: movs r7, 0x50 -_0814CF62: +@0814CF62: ldr r5, =0x02024064 ldrb r0, [r5] bl sub_806D864 @@ -641085,7 +641085,7 @@ _0814CF62: movs r4, 0xFF ldrb r0, [r1] cmp r0, 0x4 - beq _0814CF94 + beq @0814CF94 ldrb r0, [r5] bl sub_806D864 lsls r1, r0, 3 @@ -641096,8 +641096,8 @@ _0814CF62: adds r0, r4, 0 ands r0, r1 cmp r0, 0x5 - bne _0814CFB0 -_0814CF94: + bne @0814CFB0 +@0814CF94: ldrb r0, [r5] bl sub_806D864 lsls r1, r0, 3 @@ -641106,10 +641106,10 @@ _0814CF94: adds r1, r6 ldrb r0, [r1, 0x13] adds r4, r0, 0x2 - b _0814D002 + b @0814D002 .align 2, 0 .pool -_0814CFB0: +@0814CFB0: ldrb r0, [r5] bl sub_806D864 lsls r1, r0, 3 @@ -641120,7 +641120,7 @@ _0814CFB0: adds r0, r4, 0 ands r0, r1 cmp r0, 0x2 - beq _0814CFDE + beq @0814CFDE ldrb r0, [r5] bl sub_806D864 lsls r1, r0, 3 @@ -641130,8 +641130,8 @@ _0814CFB0: ldrh r0, [r1] ands r4, r0 cmp r4, 0x1 - bne _0814CFF2 -_0814CFDE: + bne @0814CFF2 +@0814CFDE: ldrb r0, [r5] bl sub_806D864 lsls r1, r0, 3 @@ -641140,8 +641140,8 @@ _0814CFDE: adds r1, r6 ldrb r0, [r1, 0x13] adds r4, r0, 0x4 - b _0814D002 -_0814CFF2: + b @0814D002 +@0814CFF2: ldrb r0, [r5] bl sub_806D864 lsls r1, r0, 3 @@ -641149,7 +641149,7 @@ _0814CFF2: lsls r1, 2 adds r1, r6 ldrb r4, [r1, 0x13] -_0814D002: +@0814D002: ldr r5, =0x02024064 ldrb r1, [r5] adds r0, r4, 0 @@ -641245,7 +641245,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} @@ -641253,7 +641253,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 @@ -641327,7 +641327,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] @@ -641340,7 +641340,7 @@ sub_814D19C: @ 814D19C adds r3, r1, r0 ldrb r0, [r3, 0x4] cmp r0, 0 - bne _0814D1F0 + bne @0814D1F0 ldr r1, [r4] lsls r0, r2, 2 adds r0, r1 @@ -641348,12 +641348,12 @@ sub_814D19C: @ 814D19C movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0814D1D0 + beq @0814D1D0 adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -_0814D1D0: +@0814D1D0: ldr r0, [r6] ldrb r1, [r5] ldr r2, [r0, 0x4] @@ -641364,17 +641364,17 @@ _0814D1D0: ldrb r1, [r0, 0x4] adds r1, 0x1 strb r1, [r0, 0x4] - b _0814D266 + b @0814D266 .align 2, 0 .pool -_0814D1F0: +@0814D1F0: ldrb r1, [r3] movs r0, 0x40 ands r0, r1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _0814D266 + bne @0814D266 strb r4, [r3, 0x4] ldr r2, =0x0202406e ldrb r1, [r5] @@ -641425,7 +641425,7 @@ _0814D1F0: adds r0, r1 ldr r1, =sub_814B340 + 1 str r1, [r0] -_0814D266: +@0814D266: pop {r4-r6} pop {r0} bx r0 @@ -641434,7 +641434,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} @@ -641442,7 +641442,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} @@ -641450,7 +641450,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} @@ -641458,7 +641458,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} @@ -641466,7 +641466,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} @@ -641475,9 +641475,9 @@ sub_814D2B8: @ 814D2B8 bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - beq _0814D2CE - b _0814D3F4 -_0814D2CE: + beq @0814D2CE + b @0814D3F4 +@0814D2CE: ldr r0, =0x02023064 mov r12, r0 ldrb r1, [r5] @@ -641581,12 +641581,12 @@ _0814D2CE: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq _0814D3CC + beq @0814D3CC bl dp01_tbl4_exec_completed - b _0814D3F4 + b @0814D3F4 .align 2, 0 .pool -_0814D3CC: +@0814D3CC: ldr r0, =0x020244d0 ldr r0, [r0] ldrb r1, [r5] @@ -641606,7 +641606,7 @@ _0814D3CC: ldr r2, [r7] adds r0, r6, 0 bl sub_817E0FC -_0814D3F4: +@0814D3F4: pop {r3} mov r8, r3 pop {r4-r7} @@ -641617,7 +641617,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 @@ -641650,21 +641650,21 @@ bx_move_anim_4: @ 814D40C adds r0, r1 ldrb r2, [r0, 0x4] cmp r2, 0x1 - beq _0814D4A4 + beq @0814D4A4 cmp r2, 0x1 - bgt _0814D464 + bgt @0814D464 cmp r2, 0 - beq _0814D46E - b _0814D580 + beq @0814D46E + b @0814D580 .align 2, 0 .pool -_0814D464: +@0814D464: cmp r2, 0x2 - beq _0814D4CE + beq @0814D4CE cmp r2, 0x3 - beq _0814D544 - b _0814D580 -_0814D46E: + beq @0814D544 + b @0814D580 +@0814D46E: ldr r1, [r5] lsls r0, r3, 2 adds r1, r0, r1 @@ -641672,7 +641672,7 @@ _0814D46E: movs r0, 0xC ands r0, r2 cmp r0, 0x4 - bne _0814D490 + bne @0814D490 movs r0, 0x8 orrs r0, r2 strb r0, [r1] @@ -641681,7 +641681,7 @@ _0814D46E: adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -_0814D490: +@0814D490: ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -641691,13 +641691,13 @@ _0814D490: adds r0, r2 movs r1, 0x1 strb r1, [r0, 0x4] - b _0814D580 -_0814D4A4: + b @0814D580 +@0814D4A4: ldrb r1, [r0] movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _0814D580 + bne @0814D580 movs r0, 0 bl sub_805EB9C adds r0, r4, 0 @@ -641711,15 +641711,15 @@ _0814D4A4: adds r0, r2 movs r1, 0x2 strb r1, [r0, 0x4] - b _0814D580 -_0814D4CE: + b @0814D580 +@0814D4CE: ldr r0, =0x020383f8 ldr r0, [r0] bl _call_via_r0 ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 - bne _0814D580 + bne @0814D580 movs r0, 0x1 bl sub_805EB9C ldr r0, [r7] @@ -641731,10 +641731,10 @@ _0814D4CE: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0814D51C + beq @0814D51C mov r0, r8 cmp r0, 0x1 - bhi _0814D51C + bhi @0814D51C adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x6 @@ -641749,7 +641749,7 @@ _0814D4CE: negs r0, r0 ands r0, r2 strb r0, [r1] -_0814D51C: +@0814D51C: ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -641761,17 +641761,17 @@ _0814D51C: adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x4] - b _0814D580 + b @0814D580 .align 2, 0 .pool -_0814D544: +@0814D544: ldrb r1, [r0] movs r0, 0x40 ands r0, r1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _0814D580 + bne @0814D580 bl sub_805E394 ldrb r0, [r6] lsls r2, r0, 9 @@ -641792,7 +641792,7 @@ _0814D544: adds r0, r2 strb r4, [r0, 0x4] bl dp01_tbl4_exec_completed -_0814D580: +@0814D580: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -641803,7 +641803,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 @@ -641836,7 +641836,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} @@ -641844,7 +641844,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} @@ -641852,7 +641852,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} @@ -641860,7 +641860,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} @@ -641868,7 +641868,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} @@ -641876,7 +641876,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} @@ -641884,7 +641884,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} @@ -641892,7 +641892,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 @@ -641917,7 +641917,7 @@ sub_814D63C: @ 814D63C asrs r7, r1, 16 ldr r0, =0x00007fff cmp r7, r0 - beq _0814D6CC + beq @0814D6CC ldr r6, =0x0202406e lsls r0, r4, 1 adds r0, r6 @@ -641947,10 +641947,10 @@ sub_814D63C: @ 814D63C str r7, [sp] mov r2, r8 bl sub_807294C - b _0814D6F6 + b @0814D6F6 .align 2, 0 .pool -_0814D6CC: +@0814D6CC: ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -641970,7 +641970,7 @@ _0814D6CC: str r7, [sp] movs r3, 0 bl sub_807294C -_0814D6F6: +@0814D6F6: ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -641990,7 +641990,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} @@ -641998,14 +641998,14 @@ 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] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne _0814D78C + bne @0814D78C ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 @@ -642039,7 +642039,7 @@ sub_814D738: @ 814D738 adds r0, r1 ldr r1, =sub_814B7B8 + 1 str r1, [r0] -_0814D78C: +@0814D78C: pop {r4} pop {r0} bx r0 @@ -642048,14 +642048,14 @@ _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] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne _0814D800 + bne @0814D800 ldr r4, =0x02023064 ldrb r3, [r5] lsls r3, 9 @@ -642087,7 +642087,7 @@ sub_814D7B0: @ 814D7B0 adds r0, r1 ldr r1, =sub_814B7B8 + 1 str r1, [r0] -_0814D800: +@0814D800: pop {r4,r5} pop {r0} bx r0 @@ -642096,7 +642096,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} @@ -642104,7 +642104,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} @@ -642112,7 +642112,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} @@ -642120,7 +642120,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} @@ -642128,7 +642128,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} @@ -642136,7 +642136,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} @@ -642144,7 +642144,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} @@ -642152,7 +642152,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} @@ -642160,7 +642160,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} @@ -642168,7 +642168,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] @@ -642184,7 +642184,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 @@ -642210,7 +642210,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] @@ -642225,7 +642225,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] @@ -642247,7 +642247,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 @@ -642263,12 +642263,12 @@ dp01t_29_4_blink: @ 814D918 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - bge _0814D94C + bge @0814D94C bl dp01_tbl4_exec_completed - b _0814D976 + b @0814D976 .align 2, 0 .pool -_0814D94C: +@0814D94C: ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] @@ -642289,7 +642289,7 @@ _0814D94C: adds r0, r1 ldr r1, =dp01t_0F_4_move_anim + 1 str r1, [r0] -_0814D976: +@0814D976: pop {r4} pop {r0} bx r0 @@ -642298,7 +642298,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} @@ -642306,7 +642306,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] @@ -642314,9 +642314,9 @@ sub_814D994: @ 814D994 lsls r0, 24 movs r3, 0x3F cmp r0, 0 - bne _0814D9A8 + bne @0814D9A8 movs r3, 0xC0 -_0814D9A8: +@0814D9A8: ldr r2, =0x02023064 ldrb r1, [r4] lsls r1, 9 @@ -642340,7 +642340,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 @@ -642350,7 +642350,7 @@ sub_814D9D8: @ 814D9D8 adds r0, r3, r0 ldrb r0, [r0] cmp r0, 0 - beq _0814DA14 + beq @0814DA14 bl sub_805EA60 ldrb r1, [r5] lsls r1, 9 @@ -642363,10 +642363,10 @@ sub_814D9D8: @ 814D9D8 lsls r1, 8 orrs r0, r1 bl song_play_for_text - b _0814DA28 + b @0814DA28 .align 2, 0 .pool -_0814DA14: +@0814DA14: adds r0, r4, 0x1 adds r0, r3, r0 ldrb r0, [r0] @@ -642376,7 +642376,7 @@ _0814DA14: lsls r1, 8 orrs r0, r1 bl fanfare_play -_0814DA28: +@0814DA28: bl dp01_tbl4_exec_completed pop {r4,r5} pop {r0} @@ -642384,7 +642384,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 @@ -642412,7 +642412,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 @@ -642435,7 +642435,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 @@ -642526,7 +642526,7 @@ sub_814DAA8: @ 814DAA8 movs r5, 0xFF ldrb r0, [r1] cmp r0, 0x4 - beq _0814DB80 + beq @0814DB80 ldrb r0, [r6] bl sub_806D864 lsls r1, r0, 3 @@ -642537,8 +642537,8 @@ sub_814DAA8: @ 814DAA8 adds r0, r5, 0 ands r0, r1 cmp r0, 0x5 - bne _0814DBB4 -_0814DB80: + bne @0814DBB4 +@0814DB80: ldrb r0, [r6] bl sub_806D864 lsls r1, r0, 3 @@ -642547,10 +642547,10 @@ _0814DB80: adds r1, r4 ldrb r0, [r1, 0x13] adds r0, 0x2 - b _0814DC06 + b @0814DC06 .align 2, 0 .pool -_0814DBB4: +@0814DBB4: ldrb r0, [r6] bl sub_806D864 lsls r1, r0, 3 @@ -642561,7 +642561,7 @@ _0814DBB4: adds r0, r5, 0 ands r0, r1 cmp r0, 0x2 - beq _0814DBE2 + beq @0814DBE2 ldrb r0, [r6] bl sub_806D864 lsls r1, r0, 3 @@ -642571,8 +642571,8 @@ _0814DBB4: ldrh r0, [r1] ands r5, r0 cmp r5, 0x1 - bne _0814DBF6 -_0814DBE2: + bne @0814DBF6 +@0814DBE2: ldrb r0, [r6] bl sub_806D864 lsls r1, r0, 3 @@ -642581,8 +642581,8 @@ _0814DBE2: adds r1, r4 ldrb r0, [r1, 0x13] adds r0, 0x4 - b _0814DC06 -_0814DBF6: + b @0814DC06 +@0814DBF6: ldrb r0, [r6] bl sub_806D864 lsls r1, r0, 3 @@ -642590,7 +642590,7 @@ _0814DBF6: lsls r1, 2 adds r1, r4 ldrb r0, [r1, 0x13] -_0814DC06: +@0814DC06: ldr r1, =0x08305d8c lsls r0, 3 adds r0, r1 @@ -642640,7 +642640,7 @@ _0814DC06: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0814DC80 + beq @0814DC80 ldr r0, =0x020244b4 adds r0, r2, r0 ldrb r1, [r0] @@ -642650,7 +642650,7 @@ _0814DC06: adds r0, r4 ldr r1, =sub_8073C30 + 1 str r1, [r0] -_0814DC80: +@0814DC80: ldr r0, [r3] ldr r2, [r0, 0x8] ldrb r0, [r2, 0x9] @@ -642671,7 +642671,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 @@ -642688,13 +642688,13 @@ sub_814DCCC: @ 814DCCC movs r3, 0xA ldrsh r0, [r1, r3] cmp r0, 0x17 - bgt _0814DCF8 + bgt @0814DCF8 adds r0, r2, 0x1 strh r0, [r1, 0xA] - b _0814DDB4 + b @0814DDB4 .align 2, 0 .pool -_0814DCF8: +@0814DCF8: ldr r7, =0x02024064 ldrb r0, [r7] mov r9, r0 @@ -642703,14 +642703,14 @@ _0814DCF8: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _0814DD18 + beq @0814DD18 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _0814DD48 -_0814DD18: + beq @0814DD48 +@0814DD18: ldr r0, =0x02023064 ldrb r1, [r7] lsls r2, r1, 9 @@ -642724,10 +642724,10 @@ _0814DD18: ldrb r0, [r7] movs r1, 0 bl sub_814CC98 - b _0814DD9C + b @0814DD9C .align 2, 0 .pool -_0814DD48: +@0814DD48: ldr r4, =0x02023064 ldrb r0, [r7] lsls r1, r0, 9 @@ -642767,7 +642767,7 @@ _0814DD48: ldrb r0, [r7] eors r0, r6 strb r0, [r7] -_0814DD9C: +@0814DD9C: ldr r1, =0x03005d60 ldr r2, =0x02024064 ldrb r0, [r2] @@ -642779,7 +642779,7 @@ _0814DD9C: strb r3, [r2] mov r0, r8 bl remove_task -_0814DDB4: +@0814DDB4: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -642791,7 +642791,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 @@ -642801,17 +642801,17 @@ sub_814DDD8: @ 814DDD8 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _0814DE08 + beq @0814DE08 adds r0, r2, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0814DE08 + bne @0814DE08 bl dp01_tbl4_exec_completed - b _0814DE7C + b @0814DE7C .align 2, 0 .pool -_0814DE08: +@0814DE08: ldr r6, =0x020244d0 ldr r0, [r6] ldr r5, =0x02024064 @@ -642854,7 +642854,7 @@ _0814DE08: adds r0, r4 ldrb r0, [r0] cmp r0, 0 - beq _0814DE70 + beq @0814DE70 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -642863,14 +642863,14 @@ _0814DE08: adds r0, r1 movs r1, 0x5D strb r1, [r0, 0x5] -_0814DE70: +@0814DE70: ldr r0, =0x03005d60 ldrb r1, [r5] lsls r1, 2 adds r1, r0 ldr r0, =sub_814DE9C + 1 str r0, [r1] -_0814DE7C: +@0814DE7C: pop {r4-r6} pop {r0} bx r0 @@ -642879,7 +642879,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] @@ -642896,7 +642896,7 @@ sub_814DE9C: @ 814DE9C lsls r1, 24 lsrs r1, 24 cmp r1, 0x5C - bls _0814DED4 + bls @0814DED4 ldr r0, [r4] ldrb r1, [r3] ldr r2, [r0, 0x4] @@ -642907,7 +642907,7 @@ sub_814DE9C: @ 814DE9C movs r1, 0 strb r1, [r0, 0x5] bl dp01_tbl4_exec_completed -_0814DED4: +@0814DED4: pop {r4} pop {r0} bx r0 @@ -642916,7 +642916,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] @@ -642931,7 +642931,7 @@ sub_814DEE4: @ 814DEE4 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0814DF16 + beq @0814DF16 ldr r2, =0x03005e00 ldr r0, =0x020244b4 adds r0, r3, r0 @@ -642942,7 +642942,7 @@ sub_814DEE4: @ 814DEE4 adds r0, r2 ldr r1, =sub_8073C30 + 1 str r1, [r0] -_0814DF16: +@0814DF16: bl dp01_tbl4_exec_completed pop {r0} bx r0 @@ -642951,7 +642951,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} @@ -642959,14 +642959,14 @@ 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] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 - beq _0814DF86 + beq @0814DF86 ldr r3, =0x02020630 ldr r0, =0x020241e4 ldrb r1, [r4] @@ -642993,7 +642993,7 @@ sub_814DF40: @ 814DF40 strb r0, [r2] ldrb r0, [r4] bl sub_805E408 -_0814DF86: +@0814DF86: bl dp01_tbl4_exec_completed pop {r4} pop {r0} @@ -643003,7 +643003,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 @@ -643011,7 +643011,7 @@ sub_814DFA0: @ 814DFA0 bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne _0814E002 + bne @0814E002 ldr r4, =0x02023064 ldrb r2, [r5] lsls r1, r2, 9 @@ -643033,22 +643033,22 @@ sub_814DFA0: @ 814DFA0 bl move_anim_start_t3 lsls r0, 24 cmp r0, 0 - beq _0814DFF0 + beq @0814DFF0 bl dp01_tbl4_exec_completed - b _0814DFFC + b @0814DFFC .align 2, 0 .pool -_0814DFF0: +@0814DFF0: ldr r0, =0x03005d60 ldrb r1, [r5] lsls r1, 2 adds r1, r0 ldr r0, =sub_814B7E8 + 1 str r0, [r1] -_0814DFFC: +@0814DFFC: adds r0, r6, 0 bl sub_817E32C -_0814E002: +@0814E002: add sp, 0x4 pop {r4-r6} pop {r0} @@ -643058,7 +643058,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] @@ -643074,7 +643074,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} @@ -643082,7 +643082,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] @@ -643134,12 +643134,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 @@ -643189,7 +643189,7 @@ battle_pick_message: @ 814E0C4 ldr r1, =0x02022f58 mov r10, r1 ldr r3, =0x0203aba4 -_0814E126: +@0814E126: adds r0, r2, r3 ldr r1, [r4] adds r1, 0xC @@ -643198,14 +643198,14 @@ _0814E126: strb r1, [r0] adds r2, 0x1 cmp r2, 0x3 - ble _0814E126 + ble @0814E126 movs r2, 0 ldr r0, =0x02022f58 mov r8, r0 ldr r3, =0x0203aba8 ldr r5, =0x02022f68 ldr r4, =0x02022f78 -_0814E144: +@0814E144: mov r0, r8 adds r1, r2, r0 ldr r0, [r3] @@ -643227,413 +643227,413 @@ _0814E144: strb r0, [r1] adds r2, 0x1 cmp r2, 0xF - ble _0814E144 + ble @0814E144 cmp r6, 0x5 - bls _0814E176 - b _0814E6B8 -_0814E176: + bls @0814E176 + b @0814E6B8 +@0814E176: lsls r0, r6, 2 - ldr r1, =_0814E1B4 + ldr r1, =@0814E1B4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0814E1B4: - .4byte _0814E1CC - .4byte _0814E2AC - .4byte _0814E394 - .4byte _0814E430 - .4byte _0814E4F8 - .4byte _0814E55C -_0814E1CC: +@0814E1B4: + .4byte @0814E1CC + .4byte @0814E2AC + .4byte @0814E394 + .4byte @0814E430 + .4byte @0814E4F8 + .4byte @0814E55C +@0814E1CC: ldr r0, =0x02022fec ldr r2, [r0] movs r0, 0x8 ands r0, r2 cmp r0, 0 - beq _0814E26C + beq @0814E26C ldr r0, =0x02000002 ands r0, r2 cmp r0, 0 - beq _0814E248 + beq @0814E248 movs r0, 0x80 lsls r0, 16 ands r0, r2 cmp r0, 0 - bne _0814E260 + bne @0814E260 movs r0, 0x40 ands r0, r2 cmp r0, 0 - beq _0814E214 + beq @0814E214 movs r0, 0x80 lsls r0, 17 ands r2, r0 ldr r7, =0x085cbbcd cmp r2, 0 - bne _0814E200 - b _0814E6D8 -_0814E200: + bne @0814E200 + b @0814E6D8 +@0814E200: ldr r7, =0x085cd318 - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E214: +@0814E214: ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0xC0 lsls r0, 4 cmp r1, r0 - bne _0814E22C + bne @0814E22C ldr r7, =0x085cbb9c - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E22C: +@0814E22C: movs r0, 0x80 lsls r0, 17 ands r2, r0 ldr r7, =0x085cbbb9 cmp r2, 0 - bne _0814E23A - b _0814E6D8 -_0814E23A: + bne @0814E23A + b @0814E6D8 +@0814E23A: ldr r7, =0x085cd301 - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E248: +@0814E248: movs r0, 0x80 lsls r0, 15 ands r0, r2 cmp r0, 0 - bne _0814E260 + bne @0814E260 movs r0, 0x80 lsls r0, 8 ands r2, r0 ldr r7, =0x085cbb9c cmp r2, 0 - bne _0814E260 - b _0814E6D8 -_0814E260: + bne @0814E260 + b @0814E6D8 +@0814E260: ldr r7, =0x085cce17 - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E26C: +@0814E26C: movs r0, 0x80 lsls r0, 6 ands r0, r2 cmp r0, 0 - beq _0814E280 + beq @0814E280 ldr r7, =0x085cbb5a - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E280: +@0814E280: movs r0, 0x1 ands r0, r2 cmp r0, 0 - beq _0814E290 + beq @0814E290 ldr r7, =0x085cbb82 - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E290: +@0814E290: movs r0, 0x80 lsls r0, 2 ands r2, r0 ldr r7, =0x085cbb47 cmp r2, 0 - bne _0814E29E - b _0814E6D8 -_0814E29E: + bne @0814E29E + b @0814E6D8 +@0814E29E: ldr r7, =0x085cbb6d - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E2AC: +@0814E2AC: mov r1, r12 ldrb r0, [r1] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0814E310 + bne @0814E310 ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0814E308 + beq @0814E308 movs r0, 0x80 lsls r0, 15 ands r0, r1 cmp r0, 0 - beq _0814E2DC + beq @0814E2DC ldr r7, =0x085cce38 - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E2DC: +@0814E2DC: movs r0, 0x80 lsls r0, 8 ands r0, r1 cmp r0, 0 - beq _0814E2F0 + beq @0814E2F0 ldr r7, =0x085cbc96 - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E2F0: +@0814E2F0: movs r0, 0x40 ands r1, r0 ldr r7, =0x085cbc96 cmp r1, 0 - bne _0814E2FC - b _0814E6D8 -_0814E2FC: + bne @0814E2FC + b @0814E6D8 +@0814E2FC: ldr r7, =0x085cbce5 - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E308: +@0814E308: ldr r7, =0x085cbc8e - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E310: +@0814E310: ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0814E368 + beq @0814E368 movs r0, 0x80 lsls r0, 8 ands r0, r1 cmp r0, 0 - bne _0814E330 + bne @0814E330 movs r0, 0x80 lsls r0, 16 ands r0, r1 cmp r0, 0 - beq _0814E33C -_0814E330: + beq @0814E33C +@0814E330: ldr r7, =0x085ccdde - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E33C: +@0814E33C: movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0814E34C + beq @0814E34C ldr r7, =0x085cbc4e - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E34C: +@0814E34C: ldr r0, =0x02000002 ands r1, r0 ldr r7, =0x085cbbfa cmp r1, 0 - bne _0814E358 - b _0814E6D8 -_0814E358: + bne @0814E358 + b @0814E6D8 +@0814E358: ldr r7, =0x085cbc37 - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E368: +@0814E368: ldr r0, =0x02000002 ands r1, r0 cmp r1, 0 - beq _0814E380 + beq @0814E380 ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0xC0 lsls r0, 4 ldr r7, =0x085cbc27 cmp r1, r0 - beq _0814E380 - b _0814E6D8 -_0814E380: + beq @0814E380 + b @0814E6D8 +@0814E380: ldr r7, =0x085cbbe7 - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E394: +@0814E394: mov r1, r12 ldrb r0, [r1] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0814E3EC + bne @0814E3EC ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0xB1 ldrb r2, [r0] cmp r2, 0 - bne _0814E3BC + bne @0814E3BC ldr r7, =0x085cbcfd - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E3BC: +@0814E3BC: cmp r2, 0x1 - beq _0814E3CC + beq @0814E3CC ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0814E3D8 -_0814E3CC: + beq @0814E3D8 +@0814E3CC: ldr r7, =0x085cbd1b - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E3D8: +@0814E3D8: ldr r7, =0x085cbd3d cmp r2, 0x2 - beq _0814E3E0 - b _0814E6D8 -_0814E3E0: + beq @0814E3E0 + b @0814E6D8 +@0814E3E0: ldr r7, =0x085cbd2a - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E3EC: +@0814E3EC: ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0x80 lsls r0, 4 ldr r2, =0x02022fec cmp r1, r0 - beq _0814E406 + beq @0814E406 ldr r0, [r2] movs r1, 0x80 lsls r1, 18 ands r0, r1 cmp r0, 0 - beq _0814E428 -_0814E406: + beq @0814E428 +@0814E406: ldr r0, [r2] movs r1, 0x40 ands r0, r1 ldr r7, =0x085cbd65 cmp r0, 0 - bne _0814E414 - b _0814E6D8 -_0814E414: + bne @0814E414 + b @0814E6D8 +@0814E414: ldr r7, =0x085cbd75 - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E428: +@0814E428: ldr r7, =0x085cbd52 - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E430: +@0814E430: mov r4, r9 ldrb r0, [r4, 0x17] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0814E488 + bne @0814E488 ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0xB1 ldrb r2, [r0] cmp r2, 0 - beq _0814E456 + beq @0814E456 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0814E468 -_0814E456: + beq @0814E468 +@0814E456: ldr r7, =0x085cbca5 - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E468: +@0814E468: cmp r2, 0x1 - bne _0814E474 + bne @0814E474 ldr r7, =0x085cbcad - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E474: +@0814E474: ldr r7, =0x085cbcc7 cmp r2, 0x2 - beq _0814E47C - b _0814E6D8 -_0814E47C: + beq @0814E47C + b @0814E6D8 +@0814E47C: ldr r7, =0x085cbcb8 - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E488: +@0814E488: ldr r0, =0x02022fec ldr r1, [r0] ldr r0, =0x02000002 ands r0, r1 cmp r0, 0 - beq _0814E4DC + beq @0814E4DC movs r0, 0x80 lsls r0, 16 ands r0, r1 cmp r0, 0 - beq _0814E4AC + beq @0814E4AC ldrb r0, [r4, 0x17] - b _0814E4EA + b @0814E4EA .align 2, 0 .pool -_0814E4AC: +@0814E4AC: movs r0, 0x40 ands r1, r0 cmp r1, 0 - beq _0814E4BC + beq @0814E4BC ldr r7, =0x085cbc7e - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E4BC: +@0814E4BC: ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0xC0 lsls r0, 4 ldr r7, =0x085cbc6e cmp r1, r0 - beq _0814E4CC - b _0814E6D8 -_0814E4CC: + beq @0814E4CC + b @0814E6D8 +@0814E4CC: ldr r7, =0x085cbc14 - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E4DC: +@0814E4DC: movs r0, 0x80 lsls r0, 8 ands r1, r0 cmp r1, 0 - beq _0814E4CC + beq @0814E4CC mov r1, r9 ldrb r0, [r1, 0x17] -_0814E4EA: +@0814E4EA: ldr r7, =0x085cce04 cmp r0, 0x1 - beq _0814E4F2 - b _0814E6D8 -_0814E4F2: - b _0814E4CC + beq @0814E4F2 + b @0814E6D8 +@0814E4F2: + b @0814E4CC .align 2, 0 .pool -_0814E4F8: +@0814E4F8: mov r0, r10 bl sub_814F8F8 ldr r0, =0x0203aba8 @@ -643642,7 +643642,7 @@ _0814E4F8: movs r0, 0xB1 lsls r0, 1 cmp r1, r0 - bls _0814E534 + bls @0814E534 ldr r0, =0x02022f68 ldr r1, =0x0202449c ldr r1, [r1] @@ -643653,10 +643653,10 @@ _0814E4F8: ldr r2, =0x085ccbbc adds r1, r2 bl gf_strcpy - b _0814E544 + b @0814E544 .align 2, 0 .pool -_0814E534: +@0814E534: ldr r0, =0x02022f68 ldrh r2, [r2] movs r1, 0xD @@ -643664,20 +643664,20 @@ _0814E534: ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy -_0814E544: +@0814E544: ldr r0, =0x02022f68 bl sub_814F950 ldr r7, =0x085cbdac - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E55C: +@0814E55C: ldr r4, =0x02022f58 ldrb r1, [r4] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0814E5C4 + beq @0814E5C4 movs r0, 0x7F ands r0, r1 strb r0, [r4] @@ -643687,186 +643687,186 @@ _0814E55C: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0814E58A + bne @0814E58A ldrb r1, [r4] cmp r1, 0x3 - beq _0814E58A + beq @0814E58A movs r0, 0x3 eors r0, r1 strb r0, [r4] -_0814E58A: +@0814E58A: ldr r0, =0x02022f58 ldrb r0, [r0] subs r0, 0x2 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _0814E5A4 + bhi @0814E5A4 ldr r7, =0x085cb4ca - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E5A4: +@0814E5A4: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 ldr r7, =0x085cb5d2 cmp r0, 0 - bne _0814E5B4 - b _0814E6D8 -_0814E5B4: + bne @0814E5B4 + b @0814E6D8 +@0814E5B4: ldr r7, =0x085cb5df - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E5C4: +@0814E5C4: mov r1, r12 ldrb r0, [r1] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0814E5E0 + bne @0814E5E0 ldrb r1, [r4] cmp r1, 0x3 - beq _0814E5E0 + beq @0814E5E0 movs r0, 0x3 eors r0, r1 strb r0, [r4] -_0814E5E0: +@0814E5E0: ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0814E638 + beq @0814E638 ldr r0, =0x02022f58 ldrb r0, [r0] cmp r0, 0x2 - beq _0814E628 + beq @0814E628 cmp r0, 0x2 - bgt _0814E608 + bgt @0814E608 cmp r0, 0x1 - beq _0814E60E - b _0814E6D8 + beq @0814E60E + b @0814E6D8 .align 2, 0 .pool -_0814E608: +@0814E608: cmp r0, 0x3 - beq _0814E630 - b _0814E6D8 -_0814E60E: + beq @0814E630 + b @0814E6D8 +@0814E60E: movs r0, 0x80 lsls r0, 16 ands r1, r0 ldr r7, =0x085cb538 cmp r1, 0 - beq _0814E6D8 + beq @0814E6D8 ldr r7, =0x085cce53 - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E628: +@0814E628: ldr r7, =0x085cb567 - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E630: +@0814E630: ldr r7, =0x085cb5a6 - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E638: +@0814E638: ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0xC0 lsls r0, 4 cmp r1, r0 - bne _0814E680 + bne @0814E680 ldr r0, =0x02022f58 ldrb r0, [r0] cmp r0, 0x2 - beq _0814E670 + beq @0814E670 cmp r0, 0x2 - bgt _0814E660 + bgt @0814E660 cmp r0, 0x1 - beq _0814E666 - b _0814E6D8 + beq @0814E666 + b @0814E6D8 .align 2, 0 .pool -_0814E660: +@0814E660: cmp r0, 0x3 - beq _0814E678 - b _0814E6D8 -_0814E666: + beq @0814E678 + b @0814E6D8 +@0814E666: ldr r7, =0x085cba2e - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E670: +@0814E670: ldr r7, =0x085cd24c - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E678: +@0814E678: ldr r7, =0x085cd267 - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E680: +@0814E680: ldr r0, =0x02022f58 ldrb r0, [r0] cmp r0, 0x2 - beq _0814E6A8 + beq @0814E6A8 cmp r0, 0x2 - bgt _0814E698 + bgt @0814E698 cmp r0, 0x1 - beq _0814E69E - b _0814E6D8 + beq @0814E69E + b @0814E6D8 .align 2, 0 .pool -_0814E698: +@0814E698: cmp r0, 0x3 - beq _0814E6B0 - b _0814E6D8 -_0814E69E: + beq @0814E6B0 + b @0814E6D8 +@0814E69E: ldr r7, =0x085cb524 - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E6A8: +@0814E6A8: ldr r7, =0x085cb54f - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E6B0: +@0814E6B0: ldr r7, =0x085cb581 - b _0814E6D8 + b @0814E6D8 .align 2, 0 .pool -_0814E6B8: +@0814E6B8: movs r0, 0xBE lsls r0, 1 cmp r6, r0 - bls _0814E6CC + bls @0814E6CC ldr r1, =0x02022e2c movs r0, 0xFF strb r0, [r1] - b _0814E6DE + b @0814E6DE .align 2, 0 .pool -_0814E6CC: +@0814E6CC: ldr r1, =0x085cc270 adds r0, r6, 0 subs r0, 0xC lsls r0, 2 adds r0, r1 ldr r7, [r0] -_0814E6D8: +@0814E6D8: adds r0, r7, 0 bl sub_814E6F0 -_0814E6DE: +@0814E6DE: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -643879,7 +643879,7 @@ _0814E6DE: thumb_func_end battle_pick_message thumb_func_start sub_814E6F0 -sub_814E6F0: @ 814E6F0 +sub_814E6F0: ; 814E6F0 push {lr} ldr r1, =0x02022e2c bl sub_814E764 @@ -643890,7 +643890,7 @@ sub_814E6F0: @ 814E6F0 thumb_func_end sub_814E6F0 thumb_func_start sub_814E700 -sub_814E700: @ 814E700 +sub_814E700: ; 814E700 push {r4,r5,lr} sub sp, 0x8 adds r4, r0, 0 @@ -643900,45 +643900,45 @@ sub_814E700: @ 814E700 bl memcpy mov r2, sp movs r3, 0 - b _0814E728 + b @0814E728 .align 2, 0 .pool -_0814E71C: +@0814E71C: strb r1, [r2] adds r4, 0x1 adds r2, 0x1 adds r3, 0x1 cmp r3, 0x7 - bhi _0814E730 -_0814E728: + bhi @0814E730 +@0814E728: ldrb r1, [r4] adds r0, r1, 0 cmp r0, 0xFF - bne _0814E71C -_0814E730: + bne @0814E71C +@0814E730: ldr r5, [sp] ldr r4, [sp, 0x4] movs r3, 0 ldr r2, =0x0831bca8 -_0814E738: +@0814E738: ldr r1, [r2] ldr r0, [r1] cmp r5, r0 - bne _0814E750 + bne @0814E750 ldr r0, [r1, 0x4] cmp r4, r0 - bne _0814E750 + bne @0814E750 ldr r0, [r2, 0x4] - b _0814E75A + b @0814E75A .align 2, 0 .pool -_0814E750: +@0814E750: adds r2, 0x8 adds r3, 0x1 cmp r3, 0x6 - bls _0814E738 + bls @0814E738 movs r0, 0 -_0814E75A: +@0814E75A: add sp, 0x8 pop {r4,r5} pop {r1} @@ -643946,7 +643946,7 @@ _0814E75A: thumb_func_end sub_814E700 thumb_func_start sub_814E764 -sub_814E764: @ 814E764 +sub_814E764: ; 814E764 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -643962,157 +643962,157 @@ sub_814E764: @ 814E764 lsls r1, 18 ands r0, r1 cmp r0, 0 - beq _0814E794 + beq @0814E794 ldr r0, =0x0203c7b4 ldrb r7, [r0] - b _0814E79C + b @0814E79C .align 2, 0 .pool -_0814E794: +@0814E794: bl link_get_multiplayer_id lsls r0, 24 lsrs r7, r0, 24 -_0814E79C: +@0814E79C: mov r0, r9 ldrb r1, [r0] - bl _0814F620 -_0814E7A4: + bl @0814F620 +@0814E7A4: cmp r1, 0xFD - beq _0814E7AC - bl _0814F610 -_0814E7AC: + beq @0814E7AC + bl @0814F610 +@0814E7AC: movs r1, 0x1 add r9, r1 mov r2, r9 ldrb r0, [r2] cmp r0, 0x34 - bls _0814E7BC - bl _0814F5C0 -_0814E7BC: + bls @0814E7BC + bl @0814F5C0 +@0814E7BC: lsls r0, 2 - ldr r1, =_0814E7CC + ldr r1, =@0814E7CC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0814E7CC: - .4byte _0814E8A0 - .4byte _0814E8CE - .4byte _0814E90A - .4byte _0814E914 - .4byte _0814E920 - .4byte _0814E92C - .4byte _0814E960 - .4byte _0814E994 - .4byte _0814E9C8 - .4byte _0814E9FC - .4byte _0814EA38 - .4byte _0814EA78 - .4byte _0814EAB8 - .4byte _0814EAF8 - .4byte _0814EBB0 - .4byte _0814EC38 - .4byte _0814ECD4 - .4byte _0814ED70 - .4byte _0814EE0C - .4byte _0814EEA8 - .4byte _0814EF44 - .4byte _0814EF5C - .4byte _0814EF98 - .4byte _0814F080 - .4byte _0814F088 - .4byte _0814F098 - .4byte _0814F0A8 - .4byte _0814F0B8 - .4byte _0814F0D8 - .4byte _0814F164 - .4byte _0814F220 - .4byte _0814F230 - .4byte _0814F244 - .4byte _0814F258 - .4byte _0814F27C - .4byte _0814F298 - .4byte _0814F2C0 - .4byte _0814F300 - .4byte _0814F330 - .4byte _0814F3C4 - .4byte _0814F410 - .4byte _0814F418 - .4byte _0814F3E4 - .4byte _0814F3EC - .4byte _0814F43C - .4byte _0814F444 - .4byte _0814F468 - .4byte _0814F4B8 - .4byte _0814F508 - .4byte _0814F548 - .4byte _0814F594 - .4byte _0814F5B4 - .4byte _0814E8E4 -_0814E8A0: +@0814E7CC: + .4byte @0814E8A0 + .4byte @0814E8CE + .4byte @0814E90A + .4byte @0814E914 + .4byte @0814E920 + .4byte @0814E92C + .4byte @0814E960 + .4byte @0814E994 + .4byte @0814E9C8 + .4byte @0814E9FC + .4byte @0814EA38 + .4byte @0814EA78 + .4byte @0814EAB8 + .4byte @0814EAF8 + .4byte @0814EBB0 + .4byte @0814EC38 + .4byte @0814ECD4 + .4byte @0814ED70 + .4byte @0814EE0C + .4byte @0814EEA8 + .4byte @0814EF44 + .4byte @0814EF5C + .4byte @0814EF98 + .4byte @0814F080 + .4byte @0814F088 + .4byte @0814F098 + .4byte @0814F0A8 + .4byte @0814F0B8 + .4byte @0814F0D8 + .4byte @0814F164 + .4byte @0814F220 + .4byte @0814F230 + .4byte @0814F244 + .4byte @0814F258 + .4byte @0814F27C + .4byte @0814F298 + .4byte @0814F2C0 + .4byte @0814F300 + .4byte @0814F330 + .4byte @0814F3C4 + .4byte @0814F410 + .4byte @0814F418 + .4byte @0814F3E4 + .4byte @0814F3EC + .4byte @0814F43C + .4byte @0814F444 + .4byte @0814F468 + .4byte @0814F4B8 + .4byte @0814F508 + .4byte @0814F548 + .4byte @0814F594 + .4byte @0814F5B4 + .4byte @0814E8E4 +@0814E8A0: ldr r5, =0x02022f58 ldrb r0, [r5] cmp r0, 0xFD - bne _0814E8B8 + bne @0814E8B8 ldr r4, =0x02021cc4 adds r0, r5, 0 - b _0814E8F0 + b @0814E8F0 .align 2, 0 .pool -_0814E8B8: +@0814E8B8: adds r0, r5, 0 bl sub_814E700 adds r4, r0, 0 cmp r4, 0 - beq _0814E8C8 - bl _0814F5C0 -_0814E8C8: + beq @0814E8C8 + bl @0814F5C0 +@0814E8C8: adds r4, r5, 0 - bl _0814F5C0 -_0814E8CE: + bl @0814F5C0 +@0814E8CE: ldr r1, =0x02022f68 ldrb r0, [r1] cmp r0, 0xFD - bne _0814E904 + bne @0814E904 ldr r4, =0x02021dc4 - b _0814E8EE + b @0814E8EE .align 2, 0 .pool -_0814E8E4: +@0814E8E4: ldr r1, =0x02022f78 ldrb r0, [r1] cmp r0, 0xFD - bne _0814E904 + bne @0814E904 ldr r4, =0x02021ec4 -_0814E8EE: +@0814E8EE: adds r0, r1, 0 -_0814E8F0: +@0814E8F0: adds r1, r4, 0 bl sub_814F648 - bl _0814F5C0 + bl @0814F5C0 .align 2, 0 .pool -_0814E904: +@0814E904: adds r4, r1, 0 - bl _0814F5C0 -_0814E90A: + bl @0814F5C0 +@0814E90A: ldr r4, =0x02021cc4 - bl _0814F5C0 + bl @0814F5C0 .align 2, 0 .pool -_0814E914: +@0814E914: ldr r4, =0x02021dc4 - bl _0814F5C0 + bl @0814F5C0 .align 2, 0 .pool -_0814E920: +@0814E920: ldr r4, =0x02021ec4 - bl _0814F5C0 + bl @0814F5C0 .align 2, 0 .pool -_0814E92C: +@0814E92C: movs r0, 0 bl battle_get_side_with_given_state ldr r1, =0x0202406e @@ -644129,10 +644129,10 @@ _0814E92C: bl pokemon_getattr mov r0, sp bl get_end_of_string_ptr_limit_10_chars - bl _0814F5BE + bl @0814F5BE .align 2, 0 .pool -_0814E960: +@0814E960: movs r0, 0x1 bl battle_get_side_with_given_state ldr r1, =0x0202406e @@ -644149,10 +644149,10 @@ _0814E960: bl pokemon_getattr mov r0, sp bl get_end_of_string_ptr_limit_10_chars - bl _0814F5BE + bl @0814F5BE .align 2, 0 .pool -_0814E994: +@0814E994: movs r0, 0x2 bl battle_get_side_with_given_state ldr r1, =0x0202406e @@ -644169,10 +644169,10 @@ _0814E994: bl pokemon_getattr mov r0, sp bl get_end_of_string_ptr_limit_10_chars - bl _0814F5BE + bl @0814F5BE .align 2, 0 .pool -_0814E9C8: +@0814E9C8: movs r0, 0x3 bl battle_get_side_with_given_state ldr r1, =0x0202406e @@ -644189,10 +644189,10 @@ _0814E9C8: bl pokemon_getattr mov r0, sp bl get_end_of_string_ptr_limit_10_chars - bl _0814F5BE + bl @0814F5BE .align 2, 0 .pool -_0814E9FC: +@0814E9FC: ldr r2, =0x0202406e ldr r1, =0x020229e8 lsls r0, r7, 3 @@ -644212,10 +644212,10 @@ _0814E9FC: bl pokemon_getattr mov r0, sp bl get_end_of_string_ptr_limit_10_chars - bl _0814F5BE + bl @0814F5BE .align 2, 0 .pool -_0814EA38: +@0814EA38: ldr r2, =0x0202406e ldr r1, =0x020229e8 lsls r0, r7, 3 @@ -644237,10 +644237,10 @@ _0814EA38: bl pokemon_getattr mov r0, sp bl get_end_of_string_ptr_limit_10_chars - bl _0814F5BE + bl @0814F5BE .align 2, 0 .pool -_0814EA78: +@0814EA78: ldr r2, =0x0202406e ldr r1, =0x020229e8 lsls r0, r7, 3 @@ -644262,10 +644262,10 @@ _0814EA78: bl pokemon_getattr mov r0, sp bl get_end_of_string_ptr_limit_10_chars - bl _0814F5BE + bl @0814F5BE .align 2, 0 .pool -_0814EAB8: +@0814EAB8: ldr r2, =0x0202406e ldr r1, =0x020229e8 lsls r0, r7, 3 @@ -644287,39 +644287,39 @@ _0814EAB8: bl pokemon_getattr mov r0, sp bl get_end_of_string_ptr_limit_10_chars - bl _0814F5BE + bl @0814F5BE .align 2, 0 .pool -_0814EAF8: +@0814EAF8: ldr r4, =0x0202420b ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 adds r2, r4, 0 cmp r0, 0 - beq _0814EB74 + beq @0814EB74 ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x8 ands r1, r0 ldr r4, =0x085cbd85 cmp r1, 0 - beq _0814EB36 + beq @0814EB36 ldr r4, =0x085cbd8b - b _0814EB36 + b @0814EB36 .align 2, 0 .pool -_0814EB2C: +@0814EB2C: mov r3, r8 adds r0, r3, r6 strb r1, [r0] adds r6, 0x1 adds r4, 0x1 -_0814EB36: +@0814EB36: ldrb r1, [r4] adds r0, r1, 0 cmp r0, 0xFF - bne _0814EB2C + bne @0814EB2C ldrb r0, [r2] bl battle_get_per_side_status adds r1, r0, 0 @@ -644338,10 +644338,10 @@ _0814EB36: movs r1, 0x2 mov r2, sp bl pokemon_getattr - b _0814EB9E + b @0814EB9E .align 2, 0 .pool -_0814EB74: +@0814EB74: ldrb r0, [r2] bl battle_get_per_side_status adds r1, r0, 0 @@ -644360,19 +644360,19 @@ _0814EB74: movs r1, 0x2 mov r2, sp bl pokemon_getattr -_0814EB9E: +@0814EB9E: mov r0, sp bl get_end_of_string_ptr_limit_10_chars - bl _0814F5BE + bl @0814F5BE .align 2, 0 .pool -_0814EBB0: +@0814EBB0: ldr r4, =0x0202420b ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0814EBF8 + bne @0814EBF8 ldrb r0, [r4] bl battle_get_per_side_status adds r1, r0, 0 @@ -644392,10 +644392,10 @@ _0814EBB0: movs r1, 0x2 mov r2, sp bl pokemon_getattr - b _0814EC24 + b @0814EC24 .align 2, 0 .pool -_0814EBF8: +@0814EBF8: ldrb r0, [r4] bl battle_get_per_side_status adds r1, r0, 0 @@ -644415,28 +644415,28 @@ _0814EBF8: movs r1, 0x2 mov r2, sp bl pokemon_getattr -_0814EC24: +@0814EC24: mov r0, sp bl get_end_of_string_ptr_limit_10_chars - bl _0814F5BE + bl @0814F5BE .align 2, 0 .pool -_0814EC38: +@0814EC38: ldr r5, =0x0202420b ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0814ECA8 + beq @0814ECA8 ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x8 ands r1, r0 ldr r4, =0x085cbd85 cmp r1, 0 - beq _0814EC56 + beq @0814EC56 ldr r4, =0x085cbd8b -_0814EC56: +@0814EC56: ldrb r1, [r4] adds r0, r1, 0 ldr r3, =0x0202406e @@ -644444,8 +644444,8 @@ _0814EC56: mov r12, r2 adds r2, r5, 0 cmp r0, 0xFF - beq _0814EC78 -_0814EC66: + beq @0814EC78 +@0814EC66: mov r5, r8 adds r0, r5, r6 strb r1, [r0] @@ -644454,8 +644454,8 @@ _0814EC66: ldrb r1, [r4] adds r0, r1, 0 cmp r0, 0xFF - bne _0814EC66 -_0814EC78: + bne @0814EC66 +@0814EC78: ldrb r0, [r2] lsls r0, 1 adds r0, r3 @@ -644466,10 +644466,10 @@ _0814EC78: movs r1, 0x2 mov r2, sp bl pokemon_getattr - b _0814ECC2 + b @0814ECC2 .align 2, 0 .pool -_0814ECA8: +@0814ECA8: ldr r1, =0x0202406e ldrb r0, [r5] lsls r0, 1 @@ -644482,28 +644482,28 @@ _0814ECA8: movs r1, 0x2 mov r2, sp bl pokemon_getattr -_0814ECC2: +@0814ECC2: mov r0, sp bl get_end_of_string_ptr_limit_10_chars - bl _0814F5BE + bl @0814F5BE .align 2, 0 .pool -_0814ECD4: +@0814ECD4: ldr r5, =0x0202420c ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0814ED44 + beq @0814ED44 ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x8 ands r1, r0 ldr r4, =0x085cbd85 cmp r1, 0 - beq _0814ECF2 + beq @0814ECF2 ldr r4, =0x085cbd8b -_0814ECF2: +@0814ECF2: ldrb r1, [r4] adds r0, r1, 0 ldr r3, =0x0202406e @@ -644511,8 +644511,8 @@ _0814ECF2: mov r12, r2 adds r2, r5, 0 cmp r0, 0xFF - beq _0814ED14 -_0814ED02: + beq @0814ED14 +@0814ED02: mov r5, r8 adds r0, r5, r6 strb r1, [r0] @@ -644521,8 +644521,8 @@ _0814ED02: ldrb r1, [r4] adds r0, r1, 0 cmp r0, 0xFF - bne _0814ED02 -_0814ED14: + bne @0814ED02 +@0814ED14: ldrb r0, [r2] lsls r0, 1 adds r0, r3 @@ -644533,10 +644533,10 @@ _0814ED14: movs r1, 0x2 mov r2, sp bl pokemon_getattr - b _0814ED5E + b @0814ED5E .align 2, 0 .pool -_0814ED44: +@0814ED44: ldr r1, =0x0202406e ldrb r0, [r5] lsls r0, 1 @@ -644549,28 +644549,28 @@ _0814ED44: movs r1, 0x2 mov r2, sp bl pokemon_getattr -_0814ED5E: +@0814ED5E: mov r0, sp bl get_end_of_string_ptr_limit_10_chars - bl _0814F5BE + bl @0814F5BE .align 2, 0 .pool -_0814ED70: +@0814ED70: ldr r5, =0x0202420e ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0814EDE0 + beq @0814EDE0 ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x8 ands r1, r0 ldr r4, =0x085cbd85 cmp r1, 0 - beq _0814ED8E + beq @0814ED8E ldr r4, =0x085cbd8b -_0814ED8E: +@0814ED8E: ldrb r1, [r4] adds r0, r1, 0 ldr r3, =0x0202406e @@ -644578,8 +644578,8 @@ _0814ED8E: mov r12, r2 adds r2, r5, 0 cmp r0, 0xFF - beq _0814EDB0 -_0814ED9E: + beq @0814EDB0 +@0814ED9E: mov r5, r8 adds r0, r5, r6 strb r1, [r0] @@ -644588,8 +644588,8 @@ _0814ED9E: ldrb r1, [r4] adds r0, r1, 0 cmp r0, 0xFF - bne _0814ED9E -_0814EDB0: + bne @0814ED9E +@0814EDB0: ldrb r0, [r2] lsls r0, 1 adds r0, r3 @@ -644600,10 +644600,10 @@ _0814EDB0: movs r1, 0x2 mov r2, sp bl pokemon_getattr - b _0814EDFA + b @0814EDFA .align 2, 0 .pool -_0814EDE0: +@0814EDE0: ldr r1, =0x0202406e ldrb r0, [r5] lsls r0, 1 @@ -644616,28 +644616,28 @@ _0814EDE0: movs r1, 0x2 mov r2, sp bl pokemon_getattr -_0814EDFA: +@0814EDFA: mov r0, sp bl get_end_of_string_ptr_limit_10_chars - bl _0814F5BE + bl @0814F5BE .align 2, 0 .pool -_0814EE0C: +@0814EE0C: ldr r5, =0x02024064 ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0814EE7C + beq @0814EE7C ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x8 ands r1, r0 ldr r4, =0x085cbd85 cmp r1, 0 - beq _0814EE2A + beq @0814EE2A ldr r4, =0x085cbd8b -_0814EE2A: +@0814EE2A: ldrb r1, [r4] adds r0, r1, 0 ldr r3, =0x0202406e @@ -644645,8 +644645,8 @@ _0814EE2A: mov r12, r2 adds r2, r5, 0 cmp r0, 0xFF - beq _0814EE4C -_0814EE3A: + beq @0814EE4C +@0814EE3A: mov r5, r8 adds r0, r5, r6 strb r1, [r0] @@ -644655,8 +644655,8 @@ _0814EE3A: ldrb r1, [r4] adds r0, r1, 0 cmp r0, 0xFF - bne _0814EE3A -_0814EE4C: + bne @0814EE3A +@0814EE4C: ldrb r0, [r2] lsls r0, 1 adds r0, r3 @@ -644667,10 +644667,10 @@ _0814EE4C: movs r1, 0x2 mov r2, sp bl pokemon_getattr - b _0814EE96 + b @0814EE96 .align 2, 0 .pool -_0814EE7C: +@0814EE7C: ldr r1, =0x0202406e ldrb r0, [r5] lsls r0, 1 @@ -644683,28 +644683,28 @@ _0814EE7C: movs r1, 0x2 mov r2, sp bl pokemon_getattr -_0814EE96: +@0814EE96: mov r0, sp bl get_end_of_string_ptr_limit_10_chars - b _0814F5BE + b @0814F5BE .align 2, 0 .pool -_0814EEA8: +@0814EEA8: ldr r5, =0x02024474 ldrb r0, [r5, 0x17] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0814EF18 + beq @0814EF18 ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x8 ands r1, r0 ldr r4, =0x085cbd85 cmp r1, 0 - beq _0814EEC6 + beq @0814EEC6 ldr r4, =0x085cbd8b -_0814EEC6: +@0814EEC6: ldrb r1, [r4] adds r0, r1, 0 ldr r3, =0x0202406e @@ -644712,8 +644712,8 @@ _0814EEC6: mov r12, r2 adds r2, r5, 0 cmp r0, 0xFF - beq _0814EEE8 -_0814EED6: + beq @0814EEE8 +@0814EED6: mov r5, r8 adds r0, r5, r6 strb r1, [r0] @@ -644722,8 +644722,8 @@ _0814EED6: ldrb r1, [r4] adds r0, r1, 0 cmp r0, 0xFF - bne _0814EED6 -_0814EEE8: + bne @0814EED6 +@0814EEE8: ldrb r0, [r2, 0x17] lsls r0, 1 adds r0, r3 @@ -644734,10 +644734,10 @@ _0814EEE8: movs r1, 0x2 mov r2, sp bl pokemon_getattr - b _0814EF32 + b @0814EF32 .align 2, 0 .pool -_0814EF18: +@0814EF18: ldr r1, =0x0202406e ldrb r0, [r5, 0x17] lsls r0, 1 @@ -644750,33 +644750,33 @@ _0814EF18: movs r1, 0x2 mov r2, sp bl pokemon_getattr -_0814EF32: +@0814EF32: mov r0, sp bl get_end_of_string_ptr_limit_10_chars - b _0814F5BE + b @0814F5BE .align 2, 0 .pool -_0814EF44: +@0814EF44: ldr r0, =0x0203aba8 ldr r2, [r0] ldrh r1, [r2] movs r0, 0xB1 lsls r0, 1 cmp r1, r0 - bhi _0814EF6A + bhi @0814EF6A ldrh r1, [r2] - b _0814EF8A + b @0814EF8A .align 2, 0 .pool -_0814EF5C: +@0814EF5C: ldr r0, =0x0203aba8 ldr r2, [r0] ldrh r1, [r2, 0x2] movs r0, 0xB1 lsls r0, 1 cmp r1, r0 - bls _0814EF88 -_0814EF6A: + bls @0814EF88 +@0814EF6A: ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x8E @@ -644785,56 +644785,56 @@ _0814EF6A: adds r0, r1 ldr r1, =0x085ccbbc adds r4, r0, r1 - b _0814F5C0 + b @0814F5C0 .align 2, 0 .pool -_0814EF88: +@0814EF88: ldrh r1, [r2, 0x2] -_0814EF8A: +@0814EF8A: movs r0, 0xD muls r1, r0 ldr r0, =0x0831977c adds r4, r1, r0 - b _0814F5C0 + b @0814F5C0 .align 2, 0 .pool -_0814EF98: +@0814EF98: ldr r0, =0x02022fec ldr r1, [r0] ldr r0, =0x02000002 ands r0, r1 cmp r0, 0 - beq _0814F06E + beq @0814F06E ldr r2, =0x02024208 ldrh r0, [r2] cmp r0, 0xAF - bne _0814F064 + bne @0814F064 movs r0, 0x40 ands r1, r0 cmp r1, 0 - bne _0814F014 + bne @0814F014 ldr r0, =0x02024474 adds r0, 0x25 ldrb r0, [r0] cmp r0, 0 - beq _0814EFE0 + beq @0814EFE0 ldr r2, =0x0202420f ldrb r1, [r2] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0814EFEC - b _0814F05C + bne @0814EFEC + b @0814F05C .align 2, 0 .pool -_0814EFE0: +@0814EFE0: ldr r2, =0x0202420f ldrb r1, [r2] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0814F05C -_0814EFEC: + bne @0814F05C +@0814EFEC: ldrb r0, [r2] lsls r1, r0, 3 subs r1, r0 @@ -644846,10 +644846,10 @@ _0814EFEC: ldr r1, =0x085cc0ad mov r0, sp bl gf_strcat - b _0814F5BE + b @0814F5BE .align 2, 0 .pool -_0814F014: +@0814F014: ldr r2, =0x020229e8 ldr r0, =0x02024474 adds r0, 0x25 @@ -644862,7 +644862,7 @@ _0814F014: ldrb r2, [r1] ldrh r0, [r0, 0x18] cmp r0, r2 - bne _0814F05C + bne @0814F05C lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -644873,127 +644873,127 @@ _0814F014: ldr r1, =0x085cc0ad mov r0, sp bl gf_strcat - b _0814F5BE + b @0814F5BE .align 2, 0 .pool -_0814F05C: +@0814F05C: ldr r4, =0x085cc0a0 - b _0814F5C0 + b @0814F5C0 .align 2, 0 .pool -_0814F064: +@0814F064: ldrh r0, [r2] mov r1, sp bl itemid_get_name - b _0814F5BE -_0814F06E: + b @0814F5BE +@0814F06E: ldr r0, =0x02024208 ldrh r0, [r0] mov r1, sp bl itemid_get_name - b _0814F5BE + b @0814F5BE .align 2, 0 .pool -_0814F080: +@0814F080: ldr r0, =0x0202420a - b _0814F0C0 + b @0814F0C0 .align 2, 0 .pool -_0814F088: +@0814F088: ldr r1, =0x0203aba4 ldr r0, =0x0202420b - b _0814F0BC + b @0814F0BC .align 2, 0 .pool -_0814F098: +@0814F098: ldr r1, =0x0203aba4 ldr r0, =0x0202420c - b _0814F0BC + b @0814F0BC .align 2, 0 .pool -_0814F0A8: +@0814F0A8: ldr r1, =0x0203aba4 ldr r0, =0x02024474 ldrb r0, [r0, 0x17] - b _0814F0BE + b @0814F0BE .align 2, 0 .pool -_0814F0B8: +@0814F0B8: ldr r1, =0x0203aba4 ldr r0, =0x0202420e -_0814F0BC: +@0814F0BC: ldrb r0, [r0] -_0814F0BE: +@0814F0BE: adds r0, r1 -_0814F0C0: +@0814F0C0: ldrb r1, [r0] movs r0, 0xD muls r1, r0 ldr r0, =0x0831b6db adds r4, r1, r0 - b _0814F5C0 + b @0814F5C0 .align 2, 0 .pool -_0814F0D8: +@0814F0D8: ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 lsls r0, 20 ands r0, r1 cmp r0, 0 - beq _0814F0F0 + beq @0814F0F0 bl sub_806B870 - b _0814F59C + b @0814F59C .align 2, 0 .pool -_0814F0F0: +@0814F0F0: ldr r3, =0x02038bca ldrh r2, [r3] movs r0, 0xC0 lsls r0, 4 cmp r2, r0 - bne _0814F10C + bne @0814F10C bl sub_8068BB0 lsls r0, 16 lsrs r0, 16 - b _0814F5A0 + b @0814F5A0 .align 2, 0 .pool -_0814F10C: +@0814F10C: ldr r0, =0x000003fe cmp r2, r0 - bne _0814F11C + bne @0814F11C bl sub_81A4D00 - b _0814F59C + b @0814F59C .align 2, 0 .pool -_0814F11C: +@0814F11C: ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 - beq _0814F12C + beq @0814F12C ldrh r0, [r3] - b _0814F598 + b @0814F598 .align 2, 0 .pool -_0814F12C: +@0814F12C: movs r0, 0x80 lsls r0, 19 ands r0, r1 cmp r0, 0 - beq _0814F13E + beq @0814F13E ldrh r0, [r3] bl sub_81D5530 - b _0814F59C -_0814F13E: + b @0814F59C +@0814F13E: movs r0, 0x80 lsls r0, 4 ands r1, r0 cmp r1, 0 - beq _0814F14E + beq @0814F14E bl sub_8165264 - b _0814F59C -_0814F14E: + b @0814F59C +@0814F14E: ldr r2, =0x08310030 ldrh r1, [r3] lsls r0, r1, 2 @@ -645002,21 +645002,21 @@ _0814F14E: adds r0, r2 ldrb r1, [r0, 0x1] movs r0, 0xD - b _0814F5A2 + b @0814F5A2 .align 2, 0 .pool -_0814F164: +@0814F164: ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 lsls r0, 20 ands r0, r1 cmp r0, 0 - beq _0814F1AC + beq @0814F1AC movs r2, 0 ldr r4, =0x020244a8 ldr r3, [r4] -_0814F178: +@0814F178: mov r1, sp adds r0, r1, r2 ldr r1, [r3] @@ -645026,7 +645026,7 @@ _0814F178: strb r1, [r0] adds r2, 0x1 cmp r2, 0x6 - ble _0814F178 + ble @0814F178 mov r3, sp adds r1, r3, r2 movs r0, 0xFF @@ -645036,79 +645036,79 @@ _0814F178: ldrb r1, [r0, 0xD] mov r0, sp bl sub_8009308 - b _0814F5BE + b @0814F5BE .align 2, 0 .pool -_0814F1AC: +@0814F1AC: ldr r3, =0x02038bca ldrh r2, [r3] movs r0, 0xC0 lsls r0, 4 cmp r2, r0 - bne _0814F1C4 + bne @0814F1C4 movs r1, 0x1 adds r0, r7, 0 eors r0, r1 - b _0814F284 + b @0814F284 .align 2, 0 .pool -_0814F1C4: +@0814F1C4: ldr r0, =0x000003fe cmp r2, r0 - bne _0814F1D8 + bne @0814F1D8 mov r0, sp bl sub_81A4D50 - b _0814F5BE + b @0814F5BE .align 2, 0 .pool -_0814F1D8: +@0814F1D8: ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 - beq _0814F1E8 + beq @0814F1E8 ldrh r1, [r3] - b _0814F5B8 + b @0814F5B8 .align 2, 0 .pool -_0814F1E8: +@0814F1E8: movs r0, 0x80 lsls r0, 19 ands r0, r1 cmp r0, 0 - beq _0814F1FC + beq @0814F1FC ldrh r1, [r3] mov r0, sp bl sub_81D5554 - b _0814F5BE -_0814F1FC: + b @0814F5BE +@0814F1FC: movs r0, 0x80 lsls r0, 4 ands r1, r0 cmp r1, 0 - beq _0814F20E + beq @0814F20E mov r0, sp bl sub_8165284 - b _0814F5BE -_0814F20E: + b @0814F5BE +@0814F20E: ldrh r0, [r3] lsls r1, r0, 2 adds r1, r0 lsls r1, 3 ldr r0, =0x08310034 adds r4, r1, r0 - b _0814F5C0 + b @0814F5C0 .align 2, 0 .pool -_0814F220: +@0814F220: lsls r0, r7, 3 subs r0, r7 lsls r0, 2 ldr r1, =0x020229f0 adds r4, r0, r1 - b _0814F5C0 + b @0814F5C0 .align 2, 0 .pool -_0814F230: +@0814F230: ldr r4, =0x020229e8 lsls r0, r7, 3 subs r0, r7 @@ -645116,10 +645116,10 @@ _0814F230: adds r0, r4 ldrh r1, [r0, 0x18] movs r0, 0x2 - b _0814F266 + b @0814F266 .align 2, 0 .pool -_0814F244: +@0814F244: ldr r4, =0x020229e8 lsls r0, r7, 3 subs r0, r7 @@ -645127,10 +645127,10 @@ _0814F244: adds r0, r4 ldrh r1, [r0, 0x18] movs r0, 0x1 - b _0814F266 + b @0814F266 .align 2, 0 .pool -_0814F258: +@0814F258: ldr r4, =0x020229e8 lsls r0, r7, 3 subs r0, r7 @@ -645138,7 +645138,7 @@ _0814F258: adds r0, r4 ldrh r1, [r0, 0x18] movs r0, 0x3 -_0814F266: +@0814F266: eors r0, r1 bl sub_806D864 lsls r1, r0, 3 @@ -645146,116 +645146,116 @@ _0814F266: lsls r1, 2 adds r4, 0x8 adds r4, r1, r4 - b _0814F5C0 + b @0814F5C0 .align 2, 0 .pool -_0814F27C: +@0814F27C: ldr r0, =0x02024474 ldrb r0, [r0, 0x17] bl sub_806D864 -_0814F284: +@0814F284: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 ldr r0, =0x020229f0 adds r4, r1, r0 - b _0814F5C0 + b @0814F5C0 .align 2, 0 .pool -_0814F298: +@0814F298: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 - beq _0814F2B4 + beq @0814F2B4 ldr r4, =0x020229f0 - b _0814F5C0 + b @0814F5C0 .align 2, 0 .pool -_0814F2B4: +@0814F2B4: ldr r0, =0x03005d90 ldr r4, [r0] - b _0814F5C0 + b @0814F5C0 .align 2, 0 .pool -_0814F2C0: +@0814F2C0: ldr r0, =0x02022fec ldr r1, [r0] ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 - beq _0814F2E0 + beq @0814F2E0 ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0x2 - b _0814F55A + b @0814F55A .align 2, 0 .pool -_0814F2E0: +@0814F2E0: movs r0, 0x80 lsls r0, 19 ands r1, r0 cmp r1, 0 - beq _0814F2F8 + beq @0814F2F8 ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0x4 - b _0814F584 + b @0814F584 .align 2, 0 .pool -_0814F2F8: +@0814F2F8: bl sub_80B1CA4 adds r4, r0, 0 - b _0814F5C0 -_0814F300: + b @0814F5C0 +@0814F300: ldr r0, =0x02022fec ldr r1, [r0] ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 - beq _0814F31C + beq @0814F31C ldr r0, =0x02038bca - b _0814F556 + b @0814F556 .align 2, 0 .pool -_0814F31C: +@0814F31C: movs r0, 0x80 lsls r0, 19 ands r1, r0 cmp r1, 0 - bne _0814F328 - b _0814F5C0 -_0814F328: + bne @0814F328 + b @0814F5C0 +@0814F328: ldr r0, =0x02038bca - b _0814F580 + b @0814F580 .align 2, 0 .pool -_0814F330: +@0814F330: ldr r0, =0x02024474 ldrb r0, [r0, 0x17] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0814F39C + beq @0814F39C ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x8 ands r1, r0 ldr r4, =0x085cbd85 cmp r1, 0 - beq _0814F34E + beq @0814F34E ldr r4, =0x085cbd8b -_0814F34E: +@0814F34E: ldrb r1, [r4] adds r0, r1, 0 ldr r5, =0x02024744 mov r12, r5 ldr r2, =0x0202449c cmp r0, 0xFF - beq _0814F36E -_0814F35C: + beq @0814F36E +@0814F35C: mov r3, r8 adds r0, r3, r6 strb r1, [r0] @@ -645264,8 +645264,8 @@ _0814F35C: ldrb r1, [r4] adds r0, r1, 0 cmp r0, 0xFF - bne _0814F35C -_0814F36E: + bne @0814F35C +@0814F36E: ldr r0, [r2] adds r0, 0x52 ldrb r1, [r0] @@ -645275,10 +645275,10 @@ _0814F36E: movs r1, 0x2 mov r2, sp bl pokemon_getattr - b _0814F3B4 + b @0814F3B4 .align 2, 0 .pool -_0814F39C: +@0814F39C: ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x52 @@ -645290,109 +645290,109 @@ _0814F39C: movs r1, 0x2 mov r2, sp bl pokemon_getattr -_0814F3B4: +@0814F3B4: mov r0, sp bl get_end_of_string_ptr_limit_10_chars - b _0814F5BE + b @0814F5BE .align 2, 0 .pool -_0814F3C4: +@0814F3C4: ldr r0, =0x000008ab bl flag_check lsls r0, 24 ldr r4, =0x085cc015 cmp r0, 0 - bne _0814F3D4 - b _0814F5C0 -_0814F3D4: + bne @0814F3D4 + b @0814F5C0 +@0814F3D4: ldr r4, =0x085cc01f - b _0814F5C0 + b @0814F5C0 .align 2, 0 .pool -_0814F3E4: +@0814F3E4: ldr r0, =0x0202420b - b _0814F3EE + b @0814F3EE .align 2, 0 .pool -_0814F3EC: +@0814F3EC: ldr r0, =0x0202420c -_0814F3EE: +@0814F3EE: ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 ldr r4, =0x085cbd9a cmp r0, 0 - beq _0814F3FE - b _0814F5C0 -_0814F3FE: + beq @0814F3FE + b @0814F5C0 +@0814F3FE: ldr r4, =0x085cbd9e - b _0814F5C0 + b @0814F5C0 .align 2, 0 .pool -_0814F410: +@0814F410: ldr r0, =0x0202420b - b _0814F41A + b @0814F41A .align 2, 0 .pool -_0814F418: +@0814F418: ldr r0, =0x0202420c -_0814F41A: +@0814F41A: ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 ldr r4, =0x085cbd91 cmp r0, 0 - beq _0814F42A - b _0814F5C0 -_0814F42A: + beq @0814F42A + b @0814F5C0 +@0814F42A: ldr r4, =0x085cbd95 - b _0814F5C0 + b @0814F5C0 .align 2, 0 .pool -_0814F43C: +@0814F43C: ldr r0, =0x0202420b - b _0814F446 + b @0814F446 .align 2, 0 .pool -_0814F444: +@0814F444: ldr r0, =0x0202420c -_0814F446: +@0814F446: ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 ldr r4, =0x085cbda3 cmp r0, 0 - beq _0814F456 - b _0814F5C0 -_0814F456: + beq @0814F456 + b @0814F5C0 +@0814F456: ldr r4, =0x085cbda7 - b _0814F5C0 + b @0814F5C0 .align 2, 0 .pool -_0814F468: +@0814F468: ldr r0, =0x02022fec ldr r1, [r0] ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 - beq _0814F484 + beq @0814F484 ldr r0, =0x02038bcc - b _0814F596 + b @0814F596 .align 2, 0 .pool -_0814F484: +@0814F484: movs r0, 0x80 lsls r0, 19 ands r1, r0 cmp r1, 0 - beq _0814F49C + beq @0814F49C ldr r0, =0x02038bcc ldrh r0, [r0] bl sub_81D5530 - b _0814F59C + b @0814F59C .align 2, 0 .pool -_0814F49C: +@0814F49C: ldr r2, =0x08310030 ldr r0, =0x02038bcc ldrh r1, [r0] @@ -645402,34 +645402,34 @@ _0814F49C: adds r0, r2 ldrb r1, [r0, 0x1] movs r0, 0xD - b _0814F5A2 + b @0814F5A2 .align 2, 0 .pool -_0814F4B8: +@0814F4B8: ldr r0, =0x02022fec ldr r1, [r0] ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 - beq _0814F4D4 + beq @0814F4D4 ldr r0, =0x02038bcc - b _0814F5B6 + b @0814F5B6 .align 2, 0 .pool -_0814F4D4: +@0814F4D4: movs r0, 0x80 lsls r0, 19 ands r1, r0 cmp r1, 0 - beq _0814F4F0 + beq @0814F4F0 ldr r0, =0x02038bcc ldrh r1, [r0] mov r0, sp bl sub_81D5554 - b _0814F5BE + b @0814F5BE .align 2, 0 .pool -_0814F4F0: +@0814F4F0: ldr r0, =0x02038bcc ldrh r1, [r0] lsls r0, r1, 2 @@ -645437,99 +645437,99 @@ _0814F4F0: lsls r0, 3 ldr r1, =0x08310034 adds r4, r0, r1 - b _0814F5C0 + b @0814F5C0 .align 2, 0 .pool -_0814F508: +@0814F508: ldr r0, =0x02022fec ldr r1, [r0] ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 - beq _0814F528 + beq @0814F528 ldr r0, =0x02038bcc ldrh r1, [r0] movs r0, 0x2 - b _0814F55A + b @0814F55A .align 2, 0 .pool -_0814F528: +@0814F528: movs r0, 0x80 lsls r0, 19 ands r1, r0 cmp r1, 0 - beq _0814F540 + beq @0814F540 ldr r0, =0x02038bcc ldrh r1, [r0] movs r0, 0x4 - b _0814F584 + b @0814F584 .align 2, 0 .pool -_0814F540: +@0814F540: bl sub_80B1CE0 adds r4, r0, 0 - b _0814F5C0 -_0814F548: + b @0814F5C0 +@0814F548: ldr r0, =0x02022fec ldr r1, [r0] ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 - beq _0814F574 + beq @0814F574 ldr r0, =0x02038bcc -_0814F556: +@0814F556: ldrh r1, [r0] movs r0, 0x1 -_0814F55A: +@0814F55A: bl sub_81A36D0 ldr r4, =0x02021fc4 - b _0814F5C0 + b @0814F5C0 .align 2, 0 .pool -_0814F574: +@0814F574: movs r0, 0x80 lsls r0, 19 ands r1, r0 cmp r1, 0 - beq _0814F5C0 + beq @0814F5C0 ldr r0, =0x02038bcc -_0814F580: +@0814F580: ldrh r1, [r0] movs r0, 0x3 -_0814F584: +@0814F584: bl sub_81D572C ldr r4, =0x02021fc4 - b _0814F5C0 + b @0814F5C0 .align 2, 0 .pool -_0814F594: +@0814F594: ldr r0, =0x02038bce -_0814F596: +@0814F596: ldrh r0, [r0] -_0814F598: +@0814F598: bl sub_8162BD8 -_0814F59C: +@0814F59C: lsls r0, 24 lsrs r0, 24 -_0814F5A0: +@0814F5A0: movs r1, 0xD -_0814F5A2: +@0814F5A2: muls r1, r0 ldr r0, =0x0830fcd4 adds r4, r1, r0 - b _0814F5C0 + b @0814F5C0 .align 2, 0 .pool -_0814F5B4: +@0814F5B4: ldr r0, =0x02038bce -_0814F5B6: +@0814F5B6: ldrh r1, [r0] -_0814F5B8: +@0814F5B8: mov r0, sp bl sub_8162E20 -_0814F5BE: +@0814F5BE: mov r4, sp -_0814F5C0: +@0814F5C0: ldrb r1, [r4] adds r0, r1, 0 mov r5, r9 @@ -645537,8 +645537,8 @@ _0814F5C0: mov r3, r9 adds r3, 0x1 cmp r0, 0xFF - beq _0814F5E2 -_0814F5D0: + beq @0814F5E2 +@0814F5D0: mov r5, r8 adds r0, r5, r6 strb r1, [r0] @@ -645547,19 +645547,19 @@ _0814F5D0: ldrb r1, [r4] adds r0, r1, 0 cmp r0, 0xFF - bne _0814F5D0 -_0814F5E2: + bne @0814F5D0 +@0814F5E2: lsls r0, r2, 24 lsrs r0, 24 cmp r0, 0x24 - beq _0814F5F6 + beq @0814F5F6 cmp r0, 0x30 - beq _0814F5F6 + beq @0814F5F6 cmp r0, 0x25 - beq _0814F5F6 + beq @0814F5F6 cmp r0, 0x31 - bne _0814F61C -_0814F5F6: + bne @0814F61C +@0814F5F6: mov r0, r8 adds r1, r0, r6 movs r0, 0xFC @@ -645570,25 +645570,25 @@ _0814F5F6: movs r0, 0x9 strb r0, [r1] adds r6, 0x1 - b _0814F61C + b @0814F61C .align 2, 0 .pool -_0814F610: +@0814F610: mov r3, r8 adds r0, r3, r6 strb r1, [r0] adds r6, 0x1 mov r3, r9 adds r3, 0x1 -_0814F61C: +@0814F61C: mov r9, r3 ldrb r1, [r3] -_0814F620: +@0814F620: adds r0, r1, 0 cmp r0, 0xFF - beq _0814F62A - bl _0814E7A4 -_0814F62A: + beq @0814F62A + bl @0814E7A4 +@0814F62A: mov r5, r8 adds r1, r5, r6 mov r2, r9 @@ -645606,7 +645606,7 @@ _0814F62A: thumb_func_end sub_814E764 thumb_func_start sub_814F648 -sub_814F648: @ 814F648 +sub_814F648: ; 814F648 push {r4-r7,lr} mov r7, r8 push {r7} @@ -645620,37 +645620,37 @@ sub_814F648: @ 814F648 strb r0, [r6] ldrb r0, [r7, 0x1] cmp r0, 0xFF - bne _0814F666 - b _0814F8EA -_0814F666: + bne @0814F666 + b @0814F8EA +@0814F666: adds r0, r7, r5 ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0xA - bls _0814F672 - b _0814F8E0 -_0814F672: + bls @0814F672 + b @0814F8E0 +@0814F672: lsls r0, r1, 2 - ldr r1, =_0814F680 + ldr r1, =@0814F680 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0814F680: - .4byte _0814F6AC - .4byte _0814F6C8 - .4byte _0814F71C - .4byte _0814F734 - .4byte _0814F744 - .4byte _0814F7BC - .4byte _0814F7D0 - .4byte _0814F7E2 - .4byte _0814F828 - .4byte _0814F83C - .4byte _0814F858 -_0814F6AC: +@0814F680: + .4byte @0814F6AC + .4byte @0814F6C8 + .4byte @0814F71C + .4byte @0814F734 + .4byte @0814F744 + .4byte @0814F7BC + .4byte @0814F7D0 + .4byte @0814F7E2 + .4byte @0814F828 + .4byte @0814F83C + .4byte @0814F858 +@0814F6AC: adds r0, r5, r7 ldrb r1, [r0, 0x1] ldrb r0, [r0, 0x2] @@ -645661,32 +645661,32 @@ _0814F6AC: lsls r1, 2 adds r1, r0 ldr r1, [r1] - b _0814F8BE + b @0814F8BE .align 2, 0 .pool -_0814F6C8: +@0814F6C8: ldrb r0, [r4, 0x1] cmp r0, 0x2 - beq _0814F6E4 + beq @0814F6E4 cmp r0, 0x2 - bgt _0814F6D8 + bgt @0814F6D8 cmp r0, 0x1 - beq _0814F6DE - b _0814F706 -_0814F6D8: + beq @0814F6DE + b @0814F706 +@0814F6D8: cmp r0, 0x4 - beq _0814F6EC - b _0814F706 -_0814F6DE: + beq @0814F6EC + b @0814F706 +@0814F6DE: ldrb r4, [r4, 0x3] mov r8, r4 - b _0814F706 -_0814F6E4: + b @0814F706 +@0814F6E4: ldrb r1, [r4, 0x3] ldrb r0, [r4, 0x4] lsls r0, 8 - b _0814F702 -_0814F6EC: + b @0814F702 +@0814F6EC: ldrb r0, [r4, 0x3] mov r8, r0 ldrb r0, [r4, 0x4] @@ -645698,10 +645698,10 @@ _0814F6EC: orrs r1, r0 ldrb r0, [r4, 0x6] lsls r0, 24 -_0814F702: +@0814F702: orrs r1, r0 mov r8, r1 -_0814F706: +@0814F706: adds r4, r5, r7 ldrb r3, [r4, 0x2] adds r0, r6, 0 @@ -645711,8 +645711,8 @@ _0814F706: adds r0, r5, 0x3 ldrb r4, [r4, 0x1] adds r5, r0, r4 - b _0814F8E0 -_0814F71C: + b @0814F8E0 +@0814F71C: adds r0, r5, r7 ldrb r1, [r0, 0x1] ldrb r0, [r0, 0x2] @@ -645722,24 +645722,24 @@ _0814F71C: muls r1, r0 ldr r0, =0x0831977c adds r1, r0 - b _0814F8BE + b @0814F8BE .align 2, 0 .pool -_0814F734: +@0814F734: adds r0, r5, r7 ldrb r0, [r0, 0x1] lsls r1, r0, 3 subs r1, r0 ldr r0, =0x0831ae38 - b _0814F846 + b @0814F846 .align 2, 0 .pool -_0814F744: +@0814F744: ldrb r0, [r4, 0x1] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0814F768 + bne @0814F768 ldrb r1, [r4, 0x2] movs r0, 0x64 muls r0, r1 @@ -645748,27 +645748,27 @@ _0814F744: movs r1, 0x2 mov r2, sp bl pokemon_getattr - b _0814F7A4 + b @0814F7A4 .align 2, 0 .pool -_0814F768: +@0814F768: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x8 ands r0, r1 cmp r0, 0 - beq _0814F788 + beq @0814F788 ldr r1, =0x085cbd8b adds r0, r6, 0 bl gf_strcat - b _0814F790 + b @0814F790 .align 2, 0 .pool -_0814F788: +@0814F788: ldr r1, =0x085cbd85 adds r0, r6, 0 bl gf_strcat -_0814F790: +@0814F790: adds r0, r5, r7 ldrb r1, [r0, 0x2] movs r0, 0x64 @@ -645778,26 +645778,26 @@ _0814F790: movs r1, 0x2 mov r2, sp bl pokemon_getattr -_0814F7A4: +@0814F7A4: mov r0, sp bl get_end_of_string_ptr_limit_10_chars adds r0, r6, 0 mov r1, sp bl gf_strcat - b _0814F8DE + b @0814F8DE .align 2, 0 .pool -_0814F7BC: +@0814F7BC: ldr r1, =0x085cbe00 adds r0, r5, r7 ldrb r0, [r0, 0x1] lsls r0, 2 adds r0, r1 ldr r1, [r0] - b _0814F848 + b @0814F848 .align 2, 0 .pool -_0814F7D0: +@0814F7D0: adds r0, r5, r7 ldrb r1, [r0, 0x1] ldrb r0, [r0, 0x2] @@ -645805,14 +645805,14 @@ _0814F7D0: orrs r1, r0 adds r0, r6, 0 bl get_pokemon_name - b _0814F8DE -_0814F7E2: + b @0814F8DE +@0814F7E2: adds r4, r5, r7 ldrb r0, [r4, 0x1] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0814F808 + bne @0814F808 ldrb r1, [r4, 0x2] movs r0, 0x64 muls r0, r1 @@ -645821,10 +645821,10 @@ _0814F7E2: movs r1, 0x2 adds r2, r6, 0 bl pokemon_getattr - b _0814F81A + b @0814F81A .align 2, 0 .pool -_0814F808: +@0814F808: ldrb r1, [r4, 0x2] movs r0, 0x64 muls r0, r1 @@ -645833,38 +645833,38 @@ _0814F808: movs r1, 0x2 adds r2, r6, 0 bl pokemon_getattr -_0814F81A: +@0814F81A: adds r0, r6, 0 bl get_end_of_string_ptr_limit_10_chars - b _0814F8DE + b @0814F8DE .align 2, 0 .pool -_0814F828: +@0814F828: ldr r1, =0x085cbe6c adds r0, r5, r7 ldrb r0, [r0, 0x1] lsls r0, 2 adds r0, r1 ldr r1, [r0] - b _0814F848 + b @0814F848 .align 2, 0 .pool -_0814F83C: +@0814F83C: adds r0, r5, r7 ldrb r1, [r0, 0x1] movs r0, 0xD muls r1, r0 ldr r0, =0x0831b6db -_0814F846: +@0814F846: adds r1, r0 -_0814F848: +@0814F848: adds r0, r6, 0 bl gf_strcat adds r5, 0x2 - b _0814F8E0 + b @0814F8E0 .align 2, 0 .pool -_0814F858: +@0814F858: adds r0, r5, r7 ldrb r2, [r0, 0x1] ldrb r0, [r0, 0x2] @@ -645875,9 +645875,9 @@ _0814F858: ldr r1, =0x02000002 ands r0, r1 cmp r0, 0 - beq _0814F8D6 + beq @0814F8D6 cmp r2, 0xAF - bne _0814F8CC + bne @0814F8CC ldr r2, =0x020229e8 ldr r0, =0x02024474 adds r0, 0x25 @@ -645890,7 +645890,7 @@ _0814F858: ldrb r2, [r1] ldrh r0, [r0, 0x18] cmp r0, r2 - bne _0814F8BC + bne @0814F8BC lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -645899,35 +645899,35 @@ _0814F858: adds r0, r6, 0 bl gf_strcpy ldr r1, =0x085cc0ad - b _0814F8BE + b @0814F8BE .align 2, 0 .pool -_0814F8BC: +@0814F8BC: ldr r1, =0x085cc0a0 -_0814F8BE: +@0814F8BE: adds r0, r6, 0 bl gf_strcat - b _0814F8DE + b @0814F8DE .align 2, 0 .pool -_0814F8CC: +@0814F8CC: adds r0, r2, 0 adds r1, r6, 0 bl itemid_get_name - b _0814F8DE -_0814F8D6: + b @0814F8DE +@0814F8D6: adds r0, r2, 0 adds r1, r6, 0 bl itemid_get_name -_0814F8DE: +@0814F8DE: adds r5, 0x3 -_0814F8E0: +@0814F8E0: adds r0, r7, r5 ldrb r0, [r0] cmp r0, 0xFF - beq _0814F8EA - b _0814F666 -_0814F8EA: + beq @0814F8EA + b @0814F666 +@0814F8EA: add sp, 0xC pop {r3} mov r8, r3 @@ -645937,43 +645937,43 @@ _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 ldr r5, =0x0203aba8 ldr r3, =0x085cd336 -_0814F902: +@0814F902: cmp r2, 0x4 - beq _0814F918 + beq @0814F918 ldrh r1, [r3] cmp r1, 0 - bne _0814F90E + bne @0814F90E adds r2, 0x1 -_0814F90E: +@0814F90E: ldr r0, [r5] adds r3, 0x2 ldrh r0, [r0] cmp r1, r0 - bne _0814F902 -_0814F918: + bne @0814F902 +@0814F918: cmp r2, 0 - blt _0814F944 + blt @0814F944 cmp r2, 0x2 - bgt _0814F938 + bgt @0814F938 ldr r1, =0x085ccbb5 adds r0, r4, 0 bl gf_strcpy - b _0814F944 + b @0814F944 .align 2, 0 .pool -_0814F938: +@0814F938: cmp r2, 0x4 - bgt _0814F944 + bgt @0814F944 ldr r1, =0x085ccbb9 adds r0, r4, 0 bl gf_strcpy -_0814F944: +@0814F944: pop {r4,r5} pop {r0} bx r0 @@ -645982,80 +645982,80 @@ _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 - b _0814F95A -_0814F958: + b @0814F95A +@0814F958: adds r3, 0x1 -_0814F95A: +@0814F95A: ldrb r0, [r3] cmp r0, 0xFF - bne _0814F958 + bne @0814F958 ldr r1, =0x085cd336 ldr r5, =0x0203aba8 movs r0, 0 lsls r0, 1 adds r2, r0, r1 -_0814F96A: +@0814F96A: cmp r4, 0x4 - beq _0814F984 + beq @0814F984 ldrh r1, [r2] cmp r1, 0 - bne _0814F976 + bne @0814F976 adds r4, 0x1 -_0814F976: +@0814F976: ldr r0, [r5] adds r2, 0x2 ldrh r0, [r0] cmp r1, r0 - bne _0814F96A + bne @0814F96A cmp r4, 0x4 - bhi _0814F9E0 -_0814F984: + bhi @0814F9E0 +@0814F984: lsls r0, r4, 2 - ldr r1, =_0814F99C + ldr r1, =@0814F99C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0814F99C: - .4byte _0814F9B0 - .4byte _0814F9B8 - .4byte _0814F9C0 - .4byte _0814F9C8 - .4byte _0814F9D8 -_0814F9B0: +@0814F99C: + .4byte @0814F9B0 + .4byte @0814F9B8 + .4byte @0814F9C0 + .4byte @0814F9C8 + .4byte @0814F9D8 +@0814F9B0: ldr r1, =0x085cbdb7 - b _0814F9CA + b @0814F9CA .align 2, 0 .pool -_0814F9B8: +@0814F9B8: ldr r1, =0x085cbdb9 - b _0814F9CA + b @0814F9CA .align 2, 0 .pool -_0814F9C0: +@0814F9C0: ldr r1, =0x085cbdbb - b _0814F9CA + b @0814F9CA .align 2, 0 .pool -_0814F9C8: +@0814F9C8: ldr r1, =0x085cbdbd -_0814F9CA: +@0814F9CA: adds r0, r3, 0 bl gf_strcpy - b _0814F9E0 + b @0814F9E0 .align 2, 0 .pool -_0814F9D8: +@0814F9D8: ldr r1, =0x085cbdbf adds r0, r3, 0 bl gf_strcpy -_0814F9E0: +@0814F9E0: pop {r4,r5} pop {r0} bx r0 @@ -646064,7 +646064,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 @@ -646084,14 +646084,14 @@ battle_show_message_maybe: @ 814F9EC movs r0, 0x80 ands r0, r7 cmp r0, 0 - beq _0814FA24 + beq @0814FA24 movs r0, 0x7F ands r7, r0 movs r0, 0 - b _0814FA36 + b @0814FA36 .align 2, 0 .pool -_0814FA24: +@0814FA24: lsls r0, r7, 1 adds r0, r7 lsls r0, 2 @@ -646100,7 +646100,7 @@ _0814FA24: adds r0, r7, 0 bl Window_FastFillPixels movs r0, 0x1 -_0814FA36: +@0814FA36: mov r9, r0 str r4, [sp] mov r0, sp @@ -646154,7 +646154,7 @@ _0814FA36: mov r0, sp ldrb r0, [r0, 0x6] cmp r0, 0xFF - bne _0814FAC6 + bne @0814FAC6 ldr r0, =0x02024474 adds r0, 0x24 ldrb r0, [r0] @@ -646171,23 +646171,23 @@ _0814FA36: mov r1, sp strb r0, [r1, 0x8] strb r0, [r2, 0x6] -_0814FAC6: +@0814FAC6: cmp r7, 0x16 - bne _0814FAE0 + bne @0814FAE0 ldr r0, =0x03003014 ldrb r2, [r0] movs r1, 0x3 negs r1, r1 ands r1, r2 - b _0814FAE8 + b @0814FAE8 .align 2, 0 .pool -_0814FAE0: +@0814FAE0: ldr r0, =0x03003014 ldrb r1, [r0] movs r2, 0x2 orrs r1, r2 -_0814FAE8: +@0814FAE8: strb r1, [r0] adds r3, r0, 0 ldr r0, =0x02022fec @@ -646196,63 +646196,63 @@ _0814FAE8: ands r1, r2 adds r2, r0, 0 cmp r1, 0 - beq _0814FB10 + beq @0814FB10 ldrb r0, [r3] movs r1, 0x4 orrs r0, r1 - b _0814FB18 + b @0814FB18 .align 2, 0 .pool -_0814FB10: +@0814FB10: ldrb r1, [r3] movs r0, 0x5 negs r0, r0 ands r0, r1 -_0814FB18: +@0814FB18: strb r0, [r3] cmp r7, 0 - beq _0814FB22 + beq @0814FB22 cmp r7, 0x16 - bne _0814FB6C -_0814FB22: + bne @0814FB6C +@0814FB22: ldr r1, [r2] ldr r0, =0x02000002 ands r0, r1 cmp r0, 0 - beq _0814FB34 + beq @0814FB34 movs r6, 0x1 - b _0814FB5C + b @0814FB5C .align 2, 0 .pool -_0814FB34: +@0814FB34: movs r0, 0x80 lsls r0, 17 ands r1, r0 cmp r1, 0 - beq _0814FB54 + beq @0814FB54 ldr r4, =0x085cd668 bl sub_8185FC4 lsls r0, 24 lsrs r0, 24 adds r0, r4 ldrb r6, [r0] - b _0814FB5C + b @0814FB5C .align 2, 0 .pool -_0814FB54: +@0814FB54: bl sav2_get_text_speed lsls r0, 24 lsrs r6, r0, 24 -_0814FB5C: +@0814FB5C: ldr r0, =0x03003014 ldrb r1, [r0] movs r2, 0x1 orrs r1, r2 strb r1, [r0] - b _0814FB7E + b @0814FB7E .align 2, 0 .pool -_0814FB6C: +@0814FB6C: adds r0, r6, r7 lsls r0, 2 add r0, r8 @@ -646262,20 +646262,20 @@ _0814FB6C: negs r0, r0 ands r0, r1 strb r0, [r3] -_0814FB7E: +@0814FB7E: mov r0, sp adds r1, r6, 0 movs r2, 0 bl remo_copy mov r0, r9 cmp r0, 0 - beq _0814FB9C + beq @0814FB9C adds r0, r7, 0 bl Window_WriteStandardTileMap adds r0, r7, 0 movs r1, 0x3 bl Window_CopyToVram -_0814FB9C: +@0814FB9C: add sp, 0x10 pop {r3,r4} mov r8, r3 @@ -646286,7 +646286,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] @@ -646334,7 +646334,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 @@ -646342,49 +646342,49 @@ sub_814FC20: @ 814FC20 lsls r1, 24 lsrs r0, r1, 24 cmp r0, r2 - beq _0814FC68 + beq @0814FC68 cmp r0, 0x2 - bhi _0814FC3A + bhi @0814FC3A cmp r2, 0x1 - bhi _0814FC68 - b _0814FC42 -_0814FC3A: + bhi @0814FC68 + b @0814FC42 +@0814FC3A: cmp r0, 0x7 - bhi _0814FC4C + bhi @0814FC4C cmp r2, 0x2 - bhi _0814FC68 -_0814FC42: + bhi @0814FC68 +@0814FC42: movs r0, 0x2 subs r0, r2 lsls r0, 24 lsrs r0, 24 - b _0814FC6A -_0814FC4C: + b @0814FC6A +@0814FC4C: cmp r2, 0 - bne _0814FC54 + bne @0814FC54 movs r0, 0x2 - b _0814FC6A -_0814FC54: + b @0814FC6A +@0814FC54: lsrs r0, r1, 26 cmp r2, r0 - bhi _0814FC5E + bhi @0814FC5E movs r0, 0x1 - b _0814FC6A -_0814FC5E: + b @0814FC6A +@0814FC5E: lsrs r0, r1, 25 cmp r3, r0 - bhi _0814FC68 + bhi @0814FC68 movs r0, 0 - b _0814FC6A -_0814FC68: + b @0814FC6A +@0814FC68: movs r0, 0x3 -_0814FC6A: +@0814FC6A: pop {r1} bx r1 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 @@ -646393,12 +646393,12 @@ sub_814FC70: @ 814FC70 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0814FC8E + bne @0814FC8E ldr r0, =sub_814FCC8 + 1 bl set_callback2 adds r0, r4, 0 bl remove_task -_0814FC8E: +@0814FC8E: pop {r4} pop {r0} bx r0 @@ -646407,7 +646407,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 @@ -646429,7 +646429,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 @@ -646444,27 +646444,27 @@ sub_814FCC8: @ 814FCC8 ldrb r0, [r0] adds r6, r1, 0 cmp r0, 0x9 - bhi _0814FD20 + bhi @0814FD20 lsls r0, 2 - ldr r1, =_0814FCF8 + ldr r1, =@0814FCF8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0814FCF8: - .4byte _0814FD20 - .4byte _0814FDD8 - .4byte _0814FE90 - .4byte _0814FF50 - .4byte _0814FF7C - .4byte _0814FF98 - .4byte _0814FFF8 - .4byte _08150090 - .4byte _08150190 - .4byte _081501C8 -_0814FD20: +@0814FCF8: + .4byte @0814FD20 + .4byte @0814FDD8 + .4byte @0814FE90 + .4byte @0814FF50 + .4byte @0814FF7C + .4byte @0814FF98 + .4byte @0814FFF8 + .4byte @08150090 + .4byte @08150190 + .4byte @081501C8 +@0814FD20: movs r0, 0 bl SetVBlankCallback movs r0, 0 @@ -646485,7 +646485,7 @@ _0814FD20: movs r0, 0x81 lsls r0, 24 mov r8, r0 -_0814FD4E: +@0814FD4E: strh r6, [r2] add r0, sp, 0xC str r0, [r1] @@ -646495,7 +646495,7 @@ _0814FD4E: adds r3, r5 subs r4, r5 cmp r4, r5 - bhi _0814FD4E + bhi @0814FD4E strh r6, [r2] add r2, sp, 0xC str r2, [r1] @@ -646543,10 +646543,10 @@ _0814FD4E: adds r1, r2 ldrb r0, [r1] adds r0, 0x1 - b _08150224 + b @08150224 .align 2, 0 .pool -_0814FDD8: +@0814FDD8: bl reset_all_obj_data bl clear_tasks bl gpu_pal_allocator_reset @@ -646559,7 +646559,7 @@ _0814FDD8: adds r1, r0, 0 adds r1, 0xF0 movs r2, 0 -_0814FDFC: +@0814FDFC: lsls r0, r4, 2 adds r0, r1, r0 str r2, [r0] @@ -646567,7 +646567,7 @@ _0814FDFC: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x13 - bls _0814FDFC + bls @0814FDFC bl sound_sources_off bl map_music_set_to_zero movs r0, 0 @@ -646607,14 +646607,14 @@ _0814FDFC: adds r1, r3 ldrb r0, [r1] adds r0, 0x1 - b _08150224 + b @08150224 .align 2, 0 .pool -_0814FE90: +@0814FE90: movs r4, 0 add r5, sp, 0x14 ldr r6, =0x085cdb54 -_0814FE96: +@0814FE96: lsls r0, r4, 3 adds r0, r6 bl gpu_tile_obj_decompress_and_load @@ -646622,7 +646622,7 @@ _0814FE96: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _0814FE96 + bls @0814FE96 ldr r0, =0x085cdb74 bl gpu_pal_obj_alloc_and_load_multiple ldr r0, =0x085cd67c @@ -646671,16 +646671,16 @@ _0814FE96: adds r1, r2 ldrb r0, [r1] adds r0, 0x1 - b _08150224 + b @08150224 .align 2, 0 .pool -_0814FF50: +@0814FF50: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - beq _0814FF5C - b _08150226 -_0814FF5C: + beq @0814FF5C + b @08150226 +@0814FF5C: ldr r0, =0x08dba518 movs r1, 0 movs r2, 0x80 @@ -646691,10 +646691,10 @@ _0814FF5C: adds r1, r3 ldrb r0, [r1] adds r0, 0x1 - b _08150224 + b @08150224 .align 2, 0 .pool -_0814FF7C: +@0814FF7C: bl sub_8150D28 bl run_active_tasks ldr r1, =0x030022c0 @@ -646703,62 +646703,62 @@ _0814FF7C: adds r1, r0 ldrb r0, [r1] adds r0, 0x1 - b _08150224 + b @08150224 .align 2, 0 .pool -_0814FF98: +@0814FF98: ldr r0, =0x0203abac ldr r0, [r0] ldrb r0, [r0, 0x2] cmp r0, 0x7 - bne _0814FFB4 + bne @0814FFB4 movs r2, 0x87 lsls r2, 3 adds r1, r6, r2 ldrb r0, [r1] adds r0, 0x1 - b _08150224 + b @08150224 .align 2, 0 .pool -_0814FFB4: +@0814FFB4: ldr r0, =0x0854c14c ldr r0, [r0] adds r1, r0, 0 adds r1, 0xF0 ldr r0, [r1] cmp r0, 0 - bne _0814FFC4 - b _08150226 -_0814FFC4: + bne @0814FFC4 + b @08150226 +@0814FFC4: movs r4, 0 adds r3, r1, 0 movs r5, 0xD negs r5, r5 -_0814FFCC: +@0814FFCC: lsls r0, r4, 2 adds r0, r3, r0 ldr r2, [r0] cmp r2, 0 - beq _0814FFDE + beq @0814FFDE ldrb r1, [r2, 0x5] adds r0, r5, 0 ands r0, r1 strb r0, [r2, 0x5] -_0814FFDE: +@0814FFDE: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x13 - bls _0814FFCC + bls @0814FFCC movs r3, 0x87 lsls r3, 3 adds r1, r6, r3 ldrb r0, [r1] adds r0, 0x1 - b _08150224 + b @08150224 .align 2, 0 .pool -_0814FFF8: +@0814FFF8: ldr r6, =0x0203abac ldr r0, [r6] movs r1, 0x82 @@ -646820,10 +646820,10 @@ _0814FFF8: adds r1, r0 ldrb r0, [r1] adds r0, 0x1 - b _08150224 + b @08150224 .align 2, 0 .pool -_08150090: +@08150090: ldr r0, =0x020375e0 ldrb r0, [r0] bl sub_81514C8 @@ -646934,10 +646934,10 @@ _08150090: adds r1, r2 ldrb r0, [r1] adds r0, 0x1 - b _08150224 + b @08150224 .align 2, 0 .pool -_08150190: +@08150190: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -646957,10 +646957,10 @@ _08150190: adds r1, r3 ldrb r0, [r1] adds r0, 0x1 - b _08150224 + b @08150224 .align 2, 0 .pool -_081501C8: +@081501C8: ldr r3, =0x04000208 ldrh r2, [r3] movs r0, 0 @@ -646981,21 +646981,21 @@ _081501C8: ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 - bne _08150218 + bne @08150218 ldr r0, =sub_8150550 + 1 - b _0815021A + b @0815021A .align 2, 0 .pool -_08150218: +@08150218: ldr r0, =sub_8150664 + 1 -_0815021A: +@0815021A: movs r1, 0x1 bl AddTask ldr r1, =0x0203abac ldr r1, [r1] -_08150224: +@08150224: strb r0, [r1] -_08150226: +@08150226: add sp, 0x18 pop {r3,r4} mov r8, r3 @@ -647008,7 +647008,7 @@ _08150226: thumb_func_end sub_814FCC8 thumb_func_start mainloop -mainloop: @ 815023C +mainloop: ; 815023C push {lr} bl run_active_tasks bl call_obj_callbacks @@ -647020,7 +647020,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} @@ -647047,7 +647047,7 @@ c2_8011A1C: @ 8150258 adds r1, r0, 0 adds r1, 0xF0 movs r2, 0 -_08150298: +@08150298: lsls r0, r4, 2 adds r0, r1, r0 str r2, [r0] @@ -647055,7 +647055,7 @@ _08150298: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x13 - bls _08150298 + bls @08150298 bl clear_tasks bl reset_all_obj_data bl sub_80A1A74 @@ -647119,7 +647119,7 @@ _08150298: movs r0, 0x81 lsls r0, 24 mov r12, r0 -_08150340: +@08150340: strh r6, [r4] mov r0, sp str r0, [r1] @@ -647129,7 +647129,7 @@ _08150340: adds r2, r5 subs r3, r5 cmp r3, r5 - bhi _08150340 + bhi @08150340 strh r6, [r4] mov r0, sp str r0, [r1] @@ -647183,7 +647183,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 @@ -647197,86 +647197,86 @@ sub_81503E4: @ 81503E4 ldrb r2, [r3, 0x1] adds r7, r5, 0 cmp r2, 0x2 - beq _081504EA + beq @081504EA cmp r2, 0x2 - bgt _08150414 + bgt @08150414 cmp r2, 0 - beq _08150422 + beq @08150422 cmp r2, 0x1 - beq _0815043C - b _08150542 + beq @0815043C + b @08150542 .align 2, 0 .pool -_08150414: +@08150414: cmp r2, 0x3 - bne _0815041A - b _08150510 -_0815041A: + bne @0815041A + b @08150510 +@0815041A: cmp r2, 0xFF - bne _08150420 - b _08150528 -_08150420: - b _08150542 -_08150422: + bne @08150420 + b @08150528 +@08150420: + b @08150542 +@08150422: lsls r0, 16 lsrs r0, 16 ldrh r1, [r3, 0x4] cmp r0, r1 - beq _0815042E - b _08150542 -_0815042E: + beq @0815042E + b @08150542 +@0815042E: ldrb r0, [r3, 0x2] bl weather_set ldr r1, [r5] movs r0, 0x1 strb r0, [r1, 0x1] - b _08150542 -_0815043C: + b @08150542 +@0815043C: ldrb r0, [r3, 0x2] cmp r0, 0x2 - beq _08150490 + beq @08150490 cmp r0, 0x7 - beq _08150448 - b _08150542 -_08150448: + beq @08150448 + b @08150542 +@08150448: ldr r0, =0x0854c14c ldr r0, [r0] adds r2, r0, 0 adds r2, 0xF0 ldr r0, [r2] cmp r0, 0 - beq _08150542 + beq @08150542 ldrb r1, [r0, 0x5] movs r0, 0xC ands r0, r1 cmp r0, 0 - beq _08150542 + beq @08150542 adds r3, r2, 0 movs r5, 0xD negs r5, r5 -_08150466: +@08150466: lsls r0, r4, 2 adds r0, r3, r0 ldr r2, [r0] cmp r2, 0 - beq _08150478 + beq @08150478 ldrb r1, [r2, 0x5] adds r0, r5, 0 ands r0, r1 strb r0, [r2, 0x5] -_08150478: +@08150478: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x13 - bls _08150466 + bls @08150466 ldr r1, [r7] movs r0, 0x2 strb r0, [r1, 0x1] - b _08150542 + b @08150542 .align 2, 0 .pool -_08150490: +@08150490: ldr r0, =0x0854c14c ldr r2, [r0] movs r1, 0xDA @@ -647284,28 +647284,28 @@ _08150490: adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x2 - bne _081504A8 + bne @081504A8 strb r0, [r3, 0x1] - b _08150542 + b @08150542 .align 2, 0 .pool -_081504A8: +@081504A8: ldrh r1, [r3, 0x6] ldrh r0, [r3, 0x4] adds r0, 0x8 cmp r1, r0 - blt _08150542 + blt @08150542 adds r6, r2, 0 adds r6, 0xF0 movs r5, 0x1 movs r7, 0x5 negs r7, r7 -_081504BC: +@081504BC: lsls r0, r4, 2 adds r0, r6, r0 ldr r0, [r0] cmp r0, 0 - beq _081504DE + beq @081504DE adds r3, r0, 0 adds r3, 0x3E ldrb r2, [r3] @@ -647318,18 +647318,18 @@ _081504BC: ands r0, r2 orrs r0, r1 strb r0, [r3] -_081504DE: +@081504DE: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x13 - bls _081504BC - b _08150542 -_081504EA: + bls @081504BC + b @08150542 +@081504EA: lsls r1, r0, 16 ldr r0, =0x023a0000 cmp r1, r0 - bne _08150542 + bne @08150542 movs r0, 0x3 strb r0, [r3, 0x1] subs r0, 0x4 @@ -647340,22 +647340,22 @@ _081504EA: bl sub_80A1AD4 movs r0, 0x4 bl play_sound_effect - b _08150542 + b @08150542 .align 2, 0 .pool -_08150510: +@08150510: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08150542 + bne @08150542 movs r0, 0xFF strb r0, [r3, 0x1] - b _08150542 + b @08150542 .align 2, 0 .pool -_08150528: +@08150528: movs r0, 0 bl SetVBlankCallback adds r0, r6, 0 @@ -647365,7 +647365,7 @@ _08150528: bl remove_task ldr r0, =c2_8011A1C + 1 bl set_callback2 -_08150542: +@08150542: add sp, 0x4 pop {r4-r7} pop {r0} @@ -647375,14 +647375,14 @@ _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 ldr r1, [r6] ldrb r0, [r1, 0x1] cmp r0, 0xFF - beq _08150630 + beq @08150630 ldrb r0, [r1, 0x14] subs r0, 0x1 strb r0, [r1, 0x14] @@ -647391,17 +647391,17 @@ sub_8150550: @ 8150550 movs r3, 0x1 ands r0, r3 cmp r0, 0 - bne _08150576 + bne @08150576 ldrb r0, [r1, 0x15] subs r0, 0x1 strb r0, [r1, 0x15] -_08150576: +@08150576: ldr r2, [r6] ldrh r0, [r2, 0x6] movs r1, 0x7 ands r0, r1 cmp r0, 0 - bne _08150590 + bne @08150590 ldrb r0, [r2, 0xC] subs r0, 0x1 strb r0, [r2, 0xC] @@ -647409,23 +647409,23 @@ _08150576: ldrb r0, [r1, 0xD] subs r0, 0x1 strb r0, [r1, 0xD] -_08150590: +@08150590: ldr r0, [r6] ldrb r1, [r0, 0x14] cmp r1, 0x20 - beq _081505DC + beq @081505DC cmp r1, 0x20 - bgt _081505A8 + bgt @081505A8 cmp r1, 0x10 - beq _081505F4 - b _08150630 + beq @081505F4 + b @08150630 .align 2, 0 .pool -_081505A8: +@081505A8: cmp r1, 0x28 - beq _081505CA + beq @081505CA cmp r1, 0xAF - bne _08150630 + bne @08150630 movs r0, 0x2 str r0, [sp] movs r0, 0xA @@ -647437,8 +647437,8 @@ _081505A8: movs r2, 0 movs r3, 0x16 bl Bg_FillWramTileMapRectWithTileAndPalette - b _08150630 -_081505CA: + b @08150630 +@081505CA: movs r0, 0x2 str r0, [sp] str r0, [sp, 0x4] @@ -647447,8 +647447,8 @@ _081505CA: movs r0, 0x3 movs r1, 0 movs r2, 0x3 - b _081505EC -_081505DC: + b @081505EC +@081505DC: str r3, [sp] movs r0, 0x2 str r0, [sp, 0x4] @@ -647457,11 +647457,11 @@ _081505DC: movs r0, 0x3 movs r1, 0 movs r2, 0x2 -_081505EC: +@081505EC: movs r3, 0 bl Bg_FillWramTileMapRectWithTileAndPalette - b _08150630 -_081505F4: + b @08150630 +@081505F4: ldr r1, =0x00004108 adds r0, r1 ldr r1, [r0] @@ -647490,7 +647490,7 @@ _081505F4: ldr r1, [r6] movs r0, 0x40 strb r0, [r1, 0x15] -_08150630: +@08150630: bl sub_815115C ldr r3, =0x02021bbc movs r0, 0 @@ -647498,10 +647498,10 @@ _08150630: adds r1, r2, 0x1 adds r0, r1, 0 cmp r1, 0 - bge _08150646 + bge @08150646 adds r0, r2, 0 adds r0, 0x80 -_08150646: +@08150646: asrs r0, 7 lsls r0, 7 subs r0, r1, r0 @@ -647515,16 +647515,16 @@ _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 ldr r1, [r7] ldrb r0, [r1, 0x1] cmp r0, 0xFF - bne _08150674 - b _081507B6 -_08150674: + bne @08150674 + b @081507B6 +@08150674: ldrb r0, [r1, 0x14] adds r0, 0x1 strb r0, [r1, 0x14] @@ -647533,17 +647533,17 @@ _08150674: movs r6, 0x1 ands r0, r6 cmp r0, 0 - bne _0815068C + bne @0815068C ldrb r0, [r1, 0x15] adds r0, 0x1 strb r0, [r1, 0x15] -_0815068C: +@0815068C: ldr r2, [r7] ldrh r0, [r2, 0x6] movs r1, 0x7 ands r0, r1 cmp r0, 0 - bne _081506A6 + bne @081506A6 ldrb r0, [r2, 0xC] adds r0, 0x1 strb r0, [r2, 0xC] @@ -647551,23 +647551,23 @@ _0815068C: ldrb r0, [r1, 0xD] adds r0, 0x1 strb r0, [r1, 0xD] -_081506A6: +@081506A6: ldr r0, [r7] ldrb r1, [r0, 0x14] cmp r1, 0x20 - beq _0815071A + beq @0815071A cmp r1, 0x20 - bgt _081506BC + bgt @081506BC cmp r1, 0x10 - beq _081506E8 - b _081507B6 + beq @081506E8 + b @081507B6 .align 2, 0 .pool -_081506BC: +@081506BC: cmp r1, 0x28 - beq _08150784 + beq @08150784 cmp r1, 0xB0 - bne _081507B6 + bne @081507B6 ldr r1, =0x0000410c adds r0, r1 ldr r1, [r0] @@ -647581,10 +647581,10 @@ _081506BC: movs r2, 0 movs r3, 0x2 bl bg_copy_tilemap_rect_simple - b _081507B6 + b @081507B6 .align 2, 0 .pool -_081506E8: +@081506E8: movs r0, 0x3 str r0, [sp] movs r4, 0x2 @@ -647607,8 +647607,8 @@ _081506E8: ldr r1, [r7] movs r0, 0xC0 strb r0, [r1, 0x15] - b _081507B6 -_0815071A: + b @081507B6 +@0815071A: ldr r5, =0x00004108 adds r0, r5 ldr r0, [r0] @@ -647654,10 +647654,10 @@ _0815071A: movs r2, 0x3 movs r3, 0x1 bl Bg_FillWramTileMapRectWithTileAndPalette - b _081507B6 + b @081507B6 .align 2, 0 .pool -_08150784: +@08150784: ldr r5, =0x00004108 adds r0, r5 ldr r0, [r0] @@ -647681,27 +647681,27 @@ _08150784: movs r2, 0x4 movs r3, 0x1 bl Bg_FillWramTileMapRectWithTileAndPalette -_081507B6: +@081507B6: bl sub_81511B8 ldr r0, =0x0203abac ldr r1, [r0] ldrh r0, [r1, 0x6] ldrh r1, [r1, 0x4] cmp r0, r1 - bcs _081507DC + bcs @081507DC ldr r4, =0x02021bbc movs r1, 0 ldrsh r0, [r4, r1] - b _081507E6 + b @081507E6 .align 2, 0 .pool -_081507DC: +@081507DC: ldr r0, =0x0854c14c ldr r4, [r0] ldr r0, =0x000006fc adds r4, r0 ldrh r0, [r4] -_081507E6: +@081507E6: adds r0, 0xF7 movs r1, 0xF8 bl __modsi3 @@ -647715,7 +647715,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 gpu_copy_wram_bg_tilemap_to_vram @@ -647757,32 +647757,32 @@ 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 ldr r6, [r0] ldrb r0, [r6, 0x1] cmp r0, 0xFF - beq _08150934 + beq @08150934 ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 - bne _081508E4 + bne @081508E4 movs r0, 0x6 ldrsh r4, [r6, r0] adds r0, r4, 0 bl __floatsisf cmp r4, 0 - bge _08150892 + bge @08150892 ldr r1, =0x47800000 bl __addsf3 -_08150892: +@08150892: ldr r1, =0x3e0f5c29 bl __mulsf3 bl __fixunssfsi @@ -647796,10 +647796,10 @@ _08150892: adds r0, r4, 0 bl __floatsisf cmp r4, 0 - bge _081508BA + bge @081508BA ldr r1, =0x47800000 bl __addsf3 -_081508BA: +@081508BA: ldr r1, =0x3d89374c bl __mulsf3 bl __fixunssfsi @@ -647808,19 +647808,19 @@ _081508BA: ldrh r1, [r5, 0x30] subs r1, r0 strh r1, [r5, 0x22] - b _08150934 + b @08150934 .align 2, 0 .pool -_081508E4: +@081508E4: movs r0, 0x6 ldrsh r4, [r6, r0] adds r0, r4, 0 bl __floatsisf cmp r4, 0 - bge _081508F8 + bge @081508F8 ldr r1, =0x47800000 bl __addsf3 -_081508F8: +@081508F8: ldr r1, =0x3e0f5c29 bl __mulsf3 bl __fixunssfsi @@ -647834,10 +647834,10 @@ _081508F8: adds r0, r4, 0 bl __floatsisf cmp r4, 0 - bge _08150920 + bge @08150920 ldr r1, =0x47800000 bl __addsf3 -_08150920: +@08150920: ldr r1, =0x3d89374c bl __mulsf3 bl __fixunssfsi @@ -647846,7 +647846,7 @@ _08150920: ldrh r1, [r5, 0x30] adds r0, r1 strh r0, [r5, 0x22] -_08150934: +@08150934: pop {r4-r6} pop {r0} bx r0 @@ -647855,29 +647855,29 @@ _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 ldr r6, [r0] ldrb r0, [r6, 0x1] cmp r0, 0xFF - bne _08150958 - b _08150A60 -_08150958: + bne @08150958 + b @08150A60 +@08150958: ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 - bne _081509C8 + bne @081509C8 movs r0, 0x6 ldrsh r4, [r6, r0] adds r0, r4, 0 bl __floatsisf cmp r4, 0 - bge _08150974 + bge @08150974 ldr r1, =0x47800000 bl __addsf3 -_08150974: +@08150974: ldr r1, =0x3e0f5c29 bl __mulsf3 bl __fixunssfsi @@ -647891,10 +647891,10 @@ _08150974: adds r0, r4, 0 bl __floatsisf cmp r4, 0 - bge _0815099C + bge @0815099C ldr r1, =0x47800000 bl __addsf3 -_0815099C: +@0815099C: ldr r1, =0x3d89374c bl __mulsf3 bl __fixunssfsi @@ -647903,19 +647903,19 @@ _0815099C: ldrh r1, [r5, 0x30] subs r1, r0 strh r1, [r5, 0x22] - b _08150A18 + b @08150A18 .align 2, 0 .pool -_081509C8: +@081509C8: movs r0, 0x6 ldrsh r4, [r6, r0] adds r0, r4, 0 bl __floatsisf cmp r4, 0 - bge _081509DC + bge @081509DC ldr r1, =0x47800000 bl __addsf3 -_081509DC: +@081509DC: ldr r1, =0x3e0f5c29 bl __mulsf3 bl __fixunssfsi @@ -647929,10 +647929,10 @@ _081509DC: adds r0, r4, 0 bl __floatsisf cmp r4, 0 - bge _08150A04 + bge @08150A04 ldr r1, =0x47800000 bl __addsf3 -_08150A04: +@08150A04: ldr r1, =0x3d89374c bl __mulsf3 bl __fixunssfsi @@ -647941,11 +647941,11 @@ _08150A04: ldrh r1, [r5, 0x30] adds r0, r1 strh r0, [r5, 0x22] -_08150A18: +@08150A18: movs r0, 0x32 ldrsh r2, [r5, r0] cmp r2, 0 - bne _08150A48 + bne @08150A48 movs r0, 0x11 strh r0, [r5, 0x26] ldrh r0, [r5, 0x34] @@ -647954,15 +647954,15 @@ _08150A18: lsls r0, 16 asrs r0, 16 cmp r0, 0x9 - ble _08150A60 + ble @08150A60 strh r2, [r5, 0x34] ldrh r0, [r5, 0x32] adds r0, 0x1 strh r0, [r5, 0x32] - b _08150A60 + b @08150A60 .align 2, 0 .pool -_08150A48: +@08150A48: movs r2, 0 movs r0, 0x10 strh r0, [r5, 0x26] @@ -647972,23 +647972,23 @@ _08150A48: lsls r0, 16 asrs r0, 16 cmp r0, 0x9 - ble _08150A60 + ble @08150A60 strh r2, [r5, 0x34] strh r2, [r5, 0x32] -_08150A60: +@08150A60: pop {r4-r6} pop {r0} bx r0 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 ldrsh r0, [r2, r1] cmp r0, 0 - bne _08150A98 + bne @08150A98 adds r0, r2, 0 adds r0, 0x28 ldrb r0, [r0] @@ -648007,7 +648007,7 @@ sub_8150A68: @ 8150A68 asrs r0, 24 adds r0, r1 strh r0, [r2, 0x22] -_08150A98: +@08150A98: ldrh r0, [r2, 0x2E] adds r0, 0x1 strh r0, [r2, 0x2E] @@ -648016,57 +648016,57 @@ _08150A98: movs r3, 0x32 ldrsh r1, [r2, r3] cmp r0, r1 - blt _08150AEE + blt @08150AEE movs r0, 0x30 ldrsh r1, [r2, r0] cmp r1, 0 - beq _08150AB8 + beq @08150AB8 cmp r1, 0x1 - beq _08150AC2 - b _08150AE0 -_08150AB8: + beq @08150AC2 + b @08150AE0 +@08150AB8: ldrh r0, [r2, 0x20] adds r0, 0x1 strh r0, [r2, 0x20] ldrh r0, [r2, 0x2E] - b _08150AD2 -_08150AC2: + b @08150AD2 +@08150AC2: ldrh r0, [r2, 0x2E] ands r0, r1 cmp r0, 0 - beq _08150AE0 + beq @08150AE0 ldrh r0, [r2, 0x20] adds r0, 0x1 strh r0, [r2, 0x20] ldrh r0, [r2, 0x20] -_08150AD2: +@08150AD2: movs r1, 0x3 ands r0, r1 cmp r0, 0 - bne _08150AE0 + bne @08150AE0 ldrh r0, [r2, 0x22] adds r0, 0x1 strh r0, [r2, 0x22] -_08150AE0: +@08150AE0: movs r1, 0x22 ldrsh r0, [r2, r1] cmp r0, 0xA0 - ble _08150AEE + ble @08150AEE adds r0, r2, 0 bl obj_delete_and_free_tiles -_08150AEE: +@08150AEE: pop {r0} bx r0 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 ldrsh r0, [r2, r1] cmp r0, 0 - bne _08150B12 + bne @08150B12 ldrh r1, [r2, 0x22] adds r1, 0x10 adds r0, r2, 0 @@ -648076,7 +648076,7 @@ sub_8150AF4: @ 8150AF4 asrs r0, 24 adds r0, r1 strh r0, [r2, 0x22] -_08150B12: +@08150B12: ldrh r0, [r2, 0x2E] adds r0, 0x1 strh r0, [r2, 0x2E] @@ -648085,59 +648085,59 @@ _08150B12: movs r3, 0x32 ldrsh r1, [r2, r3] cmp r0, r1 - blt _08150B68 + blt @08150B68 movs r0, 0x30 ldrsh r1, [r2, r0] cmp r1, 0 - beq _08150B32 + beq @08150B32 cmp r1, 0x1 - beq _08150B3C - b _08150B5A -_08150B32: + beq @08150B3C + b @08150B5A +@08150B32: ldrh r0, [r2, 0x20] subs r0, 0x1 strh r0, [r2, 0x20] ldrh r0, [r2, 0x2E] - b _08150B4C -_08150B3C: + b @08150B4C +@08150B3C: ldrh r0, [r2, 0x2E] ands r0, r1 cmp r0, 0 - beq _08150B5A + beq @08150B5A ldrh r0, [r2, 0x20] subs r0, 0x1 strh r0, [r2, 0x20] ldrh r0, [r2, 0x20] -_08150B4C: +@08150B4C: movs r1, 0x3 ands r0, r1 cmp r0, 0 - bne _08150B5A + bne @08150B5A ldrh r0, [r2, 0x22] subs r0, 0x1 strh r0, [r2, 0x22] -_08150B5A: +@08150B5A: movs r1, 0x22 ldrsh r0, [r2, r1] cmp r0, 0x4F - bgt _08150B68 + bgt @08150B68 adds r0, r2, 0 bl obj_delete_and_free_tiles -_08150B68: +@08150B68: pop {r0} bx r0 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 cmp r0, 0 - beq _08150B7A + beq @08150B7A cmp r0, 0x1 - beq _08150C1C -_08150B7A: + beq @08150C1C +@08150B7A: movs r0, 0x48 movs r1, 0 bl lcd_io_set @@ -648198,8 +648198,8 @@ _08150B7A: movs r0, 0x50 movs r1, 0 bl lcd_io_set - b _08150D1C -_08150C1C: + b @08150D1C +@08150C1C: movs r0, 0x48 movs r1, 0 bl lcd_io_set @@ -648221,7 +648221,7 @@ _08150C1C: ldr r0, =0x020375e0 ldrh r3, [r0] cmp r3, 0 - bne _08150C74 + bne @08150C74 ldr r1, =0x0203abac ldr r2, [r1] movs r0, 0xB0 @@ -648233,10 +648233,10 @@ _08150C1C: strb r3, [r0, 0xC] ldr r2, [r1] movs r0, 0x50 - b _08150C8C + b @08150C8C .align 2, 0 .pool -_08150C74: +@08150C74: ldr r1, =0x0203abac ldr r2, [r1] movs r3, 0 @@ -648249,7 +648249,7 @@ _08150C74: strb r3, [r0, 0xC] ldr r2, [r1] movs r0, 0x4 -_08150C8C: +@08150C8C: strb r0, [r2, 0xD] ldr r0, [r1] strb r3, [r0, 0x9] @@ -648306,7 +648306,7 @@ _08150C8C: lsls r1, 6 movs r0, 0x50 bl lcd_io_set -_08150D1C: +@08150D1C: pop {r4} pop {r0} bx r0 @@ -648315,7 +648315,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 @@ -648355,10 +648355,10 @@ sub_8150D28: @ 8150D28 mov r8, r6 mov r10, r5 cmp r0, 0 - beq _08150D86 + beq @08150D86 cmp r0, 0x1 - beq _08150E68 -_08150D86: + beq @08150E68 +@08150D86: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] @@ -648374,7 +648374,7 @@ _08150D86: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 - beq _08150DD0 + beq @08150DD0 ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 @@ -648395,7 +648395,7 @@ _08150D86: strh r0, [r1, 0x2E] movs r0, 0x49 strh r0, [r1, 0x30] -_08150DD0: +@08150DD0: ldr r4, =0x085cdb9c adds r0, r4, 0 movs r1, 0xB0 @@ -648446,10 +648446,10 @@ _08150DD0: strh r0, [r1, 0x4] movs r0, 0x2 bl sub_80AB130 - b _08150F3A + b @08150F3A .align 2, 0 .pool -_08150E68: +@08150E68: ldr r7, =0x0203abac ldr r0, [r7] ldr r1, =0x000040fc @@ -648481,7 +648481,7 @@ _08150E68: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 - beq _08150ED4 + beq @08150ED4 ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 @@ -648502,7 +648502,7 @@ _08150E68: strh r0, [r1, 0x2E] movs r0, 0x27 strh r0, [r1, 0x30] -_08150ED4: +@08150ED4: ldr r4, =0x085cdb9c adds r0, r4, 0 movs r1, 0x68 @@ -648551,10 +648551,10 @@ _08150ED4: strh r0, [r1, 0x4] movs r0, 0x7 bl sub_80AB130 -_08150F3A: +@08150F3A: movs r4, 0 ldr r5, =0x02020630 -_08150F3E: +@08150F3E: lsls r1, r4, 20 movs r2, 0xC0 lsls r2, 15 @@ -648580,12 +648580,12 @@ _08150F3E: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x8 - bls _08150F3E + bls @08150F3E movs r0, 0x3F mov r4, r9 ands r0, r4 cmp r0, 0 - bne _08151074 + bne @08151074 mov r0, r9 movs r1, 0x3 bl __umodsi3 @@ -648614,7 +648614,7 @@ _08150F3E: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 - beq _08151074 + beq @08151074 ldr r1, =0x02020630 lsls r2, r6, 4 adds r0, r2, r6 @@ -648644,43 +648644,43 @@ _08150F3E: ldrh r0, [r5] mov r8, r2 cmp r0, 0 - bne _08151036 + bne @08151036 movs r7, 0x1 mov r5, r9 ands r5, r7 cmp r5, 0 - beq _08151030 + beq @08151030 adds r0, r4, 0 movs r1, 0x6 - b _08151044 + b @08151044 .align 2, 0 .pool -_08151030: +@08151030: adds r0, r4, 0 movs r1, 0x7 - b _08151056 -_08151036: + b @08151056 +@08151036: movs r7, 0x1 mov r5, r9 ands r5, r7 cmp r5, 0 - beq _08151052 + beq @08151052 adds r0, r4, 0 movs r1, 0x7 -_08151044: +@08151044: bl obj_anim_image_start strh r7, [r4, 0x30] ldrh r0, [r4, 0x22] adds r0, 0x2 strh r0, [r4, 0x22] - b _0815105C -_08151052: + b @0815105C +@08151052: adds r0, r4, 0 movs r1, 0x6 -_08151056: +@08151056: bl obj_anim_image_start strh r5, [r4, 0x30] -_0815105C: +@0815105C: ldr r0, =0x02020630 mov r2, r8 adds r1, r2, r6 @@ -648693,7 +648693,7 @@ _0815105C: adds r0, 0x1C ldrb r0, [r0] strh r0, [r1, 0x32] -_08151074: +@08151074: add sp, 0x28 pop {r3-r5} mov r8, r3 @@ -648707,7 +648707,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 @@ -648725,7 +648725,7 @@ sub_8151088: @ 8151088 lsls r0, 26 lsrs r0, 24 mov r12, r0 -_081510AA: +@081510AA: movs r7, 0 lsls r0, r3, 1 adds r1, r3, 0x3 @@ -648743,7 +648743,7 @@ _081510AA: adds r0, r2 lsls r0, 3 mov r8, r0 -_081510CC: +@081510CC: ldr r0, =0x0203abac ldr r6, [r0] lsls r3, r7, 1 @@ -648791,12 +648791,12 @@ _081510CC: lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0xB - bls _081510CC + bls @081510CC ldr r4, [sp, 0x4] lsls r0, r4, 24 lsrs r3, r0, 24 cmp r3, 0x2 - bls _081510AA + bls @081510AA ldrb r0, [r6, 0x1B] adds r0, 0x1 movs r1, 0x3 @@ -648815,7 +648815,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] @@ -648845,17 +648845,17 @@ sub_815115C: @ 815115C movs r1, 0x3 ands r0, r1 cmp r0, 0 - bne _081511A0 + bne @081511A0 ldrb r0, [r2, 0x1E] adds r0, 0x1 strb r0, [r2, 0x1E] -_081511A0: +@081511A0: ldr r0, [r5] ldrb r0, [r0, 0x1D] cmp r0, 0x10 - bls _081511AC + bls @081511AC bl sub_8151214 -_081511AC: +@081511AC: pop {r4,r5} pop {r0} bx r0 @@ -648864,7 +648864,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] @@ -648894,17 +648894,17 @@ sub_81511B8: @ 81511B8 movs r1, 0x3 ands r0, r1 cmp r0, 0 - bne _081511FC + bne @081511FC ldrb r0, [r2, 0x1E] adds r0, 0x1 strb r0, [r2, 0x1E] -_081511FC: +@081511FC: ldr r0, [r5] ldrb r0, [r0, 0x1D] cmp r0, 0x10 - bls _08151208 + bls @08151208 bl sub_8151388 -_08151208: +@08151208: pop {r4,r5} pop {r0} bx r0 @@ -648913,7 +648913,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 @@ -648959,7 +648959,7 @@ sub_8151214: @ 8151214 mov r9, r3 ldr r0, =0x0203abb1 mov r8, r0 -_0815126E: +@0815126E: mov r1, r9 ldr r2, [r1] ldrb r0, [r2, 0x19] @@ -649023,7 +649023,7 @@ _0815126E: lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x8 - bls _0815126E + bls @0815126E ldr r5, =0x0203abb0 ldr r4, =0x0203abac ldr r0, [r4] @@ -649049,7 +649049,7 @@ _0815126E: ldr r1, [r4] ldrb r0, [r1, 0x18] cmp r0, 0 - bne _08151368 + bne @08151368 ldrb r2, [r1, 0x1A] adds r3, r2, 0 adds r3, 0x1D @@ -649080,7 +649080,7 @@ _0815126E: movs r1, 0 movs r2, 0 bl Bg_FillWramTileMapRectWithTileAndPalette -_08151368: +@08151368: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -649094,7 +649094,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 @@ -649133,7 +649133,7 @@ sub_8151388: @ 8151388 mov r10, r2 ldr r0, =0x0203abb4 mov r9, r0 -_081513D4: +@081513D4: mov r1, r10 ldr r2, [r1] ldrb r0, [r2, 0x19] @@ -649197,7 +649197,7 @@ _081513D4: lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x8 - bls _081513D4 + bls @081513D4 ldr r4, =0x0203abb4 ldr r5, =0x0203abac ldr r3, [r5] @@ -649223,7 +649223,7 @@ _081513D4: ldr r1, [r5] ldrb r0, [r1, 0x18] cmp r0, 0xA - bne _081514A6 + bne @081514A6 ldrb r2, [r1, 0x1A] adds r3, r2, 0x3 adds r0, r3, 0 @@ -649235,7 +649235,7 @@ _081513D4: movs r0, 0xFE strb r0, [r1, 0x18] bl sub_8151088 -_081514A6: +@081514A6: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -649249,15 +649249,15 @@ _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 cmp r0, 0 - beq _081514D6 + beq @081514D6 cmp r0, 0x1 - beq _08151500 -_081514D6: + beq @08151500 +@081514D6: ldr r1, =0x0203abac ldr r2, [r1] movs r3, 0 @@ -649273,10 +649273,10 @@ _081514D6: strb r0, [r1, 0x18] bl sub_8151088 bl sub_8151214 - b _08151522 + b @08151522 .align 2, 0 .pool -_08151500: +@08151500: ldr r1, =0x0203abac ldr r2, [r1] movs r0, 0x2 @@ -649292,7 +649292,7 @@ _08151500: strb r0, [r1, 0x18] bl sub_8151088 bl sub_8151388 -_08151522: +@08151522: ldr r0, =0x0203abac ldr r1, [r0] movs r0, 0 @@ -649304,7 +649304,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 @@ -649313,9 +649313,9 @@ sub_8151534: @ 8151534 muls r0, r1 adds r1, r0, 0 cmp r0, 0 - bge _08151548 + bge @08151548 adds r1, 0xFF -_08151548: +@08151548: lsls r0, r1, 8 asrs r0, 16 pop {r1} @@ -649323,7 +649323,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 @@ -649344,7 +649344,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 @@ -649358,12 +649358,12 @@ sub_8151574: @ 8151574 adds r7, r5, 0 adds r6, r4, 0 cmp r5, 0 - bge _0815159A + bge @0815159A movs r6, 0xFF movs r7, 0 adds r6, r4 adcs r7, r5 -_0815159A: +@0815159A: lsls r3, r7, 24 lsrs r2, r6, 8 adds r0, r3, 0 @@ -649378,29 +649378,29 @@ _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 lsls r1, 16 asrs r1, 16 cmp r1, 0 - beq _081515CC + beq @081515CC lsls r0, 16 asrs r0, 8 bl __divsi3 lsls r0, 16 asrs r0, 16 - b _081515CE -_081515CC: + b @081515CE +@081515CC: movs r0, 0 -_081515CE: +@081515CE: pop {r1} bx r1 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 @@ -649409,27 +649409,27 @@ sub_81515D4: @ 81515D4 lsls r2, 16 asrs r1, r2, 16 cmp r1, 0 - beq _081515F6 + beq @081515F6 lsls r0, 16 asrs r0, 16 lsls r0, r3 bl __divsi3 lsls r0, 16 asrs r0, 16 - b _081515F8 -_081515F6: + b @081515F8 +@081515F6: movs r0, 0 -_081515F8: +@081515F8: pop {r1} bx r1 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 - beq _0815161C + beq @0815161C adds r2, r0, 0 asrs r3, r0, 31 lsrs r5, r2, 24 @@ -649440,17 +649440,17 @@ sub_81515FC: @ 81515FC adds r2, r6, 0 asrs r3, r6, 31 bl __divdi3 - b _0815161E -_0815161C: + b @0815161E +@0815161C: movs r0, 0 -_0815161E: +@0815161E: pop {r4-r6} pop {r1} bx r1 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 @@ -649465,7 +649465,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 @@ -649483,22 +649483,22 @@ 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 - ldr r0, _08151670 + ldr r1, @08151674 + ldr r0, @08151670 asrs r3, r2, 31 bl __divdi3 pop {r1} bx r1 .align 2, 0 -_08151670: .4byte 0x00010000 -_08151674: .4byte 0x00000000 +@08151670: .4byte 0x00010000 +@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] @@ -649511,13 +649511,13 @@ 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 lsrs r6, r1, 24 cmp r6, 0xF - bhi _081516A8 + bhi @081516A8 lsls r0, r6, 1 adds r0, r6 lsls r0, 2 @@ -649525,11 +649525,11 @@ sub_815168C: @ 815168C ldrb r7, [r5, 0x4] lsrs r0, r7, 7 cmp r0, 0 - beq _081516AC -_081516A8: + beq @081516AC +@081516A8: movs r0, 0xFF - b _0815170A -_081516AC: + b @0815170A +@081516AC: ldrh r0, [r2] movs r4, 0 strh r0, [r5, 0x8] @@ -649571,29 +649571,29 @@ _081516AC: strb r4, [r5, 0x5] lsls r1, 24 cmp r1, 0 - bge _08151704 + bge @08151704 movs r0, 0xFF - b _08151706 -_08151704: + b @08151706 +@08151704: movs r0, 0x1 -_08151706: +@08151706: strb r0, [r5, 0x7] adds r0, r6, 0 -_0815170A: +@0815170A: pop {r4-r7} pop {r1} bx r1 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 lsrs r1, 24 adds r4, r1, 0 cmp r4, 0xF - bhi _0815173C + bhi @0815173C lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -649601,23 +649601,23 @@ sub_8151710: @ 8151710 ldrb r0, [r1, 0x4] lsrs r0, 7 cmp r0, 0 - beq _0815173C + beq @0815173C adds r0, r1, 0x4 movs r1, 0 movs r2, 0xC bl memset adds r0, r4, 0 - b _0815173E -_0815173C: + b @0815173E +@0815173C: movs r0, 0xFF -_0815173E: +@0815173E: pop {r4} pop {r1} bx r1 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 @@ -649628,9 +649628,9 @@ sub_8151744: @ 8151744 mov r12, r0 ldrb r1, [r5, 0x8] cmp r12, r1 - bcc _0815175C - b _081518F4 -_0815175C: + bcc @0815175C + b @081518F4 +@0815175C: movs r7, 0x1F ldr r0, =0xfffffc1f mov r10, r0 @@ -649639,7 +649639,7 @@ _0815175C: mov r9, r1 movs r0, 0x1F mov r8, r0 -_0815176C: +@0815176C: ldrh r0, [r5, 0x6] add r0, r12 lsls r0, 1 @@ -649651,13 +649651,13 @@ _0815176C: lsls r0, 25 lsrs r0, 25 cmp r0, 0x1 - beq _08151798 + beq @08151798 cmp r0, 0x2 - beq _081517F6 - b _081518E2 + beq @081517F6 + b @081518E2 .align 2, 0 .pool -_08151798: +@08151798: ldr r0, [r3] lsls r2, r0, 27 lsrs r0, r2, 27 @@ -649665,7 +649665,7 @@ _08151798: ldrsb r1, [r5, r1] adds r0, r1 cmp r0, 0x1F - bhi _081517BA + bhi @081517BA lsrs r0, r2, 27 adds r0, r1 ands r0, r7 @@ -649675,7 +649675,7 @@ _08151798: ands r1, r2 orrs r1, r0 strb r1, [r3] -_081517BA: +@081517BA: ldr r0, [r3] lsls r2, r0, 22 lsrs r0, r2, 27 @@ -649683,7 +649683,7 @@ _081517BA: ldrsb r1, [r5, r1] adds r0, r1 cmp r0, 0x1F - bhi _081517DE + bhi @081517DE lsrs r0, r2, 27 adds r0, r1 mov r1, r8 @@ -649694,7 +649694,7 @@ _081517BA: ands r1, r2 orrs r1, r0 strh r1, [r3] -_081517DE: +@081517DE: ldr r0, [r3] lsls r2, r0, 17 lsrs r0, r2, 27 @@ -649702,17 +649702,17 @@ _081517DE: ldrsb r1, [r5, r1] adds r0, r1 cmp r0, 0x1F - bls _081517F0 - b _081518E2 -_081517F0: + bls @081517F0 + b @081518E2 +@081517F0: lsrs r0, r2, 27 adds r0, r1 - b _081518D4 -_081517F6: + b @081518D4 +@081517F6: movs r0, 0x3 ldrsb r0, [r5, r0] cmp r0, 0 - bge _08151868 + bge @08151868 ldr r0, [r3] lsls r4, r0, 27 lsrs r1, r4, 27 @@ -649723,7 +649723,7 @@ _081517F6: lsls r0, 27 lsrs r0, 27 cmp r1, r0 - blt _08151826 + blt @08151826 lsrs r0, r4, 27 adds r0, r2 ands r0, r7 @@ -649733,7 +649733,7 @@ _081517F6: ands r1, r2 orrs r1, r0 strb r1, [r3] -_08151826: +@08151826: ldr r0, [r3] lsls r4, r0, 22 lsrs r1, r4, 27 @@ -649744,7 +649744,7 @@ _08151826: lsls r0, 22 lsrs r0, 27 cmp r1, r0 - blt _08151850 + blt @08151850 lsrs r0, r4, 27 adds r0, r2 mov r1, r8 @@ -649755,7 +649755,7 @@ _08151826: ands r1, r2 orrs r1, r0 strh r1, [r3] -_08151850: +@08151850: ldr r0, [r3] lsls r4, r0, 17 lsrs r1, r4, 27 @@ -649766,9 +649766,9 @@ _08151850: lsls r0, 17 lsrs r0, 27 cmp r1, r0 - blt _081518E2 - b _081518D0 -_08151868: + blt @081518E2 + b @081518D0 +@08151868: ldr r0, [r3] lsls r4, r0, 27 lsrs r1, r4, 27 @@ -649779,7 +649779,7 @@ _08151868: lsls r0, 27 lsrs r0, 27 cmp r1, r0 - bgt _08151890 + bgt @08151890 lsrs r0, r4, 27 adds r0, r2 ands r0, r7 @@ -649789,7 +649789,7 @@ _08151868: ands r1, r2 orrs r1, r0 strb r1, [r3] -_08151890: +@08151890: ldr r0, [r3] lsls r4, r0, 22 lsrs r1, r4, 27 @@ -649800,7 +649800,7 @@ _08151890: lsls r0, 22 lsrs r0, 27 cmp r1, r0 - bgt _081518BA + bgt @081518BA lsrs r0, r4, 27 adds r0, r2 mov r1, r8 @@ -649811,7 +649811,7 @@ _08151890: ands r1, r2 orrs r1, r0 strh r1, [r3] -_081518BA: +@081518BA: ldr r0, [r3] lsls r4, r0, 17 lsrs r1, r4, 27 @@ -649822,11 +649822,11 @@ _081518BA: lsls r0, 17 lsrs r0, 27 cmp r1, r0 - bgt _081518E2 -_081518D0: + bgt @081518E2 +@081518D0: lsrs r0, r4, 27 adds r0, r2 -_081518D4: +@081518D4: ands r0, r7 lsls r0, 2 ldrb r2, [r3, 0x1] @@ -649834,7 +649834,7 @@ _081518D4: ands r1, r2 orrs r1, r0 strb r1, [r3, 0x1] -_081518E2: +@081518E2: mov r0, r12 adds r0, 0x1 lsls r0, 24 @@ -649842,9 +649842,9 @@ _081518E2: mov r12, r0 ldrb r0, [r5, 0x8] cmp r12, r0 - bcs _081518F4 - b _0815176C -_081518F4: + bcs @081518F4 + b @0815176C +@081518F4: ldrb r1, [r5, 0x2] adds r0, r1, 0x1 strb r0, [r5, 0x2] @@ -649853,10 +649853,10 @@ _081518F4: lsls r1, 24 asrs r0, 3 cmp r1, r0 - beq _0815190A + beq @0815190A movs r0, 0 - b _0815193E -_0815190A: + b @0815193E +@0815190A: movs r0, 0 strb r0, [r5, 0x2] movs r0, 0x3 @@ -649868,16 +649868,16 @@ _0815190A: movs r0, 0x7F ands r0, r2 cmp r0, 0x1 - bne _0815192A + bne @0815192A lsls r0, r2, 25 lsrs r0, 25 adds r0, 0x1 - b _08151930 -_0815192A: + b @08151930 +@0815192A: lsls r0, r2, 25 lsrs r0, 25 subs r0, 0x1 -_08151930: +@08151930: ands r0, r1 movs r1, 0x80 negs r1, r1 @@ -649885,7 +649885,7 @@ _08151930: orrs r1, r0 strb r1, [r5] movs r0, 0x1 -_0815193E: +@0815193E: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -649896,7 +649896,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 @@ -649904,16 +649904,16 @@ sub_815194C: @ 815194C lsls r0, 25 lsrs r0, 25 cmp r0, 0x1 - beq _08151962 + beq @08151962 cmp r0, 0x2 - beq _08151990 - b _081519CA -_08151962: + beq @08151990 + b @081519CA +@08151962: ldrb r0, [r3, 0x8] cmp r2, r0 - bcs _08151982 + bcs @08151982 ldr r4, =0x02037b14 -_0815196A: +@0815196A: ldrh r0, [r3, 0x6] adds r0, r2 lsls r0, 1 @@ -649925,22 +649925,22 @@ _0815196A: lsrs r2, r0, 24 ldrb r0, [r3, 0x8] cmp r2, r0 - bcc _0815196A -_08151982: + bcc @0815196A +@08151982: ldrb r2, [r3] lsls r1, r2, 25 lsrs r1, 25 adds r1, 0x1 - b _081519BC + b @081519BC .align 2, 0 .pool -_08151990: +@08151990: ldrb r0, [r3, 0x8] cmp r2, r0 - bcs _081519B4 + bcs @081519B4 ldr r5, =0x02037b14 ldr r4, =0x02037714 -_0815199A: +@0815199A: ldrh r0, [r3, 0x6] adds r0, r2 lsls r0, 1 @@ -649953,13 +649953,13 @@ _0815199A: lsrs r2, r0, 24 ldrb r0, [r3, 0x8] cmp r2, r0 - bcc _0815199A -_081519B4: + bcc @0815199A +@081519B4: ldrb r2, [r3] lsls r1, r2, 25 lsrs r1, 25 subs r1, 0x1 -_081519BC: +@081519BC: movs r0, 0x7F ands r1, r0 movs r0, 0x80 @@ -649967,7 +649967,7 @@ _081519BC: ands r0, r2 orrs r0, r1 strb r0, [r3] -_081519CA: +@081519CA: movs r0, 0x1 pop {r4,r5} pop {r1} @@ -649977,20 +649977,20 @@ _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 ldrb r0, [r4] cmp r0, 0 - beq _08151A40 -_081519E8: + beq @08151A40 +@081519E8: ldrh r0, [r4, 0x2] asrs r0, r5 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08151A36 + beq @08151A36 lsls r1, r5, 1 adds r0, r1, r5 lsls r3, r0, 2 @@ -650002,42 +650002,42 @@ _081519E8: lsrs r0, 24 adds r6, r1, 0 cmp r0, 0xFF - bne _08151A36 + bne @08151A36 ldrh r0, [r2, 0x8] movs r2, 0x80 lsls r2, 8 adds r1, r2, 0 ands r0, r1 cmp r0, 0 - beq _08151A24 + beq @08151A24 adds r0, r3, 0x4 adds r0, r4, r0 bl sub_8151744 - b _08151A2C -_08151A24: + b @08151A2C +@08151A24: adds r0, r3, 0x4 adds r0, r4, r0 bl sub_815194C -_08151A2C: +@08151A2C: adds r0, r6, r5 lsls r0, 2 adds r0, r4, r0 ldrb r1, [r0, 0xD] strb r1, [r0, 0x5] -_08151A36: +@08151A36: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0xF - bls _081519E8 -_08151A40: + bls @081519E8 +@08151A40: pop {r4-r6} pop {r0} bx r0 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 @@ -650049,12 +650049,12 @@ sub_8151A48: @ 8151A48 movs r5, 0x1 movs r7, 0x80 negs r7, r7 -_08151A5E: +@08151A5E: adds r0, r6, 0 asrs r0, r4 ands r0, r5 cmp r0, 0 - beq _08151A8C + beq @08151A8C lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -650062,7 +650062,7 @@ _08151A5E: ldrb r0, [r2, 0x4] lsrs r0, 7 cmp r0, 0 - beq _08151A8C + beq @08151A8C adds r0, r5, 0 lsls r0, r4 ldrh r1, [r3, 0x2] @@ -650073,19 +650073,19 @@ _08151A5E: ands r0, r1 orrs r0, r5 strb r0, [r2, 0x4] -_08151A8C: +@08151A8C: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bls _08151A5E + bls @08151A5E pop {r4-r7} pop {r0} bx r0 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 @@ -650093,12 +650093,12 @@ sub_8151A9C: @ 8151A9C lsrs r7, r1, 16 movs r5, 0 movs r3, 0x1 -_08151AAA: +@08151AAA: ldrh r0, [r6, 0x2] asrs r0, r5 ands r0, r3 cmp r0, 0 - beq _08151B12 + beq @08151B12 lsls r0, r5, 1 adds r0, r5 lsls r0, 2 @@ -650106,12 +650106,12 @@ _08151AAA: ldrb r0, [r4, 0x4] lsrs r0, 7 cmp r0, 0 - beq _08151B12 + beq @08151B12 adds r0, r7, 0 asrs r0, r5 ands r0, r3 cmp r0, 0 - beq _08151B12 + beq @08151B12 ldrh r1, [r4, 0xA] lsls r1, 1 ldr r0, =0x02037b14 @@ -650135,32 +650135,32 @@ _08151AAA: lsls r0, 24 ldr r3, [sp] cmp r0, 0 - bge _08151B10 + bge @08151B10 movs r0, 0xFF strb r0, [r4, 0x7] - b _08151B12 + b @08151B12 .align 2, 0 .pool -_08151B10: +@08151B10: strb r3, [r4, 0x7] -_08151B12: +@08151B12: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0xF - bls _08151AAA + bls @08151AAA ldr r0, =0x0000ffff cmp r7, r0 - bne _08151B2C + bne @08151B2C movs r0, 0 strb r0, [r6] - b _08151B30 + b @08151B30 .align 2, 0 .pool -_08151B2C: +@08151B2C: ldrh r0, [r6, 0x2] bics r0, r7 -_08151B30: +@08151B30: strh r0, [r6, 0x2] add sp, 0x4 pop {r4-r7} @@ -650169,7 +650169,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 @@ -650178,7 +650178,7 @@ sub_8151B3C: @ 8151B3C movs r1, 0 movs r2, 0xC0 bl memset -_08151B4E: +@08151B4E: lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -650188,14 +650188,14 @@ _08151B4E: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bls _08151B4E + bls @08151B4E pop {r4,r5} pop {r0} bx r0 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 @@ -650204,15 +650204,15 @@ sub_8151B68: @ 8151B68 ldrb r0, [r2, 0x5] lsrs r0, 7 cmp r0, 0 - bne _08151B7E + bne @08151B7E adds r4, r2, 0x4 - b _08151B9C -_08151B7E: + b @08151B9C +@08151B7E: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0xF - bhi _08151B9C + bhi @08151B9C lsls r0, r3, 1 adds r0, r3 lsls r1, r0, 2 @@ -650220,12 +650220,12 @@ _08151B7E: ldrb r0, [r0, 0x5] lsrs r0, 7 cmp r0, 0 - bne _08151B7E + bne @08151B7E adds r0, r1, 0x4 adds r4, r2, r0 -_08151B9C: +@08151B9C: cmp r4, 0 - beq _08151BCA + beq @08151BCA ldrb r1, [r4, 0x1] movs r0, 0x10 negs r0, r0 @@ -650246,17 +650246,17 @@ _08151B9C: ldm r0!, {r2,r4} stm r1!, {r2,r4} adds r0, r3, 0 - b _08151BCC -_08151BCA: + b @08151BCC +@08151BCA: movs r0, 0xFF -_08151BCC: +@08151BCC: pop {r4,r5} pop {r1} bx r1 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] @@ -650264,20 +650264,20 @@ sub_8151BD4: @ 8151BD4 adds r0, r2, 0 ands r0, r1 cmp r0, 0 - bne _08151C16 + bne @08151C16 ldrb r1, [r4, 0xB] adds r0, r2, 0 ands r0, r1 cmp r0, 0 - beq _08151C16 + beq @08151C16 ldrh r2, [r4, 0x6] ldrb r0, [r4, 0x8] adds r0, r2, r0 cmp r2, r0 - bge _08151C16 + bge @08151C16 ldr r5, =0x02037b14 ldr r3, =0x02037714 -_08151BFC: +@08151BFC: lsls r0, r2, 1 adds r1, r0, r5 adds r0, r3 @@ -650290,8 +650290,8 @@ _08151BFC: ldrb r1, [r4, 0x8] adds r0, r1 cmp r2, r0 - blt _08151BFC -_08151C16: + blt @08151BFC +@08151C16: adds r0, r4, 0x4 movs r1, 0 movs r2, 0x8 @@ -650321,7 +650321,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 @@ -650329,7 +650329,7 @@ sub_8151C50: @ 8151C50 lsls r2, 24 movs r5, 0 cmp r2, 0 - bne _08151C74 + bne @08151C74 movs r1, 0xF ands r1, r4 lsls r0, r1, 1 @@ -650338,12 +650338,12 @@ sub_8151C50: @ 8151C50 adds r0, 0x4 adds r0, r6, r0 bl sub_8151BD4 - b _08151CA0 -_08151C74: + b @08151CA0 +@08151C74: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _08151C94 + beq @08151C94 lsls r0, r5, 1 adds r0, r5 lsls r1, r0, 2 @@ -650351,25 +650351,25 @@ _08151C74: ldrb r0, [r0, 0x5] lsrs r0, 7 cmp r0, 0 - beq _08151C94 + beq @08151C94 adds r0, r1, 0x4 adds r0, r6, r0 bl sub_8151BD4 -_08151C94: +@08151C94: lsrs r4, 1 adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0xF - bls _08151C74 -_08151CA0: + bls @08151C74 +@08151CA0: pop {r4-r6} pop {r0} bx r0 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 @@ -650377,7 +650377,7 @@ sub_8151CA8: @ 8151CA8 lsls r2, 24 movs r3, 0 cmp r2, 0 - bne _08151CDC + bne @08151CDC movs r0, 0xF adds r3, r0, 0 ands r3, r4 @@ -650395,16 +650395,16 @@ sub_8151CA8: @ 8151CA8 ldrh r1, [r5] orrs r0, r1 strh r0, [r5] - b _08151D20 -_08151CDC: + b @08151D20 +@08151CDC: movs r6, 0x1 movs r7, 0x41 negs r7, r7 -_08151CE2: +@08151CE2: adds r0, r4, 0 ands r0, r6 cmp r0, 0 - beq _08151D00 + beq @08151D00 lsls r0, r3, 1 adds r0, r3 lsls r0, 2 @@ -650412,15 +650412,15 @@ _08151CE2: ldrb r1, [r2, 0x5] lsrs r0, r1, 7 cmp r0, 0 - beq _08151D00 + beq @08151D00 lsls r0, r1, 25 cmp r0, 0 - blt _08151D06 -_08151D00: + blt @08151D06 +@08151D00: lsls r0, r4, 17 lsrs r4, r0, 16 - b _08151D16 -_08151D06: + b @08151D16 +@08151D06: adds r0, r7, 0 ands r0, r1 strb r0, [r2, 0x5] @@ -650429,20 +650429,20 @@ _08151D06: ldrh r1, [r5] orrs r0, r1 strh r0, [r5] -_08151D16: +@08151D16: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0xF - bls _08151CE2 -_08151D20: + bls @08151CE2 +@08151D20: pop {r4-r7} pop {r0} bx r0 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 @@ -650455,7 +650455,7 @@ sub_8151D28: @ 8151D28 movs r0, 0 mov r12, r0 cmp r2, 0 - bne _08151DB0 + bne @08151DB0 movs r1, 0xF ands r1, r7 lsls r0, r1, 1 @@ -650468,20 +650468,20 @@ sub_8151D28: @ 8151D28 movs r0, 0xC0 ands r0, r1 cmp r0, 0x80 - bne _08151E3A + bne @08151E3A ldrb r1, [r3, 0xB] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _08151D8E + beq @08151D8E ldrh r2, [r3, 0x6] ldrb r0, [r3, 0x8] adds r0, r2, r0 cmp r2, r0 - bge _08151D8E + bge @08151D8E ldr r5, =0x02037b14 ldr r4, =0x02037714 -_08151D74: +@08151D74: lsls r0, r2, 1 adds r1, r0, r5 adds r0, r4 @@ -650494,8 +650494,8 @@ _08151D74: ldrb r1, [r3, 0x8] adds r0, r1 cmp r2, r0 - blt _08151D74 -_08151D8E: + blt @08151D74 +@08151D8E: ldrb r0, [r3, 0x1] movs r1, 0x40 orrs r0, r1 @@ -650507,15 +650507,15 @@ _08151D8E: ldrh r0, [r2] bics r0, r1 strh r0, [r2] - b _08151E3A + b @08151E3A .align 2, 0 .pool -_08151DB0: +@08151DB0: movs r0, 0x1 mov r9, r0 movs r1, 0x40 mov r10, r1 -_08151DB8: +@08151DB8: mov r2, r12 lsls r0, r2, 1 add r0, r12 @@ -650527,34 +650527,34 @@ _08151DB8: mov r2, r9 ands r0, r2 cmp r0, 0 - beq _08151DDA + beq @08151DDA ldrb r1, [r3, 0x1] movs r0, 0xC0 ands r0, r1 cmp r0, 0x80 - beq _08151DE4 -_08151DDA: + beq @08151DE4 +@08151DDA: lsls r0, r7, 17 lsrs r7, r0, 16 mov r5, r12 adds r5, 0x1 - b _08151E30 -_08151DE4: + b @08151E30 +@08151DE4: ldrb r1, [r3, 0xB] mov r0, r10 ands r0, r1 mov r5, r12 adds r5, 0x1 cmp r0, 0 - beq _08151E1A + beq @08151E1A ldrh r2, [r3, 0x6] ldrb r0, [r3, 0x8] adds r0, r2, r0 cmp r2, r0 - bge _08151E1A + bge @08151E1A ldr r6, =0x02037b14 ldr r4, =0x02037714 -_08151E00: +@08151E00: lsls r0, r2, 1 adds r1, r0, r6 adds r0, r4 @@ -650567,8 +650567,8 @@ _08151E00: ldrb r1, [r3, 0x8] adds r0, r1 cmp r2, r0 - blt _08151E00 -_08151E1A: + blt @08151E00 +@08151E1A: ldrb r1, [r3, 0x1] mov r0, r10 orrs r0, r1 @@ -650580,13 +650580,13 @@ _08151E1A: ldrh r0, [r2] bics r0, r1 strh r0, [r2] -_08151E30: +@08151E30: lsls r0, r5, 24 lsrs r0, 24 mov r12, r0 cmp r0, 0xF - bls _08151DB8 -_08151E3A: + bls @08151DB8 +@08151E3A: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -650599,7 +650599,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 @@ -650612,16 +650612,16 @@ sub_8151E50: @ 8151E50 ldr r1, [sp] ldrh r0, [r1] cmp r0, 0 - bne _08151E6C - b _08151FF6 -_08151E6C: + bne @08151E6C + b @08151FF6 +@08151E6C: movs r2, 0xF mov r9, r2 movs r3, 0x10 negs r3, r3 mov r8, r3 movs r7, 0x1 -_08151E78: +@08151E78: mov r5, r10 lsls r0, r5, 1 add r0, r10 @@ -650633,30 +650633,30 @@ _08151E78: movs r3, 0xC0 ands r3, r2 cmp r3, 0x80 - beq _08151E92 - b _08151FE6 -_08151E92: + beq @08151E92 + b @08151FE6 +@08151E92: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _08151EA8 + beq @08151EA8 ldrb r0, [r4, 0xB] ands r3, r0 cmp r3, 0 - beq _08151EA8 - b _08151FE6 -_08151EA8: + beq @08151EA8 + b @08151FE6 +@08151EA8: ldrb r0, [r4, 0x2] subs r0, 0x1 strb r0, [r4, 0x2] lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _08151EB8 - b _08151FE6 -_08151EB8: + beq @08151EB8 + b @08151FE6 +@08151EB8: ldrb r0, [r4, 0x9] strb r0, [r4, 0x2] ldrh r0, [r4, 0x6] @@ -650669,19 +650669,19 @@ _08151EB8: lsls r0, r5, 26 asrs r0, 30 cmp r0, 0x1 - beq _08151F16 + beq @08151F16 cmp r0, 0x1 - bgt _08151EE4 + bgt @08151EE4 cmp r0, 0 - beq _08151EEA - b _08151FD0 + beq @08151EEA + b @08151FD0 .align 2, 0 .pool -_08151EE4: +@08151EE4: cmp r0, 0x2 - beq _08151F92 - b _08151FD0 -_08151EEA: + beq @08151F92 + b @08151FD0 +@08151EEA: ldrb r2, [r4, 0x1] lsls r1, r2, 28 lsrs r0, r1, 28 @@ -650697,19 +650697,19 @@ _08151EEA: lsls r0, r5, 28 asrs r0, 28 cmp r1, r0 - bne _08151FD0 + bne @08151FD0 ldrb r0, [r4, 0x3] adds r0, 0x1 strb r0, [r4, 0x3] ands r3, r6 strb r3, [r4, 0x1] - b _08151FD0 -_08151F16: + b @08151FD0 +@08151F16: ldrb r3, [r4, 0x1] movs r0, 0x10 ands r0, r3 cmp r0, 0 - beq _08151F54 + beq @08151F54 lsls r0, r3, 28 lsrs r0, 28 subs r0, 0x1 @@ -650720,7 +650720,7 @@ _08151F16: orrs r2, r0 strb r2, [r4, 0x1] cmp r0, 0 - bne _08151FD0 + bne @08151FD0 ldrb r0, [r4, 0x3] adds r0, 0x1 strb r0, [r4, 0x3] @@ -650735,8 +650735,8 @@ _08151F16: ands r2, r1 orrs r2, r0 strb r2, [r4, 0x1] - b _08151FD0 -_08151F54: + b @08151FD0 +@08151F54: lsls r0, r5, 28 asrs r0, 28 subs r0, 0x1 @@ -650752,7 +650752,7 @@ _08151F54: strb r3, [r4, 0x1] lsrs r2, 28 cmp r2, r0 - bne _08151FD0 + bne @08151FD0 ldrb r0, [r4, 0x3] adds r0, 0x1 strb r0, [r4, 0x3] @@ -650767,17 +650767,17 @@ _08151F54: ands r3, r1 orrs r3, r0 strb r3, [r4, 0x1] - b _08151FD0 -_08151F92: + b @08151FD0 +@08151F92: ldrb r2, [r4, 0x1] movs r0, 0x10 ands r0, r2 cmp r0, 0 - beq _08151FA2 + beq @08151FA2 mov r0, r8 ands r0, r2 - b _08151FB0 -_08151FA2: + b @08151FB0 +@08151FA2: lsls r1, r5, 28 asrs r1, 28 mov r3, r9 @@ -650785,7 +650785,7 @@ _08151FA2: mov r0, r8 ands r0, r2 orrs r0, r1 -_08151FB0: +@08151FB0: strb r0, [r4, 0x1] ldrb r2, [r4, 0x1] lsls r0, r2, 27 @@ -650802,27 +650802,27 @@ _08151FB0: ldrb r0, [r4, 0x3] adds r0, 0x1 strb r0, [r4, 0x3] -_08151FD0: +@08151FD0: ldrb r1, [r4, 0xA] cmp r1, 0xFF - beq _08151FE6 + beq @08151FE6 ldrb r0, [r4, 0x3] cmp r0, r1 - bne _08151FE6 + bne @08151FE6 ldrb r1, [r4] ldr r0, [sp] movs r2, 0 bl sub_8151D28 -_08151FE6: +@08151FE6: mov r0, r10 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r10, r0 cmp r0, 0xF - bhi _08151FF6 - b _08151E78 -_08151FF6: + bhi @08151FF6 + b @08151E78 +@08151FF6: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -650834,7 +650834,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] @@ -650854,35 +650854,35 @@ sub_8152008: @ 8152008 lsls r3, 1 adds r6, r3 cmp r1, r4 - bcs _08152052 -_08152030: + bcs @08152052 +@08152030: lsls r0, r1, 6 adds r2, r6, r0 movs r0, 0 adds r3, r1, 0x1 cmp r0, r5 - bcs _0815204A -_0815203C: + bcs @0815204A +@0815203C: strh r7, [r2] adds r2, 0x2 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 cmp r0, r5 - bcc _0815203C -_0815204A: + bcc @0815203C +@0815204A: lsls r0, r3, 24 lsrs r1, r0, 24 cmp r1, r4 - bcc _08152030 -_08152052: + bcc @08152030 +@08152052: pop {r4-r7} pop {r0} bx r0 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] @@ -650900,15 +650900,15 @@ sub_8152058: @ 8152058 lsls r3, 1 adds r7, r3 cmp r4, r6 - bcs _081520A2 -_0815207C: + bcs @081520A2 +@0815207C: lsls r0, r4, 6 adds r2, r7, r0 movs r3, 0 adds r4, 0x1 cmp r3, r5 - bcs _0815209A -_08152088: + bcs @0815209A +@08152088: ldrh r0, [r1] strh r0, [r2] adds r1, 0x2 @@ -650917,20 +650917,20 @@ _08152088: lsls r0, 24 lsrs r3, r0, 24 cmp r3, r5 - bcc _08152088 -_0815209A: + bcc @08152088 +@0815209A: lsls r0, r4, 24 lsrs r4, r0, 24 cmp r4, r6 - bcc _0815207C -_081520A2: + bcc @0815207C +@081520A2: pop {r4-r7} pop {r0} bx r0 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 @@ -650955,17 +650955,17 @@ sub_81520A8: @ 81520A8 movs r0, 0 lsrs r4, r3, 24 cmp r0, r8 - bcs _08152122 -_081520DA: + bcs @08152122 +@081520DA: ldr r2, [sp] movs r3, 0 adds r6, r4, 0x1 adds r0, 0x1 mov r12, r0 cmp r3, r7 - bcs _0815210C + bcs @0815210C lsls r5, r4, 6 -_081520EA: +@081520EA: lsls r0, r2, 1 adds r0, r5 add r0, r10 @@ -650982,8 +650982,8 @@ _081520EA: lsls r0, 24 lsrs r3, r0, 24 cmp r3, r7 - bcc _081520EA -_0815210C: + bcc @081520EA +@0815210C: adds r0, r6, 0 asrs r0, 5 lsls r0, 5 @@ -650994,8 +650994,8 @@ _0815210C: lsls r0, r1, 24 lsrs r0, 24 cmp r0, r8 - bcc _081520DA -_08152122: + bcc @081520DA +@08152122: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -651007,7 +651007,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 @@ -651031,17 +651031,17 @@ sub_8152134: @ 8152134 adds r5, r1, 0 lsrs r4, r3, 24 cmp r0, r9 - bcs _081521AE -_08152164: + bcs @081521AE +@08152164: ldr r2, [sp] movs r3, 0 adds r7, r4, 0x1 adds r0, 0x1 mov r8, r0 cmp r3, r12 - bcs _08152198 + bcs @08152198 lsls r6, r4, 6 -_08152174: +@08152174: lsls r0, r2, 1 adds r0, r6 add r0, r10 @@ -651059,8 +651059,8 @@ _08152174: lsls r0, 24 lsrs r3, r0, 24 cmp r3, r12 - bcc _08152174 -_08152198: + bcc @08152174 +@08152198: adds r0, r7, 0 asrs r0, 5 lsls r0, 5 @@ -651071,8 +651071,8 @@ _08152198: lsls r0, r1, 24 lsrs r0, 24 cmp r0, r9 - bcc _08152164 -_081521AE: + bcc @08152164 +@081521AE: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -651084,7 +651084,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} @@ -651092,17 +651092,17 @@ sub_81521C0: @ 81521C0 lsrs r4, r0, 24 movs r5, 0 cmp r4, 0 - beq _081521FE + beq @081521FE cmp r4, 0x40 - bls _081521D6 + bls @081521D6 movs r4, 0x40 -_081521D6: +@081521D6: ldr r6, =0x0203abb8 movs r0, 0x8 bl malloc_and_clear str r0, [r6] cmp r0, 0 - beq _081521FE + beq @081521FE lsls r0, r4, 1 adds r0, r4 lsls r0, 4 @@ -651110,25 +651110,25 @@ _081521D6: ldr r1, [r6] str r0, [r1, 0x4] cmp r0, 0 - bne _08152208 + bne @08152208 adds r0, r1, 0 bl free str r5, [r6] -_081521FE: +@081521FE: movs r0, 0 - b _08152244 + b @08152244 .align 2, 0 .pool -_08152208: +@08152208: strb r4, [r1] cmp r5, r4 - bcs _08152242 + bcs @08152242 adds r3, r6, 0 ldr r0, =0x082ec690 mov r12, r0 movs r2, 0x4 mov r8, r2 -_08152218: +@08152218: ldr r0, [r3] ldr r2, [r0, 0x4] lsls r1, r5, 1 @@ -651149,10 +651149,10 @@ _08152218: lsls r0, 24 lsrs r5, r0, 24 cmp r5, r4 - bcc _08152218 -_08152242: + bcc @08152218 +@08152242: movs r0, 0x1 -_08152244: +@08152244: pop {r3} mov r8, r3 pop {r4-r7} @@ -651163,27 +651163,27 @@ _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 ldr r2, [r0] adds r5, r0, 0 cmp r2, 0 - bne _0815226C + bne @0815226C movs r0, 0 - b _081522C4 + b @081522C4 .align 2, 0 .pool -_0815226C: +@0815226C: ldrb r2, [r2] cmp r3, r2 - bcs _08152292 + bcs @08152292 ldr r0, =0x030024f8 mov r12, r0 ldr r4, =0x082ec690 adds r2, r5, 0 -_0815227A: +@0815227A: lsls r1, r3, 3 add r1, r12 adds r0, r4, 0 @@ -651195,8 +651195,8 @@ _0815227A: ldr r0, [r2] ldrb r0, [r0] cmp r3, r0 - bcc _0815227A -_08152292: + bcc @0815227A +@08152292: ldr r1, [r5] ldrb r0, [r1] lsls r2, r0, 1 @@ -651218,7 +651218,7 @@ _08152292: bl free str r4, [r5] movs r0, 0x1 -_081522C4: +@081522C4: pop {r4-r7} pop {r1} bx r1 @@ -651227,7 +651227,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} @@ -651236,23 +651236,23 @@ sub_81522D4: @ 81522D4 ldr r1, [r0] adds r3, r0, 0 cmp r1, 0 - beq _081522EC + beq @081522EC ldr r0, [r1, 0x4] cmp r0, 0 - bne _081522F4 -_081522EC: + bne @081522F4 +@081522EC: movs r0, 0 - b _081523D2 + b @081523D2 .align 2, 0 .pool -_081522F4: +@081522F4: ldrb r1, [r1] cmp r6, r1 - bcs _081523D0 + bcs @081523D0 adds r7, r3, 0 movs r0, 0x3 mov r8, r0 -_08152300: +@08152300: ldr r0, [r7] ldr r1, [r0, 0x4] lsls r0, r6, 1 @@ -651263,13 +651263,13 @@ _08152300: movs r0, 0x3 ands r0, r1 cmp r0, 0x3 - bne _081523C2 + bne @081523C2 ldr r1, [r2, 0x2C] cmp r1, 0 - beq _08152322 + beq @08152322 adds r0, r2, 0 bl _call_via_r1 -_08152322: +@08152322: ldr r0, [r7] ldr r0, [r0, 0x4] adds r2, r5, r0 @@ -651277,17 +651277,17 @@ _08152322: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08152348 + beq @08152348 lsls r0, r6, 3 ldr r1, =0x030024f8 adds r0, r1 ldr r1, =0x082ec690 ldm r1!, {r2,r3} stm r0!, {r2,r3} - b _081523C0 + b @081523C0 .align 2, 0 .pool -_08152348: +@08152348: ldrb r0, [r2, 0xE] ldrb r4, [r2, 0xA] adds r0, r4 @@ -651348,19 +651348,19 @@ _08152348: adds r0, r5, r0 ldm r0!, {r2,r3} stm r1!, {r2,r3} -_081523C0: +@081523C0: ldr r3, =0x0203abb8 -_081523C2: +@081523C2: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 ldr r0, [r3] ldrb r0, [r0] cmp r6, r0 - bcc _08152300 -_081523D0: + bcc @08152300 +@081523D0: movs r0, 0x1 -_081523D2: +@081523D2: pop {r3} mov r8, r3 pop {r4-r7} @@ -651371,20 +651371,20 @@ _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 lsrs r6, r1, 24 cmp r4, 0 - beq _08152430 + beq @08152430 ldrh r0, [r4, 0x10] bl gpu_tile_obj_tag_get_range_start lsls r0, 16 lsrs r5, r0, 16 ldr r0, =0x0000ffff cmp r5, r0 - beq _08152430 + beq @08152430 strb r6, [r4, 0x18] ldrb r0, [r4, 0x1] lsrs r0, 6 @@ -651397,19 +651397,19 @@ sub_81523F4: @ 81523F4 adds r0, r5, r0 strh r0, [r4, 0x14] movs r0, 0x1 - b _08152432 + b @08152432 .align 2, 0 .pool -_08152430: +@08152430: movs r0, 0 -_08152432: +@08152432: pop {r4-r6} pop {r1} bx r1 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 @@ -651417,10 +651417,10 @@ sub_8152438: @ 8152438 ldr r0, =0x0203abb8 ldr r0, [r0] cmp r0, 0 - beq _0815246C + beq @0815246C ldrb r1, [r0] cmp r2, r1 - bcs _0815246C + bcs @0815246C ldr r1, [r0, 0x4] lsls r0, r2, 1 adds r0, r2 @@ -651430,22 +651430,22 @@ sub_8152438: @ 8152438 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0815246C + beq @0815246C str r4, [r3, 0x2C] adds r0, r2, 0 - b _0815246E + b @0815246E .align 2, 0 .pool -_0815246C: +@0815246C: movs r0, 0xFF -_0815246E: +@0815246E: pop {r4} pop {r1} bx r1 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 @@ -651456,10 +651456,10 @@ sub_8152474: @ 8152474 ldr r0, =0x0203abb8 ldr r0, [r0] cmp r0, 0 - beq _081524A8 + beq @081524A8 ldrb r1, [r0] cmp r3, r1 - bcs _081524A8 + bcs @081524A8 ldr r1, [r0, 0x4] lsls r0, r3, 1 adds r0, r3 @@ -651469,29 +651469,29 @@ sub_8152474: @ 8152474 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081524A8 + beq @081524A8 cmp r4, 0x7 - bls _081524B0 -_081524A8: + bls @081524B0 +@081524A8: movs r0, 0xFF - b _081524BC + b @081524BC .align 2, 0 .pool -_081524B0: +@081524B0: lsls r1, r4, 1 adds r0, r2, 0 adds r0, 0x1A adds r0, r1 strh r5, [r0] adds r0, r3, 0 -_081524BC: +@081524BC: pop {r4,r5} pop {r1} bx r1 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 @@ -651524,14 +651524,14 @@ sub_81524C4: @ 81524C4 ldr r0, =0x0203abb8 ldr r0, [r0] cmp r0, 0 - beq _0815255E + beq @0815255E mov r1, r9 cmp r1, 0 - bne _08152530 - b _0815255E + bne @08152530 + b @0815255E .align 2, 0 .pool -_08152514: +@08152514: adds r5, r2, 0 adds r0, r5, 0 movs r1, 0 @@ -651544,16 +651544,16 @@ _08152514: movs r1, 0x2 orrs r0, r1 strb r0, [r5, 0x19] - b _0815255A -_08152530: + b @0815255A +@08152530: movs r4, 0 ldrb r1, [r0] cmp r5, r1 - bcs _0815255A + bcs @0815255A ldr r6, [r0, 0x4] adds r3, r1, 0 movs r7, 0x1 -_0815253E: +@0815253E: lsls r0, r4, 1 adds r0, r4 lsls r0, 4 @@ -651562,19 +651562,19 @@ _0815253E: adds r0, r7, 0 ands r0, r1 cmp r0, 0 - beq _08152514 + beq @08152514 adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r3 - bcc _0815253E -_0815255A: + bcc @0815253E +@0815255A: cmp r5, 0 - bne _08152562 -_0815255E: + bne @08152562 +@0815255E: movs r0, 0xFF - b _081525C0 -_08152562: + b @081525C0 +@08152562: adds r1, r5, 0 mov r0, r9 ldm r0!, {r2,r3} @@ -651600,7 +651600,7 @@ _08152562: strb r4, [r5, 0x5] mov r0, r10 cmp r0, 0x3 - bhi _081525B6 + bhi @081525B6 movs r1, 0x3 ands r1, r0 lsls r3, r1, 3 @@ -651616,12 +651616,12 @@ _08152562: ands r4, r0 orrs r4, r1 strb r4, [r5, 0x5] -_081525B6: +@081525B6: adds r0, r5, 0 ldr r1, [sp, 0xC] bl sub_81523F4 ldrb r0, [r5, 0x16] -_081525C0: +@081525C0: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -651633,14 +651633,14 @@ _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 ldr r6, =0x0203abb8 ldr r0, [r6] cmp r0, 0 - beq _081525F2 + beq @081525F2 ldr r1, [r0, 0x4] lsls r0, r5, 1 adds r0, r5 @@ -651650,13 +651650,13 @@ sub_81525D0: @ 81525D0 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _081525FC -_081525F2: + bne @081525FC +@081525F2: movs r0, 0xFF - b _0815263C + b @0815263C .align 2, 0 .pool -_081525FC: +@081525FC: adds r0, r2, 0 movs r1, 0 movs r2, 0x30 @@ -651688,7 +651688,7 @@ _081525FC: ldm r0!, {r2,r3} stm r1!, {r2,r3} adds r0, r5, 0 -_0815263C: +@0815263C: pop {r4-r6} pop {r1} bx r1 @@ -651697,11 +651697,11 @@ _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 -_08152656: +@08152656: ldr r1, [r5] adds r0, r4, 0 bl _call_via_r1 @@ -651715,7 +651715,7 @@ _08152656: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0xF - bls _08152656 + bls @08152656 pop {r4,r5} pop {r0} bx r0 @@ -651724,7 +651724,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] @@ -651738,7 +651738,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 @@ -651746,46 +651746,46 @@ sub_815269C: @ 815269C lsrs r3, r1, 24 movs r4, 0 cmp r0, 0x1 - beq _081526D0 + beq @081526D0 cmp r0, 0x1 - bgt _081526B6 + bgt @081526B6 cmp r0, 0 - beq _081526BC - b _081526F4 -_081526B6: + beq @081526BC + b @081526F4 +@081526B6: cmp r0, 0x2 - beq _081526E4 - b _081526F4 -_081526BC: + beq @081526E4 + b @081526F4 +@081526BC: ldr r2, =0x030061fc movs r1, 0x1 lsls r1, r3 ldr r0, [r2] orrs r0, r1 str r0, [r2] - b _081526F4 + b @081526F4 .align 2, 0 .pool -_081526D0: +@081526D0: ldr r2, =0x030061fc adds r1, r0, 0 lsls r1, r3 ldr r0, [r2] bics r0, r1 str r0, [r2] - b _081526F4 + b @081526F4 .align 2, 0 .pool -_081526E4: +@081526E4: ldr r0, =0x030061fc movs r1, 0x1 lsls r1, r3 ldr r0, [r0] ands r0, r1 cmp r0, 0 - beq _081526F4 + beq @081526F4 movs r4, 0x1 -_081526F4: +@081526F4: adds r0, r4, 0 pop {r4} pop {r1} @@ -651795,7 +651795,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 @@ -651805,16 +651805,16 @@ save_write_to_flash: @ 8152700 str r0, [r1] ldr r0, =0x0000ffff cmp r2, r0 - beq _08152730 + beq @08152730 adds r0, r2, 0 adds r1, r7, 0 bl sub_81527A0 lsls r0, 24 lsrs r5, r0, 24 - b _08152782 + b @08152782 .align 2, 0 .pool -_08152730: +@08152730: ldr r1, =0x030061f8 ldr r5, =0x030061f0 ldrh r0, [r5] @@ -651833,7 +651833,7 @@ _08152730: str r4, [r6] movs r5, 0x1 movs r4, 0 -_08152756: +@08152756: adds r0, r4, 0 adds r1, r7, 0 bl sub_81527A0 @@ -651841,11 +651841,11 @@ _08152756: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0xD - bls _08152756 + bls @08152756 ldr r0, =0x030061fc ldr r0, [r0] cmp r0, 0 - beq _08152782 + beq @08152782 movs r5, 0xFF ldr r1, =0x030061f0 ldr r0, =0x030061f8 @@ -651855,7 +651855,7 @@ _08152756: ldr r0, =0x030061f4 ldr r0, [r0] str r0, [r1] -_08152782: +@08152782: adds r0, r5, 0 pop {r4-r7} pop {r1} @@ -651865,7 +651865,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 @@ -651906,7 +651906,7 @@ sub_81527A0: @ 81527A0 mov r8, r12 movs r2, 0 ldr r1, =0x00000fff -_081527F2: +@081527F2: mov r7, r8 ldr r0, [r7] adds r0, r3 @@ -651915,7 +651915,7 @@ _081527F2: lsls r0, 16 lsrs r3, r0, 16 cmp r3, r1 - bls _081527F2 + bls @081527F2 mov r0, r12 ldr r1, [r0] ldr r2, =0x00000ff4 @@ -651933,9 +651933,9 @@ _081527F2: movs r3, 0 lsls r5, 24 cmp r3, r4 - bcs _08152840 + bcs @08152840 mov r2, r12 -_0815282A: +@0815282A: ldr r1, [r2] adds r1, r3 mov r6, r10 @@ -651946,8 +651946,8 @@ _0815282A: lsls r0, 16 lsrs r3, r0, 16 cmp r3, r4 - bcc _0815282A -_08152840: + bcc @0815282A +@08152840: mov r0, r10 adds r1, r4, 0 bl sub_8153164 @@ -651972,7 +651972,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 @@ -651983,22 +651983,22 @@ sub_8152890: @ 8152890 movs r3, 0 movs r6, 0 ldr r1, =0x00000fff -_081528A4: +@081528A4: adds r0, r4, r3 strb r6, [r0] adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, r1 - bls _081528A4 + bls @081528A4 ldr r0, =0x00000ff8 adds r1, r4, r0 ldr r0, =0x08012025 str r0, [r1] movs r3, 0 cmp r3, r2 - bcs _081528D2 -_081528C0: + bcs @081528D2 +@081528C0: adds r1, r4, r3 adds r0, r5, r3 ldrb r0, [r0] @@ -652007,8 +652007,8 @@ _081528C0: lsls r0, 16 lsrs r3, r0, 16 cmp r3, r2 - bcc _081528C0 -_081528D2: + bcc @081528C0 +@081528D2: adds r0, r5, 0 adds r1, r2, 0 bl sub_8153164 @@ -652028,32 +652028,32 @@ _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 adds r0, r4, 0 bl ProgramFlashSectorsAndVerify cmp r0, 0 - bne _08152924 + bne @08152924 movs r0, 0x1 adds r1, r4, 0 bl sub_815269C movs r0, 0x1 - b _0815292E -_08152924: + b @0815292E +@08152924: movs r0, 0 adds r1, r4, 0 bl sub_815269C movs r0, 0xFF -_0815292E: +@0815292E: pop {r4} pop {r1} bx r1 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 @@ -652088,7 +652088,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] @@ -652112,7 +652112,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 @@ -652120,7 +652120,7 @@ sub_81529D4: @ 81529D4 ldrh r2, [r4] subs r0, 0x1 cmp r2, r0 - bge _08152A28 + bge @08152A28 movs r5, 0x1 adds r0, r2, 0 bl sub_81527A0 @@ -652130,7 +652130,7 @@ sub_81529D4: @ 81529D4 ldr r0, =0x030061fc ldr r0, [r0] cmp r0, 0 - beq _08152A2A + beq @08152A2A movs r5, 0xFF ldr r1, =0x030061f0 ldr r0, =0x030061f8 @@ -652140,12 +652140,12 @@ sub_81529D4: @ 81529D4 ldr r0, =0x030061f4 ldr r0, [r0] str r0, [r1] - b _08152A2A + b @08152A2A .align 2, 0 .pool -_08152A28: +@08152A28: movs r5, 0xFF -_08152A2A: +@08152A2A: adds r0, r5, 0 pop {r4,r5} pop {r1} @@ -652153,7 +652153,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 @@ -652164,7 +652164,7 @@ sub_8152A34: @ 8152A34 ldr r0, =0x030061fc ldr r0, [r0] cmp r0, 0 - beq _08152A5E + beq @08152A5E movs r4, 0xFF ldr r1, =0x030061f0 ldr r0, =0x030061f8 @@ -652174,7 +652174,7 @@ sub_8152A34: @ 8152A34 ldr r0, =0x030061f4 ldr r0, [r0] str r0, [r1] -_08152A5E: +@08152A5E: adds r0, r4, 0 pop {r4} pop {r1} @@ -652184,7 +652184,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 @@ -652225,7 +652225,7 @@ calls_flash_erase_block_2: @ 8152A80 mov r8, r12 movs r2, 0 ldr r1, =0x00000fff -_08152AD2: +@08152AD2: mov r7, r8 ldr r0, [r7] adds r0, r4 @@ -652234,7 +652234,7 @@ _08152AD2: lsls r0, 16 lsrs r4, r0, 16 cmp r4, r1 - bls _08152AD2 + bls @08152AD2 mov r0, r12 ldr r1, [r0] ldr r2, =0x00000ff4 @@ -652253,9 +652253,9 @@ _08152AD2: lsls r6, r5, 24 mov r8, r6 cmp r4, r3 - bcs _08152B22 + bcs @08152B22 mov r2, r12 -_08152B0C: +@08152B0C: ldr r1, [r2] adds r1, r4 mov r7, r10 @@ -652266,8 +652266,8 @@ _08152B0C: lsls r0, 16 lsrs r4, r0, 16 cmp r4, r3 - bcc _08152B0C -_08152B22: + bcc @08152B0C +@08152B22: mov r0, r10 adds r1, r3, 0 bl sub_8153164 @@ -652285,16 +652285,16 @@ _08152B22: ldr r7, =0x00000ff7 mov r9, r7 ldr r7, =0x03007854 - b _08152B82 + b @08152B82 .align 2, 0 .pool -_08152B7C: +@08152B7C: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 -_08152B82: +@08152B82: cmp r4, r9 - bhi _08152BA0 + bhi @08152BA0 ldr r0, =0x03006204 ldr r0, [r0] adds r0, r4 @@ -652305,32 +652305,32 @@ _08152B82: bl _call_via_r3 lsls r0, 16 cmp r0, 0 - beq _08152B7C + beq @08152B7C movs r6, 0xFF -_08152BA0: +@08152BA0: cmp r6, 0xFF - bne _08152BB0 + bne @08152BB0 mov r0, r8 lsrs r1, r0, 24 - b _08152C08 + b @08152C08 .align 2, 0 .pool -_08152BB0: +@08152BB0: movs r6, 0x1 movs r4, 0 ldr r1, =0x03007854 mov r9, r1 ldr r7, =0x00000ff9 - b _08152BCA + b @08152BCA .align 2, 0 .pool -_08152BC4: +@08152BC4: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 -_08152BCA: +@08152BCA: cmp r4, 0x6 - bhi _08152BEC + bhi @08152BEC adds r1, r4, r7 ldr r0, =0x03006204 ldr r0, [r0] @@ -652343,27 +652343,27 @@ _08152BCA: bl _call_via_r3 lsls r0, 16 cmp r0, 0 - beq _08152BC4 + beq @08152BC4 movs r6, 0xFF -_08152BEC: +@08152BEC: cmp r6, 0xFF - beq _08152C04 + beq @08152C04 mov r2, r8 lsrs r1, r2, 24 movs r0, 0x1 bl sub_815269C movs r0, 0x1 - b _08152C10 + b @08152C10 .align 2, 0 .pool -_08152C04: +@08152C04: mov r6, r8 lsrs r1, r6, 24 -_08152C08: +@08152C08: movs r0, 0 bl sub_815269C movs r0, 0xFF -_08152C10: +@08152C10: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -652374,7 +652374,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 @@ -652406,16 +652406,16 @@ sav12_xor_get: @ 8152C20 bl _call_via_r3 lsls r0, 16 cmp r0, 0 - bne _08152C84 + bne @08152C84 lsls r1, r4, 24 lsrs r1, 24 movs r0, 0x1 bl sub_815269C movs r0, 0x1 - b _08152C9C + b @08152C9C .align 2, 0 .pool -_08152C84: +@08152C84: lsls r1, r4, 24 lsrs r1, 24 movs r0, 0 @@ -652427,7 +652427,7 @@ _08152C84: ldr r0, [r0] str r0, [r5] movs r0, 0xFF -_08152C9C: +@08152C9C: pop {r4-r6} pop {r1} bx r1 @@ -652436,7 +652436,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 @@ -652472,16 +652472,16 @@ sub_8152CAC: @ 8152CAC bl _call_via_r3 lsls r0, 16 cmp r0, 0 - bne _08152D1C + bne @08152D1C lsls r1, r4, 24 lsrs r1, 24 movs r0, 0x1 bl sub_815269C movs r0, 0x1 - b _08152D34 + b @08152D34 .align 2, 0 .pool -_08152D1C: +@08152D1C: lsls r1, r4, 24 lsrs r1, 24 movs r0, 0 @@ -652493,7 +652493,7 @@ _08152D1C: ldr r0, [r0] str r0, [r5] movs r0, 0xFF -_08152D34: +@08152D34: pop {r4-r6} pop {r1} bx r1 @@ -652502,7 +652502,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 @@ -652535,16 +652535,16 @@ sub_8152D44: @ 8152D44 bl _call_via_r3 lsls r0, 16 cmp r0, 0 - bne _08152DA8 + bne @08152DA8 lsls r1, r4, 24 lsrs r1, 24 movs r0, 0x1 bl sub_815269C movs r0, 0x1 - b _08152DC0 + b @08152DC0 .align 2, 0 .pool -_08152DA8: +@08152DA8: lsls r1, r4, 24 lsrs r1, 24 movs r0, 0 @@ -652556,7 +652556,7 @@ _08152DA8: ldr r0, [r0] str r0, [r5] movs r0, 0xFF -_08152DC0: +@08152DC0: pop {r4-r6} pop {r1} bx r1 @@ -652565,7 +652565,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 @@ -652575,12 +652575,12 @@ sub_8152DD0: @ 8152DD0 str r0, [r1] ldr r0, =0x0000ffff cmp r4, r0 - beq _08152DF4 + beq @08152DF4 movs r5, 0xFF - b _08152E06 + b @08152E06 .align 2, 0 .pool -_08152DF4: +@08152DF4: adds r0, r6, 0 bl sub_8152EC8 lsls r0, 24 @@ -652588,7 +652588,7 @@ _08152DF4: adds r0, r4, 0 adds r1, r6, 0 bl sub_8152E10 -_08152E06: +@08152E06: adds r0, r5, 0 pop {r4-r6} pop {r1} @@ -652596,7 +652596,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} @@ -652611,7 +652611,7 @@ sub_8152E10: @ 8152E10 lsrs r7, r0, 16 movs r5, 0 ldr r6, =0x03006204 -_08152E2C: +@08152E2C: adds r0, r5, r7 lsls r0, 24 lsrs r0, 24 @@ -652622,10 +652622,10 @@ _08152E2C: adds r0, r1 ldrh r1, [r0] cmp r1, 0 - bne _08152E48 + bne @08152E48 ldr r0, =0x030061f0 strh r5, [r0] -_08152E48: +@08152E48: ldr r0, [r6] lsls r1, 3 mov r2, r8 @@ -652641,19 +652641,19 @@ _08152E48: ldr r0, =0x08012025 adds r5, 0x1 cmp r1, r0 - bne _08152E98 + bne @08152E98 ldr r1, =0x00000ff6 adds r0, r2, r1 ldrh r0, [r0] cmp r0, r3 - bne _08152E98 + bne @08152E98 movs r2, 0 ldrh r0, [r4, 0x4] cmp r2, r0 - bcs _08152E98 + bcs @08152E98 adds r3, r4, 0 ldr r4, =0x03006204 -_08152E80: +@08152E80: ldr r1, [r3] adds r1, r2 ldr r0, [r4] @@ -652665,12 +652665,12 @@ _08152E80: lsrs r2, r0, 16 ldrh r1, [r3, 0x4] cmp r2, r1 - bcc _08152E80 -_08152E98: + bcc @08152E80 +@08152E98: lsls r0, r5, 16 lsrs r5, r0, 16 cmp r5, 0xD - bls _08152E2C + bls @08152E2C movs r0, 0x1 pop {r3} mov r8, r3 @@ -652682,7 +652682,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 @@ -652697,7 +652697,7 @@ sub_8152EC8: @ 8152EC8 movs r5, 0 movs r4, 0 ldr r7, =0x03006204 -_08152EE4: +@08152EE4: lsls r0, r4, 24 lsrs r0, 24 ldr r1, [r7] @@ -652708,7 +652708,7 @@ _08152EE4: ldr r1, [r0] ldr r0, =0x08012025 cmp r1, r0 - bne _08152F34 + bne @08152F34 movs r5, 0x1 ldr r3, =0x00000ff4 adds r0, r2, r3 @@ -652725,7 +652725,7 @@ _08152EE4: adds r0, r1, r3 ldrh r0, [r0] cmp r0, r2 - bne _08152F34 + bne @08152F34 ldr r2, =0x00000ffc adds r0, r1, r2 ldr r0, [r0] @@ -652736,33 +652736,33 @@ _08152EE4: ldrh r1, [r1] lsls r0, r1 orrs r6, r0 -_08152F34: +@08152F34: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0xD - bls _08152EE4 + bls @08152EE4 cmp r5, 0 - beq _08152F70 + beq @08152F70 ldr r0, =0x00003fff movs r1, 0xFF str r1, [sp] cmp r6, r0 - bne _08152F74 + bne @08152F74 movs r2, 0x1 str r2, [sp] - b _08152F74 + b @08152F74 .align 2, 0 .pool -_08152F70: +@08152F70: movs r3, 0 str r3, [sp] -_08152F74: +@08152F74: movs r6, 0 movs r5, 0 movs r4, 0 ldr r7, =0x03006204 -_08152F7C: +@08152F7C: adds r0, r4, 0 adds r0, 0xE lsls r0, 24 @@ -652775,7 +652775,7 @@ _08152F7C: ldr r1, [r0] ldr r0, =0x08012025 cmp r1, r0 - bne _08152FD0 + bne @08152FD0 movs r5, 0x1 ldr r3, =0x00000ff4 adds r0, r2, r3 @@ -652792,7 +652792,7 @@ _08152F7C: adds r0, r1, r3 ldrh r0, [r0] cmp r0, r2 - bne _08152FD0 + bne @08152FD0 ldr r2, =0x00000ffc adds r0, r1, r2 ldr r0, [r0] @@ -652803,127 +652803,127 @@ _08152F7C: ldrh r1, [r1] lsls r0, r1 orrs r6, r0 -_08152FD0: +@08152FD0: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0xD - bls _08152F7C + bls @08152F7C cmp r5, 0 - beq _08153008 + beq @08153008 ldr r0, =0x00003fff movs r1, 0xFF cmp r6, r0 - bne _0815300A + bne @0815300A movs r1, 0x1 - b _0815300A + b @0815300A .align 2, 0 .pool -_08153008: +@08153008: movs r1, 0 -_0815300A: +@0815300A: ldr r0, [sp] cmp r0, 0x1 - bne _0815307C + bne @0815307C cmp r1, 0x1 - bne _0815306C + bne @0815306C movs r0, 0x1 negs r0, r0 cmp r8, r0 - bne _08153022 + bne @08153022 mov r1, r9 cmp r1, 0 - beq _0815302C -_08153022: + beq @0815302C +@08153022: mov r2, r8 cmp r2, 0 - bne _08153050 + bne @08153050 cmp r9, r0 - bne _08153050 -_0815302C: + bne @08153050 +@0815302C: mov r1, r8 adds r1, 0x1 mov r0, r9 adds r0, 0x1 cmp r1, r0 - bcs _08153044 + bcs @08153044 ldr r0, =0x03006200 mov r3, r9 - b _08153064 + b @08153064 .align 2, 0 .pool -_08153044: +@08153044: ldr r0, =0x03006200 mov r1, r8 str r1, [r0] - b _08153094 + b @08153094 .align 2, 0 .pool -_08153050: +@08153050: cmp r8, r9 - bcs _08153060 + bcs @08153060 ldr r0, =0x03006200 mov r2, r9 str r2, [r0] - b _08153094 + b @08153094 .align 2, 0 .pool -_08153060: +@08153060: ldr r0, =0x03006200 mov r3, r8 -_08153064: +@08153064: str r3, [r0] - b _08153094 + b @08153094 .align 2, 0 .pool -_0815306C: +@0815306C: ldr r0, =0x03006200 mov r2, r8 str r2, [r0] cmp r1, 0xFF - beq _0815308C - b _08153094 + beq @0815308C + b @08153094 .align 2, 0 .pool -_0815307C: +@0815307C: cmp r1, 0x1 - bne _08153098 + bne @08153098 ldr r0, =0x03006200 mov r3, r9 str r3, [r0] ldr r0, [sp] cmp r0, 0xFF - bne _08153094 -_0815308C: + bne @08153094 +@0815308C: movs r0, 0xFF - b _081530C4 + b @081530C4 .align 2, 0 .pool -_08153094: +@08153094: movs r0, 0x1 - b _081530C4 -_08153098: + b @081530C4 +@08153098: ldr r2, [sp] cmp r2, 0 - bne _081530B8 + bne @081530B8 cmp r1, 0 - bne _081530B8 + bne @081530B8 ldr r0, =0x03006200 str r1, [r0] ldr r0, =0x030061f0 strh r1, [r0] movs r0, 0 - b _081530C4 + b @081530C4 .align 2, 0 .pool -_081530B8: +@081530B8: ldr r0, =0x03006200 movs r1, 0 str r1, [r0] ldr r0, =0x030061f0 strh r1, [r0] movs r0, 0x2 -_081530C4: +@081530C4: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -652937,7 +652937,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 @@ -652952,7 +652952,7 @@ sub_81530DC: @ 81530DC ldr r1, [r0] ldr r0, =0x08012025 cmp r1, r0 - bne _08153144 + bne @08153144 adds r0, r5, 0 adds r1, r4, 0 bl sub_8153164 @@ -652962,11 +652962,11 @@ sub_81530DC: @ 81530DC adds r1, r5, r2 ldrh r1, [r1] cmp r1, r0 - bne _08153140 + bne @08153140 movs r2, 0 cmp r2, r4 - bcs _0815312A -_08153118: + bcs @0815312A +@08153118: adds r1, r6, r2 adds r0, r5, r2 ldrb r0, [r0] @@ -652975,25 +652975,25 @@ _08153118: lsls r0, 16 lsrs r2, r0, 16 cmp r2, r4 - bcc _08153118 -_0815312A: + bcc @08153118 +@0815312A: movs r0, 0x1 - b _08153146 + b @08153146 .align 2, 0 .pool -_08153140: +@08153140: movs r0, 0x2 - b _08153146 -_08153144: + b @08153146 +@08153144: movs r0, 0 -_08153146: +@08153146: pop {r4-r6} pop {r1} bx r1 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 @@ -653008,7 +653008,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 @@ -653016,16 +653016,16 @@ sub_8153164: @ 8153164 movs r3, 0 lsrs r1, 18 cmp r2, r1 - bcs _08153182 -_08153174: + bcs @08153182 +@08153174: ldm r4!, {r0} adds r2, r0 adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, r1 - bcc _08153174 -_08153182: + bcc @08153174 +@08153182: lsrs r0, r2, 16 adds r0, r2 lsls r0, 16 @@ -653036,7 +653036,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 @@ -653051,7 +653051,7 @@ sub_8153190: @ 8153190 adds r3, 0x8 adds r2, 0x4 movs r4, 0x3 -_081531AC: +@081531AC: ldrh r0, [r2] ldr r1, [r5] adds r1, r0 @@ -653062,7 +653062,7 @@ _081531AC: adds r2, 0x4 subs r4, 0x1 cmp r4, 0 - bge _081531AC + bge @081531AC movs r4, 0x5 ldr r1, =0x03006220 ldr r5, =0x03005d94 @@ -653071,7 +653071,7 @@ _081531AC: adds r3, 0x28 adds r2, r0, 0 adds r2, 0x14 -_081531D2: +@081531D2: ldrh r0, [r2] ldr r1, [r5] adds r1, r0 @@ -653082,7 +653082,7 @@ _081531D2: adds r2, 0x4 adds r4, 0x1 cmp r4, 0xD - ble _081531D2 + ble @081531D2 pop {r4,r5} pop {r0} bx r0 @@ -653091,7 +653091,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 @@ -653101,26 +653101,26 @@ calls_flash_erase_block_3: @ 8153204 str r0, [r1] bl sub_8153190 cmp r4, 0x5 - bhi _081532AC + bhi @081532AC lsls r0, r4, 2 - ldr r1, =_0815322C + ldr r1, =@0815322C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0815322C: - .4byte _081532AC - .4byte _081532C4 - .4byte _081532C4 - .4byte _0815325A - .4byte _081532F8 - .4byte _08153244 -_08153244: +@0815322C: + .4byte @081532AC + .4byte @081532C4 + .4byte @081532C4 + .4byte @0815325A + .4byte @081532F8 + .4byte @08153244 +@08153244: movs r4, 0x1C ldr r5, =0x03007860 -_08153248: +@08153248: ldr r1, [r5] adds r0, r4, 0 bl _call_via_r1 @@ -653128,16 +653128,16 @@ _08153248: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1F - bls _08153248 -_0815325A: + bls @08153248 +@0815325A: movs r0, 0xA bl sub_80847F8 ldr r1, =0x000003e6 cmp r0, r1 - bhi _0815326C + bhi @0815326C movs r0, 0xA bl sav12_xor_increment -_0815326C: +@0815326C: bl save_serialize_game ldr r0, =0x0000ffff ldr r1, =0x03006220 @@ -653154,21 +653154,21 @@ _0815326C: adds r1, r4, 0 adds r2, r5, 0 bl sub_8152890 - b _0815331A + b @0815331A .align 2, 0 .pool -_081532AC: +@081532AC: bl save_serialize_game ldr r0, =0x0000ffff ldr r1, =0x03006220 bl save_write_to_flash - b _0815331A + b @0815331A .align 2, 0 .pool -_081532C4: +@081532C4: bl save_serialize_game movs r4, 0 -_081532CA: +@081532CA: adds r0, r4, 0 ldr r1, =0x03006220 bl calls_flash_erase_block_2 @@ -653176,9 +653176,9 @@ _081532CA: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 - bls _081532CA + bls @081532CA movs r4, 0 -_081532DE: +@081532DE: adds r0, r4, 0 ldr r1, =0x03006220 bl sav12_xor_get @@ -653186,14 +653186,14 @@ _081532DE: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 - bls _081532DE - b _0815331A + bls @081532DE + b @0815331A .align 2, 0 .pool -_081532F8: +@081532F8: movs r4, 0x1C ldr r5, =0x03007860 -_081532FC: +@081532FC: ldr r1, [r5] adds r0, r4, 0 bl _call_via_r1 @@ -653201,12 +653201,12 @@ _081532FC: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1F - bls _081532FC + bls @081532FC bl save_serialize_game ldr r0, =0x0000ffff ldr r1, =0x03006220 bl save_write_to_flash -_0815331A: +@0815331A: ldr r0, =0x0203cf5c str r6, [r0] movs r0, 0 @@ -653218,35 +653218,35 @@ _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 ldr r0, =0x03005d88 ldr r4, [r0] cmp r4, 0x1 - bne _0815335A + bne @0815335A adds r0, r5, 0 bl calls_flash_erase_block_3 ldr r0, =0x030061fc ldr r0, [r0] cmp r0, 0 - beq _08153370 + beq @08153370 adds r0, r5, 0 bl fullscreen_save_activate -_0815335A: +@0815335A: ldr r1, =0x03006294 movs r0, 0xFF strh r0, [r1] movs r0, 0xFF - b _08153376 + b @08153376 .align 2, 0 .pool -_08153370: +@08153370: ldr r0, =0x03006294 strh r4, [r0] movs r0, 0x1 -_08153376: +@08153376: pop {r4,r5} pop {r1} bx r1 @@ -653255,29 +653255,29 @@ _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] cmp r0, 0x1 - bne _081533A4 + bne @081533A4 bl sub_8153190 bl save_serialize_game ldr r0, =0x03006220 bl sub_8152934 movs r0, 0 - b _081533A6 + b @081533A6 .align 2, 0 .pool -_081533A4: +@081533A4: movs r0, 0x1 -_081533A6: +@081533A6: pop {r1} bx r1 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 @@ -653287,26 +653287,26 @@ sub_81533AC: @ 81533AC ldr r0, =0x030061fc ldr r0, [r0] cmp r0, 0 - beq _081533C8 + beq @081533C8 movs r0, 0 bl fullscreen_save_activate -_081533C8: +@081533C8: cmp r4, 0xFF - beq _081533D8 + beq @081533D8 movs r0, 0 - b _081533DA + b @081533DA .align 2, 0 .pool -_081533D8: +@081533D8: movs r0, 0x1 -_081533DA: +@081533DA: pop {r4} pop {r1} bx r1 thumb_func_end sub_81533AC thumb_func_start sub_81533E0 -sub_81533E0: @ 81533E0 +sub_81533E0: ; 81533E0 push {lr} ldr r1, =0x03006220 movs r0, 0xE @@ -653314,10 +653314,10 @@ sub_81533E0: @ 81533E0 ldr r0, =0x030061fc ldr r0, [r0] cmp r0, 0 - beq _081533F8 + beq @081533F8 movs r0, 0 bl fullscreen_save_activate -_081533F8: +@081533F8: movs r0, 0 pop {r1} bx r1 @@ -653326,7 +653326,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 @@ -653334,10 +653334,10 @@ sub_8153408: @ 8153408 ldr r0, =0x030061fc ldr r0, [r0] cmp r0, 0 - beq _08153420 + beq @08153420 movs r0, 0 bl fullscreen_save_activate -_08153420: +@08153420: movs r0, 0 pop {r1} bx r1 @@ -653346,12 +653346,12 @@ _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] cmp r0, 0x1 - bne _0815346C + bne @0815346C bl sub_8153190 bl save_serialize_game ldr r4, =0x03006220 @@ -653365,19 +653365,19 @@ sub_8153430: @ 8153430 adds r1, r4, 0 bl sub_8152A34 movs r0, 0 - b _0815346E + b @0815346E .align 2, 0 .pool -_0815346C: +@0815346C: movs r0, 0x1 -_0815346E: +@0815346E: pop {r4} pop {r1} bx r1 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 @@ -653387,7 +653387,7 @@ sub_8153474: @ 8153474 lsls r0, r1, 16 lsrs r5, r0, 16 cmp r5, 0x4 - bhi _081534A8 + bhi @081534A8 adds r0, r1, 0x1 lsls r0, 16 lsrs r0, 16 @@ -653397,22 +653397,22 @@ sub_8153474: @ 8153474 adds r0, r5, 0 adds r1, r4, 0 bl sub_8152D44 - b _081534B2 + b @081534B2 .align 2, 0 .pool -_081534A8: +@081534A8: ldr r1, =0x03006220 adds r0, r5, 0 bl sub_8152D44 movs r6, 0x1 -_081534B2: +@081534B2: ldr r0, =0x030061fc ldr r0, [r0] cmp r0, 0 - beq _081534C0 + beq @081534C0 movs r0, 0x1 bl fullscreen_save_activate -_081534C0: +@081534C0: adds r0, r6, 0 pop {r4-r6} pop {r1} @@ -653422,28 +653422,28 @@ _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 ldr r0, =0x03005d88 ldr r0, [r0] cmp r0, 0x1 - beq _081534F0 + beq @081534F0 ldr r1, =0x03006210 movs r0, 0x4 strh r0, [r1] movs r0, 0xFF - b _08153550 + b @08153550 .align 2, 0 .pool -_081534F0: +@081534F0: bl sub_8153190 cmp r4, 0 - beq _081534FC + beq @081534FC cmp r4, 0x3 - beq _08153528 -_081534FC: + beq @08153528 +@081534FC: ldr r0, =0x0000ffff ldr r1, =0x03006220 bl sub_8152DD0 @@ -653455,10 +653455,10 @@ _081534FC: ldr r1, =0x03006214 movs r0, 0 str r0, [r1] - b _0815354E + b @0815354E .align 2, 0 .pool -_08153528: +@08153528: ldr r5, =0x0201c000 movs r6, 0xF8 lsls r6, 4 @@ -653469,16 +653469,16 @@ _08153528: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bne _0815354E + bne @0815354E adds r1, r5, r6 movs r0, 0x1D adds r2, r6, 0 bl sub_81530DC lsls r0, 24 lsrs r4, r0, 24 -_0815354E: +@0815354E: adds r0, r4, 0 -_08153550: +@08153550: pop {r4-r6} pop {r1} bx r1 @@ -653487,7 +653487,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 @@ -653496,11 +653496,11 @@ sub_815355C: @ 815355C ldr r0, =0x03005d88 ldr r4, [r0] cmp r4, 0x1 - beq _0815358C - b _081535C8 + beq @0815358C + b @081535C8 .align 2, 0 .pool -_0815357C: +@0815357C: ldrb r1, [r7, 0xA] ldrb r0, [r7, 0xB] adds r1, r0 @@ -653508,8 +653508,8 @@ _0815357C: adds r1, r0 ldrb r0, [r7, 0xD] adds r0, r1 - b _081535CA -_0815358C: + b @081535CA +@0815358C: bl sub_8153190 ldr r0, =0x03006220 bl sub_8152EC8 @@ -653521,7 +653521,7 @@ _0815358C: lsls r0, 17 lsrs r6, r0, 16 movs r4, 0 -_081535A6: +@081535A6: adds r0, r4, r6 lsls r0, 24 lsrs r0, 24 @@ -653532,15 +653532,15 @@ _081535A6: adds r0, r1 ldrh r0, [r0] cmp r0, 0 - beq _0815357C + beq @0815357C adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0xD - bls _081535A6 -_081535C8: + bls @081535A6 +@081535C8: movs r0, 0 -_081535CA: +@081535CA: pop {r4-r7} pop {r1} bx r1 @@ -653549,7 +653549,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 @@ -653559,7 +653559,7 @@ sub_81535DC: @ 81535DC adds r0, r2 lsrs r0, 24 cmp r0, 0x1 - bhi _08153608 + bhi @08153608 ldr r4, =0x0203abbc movs r3, 0x80 lsls r3, 5 @@ -653570,26 +653570,26 @@ sub_81535DC: @ 81535DC ldr r1, [r4] ldr r0, =0x0000b39d cmp r1, r0 - beq _08153614 -_08153608: + beq @08153614 +@08153608: movs r0, 0xFF - b _0815362A + b @0815362A .align 2, 0 .pool -_08153614: +@08153614: movs r3, 0 ldr r5, =0x00000ffb adds r2, r4, 0x4 -_0815361A: +@0815361A: adds r0, r6, r3 adds r1, r2, r3 ldrb r1, [r1] strb r1, [r0] adds r3, 0x1 cmp r3, r5 - ble _0815361A + ble @0815361A movs r0, 0x1 -_0815362A: +@0815362A: pop {r4-r6} pop {r1} bx r1 @@ -653598,7 +653598,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 @@ -653608,40 +653608,40 @@ sub_8153634: @ 8153634 adds r0, r1 lsrs r0, 24 cmp r0, 0x1 - bhi _08153680 + bhi @08153680 ldr r7, =0x0203abbc ldr r0, =0x0000b39d adds r3, r7, 0 stm r3!, {r0} movs r2, 0 ldr r4, =0x00000ffb -_08153654: +@08153654: adds r0, r3, r2 adds r1, r5, r2 ldrb r1, [r1] strb r1, [r0] adds r2, 0x1 cmp r2, r4 - ble _08153654 + ble @08153654 adds r0, r6, 0 adds r1, r7, 0 bl ProgramFlashSectorsAndVerify cmp r0, 0 - bne _08153680 + bne @08153680 movs r0, 0x1 - b _08153682 + b @08153682 .align 2, 0 .pool -_08153680: +@08153680: movs r0, 0xFF -_08153682: +@08153682: pop {r4-r7} pop {r1} bx r1 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 @@ -653653,144 +653653,144 @@ sub_8153688: @ 8153688 movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0xB - bls _081536A2 - b _081537C2 -_081536A2: + bls @081536A2 + b @081537C2 +@081536A2: lsls r0, 2 - ldr r1, =_081536B4 + ldr r1, =@081536B4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081536B4: - .4byte _081536E4 - .4byte _081536F4 - .4byte _081536FE - .4byte _0815371A - .4byte _0815372C - .4byte _08153742 - .4byte _08153758 - .4byte _08153762 - .4byte _08153778 - .4byte _0815378C - .4byte _08153796 - .4byte _081537A8 -_081536E4: +@081536B4: + .4byte @081536E4 + .4byte @081536F4 + .4byte @081536FE + .4byte @0815371A + .4byte @0815372C + .4byte @08153742 + .4byte @08153758 + .4byte @08153762 + .4byte @08153778 + .4byte @0815378C + .4byte @08153796 + .4byte @081537A8 +@081536E4: ldr r0, =0x03002700 movs r1, 0x1 strb r1, [r0] movs r0, 0x1 strh r0, [r4] - b _081537C2 + b @081537C2 .align 2, 0 .pool -_081536F4: +@081536F4: bl sub_800ADF8 movs r0, 0x2 strh r0, [r4] - b _081537C2 -_081536FE: + b @081537C2 +@081536FE: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _081537C2 + beq @081537C2 movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08153714 + bne @08153714 bl save_serialize_map -_08153714: +@08153714: movs r0, 0x3 strh r0, [r4] - b _081537C2 -_0815371A: + b @081537C2 +@0815371A: movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08153726 + bne @08153726 bl sub_8076D5C -_08153726: +@08153726: bl sub_8153380 - b _08153752 -_0815372C: + b @08153752 +@0815372C: ldrh r0, [r4, 0x2] adds r0, 0x1 strh r0, [r4, 0x2] lsls r0, 16 asrs r1, r0, 16 cmp r1, 0x5 - bne _081537C2 + bne @081537C2 movs r0, 0 strh r0, [r4, 0x2] strh r1, [r4] - b _081537C2 -_08153742: + b @081537C2 +@08153742: bl sub_81533AC lsls r0, 24 cmp r0, 0 - beq _08153752 + beq @08153752 movs r0, 0x6 strh r0, [r4] - b _081537C2 -_08153752: + b @081537C2 +@08153752: movs r0, 0x4 strh r0, [r4] - b _081537C2 -_08153758: + b @081537C2 +@08153758: bl sub_81533E0 movs r0, 0x7 strh r0, [r4] - b _081537C2 -_08153762: + b @081537C2 +@08153762: movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0815376E + bne @0815376E bl sav2_gender2_inplace_and_xFE -_0815376E: +@0815376E: bl sub_800ADF8 movs r0, 0x8 strh r0, [r4] - b _081537C2 -_08153778: + b @081537C2 +@08153778: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _081537C2 + beq @081537C2 bl sub_8153408 movs r0, 0x9 strh r0, [r4] - b _081537C2 -_0815378C: + b @081537C2 +@0815378C: bl sub_800ADF8 movs r0, 0xA strh r0, [r4] - b _081537C2 -_08153796: + b @081537C2 +@08153796: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _081537C2 + beq @081537C2 ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - b _081537C2 -_081537A8: + b @081537C2 +@081537A8: ldrh r0, [r4, 0x2] adds r0, 0x1 strh r0, [r4, 0x2] lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - ble _081537C2 + ble @081537C2 ldr r1, =0x03002700 movs r0, 0 strb r0, [r1] adds r0, r2, 0 bl remove_task -_081537C2: +@081537C2: pop {r4} pop {r0} bx r0 @@ -653799,7 +653799,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 @@ -653809,31 +653809,31 @@ sub_81537CC: @ 81537CC movs r3, 0x1 ands r0, r3 cmp r0, 0 - beq _081537FC + beq @081537FC ands r1, r3 cmp r1, 0 - beq _081537FC + beq @081537FC movs r0, 0x4 ands r2, r0 cmp r2, 0 - beq _081537FC + beq @081537FC movs r0, 0x80 lsls r0, 2 ands r0, r4 cmp r0, 0 - beq _081537FC + beq @081537FC movs r0, 0x1 - b _081537FE -_081537FC: + b @081537FE +@081537FC: movs r0, 0 -_081537FE: +@081537FE: pop {r4} pop {r1} bx r1 thumb_func_end sub_81537CC thumb_func_start sub_8153804 -sub_8153804: @ 8153804 +sub_8153804: ; 8153804 push {lr} ldr r0, =0x02021fc4 ldr r1, =0x08674c86 @@ -653847,7 +653847,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 @@ -653870,28 +653870,28 @@ 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 lsls r0, 24 cmp r0, 0 - beq _08153868 + beq @08153868 ldr r0, [r4, 0x70] cmp r0, 0 - beq _08153868 + beq @08153868 movs r0, 0x1 - b _0815386A -_08153868: + b @0815386A +@08153868: movs r0, 0 -_0815386A: +@0815386A: pop {r4} pop {r1} bx r1 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 @@ -653903,7 +653903,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 @@ -653919,17 +653919,17 @@ 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 adds r0, r4, 0 bl sub_8153820 -_081538AC: +@081538AC: adds r0, r4, 0 bl sub_8153850 cmp r0, 0 - bne _081538AC + bne @081538AC ldr r0, [r4, 0x6C] pop {r4} pop {r1} @@ -653939,7 +653939,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 @@ -653948,7 +653948,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 @@ -653956,13 +653956,13 @@ sub_81538D0: @ 81538D0 ldr r1, =0x00003b18 adds r3, r0, r1 movs r1, 0 -_081538DE: +@081538DE: adds r0, r3, r1 ldrb r0, [r0] adds r2, r0 adds r1, 0x1 cmp r1, 0xB - bls _081538DE + bls @081538DE adds r0, r2, 0 pop {r1} bx r1 @@ -653971,7 +653971,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] @@ -653981,36 +653981,36 @@ sub_81538F8: @ 81538F8 adds r1, r0, 0 ldrb r0, [r4] cmp r0, 0 - beq _0815392A + beq @0815392A ldrb r0, [r4, 0x1] cmp r0, 0 - beq _0815392A + beq @0815392A ldrh r0, [r4, 0x2] cmp r0, 0 - beq _0815392A + beq @0815392A cmp r1, 0 - beq _0815392A + beq @0815392A ldr r0, [r5] ldr r2, =0x00003b14 adds r0, r2 ldr r0, [r0] cmp r1, r0 - beq _0815393C -_0815392A: + beq @0815393C +@0815392A: movs r0, 0 - b _0815393E + b @0815393E .align 2, 0 .pool -_0815393C: +@0815393C: movs r0, 0x1 -_0815393E: +@0815393E: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_81538F8 thumb_func_start sub_8153944 -sub_8153944: @ 8153944 +sub_8153944: ; 8153944 push {lr} sub sp, 0x4 mov r1, sp @@ -654031,7 +654031,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 @@ -654043,15 +654043,15 @@ sub_8153970: @ 8153970 lsrs r2, 16 adds r6, r2, 0 cmp r3, 0 - beq _08153990 + beq @08153990 cmp r1, 0 - beq _08153990 + beq @08153990 cmp r2, 0 - bne _08153996 -_08153990: + bne @08153996 +@08153990: bl sub_8153944 - b _081539BC -_08153996: + b @081539BC +@08153996: ldr r4, =0x03005d8c ldr r0, [r4] ldr r1, =0x00003b18 @@ -654070,7 +654070,7 @@ _08153996: ldr r2, =0x00003b14 adds r1, r2 str r0, [r1] -_081539BC: +@081539BC: pop {r4-r6} pop {r0} bx r0 @@ -654079,7 +654079,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] @@ -654087,31 +654087,31 @@ sub_81539D4: @ 81539D4 adds r4, r0, r1 bl sub_81538F8 cmp r0, 0 - bne _081539F8 + bne @081539F8 bl sub_8153944 movs r0, 0 - b _08153A1A + b @08153A1A .align 2, 0 .pool -_081539F8: +@081539F8: ldrh r5, [r4, 0x2] ldrb r0, [r4, 0x1] subs r0, 0x1 strb r0, [r4, 0x1] lsls r0, 24 cmp r0, 0 - bne _08153A0C + bne @08153A0C bl sub_8153944 - b _08153A18 -_08153A0C: + b @08153A18 +@08153A0C: bl sub_81538D0 ldr r1, [r6] ldr r2, =0x00003b14 adds r1, r2 str r0, [r1] -_08153A18: +@08153A18: adds r0, r5, 0 -_08153A1A: +@08153A1A: pop {r4-r6} pop {r1} bx r1 @@ -654120,7 +654120,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 @@ -654129,7 +654129,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 @@ -654155,12 +654155,12 @@ sub_8153A30: @ 8153A30 adds r2, r4, 0 bl sub_81537CC cmp r0, 0x1 - bne _08153A74 + bne @08153A74 str r0, [r7, 0x70] - b _08153A78 -_08153A74: + b @08153A78 +@08153A74: bl sub_8153804 -_08153A78: +@08153A78: movs r0, 0x1 pop {r4-r7} pop {r1} @@ -654168,13 +654168,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 @@ -654185,7 +654185,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] @@ -654199,14 +654199,14 @@ sub_8153A94: @ 8153A94 ldr r1, [r4, 0x64] adds r1, r0, r1 cmp r5, 0xFF - beq _08153AB8 + beq @08153AB8 ldr r0, [r4, 0x6C] cmp r5, r0 - bne _08153ABE -_08153AB8: + bne @08153ABE +@08153AB8: ldr r0, =0x02021fc4 bl ExpandTextCodes -_08153ABE: +@08153ABE: movs r0, 0 pop {r4,r5} pop {r1} @@ -654216,7 +654216,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 @@ -654232,7 +654232,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 @@ -654265,43 +654265,43 @@ sub_8153AE8: @ 8153AE8 bl gf_strncpy mov r0, r8 cmp r0, 0 - bne _08153B54 + bne @08153B54 ldr r0, =0x02021fc4 ldr r1, =0x08674ae4 - b _08153B74 + b @08153B74 .align 2, 0 .pool -_08153B54: +@08153B54: mov r0, r9 adds r1, r4, 0 bl sub_8008C44 cmp r0, 0 - beq _08153B70 + beq @08153B70 ldr r0, =0x02021fc4 ldr r1, =0x08674b16 - b _08153B74 + b @08153B74 .align 2, 0 .pool -_08153B70: +@08153B70: ldr r0, =0x02021fc4 ldr r1, =0x08674b42 -_08153B74: +@08153B74: bl ExpandTextCodes movs r0, 0x2 str r0, [r7, 0x6C] bl sub_80E162C cmp r0, 0x1 - bne _08153B9C + bne @08153B9C ldr r0, =0x0000402d movs r1, 0x1 bl var_set - b _08153BA0 + b @08153BA0 .align 2, 0 .pool -_08153B9C: +@08153B9C: movs r0, 0x1 str r0, [r7, 0x6C] -_08153BA0: +@08153BA0: movs r0, 0 pop {r3,r4} mov r8, r3 @@ -654312,7 +654312,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] @@ -654337,7 +654337,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 @@ -654389,7 +654389,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 @@ -654407,7 +654407,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] @@ -654429,7 +654429,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] @@ -654452,7 +654452,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} @@ -654479,32 +654479,32 @@ sub_8153CC8: @ 8153CC8 movs r0, 0xCE lsls r0, 1 cmp r4, r0 - bne _08153D18 + bne @08153D18 ldr r0, =0x02021cc4 ldr r1, =0x085e8264 movs r2, 0xB bl gf_strncpy - b _08153D22 + b @08153D22 .align 2, 0 .pool -_08153D18: +@08153D18: ldr r0, =0x02021cc4 ldr r1, =0x085e8268 movs r2, 0xB bl gf_strncpy -_08153D22: +@08153D22: ldr r0, =0x020244e9 ldrb r0, [r0] cmp r0, 0x6 - bne _08153D4C + bne @08153D4C ldr r0, =0x02021fc4 ldr r1, =0x08674c02 bl ExpandTextCodes movs r0, 0x3 - b _08153DB6 + b @08153DB6 .align 2, 0 .pool -_08153D4C: +@08153D4C: ldr r7, =0x020246e0 adds r0, r7, 0 adds r1, r5, 0 @@ -654517,7 +654517,7 @@ _08153D4C: movs r0, 0xCE lsls r0, 1 cmp r4, r0 - beq _08153D86 + beq @08153D86 adds r0, r4, 0 bl SpeciesToNationalPokedexNum adds r4, r0, 0 @@ -654529,7 +654529,7 @@ _08153D4C: adds r0, r4, 0 movs r1, 0x3 bl pokedex_flag_operation -_08153D86: +@08153D86: adds r0, r7, 0 movs r1, 0xC bl pokemon_getattr @@ -654538,18 +654538,18 @@ _08153D86: bl itemid_is_mail lsls r0, 24 cmp r0, 0 - beq _08153DA4 + beq @08153DA4 adds r0, r7, 0 mov r1, sp bl sub_80D460C -_08153DA4: +@08153DA4: bl party_compaction bl calc_player_party_count ldr r0, =0x02021fc4 ldr r1, =0x08674bf0 bl ExpandTextCodes movs r0, 0x2 -_08153DB6: +@08153DB6: str r0, [r6, 0x6C] movs r0, 0 add sp, 0x88 @@ -654563,7 +654563,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 @@ -654593,7 +654593,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 @@ -654611,7 +654611,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 @@ -654634,12 +654634,12 @@ sub_8153E40: @ 8153E40 adds r0, r4, 0 bl sub_806F96C cmp r5, r0 - beq _08153E7E + beq @08153E7E movs r0, 0 str r0, [r6, 0x70] movs r0, 0x1 str r0, [r6, 0x6C] -_08153E7E: +@08153E7E: movs r0, 0x1 pop {r4-r6} pop {r1} @@ -654647,7 +654647,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 @@ -654672,12 +654672,12 @@ sub_8153E88: @ 8153E88 lsls r0, 16 lsrs r0, 16 cmp r5, r0 - beq _08153ECA + beq @08153ECA movs r0, 0 str r0, [r6, 0x70] movs r0, 0x1 str r0, [r6, 0x6C] -_08153ECA: +@08153ECA: movs r0, 0x1 pop {r4-r6} pop {r1} @@ -654685,7 +654685,7 @@ _08153ECA: thumb_func_end sub_8153E88 thumb_func_start dp03_step_water_reflection -dp03_step_water_reflection: @ 8153ED4 +dp03_step_water_reflection: ; 8153ED4 push {r4-r7,lr} mov r7, r8 push {r7} @@ -654758,7 +654758,7 @@ dp03_step_water_reflection: @ 8153ED4 adds r1, r7, 0 bl npc_pal_op cmp r5, 0 - bne _08153F7A + bne @08153F7A ldrb r0, [r7, 0x1] movs r1, 0x4 negs r1, r1 @@ -654766,7 +654766,7 @@ dp03_step_water_reflection: @ 8153ED4 movs r0, 0x1 orrs r1, r0 strb r1, [r7, 0x1] -_08153F7A: +@08153F7A: pop {r3} mov r8, r3 pop {r4-r7} @@ -654777,7 +654777,7 @@ _08153F7A: thumb_func_end dp03_step_water_reflection thumb_func_start sub_8153F98 -sub_8153F98: @ 8153F98 +sub_8153F98: ; 8153F98 push {lr} ldrb r0, [r0, 0x5] bl npc_get_type @@ -654790,7 +654790,7 @@ sub_8153F98: @ 8153F98 thumb_func_end sub_8153F98 thumb_func_start npc_pal_op -npc_pal_op: @ 8153FAC +npc_pal_op: ; 8153FAC push {r4,r5,lr} sub sp, 0x8 adds r5, r0, 0 @@ -654807,20 +654807,20 @@ npc_pal_op: @ 8153FAC movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08154008 + bne @08154008 ldrb r0, [r5, 0x1F] bl sub_80894D4 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _08153FEE + bne @08153FEE ldrb r0, [r5, 0x1E] bl sub_80894D4 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _08154008 -_08153FEE: + beq @08154008 +@08153FEE: subs r0, 0x1 lsls r0, 1 add r0, sp @@ -654830,15 +654830,15 @@ _08153FEE: lsrs r1, 4 adds r0, r5, 0 bl npc_pal_op_A - b _08154012 + b @08154012 .align 2, 0 .pool -_08154008: +@08154008: ldrb r1, [r4, 0x5] lsrs r1, 4 adds r0, r5, 0 bl npc_pal_op_B -_08154012: +@08154012: add sp, 0x8 pop {r4,r5} pop {r0} @@ -654846,7 +654846,7 @@ _08154012: thumb_func_end npc_pal_op thumb_func_start npc_pal_op_B -npc_pal_op_B: @ 815401C +npc_pal_op_B: ; 815401C push {r4,lr} lsls r1, 24 lsrs r4, r1, 24 @@ -654856,43 +654856,43 @@ npc_pal_op_B: @ 815401C ldrh r1, [r2, 0x4] ldr r0, =0x000011ff cmp r1, r0 - beq _08154070 + beq @08154070 ldrb r0, [r2, 0xC] movs r1, 0xF ands r1, r0 cmp r1, 0 - bne _0815404C + bne @0815404C ldrh r0, [r2, 0x2] adds r1, r4, 0 bl npc_load_two_palettes__no_record - b _0815406A + b @0815406A .align 2, 0 .pool -_0815404C: +@0815404C: cmp r1, 0xA - bne _0815405A + bne @0815405A ldrh r0, [r2, 0x2] adds r1, r4, 0 bl npc_load_two_palettes__and_record - b _0815406A -_0815405A: + b @0815406A +@0815405A: adds r0, r4, 0 bl npc_paltag_by_palslot lsls r0, 16 lsrs r0, 16 adds r1, r4, 0 bl pal_patch_for_npc -_0815406A: +@0815406A: adds r0, r4, 0 bl sub_80ABE18 -_08154070: +@08154070: pop {r4} pop {r0} bx r0 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 @@ -654902,13 +654902,13 @@ npc_pal_op_A: @ 8154078 ldrh r1, [r2, 0x4] ldr r0, =0x000011ff cmp r1, r0 - beq _0815409C + beq @0815409C adds r0, r1, 0 adds r1, r4, 0 bl pal_patch_for_npc adds r0, r4, 0 bl sub_80ABE18 -_0815409C: +@0815409C: pop {r4} pop {r0} bx r0 @@ -654917,7 +654917,7 @@ _0815409C: thumb_func_end npc_pal_op_A thumb_func_start objc_80DAF50 -objc_80DAF50: @ 81540A8 +objc_80DAF50: ; 81540A8 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -654940,13 +654940,13 @@ objc_80DAF50: @ 81540A8 ldr r1, =0x00020001 ands r0, r1 cmp r0, r1 - bne _081540E0 + bne @081540E0 ldrb r1, [r7, 0x8] movs r2, 0x30 ldrsh r0, [r4, r2] cmp r1, r0 - beq _081540FC -_081540E0: + beq @081540FC +@081540E0: adds r2, r4, 0 adds r2, 0x3E ldrb r1, [r2] @@ -654954,10 +654954,10 @@ _081540E0: negs r0, r0 ands r0, r1 strb r0, [r2] - b _08154214 + b @08154214 .align 2, 0 .pool -_081540FC: +@081540FC: ldr r1, =0x084975c4 ldrb r0, [r5, 0x5] lsrs r0, 4 @@ -655074,15 +655074,15 @@ _081540FC: ldrb r0, [r7, 0x3] lsls r0, 28 cmp r0, 0 - bge _081541EE + bge @081541EE movs r0, 0x4 orrs r2, r0 strb r2, [r6] -_081541EE: +@081541EE: movs r1, 0x3C ldrsh r0, [r4, r1] cmp r0, 0 - bne _08154214 + bne @08154214 ldrb r0, [r4, 0x3] mov r2, r9 ands r2, r0 @@ -655093,12 +655093,12 @@ _081541EE: movs r1, 0x8 ands r0, r1 cmp r0, 0 - beq _08154214 + beq @08154214 movs r1, 0x2 adds r0, r2, 0 orrs r0, r1 strb r0, [r4, 0x3] -_08154214: +@08154214: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -655110,7 +655110,7 @@ _08154214: thumb_func_end objc_80DAF50 thumb_func_start sub_8154228 -sub_8154228: @ 8154228 +sub_8154228: ; 8154228 push {r4,lr} ldr r0, =0x085059f8 ldr r0, [r0, 0x20] @@ -655122,7 +655122,7 @@ sub_8154228: @ 8154228 lsrs r0, 24 adds r4, r0, 0 cmp r0, 0x40 - beq _08154266 + beq @08154266 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -655141,7 +655141,7 @@ sub_8154228: @ 8154228 orrs r0, r2 orrs r0, r3 strb r0, [r1] -_08154266: +@08154266: adds r0, r4, 0 pop {r4} pop {r1} @@ -655151,7 +655151,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 @@ -655170,7 +655170,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} @@ -655195,20 +655195,20 @@ sub_8154298: @ 8154298 movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne _081542E2 + bne @081542E2 movs r0, 0x2E ldrsh r1, [r2, r0] lsls r0, r7, 16 asrs r0, 16 cmp r1, r0 - bne _081542E2 + bne @081542E2 movs r0, 0x30 ldrsh r1, [r2, r0] lsls r0, r6, 16 asrs r0, 16 cmp r1, r0 - beq _0815432E -_081542E2: + beq @0815432E +@081542E2: lsls r0, r7, 16 asrs r0, 16 lsls r1, r6, 16 @@ -655245,7 +655245,7 @@ _081542E2: lsrs r1, 24 adds r0, r2, 0 bl obj_anim_image_start -_0815432E: +@0815432E: add sp, 0x4 pop {r3} mov r8, r3 @@ -655257,7 +655257,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] @@ -655291,7 +655291,7 @@ oei_shadow: @ 8154340 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq _081543C4 + beq @081543C4 ldr r0, =0x02020630 lsls r2, r1, 4 adds r2, r1 @@ -655321,7 +655321,7 @@ oei_shadow: @ 8154340 ldrh r0, [r0] subs r1, r0 strh r1, [r2, 0x34] -_081543C4: +@081543C4: movs r0, 0 pop {r4,r5} pop {r1} @@ -655331,7 +655331,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 @@ -655348,12 +655348,12 @@ oamc_shadow: @ 81543E4 bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - beq _08154412 + beq @08154412 adds r0, r5, 0 movs r1, 0x3 bl oe_stop - b _08154498 -_08154412: + b @08154498 +@08154412: mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -655386,37 +655386,37 @@ _08154412: ldr r1, =0x00400001 ands r0, r1 cmp r0, r1 - bne _08154490 + bne @08154490 ldrb r0, [r4, 0x1E] bl sub_8088E64 lsls r0, 24 cmp r0, 0 - bne _08154490 + bne @08154490 ldrb r0, [r4, 0x1E] bl is_tile_grass_maybe lsls r0, 24 cmp r0, 0 - bne _08154490 + bne @08154490 ldrb r0, [r4, 0x1F] bl is_tile_grass_maybe lsls r0, 24 cmp r0, 0 - bne _08154490 + bne @08154490 ldrb r0, [r4, 0x1E] bl is_water_tile_2 lsls r0, 24 cmp r0, 0 - bne _08154490 + bne @08154490 ldrb r0, [r4, 0x1F] bl is_water_tile_2 lsls r0, 24 cmp r0, 0 - beq _08154498 -_08154490: + beq @08154498 +@08154490: adds r0, r5, 0 movs r1, 0x3 bl oe_stop -_08154498: +@08154498: add sp, 0x4 pop {r4,r5} pop {r0} @@ -655426,7 +655426,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 @@ -655454,7 +655454,7 @@ oei_grass_normal: @ 81544AC lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq _08154538 + beq @08154538 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -655490,11 +655490,11 @@ oei_grass_normal: @ 81544AC strh r0, [r3, 0x38] ldr r0, [r5, 0x1C] cmp r0, 0 - beq _08154538 + beq @08154538 adds r0, r3, 0 movs r1, 0x4 bl obj_anim_image_seek -_08154538: +@08154538: movs r0, 0 add sp, 0x4 pop {r4,r5} @@ -655505,7 +655505,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} @@ -655520,18 +655520,18 @@ unc_grass_normal: @ 8154550 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0815459C + beq @0815459C ldr r0, =0x03005d8c ldr r2, [r0] movs r0, 0x5 ldrsb r0, [r2, r0] cmp r0, r4 - bne _08154582 + bne @08154582 movs r0, 0x4 ldrsb r0, [r2, r0] cmp r0, r7 - beq _0815459C -_08154582: + beq @0815459C +@08154582: ldr r1, [r3, 0x4] ldrh r0, [r5, 0x30] subs r0, r1 @@ -655545,7 +655545,7 @@ _08154582: ldrb r0, [r2, 0x4] orrs r0, r1 strh r0, [r5, 0x38] -_0815459C: +@0815459C: ldrh r0, [r5, 0x34] lsrs r1, r0, 8 mov r8, r1 @@ -655568,31 +655568,31 @@ _0815459C: bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _081545F0 + bne @081545F0 adds r0, r6, 0 bl is_tile_x02_or_xD1 lsls r0, 24 cmp r0, 0 - beq _081545F0 + beq @081545F0 movs r1, 0x3C ldrsh r0, [r5, r1] cmp r0, 0 - beq _08154604 + beq @08154604 adds r0, r5, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08154604 -_081545F0: + beq @08154604 +@081545F0: adds r0, r5, 0 movs r1, 0x4 bl oe_stop - b _08154648 + b @08154648 .align 2, 0 .pool -_08154604: +@08154604: mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -655603,21 +655603,21 @@ _08154604: ldr r0, [r2, 0x10] ldr r1, [r5, 0x30] cmp r0, r1 - beq _08154624 + beq @08154624 ldr r0, [r2, 0x14] cmp r0, r1 - beq _08154624 + beq @08154624 movs r0, 0x1 strh r0, [r5, 0x3C] -_08154624: +@08154624: movs r6, 0 adds r0, r5, 0 adds r0, 0x2B ldrb r0, [r0] cmp r0, 0 - bne _08154632 + bne @08154632 movs r6, 0x4 -_08154632: +@08154632: adds r0, r5, 0 movs r1, 0 bl sub_80979D4 @@ -655627,7 +655627,7 @@ _08154632: adds r0, r5, 0 adds r2, r6, 0 bl sub_81561FC -_08154648: +@08154648: add sp, 0x4 pop {r3} mov r8, r3 @@ -655639,7 +655639,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 @@ -655658,7 +655658,7 @@ sub_8154658: @ 8154658 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _081546B4 + beq @081546B4 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -655684,7 +655684,7 @@ sub_8154658: @ 8154658 strh r0, [r2, 0x2E] movs r0, 0xC strh r0, [r2, 0x30] -_081546B4: +@081546B4: movs r0, 0 pop {r4} pop {r1} @@ -655694,7 +655694,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} @@ -655713,7 +655713,7 @@ sub_81546C8: @ 81546C8 asrs r3, 16 lsls r4, 16 asrs r4, 16 -_081546EC: +@081546EC: lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -655724,43 +655724,43 @@ _081546EC: ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - beq _08154740 + beq @08154740 ldr r1, [r2, 0x1C] ldr r0, =unc_grass_normal + 1 cmp r1, r0 - bne _08154740 + bne @08154740 movs r1, 0x30 ldrsh r0, [r2, r1] cmp r3, r0 - bne _08154740 + bne @08154740 movs r1, 0x32 ldrsh r0, [r2, r1] cmp r4, r0 - bne _08154740 + bne @08154740 ldrh r1, [r2, 0x34] lsrs r0, r1, 8 cmp r12, r0 - bne _08154740 + bne @08154740 movs r0, 0xFF ands r0, r1 cmp r7, r0 - bne _08154740 + bne @08154740 movs r1, 0x36 ldrsh r0, [r2, r1] cmp r6, r0 - bne _08154740 + bne @08154740 adds r0, r5, 0 - b _0815474C + b @0815474C .align 2, 0 .pool -_08154740: +@08154740: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3F - bls _081546EC + bls @081546EC movs r0, 0x40 -_0815474C: +@0815474C: pop {r3} mov r8, r3 pop {r4-r7} @@ -655769,7 +655769,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 @@ -655797,7 +655797,7 @@ sub_8154758: @ 8154758 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq _081547E8 + beq @081547E8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -655834,11 +655834,11 @@ sub_8154758: @ 8154758 strh r0, [r4, 0x38] ldr r0, [r5, 0x1C] cmp r0, 0 - beq _081547E8 + beq @081547E8 adds r0, r4, 0 movs r1, 0x6 bl obj_anim_image_seek -_081547E8: +@081547E8: movs r0, 0 add sp, 0x4 pop {r4,r5} @@ -655849,7 +655849,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} @@ -655864,18 +655864,18 @@ unc_grass_tall: @ 8154800 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0815484C + beq @0815484C ldr r0, =0x03005d8c ldr r2, [r0] movs r0, 0x5 ldrsb r0, [r2, r0] cmp r0, r7 - bne _08154832 + bne @08154832 movs r0, 0x4 ldrsb r0, [r2, r0] cmp r0, r6 - beq _0815484C -_08154832: + beq @0815484C +@08154832: ldr r1, [r3, 0x4] ldrh r0, [r5, 0x30] subs r0, r1 @@ -655889,7 +655889,7 @@ _08154832: ldrb r0, [r2, 0x4] orrs r0, r1 strh r0, [r5, 0x38] -_0815484C: +@0815484C: ldrh r0, [r5, 0x34] lsrs r1, r0, 8 mov r8, r1 @@ -655912,31 +655912,31 @@ _0815484C: bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _081548A0 + bne @081548A0 adds r0, r4, 0 bl is_tile_tallgrass lsls r0, 24 cmp r0, 0 - beq _081548A0 + beq @081548A0 movs r1, 0x3C ldrsh r0, [r5, r1] cmp r0, 0 - beq _081548B4 + beq @081548B4 adds r0, r5, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _081548B4 -_081548A0: + beq @081548B4 +@081548A0: adds r0, r5, 0 movs r1, 0x11 bl oe_stop - b _081548EA + b @081548EA .align 2, 0 .pool -_081548B4: +@081548B4: mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -655947,13 +655947,13 @@ _081548B4: ldr r0, [r2, 0x10] ldr r1, [r5, 0x30] cmp r0, r1 - beq _081548D4 + beq @081548D4 ldr r0, [r2, 0x14] cmp r0, r1 - beq _081548D4 + beq @081548D4 movs r0, 0x1 strh r0, [r5, 0x3C] -_081548D4: +@081548D4: adds r0, r5, 0 movs r1, 0 bl sub_80979D4 @@ -655963,7 +655963,7 @@ _081548D4: adds r0, r5, 0 movs r2, 0 bl sub_81561FC -_081548EA: +@081548EA: add sp, 0x4 pop {r3} mov r8, r3 @@ -655975,7 +655975,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 @@ -655994,7 +655994,7 @@ sub_81548FC: @ 81548FC lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _08154958 + beq @08154958 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -656020,7 +656020,7 @@ sub_81548FC: @ 81548FC strh r0, [r2, 0x2E] movs r0, 0x12 strh r0, [r2, 0x30] -_08154958: +@08154958: movs r0, 0 pop {r4} pop {r1} @@ -656030,7 +656030,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] @@ -656053,7 +656053,7 @@ sub_815496C: @ 815496C lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _081549F8 + beq @081549F8 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -656099,7 +656099,7 @@ sub_815496C: @ 815496C adds r0, r4 ldrh r0, [r0, 0x22] strh r0, [r2, 0x36] -_081549F8: +@081549F8: movs r0, 0 pop {r4-r6} pop {r1} @@ -656109,7 +656109,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} @@ -656128,7 +656128,7 @@ sub_8154A10: @ 8154A10 bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _08154A4E + bne @08154A4E ldr r5, =0x02037350 mov r0, sp ldrb r1, [r0] @@ -656139,15 +656139,15 @@ sub_8154A10: @ 8154A10 ldrb r0, [r1, 0x2] lsls r0, 29 cmp r0, 0 - blt _08154A5C -_08154A4E: + blt @08154A5C +@08154A4E: adds r0, r4, 0 movs r1, 0x29 bl oe_stop - b _08154AF2 + b @08154AF2 .align 2, 0 .pool -_08154A5C: +@08154A5C: ldrb r0, [r1, 0x5] bl npc_get_type mov r8, r0 @@ -656170,14 +656170,14 @@ _08154A5C: movs r2, 0x34 ldrsh r0, [r4, r2] cmp r1, r0 - bne _08154A98 + bne @08154A98 lsls r0, r5, 16 asrs r0, 16 movs r2, 0x36 ldrsh r1, [r4, r2] cmp r0, r1 - beq _08154AB2 -_08154A98: + beq @08154AB2 +@08154A98: strh r7, [r4, 0x34] strh r5, [r4, 0x36] adds r0, r4, 0 @@ -656186,11 +656186,11 @@ _08154A98: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08154AB2 + beq @08154AB2 adds r0, r4, 0 movs r1, 0 bl obj_anim_image_start -_08154AB2: +@08154AB2: strh r7, [r4, 0x20] strh r5, [r4, 0x22] mov r1, r8 @@ -656222,7 +656222,7 @@ _08154AB2: lsrs r1, 31 adds r0, r4, 0 bl sub_80979D4 -_08154AF2: +@08154AF2: add sp, 0x4 pop {r3} mov r8, r3 @@ -656234,7 +656234,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 @@ -656253,7 +656253,7 @@ sub_8154B04: @ 8154B04 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq _08154B62 + beq @08154B62 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -656279,7 +656279,7 @@ sub_8154B04: @ 8154B04 strh r1, [r0, 0x3C] ldrb r1, [r4, 0x10] bl obj_anim_image_start -_08154B62: +@08154B62: movs r0, 0 pop {r4} pop {r1} @@ -656289,7 +656289,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 @@ -656309,7 +656309,7 @@ sub_8154B78: @ 8154B78 lsrs r1, r0, 24 adds r5, r1, 0 cmp r1, 0x40 - beq _08154BD8 + beq @08154BD8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -656335,7 +656335,7 @@ sub_8154B78: @ 8154B78 strh r1, [r0, 0x3C] ldrb r1, [r4, 0x10] bl obj_anim_image_start -_08154BD8: +@08154BD8: adds r0, r5, 0 pop {r4,r5} pop {r1} @@ -656345,7 +656345,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 @@ -656365,7 +656365,7 @@ sub_8154BEC: @ 8154BEC lsrs r1, r0, 24 adds r5, r1, 0 cmp r1, 0x40 - beq _08154C4C + beq @08154C4C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -656391,7 +656391,7 @@ sub_8154BEC: @ 8154BEC strh r1, [r0, 0x3C] ldrb r1, [r4, 0x10] bl obj_anim_image_start -_08154C4C: +@08154C4C: adds r0, r5, 0 pop {r4,r5} pop {r1} @@ -656401,7 +656401,7 @@ _08154C4C: thumb_func_end sub_8154BEC thumb_func_start sub_8154C60 -sub_8154C60: @ 8154C60 +sub_8154C60: ; 8154C60 push {lr} ldr r2, =0x085cdc4c movs r3, 0x2E @@ -656417,7 +656417,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] @@ -656426,10 +656426,10 @@ sub_8154C7C: @ 8154C7C lsls r0, 16 asrs r0, 16 cmp r0, 0x28 - ble _08154C92 + ble @08154C92 movs r0, 0x1 strh r0, [r1, 0x2E] -_08154C92: +@08154C92: adds r0, r1, 0 movs r1, 0 bl sub_80979D4 @@ -656438,7 +656438,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 @@ -656465,20 +656465,20 @@ sub_8154CA0: @ 8154CA0 movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0x38 - ble _08154CE4 + ble @08154CE4 ldrh r1, [r4, 0x3C] lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 bl oe_stop -_08154CE4: +@08154CE4: pop {r4} pop {r0} bx r0 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] @@ -656501,7 +656501,7 @@ sub_8154CEC: @ 8154CEC lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x40 - beq _08154D76 + beq @08154D76 ldrb r0, [r5, 0x5] bl npc_get_type lsls r3, r4, 4 @@ -656544,7 +656544,7 @@ sub_8154CEC: @ 8154CEC strh r0, [r3, 0x26] movs r0, 0x46 bl audio_play -_08154D76: +@08154D76: movs r0, 0 pop {r4-r6} pop {r1} @@ -656554,7 +656554,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 @@ -656563,7 +656563,7 @@ sub_8154D90: @ 8154D90 movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _08154DC0 + bne @08154DC0 ldrh r0, [r4, 0x2E] lsls r0, 24 lsrs r0, 24 @@ -656577,13 +656577,13 @@ sub_8154D90: @ 8154D90 bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - beq _08154DCA -_08154DC0: + beq @08154DCA +@08154DC0: adds r0, r4, 0 movs r1, 0xF bl oe_stop - b _08154E0A -_08154DCA: + b @08154E0A +@08154DCA: ldr r3, =0x02020630 ldr r2, =0x02037350 mov r0, sp @@ -656615,7 +656615,7 @@ _08154DCA: adds r0, r4, 0 movs r1, 0 bl sub_80979D4 -_08154E0A: +@08154E0A: add sp, 0x4 pop {r4} pop {r0} @@ -656625,7 +656625,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 @@ -656644,7 +656644,7 @@ sub_8154E1C: @ 8154E1C lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _08154E78 + beq @08154E78 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -656670,7 +656670,7 @@ sub_8154E1C: @ 8154E1C strh r0, [r2, 0x2E] movs r0, 0x10 strh r0, [r2, 0x30] -_08154E78: +@08154E78: movs r0, 0 pop {r4} pop {r1} @@ -656680,7 +656680,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 @@ -656699,7 +656699,7 @@ oei_water_drop_tall: @ 8154E8C lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _08154EE8 + beq @08154EE8 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -656725,7 +656725,7 @@ oei_water_drop_tall: @ 8154E8C strh r0, [r2, 0x2E] movs r0, 0xE strh r0, [r2, 0x30] -_08154EE8: +@08154EE8: movs r0, 0 pop {r4} pop {r1} @@ -656735,7 +656735,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] @@ -656758,7 +656758,7 @@ sub_8154EFC: @ 8154EFC lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 - beq _08154F92 + beq @08154F92 ldrb r0, [r6, 0x5] bl npc_get_type adds r4, r0, 0 @@ -656807,7 +656807,7 @@ sub_8154EFC: @ 8154EFC strh r1, [r0, 0x26] movs r1, 0x1 bl obj_anim_image_start -_08154F92: +@08154F92: movs r0, 0 pop {r4-r7} pop {r1} @@ -656817,7 +656817,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 @@ -656834,7 +656834,7 @@ sub_8154FB4: @ 8154FB4 bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _08154FEE + bne @08154FEE ldr r2, =0x02037350 mov r0, sp ldrb r1, [r0] @@ -656845,15 +656845,15 @@ sub_8154FB4: @ 8154FB4 ldrb r0, [r5, 0x2] lsls r0, 28 cmp r0, 0 - blt _08154FFC -_08154FEE: + blt @08154FFC +@08154FEE: adds r0, r4, 0 movs r1, 0x22 bl oe_stop - b _08155046 + b @08155046 .align 2, 0 .pool -_08154FFC: +@08154FFC: ldrb r1, [r5, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -656875,7 +656875,7 @@ _08154FFC: ldr r1, [r5, 0x10] ldr r0, [r4, 0x34] cmp r1, r0 - beq _08155046 + beq @08155046 ldrh r0, [r5, 0x10] strh r0, [r4, 0x34] ldrh r0, [r5, 0x12] @@ -656886,10 +656886,10 @@ _08154FFC: movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne _08155046 + bne @08155046 movs r0, 0x46 bl audio_play -_08155046: +@08155046: add sp, 0x4 pop {r4,r5} pop {r0} @@ -656899,7 +656899,7 @@ _08155046: thumb_func_end sub_8154FB4 thumb_func_start oei_ripples -oei_ripples: @ 8155054 +oei_ripples: ; 8155054 push {r4,lr} ldr r0, =0x085059f8 ldr r0, [r0, 0x14] @@ -656913,7 +656913,7 @@ oei_ripples: @ 8155054 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _081550A0 + beq @081550A0 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -656937,7 +656937,7 @@ oei_ripples: @ 8155054 strb r0, [r2, 0x5] movs r0, 0x5 strh r0, [r2, 0x2E] -_081550A0: +@081550A0: movs r0, 0 pop {r4} pop {r1} @@ -656947,7 +656947,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] @@ -656970,7 +656970,7 @@ sub_81550B4: @ 81550B4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _08155140 + beq @08155140 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -657016,7 +657016,7 @@ sub_81550B4: @ 81550B4 adds r0, r4 ldrh r0, [r0, 0x22] strh r0, [r2, 0x36] -_08155140: +@08155140: movs r0, 0 pop {r4-r6} pop {r1} @@ -657026,7 +657026,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 @@ -657043,7 +657043,7 @@ sub_8155158: @ 8155158 bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _08155192 + bne @08155192 ldr r5, =0x02037350 mov r0, sp ldrb r1, [r0] @@ -657054,15 +657054,15 @@ sub_8155158: @ 8155158 ldrb r0, [r1, 0x2] lsls r0, 26 cmp r0, 0 - blt _081551A0 -_08155192: + blt @081551A0 +@08155192: adds r0, r4, 0 movs r1, 0x2A bl oe_stop - b _081551E4 + b @081551E4 .align 2, 0 .pool -_081551A0: +@081551A0: ldrb r0, [r1, 0x5] bl npc_get_type mov r1, sp @@ -657095,7 +657095,7 @@ _081551A0: adds r0, r4, 0 movs r1, 0 bl sub_80979D4 -_081551E4: +@081551E4: add sp, 0x4 pop {r4,r5} pop {r0} @@ -657105,7 +657105,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 @@ -657124,7 +657124,7 @@ sub_81551F0: @ 81551F0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _08155248 + beq @08155248 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -657148,7 +657148,7 @@ sub_81551F0: @ 81551F0 strb r0, [r2, 0x5] movs r0, 0x13 strh r0, [r2, 0x2E] -_08155248: +@08155248: movs r0, 0 pop {r4} pop {r1} @@ -657158,7 +657158,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 @@ -657177,7 +657177,7 @@ sub_815525C: @ 815525C lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _081552B4 + beq @081552B4 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -657201,7 +657201,7 @@ sub_815525C: @ 815525C strb r0, [r2, 0x5] movs r0, 0x14 strh r0, [r2, 0x2E] -_081552B4: +@081552B4: movs r0, 0 pop {r4} pop {r1} @@ -657211,7 +657211,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 @@ -657230,7 +657230,7 @@ sub_81552C8: @ 81552C8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _08155320 + beq @08155320 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -657254,7 +657254,7 @@ sub_81552C8: @ 81552C8 strb r0, [r2, 0x5] movs r0, 0x15 strh r0, [r2, 0x2E] -_08155320: +@08155320: movs r0, 0 pop {r4} pop {r1} @@ -657264,7 +657264,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 @@ -657283,7 +657283,7 @@ sub_8155334: @ 8155334 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _0815538C + beq @0815538C lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -657307,7 +657307,7 @@ sub_8155334: @ 8155334 strb r0, [r2, 0x5] movs r0, 0x16 strh r0, [r2, 0x2E] -_0815538C: +@0815538C: movs r0, 0 pop {r4} pop {r1} @@ -657317,7 +657317,7 @@ _0815538C: thumb_func_end sub_8155334 thumb_func_start ash -ash: @ 81553A0 +ash: ; 81553A0 push {r4,lr} lsls r2, 16 lsrs r2, 16 @@ -657346,7 +657346,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 @@ -657374,7 +657374,7 @@ oei_ash: @ 81553D4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _0815544A + beq @0815544A lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -657404,7 +657404,7 @@ oei_ash: @ 81553D4 strh r0, [r2, 0x34] ldr r0, [r5, 0x14] strh r0, [r2, 0x36] -_0815544A: +@0815544A: movs r0, 0 add sp, 0x4 pop {r4,r5} @@ -657415,7 +657415,7 @@ _0815544A: thumb_func_end oei_ash thumb_func_start sub_8155460 -sub_8155460: @ 8155460 +sub_8155460: ; 8155460 push {lr} ldr r2, =0x085cdc54 movs r3, 0x2E @@ -657431,7 +657431,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 @@ -657450,16 +657450,16 @@ sub_815547C: @ 815547C strh r0, [r3, 0x36] lsls r0, 16 cmp r0, 0 - bne _081554A6 + bne @081554A6 movs r0, 0x1 strh r0, [r3, 0x2E] -_081554A6: +@081554A6: pop {r0} bx r0 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 @@ -657507,7 +657507,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 @@ -657518,18 +657518,18 @@ sub_815550C: @ 815550C movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0815552C + beq @0815552C adds r0, r4, 0 movs r1, 0x7 bl oe_stop -_0815552C: +@0815552C: pop {r4} pop {r0} bx r0 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 @@ -657549,7 +657549,7 @@ sub_8155534: @ 8155534 lsrs r0, 24 adds r5, r0, 0 cmp r0, 0x40 - beq _0815558E + beq @0815558E lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -657573,7 +657573,7 @@ sub_8155534: @ 8155534 negs r0, r0 strh r0, [r1, 0x3A] strh r0, [r1, 0x3C] -_0815558E: +@0815558E: movs r0, 0x8 bl oe_active_list_remove adds r0, r5, 0 @@ -657585,7 +657585,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 @@ -657610,7 +657610,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 @@ -657635,7 +657635,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 @@ -657663,7 +657663,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 @@ -657671,7 +657671,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 @@ -657680,7 +657680,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 @@ -657690,7 +657690,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 @@ -657733,7 +657733,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 @@ -657746,14 +657746,14 @@ sub_81556B0: @ 81556B0 bl sub_8155640 lsls r0, 24 cmp r0, 0 - bne _081556DC + bne @081556DC ldrb r0, [r5, 0x18] lsrs r0, 4 add r0, sp ldrb r1, [r0] adds r0, r4, 0 bl obj_anim_image_start_if_different -_081556DC: +@081556DC: add sp, 0xC pop {r4,r5} pop {r0} @@ -657763,7 +657763,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} @@ -657780,21 +657780,21 @@ sub_81556E8: @ 81556E8 ldrsh r3, [r4, r2] mov r8, r0 cmp r3, 0 - bne _08155770 + bne @08155770 mov r0, sp movs r5, 0 ldrsh r2, [r0, r5] movs r5, 0x3A ldrsh r0, [r4, r5] cmp r2, r0 - bne _08155724 + bne @08155724 lsls r0, r1, 16 asrs r0, 16 movs r5, 0x3C ldrsh r1, [r4, r5] cmp r0, r1 - beq _08155770 -_08155724: + beq @08155770 +@08155724: strh r3, [r4, 0x38] strh r2, [r4, 0x3A] mov r1, r8 @@ -657804,7 +657804,7 @@ _08155724: movs r5, 0x1 mov r7, r8 mov r6, sp -_08155736: +@08155736: adds r0, r5, 0 mov r1, sp adds r2, r7, 0 @@ -657817,12 +657817,12 @@ _08155736: lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bne _0815575C + bne @0815575C ldrh r0, [r4, 0x38] adds r0, 0x1 strh r0, [r4, 0x38] - b _08155770 -_0815575C: + b @08155770 +@0815575C: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -657832,8 +657832,8 @@ _0815575C: mov r1, r8 strh r0, [r1] cmp r5, 0x4 - bls _08155736 -_08155770: + bls @08155736 +@08155770: add sp, 0x4 pop {r3} mov r8, r3 @@ -657843,7 +657843,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 @@ -657858,7 +657858,7 @@ sub_815577C: @ 815577C lsrs r0, 24 adds r2, r0, 0 cmp r2, 0 - beq _081557F6 + beq @081557F6 ldrh r1, [r4, 0x36] adds r1, 0x1 strh r1, [r4, 0x36] @@ -657869,44 +657869,44 @@ sub_815577C: @ 815577C ldrh r0, [r0] ands r1, r0 cmp r1, 0 - bne _081557BC + bne @081557BC ldrh r0, [r4, 0x34] ldrh r1, [r4, 0x26] adds r0, r1 strh r0, [r4, 0x26] -_081557BC: +@081557BC: ldrh r1, [r4, 0x36] movs r0, 0xF ands r0, r1 cmp r0, 0 - bne _081557CC + bne @081557CC ldrh r0, [r4, 0x34] negs r0, r0 strh r0, [r4, 0x34] -_081557CC: +@081557CC: cmp r2, 0x2 - beq _081557F6 + beq @081557F6 adds r0, r4, 0 bl sub_815564C lsls r0, 24 cmp r0, 0 - bne _081557E4 + bne @081557E4 ldrh r0, [r4, 0x26] - b _081557EA + b @081557EA .align 2, 0 .pool -_081557E4: +@081557E4: ldrh r0, [r4, 0x26] ldrh r3, [r4, 0x30] adds r0, r3 -_081557EA: +@081557EA: strh r0, [r5, 0x26] ldrh r0, [r5, 0x20] strh r0, [r4, 0x20] ldrh r0, [r5, 0x22] adds r0, 0x8 strh r0, [r4, 0x22] -_081557F6: +@081557F6: add sp, 0x4 pop {r4,r5} pop {r0} @@ -657914,7 +657914,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 @@ -657952,7 +657952,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 @@ -657968,21 +657968,21 @@ sub_8155850: @ 8155850 movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne _08155878 + bne @08155878 ldrh r0, [r2, 0x30] ldrh r1, [r3, 0x26] adds r0, r1 strh r0, [r3, 0x26] -_08155878: +@08155878: ldrh r1, [r2, 0x32] movs r0, 0xF ands r0, r1 cmp r0, 0 - bne _08155888 + bne @08155888 ldrh r0, [r2, 0x30] negs r0, r0 strh r0, [r2, 0x30] -_08155888: +@08155888: pop {r0} bx r0 .align 2, 0 @@ -657990,7 +657990,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 @@ -658009,7 +658009,7 @@ sub_8155890: @ 8155890 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _081558EC + beq @081558EC lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -658035,7 +658035,7 @@ sub_8155890: @ 8155890 strh r0, [r2, 0x2E] movs r0, 0xA strh r0, [r2, 0x30] -_081558EC: +@081558EC: movs r0, 0 pop {r4} pop {r1} @@ -658045,7 +658045,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] @@ -658068,7 +658068,7 @@ sub_8155900: @ 8155900 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x40 - beq _081559A4 + beq @081559A4 ldrb r0, [r6, 0x5] bl npc_get_type adds r5, r0, 0 @@ -658124,7 +658124,7 @@ sub_8155900: @ 8155900 strh r1, [r0, 0x26] movs r1, 0x2 bl obj_anim_image_seek -_081559A4: +@081559A4: movs r0, 0 pop {r4-r7} pop {r1} @@ -658134,7 +658134,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 @@ -658151,7 +658151,7 @@ sub_81559BC: @ 81559BC bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - bne _081559F6 + bne @081559F6 ldr r2, =0x02037350 mov r0, sp ldrb r1, [r0] @@ -658162,15 +658162,15 @@ sub_81559BC: @ 81559BC ldrb r0, [r1, 0x2] lsls r0, 27 cmp r0, 0 - blt _08155A04 -_081559F6: + blt @08155A04 +@081559F6: adds r0, r4, 0 movs r1, 0x27 bl oe_stop - b _08155A76 + b @08155A76 .align 2, 0 .pool -_08155A04: +@08155A04: ldr r2, =0x02020630 ldrb r1, [r1, 0x4] lsls r0, r1, 4 @@ -658184,14 +658184,14 @@ _08155A04: movs r2, 0x34 ldrsh r0, [r4, r2] cmp r1, r0 - bne _08155A2C + bne @08155A2C lsls r0, r5, 16 asrs r0, 16 movs r2, 0x36 ldrsh r1, [r4, r2] cmp r0, r1 - beq _08155A46 -_08155A2C: + beq @08155A46 +@08155A2C: strh r6, [r4, 0x34] strh r5, [r4, 0x36] adds r0, r4, 0 @@ -658200,11 +658200,11 @@ _08155A2C: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08155A46 + beq @08155A46 adds r0, r4, 0 movs r1, 0 bl obj_anim_image_start -_08155A46: +@08155A46: strh r6, [r4, 0x20] strh r5, [r4, 0x22] ldr r3, =0x02020630 @@ -658228,7 +658228,7 @@ _08155A46: adds r0, r4, 0 movs r1, 0 bl sub_80979D4 -_08155A76: +@08155A76: add sp, 0x4 pop {r4-r6} pop {r0} @@ -658238,7 +658238,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 @@ -658258,7 +658258,7 @@ sub_8155A88: @ 8155A88 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _08155AD8 + beq @08155AD8 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -658277,7 +658277,7 @@ sub_8155A88: @ 8155A88 movs r2, 0x4 orrs r0, r2 strb r0, [r1, 0x5] -_08155AD8: +@08155AD8: movs r0, 0 pop {r4} pop {r1} @@ -658287,7 +658287,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] @@ -658308,11 +658308,11 @@ sub_8155AEC: @ 8155AEC ldr r0, =0x00001004 ands r0, r1 cmp r0, 0 - beq _08155B20 + beq @08155B20 adds r0, r4, 0 movs r1, 0x35 bl oe_stop -_08155B20: +@08155B20: pop {r4} pop {r0} bx r0 @@ -658321,7 +658321,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 @@ -658340,7 +658340,7 @@ sub_8155B2C: @ 8155B2C lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _08155B8C + beq @08155B8C lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -658368,7 +658368,7 @@ sub_8155B2C: @ 8155B2C strb r0, [r2, 0x5] movs r0, 0x17 strh r0, [r2, 0x2E] -_08155B8C: +@08155B8C: movs r0, 0 pop {r4} pop {r1} @@ -658378,7 +658378,7 @@ _08155B8C: thumb_func_end sub_8155B2C thumb_func_start sub_8155BA0 -sub_8155BA0: @ 8155BA0 +sub_8155BA0: ; 8155BA0 push {lr} movs r0, 0x1C movs r1, 0x18 @@ -658389,7 +658389,7 @@ sub_8155BA0: @ 8155BA0 thumb_func_end sub_8155BA0 thumb_func_start sub_8155BB0 -sub_8155BB0: @ 8155BB0 +sub_8155BB0: ; 8155BB0 push {lr} movs r0, 0x1D movs r1, 0x19 @@ -658400,7 +658400,7 @@ sub_8155BB0: @ 8155BB0 thumb_func_end sub_8155BB0 thumb_func_start sub_8155BC0 -sub_8155BC0: @ 8155BC0 +sub_8155BC0: ; 8155BC0 push {lr} movs r0, 0x24 movs r1, 0x1C @@ -658411,7 +658411,7 @@ sub_8155BC0: @ 8155BC0 thumb_func_end sub_8155BC0 thumb_func_start sub_8155BD0 -sub_8155BD0: @ 8155BD0 +sub_8155BD0: ; 8155BD0 push {r4-r7,lr} mov r7, r8 push {r7} @@ -658431,14 +658431,14 @@ sub_8155BD0: @ 8155BD0 bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - beq _08155C08 + beq @08155C08 adds r0, r4, 0 bl oe_active_list_remove movs r0, 0x40 - b _08155C74 + b @08155C74 .align 2, 0 .pool -_08155C08: +@08155C08: ldr r1, =0x085059f8 lsls r0, r6, 2 adds r0, r1 @@ -658452,7 +658452,7 @@ _08155C08: lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _08155C70 + beq @08155C70 mov r0, sp ldrb r0, [r0] lsls r2, r0, 4 @@ -658490,10 +658490,10 @@ _08155C08: strh r0, [r2, 0x34] ldr r0, [r5, 0x8] strh r0, [r2, 0x36] -_08155C70: +@08155C70: mov r0, sp ldrb r0, [r0] -_08155C74: +@08155C74: add sp, 0x4 pop {r3} mov r8, r3 @@ -658505,7 +658505,7 @@ _08155C74: thumb_func_end sub_8155BD0 thumb_func_start sub_8155C88 -sub_8155C88: @ 8155C88 +sub_8155C88: ; 8155C88 push {r4,r5,lr} sub sp, 0x4 adds r5, r0, 0 @@ -658522,13 +658522,13 @@ sub_8155C88: @ 8155C88 bl npc_id_by_local_id_and_map_ret_success lsls r0, 24 cmp r0, 0 - beq _08155CB8 + beq @08155CB8 ldrh r1, [r5, 0x30] lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 bl oe_stop -_08155CB8: +@08155CB8: ldr r4, =0x02037350 mov r0, sp ldrb r1, [r0] @@ -658585,38 +658585,38 @@ _08155CB8: movs r2, 0x2E ldrsh r0, [r5, r2] cmp r0, 0x1 - bne _08155D38 + bne @08155D38 adds r0, r1, 0x1 strh r0, [r5, 0x2E] adds r0, r5, 0 movs r1, 0x1 bl obj_anim_image_start -_08155D38: +@08155D38: movs r3, 0x2E ldrsh r0, [r5, r3] ldrh r2, [r5, 0x2E] cmp r0, 0x2 - bne _08155D54 + bne @08155D54 adds r0, r5, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08155D54 + beq @08155D54 movs r0, 0x1 strh r0, [r5, 0x3C] -_08155D54: +@08155D54: lsls r0, r2, 16 asrs r0, 16 cmp r0, 0x3 - bne _08155D68 + bne @08155D68 ldrh r1, [r5, 0x30] lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 bl oe_stop -_08155D68: +@08155D68: add sp, 0x4 pop {r4,r5} pop {r0} @@ -658626,13 +658626,13 @@ _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 ldrb r0, [r0] cmp r0, 0x1 - bne _08155D96 + bne @08155D96 ldr r2, =0x02020630 ldrb r1, [r1, 0x1A] lsls r0, r1, 4 @@ -658642,7 +658642,7 @@ sub_8155D78: @ 8155D78 ldrh r1, [r0, 0x2E] adds r1, 0x1 strh r1, [r0, 0x2E] -_08155D96: +@08155D96: pop {r0} bx r0 .align 2, 0 @@ -658650,15 +658650,15 @@ _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 ldrb r1, [r2] cmp r1, 0x2 - beq _08155DD6 + beq @08155DD6 cmp r1, 0 - beq _08155DD6 + beq @08155DD6 ldrb r1, [r0, 0x1A] lsls r0, r1, 4 adds r0, r1 @@ -658668,26 +658668,26 @@ sub_8155DA0: @ 8155DA0 movs r3, 0x3C ldrsh r0, [r1, r3] cmp r0, 0 - bne _08155DCC + bne @08155DCC movs r0, 0 - b _08155DD8 + b @08155DD8 .align 2, 0 .pool -_08155DCC: +@08155DCC: movs r0, 0x2 strb r0, [r2] ldrh r0, [r1, 0x2E] adds r0, 0x1 strh r0, [r1, 0x2E] -_08155DD6: +@08155DD6: movs r0, 0x1 -_08155DD8: +@08155DD8: pop {r1} bx r1 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] @@ -658713,7 +658713,7 @@ sub_8155DDC: @ 8155DDC lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq _08155E3C + beq @08155E3C ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 @@ -658734,7 +658734,7 @@ sub_8155DDC: @ 8155DDC movs r2, 0x2 orrs r0, r2 strb r0, [r1] -_08155E3C: +@08155E3C: movs r0, 0 pop {r4} pop {r1} @@ -658744,20 +658744,20 @@ _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 ldrsh r0, [r2, r1] cmp r0, 0 - bne _08155E84 + bne @08155E84 adds r0, r2, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08155E7C + beq @08155E7C adds r3, r2, 0 adds r3, 0x3E ldrb r0, [r3] @@ -658767,29 +658767,29 @@ sub_8155E50: @ 8155E50 ldrh r0, [r2, 0x2E] adds r0, 0x1 strh r0, [r2, 0x2E] -_08155E7C: +@08155E7C: movs r1, 0x2E ldrsh r0, [r2, r1] cmp r0, 0 - beq _08155E9A -_08155E84: + beq @08155E9A +@08155E84: ldrh r0, [r2, 0x30] adds r0, 0x1 strh r0, [r2, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x22 - ble _08155E9A + ble @08155E9A adds r0, r2, 0 movs r1, 0x36 bl oe_stop -_08155E9A: +@08155E9A: pop {r0} bx r0 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] @@ -658797,26 +658797,26 @@ 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 movs r1, 0x3C ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _08155EDE + beq @08155EDE cmp r0, 0x1 - bgt _08155EC0 + bgt @08155EC0 cmp r0, 0 - beq _08155ECA - b _08155F42 -_08155EC0: + beq @08155ECA + b @08155F42 +@08155EC0: cmp r0, 0x2 - beq _08155F06 + beq @08155F06 cmp r0, 0x3 - beq _08155F1A - b _08155F42 -_08155ECA: + beq @08155F1A + b @08155F42 +@08155ECA: movs r2, 0x3A ldrsh r0, [r5, r2] bl sub_809773C @@ -658825,8 +658825,8 @@ _08155ECA: strh r0, [r5, 0x24] movs r2, 0x3A ldrsh r0, [r5, r2] - b _08155F38 -_08155EDE: + b @08155F38 +@08155EDE: ldrh r0, [r5, 0x3A] movs r4, 0x47 subs r0, r4, r0 @@ -658844,8 +658844,8 @@ _08155EDE: bl sub_8097728 ldrh r2, [r5, 0x26] adds r0, r2 - b _08155F40 -_08155F06: + b @08155F40 +@08155F06: movs r1, 0x3A ldrsh r0, [r5, r1] bl sub_809773C @@ -658854,8 +658854,8 @@ _08155F06: strh r1, [r5, 0x24] movs r2, 0x3A ldrsh r0, [r5, r2] - b _08155F38 -_08155F1A: + b @08155F38 +@08155F1A: ldrh r0, [r5, 0x3A] movs r4, 0x47 subs r0, r4, r0 @@ -658870,13 +658870,13 @@ _08155F1A: lsls r4, 16 asrs r4, 16 adds r0, r4, 0 -_08155F38: +@08155F38: bl sub_8097728 ldrh r1, [r5, 0x26] adds r0, r1 -_08155F40: +@08155F40: strh r0, [r5, 0x26] -_08155F42: +@08155F42: ldrh r1, [r5, 0x24] negs r1, r1 lsls r1, 16 @@ -658890,20 +658890,20 @@ _08155F42: lsls r0, 16 asrs r0, 16 cmp r0, 0x48 - bne _08155F68 + bne @08155F68 strh r1, [r5, 0x3A] ldrh r0, [r5, 0x3C] adds r0, 0x1 strh r0, [r5, 0x3C] -_08155F68: +@08155F68: movs r2, 0x3C ldrsh r0, [r5, r2] cmp r0, 0x4 - bne _08155F76 + bne @08155F76 strh r1, [r5, 0x26] strh r1, [r5, 0x24] movs r6, 0x1 -_08155F76: +@08155F76: adds r0, r6, 0 pop {r4-r6} pop {r1} @@ -658911,34 +658911,34 @@ _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 ldrsh r0, [r5, r1] cmp r0, 0x8 - bls _08155F8E - b _08156156 -_08155F8E: + bls @08155F8E + b @08156156 +@08155F8E: lsls r0, 2 - ldr r1, =_08155F9C + ldr r1, =@08155F9C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08155F9C: - .4byte _08155FC0 - .4byte _08156034 - .4byte _0815606C - .4byte _08156090 - .4byte _081560C0 - .4byte _081560D4 - .4byte _081560E0 - .4byte _0815610E - .4byte _08156120 -_08155FC0: +@08155F9C: + .4byte @08155FC0 + .4byte @08156034 + .4byte @0815606C + .4byte @08156090 + .4byte @081560C0 + .4byte @081560D4 + .4byte @081560E0 + .4byte @0815610E + .4byte @08156120 +@08155FC0: movs r2, 0x2E ldrsh r0, [r5, r2] movs r1, 0x3 @@ -658952,20 +658952,20 @@ _08155FC0: movs r3, 0x2E ldrsh r0, [r5, r3] cmp r0, 0x60 - bne _08156016 + bne @08156016 movs r1, 0 ldr r4, =0x0600f800 mov r12, r4 ldr r0, =0x0000bff4 adds r7, r0, 0 -_08155FEA: +@08155FEA: movs r2, 0xC lsls r0, r1, 1 adds r3, r1, 0x1 lsls r6, r1, 5 adds r0, r1 lsls r4, r0, 1 -_08155FF6: +@08155FF6: adds r0, r6, r2 lsls r0, 1 add r0, r12 @@ -658977,25 +658977,25 @@ _08155FF6: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x11 - bls _08155FF6 + bls @08155FF6 lsls r0, r3, 24 lsrs r1, r0, 24 cmp r1, 0x2 - bls _08155FEA -_08156016: + bls @08155FEA +@08156016: movs r2, 0x2E ldrsh r1, [r5, r2] ldr r0, =0x00000137 cmp r1, r0 - bgt _08156022 - b _08156156 -_08156022: + bgt @08156022 + b @08156156 +@08156022: movs r1, 0 movs r0, 0x1 - b _0815611A + b @0815611A .align 2, 0 .pool -_08156034: +@08156034: ldr r4, =0x08329f40 movs r3, 0x2E ldrsh r0, [r5, r3] @@ -659014,84 +659014,84 @@ _08156034: movs r2, 0x2E ldrsh r0, [r5, r2] cmp r0, 0xBD - bne _08156156 + bne @08156156 movs r0, 0x2 strh r0, [r5, 0x32] strh r1, [r5, 0x38] strh r1, [r5, 0x2E] - b _08156156 + b @08156156 .align 2, 0 .pool -_0815606C: +@0815606C: movs r3, 0x2E ldrsh r0, [r5, r3] cmp r0, 0x3C - bne _0815607E + bne @0815607E ldrh r0, [r5, 0x38] adds r0, 0x1 movs r1, 0 strh r0, [r5, 0x38] strh r1, [r5, 0x2E] -_0815607E: +@0815607E: movs r4, 0x38 ldrsh r0, [r5, r4] cmp r0, 0x7 - bne _08156156 + bne @08156156 movs r0, 0 strh r0, [r5, 0x38] movs r0, 0x3 strh r0, [r5, 0x32] - b _08156156 -_08156090: + b @08156156 +@08156090: ldrh r2, [r5, 0x26] movs r0, 0x26 ldrsh r1, [r5, r0] adds r3, r2, 0 cmp r1, 0 - bne _081560A4 + bne @081560A4 strh r1, [r5, 0x2E] ldrh r0, [r5, 0x32] adds r0, 0x1 strh r0, [r5, 0x32] -_081560A4: +@081560A4: movs r4, 0x2E ldrsh r0, [r5, r4] cmp r0, 0x5 - bne _08156156 + bne @08156156 movs r0, 0 strh r0, [r5, 0x2E] cmp r1, 0 - ble _081560BA + ble @081560BA subs r0, r3, 0x1 strh r0, [r5, 0x26] - b _08156156 -_081560BA: + b @08156156 +@081560BA: adds r0, r2, 0x1 strh r0, [r5, 0x26] - b _08156156 -_081560C0: + b @08156156 +@081560C0: movs r1, 0x2E ldrsh r0, [r5, r1] cmp r0, 0x3C - bne _08156156 + bne @08156156 movs r1, 0 movs r0, 0x5 strh r0, [r5, 0x32] strh r1, [r5, 0x2E] strh r1, [r5, 0x38] - b _08156156 -_081560D4: + b @08156156 +@081560D4: adds r0, r5, 0 bl sub_8155EA0 movs r1, 0 movs r0, 0x6 - b _0815611A -_081560E0: + b @0815611A +@081560E0: adds r0, r5, 0 bl sub_8155EA8 lsls r0, 24 cmp r0, 0 - beq _08156156 + beq @08156156 movs r1, 0 strh r1, [r5, 0x2E] ldrh r0, [r5, 0x38] @@ -659100,35 +659100,35 @@ _081560E0: lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - bgt _08156106 + bgt @08156106 adds r0, r5, 0 bl sub_8155EA0 - b _08156156 -_08156106: + b @08156156 +@08156106: strh r1, [r5, 0x38] movs r0, 0x7 strh r0, [r5, 0x32] - b _08156156 -_0815610E: + b @08156156 +@0815610E: movs r2, 0x2E ldrsh r0, [r5, r2] cmp r0, 0x1E - bne _08156156 + bne @08156156 movs r1, 0 movs r0, 0x8 -_0815611A: +@0815611A: strh r0, [r5, 0x32] strh r1, [r5, 0x2E] - b _08156156 -_08156120: + b @08156156 +@08156120: movs r1, 0 ldr r6, =0x0600f800 movs r4, 0 -_08156126: +@08156126: movs r2, 0xC adds r3, r1, 0x1 lsls r1, 5 -_0815612C: +@0815612C: adds r0, r1, r2 lsls r0, 1 adds r0, r6 @@ -659137,44 +659137,44 @@ _0815612C: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x11 - bls _0815612C + bls @0815612C lsls r0, r3, 24 lsrs r1, r0, 24 cmp r1, 0xE - bls _08156126 + bls @08156126 movs r0, 0x12 movs r1, 0 bl lcd_io_set adds r0, r5, 0 movs r1, 0x40 bl oe_stop -_08156156: +@08156156: movs r3, 0x32 ldrsh r0, [r5, r3] cmp r0, 0x1 - bne _08156184 + bne @08156184 ldrh r1, [r5, 0x30] movs r0, 0x7 ands r0, r1 adds r2, r1, 0 cmp r0, 0 - bne _08156172 + bne @08156172 ldrh r0, [r5, 0x34] ldrh r4, [r5, 0x26] adds r0, r4 strh r0, [r5, 0x26] -_08156172: +@08156172: movs r0, 0xF ands r0, r2 cmp r0, 0 - bne _08156180 + bne @08156180 ldrh r0, [r5, 0x34] negs r0, r0 strh r0, [r5, 0x34] -_08156180: +@08156180: adds r0, r1, 0x1 strh r0, [r5, 0x30] -_08156184: +@08156184: ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] @@ -659186,7 +659186,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 @@ -659194,14 +659194,14 @@ sub_8156194: @ 8156194 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _081561B2 + beq @081561B2 ldrh r1, [r4, 0x30] lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 bl oe_stop - b _081561C8 -_081561B2: + b @081561C8 +@081561B2: adds r0, r4, 0 movs r1, 0 bl sub_80979D4 @@ -659211,14 +659211,14 @@ _081561B2: adds r1, r4, 0 movs r2, 0 bl npc_y_height_related -_081561C8: +@081561C8: pop {r4} pop {r0} bx r0 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 @@ -659226,24 +659226,24 @@ sub_81561D0: @ 81561D0 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _081561EE + beq @081561EE ldrh r1, [r2, 0x2E] lsls r1, 24 lsrs r1, 24 adds r0, r2, 0 bl oe_stop - b _081561F6 -_081561EE: + b @081561F6 +@081561EE: adds r0, r2, 0 movs r1, 0 bl sub_80979D4 -_081561F6: +@081561F6: pop {r0} bx r0 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 @@ -659254,7 +659254,7 @@ sub_81561FC: @ 81561FC adds r1, r6, 0 bl npc_y_height_related movs r7, 0 -_08156212: +@08156212: lsls r0, r7, 3 adds r0, r7 lsls r0, 2 @@ -659263,7 +659263,7 @@ _08156212: ldrb r0, [r4] lsls r0, 31 cmp r0, 0 - beq _081562B4 + beq @081562B4 ldrb r0, [r4, 0x5] bl npc_get_type ldrb r1, [r4, 0x4] @@ -659286,11 +659286,11 @@ _08156212: movs r0, 0x20 ldrsh r2, [r5, r0] cmp r1, r2 - bge _081562B4 + bge @081562B4 lsls r0, r4, 16 asrs r0, 16 cmp r0, r2 - ble _081562B4 + ble @081562B4 adds r0, r5, 0 adds r0, 0x29 movs r3, 0 @@ -659312,14 +659312,14 @@ _08156212: lsls r3, 16 asrs r3, 16 cmp r2, r3 - blt _0815628C + blt @0815628C cmp r2, r0 - bge _081562B4 -_0815628C: + bge @081562B4 +@0815628C: lsls r0, r4, 16 asrs r0, 16 cmp r0, r3 - ble _081562B4 + ble @081562B4 adds r2, r6, 0 adds r2, 0x43 adds r0, r5, 0 @@ -659327,26 +659327,26 @@ _0815628C: ldrb r1, [r0] ldrb r0, [r2] cmp r0, r1 - bhi _081562B4 + bhi @081562B4 adds r0, r1, 0x2 strb r0, [r2] - b _081562BE + b @081562BE .align 2, 0 .pool -_081562B4: +@081562B4: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0xF - bls _08156212 -_081562BE: + bls @08156212 +@081562BE: pop {r4-r7} pop {r0} bx r0 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 @@ -659359,7 +659359,7 @@ sub_81562C4: @ 81562C4 movs r1, 0 movs r3, 0x64 adds r2, r4, 0 -_081562DE: +@081562DE: ldr r0, [r4] ldr r0, [r0, 0xC] adds r0, 0x5 @@ -659367,7 +659367,7 @@ _081562DE: strb r3, [r0] adds r1, 0x1 cmp r1, 0x3 - ble _081562DE + ble @081562DE ldr r0, [r2] ldr r0, [r0, 0xC] adds r0, 0x41 @@ -659396,27 +659396,27 @@ _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] ldr r0, [r0, 0xC] ldr r0, [r0, 0x14] cmp r0, 0 - beq _0815636A + beq @0815636A adds r4, r1, 0 movs r5, 0 -_08156336: +@08156336: ldr r0, [r4] ldr r2, [r0, 0xC] ldr r0, [r2, 0x14] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0815634A + beq @0815634A strb r5, [r2] bl sub_81563B0 -_0815634A: +@0815634A: ldr r0, [r4] ldr r1, [r0, 0xC] ldr r0, [r1, 0x14] @@ -659432,10 +659432,10 @@ _0815634A: ldr r0, [r0, 0xC] ldr r0, [r0, 0x14] cmp r0, 0 - bne _08156336 -_0815636A: + bne @08156336 +@0815636A: movs r6, 0x3 -_0815636C: +@0815636C: bl GenerateRandomNumber adds r5, r0, 0 ands r5, r6 @@ -659448,22 +659448,22 @@ _0815636C: movs r2, 0 ldrb r1, [r1, 0x5] cmp r3, r1 - bcc _0815639E + bcc @0815639E adds r1, r4, 0 -_0815638A: +@0815638A: adds r2, 0x1 cmp r2, 0x3 - bgt _0815639E + bgt @0815639E ldr r0, [r1] ldr r0, [r0, 0xC] adds r0, 0x5 adds r0, r2 ldrb r0, [r0] cmp r3, r0 - bcs _0815638A -_0815639E: + bcs @0815638A +@0815639E: cmp r2, 0x4 - bne _0815636C + bne @0815636C adds r0, r5, 0 pop {r4-r6} pop {r1} @@ -659473,7 +659473,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} @@ -659483,21 +659483,21 @@ sub_81563B0: @ 81563B0 ldrb r0, [r0] adds r4, r5, 0 cmp r0, 0x2 - beq _081564A0 + beq @081564A0 adds r7, r5, 0 ldr r6, =0x0203ab38 ldr r0, =0x02039e1e mov r8, r0 -_081563CC: +@081563CC: ldr r0, [r7] ldr r2, [r0, 0xC] ldrb r0, [r2] cmp r0, 0x1 - beq _08156426 + beq @08156426 cmp r0, 0x1 - bgt _08156496 + bgt @08156496 cmp r0, 0 - bne _08156496 + bne @08156496 ldr r1, =0x082de350 ldrb r0, [r2, 0x10] lsls r0, 2 @@ -659515,24 +659515,24 @@ _081563CC: ldrh r1, [r1] adds r0, r1, 0 cmp r0, 0 - bne _08156418 + bne @08156418 strh r0, [r2, 0x2] - b _0815641A + b @0815641A .align 2, 0 .pool -_08156418: +@08156418: strh r1, [r2, 0x2] -_0815641A: +@0815641A: ldr r0, [r4] ldr r1, [r0, 0xC] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08156496 -_08156426: + b @08156496 +@08156426: ldrh r1, [r2, 0x2] cmp r1, 0 - beq _08156444 + beq @08156444 ldr r1, =0x085cdd00 ldr r0, [r6] ldrb r0, [r0] @@ -659540,10 +659540,10 @@ _08156426: adds r0, r1 ldr r0, [r0] bl _call_via_r0 - b _08156458 + b @08156458 .align 2, 0 .pool -_08156444: +@08156444: adds r0, r2, 0x5 ldrb r2, [r2, 0x4] adds r0, r2 @@ -659554,7 +659554,7 @@ _08156444: movs r0, 0x1 orrs r0, r1 strb r0, [r2, 0x9] -_08156458: +@08156458: ldr r2, =0x02039f34 ldr r0, [r2] ldr r3, [r0, 0xC] @@ -659563,7 +659563,7 @@ _08156458: ands r0, r1 adds r4, r2, 0 cmp r0, 0 - beq _08156496 + beq @08156496 ldrb r0, [r3, 0x4] adds r0, 0x1 movs r2, 0 @@ -659572,29 +659572,29 @@ _08156458: ldr r1, [r0, 0xC] ldrb r0, [r1, 0x4] cmp r0, 0x3 - bhi _08156484 + bhi @08156484 strb r2, [r1] - b _0815648A + b @0815648A .align 2, 0 .pool -_08156484: +@08156484: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_0815648A: +@0815648A: ldr r0, [r4] ldr r2, [r0, 0xC] ldrb r1, [r2, 0x9] movs r0, 0xFE ands r0, r1 strb r0, [r2, 0x9] -_08156496: +@08156496: ldr r0, [r5] ldr r0, [r0, 0xC] ldrb r0, [r0] cmp r0, 0x2 - bne _081563CC -_081564A0: + bne @081563CC +@081564A0: pop {r3} mov r8, r3 pop {r4-r7} @@ -659603,7 +659603,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 @@ -659611,21 +659611,21 @@ sub_81564AC: @ 81564AC ldr r3, =0x02039f34 ldr r0, [r3] ldr r0, [r0, 0x8] - b _081564CC + b @081564CC .align 2, 0 .pool -_081564C0: +@081564C0: adds r1, 0x1 cmp r1, 0x3 - bgt _081564D2 + bgt @081564D2 ldr r0, [r3] ldr r0, [r0, 0x8] adds r0, r1 -_081564CC: +@081564CC: ldrb r0, [r0] cmp r0, r2 - bne _081564C0 -_081564D2: + bne @081564C0 +@081564D2: lsls r0, r1, 24 lsrs r0, 24 pop {r1} @@ -659633,7 +659633,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] @@ -659652,16 +659652,16 @@ sub_81564DC: @ 81564DC lsrs r4, r0, 16 asrs r0, 16 cmp r0, 0xFF - ble _08156510 + ble @08156510 movs r4, 0xFF - b _08156516 + b @08156516 .align 2, 0 .pool -_08156510: +@08156510: cmp r0, 0 - bge _08156516 + bge @08156516 movs r4, 0 -_08156516: +@08156516: ldr r0, [r3] ldr r1, [r0, 0xC] adds r0, r1, 0x5 @@ -659677,7 +659677,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] @@ -659694,7 +659694,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 @@ -659706,7 +659706,7 @@ sub_8156550: @ 8156550 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bge _0815658C + bge @0815658C ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -659718,19 +659718,19 @@ sub_8156550: @ 8156550 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08156590 + b @08156590 .align 2, 0 .pool -_0815658C: +@0815658C: adds r0, r2, 0x5 str r0, [r3] -_08156590: +@08156590: pop {r0} bx r0 thumb_func_end sub_8156550 thumb_func_start sub_8156594 -sub_8156594: @ 8156594 +sub_8156594: ; 8156594 push {lr} bl sub_8156530 ldr r0, =0x02039f34 @@ -659742,7 +659742,7 @@ sub_8156594: @ 8156594 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - ble _081565D0 + ble @081565D0 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -659754,19 +659754,19 @@ sub_8156594: @ 8156594 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081565D4 + b @081565D4 .align 2, 0 .pool -_081565D0: +@081565D0: adds r0, r2, 0x5 str r0, [r3] -_081565D4: +@081565D4: pop {r0} bx r0 thumb_func_end sub_8156594 thumb_func_start sub_81565D8 -sub_81565D8: @ 81565D8 +sub_81565D8: ; 81565D8 push {lr} bl sub_8156530 ldr r0, =0x02039f34 @@ -659778,7 +659778,7 @@ sub_81565D8: @ 81565D8 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bne _08156614 + bne @08156614 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -659790,19 +659790,19 @@ sub_81565D8: @ 81565D8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08156618 + b @08156618 .align 2, 0 .pool -_08156614: +@08156614: adds r0, r2, 0x5 str r0, [r3] -_08156618: +@08156618: pop {r0} bx r0 thumb_func_end sub_81565D8 thumb_func_start sub_815661C -sub_815661C: @ 815661C +sub_815661C: ; 815661C push {lr} bl sub_8156530 ldr r0, =0x02039f34 @@ -659814,7 +659814,7 @@ sub_815661C: @ 815661C ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - beq _08156658 + beq @08156658 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -659826,19 +659826,19 @@ sub_815661C: @ 815661C lsls r0, 24 orrs r1, r0 str r1, [r3] - b _0815665C + b @0815665C .align 2, 0 .pool -_08156658: +@08156658: adds r0, r2, 0x5 str r0, [r3] -_0815665C: +@0815665C: pop {r0} bx r0 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] @@ -659857,7 +659857,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 @@ -659869,7 +659869,7 @@ sub_8156684: @ 8156684 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bge _081566C0 + bge @081566C0 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -659881,19 +659881,19 @@ sub_8156684: @ 8156684 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081566C4 + b @081566C4 .align 2, 0 .pool -_081566C0: +@081566C0: adds r0, r2, 0x5 str r0, [r3] -_081566C4: +@081566C4: pop {r0} bx r0 thumb_func_end sub_8156684 thumb_func_start sub_81566C8 -sub_81566C8: @ 81566C8 +sub_81566C8: ; 81566C8 push {lr} bl sub_8156660 ldr r0, =0x02039f34 @@ -659905,7 +659905,7 @@ sub_81566C8: @ 81566C8 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - ble _08156704 + ble @08156704 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -659917,19 +659917,19 @@ sub_81566C8: @ 81566C8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08156708 + b @08156708 .align 2, 0 .pool -_08156704: +@08156704: adds r0, r2, 0x5 str r0, [r3] -_08156708: +@08156708: pop {r0} bx r0 thumb_func_end sub_81566C8 thumb_func_start sub_815670C -sub_815670C: @ 815670C +sub_815670C: ; 815670C push {lr} bl sub_8156660 ldr r0, =0x02039f34 @@ -659941,7 +659941,7 @@ sub_815670C: @ 815670C ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bne _08156748 + bne @08156748 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -659953,19 +659953,19 @@ sub_815670C: @ 815670C lsls r0, 24 orrs r1, r0 str r1, [r3] - b _0815674C + b @0815674C .align 2, 0 .pool -_08156748: +@08156748: adds r0, r2, 0x5 str r0, [r3] -_0815674C: +@0815674C: pop {r0} bx r0 thumb_func_end sub_815670C thumb_func_start sub_8156750 -sub_8156750: @ 8156750 +sub_8156750: ; 8156750 push {lr} bl sub_8156660 ldr r0, =0x02039f34 @@ -659977,7 +659977,7 @@ sub_8156750: @ 8156750 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - beq _0815678C + beq @0815678C ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -659989,19 +659989,19 @@ sub_8156750: @ 8156750 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08156790 + b @08156790 .align 2, 0 .pool -_0815678C: +@0815678C: adds r0, r2, 0x5 str r0, [r3] -_08156790: +@08156790: pop {r0} bx r0 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] @@ -660022,7 +660022,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 @@ -660034,7 +660034,7 @@ sub_81567BC: @ 81567BC ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bge _081567F8 + bge @081567F8 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -660046,19 +660046,19 @@ sub_81567BC: @ 81567BC lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081567FC + b @081567FC .align 2, 0 .pool -_081567F8: +@081567F8: adds r0, r2, 0x5 str r0, [r3] -_081567FC: +@081567FC: pop {r0} bx r0 thumb_func_end sub_81567BC thumb_func_start sub_8156800 -sub_8156800: @ 8156800 +sub_8156800: ; 8156800 push {lr} bl sub_8156794 ldr r0, =0x02039f34 @@ -660070,7 +660070,7 @@ sub_8156800: @ 8156800 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - ble _0815683C + ble @0815683C ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -660082,19 +660082,19 @@ sub_8156800: @ 8156800 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08156840 + b @08156840 .align 2, 0 .pool -_0815683C: +@0815683C: adds r0, r2, 0x5 str r0, [r3] -_08156840: +@08156840: pop {r0} bx r0 thumb_func_end sub_8156800 thumb_func_start sub_8156844 -sub_8156844: @ 8156844 +sub_8156844: ; 8156844 push {lr} bl sub_8156794 ldr r0, =0x02039f34 @@ -660106,7 +660106,7 @@ sub_8156844: @ 8156844 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bne _08156880 + bne @08156880 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -660118,19 +660118,19 @@ sub_8156844: @ 8156844 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08156884 + b @08156884 .align 2, 0 .pool -_08156880: +@08156880: adds r0, r2, 0x5 str r0, [r3] -_08156884: +@08156884: pop {r0} bx r0 thumb_func_end sub_8156844 thumb_func_start sub_8156888 -sub_8156888: @ 8156888 +sub_8156888: ; 8156888 push {lr} bl sub_8156794 ldr r0, =0x02039f34 @@ -660142,7 +660142,7 @@ sub_8156888: @ 8156888 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - beq _081568C4 + beq @081568C4 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -660154,19 +660154,19 @@ sub_8156888: @ 8156888 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081568C8 + b @081568C8 .align 2, 0 .pool -_081568C4: +@081568C4: adds r0, r2, 0x5 str r0, [r3] -_081568C8: +@081568C8: pop {r0} bx r0 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] @@ -660199,7 +660199,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 @@ -660211,7 +660211,7 @@ sub_815690C: @ 815690C ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bge _08156948 + bge @08156948 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -660223,19 +660223,19 @@ sub_815690C: @ 815690C lsls r0, 24 orrs r1, r0 str r1, [r3] - b _0815694C + b @0815694C .align 2, 0 .pool -_08156948: +@08156948: adds r0, r2, 0x5 str r0, [r3] -_0815694C: +@0815694C: pop {r0} bx r0 thumb_func_end sub_815690C thumb_func_start sub_8156950 -sub_8156950: @ 8156950 +sub_8156950: ; 8156950 push {lr} bl sub_81568CC ldr r0, =0x02039f34 @@ -660247,7 +660247,7 @@ sub_8156950: @ 8156950 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - ble _0815698C + ble @0815698C ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -660259,19 +660259,19 @@ sub_8156950: @ 8156950 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08156990 + b @08156990 .align 2, 0 .pool -_0815698C: +@0815698C: adds r0, r2, 0x5 str r0, [r3] -_08156990: +@08156990: pop {r0} bx r0 thumb_func_end sub_8156950 thumb_func_start sub_8156994 -sub_8156994: @ 8156994 +sub_8156994: ; 8156994 push {lr} bl sub_81568CC ldr r0, =0x02039f34 @@ -660283,7 +660283,7 @@ sub_8156994: @ 8156994 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bne _081569D0 + bne @081569D0 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -660295,19 +660295,19 @@ sub_8156994: @ 8156994 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081569D4 + b @081569D4 .align 2, 0 .pool -_081569D0: +@081569D0: adds r0, r2, 0x5 str r0, [r3] -_081569D4: +@081569D4: pop {r0} bx r0 thumb_func_end sub_8156994 thumb_func_start sub_81569D8 -sub_81569D8: @ 81569D8 +sub_81569D8: ; 81569D8 push {lr} bl sub_81568CC ldr r0, =0x02039f34 @@ -660319,7 +660319,7 @@ sub_81569D8: @ 81569D8 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - beq _08156A14 + beq @08156A14 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -660331,19 +660331,19 @@ sub_81569D8: @ 81569D8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08156A18 + b @08156A18 .align 2, 0 .pool -_08156A14: +@08156A14: adds r0, r2, 0x5 str r0, [r3] -_08156A18: +@08156A18: pop {r0} bx r0 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] @@ -660367,7 +660367,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 @@ -660384,7 +660384,7 @@ sub_8156A48: @ 8156A48 lsls r1, 16 asrs r1, 16 cmp r0, r1 - bge _08156A8C + bge @08156A8C ldrb r1, [r3, 0x2] ldrb r0, [r3, 0x3] lsls r0, 8 @@ -660396,20 +660396,20 @@ sub_8156A48: @ 8156A48 lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08156A90 + b @08156A90 .align 2, 0 .pool -_08156A8C: +@08156A8C: adds r0, r3, 0x6 str r0, [r4] -_08156A90: +@08156A90: pop {r4,r5} pop {r0} bx r0 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 @@ -660426,7 +660426,7 @@ sub_8156A98: @ 8156A98 lsls r1, 16 asrs r1, 16 cmp r0, r1 - ble _08156ADC + ble @08156ADC ldrb r1, [r3, 0x2] ldrb r0, [r3, 0x3] lsls r0, 8 @@ -660438,20 +660438,20 @@ sub_8156A98: @ 8156A98 lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08156AE0 + b @08156AE0 .align 2, 0 .pool -_08156ADC: +@08156ADC: adds r0, r3, 0x6 str r0, [r4] -_08156AE0: +@08156AE0: pop {r4,r5} pop {r0} bx r0 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 @@ -660468,7 +660468,7 @@ sub_8156AE8: @ 8156AE8 lsls r1, 16 asrs r1, 16 cmp r0, r1 - bne _08156B2C + bne @08156B2C ldrb r1, [r3, 0x2] ldrb r0, [r3, 0x3] lsls r0, 8 @@ -660480,20 +660480,20 @@ sub_8156AE8: @ 8156AE8 lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08156B30 + b @08156B30 .align 2, 0 .pool -_08156B2C: +@08156B2C: adds r0, r3, 0x6 str r0, [r4] -_08156B30: +@08156B30: pop {r4,r5} pop {r0} bx r0 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 @@ -660510,7 +660510,7 @@ sub_8156B38: @ 8156B38 lsls r1, 16 asrs r1, 16 cmp r0, r1 - beq _08156B7C + beq @08156B7C ldrb r1, [r3, 0x2] ldrb r0, [r3, 0x3] lsls r0, 8 @@ -660522,20 +660522,20 @@ sub_8156B38: @ 8156B38 lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08156B80 + b @08156B80 .align 2, 0 .pool -_08156B7C: +@08156B7C: adds r0, r3, 0x6 str r0, [r4] -_08156B80: +@08156B80: pop {r4,r5} pop {r0} bx r0 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] @@ -660557,7 +660557,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 @@ -660574,7 +660574,7 @@ sub_8156BB4: @ 8156BB4 lsls r1, 16 asrs r1, 16 cmp r0, r1 - bge _08156BF8 + bge @08156BF8 ldrb r1, [r3, 0x2] ldrb r0, [r3, 0x3] lsls r0, 8 @@ -660586,20 +660586,20 @@ sub_8156BB4: @ 8156BB4 lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08156BFC + b @08156BFC .align 2, 0 .pool -_08156BF8: +@08156BF8: adds r0, r3, 0x6 str r0, [r4] -_08156BFC: +@08156BFC: pop {r4,r5} pop {r0} bx r0 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 @@ -660616,7 +660616,7 @@ sub_8156C04: @ 8156C04 lsls r1, 16 asrs r1, 16 cmp r0, r1 - ble _08156C48 + ble @08156C48 ldrb r1, [r3, 0x2] ldrb r0, [r3, 0x3] lsls r0, 8 @@ -660628,20 +660628,20 @@ sub_8156C04: @ 8156C04 lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08156C4C + b @08156C4C .align 2, 0 .pool -_08156C48: +@08156C48: adds r0, r3, 0x6 str r0, [r4] -_08156C4C: +@08156C4C: pop {r4,r5} pop {r0} bx r0 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 @@ -660658,7 +660658,7 @@ sub_8156C54: @ 8156C54 lsls r1, 16 asrs r1, 16 cmp r0, r1 - bne _08156C98 + bne @08156C98 ldrb r1, [r3, 0x2] ldrb r0, [r3, 0x3] lsls r0, 8 @@ -660670,20 +660670,20 @@ sub_8156C54: @ 8156C54 lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08156C9C + b @08156C9C .align 2, 0 .pool -_08156C98: +@08156C98: adds r0, r3, 0x6 str r0, [r4] -_08156C9C: +@08156C9C: pop {r4,r5} pop {r0} bx r0 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 @@ -660700,7 +660700,7 @@ sub_8156CA4: @ 8156CA4 lsls r1, 16 asrs r1, 16 cmp r0, r1 - beq _08156CE8 + beq @08156CE8 ldrb r1, [r3, 0x2] ldrb r0, [r3, 0x3] lsls r0, 8 @@ -660712,20 +660712,20 @@ sub_8156CA4: @ 8156CA4 lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08156CEC + b @08156CEC .align 2, 0 .pool -_08156CE8: +@08156CE8: adds r0, r3, 0x6 str r0, [r4] -_08156CEC: +@08156CEC: pop {r4,r5} pop {r0} bx r0 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] @@ -660742,7 +660742,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 @@ -660754,7 +660754,7 @@ sub_8156D18: @ 8156D18 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bne _08156D54 + bne @08156D54 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -660766,19 +660766,19 @@ sub_8156D18: @ 8156D18 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08156D58 + b @08156D58 .align 2, 0 .pool -_08156D54: +@08156D54: adds r0, r2, 0x5 str r0, [r3] -_08156D58: +@08156D58: pop {r0} bx r0 thumb_func_end sub_8156D18 thumb_func_start sub_8156D5C -sub_8156D5C: @ 8156D5C +sub_8156D5C: ; 8156D5C push {lr} bl sub_8156CF4 ldr r0, =0x02039f34 @@ -660790,7 +660790,7 @@ sub_8156D5C: @ 8156D5C ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - beq _08156D98 + beq @08156D98 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -660802,19 +660802,19 @@ sub_8156D5C: @ 8156D5C lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08156D9C + b @08156D9C .align 2, 0 .pool -_08156D98: +@08156D98: adds r0, r2, 0x5 str r0, [r3] -_08156D9C: +@08156D9C: pop {r0} bx r0 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 @@ -660847,7 +660847,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 @@ -660860,7 +660860,7 @@ sub_8156DE4: @ 8156DE4 movs r0, 0 ldrsb r0, [r2, r0] cmp r1, r0 - bge _08156E20 + bge @08156E20 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -660872,20 +660872,20 @@ sub_8156DE4: @ 8156DE4 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08156E24 + b @08156E24 .align 2, 0 .pool -_08156E20: +@08156E20: adds r0, r2, 0x5 str r0, [r3] -_08156E24: +@08156E24: pop {r4} pop {r0} bx r0 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 @@ -660898,7 +660898,7 @@ sub_8156E2C: @ 8156E2C movs r0, 0 ldrsb r0, [r2, r0] cmp r1, r0 - ble _08156E68 + ble @08156E68 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -660910,20 +660910,20 @@ sub_8156E2C: @ 8156E2C lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08156E6C + b @08156E6C .align 2, 0 .pool -_08156E68: +@08156E68: adds r0, r2, 0x5 str r0, [r3] -_08156E6C: +@08156E6C: pop {r4} pop {r0} bx r0 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 @@ -660936,7 +660936,7 @@ sub_8156E74: @ 8156E74 movs r0, 0 ldrsb r0, [r2, r0] cmp r1, r0 - bne _08156EB0 + bne @08156EB0 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -660948,20 +660948,20 @@ sub_8156E74: @ 8156E74 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08156EB4 + b @08156EB4 .align 2, 0 .pool -_08156EB0: +@08156EB0: adds r0, r2, 0x5 str r0, [r3] -_08156EB4: +@08156EB4: pop {r4} pop {r0} bx r0 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 @@ -660974,7 +660974,7 @@ sub_8156EBC: @ 8156EBC movs r0, 0 ldrsb r0, [r2, r0] cmp r1, r0 - beq _08156EF8 + beq @08156EF8 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -660986,20 +660986,20 @@ sub_8156EBC: @ 8156EBC lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08156EFC + b @08156EFC .align 2, 0 .pool -_08156EF8: +@08156EF8: adds r0, r2, 0x5 str r0, [r3] -_08156EFC: +@08156EFC: pop {r4} pop {r0} bx r0 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] @@ -661029,7 +661029,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 @@ -661041,7 +661041,7 @@ sub_8156F44: @ 8156F44 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bne _08156F80 + bne @08156F80 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -661053,19 +661053,19 @@ sub_8156F44: @ 8156F44 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08156F84 + b @08156F84 .align 2, 0 .pool -_08156F80: +@08156F80: adds r0, r2, 0x5 str r0, [r3] -_08156F84: +@08156F84: pop {r0} bx r0 thumb_func_end sub_8156F44 thumb_func_start sub_8156F88 -sub_8156F88: @ 8156F88 +sub_8156F88: ; 8156F88 push {lr} bl sub_8156F04 ldr r0, =0x02039f34 @@ -661077,7 +661077,7 @@ sub_8156F88: @ 8156F88 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - beq _08156FC4 + beq @08156FC4 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -661089,19 +661089,19 @@ sub_8156F88: @ 8156F88 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08156FC8 + b @08156FC8 .align 2, 0 .pool -_08156FC4: +@08156FC4: adds r0, r2, 0x5 str r0, [r3] -_08156FC8: +@08156FC8: pop {r0} bx r0 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] @@ -661135,7 +661135,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 @@ -661147,7 +661147,7 @@ sub_8157018: @ 8157018 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bne _08157054 + bne @08157054 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -661159,19 +661159,19 @@ sub_8157018: @ 8157018 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157058 + b @08157058 .align 2, 0 .pool -_08157054: +@08157054: adds r0, r2, 0x5 str r0, [r3] -_08157058: +@08157058: pop {r0} bx r0 thumb_func_end sub_8157018 thumb_func_start sub_815705C -sub_815705C: @ 815705C +sub_815705C: ; 815705C push {lr} bl sub_8156FCC ldr r0, =0x02039f34 @@ -661183,7 +661183,7 @@ sub_815705C: @ 815705C ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - beq _08157098 + beq @08157098 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -661195,19 +661195,19 @@ sub_815705C: @ 815705C lsls r0, 24 orrs r1, r0 str r1, [r3] - b _0815709C + b @0815709C .align 2, 0 .pool -_08157098: +@08157098: adds r0, r2, 0x5 str r0, [r3] -_0815709C: +@0815709C: pop {r0} bx r0 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 @@ -661234,10 +661234,10 @@ sub_81570A0: @ 81570A0 ldr r0, =0x0203ab38 mov r12, r0 adds r1, r2 -_081570D4: +@081570D4: ldrh r0, [r1] cmp r0, 0 - beq _081570EA + beq @081570EA lsls r0, 3 adds r0, r4 ldrb r0, [r0] @@ -661245,26 +661245,26 @@ _081570D4: adds r0, r3 ldrb r0, [r0, 0x1] cmp r7, r0 - bcc _081570F2 -_081570EA: + bcc @081570F2 +@081570EA: adds r1, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble _081570D4 -_081570F2: + ble @081570D4 +@081570F2: cmp r6, 0x4 - bne _08157114 + bne @08157114 ldr r0, [r5] ldr r1, [r0, 0xC] movs r0, 0x1 - b _0815711A + b @0815711A .align 2, 0 .pool -_08157114: +@08157114: ldr r0, [r5] ldr r1, [r0, 0xC] movs r0, 0 -_0815711A: +@0815711A: strh r0, [r1, 0x18] mov r1, r12 ldr r0, [r1] @@ -661276,7 +661276,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 @@ -661285,7 +661285,7 @@ sub_815712C: @ 815712C movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - beq _08157164 + beq @08157164 ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] @@ -661299,15 +661299,15 @@ sub_815712C: @ 815712C lsls r0, 24 orrs r1, r0 str r1, [r3] - b _0815716C + b @0815716C .align 2, 0 .pool -_08157164: +@08157164: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -_0815716C: +@0815716C: pop {r0} bx r0 .align 2, 0 @@ -661315,7 +661315,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 @@ -661342,10 +661342,10 @@ sub_8157174: @ 8157174 ldr r0, =0x0203ab38 mov r12, r0 adds r1, r2 -_081571A8: +@081571A8: ldrh r0, [r1] cmp r0, 0 - beq _081571BE + beq @081571BE lsls r0, 3 adds r0, r4 ldrb r0, [r0] @@ -661353,26 +661353,26 @@ _081571A8: adds r0, r3 ldrb r0, [r0, 0x2] cmp r7, r0 - bcc _081571C6 -_081571BE: + bcc @081571C6 +@081571BE: adds r1, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble _081571A8 -_081571C6: + ble @081571A8 +@081571C6: cmp r6, 0x4 - bne _081571E8 + bne @081571E8 ldr r0, [r5] ldr r1, [r0, 0xC] movs r0, 0x1 - b _081571EE + b @081571EE .align 2, 0 .pool -_081571E8: +@081571E8: ldr r0, [r5] ldr r1, [r0, 0xC] movs r0, 0 -_081571EE: +@081571EE: strh r0, [r1, 0x18] mov r1, r12 ldr r0, [r1] @@ -661384,7 +661384,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 @@ -661393,7 +661393,7 @@ sub_8157200: @ 8157200 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - beq _08157238 + beq @08157238 ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -661407,15 +661407,15 @@ sub_8157200: @ 8157200 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157240 + b @08157240 .align 2, 0 .pool -_08157238: +@08157238: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -_08157240: +@08157240: pop {r0} bx r0 .align 2, 0 @@ -661423,7 +661423,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 @@ -661464,7 +661464,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 @@ -661476,7 +661476,7 @@ sub_81572A4: @ 81572A4 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bge _081572E0 + bge @081572E0 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -661488,19 +661488,19 @@ sub_81572A4: @ 81572A4 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081572E4 + b @081572E4 .align 2, 0 .pool -_081572E0: +@081572E0: adds r0, r2, 0x5 str r0, [r3] -_081572E4: +@081572E4: pop {r0} bx r0 thumb_func_end sub_81572A4 thumb_func_start sub_81572E8 -sub_81572E8: @ 81572E8 +sub_81572E8: ; 81572E8 push {lr} bl sub_8157248 ldr r0, =0x02039f34 @@ -661512,7 +661512,7 @@ sub_81572E8: @ 81572E8 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - ble _08157324 + ble @08157324 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -661524,19 +661524,19 @@ sub_81572E8: @ 81572E8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157328 + b @08157328 .align 2, 0 .pool -_08157324: +@08157324: adds r0, r2, 0x5 str r0, [r3] -_08157328: +@08157328: pop {r0} bx r0 thumb_func_end sub_81572E8 thumb_func_start sub_815732C -sub_815732C: @ 815732C +sub_815732C: ; 815732C push {lr} bl sub_8157248 ldr r0, =0x02039f34 @@ -661548,7 +661548,7 @@ sub_815732C: @ 815732C ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bne _08157368 + bne @08157368 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -661560,19 +661560,19 @@ sub_815732C: @ 815732C lsls r0, 24 orrs r1, r0 str r1, [r3] - b _0815736C + b @0815736C .align 2, 0 .pool -_08157368: +@08157368: adds r0, r2, 0x5 str r0, [r3] -_0815736C: +@0815736C: pop {r0} bx r0 thumb_func_end sub_815732C thumb_func_start sub_8157370 -sub_8157370: @ 8157370 +sub_8157370: ; 8157370 push {lr} bl sub_8157248 ldr r0, =0x02039f34 @@ -661584,7 +661584,7 @@ sub_8157370: @ 8157370 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - beq _081573AC + beq @081573AC ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -661596,19 +661596,19 @@ sub_8157370: @ 8157370 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081573B0 + b @081573B0 .align 2, 0 .pool -_081573AC: +@081573AC: adds r0, r2, 0x5 str r0, [r3] -_081573B0: +@081573B0: pop {r0} bx r0 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 @@ -661649,7 +661649,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 @@ -661661,7 +661661,7 @@ sub_8157410: @ 8157410 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bge _0815744C + bge @0815744C ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -661673,19 +661673,19 @@ sub_8157410: @ 8157410 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157450 + b @08157450 .align 2, 0 .pool -_0815744C: +@0815744C: adds r0, r2, 0x5 str r0, [r3] -_08157450: +@08157450: pop {r0} bx r0 thumb_func_end sub_8157410 thumb_func_start sub_8157454 -sub_8157454: @ 8157454 +sub_8157454: ; 8157454 push {lr} bl sub_81573B4 ldr r0, =0x02039f34 @@ -661697,7 +661697,7 @@ sub_8157454: @ 8157454 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - ble _08157490 + ble @08157490 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -661709,19 +661709,19 @@ sub_8157454: @ 8157454 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157494 + b @08157494 .align 2, 0 .pool -_08157490: +@08157490: adds r0, r2, 0x5 str r0, [r3] -_08157494: +@08157494: pop {r0} bx r0 thumb_func_end sub_8157454 thumb_func_start sub_8157498 -sub_8157498: @ 8157498 +sub_8157498: ; 8157498 push {lr} bl sub_81573B4 ldr r0, =0x02039f34 @@ -661733,7 +661733,7 @@ sub_8157498: @ 8157498 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bne _081574D4 + bne @081574D4 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -661745,19 +661745,19 @@ sub_8157498: @ 8157498 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081574D8 + b @081574D8 .align 2, 0 .pool -_081574D4: +@081574D4: adds r0, r2, 0x5 str r0, [r3] -_081574D8: +@081574D8: pop {r0} bx r0 thumb_func_end sub_8157498 thumb_func_start sub_81574DC -sub_81574DC: @ 81574DC +sub_81574DC: ; 81574DC push {lr} bl sub_81573B4 ldr r0, =0x02039f34 @@ -661769,7 +661769,7 @@ sub_81574DC: @ 81574DC ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - beq _08157518 + beq @08157518 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -661781,19 +661781,19 @@ sub_81574DC: @ 81574DC lsls r0, 24 orrs r1, r0 str r1, [r3] - b _0815751C + b @0815751C .align 2, 0 .pool -_08157518: +@08157518: adds r0, r2, 0x5 str r0, [r3] -_0815751C: +@0815751C: pop {r0} bx r0 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 @@ -661815,17 +661815,17 @@ sub_8157520: @ 8157520 adds r0, r1 ldrh r1, [r0, 0x8] cmp r3, r1 - beq _08157558 + beq @08157558 movs r1, 0 - b _08157560 + b @08157560 .align 2, 0 .pool -_08157558: +@08157558: ldrb r0, [r0, 0xB] lsls r0, 25 lsrs r0, 29 adds r1, r0, 0x1 -_08157560: +@08157560: ldr r0, [r5] ldr r0, [r0, 0xC] strh r1, [r0, 0x18] @@ -661841,7 +661841,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 @@ -661853,7 +661853,7 @@ sub_8157578: @ 8157578 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bge _081575B4 + bge @081575B4 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -661865,19 +661865,19 @@ sub_8157578: @ 8157578 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081575B8 + b @081575B8 .align 2, 0 .pool -_081575B4: +@081575B4: adds r0, r2, 0x5 str r0, [r3] -_081575B8: +@081575B8: pop {r0} bx r0 thumb_func_end sub_8157578 thumb_func_start sub_81575BC -sub_81575BC: @ 81575BC +sub_81575BC: ; 81575BC push {lr} bl sub_8157520 ldr r0, =0x02039f34 @@ -661889,7 +661889,7 @@ sub_81575BC: @ 81575BC ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - ble _081575F8 + ble @081575F8 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -661901,19 +661901,19 @@ sub_81575BC: @ 81575BC lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081575FC + b @081575FC .align 2, 0 .pool -_081575F8: +@081575F8: adds r0, r2, 0x5 str r0, [r3] -_081575FC: +@081575FC: pop {r0} bx r0 thumb_func_end sub_81575BC thumb_func_start sub_8157600 -sub_8157600: @ 8157600 +sub_8157600: ; 8157600 push {lr} bl sub_8157520 ldr r0, =0x02039f34 @@ -661925,7 +661925,7 @@ sub_8157600: @ 8157600 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bne _0815763C + bne @0815763C ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -661937,19 +661937,19 @@ sub_8157600: @ 8157600 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157640 + b @08157640 .align 2, 0 .pool -_0815763C: +@0815763C: adds r0, r2, 0x5 str r0, [r3] -_08157640: +@08157640: pop {r0} bx r0 thumb_func_end sub_8157600 thumb_func_start sub_8157644 -sub_8157644: @ 8157644 +sub_8157644: ; 8157644 push {lr} bl sub_8157520 ldr r0, =0x02039f34 @@ -661961,7 +661961,7 @@ sub_8157644: @ 8157644 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - beq _08157680 + beq @08157680 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -661973,19 +661973,19 @@ sub_8157644: @ 8157644 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157684 + b @08157684 .align 2, 0 .pool -_08157680: +@08157680: adds r0, r2, 0x5 str r0, [r3] -_08157684: +@08157684: pop {r0} bx r0 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 @@ -662003,7 +662003,7 @@ sub_8157688: @ 8157688 ldrh r5, [r1] movs r4, 0 adds r6, r2, 0 -_081576AA: +@081576AA: lsls r1, r4, 1 ldr r0, =0x02039f34 ldr r0, [r0] @@ -662015,23 +662015,23 @@ _081576AA: adds r1, r6 ldrh r0, [r1] cmp r0, 0 - beq _081576D2 + beq @081576D2 adds r1, r0, 0 adds r0, r5, 0 bl sub_80E5414 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - bne _081576DC -_081576D2: + bne @081576DC +@081576D2: adds r4, 0x1 cmp r4, 0x3 - ble _081576AA + ble @081576AA cmp r3, 0 - beq _081576DE -_081576DC: + beq @081576DE +@081576DC: movs r3, 0x1 -_081576DE: +@081576DE: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] @@ -662048,7 +662048,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 @@ -662057,7 +662057,7 @@ sub_8157700: @ 8157700 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - beq _08157738 + beq @08157738 ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] @@ -662071,15 +662071,15 @@ sub_8157700: @ 8157700 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157740 + b @08157740 .align 2, 0 .pool -_08157738: +@08157738: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -_08157740: +@08157740: pop {r0} bx r0 .align 2, 0 @@ -662087,7 +662087,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 @@ -662096,7 +662096,7 @@ sub_8157748: @ 8157748 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08157780 + bne @08157780 ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] @@ -662110,15 +662110,15 @@ sub_8157748: @ 8157748 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157788 + b @08157788 .align 2, 0 .pool -_08157780: +@08157780: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -_08157788: +@08157788: pop {r0} bx r0 .align 2, 0 @@ -662126,7 +662126,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 @@ -662144,7 +662144,7 @@ sub_8157790: @ 8157790 ldrh r5, [r1] movs r4, 0 adds r6, r2, 0 -_081577B2: +@081577B2: lsls r1, r4, 1 ldr r0, =0x02039f34 ldr r0, [r0] @@ -662156,22 +662156,22 @@ _081577B2: adds r1, r6 ldrh r0, [r1] cmp r0, 0 - beq _081577D8 + beq @081577D8 adds r1, r5, 0 bl sub_80E5414 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - bne _081577E2 -_081577D8: + bne @081577E2 +@081577D8: adds r4, 0x1 cmp r4, 0x3 - ble _081577B2 + ble @081577B2 cmp r3, 0 - beq _081577E4 -_081577E2: + beq @081577E4 +@081577E2: movs r3, 0x1 -_081577E4: +@081577E4: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] @@ -662188,7 +662188,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 @@ -662197,7 +662197,7 @@ sub_8157808: @ 8157808 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - beq _08157840 + beq @08157840 ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] @@ -662211,15 +662211,15 @@ sub_8157808: @ 8157808 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157848 + b @08157848 .align 2, 0 .pool -_08157840: +@08157840: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -_08157848: +@08157848: pop {r0} bx r0 .align 2, 0 @@ -662227,7 +662227,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 @@ -662236,7 +662236,7 @@ sub_8157850: @ 8157850 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08157888 + bne @08157888 ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] @@ -662250,15 +662250,15 @@ sub_8157850: @ 8157850 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157890 + b @08157890 .align 2, 0 .pool -_08157888: +@08157888: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -_08157890: +@08157890: pop {r0} bx r0 .align 2, 0 @@ -662266,7 +662266,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 @@ -662289,16 +662289,16 @@ sub_8157898: @ 8157898 adds r1, r0, r1 ldrh r0, [r1, 0x8] cmp r0, 0 - beq _081578D0 + beq @081578D0 adds r1, r3, 0 bl sub_80E5414 lsls r0, 24 lsrs r5, r0, 24 -_081578D0: +@081578D0: cmp r5, 0 - beq _081578D6 + beq @081578D6 movs r5, 0x1 -_081578D6: +@081578D6: ldr r0, [r6] ldr r0, [r0, 0xC] strh r5, [r0, 0x18] @@ -662314,7 +662314,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 @@ -662323,7 +662323,7 @@ sub_81578F8: @ 81578F8 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - beq _08157930 + beq @08157930 ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] @@ -662337,15 +662337,15 @@ sub_81578F8: @ 81578F8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157938 + b @08157938 .align 2, 0 .pool -_08157930: +@08157930: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -_08157938: +@08157938: pop {r0} bx r0 .align 2, 0 @@ -662353,7 +662353,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 @@ -662362,7 +662362,7 @@ sub_8157940: @ 8157940 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08157978 + bne @08157978 ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] @@ -662376,15 +662376,15 @@ sub_8157940: @ 8157940 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157980 + b @08157980 .align 2, 0 .pool -_08157978: +@08157978: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -_08157980: +@08157980: pop {r0} bx r0 .align 2, 0 @@ -662392,7 +662392,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] @@ -662426,7 +662426,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 @@ -662438,7 +662438,7 @@ sub_81579CC: @ 81579CC ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bge _08157A08 + bge @08157A08 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -662450,19 +662450,19 @@ sub_81579CC: @ 81579CC lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157A0C + b @08157A0C .align 2, 0 .pool -_08157A08: +@08157A08: adds r0, r2, 0x5 str r0, [r3] -_08157A0C: +@08157A0C: pop {r0} bx r0 thumb_func_end sub_81579CC thumb_func_start sub_8157A10 -sub_8157A10: @ 8157A10 +sub_8157A10: ; 8157A10 push {lr} bl sub_8157988 ldr r0, =0x02039f34 @@ -662474,7 +662474,7 @@ sub_8157A10: @ 8157A10 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - ble _08157A4C + ble @08157A4C ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -662486,19 +662486,19 @@ sub_8157A10: @ 8157A10 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157A50 + b @08157A50 .align 2, 0 .pool -_08157A4C: +@08157A4C: adds r0, r2, 0x5 str r0, [r3] -_08157A50: +@08157A50: pop {r0} bx r0 thumb_func_end sub_8157A10 thumb_func_start sub_8157A54 -sub_8157A54: @ 8157A54 +sub_8157A54: ; 8157A54 push {lr} bl sub_8157988 ldr r0, =0x02039f34 @@ -662510,7 +662510,7 @@ sub_8157A54: @ 8157A54 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bne _08157A90 + bne @08157A90 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -662522,19 +662522,19 @@ sub_8157A54: @ 8157A54 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157A94 + b @08157A94 .align 2, 0 .pool -_08157A90: +@08157A90: adds r0, r2, 0x5 str r0, [r3] -_08157A94: +@08157A94: pop {r0} bx r0 thumb_func_end sub_8157A54 thumb_func_start sub_8157A98 -sub_8157A98: @ 8157A98 +sub_8157A98: ; 8157A98 push {lr} bl sub_8157988 ldr r0, =0x02039f34 @@ -662546,7 +662546,7 @@ sub_8157A98: @ 8157A98 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - beq _08157AD4 + beq @08157AD4 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -662558,19 +662558,19 @@ sub_8157A98: @ 8157A98 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157AD8 + b @08157AD8 .align 2, 0 .pool -_08157AD4: +@08157AD4: adds r0, r2, 0x5 str r0, [r3] -_08157AD8: +@08157AD8: pop {r0} bx r0 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 @@ -662583,7 +662583,7 @@ sub_8157ADC: @ 8157ADC bl sub_80DE1E8 lsls r0, 24 cmp r0, 0 - beq _08157B18 + beq @08157B18 ldr r2, =0x0858c2b4 ldr r0, =0x02039f34 ldr r0, [r0] @@ -662599,7 +662599,7 @@ sub_8157ADC: @ 8157ADC negs r0, r1 orrs r0, r1 lsrs r6, r0, 31 -_08157B18: +@08157B18: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] @@ -662615,7 +662615,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 @@ -662627,7 +662627,7 @@ sub_8157B38: @ 8157B38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bge _08157B74 + bge @08157B74 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -662639,19 +662639,19 @@ sub_8157B38: @ 8157B38 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157B78 + b @08157B78 .align 2, 0 .pool -_08157B74: +@08157B74: adds r0, r2, 0x5 str r0, [r3] -_08157B78: +@08157B78: pop {r0} bx r0 thumb_func_end sub_8157B38 thumb_func_start sub_8157B7C -sub_8157B7C: @ 8157B7C +sub_8157B7C: ; 8157B7C push {lr} bl sub_8157ADC ldr r0, =0x02039f34 @@ -662663,7 +662663,7 @@ sub_8157B7C: @ 8157B7C ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - ble _08157BB8 + ble @08157BB8 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -662675,19 +662675,19 @@ sub_8157B7C: @ 8157B7C lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157BBC + b @08157BBC .align 2, 0 .pool -_08157BB8: +@08157BB8: adds r0, r2, 0x5 str r0, [r3] -_08157BBC: +@08157BBC: pop {r0} bx r0 thumb_func_end sub_8157B7C thumb_func_start sub_8157BC0 -sub_8157BC0: @ 8157BC0 +sub_8157BC0: ; 8157BC0 push {lr} bl sub_8157ADC ldr r0, =0x02039f34 @@ -662699,7 +662699,7 @@ sub_8157BC0: @ 8157BC0 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bne _08157BFC + bne @08157BFC ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -662711,19 +662711,19 @@ sub_8157BC0: @ 8157BC0 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157C00 + b @08157C00 .align 2, 0 .pool -_08157BFC: +@08157BFC: adds r0, r2, 0x5 str r0, [r3] -_08157C00: +@08157C00: pop {r0} bx r0 thumb_func_end sub_8157BC0 thumb_func_start sub_8157C04 -sub_8157C04: @ 8157C04 +sub_8157C04: ; 8157C04 push {lr} bl sub_8157ADC ldr r0, =0x02039f34 @@ -662735,7 +662735,7 @@ sub_8157C04: @ 8157C04 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - beq _08157C40 + beq @08157C40 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -662747,19 +662747,19 @@ sub_8157C04: @ 8157C04 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157C44 + b @08157C44 .align 2, 0 .pool -_08157C40: +@08157C40: adds r0, r2, 0x5 str r0, [r3] -_08157C44: +@08157C44: pop {r0} bx r0 thumb_func_end sub_8157C04 thumb_func_start sub_8157C48 -sub_8157C48: @ 8157C48 +sub_8157C48: ; 8157C48 push {lr} ldr r0, =0x0203ab38 ldr r0, [r0] @@ -662770,20 +662770,20 @@ sub_8157C48: @ 8157C48 bl sub_80DBCA8 lsls r0, 24 cmp r0, 0 - beq _08157C74 + beq @08157C74 ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0xC] movs r0, 0 - b _08157C7C + b @08157C7C .align 2, 0 .pool -_08157C74: +@08157C74: ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0xC] movs r0, 0x1 -_08157C7C: +@08157C7C: strh r0, [r1, 0x18] ldr r1, =0x0203ab38 ldr r0, [r1] @@ -662796,7 +662796,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 @@ -662805,7 +662805,7 @@ sub_8157C94: @ 8157C94 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - beq _08157CCC + beq @08157CCC ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] @@ -662819,15 +662819,15 @@ sub_8157C94: @ 8157C94 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157CD4 + b @08157CD4 .align 2, 0 .pool -_08157CCC: +@08157CCC: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -_08157CD4: +@08157CD4: pop {r0} bx r0 .align 2, 0 @@ -662835,7 +662835,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 @@ -662844,7 +662844,7 @@ sub_8157CDC: @ 8157CDC movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08157D14 + bne @08157D14 ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] @@ -662858,15 +662858,15 @@ sub_8157CDC: @ 8157CDC lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157D1C + b @08157D1C .align 2, 0 .pool -_08157D14: +@08157D14: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -_08157D1C: +@08157D1C: pop {r0} bx r0 .align 2, 0 @@ -662874,7 +662874,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] @@ -662905,7 +662905,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 @@ -662914,7 +662914,7 @@ sub_8157D60: @ 8157D60 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - beq _08157D98 + beq @08157D98 ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] @@ -662928,15 +662928,15 @@ sub_8157D60: @ 8157D60 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157DA0 + b @08157DA0 .align 2, 0 .pool -_08157D98: +@08157D98: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -_08157DA0: +@08157DA0: pop {r0} bx r0 .align 2, 0 @@ -662944,7 +662944,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 @@ -662953,7 +662953,7 @@ sub_8157DA8: @ 8157DA8 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08157DE0 + bne @08157DE0 ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] @@ -662967,15 +662967,15 @@ sub_8157DA8: @ 8157DA8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157DE8 + b @08157DE8 .align 2, 0 .pool -_08157DE0: +@08157DE0: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -_08157DE8: +@08157DE8: pop {r0} bx r0 .align 2, 0 @@ -662983,7 +662983,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] @@ -663021,7 +663021,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 @@ -663030,7 +663030,7 @@ sub_8157E3C: @ 8157E3C movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - bge _08157E74 + bge @08157E74 ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] @@ -663044,15 +663044,15 @@ sub_8157E3C: @ 8157E3C lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157E7C + b @08157E7C .align 2, 0 .pool -_08157E74: +@08157E74: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -_08157E7C: +@08157E7C: pop {r0} bx r0 .align 2, 0 @@ -663060,7 +663060,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 @@ -663069,7 +663069,7 @@ sub_8157E84: @ 8157E84 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - ble _08157EBC + ble @08157EBC ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] @@ -663083,15 +663083,15 @@ sub_8157E84: @ 8157E84 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157EC4 + b @08157EC4 .align 2, 0 .pool -_08157EBC: +@08157EBC: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -_08157EC4: +@08157EC4: pop {r0} bx r0 .align 2, 0 @@ -663099,7 +663099,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 @@ -663108,7 +663108,7 @@ sub_8157ECC: @ 8157ECC movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08157F04 + bne @08157F04 ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] @@ -663122,15 +663122,15 @@ sub_8157ECC: @ 8157ECC lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157F0C + b @08157F0C .align 2, 0 .pool -_08157F04: +@08157F04: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -_08157F0C: +@08157F0C: pop {r0} bx r0 .align 2, 0 @@ -663138,7 +663138,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 @@ -663147,7 +663147,7 @@ sub_8157F14: @ 8157F14 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - beq _08157F4C + beq @08157F4C ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] @@ -663161,15 +663161,15 @@ sub_8157F14: @ 8157F14 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157F54 + b @08157F54 .align 2, 0 .pool -_08157F4C: +@08157F4C: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -_08157F54: +@08157F54: pop {r0} bx r0 .align 2, 0 @@ -663177,7 +663177,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] @@ -663210,7 +663210,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 @@ -663219,7 +663219,7 @@ sub_8157FA0: @ 8157FA0 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - bge _08157FD8 + bge @08157FD8 ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] @@ -663233,15 +663233,15 @@ sub_8157FA0: @ 8157FA0 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08157FE0 + b @08157FE0 .align 2, 0 .pool -_08157FD8: +@08157FD8: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -_08157FE0: +@08157FE0: pop {r0} bx r0 .align 2, 0 @@ -663249,7 +663249,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 @@ -663258,7 +663258,7 @@ sub_8157FE8: @ 8157FE8 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - ble _08158020 + ble @08158020 ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] @@ -663272,15 +663272,15 @@ sub_8157FE8: @ 8157FE8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08158028 + b @08158028 .align 2, 0 .pool -_08158020: +@08158020: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -_08158028: +@08158028: pop {r0} bx r0 .align 2, 0 @@ -663288,7 +663288,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 @@ -663297,7 +663297,7 @@ sub_8158030: @ 8158030 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08158068 + bne @08158068 ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] @@ -663311,15 +663311,15 @@ sub_8158030: @ 8158030 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08158070 + b @08158070 .align 2, 0 .pool -_08158068: +@08158068: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -_08158070: +@08158070: pop {r0} bx r0 .align 2, 0 @@ -663327,7 +663327,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 @@ -663336,7 +663336,7 @@ sub_8158078: @ 8158078 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - beq _081580B0 + beq @081580B0 ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] @@ -663350,15 +663350,15 @@ sub_8158078: @ 8158078 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081580B8 + b @081580B8 .align 2, 0 .pool -_081580B0: +@081580B0: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -_081580B8: +@081580B8: pop {r0} bx r0 .align 2, 0 @@ -663366,7 +663366,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] @@ -663400,7 +663400,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 @@ -663412,7 +663412,7 @@ sub_8158108: @ 8158108 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bge _08158144 + bge @08158144 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -663424,19 +663424,19 @@ sub_8158108: @ 8158108 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08158148 + b @08158148 .align 2, 0 .pool -_08158144: +@08158144: adds r0, r2, 0x5 str r0, [r3] -_08158148: +@08158148: pop {r0} bx r0 thumb_func_end sub_8158108 thumb_func_start sub_815814C -sub_815814C: @ 815814C +sub_815814C: ; 815814C push {lr} bl sub_81580C0 ldr r0, =0x02039f34 @@ -663448,7 +663448,7 @@ sub_815814C: @ 815814C ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - ble _08158188 + ble @08158188 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -663460,19 +663460,19 @@ sub_815814C: @ 815814C lsls r0, 24 orrs r1, r0 str r1, [r3] - b _0815818C + b @0815818C .align 2, 0 .pool -_08158188: +@08158188: adds r0, r2, 0x5 str r0, [r3] -_0815818C: +@0815818C: pop {r0} bx r0 thumb_func_end sub_815814C thumb_func_start sub_8158190 -sub_8158190: @ 8158190 +sub_8158190: ; 8158190 push {lr} bl sub_81580C0 ldr r0, =0x02039f34 @@ -663484,7 +663484,7 @@ sub_8158190: @ 8158190 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bne _081581CC + bne @081581CC ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -663496,19 +663496,19 @@ sub_8158190: @ 8158190 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081581D0 + b @081581D0 .align 2, 0 .pool -_081581CC: +@081581CC: adds r0, r2, 0x5 str r0, [r3] -_081581D0: +@081581D0: pop {r0} bx r0 thumb_func_end sub_8158190 thumb_func_start sub_81581D4 -sub_81581D4: @ 81581D4 +sub_81581D4: ; 81581D4 push {lr} bl sub_81580C0 ldr r0, =0x02039f34 @@ -663520,7 +663520,7 @@ sub_81581D4: @ 81581D4 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - beq _08158210 + beq @08158210 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -663532,19 +663532,19 @@ sub_81581D4: @ 81581D4 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08158214 + b @08158214 .align 2, 0 .pool -_08158210: +@08158210: adds r0, r2, 0x5 str r0, [r3] -_08158214: +@08158214: pop {r0} bx r0 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] @@ -663575,7 +663575,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 @@ -663587,7 +663587,7 @@ sub_8158254: @ 8158254 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bge _08158290 + bge @08158290 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -663599,19 +663599,19 @@ sub_8158254: @ 8158254 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08158294 + b @08158294 .align 2, 0 .pool -_08158290: +@08158290: adds r0, r2, 0x5 str r0, [r3] -_08158294: +@08158294: pop {r0} bx r0 thumb_func_end sub_8158254 thumb_func_start sub_8158298 -sub_8158298: @ 8158298 +sub_8158298: ; 8158298 push {lr} bl sub_8158218 ldr r0, =0x02039f34 @@ -663623,7 +663623,7 @@ sub_8158298: @ 8158298 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - ble _081582D4 + ble @081582D4 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -663635,19 +663635,19 @@ sub_8158298: @ 8158298 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081582D8 + b @081582D8 .align 2, 0 .pool -_081582D4: +@081582D4: adds r0, r2, 0x5 str r0, [r3] -_081582D8: +@081582D8: pop {r0} bx r0 thumb_func_end sub_8158298 thumb_func_start sub_81582DC -sub_81582DC: @ 81582DC +sub_81582DC: ; 81582DC push {lr} bl sub_8158218 ldr r0, =0x02039f34 @@ -663659,7 +663659,7 @@ sub_81582DC: @ 81582DC ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bne _08158318 + bne @08158318 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -663671,19 +663671,19 @@ sub_81582DC: @ 81582DC lsls r0, 24 orrs r1, r0 str r1, [r3] - b _0815831C + b @0815831C .align 2, 0 .pool -_08158318: +@08158318: adds r0, r2, 0x5 str r0, [r3] -_0815831C: +@0815831C: pop {r0} bx r0 thumb_func_end sub_81582DC thumb_func_start sub_8158320 -sub_8158320: @ 8158320 +sub_8158320: ; 8158320 push {lr} bl sub_8158218 ldr r0, =0x02039f34 @@ -663695,7 +663695,7 @@ sub_8158320: @ 8158320 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - beq _0815835C + beq @0815835C ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -663707,19 +663707,19 @@ sub_8158320: @ 8158320 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08158360 + b @08158360 .align 2, 0 .pool -_0815835C: +@0815835C: adds r0, r2, 0x5 str r0, [r3] -_08158360: +@08158360: pop {r0} bx r0 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] @@ -663757,7 +663757,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 @@ -663769,7 +663769,7 @@ sub_81583B8: @ 81583B8 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - bne _081583F4 + bne @081583F4 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -663781,19 +663781,19 @@ sub_81583B8: @ 81583B8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081583F8 + b @081583F8 .align 2, 0 .pool -_081583F4: +@081583F4: adds r0, r2, 0x5 str r0, [r3] -_081583F8: +@081583F8: pop {r0} bx r0 thumb_func_end sub_81583B8 thumb_func_start sub_81583FC -sub_81583FC: @ 81583FC +sub_81583FC: ; 81583FC push {lr} bl sub_8158364 ldr r0, =0x02039f34 @@ -663805,7 +663805,7 @@ sub_81583FC: @ 81583FC ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 - beq _08158438 + beq @08158438 ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 @@ -663817,19 +663817,19 @@ sub_81583FC: @ 81583FC lsls r0, 24 orrs r1, r0 str r1, [r3] - b _0815843C + b @0815843C .align 2, 0 .pool -_08158438: +@08158438: adds r0, r2, 0x5 str r0, [r3] -_0815843C: +@0815843C: pop {r0} bx r0 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] @@ -663853,7 +663853,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] @@ -663879,7 +663879,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] @@ -663908,7 +663908,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] @@ -663936,7 +663936,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] @@ -663964,7 +663964,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] @@ -663982,7 +663982,7 @@ sub_815853C: @ 815853C lsls r0, 8 orrs r1, r0 cmp r2, r1 - bge _08158580 + bge @08158580 ldrb r1, [r3, 0x4] ldrb r0, [r3, 0x5] lsls r0, 8 @@ -663994,21 +663994,21 @@ sub_815853C: @ 815853C lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08158586 + b @08158586 .align 2, 0 .pool -_08158580: +@08158580: adds r0, r3, 0 adds r0, 0x8 str r0, [r4] -_08158586: +@08158586: pop {r4} pop {r0} bx r0 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] @@ -664026,7 +664026,7 @@ sub_815858C: @ 815858C lsls r0, 8 orrs r1, r0 cmp r2, r1 - ble _081585D0 + ble @081585D0 ldrb r1, [r3, 0x4] ldrb r0, [r3, 0x5] lsls r0, 8 @@ -664038,21 +664038,21 @@ sub_815858C: @ 815858C lsls r0, 24 orrs r1, r0 str r1, [r4] - b _081585D6 + b @081585D6 .align 2, 0 .pool -_081585D0: +@081585D0: adds r0, r3, 0 adds r0, 0x8 str r0, [r4] -_081585D6: +@081585D6: pop {r4} pop {r0} bx r0 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] @@ -664070,7 +664070,7 @@ sub_81585DC: @ 81585DC lsls r0, 8 orrs r1, r0 cmp r2, r1 - bne _08158620 + bne @08158620 ldrb r1, [r3, 0x4] ldrb r0, [r3, 0x5] lsls r0, 8 @@ -664082,21 +664082,21 @@ sub_81585DC: @ 81585DC lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08158626 + b @08158626 .align 2, 0 .pool -_08158620: +@08158620: adds r0, r3, 0 adds r0, 0x8 str r0, [r4] -_08158626: +@08158626: pop {r4} pop {r0} bx r0 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] @@ -664114,7 +664114,7 @@ sub_815862C: @ 815862C lsls r0, 8 orrs r1, r0 cmp r2, r1 - beq _08158670 + beq @08158670 ldrb r1, [r3, 0x4] ldrb r0, [r3, 0x5] lsls r0, 8 @@ -664126,21 +664126,21 @@ sub_815862C: @ 815862C lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08158676 + b @08158676 .align 2, 0 .pool -_08158670: +@08158670: adds r0, r3, 0 adds r0, 0x8 str r0, [r4] -_08158676: +@08158676: pop {r4} pop {r0} bx r0 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] @@ -664159,7 +664159,7 @@ sub_815867C: @ 815867C movs r5, 0 ldrsh r0, [r2, r5] cmp r1, r0 - bge _081586C4 + bge @081586C4 ldrb r1, [r3, 0x3] ldrb r0, [r3, 0x4] lsls r0, 8 @@ -664171,20 +664171,20 @@ sub_815867C: @ 815867C lsls r0, 24 orrs r1, r0 str r1, [r4] - b _081586C8 + b @081586C8 .align 2, 0 .pool -_081586C4: +@081586C4: adds r0, r3, 0x7 str r0, [r4] -_081586C8: +@081586C8: pop {r4,r5} pop {r0} bx r0 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] @@ -664203,7 +664203,7 @@ sub_81586D0: @ 81586D0 movs r5, 0 ldrsh r0, [r2, r5] cmp r1, r0 - ble _08158718 + ble @08158718 ldrb r1, [r3, 0x3] ldrb r0, [r3, 0x4] lsls r0, 8 @@ -664215,20 +664215,20 @@ sub_81586D0: @ 81586D0 lsls r0, 24 orrs r1, r0 str r1, [r4] - b _0815871C + b @0815871C .align 2, 0 .pool -_08158718: +@08158718: adds r0, r3, 0x7 str r0, [r4] -_0815871C: +@0815871C: pop {r4,r5} pop {r0} bx r0 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] @@ -664247,7 +664247,7 @@ sub_8158724: @ 8158724 movs r5, 0 ldrsh r0, [r2, r5] cmp r1, r0 - bne _0815876C + bne @0815876C ldrb r1, [r3, 0x3] ldrb r0, [r3, 0x4] lsls r0, 8 @@ -664259,20 +664259,20 @@ sub_8158724: @ 8158724 lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08158770 + b @08158770 .align 2, 0 .pool -_0815876C: +@0815876C: adds r0, r3, 0x7 str r0, [r4] -_08158770: +@08158770: pop {r4,r5} pop {r0} bx r0 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] @@ -664291,7 +664291,7 @@ sub_8158778: @ 8158778 movs r5, 0 ldrsh r0, [r2, r5] cmp r1, r0 - beq _081587C0 + beq @081587C0 ldrb r1, [r3, 0x3] ldrb r0, [r3, 0x4] lsls r0, 8 @@ -664303,20 +664303,20 @@ sub_8158778: @ 8158778 lsls r0, 24 orrs r1, r0 str r1, [r4] - b _081587C4 + b @081587C4 .align 2, 0 .pool -_081587C0: +@081587C0: adds r0, r3, 0x7 str r0, [r4] -_081587C4: +@081587C4: pop {r4,r5} pop {r0} bx r0 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 @@ -664333,7 +664333,7 @@ sub_81587CC: @ 81587CC movs r5, 0 ldrsh r0, [r1, r5] cmp r2, r0 - bge _08158810 + bge @08158810 ldrb r1, [r3, 0x2] ldrb r0, [r3, 0x3] lsls r0, 8 @@ -664345,20 +664345,20 @@ sub_81587CC: @ 81587CC lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08158814 + b @08158814 .align 2, 0 .pool -_08158810: +@08158810: adds r0, r3, 0x6 str r0, [r4] -_08158814: +@08158814: pop {r4,r5} pop {r0} bx r0 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 @@ -664375,7 +664375,7 @@ sub_815881C: @ 815881C movs r5, 0 ldrsh r0, [r1, r5] cmp r2, r0 - ble _08158860 + ble @08158860 ldrb r1, [r3, 0x2] ldrb r0, [r3, 0x3] lsls r0, 8 @@ -664387,20 +664387,20 @@ sub_815881C: @ 815881C lsls r0, 24 orrs r1, r0 str r1, [r4] - b _08158864 + b @08158864 .align 2, 0 .pool -_08158860: +@08158860: adds r0, r3, 0x6 str r0, [r4] -_08158864: +@08158864: pop {r4,r5} pop {r0} bx r0 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] @@ -664420,7 +664420,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] @@ -664446,12 +664446,12 @@ 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 cmp r0, 0 - bne _081588D6 + bne @081588D6 ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0xC] @@ -664459,7 +664459,7 @@ sub_81588BC: @ 81588BC movs r0, 0x1 orrs r0, r1 strb r0, [r2, 0x9] -_081588D6: +@081588D6: pop {r0} bx r0 .align 2, 0 @@ -664467,7 +664467,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] @@ -664490,7 +664490,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] @@ -664499,12 +664499,12 @@ sub_8158908: @ 8158908 adds r1, 0x40 ldrb r0, [r1] cmp r0, 0 - bne _08158924 + bne @08158924 movs r0, 0 - b _08158940 + b @08158940 .align 2, 0 .pool -_08158924: +@08158924: subs r0, 0x1 strb r0, [r1] ldr r2, =0x0203ab38 @@ -664519,7 +664519,7 @@ _08158924: ldr r0, [r1] str r0, [r2] movs r0, 0x1 -_08158940: +@08158940: pop {r1} bx r1 .align 2, 0 @@ -664527,12 +664527,12 @@ _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 ldr r6, =0x02039e1e -_08158950: +@08158950: lsls r1, r4, 1 ldr r0, =0x02039f34 ldr r0, [r0] @@ -664544,21 +664544,21 @@ _08158950: adds r1, r6 ldrh r0, [r1] cmp r0, 0 - beq _08158980 + beq @08158980 bl sub_80DD9F0 lsls r0, 24 asrs r0, 24 cmp r0, 0x1 - bne _08158980 + bne @08158980 movs r5, 0x1 - b _08158986 + b @08158986 .align 2, 0 .pool -_08158980: +@08158980: adds r4, 0x1 cmp r4, 0x3 - ble _08158950 -_08158986: + ble @08158950 +@08158986: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] @@ -664575,7 +664575,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 @@ -664584,7 +664584,7 @@ sub_81589A4: @ 81589A4 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - beq _081589DC + beq @081589DC ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] @@ -664598,15 +664598,15 @@ sub_81589A4: @ 81589A4 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081589E4 + b @081589E4 .align 2, 0 .pool -_081589DC: +@081589DC: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -_081589E4: +@081589E4: pop {r0} bx r0 .align 2, 0 @@ -664614,7 +664614,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 @@ -664623,7 +664623,7 @@ sub_81589EC: @ 81589EC movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08158A24 + bne @08158A24 ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] @@ -664637,15 +664637,15 @@ sub_81589EC: @ 81589EC lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08158A2C + b @08158A2C .align 2, 0 .pool -_08158A24: +@08158A24: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -_08158A2C: +@08158A2C: pop {r0} bx r0 .align 2, 0 @@ -664653,7 +664653,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 @@ -664675,13 +664675,13 @@ sub_8158A34: @ 8158A34 adds r1, 0x1E adds r0, r1 ldrh r0, [r0] - b _08158A88 + b @08158A88 .align 2, 0 .pool -_08158A6C: +@08158A6C: adds r4, 0x1 cmp r4, 0x3 - bgt _08158A8E + bgt @08158A8E lsls r1, r4, 1 ldr r0, [r2] ldr r0, [r0, 0xC] @@ -664693,11 +664693,11 @@ _08158A6C: adds r0, 0x1E adds r1, r0 ldrh r0, [r1] -_08158A88: +@08158A88: cmp r0, r5 - bne _08158A6C + bne @08158A6C movs r6, 0x1 -_08158A8E: +@08158A8E: ldr r0, [r2] ldr r0, [r0, 0xC] strh r6, [r0, 0x18] @@ -664710,7 +664710,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 @@ -664719,7 +664719,7 @@ sub_8158AA0: @ 8158AA0 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - beq _08158AD8 + beq @08158AD8 ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] @@ -664733,15 +664733,15 @@ sub_8158AA0: @ 8158AA0 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08158AE0 + b @08158AE0 .align 2, 0 .pool -_08158AD8: +@08158AD8: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -_08158AE0: +@08158AE0: pop {r0} bx r0 .align 2, 0 @@ -664749,7 +664749,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 @@ -664758,7 +664758,7 @@ sub_8158AE8: @ 8158AE8 movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08158B20 + bne @08158B20 ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] @@ -664772,15 +664772,15 @@ sub_8158AE8: @ 8158AE8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _08158B28 + b @08158B28 .align 2, 0 .pool -_08158B20: +@08158B20: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -_08158B28: +@08158B28: pop {r0} bx r0 .align 2, 0 @@ -664788,7 +664788,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 @@ -664836,7 +664836,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 @@ -664854,29 +664854,29 @@ sub_8158B98: @ 8158B98 lsls r0, 16 asrs r0, 16 cmp r0, 0x6F - bne _08158BD0 + bne @08158BD0 movs r0, 0x5 strh r0, [r4, 0x1C] strh r1, [r4, 0x1E] ldr r0, =sub_8158C04 + 1 str r0, [r4] - b _08158BFE + b @08158BFE .align 2, 0 .pool -_08158BD0: +@08158BD0: ldrh r0, [r4, 0x1C] adds r0, 0x1 strh r0, [r4, 0x1C] lsls r0, 16 asrs r0, 16 cmp r0, 0xB - bne _08158BEA + bne @08158BEA strh r1, [r4, 0x1C] ldrh r0, [r4, 0x8] lsls r1, r5, 24 asrs r1, 24 bl audio_play_and_stuff -_08158BEA: +@08158BEA: lsls r1, r6, 24 asrs r1, 24 lsls r0, r5, 16 @@ -664886,14 +664886,14 @@ _08158BEA: asrs r0, 16 bl sub_80A52EC strh r0, [r4, 0xC] -_08158BFE: +@08158BFE: pop {r4-r6} pop {r0} bx r0 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 @@ -664908,7 +664908,7 @@ sub_8158C04: @ 8158C04 lsls r0, 16 asrs r0, 16 cmp r0, 0x6 - bne _08158C4C + bne @08158C4C movs r0, 0 strh r0, [r4, 0x1C] movs r0, 0x3F @@ -664924,10 +664924,10 @@ sub_8158C04: @ 8158C04 lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - bne _08158C4C + bne @08158C4C adds r0, r5, 0 bl move_anim_related_task_del -_08158C4C: +@08158C4C: pop {r4,r5} pop {r0} bx r0 @@ -664936,7 +664936,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 @@ -665019,7 +665019,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 @@ -665036,7 +665036,7 @@ sub_8158D08: @ 8158D08 movs r2, 0x14 ldrsh r1, [r4, r2] cmp r0, r1 - bne _08158D50 + bne @08158D50 movs r0, 0 strh r0, [r4, 0x20] ldrh r0, [r4, 0x8] @@ -665048,13 +665048,13 @@ sub_8158D08: @ 8158D08 strh r0, [r4, 0x10] lsls r0, 16 cmp r0, 0 - bne _08158D50 + bne @08158D50 adds r0, r5, 0 bl move_anim_related_task_del - b _08158D82 + b @08158D82 .align 2, 0 .pool -_08158D50: +@08158D50: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -665068,7 +665068,7 @@ _08158D50: movs r2, 0x12 ldrsh r1, [r4, r2] cmp r0, r1 - bne _08158D82 + bne @08158D82 movs r0, 0 strh r0, [r4, 0x1C] ldrh r0, [r4, 0xE] @@ -665079,7 +665079,7 @@ _08158D50: ldrsh r0, [r4, r2] bl sub_80A52EC strh r0, [r4, 0x1E] -_08158D82: +@08158D82: pop {r4,r5} pop {r0} bx r0 @@ -665088,7 +665088,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 @@ -665101,81 +665101,81 @@ sub_8158D8C: @ 8158D8C bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _08158DD0 + beq @08158DD0 ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08158DC8 + bne @08158DC8 ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r4, [r0] - b _08158E76 + b @08158E76 .align 2, 0 .pool -_08158DC8: +@08158DC8: adds r0, r5, 0 bl move_anim_task_del - b _08158E76 -_08158DD0: + b @08158E76 +@08158DD0: ldr r0, =0x0203841e movs r2, 0 ldrsh r1, [r0, r2] adds r2, r0, 0 cmp r1, 0 - bne _08158DEC + bne @08158DEC ldr r0, =0x02038436 ldrb r4, [r0] - b _08158E12 + b @08158E12 .align 2, 0 .pool -_08158DEC: +@08158DEC: cmp r1, 0x1 - bne _08158DFC + bne @08158DFC ldr r0, =0x02038437 ldrb r4, [r0] - b _08158E12 + b @08158E12 .align 2, 0 .pool -_08158DFC: +@08158DFC: cmp r1, 0x2 - bne _08158E08 + bne @08158E08 ldr r0, =0x02038436 - b _08158E0A + b @08158E0A .align 2, 0 .pool -_08158E08: +@08158E08: ldr r0, =0x02038437 -_08158E0A: +@08158E0A: ldrb r1, [r0] movs r0, 0x2 adds r4, r0, 0 eors r4, r1 -_08158E12: +@08158E12: movs r1, 0 ldrsh r0, [r2, r1] cmp r0, 0x1 - beq _08158E1E + beq @08158E1E cmp r0, 0x3 - bne _08158E38 -_08158E1E: + bne @08158E38 +@08158E1E: adds r0, r4, 0 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - bne _08158E38 + bne @08158E38 adds r0, r5, 0 bl move_anim_task_del - b _08158E8C + b @08158E8C .align 2, 0 .pool -_08158E38: +@08158E38: adds r0, r4, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08158E5C + beq @08158E5C ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -665183,10 +665183,10 @@ _08158E38: movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 - b _08158E6A + b @08158E6A .align 2, 0 .pool -_08158E5C: +@08158E5C: ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -665194,24 +665194,24 @@ _08158E5C: movs r0, 0x64 muls r0, r1 ldr r1, =0x020244ec -_08158E6A: +@08158E6A: adds r0, r1 movs r1, 0xB bl pokemon_getattr lsls r0, 16 lsrs r4, r0, 16 -_08158E76: +@08158E76: cmp r4, 0 - beq _08158E86 + beq @08158E86 lsls r1, r6, 24 asrs r1, 24 adds r0, r4, 0 movs r2, 0x3 bl sub_80A32E4 -_08158E86: +@08158E86: adds r0, r5, 0 bl move_anim_task_del -_08158E8C: +@08158E8C: pop {r4-r6} pop {r0} bx r0 @@ -665220,7 +665220,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 @@ -665233,81 +665233,81 @@ sub_8158E9C: @ 8158E9C bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _08158EE0 + beq @08158EE0 ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08158ED8 + bne @08158ED8 ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r4, [r0] - b _08158F86 + b @08158F86 .align 2, 0 .pool -_08158ED8: +@08158ED8: adds r0, r6, 0 bl move_anim_task_del - b _08158F86 -_08158EE0: + b @08158F86 +@08158EE0: ldr r0, =0x0203841e movs r2, 0 ldrsh r1, [r0, r2] adds r2, r0, 0 cmp r1, 0 - bne _08158EFC + bne @08158EFC ldr r0, =0x02038436 ldrb r4, [r0] - b _08158F22 + b @08158F22 .align 2, 0 .pool -_08158EFC: +@08158EFC: cmp r1, 0x1 - bne _08158F0C + bne @08158F0C ldr r0, =0x02038437 ldrb r4, [r0] - b _08158F22 + b @08158F22 .align 2, 0 .pool -_08158F0C: +@08158F0C: cmp r1, 0x2 - bne _08158F18 + bne @08158F18 ldr r0, =0x02038436 - b _08158F1A + b @08158F1A .align 2, 0 .pool -_08158F18: +@08158F18: ldr r0, =0x02038437 -_08158F1A: +@08158F1A: ldrb r1, [r0] movs r0, 0x2 adds r4, r0, 0 eors r4, r1 -_08158F22: +@08158F22: movs r1, 0 ldrsh r0, [r2, r1] cmp r0, 0x1 - beq _08158F2E + beq @08158F2E cmp r0, 0x3 - bne _08158F48 -_08158F2E: + bne @08158F48 +@08158F2E: adds r0, r4, 0 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - bne _08158F48 + bne @08158F48 adds r0, r6, 0 bl move_anim_task_del - b _08158FEE + b @08158FEE .align 2, 0 .pool -_08158F48: +@08158F48: adds r0, r4, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08158F6C + beq @08158F6C ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -665315,10 +665315,10 @@ _08158F48: movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 - b _08158F7A + b @08158F7A .align 2, 0 .pool -_08158F6C: +@08158F6C: ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -665326,13 +665326,13 @@ _08158F6C: movs r0, 0x64 muls r0, r1 ldr r1, =0x020244ec -_08158F7A: +@08158F7A: adds r0, r1 movs r1, 0xB bl pokemon_getattr lsls r0, 16 lsrs r4, r0, 16 -_08158F86: +@08158F86: ldr r1, =0x03005e00 lsls r2, r6, 2 adds r0, r2, r6 @@ -665347,42 +665347,42 @@ _08158F86: strh r1, [r0, 0xC] adds r5, r2, 0 cmp r4, 0 - beq _08158FE8 + beq @08158FE8 movs r2, 0x2 ldrsh r0, [r3, r2] cmp r0, 0xFF - bne _08158FC8 + bne @08158FC8 adds r0, r4, 0 movs r2, 0x9 bl sub_80A32E4 - b _08158FD0 + b @08158FD0 .align 2, 0 .pool -_08158FC8: +@08158FC8: adds r0, r4, 0 movs r2, 0x7 bl sub_80A32E4 -_08158FD0: +@08158FD0: ldr r0, =0x03005e00 adds r1, r5, r6 lsls r1, 3 adds r1, r0 ldr r0, =sub_8158FF4 + 1 str r0, [r1] - b _08158FEE + b @08158FEE .align 2, 0 .pool -_08158FE8: +@08158FE8: adds r0, r6, 0 bl move_anim_task_del -_08158FEE: +@08158FEE: pop {r4-r6} pop {r0} bx r0 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 @@ -665403,21 +665403,21 @@ sub_8158FF4: @ 8158FF4 movs r3, 0x1A ldrsh r0, [r1, r3] cmp r0, 0x1 - bgt _08159028 + bgt @08159028 adds r0, r2, 0x1 strh r0, [r1, 0x1A] - b _0815906A + b @0815906A .align 2, 0 .pool -_08159028: +@08159028: movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0xFF - bne _0815904E + bne @0815904E bl sub_80A36EC lsls r0, 24 cmp r0, 0 - bne _0815906A + bne @0815906A lsls r1, r5, 24 asrs r1, 24 adds r0, r6, 0 @@ -665425,12 +665425,12 @@ _08159028: bl sub_80A32E4 adds r0, r4, 0 bl move_anim_task_del - b _0815906A -_0815904E: + b @0815906A +@0815904E: bl sub_80A36EC lsls r0, 24 cmp r0, 0 - bne _0815906A + bne @0815906A lsls r1, r7, 24 asrs r1, 24 mov r0, r8 @@ -665438,7 +665438,7 @@ _0815904E: bl sub_80A32E4 mov r0, r9 bl move_anim_task_del -_0815906A: +@0815906A: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -665448,7 +665448,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 @@ -665462,27 +665462,27 @@ sub_8159078: @ 8159078 movs r3, 0x1A ldrsh r0, [r1, r3] cmp r0, 0x1 - bgt _081590A0 + bgt @081590A0 adds r0, r2, 0x1 strh r0, [r1, 0x1A] - b _081590B0 + b @081590B0 .align 2, 0 .pool -_081590A0: +@081590A0: bl sub_80A36EC lsls r0, 24 cmp r0, 0 - bne _081590B0 + bne @081590B0 adds r0, r4, 0 bl move_anim_task_del -_081590B0: +@081590B0: pop {r4} pop {r0} bx r0 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 @@ -665502,20 +665502,20 @@ sub_81590B8: @ 81590B8 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _081590F8 + beq @081590F8 ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] - b _08159102 + b @08159102 .align 2, 0 .pool -_081590F8: +@081590F8: ldr r1, =0x02038438 ldr r0, =0x02038436 ldrb r0, [r0] lsls r0, 1 adds r0, r1 -_08159102: +@08159102: ldrh r2, [r0] ldr r0, =0x03005e00 lsls r1, r4, 2 @@ -665527,23 +665527,23 @@ _08159102: asrs r0, 24 strh r0, [r1, 0xC] cmp r2, 0 - beq _08159130 + beq @08159130 ldr r0, =sub_815913C + 1 str r0, [r1] - b _08159136 + b @08159136 .align 2, 0 .pool -_08159130: +@08159130: adds r0, r4, 0 bl move_anim_task_del -_08159136: +@08159136: pop {r4,r5} pop {r0} bx r0 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} @@ -665562,23 +665562,23 @@ sub_815913C: @ 815913C ldrsh r2, [r0, r7] mov r12, r1 cmp r2, 0x5 - bhi _081591DC + bhi @081591DC lsls r0, r2, 2 - ldr r1, =_08159174 + ldr r1, =@08159174 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08159174: - .4byte _081591C2 - .4byte _081591A8 - .4byte _0815918C - .4byte _081591A8 - .4byte _081591A8 - .4byte _081591B8 -_0815918C: +@08159174: + .4byte @081591C2 + .4byte @081591A8 + .4byte @0815918C + .4byte @081591A8 + .4byte @081591A8 + .4byte @081591B8 +@0815918C: lsls r1, r5, 24 asrs r1, 24 mov r0, r8 @@ -665589,25 +665589,25 @@ _0815918C: adds r0, r4 lsls r0, 3 adds r0, r1 - b _081591B0 + b @081591B0 .align 2, 0 .pool -_081591A8: +@081591A8: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 add r0, r12 -_081591B0: +@081591B0: ldrh r1, [r0, 0x1A] adds r1, 0x1 strh r1, [r0, 0x1A] - b _08159204 -_081591B8: + b @08159204 +@081591B8: bl sub_80A36EC lsls r0, 24 cmp r0, 0 - bne _08159204 -_081591C2: + bne @08159204 +@081591C2: bl sub_80A369C ldr r0, =0x03005e00 lsls r1, r4, 2 @@ -665617,30 +665617,30 @@ _081591C2: ldrh r0, [r1, 0x1A] adds r0, 0x1 strh r0, [r1, 0x1A] - b _08159204 + b @08159204 .align 2, 0 .pool -_081591DC: +@081591DC: movs r1, 0x1C ldrsh r0, [r0, r1] cmp r0, 0 - bne _081591F2 + bne @081591F2 lsls r1, r3, 24 asrs r1, 24 adds r0, r6, 0 movs r2, 0x6 bl play_cry_maybe - b _081591FE -_081591F2: + b @081591FE +@081591F2: lsls r1, r5, 24 asrs r1, 24 mov r0, r8 movs r2, 0x6 bl sub_80A32E4 -_081591FE: +@081591FE: adds r0, r4, 0 bl move_anim_task_del -_08159204: +@08159204: pop {r3} mov r8, r3 pop {r4-r7} @@ -665649,7 +665649,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 @@ -665675,7 +665675,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 @@ -665701,7 +665701,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 @@ -665768,7 +665768,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 @@ -665787,7 +665787,7 @@ sub_8159308: @ 8159308 movs r3, 0x12 ldrsh r1, [r4, r3] cmp r0, r1 - bne _08159342 + bne @08159342 movs r0, 0 strh r0, [r4, 0x1C] ldrh r1, [r4, 0x1E] @@ -665797,7 +665797,7 @@ sub_8159308: @ 8159308 ldrsh r0, [r4, r2] bl sub_80A52EC strh r0, [r4, 0x1E] -_08159342: +@08159342: ldr r1, =0x02038440 ldrh r0, [r4, 0x1E] strb r0, [r1] @@ -665806,10 +665806,10 @@ _08159342: movs r2, 0xC ldrsh r0, [r4, r2] cmp r1, r0 - bne _0815935A + bne @0815935A adds r0, r5, 0 bl move_anim_task_del -_0815935A: +@0815935A: pop {r4,r5} pop {r0} bx r0 @@ -665818,12 +665818,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] @@ -665837,7 +665837,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, =0x0832a328 @@ -665849,31 +665849,31 @@ bx_exec_buffer_A_ch0_tbl6: @ 8159388 ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _081593D4 + beq @081593D4 ldr r0, =0x02023064 lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] cmp r0, 0x38 - bhi _081593D0 + bhi @081593D0 ldr r0, =0x085cdf20 ldrb r1, [r1] lsls r1, 2 adds r1, r0 ldr r0, [r1] bl _call_via_r0 - b _081593D4 + b @081593D4 .align 2, 0 .pool -_081593D0: +@081593D0: bl dp01_tbl6_exec_completed -_081593D4: +@081593D4: pop {r0} bx r0 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] @@ -665881,7 +665881,7 @@ bx_battle_menu_t6_2: @ 81593D8 adds r0, r2, 0 ands r0, r1 cmp r0, 0 - beq _08159446 + beq @08159446 movs r0, 0x5 bl audio_play ldr r1, =0x020244ac @@ -665890,48 +665890,48 @@ bx_battle_menu_t6_2: @ 81593D8 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - beq _08159424 + beq @08159424 cmp r0, 0x1 - bgt _08159414 + bgt @08159414 cmp r0, 0 - beq _0815941E - b _08159440 + beq @0815941E + b @08159440 .align 2, 0 .pool -_08159414: +@08159414: cmp r0, 0x2 - beq _0815942A + beq @0815942A cmp r0, 0x3 - beq _08159436 - b _08159440 -_0815941E: + beq @08159436 + b @08159440 +@0815941E: movs r0, 0x1 movs r1, 0x5 - b _0815942E -_08159424: + b @0815942E +@08159424: movs r0, 0x1 movs r1, 0x6 - b _0815942E -_0815942A: + b @0815942E +@0815942A: movs r0, 0x1 movs r1, 0x7 -_0815942E: +@0815942E: movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb - b _08159440 -_08159436: + b @08159440 +@08159436: movs r0, 0x1 movs r1, 0x8 movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb -_08159440: +@08159440: bl dp01_tbl6_exec_completed - b _0815954E -_08159446: + b @0815954E +@08159446: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _08159484 + beq @08159484 ldr r5, =0x020244ac ldr r4, =0x02024064 ldrb r0, [r4] @@ -665940,7 +665940,7 @@ _08159446: adds r0, r2, 0 ands r0, r1 cmp r0, 0 - beq _0815954E + beq @0815954E movs r0, 0x5 bl audio_play ldrb r0, [r4] @@ -665951,14 +665951,14 @@ _08159446: adds r1, r5 ldrb r0, [r1] movs r2, 0x1 - b _081594F2 + b @081594F2 .align 2, 0 .pool -_08159484: +@08159484: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _081594C0 + beq @081594C0 ldr r5, =0x020244ac ldr r4, =0x02024064 ldrb r0, [r4] @@ -665967,7 +665967,7 @@ _08159484: adds r0, r2, 0 ands r0, r1 cmp r0, 0 - bne _0815954E + bne @0815954E movs r0, 0x5 bl audio_play ldrb r0, [r4] @@ -665978,14 +665978,14 @@ _08159484: adds r1, r5 ldrb r0, [r1] movs r2, 0x1 - b _081594F2 + b @081594F2 .align 2, 0 .pool -_081594C0: +@081594C0: movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0815950C + beq @0815950C ldr r5, =0x020244ac ldr r4, =0x02024064 ldrb r0, [r4] @@ -665994,7 +665994,7 @@ _081594C0: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0815954E + beq @0815954E movs r0, 0x5 bl audio_play ldrb r0, [r4] @@ -666005,7 +666005,7 @@ _081594C0: adds r1, r5 ldrb r0, [r1] movs r2, 0x2 -_081594F2: +@081594F2: eors r0, r2 strb r0, [r1] ldrb r0, [r4] @@ -666013,14 +666013,14 @@ _081594F2: ldrb r0, [r0] movs r1, 0 bl sub_8059CB4 - b _0815954E + b @0815954E .align 2, 0 .pool -_0815950C: +@0815950C: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0815954E + beq @0815954E ldr r5, =0x020244ac ldr r4, =0x02024064 ldrb r0, [r4] @@ -666029,7 +666029,7 @@ _0815950C: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _0815954E + bne @0815954E movs r0, 0x5 bl audio_play ldrb r0, [r4] @@ -666047,7 +666047,7 @@ _0815950C: ldrb r0, [r0] movs r1, 0 bl sub_8059CB4 -_0815954E: +@0815954E: pop {r4,r5} pop {r0} bx r0 @@ -666056,7 +666056,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 @@ -666072,9 +666072,9 @@ sub_815955C: @ 815955C ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _08159580 + bne @08159580 bl dp01_tbl6_exec_completed -_08159580: +@08159580: pop {r0} bx r0 .align 2, 0 @@ -666082,21 +666082,21 @@ _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 a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _081595A6 + bne @081595A6 bl dp01_tbl6_exec_completed -_081595A6: +@081595A6: pop {r0} bx r0 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 @@ -666112,9 +666112,9 @@ sub_81595AC: @ 81595AC ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _081595D0 + bne @081595D0 bl dp01_tbl6_exec_completed -_081595D0: +@081595D0: pop {r0} bx r0 .align 2, 0 @@ -666122,14 +666122,14 @@ _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] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0815960E + bne @0815960E ldr r2, =0x030022c0 ldr r0, =0x00000439 adds r3, r2, r0 @@ -666143,7 +666143,7 @@ sub_81595E4: @ 81595E4 str r0, [r2] ldr r0, [r2, 0x8] bl set_callback2 -_0815960E: +@0815960E: pop {r0} bx r0 .align 2, 0 @@ -666151,12 +666151,12 @@ _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] cmp r0, 0 - beq _0815964A + beq @0815964A ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -666170,10 +666170,10 @@ bx_wait_t6: @ 8159624 movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _0815964E -_0815964A: + bne @0815964E +@0815964A: bl dp01_tbl6_exec_completed -_0815964E: +@0815964E: pop {r0} bx r0 .align 2, 0 @@ -666181,14 +666181,14 @@ _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] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08159684 + bne @08159684 ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -666198,7 +666198,7 @@ sub_8159660: @ 8159660 str r1, [r0] bl Window_FreeMemory bl sub_81358F4 -_08159684: +@08159684: pop {r0} bx r0 .align 2, 0 @@ -666206,25 +666206,25 @@ _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] ldr r0, =sub_8038420 + 1 cmp r1, r0 - bne _081596BE + bne @081596BE ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081596BE + bne @081596BE ldr r0, =0x0203ce7c ldrh r1, [r0] movs r0, 0x1 bl dp01_build_cmdbuf_x23_aa_0 bl dp01_tbl6_exec_completed -_081596BE: +@081596BE: pop {r0} bx r0 .align 2, 0 @@ -666232,7 +666232,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] @@ -666247,9 +666247,9 @@ sub_81596D4: @ 81596D4 movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _081596F6 + bne @081596F6 bl dp01_tbl6_exec_completed -_081596F6: +@081596F6: pop {r0} bx r0 .align 2, 0 @@ -666257,7 +666257,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 @@ -666272,7 +666272,7 @@ dp01_tbl6_exec_completed: @ 8159704 movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _08159758 + beq @08159758 bl link_get_multiplayer_id mov r1, sp strb r0, [r1] @@ -666286,10 +666286,10 @@ dp01_tbl6_exec_completed: @ 8159704 adds r0, r1 movs r1, 0x38 strb r1, [r0] - b _0815976A + b @0815976A .align 2, 0 .pool -_08159758: +@08159758: ldr r2, =0x02024068 ldr r1, =0x0832a328 ldrb r0, [r4] @@ -666299,7 +666299,7 @@ _08159758: ldr r0, [r2] bics r0, r1 str r0, [r2] -_0815976A: +@0815976A: add sp, 0x4 pop {r4} pop {r0} @@ -666309,7 +666309,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] @@ -666324,9 +666324,9 @@ bx_80364D0: @ 815977C movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _0815979E + bne @0815979E bl dp01_tbl6_exec_completed -_0815979E: +@0815979E: pop {r0} bx r0 .align 2, 0 @@ -666334,7 +666334,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} @@ -666342,7 +666342,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} @@ -666350,7 +666350,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} @@ -666358,7 +666358,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} @@ -666366,7 +666366,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} @@ -666374,7 +666374,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} @@ -666382,7 +666382,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} @@ -666390,7 +666390,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] @@ -666484,7 +666484,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} @@ -666492,7 +666492,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} @@ -666500,7 +666500,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} @@ -666508,7 +666508,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} @@ -666516,7 +666516,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] @@ -666551,7 +666551,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 @@ -666591,7 +666591,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} @@ -666599,7 +666599,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} @@ -666607,7 +666607,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 @@ -666638,33 +666638,33 @@ 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] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08159A4C + bne @08159A4C bl dp01t_10_6_message - b _08159A50 + b @08159A50 .align 2, 0 .pool -_08159A4C: +@08159A4C: bl dp01_tbl6_exec_completed -_08159A50: +@08159A50: pop {r0} bx r0 thumb_func_end dp01t_11_6_message_for_player_only thumb_func_start sub_8159A54 -sub_8159A54: @ 8159A54 +sub_8159A54: ; 8159A54 push {lr} bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _08159A7A + bne @08159A7A ldr r0, =0x02022e14 strh r1, [r0] ldr r1, =0x02022e16 @@ -666677,7 +666677,7 @@ sub_8159A54: @ 8159A54 adds r0, r1 ldr r1, =bx_battle_menu_t6_2 + 1 str r1, [r0] -_08159A7A: +@08159A7A: pop {r0} bx r0 .align 2, 0 @@ -666685,7 +666685,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 @@ -666698,13 +666698,13 @@ sub_8159A94: @ 8159A94 movs r1, 0x2 bl battle_show_message_maybe movs r4, 0 -_08159AAE: +@08159AAE: lsls r0, r4, 24 lsrs r0, 24 bl sub_8059CF8 adds r4, 0x1 cmp r4, 0x3 - ble _08159AAE + ble @08159AAE ldr r1, =0x020244ac ldr r0, =0x02024064 ldrb r0, [r0] @@ -666725,7 +666725,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} @@ -666733,7 +666733,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} @@ -666741,7 +666741,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 @@ -666769,7 +666769,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} @@ -666777,7 +666777,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} @@ -666785,7 +666785,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} @@ -666793,7 +666793,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} @@ -666801,7 +666801,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 @@ -666826,7 +666826,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} @@ -666834,7 +666834,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} @@ -666842,7 +666842,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} @@ -666850,7 +666850,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} @@ -666858,7 +666858,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} @@ -666866,7 +666866,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} @@ -666874,7 +666874,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} @@ -666882,7 +666882,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} @@ -666890,7 +666890,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} @@ -666898,7 +666898,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} @@ -666906,7 +666906,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} @@ -666914,7 +666914,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} @@ -666922,7 +666922,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} @@ -666930,7 +666930,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} @@ -666938,7 +666938,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} @@ -666946,7 +666946,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} @@ -666954,7 +666954,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] @@ -666962,9 +666962,9 @@ sub_8159C80: @ 8159C80 lsls r0, 24 movs r3, 0x3F cmp r0, 0 - bne _08159C94 + bne @08159C94 movs r3, 0xC0 -_08159C94: +@08159C94: ldr r2, =0x02023064 ldrb r1, [r4] lsls r1, 9 @@ -666988,7 +666988,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 @@ -666998,7 +666998,7 @@ dp01t_34_6_move_anim_start_t3: @ 8159CC4 adds r0, r3, r0 ldrb r0, [r0] cmp r0, 0 - beq _08159D00 + beq @08159D00 bl sub_805EA60 ldrb r1, [r5] lsls r1, 9 @@ -667011,10 +667011,10 @@ dp01t_34_6_move_anim_start_t3: @ 8159CC4 lsls r1, 8 orrs r0, r1 bl song_play_for_text - b _08159D14 + b @08159D14 .align 2, 0 .pool -_08159D00: +@08159D00: adds r0, r4, 0x1 adds r0, r3, r0 ldrb r0, [r0] @@ -667024,7 +667024,7 @@ _08159D00: lsls r1, 8 orrs r0, r1 bl fanfare_play -_08159D14: +@08159D14: bl dp01_tbl6_exec_completed pop {r4,r5} pop {r0} @@ -667032,7 +667032,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 @@ -667058,7 +667058,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 @@ -667081,7 +667081,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 @@ -667118,7 +667118,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} @@ -667126,7 +667126,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} @@ -667134,7 +667134,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} @@ -667142,7 +667142,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} @@ -667150,7 +667150,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 @@ -667174,19 +667174,19 @@ sub_8159E1C: @ 8159E1C bl move_anim_start_t3 lsls r0, 24 cmp r0, 0 - beq _08159E5C + beq @08159E5C bl dp01_tbl6_exec_completed - b _08159E68 + b @08159E68 .align 2, 0 .pool -_08159E5C: +@08159E5C: ldr r0, =0x03005d60 ldrb r1, [r6] lsls r1, 2 adds r1, r0 ldr r0, =sub_81596D4 + 1 str r0, [r1] -_08159E68: +@08159E68: add sp, 0x4 pop {r4-r6} pop {r0} @@ -667196,7 +667196,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} @@ -667204,7 +667204,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} @@ -667212,7 +667212,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 @@ -667233,14 +667233,14 @@ sub_8159E90: @ 8159E90 movs r1, 0x6 ands r0, r1 cmp r0, 0x2 - bne _08159ECC + bne @08159ECC ldr r0, =0x03005d60 ldrb r1, [r4] lsls r1, 2 adds r1, r0 ldr r0, =sub_81595E4 + 1 str r0, [r1] -_08159ECC: +@08159ECC: pop {r4} pop {r0} bx r0 @@ -667249,12 +667249,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 + 1 str r0, [r1] @@ -667268,7 +667268,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 oe_exec @@ -667284,7 +667284,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 @@ -667307,7 +667307,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 @@ -667366,7 +667366,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 @@ -667378,7 +667378,7 @@ sub_8159FEC: @ 8159FEC lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - bne _0815A088 + bne @0815A088 bl sub_81BE72C movs r0, 0x40 movs r1, 0x8 @@ -667393,19 +667393,19 @@ sub_8159FEC: @ 8159FEC movs r2, 0x8 ldrsh r0, [r4, r2] cmp r0, 0x40 - bne _0815A084 + bne @0815A084 strh r6, [r4, 0x8] bl sub_80B5578 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0815A044 + bne @0815A044 adds r0, r5, 0 bl remove_task - b _0815A088 + b @0815A088 .align 2, 0 .pool -_0815A044: +@0815A044: ldr r0, =sub_815A090 + 1 str r0, [r4] bl sub_808BCDC @@ -667429,13 +667429,13 @@ _0815A044: movs r3, 0 bl sub_80A1AD4 bl sub_81BE6B8 - b _0815A088 + b @0815A088 .align 2, 0 .pool -_0815A084: +@0815A084: adds r0, r1, 0x1 strh r0, [r4, 0x8] -_0815A088: +@0815A088: add sp, 0x4 pop {r4-r6} pop {r0} @@ -667443,7 +667443,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 @@ -667452,7 +667452,7 @@ sub_815A090: @ 815A090 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0815A0BE + bne @0815A0BE ldr r0, =0x02037fe8 ldr r1, =0x02037714 movs r2, 0x80 @@ -667463,7 +667463,7 @@ sub_815A090: @ 815A090 bl script_env_1_execute_new_script adds r0, r4, 0 bl remove_task -_0815A0BE: +@0815A0BE: pop {r4} pop {r0} bx r0 @@ -667472,7 +667472,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 @@ -667487,15 +667487,15 @@ sub_815A0D4: @ 815A0D4 movs r3, 0x6 ldrsh r0, [r1, r3] cmp r0, 0 - bne _0815A0FC + bne @0815A0FC ldrh r0, [r1, 0x4] - b _0815A100 + b @0815A100 .align 2, 0 .pool -_0815A0FC: +@0815A0FC: ldrh r0, [r1, 0x4] negs r0, r0 -_0815A100: +@0815A100: strh r0, [r2, 0x2E] ldrh r0, [r1, 0x8] strh r0, [r2, 0x30] @@ -667508,13 +667508,13 @@ _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 ldrsh r0, [r3, r1] cmp r0, 0 - ble _0815A154 + ble @0815A154 ldrh r1, [r3, 0x32] lsls r0, r1, 16 asrs r0, 24 @@ -667540,17 +667540,17 @@ sub_815A114: @ 815A114 ldrh r0, [r3, 0x30] subs r0, 0x1 strh r0, [r3, 0x30] - b _0815A15A -_0815A154: + b @0815A15A +@0815A154: adds r0, r3, 0 bl move_anim_8072740 -_0815A15A: +@0815A15A: pop {r0} bx r0 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 @@ -667589,7 +667589,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 @@ -667622,7 +667622,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] @@ -667639,7 +667639,7 @@ sub_815A1F4: @ 815A1F4 strh r0, [r4, 0x30] lsls r0, 16 cmp r0, 0 - bge _0815A228 + bge @0815A228 adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -667648,7 +667648,7 @@ sub_815A1F4: @ 815A1F4 strb r0, [r2] ldr r0, =sub_815A234 + 1 str r0, [r4, 0x1C] -_0815A228: +@0815A228: pop {r4} pop {r0} bx r0 @@ -667657,7 +667657,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 @@ -667674,7 +667674,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 @@ -667711,13 +667711,13 @@ sub_815A254: @ 815A254 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _0815A2B2 + beq @0815A2B2 movs r1, 0x80 lsls r1, 7 adds r0, r4, r1 lsls r0, 16 lsrs r4, r0, 16 -_0815A2B2: +@0815A2B2: movs r3, 0x80 lsls r3, 1 str r4, [sp] @@ -667744,7 +667744,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 @@ -667767,7 +667767,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] @@ -667782,34 +667782,34 @@ sub_815A31C: @ 815A31C movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0 - beq _0815A342 + beq @0815A342 ldrh r0, [r4, 0x2E] subs r0, 0x1 - b _0815A346 -_0815A342: + b @0815A346 +@0815A342: ldrh r0, [r4, 0x2E] adds r0, 0x1 -_0815A346: +@0815A346: strh r0, [r4, 0x2E] movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0xF - beq _0815A354 + beq @0815A354 cmp r0, 0x4 - bne _0815A35C -_0815A354: + bne @0815A35C +@0815A354: ldrh r0, [r4, 0x30] movs r1, 0x1 eors r0, r1 strh r0, [r4, 0x30] -_0815A35C: +@0815A35C: ldrh r0, [r4, 0x32] adds r1, r0, 0x1 strh r1, [r4, 0x32] lsls r0, 16 asrs r0, 16 cmp r0, 0x46 - ble _0815A3A0 + ble @0815A3A0 movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -667834,7 +667834,7 @@ _0815A35C: strb r0, [r2] ldr r0, =sub_815A3AC + 1 str r0, [r4, 0x1C] -_0815A3A0: +@0815A3A0: pop {r4} pop {r0} bx r0 @@ -667843,7 +667843,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] @@ -667852,7 +667852,7 @@ sub_815A3AC: @ 815A3AC lsls r0, 16 asrs r0, 16 cmp r0, 0x9 - ble _0815A3E8 + ble @0815A3E8 adds r2, r3, 0 adds r2, 0x3E ldrb r1, [r2] @@ -667871,10 +667871,10 @@ sub_815A3AC: @ 815A3AC movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0815A3E8 + beq @0815A3E8 ldr r0, =sub_815A3F0 + 1 str r0, [r3, 0x1C] -_0815A3E8: +@0815A3E8: pop {r0} bx r0 .align 2, 0 @@ -667882,54 +667882,54 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0x6 - bhi _0815A448 + bhi @0815A448 lsls r0, 2 - ldr r1, =_0815A40C + ldr r1, =@0815A40C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0815A40C: - .4byte _0815A428 - .4byte _0815A428 - .4byte _0815A432 - .4byte _0815A432 - .4byte _0815A440 - .4byte _0815A440 - .4byte _0815A448 -_0815A428: +@0815A40C: + .4byte @0815A428 + .4byte @0815A428 + .4byte @0815A432 + .4byte @0815A432 + .4byte @0815A440 + .4byte @0815A440 + .4byte @0815A448 +@0815A428: movs r1, 0 movs r0, 0x1 strh r0, [r4, 0x24] strh r1, [r4, 0x26] - b _0815A450 -_0815A432: + b @0815A450 +@0815A432: ldr r0, =0x0000ffff strh r0, [r4, 0x24] movs r0, 0 - b _0815A44E + b @0815A44E .align 2, 0 .pool -_0815A440: +@0815A440: movs r0, 0 strh r0, [r4, 0x24] movs r0, 0x1 - b _0815A44E -_0815A448: + b @0815A44E +@0815A448: movs r0, 0 strh r0, [r4, 0x24] ldr r0, =0x0000ffff -_0815A44E: +@0815A44E: strh r0, [r4, 0x26] -_0815A450: +@0815A450: ldrh r0, [r4, 0x34] adds r0, 0x1 movs r2, 0 @@ -667937,16 +667937,16 @@ _0815A450: lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - ble _0815A462 + ble @0815A462 strh r2, [r4, 0x34] -_0815A462: +@0815A462: ldrh r0, [r4, 0x36] adds r1, r0, 0x1 strh r1, [r4, 0x36] lsls r0, 16 asrs r0, 16 cmp r0, 0xF - ble _0815A48C + ble @0815A48C movs r0, 0x10 strh r0, [r4, 0x2E] strh r2, [r4, 0x30] @@ -667959,7 +667959,7 @@ _0815A462: bl lcd_io_set ldr r0, =sub_815A49C + 1 str r0, [r4, 0x1C] -_0815A48C: +@0815A48C: pop {r4} pop {r0} bx r0 @@ -667968,7 +667968,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] @@ -667986,28 +667986,28 @@ sub_815A49C: @ 815A49C lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0815A4CC + ble @0815A4CC ldrh r0, [r4, 0x2E] subs r0, 0x1 movs r1, 0 strh r0, [r4, 0x2E] strh r1, [r4, 0x30] -_0815A4CC: +@0815A4CC: movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - bne _0815A4E0 + bne @0815A4E0 adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 strb r0, [r2] -_0815A4E0: +@0815A4E0: movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - bge _0815A4FE + bge @0815A4FE movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -668016,14 +668016,14 @@ _0815A4E0: bl lcd_io_set adds r0, r4, 0 bl move_anim_8072740 -_0815A4FE: +@0815A4FE: pop {r4} pop {r0} bx r0 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 @@ -668043,7 +668043,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 @@ -668064,7 +668064,7 @@ sub_815A52C: @ 815A52C lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne _0815A59C + bne @0815A59C ldr r0, =0x02037b14 lsls r2, r6, 4 adds r1, r2, 0 @@ -668082,14 +668082,14 @@ sub_815A52C: @ 815A52C add r0, r12 adds r2, r0, 0 adds r2, 0x14 -_0815A57A: +@0815A57A: ldrh r0, [r2] strh r0, [r1] subs r2, 0x2 subs r1, 0x2 subs r3, 0x1 cmp r3, 0 - bgt _0815A57A + bgt @0815A57A adds r0, r5, 0x1 lsls r0, 1 add r0, r12 @@ -668100,15 +668100,15 @@ _0815A57A: lsls r0, 3 add r0, r9 strh r1, [r0, 0x12] -_0815A59C: +@0815A59C: ldr r0, =0x0203841e ldrh r1, [r0, 0xE] ldr r0, =0x0000ffff cmp r1, r0 - bne _0815A5AC + bne @0815A5AC adds r0, r4, 0 bl remove_task -_0815A5AC: +@0815A5AC: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -668120,7 +668120,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 @@ -668140,7 +668140,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 @@ -668164,7 +668164,7 @@ sub_815A5F0: @ 815A5F0 lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne _0815A692 + bne @0815A692 ldr r0, =0x02037b14 lsls r2, r7, 4 adds r1, r2, 0 @@ -668182,14 +668182,14 @@ sub_815A5F0: @ 815A5F0 add r0, r9 adds r3, r0, 0 adds r3, 0x14 -_0815A644: +@0815A644: ldrh r0, [r3] strh r0, [r1] subs r3, 0x2 subs r1, 0x2 subs r4, 0x1 cmp r4, 0 - bgt _0815A644 + bgt @0815A644 adds r0, r5, 0x1 lsls r0, 1 add r0, r9 @@ -668204,14 +668204,14 @@ _0815A644: add r0, r12 adds r2, r0, 0 adds r2, 0x14 -_0815A66E: +@0815A66E: ldrh r0, [r2] strh r0, [r1] subs r2, 0x2 subs r1, 0x2 subs r4, 0x1 cmp r4, 0 - bgt _0815A66E + bgt @0815A66E adds r0, r5, 0x1 lsls r0, 1 add r0, r12 @@ -668223,15 +668223,15 @@ _0815A66E: ldr r2, =0x03005e00 adds r0, r2 strh r1, [r0, 0x12] -_0815A692: +@0815A692: ldr r0, =0x0203841e ldrh r1, [r0, 0xE] ldr r0, =0x0000ffff cmp r1, r0 - bne _0815A6A2 + bne @0815A6A2 mov r0, r8 bl remove_task -_0815A6A2: +@0815A6A2: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -668244,7 +668244,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 @@ -668263,12 +668263,12 @@ sub_815A6C4: @ 815A6C4 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0815A6F8 + beq @0815A6F8 ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] -_0815A6F8: +@0815A6F8: ldr r1, =0x0203841e ldrh r0, [r1, 0x8] strh r0, [r4, 0x2E] @@ -668296,13 +668296,13 @@ _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 lsls r0, 24 cmp r0, 0 - beq _0815A75E + beq @0815A75E movs r1, 0 movs r0, 0x1E strh r0, [r4, 0x2E] @@ -668312,7 +668312,7 @@ sub_815A73C: @ 815A73C ldr r1, =sub_815A76C + 1 adds r0, r4, 0 bl oamt_set_x3A_32 -_0815A75E: +@0815A75E: pop {r4} pop {r0} bx r0 @@ -668321,14 +668321,14 @@ _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] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0815A798 + beq @0815A798 movs r0, 0x3E adds r0, r3 mov r12, r0 @@ -668344,23 +668344,23 @@ sub_815A76C: @ 815A76C orrs r0, r1 mov r1, r12 strb r0, [r1] -_0815A798: +@0815A798: ldrh r0, [r3, 0x30] adds r0, 0x1 strh r0, [r3, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x10 - bne _0815A7AC + bne @0815A7AC adds r0, r3, 0 bl move_anim_8072740 -_0815A7AC: +@0815A7AC: pop {r0} bx r0 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 @@ -668386,13 +668386,13 @@ 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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0815A84C + bne @0815A84C adds r0, r4, 0 bl sub_80A6838 ldr r5, =0x0203841e @@ -668403,18 +668403,18 @@ sub_815A7EC: @ 815A7EC bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0815A840 + bne @0815A840 ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0815A830 + bne @0815A830 ldrh r0, [r5, 0x4] - b _0815A846 + b @0815A846 .align 2, 0 .pool -_0815A830: +@0815A830: movs r1, 0x4 ldrsh r0, [r5, r1] negs r0, r0 @@ -668422,17 +668422,17 @@ _0815A830: movs r2, 0x6 ldrsh r0, [r5, r2] negs r0, r0 - b _0815A84A -_0815A840: + b @0815A84A +@0815A840: movs r1, 0x4 ldrsh r0, [r5, r1] negs r0, r0 -_0815A846: +@0815A846: strh r0, [r4, 0x30] ldrh r0, [r5, 0x6] -_0815A84A: +@0815A84A: strh r0, [r4, 0x32] -_0815A84C: +@0815A84C: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] @@ -668472,17 +668472,17 @@ _0815A84C: lsls r0, 16 lsrs r0, 16 cmp r0, 0xF0 - bls _0815A8A4 + bls @0815A8A4 adds r0, r4, 0 bl move_anim_8072740 -_0815A8A4: +@0815A8A4: pop {r4,r5} pop {r0} bx r0 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 @@ -668490,16 +668490,16 @@ sub_815A8AC: @ 815A8AC movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0815A8C2 + beq @0815A8C2 adds r0, r2, 0 bl move_anim_8072740 -_0815A8C2: +@0815A8C2: pop {r0} bx r0 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 @@ -668509,16 +668509,16 @@ sub_815A8C8: @ 815A8C8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0815A8EC + bne @0815A8EC ldr r1, =0x0203841e movs r0, 0 - b _0815A8F0 + b @0815A8F0 .align 2, 0 .pool -_0815A8EC: +@0815A8EC: ldr r1, =0x0203841e movs r0, 0x1 -_0815A8F0: +@0815A8F0: strh r0, [r1, 0xE] adds r0, r4, 0 bl move_anim_task_del @@ -668530,23 +668530,23 @@ _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 ldr r0, =0x02038404 ldr r0, [r0] cmp r0, 0 - ble _0815A920 + ble @0815A920 ldr r1, =0x0203841e movs r0, 0 - b _0815A924 + b @0815A924 .align 2, 0 .pool -_0815A920: +@0815A920: ldr r1, =0x0203841e movs r0, 0x1 -_0815A924: +@0815A924: strh r0, [r1, 0xE] adds r0, r2, 0 bl move_anim_task_del @@ -668557,7 +668557,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 @@ -668604,29 +668604,29 @@ 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 ldrsh r0, [r4, r1] cmp r0, 0x5 - bhi _0815AA60 + bhi @0815AA60 lsls r0, 2 - ldr r1, =_0815A9BC + ldr r1, =@0815A9BC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0815A9BC: - .4byte _0815A9D4 - .4byte _0815A9F2 - .4byte _0815AA12 - .4byte _0815A9F2 - .4byte _0815AA32 - .4byte _0815AA42 -_0815A9D4: +@0815A9BC: + .4byte @0815A9D4 + .4byte @0815A9F2 + .4byte @0815AA12 + .4byte @0815A9F2 + .4byte @0815AA32 + .4byte @0815AA42 +@0815A9D4: adds r2, r4, 0 adds r2, 0x3E ldrb r1, [r2] @@ -668640,9 +668640,9 @@ _0815A9D4: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0815AA60 - b _0815AA3A -_0815A9F2: + beq @0815AA60 + b @0815AA3A +@0815A9F2: ldrh r0, [r4, 0x30] adds r0, 0x75 strh r0, [r4, 0x30] @@ -668655,11 +668655,11 @@ _0815A9F2: lsls r0, 16 asrs r0, 16 cmp r0, 0x15 - bne _0815AA60 + bne @0815AA60 movs r0, 0 strh r0, [r4, 0x32] - b _0815AA3A -_0815AA12: + b @0815AA3A +@0815AA12: ldrh r0, [r4, 0x30] subs r0, 0x75 strh r0, [r4, 0x30] @@ -668672,27 +668672,27 @@ _0815AA12: lsls r0, 16 asrs r0, 16 cmp r0, 0x29 - bne _0815AA60 + bne @0815AA60 movs r0, 0 strh r0, [r4, 0x32] - b _0815AA3A -_0815AA32: + b @0815AA3A +@0815AA32: adds r0, r4, 0 movs r1, 0x1 bl sub_80082B8 -_0815AA3A: +@0815AA3A: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _0815AA60 -_0815AA42: + b @0815AA60 +@0815AA42: adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0815AA60 + beq @0815AA60 adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -668701,7 +668701,7 @@ _0815AA42: strb r0, [r2] ldr r0, =sub_815AA6C + 1 str r0, [r4, 0x1C] -_0815AA60: +@0815AA60: pop {r4} pop {r0} bx r0 @@ -668710,7 +668710,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 @@ -668737,14 +668737,14 @@ 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 movs r1, 0x6 ldrsh r0, [r6, r1] cmp r0, 0 - bne _0815AAD0 + bne @0815AAD0 ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 @@ -668758,7 +668758,7 @@ sub_815AAA4: @ 815AAA4 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] -_0815AAD0: +@0815AAD0: ldrh r0, [r6] ldrh r2, [r5, 0x20] adds r0, r2 @@ -668782,7 +668782,7 @@ _0815AAD0: movs r1, 0x4 ldrsh r0, [r6, r1] cmp r0, 0 - bne _0815AB2C + bne @0815AB2C ldrb r1, [r5, 0x3] movs r0, 0x3F negs r0, r0 @@ -668793,14 +668793,14 @@ _0815AAD0: ldr r0, =0x0000fff4 strh r0, [r5, 0x24] movs r0, 0x2 - b _0815AB32 + b @0815AB32 .align 2, 0 .pool -_0815AB2C: +@0815AB2C: movs r0, 0xC strh r0, [r5, 0x24] ldr r0, =0x0000fffe -_0815AB32: +@0815AB32: strh r0, [r5, 0x30] ldr r1, =0x0203841e ldrh r0, [r1, 0x8] @@ -668808,10 +668808,10 @@ _0815AB32: movs r2, 0x34 ldrsh r0, [r5, r2] cmp r0, 0xFF - beq _0815AB46 + beq @0815AB46 ldrh r0, [r1, 0x4] strh r0, [r5, 0x34] -_0815AB46: +@0815AB46: ldr r0, =sub_815AB5C + 1 str r0, [r5, 0x1C] pop {r4-r6} @@ -668822,27 +668822,27 @@ _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] movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0815AB9A + bne @0815AB9A ldrh r0, [r4, 0x30] ldrh r1, [r4, 0x24] adds r0, r1 strh r0, [r4, 0x24] lsls r0, 16 cmp r0, 0 - bne _0815ABBA + bne @0815ABBA adds r0, r2, 0x1 strh r0, [r4, 0x32] movs r1, 0x34 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0815ABBA + bne @0815ABBA movs r0, 0x40 negs r0, r0 bl sub_80A5178 @@ -668851,8 +668851,8 @@ sub_815AB5C: @ 815AB5C asrs r1, 24 movs r0, 0xDE bl sub_80A3808 - b _0815ABBA -_0815AB9A: + b @0815ABBA +@0815AB9A: ldrh r0, [r4, 0x24] ldrh r1, [r4, 0x30] subs r0, r1 @@ -668860,31 +668860,31 @@ _0815AB9A: movs r1, 0x24 ldrsh r0, [r4, r1] cmp r0, 0 - bge _0815ABAC + bge @0815ABAC negs r0, r0 -_0815ABAC: +@0815ABAC: cmp r0, 0xC - bne _0815ABBA + bne @0815ABBA ldrh r0, [r4, 0x2E] subs r0, 0x1 strh r0, [r4, 0x2E] subs r0, r2, 0x1 strh r0, [r4, 0x32] -_0815ABBA: +@0815ABBA: movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - bne _0815ABC8 + bne @0815ABC8 adds r0, r4, 0 bl move_anim_8072740 -_0815ABC8: +@0815ABC8: pop {r4} pop {r0} bx r0 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 @@ -668901,14 +668901,14 @@ 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 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _0815AC40 + beq @0815AC40 ldr r1, =0x00001f3f movs r0, 0x48 bl lcd_io_set @@ -668927,10 +668927,10 @@ sub_815ABEC: @ 815ABEC ldrh r1, [r0] movs r0, 0x46 bl lcd_io_set - b _0815AC70 + b @0815AC70 .align 2, 0 .pool -_0815AC40: +@0815AC40: ldr r1, =0x00001f3f movs r0, 0x48 bl lcd_io_set @@ -668951,7 +668951,7 @@ _0815AC40: lsls r1, 7 movs r0, 0 bl lcd_io_set_bits -_0815AC70: +@0815AC70: adds r0, r5, 0 bl move_anim_task_del pop {r4,r5} @@ -668962,7 +668962,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 @@ -668977,12 +668977,12 @@ sub_815AC8C: @ 815AC8C bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0815ACB8 + bne @0815ACB8 movs r1, 0x80 lsls r1, 7 movs r0, 0 bl lcd_io_clear_bits -_0815ACB8: +@0815ACB8: adds r0, r4, 0 bl move_anim_task_del pop {r4} @@ -668993,21 +668993,21 @@ _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 movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 - bne _0815ACEC + bne @0815ACEC ldr r4, =0x02038436 - b _0815ACEE + b @0815ACEE .align 2, 0 .pool -_0815ACEC: +@0815ACEC: ldr r4, =0x02038437 -_0815ACEE: +@0815ACEE: ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -669032,9 +669032,9 @@ _0815ACEE: movs r6, 0x6 ldrsh r1, [r2, r6] cmp r0, r1 - ble _0815AD26 + ble @0815AD26 movs r3, 0x1 -_0815AD26: +@0815AD26: strh r3, [r5, 0x2E] movs r0, 0 strh r0, [r5, 0x30] @@ -669053,7 +669053,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] @@ -669078,34 +669078,34 @@ sub_815AD4C: @ 815AD4C movs r3, 0x2E ldrsh r0, [r2, r3] cmp r0, 0 - beq _0815AD98 + beq @0815AD98 lsls r0, r1, 16 asrs r0, 16 movs r3, 0x36 ldrsh r1, [r2, r3] cmp r0, r1 - bge _0815ADAA + bge @0815ADAA adds r0, r2, 0 bl move_anim_8072740 - b _0815ADAA + b @0815ADAA .align 2, 0 .pool -_0815AD98: +@0815AD98: lsls r0, r1, 16 asrs r0, 16 movs r3, 0x36 ldrsh r1, [r2, r3] cmp r0, r1 - ble _0815ADAA + ble @0815ADAA adds r0, r2, 0 bl move_anim_8072740 -_0815ADAA: +@0815ADAA: pop {r0} bx r0 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 @@ -669119,14 +669119,14 @@ sub_815ADB0: @ 815ADB0 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _0815ADDC + bne @0815ADDC ldr r4, =0x02038436 - b _0815ADDE + b @0815ADDE .align 2, 0 .pool -_0815ADDC: +@0815ADDC: ldr r4, =0x02038437 -_0815ADDE: +@0815ADDE: ldrb r0, [r4] bl sub_80A6190 lsls r0, 24 @@ -669144,9 +669144,9 @@ _0815ADDE: subs r0, 0x21 strh r0, [r5, 0xC] cmp r0, 0 - bge _0815AE08 + bge @0815AE08 strh r2, [r5, 0xC] -_0815AE08: +@0815AE08: ldrh r0, [r5, 0x8] strh r0, [r5, 0xE] movs r0, 0x8 @@ -669157,14 +669157,14 @@ _0815AE08: strh r2, [r5, 0x14] strh r2, [r5, 0x16] cmp r7, 0x1 - bne _0815AE30 + bne @0815AE30 ldr r0, =0x02022e18 - b _0815AE32 + b @0815AE32 .align 2, 0 .pool -_0815AE30: +@0815AE30: ldr r0, =0x02022e1c -_0815AE32: +@0815AE32: ldrh r2, [r0] strh r2, [r5, 0x18] adds r3, r2, 0 @@ -669175,16 +669175,16 @@ _0815AE32: movs r4, 0x4 ldrsh r0, [r1, r4] cmp r0, 0 - bne _0815AE54 + bne @0815AE54 strh r3, [r5, 0x1E] ldrh r3, [r5, 0x18] - b _0815AE58 + b @0815AE58 .align 2, 0 .pool -_0815AE54: +@0815AE54: strh r2, [r5, 0x1E] ldrh r3, [r5, 0x1A] -_0815AE58: +@0815AE58: movs r0, 0 strh r0, [r5, 0x26] ldrh r1, [r5, 0xC] @@ -669193,13 +669193,13 @@ _0815AE58: movs r6, 0xE ldrsh r0, [r5, r6] cmp r1, r0 - bgt _0815AE8E + bgt @0815AE8E ldr r4, =0x02038c28 movs r0, 0xF0 lsls r0, 3 adds r0, r4 mov r12, r0 -_0815AE74: +@0815AE74: asrs r2, 16 lsls r1, r2, 1 adds r0, r1, r4 @@ -669212,17 +669212,17 @@ _0815AE74: movs r6, 0xE ldrsh r0, [r5, r6] cmp r1, r0 - ble _0815AE74 -_0815AE8E: + ble @0815AE74 +@0815AE8E: cmp r7, 0x1 - bne _0815AEA0 + bne @0815AEA0 ldr r0, =0x04000014 - b _0815AEA2 + b @0815AEA2 .align 2, 0 .pool -_0815AEA0: +@0815AEA0: ldr r0, =0x04000018 -_0815AEA2: +@0815AEA2: str r0, [sp] ldr r0, =0xa2600001 str r0, [sp, 0x4] @@ -669247,7 +669247,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 @@ -669266,14 +669266,14 @@ sub_815AED8: @ 815AED8 movs r3, 0xC ldrsh r1, [r4, r3] cmp r0, r1 - bge _0815AF00 + bge @0815AF00 strh r2, [r4, 0x8] -_0815AF00: +@0815AF00: ldrh r1, [r4, 0x10] movs r2, 0x10 ldrsh r0, [r4, r2] cmp r0, 0 - bne _0815AF2C + bne @0815AF2C ldrh r0, [r4, 0xA] ldrh r1, [r4, 0x12] subs r0, r1 @@ -669284,55 +669284,55 @@ _0815AF00: movs r3, 0xC ldrsh r1, [r4, r3] cmp r0, r1 - bge _0815AF30 + bge @0815AF30 strh r2, [r4, 0xA] movs r0, 0x1 strh r0, [r4, 0x26] - b _0815AF30 + b @0815AF30 .align 2, 0 .pool -_0815AF2C: +@0815AF2C: subs r0, r1, 0x1 strh r0, [r4, 0x10] -_0815AF30: +@0815AF30: ldrh r0, [r4, 0x14] adds r0, 0x1 strh r0, [r4, 0x14] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0815AF5C + ble @0815AF5C movs r0, 0 strh r0, [r4, 0x14] movs r1, 0 movs r2, 0x16 ldrsh r0, [r4, r2] cmp r0, 0 - bne _0815AF4E + bne @0815AF4E movs r1, 0x1 -_0815AF4E: +@0815AF4E: strh r1, [r4, 0x16] cmp r1, 0 - beq _0815AF58 + beq @0815AF58 ldrh r0, [r4, 0x18] - b _0815AF5A -_0815AF58: + b @0815AF5A +@0815AF58: ldrh r0, [r4, 0x1A] -_0815AF5A: +@0815AF5A: strh r0, [r4, 0x20] -_0815AF5C: +@0815AF5C: ldrh r1, [r4, 0x8] lsls r3, r1, 16 asrs r1, r3, 16 movs r2, 0xA ldrsh r0, [r4, r2] cmp r1, r0 - bge _0815AF90 + bge @0815AF90 ldr r5, =0x02038c28 movs r0, 0xF0 lsls r0, 3 adds r6, r5, r0 -_0815AF72: +@0815AF72: asrs r3, 16 lsls r1, r3, 1 adds r2, r1, r5 @@ -669347,20 +669347,20 @@ _0815AF72: movs r2, 0xA ldrsh r0, [r4, r2] cmp r1, r0 - blt _0815AF72 -_0815AF90: + blt @0815AF72 +@0815AF90: ldrh r1, [r4, 0xA] lsls r3, r1, 16 asrs r1, r3, 16 movs r2, 0xE ldrsh r0, [r4, r2] cmp r1, r0 - bgt _0815AFC4 + bgt @0815AFC4 ldr r5, =0x02038c28 movs r0, 0xF0 lsls r0, 3 adds r6, r5, r0 -_0815AFA6: +@0815AFA6: asrs r3, 16 lsls r1, r3, 1 adds r2, r1, r5 @@ -669375,23 +669375,23 @@ _0815AFA6: movs r2, 0xE ldrsh r0, [r4, r2] cmp r1, r0 - ble _0815AFA6 -_0815AFC4: + ble @0815AFA6 +@0815AFC4: movs r3, 0x26 ldrsh r0, [r4, r3] cmp r0, 0 - beq _0815AFE0 + beq @0815AFE0 movs r1, 0x1C ldrsh r0, [r4, r1] cmp r0, 0 - beq _0815AFDA + beq @0815AFDA ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] -_0815AFDA: +@0815AFDA: adds r0, r7, 0 bl move_anim_task_del -_0815AFE0: +@0815AFE0: pop {r4-r7} pop {r0} bx r0 @@ -669400,7 +669400,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 @@ -669445,7 +669445,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} @@ -669460,41 +669460,41 @@ sub_815B054: @ 815B054 movs r1, 0x8 ldrsh r0, [r6, r1] cmp r0, 0x5 - bls _0815B074 - b _0815B22E -_0815B074: + bls @0815B074 + b @0815B22E +@0815B074: lsls r0, 2 - ldr r1, =_0815B088 + ldr r1, =@0815B088 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0815B088: - .4byte _0815B0A0 - .4byte _0815B160 - .4byte _0815B18E - .4byte _0815B1A2 - .4byte _0815B1B8 - .4byte _0815B220 -_0815B0A0: +@0815B088: + .4byte @0815B0A0 + .4byte @0815B160 + .4byte @0815B18E + .4byte @0815B1A2 + .4byte @0815B1B8 + .4byte @0815B220 +@0815B0A0: movs r0, 0xC ldrsh r2, [r6, r0] ldrh r1, [r6, 0xA] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0815B0B6 + beq @0815B0B6 movs r1, 0x10 ldrsh r0, [r6, r1] subs r0, r2, r0 - b _0815B0BC -_0815B0B6: + b @0815B0BC +@0815B0B6: movs r1, 0x10 ldrsh r0, [r6, r1] adds r0, r2, r0 -_0815B0BC: +@0815B0BC: lsls r0, 16 lsrs r1, r0, 16 ldrh r2, [r6, 0x12] @@ -669522,7 +669522,7 @@ _0815B0BC: movs r0, 0xBA bl audio_play_and_stuff cmp r4, 0x40 - beq _0815B120 + beq @0815B120 ldr r5, =0x02020630 lsls r1, r4, 4 adds r1, r4 @@ -669542,20 +669542,20 @@ _0815B0BC: adds r1, r5 ldr r0, =nullsub_12 + 1 str r0, [r1] -_0815B120: +@0815B120: ldrh r1, [r6, 0xA] movs r4, 0x1 adds r0, r4, 0 ands r0, r1 cmp r0, 0 - beq _0815B138 + beq @0815B138 ldrh r0, [r6, 0x10] subs r0, 0x6 strh r0, [r6, 0x10] ldrh r0, [r6, 0x12] subs r0, 0x6 strh r0, [r6, 0x12] -_0815B138: +@0815B138: ldrh r1, [r6, 0x26] lsls r1, 24 lsrs r1, 24 @@ -669566,67 +669566,67 @@ _0815B138: adds r0, 0x1 strh r0, [r6, 0xA] strh r4, [r6, 0x8] - b _0815B22E + b @0815B22E .align 2, 0 .pool -_0815B160: +@0815B160: adds r0, r6, 0 bl sub_80A7D34 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _0815B22E + bne @0815B22E movs r2, 0xA ldrsh r1, [r6, r2] cmp r1, 0x6 - bne _0815B180 + bne @0815B180 movs r0, 0x8 strh r0, [r6, 0x14] movs r0, 0x3 strh r0, [r6, 0x8] - b _0815B22E -_0815B180: + b @0815B22E +@0815B180: cmp r1, 0x2 - bgt _0815B186 + bgt @0815B186 movs r0, 0xA -_0815B186: +@0815B186: strh r0, [r6, 0x14] movs r0, 0x2 strh r0, [r6, 0x8] - b _0815B22E -_0815B18E: + b @0815B22E +@0815B18E: ldrh r0, [r6, 0x14] movs r2, 0x14 ldrsh r1, [r6, r2] cmp r1, 0 - beq _0815B19E + beq @0815B19E subs r0, 0x1 strh r0, [r6, 0x14] - b _0815B22E -_0815B19E: + b @0815B22E +@0815B19E: strh r1, [r6, 0x8] - b _0815B22E -_0815B1A2: + b @0815B22E +@0815B1A2: ldrh r1, [r6, 0x14] movs r2, 0x14 ldrsh r0, [r6, r2] cmp r0, 0 - beq _0815B1B2 + beq @0815B1B2 subs r0, r1, 0x1 strh r0, [r6, 0x14] - b _0815B22E -_0815B1B2: + b @0815B22E +@0815B1B2: movs r0, 0x4 strh r0, [r6, 0x8] - b _0815B22E -_0815B1B8: + b @0815B22E +@0815B1B8: movs r5, 0 movs r7, 0 ldr r3, =0x02020630 movs r0, 0x1C adds r0, r3 mov r8, r0 -_0815B1C4: +@0815B1C4: lsls r0, r5, 4 adds r0, r5 lsls r4, r0, 2 @@ -669636,7 +669636,7 @@ _0815B1C4: ldr r1, [r0] ldr r0, =0x08593114 cmp r1, r0 - bne _0815B200 + bne @0815B200 adds r0, r4, r3 strh r2, [r0, 0x2E] movs r1, 0x6 @@ -669655,28 +669655,28 @@ _0815B1C4: ldr r2, [sp] ldr r3, [sp, 0x4] cmp r7, 0x6 - beq _0815B20A -_0815B200: + beq @0815B20A +@0815B200: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x3F - bls _0815B1C4 -_0815B20A: + bls @0815B1C4 +@0815B20A: strh r7, [r6, 0x14] movs r0, 0x5 strh r0, [r6, 0x8] - b _0815B22E + b @0815B22E .align 2, 0 .pool -_0815B220: +@0815B220: movs r1, 0x14 ldrsh r0, [r6, r1] cmp r0, 0 - bne _0815B22E + bne @0815B22E adds r0, r2, 0 bl move_anim_task_del -_0815B22E: +@0815B22E: add sp, 0x8 pop {r3} mov r8, r3 @@ -669686,7 +669686,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 @@ -669694,7 +669694,7 @@ sub_815B23C: @ 815B23C movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0815B270 + beq @0815B270 ldr r3, =0x03005e00 movs r0, 0x30 ldrsh r1, [r4, r0] @@ -669712,7 +669712,7 @@ sub_815B23C: @ 815B23C strh r0, [r1] adds r0, r4, 0 bl obj_delete_and_free_tiles -_0815B270: +@0815B270: pop {r4} pop {r0} bx r0 @@ -669721,49 +669721,49 @@ _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 ldrsh r0, [r5, r1] cmp r0, 0 - bne _0815B290 + bne @0815B290 adds r0, r5, 0 movs r1, 0 bl sub_80A69CC -_0815B290: +@0815B290: ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] lsls r0, 16 asrs r0, 16 cmp r0, 0x27 - bgt _0815B2C2 + bgt @0815B2C2 ldrh r0, [r5, 0x2E] movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _0815B2B4 + bne @0815B2B4 adds r2, r5, 0 adds r2, 0x3E ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 - b _0815B2C0 -_0815B2B4: + b @0815B2C0 +@0815B2B4: adds r2, r5, 0 adds r2, 0x3E ldrb r1, [r2] movs r0, 0x5 negs r0, r0 ands r0, r1 -_0815B2C0: +@0815B2C0: strb r0, [r2] -_0815B2C2: +@0815B2C2: movs r2, 0x2E ldrsh r0, [r5, r2] cmp r0, 0x1E - ble _0815B2D8 + ble @0815B2D8 adds r2, r5, 0 adds r2, 0x3E ldrb r1, [r2] @@ -669771,11 +669771,11 @@ _0815B2C2: negs r0, r0 ands r0, r1 strb r0, [r2] -_0815B2D8: +@0815B2D8: movs r1, 0x2E ldrsh r0, [r5, r1] cmp r0, 0x3D - bne _0815B324 + bne @0815B324 ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 @@ -669807,7 +669807,7 @@ _0815B2D8: strh r0, [r5, 0x36] ldr r0, =sub_80A6EEC + 1 str r0, [r5, 0x1C] -_0815B324: +@0815B324: pop {r4,r5} pop {r0} bx r0 @@ -669816,7 +669816,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 @@ -669828,13 +669828,13 @@ sub_815B338: @ 815B338 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - beq _0815B35C + beq @0815B35C cmp r0, 0x1 - beq _0815B37C - b _0815B38E + beq @0815B37C + b @0815B38E .align 2, 0 .pool -_0815B35C: +@0815B35C: movs r0, 0 bl obj_id_for_side_relative_to_move adds r1, r0, 0 @@ -669846,25 +669846,25 @@ _0815B35C: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0815B38E + b @0815B38E .align 2, 0 .pool -_0815B37C: +@0815B37C: adds r0, r4, 0 bl sub_80A7D34 lsls r0, 24 cmp r0, 0 - bne _0815B38E + bne @0815B38E adds r0, r5, 0 bl move_anim_task_del -_0815B38E: +@0815B38E: pop {r4,r5} pop {r0} bx r0 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 @@ -669874,19 +669874,19 @@ sub_815B394: @ 815B394 movs r1, 0x2E ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _0815B3F4 + beq @0815B3F4 cmp r0, 0x1 - bgt _0815B3B4 + bgt @0815B3B4 cmp r0, 0 - beq _0815B3BE - b _0815B496 -_0815B3B4: + beq @0815B3BE + b @0815B496 +@0815B3B4: cmp r0, 0x2 - beq _0815B424 + beq @0815B424 cmp r0, 0x3 - beq _0815B478 - b _0815B496 -_0815B3BE: + beq @0815B478 + b @0815B496 +@0815B3BE: ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 @@ -669907,10 +669907,10 @@ _0815B3BE: lsls r0, 1 strh r0, [r5, 0x30] strh r0, [r5, 0x32] - b _0815B46C + b @0815B46C .align 2, 0 .pool -_0815B3F4: +@0815B3F4: ldrh r0, [r5, 0x30] adds r0, 0x60 strh r0, [r5, 0x30] @@ -669930,11 +669930,11 @@ _0815B3F4: lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - bne _0815B424 + bne @0815B424 ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] -_0815B424: +@0815B424: ldrh r0, [r5, 0x30] adds r0, 0x60 strh r0, [r5, 0x30] @@ -669954,7 +669954,7 @@ _0815B424: lsls r0, 16 asrs r0, 16 cmp r0, 0x9 - bne _0815B496 + bne @0815B496 movs r0, 0 strh r0, [r5, 0x34] ldr r1, =0x02020630 @@ -669969,14 +669969,14 @@ _0815B424: strb r1, [r0] adds r0, r6, 0 bl sub_80A7344 -_0815B46C: +@0815B46C: ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] - b _0815B496 + b @0815B496 .align 2, 0 .pool -_0815B478: +@0815B478: ldrh r0, [r5, 0x26] subs r0, 0x6 strh r0, [r5, 0x26] @@ -669988,17 +669988,17 @@ _0815B478: movs r1, 0x20 negs r1, r1 cmp r0, r1 - bge _0815B496 + bge @0815B496 adds r0, r5, 0 bl move_anim_8072740 -_0815B496: +@0815B496: pop {r4-r6} pop {r0} bx r0 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 @@ -670006,15 +670006,15 @@ sub_815B49C: @ 815B49C bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0815B4BC + beq @0815B4BC ldr r0, =0x0000fff0 - b _0815B4C0 + b @0815B4C0 .align 2, 0 .pool -_0815B4BC: +@0815B4BC: movs r0, 0x80 lsls r0, 1 -_0815B4C0: +@0815B4C0: strh r0, [r4, 0x20] movs r0, 0 strh r0, [r4, 0x22] @@ -670028,7 +670028,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] @@ -670039,19 +670039,19 @@ sub_815B4D4: @ 815B4D4 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0815B4F8 + beq @0815B4F8 ldrh r0, [r4, 0x2E] lsls r0, 16 asrs r0, 20 - b _0815B500 + b @0815B500 .align 2, 0 .pool -_0815B4F8: +@0815B4F8: ldrh r0, [r4, 0x2E] lsls r0, 16 asrs r0, 20 negs r0, r0 -_0815B500: +@0815B500: strh r0, [r4, 0x24] ldrh r0, [r4, 0x30] adds r0, 0x10 @@ -670070,7 +670070,7 @@ _0815B500: bl __modsi3 lsls r0, 16 cmp r0, 0 - bne _0815B54C + bne @0815B54C ldr r0, =0x085ce3a0 ldrh r1, [r4, 0x24] ldrh r2, [r4, 0x20] @@ -670088,7 +670088,7 @@ _0815B500: lsls r3, 24 lsrs r3, 24 bl obj_add_from_template_call_callback_once -_0815B54C: +@0815B54C: movs r1, 0x20 ldrsh r0, [r4, r1] movs r2, 0x24 @@ -670098,10 +670098,10 @@ _0815B54C: movs r1, 0x98 lsls r1, 1 cmp r0, r1 - bls _0815B566 + bls @0815B566 adds r0, r4, 0 bl move_anim_8072740 -_0815B566: +@0815B566: pop {r4,r5} pop {r0} bx r0 @@ -670110,25 +670110,25 @@ _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 movs r1, 0x3 ands r0, r1 cmp r0, 0 - bne _0815B58A + bne @0815B58A ldrh r2, [r4, 0x4] lsls r1, r2, 22 lsrs r1, 22 adds r1, 0x4 - b _0815B592 -_0815B58A: + b @0815B592 +@0815B58A: ldrh r2, [r4, 0x4] lsls r1, r2, 22 lsrs r1, 22 adds r1, 0x5 -_0815B592: +@0815B592: ldr r3, =0x000003ff adds r0, r3, 0 ands r1, r0 @@ -670141,11 +670141,11 @@ _0815B592: ands r0, r1 adds r1, r0, 0 cmp r1, 0x3 - ble _0815B5B4 + ble @0815B5B4 negs r0, r1 lsls r0, 24 lsrs r0, 24 -_0815B5B4: +@0815B5B4: lsls r0, 24 asrs r0, 24 strh r0, [r4, 0x26] @@ -670159,7 +670159,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] @@ -670168,14 +670168,14 @@ sub_815B5D0: @ 815B5D0 lsls r0, 16 asrs r0, 16 cmp r0, 0x1D - bgt _0815B612 + bgt @0815B612 ldrh r0, [r3, 0x30] adds r0, 0x1 strh r0, [r3, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - bne _0815B646 + bne @0815B646 movs r0, 0x3E adds r0, r3 mov r12, r0 @@ -670192,12 +670192,12 @@ sub_815B5D0: @ 815B5D0 mov r1, r12 strb r0, [r1] movs r0, 0 - b _0815B644 -_0815B612: + b @0815B644 +@0815B612: movs r1, 0x30 ldrsh r0, [r3, r1] cmp r0, 0x2 - bne _0815B628 + bne @0815B628 adds r2, r3, 0 adds r2, 0x3E ldrb r1, [r2] @@ -670205,11 +670205,11 @@ _0815B612: negs r0, r0 ands r0, r1 strb r0, [r2] -_0815B628: +@0815B628: movs r1, 0x30 ldrsh r0, [r3, r1] cmp r0, 0x3 - bne _0815B640 + bne @0815B640 adds r2, r3, 0 adds r2, 0x3E ldrb r0, [r2] @@ -670218,19 +670218,19 @@ _0815B628: strb r0, [r2] ldr r0, =0x0000ffff strh r0, [r3, 0x30] -_0815B640: +@0815B640: ldrh r0, [r3, 0x30] adds r0, 0x1 -_0815B644: +@0815B644: strh r0, [r3, 0x30] -_0815B646: +@0815B646: movs r1, 0x2E ldrsh r0, [r3, r1] cmp r0, 0x3C - ble _0815B654 + ble @0815B654 adds r0, r3, 0 bl obj_delete_and_free_tiles -_0815B654: +@0815B654: pop {r0} bx r0 .align 2, 0 @@ -670238,7 +670238,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 @@ -670251,7 +670251,7 @@ sub_815B65C: @ 815B65C movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0815B69C + bne @0815B69C movs r0, 0 bl obj_id_for_side_relative_to_move adds r1, r0, 0 @@ -670263,25 +670263,25 @@ sub_815B65C: @ 815B65C ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0815B6AE + b @0815B6AE .align 2, 0 .pool -_0815B69C: +@0815B69C: adds r0, r4, 0 bl sub_80A7D34 lsls r0, 24 cmp r0, 0 - bne _0815B6AE + bne @0815B6AE adds r0, r5, 0 bl move_anim_task_del -_0815B6AE: +@0815B6AE: pop {r4,r5} pop {r0} bx r0 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 @@ -670294,7 +670294,7 @@ sub_815B6B4: @ 815B6B4 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0815B6F4 + bne @0815B6F4 movs r0, 0 bl obj_id_for_side_relative_to_move adds r1, r0, 0 @@ -670306,35 +670306,35 @@ sub_815B6B4: @ 815B6B4 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0815B706 + b @0815B706 .align 2, 0 .pool -_0815B6F4: +@0815B6F4: adds r0, r4, 0 bl sub_80A7D34 lsls r0, 24 cmp r0, 0 - bne _0815B706 + bne @0815B706 adds r0, r5, 0 bl move_anim_task_del -_0815B706: +@0815B706: pop {r4,r5} pop {r0} bx r0 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 ldrsh r0, [r4, r1] cmp r0, 0 - beq _0815B71E + beq @0815B71E cmp r0, 0x1 - beq _0815B748 - b _0815B770 -_0815B71E: + beq @0815B748 + b @0815B770 +@0815B71E: adds r0, r4, 0 movs r1, 0 bl sub_80A69CC @@ -670351,10 +670351,10 @@ _0815B71E: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _0815B770 + b @0815B770 .align 2, 0 .pool -_0815B748: +@0815B748: ldrh r2, [r4, 0x30] lsls r1, r2, 16 asrs r1, 24 @@ -670371,17 +670371,17 @@ _0815B748: movs r2, 0x32 ldrsh r1, [r4, r2] cmp r0, r1 - ble _0815B770 + ble @0815B770 adds r0, r4, 0 bl move_anim_8072740 -_0815B770: +@0815B770: pop {r4} pop {r0} bx r0 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 @@ -670394,7 +670394,7 @@ sub_815B778: @ 815B778 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0815B7B8 + bne @0815B7B8 movs r0, 0 bl obj_id_for_side_relative_to_move adds r1, r0, 0 @@ -670406,25 +670406,25 @@ sub_815B778: @ 815B778 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0815B7CA + b @0815B7CA .align 2, 0 .pool -_0815B7B8: +@0815B7B8: adds r0, r4, 0 bl sub_80A7D34 lsls r0, 24 cmp r0, 0 - bne _0815B7CA + bne @0815B7CA adds r0, r5, 0 bl move_anim_task_del -_0815B7CA: +@0815B7CA: pop {r4,r5} pop {r0} bx r0 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 @@ -670442,24 +670442,24 @@ sub_815B7D0: @ 815B7D0 ldrsh r0, [r0, r2] adds r3, r1, 0 cmp r0, 0x4 - bls _0815B7F6 - b _0815BAFC -_0815B7F6: + bls @0815B7F6 + b @0815BAFC +@0815B7F6: lsls r0, 2 - ldr r1, =_0815B808 + ldr r1, =@0815B808 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0815B808: - .4byte _0815B81C - .4byte _0815B86C - .4byte _0815B8A8 - .4byte _0815BA44 - .4byte _0815BA82 -_0815B81C: +@0815B808: + .4byte @0815B81C + .4byte @0815B86C + .4byte @0815B8A8 + .4byte @0815BA44 + .4byte @0815BA82 +@0815B81C: movs r0, 0x4C movs r1, 0 bl lcd_io_set @@ -670469,20 +670469,20 @@ _0815B81C: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0815B844 + bne @0815B844 movs r0, 0x1 movs r1, 0x2 movs r2, 0x1 bl lcd_bg_operations - b _0815B84E + b @0815B84E .align 2, 0 .pool -_0815B844: +@0815B844: movs r0, 0x2 movs r1, 0x2 movs r2, 0x1 bl lcd_bg_operations -_0815B84E: +@0815B84E: ldr r0, =0x03005e00 mov r6, r8 lsls r1, r6, 2 @@ -670492,10 +670492,10 @@ _0815B84E: ldr r0, =0x0203841e ldrh r0, [r0] strh r0, [r1, 0x1C] - b _0815BA26 + b @0815BA26 .align 2, 0 .pool -_0815B86C: +@0815B86C: mov r1, r8 lsls r0, r1, 2 add r0, r8 @@ -670507,9 +670507,9 @@ _0815B86C: lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - bgt _0815B886 - b _0815BAFC -_0815B886: + bgt @0815B886 + b @0815BAFC +@0815B886: movs r0, 0 strh r0, [r4, 0xC] ldrh r0, [r4, 0xA] @@ -670523,11 +670523,11 @@ _0815B886: movs r0, 0x4C bl lcd_io_set cmp r5, 0xF - beq _0815B8A6 - b _0815BAFC -_0815B8A6: - b _0815BA7A -_0815B8A8: + beq @0815B8A6 + b @0815BAFC +@0815B8A6: + b @0815BA7A +@0815B8A8: ldr r5, =0x02038436 ldrb r0, [r5] ldr r1, =0x02038437 @@ -670546,17 +670546,17 @@ _0815B8A8: lsls r0, 24 mov r9, r4 cmp r0, 0 - beq _0815B8E0 + beq @0815B8E0 movs r1, 0 - b _0815B8EA + b @0815B8EA .align 2, 0 .pool -_0815B8E0: +@0815B8E0: ldrb r0, [r5] bl battle_get_per_side_status lsls r0, 24 lsrs r1, r0, 24 -_0815B8EA: +@0815B8EA: ldr r0, =0x020244d4 ldr r2, [r0] lsls r0, r1, 2 @@ -670583,7 +670583,7 @@ _0815B8EA: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _0815BA1C + beq @0815BA1C ldr r5, =0x02039f34 ldr r0, [r5] ldr r0, [r0, 0x18] @@ -670597,19 +670597,19 @@ _0815B8EA: lsls r4, 24 lsls r0, 24 cmp r4, r0 - beq _0815B99C + beq @0815B99C ldr r6, [sp, 0x4] movs r5, 0 movs r0, 0x7 mov r12, r0 movs r7, 0 -_0815B950: +@0815B950: movs r4, 0 adds r3, r7, r6 mov r1, r12 lsls r0, r1, 1 adds r2, r0, r6 -_0815B95A: +@0815B95A: ldrh r1, [r3] ldrh r0, [r2] strh r0, [r3] @@ -670618,34 +670618,34 @@ _0815B95A: subs r2, 0x2 adds r4, 0x1 cmp r4, 0x3 - ble _0815B95A + ble @0815B95A movs r2, 0x20 add r12, r2 adds r7, 0x40 adds r5, 0x1 cmp r5, 0x7 - ble _0815B950 + ble @0815B950 movs r5, 0 movs r0, 0x80 lsls r0, 3 adds r3, r0, 0 -_0815B980: +@0815B980: adds r2, r5, 0x1 lsls r0, r5, 6 adds r1, r0, r6 movs r4, 0x7 -_0815B988: +@0815B988: ldrh r0, [r1] eors r0, r3 strh r0, [r1] adds r1, 0x2 subs r4, 0x1 cmp r4, 0 - bge _0815B988 + bge @0815B988 adds r5, r2, 0 cmp r5, 0x7 - ble _0815B980 -_0815B99C: + ble @0815B980 +@0815B99C: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] @@ -670653,7 +670653,7 @@ _0815B99C: bl sub_80DB2A8 lsls r0, 24 cmp r0, 0 - beq _0815B9EC + beq @0815B9EC ldr r3, =0x02020630 ldr r4, =0x020241e4 ldr r2, =0x02038436 @@ -670667,10 +670667,10 @@ _0815B99C: adds r1, 0x10 adds r0, r1 ldr r1, =0x082ff6c0 - b _0815BA06 + b @0815BA06 .align 2, 0 .pool -_0815B9EC: +@0815B9EC: ldr r3, =0x02020630 ldr r4, =0x020241e4 ldr r2, =0x02038436 @@ -670684,7 +670684,7 @@ _0815B9EC: adds r1, 0x10 adds r0, r1 ldr r1, =0x082ff694 -_0815BA06: +@0815BA06: str r1, [r0] ldrb r0, [r2] adds r0, r4 @@ -670695,20 +670695,20 @@ _0815BA06: adds r0, r3 movs r1, 0 bl sub_8008258 -_0815BA1C: +@0815BA1C: ldr r0, =0x03005e00 mov r1, r9 add r1, r8 lsls r1, 3 adds r1, r0 -_0815BA26: +@0815BA26: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _0815BAFC + b @0815BAFC .align 2, 0 .pool -_0815BA44: +@0815BA44: mov r1, r8 lsls r0, r1, 2 add r0, r8 @@ -670720,7 +670720,7 @@ _0815BA44: lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0815BAFC + ble @0815BAFC movs r0, 0 strh r0, [r4, 0xC] ldrh r0, [r4, 0xA] @@ -670734,13 +670734,13 @@ _0815BA44: movs r0, 0x4C bl lcd_io_set cmp r5, 0 - bne _0815BAFC -_0815BA7A: + bne @0815BAFC +@0815BA7A: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0815BAFC -_0815BA82: + b @0815BAFC +@0815BA82: movs r0, 0x4C movs r1, 0 bl lcd_io_set @@ -670750,31 +670750,31 @@ _0815BA82: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0815BAAC + bne @0815BAAC movs r0, 0x1 movs r1, 0x2 movs r2, 0 bl lcd_bg_operations - b _0815BAB6 + b @0815BAB6 .align 2, 0 .pool -_0815BAAC: +@0815BAAC: movs r0, 0x2 movs r1, 0x2 movs r2, 0 bl lcd_bg_operations -_0815BAB6: +@0815BAB6: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0815BAF6 + bne @0815BAF6 ldr r4, =0x02038436 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0815BAF6 + bne @0815BAF6 ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 @@ -670784,7 +670784,7 @@ _0815BAB6: movs r6, 0x1C ldrsh r0, [r1, r6] cmp r0, 0 - bne _0815BAF6 + bne @0815BAF6 ldrb r0, [r4] ldr r1, =0x020244d0 ldr r1, [r1] @@ -670793,10 +670793,10 @@ _0815BAB6: adds r1, r2 ldrh r1, [r1, 0x2] bl sub_805EE54 -_0815BAF6: +@0815BAF6: mov r0, r8 bl move_anim_task_del -_0815BAFC: +@0815BAFC: add sp, 0x10 pop {r3,r4} mov r8, r3 @@ -670809,7 +670809,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 @@ -670838,7 +670838,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 @@ -670859,7 +670859,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 @@ -670873,24 +670873,24 @@ sub_815BB84: @ 815BB84 ldrsh r0, [r0, r2] adds r2, r1, 0 cmp r0, 0x4 - bls _0815BBA2 - b _0815BDF2 -_0815BBA2: + bls @0815BBA2 + b @0815BDF2 +@0815BBA2: lsls r0, 2 - ldr r1, =_0815BBB4 + ldr r1, =@0815BBB4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0815BBB4: - .4byte _0815BBC8 - .4byte _0815BCB8 - .4byte _0815BD08 - .4byte _0815BD72 - .4byte _0815BDA6 -_0815BBC8: +@0815BBB4: + .4byte @0815BBC8 + .4byte @0815BCB8 + .4byte @0815BD08 + .4byte @0815BD72 + .4byte @0815BDA6 +@0815BBC8: ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set @@ -670909,12 +670909,12 @@ _0815BBC8: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0815BC02 + bne @0815BC02 movs r0, 0x1 movs r1, 0x3 movs r2, 0x1 bl lcd_bg_operations -_0815BC02: +@0815BC02: mov r0, sp bl sub_80A6B30 ldr r1, =0x08c2a6ec @@ -670924,31 +670924,31 @@ _0815BC02: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _0815BC34 + beq @0815BC34 ldr r1, =0x02022e18 ldr r3, =0x0000ffc8 - b _0815BC5C + b @0815BC5C .align 2, 0 .pool -_0815BC34: +@0815BC34: ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0815BC58 + beq @0815BC58 ldr r1, =0x02022e18 ldr r2, =0x0000ff79 adds r0, r2, 0 - b _0815BC5E + b @0815BC5E .align 2, 0 .pool -_0815BC58: +@0815BC58: ldr r1, =0x02022e18 ldr r3, =0x0000fff6 -_0815BC5C: +@0815BC5C: adds r0, r3, 0 -_0815BC5E: +@0815BC5E: strh r0, [r1] ldr r1, =0x02022e1a movs r0, 0 @@ -670978,10 +670978,10 @@ _0815BC5E: strh r0, [r1, 0x1E] ldrh r0, [r1, 0x8] adds r0, 0x1 - b _0815BD8E + b @0815BD8E .align 2, 0 .pool -_0815BCB8: +@0815BCB8: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -670991,9 +670991,9 @@ _0815BCB8: strh r1, [r4, 0x10] lsls r0, 16 cmp r0, 0 - bgt _0815BCCE - b _0815BDF2 -_0815BCCE: + bgt @0815BCCE + b @0815BDF2 +@0815BCCE: movs r0, 0 strh r0, [r4, 0x10] ldrh r0, [r4, 0xA] @@ -671002,10 +671002,10 @@ _0815BCCE: lsls r0, 16 asrs r0, 16 cmp r0, 0xC - ble _0815BCE4 + ble @0815BCE4 movs r0, 0xC strh r0, [r4, 0xA] -_0815BCE4: +@0815BCE4: ldrh r0, [r4, 0xA] movs r1, 0x10 subs r1, r0 @@ -671018,12 +671018,12 @@ _0815BCE4: movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0xC - bne _0815BDF2 + bne @0815BDF2 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0815BDF2 -_0815BD08: + b @0815BDF2 +@0815BD08: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -671033,10 +671033,10 @@ _0815BD08: strh r0, [r4, 0xA] lsls r0, 16 cmp r0, 0 - bge _0815BD20 + bge @0815BD20 movs r0, 0 strh r0, [r4, 0xA] -_0815BD20: +@0815BD20: ldrh r0, [r4, 0xA] movs r1, 0x10 subs r1, r0 @@ -671049,7 +671049,7 @@ _0815BD20: movs r2, 0xA ldrsh r0, [r4, r2] cmp r0, 0 - bne _0815BDF2 + bne @0815BDF2 ldr r2, =0x02022e18 ldr r1, =0x085ce460 movs r3, 0xC @@ -671067,16 +671067,16 @@ _0815BD20: lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne _0815BD6C + bne @0815BD6C strh r0, [r4, 0x8] - b _0815BDF2 + b @0815BDF2 .align 2, 0 .pool -_0815BD6C: +@0815BD6C: movs r0, 0x3 strh r0, [r4, 0x8] - b _0815BDF2 -_0815BD72: + b @0815BDF2 +@0815BD72: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -671087,11 +671087,11 @@ _0815BD72: lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne _0815BDF2 + bne @0815BDF2 movs r0, 0 strh r0, [r1, 0xE] movs r0, 0x1 -_0815BD8E: +@0815BD8E: strh r0, [r1, 0x8] movs r0, 0x40 negs r0, r0 @@ -671101,8 +671101,8 @@ _0815BD8E: asrs r1, 24 movs r0, 0xE4 bl audio_play_and_stuff - b _0815BDF2 -_0815BDA6: + b @0815BDF2 +@0815BDA6: mov r0, sp bl sub_80A6B30 mov r0, sp @@ -671111,12 +671111,12 @@ _0815BDA6: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0815BDC8 + bne @0815BDC8 movs r0, 0x1 movs r1, 0x3 movs r2, 0 bl lcd_bg_operations -_0815BDC8: +@0815BDC8: movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 @@ -671134,7 +671134,7 @@ _0815BDC8: bl lcd_io_set adds r0, r4, 0 bl move_anim_task_del -_0815BDF2: +@0815BDF2: add sp, 0x10 pop {r4} pop {r0} @@ -671144,7 +671144,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 @@ -671160,12 +671160,12 @@ sub_815BE04: @ 815BE04 lsrs r5, r1, 16 adds r1, r5, 0 cmp r1, 0x1F - ble _0815BE2E + ble @0815BE2E movs r0, 0x20 subs r0, r1 lsls r0, 16 lsrs r5, r0, 16 -_0815BE2E: +@0815BE2E: ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 @@ -671289,7 +671289,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] @@ -671306,13 +671306,13 @@ sub_815BF44: @ 815BF44 movs r2, 0x36 ldrsh r0, [r3, r2] cmp r0, 0 - bne _0815BF92 + bne @0815BF92 lsls r0, r1, 16 asrs r0, 16 movs r1, 0x8 negs r1, r1 cmp r0, r1 - bge _0815BF92 + bge @0815BF92 ldr r2, =0x02020630 movs r0, 0x3A ldrsh r1, [r3, r0] @@ -671329,17 +671329,17 @@ sub_815BF44: @ 815BF44 ldrh r0, [r3, 0x36] adds r0, 0x1 strh r0, [r3, 0x36] -_0815BF92: +@0815BF92: movs r1, 0x36 ldrsh r0, [r3, r1] cmp r0, 0x1 - bne _0815BFC6 + bne @0815BFC6 movs r2, 0x26 ldrsh r1, [r3, r2] movs r0, 0x10 negs r0, r0 cmp r1, r0 - bge _0815BFC6 + bge @0815BFC6 ldr r2, =0x02020630 movs r0, 0x3C ldrsh r1, [r3, r0] @@ -671356,7 +671356,7 @@ _0815BF92: ldrh r0, [r3, 0x36] adds r0, 0x1 strh r0, [r3, 0x36] -_0815BFC6: +@0815BFC6: ldrh r0, [r3, 0x30] subs r0, 0x1 strh r0, [r3, 0x30] @@ -671365,7 +671365,7 @@ _0815BFC6: movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _0815BFE8 + bne @0815BFE8 adds r2, r3, 0 adds r2, 0x3E ldrb r0, [r2] @@ -671374,7 +671374,7 @@ _0815BFC6: strb r0, [r2] ldr r0, =sub_815BFF4 + 1 str r0, [r3, 0x1C] -_0815BFE8: +@0815BFE8: pop {r0} bx r0 .align 2, 0 @@ -671382,7 +671382,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 @@ -671397,7 +671397,7 @@ sub_815BFF4: @ 815BFF4 ldr r2, [r0] ldr r0, =nullsub_12 + 1 cmp r2, r0 - bne _0815C040 + bne @0815C040 movs r1, 0x3C ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -671406,7 +671406,7 @@ sub_815BFF4: @ 815BFF4 adds r1, r6 ldr r0, [r1] cmp r0, r2 - bne _0815C040 + bne @0815C040 adds r0, r3, r5 bl obj_delete_and_free_tiles movs r0, 0x3C @@ -671418,7 +671418,7 @@ sub_815BFF4: @ 815BFF4 bl obj_delete_and_free_tiles adds r0, r4, 0 bl move_anim_8072740 -_0815C040: +@0815C040: pop {r4-r6} pop {r0} bx r0 @@ -671427,7 +671427,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 @@ -671437,7 +671437,7 @@ sub_815C050: @ 815C050 movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne _0815C09C + bne @0815C09C ldrh r2, [r3, 0x32] ldrh r1, [r3, 0x34] adds r2, r1 @@ -671457,7 +671457,7 @@ sub_815C050: @ 815C050 movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _0815C09C + bne @0815C09C mov r1, r12 ldrb r0, [r1] movs r1, 0x4 @@ -671466,7 +671466,7 @@ sub_815C050: @ 815C050 strb r0, [r1] ldr r0, =nullsub_12 + 1 str r0, [r3, 0x1C] -_0815C09C: +@0815C09C: pop {r0} bx r0 .align 2, 0 @@ -671474,7 +671474,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 @@ -671488,25 +671488,25 @@ sub_815C0A4: @ 815C0A4 ldrsh r0, [r0, r2] adds r4, r1, 0 cmp r0, 0x5 - bls _0815C0C2 - b _0815C396 -_0815C0C2: + bls @0815C0C2 + b @0815C396 +@0815C0C2: lsls r0, 2 - ldr r1, =_0815C0D4 + ldr r1, =@0815C0D4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0815C0D4: - .4byte _0815C0EC - .4byte _0815C224 - .4byte _0815C2AC - .4byte _0815C2E2 - .4byte _0815C310 - .4byte _0815C34A -_0815C0EC: +@0815C0D4: + .4byte @0815C0EC + .4byte @0815C224 + .4byte @0815C2AC + .4byte @0815C2E2 + .4byte @0815C310 + .4byte @0815C34A +@0815C0EC: ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set @@ -671524,12 +671524,12 @@ _0815C0EC: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0815C124 + bne @0815C124 movs r0, 0x1 movs r1, 0x3 movs r2, 0x1 bl lcd_bg_operations -_0815C124: +@0815C124: mov r0, sp bl sub_80A6B30 ldr r1, =0x08c2a6ec @@ -671539,14 +671539,14 @@ _0815C124: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _0815C15C + beq @0815C15C ldr r1, =0x02022e18 ldr r3, =0x0000ffc8 adds r0, r3, 0 - b _0815C1CA + b @0815C1CA .align 2, 0 .pool -_0815C15C: +@0815C15C: ldr r0, =0x02038437 ldrb r0, [r0] bl battle_get_per_side_status @@ -671556,51 +671556,51 @@ _0815C15C: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0815C1B4 + bne @0815C1B4 cmp r4, 0x1 - bne _0815C180 + bne @0815C180 ldr r1, =0x02022e18 ldr r2, =0x0000ff65 adds r0, r2, 0 strh r0, [r1] -_0815C180: +@0815C180: cmp r4, 0x3 - bne _0815C18C + bne @0815C18C ldr r1, =0x02022e18 ldr r3, =0x0000ff8d adds r0, r3, 0 strh r0, [r1] -_0815C18C: +@0815C18C: cmp r4, 0 - bne _0815C196 + bne @0815C196 ldr r1, =0x02022e18 movs r0, 0xE strh r0, [r1] -_0815C196: +@0815C196: cmp r4, 0x2 - bne _0815C1CC + bne @0815C1CC ldr r1, =0x02022e18 ldr r2, =0x0000ffec - b _0815C1C8 + b @0815C1C8 .align 2, 0 .pool -_0815C1B4: +@0815C1B4: cmp r4, 0x1 - bne _0815C1C0 + bne @0815C1C0 ldr r1, =0x02022e18 ldr r3, =0x0000ff79 adds r0, r3, 0 strh r0, [r1] -_0815C1C0: +@0815C1C0: cmp r4, 0 - bne _0815C1CC + bne @0815C1CC ldr r1, =0x02022e18 ldr r2, =0x0000fff6 -_0815C1C8: +@0815C1C8: adds r0, r2, 0 -_0815C1CA: +@0815C1CA: strh r0, [r1] -_0815C1CC: +@0815C1CC: ldr r1, =0x02022e1a movs r0, 0 strh r0, [r1] @@ -671627,10 +671627,10 @@ _0815C1CC: ldr r0, =0x02022e1a ldrh r0, [r0] strh r0, [r1, 0x1E] - b _0815C2A4 + b @0815C2A4 .align 2, 0 .pool -_0815C224: +@0815C224: ldr r1, =0x03005e00 lsls r4, r6, 2 adds r0, r4, r6 @@ -671644,7 +671644,7 @@ _0815C224: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0815C268 + bne @0815C268 ldr r2, =0x02022e18 ldr r1, =0x085ce4a4 movs r3, 0xC @@ -671655,10 +671655,10 @@ _0815C224: asrs r0, 24 ldrh r5, [r5, 0x1C] adds r0, r5 - b _0815C27A + b @0815C27A .align 2, 0 .pool -_0815C268: +@0815C268: ldr r2, =0x02022e18 ldr r1, =0x085ce4a4 movs r3, 0xC @@ -671668,7 +671668,7 @@ _0815C268: ldrsb r1, [r0, r1] ldrh r0, [r5, 0x1C] subs r0, r1 -_0815C27A: +@0815C27A: strh r0, [r2] ldr r0, =0x03005e00 adds r1, r4, r6 @@ -671680,17 +671680,17 @@ _0815C27A: lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - bne _0815C2A4 + bne @0815C2A4 strh r0, [r1, 0x8] - b _0815C396 + b @0815C396 .align 2, 0 .pool -_0815C2A4: +@0815C2A4: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _0815C396 -_0815C2AC: + b @0815C396 +@0815C2AC: lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -671701,10 +671701,10 @@ _0815C2AC: lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bgt _0815C2C6 + bgt @0815C2C6 movs r0, 0x5 strh r0, [r4, 0xA] -_0815C2C6: +@0815C2C6: ldrh r1, [r4, 0xA] lsls r1, 8 movs r0, 0x3 @@ -671716,9 +671716,9 @@ _0815C2C6: movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0x5 - bne _0815C396 - b _0815C302 -_0815C2E2: + bne @0815C396 + b @0815C302 +@0815C2E2: lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -671734,15 +671734,15 @@ _0815C2E2: adds r0, r2 ldrb r0, [r0] cmp r1, r0 - ble _0815C396 -_0815C302: + ble @0815C396 +@0815C302: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0815C396 + b @0815C396 .align 2, 0 .pool -_0815C310: +@0815C310: lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -671753,10 +671753,10 @@ _0815C310: lsls r0, 16 asrs r0, 16 cmp r0, 0xD - ble _0815C32A + ble @0815C32A movs r0, 0xD strh r0, [r4, 0xA] -_0815C32A: +@0815C32A: ldrh r1, [r4, 0xA] lsls r1, 8 movs r0, 0x3 @@ -671768,11 +671768,11 @@ _0815C32A: movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0xD - bne _0815C396 + bne @0815C396 movs r0, 0x1 strh r0, [r4, 0x8] - b _0815C396 -_0815C34A: + b @0815C396 +@0815C34A: mov r0, sp bl sub_80A6B30 mov r0, sp @@ -671781,12 +671781,12 @@ _0815C34A: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0815C36C + bne @0815C36C movs r0, 0x1 movs r1, 0x3 movs r2, 0 bl lcd_bg_operations -_0815C36C: +@0815C36C: movs r0, 0x1 movs r1, 0x4 movs r2, 0x1 @@ -671804,7 +671804,7 @@ _0815C36C: bl lcd_io_set adds r0, r6, 0 bl move_anim_task_del -_0815C396: +@0815C396: add sp, 0x10 pop {r4-r6} pop {r0} @@ -671814,7 +671814,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 @@ -671827,7 +671827,7 @@ sub_815C3A8: @ 815C3A8 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0815C3E8 + bne @0815C3E8 movs r0, 0 bl obj_id_for_side_relative_to_move adds r1, r0, 0 @@ -671839,44 +671839,44 @@ sub_815C3A8: @ 815C3A8 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0815C3FA + b @0815C3FA .align 2, 0 .pool -_0815C3E8: +@0815C3E8: adds r0, r4, 0 bl sub_80A7D34 lsls r0, 24 cmp r0, 0 - bne _0815C3FA + bne @0815C3FA adds r0, r5, 0 bl move_anim_task_del -_0815C3FA: +@0815C3FA: pop {r4,r5} pop {r0} bx r0 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] movs r2, 0x2E ldrsh r1, [r4, r2] cmp r1, 0 - bne _0815C41E + bne @0815C41E adds r0, r4, 0 movs r1, 0 bl sub_80A69CC ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _0815C472 -_0815C41E: + b @0815C472 +@0815C41E: adds r0, 0x1 strh r0, [r4, 0x2E] cmp r1, 0x14 - ble _0815C472 + ble @0815C472 ldrh r0, [r4, 0x30] adds r0, 0xA0 strh r0, [r4, 0x30] @@ -671888,19 +671888,19 @@ _0815C41E: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0815C450 + beq @0815C450 ldrh r0, [r4, 0x30] lsls r0, 16 asrs r0, 24 negs r0, r0 - b _0815C456 + b @0815C456 .align 2, 0 .pool -_0815C450: +@0815C450: ldrh r0, [r4, 0x30] lsls r0, 16 asrs r0, 24 -_0815C456: +@0815C456: strh r0, [r4, 0x24] ldrh r0, [r4, 0x32] lsls r0, 16 @@ -671911,17 +671911,17 @@ _0815C456: lsls r0, 16 asrs r0, 16 cmp r0, 0x40 - ble _0815C472 + ble @0815C472 adds r0, r4, 0 bl move_anim_8072740 -_0815C472: +@0815C472: pop {r4} pop {r0} bx r0 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 @@ -671934,27 +671934,27 @@ sub_815C478: @ 815C478 movs r1, 0x2 ldrsh r0, [r5, r1] cmp r0, 0 - bne _0815C4A4 + bne @0815C4A4 adds r0, r2, 0 bl move_anim_task_del - b _0815C538 + b @0815C538 .align 2, 0 .pool -_0815C4A4: +@0815C4A4: movs r1, 0x4 ldrsh r0, [r5, r1] cmp r0, 0 - bge _0815C4B0 + bge @0815C4B0 movs r0, 0 strh r0, [r5, 0x4] -_0815C4B0: +@0815C4B0: movs r1, 0x4 ldrsh r0, [r5, r1] cmp r0, 0x2 - ble _0815C4BC + ble @0815C4BC movs r0, 0x2 strh r0, [r5, 0x4] -_0815C4BC: +@0815C4BC: movs r0, 0 strh r0, [r4, 0x8] strh r0, [r4, 0xA] @@ -671986,20 +671986,20 @@ _0815C4BC: movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0 - bne _0815C508 + bne @0815C508 ldr r0, =0x02038436 - b _0815C50A + b @0815C50A .align 2, 0 .pool -_0815C508: +@0815C508: ldr r0, =0x02038437 -_0815C50A: +@0815C50A: ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0815C528 + bne @0815C528 movs r1, 0x10 ldrsh r0, [r4, r1] negs r0, r0 @@ -672008,7 +672008,7 @@ _0815C50A: ldrsh r0, [r4, r1] negs r0, r0 strh r0, [r4, 0x12] -_0815C528: +@0815C528: ldrh r0, [r4, 0x26] lsls r0, 24 lsrs r0, 24 @@ -672016,7 +672016,7 @@ _0815C528: bl sub_80A7270 ldr r0, =sub_815C548 + 1 str r0, [r4] -_0815C538: +@0815C538: pop {r4,r5} pop {r0} bx r0 @@ -672025,7 +672025,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 @@ -672037,23 +672037,23 @@ sub_815C548: @ 815C548 movs r0, 0x8 ldrsh r6, [r4, r0] cmp r6, 0x1 - beq _0815C5D0 + beq @0815C5D0 cmp r6, 0x1 - bgt _0815C570 + bgt @0815C570 cmp r6, 0 - beq _0815C57C - b _0815C6A8 + beq @0815C57C + b @0815C6A8 .align 2, 0 .pool -_0815C570: +@0815C570: cmp r6, 0x2 - beq _0815C628 + beq @0815C628 cmp r6, 0x3 - bne _0815C57A - b _0815C698 -_0815C57A: - b _0815C6A8 -_0815C57C: + bne @0815C57A + b @0815C698 +@0815C57A: + b @0815C6A8 +@0815C57C: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -672089,12 +672089,12 @@ _0815C57C: movs r2, 0xE ldrsh r1, [r4, r2] cmp r0, r1 - blt _0815C6A8 + blt @0815C6A8 strh r6, [r4, 0xA] - b _0815C690 + b @0815C690 .align 2, 0 .pool -_0815C5D0: +@0815C5D0: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -672131,13 +672131,13 @@ _0815C5D0: ldrsh r0, [r4, r2] lsls r0, 1 cmp r1, r0 - blt _0815C6A8 + blt @0815C6A8 movs r0, 0 strh r0, [r4, 0xA] - b _0815C690 + b @0815C690 .align 2, 0 .pool -_0815C628: +@0815C628: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -672174,39 +672174,39 @@ _0815C628: movs r2, 0xE ldrsh r1, [r4, r2] cmp r0, r1 - blt _0815C6A8 + blt @0815C6A8 ldrh r1, [r4, 0x14] movs r2, 0x14 ldrsh r0, [r4, r2] cmp r0, 0 - beq _0815C690 + beq @0815C690 subs r0, r1, 0x1 strh r0, [r4, 0x14] strh r5, [r4, 0xA] strh r5, [r4, 0x8] - b _0815C6A8 + b @0815C6A8 .align 2, 0 .pool -_0815C690: +@0815C690: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0815C6A8 -_0815C698: + b @0815C6A8 +@0815C698: ldrh r0, [r4, 0x26] lsls r0, 24 lsrs r0, 24 bl sub_80A7344 adds r0, r5, 0 bl move_anim_task_del -_0815C6A8: +@0815C6A8: pop {r4-r6} pop {r0} bx r0 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 @@ -672215,20 +672215,20 @@ sub_815C6B0: @ 815C6B0 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _0815C6D4 + bne @0815C6D4 strh r0, [r4, 0x20] ldr r1, =0x0203841e ldrh r0, [r1] - b _0815C6DE + b @0815C6DE .align 2, 0 .pool -_0815C6D4: +@0815C6D4: movs r0, 0xF0 strh r0, [r4, 0x20] ldr r1, =0x0203841e ldrh r0, [r1] subs r0, 0x1E -_0815C6DE: +@0815C6DE: strh r0, [r4, 0x22] ldrh r0, [r1, 0x4] strh r0, [r4, 0x32] @@ -672245,7 +672245,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] @@ -672256,7 +672256,7 @@ sub_815C700: @ 815C700 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0815C744 + bne @0815C744 ldrh r1, [r4, 0x20] adds r1, 0x5 strh r1, [r4, 0x20] @@ -672266,19 +672266,19 @@ sub_815C700: @ 815C700 lsls r1, 16 asrs r1, 16 cmp r1, 0xF0 - ble _0815C732 + ble @0815C732 adds r0, r4, 0 bl move_anim_8072740 -_0815C732: +@0815C732: ldrh r1, [r4, 0x2E] movs r0, 0xFF ands r0, r1 movs r1, 0x10 bl sine - b _0815C768 + b @0815C768 .align 2, 0 .pool -_0815C744: +@0815C744: ldrh r1, [r4, 0x20] subs r1, 0x5 strh r1, [r4, 0x20] @@ -672287,16 +672287,16 @@ _0815C744: strh r0, [r4, 0x22] lsls r1, 16 cmp r1, 0 - bge _0815C75C + bge @0815C75C adds r0, r4, 0 bl move_anim_8072740 -_0815C75C: +@0815C75C: ldrh r1, [r4, 0x2E] movs r0, 0xFF ands r0, r1 movs r1, 0x10 bl cosine -_0815C768: +@0815C768: strh r0, [r4, 0x26] pop {r4} pop {r0} @@ -672304,7 +672304,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 @@ -672343,7 +672343,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 @@ -672359,20 +672359,20 @@ sub_815C7C4: @ 815C7C4 ldrsh r0, [r7, r1] mov r8, r0 cmp r0, 0x1 - beq _0815C860 + beq @0815C860 cmp r0, 0x1 - bgt _0815C7F4 + bgt @0815C7F4 cmp r0, 0 - beq _0815C7FC - b _0815C8DA + beq @0815C7FC + b @0815C8DA .align 2, 0 .pool -_0815C7F4: +@0815C7F4: mov r2, r8 cmp r2, 0x2 - beq _0815C8C8 - b _0815C8DA -_0815C7FC: + beq @0815C8C8 + b @0815C8DA +@0815C7FC: movs r3, 0x80 lsls r3, 2 adds r0, r3, 0 @@ -672386,7 +672386,7 @@ _0815C7FC: movs r3, 0x24 ldrsh r1, [r7, r3] cmp r0, r1 - blt _0815C8DA + blt @0815C8DA mov r0, r8 subs r5, r0, r2 lsls r5, 16 @@ -672409,20 +672409,20 @@ _0815C7FC: movs r1, 0x1 ands r4, r1 cmp r4, 0 - bne _0815C854 + bne @0815C854 lsls r0, 16 asrs r0, 16 mov r2, r8 subs r0, r2, r0 - b _0815C8B2 -_0815C854: + b @0815C8B2 +@0815C854: lsls r0, 16 asrs r0, 16 mov r3, r8 subs r0, r3 strh r0, [r7, 0xC] - b _0815C8DA -_0815C860: + b @0815C8DA +@0815C860: ldr r1, =0xfffffe00 adds r0, r1, 0 ldrh r2, [r7, 0xC] @@ -672433,7 +672433,7 @@ _0815C860: movs r2, 0x24 ldrsh r6, [r7, r2] cmn r0, r6 - bgt _0815C8DA + bgt @0815C8DA ldrh r3, [r7, 0x24] mov r9, r3 mov r0, r9 @@ -672457,33 +672457,33 @@ _0815C860: lsls r0, r1, 16 asrs r1, r0, 16 cmp r1, 0 - bne _0815C8BC + bne @0815C8BC lsls r0, r2, 16 asrs r0, 16 mov r2, r9 subs r0, r2 -_0815C8B2: +@0815C8B2: strh r0, [r7, 0xC] strh r1, [r7, 0x8] - b _0815C8DA + b @0815C8DA .align 2, 0 .pool -_0815C8BC: +@0815C8BC: lsls r0, r2, 16 asrs r0, 16 mov r3, r9 subs r0, r3, r0 strh r0, [r7, 0xC] - b _0815C8DA -_0815C8C8: + b @0815C8DA +@0815C8C8: ldrh r0, [r7, 0x26] lsls r0, 24 lsrs r0, 24 bl sub_80A7344 adds r0, r4, 0 bl move_anim_task_del - b _0815C950 -_0815C8DA: + b @0815C950 +@0815C8DA: ldrh r0, [r7, 0x26] lsls r0, 24 lsrs r0, 24 @@ -672506,9 +672506,9 @@ _0815C8DA: movs r2, 0xC ldrsh r0, [r7, r2] cmp r0, 0 - bge _0815C90E + bge @0815C90E adds r0, 0x3F -_0815C90E: +@0815C90E: asrs r0, 6 negs r0, r0 strh r0, [r1, 0x24] @@ -672518,12 +672518,12 @@ _0815C90E: lsls r0, 16 asrs r0, 16 cmp r0, 0x8 - ble _0815C950 + ble @0815C950 ldrh r1, [r7, 0x20] movs r3, 0x20 ldrsh r0, [r7, r3] cmp r0, 0 - beq _0815C94C + beq @0815C94C subs r0, r1, 0x1 strh r0, [r7, 0x20] ldrh r0, [r7, 0x24] @@ -672533,16 +672533,16 @@ _0815C90E: lsls r0, 16 asrs r0, 16 cmp r0, 0xF - bgt _0815C950 + bgt @0815C950 movs r0, 0x10 strh r0, [r7, 0x24] - b _0815C950 + b @0815C950 .align 2, 0 .pool -_0815C94C: +@0815C94C: movs r0, 0x2 strh r0, [r7, 0x8] -_0815C950: +@0815C950: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -672552,18 +672552,18 @@ _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 ldrsh r0, [r5, r1] cmp r0, 0 - bne _0815C9BC + bne @0815C9BC ldr r6, =0x0203841e movs r2, 0x4 ldrsh r0, [r6, r2] cmp r0, 0 - bne _0815C990 + bne @0815C990 ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 @@ -672577,7 +672577,7 @@ sub_815C95C: @ 815C95C lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] -_0815C990: +@0815C990: ldrh r0, [r6] ldrh r1, [r5, 0x20] adds r0, r1 @@ -672595,10 +672595,10 @@ _0815C990: ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] - b _0815CA1A + b @0815CA1A .align 2, 0 .pool -_0815C9BC: +@0815C9BC: ldrh r1, [r5, 0x30] lsls r0, r1, 16 asrs r0, 24 @@ -672613,13 +672613,13 @@ _0815C9BC: ldrsh r0, [r5, r2] adds r4, r1, 0 cmp r0, 0 - bne _0815C9FA + bne @0815C9FA movs r0, 0x26 ldrsh r1, [r5, r0] movs r2, 0x34 ldrsh r0, [r5, r2] cmn r1, r0 - ble _0815C9FA + ble @0815C9FA movs r0, 0x1 strh r0, [r5, 0x36] movs r1, 0x32 @@ -672629,7 +672629,7 @@ _0815C9BC: bl __divsi3 lsls r0, 1 strh r0, [r5, 0x32] -_0815C9FA: +@0815C9FA: adds r0, r4, 0 adds r0, 0xC0 strh r0, [r5, 0x30] @@ -672642,17 +672642,17 @@ _0815C9FA: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0815CA1A + beq @0815CA1A adds r0, r5, 0 bl move_anim_8072740 -_0815CA1A: +@0815CA1A: pop {r4-r6} pop {r0} bx r0 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} @@ -672667,20 +672667,20 @@ sub_815CA20: @ 815CA20 movs r1, 0x8 ldrsh r0, [r2, r1] cmp r0, 0 - bne _0815CB2C + bne @0815CB2C ldr r0, =0x0203841e movs r3, 0 ldrsh r1, [r0, r3] mov r8, r0 cmp r1, 0 - bne _0815CA5C + bne @0815CA5C ldr r0, =0x02038436 - b _0815CA5E + b @0815CA5E .align 2, 0 .pool -_0815CA5C: +@0815CA5C: ldr r0, =0x02038437 -_0815CA5E: +@0815CA5E: ldrb r0, [r0] strh r0, [r2, 0x1E] mov r1, r8 @@ -672701,21 +672701,21 @@ _0815CA5E: movs r3, 0x2 ldrsh r0, [r2, r3] cmp r0, 0x1 - beq _0815CAC0 + beq @0815CAC0 cmp r0, 0x1 - bgt _0815CAA0 + bgt @0815CAA0 cmp r0, 0 - beq _0815CAA8 + beq @0815CAA8 lsls r2, r5, 4 - b _0815CB08 + b @0815CB08 .align 2, 0 .pool -_0815CAA0: +@0815CAA0: cmp r0, 0x2 - beq _0815CACA + beq @0815CACA lsls r2, r5, 4 - b _0815CB08 -_0815CAA8: + b @0815CB08 +@0815CAA8: movs r2, 0xA0 lsls r2, 1 adds r0, r5, 0 @@ -672725,19 +672725,19 @@ _0815CAA8: adds r0, r5, 0 bl sub_80A7E6C lsls r2, r5, 4 - b _0815CB08 -_0815CAC0: + b @0815CB08 +@0815CAC0: movs r2, 0x98 lsls r2, 1 movs r3, 0xF0 lsls r3, 4 - b _0815CAD2 -_0815CACA: + b @0815CAD2 +@0815CACA: movs r2, 0x98 lsls r2, 1 movs r3, 0xF1 lsls r3, 8 -_0815CAD2: +@0815CAD2: adds r0, r5, 0 movs r1, 0xD0 bl obj_id_set_rotscale @@ -672746,14 +672746,14 @@ _0815CAD2: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0815CAF8 + bne @0815CAF8 ldrb r0, [r6, 0x1E] bl battle_side_get_owner lsls r0, 24 lsls r2, r5, 4 cmp r0, 0 - bne _0815CB08 -_0815CAF8: + bne @0815CB08 +@0815CAF8: ldr r0, =0x02020630 lsls r2, r5, 4 adds r1, r2, r5 @@ -672762,7 +672762,7 @@ _0815CAF8: ldrh r0, [r1, 0x26] adds r0, 0x10 strh r0, [r1, 0x26] -_0815CB08: +@0815CB08: ldr r1, =0x02020630 adds r0, r2, r5 lsls r0, 2 @@ -672776,10 +672776,10 @@ _0815CB08: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _0815CB78 + b @0815CB78 .align 2, 0 .pool -_0815CB2C: +@0815CB2C: ldrb r5, [r2, 0x1C] ldrh r0, [r2, 0xC] adds r0, 0x1 @@ -672788,7 +672788,7 @@ _0815CB2C: lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - bne _0815CB50 + bne @0815CB50 strh r4, [r2, 0xC] ldr r0, =0x02020630 lsls r1, r5, 4 @@ -672798,14 +672798,14 @@ _0815CB2C: ldrh r0, [r1, 0x24] negs r0, r0 strh r0, [r1, 0x24] -_0815CB50: +@0815CB50: ldrh r0, [r2, 0xA] adds r0, 0x1 strh r0, [r2, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0xD - bne _0815CB78 + bne @0815CB78 adds r0, r5, 0 bl sub_80A7344 ldr r1, =0x02020630 @@ -672817,7 +672817,7 @@ _0815CB50: strh r4, [r0, 0x26] adds r0, r7, 0 bl move_anim_task_del -_0815CB78: +@0815CB78: pop {r3} mov r8, r3 pop {r4-r7} @@ -672828,7 +672828,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 @@ -672858,48 +672858,48 @@ sub_815CB88: @ 815CB88 movs r0, 0x1 ands r0, r5 cmp r0, 0 - beq _0815CBE0 + beq @0815CBE0 movs r2, 0xBC lsls r2, 3 adds r0, r5, r2 - b _0815CBE8 + b @0815CBE8 .align 2, 0 .pool -_0815CBE0: +@0815CBE0: movs r3, 0xBC lsls r3, 3 adds r0, r3, 0 subs r0, r5 -_0815CBE8: +@0815CBE8: strh r0, [r4, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0815CBFA + beq @0815CBFA movs r2, 0x90 lsls r2, 3 adds r0, r1, r2 - b _0815CC02 -_0815CBFA: + b @0815CC02 +@0815CBFA: movs r3, 0x90 lsls r3, 3 adds r0, r3, 0 subs r0, r1 -_0815CC02: +@0815CC02: strh r0, [r4, 0x30] ldr r0, =0x0203841e ldrh r0, [r0] strh r0, [r4, 0x32] lsls r0, 16 cmp r0, 0 - bne _0815CC1C + bne @0815CC1C ldr r0, =0x0000fff8 - b _0815CC1E + b @0815CC1E .align 2, 0 .pool -_0815CC1C: +@0815CC1C: movs r0, 0xF8 -_0815CC1E: +@0815CC1E: strh r0, [r4, 0x20] movs r0, 0x68 strh r0, [r4, 0x22] @@ -672913,26 +672913,26 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0815CC4C + bne @0815CC4C ldrh r3, [r4, 0x2E] lsls r0, r3, 16 asrs r0, 24 ldrh r1, [r4, 0x24] adds r0, r1 - b _0815CC56 -_0815CC4C: + b @0815CC56 +@0815CC4C: ldrh r3, [r4, 0x2E] lsls r1, r3, 16 asrs r1, 24 ldrh r0, [r4, 0x24] subs r0, r1 -_0815CC56: +@0815CC56: strh r0, [r4, 0x24] ldrh r2, [r4, 0x30] lsls r1, r2, 16 @@ -672948,27 +672948,27 @@ _0815CC56: strh r1, [r4, 0x30] lsls r0, 16 cmp r0, 0 - bge _0815CC7A + bge @0815CC7A movs r0, 0 strh r0, [r4, 0x2E] -_0815CC7A: +@0815CC7A: ldrh r0, [r4, 0x34] adds r0, 0x1 strh r0, [r4, 0x34] lsls r0, 16 asrs r0, 16 cmp r0, 0x1F - bne _0815CC8E + bne @0815CC8E adds r0, r4, 0 bl move_anim_8072740 -_0815CC8E: +@0815CC8E: pop {r4} pop {r0} bx r0 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 @@ -673018,25 +673018,25 @@ 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 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _0815CD4A + beq @0815CD4A cmp r0, 0x1 - bgt _0815CD22 + bgt @0815CD22 cmp r0, 0 - beq _0815CD2C - b _0815CDAA -_0815CD22: + beq @0815CD2C + b @0815CDAA +@0815CD22: cmp r0, 0x2 - beq _0815CD60 + beq @0815CD60 cmp r0, 0x3 - beq _0815CD82 - b _0815CDAA -_0815CD2C: + beq @0815CD82 + b @0815CDAA +@0815CD2C: adds r2, r4, 0 adds r2, 0x3E ldrb r1, [r2] @@ -673050,39 +673050,39 @@ _0815CD2C: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0815CDAA - b _0815CD7A -_0815CD4A: + beq @0815CDAA + b @0815CD7A +@0815CD4A: ldrh r0, [r4, 0x2E] subs r0, 0x1 strh r0, [r4, 0x2E] lsls r0, 16 cmp r0, 0 - bne _0815CDAA + bne @0815CDAA adds r0, r4, 0 movs r1, 0x1 bl sub_80082B8 - b _0815CD7A -_0815CD60: + b @0815CD7A +@0815CD60: adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0815CDAA + beq @0815CDAA adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 strb r0, [r2] -_0815CD7A: +@0815CD7A: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] - b _0815CDAA -_0815CD82: + b @0815CDAA +@0815CD82: ldr r1, =0x00003f3f movs r0, 0x4A bl lcd_io_set @@ -673099,7 +673099,7 @@ _0815CD82: bl lcd_io_set adds r0, r4, 0 bl move_anim_8072740 -_0815CDAA: +@0815CDAA: pop {r4} pop {r0} bx r0 @@ -673108,7 +673108,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 @@ -673141,7 +673141,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 @@ -673165,31 +673165,31 @@ sub_815CDFC: @ 815CDFC strh r0, [r4, 0x30] lsls r1, r0, 16 cmp r0, 0x3F - bls _0815CE36 + bls @0815CE36 asrs r0, r1, 16 cmp r0, 0xC3 - ble _0815CE48 -_0815CE36: + ble @0815CE48 +@0815CE36: ldr r0, =0x02038436 ldrb r0, [r0] bl sub_80A82E4 subs r0, 0x1 - b _0815CE52 + b @0815CE52 .align 2, 0 .pool -_0815CE48: +@0815CE48: ldr r0, =0x02038436 ldrb r0, [r0] bl sub_80A82E4 adds r0, 0x1 -_0815CE52: +@0815CE52: adds r1, r4, 0 adds r1, 0x43 strb r0, [r1] movs r3, 0x38 ldrsh r2, [r4, r3] cmp r2, 0 - bne _0815CE98 + bne @0815CE98 movs r1, 0x80 lsls r1, 3 adds r0, r1, 0 @@ -673210,16 +673210,16 @@ _0815CE52: movs r3, 0x2E ldrsh r1, [r4, r3] cmp r0, r1 - bne _0815CEC8 + bne @0815CEC8 strh r2, [r4, 0x36] movs r0, 0x1 strh r0, [r4, 0x38] - b _0815CEC8 + b @0815CEC8 .align 2, 0 .pool -_0815CE98: +@0815CE98: cmp r2, 0x1 - bne _0815CEC8 + bne @0815CEC8 ldr r1, =0xfffffc00 adds r0, r1, 0 ldrh r2, [r4, 0x32] @@ -673238,10 +673238,10 @@ _0815CE98: movs r2, 0x2E ldrsh r1, [r4, r2] cmp r0, r1 - bne _0815CEC8 + bne @0815CEC8 adds r0, r4, 0 bl move_anim_8072740 -_0815CEC8: +@0815CEC8: pop {r4} pop {r0} bx r0 @@ -673250,7 +673250,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 @@ -673265,7 +673265,7 @@ sub_815CED8: @ 815CED8 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _0815CF18 + beq @0815CF18 movs r0, 0x1 str r0, [sp, 0x1C] ldr r0, =0x02039f34 @@ -673277,16 +673277,16 @@ sub_815CED8: @ 815CED8 mov r8, r2 ldrh r6, [r0, 0x2] movs r3, 0x14 - b _0815D058 + b @0815D058 .align 2, 0 .pool -_0815CF18: +@0815CF18: ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0815CFC4 + beq @0815CFC4 movs r0, 0 str r0, [sp, 0x1C] ldr r6, =0x0202406e @@ -673319,22 +673319,22 @@ _0815CF18: adds r1, r0, r1 ldrh r0, [r1, 0x2] cmp r0, 0 - bne _0815CFBC + bne @0815CFBC adds r0, r2, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0815CF9C + bne @0815CF9C ldrb r0, [r4] lsls r0, 1 adds r0, r6 ldrh r0, [r0] muls r0, r5 adds r0, r7 - b _0815CFAA + b @0815CFAA .align 2, 0 .pool -_0815CF9C: +@0815CF9C: ldrb r0, [r4] lsls r0, 1 adds r0, r6 @@ -673342,21 +673342,21 @@ _0815CF9C: muls r0, r5 ldr r1, =0x02024744 adds r0, r1 -_0815CFAA: +@0815CFAA: movs r1, 0xB bl pokemon_getattr lsls r0, 16 lsrs r6, r0, 16 - b _0815CFBE + b @0815CFBE .align 2, 0 .pool -_0815CFBC: +@0815CFBC: ldrh r6, [r1, 0x2] -_0815CFBE: +@0815CFBE: movs r1, 0x14 mov r10, r1 - b _0815D05A -_0815CFC4: + b @0815D05A +@0815CFC4: movs r2, 0x1 str r2, [sp, 0x1C] ldr r6, =0x0202406e @@ -673389,12 +673389,12 @@ _0815CFC4: adds r1, r0, r1 ldrh r0, [r1, 0x2] cmp r0, 0 - bne _0815D054 + bne @0815D054 adds r0, r2, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0815D03C + bne @0815D03C ldrb r0, [r4] lsls r0, 1 adds r0, r6 @@ -673402,29 +673402,29 @@ _0815CFC4: muls r0, r5 ldr r1, =0x020244ec adds r0, r1 - b _0815D048 + b @0815D048 .align 2, 0 .pool -_0815D03C: +@0815D03C: ldrb r0, [r4] lsls r0, 1 adds r0, r6 ldrh r0, [r0] muls r0, r5 adds r0, r7 -_0815D048: +@0815D048: movs r1, 0xB bl pokemon_getattr lsls r0, 16 lsrs r6, r0, 16 - b _0815D056 -_0815D054: + b @0815D056 +@0815D054: ldrh r6, [r1, 0x2] -_0815D056: +@0815D056: ldr r3, =0x0000ffec -_0815D058: +@0815D058: mov r10, r3 -_0815D05A: +@0815D05A: ldr r0, =0x02038436 ldrb r0, [r0] bl sub_80A8328 @@ -673540,7 +673540,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 @@ -673555,7 +673555,7 @@ sub_815D160: @ 815D160 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0815D1AE + ble @0815D1AE movs r0, 0 strh r0, [r4, 0x1C] ldrh r1, [r4, 0xA] @@ -673572,14 +673572,14 @@ sub_815D160: @ 815D160 movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0xA - bne _0815D1AE + bne @0815D1AE movs r0, 0x80 lsls r0, 1 strh r0, [r4, 0x1C] strh r0, [r4, 0x1E] ldr r0, =sub_815D1BC + 1 str r0, [r4] -_0815D1AE: +@0815D1AE: pop {r4} pop {r0} bx r0 @@ -673588,7 +673588,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 @@ -673634,14 +673634,14 @@ sub_815D1BC: @ 815D1BC lsls r0, 16 asrs r0, 16 cmp r0, 0x9 - bne _0815D22A + bne @0815D22A adds r0, r6, 0 bl sub_80A749C adds r0, r6, 0 bl sub_80A8610 ldr r0, =sub_80A6814 + 1 str r0, [r5] -_0815D22A: +@0815D22A: add sp, 0x4 pop {r4-r6} pop {r0} @@ -673651,7 +673651,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 @@ -673665,14 +673665,14 @@ sub_815D240: @ 815D240 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _0815D26C + bne @0815D26C ldr r0, =0x02038436 - b _0815D26E + b @0815D26E .align 2, 0 .pool -_0815D26C: +@0815D26C: ldr r0, =0x02038437 -_0815D26E: +@0815D26E: ldrb r5, [r0] movs r6, 0 strh r6, [r4, 0x8] @@ -673692,12 +673692,12 @@ _0815D26E: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0815D2A0 + bne @0815D2A0 movs r1, 0x18 ldrsh r0, [r4, r1] negs r0, r0 strh r0, [r4, 0x18] -_0815D2A0: +@0815D2A0: adds r0, r5, 0 bl sub_80A6190 lsls r0, 24 @@ -673705,9 +673705,9 @@ _0815D2A0: subs r0, 0x22 strh r0, [r4, 0x22] cmp r0, 0 - bge _0815D2B4 + bge @0815D2B4 strh r6, [r4, 0x22] -_0815D2B4: +@0815D2B4: ldrh r0, [r4, 0x22] adds r0, 0x42 strh r0, [r4, 0x24] @@ -673722,7 +673722,7 @@ _0815D2B4: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0815D304 + bne @0815D304 ldr r0, =0x04000014 str r0, [sp] ldr r1, =0x00003f42 @@ -673731,10 +673731,10 @@ _0815D2B4: ldr r0, =0x02022e18 ldrh r5, [r0] ldr r0, =0x02022e1a - b _0815D316 + b @0815D316 .align 2, 0 .pool -_0815D304: +@0815D304: ldr r0, =0x04000018 str r0, [sp] ldr r1, =0x00003f44 @@ -673743,7 +673743,7 @@ _0815D304: ldr r0, =0x02022e1c ldrh r5, [r0] ldr r0, =0x02022e1e -_0815D316: +@0815D316: ldrh r3, [r0] movs r7, 0 movs r2, 0 @@ -673752,7 +673752,7 @@ _0815D316: lsls r0, 3 adds r0, r6 mov r12, r0 -_0815D326: +@0815D326: lsls r2, 16 asrs r2, 16 lsls r1, r2, 1 @@ -673776,7 +673776,7 @@ _0815D326: lsrs r7, r0, 16 asrs r0, 16 cmp r0, 0x9F - ble _0815D326 + ble @0815D326 ldr r0, =0xa6600001 str r0, [sp, 0x4] mov r1, sp @@ -673800,7 +673800,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 @@ -673819,46 +673819,46 @@ sub_815D398: @ 815D398 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0815D3D8 + bne @0815D3D8 ldr r0, =0x02022e18 ldrh r0, [r0] str r0, [sp, 0x4] ldr r0, =0x02022e1a - b _0815D3E0 + b @0815D3E0 .align 2, 0 .pool -_0815D3D8: +@0815D3D8: ldr r0, =0x02022e1c ldrh r0, [r0] str r0, [sp, 0x4] ldr r0, =0x02022e1e -_0815D3E0: +@0815D3E0: ldrh r0, [r0] str r0, [sp, 0x8] movs r1, 0x8 ldrsh r0, [r6, r1] cmp r0, 0x1 - bne _0815D3EE - b _0815D5CC -_0815D3EE: + bne @0815D3EE + b @0815D5CC +@0815D3EE: cmp r0, 0x1 - bgt _0815D400 + bgt @0815D400 cmp r0, 0 - beq _0815D40E - b _0815D63C + beq @0815D40E + b @0815D63C .align 2, 0 .pool -_0815D400: +@0815D400: cmp r0, 0x2 - bne _0815D406 - b _0815D5EC -_0815D406: + bne @0815D406 + b @0815D5EC +@0815D406: cmp r0, 0x3 - bne _0815D40C - b _0815D636 -_0815D40C: - b _0815D63C -_0815D40E: + bne @0815D40C + b @0815D636 +@0815D40C: + b @0815D63C +@0815D40E: movs r2, 0x24 ldrsh r0, [r6, r2] lsls r0, 17 @@ -673902,7 +673902,7 @@ _0815D40E: movs r3, 0x22 ldrsh r0, [r6, r3] cmp r1, r0 - ble _0815D52E + ble @0815D52E ldr r0, =0x02039b28 mov r10, r0 ldr r1, [sp, 0x4] @@ -673913,7 +673913,7 @@ _0815D40E: lsls r0, r2, 16 asrs r0, 16 str r0, [sp, 0xC] -_0815D47E: +@0815D47E: lsls r5, 16 asrs r5, 16 adds r2, r5, 0x1 @@ -674001,11 +674001,11 @@ _0815D47E: movs r3, 0x22 ldrsh r0, [r6, r3] cmp r1, r0 - bgt _0815D47E -_0815D52E: + bgt @0815D47E +@0815D52E: lsls r1, r2, 17 cmp r1, 0 - blt _0815D55A + blt @0815D55A ldr r4, =0x02038c28 ldr r7, [sp, 0x4] lsls r0, r7, 16 @@ -674015,7 +674015,7 @@ _0815D52E: movs r0, 0xF0 lsls r0, 3 adds r5, r4, r0 -_0815D546: +@0815D546: asrs r2, r1, 16 lsls r1, r2, 1 adds r0, r1, r4 @@ -674025,15 +674025,15 @@ _0815D546: subs r2, 0x2 lsls r1, r2, 16 cmp r1, 0 - bge _0815D546 -_0815D55A: + bge @0815D546 +@0815D55A: ldrh r0, [r6, 0x14] adds r0, 0x1 strh r0, [r6, 0x14] lsls r0, 16 asrs r0, 16 cmp r0, 0x3F - ble _0815D5C2 + ble @0815D5C2 movs r0, 0x40 strh r0, [r6, 0x14] ldrh r0, [r6, 0xC] @@ -674042,18 +674042,18 @@ _0815D55A: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0815D594 + beq @0815D594 ldrh r0, [r6, 0xE] subs r0, 0x1 strh r0, [r6, 0xE] - b _0815D59A + b @0815D59A .align 2, 0 .pool -_0815D594: +@0815D594: ldrh r0, [r6, 0x10] adds r0, 0x1 strh r0, [r6, 0x10] -_0815D59A: +@0815D59A: ldrh r1, [r6, 0x10] lsls r1, 8 ldrh r0, [r6, 0xE] @@ -674065,53 +674065,53 @@ _0815D59A: movs r2, 0xE ldrsh r1, [r6, r2] cmp r1, 0 - bne _0815D63C + bne @0815D63C movs r3, 0x10 ldrsh r0, [r6, r3] cmp r0, 0x10 - bne _0815D63C + bne @0815D63C strh r1, [r6, 0xC] strh r1, [r6, 0xE] - b _0815D62E -_0815D5C2: + b @0815D62E +@0815D5C2: ldrh r0, [r6, 0x18] ldrh r7, [r6, 0x16] adds r0, r7 strh r0, [r6, 0x16] - b _0815D63C -_0815D5CC: + b @0815D63C +@0815D5CC: ldrh r0, [r6, 0xC] adds r0, 0x1 strh r0, [r6, 0xC] lsls r0, 16 asrs r0, 16 cmp r0, 0xC - ble _0815D63C + ble @0815D63C ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] movs r0, 0 strh r0, [r6, 0xC] - b _0815D62E + b @0815D62E .align 2, 0 .pool -_0815D5EC: +@0815D5EC: ldrh r0, [r6, 0xC] adds r0, 0x1 strh r0, [r6, 0xC] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0815D602 + beq @0815D602 ldrh r0, [r6, 0xE] adds r0, 0x1 strh r0, [r6, 0xE] - b _0815D608 -_0815D602: + b @0815D608 +@0815D602: ldrh r0, [r6, 0x10] subs r0, 0x1 strh r0, [r6, 0x10] -_0815D608: +@0815D608: ldrh r1, [r6, 0x10] lsls r1, 8 ldrh r0, [r6, 0xE] @@ -674123,22 +674123,22 @@ _0815D608: movs r1, 0xE ldrsh r0, [r6, r1] cmp r0, 0x10 - bne _0815D63C + bne @0815D63C movs r2, 0x10 ldrsh r0, [r6, r2] cmp r0, 0 - bne _0815D63C + bne @0815D63C strh r0, [r6, 0xC] strh r0, [r6, 0xE] -_0815D62E: +@0815D62E: ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] - b _0815D63C -_0815D636: + b @0815D63C +@0815D636: adds r0, r4, 0 bl move_anim_task_del -_0815D63C: +@0815D63C: add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -674150,7 +674150,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 @@ -674181,7 +674181,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 @@ -674199,14 +674199,14 @@ sub_815D694: @ 815D694 lsrs r0, 16 adds r6, r2, 0 cmp r0, 0x16 - bhi _0815D6F8 + bhi @0815D6F8 ldrh r0, [r3, 0xA] adds r0, 0x1 strh r0, [r3, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0815D708 + ble @0815D708 strh r5, [r3, 0xA] ldrh r0, [r3, 0xC] adds r0, 0x1 @@ -674214,7 +674214,7 @@ sub_815D694: @ 815D694 movs r5, 0x1 ands r0, r5 cmp r0, 0 - bne _0815D6F8 + bne @0815D6F8 ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r3, r0] @@ -674224,10 +674224,10 @@ sub_815D694: @ 815D694 adds r0, r2 ldr r1, =0x0000ffff strh r1, [r0, 0x24] - b _0815D708 + b @0815D708 .align 2, 0 .pool -_0815D6F8: +@0815D6F8: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r3, r0] @@ -674236,7 +674236,7 @@ _0815D6F8: lsls r0, 2 adds r0, r2 strh r5, [r0, 0x24] -_0815D708: +@0815D708: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -674244,10 +674244,10 @@ _0815D708: bl sub_80A7D34 lsls r0, 24 cmp r0, 0 - bne _0815D720 + bne @0815D720 adds r0, r4, 0 bl move_anim_task_del -_0815D720: +@0815D720: pop {r4-r6} pop {r0} bx r0 @@ -674256,7 +674256,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} @@ -674310,7 +674310,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 @@ -674329,7 +674329,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 @@ -674367,7 +674367,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] @@ -674387,14 +674387,14 @@ sub_815D804: @ 815D804 movs r1, 0x2E ldrsh r0, [r5, r1] cmp r0, 0x3A - ble _0815D86A + ble @0815D86A ldrh r0, [r5, 0x30] adds r0, 0x1 strh r0, [r5, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0815D86A + ble @0815D86A movs r0, 0 strh r0, [r5, 0x30] ldrh r1, [r5, 0x32] @@ -674413,17 +674413,17 @@ sub_815D804: @ 815D804 movs r1, 0x32 ldrsh r0, [r5, r1] cmp r0, 0x3 - ble _0815D86A + ble @0815D86A adds r0, r5, 0 bl move_anim_8074EE0 -_0815D86A: +@0815D86A: pop {r4,r5} pop {r0} bx r0 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 @@ -674437,11 +674437,11 @@ sub_815D870: @ 815D870 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0815D896 + beq @0815D896 ldrh r0, [r6, 0x2] negs r0, r0 strh r0, [r6, 0x2] -_0815D896: +@0815D896: ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 @@ -674469,7 +674469,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} @@ -674491,7 +674491,7 @@ sub_815D8D8: @ 815D8D8 ands r0, r1 mov r8, r2 cmp r0, 0 - beq _0815D95A + beq @0815D95A ldrh r0, [r3, 0xA] subs r0, 0x1 strh r0, [r3, 0xA] @@ -674500,21 +674500,21 @@ sub_815D8D8: @ 815D8D8 movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _0815D95A + bne @0815D95A movs r2, 0x1A ldrsh r0, [r3, r2] cmp r0, 0 - bne _0815D92C + bne @0815D92C ldrh r0, [r3, 0x10] strh r0, [r3, 0x1A] negs r0, r0 strh r0, [r3, 0x10] - b _0815D92E + b @0815D92E .align 2, 0 .pool -_0815D92C: +@0815D92C: strh r7, [r3, 0x1A] -_0815D92E: +@0815D92E: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -674523,23 +674523,23 @@ _0815D92E: movs r2, 0x1C ldrsh r0, [r1, r2] cmp r0, 0 - bne _0815D94A + bne @0815D94A ldrh r0, [r1, 0x12] strh r0, [r1, 0x1C] negs r0, r0 strh r0, [r1, 0x12] - b _0815D94E -_0815D94A: + b @0815D94E +@0815D94A: movs r0, 0 strh r0, [r1, 0x1C] -_0815D94E: +@0815D94E: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 add r0, r8 ldrh r1, [r0, 0x22] strh r1, [r0, 0xA] -_0815D95A: +@0815D95A: lsls r2, r5, 2 adds r0, r2, r5 lsls r0, 3 @@ -674554,7 +674554,7 @@ _0815D95A: ands r0, r1 mov r12, r2 cmp r0, 0 - beq _0815D998 + beq @0815D998 ldr r3, =0x02020630 movs r2, 0x26 ldrsh r0, [r4, r2] @@ -674567,10 +674567,10 @@ _0815D95A: subs r0, r2 strh r0, [r1, 0x24] adds r2, r3, 0 - b _0815D9AE + b @0815D9AE .align 2, 0 .pool -_0815D998: +@0815D998: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -674582,7 +674582,7 @@ _0815D998: ldrh r4, [r4, 0x1A] adds r1, r4 strh r1, [r0, 0x24] -_0815D9AE: +@0815D9AE: mov r1, r12 adds r0, r1, r5 lsls r0, 3 @@ -674594,7 +674594,7 @@ _0815D9AE: lsls r1, 8 ands r0, r1 cmp r0, 0 - beq _0815D9E0 + beq @0815D9E0 movs r1, 0x26 ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -674604,10 +674604,10 @@ _0815D9AE: lsrs r2, r7, 8 ldrh r0, [r4, 0x1C] subs r0, r2 - b _0815D9F2 + b @0815D9F2 .align 2, 0 .pool -_0815D9E0: +@0815D9E0: movs r1, 0x26 ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -674617,7 +674617,7 @@ _0815D9E0: lsrs r0, r7, 8 ldrh r4, [r4, 0x1C] adds r0, r4 -_0815D9F2: +@0815D9F2: strh r0, [r1, 0x26] mov r2, r12 adds r0, r2, r5 @@ -674626,14 +674626,14 @@ _0815D9F2: movs r1, 0x8 ldrsh r0, [r0, r1] cmp r0, 0 - bgt _0815DA12 + bgt @0815DA12 adds r0, r5, 0 bl remove_task ldr r1, =0x020383fe ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] -_0815DA12: +@0815DA12: pop {r3} mov r8, r3 pop {r4-r7} @@ -674644,7 +674644,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 @@ -674667,7 +674667,7 @@ sub_815DA20: @ 815DA20 ands r0, r1 mov r8, r2 cmp r0, 0 - beq _0815DAA6 + beq @0815DAA6 ldrh r0, [r3, 0xA] subs r0, 0x1 strh r0, [r3, 0xA] @@ -674676,21 +674676,21 @@ sub_815DA20: @ 815DA20 movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _0815DAA6 + bne @0815DAA6 movs r2, 0x1A ldrsh r0, [r3, r2] cmp r0, 0 - bne _0815DA78 + bne @0815DA78 ldrh r0, [r3, 0x10] strh r0, [r3, 0x1A] negs r0, r0 strh r0, [r3, 0x10] - b _0815DA7A + b @0815DA7A .align 2, 0 .pool -_0815DA78: +@0815DA78: strh r7, [r3, 0x1A] -_0815DA7A: +@0815DA7A: lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -674699,23 +674699,23 @@ _0815DA7A: movs r2, 0x1C ldrsh r0, [r1, r2] cmp r0, 0 - bne _0815DA96 + bne @0815DA96 ldrh r0, [r1, 0x12] strh r0, [r1, 0x1C] negs r0, r0 strh r0, [r1, 0x12] - b _0815DA9A -_0815DA96: + b @0815DA9A +@0815DA96: movs r0, 0 strh r0, [r1, 0x1C] -_0815DA9A: +@0815DA9A: lsls r0, r6, 2 adds r0, r6 lsls r0, 3 add r0, r8 ldrh r1, [r0, 0x22] strh r1, [r0, 0xA] -_0815DAA6: +@0815DAA6: lsls r3, r6, 2 adds r0, r3, r6 lsls r0, 3 @@ -674743,7 +674743,7 @@ _0815DAA6: ands r0, r1 mov r12, r3 cmp r0, 0 - beq _0815DB00 + beq @0815DB00 ldr r3, =0x02020630 movs r2, 0x26 ldrsh r0, [r4, r2] @@ -674756,10 +674756,10 @@ _0815DAA6: subs r0, r2 strh r0, [r1, 0x24] adds r2, r3, 0 - b _0815DB16 + b @0815DB16 .align 2, 0 .pool -_0815DB00: +@0815DB00: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -674771,7 +674771,7 @@ _0815DB00: ldrh r4, [r4, 0x1A] adds r1, r4 strh r1, [r0, 0x24] -_0815DB16: +@0815DB16: mov r1, r12 adds r0, r1, r6 lsls r0, 3 @@ -674783,7 +674783,7 @@ _0815DB16: lsls r1, 8 ands r0, r1 cmp r0, 0 - beq _0815DB48 + beq @0815DB48 movs r1, 0x26 ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -674793,10 +674793,10 @@ _0815DB16: lsrs r2, r7, 8 ldrh r0, [r4, 0x1C] subs r0, r2 - b _0815DB5A + b @0815DB5A .align 2, 0 .pool -_0815DB48: +@0815DB48: movs r1, 0x26 ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -674806,7 +674806,7 @@ _0815DB48: lsrs r0, r7, 8 ldrh r4, [r4, 0x1C] adds r0, r4 -_0815DB5A: +@0815DB5A: strh r0, [r1, 0x26] mov r2, r12 adds r0, r2, r6 @@ -674819,14 +674819,14 @@ _0815DB5A: movs r1, 0x8 ldrsh r0, [r2, r1] cmp r0, 0 - bgt _0815DB80 + bgt @0815DB80 movs r0, 0x1E strh r0, [r2, 0x8] movs r0, 0 strh r0, [r2, 0x22] ldr r0, =sub_815D8D8 + 1 str r0, [r2] -_0815DB80: +@0815DB80: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -674838,7 +674838,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} @@ -674867,47 +674867,47 @@ sub_815DB90: @ 815DB90 movs r3, 0x6 ldrsh r0, [r5, r3] cmp r0, 0 - beq _0815DBD4 + beq @0815DBD4 ldrh r0, [r4, 0x14] ldr r3, =0xffff8000 adds r1, r3, 0 orrs r0, r1 strh r0, [r4, 0x14] -_0815DBD4: +@0815DBD4: ldrb r0, [r2] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0815DC04 + beq @0815DC04 ldrh r0, [r5, 0x2] strh r0, [r4, 0xC] ldrh r0, [r5, 0x4] strh r0, [r4, 0xE] mov r3, r8 adds r4, r7, 0 - b _0815DC74 + b @0815DC74 .align 2, 0 .pool -_0815DC04: +@0815DC04: movs r7, 0x2 ldrsh r0, [r5, r7] movs r1, 0x80 lsls r1, 8 ands r0, r1 cmp r0, 0 - beq _0815DC20 + beq @0815DC20 ldrh r1, [r5, 0x2] ldr r0, =0x00007fff ands r0, r1 - b _0815DC28 + b @0815DC28 .align 2, 0 .pool -_0815DC20: +@0815DC20: ldrh r0, [r5, 0x2] ldr r2, =0xffff8000 adds r1, r2, 0 orrs r0, r1 -_0815DC28: +@0815DC28: strh r0, [r4, 0xC] ldr r0, =0x0203841e movs r3, 0x4 @@ -674917,7 +674917,7 @@ _0815DC28: ands r1, r2 adds r5, r0, 0 cmp r1, 0 - beq _0815DC60 + beq @0815DC60 ldr r3, =0x03005e00 lsls r4, r6, 2 adds r1, r4, r6 @@ -674926,10 +674926,10 @@ _0815DC28: ldrh r2, [r5, 0x4] ldr r0, =0x00007fff ands r0, r2 - b _0815DC72 + b @0815DC72 .align 2, 0 .pool -_0815DC60: +@0815DC60: ldr r3, =0x03005e00 lsls r4, r6, 2 adds r1, r4, r6 @@ -674939,9 +674939,9 @@ _0815DC60: ldr r7, =0xffff8000 adds r0, r7, 0 orrs r0, r2 -_0815DC72: +@0815DC72: strh r0, [r1, 0xE] -_0815DC74: +@0815DC74: adds r0, r4, r6 lsls r0, 3 adds r0, r3 @@ -674964,7 +674964,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 @@ -674977,10 +674977,10 @@ sub_815DCA4: @ 815DCA4 movs r1, 0x2 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0815DCC4 + bne @0815DCC4 adds r0, r2, 0 bl move_anim_task_del -_0815DCC4: +@0815DCC4: movs r0, 0 strh r0, [r5, 0x8] strh r0, [r5, 0xA] @@ -674990,14 +674990,14 @@ _0815DCC4: movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0815DCE8 + bne @0815DCE8 ldr r0, =0x02038436 - b _0815DCEA + b @0815DCEA .align 2, 0 .pool -_0815DCE8: +@0815DCE8: ldr r0, =0x02038437 -_0815DCEA: +@0815DCEA: ldrb r4, [r0] adds r0, r4, 0 movs r1, 0 @@ -675036,7 +675036,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 @@ -675048,49 +675048,49 @@ sub_815DD48: @ 815DD48 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - beq _0815DD6C + beq @0815DD6C cmp r0, 0x1 - beq _0815DDCC - b _0815DDDA + beq @0815DDCC + b @0815DDDA .align 2, 0 .pool -_0815DD6C: +@0815DD6C: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x6 - bne _0815DD82 + bne @0815DD82 adds r0, r5, 0 movs r1, 0x1 bl sub_815DDE0 -_0815DD82: +@0815DD82: movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0x12 - bne _0815DD92 + bne @0815DD92 adds r0, r5, 0 movs r1, 0 bl sub_815DDE0 -_0815DD92: +@0815DD92: adds r0, r4, 0 bl sub_80A7D34 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _0815DDDA + bne @0815DDDA ldrh r0, [r4, 0xE] subs r0, 0x1 strh r0, [r4, 0xE] lsls r0, 16 cmp r0, 0 - bne _0815DDB4 + bne @0815DDB4 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0815DDDA -_0815DDB4: + b @0815DDDA +@0815DDB4: strh r1, [r4, 0xA] ldrh r1, [r4, 0x26] lsls r1, 24 @@ -675098,24 +675098,24 @@ _0815DDB4: ldr r2, =0x085ce74c adds r0, r4, 0 bl sub_80A7CFC - b _0815DDDA + b @0815DDDA .align 2, 0 .pool -_0815DDCC: +@0815DDCC: movs r1, 0xC ldrsh r0, [r4, r1] cmp r0, 0 - bne _0815DDDA + bne @0815DDDA adds r0, r5, 0 bl move_anim_task_del -_0815DDDA: +@0815DDDA: pop {r4,r5} pop {r0} bx r0 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} @@ -675129,16 +675129,16 @@ sub_815DDE0: @ 815DDE0 ldr r2, =0x03005e00 adds r4, r0, r2 cmp r1, 0 - bne _0815DE08 + bne @0815DE08 movs r1, 0x12 movs r3, 0xEC - b _0815DE0C + b @0815DE0C .align 2, 0 .pool -_0815DE08: +@0815DE08: movs r1, 0x1E movs r3, 0x14 -_0815DE0C: +@0815DE0C: mov r2, sp ldrh r0, [r4, 0x10] subs r0, r1 @@ -675167,7 +675167,7 @@ _0815DE0C: movs r5, 0 mov r8, r2 ldr r7, =0x02020630 -_0815DE44: +@0815DE44: lsls r0, r5, 1 add r0, sp movs r2, 0 @@ -675187,7 +675187,7 @@ _0815DE44: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq _0815DE98 + beq @0815DE98 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -675196,11 +675196,11 @@ _0815DE44: strh r0, [r1, 0x2E] movs r0, 0x2 cmp r5, 0x1 - bhi _0815DE86 + bhi @0815DE86 movs r2, 0x2 negs r2, r2 adds r0, r2, 0 -_0815DE86: +@0815DE86: strh r0, [r1, 0x30] ldr r0, =0x0000ffff strh r0, [r1, 0x32] @@ -675210,12 +675210,12 @@ _0815DE86: ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] -_0815DE98: +@0815DE98: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _0815DE44 + bls @0815DE44 add sp, 0xC pop {r3} mov r8, r3 @@ -675227,7 +675227,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] @@ -675244,7 +675244,7 @@ sub_815DEBC: @ 815DEBC lsls r0, 16 asrs r0, 16 cmp r0, 0x6 - ble _0815DF02 + ble @0815DF02 ldr r3, =0x03005e00 movs r0, 0x36 ldrsh r1, [r4, r0] @@ -675262,7 +675262,7 @@ sub_815DEBC: @ 815DEBC strh r0, [r1] adds r0, r4, 0 bl obj_delete_and_free_tiles -_0815DF02: +@0815DF02: pop {r4} pop {r0} bx r0 @@ -675271,7 +675271,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 @@ -675312,7 +675312,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 @@ -675324,7 +675324,7 @@ sub_815DF64: @ 815DF64 movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0 - beq _0815DFB4 + beq @0815DFB4 ldrh r0, [r4, 0xC] ldr r2, =0x085ce784 movs r3, 0x8 @@ -675341,17 +675341,17 @@ sub_815DF64: @ 815DF64 lsls r0, 16 asrs r0, 16 cmp r0, 0x17 - ble _0815DFA4 + ble @0815DFA4 movs r0, 0 strh r0, [r4, 0x8] -_0815DFA4: +@0815DFA4: ldrh r0, [r4, 0xA] subs r0, 0x1 strh r0, [r4, 0xA] - b _0815DFC6 + b @0815DFC6 .align 2, 0 .pool -_0815DFB4: +@0815DFB4: ldrh r0, [r4, 0xC] movs r1, 0x10 movs r2, 0 @@ -675359,14 +675359,14 @@ _0815DFB4: bl pal_fade_1 adds r0, r5, 0 bl move_anim_task_del -_0815DFC6: +@0815DFC6: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_815DF64 thumb_func_start sub_815DFCC -sub_815DFCC: @ 815DFCC +sub_815DFCC: ; 815DFCC push {lr} sub sp, 0x1C lsls r0, 24 @@ -675400,7 +675400,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 @@ -675409,12 +675409,12 @@ sub_815E01C: @ 815E01C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0815E038 + bne @0815E038 ldr r1, =0x0203841e ldrh r0, [r1] negs r0, r0 strh r0, [r1] -_0815E038: +@0815E038: ldrb r0, [r6] movs r1, 0 bl sub_80A5C6C @@ -675435,18 +675435,18 @@ _0815E038: movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0815E080 + bne @0815E080 movs r0, 0xA0 lsls r0, 2 strh r0, [r5, 0x2E] ldr r0, =0x0000fd80 strh r0, [r5, 0x30] - b _0815E0A8 + b @0815E0A8 .align 2, 0 .pool -_0815E080: +@0815E080: cmp r0, 0x1 - bne _0815E09A + bne @0815E09A adds r2, r5, 0 adds r2, 0x3F ldrb r0, [r2] @@ -675457,21 +675457,21 @@ _0815E080: lsls r0, 2 strh r0, [r5, 0x2E] strh r0, [r5, 0x30] - b _0815E0A8 -_0815E09A: + b @0815E0A8 +@0815E09A: adds r0, r5, 0 movs r1, 0x1 bl obj_anim_image_start movs r0, 0xA0 lsls r0, 2 strh r0, [r5, 0x2E] -_0815E0A8: +@0815E0A8: ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0815E0C8 + beq @0815E0C8 ldrh r0, [r5, 0x2E] negs r0, r0 strh r0, [r5, 0x2E] @@ -675481,7 +675481,7 @@ _0815E0A8: movs r1, 0x1 orrs r0, r1 strb r0, [r2] -_0815E0C8: +@0815E0C8: ldr r0, =sub_815E0DC + 1 str r0, [r5, 0x1C] pop {r4-r6} @@ -675492,7 +675492,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] @@ -675515,16 +675515,16 @@ sub_815E0DC: @ 815E0DC lsls r0, 16 asrs r0, 16 cmp r0, 0xE - bne _0815E110 + bne @0815E110 adds r0, r2, 0 bl move_anim_8072740 -_0815E110: +@0815E110: pop {r0} bx r0 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 @@ -675537,29 +675537,29 @@ sub_815E114: @ 815E114 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq _0815E144 + beq @0815E144 movs r0, 0x8 strh r0, [r6, 0x12] movs r0, 0x3 strh r0, [r6, 0x14] movs r0, 0x1 strh r0, [r6, 0x16] - b _0815E14E + b @0815E14E .align 2, 0 .pool -_0815E144: +@0815E144: movs r0, 0xC strh r0, [r6, 0x12] movs r0, 0x3 strh r0, [r6, 0x14] strh r1, [r6, 0x16] -_0815E14E: +@0815E14E: ldr r5, =0x02038436 ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0815E188 + bne @0815E188 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -675572,15 +675572,15 @@ _0815E14E: lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _0815E17C + bge @0815E17C adds r0, 0x3 -_0815E17C: +@0815E17C: asrs r0, 2 adds r0, r4, r0 - b _0815E1AC + b @0815E1AC .align 2, 0 .pool -_0815E188: +@0815E188: ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -675593,12 +675593,12 @@ _0815E188: lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _0815E1A8 + bge @0815E1A8 adds r0, 0x3 -_0815E1A8: +@0815E1A8: asrs r0, 2 subs r0, r4, r0 -_0815E1AC: +@0815E1AC: strh r0, [r6, 0x1E] ldr r5, =0x02038436 ldrb r0, [r5] @@ -675613,9 +675613,9 @@ _0815E1AC: lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _0815E1D0 + bge @0815E1D0 adds r0, 0x3 -_0815E1D0: +@0815E1D0: asrs r0, 2 subs r0, r4, r0 strh r0, [r6, 0x20] @@ -675642,7 +675642,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} @@ -675657,22 +675657,22 @@ sub_815E20C: @ 815E20C movs r0, 0x8 ldrsh r1, [r5, r0] cmp r1, 0 - beq _0815E238 + beq @0815E238 cmp r1, 0x1 - bne _0815E230 - b _0815E330 -_0815E230: - b _0815E33E + bne @0815E230 + b @0815E330 +@0815E230: + b @0815E33E .align 2, 0 .pool -_0815E238: +@0815E238: ldrh r0, [r5, 0xA] adds r0, 0x1 strh r0, [r5, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble _0815E33E + ble @0815E33E strh r1, [r5, 0xA] movs r1, 0x1E ldrsh r0, [r5, r1] @@ -675694,7 +675694,7 @@ _0815E238: movs r6, 0 mov r8, r4 ldr r4, =0x02020630 -_0815E272: +@0815E272: add r0, sp, 0x10 movs r2, 0 ldrsh r1, [r0, r2] @@ -675707,13 +675707,13 @@ _0815E272: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 - beq _0815E306 + beq @0815E306 movs r1, 0x16 ldrsh r0, [r5, r1] cmp r0, 0 - bne _0815E2C6 + bne @0815E2C6 cmp r6, 0 - bne _0815E2B4 + bne @0815E2B4 lsls r2, r3, 4 adds r1, r2, r3 lsls r1, 2 @@ -675722,10 +675722,10 @@ _0815E272: negs r0, r0 strh r0, [r1, 0x26] strh r0, [r1, 0x24] - b _0815E2EE + b @0815E2EE .align 2, 0 .pool -_0815E2B4: +@0815E2B4: lsls r2, r3, 4 adds r1, r2, r3 lsls r1, 2 @@ -675734,10 +675734,10 @@ _0815E2B4: strh r0, [r1, 0x26] ldrh r0, [r5, 0x14] strh r0, [r1, 0x24] - b _0815E2EE -_0815E2C6: + b @0815E2EE +@0815E2C6: cmp r6, 0 - bne _0815E2DC + bne @0815E2DC lsls r2, r3, 4 adds r1, r2, r3 lsls r1, 2 @@ -675746,8 +675746,8 @@ _0815E2C6: negs r0, r0 strh r0, [r1, 0x24] ldrh r0, [r5, 0x14] - b _0815E2EC -_0815E2DC: + b @0815E2EC +@0815E2DC: lsls r2, r3, 4 adds r1, r2, r3 lsls r1, 2 @@ -675756,9 +675756,9 @@ _0815E2DC: strh r0, [r1, 0x24] ldrh r0, [r5, 0x14] negs r0, r0 -_0815E2EC: +@0815E2EC: strh r0, [r1, 0x26] -_0815E2EE: +@0815E2EE: ldr r1, =0x02020630 adds r0, r2, r3 lsls r0, 2 @@ -675771,36 +675771,36 @@ _0815E2EE: ldrh r0, [r5, 0x1C] adds r0, 0x1 strh r0, [r5, 0x1C] -_0815E306: +@0815E306: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x1 - bls _0815E272 + bls @0815E272 ldrh r2, [r5, 0xC] movs r3, 0xC ldrsh r1, [r5, r3] movs r4, 0x12 ldrsh r0, [r5, r4] cmp r1, r0 - bne _0815E324 + bne @0815E324 ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] -_0815E324: +@0815E324: adds r0, r2, 0x1 strh r0, [r5, 0xC] - b _0815E33E + b @0815E33E .align 2, 0 .pool -_0815E330: +@0815E330: movs r1, 0x1C ldrsh r0, [r5, r1] cmp r0, 0 - bne _0815E33E + bne @0815E33E adds r0, r7, 0 bl move_anim_task_del -_0815E33E: +@0815E33E: add sp, 0x14 pop {r3} mov r8, r3 @@ -675810,7 +675810,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 @@ -675841,21 +675841,21 @@ sub_815E34C: @ 815E34C lsrs r5, 24 mov r8, r5 cmp r5, 0 - bne _0815E394 + bne @0815E394 mov r2, r9 strh r0, [r2] mov r6, r10 strh r1, [r6] - b _0815E3F2 -_0815E394: + b @0815E3F2 +@0815E394: cmp r5, r6 - bcc _0815E3A2 + bcc @0815E3A2 mov r0, r9 strh r2, [r0] mov r1, r10 strh r3, [r1] - b _0815E3F2 -_0815E3A2: + b @0815E3F2 +@0815E3A2: subs r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 @@ -675894,7 +675894,7 @@ _0815E3A2: asrs r4, 8 mov r1, r10 strh r4, [r1] -_0815E3F2: +@0815E3F2: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -675906,7 +675906,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] @@ -675915,7 +675915,7 @@ sub_815E404: @ 815E404 lsls r0, 16 asrs r0, 16 cmp r0, 0x24 - ble _0815E43A + ble @0815E43A ldr r3, =0x03005e00 movs r0, 0x32 ldrsh r1, [r4, r0] @@ -675933,7 +675933,7 @@ sub_815E404: @ 815E404 strh r0, [r1] adds r0, r4, 0 bl obj_delete_and_free_tiles -_0815E43A: +@0815E43A: pop {r4} pop {r0} bx r0 @@ -675942,7 +675942,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 @@ -675969,7 +675969,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 @@ -676020,9 +676020,9 @@ sub_815E47C: @ 815E47C lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _0815E4EE + bge @0815E4EE adds r0, 0x3 -_0815E4EE: +@0815E4EE: asrs r0, 2 adds r0, r4, r0 strh r0, [r7, 0x24] @@ -676046,7 +676046,7 @@ _0815E4EE: lsrs r0, 24 strh r0, [r7, 0x26] cmp r0, 0x40 - beq _0815E5B8 + beq @0815E5B8 ldr r4, =0x02020630 movs r0, 0x26 ldrsh r1, [r7, r0] @@ -676093,7 +676093,7 @@ _0815E4EE: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0815E596 + bne @0815E596 movs r0, 0x26 ldrsh r1, [r7, r0] lsls r0, r1, 4 @@ -676102,16 +676102,16 @@ _0815E4EE: adds r0, r4 movs r1, 0x1 bl sub_8008258 -_0815E596: +@0815E596: ldr r0, =sub_815E5CC + 1 str r0, [r7] - b _0815E5BE + b @0815E5BE .align 2, 0 .pool -_0815E5B8: +@0815E5B8: mov r0, r9 bl move_anim_task_del -_0815E5BE: +@0815E5BE: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -676122,7 +676122,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 @@ -676134,28 +676134,28 @@ sub_815E5CC: @ 815E5CC movs r0, 0x8 ldrsh r1, [r4, r0] cmp r1, 0x1 - beq _0815E634 + beq @0815E634 cmp r1, 0x1 - bgt _0815E5F4 + bgt @0815E5F4 cmp r1, 0 - beq _0815E5FE - b _0815E6D2 + beq @0815E5FE + b @0815E6D2 .align 2, 0 .pool -_0815E5F4: +@0815E5F4: cmp r1, 0x2 - beq _0815E658 + beq @0815E658 cmp r1, 0x3 - beq _0815E6CC - b _0815E6D2 -_0815E5FE: + beq @0815E6CC + b @0815E6D2 +@0815E5FE: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0815E6D2 + ble @0815E6D2 strh r1, [r4, 0xA] movs r0, 0x26 ldrsh r1, [r4, r0] @@ -676171,11 +676171,11 @@ _0815E5FE: lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - ble _0815E6D2 - b _0815E6BE + ble @0815E6D2 + b @0815E6BE .align 2, 0 .pool -_0815E634: +@0815E634: movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -676186,21 +676186,21 @@ _0815E634: bl sub_80A6900 lsls r0, 24 cmp r0, 0 - beq _0815E6D2 + beq @0815E6D2 movs r0, 0 strh r0, [r4, 0xA] strh r0, [r4, 0xC] - b _0815E6BE + b @0815E6BE .align 2, 0 .pool -_0815E658: +@0815E658: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0815E6D2 + ble @0815E6D2 movs r0, 0 strh r0, [r4, 0xA] ldrh r2, [r4, 0xC] @@ -676225,7 +676225,7 @@ _0815E658: movs r1, 0xC ldrsh r0, [r4, r1] cmp r0, 0x10 - bne _0815E6D2 + bne @0815E6D2 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -676243,24 +676243,24 @@ _0815E658: lsls r0, 2 adds r0, r5 bl obj_delete_and_free_tiles -_0815E6BE: +@0815E6BE: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0815E6D2 + b @0815E6D2 .align 2, 0 .pool -_0815E6CC: +@0815E6CC: adds r0, r2, 0 bl move_anim_task_del -_0815E6D2: +@0815E6D2: pop {r4,r5} pop {r0} bx r0 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 @@ -676268,14 +676268,14 @@ sub_815E6D8: @ 815E6D8 ldrsh r1, [r0, r2] adds r6, r0, 0 cmp r1, 0 - bne _0815E6F4 + bne @0815E6F4 ldr r0, =0x02038436 - b _0815E6F6 + b @0815E6F6 .align 2, 0 .pool -_0815E6F4: +@0815E6F4: ldr r0, =0x02038437 -_0815E6F6: +@0815E6F6: ldrb r5, [r0] ldrh r2, [r4, 0x4] lsls r1, r2, 22 @@ -676295,11 +676295,11 @@ _0815E6F6: ldrsh r0, [r1, r2] movs r1, 0x1 cmp r0, 0 - bne _0815E724 + bne @0815E724 movs r3, 0x1 negs r3, r3 adds r1, r3, 0 -_0815E724: +@0815E724: strh r1, [r4, 0x3C] adds r0, r5, 0 movs r1, 0x3 @@ -676310,7 +676310,7 @@ _0815E724: movs r1, 0x2 ldrsh r0, [r6, r1] cmp r0, 0 - bne _0815E768 + bne @0815E768 ldrb r2, [r4, 0x3] lsls r1, r2, 26 lsrs r1, 27 @@ -676325,15 +676325,15 @@ _0815E724: movs r1, 0x4 bl sub_80A861C subs r0, 0x8 - b _0815E772 + b @0815E772 .align 2, 0 .pool -_0815E768: +@0815E768: adds r0, r5, 0 movs r1, 0x5 bl sub_80A861C adds r0, 0x8 -_0815E772: +@0815E772: strh r0, [r4, 0x20] ldr r0, =sub_815E784 + 1 str r0, [r4, 0x1C] @@ -676345,32 +676345,32 @@ _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 ldrsh r1, [r2, r0] cmp r1, 0x1 - beq _0815E7CC + beq @0815E7CC cmp r1, 0x1 - bgt _0815E79A + bgt @0815E79A cmp r1, 0 - beq _0815E7A4 - b _0815E83C -_0815E79A: + beq @0815E7A4 + b @0815E83C +@0815E79A: cmp r1, 0x2 - beq _0815E7DC + beq @0815E7DC cmp r1, 0x3 - beq _0815E802 - b _0815E83C -_0815E7A4: + beq @0815E802 + b @0815E83C +@0815E7A4: ldrh r0, [r2, 0x30] adds r0, 0x1 strh r0, [r2, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0815E83C + ble @0815E83C strh r1, [r2, 0x30] ldrh r0, [r2, 0x3C] ldrh r1, [r2, 0x24] @@ -676382,18 +676382,18 @@ _0815E7A4: lsls r0, 16 asrs r0, 16 cmp r0, 0xC - bne _0815E83C - b _0815E7FA -_0815E7CC: + bne @0815E83C + b @0815E7FA +@0815E7CC: ldrh r0, [r2, 0x30] adds r0, 0x1 strh r0, [r2, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x8 - bne _0815E83C - b _0815E7F6 -_0815E7DC: + bne @0815E83C + b @0815E7F6 +@0815E7DC: movs r0, 0x3C ldrsh r1, [r2, r0] lsls r1, 2 @@ -676406,16 +676406,16 @@ _0815E7DC: lsls r0, 16 asrs r0, 16 cmp r0, 0x6 - bne _0815E83C -_0815E7F6: + bne @0815E83C +@0815E7F6: movs r0, 0 strh r0, [r2, 0x30] -_0815E7FA: +@0815E7FA: ldrh r0, [r2, 0x2E] adds r0, 0x1 strh r0, [r2, 0x2E] - b _0815E83C -_0815E802: + b @0815E83C +@0815E802: movs r0, 0x3C ldrsh r1, [r2, r0] lsls r0, r1, 1 @@ -676429,29 +676429,29 @@ _0815E802: lsls r0, 16 asrs r0, 16 cmp r0, 0x8 - bne _0815E83C + bne @0815E83C ldrh r0, [r2, 0x3A] subs r0, 0x1 strh r0, [r2, 0x3A] lsls r0, 16 cmp r0, 0 - beq _0815E836 + beq @0815E836 movs r0, 0 strh r0, [r2, 0x30] ldrh r0, [r2, 0x2E] subs r0, 0x1 strh r0, [r2, 0x2E] - b _0815E83C -_0815E836: + b @0815E83C +@0815E836: adds r0, r2, 0 bl move_anim_8072740 -_0815E83C: +@0815E83C: pop {r0} bx r0 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 @@ -676459,13 +676459,13 @@ sub_815E840: @ 815E840 movs r3, 0 ldrsh r0, [r2, r3] cmp r0, 0 - bne _0815E85C + bne @0815E85C adds r0, r1, 0 bl move_anim_task_del - b _0815E884 + b @0815E884 .align 2, 0 .pool -_0815E85C: +@0815E85C: ldr r0, =0x03005e00 lsls r4, r1, 2 adds r4, r1 @@ -676484,7 +676484,7 @@ _0815E85C: bl sub_80A7CFC ldr r0, =sub_815E898 + 1 str r0, [r4] -_0815E884: +@0815E884: pop {r4} pop {r0} bx r0 @@ -676493,7 +676493,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 @@ -676508,14 +676508,14 @@ sub_815E898: @ 815E898 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0815E8F2 + ble @0815E8F2 movs r0, 0 strh r0, [r4, 0xA] ldrh r1, [r4, 0xC] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0815E8E0 + bne @0815E8E0 ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -676524,10 +676524,10 @@ sub_815E898: @ 815E898 lsls r0, 2 adds r0, r2 movs r1, 0x2 - b _0815E8F0 + b @0815E8F0 .align 2, 0 .pool -_0815E8E0: +@0815E8E0: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -676536,15 +676536,15 @@ _0815E8E0: lsls r0, 2 adds r0, r2 ldr r1, =0x0000fffe -_0815E8F0: +@0815E8F0: strh r1, [r0, 0x24] -_0815E8F2: +@0815E8F2: adds r0, r4, 0 bl sub_80A7D34 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _0815E94E + bne @0815E94E ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -676558,7 +676558,7 @@ _0815E8F2: strh r0, [r4, 0x8] lsls r0, 16 cmp r0, 0 - beq _0815E948 + beq @0815E948 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -676571,34 +676571,34 @@ _0815E8F2: bl sub_80A7CFC strh r5, [r4, 0xA] strh r5, [r4, 0xC] - b _0815E94E + b @0815E94E .align 2, 0 .pool -_0815E948: +@0815E948: adds r0, r6, 0 bl move_anim_task_del -_0815E94E: +@0815E94E: pop {r4-r6} pop {r0} bx r0 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 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _0815E970 + bne @0815E970 ldr r4, =0x02038436 - b _0815E972 + b @0815E972 .align 2, 0 .pool -_0815E970: +@0815E970: ldr r4, =0x02038437 -_0815E972: +@0815E972: ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -676612,10 +676612,10 @@ _0815E972: movs r1, 0x22 ldrsh r0, [r5, r1] cmp r0, 0x7 - bgt _0815E996 + bgt @0815E996 movs r0, 0x8 strh r0, [r5, 0x22] -_0815E996: +@0815E996: movs r2, 0 strh r2, [r5, 0x2E] ldr r1, =0x0203841e @@ -676634,7 +676634,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] @@ -676645,7 +676645,7 @@ sub_815E9BC: @ 815E9BC movs r2, 0x30 ldrsh r1, [r3, r2] cmp r0, r1 - blt _0815EA10 + blt @0815EA10 movs r0, 0 strh r0, [r3, 0x2E] ldrh r1, [r3, 0x32] @@ -676667,29 +676667,29 @@ sub_815E9BC: @ 815E9BC movs r2, 0x32 ldrsh r0, [r3, r2] cmp r0, 0 - beq _0815EA10 + beq @0815EA10 ldrh r0, [r3, 0x34] subs r0, 0x1 strh r0, [r3, 0x34] lsls r0, 16 cmp r0, 0 - bne _0815EA10 + bne @0815EA10 adds r0, r3, 0 bl move_anim_8072740 -_0815EA10: +@0815EA10: pop {r0} bx r0 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 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _0815EA44 + bne @0815EA44 ldrb r2, [r3, 0x3] lsls r1, r2, 26 lsrs r1, 27 @@ -676703,14 +676703,14 @@ sub_815EA14: @ 815EA14 movs r0, 0x64 strh r0, [r3, 0x20] movs r0, 0x1 - b _0815EA4A + b @0815EA4A .align 2, 0 .pool -_0815EA44: +@0815EA44: movs r0, 0x8C strh r0, [r3, 0x20] ldr r0, =0x0000ffff -_0815EA4A: +@0815EA4A: strh r0, [r3, 0x3C] movs r0, 0x38 strh r0, [r3, 0x22] @@ -676723,34 +676723,34 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0x8 - bls _0815EA6E - b _0815EC40 -_0815EA6E: + bls @0815EA6E + b @0815EC40 +@0815EA6E: lsls r0, 2 - ldr r1, =_0815EA7C + ldr r1, =@0815EA7C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0815EA7C: - .4byte _0815EAA0 - .4byte _0815EAD2 - .4byte _0815EAE4 - .4byte _0815EB24 - .4byte _0815EB36 - .4byte _0815EB74 - .4byte _0815EBD8 - .4byte _0815EBF8 - .4byte _0815EC1E -_0815EAA0: +@0815EA7C: + .4byte @0815EAA0 + .4byte @0815EAD2 + .4byte @0815EAE4 + .4byte @0815EB24 + .4byte @0815EB36 + .4byte @0815EB74 + .4byte @0815EBD8 + .4byte @0815EBF8 + .4byte @0815EC1E +@0815EAA0: movs r3, 0x3C ldrsh r0, [r4, r3] lsls r0, 1 @@ -676761,35 +676761,35 @@ _0815EAA0: movs r0, 0x1 ands r0, r2 cmp r0, 0 - beq _0815EAC2 + beq @0815EAC2 movs r0, 0x3C ldrsh r1, [r4, r0] lsls r1, 1 ldrh r0, [r4, 0x20] subs r0, r1 strh r0, [r4, 0x20] -_0815EAC2: +@0815EAC2: adds r0, r2, 0x1 strh r0, [r4, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x9 - beq _0815EAD0 - b _0815EC40 -_0815EAD0: - b _0815EC12 -_0815EAD2: + beq @0815EAD0 + b @0815EC40 +@0815EAD0: + b @0815EC12 +@0815EAD2: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - beq _0815EAE2 - b _0815EC40 -_0815EAE2: - b _0815EC12 -_0815EAE4: + beq @0815EAE2 + b @0815EC40 +@0815EAE2: + b @0815EC12 +@0815EAE4: ldrh r2, [r4, 0x30] adds r2, 0x1 strh r2, [r4, 0x30] @@ -676816,24 +676816,24 @@ _0815EAE4: lsls r2, 16 asrs r2, 16 cmp r2, 0xC - beq _0815EB1C - b _0815EC40 -_0815EB1C: - b _0815EC12 + beq @0815EB1C + b @0815EC40 +@0815EB1C: + b @0815EC12 .align 2, 0 .pool -_0815EB24: +@0815EB24: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - beq _0815EB34 - b _0815EC40 -_0815EB34: - b _0815EC12 -_0815EB36: + beq @0815EB34 + b @0815EC40 +@0815EB34: + b @0815EC12 +@0815EB36: ldrh r2, [r4, 0x30] adds r2, 0x1 strh r2, [r4, 0x30] @@ -676860,11 +676860,11 @@ _0815EB36: lsls r2, 16 asrs r2, 16 cmp r2, 0xC - bne _0815EC40 - b _0815EC16 + bne @0815EC40 + b @0815EC16 .align 2, 0 .pool -_0815EB74: +@0815EB74: ldrh r2, [r4, 0x30] adds r2, 0x1 strh r2, [r4, 0x30] @@ -676891,7 +676891,7 @@ _0815EB74: lsls r2, 16 asrs r2, 16 cmp r2, 0xF - bne _0815EBC0 + bne @0815EBC0 ldrh r2, [r4, 0x4] lsls r1, r2, 22 lsrs r1, 22 @@ -676903,15 +676903,15 @@ _0815EB74: ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] -_0815EBC0: +@0815EBC0: movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0x12 - bne _0815EC40 - b _0815EC12 + bne @0815EC40 + b @0815EC12 .align 2, 0 .pool -_0815EBD8: +@0815EBD8: movs r3, 0x3C ldrsh r0, [r4, r3] lsls r1, r0, 1 @@ -676926,9 +676926,9 @@ _0815EBD8: lsls r0, 16 asrs r0, 16 cmp r0, 0x9 - bne _0815EC40 - b _0815EC12 -_0815EBF8: + bne @0815EC40 + b @0815EC12 +@0815EBF8: movs r1, 0x3C ldrsh r0, [r4, r1] lsls r0, 1 @@ -676941,16 +676941,16 @@ _0815EBF8: lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - bne _0815EC40 -_0815EC12: + bne @0815EC40 +@0815EC12: movs r0, 0 strh r0, [r4, 0x30] -_0815EC16: +@0815EC16: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _0815EC40 -_0815EC1E: + b @0815EC40 +@0815EC1E: movs r1, 0x3C ldrsh r0, [r4, r1] lsls r1, r0, 1 @@ -676964,17 +676964,17 @@ _0815EC1E: lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - bne _0815EC40 + bne @0815EC40 adds r0, r4, 0 bl move_anim_8072740 -_0815EC40: +@0815EC40: pop {r4} pop {r0} bx r0 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 @@ -676991,12 +676991,12 @@ sub_815EC48: @ 815EC48 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0815ECD0 + bne @0815ECD0 bl battle_type_is_double lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x1 - bne _0815ECB4 + bne @0815ECB4 ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0 @@ -677012,32 +677012,32 @@ sub_815EC48: @ 815EC48 lsls r0, 24 lsrs r0, 24 cmp r4, r0 - ble _0815ECAC + ble @0815ECAC strh r7, [r6, 0x24] - b _0815ECD4 + b @0815ECD4 .align 2, 0 .pool -_0815ECAC: +@0815ECAC: ldr r0, =0x0000ffff - b _0815ECD2 + b @0815ECD2 .align 2, 0 .pool -_0815ECB4: +@0815ECB4: ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0815ECD0 + bne @0815ECD0 ldr r0, =0x0000ffff - b _0815ECD2 + b @0815ECD2 .align 2, 0 .pool -_0815ECD0: +@0815ECD0: movs r0, 0x1 -_0815ECD2: +@0815ECD2: strh r0, [r6, 0x24] -_0815ECD4: +@0815ECD4: ldr r0, =sub_815ECE4 + 1 str r0, [r6] pop {r4-r7} @@ -677048,7 +677048,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 @@ -677060,39 +677060,39 @@ sub_815ECE4: @ 815ECE4 movs r1, 0x8 ldrsh r0, [r3, r1] cmp r0, 0x8 - bls _0815ECFE - b _0815EE78 -_0815ECFE: + bls @0815ECFE + b @0815EE78 +@0815ECFE: lsls r0, 2 - ldr r1, =_0815ED10 + ldr r1, =@0815ED10 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0815ED10: - .4byte _0815ED34 - .4byte _0815ED46 - .4byte _0815ED78 - .4byte _0815EDA8 - .4byte _0815EDCE - .4byte _0815EDF8 - .4byte _0815EE08 - .4byte _0815EE28 - .4byte _0815EE60 -_0815ED34: +@0815ED10: + .4byte @0815ED34 + .4byte @0815ED46 + .4byte @0815ED78 + .4byte @0815EDA8 + .4byte @0815EDCE + .4byte @0815EDF8 + .4byte @0815EE08 + .4byte @0815EE28 + .4byte @0815EE60 +@0815ED34: ldrh r0, [r3, 0xA] adds r0, 0x1 strh r0, [r3, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0xD - beq _0815ED44 - b _0815EE78 -_0815ED44: - b _0815EE50 -_0815ED46: + beq @0815ED44 + b @0815EE78 +@0815ED44: + b @0815EE50 +@0815ED46: ldr r2, =0x02020630 movs r1, 0x26 ldrsh r0, [r3, r1] @@ -677113,13 +677113,13 @@ _0815ED46: lsls r0, 16 asrs r0, 16 cmp r0, 0x6 - beq _0815ED72 - b _0815EE78 -_0815ED72: - b _0815EE50 + beq @0815ED72 + b @0815EE78 +@0815ED72: + b @0815EE50 .align 2, 0 .pool -_0815ED78: +@0815ED78: ldr r2, =0x02020630 movs r1, 0x26 ldrsh r0, [r3, r1] @@ -677140,31 +677140,31 @@ _0815ED78: lsls r0, 16 asrs r0, 16 cmp r0, 0x6 - bne _0815EE78 - b _0815EE50 + bne @0815EE78 + b @0815EE50 .align 2, 0 .pool -_0815EDA8: +@0815EDA8: ldrh r0, [r3, 0xA] adds r0, 0x1 strh r0, [r3, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - bne _0815EE78 + bne @0815EE78 movs r0, 0 strh r0, [r3, 0xA] ldrh r1, [r3, 0xC] movs r2, 0xC ldrsh r0, [r3, r2] cmp r0, 0 - bne _0815EE54 + bne @0815EE54 adds r0, r1, 0x1 strh r0, [r3, 0xC] movs r0, 0x1 strh r0, [r3, 0x8] - b _0815EE78 -_0815EDCE: + b @0815EE78 +@0815EDCE: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r3, r0] @@ -677182,20 +677182,20 @@ _0815EDCE: lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - bne _0815EE78 - b _0815EE50 + bne @0815EE78 + b @0815EE50 .align 2, 0 .pool -_0815EDF8: +@0815EDF8: ldrh r0, [r3, 0xA] adds r0, 0x1 strh r0, [r3, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x6 - bne _0815EE78 - b _0815EE50 -_0815EE08: + bne @0815EE78 + b @0815EE50 +@0815EE08: ldr r2, =0x02020630 movs r1, 0x26 ldrsh r0, [r3, r1] @@ -677208,10 +677208,10 @@ _0815EE08: lsls r2, 2 ldrh r0, [r1, 0x24] subs r0, r2 - b _0815EE40 + b @0815EE40 .align 2, 0 .pool -_0815EE28: +@0815EE28: ldr r2, =0x02020630 movs r1, 0x26 ldrsh r0, [r3, r1] @@ -677224,7 +677224,7 @@ _0815EE28: lsls r0, 2 ldrh r2, [r1, 0x24] adds r0, r2 -_0815EE40: +@0815EE40: strh r0, [r1, 0x24] ldrh r0, [r3, 0xA] adds r0, 0x1 @@ -677232,18 +677232,18 @@ _0815EE40: lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - bne _0815EE78 -_0815EE50: + bne @0815EE78 +@0815EE50: movs r0, 0 strh r0, [r3, 0xA] -_0815EE54: +@0815EE54: ldrh r0, [r3, 0x8] adds r0, 0x1 strh r0, [r3, 0x8] - b _0815EE78 + b @0815EE78 .align 2, 0 .pool -_0815EE60: +@0815EE60: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r3, r0] @@ -677255,7 +677255,7 @@ _0815EE60: strh r1, [r0, 0x24] adds r0, r4, 0 bl move_anim_task_del -_0815EE78: +@0815EE78: pop {r4} pop {r0} bx r0 @@ -677264,24 +677264,24 @@ _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 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne _0815EEA8 + bne @0815EEA8 adds r0, r4, 0 movs r1, 0x1 bl sub_80A69CC ldr r0, =0x02038436 - b _0815EEAA + b @0815EEAA .align 2, 0 .pool -_0815EEA8: +@0815EEA8: ldr r0, =0x02038437 -_0815EEAA: +@0815EEAA: ldrb r0, [r0] strh r0, [r4, 0x3C] ldrh r0, [r4, 0x3C] @@ -677291,7 +677291,7 @@ _0815EEAA: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0815EECE + bne @0815EECE ldrb r0, [r4, 0x3] movs r1, 0x3F negs r1, r1 @@ -677299,7 +677299,7 @@ _0815EEAA: movs r0, 0x10 orrs r1, r0 strb r1, [r4, 0x3] -_0815EECE: +@0815EECE: ldrh r0, [r4, 0x3C] lsls r0, 24 lsrs r0, 24 @@ -677329,53 +677329,53 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0x4 - bls _0815EF16 - b _0815F106 -_0815EF16: + bls @0815EF16 + b @0815F106 +@0815EF16: lsls r0, 2 - ldr r1, =_0815EF24 + ldr r1, =@0815EF24 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0815EF24: - .4byte _0815EF38 - .4byte _0815F038 - .4byte _0815F0A0 - .4byte _0815F0B4 - .4byte _0815F100 -_0815EF38: +@0815EF24: + .4byte @0815EF38 + .4byte @0815F038 + .4byte @0815F0A0 + .4byte @0815F0B4 + .4byte @0815F100 +@0815EF38: movs r2, 0x3A ldrsh r0, [r4, r2] cmp r0, 0x5 - bhi _0815EF68 + bhi @0815EF68 lsls r0, 2 - ldr r1, =_0815EF50 + ldr r1, =@0815EF50 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0815EF50: - .4byte _0815EF6C - .4byte _0815EF88 - .4byte _0815EFAA - .4byte _0815EFC6 - .4byte _0815EF6C - .4byte _0815EFEC -_0815EF68: +@0815EF50: + .4byte @0815EF6C + .4byte @0815EF88 + .4byte @0815EFAA + .4byte @0815EFC6 + .4byte @0815EF6C + .4byte @0815EFEC +@0815EF68: movs r0, 0 strh r0, [r4, 0x3A] -_0815EF6C: +@0815EF6C: ldrh r0, [r4, 0x3C] lsls r0, 24 lsrs r0, 24 @@ -677388,8 +677388,8 @@ _0815EF6C: lsls r0, 24 lsrs r0, 24 movs r1, 0x3 - b _0815EFE0 -_0815EF88: + b @0815EFE0 +@0815EF88: ldrh r0, [r4, 0x3C] lsls r0, 24 lsrs r0, 24 @@ -677404,8 +677404,8 @@ _0815EF88: movs r1, 0x2 bl sub_80A861C adds r0, 0x4 - b _0815EFE6 -_0815EFAA: + b @0815EFE6 +@0815EFAA: ldrh r0, [r4, 0x3C] lsls r0, 24 lsrs r0, 24 @@ -677418,8 +677418,8 @@ _0815EFAA: lsls r0, 24 lsrs r0, 24 movs r1, 0x3 - b _0815EFE0 -_0815EFC6: + b @0815EFE0 +@0815EFC6: ldrh r0, [r4, 0x3C] lsls r0, 24 lsrs r0, 24 @@ -677432,14 +677432,14 @@ _0815EFC6: lsls r0, 24 lsrs r0, 24 movs r1, 0x2 -_0815EFE0: +@0815EFE0: bl sub_80A861C subs r0, 0x4 -_0815EFE6: +@0815EFE6: lsls r0, 16 lsrs r1, r0, 16 - b _0815F00C -_0815EFEC: + b @0815F00C +@0815EFEC: ldrh r0, [r4, 0x3C] lsls r0, 24 lsrs r0, 24 @@ -677454,21 +677454,21 @@ _0815EFEC: bl sub_80A5C6C lsls r0, 24 lsrs r1, r0, 24 -_0815F00C: +@0815F00C: movs r2, 0x3A ldrsh r0, [r4, r2] cmp r0, 0x4 - bne _0815F018 + bne @0815F018 movs r0, 0x18 - b _0815F022 -_0815F018: + b @0815F022 +@0815F018: cmp r0, 0x5 - bne _0815F020 + bne @0815F020 movs r0, 0x6 - b _0815F022 -_0815F020: + b @0815F022 +@0815F020: movs r0, 0xC -_0815F022: +@0815F022: strh r0, [r4, 0x2E] ldrh r0, [r4, 0x20] strh r0, [r4, 0x30] @@ -677478,19 +677478,19 @@ _0815F022: strh r1, [r4, 0x36] adds r0, r4, 0 bl obj_translate_based_on_private_1_2_3_4 - b _0815F0F8 -_0815F038: + b @0815F0F8 +@0815F038: adds r0, r4, 0 bl sub_80A6F3C lsls r0, 24 cmp r0, 0 - beq _0815F106 + beq @0815F106 movs r1, 0x3A ldrsh r0, [r4, r1] cmp r0, 0x4 - beq _0815F070 + beq @0815F070 cmp r0, 0x5 - beq _0815F090 + beq @0815F090 ldrh r0, [r4, 0x24] ldrh r2, [r4, 0x20] adds r0, r2 @@ -677506,8 +677506,8 @@ _0815F038: ldrh r0, [r4, 0x38] adds r0, 0x1 strh r0, [r4, 0x38] - b _0815F088 -_0815F070: + b @0815F088 +@0815F070: ldrh r0, [r4, 0x24] ldrh r1, [r4, 0x20] adds r0, r1 @@ -677520,12 +677520,12 @@ _0815F070: strh r1, [r4, 0x26] strh r1, [r4, 0x24] strh r1, [r4, 0x38] -_0815F088: +@0815F088: ldrh r0, [r4, 0x3A] adds r0, 0x1 strh r0, [r4, 0x3A] - b _0815F106 -_0815F090: + b @0815F106 +@0815F090: movs r0, 0 strh r0, [r4, 0x2E] movs r1, 0x10 @@ -677533,33 +677533,33 @@ _0815F090: strh r0, [r4, 0x32] movs r0, 0x3 strh r0, [r4, 0x38] - b _0815F106 -_0815F0A0: + b @0815F106 +@0815F0A0: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne _0815F106 + bne @0815F106 movs r0, 0 strh r0, [r4, 0x38] - b _0815F106 -_0815F0B4: + b @0815F106 +@0815F0B4: ldrh r1, [r4, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0815F0C6 + bne @0815F0C6 ldrh r0, [r4, 0x30] subs r0, 0x1 strh r0, [r4, 0x30] - b _0815F0CC -_0815F0C6: + b @0815F0CC +@0815F0C6: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] -_0815F0CC: +@0815F0CC: ldrh r1, [r4, 0x32] lsls r1, 8 ldrh r0, [r4, 0x30] @@ -677574,29 +677574,29 @@ _0815F0CC: lsls r0, 16 asrs r0, 16 cmp r0, 0x20 - bne _0815F106 + bne @0815F106 adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 strb r0, [r2] -_0815F0F8: +@0815F0F8: ldrh r0, [r4, 0x38] adds r0, 0x1 strh r0, [r4, 0x38] - b _0815F106 -_0815F100: + b @0815F106 +@0815F100: adds r0, r4, 0 bl move_anim_8072740 -_0815F106: +@0815F106: pop {r4,r5} pop {r0} bx r0 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 @@ -677629,7 +677629,7 @@ sub_815F10C: @ 815F10C movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0815F16A + bne @0815F16A ldr r0, =0x085ce3a0 ldrh r1, [r4, 0x20] adds r1, r5 @@ -677641,16 +677641,16 @@ sub_815F10C: @ 815F10C asrs r2, 16 movs r3, 0x5 bl obj_add_from_template_forward_search -_0815F16A: +@0815F16A: movs r0, 0x38 ldrsh r1, [r4, r0] movs r2, 0x36 ldrsh r0, [r4, r2] cmp r1, r0 - bne _0815F17C + bne @0815F17C adds r0, r4, 0 bl move_anim_8072740 -_0815F17C: +@0815F17C: ldrh r0, [r4, 0x38] adds r0, 0x1 strh r0, [r4, 0x38] @@ -677662,7 +677662,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 @@ -677676,12 +677676,12 @@ sub_815F18C: @ 815F18C bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _0815F1B8 + beq @0815F1B8 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _0815F1D0 -_0815F1B8: + beq @0815F1D0 +@0815F1B8: ldr r2, =0x0203841e ldrh r1, [r5, 0x20] ldrh r0, [r2] @@ -677689,10 +677689,10 @@ _0815F1B8: strh r0, [r5, 0x2E] ldrh r0, [r2, 0x4] subs r1, r0 - b _0815F1DE + b @0815F1DE .align 2, 0 .pool -_0815F1D0: +@0815F1D0: ldr r2, =0x0203841e ldrh r1, [r5, 0x20] ldrh r0, [r2] @@ -677700,7 +677700,7 @@ _0815F1D0: strh r0, [r5, 0x2E] ldrh r0, [r2, 0x4] adds r1, r0 -_0815F1DE: +@0815F1DE: strh r1, [r5, 0x32] adds r3, r2, 0 ldrh r1, [r5, 0x22] @@ -677725,7 +677725,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 @@ -677748,7 +677748,7 @@ sub_815F20C: @ 815F20C movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0815F254 + bne @0815F254 adds r0, r5, 0 movs r1, 0 bl sub_80A7270 @@ -677756,12 +677756,12 @@ sub_815F20C: @ 815F20C lsls r0, 1 strh r0, [r4, 0xA] strh r0, [r4, 0xC] - b _0815F2A0 + b @0815F2A0 .align 2, 0 .pool -_0815F254: +@0815F254: cmp r0, 0x1 - bne _0815F2AC + bne @0815F2AC ldrh r0, [r4, 0xA] adds r0, 0x60 strh r0, [r4, 0xA] @@ -677781,7 +677781,7 @@ _0815F254: lsls r0, 16 asrs r0, 16 cmp r0, 0x9 - bne _0815F310 + bne @0815F310 movs r0, 0 strh r0, [r4, 0xE] adds r0, r5, 0 @@ -677796,14 +677796,14 @@ _0815F254: movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_0815F2A0: +@0815F2A0: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0815F310 + b @0815F310 .align 2, 0 .pool -_0815F2AC: +@0815F2AC: ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 @@ -677811,7 +677811,7 @@ _0815F2AC: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _0815F2EE + beq @0815F2EE ldr r3, =0x02020630 ldr r2, =0x020241e4 ldrb r0, [r4] @@ -677834,7 +677834,7 @@ _0815F2AC: adds r0, r3 movs r1, 0 bl sub_8008258 -_0815F2EE: +@0815F2EE: mov r4, r9 adds r3, r7, 0 ldr r5, =sub_815F330 + 1 @@ -677843,17 +677843,17 @@ _0815F2EE: adds r0, r4, r2 adds r0, 0x26 movs r2, 0 -_0815F2FE: +@0815F2FE: strh r2, [r0] subs r0, 0x2 subs r1, 0x1 cmp r1, 0 - bge _0815F2FE + bge @0815F2FE adds r0, r3, r6 lsls r0, 3 adds r0, r4 str r5, [r0] -_0815F310: +@0815F310: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -677865,7 +677865,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 @@ -677881,21 +677881,21 @@ sub_815F330: @ 815F330 movs r0, 0x8 ldrsh r5, [r4, r0] cmp r5, 0x1 - beq _0815F394 + beq @0815F394 cmp r5, 0x1 - bgt _0815F360 + bgt @0815F360 cmp r5, 0 - beq _0815F36A - b _0815F482 + beq @0815F36A + b @0815F482 .align 2, 0 .pool -_0815F360: +@0815F360: cmp r5, 0x2 - beq _0815F400 + beq @0815F400 cmp r5, 0x3 - beq _0815F43C - b _0815F482 -_0815F36A: + beq @0815F43C + b @0815F482 +@0815F36A: ldr r0, =0x02020630 lsls r1, r3, 4 adds r1, r3 @@ -677911,10 +677911,10 @@ _0815F36A: ands r0, r2 strb r0, [r1] strh r5, [r4, 0x1C] - b _0815F42E + b @0815F42E .align 2, 0 .pool -_0815F394: +@0815F394: ldrh r1, [r4, 0x1C] adds r1, 0x70 movs r5, 0 @@ -677937,19 +677937,19 @@ _0815F394: movs r1, 0x20 negs r1, r1 cmp r0, r1 - blt _0815F3C4 + blt @0815F3C4 strh r5, [r2, 0x24] -_0815F3C4: +@0815F3C4: movs r1, 0x26 ldrsh r0, [r2, r1] cmp r0, 0 - ble _0815F3CE + ble @0815F3CE strh r5, [r2, 0x26] -_0815F3CE: +@0815F3CE: movs r3, 0x26 ldrsh r0, [r2, r3] cmp r0, 0 - bne _0815F482 + bne @0815F482 movs r0, 0x40 negs r0, r0 bl sub_80A5178 @@ -677963,19 +677963,19 @@ _0815F3CE: ldrh r2, [r4, 0x1C] adds r0, r2 strh r0, [r4, 0x1C] - b _0815F42E + b @0815F42E .align 2, 0 .pool -_0815F400: +@0815F400: ldrh r0, [r4, 0x1C] subs r0, 0x70 strh r0, [r4, 0x1C] lsls r0, 16 cmp r0, 0 - bge _0815F410 + bge @0815F410 movs r0, 0 strh r0, [r4, 0x1C] -_0815F410: +@0815F410: ldr r0, =0x02020630 lsls r1, r3, 4 adds r1, r3 @@ -677990,15 +677990,15 @@ _0815F410: movs r3, 0x1C ldrsh r0, [r4, r3] cmp r0, 0 - bne _0815F482 -_0815F42E: + bne @0815F482 +@0815F42E: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0815F482 + b @0815F482 .align 2, 0 .pool -_0815F43C: +@0815F43C: ldrh r0, [r4, 0x1C] adds r0, 0x70 strh r0, [r4, 0x1C] @@ -678014,14 +678014,14 @@ _0815F43C: strh r0, [r1, 0x26] lsls r0, 16 cmp r0, 0 - ble _0815F460 + ble @0815F460 movs r0, 0 strh r0, [r1, 0x26] -_0815F460: +@0815F460: movs r3, 0x26 ldrsh r0, [r1, r3] cmp r0, 0 - bne _0815F482 + bne @0815F482 movs r0, 0x40 negs r0, r0 bl sub_80A5178 @@ -678032,7 +678032,7 @@ _0815F460: bl audio_play_and_stuff adds r0, r6, 0 bl move_anim_task_del -_0815F482: +@0815F482: pop {r4-r6} pop {r0} bx r0 @@ -678041,7 +678041,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 @@ -678049,7 +678049,7 @@ sub_815F48C: @ 815F48C bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0815F4B8 + bne @0815F4B8 ldrb r0, [r4] bl sub_80A82E4 subs r0, 0x2 @@ -678057,10 +678057,10 @@ sub_815F48C: @ 815F48C adds r1, 0x43 strb r0, [r1] ldr r4, =0x0000ff70 - b _0815F4C8 + b @0815F4C8 .align 2, 0 .pool -_0815F4B8: +@0815F4B8: ldrb r0, [r4] bl sub_80A82E4 adds r0, 0x2 @@ -678068,7 +678068,7 @@ _0815F4B8: adds r1, 0x43 strb r0, [r1] ldr r4, =0x0000ffa0 -_0815F4C8: +@0815F4C8: ldr r0, =0x02038437 ldrb r0, [r0] movs r1, 0x3 @@ -678087,36 +678087,36 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0x4 - bls _0815F4FE - b _0815F61A -_0815F4FE: + bls @0815F4FE + b @0815F61A +@0815F4FE: lsls r0, 2 - ldr r1, =_0815F50C + ldr r1, =@0815F50C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0815F50C: - .4byte _0815F520 - .4byte _0815F544 - .4byte _0815F584 - .4byte _0815F5B4 - .4byte _0815F5E0 -_0815F520: +@0815F50C: + .4byte @0815F520 + .4byte @0815F544 + .4byte @0815F584 + .4byte @0815F5B4 + .4byte @0815F5E0 +@0815F520: ldrh r0, [r4, 0x26] adds r0, 0xA strh r0, [r4, 0x26] lsls r0, 16 cmp r0, 0 - blt _0815F61A + blt @0815F61A movs r0, 0x3F bl sub_80A5178 adds r1, r0, 0 @@ -678126,8 +678126,8 @@ _0815F520: bl audio_play_and_stuff movs r0, 0 strh r0, [r4, 0x26] - b _0815F5D8 -_0815F544: + b @0815F5D8 +@0815F544: ldrh r1, [r4, 0x30] adds r1, 0x4 movs r5, 0 @@ -678145,7 +678145,7 @@ _0815F544: lsls r1, 16 asrs r1, 16 cmp r1, 0x7F - ble _0815F61A + ble @0815F61A movs r0, 0x3F bl sub_80A5178 adds r1, r0, 0 @@ -678155,10 +678155,10 @@ _0815F544: bl audio_play_and_stuff strh r5, [r4, 0x30] strh r5, [r4, 0x26] - b _0815F5D8 + b @0815F5D8 .align 2, 0 .pool -_0815F584: +@0815F584: ldrh r1, [r4, 0x30] adds r1, 0x6 movs r3, 0 @@ -678176,20 +678176,20 @@ _0815F584: lsls r1, 16 asrs r1, 16 cmp r1, 0x7F - ble _0815F61A + ble @0815F61A strh r3, [r4, 0x30] strh r3, [r4, 0x26] - b _0815F5D8 + b @0815F5D8 .align 2, 0 .pool -_0815F5B4: +@0815F5B4: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x8 - ble _0815F61A + ble @0815F61A movs r0, 0x3F bl sub_80A5178 adds r1, r0, 0 @@ -678199,19 +678199,19 @@ _0815F5B4: bl audio_play_and_stuff movs r0, 0 strh r0, [r4, 0x30] -_0815F5D8: +@0815F5D8: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _0815F61A -_0815F5E0: + b @0815F61A +@0815F5E0: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x8 - ble _0815F61A + ble @0815F61A movs r0, 0 strh r0, [r4, 0x30] ldrh r1, [r4, 0x32] @@ -678230,17 +678230,17 @@ _0815F5E0: movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0x7 - bne _0815F61A + bne @0815F61A adds r0, r4, 0 bl move_anim_8072740 -_0815F61A: +@0815F61A: pop {r4,r5} pop {r0} bx r0 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 @@ -678253,7 +678253,7 @@ sub_815F620: @ 815F620 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0 - bne _0815F66E + bne @0815F66E movs r0, 0x1 bl duplicate_obj_of_side_rel2move_in_transparent_mode lsls r0, 16 @@ -678261,7 +678261,7 @@ sub_815F620: @ 815F620 mov r10, r1 asrs r6, r0, 16 cmp r6, 0 - blt _0815F66E + blt @0815F66E movs r0, 0x1 bl duplicate_obj_of_side_rel2move_in_transparent_mode lsls r0, 16 @@ -678269,20 +678269,20 @@ sub_815F620: @ 815F620 mov r9, r1 asrs r1, r0, 16 cmp r1, 0 - bge _0815F67C + bge @0815F67C lsls r0, r6, 4 adds r0, r6 lsls r0, 2 ldr r1, =0x02020630 adds r0, r1 bl obj_delete_but_dont_free_vram -_0815F66E: +@0815F66E: mov r0, r8 bl move_anim_task_del - b _0815F780 + b @0815F780 .align 2, 0 .pool -_0815F67C: +@0815F67C: ldr r4, =0x02020630 lsls r0, r1, 4 adds r0, r1 @@ -678340,7 +678340,7 @@ _0815F67C: adds r7, r4, 0 mov r12, r3 cmp r0, 0 - bne _0815F720 + bne @0815F720 adds r2, r5, 0 adds r2, 0x3E ldrb r1, [r2] @@ -678354,10 +678354,10 @@ _0815F67C: movs r1, 0x4 orrs r0, r1 strb r0, [r2] - b _0815F736 + b @0815F736 .align 2, 0 .pool -_0815F720: +@0815F720: adds r1, r5, 0 adds r1, 0x3E ldrb r0, [r1] @@ -678369,7 +678369,7 @@ _0815F720: ldrb r0, [r1] orrs r0, r2 strb r0, [r1] -_0815F736: +@0815F736: mov r1, r9 lsls r0, r1, 16 asrs r0, 16 @@ -678407,7 +678407,7 @@ _0815F736: adds r0, r1 ldr r1, =sub_815F79C + 1 str r1, [r0] -_0815F780: +@0815F780: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -678420,7 +678420,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 @@ -678432,10 +678432,10 @@ sub_815F79C: @ 815F79C movs r1, 0x8 ldrsh r0, [r0, r1] cmp r0, 0 - bne _0815F7BA + bne @0815F7BA adds r0, r2, 0 bl move_anim_task_del -_0815F7BA: +@0815F7BA: pop {r0} bx r0 .align 2, 0 @@ -678443,7 +678443,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] @@ -678452,7 +678452,7 @@ sub_815F7C4: @ 815F7C4 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _0815F80E + ble @0815F80E movs r0, 0 strh r0, [r4, 0x30] ldr r0, =0x020244d0 @@ -678466,7 +678466,7 @@ sub_815F7C4: @ 815F7C4 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0815F80E + bne @0815F80E adds r3, r4, 0 adds r3, 0x3E ldrb r2, [r3] @@ -678481,7 +678481,7 @@ sub_815F7C4: @ 815F7C4 ands r0, r2 orrs r0, r1 strb r0, [r3] -_0815F80E: +@0815F80E: ldrh r0, [r4, 0x34] ldrh r1, [r4, 0x36] adds r0, r1 @@ -678498,39 +678498,39 @@ _0815F80E: movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - beq _0815F840 + beq @0815F840 cmp r0, 0x1 - beq _0815F858 - b _0815F896 + beq @0815F858 + b @0815F896 .align 2, 0 .pool -_0815F840: +@0815F840: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] lsls r0, 16 asrs r0, 16 cmp r0, 0x3C - bne _0815F896 + bne @0815F896 strh r5, [r4, 0x32] ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _0815F896 -_0815F858: + b @0815F896 +@0815F858: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] lsls r0, 16 cmp r0, 0 - ble _0815F896 + ble @0815F896 strh r5, [r4, 0x32] ldrh r0, [r4, 0x38] subs r0, 0x2 strh r0, [r4, 0x38] lsls r0, 16 cmp r0, 0 - bge _0815F896 + bge @0815F896 ldr r3, =0x03005e00 movs r2, 0x3C ldrsh r1, [r4, r2] @@ -678548,7 +678548,7 @@ _0815F858: strh r0, [r1] adds r0, r4, 0 bl obj_delete_but_dont_free_vram -_0815F896: +@0815F896: pop {r4,r5} pop {r0} bx r0 @@ -678557,7 +678557,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 @@ -678573,26 +678573,26 @@ sub_815F8A0: @ 815F8A0 lsrs r0, 24 adds r2, r1, 0 cmp r0, 0x1E - bhi _0815F8C4 + bhi @0815F8C4 movs r0, 0x1 strh r0, [r3, 0xE] -_0815F8C4: +@0815F8C4: adds r0, r2, 0 subs r0, 0x5C lsls r0, 24 lsrs r0, 24 cmp r0, 0x6C - bhi _0815F8D4 + bhi @0815F8D4 movs r0, 0x2 strh r0, [r3, 0xE] -_0815F8D4: +@0815F8D4: lsls r0, r1, 24 lsrs r0, 24 cmp r0, 0xC8 - bls _0815F8E0 + bls @0815F8E0 movs r0, 0x3 strh r0, [r3, 0xE] -_0815F8E0: +@0815F8E0: adds r0, r4, 0 bl move_anim_task_del pop {r4} @@ -678603,7 +678603,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 @@ -678621,24 +678621,24 @@ sub_815F8F4: @ 815F8F4 movs r1, 0x8 ldrsh r0, [r0, r1] cmp r0, 0x4 - bls _0815F91A - b _0815FE68 -_0815F91A: + bls @0815F91A + b @0815FE68 +@0815F91A: lsls r0, 2 - ldr r1, =_0815F92C + ldr r1, =@0815F92C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0815F92C: - .4byte _0815F940 - .4byte _0815F9F4 - .4byte _0815FBE8 - .4byte _0815FD08 - .4byte _0815FD8C -_0815F940: +@0815F92C: + .4byte @0815F940 + .4byte @0815F9F4 + .4byte @0815FBE8 + .4byte @0815FD08 + .4byte @0815FD8C +@0815F940: movs r0, 0 bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -678661,7 +678661,7 @@ _0815F940: lsls r0, 24 mov r9, r4 cmp r0, 0 - bne _0815F998 + bne @0815F998 ldr r2, =0x02020630 lsls r3, r7, 4 adds r1, r3, r7 @@ -678673,10 +678673,10 @@ _0815F940: ldrh r4, [r1, 0x24] adds r0, r4 strh r0, [r1, 0x24] - b _0815F9B2 + b @0815F9B2 .align 2, 0 .pool -_0815F998: +@0815F998: ldr r3, =0x02020630 lsls r4, r7, 4 adds r2, r4, r7 @@ -678690,7 +678690,7 @@ _0815F998: strh r0, [r2, 0x24] adds r2, r3, 0 adds r3, r4, 0 -_0815F9B2: +@0815F9B2: ldr r1, =0x03005e00 mov r0, r9 add r0, r8 @@ -678711,22 +678711,22 @@ _0815F9B2: movs r1, 0x98 lsls r1, 17 cmp r0, r1 - bhi _0815F9DE - b _0815FE68 -_0815F9DE: + bhi @0815F9DE + b @0815FE68 +@0815F9DE: movs r0, 0 strh r0, [r4, 0xA] ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0815FE68 + b @0815FE68 .align 2, 0 .pool -_0815F9F4: +@0815F9F4: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq _0815FA28 + beq @0815FA28 ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] @@ -678741,16 +678741,16 @@ _0815F9F4: lsls r0, 24 lsrs r4, r0, 24 movs r7, 0 - b _0815FB4E + b @0815FB4E .align 2, 0 .pool -_0815FA28: +@0815FA28: ldr r4, =0x02038436 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0815FAC8 + bne @0815FAC8 ldr r7, =0x0202406e ldrb r0, [r4] lsls r0, 1 @@ -678780,7 +678780,7 @@ _0815FA28: adds r1, r0, r1 ldrh r0, [r1, 0x2] cmp r0, 0 - bne _0815FA9C + bne @0815FA9C lsls r0, r2, 1 adds r0, r7 ldrh r0, [r0] @@ -678790,12 +678790,12 @@ _0815FA28: bl pokemon_getattr lsls r0, 16 lsrs r6, r0, 16 - b _0815FA9E + b @0815FA9E .align 2, 0 .pool -_0815FA9C: +@0815FA9C: ldrh r6, [r1, 0x2] -_0815FA9E: +@0815FA9E: movs r0, 0x1 bl obj_id_for_side_relative_to_move ldr r2, =0x02020630 @@ -678813,10 +678813,10 @@ _0815FA9E: movs r7, 0 movs r5, 0x88 lsls r5, 1 - b _0815FB50 + b @0815FB50 .align 2, 0 .pool -_0815FAC8: +@0815FAC8: ldr r7, =0x0202406e ldrb r0, [r4] lsls r0, 1 @@ -678846,7 +678846,7 @@ _0815FAC8: adds r1, r0, r1 ldrh r0, [r1, 0x2] cmp r0, 0 - bne _0815FB2C + bne @0815FB2C lsls r0, r2, 1 adds r0, r7 ldrh r0, [r0] @@ -678856,12 +678856,12 @@ _0815FAC8: bl pokemon_getattr lsls r0, 16 lsrs r6, r0, 16 - b _0815FB2E + b @0815FB2E .align 2, 0 .pool -_0815FB2C: +@0815FB2C: ldrh r6, [r1, 0x2] -_0815FB2E: +@0815FB2E: movs r0, 0x1 bl obj_id_for_side_relative_to_move ldr r2, =0x02020630 @@ -678877,9 +678877,9 @@ _0815FB2E: lsls r0, 24 lsrs r4, r0, 24 movs r7, 0x1 -_0815FB4E: +@0815FB4E: ldr r5, =0x0000ffe0 -_0815FB50: +@0815FB50: ldr r0, =0x02038437 ldrb r0, [r0] movs r1, 0x1 @@ -678913,7 +678913,7 @@ _0815FB50: adds r0, r1 ldrh r0, [r0, 0x2] cmp r0, 0 - beq _0815FBBA + beq @0815FBBA ldr r1, =0x02020630 lsls r0, r5, 4 adds r0, r5 @@ -678930,7 +678930,7 @@ _0815FB50: movs r1, 0x10 movs r2, 0x6 bl pal_fade_1 -_0815FBBA: +@0815FBBA: ldr r0, =0x03005e00 mov r3, r8 lsls r1, r3, 2 @@ -678938,10 +678938,10 @@ _0815FBBA: lsls r1, 3 adds r1, r0 strh r5, [r1, 0x26] - b _0815FD7E + b @0815FD7E .align 2, 0 .pool -_0815FBE8: +@0815FBE8: ldr r1, =0x03005e00 mov r0, r8 lsls r4, r0, 2 @@ -678963,7 +678963,7 @@ _0815FBE8: lsls r0, 24 mov r9, r4 cmp r0, 0 - bne _0815FC40 + bne @0815FC40 ldr r3, =0x02020630 lsls r4, r5, 4 adds r2, r4, r5 @@ -678977,10 +678977,10 @@ _0815FBE8: strh r0, [r2, 0x24] adds r2, r3, 0 adds r3, r4, 0 - b _0815FC56 + b @0815FC56 .align 2, 0 .pool -_0815FC40: +@0815FC40: ldr r2, =0x02020630 lsls r3, r5, 4 adds r1, r3, r5 @@ -678992,7 +678992,7 @@ _0815FC40: ldrh r4, [r1, 0x24] adds r0, r4 strh r0, [r1, 0x24] -_0815FC56: +@0815FC56: ldr r1, =0x03005e00 mov r0, r9 add r0, r8 @@ -679011,13 +679011,13 @@ _0815FC56: movs r1, 0x24 ldrsh r0, [r6, r1] cmp r0, 0 - bne _0815FCD6 + bne @0815FCD6 ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0815FCB4 + bne @0815FCB4 lsls r4, r5, 16 asrs r4, 16 ldr r0, =0x02038437 @@ -679027,11 +679027,11 @@ _0815FC56: lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bge _0815FCD6 - b _0815FCCA + bge @0815FCD6 + b @0815FCCA .align 2, 0 .pool -_0815FCB4: +@0815FCB4: lsls r4, r5, 16 asrs r4, 16 ldr r0, =0x02038437 @@ -679041,15 +679041,15 @@ _0815FCB4: lsls r0, 24 lsrs r0, 24 cmp r4, r0 - ble _0815FCD6 -_0815FCCA: + ble @0815FCD6 +@0815FCCA: ldrh r0, [r6, 0x24] adds r0, 0x1 strh r0, [r6, 0x24] ldr r1, =0x0203841e ldr r0, =0x0000ffff strh r0, [r1, 0xE] -_0815FCD6: +@0815FCD6: lsls r0, r5, 16 movs r2, 0x80 lsls r2, 14 @@ -679057,9 +679057,9 @@ _0815FCD6: movs r1, 0x98 lsls r1, 17 cmp r0, r1 - bhi _0815FCE8 - b _0815FE68 -_0815FCE8: + bhi @0815FCE8 + b @0815FE68 +@0815FCE8: ldr r0, =0x03005e00 mov r1, r9 add r1, r8 @@ -679067,10 +679067,10 @@ _0815FCE8: adds r1, r0 movs r0, 0 strh r0, [r1, 0xA] - b _0815FD7E + b @0815FD7E .align 2, 0 .pool -_0815FD08: +@0815FD08: movs r0, 0 bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -679096,7 +679096,7 @@ _0815FD08: lsls r0, 24 mov r9, r4 cmp r0, 0 - bne _0815FD60 + bne @0815FD60 lsls r1, r7, 4 adds r1, r7 lsls r1, 2 @@ -679105,10 +679105,10 @@ _0815FD08: negs r0, r0 subs r0, 0x20 strh r0, [r1, 0x24] - b _0815FD74 + b @0815FD74 .align 2, 0 .pool -_0815FD60: +@0815FD60: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -679119,20 +679119,20 @@ _0815FD60: adds r1, r4, 0 subs r1, r2 strh r1, [r0, 0x24] -_0815FD74: +@0815FD74: ldr r0, =0x03005e00 mov r1, r9 add r1, r8 lsls r1, 3 adds r1, r0 -_0815FD7E: +@0815FD7E: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _0815FE68 + b @0815FE68 .align 2, 0 .pool -_0815FD8C: +@0815FD8C: movs r0, 0 bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -679158,7 +679158,7 @@ _0815FD8C: mov r9, r4 ldr r2, [sp, 0x18] cmp r0, 0 - bne _0815FE0C + bne @0815FE0C ldr r1, =0x02020630 lsls r5, r7, 4 adds r0, r5, r7 @@ -679183,13 +679183,13 @@ _0815FD8C: lsrs r0, 24 adds r3, r5, 0 cmp r4, r0 - blt _0815FE44 + blt @0815FE44 movs r2, 0 strh r2, [r6, 0x24] - b _0815FE44 + b @0815FE44 .align 2, 0 .pool -_0815FE0C: +@0815FE0C: ldr r1, =0x02020630 lsls r5, r7, 4 adds r0, r5, r7 @@ -679214,10 +679214,10 @@ _0815FE0C: lsrs r0, 24 adds r3, r5, 0 cmp r4, r0 - bgt _0815FE44 + bgt @0815FE44 movs r4, 0 strh r4, [r6, 0x24] -_0815FE44: +@0815FE44: ldr r1, =0x03005e00 mov r0, r9 add r0, r8 @@ -679232,10 +679232,10 @@ _0815FE44: movs r1, 0x24 ldrsh r0, [r0, r1] cmp r0, 0 - bne _0815FE68 + bne @0815FE68 mov r0, r8 bl move_anim_task_del -_0815FE68: +@0815FE68: add sp, 0x1C pop {r3-r5} mov r8, r3 @@ -679249,24 +679249,24 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - beq _0815FE92 + beq @0815FE92 cmp r0, 0x1 - beq _0815FF3A - b _0815FFBC -_0815FE92: + beq @0815FF3A + b @0815FFBC +@0815FE92: ldr r0, =0x0203841e movs r2, 0xE ldrsh r1, [r0, r2] movs r0, 0x1 negs r0, r0 cmp r1, r0 - bne _0815FF2C + bne @0815FF2C movs r0, 0x3F bl sub_80A5178 adds r1, r0, 0 @@ -679300,11 +679300,11 @@ _0815FE92: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0815FFBC + bne @0815FFBC bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0815FFBC + bne @0815FFBC movs r0, 0x1 bl obj_id_for_side_relative_to_move ldr r2, =0x02020630 @@ -679320,18 +679320,18 @@ _0815FE92: adds r1, r4, 0 adds r1, 0x43 strb r0, [r1] - b _0815FFBC + b @0815FFBC .align 2, 0 .pool -_0815FF2C: +@0815FF2C: adds r0, r4, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] - b _0815FFBC -_0815FF3A: + b @0815FFBC +@0815FF3A: movs r1, 0x30 ldrsh r0, [r4, r1] movs r2, 0x2E @@ -679344,7 +679344,7 @@ _0815FF3A: lsls r0, 16 asrs r0, 16 cmp r0, 0x7F - ble _0815FF6E + ble @0815FF6E movs r1, 0x2E ldrsh r0, [r4, r1] lsrs r1, r0, 31 @@ -679357,7 +679357,7 @@ _0815FF3A: adds r0, r2, 0 subs r0, 0x7A strh r0, [r4, 0x30] -_0815FF6E: +@0815FF6E: movs r2, 0x80 lsls r2, 1 adds r0, r2, 0 @@ -679369,7 +679369,7 @@ _0815FF6E: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0815FF9C + bne @0815FF9C ldrh r2, [r4, 0x32] lsls r1, r2, 16 asrs r1, 24 @@ -679377,34 +679377,34 @@ _0815FF6E: subs r0, r1 strh r0, [r4, 0x24] adds r1, r2, 0 - b _0815FFA8 + b @0815FFA8 .align 2, 0 .pool -_0815FF9C: +@0815FF9C: ldrh r1, [r4, 0x32] lsls r0, r1, 16 asrs r0, 24 ldrh r2, [r4, 0x24] adds r0, r2 strh r0, [r4, 0x24] -_0815FFA8: +@0815FFA8: movs r0, 0xFF ands r0, r1 strh r0, [r4, 0x32] movs r1, 0x34 ldrsh r0, [r4, r1] cmp r0, 0x2 - bne _0815FFBC + bne @0815FFBC adds r0, r4, 0 bl move_anim_8072740 -_0815FFBC: +@0815FFBC: pop {r4} pop {r0} bx r0 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 @@ -679417,24 +679417,24 @@ sub_815FFC4: @ 815FFC4 ldrsh r0, [r0, r2] adds r3, r1, 0 cmp r0, 0x4 - bls _0815FFE0 - b _08160132 -_0815FFE0: + bls @0815FFE0 + b @08160132 +@0815FFE0: lsls r0, 2 - ldr r1, =_0815FFF4 + ldr r1, =@0815FFF4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0815FFF4: - .4byte _08160008 - .4byte _08160058 - .4byte _081600B4 - .4byte _081600CC - .4byte _08160132 -_08160008: +@0815FFF4: + .4byte @08160008 + .4byte @08160058 + .4byte @081600B4 + .4byte @081600CC + .4byte @08160132 +@08160008: ldr r0, =0x02038436 ldrb r0, [r0] movs r1, 0 @@ -679457,19 +679457,19 @@ _08160008: movs r0, 0x6 strh r0, [r1, 0x8] cmp r5, r2 - ble _0816003E + ble @0816003E negs r0, r0 strh r0, [r1, 0x8] -_0816003E: +@0816003E: strh r5, [r1, 0xA] strh r2, [r1, 0xC] ldrh r0, [r1, 0x26] adds r0, 0x1 strh r0, [r1, 0x26] - b _08160150 + b @08160150 .align 2, 0 .pool -_08160058: +@08160058: ldr r1, =0x020241e4 ldr r0, =0x02038436 ldrb r0, [r0] @@ -679491,7 +679491,7 @@ _08160058: movs r3, 0x8 ldrsh r0, [r2, r3] cmp r0, 0 - ble _081600A0 + ble @081600A0 movs r3, 0x20 ldrsh r0, [r1, r3] movs r3, 0x24 @@ -679499,10 +679499,10 @@ _08160058: adds r0, r1 movs r3, 0xC ldrsh r1, [r2, r3] - b _08160126 + b @08160126 .align 2, 0 .pool -_081600A0: +@081600A0: movs r3, 0x20 ldrsh r0, [r1, r3] movs r3, 0x24 @@ -679511,9 +679511,9 @@ _081600A0: movs r3, 0xC ldrsh r1, [r2, r3] cmp r0, r1 - bgt _08160150 - b _0816012A -_081600B4: + bgt @08160150 + b @0816012A +@081600B4: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -679525,8 +679525,8 @@ _081600B4: ldrh r1, [r0, 0x26] adds r1, 0x1 strh r1, [r0, 0x26] - b _08160150 -_081600CC: + b @08160150 +@081600CC: ldr r1, =0x020241e4 ldr r0, =0x02038436 ldrb r0, [r0] @@ -679548,7 +679548,7 @@ _081600CC: movs r3, 0x8 ldrsh r0, [r2, r3] cmp r0, 0 - bge _08160118 + bge @08160118 movs r3, 0x20 ldrsh r0, [r1, r3] movs r3, 0x24 @@ -679557,11 +679557,11 @@ _081600CC: movs r3, 0xA ldrsh r1, [r2, r3] cmp r0, r1 - bgt _08160150 - b _0816012A + bgt @08160150 + b @0816012A .align 2, 0 .pool -_08160118: +@08160118: movs r3, 0x20 ldrsh r0, [r1, r3] movs r3, 0x24 @@ -679569,15 +679569,15 @@ _08160118: adds r0, r1 movs r3, 0xA ldrsh r1, [r2, r3] -_08160126: +@08160126: cmp r0, r1 - blt _08160150 -_0816012A: + blt @08160150 +@0816012A: ldrh r0, [r2, 0x26] adds r0, 0x1 strh r0, [r2, 0x26] - b _08160150 -_08160132: + b @08160150 +@08160132: ldr r1, =0x020241e4 ldr r0, =0x02038436 ldrb r0, [r0] @@ -679592,7 +679592,7 @@ _08160132: strh r1, [r0, 0x24] adds r0, r4, 0 bl move_anim_task_del -_08160150: +@08160150: pop {r4,r5} pop {r0} bx r0 @@ -679601,7 +679601,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 @@ -679624,9 +679624,9 @@ sub_8160164: @ 8160164 negs r2, r2 adds r1, r2, 0 cmp r0, 0 - bne _08160198 + bne @08160198 movs r1, 0x1 -_08160198: +@08160198: strh r1, [r4, 0x10] ldr r2, =0x02020630 movs r0, 0xE @@ -679658,7 +679658,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 @@ -679670,19 +679670,19 @@ sub_81601DC: @ 81601DC movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _08160284 + beq @08160284 cmp r0, 0x1 - bgt _08160204 + bgt @08160204 cmp r0, 0 - beq _0816020A - b _081602DA + beq @0816020A + b @081602DA .align 2, 0 .pool -_08160204: +@08160204: cmp r0, 0x2 - beq _081602D4 - b _081602DA -_0816020A: + beq @081602D4 + b @081602DA +@0816020A: ldrh r0, [r4, 0x1E] adds r0, 0x8 movs r2, 0xFF @@ -679729,7 +679729,7 @@ _0816020A: movs r6, 0x1A ldrsh r0, [r4, r6] cmp r0, 0 - bne _081602DA + bne @081602DA movs r0, 0xE ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -679738,10 +679738,10 @@ _0816020A: adds r0, r5 ldrh r1, [r4, 0x12] strh r1, [r0, 0x20] - b _081602C4 + b @081602C4 .align 2, 0 .pool -_08160284: +@08160284: ldrh r0, [r4, 0x1E] adds r0, 0x8 movs r1, 0xFF @@ -679766,7 +679766,7 @@ _08160284: movs r6, 0x1E ldrsh r2, [r4, r6] cmp r2, 0 - bne _081602DA + bne @081602DA movs r1, 0xE ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -679774,24 +679774,24 @@ _08160284: lsls r1, 2 adds r1, r3 strh r2, [r1, 0x24] -_081602C4: +@081602C4: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _081602DA + b @081602DA .align 2, 0 .pool -_081602D4: +@081602D4: adds r0, r2, 0 bl move_anim_task_del -_081602DA: +@081602DA: pop {r4-r6} pop {r0} bx r0 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 @@ -679820,10 +679820,10 @@ sub_81602E0: @ 81602E0 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08160326 + beq @08160326 adds r0, r4, 0 bl move_anim_8072740 -_08160326: +@08160326: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] @@ -679835,7 +679835,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 @@ -679843,7 +679843,7 @@ sub_8160338: @ 8160338 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0816037C + bne @0816037C ldr r2, =0x0203841e ldrh r0, [r4, 0x20] ldrh r1, [r2] @@ -679860,10 +679860,10 @@ sub_8160338: @ 8160338 adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 - b _08160396 + b @08160396 .align 2, 0 .pool -_0816037C: +@0816037C: movs r0, 0xB strh r0, [r4, 0x2E] movs r0, 0xC0 @@ -679877,7 +679877,7 @@ _0816037C: ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] -_08160396: +@08160396: ldr r0, =sub_81602E0 + 1 str r0, [r4, 0x1C] pop {r4} @@ -679888,7 +679888,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 @@ -679905,10 +679905,10 @@ sub_81603A8: @ 81603A8 lsls r0, 16 asrs r0, 16 cmp r0, 0xF - bgt _081603D2 + bgt @081603D2 movs r0, 0x10 strh r0, [r5, 0x22] -_081603D2: +@081603D2: movs r0, 0 strh r0, [r5, 0x3A] movs r1, 0x10 @@ -679926,55 +679926,55 @@ _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 ldrsh r1, [r4, r0] cmp r1, 0x1 - beq _0816046C + beq @0816046C cmp r1, 0x1 - bgt _0816040A + bgt @0816040A cmp r1, 0 - beq _08160414 - b _081604E8 -_0816040A: + beq @08160414 + b @081604E8 +@0816040A: cmp r1, 0x2 - beq _08160482 + beq @08160482 cmp r1, 0x3 - beq _081604E2 - b _081604E8 -_08160414: + beq @081604E2 + b @081604E8 +@08160414: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _081604E8 + ble @081604E8 strh r1, [r4, 0x2E] ldrh r1, [r4, 0x30] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0816043E + bne @0816043E ldrh r2, [r4, 0x3A] movs r3, 0x3A ldrsh r0, [r4, r3] cmp r0, 0xF - bgt _0816044C + bgt @0816044C adds r0, r2, 0x1 strh r0, [r4, 0x3A] - b _0816044C -_0816043E: + b @0816044C +@0816043E: ldrh r2, [r4, 0x3C] movs r3, 0x3C ldrsh r0, [r4, r3] cmp r0, 0 - beq _0816044C + beq @0816044C subs r0, r2, 0x1 strh r0, [r4, 0x3C] -_0816044C: +@0816044C: adds r0, r1, 0x1 strh r0, [r4, 0x30] ldrh r1, [r4, 0x3C] @@ -679988,9 +679988,9 @@ _0816044C: movs r1, 0x3C ldrsh r0, [r4, r1] cmp r0, 0 - bne _081604E8 - b _081604DA -_0816046C: + bne @081604E8 + b @081604DA +@0816046C: ldrh r0, [r4, 0x2E] adds r0, 0x1 movs r1, 0 @@ -679998,42 +679998,42 @@ _0816046C: lsls r0, 16 asrs r0, 16 cmp r0, 0xA - bne _081604E8 + bne @081604E8 strh r1, [r4, 0x2E] strh r1, [r4, 0x30] - b _081604DA -_08160482: + b @081604DA +@08160482: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _081604E8 + ble @081604E8 movs r0, 0 strh r0, [r4, 0x2E] ldrh r1, [r4, 0x30] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _081604AE + bne @081604AE ldrh r2, [r4, 0x3A] movs r3, 0x3A ldrsh r0, [r4, r3] cmp r0, 0 - beq _081604BC + beq @081604BC subs r0, r2, 0x1 strh r0, [r4, 0x3A] - b _081604BC -_081604AE: + b @081604BC +@081604AE: ldrh r2, [r4, 0x3C] movs r3, 0x3C ldrsh r0, [r4, r3] cmp r0, 0xF - bgt _081604BC + bgt @081604BC adds r0, r2, 0x1 strh r0, [r4, 0x3C] -_081604BC: +@081604BC: adds r0, r1, 0x1 strh r0, [r4, 0x30] ldrh r1, [r4, 0x3C] @@ -680047,23 +680047,23 @@ _081604BC: movs r1, 0x3C ldrsh r0, [r4, r1] cmp r0, 0x10 - bne _081604E8 -_081604DA: + bne @081604E8 +@081604DA: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] - b _081604E8 -_081604E2: + b @081604E8 +@081604E2: adds r0, r4, 0 bl move_anim_8074EE0 -_081604E8: +@081604E8: pop {r4} pop {r0} bx r0 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 @@ -680075,34 +680075,34 @@ sub_81604F0: @ 81604F0 movs r0, 0x60 ands r0, r1 cmp r0, 0 - beq _08160514 + beq @08160514 movs r0, 0x1 - b _08160536 + b @08160536 .align 2, 0 .pool -_08160514: +@08160514: movs r0, 0x7 ands r0, r1 cmp r0, 0 - beq _08160520 + beq @08160520 movs r0, 0x2 - b _08160536 -_08160520: + b @08160536 +@08160520: movs r0, 0x18 ands r0, r1 cmp r0, 0 - beq _0816052C + beq @0816052C movs r0, 0x3 - b _08160536 -_0816052C: + b @08160536 +@0816052C: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08160538 + beq @08160538 movs r0, 0x4 -_08160536: +@08160536: strh r0, [r2, 0xE] -_08160538: +@08160538: adds r0, r3, 0 bl move_anim_task_del pop {r0} @@ -680110,7 +680110,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 @@ -680141,7 +680141,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 @@ -680159,14 +680159,14 @@ sub_816058C: @ 816058C lsrs r0, 16 adds r6, r2, 0 cmp r0, 0x16 - bhi _081605F0 + bhi @081605F0 ldrh r0, [r3, 0xA] adds r0, 0x1 strh r0, [r3, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - ble _08160600 + ble @08160600 strh r5, [r3, 0xA] ldrh r0, [r3, 0xC] adds r0, 0x1 @@ -680174,7 +680174,7 @@ sub_816058C: @ 816058C movs r5, 0x1 ands r0, r5 cmp r0, 0 - bne _081605F0 + bne @081605F0 ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r3, r0] @@ -680184,10 +680184,10 @@ sub_816058C: @ 816058C adds r0, r2 ldr r1, =0x0000ffff strh r1, [r0, 0x24] - b _08160600 + b @08160600 .align 2, 0 .pool -_081605F0: +@081605F0: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r3, r0] @@ -680196,7 +680196,7 @@ _081605F0: lsls r0, 2 adds r0, r2 strh r5, [r0, 0x24] -_08160600: +@08160600: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -680204,10 +680204,10 @@ _08160600: bl sub_80A7D34 lsls r0, 24 cmp r0, 0 - bne _08160618 + bne @08160618 adds r0, r4, 0 bl move_anim_task_del -_08160618: +@08160618: pop {r4-r6} pop {r0} bx r0 @@ -680216,7 +680216,7 @@ _08160618: thumb_func_end sub_816058C thumb_func_start sub_8160624 -sub_8160624: @ 8160624 +sub_8160624: ; 8160624 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -680226,7 +680226,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 @@ -680248,7 +680248,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 @@ -680257,7 +680257,7 @@ sub_8160664: @ 8160664 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08160688 + bne @08160688 ldr r0, =sub_81606A0 + 1 bl set_callback2 ldr r1, =0x03005dac @@ -680265,7 +680265,7 @@ sub_8160664: @ 8160664 str r0, [r1] adds r0, r4, 0 bl remove_task -_08160688: +@08160688: pop {r4} pop {r0} bx r0 @@ -680274,7 +680274,7 @@ _08160688: thumb_func_end sub_8160664 thumb_func_start sub_81606A0 -sub_81606A0: @ 81606A0 +sub_81606A0: ; 81606A0 push {r4-r6,lr} bl reset_all_obj_data bl gpu_pal_allocator_reset @@ -680329,7 +680329,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 reset_all_obj_data bl gpu_pal_allocator_reset @@ -680387,7 +680387,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 @@ -680415,7 +680415,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 run_active_tasks @@ -680428,7 +680428,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 @@ -680444,7 +680444,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} @@ -680454,53 +680454,53 @@ sub_8160868: @ 8160868 ldrb r0, [r0] adds r7, r1, 0 cmp r0, 0x21 - bls _0816087E - b _08160E8A -_0816087E: + bls @0816087E + b @08160E8A +@0816087E: lsls r0, 2 - ldr r1, =_08160890 + ldr r1, =@08160890 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08160890: - .4byte _08160918 - .4byte _08160932 - .4byte _0816094C - .4byte _08160954 - .4byte _0816095C - .4byte _08160964 - .4byte _08160980 - .4byte _08160E8A - .4byte _08160988 - .4byte _081609A8 - .4byte _08160E8A - .4byte _08160E8A - .4byte _08160A44 - .4byte _08160A64 - .4byte _08160CB8 - .4byte _08160CD8 - .4byte _08160AB8 - .4byte _08160AD0 - .4byte _08160AEC - .4byte _08160C1C - .4byte _08160C48 - .4byte _08160C98 - .4byte _08160CA6 - .4byte _08160E8A - .4byte _08160B2C - .4byte _08160B60 - .4byte _08160B80 - .4byte _08160BDC - .4byte _08160CFC - .4byte _08160D48 - .4byte _08160E0C - .4byte _08160E38 - .4byte _08160E58 - .4byte _08160E70 -_08160918: +@08160890: + .4byte @08160918 + .4byte @08160932 + .4byte @0816094C + .4byte @08160954 + .4byte @0816095C + .4byte @08160964 + .4byte @08160980 + .4byte @08160E8A + .4byte @08160988 + .4byte @081609A8 + .4byte @08160E8A + .4byte @08160E8A + .4byte @08160A44 + .4byte @08160A64 + .4byte @08160CB8 + .4byte @08160CD8 + .4byte @08160AB8 + .4byte @08160AD0 + .4byte @08160AEC + .4byte @08160C1C + .4byte @08160C48 + .4byte @08160C98 + .4byte @08160CA6 + .4byte @08160E8A + .4byte @08160B2C + .4byte @08160B60 + .4byte @08160B80 + .4byte @08160BDC + .4byte @08160CFC + .4byte @08160D48 + .4byte @08160E0C + .4byte @08160E38 + .4byte @08160E58 + .4byte @08160E70 +@08160918: ldr r1, [r7] ldrb r0, [r1] adds r0, 0x1 @@ -680512,72 +680512,72 @@ _08160918: negs r0, r0 str r4, [sp] movs r1, 0 - b _08160CAE -_08160932: + b @08160CAE +@08160932: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08160940 - b _08160E8A -_08160940: + beq @08160940 + b @08160E8A +@08160940: ldr r1, [r7] movs r0, 0x4 - b _08160E88 + b @08160E88 .align 2, 0 .pool -_0816094C: +@0816094C: ldr r1, [r7] ldrb r0, [r1] adds r0, 0x1 - b _08160E88 -_08160954: + b @08160E88 +@08160954: movs r0, 0 bl render_previous_quest_text - b _0816096A -_0816095C: + b @0816096A +@0816095C: movs r0, 0 bl sub_8160F50 - b _08160E8A -_08160964: + b @08160E8A +@08160964: movs r0, 0 bl sub_8161074 -_0816096A: +@0816096A: ldr r0, =0x0203bc34 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] bl sub_81611AC - b _08160E8A + b @08160E8A .align 2, 0 .pool -_08160980: +@08160980: movs r0, 0x1 bl sub_8160F50 - b _08160E8A -_08160988: + b @08160E8A +@08160988: bl sub_81D2C3C lsls r0, 16 cmp r0, 0 - beq _08160994 - b _08160E8A -_08160994: + beq @08160994 + b @08160E8A +@08160994: bl sub_81D2C50 ldr r0, =0x0203bc34 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 - b _08160E88 + b @08160E88 .align 2, 0 .pool -_081609A8: +@081609A8: bl sub_8198C58 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - bne _08160A0A + bne @08160A0A ldr r5, =0x0203bc34 ldr r0, [r5] adds r0, 0x44 @@ -680596,7 +680596,7 @@ _081609A8: lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 - beq _08160A04 + beq @08160A04 ldr r0, =0x085ef8e4 bl sub_816084C ldr r1, =0x020375e0 @@ -680604,153 +680604,153 @@ _081609A8: strh r0, [r1] ldr r1, [r5] movs r0, 0x1F - b _08160E88 + b @08160E88 .align 2, 0 .pool -_08160A04: +@08160A04: ldr r1, [r5] movs r0, 0x10 - b _08160E88 -_08160A0A: + b @08160E88 +@08160A0A: movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _08160A18 + beq @08160A18 cmp r1, 0x1 - beq _08160A18 - b _08160E8A -_08160A18: + beq @08160A18 + b @08160E8A +@08160A18: ldr r0, =0x0203bc38 ldrb r0, [r0, 0x4] cmp r0, 0 - bne _08160A30 + bne @08160A30 ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x3 - b _08160E88 + b @08160E88 .align 2, 0 .pool -_08160A30: +@08160A30: cmp r0, 0x1 - beq _08160A36 - b _08160E8A -_08160A36: + beq @08160A36 + b @08160E8A +@08160A36: ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x5 - b _08160E88 + b @08160E88 .align 2, 0 .pool -_08160A44: +@08160A44: bl sub_81D2C3C lsls r0, 16 cmp r0, 0 - beq _08160A50 - b _08160E8A -_08160A50: + beq @08160A50 + b @08160E8A +@08160A50: bl sub_81D2C50 ldr r0, =0x0203bc34 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 - b _08160E88 + b @08160E88 .align 2, 0 .pool -_08160A64: +@08160A64: bl sub_8198C58 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - bne _08160A7C + bne @08160A7C ldr r0, =0x020375e0 strh r1, [r0] - b _08160E82 + b @08160E82 .align 2, 0 .pool -_08160A7C: +@08160A7C: movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _08160A8A + beq @08160A8A cmp r1, 0x1 - beq _08160A8A - b _08160E8A -_08160A8A: + beq @08160A8A + b @08160E8A +@08160A8A: ldr r0, =0x0203bc38 ldrb r0, [r0, 0x4] cmp r0, 0 - bne _08160AA4 + bne @08160AA4 ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x3 - b _08160E88 + b @08160E88 .align 2, 0 .pool -_08160AA4: +@08160AA4: cmp r0, 0x1 - beq _08160AAA - b _08160E8A -_08160AAA: + beq @08160AAA + b @08160E8A +@08160AAA: ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x5 - b _08160E88 + b @08160E88 .align 2, 0 .pool -_08160AB8: +@08160AB8: ldr r0, =0x085ef8f3 bl sub_816084C ldr r0, =0x0203bc34 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 - b _08160E88 + b @08160E88 .align 2, 0 .pool -_08160AD0: +@08160AD0: bl sub_81D2C3C lsls r0, 16 cmp r0, 0 - beq _08160ADC - b _08160E8A -_08160ADC: + beq @08160ADC + b @08160E8A +@08160ADC: bl sub_81D2C50 ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x12 - b _08160E88 + b @08160E88 .align 2, 0 .pool -_08160AEC: +@08160AEC: bl sub_8198C58 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - bne _08160B10 + bne @08160B10 ldr r0, =0x085efa10 bl sub_816084C ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x13 - b _08160E88 + b @08160E88 .align 2, 0 .pool -_08160B10: +@08160B10: movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _08160B1E + beq @08160B1E cmp r1, 0x1 - beq _08160B1E - b _08160E8A -_08160B1E: + beq @08160B1E + b @08160E8A +@08160B1E: ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x18 - b _08160E88 + b @08160E88 .align 2, 0 .pool -_08160B2C: +@08160B2C: ldr r4, =0x02021dc4 bl sub_8161054 movs r1, 0xD @@ -680765,109 +680765,109 @@ _08160B2C: ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 - b _08160E88 + b @08160E88 .align 2, 0 .pool -_08160B60: +@08160B60: bl sub_81D2C3C lsls r0, 16 cmp r0, 0 - beq _08160B6C - b _08160E8A -_08160B6C: + beq @08160B6C + b @08160E8A +@08160B6C: bl sub_81D2C50 ldr r0, =0x0203bc34 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 - b _08160E88 + b @08160E88 .align 2, 0 .pool -_08160B80: +@08160B80: bl sub_8198C58 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - bne _08160B98 + bne @08160B98 ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x1B - b _08160E88 + b @08160E88 .align 2, 0 .pool -_08160B98: +@08160B98: movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _08160BA6 + beq @08160BA6 cmp r1, 0x1 - beq _08160BA6 - b _08160E8A -_08160BA6: + beq @08160BA6 + b @08160E8A +@08160BA6: ldr r0, =0x0203bc38 ldrb r0, [r0, 0x4] cmp r0, 0 - bne _08160BC4 + bne @08160BC4 ldr r2, =0x0203bc34 ldr r1, [r2] movs r0, 0x3 strb r0, [r1] adds r7, r2, 0 - b _08160BD0 + b @08160BD0 .align 2, 0 .pool -_08160BC4: +@08160BC4: ldr r7, =0x0203bc34 cmp r0, 0x1 - bne _08160BD0 + bne @08160BD0 ldr r1, [r7] movs r0, 0x5 strb r0, [r1] -_08160BD0: +@08160BD0: ldr r1, [r7] movs r0, 0x10 - b _08160E88 + b @08160E88 .align 2, 0 .pool -_08160BDC: +@08160BDC: bl sub_81D2C3C lsls r0, 16 cmp r0, 0 - beq _08160BE8 - b _08160E8A -_08160BE8: + beq @08160BE8 + b @08160E8A +@08160BE8: movs r0, 0x3 movs r1, 0x11 bl Window_FastFillPixels ldr r0, =0x0203bc38 ldrb r0, [r0, 0x4] cmp r0, 0 - bne _08160C08 + bne @08160C08 ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x3 - b _08160E88 + b @08160E88 .align 2, 0 .pool -_08160C08: +@08160C08: cmp r0, 0x1 - beq _08160C0E - b _08160E8A -_08160C0E: + beq @08160C0E + b @08160E8A +@08160C0E: ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x5 - b _08160E88 + b @08160E88 .align 2, 0 .pool -_08160C1C: +@08160C1C: bl sub_81D2C3C lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0 - beq _08160C2A - b _08160E8A -_08160C2A: + beq @08160C2A + b @08160E8A +@08160C2A: ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x14 @@ -680878,18 +680878,18 @@ _08160C2A: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - b _08160E8A + b @08160E8A .align 2, 0 .pool -_08160C48: +@08160C48: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08160C56 - b _08160E8A -_08160C56: + beq @08160C56 + b @08160E8A +@08160C56: bl sub_8161054 lsls r0, 16 lsrs r0, 16 @@ -680908,28 +680908,28 @@ _08160C56: adds r0, r4, 0 bl sub_81BFA38 bl sub_8160EA0 - b _08160E8A + b @08160E8A .align 2, 0 .pool -_08160C98: +@08160C98: bl sub_81D2C3C lsls r0, 16 cmp r0, 0 - beq _08160CA4 - b _08160E8A -_08160CA4: - b _08160E82 -_08160CA6: + beq @08160CA4 + b @08160E8A +@08160CA4: + b @08160E82 +@08160CA6: movs r0, 0x1 negs r0, r0 movs r1, 0 str r1, [sp] -_08160CAE: +@08160CAE: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - b _08160E8A -_08160CB8: + b @08160E8A +@08160CB8: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -680941,25 +680941,25 @@ _08160CB8: ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 - b _08160E88 + b @08160E88 .align 2, 0 .pool -_08160CD8: +@08160CD8: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08160CE6 - b _08160E8A -_08160CE6: + beq @08160CE6 + b @08160E8A +@08160CE6: bl sub_8160EA0 ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 - b _08160E8A + b @08160E8A .align 2, 0 .pool -_08160CFC: +@08160CFC: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -680975,43 +680975,43 @@ _08160CFC: ldr r0, =0x0203bc38 ldrb r0, [r0, 0x4] cmp r0, 0 - bne _08160D30 + bne @08160D30 movs r0, 0x1 bl render_previous_quest_text - b _08160D3A + b @08160D3A .align 2, 0 .pool -_08160D30: +@08160D30: cmp r0, 0x1 - bne _08160D3A + bne @08160D3A movs r0, 0x1 bl sub_8161074 -_08160D3A: +@08160D3A: bl sub_8161234 movs r0, 0x3 movs r1, 0x2 bl Window_CopyToVram - b _08160E8A -_08160D48: + b @08160E8A +@08160D48: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08160D56 - b _08160E8A -_08160D56: + beq @08160D56 + b @08160E8A +@08160D56: ldr r1, [r7] adds r2, r1, 0 adds r2, 0x45 ldrb r0, [r2] cmp r0, 0x4 - bne _08160D6C + bne @08160D6C movs r0, 0x18 - b _08160E88 + b @08160E88 .align 2, 0 .pool -_08160D6C: +@08160D6C: adds r0, r1, 0 adds r0, 0x44 ldrb r0, [r0] @@ -681071,14 +681071,14 @@ _08160D6C: ldr r1, =0x020375e0 movs r0, 0x1 strh r0, [r1] - b _08160E8A + b @08160E8A .align 2, 0 .pool -_08160E0C: +@08160E0C: bl sub_81D2C3C lsls r0, 16 cmp r0, 0 - bne _08160E8A + bne @08160E8A ldr r0, =0x085ef9a6 bl sub_816084C ldr r0, =0x0203bc34 @@ -681087,49 +681087,49 @@ _08160E0C: strb r0, [r1] ldr r0, =0x0000016f bl fanfare_play - b _08160E8A + b @08160E8A .align 2, 0 .pool -_08160E38: +@08160E38: bl sub_81D2C3C lsls r0, 16 cmp r0, 0 - bne _08160E8A + bne @08160E8A ldr r0, =0x0000016f bl fanfare_play ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x20 - b _08160E88 + b @08160E88 .align 2, 0 .pool -_08160E58: +@08160E58: bl task_is_not_running_overworld_fanfare lsls r0, 24 cmp r0, 0 - beq _08160E8A + beq @08160E8A ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x21 - b _08160E88 + b @08160E88 .align 2, 0 .pool -_08160E70: +@08160E70: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08160E8A + beq @08160E8A movs r0, 0x5 bl audio_play -_08160E82: +@08160E82: ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0xE -_08160E88: +@08160E88: strb r0, [r1] -_08160E8A: +@08160E8A: add sp, 0x4 pop {r3} mov r8, r3 @@ -681141,7 +681141,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 @@ -681168,7 +681168,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 @@ -681177,7 +681177,7 @@ render_previous_quest_text: @ 8160EE0 ldr r6, =0x02020630 ldr r4, =0x0203bc34 movs r3, 0x4 -_08160EF0: +@08160EF0: ldr r0, [r4] adds r0, 0x1 adds r0, r2 @@ -681192,9 +681192,9 @@ _08160EF0: strb r1, [r0] adds r2, 0x1 cmp r2, 0xF - ble _08160EF0 + ble @08160EF0 cmp r5, 0 - bne _08160F38 + bne @08160F38 ldr r4, =0x02021fc4 ldr r1, =0x085ef8c2 adds r0, r4, 0 @@ -681211,7 +681211,7 @@ _08160EF0: adds r2, r4, 0 movs r3, 0 bl Print -_08160F38: +@08160F38: add sp, 0xC pop {r4-r6} pop {r0} @@ -681221,7 +681221,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 @@ -681243,25 +681243,25 @@ sub_8160F50: @ 8160F50 movs r0, 0x2 negs r0, r0 cmp r5, r0 - beq _08160FE4 + beq @08160FE4 adds r0, 0x1 cmp r5, r0 - bne _08161010 + bne @08161010 ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x30 ands r0, r1 cmp r0, 0 - bne _08160F9C + bne @08160F9C bl sub_81220D0 lsls r0, 24 cmp r0, 0 - beq _0816103E -_08160F9C: + beq @0816103E +@08160F9C: movs r0, 0x5 bl audio_play cmp r7, 0 - bne _08160FC4 + bne @08160FC4 movs r0, 0x1 bl Window_WriteStandardTileMap ldr r0, [r6] @@ -681269,10 +681269,10 @@ _08160F9C: strb r1, [r0] movs r0, 0x1 strb r0, [r4, 0x4] - b _08160FD4 + b @08160FD4 .align 2, 0 .pool -_08160FC4: +@08160FC4: movs r0, 0 bl Window_WriteStandardTileMap ldr r0, [r6] @@ -681280,13 +681280,13 @@ _08160FC4: movs r1, 0x3 strb r1, [r0] strb r2, [r4, 0x4] -_08160FD4: +@08160FD4: movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram bl sub_8161054 bl sub_816137C - b _0816103E -_08160FE4: + b @0816103E +@08160FE4: movs r0, 0x5 bl audio_play bl sub_8161234 @@ -681299,10 +681299,10 @@ _08160FE4: bl ExpandTextCodes adds r0, r4, 0 bl sub_81D2BF4 - b _0816103E + b @0816103E .align 2, 0 .pool -_08161010: +@08161010: movs r0, 0x5 bl audio_play bl sub_8161234 @@ -681321,7 +681321,7 @@ _08161010: bl ExpandTextCodes adds r0, r4, 0 bl sub_81D2BF4 -_0816103E: +@0816103E: pop {r4-r7} pop {r0} bx r0 @@ -681330,7 +681330,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 @@ -681347,13 +681347,13 @@ 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 lsrs r5, r0, 24 cmp r5, 0 - bne _081610A6 + bne @081610A6 ldr r4, =0x02021fc4 ldr r1, =0x085ef8c2 adds r0, r4, 0 @@ -681370,7 +681370,7 @@ sub_8161074: @ 8161074 adds r2, r4, 0 movs r3, 0 bl Print -_081610A6: +@081610A6: add sp, 0xC pop {r4,r5} pop {r0} @@ -681380,7 +681380,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] @@ -681398,12 +681398,12 @@ sub_81610B8: @ 81610B8 bl sub_81611AC movs r4, 0 ldr r5, =0x085cec10 -_081610DC: +@081610DC: adds r2, r4, 0 cmp r4, 0 - bge _081610E4 + bge @081610E4 adds r2, r4, 0x3 -_081610E4: +@081610E4: asrs r2, 2 lsls r1, r2, 2 subs r1, r4, r1 @@ -681427,16 +681427,16 @@ _081610E4: strb r0, [r1] adds r4, 0x1 cmp r4, 0x7 - ble _081610DC + ble @081610DC movs r4, 0 ldr r7, =0x085cec10 adds r6, r2, 0 -_0816111C: +@0816111C: adds r2, r4, 0 cmp r4, 0 - bge _08161124 + bge @08161124 adds r2, r4, 0x3 -_08161124: +@08161124: asrs r2, 2 lsls r1, r2, 2 subs r1, r4, r1 @@ -681472,11 +681472,11 @@ _08161124: bl obj_anim_image_start adds r4, 0x1 cmp r4, 0x7 - ble _0816111C + ble @0816111C movs r4, 0 ldr r3, =0x0203bc34 movs r2, 0x4 -_08161176: +@08161176: ldr r0, [r3] adds r0, 0x1 adds r0, r4 @@ -681491,7 +681491,7 @@ _08161176: strb r1, [r0] adds r4, 0x1 cmp r4, 0xF - ble _08161176 + ble @08161176 pop {r4-r7} pop {r0} bx r0 @@ -681500,7 +681500,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] @@ -681509,7 +681509,7 @@ sub_81611AC: @ 81611AC adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0xFF - bne _081611D4 + bne @081611D4 ldr r0, =0x085cebc0 movs r3, 0x8B lsls r3, 1 @@ -681520,13 +681520,13 @@ sub_81611AC: @ 81611AC lsls r5, 1 adds r1, r5 strb r0, [r1] -_081611D4: +@081611D4: ldr r0, [r4] ldr r6, =0x00000113 adds r0, r6 ldrb r0, [r0] cmp r0, 0xFF - bne _08161210 + bne @08161210 ldr r0, =0x0203ce8c adds r2, r0, 0 ldr r1, =0x085cebd0 @@ -681550,7 +681550,7 @@ _081611D4: ldr r6, =0x00000113 adds r1, r6 strb r0, [r1] -_08161210: +@08161210: pop {r4-r6} pop {r0} bx r0 @@ -681559,7 +681559,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] @@ -681568,7 +681568,7 @@ sub_8161234: @ 8161234 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xFF - beq _08161256 + beq @08161256 bl sub_81AF620 ldr r0, [r4] movs r1, 0x8A @@ -681576,20 +681576,20 @@ sub_8161234: @ 8161234 adds r0, r1 movs r1, 0xFF strb r1, [r0] -_08161256: +@08161256: ldr r0, [r4] ldr r2, =0x00000113 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xFF - beq _08161270 + beq @08161270 bl sub_81AF620 ldr r0, [r4] ldr r2, =0x00000113 adds r1, r0, r2 movs r0, 0xFF strb r0, [r1] -_08161270: +@08161270: pop {r4} pop {r0} bx r0 @@ -681598,7 +681598,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 @@ -681625,13 +681625,13 @@ sub_8161280: @ 8161280 adds r0, r6 ldrb r0, [r0] cmp r5, r0 - bge _081612F6 + bge @081612F6 mov r8, r4 movs r0, 0xD mov r12, r0 ldr r2, =0x0831977c mov r9, r2 -_081612C2: +@081612C2: mov r7, r8 ldr r4, [r7] lsls r3, r5, 3 @@ -681657,8 +681657,8 @@ _081612C2: adds r0, r4, r6 ldrb r0, [r0] cmp r5, r0 - blt _081612C2 -_081612F6: + blt @081612C2 +@081612F6: ldr r4, =0x0203bc34 ldr r0, [r4] adds r0, 0x44 @@ -681716,7 +681716,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} @@ -681724,17 +681724,17 @@ sub_816137C: @ 816137C ldr r0, =0x0203bc38 ldrb r0, [r0, 0x4] cmp r0, 0 - beq _08161394 + beq @08161394 movs r0, 0x2 negs r0, r0 cmp r4, r0 - bne _081613CC -_08161394: + bne @081613CC +@08161394: movs r5, 0 ldr r4, =0x02020630 ldr r3, =0x0203bc34 movs r2, 0x4 -_0816139C: +@0816139C: ldr r0, [r3] adds r0, 0x1 adds r0, r5 @@ -681751,11 +681751,11 @@ _0816139C: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0xF - bls _0816139C - b _081614FE + bls @0816139C + b @081614FE .align 2, 0 .pool -_081613CC: +@081613CC: ldr r1, =0x0858cdcc ldr r0, =0x0858c2b4 lsls r4, 3 @@ -681770,15 +681770,15 @@ _081613CC: lsrs r6, r0, 24 mov r8, r4 cmp r6, 0xFF - bne _081613EE + bne @081613EE movs r6, 0 -_081613EE: +@081613EE: movs r5, 0 ldr r7, =0x0203bc34 ldr r4, =0x02020630 -_081613F4: +@081613F4: cmp r5, r6 - bcs _08161420 + bcs @08161420 ldr r0, [r7] adds r0, 0x1 adds r0, r5 @@ -681789,10 +681789,10 @@ _081613F4: adds r0, r4 movs r1, 0x1 bl obj_anim_image_start - b _08161436 + b @08161436 .align 2, 0 .pool -_08161420: +@08161420: ldr r0, [r7] adds r0, 0x1 adds r0, r5 @@ -681803,7 +681803,7 @@ _08161420: adds r0, r4 movs r1, 0 bl obj_anim_image_start -_08161436: +@08161436: ldr r0, [r7] adds r0, 0x1 adds r0, r5 @@ -681823,7 +681823,7 @@ _08161436: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x7 - bls _081613F4 + bls @081613F4 ldr r1, =0x0858cdcc ldr r0, =0x0858c2b4 add r0, r8 @@ -681836,16 +681836,16 @@ _08161436: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0xFF - bne _0816147C + bne @0816147C movs r6, 0 -_0816147C: +@0816147C: movs r5, 0 ldr r0, =0x0203bc34 mov r8, r0 ldr r7, =0x02020630 -_08161484: +@08161484: cmp r5, r6 - bcs _081614B8 + bcs @081614B8 mov r1, r8 ldr r0, [r1] adds r4, r5, 0 @@ -681859,10 +681859,10 @@ _08161484: adds r0, r7 movs r1, 0x3 bl obj_anim_image_start - b _081614D4 + b @081614D4 .align 2, 0 .pool -_081614B8: +@081614B8: mov r3, r8 ldr r0, [r3] adds r4, r5, 0 @@ -681876,7 +681876,7 @@ _081614B8: adds r0, r7 movs r1, 0x2 bl obj_anim_image_start -_081614D4: +@081614D4: mov r1, r8 ldr r0, [r1] adds r0, 0x1 @@ -681897,8 +681897,8 @@ _081614D4: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x7 - bls _08161484 -_081614FE: + bls @08161484 +@081614FE: pop {r3} mov r8, r3 pop {r4-r7} @@ -681907,7 +681907,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 @@ -681937,21 +681937,21 @@ hm_prepare_dive_probably: @ 8161508 lsls r0, 16 lsrs r0, 16 cmp r4, r0 - bhi _08161558 + bhi @08161558 movs r0, 0 - b _0816155A + b @0816155A .align 2, 0 .pool -_08161558: +@08161558: movs r0, 0x1 -_0816155A: +@0816155A: pop {r4-r6} pop {r1} bx r1 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 @@ -681983,7 +681983,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 @@ -681999,7 +681999,7 @@ sub_81615A8: @ 81615A8 ldrb r0, [r1, 0xA] adds r5, r0, 0 cmp r5, 0x6 - bls _081615EC + bls @081615EC movs r0, 0 strb r0, [r1, 0xB] bl sub_81B3054 @@ -682010,10 +682010,10 @@ sub_81615A8: @ 81615A8 adds r0, r1 ldr r1, =sub_81B1370 + 1 str r1, [r0] - b _08161658 + b @08161658 .align 2, 0 .pool -_081615EC: +@081615EC: movs r0, 0x64 mov r10, r0 mov r0, r10 @@ -682027,21 +682027,21 @@ _081615EC: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq _0816161A + beq @0816161A cmp r7, r5 - beq _0816161A + beq @0816161A adds r0, r6, 0 movs r1, 0x3A bl pokemon_getattr cmp r0, r4 - bne _08161628 -_0816161A: + bne @08161628 +@0816161A: ldr r0, [sp, 0x4] bl sub_81617B8 - b _08161658 + b @08161658 .align 2, 0 .pool -_08161628: +@08161628: movs r0, 0x1 bl audio_play mov r1, r10 @@ -682062,7 +682062,7 @@ _08161628: ldr r0, [sp, 0x4] mov r1, r8 bl sub_81B1F18 -_08161658: +@08161658: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -682076,7 +682076,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 @@ -682113,7 +682113,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 @@ -682151,7 +682151,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 @@ -682159,7 +682159,7 @@ sub_8161724: @ 8161724 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08161772 + beq @08161772 ldr r4, =0x0203cec8 movs r0, 0 strb r0, [r4, 0xB] @@ -682185,7 +682185,7 @@ sub_8161724: @ 8161724 adds r0, r1 ldr r1, =sub_81B1370 + 1 str r1, [r0] -_08161772: +@08161772: pop {r4,r5} pop {r0} bx r0 @@ -682194,7 +682194,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 @@ -682202,7 +682202,7 @@ sub_8161784: @ 8161784 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081617AA + beq @081617AA movs r0, 0x5 bl sub_81B3054 ldr r0, =0x03005e00 @@ -682212,7 +682212,7 @@ sub_8161784: @ 8161784 adds r1, r0 ldr r0, =sub_81B1370 + 1 str r0, [r1] -_081617AA: +@081617AA: pop {r4} pop {r0} bx r0 @@ -682221,7 +682221,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 @@ -682248,7 +682248,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 @@ -682310,7 +682310,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 @@ -682319,10 +682319,10 @@ sub_8161880: @ 8161880 adds r0, r2, r1 ldrb r0, [r0, 0x4] cmp r3, r0 - bcs _081618AA + bcs @081618AA adds r5, r1, 0 movs r4, 0 -_08161896: +@08161896: adds r0, r2, r5 ldr r1, [r0] adds r1, r3 @@ -682332,8 +682332,8 @@ _08161896: lsrs r3, r1, 24 ldrb r0, [r0, 0x4] cmp r3, r0 - bcc _08161896 -_081618AA: + bcc @08161896 +@081618AA: pop {r4,r5} pop {r0} bx r0 @@ -682342,24 +682342,24 @@ _081618AA: thumb_func_end sub_8161880 thumb_func_start sub_81618B4 -sub_81618B4: @ 81618B4 +sub_81618B4: ; 81618B4 push {r4,lr} movs r4, 0 -_081618B8: +@081618B8: adds r0, r4, 0 bl sub_8161880 adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bls _081618B8 + bls @081618B8 pop {r4} pop {r0} bx r0 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 @@ -682369,39 +682369,39 @@ sub_81618D0: @ 81618D0 movs r1, 0x4 ldrsb r1, [r0, r1] cmp r2, r1 - bge _0816190C + bge @0816190C adds r4, r0, 0 adds r3, r1, 0 -_081618E8: +@081618E8: lsls r0, r2, 24 asrs r1, r0, 24 ldr r0, [r4] adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _08161900 + bne @08161900 adds r0, r1, 0 - b _08161910 + b @08161910 .align 2, 0 .pool -_08161900: +@08161900: adds r0, r1, 0x1 lsls r0, 24 lsrs r2, r0, 24 asrs r0, 24 cmp r0, r3 - blt _081618E8 -_0816190C: + blt @081618E8 +@0816190C: movs r0, 0x1 negs r0, r0 -_08161910: +@08161910: pop {r4} pop {r1} bx r1 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 @@ -682415,39 +682415,39 @@ sub_8161918: @ 8161918 adds r0, r1 ldrb r1, [r0, 0x4] cmp r2, r1 - bcs _08161956 + bcs @08161956 ldr r4, [r0] -_08161936: +@08161936: adds r0, r4, r2 ldrb r0, [r0] cmp r0, r3 - bne _0816194C + bne @0816194C movs r0, 0x1 - b _08161958 + b @08161958 .align 2, 0 .pool -_0816194C: +@0816194C: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, r1 - bcc _08161936 -_08161956: + bcc @08161936 +@08161956: movs r0, 0 -_08161958: +@08161958: pop {r4} pop {r1} bx r1 thumb_func_end sub_8161918 thumb_func_start sub_8161960 -sub_8161960: @ 8161960 +sub_8161960: ; 8161960 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 cmp r4, 0 - beq _081619A0 + beq @081619A0 ldr r1, =0x085a5c08 lsls r0, r4, 5 adds r0, r1 @@ -682459,7 +682459,7 @@ sub_8161960: @ 8161960 movs r0, 0x1 negs r0, r0 cmp r2, r0 - beq _081619A0 + beq @081619A0 ldr r0, =0x0203bc40 lsls r1, r5, 3 adds r1, r0 @@ -682467,24 +682467,24 @@ sub_8161960: @ 8161960 adds r0, r2 strb r4, [r0] movs r0, 0x1 - b _081619A2 + b @081619A2 .align 2, 0 .pool -_081619A0: +@081619A0: movs r0, 0 -_081619A2: +@081619A2: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_8161960 thumb_func_start sub_81619A8 -sub_81619A8: @ 81619A8 +sub_81619A8: ; 81619A8 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _081619D4 + beq @081619D4 ldr r1, =0x085a5c08 lsls r0, 5 adds r0, r1 @@ -682495,35 +682495,35 @@ sub_81619A8: @ 81619A8 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _081619D4 + beq @081619D4 movs r0, 0x1 - b _081619D6 + b @081619D6 .align 2, 0 .pool -_081619D4: +@081619D4: movs r0, 0 -_081619D6: +@081619D6: pop {r1} bx r1 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 movs r3, 0 cmp r5, 0 - bne _081619F8 - b _08161A26 -_081619EA: + bne @081619F8 + b @08161A26 +@081619EA: movs r0, 0 strb r0, [r1] adds r0, r6, 0 bl sub_8161A38 movs r0, 0x1 - b _08161A28 -_081619F8: + b @08161A28 +@081619F8: ldr r2, =0x0203bc40 ldr r1, =0x085a5c08 lsls r0, r5, 5 @@ -682533,24 +682533,24 @@ _081619F8: adds r0, r2 ldrb r1, [r0, 0x4] cmp r3, r1 - bcs _08161A26 + bcs @08161A26 adds r6, r4, 0 adds r4, r0, 0 adds r2, r1, 0 -_08161A12: +@08161A12: ldr r0, [r4] adds r1, r0, r3 ldrb r0, [r1] cmp r0, r5 - beq _081619EA + beq @081619EA adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, r2 - bcc _08161A12 -_08161A26: + bcc @08161A12 +@08161A26: movs r0, 0 -_08161A28: +@08161A28: pop {r4-r6} pop {r1} bx r1 @@ -682559,7 +682559,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 @@ -682573,12 +682573,12 @@ sub_8161A38: @ 8161A38 adds r1, r0, r2 ldrb r3, [r1, 0x4] cmp r6, r3 - bcs _08161ABC + bcs @08161ABC adds r7, r0, 0 mov r10, r1 mov r0, r10 str r0, [sp] -_08161A5C: +@08161A5C: adds r1, r6, 0x1 lsls r0, r1, 24 lsrs r3, r0, 24 @@ -682587,12 +682587,12 @@ _08161A5C: mov r1, r10 ldrb r1, [r1, 0x4] cmp r3, r1 - bcs _08161AAE + bcs @08161AAE ldr r0, =0x0203bc40 mov r9, r0 adds r1, r0, 0 mov r8, r1 -_08161A76: +@08161A76: mov r0, r9 adds r5, r2, r0 ldr r1, [r5] @@ -682600,20 +682600,20 @@ _08161A76: ldrb r4, [r0] adds r2, r4, 0 cmp r2, 0 - beq _08161A9C + beq @08161A9C adds r0, r1, r6 ldrb r1, [r0] cmp r1, 0 - beq _08161A92 + beq @08161A92 cmp r1, r2 - bls _08161A9C -_08161A92: + bls @08161A9C +@08161A92: ldrb r1, [r0] strb r4, [r0] ldr r0, [r5] adds r0, r3 strb r1, [r0] -_08161A9C: +@08161A9C: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 @@ -682622,16 +682622,16 @@ _08161A9C: adds r0, r2, r1 ldrb r0, [r0, 0x4] cmp r3, r0 - bcc _08161A76 -_08161AAE: + bcc @08161A76 +@08161AAE: mov r3, r12 lsls r0, r3, 24 lsrs r6, r0, 24 ldr r0, [sp] ldrb r0, [r0, 0x4] cmp r6, r0 - bcc _08161A5C -_08161ABC: + bcc @08161A5C +@08161ABC: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -682645,7 +682645,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 @@ -682655,26 +682655,26 @@ sub_8161AD0: @ 8161AD0 adds r0, r1, r2 ldrb r0, [r0, 0x4] cmp r4, r0 - bcs _08161B04 + bcs @08161B04 adds r5, r2, 0 -_08161AE6: +@08161AE6: adds r2, r1, r5 ldr r0, [r2] adds r0, r3 ldrb r0, [r0] cmp r0, 0 - beq _08161AF8 + beq @08161AF8 adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_08161AF8: +@08161AF8: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 ldrb r2, [r2, 0x4] cmp r3, r2 - bcc _08161AE6 -_08161B04: + bcc @08161AE6 +@08161B04: adds r0, r4, 0 pop {r4,r5} pop {r1} @@ -682684,11 +682684,11 @@ _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 -_08161B16: +@08161B16: adds r0, r4, 0 bl sub_8161AD0 adds r0, r5, r0 @@ -682698,7 +682698,7 @@ _08161B16: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bls _08161B16 + bls @08161B16 adds r0, r5, 0 pop {r4,r5} pop {r1} @@ -682706,7 +682706,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] @@ -682727,14 +682727,14 @@ 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 ldr r4, =0x0203bc80 movs r3, 0 adds r5, r4, 0x1 -_08161B6C: +@08161B6C: lsls r1, r2, 1 adds r0, r1, r4 strb r3, [r0] @@ -682744,7 +682744,7 @@ _08161B6C: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x2 - bls _08161B6C + bls @08161B6C movs r0, 0 strb r0, [r6] strb r0, [r6, 0x1] @@ -682756,30 +682756,30 @@ _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} sub sp, 0x10 lsls r0, 16 cmp r0, 0 - bne _08161BBC + bne @08161BBC ldr r0, =0x03005d8c ldr r1, [r0] ldr r2, =0x000031dc adds r1, r2 ldr r2, =0x00000197 - b _08161BC8 + b @08161BC8 .align 2, 0 .pool -_08161BBC: +@08161BBC: ldr r0, =0x03005d8c ldr r1, [r0] ldr r2, =0x000031dc adds r1, r2 movs r2, 0xCC lsls r2, 1 -_08161BC8: +@08161BC8: strh r2, [r1, 0x8] adds r7, r0, 0 ldr r6, =0x02024744 @@ -682885,7 +682885,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 @@ -682899,7 +682899,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] @@ -682921,7 +682921,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 @@ -682930,12 +682930,12 @@ sub_8161D00: @ 8161D00 adds r0, r2 ldrb r0, [r0, 0x13] cmp r0, 0 - beq _08161D3E + beq @08161D3E ldr r0, =0x0203bc86 strb r1, [r0] ldr r5, =0x085cec30 adds r4, r0, 0 -_08161D1A: +@08161D1A: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -682950,9 +682950,9 @@ _08161D1A: ldrb r1, [r1] ldrb r0, [r4, 0x1] cmp r0, r1 - beq _08161D1A + beq @08161D1A strb r1, [r4, 0x1] -_08161D3E: +@08161D3E: pop {r4,r5} pop {r0} bx r0 @@ -682961,7 +682961,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 @@ -682970,20 +682970,20 @@ sub_8161D54: @ 8161D54 lsls r1, 12 ands r1, r0 cmp r1, 0 - bne _08161D6E + bne @08161D6E bl sub_8161D00 - b _08161DE2 -_08161D6E: + b @08161DE2 +@08161D6E: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000031dc adds r0, r1 ldrb r0, [r0, 0x13] cmp r0, 0 - beq _08161DE2 + beq @08161DE2 ldr r7, =0x0203bc86 ldr r3, =0x085cec30 -_08161D80: +@08161D80: lsls r0, r4, 1 adds r0, r4 lsls r2, r0, 1 @@ -682991,11 +682991,11 @@ _08161D80: ldrb r0, [r7, 0x1] ldrb r1, [r1] cmp r0, r1 - bne _08161DD8 + bne @08161DD8 ldr r6, =0x085cec30 adds r5, r2, 0x1 ldr r4, =0x0203bc80 -_08161D96: +@08161D96: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -683008,31 +683008,31 @@ _08161D96: ldrb r1, [r0] ldrb r0, [r4, 0x4] cmp r0, 0 - bne _08161DBA + bne @08161DBA ldrb r0, [r4, 0x5] cmp r0, r1 - beq _08161D96 -_08161DBA: + beq @08161D96 +@08161DBA: cmp r1, 0xFF - beq _08161D96 + beq @08161D96 strb r1, [r7, 0x1] - b _08161DE2 + b @08161DE2 .align 2, 0 .pool -_08161DD8: +@08161DD8: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x13 - bls _08161D80 -_08161DE2: + bls @08161D80 +@08161DE2: pop {r4-r7} pop {r0} bx r0 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 @@ -683044,27 +683044,27 @@ sub_8161DE8: @ 8161DE8 adds r0, r3 ldrb r0, [r0, 0x13] cmp r0, 0 - beq _08161E20 + beq @08161E20 ldr r0, =0x0203bc86 ldrb r3, [r0] cmp r2, r3 - bne _08161E20 + bne @08161E20 ldrb r0, [r0, 0x1] cmp r1, r0 - bne _08161E20 + bne @08161E20 movs r0, 0x1 - b _08161E22 + b @08161E22 .align 2, 0 .pool -_08161E20: +@08161E20: movs r0, 0 -_08161E22: +@08161E22: pop {r1} bx r1 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 @@ -683131,7 +683131,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] @@ -683141,28 +683141,28 @@ sub_8161EDC: @ 8161EDC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08161F10 + bne @08161F10 bl GenerateRandomNumber lsls r0, 16 movs r1, 0xC0 lsls r1, 10 ands r1, r0 cmp r1, 0 - bne _08161F10 + bne @08161F10 bl sub_8161E28 movs r0, 0x1 - b _08161F12 + b @08161F12 .align 2, 0 .pool -_08161F10: +@08161F10: movs r0, 0 -_08161F12: +@08161F12: pop {r1} bx r1 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 @@ -683187,7 +683187,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 @@ -683200,7 +683200,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] @@ -683212,7 +683212,7 @@ sub_8161F64: @ 8161F64 thumb_func_end sub_8161F64 thumb_func_start sub_8161F74 -sub_8161F74: @ 8161F74 +sub_8161F74: ; 8161F74 push {lr} ldr r1, =0x085df96c ldr r0, =0x020375e0 @@ -683228,7 +683228,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] @@ -683279,7 +683279,7 @@ sub_8161F94: @ 8161F94 ldr r1, [r1] ands r0, r1 cmp r0, 0 - bne _0816200E + bne @0816200E lsls r0, r5, 1 lsls r1, r6, 2 adds r0, r1 @@ -683288,7 +683288,7 @@ sub_8161F94: @ 8161F94 adds r1, r4, r2 adds r1, r0 strh r7, [r1] -_0816200E: +@0816200E: bl sub_8164ED8 ldr r0, =0x03005d8c ldr r0, [r0] @@ -683310,7 +683310,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] @@ -683326,27 +683326,27 @@ sub_8162054: @ 8162054 ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x1 - beq _08162094 + beq @08162094 cmp r0, 0x1 - ble _081620E8 + ble @081620E8 cmp r0, 0x2 - beq _081620A8 + beq @081620A8 cmp r0, 0x3 - beq _081620D8 - b _081620E8 + beq @081620D8 + b @081620E8 .align 2, 0 .pool -_08162094: +@08162094: adds r0, r6, 0 lsls r1, 24 lsrs r1, 24 bl sub_8164FCC ldr r1, =0x020375f0 strh r0, [r1] - b _081620E8 + b @081620E8 .align 2, 0 .pool -_081620A8: +@081620A8: ldr r4, =0x020375f0 ldr r2, [r5] ldr r0, =0x00000cdc @@ -683363,10 +683363,10 @@ _081620A8: orrs r0, r1 lsrs r0, 31 strh r0, [r4] - b _081620E8 + b @081620E8 .align 2, 0 .pool -_081620D8: +@081620D8: ldr r1, [r5] adds r0, r1, r4 ldrb r0, [r0] @@ -683375,7 +683375,7 @@ _081620D8: ldr r2, =0x00000d07 adds r1, r2 strb r0, [r1] -_081620E8: +@081620E8: pop {r4-r6} pop {r0} bx r0 @@ -683384,7 +683384,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] @@ -683400,17 +683400,17 @@ sub_81620F4: @ 81620F4 ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x1 - beq _08162134 + beq @08162134 cmp r0, 0x1 - ble _081621B4 + ble @081621B4 cmp r0, 0x2 - beq _08162150 + beq @08162150 cmp r0, 0x3 - beq _081621A4 - b _081621B4 + beq @081621A4 + b @081621B4 .align 2, 0 .pool -_08162134: +@08162134: ldr r2, [r6] lsls r0, r5, 1 lsls r1, r4, 2 @@ -683422,14 +683422,14 @@ _08162134: ldr r0, =0x020375e4 ldrh r0, [r0] strh r0, [r2] - b _081621B4 + b @081621B4 .align 2, 0 .pool -_08162150: +@08162150: ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0 - beq _08162180 + beq @08162180 ldr r2, [r6] ldr r0, =0x00000cdc adds r2, r0 @@ -683442,10 +683442,10 @@ _08162150: ldr r1, [r1] orrs r0, r1 str r0, [r2] - b _081621B4 + b @081621B4 .align 2, 0 .pool -_08162180: +@08162180: ldr r2, [r6] ldr r1, =0x00000cdc adds r2, r1 @@ -683458,10 +683458,10 @@ _08162180: ldr r1, [r1] ands r0, r1 str r0, [r2] - b _081621B4 + b @081621B4 .align 2, 0 .pool -_081621A4: +@081621A4: ldr r1, [r6] adds r0, r1, r7 ldrb r0, [r0] @@ -683470,7 +683470,7 @@ _081621A4: ldr r2, =0x00000d07 adds r1, r2 strb r0, [r1] -_081621B4: +@081621B4: pop {r4-r7} pop {r0} bx r0 @@ -683479,20 +683479,20 @@ _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] movs r0, 0xFA lsls r0, 1 cmp r1, r0 - bne _081621DA + bne @081621DA ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000bec adds r0, r1 bl sub_816534C -_081621DA: +@081621DA: ldr r5, =0x03005d90 ldr r0, [r5] ldr r1, =0x00000d04 @@ -683500,10 +683500,10 @@ _081621DA: ldrh r1, [r2] ldr r0, =0x0000270e cmp r1, r0 - bhi _081621EE + bhi @081621EE adds r0, r1, 0x1 strh r0, [r2] -_081621EE: +@081621EE: ldr r1, [r5] ldr r4, =0x00000cb2 adds r1, r4 @@ -683524,7 +683524,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 @@ -683550,9 +683550,9 @@ sub_816222C: @ 816222C bl var_get lsls r0, 16 cmp r0, 0 - beq _08162266 - b _0816239C -_08162266: + beq @08162266 + b @0816239C +@08162266: mov r0, r10 ldr r1, [sp, 0x2C] bl sub_8164FCC @@ -683562,7 +683562,7 @@ _08162266: movs r7, 0 mov r2, sp str r2, [sp, 0x34] -_0816227A: +@0816227A: movs r3, 0xEC adds r0, r7, 0 muls r0, r3 @@ -683578,7 +683578,7 @@ _0816227A: adds r3, r7, 0x1 str r3, [sp, 0x30] adds r1, r0 -_08162298: +@08162298: ldm r1!, {r0} mov r4, r8 orrs r4, r0 @@ -683586,13 +683586,13 @@ _08162298: add r9, r0 adds r5, 0x1 cmp r5, 0x39 - bls _08162298 + bls @08162298 movs r6, 0 movs r5, 0 movs r0, 0xEC adds r2, r7, 0 muls r2, r0 -_081622B2: +@081622B2: ldr r3, =0x03005d90 ldr r1, [r3] movs r0, 0x2C @@ -683603,7 +683603,7 @@ _081622B2: adds r0, r1, r4 ldrh r0, [r0] cmp r0, 0 - beq _081622E4 + beq @081622E4 movs r0, 0xEF lsls r0, 3 adds r4, r1, r0 @@ -683615,18 +683615,18 @@ _081622B2: lsrs r0, 24 ldr r2, [sp, 0x38] cmp r1, r0 - bhi _081622E4 + bhi @081622E4 adds r6, 0x1 -_081622E4: +@081622E4: adds r5, 0x1 cmp r5, 0x3 - ble _081622B2 + ble @081622B2 ldr r0, =0x085df9f6 ldr r1, [sp, 0x2C] adds r0, r1, r0 ldrb r0, [r0] cmp r6, r0 - blt _0816233E + blt @0816233E ldr r3, =0x03005d90 ldr r2, [r3] movs r4, 0xEC @@ -683638,22 +683638,22 @@ _081622E4: ldrh r0, [r0] ldr r4, [sp, 0x28] cmp r0, r4 - bne _0816233E + bne @0816233E subs r5, 0x2 adds r0, r1, r5 ldrb r0, [r0] cmp r0, r10 - bne _0816233E + bne @0816233E mov r0, r8 cmp r0, 0 - beq _0816233E + beq @0816233E movs r1, 0x82 lsls r1, 4 adds r0, r2, r1 adds r0, r3 ldr r0, [r0] cmp r0, r9 - bne _0816233E + bne @0816233E movs r2, 0x96 lsls r2, 1 adds r0, r7, r2 @@ -683663,13 +683663,13 @@ _081622E4: ldr r4, [sp, 0x24] adds r4, 0x1 str r4, [sp, 0x24] -_0816233E: +@0816233E: ldr r7, [sp, 0x30] cmp r7, 0x4 - ble _0816227A + ble @0816227A ldr r5, [sp, 0x2C] cmp r5, 0 - bne _08162396 + bne @08162396 bl sub_8165B20 movs r7, 0 ldr r0, =0x03005d90 @@ -683681,22 +683681,22 @@ _0816233E: lsls r0, r1, 2 mov r5, sp adds r3, r0, r5 -_08162362: +@08162362: ldrb r0, [r2] lsls r1, r0, 25 lsrs r0, r1, 30 cmp r0, 0 - beq _0816238E + beq @0816238E ldrb r0, [r2, 0x1] adds r0, r4 ldrb r0, [r0] ldr r5, [sp, 0x28] cmp r0, r5 - bne _0816238E + bne @0816238E lsrs r0, r1, 30 subs r0, 0x1 cmp r0, r10 - bne _0816238E + bne @0816238E movs r1, 0xC8 lsls r1, 1 adds r0, r7, r1 @@ -683704,21 +683704,21 @@ _08162362: ldr r5, [sp, 0x24] adds r5, 0x1 str r5, [sp, 0x24] -_0816238E: +@0816238E: adds r2, 0x44 adds r7, 0x1 cmp r7, 0x3 - ble _08162362 -_08162396: + ble @08162362 +@08162396: ldr r0, [sp, 0x24] cmp r0, 0 - bne _081623C0 -_0816239C: + bne @081623C0 +@0816239C: movs r0, 0 - b _081623DA + b @081623DA .align 2, 0 .pool -_081623C0: +@081623C0: ldr r4, =0x02038bca bl GenerateRandomNumber lsls r0, 16 @@ -683730,7 +683730,7 @@ _081623C0: ldr r0, [r0] strh r0, [r4] movs r0, 0x1 -_081623DA: +@081623DA: add sp, 0x3C pop {r3-r5} mov r8, r3 @@ -683744,7 +683744,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] @@ -683754,12 +683754,12 @@ sub_81623F0: @ 81623F0 lsls r0, 30 lsrs r0, 30 cmp r0, 0x2 - bne _08162414 + bne @08162414 bl sub_8165E18 - b _08162530 + b @08162530 .align 2, 0 .pool -_08162414: +@08162414: ldr r0, =0x000040ce bl var_get adds r4, r0, 0 @@ -683775,7 +683775,7 @@ _08162414: bl sub_8165C40 subs r4, 0x2 cmp r4, 0x1 - bhi _08162488 + bhi @08162488 ldr r1, [r6] ldr r2, =0x00000cb2 adds r0, r1, r2 @@ -683800,14 +683800,14 @@ _08162414: ldrh r0, [r4] movs r1, 0x1 bl sub_8162614 - b _08162530 + b @08162530 .align 2, 0 .pool -_08162488: +@08162488: bl sub_816222C lsls r0, 24 cmp r0, 0 - beq _081624B4 + beq @081624B4 ldr r4, =0x02038bca ldrh r0, [r4] movs r1, 0 @@ -683818,14 +683818,14 @@ _08162488: ldrh r0, [r0] lsls r0, 1 adds r2, 0x2 - b _08162528 + b @08162528 .align 2, 0 .pool -_081624B4: +@081624B4: lsls r7, r5, 24 adds r5, r6, 0 ldr r6, =0x00000cb2 -_081624BA: +@081624BA: ldr r0, [r5] adds r0, r6 ldrb r1, [r0] @@ -683838,12 +683838,12 @@ _081624BA: adds r0, r1, r6 ldrh r0, [r0] cmp r4, r0 - bge _081624FC + bge @081624FC ldr r2, =0x00000cb4 adds r0, r1, r2 ldrh r0, [r0] cmp r0, r3 - beq _081624FC + beq @081624FC ldr r0, =0x03005d90 ldr r1, [r0] subs r2, 0x2 @@ -683851,21 +683851,21 @@ _081624BA: ldrh r2, [r0] ldr r0, =0x00000cb4 adds r1, r0 -_081624EE: +@081624EE: adds r1, 0x2 adds r4, 0x1 cmp r4, r2 - bge _081624FC + bge @081624FC ldrh r0, [r1] cmp r0, r3 - bne _081624EE -_081624FC: + bne @081624EE +@081624FC: ldr r0, [r5] ldr r1, =0x00000cb2 adds r0, r1 ldrh r0, [r0] cmp r4, r0 - bne _081624BA + bne @081624BA ldr r4, =0x02038bca strh r3, [r4] ldrh r0, [r4] @@ -683878,15 +683878,15 @@ _081624FC: ldrh r2, [r0] adds r0, r2, 0x1 cmp r0, 0x6 - bgt _08162530 + bgt @08162530 lsls r0, r2, 1 ldr r2, =0x00000cb4 -_08162528: +@08162528: adds r1, r2 adds r1, r0 ldrh r0, [r4] strh r0, [r1] -_08162530: +@08162530: pop {r4-r7} pop {r0} bx r0 @@ -683895,7 +683895,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 @@ -683903,9 +683903,9 @@ sub_8162548: @ 8162548 lsls r1, 24 lsrs r1, 24 cmp r0, 0x7 - bhi _08162584 + bhi @08162584 cmp r1, 0x6 - bne _08162570 + bne @08162570 ldr r2, =0x085dfa1a lsls r1, r0, 2 adds r0, r2, 0x2 @@ -683913,10 +683913,10 @@ sub_8162548: @ 8162548 adds r1, r2 ldrh r0, [r0] ldrh r4, [r1] - b _0816258A + b @0816258A .align 2, 0 .pool -_08162570: +@08162570: ldr r2, =0x085df9fa lsls r1, r3, 2 adds r0, r2, 0x2 @@ -683924,14 +683924,14 @@ _08162570: adds r1, r2 ldrh r0, [r0] ldrh r4, [r1] - b _0816258A + b @0816258A .align 2, 0 .pool -_08162584: +@08162584: ldr r1, =0x085df9fa ldrh r0, [r1, 0x1E] ldrh r4, [r1, 0x1C] -_0816258A: +@0816258A: subs r0, r4 adds r0, 0x1 lsls r0, 16 @@ -683953,7 +683953,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 @@ -683962,18 +683962,18 @@ sub_81625B4: @ 81625B4 lsls r1, 24 lsrs r1, 24 cmp r0, 0x7 - bhi _081625F4 + bhi @081625F4 cmp r1, 0x6 - bne _081625D4 + bne @081625D4 ldr r1, =0x085dfa1a lsls r2, r0, 2 - b _081625D8 + b @081625D8 .align 2, 0 .pool -_081625D4: +@081625D4: ldr r1, =0x085df9fa lsls r2, 2 -_081625D8: +@081625D8: adds r0, r1, 0x2 adds r0, r2, r0 adds r2, r1 @@ -683984,10 +683984,10 @@ _081625D8: lsls r0, 16 lsrs r1, r0, 16 ldrh r0, [r2] - b _08162604 + b @08162604 .align 2, 0 .pool -_081625F4: +@081625F4: ldr r0, =0x085df9fa ldrh r1, [r0, 0x1E] ldrh r2, [r0, 0x1C] @@ -683996,7 +683996,7 @@ _081625F4: lsls r1, 16 lsrs r1, 16 ldrh r0, [r0, 0x1C] -_08162604: +@08162604: strh r0, [r4] strb r1, [r3] pop {r4} @@ -684007,7 +684007,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 @@ -684018,38 +684018,38 @@ sub_8162614: @ 8162614 movs r0, 0xFA lsls r0, 1 cmp r4, r0 - bne _08162640 + bne @08162640 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000bed adds r0, r1 - b _081626BA + b @081626BA .align 2, 0 .pool -_08162640: +@08162640: ldr r0, =0x000003fe cmp r4, r0 - bne _08162650 + bne @08162650 bl sub_81A4DD8 - b _08162788 + b @08162788 .align 2, 0 .pool -_08162650: +@08162650: ldr r0, =0x0000012b cmp r4, r0 - bhi _0816266C + bhi @0816266C ldr r0, =0x0203bc88 ldr r1, [r0] movs r0, 0x34 muls r0, r4 adds r0, r1 - b _081626BA + b @081626BA .align 2, 0 .pool -_0816266C: +@0816266C: ldr r0, =0x0000018f cmp r4, r0 - bhi _08162698 + bhi @08162698 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0xfffffed4 @@ -684059,10 +684059,10 @@ _0816266C: adds r0, r1 ldr r1, =0x00000739 adds r0, r1 - b _081626BA + b @081626BA .align 2, 0 .pool -_08162698: +@08162698: ldr r3, =0x08610970 ldr r0, =0x03005d90 ldr r1, [r0] @@ -684080,105 +684080,105 @@ _08162698: muls r0, r1 adds r0, r3 adds r0, 0x32 -_081626BA: +@081626BA: ldrb r2, [r0] movs r1, 0 ldr r3, =0x085dcedc ldrb r0, [r3] cmp r0, r2 - beq _081626D4 -_081626C6: + beq @081626D4 +@081626C6: adds r1, 0x1 cmp r1, 0x1D - bhi _081626D4 + bhi @081626D4 adds r0, r1, r3 ldrb r0, [r0] cmp r0, r2 - bne _081626C6 -_081626D4: + bne @081626C6 +@081626D4: cmp r1, 0x1E - beq _08162700 + beq @08162700 ldr r0, =0x085dcf0e adds r0, r1, r0 ldrb r1, [r0] cmp r5, 0x1 - beq _08162744 + beq @08162744 cmp r5, 0x1 - ble _0816272E + ble @0816272E cmp r5, 0xF - bne _0816272E - b _08162750 + bne @0816272E + b @08162750 .align 2, 0 .pool -_08162700: +@08162700: movs r1, 0 ldr r3, =0x085dcefa ldrb r0, [r3] cmp r0, r2 - beq _08162718 -_0816270A: + beq @08162718 +@0816270A: adds r1, 0x1 cmp r1, 0x13 - bhi _08162718 + bhi @08162718 adds r0, r1, r3 ldrb r0, [r0] cmp r0, r2 - bne _0816270A -_08162718: + bne @0816270A +@08162718: cmp r1, 0x14 - beq _0816275C + beq @0816275C ldr r0, =0x085dcf2c adds r0, r1, r0 ldrb r1, [r0] cmp r5, 0x1 - beq _08162744 + beq @08162744 cmp r5, 0x1 - ble _0816272E + ble @0816272E cmp r5, 0xF - beq _08162750 -_0816272E: + beq @08162750 +@0816272E: ldr r0, =0x00004010 bl var_set - b _08162788 + b @08162788 .align 2, 0 .pool -_08162744: +@08162744: ldr r0, =0x00004011 bl var_set - b _08162788 + b @08162788 .align 2, 0 .pool -_08162750: +@08162750: ldr r0, =0x0000401e bl var_set - b _08162788 + b @08162788 .align 2, 0 .pool -_0816275C: +@0816275C: cmp r5, 0x1 - beq _08162770 + beq @08162770 cmp r5, 0x1 - ble _08162768 + ble @08162768 cmp r5, 0xF - beq _08162780 -_08162768: + beq @08162780 +@08162768: ldr r0, =0x00004010 - b _08162772 + b @08162772 .align 2, 0 .pool -_08162770: +@08162770: ldr r0, =0x00004011 -_08162772: +@08162772: movs r1, 0x7 bl var_set - b _08162788 + b @08162788 .align 2, 0 .pool -_08162780: +@08162780: ldr r0, =0x0000401e movs r1, 0x7 bl var_set -_08162788: +@08162788: pop {r4-r6} pop {r0} bx r0 @@ -684187,7 +684187,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 @@ -684198,7 +684198,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 @@ -684207,30 +684207,30 @@ sub_81627A4: @ 81627A4 movs r0, 0xFA lsls r0, 1 cmp r4, r0 - bne _081627CC + bne @081627CC ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000bed adds r0, r1 - b _08162836 + b @08162836 .align 2, 0 .pool -_081627CC: +@081627CC: ldr r0, =0x0000012b cmp r4, r0 - bhi _081627E8 + bhi @081627E8 ldr r0, =0x0203bc88 ldr r1, [r0] movs r0, 0x34 muls r0, r4 adds r0, r1 - b _08162836 + b @08162836 .align 2, 0 .pool -_081627E8: +@081627E8: ldr r0, =0x0000018f cmp r4, r0 - bhi _08162814 + bhi @08162814 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0xfffffed4 @@ -684240,10 +684240,10 @@ _081627E8: adds r0, r1 ldr r1, =0x00000739 adds r0, r1 - b _08162836 + b @08162836 .align 2, 0 .pool -_08162814: +@08162814: ldr r3, =0x08610970 ldr r0, =0x03005d90 ldr r1, [r0] @@ -684261,55 +684261,55 @@ _08162814: muls r0, r1 adds r0, r3 adds r0, 0x32 -_08162836: +@08162836: ldrb r2, [r0] movs r1, 0 ldr r3, =0x085dcedc ldrb r0, [r3] cmp r0, r2 - beq _08162850 -_08162842: + beq @08162850 +@08162842: adds r1, 0x1 cmp r1, 0x1D - bhi _08162850 + bhi @08162850 adds r0, r1, r3 ldrb r0, [r0] cmp r0, r2 - bne _08162842 -_08162850: + bne @08162842 +@08162850: cmp r1, 0x1E - beq _0816286C + beq @0816286C ldr r0, =0x085dcf0e - b _08162892 + b @08162892 .align 2, 0 .pool -_0816286C: +@0816286C: movs r1, 0 ldr r3, =0x085dcefa ldrb r0, [r3] cmp r0, r2 - beq _08162884 -_08162876: + beq @08162884 +@08162876: adds r1, 0x1 cmp r1, 0x13 - bhi _08162884 + bhi @08162884 adds r0, r1, r3 ldrb r0, [r0] cmp r0, r2 - bne _08162876 -_08162884: + bne @08162876 +@08162884: cmp r1, 0x14 - bne _08162890 + bne @08162890 movs r0, 0x7 - b _08162896 + b @08162896 .align 2, 0 .pool -_08162890: +@08162890: ldr r0, =0x085dcf2c -_08162892: +@08162892: adds r0, r1, r0 ldrb r0, [r0] -_08162896: +@08162896: pop {r4,r5} pop {r1} bx r1 @@ -684318,7 +684318,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 @@ -684340,21 +684340,21 @@ sub_81628A0: @ 81628A0 ldr r1, =0x00000744 adds r1, r0 mov r12, r1 -_081628CA: +@081628CA: movs r6, 0 movs r3, 0 mov r2, r12 ldrb r0, [r2] ldr r4, [sp, 0x18] cmp r0, r4 - bne _081628FA + bne @081628FA mov r4, r9 mov r2, r10 adds r2, 0xC -_081628DE: +@081628DE: adds r3, 0x1 cmp r3, 0x3 - bgt _081628FA + bgt @081628FA ldr r7, =0x03005d90 ldr r0, [r7] adds r1, r3, r4 @@ -684365,10 +684365,10 @@ _081628DE: ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - beq _081628DE -_081628FA: + beq @081628DE +@081628FA: cmp r3, 0x4 - bne _08162944 + bne @08162944 movs r6, 0 ldr r1, =0x03005d90 ldr r0, [r1] @@ -684380,31 +684380,31 @@ _081628FA: mov r4, r10 ldrb r4, [r4, 0x8] cmp r0, r4 - bne _08162944 + bne @08162944 adds r1, r0, 0 mov r2, r9 adds r2, 0x4 -_0816291C: +@0816291C: cmp r1, 0xFF - bne _08162930 + bne @08162930 movs r6, 0x7 - b _08162944 + b @08162944 .align 2, 0 .pool -_08162930: +@08162930: adds r6, 0x1 cmp r6, 0x6 - bgt _08162944 + bgt @08162944 ldr r7, =0x03005d90 ldr r0, [r7] adds r0, r3 adds r0, r2 ldrb r0, [r0] cmp r0, r1 - beq _0816291C -_08162944: + beq @0816291C +@08162944: cmp r6, 0x7 - beq _0816295A + beq @0816295A movs r0, 0xEC add r9, r0 ldr r1, [sp, 0x1C] @@ -684413,10 +684413,10 @@ _08162944: add r12, r0 adds r5, 0x1 cmp r5, 0x4 - ble _081628CA -_0816295A: + ble @081628CA +@0816295A: cmp r5, 0x4 - bgt _08162974 + bgt @08162974 ldr r2, =0x03005d90 ldr r0, [r2] movs r1, 0xEC @@ -684425,10 +684425,10 @@ _0816295A: movs r4, 0xE7 lsls r4, 3 adds r0, r4 - b _081629B2 + b @081629B2 .align 2, 0 .pool -_08162974: +@08162974: movs r5, 0 ldr r7, =0x03005d90 ldr r0, [r7] @@ -684436,24 +684436,24 @@ _08162974: adds r0, r1 ldrh r0, [r0] cmp r0, 0 - beq _0816299E + beq @0816299E adds r3, r7, 0 adds r2, r1, 0 movs r1, 0 -_0816298A: +@0816298A: adds r1, 0xEC adds r5, 0x1 cmp r5, 0x4 - bgt _081629C4 + bgt @081629C4 ldr r0, [r3] adds r0, r1 adds r0, r2 ldrh r0, [r0] cmp r0, 0 - bne _0816298A -_0816299E: + bne @0816298A +@0816299E: cmp r5, 0x4 - bgt _081629C4 + bgt @081629C4 ldr r1, =0x03005d90 ldr r0, [r1] movs r1, 0xEC @@ -684462,14 +684462,14 @@ _0816299E: movs r2, 0xE7 lsls r2, 3 adds r0, r2 -_081629B2: +@081629B2: mov r1, r10 movs r2, 0xEC bl memcpy - b _08162A8A + b @08162A8A .align 2, 0 .pool -_081629C4: +@081629C4: mov r2, sp ldr r4, =0x03005d90 ldr r0, [r4] @@ -684486,11 +684486,11 @@ _081629C4: add r0, sp, 0xC mov r9, r0 mov r12, r3 -_081629E4: +@081629E4: movs r3, 0 adds r7, r5, 0x1 cmp r3, r8 - bge _08162A2E + bge @08162A2E ldr r1, =0x03005d90 ldr r0, [r1] movs r2, 0xEC @@ -684500,32 +684500,32 @@ _081629E4: mov r1, r12 adds r4, r0, r1 mov r6, sp -_081629FE: +@081629FE: lsls r0, r3, 1 add r0, sp ldrh r2, [r4] adds r1, r2, 0 ldrh r0, [r0] cmp r1, r0 - bcs _08162A24 + bcs @08162A24 movs r3, 0 movs r4, 0x1 mov r8, r4 strh r2, [r6] mov r0, r9 strh r5, [r0] - b _08162A2E + b @08162A2E .align 2, 0 .pool -_08162A24: +@08162A24: cmp r1, r0 - bhi _08162A2E + bhi @08162A2E adds r3, 0x1 cmp r3, r8 - blt _081629FE -_08162A2E: + blt @081629FE +@08162A2E: cmp r3, r8 - bne _08162A54 + bne @08162A54 mov r1, r8 lsls r2, r1, 1 mov r4, sp @@ -684543,10 +684543,10 @@ _08162A2E: strh r5, [r2] movs r0, 0x1 add r8, r0 -_08162A54: +@08162A54: adds r5, r7, 0 cmp r5, 0x4 - ble _081629E4 + ble @081629E4 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -684568,7 +684568,7 @@ _08162A54: mov r1, r10 movs r2, 0xEC bl memcpy -_08162A8A: +@08162A8A: add sp, 0x20 pop {r3-r5} mov r8, r3 @@ -684582,7 +684582,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 @@ -684591,7 +684591,7 @@ sub_8162AA0: @ 8162AA0 movs r0, 0xFA lsls r0, 1 cmp r4, r0 - bne _08162AD0 + bne @08162AD0 ldr r1, =0x0831f578 ldr r0, =0x03005d90 ldr r0, [r0] @@ -684599,23 +684599,23 @@ sub_8162AA0: @ 8162AA0 adds r0, r2 ldrb r0, [r0] adds r0, r1 - b _08162BC8 + b @08162BC8 .align 2, 0 .pool -_08162AD0: +@08162AD0: ldr r0, =0x000003fe cmp r4, r0 - bne _08162AE4 + bne @08162AE4 bl sub_81A4CB0 lsls r0, 24 lsrs r0, 24 - b _08162BCA + b @08162BCA .align 2, 0 .pool -_08162AE4: +@08162AE4: ldr r0, =0x0000012b cmp r4, r0 - bhi _08162B08 + bhi @08162B08 ldr r2, =0x0831f578 ldr r0, =0x0203bc88 ldr r1, [r0] @@ -684624,29 +684624,29 @@ _08162AE4: adds r0, r1 ldrb r0, [r0] adds r0, r2 - b _08162BC8 + b @08162BC8 .align 2, 0 .pool -_08162B08: +@08162B08: ldr r0, =0x0000018f cmp r4, r0 - bhi _08162B64 + bhi @08162B64 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 - beq _08162B38 + beq @08162B38 ldr r4, =0x0831f578 bl sub_818649C lsls r0, 24 lsrs r0, 24 adds r0, r4 - b _08162BC8 + b @08162BC8 .align 2, 0 .pool -_08162B38: +@08162B38: ldr r3, =0x0831f578 ldr r0, =0x03005d90 ldr r0, [r0] @@ -684659,17 +684659,17 @@ _08162B38: adds r0, r2 ldrb r0, [r0] adds r0, r3 - b _08162BC8 + b @08162BC8 .align 2, 0 .pool -_08162B64: +@08162B64: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 - bne _08162BB0 + bne @08162BB0 ldr r4, =0x0831f578 ldr r3, =0x08610970 ldr r0, =0x03005d90 @@ -684690,10 +684690,10 @@ _08162B64: adds r0, 0x32 ldrb r0, [r0] adds r0, r4 - b _08162BC8 + b @08162BC8 .align 2, 0 .pool -_08162BB0: +@08162BB0: ldr r5, =0x0831f578 ldr r4, =0x08610970 bl sub_81864A8 @@ -684705,9 +684705,9 @@ _08162BB0: adds r0, 0x32 ldrb r0, [r0] adds r0, r5 -_08162BC8: +@08162BC8: ldrb r0, [r0] -_08162BCA: +@08162BCA: pop {r4,r5} pop {r1} bx r1 @@ -684716,7 +684716,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 @@ -684725,42 +684725,42 @@ sub_8162BD8: @ 8162BD8 movs r0, 0xFA lsls r0, 1 cmp r4, r0 - bne _08162C08 + bne @08162C08 ldr r1, =0x0831f5ca ldr r0, =0x03005d90 ldr r0, [r0] ldr r2, =0x00000bed adds r0, r2 ldrb r0, [r0] - b _08162C26 + b @08162C26 .align 2, 0 .pool -_08162C08: +@08162C08: ldr r0, =0x000003fe cmp r4, r0 - bne _08162C1C + bne @08162C1C bl sub_81A4D00 lsls r0, 24 lsrs r0, 24 - b _08162D1E + b @08162D1E .align 2, 0 .pool -_08162C1C: +@08162C1C: ldr r0, =0x00000c03 cmp r4, r0 - bne _08162C38 + bne @08162C38 ldr r0, =0x08310030 ldr r1, =0x00007da1 -_08162C26: +@08162C26: adds r0, r1 ldrb r0, [r0] - b _08162D1E + b @08162D1E .align 2, 0 .pool -_08162C38: +@08162C38: ldr r0, =0x0000012b cmp r4, r0 - bhi _08162C60 + bhi @08162C60 ldr r2, =0x0831f5ca ldr r0, =0x0203bc88 ldr r1, [r0] @@ -684770,30 +684770,30 @@ _08162C38: ldrb r0, [r0] adds r0, r2 ldrb r0, [r0] - b _08162D1E + b @08162D1E .align 2, 0 .pool -_08162C60: +@08162C60: ldr r0, =0x0000018f cmp r4, r0 - bhi _08162CBC + bhi @08162CBC ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 - beq _08162C90 + beq @08162C90 ldr r4, =0x0831f5ca bl sub_818649C lsls r0, 24 lsrs r0, 24 adds r0, r4 ldrb r0, [r0] - b _08162D1E + b @08162D1E .align 2, 0 .pool -_08162C90: +@08162C90: ldr r3, =0x0831f5ca ldr r0, =0x03005d90 ldr r0, [r0] @@ -684807,17 +684807,17 @@ _08162C90: ldrb r0, [r0] adds r0, r3 ldrb r0, [r0] - b _08162D1E + b @08162D1E .align 2, 0 .pool -_08162CBC: +@08162CBC: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 - beq _08162CF4 + beq @08162CF4 ldr r5, =0x0831f5ca ldr r4, =0x08610970 bl sub_81864A8 @@ -684830,10 +684830,10 @@ _08162CBC: ldrb r0, [r0] adds r0, r5 ldrb r0, [r0] - b _08162D1E + b @08162D1E .align 2, 0 .pool -_08162CF4: +@08162CF4: ldr r4, =0x0831f5ca ldr r3, =0x08610970 ldr r0, =0x03005d90 @@ -684855,7 +684855,7 @@ _08162CF4: ldrb r0, [r0] adds r0, r4 ldrb r0, [r0] -_08162D1E: +@08162D1E: pop {r4,r5} pop {r1} bx r1 @@ -684864,7 +684864,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 @@ -684873,44 +684873,44 @@ sub_8162D34: @ 8162D34 movs r0, 0xFA lsls r0, 1 cmp r4, r0 - bne _08162D5C + bne @08162D5C ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000bed adds r0, r1 - b _08162E0A + b @08162E0A .align 2, 0 .pool -_08162D5C: +@08162D5C: ldr r0, =0x0000012b cmp r4, r0 - bhi _08162D78 + bhi @08162D78 ldr r0, =0x0203bc88 ldr r1, [r0] movs r0, 0x34 muls r0, r4 adds r0, r1 - b _08162E0A + b @08162E0A .align 2, 0 .pool -_08162D78: +@08162D78: ldr r0, =0x0000018f cmp r4, r0 - bhi _08162DC0 + bhi @08162DC0 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 - beq _08162DA0 + beq @08162DA0 bl sub_818649C lsls r0, 24 lsrs r0, 24 - b _08162E0C + b @08162E0C .align 2, 0 .pool -_08162DA0: +@08162DA0: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0xfffffed4 @@ -684920,17 +684920,17 @@ _08162DA0: adds r0, r1 ldr r1, =0x00000739 adds r0, r1 - b _08162E0A + b @08162E0A .align 2, 0 .pool -_08162DC0: +@08162DC0: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 - beq _08162DE8 + beq @08162DE8 ldr r4, =0x08610970 bl sub_81864A8 lsls r0, 24 @@ -684938,10 +684938,10 @@ _08162DC0: movs r1, 0x58 muls r0, r1 adds r0, r4 - b _08162E08 + b @08162E08 .align 2, 0 .pool -_08162DE8: +@08162DE8: ldr r3, =0x08610970 ldr r0, =0x03005d90 ldr r1, [r0] @@ -684958,11 +684958,11 @@ _08162DE8: movs r1, 0x58 muls r0, r1 adds r0, r3 -_08162E08: +@08162E08: adds r0, 0x32 -_08162E0A: +@08162E0A: ldrb r0, [r0] -_08162E0C: +@08162E0C: pop {r4,r5} pop {r1} bx r1 @@ -684971,7 +684971,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 @@ -684981,86 +684981,86 @@ sub_8162E20: @ 8162E20 movs r0, 0xFA lsls r0, 1 cmp r5, r0 - bne _08162E54 + bne @08162E54 ldr r0, =0x03005d90 ldr r0, [r0] movs r1, 0xBF lsls r1, 4 adds r2, r0, r1 -_08162E40: +@08162E40: adds r0, r6, r4 adds r1, r2, r4 ldrb r1, [r1] strb r1, [r0] adds r4, 0x1 cmp r4, 0x6 - ble _08162E40 - b _08162F5C + ble @08162E40 + b @08162F5C .align 2, 0 .pool -_08162E54: +@08162E54: ldr r0, =0x000003fe cmp r5, r0 - bne _08162E68 + bne @08162E68 adds r0, r6, 0 bl sub_81A4D50 - b _08162F62 + b @08162F62 .align 2, 0 .pool -_08162E68: +@08162E68: ldr r0, =0x00000c03 cmp r5, r0 - bne _08162E88 + bne @08162E88 ldr r2, =0x08317dd4 -_08162E70: +@08162E70: adds r0, r6, r4 adds r1, r4, r2 ldrb r1, [r1] strb r1, [r0] adds r4, 0x1 cmp r4, 0x6 - ble _08162E70 - b _08162F5C + ble @08162E70 + b @08162F5C .align 2, 0 .pool -_08162E88: +@08162E88: ldr r0, =0x0000012b cmp r5, r0 - bhi _08162EB4 + bhi @08162EB4 ldr r0, =0x0203bc88 ldr r1, [r0] movs r0, 0x34 muls r0, r5 adds r0, r1 adds r2, r0, 0x4 -_08162E9A: +@08162E9A: adds r0, r6, r4 adds r1, r2, r4 ldrb r1, [r1] strb r1, [r0] adds r4, 0x1 cmp r4, 0x6 - ble _08162E9A - b _08162F5C + ble @08162E9A + b @08162F5C .align 2, 0 .pool -_08162EB4: +@08162EB4: ldr r0, =0x0000018f cmp r5, r0 - bhi _08162F00 + bhi @08162F00 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 - beq _08162ED8 + beq @08162ED8 adds r0, r6, 0 bl sub_8186468 - b _08162F62 + b @08162F62 .align 2, 0 .pool -_08162ED8: +@08162ED8: ldr r2, =0x03005d90 movs r0, 0xEC adds r1, r5, 0 @@ -685074,27 +685074,27 @@ _08162ED8: ldrb r2, [r0] adds r0, r6, 0 bl sub_81DB5E8 - b _08162F62 + b @08162F62 .align 2, 0 .pool -_08162F00: +@08162F00: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 - beq _08162F24 + beq @08162F24 bl sub_81864A8 lsls r0, 24 lsrs r5, r0, 24 bl sub_81864C0 lsls r0, 24 lsrs r4, r0, 24 - b _08162F3E + b @08162F3E .align 2, 0 .pool -_08162F24: +@08162F24: ldr r1, =0x03005d90 lsls r0, r5, 4 adds r0, r5 @@ -685108,7 +685108,7 @@ _08162F24: lsrs r5, r0, 27 adds r1, 0x3F ldrb r4, [r1] -_08162F3E: +@08162F3E: adds r0, r5, 0 adds r1, r4, 0 bl sub_81A1650 @@ -685116,21 +685116,21 @@ _08162F3E: adds r0, r6, 0 adds r2, r4, 0 bl sub_81DB5E8 - b _08162F62 + b @08162F62 .align 2, 0 .pool -_08162F5C: +@08162F5C: adds r1, r6, r4 movs r0, 0xFF strb r0, [r1] -_08162F62: +@08162F62: pop {r4-r6} pop {r0} bx r0 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 @@ -685139,40 +685139,40 @@ sub_8162F68: @ 8162F68 movs r0, 0xFA lsls r0, 1 cmp r4, r0 - bne _08162F90 + bne @08162F90 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000bed adds r0, r1 - b _0816300E + b @0816300E .align 2, 0 .pool -_08162F90: +@08162F90: ldr r0, =0x000003fe cmp r4, r0 - bne _08162FA4 + bne @08162FA4 bl sub_81A4DB8 lsls r0, 24 lsrs r0, 24 - b _08163042 + b @08163042 .align 2, 0 .pool -_08162FA4: +@08162FA4: ldr r0, =0x0000012b cmp r4, r0 - bhi _08162FC0 + bhi @08162FC0 ldr r0, =0x0203bc88 ldr r1, [r0] movs r0, 0x34 muls r0, r4 adds r0, r1 - b _0816300E + b @0816300E .align 2, 0 .pool -_08162FC0: +@08162FC0: ldr r0, =0x0000018f cmp r4, r0 - bhi _08162FEC + bhi @08162FEC ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0xfffffed4 @@ -685182,10 +685182,10 @@ _08162FC0: adds r0, r1 ldr r1, =0x00000739 adds r0, r1 - b _0816300E + b @0816300E .align 2, 0 .pool -_08162FEC: +@08162FEC: ldr r3, =0x08610970 ldr r0, =0x03005d90 ldr r1, [r0] @@ -685203,38 +685203,38 @@ _08162FEC: muls r0, r1 adds r0, r3 adds r0, 0x32 -_0816300E: +@0816300E: ldrb r2, [r0] movs r1, 0 ldr r3, =0x085dcefa ldrb r0, [r3] cmp r0, r2 - beq _08163028 -_0816301A: + beq @08163028 +@0816301A: adds r1, 0x1 cmp r1, 0x13 - bhi _08163028 + bhi @08163028 adds r0, r1, r3 ldrb r0, [r0] cmp r0, r2 - bne _0816301A -_08163028: + bne @0816301A +@08163028: cmp r1, 0x14 - bne _08163040 + bne @08163040 movs r0, 0 - b _08163042 + b @08163042 .align 2, 0 .pool -_08163040: +@08163040: movs r0, 0x1 -_08163042: +@08163042: pop {r4,r5} pop {r1} bx r1 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 @@ -685253,7 +685253,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 @@ -685277,7 +685277,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 @@ -685296,7 +685296,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 @@ -685320,7 +685320,7 @@ sub_81630C4: @ 81630C4 str r0, [sp, 0x20] ldr r0, =0x0000012b cmp r5, r0 - bhi _08163138 + bhi @08163138 adds r0, r5, 0 bl sub_8165D08 lsls r0, 24 @@ -685341,25 +685341,25 @@ sub_81630C4: @ 81630C4 ldrh r1, [r2] ldr r0, =0x0000ffff cmp r1, r0 - bne _08163124 - b _08163278 -_08163124: - b _08163260 + bne @08163124 + b @08163278 +@08163124: + b @08163260 .align 2, 0 .pool -_08163138: +@08163138: movs r0, 0xFA lsls r0, 1 cmp r5, r0 - bne _08163180 + bne @08163180 ldr r7, [sp, 0x18] adds r0, r7, 0x3 cmp r7, r0 - blt _0816314A - b _08163426 -_0816314A: + blt @0816314A + b @08163426 +@0816314A: ldr r4, =0x03005d90 -_0816314C: +@0816314C: movs r0, 0x64 muls r0, r7 ldr r1, =0x02024744 @@ -685378,30 +685378,30 @@ _0816314C: adds r0, r5, 0 adds r0, 0x3 cmp r7, r0 - blt _0816314C - b _08163426 + blt @0816314C + b @08163426 .align 2, 0 .pool -_08163180: +@08163180: ldr r0, =0x000003fe cmp r5, r0 - bne _08163190 + bne @08163190 bl sub_81A4E04 - b _08163426 + b @08163426 .align 2, 0 .pool -_08163190: +@08163190: ldr r0, =0x0000018f cmp r5, r0 - bhi _08163218 + bhi @08163218 movs r6, 0 ldr r7, [sp, 0x18] ldr r1, [sp, 0x1C] adds r0, r7, r1 cmp r7, r0 - blt _081631A4 - b _08163426 -_081631A4: + blt @081631A4 + b @08163426 +@081631A4: ldr r2, =0xfffffed4 adds r1, r5, r2 movs r0, 0xEC @@ -685411,7 +685411,7 @@ _081631A4: muls r0, r5 ldr r5, =0xfffef2a8 adds r4, r0, r5 -_081631B6: +@081631B6: ldr r0, =0x03005d90 ldr r3, [r0] movs r0, 0x2C @@ -685424,13 +685424,13 @@ _081631B6: adds r0, r1, r5 ldrh r0, [r0] cmp r0, 0 - beq _081631F0 + beq @081631F0 adds r5, 0xC adds r0, r1, r5 ldrb r0, [r0] ldr r1, [sp, 0x20] cmp r0, r1 - bhi _081631F0 + bhi @081631F0 movs r0, 0x64 muls r0, r7 ldr r1, =0x02024744 @@ -685440,24 +685440,24 @@ _081631B6: adds r1, r2 movs r2, 0 bl sub_8068338 -_081631F0: +@081631F0: adds r6, 0x1 adds r7, 0x1 ldr r2, [sp, 0x18] ldr r5, [sp, 0x1C] adds r0, r2, r5 cmp r7, r0 - blt _081631B6 - b _08163426 + blt @081631B6 + b @08163426 .align 2, 0 .pool -_08163218: +@08163218: ldr r7, [sp, 0x18] adds r0, r7, 0x3 cmp r7, r0 - blt _08163222 - b _08163426 -_08163222: + blt @08163222 + b @08163426 +@08163222: ldr r6, =0x03005d90 lsls r0, r5, 4 adds r0, r5 @@ -685465,7 +685465,7 @@ _08163222: ldr r1, =0xffff969c adds r5, r0, r1 movs r4, 0 -_08163230: +@08163230: movs r0, 0x64 muls r0, r7 ldr r1, =0x02024744 @@ -685481,11 +685481,11 @@ _08163230: ldr r0, [sp, 0x18] adds r0, 0x3 cmp r7, r0 - blt _08163230 - b _08163426 + blt @08163230 + b @08163426 .align 2, 0 .pool -_08163260: +@08163260: ldr r0, [sp, 0x28] adds r0, 0x1 lsls r0, 24 @@ -685497,8 +685497,8 @@ _08163260: ldrh r1, [r0] ldr r0, =0x0000ffff cmp r1, r0 - bne _08163260 -_08163278: + bne @08163260 +@08163278: movs r7, 0 bl GenerateRandomNumber adds r4, r0, 0 @@ -685510,9 +685510,9 @@ _08163278: str r4, [sp, 0x30] ldr r6, [sp, 0x1C] cmp r7, r6 - bne _08163296 - b _08163426 -_08163296: + bne @08163296 + b @08163426 +@08163296: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -685524,27 +685524,27 @@ _08163296: ldrh r4, [r0] ldr r2, [sp, 0x20] cmp r2, 0x32 - beq _081632B6 + beq @081632B6 cmp r2, 0x14 - bne _081632BE -_081632B6: + bne @081632BE +@081632B6: ldr r0, =0x00000351 cmp r4, r0 - bls _081632BE - b _0816341E -_081632BE: + bls @081632BE + b @0816341E +@081632BE: movs r6, 0 ldr r5, [sp, 0x18] adds r5, r7 mov r8, r5 - b _081632D2 + b @081632D2 .align 2, 0 .pool -_081632D0: +@081632D0: adds r6, 0x1 -_081632D2: +@081632D2: cmp r6, r8 - bge _081632F6 + bge @081632F6 movs r1, 0x64 adds r0, r6, 0 muls r0, r1 @@ -685559,19 +685559,19 @@ _081632D2: adds r1, r2 ldrh r1, [r1] cmp r0, r1 - bne _081632D0 -_081632F6: + bne @081632D0 +@081632F6: cmp r6, r8 - beq _081632FC - b _0816341E -_081632FC: + beq @081632FC + b @0816341E +@081632FC: movs r6, 0 cmp r6, r8 - bge _08163346 + bge @08163346 ldr r5, =0x085cecb0 mov r9, r5 movs r3, 0 -_08163308: +@08163308: ldr r0, =0x02024744 adds r5, r3, r0 adds r0, r5, 0 @@ -685581,7 +685581,7 @@ _08163308: bl pokemon_getattr ldr r3, [sp, 0x38] cmp r0, 0 - beq _0816333E + beq @0816333E adds r0, r5, 0 movs r1, 0xC movs r2, 0 @@ -685596,34 +685596,34 @@ _08163308: ldr r3, [sp, 0x38] ldrh r1, [r1] cmp r0, r1 - beq _08163346 -_0816333E: + beq @08163346 +@0816333E: adds r3, 0x64 adds r6, 0x1 cmp r6, r8 - blt _08163308 -_08163346: + blt @08163308 +@08163346: cmp r6, r8 - bne _0816341E + bne @0816341E movs r6, 0 cmp r6, r7 - bge _08163368 + bge @08163368 add r0, sp, 0xC ldrh r0, [r0] cmp r0, r4 - beq _08163368 + beq @08163368 add r1, sp, 0xC -_0816335A: +@0816335A: adds r1, 0x2 adds r6, 0x1 cmp r6, r7 - bge _08163368 + bge @08163368 ldrh r0, [r1] cmp r0, r4 - bne _0816335A -_08163368: + bne @0816335A +@08163368: cmp r6, r7 - bne _0816341E + bne @0816341E lsls r0, r7, 1 add r0, sp adds r0, 0xC @@ -685661,7 +685661,7 @@ _08163368: str r1, [sp, 0x3C] ldr r2, =0x02024744 mov r10, r2 -_081633B8: +@081633B8: ldr r0, [r5] ldr r7, [sp, 0x3C] adds r0, r7, r0 @@ -685683,14 +685683,14 @@ _081633B8: ldrh r0, [r0] ldr r3, [sp, 0x38] cmp r0, 0xDA - bne _081633EC + bne @081633EC movs r0, 0 mov r2, sp strb r0, [r2, 0x14] -_081633EC: +@081633EC: adds r6, 0x1 cmp r6, 0x3 - ble _081633B8 + ble @081633B8 movs r5, 0x64 mov r4, r8 muls r4, r5 @@ -685711,12 +685711,12 @@ _081633EC: movs r1, 0xC bl pokemon_setattr ldr r7, [sp, 0x34] -_0816341E: +@0816341E: ldr r0, [sp, 0x1C] cmp r7, r0 - beq _08163426 - b _08163296 -_08163426: + beq @08163426 + b @08163296 +@08163426: add sp, 0x40 pop {r3-r5} mov r8, r3 @@ -685730,7 +685730,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 @@ -685752,10 +685752,10 @@ sub_8163444: @ 8163444 movs r1, 0x9 str r1, [sp, 0x10] cmp r0, 0x4 - bhi _08163474 + bhi @08163474 movs r0, 0x6 str r0, [sp, 0x10] -_08163474: +@08163474: ldr r1, =0x00000ca9 adds r0, r2, r1 ldrb r1, [r0] @@ -685764,16 +685764,16 @@ _08163474: movs r1, 0x32 str r1, [sp, 0xC] cmp r0, 0 - beq _0816348A + beq @0816348A movs r0, 0x64 str r0, [sp, 0xC] -_0816348A: +@0816348A: movs r7, 0 adds r2, 0xE2 str r2, [sp, 0x14] add r1, sp, 0x4 mov r9, r1 -_08163494: +@08163494: ldr r2, [sp, 0x8] adds r6, r2, r7 movs r0, 0x64 @@ -685797,20 +685797,20 @@ _08163494: adds r2, r7, 0x1 mov r8, r2 movs r1, 0x3 -_081634C4: +@081634C4: ldr r2, [sp, 0x14] adds r0, r2, r4 ldrh r0, [r0] cmp r0, 0xDA - bne _081634D4 + bne @081634D4 movs r2, 0 mov r0, r9 strb r2, [r0] -_081634D4: +@081634D4: adds r4, 0x2 subs r1, 0x1 cmp r1, 0 - bge _081634C4 + bge @081634C4 movs r0, 0x64 adds r4, r6, 0 muls r4, r0 @@ -685829,7 +685829,7 @@ _081634D4: bl pokemon_setattr mov r7, r8 cmp r7, 0x3 - bne _08163494 + bne @08163494 add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -685843,7 +685843,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 @@ -685859,21 +685859,21 @@ sub_8163524: @ 8163524 ldr r5, [r0, 0x30] movs r4, 0 ldrh r1, [r5] - b _08163558 + b @08163558 .align 2, 0 .pool -_0816354C: +@0816354C: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 lsls r0, r4, 1 adds r0, r5 ldrh r1, [r0] -_08163558: +@08163558: ldr r0, =0x0000ffff cmp r1, r0 - bne _0816354C -_0816355E: + bne @0816354C +@0816355E: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -685883,14 +685883,14 @@ _0816355E: adds r0, r5 ldrh r1, [r0] cmp r6, 0x32 - beq _0816357A + beq @0816357A cmp r6, 0x14 - bne _08163580 -_0816357A: + bne @08163580 +@0816357A: ldr r0, =0x00000351 cmp r1, r0 - bhi _0816355E -_08163580: + bhi @0816355E +@08163580: adds r0, r1, 0 pop {r4-r6} pop {r1} @@ -685900,7 +685900,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 @@ -685911,20 +685911,20 @@ sub_8163590: @ 8163590 movs r0, 0x3 ands r0, r1 cmp r0, 0x2 - beq _081635C0 + beq @081635C0 ldr r0, =0x02038bca ldrh r0, [r0] movs r1, 0 bl sub_81635D4 - b _081635CA + b @081635CA .align 2, 0 .pool -_081635C0: +@081635C0: ldr r0, =0x02038bca ldrh r0, [r0] movs r1, 0 bl sub_816379C -_081635CA: +@081635CA: pop {r0} bx r0 .align 2, 0 @@ -685932,7 +685932,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 @@ -685947,7 +685947,7 @@ sub_81635D4: @ 81635D4 str r1, [sp, 0x10] ldr r0, =0x0000012b cmp r2, r0 - bhi _0816364A + bhi @0816364A ldr r4, =0x03005d90 ldr r0, =0x000040ce bl var_get @@ -685967,35 +685967,35 @@ sub_81635D4: @ 81635D4 adds r4, r3 ldrh r0, [r4] cmp r0, 0x5 - bhi _0816363C + bhi @0816363C adds r0, r1, 0 movs r1, 0 bl sub_81A6CA8 lsls r0, 24 lsrs r0, 24 - b _081636A6 + b @081636A6 .align 2, 0 .pool -_0816363C: +@0816363C: adds r0, r1, 0 movs r1, 0x1 bl sub_81A6CA8 lsls r0, 24 lsrs r0, 24 - b _081636A6 -_0816364A: + b @081636A6 +@0816364A: movs r0, 0xFA lsls r0, 1 cmp r2, r0 - bne _08163694 + bne @08163694 ldr r7, [sp, 0x10] adds r0, r7, 0x3 cmp r7, r0 - blt _0816365C - b _08163776 -_0816365C: + blt @0816365C + b @08163776 +@0816365C: ldr r4, =0x03005d90 -_0816365E: +@0816365E: movs r0, 0x64 muls r0, r7 ldr r1, =0x02024744 @@ -686016,21 +686016,21 @@ _0816365E: ldr r0, [sp, 0x10] adds r0, 0x3 cmp r7, r0 - blt _0816365E - b _08163776 + blt @0816365E + b @08163776 .align 2, 0 .pool -_08163694: +@08163694: ldr r0, =0x000003fe cmp r3, r0 - bne _081636A4 + bne @081636A4 bl sub_81A6CD0 - b _08163776 + b @08163776 .align 2, 0 .pool -_081636A4: +@081636A4: movs r0, 0x1F -_081636A6: +@081636A6: str r0, [sp, 0x18] bl sub_8165C40 lsls r0, 24 @@ -686050,7 +686050,7 @@ _081636A6: orrs r2, r0 mov r8, r2 movs r7, 0 -_081636CE: +@081636CE: ldr r1, =0x03006298 lsls r0, r7, 1 adds r0, r1 @@ -686087,7 +686087,7 @@ _081636CE: adds r7, 0x1 mov r10, r7 adds r7, r4, 0 -_08163718: +@08163718: ldr r0, =0x0203bc8c ldr r1, [r0] mov r2, r9 @@ -686107,7 +686107,7 @@ _08163718: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3 - bls _08163718 + bls @08163718 movs r3, 0x64 adds r4, r5, 0 muls r4, r3 @@ -686131,8 +686131,8 @@ _08163718: lsls r0, r2, 24 lsrs r7, r0, 24 cmp r7, 0x2 - bls _081636CE -_08163776: + bls @081636CE +@08163776: add sp, 0x20 pop {r3-r5} mov r8, r3 @@ -686146,7 +686146,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 @@ -686173,7 +686173,7 @@ sub_816379C: @ 816379C mov r9, r2 movs r7, 0 mov r8, r7 -_081637D0: +@081637D0: ldr r1, =0x03006298 mov r2, r8 lsls r0, r2, 1 @@ -686209,7 +686209,7 @@ _081637D0: str r0, [sp, 0x14] mov r8, r4 mov r5, r8 -_08163818: +@08163818: ldr r1, =0x0203bc8c ldr r0, [r1] adds r0, r5, r0 @@ -686228,16 +686228,16 @@ _08163818: adds r0, r4 ldrh r0, [r0] cmp r0, 0xDA - bne _08163846 + bne @08163846 movs r1, 0 add r0, sp, 0xC strb r1, [r0] -_08163846: +@08163846: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x3 - bls _08163818 + bls @08163818 movs r2, 0x64 mov r4, r10 muls r4, r2 @@ -686262,7 +686262,7 @@ _08163846: lsrs r0, 24 mov r8, r0 cmp r0, 0x2 - bls _081637D0 + bls @081637D0 add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -686276,7 +686276,7 @@ _08163846: thumb_func_end sub_816379C thumb_func_start sub_81638AC -sub_81638AC: @ 81638AC +sub_81638AC: ; 81638AC push {r4,r5,lr} adds r5, r0, 0 ldr r4, =0x02021fc4 @@ -686291,7 +686291,7 @@ sub_81638AC: @ 81638AC adds r1, r4, 0 bl font_get_width_of_string cmp r0, 0xCC - bls _0816390A + bls @0816390A adds r0, r4, 0 adds r1, r5, 0 movs r2, 0x2 @@ -686300,32 +686300,32 @@ sub_81638AC: @ 81638AC ldrb r0, [r4] movs r1, 0x1 cmp r0, 0xFE - beq _081638EE + beq @081638EE adds r2, r4, 0 -_081638E4: +@081638E4: adds r0, r1, r2 ldrb r0, [r0] adds r1, 0x1 cmp r0, 0xFE - bne _081638E4 -_081638EE: + bne @081638E4 +@081638EE: ldr r2, =0x02021fc4 adds r0, r1, r2 ldrb r0, [r0] adds r3, r2, 0 cmp r0, 0xFE - beq _08163904 -_081638FA: + beq @08163904 +@081638FA: adds r1, 0x1 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0xFE - bne _081638FA -_08163904: + bne @081638FA +@08163904: adds r1, r3 movs r0, 0xFA strb r0, [r1] -_0816390A: +@0816390A: pop {r4,r5} pop {r0} bx r0 @@ -686334,35 +686334,35 @@ _0816390A: thumb_func_end sub_81638AC thumb_func_start sub_8163914 -sub_8163914: @ 8163914 +sub_8163914: ; 8163914 push {lr} bl sub_8165C40 ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0 - beq _08163930 + beq @08163930 ldr r0, =0x02038bcc - b _08163932 + b @08163932 .align 2, 0 .pool -_08163930: +@08163930: ldr r0, =0x02038bca -_08163932: +@08163932: ldrh r3, [r0] movs r0, 0xFA lsls r0, 1 cmp r3, r0 - bne _08163950 + bne @08163950 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000bfc - b _08163986 + b @08163986 .align 2, 0 .pool -_08163950: +@08163950: ldr r0, =0x0000012b cmp r3, r0 - bhi _08163974 + bhi @08163974 ldr r2, =0x0203bc88 movs r0, 0x34 adds r1, r3, 0 @@ -686371,38 +686371,38 @@ _08163950: adds r0, r1 adds r0, 0xC bl sub_81638AC - b _081639A8 + b @081639A8 .align 2, 0 .pool -_08163974: +@08163974: ldr r0, =0x0000018f cmp r3, r0 - bhi _0816399C + bhi @0816399C ldr r1, =0x03005d90 movs r0, 0xEC muls r0, r3 ldr r1, [r1] adds r0, r1 ldr r1, =0xfffef2b8 -_08163986: +@08163986: adds r0, r1 bl sub_81638AC - b _081639A8 + b @081639A8 .align 2, 0 .pool -_0816399C: +@0816399C: adds r0, r3, 0 adds r0, 0x70 lsls r0, 24 lsrs r0, 24 bl sub_819F99C -_081639A8: +@081639A8: pop {r0} bx r0 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 @@ -686410,28 +686410,28 @@ sub_81639AC: @ 81639AC adds r0, 0x26 ldrb r0, [r0] cmp r0, 0xA - bhi _08163A78 + bhi @08163A78 lsls r0, 2 - ldr r1, =_081639D0 + ldr r1, =@081639D0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081639D0: - .4byte _081639FC - .4byte _08163A38 - .4byte _08163A74 - .4byte _081639FC - .4byte _081639FC - .4byte _081639FC - .4byte _081639FC - .4byte _081639FC - .4byte _08163A78 - .4byte _081639FC - .4byte _081639FC -_081639FC: +@081639D0: + .4byte @081639FC + .4byte @08163A38 + .4byte @08163A74 + .4byte @081639FC + .4byte @081639FC + .4byte @081639FC + .4byte @081639FC + .4byte @081639FC + .4byte @08163A78 + .4byte @081639FC + .4byte @081639FC +@081639FC: ldr r0, =0x03005d90 ldr r0, [r0] ldr r2, =0x00000ebc @@ -686439,27 +686439,27 @@ _081639FC: ldr r2, [r1] ldr r0, =0x00fffffe cmp r2, r0 - bhi _08163A2C + bhi @08163A2C adds r0, r2, 0x1 str r0, [r1] movs r1, 0x14 bl __umodsi3 cmp r0, 0 - bne _08163A78 + bne @08163A78 bl sub_81DA57C - b _08163A78 + b @08163A78 .align 2, 0 .pool -_08163A2C: +@08163A2C: ldr r0, =0x00ffffff str r0, [r1] - b _08163A78 + b @08163A78 .align 2, 0 .pool -_08163A38: +@08163A38: movs r5, 0 ldr r6, =0x03005d8c -_08163A3C: +@08163A3C: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -686480,13 +686480,13 @@ _08163A3C: bl pokemon_setattr adds r5, 0x1 cmp r5, 0x5 - ble _08163A3C - b _08163A78 + ble @08163A3C + b @08163A78 .align 2, 0 .pool -_08163A74: +@08163A74: bl sub_816537C -_08163A78: +@08163A78: ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 add sp, 0x4 @@ -686498,7 +686498,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 @@ -686506,7 +686506,7 @@ sub_8163A8C: @ 8163A8C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08163AB0 + bne @08163AB0 ldr r0, =0x030022c0 ldr r1, =sub_81639AC + 1 str r1, [r0, 0x8] @@ -686514,7 +686514,7 @@ sub_8163A8C: @ 8163A8C bl set_callback2 adds r0, r4, 0 bl remove_task -_08163AB0: +@08163AB0: pop {r4} pop {r0} bx r0 @@ -686523,7 +686523,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 @@ -686533,30 +686533,30 @@ sub_8163AC4: @ 8163AC4 strb r1, [r0] ldrh r0, [r2] cmp r0, 0xA - bls _08163ADA - b _08163E68 -_08163ADA: + bls @08163ADA + b @08163E68 +@08163ADA: lsls r0, 2 - ldr r1, =_08163AF0 + ldr r1, =@08163AF0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08163AF0: - .4byte _08163B1C - .4byte _08163BC0 - .4byte _08163C10 - .4byte _08163C70 - .4byte _08163CC4 - .4byte _08163D28 - .4byte _08163D74 - .4byte _08163DB4 - .4byte _08163E2C - .4byte _08163DF4 - .4byte _08163DC8 -_08163B1C: +@08163AF0: + .4byte @08163B1C + .4byte @08163BC0 + .4byte @08163C10 + .4byte @08163C70 + .4byte @08163CC4 + .4byte @08163D28 + .4byte @08163D74 + .4byte @08163DB4 + .4byte @08163E2C + .4byte @08163DF4 + .4byte @08163DC8 +@08163B1C: ldr r5, =0x02022fec movs r0, 0x84 lsls r0, 1 @@ -686566,32 +686566,32 @@ _08163B1C: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x1 - beq _08163B56 + beq @08163B56 cmp r4, 0x1 - bgt _08163B44 + bgt @08163B44 cmp r4, 0 - beq _08163B4E - b _08163BA6 + beq @08163B4E + b @08163BA6 .align 2, 0 .pool -_08163B44: +@08163B44: cmp r4, 0x2 - beq _08163B64 + beq @08163B64 cmp r4, 0x3 - beq _08163B98 - b _08163BA6 -_08163B4E: + beq @08163B98 + b @08163BA6 +@08163B4E: movs r0, 0x3 bl sub_8163048 - b _08163BA6 -_08163B56: + b @08163BA6 +@08163B56: movs r0, 0x4 bl sub_8163048 ldr r0, [r5] orrs r0, r4 str r0, [r5] - b _08163BA6 -_08163B64: + b @08163BA6 +@08163B64: movs r0, 0x2 bl sub_816306C ldr r1, =0x02038bce @@ -686607,30 +686607,30 @@ _08163B64: ldr r1, =0x00408041 orrs r0, r1 str r0, [r5] - b _08163BA6 + b @08163BA6 .align 2, 0 .pool -_08163B98: +@08163B98: ldr r0, [r5] ldr r1, =0x00800043 orrs r0, r1 str r0, [r5] movs r0, 0x2 bl sub_816306C -_08163BA6: +@08163BA6: ldr r0, =sub_8163A8C + 1 movs r1, 0x1 bl AddTask movs r0, 0 bl current_map_music_set__default_for_battle movs r0, 0 - b _08163E10 + b @08163E10 .align 2, 0 .pool -_08163BC0: +@08163BC0: movs r5, 0 ldr r6, =0x03005d8c -_08163BC4: +@08163BC4: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -686650,21 +686650,21 @@ _08163BC4: bl pokemon_setattr adds r5, 0x1 cmp r5, 0x5 - ble _08163BC4 + ble @08163BC4 ldr r0, =sub_8163A8C + 1 movs r1, 0x1 bl AddTask movs r0, 0 bl current_map_music_set__default_for_battle movs r0, 0xC - b _08163E10 + b @08163E10 .align 2, 0 .pool -_08163C10: +@08163C10: bl zero_enemy_party_data movs r5, 0 ldr r4, =0x03005d90 -_08163C18: +@08163C18: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -686680,7 +686680,7 @@ _08163C18: bl sub_806819C adds r5, 0x1 cmp r5, 0x2 - ble _08163C18 + ble @08163C18 ldr r1, =0x02022fec ldr r0, =0x00000808 str r0, [r1] @@ -686693,10 +686693,10 @@ _08163C18: movs r0, 0 bl current_map_music_set__default_for_battle movs r0, 0xD - b _08163E10 + b @08163E10 .align 2, 0 .pool -_08163C70: +@08163C70: ldr r4, =0x02022fec ldr r0, =0x00010008 str r0, [r4] @@ -686705,29 +686705,29 @@ _08163C70: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x1 - bne _08163C8A + bne @08163C8A ldr r0, [r4] orrs r0, r1 str r0, [r4] -_08163C8A: +@08163C8A: ldr r0, =0x02038bca ldrh r1, [r0] ldr r0, =0x000003fe cmp r1, r0 - bne _08163C9A + bne @08163C9A movs r0, 0x2 bl sub_8163048 -_08163C9A: +@08163C9A: ldr r0, =sub_8163A8C + 1 movs r1, 0x1 bl AddTask movs r0, 0 bl sub_806E694 movs r0, 0x3 - b _08163E10 + b @08163E10 .align 2, 0 .pool -_08163CC4: +@08163CC4: ldr r4, =0x02022fec ldr r0, =0x00020008 str r0, [r4] @@ -686736,11 +686736,11 @@ _08163CC4: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x1 - bne _08163CDE + bne @08163CDE ldr r0, [r4] orrs r0, r1 str r0, [r4] -_08163CDE: +@08163CDE: ldr r0, =0x03005d90 ldr r0, [r0] ldr r2, =0x00000ca9 @@ -686749,26 +686749,26 @@ _08163CDE: movs r0, 0x3 ands r0, r1 cmp r0, 0x2 - beq _08163D0C + beq @08163D0C movs r0, 0x3 bl sub_8163048 - b _08163D12 + b @08163D12 .align 2, 0 .pool -_08163D0C: +@08163D0C: movs r0, 0x3 bl sub_81630A0 -_08163D12: +@08163D12: ldr r0, =sub_8163A8C + 1 movs r1, 0x1 bl AddTask movs r0, 0 bl current_map_music_set__default_for_battle movs r0, 0x4 - b _08163E10 + b @08163E10 .align 2, 0 .pool -_08163D28: +@08163D28: ldr r1, =0x02022fec ldr r0, =0x00040008 str r0, [r1] @@ -686780,26 +686780,26 @@ _08163D28: movs r0, 0x3 ands r0, r1 cmp r0, 0x2 - beq _08163D58 + beq @08163D58 movs r0, 0x3 bl sub_8163048 - b _08163D5E + b @08163D5E .align 2, 0 .pool -_08163D58: +@08163D58: movs r0, 0x3 bl sub_81630A0 -_08163D5E: +@08163D5E: ldr r0, =sub_8163A8C + 1 movs r1, 0x1 bl AddTask movs r0, 0 bl current_map_music_set__default_for_battle movs r0, 0x5 - b _08163E10 + b @08163E10 .align 2, 0 .pool -_08163D74: +@08163D74: ldr r4, =0x02022fec ldr r0, =0x00080008 str r0, [r4] @@ -686808,11 +686808,11 @@ _08163D74: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x1 - bne _08163D8E + bne @08163D8E ldr r0, [r4] orrs r0, r1 str r0, [r4] -_08163D8E: +@08163D8E: bl sub_8163590 ldr r0, =sub_8163A8C + 1 movs r1, 0x1 @@ -686820,20 +686820,20 @@ _08163D8E: movs r0, 0 bl current_map_music_set__default_for_battle movs r0, 0x6 - b _08163E10 + b @08163E10 .align 2, 0 .pool -_08163DB4: +@08163DB4: ldr r1, =0x02022fec movs r0, 0x84 lsls r0, 1 str r0, [r1] movs r0, 0x3 bl sub_8163048 - b _08163E00 + b @08163E00 .align 2, 0 .pool -_08163DC8: +@08163DC8: ldr r1, =0x02022fec ldr r0, =0x00200008 str r0, [r1] @@ -686845,31 +686845,31 @@ _08163DC8: movs r0, 0 bl current_map_music_set__default_for_battle movs r0, 0xA - b _08163E10 + b @08163E10 .align 2, 0 .pool -_08163DF4: +@08163DF4: ldr r1, =0x02022fec ldr r0, =0x00008109 str r0, [r1] movs r0, 0x1 bl sub_816306C -_08163E00: +@08163E00: ldr r0, =sub_8163A8C + 1 movs r1, 0x1 bl AddTask movs r0, 0 bl current_map_music_set__default_for_battle movs r0, 0x7 -_08163E10: +@08163E10: bl sub_80B100C lsls r0, 24 lsrs r0, 24 bl sub_8145EF4 - b _08163E68 + b @08163E68 .align 2, 0 .pool -_08163E2C: +@08163E2C: ldr r1, =0x02022fec ldr r0, =0x00408049 str r0, [r1] @@ -686894,7 +686894,7 @@ _08163E2C: bl current_map_music_set__default_for_battle movs r0, 0x12 bl sub_8145EF4 -_08163E68: +@08163E68: add sp, 0x4 pop {r4-r6} pop {r0} @@ -686904,7 +686904,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] @@ -686933,9 +686933,9 @@ sub_8163E90: @ 8163E90 adds r1, r0, r5 ldrh r0, [r1] cmp r0, r2 - bcs _08163ED0 + bcs @08163ED0 strh r2, [r1] -_08163ED0: +@08163ED0: pop {r4-r6} pop {r0} bx r0 @@ -686944,7 +686944,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 @@ -686968,7 +686968,7 @@ sub_8163EE4: @ 8163EE4 ldr r2, [r4] ldrb r0, [r2, 0x8] cmp r0, 0 - beq _08163F40 + beq @08163F40 ldr r4, =0x085dcefa ldrb r0, [r2, 0xA] ldrb r1, [r2, 0xB] @@ -686978,10 +686978,10 @@ sub_8163EE4: @ 8163EE4 ldrb r1, [r2, 0xD] adds r0, r1 movs r1, 0x14 - b _08163F52 + b @08163F52 .align 2, 0 .pool -_08163F40: +@08163F40: ldr r4, =0x085dcedc ldrb r0, [r2, 0xA] ldrb r1, [r2, 0xB] @@ -686991,7 +686991,7 @@ _08163F40: ldrb r1, [r2, 0xD] adds r0, r1 movs r1, 0x1E -_08163F52: +@08163F52: bl __umodsi3 adds r0, r4 ldrb r0, [r0] @@ -687022,7 +687022,7 @@ _08163F52: movs r0, 0xE4 adds r0, r5 mov r8, r0 -_08163F96: +@08163F96: lsls r2, r4, 1 mov r1, r12 adds r3, r1, r2 @@ -687048,9 +687048,9 @@ _08163F96: strh r0, [r3] adds r4, 0x1 cmp r4, 0x5 - ble _08163F96 + ble @08163F96 movs r4, 0 -_08163FCC: +@08163FCC: ldr r6, =0x03005d90 ldr r0, [r6] lsls r1, r4, 1 @@ -687059,7 +687059,7 @@ _08163FCC: adds r1, r0, r1 ldrh r0, [r1] cmp r0, 0 - beq _08163FF4 + beq @08163FF4 adds r1, r0, 0 movs r0, 0x64 muls r0, r1 @@ -687070,10 +687070,10 @@ _08163FCC: adds r1, 0x34 adds r1, r5, r1 bl sub_80686FC -_08163FF4: +@08163FF4: adds r4, 0x1 cmp r4, 0x3 - ble _08163FCC + ble @08163FCC ldr r0, =gUnknown_82E9531 ldrb r0, [r0] mov r7, r8 @@ -687094,7 +687094,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] @@ -687122,17 +687122,17 @@ sub_8164040: @ 8164040 ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0 - bne _0816408E + bne @0816408E cmp r1, 0x1 - bgt _0816408A + bgt @0816408A ldr r1, =0x00000cb2 adds r0, r5, r1 ldrh r0, [r0] cmp r0, 0 - beq _0816408E -_0816408A: + beq @0816408E +@0816408A: bl sub_8163EE4 -_0816408E: +@0816408E: ldr r4, =0x03005d90 ldr r0, [r4] ldr r1, =0x020375e2 @@ -687160,17 +687160,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 @@ -687202,19 +687202,19 @@ sub_81640E0: @ 81640E0 adds r1, 0xE0 adds r0, r1 mov r3, sp -_08164122: +@08164122: ldrh r1, [r0] cmp r1, r7 - beq _08164130 + beq @08164130 cmp r1, r4 - beq _08164130 + beq @08164130 stm r3!, {r2} adds r6, 0x1 -_08164130: +@08164130: adds r0, 0xC adds r2, 0x1 cmp r2, 0x2 - ble _08164122 + ble @08164122 bl GenerateRandomNumber ldr r4, =0x03006298 lsls r0, 16 @@ -687225,7 +687225,7 @@ _08164130: add r0, sp ldr r0, [r0] strh r0, [r4] -_08164150: +@08164150: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -687239,7 +687239,7 @@ _08164150: lsls r0, 16 lsrs r0, 16 cmp r1, r0 - beq _08164150 + beq @08164150 add sp, 0xC pop {r4-r7} pop {r0} @@ -687249,7 +687249,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 @@ -687295,7 +687295,7 @@ sub_8164188: @ 8164188 adds r1, r5, 0 muls r1, r0 mov r9, r1 -_081641E6: +@081641E6: ldr r1, [r2] movs r0, 0x2C muls r0, r7 @@ -687306,10 +687306,10 @@ _081641E6: ldrh r0, [r0] ldr r3, [sp, 0x10] cmp r0, r3 - beq _0816423A + beq @0816423A ldr r3, [sp, 0x14] cmp r0, r3 - beq _0816423A + beq @0816423A movs r0, 0xEF lsls r0, 3 adds r4, r1, r0 @@ -687323,13 +687323,13 @@ _081641E6: lsrs r0, 24 ldr r2, [sp, 0x18] cmp r1, r0 - bhi _0816423A + bhi @0816423A ldr r0, [r2] adds r0, r5 adds r0, r6 ldrh r0, [r0] cmp r0, 0 - beq _0816423A + beq @0816423A mov r3, r10 adds r3, 0x4 mov r10, r3 @@ -687337,10 +687337,10 @@ _081641E6: stm r3!, {r7} movs r0, 0x1 add r8, r0 -_0816423A: +@0816423A: adds r7, 0x1 cmp r7, 0x3 - ble _081641E6 + ble @081641E6 bl GenerateRandomNumber ldr r4, =0x03006298 lsls r0, 16 @@ -687351,7 +687351,7 @@ _0816423A: add r0, sp ldr r0, [r0] strh r0, [r4, 0x4] -_08164258: +@08164258: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -687365,7 +687365,7 @@ _08164258: lsls r0, 16 lsrs r0, 16 cmp r1, r0 - beq _08164258 + beq @08164258 add sp, 0x1C pop {r3-r5} mov r8, r3 @@ -687379,7 +687379,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 @@ -687435,9 +687435,9 @@ sub_81642A0: @ 81642A0 ldr r0, [sp, 0x18] lsls r0, 24 mov r10, r0 -_08164318: +@08164318: lsls r6, r7, 1 -_0816431A: +@0816431A: mov r1, r10 lsrs r0, r1, 24 movs r1, 0 @@ -687448,13 +687448,13 @@ _0816431A: movs r2, 0 mov r9, r2 cmp r9, r7 - bge _08164368 + bge @08164368 ldr r0, [r5] ldr r3, =0x00000cb4 adds r1, r0, r3 ldrh r0, [r1] cmp r0, r8 - beq _08164368 + beq @08164368 ldr r0, =0x0203bc88 ldr r2, [r0] movs r4, 0x34 @@ -687462,24 +687462,24 @@ _0816431A: muls r0, r4 adds r0, r2 ldrb r3, [r0] -_0816434C: +@0816434C: ldrh r0, [r1] muls r0, r4 adds r0, r2 ldrb r0, [r0] cmp r0, r3 - beq _08164368 + beq @08164368 adds r1, 0x2 movs r0, 0x1 add r9, r0 cmp r9, r7 - bge _08164368 + bge @08164368 ldrh r0, [r1] cmp r0, r8 - bne _0816434C -_08164368: + bne @0816434C +@08164368: cmp r9, r7 - bne _0816431A + bne @0816431A ldr r0, [r5] ldr r1, =0x00000cb4 adds r0, r1 @@ -687489,14 +687489,14 @@ _08164368: mov r7, r9 adds r7, 0x1 cmp r7, 0x5 - ble _08164318 + ble @08164318 movs r3, 0x8 mov r10, r3 movs r4, 0 mov r9, r4 ldr r0, [sp, 0x24] str r0, [sp, 0x40] -_0816438C: +@0816438C: ldr r1, =0x03005d90 ldr r0, [r1] mov r2, r9 @@ -687510,7 +687510,7 @@ _0816438C: ldr r4, [sp, 0x40] strb r0, [r4, 0x19] movs r7, 0 -_081643A8: +@081643A8: adds r0, r7, 0x1 str r0, [sp, 0x30] mov r1, r10 @@ -687523,7 +687523,7 @@ _081643A8: subs r0, 0x1 lsls r0, 1 str r0, [sp, 0x28] -_081643C0: +@081643C0: mov r0, r8 bl sub_8163524 lsls r0, 16 @@ -687531,7 +687531,7 @@ _081643C0: movs r0, 0x1 ands r0, r7 cmp r0, 0 - beq _081643F4 + beq @081643F4 ldr r3, =0x03005d90 ldr r0, [r3] ldr r4, =0x00000cb4 @@ -687548,11 +687548,11 @@ _081643C0: ldrb r0, [r2, 0xA] ldrb r1, [r1, 0xA] cmp r0, r1 - beq _081643C0 -_081643F4: + beq @081643C0 +@081643F4: movs r5, 0x8 cmp r5, r10 - bge _08164430 + bge @08164430 ldr r2, =0x03005d90 ldr r0, [r2] ldr r1, =0x0203bc8c @@ -687563,27 +687563,27 @@ _081643F4: adds r2, r0, r4 ldrh r0, [r1] mov r12, r0 -_0816440E: +@0816440E: ldrh r0, [r2] lsls r0, 4 adds r0, r3 ldrh r0, [r0] cmp r0, r12 - beq _08164430 + beq @08164430 ldrh r0, [r1] ldr r4, [sp, 0x1C] cmp r4, r0 - beq _08164430 + beq @08164430 ldr r4, [sp, 0x20] cmp r4, r0 - beq _08164430 + beq @08164430 adds r2, 0x2 adds r5, 0x1 cmp r5, r10 - blt _0816440E -_08164430: + blt @0816440E +@08164430: cmp r5, r10 - bne _081643C0 + bne @081643C0 ldr r1, =0x03005d90 ldr r0, [r1] ldr r2, =0x00000cb4 @@ -687595,7 +687595,7 @@ _08164430: mov r10, r4 ldr r7, [sp, 0x30] cmp r7, 0x1 - ble _081643A8 + ble @081643A8 ldr r0, [sp, 0x40] adds r0, 0x18 str r0, [sp, 0x40] @@ -687603,7 +687603,7 @@ _08164430: add r9, r1 mov r2, r9 cmp r2, 0x5 - ble _0816438C + ble @0816438C movs r3, 0 mov r10, r3 bl sub_8165B20 @@ -687615,12 +687615,12 @@ _08164430: adds r6, r0, 0 adds r6, 0xDC mov r8, sp -_08164474: +@08164474: ldrb r0, [r6] lsls r4, r0, 25 lsrs r0, r4, 30 cmp r0, 0 - beq _081644E0 + beq @081644E0 ldr r1, =0x085df9ec ldrb r0, [r6, 0x1] adds r0, r1 @@ -687633,34 +687633,34 @@ _08164474: ldr r2, [sp, 0x44] ldr r1, [sp, 0x18] cmp r0, r1 - bgt _081644E0 + bgt @081644E0 lsrs r0, r4, 30 subs r0, 0x1 ldr r3, [sp, 0x14] cmp r0, r3 - bne _081644E0 + bne @081644E0 movs r5, 0 ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xE0 adds r1, r2, r0 movs r7, 0x2 -_081644B0: +@081644B0: ldrh r0, [r1] ldr r4, [sp, 0x1C] cmp r4, r0 - beq _081644C0 + beq @081644C0 ldr r3, [sp, 0x20] cmp r3, r0 - beq _081644C0 + beq @081644C0 adds r5, 0x1 -_081644C0: +@081644C0: adds r1, 0xC subs r7, 0x1 cmp r7, 0 - bge _081644B0 + bge @081644B0 cmp r5, 0x2 - ble _081644E0 + ble @081644E0 movs r0, 0xC8 lsls r0, 1 add r0, r9 @@ -687671,17 +687671,17 @@ _081644C0: stm r4!, {r0} movs r0, 0x1 add r10, r0 -_081644E0: +@081644E0: adds r2, 0x44 adds r6, 0x44 movs r1, 0x1 add r9, r1 mov r3, r9 cmp r3, 0x3 - ble _08164474 + ble @08164474 mov r4, r10 cmp r4, 0 - beq _08164532 + beq @08164532 bl GenerateRandomNumber ldr r6, =0x03005d90 ldr r4, [r6] @@ -687708,13 +687708,13 @@ _081644E0: adds r0, r5 ldrh r0, [r0] bl sub_81640E0 -_08164532: +@08164532: movs r0, 0 mov r10, r0 mov r9, r0 mov r1, sp str r1, [sp, 0x3C] -_0816453C: +@0816453C: ldr r0, =0x03005d90 movs r2, 0xEC mov r1, r9 @@ -687730,13 +687730,13 @@ _0816453C: adds r4, 0x1 str r4, [sp, 0x2C] adds r1, r0, r1 -_0816455A: +@0816455A: ldm r1!, {r0} orrs r2, r0 adds r3, r0 adds r7, 0x1 cmp r7, 0x39 - bls _0816455A + bls @0816455A ldr r0, =0x03005d90 ldr r5, [r0] movs r1, 0xEC @@ -687756,28 +687756,28 @@ _0816455A: ldr r3, [sp, 0x48] ldr r1, [sp, 0x18] cmp r0, r1 - bgt _08164656 + bgt @08164656 movs r1, 0xE7 lsls r1, 3 adds r0, r4, r1 ldrb r0, [r0] ldr r4, [sp, 0x14] cmp r0, r4 - bne _08164656 + bne @08164656 cmp r2, 0 - beq _08164656 + beq @08164656 adds r1, 0xE8 adds r0, r5, r1 adds r0, r6 ldr r0, [r0] cmp r0, r3 - bne _08164656 + bne @08164656 movs r5, 0 movs r7, 0 ldr r2, =0x03005d90 mov r8, r2 ldr r3, =0x0000076c -_081645B8: +@081645B8: mov r4, r8 ldr r2, [r4] movs r0, 0x2C @@ -687792,10 +687792,10 @@ _081645B8: ldrh r0, [r0] ldr r1, [sp, 0x1C] cmp r1, r0 - beq _0816463C + beq @0816463C ldr r4, [sp, 0x20] cmp r4, r0 - beq _0816463C + beq @0816463C movs r0, 0xEF lsls r0, 3 adds r4, r2, r0 @@ -687809,25 +687809,25 @@ _081645B8: lsrs r0, 24 ldr r3, [sp, 0x48] cmp r1, r0 - bhi _0816463C + bhi @0816463C mov r2, r8 ldr r0, [r2] adds r0, r6 adds r0, r3 ldrh r0, [r0] cmp r0, 0 - b _08164638 + b @08164638 .align 2, 0 .pool -_08164638: - beq _0816463C +@08164638: + beq @0816463C adds r5, 0x1 -_0816463C: +@0816463C: adds r7, 0x1 cmp r7, 0x3 - ble _081645B8 + ble @081645B8 cmp r5, 0x1 - ble _08164656 + ble @08164656 movs r0, 0x96 lsls r0, 1 add r0, r9 @@ -687836,16 +687836,16 @@ _0816463C: str r3, [sp, 0x3C] movs r4, 0x1 add r10, r4 -_08164656: +@08164656: ldr r0, [sp, 0x2C] mov r9, r0 cmp r0, 0x4 - bgt _08164660 - b _0816453C -_08164660: + bgt @08164660 + b @0816453C +@08164660: mov r1, r10 cmp r1, 0 - beq _081646A0 + beq @081646A0 bl GenerateRandomNumber ldr r6, =0x03005d90 ldr r4, [r6] @@ -687870,7 +687870,7 @@ _08164660: adds r0, r5 ldrh r0, [r0] bl sub_8164188 -_081646A0: +@081646A0: add sp, 0x4C pop {r3-r5} mov r8, r3 @@ -687884,7 +687884,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 @@ -687901,10 +687901,10 @@ sub_81646BC: @ 81646BC movs r0, 0xFA lsls r0, 1 cmp r5, r0 - beq _081647CE + beq @081647CE subs r0, 0xC9 cmp r5, r0 - bhi _081646FC + bhi @081646FC ldr r0, =0x0203bc8c ldr r1, [r0] lsls r0, r4, 4 @@ -687913,13 +687913,13 @@ sub_81646BC: @ 81646BC mov r9, r1 ldrh r0, [r0] mov r10, r0 - b _081647CE + b @081647CE .align 2, 0 .pool -_081646FC: +@081646FC: ldr r0, =0x0000018f cmp r5, r0 - bhi _08164750 + bhi @08164750 ldr r0, =0x03005d90 ldr r3, [r0] ldr r1, =0x03006298 @@ -687946,10 +687946,10 @@ _081646FC: adds r3, r2 ldrh r3, [r3] mov r10, r3 - b _081647CE + b @081647CE .align 2, 0 .pool -_08164750: +@08164750: ldr r4, =0x03005d90 ldr r3, [r4] ldr r1, =0x03006298 @@ -687984,7 +687984,7 @@ _08164750: adds r4, r2, 0 movs r6, 0x8A lsls r6, 1 -_08164794: +@08164794: mov r1, r8 adds r2, r3, r1 mov r1, r12 @@ -687996,7 +687996,7 @@ _08164794: strb r0, [r2] adds r3, 0x1 cmp r3, 0x6 - ble _08164794 + ble @08164794 adds r1, r3, r7 movs r0, 0xFF strb r0, [r1] @@ -688013,7 +688013,7 @@ _08164794: ldrb r1, [r0] adds r0, r7, 0 bl sub_8009308 -_081647CE: +@081647CE: ldr r0, =0x02021cc4 movs r1, 0xD mov r2, r9 @@ -688042,7 +688042,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 @@ -688072,67 +688072,67 @@ sub_8164828: @ 8164828 str r3, [sp] ldr r4, =0x085dd500 lsls r6, r7, 16 - b _08164884 + b @08164884 .align 2, 0 .pool -_0816487C: +@0816487C: adds r4, 0x8 ldr r0, [sp] adds r0, 0x1 str r0, [sp] -_08164884: +@08164884: ldr r1, [sp] cmp r1, 0x31 - bhi _0816489A + bhi @0816489A lsrs r0, r6, 16 bl sub_8162D34 lsls r0, 24 lsrs r0, 24 ldr r1, [r4] cmp r1, r0 - bne _0816487C -_0816489A: + bne @0816487C +@0816489A: ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x4 - bls _081648A4 - b _08164AC2 -_081648A4: + bls @081648A4 + b @08164AC2 +@081648A4: lsls r0, 2 - ldr r1, =_081648B8 + ldr r1, =@081648B8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081648B8: - .4byte _081648CC - .4byte _08164984 - .4byte _0816499C - .4byte _081649BC - .4byte _08164AC2 -_081648CC: +@081648B8: + .4byte @081648CC + .4byte @08164984 + .4byte @0816499C + .4byte @081649BC + .4byte @08164AC2 +@081648CC: movs r0, 0xFA lsls r0, 1 cmp r7, r0 - bne _081648D6 - b _08164B54 -_081648D6: + bne @081648D6 + b @08164B54 +@081648D6: subs r0, 0xC9 cmp r7, r0 - ble _081648E2 + ble @081648E2 ldr r0, =0x0000018f cmp r7, r0 - bgt _081648F4 -_081648E2: + bgt @081648F4 +@081648E2: ldr r0, =0x02021cc4 adds r1, r7, 0 bl sub_8162E20 - b _08164AC2 + b @08164AC2 .align 2, 0 .pool -_081648F4: +@081648F4: movs r3, 0 lsls r2, r7, 16 mov r10, r2 @@ -688147,7 +688147,7 @@ _081648F4: lsls r4, r0, 2 movs r5, 0x8A lsls r5, 1 -_08164910: +@08164910: mov r0, r9 adds r2, r3, r0 mov r1, r8 @@ -688159,7 +688159,7 @@ _08164910: strb r0, [r2] adds r3, 0x1 cmp r3, 0x6 - ble _08164910 + ble @08164910 adds r1, r3, r6 movs r0, 0xFF strb r0, [r1] @@ -688189,39 +688189,39 @@ _08164910: mov r3, r10 lsrs r1, r3, 16 bl sub_8162E20 - b _08164AC2 + b @08164AC2 .align 2, 0 .pool -_08164984: +@08164984: ldr r0, =0x03005d90 ldr r1, [r0] lsls r0, r5, 2 adds r1, r0 ldr r4, =0x00000cc4 adds r1, r4 - b _081649A8 + b @081649A8 .align 2, 0 .pool -_0816499C: +@0816499C: ldr r0, =0x03005d90 ldr r1, [r0] lsls r0, r5, 2 adds r1, r0 ldr r5, =0x00000cc6 adds r1, r5 -_081649A8: +@081649A8: adds r0, r7, 0 ldrh r1, [r1] bl sub_81646BC - b _08164AC2 + b @08164AC2 .align 2, 0 .pool -_081649BC: +@081649BC: ldr r0, =0x02038bce strh r7, [r0] ldr r0, =0x0000012b cmp r7, r0 - bgt _08164A08 + bgt @08164A08 ldr r0, =0x03005d90 ldr r4, [r0] lsls r1, r5, 1 @@ -688242,13 +688242,13 @@ _081649BC: ldr r1, =0x00000cda adds r4, r1 strh r0, [r4] - b _08164A46 + b @08164A46 .align 2, 0 .pool -_08164A08: +@08164A08: ldr r0, =0x0000018f cmp r7, r0 - bgt _08164A30 + bgt @08164A30 ldr r0, =0x03005d90 ldr r1, [r0] ldr r3, =0x03006298 @@ -688257,10 +688257,10 @@ _08164A08: adds r0, r1, r4 strh r2, [r0] ldrh r0, [r3, 0x6] - b _08164A40 + b @08164A40 .align 2, 0 .pool -_08164A30: +@08164A30: ldr r0, =0x03005d90 ldr r1, [r0] ldr r3, =0x03006298 @@ -688269,16 +688269,16 @@ _08164A30: adds r0, r1, r4 strh r2, [r0] ldrh r0, [r3, 0x2] -_08164A40: +@08164A40: ldr r5, =0x00000cda adds r1, r5 strh r0, [r1] -_08164A46: +@08164A46: movs r5, 0 mov r0, r8 lsls r0, 24 str r0, [sp, 0x4] -_08164A4E: +@08164A4E: lsls r1, r5, 1 mov r10, r1 adds r2, r5, 0x1 @@ -688288,7 +688288,7 @@ _08164A4E: asrs r0, 1 lsls r0, 24 mov r8, r0 -_08164A60: +@08164A60: ldr r3, [sp, 0x4] lsrs r0, r3, 24 mov r4, r8 @@ -688299,32 +688299,32 @@ _08164A60: ldr r0, =0x02038bce ldrh r0, [r0] cmp r0, r3 - beq _08164A60 + beq @08164A60 movs r2, 0 cmp r2, r5 - bge _08164AA2 + bge @08164AA2 ldr r1, =0x03005d90 ldr r0, [r1] ldr r4, =0x00000cb4 adds r0, r4 ldrh r0, [r0] cmp r0, r3 - beq _08164AA2 + beq @08164AA2 adds r6, r1, 0 -_08164A8E: +@08164A8E: adds r2, 0x1 cmp r2, r5 - bge _08164AA2 + bge @08164AA2 ldr r0, [r6] lsls r1, r2, 1 adds r0, r4 adds r0, r1 ldrh r0, [r0] cmp r0, r3 - bne _08164A8E -_08164AA2: + bne @08164A8E +@08164AA2: cmp r2, r5 - bne _08164A60 + bne @08164A60 ldr r5, =0x03005d90 ldr r0, [r5] ldr r1, =0x00000cb4 @@ -688333,34 +688333,34 @@ _08164AA2: strh r3, [r0] mov r5, r9 cmp r5, 0xD - ble _08164A4E + ble @08164A4E ldr r2, =0x03005d90 ldr r0, [r2] ldr r3, =0x00000cd6 adds r0, r3 strh r7, [r0] -_08164AC2: +@08164AC2: movs r0, 0xFA lsls r0, 1 cmp r7, r0 - beq _08164B54 + beq @08164B54 subs r0, 0xC9 cmp r7, r0 - bgt _08164AF8 + bgt @08164AF8 ldr r0, =0x085dd500 ldr r4, [sp] lsls r1, r4, 3 - b _08164B04 + b @08164B04 .align 2, 0 .pool -_08164AF8: +@08164AF8: ldr r0, =0x0000018f cmp r7, r0 - bgt _08164B28 + bgt @08164B28 ldr r0, =0x085dd500 ldr r5, [sp] lsls r1, r5, 3 -_08164B04: +@08164B04: adds r0, 0x4 adds r1, r0 ldr r0, =0x020375e2 @@ -688370,10 +688370,10 @@ _08164B04: adds r0, r1 ldr r0, [r0] bl box_related_two__2 - b _08164B54 + b @08164B54 .align 2, 0 .pool -_08164B28: +@08164B28: ldr r0, =0x03005d90 ldr r1, [r0] ldr r0, =0xfffffe70 @@ -688395,7 +688395,7 @@ _08164B28: adds r1, r0 ldr r0, [r1] bl box_related_two__2 -_08164B54: +@08164B54: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -688409,7 +688409,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 @@ -688434,30 +688434,30 @@ sub_8164B74: @ 8164B74 ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x6 - bls _08164BAC - b _08164DB6 -_08164BAC: + bls @08164BAC + b @08164DB6 +@08164BAC: lsls r0, 2 - ldr r1, =_08164BD0 + ldr r1, =@08164BD0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08164BD0: - .4byte _08164BEC - .4byte _08164C3C - .4byte _08164CE0 - .4byte _08164D14 - .4byte _08164D98 - .4byte _08164DA8 - .4byte _08164DB6 -_08164BEC: +@08164BD0: + .4byte @08164BEC + .4byte @08164C3C + .4byte @08164CE0 + .4byte @08164D14 + .4byte @08164D98 + .4byte @08164DA8 + .4byte @08164DB6 +@08164BEC: cmp r5, 0x3 - beq _08164BF2 - b _08164DB0 -_08164BF2: + beq @08164BF2 + b @08164DB0 +@08164BF2: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r7, 1 @@ -688473,9 +688473,9 @@ _08164BF2: bl sub_800A520 lsls r0, 24 cmp r0, 0 - bne _08164C18 - b _08164DB6 -_08164C18: + bne @08164C18 + b @08164DB6 +@08164C18: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 @@ -688484,17 +688484,17 @@ _08164C18: bl link_0800A448 ldr r1, =0x020375f0 movs r0, 0x1 - b _08164DB4 + b @08164DB4 .align 2, 0 .pool -_08164C3C: +@08164C3C: bl sub_800A550 movs r1, 0x3 ands r1, r0 cmp r1, 0x3 - beq _08164C4A - b _08164DB6 -_08164C4A: + beq @08164C4A + b @08164DB6 +@08164C4A: bl sub_800A5B4 ldr r1, =0x020223c4 movs r0, 0x80 @@ -688503,21 +688503,21 @@ _08164C4A: ldrh r0, [r1] ldrh r3, [r2] cmp r0, r3 - bhi _08164C60 + bhi @08164C60 ldrh r0, [r2] -_08164C60: +@08164C60: str r0, [sp] movs r4, 0 ldr r0, =0x03005d90 mov r9, r0 -_08164C68: +@08164C68: adds r1, r4, 0x1 mov r8, r1 lsrs r0, r4, 31 adds r0, r4, r0 asrs r0, 1 lsls r7, r0, 24 -_08164C74: +@08164C74: ldr r0, [sp] lsls r0, 24 lsrs r0, 24 @@ -688527,30 +688527,30 @@ _08164C74: lsrs r3, r0, 16 movs r2, 0 cmp r2, r4 - bge _08164CB0 + bge @08164CB0 mov r1, r9 ldr r0, [r1] ldr r1, =0x00000cb4 adds r0, r1 ldrh r0, [r0] cmp r0, r3 - beq _08164CB0 + beq @08164CB0 ldr r6, =0x03005d90 adds r5, r1, 0 -_08164C9C: +@08164C9C: adds r2, 0x1 cmp r2, r4 - bge _08164CB0 + bge @08164CB0 ldr r0, [r6] lsls r1, r2, 1 adds r0, r5 adds r0, r1 ldrh r0, [r0] cmp r0, r3 - bne _08164C9C -_08164CB0: + bne @08164C9C +@08164CB0: cmp r4, r2 - bne _08164C74 + bne @08164C74 mov r2, r9 ldr r0, [r2] lsls r1, r4, 1 @@ -688560,17 +688560,17 @@ _08164CB0: strh r3, [r0] mov r4, r8 cmp r4, 0xD - ble _08164C68 + ble @08164C68 ldr r1, =0x020375f0 movs r0, 0x2 - b _08164DB4 + b @08164DB4 .align 2, 0 .pool -_08164CE0: +@08164CE0: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _08164DB6 + beq @08164DB6 bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 @@ -688582,15 +688582,15 @@ _08164CE0: bl link_0800A448 ldr r1, =0x020375f0 movs r0, 0x3 - b _08164DB4 + b @08164DB4 .align 2, 0 .pool -_08164D14: +@08164D14: bl sub_800A550 movs r1, 0x3 ands r1, r0 cmp r1, 0x3 - bne _08164DB6 + bne @08164DB6 bl sub_800A5B4 ldr r4, =0x03005d90 ldr r0, [r4] @@ -688622,34 +688622,34 @@ _08164D14: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _08164DB0 + beq @08164DB0 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - bne _08164DB0 + bne @08164DB0 ldr r1, =0x020375f0 movs r0, 0x4 - b _08164DB4 + b @08164DB4 .align 2, 0 .pool -_08164D98: +@08164D98: bl sub_800AC34 ldr r1, =0x020375f0 movs r0, 0x5 - b _08164DB4 + b @08164DB4 .align 2, 0 .pool -_08164DA8: +@08164DA8: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _08164DB6 -_08164DB0: + bne @08164DB6 +@08164DB0: ldr r1, =0x020375f0 movs r0, 0x6 -_08164DB4: +@08164DB4: strh r0, [r1] -_08164DB6: +@08164DB6: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -688662,14 +688662,14 @@ _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] cmp r0, 0 - beq _08164DDA + beq @08164DDA bl sub_800AC34 -_08164DDA: +@08164DDA: pop {r0} bx r0 .align 2, 0 @@ -688677,7 +688677,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] @@ -688693,14 +688693,14 @@ 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 bl var_get lsls r0, 16 cmp r0, 0 - bne _08164E9A + bne @08164E9A ldr r5, =0x02038bca ldrh r1, [r5] mov r0, sp @@ -688747,7 +688747,7 @@ sub_8164E04: @ 8164E04 lsls r5, 4 ldr r3, =0x020240b4 adds r6, r4, 0 -_08164E7C: +@08164E7C: ldr r0, [r4] adds r0, r5 adds r0, r2 @@ -688756,14 +688756,14 @@ _08164E7C: strb r1, [r0] adds r2, 0x1 cmp r2, 0xA - ble _08164E7C + ble @08164E7C ldr r0, [r6] ldr r1, =0x0202433a ldrb r1, [r1] ldr r2, =0x00000d06 adds r0, r2 strb r1, [r0] -_08164E9A: +@08164E9A: add sp, 0x20 pop {r4-r6} pop {r0} @@ -688773,7 +688773,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} @@ -688783,28 +688783,28 @@ sub_8164ED8: @ 8164ED8 movs r2, 0 ldr r4, =0x0000064c adds r1, r0, r4 -_08164EEA: +@08164EEA: ldm r1!, {r0} adds r3, r0 adds r2, 0x1 cmp r2, 0x39 - bls _08164EEA + bls @08164EEA ldr r5, =0x03005d90 ldr r1, [r5] ldr r2, =0x00000734 adds r0, r1, r2 ldr r0, [r0] cmp r0, r3 - beq _08164F0A + beq @08164F0A ldr r3, =0x0000064c adds r0, r1, r3 bl sub_8164FB8 -_08164F0A: +@08164F0A: movs r4, 0 adds r7, r5, 0 movs r6, 0xEC mov r8, r7 -_08164F12: +@08164F12: adds r0, r4, 0 muls r0, r6 movs r1, 0xE7 @@ -688815,12 +688815,12 @@ _08164F12: movs r2, 0 adds r5, r4, 0x1 adds r1, r0 -_08164F26: +@08164F26: ldm r1!, {r0} adds r3, r0 adds r2, 0x1 cmp r2, 0x39 - bls _08164F26 + bls @08164F26 mov r0, r8 ldr r2, [r0] adds r1, r4, 0 @@ -688831,16 +688831,16 @@ _08164F26: adds r0, r1 ldr r0, [r0] cmp r0, r3 - beq _08164F52 + beq @08164F52 movs r3, 0xE7 lsls r3, 3 adds r0, r1, r3 adds r0, r2, r0 bl sub_8164FB8 -_08164F52: +@08164F52: adds r4, r5, 0 cmp r4, 0x4 - ble _08164F12 + ble @08164F12 pop {r3} mov r8, r3 pop {r4-r7} @@ -688851,7 +688851,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 @@ -688859,21 +688859,21 @@ sub_8164F70: @ 8164F70 str r1, [r2] movs r3, 0 adds r4, r0, 0 -_08164F7E: +@08164F7E: ldr r0, [r2] ldm r4!, {r1} adds r0, r1 str r0, [r2] adds r3, 0x1 cmp r3, 0x39 - bls _08164F7E + bls @08164F7E pop {r4} pop {r0} bx r0 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 @@ -688881,35 +688881,35 @@ sub_8164F94: @ 8164F94 str r1, [r2] movs r3, 0 adds r4, r0, 0 -_08164FA2: +@08164FA2: ldr r0, [r2] ldm r4!, {r1} adds r0, r1 str r0, [r2] adds r3, 0x1 cmp r3, 0x27 - bls _08164FA2 + bls @08164FA2 pop {r4} pop {r0} bx r0 thumb_func_end sub_8164F94 thumb_func_start sub_8164FB8 -sub_8164FB8: @ 8164FB8 +sub_8164FB8: ; 8164FB8 push {lr} movs r1, 0 movs r2, 0 -_08164FBE: +@08164FBE: stm r0!, {r2} adds r1, 0x1 cmp r1, 0x3A - bls _08164FBE + bls @08164FBE pop {r0} bx r0 thumb_func_end sub_8164FB8 thumb_func_start sub_8164FCC -sub_8164FCC: @ 8164FCC +sub_8164FCC: ; 8164FCC push {lr} lsls r0, 24 lsls r1, 24 @@ -688925,9 +688925,9 @@ sub_8164FCC: @ 8164FCC ldrh r0, [r2] ldr r1, =0x0000270f cmp r0, r1 - bls _08164FEE + bls @08164FEE adds r0, r1, 0 -_08164FEE: +@08164FEE: pop {r1} bx r1 .align 2, 0 @@ -688935,7 +688935,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 @@ -688945,16 +688945,16 @@ sub_8164FFC: @ 8164FFC movs r2, 0x4 bl memcpy cmp r4, 0x3 - bls _0816501C + bls @0816501C movs r0, 0x3 - b _08165022 + b @08165022 .align 2, 0 .pool -_0816501C: +@0816501C: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] -_08165022: +@08165022: add sp, 0x4 pop {r4} pop {r1} @@ -688962,7 +688962,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 @@ -688989,10 +688989,10 @@ sub_816502C: @ 816502C movs r2, 0x44 mov r10, r2 cmp r5, 0 - beq _0816506A + beq @0816506A movs r0, 0x45 mov r10, r0 -_0816506A: +@0816506A: ldr r1, =0x020375f0 mov r9, r1 movs r0, 0 @@ -689003,13 +689003,13 @@ _0816506A: lsls r0, 16 lsrs r0, 16 cmp r0, 0x37 - bls _081650DC + bls @081650DC movs r6, 0 cmp r6, r8 - bge _081650DC + bge @081650DC ldr r7, =0x03005d8c mov r5, sp -_0816508C: +@0816508C: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r6, 1 @@ -689031,7 +689031,7 @@ _0816508C: mov r1, r10 bl pokemon_getattr cmp r0, 0 - bne _081650D4 + bne @081650D4 movs r0, 0x1 mov r2, r9 strh r0, [r2] @@ -689043,44 +689043,44 @@ _0816508C: adds r0, r4 bl sub_80EE5A4 strb r0, [r5, 0x1] -_081650D4: +@081650D4: adds r5, 0x4 adds r6, 0x1 cmp r6, r8 - blt _0816508C -_081650DC: + blt @0816508C +@081650DC: ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 - beq _08165132 + beq @08165132 movs r0, 0x2A bl sav12_xor_increment mov r0, r8 cmp r0, 0x1 - ble _08165110 + ble @08165110 mov r3, sp add r2, sp, 0x4 mov r6, r8 subs r6, 0x1 -_081650F8: +@081650F8: ldrb r1, [r3, 0x1] ldrb r0, [r2, 0x1] cmp r0, r1 - bls _08165108 + bls @08165108 ldr r1, [sp] ldr r0, [r2] str r0, [sp] str r1, [r2] -_08165108: +@08165108: adds r2, 0x4 subs r6, 0x1 cmp r6, 0 - bne _081650F8 -_08165110: + bne @081650F8 +@08165110: mov r0, sp ldrb r0, [r0, 0x1] cmp r0, 0x4 - bls _08165132 + bls @08165132 ldr r2, =0x03005d8c mov r0, sp ldrb r1, [r0] @@ -689093,7 +689093,7 @@ _08165110: adds r0, r1 mov r1, r10 bl sub_80EE4DC -_08165132: +@08165132: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -689107,7 +689107,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 @@ -689119,7 +689119,7 @@ sub_816515C: @ 816515C ldrb r0, [r2, 0x8] adds r5, r1, 0 cmp r0, 0 - beq _08165194 + beq @08165194 ldr r4, =0x085dcefa ldrb r0, [r2, 0xA] ldrb r1, [r2, 0xB] @@ -689129,10 +689129,10 @@ sub_816515C: @ 816515C ldrb r1, [r2, 0xD] adds r0, r1 movs r1, 0x14 - b _081651A6 + b @081651A6 .align 2, 0 .pool -_08165194: +@08165194: ldr r4, =0x085dcedc ldrb r0, [r2, 0xA] ldrb r1, [r2, 0xB] @@ -689142,7 +689142,7 @@ _08165194: ldrb r1, [r2, 0xD] adds r0, r1 movs r1, 0x1E -_081651A6: +@081651A6: bl __umodsi3 adds r0, r4 ldrb r0, [r0] @@ -689169,7 +689169,7 @@ _081651A6: adds r3, 0x28 adds r2, r7, 0 adds r2, 0x1C -_081651E0: +@081651E0: lsls r0, r4, 1 mov r9, r0 mov r1, r8 @@ -689187,9 +689187,9 @@ _081651E0: adds r2, 0x2 adds r4, 0x1 cmp r4, 0x5 - ble _081651E0 + ble @081651E0 movs r4, 0 -_08165206: +@08165206: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -689201,7 +689201,7 @@ _08165206: bl sub_80686FC adds r4, 0x1 cmp r4, 0x2 - ble _08165206 + ble @08165206 adds r0, r7, 0 bl sub_8165328 pop {r3,r4} @@ -689215,7 +689215,7 @@ _08165206: thumb_func_end sub_816515C thumb_func_start sub_8165244 -sub_8165244: @ 8165244 +sub_8165244: ; 8165244 ldr r1, =0x0831f578 ldr r0, =0x03005d90 ldr r0, [r0] @@ -689230,7 +689230,7 @@ sub_8165244: @ 8165244 thumb_func_end sub_8165244 thumb_func_start sub_8165264 -sub_8165264: @ 8165264 +sub_8165264: ; 8165264 ldr r1, =0x0831f5ca ldr r0, =0x03005d90 ldr r0, [r0] @@ -689245,7 +689245,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 @@ -689254,14 +689254,14 @@ sub_8165284: @ 8165284 movs r1, 0xBF lsls r1, 4 adds r4, r0, r1 -_08165294: +@08165294: adds r0, r3, r2 adds r1, r4, r2 ldrb r1, [r1] strb r1, [r0] adds r2, 0x1 cmp r2, 0x4 - ble _08165294 + ble @08165294 adds r1, r3, r2 movs r0, 0xFF strb r0, [r1] @@ -689273,7 +689273,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 @@ -689286,42 +689286,42 @@ sub_81652B4: @ 81652B4 movs r3, 0 adds r6, r1, 0 adds r1, r5, 0 -_081652CC: +@081652CC: ldm r1!, {r0} orrs r4, r0 adds r3, 0x1 cmp r3, 0x2D - bls _081652CC + bls @081652CC cmp r4, 0 - bne _081652EC + bne @081652EC movs r0, 0x1 strh r0, [r2] - b _08165316 + b @08165316 .align 2, 0 .pool -_081652EC: +@081652EC: movs r4, 0 movs r3, 0 adds r2, r5, 0 -_081652F2: +@081652F2: ldm r2!, {r0} adds r4, r0 adds r3, 0x1 cmp r3, 0x2D - bls _081652F2 + bls @081652F2 ldr r1, [r6] ldr r2, =0x00000ca4 adds r0, r1, r2 ldr r0, [r0] cmp r0, r4 - beq _08165316 + beq @08165316 ldr r3, =0x00000bec adds r0, r1, r3 bl sub_816534C ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] -_08165316: +@08165316: pop {r4-r6} pop {r0} bx r0 @@ -689330,7 +689330,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 @@ -689338,35 +689338,35 @@ sub_8165328: @ 8165328 str r1, [r2] movs r3, 0 adds r4, r0, 0 -_08165336: +@08165336: ldr r0, [r2] ldm r4!, {r1} adds r0, r1 str r0, [r2] adds r3, 0x1 cmp r3, 0x2D - bls _08165336 + bls @08165336 pop {r4} pop {r0} bx r0 thumb_func_end sub_8165328 thumb_func_start sub_816534C -sub_816534C: @ 816534C +sub_816534C: ; 816534C push {lr} movs r1, 0 movs r2, 0 -_08165352: +@08165352: stm r0!, {r2} adds r1, 0x1 cmp r1, 0x2E - bls _08165352 + bls @08165352 pop {r0} bx r0 thumb_func_end sub_816534C thumb_func_start sub_8165360 -sub_8165360: @ 8165360 +sub_8165360: ; 8165360 push {lr} ldr r0, =0x03005d90 ldr r0, [r0] @@ -689380,36 +689380,36 @@ 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] cmp r0, 0x3 - bne _08165398 + bne @08165398 ldr r1, =0x02021fc4 movs r0, 0xFF strb r0, [r1] - b _081653C0 + b @081653C0 .align 2, 0 .pool -_08165398: +@08165398: cmp r0, 0x1 - bne _081653B4 + bne @081653B4 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000c14 adds r0, r1 bl sub_81638AC - b _081653C0 + b @081653C0 .align 2, 0 .pool -_081653B4: +@081653B4: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000c08 adds r0, r1 bl sub_81638AC -_081653C0: +@081653C0: pop {r0} bx r0 .align 2, 0 @@ -689417,7 +689417,7 @@ _081653C0: thumb_func_end sub_816537C thumb_func_start start_menu_compose_normal -start_menu_compose_normal: @ 81653CC +start_menu_compose_normal: ; 81653CC push {lr} ldr r0, =0x03005d90 ldr r0, [r0] @@ -689425,19 +689425,19 @@ start_menu_compose_normal: @ 81653CC adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _081653E0 + bne @081653E0 bl start_menu_append_item -_081653E0: +@081653E0: movs r0, 0x77 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081653F8 + bne @081653F8 bl start_menu_append_item movs r0, 0x77 bl flag_clear -_081653F8: +@081653F8: pop {r0} bx r0 .align 2, 0 @@ -689445,7 +689445,7 @@ _081653F8: thumb_func_end start_menu_compose_normal thumb_func_start sub_8165404 -sub_8165404: @ 8165404 +sub_8165404: ; 8165404 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -689457,15 +689457,15 @@ sub_8165404: @ 8165404 bl sub_8165C40 ldr r0, =0x00000c03 cmp r7, r0 - beq _08165420 - b _0816554C -_08165420: + beq @08165420 + b @0816554C +@08165420: movs r0, 0 mov r10, r0 mov r1, sp adds r1, 0x44 str r1, [sp, 0x64] -_0816542A: +@0816542A: mov r2, r10 lsls r2, 2 mov r9, r2 @@ -689477,7 +689477,7 @@ _0816542A: lsls r0, 2 ldr r6, =0x085dd6d0 adds r5, r0, r6 -_08165440: +@08165440: bl GenerateRandomNumber adds r4, r0, 0 bl GenerateRandomNumber @@ -689492,14 +689492,14 @@ _08165440: lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0 - bne _08165440 + bne @08165440 ldr r0, [sp, 0x44] bl GetNatureFromPersonality ldrb r1, [r5, 0x4] lsls r0, 24 lsrs r0, 24 cmp r1, r0 - bne _08165440 + bne @08165440 movs r0, 0x64 mov r6, r10 muls r6, r0 @@ -689529,7 +689529,7 @@ _08165440: mov r4, r8 ldr r0, =0x085dd6d5 adds r5, r0 -_081654B0: +@081654B0: adds r1, r3, 0 adds r1, 0x1A adds r2, r5, r3 @@ -689540,7 +689540,7 @@ _081654B0: str r0, [sp, 0x44] adds r3, r0, 0 cmp r3, 0x5 - ble _081654B0 + ble @081654B0 movs r0, 0 str r0, [sp, 0x44] movs r1, 0 @@ -689552,7 +689552,7 @@ _081654B0: mov r0, r9 add r0, r10 lsls r5, r0, 2 -_081654DE: +@081654DE: lsls r0, r1, 1 adds r0, r5 adds r0, r7 @@ -689566,7 +689566,7 @@ _081654DE: str r0, [sp, 0x44] adds r1, r0, 0 cmp r1, 0x3 - ble _081654DE + ble @081654DE movs r1, 0x64 mov r4, r10 muls r4, r1 @@ -689587,30 +689587,30 @@ _081654DE: ldr r2, [sp, 0x60] mov r10, r2 cmp r2, 0x2 - bgt _0816552E - b _0816542A -_0816552E: - b _0816585A + bgt @0816552E + b @0816542A +@0816552E: + b @0816585A .align 2, 0 .pool -_0816554C: +@0816554C: movs r0, 0xFA lsls r0, 1 cmp r7, r0 - bne _08165564 + bne @08165564 add r0, sp, 0x10 ldr r1, =gUnknown_82E9531 ldrb r1, [r1] strb r1, [r0] - b _0816585A + b @0816585A .align 2, 0 .pool -_08165564: +@08165564: ldr r0, =0x0000012b cmp r7, r0 - bls _0816556C - b _081656E8 -_0816556C: + bls @0816556C + b @081656E8 +@0816556C: bl sub_8165C40 lsls r0, 24 lsrs r0, 24 @@ -689636,7 +689636,7 @@ _0816556C: mov r0, sp adds r0, 0x48 str r0, [sp, 0x5C] -_081655A6: +@081655A6: ldr r0, =0x03005d90 ldr r1, [r0] mov r0, r10 @@ -689683,7 +689683,7 @@ _081655A6: str r0, [sp, 0x60] mov r4, r8 mov r3, r9 -_08165604: +@08165604: ldr r0, [r6] adds r0, r5, r0 lsls r1, r2, 1 @@ -689704,15 +689704,15 @@ _08165604: ldrh r0, [r0] ldr r3, [sp, 0x68] cmp r0, 0xDA - bne _08165634 + bne @08165634 movs r0, 0 str r0, [sp, 0x48] -_08165634: +@08165634: adds r0, r2, 0x1 str r0, [sp, 0x44] adds r2, r0, 0 cmp r2, 0x3 - ble _08165604 + ble @08165604 movs r1, 0x64 mov r4, r10 muls r4, r1 @@ -689743,7 +689743,7 @@ _08165634: muls r0, r7 adds r0, r1 adds r3, r0, 0x4 -_0816567E: +@0816567E: mov r1, sp adds r1, r2 adds r1, 0x10 @@ -689755,7 +689755,7 @@ _0816567E: str r0, [sp, 0x44] adds r2, r0, 0 cmp r2, 0x7 - ble _0816567E + ble @0816567E movs r3, 0x64 mov r4, r10 muls r4, r3 @@ -689777,18 +689777,18 @@ _0816567E: ldr r6, [sp, 0x60] mov r10, r6 cmp r6, 0x1 - bgt _081656CA - b _081655A6 -_081656CA: - b _0816585A + bgt @081656CA + b @081655A6 +@081656CA: + b @0816585A .align 2, 0 .pool -_081656E8: +@081656E8: ldr r0, =0x0000018f cmp r7, r0 - bls _081656F0 - b _081657F0 -_081656F0: + bls @081656F0 + b @081657F0 +@081656F0: ldr r1, =0xfffffed4 adds r0, r7, r1 lsls r0, 16 @@ -689805,7 +689805,7 @@ _081656F0: mov r8, r0 movs r1, 0x24 str r1, [sp, 0x6C] -_08165710: +@08165710: ldr r1, =0x03005d90 movs r0, 0xEC adds r4, r7, 0 @@ -689839,12 +689839,12 @@ _08165710: adds r4, 0xE4 ldrb r0, [r4] cmp r0, 0x1 - bne _0816578C + bne @0816578C ldrh r0, [r5, 0x20] mov r6, r8 ands r0, r6 cmp r0, r9 - beq _0816579C + beq @0816579C mov r1, sp adds r1, 0x3D movs r0, 0xFF @@ -689852,19 +689852,19 @@ _08165710: add r0, sp, 0x38 movs r1, 0x1 bl sub_8009308 - b _0816579C + b @0816579C .align 2, 0 .pool -_0816578C: +@0816578C: ldrh r0, [r5, 0x20] mov r1, r8 ands r0, r1 cmp r0, r9 - bne _0816579C + bne @0816579C add r1, sp, 0x10 movs r0, 0xFF strb r0, [r1, 0x5] -_0816579C: +@0816579C: movs r0, 0x64 mov r4, r10 muls r4, r0 @@ -689898,11 +689898,11 @@ _0816579C: add r10, r6 mov r0, r10 cmp r0, 0x1 - ble _08165710 - b _0816585A + ble @08165710 + b @0816585A .align 2, 0 .pool -_081657F0: +@081657F0: ldr r1, =0xfffffe70 adds r0, r7, r1 lsls r0, 16 @@ -689920,7 +689920,7 @@ _081657F0: lsls r0, 2 adds r6, r0, 0 adds r6, 0xDC -_08165812: +@08165812: movs r0, 0x64 mov r4, r10 muls r4, r0 @@ -689953,8 +689953,8 @@ _08165812: add r10, r0 mov r1, r10 cmp r1, 0x1 - ble _08165812 -_0816585A: + ble @08165812 +@0816585A: add sp, 0x70 pop {r3-r5} mov r8, r3 @@ -689968,7 +689968,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 @@ -689981,24 +689981,24 @@ sub_816587C: @ 816587C adds r1, r6, 0 adds r3, r6, 0 adds r3, 0x58 -_08165894: +@08165894: ldrh r0, [r1, 0x1C] cmp r0, 0 - beq _0816589C + beq @0816589C adds r2, 0x1 -_0816589C: +@0816589C: adds r1, 0x2C cmp r1, r3 - ble _08165894 + ble @08165894 cmp r2, 0x3 - beq _081658B4 + beq @081658B4 adds r0, r5, 0 movs r1, 0 movs r2, 0xEC bl memset movs r0, 0 - b _081659BE -_081658B4: + b @081659BE +@081658B4: ldrb r0, [r6] strb r0, [r5] ldrh r0, [r6, 0x2] @@ -690030,91 +690030,91 @@ _081658B4: adds r0, 0x90 str r0, [sp, 0x10] cmp r1, r3 - beq _08165904 + beq @08165904 mov r1, r12 -_081658F6: +@081658F6: adds r1, 0x2 adds r2, 0x1 cmp r2, 0x51 - bgt _08165904 + bgt @08165904 ldrb r0, [r1] cmp r0, r3 - bne _081658F6 -_08165904: + bne @081658F6 +@08165904: cmp r2, 0x52 - beq _08165918 + beq @08165918 lsls r0, r2, 1 mov r1, r12 adds r1, 0x1 adds r0, r1 ldrb r0, [r0] - b _0816591A + b @0816591A .align 2, 0 .pool -_08165918: +@08165918: movs r0, 0x2B -_0816591A: +@0816591A: strb r0, [r5, 0x1] movs r2, 0 adds r3, r7, 0 -_08165920: +@08165920: adds r0, r4, r2 adds r1, r3, r2 ldrb r1, [r1] strb r1, [r0] adds r2, 0x1 cmp r2, 0x7 - ble _08165920 + ble @08165920 movs r2, 0 mov r4, r9 mov r3, r8 -_08165934: +@08165934: adds r0, r4, r2 adds r1, r3, r2 ldrb r1, [r1] strb r1, [r0] adds r2, 0x1 cmp r2, 0x3 - ble _08165934 + ble @08165934 mov r3, r10 ldr r1, [sp, 0x4] movs r2, 0x5 -_08165948: +@08165948: ldrh r0, [r3] strh r0, [r1] adds r3, 0x2 adds r1, 0x2 subs r2, 0x1 cmp r2, 0 - bge _08165948 + bge @08165948 ldr r3, =0x085dfa46 ldr r1, [sp, 0x8] movs r2, 0x5 -_0816595C: +@0816595C: ldrh r0, [r3] strh r0, [r1] adds r3, 0x2 adds r1, 0x2 subs r2, 0x1 cmp r2, 0 - bge _0816595C + bge @0816595C ldr r3, =0x085dfa52 ldr r1, [sp, 0xC] movs r2, 0x5 -_08165970: +@08165970: ldrh r0, [r3] strh r0, [r1] adds r3, 0x2 adds r1, 0x2 subs r2, 0x1 cmp r2, 0 - bge _08165970 + bge @08165970 adds r2, r6, 0 adds r3, r5, 0 movs r4, 0x58 adds r4, r2 mov r8, r4 -_08165988: +@08165988: adds r1, r3, 0 adds r1, 0x34 adds r0, r2, 0 @@ -690130,7 +690130,7 @@ _08165988: adds r2, 0x2C adds r3, 0x2C cmp r2, r8 - ble _08165988 + ble @08165988 movs r0, 0 str r0, [sp] ldr r2, =0x0500000b @@ -690140,7 +690140,7 @@ _08165988: adds r0, r5, 0 bl sub_8164F70 movs r0, 0x1 -_081659BE: +@081659BE: add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -690154,7 +690154,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 @@ -690167,24 +690167,24 @@ sub_81659DC: @ 81659DC adds r1, r4, 0 adds r3, r4, 0 adds r3, 0x58 -_081659F4: +@081659F4: ldrh r0, [r1, 0x34] cmp r0, 0 - beq _081659FC + beq @081659FC adds r2, 0x1 -_081659FC: +@081659FC: adds r1, 0x2C cmp r1, r3 - ble _081659F4 + ble @081659F4 cmp r2, 0x3 - beq _08165A14 + beq @08165A14 adds r0, r6, 0 movs r1, 0 movs r2, 0xA4 bl memset movs r0, 0 - b _08165AD8 -_08165A14: + b @08165AD8 +@08165A14: ldrb r0, [r4] strb r0, [r6] ldrh r0, [r4, 0x2] @@ -690209,68 +690209,68 @@ _08165A14: adds r0, r4 mov r10, r0 cmp r1, r3 - beq _08165A58 + beq @08165A58 mov r1, r12 adds r1, 0x1 -_08165A4A: +@08165A4A: adds r1, 0x2 adds r2, 0x1 cmp r2, 0x51 - bgt _08165A58 + bgt @08165A58 ldrb r0, [r1] cmp r0, r3 - bne _08165A4A -_08165A58: + bne @08165A4A +@08165A58: cmp r2, 0x52 - beq _08165A68 + beq @08165A68 lsls r0, r2, 1 add r0, r12 ldrb r0, [r0] - b _08165A6A + b @08165A6A .align 2, 0 .pool -_08165A68: +@08165A68: movs r0, 0x24 -_08165A6A: +@08165A6A: strb r0, [r6, 0x1] movs r2, 0 adds r3, r7, 0 -_08165A70: +@08165A70: adds r0, r5, r2 adds r1, r3, r2 ldrb r1, [r1] strb r1, [r0] adds r2, 0x1 cmp r2, 0x7 - ble _08165A70 + ble @08165A70 movs r2, 0 mov r5, r9 mov r3, r8 -_08165A84: +@08165A84: adds r0, r5, r2 adds r1, r3, r2 ldrb r1, [r1] strb r1, [r0] adds r2, 0x1 cmp r2, 0x3 - ble _08165A84 + ble @08165A84 mov r3, r10 ldr r1, [sp] movs r2, 0x5 -_08165A98: +@08165A98: ldrh r0, [r3] strh r0, [r1] adds r3, 0x2 adds r1, 0x2 subs r2, 0x1 cmp r2, 0 - bge _08165A98 + bge @08165A98 adds r2, r4, 0 adds r3, r6, 0 movs r4, 0x58 adds r4, r2 mov r8, r4 -_08165AB0: +@08165AB0: adds r1, r3, 0 adds r1, 0x1C adds r0, r2, 0 @@ -690286,11 +690286,11 @@ _08165AB0: adds r2, 0x2C adds r3, 0x2C cmp r2, r8 - ble _08165AB0 + ble @08165AB0 adds r0, r6, 0 bl sub_8164F94 movs r0, 0x1 -_08165AD8: +@08165AD8: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -690302,44 +690302,44 @@ _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 str r0, [r2, 0x40] movs r3, 0 adds r4, r2, 0 -_08165AF4: +@08165AF4: ldr r0, [r2, 0x40] ldm r4!, {r1} adds r0, r1 str r0, [r2, 0x40] adds r3, 0x1 cmp r3, 0xF - bls _08165AF4 + bls @08165AF4 pop {r4} pop {r0} bx r0 thumb_func_end sub_8165AE8 thumb_func_start sub_8165B08 -sub_8165B08: @ 8165B08 +sub_8165B08: ; 8165B08 push {lr} movs r1, 0 movs r3, 0 adds r2, r0, 0 -_08165B10: +@08165B10: stm r2!, {r3} adds r1, 0x1 cmp r1, 0x10 - bls _08165B10 + bls @08165B10 bl sub_819FA5C pop {r0} bx r0 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 @@ -690348,7 +690348,7 @@ sub_8165B20: @ 8165B20 ldr r0, =0x03005d90 mov r8, r0 mov r9, r8 -_08165B30: +@08165B30: lsls r0, r5, 4 adds r1, r0, r5 lsls r1, 2 @@ -690360,12 +690360,12 @@ _08165B30: adds r6, r0, 0 adds r7, r5, 0x1 adds r2, r1 -_08165B46: +@08165B46: ldm r2!, {r0} adds r4, r0 adds r3, 0x1 cmp r3, 0xF - bls _08165B46 + bls @08165B46 mov r0, r8 ldr r2, [r0] adds r0, r6, r5 @@ -690376,15 +690376,15 @@ _08165B46: adds r0, r1 ldr r0, [r0] cmp r0, r4 - beq _08165B70 + beq @08165B70 adds r0, r1, 0 adds r0, 0xDC adds r0, r2, r0 bl sub_8165B08 -_08165B70: +@08165B70: adds r5, r7, 0 cmp r5, 0x3 - ble _08165B30 + ble @08165B30 pop {r3,r4} mov r8, r3 mov r9, r4 @@ -690396,7 +690396,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 @@ -690405,35 +690405,35 @@ sub_8165B88: @ 8165B88 movs r0, 0xFA lsls r0, 1 cmp r2, r0 - bne _08165BA4 + bne @08165BA4 ldr r0, =gUnknown_82E9531 - b _08165C28 + b @08165C28 .align 2, 0 .pool -_08165BA4: +@08165BA4: ldr r0, =0x0000012b cmp r2, r0 - bhi _08165BB8 + bhi @08165BB8 ldr r0, =gUnknown_82E9531 - b _08165C28 + b @08165C28 .align 2, 0 .pool -_08165BB8: +@08165BB8: ldr r0, =0x0000018f cmp r2, r0 - bhi _08165BFC + bhi @08165BFC ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 - beq _08165BDC + beq @08165BDC bl sub_81864B4 - b _08165C2A + b @08165C2A .align 2, 0 .pool -_08165BDC: +@08165BDC: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0xfffffed4 @@ -690443,22 +690443,22 @@ _08165BDC: adds r0, r1 ldr r1, =0x0000081c adds r0, r1 - b _08165C28 + b @08165C28 .align 2, 0 .pool -_08165BFC: +@08165BFC: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 - beq _08165C14 + beq @08165C14 bl sub_81864C0 - b _08165C2A + b @08165C2A .align 2, 0 .pool -_08165C14: +@08165C14: ldr r0, =0x03005d90 ldr r2, [r0] ldr r0, =0xfffffe70 @@ -690469,9 +690469,9 @@ _08165C14: adds r2, r0 ldr r1, =0x0000011b adds r0, r2, r1 -_08165C28: +@08165C28: ldrb r0, [r0] -_08165C2A: +@08165C2A: strb r0, [r4] pop {r4} pop {r0} @@ -690481,7 +690481,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] @@ -690491,7 +690491,7 @@ sub_8165C40: @ 8165C40 movs r0, 0x3 ands r0, r1 cmp r0, 0x2 - beq _08165C84 + beq @08165C84 ldr r1, =0x0203bc88 ldr r0, =0x085d5acc str r0, [r1] @@ -690502,12 +690502,12 @@ sub_8165C40: @ 8165C40 lsls r0, 30 lsrs r0, 30 bl sub_8165C90 - b _08165C88 + b @08165C88 .align 2, 0 .pool -_08165C84: +@08165C84: bl sub_8165D78 -_08165C88: +@08165C88: lsls r0, 24 lsrs r0, 24 pop {r1} @@ -690515,35 +690515,35 @@ _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 cmp r0, 0 - beq _08165C9E + beq @08165C9E cmp r0, 0x1 - beq _08165CA2 -_08165C9E: + beq @08165CA2 +@08165C9E: movs r0, 0x32 - b _08165CB0 -_08165CA2: + b @08165CB0 +@08165CA2: bl sub_8165CB4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3B - bhi _08165CB0 + bhi @08165CB0 movs r0, 0x3C -_08165CB0: +@08165CB0: pop {r1} bx r1 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 -_08165CBA: +@08165CBA: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -690554,7 +690554,7 @@ _08165CBA: movs r2, 0 bl pokemon_getattr cmp r0, 0 - beq _08165CF4 + beq @08165CF4 adds r0, r4, 0 movs r1, 0x41 movs r2, 0 @@ -690562,18 +690562,18 @@ _08165CBA: movs r1, 0xCE lsls r1, 1 cmp r0, r1 - beq _08165CF4 + beq @08165CF4 adds r0, r4, 0 movs r1, 0x38 movs r2, 0 bl pokemon_getattr cmp r0, r6 - ble _08165CF4 + ble @08165CF4 adds r6, r0, 0 -_08165CF4: +@08165CF4: adds r5, 0x1 cmp r5, 0x5 - ble _08165CBA + ble @08165CBA adds r0, r6, 0 pop {r4-r6} pop {r1} @@ -690583,52 +690583,52 @@ _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 movs r1, 0x3 cmp r0, 0x63 - bls _08165D3A + bls @08165D3A movs r1, 0x6 cmp r0, 0x77 - bls _08165D3A + bls @08165D3A movs r1, 0x9 cmp r0, 0x8B - bls _08165D3A + bls @08165D3A movs r1, 0xC cmp r0, 0x9F - bls _08165D3A + bls @08165D3A movs r1, 0xF cmp r0, 0xB3 - bls _08165D3A + bls @08165D3A movs r1, 0x12 cmp r0, 0xC7 - bls _08165D3A + bls @08165D3A movs r1, 0x1F cmp r0, 0xDB - bhi _08165D3A + bhi @08165D3A movs r1, 0x15 -_08165D3A: +@08165D3A: adds r0, r1, 0 pop {r1} bx r1 thumb_func_end sub_8165D08 thumb_func_start sub_8165D40 -sub_8165D40: @ 8165D40 +sub_8165D40: ; 8165D40 push {lr} ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - beq _08165D58 + beq @08165D58 cmp r0, 0x3 - beq _08165D58 + beq @08165D58 cmp r0, 0x4 - bne _08165D70 -_08165D58: + bne @08165D70 +@08165D58: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -690636,70 +690636,70 @@ _08165D58: bl __umodsi3 lsls r0, 16 lsrs r0, 16 - b _08165D72 + b @08165D72 .align 2, 0 .pool -_08165D70: +@08165D70: movs r0, 0 -_08165D72: +@08165D72: pop {r1} bx r1 thumb_func_end sub_8165D40 thumb_func_start sub_8165D78 -sub_8165D78: @ 8165D78 +sub_8165D78: ; 8165D78 push {lr} ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x4 - bne _08165DA8 + bne @08165DA8 ldr r1, =0x0203bc88 ldr r0, =0x085dda14 str r0, [r1] ldr r1, =0x0203bc8c ldr r0, =0x085de02c - b _08165DF2 + b @08165DF2 .align 2, 0 .pool -_08165DA8: +@08165DA8: cmp r0, 0x2 - bne _08165DC8 + bne @08165DC8 ldr r1, =0x0203bc88 ldr r0, =0x085de610 str r0, [r1] ldr r1, =0x0203bc8c ldr r0, =0x085dec28 - b _08165DF2 + b @08165DF2 .align 2, 0 .pool -_08165DC8: +@08165DC8: cmp r0, 0x3 - bne _08165DE8 + bne @08165DE8 ldr r1, =0x0203bc88 ldr r0, =0x085df084 str r0, [r1] ldr r1, =0x0203bc8c ldr r0, =0x085df69c - b _08165DF2 + b @08165DF2 .align 2, 0 .pool -_08165DE8: +@08165DE8: ldr r1, =0x0203bc88 ldr r0, =0x085d5acc str r0, [r1] ldr r1, =0x0203bc8c ldr r0, =0x085d97bc -_08165DF2: +@08165DF2: str r0, [r1] bl sub_8165CB4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1D - bhi _08165E02 + bhi @08165E02 movs r0, 0x1E -_08165E02: +@08165E02: pop {r1} bx r1 .align 2, 0 @@ -690707,10 +690707,10 @@ _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: +@08165E1C: bl sub_8165D40 lsls r0, 16 lsrs r4, r0, 16 @@ -690720,12 +690720,12 @@ _08165E1C: adds r0, r1, r2 ldrh r0, [r0] cmp r3, r0 - bge _08165E58 + bge @08165E58 adds r2, 0x2 adds r0, r1, r2 ldrh r0, [r0] cmp r0, r4 - beq _08165E58 + beq @08165E58 ldr r0, =0x03005d90 ldr r1, [r0] subs r2, 0x2 @@ -690733,21 +690733,21 @@ _08165E1C: ldrh r2, [r0] ldr r0, =0x00000cb4 adds r1, r0 -_08165E4A: +@08165E4A: adds r1, 0x2 adds r3, 0x1 cmp r3, r2 - bge _08165E58 + bge @08165E58 ldrh r0, [r1] cmp r0, r4 - bne _08165E4A -_08165E58: + bne @08165E4A +@08165E58: ldr r0, [r5] ldr r1, =0x00000cb2 adds r0, r1 ldrh r0, [r0] cmp r3, r0 - bne _08165E1C + bne @08165E1C ldr r5, =0x02038bca strh r4, [r5] ldrh r0, [r5] @@ -690760,14 +690760,14 @@ _08165E58: ldrh r2, [r0] adds r0, r2, 0x1 cmp r0, 0x2 - bgt _08165E8C + bgt @08165E8C lsls r0, r2, 1 ldr r2, =0x00000cb4 adds r1, r2 adds r1, r0 ldrh r0, [r5] strh r0, [r1] -_08165E8C: +@08165E8C: pop {r4,r5} pop {r0} bx r0 @@ -690776,7 +690776,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 @@ -690806,10 +690806,10 @@ sub_8165EA4: @ 8165EA4 str r0, [sp, 0x24] ldr r2, [sp, 0x28] ldrh r1, [r2] - b _08165EFE + b @08165EFE .align 2, 0 .pool -_08165EEC: +@08165EEC: ldr r0, [sp, 0x24] adds r0, 0x1 lsls r0, 24 @@ -690819,10 +690819,10 @@ _08165EEC: ldr r6, [sp, 0x28] adds r0, r6 ldrh r1, [r0] -_08165EFE: +@08165EFE: ldr r0, =0x0000ffff cmp r1, r0 - bne _08165EEC + bne @08165EEC movs r0, 0 mov r8, r0 bl GenerateRandomNumber @@ -690833,10 +690833,10 @@ _08165EFE: lsls r0, 16 orrs r4, r0 str r4, [sp, 0x2C] - b _08166092 + b @08166092 .align 2, 0 .pool -_08165F24: +@08165F24: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -690849,12 +690849,12 @@ _08165F24: movs r6, 0 ldr r7, [sp, 0x18] add r7, r8 - b _08165F44 -_08165F42: + b @08165F44 +@08165F42: adds r6, 0x1 -_08165F44: +@08165F44: cmp r6, r7 - bge _08165F68 + bge @08165F68 movs r1, 0x64 adds r0, r6, 0 muls r0, r1 @@ -690869,19 +690869,19 @@ _08165F44: adds r1, r2 ldrh r1, [r1] cmp r0, r1 - bne _08165F42 -_08165F68: + bne @08165F42 +@08165F68: cmp r6, r7 - beq _08165F6E - b _08166092 -_08165F6E: + beq @08165F6E + b @08166092 +@08165F6E: movs r6, 0 cmp r6, r7 - bge _08165FB8 + bge @08165FB8 ldr r0, =0x085cecb0 mov r9, r0 movs r3, 0 -_08165F7A: +@08165F7A: ldr r1, =0x02024744 adds r5, r3, r1 adds r0, r5, 0 @@ -690891,7 +690891,7 @@ _08165F7A: bl pokemon_getattr ldr r3, [sp, 0x34] cmp r0, 0 - beq _08165FB0 + beq @08165FB0 adds r0, r5, 0 movs r1, 0xC movs r2, 0 @@ -690906,34 +690906,34 @@ _08165F7A: ldr r3, [sp, 0x34] ldrh r1, [r1] cmp r0, r1 - beq _08165FB8 -_08165FB0: + beq @08165FB8 +@08165FB0: adds r3, 0x64 adds r6, 0x1 cmp r6, r7 - blt _08165F7A -_08165FB8: + blt @08165F7A +@08165FB8: cmp r6, r7 - bne _08166092 + bne @08166092 movs r6, 0 cmp r6, r8 - bge _08165FDA + bge @08165FDA add r0, sp, 0xC ldrh r0, [r0] cmp r0, r4 - beq _08165FDA + beq @08165FDA add r1, sp, 0xC -_08165FCC: +@08165FCC: adds r1, 0x2 adds r6, 0x1 cmp r6, r8 - bge _08165FDA + bge @08165FDA ldrh r0, [r1] cmp r0, r4 - bne _08165FCC -_08165FDA: + bne @08165FCC +@08165FDA: cmp r6, r8 - bne _08166092 + bne @08166092 mov r2, r8 lsls r0, r2, 1 add r0, sp @@ -690973,7 +690973,7 @@ _08165FDA: mov r5, r9 ldr r2, =0x02024744 mov r10, r2 -_0816602E: +@0816602E: ldr r0, [r3] adds r0, r5, r0 lsls r4, r6, 1 @@ -690993,14 +690993,14 @@ _0816602E: adds r0, r4 ldrh r0, [r0] cmp r0, 0xDA - bne _0816605E + bne @0816605E movs r0, 0 mov r1, sp strb r0, [r1, 0x14] -_0816605E: +@0816605E: adds r6, 0x1 cmp r6, 0x3 - ble _0816602E + ble @0816602E movs r2, 0x64 adds r4, r7, 0 muls r4, r2 @@ -691022,12 +691022,12 @@ _0816605E: bl pokemon_setattr ldr r0, [sp, 0x30] mov r8, r0 -_08166092: +@08166092: ldr r1, [sp, 0x1C] cmp r8, r1 - beq _0816609A - b _08165F24 -_0816609A: + beq @0816609A + b @08165F24 +@0816609A: add sp, 0x38 pop {r3-r5} mov r8, r3 @@ -691041,7 +691041,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 @@ -691049,53 +691049,53 @@ sub_81660B8: @ 81660B8 ldr r3, =0x085dcedc ldrb r0, [r3] cmp r0, r2 - beq _081660DA -_081660C8: + beq @081660DA +@081660C8: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x1D - bhi _081660DA + bhi @081660DA adds r0, r1, r3 ldrb r0, [r0] cmp r0, r2 - bne _081660C8 -_081660DA: + bne @081660C8 +@081660DA: cmp r1, 0x1E - beq _081660EC + beq @081660EC ldr r0, =0x085dcf0e - b _08166116 + b @08166116 .align 2, 0 .pool -_081660EC: +@081660EC: movs r1, 0 ldr r3, =0x085dcefa ldrb r0, [r3] cmp r0, r2 - beq _08166108 -_081660F6: + beq @08166108 +@081660F6: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x13 - bhi _08166108 + bhi @08166108 adds r0, r1, r3 ldrb r0, [r0] cmp r0, r2 - bne _081660F6 -_08166108: + bne @081660F6 +@08166108: cmp r1, 0x14 - bne _08166114 + bne @08166114 movs r0, 0x7 - b _0816611A + b @0816611A .align 2, 0 .pool -_08166114: +@08166114: ldr r0, =0x085dcf2c -_08166116: +@08166116: adds r0, r1, r0 ldrb r0, [r0] -_0816611A: +@0816611A: pop {r1} bx r1 .align 2, 0 @@ -691103,7 +691103,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 @@ -691118,18 +691118,18 @@ sub_8166124: @ 8166124 movs r4, 0 movs r3, 0 adds r1, r0 -_08166140: +@08166140: ldm r1!, {r0} adds r5, r0 orrs r4, r0 adds r3, 0x1 cmp r3, 0x39 - bls _08166140 + bls @08166140 cmp r5, 0 - bne _08166154 + bne @08166154 cmp r4, 0 - beq _08166180 -_08166154: + beq @08166180 +@08166154: ldr r2, [r2] movs r0, 0xEC adds r1, r6, 0 @@ -691140,34 +691140,34 @@ _08166154: adds r0, r1 ldr r0, [r0] cmp r0, r5 - bne _08166174 + bne @08166174 movs r0, 0x1 - b _08166182 + b @08166182 .align 2, 0 .pool -_08166174: +@08166174: movs r3, 0xE7 lsls r3, 3 adds r0, r1, r3 adds r0, r2, r0 bl sub_8164FB8 -_08166180: +@08166180: movs r0, 0 -_08166182: +@08166182: pop {r4-r6} pop {r1} bx r1 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] ldr r1, =0x02000002 ands r0, r1 cmp r0, 0 - beq _081661E8 + beq @081661E8 bl sub_8165C40 lsls r0, 24 movs r5, 0 @@ -691175,7 +691175,7 @@ sub_8166188: @ 8166188 lsrs r0, 22 ldr r1, =0x0831f72c adds r6, r0, r1 -_081661A6: +@081661A6: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -691187,7 +691187,7 @@ _081661A6: bl pokemon_getattr adds r1, r0, 0 cmp r1, 0 - beq _081661E2 + beq @081661E2 lsls r0, r1, 3 subs r0, r1 lsls r0, 2 @@ -691203,11 +691203,11 @@ _081661A6: bl pokemon_setattr adds r0, r4, 0 bl pokemon_calc_effective_stats -_081661E2: +@081661E2: adds r5, 0x1 cmp r5, 0x5 - ble _081661A6 -_081661E8: + ble @081661A6 +@081661E8: pop {r4-r7} pop {r0} bx r0 @@ -691216,7 +691216,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 @@ -691242,7 +691242,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 @@ -691267,9 +691267,9 @@ sub_816624C: @ 816624C lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bls _08166284 + bls @08166284 movs r1, 0x1 -_08166284: +@08166284: adds r0, r5, 0 adds r0, 0x56 strb r1, [r0] @@ -691285,7 +691285,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] @@ -691298,14 +691298,14 @@ sub_81662C0: @ 81662C0 ldr r1, [r4] ldr r0, =map_warp_consider_1_to_outside_or_stair_or_dive + 1 cmp r1, r0 - bne _081662F0 + bne @081662F0 adds r0, r4, 0 adds r0, 0x50 movs r1, 0 strb r1, [r0] ldr r0, =sub_8166304 + 1 bl set_callback2 -_081662F0: +@081662F0: pop {r4} pop {r0} bx r0 @@ -691314,7 +691314,7 @@ _081662F0: thumb_func_end sub_81662C0 thumb_func_start sub_8166304 -sub_8166304: @ 8166304 +sub_8166304: ; 8166304 push {lr} bl sub_81668F8 bl call_obj_callbacks @@ -691325,7 +691325,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] @@ -691342,7 +691342,7 @@ sub_816631C: @ 816631C thumb_func_end sub_816631C thumb_func_start sub_8166340 -sub_8166340: @ 8166340 +sub_8166340: ; 8166340 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -691360,7 +691360,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] @@ -691373,7 +691373,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 @@ -691382,35 +691382,35 @@ sub_8166380: @ 8166380 ldrb r0, [r0] adds r2, r1, 0 cmp r0, 0xF - bls _08166394 - b _08166556 -_08166394: + bls @08166394 + b @08166556 +@08166394: lsls r0, 2 - ldr r1, =_081663A8 + ldr r1, =@081663A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081663A8: - .4byte _081663E8 - .4byte _0816640C - .4byte _08166416 - .4byte _08166434 - .4byte _08166464 - .4byte _08166468 - .4byte _08166474 - .4byte _08166484 - .4byte _08166490 - .4byte _0816649C - .4byte _081664B8 - .4byte _081664BC - .4byte _081664E4 - .4byte _08166510 - .4byte _08166528 - .4byte _08166550 -_081663E8: +@081663A8: + .4byte @081663E8 + .4byte @0816640C + .4byte @08166416 + .4byte @08166434 + .4byte @08166464 + .4byte @08166468 + .4byte @08166474 + .4byte @08166484 + .4byte @08166490 + .4byte @0816649C + .4byte @081664B8 + .4byte @081664BC + .4byte @081664E4 + .4byte @08166510 + .4byte @08166528 + .4byte @08166550 +@081663E8: ldr r2, =0x0203bcac ldr r0, [r2] ldr r1, =0x00007b10 @@ -691421,14 +691421,14 @@ _081663E8: ldr r2, =0x00007c58 adds r0, r2 bl sub_81D1ED4 - b _0816653C + b @0816653C .align 2, 0 .pool -_0816640C: +@0816640C: bl reset_all_obj_data bl gpu_pal_allocator_reset - b _0816653C -_08166416: + b @0816653C +@08166416: movs r0, 0 bl SetVBlankCallback movs r0, 0 @@ -691438,10 +691438,10 @@ _08166416: ldr r2, =0x05006000 mov r0, sp bl CpuSet - b _0816653C + b @0816653C .align 2, 0 .pool -_08166434: +@08166434: movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags ldr r1, =0x085dfccc @@ -691455,38 +691455,38 @@ _08166434: movs r1, 0x97 movs r2, 0xE0 bl sub_809882C - b _0816653C + b @0816653C .align 2, 0 .pool -_08166464: +@08166464: ldr r1, [r2] - b _08166540 -_08166468: + b @08166540 +@08166468: bl sub_8168328 lsls r0, 24 cmp r0, 0 - bne _08166556 - b _0816653C -_08166474: + bne @08166556 + b @0816653C +@08166474: ldr r1, =0x030022b0 movs r0, 0x14 strh r0, [r1] bl sub_8167420 - b _0816653C + b @0816653C .align 2, 0 .pool -_08166484: +@08166484: bl sub_8167930 lsls r0, 24 cmp r0, 0 - bne _08166556 - b _0816653C -_08166490: + bne @08166556 + b @0816653C +@08166490: movs r0, 0 bl sub_8167608 bl sub_8167760 - b _0816653C -_0816649C: + b @0816653C +@0816649C: ldr r0, =0x0203bcac ldr r0, [r0] ldr r1, =0x00007b0e @@ -691494,14 +691494,14 @@ _0816649C: bl sub_81D312C lsls r0, 24 cmp r0, 0 - bne _08166556 - b _0816653C + bne @08166556 + b @0816653C .align 2, 0 .pool -_081664B8: +@081664B8: ldr r1, [r2] - b _08166540 -_081664BC: + b @08166540 +@081664BC: ldr r5, =0x0203bcac ldr r1, [r5] ldr r4, =0x00007c58 @@ -691512,10 +691512,10 @@ _081664BC: ldr r0, [r5] adds r0, r4 bl sub_81D20AC - b _0816653C + b @0816653C .align 2, 0 .pool -_081664E4: +@081664E4: ldr r4, =0x0203bcac ldr r0, [r4] ldr r1, =0x00007c58 @@ -691523,7 +691523,7 @@ _081664E4: bl sub_81D20BC lsls r0, 24 cmp r0, 0 - bne _08166556 + bne @08166556 ldr r2, [r4] ldr r1, =0x00007c58 adds r0, r2, r1 @@ -691531,19 +691531,19 @@ _081664E4: adds r2, r1 adds r1, r2, 0 bl sub_81D1F84 - b _0816653C + b @0816653C .align 2, 0 .pool -_08166510: +@08166510: ldr r0, =0x0203bcac ldr r0, [r0] ldr r2, =0x00007c58 adds r0, r2 bl sub_81D2230 - b _0816653C + b @0816653C .align 2, 0 .pool -_08166528: +@08166528: movs r0, 0 bl Window_WriteStandardTileMap movs r0, 0x1 @@ -691551,21 +691551,21 @@ _08166528: movs r0, 0 movs r1, 0x1 bl sub_8167BA0 -_0816653C: +@0816653C: ldr r0, =0x0203bc90 ldr r1, [r0] -_08166540: +@08166540: adds r1, 0x50 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08166556 + b @08166556 .align 2, 0 .pool -_08166550: +@08166550: ldr r0, =map_warp_consider_1_to_outside_or_stair_or_dive + 1 bl launch_c3_walk_stairs_and_run_once -_08166556: +@08166556: add sp, 0x4 pop {r4,r5} pop {r0} @@ -691575,7 +691575,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 @@ -691583,13 +691583,13 @@ map_warp_consider_1_to_outside_or_stair_or_dive: @ 8166564 adds r0, 0x50 ldrb r1, [r0] cmp r1, 0 - beq _08166580 + beq @08166580 cmp r1, 0x1 - beq _081665C0 - b _08166610 + beq @081665C0 + b @08166610 .align 2, 0 .pool -_08166580: +@08166580: movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -691612,16 +691612,16 @@ _08166580: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08166610 + b @08166610 .align 2, 0 .pool -_081665C0: +@081665C0: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08166610 + bne @08166610 ldr r4, =0x0203bcac ldr r0, [r4] ldr r1, =0x00007b1c @@ -691636,7 +691636,7 @@ _081665C0: ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 - beq _0816660A + beq @0816660A ldr r1, =0x00007fb3 adds r0, r4, r1 movs r1, 0 @@ -691651,10 +691651,10 @@ _081665C0: adds r1, r4, r3 ldrb r1, [r1] bl sub_81D3480 -_0816660A: +@0816660A: ldr r0, =sub_8166634 + 1 bl launch_c3_walk_stairs_and_run_once -_08166610: +@08166610: add sp, 0x4 pop {r4} pop {r0} @@ -691664,40 +691664,40 @@ _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] adds r0, 0x50 ldrb r0, [r0] cmp r0, 0x7 - bls _08166644 - b _0816680E -_08166644: + bls @08166644 + b @0816680E +@08166644: lsls r0, 2 - ldr r1, =_08166658 + ldr r1, =@08166658 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08166658: - .4byte _08166678 - .4byte _0816675C - .4byte _0816680E - .4byte _08166788 - .4byte _0816680E - .4byte _08166794 - .4byte _081667AC - .4byte _081667F4 -_08166678: +@08166658: + .4byte @08166678 + .4byte @0816675C + .4byte @0816680E + .4byte @08166788 + .4byte @0816680E + .4byte @08166794 + .4byte @081667AC + .4byte @081667F4 +@08166678: ldr r2, =0x030022c0 ldrh r1, [r2, 0x2C] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _081666B8 + beq @081666B8 movs r0, 0x5 bl audio_play movs r0, 0x1 @@ -691711,14 +691711,14 @@ _08166678: ldr r0, [r0] adds r0, 0x50 movs r1, 0x1 - b _0816680C + b @0816680C .align 2, 0 .pool -_081666B8: +@081666B8: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081666F0 + beq @081666F0 movs r0, 0x5 bl audio_play movs r0, 0 @@ -691732,31 +691732,31 @@ _081666B8: ldr r0, [r0] adds r0, 0x50 movs r1, 0x1 - b _0816680C + b @0816680C .align 2, 0 .pool -_081666F0: +@081666F0: ldrh r1, [r2, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08166710 + beq @08166710 movs r0, 0x5 bl audio_play ldr r0, =0x0203bc90 ldr r0, [r0] adds r0, 0x50 movs r1, 0x3 - b _0816680C + b @0816680C .align 2, 0 .pool -_08166710: +@08166710: movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0816671A - b _0816680E -_0816671A: + bne @0816671A + b @0816680E +@0816671A: movs r0, 0x5 bl audio_play ldr r0, =0x0203bcac @@ -691769,23 +691769,23 @@ _0816671A: ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 - bne _0816674C + bne @0816674C ldr r0, =0x0203bc90 ldr r0, [r0] adds r0, 0x50 movs r1, 0x3 - b _0816680C + b @0816680C .align 2, 0 .pool -_0816674C: +@0816674C: ldr r0, =0x0203bc90 ldr r0, [r0] adds r0, 0x50 movs r1, 0x5 - b _0816680C + b @0816680C .align 2, 0 .pool -_0816675C: +@0816675C: ldr r0, =0x0203bcac ldr r0, [r0] ldr r1, =0x00008044 @@ -691795,20 +691795,20 @@ _0816675C: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _0816680E + bne @0816680E ldr r0, =0x0203bc90 ldr r0, [r0] adds r0, 0x50 - b _0816680C + b @0816680C .align 2, 0 .pool -_08166788: +@08166788: ldr r0, =sub_8166BEC + 1 bl launch_c3_walk_stairs_and_run_once - b _0816680E + b @0816680E .align 2, 0 .pool -_08166794: +@08166794: bl sub_8166D44 ldr r0, =0x0203bc90 ldr r1, [r0] @@ -691816,61 +691816,61 @@ _08166794: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0816680E + b @0816680E .align 2, 0 .pool -_081667AC: +@081667AC: bl sub_8166DE4 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _081667CC + beq @081667CC cmp r1, 0 - bgt _081667C6 + bgt @081667C6 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _08166804 - b _0816680E -_081667C6: + beq @08166804 + b @0816680E +@081667C6: cmp r1, 0x1 - bne _0816680E - b _08166804 -_081667CC: + bne @0816680E + b @08166804 +@081667CC: bl sub_8167268 lsls r0, 24 cmp r0, 0 - beq _081667E8 + beq @081667E8 bl sub_8166F50 ldr r0, =0x0203bc90 ldr r0, [r0] adds r0, 0x50 movs r1, 0x7 - b _0816680C + b @0816680C .align 2, 0 .pool -_081667E8: +@081667E8: ldr r0, =sub_816681C + 1 bl launch_c3_walk_stairs_and_run_once - b _0816680E + b @0816680E .align 2, 0 .pool -_081667F4: +@081667F4: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _0816680E + beq @0816680E bl sub_8166F94 -_08166804: +@08166804: ldr r0, =0x0203bc90 ldr r0, [r0] adds r0, 0x50 movs r1, 0 -_0816680C: +@0816680C: strb r1, [r0] -_0816680E: +@0816680E: pop {r0} bx r0 .align 2, 0 @@ -691878,7 +691878,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 @@ -691886,13 +691886,13 @@ sub_816681C: @ 816681C adds r0, 0x50 ldrb r4, [r0] cmp r4, 0 - beq _08166838 + beq @08166838 cmp r4, 0x1 - beq _08166888 - b _081668D4 + beq @08166888 + b @081668D4 .align 2, 0 .pool -_08166838: +@08166838: ldr r0, =0x0203bcac ldr r0, [r0] ldr r1, =0x00008041 @@ -691920,10 +691920,10 @@ _08166838: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _081668D4 + b @081668D4 .align 2, 0 .pool -_08166888: +@08166888: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -691931,7 +691931,7 @@ _08166888: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _081668D4 + bne @081668D4 movs r0, 0 bl SetVBlankCallback ldr r4, =0x0203bca0 @@ -691955,7 +691955,7 @@ _08166888: ldr r0, =sub_816624C + 1 str r0, [r1, 0x8] bl sub_8179D70 -_081668D4: +@081668D4: add sp, 0x4 pop {r4,r5} pop {r0} @@ -691965,7 +691965,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 @@ -691974,26 +691974,26 @@ sub_81668F8: @ 81668F8 ldrb r0, [r0] adds r4, r1, 0 cmp r0, 0x6 - bls _0816690C - b _08166A18 -_0816690C: + bls @0816690C + b @08166A18 +@0816690C: lsls r0, 2 - ldr r1, =_08166920 + ldr r1, =@08166920 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08166920: - .4byte _0816693C - .4byte _08166972 - .4byte _08166A18 - .4byte _081669A0 - .4byte _081669AE - .4byte _081669C8 - .4byte _081669F4 -_0816693C: +@08166920: + .4byte @0816693C + .4byte @08166972 + .4byte @08166A18 + .4byte @081669A0 + .4byte @081669AE + .4byte @081669C8 + .4byte @081669F4 +@0816693C: ldr r0, =0x0203bcac ldr r0, [r0] ldr r1, =0x00008041 @@ -692002,22 +692002,22 @@ _0816693C: ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - beq _08166968 + beq @08166968 ldr r0, [r4] adds r0, 0x56 ldrb r0, [r0] bl sub_8167CA0 ldr r1, [r4] - b _081669E2 + b @081669E2 .align 2, 0 .pool -_08166968: +@08166968: ldr r0, [r4] adds r0, 0x50 movs r1, 0x3 strb r1, [r0] - b _08166A18 -_08166972: + b @08166A18 +@08166972: ldr r0, =0x0203bcac ldr r0, [r0] ldr r1, =0x00008044 @@ -692027,22 +692027,22 @@ _08166972: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _08166A18 + bne @08166A18 ldr r0, =0x0203bc90 ldr r0, [r0] adds r0, 0x50 strb r1, [r0] - b _08166A18 + b @08166A18 .align 2, 0 .pool -_081669A0: +@081669A0: movs r0, 0x1 negs r0, r0 movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - b _081669DE -_081669AE: + b @081669DE +@081669AE: movs r0, 0 bl gpu_sync_bg_show movs r0, 0x1 @@ -692051,8 +692051,8 @@ _081669AE: bl gpu_sync_bg_show movs r0, 0x2 bl gpu_sync_bg_show - b _081669DE -_081669C8: + b @081669DE +@081669C8: ldr r0, =sub_8166340 + 1 bl SetVBlankCallback movs r0, 0x1 @@ -692062,24 +692062,24 @@ _081669C8: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 -_081669DE: +@081669DE: ldr r0, =0x0203bc90 ldr r1, [r0] -_081669E2: +@081669E2: adds r1, 0x50 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08166A18 + b @08166A18 .align 2, 0 .pool -_081669F4: +@081669F4: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08166A18 + bne @08166A18 ldr r0, =0x0203bcac ldr r0, [r0] ldr r1, =0x00007b1c @@ -692089,7 +692089,7 @@ _081669F4: bl launch_c3_walk_stairs_and_run_once ldr r0, =sub_816631C + 1 bl set_callback2 -_08166A18: +@08166A18: add sp, 0x4 pop {r4} pop {r0} @@ -692099,7 +692099,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] @@ -692107,25 +692107,25 @@ sub_8166A34: @ 8166A34 ldrb r0, [r0] adds r5, r1, 0 cmp r0, 0x5 - bls _08166A46 - b _08166BDA -_08166A46: + bls @08166A46 + b @08166BDA +@08166A46: lsls r0, 2 - ldr r1, =_08166A58 + ldr r1, =@08166A58 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08166A58: - .4byte _08166A70 - .4byte _08166AAC - .4byte _08166AC0 - .4byte _08166B14 - .4byte _08166B94 - .4byte _08166BB6 -_08166A70: +@08166A58: + .4byte @08166A70 + .4byte @08166AAC + .4byte @08166AC0 + .4byte @08166B14 + .4byte @08166B94 + .4byte @08166BB6 +@08166A70: ldr r4, [r5] ldr r3, =0x020244ec str r3, [r4, 0xC] @@ -692146,22 +692146,22 @@ _08166A70: ldr r3, =0x00007b1c adds r0, r3 bl sub_81D3520 - b _08166BAA + b @08166BAA .align 2, 0 .pool -_08166AAC: +@08166AAC: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne _08166ABA - b _08166BDA -_08166ABA: - b _08166BAA + bne @08166ABA + b @08166BDA +@08166ABA: + b @08166BAA .align 2, 0 .pool -_08166AC0: +@08166AC0: bl sub_8167104 ldr r6, =0x0203bc90 ldr r0, [r6] @@ -692188,10 +692188,10 @@ _08166AC0: bl sub_81D1F84 bl sub_8167338 ldr r1, [r6] - b _08166BAC + b @08166BAC .align 2, 0 .pool -_08166B14: +@08166B14: ldr r5, =0x0203bcac ldr r0, [r5] ldr r1, =0x00007c58 @@ -692200,7 +692200,7 @@ _08166B14: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - bne _08166BDA + bne @08166BDA ldr r0, [r5] ldr r4, =0x00008041 adds r0, r4 @@ -692217,7 +692217,7 @@ _08166B14: ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 - beq _08166B6C + beq @08166B6C ldr r4, =0x00007fb3 adds r0, r3, r4 movs r1, 0 @@ -692232,16 +692232,16 @@ _08166B14: adds r1, r3, r4 ldrb r1, [r1] bl sub_81D3480 -_08166B6C: +@08166B6C: ldr r1, =0x0203bc90 ldr r0, [r1] adds r0, 0x52 strb r6, [r0] ldr r1, [r1] - b _08166BAC + b @08166BAC .align 2, 0 .pool -_08166B94: +@08166B94: ldr r1, [r5] adds r1, 0x52 ldrb r0, [r1] @@ -692250,33 +692250,33 @@ _08166B94: lsls r0, 24 lsrs r0, 24 cmp r0, 0x10 - bls _08166BDA + bls @08166BDA bl sub_8166E24 -_08166BAA: +@08166BAA: ldr r1, [r5] -_08166BAC: +@08166BAC: adds r1, 0x50 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08166BDA -_08166BB6: + b @08166BDA +@08166BB6: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _08166BDA + beq @08166BDA bl sub_8166EDC lsls r0, 24 cmp r0, 0 - bne _08166BDA + bne @08166BDA ldr r0, =0x0203ce7c ldrb r0, [r0] bl sub_8136F68 ldr r0, =sub_8166BEC + 1 bl launch_c3_walk_stairs_and_run_once -_08166BDA: +@08166BDA: pop {r4-r6} pop {r0} bx r0 @@ -692285,7 +692285,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 @@ -692294,21 +692294,21 @@ sub_8166BEC: @ 8166BEC adds r2, 0x50 ldrb r1, [r2] cmp r1, 0x1 - beq _08166C28 + beq @08166C28 cmp r1, 0x1 - bgt _08166C0C + bgt @08166C0C cmp r1, 0 - beq _08166C16 - b _08166D18 + beq @08166C16 + b @08166D18 .align 2, 0 .pool -_08166C0C: +@08166C0C: cmp r1, 0x2 - beq _08166C40 + beq @08166C40 cmp r1, 0x3 - beq _08166C5C - b _08166D18 -_08166C16: + beq @08166C5C + b @08166D18 +@08166C16: movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -692316,34 +692316,34 @@ _08166C16: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - b _08166C4A -_08166C28: + b @08166C4A +@08166C28: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08166D18 + bne @08166D18 movs r0, 0x2 strb r0, [r2] - b _08166D18 + b @08166D18 .align 2, 0 .pool -_08166C40: +@08166C40: ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] bl sub_80BA0A8 -_08166C4A: +@08166C4A: ldr r1, [r4] adds r1, 0x50 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08166D18 + b @08166D18 .align 2, 0 .pool -_08166C5C: +@08166C5C: ldr r0, [r0, 0x4] bl set_callback2 ldr r0, =0x0203bcac @@ -692352,7 +692352,7 @@ _08166C5C: adds r0, r1 bl sub_81D354C movs r4, 0 -_08166C70: +@08166C70: ldr r5, =0x0203bcac ldr r0, [r5] ldr r2, =0x00007b06 @@ -692369,7 +692369,7 @@ _08166C70: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x6 - bls _08166C70 + bls @08166C70 movs r0, 0 bl gpu_tile_obj_free_by_tag movs r0, 0x1 @@ -692379,7 +692379,7 @@ _08166C70: movs r0, 0x1 bl gpu_pal_free_tag movs r4, 0 -_08166CAE: +@08166CAE: ldr r0, [r5] lsls r1, r4, 2 ldr r2, =0x00007b44 @@ -692391,14 +692391,14 @@ _08166CAE: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bls _08166CAE + bls @08166CAE ldr r6, =0x0203bcac ldr r0, [r6] ldr r2, =0x00007b10 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xFF - beq _08166CE6 + beq @08166CE6 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -692406,7 +692406,7 @@ _08166CAE: ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles -_08166CE6: +@08166CE6: movs r0, 0 bl SetVBlankCallback ldr r4, =0x0203bca0 @@ -692426,7 +692426,7 @@ _08166CE6: bl free str r5, [r6] bl Window_FreeMemory -_08166D18: +@08166D18: add sp, 0x4 pop {r4-r6} pop {r0} @@ -692436,7 +692436,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 @@ -692499,32 +692499,32 @@ 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 lsrs r4, r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _08166E18 + beq @08166E18 cmp r1, 0 - bgt _08166E02 + bgt @08166E02 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _08166E06 - b _08166E18 -_08166E02: + beq @08166E06 + b @08166E18 +@08166E02: cmp r1, 0x1 - bne _08166E18 -_08166E06: + bne @08166E18 +@08166E06: movs r0, 0x5 bl audio_play movs r0, 0x2 bl rbox_fill_rectangle movs r0, 0x2 bl Window_FillTileMap -_08166E18: +@08166E18: lsls r0, r4, 24 asrs r0, 24 pop {r4} @@ -692533,7 +692533,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 @@ -692552,7 +692552,7 @@ sub_8166E24: @ 8166E24 adds r1, 0x53 ldrb r0, [r1] cmp r0, 0x4 - bhi _08166EA8 + bhi @08166EA8 adds r0, r2, 0 adds r0, 0x61 ldrb r1, [r1] @@ -692560,9 +692560,9 @@ sub_8166E24: @ 8166E24 ldrb r0, [r0] adds r4, r3, 0 cmp r0, 0 - bne _08166E84 + bne @08166E84 adds r2, r4, 0 -_08166E60: +@08166E60: ldr r0, [r2] adds r0, 0x53 ldrb r1, [r0] @@ -692573,31 +692573,31 @@ _08166E60: adds r1, 0x53 ldrb r0, [r1] cmp r0, 0x4 - bhi _08166EA8 + bhi @08166EA8 adds r0, r3, 0 adds r0, 0x61 ldrb r1, [r1] adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _08166E60 -_08166E84: + beq @08166E60 +@08166E84: ldr r2, [r4] adds r1, r2, 0 adds r1, 0x53 ldrb r0, [r1] cmp r0, 0x4 - bhi _08166EA8 + bhi @08166EA8 ldr r0, =0x02021fc4 ldrb r1, [r1] adds r2, 0x61 adds r2, r1 ldrb r2, [r2] bl sub_8166FD4 - b _08166EB8 + b @08166EB8 .align 2, 0 .pool -_08166EA8: +@08166EA8: ldr r0, =0x02021fc4 ldr r1, =0x0203bc90 ldr r1, [r1] @@ -692605,7 +692605,7 @@ _08166EA8: ldrb r1, [r1] movs r2, 0 bl sub_8166FD4 -_08166EB8: +@08166EB8: ldr r0, =0x02021fc4 bl sub_8166FB0 movs r0, 0x2 @@ -692621,7 +692621,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 @@ -692629,7 +692629,7 @@ sub_8166EDC: @ 8166EDC ldr r5, =0x0203bc90 adds r3, r5, 0 movs r4, 0x5 -_08166EEC: +@08166EEC: ldr r0, [r3] adds r0, 0x53 ldrb r1, [r0] @@ -692640,22 +692640,22 @@ _08166EEC: adds r1, 0x53 ldrb r0, [r1] cmp r0, 0x4 - bhi _08166F18 + bhi @08166F18 adds r0, r2, 0 adds r0, 0x61 ldrb r1, [r1] adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _08166F1E - b _08166EEC + bne @08166F1E + b @08166EEC .align 2, 0 .pool -_08166F18: +@08166F18: strb r4, [r1] movs r0, 0 - b _08166F44 -_08166F1E: + b @08166F44 +@08166F1E: ldr r4, =0x02021fc4 ldr r0, [r5] adds r1, r0, 0 @@ -692672,7 +692672,7 @@ _08166F1E: movs r1, 0x2 bl Window_CopyToVram movs r0, 0x1 -_08166F44: +@08166F44: pop {r4,r5} pop {r1} bx r1 @@ -692681,7 +692681,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 @@ -692714,7 +692714,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 @@ -692728,7 +692728,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 @@ -692749,7 +692749,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 @@ -692758,11 +692758,11 @@ sub_8166FD4: @ 8166FD4 lsrs r0, r2, 16 asrs r2, 16 cmp r2, 0 - beq _08167010 + beq @08167010 cmp r2, 0 - ble _08166FEC + ble @08166FEC movs r0, 0 -_08166FEC: +@08166FEC: lsls r0, 16 ldr r1, =0x085dfd04 lsls r0, r3, 2 @@ -692773,14 +692773,14 @@ _08166FEC: ldr r1, =0x085ec7e1 adds r0, r4, 0 bl gf_strcat - b _08167018 + b @08167018 .align 2, 0 .pool -_08167010: +@08167010: ldr r1, =0x085ec7ef adds r0, r4, 0 bl gf_strcpy -_08167018: +@08167018: pop {r4} pop {r0} bx r0 @@ -692789,13 +692789,13 @@ _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 movs r4, 0 ldr r7, =0x085dfcb0 -_0816702E: +@0816702E: lsls r0, r4, 2 adds r0, r7 ldr r1, [r0] @@ -692807,7 +692807,7 @@ _0816702E: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x4 - bls _0816702E + bls @0816702E pop {r4-r7} pop {r0} bx r0 @@ -692816,7 +692816,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} @@ -692827,13 +692827,13 @@ sub_8167054: @ 8167054 movs r1, 0x30 bl pokemon_getattr cmp r0, 0xFF - beq _081670F0 + beq @081670F0 mov r0, r8 adds r1, r5, 0 bl sub_8167184 movs r4, 0 mov r7, sp -_08167078: +@08167078: ldr r1, =0x085dfcb0 lsls r0, r4, 2 adds r0, r1 @@ -692854,15 +692854,15 @@ _08167078: lsls r0, 16 lsrs r1, r0, 16 cmp r0, 0 - bge _081670A6 + bge @081670A6 movs r1, 0 -_081670A6: +@081670A6: lsls r0, r1, 16 asrs r0, 16 cmp r0, 0xFF - ble _081670B0 + ble @081670B0 movs r1, 0xFF -_081670B0: +@081670B0: strb r1, [r7] adds r0, r5, 0 adds r1, r6, 0 @@ -692872,7 +692872,7 @@ _081670B0: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x4 - bls _08167078 + bls @08167078 adds r0, r5, 0 movs r1, 0x30 bl pokemon_getattr @@ -692884,16 +692884,16 @@ _081670B0: lsls r0, r1, 16 asrs r0, 16 cmp r0, 0xFF - ble _081670E2 + ble @081670E2 movs r1, 0xFF -_081670E2: +@081670E2: mov r0, sp strb r1, [r0] adds r0, r5, 0 movs r1, 0x30 mov r2, sp bl pokemon_setattr -_081670F0: +@081670F0: add sp, 0x4 pop {r3} mov r8, r3 @@ -692905,7 +692905,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 @@ -692935,7 +692935,7 @@ sub_8167104: @ 8167104 adds r0, r5, 0 bl sub_8167024 movs r3, 0 -_08167144: +@08167144: ldr r0, [r4] adds r2, r0, 0 adds r2, 0x61 @@ -692953,7 +692953,7 @@ _08167144: lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x4 - bls _08167144 + bls @08167144 pop {r4,r5} pop {r0} bx r0 @@ -692962,7 +692962,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 @@ -692995,22 +692995,22 @@ sub_8167184: @ 8167184 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - ble _081671D4 + ble @081671D4 movs r0, 0x1 - b _081671DA + b @081671DA .align 2, 0 .pool -_081671D4: +@081671D4: cmp r0, 0 - bge _08167250 + bge @08167250 movs r0, 0xFF -_081671DA: +@081671DA: movs r2, 0 lsls r0, 24 mov r9, r0 ldr r0, =0x0203bc90 mov r8, r0 -_081671E4: +@081671E4: mov r0, r8 ldr r1, [r0] lsls r0, r2, 24 @@ -693031,13 +693031,13 @@ _081671E4: lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _0816721C + ble @0816721C lsls r0, r5, 24 movs r1, 0x80 lsls r1, 17 adds r0, r1 lsrs r5, r0, 24 -_0816721C: +@0816721C: ldr r0, =0x085dfcc4 adds r0, r6, r0 ldrb r1, [r0] @@ -693046,7 +693046,7 @@ _0816721C: lsls r0, 24 asrs r2, r0, 24 cmp r0, r9 - bne _08167244 + bne @08167244 mov r1, r8 ldr r0, [r1] adds r0, 0x66 @@ -693057,14 +693057,14 @@ _0816721C: ldrh r2, [r0] adds r1, r2 strh r1, [r0] -_08167244: +@08167244: adds r0, r6, 0x1 lsls r0, 24 lsrs r2, r0, 24 asrs r0, 24 cmp r0, 0x4 - ble _081671E4 -_08167250: + ble @081671E4 +@08167250: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -693077,7 +693077,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] @@ -693096,25 +693096,25 @@ sub_8167268: @ 8167268 movs r3, 0 bl sub_81D2C68 cmp r0, 0xFF - beq _0816729C + beq @0816729C movs r0, 0 - b _0816729E + b @0816729E .align 2, 0 .pool -_0816729C: +@0816729C: movs r0, 0x1 -_0816729E: +@0816729E: pop {r1} bx r1 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 movs r4, 0 -_081672AC: +@081672AC: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -693122,40 +693122,40 @@ _081672AC: movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _081672D2 + bne @081672D2 cmp r5, 0 - bne _081672CC + bne @081672CC adds r0, r4, 0 - b _081672DE + b @081672DE .align 2, 0 .pool -_081672CC: +@081672CC: subs r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_081672D2: +@081672D2: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls _081672AC + bls @081672AC movs r0, 0 -_081672DE: +@081672DE: pop {r4,r5} pop {r1} bx r1 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 movs r4, 0 movs r6, 0 cmp r6, r5 - bcs _08167314 -_081672F2: + bcs @08167314 +@081672F2: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -693163,17 +693163,17 @@ _081672F2: movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - beq _0816730A + beq @0816730A adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_0816730A: +@0816730A: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc _081672F2 -_08167314: + bcc @081672F2 +@08167314: subs r0, r5, r6 lsls r0, 24 lsrs r0, 24 @@ -693185,7 +693185,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 @@ -693197,7 +693197,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} @@ -693216,13 +693216,13 @@ sub_8167338: @ 8167338 adds r0, r6, 0x2 mov r8, r0 ldr r7, =0x0202064c -_08167360: +@08167360: ldr r0, [r5] adds r0, 0x61 adds r0, r4 ldrb r0, [r0] cmp r0, 0 - beq _081673AC + beq @081673AC lsls r2, r4, 2 adds r0, r2, r6 movs r3, 0 @@ -693236,31 +693236,31 @@ _08167360: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq _081673AC + beq @081673AC ldr r0, [r5] adds r0, 0x61 adds r0, r4 ldrb r0, [r0] cmp r0, 0 - beq _081673A2 + beq @081673A2 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r7 ldr r1, =sub_81673DC + 1 str r1, [r0] -_081673A2: +@081673A2: ldr r1, [r5] adds r1, 0x54 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_081673AC: +@081673AC: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x4 - bls _08167360 + bls @08167360 pop {r3} mov r8, r3 pop {r4-r7} @@ -693271,31 +693271,31 @@ _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 ldrsh r0, [r1, r2] cmp r0, 0x5 - bgt _081673EE + bgt @081673EE ldrh r0, [r1, 0x26] subs r0, 0x2 - b _081673F6 -_081673EE: + b @081673F6 +@081673EE: cmp r0, 0xB - bgt _081673F8 + bgt @081673F8 ldrh r0, [r1, 0x26] adds r0, 0x2 -_081673F6: +@081673F6: strh r0, [r1, 0x26] -_081673F8: +@081673F8: ldrh r0, [r1, 0x2E] adds r0, 0x1 strh r0, [r1, 0x2E] lsls r0, 16 asrs r0, 16 cmp r0, 0x3C - ble _08167418 + ble @08167418 adds r0, r1, 0 bl obj_delete_and_free_tiles ldr r0, =0x0203bc90 @@ -693304,7 +693304,7 @@ _081673F8: ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] -_08167418: +@08167418: pop {r0} bx r0 .align 2, 0 @@ -693312,15 +693312,15 @@ _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 ldr r6, =0x0203bcac - b _08167472 + b @08167472 .align 2, 0 .pool -_08167430: +@08167430: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -693329,7 +693329,7 @@ _08167430: bl pokemon_getattr adds r3, r0, 0 cmp r3, 0 - bne _0816746C + bne @0816746C ldr r1, [r6] lsls r2, r5, 2 adds r1, r2 @@ -693350,16 +693350,16 @@ _08167430: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 -_0816746C: +@0816746C: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 -_08167472: +@08167472: bl calc_player_party_count lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bcc _08167430 + bcc @08167430 ldr r2, =0x0203bcac ldr r0, [r2] ldr r1, =0x00008041 @@ -693380,7 +693380,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] @@ -693412,18 +693412,18 @@ sub_81674BC: @ 81674BC adds r0, r2 ldrb r2, [r0] cmp r1, r2 - blt _08167500 + blt @08167500 movs r1, 0 -_08167500: +@08167500: subs r0, r3, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r0, 0 - bge _08167510 + bge @08167510 subs r0, r2, 0x1 lsls r0, 16 lsrs r4, r0, 16 -_08167510: +@08167510: adds r0, r1, 0 movs r1, 0x1 bl sub_816753C @@ -693439,7 +693439,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 @@ -693530,7 +693530,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} @@ -693545,7 +693545,7 @@ sub_8167608: @ 8167608 ldrb r0, [r0] adds r7, r1, 0 cmp r0, 0xFF - bne _08167714 + bne @08167714 add r5, sp, 0x18 add r4, sp, 0x20 adds r0, r5, 0 @@ -693589,7 +693589,7 @@ sub_8167608: @ 8167608 adds r0, r2 strb r1, [r0] cmp r1, 0x40 - bne _081676AC + bne @081676AC movs r0, 0x64 bl gpu_tile_obj_free_by_tag movs r0, 0x64 @@ -693598,10 +693598,10 @@ sub_8167608: @ 8167608 add r0, r8 movs r1, 0xFF strb r1, [r0] - b _08167742 + b @08167742 .align 2, 0 .pool -_081676AC: +@081676AC: ldr r0, [r7] add r0, r8 strb r1, [r0] @@ -693643,10 +693643,10 @@ _081676AC: lsls r1, 1 adds r0, r1 strh r0, [r2] - b _08167742 + b @08167742 .align 2, 0 .pool -_08167714: +@08167714: lsls r1, r6, 13 movs r0, 0xC1 lsls r0, 2 @@ -693669,7 +693669,7 @@ _08167714: ldrh r1, [r1] movs r2, 0x20 bl gpu_pal_apply -_08167742: +@08167742: add sp, 0x28 pop {r3} mov r8, r3 @@ -693681,7 +693681,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 @@ -693711,13 +693711,13 @@ sub_8167760: @ 8167760 add r2, sp, 0x58 mov r10, r2 cmp r4, r0 - bge _0816781C + bge @0816781C adds r5, r1, 0 ldr r7, =0x02020630 movs r0, 0x1C adds r0, r7 mov r8, r0 -_081677AC: +@081677AC: lsls r2, r4, 2 adds r2, r4 lsls r2, 18 @@ -693732,7 +693732,7 @@ _081677AC: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 - beq _081677FC + beq @081677FC ldr r0, [r5] ldr r2, =0x00007b06 adds r0, r2 @@ -693746,17 +693746,17 @@ _081677AC: add r0, r8 ldr r1, =sub_8168180 + 1 str r1, [r0] - b _08167808 + b @08167808 .align 2, 0 .pool -_081677FC: +@081677FC: ldr r0, [r5] ldr r1, =0x00007b06 adds r0, r1 adds r0, r4 movs r1, 0xFF strb r1, [r0] -_08167808: +@08167808: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -693766,15 +693766,15 @@ _08167808: ldrb r0, [r0] subs r0, 0x1 cmp r4, r0 - blt _081677AC -_0816781C: + blt @081677AC +@0816781C: movs r0, 0x67 strh r0, [r6] cmp r4, 0x5 - bhi _0816788A + bhi @0816788A ldr r5, =0x0203bcac ldr r7, =0x02020630 -_08167828: +@08167828: lsls r2, r4, 2 adds r2, r4 lsls r2, 18 @@ -693789,7 +693789,7 @@ _08167828: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 - beq _08167874 + beq @08167874 ldr r0, [r5] ldr r1, =0x00007b06 adds r0, r1 @@ -693803,23 +693803,23 @@ _08167828: movs r0, 0x3F ands r0, r2 strb r0, [r1, 0x3] - b _08167880 + b @08167880 .align 2, 0 .pool -_08167874: +@08167874: ldr r0, [r5] ldr r2, =0x00007b06 adds r0, r2 adds r0, r4 movs r1, 0xFF strb r1, [r0] -_08167880: +@08167880: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x5 - bls _08167828 -_0816788A: + bls @08167828 +@0816788A: movs r0, 0x66 strh r0, [r6] ldr r0, =sub_81681B4 + 1 @@ -693838,7 +693838,7 @@ _0816788A: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 - beq _081678F4 + beq @081678F4 ldr r0, =0x0203bcac ldr r0, [r0] ldr r1, =0x00007b06 @@ -693862,10 +693862,10 @@ _0816788A: movs r0, 0x80 orrs r1, r0 strb r1, [r2, 0x3] - b _08167902 + b @08167902 .align 2, 0 .pool -_081678F4: +@081678F4: ldr r0, =0x0203bcac ldr r0, [r0] ldr r2, =0x00007b06 @@ -693873,7 +693873,7 @@ _081678F4: adds r0, r4 movs r1, 0xFF strb r1, [r0] -_08167902: +@08167902: mov r0, r9 mov r1, r10 bl sub_81D32B0 @@ -693894,7 +693894,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 @@ -693903,31 +693903,31 @@ sub_8167930: @ 8167930 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xB - bls _08167944 - b _08167B78 -_08167944: + bls @08167944 + b @08167B78 +@08167944: lsls r0, 2 - ldr r1, =_0816795C + ldr r1, =@0816795C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0816795C: - .4byte _0816798C - .4byte _08167A04 - .4byte _08167A38 - .4byte _08167A48 - .4byte _08167A5C - .4byte _08167A74 - .4byte _08167A9C - .4byte _08167AB0 - .4byte _08167AD4 - .4byte _08167AEC - .4byte _08167B1C - .4byte _08167B38 -_0816798C: +@0816795C: + .4byte @0816798C + .4byte @08167A04 + .4byte @08167A38 + .4byte @08167A48 + .4byte @08167A5C + .4byte @08167A74 + .4byte @08167A9C + .4byte @08167AB0 + .4byte @08167AD4 + .4byte @08167AEC + .4byte @08167B1C + .4byte @08167B38 +@0816798C: movs r0, 0 movs r1, 0 movs r2, 0 @@ -693971,10 +693971,10 @@ _0816798C: ldr r1, =0x0000040b movs r0, 0x52 bl lcd_io_set - b _08167B7E + b @08167B7E .align 2, 0 .pool -_08167A04: +@08167A04: ldr r4, =0x0203bca4 movs r0, 0xD0 lsls r0, 5 @@ -693990,25 +693990,25 @@ _08167A04: adds r0, r4, 0 bl malloc str r0, [r5] - b _08167B7E + b @08167B7E .align 2, 0 .pool -_08167A38: +@08167A38: ldr r0, =0x085dfb60 ldr r1, =0x0203bca8 - b _08167AA0 + b @08167AA0 .align 2, 0 .pool -_08167A48: +@08167A48: ldr r1, =0x085dfa80 movs r0, 0x3 movs r2, 0xE0 movs r3, 0 bl gpu_copy_bg_tile_pattern_data_to_vram - b _08167B7E + b @08167B7E .align 2, 0 .pool -_08167A5C: +@08167A5C: ldr r0, =0x0203bca8 ldr r1, [r0] movs r2, 0xA0 @@ -694016,10 +694016,10 @@ _08167A5C: movs r0, 0x3 movs r3, 0 bl gpu_copy_bg_tile_map_to_vram - b _08167B7E + b @08167B7E .align 2, 0 .pool -_08167A74: +@08167A74: ldr r0, =0x085dfa60 movs r1, 0xD0 movs r2, 0x20 @@ -694030,19 +694030,19 @@ _08167A74: adds r0, r1 ldr r1, =0x0000ffb0 strh r1, [r0] - b _08167B7E + b @08167B7E .align 2, 0 .pool -_08167A9C: +@08167A9C: ldr r0, =0x08dccf7c ldr r1, =0x0203bca4 -_08167AA0: +@08167AA0: ldr r1, [r1] bl LZ77UnCompVram - b _08167B7E + b @08167B7E .align 2, 0 .pool -_08167AB0: +@08167AB0: ldr r0, =0x08dcd81c ldr r1, =0x0203bca0 ldr r1, [r1] @@ -694051,10 +694051,10 @@ _08167AB0: movs r1, 0x20 movs r2, 0x20 bl gpu_pal_apply - b _08167B7E + b @08167B7E .align 2, 0 .pool -_08167AD4: +@08167AD4: ldr r0, =0x0203bca4 ldr r1, [r0] movs r2, 0xD0 @@ -694063,10 +694063,10 @@ _08167AD4: lsls r3, 2 movs r0, 0x1 bl gpu_copy_bg_tile_pattern_data_to_vram - b _08167B7E + b @08167B7E .align 2, 0 .pool -_08167AEC: +@08167AEC: ldr r0, =0x0203bca0 ldr r1, [r0] movs r0, 0x1 @@ -694082,20 +694082,20 @@ _08167AEC: bl gpu_copy_to_iwram_tile_map_rect movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram - b _08167B7E + b @08167B7E .align 2, 0 .pool -_08167B1C: +@08167B1C: ldr r0, =0x085dfc0c ldr r1, =0x0203bcac ldr r1, [r1] ldr r2, =0x00007304 adds r1, r2 bl LZ77UnCompVram - b _08167B7E + b @08167B7E .align 2, 0 .pool -_08167B38: +@08167B38: ldr r0, =0x0203bcac ldr r1, [r0] ldr r0, =0x00007304 @@ -694115,14 +694115,14 @@ _08167B38: bl gpu_pal_apply movs r0, 0x2 bl sub_81D21DC - b _08167B7E + b @08167B7E .align 2, 0 .pool -_08167B78: +@08167B78: movs r0, 0 strb r0, [r1] - b _08167B8E -_08167B7E: + b @08167B8E +@08167B7E: ldr r0, =0x0203bcac ldr r1, [r0] ldr r2, =0x00008048 @@ -694131,7 +694131,7 @@ _08167B7E: adds r0, 0x1 strb r0, [r1] movs r0, 0x1 -_08167B8E: +@08167B8E: add sp, 0x8 pop {r4,r5} pop {r1} @@ -694141,7 +694141,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} @@ -694167,7 +694167,7 @@ sub_8167BA0: @ 8167BA0 ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 - beq _08167C46 + beq @08167C46 lsls r2, r4, 6 ldr r0, =0x00007b95 adds r2, r0 @@ -694217,27 +694217,27 @@ sub_8167BA0: @ 8167BA0 movs r2, 0x2 movs r3, 0x1 bl box_print -_08167C46: +@08167C46: mov r2, r8 cmp r2, 0 - beq _08167C84 + beq @08167C84 movs r0, 0 movs r1, 0x3 bl Window_CopyToVram movs r0, 0x1 movs r1, 0x3 bl Window_CopyToVram - b _08167C94 + b @08167C94 .align 2, 0 .pool -_08167C84: +@08167C84: movs r0, 0 movs r1, 0x2 bl Window_CopyToVram movs r0, 0x1 movs r1, 0x2 bl Window_CopyToVram -_08167C94: +@08167C94: add sp, 0xC pop {r3} mov r8, r3 @@ -694247,27 +694247,27 @@ _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} lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0 - beq _08167CC0 + beq @08167CC0 ldr r0, =0x0203bcac ldr r0, [r0] ldr r1, =0x00007fb5 adds r0, r1 - b _08167CC8 + b @08167CC8 .align 2, 0 .pool -_08167CC0: +@08167CC0: ldr r0, =0x0203bcac ldr r0, [r0] ldr r2, =0x00007fb4 adds r0, r2 -_08167CC8: +@08167CC8: ldrb r0, [r0] lsls r0, 24 asrs r0, 24 @@ -694308,7 +694308,7 @@ _08167CC8: lsrs r0, 31 mov r8, r0 cmp r7, 0 - beq _08167D98 + beq @08167D98 ldr r3, =0x00007fb4 adds r0, r4, r3 ldrb r1, [r0] @@ -694335,11 +694335,11 @@ _08167CC8: adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 - bne _08167D58 + bne @08167D58 mov r4, r12 adds r0, r1, r4 ldrb r0, [r0] -_08167D58: +@08167D58: subs r2, r0, 0x1 ldr r0, =0x00008041 adds r1, r0 @@ -694350,16 +694350,16 @@ _08167D58: ldrb r0, [r0] adds r6, r1, 0 cmp r0, 0 - bne _08167D74 + bne @08167D74 ldr r1, =0x00008040 adds r0, r3, r1 ldrb r0, [r0] -_08167D74: +@08167D74: subs r1, r0, 0x1 - b _08167E1E + b @08167E1E .align 2, 0 .pool -_08167D98: +@08167D98: ldr r3, =0x00007fb5 adds r0, r4, r3 ldrb r1, [r0] @@ -694390,14 +694390,14 @@ _08167D98: ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 - bge _08167DEC + bge @08167DEC adds r3, r1, 0x1 - b _08167DEE + b @08167DEE .align 2, 0 .pool -_08167DEC: +@08167DEC: movs r3, 0 -_08167DEE: +@08167DEE: ldr r1, =0x00008041 adds r0, r2, r1 strb r3, [r0] @@ -694411,14 +694411,14 @@ _08167DEE: subs r0, 0x1 adds r6, r2, 0 cmp r1, r0 - bge _08167E1C + bge @08167E1C adds r1, 0x1 - b _08167E1E + b @08167E1E .align 2, 0 .pool -_08167E1C: +@08167E1C: movs r1, 0 -_08167E1E: +@08167E1E: ldr r2, =0x00007b4c adds r0, r3, r2 strb r1, [r0] @@ -694440,30 +694440,30 @@ _08167E1E: bl sub_81D3520 mov r2, r8 cmp r2, 0 - bne _08167E70 + bne @08167E70 ldr r0, [r5] ldr r3, =0x00008044 adds r0, r3 ldr r1, =sub_8167EA4 + 1 - b _08167E90 + b @08167E90 .align 2, 0 .pool -_08167E70: +@08167E70: cmp r4, 0 - bne _08167E88 + bne @08167E88 ldr r0, [r5] ldr r4, =0x00008044 adds r0, r4 ldr r1, =sub_8167FA4 + 1 - b _08167E90 + b @08167E90 .align 2, 0 .pool -_08167E88: +@08167E88: ldr r0, [r6] ldr r1, =0x00008044 adds r0, r1 ldr r1, =sub_8168048 + 1 -_08167E90: +@08167E90: str r1, [r0] pop {r3} mov r8, r3 @@ -694475,7 +694475,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] @@ -694483,29 +694483,29 @@ sub_8167EA4: @ 8167EA4 adds r0, r1, r5 ldrb r0, [r0] cmp r0, 0x1 - beq _08167EE4 + beq @08167EE4 cmp r0, 0x1 - bgt _08167EC8 + bgt @08167EC8 cmp r0, 0 - beq _08167ED2 - b _08167F9C + beq @08167ED2 + b @08167F9C .align 2, 0 .pool -_08167EC8: +@08167EC8: cmp r0, 0x2 - beq _08167F08 + beq @08167F08 cmp r0, 0x3 - beq _08167F48 - b _08167F9C -_08167ED2: + beq @08167F48 + b @08167F9C +@08167ED2: ldr r2, =0x00007fb3 adds r0, r1, r2 ldrb r0, [r0] bl sub_8167608 - b _08167F2C + b @08167F2C .align 2, 0 .pool -_08167EE4: +@08167EE4: ldr r6, =0x00007fb3 adds r0, r1, r6 ldrb r0, [r0] @@ -694518,10 +694518,10 @@ _08167EE4: ldr r1, [r4] ldr r0, =0x00008048 adds r1, r0 - b _08167F30 + b @08167F30 .align 2, 0 .pool -_08167F08: +@08167F08: ldr r2, =0x00007c58 adds r0, r1, r2 ldr r6, =0x00007b0e @@ -694529,7 +694529,7 @@ _08167F08: bl sub_81D3178 lsls r0, 24 cmp r0, 0 - bne _08167F9C + bne @08167F9C ldr r1, [r4] ldr r2, =0x00007b4c adds r0, r1, r2 @@ -694538,17 +694538,17 @@ _08167F08: adds r1, r6 ldrb r1, [r1] bl sub_816753C -_08167F2C: +@08167F2C: ldr r1, [r4] adds r1, r5 -_08167F30: +@08167F30: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08167F9C + b @08167F9C .align 2, 0 .pool -_08167F48: +@08167F48: ldr r2, =0x00007b1c adds r0, r1, r2 bl sub_81D3464 @@ -694561,7 +694561,7 @@ _08167F48: ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 - beq _08167F82 + beq @08167F82 subs r6, 0x8E adds r0, r3, r6 movs r1, 0 @@ -694576,25 +694576,25 @@ _08167F48: adds r1, r3, r6 ldrb r1, [r1] bl sub_81D3480 -_08167F82: +@08167F82: ldr r0, [r4] adds r0, r5 movs r1, 0 strb r1, [r0] movs r0, 0 - b _08167F9E + b @08167F9E .align 2, 0 .pool -_08167F9C: +@08167F9C: movs r0, 0x1 -_08167F9E: +@08167F9E: pop {r4-r6} pop {r1} bx r1 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] @@ -694602,21 +694602,21 @@ sub_8167FA4: @ 8167FA4 adds r2, r1, r5 ldrb r0, [r2] cmp r0, 0x1 - beq _08167FF0 + beq @08167FF0 cmp r0, 0x1 - bgt _08167FC8 + bgt @08167FC8 cmp r0, 0 - beq _08167FD2 - b _0816803E + beq @08167FD2 + b @0816803E .align 2, 0 .pool -_08167FC8: +@08167FC8: cmp r0, 0x2 - beq _08168014 + beq @08168014 cmp r0, 0x3 - beq _08168038 - b _0816803E -_08167FD2: + beq @08168038 + b @0816803E +@08167FD2: ldr r2, =0x00007c58 adds r0, r1, r2 ldr r2, =0x00007b0e @@ -694624,11 +694624,11 @@ _08167FD2: bl sub_81D31A4 lsls r0, 24 cmp r0, 0 - bne _0816803E - b _08168024 + bne @0816803E + b @08168024 .align 2, 0 .pool -_08167FF0: +@08167FF0: ldr r2, =0x00007fb3 adds r0, r1, r2 ldrb r0, [r0] @@ -694641,10 +694641,10 @@ _08167FF0: ldr r1, [r4] ldr r0, =0x00008048 adds r1, r0 - b _08168028 + b @08168028 .align 2, 0 .pool -_08168014: +@08168014: ldr r2, =0x00007b4c adds r0, r1, r2 ldrb r0, [r0] @@ -694652,30 +694652,30 @@ _08168014: adds r1, r2 ldrb r1, [r1] bl sub_816753C -_08168024: +@08168024: ldr r1, [r4] adds r1, r5 -_08168028: +@08168028: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0816803E + b @0816803E .align 2, 0 .pool -_08168038: +@08168038: movs r0, 0 strb r0, [r2] - b _08168040 -_0816803E: + b @08168040 +@0816803E: movs r0, 0x1 -_08168040: +@08168040: pop {r4,r5} pop {r1} bx r1 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] @@ -694683,21 +694683,21 @@ sub_8168048: @ 8168048 adds r0, r1, r5 ldrb r0, [r0] cmp r0, 0x1 - beq _081680A8 + beq @081680A8 cmp r0, 0x1 - bgt _0816806C + bgt @0816806C cmp r0, 0 - beq _08168076 - b _08168160 + beq @08168076 + b @08168160 .align 2, 0 .pool -_0816806C: +@0816806C: cmp r0, 0x2 - beq _081680CC + beq @081680CC cmp r0, 0x3 - beq _0816810C - b _08168160 -_08168076: + beq @0816810C + b @08168160 +@08168076: ldr r2, =0x00007c58 adds r0, r1, r2 bl sub_81D2074 @@ -694707,16 +694707,16 @@ _08168076: bl sub_81D3150 lsls r0, 24 cmp r0, 0 - bne _08168160 + bne @08168160 ldr r0, [r4] ldr r1, =0x00007fb3 adds r0, r1 ldrb r0, [r0] bl sub_8167608 - b _081680F0 + b @081680F0 .align 2, 0 .pool -_081680A8: +@081680A8: ldr r2, =0x00007fb3 adds r0, r1, r2 ldrb r0, [r0] @@ -694729,10 +694729,10 @@ _081680A8: ldr r1, [r4] ldr r6, =0x00008048 adds r1, r6 - b _081680F4 + b @081680F4 .align 2, 0 .pool -_081680CC: +@081680CC: ldr r2, =0x00007c58 adds r0, r1, r2 ldr r6, =0x00007b0e @@ -694740,7 +694740,7 @@ _081680CC: bl sub_81D3178 lsls r0, 24 cmp r0, 0 - bne _08168160 + bne @08168160 ldr r1, [r4] ldr r2, =0x00007b4c adds r0, r1, r2 @@ -694749,17 +694749,17 @@ _081680CC: adds r1, r6 ldrb r1, [r1] bl sub_816753C -_081680F0: +@081680F0: ldr r1, [r4] adds r1, r5 -_081680F4: +@081680F4: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08168160 + b @08168160 .align 2, 0 .pool -_0816810C: +@0816810C: ldr r2, =0x00007b1c adds r0, r1, r2 bl sub_81D3464 @@ -694772,7 +694772,7 @@ _0816810C: ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 - beq _08168146 + beq @08168146 subs r6, 0x8E adds r0, r3, r6 movs r1, 0 @@ -694787,25 +694787,25 @@ _0816810C: adds r1, r3, r6 ldrb r1, [r1] bl sub_81D3480 -_08168146: +@08168146: ldr r0, [r4] adds r0, r5 movs r1, 0 strb r1, [r0] movs r0, 0 - b _08168162 + b @08168162 .align 2, 0 .pool -_08168160: +@08168160: movs r0, 0x1 -_08168162: +@08168162: pop {r4-r6} pop {r1} bx r1 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 @@ -694819,7 +694819,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 @@ -694830,24 +694830,24 @@ sub_8168180: @ 8168180 adds r0, r3 ldrb r0, [r0] cmp r1, r0 - bne _081681A8 + bne @081681A8 adds r0, r2, 0 movs r1, 0 bl obj_anim_image_start - b _081681B0 + b @081681B0 .align 2, 0 .pool -_081681A8: +@081681A8: adds r0, r2, 0 movs r1, 0x1 bl obj_anim_image_start -_081681B0: +@081681B0: pop {r0} bx r0 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 @@ -694860,14 +694860,14 @@ sub_81681B4: @ 81681B4 ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 - bne _081681DC + bne @081681DC movs r0, 0x65 - b _081681DE + b @081681DE .align 2, 0 .pool -_081681DC: +@081681DC: movs r0, 0x66 -_081681DE: +@081681DE: bl gpu_pal_tags_index_of lsls r0, 4 ldrb r2, [r4, 0x5] @@ -694881,7 +694881,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 @@ -694904,16 +694904,16 @@ sub_81681F4: @ 81681F4 adds r0, r3 adds r4, r0, r1 cmp r2, 0xFF - beq _0816823C + beq @0816823C adds r0, r2, 0 movs r1, 0x1D bl __udivsi3 - b _0816823E + b @0816823E .align 2, 0 .pool -_0816823C: +@0816823C: movs r0, 0x9 -_0816823E: +@0816823E: strb r0, [r4] pop {r4} pop {r0} @@ -694921,7 +694921,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, =0x085dfdb8 @@ -694954,7 +694954,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 @@ -694972,7 +694972,7 @@ sub_8168294: @ 8168294 movs r0, 0x60 negs r0, r0 mov r8, r0 -_081682B6: +@081682B6: mov r5, r9 muls r5, r6 mov r0, r8 @@ -694988,7 +694988,7 @@ _081682B6: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq _081682FE + beq @081682FE ldr r0, =0x02020630 lsls r4, r1, 4 adds r4, r1 @@ -695007,12 +695007,12 @@ _081682B6: lsls r0, r6, 2 adds r0, r7 str r4, [r0] -_081682FE: +@081682FE: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x1 - bls _081682B6 + bls @081682B6 pop {r3-r5} mov r8, r3 mov r9, r4 @@ -695025,7 +695025,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] @@ -695033,13 +695033,13 @@ sub_8168328: @ 8168328 adds r0, r5 ldrb r0, [r0] cmp r0, 0 - beq _08168348 + beq @08168348 cmp r0, 0x1 - beq _08168360 - b _0816836C + beq @08168360 + b @0816836C .align 2, 0 .pool -_08168348: +@08168348: bl sub_8168248 ldr r1, [r4] ldr r0, =0x00008048 @@ -695048,25 +695048,25 @@ _08168348: adds r0, 0x1 strb r0, [r1] movs r0, 0x1 - b _0816836E + b @0816836E .align 2, 0 .pool -_08168360: +@08168360: bl sub_8168294 ldr r0, [r4] adds r0, r5 movs r1, 0 strb r1, [r0] -_0816836C: +@0816836C: movs r0, 0 -_0816836E: +@0816836E: pop {r4,r5} pop {r1} bx r1 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] @@ -695078,24 +695078,24 @@ sub_8168374: @ 8168374 movs r0, 0x30 ldrsh r1, [r2, r0] cmp r4, r1 - bgt _08168398 + bgt @08168398 lsls r0, r3, 16 asrs r0, 16 cmp r0, r1 - bge _081683A0 + bge @081683A0 cmp r4, r1 - blt _081683A8 -_08168398: + blt @081683A8 +@08168398: lsls r0, r3, 16 asrs r0, 16 cmp r0, r1 - bgt _081683A8 -_081683A0: + bgt @081683A8 +@081683A0: ldrh r0, [r2, 0x30] strh r0, [r2, 0x20] ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] -_081683A8: +@081683A8: pop {r4} pop {r0} bx r0 @@ -695104,12 +695104,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] @@ -695137,7 +695137,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, =0x0832a328 @@ -695149,31 +695149,31 @@ bx_exec_buffer_A_ch0_tbl2: @ 81683F4 ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _08168440 + beq @08168440 ldr r0, =0x02023064 lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] cmp r0, 0x38 - bhi _0816843C + bhi @0816843C ldr r0, =0x085dfdc0 ldrb r1, [r1] lsls r1, 2 adds r1, r0 ldr r0, [r1] bl _call_via_r0 - b _08168440 + b @08168440 .align 2, 0 .pool -_0816843C: +@0816843C: bl dp01_tbl5_exec_completed -_08168440: +@08168440: pop {r0} bx r0 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] @@ -695181,25 +695181,25 @@ sub_8168444: @ 8168444 ldrb r0, [r0] adds r4, r1, 0 cmp r0, 0x5 - bls _08168456 - b _08168564 -_08168456: + bls @08168456 + b @08168564 +@08168456: lsls r0, 2 - ldr r1, =_08168468 + ldr r1, =@08168468 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08168468: - .4byte _08168480 - .4byte _08168492 - .4byte _081684B0 - .4byte _081684CE - .4byte _08168508 - .4byte _08168540 -_08168480: +@08168468: + .4byte @08168480 + .4byte @08168492 + .4byte @081684B0 + .4byte @081684CE + .4byte @08168508 + .4byte @08168540 +@08168480: ldr r0, [r4] adds r0, 0x96 movs r1, 0x40 @@ -695209,7 +695209,7 @@ _08168480: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_08168492: +@08168492: ldr r1, [r4] adds r1, 0x96 ldrb r0, [r1] @@ -695218,13 +695218,13 @@ _08168492: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _08168564 + bne @08168564 movs r0, 0x5 bl audio_play movs r0, 0x1 movs r1, 0 - b _081684E4 -_081684B0: + b @081684E4 +@081684B0: ldr r1, [r4] adds r1, 0x96 ldrb r0, [r1] @@ -695233,13 +695233,13 @@ _081684B0: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _08168564 + bne @08168564 movs r0, 0x5 bl audio_play movs r0, 0x1 movs r1, 0 - b _081684E4 -_081684CE: + b @081684E4 +@081684CE: ldr r1, [r4] adds r1, 0x96 ldrb r0, [r1] @@ -695248,10 +695248,10 @@ _081684CE: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _08168564 + bne @08168564 movs r0, 0x1 movs r1, 0x9 -_081684E4: +@081684E4: movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb bl dp01_tbl5_exec_completed @@ -695267,8 +695267,8 @@ _081684E4: adds r0, 0x96 movs r1, 0x40 strb r1, [r0] - b _08168564 -_08168508: + b @08168564 +@08168508: ldr r1, [r4] adds r1, 0x96 ldrb r0, [r1] @@ -695276,7 +695276,7 @@ _08168508: strb r0, [r1] lsls r0, 24 cmp r0, 0 - bne _08168564 + bne @08168564 movs r0, 0x5 bl audio_play movs r0, 0 @@ -695293,8 +695293,8 @@ _08168508: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08168564 -_08168540: + b @08168564 +@08168540: ldr r1, [r4] adds r1, 0x96 ldrb r0, [r1] @@ -695302,7 +695302,7 @@ _08168540: strb r0, [r1] lsls r0, 24 cmp r0, 0 - bne _08168564 + bne @08168564 movs r0, 0x5 bl audio_play movs r0, 0x1 @@ -695310,14 +695310,14 @@ _08168540: movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb bl dp01_tbl5_exec_completed -_08168564: +@08168564: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_8168444 thumb_func_start sub_816856C -sub_816856C: @ 816856C +sub_816856C: ; 816856C push {lr} ldr r2, =0x02020630 ldr r1, =0x020241e4 @@ -695333,9 +695333,9 @@ sub_816856C: @ 816856C ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _08168590 + bne @08168590 bl dp01_tbl5_exec_completed -_08168590: +@08168590: pop {r0} bx r0 .align 2, 0 @@ -695343,28 +695343,28 @@ _08168590: thumb_func_end sub_816856C thumb_func_start sub_81685A4 -sub_81685A4: @ 81685A4 +sub_81685A4: ; 81685A4 push {lr} movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _081685B6 + bne @081685B6 bl dp01_tbl5_exec_completed -_081685B6: +@081685B6: pop {r0} bx r0 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] cmp r0, 0 - bne _081685CA + bne @081685CA bl dp01_tbl5_exec_completed -_081685CA: +@081685CA: pop {r0} bx r0 .align 2, 0 @@ -695372,14 +695372,14 @@ _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] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081685FC + bne @081685FC ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -695390,7 +695390,7 @@ sub_81685D4: @ 81685D4 bl nullsub_35 bl Window_FreeMemory bl sub_81ADD70 -_081685FC: +@081685FC: pop {r0} bx r0 .align 2, 0 @@ -695398,25 +695398,25 @@ _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] ldr r0, =sub_8038420 + 1 cmp r1, r0 - bne _08168636 + bne @08168636 ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08168636 + bne @08168636 ldr r0, =0x0203ce7c ldrh r1, [r0] movs r0, 0x1 bl dp01_build_cmdbuf_x23_aa_0 bl dp01_tbl5_exec_completed -_08168636: +@08168636: pop {r0} bx r0 .align 2, 0 @@ -695424,7 +695424,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} @@ -695442,7 +695442,7 @@ sub_816864C: @ 816864C adds r0, r7, 0 ands r0, r1 cmp r0, 0 - bne _08168684 + bne @08168684 ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] @@ -695452,7 +695452,7 @@ sub_816864C: @ 816864C adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 -_08168684: +@08168684: ldr r1, [r4] ldrb r0, [r5] movs r6, 0x2 @@ -695467,7 +695467,7 @@ _08168684: adds r0, r7, 0 ands r0, r1 cmp r0, 0 - bne _081686B6 + bne @081686B6 ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] @@ -695477,7 +695477,7 @@ _08168684: adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 -_081686B6: +@081686B6: ldr r0, [r4] ldrb r2, [r5] ldr r3, [r0, 0x4] @@ -695490,9 +695490,9 @@ _081686B6: adds r0, r4, 0 ands r0, r1 cmp r0, 0 - beq _081686D2 - b _081687DC -_081686D2: + beq @081686D2 + b @081687DC +@081686D2: adds r1, r2, 0 eors r1, r6 lsls r0, r1, 1 @@ -695503,7 +695503,7 @@ _081686D2: adds r0, r4, 0 ands r0, r1 cmp r0, 0 - bne _081687DC + bne @081687DC ldr r0, =0x02020630 mov r8, r0 ldr r7, =0x03005d7c @@ -695518,7 +695518,7 @@ _081686D2: ldr r3, [r0] ldr r0, =nullsub_12 + 1 cmp r3, r0 - bne _081687DC + bne @081687DC ldr r0, =0x020241e4 adds r0, r2, r0 ldrb r1, [r0] @@ -695528,17 +695528,17 @@ _081686D2: adds r0, r4 ldr r0, [r0] cmp r0, r3 - bne _081687DC + bne @081687DC bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _0816877A + beq @0816877A ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - bne _0816877A + bne @0816877A ldrb r0, [r5] eors r0, r6 adds r0, r7 @@ -695572,7 +695572,7 @@ _081686D2: adds r0, r4 ldrb r0, [r0] bl sub_80729D0 -_0816877A: +@0816877A: ldr r1, =0x03005d7c ldr r4, =0x02024064 ldrb r0, [r4] @@ -695618,7 +695618,7 @@ _0816877A: adds r0, r1 ldr r1, =sub_8168818 + 1 str r1, [r0] -_081687DC: +@081687DC: pop {r3} mov r8, r3 pop {r4-r7} @@ -695629,7 +695629,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} @@ -695649,11 +695649,11 @@ sub_8168818: @ 8168818 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _08168842 + bne @08168842 movs r4, 0x1 -_08168842: +@08168842: cmp r4, 0 - beq _08168904 + beq @08168904 ldr r7, =0x020244d0 ldr r0, [r7] ldr r4, [r0, 0x4] @@ -695666,7 +695666,7 @@ _08168842: adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _08168904 + beq @08168904 movs r6, 0x2 adds r1, r6, 0 eors r1, r3 @@ -695678,7 +695678,7 @@ _08168842: adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _08168904 + beq @08168904 ldrb r1, [r2] movs r3, 0x7F adds r0, r3, 0 @@ -695744,7 +695744,7 @@ _08168842: adds r0, r2 bl sub_805E990 bl dp01_tbl5_exec_completed -_08168904: +@08168904: pop {r3} mov r8, r3 pop {r4-r7} @@ -695755,7 +695755,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] @@ -695777,16 +695777,16 @@ sub_8168934: @ 8168934 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _0816897C + beq @0816897C ldrb r0, [r5] adds r0, r6 ldrb r0, [r0] movs r2, 0 bl heathbar_draw_hp - b _08168996 + b @08168996 .align 2, 0 .pool -_0816897C: +@0816897C: ldr r2, =0x0202406e ldrb r1, [r5] lsls r0, r1, 1 @@ -695798,7 +695798,7 @@ _0816897C: adds r0, r2 bl sub_805E990 bl dp01_tbl5_exec_completed -_08168996: +@08168996: pop {r4-r6} pop {r0} bx r0 @@ -695807,7 +695807,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 @@ -695822,7 +695822,7 @@ bx_blink_t5: @ 81689A4 movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0x20 - bne _081689F0 + bne @081689F0 movs r3, 0 movs r0, 0 strh r0, [r4, 0x30] @@ -695835,15 +695835,15 @@ bx_blink_t5: @ 81689A4 ldr r0, =0x020244b9 strb r3, [r0] bl dp01_tbl5_exec_completed - b _08168A1A + b @08168A1A .align 2, 0 .pool -_081689F0: +@081689F0: ldrh r0, [r4, 0x30] movs r1, 0x3 ands r0, r1 cmp r0, 0 - bne _08168A14 + bne @08168A14 adds r3, r4, 0 adds r3, 0x3E ldrb r2, [r3] @@ -695857,18 +695857,18 @@ _081689F0: ands r0, r2 orrs r0, r1 strb r0, [r3] -_08168A14: +@08168A14: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] -_08168A1A: +@08168A1A: pop {r4} pop {r0} bx r0 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] @@ -695883,7 +695883,7 @@ sub_8168A20: @ 8168A20 movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _08168A74 + bne @08168A74 ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] @@ -695907,7 +695907,7 @@ sub_8168A20: @ 8168A20 ldrb r0, [r0] bl sub_8072984 bl dp01_tbl5_exec_completed -_08168A74: +@08168A74: pop {r4-r6} pop {r0} bx r0 @@ -695916,7 +695916,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 @@ -695932,9 +695932,9 @@ sub_8168A90: @ 8168A90 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _08168AB4 + bne @08168AB4 bl dp01_tbl5_exec_completed -_08168AB4: +@08168AB4: pop {r0} bx r0 .align 2, 0 @@ -695942,7 +695942,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] @@ -695957,9 +695957,9 @@ sub_8168AC8: @ 8168AC8 movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _08168AEA + bne @08168AEA bl dp01_tbl5_exec_completed -_08168AEA: +@08168AEA: pop {r0} bx r0 .align 2, 0 @@ -695967,7 +695967,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 @@ -695982,7 +695982,7 @@ dp01_tbl5_exec_completed: @ 8168AF8 movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _08168B4C + beq @08168B4C bl link_get_multiplayer_id mov r1, sp strb r0, [r1] @@ -695996,10 +695996,10 @@ dp01_tbl5_exec_completed: @ 8168AF8 adds r0, r1 movs r1, 0x38 strb r1, [r0] - b _08168B5E + b @08168B5E .align 2, 0 .pool -_08168B4C: +@08168B4C: ldr r2, =0x02024068 ldr r1, =0x0832a328 ldrb r0, [r4] @@ -696009,7 +696009,7 @@ _08168B4C: ldr r0, [r2] bics r0, r1 str r0, [r2] -_08168B5E: +@08168B5E: add sp, 0x4 pop {r4} pop {r0} @@ -696019,7 +696019,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] @@ -696034,9 +696034,9 @@ sub_8168B70: @ 8168B70 movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _08168B92 + bne @08168B92 bl dp01_tbl5_exec_completed -_08168B92: +@08168B92: pop {r0} bx r0 .align 2, 0 @@ -696044,7 +696044,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 @@ -696056,7 +696056,7 @@ dp01t_00_5_getattr: @ 8168BA0 adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0 - bne _08168BD8 + bne @08168BD8 ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 @@ -696064,29 +696064,29 @@ dp01t_00_5_getattr: @ 8168BA0 mov r1, sp bl sub_8168C14 adds r6, r0, 0 - b _08168BFA + b @08168BFA .align 2, 0 .pool -_08168BD8: +@08168BD8: ldrb r4, [r1] movs r5, 0 -_08168BDC: +@08168BDC: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _08168BF2 + beq @08168BF2 lsls r0, r5, 24 lsrs r0, 24 mov r2, sp adds r1, r2, r6 bl sub_8168C14 adds r6, r0 -_08168BF2: +@08168BF2: lsrs r4, 1 adds r5, 0x1 cmp r5, 0x5 - ble _08168BDC -_08168BFA: + ble @08168BDC +@08168BFA: lsls r1, r6, 16 lsrs r1, 16 movs r0, 0x1 @@ -696100,7 +696100,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 @@ -696119,79 +696119,79 @@ sub_8168C14: @ 8168C14 adds r0, r1 ldrb r0, [r0] cmp r0, 0x3B - bls _08168C3E - bl _081693AA -_08168C3E: + bls @08168C3E + bl @081693AA +@08168C3E: lsls r0, 2 - ldr r1, =_08168C54 + ldr r1, =@08168C54 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08168C54: - .4byte _08168D44 - .4byte _08168F68 - .4byte _08168F78 - .4byte _08168F88 - .4byte _08168FF0 - .4byte _08168FF0 - .4byte _08168FF0 - .4byte _08168FF0 - .4byte _0816900C - .4byte _08169048 - .4byte _08169048 - .4byte _08169048 - .4byte _08169048 - .4byte _081693AA - .4byte _081693AA - .4byte _081693AA - .4byte _081693AA - .4byte _08169064 - .4byte _08169074 - .4byte _081690A4 - .4byte _081690B4 - .4byte _081690C4 - .4byte _081690D4 - .4byte _081690E4 - .4byte _081690F4 - .4byte _08169104 - .4byte _08169114 - .4byte _08169124 - .4byte _08169134 - .4byte _08169144 - .4byte _08169154 - .4byte _08169164 - .4byte _081691B4 - .4byte _081691C4 - .4byte _081691D4 - .4byte _081691E4 - .4byte _081691F4 - .4byte _08169204 - .4byte _08169214 - .4byte _08169224 - .4byte _08169234 - .4byte _08169268 - .4byte _08169278 - .4byte _08169288 - .4byte _08169298 - .4byte _081692A8 - .4byte _081692B8 - .4byte _081692C8 - .4byte _081692D8 - .4byte _081692F8 - .4byte _08169308 - .4byte _08169318 - .4byte _08169328 - .4byte _08169338 - .4byte _08169348 - .4byte _08169358 - .4byte _08169368 - .4byte _08169378 - .4byte _08169388 - .4byte _08169398 -_08168D44: +@08168C54: + .4byte @08168D44 + .4byte @08168F68 + .4byte @08168F78 + .4byte @08168F88 + .4byte @08168FF0 + .4byte @08168FF0 + .4byte @08168FF0 + .4byte @08168FF0 + .4byte @0816900C + .4byte @08169048 + .4byte @08169048 + .4byte @08169048 + .4byte @08169048 + .4byte @081693AA + .4byte @081693AA + .4byte @081693AA + .4byte @081693AA + .4byte @08169064 + .4byte @08169074 + .4byte @081690A4 + .4byte @081690B4 + .4byte @081690C4 + .4byte @081690D4 + .4byte @081690E4 + .4byte @081690F4 + .4byte @08169104 + .4byte @08169114 + .4byte @08169124 + .4byte @08169134 + .4byte @08169144 + .4byte @08169154 + .4byte @08169164 + .4byte @081691B4 + .4byte @081691C4 + .4byte @081691D4 + .4byte @081691E4 + .4byte @081691F4 + .4byte @08169204 + .4byte @08169214 + .4byte @08169224 + .4byte @08169234 + .4byte @08169268 + .4byte @08169278 + .4byte @08169288 + .4byte @08169298 + .4byte @081692A8 + .4byte @081692B8 + .4byte @081692C8 + .4byte @081692D8 + .4byte @081692F8 + .4byte @08169308 + .4byte @08169318 + .4byte @08169328 + .4byte @08169338 + .4byte @08169348 + .4byte @08169358 + .4byte @08169368 + .4byte @08169378 + .4byte @08169388 + .4byte @08169398 +@08168D44: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -696228,7 +696228,7 @@ _08168D44: str r0, [sp, 0x88] mov r8, r4 add r4, sp, 0xC -_08168D90: +@08168D90: adds r1, r6, 0 adds r1, 0xD mov r0, r8 @@ -696244,7 +696244,7 @@ _08168D90: adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble _08168D90 + ble @08168D90 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -696422,36 +696422,36 @@ _08168D90: bl pokemon_getattr mov r2, sp movs r6, 0 -_08168F48: +@08168F48: adds r0, r7, r6 adds r1, r2, r6 ldrb r1, [r1] strb r1, [r0] adds r6, 0x1 cmp r6, 0x57 - bls _08168F48 - b _081693AA + bls @08168F48 + b @081693AA .align 2, 0 .pool -_08168F68: +@08168F68: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB - b _081692E2 + b @081692E2 .align 2, 0 .pool -_08168F78: +@08168F78: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC - b _081692E2 + b @081692E2 .align 2, 0 .pool -_08168F88: +@08168F88: movs r6, 0 add r2, sp, 0x58 mov r9, r2 @@ -696463,7 +696463,7 @@ _08168F88: ldr r0, =0x020244ec adds r4, r1, r0 mov r8, r9 -_08168F9E: +@08168F9E: adds r1, r6, 0 adds r1, 0xD adds r0, r4, 0 @@ -696481,7 +696481,7 @@ _08168F9E: add r8, r0 adds r6, 0x1 cmp r6, 0x3 - ble _08168F9E + ble @08168F9E movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -696492,18 +696492,18 @@ _08168F9E: strb r0, [r1, 0xC] mov r2, r9 movs r6, 0 -_08168FDC: +@08168FDC: adds r0, r7, r6 adds r1, r2, r6 ldrb r1, [r1] strb r1, [r0] adds r6, 0x1 cmp r6, 0xF - bls _08168FDC - b _081693AA + bls @08168FDC + b @081693AA .align 2, 0 .pool -_08168FF0: +@08168FF0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -696514,17 +696514,17 @@ _08168FF0: adds r1, r2 ldrb r1, [r1] adds r1, 0x9 - b _081692E2 + b @081692E2 .align 2, 0 .pool -_0816900C: +@0816900C: movs r6, 0 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 ldr r2, =0x020244ec mov r8, r2 -_08169018: +@08169018: adds r1, r6, 0 adds r1, 0x11 mov r2, r8 @@ -696534,7 +696534,7 @@ _08169018: strb r0, [r1] adds r6, 0x1 cmp r6, 0x3 - ble _08169018 + ble @08169018 movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -696544,10 +696544,10 @@ _08169018: adds r1, r7, r6 strb r0, [r1] adds r6, 0x1 - b _081693AA + b @081693AA .align 2, 0 .pool -_08169048: +@08169048: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -696558,25 +696558,25 @@ _08169048: adds r1, r2 ldrb r1, [r1] adds r1, 0x8 - b _081693A2 + b @081693A2 .align 2, 0 .pool -_08169064: +@08169064: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1 - b _0816907E + b @0816907E .align 2, 0 .pool -_08169074: +@08169074: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x19 -_0816907E: +@0816907E: bl pokemon_getattr adds r1, r0, 0 strb r1, [r7] @@ -696591,118 +696591,118 @@ _0816907E: lsrs r0, 16 strb r0, [r7, 0x2] movs r6, 0x3 - b _081693AA + b @081693AA .align 2, 0 .pool -_081690A4: +@081690A4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1A - b _081693A2 + b @081693A2 .align 2, 0 .pool -_081690B4: +@081690B4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1B - b _081693A2 + b @081693A2 .align 2, 0 .pool -_081690C4: +@081690C4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1C - b _081693A2 + b @081693A2 .align 2, 0 .pool -_081690D4: +@081690D4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1D - b _081693A2 + b @081693A2 .align 2, 0 .pool -_081690E4: +@081690E4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1E - b _081693A2 + b @081693A2 .align 2, 0 .pool -_081690F4: +@081690F4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1F - b _081693A2 + b @081693A2 .align 2, 0 .pool -_08169104: +@08169104: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x20 - b _081693A2 + b @081693A2 .align 2, 0 .pool -_08169114: +@08169114: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x22 - b _081693A2 + b @081693A2 .align 2, 0 .pool -_08169124: +@08169124: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x23 - b _081693A2 + b @081693A2 .align 2, 0 .pool -_08169134: +@08169134: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x24 - b _081693A2 + b @081693A2 .align 2, 0 .pool -_08169144: +@08169144: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x25 - b _081693A2 + b @081693A2 .align 2, 0 .pool -_08169154: +@08169154: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x26 - b _081693A2 + b @081693A2 .align 2, 0 .pool -_08169164: +@08169164: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -696733,88 +696733,88 @@ _08169164: bl pokemon_getattr strb r0, [r7, 0x5] movs r6, 0x6 - b _081693AA + b @081693AA .align 2, 0 .pool -_081691B4: +@081691B4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x27 - b _081693A2 + b @081693A2 .align 2, 0 .pool -_081691C4: +@081691C4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x28 - b _081693A2 + b @081693A2 .align 2, 0 .pool -_081691D4: +@081691D4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x29 - b _081693A2 + b @081693A2 .align 2, 0 .pool -_081691E4: +@081691E4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2A - b _081693A2 + b @081693A2 .align 2, 0 .pool -_081691F4: +@081691F4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2B - b _081693A2 + b @081693A2 .align 2, 0 .pool -_08169204: +@08169204: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2C - b _081693A2 + b @081693A2 .align 2, 0 .pool -_08169214: +@08169214: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0 - b _0816923E + b @0816923E .align 2, 0 .pool -_08169224: +@08169224: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x9 - b _081692E2 + b @081692E2 .align 2, 0 .pool -_08169234: +@08169234: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x37 -_0816923E: +@0816923E: bl pokemon_getattr adds r1, r0, 0 strb r1, [r7] @@ -696831,79 +696831,79 @@ _0816923E: lsrs r0, r1, 24 strb r0, [r7, 0x3] movs r6, 0x4 - b _081693AA + b @081693AA .align 2, 0 .pool -_08169268: +@08169268: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x38 - b _081693A2 + b @081693A2 .align 2, 0 .pool -_08169278: +@08169278: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x39 - b _081692E2 + b @081692E2 .align 2, 0 .pool -_08169288: +@08169288: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3A - b _081692E2 + b @081692E2 .align 2, 0 .pool -_08169298: +@08169298: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3B - b _081692E2 + b @081692E2 .align 2, 0 .pool -_081692A8: +@081692A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3C - b _081692E2 + b @081692E2 .align 2, 0 .pool -_081692B8: +@081692B8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3D - b _081692E2 + b @081692E2 .align 2, 0 .pool -_081692C8: +@081692C8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3E - b _081692E2 + b @081692E2 .align 2, 0 .pool -_081692D8: +@081692D8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3F -_081692E2: +@081692E2: bl pokemon_getattr lsls r0, 16 lsrs r0, 16 @@ -696911,110 +696911,110 @@ _081692E2: lsrs r0, 8 strb r0, [r7, 0x1] movs r6, 0x2 - b _081693AA + b @081693AA .align 2, 0 .pool -_081692F8: +@081692F8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x16 - b _081693A2 + b @081693A2 .align 2, 0 .pool -_08169308: +@08169308: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x17 - b _081693A2 + b @081693A2 .align 2, 0 .pool -_08169318: +@08169318: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x18 - b _081693A2 + b @081693A2 .align 2, 0 .pool -_08169328: +@08169328: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x21 - b _081693A2 + b @081693A2 .align 2, 0 .pool -_08169338: +@08169338: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2F - b _081693A2 + b @081693A2 .align 2, 0 .pool -_08169348: +@08169348: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x30 - b _081693A2 + b @081693A2 .align 2, 0 .pool -_08169358: +@08169358: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x32 - b _081693A2 + b @081693A2 .align 2, 0 .pool -_08169368: +@08169368: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x33 - b _081693A2 + b @081693A2 .align 2, 0 .pool -_08169378: +@08169378: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x34 - b _081693A2 + b @081693A2 .align 2, 0 .pool -_08169388: +@08169388: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x35 - b _081693A2 + b @081693A2 .align 2, 0 .pool -_08169398: +@08169398: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x36 -_081693A2: +@081693A2: bl pokemon_getattr strb r0, [r7] movs r6, 0x1 -_081693AA: +@081693AA: adds r0, r6, 0 add sp, 0x90 pop {r3-r5} @@ -697029,7 +697029,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} @@ -697037,7 +697037,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 @@ -697047,33 +697047,33 @@ sub_81693CC: @ 81693CC adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0 - bne _081693FC + bne @081693FC ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] bl sub_8169424 - b _0816941A + b @0816941A .align 2, 0 .pool -_081693FC: +@081693FC: ldrb r4, [r1] movs r5, 0 -_08169400: +@08169400: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _0816940E + beq @0816940E adds r0, r5, 0 bl sub_8169424 -_0816940E: +@0816940E: lsrs r4, 1 adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls _08169400 -_0816941A: + bls @08169400 +@0816941A: bl dp01_tbl5_exec_completed pop {r4,r5} pop {r0} @@ -697081,7 +697081,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 @@ -697101,79 +697101,79 @@ sub_8169424: @ 8169424 ldrb r0, [r0] adds r7, r2, 0 cmp r0, 0x3B - bls _08169450 - bl _08169DEA -_08169450: + bls @08169450 + bl @08169DEA +@08169450: lsls r0, 2 - ldr r1, =_08169468 + ldr r1, =@08169468 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08169468: - .4byte _08169558 - .4byte _081696F0 - .4byte _08169710 - .4byte _08169730 - .4byte _08169788 - .4byte _08169788 - .4byte _08169788 - .4byte _08169788 - .4byte _081697B0 - .4byte _08169814 - .4byte _08169814 - .4byte _08169814 - .4byte _08169814 - .4byte _08169DEA - .4byte _08169DEA - .4byte _08169DEA - .4byte _08169DEA - .4byte _08169844 - .4byte _08169864 - .4byte _08169884 - .4byte _081698A4 - .4byte _081698C4 - .4byte _081698E4 - .4byte _08169904 - .4byte _08169924 - .4byte _08169944 - .4byte _08169964 - .4byte _08169984 - .4byte _081699A4 - .4byte _081699C4 - .4byte _081699E4 - .4byte _08169A04 - .4byte _08169A74 - .4byte _08169A94 - .4byte _08169AB4 - .4byte _08169AD4 - .4byte _08169AF4 - .4byte _08169B14 - .4byte _08169B34 - .4byte _08169B54 - .4byte _08169B74 - .4byte _08169B94 - .4byte _08169BB4 - .4byte _08169BD4 - .4byte _08169BF4 - .4byte _08169C14 - .4byte _08169C34 - .4byte _08169C54 - .4byte _08169C74 - .4byte _08169C94 - .4byte _08169CB4 - .4byte _08169CD4 - .4byte _08169CF4 - .4byte _08169D14 - .4byte _08169D34 - .4byte _08169D54 - .4byte _08169D74 - .4byte _08169D94 - .4byte _08169DB4 - .4byte _08169DD4 -_08169558: +@08169468: + .4byte @08169558 + .4byte @081696F0 + .4byte @08169710 + .4byte @08169730 + .4byte @08169788 + .4byte @08169788 + .4byte @08169788 + .4byte @08169788 + .4byte @081697B0 + .4byte @08169814 + .4byte @08169814 + .4byte @08169814 + .4byte @08169814 + .4byte @08169DEA + .4byte @08169DEA + .4byte @08169DEA + .4byte @08169DEA + .4byte @08169844 + .4byte @08169864 + .4byte @08169884 + .4byte @081698A4 + .4byte @081698C4 + .4byte @081698E4 + .4byte @08169904 + .4byte @08169924 + .4byte @08169944 + .4byte @08169964 + .4byte @08169984 + .4byte @081699A4 + .4byte @081699C4 + .4byte @081699E4 + .4byte @08169A04 + .4byte @08169A74 + .4byte @08169A94 + .4byte @08169AB4 + .4byte @08169AD4 + .4byte @08169AF4 + .4byte @08169B14 + .4byte @08169B34 + .4byte @08169B54 + .4byte @08169B74 + .4byte @08169B94 + .4byte @08169BB4 + .4byte @08169BD4 + .4byte @08169BF4 + .4byte @08169C14 + .4byte @08169C34 + .4byte @08169C54 + .4byte @08169C74 + .4byte @08169C94 + .4byte @08169CB4 + .4byte @08169CD4 + .4byte @08169CF4 + .4byte @08169D14 + .4byte @08169D34 + .4byte @08169D54 + .4byte @08169D74 + .4byte @08169D94 + .4byte @08169DB4 + .4byte @08169DD4 +@08169558: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -697223,7 +697223,7 @@ _08169558: adds r7, 0x24 adds r4, r6, 0 adds r4, 0xC -_081695BE: +@081695BE: mov r1, r8 adds r1, 0xD mov r0, r9 @@ -697240,7 +697240,7 @@ _081695BE: add r8, r0 mov r0, r8 cmp r0, 0x3 - ble _081695BE + ble @081695BE movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -697352,10 +697352,10 @@ _081695BE: movs r1, 0x3F ldr r2, [sp, 0x14] bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_081696F0: +@081696F0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697366,10 +697366,10 @@ _081696F0: adds r2, r7 movs r1, 0xB bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169710: +@08169710: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697380,10 +697380,10 @@ _08169710: adds r2, r7 movs r1, 0xC bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169730: +@08169730: movs r0, 0 mov r8, r0 movs r0, 0xC @@ -697397,7 +697397,7 @@ _08169730: adds r6, r3, 0 adds r6, 0x8 adds r4, r3, 0 -_0816974A: +@0816974A: mov r1, r8 adds r1, 0xD adds r0, r7, 0 @@ -697414,7 +697414,7 @@ _0816974A: add r8, r0 mov r0, r8 cmp r0, 0x3 - ble _0816974A + ble @0816974A movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697422,10 +697422,10 @@ _0816974A: movs r1, 0x15 mov r2, r9 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169788: +@08169788: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697438,10 +697438,10 @@ _08169788: adds r1, r2, r1 ldrb r1, [r1] adds r1, 0x9 - b _0816982C + b @0816982C .align 2, 0 .pool -_081697B0: +@081697B0: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -697482,10 +697482,10 @@ _081697B0: adds r0, r4, 0 movs r1, 0x15 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169814: +@08169814: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697498,14 +697498,14 @@ _08169814: adds r1, r2, r1 ldrb r1, [r1] adds r1, 0x8 -_0816982C: +@0816982C: adds r3, 0x3 adds r2, r3 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169844: +@08169844: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697516,10 +697516,10 @@ _08169844: adds r2, r7 movs r1, 0x1 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169864: +@08169864: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697530,10 +697530,10 @@ _08169864: adds r2, r7 movs r1, 0x19 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169884: +@08169884: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697544,10 +697544,10 @@ _08169884: adds r2, r7 movs r1, 0x1A bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_081698A4: +@081698A4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697558,10 +697558,10 @@ _081698A4: adds r2, r7 movs r1, 0x1B bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_081698C4: +@081698C4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697572,10 +697572,10 @@ _081698C4: adds r2, r7 movs r1, 0x1C bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_081698E4: +@081698E4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697586,10 +697586,10 @@ _081698E4: adds r2, r7 movs r1, 0x1D bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169904: +@08169904: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697600,10 +697600,10 @@ _08169904: adds r2, r7 movs r1, 0x1E bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169924: +@08169924: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697614,10 +697614,10 @@ _08169924: adds r2, r7 movs r1, 0x1F bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169944: +@08169944: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697628,10 +697628,10 @@ _08169944: adds r2, r7 movs r1, 0x20 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169964: +@08169964: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697642,10 +697642,10 @@ _08169964: adds r2, r7 movs r1, 0x22 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169984: +@08169984: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697656,10 +697656,10 @@ _08169984: adds r2, r7 movs r1, 0x23 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_081699A4: +@081699A4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697670,10 +697670,10 @@ _081699A4: adds r2, r7 movs r1, 0x24 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_081699C4: +@081699C4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697684,10 +697684,10 @@ _081699C4: adds r2, r7 movs r1, 0x25 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_081699E4: +@081699E4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697698,10 +697698,10 @@ _081699E4: adds r2, r7 movs r1, 0x26 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169A04: +@08169A04: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -697747,10 +697747,10 @@ _08169A04: adds r0, r7, 0x5 adds r2, r0 adds r0, r4, 0 - b _08169B24 + b @08169B24 .align 2, 0 .pool -_08169A74: +@08169A74: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697761,10 +697761,10 @@ _08169A74: adds r2, r7 movs r1, 0x27 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169A94: +@08169A94: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697775,10 +697775,10 @@ _08169A94: adds r2, r7 movs r1, 0x28 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169AB4: +@08169AB4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697789,10 +697789,10 @@ _08169AB4: adds r2, r7 movs r1, 0x29 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169AD4: +@08169AD4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697803,10 +697803,10 @@ _08169AD4: adds r2, r7 movs r1, 0x2A bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169AF4: +@08169AF4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697817,10 +697817,10 @@ _08169AF4: adds r2, r7 movs r1, 0x2B bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169B14: +@08169B14: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697829,13 +697829,13 @@ _08169B14: ldrb r2, [r1] lsls r2, 9 adds r2, r7 -_08169B24: +@08169B24: movs r1, 0x2C bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169B34: +@08169B34: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697846,10 +697846,10 @@ _08169B34: adds r2, r7 movs r1, 0 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169B54: +@08169B54: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697860,10 +697860,10 @@ _08169B54: adds r2, r7 movs r1, 0x9 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169B74: +@08169B74: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697874,10 +697874,10 @@ _08169B74: adds r2, r7 movs r1, 0x37 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169B94: +@08169B94: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697888,10 +697888,10 @@ _08169B94: adds r2, r7 movs r1, 0x38 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169BB4: +@08169BB4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697902,10 +697902,10 @@ _08169BB4: adds r2, r7 movs r1, 0x39 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169BD4: +@08169BD4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697916,10 +697916,10 @@ _08169BD4: adds r2, r7 movs r1, 0x3A bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169BF4: +@08169BF4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697930,10 +697930,10 @@ _08169BF4: adds r2, r7 movs r1, 0x3B bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169C14: +@08169C14: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697944,10 +697944,10 @@ _08169C14: adds r2, r7 movs r1, 0x3C bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169C34: +@08169C34: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697958,10 +697958,10 @@ _08169C34: adds r2, r7 movs r1, 0x3D bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169C54: +@08169C54: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697972,10 +697972,10 @@ _08169C54: adds r2, r7 movs r1, 0x3E bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169C74: +@08169C74: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -697986,10 +697986,10 @@ _08169C74: adds r2, r7 movs r1, 0x3F bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169C94: +@08169C94: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -698000,10 +698000,10 @@ _08169C94: adds r2, r7 movs r1, 0x16 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169CB4: +@08169CB4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -698014,10 +698014,10 @@ _08169CB4: adds r2, r7 movs r1, 0x17 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169CD4: +@08169CD4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -698028,10 +698028,10 @@ _08169CD4: adds r2, r7 movs r1, 0x18 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169CF4: +@08169CF4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -698042,10 +698042,10 @@ _08169CF4: adds r2, r7 movs r1, 0x21 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169D14: +@08169D14: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -698056,10 +698056,10 @@ _08169D14: adds r2, r7 movs r1, 0x2F bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169D34: +@08169D34: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -698070,10 +698070,10 @@ _08169D34: adds r2, r7 movs r1, 0x30 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169D54: +@08169D54: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -698084,10 +698084,10 @@ _08169D54: adds r2, r7 movs r1, 0x32 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169D74: +@08169D74: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -698098,10 +698098,10 @@ _08169D74: adds r2, r7 movs r1, 0x33 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169D94: +@08169D94: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -698112,10 +698112,10 @@ _08169D94: adds r2, r7 movs r1, 0x34 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169DB4: +@08169DB4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -698126,10 +698126,10 @@ _08169DB4: adds r2, r7 movs r1, 0x35 bl pokemon_setattr - b _08169DEA + b @08169DEA .align 2, 0 .pool -_08169DD4: +@08169DD4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -698140,7 +698140,7 @@ _08169DD4: adds r2, r7 movs r1, 0x36 bl pokemon_setattr -_08169DEA: +@08169DEA: ldr r2, =0x0202406e ldr r0, =0x02024064 ldrb r1, [r0] @@ -698165,7 +698165,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} @@ -698173,7 +698173,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} @@ -698181,7 +698181,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} @@ -698189,7 +698189,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 @@ -698199,7 +698199,7 @@ sub_8169E44: @ 8169E44 adds r1, r0 ldrb r0, [r1] cmp r0, 0 - bne _08169E80 + bne @08169E80 adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x1 @@ -698210,10 +698210,10 @@ sub_8169E44: @ 8169E44 adds r1, r0 ldr r0, =sub_8168A20 + 1 str r0, [r1] - b _08169EB6 + b @08169EB6 .align 2, 0 .pool -_08169E80: +@08169E80: ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] @@ -698237,7 +698237,7 @@ _08169E80: ldrb r0, [r0] bl sub_8072984 bl dp01_tbl5_exec_completed -_08169EB6: +@08169EB6: pop {r4-r6} pop {r0} bx r0 @@ -698246,7 +698246,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] @@ -698332,7 +698332,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] @@ -698418,7 +698418,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} @@ -698426,7 +698426,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} @@ -698434,7 +698434,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} @@ -698442,7 +698442,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] @@ -698477,7 +698477,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 @@ -698517,7 +698517,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} @@ -698525,7 +698525,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 @@ -698627,12 +698627,12 @@ sub_816A144: @ 816A144 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq _0816A23C + beq @0816A23C bl dp01_tbl5_exec_completed - b _0816A25A + b @0816A25A .align 2, 0 .pool -_0816A23C: +@0816A23C: ldr r0, =0x020244d0 ldr r0, [r0] ldrb r1, [r6] @@ -698648,7 +698648,7 @@ _0816A23C: adds r0, r1 ldr r1, =bx_move_anim_5 + 1 str r1, [r0] -_0816A25A: +@0816A25A: pop {r4-r6} pop {r0} bx r0 @@ -698657,7 +698657,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 @@ -698685,21 +698685,21 @@ bx_move_anim_5: @ 816A26C adds r0, r1 ldrb r2, [r0, 0x4] cmp r2, 0x1 - beq _0816A2F6 + beq @0816A2F6 cmp r2, 0x1 - bgt _0816A2BC + bgt @0816A2BC cmp r2, 0 - beq _0816A2C6 - b _0816A3AC + beq @0816A2C6 + b @0816A3AC .align 2, 0 .pool -_0816A2BC: +@0816A2BC: cmp r2, 0x2 - beq _0816A320 + beq @0816A320 cmp r2, 0x3 - beq _0816A370 - b _0816A3AC -_0816A2C6: + beq @0816A370 + b @0816A3AC +@0816A2C6: ldr r1, [r5] lsls r0, r3, 2 adds r0, r1 @@ -698707,13 +698707,13 @@ _0816A2C6: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0816A2E2 + beq @0816A2E2 adds r0, r3, 0 adds r1, r3, 0 adds r2, r3, 0 movs r3, 0x5 bl move_anim_start_t4 -_0816A2E2: +@0816A2E2: ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -698723,13 +698723,13 @@ _0816A2E2: adds r0, r2 movs r1, 0x1 strb r1, [r0, 0x4] - b _0816A3AC -_0816A2F6: + b @0816A3AC +@0816A2F6: ldrb r1, [r0] movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _0816A3AC + bne @0816A3AC movs r0, 0 bl sub_805EB9C adds r0, r4, 0 @@ -698743,15 +698743,15 @@ _0816A2F6: adds r0, r2 movs r1, 0x2 strb r1, [r0, 0x4] - b _0816A3AC -_0816A320: + b @0816A3AC +@0816A320: ldr r0, =0x020383f8 ldr r0, [r0] bl _call_via_r0 ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 - bne _0816A3AC + bne @0816A3AC movs r0, 0x1 bl sub_805EB9C ldr r0, [r7] @@ -698763,12 +698763,12 @@ _0816A320: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0816A354 + beq @0816A354 adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x6 bl move_anim_start_t4 -_0816A354: +@0816A354: ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -698778,17 +698778,17 @@ _0816A354: adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x4] - b _0816A3AC + b @0816A3AC .align 2, 0 .pool -_0816A370: +@0816A370: ldrb r1, [r0] movs r0, 0x40 ands r0, r1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _0816A3AC + bne @0816A3AC bl sub_805E394 ldrb r0, [r6] lsls r2, r0, 9 @@ -698809,7 +698809,7 @@ _0816A370: adds r0, r2 strb r4, [r0, 0x4] bl dp01_tbl5_exec_completed -_0816A3AC: +@0816A3AC: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -698819,7 +698819,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 @@ -698850,33 +698850,33 @@ 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] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0816A428 + bne @0816A428 bl sub_816A3B8 - b _0816A42C + b @0816A42C .align 2, 0 .pool -_0816A428: +@0816A428: bl dp01_tbl5_exec_completed -_0816A42C: +@0816A42C: pop {r0} bx r0 thumb_func_end dp01t_11_5_message_for_player_only thumb_func_start sub_816A430 -sub_816A430: @ 816A430 +sub_816A430: ; 816A430 push {lr} bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _0816A456 + bne @0816A456 ldr r0, =0x02022e14 strh r1, [r0] ldr r1, =0x02022e16 @@ -698889,7 +698889,7 @@ sub_816A430: @ 816A430 adds r0, r1 ldr r1, =sub_8168444 + 1 str r1, [r0] -_0816A456: +@0816A456: pop {r0} bx r0 .align 2, 0 @@ -698897,7 +698897,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 @@ -698910,13 +698910,13 @@ dp01t_12_1_battle_menu: @ 816A470 movs r1, 0x2 bl battle_show_message_maybe movs r4, 0 -_0816A48A: +@0816A48A: lsls r0, r4, 24 lsrs r0, 24 bl sub_8059CF8 adds r4, 0x1 cmp r4, 0x3 - ble _0816A48A + ble @0816A48A ldr r1, =0x020244ac ldr r0, =0x02024064 ldrb r0, [r0] @@ -698937,7 +698937,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} @@ -698945,7 +698945,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] @@ -698953,19 +698953,19 @@ sub_816A4E4: @ 816A4E4 adds r0, 0x95 ldrb r0, [r0] cmp r0, 0x1 - beq _0816A522 + beq @0816A522 cmp r0, 0x1 - bgt _0816A504 + bgt @0816A504 cmp r0, 0 - beq _0816A50A - b _0816A574 + beq @0816A50A + b @0816A574 .align 2, 0 .pool -_0816A504: +@0816A504: cmp r0, 0x2 - beq _0816A550 - b _0816A574 -_0816A50A: + beq @0816A550 + b @0816A574 +@0816A50A: bl sub_805C210 ldr r1, [r4] adds r1, 0x95 @@ -698976,13 +698976,13 @@ _0816A50A: adds r0, 0x97 movs r1, 0x50 strb r1, [r0] - b _0816A574 -_0816A522: + b @0816A574 +@0816A522: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _0816A574 + bne @0816A574 ldr r0, =0x02022e14 strh r1, [r0] ldr r1, =0x02022e16 @@ -698995,17 +698995,17 @@ _0816A522: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0816A574 + b @0816A574 .align 2, 0 .pool -_0816A550: +@0816A550: adds r1, 0x97 ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] lsls r0, 24 cmp r0, 0 - bne _0816A574 + bne @0816A574 movs r0, 0x5 bl audio_play movs r2, 0x80 @@ -699014,14 +699014,14 @@ _0816A550: movs r1, 0xA bl dp01_build_cmdbuf_x21_a_bb bl dp01_tbl5_exec_completed -_0816A574: +@0816A574: pop {r4} pop {r0} bx r0 thumb_func_end sub_816A4E4 thumb_func_start sub_816A57C -sub_816A57C: @ 816A57C +sub_816A57C: ; 816A57C push {lr} sub sp, 0x4 movs r0, 0x1 @@ -699049,7 +699049,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} @@ -699057,7 +699057,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} @@ -699065,7 +699065,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 @@ -699090,7 +699090,7 @@ sub_816A5D4: @ 816A5D4 asrs r7, r1, 16 ldr r0, =0x00007fff cmp r7, r0 - beq _0816A664 + beq @0816A664 ldr r6, =0x0202406e lsls r0, r4, 1 adds r0, r6 @@ -699120,10 +699120,10 @@ sub_816A5D4: @ 816A5D4 str r7, [sp] mov r2, r8 bl sub_807294C - b _0816A69E + b @0816A69E .align 2, 0 .pool -_0816A664: +@0816A664: ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -699150,7 +699150,7 @@ _0816A664: movs r1, 0 movs r2, 0 bl heathbar_draw_hp -_0816A69E: +@0816A69E: ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -699170,7 +699170,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} @@ -699178,7 +699178,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} @@ -699186,7 +699186,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} @@ -699194,7 +699194,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} @@ -699202,7 +699202,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} @@ -699210,7 +699210,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} @@ -699218,7 +699218,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} @@ -699226,7 +699226,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} @@ -699234,7 +699234,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} @@ -699242,7 +699242,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} @@ -699250,7 +699250,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} @@ -699258,7 +699258,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} @@ -699266,7 +699266,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} @@ -699274,7 +699274,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} @@ -699282,7 +699282,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} @@ -699290,7 +699290,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} @@ -699298,7 +699298,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 @@ -699314,12 +699314,12 @@ sub_816A794: @ 816A794 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - bge _0816A7C8 + bge @0816A7C8 bl dp01_tbl5_exec_completed - b _0816A7F2 + b @0816A7F2 .align 2, 0 .pool -_0816A7C8: +@0816A7C8: ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] @@ -699340,7 +699340,7 @@ _0816A7C8: adds r0, r1 ldr r1, =bx_blink_t5 + 1 str r1, [r0] -_0816A7F2: +@0816A7F2: pop {r4} pop {r0} bx r0 @@ -699349,7 +699349,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} @@ -699357,7 +699357,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 @@ -699380,7 +699380,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 @@ -699390,7 +699390,7 @@ sub_816A840: @ 816A840 adds r0, r3, r0 ldrb r0, [r0] cmp r0, 0 - beq _0816A87C + beq @0816A87C bl sub_805EA60 ldrb r1, [r5] lsls r1, 9 @@ -699403,10 +699403,10 @@ sub_816A840: @ 816A840 lsls r1, 8 orrs r0, r1 bl song_play_for_text - b _0816A890 + b @0816A890 .align 2, 0 .pool -_0816A87C: +@0816A87C: adds r0, r4, 0x1 adds r0, r3, r0 ldrb r0, [r0] @@ -699416,7 +699416,7 @@ _0816A87C: lsls r1, 8 orrs r0, r1 bl fanfare_play -_0816A890: +@0816A890: bl dp01_tbl5_exec_completed pop {r4,r5} pop {r0} @@ -699424,7 +699424,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 @@ -699450,7 +699450,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 @@ -699473,7 +699473,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 @@ -699598,7 +699598,7 @@ sub_816A90C: @ 816A90C movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0816AA24 + beq @0816AA24 ldr r0, =0x020244b4 adds r0, r2, r0 ldrb r1, [r0] @@ -699608,7 +699608,7 @@ sub_816A90C: @ 816A90C adds r0, r4 ldr r1, =sub_8073C30 + 1 str r1, [r0] -_0816AA24: +@0816AA24: ldr r0, [r3] ldr r2, [r0, 0x8] ldrb r0, [r2, 0x9] @@ -699629,7 +699629,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 @@ -699796,7 +699796,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 @@ -699809,13 +699809,13 @@ sub_816AC04: @ 816AC04 movs r3, 0xA ldrsh r0, [r1, r3] cmp r0, 0x1E - bgt _0816AC28 + bgt @0816AC28 adds r0, r2, 0x1 strh r0, [r1, 0xA] - b _0816AC5E + b @0816AC5E .align 2, 0 .pool -_0816AC28: +@0816AC28: ldr r4, =0x02024064 ldrb r5, [r4] ldrh r0, [r1, 0x8] @@ -699841,7 +699841,7 @@ _0816AC28: strb r5, [r4] adds r0, r6, 0 bl remove_task -_0816AC5E: +@0816AC5E: pop {r4-r6} pop {r0} bx r0 @@ -699850,7 +699850,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 @@ -699860,17 +699860,17 @@ sub_816AC78: @ 816AC78 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _0816ACA8 + beq @0816ACA8 adds r0, r2, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0816ACA8 + bne @0816ACA8 bl dp01_tbl5_exec_completed - b _0816ACE6 + b @0816ACE6 .align 2, 0 .pool -_0816ACA8: +@0816ACA8: ldr r0, =0x020244d0 ldr r0, [r0] ldr r5, =0x02024064 @@ -699900,7 +699900,7 @@ _0816ACA8: adds r1, r2 strb r0, [r1] bl dp01_tbl5_exec_completed -_0816ACE6: +@0816ACE6: pop {r4,r5} pop {r0} bx r0 @@ -699909,7 +699909,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} @@ -699917,7 +699917,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} @@ -699925,7 +699925,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} @@ -699933,7 +699933,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 @@ -699957,19 +699957,19 @@ sub_816AD20: @ 816AD20 bl move_anim_start_t3 lsls r0, 24 cmp r0, 0 - beq _0816AD60 + beq @0816AD60 bl dp01_tbl5_exec_completed - b _0816AD6C + b @0816AD6C .align 2, 0 .pool -_0816AD60: +@0816AD60: ldr r0, =0x03005d60 ldrb r1, [r6] lsls r1, 2 adds r1, r0 ldr r0, =sub_8168AC8 + 1 str r0, [r1] -_0816AD6C: +@0816AD6C: add sp, 0x4 pop {r4-r6} pop {r0} @@ -699979,7 +699979,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} @@ -699987,7 +699987,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} @@ -699995,7 +699995,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 @@ -700016,14 +700016,14 @@ sub_816AD94: @ 816AD94 movs r1, 0x6 ands r0, r1 cmp r0, 0x2 - bne _0816ADD0 + bne @0816ADD0 ldr r0, =0x03005d60 ldrb r1, [r4] lsls r1, 2 adds r1, r0 ldr r0, =sub_80587B0 + 1 str r0, [r1] -_0816ADD0: +@0816ADD0: pop {r4} pop {r0} bx r0 @@ -700032,12 +700032,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 @@ -700050,13 +700050,13 @@ sub_816ADF4: @ 816ADF4 ldr r1, =0x085dfefc ldrh r0, [r1] cmp r0, 0 - beq _0816AE48 + beq @0816AE48 ldrh r0, [r1, 0x2] cmp r0, 0 - beq _0816AE48 + beq @0816AE48 adds r5, r1, 0 adds r6, r5, 0x2 -_0816AE1A: +@0816AE1A: lsls r1, r4, 2 adds r0, r1, r5 ldrh r0, [r0] @@ -700066,7 +700066,7 @@ _0816AE1A: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0816AE48 + bne @0816AE48 adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -700074,12 +700074,12 @@ _0816AE1A: adds r0, r1, r5 ldrh r0, [r0] cmp r0, 0 - beq _0816AE48 + beq @0816AE48 adds r0, r1, r6 ldrh r0, [r0] cmp r0, 0 - bne _0816AE1A -_0816AE48: + bne @0816AE1A +@0816AE48: pop {r4-r6} pop {r0} bx r0 @@ -700088,7 +700088,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, =0x085dfed4 @@ -700111,7 +700111,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, =0x085dfed8 @@ -700134,7 +700134,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} @@ -700150,18 +700150,18 @@ sub_816AED8: @ 816AED8 ldrb r1, [r0] mov r8, r0 cmp r1, 0x3 - bne _0816AF0C + bne @0816AF0C ldr r0, =0x085dff24 ldr r1, [r0, 0x4] ldr r0, [r0] - b _0816AF12 + b @0816AF12 .align 2, 0 .pool -_0816AF0C: +@0816AF0C: ldr r0, =0x085dff24 ldr r1, [r0, 0xC] ldr r0, [r0, 0x8] -_0816AF12: +@0816AF12: str r0, [sp] str r1, [sp, 0x4] ldr r5, =0x085dfeb4 @@ -700215,7 +700215,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 @@ -700227,14 +700227,14 @@ sub_816AF98: @ 816AF98 ldr r0, =0x0203bcb4 ldrb r0, [r0] cmp r0, 0x3 - bls _0816AFC0 + bls @0816AFC0 bl ProcessMenuInput - b _0816AFC4 + b @0816AFC4 .align 2, 0 .pool -_0816AFC0: +@0816AFC0: bl ProcessMenuInputNoWrapAround -_0816AFC4: +@0816AFC4: lsls r0, 24 lsrs r0, 24 lsls r0, 24 @@ -700242,10 +700242,10 @@ _0816AFC4: movs r0, 0x2 negs r0, r0 cmp r5, r0 - beq _0816B04C + beq @0816B04C adds r0, 0x1 cmp r5, r0 - bne _0816B014 + bne @0816B014 movs r0, 0x5 bl audio_play ldrb r0, [r4, 0x8] @@ -700264,10 +700264,10 @@ _0816AFC4: adds r0, r1 ldr r1, =sub_816B148 + 1 str r1, [r0] - b _0816B04C + b @0816B04C .align 2, 0 .pool -_0816B014: +@0816B014: ldrb r0, [r4, 0x8] movs r1, 0 bl sub_8198070 @@ -700292,7 +700292,7 @@ _0816B014: adds r0, r2 ldr r0, [r0] str r0, [r1] -_0816B04C: +@0816B04C: pop {r4-r6} pop {r0} bx r0 @@ -700301,7 +700301,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 @@ -700315,7 +700315,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 @@ -700338,7 +700338,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 @@ -700349,15 +700349,15 @@ sub_816B0A8: @ 816B0A8 strb r0, [r5, 0x5] lsls r0, 24 cmp r0, 0 - bne _0816B0D8 + bne @0816B0D8 ldr r1, =0x085eac4b ldr r2, =sub_816B060 + 1 adds r0, r4, 0 bl sub_81978EC - b _0816B12A + b @0816B12A .align 2, 0 .pool -_0816B0D8: +@0816B0D8: strh r1, [r5] strh r1, [r5, 0x2] movs r0, 0xFF @@ -700370,7 +700370,7 @@ _0816B0D8: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0816B120 + bne @0816B120 movs r0, 0 movs r1, 0 bl sub_8197434 @@ -700383,15 +700383,15 @@ _0816B0D8: adds r1, r0 ldr r0, =sub_816B674 + 1 str r0, [r1] - b _0816B12A + b @0816B12A .align 2, 0 .pool -_0816B120: +@0816B120: ldr r1, =0x085eac4b ldr r2, =sub_816B060 + 1 adds r0, r6, 0 bl sub_81978EC -_0816B12A: +@0816B12A: pop {r4-r6} pop {r0} bx r0 @@ -700400,7 +700400,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 @@ -700410,33 +700410,33 @@ 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 ldr r0, =0x0203bcb4 ldrb r0, [r0] cmp r0, 0x4 - bne _0816B180 + bne @0816B180 ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - bne _0816B174 + bne @0816B174 ldr r0, =0x081f863f bl script_env_1_execute_new_script - b _0816B184 + b @0816B184 .align 2, 0 .pool -_0816B174: +@0816B174: ldr r0, =0x081f958f bl script_env_1_execute_new_script - b _0816B184 + b @0816B184 .align 2, 0 .pool -_0816B180: +@0816B180: bl script_env_2_enable_and_set_ctx_running -_0816B184: +@0816B184: adds r0, r4, 0 bl remove_task pop {r4} @@ -700445,7 +700445,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 @@ -700504,7 +700504,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 @@ -700527,7 +700527,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 @@ -700546,10 +700546,10 @@ sub_816B248: @ 816B248 movs r0, 0x2 negs r0, r0 cmp r4, r0 - beq _0816B298 + beq @0816B298 adds r0, 0x1 cmp r4, r0 - beq _0816B2B4 + beq @0816B2B4 movs r0, 0x5 bl audio_play ldr r0, =0x085dfedc @@ -700559,36 +700559,36 @@ sub_816B248: @ 816B248 ldr r1, [r1] adds r0, r6, 0 bl _call_via_r1 - b _0816B2C0 + b @0816B2C0 .align 2, 0 .pool -_0816B298: +@0816B298: lsls r1, r5, 24 lsls r0, r2, 24 asrs r2, r0, 24 cmp r1, r0 - beq _0816B2C0 + beq @0816B2C0 ldr r0, =0x085dfea4 lsls r1, r2, 2 adds r1, r0 ldr r0, [r1] bl sub_816B21C - b _0816B2C0 + b @0816B2C0 .align 2, 0 .pool -_0816B2B4: +@0816B2B4: movs r0, 0x5 bl audio_play adds r0, r6, 0 bl sub_816B4A4 -_0816B2C0: +@0816B2C0: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_816B248 thumb_func_start sub_816B2C8 -sub_816B2C8: @ 816B2C8 +sub_816B2C8: ; 816B2C8 push {lr} lsls r0, 24 lsrs r0, 24 @@ -700609,7 +700609,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 @@ -700618,12 +700618,12 @@ sub_816B2F0: @ 816B2F0 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0816B310 + bne @0816B310 bl overworld_free_bg_tilemaps bl sub_81AAC14 adds r0, r4, 0 bl remove_task -_0816B310: +@0816B310: pop {r4} pop {r0} bx r0 @@ -700632,7 +700632,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 + 1 @@ -700646,7 +700646,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 @@ -700667,7 +700667,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 @@ -700675,7 +700675,7 @@ sub_816B368: @ 816B368 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0816B388 + bne @0816B388 ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -700683,7 +700683,7 @@ sub_816B368: @ 816B368 adds r1, r0 ldr r0, =sub_816B248 + 1 str r0, [r1] -_0816B388: +@0816B388: pop {r4} pop {r0} bx r0 @@ -700692,7 +700692,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 @@ -700706,21 +700706,21 @@ sub_816B398: @ 816B398 lsrs r0, 24 strh r0, [r4, 0x2] cmp r0, 0 - beq _0816B3C4 + beq @0816B3C4 adds r0, r5, 0 movs r1, 0 bl sub_816B430 - b _0816B3D4 + b @0816B3D4 .align 2, 0 .pool -_0816B3C4: +@0816B3C4: adds r0, r5, 0 bl sub_816B4DC ldr r1, =0x085eabd1 ldr r2, =task_pc_itemstorage + 1 adds r0, r5, 0 bl sub_81978EC -_0816B3D4: +@0816B3D4: pop {r4,r5} pop {r0} bx r0 @@ -700729,7 +700729,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 @@ -700743,21 +700743,21 @@ sub_816B3E4: @ 816B3E4 lsrs r0, 24 strh r0, [r4, 0x2] cmp r0, 0 - beq _0816B410 + beq @0816B410 adds r0, r5, 0 movs r1, 0x1 bl sub_816B430 - b _0816B420 + b @0816B420 .align 2, 0 .pool -_0816B410: +@0816B410: adds r0, r5, 0 bl sub_816B4DC ldr r1, =0x085eabd1 ldr r2, =task_pc_itemstorage + 1 adds r0, r5, 0 bl sub_81978EC -_0816B420: +@0816B420: pop {r4,r5} pop {r0} bx r0 @@ -700766,7 +700766,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 @@ -700814,7 +700814,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 @@ -700829,26 +700829,26 @@ 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] cmp r0, 0x7 - bls _0816B4D4 + bls @0816B4D4 movs r0, 0x8 - b _0816B4D6 + b @0816B4D6 .align 2, 0 .pool -_0816B4D4: +@0816B4D4: adds r0, 0x1 -_0816B4D6: +@0816B4D6: strb r0, [r1, 0x4] pop {r0} bx r0 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 @@ -700874,7 +700874,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 @@ -700882,7 +700882,7 @@ sub_816B510: @ 816B510 ldr r3, [r0] movs r4, 0xB0 lsls r4, 6 -_0816B51E: +@0816B51E: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 @@ -700890,16 +700890,16 @@ _0816B51E: adds r0, r4 ldrh r0, [r0] cmp r0, 0 - beq _0816B534 + beq @0816B534 adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 -_0816B534: +@0816B534: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xF - bls _0816B51E + bls @0816B51E adds r0, r2, 0 pop {r4} pop {r1} @@ -700909,7 +700909,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 @@ -700917,13 +700917,13 @@ sub_816B54C: @ 816B54C push {r5-r7} sub sp, 0x24 movs r2, 0x6 -_0816B55A: +@0816B55A: adds r1, r2, 0x1 lsls r0, r1, 24 lsrs r4, r0, 24 mov r8, r1 cmp r4, 0xF - bhi _0816B5D4 + bhi @0816B5D4 ldr r0, =0x03005d8c mov r10, r0 lsls r0, r2, 3 @@ -700931,7 +700931,7 @@ _0816B55A: lsls r0, 2 mov r12, r0 ldr r6, =0x00002be0 -_0816B574: +@0816B574: mov r1, r10 ldr r1, [r1] mov r9, r1 @@ -700942,7 +700942,7 @@ _0816B574: adds r0, r2, r3 ldrh r0, [r0] cmp r0, 0 - bne _0816B5CA + bne @0816B5CA adds r2, r6 mov r1, sp adds r0, r2, 0 @@ -700975,18 +700975,18 @@ _0816B574: stm r1!, {r2,r3,r7} ldm r0!, {r2,r5,r7} stm r1!, {r2,r5,r7} -_0816B5CA: +@0816B5CA: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bls _0816B574 -_0816B5D4: + bls @0816B574 +@0816B5D4: mov r3, r8 lsls r0, r3, 24 lsrs r2, r0, 24 cmp r2, 0xE - bls _0816B55A + bls @0816B55A add sp, 0x24 pop {r3-r5} mov r8, r3 @@ -701000,7 +701000,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 @@ -701054,7 +701054,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 @@ -701075,7 +701075,7 @@ sub_816B674: @ 816B674 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0816B71E + bne @0816B71E ldrb r0, [r4, 0xA] bl sub_81AE604 adds r6, r0, 0 @@ -701089,14 +701089,14 @@ sub_816B674: @ 816B674 movs r0, 0x2 negs r0, r0 cmp r6, r0 - beq _0816B6D4 + beq @0816B6D4 adds r0, 0x1 cmp r6, r0 - bne _0816B6EA - b _0816B71E + bne @0816B6EA + b @0816B71E .align 2, 0 .pool -_0816B6D4: +@0816B6D4: movs r0, 0x5 bl audio_play mov r1, r8 @@ -701104,8 +701104,8 @@ _0816B6D4: bl sub_81AF620 adds r0, r5, 0 bl sub_816B798 - b _0816B71E -_0816B6EA: + b @0816B71E +@0816B6EA: movs r0, 0x5 bl audio_play movs r0, 0 @@ -701126,7 +701126,7 @@ _0816B6EA: add r0, r9 ldr r1, =sub_816B730 + 1 str r1, [r0] -_0816B71E: +@0816B71E: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -701139,7 +701139,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 @@ -701179,7 +701179,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 @@ -701210,7 +701210,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 @@ -701245,7 +701245,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 @@ -701256,16 +701256,16 @@ sub_816B82C: @ 816B82C movs r0, 0x2 negs r0, r0 cmp r4, r0 - beq _0816B86E + beq @0816B86E adds r0, 0x1 cmp r4, r0 - bne _0816B858 + bne @0816B858 movs r0, 0x5 bl audio_play adds r0, r5, 0 bl sub_816BBD4 - b _0816B86E -_0816B858: + b @0816B86E +@0816B858: movs r0, 0x5 bl audio_play ldr r0, =0x085dff04 @@ -701275,7 +701275,7 @@ _0816B858: ldr r1, [r1] adds r0, r6, 0 bl _call_via_r1 -_0816B86E: +@0816B86E: pop {r4-r6} pop {r0} bx r0 @@ -701284,7 +701284,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 @@ -701307,7 +701307,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 @@ -701316,7 +701316,7 @@ sub_816B8A4: @ 816B8A4 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0816B8E6 + bne @0816B8E6 bl sub_81D1EC0 bl overworld_free_bg_tilemaps ldr r2, =0x03005d8c @@ -701337,7 +701337,7 @@ sub_816B8A4: @ 816B8A4 bl sub_8121478 adds r0, r4, 0 bl remove_task -_0816B8E6: +@0816B8E6: pop {r4} pop {r0} bx r0 @@ -701346,7 +701346,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 + 1 @@ -701360,7 +701360,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 + 1 @@ -701374,16 +701374,16 @@ pal_fill_for_maplights_or_black: @ 816B920 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0816B954 + bne @0816B954 adds r0, r4, 0 bl sub_816B5F8 - b _0816B95A + b @0816B95A .align 2, 0 .pool -_0816B954: +@0816B954: adds r0, r4, 0 bl remove_task -_0816B95A: +@0816B95A: bl pal_fill_black pop {r4} pop {r0} @@ -701391,7 +701391,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 @@ -701399,7 +701399,7 @@ task00_080EBBDC: @ 816B964 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0816B984 + bne @0816B984 ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -701407,7 +701407,7 @@ task00_080EBBDC: @ 816B964 adds r1, r0 ldr r0, =sub_816B674 + 1 str r0, [r1] -_0816B984: +@0816B984: pop {r4} pop {r0} bx r0 @@ -701416,7 +701416,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 @@ -701430,7 +701430,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 @@ -701451,7 +701451,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 @@ -701461,32 +701461,32 @@ sub_816B9D8: @ 816B9D8 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _0816BA04 + beq @0816BA04 cmp r0, r1 - ble _0816BA10 + ble @0816BA10 cmp r0, 0 - beq _0816B9FC + beq @0816B9FC cmp r0, 0x1 - beq _0816BA0A - b _0816BA10 -_0816B9FC: + beq @0816BA0A + b @0816BA10 +@0816B9FC: adds r0, r4, 0 bl sub_816BA18 - b _0816BA10 -_0816BA04: + b @0816BA10 +@0816BA04: movs r0, 0x5 bl audio_play -_0816BA0A: +@0816BA0A: adds r0, r4, 0 bl sub_816BAAC -_0816BA10: +@0816BA10: pop {r4} pop {r0} bx r0 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 @@ -701508,15 +701508,15 @@ sub_816BA18: @ 816BA18 bl bag_add_item lsls r0, 24 cmp r0, 0 - bne _0816BA68 + bne @0816BA68 ldr r1, =0x085eacb5 ldr r2, =sub_816BBD4 + 1 adds r0, r6, 0 bl sub_81978EC - b _0816BA9C + b @0816BA9C .align 2, 0 .pool -_0816BA68: +@0816BA68: ldr r1, =0x085eacc8 ldr r2, =sub_816BBD4 + 1 adds r0, r6, 0 @@ -701532,15 +701532,15 @@ _0816BA68: ldrh r2, [r4, 0x2] adds r0, r2 cmp r1, r0 - bge _0816BA96 + bge @0816BA96 cmp r2, 0 - beq _0816BA96 + beq @0816BA96 subs r0, r2, 0x1 strh r0, [r4, 0x2] -_0816BA96: +@0816BA96: adds r0, r6, 0 bl sub_816B4C0 -_0816BA9C: +@0816BA9C: pop {r4-r6} pop {r0} bx r0 @@ -701549,7 +701549,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 @@ -701559,18 +701559,18 @@ 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 bl calc_player_party_count lsls r0, 24 cmp r0, 0 - bne _0816BAD4 + bne @0816BAD4 adds r0, r4, 0 bl sub_816BBB8 - b _0816BAEA -_0816BAD4: + b @0816BAEA +@0816BAD4: movs r0, 0x1 movs r1, 0 bl fade_screen @@ -701581,7 +701581,7 @@ _0816BAD4: adds r1, r0 ldr r0, =sub_816BAF8 + 1 str r0, [r1] -_0816BAEA: +@0816BAEA: pop {r4} pop {r0} bx r0 @@ -701590,7 +701590,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 @@ -701599,13 +701599,13 @@ sub_816BAF8: @ 816BAF8 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0816BB1C + bne @0816BB1C bl sub_81D1EC0 bl overworld_free_bg_tilemaps bl sub_81B8448 adds r0, r4, 0 bl remove_task -_0816BB1C: +@0816BB1C: pop {r4} pop {r0} bx r0 @@ -701614,7 +701614,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 + 1 @@ -701628,7 +701628,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 + 1 movs r1, 0 @@ -701642,18 +701642,18 @@ sub_816BB48: @ 816BB48 bl sub_816B54C ldrb r0, [r5, 0x5] cmp r4, r0 - beq _0816BB7E + beq @0816BB7E ldrb r1, [r5, 0x5] ldrb r0, [r5, 0x4] ldrh r2, [r5, 0x2] adds r0, r2 cmp r1, r0 - bge _0816BB7E + bge @0816BB7E cmp r2, 0 - beq _0816BB7E + beq @0816BB7E subs r0, r2, 0x1 strh r0, [r5, 0x2] -_0816BB7E: +@0816BB7E: adds r0, r6, 0 bl sub_816B4C0 bl sub_81973A4 @@ -701663,16 +701663,16 @@ _0816BB7E: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0816BBA8 + bne @0816BBA8 adds r0, r6, 0 bl sub_816B5F8 - b _0816BBAE + b @0816BBAE .align 2, 0 .pool -_0816BBA8: +@0816BBA8: adds r0, r6, 0 bl remove_task -_0816BBAE: +@0816BBAE: bl pal_fill_black pop {r4-r6} pop {r0} @@ -701680,7 +701680,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 @@ -701694,7 +701694,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 @@ -701723,7 +701723,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 @@ -701755,16 +701755,16 @@ 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: +@0816BC5C: lsls r0, r4, 24 lsrs r0, 24 bl sub_816BCC4 adds r4, 0x1 cmp r4, 0x5 - bls _0816BC5C + bls @0816BC5C ldr r0, =0x0203bcc4 ldr r0, [r0] bl free @@ -701776,7 +701776,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 @@ -701788,7 +701788,7 @@ sub_816BC7C: @ 816BC7C adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0xFF - bne _0816BCB4 + bne @0816BCB4 lsls r0, r2, 3 ldr r1, =0x085dff5c adds r0, r1 @@ -701802,7 +701802,7 @@ sub_816BC7C: @ 816BC7C bl SetWindowBorderStyle movs r0, 0 bl schedule_bg_copy_tilemap_to_vram -_0816BCB4: +@0816BCB4: ldrb r0, [r4] pop {r4} pop {r1} @@ -701812,7 +701812,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 @@ -701824,7 +701824,7 @@ sub_816BCC4: @ 816BCC4 adds r4, r1, r0 ldrb r0, [r4] cmp r0, 0xFF - beq _0816BCF8 + beq @0816BCF8 movs r1, 0 bl sub_8198070 ldrb r0, [r4] @@ -701835,7 +701835,7 @@ sub_816BCC4: @ 816BCC4 bl Window_Remove movs r0, 0xFF strb r0, [r4] -_0816BCF8: +@0816BCF8: pop {r4} pop {r0} bx r0 @@ -701844,16 +701844,16 @@ _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 ldrb r0, [r0, 0x5] subs r0, 0x1 cmp r6, r0 - bge _0816BD58 + bge @0816BD58 ldr r5, =0x0203bcc4 -_0816BD14: +@0816BD14: lsls r4, r6, 1 adds r4, r6 lsls r4, 3 @@ -701886,8 +701886,8 @@ _0816BD14: ldrb r0, [r0, 0x5] subs r0, 0x1 cmp r6, r0 - blt _0816BD14 -_0816BD58: + blt @0816BD14 +@0816BD58: ldr r5, =0x0203bcc4 lsls r4, r6, 1 adds r4, r6 @@ -701934,7 +701934,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 @@ -701946,28 +701946,28 @@ 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 lsrs r1, 24 cmp r1, 0x1 - beq _0816BDEE + beq @0816BDEE movs r0, 0x5 bl audio_play -_0816BDEE: +@0816BDEE: ldr r0, =0x0203bcc4 ldr r0, [r0] ldr r1, =0x00000666 adds r0, r1 ldrb r0, [r0] cmp r0, 0xFF - bne _0816BE38 + bne @0816BE38 bl sub_816C0C8 movs r0, 0x2 negs r0, r0 cmp r4, r0 - beq _0816BE2C + beq @0816BE2C ldr r0, =0x03005d8c ldr r0, [r0] lsls r1, r4, 2 @@ -701977,16 +701977,16 @@ _0816BDEE: adds r0, r1 ldrh r0, [r0] bl sub_816C060 - b _0816BE32 + b @0816BE32 .align 2, 0 .pool -_0816BE2C: +@0816BE2C: ldr r0, =0x0000ffff bl sub_816C060 -_0816BE32: +@0816BE32: adds r0, r4, 0 bl sub_816BEF0 -_0816BE38: +@0816BE38: pop {r4} pop {r0} bx r0 @@ -701995,7 +701995,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 @@ -702006,31 +702006,31 @@ fish4_goto_x5_or_x6: @ 816BE44 movs r0, 0x2 negs r0, r0 cmp r4, r0 - beq _0816BED4 + beq @0816BED4 ldr r0, =0x0203bcc4 ldr r0, [r0] ldr r1, =0x00000666 adds r0, r1 ldrb r1, [r0] cmp r1, 0xFF - beq _0816BE8E + beq @0816BE8E lsls r0, r4, 24 lsrs r0, 24 cmp r1, r0 - bne _0816BE84 + bne @0816BE84 adds r0, r5, 0 movs r1, 0 movs r2, 0xFF bl sub_816BFE0 - b _0816BE8E + b @0816BE8E .align 2, 0 .pool -_0816BE84: +@0816BE84: adds r0, r5, 0 movs r1, 0xFF movs r2, 0xFF bl sub_816BFE0 -_0816BE8E: +@0816BE8E: ldr r0, =0x02021cc4 ldr r1, =0x03005d8c ldr r1, [r1] @@ -702062,7 +702062,7 @@ _0816BE8E: movs r1, 0x7 adds r2, r4, 0 bl Print -_0816BED4: +@0816BED4: add sp, 0xC pop {r4-r6} pop {r0} @@ -702072,7 +702072,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 @@ -702084,7 +702084,7 @@ sub_816BEF0: @ 816BEF0 movs r0, 0x2 negs r0, r0 cmp r1, r0 - beq _0816BF2C + beq @0816BF2C ldr r0, =0x03005d8c ldr r0, [r0] lsls r1, 2 @@ -702094,13 +702094,13 @@ sub_816BEF0: @ 816BEF0 adds r0, r1 ldrh r0, [r0] bl itemid_get_description - b _0816BF32 + b @0816BF32 .align 2, 0 .pool -_0816BF2C: +@0816BF2C: ldr r0, =0x0000ffff bl sub_816C228 -_0816BF32: +@0816BF32: adds r4, r0, 0 adds r0, r5, 0 movs r1, 0x11 @@ -702124,13 +702124,13 @@ _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 ldrb r0, [r4, 0x9] cmp r0, 0xFF - bne _0816BF8C + bne @0816BF8C ldrb r0, [r4, 0x5] ldrb r1, [r4, 0x4] subs r0, r1 @@ -702146,7 +702146,7 @@ sub_816BF60: @ 816BF60 movs r3, 0x94 bl sub_81AF4A0 strb r0, [r4, 0x9] -_0816BF8C: +@0816BF8C: add sp, 0x10 pop {r4} pop {r0} @@ -702156,16 +702156,16 @@ _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] cmp r0, 0xFF - beq _0816BFAE + beq @0816BFAE bl sub_81AF620 movs r0, 0xFF strb r0, [r4, 0x9] -_0816BFAE: +@0816BFAE: pop {r4} pop {r0} bx r0 @@ -702174,7 +702174,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 @@ -702196,7 +702196,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 @@ -702212,7 +702212,7 @@ sub_816BFE0: @ 816BFE0 adds r0, r3 ldrb r5, [r0] cmp r1, 0xFF - bne _0816C030 + bne @0816C030 movs r0, 0x1 movs r1, 0 bl GetMenuCursorDimensionByFont @@ -702231,10 +702231,10 @@ sub_816BFE0: @ 816BFE0 movs r2, 0 adds r3, r6, 0 bl Window_FillPixelRect - b _0816C050 + b @0816C050 .align 2, 0 .pool -_0816C030: +@0816C030: movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -702250,7 +702250,7 @@ _0816C030: movs r2, 0 adds r3, r6, 0 bl sub_8199EEC -_0816C050: +@0816C050: add sp, 0x14 pop {r4-r6} pop {r0} @@ -702260,7 +702260,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 @@ -702270,7 +702270,7 @@ sub_816C060: @ 816C060 adds r5, r0, r1 ldrb r0, [r5] cmp r0, 0xFF - bne _0816C0B2 + bne @0816C0B2 ldr r4, =0x000013f6 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag @@ -702283,7 +702283,7 @@ sub_816C060: @ 816C060 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq _0816C0B2 + beq @0816C0B2 strb r2, [r5] ldr r0, =0x02020630 lsls r1, r2, 4 @@ -702299,7 +702299,7 @@ sub_816C060: @ 816C060 strh r0, [r1, 0x24] movs r0, 0x50 strh r0, [r1, 0x26] -_0816C0B2: +@0816C0B2: pop {r4-r6} pop {r0} bx r0 @@ -702308,7 +702308,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] @@ -702316,7 +702316,7 @@ sub_816C0C8: @ 816C0C8 adds r5, r0, r1 ldrb r0, [r5] cmp r0, 0xFF - beq _0816C0FA + beq @0816C0FA ldr r4, =0x000013f6 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag @@ -702331,7 +702331,7 @@ sub_816C0C8: @ 816C0C8 bl obj_delete_and_free_tiles movs r0, 0xFF strb r0, [r5] -_0816C0FA: +@0816C0FA: pop {r4,r5} pop {r0} bx r0 @@ -702340,7 +702340,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 @@ -702363,7 +702363,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 @@ -702377,7 +702377,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 @@ -702388,20 +702388,20 @@ sub_816C158: @ 816C158 ldr r1, =0x03005e08 adds r7, r0, r1 movs r4, 0 -_0816C16C: +@0816C16C: lsls r0, r4, 24 lsrs r0, 24 bl sub_816BC7C adds r4, 0x1 cmp r4, 0x3 - bls _0816C16C + bls @0816C16C movs r1, 0x6 ldrsh r0, [r7, r1] ldr r5, =0x085eab71 cmp r0, 0 - bne _0816C186 + bne @0816C186 ldr r5, =0x085eab63 -_0816C186: +@0816C186: movs r0, 0x1 adds r1, r5, 0 movs r2, 0x68 @@ -702458,87 +702458,87 @@ _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 ldr r2, =0xffff0009 adds r0, r1, r2 cmp r0, 0x8 - bhi _0816C2B4 + bhi @0816C2B4 lsls r0, 2 - ldr r1, =_0816C248 + ldr r1, =@0816C248 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0816C248: - .4byte _0816C2AC - .4byte _0816C2A4 - .4byte _0816C29C - .4byte _0816C294 - .4byte _0816C28C - .4byte _0816C284 - .4byte _0816C27C - .4byte _0816C274 - .4byte _0816C26C -_0816C26C: +@0816C248: + .4byte @0816C2AC + .4byte @0816C2A4 + .4byte @0816C29C + .4byte @0816C294 + .4byte @0816C28C + .4byte @0816C284 + .4byte @0816C27C + .4byte @0816C274 + .4byte @0816C26C +@0816C26C: ldr r0, =0x085e8d62 - b _0816C2BA + b @0816C2BA .align 2, 0 .pool -_0816C274: +@0816C274: ldr r0, =0x085eac09 - b _0816C2BA + b @0816C2BA .align 2, 0 .pool -_0816C27C: +@0816C27C: ldr r0, =0x085eac22 - b _0816C2BA + b @0816C2BA .align 2, 0 .pool -_0816C284: +@0816C284: ldr r0, =0x085e8ee0 - b _0816C2BA + b @0816C2BA .align 2, 0 .pool -_0816C28C: +@0816C28C: ldr r0, =0x085e8ef9 - b _0816C2BA + b @0816C2BA .align 2, 0 .pool -_0816C294: +@0816C294: ldr r0, =0x085eabe7 - b _0816C2BA + b @0816C2BA .align 2, 0 .pool -_0816C29C: +@0816C29C: ldr r0, =0x085e8eb9 - b _0816C2BA + b @0816C2BA .align 2, 0 .pool -_0816C2A4: +@0816C2A4: ldr r0, =0x085e8f0e - b _0816C2BA + b @0816C2BA .align 2, 0 .pool -_0816C2AC: +@0816C2AC: ldr r0, =0x085e8dfe - b _0816C2BA + b @0816C2BA .align 2, 0 .pool -_0816C2B4: +@0816C2B4: adds r0, r1, 0 bl itemid_get_description -_0816C2BA: +@0816C2BA: pop {r1} bx r1 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 @@ -702573,7 +702573,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 @@ -702587,7 +702587,7 @@ sub_816C30C: @ 816C30C movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0816C35C + beq @0816C35C ldrb r0, [r4, 0xA] ldr r1, =0x0203bcba subs r4, r1, 0x2 @@ -702599,15 +702599,15 @@ sub_816C30C: @ 816C30C ldrb r0, [r4, 0x5] subs r0, 0x1 cmp r1, r0 - beq _0816C39E + beq @0816C39E movs r0, 0x5 bl audio_play adds r0, r5, 0 bl sub_816C450 - b _0816C39E + b @0816C39E .align 2, 0 .pool -_0816C35C: +@0816C35C: ldrb r0, [r4, 0xA] bl sub_81AE604 adds r6, r0, 0 @@ -702618,32 +702618,32 @@ _0816C35C: movs r0, 0x2 negs r0, r0 cmp r6, r0 - beq _0816C384 + beq @0816C384 adds r0, 0x1 cmp r6, r0 - bne _0816C392 - b _0816C39E + bne @0816C392 + b @0816C39E .align 2, 0 .pool -_0816C384: +@0816C384: movs r0, 0x5 bl audio_play adds r0, r5, 0 bl sub_816C400 - b _0816C39E -_0816C392: + b @0816C39E +@0816C392: movs r0, 0x5 bl audio_play adds r0, r5, 0 bl sub_816C71C -_0816C39E: +@0816C39E: pop {r4-r6} pop {r0} bx r0 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 @@ -702655,25 +702655,25 @@ bx_battle_menu_t3: @ 816C3A4 bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _0816C3F2 + bne @0816C3F2 movs r0, 0 movs r1, 0 bl sub_81973C4 movs r1, 0x6 ldrsh r0, [r5, r1] cmp r0, 0 - bne _0816C3DC + bne @0816C3DC adds r0, r4, 0 movs r1, 0 bl sub_816B190 - b _0816C3E4 + b @0816C3E4 .align 2, 0 .pool -_0816C3DC: +@0816C3DC: adds r0, r4, 0 movs r1, 0x2 bl sub_816B190 -_0816C3E4: +@0816C3E4: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -702681,7 +702681,7 @@ _0816C3E4: adds r1, r0 ldr r0, =sub_816B248 + 1 str r0, [r1] -_0816C3F2: +@0816C3F2: pop {r4,r5} pop {r0} bx r0 @@ -702690,7 +702690,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 @@ -702725,7 +702725,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 @@ -702795,7 +702795,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 @@ -702809,15 +702809,15 @@ sub_816C4FC: @ 816C4FC movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0816C530 + beq @0816C530 ldrb r0, [r4, 0xA] ldr r1, =0x0203bcba subs r2, r1, 0x2 bl get_coro_args_x18_x1A - b _0816C57E + b @0816C57E .align 2, 0 .pool -_0816C530: +@0816C530: ldrb r0, [r4, 0xA] bl sub_81AE604 adds r6, r0, 0 @@ -702839,41 +702839,41 @@ _0816C530: movs r0, 0x2 negs r0, r0 cmp r6, r0 - beq _0816C574 + beq @0816C574 adds r0, 0x1 cmp r6, r0 - bne _0816C592 - b _0816C59A + bne @0816C592 + b @0816C59A .align 2, 0 .pool -_0816C574: +@0816C574: ldrh r1, [r7, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0816C588 -_0816C57E: + beq @0816C588 +@0816C57E: adds r0, r5, 0 movs r1, 0 bl sub_816C5A0 - b _0816C59A -_0816C588: + b @0816C59A +@0816C588: adds r0, r5, 0 movs r1, 0x1 bl sub_816C5A0 - b _0816C59A -_0816C592: + b @0816C59A +@0816C592: adds r0, r5, 0 movs r1, 0 bl sub_816C5A0 -_0816C59A: +@0816C59A: pop {r4-r7} pop {r0} bx r0 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} @@ -702902,7 +702902,7 @@ sub_816C5A0: @ 816C5A0 adds r2, r4, 0 bl sub_81AE6C8 cmp r5, 0 - bne _0816C60A + bne @0816C60A ldr r1, =0x0203bcc4 ldr r0, [r1] ldr r2, =0x00000666 @@ -702910,10 +702910,10 @@ sub_816C5A0: @ 816C5A0 ldrb r2, [r0] adds r4, r1, 0 cmp r2, r6 - beq _0816C622 + beq @0816C622 subs r0, r6, 0x1 cmp r2, r0 - beq _0816C60A + beq @0816C60A ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x93 @@ -702923,7 +702923,7 @@ sub_816C5A0: @ 816C5A0 adds r2, r6, 0 bl sub_80D702C bl sub_816BD04 -_0816C60A: +@0816C60A: ldr r0, =0x0203bcc4 ldr r1, [r0] ldr r2, =0x00000666 @@ -702931,12 +702931,12 @@ _0816C60A: ldrb r1, [r1] adds r4, r0, 0 cmp r1, r6 - bcs _0816C622 + bcs @0816C622 ldr r1, =0x0203bcb8 ldrh r0, [r1] subs r0, 0x1 strh r0, [r1] -_0816C622: +@0816C622: ldr r0, [r4] movs r1, 0xCD lsls r1, 3 @@ -702977,7 +702977,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 @@ -703001,7 +703001,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 @@ -703045,7 +703045,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 @@ -703067,7 +703067,7 @@ sub_816C71C: @ 816C71C movs r1, 0x6 ldrsh r0, [r6, r1] cmp r0, 0 - bne _0816C798 + bne @0816C798 ldr r0, =0x03005d8c ldr r1, [r0] lsls r0, r4, 2 @@ -703076,13 +703076,13 @@ sub_816C71C: @ 816C71C adds r0, r1, r2 ldrh r0, [r0] cmp r0, 0x1 - bne _0816C774 + bne @0816C774 adds r0, r5, 0 bl sub_816C8FC - b _0816C7FE + b @0816C7FE .align 2, 0 .pool -_0816C774: +@0816C774: movs r2, 0x93 lsls r2, 3 adds r0, r1, r2 @@ -703092,10 +703092,10 @@ _0816C774: ldr r0, =0x0000fffe bl sub_816C228 bl sub_816C2C0 - b _0816C7D4 + b @0816C7D4 .align 2, 0 .pool -_0816C798: +@0816C798: ldr r0, =0x03005d8c ldr r1, [r0] lsls r0, r4, 2 @@ -703104,13 +703104,13 @@ _0816C798: adds r0, r1, r2 ldrh r0, [r0] cmp r0, 0x1 - bne _0816C7BC + bne @0816C7BC adds r0, r5, 0 bl sub_816C9B8 - b _0816C7FE + b @0816C7FE .align 2, 0 .pool -_0816C7BC: +@0816C7BC: movs r2, 0x93 lsls r2, 3 adds r0, r1, r2 @@ -703120,7 +703120,7 @@ _0816C7BC: ldr r0, =0x0000fffc bl sub_816C228 bl sub_816C2C0 -_0816C7D4: +@0816C7D4: movs r0, 0x4 bl sub_816BC7C lsls r0, 24 @@ -703140,7 +703140,7 @@ _0816C7D4: adds r0, r1 ldr r1, =sub_816C818 + 1 str r1, [r0] -_0816C7FE: +@0816C7FE: add sp, 0x8 pop {r4-r6} pop {r0} @@ -703150,7 +703150,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 @@ -703182,7 +703182,7 @@ sub_816C818: @ 816C818 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bne _0816C888 + bne @0816C888 movs r0, 0x4 bl sub_816BC7C lsls r0, 24 @@ -703194,16 +703194,16 @@ sub_816C818: @ 816C818 movs r2, 0x2 movs r3, 0x8 bl sub_816C6BC - b _0816C8EC + b @0816C8EC .align 2, 0 .pool -_0816C888: +@0816C888: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0816C8BC + beq @0816C8BC movs r0, 0x5 bl audio_play movs r0, 0x4 @@ -703211,21 +703211,21 @@ _0816C888: movs r3, 0x6 ldrsh r0, [r6, r3] cmp r0, 0 - bne _0816C8B4 + bne @0816C8B4 adds r0, r5, 0 bl sub_816C8FC - b _0816C8EC + b @0816C8EC .align 2, 0 .pool -_0816C8B4: +@0816C8B4: adds r0, r5, 0 bl sub_816C9B8 - b _0816C8EC -_0816C8BC: + b @0816C8EC +@0816C8BC: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0816C8EC + beq @0816C8EC movs r0, 0x5 bl audio_play movs r0, 0x4 @@ -703241,7 +703241,7 @@ _0816C8BC: bl sub_816C2C0 mov r0, r9 bl sub_816CBC0 -_0816C8EC: +@0816C8EC: add sp, 0x8 pop {r3,r4} mov r8, r3 @@ -703252,7 +703252,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} @@ -703282,7 +703282,7 @@ sub_816C8FC: @ 816C8FC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0816C98C + bne @0816C98C ldr r0, [r7] adds r0, r5 movs r2, 0x93 @@ -703304,10 +703304,10 @@ sub_816C8FC: @ 816C8FC subs r0, 0x8 adds r0, r6, r0 ldr r1, =sub_816CB04 + 1 - b _0816C9A2 + b @0816C9A2 .align 2, 0 .pool -_0816C98C: +@0816C98C: movs r0, 0 strh r0, [r4, 0x4] ldr r0, =0x0000fffa @@ -703317,7 +703317,7 @@ _0816C98C: subs r0, 0x8 adds r0, r6, r0 ldr r1, =sub_816CB74 + 1 -_0816C9A2: +@0816C9A2: str r1, [r0] pop {r3} mov r8, r3 @@ -703329,7 +703329,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 @@ -703361,7 +703361,7 @@ sub_816C9B8: @ 816C9B8 bl itemid_is_unique lsls r0, 24 cmp r0, 0 - bne _0816CA64 + bne @0816CA64 ldr r0, [r6] adds r0, r4 movs r2, 0x93 @@ -703393,10 +703393,10 @@ sub_816C9B8: @ 816C9B8 movs r2, 0x1 movs r3, 0 bl sub_8121F94 - b _0816CA7C + b @0816CA7C .align 2, 0 .pool -_0816CA64: +@0816CA64: movs r0, 0 strh r0, [r7, 0x4] ldr r0, =0x0000fff9 @@ -703407,7 +703407,7 @@ _0816CA64: add r0, r8 ldr r1, =sub_816CB74 + 1 str r1, [r0] -_0816CA7C: +@0816CA7C: add sp, 0x10 pop {r3,r4} mov r8, r3 @@ -703420,7 +703420,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 @@ -703443,7 +703443,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 @@ -703472,7 +703472,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 @@ -703486,7 +703486,7 @@ sub_816CB04: @ 816CB04 movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _0816CB5E + beq @0816CB5E ldr r4, =0x0203bcb8 ldrb r0, [r4, 0x2] ldrb r1, [r4] @@ -703511,7 +703511,7 @@ sub_816CB04: @ 816CB04 strh r0, [r5, 0xA] adds r0, r6, 0 bl sub_816CBC0 -_0816CB5E: +@0816CB5E: pop {r4-r6} pop {r0} bx r0 @@ -703520,7 +703520,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 @@ -703529,7 +703529,7 @@ sub_816CB74: @ 816CB74 movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _0816CBAC + beq @0816CBAC ldr r0, =0x03005d8c ldr r2, [r0] ldr r1, =0x0203bcb8 @@ -703546,7 +703546,7 @@ sub_816CB74: @ 816CB74 bl sub_816C2C0 adds r0, r4, 0 bl sub_816CBC0 -_0816CBAC: +@0816CBAC: pop {r4} pop {r0} bx r0 @@ -703555,7 +703555,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 @@ -703576,7 +703576,7 @@ sub_816CBC0: @ 816CBC0 thumb_func_end sub_816CBC0 thumb_func_start sub_816CBE8 -sub_816CBE8: @ 816CBE8 +sub_816CBE8: ; 816CBE8 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -703587,7 +703587,7 @@ sub_816CBE8: @ 816CBE8 thumb_func_end sub_816CBE8 thumb_func_start sub_816CC00 -sub_816CC00: @ 816CC00 +sub_816CC00: ; 816CC00 push {lr} bl run_active_tasks bl call_obj_callbacks @@ -703596,28 +703596,28 @@ sub_816CC00: @ 816CC00 ldr r0, =0x030022c0 ldrh r0, [r0, 0x2E] cmp r0, 0 - beq _0816CC3C + beq @0816CC3C ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0816CC3C + bne @0816CC3C ldr r0, =sub_816CC54 + 1 bl set_callback2 - b _0816CC4C + b @0816CC4C .align 2, 0 .pool -_0816CC3C: +@0816CC3C: ldr r2, =0x030062a0 ldr r1, [r2] movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _0816CC4C + beq @0816CC4C adds r0, r1, 0x1 str r0, [r2] -_0816CC4C: +@0816CC4C: pop {r0} bx r0 .align 2, 0 @@ -703625,15 +703625,15 @@ _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 cmp r0, 0 - bne _0816CC66 + bne @0816CC66 ldr r0, =c2_title_screen_1 + 1 bl set_callback2 -_0816CC66: +@0816CC66: pop {r0} bx r0 .align 2, 0 @@ -703641,8 +703641,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 @@ -703675,7 +703675,7 @@ load_copyright_graphics: @ 816CC70 thumb_func_end load_copyright_graphics thumb_func_start sub_816CCB8 -sub_816CCB8: @ 816CCB8 +sub_816CCB8: ; 816CCB8 push {lr} ldr r0, =0x030062b0 bl sub_82DEEE2 @@ -703686,7 +703686,7 @@ sub_816CCB8: @ 816CCB8 thumb_func_end sub_816CCB8 thumb_func_start do_copyright_screen -do_copyright_screen: @ 816CCC8 +do_copyright_screen: ; 816CCC8 push {r4-r6,lr} sub sp, 0x10 ldr r0, =0x030022c0 @@ -703695,23 +703695,23 @@ do_copyright_screen: @ 816CCC8 adds r5, r0, r1 ldrb r4, [r5] cmp r4, 0x8C - bne _0816CCDC - b _0816CE00 -_0816CCDC: + bne @0816CCDC + b @0816CE00 +@0816CCDC: cmp r4, 0x8C - bgt _0816CCEC + bgt @0816CCEC cmp r4, 0 - beq _0816CCF4 - b _0816CDBC + beq @0816CCF4 + b @0816CDBC .align 2, 0 .pool -_0816CCEC: +@0816CCEC: cmp r4, 0x8D - bne _0816CCF2 - b _0816CE2C -_0816CCF2: - b _0816CDBC -_0816CCF4: + bne @0816CCF2 + b @0816CE2C +@0816CCF2: + b @0816CDBC +@0816CCF4: movs r0, 0 bl SetVBlankCallback movs r0, 0x50 @@ -703790,7 +703790,7 @@ _0816CCF4: bl set_serial_callback ldr r0, =0x030062b0 bl sub_82DEE98 -_0816CDBC: +@0816CDBC: bl fade_and_return_progress_probably ldr r0, =0x030022c0 movs r1, 0x87 @@ -703801,16 +703801,16 @@ _0816CDBC: strb r1, [r0] ldr r0, =0x030062b0 bl sub_82DED84 - b _0816CEA0 + b @0816CEA0 .align 2, 0 .pool -_0816CE00: +@0816CE00: ldr r4, =0x030062b0 adds r0, r4, 0 bl sub_82DED84 ldrb r0, [r4, 0x2] cmp r0, 0x1 - beq _0816CEA0 + beq @0816CEA0 movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -703821,14 +703821,14 @@ _0816CE00: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] - b _0816CEA0 + b @0816CEA0 .align 2, 0 .pool -_0816CE2C: +@0816CE2C: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne _0816CEA0 + bne @0816CEA0 ldr r0, =task_intro_1 + 1 movs r1, 0 bl AddTask @@ -703837,15 +703837,15 @@ _0816CE2C: ldr r5, =0x030062b0 ldrb r0, [r5, 0x2] cmp r0, 0 - beq _0816CE8C + beq @0816CE8C ldrb r0, [r5, 0x2] cmp r0, 0x2 - bne _0816CE96 + bne @0816CE96 ldr r6, =0x020000ac ldr r4, [r6] ldr r0, =0x65366347 cmp r4, r0 - bne _0816CE6C + bne @0816CE6C ldr r0, =0x089aa144 movs r1, 0x80 lsls r1, 18 @@ -703853,24 +703853,24 @@ _0816CE2C: lsls r2, 9 bl CpuSet str r4, [r6] -_0816CE6C: +@0816CE6C: adds r0, r5, 0 bl sub_82DEE84 - b _0816CE96 + b @0816CE96 .align 2, 0 .pool -_0816CE8C: +@0816CE8C: bl sub_82DF012 ldr r0, =sub_800BA38 + 1 bl set_serial_callback -_0816CE96: +@0816CE96: movs r0, 0 - b _0816CEA2 + b @0816CEA2 .align 2, 0 .pool -_0816CEA0: +@0816CEA0: movs r0, 0x1 -_0816CEA2: +@0816CEA2: add sp, 0x10 pop {r4-r6} pop {r1} @@ -703878,12 +703878,12 @@ _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 cmp r0, 0 - bne _0816CEFA + bne @0816CEFA bl sub_815355C lsls r0, 16 lsrs r0, 16 @@ -703895,12 +703895,12 @@ c2_copyright_1: @ 816CEAC ldr r0, =0x03006210 ldrh r0, [r0] cmp r0, 0 - beq _0816CEDE + beq @0816CEDE cmp r0, 0x2 - bne _0816CEE2 -_0816CEDE: + bne @0816CEE2 +@0816CEDE: bl init_sav2 -_0816CEE2: +@0816CEE2: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x15] @@ -703911,7 +703911,7 @@ _0816CEE2: movs r1, 0xE0 lsls r1, 9 bl init_malloc -_0816CEFA: +@0816CEFA: pop {r0} bx r0 .align 2, 0 @@ -703919,7 +703919,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} @@ -703927,8 +703927,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} @@ -704112,7 +704112,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 @@ -704154,7 +704154,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 @@ -704163,7 +704163,7 @@ task_intro_3: @ 816D190 ldr r5, =0x030062a0 ldr r0, [r5] cmp r0, 0x4C - bne _0816D1BE + bne @0816D1BE ldr r2, =0x02020630 ldr r1, =0x03005e00 lsls r0, r4, 2 @@ -704178,17 +704178,17 @@ task_intro_3: @ 816D190 adds r0, r2 movs r1, 0x1 strh r1, [r0, 0x2E] -_0816D1BE: +@0816D1BE: ldr r0, [r5] cmp r0, 0x80 - bne _0816D1CC + bne @0816D1CC ldr r0, =task_intro_3_1 + 1 movs r1, 0 bl AddTask -_0816D1CC: +@0816D1CC: ldr r0, [r5] cmp r0, 0xFB - bne _0816D1EE + bne @0816D1EE ldr r2, =0x02020630 ldr r1, =0x03005e00 lsls r0, r4, 2 @@ -704203,21 +704203,21 @@ _0816D1CC: adds r0, r2 movs r1, 0x2 strh r1, [r0, 0x2E] -_0816D1EE: +@0816D1EE: ldr r1, [r5] movs r0, 0x80 lsls r0, 1 cmp r1, r0 - bne _0816D200 + bne @0816D200 ldr r0, =task_intro_3_2 + 1 movs r1, 0 bl AddTask -_0816D200: +@0816D200: ldr r1, [r5] movs r0, 0xB8 lsls r0, 1 cmp r1, r0 - bne _0816D220 + bne @0816D220 movs r2, 0x80 lsls r2, 3 movs r0, 0x70 @@ -704228,12 +704228,12 @@ _0816D200: movs r1, 0 movs r3, 0x5 bl sub_816F7D0 -_0816D220: +@0816D220: ldr r1, [r5] movs r0, 0xC0 lsls r0, 1 cmp r1, r0 - bne _0816D240 + bne @0816D240 movs r2, 0x80 lsls r2, 3 movs r0, 0x80 @@ -704244,19 +704244,19 @@ _0816D220: movs r1, 0x3C movs r3, 0x9 bl sub_816F7D0 -_0816D240: +@0816D240: ldr r0, [r5] movs r4, 0x8C lsls r4, 2 cmp r0, r4 - bne _0816D252 + bne @0816D252 ldr r0, =task_intro_3_3 + 1 movs r1, 0 bl AddTask -_0816D252: +@0816D252: ldr r0, [r5] cmp r0, r4 - bls _0816D27A + bls @0816D27A ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 @@ -704274,7 +704274,7 @@ _0816D252: strh r2, [r0, 0x14] ldr r1, =task_intro_4 + 1 str r1, [r0] -_0816D27A: +@0816D27A: add sp, 0x8 pop {r4-r6} pop {r0} @@ -704284,7 +704284,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 @@ -704299,21 +704299,21 @@ task_intro_3_3: @ 816D2A0 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0816D2C4 + beq @0816D2C4 ldrh r0, [r4, 0x6] adds r0, 0x1 strh r0, [r4, 0x6] -_0816D2C4: +@0816D2C4: movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0 - beq _0816D2D8 + beq @0816D2D8 cmp r0, 0x1 - beq _0816D314 - b _0816D324 + beq @0816D314 + b @0816D324 .align 2, 0 .pool -_0816D2D8: +@0816D2D8: ldr r0, =0x085e4ab8 ldr r2, =0x085e4ad0 movs r1, 0x8 @@ -704338,33 +704338,33 @@ _0816D2D8: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0816D324 + b @0816D324 .align 2, 0 .pool -_0816D314: +@0816D314: ldrh r0, [r4, 0x2] subs r0, 0x1 strh r0, [r4, 0x2] lsls r0, 16 asrs r0, 16 cmp r0, 0 - bne _0816D324 + bne @0816D324 strh r0, [r4] -_0816D324: +@0816D324: movs r1, 0x6 ldrsh r0, [r4, r1] cmp r0, 0x3C - ble _0816D332 + ble @0816D332 adds r0, r5, 0 bl remove_task -_0816D332: +@0816D332: pop {r4,r5} pop {r0} bx r0 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] @@ -704373,16 +704373,16 @@ sub_816D338: @ 816D338 lsls r0, 16 asrs r0, 16 cmp r0, 0xC - bne _0816D350 + bne @0816D350 adds r0, r1, 0 bl obj_delete_and_free_tiles -_0816D350: +@0816D350: pop {r0} bx r0 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 @@ -704392,7 +704392,7 @@ task_intro_4: @ 816D354 ldr r2, [r5] ldr r0, =0x00000387 cmp r2, r0 - bhi _0816D418 + bhi @0816D418 ldr r0, =0x03005e00 lsls r4, r1, 2 adds r4, r1 @@ -704441,7 +704441,7 @@ task_intro_4: @ 816D354 movs r0, 0xD0 lsls r0, 2 cmp r1, r0 - bne _0816D43E + bne @0816D43E ldr r0, =0x085e4fc4 movs r1, 0x78 movs r2, 0xA0 @@ -704459,13 +704459,13 @@ task_intro_4: @ 816D354 movs r2, 0x4 orrs r0, r2 strb r0, [r1] - b _0816D43E + b @0816D43E .align 2, 0 .pool -_0816D418: +@0816D418: ldr r0, =0x000003ef cmp r2, r0 - bls _0816D43E + bls @0816D43E movs r0, 0x1 negs r0, r0 ldr r1, =0x0000ffff @@ -704481,7 +704481,7 @@ _0816D418: adds r0, r1 ldr r1, =task_intro_5 + 1 str r1, [r0] -_0816D43E: +@0816D43E: add sp, 0x4 pop {r4,r5} pop {r0} @@ -704491,7 +704491,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 @@ -704499,7 +704499,7 @@ task_intro_5: @ 816D458 ldr r1, [r0] ldr r0, =0x00000402 cmp r1, r0 - bls _0816D476 + bls @0816D476 ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -704507,7 +704507,7 @@ task_intro_5: @ 816D458 adds r1, r0 ldr r0, =task_intro_6 + 1 str r0, [r1] -_0816D476: +@0816D476: pop {r0} bx r0 .align 2, 0 @@ -704515,7 +704515,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 @@ -704549,7 +704549,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 @@ -704557,16 +704557,16 @@ task_intro_7: @ 816D4E4 ldr r0, =0x0203bcc8 ldrh r0, [r0] cmp r0, 0 - bne _0816D504 + bne @0816D504 ldr r0, =0x085f52bc bl gpu_tile_obj_decompress_and_load - b _0816D50A + b @0816D50A .align 2, 0 .pool -_0816D504: +@0816D504: ldr r0, =0x085f52cc bl gpu_tile_obj_decompress_and_load -_0816D50A: +@0816D50A: ldr r0, =0x085f52dc bl gpu_tile_obj_decompress_and_load ldr r0, =0x085f52fc @@ -704574,7 +704574,7 @@ _0816D50A: movs r6, 0 lsls r7, r4, 2 ldr r5, =0x085e4ae8 -_0816D51C: +@0816D51C: lsls r0, r6, 3 adds r0, r5 bl gpu_tile_obj_decompress_and_load @@ -704582,7 +704582,7 @@ _0816D51C: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x2 - bls _0816D51C + bls @0816D51C ldr r0, =0x085f530c bl gpu_pal_obj_alloc_and_load_multiple ldr r0, =0x085e4b08 @@ -704603,18 +704603,18 @@ _0816D51C: ldr r0, =0x0203bcc8 ldrh r0, [r0] cmp r0, 0 - bne _0816D590 + bne @0816D590 adds r0, r5, 0 movs r1, 0x64 bl sub_817B834 - b _0816D598 + b @0816D598 .align 2, 0 .pool -_0816D590: +@0816D590: adds r0, r5, 0 movs r1, 0x64 bl sub_817B88C -_0816D598: +@0816D598: lsls r0, 24 lsrs r6, r0, 24 ldr r2, =0x02020630 @@ -704687,8 +704687,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 @@ -704699,7 +704699,7 @@ task_intro_8: @ 816D650 movs r0, 0xE8 lsls r0, 3 cmp r1, r0 - bne _0816D67C + bne @0816D67C ldr r1, =0x0203bd28 movs r0, 0x2 strh r0, [r1] @@ -704710,11 +704710,11 @@ task_intro_8: @ 816D650 adds r0, r1 ldrb r0, [r0, 0x8] bl remove_task -_0816D67C: +@0816D67C: ldr r1, [r5] ldr r0, =0x0000079a cmp r1, r0 - bls _0816D6A4 + bls @0816D6A4 movs r0, 0x1 negs r0, r0 ldr r1, =0x0000ffff @@ -704730,12 +704730,12 @@ _0816D67C: adds r0, r1 ldr r1, =task_intro_9 + 1 str r1, [r0] -_0816D6A4: +@0816D6A4: ldr r1, [r5] ldr r0, =0x00000455 ldr r3, =0x03005e00 cmp r1, r0 - bne _0816D6C8 + bne @0816D6C8 ldr r2, =0x02020630 lsls r0, r4, 2 adds r0, r4 @@ -704749,11 +704749,11 @@ _0816D6A4: adds r0, r2 movs r1, 0x1 strh r1, [r0, 0x2E] -_0816D6C8: +@0816D6C8: ldr r1, [r5] ldr r0, =0x000004be cmp r1, r0 - bne _0816D6EA + bne @0816D6EA ldr r2, =0x02020630 lsls r0, r4, 2 adds r0, r4 @@ -704767,11 +704767,11 @@ _0816D6C8: adds r0, r2 movs r1, 0 strh r1, [r0, 0x2E] -_0816D6EA: +@0816D6EA: ldr r1, [r5] ldr r0, =0x00000572 cmp r1, r0 - bne _0816D70C + bne @0816D70C ldr r2, =0x02020630 lsls r0, r4, 2 adds r0, r4 @@ -704785,11 +704785,11 @@ _0816D6EA: adds r0, r2 movs r1, 0x1 strh r1, [r0, 0x2E] -_0816D70C: +@0816D70C: ldr r1, [r5] ldr r0, =0x00000576 cmp r1, r0 - bne _0816D72E + bne @0816D72E ldr r2, =0x02020630 lsls r0, r4, 2 adds r0, r4 @@ -704803,12 +704803,12 @@ _0816D70C: adds r0, r2 movs r1, 0x2 strh r1, [r0, 0x2E] -_0816D72E: +@0816D72E: ldr r1, [r5] movs r0, 0xC5 lsls r0, 3 cmp r1, r0 - bne _0816D752 + bne @0816D752 ldr r2, =0x02020630 lsls r0, r4, 2 adds r0, r4 @@ -704822,11 +704822,11 @@ _0816D72E: adds r0, r2 movs r1, 0x3 strh r1, [r0, 0x2E] -_0816D752: +@0816D752: ldr r1, [r5] ldr r0, =0x000006bf cmp r1, r0 - bne _0816D774 + bne @0816D774 ldr r2, =0x02020630 lsls r0, r4, 2 adds r0, r4 @@ -704840,7 +704840,7 @@ _0816D752: adds r0, r2 movs r1, 0x4 strh r1, [r0, 0x2E] -_0816D774: +@0816D774: lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -704859,10 +704859,10 @@ _0816D774: ldrsh r1, [r4, r7] ldr r0, =0x000001ff cmp r1, r0 - bgt _0816D7A0 + bgt @0816D7A0 adds r0, r2, 0x1 strh r0, [r4, 0xE] -_0816D7A0: +@0816D7A0: movs r0, 0 bl sub_817B540 add sp, 0x4 @@ -704874,7 +704874,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 @@ -704882,7 +704882,7 @@ task_intro_9: @ 816D7E8 ldr r1, [r0] ldr r0, =0x00000814 cmp r1, r0 - bls _0816D806 + bls @0816D806 ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -704890,7 +704890,7 @@ task_intro_9: @ 816D7E8 adds r1, r0 ldr r0, =task_intro_10 + 1 str r0, [r1] -_0816D806: +@0816D806: pop {r0} bx r0 .align 2, 0 @@ -704898,7 +704898,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] @@ -704907,58 +704907,58 @@ sub_816D81C: @ 816D81C movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0x8 - bls _0816D830 - b _0816D9BA -_0816D830: + bls @0816D830 + b @0816D9BA +@0816D830: lsls r0, 2 - ldr r1, =_0816D840 + ldr r1, =@0816D840 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0816D840: - .4byte _0816D864 - .4byte _0816D87A - .4byte _0816D898 - .4byte _0816D8BC - .4byte _0816D8D8 - .4byte _0816D8FA - .4byte _0816D912 - .4byte _0816D96E - .4byte _0816D99C -_0816D864: +@0816D840: + .4byte @0816D864 + .4byte @0816D87A + .4byte @0816D898 + .4byte @0816D8BC + .4byte @0816D8D8 + .4byte @0816D8FA + .4byte @0816D912 + .4byte @0816D96E + .4byte @0816D99C +@0816D864: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0xB3 - bgt _0816D874 - b _0816D9BA -_0816D874: + bgt @0816D874 + b @0816D9BA +@0816D874: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] -_0816D87A: +@0816D87A: ldrh r0, [r4, 0x20] subs r0, 0x4 strh r0, [r4, 0x20] lsls r0, 16 asrs r0, 16 cmp r0, 0x3C - beq _0816D88A - b _0816D9BA -_0816D88A: + beq @0816D88A + b @0816D9BA +@0816D88A: movs r0, 0x8 strh r0, [r4, 0x2E] movs r0, 0x14 strh r0, [r4, 0x30] movs r0, 0x2 strh r0, [r4, 0x32] - b _0816D9BA -_0816D898: + b @0816D9BA +@0816D898: ldrh r1, [r4, 0x20] adds r1, 0x8 strh r1, [r4, 0x20] @@ -704968,32 +704968,32 @@ _0816D898: lsls r1, 16 asrs r1, 16 cmp r1, 0x7C - beq _0816D8AE - b _0816D9BA -_0816D8AE: + beq @0816D8AE + b @0816D9BA +@0816D8AE: movs r0, 0x8 strh r0, [r4, 0x2E] movs r0, 0x14 strh r0, [r4, 0x30] movs r0, 0x3 strh r0, [r4, 0x32] - b _0816D9BA -_0816D8BC: + b @0816D9BA +@0816D8BC: ldrh r0, [r4, 0x22] adds r0, 0x4 strh r0, [r4, 0x22] lsls r0, 16 asrs r0, 16 cmp r0, 0x50 - bne _0816D9BA + bne @0816D9BA movs r0, 0x8 strh r0, [r4, 0x2E] movs r0, 0xA strh r0, [r4, 0x30] movs r0, 0x4 strh r0, [r4, 0x32] - b _0816D9BA -_0816D8D8: + b @0816D9BA +@0816D8D8: ldrh r1, [r4, 0x20] subs r1, 0x8 strh r1, [r4, 0x20] @@ -705003,15 +705003,15 @@ _0816D8D8: lsls r1, 16 asrs r1, 16 cmp r1, 0x3C - bne _0816D9BA + bne @0816D9BA movs r0, 0x8 strh r0, [r4, 0x2E] movs r0, 0xA strh r0, [r4, 0x30] movs r0, 0x5 strh r0, [r4, 0x32] - b _0816D9BA -_0816D8FA: + b @0816D9BA +@0816D8FA: ldrh r0, [r4, 0x20] adds r0, 0x3C strh r0, [r4, 0x20] @@ -705024,7 +705024,7 @@ _0816D8FA: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] -_0816D912: +@0816D912: ldrh r0, [r4, 0x36] lsls r0, 24 lsrs r0, 24 @@ -705046,7 +705046,7 @@ _0816D912: movs r0, 0xFF ands r1, r0 cmp r1, 0x40 - bne _0816D9BA + bne @0816D9BA adds r2, r4, 0 adds r2, 0x3F ldrb r0, [r2] @@ -705060,7 +705060,7 @@ _0816D912: lsls r0, 16 asrs r1, r0, 16 cmp r1, 0 - bne _0816D9BA + bne @0816D9BA ldrh r0, [r4, 0x24] ldrh r2, [r4, 0x20] adds r0, r2 @@ -705068,8 +705068,8 @@ _0816D912: strh r1, [r4, 0x24] ldrh r0, [r4, 0x2E] adds r0, 0x1 - b _0816D9B8 -_0816D96E: + b @0816D9B8 +@0816D96E: ldrh r0, [r4, 0x20] subs r0, 0x2 strh r0, [r4, 0x20] @@ -705087,11 +705087,11 @@ _0816D96E: movs r0, 0x10 negs r0, r0 cmp r1, r0 - bge _0816D9BA + bge @0816D9BA adds r0, r4, 0 bl obj_delete_and_free_tiles - b _0816D9BA -_0816D99C: + b @0816D9BA +@0816D99C: ldrh r0, [r4, 0x34] lsls r0, 24 lsrs r0, 24 @@ -705103,69 +705103,69 @@ _0816D99C: strh r0, [r4, 0x30] lsls r0, 16 cmp r0, 0 - bne _0816D9BA + bne @0816D9BA ldrh r0, [r4, 0x32] -_0816D9B8: +@0816D9B8: strh r0, [r4, 0x2E] -_0816D9BA: +@0816D9BA: pop {r4} pop {r0} bx r0 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 ldrsh r0, [r4, r1] cmp r0, 0x5 - bls _0816D9CE - b _0816DADA -_0816D9CE: + bls @0816D9CE + b @0816DADA +@0816D9CE: lsls r0, 2 - ldr r1, =_0816D9DC + ldr r1, =@0816D9DC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0816D9DC: - .4byte _0816D9F4 - .4byte _0816DA08 - .4byte _0816DA20 - .4byte _0816DA64 - .4byte _0816DA9A - .4byte _0816DACA -_0816D9F4: +@0816D9DC: + .4byte @0816D9F4 + .4byte @0816DA08 + .4byte @0816DA20 + .4byte @0816DA64 + .4byte @0816DA9A + .4byte @0816DACA +@0816D9F4: ldr r0, =0x030062a0 ldr r1, [r0] movs r0, 0x99 lsls r0, 3 cmp r1, r0 - bne _0816DADA - b _0816DABA + bne @0816DADA + b @0816DABA .align 2, 0 .pool -_0816DA08: +@0816DA08: ldr r0, =0x030062a0 ldr r1, [r0] movs r0, 0xC5 lsls r0, 3 cmp r1, r0 - bne _0816DA70 + bne @0816DA70 adds r0, r4, 0 movs r1, 0 - b _0816DABE + b @0816DABE .align 2, 0 .pool -_0816DA20: +@0816DA20: ldr r0, =0x030062a0 ldr r1, [r0] ldr r0, =0x000006c7 cmp r1, r0 - beq _0816DA50 + beq @0816DA50 ldrh r0, [r4, 0x30] adds r2, r0, 0 adds r2, 0x20 @@ -705176,13 +705176,13 @@ _0816DA20: lsls r1, 8 ands r0, r1 cmp r0, 0 - beq _0816DADA + beq @0816DADA ldrh r0, [r4, 0x20] adds r0, 0x1 - b _0816DA8A + b @0816DA8A .align 2, 0 .pool -_0816DA50: +@0816DA50: adds r0, r4, 0 movs r1, 0x1 bl obj_anim_image_start @@ -705191,15 +705191,15 @@ _0816DA50: strh r0, [r4, 0x2E] movs r0, 0x50 strh r0, [r4, 0x32] - b _0816DADA -_0816DA64: + b @0816DADA +@0816DA64: ldrh r0, [r4, 0x32] subs r0, 0x1 strh r0, [r4, 0x32] lsls r0, 16 cmp r0, 0 - beq _0816DA94 -_0816DA70: + beq @0816DA94 +@0816DA70: ldrh r0, [r4, 0x30] adds r2, r0, 0 adds r2, 0x40 @@ -705210,56 +705210,56 @@ _0816DA70: lsls r1, 8 ands r0, r1 cmp r0, 0 - beq _0816DADA + beq @0816DADA ldrh r0, [r4, 0x20] subs r0, 0x1 -_0816DA8A: +@0816DA8A: strh r0, [r4, 0x20] movs r0, 0xFF ands r2, r0 strh r2, [r4, 0x30] - b _0816DADA -_0816DA94: + b @0816DADA +@0816DA94: adds r0, r4, 0 movs r1, 0x2 - b _0816DABE -_0816DA9A: + b @0816DABE +@0816DA9A: adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0816DAAE + beq @0816DAAE ldrh r0, [r4, 0x20] adds r0, 0x4 strh r0, [r4, 0x20] -_0816DAAE: +@0816DAAE: movs r0, 0x20 ldrsh r1, [r4, r0] movs r0, 0xA8 lsls r0, 1 cmp r1, r0 - ble _0816DADA -_0816DABA: + ble @0816DADA +@0816DABA: adds r0, r4, 0 movs r1, 0x1 -_0816DABE: +@0816DABE: bl obj_anim_image_start ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _0816DADA -_0816DACA: + b @0816DADA +@0816DACA: ldr r0, =0x030062a0 ldr r1, [r0] ldr r0, =0x0000073f cmp r1, r0 - bls _0816DADA + bls @0816DADA ldrh r0, [r4, 0x20] subs r0, 0x2 strh r0, [r4, 0x20] -_0816DADA: +@0816DADA: pop {r4} pop {r0} bx r0 @@ -705268,36 +705268,36 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _0816DB1C + beq @0816DB1C cmp r0, 0x1 - bgt _0816DAFE + bgt @0816DAFE cmp r0, 0 - beq _0816DB04 - b _0816DBA4 -_0816DAFE: + beq @0816DB04 + b @0816DBA4 +@0816DAFE: cmp r0, 0x2 - beq _0816DB42 - b _0816DBA4 -_0816DB04: + beq @0816DB42 + b @0816DBA4 +@0816DB04: ldr r0, =0x030062a0 ldr r1, [r0] movs r0, 0x88 lsls r0, 3 cmp r1, r0 - bne _0816DBA4 + bne @0816DBA4 ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _0816DBA4 + b @0816DBA4 .align 2, 0 .pool -_0816DB1C: +@0816DB1C: ldrh r0, [r4, 0x20] subs r0, 0x2 strh r0, [r4, 0x20] @@ -705306,7 +705306,7 @@ _0816DB1C: movs r0, 0x92 lsls r0, 3 cmp r1, r0 - bne _0816DBA4 + bne @0816DBA4 ldrh r0, [r4, 0x22] subs r0, 0xC strh r0, [r4, 0x22] @@ -705317,7 +705317,7 @@ _0816DB1C: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] -_0816DB42: +@0816DB42: movs r2, 0x20 ldrsh r0, [r4, r2] movs r2, 0x24 @@ -705326,34 +705326,34 @@ _0816DB42: movs r1, 0x20 negs r1, r1 cmp r0, r1 - bgt _0816DB60 + bgt @0816DB60 adds r0, r4, 0 bl obj_delete_and_free_tiles - b _0816DBA4 + b @0816DBA4 .align 2, 0 .pool -_0816DB60: +@0816DB60: ldrh r0, [r4, 0x30] movs r1, 0xFF ands r1, r0 cmp r1, 0x3F - bgt _0816DB72 + bgt @0816DB72 lsls r0, 24 lsrs r0, 24 movs r1, 0x10 - b _0816DB84 -_0816DB72: + b @0816DB84 +@0816DB72: cmp r1, 0x40 - bne _0816DB7C + bne @0816DB7C ldrh r0, [r4, 0x20] subs r0, 0x30 strh r0, [r4, 0x20] -_0816DB7C: +@0816DB7C: ldrh r0, [r4, 0x30] lsls r0, 24 lsrs r0, 24 movs r1, 0x40 -_0816DB84: +@0816DB84: bl sine strh r0, [r4, 0x24] ldrh r0, [r4, 0x30] @@ -705368,14 +705368,14 @@ _0816DB84: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] -_0816DBA4: +@0816DBA4: pop {r4} pop {r0} bx r0 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 @@ -705441,7 +705441,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 @@ -705462,19 +705462,19 @@ task_intro_11: @ 816DC64 ldrsh r1, [r3, r0] ldr r0, =0x000006bf cmp r1, r0 - bgt _0816DCA4 + bgt @0816DCA4 ldrh r0, [r3, 0xC] adds r1, r4, r0 strh r1, [r3, 0xA] adds r0, 0x2 strh r0, [r3, 0xC] - b _0816DCA8 + b @0816DCA8 .align 2, 0 .pool -_0816DCA4: +@0816DCA4: ldr r0, =task_intro_12 + 1 str r0, [r3] -_0816DCA8: +@0816DCA8: lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -705494,7 +705494,7 @@ _0816DCA8: ldr r0, =0x030062a0 ldr r0, [r0] cmp r0, 0x1C - bne _0816DCE6 + bne @0816DCE6 movs r0, 0x1 negs r0, r0 ldr r1, =0x0000ffff @@ -705503,7 +705503,7 @@ _0816DCA8: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 -_0816DCE6: +@0816DCE6: add sp, 0x4 pop {r4,r5} pop {r0} @@ -705513,14 +705513,14 @@ _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 ldr r0, =0x030062a0 ldr r0, [r0] cmp r0, 0x2B - bls _0816DD18 + bls @0816DD18 ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -705528,7 +705528,7 @@ task_intro_12: @ 816DCFC adds r1, r0 ldr r0, =task_intro_13 + 1 str r0, [r1] -_0816DD18: +@0816DD18: pop {r0} bx r0 .align 2, 0 @@ -705536,7 +705536,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 @@ -705545,7 +705545,7 @@ task_intro_13: @ 816DD28 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0816DD94 + bne @0816DD94 bl intro_reset_and_hide_bgs bl reset_all_obj_data bl gpu_pal_allocator_reset @@ -705581,7 +705581,7 @@ task_intro_13: @ 816DD28 adds r0, r1 ldr r1, =task_intro_14 + 1 str r1, [r0] -_0816DD94: +@0816DD94: pop {r4} pop {r0} bx r0 @@ -705590,7 +705590,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 @@ -705652,7 +705652,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 @@ -705665,7 +705665,7 @@ task_intro_15: @ 816DE7C movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x20 - beq _0816DEB8 + beq @0816DEB8 adds r0, r2, 0x4 strh r0, [r4, 0x8] movs r0, 0x8 @@ -705678,17 +705678,17 @@ task_intro_15: @ 816DE7C lsrs r1, 16 movs r0, 0x44 bl lcd_io_set - b _0816DEC6 + b @0816DEC6 .align 2, 0 .pool -_0816DEB8: +@0816DEB8: movs r1, 0x82 lsls r1, 6 movs r0, 0x44 bl lcd_io_set ldr r0, =task_intro_16 + 1 str r0, [r4] -_0816DEC6: +@0816DEC6: pop {r4} pop {r0} bx r0 @@ -705697,7 +705697,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 @@ -705713,7 +705713,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 @@ -705745,7 +705745,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 @@ -705763,17 +705763,17 @@ task_intro_18: @ 816DF2C lsls r0, 16 lsrs r0, 16 cmp r0, 0x6 - bhi _0816DF62 + bhi @0816DF62 ldrh r0, [r4, 0xA] movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _0816DF62 + bne @0816DF62 ldrh r0, [r4, 0x8] movs r1, 0x3 eors r0, r1 strh r0, [r4, 0x8] -_0816DF62: +@0816DF62: ldrh r0, [r4, 0x2] ldrh r1, [r4, 0x8] ldrh r2, [r4, 0x4] @@ -705786,38 +705786,38 @@ _0816DF62: movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0x9 - bls _0816DF80 - b _0816E176 -_0816DF80: + bls @0816DF80 + b @0816E176 +@0816DF80: lsls r0, 2 - ldr r1, =_0816DF94 + ldr r1, =@0816DF94 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0816DF94: - .4byte _0816DFBC - .4byte _0816DFE6 - .4byte _0816E024 - .4byte _0816E038 - .4byte _0816E07C - .4byte _0816E09A - .4byte _0816E0C8 - .4byte _0816E0DE - .4byte _0816E13C - .4byte _0816E156 -_0816DFBC: +@0816DF94: + .4byte @0816DFBC + .4byte @0816DFE6 + .4byte @0816E024 + .4byte @0816E038 + .4byte @0816E07C + .4byte @0816E09A + .4byte @0816E0C8 + .4byte @0816E0DE + .4byte @0816E13C + .4byte @0816E156 +@0816DFBC: ldrh r0, [r4, 0x2] adds r0, 0x10 strh r0, [r4, 0x2] lsls r0, 16 asrs r0, 16 cmp r0, 0xA0 - beq _0816DFCC - b _0816E176 -_0816DFCC: + beq @0816DFCC + b @0816E176 +@0816DFCC: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] @@ -705829,16 +705829,16 @@ _0816DFCC: strh r0, [r4, 0xE] adds r0, r5, 0 bl sub_816E190 - b _0816E176 -_0816DFE6: + b @0816E176 +@0816DFE6: ldrh r0, [r4, 0xC] subs r0, 0x1 strh r0, [r4, 0xC] lsls r0, 16 cmp r0, 0 - beq _0816DFF4 - b _0816E176 -_0816DFF4: + beq @0816DFF4 + b @0816E176 +@0816DFF4: movs r0, 0x2 strh r0, [r4, 0xC] movs r1, 0xE @@ -705855,33 +705855,33 @@ _0816DFF4: movs r1, 0xF6 lsls r1, 17 cmp r0, r1 - beq _0816E01A - b _0816E176 -_0816E01A: - b _0816E14E + beq @0816E01A + b @0816E176 +@0816E01A: + b @0816E14E .align 2, 0 .pool -_0816E024: +@0816E024: ldrh r0, [r4, 0xC] subs r0, 0x1 strh r0, [r4, 0xC] lsls r0, 16 cmp r0, 0 - beq _0816E032 - b _0816E176 -_0816E032: + beq @0816E032 + b @0816E176 +@0816E032: movs r0, 0x2 strh r0, [r4, 0xC] - b _0816E14E -_0816E038: + b @0816E14E +@0816E038: ldrh r0, [r4, 0xC] subs r0, 0x1 strh r0, [r4, 0xC] lsls r0, 16 cmp r0, 0 - beq _0816E046 - b _0816E176 -_0816E046: + beq @0816E046 + b @0816E176 +@0816E046: movs r0, 0x2 strh r0, [r4, 0xC] movs r2, 0xE @@ -705898,21 +705898,21 @@ _0816E046: movs r1, 0xF0 lsls r1, 17 cmp r0, r1 - beq _0816E06C - b _0816E176 -_0816E06C: + beq @0816E06C + b @0816E176 +@0816E06C: movs r0, 0x8 strh r0, [r4, 0xC] - b _0816E14E + b @0816E14E .align 2, 0 .pool -_0816E07C: +@0816E07C: ldrh r0, [r4, 0xC] subs r0, 0x1 strh r0, [r4, 0xC] lsls r0, 16 cmp r0, 0 - bne _0816E176 + bne @0816E176 movs r1, 0x60 negs r1, r1 adds r0, r1, 0 @@ -705921,15 +705921,15 @@ _0816E07C: strh r0, [r4, 0x4] movs r0, 0x3 strh r0, [r4, 0xC] - b _0816E14E -_0816E09A: + b @0816E14E +@0816E09A: ldrh r0, [r4, 0xC] subs r0, 0x1 strh r0, [r4, 0xC] lsls r0, 16 asrs r1, r0, 16 cmp r1, 0 - bne _0816E176 + bne @0816E176 movs r0, 0x50 strh r0, [r4, 0x2] movs r0, 0x29 @@ -705942,22 +705942,22 @@ _0816E09A: movs r2, 0x64 movs r3, 0xA bl sub_80A344C - b _0816E14E + b @0816E14E .align 2, 0 .pool -_0816E0C8: +@0816E0C8: ldrh r0, [r4, 0xC] subs r0, 0x1 strh r0, [r4, 0xC] lsls r0, 16 cmp r0, 0 - bne _0816E176 + bne @0816E176 movs r0, 0x50 strh r0, [r4, 0x2] movs r0, 0x28 strh r0, [r4, 0x4] - b _0816E14E -_0816E0DE: + b @0816E14E +@0816E0DE: ldrh r0, [r4, 0x2] adds r0, 0x4 strh r0, [r4, 0x2] @@ -705985,7 +705985,7 @@ _0816E0DE: movs r2, 0x2 ldrsh r0, [r4, r2] cmp r0, 0x78 - bne _0816E176 + bne @0816E176 movs r0, 0x2 negs r0, r0 ldr r1, =0x00007fff @@ -705997,31 +705997,31 @@ _0816E0DE: strh r5, [r4, 0x6] movs r0, 0 strh r0, [r4, 0x8] - b _0816E14E + b @0816E14E .align 2, 0 .pool -_0816E13C: +@0816E13C: ldrh r1, [r4, 0x6] movs r2, 0x6 ldrsh r0, [r4, r2] cmp r0, 0 - beq _0816E14E + beq @0816E14E adds r0, r1, 0 subs r0, 0x8 strh r0, [r4, 0x6] - b _0816E176 -_0816E14E: + b @0816E176 +@0816E14E: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - b _0816E176 -_0816E156: + b @0816E176 +@0816E156: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0816E176 + bne @0816E176 ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -706032,7 +706032,7 @@ _0816E156: ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] -_0816E176: +@0816E176: add sp, 0x4 pop {r4,r5} pop {r0} @@ -706042,14 +706042,14 @@ _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 movs r4, 0 ldr r6, =0x02020630 ldr r5, =0x085e4c64 -_0816E19C: +@0816E19C: movs r0, 0 ldrsh r1, [r5, r0] lsls r3, r4, 24 @@ -706082,7 +706082,7 @@ _0816E19C: adds r5, 0x6 adds r4, 0x1 cmp r4, 0x5 - ble _0816E19C + ble @0816E19C pop {r4-r7} pop {r0} bx r0 @@ -706091,7 +706091,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] @@ -706101,20 +706101,20 @@ sub_816E1F8: @ 816E1F8 movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _0816E214 + bne @0816E214 ldrh r0, [r3, 0x26] movs r1, 0x3 eors r0, r1 strh r0, [r3, 0x26] -_0816E214: +@0816E214: movs r1, 0x2E ldrsh r0, [r3, r1] cmp r0, 0 - beq _0816E222 + beq @0816E222 cmp r0, 0x1 - beq _0816E278 - b _0816E29C -_0816E222: + beq @0816E278 + b @0816E29C +@0816E222: ldr r2, =0x085e4c64 movs r0, 0x30 ldrsh r1, [r3, r0] @@ -706149,43 +706149,43 @@ _0816E222: movs r1, 0x8 ldrsh r0, [r0, r1] cmp r0, 0x7 - ble _0816E29C + ble @0816E29C ldrh r0, [r3, 0x2E] adds r0, 0x1 strh r0, [r3, 0x2E] - b _0816E29C + b @0816E29C .align 2, 0 .pool -_0816E278: +@0816E278: ldrh r1, [r3, 0x20] movs r2, 0x20 ldrsh r0, [r3, r2] cmp r0, 0x77 - bgt _0816E286 + bgt @0816E286 subs r0, r1, 0x2 - b _0816E288 -_0816E286: + b @0816E288 +@0816E286: adds r0, r1, 0x2 -_0816E288: +@0816E288: strh r0, [r3, 0x20] ldrh r1, [r3, 0x22] movs r2, 0x22 ldrsh r0, [r3, r2] cmp r0, 0x4F - bgt _0816E298 + bgt @0816E298 subs r0, r1, 0x2 - b _0816E29A -_0816E298: + b @0816E29A +@0816E298: adds r0, r1, 0x2 -_0816E29A: +@0816E29A: strh r0, [r3, 0x22] -_0816E29C: +@0816E29C: pop {r0} bx r0 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 @@ -706254,7 +706254,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 @@ -706272,45 +706272,45 @@ task_intro_20: @ 816E358 movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0xD - bls _0816E380 - b _0816E6BC -_0816E380: + bls @0816E380 + b @0816E6BC +@0816E380: lsls r0, 2 - ldr r1, =_0816E394 + ldr r1, =@0816E394 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0816E394: - .4byte _0816E3CC - .4byte _0816E3E0 - .4byte _0816E43C - .4byte _0816E488 - .4byte _0816E4C4 - .4byte _0816E4EC - .4byte _0816E544 - .4byte _0816E560 - .4byte _0816E5A0 - .4byte _0816E5BC - .4byte _0816E5FC - .4byte _0816E61A - .4byte _0816E664 - .4byte _0816E69C -_0816E3CC: +@0816E394: + .4byte @0816E3CC + .4byte @0816E3E0 + .4byte @0816E43C + .4byte @0816E488 + .4byte @0816E4C4 + .4byte @0816E4EC + .4byte @0816E544 + .4byte @0816E560 + .4byte @0816E5A0 + .4byte @0816E5BC + .4byte @0816E5FC + .4byte @0816E61A + .4byte @0816E664 + .4byte @0816E69C +@0816E3CC: ldrh r0, [r5, 0xC] subs r0, 0x1 strh r0, [r5, 0xC] lsls r0, 16 cmp r0, 0 - beq _0816E3DA - b _0816E6BC -_0816E3DA: + beq @0816E3DA + b @0816E6BC +@0816E3DA: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] -_0816E3E0: +@0816E3E0: ldrh r0, [r5, 0xC] adds r0, 0x4 strh r0, [r5, 0xC] @@ -706339,9 +706339,9 @@ _0816E3E0: movs r2, 0xC ldrsh r0, [r5, r2] cmp r0, 0x40 - beq _0816E420 - b _0816E6BC -_0816E420: + beq @0816E420 + b @0816E6BC +@0816E420: movs r0, 0x19 strh r0, [r5, 0xC] movs r0, 0x1 @@ -706351,18 +706351,18 @@ _0816E420: strh r0, [r5] movs r0, 0 bl sub_816E6D4 - b _0816E6BC + b @0816E6BC .align 2, 0 .pool -_0816E43C: +@0816E43C: ldrh r0, [r5, 0xC] subs r0, 0x1 strh r0, [r5, 0xC] lsls r0, 16 cmp r0, 0 - beq _0816E44A - b _0816E6BC -_0816E44A: + beq @0816E44A + b @0816E6BC +@0816E44A: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -706387,18 +706387,18 @@ _0816E44A: movs r0, 0 bl sub_816E6D4 bl sub_816E74C - b _0816E6BC + b @0816E6BC .align 2, 0 .pool -_0816E488: +@0816E488: ldrh r0, [r5, 0xC] subs r0, 0x1 strh r0, [r5, 0xC] lsls r0, 16 cmp r0, 0 - beq _0816E496 - b _0816E6BC -_0816E496: + beq @0816E496 + b @0816E6BC +@0816E496: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -706417,18 +706417,18 @@ _0816E496: strh r0, [r1, 0xC] movs r0, 0x8 strh r0, [r5, 0xC] - b _0816E690 + b @0816E690 .align 2, 0 .pool -_0816E4C4: +@0816E4C4: ldrh r0, [r5, 0xC] subs r0, 0x1 strh r0, [r5, 0xC] lsls r0, 16 cmp r0, 0 - beq _0816E4D2 - b _0816E6BC -_0816E4D2: + beq @0816E4D2 + b @0816E6BC +@0816E4D2: ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 @@ -706439,18 +706439,18 @@ _0816E4D2: strh r1, [r0, 0xC] movs r0, 0x8 strh r0, [r5, 0xC] - b _0816E690 + b @0816E690 .align 2, 0 .pool -_0816E4EC: +@0816E4EC: ldrh r0, [r5, 0xC] subs r0, 0x1 strh r0, [r5, 0xC] lsls r0, 16 cmp r0, 0 - beq _0816E4FA - b _0816E6BC -_0816E4FA: + beq @0816E4FA + b @0816E6BC +@0816E4FA: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -706463,17 +706463,17 @@ _0816E4FA: movs r0, 0xE ldrsh r1, [r5, r0] cmp r1, 0 - beq _0816E528 + beq @0816E528 movs r0, 0xC strh r0, [r5, 0xC] subs r0, r2, 0x1 strh r0, [r5, 0xE] movs r0, 0x2 strh r0, [r5] - b _0816E6BC + b @0816E6BC .align 2, 0 .pool -_0816E528: +@0816E528: movs r0, 0x1 strh r0, [r5, 0xC] ldrh r0, [r5] @@ -706486,32 +706486,32 @@ _0816E528: movs r2, 0x78 movs r3, 0xA bl sub_80A344C - b _0816E6BC -_0816E544: + b @0816E6BC +@0816E544: ldrh r0, [r5, 0xC] subs r0, 0x1 strh r0, [r5, 0xC] lsls r0, 16 cmp r0, 0 - beq _0816E552 - b _0816E6BC -_0816E552: + beq @0816E552 + b @0816E6BC +@0816E552: movs r0, 0x4 strh r0, [r5, 0xC] movs r1, 0xF5 lsls r1, 1 adds r0, r1, 0 strh r0, [r5, 0xE] - b _0816E690 -_0816E560: + b @0816E690 +@0816E560: ldrh r0, [r5, 0xC] subs r0, 0x1 strh r0, [r5, 0xC] lsls r0, 16 cmp r0, 0 - beq _0816E56E - b _0816E6BC -_0816E56E: + beq @0816E56E + b @0816E6BC +@0816E56E: movs r0, 0x4 strh r0, [r5, 0xC] movs r2, 0xE @@ -706528,35 +706528,35 @@ _0816E56E: movs r1, 0xF0 lsls r1, 17 cmp r0, r1 - beq _0816E594 - b _0816E6BC -_0816E594: - b _0816E690 + beq @0816E594 + b @0816E6BC +@0816E594: + b @0816E690 .align 2, 0 .pool -_0816E5A0: +@0816E5A0: ldrh r0, [r5, 0xC] subs r0, 0x1 strh r0, [r5, 0xC] lsls r0, 16 cmp r0, 0 - beq _0816E5AE - b _0816E6BC -_0816E5AE: + beq @0816E5AE + b @0816E6BC +@0816E5AE: movs r0, 0x4 strh r0, [r5, 0xC] movs r1, 0xF1 lsls r1, 1 adds r0, r1, 0 strh r0, [r5, 0xE] - b _0816E690 -_0816E5BC: + b @0816E690 +@0816E5BC: ldrh r0, [r5, 0xC] subs r0, 0x1 strh r0, [r5, 0xC] lsls r0, 16 cmp r0, 0 - bne _0816E6BC + bne @0816E6BC movs r0, 0x4 strh r0, [r5, 0xC] movs r2, 0xE @@ -706573,28 +706573,28 @@ _0816E5BC: movs r1, 0xF7 lsls r1, 17 cmp r0, r1 - bne _0816E6BC + bne @0816E6BC movs r0, 0x10 strh r0, [r5, 0xC] - b _0816E690 + b @0816E690 .align 2, 0 .pool -_0816E5FC: +@0816E5FC: ldrh r0, [r5, 0xC] subs r0, 0x1 strh r0, [r5, 0xC] lsls r0, 16 asrs r0, 16 cmp r0, 0 - bne _0816E6BC + bne @0816E6BC strh r0, [r5, 0xC] ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] adds r0, r6, 0 bl sub_816E6D4 - b _0816E6BC -_0816E61A: + b @0816E6BC +@0816E61A: ldrh r0, [r5, 0xC] adds r0, 0x4 strh r0, [r5, 0xC] @@ -706615,7 +706615,7 @@ _0816E61A: movs r2, 0xC ldrsh r0, [r5, r2] cmp r0, 0x40 - bne _0816E6BC + bne @0816E6BC movs r0, 0x2 negs r0, r0 ldr r1, =0x00007fff @@ -706624,10 +706624,10 @@ _0816E61A: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - b _0816E690 + b @0816E690 .align 2, 0 .pool -_0816E664: +@0816E664: ldrh r0, [r5, 0xC] adds r0, 0x4 strh r0, [r5, 0xC] @@ -706648,21 +706648,21 @@ _0816E664: movs r2, 0xC ldrsh r0, [r5, r2] cmp r0, 0x80 - bne _0816E6BC -_0816E690: + bne @0816E6BC +@0816E690: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] - b _0816E6BC + b @0816E6BC .align 2, 0 .pool -_0816E69C: +@0816E69C: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0816E6BC + bne @0816E6BC ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 @@ -706673,7 +706673,7 @@ _0816E69C: ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] -_0816E6BC: +@0816E6BC: add sp, 0x4 pop {r4-r6} pop {r0} @@ -706683,7 +706683,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 @@ -706697,7 +706697,7 @@ sub_816E6D4: @ 816E6D4 mov r9, r0 adds r4, r7, 0 movs r6, 0 -_0816E6EE: +@0816E6EE: movs r3, 0 ldrsh r1, [r4, r3] adds r0, r7, 0x2 @@ -706730,7 +706730,7 @@ _0816E6EE: adds r6, 0x6 adds r5, 0x1 cmp r5, 0x5 - ble _0816E6EE + ble @0816E6EE pop {r3,r4} mov r8, r3 mov r9, r4 @@ -706742,7 +706742,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} @@ -706752,7 +706752,7 @@ sub_816E74C: @ 816E74C movs r6, 0x24 ldr r0, =0x02020630 mov r8, r0 -_0816E75E: +@0816E75E: movs r3, 0x20 ldrsh r1, [r4, r3] adds r0, r7, 0x2 @@ -706783,7 +706783,7 @@ _0816E75E: adds r6, 0x6 adds r5, 0x1 cmp r5, 0x5 - ble _0816E75E + ble @0816E75E pop {r3} mov r8, r3 pop {r4-r7} @@ -706794,22 +706794,22 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - beq _0816E7C6 + beq @0816E7C6 cmp r0, 0x1 - beq _0816E84C - b _0816E882 -_0816E7C6: + beq @0816E84C + b @0816E882 +@0816E7C6: ldrh r1, [r4, 0x3A] movs r2, 0x3A ldrsh r0, [r4, r2] cmp r0, 0 - bne _0816E80A + bne @0816E80A ldrh r0, [r4, 0x30] adds r0, 0xB movs r1, 0xFF @@ -706833,16 +706833,16 @@ _0816E7C6: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0816E82A + beq @0816E82A adds r0, r4, 0 bl obj_delete_and_free_tiles - b _0816E82A -_0816E80A: + b @0816E82A +@0816E80A: subs r0, r1, 0x1 strh r0, [r4, 0x3A] lsls r0, 16 cmp r0, 0 - bne _0816E82A + bne @0816E82A adds r0, r4, 0 movs r1, 0 bl obj_anim_image_start @@ -706853,7 +706853,7 @@ _0816E80A: negs r0, r0 ands r0, r1 strb r0, [r2] -_0816E82A: +@0816E82A: ldr r2, =0x03005e00 movs r0, 0x38 ldrsh r1, [r4, r0] @@ -706864,52 +706864,52 @@ _0816E82A: movs r1, 0x8 ldrsh r0, [r0, r1] cmp r0, 0xB - ble _0816E882 + ble @0816E882 ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _0816E882 + b @0816E882 .align 2, 0 .pool -_0816E84C: +@0816E84C: ldrh r1, [r4, 0x20] movs r2, 0x20 ldrsh r0, [r4, r2] cmp r0, 0x77 - bgt _0816E85A + bgt @0816E85A subs r0, r1, 0x3 - b _0816E85C -_0816E85A: + b @0816E85C +@0816E85A: adds r0, r1, 0x3 -_0816E85C: +@0816E85C: strh r0, [r4, 0x20] ldrh r1, [r4, 0x22] movs r2, 0x22 ldrsh r0, [r4, r2] cmp r0, 0x4F - bgt _0816E86C + bgt @0816E86C subs r0, r1, 0x3 - b _0816E86E -_0816E86C: + b @0816E86E +@0816E86C: adds r0, r1, 0x3 -_0816E86E: +@0816E86E: strh r0, [r4, 0x22] ldrh r0, [r4, 0x22] subs r0, 0x14 lsls r0, 16 lsrs r0, 16 cmp r0, 0x8C - bls _0816E882 + bls @0816E882 adds r0, r4, 0 bl obj_delete_and_free_tiles -_0816E882: +@0816E882: pop {r4} pop {r0} bx r0 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 @@ -706981,7 +706981,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 @@ -707007,7 +707007,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 @@ -707040,7 +707040,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 @@ -707068,19 +707068,19 @@ task_intro_24: @ 816E9DC movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0 - beq _0816EA24 + beq @0816EA24 cmp r0, 0x1 - beq _0816EA58 - b _0816EAA6 + beq @0816EA58 + b @0816EAA6 .align 2, 0 .pool -_0816EA24: +@0816EA24: ldrh r0, [r4, 0xC] subs r0, 0x1 strh r0, [r4, 0xC] lsls r0, 16 cmp r0, 0 - bne _0816EAA6 + bne @0816EAA6 movs r0, 0x2 negs r0, r0 ldr r1, =0x0000ffff @@ -707096,16 +707096,16 @@ _0816EA24: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - b _0816EAA6 + b @0816EAA6 .align 2, 0 .pool -_0816EA58: +@0816EA58: movs r0, 0xC ldrsh r1, [r4, r0] movs r0, 0xA0 lsls r0, 6 cmp r1, r0 - bne _0816EA74 + bne @0816EA74 ldr r0, =0x0000fffe ldr r1, =0x00002949 str r1, [sp] @@ -707113,31 +707113,31 @@ _0816EA58: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 -_0816EA74: +@0816EA74: ldrh r1, [r4, 0xC] movs r2, 0xC ldrsh r0, [r4, r2] cmp r0, 0 - beq _0816EA90 + beq @0816EA90 adds r0, r1, 0 subs r0, 0x80 strh r0, [r4, 0xC] - b _0816EAA6 + b @0816EAA6 .align 2, 0 .pool -_0816EA90: +@0816EA90: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0816EAA6 + bne @0816EAA6 adds r0, r6, 0 subs r0, 0x8 adds r0, r5, r0 ldr r1, =task_intro_25 + 1 str r1, [r0] -_0816EAA6: +@0816EAA6: add sp, 0x4 pop {r4-r6} pop {r0} @@ -707147,7 +707147,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 @@ -707193,7 +707193,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 @@ -707205,25 +707205,25 @@ task_intro_26: @ 816EB44 movs r3, 0 ldrsh r0, [r6, r3] cmp r0, 0x1 - beq _0816EBE0 + beq @0816EBE0 cmp r0, 0x1 - bgt _0816EB6C + bgt @0816EB6C cmp r0, 0 - beq _0816EB72 - b _0816EC62 + beq @0816EB72 + b @0816EC62 .align 2, 0 .pool -_0816EB6C: +@0816EB6C: cmp r0, 0x2 - beq _0816EC4C - b _0816EC62 -_0816EB72: + beq @0816EC4C + b @0816EC62 +@0816EB72: ldrh r0, [r6, 0xC] subs r0, 0x1 strh r0, [r6, 0xC] lsls r0, 16 cmp r0, 0 - bne _0816EC62 + bne @0816EC62 ldr r4, =0x085e4c4c adds r0, r4, 0 movs r1, 0xC8 @@ -707262,16 +707262,16 @@ _0816EB72: strh r0, [r6] movs r0, 0x48 strh r0, [r6, 0xC] - b _0816EC62 + b @0816EC62 .align 2, 0 .pool -_0816EBE0: +@0816EBE0: ldrh r0, [r6, 0xC] subs r0, 0x1 strh r0, [r6, 0xC] lsls r0, 16 cmp r0, 0 - bne _0816EC62 + bne @0816EC62 ldr r4, =0x085e4c4c adds r0, r4, 0 movs r1, 0x28 @@ -707310,22 +707310,22 @@ _0816EBE0: strh r0, [r6] movs r0, 0x30 strh r0, [r6, 0xC] - b _0816EC62 + b @0816EC62 .align 2, 0 .pool -_0816EC4C: +@0816EC4C: ldrh r0, [r6, 0xC] subs r0, 0x1 strh r0, [r6, 0xC] lsls r0, 16 cmp r0, 0 - bne _0816EC62 + bne @0816EC62 adds r0, r2, 0 subs r0, 0x8 adds r0, r1, r0 ldr r1, =task_intro_27 + 1 str r1, [r0] -_0816EC62: +@0816EC62: pop {r4-r6} pop {r0} bx r0 @@ -707334,7 +707334,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 @@ -707342,35 +707342,35 @@ sub_816EC6C: @ 816EC6C movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0816EC88 + beq @0816EC88 adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 strb r0, [r2] -_0816EC88: +@0816EC88: movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _0816ECAC + beq @0816ECAC cmp r0, 0x1 - bgt _0816EC9A + bgt @0816EC9A cmp r0, 0 - beq _0816ECA0 - b _0816ED12 -_0816EC9A: + beq @0816ECA0 + b @0816ED12 +@0816EC9A: cmp r0, 0x2 - beq _0816ECDC - b _0816ED12 -_0816ECA0: + beq @0816ECDC + b @0816ED12 +@0816ECA0: movs r0, 0xE1 lsls r0, 1 strh r0, [r4, 0x30] ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] -_0816ECAC: +@0816ECAC: movs r1, 0x30 ldrsh r0, [r4, r1] ldr r1, =0x08d85cd0 @@ -707385,7 +707385,7 @@ _0816ECAC: movs r1, 0xE7 lsls r1, 17 cmp r0, r1 - bne _0816ED12 + bne @0816ED12 movs r0, 0xE6 lsls r0, 1 strh r0, [r4, 0x30] @@ -707394,13 +707394,13 @@ _0816ECAC: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] -_0816ECDC: +@0816ECDC: ldrh r0, [r4, 0x32] subs r0, 0x1 strh r0, [r4, 0x32] lsls r0, 16 cmp r0, 0 - bne _0816ED12 + bne @0816ED12 movs r0, 0x4 strh r0, [r4, 0x32] movs r1, 0x30 @@ -707417,10 +707417,10 @@ _0816ECDC: movs r1, 0xE0 lsls r1, 17 cmp r0, r1 - bne _0816ED12 + bne @0816ED12 adds r0, r4, 0 bl obj_delete_and_free_tiles -_0816ED12: +@0816ED12: pop {r4} pop {r0} bx r0 @@ -707429,7 +707429,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 @@ -707485,7 +707485,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 @@ -707498,36 +707498,36 @@ task_intro_28: @ 816EDB4 movs r3, 0x1 ands r0, r3 cmp r0, 0 - bne _0816EDD6 + bne @0816EDD6 ldrh r0, [r2, 0xC] movs r1, 0x2 eors r0, r1 strh r0, [r2, 0xC] -_0816EDD6: +@0816EDD6: ldrh r0, [r2, 0xE] adds r0, 0x1 strh r0, [r2, 0xE] movs r6, 0 ldrsh r1, [r2, r6] cmp r1, 0x1 - beq _0816EE2E + beq @0816EE2E cmp r1, 0x1 - bgt _0816EDF4 + bgt @0816EDF4 cmp r1, 0 - beq _0816EDFE - b _0816EE86 + beq @0816EDFE + b @0816EE86 .align 2, 0 .pool -_0816EDF4: +@0816EDF4: cmp r1, 0x2 - beq _0816EE3A + beq @0816EE3A cmp r1, 0x3 - beq _0816EE70 - b _0816EE86 -_0816EDFE: + beq @0816EE70 + b @0816EE86 +@0816EDFE: ands r0, r3 cmp r0, 0 - beq _0816EE1C + beq @0816EE1C ldrh r0, [r2, 0x2] subs r0, 0x2 strh r0, [r2, 0x2] @@ -707540,24 +707540,24 @@ _0816EDFE: ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] -_0816EE1C: +@0816EE1C: movs r1, 0x2 ldrsh r0, [r2, r1] cmp r0, 0x68 - bne _0816EE86 + bne @0816EE86 ldrh r0, [r2] adds r0, 0x1 strh r0, [r2] strh r3, [r2, 0xA] - b _0816EE86 -_0816EE2E: + b @0816EE86 +@0816EE2E: ldrh r0, [r2] adds r0, 0x1 strh r0, [r2] movs r0, 0x4 strh r0, [r2, 0xA] - b _0816EE86 -_0816EE3A: + b @0816EE86 +@0816EE3A: ldrh r0, [r2, 0x2] adds r0, 0x4 strh r0, [r2, 0x2] @@ -707575,28 +707575,28 @@ _0816EE3A: movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0816EE86 + bne @0816EE86 movs r0, 0x8C strh r0, [r2, 0xA] ldrh r0, [r2] adds r0, 0x1 strh r0, [r2] - b _0816EE86 + b @0816EE86 .align 2, 0 .pool -_0816EE70: +@0816EE70: ldrh r0, [r2, 0xA] subs r0, 0x1 strh r0, [r2, 0xA] lsls r0, 16 cmp r0, 0 - bne _0816EE86 + bne @0816EE86 adds r0, r5, 0 subs r0, 0x8 adds r0, r4, r0 ldr r1, =task_intro_29 + 1 str r1, [r0] -_0816EE86: +@0816EE86: pop {r4-r6} pop {r0} bx r0 @@ -707605,7 +707605,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 @@ -707619,7 +707619,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 @@ -707635,30 +707635,30 @@ sub_816EEA8: @ 816EEA8 movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0x5 - bls _0816EECA - b _0816F0B2 -_0816EECA: + bls @0816EECA + b @0816F0B2 +@0816EECA: lsls r0, 2 - ldr r1, =_0816EEDC + ldr r1, =@0816EEDC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0816EEDC: - .4byte _0816EEF4 - .4byte _0816EF34 - .4byte _0816EF80 - .4byte _0816F00A - .4byte _0816F074 - .4byte _0816F0A0 -_0816EEF4: +@0816EEDC: + .4byte @0816EEF4 + .4byte @0816EF34 + .4byte @0816EF80 + .4byte @0816F00A + .4byte @0816F074 + .4byte @0816F0A0 +@0816EEF4: ldrh r1, [r5, 0x4] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0816EF16 + beq @0816EF16 movs r2, 0x2 ldrsh r0, [r5, r2] lsls r0, 1 @@ -707670,32 +707670,32 @@ _0816EEF4: ldrh r0, [r5, 0x2] adds r0, 0x1 strh r0, [r5, 0x2] -_0816EF16: +@0816EF16: movs r1, 0x2 ldrsh r0, [r5, r1] cmp r0, 0x6 - beq _0816EF20 - b _0816F0B2 -_0816EF20: + beq @0816EF20 + b @0816F0B2 +@0816EF20: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] movs r0, 0 strh r0, [r5, 0x2] - b _0816EF70 + b @0816EF70 .align 2, 0 .pool -_0816EF34: +@0816EF34: ldrh r1, [r5, 0x6] movs r2, 0x6 ldrsh r0, [r5, r2] cmp r0, 0 - bne _0816F004 + bne @0816F004 ldrh r1, [r5, 0x4] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0816EF60 + beq @0816EF60 movs r1, 0x2 ldrsh r0, [r5, r1] lsls r0, 1 @@ -707707,33 +707707,33 @@ _0816EF34: ldrh r0, [r5, 0x2] adds r0, 0x1 strh r0, [r5, 0x2] -_0816EF60: +@0816EF60: movs r2, 0x2 ldrsh r0, [r5, r2] cmp r0, 0x6 - beq _0816EF6A - b _0816F0B2 -_0816EF6A: + beq @0816EF6A + b @0816F0B2 +@0816EF6A: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] -_0816EF70: +@0816EF70: movs r0, 0xA strh r0, [r5, 0x6] - b _0816F0B2 + b @0816F0B2 .align 2, 0 .pool -_0816EF80: +@0816EF80: ldrh r1, [r5, 0x6] movs r2, 0x6 ldrsh r0, [r5, r2] cmp r0, 0 - bne _0816F004 + bne @0816F004 ldrh r1, [r5, 0x4] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0816EFAC + beq @0816EFAC movs r1, 0x2 ldrsh r0, [r5, r1] lsls r0, 1 @@ -707745,13 +707745,13 @@ _0816EF80: ldrh r0, [r5, 0x2] adds r0, 0x1 strh r0, [r5, 0x2] -_0816EFAC: +@0816EFAC: movs r2, 0x2 ldrsh r0, [r5, r2] cmp r0, 0x6 - beq _0816EFB6 - b _0816F0B2 -_0816EFB6: + beq @0816EFB6 + b @0816F0B2 +@0816EFB6: ldr r0, =0x085e5030 movs r1, 0x78 movs r2, 0x58 @@ -707780,26 +707780,26 @@ _0816EFB6: strh r0, [r5] movs r0, 0x10 strh r0, [r5, 0x6] - b _0816F0B2 + b @0816F0B2 .align 2, 0 .pool -_0816F004: +@0816F004: subs r0, r1, 0x1 strh r0, [r5, 0x6] - b _0816F0B2 -_0816F00A: + b @0816F0B2 +@0816F00A: ldrh r1, [r5, 0x4] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0816F0B2 + beq @0816F0B2 ldrh r0, [r5, 0x6] subs r0, 0x1 adds r2, r0, 0 strh r0, [r5, 0x6] lsls r0, 16 cmp r0, 0 - beq _0816F068 + beq @0816F068 lsls r2, 24 lsrs r2, 24 ldr r3, =0x00002949 @@ -707823,23 +707823,23 @@ _0816F00A: adds r1, r5, 0 movs r2, 0x1 bl CpuSet - b _0816F0B2 + b @0816F0B2 .align 2, 0 .pool -_0816F068: +@0816F068: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] movs r0, 0x35 strh r0, [r5, 0x6] - b _0816F0B2 -_0816F074: + b @0816F0B2 +@0816F074: ldrh r0, [r5, 0x6] subs r0, 0x1 strh r0, [r5, 0x6] lsls r0, 16 cmp r0, 0 - bne _0816F0B2 + bne @0816F0B2 movs r0, 0x1 negs r0, r0 ldr r1, =0x00007fff @@ -707851,19 +707851,19 @@ _0816F074: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] - b _0816F0B2 + b @0816F0B2 .align 2, 0 .pool -_0816F0A0: +@0816F0A0: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0816F0B2 + bne @0816F0B2 adds r0, r2, 0 bl remove_task -_0816F0B2: +@0816F0B2: add sp, 0x4 pop {r4,r5} pop {r0} @@ -707873,8 +707873,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 @@ -707917,7 +707917,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 @@ -707929,12 +707929,12 @@ task_intro_3_1: @ 816F128 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _0816F170 + beq @0816F170 cmp r0, 0x1 - ble _0816F148 + ble @0816F148 cmp r0, 0x2 - beq _0816F1BC -_0816F148: + beq @0816F1BC +@0816F148: movs r1, 0xFD lsls r1, 6 movs r0, 0x50 @@ -707947,15 +707947,15 @@ _0816F148: movs r1, 0 bl lcd_io_set movs r0, 0x40 - b _0816F1AC + b @0816F1AC .align 2, 0 .pool -_0816F170: +@0816F170: ldrh r1, [r4, 0xA] movs r2, 0xA ldrsh r0, [r4, r2] cmp r0, 0 - beq _0816F1A0 + beq @0816F1A0 subs r0, r1, 0x1 strh r0, [r4, 0xA] movs r1, 0xA @@ -707970,24 +707970,24 @@ _0816F170: ldrh r1, [r0] movs r0, 0x52 bl lcd_io_set - b _0816F1DA + b @0816F1DA .align 2, 0 .pool -_0816F1A0: +@0816F1A0: ldr r0, =0x0853ff70 ldrh r1, [r0] movs r0, 0x52 bl lcd_io_set movs r0, 0x10 -_0816F1AC: +@0816F1AC: strh r0, [r4, 0xA] ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0816F1DA + b @0816F1DA .align 2, 0 .pool -_0816F1BC: +@0816F1BC: movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -707999,14 +707999,14 @@ _0816F1BC: bl lcd_io_set adds r0, r5, 0 bl remove_task -_0816F1DA: +@0816F1DA: pop {r4,r5} pop {r0} bx r0 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 @@ -708018,12 +708018,12 @@ task_intro_3_2: @ 816F1E0 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _0816F228 + beq @0816F228 cmp r0, 0x1 - ble _0816F200 + ble @0816F200 cmp r0, 0x2 - beq _0816F274 -_0816F200: + beq @0816F274 +@0816F200: movs r1, 0xFD lsls r1, 6 movs r0, 0x50 @@ -708036,15 +708036,15 @@ _0816F200: movs r1, 0 bl lcd_io_set movs r0, 0 - b _0816F264 + b @0816F264 .align 2, 0 .pool -_0816F228: +@0816F228: ldrh r1, [r4, 0xA] movs r2, 0xA ldrsh r0, [r4, r2] cmp r0, 0x3D - bgt _0816F258 + bgt @0816F258 adds r0, r1, 0x1 strh r0, [r4, 0xA] movs r1, 0xA @@ -708059,33 +708059,33 @@ _0816F228: ldrh r1, [r0] movs r0, 0x52 bl lcd_io_set - b _0816F2A2 + b @0816F2A2 .align 2, 0 .pool -_0816F258: +@0816F258: ldr r0, =0x0853ff70 ldrh r1, [r0, 0x3E] movs r0, 0x52 bl lcd_io_set movs r0, 0x10 -_0816F264: +@0816F264: strh r0, [r4, 0xA] ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0816F2A2 + b @0816F2A2 .align 2, 0 .pool -_0816F274: +@0816F274: ldrh r1, [r4, 0xA] movs r2, 0xA ldrsh r0, [r4, r2] cmp r0, 0 - beq _0816F284 + beq @0816F284 subs r0, r1, 0x1 strh r0, [r4, 0xA] - b _0816F2A2 -_0816F284: + b @0816F2A2 +@0816F284: movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -708097,14 +708097,14 @@ _0816F284: bl lcd_io_set adds r0, r5, 0 bl remove_task -_0816F2A2: +@0816F2A2: pop {r4,r5} pop {r0} bx r0 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 @@ -708155,23 +708155,23 @@ 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 movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0xBF - ble _0816F394 + ble @0816F394 ldrh r1, [r4, 0x34] movs r2, 0x34 ldrsh r0, [r4, r2] cmp r0, 0 - beq _0816F336 + beq @0816F336 subs r0, r1, 0x1 strh r0, [r4, 0x34] - b _0816F39A -_0816F336: + b @0816F39A +@0816F336: adds r2, r4, 0 adds r2, 0x3E ldrb r1, [r2] @@ -708201,28 +708201,28 @@ _0816F336: adds r0, r1, 0 subs r0, 0xC0 cmp r0, 0 - bge _0816F378 + bge @0816F378 adds r0, 0x7F -_0816F378: +@0816F378: asrs r0, 7 adds r0, 0x9 lsls r0, 24 lsrs r0, 24 cmp r0, 0xF - bls _0816F386 + bls @0816F386 movs r0, 0xF -_0816F386: +@0816F386: lsls r2, r0, 4 ldrb r1, [r4, 0x5] movs r0, 0xF ands r0, r1 orrs r0, r2 strb r0, [r4, 0x5] - b _0816F39A -_0816F394: + b @0816F39A +@0816F394: adds r0, r4, 0 bl obj_delete_and_free_tiles -_0816F39A: +@0816F39A: add sp, 0x4 pop {r4} pop {r0} @@ -708230,7 +708230,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 @@ -708243,7 +708243,7 @@ sub_816F3A4: @ 816F3A4 movs r3, 0x3C ldrsh r0, [r1, r3] cmp r0, 0 - beq _0816F420 + beq @0816F420 adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -708286,10 +708286,10 @@ sub_816F3A4: @ 816F3A4 movs r2, 0x3 movs r3, 0x2 bl oam_center - b _0816F44C + b @0816F44C .align 2, 0 .pool -_0816F420: +@0816F420: ldrh r0, [r1, 0x24] strh r0, [r4, 0x24] movs r0, 0x3C @@ -708312,23 +708312,23 @@ _0816F420: adds r0, r2 ldrh r0, [r0, 0x22] strh r0, [r4, 0x22] -_0816F44C: +@0816F44C: pop {r4} pop {r0} bx r0 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 ldrsh r0, [r1, r2] cmp r0, 0 - beq _0816F464 + beq @0816F464 ldr r0, =sub_816F46C + 1 str r0, [r1, 0x1C] -_0816F464: +@0816F464: pop {r0} bx r0 .align 2, 0 @@ -708336,7 +708336,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 @@ -708348,7 +708348,7 @@ sub_816F46C: @ 816F46C movs r1, 0x20 ldrsh r0, [r7, r1] cmp r0, 0x74 - bgt _0816F4AC + bgt @0816F4AC ldrh r0, [r7, 0x26] ldrh r1, [r7, 0x22] adds r0, r1 @@ -708363,10 +708363,10 @@ sub_816F46C: @ 816F46C strh r0, [r7, 0x36] ldr r0, =sub_816F5B4 + 1 str r0, [r7, 0x1C] - b _0816F59E + b @0816F59E .align 2, 0 .pool -_0816F4AC: +@0816F4AC: ldrh r1, [r7, 0x36] ldr r5, =0x08329f40 lsls r0, r1, 24 @@ -708384,9 +708384,9 @@ _0816F4AC: lsls r2, 16 asrs r0, r2, 16 cmp r0, 0 - bge _0816F4D2 + bge @0816F4D2 adds r0, 0x1F -_0816F4D2: +@0816F4D2: asrs r0, 5 strh r0, [r7, 0x26] subs r0, r4, 0x1 @@ -708394,18 +708394,18 @@ _0816F4D2: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0816F4E8 + beq @0816F4E8 ldrh r0, [r7, 0x22] adds r0, 0x1 strh r0, [r7, 0x22] -_0816F4E8: +@0816F4E8: lsls r0, r3, 16 asrs r0, 16 negs r0, r0 cmp r0, 0 - bge _0816F4F4 + bge @0816F4F4 adds r0, 0xF -_0816F4F4: +@0816F4F4: lsls r1, r0, 12 lsrs r1, 16 ldrh r4, [r7, 0x32] @@ -708425,9 +708425,9 @@ _0816F4F4: adds r0, r1, 0 muls r0, r4 cmp r0, 0 - bge _0816F51E + bge @0816F51E adds r0, 0xFF -_0816F51E: +@0816F51E: lsls r0, 8 lsrs r0, 16 mov r8, r0 @@ -708436,26 +708436,26 @@ _0816F51E: negs r0, r2 muls r0, r3 cmp r0, 0 - bge _0816F532 + bge @0816F532 adds r0, 0xFF -_0816F532: +@0816F532: lsls r0, 8 lsrs r0, 16 mov r10, r0 adds r0, r2, 0 muls r0, r4 cmp r0, 0 - bge _0816F542 + bge @0816F542 adds r0, 0xFF -_0816F542: +@0816F542: lsls r0, 8 lsrs r5, r0, 16 adds r0, r1, 0 muls r0, r3 cmp r0, 0 - bge _0816F550 + bge @0816F550 adds r0, 0xFF -_0816F550: +@0816F550: lsls r6, r0, 8 lsrs r6, 16 ldrh r0, [r7, 0x30] @@ -708492,7 +708492,7 @@ _0816F550: mov r2, r9 adds r3, r5, 0 bl rotscale_set_direct -_0816F59E: +@0816F59E: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -708506,7 +708506,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 @@ -708549,7 +708549,7 @@ sub_816F5B4: @ 816F5B4 movs r2, 0x36 ldrsh r0, [r4, r2] cmp r0, 0x40 - beq _0816F64C + beq @0816F64C adds r0, r1, 0 subs r0, 0x8 strh r0, [r4, 0x36] @@ -708563,9 +708563,9 @@ sub_816F5B4: @ 816F5B4 movs r3, 0 ldrsh r0, [r0, r3] cmp r0, 0 - bge _0816F62E + bge @0816F62E adds r0, 0x3F -_0816F62E: +@0816F62E: asrs r0, 6 strh r0, [r4, 0x24] lsls r0, r1, 24 @@ -708574,20 +708574,20 @@ _0816F62E: movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bge _0816F642 + bge @0816F642 adds r0, 0x3F -_0816F642: +@0816F642: asrs r0, 6 strh r0, [r4, 0x26] - b _0816F654 + b @0816F654 .align 2, 0 .pool -_0816F64C: +@0816F64C: movs r0, 0 strh r0, [r4, 0x36] ldr r0, =sub_816F660 + 1 str r0, [r4, 0x1C] -_0816F654: +@0816F654: add sp, 0x4 pop {r4} pop {r0} @@ -708597,13 +708597,13 @@ _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 ldrsh r0, [r1, r2] cmp r0, 0x2 - beq _0816F6C0 + beq @0816F6C0 ldrh r0, [r1, 0x36] adds r0, 0x8 strh r0, [r1, 0x36] @@ -708614,9 +708614,9 @@ sub_816F660: @ 816F660 movs r4, 0 ldrsh r0, [r0, r4] cmp r0, 0 - bge _0816F684 + bge @0816F684 adds r0, 0xF -_0816F684: +@0816F684: asrs r0, 4 adds r0, 0x40 lsls r0, 16 @@ -708629,9 +708629,9 @@ _0816F684: movs r4, 0 ldrsh r0, [r0, r4] cmp r0, 0 - bge _0816F6A0 + bge @0816F6A0 adds r0, 0x3F -_0816F6A0: +@0816F6A0: asrs r0, 6 strh r0, [r1, 0x24] lsls r0, r2, 24 @@ -708640,18 +708640,18 @@ _0816F6A0: movs r2, 0 ldrsh r0, [r0, r2] cmp r0, 0 - bge _0816F6B4 + bge @0816F6B4 adds r0, 0x3F -_0816F6B4: +@0816F6B4: asrs r0, 6 strh r0, [r1, 0x26] - b _0816F6C4 + b @0816F6C4 .align 2, 0 .pool -_0816F6C0: +@0816F6C0: ldr r0, =sub_816F6D0 + 1 str r0, [r1, 0x1C] -_0816F6C4: +@0816F6C4: pop {r4} pop {r0} bx r0 @@ -708660,7 +708660,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] @@ -708669,11 +708669,11 @@ sub_816F6D0: @ 816F6D0 movs r3, 0x38 ldrsh r0, [r4, r3] cmp r1, r0 - bge _0816F6E8 + bge @0816F6E8 adds r0, r2, 0x4 strh r0, [r4, 0x22] - b _0816F744 -_0816F6E8: + b @0816F744 +@0816F6E8: movs r0, 0x1 strh r0, [r4, 0x3C] adds r2, r4, 0 @@ -708718,7 +708718,7 @@ _0816F6E8: movs r2, 0x3 movs r3, 0x2 bl oam_center -_0816F744: +@0816F744: pop {r4} pop {r0} bx r0 @@ -708727,7 +708727,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] @@ -708736,11 +708736,11 @@ sub_816F750: @ 816F750 movs r3, 0x38 ldrsh r0, [r4, r3] cmp r1, r0 - bge _0816F768 + bge @0816F768 adds r0, r2, 0x4 strh r0, [r4, 0x22] - b _0816F7C4 -_0816F768: + b @0816F7C4 +@0816F768: movs r0, 0x1 strh r0, [r4, 0x3C] adds r2, r4, 0 @@ -708785,7 +708785,7 @@ _0816F768: movs r2, 0x3 movs r3, 0x2 bl oam_center -_0816F7C4: +@0816F7C4: pop {r4} pop {r0} bx r0 @@ -708794,7 +708794,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 @@ -708879,20 +708879,20 @@ sub_816F7D0: @ 816F7D0 bl obj_anim_image_start mov r1, r8 cmp r1, 0 - bne _0816F898 + bne @0816F898 mov r0, r9 adds r0, 0x1C adds r0, r5, r0 ldr r1, =sub_816F454 + 1 - b _0816F8A0 + b @0816F8A0 .align 2, 0 .pool -_0816F898: +@0816F898: mov r0, r9 adds r0, 0x1C adds r0, r5, r0 ldr r1, =sub_816F750 + 1 -_0816F8A0: +@0816F8A0: str r1, [r0] str r7, [sp, 0x10] mov r2, r10 @@ -709034,35 +709034,35 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0x4 - bhi _0816FA62 + bhi @0816FA62 lsls r0, 2 - ldr r1, =_0816F9F0 + ldr r1, =@0816F9F0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0816F9F0: - .4byte _0816FA04 - .4byte _0816FA12 - .4byte _0816FA30 - .4byte _0816FA62 - .4byte _0816FA50 -_0816FA04: +@0816F9F0: + .4byte @0816FA04 + .4byte @0816FA12 + .4byte @0816FA30 + .4byte @0816FA62 + .4byte @0816FA50 +@0816FA04: adds r0, r4, 0 movs r1, 0 bl obj_anim_image_start_if_different ldrh r0, [r4, 0x20] subs r0, 0x1 - b _0816FA60 -_0816FA12: + b @0816FA60 +@0816FA12: adds r0, r4, 0 movs r1, 0 bl obj_anim_image_start_if_different @@ -709071,103 +709071,103 @@ _0816FA12: movs r1, 0x7 ands r0, r1 cmp r0, 0 - bne _0816FAAA + bne @0816FAAA ldrh r0, [r4, 0x20] adds r0, 0x1 - b _0816FA60 + b @0816FA60 .align 2, 0 .pool -_0816FA30: +@0816FA30: ldrh r2, [r4, 0x20] movs r1, 0x20 ldrsh r0, [r4, r1] cmp r0, 0x78 - ble _0816FA46 + ble @0816FA46 ldr r0, =0x030062a0 ldr r0, [r0] movs r1, 0x7 ands r0, r1 cmp r0, 0 - beq _0816FA6E -_0816FA46: + beq @0816FA6E +@0816FA46: adds r0, r2, 0x1 - b _0816FA60 + b @0816FA60 .align 2, 0 .pool -_0816FA50: +@0816FA50: ldrh r2, [r4, 0x20] movs r0, 0x20 ldrsh r1, [r4, r0] movs r0, 0x20 negs r0, r0 cmp r1, r0 - ble _0816FA62 + ble @0816FA62 subs r0, r2, 0x2 -_0816FA60: +@0816FA60: strh r0, [r4, 0x20] -_0816FA62: +@0816FA62: ldr r0, =0x030062a0 ldr r0, [r0] movs r1, 0x7 ands r0, r1 cmp r0, 0 - bne _0816FAAA -_0816FA6E: + bne @0816FAAA +@0816FA6E: movs r1, 0x26 ldrsh r5, [r4, r1] cmp r5, 0 - beq _0816FA80 + beq @0816FA80 movs r0, 0 strh r0, [r4, 0x26] - b _0816FAAA + b @0816FAAA .align 2, 0 .pool -_0816FA80: +@0816FA80: bl GenerateRandomNumber movs r1, 0x3 ands r1, r0 cmp r1, 0x1 - beq _0816FAA8 + beq @0816FAA8 cmp r1, 0x1 - bgt _0816FA96 + bgt @0816FA96 cmp r1, 0 - beq _0816FA9E - b _0816FAAA -_0816FA96: + beq @0816FA9E + b @0816FAAA +@0816FA96: cmp r1, 0x3 - bgt _0816FAAA + bgt @0816FAAA strh r5, [r4, 0x26] - b _0816FAAA -_0816FA9E: + b @0816FAAA +@0816FA9E: ldr r0, =0x0000ffff strh r0, [r4, 0x26] - b _0816FAAA + b @0816FAAA .align 2, 0 .pool -_0816FAA8: +@0816FAA8: strh r1, [r4, 0x26] -_0816FAAA: +@0816FAAA: pop {r4,r5} pop {r0} bx r0 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 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _0816FACA + beq @0816FACA cmp r0, 0x1 - ble _0816FB12 + ble @0816FB12 cmp r0, 0x2 - beq _0816FAEA + beq @0816FAEA cmp r0, 0x3 - beq _0816FB04 - b _0816FB12 -_0816FACA: + beq @0816FB04 + b @0816FB12 +@0816FACA: movs r2, 0x24 ldrsh r0, [r4, r2] movs r2, 0x20 @@ -709175,41 +709175,41 @@ _0816FACA: adds r0, r1 ldr r1, =0x0000012f cmp r0, r1 - bgt _0816FAE4 + bgt @0816FAE4 ldrh r0, [r4, 0x24] adds r0, 0x8 - b _0816FB10 + b @0816FB10 .align 2, 0 .pool -_0816FAE4: +@0816FAE4: movs r0, 0x2 strh r0, [r4, 0x2E] - b _0816FB12 -_0816FAEA: + b @0816FB12 +@0816FAEA: movs r1, 0x24 ldrsh r0, [r4, r1] movs r2, 0x20 ldrsh r1, [r4, r2] adds r0, r1 cmp r0, 0x78 - ble _0816FAFE + ble @0816FAFE ldrh r0, [r4, 0x24] subs r0, 0x1 - b _0816FB10 -_0816FAFE: + b @0816FB10 +@0816FAFE: movs r0, 0x3 strh r0, [r4, 0x2E] - b _0816FB12 -_0816FB04: + b @0816FB12 +@0816FB04: ldrh r1, [r4, 0x24] movs r2, 0x24 ldrsh r0, [r4, r2] cmp r0, 0 - ble _0816FB12 + ble @0816FB12 subs r0, r1, 0x2 -_0816FB10: +@0816FB10: strh r0, [r4, 0x24] -_0816FB12: +@0816FB12: ldrh r0, [r4, 0x30] lsls r0, 24 lsrs r0, 24 @@ -709230,40 +709230,40 @@ _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 ldrsh r0, [r6, r1] cmp r0, 0x5 - bls _0816FB46 - b _0816FD38 -_0816FB46: + bls @0816FB46 + b @0816FD38 +@0816FB46: lsls r0, 2 - ldr r1, =_0816FB54 + ldr r1, =@0816FB54 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0816FB54: - .4byte _0816FB6C - .4byte _0816FB94 - .4byte _0816FBB4 - .4byte _0816FC5C - .4byte _0816FCC4 - .4byte _0816FCF4 -_0816FB6C: +@0816FB54: + .4byte @0816FB6C + .4byte @0816FB94 + .4byte @0816FBB4 + .4byte @0816FC5C + .4byte @0816FCC4 + .4byte @0816FCF4 +@0816FB6C: ldrh r1, [r6, 0x30] movs r2, 0x30 ldrsh r0, [r6, r2] cmp r0, 0 - beq _0816FB7C + beq @0816FB7C subs r0, r1, 0x1 strh r0, [r6, 0x30] - b _0816FD38 -_0816FB7C: + b @0816FD38 +@0816FB7C: adds r2, r6, 0 adds r2, 0x3E ldrb r0, [r2] @@ -709274,14 +709274,14 @@ _0816FB7C: adds r0, r6, 0 movs r1, 0x1 bl sub_8008258 - b _0816FCE6 -_0816FB94: + b @0816FCE6 +@0816FB94: ldr r0, =0x030062a0 ldr r0, [r0] cmp r0, 0x90 - beq _0816FB9E - b _0816FD38 -_0816FB9E: + beq @0816FB9E + b @0816FD38 +@0816FB9E: ldrh r0, [r6, 0x2E] adds r0, 0x1 strh r0, [r6, 0x2E] @@ -709289,21 +709289,21 @@ _0816FB9E: strh r0, [r6, 0x30] movs r0, 0x2 strh r0, [r6, 0x34] - b _0816FD38 + b @0816FD38 .align 2, 0 .pool -_0816FBB4: +@0816FBB4: ldrh r1, [r6, 0x34] movs r2, 0x34 ldrsh r0, [r6, r2] cmp r0, 0 - bne _0816FC66 + bne @0816FC66 movs r0, 0x2 strh r0, [r6, 0x34] movs r1, 0x30 ldrsh r0, [r6, r1] cmp r0, 0 - beq _0816FC14 + beq @0816FC14 lsls r0, 1 ldr r4, =0x08d85c50 adds r0, r4 @@ -709333,10 +709333,10 @@ _0816FBB4: ldrh r0, [r6, 0x30] subs r0, 0x1 strh r0, [r6, 0x30] - b _0816FD38 + b @0816FD38 .align 2, 0 .pool -_0816FC14: +@0816FC14: movs r1, 0x30 ldrsh r0, [r6, r1] lsls r0, 1 @@ -709365,26 +709365,26 @@ _0816FC14: adds r1, r5, 0 movs r2, 0x1 bl CpuSet - b _0816FCE6 + b @0816FCE6 .align 2, 0 .pool -_0816FC5C: +@0816FC5C: ldrh r1, [r6, 0x34] movs r2, 0x34 ldrsh r0, [r6, r2] cmp r0, 0 - beq _0816FC6C -_0816FC66: + beq @0816FC6C +@0816FC66: subs r0, r1, 0x1 strh r0, [r6, 0x34] - b _0816FD38 -_0816FC6C: + b @0816FD38 +@0816FC6C: movs r0, 0x2 strh r0, [r6, 0x34] movs r1, 0x30 ldrsh r0, [r6, r1] cmp r0, 0x9 - bgt _0816FCE6 + bgt @0816FCE6 lsls r0, 1 ldr r4, =0x08d85c50 adds r0, r4 @@ -709414,16 +709414,16 @@ _0816FC6C: ldrh r0, [r6, 0x30] adds r0, 0x1 strh r0, [r6, 0x30] - b _0816FD38 + b @0816FD38 .align 2, 0 .pool -_0816FCC4: +@0816FCC4: ldr r0, =0x030062a0 ldr r1, [r0] movs r0, 0x88 lsls r0, 1 cmp r1, r0 - bne _0816FD38 + bne @0816FD38 adds r0, r6, 0 movs r1, 0x2 bl sub_8008258 @@ -709434,14 +709434,14 @@ _0816FCC4: movs r1, 0x4 orrs r0, r1 strb r0, [r6, 0x1] -_0816FCE6: +@0816FCE6: ldrh r0, [r6, 0x2E] adds r0, 0x1 strh r0, [r6, 0x2E] - b _0816FD38 + b @0816FD38 .align 2, 0 .pool -_0816FCF4: +@0816FCF4: ldr r1, =0x085e4f48 movs r2, 0x32 ldrsh r0, [r6, r2] @@ -709461,22 +709461,22 @@ _0816FCF4: movs r1, 0x32 ldrsh r0, [r6, r1] cmp r0, 0x3 - bgt _0816FD24 + bgt @0816FD24 movs r2, 0x24 ldrsh r0, [r6, r2] negs r0, r0 strh r0, [r6, 0x24] -_0816FD24: +@0816FD24: adds r0, r6, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0816FD38 + beq @0816FD38 adds r0, r6, 0 bl obj_delete_and_free_tiles -_0816FD38: +@0816FD38: pop {r4-r6} pop {r0} bx r0 @@ -709485,27 +709485,27 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _0816FD7C + beq @0816FD7C cmp r0, 0x1 - bgt _0816FD5A + bgt @0816FD5A cmp r0, 0 - beq _0816FD60 - b _0816FDB0 -_0816FD5A: + beq @0816FD60 + b @0816FDB0 +@0816FD5A: cmp r0, 0x2 - beq _0816FD9C - b _0816FDB0 -_0816FD60: + beq @0816FD9C + b @0816FDB0 +@0816FD60: ldr r0, =0x030062a0 ldr r0, [r0] cmp r0, 0x80 - bne _0816FDB0 + bne @0816FDB0 adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -709513,44 +709513,44 @@ _0816FD60: negs r1, r1 ands r1, r0 strb r1, [r2] - b _0816FD90 + b @0816FD90 .align 2, 0 .pool -_0816FD7C: +@0816FD7C: ldr r0, =0x030062a0 ldr r1, [r0] movs r0, 0x88 lsls r0, 1 cmp r1, r0 - bne _0816FDB0 + bne @0816FDB0 adds r0, r4, 0 movs r1, 0x3 bl sub_8008258 -_0816FD90: +@0816FD90: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _0816FDB0 + b @0816FDB0 .align 2, 0 .pool -_0816FD9C: +@0816FD9C: adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0816FDB0 + beq @0816FDB0 adds r0, r4, 0 bl obj_delete_and_free_tiles -_0816FDB0: +@0816FDB0: pop {r4} pop {r0} bx r0 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 @@ -709564,7 +709564,7 @@ sub_816FDB8: @ 816FDB8 lsrs r1, 16 str r1, [sp, 0x4] movs r7, 0 -_0816FDD2: +@0816FDD2: lsls r5, r7, 2 ldr r0, =0x085e4e94 adds r0, 0x2 @@ -709635,7 +709635,7 @@ _0816FDD2: lsls r0, 16 lsrs r7, r0, 16 cmp r7, 0x8 - bls _0816FDD2 + bls @0816FDD2 ldr r0, =0x085e4f8c ldr r2, [sp, 0x8] subs r2, 0x6 @@ -709685,7 +709685,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 @@ -709695,7 +709695,7 @@ sub_816FEDC: @ 816FEDC movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - beq _0816FF48 + beq @0816FF48 ldr r2, =0x08329f40 ldrh r1, [r4, 0x32] lsls r0, r1, 24 @@ -709714,9 +709714,9 @@ sub_816FEDC: @ 816FEDC muls r1, r2 adds r0, r1, 0 cmp r1, 0 - bge _0816FF18 + bge @0816FF18 adds r0, 0xFF -_0816FF18: +@0816FF18: lsls r0, 8 lsrs r6, r0, 16 lsls r0, r3, 16 @@ -709724,17 +709724,17 @@ _0816FF18: negs r0, r3 muls r0, r2 cmp r0, 0 - bge _0816FF2A + bge @0816FF2A adds r0, 0xFF -_0816FF2A: +@0816FF2A: lsls r0, 8 lsrs r5, r0, 16 adds r0, r3, 0 muls r0, r2 cmp r0, 0 - bge _0816FF38 + bge @0816FF38 adds r0, 0xFF -_0816FF38: +@0816FF38: lsls r0, 8 lsrs r2, r0, 16 adds r1, r6, 0 @@ -709742,16 +709742,16 @@ _0816FF38: str r1, [sp] movs r0, 0x1 bl rotscale_set_direct -_0816FF48: +@0816FF48: movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0x1 - beq _0816FF9C + beq @0816FF9C cmp r0, 0x1 - ble _0816FF58 + ble @0816FF58 cmp r0, 0x2 - beq _0816FFFE -_0816FF58: + beq @0816FFFE +@0816FF58: ldrb r0, [r4, 0x1] movs r1, 0x3 orrs r0, r1 @@ -709782,10 +709782,10 @@ _0816FF58: strh r0, [r4, 0x30] strh r1, [r4, 0x32] strh r1, [r4, 0x34] - b _08170038 + b @08170038 .align 2, 0 .pool -_0816FF9C: +@0816FF9C: ldrh r0, [r4, 0x34] lsls r0, 24 lsrs r0, 24 @@ -709814,7 +709814,7 @@ _0816FF9C: movs r1, 0x10 negs r1, r1 cmp r0, r1 - bgt _08170038 + bgt @08170038 ldrb r0, [r4, 0x5] movs r1, 0xC orrs r0, r1 @@ -709832,8 +709832,8 @@ _0816FF9C: movs r0, 0 strh r0, [r4, 0x32] movs r0, 0x10 - b _08170036 -_0816FFFE: + b @08170036 +@0816FFFE: ldrh r0, [r4, 0x34] lsls r0, 24 lsrs r0, 24 @@ -709856,12 +709856,12 @@ _0816FFFE: bl __modsi3 lsls r0, 16 cmp r0, 0 - bne _08170038 + bne @08170038 ldrh r0, [r4, 0x34] adds r0, 0x1 -_08170036: +@08170036: strh r0, [r4, 0x34] -_08170038: +@08170038: add sp, 0x4 pop {r4-r6} pop {r0} @@ -709869,19 +709869,19 @@ _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 movs r1, 0x2E ldrsh r0, [r5, r1] cmp r0, 0 - beq _08170056 + beq @08170056 adds r4, r5, 0 adds r4, 0x3E cmp r0, 0x1 - beq _0817008E -_08170056: + beq @0817008E +@08170056: adds r4, r5, 0 adds r4, 0x3E ldrb r1, [r4] @@ -709909,20 +709909,20 @@ _08170056: strh r0, [r5, 0x30] movs r0, 0x1 strh r0, [r5, 0x2E] -_0817008E: +@0817008E: ldrh r0, [r5, 0x3C] adds r0, 0x1 strh r0, [r5, 0x3C] movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _081700A6 + beq @081700A6 ldrb r0, [r4] movs r1, 0x4 orrs r0, r1 strb r0, [r4] - b _081700BE -_081700A6: + b @081700BE +@081700A6: ldrb r0, [r4] movs r1, 0x5 negs r1, r1 @@ -709932,10 +709932,10 @@ _081700A6: movs r2, 0x30 ldrsh r0, [r5, r2] cmp r0, 0x3F - bgt _081700BE + bgt @081700BE adds r0, r1, 0x1 strh r0, [r5, 0x30] -_081700BE: +@081700BE: ldr r1, =0x08329f40 ldrh r0, [r5, 0x30] lsls r0, 24 @@ -709966,7 +709966,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] @@ -709997,12 +709997,12 @@ sub_81700F8: @ 81700F8 ldr r0, =0x03006210 ldrh r0, [r0] cmp r0, 0 - beq _08170148 + beq @08170148 cmp r0, 0x2 - bne _0817014C -_08170148: + bne @0817014C +@08170148: bl init_sav2 -_0817014C: +@0817014C: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x15] @@ -710023,7 +710023,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 @@ -710048,7 +710048,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 @@ -710104,7 +710104,7 @@ sub_81701C4: @ 81701C4 thumb_func_end sub_81701C4 thumb_func_start sub_8170260 -sub_8170260: @ 8170260 +sub_8170260: ; 8170260 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -710114,7 +710114,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 call_obj_callbacks @@ -710126,7 +710126,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 @@ -710136,26 +710136,26 @@ sub_8170290: @ 8170290 ldrh r0, [r0] adds r4, r1, 0 cmp r0, 0x6 - bls _081702A6 - b _08170416 -_081702A6: + bls @081702A6 + b @08170416 +@081702A6: lsls r0, 2 - ldr r1, =_081702BC + ldr r1, =@081702BC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081702BC: - .4byte _081702D8 - .4byte _08170300 - .4byte _08170358 - .4byte _08170380 - .4byte _08170394 - .4byte _081703C0 - .4byte _081703E8 -_081702D8: +@081702BC: + .4byte @081702D8 + .4byte @08170300 + .4byte @08170358 + .4byte @08170380 + .4byte @08170394 + .4byte @081703C0 + .4byte @081703E8 +@081702D8: ldr r0, [r4] adds r0, 0x8 movs r1, 0 @@ -710169,10 +710169,10 @@ _081702D8: ldr r1, [r4] ldr r0, =0x0000088c adds r1, r0 - b _081703D8 + b @081703D8 .align 2, 0 .pool -_08170300: +@08170300: movs r0, 0x1 movs r1, 0 movs r2, 0x27 @@ -710208,10 +710208,10 @@ _08170300: movs r1, 0 movs r2, 0x10 movs r3, 0 - b _081703CC + b @081703CC .align 2, 0 .pool -_08170358: +@08170358: movs r1, 0x82 lsls r1, 5 movs r0, 0 @@ -710224,62 +710224,62 @@ _08170358: ldr r1, [r0] ldr r0, =0x0000088c adds r1, r0 - b _081703D8 + b @081703D8 .align 2, 0 .pool -_08170380: +@08170380: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08170416 + bne @08170416 ldr r1, [r4] - b _081703D4 + b @081703D4 .align 2, 0 .pool -_08170394: +@08170394: bl sub_81230AC lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bne _081703A6 + bne @081703A6 bl sub_8170428 - b _08170416 -_081703A6: + b @08170416 +@081703A6: cmp r0, 0x3 - blt _08170416 + blt @08170416 cmp r0, 0x5 - bgt _08170416 + bgt @08170416 ldr r0, =0x0203bcd0 ldr r1, [r0] ldr r0, =0x0000088c adds r1, r0 - b _081703D8 + b @081703D8 .align 2, 0 .pool -_081703C0: +@081703C0: movs r0, 0x1 negs r0, r0 movs r1, 0 str r1, [sp] movs r2, 0 movs r3, 0x10 -_081703CC: +@081703CC: bl sub_80A1AD4 ldr r0, =0x0203bcd0 ldr r1, [r0] -_081703D4: +@081703D4: ldr r2, =0x0000088c adds r1, r2 -_081703D8: +@081703D8: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _08170416 + b @08170416 .align 2, 0 .pool -_081703E8: +@081703E8: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -710287,7 +710287,7 @@ _081703E8: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _08170416 + bne @08170416 bl sub_812305C ldr r4, =0x0203bcd0 ldr r0, [r4] @@ -710295,12 +710295,12 @@ _081703E8: bl set_callback2 ldr r0, [r4] cmp r0, 0 - beq _08170412 + beq @08170412 bl free str r5, [r4] -_08170412: +@08170412: bl Window_FreeMemory -_08170416: +@08170416: add sp, 0xC pop {r4,r5} pop {r0} @@ -710310,14 +710310,14 @@ _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 ldr r0, [r4] ldrb r0, [r0, 0xA] cmp r0, 0 - beq _08170460 + beq @08170460 movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels @@ -710333,17 +710333,17 @@ sub_8170428: @ 8170428 bl Print movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - b _08170470 + b @08170470 .align 2, 0 .pool -_08170460: +@08170460: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels movs r0, 0 movs r1, 0x3 bl Window_CopyToVram -_08170470: +@08170470: add sp, 0xC pop {r4} pop {r0} @@ -710351,7 +710351,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 @@ -710552,7 +710552,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} @@ -710583,28 +710583,28 @@ sub_8170660: @ 8170660 movs r1, 0x26 ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _081706F0 + beq @081706F0 cmp r0, 0x1 - bgt _081706B4 + bgt @081706B4 cmp r0, 0 - beq _081706BA - b _08170814 + beq @081706BA + b @08170814 .align 2, 0 .pool -_081706B4: +@081706B4: cmp r0, 0x2 - beq _08170708 - b _08170814 -_081706BA: + beq @08170708 + b @08170814 +@081706BA: ldrh r0, [r5, 0x1E] adds r1, r0, 0x1 strh r1, [r5, 0x1E] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - bgt _081706CA - b _08170814 -_081706CA: + bgt @081706CA + b @08170814 +@081706CA: strh r3, [r5, 0x1E] ldrh r1, [r5, 0x20] adds r1, 0x1 @@ -710620,32 +710620,32 @@ _081706CA: movs r2, 0x20 ldrsh r0, [r5, r2] cmp r0, 0x8 - beq _081706EE - b _08170814 -_081706EE: - b _08170700 -_081706F0: + beq @081706EE + b @08170814 +@081706EE: + b @08170700 +@081706F0: ldrh r0, [r5, 0x1C] adds r0, 0x1 strh r0, [r5, 0x1C] lsls r0, 16 asrs r0, 16 cmp r0, 0x1E - beq _08170700 - b _08170814 -_08170700: + beq @08170700 + b @08170814 +@08170700: ldrh r0, [r5, 0x26] adds r0, 0x1 strh r0, [r5, 0x26] - b _08170814 -_08170708: + b @08170814 +@08170708: ldrh r0, [r5, 0x1E] adds r1, r0, 0x1 strh r1, [r5, 0x1E] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _08170814 + ble @08170814 strh r3, [r5, 0x1E] ldrh r1, [r5, 0x20] subs r1, 0x1 @@ -710661,7 +710661,7 @@ _08170708: movs r0, 0x20 ldrsh r4, [r5, r0] cmp r4, 0 - bne _08170814 + bne @08170814 movs r0, 0 bl sub_80A477C ldr r0, =0x02022e24 @@ -710678,12 +710678,12 @@ _08170708: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne _0817076C + bne @0817076C movs r0, 0x1 movs r1, 0x3 movs r2, 0 bl lcd_bg_operations -_0817076C: +@0817076C: movs r0, 0 bl lcd_io_get adds r1, r0, 0 @@ -710760,7 +710760,7 @@ _0817076C: strb r2, [r0, 0x5] adds r0, r7, 0 bl move_anim_task_del -_08170814: +@08170814: pop {r3} mov r8, r3 pop {r4-r7} @@ -710771,7 +710771,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 @@ -710881,7 +710881,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 @@ -710904,7 +710904,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 @@ -710974,7 +710974,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 @@ -710992,7 +710992,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 @@ -711013,7 +711013,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 @@ -711032,7 +711032,7 @@ sub_8170A38: @ 8170A38 movs r2, 0x1E ldrsh r1, [r4, r2] cmp r0, r1 - blt _08170AF8 + blt @08170AF8 strh r6, [r4, 0x8] ldr r0, =0x0000d709 bl gpu_pal_tags_index_of @@ -711042,29 +711042,29 @@ sub_8170A38: @ 8170A38 ldrsh r0, [r4, r3] movs r1, 0x2 cmp r0, 0 - bne _08170A76 + bne @08170A76 movs r1, 0x6 -_08170A76: +@08170A76: movs r3, 0xA ldrsh r0, [r4, r3] cmp r0, 0 - beq _08170A8C + beq @08170A8C cmp r0, 0x1 - beq _08170AC8 - b _08170AF8 + beq @08170AC8 + b @08170AF8 .align 2, 0 .pool -_08170A8C: +@08170A8C: ldrh r0, [r4, 0xC] adds r0, 0x2 strh r0, [r4, 0xC] lsls r0, 16 asrs r0, 16 cmp r0, 0x10 - ble _08170A9E + ble @08170A9E movs r0, 0x10 strh r0, [r4, 0xC] -_08170A9E: +@08170A9E: lsls r0, r2, 4 movs r2, 0x80 lsls r2, 1 @@ -711077,22 +711077,22 @@ _08170A9E: movs r3, 0xC ldrsh r0, [r4, r3] cmp r0, 0x10 - bne _08170AF8 + bne @08170AF8 ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] - b _08170AF8 + b @08170AF8 .align 2, 0 .pool -_08170AC8: +@08170AC8: ldrh r0, [r4, 0xC] subs r0, 0x2 strh r0, [r4, 0xC] lsls r0, 16 cmp r0, 0 - bge _08170AD6 + bge @08170AD6 strh r6, [r4, 0xC] -_08170AD6: +@08170AD6: lsls r0, r2, 4 movs r2, 0x80 lsls r2, 1 @@ -711105,10 +711105,10 @@ _08170AD6: movs r3, 0xC ldrsh r0, [r4, r3] cmp r0, 0 - bne _08170AF8 + bne @08170AF8 adds r0, r5, 0 bl move_anim_task_del -_08170AF8: +@08170AF8: pop {r4-r6} pop {r0} bx r0 @@ -711117,7 +711117,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 @@ -711134,27 +711134,27 @@ sub_8170B04: @ 8170B04 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _08170B52 + beq @08170B52 cmp r0, 0x1 - bgt _08170B3C + bgt @08170B3C cmp r0, 0 - beq _08170B42 - b _08170BA4 + beq @08170B42 + b @08170BA4 .align 2, 0 .pool -_08170B3C: +@08170B3C: cmp r0, 0x2 - beq _08170B84 - b _08170BA4 -_08170B42: + beq @08170B84 + b @08170BA4 +@08170B42: adds r0, r5, 0 movs r1, 0 bl sub_80A7270 movs r0, 0x80 lsls r0, 1 strh r0, [r4, 0x1C] - b _08170B76 -_08170B52: + b @08170B76 +@08170B52: ldrh r0, [r4, 0x1C] adds r0, 0x30 strh r0, [r4, 0x1C] @@ -711170,15 +711170,15 @@ _08170B52: ldrsh r1, [r4, r0] ldr r0, =0x000002cf cmp r1, r0 - ble _08170BA4 -_08170B76: + ble @08170BA4 +@08170B76: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _08170BA4 + b @08170BA4 .align 2, 0 .pool -_08170B84: +@08170B84: adds r0, r5, 0 bl sub_80A7344 ldr r1, =0x02020630 @@ -711193,7 +711193,7 @@ _08170B84: strb r1, [r0] adds r0, r6, 0 bl move_anim_task_del -_08170BA4: +@08170BA4: pop {r4-r6} pop {r0} bx r0 @@ -711202,7 +711202,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 @@ -711219,7 +711219,7 @@ sub_8170BB0: @ 8170BB0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08170BF8 + bne @08170BF8 ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 @@ -711228,10 +711228,10 @@ sub_8170BB0: @ 8170BB0 movs r0, 0x64 muls r0, r1 ldr r1, =0x020244ec - b _08170C08 + b @08170C08 .align 2, 0 .pool -_08170BF8: +@08170BF8: ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 @@ -711240,7 +711240,7 @@ _08170BF8: movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 -_08170C08: +@08170C08: adds r0, r1 movs r1, 0x26 bl pokemon_getattr @@ -711258,13 +711258,13 @@ _08170C08: movs r0, 0x8 ldrsh r7, [r6, r0] cmp r7, 0 - beq _08170C44 + beq @08170C44 cmp r7, 0x1 - beq _08170CC4 - b _08170CEE + beq @08170CC4 + b @08170CEE .align 2, 0 .pool -_08170C44: +@08170C44: ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0 @@ -711318,10 +711318,10 @@ _08170C44: ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] - b _08170CEE + b @08170CEE .align 2, 0 .pool -_08170CC4: +@08170CC4: movs r1, 0x1C ldrsh r0, [r6, r1] lsls r1, r0, 2 @@ -711330,7 +711330,7 @@ _08170CC4: adds r1, r2 ldrb r0, [r1, 0x4] cmp r0, 0 - bne _08170CEE + bne @08170CEE movs r3, 0x1E ldrsh r0, [r6, r3] lsls r1, r0, 2 @@ -711339,10 +711339,10 @@ _08170CC4: adds r1, r2 ldrb r0, [r1, 0x4] cmp r0, 0 - bne _08170CEE + bne @08170CEE adds r0, r5, 0 bl move_anim_task_del -_08170CEE: +@08170CEE: add sp, 0xC pop {r3,r4} mov r8, r3 @@ -711353,7 +711353,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 @@ -711374,7 +711374,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 @@ -711395,7 +711395,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 @@ -711404,16 +711404,16 @@ sub_8170D4C: @ 8170D4C ldr r0, [r0, 0x8] ldrb r0, [r0, 0x8] cmp r0, 0x5 - bne _08170D70 + bne @08170D70 ldr r1, =0x0203841e ldr r0, =0x0000ffff - b _08170D74 + b @08170D74 .align 2, 0 .pool -_08170D70: +@08170D70: ldr r1, =0x0203841e movs r0, 0 -_08170D74: +@08170D74: strh r0, [r1, 0xE] adds r0, r2, 0 bl move_anim_task_del @@ -711424,76 +711424,76 @@ _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 subs r0, 0x1 cmp r0, 0xB - bhi _08170DFC + bhi @08170DFC lsls r0, 2 - ldr r1, =_08170DA0 + ldr r1, =@08170DA0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08170DA0: - .4byte _08170DD0 - .4byte _08170DD4 - .4byte _08170DD8 - .4byte _08170DFC - .4byte _08170DDC - .4byte _08170DE0 - .4byte _08170DE4 - .4byte _08170DE8 - .4byte _08170DEC - .4byte _08170DF0 - .4byte _08170DF4 - .4byte _08170DF8 -_08170DD0: +@08170DA0: + .4byte @08170DD0 + .4byte @08170DD4 + .4byte @08170DD8 + .4byte @08170DFC + .4byte @08170DDC + .4byte @08170DE0 + .4byte @08170DE4 + .4byte @08170DE8 + .4byte @08170DEC + .4byte @08170DF0 + .4byte @08170DF4 + .4byte @08170DF8 +@08170DD0: movs r0, 0x4 - b _08170DFE -_08170DD4: + b @08170DFE +@08170DD4: movs r0, 0x3 - b _08170DFE -_08170DD8: + b @08170DFE +@08170DD8: movs r0, 0x1 - b _08170DFE -_08170DDC: + b @08170DFE +@08170DDC: movs r0, 0x2 - b _08170DFE -_08170DE0: + b @08170DFE +@08170DE0: movs r0, 0x5 - b _08170DFE -_08170DE4: + b @08170DFE +@08170DE4: movs r0, 0x6 - b _08170DFE -_08170DE8: + b @08170DFE +@08170DE8: movs r0, 0x7 - b _08170DFE -_08170DEC: + b @08170DFE +@08170DEC: movs r0, 0x8 - b _08170DFE -_08170DF0: + b @08170DFE +@08170DF0: movs r0, 0x9 - b _08170DFE -_08170DF4: + b @08170DFE +@08170DF4: movs r0, 0xA - b _08170DFE -_08170DF8: + b @08170DFE +@08170DF8: movs r0, 0xB - b _08170DFE -_08170DFC: + b @08170DFE +@08170DFC: movs r0, 0 -_08170DFE: +@08170DFE: pop {r1} bx r1 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 @@ -711594,7 +711594,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 @@ -711612,10 +711612,10 @@ sub_8170EF0: @ 8170EF0 ldrh r1, [r0, 0x2E] ldr r0, =0x0000ffff cmp r1, r0 - bne _08170F1A + bne @08170F1A adds r0, r3, 0 bl move_anim_task_del -_08170F1A: +@08170F1A: pop {r0} bx r0 .align 2, 0 @@ -711623,7 +711623,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 @@ -711636,16 +711636,16 @@ sub_8170F2C: @ 8170F2C lsls r1, 2 ands r0, r1 cmp r0, 0 - beq _08170F50 + beq @08170F50 movs r6, 0x20 movs r5, 0xB - b _08170F54 + b @08170F54 .align 2, 0 .pool -_08170F50: +@08170F50: movs r6, 0x17 movs r5, 0x5 -_08170F54: +@08170F54: ldr r0, =0x02024208 ldrh r0, [r0] bl ball_number_to_ball_processing_index @@ -711736,7 +711736,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 @@ -711755,7 +711755,7 @@ sub_8171030: @ 8171030 adds r0, 0x2B ldrb r0, [r0] cmp r0, 0x1 - bne _0817108A + bne @0817108A movs r0, 0x3D movs r1, 0 bl audio_play_and_stuff @@ -711779,7 +711779,7 @@ sub_8171030: @ 8171030 bl AddTask ldr r0, =sub_8170EF0 + 1 str r0, [r4] -_0817108A: +@0817108A: pop {r4-r6} pop {r0} bx r0 @@ -711788,7 +711788,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 @@ -711808,7 +711808,7 @@ sub_81710A8: @ 81710A8 ldrb r0, [r0] lsls r0, 27 cmp r0, 0 - bge _081710F4 + bge @081710F4 movs r0, 0 bl battle_get_side_with_given_state lsls r0, 24 @@ -711823,7 +711823,7 @@ sub_81710A8: @ 81710A8 bl obj_anim_image_start adds r0, r5, 0 bl remove_task -_081710F4: +@081710F4: pop {r4-r6} pop {r0} bx r0 @@ -711832,7 +711832,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] @@ -711857,26 +711857,26 @@ 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 bl sub_80A6900 lsls r0, 24 cmp r0, 0 - beq _081711D2 + beq @081711D2 ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x8] cmp r0, 0x5 - bne _08171160 + bne @08171160 ldr r0, =sub_8171CAC + 1 str r0, [r4, 0x1C] - b _081711D2 + b @081711D2 .align 2, 0 .pool -_08171160: +@08171160: adds r0, r4, 0 movs r1, 0x1 bl obj_anim_image_start @@ -711896,11 +711896,11 @@ _08171160: movs r2, 0 adds r0, r4, 0 adds r0, 0x3C -_08171188: +@08171188: strh r2, [r0] subs r0, 0x2 cmp r0, r1 - bge _08171188 + bge @08171188 movs r0, 0 strh r0, [r4, 0x38] ldr r0, =sub_81711E8 + 1 @@ -711911,9 +711911,9 @@ _08171188: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0xB - bgt _081711D2 + bgt @081711D2 cmp r5, 0 - blt _081711D2 + blt @081711D2 ldrh r0, [r4, 0x20] lsls r0, 24 lsrs r0, 24 @@ -711931,7 +711931,7 @@ _08171188: movs r2, 0xE adds r3, r5, 0 bl sub_81729E8 -_081711D2: +@081711D2: add sp, 0x4 pop {r4,r5} pop {r0} @@ -711941,7 +711941,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] @@ -711950,7 +711950,7 @@ sub_81711E8: @ 81711E8 lsls r0, 16 asrs r0, 16 cmp r0, 0xA - bne _08171224 + bne @08171224 ldr r0, =nullsub_4 + 1 movs r1, 0x32 bl AddTask @@ -711971,7 +711971,7 @@ sub_81711E8: @ 81711E8 adds r0, r2 movs r1, 0 strh r1, [r0, 0x30] -_08171224: +@08171224: pop {r4} pop {r0} bx r0 @@ -711980,7 +711980,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 @@ -712002,26 +712002,26 @@ sub_8171240: @ 8171240 lsls r0, 16 asrs r0, 16 cmp r0, 0xB - bne _08171272 + bne @08171272 movs r0, 0x3C bl audio_play -_08171272: +@08171272: movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _081712E8 + beq @081712E8 cmp r0, 0x1 - bgt _08171290 + bgt @08171290 cmp r0, 0 - beq _08171296 - b _08171354 + beq @08171296 + b @08171354 .align 2, 0 .pool -_08171290: +@08171290: cmp r0, 0x2 - beq _0817132C - b _08171354 -_08171296: + beq @0817132C + b @08171354 +@08171296: adds r0, r4, 0 movs r1, 0 bl sub_80A7270 @@ -712052,10 +712052,10 @@ _08171296: bl __udivsi3 strh r0, [r4] strh r0, [r5, 0xC] - b _08171346 + b @08171346 .align 2, 0 .pool -_081712E8: +@081712E8: ldrh r0, [r5, 0x1C] adds r0, 0x20 strh r0, [r5, 0x1C] @@ -712083,11 +712083,11 @@ _081712E8: ldrsh r1, [r5, r0] ldr r0, =0x0000047f cmp r1, r0 - ble _0817137C - b _08171346 + ble @0817137C + b @08171346 .align 2, 0 .pool -_0817132C: +@0817132C: adds r0, r4, 0 bl sub_80A7344 ldr r1, =0x02020630 @@ -712100,14 +712100,14 @@ _0817132C: movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_08171346: +@08171346: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] - b _0817137C + b @0817137C .align 2, 0 .pool -_08171354: +@08171354: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -712116,7 +712116,7 @@ _08171354: movs r2, 0xA ldrsh r0, [r1, r2] cmp r0, 0xA - ble _0817137C + ble @0817137C adds r0, r6, 0 bl remove_task adds r0, r7, 0 @@ -712126,7 +712126,7 @@ _08171354: strh r0, [r7, 0x38] ldr r0, =sub_817138C + 1 str r0, [r7, 0x1C] -_0817137C: +@0817137C: pop {r4-r7} pop {r0} bx r0 @@ -712135,7 +712135,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 @@ -712143,7 +712143,7 @@ sub_817138C: @ 817138C movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _081713C6 + beq @081713C6 movs r1, 0 strh r1, [r4, 0x34] movs r0, 0x28 @@ -712163,7 +712163,7 @@ sub_817138C: @ 817138C strh r0, [r4, 0x26] ldr r0, =sub_81713D0 + 1 str r0, [r4, 0x1C] -_081713C6: +@081713C6: pop {r4} pop {r0} bx r0 @@ -712172,7 +712172,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 @@ -712180,11 +712180,11 @@ sub_81713D0: @ 81713D0 movs r1, 0xFF ands r1, r0 cmp r1, 0 - beq _081713E6 + beq @081713E6 cmp r1, 0x1 - beq _0817145A - b _08171486 -_081713E6: + beq @0817145A + b @08171486 +@081713E6: movs r1, 0x38 ldrsh r0, [r4, r1] movs r2, 0x36 @@ -712202,7 +712202,7 @@ _081713E6: lsls r1, 16 asrs r1, 16 cmp r1, 0x3F - ble _08171486 + ble @08171486 ldrh r0, [r4, 0x36] subs r0, 0xA strh r0, [r4, 0x36] @@ -712212,39 +712212,39 @@ _081713E6: lsls r0, 16 asrs r0, 24 cmp r0, 0x4 - bne _08171422 + bne @08171422 movs r5, 0x1 -_08171422: +@08171422: cmp r0, 0x2 - beq _08171442 + beq @08171442 cmp r0, 0x2 - bgt _08171434 + bgt @08171434 cmp r0, 0x1 - beq _0817143A - b _08171452 + beq @0817143A + b @08171452 .align 2, 0 .pool -_08171434: +@08171434: cmp r0, 0x3 - beq _0817144A - b _08171452 -_0817143A: + beq @0817144A + b @08171452 +@0817143A: movs r0, 0x38 bl audio_play - b _08171486 -_08171442: + b @08171486 +@08171442: movs r0, 0x39 bl audio_play - b _08171486 -_0817144A: + b @08171486 +@0817144A: movs r0, 0x3A bl audio_play - b _08171486 -_08171452: + b @08171486 +@08171452: movs r0, 0x3B bl audio_play - b _08171486 -_0817145A: + b @08171486 +@0817145A: movs r2, 0x38 ldrsh r0, [r4, r2] movs r2, 0x36 @@ -712261,14 +712261,14 @@ _0817145A: strh r1, [r4, 0x38] lsls r1, 16 cmp r1, 0 - bgt _08171486 + bgt @08171486 strh r5, [r4, 0x38] ldr r0, =0xffffff00 ands r0, r2 strh r0, [r4, 0x34] -_08171486: +@08171486: cmp r5, 0 - beq _081714CA + beq @081714CA movs r5, 0 strh r5, [r4, 0x34] movs r0, 0x40 @@ -712283,20 +712283,20 @@ _08171486: ldr r0, [r0, 0x8] ldrb r0, [r0, 0x8] cmp r0, 0 - bne _081714C0 + bne @081714C0 strh r5, [r4, 0x38] ldr r0, =sub_81717B4 + 1 str r0, [r4, 0x1C] - b _081714CA + b @081714CA .align 2, 0 .pool -_081714C0: +@081714C0: ldr r0, =sub_81714D4 + 1 str r0, [r4, 0x1C] movs r0, 0x1 strh r0, [r4, 0x36] strh r5, [r4, 0x38] -_081714CA: +@081714CA: pop {r4,r5} pop {r0} bx r0 @@ -712305,7 +712305,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] @@ -712315,7 +712315,7 @@ sub_81714D4: @ 81714D4 lsls r0, 16 asrs r0, 16 cmp r0, 0x1F - bne _08171510 + bne @08171510 strh r5, [r4, 0x34] adds r2, r4, 0 adds r2, 0x2C @@ -712334,7 +712334,7 @@ sub_81714D4: @ 81714D4 str r0, [r4, 0x1C] movs r0, 0x17 bl audio_play -_08171510: +@08171510: pop {r4,r5} pop {r0} bx r0 @@ -712343,33 +712343,33 @@ _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] movs r1, 0xFF ands r1, r0 cmp r1, 0x6 - bls _08171530 - b _08171768 -_08171530: + bls @08171530 + b @08171768 +@08171530: lsls r0, r1, 2 - ldr r1, =_08171540 + ldr r1, =@08171540 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08171540: - .4byte _0817155C - .4byte _081715AE - .4byte _081715F4 - .4byte _08171654 - .4byte _081716A4 - .4byte _08171708 - .4byte _08171768 -_0817155C: +@08171540: + .4byte @0817155C + .4byte @081715AE + .4byte @081715F4 + .4byte @08171654 + .4byte @081716A4 + .4byte @08171708 + .4byte @08171768 +@0817155C: ldr r1, =0x020244d0 ldr r5, [r1] ldr r2, [r5, 0x8] @@ -712378,7 +712378,7 @@ _0817155C: ldrsh r0, [r2, r6] adds r6, r1, 0 cmp r0, 0xFF - ble _08171584 + ble @08171584 ldrh r0, [r4, 0x36] ldrh r1, [r4, 0x24] adds r0, r1 @@ -712386,14 +712386,14 @@ _0817155C: ldr r1, [r5, 0x8] ldrb r0, [r1, 0xC] strh r0, [r1, 0xC] - b _0817158A + b @0817158A .align 2, 0 .pool -_08171584: +@08171584: adds r0, r3, 0 adds r0, 0xB0 strh r0, [r2, 0xC] -_0817158A: +@0817158A: ldrh r0, [r4, 0x38] adds r0, 0x1 movs r3, 0 @@ -712409,18 +712409,18 @@ _0817158A: lsls r0, 16 lsrs r0, 16 cmp r0, 0xE - bhi _081715AC - b _081717AE -_081715AC: - b _08171644 -_081715AE: + bhi @081715AC + b @081717AE +@081715AC: + b @08171644 +@081715AE: ldrh r0, [r4, 0x38] adds r0, 0x1 strh r0, [r4, 0x38] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - bne _08171660 + bne @08171660 movs r0, 0 strh r0, [r4, 0x38] ldrh r0, [r4, 0x36] @@ -712438,17 +712438,17 @@ _081715AE: movs r6, 0x36 ldrsh r0, [r4, r6] cmp r0, 0 - bge _081715EA + bge @081715EA adds r0, r4, 0 movs r1, 0x2 bl sub_80082B8 - b _081717AE -_081715EA: + b @081717AE +@081715EA: adds r0, r4, 0 movs r1, 0x1 bl sub_80082B8 - b _081717AE -_081715F4: + b @081717AE +@081715F4: ldr r1, =0x020244d0 ldr r5, [r1] ldr r2, [r5, 0x8] @@ -712457,7 +712457,7 @@ _081715F4: ldrsh r0, [r2, r6] adds r6, r1, 0 cmp r0, 0xFF - ble _0817161C + ble @0817161C ldrh r0, [r4, 0x36] ldrh r1, [r4, 0x24] adds r0, r1 @@ -712465,14 +712465,14 @@ _081715F4: ldr r1, [r5, 0x8] ldrb r0, [r1, 0xC] strh r0, [r1, 0xC] - b _08171622 + b @08171622 .align 2, 0 .pool -_0817161C: +@0817161C: adds r0, r3, 0 adds r0, 0xB0 strh r0, [r2, 0xC] -_08171622: +@08171622: ldrh r0, [r4, 0x38] adds r0, 0x1 movs r3, 0 @@ -712488,9 +712488,9 @@ _08171622: lsls r0, 16 lsrs r0, 16 cmp r0, 0x18 - bhi _08171644 - b _081717AE -_08171644: + bhi @08171644 + b @081717AE +@08171644: ldr r0, [r6] ldr r0, [r0, 0x8] strh r3, [r0, 0xC] @@ -712498,23 +712498,23 @@ _08171644: adds r0, 0x1 strh r0, [r4, 0x34] strh r3, [r4, 0x38] - b _081717AE -_08171654: + b @081717AE +@08171654: ldrh r0, [r4, 0x38] adds r1, r0, 0x1 strh r1, [r4, 0x38] lsls r0, 16 cmp r0, 0 - bge _0817166E -_08171660: + bge @0817166E +@08171660: adds r0, r4, 0 adds r0, 0x2C ldrb r1, [r0] movs r2, 0x80 orrs r1, r2 strb r1, [r0] - b _081717AE -_0817166E: + b @081717AE +@0817166E: movs r0, 0 strh r0, [r4, 0x38] ldrh r0, [r4, 0x36] @@ -712532,16 +712532,16 @@ _0817166E: movs r6, 0x36 ldrsh r0, [r4, r6] cmp r0, 0 - bge _0817169C + bge @0817169C adds r0, r4, 0 movs r1, 0x2 bl sub_80082B8 - b _081716A4 -_0817169C: + b @081716A4 +@0817169C: adds r0, r4, 0 movs r1, 0x1 bl sub_80082B8 -_081716A4: +@081716A4: ldr r1, =0x020244d0 ldr r5, [r1] ldr r2, [r5, 0x8] @@ -712550,7 +712550,7 @@ _081716A4: ldrsh r0, [r2, r6] adds r6, r1, 0 cmp r0, 0xFF - ble _081716CC + ble @081716CC ldrh r0, [r4, 0x36] ldrh r1, [r4, 0x24] adds r0, r1 @@ -712558,14 +712558,14 @@ _081716A4: ldr r1, [r5, 0x8] ldrb r0, [r1, 0xC] strh r0, [r1, 0xC] - b _081716D2 + b @081716D2 .align 2, 0 .pool -_081716CC: +@081716CC: adds r0, r3, 0 adds r0, 0xB0 strh r0, [r2, 0xC] -_081716D2: +@081716D2: ldrh r0, [r4, 0x38] adds r0, 0x1 movs r3, 0 @@ -712581,7 +712581,7 @@ _081716D2: lsls r0, 16 lsrs r0, 16 cmp r0, 0x8 - bls _081717AE + bls @081717AE ldr r0, [r6] ldr r0, [r0, 0x8] strh r3, [r0, 0xC] @@ -712592,8 +712592,8 @@ _081716D2: ldrh r0, [r4, 0x36] negs r0, r0 strh r0, [r4, 0x36] - b _081717AE -_08171708: + b @081717AE +@08171708: movs r6, 0x80 lsls r6, 1 adds r0, r6, 0 @@ -712607,7 +712607,7 @@ _08171708: ldr r0, [r0, 0x8] ldrb r0, [r0, 0x8] cmp r1, r0 - bne _08171740 + bne @08171740 adds r2, r4, 0 adds r2, 0x2C ldrb r0, [r2] @@ -712616,39 +712616,39 @@ _08171708: strb r0, [r2] ldr r0, =sub_81717B4 + 1 str r0, [r4, 0x1C] - b _081717AE + b @081717AE .align 2, 0 .pool -_08171740: +@08171740: cmp r0, 0x4 - bne _08171754 + bne @08171754 cmp r1, 0x3 - bne _08171754 + bne @08171754 ldr r0, =sub_81717D8 + 1 str r0, [r4, 0x1C] - b _0817175A + b @0817175A .align 2, 0 .pool -_08171754: +@08171754: ldrh r0, [r4, 0x34] adds r0, 0x1 strh r0, [r4, 0x34] -_0817175A: +@0817175A: adds r2, r4, 0 adds r2, 0x2C ldrb r0, [r2] movs r1, 0x80 orrs r0, r1 strb r0, [r2] - b _081717AE -_08171768: + b @081717AE +@08171768: ldrh r0, [r4, 0x38] adds r0, 0x1 strh r0, [r4, 0x38] lsls r0, 16 asrs r0, 16 cmp r0, 0x1F - bne _081717AE + bne @081717AE movs r0, 0 strh r0, [r4, 0x38] ldrh r1, [r4, 0x34] @@ -712661,28 +712661,28 @@ _08171768: movs r6, 0x36 ldrsh r0, [r4, r6] cmp r0, 0 - bge _081717A0 + bge @081717A0 adds r0, r4, 0 movs r1, 0x2 bl sub_8008258 - b _081717A8 + b @081717A8 .align 2, 0 .pool -_081717A0: +@081717A0: adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 -_081717A8: +@081717A8: movs r0, 0x17 bl audio_play -_081717AE: +@081717AE: pop {r4-r6} pop {r0} bx r0 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] @@ -712691,12 +712691,12 @@ sub_81717B4: @ 81717B4 lsls r0, 16 asrs r0, 16 cmp r0, 0x1F - bne _081717CE + bne @081717CE movs r0, 0 strh r0, [r1, 0x38] ldr r0, =sub_8171AE4 + 1 str r0, [r1, 0x1C] -_081717CE: +@081717CE: pop {r0} bx r0 .align 2, 0 @@ -712704,7 +712704,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] @@ -712723,7 +712723,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} @@ -712738,7 +712738,7 @@ sub_81717F8: @ 81717F8 lsls r0, 16 asrs r1, r0, 16 cmp r1, 0x28 - bne _0817183C + bne @0817183C movs r0, 0xFE bl audio_play ldrb r1, [r6, 0x5] @@ -712751,12 +712751,12 @@ sub_81717F8: @ 81717F8 bl sub_80A2A20 adds r0, r6, 0 bl sub_81719EC - b _081718BC + b @081718BC .align 2, 0 .pool -_0817183C: +@0817183C: cmp r1, 0x3C - bne _0817185A + bne @0817185A ldrb r1, [r6, 0x5] lsrs r1, 4 movs r0, 0x80 @@ -712768,10 +712768,10 @@ _0817183C: movs r2, 0x6 movs r3, 0 bl sub_80A1AD4 - b _081718BC -_0817185A: + b @081718BC +@0817185A: cmp r1, 0x5F - bne _08171880 + bne @08171880 ldr r0, =0x020244b9 movs r1, 0 strb r1, [r0] @@ -712780,13 +712780,13 @@ _0817185A: bl m4aMPlayAllStop ldr r0, =0x00000213 bl audio_play - b _081718BC + b @081718BC .align 2, 0 .pool -_08171880: +@08171880: ldr r0, =0x0000013b cmp r1, r0 - bne _081718BC + bne @081718BC ldr r5, =0x02020630 ldr r4, =0x020241e4 ldrb r0, [r7] @@ -712812,7 +712812,7 @@ _08171880: strh r0, [r6, 0x2E] ldr r0, =sub_81718D8 + 1 str r0, [r6, 0x1C] -_081718BC: +@081718BC: add sp, 0x4 pop {r3} mov r8, r3 @@ -712824,24 +712824,24 @@ _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 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _08171944 + beq @08171944 cmp r0, 0x1 - bgt _081718F0 + bgt @081718F0 cmp r0, 0 - beq _081718F6 - b _0817198A -_081718F0: + beq @081718F6 + b @0817198A +@081718F0: cmp r0, 0x2 - beq _08171976 - b _0817198A -_081718F6: + beq @08171976 + b @0817198A +@081718F6: strh r0, [r4, 0x30] strh r0, [r4, 0x32] ldrb r1, [r4, 0x1] @@ -712873,16 +712873,16 @@ _081718F6: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - b _08171982 + b @08171982 .align 2, 0 .pool -_08171944: +@08171944: ldrh r0, [r4, 0x30] adds r1, r0, 0x1 strh r1, [r4, 0x30] lsls r0, 16 cmp r0, 0 - ble _081719B0 + ble @081719B0 movs r0, 0 strh r0, [r4, 0x30] ldrh r2, [r4, 0x32] @@ -712899,21 +712899,21 @@ _08171944: movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0x10 - bne _081719B0 - b _08171982 -_08171976: + bne @081719B0 + b @08171982 +@08171976: adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 strb r0, [r2] -_08171982: +@08171982: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _081719B0 -_0817198A: + b @081719B0 +@0817198A: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -712921,7 +712921,7 @@ _0817198A: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _081719B0 + bne @081719B0 movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -712931,7 +712931,7 @@ _0817198A: strh r5, [r4, 0x2E] ldr r0, =sub_81719C0 + 1 str r0, [r4, 0x1C] -_081719B0: +@081719B0: add sp, 0x4 pop {r4,r5} pop {r0} @@ -712941,32 +712941,32 @@ _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] movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0 - bne _081719D8 + bne @081719D8 ldr r0, =0x0000ffff strh r0, [r4, 0x2E] - b _081719E4 + b @081719E4 .align 2, 0 .pool -_081719D8: +@081719D8: adds r0, r4, 0 bl obj_free_rotscale_entry adds r0, r4, 0 bl obj_delete_and_free_tiles -_081719E4: +@081719E4: pop {r4} pop {r0} bx r0 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 @@ -712977,18 +712977,18 @@ sub_81719EC: @ 81719EC adds r1, 0x43 ldrb r0, [r1] cmp r0, 0 - beq _08171A0C + beq @08171A0C subs r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r8, r0 - b _08171A14 -_08171A0C: + b @08171A14 +@08171A0C: movs r0, 0 mov r8, r0 movs r0, 0x1 strb r0, [r1] -_08171A14: +@08171A14: movs r0, 0x4 bl sub_8171D60 movs r7, 0 @@ -712997,7 +712997,7 @@ _08171A14: movs r0, 0x1C add r0, r9 mov r10, r0 -_08171A26: +@08171A26: movs r2, 0x20 ldrsh r1, [r6, r2] movs r0, 0x22 @@ -713008,7 +713008,7 @@ _08171A26: lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _08171A82 + beq @08171A82 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -713041,10 +713041,10 @@ _08171A26: ldrb r1, [r0, 0x4] adds r0, r5, 0 bl obj_anim_image_start -_08171A82: +@08171A82: adds r7, 0x1 cmp r7, 0x2 - bls _08171A26 + bls @08171A26 pop {r3-r5} mov r8, r3 mov r9, r4 @@ -713057,7 +713057,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 @@ -713077,17 +713077,17 @@ sub_8171AAC: @ 8171AAC bl sub_80A6900 lsls r0, 24 cmp r0, 0 - beq _08171ADC + beq @08171ADC adds r0, r4, 0 bl obj_delete_and_free_tiles -_08171ADC: +@08171ADC: pop {r4} pop {r0} bx r0 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 @@ -713104,9 +713104,9 @@ sub_8171AE4: @ 8171AE4 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0xB - bgt _08171B36 + bgt @08171B36 cmp r5, 0 - blt _08171B36 + blt @08171B36 ldrh r0, [r4, 0x20] lsls r0, 24 lsrs r0, 24 @@ -713124,7 +713124,7 @@ sub_8171AE4: @ 8171AE4 movs r2, 0xE adds r3, r5, 0 bl sub_81729E8 -_08171B36: +@08171B36: ldr r6, =0x02020630 ldr r5, =0x020241e4 ldr r4, =0x02038437 @@ -713177,7 +713177,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 @@ -713186,14 +713186,14 @@ sub_8171BAC: @ 8171BAC movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08171BCA + beq @08171BCA adds r2, r7, 0 adds r2, 0x3E ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 strb r0, [r2] -_08171BCA: +@08171BCA: ldr r4, =0x02020630 ldr r3, =0x020241e4 ldr r2, =0x02038437 @@ -713209,15 +713209,15 @@ _08171BCA: ldrb r0, [r0] lsls r0, 26 cmp r0, 0 - bge _08171C04 + bge @08171C04 adds r0, r1, 0 movs r1, 0 bl sub_8008258 movs r5, 0x1 - b _08171C24 + b @08171C24 .align 2, 0 .pool -_08171C04: +@08171C04: ldr r6, =0xfffffee0 adds r0, r6, 0 ldrh r6, [r1, 0x30] @@ -713234,16 +713234,16 @@ _08171C04: lsls r0, 16 asrs r0, 24 strh r0, [r1, 0x26] -_08171C24: +@08171C24: adds r0, r7, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08171C8A + beq @08171C8A cmp r5, 0 - beq _08171C8A + beq @08171C8A ldr r4, =0x02020630 ldr r3, =0x020241e4 ldr r2, =0x02038437 @@ -713285,7 +713285,7 @@ _08171C24: strb r6, [r0] movs r0, 0x1 bl sub_8072A88 -_08171C8A: +@08171C8A: pop {r4-r7} pop {r0} bx r0 @@ -713294,7 +713294,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] @@ -713313,12 +713313,12 @@ sub_8171CAC: @ 8171CAC movs r1, 0x5 adds r0, r2, 0 adds r0, 0x38 -_08171CD0: +@08171CD0: strh r3, [r0] subs r0, 0x2 subs r1, 0x1 cmp r1, 0 - bge _08171CD0 + bge @08171CD0 str r4, [r2, 0x1C] pop {r4} pop {r0} @@ -713328,7 +713328,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 @@ -713362,7 +713362,7 @@ sub_8171CE8: @ 8171CE8 ldrsh r1, [r4, r2] adds r0, r1 cmp r0, 0xA0 - bgt _08171D3E + bgt @08171D3E movs r1, 0x20 ldrsh r0, [r4, r1] movs r2, 0x24 @@ -713371,8 +713371,8 @@ sub_8171CE8: @ 8171CE8 movs r1, 0x8 negs r1, r1 cmp r0, r1 - bge _08171D52 -_08171D3E: + bge @08171D52 +@08171D3E: movs r0, 0 strh r0, [r4, 0x2E] ldr r0, =sub_81719C0 + 1 @@ -713382,7 +713382,7 @@ _08171D3E: strb r0, [r1] movs r0, 0x1 bl sub_8072A88 -_08171D52: +@08171D52: pop {r4} pop {r0} bx r0 @@ -713391,7 +713391,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, =0x085e5094 @@ -713402,13 +713402,13 @@ sub_8171D60: @ 8171D60 lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 - bne _08171D86 + bne @08171D86 adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load3 ldr r0, =0x085e50f4 adds r0, r5, r0 bl gpu_pal_obj_decompress_and_apply3 -_08171D86: +@08171D86: pop {r4,r5} pop {r0} bx r0 @@ -713417,7 +713417,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 @@ -713483,7 +713483,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 @@ -713492,14 +713492,14 @@ sub_8171E20: @ 8171E20 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08171E3E + beq @08171E3E ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x8] ldrb r0, [r1, 0xA] adds r0, 0x1 strb r0, [r1, 0xA] -_08171E3E: +@08171E3E: pop {r0} bx r0 .align 2, 0 @@ -713507,7 +713507,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 @@ -713530,7 +713530,7 @@ sub_8171E50: @ 8171E50 ldrsh r0, [r6, r2] adds r2, r1, 0 cmp r0, 0xF - bgt _08171F48 + bgt @08171F48 ldrb r1, [r6, 0xA] ldrb r2, [r6, 0xC] ldrb r4, [r6, 0xE] @@ -713547,7 +713547,7 @@ sub_8171E50: @ 8171E50 lsrs r0, 24 mov r10, r0 cmp r0, 0x40 - beq _08171EEC + beq @08171EEC bl sub_8171E20 mov r0, r10 lsls r4, r0, 4 @@ -713577,14 +713577,14 @@ sub_8171E50: @ 8171E50 strb r0, [r7, 0x5] ldrb r0, [r6, 0x8] cmp r0, 0x7 - bls _08171EE8 + bls @08171EE8 subs r0, 0x8 lsls r0, 24 lsrs r0, 24 -_08171EE8: +@08171EE8: lsls r0, 5 strh r0, [r7, 0x2E] -_08171EEC: +@08171EEC: ldr r0, =0x03005e00 mov r4, r8 lsls r1, r4, 2 @@ -713595,7 +713595,7 @@ _08171EEC: ldrsh r1, [r1, r2] adds r2, r0, 0 cmp r1, 0xF - bne _08171F48 + bne @08171F48 ldr r0, =0x030022c0 ldr r4, =0x00000439 adds r0, r4 @@ -713603,7 +713603,7 @@ _08171EEC: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _08171F22 + bne @08171F22 ldr r0, =0x02020630 mov r2, r10 lsls r1, r2, 4 @@ -713612,13 +713612,13 @@ _08171EEC: adds r1, r0 movs r0, 0x1 strh r0, [r1, 0x3C] -_08171F22: +@08171F22: mov r0, r8 bl remove_task - b _08171F58 + b @08171F58 .align 2, 0 .pool -_08171F48: +@08171F48: mov r4, r8 lsls r0, r4, 2 add r0, r8 @@ -713627,7 +713627,7 @@ _08171F48: ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] -_08171F58: +@08171F58: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -713639,29 +713639,29 @@ _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] movs r3, 0x30 ldrsh r0, [r1, r3] cmp r0, 0 - bne _08171F80 + bne @08171F80 ldr r0, =sub_8171F88 + 1 str r0, [r1, 0x1C] - b _08171F84 + b @08171F84 .align 2, 0 .pool -_08171F80: +@08171F80: subs r0, r2, 0x1 strh r0, [r1, 0x30] -_08171F84: +@08171F84: pop {r0} bx r0 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 @@ -713682,17 +713682,17 @@ sub_8171F88: @ 8171F88 lsls r0, 16 asrs r0, 16 cmp r0, 0x32 - bne _08171FBC + bne @08171FBC adds r0, r4, 0 bl sub_8172944 -_08171FBC: +@08171FBC: pop {r4} pop {r0} bx r0 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 @@ -713728,7 +713728,7 @@ sub_8171FC4: @ 8171FC4 add r0, r8 lsls r0, 3 str r0, [sp, 0x10] -_0817200A: +@0817200A: ldr r0, =0x085e51f0 ldr r2, [sp, 0x10] adds r0, r2, r0 @@ -713739,7 +713739,7 @@ _0817200A: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 - beq _0817206A + beq @0817206A bl sub_8171E20 lsls r4, r6, 4 adds r4, r6 @@ -713774,12 +713774,12 @@ _0817200A: strh r0, [r5, 0x38] movs r0, 0x1 strh r0, [r5, 0x3A] -_0817206A: +@0817206A: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x7 - bls _0817200A + bls @0817200A ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -713787,7 +713787,7 @@ _0817206A: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _08172092 + bne @08172092 ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 @@ -713795,7 +713795,7 @@ _0817206A: adds r1, r0 movs r0, 0x1 strh r0, [r1, 0x3C] -_08172092: +@08172092: mov r0, r9 bl remove_task add sp, 0x14 @@ -713811,7 +713811,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 @@ -713847,7 +713847,7 @@ sub_81720C8: @ 81720C8 add r0, r8 lsls r0, 3 str r0, [sp, 0x10] -_0817210E: +@0817210E: ldr r0, =0x085e51f0 ldr r2, [sp, 0x10] adds r0, r2, r0 @@ -713858,7 +713858,7 @@ _0817210E: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 - beq _0817216E + beq @0817216E bl sub_8171E20 lsls r4, r6, 4 adds r4, r6 @@ -713893,12 +713893,12 @@ _0817210E: strh r0, [r5, 0x38] movs r0, 0x2 strh r0, [r5, 0x3A] -_0817216E: +@0817216E: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x7 - bls _0817210E + bls @0817210E ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -713906,7 +713906,7 @@ _0817216E: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _08172196 + bne @08172196 ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 @@ -713914,7 +713914,7 @@ _0817216E: adds r1, r0 movs r0, 0x1 strh r0, [r1, 0x3C] -_08172196: +@08172196: mov r0, r9 bl remove_task add sp, 0x14 @@ -713930,7 +713930,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 @@ -713966,7 +713966,7 @@ sub_81721CC: @ 81721CC ldr r0, =0x085e51b4 adds r1, r0 mov r10, r1 -_08172212: +@08172212: ldr r0, =0x085e51f0 ldr r1, [sp, 0x10] adds r0, r1, r0 @@ -713977,7 +713977,7 @@ _08172212: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 - beq _0817226E + beq @0817226E bl sub_8171E20 lsls r4, r6, 4 adds r4, r6 @@ -714010,12 +714010,12 @@ _08172212: movs r0, 0x1 strh r0, [r5, 0x38] strh r0, [r5, 0x3A] -_0817226E: +@0817226E: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x7 - bls _08172212 + bls @08172212 ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -714023,7 +714023,7 @@ _0817226E: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _08172296 + bne @08172296 ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 @@ -714031,7 +714031,7 @@ _0817226E: adds r1, r0 movs r0, 0x1 strh r0, [r1, 0x3C] -_08172296: +@08172296: mov r0, r9 bl remove_task add sp, 0x14 @@ -714047,7 +714047,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 @@ -714083,7 +714083,7 @@ sub_81722CC: @ 81722CC add r0, r8 lsls r0, 3 str r0, [sp, 0x10] -_08172312: +@08172312: ldr r0, =0x085e51f0 ldr r2, [sp, 0x10] adds r0, r2, r0 @@ -714094,7 +714094,7 @@ _08172312: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 - beq _08172376 + beq @08172376 bl sub_8171E20 lsls r4, r6, 4 adds r4, r6 @@ -714131,12 +714131,12 @@ _08172312: movs r0, 0x1 strh r0, [r5, 0x38] strh r0, [r5, 0x3A] -_08172376: +@08172376: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x9 - bls _08172312 + bls @08172312 ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -714144,7 +714144,7 @@ _08172376: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _0817239E + bne @0817239E ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 @@ -714152,7 +714152,7 @@ _08172376: adds r1, r0 movs r0, 0x1 strh r0, [r1, 0x3C] -_0817239E: +@0817239E: mov r0, r9 bl remove_task add sp, 0x14 @@ -714168,7 +714168,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 @@ -714187,13 +714187,13 @@ sub_81723D4: @ 81723D4 movs r4, 0x16 ldrsh r0, [r3, r4] cmp r0, 0 - beq _08172404 + beq @08172404 subs r0, r1, 0x1 strh r0, [r3, 0x16] - b _081724D6 + b @081724D6 .align 2, 0 .pool -_08172404: +@08172404: ldrh r0, [r3, 0x26] lsls r0, 24 lsrs r0, 24 @@ -714216,7 +714216,7 @@ _08172404: ldr r1, =0x085e51b4 adds r0, r1 mov r10, r0 -_08172430: +@08172430: ldr r0, =0x085e51f0 ldr r4, [sp, 0x10] adds r0, r4, r0 @@ -714227,7 +714227,7 @@ _08172430: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 - beq _0817248C + beq @0817248C bl sub_8171E20 lsls r4, r6, 4 adds r4, r6 @@ -714260,12 +714260,12 @@ _08172430: movs r0, 0x2 strh r0, [r5, 0x38] strh r0, [r5, 0x3A] -_0817248C: +@0817248C: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x7 - bls _08172430 + bls @08172430 ldr r0, =0x03005e00 ldr r1, [sp, 0x14] add r1, r8 @@ -714279,7 +714279,7 @@ _0817248C: lsls r0, 16 asrs r2, r0, 16 cmp r2, 0x2 - bne _081724D6 + bne @081724D6 ldr r0, =0x030022c0 ldr r4, =0x00000439 adds r0, r4 @@ -714287,7 +714287,7 @@ _0817248C: adds r0, r2, 0 ands r0, r1 cmp r0, 0 - bne _081724D0 + bne @081724D0 ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 @@ -714295,10 +714295,10 @@ _0817248C: adds r1, r0 movs r0, 0x1 strh r0, [r1, 0x3C] -_081724D0: +@081724D0: mov r0, r8 bl remove_task -_081724D6: +@081724D6: add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -714312,7 +714312,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 @@ -714347,17 +714347,17 @@ sub_8172508: @ 8172508 lsls r0, 16 asrs r0, 16 cmp r0, 0x33 - bne _08172558 + bne @08172558 adds r0, r4, 0 bl sub_8172944 -_08172558: +@08172558: pop {r4} pop {r0} bx r0 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 @@ -714393,7 +714393,7 @@ sub_8172560: @ 8172560 ldr r0, =0x085e51b4 adds r1, r0 mov r10, r1 -_081725A6: +@081725A6: ldr r0, =0x085e51f0 ldr r1, [sp, 0x10] adds r0, r1, r0 @@ -714404,7 +714404,7 @@ _081725A6: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 - beq _081725FE + beq @081725FE bl sub_8171E20 lsls r4, r6, 4 adds r4, r6 @@ -714435,12 +714435,12 @@ _081725A6: lsls r0, 2 adds r0, r7 strh r0, [r5, 0x2E] -_081725FE: +@081725FE: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0xB - bls _081725A6 + bls @081725A6 ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -714448,7 +714448,7 @@ _081725FE: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _08172626 + bne @08172626 ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 @@ -714456,7 +714456,7 @@ _081725FE: adds r1, r0 movs r0, 0x1 strh r0, [r1, 0x3C] -_08172626: +@08172626: mov r0, r9 bl remove_task add sp, 0x14 @@ -714472,7 +714472,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 @@ -714510,17 +714510,17 @@ sub_817265C: @ 817265C lsls r0, 16 asrs r0, 16 cmp r0, 0x33 - bne _081726B4 + bne @081726B4 adds r0, r5, 0 bl sub_8172944 -_081726B4: +@081726B4: pop {r4,r5} pop {r0} bx r0 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 @@ -714555,12 +714555,12 @@ sub_81726BC: @ 81726BC add r0, r9 lsls r0, 3 str r0, [sp, 0x14] -_08172700: +@08172700: movs r7, 0 movs r2, 0x1 add r2, r8 mov r10, r2 -_08172708: +@08172708: ldr r0, =0x085e51f0 ldr r3, [sp, 0x14] adds r0, r3, r0 @@ -714571,7 +714571,7 @@ _08172708: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 - beq _08172790 + beq @08172790 bl sub_8171E20 lsls r4, r6, 4 adds r4, r6 @@ -714604,31 +714604,31 @@ _08172708: strh r0, [r5, 0x36] mov r0, r8 cmp r0, 0 - bne _08172788 + bne @08172788 movs r0, 0x2 strh r0, [r5, 0x38] movs r0, 0x1 - b _0817278E + b @0817278E .align 2, 0 .pool -_08172788: +@08172788: movs r0, 0x1 strh r0, [r5, 0x38] movs r0, 0x2 -_0817278E: +@0817278E: strh r0, [r5, 0x3A] -_08172790: +@08172790: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x7 - bls _08172708 + bls @08172708 mov r1, r10 lsls r0, r1, 24 lsrs r0, 24 mov r8, r0 cmp r0, 0x1 - bls _08172700 + bls @08172700 ldr r0, =0x030022c0 ldr r2, =0x00000439 adds r0, r2 @@ -714636,7 +714636,7 @@ _08172790: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _081727C4 + bne @081727C4 ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 @@ -714644,7 +714644,7 @@ _08172790: adds r1, r0 movs r0, 0x1 strh r0, [r1, 0x3C] -_081727C4: +@081727C4: ldr r0, [sp] bl remove_task add sp, 0x18 @@ -714660,7 +714660,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 @@ -714696,7 +714696,7 @@ sub_81727E8: @ 81727E8 ldr r0, =0x085e51b4 adds r1, r0 mov r10, r1 -_0817282E: +@0817282E: ldr r0, =0x085e51f0 ldr r1, [sp, 0x10] adds r0, r1, r0 @@ -714707,7 +714707,7 @@ _0817282E: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 - beq _08172880 + beq @08172880 bl sub_8171E20 lsls r4, r6, 4 adds r4, r6 @@ -714735,12 +714735,12 @@ _0817282E: strb r0, [r5, 0x5] lsls r0, r7, 5 strh r0, [r5, 0x2E] -_08172880: +@08172880: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x7 - bls _0817282E + bls @0817282E ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -714748,7 +714748,7 @@ _08172880: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _081728A8 + bne @081728A8 ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 @@ -714756,7 +714756,7 @@ _08172880: adds r1, r0 movs r0, 0x1 strh r0, [r1, 0x3C] -_081728A8: +@081728A8: mov r0, r9 bl remove_task add sp, 0x14 @@ -714772,7 +714772,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 @@ -714812,17 +714812,17 @@ sub_81728E0: @ 81728E0 lsls r0, 16 asrs r0, 16 cmp r0, 0x33 - bne _0817293C + bne @0817293C adds r0, r5, 0 bl sub_8172944 -_0817293C: +@0817293C: pop {r4,r5} pop {r0} bx r0 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 @@ -714832,17 +714832,17 @@ sub_8172944: @ 8172944 movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _08172970 + bne @08172970 movs r1, 0x3C ldrsh r0, [r7, r1] cmp r0, 0x1 - bne _081729CA + bne @081729CA adds r0, r7, 0 bl obj_delete_and_free_resources - b _081729E2 + b @081729E2 .align 2, 0 .pool -_08172970: +@08172970: ldr r2, =0x020244d0 ldr r0, [r2] ldr r1, [r0, 0x8] @@ -714853,31 +714853,31 @@ _08172970: ldr r0, [r0, 0x8] ldrb r0, [r0, 0xA] cmp r0, 0 - bne _081729DC + bne @081729DC movs r4, 0 ldr r5, =0x085e51c0 - b _08172998 + b @08172998 .align 2, 0 .pool -_08172994: +@08172994: adds r5, 0x4 adds r4, 0x1 -_08172998: +@08172998: cmp r4, 0xB - bgt _081729AA + bgt @081729AA ldr r0, [r5] bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08172994 -_081729AA: + bne @08172994 +@081729AA: cmp r4, 0xC - bne _081729CA + bne @081729CA movs r6, 0 ldr r5, =0x085e5094 ldr r4, =0x085e50f4 -_081729B4: +@081729B4: ldrh r0, [r5, 0x6] bl gpu_tile_obj_free_by_tag ldrh r0, [r4, 0x4] @@ -714886,24 +714886,24 @@ _081729B4: adds r4, 0x8 adds r6, 0x1 cmp r6, 0xB - ble _081729B4 -_081729CA: + ble @081729B4 +@081729CA: adds r0, r7, 0 bl obj_delete_and_free_tiles - b _081729E2 + b @081729E2 .align 2, 0 .pool -_081729DC: +@081729DC: adds r0, r7, 0 bl obj_delete_and_free_tiles -_081729E2: +@081729E2: pop {r4-r7} pop {r0} bx r0 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 @@ -714936,7 +714936,7 @@ sub_81729E8: @ 81729E8 lsrs r0, r1, 16 strh r0, [r5, 0x1E] cmp r4, 0 - bne _08172A58 + bne @08172A58 lsls r0, r6, 20 movs r2, 0x80 lsls r2, 17 @@ -714951,10 +714951,10 @@ sub_81729E8: @ 81729E8 bl pal_fade_1 movs r0, 0x1 strh r0, [r5, 0xA] - b _08172A7E + b @08172A7E .align 2, 0 .pool -_08172A58: +@08172A58: lsls r0, r6, 20 movs r1, 0x80 lsls r1, 17 @@ -714973,7 +714973,7 @@ _08172A58: strh r0, [r5, 0xA] ldr r0, =sub_8172B40 + 1 str r0, [r5] -_08172A7E: +@08172A7E: ldr r0, =0x00007fff str r0, [sp] mov r0, r9 @@ -714994,7 +714994,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 @@ -715011,7 +715011,7 @@ sub_8172AB0: @ 8172AB0 movs r2, 0xC ldrsh r0, [r4, r2] cmp r0, 0x10 - bgt _08172B08 + bgt @08172B08 movs r2, 0xE ldrsh r0, [r4, r2] lsls r0, 20 @@ -715033,16 +715033,16 @@ sub_8172AB0: @ 8172AB0 ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] - b _08172B30 + b @08172B30 .align 2, 0 .pool -_08172B08: +@08172B08: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08172B30 + bne @08172B30 ldrh r0, [r4, 0x1C] ldrh r1, [r4, 0x1E] lsls r1, 16 @@ -715055,7 +715055,7 @@ _08172B08: bl sub_80A1AD4 adds r0, r5, 0 bl remove_task -_08172B30: +@08172B30: add sp, 0x4 pop {r4,r5} pop {r0} @@ -715065,7 +715065,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 @@ -715075,7 +715075,7 @@ sub_8172B40: @ 8172B40 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08172B78 + bne @08172B78 ldr r0, =0x03005e00 lsls r4, r2, 2 adds r4, r2 @@ -715093,7 +715093,7 @@ sub_8172B40: @ 8172B40 bl sub_80A1AD4 ldr r0, =sub_8172B90 + 1 str r0, [r4] -_08172B78: +@08172B78: add sp, 0x4 pop {r4} pop {r0} @@ -715103,7 +715103,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 @@ -715118,7 +715118,7 @@ sub_8172B90: @ 8172B90 movs r3, 0xC ldrsh r0, [r4, r3] cmp r0, 0x10 - bgt _08172BE4 + bgt @08172BE4 movs r2, 0xE ldrsh r0, [r4, r2] lsls r0, 20 @@ -715140,20 +715140,20 @@ sub_8172B90: @ 8172B90 ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] - b _08172BEA + b @08172BEA .align 2, 0 .pool -_08172BE4: +@08172BE4: adds r0, r2, 0 bl remove_task -_08172BEA: +@08172BEA: pop {r4} pop {r0} bx r0 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} @@ -715174,19 +715174,19 @@ sub_8172BF0: @ 8172BF0 movs r1, 0x1C ldrsh r0, [r5, r1] cmp r0, 0x1 - beq _08172CC8 + beq @08172CC8 cmp r0, 0x1 - bgt _08172C30 + bgt @08172C30 cmp r0, 0 - beq _08172C36 - b _08172D8A + beq @08172C36 + b @08172D8A .align 2, 0 .pool -_08172C30: +@08172C30: cmp r0, 0x2 - beq _08172CDA - b _08172D8A -_08172C36: + beq @08172CDA + b @08172D8A +@08172C36: ldr r0, =0x0203841e ldrh r0, [r0] strh r0, [r5, 0x1E] @@ -715200,7 +715200,7 @@ _08172C36: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08172C78 + beq @08172C78 ldr r2, =0x02020630 lsls r3, r6, 4 adds r1, r3, r6 @@ -715213,10 +715213,10 @@ _08172C36: adds r0, r4 strh r0, [r1, 0x24] adds r4, r3, 0 - b _08172C90 + b @08172C90 .align 2, 0 .pool -_08172C78: +@08172C78: ldr r3, =0x02020630 lsls r4, r6, 4 adds r2, r4, r6 @@ -715229,7 +715229,7 @@ _08172C78: subs r0, r1 strh r0, [r2, 0x24] adds r2, r3, 0 -_08172C90: +@08172C90: ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 @@ -715249,14 +715249,14 @@ _08172C90: movs r0, 0x98 lsls r0, 1 cmp r1, r0 - bls _08172D8A + bls @08172D8A ldrh r0, [r3, 0x1C] adds r0, 0x1 strh r0, [r3, 0x1C] - b _08172D8A + b @08172D8A .align 2, 0 .pool -_08172CC8: +@08172CC8: ldrb r1, [r5, 0x1E] adds r0, r2, 0 adds r2, r6, 0 @@ -715264,8 +715264,8 @@ _08172CC8: ldrh r0, [r5, 0x1C] adds r0, 0x1 strh r0, [r5, 0x1C] - b _08172D8A -_08172CDA: + b @08172D8A +@08172CDA: movs r1, 0xA0 lsls r1, 3 adds r0, r1, 0 @@ -715276,7 +715276,7 @@ _08172CDA: bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq _08172D10 + beq @08172D10 ldr r0, =0x02020630 lsls r3, r6, 4 adds r2, r3, r6 @@ -715289,10 +715289,10 @@ _08172CDA: subs r0, r1 strh r0, [r2, 0x24] adds r4, r3, 0 - b _08172D28 + b @08172D28 .align 2, 0 .pool -_08172D10: +@08172D10: ldr r0, =0x02020630 lsls r2, r6, 4 adds r1, r2, r6 @@ -715305,7 +715305,7 @@ _08172D10: adds r0, r3 strh r0, [r1, 0x24] adds r4, r2, 0 -_08172D28: +@08172D28: ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 @@ -715319,7 +715319,7 @@ _08172D28: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - beq _08172D68 + beq @08172D68 ldr r0, =0x02020630 adds r1, r4, r6 lsls r1, 2 @@ -715327,13 +715327,13 @@ _08172D28: movs r4, 0x24 ldrsh r0, [r1, r4] cmp r0, 0 - bgt _08172D7E + bgt @08172D7E movs r0, 0 strh r0, [r1, 0x24] - b _08172D84 + b @08172D84 .align 2, 0 .pool -_08172D68: +@08172D68: ldr r0, =0x02020630 adds r1, r4, r6 lsls r1, 2 @@ -715341,18 +715341,18 @@ _08172D68: movs r3, 0x24 ldrsh r0, [r1, r3] cmp r0, 0 - blt _08172D7E + blt @08172D7E strh r2, [r1, 0x24] movs r4, 0x1 mov r8, r4 -_08172D7E: +@08172D7E: mov r0, r8 cmp r0, 0 - beq _08172D8A -_08172D84: + beq @08172D8A +@08172D84: adds r0, r7, 0 bl move_anim_task_del -_08172D8A: +@08172D8A: pop {r3} mov r8, r3 pop {r4-r7} @@ -715363,7 +715363,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 @@ -715375,37 +715375,37 @@ sub_8172D98: @ 8172D98 movs r1, 0x26 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _08172E14 + beq @08172E14 cmp r0, 0x1 - bgt _08172DC0 + bgt @08172DC0 cmp r0, 0 - beq _08172DC6 - b _08172E84 + beq @08172DC6 + b @08172E84 .align 2, 0 .pool -_08172DC0: +@08172DC0: cmp r0, 0x2 - beq _08172E4E - b _08172E84 -_08172DC6: + beq @08172E4E + b @08172E84 +@08172DC6: ldr r0, =0x02038436 ldrb r0, [r0] bl battle_get_per_side_status_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08172DE8 + bne @08172DE8 ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set - b _08172DF0 + b @08172DF0 .align 2, 0 .pool -_08172DE8: +@08172DE8: ldr r1, =0x00003f44 movs r0, 0x50 bl lcd_io_set -_08172DF0: +@08172DF0: movs r0, 0x52 movs r1, 0x10 bl lcd_io_set @@ -715417,17 +715417,17 @@ _08172DF0: ldrh r0, [r1, 0x26] adds r0, 0x1 strh r0, [r1, 0x26] - b _08172E84 + b @08172E84 .align 2, 0 .pool -_08172E14: +@08172E14: ldrh r0, [r4, 0xA] adds r1, r0, 0x1 strh r1, [r4, 0xA] lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble _08172E84 + ble @08172E84 movs r0, 0 strh r0, [r4, 0xA] ldrh r2, [r4, 0x8] @@ -715444,12 +715444,12 @@ _08172E14: movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x10 - bne _08172E84 + bne @08172E84 ldrh r0, [r4, 0x26] adds r0, 0x1 strh r0, [r4, 0x26] - b _08172E84 -_08172E4E: + b @08172E84 +@08172E4E: ldr r1, =0x020241e4 ldr r4, =0x02038436 ldrb r0, [r4] @@ -715474,7 +715474,7 @@ _08172E4E: bl sub_805E974 adds r0, r5, 0 bl move_anim_task_del -_08172E84: +@08172E84: pop {r4,r5} pop {r0} bx r0 @@ -715483,7 +715483,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 @@ -715507,7 +715507,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 @@ -715523,7 +715523,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} @@ -715555,7 +715555,7 @@ sub_8172EF0: @ 8172EF0 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq _08172FC8 + beq @08172FC8 lsrs r0, r5, 16 ldr r7, =0x0000ffff ands r5, r7 @@ -715565,24 +715565,24 @@ sub_8172EF0: @ 8172EF0 ands r4, r7 eors r0, r4 cmp r0, 0x7 - bhi _08172F4E + bhi @08172F4E movs r0, 0x1 mov r8, r0 -_08172F4E: +@08172F4E: mov r0, r8 cmp r0, 0 - beq _08172FC8 + beq @08172FC8 ldr r0, =0x000027f9 bl gpu_tile_obj_tag_get_range_start lsls r0, 16 lsrs r0, 16 cmp r0, r7 - bne _08172F6E + bne @08172F6E ldr r0, =0x0852528c bl gpu_tile_obj_decompress_and_load3 ldr r0, =0x08525b94 bl gpu_pal_obj_decompress_and_apply3 -_08172F6E: +@08172F6E: ldr r5, =sub_8172FEC + 1 adds r0, r5, 0 movs r1, 0xA @@ -715610,10 +715610,10 @@ _08172F6E: strh r4, [r2, 0xA] movs r0, 0x1 strh r0, [r1, 0xA] - b _08172FDE + b @08172FDE .align 2, 0 .pool -_08172FC8: +@08172FC8: ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -715625,7 +715625,7 @@ _08172FC8: movs r2, 0x1 orrs r1, r2 strb r1, [r0, 0x1] -_08172FDE: +@08172FDE: pop {r3} mov r8, r3 pop {r4-r7} @@ -715636,7 +715636,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 @@ -715652,21 +715652,21 @@ sub_8172FEC: @ 8172FEC movs r2, 0x22 ldrsh r0, [r4, r2] cmp r0, 0x3B - bgt _08173018 + bgt @08173018 adds r0, r1, 0x1 strh r0, [r4, 0x22] - b _08173190 + b @08173190 .align 2, 0 .pool -_08173018: +@08173018: ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0xA] cmp r0, 0 - beq _08173026 - b _08173190 -_08173026: + beq @08173026 + b @08173190 +@08173026: ldrh r0, [r4, 0x1C] adds r1, r0, 0x1 strh r1, [r4, 0x1C] @@ -715675,9 +715675,9 @@ _08173026: lsls r1, 10 ands r1, r0 cmp r1, 0 - beq _0817303A - b _08173190 -_0817303A: + beq @0817303A + b @08173190 +@0817303A: ldrb r0, [r4, 0x8] mov r8, r0 movs r1, 0 @@ -715692,21 +715692,21 @@ _0817303A: movs r1, 0x1E ldrsh r0, [r4, r1] cmp r0, 0 - bne _08173074 + bne @08173074 ldr r0, =0x085ce388 adds r1, r5, 0 movs r3, 0x5 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r5, r0, 24 - b _081730D6 + b @081730D6 .align 2, 0 .pool -_08173074: +@08173074: cmp r0, 0 - blt _081730A8 + blt @081730A8 cmp r0, 0x3 - bgt _081730A8 + bgt @081730A8 ldr r0, =0x085ce3a0 adds r1, r5, 0 movs r3, 0x5 @@ -715722,10 +715722,10 @@ _08173074: lsls r1, r3, 22 lsrs r1, 22 adds r1, 0x4 - b _081730C8 + b @081730C8 .align 2, 0 .pool -_081730A8: +@081730A8: ldr r0, =0x085ce3a0 adds r1, r5, 0 movs r3, 0x5 @@ -715741,7 +715741,7 @@ _081730A8: lsls r1, r3, 22 lsrs r1, 22 adds r1, 0x5 -_081730C8: +@081730C8: ldr r4, =0x000003ff adds r0, r4, 0 ands r1, r0 @@ -715749,7 +715749,7 @@ _081730C8: ands r0, r3 orrs r0, r1 strh r0, [r2, 0x4] -_081730D6: +@081730D6: ldr r2, =0x03005e00 lsls r1, r7, 2 adds r0, r1, r7 @@ -715759,7 +715759,7 @@ _081730D6: ldrsh r0, [r6, r2] mov r9, r1 cmp r0, 0 - bne _08173118 + bne @08173118 ldr r1, =0x02020630 lsls r2, r5, 4 adds r0, r2, r5 @@ -715769,10 +715769,10 @@ _081730D6: ldr r1, =sub_81731FC + 1 str r1, [r0] adds r4, r2, 0 - b _08173160 + b @08173160 .align 2, 0 .pool -_08173118: +@08173118: ldr r3, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 @@ -715795,20 +715795,20 @@ _08173118: movs r1, 0x1E ldrsh r0, [r6, r1] cmp r0, 0 - bne _08173160 + bne @08173160 mov r0, r8 bl battle_side_get_owner lsls r0, 24 movs r1, 0x3F cmp r0, 0 - bne _08173156 + bne @08173156 movs r1, 0xC0 -_08173156: +@08173156: lsls r1, 24 asrs r1, 24 movs r0, 0x66 bl audio_play_and_stuff -_08173160: +@08173160: ldr r1, =0x02020630 adds r0, r4, r5 lsls r0, 2 @@ -715823,18 +715823,18 @@ _08173160: adds r0, 0x1 strh r0, [r1, 0x1E] cmp r5, 0x40 - beq _08173184 + beq @08173184 ldrh r0, [r1, 0x20] adds r0, 0x1 strh r0, [r1, 0x20] -_08173184: +@08173184: movs r4, 0x1E ldrsh r0, [r1, r4] cmp r0, 0x5 - bne _08173190 + bne @08173190 ldr r0, =sub_81731B0 + 1 str r0, [r1] -_08173190: +@08173190: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -715846,7 +715846,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 @@ -715859,11 +715859,11 @@ sub_81731B0: @ 81731B0 movs r2, 0x20 ldrsh r0, [r1, r2] cmp r0, 0 - bne _081731F0 + bne @081731F0 movs r2, 0xA ldrsh r0, [r1, r2] cmp r0, 0x1 - bne _081731EA + bne @081731EA ldrb r1, [r1, 0x8] ldr r0, =0x020244d0 ldr r0, [r0] @@ -715876,10 +715876,10 @@ sub_81731B0: @ 81731B0 movs r2, 0x1 orrs r1, r2 strb r1, [r0, 0x1] -_081731EA: +@081731EA: adds r0, r3, 0 bl remove_task -_081731F0: +@081731F0: pop {r0} bx r0 .align 2, 0 @@ -715887,7 +715887,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 @@ -715906,7 +715906,7 @@ sub_81731FC: @ 81731FC lsls r0, 16 asrs r0, 16 cmp r0, 0xFF - ble _08173246 + ble @08173246 ldr r2, =0x03005e00 movs r0, 0x2E ldrsh r1, [r4, r0] @@ -715921,7 +715921,7 @@ sub_81731FC: @ 81731FC bl obj_free_rotscale_entry adds r0, r4, 0 bl obj_delete_and_free_tiles -_08173246: +@08173246: pop {r4} pop {r0} bx r0 @@ -715930,18 +715930,18 @@ _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] movs r2, 0x30 ldrsh r0, [r4, r2] cmp r0, 0x3 - bgt _08173264 + bgt @08173264 adds r0, r1, 0x1 strh r0, [r4, 0x30] - b _081732A6 -_08173264: + b @081732A6 +@08173264: adds r2, r4, 0 adds r2, 0x3E ldrb r1, [r2] @@ -715958,7 +715958,7 @@ _08173264: lsls r1, 16 asrs r1, 16 cmp r1, 0x20 - ble _081732A6 + ble @081732A6 ldr r2, =0x03005e00 movs r0, 0x2E ldrsh r1, [r4, r0] @@ -715973,7 +715973,7 @@ _08173264: bl obj_free_rotscale_entry adds r0, r4, 0 bl obj_delete_and_free_tiles -_081732A6: +@081732A6: pop {r4} pop {r0} bx r0 @@ -715982,7 +715982,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 @@ -716003,7 +716003,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 @@ -716023,7 +716023,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 @@ -716080,7 +716080,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 @@ -716096,10 +716096,10 @@ sub_817339C: @ 817339C adds r0, 0x2B ldrb r0, [r0] cmp r0, 0x1 - bne _081733C0 + bne @081733C0 ldr r0, =sub_81733D4 + 1 str r0, [r3, 0x1C] -_081733C0: +@081733C0: pop {r0} bx r0 .align 2, 0 @@ -716107,13 +716107,13 @@ _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 lsls r0, 24 cmp r0, 0 - beq _081733F6 + beq @081733F6 movs r0, 0 strh r0, [r4, 0x2E] adds r2, r4, 0 @@ -716124,7 +716124,7 @@ sub_81733D4: @ 81733D4 strb r0, [r2] ldr r0, =sub_8173400 + 1 str r0, [r4, 0x1C] -_081733F6: +@081733F6: pop {r4} pop {r0} bx r0 @@ -716133,7 +716133,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 @@ -716150,13 +716150,13 @@ sub_8173400: @ 8173400 ldrb r0, [r0] lsls r0, 27 cmp r0, 0 - bge _08173448 + bge @08173448 ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] lsls r0, 16 cmp r0, 0 - ble _08173448 + ble @08173448 ldrb r0, [r2] adds r0, r3 ldrb r1, [r0] @@ -716168,7 +716168,7 @@ sub_8173400: @ 8173400 bl obj_anim_image_start adds r0, r4, 0 bl move_anim_8072740 -_08173448: +@08173448: pop {r4,r5} pop {r0} bx r0 @@ -716177,7 +716177,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 @@ -716185,32 +716185,32 @@ sub_817345C: @ 817345C movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - beq _08173478 + beq @08173478 cmp r0, 0x1 - beq _0817348C - b _081734A0 + beq @0817348C + b @081734A0 .align 2, 0 .pool -_08173478: +@08173478: movs r0, 0 bl battle_get_side_with_given_state ldr r1, =0x02038436 strb r0, [r1] movs r0, 0x1 - b _08173498 + b @08173498 .align 2, 0 .pool -_0817348C: +@0817348C: movs r0, 0x1 bl battle_get_side_with_given_state ldr r1, =0x02038436 strb r0, [r1] movs r0, 0 -_08173498: +@08173498: bl battle_get_side_with_given_state ldr r1, =0x02038437 strb r0, [r1] -_081734A0: +@081734A0: adds r0, r4, 0 bl move_anim_task_del pop {r4} @@ -716221,7 +716221,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 @@ -716230,42 +716230,42 @@ sub_81734B4: @ 81734B4 ldr r0, [r0, 0x8] ldrh r1, [r0] cmp r1, 0x53 - bne _081734D4 + bne @081734D4 ldr r1, =0x0203841e movs r0, 0x1 - b _0817350C + b @0817350C .align 2, 0 .pool -_081734D4: +@081734D4: cmp r1, 0xFA - bne _081734E4 + bne @081734E4 ldr r1, =0x0203841e movs r0, 0x2 - b _0817350C + b @0817350C .align 2, 0 .pool -_081734E4: +@081734E4: cmp r1, 0x80 - bne _081734F4 + bne @081734F4 ldr r1, =0x0203841e movs r0, 0x3 - b _0817350C + b @0817350C .align 2, 0 .pool -_081734F4: +@081734F4: movs r0, 0xA4 lsls r0, 1 cmp r1, r0 - bne _08173508 + bne @08173508 ldr r1, =0x0203841e movs r0, 0x4 - b _0817350C + b @0817350C .align 2, 0 .pool -_08173508: +@08173508: ldr r1, =0x0203841e movs r0, 0 -_0817350C: +@0817350C: strh r0, [r1] adds r0, r2, 0 bl move_anim_task_del @@ -716276,7 +716276,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 @@ -716299,7 +716299,7 @@ sub_817351C: @ 817351C thumb_func_end sub_817351C thumb_func_start sub_817354C -sub_817354C: @ 817354C +sub_817354C: ; 817354C push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -716309,7 +716309,7 @@ sub_817354C: @ 817354C thumb_func_end sub_817354C thumb_func_start sub_8173560 -sub_8173560: @ 8173560 +sub_8173560: ; 8173560 push {lr} bl run_active_tasks bl run_remoboxes @@ -716321,7 +716321,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 @@ -716330,24 +716330,24 @@ sub_817357C: @ 817357C adds r0, r1 ldrb r0, [r0] cmp r0, 0x4 - bls _08173590 - b _08173688 -_08173590: + bls @08173590 + b @08173688 +@08173590: lsls r0, 2 - ldr r1, =_081735A4 + ldr r1, =@081735A4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081735A4: - .4byte _081735B8 - .4byte _081735E8 - .4byte _081735EE - .4byte _08173620 - .4byte _0817365C -_081735B8: +@081735A4: + .4byte @081735B8 + .4byte @081735E8 + .4byte @081735EE + .4byte @08173620 + .4byte @0817365C +@081735B8: movs r0, 0 bl SetVBlankCallback bl sub_8174EC4 @@ -716361,13 +716361,13 @@ _081735B8: adds r0, r1 movs r1, 0x1 strb r1, [r0] - b _08173688 + b @08173688 .align 2, 0 .pool -_081735E8: +@081735E8: bl sub_8174F70 - b _08173642 -_081735EE: + b @08173642 +@081735EE: ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set @@ -716383,15 +716383,15 @@ _081735EE: ldr r1, [r0] movs r0, 0 strh r0, [r1] - b _08173642 + b @08173642 .align 2, 0 .pool -_08173620: +@08173620: bl sub_8175024 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _08173688 + bne @08173688 ldr r0, =sub_817354C + 1 bl SetVBlankCallback movs r0, 0x1 @@ -716401,7 +716401,7 @@ _08173620: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 -_08173642: +@08173642: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -716409,29 +716409,29 @@ _08173642: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08173688 + b @08173688 .align 2, 0 .pool -_0817365C: +@0817365C: bl fade_and_return_progress_probably ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08173688 + bne @08173688 ldr r0, =sub_8173560 + 1 bl set_callback2 movs r0, 0xDA lsls r0, 1 bl song_play_for_text movs r0, 0 - b _0817368A + b @0817368A .align 2, 0 .pool -_08173688: +@08173688: movs r0, 0x1 -_0817368A: +@0817368A: add sp, 0x4 pop {r4} pop {r1} @@ -716439,13 +716439,13 @@ _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 lsrs r4, r0, 24 cmp r4, 0 - bne _081736C4 + bne @081736C4 ldr r0, =sub_817371C + 1 movs r1, 0 bl AddTask @@ -716461,7 +716461,7 @@ sub_8173694: @ 8173694 movs r0, 0x78 bl malloc_and_clear str r0, [r4] -_081736C4: +@081736C4: pop {r4} pop {r0} bx r0 @@ -716470,12 +716470,12 @@ _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 cmp r0, 0 - bne _08173708 + bne @08173708 ldr r0, =sub_817371C + 1 movs r1, 0 bl AddTask @@ -716492,7 +716492,7 @@ sub_81736D8: @ 81736D8 movs r0, 0x78 bl malloc_and_clear str r0, [r4] -_08173708: +@08173708: pop {r4} pop {r0} bx r0 @@ -716501,7 +716501,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 @@ -716520,7 +716520,7 @@ sub_817371C: @ 817371C movs r7, 0 ldr r0, =0x0203bcd8 mov r9, r0 -_08173740: +@08173740: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 @@ -716531,7 +716531,7 @@ _08173740: bl pokemon_getattr adds r5, r0, 0 cmp r5, 0 - beq _0817380C + beq @0817380C adds r0, r6, 0 movs r1, 0x41 bl pokemon_getattr @@ -716584,7 +716584,7 @@ _08173740: mov r6, r8 lsls r5, r6, 2 ldr r3, =0x0203bcd8 -_081737CA: +@081737CA: ldr r0, [r3] adds r1, r2, r4 adds r0, 0xA @@ -716597,7 +716597,7 @@ _081737CA: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x9 - bls _081737CA + bls @081737CA ldr r0, =0x03005e00 mov r2, r8 adds r1, r5, r2 @@ -716606,10 +716606,10 @@ _081737CA: ldrh r0, [r1, 0xC] adds r0, 0x1 strh r0, [r1, 0xC] - b _08173840 + b @08173840 .align 2, 0 .pool -_0817380C: +@0817380C: mov r6, r9 ldr r3, [r6] lsls r2, r7, 2 @@ -716636,14 +716636,14 @@ _0817380C: strb r1, [r0, 0xA] mov r2, r8 lsls r5, r2, 2 -_08173840: +@08173840: adds r0, r7, 0x1 lsls r0, 16 lsrs r7, r0, 16 cmp r7, 0x5 - bhi _0817384C - b _08173740 -_0817384C: + bhi @0817384C + b @08173740 +@0817384C: ldr r0, =0x0203bcd4 movs r3, 0 str r3, [r0] @@ -716659,7 +716659,7 @@ _0817384C: adds r3, r4, 0 adds r3, 0x8 movs r2, 0xFF -_0817386A: +@0817386A: adds r0, r7, 0x5 lsls r0, 1 adds r0, r1 @@ -716669,7 +716669,7 @@ _0817386A: lsls r0, 16 lsrs r7, r0, 16 cmp r7, 0x5 - bls _0817386A + bls @0817386A mov r1, r8 adds r0, r5, r1 lsls r0, 3 @@ -716677,14 +716677,14 @@ _0817386A: movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0 - beq _081738A4 + beq @081738A4 ldr r0, =sub_8173A8C + 1 - b _081738A6 + b @081738A6 .align 2, 0 .pool -_081738A4: +@081738A4: ldr r0, =sub_81738BC + 1 -_081738A6: +@081738A6: str r0, [r1] add sp, 0xC pop {r3,r4} @@ -716698,7 +716698,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 @@ -716711,28 +716711,28 @@ sub_81738BC: @ 81738BC ldr r0, =0x0203bce4 ldrb r0, [r0] cmp r0, 0 - bne _081738EC + bne @081738EC movs r2, 0x80 lsls r2, 6 adds r0, r7, 0 movs r1, 0 bl memset - b _08173906 + b @08173906 .align 2, 0 .pool -_081738EC: +@081738EC: movs r0, 0x3 bl sub_81534D0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08173906 + beq @08173906 movs r2, 0x80 lsls r2, 6 adds r0, r7, 0 movs r1, 0 bl memset -_08173906: +@08173906: movs r5, 0 ldrh r1, [r7, 0x8] ldr r2, =0x000001ff @@ -716742,29 +716742,29 @@ _08173906: lsls r1, 2 mov r8, r1 cmp r0, 0 - beq _08173930 -_0817391A: + beq @08173930 +@0817391A: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 adds r7, 0x78 cmp r5, 0x31 - bhi _08173934 + bhi @08173934 ldrh r1, [r7, 0x8] adds r0, r2, 0 ands r0, r1 cmp r0, 0 - bne _0817391A -_08173930: + bne @0817391A +@08173930: cmp r5, 0x31 - bls _08173956 -_08173934: + bls @08173956 +@08173934: ldr r4, =0x0201c000 adds r6, r4, 0 adds r4, 0x78 movs r5, 0 subs r7, 0x78 -_0817393E: +@0817393E: adds r0, r6, 0 adds r1, r4, 0 movs r2, 0x78 @@ -716775,8 +716775,8 @@ _0817393E: adds r6, 0x78 adds r4, 0x78 cmp r5, 0x30 - bls _0817393E -_08173956: + bls @0817393E +@08173956: ldr r0, =0x0203bcd8 ldr r1, [r0] adds r0, r7, 0 @@ -716820,7 +716820,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 @@ -716832,11 +716832,11 @@ sub_81739C4: @ 81739C4 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _08173A34 + bne @08173A34 ldr r0, =0x030061fc ldr r0, [r0] cmp r0, 0 - beq _08173A34 + beq @08173A34 movs r0, 0x1 bl bg_unset_tilemap movs r0, 0x3 @@ -716845,25 +716845,25 @@ sub_81739C4: @ 81739C4 ldr r5, =0x0203bcdc ldr r0, [r5] cmp r0, 0 - beq _08173A06 + beq @08173A06 bl free movs r0, 0 str r0, [r5] -_08173A06: +@08173A06: ldr r5, =0x0203bcd8 ldr r0, [r5] cmp r0, 0 - beq _08173A16 + beq @08173A16 bl free movs r0, 0 str r0, [r5] -_08173A16: +@08173A16: adds r0, r4, 0 bl remove_task - b _08173A4C + b @08173A4C .align 2, 0 .pool -_08173A34: +@08173A34: movs r0, 0x37 bl audio_play ldr r1, =0x03005e00 @@ -716875,7 +716875,7 @@ _08173A34: str r1, [r0] movs r1, 0x20 strh r1, [r0, 0xE] -_08173A4C: +@08173A4C: pop {r4,r5} pop {r0} bx r0 @@ -716884,7 +716884,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 @@ -716897,16 +716897,16 @@ sub_8173A5C: @ 8173A5C movs r3, 0xE ldrsh r0, [r1, r3] cmp r0, 0 - beq _08173A80 + beq @08173A80 subs r0, r2, 0x1 strh r0, [r1, 0xE] - b _08173A84 + b @08173A84 .align 2, 0 .pool -_08173A80: +@08173A80: ldr r0, =sub_8173A8C + 1 str r0, [r1] -_08173A84: +@08173A84: pop {r0} bx r0 .align 2, 0 @@ -716914,7 +716914,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 @@ -716930,7 +716930,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 @@ -716955,14 +716955,14 @@ sub_8173AA8: @ 8173AA8 movs r2, 0xC ldrsh r0, [r1, r2] cmp r0, 0x3 - ble _08173AEC + ble @08173AEC ldr r1, =0x085e53b4 - b _08173AEE + b @08173AEE .align 2, 0 .pool -_08173AEC: +@08173AEC: ldr r1, =0x085e53e4 -_08173AEE: +@08173AEE: lsls r2, r6, 3 adds r0, r2, r1 ldrh r3, [r0] @@ -716982,13 +716982,13 @@ _08173AEE: movs r1, 0xCE lsls r1, 1 cmp r0, r1 - bne _08173B20 + bne @08173B20 lsls r0, r5, 16 movs r1, 0xA0 lsls r1, 12 adds r0, r1 lsrs r5, r0, 16 -_08173B20: +@08173B20: lsls r0, r2, 23 lsrs r0, 23 ldr r1, [r7] @@ -717058,7 +717058,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 @@ -717089,7 +717089,7 @@ sub_8173BC0: @ 8173BC0 ldr r1, [r3, 0x1C] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _08173C1A + bne @08173C1A ldrb r1, [r3, 0x1] movs r0, 0x4 negs r0, r0 @@ -717103,7 +717103,7 @@ sub_8173BC0: @ 8173BC0 strh r0, [r5, 0xE] ldr r0, =sub_8173C34 + 1 str r0, [r5] -_08173C1A: +@08173C1A: pop {r4,r5} pop {r0} bx r0 @@ -717112,7 +717112,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 @@ -717138,13 +717138,13 @@ sub_8173C34: @ 8173C34 ldrsh r0, [r4, r7] mov r12, r2 cmp r0, 0 - beq _08173C78 + beq @08173C78 subs r0, r1, 0x1 strh r0, [r4, 0xE] - b _08173D10 + b @08173D10 .align 2, 0 .pool -_08173C78: +@08173C78: ldr r2, =0x0203bcd4 ldr r0, =0x02020630 mov r8, r0 @@ -717172,13 +717172,13 @@ _08173C78: movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0x4 - bgt _08173D04 + bgt @08173D04 mov r7, r9 ldrh r1, [r7, 0x1C] ldr r0, =0x000001ff ands r0, r1 cmp r0, 0 - beq _08173D04 + beq @08173D04 adds r0, r2, 0x1 strh r0, [r4, 0xA] ldr r0, =0x000063b0 @@ -717203,17 +717203,17 @@ _08173C78: strb r1, [r0, 0x5] ldr r0, =sub_8173AA8 + 1 str r0, [r4] - b _08173D10 + b @08173D10 .align 2, 0 .pool -_08173D04: +@08173D04: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 add r0, r12 ldr r1, =sub_8173D24 + 1 str r1, [r0] -_08173D10: +@08173D10: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -717226,7 +717226,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} @@ -717249,7 +717249,7 @@ sub_8173D24: @ 8173D24 ldr r6, =0x02020630 movs r7, 0xD negs r7, r7 -_08173D52: +@08173D52: adds r0, r3, 0x5 lsls r0, 1 adds r0, r5 @@ -717258,7 +717258,7 @@ _08173D52: movs r2, 0 ldrsh r0, [r1, r2] cmp r0, 0xFF - beq _08173D74 + beq @08173D74 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -717267,12 +717267,12 @@ _08173D52: adds r0, r7, 0 ands r0, r2 strb r0, [r1, 0x5] -_08173D74: +@08173D74: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x5 - bls _08173D52 + bls @08173D52 movs r0, 0 movs r1, 0xF bl sub_8174A38 @@ -717299,7 +717299,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 @@ -717317,22 +717317,22 @@ sub_8173DC0: @ 8173DC0 movs r3, 0xE ldrsh r0, [r1, r3] cmp r0, 0 - beq _08173E04 + beq @08173E04 subs r2, 0x1 strh r2, [r1, 0xE] movs r0, 0x3 ands r0, r2 cmp r0, 0 - bne _08173E7E + bne @08173E7E lsls r0, r2, 16 asrs r0, 16 cmp r0, 0x6E - ble _08173E7E + ble @08173E7E bl sub_81751FC - b _08173E7E + b @08173E7E .align 2, 0 .pool -_08173E04: +@08173E04: movs r3, 0 mov r9, r4 ldr r0, =0x0203bcd4 @@ -717345,7 +717345,7 @@ _08173E04: negs r1, r1 mov r12, r1 movs r5, 0x4 -_08173E1C: +@08173E1C: adds r0, r3, 0x5 lsls r0, 1 adds r0, r4 @@ -717354,7 +717354,7 @@ _08173E1C: movs r2, 0 ldrsh r0, [r1, r2] cmp r0, 0xFF - beq _08173E40 + beq @08173E40 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -717364,12 +717364,12 @@ _08173E1C: ands r0, r2 orrs r0, r5 strb r0, [r1, 0x5] -_08173E40: +@08173E40: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x5 - bls _08173E1C + bls @08173E1C mov r3, r10 ldr r0, [r3] ldr r1, =0x000063b0 @@ -717393,7 +717393,7 @@ _08173E40: strh r1, [r0, 0xE] ldr r1, =sub_8173EA4 + 1 str r1, [r0] -_08173E7E: +@08173E7E: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -717407,7 +717407,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 @@ -717420,13 +717420,13 @@ sub_8173EA4: @ 8173EA4 movs r3, 0xE ldrsh r0, [r1, r3] cmp r0, 0xF - ble _08173ECC + ble @08173ECC ldr r0, =sub_8173EE4 + 1 str r0, [r1] - b _08173EDE + b @08173EDE .align 2, 0 .pool -_08173ECC: +@08173ECC: adds r0, r2, 0x1 strh r0, [r1, 0xE] movs r0, 0xE @@ -717435,13 +717435,13 @@ _08173ECC: lsrs r1, 16 movs r0, 0x52 bl lcd_io_set -_08173EDE: +@08173EDE: pop {r0} bx r0 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 @@ -717505,7 +717505,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 @@ -717519,13 +717519,13 @@ sub_8173F84: @ 8173F84 movs r1, 0xE ldrsh r5, [r4, r1] cmp r5, 0 - beq _08173FAC + beq @08173FAC subs r0, 0x1 strh r0, [r4, 0xE] - b _08174018 + b @08174018 .align 2, 0 .pool -_08173FAC: +@08173FAC: ldr r2, =0x02020630 movs r3, 0x10 ldrsh r1, [r4, r3] @@ -717537,13 +717537,13 @@ _08173FAC: movs r3, 0x20 ldrsh r0, [r1, r3] cmp r0, 0xC0 - beq _08173FD0 + beq @08173FD0 adds r0, r2, 0x1 strh r0, [r1, 0x20] - b _08174018 + b @08174018 .align 2, 0 .pool -_08173FD0: +@08173FD0: movs r0, 0x20 str r0, [sp] str r0, [sp, 0x4] @@ -717575,7 +717575,7 @@ _08173FD0: bl Window_CopyToVram ldr r0, =sub_8174028 + 1 str r0, [r4] -_08174018: +@08174018: add sp, 0x10 pop {r4,r5} pop {r0} @@ -717585,7 +717585,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 @@ -717594,7 +717594,7 @@ sub_8174028: @ 8174028 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0817404E + beq @0817404E movs r0, 0x4 bl play_sound_effect ldr r0, =0x03005e00 @@ -717604,7 +717604,7 @@ sub_8174028: @ 8174028 adds r1, r0 ldr r0, =sub_8174060 + 1 str r0, [r1] -_0817404E: +@0817404E: pop {r4} pop {r0} bx r0 @@ -717613,7 +717613,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 @@ -717648,7 +717648,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 @@ -717660,7 +717660,7 @@ sub_81740B0: @ 81740B0 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08174164 + bne @08174164 lsls r0, r7, 2 mov r8, r0 ldr r1, =0x03005e00 @@ -717671,10 +717671,10 @@ sub_81740B0: @ 81740B0 ldr r2, =0x02020630 mov r9, r2 movs r6, 0x5 -_081740DC: +@081740DC: ldrb r4, [r5] cmp r4, 0xFF - beq _081740FA + beq @081740FA lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -717685,11 +717685,11 @@ _081740DC: bl rotscale_free_entry adds r0, r4, 0 bl sub_818D820 -_081740FA: +@081740FA: adds r5, 0x2 subs r6, 0x1 cmp r6, 0 - bge _081740DC + bge @081740DC ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 @@ -717715,21 +717715,21 @@ _081740FA: ldr r4, =0x0203bcdc ldr r0, [r4] cmp r0, 0 - beq _08174150 + beq @08174150 bl free movs r0, 0 str r0, [r4] -_08174150: +@08174150: ldr r4, =0x0203bcd8 ldr r0, [r4] cmp r0, 0 - beq _08174160 + beq @08174160 bl free movs r0, 0 str r0, [r4] -_08174160: +@08174160: bl sub_8174184 -_08174164: +@08174164: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -717741,7 +717741,7 @@ _08174164: thumb_func_end sub_81740B0 thumb_func_start sub_8174184 -sub_8174184: @ 8174184 +sub_8174184: ; 8174184 push {lr} ldr r0, =sub_8175620 + 1 bl set_callback2 @@ -717752,7 +717752,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 @@ -717760,23 +717760,23 @@ sub_8174194: @ 8174194 adds r0, r1 ldrb r0, [r0] cmp r0, 0x5 - bhi _081741D0 + bhi @081741D0 lsls r0, 2 - ldr r1, =_081741B8 + ldr r1, =@081741B8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081741B8: - .4byte _081741D0 - .4byte _08174200 - .4byte _08174214 - .4byte _08174240 - .4byte _08174280 - .4byte _081742B0 -_081741D0: +@081741B8: + .4byte @081741D0 + .4byte @08174200 + .4byte @08174214 + .4byte @08174240 + .4byte @08174280 + .4byte @081742B0 +@081741D0: movs r0, 0 bl SetVBlankCallback bl sub_8174EC4 @@ -717790,19 +717790,19 @@ _081741D0: adds r0, r2 movs r1, 0x1 strb r1, [r0] - b _08174308 + b @08174308 .align 2, 0 .pool -_08174200: +@08174200: bl sub_8174F70 ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 - b _081742A2 + b @081742A2 .align 2, 0 .pool -_08174214: +@08174214: movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -717817,14 +717817,14 @@ _08174214: movs r4, 0x87 lsls r4, 3 adds r1, r4 - b _081742A2 + b @081742A2 .align 2, 0 .pool -_08174240: +@08174240: bl sub_8175024 lsls r0, 24 cmp r0, 0 - bne _08174308 + bne @08174308 ldr r1, =0x0201c000 ldr r0, =0x085e56d4 ldm r0!, {r2-r4} @@ -717841,10 +717841,10 @@ _08174240: movs r4, 0x87 lsls r4, 3 adds r1, r4 - b _081742A2 + b @081742A2 .align 2, 0 .pool -_08174280: +@08174280: bl run_active_tasks bl call_obj_callbacks bl obj_sync_something @@ -717852,19 +717852,19 @@ _08174280: bl sub_80F9C1C lsls r0, 24 cmp r0, 0 - bne _08174308 + bne @08174308 ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 -_081742A2: +@081742A2: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08174308 + b @08174308 .align 2, 0 .pool -_081742B0: +@081742B0: ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set @@ -717886,7 +717886,7 @@ _081742B0: lsls r1, 3 ldr r4, =0x03005e08 movs r3, 0xFF -_081742E2: +@081742E2: adds r0, r2, 0x5 lsls r0, 1 adds r0, r1 @@ -717896,7 +717896,7 @@ _081742E2: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x5 - bls _081742E2 + bls @081742E2 ldr r4, =0x0203bcd8 movs r0, 0x80 lsls r0, 6 @@ -717904,7 +717904,7 @@ _081742E2: str r0, [r4] ldr r0, =sub_8173560 + 1 bl set_callback2 -_08174308: +@08174308: pop {r4} pop {r0} bx r0 @@ -717913,7 +717913,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 @@ -717930,17 +717930,17 @@ sub_8174324: @ 8174324 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08174364 + beq @08174364 ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 ldr r0, =sub_81749A0 + 1 - b _081743DA + b @081743DA .align 2, 0 .pool -_08174364: +@08174364: ldr r0, =0x0201c000 ldr r4, =0x0203bcd8 ldr r1, [r4] @@ -717955,37 +717955,37 @@ _08174364: ands r0, r1 lsls r5, r6, 2 cmp r0, 0 - beq _0817439A -_08174384: + beq @0817439A +@08174384: adds r0, r2, 0x1 lsls r0, 16 lsrs r2, r0, 16 adds r4, 0x78 cmp r2, 0x31 - bhi _081743BC + bhi @081743BC ldrh r1, [r4, 0x8] adds r0, r3, 0 ands r0, r1 cmp r0, 0 - bne _08174384 -_0817439A: + bne @08174384 +@0817439A: cmp r2, 0x31 - bhi _081743BC + bhi @081743BC ldr r0, =0x03005e00 adds r1, r5, r6 lsls r1, 3 adds r1, r0 subs r0, r2, 0x1 - b _081743C6 + b @081743C6 .align 2, 0 .pool -_081743BC: +@081743BC: ldr r0, =0x03005e00 adds r1, r5, r6 lsls r1, 3 adds r1, r0 movs r0, 0x31 -_081743C6: +@081743C6: strh r0, [r1, 0x8] movs r0, 0xA bl sub_80847F8 @@ -717995,7 +717995,7 @@ _081743C6: adds r1, r2 strh r0, [r1, 0xA] ldr r0, =sub_81743EC + 1 -_081743DA: +@081743DA: str r0, [r1] add sp, 0x4 pop {r4-r6} @@ -718006,7 +718006,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 @@ -718030,16 +718030,16 @@ sub_81743EC: @ 81743EC adds r4, r1, 0 ldr r2, =0x0203bcd4 cmp r5, r0 - bge _0817442A + bge @0817442A adds r1, r0, 0 -_0817441E: +@0817441E: adds r3, 0x78 adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, r1 - blt _0817441E -_0817442A: + blt @0817441E +@0817442A: adds r6, r3, 0 movs r0, 0 str r0, [r2] @@ -718054,22 +718054,22 @@ _0817442A: str r2, [sp, 0x14] ldr r4, =0x000001ff adds r2, r1, 0 -_08174446: +@08174446: ldrh r1, [r6, 0x8] adds r0, r4, 0 ands r0, r1 cmp r0, 0 - beq _08174456 + beq @08174456 ldrh r0, [r2, 0x10] adds r0, 0x1 strh r0, [r2, 0x10] -_08174456: +@08174456: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 adds r6, 0x14 cmp r5, 0x5 - bls _08174446 + bls @08174446 adds r6, r3, 0 movs r5, 0 ldr r1, =0x03005e00 @@ -718081,18 +718081,18 @@ _08174456: str r0, [sp, 0x10] ldr r1, =0x000001ff mov r10, r1 -_08174478: +@08174478: ldrh r0, [r6, 0x8] mov r1, r10 ands r1, r0 adds r7, r0, 0 cmp r1, 0 - beq _08174540 + beq @08174540 ldr r2, [sp, 0x10] movs r4, 0x10 ldrsh r0, [r2, r4] cmp r0, 0x3 - ble _081744B8 + ble @081744B8 lsls r1, r5, 3 ldr r0, =0x085e53b4 adds r0, 0x4 @@ -718101,10 +718101,10 @@ _08174478: ldr r0, =0x085e53ba adds r1, r0 ldrh r4, [r1] - b _081744C8 + b @081744C8 .align 2, 0 .pool -_081744B8: +@081744B8: ldr r0, =0x085e53e4 lsls r2, r5, 3 adds r1, r0, 0x4 @@ -718113,19 +718113,19 @@ _081744B8: adds r0, 0x6 adds r2, r0 ldrh r4, [r2] -_081744C8: +@081744C8: mov r1, r10 ands r1, r7 movs r0, 0xCE lsls r0, 1 cmp r1, r0 - bne _081744DE + bne @081744DE lsls r0, r4, 16 movs r1, 0xA0 lsls r1, 12 adds r0, r1 lsrs r4, r0, 16 -_081744DE: +@081744DE: lsls r0, r7, 23 lsrs r0, 23 ldr r1, [r6] @@ -718164,10 +718164,10 @@ _081744DE: ldr r2, =0x03005e08 adds r1, r2 strh r0, [r1] - b _0817454E + b @0817454E .align 2, 0 .pool -_08174540: +@08174540: adds r0, r5, 0x5 lsls r0, 1 add r0, r9 @@ -718175,13 +718175,13 @@ _08174540: adds r0, r4 movs r1, 0xFF strh r1, [r0] -_0817454E: +@0817454E: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 adds r6, 0x14 cmp r5, 0x5 - bls _08174478 + bls @08174478 ldr r0, =0xffff0000 ldr r2, =0x000063b0 movs r1, 0xC @@ -718204,7 +718204,7 @@ _0817454E: movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - bgt _081745C0 + bgt @081745C0 ldr r1, =0x085e8574 movs r0, 0x1 str r0, [sp] @@ -718212,10 +718212,10 @@ _0817454E: movs r2, 0 movs r3, 0 bl sub_8198204 - b _081745D0 + b @081745D0 .align 2, 0 .pool -_081745C0: +@081745C0: ldr r1, =0x085e855c movs r0, 0x1 str r0, [sp] @@ -718223,7 +718223,7 @@ _081745C0: movs r2, 0 movs r3, 0 bl sub_8198204 -_081745D0: +@081745D0: ldr r0, =0x03005e00 ldr r1, [sp, 0x14] add r1, r8 @@ -718244,7 +718244,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 @@ -718263,16 +718263,16 @@ sub_81745FC: @ 81745FC movs r2, 0x8 ldrsh r0, [r0, r2] cmp r3, r0 - bge _08174630 + bge @08174630 adds r1, r0, 0 -_08174624: +@08174624: adds r5, 0x78 adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, r1 - blt _08174624 -_08174630: + blt @08174624 +@08174630: movs r3, 0 lsls r7, r4, 2 adds r0, r7, r4 @@ -718286,14 +718286,14 @@ _08174630: mov r9, r2 movs r0, 0x4 mov r12, r0 -_0817464A: +@0817464A: adds r0, r3, 0x5 lsls r0, 1 adds r0, r6 add r0, r10 ldrh r1, [r0] cmp r1, 0xFF - beq _0817466C + beq @0817466C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -718304,12 +718304,12 @@ _0817464A: mov r2, r12 orrs r1, r2 strb r1, [r0, 0x5] -_0817466C: +@0817466C: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x5 - bls _0817464A + bls @0817464A adds r1, r7, r4 lsls r1, 3 ldr r0, =0x03005e00 @@ -718356,14 +718356,14 @@ _0817466C: movs r1, 0xCE lsls r1, 1 cmp r0, r1 - beq _081746E6 + beq @081746E6 bl sub_80A369C ldrh r0, [r4, 0x8] lsls r0, 23 lsrs r0, 23 movs r1, 0 bl cry_related -_081746E6: +@081746E6: adds r0, r4, 0 movs r1, 0 movs r2, 0xE @@ -718382,7 +718382,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 @@ -718395,7 +718395,7 @@ sub_8174728: @ 8174728 ands r0, r2 adds r3, r1, 0 cmp r0, 0 - beq _081747E4 + beq @081747E4 ldr r0, =0x03005e00 mov r12, r0 lsls r0, r6, 2 @@ -718408,7 +718408,7 @@ sub_8174728: @ 8174728 ldrsh r1, [r4, r5] mov r9, r0 cmp r1, 0 - beq _081747B8 + beq @081747B8 subs r0, r2, 0x1 strh r0, [r4, 0x8] movs r5, 0 @@ -718416,7 +718416,7 @@ sub_8174728: @ 8174728 movs r0, 0x8 add r0, r12 mov r8, r0 -_0817476A: +@0817476A: adds r0, r5, 0x5 lsls r0, 1 adds r0, r7 @@ -718424,16 +718424,16 @@ _0817476A: adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0xFF - beq _08174782 + beq @08174782 bl sub_818D820 movs r0, 0xFF strh r0, [r4] -_08174782: +@08174782: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x5 - bls _0817476A + bls @0817476A ldr r0, =0x03005e00 mov r2, r9 adds r1, r2, r6 @@ -718443,48 +718443,48 @@ _08174782: movs r3, 0xA ldrsh r0, [r1, r3] cmp r0, 0 - beq _081747A4 + beq @081747A4 subs r0, r2, 0x1 strh r0, [r1, 0xA] -_081747A4: +@081747A4: ldr r0, =sub_81743EC + 1 str r0, [r1] - b _08174884 + b @08174884 .align 2, 0 .pool -_081747B8: +@081747B8: bl sub_80A36C8 lsls r0, 24 cmp r0, 0 - beq _081747D2 + beq @081747D2 bl sub_80A369C ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl -_081747D2: +@081747D2: ldr r0, =sub_8174898 + 1 str r0, [r4] - b _08174884 + b @08174884 .align 2, 0 .pool -_081747E4: +@081747E4: movs r0, 0x2 ands r0, r2 cmp r0, 0 - beq _08174828 + beq @08174828 bl sub_80A36C8 lsls r0, 24 cmp r0, 0 - beq _08174806 + beq @08174806 bl sub_80A369C ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl -_08174806: +@08174806: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -718492,14 +718492,14 @@ _08174806: adds r1, r0 ldr r0, =sub_8174898 + 1 str r0, [r1] - b _08174884 + b @08174884 .align 2, 0 .pool -_08174828: +@08174828: movs r0, 0x40 ands r0, r2 cmp r0, 0 - beq _08174858 + beq @08174858 ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -718509,20 +718509,20 @@ _08174828: movs r4, 0xC ldrsh r0, [r1, r4] cmp r0, 0 - beq _08174858 + beq @08174858 subs r0, r2, 0x1 strh r0, [r1, 0xC] ldr r0, =sub_81745FC + 1 str r0, [r1] - b _08174884 + b @08174884 .align 2, 0 .pool -_08174858: +@08174858: ldrh r1, [r3, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08174884 + beq @08174884 ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 @@ -718534,13 +718534,13 @@ _08174858: ldrsh r0, [r2, r3] subs r0, 0x1 cmp r1, r0 - bge _08174884 + bge @08174884 ldrh r0, [r2, 0xC] adds r0, 0x1 strh r0, [r2, 0xC] ldr r0, =sub_81745FC + 1 str r0, [r2] -_08174884: +@08174884: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -718552,7 +718552,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 @@ -718587,7 +718587,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} @@ -718596,14 +718596,14 @@ sub_81748F0: @ 81748F0 bl sub_80F9C30 lsls r0, 24 cmp r0, 0 - bne _08174988 + bne @08174988 movs r5, 0 lsls r0, r6, 2 adds r0, r6 lsls r7, r0, 3 ldr r0, =0x03005e08 mov r8, r0 -_08174910: +@08174910: adds r0, r5, 0x5 lsls r0, 1 adds r0, r7 @@ -718611,16 +718611,16 @@ _08174910: adds r4, r0, r1 ldrh r0, [r4] cmp r0, 0xFF - beq _08174928 + beq @08174928 bl sub_818D820 movs r0, 0xFF strh r0, [r4] -_08174928: +@08174928: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls _08174910 + bls @08174910 movs r0, 0 bl gpu_sync_bg_hide movs r0, 0x1 @@ -718640,21 +718640,21 @@ _08174928: ldr r4, =0x0203bcdc ldr r0, [r4] cmp r0, 0 - beq _08174974 + beq @08174974 bl free movs r0, 0 str r0, [r4] -_08174974: +@08174974: ldr r4, =0x0203bcd8 ldr r0, [r4] cmp r0, 0 - beq _08174984 + beq @08174984 bl free movs r0, 0 str r0, [r4] -_08174984: +@08174984: bl sub_8137C3C -_08174988: +@08174988: pop {r3} mov r8, r3 pop {r4-r7} @@ -718665,7 +718665,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 @@ -718710,7 +718710,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 @@ -718719,7 +718719,7 @@ sub_8174A08: @ 8174A08 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08174A28 + beq @08174A28 ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -718727,7 +718727,7 @@ sub_8174A08: @ 8174A08 adds r1, r0 ldr r0, =sub_8174898 + 1 str r0, [r1] -_08174A28: +@08174A28: pop {r0} bx r0 .align 2, 0 @@ -718735,7 +718735,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 @@ -718771,7 +718771,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 @@ -718786,7 +718786,7 @@ sub_8174A88: @ 8174A88 movs r0, 0xCE lsls r0, 1 cmp r1, r0 - beq _08174B30 + beq @08174B30 ldr r1, =0x085e8c36 add r0, sp, 0xC bl gf_strcpy @@ -718799,7 +718799,7 @@ sub_8174A88: @ 8174A88 lsrs r4, r0, 16 ldr r0, =0x0000ffff cmp r4, r0 - beq _08174B04 + beq @08174B04 adds r0, r4, 0 movs r1, 0x64 bl __divsi3 @@ -718819,16 +718819,16 @@ sub_8174A88: @ 8174A88 movs r1, 0xA bl __modsi3 subs r0, 0x5F - b _08174B0E + b @08174B0E .align 2, 0 .pool -_08174B04: +@08174B04: movs r0, 0xAC strb r0, [r6] adds r6, 0x1 strb r0, [r6] adds r6, 0x1 -_08174B0E: +@08174B0E: strb r0, [r6] adds r6, 0x1 movs r0, 0xFF @@ -718845,7 +718845,7 @@ _08174B0E: movs r2, 0x10 movs r3, 0x1 bl box_print -_08174B30: +@08174B30: adds r1, r7, 0 adds r1, 0xA add r0, sp, 0xC @@ -718861,7 +718861,7 @@ _08174B30: movs r1, 0xCE lsls r1, 1 cmp r0, r1 - bne _08174B8C + bne @08174B8C movs r0, 0x1 add r1, sp, 0xC movs r2, 0xD0 @@ -718882,10 +718882,10 @@ _08174B30: movs r0, 0 movs r1, 0x3 bl Window_CopyToVram - b _08174C82 + b @08174C82 .align 2, 0 .pool -_08174B8C: +@08174B8C: movs r0, 0x1 add r1, sp, 0xC movs r2, 0x80 @@ -718921,9 +718921,9 @@ _08174B8C: adds r0, r4, 0 ands r0, r1 cmp r0, 0x20 - beq _08174C0A + beq @08174C0A cmp r0, 0x1D - beq _08174C0A + beq @08174C0A lsls r0, r1, 23 lsrs r0, 23 ldr r1, [r7, 0x4] @@ -718931,21 +718931,21 @@ _08174B8C: lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _08174C00 + beq @08174C00 cmp r0, 0xFE - beq _08174C04 - b _08174C0A + beq @08174C04 + b @08174C0A .align 2, 0 .pool -_08174C00: +@08174C00: movs r0, 0xB5 - b _08174C06 -_08174C04: + b @08174C06 +@08174C04: movs r0, 0xB6 -_08174C06: +@08174C06: strb r0, [r6] adds r6, 0x1 -_08174C0A: +@08174C0A: movs r0, 0xFF strb r0, [r6] ldr r5, =0x085e5388 @@ -718998,7 +718998,7 @@ _08174C0A: movs r0, 0 movs r1, 0x3 bl Window_CopyToVram -_08174C82: +@08174C82: add sp, 0x2C pop {r4-r7} pop {r0} @@ -719008,7 +719008,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 @@ -719178,20 +719178,20 @@ sub_8174C98: @ 8174C98 add r0, sp, 0xC ldrb r0, [r0] cmp r0, 0xA1 - bne _08174E1E + bne @08174E1E add r0, sp, 0xC strb r7, [r0] -_08174E1E: +@08174E1E: add r0, sp, 0xC ldrb r1, [r0] cmp r1, 0 - bne _08174E30 + bne @08174E30 ldrb r0, [r0, 0x1] cmp r0, 0xA1 - bne _08174E30 + bne @08174E30 add r0, sp, 0xC strb r1, [r0, 0x8] -_08174E30: +@08174E30: add r1, sp, 0xC movs r0, 0xF0 strb r0, [r1, 0x3] @@ -719248,7 +719248,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} @@ -719268,7 +719268,7 @@ sub_8174EC4: @ 8174EC4 movs r0, 0x81 lsls r0, 24 mov r12, r0 -_08174EEA: +@08174EEA: strh r6, [r2] mov r0, sp str r0, [r1] @@ -719278,7 +719278,7 @@ _08174EEA: adds r3, r5 subs r4, r5 cmp r4, r5 - bhi _08174EEA + bhi @08174EEA strh r6, [r2] mov r2, sp str r2, [r1] @@ -719332,7 +719332,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 @@ -719354,7 +719354,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 gpu_reset_bgs_and_dma3_busy_flags @@ -719404,29 +719404,29 @@ 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 ldr r0, [r0] ldrh r0, [r0] cmp r0, 0x4 - bhi _08175108 + bhi @08175108 lsls r0, 2 - ldr r1, =_08175044 + ldr r1, =@08175044 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08175044: - .4byte _08175058 - .4byte _08175070 - .4byte _0817507C - .4byte _081750D2 - .4byte _081750DC -_08175058: +@08175044: + .4byte @08175058 + .4byte @08175070 + .4byte @0817507C + .4byte @081750D2 + .4byte @081750DC +@08175058: ldr r1, =0x085e5508 movs r0, 0 str r0, [sp] @@ -719434,16 +719434,16 @@ _08175058: movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - b _08175108 + b @08175108 .align 2, 0 .pool -_08175070: +@08175070: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - beq _08175108 - b _08175112 -_0817507C: + beq @08175108 + b @08175112 +@0817507C: movs r4, 0x20 str r4, [sp] movs r0, 0x2 @@ -719480,12 +719480,12 @@ _0817507C: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - b _08175108 -_081750D2: + b @08175108 +@081750D2: bl sub_81971D0 bl sub_8197200 - b _08175108 -_081750DC: + b @08175108 +@081750DC: movs r1, 0x82 lsls r1, 5 movs r0, 0 @@ -719500,18 +719500,18 @@ _081750DC: ldr r1, [r0] movs r0, 0 strh r0, [r1] - b _08175114 + b @08175114 .align 2, 0 .pool -_08175108: +@08175108: ldr r0, =0x0203bcdc ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_08175112: +@08175112: movs r0, 0x1 -_08175114: +@08175114: add sp, 0x8 pop {r4} pop {r1} @@ -719521,91 +719521,91 @@ _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] ldr r0, [r2, 0x30] cmp r1, r0 - beq _08175176 + beq @08175176 ldrh r3, [r2, 0x20] movs r1, 0x20 ldrsh r0, [r2, r1] movs r4, 0x30 ldrsh r1, [r2, r4] cmp r0, r1 - bge _08175140 + bge @08175140 adds r0, r3, 0 adds r0, 0xF strh r0, [r2, 0x20] -_08175140: +@08175140: ldrh r3, [r2, 0x20] movs r4, 0x20 ldrsh r0, [r2, r4] cmp r0, r1 - ble _08175150 + ble @08175150 adds r0, r3, 0 subs r0, 0xF strh r0, [r2, 0x20] -_08175150: +@08175150: ldrh r3, [r2, 0x22] movs r1, 0x22 ldrsh r0, [r2, r1] movs r4, 0x32 ldrsh r1, [r2, r4] cmp r0, r1 - bge _08175164 + bge @08175164 adds r0, r3, 0 adds r0, 0xA strh r0, [r2, 0x22] -_08175164: +@08175164: ldrh r3, [r2, 0x22] movs r4, 0x22 ldrsh r0, [r2, r4] cmp r0, r1 - ble _0817519C + ble @0817519C adds r0, r3, 0 subs r0, 0xA strh r0, [r2, 0x22] - b _0817519C -_08175176: + b @0817519C +@08175176: ldrh r0, [r2, 0x3C] lsls r1, r0, 16 movs r0, 0xCE lsls r0, 17 cmp r1, r0 - bne _08175190 + bne @08175190 lsrs r1, 16 adds r0, r2, 0 movs r2, 0x1 movs r3, 0x3 bl sub_806ED40 - b _0817519C -_08175190: + b @0817519C +@08175190: lsrs r1, 16 adds r0, r2, 0 movs r2, 0 movs r3, 0x3 bl sub_806ED40 -_0817519C: +@0817519C: pop {r4} pop {r0} bx r0 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] movs r2, 0x26 ldrsh r0, [r5, r2] cmp r0, 0x78 - ble _081751BA + ble @081751BA adds r0, r5, 0 bl obj_delete_and_free_tiles - b _081751F2 -_081751BA: + b @081751F2 +@081751BA: adds r0, r1, 0x1 ldrh r1, [r5, 0x30] adds r0, r1 @@ -719626,15 +719626,15 @@ _081751BA: ldrsh r1, [r4, r2] muls r0, r1 cmp r0, 0 - bge _081751E8 + bge @081751E8 adds r0, 0xFF -_081751E8: +@081751E8: asrs r0, 8 strh r0, [r5, 0x24] ldrh r0, [r5, 0x2E] adds r0, 0x4 strh r0, [r5, 0x2E] -_081751F2: +@081751F2: pop {r4,r5} pop {r0} bx r0 @@ -719643,7 +719643,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 @@ -719689,14 +719689,14 @@ sub_81751FC: @ 81751FC movs r1, 0x3 ands r1, r0 cmp r1, 0 - beq _08175274 + beq @08175274 movs r0, 0 - b _08175276 + b @08175276 .align 2, 0 .pool -_08175274: +@08175274: movs r0, 0x1 -_08175276: +@08175276: strh r0, [r4, 0x30] movs r0, 0 pop {r4} @@ -719705,7 +719705,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 @@ -719716,7 +719716,7 @@ sub_8175280: @ 8175280 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq _081752AA + beq @081752AA ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 @@ -719726,7 +719726,7 @@ sub_8175280: @ 8175280 strh r1, [r0, 0xA] ldr r0, =0x020375e2 strh r2, [r0] -_081752AA: +@081752AA: pop {r4} pop {r0} bx r0 @@ -719735,16 +719735,16 @@ _081752AA: thumb_func_end sub_8175280 thumb_func_start sub_81752C0 -sub_81752C0: @ 81752C0 +sub_81752C0: ; 81752C0 push {r4,lr} ldr r0, =sub_8175364 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _081752D4 + beq @081752D4 bl remove_task -_081752D4: +@081752D4: bl sub_8152254 ldr r4, =0x000003e9 adds r0, r4, 0 @@ -719759,14 +719759,14 @@ _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] movs r2, 0xE ldrsh r0, [r5, r2] cmp r0, 0x6E - ble _08175324 + ble @08175324 ldr r2, =0x03005e00 movs r0, 0x28 ldrsh r1, [r5, r0] @@ -719779,10 +719779,10 @@ sub_81752F4: @ 81752F4 strh r1, [r0, 0x26] ldrb r0, [r5, 0x16] bl sub_81525D0 - b _08175358 + b @08175358 .align 2, 0 .pool -_08175324: +@08175324: adds r0, r1, 0x1 ldrh r1, [r5, 0x1C] adds r0, r1 @@ -719801,15 +719801,15 @@ _08175324: ldrsh r1, [r4, r2] muls r0, r1 cmp r0, 0 - bge _0817534E + bge @0817534E adds r0, 0xFF -_0817534E: +@0817534E: asrs r0, 8 strh r0, [r5, 0xC] ldrh r0, [r5, 0x1A] adds r0, 0x4 strh r0, [r5, 0x1A] -_08175358: +@08175358: pop {r4,r5} pop {r0} bx r0 @@ -719818,7 +719818,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} @@ -719834,25 +719834,25 @@ sub_8175364: @ 8175364 adds r6, r0, r1 ldrh r0, [r6] cmp r0, 0x1 - beq _081753E0 + beq @081753E0 cmp r0, 0x1 - bgt _08175394 + bgt @08175394 cmp r0, 0 - beq _0817539C - b _081754B0 + beq @0817539C + b @081754B0 .align 2, 0 .pool -_08175394: +@08175394: cmp r0, 0xFF - bne _0817539A - b _081754A0 -_0817539A: - b _081754B0 -_0817539C: + bne @0817539A + b @081754A0 +@0817539A: + b @081754B0 +@0817539C: movs r0, 0x40 bl sub_81521C0 cmp r0, 0 - bne _081753B8 + bne @081753B8 adds r0, r4, 0 bl remove_task ldr r0, =0x020375e0 @@ -719861,7 +719861,7 @@ _0817539C: ldr r2, =0x0000ffff adds r0, r2, 0 strh r0, [r1] -_081753B8: +@081753B8: ldr r0, =0x085e5394 bl gpu_tile_obj_decompress_and_load ldr r0, =0x085e53a4 @@ -719869,18 +719869,18 @@ _081753B8: ldrh r0, [r6] adds r0, 0x1 strh r0, [r6] - b _081754B0 + b @081754B0 .align 2, 0 .pool -_081753E0: +@081753E0: ldrh r0, [r6, 0x2] cmp r0, 0 - beq _08175478 + beq @08175478 movs r1, 0x3 bl __umodsi3 lsls r0, 16 cmp r0, 0 - bne _08175478 + bne @08175478 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -719917,7 +719917,7 @@ _081753E0: lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0xFF - beq _08175478 + beq @08175478 adds r4, r7, 0 ldr r1, =sub_81752F4 + 1 adds r0, r4, 0 @@ -719926,12 +719926,12 @@ _081753E0: movs r1, 0x3 ands r1, r0 cmp r1, 0 - bne _08175468 + bne @08175468 adds r0, r4, 0 movs r1, 0x1 movs r2, 0x1 bl sub_8152474 -_08175468: +@08175468: adds r0, r4, 0 movs r1, 0x7 mov r2, r8 @@ -719939,24 +719939,24 @@ _08175468: ldrh r0, [r6, 0x1E] adds r0, 0x1 strh r0, [r6, 0x1E] -_08175478: +@08175478: bl sub_81522D4 ldrh r0, [r6, 0x2] cmp r0, 0 - beq _08175494 + beq @08175494 subs r0, 0x1 strh r0, [r6, 0x2] - b _081754B0 + b @081754B0 .align 2, 0 .pool -_08175494: +@08175494: ldrh r0, [r6, 0x1E] cmp r0, 0 - bne _081754B0 + bne @081754B0 movs r0, 0xFF strh r0, [r6] - b _081754B0 -_081754A0: + b @081754B0 +@081754A0: bl sub_81752C0 ldr r0, =0x020375e0 strh r7, [r0] @@ -719964,7 +719964,7 @@ _081754A0: ldr r2, =0x0000ffff adds r0, r2, 0 strh r0, [r1] -_081754B0: +@081754B0: add sp, 0xC pop {r3} mov r8, r3 @@ -719976,7 +719976,7 @@ _081754B0: thumb_func_end sub_8175364 thumb_func_start sub_81754C8 -sub_81754C8: @ 81754C8 +sub_81754C8: ; 81754C8 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -719986,7 +719986,7 @@ sub_81754C8: @ 81754C8 thumb_func_end sub_81754C8 thumb_func_start sub_81754DC -sub_81754DC: @ 81754DC +sub_81754DC: ; 81754DC push {lr} bl run_active_tasks bl call_obj_callbacks @@ -719995,11 +719995,11 @@ sub_81754DC: @ 81754DC movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08175522 + beq @08175522 ldr r0, =0x0203bce4 ldrb r0, [r0] cmp r0, 0 - beq _08175522 + beq @08175522 ldr r2, =0x03005e00 ldr r0, =0x0203bce2 ldrh r1, [r0] @@ -720010,14 +720010,14 @@ sub_81754DC: @ 81754DC ldr r1, [r0] ldr r0, =sub_8175774 + 1 cmp r1, r0 - bne _08175522 + bne @08175522 bl sub_81754C8 bl run_active_tasks bl call_obj_callbacks ldr r1, =0x0203bce5 movs r0, 0x1 strb r0, [r1] -_08175522: +@08175522: bl obj_sync_something bl fade_and_return_progress_probably pop {r0} @@ -720027,7 +720027,7 @@ _08175522: thumb_func_end sub_81754DC thumb_func_start sub_8175548 -sub_8175548: @ 8175548 +sub_8175548: ; 8175548 push {lr} movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags @@ -720062,21 +720062,21 @@ sub_8175548: @ 8175548 thumb_func_end sub_8175548 thumb_func_start sub_81755A4 -sub_81755A4: @ 81755A4 +sub_81755A4: ; 81755A4 push {lr} bl Window_FreeMemory movs r0, 0 bl bg_get_tilemap cmp r0, 0 - beq _081755B8 + beq @081755B8 bl free -_081755B8: +@081755B8: pop {r0} bx r0 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 @@ -720088,17 +720088,17 @@ sub_81755BC: @ 81755BC movs r0, 0 strb r0, [r1] cmp r2, 0x1 - bne _081755DC + bne @081755DC movs r0, 0x3 strb r0, [r1, 0x1] movs r0, 0x4 - b _081755E4 -_081755DC: + b @081755E4 +@081755DC: add r1, sp, 0x14 movs r0, 0x1 strb r0, [r1, 0x1] movs r0, 0x2 -_081755E4: +@081755E4: strb r0, [r1, 0x2] movs r0, 0x1 adds r1, r4, 0 @@ -720129,7 +720129,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} @@ -720160,13 +720160,13 @@ sub_8175620: @ 8175620 strh r1, [r0, 0x1E] movs r1, 0x1 strh r1, [r0, 0x22] -_0817566A: +@0817566A: movs r0, 0 adds r1, r7, 0 bl sub_8176AB0 lsls r0, 24 cmp r0, 0 - beq _0817566A + beq @0817566A ldr r5, =0x03005e00 lsls r4, r7, 2 adds r4, r7 @@ -720242,7 +720242,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 @@ -720251,7 +720251,7 @@ sub_8175744: @ 8175744 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08175764 + bne @08175764 ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -720259,7 +720259,7 @@ sub_8175744: @ 8175744 adds r1, r0 ldr r0, =sub_8175774 + 1 str r0, [r1] -_08175764: +@08175764: pop {r0} bx r0 .align 2, 0 @@ -720267,7 +720267,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 @@ -720280,7 +720280,7 @@ sub_8175774: @ 8175774 movs r0, 0x10 ldrsh r1, [r4, r0] cmp r1, 0 - beq _081757B0 + beq @081757B0 movs r3, 0xA ldrsh r1, [r4, r3] lsls r0, r1, 2 @@ -720293,17 +720293,17 @@ sub_8175774: @ 8175774 lsls r0, 1 strh r0, [r4, 0x20] ldr r0, =sub_8175A9C + 1 - b _081757FA + b @081757FA .align 2, 0 .pool -_081757B0: +@081757B0: ldr r0, =0x0203bce0 strh r1, [r0] ldrh r2, [r4, 0x1E] movs r3, 0x1E ldrsh r0, [r4, r3] cmp r0, 0x1 - bne _081757E0 + bne @081757E0 strh r2, [r4, 0x22] strh r1, [r4, 0x1E] movs r0, 0x1 @@ -720314,12 +720314,12 @@ _081757B0: movs r3, 0x10 bl sub_80A1AD4 ldr r0, =sub_8175808 + 1 - b _081757FA + b @081757FA .align 2, 0 .pool -_081757E0: +@081757E0: cmp r0, 0x2 - bne _081757FC + bne @081757FC strh r2, [r4, 0x22] strh r1, [r4, 0x1E] movs r0, 0x1 @@ -720330,9 +720330,9 @@ _081757E0: movs r3, 0x10 bl sub_80A1AD4 ldr r0, =sub_81758A4 + 1 -_081757FA: +@081757FA: str r0, [r4] -_081757FC: +@081757FC: add sp, 0x4 pop {r4} pop {r0} @@ -720342,7 +720342,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 @@ -720351,7 +720351,7 @@ sub_8175808: @ 8175808 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08175836 + bne @08175836 movs r0, 0 movs r1, 0 bl lcd_io_set @@ -720364,7 +720364,7 @@ sub_8175808: @ 8175808 adds r1, r0 ldr r0, =c2_080C9BFC + 1 str r0, [r1] -_08175836: +@08175836: pop {r4} pop {r0} bx r0 @@ -720373,7 +720373,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 @@ -720391,7 +720391,7 @@ c2_080C9BFC: @ 8175848 bl sub_8176AB0 lsls r0, 24 cmp r0, 0 - beq _08175890 + beq @08175890 movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -720405,7 +720405,7 @@ c2_080C9BFC: @ 8175848 bl SetVBlankCallback ldr r0, =sub_8175744 + 1 str r0, [r5] -_08175890: +@08175890: add sp, 0x4 pop {r4,r5} pop {r0} @@ -720415,7 +720415,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 @@ -720424,7 +720424,7 @@ sub_81758A4: @ 81758A4 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081758D2 + bne @081758D2 movs r0, 0 movs r1, 0 bl lcd_io_set @@ -720437,7 +720437,7 @@ sub_81758A4: @ 81758A4 adds r1, r0 ldr r0, =sub_81758E4 + 1 str r0, [r1] -_081758D2: +@081758D2: pop {r4} pop {r0} bx r0 @@ -720446,7 +720446,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 @@ -720461,10 +720461,10 @@ sub_81758E4: @ 81758E4 mov r8, r1 ldrb r7, [r1] cmp r7, 0 - beq _08175906 + beq @08175906 cmp r7, 0x1 - beq _081759F0 -_08175906: + beq @081759F0 +@08175906: bl reset_all_obj_data bl dp13_810BB8C bl gpu_pal_allocator_reset @@ -720486,14 +720486,14 @@ _08175906: ldr r4, =0x0201c000 movs r3, 0x11 ldr r2, =0x000007ff -_0817593C: +@0817593C: adds r0, r1, r4 strb r3, [r0] adds r0, r1, 0x1 lsls r0, 16 lsrs r1, r0, 16 cmp r1, r2 - bls _0817593C + bls @0817593C movs r1, 0 ldr r2, =0x0201d800 ldr r6, =0x085e701c @@ -720501,26 +720501,26 @@ _0817593C: adds r5, r2, r0 movs r4, 0x22 ldr r3, =0x000007ff -_08175958: +@08175958: adds r0, r1, r5 strb r4, [r0] adds r0, r1, 0x1 lsls r0, 16 lsrs r1, r0, 16 cmp r1, r3 - bls _08175958 + bls @08175958 movs r1, 0 ldr r5, =0x0201d000 movs r4, 0x33 ldr r3, =0x000007ff -_0817596E: +@0817596E: adds r0, r1, r5 strb r4, [r0] adds r0, r1, 0x1 lsls r0, 16 lsrs r1, r0, 16 cmp r1, r3 - bls _0817596E + bls @0817596E movs r0, 0 strh r0, [r2] ldr r1, =0x000053ff @@ -720543,10 +720543,10 @@ _0817596E: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08175A7A + b @08175A7A .align 2, 0 .pool -_081759F0: +@081759F0: ldr r0, =sub_81760FC + 1 movs r1, 0 bl AddTask @@ -720610,7 +720610,7 @@ _081759F0: strh r5, [r0] ldr r0, =sub_8175744 + 1 str r0, [r4] -_08175A7A: +@08175A7A: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -720623,7 +720623,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 @@ -720637,13 +720637,13 @@ sub_8175A9C: @ 8175A9C movs r2, 0x20 ldrsh r1, [r4, r2] cmp r1, 0 - beq _08175AC4 + beq @08175AC4 subs r0, 0x1 strh r0, [r4, 0x20] - b _08175AD8 + b @08175AD8 .align 2, 0 .pool -_08175AC4: +@08175AC4: movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -720653,7 +720653,7 @@ _08175AC4: bl sub_80A1AD4 ldr r0, =sub_8175AE4 + 1 str r0, [r4] -_08175AD8: +@08175AD8: add sp, 0x4 pop {r4} pop {r0} @@ -720663,7 +720663,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 @@ -720672,7 +720672,7 @@ sub_8175AE4: @ 8175AE4 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08175B0A + bne @08175B0A adds r0, r4, 0 bl sub_8176CA0 ldr r0, =0x03005e00 @@ -720682,7 +720682,7 @@ sub_8175AE4: @ 8175AE4 adds r1, r0 ldr r0, =sub_8175B1C + 1 str r0, [r1] -_08175B0A: +@08175B0A: pop {r4} pop {r0} bx r0 @@ -720691,7 +720691,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 @@ -720742,7 +720742,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 @@ -720756,13 +720756,13 @@ sub_8175B90: @ 8175B90 movs r2, 0x8 ldrsh r1, [r4, r2] cmp r1, 0 - beq _08175BB8 + beq @08175BB8 subs r0, 0x1 strh r0, [r4, 0x8] - b _08175BCC + b @08175BCC .align 2, 0 .pool -_08175BB8: +@08175BB8: movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -720772,7 +720772,7 @@ _08175BB8: bl sub_80A1AD4 ldr r0, =sub_8175BD8 + 1 str r0, [r4] -_08175BCC: +@08175BCC: add sp, 0x4 pop {r4} pop {r0} @@ -720782,7 +720782,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 @@ -720794,7 +720794,7 @@ sub_8175BD8: @ 8175BD8 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _08175C1E + bne @08175C1E movs r0, 0xE0 lsls r0, 6 movs r1, 0 @@ -720816,7 +720816,7 @@ sub_8175BD8: @ 8175BD8 strh r1, [r0, 0x8] ldr r1, =sub_8175C34 + 1 str r1, [r0] -_08175C1E: +@08175C1E: add sp, 0x4 pop {r4,r5} pop {r0} @@ -720826,7 +720826,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 @@ -720836,7 +720836,7 @@ sub_8175C34: @ 8175C34 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08175CB8 + bne @08175CB8 ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 @@ -720845,12 +720845,12 @@ sub_8175C34: @ 8175C34 movs r0, 0x8 ldrsh r1, [r4, r0] cmp r1, 0 - beq _08175C62 + beq @08175C62 ldr r0, =0x030022c0 ldrh r0, [r0, 0x2E] cmp r0, 0 - beq _08175C94 -_08175C62: + beq @08175C94 +@08175C62: movs r0, 0x4 bl play_sound_effect movs r0, 0x1 @@ -720863,29 +720863,29 @@ _08175C62: bl sub_80A1AD4 ldr r0, =sub_8175CC8 + 1 str r0, [r4] - b _08175CB8 + b @08175CB8 .align 2, 0 .pool -_08175C94: +@08175C94: ldr r0, =0x00001be8 cmp r1, r0 - bne _08175CA0 + bne @08175CA0 movs r0, 0x8 bl play_sound_effect -_08175CA0: +@08175CA0: movs r0, 0x8 ldrsh r1, [r4, r0] ldr r0, =0x00001ab8 cmp r1, r0 - bne _08175CB2 + bne @08175CB2 movs r0, 0xE4 lsls r0, 1 bl m4aSongNumStart -_08175CB2: +@08175CB2: ldrh r0, [r4, 0x8] subs r0, 0x1 strh r0, [r4, 0x8] -_08175CB8: +@08175CB8: add sp, 0x4 pop {r4} pop {r0} @@ -720895,17 +720895,17 @@ _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] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08175CDC + bne @08175CDC movs r0, 0xFF bl SoftReset -_08175CDC: +@08175CDC: pop {r0} bx r0 .align 2, 0 @@ -720913,7 +720913,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 @@ -720990,7 +720990,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 @@ -721007,28 +721007,28 @@ sub_8175DA0: @ 8175DA0 ldrsh r0, [r0, r2] adds r5, r1, 0 cmp r0, 0xA - bhi _08175E00 + bhi @08175E00 lsls r0, 2 - ldr r1, =_08175DD4 + ldr r1, =@08175DD4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08175DD4: - .4byte _08175E00 - .4byte _08175E40 - .4byte _08175E60 - .4byte _08175F38 - .4byte _08175F5C - .4byte _08175FC8 - .4byte _08175E00 - .4byte _08175E00 - .4byte _08175E00 - .4byte _08175E00 - .4byte _08175FFC -_08175E00: +@08175DD4: + .4byte @08175E00 + .4byte @08175E40 + .4byte @08175E60 + .4byte @08175F38 + .4byte @08175F5C + .4byte @08175FC8 + .4byte @08175E00 + .4byte @08175E00 + .4byte @08175E00 + .4byte @08175E00 + .4byte @08175FFC +@08175E00: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -721036,9 +721036,9 @@ _08175E00: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - beq _08175E12 - b _0817602A -_08175E12: + beq @08175E12 + b @0817602A +@08175E12: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -721056,10 +721056,10 @@ _08175E12: strh r2, [r0, 0x24] ldr r0, =0x0203bce0 strh r2, [r0] - b _0817602A + b @0817602A .align 2, 0 .pool -_08175E40: +@08175E40: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -721068,16 +721068,16 @@ _08175E40: movs r3, 0xE ldrsh r0, [r1, r3] cmp r0, 0 - beq _08175E58 + beq @08175E58 subs r0, r2, 0x1 strh r0, [r1, 0xE] - b _0817602A -_08175E58: + b @0817602A +@08175E58: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _0817602A -_08175E60: + b @0817602A +@08175E60: lsls r2, r4, 2 adds r0, r2, r4 lsls r0, 3 @@ -721092,18 +721092,18 @@ _08175E60: ldr r0, =sub_8175774 + 1 mov r9, r2 cmp r1, r0 - bne _08175F32 + bne @08175F32 movs r1, 0xC ldrsh r0, [r3, r1] cmp r0, 0x38 - bgt _08175F2C + bgt @08175F2C movs r5, 0 ldr r2, =0x085e6af4 mov r8, r2 adds r7, r3, 0 movs r6, 0xA0 lsls r6, 19 -_08175E92: +@08175E92: movs r3, 0xC ldrsh r1, [r7, r3] lsls r0, r1, 2 @@ -721121,7 +721121,7 @@ _08175E92: adds r6, r0 adds r5, 0x1 cmp r5, 0x4 - ble _08175E92 + ble @08175E92 movs r0, 0 movs r1, 0x2 bl Window_CopyToVram @@ -721153,41 +721153,41 @@ _08175E92: movs r3, 0x22 ldrsh r0, [r0, r3] cmp r0, 0x1 - bne _08175F14 + bne @08175F14 movs r0, 0xC0 lsls r0, 2 ldr r1, =0x0000328d - b _08175F1A + b @08175F1A .align 2, 0 .pool -_08175F14: +@08175F14: movs r0, 0xC0 lsls r0, 2 ldr r1, =0x00001967 -_08175F1A: +@08175F1A: str r1, [sp] movs r1, 0 movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - b _0817602A + b @0817602A .align 2, 0 .pool -_08175F2C: +@08175F2C: movs r0, 0xA strh r0, [r3, 0x8] - b _0817602A -_08175F32: + b @0817602A +@08175F32: movs r0, 0 strh r0, [r5, 0x24] - b _0817602A -_08175F38: + b @0817602A +@08175F38: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0817602A + bne @0817602A lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -721197,10 +721197,10 @@ _08175F38: ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b _0817602A + b @0817602A .align 2, 0 .pool -_08175F5C: +@08175F5C: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -721209,22 +721209,22 @@ _08175F5C: movs r2, 0xE ldrsh r0, [r4, r2] cmp r0, 0 - beq _08175F74 + beq @08175F74 subs r0, r1, 0x1 strh r0, [r4, 0xE] - b _0817602A -_08175F74: + b @0817602A +@08175F74: ldrb r0, [r4, 0xC] ldrb r1, [r4, 0xA] bl sub_817603C lsls r0, 24 cmp r0, 0 - beq _08175F8A + beq @08175F8A ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0817602A -_08175F8A: + b @0817602A +@08175F8A: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -721237,33 +721237,33 @@ _08175F8A: movs r1, 0x22 ldrsh r0, [r0, r1] cmp r0, 0x1 - bne _08175FB0 + bne @08175FB0 movs r0, 0xC0 lsls r0, 2 ldr r1, =0x0000328d - b _08175FB6 + b @08175FB6 .align 2, 0 .pool -_08175FB0: +@08175FB0: movs r0, 0xC0 lsls r0, 2 ldr r1, =0x00001967 -_08175FB6: +@08175FB6: str r1, [sp] movs r1, 0 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - b _0817602A + b @0817602A .align 2, 0 .pool -_08175FC8: +@08175FC8: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0817602A + bne @0817602A movs r0, 0 movs r1, 0 bl Window_FastFillPixels @@ -721277,10 +721277,10 @@ _08175FC8: adds r1, r0 movs r0, 0x2 strh r0, [r1, 0x8] - b _0817602A + b @0817602A .align 2, 0 .pool -_08175FFC: +@08175FFC: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -721301,7 +721301,7 @@ _08175FFC: ldr r0, [r4] bl free str r5, [r4] -_0817602A: +@0817602A: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -721314,7 +721314,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 @@ -721324,16 +721324,16 @@ sub_817603C: @ 817603C adds r5, r2, 0 ldr r4, =0x03005e00 cmp r3, 0x6 - bne _0817605C + bne @0817605C lsls r0, r2, 2 adds r0, r2 lsls r0, 3 adds r0, r4 movs r1, 0x2 strh r1, [r0, 0x1E] -_0817605C: +@0817605C: cmp r3, 0xC - bne _0817606E + bne @0817606E lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -721341,18 +721341,18 @@ _0817605C: movs r1, 0x1 strh r1, [r0, 0x16] strh r1, [r0, 0x1E] -_0817606E: +@0817606E: cmp r3, 0x12 - bne _0817607E + bne @0817607E lsls r0, r2, 2 adds r0, r2 lsls r0, 3 adds r0, r4 movs r1, 0x2 strh r1, [r0, 0x1E] -_0817607E: +@0817607E: cmp r3, 0x18 - bne _08176092 + bne @08176092 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -721361,18 +721361,18 @@ _0817607E: strh r1, [r0, 0x16] movs r1, 0x1 strh r1, [r0, 0x1E] -_08176092: +@08176092: cmp r3, 0x1E - bne _081760A2 + bne @081760A2 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 adds r0, r4 movs r1, 0x2 strh r1, [r0, 0x1E] -_081760A2: +@081760A2: cmp r3, 0x24 - bne _081760B6 + bne @081760B6 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -721381,18 +721381,18 @@ _081760A2: strh r1, [r0, 0x16] movs r1, 0x1 strh r1, [r0, 0x1E] -_081760B6: +@081760B6: cmp r3, 0x2A - bne _081760C6 + bne @081760C6 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 adds r0, r4 movs r1, 0x2 strh r1, [r0, 0x1E] -_081760C6: +@081760C6: cmp r6, 0x30 - bne _081760DA + bne @081760DA lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -721401,7 +721401,7 @@ _081760C6: strh r1, [r0, 0x16] movs r1, 0x1 strh r1, [r0, 0x1E] -_081760DA: +@081760DA: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -721409,21 +721409,21 @@ _081760DA: movs r1, 0x1E ldrsh r0, [r0, r1] cmp r0, 0 - bne _081760F4 + bne @081760F4 movs r0, 0 - b _081760F6 + b @081760F6 .align 2, 0 .pool -_081760F4: +@081760F4: movs r0, 0x1 -_081760F6: +@081760F6: pop {r4-r6} pop {r1} bx r1 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 @@ -721435,27 +721435,27 @@ sub_81760FC: @ 81760FC movs r1, 0x8 ldrsh r0, [r2, r1] cmp r0, 0x1 - beq _0817612C + beq @0817612C cmp r0, 0x1 - bgt _0817611A - b _08176244 -_0817611A: + bgt @0817611A + b @08176244 +@0817611A: cmp r0, 0x2 - beq _08176158 + beq @08176158 cmp r0, 0x3 - bne _08176124 - b _08176230 -_08176124: - b _08176244 + bne @08176124 + b @08176230 +@08176124: + b @08176244 .align 2, 0 .pool -_0817612C: +@0817612C: ldr r0, =0x0203bce8 ldr r0, [r0] adds r0, 0x90 ldrh r0, [r0] cmp r0, 0 - bne _0817614E + bne @0817614E movs r3, 0xA ldrsh r0, [r2, r3] lsls r1, r0, 2 @@ -721465,22 +721465,22 @@ _0817612C: movs r3, 0x24 ldrsh r0, [r1, r3] cmp r0, 0 - bne _0817614E - b _08176244 -_0817614E: + bne @0817614E + b @08176244 +@0817614E: ldrh r0, [r2, 0x8] adds r0, 0x1 - b _08176242 + b @08176242 .align 2, 0 .pool -_08176158: +@08176158: ldr r6, =0x0203bce8 ldr r3, [r6] adds r0, r3, 0 adds r0, 0x8E ldrh r0, [r0] cmp r0, 0x47 - beq _08176244 + beq @08176244 movs r0, 0xA ldrsh r1, [r2, r0] lsls r0, r1, 2 @@ -721490,7 +721490,7 @@ _08176158: ldr r1, [r0] ldr r0, =sub_8175774 + 1 cmp r1, r0 - bne _08176244 + bne @08176244 adds r0, r3, 0 adds r0, 0x92 ldrh r0, [r0] @@ -721518,7 +721518,7 @@ _08176158: ldrh r0, [r0] subs r0, 0x1 cmp r3, r0 - bge _081761D8 + bge @081761D8 adds r0, r3, 0x1 strh r0, [r1] ldr r1, =0x02020630 @@ -721527,10 +721527,10 @@ _08176158: lsls r0, 2 adds r0, r1 movs r1, 0x32 - b _081761EA + b @081761EA .align 2, 0 .pool -_081761D8: +@081761D8: movs r0, 0 strh r0, [r1] ldr r1, =0x02020630 @@ -721540,7 +721540,7 @@ _081761D8: adds r0, r1 movs r1, 0x80 lsls r1, 2 -_081761EA: +@081761EA: strh r1, [r0, 0x34] ldr r0, =0x0203bce8 ldr r1, [r0] @@ -721552,14 +721552,14 @@ _081761EA: adds r1, 0x90 ldrh r0, [r1] cmp r0, 0x2 - bne _08176210 + bne @08176210 movs r0, 0 - b _08176212 + b @08176212 .align 2, 0 .pool -_08176210: +@08176210: adds r0, 0x1 -_08176212: +@08176212: strh r0, [r1] ldr r0, =0x03005e00 lsls r1, r5, 2 @@ -721571,30 +721571,30 @@ _08176212: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _08176244 + b @08176244 .align 2, 0 .pool -_08176230: +@08176230: ldrh r1, [r2, 0xE] movs r3, 0xE ldrsh r0, [r2, r3] cmp r0, 0 - beq _08176240 + beq @08176240 subs r0, r1, 0x1 strh r0, [r2, 0xE] - b _08176244 -_08176240: + b @08176244 +@08176240: movs r0, 0x1 -_08176242: +@08176242: strh r0, [r2, 0x8] -_08176244: +@08176244: pop {r4-r6} pop {r0} bx r0 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 @@ -721607,70 +721607,70 @@ sub_817624C: @ 817624C ldrsh r0, [r0, r2] adds r6, r1, 0 cmp r0, 0x32 - bls _08176268 - b _08176514 -_08176268: + bls @08176268 + b @08176514 +@08176268: lsls r0, 2 - ldr r1, =_0817627C + ldr r1, =@0817627C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0817627C: - .4byte _08176348 - .4byte _0817636C - .4byte _081763C0 - .4byte _081763D8 - .4byte _08176414 - .4byte _08176438 - .4byte _08176484 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176490 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _081764B0 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _081764D4 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176514 - .4byte _08176508 -_08176348: +@0817627C: + .4byte @08176348 + .4byte @0817636C + .4byte @081763C0 + .4byte @081763D8 + .4byte @08176414 + .4byte @08176438 + .4byte @08176484 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176490 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @081764B0 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @081764D4 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176514 + .4byte @08176508 +@08176348: lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -721684,15 +721684,15 @@ _08176348: bl sine ldr r1, =0x0203bd26 strh r0, [r1] - b _08176390 + b @08176390 .align 2, 0 .pool -_0817636C: +@0817636C: ldr r7, =0x0203bd26 movs r3, 0 ldrsh r4, [r7, r3] cmp r4, 0 - beq _0817639C + beq @0817639C lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -721705,14 +721705,14 @@ _0817636C: movs r1, 0xC bl sine strh r0, [r7] -_08176390: +@08176390: ldrh r0, [r4, 0x12] adds r0, 0x1 strh r0, [r4, 0x12] - b _08176514 + b @08176514 .align 2, 0 .pool -_0817639C: +@0817639C: ldr r3, =0x02020630 lsls r1, r5, 2 adds r1, r5 @@ -721727,10 +721727,10 @@ _0817639C: movs r2, 0x2 strh r2, [r0, 0x2E] strh r4, [r1, 0x12] - b _08176430 + b @08176430 .align 2, 0 .pool -_081763C0: +@081763C0: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -721739,11 +721739,11 @@ _081763C0: movs r3, 0x12 ldrsh r0, [r1, r3] cmp r0, 0x3F - bgt _08176430 + bgt @08176430 adds r0, r2, 0x1 strh r0, [r1, 0x12] - b _0817644E -_081763D8: + b @0817644E +@081763D8: ldr r3, =0x02020630 lsls r2, r5, 2 adds r2, r5 @@ -721770,10 +721770,10 @@ _081763D8: ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] - b _08176514 + b @08176514 .align 2, 0 .pool -_08176414: +@08176414: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -721782,19 +721782,19 @@ _08176414: movs r3, 0x10 ldrsh r0, [r1, r3] cmp r0, 0 - beq _0817642C + beq @0817642C subs r0, r2, 0x1 strh r0, [r1, 0x10] - b _08176514 -_0817642C: + b @08176514 +@0817642C: movs r0, 0x40 strh r0, [r1, 0x12] -_08176430: +@08176430: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _08176514 -_08176438: + b @08176514 +@08176438: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -721803,20 +721803,20 @@ _08176438: movs r2, 0x12 ldrsh r0, [r4, r2] cmp r0, 0 - ble _08176464 + ble @08176464 subs r0, r1, 0x1 strh r0, [r4, 0x12] -_0817644E: +@0817644E: movs r1, 0x7F ands r0, r1 movs r1, 0x14 bl sine ldr r1, =0x0203bd26 strh r0, [r1] - b _08176514 + b @08176514 .align 2, 0 .pool -_08176464: +@08176464: ldr r2, =0x02020630 movs r3, 0xC ldrsh r1, [r4, r3] @@ -721829,17 +721829,17 @@ _08176464: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _08176514 + b @08176514 .align 2, 0 .pool -_08176484: +@08176484: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r6 movs r1, 0x32 - b _08176512 -_08176490: + b @08176512 +@08176490: ldr r3, =0x02020630 lsls r1, r5, 2 adds r1, r5 @@ -721852,10 +721852,10 @@ _08176490: lsls r0, 2 adds r0, r3 movs r2, 0x2 - b _081764C8 + b @081764C8 .align 2, 0 .pool -_081764B0: +@081764B0: ldr r3, =0x02020630 lsls r1, r5, 2 adds r1, r5 @@ -721868,14 +721868,14 @@ _081764B0: lsls r0, 2 adds r0, r3 movs r2, 0x4 -_081764C8: +@081764C8: strh r2, [r0, 0x2E] movs r0, 0x32 strh r0, [r1, 0x8] - b _08176514 + b @08176514 .align 2, 0 .pool -_081764D4: +@081764D4: ldr r3, =0x02020630 lsls r2, r5, 2 adds r2, r5 @@ -721899,25 +721899,25 @@ _081764D4: strh r1, [r0, 0x2E] movs r0, 0x32 strh r0, [r2, 0x8] - b _08176514 + b @08176514 .align 2, 0 .pool -_08176508: +@08176508: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r6 movs r1, 0 -_08176512: +@08176512: strh r1, [r0, 0x8] -_08176514: +@08176514: pop {r4-r7} pop {r0} bx r0 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 @@ -721930,22 +721930,22 @@ sub_817651C: @ 817651C ldrsh r0, [r0, r3] adds r4, r1, 0 cmp r0, 0x4 - bhi _0817655C + bhi @0817655C lsls r0, 2 - ldr r1, =_08176548 + ldr r1, =@08176548 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08176548: - .4byte _0817655C - .4byte _081765A0 - .4byte _081765AC - .4byte _081765F4 - .4byte _08176640 -_0817655C: +@08176548: + .4byte @0817655C + .4byte @081765A0 + .4byte @081765AC + .4byte @081765F4 + .4byte @08176640 +@0817655C: lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -721954,7 +721954,7 @@ _0817655C: ldrsh r0, [r2, r1] ldr r5, =0x00007fff cmp r0, r5 - beq _081765A0 + beq @081765A0 movs r3, 0xC ldrsh r1, [r2, r3] lsls r0, r1, 2 @@ -721970,7 +721970,7 @@ _0817655C: movs r1, 0xC ldrsh r0, [r0, r1] cmp r0, 0x2 - bne _081765A0 + bne @081765A0 movs r1, 0xA ldrsh r0, [r3, r1] lsls r1, r0, 2 @@ -721980,13 +721980,13 @@ _0817655C: movs r0, 0x14 strh r0, [r1, 0x8] strh r5, [r2, 0xA] -_081765A0: +@081765A0: movs r0, 0 bl sub_817B540 - b _08176646 + b @08176646 .align 2, 0 .pool -_081765AC: +@081765AC: lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -721995,7 +721995,7 @@ _081765AC: ldrsh r0, [r2, r3] ldr r5, =0x00007fff cmp r0, r5 - beq _08176638 + beq @08176638 movs r0, 0xC ldrsh r1, [r2, r0] lsls r0, r1, 2 @@ -722015,14 +722015,14 @@ _081765AC: movs r1, 0xA0 lsls r1, 2 cmp r0, r1 - bne _08176638 + bne @08176638 movs r0, 0x1 strh r0, [r3, 0x8] strh r5, [r2, 0xA] - b _08176638 + b @08176638 .align 2, 0 .pool -_081765F4: +@081765F4: lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -722032,11 +722032,11 @@ _081765F4: ldrsh r1, [r2, r0] ldr r5, =0x00007fff cmp r1, r5 - beq _08176638 + beq @08176638 movs r0, 0x92 lsls r0, 2 cmp r1, r0 - bne _08176634 + bne @08176634 movs r3, 0xC ldrsh r1, [r2, r3] lsls r0, r1, 2 @@ -722052,27 +722052,27 @@ _081765F4: movs r1, 0xA strh r1, [r0, 0x8] strh r5, [r2, 0xA] - b _08176638 + b @08176638 .align 2, 0 .pool -_08176634: +@08176634: adds r0, r3, 0x1 strh r0, [r2, 0xA] -_08176638: +@08176638: movs r0, 0x1 bl sub_817B540 - b _08176646 -_08176640: + b @08176646 +@08176640: movs r0, 0x2 bl sub_817B540 -_08176646: +@08176646: pop {r4,r5} pop {r0} bx r0 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} @@ -722082,24 +722082,24 @@ sub_817664C: @ 817664C lsls r1, 24 lsrs r7, r1, 24 cmp r0, 0x4 - bls _08176662 - b _081769E0 -_08176662: + bls @08176662 + b @081769E0 +@08176662: lsls r0, 2 - ldr r1, =_08176670 + ldr r1, =@08176670 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08176670: - .4byte _08176684 - .4byte _0817672C - .4byte _081767D8 - .4byte _08176884 - .4byte _08176934 -_08176684: +@08176670: + .4byte @08176684 + .4byte @0817672C + .4byte @081767D8 + .4byte @08176884 + .4byte @08176934 +@08176684: ldr r5, =0x02020630 ldr r0, =0x03005e00 lsls r4, r7, 2 @@ -722179,10 +722179,10 @@ _08176684: lsls r1, 6 movs r0, 0 movs r2, 0x20 - b _081769D4 + b @081769D4 .align 2, 0 .pool -_0817672C: +@0817672C: ldr r5, =0x02020630 ldr r0, =0x03005e00 lsls r4, r7, 2 @@ -722263,10 +722263,10 @@ _0817672C: lsls r1, 6 movs r0, 0 movs r2, 0x20 - b _081769D4 + b @081769D4 .align 2, 0 .pool -_081767D8: +@081767D8: ldr r5, =0x02020630 ldr r0, =0x03005e00 lsls r4, r7, 2 @@ -722348,10 +722348,10 @@ _081767D8: movs r2, 0x80 lsls r2, 2 movs r0, 0x1 - b _081769D4 + b @081769D4 .align 2, 0 .pool -_08176884: +@08176884: ldr r5, =0x02020630 ldr r0, =0x03005e00 lsls r4, r7, 2 @@ -722432,10 +722432,10 @@ _08176884: movs r2, 0x80 lsls r2, 2 movs r0, 0x1 - b _081769D4 + b @081769D4 .align 2, 0 .pool -_08176934: +@08176934: ldr r5, =0x02020630 ldr r0, =0x03005e00 lsls r4, r7, 2 @@ -722516,13 +722516,13 @@ _08176934: movs r2, 0x80 lsls r2, 2 movs r0, 0x2 -_081769D4: +@081769D4: movs r3, 0x8 bl sub_817B3DC lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x8] -_081769E0: +@081769E0: ldr r0, =sub_817651C + 1 movs r1, 0 bl AddTask @@ -722602,7 +722602,7 @@ _081769E0: strh r4, [r0, 0x10] mov r1, r8 cmp r1, 0x2 - bne _08176A94 + bne @08176A94 movs r1, 0xA ldrsh r0, [r5, r1] lsls r1, r0, 2 @@ -722611,7 +722611,7 @@ _081769E0: adds r1, r6 movs r0, 0x45 strh r0, [r1, 0x12] -_08176A94: +@08176A94: pop {r3} mov r8, r3 pop {r4-r7} @@ -722622,7 +722622,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 @@ -722634,15 +722634,15 @@ sub_8176AB0: @ 8176AB0 adds r6, r0, r1 ldrb r0, [r6] cmp r0, 0x1 - beq _08176B30 + beq @08176B30 cmp r0, 0x1 - ble _08176AD6 + ble @08176AD6 cmp r0, 0x2 - beq _08176B54 + beq @08176B54 cmp r0, 0x3 - bne _08176AD6 - b _08176C80 -_08176AD6: + bne @08176AD6 + b @08176C80 +@08176AD6: movs r0, 0 movs r1, 0 bl lcd_io_set @@ -722674,10 +722674,10 @@ _08176AD6: bl gpu_pal_allocator_reset movs r0, 0x1 strb r0, [r6] - b _08176C96 + b @08176C96 .align 2, 0 .pool -_08176B30: +@08176B30: ldr r1, =0x0203bd24 movs r0, 0x22 strh r0, [r1] @@ -722689,15 +722689,15 @@ _08176B30: ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] - b _08176C96 + b @08176C96 .align 2, 0 .pool -_08176B54: +@08176B54: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - bne _08176BD8 + bne @08176BD8 ldr r0, =0x085f5334 bl gpu_tile_obj_decompress_and_load ldr r0, =0x085f53bc @@ -722734,10 +722734,10 @@ _08176B54: lsls r0, 1 movs r1, 0x2E bl sub_817B88C - b _08176C2C + b @08176C2C .align 2, 0 .pool -_08176BD8: +@08176BD8: ldr r0, =0x085f5344 bl gpu_tile_obj_decompress_and_load ldr r0, =0x085f53ac @@ -722774,7 +722774,7 @@ _08176BD8: lsls r0, 1 movs r1, 0x2E bl sub_817B834 -_08176C2C: +@08176C2C: lsls r0, 24 lsrs r2, r0, 24 strh r2, [r4, 0x14] @@ -722794,10 +722794,10 @@ _08176C2C: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08176C96 + b @08176C96 .align 2, 0 .pool -_08176C80: +@08176C80: adds r0, r4, 0 adds r1, r5, 0 bl sub_817664C @@ -722806,17 +722806,17 @@ _08176C80: movs r0, 0 strb r0, [r6] movs r0, 0x1 - b _08176C98 -_08176C96: + b @08176C98 +@08176C96: movs r0, 0 -_08176C98: +@08176C98: pop {r4-r6} pop {r1} bx r1 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 @@ -722829,46 +722829,46 @@ sub_8176CA0: @ 8176CA0 movs r2, 0x8 ldrsh r0, [r4, r2] cmp r0, 0 - beq _08176CC6 + beq @08176CC6 lsls r0, r1, 24 lsrs r0, 24 bl remove_task movs r0, 0 strh r0, [r4, 0x8] -_08176CC6: +@08176CC6: ldrh r1, [r4, 0xA] movs r2, 0xA ldrsh r0, [r4, r2] cmp r0, 0 - beq _08176CDC + beq @08176CDC lsls r0, r1, 24 lsrs r0, 24 bl remove_task movs r0, 0 strh r0, [r4, 0xA] -_08176CDC: +@08176CDC: ldrh r1, [r4, 0xC] movs r2, 0xC ldrsh r0, [r4, r2] cmp r0, 0 - beq _08176CF2 + beq @08176CF2 lsls r0, r1, 24 lsrs r0, 24 bl remove_task movs r0, 0 strh r0, [r4, 0xC] -_08176CF2: +@08176CF2: ldrh r1, [r4, 0xE] movs r2, 0xE ldrsh r0, [r4, r2] cmp r0, 0 - beq _08176D08 + beq @08176D08 lsls r0, r1, 24 lsrs r0, 24 bl remove_task movs r0, 0 strh r0, [r4, 0xE] -_08176D08: +@08176D08: ldr r1, =0x0203bd28 movs r0, 0x1 strh r0, [r1] @@ -722880,7 +722880,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 @@ -722906,7 +722906,7 @@ sub_8176D1C: @ 8176D1C movs r1, 0 adds r4, 0x1 ldr r2, =0x000003ff -_08176D52: +@08176D52: lsls r0, r1, 1 adds r0, r7 adds r0, r6 @@ -722915,7 +722915,7 @@ _08176D52: lsls r0, 16 lsrs r1, r0, 16 cmp r1, r2 - bls _08176D52 + bls @08176D52 pop {r4-r7} pop {r0} bx r0 @@ -722924,7 +722924,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 @@ -722934,38 +722934,38 @@ sub_8176D78: @ 8176D78 adds r1, r0, 0 adds r1, 0x50 cmp r2, 0xFF - bne _08176D90 + bne @08176D90 movs r0, 0x1 - b _08176DB6 -_08176D90: + b @08176DB6 +@08176D90: movs r0, 0x80 ands r0, r2 cmp r0, 0 - beq _08176DA0 + beq @08176DA0 movs r2, 0x80 lsls r2, 4 adds r0, r2, 0 orrs r1, r0 -_08176DA0: +@08176DA0: movs r0, 0x40 ands r3, r0 cmp r3, 0 - beq _08176DB4 + beq @08176DB4 movs r2, 0x80 lsls r2, 3 adds r0, r2, 0 orrs r1, r0 lsls r0, r1, 16 lsrs r1, r0, 16 -_08176DB4: +@08176DB4: adds r0, r1, 0 -_08176DB6: +@08176DB6: pop {r1} bx r1 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 @@ -722989,7 +722989,7 @@ sub_8176DBC: @ 8176DBC lsrs r0, 16 mov r9, r0 movs r5, 0 -_08176DEA: +@08176DEA: movs r4, 0 lsls r7, r5, 1 ldr r1, [sp, 0x4] @@ -722999,7 +722999,7 @@ _08176DEA: lsls r0, 6 ldr r1, [sp, 0x8] adds r6, r0, r1 -_08176DFC: +@08176DFC: adds r0, r7, r5 adds r0, r4 ldr r2, [sp] @@ -723019,12 +723019,12 @@ _08176DFC: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _08176DFC + bls @08176DFC mov r1, r8 lsls r0, r1, 24 lsrs r5, r0, 24 cmp r5, 0x4 - bls _08176DEA + bls @08176DEA add sp, 0xC pop {r3-r5} mov r8, r3 @@ -723036,7 +723036,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 @@ -723052,7 +723052,7 @@ sub_8176E40: @ 8176E40 lsls r4, 19 adds r1, 0x1 ldr r3, =0x000003ff -_08176E5E: +@08176E5E: lsls r0, r2, 1 adds r0, r5 adds r0, r4 @@ -723061,7 +723061,7 @@ _08176E5E: lsls r0, 16 lsrs r2, r0, 16 cmp r2, r3 - bls _08176E5E + bls @08176E5E str r6, [sp] adds r0, r7, 0 movs r1, 0x3 @@ -723108,59 +723108,59 @@ _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 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - beq _08176F04 + beq @08176F04 adds r0, r4, 0 bl obj_delete_and_free_tiles - b _08176F88 + b @08176F88 .align 2, 0 .pool -_08176F04: +@08176F04: movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0x5 - bhi _08176F88 + bhi @08176F88 lsls r0, 2 - ldr r1, =_08176F1C + ldr r1, =@08176F1C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08176F1C: - .4byte _08176F34 - .4byte _08176F3E - .4byte _08176F44 - .4byte _08176F4E - .4byte _08176F58 - .4byte _08176F6E -_08176F34: +@08176F1C: + .4byte @08176F34 + .4byte @08176F3E + .4byte @08176F44 + .4byte @08176F4E + .4byte @08176F58 + .4byte @08176F6E +@08176F34: adds r0, r4, 0 movs r1, 0 bl obj_anim_image_start_if_different - b _08176F88 -_08176F3E: + b @08176F88 +@08176F3E: adds r0, r4, 0 movs r1, 0x1 - b _08176F72 -_08176F44: + b @08176F72 +@08176F44: adds r0, r4, 0 movs r1, 0x2 bl obj_anim_image_start_if_different - b _08176F88 -_08176F4E: + b @08176F88 +@08176F4E: adds r0, r4, 0 movs r1, 0x3 bl obj_anim_image_start_if_different - b _08176F88 -_08176F58: + b @08176F88 +@08176F58: adds r0, r4, 0 movs r1, 0 bl obj_anim_image_start_if_different @@ -723168,13 +723168,13 @@ _08176F58: movs r2, 0x20 ldrsh r0, [r4, r2] cmp r0, 0x78 - ble _08176F88 + ble @08176F88 subs r0, r1, 0x1 - b _08176F86 -_08176F6E: + b @08176F86 +@08176F6E: adds r0, r4, 0 movs r1, 0 -_08176F72: +@08176F72: bl obj_anim_image_start_if_different ldrh r2, [r4, 0x20] movs r0, 0x20 @@ -723182,84 +723182,84 @@ _08176F72: movs r0, 0x20 negs r0, r0 cmp r1, r0 - ble _08176F88 + ble @08176F88 subs r0, r2, 0x1 -_08176F86: +@08176F86: strh r0, [r4, 0x20] -_08176F88: +@08176F88: pop {r4} pop {r0} bx r0 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 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - beq _08176FAC + beq @08176FAC adds r0, r4, 0 bl obj_delete_and_free_tiles - b _08177048 + b @08177048 .align 2, 0 .pool -_08176FAC: +@08176FAC: movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _08176FD4 + beq @08176FD4 cmp r0, 0x1 - bgt _08176FBE + bgt @08176FBE cmp r0, 0 - beq _08176FC8 - b _08177048 -_08176FBE: + beq @08176FC8 + b @08177048 +@08176FBE: cmp r0, 0x2 - beq _08177010 + beq @08177010 cmp r0, 0x3 - beq _0817702E - b _08177048 -_08176FC8: + beq @0817702E + b @08177048 +@08176FC8: strh r0, [r4, 0x26] adds r0, r4, 0 movs r1, 0 bl obj_anim_image_start_if_different - b _08177048 -_08176FD4: + b @08177048 +@08176FD4: movs r1, 0x20 ldrsh r0, [r4, r1] cmp r0, 0xC8 - ble _08176FE6 + ble @08176FE6 adds r0, r4, 0 movs r1, 0x1 bl obj_anim_image_start_if_different - b _08176FEE -_08176FE6: + b @08176FEE +@08176FE6: adds r0, r4, 0 movs r1, 0x2 bl obj_anim_image_start_if_different -_08176FEE: +@08176FEE: ldrh r2, [r4, 0x20] movs r0, 0x20 ldrsh r1, [r4, r0] movs r0, 0x20 negs r0, r0 cmp r1, r0 - ble _08177000 + ble @08177000 subs r0, r2, 0x2 strh r0, [r4, 0x20] -_08177000: +@08177000: ldr r0, =0x0203bd26 ldrh r0, [r0] negs r0, r0 strh r0, [r4, 0x26] - b _08177048 + b @08177048 .align 2, 0 .pool -_08177010: +@08177010: ldrh r0, [r4, 0x3C] adds r0, 0x1 strh r0, [r4, 0x3C] @@ -723270,11 +723270,11 @@ _08177010: movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne _08177048 + bne @08177048 ldrh r0, [r4, 0x20] adds r0, 0x1 - b _08177046 -_0817702E: + b @08177046 +@0817702E: adds r0, r4, 0 movs r1, 0 bl obj_anim_image_start_if_different @@ -723284,18 +723284,18 @@ _0817702E: movs r0, 0x20 negs r0, r0 cmp r1, r0 - ble _08177048 + ble @08177048 subs r0, r2, 0x1 -_08177046: +@08177046: strh r0, [r4, 0x20] -_08177048: +@08177048: pop {r4} pop {r0} bx r0 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 @@ -723303,41 +723303,41 @@ sub_8177050: @ 8177050 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - beq _0817706C + beq @0817706C ldrh r0, [r5, 0x3A] bl sub_818D820 - b _0817721C + b @0817721C .align 2, 0 .pool -_0817706C: +@0817706C: ldrh r0, [r5, 0x3C] adds r0, 0x1 strh r0, [r5, 0x3C] movs r2, 0x2E ldrsh r0, [r5, r2] cmp r0, 0xA - bhi _081770B4 + bhi @081770B4 lsls r0, 2 - ldr r1, =_08177088 + ldr r1, =@08177088 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08177088: - .4byte _081770B4 - .4byte _0817710E - .4byte _08177190 - .4byte _081771C6 - .4byte _081770B4 - .4byte _081770B4 - .4byte _081770B4 - .4byte _081770B4 - .4byte _081770B4 - .4byte _081771FE - .4byte _08177206 -_081770B4: +@08177088: + .4byte @081770B4 + .4byte @0817710E + .4byte @08177190 + .4byte @081771C6 + .4byte @081770B4 + .4byte @081770B4 + .4byte @081770B4 + .4byte @081770B4 + .4byte @081770B4 + .4byte @081771FE + .4byte @08177206 +@081770B4: ldrb r1, [r5, 0x1] movs r0, 0x4 negs r0, r0 @@ -723380,13 +723380,13 @@ _081770B4: strb r0, [r2] movs r0, 0x1 strh r0, [r5, 0x2E] - b _0817721C -_0817710E: + b @0817721C +@0817710E: ldrh r1, [r5, 0x32] movs r2, 0x32 ldrsh r0, [r5, r2] cmp r0, 0xFF - bgt _08177144 + bgt @08177144 adds r0, r1, 0 adds r0, 0x8 strh r0, [r5, 0x32] @@ -723406,62 +723406,62 @@ _0817710E: movs r2, 0 movs r3, 0 bl rotscale_set_direct - b _0817714A -_08177144: + b @0817714A +@08177144: ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] -_0817714A: +@0817714A: movs r2, 0x30 ldrsh r1, [r5, r2] cmp r1, 0x2 - beq _0817721C + beq @0817721C cmp r1, 0x2 - bgt _0817715C + bgt @0817715C cmp r1, 0x1 - beq _08177162 - b _0817721C -_0817715C: + beq @08177162 + b @0817721C +@0817715C: cmp r1, 0x3 - beq _0817717A - b _0817721C -_08177162: + beq @0817717A + b @0817721C +@08177162: ldrh r1, [r5, 0x3C] movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne _08177172 + bne @08177172 ldrh r0, [r5, 0x22] adds r0, 0x1 strh r0, [r5, 0x22] -_08177172: +@08177172: ldrh r0, [r5, 0x20] subs r0, 0x2 strh r0, [r5, 0x20] - b _0817721C -_0817717A: + b @0817721C +@0817717A: ldrh r0, [r5, 0x3C] ands r1, r0 cmp r1, 0 - bne _08177188 + bne @08177188 ldrh r0, [r5, 0x22] adds r0, 0x1 strh r0, [r5, 0x22] -_08177188: +@08177188: ldrh r0, [r5, 0x20] adds r0, 0x2 strh r0, [r5, 0x20] - b _0817721C -_08177190: + b @0817721C +@08177190: ldrh r1, [r5, 0x34] movs r2, 0x34 ldrsh r0, [r5, r2] cmp r0, 0 - beq _081771A0 + beq @081771A0 subs r0, r1, 0x1 strh r0, [r5, 0x34] - b _0817721C -_081771A0: + b @0817721C +@081771A0: movs r1, 0xF4 lsls r1, 4 movs r0, 0x50 @@ -723478,13 +723478,13 @@ _081771A0: strb r0, [r5, 0x1] movs r0, 0x10 strh r0, [r5, 0x34] - b _081771FE -_081771C6: + b @081771FE +@081771C6: ldrh r1, [r5, 0x34] movs r2, 0x34 ldrsh r0, [r5, r2] cmp r0, 0 - beq _081771EC + beq @081771EC subs r1, 0x1 strh r1, [r5, 0x34] movs r0, 0x34 @@ -723497,8 +723497,8 @@ _081771C6: lsrs r1, 16 movs r0, 0x52 bl lcd_io_set - b _0817721C -_081771EC: + b @0817721C +@081771EC: adds r2, r5, 0 adds r2, 0x3E ldrb r0, [r2] @@ -723507,13 +723507,13 @@ _081771EC: strb r0, [r2] movs r0, 0x9 strh r0, [r5, 0x2E] - b _0817721C -_081771FE: + b @0817721C +@081771FE: ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] - b _0817721C -_08177206: + b @0817721C +@08177206: movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -723522,7 +723522,7 @@ _08177206: bl lcd_io_set ldrh r0, [r5, 0x3A] bl sub_818D820 -_0817721C: +@0817721C: add sp, 0x4 pop {r4,r5} pop {r0} @@ -723530,7 +723530,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 @@ -723601,7 +723601,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 @@ -723614,19 +723614,19 @@ sub_81772B8: @ 81772B8 movs r2, 0x2E ldrsh r0, [r1, r2] cmp r0, 0xA - beq _081772DC + beq @081772DC ldr r0, =0x0203bd28 movs r2, 0 ldrsh r0, [r0, r2] cmp r0, 0 - beq _081772EC -_081772DC: + beq @081772EC +@081772DC: adds r0, r3, 0 bl obj_delete_and_free_tiles - b _08177380 + b @08177380 .align 2, 0 .pool -_081772EC: +@081772EC: adds r0, r1, 0 adds r0, 0x3E ldrb r0, [r0] @@ -723701,14 +723701,14 @@ _081772EC: adds r0, r4 ldrh r0, [r0, 0x22] strh r0, [r3, 0x22] -_08177380: +@08177380: pop {r4} pop {r0} bx r0 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 @@ -723728,13 +723728,13 @@ sub_8177388: @ 8177388 movs r4, 0x1 movs r6, 0 ldr r5, =0x00000181 -_081773B4: +@081773B4: adds r0, r4, 0 movs r1, 0x1 bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - beq _081773D4 + beq @081773D4 ldr r0, =0x0203bce8 ldr r0, [r0] lsls r1, r6, 1 @@ -723744,23 +723744,23 @@ _081773B4: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 -_081773D4: +@081773D4: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, r5 - bls _081773B4 + bls @081773B4 adds r4, r6, 0 ldr r0, =0x00000181 ldr r1, =0x0203bce8 mov r8, r1 lsls r7, r4, 16 cmp r4, r0 - bhi _08177406 + bhi @08177406 mov r5, r8 movs r3, 0 adds r2, r0, 0 -_081773F2: +@081773F2: ldr r0, [r5] lsls r1, r4, 1 adds r0, 0x96 @@ -723770,8 +723770,8 @@ _081773F2: lsls r0, 16 lsrs r4, r0, 16 cmp r4, r2 - bls _081773F2 -_08177406: + bls @081773F2 +@08177406: mov r2, r8 ldr r1, [r2] ldr r2, =0x0000039a @@ -723779,31 +723779,31 @@ _08177406: strh r6, [r0] lsrs r0, r7, 16 cmp r0, 0x46 - bhi _08177430 + bhi @08177430 adds r0, r1, 0 adds r0, 0x94 strh r6, [r0] - b _08177436 + b @08177436 .align 2, 0 .pool -_08177430: +@08177430: adds r1, 0x94 movs r0, 0x47 strh r0, [r1] -_08177436: +@08177436: movs r6, 0 ldr r0, =0x0203bce8 mov r9, r0 ldr r1, =0x0000039a mov r8, r1 movs r7, 0 - b _08177450 + b @08177450 .align 2, 0 .pool -_0817744C: +@0817744C: cmp r6, 0x46 - bhi _081774AC -_08177450: + bhi @081774AC +@08177450: bl GenerateRandomNumber mov r2, r9 ldr r4, [r2] @@ -723832,7 +723832,7 @@ _08177450: lsls r0, 16 lsrs r0, 16 cmp r3, r0 - beq _081774A0 + beq @081774A0 ldrh r0, [r5] lsls r0, 1 adds r0, r4, r0 @@ -723842,14 +723842,14 @@ _08177450: lsls r0, 1 adds r0, r4, r0 strh r7, [r0] -_081774A0: +@081774A0: mov r2, r9 ldr r0, [r2] add r0, r8 ldrh r0, [r0] cmp r0, 0 - bne _0817744C -_081774AC: + bne @0817744C +@081774AC: ldr r1, =0x0203bce8 ldr r2, [r1] adds r3, r2, 0 @@ -723857,13 +723857,13 @@ _081774AC: ldrh r0, [r3] mov r8, r1 cmp r0, 0x46 - bhi _081774F8 + bhi @081774F8 adds r6, r0, 0 movs r3, 0 cmp r6, 0x46 - bhi _081774EE + bhi @081774EE mov r4, r8 -_081774C6: +@081774C6: ldr r2, [r4] lsls r1, r6, 1 adds r1, r2, r1 @@ -723877,27 +723877,27 @@ _081774C6: adds r2, 0x94 ldrh r2, [r2] cmp r3, r2 - bne _081774E4 + bne @081774E4 movs r3, 0 -_081774E4: +@081774E4: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x46 - bls _081774C6 -_081774EE: + bls @081774C6 +@081774EE: mov r1, r8 ldr r0, [r1] - b _08177538 + b @08177538 .align 2, 0 .pool -_081774F8: +@081774F8: movs r4, 0 ldrh r0, [r2] cmp r0, r10 - beq _08177516 + beq @08177516 adds r1, r2, 0 -_08177502: +@08177502: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -723905,10 +723905,10 @@ _08177502: adds r0, r1, r0 ldrh r0, [r0] cmp r0, r10 - beq _08177516 + beq @08177516 cmp r4, 0x46 - bls _08177502 -_08177516: + bls @08177502 +@08177516: mov r0, r8 ldr r2, [r0] adds r0, r2, 0 @@ -723916,7 +723916,7 @@ _08177516: ldrh r0, [r0] subs r0, 0x1 cmp r4, r0 - bge _08177536 + bge @08177536 lsls r0, r4, 1 adds r0, r2, r0 adds r2, 0x8C @@ -723924,14 +723924,14 @@ _08177516: strh r1, [r0] mov r1, r10 strh r1, [r2] - b _0817753E -_08177536: + b @0817753E +@08177536: adds r0, r2, 0 -_08177538: +@08177538: adds r0, 0x8C mov r2, r10 strh r2, [r0] -_0817753E: +@0817753E: mov r1, r8 ldr r0, [r1] adds r0, 0x94 @@ -723947,7 +723947,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 @@ -723968,7 +723968,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 @@ -723980,11 +723980,11 @@ sub_8177584: @ 8177584 lsrs r4, r0, 16 ldr r0, =0x0000ffff cmp r4, r0 - beq _081775B4 + beq @081775B4 ldr r5, =0x41c64e6d ldr r3, =0x00003039 adds r2, r0, 0 -_081775A4: +@081775A4: adds r0, r1, 0 muls r0, r5 adds r1, r0, r3 @@ -723992,8 +723992,8 @@ _081775A4: lsls r0, 16 lsrs r4, r0, 16 cmp r4, r2 - bne _081775A4 -_081775B4: + bne @081775A4 +@081775B4: adds r0, r1, 0 bl sub_8177814 pop {r4,r5} @@ -724004,7 +724004,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 @@ -724016,7 +724016,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 @@ -724031,7 +724031,7 @@ sub_81775E0: @ 81775E0 movs r1, 0 str r1, [sp] movs r7, 0 -_081775FC: +@081775FC: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 @@ -724041,12 +724041,12 @@ _081775FC: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _08177658 + beq @08177658 adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _0817764E + bne @0817764E adds r0, r4, 0 movs r1, 0x1 bl pokemon_getattr @@ -724061,32 +724061,32 @@ _081775FC: ldr r1, =0x020375e0 ldrh r2, [r1] cmp r0, r2 - bls _0817764E + bls @0817764E cmp r0, 0x1 - bls _0817764E + bls @0817764E subs r0, 0x1 strh r0, [r1] movs r0, 0xE str r0, [sp] str r7, [sp, 0x4] -_0817764E: +@0817764E: adds r0, r7, 0x1 lsls r0, 16 lsrs r7, r0, 16 cmp r7, 0x5 - bls _081775FC -_08177658: + bls @081775FC +@08177658: movs r7, 0 ldr r1, =0x03005d94 mov r9, r1 -_0817765E: +@0817765E: movs r6, 0 adds r2, r7, 0x1 mov r10, r2 lsls r0, r7, 2 adds r0, r7 mov r8, r0 -_0817766A: +@0817766A: mov r1, r8 lsls r0, r1, 4 subs r0, r1 @@ -724102,7 +724102,7 @@ _0817766A: movs r1, 0xB bl pokemon_getattr_encrypted cmp r0, 0 - beq _081776D2 + beq @081776D2 mov r1, r9 ldr r0, [r1] adds r0, r5 @@ -724110,7 +724110,7 @@ _0817766A: movs r1, 0x2D bl pokemon_getattr_encrypted cmp r0, 0 - bne _081776D2 + bne @081776D2 mov r2, r9 ldr r0, [r2] adds r0, r5 @@ -724128,28 +724128,28 @@ _0817766A: ldr r1, =0x020375e0 ldrh r2, [r1] cmp r0, r2 - bls _081776D2 + bls @081776D2 cmp r0, 0x1 - bls _081776D2 + bls @081776D2 subs r0, 0x1 strh r0, [r1] str r7, [sp] str r6, [sp, 0x4] -_081776D2: +@081776D2: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x1D - bls _0817766A + bls @0817766A mov r1, r10 lsls r0, r1, 16 lsrs r7, r0, 16 cmp r7, 0xD - bls _0817765E + bls @0817765E ldr r3, =0x020375e0 ldrh r0, [r3] cmp r0, 0 - beq _0817776E + beq @0817776E ldr r2, =0x020375e2 ldr r1, =0x085e7080 subs r0, 0x1 @@ -724159,7 +724159,7 @@ _081776D2: strh r0, [r2] ldr r2, [sp] cmp r2, 0xE - bne _0817773C + bne @0817773C ldr r1, =0x020375e4 movs r0, 0 strh r0, [r1] @@ -724171,10 +724171,10 @@ _081776D2: ldr r2, =0x02021cc4 movs r1, 0x2 bl pokemon_getattr - b _08177768 + b @08177768 .align 2, 0 .pool -_0817773C: +@0817773C: ldr r1, =0x020375e4 movs r0, 0x1 strh r0, [r1] @@ -724196,10 +724196,10 @@ _0817773C: ldr r2, =0x02021cc4 movs r1, 0x2 bl pokemon_getattr_encrypted -_08177768: +@08177768: ldr r0, =0x02021cc4 bl get_end_of_string_ptr_limit_10_chars -_0817776E: +@0817776E: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -724213,7 +724213,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 @@ -724230,7 +724230,7 @@ sub_817778C: @ 817778C mov r10, r1 ldr r0, =0x0203bcee mov r9, r0 -_081777AC: +@081777AC: adds r0, r6, 0 movs r1, 0xA bl __umodsi3 @@ -724245,7 +724245,7 @@ _081777AC: lsls r4, 16 lsls r0, 16 cmp r4, r0 - bne _081777FA + bne @081777FA adds r0, r6, 0 movs r1, 0xA bl __udivsi3 @@ -724265,8 +724265,8 @@ _081777AC: lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x4 - bls _081777AC -_081777FA: + bls @081777AC +@081777FA: mov r0, r8 pop {r3-r5} mov r8, r3 @@ -724280,7 +724280,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 @@ -724299,7 +724299,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 var_get @@ -724318,7 +724318,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 @@ -724328,7 +724328,7 @@ sub_8177864: @ 8177864 thumb_func_end sub_8177864 thumb_func_start sub_8177874 -sub_8177874: @ 8177874 +sub_8177874: ; 8177874 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -724338,7 +724338,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 @@ -724436,12 +724436,12 @@ sub_8177888: @ 8177888 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram -_0817797C: +@0817797C: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _0817797C + bne @0817797C ldr r0, =0x085e70c8 ldr r1, =0x0203bcf0 ldr r1, [r1] @@ -724479,7 +724479,7 @@ _0817797C: thumb_func_end sub_8177888 thumb_func_start sub_8177A08 -sub_8177A08: @ 8177A08 +sub_8177A08: ; 8177A08 push {lr} bl run_active_tasks bl call_obj_callbacks @@ -724490,7 +724490,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 @@ -724499,7 +724499,7 @@ sub_8177A20: @ 8177A20 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08177A40 + bne @08177A40 ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -724507,7 +724507,7 @@ sub_8177A20: @ 8177A20 adds r1, r0 ldr r0, =sub_8177A50 + 1 str r0, [r1] -_08177A40: +@08177A40: pop {r0} bx r0 .align 2, 0 @@ -724515,7 +724515,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 @@ -724525,7 +724525,7 @@ sub_8177A50: @ 8177A50 movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _08177A82 + beq @08177A82 movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -724540,7 +724540,7 @@ sub_8177A50: @ 8177A50 adds r0, r1 ldr r1, =sub_8177A98 + 1 str r1, [r0] -_08177A82: +@08177A82: add sp, 0x4 pop {r4} pop {r0} @@ -724550,7 +724550,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 @@ -724559,7 +724559,7 @@ sub_8177A98: @ 8177A98 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08177AC2 + bne @08177AC2 ldr r0, =0x0203bcf0 ldr r0, [r0] bl free @@ -724568,7 +724568,7 @@ sub_8177A98: @ 8177A98 bl remove_task ldr r0, =sub_80861E8 + 1 bl set_callback2 -_08177AC2: +@08177AC2: pop {r4} pop {r0} bx r0 @@ -724577,12 +724577,12 @@ _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 cmp r0, 0 - beq _08177AFC + beq @08177AFC movs r1, 0x80 lsls r1, 1 movs r0, 0x14 @@ -724590,17 +724590,17 @@ pokedex_diploma_something: @ 8177AD4 ldr r0, =0x02021cc4 ldr r1, =0x085ee855 bl gf_strcpy - b _08177B0C + b @08177B0C .align 2, 0 .pool -_08177AFC: +@08177AFC: movs r0, 0x14 movs r1, 0 bl lcd_io_set ldr r0, =0x02021cc4 ldr r1, =0x085ee84f bl gf_strcpy -_08177B0C: +@08177B0C: ldr r4, =0x02021fc4 ldr r1, =0x085ee85e adds r0, r4, 0 @@ -724622,7 +724622,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 gpu_reset_bgs_and_dma3_busy_flags @@ -724658,7 +724658,7 @@ sub_8177B44: @ 8177B44 thumb_func_end sub_8177B44 thumb_func_start sub_8177B9C -sub_8177B9C: @ 8177B9C +sub_8177B9C: ; 8177B9C push {lr} ldr r0, =0x085e8204 bl Window_InitFromTemplates @@ -724679,7 +724679,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 @@ -724716,7 +724716,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 @@ -724742,7 +724742,7 @@ sub_8177C14: @ 8177C14 thumb_func_end sub_8177C14 thumb_func_start sub_8177C54 -sub_8177C54: @ 8177C54 +sub_8177C54: ; 8177C54 push {lr} bl run_active_tasks bl call_obj_callbacks @@ -724754,7 +724754,7 @@ sub_8177C54: @ 8177C54 thumb_func_end sub_8177C54 thumb_func_start sub_8177C70 -sub_8177C70: @ 8177C70 +sub_8177C70: ; 8177C70 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -724764,31 +724764,31 @@ sub_8177C70: @ 8177C70 thumb_func_end sub_8177C70 thumb_func_start sub_8177C84 -sub_8177C84: @ 8177C84 +sub_8177C84: ; 8177C84 push {lr} -_08177C86: +@08177C86: bl sub_81221EC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08177CAA + beq @08177CAA bl sub_8177CB0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08177CAA + beq @08177CAA bl sub_81221AC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08177C86 -_08177CAA: + bne @08177C86 +@08177CAA: pop {r0} bx r0 thumb_func_end sub_8177C84 thumb_func_start sub_8177CB0 -sub_8177CB0: @ 8177CB0 +sub_8177CB0: ; 8177CB0 push {lr} sub sp, 0x4 ldr r0, =0x030022c0 @@ -724797,65 +724797,65 @@ sub_8177CB0: @ 8177CB0 adds r0, r1 ldrb r0, [r0] cmp r0, 0xF - bls _08177CC4 - b _08177DF4 -_08177CC4: + bls @08177CC4 + b @08177DF4 +@08177CC4: lsls r0, 2 - ldr r1, =_08177CD8 + ldr r1, =@08177CD8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08177CD8: - .4byte _08177D18 - .4byte _08177D26 - .4byte _08177D2C - .4byte _08177D40 - .4byte _08177D46 - .4byte _08177D4C - .4byte _08177D5C - .4byte _08177D78 - .4byte _08177D84 - .4byte _08177D8A - .4byte _08177D90 - .4byte _08177D96 - .4byte _08177D9C - .4byte _08177DA6 - .4byte _08177DB4 - .4byte _08177DC2 -_08177D18: +@08177CD8: + .4byte @08177D18 + .4byte @08177D26 + .4byte @08177D2C + .4byte @08177D40 + .4byte @08177D46 + .4byte @08177D4C + .4byte @08177D5C + .4byte @08177D78 + .4byte @08177D84 + .4byte @08177D8A + .4byte @08177D90 + .4byte @08177D96 + .4byte @08177D9C + .4byte @08177DA6 + .4byte @08177DB4 + .4byte @08177DC2 +@08177D18: bl vblank_hblank_handler_set_zero bl sub_8121DA0 bl clear_scheduled_bg_copies_to_vram - b _08177DDC -_08177D26: + b @08177DDC +@08177D26: bl remove_some_task - b _08177DDC -_08177D2C: + b @08177DDC +@08177D2C: bl sub_80A1A74 ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 - b _08177DDA + b @08177DDA .align 2, 0 .pool -_08177D40: +@08177D40: bl reset_all_obj_data - b _08177DDC -_08177D46: + b @08177DDC +@08177D46: bl gpu_pal_allocator_reset - b _08177DDC -_08177D4C: + b @08177DDC +@08177D4C: bl sub_81221AC lsls r0, 24 cmp r0, 0 - bne _08177DDC + bne @08177DDC bl clear_tasks - b _08177DDC -_08177D5C: + b @08177DDC +@08177D5C: bl sub_8177E14 ldr r0, =0x0203bcf4 ldr r0, [r0] @@ -724863,46 +724863,46 @@ _08177D5C: adds r0, r1 movs r1, 0 strh r1, [r0] - b _08177DDC + b @08177DDC .align 2, 0 .pool -_08177D78: +@08177D78: bl sub_8177E88 lsls r0, 24 cmp r0, 0 - beq _08177E0C - b _08177DDC -_08177D84: + beq @08177E0C + b @08177DDC +@08177D84: bl sub_8178008 - b _08177DDC -_08177D8A: + b @08177DDC +@08177D8A: bl sub_8178090 - b _08177DDC -_08177D90: + b @08177DDC +@08177D90: bl sub_81780F4 - b _08177DDC -_08177D96: + b @08177DDC +@08177D96: bl sub_8178338 - b _08177DDC -_08177D9C: + b @08177DDC +@08177D9C: bl sub_817839C bl sub_8178404 - b _08177DDC -_08177DA6: + b @08177DDC +@08177DA6: ldr r0, =sub_8178654 + 1 movs r1, 0 bl AddTask - b _08177DDC + b @08177DDC .align 2, 0 .pool -_08177DB4: +@08177DB4: movs r0, 0x1 negs r0, r0 movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - b _08177DDC -_08177DC2: + b @08177DDC +@08177DC2: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -724914,9 +724914,9 @@ _08177DC2: ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 -_08177DDA: +@08177DDA: strb r0, [r2, 0x8] -_08177DDC: +@08177DDC: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -724924,28 +724924,28 @@ _08177DDC: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08177E0C + b @08177E0C .align 2, 0 .pool -_08177DF4: +@08177DF4: ldr r0, =sub_8177C70 + 1 bl SetVBlankCallback ldr r0, =sub_8177C54 + 1 bl set_callback2 movs r0, 0x1 - b _08177E0E + b @08177E0E .align 2, 0 .pool -_08177E0C: +@08177E0C: movs r0, 0 -_08177E0E: +@08177E0E: add sp, 0x4 pop {r1} bx r1 thumb_func_end sub_8177CB0 thumb_func_start sub_8177E14 -sub_8177E14: @ 8177E14 +sub_8177E14: ; 8177E14 push {r4,lr} movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags @@ -724991,7 +724991,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 @@ -725001,25 +725001,25 @@ sub_8177E88: @ 8177E88 ldrh r0, [r0] adds r7, r1, 0 cmp r0, 0x5 - bls _08177E9E - b _08177FEC -_08177E9E: + bls @08177E9E + b @08177FEC +@08177E9E: lsls r0, 2 - ldr r1, =_08177EB4 + ldr r1, =@08177EB4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08177EB4: - .4byte _08177ECC - .4byte _08177EF8 - .4byte _08177F1C - .4byte _08177F3C - .4byte _08177FA8 - .4byte _08177FC8 -_08177ECC: +@08177EB4: + .4byte @08177ECC + .4byte @08177EF8 + .4byte @08177F1C + .4byte @08177F3C + .4byte @08177FA8 + .4byte @08177FC8 +@08177ECC: bl reset_temp_tile_data_buffers ldr r1, =0x08d9bb44 movs r0, 0 @@ -725032,26 +725032,26 @@ _08177ECC: ldr r1, [r0] ldr r0, =0x00001808 adds r1, r0 - b _08177FD6 + b @08177FD6 .align 2, 0 .pool -_08177EF8: +@08177EF8: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08177F06 - b _08177FFC -_08177F06: + bne @08177F06 + b @08177FFC +@08177F06: ldr r0, =0x08d9bf98 ldr r4, =0x0203bcf4 ldr r1, [r4] bl call_LZZUnCompWram ldr r1, [r4] - b _08177FD2 + b @08177FD2 .align 2, 0 .pool -_08177F1C: +@08177F1C: ldr r0, =0x08d9c13c ldr r1, [r7] movs r2, 0x80 @@ -725061,22 +725061,22 @@ _08177F1C: ldr r1, [r7] ldr r0, =0x00001808 adds r1, r0 - b _08177FD6 + b @08177FD6 .align 2, 0 .pool -_08177F3C: +@08177F3C: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - bne _08177F78 + bne @08177F78 movs r2, 0 ldr r6, =0x0203bcf4 movs r5, 0x80 lsls r5, 4 ldr r4, =0x00004042 ldr r3, =0x000003ff -_08177F52: +@08177F52: ldr r0, [r6] lsls r1, r2, 1 adds r0, r5 @@ -725086,18 +725086,18 @@ _08177F52: lsls r0, 16 lsrs r2, r0, 16 cmp r2, r3 - bls _08177F52 - b _08177F98 + bls @08177F52 + b @08177F98 .align 2, 0 .pool -_08177F78: +@08177F78: movs r2, 0 ldr r6, =0x0203bcf4 movs r5, 0x80 lsls r5, 4 ldr r4, =0x00005042 ldr r3, =0x000003ff -_08177F84: +@08177F84: ldr r0, [r6] lsls r1, r2, 1 adds r0, r5 @@ -725107,13 +725107,13 @@ _08177F84: lsls r0, 16 lsrs r2, r0, 16 cmp r2, r3 - bls _08177F84 -_08177F98: + bls @08177F84 +@08177F98: ldr r1, [r7] - b _08177FD2 + b @08177FD2 .align 2, 0 .pool -_08177FA8: +@08177FA8: ldr r0, =0x08d9bef0 movs r1, 0 movs r2, 0xC0 @@ -725122,34 +725122,34 @@ _08177FA8: ldr r1, [r0] ldr r0, =0x00001808 adds r1, r0 - b _08177FD6 + b @08177FD6 .align 2, 0 .pool -_08177FC8: +@08177FC8: ldr r0, =0x0857fdec bl gpu_tile_obj_decompress_and_load ldr r0, =0x0203bcf4 ldr r1, [r0] -_08177FD2: +@08177FD2: ldr r2, =0x00001808 adds r1, r2 -_08177FD6: +@08177FD6: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _08177FFC + b @08177FFC .align 2, 0 .pool -_08177FEC: +@08177FEC: ldr r0, =0x0857fdf4 bl gpu_pal_obj_decompress_and_apply movs r0, 0x1 - b _08177FFE + b @08177FFE .align 2, 0 .pool -_08177FFC: +@08177FFC: movs r0, 0 -_08177FFE: +@08177FFE: add sp, 0x4 pop {r4-r7} pop {r1} @@ -725157,7 +725157,7 @@ _08177FFE: thumb_func_end sub_8177E88 thumb_func_start sub_8178008 -sub_8178008: @ 8178008 +sub_8178008: ; 8178008 push {r4,lr} ldr r0, =0x085efd28 bl Window_InitFromTemplates @@ -725167,7 +725167,7 @@ sub_8178008: @ 8178008 movs r2, 0x20 bl gpu_pal_apply movs r4, 0 -_08178020: +@08178020: lsls r0, r4, 24 lsrs r0, 24 bl Window_WriteStandardTileMap @@ -725175,7 +725175,7 @@ _08178020: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x3 - bls _08178020 + bls @08178020 movs r0, 0 bl schedule_bg_copy_tilemap_to_vram movs r0, 0x1 @@ -725188,7 +725188,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] @@ -725224,7 +725224,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 @@ -725269,7 +725269,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 @@ -725281,7 +725281,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 @@ -725322,7 +725322,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 @@ -725346,7 +725346,7 @@ sub_8178174: @ 8178174 bl Print ldrh r0, [r4, 0x8] cmp r0, 0 - beq _08178230 + beq @08178230 adds r1, r0, 0 lsls r0, r1, 5 subs r0, r1 @@ -725359,9 +725359,9 @@ sub_8178174: @ 8178174 movs r1, 0xA bl __umodsi3 cmp r0, 0x4 - bls _081781C8 + bls @081781C8 adds r5, 0xA -_081781C8: +@081781C8: adds r0, r5, 0 movs r1, 0x64 bl __umodsi3 @@ -725394,10 +725394,10 @@ _081781C8: adds r2, r4, 0 movs r3, 0x28 bl Print - b _08178242 + b @08178242 .align 2, 0 .pool -_08178230: +@08178230: ldr r2, =0x085e8d34 str r7, [sp] str r0, [sp, 0x4] @@ -725406,7 +725406,7 @@ _08178230: movs r1, 0x1 movs r3, 0x28 bl Print -_08178242: +@08178242: add sp, 0xC pop {r4-r7} pop {r0} @@ -725416,7 +725416,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 @@ -725440,7 +725440,7 @@ itemid_copy_name: @ 8178250 bl Print ldrb r0, [r6, 0x7] cmp r0, 0 - beq _081782B0 + beq @081782B0 ldr r0, =0x085efd50 ldrb r1, [r6, 0x7] subs r1, 0x1 @@ -725454,10 +725454,10 @@ itemid_copy_name: @ 8178250 movs r1, 0x1 movs r3, 0x28 bl Print - b _081782C2 + b @081782C2 .align 2, 0 .pool -_081782B0: +@081782B0: ldr r2, =0x085e8d34 str r5, [sp] str r0, [sp, 0x4] @@ -725466,7 +725466,7 @@ _081782B0: movs r1, 0x1 movs r3, 0x28 bl Print -_081782C2: +@081782C2: add sp, 0xC pop {r4-r6} pop {r0} @@ -725476,7 +725476,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 @@ -725504,7 +725504,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 @@ -725532,7 +725532,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] @@ -725558,7 +725558,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] @@ -725579,7 +725579,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 @@ -725620,7 +725620,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] @@ -725632,7 +725632,7 @@ sub_8178404: @ 8178404 adds r5, r0, 0 ldrb r0, [r5, 0x15] cmp r0, 0 - beq _08178448 + beq @08178448 ldr r3, =0x02020630 ldr r0, [r4] ldr r1, =0x00001803 @@ -725647,10 +725647,10 @@ sub_8178404: @ 8178404 movs r1, 0x5 negs r1, r1 ands r1, r2 - b _08178462 + b @08178462 .align 2, 0 .pool -_08178448: +@08178448: ldr r3, =0x02020630 ldr r0, [r4] ldr r1, =0x00001803 @@ -725664,12 +725664,12 @@ _08178448: ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 -_08178462: +@08178462: strb r1, [r0] adds r4, r3, 0 ldrb r0, [r5, 0x16] cmp r0, 0 - beq _0817849C + beq @0817849C ldr r3, =0x0203bcf4 ldr r0, [r3] ldr r1, =0x00001804 @@ -725684,10 +725684,10 @@ _08178462: movs r1, 0x5 negs r1, r1 ands r1, r2 - b _081784B6 + b @081784B6 .align 2, 0 .pool -_0817849C: +@0817849C: ldr r3, =0x0203bcf4 ldr r0, [r3] ldr r1, =0x00001804 @@ -725701,11 +725701,11 @@ _0817849C: ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 -_081784B6: +@081784B6: strb r1, [r0] ldrb r0, [r5, 0x17] cmp r0, 0 - beq _081784E8 + beq @081784E8 ldr r0, [r3] ldr r1, =0x00001805 adds r0, r1 @@ -725719,10 +725719,10 @@ _081784B6: movs r1, 0x5 negs r1, r1 ands r1, r2 - b _08178500 + b @08178500 .align 2, 0 .pool -_081784E8: +@081784E8: ldr r0, [r3] ldr r1, =0x00001805 adds r0, r1 @@ -725735,11 +725735,11 @@ _081784E8: ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 -_08178500: +@08178500: strb r1, [r0] ldrb r0, [r5, 0x18] cmp r0, 0 - beq _0817852C + beq @0817852C ldr r0, [r3] ldr r1, =0x00001806 adds r0, r1 @@ -725753,10 +725753,10 @@ _08178500: movs r1, 0x5 negs r1, r1 ands r1, r2 - b _08178544 + b @08178544 .align 2, 0 .pool -_0817852C: +@0817852C: ldr r0, [r3] ldr r1, =0x00001806 adds r0, r1 @@ -725769,11 +725769,11 @@ _0817852C: ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 -_08178544: +@08178544: strb r1, [r0] ldrb r0, [r5, 0x19] cmp r0, 0 - beq _08178570 + beq @08178570 ldr r0, [r3] ldr r1, =0x00001807 adds r0, r1 @@ -725787,10 +725787,10 @@ _08178544: movs r1, 0x5 negs r1, r1 ands r1, r2 - b _08178588 + b @08178588 .align 2, 0 .pool -_08178570: +@08178570: ldr r0, [r3] ldr r1, =0x00001807 adds r0, r1 @@ -725803,7 +725803,7 @@ _08178570: ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 -_08178588: +@08178588: strb r1, [r0] pop {r4,r5} pop {r0} @@ -725813,10 +725813,10 @@ _08178588: thumb_func_end sub_8178404 thumb_func_start sub_8178594 -sub_8178594: @ 8178594 +sub_8178594: ; 8178594 push {r4,lr} movs r4, 0 -_08178598: +@08178598: ldr r0, =0x0203bcf4 ldr r0, [r0] ldr r1, =0x00001803 @@ -725833,7 +725833,7 @@ _08178598: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x4 - bls _08178598 + bls @08178598 pop {r4} pop {r0} bx r0 @@ -725842,7 +725842,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 @@ -725873,7 +725873,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 @@ -725882,7 +725882,7 @@ sub_8178610: @ 8178610 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08178642 + bne @08178642 bl sub_817836C bl sub_8178594 ldr r0, =0x0203bcf4 @@ -725893,7 +725893,7 @@ sub_8178610: @ 8178610 bl set_callback2 adds r0, r4, 0 bl remove_task -_08178642: +@08178642: pop {r4} pop {r0} bx r0 @@ -725902,7 +725902,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 @@ -725912,43 +725912,43 @@ sub_8178654: @ 8178654 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081786A6 + bne @081786A6 ldr r3, =0x030022c0 ldrh r0, [r3, 0x30] movs r1, 0xF0 ands r1, r0 cmp r1, 0x40 - bne _08178688 + bne @08178688 movs r1, 0x1 negs r1, r1 adds r0, r2, 0 bl sub_81786AC - b _081786A6 + b @081786A6 .align 2, 0 .pool -_08178688: +@08178688: cmp r1, 0x80 - bne _08178696 + bne @08178696 adds r0, r2, 0 movs r1, 0x1 bl sub_81786AC - b _081786A6 -_08178696: + b @081786A6 +@08178696: ldrh r1, [r3, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _081786A6 + beq @081786A6 adds r0, r4, 0 bl sub_81785D0 -_081786A6: +@081786A6: pop {r4} pop {r0} bx r0 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 @@ -725968,23 +725968,23 @@ sub_81786AC: @ 81786AC asrs r6, r1, 24 adds r0, r6 cmp r0, 0x2D - bhi _08178718 + bhi @08178718 lsls r1, r0, 16 lsrs r1, 16 movs r0, 0x4 bl bag_pocket_get_itemid lsls r0, 16 cmp r0, 0 - beq _08178718 + beq @08178718 cmp r6, 0 - bge _081786F4 + bge @081786F4 movs r0, 0x2 - b _081786F6 + b @081786F6 .align 2, 0 .pool -_081786F4: +@081786F4: movs r0, 0x1 -_081786F6: +@081786F6: strh r0, [r4, 0x2] movs r0, 0 strh r0, [r4] @@ -726000,7 +726000,7 @@ _081786F6: adds r0, r1 ldr r1, =sub_81787AC + 1 str r1, [r0] -_08178718: +@08178718: pop {r4-r7} pop {r0} bx r0 @@ -726009,7 +726009,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 @@ -726017,10 +726017,10 @@ sub_8178728: @ 8178728 lsls r0, 24 asrs r4, r0, 24 cmp r4, 0 - ble _08178764 + ble @08178764 ldrh r0, [r6] cmp r0, 0x3 - bls _08178752 + bls @08178752 ldrh r1, [r5] adds r1, 0x8 lsls r1, 16 @@ -726029,32 +726029,32 @@ sub_8178728: @ 8178728 bl bag_pocket_get_itemid lsls r0, 16 cmp r0, 0 - bne _08178760 -_08178752: + bne @08178760 +@08178752: ldrh r0, [r6] adds r0, r4 strh r0, [r6] - b _0817877A + b @0817877A .align 2, 0 .pool -_08178760: +@08178760: ldrh r0, [r5] - b _08178776 -_08178764: + b @08178776 +@08178764: ldrh r1, [r6] cmp r1, 0x3 - bhi _08178770 + bhi @08178770 ldrh r0, [r5] cmp r0, 0 - bne _08178776 -_08178770: + bne @08178776 +@08178770: adds r0, r1, r4 strh r0, [r6] - b _0817877A -_08178776: + b @0817877A +@08178776: adds r0, r4 strh r0, [r5] -_0817877A: +@0817877A: ldrh r1, [r6] ldrh r5, [r5] adds r1, r5 @@ -726081,7 +726081,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} @@ -726101,135 +726101,135 @@ sub_81787AC: @ 81787AC movs r1, 0x2 ldrsh r0, [r6, r1] cmp r0, 0x1 - bne _08178828 + bne @08178828 movs r2, 0 ldrsh r0, [r6, r2] cmp r0, 0x70 - beq _08178888 + beq @08178888 cmp r0, 0x70 - bgt _081787FE + bgt @081787FE cmp r0, 0x40 - beq _0817881A + beq @0817881A cmp r0, 0x40 - bgt _081787F4 + bgt @081787F4 cmp r0, 0x30 - beq _08178898 - b _081788A6 + beq @08178898 + b @081788A6 .align 2, 0 .pool -_081787F4: +@081787F4: cmp r0, 0x50 - beq _0817888E + beq @0817888E cmp r0, 0x60 - beq _08178820 - b _081788A6 -_081787FE: + beq @08178820 + b @081788A6 +@081787FE: cmp r0, 0xA0 - beq _08178824 + beq @08178824 cmp r0, 0xA0 - bgt _08178810 + bgt @08178810 cmp r0, 0x80 - beq _08178882 + beq @08178882 cmp r0, 0x90 - beq _08178878 - b _081788A6 -_08178810: + beq @08178878 + b @081788A6 +@08178810: cmp r0, 0xB0 - beq _08178872 + beq @08178872 cmp r0, 0xC0 - beq _0817886C - b _081788A6 -_0817881A: + beq @0817886C + b @081788A6 +@0817881A: bl sub_8178110 - b _081788A6 -_08178820: + b @081788A6 +@08178820: movs r0, 0x1 - b _0817889A -_08178824: + b @0817889A +@08178824: movs r0, 0x2 - b _0817889A -_08178828: + b @0817889A +@08178828: movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0x70 - beq _0817887E + beq @0817887E cmp r0, 0x70 - bgt _0817884C + bgt @0817884C cmp r0, 0x40 - beq _0817886C + beq @0817886C cmp r0, 0x40 - bgt _08178842 + bgt @08178842 cmp r0, 0x30 - beq _08178868 - b _081788A6 -_08178842: + beq @08178868 + b @081788A6 +@08178842: cmp r0, 0x50 - beq _08178872 + beq @08178872 cmp r0, 0x60 - beq _08178878 - b _081788A6 -_0817884C: + beq @08178878 + b @081788A6 +@0817884C: cmp r0, 0xA0 - beq _0817888E + beq @0817888E cmp r0, 0xA0 - bgt _0817885E + bgt @0817885E cmp r0, 0x80 - beq _08178882 + beq @08178882 cmp r0, 0x90 - beq _08178888 - b _081788A6 -_0817885E: + beq @08178888 + b @081788A6 +@0817885E: cmp r0, 0xB0 - beq _08178898 + beq @08178898 cmp r0, 0xC0 - beq _081788A2 - b _081788A6 -_08178868: + beq @081788A2 + b @081788A6 +@08178868: movs r0, 0x2 - b _0817889A -_0817886C: + b @0817889A +@0817886C: bl sub_8178304 - b _081788A6 -_08178872: + b @081788A6 +@08178872: bl sub_81782D0 - b _081788A6 -_08178878: + b @081788A6 +@08178878: bl sub_8178404 - b _081788A6 -_0817887E: + b @081788A6 +@0817887E: movs r0, 0x1 - b _0817889A -_08178882: + b @0817889A +@08178882: bl itemid_copy_name - b _081788A6 -_08178888: + b @081788A6 +@08178888: bl sub_8178174 - b _081788A6 -_0817888E: + b @081788A6 +@0817888E: bl sub_817836C bl sub_8178338 - b _081788A6 -_08178898: + b @081788A6 +@08178898: movs r0, 0 -_0817889A: +@0817889A: movs r1, 0 bl Window_FastFillPixels - b _081788A6 -_081788A2: + b @081788A6 +@081788A2: bl sub_8178110 -_081788A6: +@081788A6: movs r2, 0x2 ldrsh r0, [r6, r2] cmp r0, 0x1 - bne _081788B8 + bne @081788B8 ldrh r0, [r6] negs r0, r0 lsls r0, 16 lsrs r5, r0, 16 - b _081788BA -_081788B8: + b @081788BA +@081788B8: ldrh r5, [r6] -_081788BA: +@081788BA: ldr r2, =0x02020630 ldr r3, =0x0203bcf4 ldr r0, [r3] @@ -726244,7 +726244,7 @@ _081788BA: movs r4, 0 adds r7, r2, 0 ldr r2, =0x00001803 -_081788D6: +@081788D6: ldr r0, [r3] adds r0, r2 adds r0, r4 @@ -726258,7 +726258,7 @@ _081788D6: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x4 - bls _081788D6 + bls @081788D6 movs r4, 0x80 lsls r4, 5 ldrb r2, [r6, 0x2] @@ -726272,7 +726272,7 @@ _081788D6: movs r2, 0 ldrsh r0, [r6, r2] cmp r0, 0 - bne _08178922 + bne @08178922 ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 @@ -726281,7 +726281,7 @@ _081788D6: adds r1, r0 ldr r0, =sub_8178654 + 1 str r0, [r1] -_08178922: +@08178922: pop {r3} mov r8, r3 pop {r4-r7} @@ -726292,7 +726292,7 @@ _08178922: thumb_func_end sub_81787AC thumb_func_start sub_8178944 -sub_8178944: @ 8178944 +sub_8178944: ; 8178944 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -726302,16 +726302,16 @@ 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 ldrh r0, [r1, 0x1A] ldrh r1, [r1, 0x36] cmp r0, r1 - bne _08178968 + bne @08178968 movs r2, 0x1 -_08178968: +@08178968: adds r0, r2, 0 pop {r1} bx r1 @@ -726320,7 +726320,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 reset_all_obj_data @@ -726338,17 +726338,17 @@ sub_8178974: @ 8178974 bl Window_InitFromTemplates lsls r0, 16 cmp r0, 0 - beq _08178A22 + beq @08178A22 bl TextBox_ResetSomeField movs r4, 0 -_081789AC: +@081789AC: lsls r0, r4, 24 lsrs r0, 24 movs r1, 0 bl Window_FastFillPixels adds r4, 0x1 cmp r4, 0x1 - ble _081789AC + ble @081789AC movs r0, 0x1E str r0, [sp] movs r0, 0x14 @@ -726386,7 +726386,7 @@ _081789AC: bl rboxid_80040B8 ldr r0, =sub_8178A78 + 1 bl set_callback2 -_08178A22: +@08178A22: add sp, 0x8 pop {r4} pop {r0} @@ -726396,27 +726396,27 @@ _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 movs r5, 0x1 cmp r4, 0 - bne _08178A54 + bne @08178A54 ldr r1, =0x085ee80a bl gf_strcpy movs r5, 0 -_08178A54: +@08178A54: cmp r4, 0x2 - bne _08178A5A + bne @08178A5A movs r5, 0 -_08178A5A: +@08178A5A: cmp r4, 0x1 - bne _08178A66 + bne @08178A66 ldr r1, =0x085ee827 adds r0, r6, 0 bl gf_strcpy -_08178A66: +@08178A66: adds r0, r5, 0 pop {r4-r6} pop {r1} @@ -726426,7 +726426,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 @@ -726436,36 +726436,36 @@ sub_8178A78: @ 8178A78 ldrb r0, [r0] adds r4, r1, 0 cmp r0, 0x10 - bls _08178A8E - b _08178E58 -_08178A8E: + bls @08178A8E + b @08178E58 +@08178A8E: lsls r0, 2 - ldr r1, =_08178AA0 + ldr r1, =@08178AA0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08178AA0: - .4byte _08178AE4 - .4byte _08178B12 - .4byte _08178B48 - .4byte _08178B80 - .4byte _08178BCC - .4byte _08178BDC - .4byte _08178C54 - .4byte _08178D28 - .4byte _08178D38 - .4byte _08178D58 - .4byte _08178D60 - .4byte _08178D74 - .4byte _08178DBC - .4byte _08178DE0 - .4byte _08178E0C - .4byte _08178E24 - .4byte _08178E48 -_08178AE4: +@08178AA0: + .4byte @08178AE4 + .4byte @08178B12 + .4byte @08178B48 + .4byte @08178B80 + .4byte @08178BCC + .4byte @08178BDC + .4byte @08178C54 + .4byte @08178D28 + .4byte @08178D38 + .4byte @08178D58 + .4byte @08178D60 + .4byte @08178D74 + .4byte @08178DBC + .4byte @08178DE0 + .4byte @08178E0C + .4byte @08178E24 + .4byte @08178E48 +@08178AE4: movs r0, 0 movs r1, 0x1 movs r2, 0x1 @@ -726484,16 +726484,16 @@ _08178AE4: str r1, [sp] movs r2, 0x10 movs r3, 0 - b _08178E30 -_08178B12: + b @08178E30 +@08178B12: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08178B20 - b _08178E58 -_08178B20: + beq @08178B20 + b @08178E58 +@08178B20: ldr r1, =0x085ee765 movs r0, 0x1 str r0, [sp] @@ -726505,17 +726505,17 @@ _08178B20: movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _08178E3C + b @08178E3C .align 2, 0 .pool -_08178B48: +@08178B48: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - beq _08178B56 - b _08178E58 -_08178B56: + beq @08178B56 + b @08178E58 +@08178B56: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -726528,24 +726528,24 @@ _08178B56: adds r0, r2, 0 strh r0, [r1] bl sub_8009734 - b _08178E58 + b @08178E58 .align 2, 0 .pool -_08178B80: +@08178B80: ldr r0, =0x030030e0 ldr r1, [r0] movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _08178B8E - b _08178D00 -_08178B8E: + bne @08178B8E + b @08178D00 +@08178B8E: movs r0, 0x1C ands r1, r0 cmp r1, 0x4 - bhi _08178B98 - b _08178D00 -_08178B98: + bhi @08178B98 + b @08178D00 +@08178B98: movs r0, 0x15 bl audio_play ldr r1, =0x085ee788 @@ -726562,30 +726562,30 @@ _08178B98: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08178D00 + b @08178D00 .align 2, 0 .pool -_08178BCC: +@08178BCC: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - beq _08178BDA - b _08178E58 -_08178BDA: - b _08178E34 -_08178BDC: + beq @08178BDA + b @08178E58 +@08178BDA: + b @08178E34 +@08178BDC: bl sub_800ABAC lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x2 - bne _08178CD0 + bne @08178CD0 ldr r4, =0x030022c0 ldrh r1, [r4, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08178C38 + beq @08178C38 movs r0, 0x5 bl audio_play bl sub_800A620 @@ -726609,41 +726609,41 @@ _08178BDC: movs r2, 0x87 lsls r2, 3 adds r1, r4, r2 - b _08178E3C + b @08178E3C .align 2, 0 .pool -_08178C38: +@08178C38: adds r0, r2, 0 ands r0, r1 cmp r0, 0 - bne _08178C42 - b _08178E58 -_08178C42: + bne @08178C42 + b @08178E58 +@08178C42: movs r0, 0x5 bl audio_play bl sub_80097E8 movs r0, 0x87 lsls r0, 3 adds r1, r4, r0 - b _08178D1E -_08178C54: + b @08178D1E +@08178C54: bl sub_800B320 lsls r0, 24 cmp r0, 0 - beq _08178D00 + beq @08178D00 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _08178C68 - b _08178E58 -_08178C68: + bne @08178C68 + b @08178E58 +@08178C68: movs r0, 0x2 movs r1, 0x2 bl sub_800A0C8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bne _08178CAC + bne @08178CAC bl sub_800AC34 ldr r4, =0x02021fc4 adds r0, r4, 0 @@ -726660,14 +726660,14 @@ _08178C68: movs r2, 0x87 lsls r2, 3 adds r0, r2 - b _08178CF2 + b @08178CF2 .align 2, 0 .pool -_08178CAC: +@08178CAC: bl sub_8178958 lsls r0, 24 cmp r0, 0 - beq _08178CCC + beq @08178CCC ldr r1, =0x085ee7ce movs r0, 0x1 str r0, [sp] @@ -726675,12 +726675,12 @@ _08178CAC: movs r2, 0x1 movs r3, 0x2 bl sub_8178EC4 - b _08178E34 + b @08178E34 .align 2, 0 .pool -_08178CCC: +@08178CCC: bl sub_80097E8 -_08178CD0: +@08178CD0: ldr r4, =0x02021fc4 adds r0, r4, 0 movs r1, 0x1 @@ -726696,76 +726696,76 @@ _08178CD0: movs r1, 0x87 lsls r1, 3 adds r0, r1 -_08178CF2: +@08178CF2: movs r1, 0xD strb r1, [r0] - b _08178E58 + b @08178E58 .align 2, 0 .pool -_08178D00: +@08178D00: ldr r4, =0x030022c0 ldrh r1, [r4, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _08178D0E - b _08178E58 -_08178D0E: + bne @08178D0E + b @08178E58 +@08178D0E: movs r0, 0x5 bl audio_play bl sub_80097E8 movs r2, 0x87 lsls r2, 3 adds r1, r4, r2 -_08178D1E: +@08178D1E: movs r0, 0xF strb r0, [r1] - b _08178E58 + b @08178E58 .align 2, 0 .pool -_08178D28: +@08178D28: movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - beq _08178D36 - b _08178E58 -_08178D36: - b _08178E34 -_08178D38: + beq @08178D36 + b @08178E58 +@08178D36: + b @08178E34 +@08178D38: bl sub_800A550 lsls r0, 24 cmp r0, 0 - bne _08178D44 - b _08178E58 -_08178D44: + bne @08178D44 + b @08178E58 +@08178D44: bl sub_800A5B4 ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _08178E3C + b @08178E3C .align 2, 0 .pool -_08178D58: +@08178D58: movs r0, 0x87 lsls r0, 3 adds r1, r4, r0 - b _08178E3C -_08178D60: + b @08178E3C +@08178D60: bl sub_800AC34 ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _08178E3C + b @08178E3C .align 2, 0 .pool -_08178D74: +@08178D74: ldr r0, =0x03003124 ldrb r6, [r0] cmp r6, 0 - bne _08178E58 + bne @08178E58 ldr r5, =0x0201c000 adds r0, r5, 0 bl sub_81538A0 @@ -726782,13 +726782,13 @@ _08178D74: bl sub_8178A40 lsls r0, 24 cmp r0, 0 - bne _08178E34 + bne @08178E34 movs r0, 0 bl save_game_when_memory_present - b _08178E34 + b @08178E34 .align 2, 0 .pool -_08178DBC: +@08178DBC: ldr r1, =0x02021fc4 movs r0, 0x1 str r0, [sp] @@ -726800,16 +726800,16 @@ _08178DBC: movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _08178E3C + b @08178E3C .align 2, 0 .pool -_08178DE0: +@08178DE0: movs r0, 0 bl a_pressed_maybe lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0 - bne _08178E58 + bne @08178E58 ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 @@ -726819,61 +726819,61 @@ _08178DE0: strb r1, [r0] ldr r0, =0x0203bcf8 strb r2, [r0] - b _08178E58 + b @08178E58 .align 2, 0 .pool -_08178E0C: +@08178E0C: ldrh r1, [r4, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08178E58 + beq @08178E58 movs r0, 0x5 bl audio_play movs r2, 0x87 lsls r2, 3 adds r1, r4, r2 - b _08178E3C -_08178E24: + b @08178E3C +@08178E24: movs r0, 0x1 negs r0, r0 movs r1, 0 str r1, [sp] movs r2, 0 movs r3, 0x10 -_08178E30: +@08178E30: bl sub_80A1AD4 -_08178E34: +@08178E34: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 -_08178E3C: +@08178E3C: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08178E58 + b @08178E58 .align 2, 0 .pool -_08178E48: +@08178E48: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08178E58 + bne @08178E58 bl do_reset -_08178E58: +@08178E58: ldr r0, =0x030030e0 ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _08178E98 + beq @08178E98 bl sub_800ABBC lsls r0, 24 cmp r0, 0 - bne _08178E98 + bne @08178E98 bl sub_80097E8 ldr r4, =0x02021fc4 adds r0, r4, 0 @@ -726892,7 +726892,7 @@ _08178E58: adds r0, r1 movs r1, 0xD strb r1, [r0] -_08178E98: +@08178E98: bl run_active_tasks bl call_obj_callbacks bl obj_sync_something @@ -726907,7 +726907,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 @@ -726972,7 +726972,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 @@ -727012,7 +727012,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 @@ -727037,7 +727037,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 copy_super_sprites_to_oam bl copy_queue_process @@ -727047,7 +727047,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} @@ -727058,11 +727058,11 @@ sub_8178FDC: @ 8178FDC adds r7, r0, r1 ldrb r0, [r7] cmp r0, 0 - beq _08178FF8 + beq @08178FF8 cmp r0, 0x1 - bne _08178FF8 - b _0817925C -_08178FF8: + bne @08178FF8 + b @0817925C +@08178FF8: movs r0, 0 bl SetVBlankCallback movs r0, 0 @@ -727265,19 +727265,19 @@ _08178FF8: ldrb r0, [r7] adds r0, 0x1 strb r0, [r7] - b _08179272 + b @08179272 .align 2, 0 .pool -_0817925C: +@0817925C: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne _08179272 + bne @08179272 ldr r0, =sub_8179288 + 1 bl set_callback2 ldr r0, =sub_8179454 + 1 bl SetVBlankCallback -_08179272: +@08179272: add sp, 0xC pop {r3} mov r8, r3 @@ -727289,7 +727289,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 @@ -727298,14 +727298,14 @@ sub_8179288: @ 8179288 ldr r1, =0x030061fc ldr r0, [r1] cmp r0, 0 - beq _081792EC + beq @081792EC adds r6, r1, 0 -_0817929C: +@0817929C: ldr r0, [r6] bl sub_81795AC lsls r0, 24 cmp r0, 0 - bne _08179348 + bne @08179348 ldr r4, =0x0203bd0e ldrb r0, [r4] movs r1, 0x11 @@ -727319,7 +727319,7 @@ _0817929C: bl calls_flash_erase_block_3 ldr r0, [r6] cmp r0, 0 - beq _081792DC + beq @081792DC ldrb r0, [r4] movs r1, 0x11 bl Window_FastFillPixels @@ -727327,27 +727327,27 @@ _0817929C: movs r1, 0x1 movs r2, 0 bl sub_8178F44 -_081792DC: +@081792DC: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 ldr r0, [r6] cmp r0, 0 - beq _081792EC + beq @081792EC cmp r5, 0x2 - bls _0817929C -_081792EC: + bls @0817929C +@081792EC: cmp r5, 0x3 - bne _0817931C + bne @0817931C ldr r0, =0x0203bd0e ldrb r0, [r0] movs r1, 0x11 bl Window_FastFillPixels ldr r0, =0x085ec86f - b _08179330 + b @08179330 .align 2, 0 .pool -_0817931C: +@0817931C: ldr r0, =0x0203bd0e ldrb r0, [r0] movs r1, 0x11 @@ -727355,16 +727355,16 @@ _0817931C: ldr r0, =0x03006214 ldr r0, [r0] cmp r0, 0 - bne _08179370 + bne @08179370 ldr r0, =0x085ec94f -_08179330: +@08179330: movs r1, 0x1 movs r2, 0 bl sub_8178F44 - b _0817937A + b @0817937A .align 2, 0 .pool -_08179348: +@08179348: ldr r0, =0x0203bd0e ldrb r0, [r0] movs r1, 0x11 @@ -727375,18 +727375,18 @@ _08179348: bl sub_8178F44 ldr r0, =sub_8179390 + 1 bl set_callback2 - b _08179380 + b @08179380 .align 2, 0 .pool -_08179370: +@08179370: ldr r0, =0x085ec9a2 movs r1, 0x1 movs r2, 0 bl sub_8178F44 -_0817937A: +@0817937A: ldr r0, =sub_81793E0 + 1 bl set_callback2 -_08179380: +@08179380: pop {r4-r6} pop {r0} bx r0 @@ -727395,7 +727395,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 @@ -727405,7 +727405,7 @@ sub_8179390: @ 8179390 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081793C4 + beq @081793C4 ldr r0, =0x0203bd0e ldrb r0, [r0] movs r1, 0x11 @@ -727418,7 +727418,7 @@ sub_8179390: @ 8179390 bl SetVBlankCallback ldr r0, =sub_81793E0 + 1 bl set_callback2 -_081793C4: +@081793C4: pop {r0} bx r0 .align 2, 0 @@ -727426,7 +727426,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 @@ -727437,7 +727437,7 @@ sub_81793E0: @ 81793E0 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08179410 + beq @08179410 movs r0, 0x1 negs r0, r0 str r2, [sp] @@ -727448,7 +727448,7 @@ sub_81793E0: @ 81793E0 bl SetVBlankCallback ldr r0, =sub_8179428 + 1 bl set_callback2 -_08179410: +@08179410: add sp, 0x4 pop {r0} bx r0 @@ -727457,32 +727457,32 @@ _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 lsrs r4, r0, 24 cmp r4, 0 - bne _0817944E + bne @0817944E ldr r5, =0x03006214 ldr r0, [r5] cmp r0, 0 - bne _08179448 + bne @08179448 bl do_reset - b _0817944E + b @0817944E .align 2, 0 .pool -_08179448: +@08179448: bl set_callback2 str r4, [r5] -_0817944E: +@0817944E: pop {r4,r5} pop {r0} bx r0 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] @@ -727507,7 +727507,7 @@ sub_8179454: @ 8179454 ldr r0, =0x0203bcfe ldrh r0, [r0] cmp r0, 0 - beq _081794DC + beq @081794DC ldr r3, =0x085efdac lsls r2, r4, 1 adds r2, r4 @@ -727538,17 +727538,17 @@ sub_8179454: @ 8179454 ands r0, r2 orrs r0, r1 strb r0, [r3] - b _081794E8 + b @081794E8 .align 2, 0 .pool -_081794DC: +@081794DC: ldrh r0, [r5, 0x3C] ldr r1, =0xfffffc00 ands r1, r0 movs r0, 0x1 orrs r1, r0 strh r1, [r5, 0x3C] -_081794E8: +@081794E8: ldr r0, =0x030022f8 movs r1, 0xE0 lsls r1, 19 @@ -727557,10 +727557,10 @@ _081794E8: ldr r1, =0x0203bcfe ldrh r0, [r1, 0x2] cmp r0, 0 - beq _08179500 + beq @08179500 subs r0, 0x1 strh r0, [r1, 0x2] -_08179500: +@08179500: pop {r4,r5} pop {r0} bx r0 @@ -727569,7 +727569,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 @@ -727581,30 +727581,30 @@ sub_8179514: @ 8179514 bl ReadFlash movs r1, 0 ldr r2, =0x000003ff -_0817952C: +@0817952C: ldr r0, [r4] cmp r0, 0 - beq _08179540 + beq @08179540 movs r0, 0x1 - b _0817954E + b @0817954E .align 2, 0 .pool -_08179540: +@08179540: adds r0, r1, 0x1 lsls r0, 16 lsrs r1, r0, 16 adds r4, 0x4 cmp r1, r2 - bls _0817952C + bls @0817952C movs r0, 0 -_0817954E: +@0817954E: pop {r4} pop {r1} bx r1 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} @@ -727614,10 +727614,10 @@ sub_8179554: @ 8179554 ldr r1, =0x00000fff mov r8, r1 ldr r7, =0x03007854 -_08179566: +@08179566: movs r4, 0 adds r5, r0, 0x1 -_0817956A: +@0817956A: ldr r3, [r7] adds r0, r6, 0 adds r1, r4, 0 @@ -727627,7 +727627,7 @@ _0817956A: lsls r0, 16 lsrs r4, r0, 16 cmp r4, r8 - bls _0817956A + bls @0817956A adds r0, r6, 0 bl sub_8179514 lsls r0, 24 @@ -727635,10 +727635,10 @@ _0817956A: lsls r0, r5, 16 lsrs r0, 16 cmp r1, 0 - beq _08179596 + beq @08179596 cmp r0, 0x81 - bls _08179566 -_08179596: + bls @08179566 +@08179596: adds r0, r1, 0 pop {r3} mov r8, r3 @@ -727650,79 +727650,79 @@ _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 -_081795B2: +@081795B2: movs r4, 0x1 lsls r4, r6 adds r0, r5, 0 ands r0, r4 cmp r0, 0 - beq _081795CC + beq @081795CC adds r0, r6, 0 bl sub_8179554 lsls r0, 24 cmp r0, 0 - bne _081795CC + bne @081795CC bics r5, r4 -_081795CC: +@081795CC: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x1F - bls _081795B2 + bls @081795B2 cmp r5, 0 - beq _081795DE + beq @081795DE movs r0, 0x1 - b _081795E0 -_081795DE: + b @081795E0 +@081795DE: movs r0, 0 -_081795E0: +@081795E0: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_81795AC thumb_func_start sub_81795E8 -sub_81795E8: @ 81795E8 +sub_81795E8: ; 81795E8 push {lr} ldr r0, =0x000008af bl flag_check lsls r0, 24 cmp r0, 0 - bne _08179634 + bne @08179634 ldr r0, =0x03005d8c ldr r2, [r0] ldrh r1, [r2, 0x4] ldr r0, =0x00004718 cmp r1, r0 - bne _08179634 + bne @08179634 ldr r1, [r2] ldr r0, =0x0003000a cmp r1, r0 - beq _08179616 + beq @08179616 ldr r0, =0x00030009 cmp r1, r0 - beq _08179616 + beq @08179616 ldr r0, =0x0003000b cmp r1, r0 - bne _08179634 -_08179616: + bne @08179634 +@08179616: movs r0, 0x1 - b _08179636 + b @08179636 .align 2, 0 .pool -_08179634: +@08179634: movs r0, 0 -_08179636: +@08179636: pop {r1} bx r1 thumb_func_end sub_81795E8 thumb_func_start sub_817963C -sub_817963C: @ 817963C +sub_817963C: ; 817963C push {lr} ldr r2, =0x0000022a movs r0, 0x10 @@ -727762,7 +727762,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 @@ -727772,7 +727772,7 @@ sub_81796AC: @ 81796AC movs r1, 0x9D lsls r1, 1 cmp r0, r1 - bne _081796F4 + bne @081796F4 bl calc_player_party_count ldr r0, =0x020244e9 ldrb r1, [r0] @@ -727786,26 +727786,26 @@ sub_81796AC: @ 81796AC bl pokemon_getattr ldr r1, =0x0000017d cmp r0, r1 - bne _081796F4 + bne @081796F4 movs r0, 0x1 - b _081796F6 + b @081796F6 .align 2, 0 .pool -_081796F4: +@081796F4: movs r0, 0 -_081796F6: +@081796F6: pop {r4} pop {r1} bx r1 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 + 1 movs r1, 0x9 @@ -727835,7 +727835,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 + 1 movs r1, 0x9 @@ -727865,7 +727865,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 @@ -727883,7 +727883,7 @@ sub_8179778: @ 8179778 ldrsh r1, [r4, r2] bl __modsi3 cmp r0, 0 - bne _081797D0 + bne @081797D0 strh r0, [r4, 0xA] ldrh r0, [r4, 0xC] adds r0, 0x1 @@ -727900,12 +727900,12 @@ sub_8179778: @ 8179778 movs r2, 0x14 ldrsh r0, [r4, r2] cmp r1, r0 - bne _081797D0 + bne @081797D0 adds r0, r5, 0 bl remove_task bl script_env_2_enable_and_set_ctx_running bl sub_808A2E4 -_081797D0: +@081797D0: pop {r4,r5} pop {r0} bx r0 @@ -727914,7 +727914,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 @@ -727922,40 +727922,40 @@ sub_81797DC: @ 81797DC lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - bne _0817982C + bne @0817982C ldr r0, =0x03005d8c ldr r3, [r0] ldrh r1, [r3, 0x4] movs r0, 0xC3 lsls r0, 3 cmp r1, r0 - bne _0817982C + bne @0817982C ldr r1, [r3] ldr r0, =0x00170006 cmp r1, r0 - beq _08179810 + beq @08179810 ldr r0, =0x00170005 cmp r1, r0 - beq _08179810 + beq @08179810 ldr r0, =0x00170007 cmp r1, r0 - bne _0817982C -_08179810: + bne @0817982C +@08179810: ldr r0, =0x0203bd14 strb r2, [r0] movs r0, 0x1 - b _0817982E + b @0817982E .align 2, 0 .pool -_0817982C: +@0817982C: movs r0, 0 -_0817982E: +@0817982E: pop {r1} bx r1 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 @@ -727971,7 +727971,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 oe_active_list_remove @@ -727981,7 +727981,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 @@ -728022,39 +728022,39 @@ 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 flag_check lsls r0, 24 cmp r0, 0 - bne _08179910 + bne @08179910 ldr r0, =0x03005d8c ldr r2, [r0] ldrh r1, [r2, 0x4] ldr r0, =0x00004418 cmp r1, r0 - bne _08179910 + bne @08179910 ldr r1, [r2] ldr r0, =0x00190008 cmp r1, r0 - bne _08179910 + bne @08179910 ldr r1, =0x0203bd14 movs r0, 0x1 strb r0, [r1] movs r0, 0x1 - b _08179912 + b @08179912 .align 2, 0 .pool -_08179910: +@08179910: movs r0, 0 -_08179912: +@08179912: pop {r1} bx r1 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 @@ -728070,7 +728070,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 oe_active_list_remove @@ -728080,7 +728080,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 @@ -728120,12 +728120,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 @@ -728133,24 +728133,24 @@ sub_81799B8: @ 81799B8 ldr r0, =0x0203bd14 ldrb r0, [r0] cmp r0, 0x1 - bne _081799E4 + bne @081799E4 ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 adds r0, r1 ldr r2, =sub_8179934 + 1 - b _081799F0 + b @081799F0 .align 2, 0 .pool -_081799E4: +@081799E4: ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 adds r0, r1 ldr r2, =sub_8179850 + 1 -_081799F0: +@081799F0: lsrs r1, r2, 16 strh r1, [r0, 0x18] strh r2, [r0, 0x1A] @@ -728162,7 +728162,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 @@ -728172,36 +728172,36 @@ sub_8179A04: @ 8179A04 ldrh r1, [r0, 0x4] ldr r0, =0x00004318 cmp r1, r0 - beq _08179A1A - b _08179B5A -_08179A1A: + beq @08179A1A + b @08179B5A +@08179A1A: ldr r0, =0x000008b1 bl flag_check lsls r0, 24 cmp r0, 0 - beq _08179A28 - b _08179B5A -_08179A28: + beq @08179A28 + b @08179B5A +@08179A28: movs r0, 0x2 bl flag_check lsls r0, 24 cmp r0, 0 - bne _08179A36 - b _08179B5A -_08179A36: + bne @08179A36 + b @08179B5A +@08179A36: movs r0, 0x3 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08179A58 - b _08179B5A + bne @08179A58 + b @08179B5A .align 2, 0 .pool -_08179A54: +@08179A54: movs r0, 0x1 - b _08179B5C -_08179A58: + b @08179B5C +@08179A58: movs r5, 0 mov r8, r4 ldr r4, =0x085efe74 @@ -728210,7 +728210,7 @@ _08179A58: ldr r6, =0x0000403b ldr r1, =0x0000403c mov r9, r1 -_08179A68: +@08179A68: lsls r0, r5, 1 adds r1, r0, r4 add r0, r12 @@ -728221,13 +728221,13 @@ _08179A68: ldrsh r0, [r2, r7] ldrb r1, [r1] cmp r0, r1 - bne _08179B44 + bne @08179B44 movs r1, 0x2 ldrsh r0, [r2, r1] cmp r0, r3 - bne _08179B44 + bne @08179B44 cmp r5, 0xF - bhi _08179AB0 + bhi @08179AB0 adds r0, r6, 0 bl var_get lsls r0, 16 @@ -728238,12 +728238,12 @@ _08179A68: lsrs r1, 16 adds r0, r6, 0 bl var_set - b _08179AF0 + b @08179AF0 .align 2, 0 .pool -_08179AB0: +@08179AB0: cmp r5, 0x1F - bhi _08179AD2 + bhi @08179AD2 mov r0, r9 bl var_get lsls r0, 16 @@ -728256,8 +728256,8 @@ _08179AB0: lsrs r1, 16 mov r0, r9 bl var_set - b _08179AF0 -_08179AD2: + b @08179AF0 +@08179AD2: ldr r4, =0x0000403d adds r0, r4, 0 bl var_get @@ -728271,48 +728271,48 @@ _08179AD2: lsrs r1, 16 adds r0, r4, 0 bl var_set -_08179AF0: +@08179AF0: ldr r0, =0x0000403b bl var_get lsls r0, 16 lsrs r4, r0, 16 ldr r0, =0x0000ffff cmp r4, r0 - bne _08179B5A + bne @08179B5A ldr r0, =0x0000403c bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, r4 - bne _08179B5A + bne @08179B5A ldr r0, =0x0000403d bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0xF - bne _08179B5A + bne @08179B5A ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, [r0] ldr r0, =0x00150008 cmp r1, r0 - beq _08179A54 - b _08179B5A + beq @08179A54 + b @08179B5A .align 2, 0 .pool -_08179B44: +@08179B44: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x23 - bls _08179A68 + bls @08179A68 movs r0, 0x3 bl flag_set movs r0, 0x2 bl flag_clear -_08179B5A: +@08179B5A: movs r0, 0 -_08179B5C: +@08179B5C: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -728322,7 +728322,7 @@ _08179B5C: thumb_func_end sub_8179A04 thumb_func_start sub_8179B68 -sub_8179B68: @ 8179B68 +sub_8179B68: ; 8179B68 push {lr} bl run_active_tasks bl call_obj_callbacks @@ -728334,7 +728334,7 @@ sub_8179B68: @ 8179B68 thumb_func_end sub_8179B68 thumb_func_start sub_8179B84 -sub_8179B84: @ 8179B84 +sub_8179B84: ; 8179B84 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -728344,7 +728344,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 @@ -728353,33 +728353,33 @@ sub_8179B98: @ 8179B98 adds r0, r1 ldrb r0, [r0] cmp r0, 0xD - bls _08179BAC - b _08179D4C -_08179BAC: + bls @08179BAC + b @08179D4C +@08179BAC: lsls r0, 2 - ldr r1, =_08179BC0 + ldr r1, =@08179BC0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08179BC0: - .4byte _08179BF8 - .4byte _08179C20 - .4byte _08179C34 - .4byte _08179C48 - .4byte _08179C4E - .4byte _08179C60 - .4byte _08179C66 - .4byte _08179C78 - .4byte _08179C98 - .4byte _08179CB0 - .4byte _08179CDC - .4byte _08179CF8 - .4byte _08179CFE - .4byte _08179D18 -_08179BF8: +@08179BC0: + .4byte @08179BF8 + .4byte @08179C20 + .4byte @08179C34 + .4byte @08179C48 + .4byte @08179C4E + .4byte @08179C60 + .4byte @08179C66 + .4byte @08179C78 + .4byte @08179C98 + .4byte @08179CB0 + .4byte @08179CDC + .4byte @08179CF8 + .4byte @08179CFE + .4byte @08179D18 +@08179BF8: ldr r4, =0x0203bd18 ldr r0, =0x00001084 bl malloc_and_clear @@ -728390,52 +728390,52 @@ _08179BF8: movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _08179D3A + b @08179D3A .align 2, 0 .pool -_08179C20: +@08179C20: bl sub_80A1A74 ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 - b _08179D30 + b @08179D30 .align 2, 0 .pool -_08179C34: +@08179C34: bl reset_all_obj_data ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _08179D3A + b @08179D3A .align 2, 0 .pool -_08179C48: +@08179C48: bl gpu_pal_allocator_reset - b _08179D32 -_08179C4E: + b @08179D32 +@08179C4E: bl init_uns_table_pokemon_copy ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _08179D3A + b @08179D3A .align 2, 0 .pool -_08179C60: +@08179C60: bl sub_8179D9C - b _08179D32 -_08179C66: + b @08179D32 +@08179C66: bl sub_8179FAC ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _08179D3A + b @08179D3A .align 2, 0 .pool -_08179C78: +@08179C78: ldr r0, =0x0203bc9c ldrb r1, [r0] movs r0, 0x64 @@ -728445,21 +728445,21 @@ _08179C78: bl sub_8179DF4 lsls r0, 24 cmp r0, 0 - beq _08179D64 - b _08179D32 + beq @08179D64 + b @08179D32 .align 2, 0 .pool -_08179C98: +@08179C98: bl sub_817A4A4 ldr r1, =0x0203bd18 ldr r1, [r1] ldr r2, =0x0000105e adds r1, r2 strb r0, [r1] - b _08179D32 + b @08179D32 .align 2, 0 .pool -_08179CB0: +@08179CB0: ldr r0, =0x0203bc9c ldrb r1, [r0] movs r0, 0x64 @@ -728472,10 +728472,10 @@ _08179CB0: ldr r2, =0x0000105d adds r1, r2 strb r0, [r1] - b _08179D32 + b @08179D32 .align 2, 0 .pool -_08179CDC: +@08179CDC: movs r0, 0 movs r1, 0x1 movs r2, 0x1 @@ -728485,13 +728485,13 @@ _08179CDC: movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _08179D3A + b @08179D3A .align 2, 0 .pool -_08179CF8: +@08179CF8: bl sub_817A168 - b _08179D32 -_08179CFE: + b @08179D32 +@08179CFE: movs r0, 0x1 negs r0, r0 movs r1, 0x10 @@ -728501,10 +728501,10 @@ _08179CFE: movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _08179D3A + b @08179D3A .align 2, 0 .pool -_08179D18: +@08179D18: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -728516,32 +728516,32 @@ _08179D18: ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 -_08179D30: +@08179D30: strb r0, [r2, 0x8] -_08179D32: +@08179D32: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 -_08179D3A: +@08179D3A: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08179D64 + b @08179D64 .align 2, 0 .pool -_08179D4C: +@08179D4C: ldr r0, =sub_8179B84 + 1 bl SetVBlankCallback ldr r0, =sub_8179B68 + 1 bl set_callback2 movs r0, 0x1 - b _08179D66 + b @08179D66 .align 2, 0 .pool -_08179D64: +@08179D64: movs r0, 0 -_08179D66: +@08179D66: add sp, 0x4 pop {r4} pop {r1} @@ -728549,31 +728549,31 @@ _08179D66: thumb_func_end sub_8179B98 thumb_func_start sub_8179D70 -sub_8179D70: @ 8179D70 +sub_8179D70: ; 8179D70 push {lr} -_08179D72: +@08179D72: bl sub_81221EC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08179D96 + beq @08179D96 bl sub_8179B98 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08179D96 + beq @08179D96 bl sub_81221AC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08179D72 -_08179D96: + bne @08179D72 +@08179D96: pop {r0} bx r0 thumb_func_end sub_8179D70 thumb_func_start sub_8179D9C -sub_8179D9C: @ 8179D9C +sub_8179D9C: ; 8179D9C push {lr} bl sub_8121DA0 movs r0, 0 @@ -728608,7 +728608,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 @@ -728619,28 +728619,28 @@ sub_8179DF4: @ 8179DF4 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x8 - bls _08179E0C - b _08179FA0 -_08179E0C: + bls @08179E0C + b @08179FA0 +@08179E0C: lsls r0, 2 - ldr r1, =_08179E24 + ldr r1, =@08179E24 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08179E24: - .4byte _08179E48 - .4byte _08179E84 - .4byte _08179EC4 - .4byte _08179ED8 - .4byte _08179EEC - .4byte _08179F00 - .4byte _08179F20 - .4byte _08179F44 - .4byte _08179F78 -_08179E48: +@08179E24: + .4byte @08179E48 + .4byte @08179E84 + .4byte @08179EC4 + .4byte @08179ED8 + .4byte @08179EEC + .4byte @08179F00 + .4byte @08179F20 + .4byte @08179F44 + .4byte @08179F78 +@08179E48: adds r0, r6, 0 movs r1, 0x41 bl pokemon_getattr @@ -728661,10 +728661,10 @@ _08179E48: bl help_system_enable_unless_flashback__sp199 ldr r0, =0x0203bd18 ldr r1, [r0] - b _08179F5E + b @08179F5E .align 2, 0 .pool -_08179E84: +@08179E84: adds r0, r6, 0 movs r1, 0x41 bl pokemon_getattr @@ -728688,34 +728688,34 @@ _08179E84: bl sub_806A068 ldr r0, =0x0203bd18 ldr r1, [r0] - b _08179F5E + b @08179F5E .align 2, 0 .pool -_08179EC4: +@08179EC4: ldr r0, =0x085b26f4 bl gpu_tile_obj_decompress_and_load ldr r0, =0x0203bd18 ldr r1, [r0] - b _08179F5E + b @08179F5E .align 2, 0 .pool -_08179ED8: +@08179ED8: ldr r0, =0x085b26fc bl gpu_pal_obj_decompress_and_apply ldr r0, =0x0203bd18 ldr r1, [r0] - b _08179F5E + b @08179F5E .align 2, 0 .pool -_08179EEC: +@08179EEC: ldr r0, =0x085f06a0 bl gpu_tile_obj_decompress_and_load ldr r0, =0x0203bd18 ldr r1, [r0] - b _08179F5E + b @08179F5E .align 2, 0 .pool -_08179F00: +@08179F00: ldr r0, =0x0203ce7c ldrb r0, [r0] bl sub_8179FEC @@ -728723,10 +728723,10 @@ _08179F00: bl gpu_pal_obj_decompress_and_apply ldr r0, =0x0203bd18 ldr r1, [r0] - b _08179F5E + b @08179F5E .align 2, 0 .pool -_08179F20: +@08179F20: bl reset_temp_tile_data_buffers ldr r1, =0x08d7c440 movs r0, 0 @@ -728737,31 +728737,31 @@ _08179F20: bl decompress_and_copy_tile_data_to_vram ldr r0, =0x0203bd18 ldr r1, [r0] - b _08179F5E + b @08179F5E .align 2, 0 .pool -_08179F44: +@08179F44: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _08179FA0 + beq @08179FA0 ldr r0, =0x08d9ba44 ldr r4, =0x0203bd18 ldr r1, [r4] adds r1, 0x48 bl call_LZZUnCompWram ldr r1, [r4] -_08179F5E: +@08179F5E: ldr r0, =0x0000107e adds r1, r0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _08179FA0 + b @08179FA0 .align 2, 0 .pool -_08179F78: +@08179F78: ldr r0, =0x08d7c9ec movs r1, 0x20 movs r2, 0x60 @@ -728773,12 +728773,12 @@ _08179F78: movs r1, 0 strh r1, [r0] movs r0, 0x1 - b _08179FA2 + b @08179FA2 .align 2, 0 .pool -_08179FA0: +@08179FA0: movs r0, 0 -_08179FA2: +@08179FA2: add sp, 0x4 pop {r4-r6} pop {r1} @@ -728786,7 +728786,7 @@ _08179FA2: thumb_func_end sub_8179DF4 thumb_func_start sub_8179FAC -sub_8179FAC: @ 8179FAC +sub_8179FAC: ; 8179FAC push {lr} ldr r0, =0x085f0558 bl Window_InitFromTemplates @@ -728813,7 +728813,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 @@ -728842,7 +728842,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 @@ -728851,9 +728851,9 @@ sub_817A030: @ 817A030 movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0817A044 - b _0817A154 -_0817A044: + beq @0817A044 + b @0817A154 +@0817A044: ldr r0, =0x03005e00 lsls r2, r4, 2 adds r1, r2, r4 @@ -728864,27 +728864,27 @@ _0817A044: ldr r0, =0x0000010d adds r5, r2, 0 cmp r3, r0 - beq _0817A0C8 + beq @0817A0C8 cmp r3, r0 - bgt _0817A074 + bgt @0817A074 cmp r3, 0 - beq _0817A088 + beq @0817A088 cmp r3, 0xFF - beq _0817A0AC - b _0817A104 + beq @0817A0AC + b @0817A104 .align 2, 0 .pool -_0817A074: +@0817A074: ldr r0, =0x00000119 cmp r3, r0 - beq _0817A0E0 + beq @0817A0E0 adds r0, 0x10 cmp r3, r0 - beq _0817A0F8 - b _0817A104 + beq @0817A0F8 + b @0817A104 .align 2, 0 .pool -_0817A088: +@0817A088: ldr r0, =0x0203bd18 ldr r1, [r0] ldr r2, =0x00001050 @@ -728895,10 +728895,10 @@ _0817A088: adds r0, r1 strh r3, [r0] bl sub_817A5CC - b _0817A104 + b @0817A104 .align 2, 0 .pool -_0817A0AC: +@0817A0AC: ldr r0, =0x0203bd18 ldr r0, [r0] ldr r2, =0x0000105e @@ -728906,36 +728906,36 @@ _0817A0AC: ldrb r0, [r0] ldrb r1, [r1, 0xA] bl sub_817A4F8 - b _0817A104 + b @0817A104 .align 2, 0 .pool -_0817A0C8: +@0817A0C8: bl sub_817A56C ldr r1, =0x0203bd18 ldr r1, [r1] ldr r2, =0x0000105f adds r1, r2 strb r0, [r1] - b _0817A104 + b @0817A104 .align 2, 0 .pool -_0817A0E0: +@0817A0E0: ldr r0, =0x0203bd18 ldr r0, [r0] ldr r1, =0x0000105d adds r0, r1 ldrb r0, [r0] bl sub_817A434 - b _0817A104 + b @0817A104 .align 2, 0 .pool -_0817A0F8: +@0817A0F8: ldr r0, =sub_817A1C4 + 1 str r0, [r1] - b _0817A154 + b @0817A154 .align 2, 0 .pool -_0817A104: +@0817A104: ldr r0, =0x0203bd18 ldr r0, [r0] ldr r2, =0x00001058 @@ -728945,21 +728945,21 @@ _0817A104: ldrh r1, [r1] ldrh r0, [r0] cmp r1, r0 - bcs _0817A128 + bcs @0817A128 bl sub_817A634 - b _0817A138 + b @0817A138 .align 2, 0 .pool -_0817A128: +@0817A128: cmp r1, r0 - bne _0817A138 + bne @0817A138 ldr r0, =0x03005e00 adds r1, r5, r4 lsls r1, 3 adds r1, r0 movs r0, 0xFE strh r0, [r1, 0x8] -_0817A138: +@0817A138: ldr r0, =0x0203bd18 ldr r1, [r0] ldr r0, =0x00001058 @@ -728974,7 +728974,7 @@ _0817A138: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_0817A154: +@0817A154: pop {r4,r5} pop {r0} bx r0 @@ -728983,7 +728983,7 @@ _0817A154: thumb_func_end sub_817A030 thumb_func_start sub_817A168 -sub_817A168: @ 817A168 +sub_817A168: ; 817A168 push {lr} ldr r0, =sub_817A030 + 1 movs r1, 0 @@ -729006,7 +729006,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 @@ -729015,7 +729015,7 @@ sub_817A194: @ 817A194 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - beq _0817A1B6 + beq @0817A1B6 ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -729023,7 +729023,7 @@ sub_817A194: @ 817A194 adds r1, r0 ldr r0, =sub_817A320 + 1 str r0, [r1] -_0817A1B6: +@0817A1B6: pop {r4} pop {r0} bx r0 @@ -729032,7 +729032,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 @@ -729069,27 +729069,27 @@ sub_817A1C4: @ 817A1C4 movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 - bne _0817A248 + bne @0817A248 ldr r0, =0x02021fc4 ldr r1, =0x085e937f bl ExpandTextCodes - b _0817A268 + b @0817A268 .align 2, 0 .pool -_0817A248: +@0817A248: cmp r0, 0 - ble _0817A260 + ble @0817A260 ldr r0, =0x02021fc4 ldr r1, =0x085e9390 bl ExpandTextCodes - b _0817A268 + b @0817A268 .align 2, 0 .pool -_0817A260: +@0817A260: ldr r0, =0x02021fc4 ldr r1, =0x085e93a9 bl ExpandTextCodes -_0817A268: +@0817A268: ldr r2, =0x03003014 ldrb r0, [r2] movs r1, 0x1 @@ -729127,7 +729127,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 @@ -729136,7 +729136,7 @@ sub_817A2C0: @ 817A2C0 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0817A304 + bne @0817A304 bl reset_all_obj_data bl gpu_pal_allocator_reset ldr r0, =0x03007420 @@ -729154,7 +729154,7 @@ sub_817A2C0: @ 817A2C0 ldr r0, [r0] bl free bl sub_805F094 -_0817A304: +@0817A304: pop {r4} pop {r0} bx r0 @@ -729163,7 +729163,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 @@ -729192,7 +729192,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 @@ -729250,7 +729250,7 @@ sub_817A358: @ 817A358 bl sub_806E840 lsls r0, 24 cmp r0, 0 - bne _0817A402 + bne @0817A402 adds r0, r7, 0 adds r0, 0x10 adds r0, r5, r0 @@ -729273,7 +729273,7 @@ sub_817A358: @ 817A358 adds r0, r1 movs r1, 0 strb r1, [r0] -_0817A402: +@0817A402: mov r0, r8 pop {r3,r4} mov r8, r3 @@ -729286,7 +729286,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 @@ -729312,7 +729312,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] @@ -729327,18 +729327,18 @@ sub_817A468: @ 817A468 strh r0, [r4, 0x2E] lsls r0, 16 cmp r0, 0 - bne _0817A48E + bne @0817A48E ldrh r0, [r4, 0x32] movs r1, 0 bl cry_related -_0817A48E: +@0817A48E: movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0x9 - bne _0817A49A + bne @0817A49A ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] -_0817A49A: +@0817A49A: pop {r4} pop {r0} bx r0 @@ -729347,7 +729347,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 @@ -729387,7 +729387,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} @@ -729412,20 +729412,20 @@ sub_817A4F8: @ 817A4F8 orrs r0, r1 strb r0, [r4, 0x1] cmp r5, 0 - bne _0817A540 + bne @0817A540 mov r0, r8 adds r0, 0x10 adds r0, r6, r0 ldr r1, =0x085f0668 - b _0817A548 + b @0817A548 .align 2, 0 .pool -_0817A540: +@0817A540: mov r0, r8 adds r0, 0x10 adds r0, r6, r0 ldr r1, =0x085f066c -_0817A548: +@0817A548: str r1, [r0] lsls r0, r7, 4 adds r0, r7 @@ -729443,7 +729443,7 @@ _0817A548: thumb_func_end sub_817A4F8 thumb_func_start sub_817A56C -sub_817A56C: @ 817A56C +sub_817A56C: ; 817A56C push {lr} ldr r0, =0x085f06a8 movs r1, 0xAE @@ -729468,7 +729468,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] @@ -729484,16 +729484,16 @@ sub_817A5A0: @ 817A5A0 lsls r0, 16 asrs r0, 16 cmp r0, 0xA - bne _0817A5C6 + bne @0817A5C6 adds r0, r2, 0 bl obj_delete_and_free_tiles -_0817A5C6: +@0817A5C6: pop {r0} bx r0 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] @@ -729512,7 +729512,7 @@ sub_817A5CC: @ 817A5CC ldr r5, =0x085eff00 adds r6, r5, 0 subs r6, 0xA -_0817A5F0: +@0817A5F0: lsls r1, r2, 2 adds r1, r2 lsls r1, 2 @@ -729525,7 +729525,7 @@ _0817A5F0: movs r7, 0 ldrsh r0, [r1, r7] cmp r0, 0x1 - beq _0817A61A + beq @0817A61A adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -729533,8 +729533,8 @@ _0817A5F0: lsls r0, 24 lsrs r2, r0, 24 cmp r4, 0x7 - bls _0817A5F0 -_0817A61A: + bls @0817A5F0 +@0817A61A: pop {r4-r7} pop {r0} bx r0 @@ -729543,7 +729543,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] @@ -729551,110 +729551,110 @@ sub_817A634: @ 817A634 adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0x5A - bls _0817A646 - b _0817A90E -_0817A646: + bls @0817A646 + b @0817A90E +@0817A646: lsls r0, 2 - ldr r1, =_0817A65C + ldr r1, =@0817A65C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0817A65C: - .4byte _0817A7C8 - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A818 - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A858 - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A8A2 - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A8FC - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E -_0817A7C8: +@0817A65C: + .4byte @0817A7C8 + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A818 + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A858 + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A8A2 + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A8FC + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E + .4byte @0817A90E +@0817A7C8: ldr r1, =0x085efebc ldr r2, =0x0000105a adds r0, r4, r2 @@ -729681,10 +729681,10 @@ _0817A7C8: adds r1, r4, r2 movs r0, 0xA strb r0, [r1] - b _0817A90E + b @0817A90E .align 2, 0 .pool -_0817A818: +@0817A818: bl sub_817A91C ldr r1, =0x085efebc ldr r3, =0x0000105a @@ -729695,7 +729695,7 @@ _0817A818: adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _0817A850 + beq @0817A850 ldr r2, [r4] ldrb r0, [r2, 0x1] movs r1, 0x3 @@ -729711,12 +729711,12 @@ _0817A818: ldr r1, =0x085f04fc str r1, [r0, 0x10] bl obj_alloc_rotscale_entry -_0817A850: +@0817A850: ldr r0, =0x00001050 adds r1, r4, r0 movs r0, 0x32 strb r0, [r1] -_0817A858: +@0817A858: ldr r1, =0x085efebc ldr r2, =0x0000105a adds r0, r4, r2 @@ -729726,52 +729726,52 @@ _0817A858: adds r2, r0, r1 ldrb r1, [r2] cmp r1, 0 - beq _0817A8C8 + beq @0817A8C8 ldr r3, =0x00001053 adds r0, r4, r3 ldrb r0, [r0] cmp r0, 0 - bne _0817A898 + bne @0817A898 ldr r0, [r4] adds r1, 0xA lsls r1, 24 lsrs r1, 24 bl sub_8008258 - b _0817A8C8 + b @0817A8C8 .align 2, 0 .pool -_0817A898: +@0817A898: ldr r0, [r4] ldrb r1, [r2] bl sub_8008258 - b _0817A8C8 -_0817A8A2: + b @0817A8C8 +@0817A8A2: bl sub_817A9E4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0817A90E + bne @0817A90E ldr r1, =0x00001072 adds r0, r4, r1 movs r2, 0 ldrsh r0, [r0, r2] cmp r0, 0 - bne _0817A8E0 + bne @0817A8E0 ldr r3, =0x00001051 adds r1, r4, r3 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] bl sub_817A91C -_0817A8C8: +@0817A8C8: ldr r0, =0x00001050 adds r1, r4, r0 movs r0, 0x3C strb r0, [r1] - b _0817A90E + b @0817A90E .align 2, 0 .pool -_0817A8E0: +@0817A8E0: ldr r0, [r4] ldrb r0, [r0, 0x3] lsls r0, 26 @@ -729781,10 +729781,10 @@ _0817A8E0: adds r1, r4, r2 movs r0, 0x46 strb r0, [r1] - b _0817A90E + b @0817A90E .align 2, 0 .pool -_0817A8FC: +@0817A8FC: bl sub_817AA3C ldr r3, =0x00001051 adds r0, r4, r3 @@ -729793,7 +729793,7 @@ _0817A8FC: ldr r2, =0x00001050 adds r0, r4, r2 strb r1, [r0] -_0817A90E: +@0817A90E: pop {r4} pop {r0} bx r0 @@ -729802,7 +729802,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] @@ -729814,7 +729814,7 @@ sub_817A91C: @ 817A91C mov r12, r1 ldr r2, =0x00001051 adds r6, r5, r2 -_0817A932: +@0817A932: lsls r2, r4, 1 adds r3, r7, r2 ldrb r1, [r6] @@ -729829,13 +729829,13 @@ _0817A932: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x9 - bls _0817A932 + bls @0817A932 ldr r0, =0x00001068 adds r6, r5, r0 movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 - beq _0817A9DC + beq @0817A9DC movs r2, 0x83 lsls r2, 5 adds r4, r5, r2 @@ -729880,19 +729880,19 @@ _0817A932: ldrh r0, [r4] strh r0, [r6] movs r0, 0 - b _0817A9DE + b @0817A9DE .align 2, 0 .pool -_0817A9DC: +@0817A9DC: movs r0, 0x1 -_0817A9DE: +@0817A9DE: pop {r4-r7} pop {r1} bx r1 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] @@ -729924,21 +729924,21 @@ sub_817A9E4: @ 817A9E4 strh r0, [r4] lsls r0, 16 cmp r0, 0 - beq _0817AA34 + beq @0817AA34 movs r0, 0 - b _0817AA36 + b @0817AA36 .align 2, 0 .pool -_0817AA34: +@0817AA34: movs r0, 0x1 -_0817AA36: +@0817AA36: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_817A9E4 thumb_func_start sub_817AA3C -sub_817AA3C: @ 817AA3C +sub_817AA3C: ; 817AA3C push {lr} ldr r0, =0x0203bd18 ldr r0, [r0] @@ -729952,7 +729952,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 @@ -729997,7 +729997,7 @@ sub_817AA54: @ 817AA54 mov r0, r8 subs r0, 0x1 cmp r5, r0 - bge _0817AB20 + bge @0817AB20 ldr r1, [sp] lsls r0, r1, 16 asrs r0, 16 @@ -730006,7 +730006,7 @@ sub_817AA54: @ 817AA54 lsls r0, r2, 16 asrs r0, 16 mov r10, r0 -_0817AABE: +@0817AABE: mov r3, r9 adds r0, r3, r5 lsls r0, 1 @@ -730053,8 +730053,8 @@ _0817AABE: mov r0, r8 subs r0, 0x1 cmp r5, r0 - blt _0817AABE -_0817AB20: + blt @0817AABE +@0817AB20: mov r0, r9 add r0, r8 subs r0, 0x1 @@ -730086,7 +730086,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 @@ -730124,15 +730124,15 @@ sub_817AB68: @ 817AB68 lsls r1, 16 asrs r1, 16 mov r10, r1 -_0817ABB2: +@0817ABB2: ldr r1, =0x0000106a adds r0, r6, r1 movs r2, 0 ldrsh r0, [r0, r2] cmp r0, 0 - bge _0817ABC0 + bge @0817ABC0 negs r0, r0 -_0817ABC0: +@0817ABC0: lsls r0, 16 ldr r3, =0x00001066 adds r7, r6, r3 @@ -730147,10 +730147,10 @@ _0817ABC0: movs r3, 0 ldrsh r0, [r0, r3] cmp r0, 0 - bge _0817ABE2 + bge @0817ABE2 movs r0, 0x1 str r0, [sp] -_0817ABE2: +@0817ABE2: ldr r1, =0x00001078 adds r0, r6, r1 ldrh r0, [r0] @@ -730160,10 +730160,10 @@ _0817ABE2: lsls r0, 16 lsrs r5, r0, 16 cmp r1, 0 - beq _0817ACB8 + beq @0817ACB8 ldr r0, [sp] cmp r0, 0 - bne _0817AC54 + bne @0817AC54 mov r1, r8 movs r3, 0 ldrsh r0, [r1, r3] @@ -730185,10 +730185,10 @@ _0817ABE2: ldrsh r0, [r1, r2] ldrh r1, [r7] adds r1, r4 - b _0817AC80 + b @0817AC80 .align 2, 0 .pool -_0817AC54: +@0817AC54: mov r1, r8 movs r3, 0 ldrsh r0, [r1, r3] @@ -730210,7 +730210,7 @@ _0817AC54: ldrsh r0, [r1, r2] ldrh r1, [r7] subs r1, r4 -_0817AC80: +@0817AC80: lsls r1, 16 asrs r1, 16 bl cosine @@ -730234,10 +730234,10 @@ _0817AC80: ldrh r0, [r1] subs r0, 0x1 strh r0, [r1] - b _0817ABB2 + b @0817ABB2 .align 2, 0 .pool -_0817ACB8: +@0817ACB8: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -730249,16 +730249,16 @@ _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 cmp r0, 0 - beq _0817ACDC + beq @0817ACDC ldr r0, =sub_817ACE4 + 1 movs r1, 0 bl AddTask -_0817ACDC: +@0817ACDC: pop {r0} bx r0 .align 2, 0 @@ -730266,7 +730266,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 @@ -730307,7 +730307,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 @@ -730316,19 +730316,19 @@ sub_817AD40: @ 817AD40 lsls r0, 24 asrs r4, r0, 24 cmp r4, 0 - beq _0817AD68 + beq @0817AD68 cmp r4, 0 - bgt _0817AD62 + bgt @0817AD62 movs r0, 0x1 negs r0, r0 cmp r4, r0 - beq _0817ADA0 - b _0817ADB2 -_0817AD62: + beq @0817ADA0 + b @0817ADB2 +@0817AD62: cmp r4, 0x1 - beq _0817ADA0 - b _0817ADB2 -_0817AD68: + beq @0817ADA0 + b @0817ADB2 +@0817AD68: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels @@ -730348,17 +730348,17 @@ _0817AD68: adds r0, r1 ldr r1, =sub_817ADC0 + 1 str r1, [r0] - b _0817ADB2 + b @0817ADB2 .align 2, 0 .pool -_0817ADA0: +@0817ADA0: movs r0, 0x5 bl audio_play adds r0, r5, 0 bl remove_task ldr r0, =sub_817AFD4 + 1 bl set_callback2 -_0817ADB2: +@0817ADB2: add sp, 0xC pop {r4,r5} pop {r0} @@ -730368,7 +730368,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 @@ -730386,7 +730386,7 @@ sub_817ADC0: @ 817ADC0 thumb_func_end sub_817ADC0 thumb_func_start sub_817ADE4 -sub_817ADE4: @ 817ADE4 +sub_817ADE4: ; 817ADE4 push {lr} bl run_active_tasks bl fade_and_return_progress_probably @@ -730395,7 +730395,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} @@ -730403,7 +730403,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 @@ -730412,11 +730412,11 @@ sub_817AE00: @ 817AE00 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _0817AE18 + beq @0817AE18 cmp r0, 0x1 - bne _0817AE18 - b _0817AFA4 -_0817AE18: + bne @0817AE18 + b @0817AFA4 +@0817AE18: movs r0, 0 bl SetVBlankCallback movs r0, 0 @@ -730497,7 +730497,7 @@ _0817AE18: ldr r3, =0x06000020 ldr r0, =0x00001111 adds r2, r0, 0 -_0817AED4: +@0817AED4: lsls r0, r1, 1 adds r0, r3 strh r2, [r0] @@ -730505,12 +730505,12 @@ _0817AED4: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0xF - bls _0817AED4 + bls @0817AED4 movs r1, 0 ldr r4, =0x0600f000 movs r3, 0x1 ldr r2, =0x000003ff -_0817AEEC: +@0817AEEC: lsls r0, r1, 1 adds r0, r4 strh r3, [r0] @@ -730518,7 +730518,7 @@ _0817AEEC: lsls r0, 16 lsrs r1, r0, 16 cmp r1, r2 - bls _0817AEEC + bls @0817AEEC bl clear_tasks bl reset_all_obj_data movs r0, 0 @@ -730555,26 +730555,26 @@ _0817AEEC: adds r0, r1 movs r1, 0x1 strb r1, [r0] - b _0817AFC8 + b @0817AFC8 .align 2, 0 .pool -_0817AFA4: +@0817AFA4: bl fade_and_return_progress_probably ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0817AFC8 + bne @0817AFC8 ldr r0, =sub_817ADE4 + 1 bl set_callback2 movs r0, 0x1 - b _0817AFCA + b @0817AFCA .align 2, 0 .pool -_0817AFC8: +@0817AFC8: movs r0, 0 -_0817AFCA: +@0817AFCA: add sp, 0xC pop {r4} pop {r1} @@ -730582,7 +730582,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 @@ -730591,10 +730591,10 @@ sub_817AFD4: @ 817AFD4 adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0 - beq _0817AFEA + beq @0817AFEA cmp r0, 0x1 - beq _0817B008 -_0817AFEA: + beq @0817B008 +@0817AFEA: ldr r0, =0x0000ffff str r0, [sp] movs r1, 0 @@ -730603,20 +730603,20 @@ _0817AFEA: bl sub_80A1AD4 movs r0, 0x1 strb r0, [r4] - b _0817B020 + b @0817B020 .align 2, 0 .pool -_0817B008: +@0817B008: bl fade_and_return_progress_probably ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0817B020 + bne @0817B020 bl Window_FreeMemory bl do_reset -_0817B020: +@0817B020: add sp, 0x4 pop {r4} pop {r0} @@ -730626,7 +730626,7 @@ _0817B020: thumb_func_end sub_817AFD4 thumb_func_start sub_817B02C -sub_817B02C: @ 817B02C +sub_817B02C: ; 817B02C push {lr} ldr r0, =0x085f06c8 bl Window_InitFromTemplates @@ -730650,7 +730650,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 @@ -730665,10 +730665,10 @@ load_intro_part2_graphics: @ 817B064 movs r2, 0x20 bl gpu_pal_apply cmp r4, 0 - beq _0817B08C + beq @0817B08C cmp r4, 0x1 - beq _0817B0EC -_0817B08C: + beq @0817B0EC +@0817B08C: ldr r0, =0x085f0dbc movs r1, 0xC0 lsls r1, 19 @@ -730688,10 +730688,10 @@ _0817B08C: movs r2, 0x20 bl gpu_pal_apply bl sub_817B76C - b _0817B11E + b @0817B11E .align 2, 0 .pool -_0817B0EC: +@0817B0EC: ldr r0, =0x085f1824 movs r1, 0xC0 lsls r1, 19 @@ -730711,7 +730711,7 @@ _0817B0EC: movs r2, 0x20 bl gpu_pal_apply bl sub_817B788 -_0817B11E: +@0817B11E: ldr r1, =0x0203bd28 movs r0, 0 strh r0, [r1] @@ -730726,17 +730726,17 @@ _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 cmp r0, 0x1 - beq _0817B162 + beq @0817B162 cmp r0, 0x1 - ble _0817B162 + ble @0817B162 cmp r0, 0x2 - beq _0817B194 -_0817B162: + beq @0817B194 +@0817B162: ldr r1, =0x00000603 movs r0, 0xE bl lcd_io_set @@ -730750,10 +730750,10 @@ _0817B162: lsls r1, 5 movs r0, 0 bl lcd_io_set - b _0817B1B6 + b @0817B1B6 .align 2, 0 .pool -_0817B194: +@0817B194: ldr r1, =0x00000603 movs r0, 0xE bl lcd_io_set @@ -730767,7 +730767,7 @@ _0817B194: lsls r1, 5 movs r0, 0 bl lcd_io_set -_0817B1B6: +@0817B1B6: pop {r0} bx r0 .align 2, 0 @@ -730775,7 +730775,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 @@ -730786,22 +730786,22 @@ sub_817B1C8: @ 817B1C8 ldr r1, =0x06007800 bl LZ77UnCompVram cmp r4, 0x4 - bhi _0817B214 + bhi @0817B214 lsls r0, r4, 2 - ldr r1, =_0817B200 + ldr r1, =@0817B200 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0817B200: - .4byte _0817B214 - .4byte _0817B270 - .4byte _0817B2DC - .4byte _0817B2DC - .4byte _0817B334 -_0817B214: +@0817B200: + .4byte @0817B214 + .4byte @0817B270 + .4byte @0817B2DC + .4byte @0817B2DC + .4byte @0817B334 +@0817B214: ldr r0, =0x085f06e0 movs r1, 0xF0 movs r2, 0x20 @@ -730823,10 +730823,10 @@ _0817B214: ldr r1, =0x06010000 bl LZ77UnCompVram ldr r0, =0x085f1668 - b _0817B2A6 + b @0817B2A6 .align 2, 0 .pool -_0817B270: +@0817B270: ldr r0, =0x085f0700 movs r1, 0xF0 movs r2, 0x20 @@ -730848,16 +730848,16 @@ _0817B270: ldr r1, =0x06010000 bl LZ77UnCompVram ldr r0, =0x085f1688 -_0817B2A6: +@0817B2A6: movs r1, 0x80 lsls r1, 1 movs r2, 0x20 bl gpu_pal_apply bl sub_817B76C - b _0817B370 + b @0817B370 .align 2, 0 .pool -_0817B2DC: +@0817B2DC: ldr r0, =0x085f0700 movs r1, 0xF0 movs r2, 0x20 @@ -730882,10 +730882,10 @@ _0817B2DC: movs r2, 0x20 bl gpu_pal_apply bl sub_817B788 - b _0817B370 + b @0817B370 .align 2, 0 .pool -_0817B334: +@0817B334: ldr r0, =0x085f0720 movs r1, 0xF0 movs r2, 0x20 @@ -730909,7 +730909,7 @@ _0817B334: movs r2, 0x20 bl gpu_pal_apply bl sub_817B7A4 -_0817B370: +@0817B370: ldr r1, =0x0300301c movs r0, 0x8 strb r0, [r1] @@ -730924,7 +730924,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 @@ -730946,7 +730946,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 @@ -731008,7 +731008,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 @@ -731020,7 +731020,7 @@ sub_817B458: @ 817B458 ldrh r0, [r4, 0xA] lsls r2, r0, 16 cmp r2, 0 - beq _0817B4A0 + beq @0817B4A0 movs r1, 0xC ldrsh r0, [r4, r1] lsls r0, 16 @@ -731043,11 +731043,11 @@ sub_817B458: @ 817B458 lsrs r1, 16 movs r0, 0x16 bl lcd_io_set -_0817B4A0: +@0817B4A0: ldrh r0, [r4, 0x10] lsls r2, r0, 16 cmp r2, 0 - beq _0817B4FA + beq @0817B4FA movs r1, 0x12 ldrsh r0, [r4, r1] lsls r0, 16 @@ -731064,7 +731064,7 @@ _0817B4A0: movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - beq _0817B4F0 + beq @0817B4F0 ldr r2, =0x0203bd24 ldr r0, =0x0203bd26 ldrh r1, [r0] @@ -731074,15 +731074,15 @@ _0817B4A0: lsrs r1, 16 movs r0, 0x1A bl lcd_io_set - b _0817B4FA + b @0817B4FA .align 2, 0 .pool -_0817B4F0: +@0817B4F0: ldr r0, =0x0203bd24 ldrh r1, [r0] movs r0, 0x1A bl lcd_io_set -_0817B4FA: +@0817B4FA: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -731091,7 +731091,7 @@ _0817B4FA: ldrh r0, [r2, 0x16] lsls r3, r0, 16 cmp r3, 0 - beq _0817B532 + beq @0817B532 movs r1, 0x18 ldrsh r0, [r2, r1] lsls r0, 16 @@ -731109,7 +731109,7 @@ _0817B4FA: ldrh r1, [r0] movs r0, 0x1E bl lcd_io_set -_0817B532: +@0817B532: pop {r4,r5} pop {r0} bx r0 @@ -731118,49 +731118,49 @@ _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 lsrs r0, 24 cmp r0, 0x1 - beq _0817B620 + beq @0817B620 cmp r0, 0x1 - ble _0817B554 + ble @0817B554 cmp r0, 0x2 - beq _0817B5B8 -_0817B554: + beq @0817B5B8 +@0817B554: ldr r0, =0x030022c0 ldr r2, [r0, 0x20] movs r0, 0x3 ands r0, r2 cmp r0, 0 - bne _0817B620 + bne @0817B620 ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0817B620 + bne @0817B620 movs r0, 0x4 ands r2, r0 cmp r2, 0 - beq _0817B58C + beq @0817B58C ldr r2, =0x02037714 ldrh r1, [r2, 0x12] mov r0, sp strh r1, [r0] ldrh r1, [r2, 0x14] - b _0817B596 + b @0817B596 .align 2, 0 .pool -_0817B58C: +@0817B58C: ldr r2, =0x02037714 ldrh r1, [r2, 0x14] mov r0, sp strh r1, [r0] ldrh r1, [r2, 0x12] -_0817B596: +@0817B596: adds r0, 0x2 strh r1, [r0] adds r4, r0, 0 @@ -731172,36 +731172,36 @@ _0817B596: movs r1, 0xA movs r2, 0x2 bl gpu_pal_apply - b _0817B620 + b @0817B620 .align 2, 0 .pool -_0817B5B8: +@0817B5B8: ldr r0, =0x030022c0 ldr r2, [r0, 0x20] movs r0, 0x3 ands r0, r2 cmp r0, 0 - bne _0817B620 + bne @0817B620 ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0817B620 + bne @0817B620 movs r0, 0x4 ands r2, r0 cmp r2, 0 - beq _0817B5F8 + beq @0817B5F8 mov r1, sp ldr r2, =0x00003d27 adds r0, r2, 0 strh r0, [r1] adds r1, 0x2 ldr r2, =0x00000295 - b _0817B606 + b @0817B606 .align 2, 0 .pool -_0817B5F8: +@0817B5F8: mov r1, sp movs r2, 0xC7 lsls r2, 2 @@ -731209,7 +731209,7 @@ _0817B5F8: strh r0, [r1] adds r1, 0x2 ldr r2, =0x00003d27 -_0817B606: +@0817B606: adds r0, r2, 0 strh r0, [r1] adds r4, r1, 0 @@ -731221,7 +731221,7 @@ _0817B606: movs r1, 0xD movs r2, 0x2 bl gpu_pal_apply -_0817B620: +@0817B620: add sp, 0x4 pop {r4} pop {r0} @@ -731231,22 +731231,22 @@ _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 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x2 - beq _0817B690 + beq @0817B690 cmp r0, 0 - beq _0817B64C + beq @0817B64C adds r0, r2, 0 bl obj_delete_and_free_tiles - b _0817B690 + b @0817B690 .align 2, 0 .pool -_0817B64C: +@0817B64C: movs r1, 0x20 ldrsh r0, [r2, r1] lsls r0, 16 @@ -731258,29 +731258,29 @@ _0817B64C: strh r1, [r2, 0x20] strh r0, [r2, 0x32] cmp r1, 0xFF - ble _0817B668 + ble @0817B668 ldr r0, =0x0000ffe0 strh r0, [r2, 0x20] -_0817B668: +@0817B668: movs r1, 0x2E ldrsh r0, [r2, r1] cmp r0, 0 - beq _0817B688 + beq @0817B688 ldr r1, =0x0203bd24 ldr r0, =0x0203bd26 ldrh r0, [r0] ldrh r1, [r1] adds r0, r1 - b _0817B68C + b @0817B68C .align 2, 0 .pool -_0817B688: +@0817B688: ldr r0, =0x0203bd24 ldrh r0, [r0] -_0817B68C: +@0817B68C: negs r0, r0 strh r0, [r2, 0x26] -_0817B690: +@0817B690: pop {r0} bx r0 .align 2, 0 @@ -731288,7 +731288,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 @@ -731305,12 +731305,12 @@ sub_817B698: @ 817B698 mov r8, r3 movs r7, 0 cmp r7, r8 - bcs _0817B74E + bcs @0817B74E ldr r0, =0x02020630 mov r10, r0 movs r2, 0x3F mov r9, r2 -_0817B6C2: +@0817B6C2: lsls r6, r7, 3 ldr r0, [sp, 0x4] adds r6, r0 @@ -731377,8 +731377,8 @@ _0817B6C2: lsls r0, 24 lsrs r7, r0, 24 cmp r7, r8 - bcc _0817B6C2 -_0817B74E: + bcc @0817B6C2 +@0817B74E: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -731392,7 +731392,7 @@ _0817B74E: thumb_func_end sub_817B698 thumb_func_start sub_817B76C -sub_817B76C: @ 817B76C +sub_817B76C: ; 817B76C push {lr} ldr r1, =0x085f50a4 ldr r2, =0x085f5094 @@ -731406,7 +731406,7 @@ sub_817B76C: @ 817B76C thumb_func_end sub_817B76C thumb_func_start sub_817B788 -sub_817B788: @ 817B788 +sub_817B788: ; 817B788 push {lr} ldr r1, =0x085f5120 ldr r2, =0x085f5114 @@ -731420,7 +731420,7 @@ sub_817B788: @ 817B788 thumb_func_end sub_817B788 thumb_func_start sub_817B7A4 -sub_817B7A4: @ 817B7A4 +sub_817B7A4: ; 817B7A4 push {lr} ldr r1, =0x085f519c ldr r2, =0x085f5198 @@ -731434,12 +731434,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 @@ -731498,7 +731498,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 @@ -731539,7 +731539,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 @@ -731580,12 +731580,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 @@ -731637,7 +731637,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} @@ -731693,7 +731693,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} @@ -731749,17 +731749,17 @@ 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 ldr r5, =0x085f5458 -_0817BA4C: +@0817BA4C: adds r0, r4, 0 adds r0, 0x14 lsls r0, 24 @@ -731775,7 +731775,7 @@ _0817BA4C: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0xB - bls _0817BA4C + bls @0817BA4C add sp, 0x4 pop {r4,r5} pop {r0} @@ -731785,13 +731785,13 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0x8 - ble _0817BB2A + ble @0817BB2A movs r2, 0x3C ldrsh r0, [r4, r2] adds r1, r0, 0 @@ -731811,9 +731811,9 @@ sub_817BA7C: @ 817BA7C lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _0817BAB6 + bge @0817BAB6 adds r0, 0x3 -_0817BAB6: +@0817BAB6: asrs r0, 2 strh r0, [r4, 0x26] ldrh r0, [r4, 0x3A] @@ -731830,42 +731830,42 @@ _0817BAB6: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0817BAE0 + beq @0817BAE0 ldrh r0, [r4, 0x38] subs r0, 0x1 strh r0, [r4, 0x38] -_0817BAE0: +@0817BAE0: ldrh r0, [r4, 0x3C] adds r0, 0x1 strh r0, [r4, 0x3C] movs r1, 0x26 ldrsh r0, [r4, r1] cmp r0, 0 - ble _0817BAF6 + ble @0817BAF6 adds r1, r4, 0 adds r1, 0x43 movs r0, 0x1 - b _0817BAFC -_0817BAF6: + b @0817BAFC +@0817BAF6: adds r1, r4, 0 adds r1, 0x43 movs r0, 0x14 -_0817BAFC: +@0817BAFC: strb r0, [r1] movs r2, 0x38 ldrsh r0, [r4, r2] cmp r0, 0 - bge _0817BB08 + bge @0817BB08 adds r0, 0x3 -_0817BB08: +@0817BB08: asrs r0, 2 adds r0, 0x14 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x1F - bls _0817BB16 + bls @0817BB16 movs r2, 0x1F -_0817BB16: +@0817BB16: movs r0, 0x1F ands r2, r0 lsls r2, 1 @@ -731875,18 +731875,18 @@ _0817BB16: ands r0, r1 orrs r0, r2 strb r0, [r4, 0x3] - b _0817BB30 -_0817BB2A: + b @0817BB30 +@0817BB2A: adds r0, r4, 0 bl obj_delete_and_free_tiles -_0817BB30: +@0817BB30: pop {r4} pop {r0} bx r0 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 @@ -731898,7 +731898,7 @@ sub_817BB38: @ 817BB38 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _0817BB82 + beq @0817BB82 ldr r4, =0x02020630 lsls r3, r0, 4 adds r3, r0 @@ -731923,7 +731923,7 @@ sub_817BB38: @ 817BB38 adds r3, r4 ldr r0, =sub_817BA7C + 1 str r0, [r3] -_0817BB82: +@0817BB82: pop {r4,r5} pop {r0} bx r0 @@ -731932,13 +731932,13 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0x57 - bgt _0817BBFA + bgt @0817BBFA movs r2, 0x3C ldrsh r0, [r4, r2] adds r1, r0, 0 @@ -731957,9 +731957,9 @@ sub_817BB94: @ 817BB94 lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _0817BBCC + bge @0817BBCC adds r0, 0x3 -_0817BBCC: +@0817BBCC: asrs r0, 2 strh r0, [r4, 0x26] ldrh r0, [r4, 0x3A] @@ -731980,18 +731980,18 @@ _0817BBCC: ldrh r0, [r4, 0x3C] adds r0, 0x1 strh r0, [r4, 0x3C] - b _0817BC00 -_0817BBFA: + b @0817BC00 +@0817BBFA: adds r0, r4, 0 bl obj_delete_and_free_tiles -_0817BC00: +@0817BC00: pop {r4} pop {r0} bx r0 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 @@ -732003,7 +732003,7 @@ sub_817BC08: @ 817BC08 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _0817BC5E + beq @0817BC5E ldr r4, =0x02020630 lsls r3, r0, 4 adds r3, r0 @@ -732034,7 +732034,7 @@ sub_817BC08: @ 817BC08 adds r3, r4 ldr r0, =sub_817BB94 + 1 str r0, [r3] -_0817BC5E: +@0817BC5E: pop {r4,r5} pop {r0} bx r0 @@ -732043,13 +732043,13 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0x8 - ble _0817BCAC + ble @0817BCAC ldrh r0, [r4, 0x3A] lsls r0, 24 lsrs r0, 24 @@ -732071,18 +732071,18 @@ sub_817BC70: @ 817BC70 ldrh r0, [r4, 0x3A] adds r0, 0x4 strh r0, [r4, 0x3A] - b _0817BCB2 -_0817BCAC: + b @0817BCB2 +@0817BCAC: adds r0, r4, 0 bl obj_delete_and_free_tiles -_0817BCB2: +@0817BCB2: pop {r4} pop {r0} bx r0 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 @@ -732096,7 +732096,7 @@ sub_817BCB8: @ 817BCB8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _0817BD0E + beq @0817BD0E ldr r4, =0x02020630 lsls r3, r0, 4 adds r3, r0 @@ -732125,7 +732125,7 @@ sub_817BCB8: @ 817BCB8 adds r3, r4 ldr r0, =sub_817BC70 + 1 str r0, [r3] -_0817BD0E: +@0817BD0E: pop {r4-r6} pop {r0} bx r0 @@ -732134,23 +732134,23 @@ _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] movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne _0817BD34 + bne @0817BD34 ldrh r0, [r4, 0x22] adds r0, 0x1 strh r0, [r4, 0x22] -_0817BD34: +@0817BD34: ldrh r1, [r4, 0x3A] movs r2, 0x3A ldrsh r0, [r4, r2] cmp r0, 0x7F - bgt _0817BDE4 + bgt @0817BDE4 lsls r0, r1, 24 lsrs r0, 24 movs r5, 0x38 @@ -732176,9 +732176,9 @@ _0817BD34: adds r0, r1 lsls r0, 2 cmp r0, 0 - bge _0817BD78 + bge @0817BD78 adds r0, 0x7F -_0817BD78: +@0817BD78: asrs r0, 7 movs r1, 0x1F subs r1, r0 @@ -732187,13 +732187,13 @@ _0817BD78: lsls r0, r3, 16 asrs r0, 16 cmp r0, 0x40 - ble _0817BD94 + ble @0817BD94 adds r1, r4, 0 adds r1, 0x43 movs r0, 0x1 strb r0, [r1] - b _0817BDC4 -_0817BD94: + b @0817BDC4 +@0817BD94: adds r3, r4, 0 adds r3, 0x3E ldrb r1, [r3] @@ -732209,20 +732209,20 @@ _0817BD94: movs r5, 0x3A ldrsh r0, [r4, r5] cmp r0, 0x70 - ble _0817BDC4 + ble @0817BDC4 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0817BDC4 + beq @0817BDC4 ldrb r0, [r3] movs r1, 0x4 orrs r0, r1 strb r0, [r3] -_0817BDC4: +@0817BDC4: cmp r2, 0x13 - bhi _0817BDCA + bhi @0817BDCA movs r2, 0x14 -_0817BDCA: +@0817BDCA: movs r0, 0x1F ands r2, r0 lsls r2, 1 @@ -732235,18 +732235,18 @@ _0817BDCA: ldrh r0, [r4, 0x3C] adds r0, 0x1 strh r0, [r4, 0x3C] - b _0817BDEA -_0817BDE4: + b @0817BDEA +@0817BDE4: adds r0, r4, 0 bl obj_delete_and_free_tiles -_0817BDEA: +@0817BDEA: pop {r4,r5} pop {r0} bx r0 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} @@ -732258,7 +732258,7 @@ sub_817BDF0: @ 817BDF0 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x40 - beq _0817BE60 + beq @0817BE60 bl GenerateRandomNumber ldr r6, =0x02020630 lsls r5, r4, 4 @@ -732299,7 +732299,7 @@ sub_817BDF0: @ 817BDF0 adds r5, r6 ldr r0, =sub_817BD20 + 1 str r0, [r5] -_0817BE60: +@0817BE60: pop {r3} mov r8, r3 pop {r4-r6} @@ -732310,7 +732310,7 @@ _0817BE60: thumb_func_end sub_817BDF0 thumb_func_start sub_817BE78 -sub_817BE78: @ 817BE78 +sub_817BE78: ; 817BE78 push {lr} ldr r0, =0x085f540c bl gpu_tile_obj_decompress_and_load3 @@ -732323,7 +732323,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 @@ -732347,7 +732347,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 @@ -732384,7 +732384,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 @@ -732397,15 +732397,15 @@ sub_817BF14: @ 817BF14 movs r4, 0x26 ldrsh r0, [r1, r4] cmp r0, 0x3F - bgt _0817BF70 + bgt @0817BF70 movs r0, 0x7 ands r0, r2 adds r7, r3, 0 cmp r0, 0 - bne _0817BF5A + bne @0817BF5A movs r4, 0 adds r6, r1, 0 -_0817BF3C: +@0817BF3C: ldrh r1, [r6, 0x26] movs r0, 0x78 ands r0, r1 @@ -732419,8 +732419,8 @@ _0817BF3C: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _0817BF3C -_0817BF5A: + bls @0817BF3C +@0817BF5A: ldr r0, =0x03005e00 adds r1, r7, r5 lsls r1, 3 @@ -732428,15 +732428,15 @@ _0817BF5A: ldrh r0, [r1, 0x26] adds r0, 0x1 strh r0, [r1, 0x26] - b _0817BF78 + b @0817BF78 .align 2, 0 .pool -_0817BF70: +@0817BF70: movs r0, 0x60 strh r0, [r1, 0x26] ldr r0, =sub_817BF84 + 1 str r0, [r1] -_0817BF78: +@0817BF78: pop {r4-r7} pop {r0} bx r0 @@ -732445,7 +732445,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 @@ -732458,23 +732458,23 @@ sub_817BF84: @ 817BF84 movs r4, 0x26 ldrsh r0, [r1, r4] cmp r0, 0 - beq _0817BFA8 + beq @0817BFA8 subs r0, r3, 0x1 strh r0, [r1, 0x26] - b _0817BFAE + b @0817BFAE .align 2, 0 .pool -_0817BFA8: +@0817BFA8: adds r0, r2, 0 bl remove_task -_0817BFAE: +@0817BFAE: pop {r4} pop {r0} bx r0 thumb_func_end sub_817BF84 thumb_func_start sub_817BFB4 -sub_817BFB4: @ 817BFB4 +sub_817BFB4: ; 817BFB4 push {lr} ldr r0, =sub_817BFCC + 1 movs r1, 0 @@ -732488,7 +732488,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 @@ -732513,7 +732513,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 @@ -732525,12 +732525,12 @@ sub_817C000: @ 817C000 movs r3, 0x26 ldrsh r0, [r1, r3] cmp r0, 0x5F - bgt _0817C048 + bgt @0817C048 adds r6, r2, 0 cmp r0, 0x5 - bgt _0817C032 + bgt @0817C032 movs r4, 0 -_0817C020: +@0817C020: lsls r0, r4, 28 lsrs r0, 24 bl sub_817BC08 @@ -732538,8 +732538,8 @@ _0817C020: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x8 - bls _0817C020 -_0817C032: + bls @0817C020 +@0817C032: ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 @@ -732547,13 +732547,13 @@ _0817C032: ldrh r0, [r1, 0x26] adds r0, 0x1 strh r0, [r1, 0x26] - b _0817C04C + b @0817C04C .align 2, 0 .pool -_0817C048: +@0817C048: ldr r0, =sub_817C058 + 1 str r0, [r1] -_0817C04C: +@0817C04C: pop {r4-r6} pop {r0} bx r0 @@ -732562,7 +732562,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 @@ -732572,7 +732572,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 + 1 movs r1, 0 @@ -732586,7 +732586,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 @@ -732611,7 +732611,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 @@ -732623,12 +732623,12 @@ sub_817C0B4: @ 817C0B4 movs r3, 0x26 ldrsh r0, [r1, r3] cmp r0, 0x2F - bgt _0817C124 + bgt @0817C124 adds r6, r2, 0 cmp r0, 0 - bne _0817C0E8 + bne @0817C0E8 movs r4, 0 -_0817C0D4: +@0817C0D4: lsls r0, r4, 28 lsrs r0, 24 movs r1, 0x4 @@ -732637,8 +732637,8 @@ _0817C0D4: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bls _0817C0D4 -_0817C0E8: + bls @0817C0D4 +@0817C0E8: ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 @@ -732646,9 +732646,9 @@ _0817C0E8: movs r2, 0x26 ldrsh r0, [r1, r2] cmp r0, 0x20 - bne _0817C10E + bne @0817C10E movs r4, 0 -_0817C0FA: +@0817C0FA: lsls r0, r4, 28 lsrs r0, 24 movs r1, 0x8 @@ -732657,8 +732657,8 @@ _0817C0FA: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bls _0817C0FA -_0817C10E: + bls @0817C0FA +@0817C10E: ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 @@ -732666,13 +732666,13 @@ _0817C10E: ldrh r0, [r1, 0x26] adds r0, 0x1 strh r0, [r1, 0x26] - b _0817C128 + b @0817C128 .align 2, 0 .pool -_0817C124: +@0817C124: ldr r0, =sub_817C134 + 1 str r0, [r1] -_0817C128: +@0817C128: pop {r4-r6} pop {r0} bx r0 @@ -732681,7 +732681,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 @@ -732691,7 +732691,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 @@ -732715,7 +732715,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 @@ -732753,7 +732753,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 @@ -732766,33 +732766,33 @@ sub_817C1D4: @ 817C1D4 movs r0, 0x26 ldrsh r2, [r1, r0] cmp r2, 0x7F - bgt _0817C250 + bgt @0817C250 adds r0, r2, 0 cmp r0, 0 - beq _0817C210 + beq @0817C210 cmp r0, 0x20 - beq _0817C224 + beq @0817C224 cmp r2, 0x31 - bgt _0817C234 + bgt @0817C234 bl GenerateRandomNumber movs r1, 0x7 ands r0, r1 bl sub_817BDF0 - b _0817C234 + b @0817C234 .align 2, 0 .pool -_0817C210: +@0817C210: movs r4, 0 -_0817C212: +@0817C212: adds r0, r4, 0 bl sub_817BDF0 adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bls _0817C212 - b _0817C234 -_0817C224: + bls @0817C212 + b @0817C234 +@0817C224: ldr r0, =0xffff041c ldr r1, =0x00007fff str r1, [sp] @@ -732800,7 +732800,7 @@ _0817C224: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 -_0817C234: +@0817C234: ldr r0, =0x03005e00 adds r1, r5, r6 lsls r1, 3 @@ -732808,13 +732808,13 @@ _0817C234: ldrh r0, [r1, 0x26] adds r0, 0x1 strh r0, [r1, 0x26] - b _0817C254 + b @0817C254 .align 2, 0 .pool -_0817C250: +@0817C250: ldr r0, =sub_817C260 + 1 str r0, [r1] -_0817C254: +@0817C254: add sp, 0x4 pop {r4-r6} pop {r0} @@ -732824,7 +732824,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 @@ -732833,10 +732833,10 @@ sub_817C260: @ 817C260 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0817C278 + bne @0817C278 adds r0, r2, 0 bl remove_task -_0817C278: +@0817C278: pop {r0} bx r0 .align 2, 0 @@ -732844,7 +732844,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 @@ -732868,7 +732868,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 @@ -732906,7 +732906,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 @@ -732919,33 +732919,33 @@ sub_817C310: @ 817C310 movs r0, 0x26 ldrsh r2, [r1, r0] cmp r2, 0x7F - bgt _0817C38C + bgt @0817C38C adds r0, r2, 0 cmp r0, 0 - beq _0817C34C + beq @0817C34C cmp r0, 0x20 - beq _0817C360 + beq @0817C360 cmp r2, 0x31 - bgt _0817C370 + bgt @0817C370 bl GenerateRandomNumber movs r1, 0x7 ands r0, r1 bl sub_817BDF0 - b _0817C370 + b @0817C370 .align 2, 0 .pool -_0817C34C: +@0817C34C: movs r4, 0 -_0817C34E: +@0817C34E: adds r0, r4, 0 bl sub_817BDF0 adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bls _0817C34E - b _0817C370 -_0817C360: + bls @0817C34E + b @0817C370 +@0817C360: ldr r0, =0xffff0400 ldr r1, =0x00007fff str r1, [sp] @@ -732953,7 +732953,7 @@ _0817C360: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 -_0817C370: +@0817C370: ldr r0, =0x03005e00 adds r1, r5, r6 lsls r1, 3 @@ -732961,13 +732961,13 @@ _0817C370: ldrh r0, [r1, 0x26] adds r0, 0x1 strh r0, [r1, 0x26] - b _0817C390 + b @0817C390 .align 2, 0 .pool -_0817C38C: +@0817C38C: ldr r0, =sub_817C260 + 1 str r0, [r1] -_0817C390: +@0817C390: add sp, 0x4 pop {r4-r6} pop {r0} @@ -732977,12 +732977,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 @@ -732996,7 +732996,7 @@ sub_817C3A0: @ 817C3A0 movs r1, 0 ldr r3, =sub_817C4EC + 1 ldr r2, =0x00007fff -_0817C3BA: +@0817C3BA: lsls r0, r1, 1 add r0, sp adds r0, 0x4 @@ -733005,7 +733005,7 @@ _0817C3BA: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0xF - bls _0817C3BA + bls @0817C3BA adds r0, r3, 0 movs r1, 0 bl AddTask @@ -733137,7 +733137,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 @@ -733157,7 +733157,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 @@ -733169,22 +733169,22 @@ sub_817C510: @ 817C510 movs r1, 0x18 ldrsh r0, [r2, r1] cmp r0, 0 - beq _0817C534 + beq @0817C534 adds r0, r3, 0 bl sub_817C72C - b _0817C556 + b @0817C556 .align 2, 0 .pool -_0817C534: +@0817C534: ldrh r1, [r2, 0x14] movs r4, 0x14 ldrsh r0, [r2, r4] cmp r0, 0x80 - bne _0817C546 + bne @0817C546 adds r0, r3, 0 bl sub_817C67C - b _0817C556 -_0817C546: + b @0817C556 +@0817C546: adds r0, r1, 0x2 strh r0, [r2, 0x14] ldrh r0, [r2, 0x12] @@ -733193,7 +733193,7 @@ _0817C546: strh r0, [r2, 0x12] ldr r0, =sub_817C560 + 1 str r0, [r2] -_0817C556: +@0817C556: pop {r4} pop {r0} bx r0 @@ -733202,7 +733202,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 @@ -733216,18 +733216,18 @@ sub_817C560: @ 817C560 ldrsh r0, [r2, r3] adds r5, r1, 0 cmp r0, 0 - beq _0817C58C + beq @0817C58C ldr r0, =sub_817C72C + 1 str r0, [r2] - b _0817C670 + b @0817C670 .align 2, 0 .pool -_0817C58C: +@0817C58C: movs r6, 0 movs r7, 0x12 ldrsh r0, [r2, r7] cmp r0, 0 - bne _0817C5DC + bne @0817C5DC movs r0, 0xE ldrsh r1, [r2, r0] movs r3, 0x14 @@ -733236,16 +733236,16 @@ _0817C58C: lsls r3, 1 subs r0, r3, r0 cmp r1, r0 - bge _0817C5B2 + bge @0817C5B2 ldrh r0, [r2, 0x14] ldrh r7, [r2, 0xE] adds r0, r7 strh r0, [r2, 0xE] - b _0817C5B6 -_0817C5B2: + b @0817C5B6 +@0817C5B2: strh r3, [r2, 0xE] movs r6, 0x1 -_0817C5B6: +@0817C5B6: lsls r2, r4, 2 adds r0, r2, r4 lsls r0, 3 @@ -733256,17 +733256,17 @@ _0817C5B6: ldrsh r0, [r3, r7] adds r0, 0x10 cmp r1, r0 - ble _0817C5D6 + ble @0817C5D6 ldrh r0, [r3, 0x10] ldrh r1, [r3, 0x14] subs r0, r1 strh r0, [r3, 0x10] - b _0817C626 -_0817C5D6: + b @0817C626 +@0817C5D6: movs r0, 0x10 strh r0, [r3, 0x10] - b _0817C620 -_0817C5DC: + b @0817C620 +@0817C5DC: movs r0, 0x10 ldrsh r1, [r2, r0] movs r3, 0x14 @@ -733275,16 +733275,16 @@ _0817C5DC: lsls r3, 1 subs r0, r3, r0 cmp r1, r0 - bge _0817C5F8 + bge @0817C5F8 ldrh r0, [r2, 0x14] ldrh r7, [r2, 0x10] adds r0, r7 strh r0, [r2, 0x10] - b _0817C5FC -_0817C5F8: + b @0817C5FC +@0817C5F8: strh r3, [r2, 0x10] movs r6, 0x1 -_0817C5FC: +@0817C5FC: lsls r2, r4, 2 adds r0, r2, r4 lsls r0, 3 @@ -733295,20 +733295,20 @@ _0817C5FC: ldrsh r0, [r3, r7] adds r0, 0x10 cmp r1, r0 - ble _0817C61C + ble @0817C61C ldrh r0, [r3, 0xE] ldrh r1, [r3, 0x14] subs r0, r1 strh r0, [r3, 0xE] - b _0817C626 -_0817C61C: + b @0817C626 +@0817C61C: movs r0, 0x10 strh r0, [r3, 0xE] -_0817C620: +@0817C620: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_0817C626: +@0817C626: adds r0, r2, r4 lsls r0, 3 adds r5, r0, r5 @@ -733339,10 +733339,10 @@ _0817C626: movs r3, 0 bl rotscale_set_direct cmp r6, 0x2 - bne _0817C670 + bne @0817C670 ldr r0, =sub_817C510 + 1 str r0, [r5] -_0817C670: +@0817C670: add sp, 0x4 pop {r4-r7} pop {r0} @@ -733352,7 +733352,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} @@ -733441,7 +733441,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} @@ -733530,7 +733530,7 @@ sub_817C72C: @ 817C72C thumb_func_end sub_817C72C thumb_func_start sub_817C7DC -sub_817C7DC: @ 817C7DC +sub_817C7DC: ; 817C7DC ldr r2, =0x0860a320 lsls r0, 2 adds r0, r2 @@ -733545,7 +733545,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 @@ -733553,49 +733553,49 @@ sub_817C7F4: @ 817C7F4 bl sub_811EB10 lsls r0, 24 cmp r0, 0 - beq _0817C810 + beq @0817C810 ldr r0, =0x0860a3ac - b _0817C84E + b @0817C84E .align 2, 0 .pool -_0817C810: +@0817C810: lsrs r0, r4, 25 ldr r2, =0x000001ff ands r2, r5 cmp r0, 0x13 - bhi _0817C828 + bhi @0817C828 cmp r0, 0x12 - bcs _0817C834 + bcs @0817C834 cmp r0, 0 - beq _0817C82C - b _0817C83C + beq @0817C82C + b @0817C83C .align 2, 0 .pool -_0817C828: +@0817C828: cmp r0, 0x15 - bne _0817C83C -_0817C82C: + bne @0817C83C +@0817C82C: ldr r1, =0x085f5494 - b _0817C844 + b @0817C844 .align 2, 0 .pool -_0817C834: +@0817C834: ldr r1, =0x085fa1d8 - b _0817C844 + b @0817C844 .align 2, 0 .pool -_0817C83C: +@0817C83C: ldr r1, =0x0860a168 lsls r0, 2 adds r0, r1 ldr r1, [r0] -_0817C844: +@0817C844: lsls r0, r2, 1 adds r0, r2 lsls r0, 4 adds r1, r0 adds r0, r1, 0 -_0817C84E: +@0817C84E: pop {r4,r5} pop {r1} bx r1 @@ -733604,7 +733604,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} @@ -733618,13 +733618,13 @@ sub_817C858: @ 817C858 mov r8, r0 adds r4, r5, 0 adds r4, 0x18 -_0817C872: +@0817C872: lsls r0, r6, 3 ldr r1, [r5, 0x30] adds r2, r1, r0 ldrb r0, [r2] cmp r0, 0xFF - beq _0817C8A0 + beq @0817C8A0 movs r1, 0x1 ldrsb r1, [r2, r1] lsls r0, 2 @@ -733641,11 +733641,11 @@ _0817C872: ldrh r1, [r5, 0x4] adds r0, r1 strh r0, [r5, 0x4] -_0817C8A0: +@0817C8A0: adds r4, 0x4 adds r6, 0x1 cmp r6, 0x5 - ble _0817C872 + ble @0817C872 movs r0, 0 strb r0, [r5, 0x1] strh r0, [r5, 0xA] @@ -733659,7 +733659,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] @@ -733667,12 +733667,12 @@ sub_817C8BC: @ 817C8BC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0817C8D8 + beq @0817C8D8 movs r0, 0 - b _0817C8E6 + b @0817C8E6 .align 2, 0 .pool -_0817C8D8: +@0817C8D8: ldr r1, =0x03005db0 ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] @@ -733680,7 +733680,7 @@ _0817C8D8: ldr r0, =hm_teleport_run_dp02scr + 1 str r0, [r1] movs r0, 0x1 -_0817C8E6: +@0817C8E6: pop {r1} bx r1 .align 2, 0 @@ -733688,7 +733688,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 new_game movs r0, 0x3F @@ -733705,7 +733705,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 @@ -733729,7 +733729,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 oe_active_list_remove @@ -733739,7 +733739,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 @@ -733754,14 +733754,14 @@ sub_817C95C: @ 817C95C movs r1, 0x2 ands r0, r1 cmp r0, 0 - bne _0817C988 + bne @0817C988 ldr r0, [sp] cmp r0, 0x1B - beq _0817C988 + beq @0817C988 cmp r0, 0xDD - beq _0817C988 - bl _0817E0A6 -_0817C988: + beq @0817C988 + bl @0817E0A6 +@0817C988: ldr r0, =0x0202449c ldr r0, [r0] movs r1, 0x81 @@ -733791,7 +733791,7 @@ _0817C988: lsrs r0, 24 str r0, [sp, 0x4] cmp r4, 0 - bne _0817CA00 + bne @0817CA00 ldr r2, =0x0202406e ldrb r0, [r5] lsls r0, 1 @@ -733800,10 +733800,10 @@ _0817C988: movs r0, 0x64 muls r1, r0 ldr r0, =0x020244ec - b _0817CA10 + b @0817CA10 .align 2, 0 .pool -_0817CA00: +@0817CA00: ldr r2, =0x0202406e ldrb r0, [r5] lsls r0, 1 @@ -733812,11 +733812,11 @@ _0817CA00: movs r0, 0x64 muls r1, r0 ldr r0, =0x02024744 -_0817CA10: +@0817CA10: adds r1, r0 str r1, [sp, 0x8] cmp r6, 0 - bne _0817CA3C + bne @0817CA3C ldr r0, =0x0202420c ldrb r0, [r0] lsls r0, 1 @@ -733825,10 +733825,10 @@ _0817CA10: movs r0, 0x64 muls r1, r0 ldr r0, =0x020244ec - b _0817CA4C + b @0817CA4C .align 2, 0 .pool -_0817CA3C: +@0817CA3C: ldr r0, =0x0202420c ldrb r0, [r0] lsls r0, 1 @@ -733837,7 +733837,7 @@ _0817CA3C: movs r0, 0x64 muls r1, r0 ldr r0, =0x02024744 -_0817CA4C: +@0817CA4C: adds r1, r0 str r1, [sp, 0xC] ldr r0, =0x0202420b @@ -733850,15 +733850,15 @@ _0817CA4C: lsrs r0, 24 mov r10, r0 cmp r0, 0x3 - bls _0817CA9C + bls @0817CA9C ldr r0, [sp] bl sub_817E0B8 lsls r0, 24 cmp r0, 0 - beq _0817CA9C + beq @0817CA9C ldr r2, [sp] cmp r2, 0xC - bls _0817CA9C + bls @0817CA9C lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -733866,10 +733866,10 @@ _0817CA4C: adds r0, 0x57 ldrb r1, [r0] movs r2, 0x1E - bl _0817E0A2 + bl @0817E0A2 .align 2, 0 .pool -_0817CA9C: +@0817CA9C: ldr r0, =0x0202420b ldrb r0, [r0] bl battle_get_per_side_status @@ -733891,372 +733891,372 @@ _0817CA9C: movs r0, 0xB0 lsls r0, 1 cmp r1, r0 - bls _0817CAD2 - bl _0817E0A6 -_0817CAD2: + bls @0817CAD2 + bl @0817E0A6 +@0817CAD2: lsls r0, r1, 2 - ldr r1, =_0817CAEC + ldr r1, =@0817CAEC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0817CAEC: - .4byte _0817DD7A - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817D070 - .4byte _0817DD74 - .4byte _0817DD80 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817DA68 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817D7D8 - .4byte _0817E0A6 - .4byte _0817D8A4 - .4byte _0817E0A6 - .4byte _0817D838 - .4byte _0817E0A6 - .4byte _0817D704 - .4byte _0817E0A6 - .4byte _0817D76C - .4byte _0817DB24 - .4byte _0817E0A6 - .4byte _0817DB90 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817D9C2 - .4byte _0817E0A6 - .4byte _0817DA24 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817DBD4 - .4byte _0817E0A6 - .4byte _0817D94C - .4byte _0817E0A6 - .4byte _0817D994 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E040 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817DE10 - .4byte _0817DDC8 - .4byte _0817DEDC - .4byte _0817DF24 - .4byte _0817DF4E - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817D65E - .4byte _0817D65E - .4byte _0817D65E - .4byte _0817D65E - .4byte _0817D698 - .4byte _0817E0A6 - .4byte _0817E08E - .4byte _0817DF70 - .4byte _0817DFBC - .4byte _0817E0A6 - .4byte _0817E08E - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817D53C - .4byte _0817E0A6 - .4byte _0817D584 - .4byte _0817DACC - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817D3A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817D296 - .4byte _0817D2E4 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817D5CE - .4byte _0817D608 - .4byte _0817D498 - .4byte _0817D4E0 - .4byte _0817DC62 - .4byte _0817DC98 - .4byte _0817E0A6 - .4byte _0817D1B8 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817DCDC - .4byte _0817E0A6 - .4byte _0817D0DC - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817D1E0 - .4byte _0817D314 - .4byte _0817D354 - .4byte _0817D372 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817D216 - .4byte _0817D260 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817D3C0 - .4byte _0817D3F2 - .4byte _0817D440 - .4byte _0817D45C - .4byte _0817D3B8 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817D098 - .4byte _0817D0D4 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817DC20 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817D16C - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817DD38 - .4byte _0817DCFC - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817D65E - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817D124 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817E0A6 - .4byte _0817DE58 - .4byte _0817DDC8 - .4byte _0817DE10 - .4byte _0817DFE6 -_0817D070: +@0817CAEC: + .4byte @0817DD7A + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817D070 + .4byte @0817DD74 + .4byte @0817DD80 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817DA68 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817D7D8 + .4byte @0817E0A6 + .4byte @0817D8A4 + .4byte @0817E0A6 + .4byte @0817D838 + .4byte @0817E0A6 + .4byte @0817D704 + .4byte @0817E0A6 + .4byte @0817D76C + .4byte @0817DB24 + .4byte @0817E0A6 + .4byte @0817DB90 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817D9C2 + .4byte @0817E0A6 + .4byte @0817DA24 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817DBD4 + .4byte @0817E0A6 + .4byte @0817D94C + .4byte @0817E0A6 + .4byte @0817D994 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E040 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817DE10 + .4byte @0817DDC8 + .4byte @0817DEDC + .4byte @0817DF24 + .4byte @0817DF4E + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817D65E + .4byte @0817D65E + .4byte @0817D65E + .4byte @0817D65E + .4byte @0817D698 + .4byte @0817E0A6 + .4byte @0817E08E + .4byte @0817DF70 + .4byte @0817DFBC + .4byte @0817E0A6 + .4byte @0817E08E + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817D53C + .4byte @0817E0A6 + .4byte @0817D584 + .4byte @0817DACC + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817D3A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817D296 + .4byte @0817D2E4 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817D5CE + .4byte @0817D608 + .4byte @0817D498 + .4byte @0817D4E0 + .4byte @0817DC62 + .4byte @0817DC98 + .4byte @0817E0A6 + .4byte @0817D1B8 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817DCDC + .4byte @0817E0A6 + .4byte @0817D0DC + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817D1E0 + .4byte @0817D314 + .4byte @0817D354 + .4byte @0817D372 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817D216 + .4byte @0817D260 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817D3C0 + .4byte @0817D3F2 + .4byte @0817D440 + .4byte @0817D45C + .4byte @0817D3B8 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817D098 + .4byte @0817D0D4 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817DC20 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817D16C + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817DD38 + .4byte @0817DCFC + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817D65E + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817D124 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817E0A6 + .4byte @0817DE58 + .4byte @0817DDC8 + .4byte @0817DE10 + .4byte @0817DFE6 +@0817D070: movs r0, 0x1 mov r1, r10 movs r2, 0x2 @@ -734267,14 +734267,14 @@ _0817D070: movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _0817D08C - bl _0817E0A6 -_0817D08C: + beq @0817D08C + bl @0817E0A6 +@0817D08C: bl sub_817EECC - bl _0817E0A6 + bl @0817E0A6 .align 2, 0 .pool -_0817D098: +@0817D098: movs r0, 0x1 mov r1, r10 movs r2, 0x1 @@ -734285,27 +734285,27 @@ _0817D098: movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _0817D0B4 - bl _0817E0A6 -_0817D0B4: + beq @0817D0B4 + bl @0817E0A6 +@0817D0B4: ldr r0, [sp, 0xC] movs r1, 0x39 movs r2, 0 bl pokemon_getattr cmp r0, 0 - bne _0817D0C6 - bl _0817E0A6 -_0817D0C6: + bne @0817D0C6 + bl @0817E0A6 +@0817D0C6: bl sub_817EECC - bl _0817E0A6 + bl @0817E0A6 .align 2, 0 .pool -_0817D0D4: +@0817D0D4: movs r0, 0x1 mov r1, r10 movs r2, 0 - b _0817D48E -_0817D0DC: + b @0817D48E +@0817D0DC: lsls r3, r4, 1 adds r3, r4 lsls r3, 2 @@ -734333,10 +734333,10 @@ _0817D0DC: ldrb r2, [r3] movs r0, 0xD negs r0, r0 - bl _0817DC0C + bl @0817DC0C .align 2, 0 .pool -_0817D124: +@0817D124: lsls r2, r4, 1 adds r2, r4 lsls r2, 2 @@ -734367,10 +734367,10 @@ _0817D124: ldrb r3, [r2] movs r0, 0x31 negs r0, r0 - bl _0817DFAA + bl @0817DFAA .align 2, 0 .pool -_0817D16C: +@0817D16C: lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -734403,16 +734403,16 @@ _0817D16C: adds r2, 0x58 ldrb r0, [r2] movs r1, 0x40 - bl _0817DFAC + bl @0817DFAC .align 2, 0 .pool -_0817D1B8: +@0817D1B8: ldr r1, =0x02022f5c ldrb r0, [r1] cmp r0, 0 - beq _0817D1C4 - bl _0817E0A6 -_0817D1C4: + beq @0817D1C4 + bl @0817E0A6 +@0817D1C4: lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -734423,10 +734423,10 @@ _0817D1C4: negs r1, r1 ands r1, r2 movs r2, 0x14 - bl _0817E0A2 + bl @0817E0A2 .align 2, 0 .pool -_0817D1E0: +@0817D1E0: lsls r0, r6, 1 adds r0, r6 lsls r0, 2 @@ -734437,9 +734437,9 @@ _0817D1E0: lsls r0, 29 lsrs r0, 29 cmp r0, 0 - bne _0817D1FA - bl _0817E0A6 -_0817D1FA: + bne @0817D1FA + bl @0817E0A6 +@0817D1FA: adds r2, r6, 0 subs r1, r0, 0x1 lsls r1, 2 @@ -734452,8 +734452,8 @@ _0817D1FA: lsls r3, 24 lsrs r3, 24 movs r0, 0x2 - bl _0817DB10 -_0817D216: + bl @0817DB10 +@0817D216: lsls r2, r4, 1 adds r2, r4 lsls r2, 2 @@ -734484,10 +734484,10 @@ _0817D216: ldrb r3, [r2] movs r0, 0xD negs r0, r0 - bl _0817DFAA + bl @0817DFAA .align 2, 0 .pool -_0817D260: +@0817D260: lsls r0, r6, 1 adds r0, r6 lsls r0, 2 @@ -734498,9 +734498,9 @@ _0817D260: lsls r0, 26 lsrs r0, 29 cmp r0, 0 - bne _0817D27A - bl _0817E0A6 -_0817D27A: + bne @0817D27A + bl @0817E0A6 +@0817D27A: adds r2, r6, 0 subs r1, r0, 0x1 lsls r1, 2 @@ -734513,8 +734513,8 @@ _0817D27A: lsls r3, 24 lsrs r3, 24 movs r0, 0x2 - bl _0817DBC2 -_0817D296: + bl @0817DBC2 +@0817D296: lsls r2, r4, 1 adds r2, r4 lsls r2, 2 @@ -734545,10 +734545,10 @@ _0817D296: ands r0, r3 orrs r0, r1 strh r0, [r2] - bl _0817E0A6 + bl @0817E0A6 .align 2, 0 .pool -_0817D2E4: +@0817D2E4: lsls r0, r6, 1 adds r0, r6 lsls r0, 2 @@ -734558,9 +734558,9 @@ _0817D2E4: lsls r0, 25 lsrs r0, 29 cmp r0, 0 - bne _0817D2FC - bl _0817E0A6 -_0817D2FC: + bne @0817D2FC + bl @0817E0A6 +@0817D2FC: lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -734571,8 +734571,8 @@ _0817D2FC: negs r1, r1 ands r1, r2 movs r2, 0x16 - bl _0817E0A2 -_0817D314: + bl @0817E0A2 +@0817D314: mov r2, r8 lsls r3, r2, 3 lsls r0, r4, 4 @@ -734599,10 +734599,10 @@ _0817D314: lsls r1, 3 movs r2, 0x19 negs r2, r2 - bl _0817DC0C + bl @0817DC0C .align 2, 0 .pool -_0817D354: +@0817D354: mov r1, r8 lsls r0, r1, 3 lsls r1, r4, 4 @@ -734613,12 +734613,12 @@ _0817D354: lsls r0, r1, 29 lsrs r0, 29 cmp r0, 0 - bne _0817D36E - bl _0817E0A6 -_0817D36E: + bne @0817D36E + bl @0817E0A6 +@0817D36E: adds r2, r4, 0 - b _0817D38C -_0817D372: + b @0817D38C +@0817D372: lsls r0, r5, 3 lsls r1, r6, 4 adds r0, r1 @@ -734628,11 +734628,11 @@ _0817D372: lsls r0, r1, 29 lsrs r0, 29 cmp r0, 0 - bne _0817D38A - bl _0817E0A6 -_0817D38A: + bne @0817D38A + bl @0817E0A6 +@0817D38A: adds r2, r6, 0 -_0817D38C: +@0817D38C: subs r0, 0x1 lsls r0, 2 lsls r3, r1, 27 @@ -734643,124 +734643,124 @@ _0817D38C: movs r0, 0x2 movs r1, 0x6 bl sub_817E684 - bl _0817E0A6 -_0817D3A6: + bl @0817E0A6 +@0817D3A6: ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0xB3 movs r1, 0x1 - bl _0817E0A4 + bl @0817E0A4 .align 2, 0 .pool -_0817D3B8: +@0817D3B8: movs r0, 0x12 mov r1, r10 movs r2, 0 - b _0817D48E -_0817D3C0: + b @0817D48E +@0817D3C0: ldr r0, =0x02022f58 ldrb r2, [r0, 0x2] cmp r2, 0 - bne _0817D3CC - bl _0817E0A6 -_0817D3CC: + bne @0817D3CC + bl @0817E0A6 +@0817D3CC: ldr r1, =0x02022f6a ldrh r0, [r1] cmp r0, 0xD1 - bne _0817D3E8 + bne @0817D3E8 subs r2, 0x1 lsls r2, 24 lsrs r2, 24 movs r0, 0x17 - b _0817D48C + b @0817D48C .align 2, 0 .pool -_0817D3E8: +@0817D3E8: subs r2, 0x1 lsls r2, 24 lsrs r2, 24 movs r0, 0x16 - b _0817D48C -_0817D3F2: + b @0817D48C +@0817D3F2: ldr r0, =0x02022f58 ldrb r2, [r0, 0x2] cmp r2, 0 - bne _0817D3FE - bl _0817E0A6 -_0817D3FE: + bne @0817D3FE + bl @0817E0A6 +@0817D3FE: ldr r0, =0x0202420b ldr r1, =0x0202420c ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bne _0817D436 + bne @0817D436 ldr r1, =0x02022f6a ldrh r0, [r1] cmp r0, 0xD1 - bne _0817D42C + bne @0817D42C subs r2, 0x1 lsls r2, 24 lsrs r2, 24 movs r0, 0x17 - b _0817D48C + b @0817D48C .align 2, 0 .pool -_0817D42C: +@0817D42C: subs r2, 0x1 lsls r2, 24 lsrs r2, 24 movs r0, 0x16 - b _0817D48C -_0817D436: + b @0817D48C +@0817D436: subs r2, 0x1 lsls r2, 24 lsrs r2, 24 movs r0, 0x1B - b _0817D48C -_0817D440: + b @0817D48C +@0817D440: ldr r0, =0x02022f58 ldrb r2, [r0, 0x2] cmp r2, 0 - bne _0817D44C - bl _0817E0A6 -_0817D44C: + bne @0817D44C + bl @0817E0A6 +@0817D44C: subs r2, 0x1 lsls r2, 24 lsrs r2, 24 movs r0, 0x18 - b _0817D48C + b @0817D48C .align 2, 0 .pool -_0817D45C: +@0817D45C: ldr r0, =0x02022f58 ldrb r2, [r0, 0x2] cmp r2, 0 - bne _0817D468 - bl _0817E0A6 -_0817D468: + bne @0817D468 + bl @0817E0A6 +@0817D468: ldr r1, =0x02022f6a ldrh r0, [r1] cmp r0, 0xD3 - bne _0817D484 + bne @0817D484 subs r2, 0x1 lsls r2, 24 lsrs r2, 24 movs r0, 0x1A - b _0817D48C + b @0817D48C .align 2, 0 .pool -_0817D484: +@0817D484: subs r2, 0x1 lsls r2, 24 lsrs r2, 24 movs r0, 0x19 -_0817D48C: +@0817D48C: mov r1, r10 -_0817D48E: +@0817D48E: movs r3, 0 bl sub_817E684 - bl _0817E0A6 -_0817D498: + bl @0817E0A6 +@0817D498: lsls r2, r5, 3 lsls r0, r6, 4 adds r2, r0 @@ -734790,18 +734790,18 @@ _0817D498: ldrb r3, [r2] movs r0, 0xD negs r0, r0 - bl _0817DFAA + bl @0817DFAA .align 2, 0 .pool -_0817D4E0: +@0817D4E0: ldr r0, [sp, 0x8] movs r1, 0x39 movs r2, 0 bl pokemon_getattr cmp r0, 0 - bne _0817D4F2 - bl _0817E0A6 -_0817D4F2: + bne @0817D4F2 + bl @0817E0A6 +@0817D4F2: mov r2, r8 lsls r0, r2, 3 lsls r1, r4, 4 @@ -734813,9 +734813,9 @@ _0817D4F2: lsls r0, 29 lsrs r0, 29 cmp r0, 0 - bne _0817D50E - bl _0817E0A6 -_0817D50E: + bne @0817D50E + bl @0817E0A6 +@0817D50E: subs r2, r0, 0x1 lsls r2, 24 lsrs r2, 24 @@ -734837,8 +734837,8 @@ _0817D50E: negs r0, r0 ands r0, r2 movs r2, 0x2 - b _0817D6F2 -_0817D53C: + b @0817D6F2 +@0817D53C: lsls r2, r5, 3 lsls r0, r6, 4 adds r2, r0 @@ -734869,10 +734869,10 @@ _0817D53C: ldrb r3, [r2] movs r0, 0x31 negs r0, r0 - bl _0817DFAA + bl @0817DFAA .align 2, 0 .pool -_0817D584: +@0817D584: mov r1, r8 lsls r0, r1, 3 lsls r1, r4, 4 @@ -734884,9 +734884,9 @@ _0817D584: lsls r0, 26 lsrs r0, 29 cmp r0, 0 - bne _0817D5A0 - bl _0817E0A6 -_0817D5A0: + bne @0817D5A0 + bl @0817E0A6 +@0817D5A0: subs r2, r0, 0x1 lsls r2, 24 lsrs r2, 24 @@ -734908,8 +734908,8 @@ _0817D5A0: negs r0, r0 ands r0, r2 movs r2, 0x4 - b _0817D6F2 -_0817D5CE: + b @0817D6F2 +@0817D5CE: lsls r2, r5, 3 lsls r0, r6, 4 adds r2, r0 @@ -734930,18 +734930,18 @@ _0817D5CE: orrs r0, r1 strh r0, [r2, 0x30] adds r2, 0x32 - bl _0817DF0A + bl @0817DF0A .align 2, 0 .pool -_0817D608: +@0817D608: ldr r0, [sp, 0x8] movs r1, 0x39 movs r2, 0 bl pokemon_getattr cmp r0, 0 - bne _0817D61A - bl _0817E0A6 -_0817D61A: + bne @0817D61A + bl @0817E0A6 +@0817D61A: mov r1, r8 lsls r0, r1, 3 lsls r1, r4, 4 @@ -734951,9 +734951,9 @@ _0817D61A: lsls r0, 23 lsrs r0, 29 cmp r0, 0 - bne _0817D632 - bl _0817E0A6 -_0817D632: + bne @0817D632 + bl @0817E0A6 +@0817D632: subs r2, r0, 0x1 lsls r2, 24 lsrs r2, 24 @@ -734974,8 +734974,8 @@ _0817D632: negs r0, r0 ands r0, r2 movs r2, 0xA - b _0817D6F2 -_0817D65E: + b @0817D6F2 +@0817D65E: lsls r2, r5, 3 lsls r0, r6, 4 adds r2, r0 @@ -734999,18 +734999,18 @@ _0817D65E: orrs r0, r1 strb r0, [r4] adds r2, 0x33 - bl _0817DF9E + bl @0817DF9E .align 2, 0 .pool -_0817D698: +@0817D698: ldr r0, [sp, 0x8] movs r1, 0x39 movs r2, 0 bl pokemon_getattr cmp r0, 0 - bne _0817D6AA - bl _0817E0A6 -_0817D6AA: + bne @0817D6AA + bl @0817E0A6 +@0817D6AA: mov r1, r8 lsls r0, r1, 3 lsls r1, r4, 4 @@ -735022,9 +735022,9 @@ _0817D6AA: lsls r0, 28 lsrs r0, 29 cmp r0, 0 - bne _0817D6C6 - bl _0817E0A6 -_0817D6C6: + bne @0817D6C6 + bl @0817E0A6 +@0817D6C6: subs r2, r0, 0x1 lsls r2, 24 lsrs r2, 24 @@ -735046,7 +735046,7 @@ _0817D6C6: negs r0, r0 ands r0, r2 movs r2, 0xC -_0817D6F2: +@0817D6F2: orrs r0, r2 mov r2, r8 lsls r3, r2, 5 @@ -735054,8 +735054,8 @@ _0817D6F2: ands r0, r2 orrs r0, r3 strb r0, [r1] - bl _0817E0A6 -_0817D704: + bl @0817E0A6 +@0817D704: ldr r5, =0x0202406e ldr r6, =0x0202420e ldrb r0, [r6] @@ -735097,18 +735097,18 @@ _0817D704: ands r0, r2 orrs r0, r3 strb r0, [r1, 0x2] - bl _0817E0A6 + bl @0817E0A6 .align 2, 0 .pool -_0817D76C: +@0817D76C: ldr r0, [sp, 0x8] movs r1, 0x39 movs r2, 0 bl pokemon_getattr cmp r0, 0 - bne _0817D77E - bl _0817E0A6 -_0817D77E: + bne @0817D77E + bl @0817E0A6 +@0817D77E: ldr r6, =0x0202406e ldr r5, =0x0202420b ldrb r0, [r5] @@ -735125,7 +735125,7 @@ _0817D77E: lsls r0, 23 lsrs r0, 29 cmp r0, 0 - beq _0817D7B2 + beq @0817D7B2 subs r2, r0, 0x1 lsls r2, 24 lsrs r2, 24 @@ -735134,7 +735134,7 @@ _0817D77E: movs r0, 0x8 movs r1, 0x4 bl sub_817E684 -_0817D7B2: +@0817D7B2: lsls r3, r4, 2 adds r3, r7, r3 adds r3, 0x57 @@ -735148,10 +735148,10 @@ _0817D7B2: ldrb r0, [r5] lsls r0, 1 adds r0, r6 - b _0817D934 + b @0817D934 .align 2, 0 .pool -_0817D7D8: +@0817D7D8: ldr r5, =0x0202406e ldr r6, =0x0202420e ldrb r0, [r6] @@ -735193,10 +735193,10 @@ _0817D7D8: ldrb r3, [r1, 0x2] movs r0, 0xD negs r0, r0 - b _0817D88C + b @0817D88C .align 2, 0 .pool -_0817D838: +@0817D838: ldr r5, =0x0202406e ldr r6, =0x0202420e ldrb r0, [r6] @@ -735239,22 +735239,22 @@ _0817D838: ldrb r3, [r1, 0x2] movs r0, 0x31 negs r0, r0 -_0817D88C: +@0817D88C: ands r0, r3 orrs r0, r2 strb r0, [r1, 0x2] - bl _0817E0A6 + bl @0817E0A6 .align 2, 0 .pool -_0817D8A4: +@0817D8A4: ldr r0, [sp, 0x8] movs r1, 0x39 movs r2, 0 bl pokemon_getattr cmp r0, 0 - bne _0817D8B6 - bl _0817E0A6 -_0817D8B6: + bne @0817D8B6 + bl @0817E0A6 +@0817D8B6: ldr r2, =0x0202406e mov r8, r2 ldr r6, =0x0202420b @@ -735272,7 +735272,7 @@ _0817D8B6: lsls r0, 29 lsrs r0, 29 cmp r0, 0 - beq _0817D8EE + beq @0817D8EE subs r2, r0, 0x1 lsls r2, 24 lsrs r2, 24 @@ -735282,7 +735282,7 @@ _0817D8B6: movs r0, 0x8 movs r1, 0x2 bl sub_817E684 -_0817D8EE: +@0817D8EE: ldrb r0, [r6] lsls r0, 1 add r0, r8 @@ -735294,7 +735294,7 @@ _0817D8EE: lsls r0, 26 lsrs r0, 29 cmp r0, 0 - beq _0817D91A + beq @0817D91A subs r2, r0, 0x1 lsls r2, 24 lsrs r2, 24 @@ -735304,7 +735304,7 @@ _0817D8EE: movs r0, 0x8 movs r1, 0x3 bl sub_817E684 -_0817D91A: +@0817D91A: lsls r3, r5, 2 adds r3, r7, r3 adds r3, 0x57 @@ -735318,17 +735318,17 @@ _0817D91A: ldrb r0, [r6] lsls r0, 1 add r0, r8 -_0817D934: +@0817D934: ldrh r0, [r0] lsls r0, 5 movs r2, 0x1F ands r1, r2 orrs r1, r0 strb r1, [r3] - b _0817E0A6 + b @0817E0A6 .align 2, 0 .pool -_0817D94C: +@0817D94C: lsls r2, r5, 3 lsls r0, r6, 4 adds r2, r0 @@ -735359,10 +735359,10 @@ _0817D94C: ldrb r3, [r2] movs r0, 0xD negs r0, r0 - b _0817DFAA + b @0817DFAA .align 2, 0 .pool -_0817D994: +@0817D994: mov r1, r8 lsls r0, r1, 3 lsls r1, r4, 4 @@ -735374,9 +735374,9 @@ _0817D994: lsls r0, 25 lsrs r0, 29 cmp r0, 0 - bne _0817D9AE - b _0817E0A6 -_0817D9AE: + bne @0817D9AE + b @0817E0A6 +@0817D9AE: subs r2, r0, 0x1 lsls r2, 24 lsrs r2, 24 @@ -735386,8 +735386,8 @@ _0817D9AE: lsls r3, 28 lsrs r3, 30 movs r0, 0x9 - b _0817E086 -_0817D9C2: + b @0817E086 +@0817D9C2: ldr r5, =0x0202406e ldr r6, =0x0202420e ldrb r0, [r6] @@ -735429,10 +735429,10 @@ _0817D9C2: ldrb r3, [r1, 0x3] movs r0, 0x4 negs r0, r0 - b _0817DB76 + b @0817DB76 .align 2, 0 .pool -_0817DA24: +@0817DA24: ldr r1, =0x0202406e ldr r0, =0x0202420b ldrb r0, [r0] @@ -735449,9 +735449,9 @@ _0817DA24: lsls r0, 28 lsrs r0, 29 cmp r0, 0 - bne _0817DA48 - b _0817E0A6 -_0817DA48: + bne @0817DA48 + b @0817E0A6 +@0817DA48: subs r2, r0, 0x1 lsls r2, 24 lsrs r2, 24 @@ -735461,10 +735461,10 @@ _0817DA48: movs r0, 0x9 movs r1, 0x2 bl sub_817E684 - b _0817E0A6 + b @0817E0A6 .align 2, 0 .pool -_0817DA68: +@0817DA68: ldr r5, =0x0202406e ldr r6, =0x0202420e ldrb r0, [r6] @@ -735507,10 +735507,10 @@ _0817DA68: ldrb r3, [r1, 0x3] movs r0, 0xD negs r0, r0 - b _0817DB76 + b @0817DB76 .align 2, 0 .pool -_0817DACC: +@0817DACC: ldr r1, =0x0202406e ldr r0, =0x0202420b ldrb r0, [r0] @@ -735527,20 +735527,20 @@ _0817DACC: lsls r0, 25 lsrs r2, r0, 29 cmp r2, 0 - bne _0817DAF0 - b _0817E0A6 -_0817DAF0: + bne @0817DAF0 + b @0817E0A6 +@0817DAF0: ldr r0, =0x0203aba8 ldr r0, [r0] ldrh r0, [r0] cmp r0, 0xAD - bne _0817DAFC - b _0817E0A6 -_0817DAFC: + bne @0817DAFC + b @0817E0A6 +@0817DAFC: cmp r0, 0xD6 - bne _0817DB02 - b _0817E0A6 -_0817DB02: + bne @0817DB02 + b @0817E0A6 +@0817DB02: subs r2, 0x1 lsls r2, 24 lsrs r2, 24 @@ -735548,13 +735548,13 @@ _0817DB02: lsls r3, 28 lsrs r3, 30 movs r0, 0x9 -_0817DB10: +@0817DB10: movs r1, 0x3 bl sub_817E684 - b _0817E0A6 + b @0817E0A6 .align 2, 0 .pool -_0817DB24: +@0817DB24: ldr r5, =0x0202406e ldr r6, =0x0202420e ldrb r0, [r6] @@ -735596,14 +735596,14 @@ _0817DB24: ldrb r3, [r1, 0x3] movs r0, 0x31 negs r0, r0 -_0817DB76: +@0817DB76: ands r0, r3 orrs r0, r2 strb r0, [r1, 0x3] - b _0817E0A6 + b @0817E0A6 .align 2, 0 .pool -_0817DB90: +@0817DB90: ldr r1, =0x0202406e ldr r0, =0x0202420b ldrb r0, [r0] @@ -735620,9 +735620,9 @@ _0817DB90: lsls r0, 14 lsrs r0, 29 cmp r0, 0 - bne _0817DBB4 - b _0817E0A6 -_0817DBB4: + bne @0817DBB4 + b @0817E0A6 +@0817DBB4: subs r2, r0, 0x1 lsls r2, 24 lsrs r2, 24 @@ -735630,13 +735630,13 @@ _0817DBB4: lsls r3, 26 lsrs r3, 30 movs r0, 0x9 -_0817DBC2: +@0817DBC2: movs r1, 0x4 bl sub_817E684 - b _0817E0A6 + b @0817E0A6 .align 2, 0 .pool -_0817DBD4: +@0817DBD4: lsls r3, 3 mov r1, r9 lsls r0, r1, 4 @@ -735665,14 +735665,14 @@ _0817DBD4: ldrb r2, [r3] movs r0, 0x31 negs r0, r0 -_0817DC0C: +@0817DC0C: ands r0, r2 orrs r0, r1 strb r0, [r3] - b _0817E0A6 + b @0817E0A6 .align 2, 0 .pool -_0817DC20: +@0817DC20: mov r2, r8 lsls r0, r2, 3 lsls r1, r4, 4 @@ -735682,7 +735682,7 @@ _0817DC20: lsls r0, 14 lsrs r0, 29 cmp r0, 0 - beq _0817DC4C + beq @0817DC4C subs r2, r0, 0x1 lsls r2, 24 lsrs r2, 24 @@ -735694,7 +735694,7 @@ _0817DC20: movs r0, 0x9 movs r1, 0x1 bl sub_817E684 -_0817DC4C: +@0817DC4C: lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -735705,8 +735705,8 @@ _0817DC4C: negs r1, r1 ands r1, r2 movs r2, 0x18 - b _0817E0A2 -_0817DC62: + b @0817E0A2 +@0817DC62: lsls r2, r6, 1 adds r2, r6 lsls r2, 2 @@ -735729,10 +735729,10 @@ _0817DC62: orrs r0, r1 strb r0, [r4] adds r2, 0x54 - b _0817DF9E + b @0817DF9E .align 2, 0 .pool -_0817DC98: +@0817DC98: ldr r1, [sp, 0x4] lsls r0, r1, 1 adds r0, r1 @@ -735744,9 +735744,9 @@ _0817DC98: lsls r0, 29 lsrs r2, r0, 29 cmp r2, 0 - bne _0817DCB2 - b _0817E0A6 -_0817DCB2: + bne @0817DCB2 + b @0817E0A6 +@0817DCB2: movs r0, 0x1 eors r1, r0 subs r2, 0x1 @@ -735766,8 +735766,8 @@ _0817DCB2: negs r0, r0 ands r0, r1 movs r1, 0xE - b _0817DFAC -_0817DCDC: + b @0817DFAC +@0817DCDC: lsls r1, r4, 1 adds r1, r4 lsls r1, 2 @@ -735783,8 +735783,8 @@ _0817DCDC: ldrb r2, [r1] movs r0, 0x4 negs r0, r0 - b _0817DF6A -_0817DCFC: + b @0817DF6A +@0817DCFC: mov r0, r8 lsls r2, r0, 3 lsls r0, r4, 4 @@ -735810,10 +735810,10 @@ _0817DCFC: adds r2, 0x33 mov r1, r10 lsls r3, r1, 6 - b _0817DF0E + b @0817DF0E .align 2, 0 .pool -_0817DD38: +@0817DD38: mov r0, r8 lsls r2, r0, 3 lsls r0, r4, 4 @@ -735838,21 +735838,21 @@ _0817DD38: mov r1, r10 lsls r3, r1, 6 movs r1, 0x3F - b _0817DF12 + b @0817DF12 .align 2, 0 .pool -_0817DD74: +@0817DD74: movs r0, 0 bl sub_817EA80 -_0817DD7A: +@0817DD7A: mov r2, r8 lsls r0, r2, 3 - b _0817DD88 -_0817DD80: + b @0817DD88 +@0817DD80: movs r0, 0x1 bl sub_817EA80 lsls r0, r5, 3 -_0817DD88: +@0817DD88: lsls r1, r4, 4 adds r0, r1 adds r1, r7, r0 @@ -735861,7 +735861,7 @@ _0817DD88: ldrb r5, [r4] lsls r0, r5, 29 cmp r0, 0 - beq _0817DDAE + beq @0817DDAE movs r0, 0x8 negs r0, r0 ands r0, r5 @@ -735872,22 +735872,22 @@ _0817DD88: movs r0, 0x3F ands r0, r1 strb r0, [r2] -_0817DDAE: +@0817DDAE: ldrb r1, [r4] lsls r0, r1, 26 lsrs r0, 29 cmp r0, 0 - bne _0817DDBA - b _0817E0A6 -_0817DDBA: + bne @0817DDBA + b @0817E0A6 +@0817DDBA: movs r0, 0x39 negs r0, r0 ands r0, r1 movs r1, 0x3F ands r0, r1 strb r0, [r4] - b _0817E0A6 -_0817DDC8: + b @0817E0A6 +@0817DDC8: lsls r2, r4, 1 adds r2, r4 lsls r2, 2 @@ -735918,10 +735918,10 @@ _0817DDC8: ldrb r3, [r2] movs r0, 0xD negs r0, r0 - b _0817DFAA + b @0817DFAA .align 2, 0 .pool -_0817DE10: +@0817DE10: lsls r2, r4, 1 adds r2, r4 lsls r2, 2 @@ -735951,14 +735951,14 @@ _0817DE10: ldrb r3, [r2] movs r0, 0x31 negs r0, r0 - b _0817DFAA + b @0817DFAA .align 2, 0 .pool -_0817DE58: +@0817DE58: ldr r1, =0x02022f5a ldrh r0, [r1] cmp r0, 0x73 - bne _0817DE82 + bne @0817DE82 lsls r1, r4, 1 adds r1, r4 lsls r1, 2 @@ -735976,11 +735976,11 @@ _0817DE58: negs r0, r0 ands r0, r2 strb r0, [r1] -_0817DE82: +@0817DE82: ldr r2, =0x02022f5a ldrh r0, [r2] cmp r0, 0x71 - bne _0817DEAA + bne @0817DEAA lsls r1, r4, 1 adds r1, r4 lsls r1, 2 @@ -735997,13 +735997,13 @@ _0817DE82: negs r0, r0 ands r0, r2 strb r0, [r1] -_0817DEAA: +@0817DEAA: ldr r1, =0x02022f5a ldrh r0, [r1] cmp r0, 0x36 - beq _0817DEB4 - b _0817E0A6 -_0817DEB4: + beq @0817DEB4 + b @0817E0A6 +@0817DEB4: lsls r1, r4, 1 adds r1, r4 lsls r1, 2 @@ -736019,10 +736019,10 @@ _0817DEB4: ldrb r2, [r1] movs r0, 0x4 negs r0, r0 - b _0817DF6A + b @0817DF6A .align 2, 0 .pool -_0817DEDC: +@0817DEDC: lsls r2, r4, 1 adds r2, r4 lsls r2, 2 @@ -736046,20 +736046,20 @@ _0817DEDC: orrs r0, r1 strb r0, [r4] adds r2, 0x54 -_0817DF0A: +@0817DF0A: mov r0, r10 lsls r3, r0, 6 -_0817DF0E: +@0817DF0E: ldrb r1, [r2] movs r0, 0x3F -_0817DF12: +@0817DF12: ands r0, r1 orrs r0, r3 strb r0, [r2] - b _0817E0A6 + b @0817E0A6 .align 2, 0 .pool -_0817DF24: +@0817DF24: lsls r0, r6, 1 adds r0, r6 lsls r0, 2 @@ -736070,9 +736070,9 @@ _0817DF24: lsls r0, 28 lsrs r0, 29 cmp r0, 0 - bne _0817DF3C - b _0817E0A6 -_0817DF3C: + bne @0817DF3C + b @0817E0A6 +@0817DF3C: subs r2, r0, 0x1 lsls r2, 24 lsrs r2, 24 @@ -736081,8 +736081,8 @@ _0817DF3C: ldrb r3, [r0] lsrs r3, 6 movs r0, 0xF - b _0817E086 -_0817DF4E: + b @0817E086 +@0817DF4E: lsls r1, r4, 1 adds r1, r4 lsls r1, 2 @@ -736097,11 +736097,11 @@ _0817DF4E: adds r1, 0x54 ldrb r2, [r1] movs r0, 0x3F -_0817DF6A: +@0817DF6A: ands r0, r2 strb r0, [r1] - b _0817E0A6 -_0817DF70: + b @0817E0A6 +@0817DF70: lsls r2, r4, 1 adds r2, r4 lsls r2, 2 @@ -736125,22 +736125,22 @@ _0817DF70: orrs r0, r1 strb r0, [r4] adds r2, 0x55 -_0817DF9E: +@0817DF9E: movs r0, 0x3 mov r1, r10 ands r1, r0 ldrb r3, [r2] movs r0, 0x4 negs r0, r0 -_0817DFAA: +@0817DFAA: ands r0, r3 -_0817DFAC: +@0817DFAC: orrs r0, r1 strb r0, [r2] - b _0817E0A6 + b @0817E0A6 .align 2, 0 .pool -_0817DFBC: +@0817DFBC: lsls r0, r6, 1 adds r0, r6 lsls r0, 2 @@ -736151,7 +736151,7 @@ _0817DFBC: lsls r0, 25 lsrs r0, 29 cmp r0, 0 - beq _0817E0A6 + beq @0817E0A6 subs r2, r0, 0x1 lsls r2, 24 lsrs r2, 24 @@ -736161,8 +736161,8 @@ _0817DFBC: lsls r3, 30 lsrs r3, 30 movs r0, 0x10 - b _0817E086 -_0817DFE6: + b @0817E086 +@0817DFE6: lsls r1, r6, 1 adds r1, r6 lsls r1, 2 @@ -736199,10 +736199,10 @@ _0817DFE6: movs r1, 0 mov r3, r10 bl sub_817E684 - b _0817E0A6 + b @0817E0A6 .align 2, 0 .pool -_0817E040: +@0817E040: lsls r0, r4, 4 adds r4, r7, r0 adds r0, r4, 0 @@ -736210,7 +736210,7 @@ _0817E040: ldrb r0, [r0] lsrs r0, 5 cmp r0, 0 - beq _0817E068 + beq @0817E068 subs r2, r0, 0x1 lsls r2, 24 lsrs r2, 24 @@ -736222,13 +736222,13 @@ _0817E040: movs r0, 0x15 movs r1, 0 bl sub_817E684 -_0817E068: +@0817E068: adds r0, r4, 0 adds r0, 0x3D ldrb r0, [r0] lsrs r0, 5 cmp r0, 0 - beq _0817E0A6 + beq @0817E0A6 subs r2, r0, 0x1 lsls r2, 24 lsrs r2, 24 @@ -736238,11 +736238,11 @@ _0817E068: lsls r3, 30 lsrs r3, 30 movs r0, 0x15 -_0817E086: +@0817E086: movs r1, 0 bl sub_817E684 - b _0817E0A6 -_0817E08E: + b @0817E0A6 +@0817E08E: lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -736253,11 +736253,11 @@ _0817E08E: negs r1, r1 ands r1, r2 movs r2, 0x1C -_0817E0A2: +@0817E0A2: orrs r1, r2 -_0817E0A4: +@0817E0A4: strb r1, [r0] -_0817E0A6: +@0817E0A6: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -736269,7 +736269,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 @@ -736278,37 +736278,37 @@ sub_817E0B8: @ 817E0B8 ldr r6, =0x0000ffff adds r2, r4, 0 adds r1, r4, 0 -_0817E0C8: +@0817E0C8: ldrh r0, [r1] cmp r0, r5 - beq _0817E0DA + beq @0817E0DA adds r2, 0x2 adds r1, 0x2 adds r3, 0x1 ldrh r0, [r2] cmp r0, r6 - bne _0817E0C8 -_0817E0DA: + bne @0817E0C8 +@0817E0DA: lsls r0, r3, 1 adds r0, r4 ldrh r1, [r0] ldr r0, =0x0000ffff cmp r1, r0 - beq _0817E0F4 + beq @0817E0F4 movs r0, 0 - b _0817E0F6 + b @0817E0F6 .align 2, 0 .pool -_0817E0F4: +@0817E0F4: movs r0, 0x1 -_0817E0F6: +@0817E0F6: pop {r4-r6} pop {r1} bx r1 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 @@ -736326,9 +736326,9 @@ sub_817E0FC: @ 817E0FC movs r1, 0x2 ands r0, r1 cmp r0, 0 - bne _0817E122 - b _0817E310 -_0817E122: + bne @0817E122 + b @0817E310 +@0817E122: ldr r0, =0x0202449c ldr r0, [r0] movs r1, 0x81 @@ -736354,7 +736354,7 @@ _0817E122: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x3 - bls _0817E184 + bls @0817E184 mov r2, r9 lsls r0, r2, 1 add r0, r9 @@ -736366,10 +736366,10 @@ _0817E122: movs r2, 0x1E orrs r1, r2 strb r1, [r0] - b _0817E310 + b @0817E310 .align 2, 0 .pool -_0817E184: +@0817E184: mov r2, r10 ldrb r0, [r2] bl battle_get_per_side_status @@ -736451,16 +736451,16 @@ _0817E184: ands r0, r1 str r4, [sp, 0x10] cmp r0, 0 - beq _0817E23C + beq @0817E23C movs r0, 0x7 adds r1, r7, 0 adds r2, r6, 0 movs r3, 0 bl sub_817E684 -_0817E23C: +@0817E23C: ldr r0, =0x00000111 cmp r7, r0 - bne _0817E272 + bne @0817E272 mov r1, r10 ldrb r0, [r1] lsls r0, 1 @@ -736485,12 +736485,12 @@ _0817E23C: mov r1, r8 orrs r0, r1 strb r0, [r2] -_0817E272: +@0817E272: cmp r7, 0x78 - beq _0817E27A + beq @0817E27A cmp r7, 0x99 - bne _0817E2D2 -_0817E27A: + bne @0817E2D2 +@0817E27A: movs r0, 0x1 mov r2, r9 eors r0, r2 @@ -736535,7 +736535,7 @@ _0817E27A: movs r1, 0x1 orrs r0, r1 strb r0, [r4] -_0817E2D2: +@0817E2D2: ldr r1, =0x0831c898 ldr r2, [sp, 0x10] adds r0, r2, r7 @@ -736563,7 +736563,7 @@ _0817E2D2: movs r2, 0 movs r3, 0 bl sub_817E684 -_0817E310: +@0817E310: add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -736577,7 +736577,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 @@ -736586,7 +736586,7 @@ sub_817E32C: @ 817E32C movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _0817E3EE + beq @0817E3EE ldr r0, =0x0202449c ldr r0, [r0] movs r1, 0x81 @@ -736598,13 +736598,13 @@ sub_817E32C: @ 817E32C lsls r0, 24 lsrs r2, r0, 24 cmp r5, 0x12 - beq _0817E36C + beq @0817E36C cmp r5, 0x13 - beq _0817E3AA - b _0817E3EE + beq @0817E3AA + b @0817E3EE .align 2, 0 .pool -_0817E36C: +@0817E36C: lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -736613,7 +736613,7 @@ _0817E36C: lsls r0, 14 lsrs r0, 29 cmp r0, 0 - beq _0817E3EE + beq @0817E3EE subs r0, 0x1 lsls r0, 2 adds r1, r4, 0 @@ -736634,8 +736634,8 @@ _0817E36C: negs r0, r0 ands r0, r1 movs r1, 0x10 - b _0817E3EA -_0817E3AA: + b @0817E3EA +@0817E3AA: lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -736646,7 +736646,7 @@ _0817E3AA: lsls r0, 27 lsrs r0, 29 cmp r0, 0 - beq _0817E3EE + beq @0817E3EE subs r0, 0x1 lsls r0, 2 adds r1, r4, 0 @@ -736667,17 +736667,17 @@ _0817E3AA: negs r0, r0 ands r0, r1 movs r1, 0x12 -_0817E3EA: +@0817E3EA: orrs r0, r1 strb r0, [r2] -_0817E3EE: +@0817E3EE: pop {r4,r5} pop {r0} bx r0 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 @@ -736703,15 +736703,15 @@ sub_817E3F4: @ 817E3F4 adds r0, 0xB3 ldrb r0, [r0] cmp r0, 0 - beq _0817E42A - b _0817E670 -_0817E42A: + beq @0817E42A + b @0817E670 +@0817E42A: movs r2, 0xD2 lsls r2, 1 adds r2, r1 mov r10, r2 movs r6, 0 -_0817E434: +@0817E434: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 @@ -736721,45 +736721,45 @@ _0817E434: movs r2, 0 bl pokemon_getattr cmp r0, 0 - beq _0817E454 + beq @0817E454 mov r0, r8 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r8, r0 -_0817E454: +@0817E454: ldr r5, =0x02024744 adds r0, r4, r5 movs r1, 0xB movs r2, 0 bl pokemon_getattr cmp r0, 0 - beq _0817E46A + beq @0817E46A adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 -_0817E46A: +@0817E46A: adds r6, 0x1 cmp r6, 0x5 - ble _0817E434 + ble @0817E434 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 cmp r0, 0 - bne _0817E47E - b _0817E670 -_0817E47E: + bne @0817E47E + b @0817E670 +@0817E47E: cmp r8, r7 - beq _0817E484 - b _0817E670 -_0817E484: + beq @0817E484 + b @0817E670 +@0817E484: movs r6, 0 lsls r3, r6, 1 str r3, [sp, 0x18] movs r4, 0x64 mov r8, r4 -_0817E48E: +@0817E48E: mov r1, r8 muls r1, r6 ldr r0, =0x020244ec @@ -736773,19 +736773,19 @@ _0817E48E: adds r0, r6, 0x1 mov r9, r0 cmp r7, 0 - beq _0817E4EE + beq @0817E4EE adds r0, r4, 0 movs r1, 0x2D movs r2, 0 bl pokemon_getattr cmp r0, 0 - bne _0817E4EE + bne @0817E4EE movs r4, 0 lsls r0, r6, 3 mov r2, r10 adds r1, r0, r2 movs r3, 0x3 -_0817E4C4: +@0817E4C4: lsls r0, r4, 16 asrs r0, 16 ldrh r4, [r1] @@ -736795,19 +736795,19 @@ _0817E4C4: adds r1, 0x2 subs r3, 0x1 cmp r3, 0 - bge _0817E4C4 + bge @0817E4C4 ldr r1, [sp, 0x8] lsls r0, r1, 16 lsls r1, r4, 16 cmp r0, r1 - bge _0817E4EE + bge @0817E4EE lsls r0, r6, 24 lsrs r0, 24 str r0, [sp, 0x10] lsrs r1, 16 str r1, [sp, 0x8] str r7, [sp] -_0817E4EE: +@0817E4EE: mov r0, r8 muls r0, r6 ldr r2, =0x02024744 @@ -736822,13 +736822,13 @@ _0817E4EE: lsls r3, 16 str r3, [sp, 0x1C] cmp r7, 0 - beq _0817E5A0 + beq @0817E5A0 adds r0, r4, 0 movs r1, 0x2D movs r2, 0 bl pokemon_getattr cmp r0, 0 - bne _0817E5A0 + bne @0817E5A0 movs r4, 0 ldr r0, [sp, 0xC] lsls r2, r0, 16 @@ -736841,7 +736841,7 @@ _0817E4EE: mov r3, r10 adds r1, r0, r3 movs r3, 0x3 -_0817E534: +@0817E534: lsls r0, r4, 16 asrs r0, 16 ldrh r4, [r1] @@ -736851,12 +736851,12 @@ _0817E534: adds r1, 0x2 subs r3, 0x1 cmp r3, 0 - bge _0817E534 + bge @0817E534 asrs r1, r2, 16 lsls r5, r4, 16 asrs r0, r5, 16 cmp r1, r0 - bne _0817E590 + bne @0817E590 mov r0, r8 muls r0, r6 ldr r1, =0x02024744 @@ -736874,26 +736874,26 @@ _0817E534: movs r2, 0 bl pokemon_getattr cmp r4, r0 - bls _0817E5A0 - b _0817E594 + bls @0817E5A0 + b @0817E594 .align 2, 0 .pool -_0817E590: +@0817E590: cmp r1, r0 - ble _0817E5A0 -_0817E594: + ble @0817E5A0 +@0817E594: lsls r0, r6, 24 lsrs r0, 24 str r0, [sp, 0x14] lsrs r5, 16 str r5, [sp, 0xC] str r7, [sp, 0x4] -_0817E5A0: +@0817E5A0: mov r6, r9 cmp r6, 0x5 - bgt _0817E5A8 - b _0817E48E -_0817E5A8: + bgt @0817E5A8 + b @0817E48E +@0817E5A8: movs r4, 0 movs r6, 0 movs r3, 0 @@ -736902,20 +736902,20 @@ _0817E5A8: lsls r0, r7, 3 mov r1, r10 adds r2, r0, r1 -_0817E5B8: +@0817E5B8: lsls r0, r4, 16 asrs r0, 16 movs r7, 0 ldrsh r1, [r2, r7] cmp r0, r1 - bge _0817E5C8 + bge @0817E5C8 ldrh r4, [r2] adds r6, r3, 0 -_0817E5C8: +@0817E5C8: adds r2, 0x2 adds r3, 0x1 cmp r3, 0x3 - ble _0817E5B8 + ble @0817E5B8 movs r0, 0x64 ldr r1, [sp, 0x10] muls r0, r1 @@ -736928,43 +736928,43 @@ _0817E5C8: lsrs r4, r0, 16 ldr r2, [sp, 0x1C] cmp r2, 0 - beq _0817E670 + beq @0817E670 cmp r4, 0 - beq _0817E670 + beq @0817E670 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _0817E65C + beq @0817E65C ldr r3, [sp, 0x10] cmp r3, 0x2 - bhi _0817E620 + bhi @0817E620 ldr r0, =0x02024474 adds r0, 0x25 ldrb r0, [r0] bl sub_806D82C lsls r0, 16 cmp r0, 0 - beq _0817E630 - b _0817E670 + beq @0817E630 + b @0817E670 .align 2, 0 .pool -_0817E620: +@0817E620: ldr r0, =0x02024474 adds r0, 0x25 ldrb r0, [r0] bl sub_806D82C lsls r0, 16 cmp r0, 0 - beq _0817E670 -_0817E630: + beq @0817E670 +@0817E630: movs r3, 0 ldr r7, [sp, 0x14] cmp r7, 0x2 - bls _0817E63A + bls @0817E63A movs r3, 0x1 -_0817E63A: +@0817E63A: lsls r0, r3, 24 lsrs r0, 24 ldr r1, =0x02024474 @@ -736977,10 +736977,10 @@ _0817E63A: ldr r2, [sp] ldr r3, [sp, 0x4] bl sub_80ECB00 - b _0817E670 + b @0817E670 .align 2, 0 .pool -_0817E65C: +@0817E65C: ldr r0, =0x02024474 adds r0, 0x25 ldrb r1, [r0] @@ -736990,7 +736990,7 @@ _0817E65C: ldr r2, [sp] ldr r3, [sp, 0x4] bl sub_80ECB00 -_0817E670: +@0817E670: add sp, 0x20 pop {r3-r5} mov r8, r3 @@ -737004,7 +737004,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 @@ -737041,11 +737041,11 @@ sub_817E684: @ 817E684 lsrs r3, r0, 24 mov r0, r10 cmp r0, 0x1B - bls _0817E6D4 - b _0817EA6C -_0817E6D4: + bls @0817E6D4 + b @0817EA6C +@0817E6D4: lsls r0, 2 - ldr r1, =_0817E6F0 + ldr r1, =@0817E6F0 adds r1, r0, r1 ldr r1, [r1] mov r12, r0 @@ -737053,36 +737053,36 @@ _0817E6D4: .align 2, 0 .pool .align 2, 0 -_0817E6F0: - .4byte _0817E760 - .4byte _0817E760 - .4byte _0817E85C - .4byte _0817E79C - .4byte _0817E79C - .4byte _0817E79C - .4byte _0817E79C - .4byte _0817E79C - .4byte _0817E8A0 - .4byte _0817E8A0 - .4byte _0817E8CC - .4byte _0817E8F0 - .4byte _0817E978 - .4byte _0817E9E0 - .4byte _0817EA28 - .4byte _0817E8A0 - .4byte _0817E8A0 - .4byte _0817E880 - .4byte _0817E760 - .4byte _0817E80A - .4byte _0817E848 - .4byte _0817E8A0 - .4byte _0817E760 - .4byte _0817E760 - .4byte _0817E760 - .4byte _0817E760 - .4byte _0817E760 - .4byte _0817E760 -_0817E760: +@0817E6F0: + .4byte @0817E760 + .4byte @0817E760 + .4byte @0817E85C + .4byte @0817E79C + .4byte @0817E79C + .4byte @0817E79C + .4byte @0817E79C + .4byte @0817E79C + .4byte @0817E8A0 + .4byte @0817E8A0 + .4byte @0817E8CC + .4byte @0817E8F0 + .4byte @0817E978 + .4byte @0817E9E0 + .4byte @0817EA28 + .4byte @0817E8A0 + .4byte @0817E8A0 + .4byte @0817E880 + .4byte @0817E760 + .4byte @0817E80A + .4byte @0817E848 + .4byte @0817E8A0 + .4byte @0817E760 + .4byte @0817E760 + .4byte @0817E760 + .4byte @0817E760 + .4byte @0817E760 + .4byte @0817E760 +@0817E760: ldr r1, =0x0202406e ldr r0, =0x0202420b ldrb r0, [r0] @@ -737105,10 +737105,10 @@ _0817E760: ldrh r0, [r0] ldrh r2, [r1] adds r0, r2 - b _0817EA6A + b @0817EA6A .align 2, 0 .pool -_0817E79C: +@0817E79C: ldr r1, =0x0860a834 add r1, r12 ldr r7, =0x0202406e @@ -737120,7 +737120,7 @@ _0817E79C: ldr r3, =0x0202420b ldrh r0, [r1] cmp r6, r0 - bne _0817E7E0 + bne @0817E7E0 ldrb r0, [r3] lsls r0, 1 adds r0, r7 @@ -737134,18 +737134,18 @@ _0817E79C: ldrh r2, [r0] adds r1, r2 strh r1, [r0] - b _0817EA6C + b @0817EA6C .align 2, 0 .pool -_0817E7E0: +@0817E7E0: adds r1, 0x4 ldrh r0, [r1] cmp r0, r4 - bne _0817E7EA - b _0817EA6C -_0817E7EA: + bne @0817E7EA + b @0817EA6C +@0817E7EA: cmp r6, r0 - bne _0817E7E0 + bne @0817E7E0 ldrb r0, [r3] lsls r0, 1 adds r0, r7 @@ -737159,8 +737159,8 @@ _0817E7EA: ldrh r5, [r0] adds r1, r5 strh r1, [r0] - b _0817EA6C -_0817E80A: + b @0817EA6C +@0817E80A: movs r0, 0x1 adds r1, r5, 0 eors r1, r0 @@ -737189,10 +737189,10 @@ _0817E80A: ldrh r0, [r0] ldrh r2, [r1] adds r0, r2 - b _0817EA6A + b @0817EA6A .align 2, 0 .pool -_0817E848: +@0817E848: lsls r0, r5, 1 adds r0, r5 lsls r0, 2 @@ -737203,7 +737203,7 @@ _0817E848: negs r1, r1 ands r1, r2 strb r1, [r0] -_0817E85C: +@0817E85C: mov r0, r9 lsls r1, r0, 1 lsls r0, r5, 1 @@ -737219,10 +737219,10 @@ _0817E85C: ldrh r0, [r0] ldrh r2, [r1] adds r0, r2 - b _0817EA6A + b @0817EA6A .align 2, 0 .pool -_0817E880: +@0817E880: lsls r1, r5, 2 add r1, r9 lsls r1, 1 @@ -737236,10 +737236,10 @@ _0817E880: ldr r2, [r0] lsls r0, r6, 1 adds r0, r2 - b _0817EA64 + b @0817EA64 .align 2, 0 .pool -_0817E8A0: +@0817E8A0: lsls r2, r5, 2 add r2, r9 lsls r2, 1 @@ -737259,10 +737259,10 @@ _0817E8A0: ldrh r1, [r2] adds r0, r1 strh r0, [r2] - b _0817EA6C + b @0817EA6C .align 2, 0 .pool -_0817E8CC: +@0817E8CC: lsls r1, r5, 2 add r1, r9 lsls r1, 1 @@ -737277,10 +737277,10 @@ _0817E8CC: ldrh r0, [r0] ldrh r2, [r1] adds r0, r2 - b _0817EA6A + b @0817EA6A .align 2, 0 .pool -_0817E8F0: +@0817E8F0: lsls r0, r3, 4 adds r2, r7, r0 adds r0, r2, 0 @@ -737294,15 +737294,15 @@ _0817E8F0: lsls r0, 29 lsrs r0, 29 cmn r1, r0 - bne _0817E90E - b _0817EA6C -_0817E90E: + bne @0817E90E + b @0817EA6C +@0817E90E: cmp r6, 0xA - beq _0817E914 - b _0817EA6C -_0817E914: + beq @0817E914 + b @0817EA6C +@0817E914: cmp r1, 0 - beq _0817E940 + beq @0817E940 subs r1, 0x1 lsls r1, 2 adds r0, r2, 0 @@ -737323,14 +737323,14 @@ _0817E914: ldrh r5, [r1] adds r0, r5 strh r0, [r1] -_0817E940: +@0817E940: ldrb r0, [r4] lsls r0, 29 lsrs r0, 29 cmp r0, 0 - bne _0817E94C - b _0817EA6C -_0817E94C: + bne @0817E94C + b @0817EA6C +@0817E94C: subs r1, r0, 0x1 lsls r1, 2 adds r0, r2, 0 @@ -737350,10 +737350,10 @@ _0817E94C: ldrh r0, [r0] ldrh r2, [r1] adds r0, r2 - b _0817EA6A + b @0817EA6A .align 2, 0 .pool -_0817E978: +@0817E978: lsls r1, r3, 4 adds r1, r7, r1 adds r0, r1, 0 @@ -737367,11 +737367,11 @@ _0817E978: lsls r0, 26 lsrs r0, 29 cmn r2, r0 - beq _0817EA6C + beq @0817EA6C cmp r6, 0xD - bne _0817EA6C + bne @0817EA6C cmp r2, 0 - beq _0817E9BE + beq @0817E9BE subs r1, r2, 0x1 lsls r1, 2 lsrs r0, r4, 6 @@ -737389,12 +737389,12 @@ _0817E978: ldrh r2, [r1] adds r0, r2 strh r0, [r1] -_0817E9BE: +@0817E9BE: ldrb r2, [r5] lsls r0, r2, 26 lsrs r0, 29 cmp r0, 0 - beq _0817EA6C + beq @0817EA6C subs r1, r0, 0x1 lsls r1, 2 lsrs r0, r2, 6 @@ -737403,14 +737403,14 @@ _0817E9BE: lsls r0, r3, 1 adds r0, r3 lsls r0, 4 - b _0817EA5A + b @0817EA5A .align 2, 0 .pool -_0817E9E0: +@0817E9E0: cmp r6, 0x8 - bhi _0817EA6C + bhi @0817EA6C cmp r5, 0 - beq _0817EA6C + beq @0817EA6C lsls r0, r3, 1 adds r3, r0, r3 lsls r0, r3, 2 @@ -737421,7 +737421,7 @@ _0817E9E0: lsls r0, 26 lsrs r0, 29 cmp r0, 0 - beq _0817EA6C + beq @0817EA6C subs r1, r0, 0x1 lsls r1, 2 adds r0, r2, 0 @@ -737440,14 +737440,14 @@ _0817E9E0: ldrh r0, [r0] ldrh r2, [r1] adds r0, r2 - b _0817EA6A + b @0817EA6A .align 2, 0 .pool -_0817EA28: +@0817EA28: cmp r6, 0x8 - bls _0817EA6C + bls @0817EA6C cmp r5, 0 - beq _0817EA6C + beq @0817EA6C lsls r0, r3, 1 adds r3, r0, r3 lsls r0, r3, 2 @@ -737458,7 +737458,7 @@ _0817EA28: lsls r0, 23 lsrs r0, 29 cmp r0, 0 - beq _0817EA6C + beq @0817EA6C subs r1, r0, 0x1 lsls r1, 2 adds r0, r2, 0 @@ -737469,19 +737469,19 @@ _0817EA28: adds r1, r0 lsls r1, 1 lsls r0, r3, 4 -_0817EA5A: +@0817EA5A: adds r1, r0 add r1, r8 ldr r0, =0x0860a834 add r0, r12 ldr r0, [r0] -_0817EA64: +@0817EA64: ldrh r0, [r0] ldrh r5, [r1] adds r0, r5 -_0817EA6A: +@0817EA6A: strh r0, [r1] -_0817EA6C: +@0817EA6C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -737494,7 +737494,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} @@ -737527,39 +737527,39 @@ sub_817EA80: @ 817EA80 lsls r0, 27 lsrs r0, 28 cmp r0, 0 - bne _0817EAC8 - b _0817EE50 -_0817EAC8: + bne @0817EAC8 + b @0817EE50 +@0817EAC8: subs r0, 0x1 cmp r0, 0xE - bls _0817EAD0 - b _0817EEBC -_0817EAD0: + bls @0817EAD0 + b @0817EEBC +@0817EAD0: lsls r0, 2 - ldr r1, =_0817EAEC + ldr r1, =@0817EAEC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0817EAEC: - .4byte _0817EB28 - .4byte _0817EB54 - .4byte _0817EB80 - .4byte _0817EBD4 - .4byte _0817EBFE - .4byte _0817EC26 - .4byte _0817EC4E - .4byte _0817EC6C - .4byte _0817EC9A - .4byte _0817ECCC - .4byte _0817ED54 - .4byte _0817ED82 - .4byte _0817EDC2 - .4byte _0817EE1C - .4byte _0817EEBC -_0817EB28: +@0817EAEC: + .4byte @0817EB28 + .4byte @0817EB54 + .4byte @0817EB80 + .4byte @0817EBD4 + .4byte @0817EBFE + .4byte @0817EC26 + .4byte @0817EC4E + .4byte @0817EC6C + .4byte @0817EC9A + .4byte @0817ECCC + .4byte @0817ED54 + .4byte @0817ED82 + .4byte @0817EDC2 + .4byte @0817EE1C + .4byte @0817EEBC +@0817EB28: lsls r0, r3, 3 lsls r1, r4, 4 adds r0, r1 @@ -737570,9 +737570,9 @@ _0817EB28: lsls r0, 29 lsrs r1, r0, 29 cmp r1, 0 - bne _0817EB40 - b _0817EEBC -_0817EB40: + bne @0817EB40 + b @0817EEBC +@0817EB40: movs r0, 0x1 adds r2, r4, 0 eors r2, r0 @@ -737582,8 +737582,8 @@ _0817EB40: adds r0, 0x32 ldrb r3, [r0] lsls r3, 28 - b _0817EE84 -_0817EB54: + b @0817EE84 +@0817EB54: lsls r0, r3, 3 lsls r1, r4, 4 adds r0, r1 @@ -737594,9 +737594,9 @@ _0817EB54: lsls r0, 26 lsrs r1, r0, 29 cmp r1, 0 - bne _0817EB6C - b _0817EEBC -_0817EB6C: + bne @0817EB6C + b @0817EEBC +@0817EB6C: movs r0, 0x1 adds r2, r4, 0 eors r2, r0 @@ -737606,8 +737606,8 @@ _0817EB6C: adds r0, 0x32 ldrb r3, [r0] lsls r3, 26 - b _0817EE84 -_0817EB80: + b @0817EE84 +@0817EB80: lsls r0, r3, 2 lsls r1, r4, 1 adds r1, r4 @@ -737618,7 +737618,7 @@ _0817EB80: lsls r0, 29 lsrs r1, r0, 29 cmp r1, 0 - beq _0817EBB4 + beq @0817EBB4 movs r0, 0x1 adds r2, r4, 0 eors r2, r0 @@ -737633,14 +737633,14 @@ _0817EB80: movs r0, 0x13 movs r1, 0 bl sub_817E684 -_0817EBB4: +@0817EBB4: ldrb r0, [r5] lsls r0, 26 lsrs r1, r0, 29 cmp r1, 0 - bne _0817EBC0 - b _0817EEBC -_0817EBC0: + bne @0817EBC0 + b @0817EEBC +@0817EBC0: movs r0, 0x1 adds r2, r4, 0 eors r2, r0 @@ -737650,8 +737650,8 @@ _0817EBC0: lsls r3, 26 lsrs r3, 30 adds r3, r0 - b _0817EE88 -_0817EBD4: + b @0817EE88 +@0817EBD4: lsls r0, r3, 2 lsls r1, r4, 1 adds r1, r4 @@ -737662,9 +737662,9 @@ _0817EBD4: lsls r0, 23 lsrs r3, r0, 29 cmp r3, 0 - bne _0817EBEC - b _0817EEBC -_0817EBEC: + bne @0817EBEC + b @0817EEBC +@0817EBEC: movs r0, 0x1 adds r2, r4, 0 eors r2, r0 @@ -737673,8 +737673,8 @@ _0817EBEC: ldrb r3, [r1, 0x2] lsrs r3, 6 adds r3, r0 - b _0817EE88 -_0817EBFE: + b @0817EE88 +@0817EBFE: lsls r0, r3, 3 lsls r1, r4, 4 adds r0, r1 @@ -737683,9 +737683,9 @@ _0817EBFE: lsls r0, 23 lsrs r1, r0, 29 cmp r1, 0 - bne _0817EC12 - b _0817EEBC -_0817EC12: + bne @0817EC12 + b @0817EEBC +@0817EC12: movs r0, 0x1 adds r2, r4, 0 eors r2, r0 @@ -737695,8 +737695,8 @@ _0817EC12: adds r0, 0x32 ldrb r3, [r0] lsrs r3, 6 - b _0817EE86 -_0817EC26: + b @0817EE86 +@0817EC26: lsls r0, r3, 3 lsls r1, r4, 4 adds r0, r1 @@ -737707,9 +737707,9 @@ _0817EC26: lsls r0, 28 lsrs r1, r0, 29 cmp r1, 0 - bne _0817EC3E - b _0817EEBC -_0817EC3E: + bne @0817EC3E + b @0817EEBC +@0817EC3E: movs r0, 0x1 adds r2, r4, 0 eors r2, r0 @@ -737717,8 +737717,8 @@ _0817EC3E: lsls r1, 2 adds r0, r3, 0 adds r0, 0x33 - b _0817EE80 -_0817EC4E: + b @0817EE80 +@0817EC4E: lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -737729,13 +737729,13 @@ _0817EC4E: lsls r0, 29 lsrs r1, r0, 29 cmp r1, 0 - bne _0817EC66 - b _0817EEBC -_0817EC66: + bne @0817EC66 + b @0817EEBC +@0817EC66: movs r0, 0x1 adds r2, r4, 0 - b _0817EE76 -_0817EC6C: + b @0817EE76 +@0817EC6C: lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -737744,9 +737744,9 @@ _0817EC6C: lsls r0, 14 lsrs r0, 29 cmp r0, 0 - bne _0817EC80 - b _0817EEBC -_0817EC80: + bne @0817EC80 + b @0817EEBC +@0817EC80: adds r2, r4, 0 subs r1, r0, 0x1 lsls r1, 2 @@ -737759,8 +737759,8 @@ _0817EC80: lsls r3, 24 lsrs r3, 24 movs r0, 0x14 - b _0817EE8E -_0817EC9A: + b @0817EE8E +@0817EC9A: lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -737771,9 +737771,9 @@ _0817EC9A: lsls r0, 27 lsrs r0, 29 cmp r0, 0 - bne _0817ECB2 - b _0817EEBC -_0817ECB2: + bne @0817ECB2 + b @0817EEBC +@0817ECB2: adds r2, r4, 0 subs r1, r0, 0x1 lsls r1, 2 @@ -737786,8 +737786,8 @@ _0817ECB2: lsls r3, 24 lsrs r3, 24 movs r0, 0x14 - b _0817EE8E -_0817ECCC: + b @0817EE8E +@0817ECCC: lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -737797,7 +737797,7 @@ _0817ECCC: ldrb r0, [r0] lsls r0, 25 cmp r0, 0 - bge _0817ED14 + bge @0817ED14 adds r0, r3, 0 adds r0, 0x52 ldrb r0, [r0] @@ -737810,7 +737810,7 @@ _0817ECCC: adds r0, r1 ldrh r0, [r0] cmp r6, r0 - beq _0817ED14 + beq @0817ED14 adds r2, r4, 0 lsls r1, r6, 2 adds r0, r3, 0 @@ -737823,7 +737823,7 @@ _0817ECCC: movs r0, 0x13 movs r1, 0 bl sub_817E684 -_0817ED14: +@0817ED14: movs r1, 0x1 eors r1, r4 lsls r0, r1, 1 @@ -737835,9 +737835,9 @@ _0817ED14: ldrb r0, [r0] lsls r0, 25 cmp r0, 0 - blt _0817ED2E - b _0817EEBC -_0817ED2E: + blt @0817ED2E + b @0817EEBC +@0817ED2E: movs r0, 0x1 adds r2, r4, 0 eors r2, r0 @@ -737851,10 +737851,10 @@ _0817ED2E: ldrb r3, [r1] lsrs r3, 6 adds r3, r0 - b _0817EE88 + b @0817EE88 .align 2, 0 .pool -_0817ED54: +@0817ED54: movs r0, 0x1 eors r0, r4 lsls r1, r0, 1 @@ -737866,9 +737866,9 @@ _0817ED54: lsls r0, 25 lsrs r5, r0, 29 cmp r5, 0 - bne _0817ED6E - b _0817EEBC -_0817ED6E: + bne @0817ED6E + b @0817EEBC +@0817ED6E: movs r0, 0x1 adds r2, r4, 0 eors r2, r0 @@ -737878,8 +737878,8 @@ _0817ED6E: lsls r3, 23 lsrs r3, 30 adds r3, r0 - b _0817EE88 -_0817ED82: + b @0817EE88 +@0817ED82: lsls r2, r4, 4 movs r1, 0x1 adds r0, r4, 0 @@ -737889,12 +737889,12 @@ _0817ED82: adds r0, 0x30 adds r4, r2, r0 movs r5, 0x1 -_0817ED94: +@0817ED94: ldr r0, [r4] lsls r0, 14 lsrs r0, 29 cmp r0, 0 - beq _0817EDB8 + beq @0817EDB8 subs r0, 0x1 lsls r0, 2 ldrb r3, [r4, 0x3] @@ -737907,13 +737907,13 @@ _0817ED94: movs r1, 0 lsrs r2, r6, 24 bl sub_817E684 -_0817EDB8: +@0817EDB8: adds r4, 0x8 subs r5, 0x1 cmp r5, 0 - bge _0817ED94 - b _0817EEBC -_0817EDC2: + bge @0817ED94 + b @0817EEBC +@0817EDC2: lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -737922,7 +737922,7 @@ _0817EDC2: ldrb r3, [r0] lsls r0, r3, 31 cmp r0, 0 - beq _0817EDF0 + beq @0817EDF0 adds r2, r4, 0 lsls r0, r3, 26 lsrs r0, 29 @@ -737936,7 +737936,7 @@ _0817EDC2: movs r0, 0x13 movs r1, 0 bl sub_817E684 -_0817EDF0: +@0817EDF0: movs r0, 0x1 eors r0, r4 lsls r1, r0, 1 @@ -737947,7 +737947,7 @@ _0817EDF0: ldrb r1, [r1] lsls r0, r1, 31 cmp r0, 0 - beq _0817EEBC + beq @0817EEBC movs r0, 0x1 adds r2, r4, 0 eors r2, r0 @@ -737958,10 +737958,10 @@ _0817EDF0: lsls r3, r1, 29 lsrs r3, 30 adds r3, r0 - b _0817EE88 -_0817EE1C: + b @0817EE88 +@0817EE1C: cmp r7, 0x1 - bne _0817EEBC + bne @0817EEBC adds r2, r4, 0 ldr r1, =0x0202406e ldr r0, =0x0202420b @@ -737981,10 +737981,10 @@ _0817EE1C: lsls r3, 24 lsrs r3, 24 movs r0, 0x14 - b _0817EE8E + b @0817EE8E .align 2, 0 .pool -_0817EE50: +@0817EE50: lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -737995,37 +737995,37 @@ _0817EE50: lsls r0, 27 lsrs r0, 28 cmp r0, 0x7 - bne _0817EE96 + bne @0817EE96 adds r0, r3, 0 adds r0, 0x50 ldrb r0, [r0] lsls r0, 29 lsrs r1, r0, 29 cmp r1, 0 - beq _0817EEBC + beq @0817EEBC movs r0, 0x1 -_0817EE76: +@0817EE76: eors r2, r0 subs r1, 0x1 lsls r1, 2 adds r0, r3, 0 adds r0, 0x54 -_0817EE80: +@0817EE80: ldrb r3, [r0] lsls r3, 30 -_0817EE84: +@0817EE84: lsrs r3, 30 -_0817EE86: +@0817EE86: adds r3, r1 -_0817EE88: +@0817EE88: lsls r3, 24 lsrs r3, 24 movs r0, 0x13 -_0817EE8E: +@0817EE8E: movs r1, 0 bl sub_817E684 - b _0817EEBC -_0817EE96: + b @0817EEBC +@0817EE96: adds r2, r4, 0 ldr r1, =0x0202406e mov r3, r8 @@ -738044,7 +738044,7 @@ _0817EE96: movs r0, 0x14 movs r1, 0 bl sub_817E684 -_0817EEBC: +@0817EEBC: pop {r3} mov r8, r3 pop {r4-r7} @@ -738055,7 +738055,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 @@ -738067,18 +738067,18 @@ sub_817EECC: @ 817EECC ldr r1, =0x02000003 ands r0, r1 cmp r0, 0 - beq _0817EEE6 - b _0817F1FA -_0817EEE6: + beq @0817EEE6 + b @0817F1FA +@0817EEE6: ldr r4, =0x0202420b ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _0817EEF8 - b _0817F1FA -_0817EEF8: + bne @0817EEF8 + b @0817F1FA +@0817EEF8: ldr r5, =0x02024084 ldrb r4, [r4] movs r1, 0x58 @@ -738089,9 +738089,9 @@ _0817EEF8: lsls r0, 24 asrs r0, 24 cmp r0, 0x5 - bgt _0817EF10 - b _0817F1FA -_0817EF10: + bgt @0817EF10 + b @0817F1FA +@0817EF10: ldr r0, =0x0202420c ldrb r0, [r0] muls r0, r1 @@ -738100,28 +738100,28 @@ _0817EF10: lsls r0, 24 asrs r0, 24 cmp r0, 0x6 - ble _0817EF24 - b _0817F1FA -_0817EF24: + ble @0817EF24 + b @0817F1FA +@0817EF24: ldr r0, =0x020241ea ldrh r1, [r0] cmp r1, 0xED - bne _0817EF2E - b _0817F1FA -_0817EF2E: + bne @0817EF2E + b @0817F1FA +@0817EF2E: ldr r0, =0x00000137 cmp r1, r0 - bne _0817EF36 - b _0817F1FA -_0817EF36: + bne @0817EF36 + b @0817F1FA +@0817EF36: ldr r0, [r7] movs r1, 0xC8 lsls r1, 14 ands r0, r1 cmp r0, 0 - beq _0817EF44 - b _0817F1FA -_0817EF44: + beq @0817EF44 + b @0817F1FA +@0817EF44: ldr r3, =0x0831c898 ldr r2, =0x020244b0 adds r0, r4, r2 @@ -738139,35 +738139,35 @@ _0817EF44: ldrb r0, [r0, 0x1] adds r6, r2, 0 cmp r0, 0 - bne _0817EF6A - b _0817F1FA -_0817EF6A: + bne @0817EF6A + b @0817F1FA +@0817EF6A: movs r5, 0 str r1, [sp, 0x24] ldr r1, =0x0860a4ac ldr r4, =0x0000ffff adds r3, r1, 0 adds r2, r1, 0 -_0817EF76: +@0817EF76: ldr r0, [sp, 0x24] ldrh r7, [r2] cmp r0, r7 - beq _0817EF8A + beq @0817EF8A adds r3, 0x2 adds r2, 0x2 adds r5, 0x1 ldrh r0, [r3] cmp r0, r4 - bne _0817EF76 -_0817EF8A: + bne @0817EF76 +@0817EF8A: lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] ldr r0, =0x0000ffff cmp r1, r0 - beq _0817EF98 - b _0817F1FA -_0817EF98: + beq @0817EF98 + b @0817F1FA +@0817EF98: ldr r2, =0x0202420b ldrb r0, [r2] adds r0, r6 @@ -738189,7 +738189,7 @@ _0817EF98: add r7, sp, 0x10 ldr r4, =0x0202420c mov r9, r4 -_0817EFC2: +@0817EFC2: lsls r1, r5, 1 ldr r6, =0x0202420b ldrb r0, [r6] @@ -738211,7 +738211,7 @@ _0817EFC2: bl sub_817F21C lsls r0, 24 cmp r0, 0 - beq _0817F0B4 + beq @0817F0B4 ldr r4, =0x0202428e mov r1, r9 ldrb r0, [r1] @@ -738258,7 +738258,7 @@ _0817EFC2: lsls r1, 2 ands r0, r1 cmp r0, 0 - beq _0817F06A + beq @0817F06A ldr r2, =0x0831c898 mov r6, r8 ldrh r1, [r6] @@ -738268,10 +738268,10 @@ _0817EFC2: adds r0, r2 ldrb r0, [r0, 0x2] cmp r0, 0xD - bne _0817F06A + bne @0817F06A lsls r0, r3, 1 str r0, [r4] -_0817F06A: +@0817F06A: ldr r0, =0x0202433c ldr r6, =0x0202420b ldrb r1, [r6] @@ -738280,7 +738280,7 @@ _0817F06A: ldrb r0, [r1] lsls r0, 28 cmp r0, 0 - bge _0817F08C + bge @0817F08C ldr r4, =0x020241f0 ldr r1, [r4] lsls r0, r1, 4 @@ -738288,7 +738288,7 @@ _0817F06A: movs r1, 0xA bl __divsi3 str r0, [r4] -_0817F08C: +@0817F08C: mov r1, r8 ldrh r0, [r1] ldrb r1, [r6] @@ -738301,18 +738301,18 @@ _0817F08C: ldr r0, [r0] str r0, [r7] cmp r0, 0 - bne _0817F0B4 + bne @0817F0B4 movs r0, 0x29 ands r0, r1 cmp r0, 0 - bne _0817F0B4 + bne @0817F0B4 movs r0, 0x1 str r0, [r7] -_0817F0B4: +@0817F0B4: adds r7, 0x4 adds r5, 0x1 cmp r5, 0x3 - ble _0817EFC2 + ble @0817EFC2 movs r5, 0 ldr r3, =0x0202420b ldr r6, =0x020244b0 @@ -738321,14 +738321,14 @@ _0817F0B4: movs r7, 0x64 mov r9, r7 mov r10, r6 -_0817F0CC: +@0817F0CC: ldrb r0, [r3] adds r0, r6 ldrb r2, [r0] cmp r5, r2 - bne _0817F0D8 - b _0817F1D4 -_0817F0D8: + bne @0817F0D8 + b @0817F1D4 +@0817F0D8: lsls r0, r5, 2 mov r1, sp adds r1, r0 @@ -738339,12 +738339,12 @@ _0817F0D8: ldr r1, [r1] ldr r0, [r0] cmp r1, r0 - ble _0817F1D4 + ble @0817F1D4 movs r7, 0x1 cmp r2, 0 - beq _0817F0F6 + beq @0817F0F6 movs r7, 0 -_0817F0F6: +@0817F0F6: movs r5, 0 ldr r4, =0x0202420c ldr r6, =0x02024744 @@ -738353,22 +738353,22 @@ _0817F0F6: add r0, r10 ldrb r3, [r0] add r2, sp, 0x10 -_0817F106: +@0817F106: cmp r5, r3 - beq _0817F11A + beq @0817F11A lsls r0, r7, 2 add r0, sp adds r0, 0x10 ldr r1, [r2] ldr r0, [r0] cmp r1, r0 - ble _0817F11A + ble @0817F11A adds r7, r5, 0 -_0817F11A: +@0817F11A: adds r2, 0x4 adds r5, 0x1 cmp r5, 0x3 - ble _0817F106 + ble @0817F106 ldrb r0, [r4] lsls r0, 1 add r0, r8 @@ -738416,15 +738416,15 @@ _0817F11A: str r0, [sp] adds r0, r6, 0 bl sub_80EE35C - b _0817F1DC + b @0817F1DC .align 2, 0 .pool -_0817F1D4: +@0817F1D4: adds r5, 0x1 cmp r5, 0x3 - bgt _0817F1DC - b _0817F0CC -_0817F1DC: + bgt @0817F1DC + b @0817F0CC +@0817F1DC: ldr r2, =0x020241f0 ldr r1, =0x020244b0 ldr r0, =0x0202420b @@ -738440,7 +738440,7 @@ _0817F1DC: mov r3, sp ldrh r3, [r3, 0x24] strh r3, [r0] -_0817F1FA: +@0817F1FA: add sp, 0x28 pop {r3-r5} mov r8, r3 @@ -738454,7 +738454,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 @@ -738467,37 +738467,37 @@ sub_817F21C: @ 817F21C adds r0, r1 ldrb r0, [r0, 0x1] cmp r0, 0 - beq _0817F286 + beq @0817F286 movs r4, 0 ldr r5, =0x0860a4ac ldr r7, =0x0000ffff adds r3, r5, 0 adds r1, r5, 0 -_0817F240: +@0817F240: ldrh r0, [r1] cmp r2, r0 - beq _0817F252 + beq @0817F252 adds r3, 0x2 adds r1, 0x2 adds r4, 0x1 ldrh r0, [r3] cmp r0, r7 - bne _0817F240 -_0817F252: + bne @0817F240 +@0817F252: lsls r0, r4, 1 adds r0, r5 ldrh r1, [r0] ldr r0, =0x0000ffff cmp r1, r0 - beq _0817F270 + beq @0817F270 movs r0, 0 str r0, [r6] - b _0817F2A0 + b @0817F2A0 .align 2, 0 .pool -_0817F270: +@0817F270: cmp r2, 0x95 - bne _0817F294 + bne @0817F294 ldr r2, =0x02024084 ldr r0, =0x0202420b ldrb r1, [r0] @@ -738507,35 +738507,35 @@ _0817F270: adds r0, 0x2A ldrb r0, [r0] asrs r0, 1 -_0817F286: +@0817F286: str r0, [r6] movs r0, 0 - b _0817F2A0 + b @0817F2A0 .align 2, 0 .pool -_0817F294: +@0817F294: cmp r2, 0xDE - bne _0817F29E + bne @0817F29E movs r0, 0xA mov r1, r12 strh r0, [r1] -_0817F29E: +@0817F29E: movs r0, 0x1 -_0817F2A0: +@0817F2A0: pop {r4-r7} pop {r1} bx r1 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] movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _0817F324 + beq @0817F324 ldr r0, =0x0202449c ldr r3, [r0] ldr r0, =0x0000025b @@ -738591,7 +738591,7 @@ sub_817F2A8: @ 817F2A8 ldrb r0, [r3] ands r1, r0 strb r1, [r3] -_0817F324: +@0817F324: pop {r4,r5} pop {r0} bx r0 @@ -738600,7 +738600,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 @@ -738611,21 +738611,21 @@ sub_817F33C: @ 817F33C lsls r0, 24 ldr r6, =0x02024744 cmp r0, 0 - bne _0817F356 + bne @0817F356 ldr r6, =0x020244ec -_0817F356: +@0817F356: movs r4, 0 ldr r1, =0x0202406e lsls r0, r5, 1 adds r5, r0, r1 - b _0817F36E + b @0817F36E .align 2, 0 .pool -_0817F36C: +@0817F36C: adds r4, 0x1 -_0817F36E: +@0817F36E: cmp r4, 0x3 - bgt _0817F388 + bgt @0817F388 ldrh r1, [r5] movs r0, 0x64 muls r0, r1 @@ -738635,8 +738635,8 @@ _0817F36E: movs r2, 0 bl pokemon_getattr cmp r0, r7 - bne _0817F36C -_0817F388: + bne @0817F36C +@0817F388: lsls r0, r4, 24 lsrs r0, 24 pop {r4-r7} @@ -738645,7 +738645,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 @@ -738659,49 +738659,49 @@ sub_817F394: @ 817F394 movs r0, 0x7 ands r0, r3 cmp r0, 0 - beq _0817F3B4 + beq @0817F3B4 movs r0, 0x3 - b _0817F3CA -_0817F3B4: + b @0817F3CA +@0817F3B4: movs r0, 0x60 ands r0, r3 cmp r0, 0 - beq _0817F3C0 + beq @0817F3C0 movs r0, 0x4 - b _0817F3CA -_0817F3C0: + b @0817F3CA +@0817F3C0: movs r0, 0x18 ands r0, r3 cmp r0, 0 - beq _0817F3D2 + beq @0817F3D2 movs r0, 0x5 -_0817F3CA: +@0817F3CA: movs r3, 0 bl sub_817E684 - b _0817F3E6 -_0817F3D2: + b @0817F3E6 +@0817F3D2: movs r0, 0x80 ands r4, r0 cmp r4, 0 - beq _0817F3E6 + beq @0817F3E6 movs r0, 0x6 adds r1, r6, 0 adds r2, r5, 0 movs r3, 0 bl sub_817E684 -_0817F3E6: +@0817F3E6: pop {r4-r6} pop {r0} bx r0 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 @@ -738767,7 +738767,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 @@ -738775,22 +738775,22 @@ sub_817F474: @ 817F474 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _0817F48C + bne @0817F48C movs r0, 0 - b _0817F492 + b @0817F492 .align 2, 0 .pool -_0817F48C: +@0817F48C: subs r0, 0x1 lsls r0, 24 lsrs r0, 24 -_0817F492: +@0817F492: pop {r1} bx r1 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} @@ -738813,7 +738813,7 @@ sub_817F498: @ 817F498 ldr r0, =nullsub_12 + 1 mov r12, r0 cmp r4, 0 - bne _0817F508 + bne @0817F508 ldrh r0, [r3, 0x2E] strh r0, [r2, 0x10] ldrh r0, [r3, 0x32] @@ -738828,12 +738828,12 @@ sub_817F498: @ 817F498 movs r4, 0 adds r2, r3, 0 adds r2, 0x32 -_0817F4E2: +@0817F4E2: strh r4, [r2] adds r2, 0x2 adds r0, 0x1 cmp r0, 0x7 - bls _0817F4E2 + bls @0817F4E2 adds r1, r5 lsls r1, 3 add r1, r8 @@ -738848,10 +738848,10 @@ _0817F4E2: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_0817F508: +@0817F508: ldr r0, [r3, 0x1C] cmp r0, r12 - bne _0817F528 + bne @0817F528 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -738864,7 +738864,7 @@ _0817F508: strh r2, [r3, 0x30] adds r0, r5, 0 bl remove_task -_0817F528: +@0817F528: pop {r3} mov r8, r3 pop {r4-r7} @@ -738875,7 +738875,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 @@ -738902,7 +738902,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 @@ -738918,7 +738918,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 @@ -738969,7 +738969,7 @@ sub_817F594: @ 817F594 thumb_func_end sub_817F594 thumb_func_start sub_817F60C -sub_817F60C: @ 817F60C +sub_817F60C: ; 817F60C ldr r1, =nullsub_69 + 1 str r1, [r0, 0x1C] bx lr @@ -738978,7 +738978,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 @@ -739001,7 +739001,7 @@ sub_817F618: @ 817F618 adds r1, r5, 0 movs r2, 0x1 movs r3, 0x2 - bl _082E709C + bl ObjAffineSet ldr r0, =0x02021bc0 lsls r4, 3 adds r4, r0 @@ -739022,7 +739022,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] @@ -739034,25 +739034,25 @@ sub_817F670: @ 817F670 ldr r0, =0x03001274 ldr r0, [r0] cmp r0, 0x1 - bne _0817F68E + bne @0817F68E adds r0, r4, 0 bl obj_alloc_rotscale_entry -_0817F68E: +@0817F68E: movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0817F6A8 + bne @0817F6A8 adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 - b _0817F6B0 + b @0817F6B0 .align 2, 0 .pool -_0817F6A8: +@0817F6A8: adds r0, r4, 0 movs r1, 0 bl sub_8008258 -_0817F6B0: +@0817F6B0: ldrb r3, [r4, 0x1] lsrs r1, r3, 6 ldrb r2, [r4, 0x3] @@ -739073,7 +739073,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 @@ -739085,14 +739085,14 @@ sub_817F6D4: @ 817F6D4 movs r5, 0x30 ldrsh r0, [r4, r5] cmp r0, 0 - bne _0817F6F8 + bne @0817F6F8 lsls r0, r1, 16 negs r0, r0 lsrs r1, r0, 16 negs r0, r3 lsls r0, 16 lsrs r3, r0, 16 -_0817F6F8: +@0817F6F8: lsls r1, 16 asrs r1, 16 lsls r2, 16 @@ -739105,29 +739105,29 @@ _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 ldrsh r0, [r1, r2] cmp r0, 0 - bne _0817F720 + bne @0817F720 movs r2, 0x24 ldrsh r0, [r1, r2] negs r0, r0 strh r0, [r1, 0x24] -_0817F720: +@0817F720: pop {r0} bx r0 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 cmp r2, 0x3 - bhi _0817F750 + bhi @0817F750 ldr r1, =0x03001240 lsls r0, r2, 1 adds r0, r2 @@ -739141,18 +739141,18 @@ sub_817F724: @ 817F724 strh r2, [r0, 0x2] strh r2, [r0, 0x8] movs r0, 0x1 - b _0817F752 + b @0817F752 .align 2, 0 .pool -_0817F750: +@0817F750: movs r0, 0 -_0817F752: +@0817F752: pop {r1} bx r1 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] @@ -739173,7 +739173,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] @@ -739193,21 +739193,21 @@ sub_817F77C: @ 817F77C ldr r0, =0x03001274 ldr r0, [r0] cmp r0, 0x1 - bne _0817F800 + bne @0817F800 movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0817F7C0 + bne @0817F7C0 adds r1, r4, 0 adds r1, 0x3F ldrb r0, [r1] orrs r0, r5 strb r0, [r1] adds r5, r1, 0 - b _0817F7D0 + b @0817F7D0 .align 2, 0 .pool -_0817F7C0: +@0817F7C0: adds r0, r4, 0 adds r0, 0x3F ldrb r2, [r0] @@ -739216,7 +739216,7 @@ _0817F7C0: ands r1, r2 strb r1, [r0] adds r5, r0, 0 -_0817F7D0: +@0817F7D0: ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 @@ -739240,27 +739240,27 @@ _0817F7D0: negs r0, r0 ands r0, r1 strb r0, [r4, 0x1] -_0817F800: +@0817F800: pop {r4,r5} pop {r0} bx r0 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 ldrsh r0, [r6, r1] cmp r0, 0 - bne _0817F81A + bne @0817F81A adds r0, r6, 0 bl sub_817F670 -_0817F81A: +@0817F81A: movs r1, 0x32 ldrsh r0, [r6, r1] cmp r0, 0x28 - ble _0817F840 + ble @0817F840 movs r2, 0x80 lsls r2, 1 adds r0, r6, 0 @@ -739271,10 +739271,10 @@ _0817F81A: bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r6, 0x1C] - b _0817F88C + b @0817F88C .align 2, 0 .pool -_0817F840: +@0817F840: movs r1, 0x32 ldrsh r0, [r6, r1] lsls r0, 9 @@ -739282,9 +739282,9 @@ _0817F840: bl __divsi3 adds r4, r0, 0 cmp r0, 0 - bge _0817F854 + bge @0817F854 adds r4, 0xFF -_0817F854: +@0817F854: asrs r4, 8 lsls r4, 8 subs r4, r0, r4 @@ -739310,7 +739310,7 @@ _0817F854: adds r0, r6, 0 movs r3, 0 bl sub_817F6D4 -_0817F88C: +@0817F88C: ldrh r0, [r6, 0x32] adds r0, 0x1 strh r0, [r6, 0x32] @@ -739320,28 +739320,28 @@ _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] movs r2, 0x32 ldrsh r0, [r4, r2] cmp r0, 0x28 - ble _0817F8B4 + ble @0817F8B4 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 - b _0817F8EE + b @0817F8EE .align 2, 0 .pool -_0817F8B4: +@0817F8B4: movs r0, 0x1 ands r0, r1 movs r5, 0xFF cmp r0, 0 - bne _0817F8C0 + bne @0817F8C0 movs r5, 0x1 -_0817F8C0: +@0817F8C0: movs r1, 0x32 ldrsh r0, [r4, r1] lsls r0, 7 @@ -739349,9 +739349,9 @@ _0817F8C0: bl __divsi3 adds r1, r0, 0 cmp r1, 0 - bge _0817F8D4 + bge @0817F8D4 adds r0, 0xFF -_0817F8D4: +@0817F8D4: asrs r0, 8 lsls r0, 8 subs r0, r1, r0 @@ -739364,7 +739364,7 @@ _0817F8D4: adds r2, r0, 0 muls r2, r1 adds r0, r2, 0 -_0817F8EE: +@0817F8EE: strh r0, [r4, 0x24] ldrh r0, [r4, 0x32] adds r0, 0x1 @@ -739375,7 +739375,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 @@ -739384,14 +739384,14 @@ sub_817F8FC: @ 817F8FC movs r2, 0x2E ldrsh r0, [r4, r2] cmp r1, r0 - ble _0817F91C + ble @0817F91C ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 - b _0817F946 + b @0817F946 .align 2, 0 .pool -_0817F91C: +@0817F91C: movs r0, 0x32 ldrsh r1, [r4, r0] lsls r0, r1, 1 @@ -739402,9 +739402,9 @@ _0817F91C: bl __divsi3 adds r1, r0, 0 cmp r1, 0 - bge _0817F936 + bge @0817F936 adds r0, 0xFF -_0817F936: +@0817F936: asrs r0, 8 lsls r0, 8 subs r0, r1, r0 @@ -739412,7 +739412,7 @@ _0817F936: asrs r0, 16 movs r1, 0x6 bl sine -_0817F946: +@0817F946: strh r0, [r4, 0x24] ldrh r0, [r4, 0x32] adds r0, 0x1 @@ -739425,7 +739425,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 @@ -739442,7 +739442,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 @@ -739451,14 +739451,14 @@ sub_817F978: @ 817F978 movs r2, 0x2E ldrsh r0, [r4, r2] cmp r1, r0 - ble _0817F998 + ble @0817F998 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 - b _0817F9C4 + b @0817F9C4 .align 2, 0 .pool -_0817F998: +@0817F998: movs r0, 0x32 ldrsh r1, [r4, r0] lsls r0, r1, 1 @@ -739469,9 +739469,9 @@ _0817F998: bl __divsi3 adds r1, r0, 0 cmp r1, 0 - bge _0817F9B2 + bge @0817F9B2 adds r0, 0xFF -_0817F9B2: +@0817F9B2: asrs r0, 8 lsls r0, 8 subs r0, r1, r0 @@ -739480,7 +739480,7 @@ _0817F9B2: movs r1, 0x6 bl sine negs r0, r0 -_0817F9C4: +@0817F9C4: strh r0, [r4, 0x26] ldrh r0, [r4, 0x32] adds r0, 0x1 @@ -739493,7 +739493,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 @@ -739510,7 +739510,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 @@ -739518,29 +739518,29 @@ sub_817F9F4: @ 817F9F4 movs r0, 0xC0 lsls r0, 1 cmp r1, r0 - ble _0817FA14 + ble @0817FA14 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] - b _0817FA5E + b @0817FA5E .align 2, 0 .pool -_0817FA14: +@0817FA14: adds r0, r1, 0 cmp r1, 0 - bge _0817FA1C + bge @0817FA1C adds r0, 0x7F -_0817FA1C: +@0817FA1C: asrs r2, r0, 7 lsls r0, r2, 16 asrs r0, 16 cmp r0, 0 - blt _0817FA60 + blt @0817FA60 cmp r0, 0x1 - ble _0817FA48 + ble @0817FA48 cmp r0, 0x3 - bgt _0817FA60 + bgt @0817FA60 ldr r2, =0xffffff00 adds r1, r2 lsls r0, r1, 16 @@ -739550,10 +739550,10 @@ _0817FA1C: lsls r1, r2, 1 adds r1, r2 lsls r1, 16 - b _0817FA56 + b @0817FA56 .align 2, 0 .pool -_0817FA48: +@0817FA48: lsls r0, r2, 7 subs r0, r1, r0 lsls r0, 16 @@ -739561,13 +739561,13 @@ _0817FA48: movs r2, 0x2E ldrsh r1, [r4, r2] lsls r1, 17 -_0817FA56: +@0817FA56: asrs r1, 16 bl sine negs r0, r0 -_0817FA5E: +@0817FA5E: strh r0, [r4, 0x26] -_0817FA60: +@0817FA60: ldrh r0, [r4, 0x32] adds r0, 0xC strh r0, [r4, 0x32] @@ -739577,7 +739577,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 @@ -739594,7 +739594,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 @@ -739602,103 +739602,103 @@ pokemonanimfunc_06: @ 817FA88 movs r0, 0xC0 lsls r0, 2 cmp r2, r0 - ble _0817FAA8 + ble @0817FAA8 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] - b _0817FB56 + b @0817FB56 .align 2, 0 .pool -_0817FAA8: +@0817FAA8: adds r0, r2, 0 cmp r2, 0 - bge _0817FAB0 + bge @0817FAB0 adds r0, 0x7F -_0817FAB0: +@0817FAB0: lsls r0, 9 asrs r0, 16 cmp r0, 0x5 - bhi _0817FB3C + bhi @0817FB3C lsls r0, 2 - ldr r1, =_0817FAC8 + ldr r1, =@0817FAC8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0817FAC8: - .4byte _0817FAE0 - .4byte _0817FAE0 - .4byte _0817FAE4 - .4byte _0817FAE8 - .4byte _0817FB04 - .4byte _0817FB1E -_0817FAE0: +@0817FAC8: + .4byte @0817FAE0 + .4byte @0817FAE0 + .4byte @0817FAE4 + .4byte @0817FAE8 + .4byte @0817FB04 + .4byte @0817FB1E +@0817FAE0: movs r0, 0 - b _0817FB3A -_0817FAE4: + b @0817FB3A +@0817FAE4: movs r2, 0 - b _0817FB3C -_0817FAE8: + b @0817FB3C +@0817FAE8: adds r0, r2, 0 cmp r2, 0 - bge _0817FAF0 + bge @0817FAF0 adds r0, 0x7F -_0817FAF0: +@0817FAF0: asrs r0, 7 lsls r0, 7 subs r0, r2, r0 lsls r0, 3 negs r0, r0 cmp r0, 0 - bge _0817FB00 + bge @0817FB00 adds r0, 0x7F -_0817FB00: +@0817FB00: asrs r0, 7 - b _0817FB3A -_0817FB04: + b @0817FB3A +@0817FB04: adds r0, r2, 0 cmp r2, 0 - bge _0817FB0C + bge @0817FB0C adds r0, 0x7F -_0817FB0C: +@0817FB0C: asrs r0, 7 lsls r0, 7 subs r0, r2, r0 cmp r0, 0 - bge _0817FB18 + bge @0817FB18 adds r0, 0x7 -_0817FB18: +@0817FB18: asrs r0, 3 subs r0, 0x8 - b _0817FB3A -_0817FB1E: + b @0817FB3A +@0817FB1E: adds r0, r2, 0 cmp r2, 0 - bge _0817FB26 + bge @0817FB26 adds r0, 0x7F -_0817FB26: +@0817FB26: asrs r0, 7 lsls r0, 7 subs r0, r2, r0 lsls r0, 3 negs r0, r0 cmp r0, 0 - bge _0817FB36 + bge @0817FB36 adds r0, 0x7F -_0817FB36: +@0817FB36: asrs r0, 7 adds r0, 0x8 -_0817FB3A: +@0817FB3A: strh r0, [r4, 0x24] -_0817FB3C: +@0817FB3C: adds r0, r2, 0 cmp r2, 0 - bge _0817FB44 + bge @0817FB44 adds r0, 0x7F -_0817FB44: +@0817FB44: asrs r0, 7 lsls r0, 7 subs r0, r2, r0 @@ -739707,7 +739707,7 @@ _0817FB44: movs r1, 0x8 bl sine negs r0, r0 -_0817FB56: +@0817FB56: strh r0, [r4, 0x26] ldrh r0, [r4, 0x32] adds r0, 0xC @@ -739718,20 +739718,20 @@ _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 ldrsh r0, [r6, r1] cmp r0, 0 - bne _0817FB76 + bne @0817FB76 adds r0, r6, 0 bl sub_817F670 -_0817FB76: +@0817FB76: movs r1, 0x32 ldrsh r0, [r6, r1] cmp r0, 0x28 - ble _0817FB9C + ble @0817FB9C movs r2, 0x80 lsls r2, 1 adds r0, r6, 0 @@ -739742,10 +739742,10 @@ _0817FB76: bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r6, 0x1C] - b _0817FC12 + b @0817FC12 .align 2, 0 .pool -_0817FB9C: +@0817FB9C: movs r1, 0x32 ldrsh r0, [r6, r1] lsls r0, 8 @@ -739753,9 +739753,9 @@ _0817FB9C: bl __divsi3 adds r1, r0, 0 cmp r1, 0 - bge _0817FBB0 + bge @0817FBB0 adds r0, 0xFF -_0817FBB0: +@0817FBB0: asrs r0, 8 lsls r0, 8 subs r0, r1, r0 @@ -739765,7 +739765,7 @@ _0817FBB0: movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _0817FBE0 + bne @0817FBE0 lsls r4, 16 asrs r4, 16 adds r0, r4, 0 @@ -739778,8 +739778,8 @@ _0817FBB0: strh r0, [r6, 0x36] adds r0, r4, 0 movs r1, 0x20 - b _0817FBFA -_0817FBE0: + b @0817FBFA +@0817FBE0: lsls r4, 16 asrs r4, 16 adds r0, r4, 0 @@ -739792,7 +739792,7 @@ _0817FBE0: strh r0, [r6, 0x36] adds r0, r4, 0 movs r1, 0x8 -_0817FBFA: +@0817FBFA: bl sine adds r0, r5 strh r0, [r6, 0x38] @@ -739803,7 +739803,7 @@ _0817FBFA: adds r0, r6, 0 movs r3, 0 bl sub_817F6D4 -_0817FC12: +@0817FC12: ldrh r0, [r6, 0x32] adds r0, 0x1 strh r0, [r6, 0x32] @@ -739813,16 +739813,16 @@ _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 movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0817FC32 + bne @0817FC32 strh r0, [r4, 0x34] -_0817FC32: +@0817FC32: ldr r2, =0x0860ad70 movs r5, 0x34 ldrsh r1, [r4, r5] @@ -739835,22 +739835,22 @@ _0817FC32: movs r5, 0x32 ldrsh r0, [r4, r5] cmp r1, r0 - bne _0817FC6A + bne @0817FC6A adds r0, r1, 0 cmp r0, 0 - bne _0817FC60 + bne @0817FC60 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _0817FC6A + b @0817FC6A .align 2, 0 .pool -_0817FC60: +@0817FC60: ldrh r0, [r4, 0x34] adds r0, 0x1 movs r1, 0 strh r0, [r4, 0x34] strh r1, [r4, 0x32] -_0817FC6A: +@0817FC6A: movs r0, 0x34 ldrsh r1, [r4, r0] lsls r0, r1, 1 @@ -739861,13 +739861,13 @@ _0817FC6A: lsls r0, 24 asrs r0, 24 cmp r0, 0 - bne _0817FC8C + bne @0817FC8C ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _0817FCBE + b @0817FCBE .align 2, 0 .pool -_0817FC8C: +@0817FC8C: adds r0, r1, r2 ldrb r0, [r0] lsls r0, 24 @@ -739892,14 +739892,14 @@ _0817FC8C: strh r0, [r4, 0x32] adds r0, r4, 0 bl sub_817F70C -_0817FCBE: +@0817FCBE: pop {r4,r5} pop {r0} bx r0 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 @@ -739913,7 +739913,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 @@ -739921,19 +739921,19 @@ sub_817FCDC: @ 817FCDC movs r0, 0x90 lsls r0, 4 cmp r1, r0 - ble _0817FCF8 + ble @0817FCF8 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 - b _0817FD12 + b @0817FD12 .align 2, 0 .pool -_0817FCF8: +@0817FCF8: adds r0, r1, 0 cmp r1, 0 - bge _0817FD00 + bge @0817FD00 adds r0, 0xFF -_0817FD00: +@0817FD00: asrs r0, 8 lsls r0, 8 subs r0, r1, r0 @@ -739942,7 +739942,7 @@ _0817FD00: movs r2, 0x3C ldrsh r1, [r4, r2] bl sine -_0817FD12: +@0817FD12: strh r0, [r4, 0x24] ldrh r0, [r4, 0x2E] ldrh r1, [r4, 0x32] @@ -739954,7 +739954,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 @@ -739973,7 +739973,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 @@ -739981,19 +739981,19 @@ sub_817FD44: @ 817FD44 movs r0, 0x90 lsls r0, 4 cmp r1, r0 - ble _0817FD60 + ble @0817FD60 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 - b _0817FD78 + b @0817FD78 .align 2, 0 .pool -_0817FD60: +@0817FD60: adds r0, r1, 0 cmp r1, 0 - bge _0817FD68 + bge @0817FD68 adds r0, 0xFF -_0817FD68: +@0817FD68: asrs r0, 8 lsls r0, 8 subs r0, r1, r0 @@ -740001,7 +740001,7 @@ _0817FD68: asrs r0, 16 movs r1, 0x3 bl sine -_0817FD78: +@0817FD78: strh r0, [r4, 0x26] ldrh r0, [r4, 0x2E] ldrh r1, [r4, 0x32] @@ -740013,7 +740013,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 @@ -740030,7 +740030,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] @@ -740039,29 +740039,29 @@ pokemonanimfunc_11: @ 817FDA4 movs r0, 0x80 lsls r0, 2 cmp r1, r0 - ble _0817FDC8 + ble @0817FDC8 ldr r0, =sub_8184D88 + 1 str r0, [r7, 0x1C] movs r0, 0 strh r0, [r7, 0x24] strh r0, [r7, 0x26] - b _0817FE24 + b @0817FE24 .align 2, 0 .pool -_0817FDC8: +@0817FDC8: movs r0, 0x1 ands r0, r2 movs r5, 0xFF cmp r0, 0 - bne _0817FDD4 + bne @0817FDD4 movs r5, 0x1 -_0817FDD4: +@0817FDD4: movs r1, 0x32 ldrsh r0, [r7, r1] cmp r0, 0 - bge _0817FDDE + bge @0817FDDE adds r0, 0x3 -_0817FDDE: +@0817FDDE: asrs r0, 2 movs r1, 0x8 bl sine @@ -740071,9 +740071,9 @@ _0817FDDE: ldrsh r1, [r7, r0] adds r4, r1, 0 cmp r1, 0 - bge _0817FDF6 + bge @0817FDF6 adds r4, 0xFF -_0817FDF6: +@0817FDF6: asrs r4, 8 lsls r4, 8 subs r4, r1, r4 @@ -740095,7 +740095,7 @@ _0817FDF6: muls r1, r5 adds r0, r1, 0 strh r0, [r7, 0x24] -_0817FE24: +@0817FE24: ldrh r0, [r7, 0x32] adds r0, 0x9 strh r0, [r7, 0x32] @@ -740105,7 +740105,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 @@ -740118,27 +740118,27 @@ sub_817FE30: @ 817FE30 adds r5, r0, r2 ldrh r0, [r5] cmp r0, 0 - beq _0817FE54 + beq @0817FE54 subs r0, 0x1 strh r0, [r5] - b _0817FEF8 + b @0817FEF8 .align 2, 0 .pool -_0817FE54: +@0817FE54: movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0817FE70 + bne @0817FE70 movs r2, 0x8 ldrsh r0, [r5, r2] cmp r0, 0 - bne _0817FE70 + bne @0817FE70 adds r0, r4, 0 bl sub_817F670 ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] -_0817FE70: +@0817FE70: ldr r2, =0x03001240 lsls r1, r6, 16 asrs r1, 16 @@ -740151,7 +740151,7 @@ _0817FE70: movs r2, 0x6 ldrsh r0, [r5, r2] cmp r1, r0 - ble _0817FEC4 + ble @0817FEC4 movs r2, 0x80 lsls r2, 1 adds r0, r4, 0 @@ -740162,32 +740162,32 @@ _0817FE70: movs r2, 0x4 ldrsh r0, [r5, r2] cmp r0, 0x1 - ble _0817FEB4 + ble @0817FEB4 subs r0, r1, 0x1 movs r1, 0 strh r0, [r5, 0x4] movs r0, 0xA strh r0, [r5] strh r1, [r4, 0x32] - b _0817FEF2 + b @0817FEF2 .align 2, 0 .pool -_0817FEB4: +@0817FEB4: adds r0, r4, 0 bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _0817FEF2 + b @0817FEF2 .align 2, 0 .pool -_0817FEC4: +@0817FEC4: movs r0, 0x32 ldrsh r1, [r4, r0] adds r0, r1, 0 cmp r1, 0 - bge _0817FED0 + bge @0817FED0 adds r0, 0xFF -_0817FED0: +@0817FED0: asrs r0, 8 lsls r0, 8 subs r0, r1, r0 @@ -740203,18 +740203,18 @@ _0817FED0: adds r0, r4, 0 adds r1, r2, 0 bl sub_817F6D4 -_0817FEF2: +@0817FEF2: ldrh r0, [r4, 0x32] adds r0, 0x10 strh r0, [r4, 0x32] -_0817FEF8: +@0817FEF8: pop {r4-r6} pop {r0} bx r0 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 @@ -740243,7 +740243,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] @@ -740252,10 +740252,10 @@ sub_817FF3C: @ 817FF3C movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0817FF54 + bne @0817FF54 adds r0, r4, 0 bl sub_817F670 -_0817FF54: +@0817FF54: movs r2, 0x32 ldrsh r6, [r4, r2] ldr r1, =0x03001240 @@ -740265,7 +740265,7 @@ _0817FF54: adds r0, r1 ldrh r1, [r0] cmp r6, r1 - ble _0817FF8C + ble @0817FF8C movs r2, 0x80 lsls r2, 1 adds r0, r4, 0 @@ -740276,10 +740276,10 @@ _0817FF54: bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _0817FFAA + b @0817FFAA .align 2, 0 .pool -_0817FF8C: +@0817FF8C: movs r2, 0x8 ldrsh r1, [r0, r2] movs r0, 0x80 @@ -740293,7 +740293,7 @@ _0817FF8C: adds r0, r4, 0 adds r1, r2, 0 bl sub_817F6D4 -_0817FFAA: +@0817FFAA: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] @@ -740303,7 +740303,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 @@ -740331,7 +740331,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] @@ -740349,26 +740349,26 @@ sub_817FFF0: @ 817FFF0 movs r2, 0x6 ldrsh r0, [r6, r2] cmp r1, r0 - ble _0818002C + ble @0818002C movs r0, 0 strh r0, [r5, 0x24] strh r0, [r5, 0x26] ldr r0, =sub_8184D88 + 1 str r0, [r5, 0x1C] - b _0818006A + b @0818006A .align 2, 0 .pool -_0818002C: +@0818002C: movs r0, 0x32 ldrsh r1, [r5, r0] adds r0, r1, 0 adds r0, 0xC0 adds r4, r0, 0 cmp r0, 0 - bge _0818003E + bge @0818003E ldr r2, =0x000001bf adds r4, r1, r2 -_0818003E: +@0818003E: asrs r4, 8 lsls r4, 8 subs r4, r0, r4 @@ -740389,7 +740389,7 @@ _0818003E: ldrh r1, [r6, 0x8] adds r0, r1 strh r0, [r5, 0x26] -_0818006A: +@0818006A: ldr r0, =0x03001240 lsls r1, r7, 1 adds r1, r7 @@ -740409,7 +740409,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 @@ -740440,13 +740440,13 @@ 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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _081800EC + bne @081800EC ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -740455,11 +740455,11 @@ pokemonanimfunc_15: @ 81800D0 adds r1, r2, 0 adds r0, r1 strh r0, [r4, 0x3C] -_081800EC: +@081800EC: movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0x80 - ble _0818010C + ble @0818010C ldrh r0, [r4, 0x3C] movs r1, 0x10 movs r2, 0 @@ -740467,10 +740467,10 @@ _081800EC: bl pal_fade_1 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _08180128 + b @08180128 .align 2, 0 .pool -_0818010C: +@0818010C: movs r2, 0x32 ldrsh r0, [r4, r2] movs r1, 0x10 @@ -740483,7 +740483,7 @@ _0818010C: movs r1, 0x10 movs r3, 0 bl pal_fade_1 -_08180128: +@08180128: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] @@ -740493,22 +740493,22 @@ _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 movs r1, 0x32 ldrsh r0, [r6, r1] cmp r0, 0 - bne _08180148 + bne @08180148 adds r0, r6, 0 bl sub_817F670 -_08180148: +@08180148: ldrh r5, [r6, 0x32] movs r2, 0x32 ldrsh r0, [r6, r2] cmp r0, 0x28 - ble _08180170 + ble @08180170 movs r2, 0x80 lsls r2, 1 adds r0, r6, 0 @@ -740519,10 +740519,10 @@ _08180148: bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r6, 0x1C] - b _08180204 + b @08180204 .align 2, 0 .pool -_08180170: +@08180170: movs r1, 0x32 ldrsh r0, [r6, r1] lsls r0, 7 @@ -740535,17 +740535,17 @@ _08180170: lsls r0, 16 lsrs r0, 16 cmp r0, 0x13 - bhi _08180196 + bhi @08180196 ldrh r0, [r6, 0x3C] adds r0, 0x33 strh r0, [r6, 0x3C] movs r7, 0xFF ands r7, r0 -_08180196: +@08180196: movs r2, 0x30 ldrsh r0, [r6, r2] cmp r0, 0 - bne _081801C4 + bne @081801C4 lsls r5, r4, 16 asrs r0, r5, 16 movs r1, 0x28 @@ -740559,10 +740559,10 @@ _08180196: adds r4, r0 strh r4, [r6, 0x36] adds r4, r5, 0 - b _081801E4 + b @081801E4 .align 2, 0 .pool -_081801C4: +@081801C4: adds r0, r7, 0 movs r1, 0x10 bl sine @@ -740577,7 +740577,7 @@ _081801C4: subs r1, r5 subs r1, r0 strh r1, [r6, 0x36] -_081801E4: +@081801E4: asrs r0, r4, 16 movs r1, 0x10 bl sine @@ -740592,7 +740592,7 @@ _081801E4: adds r0, r6, 0 movs r3, 0 bl sub_817F618 -_08180204: +@08180204: ldrh r0, [r6, 0x32] adds r0, 0x1 strh r0, [r6, 0x32] @@ -740602,7 +740602,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} @@ -740613,15 +740613,15 @@ pokemonanimfunc_17: @ 8180210 movs r1, 0x32 ldrsh r0, [r5, r1] cmp r0, 0 - bne _0818022C + bne @0818022C adds r0, r5, 0 bl sub_817F670 -_0818022C: +@0818022C: ldrh r6, [r5, 0x32] movs r2, 0x32 ldrsh r0, [r5, r2] cmp r0, 0x28 - ble _08180258 + ble @08180258 movs r2, 0x80 lsls r2, 1 adds r0, r5, 0 @@ -740634,10 +740634,10 @@ _0818022C: str r0, [r5, 0x1C] mov r0, r8 strh r0, [r5, 0x26] - b _0818030A + b @0818030A .align 2, 0 .pool -_08180258: +@08180258: movs r1, 0x32 ldrsh r0, [r5, r1] lsls r0, 7 @@ -740650,17 +740650,17 @@ _08180258: lsls r0, 16 lsrs r0, 16 cmp r0, 0x13 - bhi _0818027E + bhi @0818027E ldrh r0, [r5, 0x3C] adds r0, 0x33 strh r0, [r5, 0x3C] movs r7, 0xFF ands r7, r0 -_0818027E: +@0818027E: movs r2, 0x30 ldrsh r0, [r5, r2] cmp r0, 0 - bne _081802A0 + bne @081802A0 lsls r4, 16 asrs r0, r4, 16 movs r1, 0x10 @@ -740669,10 +740669,10 @@ _0818027E: adds r1, r2, 0 subs r1, r0 strh r1, [r5, 0x36] - b _081802B2 + b @081802B2 .align 2, 0 .pool -_081802A0: +@081802A0: lsls r4, 16 asrs r0, r4, 16 movs r1, 0x10 @@ -740681,7 +740681,7 @@ _081802A0: lsls r1, 1 adds r0, r1 strh r0, [r5, 0x36] -_081802B2: +@081802B2: adds r6, r4, 0 adds r0, r7, 0 movs r1, 0x8 @@ -740701,18 +740701,18 @@ _081802B2: lsls r1, 16 asrs r1, 16 cmp r4, r1 - beq _081802F0 + beq @081802F0 movs r2, 0x38 ldrsh r0, [r5, r2] subs r0, r1, r0 cmp r0, 0 - bge _081802EA + bge @081802EA adds r0, 0x7 -_081802EA: +@081802EA: lsls r0, 13 lsrs r0, 16 mov r8, r0 -_081802F0: +@081802F0: mov r1, r8 lsls r0, r1, 16 asrs r0, 16 @@ -740725,7 +740725,7 @@ _081802F0: adds r0, r5, 0 movs r3, 0 bl sub_817F618 -_0818030A: +@0818030A: ldrh r0, [r5, 0x32] adds r0, 0x1 strh r0, [r5, 0x32] @@ -740737,7 +740737,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} @@ -740760,44 +740760,44 @@ sub_818031C: @ 818031C ldrb r6, [r0] movs r1, 0 cmp r5, 0xFE - beq _08180358 + beq @08180358 subs r0, r6, r7 muls r0, r5 adds r1, r6, 0 bl __divsi3 lsls r0, 24 lsrs r1, r0, 24 -_08180358: +@08180358: cmp r5, 0xFF - bne _08180370 + bne @08180370 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x26] - b _08180394 + b @08180394 .align 2, 0 .pool -_08180370: +@08180370: mov r0, r8 bl sine strh r0, [r4, 0x26] cmp r7, r6 - bne _08180386 + bne @08180386 ldrh r0, [r4, 0x38] adds r0, 0x1 strh r0, [r4, 0x38] movs r0, 0 - b _08180392 -_08180386: + b @08180392 +@08180386: ldrh r0, [r4, 0x2E] ldrh r1, [r4, 0x32] adds r0, r1 strh r0, [r4, 0x32] ldrh r0, [r4, 0x3A] adds r0, 0x1 -_08180392: +@08180392: strh r0, [r4, 0x3A] -_08180394: +@08180394: pop {r3} mov r8, r3 pop {r4-r7} @@ -740806,7 +740806,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 @@ -740823,7 +740823,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} @@ -740834,14 +740834,14 @@ pokemonanimfunc_1A: @ 81803BC lsrs r5, r7, 24 mov r8, r5 cmp r0, 0 - bne _081803DA + bne @081803DA adds r0, r4, 0 bl sub_817F670 -_081803DA: +@081803DA: movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0x23 - ble _08180404 + ble @08180404 movs r2, 0x80 lsls r2, 1 adds r0, r4, 0 @@ -740854,10 +740854,10 @@ _081803DA: str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] - b _0818045E + b @0818045E .align 2, 0 .pool -_08180404: +@08180404: adds r6, r5, 0 subs r6, 0xA lsls r0, r6, 7 @@ -740866,7 +740866,7 @@ _08180404: lsls r0, 16 lsrs r1, r0, 16 cmp r5, 0x9 - bhi _0818042A + bhi @0818042A movs r2, 0x80 lsls r2, 1 lsrs r3, r7, 25 @@ -740874,20 +740874,20 @@ _08180404: adds r0, r4, 0 adds r1, r2, 0 bl sub_817F6D4 - b _0818045E -_0818042A: + b @0818045E +@0818042A: lsls r0, r6, 24 lsrs r0, 24 cmp r0, 0x13 - bhi _08180442 + bhi @08180442 lsls r0, r1, 16 asrs r0, 16 movs r1, 0x5 bl sine negs r0, r0 strh r0, [r4, 0x24] - b _0818045E -_08180442: + b @0818045E +@08180442: movs r2, 0x80 lsls r2, 1 movs r3, 0x23 @@ -740901,7 +740901,7 @@ _08180442: adds r0, r4, 0 adds r1, r2, 0 bl sub_817F6D4 -_0818045E: +@0818045E: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] @@ -740915,20 +740915,20 @@ _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 ldrsh r0, [r6, r1] cmp r0, 0 - bne _08180486 + bne @08180486 adds r0, r6, 0 bl sub_817F670 -_08180486: +@08180486: movs r1, 0x32 ldrsh r0, [r6, r1] cmp r0, 0x64 - ble _081804B0 + ble @081804B0 movs r2, 0x80 lsls r2, 1 adds r0, r6, 0 @@ -740941,10 +740941,10 @@ _08180486: bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r6, 0x1C] - b _081804E8 + b @081804E8 .align 2, 0 .pool -_081804B0: +@081804B0: movs r1, 0x32 ldrsh r0, [r6, r1] lsls r0, 8 @@ -740969,7 +740969,7 @@ _081804B0: adds r1, r5, 0 adds r2, r5, 0 bl sub_817F6D4 -_081804E8: +@081804E8: ldrh r0, [r6, 0x32] adds r0, 0x1 strh r0, [r6, 0x32] @@ -740981,21 +740981,21 @@ _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 movs r1, 0x32 ldrsh r0, [r6, r1] cmp r0, 0 - bne _0818050C + bne @0818050C adds r0, r6, 0 bl sub_817F670 -_0818050C: +@0818050C: movs r1, 0x32 ldrsh r0, [r6, r1] cmp r0, 0x64 - ble _08180534 + ble @08180534 movs r2, 0x80 lsls r2, 1 adds r0, r6, 0 @@ -741007,10 +741007,10 @@ _0818050C: bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r6, 0x1C] - b _08180582 + b @08180582 .align 2, 0 .pool -_08180534: +@08180534: movs r0, 0x32 ldrsh r5, [r6, r0] lsls r0, r5, 8 @@ -741045,7 +741045,7 @@ _08180534: adds r1, r4, 0 adds r2, r4, 0 bl sub_817F6D4 -_08180582: +@08180582: ldrh r0, [r6, 0x32] adds r0, 0x1 strh r0, [r6, 0x32] @@ -741057,7 +741057,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 @@ -741074,21 +741074,21 @@ 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 movs r1, 0x32 ldrsh r0, [r6, r1] cmp r0, 0 - bne _081805C4 + bne @081805C4 adds r0, r6, 0 bl sub_817F670 -_081805C4: +@081805C4: movs r2, 0x32 ldrsh r0, [r6, r2] cmp r0, 0x64 - ble _081805EC + ble @081805EC movs r2, 0x80 lsls r2, 1 adds r0, r6, 0 @@ -741100,10 +741100,10 @@ _081805C4: bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r6, 0x1C] - b _08180644 + b @08180644 .align 2, 0 .pool -_081805EC: +@081805EC: movs r0, 0x32 ldrsh r5, [r6, r0] lsls r0, r5, 8 @@ -741143,7 +741143,7 @@ _081805EC: adds r1, r4, 0 adds r2, r4, 0 bl sub_817F6D4 -_08180644: +@08180644: ldrh r0, [r6, 0x32] adds r0, 0x1 strh r0, [r6, 0x32] @@ -741155,7 +741155,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 @@ -741172,7 +741172,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 @@ -741180,14 +741180,14 @@ pokemonanimfunc_1D: @ 8180670 movs r1, 0x32 ldrsh r0, [r6, r1] cmp r0, 0 - bne _08180688 + bne @08180688 adds r0, r6, 0 bl sub_817F670 -_08180688: +@08180688: movs r1, 0x32 ldrsh r0, [r6, r1] cmp r0, 0x64 - ble _081806B0 + ble @081806B0 movs r2, 0x80 lsls r2, 1 adds r0, r6, 0 @@ -741199,10 +741199,10 @@ _08180688: bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r6, 0x1C] - b _081806FC + b @081806FC .align 2, 0 .pool -_081806B0: +@081806B0: movs r0, 0x32 ldrsh r5, [r6, r0] lsls r0, r5, 8 @@ -741236,7 +741236,7 @@ _081806B0: adds r1, r4, 0 adds r2, r4, 0 bl sub_817F6D4 -_081806FC: +@081806FC: ldrh r0, [r6, 0x32] adds r0, 0x1 strh r0, [r6, 0x32] @@ -741250,18 +741250,18 @@ _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 movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0818072A + bne @0818072A adds r0, r4, 0 bl sub_817F670 strh r6, [r4, 0x34] -_0818072A: +@0818072A: adds r0, r4, 0 bl sub_817F70C movs r0, 0x32 @@ -741271,7 +741271,7 @@ _0818072A: lsls r0, r1, 1 adds r0, r1 cmp r2, r0 - ble _08180760 + ble @08180760 movs r2, 0x80 lsls r2, 1 adds r0, r4, 0 @@ -741283,10 +741283,10 @@ _0818072A: bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _081807FE + b @081807FE .align 2, 0 .pool -_08180760: +@08180760: movs r1, 0x36 ldrsh r0, [r4, r1] movs r1, 0x20 @@ -741301,33 +741301,33 @@ _08180760: movs r2, 0x2E ldrsh r0, [r4, r2] cmp r1, r0 - ble _08180796 + ble @08180796 adds r2, r0, 0 lsls r0, r2, 1 cmp r1, r0 - bge _08180796 + bge @08180796 movs r0, 0x80 adds r1, r2, 0 bl __divsi3 ldrh r1, [r4, 0x34] adds r1, r0 strh r1, [r4, 0x34] -_08180796: +@08180796: lsls r0, r5, 16 asrs r1, r0, 16 movs r2, 0x80 lsls r2, 1 adds r5, r0, 0 cmp r1, r2 - ble _081807B0 + ble @081807B0 subs r0, r2, r1 cmp r0, 0 - bge _081807AC + bge @081807AC adds r0, 0x7 -_081807AC: +@081807AC: lsls r0, 13 lsrs r6, r0, 16 -_081807B0: +@081807B0: movs r1, 0x34 ldrsh r0, [r4, r1] movs r1, 0xA @@ -741363,7 +741363,7 @@ _081807B0: movs r0, 0xFF ands r1, r0 strh r1, [r4, 0x36] -_081807FE: +@081807FE: adds r0, r4, 0 bl sub_817F70C pop {r4-r6} @@ -741372,7 +741372,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 @@ -741389,7 +741389,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 @@ -741403,7 +741403,7 @@ sub_8180828: @ 8180828 ldrsh r1, [r5, r2] muls r0, r1 cmp r4, r0 - ble _08180868 + ble @08180868 movs r2, 0x80 lsls r2, 1 adds r0, r5, 0 @@ -741415,10 +741415,10 @@ sub_8180828: @ 8180828 bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r5, 0x1C] - b _081808D0 + b @081808D0 .align 2, 0 .pool -_08180868: +@08180868: movs r1, 0x36 ldrsh r0, [r5, r1] movs r1, 0x20 @@ -741433,15 +741433,15 @@ _08180868: lsls r1, 16 asrs r1, 16 cmp r0, r1 - ble _08180894 + ble @08180894 subs r0, r1, r0 cmp r0, 0 - bge _08180890 + bge @08180890 adds r0, 0x7 -_08180890: +@08180890: lsls r0, 13 lsrs r6, r0, 16 -_08180894: +@08180894: lsls r0, r6, 16 asrs r0, 16 negs r0, r0 @@ -741470,27 +741470,27 @@ _08180894: movs r1, 0xFF ands r0, r1 strh r0, [r5, 0x36] -_081808D0: +@081808D0: pop {r4-r6} pop {r0} bx r0 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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _081808F2 + bne @081808F2 adds r0, r4, 0 bl sub_817F670 movs r0, 0x3 strh r0, [r4, 0x3C] movs r0, 0x8 strh r0, [r4, 0x3A] -_081808F2: +@081808F2: adds r0, r4, 0 bl sub_8180828 pop {r4} @@ -741499,7 +741499,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 @@ -741546,13 +741546,13 @@ sub_8180900: @ 8180900 movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0818096C + bne @0818096C adds r0, r4, 0 bl sub_817F670 ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] -_0818096C: +@0818096C: movs r2, 0x36 ldrsh r1, [r4, r2] lsls r0, r1, 1 @@ -741564,7 +741564,7 @@ _0818096C: movs r5, 0 ldrsb r5, [r1, r5] cmp r5, 0 - bne _081809B0 + bne @081809B0 movs r2, 0x80 lsls r2, 1 adds r0, r4, 0 @@ -741577,10 +741577,10 @@ _0818096C: bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _08180A3A + b @08180A3A .align 2, 0 .pool -_081809B0: +@081809B0: lsls r0, r7, 16 asrs r5, r0, 16 lsls r0, r5, 7 @@ -741618,9 +741618,9 @@ _081809B0: muls r0, r1 negs r0, r0 cmp r0, 0 - bge _08180A04 + bge @08180A04 adds r0, 0x7 -_08180A04: +@08180A04: lsls r3, r0, 13 lsrs r3, 16 movs r2, 0x80 @@ -741638,18 +741638,18 @@ _08180A04: lsls r0, 24 asrs r0, 24 cmp r5, r0 - bne _08180A34 + bne @08180A34 ldrh r0, [r4, 0x36] adds r0, 0x1 strh r0, [r4, 0x36] movs r0, 0 - b _08180A38 -_08180A34: + b @08180A38 +@08180A34: ldrh r0, [r4, 0x34] adds r0, 0x1 -_08180A38: +@08180A38: strh r0, [r4, 0x34] -_08180A3A: +@08180A3A: adds r0, r4, 0 bl sub_817F70C add sp, 0x4 @@ -741663,7 +741663,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 @@ -741692,13 +741692,13 @@ 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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08180AA8 + bne @08180AA8 ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -741707,11 +741707,11 @@ pokemonanimfunc_20: @ 8180A8C adds r1, r2, 0 adds r0, r1 strh r0, [r4, 0x3C] -_08180AA8: +@08180AA8: movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0x80 - ble _08180ACC + ble @08180ACC ldrh r0, [r4, 0x3C] ldr r3, =0x000002df movs r1, 0x10 @@ -741719,10 +741719,10 @@ _08180AA8: bl pal_fade_1 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _08180AE8 + b @08180AE8 .align 2, 0 .pool -_08180ACC: +@08180ACC: movs r2, 0x32 ldrsh r0, [r4, r2] movs r1, 0xC @@ -741735,7 +741735,7 @@ _08180ACC: ldr r3, =0x000002df movs r1, 0x10 bl pal_fade_1 -_08180AE8: +@08180AE8: ldrh r0, [r4, 0x32] adds r0, 0x2 strh r0, [r4, 0x32] @@ -741747,13 +741747,13 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08180B14 + bne @08180B14 ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -741762,11 +741762,11 @@ pokemonanimfunc_21: @ 8180AF8 adds r1, r2, 0 adds r0, r1 strh r0, [r4, 0x3C] -_08180B14: +@08180B14: movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0x80 - ble _08180B34 + ble @08180B34 ldrh r0, [r4, 0x3C] movs r1, 0x10 movs r2, 0 @@ -741774,10 +741774,10 @@ _08180B14: bl pal_fade_1 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _08180B50 + b @08180B50 .align 2, 0 .pool -_08180B34: +@08180B34: movs r2, 0x32 ldrsh r0, [r4, r2] movs r1, 0xC @@ -741790,7 +741790,7 @@ _08180B34: movs r1, 0x10 movs r3, 0x1F bl pal_fade_1 -_08180B50: +@08180B50: ldrh r0, [r4, 0x32] adds r0, 0x2 strh r0, [r4, 0x32] @@ -741800,13 +741800,13 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08180B78 + bne @08180B78 ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -741815,11 +741815,11 @@ pokemonanimfunc_22: @ 8180B5C adds r1, r2, 0 adds r0, r1 strh r0, [r4, 0x3C] -_08180B78: +@08180B78: movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0x80 - ble _08180B98 + ble @08180B98 ldrh r0, [r4, 0x3C] movs r3, 0xF8 lsls r3, 7 @@ -741828,10 +741828,10 @@ _08180B78: bl pal_fade_1 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _08180BB6 + b @08180BB6 .align 2, 0 .pool -_08180B98: +@08180B98: movs r2, 0x32 ldrsh r0, [r4, r2] movs r1, 0xC @@ -741845,7 +741845,7 @@ _08180B98: lsls r3, 7 movs r1, 0x10 bl pal_fade_1 -_08180BB6: +@08180BB6: ldrh r0, [r4, 0x32] adds r0, 0x2 strh r0, [r4, 0x32] @@ -741855,13 +741855,13 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08180BE0 + bne @08180BE0 ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -741870,11 +741870,11 @@ pokemonanimfunc_23: @ 8180BC4 adds r1, r2, 0 adds r0, r1 strh r0, [r4, 0x3C] -_08180BE0: +@08180BE0: movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0x80 - ble _08180C04 + ble @08180C04 ldrh r0, [r4, 0x3C] ldr r3, =0x000003ff movs r1, 0x10 @@ -741882,10 +741882,10 @@ _08180BE0: bl pal_fade_1 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _08180C20 + b @08180C20 .align 2, 0 .pool -_08180C04: +@08180C04: movs r2, 0x32 ldrsh r0, [r4, r2] movs r1, 0xC @@ -741898,7 +741898,7 @@ _08180C04: ldr r3, =0x000003ff movs r1, 0x10 bl pal_fade_1 -_08180C20: +@08180C20: ldrh r0, [r4, 0x32] adds r0, 0x2 strh r0, [r4, 0x32] @@ -741910,13 +741910,13 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08180C4C + bne @08180C4C ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -741925,11 +741925,11 @@ pokemonanimfunc_24: @ 8180C30 adds r1, r2, 0 adds r0, r1 strh r0, [r4, 0x3C] -_08180C4C: +@08180C4C: movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0x80 - ble _08180C70 + ble @08180C70 ldrh r0, [r4, 0x3C] ldr r3, =0x00006018 movs r1, 0x10 @@ -741937,10 +741937,10 @@ _08180C4C: bl pal_fade_1 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _08180C8C + b @08180C8C .align 2, 0 .pool -_08180C70: +@08180C70: movs r2, 0x32 ldrsh r0, [r4, r2] movs r1, 0xC @@ -741953,7 +741953,7 @@ _08180C70: ldr r3, =0x00006018 movs r1, 0x10 bl pal_fade_1 -_08180C8C: +@08180C8C: ldrh r0, [r4, 0x32] adds r0, 0x2 strh r0, [r4, 0x32] @@ -741965,7 +741965,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 @@ -741979,7 +741979,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 @@ -741989,14 +741989,14 @@ sub_8180CB4: @ 8180CB4 lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - ble _08180CD6 + ble @08180CD6 movs r0, 0x8 strh r0, [r4, 0x24] movs r0, 0x2 strh r0, [r4, 0x3C] ldr r0, =sub_8180CE8 + 1 str r0, [r4, 0x1C] -_08180CD6: +@08180CD6: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -742007,7 +742007,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 @@ -742020,7 +742020,7 @@ sub_8180CE8: @ 8180CE8 strh r0, [r4, 0x3C] lsls r1, 16 cmp r1, 0 - bgt _08180D32 + bgt @08180D32 lsls r0, r2, 24 lsrs r2, r0, 24 movs r0, 0 @@ -742029,7 +742029,7 @@ sub_8180CE8: @ 8180CE8 ldr r5, =sub_8180D44 + 1 movs r3, 0x8 negs r3, r3 -_08180D14: +@08180D14: subs r0, r1, r2 lsls r0, 16 ldrh r1, [r4, 0x3A] @@ -742041,11 +742041,11 @@ _08180D14: lsrs r1, r0, 16 asrs r0, 16 cmp r0, r3 - bgt _08180D14 + bgt @08180D14 movs r0, 0x1 strh r0, [r4, 0x38] str r5, [r4, 0x1C] -_08180D32: +@08180D32: adds r0, r4, 0 bl sub_817F70C pop {r4,r5} @@ -742056,7 +742056,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 @@ -742085,9 +742085,9 @@ sub_8180D44: @ 8180D44 movs r3, 0x3A ldrsh r1, [r4, r3] cmp r0, r1 - ble _08180D84 + ble @08180D84 strh r2, [r4, 0x38] -_08180D84: +@08180D84: movs r2, 0x80 lsls r2, 1 lsls r3, r5, 8 @@ -742099,7 +742099,7 @@ _08180D84: movs r1, 0x8 negs r1, r1 cmp r0, r1 - bge _08180DAE + bge @08180DAE strh r1, [r4, 0x24] movs r0, 0x2 strh r0, [r4, 0x36] @@ -742108,7 +742108,7 @@ _08180D84: strh r5, [r4, 0x32] ldr r0, =sub_8180DC0 + 1 str r0, [r4, 0x1C] -_08180DAE: +@08180DAE: adds r0, r4, 0 bl sub_817F70C pop {r4,r5} @@ -742119,7 +742119,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 @@ -742127,16 +742127,16 @@ sub_8180DC0: @ 8180DC0 movs r2, 0x34 ldrsh r0, [r4, r2] cmp r0, 0xB - ble _08180E08 + ble @08180E08 ldrh r0, [r4, 0x32] subs r0, 0x2 strh r0, [r4, 0x32] lsls r0, 16 cmp r0, 0 - bge _08180DE2 + bge @08180DE2 movs r0, 0 strh r0, [r4, 0x32] -_08180DE2: +@08180DE2: movs r2, 0x80 lsls r2, 1 ldrh r3, [r4, 0x32] @@ -742148,13 +742148,13 @@ _08180DE2: movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08180E1C + bne @08180E1C ldr r0, =sub_8180E28 + 1 str r0, [r4, 0x1C] - b _08180E1C + b @08180E1C .align 2, 0 .pool -_08180E08: +@08180E08: ldrh r0, [r4, 0x36] ldrh r2, [r4, 0x24] adds r0, r2 @@ -742165,7 +742165,7 @@ _08180E08: strh r0, [r4, 0x36] adds r0, r1, 0x1 strh r0, [r4, 0x34] -_08180E1C: +@08180E1C: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -742174,7 +742174,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 @@ -742183,14 +742183,14 @@ sub_8180E28: @ 8180E28 strh r0, [r4, 0x24] lsls r0, 16 cmp r0, 0 - ble _08180E4A + ble @08180E4A movs r0, 0 strh r0, [r4, 0x24] adds r0, r4, 0 bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] -_08180E4A: +@08180E4A: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -742201,7 +742201,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 @@ -742217,7 +742217,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 @@ -742231,18 +742231,18 @@ sub_8180E78: @ 8180E78 movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _08180EA2 + bne @08180EA2 movs r1, 0x34 ldrsh r0, [r4, r1] cmp r0, 0 - bgt _08180EA2 + bgt @08180EA2 movs r0, 0xA strh r0, [r4, 0x34] -_08180EA2: +@08180EA2: movs r1, 0x24 ldrsh r0, [r4, r1] cmp r0, 0x7 - ble _08180EBA + ble @08180EBA movs r1, 0 movs r0, 0x8 strh r0, [r4, 0x24] @@ -742251,7 +742251,7 @@ _08180EA2: strh r1, [r4, 0x36] ldr r0, =sub_8180ED0 + 1 str r0, [r4, 0x1C] -_08180EBA: +@08180EBA: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -742262,7 +742262,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 @@ -742281,24 +742281,24 @@ sub_8180ED0: @ 8180ED0 movs r1, 0x36 ldrsh r0, [r4, r1] cmp r0, 0x3F - ble _08180F08 + ble @08180F08 movs r0, 0xA0 strh r0, [r4, 0x32] movs r0, 0xA strh r0, [r4, 0x34] ldr r0, =sub_8180F2C + 1 str r0, [r4, 0x1C] -_08180F08: +@08180F08: ldrh r0, [r4, 0x36] adds r0, 0x8 strh r0, [r4, 0x36] lsls r0, 16 asrs r0, 16 cmp r0, 0x40 - ble _08180F1A + ble @08180F1A movs r0, 0x40 strh r0, [r4, 0x36] -_08180F1A: +@08180F1A: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -742309,7 +742309,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 @@ -742317,11 +742317,11 @@ sub_8180F2C: @ 8180F2C movs r2, 0x34 ldrsh r0, [r4, r2] cmp r0, 0 - ble _08180F44 + ble @08180F44 subs r0, r1, 0x1 strh r0, [r4, 0x34] - b _08180F96 -_08180F44: + b @08180F96 +@08180F44: movs r1, 0x32 ldrsh r0, [r4, r1] movs r1, 0x5 @@ -742352,14 +742352,14 @@ _08180F44: movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0x20 - bgt _08180F96 + bgt @08180F96 strh r5, [r4, 0x24] strh r5, [r4, 0x26] adds r0, r4, 0 bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] -_08180F96: +@08180F96: adds r0, r4, 0 bl sub_817F70C pop {r4,r5} @@ -742370,24 +742370,24 @@ _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] movs r2, 0x34 ldrsh r0, [r3, r2] cmp r0, 0 - ble _08180FBA + ble @08180FBA subs r0, r1, 0x1 - b _08180FFE -_08180FBA: + b @08180FFE +@08180FBA: movs r2, 0 movs r1, 0x36 ldrsh r0, [r3, r1] cmp r0, 0 - bne _08180FC6 + bne @08180FC6 movs r2, 0x1 -_08180FC6: +@08180FC6: strh r2, [r3, 0x36] movs r0, 0x3E adds r0, r3 @@ -742407,7 +742407,7 @@ _08180FC6: lsls r0, 16 asrs r0, 16 cmp r0, 0x13 - ble _08180FFC + ble @08180FFC ldrb r0, [r1] adds r1, r4, 0 ands r1, r0 @@ -742415,9 +742415,9 @@ _08180FC6: strb r1, [r2] ldr r0, =sub_8184D88 + 1 str r0, [r3, 0x1C] -_08180FFC: +@08180FFC: movs r0, 0x2 -_08180FFE: +@08180FFE: strh r0, [r3, 0x34] pop {r4} pop {r0} @@ -742427,7 +742427,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 @@ -742441,7 +742441,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 @@ -742456,7 +742456,7 @@ sub_8181024: @ 8181024 movs r1, 0x10 negs r1, r1 cmp r0, r1 - bgt _08181054 + bgt @08181054 ldr r0, =0x0000fff0 strh r0, [r4, 0x24] movs r0, 0x10 @@ -742465,7 +742465,7 @@ sub_8181024: @ 8181024 str r0, [r4, 0x1C] movs r0, 0xA0 strh r0, [r4, 0x32] -_08181054: +@08181054: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -742476,7 +742476,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 @@ -742507,10 +742507,10 @@ sub_8181068: @ 8181068 movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0x20 - bgt _081810B2 + bgt @081810B2 ldr r0, =sub_81810C4 + 1 str r0, [r4, 0x1C] -_081810B2: +@081810B2: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -742521,7 +742521,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 @@ -742533,12 +742533,12 @@ sub_81810C4: @ 81810C4 strh r0, [r4, 0x26] lsls r1, 16 cmp r1, 0 - bgt _081810E8 + bgt @081810E8 adds r0, r4, 0 bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] -_081810E8: +@081810E8: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -742549,7 +742549,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 @@ -742563,7 +742563,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 @@ -742576,12 +742576,12 @@ sub_8181110: @ 8181110 lsls r1, 16 asrs r1, 16 cmp r1, 0xF - ble _08181134 + ble @08181134 movs r0, 0 strh r0, [r4, 0x32] ldr r0, =sub_8181144 + 1 str r0, [r4, 0x1C] -_08181134: +@08181134: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -742592,7 +742592,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 @@ -742605,7 +742605,7 @@ sub_8181144: @ 8181144 movs r0, 0x10 negs r0, r0 cmp r1, r0 - bgt _0818117C + bgt @0818117C ldr r0, =0x0000fff0 strh r0, [r4, 0x24] movs r0, 0x10 @@ -742614,16 +742614,16 @@ sub_8181144: @ 8181144 strh r0, [r4, 0x32] ldr r0, =sub_81811A4 + 1 str r0, [r4, 0x1C] - b _08181186 + b @08181186 .align 2, 0 .pool -_0818117C: +@0818117C: subs r0, r2, 0x2 strh r0, [r4, 0x24] ldrh r0, [r4, 0x26] adds r0, 0x2 strh r0, [r4, 0x26] -_08181186: +@08181186: movs r2, 0x80 lsls r2, 1 ldrh r3, [r4, 0x32] @@ -742640,7 +742640,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 @@ -742653,14 +742653,14 @@ sub_81811A4: @ 81811A4 strh r0, [r4, 0x26] lsls r1, 16 cmp r1, 0 - blt _081811CE + blt @081811CE strh r2, [r4, 0x24] strh r2, [r4, 0x26] adds r0, r4, 0 bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] -_081811CE: +@081811CE: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -742671,7 +742671,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 @@ -742697,7 +742697,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 @@ -742709,20 +742709,20 @@ sub_8181214: @ 8181214 adds r1, r0, r6 ldrh r0, [r1] cmp r0, 0 - beq _08181238 + beq @08181238 subs r0, 0x1 strh r0, [r1] - b _0818134A + b @0818134A .align 2, 0 .pool -_08181238: +@08181238: adds r0, r4, 0 bl sub_817F70C ldrh r0, [r4, 0x32] movs r1, 0x32 ldrsh r5, [r4, r1] cmp r5, 0 - bne _08181270 + bne @08181270 adds r0, 0x1 strh r0, [r4, 0x32] adds r0, r4, 0 @@ -742742,7 +742742,7 @@ _08181238: strh r0, [r4, 0x36] strh r5, [r4, 0x38] strh r5, [r4, 0x3A] -_08181270: +@08181270: movs r3, 0x3C ldrsh r1, [r4, r3] movs r6, 0x34 @@ -742767,7 +742767,7 @@ _08181270: lsls r1, 16 lsrs r1, 16 cmp r1, 0x1E - bls _081812B8 + bls @081812B8 movs r1, 0x34 ldrsh r0, [r4, r1] lsls r0, 4 @@ -742776,16 +742776,16 @@ _08181270: ldrsh r0, [r4, r2] negs r0, r0 strh r0, [r4, 0x34] - b _081812D4 + b @081812D4 .align 2, 0 .pool -_081812B8: +@081812B8: adds r0, r2, 0 adds r0, 0xF lsls r0, 16 lsrs r0, 16 cmp r0, 0x1E - bls _081812DA + bls @081812DA movs r3, 0x36 ldrsh r0, [r4, r3] lsls r0, 4 @@ -742794,19 +742794,19 @@ _081812B8: ldrsh r0, [r4, r6] negs r0, r0 strh r0, [r4, 0x36] -_081812D4: +@081812D4: ldrh r0, [r4, 0x38] adds r0, 0x1 strh r0, [r4, 0x38] -_081812DA: +@081812DA: movs r1, 0x38 ldrsh r0, [r4, r1] cmp r0, 0x5 - ble _08181332 + ble @08181332 movs r2, 0x24 ldrsh r0, [r4, r2] cmp r0, 0 - bgt _08181332 + bgt @08181332 movs r3, 0 strh r3, [r4, 0x24] strh r3, [r4, 0x26] @@ -742821,7 +742821,7 @@ _081812DA: movs r6, 0x4 ldrsh r0, [r1, r6] cmp r0, 0x1 - ble _08181328 + ble @08181328 subs r0, r2, 0x1 strh r0, [r1, 0x4] strh r3, [r4, 0x38] @@ -742834,15 +742834,15 @@ _081812DA: adds r0, r5 movs r1, 0xA strh r1, [r0] - b _08181332 + b @08181332 .align 2, 0 .pool -_08181328: +@08181328: adds r0, r4, 0 bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] -_08181332: +@08181332: movs r2, 0x80 lsls r2, 1 ldrh r3, [r4, 0x3A] @@ -742853,7 +742853,7 @@ _08181332: bl sub_817F6D4 adds r0, r4, 0 bl sub_817F70C -_0818134A: +@0818134A: pop {r4-r6} pop {r0} bx r0 @@ -742862,7 +742862,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 @@ -742879,7 +742879,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 @@ -742904,40 +742904,40 @@ sub_8181370: @ 8181370 movs r1, 0x3A ldrsh r0, [r4, r1] cmp r0, 0xC0 - ble _081813BA + ble @081813BA movs r1, 0x3C ldrsh r0, [r4, r1] cmp r0, 0x1 - bne _081813BA + bne @081813BA movs r2, 0x80 lsls r2, 1 adds r0, r4, 0 adds r1, r2, 0 - b _081813D2 -_081813BA: + b @081813D2 +@081813BA: movs r1, 0x3A ldrsh r0, [r4, r1] cmp r0, 0x40 - ble _081813DE + ble @081813DE movs r1, 0x3C ldrsh r0, [r4, r1] cmp r0, 0 - bne _081813DE + bne @081813DE ldr r1, =0xffffff00 movs r2, 0x80 lsls r2, 1 adds r0, r4, 0 -_081813D2: +@081813D2: movs r3, 0 bl sub_817F6D4 ldrh r0, [r4, 0x3C] adds r0, 0x1 strh r0, [r4, 0x3C] -_081813DE: +@081813DE: movs r1, 0x3A ldrsh r0, [r4, r1] cmp r0, 0xFF - ble _08181404 + ble @08181404 movs r0, 0 strh r0, [r4, 0x24] strh r0, [r4, 0x26] @@ -742951,7 +742951,7 @@ _081813DE: bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] -_08181404: +@08181404: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -742962,7 +742962,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] @@ -742972,7 +742972,7 @@ pokemonanimfunc_2C: @ 8181418 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - bne _08181442 + bne @08181442 ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -742984,7 +742984,7 @@ pokemonanimfunc_2C: @ 8181418 strh r2, [r4, 0x3A] strh r2, [r4, 0x38] strh r2, [r4, 0x36] -_08181442: +@08181442: ldr r1, =0x0860aa64 movs r2, 0x3A ldrsh r0, [r4, r2] @@ -742993,40 +742993,40 @@ _08181442: adds r0, r2, r0 ldrb r0, [r0] cmp r0, 0xFF - bne _08181464 + bne @08181464 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _081814CE + b @081814CE .align 2, 0 .pool -_08181464: +@08181464: movs r3, 0x36 ldrsh r0, [r4, r3] cmp r0, 0x1 - bne _0818149A + bne @0818149A adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 - beq _08181488 + beq @08181488 ldrh r0, [r4, 0x3C] ldr r3, =0x000003ff movs r1, 0x10 movs r2, 0x10 bl pal_fade_1 - b _08181494 + b @08181494 .align 2, 0 .pool -_08181488: +@08181488: ldrh r0, [r4, 0x3C] ldr r3, =0x000003ff movs r1, 0x10 movs r2, 0 bl pal_fade_1 -_08181494: +@08181494: movs r0, 0 strh r0, [r4, 0x36] ldr r1, =0x0860aa64 -_0818149A: +@0818149A: movs r2, 0x3A ldrsh r0, [r4, r2] lsls r0, 1 @@ -743036,7 +743036,7 @@ _0818149A: movs r3, 0x38 ldrsh r0, [r4, r3] cmp r1, r0 - bne _081814C8 + bne @081814C8 movs r1, 0 movs r0, 0x1 strh r0, [r4, 0x36] @@ -743044,30 +743044,30 @@ _0818149A: ldrh r0, [r4, 0x3A] adds r0, 0x1 strh r0, [r4, 0x3A] - b _081814CE + b @081814CE .align 2, 0 .pool -_081814C8: +@081814C8: ldrh r0, [r4, 0x38] adds r0, 0x1 strh r0, [r4, 0x38] -_081814CE: +@081814CE: pop {r4} pop {r0} bx r0 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 ldrsh r0, [r6, r1] cmp r0, 0 - bne _081814E6 + bne @081814E6 adds r0, r6, 0 bl sub_817F670 -_081814E6: +@081814E6: adds r0, r6, 0 bl sub_817F70C ldr r4, =0x03001240 @@ -743082,7 +743082,7 @@ _081814E6: movs r3, 0x8 ldrsh r0, [r2, r3] cmp r1, r0 - ble _0818154C + ble @0818154C movs r2, 0x80 lsls r2, 1 adds r0, r6, 0 @@ -743101,22 +743101,22 @@ _081814E6: movs r4, 0x4 ldrsh r0, [r1, r4] cmp r0, 0x1 - ble _0818153C + ble @0818153C subs r0, r2, 0x1 strh r0, [r1, 0x4] strh r3, [r6, 0x32] - b _08181588 + b @08181588 .align 2, 0 .pool -_0818153C: +@0818153C: adds r0, r6, 0 bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r6, 0x1C] - b _08181588 + b @08181588 .align 2, 0 .pool -_0818154C: +@0818154C: movs r1, 0x32 ldrsh r0, [r6, r1] lsls r0, 8 @@ -743143,7 +743143,7 @@ _0818154C: adds r1, r5, 0 adds r2, r5, 0 bl sub_817F6D4 -_08181588: +@08181588: ldrh r0, [r6, 0x32] adds r0, 0x1 strh r0, [r6, 0x32] @@ -743157,7 +743157,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 @@ -743183,16 +743183,16 @@ 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 ldrsh r0, [r6, r1] cmp r0, 0 - bne _081815E6 + bne @081815E6 adds r0, r6, 0 bl sub_817F670 -_081815E6: +@081815E6: adds r0, r6, 0 bl sub_817F70C ldr r4, =0x03001240 @@ -743207,7 +743207,7 @@ _081815E6: movs r3, 0x8 ldrsh r0, [r2, r3] cmp r1, r0 - ble _0818164C + ble @0818164C movs r2, 0x80 lsls r2, 1 adds r0, r6, 0 @@ -743226,22 +743226,22 @@ _081815E6: movs r4, 0x4 ldrsh r0, [r1, r4] cmp r0, 0x1 - ble _0818163C + ble @0818163C subs r0, r2, 0x1 strh r0, [r1, 0x4] strh r3, [r6, 0x32] - b _0818168A + b @0818168A .align 2, 0 .pool -_0818163C: +@0818163C: adds r0, r6, 0 bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r6, 0x1C] - b _0818168A + b @0818168A .align 2, 0 .pool -_0818164C: +@0818164C: movs r1, 0x32 ldrsh r0, [r6, r1] lsls r0, 8 @@ -743269,7 +743269,7 @@ _0818164C: adds r1, r5, 0 adds r2, r5, 0 bl sub_817F6D4 -_0818168A: +@0818168A: ldrh r0, [r6, 0x32] adds r0, 0x1 strh r0, [r6, 0x32] @@ -743283,7 +743283,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 @@ -743309,7 +743309,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 @@ -743336,7 +743336,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 @@ -743370,14 +743370,14 @@ sub_8181708: @ 8181708 movs r1, 0x3C ldrsh r0, [r4, r1] cmp r0, 0x78 - bgt _08181760 + bgt @08181760 movs r0, 0x78 strh r0, [r4, 0x3C] movs r0, 0 strh r0, [r4, 0x34] ldr r0, =sub_8181770 + 1 str r0, [r4, 0x1C] -_08181760: +@08181760: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -743388,18 +743388,18 @@ _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 ldrsh r0, [r1, r2] cmp r0, 0x14 - bne _08181784 + bne @08181784 ldr r0, =sub_8181794 + 1 str r0, [r1, 0x1C] movs r0, 0 strh r0, [r1, 0x34] -_08181784: +@08181784: ldrh r0, [r1, 0x34] adds r0, 0x1 strh r0, [r1, 0x34] @@ -743410,7 +743410,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 @@ -743446,7 +743446,7 @@ sub_8181794: @ 8181794 movs r1, 0x3C ldrsh r0, [r4, r1] cmp r0, 0x7F - ble _08181800 + ble @08181800 strh r6, [r4, 0x24] strh r6, [r4, 0x26] adds r0, r4, 0 @@ -743459,7 +743459,7 @@ sub_8181794: @ 8181794 bl sub_817F77C ldr r0, =pokemonanimfunc_10 + 1 str r0, [r4, 0x1C] -_08181800: +@08181800: adds r0, r4, 0 bl sub_817F70C pop {r4-r6} @@ -743470,7 +743470,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 @@ -743483,28 +743483,28 @@ sub_8181810: @ 8181810 ldrh r0, [r1] adds r6, r0, 0 cmp r6, 0 - beq _08181834 + beq @08181834 subs r0, 0x1 strh r0, [r1] - b _08181950 + b @08181950 .align 2, 0 .pool -_08181834: +@08181834: movs r1, 0x32 ldrsh r0, [r5, r1] cmp r0, 0 - bne _0818184A + bne @0818184A adds r0, r5, 0 bl sub_817F670 strh r6, [r5, 0x36] strh r6, [r5, 0x38] movs r0, 0x1 strh r0, [r5, 0x32] -_0818184A: +@0818184A: movs r3, 0x38 ldrsh r0, [r5, r3] cmp r0, 0 - bne _081818A2 + bne @081818A2 movs r1, 0x36 ldrsh r0, [r5, r1] movs r4, 0x80 @@ -743536,14 +743536,14 @@ _0818184A: movs r3, 0x36 ldrsh r0, [r5, r3] cmp r0, 0x80 - bne _0818193A + bne @0818193A strh r6, [r5, 0x36] movs r0, 0x1 strh r0, [r5, 0x38] - b _0818193A -_081818A2: + b @0818193A +@081818A2: cmp r0, 0x1 - bne _0818193A + bne @0818193A movs r1, 0x36 ldrsh r0, [r5, r1] movs r1, 0x20 @@ -743577,7 +743577,7 @@ _081818A2: movs r1, 0x36 ldrsh r0, [r5, r1] cmp r0, 0x80 - bne _0818193A + bne @0818193A movs r3, 0x2E ldrsh r0, [r5, r3] lsls r1, r0, 1 @@ -743588,7 +743588,7 @@ _081818A2: movs r3, 0x4 ldrsh r0, [r1, r3] cmp r0, 0x1 - ble _08181922 + ble @08181922 subs r0, r2, 0x1 strh r0, [r1, 0x4] movs r0, 0x2E @@ -743601,8 +743601,8 @@ _081818A2: strh r1, [r0] strh r6, [r5, 0x36] strh r6, [r5, 0x38] - b _0818193A -_08181922: + b @0818193A +@08181922: movs r2, 0x80 lsls r2, 1 adds r0, r5, 0 @@ -743613,7 +743613,7 @@ _08181922: bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r5, 0x1C] -_0818193A: +@0818193A: ldr r2, =0x03001240 movs r3, 0x2E ldrsh r1, [r5, r3] @@ -743625,7 +743625,7 @@ _0818193A: ldrh r1, [r5, 0x36] adds r0, r1 strh r0, [r5, 0x36] -_08181950: +@08181950: pop {r4-r6} pop {r0} bx r0 @@ -743634,7 +743634,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 @@ -743660,7 +743660,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 @@ -743670,108 +743670,108 @@ pokemonanimfunc_31: @ 8181994 movs r0, 0x80 lsls r0, 2 cmp r4, r0 - ble _081819B8 + ble @081819B8 ldr r0, =sub_8184D88 + 1 str r0, [r5, 0x1C] movs r0, 0 strh r0, [r5, 0x24] - b _08181A62 + b @08181A62 .align 2, 0 .pool -_081819B8: +@081819B8: movs r1, 0x32 ldrsh r0, [r5, r1] cmp r0, 0 - bge _081819C2 + bge @081819C2 adds r0, 0x7F -_081819C2: +@081819C2: asrs r0, 7 cmp r0, 0x1 - beq _081819F8 + beq @081819F8 cmp r0, 0x1 - bgt _081819D2 + bgt @081819D2 cmp r0, 0 - beq _081819DC - b _08181A48 -_081819D2: + beq @081819DC + b @08181A48 +@081819D2: cmp r0, 0x2 - beq _08181A12 + beq @08181A12 cmp r0, 0x3 - beq _08181A2A - b _08181A48 -_081819DC: + beq @08181A2A + b @08181A48 +@081819DC: adds r0, r4, 0 cmp r4, 0 - bge _081819E4 + bge @081819E4 adds r0, 0x7F -_081819E4: +@081819E4: asrs r0, 7 lsls r0, 7 subs r0, r4, r0 lsls r0, 3 negs r0, r0 cmp r0, 0 - bge _081819F4 + bge @081819F4 adds r0, 0x7F -_081819F4: +@081819F4: asrs r0, 7 - b _08181A46 -_081819F8: + b @08181A46 +@081819F8: adds r0, r4, 0 cmp r4, 0 - bge _08181A00 + bge @08181A00 adds r0, 0x7F -_08181A00: +@08181A00: asrs r0, 7 lsls r0, 7 subs r0, r4, r0 cmp r0, 0 - bge _08181A0C + bge @08181A0C adds r0, 0xF -_08181A0C: +@08181A0C: asrs r0, 4 subs r0, 0x8 - b _08181A46 -_08181A12: + b @08181A46 +@08181A12: adds r0, r4, 0 cmp r4, 0 - bge _08181A1A + bge @08181A1A adds r0, 0x7F -_08181A1A: +@08181A1A: asrs r0, 7 lsls r0, 7 subs r0, r4, r0 cmp r0, 0 - bge _08181A26 + bge @08181A26 adds r0, 0xF -_08181A26: +@08181A26: asrs r0, 4 - b _08181A46 -_08181A2A: + b @08181A46 +@08181A2A: adds r0, r4, 0 cmp r4, 0 - bge _08181A32 + bge @08181A32 adds r0, 0x7F -_08181A32: +@08181A32: asrs r0, 7 lsls r0, 7 subs r0, r4, r0 lsls r0, 3 negs r0, r0 cmp r0, 0 - bge _08181A42 + bge @08181A42 adds r0, 0x7F -_08181A42: +@08181A42: asrs r0, 7 adds r0, 0x8 -_08181A46: +@08181A46: strh r0, [r5, 0x24] -_08181A48: +@08181A48: adds r0, r4, 0 cmp r4, 0 - bge _08181A50 + bge @08181A50 adds r0, 0x7F -_08181A50: +@08181A50: asrs r0, 7 lsls r0, 7 subs r0, r4, r0 @@ -743780,7 +743780,7 @@ _08181A50: movs r1, 0x8 bl sine negs r0, r0 -_08181A62: +@08181A62: strh r0, [r5, 0x26] ldrh r0, [r5, 0x32] adds r0, 0xC @@ -743793,7 +743793,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 @@ -743823,7 +743823,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 @@ -743836,27 +743836,27 @@ sub_8181ABC: @ 8181ABC ldrh r0, [r1] adds r5, r0, 0 cmp r5, 0 - beq _08181AE0 + beq @08181AE0 subs r0, 0x1 strh r0, [r1] - b _08181B44 + b @08181B44 .align 2, 0 .pool -_08181AE0: +@08181AE0: adds r0, r4, 0 bl sub_817F70C movs r1, 0x32 ldrsh r2, [r4, r1] adds r0, r2, 0 cmp r0, 0x80 - ble _08181AFC + ble @08181AFC strh r5, [r4, 0x32] ldr r0, =sub_8181B4C + 1 str r0, [r4, 0x1C] - b _08181B3E + b @08181B3E .align 2, 0 .pool -_08181AFC: +@08181AFC: movs r1, 0x2E ldrsh r0, [r4, r1] lsls r1, r0, 1 @@ -743868,18 +743868,18 @@ _08181AFC: lsls r3, r0, 3 adds r0, r2, 0 cmp r2, 0 - bge _08181B16 + bge @08181B16 adds r0, 0x7F -_08181B16: +@08181B16: asrs r0, 7 lsls r0, 7 subs r1, r2, r0 adds r0, r3, 0 muls r0, r1 cmp r0, 0 - bge _08181B26 + bge @08181B26 adds r0, 0x7F -_08181B26: +@08181B26: asrs r0, 7 strh r0, [r4, 0x24] lsls r0, r1, 16 @@ -743891,24 +743891,24 @@ _08181B26: ldrh r0, [r4, 0x32] adds r0, 0xC strh r0, [r4, 0x32] -_08181B3E: +@08181B3E: adds r0, r4, 0 bl sub_817F70C -_08181B44: +@08181B44: pop {r4-r6} pop {r0} bx r0 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 movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0x30 - ble _08181B7C + ble @08181B7C movs r2, 0x80 lsls r2, 1 adds r0, r4, 0 @@ -743920,10 +743920,10 @@ sub_8181B4C: @ 8181B4C strh r0, [r4, 0x32] ldr r0, =sub_8181C2C + 1 str r0, [r4, 0x1C] - b _08181C1A + b @08181C1A .align 2, 0 .pool -_08181B7C: +@08181B7C: movs r2, 0x36 ldrsh r0, [r4, r2] movs r1, 0x40 @@ -743939,7 +743939,7 @@ _08181B7C: lsls r0, 16 lsrs r0, 16 cmp r0, 0xF - bhi _08181BBA + bhi @08181BBA ldrh r0, [r4, 0x34] adds r0, 0x8 strh r0, [r4, 0x34] @@ -743954,7 +743954,7 @@ _08181B7C: ldrh r0, [r0, 0x8] subs r1, r0 strh r1, [r4, 0x24] -_08181BBA: +@08181BBA: movs r5, 0 lsls r1, r3, 16 asrs r2, r1, 16 @@ -743962,15 +743962,15 @@ _08181BBA: asrs r0, 16 adds r6, r1, 0 cmp r2, r0 - ble _08181BD6 + ble @08181BD6 subs r0, r2 cmp r0, 0 - bge _08181BD2 + bge @08181BD2 adds r0, 0x7 -_08181BD2: +@08181BD2: lsls r0, 13 lsrs r5, r0, 16 -_08181BD6: +@08181BD6: movs r1, 0x34 ldrsh r0, [r4, r1] movs r1, 0x14 @@ -744002,7 +744002,7 @@ _08181BD6: movs r1, 0xFF ands r0, r1 strh r0, [r4, 0x36] -_08181C1A: +@08181C1A: adds r0, r4, 0 bl sub_817F70C pop {r4-r6} @@ -744013,14 +744013,14 @@ _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 movs r0, 0x32 ldrsh r3, [r4, r0] cmp r3, 0x80 - ble _08181C90 + ble @08181C90 ldr r3, =0x03001240 movs r1, 0x2E ldrsh r0, [r4, r1] @@ -744032,7 +744032,7 @@ sub_8181C2C: @ 8181C2C movs r5, 0x4 ldrsh r0, [r1, r5] cmp r0, 0x1 - ble _08181C7C + ble @08181C7C subs r0, r2, 0x1 movs r2, 0 strh r0, [r1, 0x4] @@ -744048,21 +744048,21 @@ sub_8181C2C: @ 8181C2C strh r2, [r4, 0x32] strh r2, [r4, 0x36] ldr r0, =sub_8181ABC + 1 - b _08181C84 + b @08181C84 .align 2, 0 .pool -_08181C7C: +@08181C7C: adds r0, r4, 0 bl sub_817F77C ldr r0, =sub_8184D88 + 1 -_08181C84: +@08181C84: str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] - b _08181CD0 + b @08181CD0 .align 2, 0 .pool -_08181C90: +@08181C90: ldr r2, =0x03001240 movs r5, 0x2E ldrsh r1, [r4, r5] @@ -744075,18 +744075,18 @@ _08181C90: lsls r1, r5, 3 adds r0, r3, 0 cmp r3, 0 - bge _08181CAC + bge @08181CAC adds r0, 0x7F -_08181CAC: +@08181CAC: asrs r0, 7 lsls r0, 7 subs r2, r3, r0 adds r0, r1, 0 muls r0, r2 cmp r0, 0 - bge _08181CBC + bge @08181CBC adds r0, 0x7F -_08181CBC: +@08181CBC: asrs r0, 7 lsls r1, r5, 3 subs r0, r1 @@ -744096,7 +744096,7 @@ _08181CBC: movs r1, 0x8 bl sine negs r0, r0 -_08181CD0: +@08181CD0: strh r0, [r4, 0x26] ldrh r0, [r4, 0x32] adds r0, 0xC @@ -744111,25 +744111,25 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08181D00 + bne @08181D00 adds r0, r4, 0 bl sub_817F670 ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] -_08181D00: +@08181D00: adds r0, r4, 0 bl sub_817F70C movs r3, 0x3C ldrsh r0, [r4, r3] cmp r0, 0xFE - ble _08181D60 + ble @08181D60 movs r5, 0 strh r5, [r4, 0x24] strh r5, [r4, 0x26] @@ -744150,26 +744150,26 @@ _08181D00: movs r3, 0x4 ldrsh r0, [r1, r3] cmp r0, 0x1 - ble _08181D48 + ble @08181D48 subs r0, r2, 0x1 strh r0, [r1, 0x4] strh r5, [r4, 0x32] strh r5, [r4, 0x3C] - b _08181D52 + b @08181D52 .align 2, 0 .pool -_08181D48: +@08181D48: adds r0, r4, 0 bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] -_08181D52: +@08181D52: adds r0, r4, 0 bl sub_817F70C - b _08181DA6 + b @08181DA6 .align 2, 0 .pool -_08181D60: +@08181D60: movs r1, 0x3C ldrsh r0, [r4, r1] movs r1, 0x10 @@ -744201,7 +744201,7 @@ _08181D60: strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_817F70C -_08181DA6: +@08181DA6: pop {r4,r5} pop {r0} bx r0 @@ -744210,7 +744210,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 @@ -744236,25 +744236,25 @@ 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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08181DFC + bne @08181DFC adds r0, r4, 0 bl sub_817F670 ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] -_08181DFC: +@08181DFC: adds r0, r4, 0 bl sub_817F70C movs r1, 0x3C ldrsh r0, [r4, r1] cmp r0, 0xFE - ble _08181E34 + ble @08181E34 movs r0, 0 strh r0, [r4, 0x24] strh r0, [r4, 0x26] @@ -744270,10 +744270,10 @@ _08181DFC: str r0, [r4, 0x1C] adds r0, r4, 0 bl sub_817F70C - b _08181E8A + b @08181E8A .align 2, 0 .pool -_08181E34: +@08181E34: movs r1, 0x3C ldrsh r0, [r4, r1] movs r1, 0x10 @@ -744284,9 +744284,9 @@ _08181E34: ldrsh r1, [r4, r0] adds r0, r1, 0 cmp r1, 0 - bge _08181E4E + bge @08181E4E adds r0, 0x7F -_08181E4E: +@08181E4E: asrs r0, 7 lsls r0, 7 subs r0, r1, r0 @@ -744313,22 +744313,22 @@ _08181E4E: strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_817F70C -_08181E8A: +@08181E8A: pop {r4} pop {r0} bx r0 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 ldrsh r0, [r3, r1] cmp r0, 0 - bne _08181E9E + bne @08181E9E strh r0, [r3, 0x3C] -_08181E9E: +@08181E9E: ldrh r4, [r3, 0x32] movs r5, 0x32 ldrsh r1, [r3, r5] @@ -744336,7 +744336,7 @@ _08181E9E: movs r5, 0x3C ldrsh r0, [r3, r5] cmp r1, r0 - bne _08181EC8 + bne @08181EC8 movs r0, 0 strh r0, [r3, 0x3C] adds r0, r4, 0x1 @@ -744349,8 +744349,8 @@ _08181E9E: ands r0, r2 strb r0, [r1] adds r2, r1, 0 - b _08181ED8 -_08181EC8: + b @08181ED8 +@08181EC8: adds r0, r2, 0x1 strh r0, [r3, 0x3C] adds r2, r3, 0 @@ -744359,11 +744359,11 @@ _08181EC8: movs r1, 0x4 orrs r0, r1 strb r0, [r2] -_08181ED8: +@08181ED8: movs r1, 0x32 ldrsh r0, [r3, r1] cmp r0, 0xA - ble _08181EEE + ble @08181EEE ldrb r0, [r2] movs r1, 0x5 negs r1, r1 @@ -744371,7 +744371,7 @@ _08181ED8: strb r1, [r2] ldr r0, =sub_8184D88 + 1 str r0, [r3, 0x1C] -_08181EEE: +@08181EEE: pop {r4,r5} pop {r0} bx r0 @@ -744380,7 +744380,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 @@ -744396,27 +744396,27 @@ 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] movs r2, 0x3C ldrsh r0, [r4, r2] cmp r0, 0x1F - ble _08181F34 + ble @08181F34 movs r0, 0 movs r1, 0x20 strh r1, [r4, 0x3C] strh r0, [r4, 0x32] ldr r0, =sub_8181F50 + 1 str r0, [r4, 0x1C] - b _08181F38 + b @08181F38 .align 2, 0 .pool -_08181F34: +@08181F34: adds r0, r1, 0x4 strh r0, [r4, 0x3C] -_08181F38: +@08181F38: movs r2, 0x80 lsls r2, 1 ldrh r3, [r4, 0x3C] @@ -744431,7 +744431,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 @@ -744440,33 +744440,33 @@ sub_8181F50: @ 8181F50 movs r0, 0x80 lsls r0, 2 cmp r1, r0 - ble _08181F74 + ble @08181F74 ldr r0, =sub_8181FC0 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3A] - b _08181FAE + b @08181FAE .align 2, 0 .pool -_08181F74: +@08181F74: movs r1, 0x32 ldrsh r0, [r4, r1] lsls r0, 4 negs r0, r0 cmp r0, 0 - bge _08181F84 + bge @08181F84 ldr r1, =0x000001ff adds r0, r1 -_08181F84: +@08181F84: asrs r0, 9 strh r0, [r4, 0x24] movs r0, 0x32 ldrsh r1, [r4, r0] adds r0, r1, 0 cmp r1, 0 - bge _08181F94 + bge @08181F94 adds r0, 0x7F -_08181F94: +@08181F94: asrs r0, 7 lsls r0, 7 subs r0, r1, r0 @@ -744479,7 +744479,7 @@ _08181F94: ldrh r0, [r4, 0x32] adds r0, 0xC strh r0, [r4, 0x32] -_08181FAE: +@08181FAE: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -744490,7 +744490,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 @@ -744500,17 +744500,17 @@ sub_8181FC0: @ 8181FC0 strh r0, [r4, 0x3C] lsls r0, 16 cmp r0, 0 - bge _08181FEC + bge @08181FEC strh r1, [r4, 0x3C] strh r1, [r4, 0x24] adds r0, r4, 0 bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _08181FFE + b @08181FFE .align 2, 0 .pool -_08181FEC: +@08181FEC: movs r1, 0x3C ldrsh r0, [r4, r1] lsls r0, 17 @@ -744519,7 +744519,7 @@ _08181FEC: bl sine negs r0, r0 strh r0, [r4, 0x24] -_08181FFE: +@08181FFE: movs r2, 0x80 lsls r2, 1 ldrh r3, [r4, 0x3C] @@ -744536,27 +744536,27 @@ _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 ldrsh r5, [r4, r0] cmp r5, 0 - bne _08182036 + bne @08182036 adds r0, r4, 0 bl sub_817F670 ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] strh r5, [r4, 0x3C] -_08182036: +@08182036: adds r0, r4, 0 bl sub_817F70C ldrh r1, [r4, 0x3C] movs r2, 0x3C ldrsh r0, [r4, r2] cmp r0, 0xFF - ble _08182060 + ble @08182060 movs r0, 0 strh r0, [r4, 0x24] strh r0, [r4, 0x26] @@ -744565,10 +744565,10 @@ _08182036: bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _081820A6 + b @081820A6 .align 2, 0 .pool -_08182060: +@08182060: adds r0, r1, 0 adds r0, 0x10 strh r0, [r4, 0x3C] @@ -744576,9 +744576,9 @@ _08182060: ldrsh r1, [r4, r0] adds r0, r1, 0 cmp r1, 0 - bge _08182072 + bge @08182072 adds r0, 0x7F -_08182072: +@08182072: asrs r0, 7 lsls r0, 7 subs r0, r1, r0 @@ -744592,9 +744592,9 @@ _08182072: ldrsh r1, [r4, r2] adds r0, r1, 0 cmp r1, 0 - bge _08182092 + bge @08182092 adds r0, 0x7F -_08182092: +@08182092: asrs r0, 7 lsls r0, 7 subs r0, r1, r0 @@ -744604,14 +744604,14 @@ _08182092: bl sine negs r0, r0 strh r0, [r4, 0x26] -_081820A6: +@081820A6: movs r0, 0x3C ldrsh r1, [r4, r0] adds r0, r1, 0 cmp r1, 0 - bge _081820B2 + bge @081820B2 adds r0, 0x7F -_081820B2: +@081820B2: asrs r0, 7 lsls r0, 7 subs r0, r1, r0 @@ -744635,7 +744635,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 @@ -744652,7 +744652,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 @@ -744660,22 +744660,22 @@ sub_81820FC: @ 81820FC movs r2, 0x3C ldrsh r0, [r4, r2] cmp r0, 0x18 - ble _0818212C + ble @0818212C ldrh r0, [r4, 0x36] adds r0, 0x1 strh r0, [r4, 0x36] lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - ble _0818214A + ble @0818214A movs r0, 0 strh r0, [r4, 0x36] ldr r0, =sub_818216C + 1 str r0, [r4, 0x1C] - b _0818214A + b @0818214A .align 2, 0 .pool -_0818212C: +@0818212C: adds r0, r1, 0x2 strh r0, [r4, 0x3C] movs r1, 0x3C @@ -744689,7 +744689,7 @@ _0818212C: bl sine negs r0, r0 strh r0, [r4, 0x26] -_0818214A: +@0818214A: movs r2, 0x80 lsls r2, 1 ldrh r3, [r4, 0x3C] @@ -744707,7 +744707,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 @@ -744715,15 +744715,15 @@ sub_818216C: @ 818216C movs r2, 0x3C ldrsh r0, [r4, r2] cmp r0, 0x20 - ble _0818218C + ble @0818218C movs r0, 0x1 strh r0, [r4, 0x3A] ldr r0, =sub_81821CC + 1 str r0, [r4, 0x1C] - b _081821AA + b @081821AA .align 2, 0 .pool -_0818218C: +@0818218C: adds r0, r1, 0x2 strh r0, [r4, 0x3C] movs r1, 0x3C @@ -744737,7 +744737,7 @@ _0818218C: bl sine negs r0, r0 strh r0, [r4, 0x26] -_081821AA: +@081821AA: movs r2, 0x80 lsls r2, 1 ldrh r3, [r4, 0x3C] @@ -744755,7 +744755,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 @@ -744768,12 +744768,12 @@ sub_81821CC: @ 81821CC movs r1, 0x38 ldrsh r0, [r4, r1] cmp r0, 0x9 - ble _081821F0 + ble @081821F0 movs r0, 0x20 strh r0, [r4, 0x3C] ldr r0, =sub_8182248 + 1 str r0, [r4, 0x1C] -_081821F0: +@081821F0: movs r1, 0x3C ldrsh r0, [r4, r1] movs r1, 0x8 @@ -744790,7 +744790,7 @@ _081821F0: lsls r0, 16 lsrs r0, 16 cmp r0, 0x6 - bls _08182224 + bls @08182224 movs r1, 0x3A ldrsh r0, [r4, r1] negs r0, r0 @@ -744798,7 +744798,7 @@ _081821F0: ldrh r0, [r4, 0x38] adds r0, 0x1 strh r0, [r4, 0x38] -_08182224: +@08182224: movs r2, 0x80 lsls r2, 1 ldrh r3, [r4, 0x3C] @@ -744818,7 +744818,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 @@ -744826,17 +744826,17 @@ sub_8182248: @ 8182248 movs r2, 0x3C ldrsh r0, [r4, r2] cmp r0, 0 - bgt _08182270 + bgt @08182270 movs r0, 0 strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _0818228E + b @0818228E .align 2, 0 .pool -_08182270: +@08182270: subs r0, r1, 0x2 strh r0, [r4, 0x3C] movs r1, 0x3C @@ -744850,7 +744850,7 @@ _08182270: bl sine negs r0, r0 strh r0, [r4, 0x26] -_0818228E: +@0818228E: movs r2, 0x80 lsls r2, 1 ldrh r3, [r4, 0x3C] @@ -744868,7 +744868,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 @@ -744876,29 +744876,29 @@ pokemonanimfunc_39: @ 81822B0 movs r2, 0x32 ldrsh r0, [r4, r2] cmp r0, 0x28 - ble _081822D0 + ble @081822D0 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] - b _0818235C + b @0818235C .align 2, 0 .pool -_081822D0: +@081822D0: movs r0, 0x1 ands r0, r1 movs r5, 0xFF cmp r0, 0 - bne _081822DC + bne @081822DC movs r5, 0x1 -_081822DC: +@081822DC: movs r0, 0x32 ldrsh r2, [r4, r0] adds r0, r2, 0 cmp r2, 0 - bge _081822E8 + bge @081822E8 adds r0, r2, 0x3 -_081822E8: +@081822E8: asrs r0, 2 lsls r0, 2 subs r0, r2, r0 @@ -744908,15 +744908,15 @@ _081822E8: adds r1, r0 asrs r1, 1 cmp r1, 0 - bne _0818232C + bne @0818232C lsls r0, r2, 7 movs r1, 0x28 bl __divsi3 adds r1, r0, 0 cmp r1, 0 - bge _0818230C + bge @0818230C adds r0, 0xFF -_0818230C: +@0818230C: asrs r0, 8 lsls r0, 8 subs r0, r1, r0 @@ -744931,16 +744931,16 @@ _0818230C: adds r0, r2, 0 strh r0, [r4, 0x24] negs r0, r0 - b _0818235A -_0818232C: + b @0818235A +@0818232C: lsls r0, r2, 7 movs r1, 0x28 bl __divsi3 adds r1, r0, 0 cmp r1, 0 - bge _0818233C + bge @0818233C adds r0, 0xFF -_0818233C: +@0818233C: asrs r0, 8 lsls r0, 8 subs r0, r1, r0 @@ -744955,9 +744955,9 @@ _0818233C: asrs r1, 24 muls r0, r1 strh r0, [r4, 0x24] -_0818235A: +@0818235A: strh r0, [r4, 0x26] -_0818235C: +@0818235C: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] @@ -744969,14 +744969,14 @@ _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 movs r0, 0x32 ldrsh r5, [r4, r0] cmp r5, 0 - bne _08182392 + bne @08182392 adds r0, r4, 0 bl sub_817F670 strh r5, [r4, 0x38] @@ -744985,18 +744985,18 @@ pokemonanimfunc_3A: @ 8182370 ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] -_08182392: +@08182392: ldrh r1, [r4, 0x3A] movs r2, 0x3A ldrsh r0, [r4, r2] cmp r0, 0 - ble _081823E4 + ble @081823E4 subs r0, r1, 0x1 strh r0, [r4, 0x3A] movs r1, 0x38 ldrsh r0, [r4, r1] cmp r0, 0x3 - beq _08182494 + beq @08182494 movs r2, 0x3A ldrsh r0, [r4, r2] lsls r0, 3 @@ -745023,16 +745023,16 @@ _08182392: adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 - b _08182494 -_081823E4: + b @08182494 +@081823E4: movs r2, 0x38 ldrsh r0, [r4, r2] cmp r0, 0x3 - bne _08182424 + bne @08182424 movs r1, 0x3C ldrsh r0, [r4, r1] cmp r0, 0x3F - ble _08182410 + ble @08182410 movs r0, 0x40 strh r0, [r4, 0x3C] movs r2, 0x80 @@ -745045,17 +745045,17 @@ _081823E4: bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] -_08182410: +@08182410: movs r2, 0x3C ldrsh r0, [r4, r2] movs r1, 0x40 bl cosine lsls r0, 16 lsrs r3, r0, 16 - b _08182474 + b @08182474 .align 2, 0 .pool -_08182424: +@08182424: movs r1, 0x3C ldrsh r0, [r4, r1] movs r1, 0x40 @@ -745065,40 +745065,40 @@ _08182424: movs r2, 0x3C ldrsh r0, [r4, r2] cmp r0, 0x3F - ble _08182448 + ble @08182448 movs r0, 0 movs r1, 0x3 strh r1, [r4, 0x38] movs r1, 0xA strh r1, [r4, 0x3A] strh r0, [r4, 0x3C] - b _08182474 -_08182448: + b @08182474 +@08182448: lsls r0, r3, 16 asrs r0, 16 cmp r0, 0x30 - ble _0818245C + ble @0818245C movs r1, 0x38 ldrsh r0, [r4, r1] cmp r0, 0x1 - bne _0818245C + bne @0818245C movs r0, 0x2 - b _0818246E -_0818245C: + b @0818246E +@0818245C: lsls r0, r3, 16 asrs r0, 16 cmp r0, 0x10 - ble _08182474 + ble @08182474 movs r2, 0x38 ldrsh r0, [r4, r2] cmp r0, 0 - bne _08182474 + bne @08182474 movs r0, 0x1 -_0818246E: +@0818246E: strh r0, [r4, 0x38] movs r0, 0x14 strh r0, [r4, 0x3A] -_08182474: +@08182474: ldrh r0, [r4, 0x3C] adds r0, 0x2 strh r0, [r4, 0x3C] @@ -745114,7 +745114,7 @@ _08182474: adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 -_08182494: +@08182494: adds r0, r4, 0 bl sub_817F70C pop {r4,r5} @@ -745123,26 +745123,26 @@ _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 ldrsh r5, [r4, r0] cmp r5, 0 - bne _081824BA + bne @081824BA adds r0, r4, 0 bl sub_817F670 ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] strh r5, [r4, 0x3C] -_081824BA: +@081824BA: movs r0, 0x3C ldrsh r1, [r4, r0] movs r0, 0x80 lsls r0, 2 cmp r1, r0 - ble _081824E8 + ble @081824E8 movs r0, 0 strh r0, [r4, 0x26] movs r2, 0x80 @@ -745155,17 +745155,17 @@ _081824BA: bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _08182540 + b @08182540 .align 2, 0 .pool -_081824E8: +@081824E8: movs r0, 0x3C ldrsh r1, [r4, r0] adds r0, r1, 0 cmp r1, 0 - bge _081824F4 + bge @081824F4 adds r0, 0xFF -_081824F4: +@081824F4: asrs r0, 8 lsls r0, 8 subs r0, r1, r0 @@ -745181,9 +745181,9 @@ _081824F4: ldrsh r1, [r4, r0] adds r0, r1, 0 cmp r1, 0 - bge _08182518 + bge @08182518 adds r0, 0x7F -_08182518: +@08182518: asrs r0, 7 lsls r0, 7 subs r0, r1, r0 @@ -745202,33 +745202,33 @@ _08182518: adds r0, r4, 0 movs r3, 0 bl sub_817F6D4 -_08182540: +@08182540: pop {r4,r5} pop {r0} bx r0 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 ldrsh r5, [r4, r0] cmp r5, 0 - bne _08182562 + bne @08182562 adds r0, r4, 0 bl sub_817F670 ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] strh r5, [r4, 0x3C] -_08182562: +@08182562: movs r1, 0x3C ldrsh r0, [r4, r1] movs r5, 0x80 lsls r5, 1 cmp r0, r5 - ble _08182590 + ble @08182590 movs r0, 0 strh r0, [r4, 0x26] adds r0, r4, 0 @@ -745240,10 +745240,10 @@ _08182562: bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _081825D4 + b @081825D4 .align 2, 0 .pool -_08182590: +@08182590: movs r1, 0x3C ldrsh r0, [r4, r1] movs r1, 0x10 @@ -745256,9 +745256,9 @@ _08182590: ldrsh r1, [r4, r0] adds r0, r1, 0 cmp r1, 0 - bge _081825AE + bge @081825AE adds r0, 0x3F -_081825AE: +@081825AE: asrs r0, 6 lsls r0, 6 subs r0, r1, r0 @@ -745276,14 +745276,14 @@ _081825AE: adds r1, r5, 0 movs r3, 0 bl sub_817F6D4 -_081825D4: +@081825D4: pop {r4,r5} pop {r0} bx r0 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 @@ -745299,7 +745299,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] @@ -745309,19 +745309,19 @@ sub_81825F8: @ 81825F8 lsls r0, 16 asrs r0, 16 cmp r0, 0x3F - ble _0818261C + ble @0818261C strh r1, [r4, 0x3C] strh r1, [r4, 0x3A] ldr r0, =sub_8182648 + 1 str r0, [r4, 0x1C] movs r0, 0x40 - b _08182620 + b @08182620 .align 2, 0 .pool -_0818261C: +@0818261C: movs r1, 0x3C ldrsh r0, [r4, r1] -_08182620: +@08182620: movs r1, 0x80 bl sine lsls r0, 16 @@ -745342,7 +745342,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] @@ -745351,7 +745351,7 @@ sub_8182648: @ 8182648 lsls r0, 16 asrs r0, 16 cmp r0, 0x5F - ble _08182672 + ble @08182672 movs r0, 0 movs r1, 0x80 bl cosine @@ -745362,8 +745362,8 @@ sub_8182648: @ 8182648 ldrh r0, [r4, 0x3A] adds r0, 0x1 strh r0, [r4, 0x3A] - b _081826C8 -_08182672: + b @081826C8 +@08182672: movs r1, 0x3C ldrsh r0, [r4, r1] movs r1, 0x8 @@ -745378,19 +745378,19 @@ _08182672: movs r2, 0x3C ldrsh r0, [r4, r2] cmp r0, 0x3F - ble _081826A4 + ble @081826A4 ldr r5, =0x0000ffff adds r0, r1, 0 subs r0, 0x40 lsls r0, 16 lsrs r0, 16 - b _081826A8 + b @081826A8 .align 2, 0 .pool -_081826A4: +@081826A4: movs r5, 0x1 movs r0, 0 -_081826A8: +@081826A8: lsls r0, 16 asrs r0, 15 ldrh r1, [r4, 0x3C] @@ -745406,7 +745406,7 @@ _081826A8: adds r0, r2, 0 lsls r0, 16 lsrs r2, r0, 16 -_081826C8: +@081826C8: movs r1, 0x80 lsls r1, 1 lsls r2, 16 @@ -745420,12 +745420,12 @@ _081826C8: movs r1, 0x3A ldrsh r0, [r4, r1] cmp r0, 0x3 - bne _081826EE + bne @081826EE movs r0, 0 strh r0, [r4, 0x3C] ldr r0, =sub_81826F8 + 1 str r0, [r4, 0x1C] -_081826EE: +@081826EE: pop {r4,r5} pop {r0} bx r0 @@ -745434,7 +745434,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] @@ -745455,7 +745455,7 @@ sub_81826F8: @ 81826F8 movs r1, 0x3C ldrsh r0, [r4, r1] cmp r0, 0x3F - ble _08182742 + ble @08182742 adds r0, r4, 0 bl sub_817F77C ldr r0, =sub_8184D88 + 1 @@ -745468,7 +745468,7 @@ sub_81826F8: @ 81826F8 adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 -_08182742: +@08182742: movs r1, 0x80 lsls r1, 1 lsls r2, r5, 16 @@ -745487,7 +745487,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 @@ -745495,7 +745495,7 @@ sub_8182764: @ 8182764 movs r2, 0x38 ldrsh r0, [r4, r2] cmp r1, r0 - ble _08182798 + ble @08182798 movs r0, 0 strh r0, [r4, 0x24] adds r0, r4, 0 @@ -745508,17 +745508,17 @@ sub_8182764: @ 8182764 adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 - b _081827F4 + b @081827F4 .align 2, 0 .pool -_08182798: +@08182798: movs r0, 0x3C ldrsh r1, [r4, r0] adds r0, r1, 0 cmp r1, 0 - bge _081827A4 + bge @081827A4 adds r0, 0xFF -_081827A4: +@081827A4: asrs r0, 8 lsls r0, 8 subs r0, r1, r0 @@ -745536,9 +745536,9 @@ _081827A4: ldrsh r1, [r4, r2] adds r0, r1, 0 cmp r1, 0 - bge _081827CC + bge @081827CC adds r0, 0x7F -_081827CC: +@081827CC: asrs r0, 7 lsls r0, 7 subs r0, r1, r0 @@ -745557,20 +745557,20 @@ _081827CC: adds r0, r4, 0 movs r3, 0 bl sub_817F6D4 -_081827F4: +@081827F4: pop {r4} pop {r0} bx r0 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 ldrsh r5, [r4, r0] cmp r5, 0 - bne _08182822 + bne @08182822 adds r0, r4, 0 bl sub_817F670 ldrh r0, [r4, 0x32] @@ -745583,7 +745583,7 @@ pokemonanimfunc_3E: @ 81827FC lsls r0, 2 strh r0, [r4, 0x38] strh r1, [r4, 0x36] -_08182822: +@08182822: adds r0, r4, 0 bl sub_8182764 pop {r4,r5} @@ -745592,7 +745592,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 @@ -745600,7 +745600,7 @@ sub_8182830: @ 8182830 movs r2, 0x38 ldrsh r0, [r4, r2] cmp r1, r0 - ble _08182864 + ble @08182864 movs r0, 0 strh r0, [r4, 0x24] adds r0, r4, 0 @@ -745613,17 +745613,17 @@ sub_8182830: @ 8182830 adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 - b _081828C0 + b @081828C0 .align 2, 0 .pool -_08182864: +@08182864: movs r0, 0x3C ldrsh r1, [r4, r0] adds r0, r1, 0 cmp r1, 0 - bge _08182870 + bge @08182870 adds r0, 0xFF -_08182870: +@08182870: asrs r0, 8 lsls r0, 8 subs r0, r1, r0 @@ -745641,9 +745641,9 @@ _08182870: ldrsh r1, [r4, r2] adds r0, r1, 0 cmp r1, 0 - bge _08182898 + bge @08182898 adds r0, 0x3F -_08182898: +@08182898: asrs r0, 6 lsls r0, 6 subs r0, r1, r0 @@ -745662,20 +745662,20 @@ _08182898: adds r0, r4, 0 movs r3, 0 bl sub_817F6D4 -_081828C0: +@081828C0: pop {r4} pop {r0} bx r0 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 ldrsh r5, [r4, r0] cmp r5, 0 - bne _081828EE + bne @081828EE adds r0, r4, 0 bl sub_817F670 ldrh r0, [r4, 0x32] @@ -745688,7 +745688,7 @@ pokemonanimfunc_3F: @ 81828C8 strh r0, [r4, 0x38] movs r0, 0x10 strh r0, [r4, 0x36] -_081828EE: +@081828EE: adds r0, r4, 0 bl sub_8182830 pop {r4,r5} @@ -745697,27 +745697,27 @@ _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 movs r0, 0x32 ldrsh r5, [r4, r0] cmp r5, 0 - bne _0818291A + bne @0818291A adds r0, r4, 0 bl sub_817F670 ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] strh r5, [r4, 0x3C] -_0818291A: +@0818291A: movs r0, 0x3C ldrsh r1, [r4, r0] movs r0, 0x80 lsls r0, 2 cmp r1, r0 - ble _08182948 + ble @08182948 movs r0, 0 strh r0, [r4, 0x24] adds r0, r4, 0 @@ -745730,17 +745730,17 @@ _0818291A: bl sub_817F6D4 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _0818299E + b @0818299E .align 2, 0 .pool -_08182948: +@08182948: movs r0, 0x3C ldrsh r1, [r4, r0] adds r0, r1, 0 cmp r1, 0 - bge _08182954 + bge @08182954 adds r0, 0xFF -_08182954: +@08182954: asrs r0, 8 lsls r0, 8 subs r0, r1, r0 @@ -745756,9 +745756,9 @@ _08182954: ldrsh r1, [r4, r0] adds r0, r1, 0 cmp r1, 0 - bge _08182978 + bge @08182978 adds r0, 0x7F -_08182978: +@08182978: asrs r0, 7 lsls r0, 7 subs r0, r1, r0 @@ -745776,7 +745776,7 @@ _08182978: adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 -_0818299E: +@0818299E: adds r0, r4, 0 bl sub_817F70C pop {r4,r5} @@ -745785,27 +745785,27 @@ _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 movs r0, 0x32 ldrsh r5, [r4, r0] cmp r5, 0 - bne _081829CA + bne @081829CA adds r0, r4, 0 bl sub_817F670 ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] strh r5, [r4, 0x3C] -_081829CA: +@081829CA: movs r0, 0x3C ldrsh r1, [r4, r0] movs r0, 0x80 lsls r0, 2 cmp r1, r0 - ble _081829F8 + ble @081829F8 movs r0, 0 strh r0, [r4, 0x24] adds r0, r4, 0 @@ -745818,17 +745818,17 @@ _081829CA: bl sub_817F6D4 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _08182A5E + b @08182A5E .align 2, 0 .pool -_081829F8: +@081829F8: movs r1, 0x3C ldrsh r0, [r4, r1] adds r1, r0, 0 cmp r0, 0 - bge _08182A04 + bge @08182A04 adds r1, 0xFF -_08182A04: +@08182A04: asrs r1, 8 lsls r1, 8 subs r1, r0, r1 @@ -745848,9 +745848,9 @@ _08182A04: ldrsh r0, [r4, r1] adds r1, r0, 0 cmp r0, 0 - bge _08182A30 + bge @08182A30 adds r1, 0xFF -_08182A30: +@08182A30: asrs r1, 8 lsls r1, 8 subs r1, r0, r1 @@ -745872,7 +745872,7 @@ _08182A30: adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 -_08182A5E: +@08182A5E: adds r0, r4, 0 bl sub_817F70C pop {r4,r5} @@ -745881,27 +745881,27 @@ _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 movs r0, 0x32 ldrsh r5, [r4, r0] cmp r5, 0 - bne _08182A8A + bne @08182A8A adds r0, r4, 0 bl sub_817F670 ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] strh r5, [r4, 0x3C] -_08182A8A: +@08182A8A: movs r0, 0x3C ldrsh r1, [r4, r0] movs r0, 0x80 lsls r0, 2 cmp r1, r0 - ble _08182AB8 + ble @08182AB8 movs r0, 0 strh r0, [r4, 0x24] adds r0, r4, 0 @@ -745914,17 +745914,17 @@ _08182A8A: bl sub_817F6D4 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _08182B16 + b @08182B16 .align 2, 0 .pool -_08182AB8: +@08182AB8: movs r0, 0x3C ldrsh r1, [r4, r0] adds r0, r1, 0 cmp r1, 0 - bge _08182AC4 + bge @08182AC4 adds r0, 0xFF -_08182AC4: +@08182AC4: asrs r0, 8 lsls r0, 8 subs r0, r1, r0 @@ -745941,9 +745941,9 @@ _08182AC4: ldrsh r0, [r4, r1] adds r1, r0, 0 cmp r0, 0 - bge _08182AEA + bge @08182AEA adds r1, 0xFF -_08182AEA: +@08182AEA: asrs r1, 8 lsls r1, 8 subs r1, r0, r1 @@ -745964,7 +745964,7 @@ _08182AEA: adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 -_08182B16: +@08182B16: adds r0, r4, 0 bl sub_817F70C pop {r4,r5} @@ -745973,7 +745973,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 @@ -745982,111 +745982,111 @@ pokemonanimfunc_43: @ 8182B24 movs r0, 0x80 lsls r0, 4 cmp r1, r0 - ble _08182B48 + ble @08182B48 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3A] - b _08182C08 + b @08182C08 .align 2, 0 .pool -_08182B48: +@08182B48: movs r1, 0x32 ldrsh r2, [r4, r1] adds r0, r2, 0 cmp r2, 0 - bge _08182B56 + bge @08182B56 ldr r1, =0x000001ff adds r0, r2, r1 -_08182B56: +@08182B56: asrs r3, r0, 9 adds r1, r3, 0 adds r0, r1, 0 cmp r1, 0 - bge _08182B62 + bge @08182B62 adds r0, r1, 0x3 -_08182B62: +@08182B62: asrs r0, 2 lsls r0, 2 subs r0, r1, r0 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - beq _08182BA4 + beq @08182BA4 cmp r0, 0x1 - bgt _08182B80 + bgt @08182B80 cmp r0, 0 - beq _08182B8A - b _08182BE2 + beq @08182B8A + b @08182BE2 .align 2, 0 .pool -_08182B80: +@08182B80: cmp r0, 0x2 - beq _08182BB8 + beq @08182BB8 cmp r0, 0x3 - beq _08182BCA - b _08182BE2 -_08182B8A: + beq @08182BCA + b @08182BE2 +@08182B8A: lsls r0, r3, 9 subs r0, r2, r0 lsls r0, 16 asrs r0, 12 negs r0, r0 cmp r0, 0 - bge _08182B9C + bge @08182B9C ldr r1, =0x000001ff adds r0, r1 -_08182B9C: +@08182B9C: asrs r0, 9 - b _08182BE0 + b @08182BE0 .align 2, 0 .pool -_08182BA4: +@08182BA4: lsls r0, r3, 9 subs r0, r2, r0 lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _08182BB2 + bge @08182BB2 adds r0, 0x1F -_08182BB2: +@08182BB2: asrs r0, 5 subs r0, 0x10 - b _08182BE0 -_08182BB8: + b @08182BE0 +@08182BB8: lsls r0, r3, 9 subs r0, r2, r0 lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _08182BC6 + bge @08182BC6 adds r0, 0x1F -_08182BC6: +@08182BC6: asrs r0, 5 - b _08182BE0 -_08182BCA: + b @08182BE0 +@08182BCA: lsls r0, r3, 9 subs r0, r2, r0 lsls r0, 16 asrs r0, 12 negs r0, r0 cmp r0, 0 - bge _08182BDC + bge @08182BDC ldr r1, =0x000001ff adds r0, r1 -_08182BDC: +@08182BDC: asrs r0, 9 adds r0, 0x10 -_08182BE0: +@08182BE0: strh r0, [r4, 0x24] -_08182BE2: +@08182BE2: movs r0, 0x32 ldrsh r1, [r4, r0] adds r0, r1, 0 cmp r1, 0 - bge _08182BEE + bge @08182BEE adds r0, 0x7F -_08182BEE: +@08182BEE: asrs r0, 7 lsls r0, 7 subs r0, r1, r0 @@ -746099,7 +746099,7 @@ _08182BEE: ldrh r0, [r4, 0x32] adds r0, 0x18 strh r0, [r4, 0x32] -_08182C08: +@08182C08: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -746110,7 +746110,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 @@ -746118,13 +746118,13 @@ pokemonanimfunc_44: @ 8182C18 movs r2, 0x32 ldrsh r0, [r4, r2] cmp r0, 0 - bne _08182C34 + bne @08182C34 strh r0, [r4, 0x3A] movs r0, 0x40 strh r0, [r4, 0x3C] adds r0, r1, 0x1 strh r0, [r4, 0x32] -_08182C34: +@08182C34: ldrh r0, [r4, 0x3C] adds r1, r0, 0 adds r1, 0x8 @@ -746134,41 +746134,41 @@ _08182C34: movs r5, 0x3A ldrsh r0, [r4, r5] cmp r0, 0x4 - bne _08182C52 + bne @08182C52 lsls r0, r1, 16 asrs r0, 16 cmp r0, 0x3F - ble _08182C60 - b _08182C5A -_08182C52: + ble @08182C60 + b @08182C5A +@08182C52: lsls r0, r1, 16 asrs r0, 16 cmp r0, 0x7F - ble _08182C60 -_08182C5A: + ble @08182C60 +@08182C5A: strh r3, [r4, 0x3C] adds r0, r2, 0x1 strh r0, [r4, 0x3A] -_08182C60: +@08182C60: movs r1, 0x3A ldrsh r0, [r4, r1] cmp r0, 0x4 - bhi _08182D08 + bhi @08182D08 lsls r0, 2 - ldr r1, =_08182C78 + ldr r1, =@08182C78 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08182C78: - .4byte _08182CEC - .4byte _08182C8C - .4byte _08182CAA - .4byte _08182CCC - .4byte _08182CEC -_08182C8C: +@08182C78: + .4byte @08182CEC + .4byte @08182C8C + .4byte @08182CAA + .4byte @08182CCC + .4byte @08182CEC +@08182C8C: movs r2, 0x3C ldrsh r0, [r4, r2] movs r1, 0x8 @@ -746181,8 +746181,8 @@ _08182C8C: bl sine subs r0, 0x8 strh r0, [r4, 0x26] - b _08182D12 -_08182CAA: + b @08182D12 +@08182CAA: ldrh r0, [r4, 0x3C] adds r0, 0x80 lsls r0, 16 @@ -746197,8 +746197,8 @@ _08182CAA: bl cosine negs r0, r0 strh r0, [r4, 0x26] - b _08182D12 -_08182CCC: + b @08182D12 +@08182CCC: movs r2, 0x3C ldrsh r0, [r4, r2] movs r1, 0x8 @@ -746212,8 +746212,8 @@ _08182CCC: bl sine adds r0, 0x8 strh r0, [r4, 0x26] - b _08182D12 -_08182CEC: + b @08182D12 +@08182CEC: movs r5, 0x3C ldrsh r0, [r4, r5] movs r1, 0x8 @@ -746225,14 +746225,14 @@ _08182CEC: movs r1, 0x8 bl cosine strh r0, [r4, 0x26] - b _08182D12 -_08182D08: + b @08182D12 +@08182D08: movs r0, 0 strh r0, [r4, 0x24] strh r0, [r4, 0x26] ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] -_08182D12: +@08182D12: adds r0, r4, 0 bl sub_817F70C pop {r4,r5} @@ -746243,7 +746243,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 @@ -746260,7 +746260,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 @@ -746277,7 +746277,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 @@ -746294,7 +746294,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 @@ -746323,7 +746323,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] @@ -746333,7 +746333,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] @@ -746343,27 +746343,27 @@ 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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08182DE2 + bne @08182DE2 strh r0, [r4, 0x2E] -_08182DE2: +@08182DE2: ldrh r1, [r4, 0x2E] movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0 - bgt _08182DF6 + bgt @08182DF6 adds r0, r4, 0 bl sub_817FC20 movs r0, 0x1 - b _08182DF8 -_08182DF6: + b @08182DF8 +@08182DF6: subs r0, r1, 0x1 -_08182DF8: +@08182DF8: strh r0, [r4, 0x2E] pop {r4} pop {r0} @@ -746371,7 +746371,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 @@ -746390,7 +746390,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 @@ -746407,7 +746407,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 @@ -746438,7 +746438,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 @@ -746469,7 +746469,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 @@ -746486,7 +746486,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 @@ -746503,7 +746503,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 @@ -746520,7 +746520,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 @@ -746548,7 +746548,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 @@ -746576,7 +746576,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 @@ -746604,7 +746604,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 @@ -746636,7 +746636,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 @@ -746662,7 +746662,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 @@ -746690,7 +746690,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 @@ -746716,7 +746716,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 @@ -746744,7 +746744,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 @@ -746770,7 +746770,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 @@ -746798,7 +746798,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 @@ -746806,22 +746806,22 @@ sub_8183140: @ 8183140 movs r0, 0x90 lsls r0, 4 cmp r2, r0 - ble _0818315C + ble @0818315C ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 - b _08183180 + b @08183180 .align 2, 0 .pool -_0818315C: +@0818315C: adds r1, r2, 0 adds r1, 0xC0 adds r0, r1, 0 cmp r1, 0 - bge _0818316A + bge @0818316A ldr r3, =0x000001bf adds r0, r2, r3 -_0818316A: +@0818316A: asrs r0, 8 lsls r0, 8 subs r0, r1, r0 @@ -746832,7 +746832,7 @@ _0818316A: bl sine ldrh r1, [r4, 0x3C] adds r0, r1 -_08183180: +@08183180: strh r0, [r4, 0x26] ldrh r0, [r4, 0x2E] ldrh r3, [r4, 0x32] @@ -746846,7 +746846,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 @@ -746865,7 +746865,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 @@ -746884,7 +746884,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 @@ -746893,113 +746893,113 @@ pokemonanimfunc_59: @ 81831D4 movs r0, 0x80 lsls r0, 4 cmp r1, r0 - ble _081831F8 + ble @081831F8 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3A] - b _081832BC + b @081832BC .align 2, 0 .pool -_081831F8: +@081831F8: movs r1, 0x32 ldrsh r2, [r4, r1] adds r0, r2, 0 cmp r2, 0 - bge _08183206 + bge @08183206 ldr r1, =0x000001ff adds r0, r2, r1 -_08183206: +@08183206: asrs r3, r0, 9 adds r1, r3, 0 adds r0, r1, 0 cmp r1, 0 - bge _08183212 + bge @08183212 adds r0, r1, 0x3 -_08183212: +@08183212: asrs r0, 2 lsls r0, 2 subs r0, r1, r0 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - beq _08183268 + beq @08183268 cmp r0, 0x1 - bgt _08183230 + bgt @08183230 cmp r0, 0 - beq _0818323A - b _08183298 + beq @0818323A + b @08183298 .align 2, 0 .pool -_08183230: +@08183230: cmp r0, 0x2 - beq _0818324C + beq @0818324C cmp r0, 0x3 - beq _08183284 - b _08183298 -_0818323A: + beq @08183284 + b @08183298 +@0818323A: lsls r0, r3, 9 subs r0, r2, r0 lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _08183248 + bge @08183248 adds r0, 0x1F -_08183248: +@08183248: asrs r0, 5 - b _08183296 -_0818324C: + b @08183296 +@0818324C: lsls r0, r3, 9 subs r0, r2, r0 lsls r0, 16 asrs r0, 12 negs r0, r0 cmp r0, 0 - bge _0818325E + bge @0818325E ldr r1, =0x000001ff adds r0, r1 -_0818325E: +@0818325E: asrs r0, 9 - b _08183296 + b @08183296 .align 2, 0 .pool -_08183268: +@08183268: lsls r0, r3, 9 subs r0, r2, r0 lsls r0, 16 asrs r0, 12 negs r0, r0 cmp r0, 0 - bge _0818327A + bge @0818327A ldr r1, =0x000001ff adds r0, r1 -_0818327A: +@0818327A: asrs r0, 9 adds r0, 0x10 - b _08183296 + b @08183296 .align 2, 0 .pool -_08183284: +@08183284: lsls r0, r3, 9 subs r0, r2, r0 lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _08183292 + bge @08183292 adds r0, 0x1F -_08183292: +@08183292: asrs r0, 5 subs r0, 0x10 -_08183296: +@08183296: strh r0, [r4, 0x24] -_08183298: +@08183298: movs r0, 0x32 ldrsh r1, [r4, r0] adds r0, r1, 0 cmp r1, 0 - bge _081832A4 + bge @081832A4 adds r0, 0x7F -_081832A4: +@081832A4: asrs r0, 7 lsls r0, 7 subs r0, r1, r0 @@ -747011,7 +747011,7 @@ _081832A4: ldrh r0, [r4, 0x32] adds r0, 0x18 strh r0, [r4, 0x32] -_081832BC: +@081832BC: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -747020,7 +747020,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 @@ -747033,7 +747033,7 @@ sub_81832C8: @ 81832C8 movs r2, 0x3A ldrsh r0, [r6, r2] cmp r1, r0 - ble _0818331A + ble @0818331A mov r0, r8 strh r0, [r6, 0x26] strh r0, [r6, 0x38] @@ -747047,21 +747047,21 @@ sub_81832C8: @ 81832C8 movs r2, 0x36 ldrsh r0, [r6, r2] cmp r0, 0x1 - bgt _08183310 + bgt @08183310 adds r0, r6, 0 bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r6, 0x1C] - b _081833DC + b @081833DC .align 2, 0 .pool -_08183310: +@08183310: subs r0, r1, 0x1 strh r0, [r6, 0x36] mov r0, r8 strh r0, [r6, 0x3C] - b _081833DC -_0818331A: + b @081833DC +@0818331A: movs r1, 0x38 ldrsh r5, [r6, r1] lsls r0, r5, 7 @@ -747072,9 +747072,9 @@ _0818331A: lsls r0, 16 lsrs r2, r0, 16 cmp r4, 0 - bge _08183334 + bge @08183334 adds r4, 0x3 -_08183334: +@08183334: asrs r1, r4, 2 lsls r1, 24 lsrs r1, 24 @@ -747083,9 +747083,9 @@ _08183334: lsls r0, 24 lsrs r0, 24 cmp r5, r1 - blt _08183358 + blt @08183358 cmp r5, r0 - bge _08183358 + bge @08183358 ldrh r0, [r6, 0x3C] adds r0, 0x33 strh r0, [r6, 0x3C] @@ -747093,11 +747093,11 @@ _08183334: mov r8, r1 ands r1, r0 mov r8, r1 -_08183358: +@08183358: movs r1, 0x30 ldrsh r0, [r6, r1] cmp r0, 0 - bne _0818337C + bne @0818337C lsls r4, r2, 16 asrs r0, r4, 16 movs r1, 0x10 @@ -747108,10 +747108,10 @@ _08183358: lsls r1, 16 lsrs r1, 16 mov r9, r1 - b _08183392 + b @08183392 .align 2, 0 .pool -_0818337C: +@0818337C: lsls r4, r2, 16 asrs r0, r4, 16 movs r1, 0x10 @@ -747122,7 +747122,7 @@ _0818337C: lsls r0, 16 lsrs r0, 16 mov r9, r0 -_08183392: +@08183392: adds r7, r4, 0 ldrh r4, [r6, 0x34] lsls r4, 24 @@ -747156,7 +747156,7 @@ _08183392: ldrh r0, [r6, 0x38] adds r0, 0x1 strh r0, [r6, 0x38] -_081833DC: +@081833DC: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -747166,13 +747166,13 @@ _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 ldrsh r6, [r5, r0] cmp r6, 0 - bne _0818340A + bne @0818340A movs r4, 0x1 strh r4, [r5, 0x32] adds r0, r5, 0 @@ -747183,7 +747183,7 @@ pokemonanimfunc_5A: @ 81833E8 strh r0, [r5, 0x34] strh r6, [r5, 0x38] strh r6, [r5, 0x3C] -_0818340A: +@0818340A: adds r0, r5, 0 bl sub_81832C8 pop {r4-r6} @@ -747192,7 +747192,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 @@ -747205,7 +747205,7 @@ sub_8183418: @ 8183418 movs r2, 0x3A ldrsh r0, [r6, r2] cmp r1, r0 - ble _0818346A + ble @0818346A mov r0, r8 strh r0, [r6, 0x38] movs r2, 0x80 @@ -747218,21 +747218,21 @@ sub_8183418: @ 8183418 movs r2, 0x36 ldrsh r0, [r6, r2] cmp r0, 0x1 - bgt _08183460 + bgt @08183460 adds r0, r6, 0 bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r6, 0x1C] - b _08183538 + b @08183538 .align 2, 0 .pool -_08183460: +@08183460: subs r0, r1, 0x1 strh r0, [r6, 0x36] mov r0, r8 strh r0, [r6, 0x3C] - b _08183538 -_0818346A: + b @08183538 +@0818346A: movs r1, 0x38 ldrsh r5, [r6, r1] lsls r0, r5, 7 @@ -747244,9 +747244,9 @@ _0818346A: lsrs r0, 16 mov r9, r0 cmp r4, 0 - bge _08183486 + bge @08183486 adds r4, 0x3 -_08183486: +@08183486: asrs r1, r4, 2 lsls r1, 24 lsrs r1, 24 @@ -747255,9 +747255,9 @@ _08183486: lsls r0, 24 lsrs r0, 24 cmp r5, r1 - blt _081834AC + blt @081834AC cmp r5, r0 - bge _081834AC + bge @081834AC ldrh r0, [r6, 0x3C] adds r0, 0x33 strh r0, [r6, 0x3C] @@ -747266,14 +747266,14 @@ _08183486: mov r2, r8 ands r2, r0 mov r8, r2 -_081834AC: +@081834AC: ldrh r0, [r6, 0x34] lsls r0, 24 lsrs r7, r0, 24 movs r1, 0x30 ldrsh r0, [r6, r1] cmp r0, 0 - bne _081834F0 + bne @081834F0 mov r2, r9 lsls r0, r2, 16 asrs r0, 16 @@ -747294,10 +747294,10 @@ _081834AC: adds r4, r0 lsls r4, 16 lsrs r1, r4, 16 - b _08183522 + b @08183522 .align 2, 0 .pool -_081834F0: +@081834F0: mov r4, r8 adds r0, r7, 0 movs r1, 0x5 @@ -747320,7 +747320,7 @@ _081834F0: subs r1, r0 lsls r1, 16 lsrs r1, 16 -_08183522: +@08183522: lsls r1, 16 asrs r1, 16 movs r2, 0x80 @@ -747331,7 +747331,7 @@ _08183522: ldrh r0, [r6, 0x38] adds r0, 0x1 strh r0, [r6, 0x38] -_08183538: +@08183538: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -747341,13 +747341,13 @@ _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 ldrsh r6, [r5, r0] cmp r6, 0 - bne _08183566 + bne @08183566 movs r4, 0x1 strh r4, [r5, 0x32] adds r0, r5, 0 @@ -747358,7 +747358,7 @@ pokemonanimfunc_5B: @ 8183544 strh r0, [r5, 0x34] strh r6, [r5, 0x38] strh r6, [r5, 0x3C] -_08183566: +@08183566: adds r0, r5, 0 bl sub_8183418 pop {r4-r6} @@ -747367,7 +747367,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 @@ -747389,17 +747389,17 @@ sub_8183574: @ 8183574 ldrb r5, [r0] adds r2, r5, 0 cmp r5, 0xFF - beq _081835A6 + beq @081835A6 ldrh r0, [r4, 0x3C] lsls r0, 24 lsrs r5, r0, 24 -_081835A6: +@081835A6: adds r0, r3, 0x1 adds r0, r1, r0 ldrb r6, [r0] movs r7, 0 cmp r2, 0xFE - beq _081835C2 + beq @081835C2 mov r1, r9 subs r0, r6, r1 muls r0, r5 @@ -747407,17 +747407,17 @@ _081835A6: bl __divsi3 lsls r0, 24 lsrs r7, r0, 24 -_081835C2: +@081835C2: cmp r5, 0xFF - bne _081835D8 + bne @081835D8 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x26] - b _0818360A + b @0818360A .align 2, 0 .pool -_081835D8: +@081835D8: mov r1, r8 adds r1, 0xC0 adds r0, r1, 0 @@ -747429,22 +747429,22 @@ _081835D8: adds r0, r7 strh r0, [r4, 0x26] cmp r9, r6 - bne _081835FC + bne @081835FC ldrh r0, [r4, 0x38] adds r0, 0x1 strh r0, [r4, 0x38] movs r0, 0 - b _08183608 -_081835FC: + b @08183608 +@081835FC: ldrh r0, [r4, 0x2E] ldrh r1, [r4, 0x32] adds r0, r1 strh r0, [r4, 0x32] ldrh r0, [r4, 0x3A] adds r0, 0x1 -_08183608: +@08183608: strh r0, [r4, 0x3A] -_0818360A: +@0818360A: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -747454,7 +747454,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 @@ -747473,7 +747473,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 @@ -747492,7 +747492,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 @@ -747509,28 +747509,28 @@ 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] movs r2, 0x32 ldrsh r0, [r4, r2] cmp r0, 0x28 - ble _08183690 + ble @08183690 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 - b _081836CA + b @081836CA .align 2, 0 .pool -_08183690: +@08183690: movs r0, 0x1 ands r0, r1 movs r5, 0xFF cmp r0, 0 - bne _0818369C + bne @0818369C movs r5, 0x1 -_0818369C: +@0818369C: movs r1, 0x32 ldrsh r0, [r4, r1] lsls r0, 7 @@ -747538,9 +747538,9 @@ _0818369C: bl __divsi3 adds r1, r0, 0 cmp r1, 0 - bge _081836B0 + bge @081836B0 adds r0, 0xFF -_081836B0: +@081836B0: asrs r0, 8 lsls r0, 8 subs r0, r1, r0 @@ -747553,7 +747553,7 @@ _081836B0: adds r2, r0, 0 muls r2, r1 adds r0, r2, 0 -_081836CA: +@081836CA: strh r0, [r4, 0x24] ldrh r0, [r4, 0x32] adds r0, 0x1 @@ -747564,28 +747564,28 @@ _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] movs r2, 0x32 ldrsh r0, [r4, r2] cmp r0, 0x28 - ble _081836F4 + ble @081836F4 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 - b _0818372E + b @0818372E .align 2, 0 .pool -_081836F4: +@081836F4: movs r0, 0x1 ands r0, r1 movs r5, 0xFF cmp r0, 0 - bne _08183700 + bne @08183700 movs r5, 0x1 -_08183700: +@08183700: movs r1, 0x32 ldrsh r0, [r4, r1] lsls r0, 7 @@ -747593,9 +747593,9 @@ _08183700: bl __divsi3 adds r1, r0, 0 cmp r1, 0 - bge _08183714 + bge @08183714 adds r0, 0xFF -_08183714: +@08183714: asrs r0, 8 lsls r0, 8 subs r0, r1, r0 @@ -747608,7 +747608,7 @@ _08183714: adds r2, r0, 0 muls r2, r1 adds r0, r2, 0 -_0818372E: +@0818372E: strh r0, [r4, 0x24] ldrh r0, [r4, 0x32] adds r0, 0x1 @@ -747619,7 +747619,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 @@ -747638,7 +747638,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 @@ -747657,7 +747657,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 @@ -747676,7 +747676,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 @@ -747707,7 +747707,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 @@ -747720,7 +747720,7 @@ sub_81837DC: @ 81837DC movs r2, 0x3A ldrsh r0, [r7, r2] cmp r1, r0 - ble _0818382C + ble @0818382C strh r5, [r7, 0x26] strh r5, [r7, 0x38] movs r2, 0x80 @@ -747733,20 +747733,20 @@ sub_81837DC: @ 81837DC movs r2, 0x36 ldrsh r0, [r7, r2] cmp r0, 0x1 - bgt _08183824 + bgt @08183824 adds r0, r7, 0 bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r7, 0x1C] - b _0818392C + b @0818392C .align 2, 0 .pool -_08183824: +@08183824: subs r0, r1, 0x1 strh r0, [r7, 0x36] strh r5, [r7, 0x3C] - b _0818392C -_0818382C: + b @0818392C +@0818382C: movs r0, 0x38 ldrsh r6, [r7, r0] lsls r0, r6, 7 @@ -747757,9 +747757,9 @@ _0818382C: lsls r0, 16 lsrs r2, r0, 16 cmp r4, 0 - bge _08183846 + bge @08183846 adds r4, 0x3 -_08183846: +@08183846: asrs r1, r4, 2 lsls r1, 24 lsrs r1, 24 @@ -747768,15 +747768,15 @@ _08183846: lsls r0, 24 lsrs r0, 24 cmp r6, r1 - blt _08183866 + blt @08183866 cmp r6, r0 - bge _08183866 + bge @08183866 ldrh r0, [r7, 0x3C] adds r0, 0x33 strh r0, [r7, 0x3C] movs r5, 0xFF ands r5, r0 -_08183866: +@08183866: ldrh r0, [r7, 0x34] lsls r0, 24 lsrs r0, 24 @@ -747784,7 +747784,7 @@ _08183866: movs r1, 0x30 ldrsh r0, [r7, r1] cmp r0, 0 - bne _081838B0 + bne @081838B0 lsls r2, 16 mov r8, r2 asrs r0, r2, 16 @@ -747808,10 +747808,10 @@ _08183866: lsrs r0, 16 mov r10, r0 mov r0, r8 - b _081838EA + b @081838EA .align 2, 0 .pool -_081838B0: +@081838B0: lsls r2, 16 mov r8, r2 asrs r0, r2, 16 @@ -747838,7 +747838,7 @@ _081838B0: mov r10, r1 mov r0, r8 adds r6, r5, 0 -_081838EA: +@081838EA: asrs r0, 16 mov r1, r9 bl sine @@ -747868,7 +747868,7 @@ _081838EA: ldrh r0, [r7, 0x38] adds r0, 0x1 strh r0, [r7, 0x38] -_0818392C: +@0818392C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -747879,13 +747879,13 @@ _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 ldrsh r6, [r5, r0] cmp r6, 0 - bne _0818395E + bne @0818395E movs r4, 0x1 strh r4, [r5, 0x32] adds r0, r5, 0 @@ -747896,7 +747896,7 @@ pokemonanimfunc_65: @ 818393C strh r0, [r5, 0x34] strh r6, [r5, 0x38] strh r6, [r5, 0x3C] -_0818395E: +@0818395E: adds r0, r5, 0 bl sub_81837DC pop {r4-r6} @@ -747905,7 +747905,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 @@ -747914,113 +747914,113 @@ pokemonanimfunc_66: @ 818396C movs r0, 0x80 lsls r0, 4 cmp r1, r0 - ble _08183990 + ble @08183990 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3A] - b _08183A54 + b @08183A54 .align 2, 0 .pool -_08183990: +@08183990: movs r1, 0x32 ldrsh r2, [r4, r1] adds r0, r2, 0 cmp r2, 0 - bge _0818399E + bge @0818399E ldr r1, =0x000001ff adds r0, r2, r1 -_0818399E: +@0818399E: asrs r3, r0, 9 adds r1, r3, 0 adds r0, r1, 0 cmp r1, 0 - bge _081839AA + bge @081839AA adds r0, r1, 0x3 -_081839AA: +@081839AA: asrs r0, 2 lsls r0, 2 subs r0, r1, r0 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - beq _08183A00 + beq @08183A00 cmp r0, 0x1 - bgt _081839C8 + bgt @081839C8 cmp r0, 0 - beq _081839D2 - b _08183A30 + beq @081839D2 + b @08183A30 .align 2, 0 .pool -_081839C8: +@081839C8: cmp r0, 0x2 - beq _081839E4 + beq @081839E4 cmp r0, 0x3 - beq _08183A1C - b _08183A30 -_081839D2: + beq @08183A1C + b @08183A30 +@081839D2: lsls r0, r3, 9 subs r0, r2, r0 lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _081839E0 + bge @081839E0 adds r0, 0x1F -_081839E0: +@081839E0: asrs r0, 5 - b _08183A2E -_081839E4: + b @08183A2E +@081839E4: lsls r0, r3, 9 subs r0, r2, r0 lsls r0, 16 asrs r0, 12 negs r0, r0 cmp r0, 0 - bge _081839F6 + bge @081839F6 ldr r1, =0x000001ff adds r0, r1 -_081839F6: +@081839F6: asrs r0, 9 - b _08183A2E + b @08183A2E .align 2, 0 .pool -_08183A00: +@08183A00: lsls r0, r3, 9 subs r0, r2, r0 lsls r0, 16 asrs r0, 12 negs r0, r0 cmp r0, 0 - bge _08183A12 + bge @08183A12 ldr r1, =0x000001ff adds r0, r1 -_08183A12: +@08183A12: asrs r0, 9 adds r0, 0x10 - b _08183A2E + b @08183A2E .align 2, 0 .pool -_08183A1C: +@08183A1C: lsls r0, r3, 9 subs r0, r2, r0 lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _08183A2A + bge @08183A2A adds r0, 0x1F -_08183A2A: +@08183A2A: asrs r0, 5 subs r0, 0x10 -_08183A2E: +@08183A2E: strh r0, [r4, 0x24] -_08183A30: +@08183A30: movs r0, 0x32 ldrsh r1, [r4, r0] adds r0, r1, 0 cmp r1, 0 - bge _08183A3C + bge @08183A3C adds r0, 0x7F -_08183A3C: +@08183A3C: asrs r0, 7 lsls r0, 7 subs r0, r1, r0 @@ -748032,7 +748032,7 @@ _08183A3C: ldrh r0, [r4, 0x32] adds r0, 0x30 strh r0, [r4, 0x32] -_08183A54: +@08183A54: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -748041,7 +748041,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 @@ -748050,106 +748050,106 @@ pokemonanimfunc_67: @ 8183A60 movs r0, 0x80 lsls r0, 4 cmp r1, r0 - ble _08183A84 + ble @08183A84 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3A] - b _08183B40 + b @08183B40 .align 2, 0 .pool -_08183A84: +@08183A84: movs r1, 0x32 ldrsh r2, [r4, r1] adds r0, r2, 0 cmp r2, 0 - bge _08183A92 + bge @08183A92 ldr r1, =0x000001ff adds r0, r2, r1 -_08183A92: +@08183A92: asrs r3, r0, 9 adds r1, r3, 0 adds r0, r1, 0 cmp r1, 0 - bge _08183A9E + bge @08183A9E adds r0, r1, 0x3 -_08183A9E: +@08183A9E: asrs r0, 2 lsls r0, 2 subs r0, r1, r0 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - beq _08183AF4 + beq @08183AF4 cmp r0, 0x1 - bgt _08183ABC + bgt @08183ABC cmp r0, 0 - beq _08183AC6 - b _08183B24 + beq @08183AC6 + b @08183B24 .align 2, 0 .pool -_08183ABC: +@08183ABC: cmp r0, 0x2 - beq _08183AD8 + beq @08183AD8 cmp r0, 0x3 - beq _08183B10 - b _08183B24 -_08183AC6: + beq @08183B10 + b @08183B24 +@08183AC6: lsls r0, r3, 9 subs r0, r2, r0 lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _08183AD4 + bge @08183AD4 adds r0, 0x1F -_08183AD4: +@08183AD4: asrs r0, 5 - b _08183B22 -_08183AD8: + b @08183B22 +@08183AD8: lsls r0, r3, 9 subs r0, r2, r0 lsls r0, 16 asrs r0, 12 negs r0, r0 cmp r0, 0 - bge _08183AEA + bge @08183AEA ldr r1, =0x000001ff adds r0, r1 -_08183AEA: +@08183AEA: asrs r0, 9 - b _08183B22 + b @08183B22 .align 2, 0 .pool -_08183AF4: +@08183AF4: lsls r0, r3, 9 subs r0, r2, r0 lsls r0, 16 asrs r0, 12 negs r0, r0 cmp r0, 0 - bge _08183B06 + bge @08183B06 ldr r1, =0x000001ff adds r0, r1 -_08183B06: +@08183B06: asrs r0, 9 adds r0, 0x10 - b _08183B22 + b @08183B22 .align 2, 0 .pool -_08183B10: +@08183B10: lsls r0, r3, 9 subs r0, r2, r0 lsls r0, 16 asrs r0, 16 cmp r0, 0 - bge _08183B1E + bge @08183B1E adds r0, 0x1F -_08183B1E: +@08183B1E: asrs r0, 5 subs r0, 0x10 -_08183B22: +@08183B22: strh r0, [r4, 0x24] -_08183B24: +@08183B24: movs r1, 0x32 ldrsh r0, [r4, r1] movs r1, 0x60 @@ -748162,7 +748162,7 @@ _08183B24: ldrh r0, [r4, 0x32] adds r0, 0x40 strh r0, [r4, 0x32] -_08183B40: +@08183B40: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -748171,16 +748171,16 @@ _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 movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08183B5E + bne @08183B5E strh r0, [r4, 0x34] -_08183B5E: +@08183B5E: ldr r7, =0x0860adbe movs r2, 0x34 ldrsh r1, [r4, r2] @@ -748197,13 +748197,13 @@ _08183B5E: movs r2, 0x32 ldrsh r1, [r4, r2] cmp r0, r1 - bne _08183B8C + bne @08183B8C ldrh r0, [r4, 0x34] adds r0, 0x1 movs r1, 0 strh r0, [r4, 0x34] strh r1, [r4, 0x32] -_08183B8C: +@08183B8C: movs r0, 0x34 ldrsh r1, [r4, r0] lsls r0, r1, 1 @@ -748218,22 +748218,22 @@ _08183B8C: bl __divsi3 adds r1, r0, 0 cmp r1, 0 - bne _08183BCC + bne @08183BCC ldrh r0, [r4, 0x3A] subs r0, 0x1 strh r0, [r4, 0x3A] lsls r0, 16 cmp r0, 0 - bne _08183BC8 + bne @08183BC8 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _08183C06 + b @08183C06 .align 2, 0 .pool -_08183BC8: +@08183BC8: strh r1, [r4, 0x32] - b _08183C06 -_08183BCC: + b @08183C06 +@08183BCC: adds r0, r6, r7 ldrb r0, [r0] lsls r0, 24 @@ -748262,14 +748262,14 @@ _08183BCC: strh r0, [r4, 0x32] adds r0, r4, 0 bl sub_817F70C -_08183C06: +@08183C06: pop {r4-r7} pop {r0} bx r0 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 @@ -748287,7 +748287,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 @@ -748306,7 +748306,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 @@ -748324,19 +748324,19 @@ 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] movs r2, 0x3C ldrsh r0, [r4, r2] cmp r0, 0xFF - ble _08183CAE + ble @08183CAE ldrh r1, [r4, 0x38] movs r2, 0x38 ldrsh r0, [r4, r2] cmp r0, 0x1 - bgt _08183CA4 + bgt @08183CA4 adds r0, r4, 0 bl sub_817F77C ldr r0, =sub_8184D88 + 1 @@ -748347,16 +748347,16 @@ sub_8183C6C: @ 8183C6C adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 - b _08183CE8 + b @08183CE8 .align 2, 0 .pool -_08183CA4: +@08183CA4: subs r0, r1, 0x1 movs r1, 0 strh r0, [r4, 0x38] strh r1, [r4, 0x3C] - b _08183CE8 -_08183CAE: + b @08183CE8 +@08183CAE: ldrh r0, [r4, 0x3A] adds r0, r1, r0 strh r0, [r4, 0x3C] @@ -748365,9 +748365,9 @@ _08183CAE: movs r5, 0x80 lsls r5, 1 cmp r0, r5 - ble _08183CC2 + ble @08183CC2 strh r5, [r4, 0x3C] -_08183CC2: +@08183CC2: movs r1, 0x3C ldrsh r0, [r4, r1] lsrs r1, r0, 31 @@ -748385,21 +748385,21 @@ _08183CC2: adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 -_08183CE8: +@08183CE8: pop {r4,r5} pop {r0} bx r0 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 movs r0, 0x32 ldrsh r5, [r4, r0] cmp r5, 0 - bne _08183D16 + bne @08183D16 adds r0, r4, 0 bl sub_817F670 ldrh r0, [r4, 0x32] @@ -748410,7 +748410,7 @@ pokemonanimfunc_6B: @ 8183CF0 strh r0, [r4, 0x3A] movs r0, 0x1 strh r0, [r4, 0x38] -_08183D16: +@08183D16: adds r0, r4, 0 bl sub_8183C6C adds r0, r4, 0 @@ -748421,14 +748421,14 @@ _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 movs r0, 0x32 ldrsh r5, [r4, r0] cmp r5, 0 - bne _08183D4E + bne @08183D4E adds r0, r4, 0 bl sub_817F670 ldrh r0, [r4, 0x32] @@ -748439,7 +748439,7 @@ pokemonanimfunc_6C: @ 8183D28 strh r0, [r4, 0x3A] movs r0, 0x2 strh r0, [r4, 0x38] -_08183D4E: +@08183D4E: adds r0, r4, 0 bl sub_8183C6C adds r0, r4, 0 @@ -748450,13 +748450,13 @@ _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 ldrsh r5, [r4, r0] cmp r5, 0 - bne _08183D88 + bne @08183D88 adds r0, r4, 0 bl sub_817F670 ldrh r0, [r4, 0x32] @@ -748470,7 +748470,7 @@ pokemonanimfunc_6D: @ 8183D60 strh r0, [r4, 0x38] movs r0, 0x10 strh r0, [r4, 0x36] -_08183D88: +@08183D88: adds r0, r4, 0 bl sub_8182764 pop {r4,r5} @@ -748479,13 +748479,13 @@ _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 ldrsh r5, [r4, r0] cmp r5, 0 - bne _08183DBA + bne @08183DBA adds r0, r4, 0 bl sub_817F670 ldrh r0, [r4, 0x32] @@ -748498,7 +748498,7 @@ pokemonanimfunc_6E: @ 8183D94 strh r0, [r4, 0x38] movs r0, 0x10 strh r0, [r4, 0x36] -_08183DBA: +@08183DBA: adds r0, r4, 0 bl sub_8182764 pop {r4,r5} @@ -748507,13 +748507,13 @@ _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 ldrsh r5, [r4, r0] cmp r5, 0 - bne _08183DF0 + bne @08183DF0 adds r0, r4, 0 bl sub_817F670 ldrh r0, [r4, 0x32] @@ -748527,7 +748527,7 @@ pokemonanimfunc_6F: @ 8183DC8 strh r0, [r4, 0x38] movs r0, 0x10 strh r0, [r4, 0x36] -_08183DF0: +@08183DF0: adds r0, r4, 0 bl sub_8182830 pop {r4,r5} @@ -748536,13 +748536,13 @@ _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 ldrsh r5, [r4, r0] cmp r5, 0 - bne _08183E22 + bne @08183E22 adds r0, r4, 0 bl sub_817F670 ldrh r0, [r4, 0x32] @@ -748555,7 +748555,7 @@ pokemonanimfunc_70: @ 8183DFC lsls r0, 2 strh r0, [r4, 0x38] strh r1, [r4, 0x36] -_08183E22: +@08183E22: adds r0, r4, 0 bl sub_8182830 pop {r4,r5} @@ -748564,20 +748564,20 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08183E4A + bne @08183E4A adds r0, r4, 0 bl sub_817F670 movs r0, 0x5 strh r0, [r4, 0x3C] movs r0, 0x8 strh r0, [r4, 0x3A] -_08183E4A: +@08183E4A: adds r0, r4, 0 bl sub_8180828 pop {r4} @@ -748586,20 +748586,20 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08183E72 + bne @08183E72 adds r0, r4, 0 bl sub_817F670 movs r0, 0x3 strh r0, [r4, 0x3C] movs r0, 0x4 strh r0, [r4, 0x3A] -_08183E72: +@08183E72: adds r0, r4, 0 bl sub_8180828 pop {r4} @@ -748608,13 +748608,13 @@ _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 ldrsh r6, [r5, r0] cmp r6, 0 - bne _08183EA2 + bne @08183EA2 movs r4, 0x1 strh r4, [r5, 0x32] adds r0, r5, 0 @@ -748625,7 +748625,7 @@ pokemonanimfunc_73: @ 8183E80 movs r0, 0x3C strh r0, [r5, 0x34] strh r6, [r5, 0x3C] -_08183EA2: +@08183EA2: adds r0, r5, 0 bl sub_81832C8 pop {r4-r6} @@ -748634,13 +748634,13 @@ _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 ldrsh r5, [r4, r0] cmp r5, 0 - bne _08183ED4 + bne @08183ED4 movs r0, 0x1 strh r0, [r4, 0x32] adds r0, r4, 0 @@ -748652,7 +748652,7 @@ pokemonanimfunc_74: @ 8183EB0 movs r0, 0x46 strh r0, [r4, 0x34] strh r5, [r4, 0x3C] -_08183ED4: +@08183ED4: adds r0, r4, 0 bl sub_81832C8 pop {r4,r5} @@ -748661,13 +748661,13 @@ _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 ldrsh r5, [r4, r0] cmp r5, 0 - bne _08183F06 + bne @08183F06 movs r0, 0x1 strh r0, [r4, 0x32] adds r0, r4, 0 @@ -748680,7 +748680,7 @@ pokemonanimfunc_75: @ 8183EE0 strh r0, [r4, 0x34] strh r5, [r4, 0x38] strh r5, [r4, 0x3C] -_08183F06: +@08183F06: adds r0, r4, 0 bl sub_8183418 pop {r4,r5} @@ -748689,13 +748689,13 @@ _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 ldrsh r6, [r5, r0] cmp r6, 0 - bne _08183F38 + bne @08183F38 movs r4, 0x1 strh r4, [r5, 0x32] adds r0, r5, 0 @@ -748707,7 +748707,7 @@ pokemonanimfunc_76: @ 8183F14 strh r0, [r5, 0x34] strh r6, [r5, 0x38] strh r6, [r5, 0x3C] -_08183F38: +@08183F38: adds r0, r5, 0 bl sub_8183418 pop {r4-r6} @@ -748716,13 +748716,13 @@ _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 ldrsh r5, [r4, r0] cmp r5, 0 - bne _08183F6A + bne @08183F6A movs r0, 0x1 strh r0, [r4, 0x32] adds r0, r4, 0 @@ -748735,7 +748735,7 @@ pokemonanimfunc_77: @ 8183F44 strh r0, [r4, 0x34] strh r5, [r4, 0x38] strh r5, [r4, 0x3C] -_08183F6A: +@08183F6A: adds r0, r4, 0 bl sub_81837DC pop {r4,r5} @@ -748744,13 +748744,13 @@ _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 ldrsh r6, [r5, r0] cmp r6, 0 - bne _08183F9C + bne @08183F9C movs r4, 0x1 strh r4, [r5, 0x32] adds r0, r5, 0 @@ -748762,7 +748762,7 @@ pokemonanimfunc_78: @ 8183F78 strh r0, [r5, 0x34] strh r6, [r5, 0x38] strh r6, [r5, 0x3C] -_08183F9C: +@08183F9C: adds r0, r5, 0 bl sub_81837DC pop {r4-r6} @@ -748771,42 +748771,42 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0xFF - ble _08183FEA + ble @08183FEA ldrh r2, [r4, 0x3A] movs r3, 0x3A ldrsh r0, [r4, r3] cmp r0, 0x1 - bgt _08183FD0 + bgt @08183FD0 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] strh r0, [r4, 0x26] - b _0818403E + b @0818403E .align 2, 0 .pool -_08183FD0: +@08183FD0: movs r0, 0x3C ldrsh r1, [r4, r0] adds r0, r1, 0 cmp r1, 0 - bge _08183FDC + bge @08183FDC adds r0, 0xFF -_08183FDC: +@08183FDC: asrs r0, 8 lsls r0, 8 subs r0, r1, r0 strh r0, [r4, 0x3C] subs r0, r2, 0x1 strh r0, [r4, 0x3A] - b _0818403E -_08183FEA: + b @0818403E +@08183FEA: movs r1, 0x3C ldrsh r0, [r4, r1] movs r2, 0x38 @@ -748820,10 +748820,10 @@ _08183FEA: adds r1, 0xC0 adds r0, r1, 0 cmp r1, 0 - bge _0818400C + bge @0818400C ldr r3, =0x000001bf adds r0, r2, r3 -_0818400C: +@0818400C: asrs r0, 8 lsls r0, 8 subs r0, r1, r0 @@ -748835,12 +748835,12 @@ _0818400C: strh r0, [r4, 0x26] lsls r0, 16 cmp r0, 0 - ble _0818402E + ble @0818402E movs r3, 0x26 ldrsh r0, [r4, r3] negs r0, r0 strh r0, [r4, 0x26] -_0818402E: +@0818402E: ldrh r0, [r4, 0x36] ldrh r1, [r4, 0x26] adds r0, r1 @@ -748849,7 +748849,7 @@ _0818402E: ldrh r2, [r4, 0x3C] adds r0, r2 strh r0, [r4, 0x3C] -_0818403E: +@0818403E: pop {r4} pop {r0} bx r0 @@ -748858,13 +748858,13 @@ _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 ldrsh r2, [r1, r0] cmp r2, 0 - bne _08184066 + bne @08184066 movs r0, 0x1 strh r0, [r1, 0x32] strh r0, [r1, 0x3A] @@ -748874,7 +748874,7 @@ pokemonanimfunc_79: @ 8184048 strh r0, [r1, 0x36] movs r0, 0x4 strh r0, [r1, 0x34] -_08184066: +@08184066: adds r0, r1, 0 bl sub_8183FA8 pop {r0} @@ -748882,13 +748882,13 @@ _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 ldrsh r2, [r1, r0] cmp r2, 0 - bne _0818408E + bne @0818408E movs r0, 0x1 strh r0, [r1, 0x32] strh r0, [r1, 0x3A] @@ -748898,7 +748898,7 @@ pokemonanimfunc_7A: @ 8184070 strh r0, [r1, 0x36] movs r0, 0x6 strh r0, [r1, 0x34] -_0818408E: +@0818408E: adds r0, r1, 0 bl sub_8183FA8 pop {r0} @@ -748906,13 +748906,13 @@ _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 ldrsh r2, [r1, r0] cmp r2, 0 - bne _081840B8 + bne @081840B8 movs r0, 0x1 strh r0, [r1, 0x32] movs r0, 0x2 @@ -748923,7 +748923,7 @@ pokemonanimfunc_7B: @ 8184098 strh r0, [r1, 0x36] movs r0, 0x8 strh r0, [r1, 0x34] -_081840B8: +@081840B8: adds r0, r1, 0 bl sub_8183FA8 pop {r0} @@ -748931,7 +748931,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 @@ -748939,43 +748939,43 @@ sub_81840C4: @ 81840C4 movs r1, 0x80 lsls r1, 1 cmp r0, r1 - ble _081840FC + ble @081840FC movs r2, 0x3A ldrsh r1, [r5, r2] ldrh r2, [r5, 0x36] movs r3, 0x36 ldrsh r0, [r5, r3] cmp r1, r0 - bgt _081840EC + bgt @081840EC ldr r0, =sub_8184D88 + 1 str r0, [r5, 0x1C] - b _081840F4 + b @081840F4 .align 2, 0 .pool -_081840EC: +@081840EC: adds r0, r2, 0x1 movs r1, 0 strh r0, [r5, 0x36] strh r1, [r5, 0x3C] -_081840F4: +@081840F4: movs r0, 0 strh r0, [r5, 0x24] strh r0, [r5, 0x26] - b _08184188 -_081840FC: + b @08184188 +@081840FC: cmp r0, 0x9F - ble _08184126 + ble @08184126 cmp r0, r1 - ble _08184106 + ble @08184106 strh r1, [r5, 0x3C] -_08184106: +@08184106: movs r0, 0x3C ldrsh r1, [r5, r0] adds r0, r1, 0 cmp r1, 0 - bge _08184112 + bge @08184112 adds r0, 0xFF -_08184112: +@08184112: asrs r0, 8 lsls r0, 8 subs r0, r1, r0 @@ -748984,10 +748984,10 @@ _08184112: movs r1, 0x8 bl sine negs r0, r0 - b _08184154 -_08184126: + b @08184154 +@08184126: cmp r0, 0x5F - ble _0818414A + ble @0818414A movs r0, 0x60 movs r1, 0x6 bl sine @@ -749001,15 +749001,15 @@ _08184126: bl sine subs r4, r0 strh r4, [r5, 0x26] - b _08184156 -_0818414A: + b @08184156 +@0818414A: movs r2, 0x3C ldrsh r0, [r5, r2] movs r1, 0x6 bl sine -_08184154: +@08184154: strh r0, [r5, 0x26] -_08184156: +@08184156: movs r3, 0x3C ldrsh r0, [r5, r3] lsrs r1, r0, 31 @@ -749025,30 +749025,30 @@ _08184156: movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _0818417E + bne @0818417E lsls r0, r2, 16 negs r0, r0 lsrs r2, r0, 16 -_0818417E: +@0818417E: strh r2, [r5, 0x24] ldrh r0, [r5, 0x34] ldrh r3, [r5, 0x3C] adds r0, r3 strh r0, [r5, 0x3C] -_08184188: +@08184188: pop {r4,r5} pop {r0} bx r0 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 ldrsh r3, [r2, r0] cmp r3, 0 - bne _081841B0 + bne @081841B0 movs r1, 0x1 strh r1, [r2, 0x32] movs r0, 0x2 @@ -749059,7 +749059,7 @@ pokemonanimfunc_7C: @ 8184190 strh r1, [r2, 0x36] movs r0, 0x4 strh r0, [r2, 0x34] -_081841B0: +@081841B0: adds r0, r2, 0 bl sub_81840C4 pop {r0} @@ -749067,13 +749067,13 @@ _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 ldrsh r3, [r2, r0] cmp r3, 0 - bne _081841DC + bne @081841DC movs r1, 0x1 strh r1, [r2, 0x32] movs r0, 0x2 @@ -749084,7 +749084,7 @@ pokemonanimfunc_7D: @ 81841BC strh r1, [r2, 0x36] movs r0, 0x6 strh r0, [r2, 0x34] -_081841DC: +@081841DC: adds r0, r2, 0 bl sub_81840C4 pop {r0} @@ -749092,13 +749092,13 @@ _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 ldrsh r3, [r2, r0] cmp r3, 0 - bne _08184208 + bne @08184208 movs r1, 0x1 strh r1, [r2, 0x32] movs r0, 0x3 @@ -749109,7 +749109,7 @@ pokemonanimfunc_7E: @ 81841E8 strh r1, [r2, 0x36] movs r0, 0x8 strh r0, [r2, 0x34] -_08184208: +@08184208: adds r0, r2, 0 bl sub_81840C4 pop {r0} @@ -749117,13 +749117,13 @@ _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 ldrsh r1, [r2, r0] cmp r1, 0 - bne _08184232 + bne @08184232 movs r0, 0x1 strh r0, [r2, 0x32] strh r0, [r2, 0x3A] @@ -749133,7 +749133,7 @@ pokemonanimfunc_7F: @ 8184214 movs r0, 0x6 strh r0, [r2, 0x36] strh r1, [r2, 0x34] -_08184232: +@08184232: adds r0, r2, 0 bl sub_8183FA8 pop {r0} @@ -749141,13 +749141,13 @@ _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 ldrsh r2, [r1, r0] cmp r2, 0 - bne _0818425A + bne @0818425A movs r0, 0x1 strh r0, [r1, 0x32] strh r0, [r1, 0x3A] @@ -749157,7 +749157,7 @@ pokemonanimfunc_80: @ 818423C movs r0, 0x6 strh r0, [r1, 0x36] strh r0, [r1, 0x34] -_0818425A: +@0818425A: adds r0, r1, 0 bl sub_8183FA8 pop {r0} @@ -749165,13 +749165,13 @@ _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 ldrsh r2, [r1, r0] cmp r2, 0 - bne _08184286 + bne @08184286 movs r0, 0x1 strh r0, [r1, 0x32] movs r0, 0x2 @@ -749183,7 +749183,7 @@ pokemonanimfunc_81: @ 8184264 strh r0, [r1, 0x36] movs r0, 0x8 strh r0, [r1, 0x34] -_08184286: +@08184286: adds r0, r1, 0 bl sub_8183FA8 pop {r0} @@ -749191,7 +749191,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 @@ -749228,13 +749228,13 @@ 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 ldrsh r5, [r4, r0] cmp r5, 0 - bne _08184300 + bne @08184300 adds r0, r4, 0 bl sub_817F670 movs r0, 0x3C @@ -749246,13 +749246,13 @@ pokemonanimfunc_82: @ 81842DC movs r0, 0x1 strh r0, [r4, 0x34] strh r5, [r4, 0x2E] -_08184300: +@08184300: movs r2, 0x32 ldrsh r1, [r4, r2] movs r3, 0x3C ldrsh r0, [r4, r3] cmp r1, r0 - ble _0818434C + ble @0818434C movs r2, 0x80 lsls r2, 1 adds r0, r4, 0 @@ -749270,38 +749270,38 @@ _08184300: lsls r0, 16 asrs r0, 16 cmp r1, r0 - bgt _08184348 + bgt @08184348 adds r0, r4, 0 bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _08184358 + b @08184358 .align 2, 0 .pool -_08184348: +@08184348: strh r2, [r4, 0x32] - b _08184352 -_0818434C: + b @08184352 +@0818434C: adds r0, r4, 0 bl sub_8184290 -_08184352: +@08184352: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] -_08184358: +@08184358: pop {r4,r5} pop {r0} bx r0 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 ldrsh r5, [r4, r0] cmp r5, 0 - bne _08184384 + bne @08184384 adds r0, r4, 0 bl sub_817F670 movs r0, 0x5A @@ -749313,13 +749313,13 @@ pokemonanimfunc_83: @ 8184360 movs r0, 0x1 strh r0, [r4, 0x34] strh r5, [r4, 0x2E] -_08184384: +@08184384: movs r2, 0x32 ldrsh r1, [r4, r2] movs r3, 0x3C ldrsh r0, [r4, r3] cmp r1, r0 - ble _081843D0 + ble @081843D0 movs r2, 0x80 lsls r2, 1 adds r0, r4, 0 @@ -749337,38 +749337,38 @@ _08184384: lsls r0, 16 asrs r0, 16 cmp r1, r0 - bgt _081843CC + bgt @081843CC adds r0, r4, 0 bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _081843DC + b @081843DC .align 2, 0 .pool -_081843CC: +@081843CC: strh r2, [r4, 0x32] - b _081843D6 -_081843D0: + b @081843D6 +@081843D0: adds r0, r4, 0 bl sub_8184290 -_081843D6: +@081843D6: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] -_081843DC: +@081843DC: pop {r4,r5} pop {r0} bx r0 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 ldrsh r5, [r4, r0] cmp r5, 0 - bne _08184408 + bne @08184408 adds r0, r4, 0 bl sub_817F670 movs r0, 0x1E @@ -749380,13 +749380,13 @@ pokemonanimfunc_84: @ 81843E4 movs r0, 0x2 strh r0, [r4, 0x34] strh r5, [r4, 0x2E] -_08184408: +@08184408: movs r2, 0x32 ldrsh r1, [r4, r2] movs r3, 0x3C ldrsh r0, [r4, r3] cmp r1, r0 - ble _08184454 + ble @08184454 movs r2, 0x80 lsls r2, 1 adds r0, r4, 0 @@ -749404,32 +749404,32 @@ _08184408: lsls r0, 16 asrs r0, 16 cmp r1, r0 - bgt _08184450 + bgt @08184450 adds r0, r4, 0 bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _08184460 + b @08184460 .align 2, 0 .pool -_08184450: +@08184450: strh r2, [r4, 0x32] - b _0818445A -_08184454: + b @0818445A +@08184454: adds r0, r4, 0 bl sub_8184290 -_0818445A: +@0818445A: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] -_08184460: +@08184460: pop {r4,r5} pop {r0} bx r0 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 @@ -749437,7 +749437,7 @@ sub_8184468: @ 8184468 movs r2, 0x3C ldrsh r0, [r6, r2] cmp r1, r0 - ble _0818449C + ble @0818449C movs r0, 0 strh r0, [r6, 0x26] movs r2, 0x80 @@ -749450,10 +749450,10 @@ sub_8184468: @ 8184468 bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r6, 0x1C] - b _08184544 + b @08184544 .align 2, 0 .pool -_0818449C: +@0818449C: movs r1, 0x32 ldrsh r0, [r6, r1] movs r2, 0x3A @@ -749466,9 +749466,9 @@ _0818449C: bl __divsi3 adds r1, r0, 0 cmp r1, 0 - bge _081844BC + bge @081844BC adds r0, 0xFF -_081844BC: +@081844BC: asrs r0, 8 lsls r0, 8 subs r0, r1, r0 @@ -749478,7 +749478,7 @@ _081844BC: movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _081844F8 + bne @081844F8 lsls r4, 16 asrs r4, 16 adds r0, r4, 0 @@ -749496,8 +749496,8 @@ _081844BC: strh r0, [r6, 0x38] adds r0, r4, 0 movs r1, 0x20 - b _0818451E -_081844F8: + b @0818451E +@081844F8: lsls r4, 16 asrs r4, 16 adds r0, r4, 0 @@ -749515,16 +749515,16 @@ _081844F8: strh r0, [r6, 0x38] adds r0, r4, 0 movs r1, 0x8 -_0818451E: +@0818451E: bl sine lsls r0, 24 lsrs r0, 24 lsls r0, 24 asrs r0, 24 cmp r0, 0 - bge _08184530 + bge @08184530 adds r0, 0x7 -_08184530: +@08184530: lsrs r0, 3 strh r0, [r6, 0x26] movs r0, 0x36 @@ -749534,7 +749534,7 @@ _08184530: adds r0, r6, 0 movs r3, 0 bl sub_817F6D4 -_08184544: +@08184544: ldrh r0, [r6, 0x32] adds r0, 0x1 strh r0, [r6, 0x32] @@ -749544,13 +749544,13 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08184570 + bne @08184570 adds r0, r4, 0 bl sub_817F670 ldrh r0, [r4, 0x26] @@ -749560,7 +749560,7 @@ pokemonanimfunc_85: @ 8184550 strh r0, [r4, 0x3A] movs r0, 0x50 strh r0, [r4, 0x3C] -_08184570: +@08184570: adds r0, r4, 0 bl sub_8184468 pop {r4} @@ -749569,13 +749569,13 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0818459A + bne @0818459A adds r0, r4, 0 bl sub_817F670 ldrh r0, [r4, 0x26] @@ -749584,7 +749584,7 @@ pokemonanimfunc_86: @ 818457C movs r0, 0x28 strh r0, [r4, 0x3A] strh r0, [r4, 0x3C] -_0818459A: +@0818459A: adds r0, r4, 0 bl sub_8184468 pop {r4} @@ -749593,13 +749593,13 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _081845C6 + bne @081845C6 adds r0, r4, 0 bl sub_817F670 ldrh r0, [r4, 0x26] @@ -749608,7 +749608,7 @@ pokemonanimfunc_87: @ 81845A8 movs r0, 0x50 strh r0, [r4, 0x3A] strh r0, [r4, 0x3C] -_081845C6: +@081845C6: adds r0, r4, 0 bl sub_8184468 pop {r4} @@ -749617,7 +749617,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 @@ -749630,7 +749630,7 @@ sub_81845D4: @ 81845D4 movs r2, 0x3A ldrsh r0, [r4, r2] cmn r1, r0 - bgt _081845FE + bgt @081845FE ldrh r0, [r4, 0x3A] negs r0, r0 strh r0, [r4, 0x24] @@ -749638,7 +749638,7 @@ sub_81845D4: @ 81845D4 strh r0, [r4, 0x3C] ldr r0, =sub_8184610 + 1 str r0, [r4, 0x1C] -_081845FE: +@081845FE: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -749649,7 +749649,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 @@ -749661,10 +749661,10 @@ sub_8184610: @ 8184610 strh r0, [r4, 0x3C] lsls r1, 16 cmp r1, 0 - blt _0818462E + blt @0818462E ldr r0, =sub_8184640 + 1 str r0, [r4, 0x1C] -_0818462E: +@0818462E: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -749675,7 +749675,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 @@ -749691,11 +749691,11 @@ sub_8184640: @ 8184640 movs r3, 0x3A ldrsh r0, [r4, r3] cmp r1, r0 - ble _08184668 + ble @08184668 strh r2, [r4, 0x24] ldr r0, =sub_8184678 + 1 str r0, [r4, 0x1C] -_08184668: +@08184668: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -749706,7 +749706,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 @@ -749716,13 +749716,13 @@ sub_8184678: @ 8184678 movs r3, 0x38 ldrsh r0, [r4, r3] cmp r1, r0 - blt _08184698 + blt @08184698 ldr r0, =sub_81846B8 + 1 str r0, [r4, 0x1C] - b _081846AC + b @081846AC .align 2, 0 .pool -_08184698: +@08184698: ldrh r0, [r4, 0x36] ldrh r1, [r4, 0x24] adds r0, r1 @@ -749733,7 +749733,7 @@ _08184698: strh r0, [r4, 0x36] adds r0, r2, 0x1 strh r0, [r4, 0x34] -_081846AC: +@081846AC: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -749742,7 +749742,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 @@ -749751,14 +749751,14 @@ sub_81846B8: @ 81846B8 strh r0, [r4, 0x24] lsls r0, 16 cmp r0, 0 - bgt _081846DA + bgt @081846DA movs r0, 0 strh r0, [r4, 0x24] adds r0, r4, 0 bl sub_817F77C ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] -_081846DA: +@081846DA: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -749769,7 +749769,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 @@ -749794,7 +749794,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 @@ -749819,7 +749819,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 @@ -749843,7 +749843,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] @@ -749852,23 +749852,23 @@ sub_8184770: @ 8184770 movs r3, 0x2E ldrsh r0, [r1, r3] cmp r0, 0x1 - ble _0818478E + ble @0818478E movs r2, 0x30 ldrsh r0, [r1, r2] negs r0, r0 strh r0, [r1, 0x30] movs r0, 0 - b _08184790 -_0818478E: + b @08184790 +@0818478E: adds r0, r2, 0x1 -_08184790: +@08184790: strh r0, [r1, 0x2E] pop {r0} bx r0 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, =0x0860ae7c @@ -749885,40 +749885,40 @@ sub_8184798: @ 8184798 adds r1, r0, r5 ldrb r0, [r1, 0x1] cmp r0, 0xFF - bne _081847D0 + bne @081847D0 movs r0, 0 strh r0, [r4, 0x24] ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _0818482E + b @0818482E .align 2, 0 .pool -_081847D0: +@081847D0: movs r2, 0x36 ldrsh r0, [r4, r2] cmp r0, 0x1 - bne _08184800 + bne @08184800 ldrb r0, [r1] cmp r0, 0 - beq _081847F0 + beq @081847F0 ldrh r0, [r4, 0x3C] ldr r3, =0x000003ff movs r1, 0x10 movs r2, 0x10 bl pal_fade_1 - b _081847FC + b @081847FC .align 2, 0 .pool -_081847F0: +@081847F0: ldrh r0, [r4, 0x3C] ldr r3, =0x000003ff movs r1, 0x10 movs r2, 0 bl pal_fade_1 -_081847FC: +@081847FC: movs r0, 0 strh r0, [r4, 0x36] -_08184800: +@08184800: movs r1, 0x3A ldrsh r0, [r4, r1] lsls r0, 2 @@ -749927,7 +749927,7 @@ _08184800: movs r2, 0x38 ldrsh r0, [r4, r2] cmp r1, r0 - bne _08184828 + bne @08184828 movs r1, 0 movs r0, 0x1 strh r0, [r4, 0x36] @@ -749935,21 +749935,21 @@ _08184800: ldrh r0, [r4, 0x3A] adds r0, 0x1 strh r0, [r4, 0x3A] - b _0818482E + b @0818482E .align 2, 0 .pool -_08184828: +@08184828: ldrh r0, [r4, 0x38] adds r0, 0x1 strh r0, [r4, 0x38] -_0818482E: +@0818482E: pop {r4,r5} pop {r0} bx r0 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] @@ -749959,7 +749959,7 @@ pokemonanimfunc_8B: @ 8184834 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - bne _08184860 + bne @08184860 ldrb r0, [r2, 0x5] lsrs r0, 4 lsls r0, 4 @@ -749972,7 +749972,7 @@ pokemonanimfunc_8B: @ 8184834 strh r3, [r2, 0x38] strh r3, [r2, 0x36] strh r3, [r2, 0x34] -_08184860: +@08184860: adds r0, r2, 0 bl sub_8184798 pop {r4} @@ -749981,7 +749981,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] @@ -749991,7 +749991,7 @@ pokemonanimfunc_8C: @ 818486C lsls r0, 16 asrs r4, r0, 16 cmp r4, 0x1 - bne _08184898 + bne @08184898 ldrb r0, [r2, 0x5] lsrs r0, 4 lsls r0, 4 @@ -750004,7 +750004,7 @@ pokemonanimfunc_8C: @ 818486C strh r3, [r2, 0x38] strh r3, [r2, 0x36] strh r4, [r2, 0x34] -_08184898: +@08184898: adds r0, r2, 0 bl sub_8184798 pop {r4,r5} @@ -750013,7 +750013,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] @@ -750023,7 +750023,7 @@ pokemonanimfunc_8D: @ 81848A4 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - bne _081848D2 + bne @081848D2 ldrb r0, [r2, 0x5] lsrs r0, 4 lsls r0, 4 @@ -750037,7 +750037,7 @@ pokemonanimfunc_8D: @ 81848A4 strh r3, [r2, 0x36] movs r0, 0x2 strh r0, [r2, 0x34] -_081848D2: +@081848D2: adds r0, r2, 0 bl sub_8184798 pop {r4} @@ -750046,13 +750046,13 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0x7F - ble _08184904 + ble @08184904 ldrh r0, [r4, 0x3C] movs r1, 0x10 movs r2, 0 @@ -750060,10 +750060,10 @@ sub_81848E0: @ 81848E0 bl pal_fade_1 ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] - b _0818492A + b @0818492A .align 2, 0 .pool -_08184904: +@08184904: movs r5, 0x32 ldrsh r0, [r4, r5] movs r1, 0xC @@ -750081,7 +750081,7 @@ _08184904: ldrh r3, [r1] movs r1, 0x10 bl pal_fade_1 -_0818492A: +@0818492A: pop {r4,r5} pop {r0} bx r0 @@ -750090,7 +750090,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 @@ -750098,7 +750098,7 @@ sub_8184934: @ 8184934 movs r2, 0x36 ldrsh r0, [r4, r2] cmp r1, r0 - bge _081849CC + bge @081849CC adds r0, r4, 0 bl sub_817F70C movs r3, 0x38 @@ -750106,7 +750106,7 @@ sub_8184934: @ 8184934 movs r2, 0x2E ldrsh r0, [r4, r2] cmp r1, r0 - ble _08184970 + ble @08184970 ldrh r0, [r4, 0x34] adds r0, 0x1 movs r2, 0 @@ -750116,12 +750116,12 @@ sub_8184934: @ 8184934 movs r3, 0x36 ldrsh r1, [r4, r3] cmp r0, r1 - bge _0818496C + bge @0818496C strh r2, [r4, 0x38] -_0818496C: +@0818496C: strh r2, [r4, 0x24] - b _081849C6 -_08184970: + b @081849C6 +@08184970: movs r0, 0x34 ldrsh r1, [r4, r0] lsrs r0, r1, 31 @@ -750145,9 +750145,9 @@ _08184970: bl __divsi3 adds r1, r0, 0 cmp r1, 0 - bge _081849A4 + bge @081849A4 adds r0, 0xFF -_081849A4: +@081849A4: asrs r0, 8 lsls r0, 8 subs r0, r1, r0 @@ -750164,23 +750164,23 @@ _081849A4: ldrh r0, [r4, 0x38] adds r0, 0x1 strh r0, [r4, 0x38] -_081849C6: +@081849C6: adds r0, r4, 0 bl sub_817F70C -_081849CC: +@081849CC: pop {r4,r5} pop {r0} bx r0 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 ldrsh r2, [r4, r0] cmp r2, 0 - bne _081849FE + bne @081849FE ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -750196,15 +750196,15 @@ pokemonanimfunc_8E: @ 81849D4 strh r0, [r4, 0x36] strh r2, [r4, 0x34] strh r2, [r4, 0x30] -_081849FE: +@081849FE: ldrh r0, [r4, 0x32] movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _08184A0E + bne @08184A0E adds r0, r4, 0 bl sub_81848E0 -_08184A0E: +@08184A0E: movs r0, 0x32 ldrsh r2, [r4, r0] movs r3, 0x2E @@ -750218,10 +750218,10 @@ _08184A0E: adds r0, r1 asrs r0, 1 cmp r2, r0 - blt _08184A30 + blt @08184A30 adds r0, r4, 0 bl sub_8184934 -_08184A30: +@08184A30: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] @@ -750231,13 +750231,13 @@ _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 ldrsh r2, [r4, r0] cmp r2, 0 - bne _08184A66 + bne @08184A66 ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -750253,15 +750253,15 @@ pokemonanimfunc_8F: @ 8184A3C strh r0, [r4, 0x36] strh r2, [r4, 0x34] strh r2, [r4, 0x30] -_08184A66: +@08184A66: ldrh r0, [r4, 0x32] movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _08184A76 + bne @08184A76 adds r0, r4, 0 bl sub_81848E0 -_08184A76: +@08184A76: movs r0, 0x32 ldrsh r2, [r4, r0] movs r3, 0x2E @@ -750275,10 +750275,10 @@ _08184A76: adds r0, r1 asrs r0, 1 cmp r2, r0 - blt _08184A98 + blt @08184A98 adds r0, r4, 0 bl sub_8184934 -_08184A98: +@08184A98: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] @@ -750288,13 +750288,13 @@ _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 ldrsh r2, [r4, r0] cmp r2, 0 - bne _08184ACE + bne @08184ACE ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -750310,15 +750310,15 @@ pokemonanimfunc_90: @ 8184AA4 strh r0, [r4, 0x36] strh r2, [r4, 0x34] strh r2, [r4, 0x30] -_08184ACE: +@08184ACE: ldrh r0, [r4, 0x32] movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _08184ADE + bne @08184ADE adds r0, r4, 0 bl sub_81848E0 -_08184ADE: +@08184ADE: movs r0, 0x32 ldrsh r2, [r4, r0] movs r3, 0x2E @@ -750332,10 +750332,10 @@ _08184ADE: adds r0, r1 asrs r0, 1 cmp r2, r0 - blt _08184B00 + blt @08184B00 adds r0, r4, 0 bl sub_8184934 -_08184B00: +@08184B00: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] @@ -750345,13 +750345,13 @@ _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 ldrsh r2, [r4, r0] cmp r2, 0 - bne _08184B38 + bne @08184B38 ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -750368,15 +750368,15 @@ pokemonanimfunc_91: @ 8184B0C strh r2, [r4, 0x34] movs r0, 0x1 strh r0, [r4, 0x30] -_08184B38: +@08184B38: ldrh r0, [r4, 0x32] movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _08184B48 + bne @08184B48 adds r0, r4, 0 bl sub_81848E0 -_08184B48: +@08184B48: movs r0, 0x32 ldrsh r2, [r4, r0] movs r3, 0x2E @@ -750390,10 +750390,10 @@ _08184B48: adds r0, r1 asrs r0, 1 cmp r2, r0 - blt _08184B6A + blt @08184B6A adds r0, r4, 0 bl sub_8184934 -_08184B6A: +@08184B6A: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] @@ -750403,13 +750403,13 @@ _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 ldrsh r2, [r4, r0] cmp r2, 0 - bne _08184BA2 + bne @08184BA2 ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -750425,15 +750425,15 @@ pokemonanimfunc_92: @ 8184B78 strh r0, [r4, 0x36] strh r2, [r4, 0x34] strh r0, [r4, 0x30] -_08184BA2: +@08184BA2: ldrh r0, [r4, 0x32] movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _08184BB2 + bne @08184BB2 adds r0, r4, 0 bl sub_81848E0 -_08184BB2: +@08184BB2: movs r0, 0x32 ldrsh r2, [r4, r0] movs r3, 0x2E @@ -750447,10 +750447,10 @@ _08184BB2: adds r0, r1 asrs r0, 1 cmp r2, r0 - blt _08184BD4 + blt @08184BD4 adds r0, r4, 0 bl sub_8184934 -_08184BD4: +@08184BD4: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] @@ -750460,13 +750460,13 @@ _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 ldrsh r2, [r4, r0] cmp r2, 0 - bne _08184C0A + bne @08184C0A ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -750482,15 +750482,15 @@ pokemonanimfunc_93: @ 8184BE0 strh r0, [r4, 0x36] strh r2, [r4, 0x34] strh r0, [r4, 0x30] -_08184C0A: +@08184C0A: ldrh r0, [r4, 0x32] movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _08184C1A + bne @08184C1A adds r0, r4, 0 bl sub_81848E0 -_08184C1A: +@08184C1A: movs r0, 0x32 ldrsh r2, [r4, r0] movs r3, 0x2E @@ -750504,10 +750504,10 @@ _08184C1A: adds r0, r1 asrs r0, 1 cmp r2, r0 - blt _08184C3C + blt @08184C3C adds r0, r4, 0 bl sub_8184934 -_08184C3C: +@08184C3C: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] @@ -750517,13 +750517,13 @@ _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 ldrsh r2, [r4, r0] cmp r2, 0 - bne _08184C72 + bne @08184C72 ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -750539,15 +750539,15 @@ pokemonanimfunc_94: @ 8184C48 strh r0, [r4, 0x36] strh r2, [r4, 0x34] strh r0, [r4, 0x30] -_08184C72: +@08184C72: ldrh r0, [r4, 0x32] movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _08184C82 + bne @08184C82 adds r0, r4, 0 bl sub_81848E0 -_08184C82: +@08184C82: movs r0, 0x32 ldrsh r2, [r4, r0] movs r3, 0x2E @@ -750561,10 +750561,10 @@ _08184C82: adds r0, r1 asrs r0, 1 cmp r2, r0 - blt _08184CA4 + blt @08184CA4 adds r0, r4, 0 bl sub_8184934 -_08184CA4: +@08184CA4: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] @@ -750574,13 +750574,13 @@ _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 ldrsh r2, [r4, r0] cmp r2, 0 - bne _08184CDC + bne @08184CDC ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -750597,15 +750597,15 @@ pokemonanimfunc_95: @ 8184CB0 strh r2, [r4, 0x34] movs r0, 0x2 strh r0, [r4, 0x30] -_08184CDC: +@08184CDC: ldrh r0, [r4, 0x32] movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _08184CEC + bne @08184CEC adds r0, r4, 0 bl sub_81848E0 -_08184CEC: +@08184CEC: movs r0, 0x32 ldrsh r2, [r4, r0] movs r3, 0x2E @@ -750619,10 +750619,10 @@ _08184CEC: adds r0, r1 asrs r0, 1 cmp r2, r0 - blt _08184D0E + blt @08184D0E adds r0, r4, 0 bl sub_8184934 -_08184D0E: +@08184D0E: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] @@ -750632,13 +750632,13 @@ _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 ldrsh r2, [r4, r0] cmp r2, 0 - bne _08184D48 + bne @08184D48 ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -750655,15 +750655,15 @@ pokemonanimfunc_96: @ 8184D1C strh r2, [r4, 0x34] movs r0, 0x2 strh r0, [r4, 0x30] -_08184D48: +@08184D48: ldrh r0, [r4, 0x32] movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _08184D58 + bne @08184D58 adds r0, r4, 0 bl sub_81848E0 -_08184D58: +@08184D58: movs r0, 0x32 ldrsh r2, [r4, r0] movs r3, 0x2E @@ -750677,10 +750677,10 @@ _08184D58: adds r0, r1 asrs r0, 1 cmp r2, r0 - blt _08184D7A + blt @08184D7A adds r0, r4, 0 bl sub_8184934 -_08184D7A: +@08184D7A: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] @@ -750690,7 +750690,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 @@ -750698,10 +750698,10 @@ sub_8184D88: @ 8184D88 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08184D9C + beq @08184D9C ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] -_08184D9C: +@08184D9C: pop {r0} bx r0 .align 2, 0 @@ -750709,7 +750709,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 @@ -750732,7 +750732,7 @@ sub_8184DA4: @ 8184DA4 mov r9, r6 ldr r0, =0x0203bd34 mov r8, r0 -_08184DD0: +@08184DD0: lsls r0, r2, 1 mov r3, r9 adds r1, r0, r3 @@ -750746,7 +750746,7 @@ _08184DD0: adds r4, r2, 0x1 mov r3, r12 cmp r3, 0x1 - bne _08184E1C + bne @08184E1C ldr r5, =0x02022fec movs r3, 0xFF movs r1, 0xA6 @@ -750755,14 +750755,14 @@ _08184DD0: muls r0, r1 mov r6, r8 adds r2, r0, r6 -_08184DFC: +@08184DFC: ldrb r0, [r2] orrs r0, r3 strb r0, [r2] adds r2, 0x1 subs r1, 0x1 cmp r1, 0 - bne _08184DFC + bne @08184DFC ldr r0, [r5] ldr r1, =0x0203c7b8 str r0, [r1] @@ -750772,10 +750772,10 @@ _08184DFC: ldr r0, [r0, 0xC] mov r6, r10 str r0, [r6] -_08184E1C: +@08184E1C: adds r2, r4, 0 cmp r2, 0x3 - ble _08184DD0 + ble @08184DD0 pop {r3-r5} mov r8, r3 mov r9, r4 @@ -750788,7 +750788,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 @@ -750798,7 +750798,7 @@ sub_8184E58: @ 8184E58 ldr r0, =0x0203c7ac ldrb r0, [r0] cmp r0, 0x1 - bne _08184EA0 + bne @08184EA0 ldr r1, =0x0203bd2c ldr r0, =0x03005d80 ldr r0, [r0] @@ -750810,23 +750810,23 @@ sub_8184E58: @ 8184E58 ldr r4, =0x0203c7af bl sub_81A513C strb r0, [r4] - b _08184EAC + b @08184EAC .align 2, 0 .pool -_08184EA0: +@08184EA0: cmp r0, 0x2 - bne _08184EAC + bne @08184EAC ldr r0, =0x03005d80 ldr r1, =0x0203bd2c ldr r1, [r1] str r1, [r0] -_08184EAC: +@08184EAC: ldr r0, =0x02022fec ldr r5, [r0] movs r0, 0x2 ands r5, r0 cmp r5, 0 - beq _08184F64 + beq @08184F64 bl link_get_multiplayer_id ldr r1, =0x0203c7b4 strb r0, [r1] @@ -750843,7 +750843,7 @@ _08184EAC: mov r8, r0 mov r7, r9 adds r7, 0x4 -_08184EDC: +@08184EDC: lsls r0, r5, 2 adds r0, r5 lsls r4, r0, 2 @@ -750864,7 +750864,7 @@ _08184EDC: ldrh r0, [r1, 0x1A] strh r0, [r2, 0x10] cmp r5, r10 - bge _08184F3C + bge @08184F3C mov r0, r8 adds r1, r3, r0 mov r0, sp @@ -750875,31 +750875,31 @@ _08184EDC: mov r1, sp bl gf_strcpy adds r5, 0x1 - b _08184F56 + b @08184F56 .align 2, 0 .pool -_08184F3C: +@08184F3C: adds r5, 0x1 ldr r0, =0x020229f0 adds r1, r3, r0 ldr r0, =0x0203cc84 adds r2, r4, r0 movs r3, 0x7 -_08184F48: +@08184F48: ldrb r0, [r1] strb r0, [r2] adds r1, 0x1 adds r2, 0x1 subs r3, 0x1 cmp r3, 0 - bge _08184F48 -_08184F56: + bge @08184F48 +@08184F56: cmp r5, 0x3 - ble _08184EDC - b _08184FA0 + ble @08184EDC + b @08184FA0 .align 2, 0 .pool -_08184F64: +@08184F64: ldr r3, =0x0203cc80 ldr r4, =0x03005d90 ldr r2, [r4] @@ -750922,7 +750922,7 @@ _08184F64: strh r0, [r3, 0x10] movs r5, 0 adds r3, 0x4 -_08184F90: +@08184F90: adds r0, r5, r3 ldr r1, [r4] adds r1, r5 @@ -750930,8 +750930,8 @@ _08184F90: strb r1, [r0] adds r5, 0x1 cmp r5, 0x7 - ble _08184F90 -_08184FA0: + ble @08184F90 +@08184FA0: add sp, 0x20 pop {r3-r5} mov r8, r3 @@ -750945,7 +750945,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 @@ -750958,11 +750958,11 @@ sub_8184FBC: @ 8184FBC adds r3, r2, 0 ldr r0, =0x00000297 cmp r3, r0 - bhi _08184FF0 + bhi @08184FF0 ldr r0, =0x0203c7ac ldrb r0, [r0] cmp r0, 0x2 - beq _08184FF0 + beq @08184FF0 ldr r1, =0x0203bd34 adds r0, r2, 0x1 strh r0, [r4] @@ -750972,7 +750972,7 @@ sub_8184FBC: @ 8184FBC adds r0, r3, r0 adds r0, r1 strb r6, [r0] -_08184FF0: +@08184FF0: pop {r4-r6} pop {r0} bx r0 @@ -750981,7 +750981,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 @@ -750989,7 +750989,7 @@ sub_8185008: @ 8185008 lsrs r4, r1, 24 movs r3, 0 cmp r3, r4 - bge _08185046 + bge @08185046 ldr r0, =0x0203c794 lsls r1, r5, 1 adds r2, r1, r0 @@ -750998,7 +750998,7 @@ sub_8185008: @ 8185008 lsls r0, 2 muls r5, r0 movs r6, 0xFF -_08185028: +@08185028: ldrh r0, [r2] subs r0, 0x1 strh r0, [r2] @@ -751010,11 +751010,11 @@ _08185028: strb r0, [r1] ldrh r0, [r2] cmp r0, 0 - beq _08185046 + beq @08185046 adds r3, 0x1 cmp r3, r4 - blt _08185028 -_08185046: + blt @08185028 +@08185046: pop {r4-r7} pop {r0} bx r0 @@ -751023,7 +751023,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 @@ -751034,7 +751034,7 @@ sub_8185054: @ 8185054 ldrh r1, [r2] ldr r0, =0x00000297 cmp r1, r0 - bhi _0818507A + bhi @0818507A ldr r4, =0x0203bd34 adds r0, 0x1 muls r3, r0 @@ -751042,8 +751042,8 @@ sub_8185054: @ 8185054 adds r0, r4 ldrb r0, [r0] cmp r0, 0xFF - bne _081850BC -_0818507A: + bne @081850BC +@0818507A: ldr r2, =0x020375f0 ldr r1, =0x0202433a movs r0, 0x5 @@ -751061,16 +751061,16 @@ _0818507A: ldr r0, =sub_80384E4 + 1 bl set_callback2 movs r0, 0xFF - b _081850C6 + b @081850C6 .align 2, 0 .pool -_081850BC: +@081850BC: adds r0, r1, 0x1 strh r0, [r2] adds r0, r1, r3 adds r0, r4 ldrb r0, [r0] -_081850C6: +@081850C6: add sp, 0x4 pop {r4} pop {r1} @@ -751078,7 +751078,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 @@ -751087,7 +751087,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 @@ -751098,7 +751098,7 @@ sub_81850DC: @ 81850DC movs r7, 0 movs r0, 0 mov r12, r0 -_081850F0: +@081850F0: mov r1, r12 lsls r3, r1, 1 ldr r0, =0x0203c794 @@ -751112,7 +751112,7 @@ _081850F0: str r1, [sp] ldrh r1, [r6] cmp r0, r1 - beq _0818517E + beq @0818517E adds r1, r7, 0 adds r0, r1, 0x1 lsls r0, 24 @@ -751134,7 +751134,7 @@ _081850F0: ldrh r1, [r6] subs r0, r1 cmp r4, r0 - bge _08185172 + bge @08185172 ldr r1, =0x0203bd34 mov r10, r1 ldr r6, =0x0203c79c @@ -751142,7 +751142,7 @@ _081850F0: lsls r0, 2 mov r5, r12 muls r5, r0 -_08185146: +@08185146: adds r1, r7, 0 adds r0, r1, 0x1 lsls r0, 24 @@ -751164,21 +751164,21 @@ _08185146: ldrh r0, [r2] subs r1, r0 cmp r4, r1 - blt _08185146 -_08185172: + blt @08185146 +@08185172: ldr r0, =0x0203c79c add r0, r9 ldr r1, =0x0203c794 add r1, r9 ldrh r1, [r1] strh r1, [r0] -_0818517E: +@0818517E: ldr r1, [sp] lsls r0, r1, 24 lsrs r0, 24 mov r12, r0 cmp r0, 0x3 - bls _081850F0 + bls @081850F0 adds r0, r7, 0 add sp, 0x4 pop {r3-r5} @@ -751193,7 +751193,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} @@ -751206,30 +751206,30 @@ sub_81851A8: @ 81851A8 ldr r0, [r0] ands r0, r1 cmp r0, 0 - beq _0818525E + beq @0818525E movs r5, 0 ldr r4, =0x020229e8 - b _081851DA + b @081851DA .align 2, 0 .pool -_081851D0: +@081851D0: ldrb r0, [r4] cmp r0, 0x3 - bne _0818525E + bne @0818525E adds r4, 0x1C adds r5, 0x1 -_081851DA: +@081851DA: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 cmp r5, r0 - blt _081851D0 + blt @081851D0 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x4 ands r0, r1 cmp r0, 0 - bne _0818525E + bne @0818525E ldrb r0, [r7] mov r4, sp adds r4, 0x1 @@ -751237,8 +751237,8 @@ _081851DA: ldrb r0, [r4] mov r8, r4 cmp r0, 0 - beq _0818525E -_08185202: + beq @0818525E +@08185202: adds r0, r7, 0 mov r1, sp adds r2, r4, 0 @@ -751252,7 +751252,7 @@ _08185202: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - beq _08185256 + beq @08185256 ldr r3, =0x0203bd34 ldr r0, =0x0203c7a4 lsls r1, r6, 1 @@ -751261,7 +751261,7 @@ _08185202: movs r0, 0xA6 lsls r0, 2 muls r6, r0 -_08185232: +@08185232: adds r0, r7, 0 mov r1, sp mov r2, r8 @@ -751278,13 +751278,13 @@ _08185232: strb r0, [r1] subs r5, 0x1 cmp r5, 0 - bne _08185232 -_08185256: + bne @08185232 +@08185256: mov r4, r8 ldrb r0, [r4] cmp r0, 0 - bne _08185202 -_0818525E: + bne @08185202 +@0818525E: add sp, 0x8 pop {r3} mov r8, r3 @@ -751296,7 +751296,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] @@ -751311,7 +751311,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 @@ -751328,18 +751328,18 @@ 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 adds r0, r5, r1 ldr r1, [r0] cmp r1, 0 - beq _081852E8 + beq @081852E8 ldr r0, =0x7d007e92 ands r1, r0 cmp r1, 0 - bne _081852E8 + bne @081852E8 ldr r4, =0x00000f7c adds r0, r5, 0 adds r1, r4, 0 @@ -751347,21 +751347,21 @@ sub_81852B0: @ 81852B0 adds r4, r5, r4 ldr r1, [r4] cmp r0, r1 - bne _081852E8 + bne @081852E8 movs r0, 0x1 - b _081852EA + b @081852EA .align 2, 0 .pool -_081852E8: +@081852E8: movs r0, 0 -_081852EA: +@081852EA: pop {r4,r5} pop {r1} bx r1 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 @@ -751385,21 +751385,21 @@ sub_81852F0: @ 81852F0 adds r1, r5, 0 bl sub_8153634 cmp r0, 0x1 - bne _08185330 + bne @08185330 movs r0, 0x1 - b _08185332 + b @08185332 .align 2, 0 .pool -_08185330: +@08185330: movs r0, 0 -_08185332: +@08185332: pop {r4,r5} pop {r1} bx r1 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 @@ -751417,7 +751417,7 @@ sub_8185338: @ 8185338 bl malloc_and_clear str r0, [sp] movs r6, 0 -_0818535E: +@0818535E: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 @@ -751438,7 +751438,7 @@ _0818535E: bl memcpy adds r6, 0x1 cmp r6, 0x5 - ble _0818535E + ble @0818535E movs r6, 0 ldr r2, =0x03005d90 mov r9, r2 @@ -751455,7 +751455,7 @@ _0818535E: mov r10, r4 ldr r0, =0x000004e4 adds r4, r7, r0 -_081853AC: +@081853AC: lsls r1, r6, 3 ldr r0, =0x0203cc80 adds r0, 0x4 @@ -751463,14 +751463,14 @@ _081853AC: adds r2, r3, r0 add r1, r10 movs r3, 0x7 -_081853BA: +@081853BA: ldrb r0, [r2] strb r0, [r1] adds r2, 0x1 adds r1, 0x1 subs r3, 0x1 cmp r3, 0 - bge _081853BA + bge @081853BA ldr r0, [sp, 0x8] adds r1, r0, r6 ldrb r0, [r5, 0xC] @@ -751492,7 +751492,7 @@ _081853BA: adds r4, 0x1 adds r6, 0x1 cmp r6, 0x3 - ble _081853AC + ble @081853AC movs r4, 0x9D lsls r4, 3 adds r1, r7, r4 @@ -751504,7 +751504,7 @@ _081853BA: movs r0, 0x2 ands r0, r2 cmp r0, 0 - beq _081854DC + beq @081854DC ldr r1, =0x000004ec adds r3, r7, r1 movs r1, 0x23 @@ -751517,37 +751517,37 @@ _081853BA: movs r0, 0x4 ands r0, r2 cmp r0, 0 - beq _08185454 + beq @08185454 movs r0, 0x80 lsls r0, 24 orrs r1, r0 str r1, [r3] - b _081854E2 + b @081854E2 .align 2, 0 .pool -_08185454: +@08185454: movs r0, 0x40 ands r2, r0 cmp r2, 0 - beq _081854E2 + beq @081854E2 ldr r2, =0x0203cc80 ldrh r0, [r2, 0xE] cmp r0, 0x1 - beq _081854A8 + beq @081854A8 cmp r0, 0x1 - bgt _08185474 + bgt @08185474 cmp r0, 0 - beq _0818547E - b _081854E2 + beq @0818547E + b @081854E2 .align 2, 0 .pool -_08185474: +@08185474: cmp r0, 0x2 - beq _0818547E + beq @0818547E cmp r0, 0x3 - beq _081854A8 - b _081854E2 -_0818547E: + beq @081854A8 + b @081854E2 +@0818547E: ldr r3, =0x0203c7b4 ldrb r1, [r3] lsls r0, r1, 2 @@ -751559,13 +751559,13 @@ _0818547E: movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _081854E2 + bne @081854E2 ldr r5, =0x000004ec adds r0, r7, r5 - b _081854C4 + b @081854C4 .align 2, 0 .pool -_081854A8: +@081854A8: ldr r0, =0x0203c7b4 ldrb r1, [r0] lsls r0, r1, 2 @@ -751577,23 +751577,23 @@ _081854A8: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081854E2 + beq @081854E2 ldr r2, =0x000004ec adds r0, r7, r2 -_081854C4: +@081854C4: ldr r1, [r0] movs r2, 0x80 lsls r2, 24 orrs r1, r2 str r1, [r0] - b _081854E2 + b @081854E2 .align 2, 0 .pool -_081854DC: +@081854DC: ldr r3, =0x000004ec adds r0, r7, r3 str r2, [r0] -_081854E2: +@081854E2: ldr r4, =0x02038bca ldrh r1, [r4] ldr r5, =0x000004f4 @@ -751671,9 +751671,9 @@ _081854E2: lsls r0, 16 lsrs r0, 16 cmp r0, 0x63 - bls _08185580 - b _081856C4 -_08185580: + bls @08185580 + b @081856C4 +@08185580: movs r6, 0 ldr r0, =0x00000504 adds r3, r7, r0 @@ -751683,7 +751683,7 @@ _08185580: adds r2, r4, 0 mov r8, r2 ldr r4, =0x0000073c -_08185592: +@08185592: adds r2, r3, r6 mov r5, r10 ldr r1, [r5] @@ -751699,7 +751699,7 @@ _08185592: strb r0, [r2] adds r6, 0x1 cmp r6, 0x7 - ble _08185592 + ble @08185592 mov r0, r9 ldr r2, [r0] ldr r1, =0x02038bca @@ -751718,7 +751718,7 @@ _08185592: ldr r1, =0x0203cce8 ldrb r0, [r1] cmp r0, 0x1 - bne _08185664 + bne @08185664 movs r6, 0 ldr r2, =0x0000050e adds r4, r7, r2 @@ -751726,7 +751726,7 @@ _08185592: ldr r5, =0x02038bca mov r8, r5 adds r5, r3, 0 -_081855E6: +@081855E6: lsls r3, r6, 1 mov r0, r10 ldr r2, [r0] @@ -751745,11 +751745,11 @@ _081855E6: adds r4, 0x2 adds r6, 0x1 cmp r6, 0x5 - ble _081855E6 - b _08185696 + ble @081855E6 + b @08185696 .align 2, 0 .pool -_08185664: +@08185664: movs r6, 0 ldr r1, =0x0000050e adds r4, r7, r1 @@ -751757,7 +751757,7 @@ _08185664: ldr r2, =0x02038bca mov r8, r2 adds r5, r3, 0 -_08185672: +@08185672: lsls r3, r6, 1 mov r0, r10 ldr r2, [r0] @@ -751775,8 +751775,8 @@ _08185672: adds r4, 0x2 adds r6, 0x1 cmp r6, 0x5 - ble _08185672 -_08185696: + ble @08185672 +@08185696: mov r1, r9 ldr r2, [r1] ldr r3, =0x02038bca @@ -751789,19 +751789,19 @@ _08185696: ldr r5, =0x0000081c adds r2, r5 ldrb r1, [r2] - b _08185856 + b @08185856 .align 2, 0 .pool -_081856C4: +@081856C4: ldr r3, =0x02038bcc ldrh r3, [r3] adds r0, r1, r3 lsls r0, 16 lsrs r0, 16 cmp r0, 0x63 - bls _081856D4 - b _081857E4 -_081856D4: + bls @081856D4 + b @081857E4 +@081856D4: movs r6, 0 ldr r4, =0x00000504 adds r3, r7, r4 @@ -751811,7 +751811,7 @@ _081856D4: ldr r0, =0xfffffed4 mov r8, r0 ldr r4, =0x0000073c -_081856E6: +@081856E6: adds r2, r3, r6 mov r5, r10 ldr r1, [r5] @@ -751827,7 +751827,7 @@ _081856E6: strb r0, [r2] adds r6, 0x1 cmp r6, 0x7 - ble _081856E6 + ble @081856E6 mov r0, r9 ldr r2, [r0] ldr r1, =0x02038bcc @@ -751846,7 +751846,7 @@ _081856E6: ldr r1, =0x0203cce8 ldrb r0, [r1] cmp r0, 0x1 - bne _08185784 + bne @08185784 movs r6, 0 ldr r2, =0x0000050e adds r4, r7, r2 @@ -751854,7 +751854,7 @@ _081856E6: ldr r5, =0x02038bcc mov r8, r5 adds r5, r3, 0 -_0818573A: +@0818573A: lsls r3, r6, 1 mov r0, r10 ldr r2, [r0] @@ -751873,11 +751873,11 @@ _0818573A: adds r4, 0x2 adds r6, 0x1 cmp r6, 0x5 - ble _0818573A - b _081857B6 + ble @0818573A + b @081857B6 .align 2, 0 .pool -_08185784: +@08185784: movs r6, 0 ldr r1, =0x0000050e adds r4, r7, r1 @@ -751885,7 +751885,7 @@ _08185784: ldr r2, =0x02038bcc mov r8, r2 adds r5, r3, 0 -_08185792: +@08185792: lsls r3, r6, 1 mov r0, r10 ldr r2, [r0] @@ -751903,8 +751903,8 @@ _08185792: adds r4, 0x2 adds r6, 0x1 cmp r6, 0x5 - ble _08185792 -_081857B6: + ble @08185792 +@081857B6: mov r1, r9 ldr r2, [r1] ldr r3, =0x02038bcc @@ -751917,17 +751917,17 @@ _081857B6: ldr r5, =0x0000081c adds r2, r5 ldrb r1, [r2] - b _08185856 + b @08185856 .align 2, 0 .pool -_081857E4: +@081857E4: ldr r3, =0x02038bce ldrh r3, [r3] adds r0, r1, r3 lsls r0, 16 lsrs r0, 16 cmp r0, 0x63 - bhi _0818585C + bhi @0818585C movs r6, 0 ldr r4, =0x00000504 adds r3, r7, r4 @@ -751937,7 +751937,7 @@ _081857E4: ldr r0, =0xfffffed4 mov r8, r0 ldr r4, =0x0000073c -_08185804: +@08185804: adds r2, r3, r6 mov r5, r10 ldr r1, [r5] @@ -751953,7 +751953,7 @@ _08185804: strb r0, [r2] adds r6, 0x1 cmp r6, 0x7 - ble _08185804 + ble @08185804 mov r0, r9 ldr r1, [r0] ldr r2, =0x02038bce @@ -751979,16 +751979,16 @@ _08185804: ldr r5, =0x0000081c adds r1, r5 ldrb r1, [r1] -_08185856: +@08185856: ldr r2, =0x0000051a adds r0, r7, r2 strb r1, [r0] -_0818585C: +@0818585C: ldr r3, =0x02038bca ldrh r0, [r3] ldr r1, =0x0000018f cmp r0, r1 - bls _08185900 + bls @08185900 mov r4, r9 ldr r2, [r4] adds r1, r0, 0 @@ -752012,7 +752012,7 @@ _0818585C: ldr r1, =0x02038bca mov r8, r1 adds r5, r3, 0 -_08185894: +@08185894: lsls r3, r6, 1 mov r0, r10 ldr r2, [r0] @@ -752032,21 +752032,21 @@ _08185894: adds r4, 0x2 adds r6, 0x1 cmp r6, 0x5 - ble _08185894 + ble @08185894 mov r3, r9 ldr r2, [r3] ldr r4, =0x02038bca ldrh r1, [r4] ldr r5, =0xfffffe70 adds r1, r5 - b _081859AC + b @081859AC .align 2, 0 .pool -_08185900: +@08185900: ldr r3, =0x02038bcc ldrh r0, [r3] cmp r0, r1 - bls _0818597C + bls @0818597C mov r4, r9 ldr r2, [r4] adds r1, r0, 0 @@ -752070,7 +752070,7 @@ _08185900: ldr r1, =0x02038bcc mov r8, r1 adds r5, r3, 0 -_08185936: +@08185936: lsls r3, r6, 1 mov r0, r10 ldr r2, [r0] @@ -752090,21 +752090,21 @@ _08185936: adds r4, 0x2 adds r6, 0x1 cmp r6, 0x5 - ble _08185936 + ble @08185936 mov r3, r9 ldr r2, [r3] ldr r4, =0x02038bcc ldrh r1, [r4] ldr r5, =0xfffffe70 adds r1, r5 - b _081859AC + b @081859AC .align 2, 0 .pool -_0818597C: +@0818597C: ldr r3, =0x02038bce ldrh r0, [r3] cmp r0, r1 - bls _081859C0 + bls @081859C0 mov r4, r9 ldr r2, [r4] adds r1, r0, 0 @@ -752125,7 +752125,7 @@ _0818597C: ldr r0, =0x02038bce ldrh r1, [r0] adds r1, r3 -_081859AC: +@081859AC: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -752136,7 +752136,7 @@ _081859AC: ldr r2, =0x0000051b adds r0, r7, r2 strb r1, [r0] -_081859C0: +@081859C0: movs r6, 0 ldr r3, =0x00000297 mov r10, r3 @@ -752147,7 +752147,7 @@ _081859C0: mov r8, r5 ldr r0, =0x0000051c adds r5, r7, r0 -_081859D4: +@081859D4: adds r4, r6, 0x1 mov r0, r8 muls r0, r6 @@ -752156,32 +752156,32 @@ _081859D4: adds r1, r0, r5 mov r3, r10 adds r3, 0x1 -_081859E4: +@081859E4: ldrb r0, [r2] strb r0, [r1] adds r2, 0x1 adds r1, 0x1 subs r3, 0x1 cmp r3, 0 - bne _081859E4 + bne @081859E4 adds r6, r4, 0 cmp r6, 0x3 - ble _081859D4 -_081859F8: + ble @081859D4 +@081859F8: adds r0, r7, 0 ldr r1, [sp] bl sub_81852F0 adds r4, r0, 0 cmp r4, 0x1 - beq _08185A14 + beq @08185A14 ldr r0, [sp, 0x4] adds r0, 0x1 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x4] cmp r0, 0x2 - bls _081859F8 -_08185A14: + bls @081859F8 +@08185A14: adds r0, r7, 0 bl free ldr r0, [sp] @@ -752200,14 +752200,14 @@ _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 movs r0, 0x1F bl sub_81535DC cmp r0, 0x1 - bne _08185A7E + bne @08185A7E movs r2, 0xF8 lsls r2, 4 adds r0, r5, 0 @@ -752216,19 +752216,19 @@ sub_8185A54: @ 8185A54 adds r0, r5, 0 bl sub_81852B0 cmp r0, 0 - beq _08185A7E + beq @08185A7E movs r0, 0x1 - b _08185A80 -_08185A7E: + b @08185A80 +@08185A7E: movs r0, 0 -_08185A80: +@08185A80: pop {r4,r5} pop {r1} bx r1 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 @@ -752248,7 +752248,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] @@ -752287,7 +752287,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 @@ -752301,7 +752301,7 @@ sub_8185B1C: @ 8185B1C strh r1, [r0, 0x8] lsls r1, 16 cmp r1, 0 - bne _08185B4A + bne @08185B4A ldr r0, =0x030022c0 ldr r1, =sub_8185AB0 + 1 str r1, [r0, 0x8] @@ -752309,7 +752309,7 @@ sub_8185B1C: @ 8185B1C bl set_callback2 adds r0, r4, 0 bl remove_task -_08185B4A: +@08185B4A: pop {r4} pop {r0} bx r0 @@ -752318,7 +752318,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 @@ -752331,7 +752331,7 @@ sub_8185B60: @ 8185B60 movs r6, 0 ldr r0, =0x020244ec mov r8, r0 -_08185B7C: +@08185B7C: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 @@ -752352,7 +752352,7 @@ _08185B7C: bl memcpy adds r6, 0x1 cmp r6, 0x5 - ble _08185B7C + ble @08185B7C movs r6, 0 ldr r3, =0x020229e8 mov r8, r3 @@ -752363,7 +752363,7 @@ _08185B7C: adds r4, 0x4 mov r10, r6 mov r9, r6 -_08185BBE: +@08185BBE: movs r1, 0 mov r12, r1 lsls r5, r6, 2 @@ -752378,20 +752378,20 @@ _08185BBE: adds r0, 0x8 adds r1, r0 movs r3, 0x7 -_08185BDA: +@08185BDA: ldrb r0, [r2] strb r0, [r1] ldrb r0, [r2] cmp r0, 0xFF - bne _08185BE8 + bne @08185BE8 movs r0, 0x1 mov r12, r0 -_08185BE8: +@08185BE8: adds r2, 0x1 adds r1, 0x1 subs r3, 0x1 cmp r3, 0 - bge _08185BDA + bge @08185BDA movs r1, 0x9A lsls r1, 3 adds r0, r7, r1 @@ -752416,10 +752416,10 @@ _08185BE8: str r0, [r4] mov r3, r12 cmp r3, 0 - beq _08185C2A + beq @08185C2A ldr r0, [sp] bl sub_8009308 -_08185C2A: +@08185C2A: ldr r0, [sp] adds r0, 0x1C str r0, [sp] @@ -752430,7 +752430,7 @@ _08185C2A: add r9, r2 adds r6, 0x1 cmp r6, 0x3 - ble _08185BBE + ble @08185BBE ldr r1, =0x0203bd2c movs r3, 0x9D lsls r3, 3 @@ -752512,14 +752512,14 @@ _08185C2A: ldr r5, =0x0203ccd1 ldr r0, =0x00000504 adds r4, r7, r0 -_08185CE2: +@08185CE2: adds r0, r6, r5 adds r1, r4, r6 ldrb r1, [r1] strb r1, [r0] adds r6, 0x1 cmp r6, 0x7 - ble _08185CE2 + ble @08185CE2 ldr r1, =0x0000050c adds r0, r7, r1 ldrb r0, [r0] @@ -752542,14 +752542,14 @@ _08185CE2: adds r1, r7, r0 ldr r4, =0x0203ccdc movs r6, 0x5 -_08185D1C: +@08185D1C: ldrh r0, [r1] strh r0, [r4] adds r1, 0x2 adds r4, 0x2 subs r6, 0x1 cmp r6, 0 - bge _08185D1C + bge @08185D1C mov r1, r10 ldr r2, [r1] ldr r3, =0x000004fc @@ -752575,7 +752575,7 @@ _08185D1C: mov r8, r0 ldr r1, =0x0000051c adds r5, r7, r1 -_08185D5C: +@08185D5C: adds r2, r6, 0x1 mov r0, r8 muls r0, r6 @@ -752584,17 +752584,17 @@ _08185D5C: adds r4, r0, r3 mov r3, r10 adds r3, 0x1 -_08185D6C: +@08185D6C: ldrb r0, [r1] strb r0, [r4] adds r1, 0x1 adds r4, 0x1 subs r3, 0x1 cmp r3, 0 - bne _08185D6C + bne @08185D6C adds r6, r2, 0 cmp r6, 0x3 - ble _08185D5C + ble @08185D5C add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -752608,7 +752608,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 @@ -752617,7 +752617,7 @@ sub_8185E24: @ 8185E24 adds r4, r0, 0 bl start_ov_to_battle_anim cmp r0, 0x1 - bne _08185E6E + bne @08185E6E bl sub_8185EB8 adds r0, r4, 0 bl sub_8185B60 @@ -752639,7 +752639,7 @@ sub_8185E24: @ 8185E24 bl current_map_music_set__default_for_battle ldr r0, =sub_8185E8C + 1 bl set_callback2 -_08185E6E: +@08185E6E: adds r0, r4, 0 bl free pop {r4,r5} @@ -752650,7 +752650,7 @@ _08185E6E: thumb_func_end sub_8185E24 thumb_func_start sub_8185E8C -sub_8185E8C: @ 8185E8C +sub_8185E8C: ; 8185E8C push {lr} bl call_obj_callbacks bl obj_sync_something @@ -752660,7 +752660,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 @@ -752669,7 +752669,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 @@ -752678,11 +752678,11 @@ 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 -_08185EBE: +@08185EBE: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -752700,7 +752700,7 @@ _08185EBE: bl memcpy adds r5, 0x1 cmp r5, 0x5 - ble _08185EBE + ble @08185EBE pop {r4-r6} pop {r0} bx r0 @@ -752709,11 +752709,11 @@ _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 -_08185F02: +@08185F02: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -752731,7 +752731,7 @@ _08185F02: bl memcpy adds r5, 0x1 cmp r5, 0x5 - ble _08185F02 + ble @08185F02 pop {r4-r6} pop {r0} bx r0 @@ -752740,7 +752740,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 @@ -752749,38 +752749,38 @@ sub_8185F40: @ 8185F40 adds r4, r0, 0 ldrb r0, [r3] cmp r1, r0 - beq _08185F64 + beq @08185F64 adds r1, r4, 0 -_08185F54: +@08185F54: adds r1, 0x1C adds r2, 0x1 cmp r2, 0x3 - bgt _08185F64 + bgt @08185F64 ldrh r0, [r1, 0x18] ldrb r5, [r3] cmp r0, r5 - bne _08185F54 -_08185F64: + bne @08185F54 +@08185F64: cmp r2, 0x4 - bne _08185F74 + bne @08185F74 movs r0, 0 - b _08185F7E + b @08185F7E .align 2, 0 .pool -_08185F74: +@08185F74: lsls r0, r2, 3 subs r0, r2 lsls r0, 2 adds r0, r4 ldrb r0, [r0, 0x13] -_08185F7E: +@08185F7E: pop {r4,r5} pop {r1} bx r1 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] @@ -752790,7 +752790,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 @@ -752808,7 +752808,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 @@ -752817,7 +752817,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 @@ -752826,7 +752826,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 @@ -752835,7 +752835,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] @@ -752843,23 +752843,23 @@ sub_8185FD0: @ 8185FD0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0818601C + beq @0818601C ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x02000002 ands r0, r1 cmp r0, 0 - bne _0818601C + bne @0818601C ldr r0, =0x0203c7ac ldrb r0, [r0] cmp r0, 0x2 - beq _0818601C + beq @0818601C movs r3, 0 ldr r7, =0x0203cc70 adds r6, r4, 0 ldr r5, =0x02024090 movs r4, 0x58 -_08186000: +@08186000: lsls r2, r3, 1 ldrb r1, [r6] lsrs r0, r1, 1 @@ -752873,8 +752873,8 @@ _08186000: strh r1, [r0] adds r3, 0x1 cmp r3, 0x3 - ble _08186000 -_0818601C: + ble @08186000 +@0818601C: pop {r4-r7} pop {r0} bx r0 @@ -752883,7 +752883,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 @@ -752898,15 +752898,15 @@ sub_818603C: @ 818603C ldr r1, =0x02000002 ands r0, r1 cmp r0, 0 - beq _0818605C - b _081863FC -_0818605C: + beq @0818605C + b @081863FC +@0818605C: movs r0, 0 mov r10, r0 - b _081863F2 + b @081863F2 .align 2, 0 .pool -_0818606C: +@0818606C: mov r1, r10 lsls r4, r1, 24 lsrs r5, r4, 24 @@ -752919,12 +752919,12 @@ _0818606C: adds r2, 0x1 str r2, [sp, 0x38] cmp r0, 0x1 - bne _0818608A - b _081863EE -_0818608A: + bne @0818608A + b @081863EE +@0818608A: ldr r3, [sp, 0x24] cmp r3, 0x1 - bne _0818611E + bne @0818611E movs r5, 0 ldr r4, =0x0203cc70 mov r0, r10 @@ -752938,21 +752938,21 @@ _0818608A: muls r0, r1 ldr r3, =0x02024090 adds r1, r0, r3 -_081860AA: +@081860AA: ldrh r0, [r1] ldrh r4, [r2] cmp r0, r4 - bne _081860BC + bne @081860BC adds r2, 0x2 adds r1, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble _081860AA -_081860BC: + ble @081860AA +@081860BC: cmp r5, 0x4 - bne _081860C2 - b _081863EE -_081860C2: + bne @081860C2 + b @081863EE +@081860C2: ldr r1, [sp, 0x4C] lsrs r0, r1, 24 movs r1, 0x6 @@ -752966,7 +752966,7 @@ _081860C2: mov r4, r10 subs r0, r4, r6 asrs r4, r0, 1 -_081860DE: +@081860DE: movs r2, 0 lsls r0, r5, 1 adds r5, 0x1 @@ -752976,29 +752976,29 @@ _081860DE: lsls r0, r4, 3 mov r6, r8 adds r1, r0, r6 -_081860F0: +@081860F0: ldrh r0, [r3] ldrh r6, [r1] cmp r0, r6 - bne _08186110 + bne @08186110 lsls r1, r2, 24 lsrs r1, 24 ldr r2, [sp, 0x4C] lsrs r0, r2, 24 bl sub_8184FBC - b _08186118 + b @08186118 .align 2, 0 .pool -_08186110: +@08186110: adds r1, 0x2 adds r2, 0x1 cmp r2, 0x3 - ble _081860F0 -_08186118: + ble @081860F0 +@08186118: cmp r5, 0x3 - ble _081860DE - b _081863EE -_0818611E: + ble @081860DE + b @081863EE +@0818611E: ldr r3, =0x0203bd34 ldr r1, =0x0203c794 mov r4, r10 @@ -753015,9 +753015,9 @@ _0818611E: ldrb r0, [r0] str r2, [sp, 0x44] cmp r0, 0x6 - beq _08186142 - b _081863EE -_08186142: + beq @08186142 + b @081863EE +@08186142: adds r0, r5, 0 bl sub_8185054 movs r5, 0 @@ -753047,7 +753047,7 @@ _08186142: adds r6, r0, 0 adds r6, 0x3B movs r4, 0x3 -_0818617E: +@0818617E: mov r0, sp adds r3, r0, r5 ldrb r1, [r6] @@ -753059,7 +753059,7 @@ _0818617E: strb r1, [r3] adds r5, 0x1 cmp r5, 0x3 - ble _0818617E + ble @0818617E movs r5, 0 ldr r1, =0x02024084 mov r9, r1 @@ -753068,7 +753068,7 @@ _0818617E: muls r7, r2 ldr r4, [sp, 0x28] ldr r6, [sp, 0x30] -_081861A6: +@081861A6: ldr r3, [sp, 0x4C] lsrs r0, r3, 24 bl sub_8185054 @@ -753117,7 +753117,7 @@ _081861A6: adds r6, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble _081861A6 + ble @081861A6 movs r5, 0 movs r3, 0xC negs r3, r3 @@ -753135,7 +753135,7 @@ _081861A6: mov r7, r8 ldr r6, [sp, 0x34] ldr r2, [sp, 0x30] -_0818622C: +@0818622C: adds r1, r3, r7 ldrh r0, [r2] strh r0, [r1] @@ -753147,7 +753147,7 @@ _0818622C: adds r2, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble _0818622C + ble @0818622C movs r0, 0x58 mov r4, r10 muls r4, r0 @@ -753172,7 +753172,7 @@ _0818622C: adds r4, 0x3B ldr r0, =0x020242bc adds r6, r3, r0 -_08186274: +@08186274: ldr r2, [sp, 0x3C] adds r0, r2, r5 ldrb r0, [r0] @@ -753195,7 +753195,7 @@ _08186274: strb r0, [r6, 0x18] adds r5, 0x1 cmp r5, 0x3 - ble _08186274 + ble @08186274 movs r2, 0x58 mov r0, r10 muls r0, r2 @@ -753207,9 +753207,9 @@ _08186274: lsls r1, 14 ands r0, r1 cmp r0, 0 - beq _081862BC - b _081863CA -_081862BC: + beq @081862BC + b @081863CA +@081862BC: movs r5, 0 mov r3, sp adds r3, 0x20 @@ -753217,7 +753217,7 @@ _081862BC: ldr r0, =0x0202406e ldr r4, [sp, 0x44] adds r6, r4, r0 -_081862CA: +@081862CA: ldrh r1, [r6] movs r0, 0x64 muls r0, r1 @@ -753236,7 +753236,7 @@ _081862CA: strb r0, [r3] adds r5, 0x1 cmp r5, 0x3 - ble _081862CA + ble @081862CA movs r5, 0 ldr r0, =0x0202406e ldr r2, [sp, 0x44] @@ -753246,7 +753246,7 @@ _081862CA: mov r8, r4 ldr r4, [sp, 0x28] ldr r6, [sp, 0x30] -_08186304: +@08186304: ldrh r0, [r7] mov r1, r9 muls r1, r0 @@ -753279,7 +753279,7 @@ _08186304: adds r6, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble _08186304 + ble @08186304 movs r5, 0 ldr r0, =0x0202406e ldr r1, [sp, 0x44] @@ -753291,7 +753291,7 @@ _08186304: ldr r6, [sp, 0x30] adds r6, 0x8 ldr r4, [sp, 0x30] -_08186360: +@08186360: ldrh r0, [r7] mov r1, r9 muls r1, r0 @@ -753314,7 +753314,7 @@ _08186360: adds r4, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble _08186360 + ble @08186360 movs r0, 0 ldr r3, [sp, 0x40] strb r0, [r3] @@ -753323,7 +753323,7 @@ _08186360: ldr r6, =0x020244ec ldr r3, [sp, 0x3C] ldr r2, [sp, 0x40] -_081863A2: +@081863A2: adds r0, r3, r5 ldrb r1, [r0] lsls r0, r5, 1 @@ -753333,7 +753333,7 @@ _081863A2: strb r0, [r2] adds r5, 0x1 cmp r5, 0x3 - ble _081863A2 + ble @081863A2 ldr r1, [sp, 0x44] adds r0, r1, r4 ldrh r1, [r0] @@ -753343,7 +753343,7 @@ _081863A2: movs r1, 0x15 ldr r2, [sp, 0x40] bl pokemon_setattr -_081863CA: +@081863CA: ldr r2, =0x02024274 ldr r3, [sp, 0x44] adds r2, r3, r2 @@ -753362,16 +753362,16 @@ _081863CA: adds r0, r1 ldrh r0, [r0] strh r0, [r2] -_081863EE: +@081863EE: ldr r6, [sp, 0x38] mov r10, r6 -_081863F2: +@081863F2: ldr r0, =0x0202406c ldrb r0, [r0] cmp r10, r0 - bge _081863FC - b _0818606C -_081863FC: + bge @081863FC + b @0818606C +@081863FC: add sp, 0x50 pop {r3-r5} mov r8, r3 @@ -753385,7 +753385,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 @@ -753394,7 +753394,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] @@ -753404,15 +753404,15 @@ 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 ldrb r0, [r0] cmp r0, 0 - bne _0818645E + bne @0818645E movs r1, 0x1 -_0818645E: +@0818645E: adds r0, r1, 0 pop {r1} bx r1 @@ -753421,20 +753421,20 @@ _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 ldr r5, =0x03001278 ldr r4, =0x0203ccd1 -_08186472: +@08186472: adds r0, r3, r2 adds r1, r2, r4 ldrb r1, [r1] strb r1, [r0] adds r2, 0x1 cmp r2, 0x7 - ble _08186472 + ble @08186472 movs r0, 0xFF strb r0, [r3, 0x7] ldrb r1, [r5] @@ -753448,7 +753448,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 @@ -753457,7 +753457,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 @@ -753466,7 +753466,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 @@ -753475,7 +753475,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 @@ -753484,7 +753484,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] @@ -753495,7 +753495,7 @@ sub_81864CC: @ 81864CC thumb_func_end sub_81864CC thumb_func_start sub_81864E0 -sub_81864E0: @ 81864E0 +sub_81864E0: ; 81864E0 ldr r0, =0x0203ccdc bx lr .align 2, 0 @@ -753503,12 +753503,12 @@ sub_81864E0: @ 81864E0 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] @@ -753522,7 +753522,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, =0x0832a328 @@ -753534,31 +753534,31 @@ sub_8186508: @ 8186508 ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _08186554 + beq @08186554 ldr r0, =0x02023064 lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] cmp r0, 0x38 - bhi _08186550 + bhi @08186550 ldr r0, =0x0860ae90 ldrb r1, [r1] lsls r1, 2 adds r1, r0 ldr r0, [r1] bl _call_via_r0 - b _08186554 + b @08186554 .align 2, 0 .pool -_08186550: +@08186550: bl sub_81871AC -_08186554: +@08186554: pop {r0} bx r0 thumb_func_end sub_8186508 thumb_func_start sub_8186558 -sub_8186558: @ 8186558 +sub_8186558: ; 8186558 push {lr} ldr r2, =0x02020630 ldr r1, =0x020241e4 @@ -753574,9 +753574,9 @@ sub_8186558: @ 8186558 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _0818657C + bne @0818657C bl sub_81871AC -_0818657C: +@0818657C: pop {r0} bx r0 .align 2, 0 @@ -753584,7 +753584,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 @@ -753600,9 +753600,9 @@ sub_8186590: @ 8186590 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _081865B4 + bne @081865B4 bl sub_81871AC -_081865B4: +@081865B4: pop {r0} bx r0 .align 2, 0 @@ -753610,7 +753610,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 @@ -753627,7 +753627,7 @@ sub_81865C8: @ 81865C8 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _0818661A + bne @0818661A adds r0, r2, r5 ldrh r0, [r0, 0x6] bl sub_805DFE4 @@ -753648,7 +753648,7 @@ sub_81865C8: @ 81865C8 adds r0, r5 bl obj_delete_and_free_tiles bl sub_81871AC -_0818661A: +@0818661A: pop {r4-r6} pop {r0} bx r0 @@ -753657,7 +753657,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] @@ -753674,7 +753674,7 @@ sub_8186630: @ 8186630 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _08186668 + bne @08186668 ldr r0, [r4] ldrb r1, [r3] ldr r2, [r0, 0x4] @@ -753685,7 +753685,7 @@ sub_8186630: @ 8186630 movs r1, 0 strb r1, [r0, 0x9] bl sub_81871AC -_08186668: +@08186668: pop {r4} pop {r0} bx r0 @@ -753694,7 +753694,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 @@ -753704,18 +753704,18 @@ sub_8186678: @ 8186678 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _081866A4 + beq @081866A4 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _081866F8 + beq @081866F8 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _081866F8 -_081866A4: + beq @081866F8 +@081866A4: ldr r4, =0x02020630 ldr r0, =0x03005d70 ldr r2, =0x02024064 @@ -753732,7 +753732,7 @@ _081866A4: ldr r0, =nullsub_12 + 1 mov r8, r2 cmp r1, r0 - bne _08186764 + bne @08186764 ldr r0, =0x020241e4 adds r0, r3, r0 ldrb r1, [r0] @@ -753744,11 +753744,11 @@ _081866A4: ldrb r0, [r0] lsls r0, 27 cmp r0, 0 - bge _08186764 - b _0818676A + bge @08186764 + b @0818676A .align 2, 0 .pool -_081866F8: +@081866F8: ldr r6, =0x02020630 ldr r7, =0x03005d70 ldr r2, =0x02024064 @@ -753765,7 +753765,7 @@ _081866F8: ldr r0, =nullsub_12 + 1 mov r8, r2 cmp r4, r0 - bne _08186764 + bne @08186764 movs r0, 0x2 adds r2, r3, 0 eors r2, r0 @@ -753777,7 +753777,7 @@ _081866F8: adds r0, r5 ldr r0, [r0] cmp r0, r4 - bne _08186764 + bne @08186764 ldr r4, =0x020241e4 adds r0, r3, r4 ldrb r1, [r0] @@ -753789,7 +753789,7 @@ _081866F8: ldrb r0, [r0] lsls r0, 27 cmp r0, 0 - bge _08186764 + bge @08186764 adds r0, r2, r4 ldrb r1, [r0] lsls r0, r1, 4 @@ -753800,21 +753800,21 @@ _081866F8: ldrb r0, [r0] lsls r0, 27 cmp r0, 0 - bge _08186764 + bge @08186764 movs r1, 0x1 mov r9, r1 -_08186764: +@08186764: mov r2, r9 cmp r2, 0 - beq _0818683A -_0818676A: + beq @0818683A +@0818676A: mov r6, r8 ldrb r0, [r6] bl battle_get_per_side_status lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x1 - bne _08186816 + bne @08186816 ldr r0, =0x020244d0 mov r12, r0 ldr r0, [r0] @@ -753828,7 +753828,7 @@ _0818676A: adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _0818683A + beq @0818683A movs r7, 0x2 adds r1, r7, 0 eors r1, r2 @@ -753840,7 +753840,7 @@ _0818676A: adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _0818683A + beq @0818683A ldrb r1, [r4] movs r3, 0x7F adds r0, r3, 0 @@ -753891,7 +753891,7 @@ _0818676A: bl gpu_tile_obj_free_by_tag adds r0, r4, 0 bl gpu_pal_free_tag -_08186816: +@08186816: ldr r0, =0x020244d0 ldr r0, [r0] mov r2, r8 @@ -753910,7 +753910,7 @@ _08186816: adds r0, r1 ldr r1, =sub_8186630 + 1 str r1, [r0] -_0818683A: +@0818683A: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -753922,7 +753922,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 @@ -753944,7 +753944,7 @@ sub_818686C: @ 818686C adds r0, r5, 0 ands r0, r1 cmp r0, 0 - bne _081868AC + bne @081868AC ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] @@ -753954,7 +753954,7 @@ sub_818686C: @ 818686C adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 -_081868AC: +@081868AC: ldr r1, [r4] ldrb r0, [r7] movs r6, 0x2 @@ -753969,7 +753969,7 @@ _081868AC: adds r0, r5, 0 ands r0, r1 cmp r0, 0 - bne _081868DE + bne @081868DE ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] @@ -753979,7 +753979,7 @@ _081868AC: adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 -_081868DE: +@081868DE: ldr r0, [r4] ldrb r2, [r7] ldr r3, [r0, 0x4] @@ -753992,7 +753992,7 @@ _081868DE: adds r0, r5, 0 ands r0, r1 cmp r0, 0 - bne _081869AE + bne @081869AE adds r1, r6, 0 eors r1, r2 lsls r0, r1, 1 @@ -754003,22 +754003,22 @@ _081868DE: adds r0, r5, 0 ands r0, r1 cmp r0, 0 - bne _081869AE + bne @081869AE ldrb r1, [r4, 0x1] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08186994 + bne @08186994 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _08186964 + beq @08186964 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - bne _08186964 + bne @08186964 ldr r4, =0x03005d70 ldrb r0, [r7] adds r1, r6, 0 @@ -754043,7 +754043,7 @@ _081868DE: adds r0, r4 ldrb r0, [r0] bl sub_80729D0 -_08186964: +@08186964: ldr r5, =0x03005d70 ldr r4, =0x02024064 ldrb r1, [r4] @@ -754065,7 +754065,7 @@ _08186964: adds r0, r5 ldrb r0, [r0] bl sub_80729D0 -_08186994: +@08186994: ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -754079,7 +754079,7 @@ _08186994: movs r2, 0x80 orrs r1, r2 strb r1, [r0, 0x1] -_081869AE: +@081869AE: ldr r5, =0x020244d0 ldr r0, [r5] ldr r4, =0x02024064 @@ -754093,7 +754093,7 @@ _081869AE: movs r0, 0xC0 ands r0, r1 cmp r0, 0x80 - bne _08186A6A + bne @08186A6A movs r1, 0x2 eors r1, r2 lsls r0, r1, 1 @@ -754104,11 +754104,11 @@ _081869AE: movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _08186A6A + bne @08186A6A bl sub_80A36C8 lsls r0, 24 cmp r0, 0 - bne _08186A6A + bne @08186A6A ldr r0, [r5] ldrb r2, [r4] ldr r1, [r0, 0x4] @@ -754120,31 +754120,31 @@ _081869AE: movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _08186A4C + bne @08186A4C ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x42 ands r0, r1 cmp r0, 0x42 - bne _08186A40 + bne @08186A40 adds r0, r2, 0 bl battle_get_per_side_status lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08186A4C + bne @08186A4C ldr r0, =0x03007420 bl m4aMPlayContinue - b _08186A4C + b @08186A4C .align 2, 0 .pool -_08186A40: +@08186A40: ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl -_08186A4C: +@08186A4C: ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -754160,11 +754160,11 @@ _08186A4C: strb r1, [r0, 0x1] movs r0, 0x1 mov r9, r0 -_08186A6A: +@08186A6A: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - bne _08186AC8 + bne @08186AC8 ldr r2, =0x02020630 ldr r0, =0x03005d7c ldr r1, =0x02024064 @@ -754179,7 +754179,7 @@ _08186A6A: ldr r3, [r0] ldr r0, =nullsub_12 + 1 cmp r3, r0 - bne _08186B26 + bne @08186B26 ldr r0, =0x020241e4 adds r0, r4, r0 ldrb r1, [r0] @@ -754189,11 +754189,11 @@ _08186A6A: adds r0, r2 ldr r0, [r0] cmp r0, r3 - bne _08186B26 - b _08186B22 + bne @08186B26 + b @08186B22 .align 2, 0 .pool -_08186AC8: +@08186AC8: ldr r2, =0x02020630 ldr r7, =0x03005d7c ldr r0, =0x02024064 @@ -754208,7 +754208,7 @@ _08186AC8: ldr r4, [r0] ldr r0, =nullsub_12 + 1 cmp r4, r0 - bne _08186B26 + bne @08186B26 ldr r6, =0x020241e4 adds r0, r3, r6 ldrb r1, [r0] @@ -754218,7 +754218,7 @@ _08186AC8: adds r0, r2 ldr r5, [r0] cmp r5, r4 - bne _08186B26 + bne @08186B26 movs r0, 0x2 eors r3, r0 adds r0, r3, r7 @@ -754229,7 +754229,7 @@ _08186AC8: adds r0, r2 ldr r4, [r0] cmp r4, r5 - bne _08186B26 + bne @08186B26 adds r0, r3, r6 ldrb r1, [r0] lsls r0, r1, 4 @@ -754238,27 +754238,27 @@ _08186AC8: adds r0, r2 ldr r0, [r0] cmp r0, r4 - bne _08186B26 -_08186B22: + bne @08186B26 +@08186B22: movs r0, 0x1 mov r8, r0 -_08186B26: +@08186B26: mov r0, r9 cmp r0, 0 - beq _08186C10 + beq @08186C10 mov r0, r8 cmp r0, 0 - beq _08186C10 + beq @08186C10 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _08186B8A + beq @08186B8A ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - bne _08186B8A + bne @08186B8A ldr r1, =0x03005d7c ldr r5, =0x02024064 ldrb r0, [r5] @@ -754289,7 +754289,7 @@ _08186B26: lsrs r1, 16 adds r0, r4, 0 bl sub_805EE54 -_08186B8A: +@08186B8A: ldr r1, =0x03005d7c ldr r4, =0x02024064 ldrb r0, [r4] @@ -754354,7 +754354,7 @@ _08186B8A: adds r0, r1 ldr r1, =sub_8186678 + 1 str r1, [r0] -_08186C10: +@08186C10: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -754366,7 +754366,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 @@ -754383,12 +754383,12 @@ sub_8186C48: @ 8186C48 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _08186CFA + bne @08186CFA adds r0, r2, r4 movs r1, 0x24 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08186CFA + bne @08186CFA ldr r6, =0x020244d0 ldr r0, [r6] ldr r1, [r0, 0x4] @@ -754400,7 +754400,7 @@ sub_8186C48: @ 8186C48 movs r0, 0x80 ands r0, r5 cmp r0, 0 - bne _08186CC0 + bne @08186CC0 ldr r0, =0x0202406e adds r0, r4, r0 ldrh r1, [r0] @@ -754410,15 +754410,15 @@ sub_8186C48: @ 8186C48 adds r1, r0 adds r0, r3, 0 bl sub_8172EF0 - b _08186CFA + b @08186CFA .align 2, 0 .pool -_08186CC0: +@08186CC0: ldrb r1, [r2, 0x1] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08186CFA + beq @08186CFA movs r0, 0x7F ands r0, r5 strb r0, [r2] @@ -754440,7 +754440,7 @@ _08186CC0: adds r0, r4, 0 bl gpu_pal_free_tag bl sub_81871AC -_08186CFA: +@08186CFA: pop {r4-r7} pop {r0} bx r0 @@ -754449,7 +754449,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] @@ -754471,25 +754471,25 @@ sub_8186D04: @ 8186D04 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _08186D4C + beq @08186D4C ldrb r0, [r6] adds r0, r5 ldrb r0, [r0] movs r2, 0 bl heathbar_draw_hp - b _08186D50 + b @08186D50 .align 2, 0 .pool -_08186D4C: +@08186D4C: bl sub_81871AC -_08186D50: +@08186D50: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_8186D04 thumb_func_start sub_8186D58 -sub_8186D58: @ 8186D58 +sub_8186D58: ; 8186D58 push {lr} ldr r2, =0x02020630 ldr r0, =0x020241e4 @@ -754505,13 +754505,13 @@ sub_8186D58: @ 8186D58 ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - bne _08186D86 + bne @08186D86 ldr r0, =0x03005d70 adds r0, r3, r0 ldrb r0, [r0] bl sub_8072984 bl sub_81871AC -_08186D86: +@08186D86: pop {r0} bx r0 .align 2, 0 @@ -754519,7 +754519,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] @@ -754534,7 +754534,7 @@ sub_8186D9C: @ 8186D9C movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _08186DF6 + bne @08186DF6 ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] @@ -754560,7 +754560,7 @@ sub_8186D9C: @ 8186D9C ldrb r0, [r0] bl sub_8072984 bl sub_81871AC -_08186DF6: +@08186DF6: pop {r4-r6} pop {r0} bx r0 @@ -754569,21 +754569,21 @@ _08186DF6: thumb_func_end sub_8186D9C thumb_func_start sub_8186E10 -sub_8186E10: @ 8186E10 +sub_8186E10: ; 8186E10 push {lr} movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _08186E22 + bne @08186E22 bl sub_81871AC -_08186E22: +@08186E22: pop {r0} bx r0 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 @@ -754598,7 +754598,7 @@ bx_blink_t2: @ 8186E28 movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0x20 - bne _08186E74 + bne @08186E74 movs r3, 0 movs r0, 0 strh r0, [r4, 0x30] @@ -754611,15 +754611,15 @@ bx_blink_t2: @ 8186E28 ldr r0, =0x020244b9 strb r3, [r0] bl sub_81871AC - b _08186E9E + b @08186E9E .align 2, 0 .pool -_08186E74: +@08186E74: ldrh r0, [r4, 0x30] movs r1, 0x3 ands r0, r1 cmp r0, 0 - bne _08186E98 + bne @08186E98 adds r3, r4, 0 adds r3, 0x3E ldrb r2, [r3] @@ -754633,18 +754633,18 @@ _08186E74: ands r0, r2 orrs r0, r1 strb r0, [r3] -_08186E98: +@08186E98: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] -_08186E9E: +@08186E9E: pop {r4} pop {r0} bx r0 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 @@ -754660,7 +754660,7 @@ sub_8186EA4: @ 8186EA4 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _08186EF0 + bne @08186EF0 ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -754670,20 +754670,20 @@ sub_8186EA4: @ 8186EA4 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08186EE4 + beq @08186EE4 adds r0, r3, 0 adds r1, r3, 0 adds r2, r3, 0 movs r3, 0x6 bl move_anim_start_t4 -_08186EE4: +@08186EE4: ldr r0, =0x03005d60 ldrb r1, [r4] lsls r1, 2 adds r1, r0 ldr r0, =sub_8186F14 + 1 str r0, [r1] -_08186EF0: +@08186EF0: pop {r4} pop {r0} bx r0 @@ -754692,7 +754692,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] @@ -754707,11 +754707,11 @@ sub_8186F14: @ 8186F14 movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _08186F6E + bne @08186F6E bl sub_80A36C8 lsls r0, 24 cmp r0, 0 - bne _08186F6E + bne @08186F6E ldr r2, =0x02020630 ldr r1, =0x020241e4 ldrb r0, [r4] @@ -754725,18 +754725,18 @@ sub_8186F14: @ 8186F14 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - beq _08186F5E + beq @08186F5E ldr r0, =nullsub_18 + 1 cmp r1, r0 - bne _08186F6E -_08186F5E: + bne @08186F6E +@08186F5E: ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl bl sub_81871AC -_08186F6E: +@08186F6E: pop {r4} pop {r0} bx r0 @@ -754745,7 +754745,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] @@ -754760,7 +754760,7 @@ sub_8186F94: @ 8186F94 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08187050 + beq @08187050 ldr r7, =0x02020630 ldr r6, =0x020241e4 adds r0, r2, r6 @@ -754774,7 +754774,7 @@ sub_8186F94: @ 8186F94 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _08187050 + bne @08187050 ldrb r1, [r3] movs r0, 0x7F ands r0, r1 @@ -754833,7 +754833,7 @@ sub_8186F94: @ 8186F94 adds r0, r1 ldr r1, =sub_8186EA4 + 1 str r1, [r0] -_08187050: +@08187050: pop {r4-r7} pop {r0} bx r0 @@ -754842,7 +754842,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] @@ -754857,7 +754857,7 @@ sub_8187084: @ 8187084 movs r0, 0x88 ands r0, r1 cmp r0, 0 - bne _081870B6 + bne @081870B6 ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] @@ -754867,7 +754867,7 @@ sub_8187084: @ 8187084 adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 -_081870B6: +@081870B6: ldr r4, =0x02020630 ldr r0, =0x03005d7c ldrb r2, [r5] @@ -754882,7 +754882,7 @@ _081870B6: ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _08187120 + bne @08187120 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -754893,7 +754893,7 @@ _081870B6: movs r0, 0x8 ands r0, r1 cmp r0, 0 - bne _08187120 + bne @08187120 adds r0, r3, r4 bl obj_delete_and_free_tiles ldrb r4, [r5] @@ -754918,7 +754918,7 @@ _081870B6: adds r0, r1 ldr r1, =sub_8186F94 + 1 str r1, [r0] -_08187120: +@08187120: pop {r4-r6} pop {r0} bx r0 @@ -754927,7 +754927,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] @@ -754942,9 +754942,9 @@ sub_818714C: @ 818714C movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _0818716E + bne @0818716E bl sub_81871AC -_0818716E: +@0818716E: pop {r0} bx r0 .align 2, 0 @@ -754952,7 +754952,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] @@ -754967,9 +754967,9 @@ sub_818717C: @ 818717C movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _0818719E + bne @0818719E bl sub_81871AC -_0818719E: +@0818719E: pop {r0} bx r0 .align 2, 0 @@ -754977,7 +754977,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 @@ -754992,7 +754992,7 @@ sub_81871AC: @ 81871AC movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _08187200 + beq @08187200 bl link_get_multiplayer_id mov r1, sp strb r0, [r1] @@ -755006,10 +755006,10 @@ sub_81871AC: @ 81871AC adds r0, r1 movs r1, 0x38 strb r1, [r0] - b _08187212 + b @08187212 .align 2, 0 .pool -_08187200: +@08187200: ldr r2, =0x02024068 ldr r1, =0x0832a328 ldrb r0, [r4] @@ -755019,7 +755019,7 @@ _08187200: ldr r0, [r2] bics r0, r1 str r0, [r2] -_08187212: +@08187212: add sp, 0x4 pop {r4} pop {r0} @@ -755029,7 +755029,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 @@ -755041,7 +755041,7 @@ sub_8187224: @ 8187224 adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0 - bne _0818725C + bne @0818725C ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 @@ -755049,29 +755049,29 @@ sub_8187224: @ 8187224 mov r1, sp bl sub_8187298 adds r6, r0, 0 - b _0818727E + b @0818727E .align 2, 0 .pool -_0818725C: +@0818725C: ldrb r4, [r1] movs r5, 0 -_08187260: +@08187260: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _08187276 + beq @08187276 lsls r0, r5, 24 lsrs r0, 24 mov r2, sp adds r1, r2, r6 bl sub_8187298 adds r6, r0 -_08187276: +@08187276: lsrs r4, 1 adds r5, 0x1 cmp r5, 0x5 - ble _08187260 -_0818727E: + ble @08187260 +@0818727E: lsls r1, r6, 16 lsrs r1, 16 movs r0, 0x1 @@ -755085,7 +755085,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 @@ -755104,79 +755104,79 @@ sub_8187298: @ 8187298 adds r0, r1 ldrb r0, [r0] cmp r0, 0x3B - bls _081872C2 - bl _08187A2E -_081872C2: + bls @081872C2 + bl @08187A2E +@081872C2: lsls r0, 2 - ldr r1, =_081872D8 + ldr r1, =@081872D8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081872D8: - .4byte _081873C8 - .4byte _081875EC - .4byte _081875FC - .4byte _0818760C - .4byte _08187674 - .4byte _08187674 - .4byte _08187674 - .4byte _08187674 - .4byte _08187690 - .4byte _081876CC - .4byte _081876CC - .4byte _081876CC - .4byte _081876CC - .4byte _08187A2E - .4byte _08187A2E - .4byte _08187A2E - .4byte _08187A2E - .4byte _081876E8 - .4byte _081876F8 - .4byte _08187728 - .4byte _08187738 - .4byte _08187748 - .4byte _08187758 - .4byte _08187768 - .4byte _08187778 - .4byte _08187788 - .4byte _08187798 - .4byte _081877A8 - .4byte _081877B8 - .4byte _081877C8 - .4byte _081877D8 - .4byte _081877E8 - .4byte _08187838 - .4byte _08187848 - .4byte _08187858 - .4byte _08187868 - .4byte _08187878 - .4byte _08187888 - .4byte _08187898 - .4byte _081878A8 - .4byte _081878B8 - .4byte _081878EC - .4byte _081878FC - .4byte _0818790C - .4byte _0818791C - .4byte _0818792C - .4byte _0818793C - .4byte _0818794C - .4byte _0818795C - .4byte _0818797C - .4byte _0818798C - .4byte _0818799C - .4byte _081879AC - .4byte _081879BC - .4byte _081879CC - .4byte _081879DC - .4byte _081879EC - .4byte _081879FC - .4byte _08187A0C - .4byte _08187A1C -_081873C8: +@081872D8: + .4byte @081873C8 + .4byte @081875EC + .4byte @081875FC + .4byte @0818760C + .4byte @08187674 + .4byte @08187674 + .4byte @08187674 + .4byte @08187674 + .4byte @08187690 + .4byte @081876CC + .4byte @081876CC + .4byte @081876CC + .4byte @081876CC + .4byte @08187A2E + .4byte @08187A2E + .4byte @08187A2E + .4byte @08187A2E + .4byte @081876E8 + .4byte @081876F8 + .4byte @08187728 + .4byte @08187738 + .4byte @08187748 + .4byte @08187758 + .4byte @08187768 + .4byte @08187778 + .4byte @08187788 + .4byte @08187798 + .4byte @081877A8 + .4byte @081877B8 + .4byte @081877C8 + .4byte @081877D8 + .4byte @081877E8 + .4byte @08187838 + .4byte @08187848 + .4byte @08187858 + .4byte @08187868 + .4byte @08187878 + .4byte @08187888 + .4byte @08187898 + .4byte @081878A8 + .4byte @081878B8 + .4byte @081878EC + .4byte @081878FC + .4byte @0818790C + .4byte @0818791C + .4byte @0818792C + .4byte @0818793C + .4byte @0818794C + .4byte @0818795C + .4byte @0818797C + .4byte @0818798C + .4byte @0818799C + .4byte @081879AC + .4byte @081879BC + .4byte @081879CC + .4byte @081879DC + .4byte @081879EC + .4byte @081879FC + .4byte @08187A0C + .4byte @08187A1C +@081873C8: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -755213,7 +755213,7 @@ _081873C8: str r0, [sp, 0x88] mov r8, r4 add r4, sp, 0xC -_08187414: +@08187414: adds r1, r6, 0 adds r1, 0xD mov r0, r8 @@ -755229,7 +755229,7 @@ _08187414: adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble _08187414 + ble @08187414 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -755407,36 +755407,36 @@ _08187414: bl pokemon_getattr mov r2, sp movs r6, 0 -_081875CC: +@081875CC: adds r0, r7, r6 adds r1, r2, r6 ldrb r1, [r1] strb r1, [r0] adds r6, 0x1 cmp r6, 0x57 - bls _081875CC - b _08187A2E + bls @081875CC + b @08187A2E .align 2, 0 .pool -_081875EC: +@081875EC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB - b _08187966 + b @08187966 .align 2, 0 .pool -_081875FC: +@081875FC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0xC - b _08187966 + b @08187966 .align 2, 0 .pool -_0818760C: +@0818760C: movs r6, 0 add r2, sp, 0x58 mov r9, r2 @@ -755448,7 +755448,7 @@ _0818760C: ldr r0, =0x02024744 adds r4, r1, r0 mov r8, r9 -_08187622: +@08187622: adds r1, r6, 0 adds r1, 0xD adds r0, r4, 0 @@ -755466,7 +755466,7 @@ _08187622: add r8, r0 adds r6, 0x1 cmp r6, 0x3 - ble _08187622 + ble @08187622 movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -755477,18 +755477,18 @@ _08187622: strb r0, [r1, 0xC] mov r2, r9 movs r6, 0 -_08187660: +@08187660: adds r0, r7, r6 adds r1, r2, r6 ldrb r1, [r1] strb r1, [r0] adds r6, 0x1 cmp r6, 0xF - bls _08187660 - b _08187A2E + bls @08187660 + b @08187A2E .align 2, 0 .pool -_08187674: +@08187674: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -755499,17 +755499,17 @@ _08187674: adds r1, r2 ldrb r1, [r1] adds r1, 0x9 - b _08187966 + b @08187966 .align 2, 0 .pool -_08187690: +@08187690: movs r6, 0 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 ldr r2, =0x02024744 mov r8, r2 -_0818769C: +@0818769C: adds r1, r6, 0 adds r1, 0x11 mov r2, r8 @@ -755519,7 +755519,7 @@ _0818769C: strb r0, [r1] adds r6, 0x1 cmp r6, 0x3 - ble _0818769C + ble @0818769C movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -755529,10 +755529,10 @@ _0818769C: adds r1, r7, r6 strb r0, [r1] adds r6, 0x1 - b _08187A2E + b @08187A2E .align 2, 0 .pool -_081876CC: +@081876CC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -755543,25 +755543,25 @@ _081876CC: adds r1, r2 ldrb r1, [r1] adds r1, 0x8 - b _08187A26 + b @08187A26 .align 2, 0 .pool -_081876E8: +@081876E8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1 - b _08187702 + b @08187702 .align 2, 0 .pool -_081876F8: +@081876F8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x19 -_08187702: +@08187702: bl pokemon_getattr adds r1, r0, 0 strb r1, [r7] @@ -755576,118 +755576,118 @@ _08187702: lsrs r0, 16 strb r0, [r7, 0x2] movs r6, 0x3 - b _08187A2E + b @08187A2E .align 2, 0 .pool -_08187728: +@08187728: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1A - b _08187A26 + b @08187A26 .align 2, 0 .pool -_08187738: +@08187738: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1B - b _08187A26 + b @08187A26 .align 2, 0 .pool -_08187748: +@08187748: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1C - b _08187A26 + b @08187A26 .align 2, 0 .pool -_08187758: +@08187758: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1D - b _08187A26 + b @08187A26 .align 2, 0 .pool -_08187768: +@08187768: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1E - b _08187A26 + b @08187A26 .align 2, 0 .pool -_08187778: +@08187778: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1F - b _08187A26 + b @08187A26 .align 2, 0 .pool -_08187788: +@08187788: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x20 - b _08187A26 + b @08187A26 .align 2, 0 .pool -_08187798: +@08187798: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x22 - b _08187A26 + b @08187A26 .align 2, 0 .pool -_081877A8: +@081877A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x23 - b _08187A26 + b @08187A26 .align 2, 0 .pool -_081877B8: +@081877B8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x24 - b _08187A26 + b @08187A26 .align 2, 0 .pool -_081877C8: +@081877C8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x25 - b _08187A26 + b @08187A26 .align 2, 0 .pool -_081877D8: +@081877D8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x26 - b _08187A26 + b @08187A26 .align 2, 0 .pool -_081877E8: +@081877E8: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -755718,88 +755718,88 @@ _081877E8: bl pokemon_getattr strb r0, [r7, 0x5] movs r6, 0x6 - b _08187A2E + b @08187A2E .align 2, 0 .pool -_08187838: +@08187838: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x27 - b _08187A26 + b @08187A26 .align 2, 0 .pool -_08187848: +@08187848: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x28 - b _08187A26 + b @08187A26 .align 2, 0 .pool -_08187858: +@08187858: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x29 - b _08187A26 + b @08187A26 .align 2, 0 .pool -_08187868: +@08187868: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2A - b _08187A26 + b @08187A26 .align 2, 0 .pool -_08187878: +@08187878: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2B - b _08187A26 + b @08187A26 .align 2, 0 .pool -_08187888: +@08187888: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2C - b _08187A26 + b @08187A26 .align 2, 0 .pool -_08187898: +@08187898: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0 - b _081878C2 + b @081878C2 .align 2, 0 .pool -_081878A8: +@081878A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x9 - b _08187966 + b @08187966 .align 2, 0 .pool -_081878B8: +@081878B8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x37 -_081878C2: +@081878C2: bl pokemon_getattr adds r1, r0, 0 strb r1, [r7] @@ -755816,79 +755816,79 @@ _081878C2: lsrs r0, r1, 24 strb r0, [r7, 0x3] movs r6, 0x4 - b _08187A2E + b @08187A2E .align 2, 0 .pool -_081878EC: +@081878EC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x38 - b _08187A26 + b @08187A26 .align 2, 0 .pool -_081878FC: +@081878FC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x39 - b _08187966 + b @08187966 .align 2, 0 .pool -_0818790C: +@0818790C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3A - b _08187966 + b @08187966 .align 2, 0 .pool -_0818791C: +@0818791C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3B - b _08187966 + b @08187966 .align 2, 0 .pool -_0818792C: +@0818792C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3C - b _08187966 + b @08187966 .align 2, 0 .pool -_0818793C: +@0818793C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3D - b _08187966 + b @08187966 .align 2, 0 .pool -_0818794C: +@0818794C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3E - b _08187966 + b @08187966 .align 2, 0 .pool -_0818795C: +@0818795C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3F -_08187966: +@08187966: bl pokemon_getattr lsls r0, 16 lsrs r0, 16 @@ -755896,110 +755896,110 @@ _08187966: lsrs r0, 8 strb r0, [r7, 0x1] movs r6, 0x2 - b _08187A2E + b @08187A2E .align 2, 0 .pool -_0818797C: +@0818797C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x16 - b _08187A26 + b @08187A26 .align 2, 0 .pool -_0818798C: +@0818798C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x17 - b _08187A26 + b @08187A26 .align 2, 0 .pool -_0818799C: +@0818799C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x18 - b _08187A26 + b @08187A26 .align 2, 0 .pool -_081879AC: +@081879AC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x21 - b _08187A26 + b @08187A26 .align 2, 0 .pool -_081879BC: +@081879BC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2F - b _08187A26 + b @08187A26 .align 2, 0 .pool -_081879CC: +@081879CC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x30 - b _08187A26 + b @08187A26 .align 2, 0 .pool -_081879DC: +@081879DC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x32 - b _08187A26 + b @08187A26 .align 2, 0 .pool -_081879EC: +@081879EC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x33 - b _08187A26 + b @08187A26 .align 2, 0 .pool -_081879FC: +@081879FC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x34 - b _08187A26 + b @08187A26 .align 2, 0 .pool -_08187A0C: +@08187A0C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x35 - b _08187A26 + b @08187A26 .align 2, 0 .pool -_08187A1C: +@08187A1C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x36 -_08187A26: +@08187A26: bl pokemon_getattr strb r0, [r7] movs r6, 0x1 -_08187A2E: +@08187A2E: adds r0, r6, 0 add sp, 0x90 pop {r3-r5} @@ -756014,7 +756014,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} @@ -756022,7 +756022,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 @@ -756032,33 +756032,33 @@ sub_8187A50: @ 8187A50 adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0 - bne _08187A80 + bne @08187A80 ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] bl dp01_setattr_for_opponent_pokemon - b _08187A9E + b @08187A9E .align 2, 0 .pool -_08187A80: +@08187A80: ldrb r4, [r1] movs r5, 0 -_08187A84: +@08187A84: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _08187A92 + beq @08187A92 adds r0, r5, 0 bl dp01_setattr_for_opponent_pokemon -_08187A92: +@08187A92: lsrs r4, 1 adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls _08187A84 -_08187A9E: + bls @08187A84 +@08187A9E: bl sub_81871AC pop {r4,r5} pop {r0} @@ -756066,7 +756066,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 @@ -756087,79 +756087,79 @@ dp01_setattr_for_opponent_pokemon: @ 8187AA8 adds r6, r3, 0 adds r3, r2, 0 cmp r0, 0x3B - bls _08187AD6 - bl _081883B4 -_08187AD6: + bls @08187AD6 + bl @081883B4 +@08187AD6: lsls r0, 2 - ldr r1, =_08187AEC + ldr r1, =@08187AEC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08187AEC: - .4byte _08187BDC - .4byte _08187D74 - .4byte _08187D90 - .4byte _08187DAC - .4byte _08187E00 - .4byte _08187E00 - .4byte _08187E00 - .4byte _08187E00 - .4byte _08187E20 - .4byte _08187E88 - .4byte _08187E88 - .4byte _08187E88 - .4byte _08187E88 - .4byte _081883B4 - .4byte _081883B4 - .4byte _081883B4 - .4byte _081883B4 - .4byte _08187EB0 - .4byte _08187ECC - .4byte _08187EE8 - .4byte _08187F04 - .4byte _08187F20 - .4byte _08187F3C - .4byte _08187F58 - .4byte _08187F74 - .4byte _08187F90 - .4byte _08187FAC - .4byte _08187FC8 - .4byte _08187FE4 - .4byte _08188000 - .4byte _0818801C - .4byte _08188038 - .4byte _081880AC - .4byte _081880C8 - .4byte _081880E4 - .4byte _08188100 - .4byte _0818811C - .4byte _08188138 - .4byte _08188154 - .4byte _08188170 - .4byte _0818818C - .4byte _081881A8 - .4byte _081881C4 - .4byte _081881E0 - .4byte _081881FC - .4byte _08188218 - .4byte _08188234 - .4byte _08188250 - .4byte _0818826C - .4byte _08188288 - .4byte _081882A4 - .4byte _081882C0 - .4byte _081882DC - .4byte _081882F8 - .4byte _08188314 - .4byte _08188330 - .4byte _0818834C - .4byte _08188368 - .4byte _08188384 - .4byte _081883A0 -_08187BDC: +@08187AEC: + .4byte @08187BDC + .4byte @08187D74 + .4byte @08187D90 + .4byte @08187DAC + .4byte @08187E00 + .4byte @08187E00 + .4byte @08187E00 + .4byte @08187E00 + .4byte @08187E20 + .4byte @08187E88 + .4byte @08187E88 + .4byte @08187E88 + .4byte @08187E88 + .4byte @081883B4 + .4byte @081883B4 + .4byte @081883B4 + .4byte @081883B4 + .4byte @08187EB0 + .4byte @08187ECC + .4byte @08187EE8 + .4byte @08187F04 + .4byte @08187F20 + .4byte @08187F3C + .4byte @08187F58 + .4byte @08187F74 + .4byte @08187F90 + .4byte @08187FAC + .4byte @08187FC8 + .4byte @08187FE4 + .4byte @08188000 + .4byte @0818801C + .4byte @08188038 + .4byte @081880AC + .4byte @081880C8 + .4byte @081880E4 + .4byte @08188100 + .4byte @0818811C + .4byte @08188138 + .4byte @08188154 + .4byte @08188170 + .4byte @0818818C + .4byte @081881A8 + .4byte @081881C4 + .4byte @081881E0 + .4byte @081881FC + .4byte @08188218 + .4byte @08188234 + .4byte @08188250 + .4byte @0818826C + .4byte @08188288 + .4byte @081882A4 + .4byte @081882C0 + .4byte @081882DC + .4byte @081882F8 + .4byte @08188314 + .4byte @08188330 + .4byte @0818834C + .4byte @08188368 + .4byte @08188384 + .4byte @081883A0 +@08187BDC: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -756209,7 +756209,7 @@ _08187BDC: adds r6, 0x24 adds r4, r7, 0 adds r4, 0xC -_08187C42: +@08187C42: mov r1, r8 adds r1, 0xD mov r0, r9 @@ -756226,7 +756226,7 @@ _08187C42: add r8, r0 mov r0, r8 cmp r0, 0x3 - ble _08187C42 + ble @08187C42 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -756338,10 +756338,10 @@ _08187C42: movs r1, 0x3F ldr r2, [sp, 0x14] bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08187D74: +@08187D74: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756351,10 +756351,10 @@ _08187D74: adds r2, r3 movs r1, 0xB bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08187D90: +@08187D90: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756364,10 +756364,10 @@ _08187D90: adds r2, r3 movs r1, 0xC bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08187DAC: +@08187DAC: movs r0, 0 mov r8, r0 movs r0, 0xC @@ -756380,7 +756380,7 @@ _08187DAC: adds r7, r1, r0 adds r6, r4, 0 adds r6, 0x8 -_08187DC4: +@08187DC4: mov r1, r8 adds r1, 0xD adds r0, r7, 0 @@ -756397,7 +756397,7 @@ _08187DC4: add r8, r0 mov r0, r8 cmp r0, 0x3 - ble _08187DC4 + ble @08187DC4 movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756405,10 +756405,10 @@ _08187DC4: movs r1, 0x15 mov r2, r9 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08187E00: +@08187E00: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756420,10 +756420,10 @@ _08187E00: adds r1, r2, r1 ldrb r1, [r1] adds r1, 0x9 - b _08187E9E + b @08187E9E .align 2, 0 .pool -_08187E20: +@08187E20: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -756468,10 +756468,10 @@ _08187E20: adds r0, r4, 0 movs r1, 0x15 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08187E88: +@08187E88: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756483,14 +756483,14 @@ _08187E88: adds r1, r2, r1 ldrb r1, [r1] adds r1, 0x8 -_08187E9E: +@08187E9E: adds r3, 0x3 adds r2, r3 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08187EB0: +@08187EB0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756500,10 +756500,10 @@ _08187EB0: adds r2, r3 movs r1, 0x1 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08187ECC: +@08187ECC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756513,10 +756513,10 @@ _08187ECC: adds r2, r3 movs r1, 0x19 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08187EE8: +@08187EE8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756526,10 +756526,10 @@ _08187EE8: adds r2, r3 movs r1, 0x1A bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08187F04: +@08187F04: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756539,10 +756539,10 @@ _08187F04: adds r2, r3 movs r1, 0x1B bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08187F20: +@08187F20: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756552,10 +756552,10 @@ _08187F20: adds r2, r3 movs r1, 0x1C bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08187F3C: +@08187F3C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756565,10 +756565,10 @@ _08187F3C: adds r2, r3 movs r1, 0x1D bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08187F58: +@08187F58: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756578,10 +756578,10 @@ _08187F58: adds r2, r3 movs r1, 0x1E bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08187F74: +@08187F74: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756591,10 +756591,10 @@ _08187F74: adds r2, r3 movs r1, 0x1F bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08187F90: +@08187F90: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756604,10 +756604,10 @@ _08187F90: adds r2, r3 movs r1, 0x20 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08187FAC: +@08187FAC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756617,10 +756617,10 @@ _08187FAC: adds r2, r3 movs r1, 0x22 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08187FC8: +@08187FC8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756630,10 +756630,10 @@ _08187FC8: adds r2, r3 movs r1, 0x23 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08187FE4: +@08187FE4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756643,10 +756643,10 @@ _08187FE4: adds r2, r3 movs r1, 0x24 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08188000: +@08188000: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756656,10 +756656,10 @@ _08188000: adds r2, r3 movs r1, 0x25 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_0818801C: +@0818801C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756669,10 +756669,10 @@ _0818801C: adds r2, r3 movs r1, 0x26 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08188038: +@08188038: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -756723,10 +756723,10 @@ _08188038: adds r0, r3, 0x5 adds r2, r0 adds r0, r4, 0 - b _08188146 + b @08188146 .align 2, 0 .pool -_081880AC: +@081880AC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756736,10 +756736,10 @@ _081880AC: adds r2, r3 movs r1, 0x27 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_081880C8: +@081880C8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756749,10 +756749,10 @@ _081880C8: adds r2, r3 movs r1, 0x28 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_081880E4: +@081880E4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756762,10 +756762,10 @@ _081880E4: adds r2, r3 movs r1, 0x29 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08188100: +@08188100: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756775,10 +756775,10 @@ _08188100: adds r2, r3 movs r1, 0x2A bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_0818811C: +@0818811C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756788,10 +756788,10 @@ _0818811C: adds r2, r3 movs r1, 0x2B bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08188138: +@08188138: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756799,13 +756799,13 @@ _08188138: ldrb r2, [r6] lsls r2, 9 adds r2, r3 -_08188146: +@08188146: movs r1, 0x2C bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08188154: +@08188154: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756815,10 +756815,10 @@ _08188154: adds r2, r3 movs r1, 0 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08188170: +@08188170: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756828,10 +756828,10 @@ _08188170: adds r2, r3 movs r1, 0x9 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_0818818C: +@0818818C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756841,10 +756841,10 @@ _0818818C: adds r2, r3 movs r1, 0x37 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_081881A8: +@081881A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756854,10 +756854,10 @@ _081881A8: adds r2, r3 movs r1, 0x38 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_081881C4: +@081881C4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756867,10 +756867,10 @@ _081881C4: adds r2, r3 movs r1, 0x39 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_081881E0: +@081881E0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756880,10 +756880,10 @@ _081881E0: adds r2, r3 movs r1, 0x3A bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_081881FC: +@081881FC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756893,10 +756893,10 @@ _081881FC: adds r2, r3 movs r1, 0x3B bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08188218: +@08188218: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756906,10 +756906,10 @@ _08188218: adds r2, r3 movs r1, 0x3C bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08188234: +@08188234: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756919,10 +756919,10 @@ _08188234: adds r2, r3 movs r1, 0x3D bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08188250: +@08188250: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756932,10 +756932,10 @@ _08188250: adds r2, r3 movs r1, 0x3E bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_0818826C: +@0818826C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756945,10 +756945,10 @@ _0818826C: adds r2, r3 movs r1, 0x3F bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08188288: +@08188288: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756958,10 +756958,10 @@ _08188288: adds r2, r3 movs r1, 0x16 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_081882A4: +@081882A4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756971,10 +756971,10 @@ _081882A4: adds r2, r3 movs r1, 0x17 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_081882C0: +@081882C0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756984,10 +756984,10 @@ _081882C0: adds r2, r3 movs r1, 0x18 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_081882DC: +@081882DC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -756997,10 +756997,10 @@ _081882DC: adds r2, r3 movs r1, 0x21 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_081882F8: +@081882F8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -757010,10 +757010,10 @@ _081882F8: adds r2, r3 movs r1, 0x2F bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08188314: +@08188314: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -757023,10 +757023,10 @@ _08188314: adds r2, r3 movs r1, 0x30 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08188330: +@08188330: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -757036,10 +757036,10 @@ _08188330: adds r2, r3 movs r1, 0x32 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_0818834C: +@0818834C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -757049,10 +757049,10 @@ _0818834C: adds r2, r3 movs r1, 0x33 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08188368: +@08188368: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -757062,10 +757062,10 @@ _08188368: adds r2, r3 movs r1, 0x34 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_08188384: +@08188384: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -757075,10 +757075,10 @@ _08188384: adds r2, r3 movs r1, 0x35 bl pokemon_setattr - b _081883B4 + b @081883B4 .align 2, 0 .pool -_081883A0: +@081883A0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -757088,7 +757088,7 @@ _081883A0: adds r2, r3 movs r1, 0x36 bl pokemon_setattr -_081883B4: +@081883B4: add sp, 0x38 pop {r3-r5} mov r8, r3 @@ -757102,7 +757102,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 @@ -757126,11 +757126,11 @@ sub_81883C8: @ 81883C8 adds r2, r0 ldrb r2, [r2] cmp r3, r2 - bcs _08188420 + bcs @08188420 adds r6, r4, 0 adds r2, r7, 0 adds r4, r0, 0 -_081883FE: +@081883FE: adds r1, r5, r3 ldrb r0, [r2] lsls r0, 9 @@ -757147,8 +757147,8 @@ _081883FE: adds r0, r4 ldrb r0, [r0] cmp r3, r0 - bcc _081883FE -_08188420: + bcc @081883FE +@08188420: bl sub_81871AC pop {r4-r7} pop {r0} @@ -757158,7 +757158,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 @@ -757300,7 +757300,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 @@ -757333,7 +757333,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 @@ -757507,7 +757507,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 @@ -757517,7 +757517,7 @@ sub_8188768: @ 8188768 adds r0, r1 ldrb r3, [r0] cmp r3, 0 - bne _081887B0 + bne @081887B0 ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -757532,10 +757532,10 @@ sub_8188768: @ 8188768 adds r0, r1 ldr r1, =sub_8188800 + 1 str r1, [r0] - b _081887EC + b @081887EC .align 2, 0 .pool -_081887B0: +@081887B0: ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] @@ -757561,7 +757561,7 @@ _081887B0: ldrb r0, [r0] bl sub_8072984 bl sub_81871AC -_081887EC: +@081887EC: pop {r4-r6} pop {r0} bx r0 @@ -757570,7 +757570,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] @@ -757583,13 +757583,13 @@ sub_8188800: @ 8188800 adds r3, r0, r1 ldrb r0, [r3, 0x4] cmp r0, 0 - beq _08188828 + beq @08188828 cmp r0, 0x1 - beq _08188856 - b _0818887E + beq @08188856 + b @0818887E .align 2, 0 .pool -_08188828: +@08188828: ldr r1, [r4] lsls r0, r2, 2 adds r0, r1 @@ -757597,12 +757597,12 @@ _08188828: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08188842 + beq @08188842 adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -_08188842: +@08188842: ldr r0, [r6] ldrb r1, [r5] ldr r2, [r0, 0x4] @@ -757612,15 +757612,15 @@ _08188842: adds r0, r2 movs r1, 0x1 strb r1, [r0, 0x4] - b _0818887E -_08188856: + b @0818887E +@08188856: ldrb r1, [r3] movs r0, 0x40 ands r0, r1 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _0818887E + bne @0818887E strb r0, [r3, 0x4] ldrb r2, [r5] adds r0, r2, 0 @@ -757633,7 +757633,7 @@ _08188856: adds r0, r1 ldr r1, =sub_8186D9C + 1 str r1, [r0] -_0818887E: +@0818887E: pop {r4-r6} pop {r0} bx r0 @@ -757642,7 +757642,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 @@ -757652,7 +757652,7 @@ sub_818888C: @ 818888C movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _081888F6 + beq @081888F6 ldr r4, =0x02024064 ldrb r0, [r4] bl battle_get_per_side_status @@ -757660,50 +757660,50 @@ sub_818888C: @ 818888C ands r1, r0 movs r7, 0xC8 cmp r1, 0 - beq _081888B4 + beq @081888B4 movs r7, 0x98 -_081888B4: +@081888B4: ldr r0, [r5] movs r1, 0x80 lsls r1, 1 ands r0, r1 cmp r0, 0 - beq _081888EC + beq @081888EC ldrb r0, [r4] cmp r0, 0x1 - bne _081888D8 + bne @081888D8 ldr r0, =0x02038bca - b _081888DA + b @081888DA .align 2, 0 .pool -_081888D8: +@081888D8: ldr r0, =0x02038bcc -_081888DA: +@081888DA: ldrh r0, [r0] bl sub_8162AA0 lsls r0, 24 lsrs r0, 24 - b _0818892C + b @0818892C .align 2, 0 .pool -_081888EC: +@081888EC: bl sub_8185F40 lsls r0, 24 lsrs r0, 24 - b _08188924 -_081888F6: + b @08188924 +@081888F6: movs r7, 0xB0 ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0xC0 lsls r0, 4 cmp r1, r0 - bne _08188910 + bne @08188910 bl sub_8068B48 - b _08188928 + b @08188928 .align 2, 0 .pool -_08188910: +@08188910: ldr r2, =0x020229e8 ldr r0, =0x0203c7b4 ldrb r0, [r0] @@ -757714,12 +757714,12 @@ _08188910: lsls r0, 2 adds r0, r2 ldrb r0, [r0, 0x13] -_08188924: +@08188924: bl sub_806F000 -_08188928: +@08188928: lsls r0, 16 lsrs r0, 16 -_0818892C: +@0818892C: mov r8, r0 ldr r5, =0x02024064 ldrb r1, [r5] @@ -757832,7 +757832,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} @@ -757840,7 +757840,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 @@ -757915,7 +757915,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] @@ -757928,7 +757928,7 @@ sub_8188AF8: @ 8188AF8 adds r3, r1, r0 ldrb r0, [r3, 0x4] cmp r0, 0 - bne _08188B4C + bne @08188B4C ldr r1, [r4] lsls r0, r2, 2 adds r0, r1 @@ -757936,12 +757936,12 @@ sub_8188AF8: @ 8188AF8 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08188B2C + beq @08188B2C adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -_08188B2C: +@08188B2C: ldr r0, [r6] ldrb r1, [r5] ldr r2, [r0, 0x4] @@ -757952,17 +757952,17 @@ _08188B2C: ldrb r1, [r0, 0x4] adds r1, 0x1 strb r1, [r0, 0x4] - b _08188B88 + b @08188B88 .align 2, 0 .pool -_08188B4C: +@08188B4C: ldrb r1, [r3] movs r0, 0x40 ands r0, r1 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _08188B88 + bne @08188B88 strb r0, [r3, 0x4] movs r0, 0x10 movs r1, 0x3F @@ -757985,7 +757985,7 @@ _08188B4C: adds r0, r1 ldr r1, =sub_8186D58 + 1 str r1, [r0] -_08188B88: +@08188B88: pop {r4-r6} pop {r0} bx r0 @@ -757994,7 +757994,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} @@ -758002,7 +758002,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} @@ -758010,7 +758010,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} @@ -758018,7 +758018,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} @@ -758026,16 +758026,16 @@ 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] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - beq _08188BE6 - b _08188CFA -_08188BE6: + beq @08188BE6 + b @08188CFA +@08188BE6: ldr r0, =0x02023064 mov r12, r0 ldrb r2, [r6] @@ -758135,12 +758135,12 @@ _08188BE6: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq _08188CDC + beq @08188CDC bl sub_81871AC - b _08188CFA + b @08188CFA .align 2, 0 .pool -_08188CDC: +@08188CDC: ldr r0, =0x020244d0 ldr r0, [r0] ldrb r1, [r6] @@ -758156,7 +758156,7 @@ _08188CDC: adds r0, r1 ldr r1, =sub_8188D0C + 1 str r1, [r0] -_08188CFA: +@08188CFA: pop {r4-r6} pop {r0} bx r0 @@ -758165,7 +758165,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 @@ -758198,21 +758198,21 @@ sub_8188D0C: @ 8188D0C adds r0, r1 ldrb r2, [r0, 0x4] cmp r2, 0x1 - beq _08188DA4 + beq @08188DA4 cmp r2, 0x1 - bgt _08188D64 + bgt @08188D64 cmp r2, 0 - beq _08188D6E - b _08188E80 + beq @08188D6E + b @08188E80 .align 2, 0 .pool -_08188D64: +@08188D64: cmp r2, 0x2 - beq _08188DCE + beq @08188DCE cmp r2, 0x3 - beq _08188E44 - b _08188E80 -_08188D6E: + beq @08188E44 + b @08188E80 +@08188D6E: ldr r1, [r5] lsls r0, r3, 2 adds r1, r0, r1 @@ -758220,7 +758220,7 @@ _08188D6E: movs r0, 0xC ands r0, r2 cmp r0, 0x4 - bne _08188D90 + bne @08188D90 movs r0, 0x8 orrs r0, r2 strb r0, [r1] @@ -758229,7 +758229,7 @@ _08188D6E: adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -_08188D90: +@08188D90: ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -758239,13 +758239,13 @@ _08188D90: adds r0, r2 movs r1, 0x1 strb r1, [r0, 0x4] - b _08188E80 -_08188DA4: + b @08188E80 +@08188DA4: ldrb r1, [r0] movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _08188E80 + bne @08188E80 movs r0, 0 bl sub_805EB9C adds r0, r4, 0 @@ -758259,15 +758259,15 @@ _08188DA4: adds r0, r2 movs r1, 0x2 strb r1, [r0, 0x4] - b _08188E80 -_08188DCE: + b @08188E80 +@08188DCE: ldr r0, =0x020383f8 ldr r0, [r0] bl _call_via_r0 ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 - bne _08188E80 + bne @08188E80 movs r0, 0x1 bl sub_805EB9C ldr r0, [r7] @@ -758279,10 +758279,10 @@ _08188DCE: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08188E1C + beq @08188E1C mov r0, r8 cmp r0, 0x1 - bhi _08188E1C + bhi @08188E1C adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x6 @@ -758297,7 +758297,7 @@ _08188DCE: negs r0, r0 ands r0, r2 strb r0, [r1] -_08188E1C: +@08188E1C: ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -758309,17 +758309,17 @@ _08188E1C: adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x4] - b _08188E80 + b @08188E80 .align 2, 0 .pool -_08188E44: +@08188E44: ldrb r1, [r0] movs r0, 0x40 ands r0, r1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _08188E80 + bne @08188E80 bl sub_805E394 ldrb r0, [r6] lsls r2, r0, 9 @@ -758340,7 +758340,7 @@ _08188E44: adds r0, r2 strb r4, [r0, 0x4] bl sub_81871AC -_08188E80: +@08188E80: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -758351,7 +758351,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 @@ -758382,7 +758382,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} @@ -758390,7 +758390,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] @@ -758409,7 +758409,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} @@ -758417,7 +758417,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] @@ -758425,7 +758425,7 @@ sub_8188F20: @ 8188F20 lsls r1, 10 ands r0, r1 cmp r0, 0 - beq _08188F48 + beq @08188F48 bl sub_805D19C adds r2, r0, 0 lsls r2, 16 @@ -758433,10 +758433,10 @@ sub_8188F20: @ 8188F20 movs r0, 0x1 movs r1, 0xA bl dp01_build_cmdbuf_x21_a_bb - b _08188F6C + b @08188F6C .align 2, 0 .pool -_08188F48: +@08188F48: ldr r5, =0x02024064 ldrb r0, [r5] bl sub_8185054 @@ -758452,7 +758452,7 @@ _08188F48: movs r0, 0x1 movs r1, 0xA bl dp01_build_cmdbuf_x21_a_bb -_08188F6C: +@08188F6C: bl sub_81871AC pop {r4,r5} pop {r0} @@ -758462,7 +758462,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} @@ -758470,7 +758470,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] @@ -758498,7 +758498,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} @@ -758506,7 +758506,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 @@ -758531,7 +758531,7 @@ sub_8188FD0: @ 8188FD0 asrs r7, r1, 16 ldr r0, =0x00007fff cmp r7, r0 - beq _08189060 + beq @08189060 ldr r6, =0x0202406e lsls r0, r4, 1 adds r0, r6 @@ -758561,10 +758561,10 @@ sub_8188FD0: @ 8188FD0 str r7, [sp] mov r2, r8 bl sub_807294C - b _0818908A + b @0818908A .align 2, 0 .pool -_08189060: +@08189060: ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -758584,7 +758584,7 @@ _08189060: str r7, [sp] movs r3, 0 bl sub_807294C -_0818908A: +@0818908A: ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -758604,7 +758604,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} @@ -758612,14 +758612,14 @@ 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] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne _08189120 + bne @08189120 ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 @@ -758653,7 +758653,7 @@ sub_81890CC: @ 81890CC adds r0, r1 ldr r1, =sub_818714C + 1 str r1, [r0] -_08189120: +@08189120: pop {r4} pop {r0} bx r0 @@ -758662,14 +758662,14 @@ _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] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne _08189194 + bne @08189194 ldr r4, =0x02023064 ldrb r3, [r5] lsls r3, 9 @@ -758701,7 +758701,7 @@ sub_8189144: @ 8189144 adds r0, r1 ldr r1, =sub_818714C + 1 str r1, [r0] -_08189194: +@08189194: pop {r4,r5} pop {r0} bx r0 @@ -758710,7 +758710,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} @@ -758718,7 +758718,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} @@ -758726,7 +758726,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} @@ -758734,7 +758734,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} @@ -758742,7 +758742,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} @@ -758750,7 +758750,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} @@ -758758,7 +758758,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} @@ -758766,7 +758766,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} @@ -758774,7 +758774,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} @@ -758782,7 +758782,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] @@ -758798,7 +758798,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 @@ -758824,7 +758824,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] @@ -758839,7 +758839,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] @@ -758861,7 +758861,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 @@ -758877,12 +758877,12 @@ sub_81892AC: @ 81892AC ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - bge _081892E0 + bge @081892E0 bl sub_81871AC - b _0818930A + b @0818930A .align 2, 0 .pool -_081892E0: +@081892E0: ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] @@ -758903,7 +758903,7 @@ _081892E0: adds r0, r1 ldr r1, =bx_blink_t2 + 1 str r1, [r0] -_0818930A: +@0818930A: pop {r4} pop {r0} bx r0 @@ -758912,7 +758912,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} @@ -758920,7 +758920,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] @@ -758928,9 +758928,9 @@ sub_8189328: @ 8189328 lsls r0, 24 movs r3, 0x3F cmp r0, 0 - bne _0818933C + bne @0818933C movs r3, 0xC0 -_0818933C: +@0818933C: ldr r2, =0x02023064 ldrb r1, [r4] lsls r1, 9 @@ -758954,7 +758954,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 @@ -758964,7 +758964,7 @@ sub_818936C: @ 818936C adds r0, r3, r0 ldrb r0, [r0] cmp r0, 0 - beq _081893A8 + beq @081893A8 bl sub_805EA60 ldrb r1, [r5] lsls r1, 9 @@ -758977,10 +758977,10 @@ sub_818936C: @ 818936C lsls r1, 8 orrs r0, r1 bl song_play_for_text - b _081893BC + b @081893BC .align 2, 0 .pool -_081893A8: +@081893A8: adds r0, r4, 0x1 adds r0, r3, r0 ldrb r0, [r0] @@ -758990,7 +758990,7 @@ _081893A8: lsls r1, 8 orrs r0, r1 bl fanfare_play -_081893BC: +@081893BC: bl sub_81871AC pop {r4,r5} pop {r0} @@ -758998,7 +758998,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 @@ -759025,7 +759025,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 @@ -759048,7 +759048,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 @@ -759133,7 +759133,7 @@ sub_8189438: @ 8189438 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081894FA + beq @081894FA ldr r0, =0x020244b4 adds r0, r2, r0 ldrb r1, [r0] @@ -759143,7 +759143,7 @@ sub_8189438: @ 8189438 adds r0, r4 ldr r1, =sub_8073C30 + 1 str r1, [r0] -_081894FA: +@081894FA: ldr r0, [r3] ldr r2, [r0, 0x8] ldrb r0, [r2, 0x9] @@ -759164,7 +759164,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 @@ -759186,14 +759186,14 @@ c3_0803D564: @ 8189548 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _08189582 + beq @08189582 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _081895B4 -_08189582: + beq @081895B4 +@08189582: ldr r0, =0x02023064 ldrb r1, [r7] lsls r2, r1, 9 @@ -759207,10 +759207,10 @@ _08189582: ldrb r0, [r7] movs r1, 0 bl sub_81885D8 - b _081895F4 + b @081895F4 .align 2, 0 .pool -_081895B4: +@081895B4: ldr r4, =0x02023064 ldrb r0, [r7] lsls r1, r0, 9 @@ -759241,7 +759241,7 @@ _081895B4: ldrb r0, [r7] eors r0, r5 strb r0, [r7] -_081895F4: +@081895F4: ldr r1, =0x03005d60 ldr r2, =0x02024064 ldrb r0, [r2] @@ -759264,7 +759264,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] @@ -759279,7 +759279,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 @@ -759289,17 +759289,17 @@ sub_8189648: @ 8189648 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _08189678 + beq @08189678 adds r0, r2, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _08189678 + bne @08189678 bl sub_81871AC - b _08189742 + b @08189742 .align 2, 0 .pool -_08189678: +@08189678: ldr r4, =0x020244d0 ldr r0, [r4] ldr r3, =0x02024064 @@ -759321,7 +759321,7 @@ _08189678: ldrb r0, [r0] adds r7, r3, 0 cmp r0, 0 - beq _081896E4 + beq @081896E4 ldr r0, [r4] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -759332,7 +759332,7 @@ _08189678: lsls r1, r2, 27 lsrs r0, r1, 28 cmp r0, 0x1 - bhi _081896DC + bhi @081896DC adds r0, 0x1 movs r1, 0xF ands r0, r1 @@ -759342,15 +759342,15 @@ _08189678: ands r1, r2 orrs r1, r0 strb r1, [r3, 0x1] - b _08189742 + b @08189742 .align 2, 0 .pool -_081896DC: +@081896DC: movs r0, 0x1F negs r0, r0 ands r0, r2 strb r0, [r3, 0x1] -_081896E4: +@081896E4: adds r5, r7, 0 ldrb r0, [r5] lsls r3, r0, 9 @@ -759382,7 +759382,7 @@ _081896E4: adds r0, r4 ldrb r0, [r0] cmp r0, 0 - beq _08189736 + beq @08189736 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -759391,14 +759391,14 @@ _081896E4: adds r0, r1 movs r1, 0x5D strb r1, [r0, 0x5] -_08189736: +@08189736: ldr r0, =0x03005d60 ldrb r1, [r7] lsls r1, 2 adds r1, r0 ldr r0, =sub_818975C + 1 str r0, [r1] -_08189742: +@08189742: pop {r4-r7} pop {r0} bx r0 @@ -759407,7 +759407,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] @@ -759424,7 +759424,7 @@ sub_818975C: @ 818975C lsls r1, 24 lsrs r1, 24 cmp r1, 0x5C - bls _08189794 + bls @08189794 ldr r0, [r4] ldrb r1, [r3] ldr r2, [r0, 0x4] @@ -759435,7 +759435,7 @@ sub_818975C: @ 818975C movs r1, 0 strb r1, [r0, 0x5] bl sub_81871AC -_08189794: +@08189794: pop {r4} pop {r0} bx r0 @@ -759444,7 +759444,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] @@ -759459,7 +759459,7 @@ sub_81897A4: @ 81897A4 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081897D6 + beq @081897D6 ldr r2, =0x03005e00 ldr r0, =0x020244b4 adds r0, r3, r0 @@ -759470,7 +759470,7 @@ sub_81897A4: @ 81897A4 adds r0, r2 ldr r1, =sub_8073C30 + 1 str r1, [r0] -_081897D6: +@081897D6: bl sub_81871AC pop {r0} bx r0 @@ -759479,7 +759479,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} @@ -759487,14 +759487,14 @@ 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] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 - beq _08189846 + beq @08189846 ldr r3, =0x02020630 ldr r0, =0x020241e4 ldrb r1, [r4] @@ -759521,7 +759521,7 @@ sub_8189800: @ 8189800 strb r0, [r2] ldrb r0, [r4] bl sub_805E408 -_08189846: +@08189846: bl sub_81871AC pop {r4} pop {r0} @@ -759531,7 +759531,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 @@ -759539,7 +759539,7 @@ sub_8189860: @ 8189860 bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne _081898B8 + bne @081898B8 ldr r5, =0x02023064 ldrb r2, [r6] lsls r1, r2, 9 @@ -759560,19 +759560,19 @@ sub_8189860: @ 8189860 bl move_anim_start_t3 lsls r0, 24 cmp r0, 0 - beq _081898AC + beq @081898AC bl sub_81871AC - b _081898B8 + b @081898B8 .align 2, 0 .pool -_081898AC: +@081898AC: ldr r0, =0x03005d60 ldrb r1, [r6] lsls r1, 2 adds r1, r0 ldr r0, =sub_818717C + 1 str r0, [r1] -_081898B8: +@081898B8: add sp, 0x4 pop {r4-r6} pop {r0} @@ -759582,7 +759582,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} @@ -759590,7 +759590,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} @@ -759598,7 +759598,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 @@ -759608,18 +759608,18 @@ sub_81898E0: @ 81898E0 adds r0, r1 ldrb r2, [r0] cmp r2, 0x3 - bne _08189908 + bne @08189908 ldr r0, =0x0202433a strb r2, [r0] - b _08189910 + b @08189910 .align 2, 0 .pool -_08189908: +@08189908: ldr r0, =0x0202433a movs r1, 0x3 eors r1, r2 strb r1, [r0] -_08189910: +@08189910: movs r0, 0x5 bl sub_80A2F50 movs r0, 0x3 @@ -759639,17 +759639,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] @@ -759663,7 +759663,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, =0x0832a328 @@ -759675,31 +759675,31 @@ sub_8189968: @ 8189968 ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _081899B4 + beq @081899B4 ldr r0, =0x02023064 lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] cmp r0, 0x38 - bhi _081899B0 + bhi @081899B0 ldr r0, =0x0860af74 ldrb r1, [r1] lsls r1, 2 adds r1, r0 ldr r0, [r1] bl _call_via_r0 - b _081899B4 + b @081899B4 .align 2, 0 .pool -_081899B0: +@081899B0: bl sub_818A514 -_081899B4: +@081899B4: pop {r0} bx r0 thumb_func_end sub_8189968 thumb_func_start sub_81899B8 -sub_81899B8: @ 81899B8 +sub_81899B8: ; 81899B8 push {lr} ldr r2, =0x02020630 ldr r1, =0x020241e4 @@ -759715,9 +759715,9 @@ sub_81899B8: @ 81899B8 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _081899DC + bne @081899DC bl sub_818A514 -_081899DC: +@081899DC: pop {r0} bx r0 .align 2, 0 @@ -759725,7 +759725,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 @@ -759742,7 +759742,7 @@ sub_81899F0: @ 81899F0 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _08189A40 + bne @08189A40 movs r0, 0 bl nullsub_25 ldrb r0, [r4] @@ -759762,7 +759762,7 @@ sub_81899F0: @ 81899F0 adds r0, r6 bl obj_delete_and_free_tiles bl sub_818A514 -_08189A40: +@08189A40: pop {r4-r6} pop {r0} bx r0 @@ -759771,7 +759771,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] @@ -759788,7 +759788,7 @@ sub_8189A58: @ 8189A58 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _08189A90 + bne @08189A90 ldr r0, [r4] ldrb r1, [r3] ldr r2, [r0, 0x4] @@ -759799,7 +759799,7 @@ sub_8189A58: @ 8189A58 movs r1, 0 strb r1, [r0, 0x9] bl sub_818A514 -_08189A90: +@08189A90: pop {r4} pop {r0} bx r0 @@ -759808,7 +759808,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 @@ -759819,24 +759819,24 @@ sub_8189AA0: @ 8189AA0 bl battle_get_per_side_status lsls r0, 24 cmp r0, 0 - beq _08189ABA - b _08189C60 -_08189ABA: + beq @08189ABA + b @08189C60 +@08189ABA: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _08189ADA + beq @08189ADA bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _08189B0C + beq @08189B0C ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _08189B0C -_08189ADA: + beq @08189B0C +@08189ADA: ldr r2, =0x02020630 ldr r1, =0x03005d70 ldrb r0, [r4] @@ -759850,11 +759850,11 @@ _08189ADA: ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _08189B42 - b _08189B48 + bne @08189B42 + b @08189B48 .align 2, 0 .pool -_08189B0C: +@08189B0C: ldr r2, =0x02020630 ldr r5, =0x03005d70 ldr r0, =0x02024064 @@ -759869,7 +759869,7 @@ _08189B0C: ldr r4, [r0] ldr r0, =nullsub_12 + 1 cmp r4, r0 - bne _08189B42 + bne @08189B42 movs r0, 0x2 eors r3, r0 adds r0, r3, r5 @@ -759880,13 +759880,13 @@ _08189B0C: adds r0, r2 ldr r0, [r0] cmp r0, r4 - bne _08189B42 + bne @08189B42 movs r6, 0x1 -_08189B42: +@08189B42: cmp r6, 0 - bne _08189B48 - b _08189D18 -_08189B48: + bne @08189B48 + b @08189D18 +@08189B48: ldr r0, =0x020244d0 mov r9, r0 ldr r0, [r0] @@ -759902,9 +759902,9 @@ _08189B48: adds r0, r6, 0 ands r0, r1 cmp r0, 0 - bne _08189B6A - b _08189D18 -_08189B6A: + bne @08189B6A + b @08189D18 +@08189B6A: movs r1, 0x2 mov r8, r1 mov r1, r8 @@ -759917,9 +759917,9 @@ _08189B6A: adds r0, r6, 0 ands r0, r1 cmp r0, 0 - bne _08189B86 - b _08189D18 -_08189B86: + bne @08189B86 + b @08189D18 +@08189B86: ldrb r1, [r4] movs r3, 0x7F adds r0, r3, 0 @@ -759983,7 +759983,7 @@ _08189B86: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _08189C22 + beq @08189C22 ldrb r0, [r5] mov r1, r8 eors r1, r0 @@ -759993,7 +759993,7 @@ _08189B86: muls r0, r6 adds r0, r4 bl sub_805E990 -_08189C22: +@08189C22: mov r1, r9 ldr r0, [r1] ldrb r1, [r5] @@ -760006,25 +760006,25 @@ _08189C22: strb r1, [r0, 0x9] ldr r1, =0x03005d60 ldrb r0, [r5] - b _08189D10 + b @08189D10 .align 2, 0 .pool -_08189C60: +@08189C60: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _08189C80 + beq @08189C80 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _08189CB0 + beq @08189CB0 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _08189CB0 -_08189C80: + beq @08189CB0 +@08189C80: ldr r2, =0x02020630 ldr r1, =0x03005d70 ldrb r0, [r4] @@ -760038,11 +760038,11 @@ _08189C80: ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _08189CE6 - b _08189CE4 + bne @08189CE6 + b @08189CE4 .align 2, 0 .pool -_08189CB0: +@08189CB0: ldr r2, =0x02020630 ldr r5, =0x03005d70 ldr r0, =0x02024064 @@ -760057,7 +760057,7 @@ _08189CB0: ldr r4, [r0] ldr r0, =nullsub_12 + 1 cmp r4, r0 - bne _08189CE6 + bne @08189CE6 movs r0, 0x2 eors r3, r0 adds r0, r3, r5 @@ -760068,18 +760068,18 @@ _08189CB0: adds r0, r2 ldr r0, [r0] cmp r0, r4 - bne _08189CE6 -_08189CE4: + bne @08189CE6 +@08189CE4: movs r6, 0x1 -_08189CE6: +@08189CE6: bl sub_80A36C8 lsls r0, 24 cmp r0, 0 - beq _08189CF2 + beq @08189CF2 movs r6, 0 -_08189CF2: +@08189CF2: cmp r6, 0 - beq _08189D18 + beq @08189D18 ldr r0, =0x020244d0 ldr r0, [r0] ldr r3, =0x02024064 @@ -760093,12 +760093,12 @@ _08189CF2: strb r1, [r0, 0x9] ldr r1, =0x03005d60 ldrb r0, [r3] -_08189D10: +@08189D10: lsls r0, 2 adds r0, r1 ldr r1, =sub_8189A58 + 1 str r1, [r0] -_08189D18: +@08189D18: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -760110,7 +760110,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 @@ -760123,7 +760123,7 @@ sub_8189D40: @ 8189D40 bl battle_get_per_side_status lsls r0, 24 cmp r0, 0 - bne _08189DBE + bne @08189DBE ldr r5, =0x020244d0 ldr r0, [r5] ldrb r2, [r4] @@ -760137,7 +760137,7 @@ sub_8189D40: @ 8189D40 adds r0, r6, 0 ands r0, r1 cmp r0, 0 - bne _08189D8C + bne @08189D8C ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] @@ -760147,7 +760147,7 @@ sub_8189D40: @ 8189D40 adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 -_08189D8C: +@08189D8C: ldr r2, [r5] ldrb r1, [r4] movs r0, 0x2 @@ -760162,7 +760162,7 @@ _08189D8C: adds r0, r6, 0 ands r0, r1 cmp r0, 0 - bne _08189DBE + bne @08189DBE ldr r0, =0x0202406e adds r0, r2, r0 ldrh r1, [r0] @@ -760172,7 +760172,7 @@ _08189D8C: adds r1, r0 adds r0, r3, 0 bl sub_8172EF0 -_08189DBE: +@08189DBE: ldr r3, =0x020244d0 ldr r0, [r3] ldr r2, =0x02024064 @@ -760189,7 +760189,7 @@ _08189DBE: mov r9, r2 mov r8, r3 cmp r0, 0 - bne _08189EA2 + bne @08189EA2 movs r7, 0x2 adds r1, r7, 0 eors r1, r5 @@ -760201,22 +760201,22 @@ _08189DBE: mov r0, r12 ands r0, r1 cmp r0, 0 - bne _08189EA2 + bne @08189EA2 ldrb r1, [r6, 0x1] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08189E84 + bne @08189E84 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _08189E54 + beq @08189E54 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - bne _08189E54 + bne @08189E54 ldr r4, =0x03005d70 mov r1, r9 ldrb r0, [r1] @@ -760244,7 +760244,7 @@ _08189DBE: adds r0, r4 ldrb r0, [r0] bl sub_80729D0 -_08189E54: +@08189E54: ldr r5, =0x03005d70 ldr r4, =0x02024064 ldrb r1, [r4] @@ -760266,7 +760266,7 @@ _08189E54: adds r0, r5 ldrb r0, [r0] bl sub_80729D0 -_08189E84: +@08189E84: ldr r4, =0x020244d0 ldr r0, [r4] ldr r3, =0x02024064 @@ -760282,7 +760282,7 @@ _08189E84: strb r1, [r0, 0x1] mov r9, r3 mov r8, r4 -_08189EA2: +@08189EA2: mov r1, r8 ldr r0, [r1] mov r1, r9 @@ -760296,7 +760296,7 @@ _08189EA2: movs r0, 0xC0 ands r0, r1 cmp r0, 0x80 - bne _08189F62 + bne @08189F62 movs r1, 0x2 eors r1, r2 lsls r0, r1, 1 @@ -760307,11 +760307,11 @@ _08189EA2: movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _08189F62 + bne @08189F62 bl sub_80A36C8 lsls r0, 24 cmp r0, 0 - bne _08189F62 + bne @08189F62 mov r1, r8 ldr r0, [r1] mov r1, r9 @@ -760325,30 +760325,30 @@ _08189EA2: movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _08189F44 + bne @08189F44 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x42 ands r0, r1 cmp r0, 0x42 - bne _08189F38 + bne @08189F38 adds r0, r2, 0 bl battle_get_per_side_status lsls r0, 24 cmp r0, 0 - bne _08189F44 + bne @08189F44 ldr r0, =0x03007420 bl m4aMPlayContinue - b _08189F44 + b @08189F44 .align 2, 0 .pool -_08189F38: +@08189F38: ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl -_08189F44: +@08189F44: ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -760364,10 +760364,10 @@ _08189F44: strb r1, [r0, 0x1] movs r0, 0x1 mov r10, r0 -_08189F62: +@08189F62: mov r1, r10 cmp r1, 0 - beq _0818A02A + beq @0818A02A ldr r7, =0x02020630 ldr r6, =0x03005d7c ldr r5, =0x02024064 @@ -760383,7 +760383,7 @@ _08189F62: ldr r2, [r0] ldr r0, =nullsub_12 + 1 cmp r2, r0 - bne _0818A02A + bne @0818A02A ldr r0, =0x020241e4 adds r0, r3, r0 ldrb r1, [r0] @@ -760393,17 +760393,17 @@ _08189F62: adds r0, r4 ldr r0, [r0] cmp r0, r2 - bne _0818A02A + bne @0818A02A bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _08189FC8 + beq @08189FC8 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - bne _08189FC8 + bne @08189FC8 ldrb r1, [r5] movs r0, 0x2 eors r0, r1 @@ -760414,7 +760414,7 @@ _08189F62: lsls r0, 2 adds r0, r7 bl obj_delete_and_free_tiles -_08189FC8: +@08189FC8: ldr r1, =0x03005d7c ldr r4, =0x02024064 ldrb r0, [r4] @@ -760463,7 +760463,7 @@ _08189FC8: adds r0, r1 ldr r1, =sub_8189AA0 + 1 str r1, [r0] -_0818A02A: +@0818A02A: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -760476,7 +760476,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 @@ -760493,13 +760493,13 @@ sub_818A064: @ 818A064 ldrb r0, [r0] lsls r0, 27 cmp r0, 0 - bge _0818A092 + bge @0818A092 movs r2, 0x24 ldrsh r0, [r1, r2] cmp r0, 0 - bne _0818A092 + bne @0818A092 bl sub_818A514 -_0818A092: +@0818A092: pop {r0} bx r0 .align 2, 0 @@ -760507,7 +760507,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] @@ -760529,16 +760529,16 @@ sub_818A0A4: @ 818A0A4 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _0818A0EC + beq @0818A0EC ldrb r0, [r5] adds r0, r6 ldrb r0, [r0] movs r2, 0 bl heathbar_draw_hp - b _0818A106 + b @0818A106 .align 2, 0 .pool -_0818A0EC: +@0818A0EC: ldr r2, =0x0202406e ldrb r1, [r5] lsls r0, r1, 1 @@ -760550,7 +760550,7 @@ _0818A0EC: adds r0, r2 bl sub_805E990 bl sub_818A514 -_0818A106: +@0818A106: pop {r4-r6} pop {r0} bx r0 @@ -760559,7 +760559,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 @@ -760577,7 +760577,7 @@ sub_818A114: @ 818A114 ldrsh r0, [r0, r3] adds r1, r0 cmp r1, 0xA0 - ble _0818A190 + ble @0818A190 ldr r1, =0x0202406e lsls r0, r2, 1 adds r0, r1 @@ -760616,7 +760616,7 @@ sub_818A114: @ 818A114 ldrb r0, [r0] bl sub_8072984 bl sub_818A514 -_0818A190: +@0818A190: pop {r4-r6} pop {r0} bx r0 @@ -760625,7 +760625,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] @@ -760640,7 +760640,7 @@ sub_818A1B0: @ 818A1B0 movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _0818A204 + bne @0818A204 ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] @@ -760664,7 +760664,7 @@ sub_818A1B0: @ 818A1B0 ldrb r0, [r0] bl sub_8072984 bl sub_818A514 -_0818A204: +@0818A204: pop {r4-r6} pop {r0} bx r0 @@ -760673,21 +760673,21 @@ _0818A204: thumb_func_end sub_818A1B0 thumb_func_start sub_818A220 -sub_818A220: @ 818A220 +sub_818A220: ; 818A220 push {lr} movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _0818A232 + bne @0818A232 bl sub_818A514 -_0818A232: +@0818A232: pop {r0} bx r0 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 @@ -760702,7 +760702,7 @@ sub_818A238: @ 818A238 movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0x20 - bne _0818A284 + bne @0818A284 movs r3, 0 movs r0, 0 strh r0, [r4, 0x30] @@ -760715,15 +760715,15 @@ sub_818A238: @ 818A238 ldr r0, =0x020244b9 strb r3, [r0] bl sub_818A514 - b _0818A2AE + b @0818A2AE .align 2, 0 .pool -_0818A284: +@0818A284: ldrh r0, [r4, 0x30] movs r1, 0x3 ands r0, r1 cmp r0, 0 - bne _0818A2A8 + bne @0818A2A8 adds r3, r4, 0 adds r3, 0x3E ldrb r2, [r3] @@ -760737,18 +760737,18 @@ _0818A284: ands r0, r2 orrs r0, r1 strb r0, [r3] -_0818A2A8: +@0818A2A8: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] -_0818A2AE: +@0818A2AE: pop {r4} pop {r0} bx r0 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 @@ -760764,7 +760764,7 @@ sub_818A2B4: @ 818A2B4 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _0818A306 + bne @0818A306 adds r0, r3, 0 bl sub_805E408 ldr r0, =0x020244d0 @@ -760777,19 +760777,19 @@ sub_818A2B4: @ 818A2B4 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0818A2FA + beq @0818A2FA adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x6 bl move_anim_start_t4 -_0818A2FA: +@0818A2FA: ldr r0, =0x03005d60 ldrb r1, [r4] lsls r1, 2 adds r1, r0 ldr r0, =sub_818A328 + 1 str r0, [r1] -_0818A306: +@0818A306: pop {r4} pop {r0} bx r0 @@ -760798,7 +760798,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] @@ -760813,7 +760813,7 @@ sub_818A328: @ 818A328 movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _0818A364 + bne @0818A364 ldr r2, =0x02020630 ldr r0, =0x020241e4 adds r0, r3, r0 @@ -760826,9 +760826,9 @@ sub_818A328: @ 818A328 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _0818A364 + bne @0818A364 bl sub_818A514 -_0818A364: +@0818A364: pop {r0} bx r0 .align 2, 0 @@ -760836,7 +760836,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} @@ -760853,7 +760853,7 @@ sub_818A37C: @ 818A37C movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0818A438 + beq @0818A438 ldrb r1, [r2] movs r0, 0x7F ands r0, r1 @@ -760923,7 +760923,7 @@ sub_818A37C: @ 818A37C adds r0, r1 ldr r1, =sub_818A2B4 + 1 str r1, [r0] -_0818A438: +@0818A438: pop {r3} mov r8, r3 pop {r4-r7} @@ -760934,7 +760934,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] @@ -760949,7 +760949,7 @@ sub_818A470: @ 818A470 movs r0, 0x88 ands r0, r1 cmp r0, 0 - bne _0818A4A2 + bne @0818A4A2 ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] @@ -760959,7 +760959,7 @@ sub_818A470: @ 818A470 adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 -_0818A4A2: +@0818A4A2: ldr r5, =0x02020630 ldr r0, =0x03005d7c ldrb r2, [r4] @@ -760974,7 +760974,7 @@ _0818A4A2: ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _0818A4E8 + bne @0818A4E8 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -760985,7 +760985,7 @@ _0818A4A2: movs r0, 0x8 ands r0, r1 cmp r0, 0 - bne _0818A4E8 + bne @0818A4E8 adds r0, r3, r5 bl obj_delete_and_free_tiles ldr r1, =0x03005d60 @@ -760994,7 +760994,7 @@ _0818A4A2: adds r0, r1 ldr r1, =sub_818A37C + 1 str r1, [r0] -_0818A4E8: +@0818A4E8: pop {r4-r6} pop {r0} bx r0 @@ -761003,7 +761003,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 @@ -761018,7 +761018,7 @@ sub_818A514: @ 818A514 movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _0818A568 + beq @0818A568 bl link_get_multiplayer_id mov r1, sp strb r0, [r1] @@ -761032,10 +761032,10 @@ sub_818A514: @ 818A514 adds r0, r1 movs r1, 0x38 strb r1, [r0] - b _0818A57A + b @0818A57A .align 2, 0 .pool -_0818A568: +@0818A568: ldr r2, =0x02024068 ldr r1, =0x0832a328 ldrb r0, [r4] @@ -761045,7 +761045,7 @@ _0818A568: ldr r0, [r2] bics r0, r1 str r0, [r2] -_0818A57A: +@0818A57A: add sp, 0x4 pop {r4} pop {r0} @@ -761055,7 +761055,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] @@ -761070,9 +761070,9 @@ sub_818A58C: @ 818A58C movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _0818A5AE + bne @0818A5AE bl sub_818A514 -_0818A5AE: +@0818A5AE: pop {r0} bx r0 .align 2, 0 @@ -761080,7 +761080,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] @@ -761095,9 +761095,9 @@ sub_818A5BC: @ 818A5BC movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _0818A5DE + bne @0818A5DE bl sub_818A514 -_0818A5DE: +@0818A5DE: pop {r0} bx r0 .align 2, 0 @@ -761105,7 +761105,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 @@ -761117,7 +761117,7 @@ sub_818A5EC: @ 818A5EC adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0 - bne _0818A624 + bne @0818A624 ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 @@ -761125,29 +761125,29 @@ sub_818A5EC: @ 818A5EC mov r1, sp bl sub_818A660 adds r6, r0, 0 - b _0818A646 + b @0818A646 .align 2, 0 .pool -_0818A624: +@0818A624: ldrb r4, [r1] movs r5, 0 -_0818A628: +@0818A628: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _0818A63E + beq @0818A63E lsls r0, r5, 24 lsrs r0, 24 mov r2, sp adds r1, r2, r6 bl sub_818A660 adds r6, r0 -_0818A63E: +@0818A63E: lsrs r4, 1 adds r5, 0x1 cmp r5, 0x5 - ble _0818A628 -_0818A646: + ble @0818A628 +@0818A646: lsls r1, r6, 16 lsrs r1, 16 movs r0, 0x1 @@ -761161,7 +761161,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 @@ -761180,79 +761180,79 @@ sub_818A660: @ 818A660 adds r0, r1 ldrb r0, [r0] cmp r0, 0x3B - bls _0818A68A - bl _0818ADF6 -_0818A68A: + bls @0818A68A + bl @0818ADF6 +@0818A68A: lsls r0, 2 - ldr r1, =_0818A6A0 + ldr r1, =@0818A6A0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0818A6A0: - .4byte _0818A790 - .4byte _0818A9B4 - .4byte _0818A9C4 - .4byte _0818A9D4 - .4byte _0818AA3C - .4byte _0818AA3C - .4byte _0818AA3C - .4byte _0818AA3C - .4byte _0818AA58 - .4byte _0818AA94 - .4byte _0818AA94 - .4byte _0818AA94 - .4byte _0818AA94 - .4byte _0818ADF6 - .4byte _0818ADF6 - .4byte _0818ADF6 - .4byte _0818ADF6 - .4byte _0818AAB0 - .4byte _0818AAC0 - .4byte _0818AAF0 - .4byte _0818AB00 - .4byte _0818AB10 - .4byte _0818AB20 - .4byte _0818AB30 - .4byte _0818AB40 - .4byte _0818AB50 - .4byte _0818AB60 - .4byte _0818AB70 - .4byte _0818AB80 - .4byte _0818AB90 - .4byte _0818ABA0 - .4byte _0818ABB0 - .4byte _0818AC00 - .4byte _0818AC10 - .4byte _0818AC20 - .4byte _0818AC30 - .4byte _0818AC40 - .4byte _0818AC50 - .4byte _0818AC60 - .4byte _0818AC70 - .4byte _0818AC80 - .4byte _0818ACB4 - .4byte _0818ACC4 - .4byte _0818ACD4 - .4byte _0818ACE4 - .4byte _0818ACF4 - .4byte _0818AD04 - .4byte _0818AD14 - .4byte _0818AD24 - .4byte _0818AD44 - .4byte _0818AD54 - .4byte _0818AD64 - .4byte _0818AD74 - .4byte _0818AD84 - .4byte _0818AD94 - .4byte _0818ADA4 - .4byte _0818ADB4 - .4byte _0818ADC4 - .4byte _0818ADD4 - .4byte _0818ADE4 -_0818A790: +@0818A6A0: + .4byte @0818A790 + .4byte @0818A9B4 + .4byte @0818A9C4 + .4byte @0818A9D4 + .4byte @0818AA3C + .4byte @0818AA3C + .4byte @0818AA3C + .4byte @0818AA3C + .4byte @0818AA58 + .4byte @0818AA94 + .4byte @0818AA94 + .4byte @0818AA94 + .4byte @0818AA94 + .4byte @0818ADF6 + .4byte @0818ADF6 + .4byte @0818ADF6 + .4byte @0818ADF6 + .4byte @0818AAB0 + .4byte @0818AAC0 + .4byte @0818AAF0 + .4byte @0818AB00 + .4byte @0818AB10 + .4byte @0818AB20 + .4byte @0818AB30 + .4byte @0818AB40 + .4byte @0818AB50 + .4byte @0818AB60 + .4byte @0818AB70 + .4byte @0818AB80 + .4byte @0818AB90 + .4byte @0818ABA0 + .4byte @0818ABB0 + .4byte @0818AC00 + .4byte @0818AC10 + .4byte @0818AC20 + .4byte @0818AC30 + .4byte @0818AC40 + .4byte @0818AC50 + .4byte @0818AC60 + .4byte @0818AC70 + .4byte @0818AC80 + .4byte @0818ACB4 + .4byte @0818ACC4 + .4byte @0818ACD4 + .4byte @0818ACE4 + .4byte @0818ACF4 + .4byte @0818AD04 + .4byte @0818AD14 + .4byte @0818AD24 + .4byte @0818AD44 + .4byte @0818AD54 + .4byte @0818AD64 + .4byte @0818AD74 + .4byte @0818AD84 + .4byte @0818AD94 + .4byte @0818ADA4 + .4byte @0818ADB4 + .4byte @0818ADC4 + .4byte @0818ADD4 + .4byte @0818ADE4 +@0818A790: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -761289,7 +761289,7 @@ _0818A790: str r0, [sp, 0x88] mov r8, r4 add r4, sp, 0xC -_0818A7DC: +@0818A7DC: adds r1, r6, 0 adds r1, 0xD mov r0, r8 @@ -761305,7 +761305,7 @@ _0818A7DC: adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble _0818A7DC + ble @0818A7DC movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -761483,36 +761483,36 @@ _0818A7DC: bl pokemon_getattr mov r2, sp movs r6, 0 -_0818A994: +@0818A994: adds r0, r7, r6 adds r1, r2, r6 ldrb r1, [r1] strb r1, [r0] adds r6, 0x1 cmp r6, 0x57 - bls _0818A994 - b _0818ADF6 + bls @0818A994 + b @0818ADF6 .align 2, 0 .pool -_0818A9B4: +@0818A9B4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB - b _0818AD2E + b @0818AD2E .align 2, 0 .pool -_0818A9C4: +@0818A9C4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC - b _0818AD2E + b @0818AD2E .align 2, 0 .pool -_0818A9D4: +@0818A9D4: movs r6, 0 add r2, sp, 0x58 mov r9, r2 @@ -761524,7 +761524,7 @@ _0818A9D4: ldr r0, =0x020244ec adds r4, r1, r0 mov r8, r9 -_0818A9EA: +@0818A9EA: adds r1, r6, 0 adds r1, 0xD adds r0, r4, 0 @@ -761542,7 +761542,7 @@ _0818A9EA: add r8, r0 adds r6, 0x1 cmp r6, 0x3 - ble _0818A9EA + ble @0818A9EA movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -761553,18 +761553,18 @@ _0818A9EA: strb r0, [r1, 0xC] mov r2, r9 movs r6, 0 -_0818AA28: +@0818AA28: adds r0, r7, r6 adds r1, r2, r6 ldrb r1, [r1] strb r1, [r0] adds r6, 0x1 cmp r6, 0xF - bls _0818AA28 - b _0818ADF6 + bls @0818AA28 + b @0818ADF6 .align 2, 0 .pool -_0818AA3C: +@0818AA3C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -761575,17 +761575,17 @@ _0818AA3C: adds r1, r2 ldrb r1, [r1] adds r1, 0x9 - b _0818AD2E + b @0818AD2E .align 2, 0 .pool -_0818AA58: +@0818AA58: movs r6, 0 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 ldr r2, =0x020244ec mov r8, r2 -_0818AA64: +@0818AA64: adds r1, r6, 0 adds r1, 0x11 mov r2, r8 @@ -761595,7 +761595,7 @@ _0818AA64: strb r0, [r1] adds r6, 0x1 cmp r6, 0x3 - ble _0818AA64 + ble @0818AA64 movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -761605,10 +761605,10 @@ _0818AA64: adds r1, r7, r6 strb r0, [r1] adds r6, 0x1 - b _0818ADF6 + b @0818ADF6 .align 2, 0 .pool -_0818AA94: +@0818AA94: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -761619,25 +761619,25 @@ _0818AA94: adds r1, r2 ldrb r1, [r1] adds r1, 0x8 - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818AAB0: +@0818AAB0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1 - b _0818AACA + b @0818AACA .align 2, 0 .pool -_0818AAC0: +@0818AAC0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x19 -_0818AACA: +@0818AACA: bl pokemon_getattr adds r1, r0, 0 strb r1, [r7] @@ -761652,118 +761652,118 @@ _0818AACA: lsrs r0, 16 strb r0, [r7, 0x2] movs r6, 0x3 - b _0818ADF6 + b @0818ADF6 .align 2, 0 .pool -_0818AAF0: +@0818AAF0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1A - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818AB00: +@0818AB00: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1B - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818AB10: +@0818AB10: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1C - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818AB20: +@0818AB20: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1D - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818AB30: +@0818AB30: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1E - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818AB40: +@0818AB40: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1F - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818AB50: +@0818AB50: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x20 - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818AB60: +@0818AB60: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x22 - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818AB70: +@0818AB70: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x23 - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818AB80: +@0818AB80: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x24 - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818AB90: +@0818AB90: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x25 - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818ABA0: +@0818ABA0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x26 - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818ABB0: +@0818ABB0: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -761794,88 +761794,88 @@ _0818ABB0: bl pokemon_getattr strb r0, [r7, 0x5] movs r6, 0x6 - b _0818ADF6 + b @0818ADF6 .align 2, 0 .pool -_0818AC00: +@0818AC00: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x27 - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818AC10: +@0818AC10: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x28 - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818AC20: +@0818AC20: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x29 - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818AC30: +@0818AC30: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2A - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818AC40: +@0818AC40: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2B - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818AC50: +@0818AC50: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2C - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818AC60: +@0818AC60: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0 - b _0818AC8A + b @0818AC8A .align 2, 0 .pool -_0818AC70: +@0818AC70: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x9 - b _0818AD2E + b @0818AD2E .align 2, 0 .pool -_0818AC80: +@0818AC80: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x37 -_0818AC8A: +@0818AC8A: bl pokemon_getattr adds r1, r0, 0 strb r1, [r7] @@ -761892,79 +761892,79 @@ _0818AC8A: lsrs r0, r1, 24 strb r0, [r7, 0x3] movs r6, 0x4 - b _0818ADF6 + b @0818ADF6 .align 2, 0 .pool -_0818ACB4: +@0818ACB4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x38 - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818ACC4: +@0818ACC4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x39 - b _0818AD2E + b @0818AD2E .align 2, 0 .pool -_0818ACD4: +@0818ACD4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3A - b _0818AD2E + b @0818AD2E .align 2, 0 .pool -_0818ACE4: +@0818ACE4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3B - b _0818AD2E + b @0818AD2E .align 2, 0 .pool -_0818ACF4: +@0818ACF4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3C - b _0818AD2E + b @0818AD2E .align 2, 0 .pool -_0818AD04: +@0818AD04: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3D - b _0818AD2E + b @0818AD2E .align 2, 0 .pool -_0818AD14: +@0818AD14: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3E - b _0818AD2E + b @0818AD2E .align 2, 0 .pool -_0818AD24: +@0818AD24: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3F -_0818AD2E: +@0818AD2E: bl pokemon_getattr lsls r0, 16 lsrs r0, 16 @@ -761972,110 +761972,110 @@ _0818AD2E: lsrs r0, 8 strb r0, [r7, 0x1] movs r6, 0x2 - b _0818ADF6 + b @0818ADF6 .align 2, 0 .pool -_0818AD44: +@0818AD44: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x16 - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818AD54: +@0818AD54: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x17 - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818AD64: +@0818AD64: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x18 - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818AD74: +@0818AD74: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x21 - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818AD84: +@0818AD84: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2F - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818AD94: +@0818AD94: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x30 - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818ADA4: +@0818ADA4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x32 - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818ADB4: +@0818ADB4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x33 - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818ADC4: +@0818ADC4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x34 - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818ADD4: +@0818ADD4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x35 - b _0818ADEE + b @0818ADEE .align 2, 0 .pool -_0818ADE4: +@0818ADE4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x36 -_0818ADEE: +@0818ADEE: bl pokemon_getattr strb r0, [r7] movs r6, 0x1 -_0818ADF6: +@0818ADF6: adds r0, r6, 0 add sp, 0x90 pop {r3-r5} @@ -762090,7 +762090,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} @@ -762098,7 +762098,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 @@ -762108,33 +762108,33 @@ sub_818AE18: @ 818AE18 adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0 - bne _0818AE48 + bne @0818AE48 ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] bl sub_818AE70 - b _0818AE66 + b @0818AE66 .align 2, 0 .pool -_0818AE48: +@0818AE48: ldrb r4, [r1] movs r5, 0 -_0818AE4C: +@0818AE4C: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _0818AE5A + beq @0818AE5A adds r0, r5, 0 bl sub_818AE70 -_0818AE5A: +@0818AE5A: lsrs r4, 1 adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls _0818AE4C -_0818AE66: + bls @0818AE4C +@0818AE66: bl sub_818A514 pop {r4,r5} pop {r0} @@ -762142,7 +762142,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 @@ -762162,79 +762162,79 @@ sub_818AE70: @ 818AE70 ldrb r0, [r0] adds r7, r2, 0 cmp r0, 0x3B - bls _0818AE9C - bl _0818B836 -_0818AE9C: + bls @0818AE9C + bl @0818B836 +@0818AE9C: lsls r0, 2 - ldr r1, =_0818AEB4 + ldr r1, =@0818AEB4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0818AEB4: - .4byte _0818AFA4 - .4byte _0818B13C - .4byte _0818B15C - .4byte _0818B17C - .4byte _0818B1D4 - .4byte _0818B1D4 - .4byte _0818B1D4 - .4byte _0818B1D4 - .4byte _0818B1FC - .4byte _0818B260 - .4byte _0818B260 - .4byte _0818B260 - .4byte _0818B260 - .4byte _0818B836 - .4byte _0818B836 - .4byte _0818B836 - .4byte _0818B836 - .4byte _0818B290 - .4byte _0818B2B0 - .4byte _0818B2D0 - .4byte _0818B2F0 - .4byte _0818B310 - .4byte _0818B330 - .4byte _0818B350 - .4byte _0818B370 - .4byte _0818B390 - .4byte _0818B3B0 - .4byte _0818B3D0 - .4byte _0818B3F0 - .4byte _0818B410 - .4byte _0818B430 - .4byte _0818B450 - .4byte _0818B4C0 - .4byte _0818B4E0 - .4byte _0818B500 - .4byte _0818B520 - .4byte _0818B540 - .4byte _0818B560 - .4byte _0818B580 - .4byte _0818B5A0 - .4byte _0818B5C0 - .4byte _0818B5E0 - .4byte _0818B600 - .4byte _0818B620 - .4byte _0818B640 - .4byte _0818B660 - .4byte _0818B680 - .4byte _0818B6A0 - .4byte _0818B6C0 - .4byte _0818B6E0 - .4byte _0818B700 - .4byte _0818B720 - .4byte _0818B740 - .4byte _0818B760 - .4byte _0818B780 - .4byte _0818B7A0 - .4byte _0818B7C0 - .4byte _0818B7E0 - .4byte _0818B800 - .4byte _0818B820 -_0818AFA4: +@0818AEB4: + .4byte @0818AFA4 + .4byte @0818B13C + .4byte @0818B15C + .4byte @0818B17C + .4byte @0818B1D4 + .4byte @0818B1D4 + .4byte @0818B1D4 + .4byte @0818B1D4 + .4byte @0818B1FC + .4byte @0818B260 + .4byte @0818B260 + .4byte @0818B260 + .4byte @0818B260 + .4byte @0818B836 + .4byte @0818B836 + .4byte @0818B836 + .4byte @0818B836 + .4byte @0818B290 + .4byte @0818B2B0 + .4byte @0818B2D0 + .4byte @0818B2F0 + .4byte @0818B310 + .4byte @0818B330 + .4byte @0818B350 + .4byte @0818B370 + .4byte @0818B390 + .4byte @0818B3B0 + .4byte @0818B3D0 + .4byte @0818B3F0 + .4byte @0818B410 + .4byte @0818B430 + .4byte @0818B450 + .4byte @0818B4C0 + .4byte @0818B4E0 + .4byte @0818B500 + .4byte @0818B520 + .4byte @0818B540 + .4byte @0818B560 + .4byte @0818B580 + .4byte @0818B5A0 + .4byte @0818B5C0 + .4byte @0818B5E0 + .4byte @0818B600 + .4byte @0818B620 + .4byte @0818B640 + .4byte @0818B660 + .4byte @0818B680 + .4byte @0818B6A0 + .4byte @0818B6C0 + .4byte @0818B6E0 + .4byte @0818B700 + .4byte @0818B720 + .4byte @0818B740 + .4byte @0818B760 + .4byte @0818B780 + .4byte @0818B7A0 + .4byte @0818B7C0 + .4byte @0818B7E0 + .4byte @0818B800 + .4byte @0818B820 +@0818AFA4: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -762284,7 +762284,7 @@ _0818AFA4: adds r7, 0x24 adds r4, r6, 0 adds r4, 0xC -_0818B00A: +@0818B00A: mov r1, r8 adds r1, 0xD mov r0, r9 @@ -762301,7 +762301,7 @@ _0818B00A: add r8, r0 mov r0, r8 cmp r0, 0x3 - ble _0818B00A + ble @0818B00A movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -762413,10 +762413,10 @@ _0818B00A: movs r1, 0x3F ldr r2, [sp, 0x14] bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B13C: +@0818B13C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762427,10 +762427,10 @@ _0818B13C: adds r2, r7 movs r1, 0xB bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B15C: +@0818B15C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762441,10 +762441,10 @@ _0818B15C: adds r2, r7 movs r1, 0xC bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B17C: +@0818B17C: movs r0, 0 mov r8, r0 movs r0, 0xC @@ -762458,7 +762458,7 @@ _0818B17C: adds r6, r3, 0 adds r6, 0x8 adds r4, r3, 0 -_0818B196: +@0818B196: mov r1, r8 adds r1, 0xD adds r0, r7, 0 @@ -762475,7 +762475,7 @@ _0818B196: add r8, r0 mov r0, r8 cmp r0, 0x3 - ble _0818B196 + ble @0818B196 movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762483,10 +762483,10 @@ _0818B196: movs r1, 0x15 mov r2, r9 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B1D4: +@0818B1D4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762499,10 +762499,10 @@ _0818B1D4: adds r1, r2, r1 ldrb r1, [r1] adds r1, 0x9 - b _0818B278 + b @0818B278 .align 2, 0 .pool -_0818B1FC: +@0818B1FC: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -762543,10 +762543,10 @@ _0818B1FC: adds r0, r4, 0 movs r1, 0x15 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B260: +@0818B260: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762559,14 +762559,14 @@ _0818B260: adds r1, r2, r1 ldrb r1, [r1] adds r1, 0x8 -_0818B278: +@0818B278: adds r3, 0x3 adds r2, r3 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B290: +@0818B290: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762577,10 +762577,10 @@ _0818B290: adds r2, r7 movs r1, 0x1 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B2B0: +@0818B2B0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762591,10 +762591,10 @@ _0818B2B0: adds r2, r7 movs r1, 0x19 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B2D0: +@0818B2D0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762605,10 +762605,10 @@ _0818B2D0: adds r2, r7 movs r1, 0x1A bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B2F0: +@0818B2F0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762619,10 +762619,10 @@ _0818B2F0: adds r2, r7 movs r1, 0x1B bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B310: +@0818B310: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762633,10 +762633,10 @@ _0818B310: adds r2, r7 movs r1, 0x1C bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B330: +@0818B330: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762647,10 +762647,10 @@ _0818B330: adds r2, r7 movs r1, 0x1D bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B350: +@0818B350: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762661,10 +762661,10 @@ _0818B350: adds r2, r7 movs r1, 0x1E bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B370: +@0818B370: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762675,10 +762675,10 @@ _0818B370: adds r2, r7 movs r1, 0x1F bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B390: +@0818B390: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762689,10 +762689,10 @@ _0818B390: adds r2, r7 movs r1, 0x20 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B3B0: +@0818B3B0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762703,10 +762703,10 @@ _0818B3B0: adds r2, r7 movs r1, 0x22 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B3D0: +@0818B3D0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762717,10 +762717,10 @@ _0818B3D0: adds r2, r7 movs r1, 0x23 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B3F0: +@0818B3F0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762731,10 +762731,10 @@ _0818B3F0: adds r2, r7 movs r1, 0x24 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B410: +@0818B410: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762745,10 +762745,10 @@ _0818B410: adds r2, r7 movs r1, 0x25 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B430: +@0818B430: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762759,10 +762759,10 @@ _0818B430: adds r2, r7 movs r1, 0x26 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B450: +@0818B450: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -762808,10 +762808,10 @@ _0818B450: adds r0, r7, 0x5 adds r2, r0 adds r0, r4, 0 - b _0818B570 + b @0818B570 .align 2, 0 .pool -_0818B4C0: +@0818B4C0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762822,10 +762822,10 @@ _0818B4C0: adds r2, r7 movs r1, 0x27 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B4E0: +@0818B4E0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762836,10 +762836,10 @@ _0818B4E0: adds r2, r7 movs r1, 0x28 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B500: +@0818B500: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762850,10 +762850,10 @@ _0818B500: adds r2, r7 movs r1, 0x29 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B520: +@0818B520: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762864,10 +762864,10 @@ _0818B520: adds r2, r7 movs r1, 0x2A bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B540: +@0818B540: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762878,10 +762878,10 @@ _0818B540: adds r2, r7 movs r1, 0x2B bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B560: +@0818B560: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762890,13 +762890,13 @@ _0818B560: ldrb r2, [r1] lsls r2, 9 adds r2, r7 -_0818B570: +@0818B570: movs r1, 0x2C bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B580: +@0818B580: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762907,10 +762907,10 @@ _0818B580: adds r2, r7 movs r1, 0 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B5A0: +@0818B5A0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762921,10 +762921,10 @@ _0818B5A0: adds r2, r7 movs r1, 0x9 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B5C0: +@0818B5C0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762935,10 +762935,10 @@ _0818B5C0: adds r2, r7 movs r1, 0x37 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B5E0: +@0818B5E0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762949,10 +762949,10 @@ _0818B5E0: adds r2, r7 movs r1, 0x38 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B600: +@0818B600: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762963,10 +762963,10 @@ _0818B600: adds r2, r7 movs r1, 0x39 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B620: +@0818B620: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762977,10 +762977,10 @@ _0818B620: adds r2, r7 movs r1, 0x3A bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B640: +@0818B640: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -762991,10 +762991,10 @@ _0818B640: adds r2, r7 movs r1, 0x3B bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B660: +@0818B660: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -763005,10 +763005,10 @@ _0818B660: adds r2, r7 movs r1, 0x3C bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B680: +@0818B680: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -763019,10 +763019,10 @@ _0818B680: adds r2, r7 movs r1, 0x3D bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B6A0: +@0818B6A0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -763033,10 +763033,10 @@ _0818B6A0: adds r2, r7 movs r1, 0x3E bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B6C0: +@0818B6C0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -763047,10 +763047,10 @@ _0818B6C0: adds r2, r7 movs r1, 0x3F bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B6E0: +@0818B6E0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -763061,10 +763061,10 @@ _0818B6E0: adds r2, r7 movs r1, 0x16 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B700: +@0818B700: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -763075,10 +763075,10 @@ _0818B700: adds r2, r7 movs r1, 0x17 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B720: +@0818B720: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -763089,10 +763089,10 @@ _0818B720: adds r2, r7 movs r1, 0x18 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B740: +@0818B740: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -763103,10 +763103,10 @@ _0818B740: adds r2, r7 movs r1, 0x21 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B760: +@0818B760: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -763117,10 +763117,10 @@ _0818B760: adds r2, r7 movs r1, 0x2F bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B780: +@0818B780: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -763131,10 +763131,10 @@ _0818B780: adds r2, r7 movs r1, 0x30 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B7A0: +@0818B7A0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -763145,10 +763145,10 @@ _0818B7A0: adds r2, r7 movs r1, 0x32 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B7C0: +@0818B7C0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -763159,10 +763159,10 @@ _0818B7C0: adds r2, r7 movs r1, 0x33 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B7E0: +@0818B7E0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -763173,10 +763173,10 @@ _0818B7E0: adds r2, r7 movs r1, 0x34 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B800: +@0818B800: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -763187,10 +763187,10 @@ _0818B800: adds r2, r7 movs r1, 0x35 bl pokemon_setattr - b _0818B836 + b @0818B836 .align 2, 0 .pool -_0818B820: +@0818B820: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -763201,7 +763201,7 @@ _0818B820: adds r2, r7 movs r1, 0x36 bl pokemon_setattr -_0818B836: +@0818B836: ldr r2, =0x0202406e ldr r0, =0x02024064 ldrb r1, [r0] @@ -763226,7 +763226,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 @@ -763250,11 +763250,11 @@ sub_818B86C: @ 818B86C adds r2, r0 ldrb r2, [r2] cmp r3, r2 - bcs _0818B8C4 + bcs @0818B8C4 adds r6, r4, 0 adds r2, r7, 0 adds r4, r0, 0 -_0818B8A2: +@0818B8A2: adds r1, r5, r3 ldrb r0, [r2] lsls r0, 9 @@ -763271,8 +763271,8 @@ _0818B8A2: adds r0, r4 ldrb r0, [r0] cmp r3, r0 - bcc _0818B8A2 -_0818B8C4: + bcc @0818B8A2 +@0818B8C4: bl sub_818A514 pop {r4-r7} pop {r0} @@ -763282,7 +763282,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} @@ -763400,7 +763400,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] @@ -763447,7 +763447,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 @@ -763611,7 +763611,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 @@ -763621,7 +763621,7 @@ sub_818BBE8: @ 818BBE8 adds r0, r1 ldrb r3, [r0] cmp r3, 0 - bne _0818BC30 + bne @0818BC30 ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -763636,10 +763636,10 @@ sub_818BBE8: @ 818BBE8 adds r0, r1 ldr r1, =sub_818BC78 + 1 str r1, [r0] - b _0818BC66 + b @0818BC66 .align 2, 0 .pool -_0818BC30: +@0818BC30: ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] @@ -763663,7 +763663,7 @@ _0818BC30: ldrb r0, [r0] bl sub_8072984 bl sub_818A514 -_0818BC66: +@0818BC66: pop {r4-r6} pop {r0} bx r0 @@ -763672,7 +763672,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] @@ -763685,13 +763685,13 @@ sub_818BC78: @ 818BC78 adds r3, r0, r1 ldrb r0, [r3, 0x4] cmp r0, 0 - beq _0818BCA0 + beq @0818BCA0 cmp r0, 0x1 - beq _0818BCCE - b _0818BCF6 + beq @0818BCCE + b @0818BCF6 .align 2, 0 .pool -_0818BCA0: +@0818BCA0: ldr r1, [r4] lsls r0, r2, 2 adds r0, r1 @@ -763699,12 +763699,12 @@ _0818BCA0: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0818BCBA + beq @0818BCBA adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -_0818BCBA: +@0818BCBA: ldr r0, [r6] ldrb r1, [r5] ldr r2, [r0, 0x4] @@ -763714,15 +763714,15 @@ _0818BCBA: adds r0, r2 movs r1, 0x1 strb r1, [r0, 0x4] - b _0818BCF6 -_0818BCCE: + b @0818BCF6 +@0818BCCE: ldrb r1, [r3] movs r0, 0x40 ands r0, r1 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _0818BCF6 + bne @0818BCF6 strb r0, [r3, 0x4] ldrb r2, [r5] adds r0, r2, 0 @@ -763735,7 +763735,7 @@ _0818BCCE: adds r0, r1 ldr r1, =sub_818A1B0 + 1 str r1, [r0] -_0818BCF6: +@0818BCF6: pop {r4-r6} pop {r0} bx r0 @@ -763744,7 +763744,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 @@ -763755,18 +763755,18 @@ sub_818BD04: @ 818BD04 lsls r0, 18 ands r0, r1 cmp r0, 0 - beq _0818BD48 + beq @0818BD48 movs r0, 0x40 ands r1, r0 cmp r1, 0 - beq _0818BD30 + beq @0818BD30 bl sub_8185F40 lsls r0, 24 lsrs r4, r0, 24 - b _0818BD4C + b @0818BD4C .align 2, 0 .pool -_0818BD30: +@0818BD30: ldr r2, =0x020229e8 ldr r0, =0x0203c7b4 ldrb r1, [r0] @@ -763774,21 +763774,21 @@ _0818BD30: subs r0, r1 lsls r0, 2 adds r0, r2 - b _0818BD4A + b @0818BD4A .align 2, 0 .pool -_0818BD48: +@0818BD48: ldr r0, =0x020229e8 -_0818BD4A: +@0818BD4A: ldrb r4, [r0, 0x13] -_0818BD4C: +@0818BD4C: ldr r0, =0x02022fec ldr r1, [r0] movs r2, 0x40 ands r1, r2 adds r5, r0, 0 cmp r1, 0 - beq _0818BD98 + beq @0818BD98 ldr r0, =0x02024064 ldrb r0, [r0] bl battle_get_per_side_status @@ -763797,28 +763797,28 @@ _0818BD4C: movs r0, 0x20 mov r9, r0 cmp r1, 0 - beq _0818BD72 + beq @0818BD72 movs r1, 0x5A mov r9, r1 -_0818BD72: +@0818BD72: ldr r0, [r5] movs r1, 0x80 lsls r1, 15 ands r0, r1 cmp r0, 0 - beq _0818BD9C + beq @0818BD9C movs r0, 0x5A mov r9, r0 ldr r1, =0x083054e0 - b _0818BD9E + b @0818BD9E .align 2, 0 .pool -_0818BD98: +@0818BD98: movs r0, 0x50 mov r9, r0 -_0818BD9C: +@0818BD9C: ldr r1, =0x08305d2c -_0818BD9E: +@0818BD9E: lsls r0, r4, 2 adds r0, r1 ldrb r1, [r0] @@ -763834,9 +763834,9 @@ _0818BD9E: lsls r1, 15 ands r0, r1 cmp r0, 0 - bne _0818BDC0 - b _0818BEDC -_0818BDC0: + bne @0818BDC0 + b @0818BEDC +@0818BDC0: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] @@ -763953,10 +763953,10 @@ _0818BDC0: movs r2, 0x1 orrs r1, r2 strb r1, [r0] - b _0818BF72 + b @0818BF72 .align 2, 0 .pool -_0818BEDC: +@0818BEDC: ldr r5, =0x02024064 ldrb r1, [r5] adds r0, r4, 0 @@ -764027,7 +764027,7 @@ _0818BEDC: adds r0, r4 ldr r1, =sub_805D7AC + 1 str r1, [r0] -_0818BF72: +@0818BF72: ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -764046,7 +764046,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} @@ -764054,7 +764054,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 @@ -764128,7 +764128,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] @@ -764141,7 +764141,7 @@ sub_818C064: @ 818C064 adds r3, r1, r0 ldrb r0, [r3, 0x4] cmp r0, 0 - bne _0818C0B8 + bne @0818C0B8 ldr r1, [r4] lsls r0, r2, 2 adds r0, r1 @@ -764149,12 +764149,12 @@ sub_818C064: @ 818C064 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0818C098 + beq @0818C098 adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -_0818C098: +@0818C098: ldr r0, [r6] ldrb r1, [r5] ldr r2, [r0, 0x4] @@ -764165,17 +764165,17 @@ _0818C098: ldrb r1, [r0, 0x4] adds r1, 0x1 strb r1, [r0, 0x4] - b _0818C12E + b @0818C12E .align 2, 0 .pool -_0818C0B8: +@0818C0B8: ldrb r1, [r3] movs r0, 0x40 ands r0, r1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _0818C12E + bne @0818C12E strb r4, [r3, 0x4] ldr r2, =0x0202406e ldrb r1, [r5] @@ -764226,7 +764226,7 @@ _0818C0B8: adds r0, r1 ldr r1, =sub_818A114 + 1 str r1, [r0] -_0818C12E: +@0818C12E: pop {r4-r6} pop {r0} bx r0 @@ -764235,7 +764235,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} @@ -764243,7 +764243,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} @@ -764251,7 +764251,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} @@ -764259,7 +764259,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} @@ -764267,16 +764267,16 @@ 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] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - beq _0818C192 - b _0818C2A6 -_0818C192: + beq @0818C192 + b @0818C2A6 +@0818C192: ldr r0, =0x02023064 mov r12, r0 ldrb r2, [r6] @@ -764376,12 +764376,12 @@ _0818C192: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq _0818C288 + beq @0818C288 bl sub_818A514 - b _0818C2A6 + b @0818C2A6 .align 2, 0 .pool -_0818C288: +@0818C288: ldr r0, =0x020244d0 ldr r0, [r0] ldrb r1, [r6] @@ -764397,7 +764397,7 @@ _0818C288: adds r0, r1 ldr r1, =bx_move_anim_2 + 1 str r1, [r0] -_0818C2A6: +@0818C2A6: pop {r4-r6} pop {r0} bx r0 @@ -764406,7 +764406,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 @@ -764439,21 +764439,21 @@ bx_move_anim_2: @ 818C2B8 adds r0, r1 ldrb r2, [r0, 0x4] cmp r2, 0x1 - beq _0818C350 + beq @0818C350 cmp r2, 0x1 - bgt _0818C310 + bgt @0818C310 cmp r2, 0 - beq _0818C31A - b _0818C42C + beq @0818C31A + b @0818C42C .align 2, 0 .pool -_0818C310: +@0818C310: cmp r2, 0x2 - beq _0818C37A + beq @0818C37A cmp r2, 0x3 - beq _0818C3F0 - b _0818C42C -_0818C31A: + beq @0818C3F0 + b @0818C42C +@0818C31A: ldr r1, [r5] lsls r0, r3, 2 adds r1, r0, r1 @@ -764461,7 +764461,7 @@ _0818C31A: movs r0, 0xC ands r0, r2 cmp r0, 0x4 - bne _0818C33C + bne @0818C33C movs r0, 0x8 orrs r0, r2 strb r0, [r1] @@ -764470,7 +764470,7 @@ _0818C31A: adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -_0818C33C: +@0818C33C: ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -764480,13 +764480,13 @@ _0818C33C: adds r0, r2 movs r1, 0x1 strb r1, [r0, 0x4] - b _0818C42C -_0818C350: + b @0818C42C +@0818C350: ldrb r1, [r0] movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _0818C42C + bne @0818C42C movs r0, 0 bl sub_805EB9C adds r0, r4, 0 @@ -764500,15 +764500,15 @@ _0818C350: adds r0, r2 movs r1, 0x2 strb r1, [r0, 0x4] - b _0818C42C -_0818C37A: + b @0818C42C +@0818C37A: ldr r0, =0x020383f8 ldr r0, [r0] bl _call_via_r0 ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 - bne _0818C42C + bne @0818C42C movs r0, 0x1 bl sub_805EB9C ldr r0, [r7] @@ -764520,10 +764520,10 @@ _0818C37A: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _0818C3C8 + beq @0818C3C8 mov r0, r8 cmp r0, 0x1 - bhi _0818C3C8 + bhi @0818C3C8 adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x6 @@ -764538,7 +764538,7 @@ _0818C37A: negs r0, r0 ands r0, r2 strb r0, [r1] -_0818C3C8: +@0818C3C8: ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -764550,17 +764550,17 @@ _0818C3C8: adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x4] - b _0818C42C + b @0818C42C .align 2, 0 .pool -_0818C3F0: +@0818C3F0: ldrb r1, [r0] movs r0, 0x40 ands r0, r1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _0818C42C + bne @0818C42C bl sub_805E394 ldrb r0, [r6] lsls r2, r0, 9 @@ -764581,7 +764581,7 @@ _0818C3F0: adds r0, r2 strb r4, [r0, 0x4] bl sub_818A514 -_0818C42C: +@0818C42C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -764592,7 +764592,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 @@ -764623,7 +764623,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} @@ -764631,7 +764631,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 @@ -764639,7 +764639,7 @@ sub_818C49C: @ 818C49C ldrb r1, [r1, 0x4] lsrs r0, 1 cmp r1, r0 - bcc _0818C4C6 + bcc @0818C4C6 ldr r0, =0x02024064 ldrb r0, [r0] bl sub_8185054 @@ -764650,7 +764650,7 @@ sub_818C49C: @ 818C49C movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb bl sub_818A514 -_0818C4C6: +@0818C4C6: pop {r0} bx r0 .align 2, 0 @@ -764658,7 +764658,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] @@ -764666,7 +764666,7 @@ sub_818C4D8: @ 818C4D8 lsls r1, 10 ands r0, r1 cmp r0, 0 - beq _0818C508 + beq @0818C508 ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -764674,10 +764674,10 @@ sub_818C4D8: @ 818C4D8 adds r0, r1 ldr r1, =sub_818C49C + 1 str r1, [r0] - b _0818C522 + b @0818C522 .align 2, 0 .pool -_0818C508: +@0818C508: ldr r0, =0x02024064 ldrb r0, [r0] bl sub_8185054 @@ -764688,7 +764688,7 @@ _0818C508: movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb bl sub_818A514 -_0818C522: +@0818C522: pop {r0} bx r0 .align 2, 0 @@ -764696,7 +764696,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} @@ -764704,7 +764704,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] @@ -764712,7 +764712,7 @@ sub_818C538: @ 818C538 lsls r1, 10 ands r0, r1 cmp r0, 0 - beq _0818C560 + beq @0818C560 bl sub_805D19C adds r2, r0, 0 lsls r2, 16 @@ -764720,10 +764720,10 @@ sub_818C538: @ 818C538 movs r0, 0x1 movs r1, 0xA bl dp01_build_cmdbuf_x21_a_bb - b _0818C584 + b @0818C584 .align 2, 0 .pool -_0818C560: +@0818C560: ldr r5, =0x02024064 ldrb r0, [r5] bl sub_8185054 @@ -764739,7 +764739,7 @@ _0818C560: movs r0, 0x1 movs r1, 0xA bl dp01_build_cmdbuf_x21_a_bb -_0818C584: +@0818C584: bl sub_818A514 pop {r4,r5} pop {r0} @@ -764749,7 +764749,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} @@ -764757,7 +764757,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] @@ -764785,7 +764785,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} @@ -764793,7 +764793,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 @@ -764818,7 +764818,7 @@ sub_818C5E8: @ 818C5E8 asrs r7, r1, 16 ldr r0, =0x00007fff cmp r7, r0 - beq _0818C678 + beq @0818C678 ldr r6, =0x0202406e lsls r0, r4, 1 adds r0, r6 @@ -764848,10 +764848,10 @@ sub_818C5E8: @ 818C5E8 str r7, [sp] mov r2, r8 bl sub_807294C - b _0818C6B2 + b @0818C6B2 .align 2, 0 .pool -_0818C678: +@0818C678: ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -764878,7 +764878,7 @@ _0818C678: movs r1, 0 movs r2, 0 bl heathbar_draw_hp -_0818C6B2: +@0818C6B2: ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -764898,7 +764898,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} @@ -764906,14 +764906,14 @@ 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] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne _0818C748 + bne @0818C748 ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 @@ -764947,7 +764947,7 @@ sub_818C6F4: @ 818C6F4 adds r0, r1 ldr r1, =sub_818A58C + 1 str r1, [r0] -_0818C748: +@0818C748: pop {r4} pop {r0} bx r0 @@ -764956,14 +764956,14 @@ _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] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne _0818C7BC + bne @0818C7BC ldr r4, =0x02023064 ldrb r3, [r5] lsls r3, 9 @@ -764995,7 +764995,7 @@ sub_818C76C: @ 818C76C adds r0, r1 ldr r1, =sub_818A58C + 1 str r1, [r0] -_0818C7BC: +@0818C7BC: pop {r4,r5} pop {r0} bx r0 @@ -765004,7 +765004,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} @@ -765012,7 +765012,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} @@ -765020,7 +765020,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} @@ -765028,7 +765028,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} @@ -765036,7 +765036,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} @@ -765044,7 +765044,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} @@ -765052,7 +765052,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} @@ -765060,7 +765060,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} @@ -765068,7 +765068,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} @@ -765076,7 +765076,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] @@ -765092,7 +765092,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 @@ -765118,7 +765118,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] @@ -765133,7 +765133,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] @@ -765155,7 +765155,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 @@ -765171,12 +765171,12 @@ sub_818C8D4: @ 818C8D4 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - bge _0818C908 + bge @0818C908 bl sub_818A514 - b _0818C932 + b @0818C932 .align 2, 0 .pool -_0818C908: +@0818C908: ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] @@ -765197,7 +765197,7 @@ _0818C908: adds r0, r1 ldr r1, =sub_818A238 + 1 str r1, [r0] -_0818C932: +@0818C932: pop {r4} pop {r0} bx r0 @@ -765206,7 +765206,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} @@ -765214,7 +765214,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] @@ -765222,9 +765222,9 @@ sub_818C950: @ 818C950 lsls r0, 24 movs r3, 0x3F cmp r0, 0 - bne _0818C964 + bne @0818C964 movs r3, 0xC0 -_0818C964: +@0818C964: ldr r2, =0x02023064 ldrb r1, [r4] lsls r1, 9 @@ -765248,7 +765248,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 @@ -765258,7 +765258,7 @@ sub_818C994: @ 818C994 adds r0, r3, r0 ldrb r0, [r0] cmp r0, 0 - beq _0818C9D0 + beq @0818C9D0 bl sub_805EA60 ldrb r1, [r5] lsls r1, 9 @@ -765271,10 +765271,10 @@ sub_818C994: @ 818C994 lsls r1, 8 orrs r0, r1 bl song_play_for_text - b _0818C9E4 + b @0818C9E4 .align 2, 0 .pool -_0818C9D0: +@0818C9D0: adds r0, r4, 0x1 adds r0, r3, r0 ldrb r0, [r0] @@ -765284,7 +765284,7 @@ _0818C9D0: lsls r1, 8 orrs r0, r1 bl fanfare_play -_0818C9E4: +@0818C9E4: bl sub_818A514 pop {r4,r5} pop {r0} @@ -765292,7 +765292,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 @@ -765320,7 +765320,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 @@ -765343,7 +765343,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 @@ -765430,7 +765430,7 @@ sub_818CA64: @ 818CA64 lsls r1, 18 ands r0, r1 cmp r0, 0 - beq _0818CB54 + beq @0818CB54 ldr r4, =0x020229e8 ldrb r0, [r6] bl sub_806D864 @@ -765439,14 +765439,14 @@ sub_818CA64: @ 818CA64 lsls r1, 2 adds r1, r4 ldrb r0, [r1, 0x13] - b _0818CB5A + b @0818CB5A .align 2, 0 .pool -_0818CB54: +@0818CB54: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] -_0818CB5A: +@0818CB5A: ldr r1, =0x08305d8c lsls r0, 3 adds r0, r1 @@ -765496,7 +765496,7 @@ _0818CB5A: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0818CBD4 + beq @0818CBD4 ldr r0, =0x020244b4 adds r0, r2, r0 ldrb r1, [r0] @@ -765506,7 +765506,7 @@ _0818CB5A: adds r0, r4 ldr r1, =sub_8073C30 + 1 str r1, [r0] -_0818CBD4: +@0818CBD4: ldr r0, [r3] ldr r2, [r0, 0x8] ldrb r0, [r2, 0x9] @@ -765527,7 +765527,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 @@ -765544,13 +765544,13 @@ sub_818CC24: @ 818CC24 movs r3, 0xA ldrsh r0, [r1, r3] cmp r0, 0x17 - bgt _0818CC50 + bgt @0818CC50 adds r0, r2, 0x1 strh r0, [r1, 0xA] - b _0818CD0C + b @0818CD0C .align 2, 0 .pool -_0818CC50: +@0818CC50: ldr r7, =0x02024064 ldrb r0, [r7] mov r9, r0 @@ -765559,14 +765559,14 @@ _0818CC50: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _0818CC70 + beq @0818CC70 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _0818CCA0 -_0818CC70: + beq @0818CCA0 +@0818CC70: ldr r0, =0x02023064 ldrb r1, [r7] lsls r2, r1, 9 @@ -765580,10 +765580,10 @@ _0818CC70: ldrb r0, [r7] movs r1, 0 bl sub_818BA6C - b _0818CCF4 + b @0818CCF4 .align 2, 0 .pool -_0818CCA0: +@0818CCA0: ldr r4, =0x02023064 ldrb r0, [r7] lsls r1, r0, 9 @@ -765623,7 +765623,7 @@ _0818CCA0: ldrb r0, [r7] eors r0, r6 strb r0, [r7] -_0818CCF4: +@0818CCF4: ldr r1, =0x03005d60 ldr r2, =0x02024064 ldrb r0, [r2] @@ -765635,7 +765635,7 @@ _0818CCF4: strb r3, [r2] mov r0, r8 bl remove_task -_0818CD0C: +@0818CD0C: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -765647,7 +765647,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 @@ -765657,17 +765657,17 @@ sub_818CD30: @ 818CD30 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _0818CD60 + beq @0818CD60 adds r0, r2, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _0818CD60 + bne @0818CD60 bl sub_818A514 - b _0818CDD4 + b @0818CDD4 .align 2, 0 .pool -_0818CD60: +@0818CD60: ldr r6, =0x020244d0 ldr r0, [r6] ldr r5, =0x02024064 @@ -765710,7 +765710,7 @@ _0818CD60: adds r0, r4 ldrb r0, [r0] cmp r0, 0 - beq _0818CDC8 + beq @0818CDC8 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -765719,14 +765719,14 @@ _0818CD60: adds r0, r1 movs r1, 0x5D strb r1, [r0, 0x5] -_0818CDC8: +@0818CDC8: ldr r0, =0x03005d60 ldrb r1, [r5] lsls r1, 2 adds r1, r0 ldr r0, =bx_increment_dp11b_field_5_till_x60_then_resume + 1 str r0, [r1] -_0818CDD4: +@0818CDD4: pop {r4-r6} pop {r0} bx r0 @@ -765735,7 +765735,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] @@ -765752,7 +765752,7 @@ bx_increment_dp11b_field_5_till_x60_then_resume: @ 818CDF4 lsls r1, 24 lsrs r1, 24 cmp r1, 0x5C - bls _0818CE2C + bls @0818CE2C ldr r0, [r4] ldrb r1, [r3] ldr r2, [r0, 0x4] @@ -765763,7 +765763,7 @@ bx_increment_dp11b_field_5_till_x60_then_resume: @ 818CDF4 movs r1, 0 strb r1, [r0, 0x5] bl sub_818A514 -_0818CE2C: +@0818CE2C: pop {r4} pop {r0} bx r0 @@ -765772,7 +765772,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] @@ -765787,7 +765787,7 @@ sub_818CE3C: @ 818CE3C movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0818CE6E + beq @0818CE6E ldr r2, =0x03005e00 ldr r0, =0x020244b4 adds r0, r3, r0 @@ -765798,7 +765798,7 @@ sub_818CE3C: @ 818CE3C adds r0, r2 ldr r1, =sub_8073C30 + 1 str r1, [r0] -_0818CE6E: +@0818CE6E: bl sub_818A514 pop {r0} bx r0 @@ -765807,7 +765807,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} @@ -765815,14 +765815,14 @@ 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] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 - beq _0818CEDE + beq @0818CEDE ldr r3, =0x02020630 ldr r0, =0x020241e4 ldrb r1, [r4] @@ -765849,7 +765849,7 @@ sub_818CE98: @ 818CE98 strb r0, [r2] ldrb r0, [r4] bl sub_805E408 -_0818CEDE: +@0818CEDE: bl sub_818A514 pop {r4} pop {r0} @@ -765859,7 +765859,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 @@ -765867,7 +765867,7 @@ sub_818CEF8: @ 818CEF8 bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne _0818CF50 + bne @0818CF50 ldr r5, =0x02023064 ldrb r2, [r6] lsls r1, r2, 9 @@ -765888,19 +765888,19 @@ sub_818CEF8: @ 818CEF8 bl move_anim_start_t3 lsls r0, 24 cmp r0, 0 - beq _0818CF44 + beq @0818CF44 bl sub_818A514 - b _0818CF50 + b @0818CF50 .align 2, 0 .pool -_0818CF44: +@0818CF44: ldr r0, =0x03005d60 ldrb r1, [r6] lsls r1, 2 adds r1, r0 ldr r0, =sub_818A5BC + 1 str r0, [r1] -_0818CF50: +@0818CF50: add sp, 0x4 pop {r4-r6} pop {r0} @@ -765910,7 +765910,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} @@ -765918,7 +765918,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} @@ -765926,7 +765926,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 @@ -765956,22 +765956,22 @@ 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, =0x0860b058 ldr r3, =0x0203cd04 movs r2, 0x7 -_0818CFD4: +@0818CFD4: adds r1, r3, 0 adds r0, r4, 0 ldm r0!, {r5-r7} @@ -765979,7 +765979,7 @@ _0818CFD4: adds r3, 0xC subs r2, 0x1 cmp r2, 0 - bge _0818CFD4 + bge @0818CFD4 movs r0, 0 pop {r4-r7} pop {r1} @@ -765989,8 +765989,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 @@ -766007,70 +766007,70 @@ load_pokemon_image_TODO: @ 818CFF4 lsrs r1, 24 adds r0, r1, 0 cmp r3, 0 - bne _0818D068 + bne @0818D068 cmp r2, 0 - beq _0818D034 + beq @0818D034 cmp r1, 0 - bne _0818D028 + bne @0818D028 lsls r0, r4, 3 ldr r1, =0x0830a18c - b _0818D03C + b @0818D03C .align 2, 0 .pool -_0818D028: +@0818D028: lsls r0, r4, 3 ldr r1, =0x0830a18c - b _0818D054 + b @0818D054 .align 2, 0 .pool -_0818D034: +@0818D034: cmp r0, 0 - bne _0818D050 + bne @0818D050 lsls r0, r4, 3 ldr r1, =0x083028b8 -_0818D03C: +@0818D03C: adds r0, r1 str r2, [sp] adds r1, r5, 0 adds r2, r4, 0 adds r3, r6, 0 bl sub_8034654 - b _0818D08E + b @0818D08E .align 2, 0 .pool -_0818D050: +@0818D050: lsls r0, r4, 3 ldr r1, =0x083028b8 -_0818D054: +@0818D054: adds r0, r1 str r2, [sp] adds r1, r5, 0 adds r2, r4, 0 adds r3, r6, 0 bl sub_8034B7C - b _0818D08E + b @0818D08E .align 2, 0 .pool -_0818D068: +@0818D068: cmp r2, 0 - beq _0818D080 + beq @0818D080 lsls r0, r4, 3 ldr r1, =0x08305654 adds r0, r1 adds r1, r5, 0 adds r2, r4, 0 bl sub_80345F0 - b _0818D08E + b @0818D08E .align 2, 0 .pool -_0818D080: +@0818D080: lsls r0, r7, 3 ldr r1, =0x08305d4c adds r0, r1 adds r1, r5, 0 adds r2, r7, 0 bl sub_80345F0 -_0818D08E: +@0818D08E: movs r0, 0 add sp, 0x4 pop {r4-r7} @@ -766081,7 +766081,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] @@ -766104,7 +766104,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} @@ -766123,10 +766123,10 @@ sub_818D0C4: @ 818D0C4 adds r1, r3, 0 lsls r2, 24 cmp r2, 0 - bne _0818D128 + bne @0818D128 ldr r0, =0x0000ffff cmp r3, r0 - bne _0818D110 + bne @0818D110 ldr r2, =0x0203ccec ldrh r1, [r2, 0x2] adds r0, r3, 0 @@ -766137,10 +766137,10 @@ sub_818D0C4: @ 818D0C4 mov r2, r8 bl species_and_otid_get_pal lsls r1, r5, 20 - b _0818D144 + b @0818D144 .align 2, 0 .pool -_0818D110: +@0818D110: ldr r0, =0x0203ccec strh r3, [r0, 0x2] adds r0, r4, 0 @@ -766148,13 +766148,13 @@ _0818D110: mov r2, r8 bl sub_806E7CC bl gpu_pal_obj_decompress_and_apply - b _0818D16E + b @0818D16E .align 2, 0 .pool -_0818D128: +@0818D128: ldr r0, =0x0000ffff cmp r3, r0 - bne _0818D160 + bne @0818D160 ldr r2, =0x0203ccec ldrh r1, [r2, 0x2] adds r0, r3, 0 @@ -766166,24 +766166,24 @@ _0818D128: ldr r0, [r0] mov r2, r12 lsls r1, r2, 20 -_0818D144: +@0818D144: movs r2, 0x80 lsls r2, 17 adds r1, r2 lsrs r1, 16 movs r2, 0x20 bl decompress_palette - b _0818D16E + b @0818D16E .align 2, 0 .pool -_0818D160: +@0818D160: ldr r0, =0x0203ccec strh r1, [r0, 0x2] lsls r0, r6, 3 ldr r1, =0x0830593c adds r0, r1 bl gpu_pal_obj_decompress_and_apply -_0818D16E: +@0818D16E: pop {r3} mov r8, r3 pop {r4-r7} @@ -766194,7 +766194,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] @@ -766204,14 +766204,14 @@ sub_818D180: @ 818D180 lsrs r4, r3, 24 lsls r1, 24 cmp r1, 0 - bne _0818D1A4 + bne @0818D1A4 adds r1, r5, 0 bl species_and_otid_get_pal lsls r1, r4, 4 movs r2, 0x20 bl decompress_palette - b _0818D1B4 -_0818D1A4: + b @0818D1B4 +@0818D1A4: ldr r1, =0x0830593c lsls r0, 3 adds r0, r1 @@ -766219,7 +766219,7 @@ _0818D1A4: lsls r1, r4, 4 movs r2, 0x20 bl decompress_palette -_0818D1B4: +@0818D1B4: pop {r4,r5} pop {r0} bx r0 @@ -766228,23 +766228,23 @@ _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 - bne _0818D1D8 + bne @0818D1D8 ldr r1, =0x0203ccec ldr r0, =0x082ff70c str r0, [r1, 0x8] - b _0818D1E0 + b @0818D1E0 .align 2, 0 .pool -_0818D1D8: +@0818D1D8: ldr r0, =0x0203ccec ldr r1, =0x0830536c ldr r1, [r1] str r1, [r0, 0x8] -_0818D1E0: +@0818D1E0: pop {r0} bx r0 .align 2, 0 @@ -766252,7 +766252,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 @@ -766296,42 +766296,42 @@ oamt_spawn_poke_or_trainer_picture: @ 818D1EC ldr r1, =0x0203cd04 ldrb r0, [r1, 0xB] cmp r0, 0 - beq _0818D25C -_0818D244: + beq @0818D25C +@0818D244: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bhi _0818D25C + bhi @0818D25C lsls r0, r4, 1 adds r0, r4 lsls r0, 2 adds r0, r1 ldrb r0, [r0, 0xB] cmp r0, 0 - bne _0818D244 -_0818D25C: + bne @0818D244 +@0818D25C: cmp r4, 0x8 - beq _0818D280 + beq @0818D280 movs r0, 0x80 lsls r0, 6 bl malloc adds r7, r0, 0 cmp r7, 0 - beq _0818D280 + beq @0818D280 movs r0, 0x20 bl malloc mov r8, r0 cmp r0, 0 - bne _0818D28C + bne @0818D28C adds r0, r7, 0 bl free -_0818D280: +@0818D280: ldr r0, =0x0000ffff - b _0818D356 + b @0818D356 .align 2, 0 .pool -_0818D28C: +@0818D28C: mov r1, r9 str r1, [sp] str r5, [sp, 0x4] @@ -766342,7 +766342,7 @@ _0818D28C: bl load_pokemon_image_TODO lsls r0, 16 cmp r0, 0 - bne _0818D280 + bne @0818D280 lsls r2, r4, 1 str r2, [sp, 0x2C] ldr r5, =0x0203ccec @@ -766360,14 +766360,14 @@ _0818D28C: adds r1, r7, 0 adds r6, r3, 0 movs r2, 0x3 -_0818D2C6: +@0818D2C6: str r1, [r0] strh r3, [r0, 0x4] adds r0, 0x8 adds r1, r6 subs r2, 0x1 cmp r2, 0 - bge _0818D2C6 + bge @0818D2C6 ldr r0, =0x0000ffff strh r0, [r5] mov r0, r12 @@ -766401,7 +766401,7 @@ _0818D2C6: adds r6, r2, 0 ldr r0, =0x0000ffff cmp r10, r0 - bne _0818D336 + bne @0818D336 ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 @@ -766414,7 +766414,7 @@ _0818D2C6: ands r0, r2 orrs r0, r3 strb r0, [r1, 0x5] -_0818D336: +@0818D336: ldr r1, =0x0203cd04 ldr r2, [sp, 0x2C] adds r0, r2, r4 @@ -766431,7 +766431,7 @@ _0818D336: movs r0, 0x1 strb r0, [r2, 0xB] adds r0, r6, 0 -_0818D356: +@0818D356: add sp, 0x30 pop {r3-r5} mov r8, r3 @@ -766445,7 +766445,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 @@ -766496,7 +766496,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 @@ -766530,56 +766530,56 @@ sub_818D3E4: @ 818D3E4 ldr r1, =0x0203cd04 ldrb r0, [r1, 0xB] cmp r0, 0 - beq _0818D440 -_0818D428: + beq @0818D440 +@0818D428: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x7 - bhi _0818D440 + bhi @0818D440 lsls r0, r5, 1 adds r0, r5 lsls r0, 2 adds r0, r1 ldrb r0, [r0, 0xB] cmp r0, 0 - bne _0818D428 -_0818D440: + bne @0818D428 +@0818D440: cmp r5, 0x8 - beq _0818D47C + beq @0818D47C movs r0, 0x80 lsls r0, 6 bl malloc adds r7, r0, 0 cmp r7, 0 - beq _0818D47C + beq @0818D47C movs r0, 0x80 ands r0, r6 cmp r0, 0 - beq _0818D468 + beq @0818D468 movs r0, 0x7F ands r6, r0 movs r0, 0x3 mov r9, r0 - b _0818D46A + b @0818D46A .align 2, 0 .pool -_0818D468: +@0818D468: mov r9, r6 -_0818D46A: +@0818D46A: movs r0, 0x20 bl malloc mov r8, r0 cmp r0, 0 - bne _0818D484 + bne @0818D484 adds r0, r7, 0 bl free -_0818D47C: +@0818D47C: ldr r0, =0x0000ffff - b _0818D588 + b @0818D588 .align 2, 0 .pool -_0818D484: +@0818D484: movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -766590,7 +766590,7 @@ _0818D484: bl load_pokemon_image_TODO lsls r0, 16 cmp r0, 0 - bne _0818D47C + bne @0818D47C lsls r1, r5, 1 str r1, [sp, 0x28] ldr r4, =0x0203ccec @@ -766609,14 +766609,14 @@ _0818D484: adds r1, r7, 0 adds r6, r3, 0 movs r2, 0x3 -_0818D4C0: +@0818D4C0: str r1, [r0] strh r3, [r0, 0x4] adds r0, 0x8 adds r1, r6 subs r2, 0x1 cmp r2, 0 - bge _0818D4C0 + bge @0818D4C0 ldr r0, =0x0000ffff strh r0, [r4] ldr r0, =0x08309aac @@ -766627,29 +766627,29 @@ _0818D4C0: str r2, [r4, 0xC] mov r0, r9 cmp r0, 0x1 - bne _0818D4F8 + bne @0818D4F8 ldr r0, =0x082ff694 - b _0818D500 + b @0818D500 .align 2, 0 .pool -_0818D4F8: +@0818D4F8: mov r1, r9 cmp r1, 0 - bne _0818D510 + bne @0818D510 ldr r0, =0x082ff618 -_0818D500: +@0818D500: str r0, [r4, 0x10] ldr r0, =0x0860b06c str r0, [r4, 0x4] - b _0818D518 + b @0818D518 .align 2, 0 .pool -_0818D510: +@0818D510: ldr r0, =0x0860b064 str r0, [r4, 0x4] ldr r0, =0x082ec6a8 str r0, [r4, 0x10] -_0818D518: +@0818D518: ldr r2, =nullsub_122 + 1 str r2, [r4, 0x14] ldr r0, [sp, 0x1C] @@ -766674,7 +766674,7 @@ _0818D518: ldr r0, =0x0000ffff ldr r1, [sp, 0x1C] cmp r1, r0 - bne _0818D566 + bne @0818D566 ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 @@ -766687,7 +766687,7 @@ _0818D518: ands r0, r2 orrs r0, r3 strb r0, [r1, 0x5] -_0818D566: +@0818D566: ldr r1, =0x0203cd04 ldr r2, [sp, 0x28] adds r0, r2, r5 @@ -766705,7 +766705,7 @@ _0818D566: movs r0, 0x1 strb r0, [r2, 0xB] adds r0, r6, 0 -_0818D588: +@0818D588: add sp, 0x2C pop {r3-r5} mov r8, r3 @@ -766719,7 +766719,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} @@ -766730,29 +766730,29 @@ sub_818D5B0: @ 818D5B0 ldrb r1, [r0, 0xA] adds r3, r0, 0 cmp r1, r4 - beq _0818D5E0 + beq @0818D5E0 adds r1, r3, 0 -_0818D5C8: +@0818D5C8: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x7 - bhi _0818D5E0 + bhi @0818D5E0 lsls r0, r2, 1 adds r0, r2 lsls r0, 2 adds r0, r1 ldrb r0, [r0, 0xA] cmp r0, r4 - bne _0818D5C8 -_0818D5E0: + bne @0818D5C8 +@0818D5E0: cmp r2, 0x8 - bne _0818D5F0 + bne @0818D5F0 ldr r0, =0x0000ffff - b _0818D646 + b @0818D646 .align 2, 0 .pool -_0818D5F0: +@0818D5F0: lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -766766,7 +766766,7 @@ _0818D5F0: ldr r0, =0x0000ffff lsls r6, r4, 4 cmp r1, r0 - beq _0818D624 + beq @0818D624 ldr r1, =0x02020630 adds r0, r6, r4 lsls r0, 2 @@ -766777,7 +766777,7 @@ _0818D5F0: lsls r0, 16 lsrs r0, 16 bl gpu_pal_free_tag -_0818D624: +@0818D624: adds r0, r6, r4 lsls r0, 2 ldr r1, =0x02020630 @@ -766792,7 +766792,7 @@ _0818D624: ldm r0!, {r2-r4} stm r1!, {r2-r4} movs r0, 0 -_0818D646: +@0818D646: pop {r3} mov r8, r3 pop {r4-r7} @@ -766803,7 +766803,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 @@ -766838,7 +766838,7 @@ sub_818D65C: @ 818D65C bl sub_818D09C lsls r0, 16 cmp r0, 0 - bne _0818D6B8 + bne @0818D6B8 str r6, [sp] adds r0, r5, 0 mov r1, r9 @@ -766846,10 +766846,10 @@ sub_818D65C: @ 818D65C mov r3, r8 bl sub_818D180 movs r0, 0 - b _0818D6BA -_0818D6B8: + b @0818D6BA +@0818D6B8: ldr r0, =0x0000ffff -_0818D6BA: +@0818D6BA: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -766862,7 +766862,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 @@ -766899,7 +766899,7 @@ sub_818D6CC: @ 818D6CC bl malloc adds r4, r0, 0 cmp r4, 0 - beq _0818D762 + beq @0818D762 str r6, [sp] mov r0, r9 ldr r1, [sp, 0x1C] @@ -766908,7 +766908,7 @@ sub_818D6CC: @ 818D6CC bl sub_818D09C lsls r0, 16 cmp r0, 0 - bne _0818D762 + bne @0818D762 movs r0, 0x40 str r0, [sp] str r0, [sp, 0x4] @@ -766932,10 +766932,10 @@ sub_818D6CC: @ 818D6CC adds r0, r4, 0 bl free movs r0, 0 - b _0818D764 -_0818D762: + b @0818D764 +@0818D762: ldr r0, =0x0000ffff -_0818D764: +@0818D764: add sp, 0x24 pop {r3-r5} mov r8, r3 @@ -766949,7 +766949,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 @@ -767000,7 +767000,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} @@ -767039,7 +767039,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 @@ -767051,7 +767051,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] @@ -767078,7 +767078,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} @@ -767117,7 +767117,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 @@ -767154,7 +767154,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 @@ -767166,7 +767166,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 @@ -767195,7 +767195,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 @@ -767232,27 +767232,27 @@ 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 lsls r1, 24 lsrs r1, 24 cmp r1, 0x1 - bne _0818D9A2 + bne @0818D9A2 cmp r0, 0 - beq _0818D99C + beq @0818D99C ldr r0, =0x0831f578 adds r0, 0x3F ldrb r0, [r0] - b _0818D9A2 + b @0818D9A2 .align 2, 0 .pool -_0818D99C: +@0818D99C: ldr r0, =0x0831f578 adds r0, 0x3C ldrb r0, [r0] -_0818D9A2: +@0818D9A2: pop {r1} bx r1 .align 2, 0 @@ -767260,7 +767260,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 @@ -767272,7 +767272,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, =0x0860b07e @@ -767287,7 +767287,7 @@ sub_818D9C0: @ 818D9C0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _0818DA20 + bne @0818DA20 ldr r0, =0x03005d8c ldr r1, [r0] ldr r0, =0x00003b58 @@ -767301,13 +767301,13 @@ sub_818D9C0: @ 818D9C0 bl var_set ldr r1, =0x020375f0 movs r0, 0x1 - b _0818DA24 + b @0818DA24 .align 2, 0 .pool -_0818DA20: +@0818DA20: ldr r1, =0x020375f0 movs r0, 0 -_0818DA24: +@0818DA24: strh r0, [r1] pop {r4,r5} pop {r0} @@ -767317,7 +767317,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] @@ -767331,63 +767331,63 @@ sub_818DA30: @ 818DA30 lsrs r0, 17 adds r1, r0, 0 cmp r0, 0x1 - beq _0818DA68 + beq @0818DA68 cmp r0, 0x1 - bgt _0818DA5C + bgt @0818DA5C cmp r0, 0 - beq _0818DA62 - b _0818DA72 + beq @0818DA62 + b @0818DA72 .align 2, 0 .pool -_0818DA5C: +@0818DA5C: cmp r1, 0x2 - beq _0818DA6E - b _0818DA72 -_0818DA62: + beq @0818DA6E + b @0818DA72 +@0818DA62: bl sub_818DF68 - b _0818DA72 -_0818DA68: + b @0818DA72 +@0818DA68: bl sub_818DB7C - b _0818DA72 -_0818DA6E: + b @0818DA72 +@0818DA6E: bl sub_818E638 -_0818DA72: +@0818DA72: pop {r0} bx r0 thumb_func_end sub_818DA30 thumb_func_start sub_818DA78 -sub_818DA78: @ 818DA78 +sub_818DA78: ; 818DA78 push {lr} bl sub_818D9AC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _0818DA9C + beq @0818DA9C cmp r0, 0x1 - bgt _0818DA90 + bgt @0818DA90 cmp r0, 0 - beq _0818DA96 - b _0818DAA6 -_0818DA90: + beq @0818DA96 + b @0818DAA6 +@0818DA90: cmp r0, 0x2 - beq _0818DAA2 - b _0818DAA6 -_0818DA96: + beq @0818DAA2 + b @0818DAA6 +@0818DA96: bl sub_818E004 - b _0818DAA6 -_0818DA9C: + b @0818DAA6 +@0818DA9C: bl sub_818DBC4 - b _0818DAA6 -_0818DAA2: + b @0818DAA6 +@0818DAA2: bl sub_818E674 -_0818DAA6: +@0818DAA6: pop {r0} bx r0 thumb_func_end sub_818DA78 thumb_func_start sub_818DAAC -sub_818DAAC: @ 818DAAC +sub_818DAAC: ; 818DAAC push {lr} bl GenerateRandomNumber lsls r0, 16 @@ -767398,31 +767398,31 @@ sub_818DAAC: @ 818DAAC lsrs r0, 24 adds r1, r0, 0 cmp r0, 0x1 - beq _0818DADC + beq @0818DADC cmp r0, 0x1 - bgt _0818DAD0 + bgt @0818DAD0 cmp r0, 0 - beq _0818DAD6 - b _0818DAE6 -_0818DAD0: + beq @0818DAD6 + b @0818DAE6 +@0818DAD0: cmp r1, 0x2 - beq _0818DAE2 - b _0818DAE6 -_0818DAD6: + beq @0818DAE2 + b @0818DAE6 +@0818DAD6: bl sub_818DF68 - b _0818DAE6 -_0818DADC: + b @0818DAE6 +@0818DADC: bl sub_818DB7C - b _0818DAE6 -_0818DAE2: + b @0818DAE6 +@0818DAE2: bl sub_818E638 -_0818DAE6: +@0818DAE6: pop {r0} bx r0 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 @@ -767437,27 +767437,27 @@ 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 - b _0818DB14 -_0818DB0C: + b @0818DB14 +@0818DB0C: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 adds r1, 0x2 -_0818DB14: +@0818DB14: ldrh r0, [r1] cmp r0, 0 - bne _0818DB0C + bne @0818DB0C adds r0, r2, 0 pop {r1} bx r1 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 @@ -767500,7 +767500,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 @@ -767533,7 +767533,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] @@ -767551,7 +767551,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 @@ -767561,25 +767561,25 @@ sub_818DBE8: @ 818DBE8 str r0, [r1] ldrb r0, [r0, 0x1] cmp r0, 0x2 - bne _0818DC0C + bne @0818DC0C movs r0, 0x2 - b _0818DC16 + b @0818DC16 .align 2, 0 .pool -_0818DC0C: +@0818DC0C: cmp r0, 0x1 - beq _0818DC14 + beq @0818DC14 movs r0, 0 - b _0818DC16 -_0818DC14: + b @0818DC16 +@0818DC14: movs r0, 0x1 -_0818DC16: +@0818DC16: pop {r1} bx r1 thumb_func_end sub_818DBE8 thumb_func_start sub_818DC1C -sub_818DC1C: @ 818DC1C +sub_818DC1C: ; 818DC1C lsls r0, 24 ldr r1, =0x0860b224 lsrs r0, 22 @@ -767591,7 +767591,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 @@ -767613,7 +767613,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 @@ -767623,12 +767623,12 @@ sub_818DC60: @ 818DC60 str r0, [r5] ldrb r0, [r0, 0x4] cmp r0, 0xFF - bne _0818DC84 + bne @0818DC84 movs r0, 0 - b _0818DC9C + b @0818DC9C .align 2, 0 .pool -_0818DC84: +@0818DC84: ldr r4, =0x02021ec4 ldr r0, =0x00003b5c adds r1, r0 @@ -767639,7 +767639,7 @@ _0818DC84: adds r0, r4, 0 bl sub_8009308 movs r0, 0x1 -_0818DC9C: +@0818DC9C: pop {r4,r5} pop {r1} bx r1 @@ -767648,7 +767648,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 @@ -767663,7 +767663,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 @@ -767681,7 +767681,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 @@ -767698,7 +767698,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 @@ -767723,7 +767723,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] @@ -767740,7 +767740,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} @@ -767748,7 +767748,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} @@ -767788,9 +767788,9 @@ sub_818DD84: @ 818DD84 movs r7, 0 movs r3, 0 cmp r7, r6 - bcs _0818DE36 + bcs @0818DE36 mov r12, r8 -_0818DDDC: +@0818DDDC: ldr r2, [r4] ldrb r0, [r2, 0xC] lsls r0, 2 @@ -767800,7 +767800,7 @@ _0818DDDC: adds r0, r1 ldrh r0, [r0] cmp r0, r5 - bne _0818DE28 + bne @0818DE28 movs r7, 0x1 ldrb r0, [r2, 0x3] adds r0, 0x1 @@ -767810,21 +767810,21 @@ _0818DDDC: ldr r1, [r4] ldrh r0, [r1, 0x10] cmp r0, r5 - bne _0818DE36 + bne @0818DE36 movs r0, 0x5 strb r0, [r1, 0x3] - b _0818DE36 + b @0818DE36 .align 2, 0 .pool -_0818DE28: +@0818DE28: movs r0, 0 strb r0, [r2, 0x2] adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, r6 - bcc _0818DDDC -_0818DE36: + bcc @0818DDDC +@0818DE36: adds r0, r7, 0 pop {r3} mov r8, r3 @@ -767834,7 +767834,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] @@ -767848,7 +767848,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 @@ -767859,9 +767859,9 @@ sub_818DE5C: @ 818DE5C ldrb r0, [r0, 0x3] movs r1, 0 cmp r0, 0x4 - bls _0818DE74 + bls @0818DE74 movs r1, 0x1 -_0818DE74: +@0818DE74: adds r0, r1, 0 pop {r1} bx r1 @@ -767870,7 +767870,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 @@ -767884,7 +767884,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 @@ -767911,7 +767911,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 @@ -767925,7 +767925,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} @@ -767933,7 +767933,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 @@ -767946,7 +767946,7 @@ sub_818DF00: @ 818DF00 lsls r0, r4, 2 adds r6, r0, r1 adds r7, r5, 0 -_0818DF1A: +@0818DF1A: ldr r2, [r5] lsls r1, r3, 1 adds r2, 0x2 @@ -767959,7 +767959,7 @@ _0818DF1A: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x8 - bls _0818DF1A + bls @0818DF1A ldr r2, [r7] ldr r0, =0x0860b1e4 lsls r1, r4, 1 @@ -767983,7 +767983,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 @@ -768001,7 +768001,7 @@ sub_818DF68: @ 818DF68 adds r5, r4, 0 ldr r0, =0x0000ffff adds r2, r0, 0 -_0818DF8A: +@0818DF8A: ldr r1, [r5] lsls r0, r3, 1 adds r1, 0x2 @@ -768013,7 +768013,7 @@ _0818DF8A: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x8 - bls _0818DF8A + bls @0818DF8A ldr r0, [r4] ldr r1, =0x0000ffff strh r1, [r0, 0x14] @@ -768023,7 +768023,7 @@ _0818DF8A: movs r3, 0 adds r5, r4, 0 movs r2, 0 -_0818DFB4: +@0818DFB4: ldr r0, [r5] lsls r1, r3, 1 adds r0, 0x20 @@ -768033,7 +768033,7 @@ _0818DFB4: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3 - bls _0818DFB4 + bls @0818DFB4 ldr r0, [r4] movs r2, 0 movs r1, 0 @@ -768057,7 +768057,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] @@ -768080,7 +768080,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 @@ -768090,25 +768090,25 @@ sub_818E038: @ 818E038 str r0, [r1] ldrb r0, [r0, 0x1] cmp r0, 0x2 - bne _0818E05C + bne @0818E05C movs r0, 0x2 - b _0818E066 + b @0818E066 .align 2, 0 .pool -_0818E05C: +@0818E05C: cmp r0, 0x1 - beq _0818E064 + beq @0818E064 movs r0, 0 - b _0818E066 -_0818E064: + b @0818E066 +@0818E064: movs r0, 0x1 -_0818E066: +@0818E066: pop {r1} bx r1 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 @@ -768121,7 +768121,7 @@ sub_818E06C: @ 818E06C ldrh r0, [r7, 0x14] bl sub_811F8D8 cmp r0, 0 - bne _0818E0EC + bne @0818E0EC ldr r1, =0x00003b83 adds r0, r4, r1 ldrb r5, [r0] @@ -768131,18 +768131,18 @@ sub_818E06C: @ 818E06C adds r1, r4 mov r10, r1 ldr r6, =0x0860b1e4 -_0818E09A: +@0818E09A: adds r5, 0x1 cmp r5, 0xF - ble _0818E0A2 + ble @0818E0A2 movs r5, 0 -_0818E0A2: +@0818E0A2: lsls r4, r5, 1 adds r0, r4, r6 ldrh r0, [r0] bl sub_811F8D8 cmp r0, 0 - beq _0818E09A + beq @0818E09A movs r3, 0 ldr r0, =0x0860b1e4 mov r12, r0 @@ -768152,7 +768152,7 @@ _0818E0A2: ldr r0, =0x0860b1a4 adds r6, r1, r0 mov r2, r8 -_0818E0C2: +@0818E0C2: lsls r0, r3, 1 ldr r1, [r6] adds r0, r1 @@ -768161,7 +768161,7 @@ _0818E0C2: adds r2, 0x2 adds r3, 0x1 cmp r3, 0x8 - ble _0818E0C2 + ble @0818E0C2 mov r1, r12 adds r0, r4, r1 ldrh r0, [r0] @@ -768174,29 +768174,29 @@ _0818E0C2: strb r5, [r0] movs r0, 0xFF strb r0, [r7, 0x18] -_0818E0EC: +@0818E0EC: bl sub_818E13C lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _0818E118 + bne @0818E118 movs r0, 0x2 - b _0818E12C + b @0818E12C .align 2, 0 .pool -_0818E118: +@0818E118: cmp r0, 0x2 - beq _0818E126 + beq @0818E126 bl sub_818E1F4 lsls r0, 24 cmp r0, 0 - beq _0818E12A -_0818E126: + beq @0818E12A +@0818E126: movs r0, 0x1 - b _0818E12C -_0818E12A: + b @0818E12C +@0818E12A: movs r0, 0 -_0818E12C: +@0818E12C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -768207,7 +768207,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 @@ -768218,15 +768218,15 @@ sub_818E13C: @ 818E13C str r0, [r5] ldrb r0, [r0, 0x18] cmp r0, 0xFF - bne _0818E174 + bne @0818E174 ldr r0, =0x02021cc4 ldr r1, =0x085eeb7e bl strcpy_limit_7_chars movs r7, 0 - b _0818E1DC + b @0818E1DC .align 2, 0 .pool -_0818E174: +@0818E174: ldr r4, =0x02021cc4 ldr r0, =0x00003b70 adds r1, r0 @@ -768248,22 +768248,22 @@ _0818E174: lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bne _0818E1DC + bne @0818E1DC ldr r0, [r5] movs r2, 0 cmp r2, r4 - bcs _0818E1DC + bcs @0818E1DC ldr r1, [r6] ldrb r0, [r0, 0x18] ldrb r1, [r1] cmp r0, r1 - bne _0818E1DA -_0818E1BA: + bne @0818E1DA +@0818E1BA: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, r4 - bcs _0818E1DC + bcs @0818E1DC ldr r0, =0x0203cd68 ldr r1, [r0] adds r1, 0x18 @@ -768274,10 +768274,10 @@ _0818E1BA: ldrb r1, [r1] ldrb r0, [r0] cmp r1, r0 - beq _0818E1BA -_0818E1DA: + beq @0818E1BA +@0818E1DA: movs r7, 0x2 -_0818E1DC: +@0818E1DC: adds r0, r7, 0 pop {r4-r7} pop {r1} @@ -768287,7 +768287,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 @@ -768306,13 +768306,13 @@ sub_818E1F4: @ 818E1F4 adds r3, r0, 0 ldrb r2, [r2, 0xA] cmp r1, r2 - bne _0818E23A -_0818E21A: + bne @0818E23A +@0818E21A: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bhi _0818E23C + bhi @0818E23C ldr r1, [r6] lsls r0, r4, 1 adds r1, 0x20 @@ -768323,10 +768323,10 @@ _0818E21A: ldrh r1, [r1] ldrb r0, [r0] cmp r1, r0 - beq _0818E21A -_0818E23A: + beq @0818E21A +@0818E23A: movs r5, 0x1 -_0818E23C: +@0818E23C: adds r0, r5, 0 pop {r4-r6} pop {r1} @@ -768336,27 +768336,27 @@ _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 - b _0818E268 -_0818E260: + b @0818E268 +@0818E260: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 adds r1, 0x1 -_0818E268: +@0818E268: ldrb r0, [r1] cmp r0, 0xFF - bne _0818E260 + bne @0818E260 adds r0, r2, 0 pop {r1} bx r1 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 @@ -768374,7 +768374,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 @@ -768385,19 +768385,19 @@ sub_818E298: @ 818E298 bl sub_818E13C lsls r0, 24 cmp r0, 0 - beq _0818E2C0 + beq @0818E2C0 movs r0, 0 - b _0818E2CC + b @0818E2CC .align 2, 0 .pool -_0818E2C0: +@0818E2C0: ldr r0, [r4] ldr r1, =gUnknown_82E9531 ldrb r1, [r1] adds r0, 0x2D strb r1, [r0] movs r0, 0x1 -_0818E2CC: +@0818E2CC: pop {r4} pop {r1} bx r1 @@ -768406,7 +768406,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] @@ -768422,7 +768422,7 @@ sub_818E2D8: @ 818E2D8 thumb_func_end sub_818E2D8 thumb_func_start sub_818E2FC -sub_818E2FC: @ 818E2FC +sub_818E2FC: ; 818E2FC push {lr} bl sub_811A4F0 pop {r0} @@ -768430,7 +768430,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 @@ -768452,9 +768452,9 @@ sub_818E308: @ 818E308 bl sub_8008C44 movs r1, 0 cmp r0, 0 - bne _0818E33C + bne @0818E33C movs r1, 0x1 -_0818E33C: +@0818E33C: adds r0, r1, 0 pop {r4-r6} pop {r1} @@ -768464,7 +768464,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] @@ -768480,7 +768480,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] @@ -768495,7 +768495,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] @@ -768510,7 +768510,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] @@ -768525,7 +768525,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} @@ -768533,7 +768533,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 @@ -768544,20 +768544,20 @@ sub_818E3EC: @ 818E3EC bl sub_818E298 lsls r0, 24 cmp r0, 0 - beq _0818E41C + beq @0818E41C ldr r0, [r4] adds r1, r0, 0 adds r1, 0x2B ldrb r1, [r1] adds r0, 0x2C - b _0818E422 + b @0818E422 .align 2, 0 .pool -_0818E41C: +@0818E41C: ldr r0, [r4] adds r0, 0x2C movs r1, 0x10 -_0818E422: +@0818E422: strb r1, [r0] bl sub_818DF00 pop {r4} @@ -768566,7 +768566,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 @@ -768579,7 +768579,7 @@ sub_818E430: @ 818E430 adds r4, r5, 0 ldr r0, =0x0000ffff adds r3, r0, 0 -_0818E448: +@0818E448: ldr r1, [r4] lsls r0, r2, 1 adds r1, 0x2 @@ -768591,7 +768591,7 @@ _0818E448: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x8 - bls _0818E448 + bls @0818E448 ldr r1, [r5] ldr r0, =0x0000ffff strh r0, [r1, 0x14] @@ -768603,7 +768603,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 @@ -768616,7 +768616,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] @@ -768629,7 +768629,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 @@ -768645,7 +768645,7 @@ sub_818E4A4: @ 818E4A4 ldr r6, =0x03005d90 adds r5, r4, 0 adds r2, r6, 0 -_0818E4C2: +@0818E4C2: ldr r1, [r5] lsls r0, r3, 1 adds r1, 0x20 @@ -768659,7 +768659,7 @@ _0818E4C2: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3 - bls _0818E4C2 + bls @0818E4C2 ldr r0, [r4] adds r0, 0x18 ldr r1, [r6] @@ -768677,7 +768677,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] @@ -768694,7 +768694,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 @@ -768712,7 +768712,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} @@ -768720,7 +768720,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 @@ -768733,18 +768733,18 @@ sub_818E570: @ 818E570 ldrb r4, [r6] adds r7, r2, 0 cmp r4, 0xF - bhi _0818E5EC + bhi @0818E5EC ldrb r0, [r3] cmp r0, 0 - bne _0818E5EC + bne @0818E5EC movs r5, 0 ldr r2, =0x00003b83 adds r0, r1, r2 ldrb r0, [r0] cmp r4, r0 - bne _0818E5E4 + bne @0818E5E4 adds r4, r7, 0 -_0818E59E: +@0818E59E: bl GenerateRandomNumber ldr r2, [r4] lsls r0, 16 @@ -768757,14 +768757,14 @@ _0818E59E: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bhi _0818E5C6 + bhi @0818E5C6 ldr r0, [r4] adds r0, 0x2B ldrb r1, [r6] ldrb r0, [r0] cmp r1, r0 - beq _0818E59E -_0818E5C6: + beq @0818E59E +@0818E5C6: ldr r0, [r4] adds r2, r0, 0 adds r2, 0x2B @@ -768772,7 +768772,7 @@ _0818E5C6: ldr r7, =0x0203cd68 ldrb r4, [r2] cmp r0, r4 - bne _0818E5E4 + bne @0818E5E4 ldrb r1, [r2] adds r3, r1, 0x1 adds r0, r3, 0 @@ -768780,12 +768780,12 @@ _0818E5C6: lsls r0, 4 subs r0, r3, r0 strb r0, [r2] -_0818E5E4: +@0818E5E4: ldr r0, [r7] ldrb r1, [r6] adds r0, 0x2C strb r1, [r0] -_0818E5EC: +@0818E5EC: pop {r4-r7} pop {r0} bx r0 @@ -768794,7 +768794,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] @@ -768822,7 +768822,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 @@ -768848,7 +768848,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 @@ -768864,13 +768864,13 @@ sub_818E674: @ 818E674 ldr r2, [r2] ldrb r0, [r2, 0x2] cmp r0, 0x5 - beq _0818E69A + beq @0818E69A ldrb r0, [r2, 0x3] cmp r0, 0x5 - bne _0818E69E -_0818E69A: + bne @0818E69E +@0818E69A: bl sub_818E604 -_0818E69E: +@0818E69E: pop {r0} bx r0 .align 2, 0 @@ -768878,7 +768878,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 @@ -768890,7 +768890,7 @@ sub_818E6B0: @ 818E6B0 str r1, [r4] ldrb r0, [r1, 0xC] cmp r0, r2 - bhi _0818E6EA + bhi @0818E6EA strb r2, [r1, 0xC] ldr r0, [r4] adds r0, 0x4 @@ -768907,7 +768907,7 @@ sub_818E6B0: @ 818E6B0 ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r1, 0xE] -_0818E6EA: +@0818E6EA: pop {r4} pop {r0} bx r0 @@ -768916,7 +768916,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 @@ -768930,43 +768930,43 @@ sub_818E704: @ 818E704 ldrb r0, [r0, 0xD] adds r5, r1, 0 cmp r0, 0x4 - bhi _0818E76A + bhi @0818E76A lsls r0, 2 - ldr r1, =_0818E73C + ldr r1, =@0818E73C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0818E73C: - .4byte _0818E750 - .4byte _0818E754 - .4byte _0818E758 - .4byte _0818E75C - .4byte _0818E760 -_0818E750: +@0818E73C: + .4byte @0818E750 + .4byte @0818E754 + .4byte @0818E758 + .4byte @0818E75C + .4byte @0818E760 +@0818E750: ldrb r0, [r2, 0x1] - b _0818E762 -_0818E754: + b @0818E762 +@0818E754: ldrb r0, [r2, 0x2] - b _0818E762 -_0818E758: + b @0818E762 +@0818E758: ldrb r0, [r2, 0x3] - b _0818E762 -_0818E75C: + b @0818E762 +@0818E75C: ldrb r0, [r2, 0x4] - b _0818E762 -_0818E760: + b @0818E762 +@0818E760: ldrb r0, [r2, 0x5] -_0818E762: +@0818E762: cmp r0, 0 - beq _0818E76A + beq @0818E76A adds r3, r0, 0 movs r4, 0x1 -_0818E76A: +@0818E76A: cmp r4, 0x1 - bne _0818E784 + bne @0818E784 adds r0, r3, 0 bl sub_818E6B0 ldr r0, =0x0203cd6c @@ -768974,15 +768974,15 @@ _0818E76A: ldrb r0, [r1, 0x2] adds r0, 0x1 strb r0, [r1, 0x2] - b _0818E78C + b @0818E78C .align 2, 0 .pool -_0818E784: +@0818E784: ldr r1, [r5] ldrb r0, [r1, 0x3] adds r0, 0x1 strb r0, [r1, 0x3] -_0818E78C: +@0818E78C: adds r0, r4, 0 pop {r4,r5} pop {r1} @@ -768990,7 +768990,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 @@ -769021,7 +769021,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 @@ -769047,7 +769047,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 @@ -769066,7 +769066,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] @@ -769081,7 +769081,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, =0x0860b338 @@ -769096,7 +769096,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 @@ -769106,25 +769106,25 @@ sub_818E880: @ 818E880 str r0, [r1] ldrb r0, [r0, 0x2] cmp r0, 0x4 - bls _0818E8A4 + bls @0818E8A4 movs r0, 0x1 - b _0818E8AE + b @0818E8AE .align 2, 0 .pool -_0818E8A4: +@0818E8A4: cmp r0, 0 - beq _0818E8AC + beq @0818E8AC movs r0, 0 - b _0818E8AE -_0818E8AC: + b @0818E8AE +@0818E8AC: movs r0, 0x2 -_0818E8AE: +@0818E8AE: pop {r1} bx r1 thumb_func_end sub_818E880 thumb_func_start sub_818E8B4 -sub_818E8B4: @ 818E8B4 +sub_818E8B4: ; 818E8B4 push {lr} ldr r1, =0x0203cd6c ldr r0, =0x03005d8c @@ -769134,20 +769134,20 @@ sub_818E8B4: @ 818E8B4 str r0, [r1] ldrb r0, [r0, 0x1] cmp r0, 0x1 - beq _0818E8D8 + beq @0818E8D8 movs r0, 0 - b _0818E8DA + b @0818E8DA .align 2, 0 .pool -_0818E8D8: +@0818E8D8: movs r0, 0x1 -_0818E8DA: +@0818E8DA: pop {r1} bx r1 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 @@ -769158,13 +769158,13 @@ sub_818E8E0: @ 818E8E0 str r2, [r1] ldrb r0, [r2, 0x2] cmp r0, 0x4 - bhi _0818E8FC + bhi @0818E8FC ldrb r0, [r2, 0x3] cmp r0, 0x4 - bls _0818E8FE -_0818E8FC: + bls @0818E8FE +@0818E8FC: movs r3, 0x1 -_0818E8FE: +@0818E8FE: adds r0, r3, 0 pop {r4} pop {r1} @@ -769174,7 +769174,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 @@ -769186,7 +769186,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 + 1 movs r0, 0x3 @@ -769198,7 +769198,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] @@ -769213,7 +769213,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] @@ -769233,7 +769233,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] @@ -769247,7 +769247,7 @@ sub_818E990: @ 818E990 thumb_func_end sub_818E990 thumb_func_start sub_818E9AC -sub_818E9AC: @ 818E9AC +sub_818E9AC: ; 818E9AC push {lr} ldr r1, =0x0860d090 ldr r0, =0x020375e0 @@ -769263,7 +769263,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] @@ -769312,7 +769312,7 @@ sub_818E9CC: @ 818E9CC ldr r1, [r1] ands r0, r1 cmp r0, 0 - bne _0818EA3E + bne @0818EA3E lsls r0, r5, 1 lsls r1, r7, 2 adds r0, r1 @@ -769320,7 +769320,7 @@ sub_818E9CC: @ 818E9CC adds r1, r4, r2 adds r1, r0 strh r6, [r1] -_0818EA3E: +@0818EA3E: ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x4 @@ -769341,7 +769341,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] @@ -769357,29 +769357,29 @@ sub_818EA84: @ 818EA84 ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x9 - bls _0818EAA8 - b _0818ED10 -_0818EAA8: + bls @0818EAA8 + b @0818ED10 +@0818EAA8: lsls r0, 2 - ldr r1, =_0818EAC8 + ldr r1, =@0818EAC8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0818EAC8: - .4byte _0818EAF0 - .4byte _0818EB14 - .4byte _0818EB48 - .4byte _0818EB64 - .4byte _0818EB80 - .4byte _0818EB98 - .4byte _0818EBB4 - .4byte _0818EC40 - .4byte _0818ECD0 - .4byte _0818ECF4 -_0818EAF0: +@0818EAC8: + .4byte @0818EAF0 + .4byte @0818EB14 + .4byte @0818EB48 + .4byte @0818EB64 + .4byte @0818EB80 + .4byte @0818EB98 + .4byte @0818EBB4 + .4byte @0818EC40 + .4byte @0818ECD0 + .4byte @0818ECF4 +@0818EAF0: ldr r3, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -769391,10 +769391,10 @@ _0818EAF0: adds r0, r1 ldrh r0, [r0] strh r0, [r3] - b _0818ED10 + b @0818ED10 .align 2, 0 .pool -_0818EB14: +@0818EB14: ldr r4, =0x020375f0 ldr r0, =0x03005d90 ldr r2, [r0] @@ -769412,10 +769412,10 @@ _0818EB14: orrs r0, r1 lsrs r0, 31 strh r0, [r4] - b _0818ED10 + b @0818ED10 .align 2, 0 .pool -_0818EB48: +@0818EB48: ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -769423,10 +769423,10 @@ _0818EB48: adds r0, r2 ldrb r0, [r0] lsls r0, 31 - b _0818ECBE + b @0818ECBE .align 2, 0 .pool -_0818EB64: +@0818EB64: ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -769434,19 +769434,19 @@ _0818EB64: adds r0, r3 ldrb r0, [r0] lsls r0, 30 - b _0818ECBE + b @0818ECBE .align 2, 0 .pool -_0818EB80: +@0818EB80: ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] ldr r2, =0x00000d08 adds r0, r2 - b _0818ECBA + b @0818ECBA .align 2, 0 .pool -_0818EB98: +@0818EB98: ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -769454,18 +769454,18 @@ _0818EB98: adds r0, r3 ldrb r0, [r0] lsls r0, 28 - b _0818ECBE + b @0818ECBE .align 2, 0 .pool -_0818EBB4: +@0818EBB4: ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bne _0818EC04 + bne @0818EC04 cmp r5, 0 - beq _0818EBE8 + beq @0818EBE8 ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -769473,10 +769473,10 @@ _0818EBB4: adds r0, r2 ldrb r0, [r0] lsls r0, 26 - b _0818ECBE + b @0818ECBE .align 2, 0 .pool -_0818EBE8: +@0818EBE8: ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -769484,12 +769484,12 @@ _0818EBE8: adds r0, r3 ldrb r0, [r0] lsls r0, 27 - b _0818ECBE + b @0818ECBE .align 2, 0 .pool -_0818EC04: +@0818EC04: cmp r5, 0 - beq _0818EC24 + beq @0818EC24 ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -769497,10 +769497,10 @@ _0818EC04: adds r0, r2 ldrb r0, [r0] lsls r0, 30 - b _0818ECBE + b @0818ECBE .align 2, 0 .pool -_0818EC24: +@0818EC24: ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -769508,18 +769508,18 @@ _0818EC24: adds r0, r3 ldrb r0, [r0] lsls r0, 31 - b _0818ECBE + b @0818ECBE .align 2, 0 .pool -_0818EC40: +@0818EC40: ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bne _0818EC90 + bne @0818EC90 cmp r5, 0 - beq _0818EC74 + beq @0818EC74 ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -769528,10 +769528,10 @@ _0818EC40: ldrb r0, [r0] lsrs r0, 7 strh r0, [r1] - b _0818ED10 + b @0818ED10 .align 2, 0 .pool -_0818EC74: +@0818EC74: ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -769539,12 +769539,12 @@ _0818EC74: adds r0, r3 ldrb r0, [r0] lsls r0, 25 - b _0818ECBE + b @0818ECBE .align 2, 0 .pool -_0818EC90: +@0818EC90: cmp r5, 0 - beq _0818ECB0 + beq @0818ECB0 ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -769552,25 +769552,25 @@ _0818EC90: adds r0, r2 ldrb r0, [r0] lsls r0, 28 - b _0818ECBE + b @0818ECBE .align 2, 0 .pool -_0818ECB0: +@0818ECB0: ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] ldr r3, =0x00000d08 adds r0, r3 -_0818ECBA: +@0818ECBA: ldrb r0, [r0] lsls r0, 29 -_0818ECBE: +@0818ECBE: lsrs r0, 31 strh r0, [r1] - b _0818ED10 + b @0818ED10 .align 2, 0 .pool -_0818ECD0: +@0818ECD0: bl sub_81B8558 ldr r2, =0x0203cef8 ldr r0, =0x03005d90 @@ -769583,10 +769583,10 @@ _0818ECD0: ldrh r0, [r0] lsrs r0, 8 strb r0, [r2, 0x1] - b _0818ED10 + b @0818ED10 .align 2, 0 .pool -_0818ECF4: +@0818ECF4: ldr r2, =0x020375f0 ldr r0, =0x03005d90 ldr r1, [r0] @@ -769601,7 +769601,7 @@ _0818ECF4: ldrb r1, [r1] adds r0, r1 strh r0, [r2] -_0818ED10: +@0818ED10: pop {r4-r6} pop {r0} bx r0 @@ -769610,7 +769610,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] @@ -769626,28 +769626,28 @@ sub_818ED28: @ 818ED28 ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x8 - bls _0818ED4C - b _0818F01E -_0818ED4C: + bls @0818ED4C + b @0818F01E +@0818ED4C: lsls r0, 2 - ldr r1, =_0818ED6C + ldr r1, =@0818ED6C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0818ED6C: - .4byte _0818ED90 - .4byte _0818EDB4 - .4byte _0818EE10 - .4byte _0818EE34 - .4byte _0818EE5C - .4byte _0818EE78 - .4byte _0818EEA0 - .4byte _0818EF50 - .4byte _0818F008 -_0818ED90: +@0818ED6C: + .4byte @0818ED90 + .4byte @0818EDB4 + .4byte @0818EE10 + .4byte @0818EE34 + .4byte @0818EE5C + .4byte @0818EE78 + .4byte @0818EEA0 + .4byte @0818EF50 + .4byte @0818F008 +@0818ED90: ldr r0, =0x03005d90 ldr r2, [r0] lsls r0, r4, 1 @@ -769659,14 +769659,14 @@ _0818ED90: ldr r0, =0x020375e4 ldrh r0, [r0] strh r0, [r2] - b _0818F01E + b @0818F01E .align 2, 0 .pool -_0818EDB4: +@0818EDB4: ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0 - beq _0818EDE8 + beq @0818EDE8 ldr r0, =0x03005d90 ldr r2, [r0] ldr r0, =0x00000cdc @@ -769680,10 +769680,10 @@ _0818EDB4: ldr r1, [r1] orrs r0, r1 str r0, [r2] - b _0818F01E + b @0818F01E .align 2, 0 .pool -_0818EDE8: +@0818EDE8: ldr r0, =0x03005d90 ldr r2, [r0] ldr r1, =0x00000cdc @@ -769697,10 +769697,10 @@ _0818EDE8: ldr r1, [r1] ands r0, r1 str r0, [r2] - b _0818F01E + b @0818F01E .align 2, 0 .pool -_0818EE10: +@0818EE10: ldr r0, =0x03005d90 ldr r2, [r0] ldr r0, =0x020375e4 @@ -769712,10 +769712,10 @@ _0818EE10: ldrb r3, [r2] movs r0, 0x2 negs r0, r0 - b _0818EF74 + b @0818EF74 .align 2, 0 .pool -_0818EE34: +@0818EE34: ldr r0, =0x03005d90 ldr r3, [r0] ldr r0, =0x020375e4 @@ -769728,20 +769728,20 @@ _0818EE34: ldrb r2, [r3] movs r0, 0x3 negs r0, r0 - b _0818EFF4 + b @0818EFF4 .align 2, 0 .pool -_0818EE5C: +@0818EE5C: ldr r0, =0x03005d90 ldr r3, [r0] ldr r0, =0x020375e4 ldrb r0, [r0] ldr r1, =0x00000d08 adds r3, r1 - b _0818EFE8 + b @0818EFE8 .align 2, 0 .pool -_0818EE78: +@0818EE78: ldr r0, =0x03005d90 ldr r3, [r0] ldr r0, =0x020375e4 @@ -769754,18 +769754,18 @@ _0818EE78: ldrb r2, [r3] movs r0, 0x9 negs r0, r0 - b _0818EFF4 + b @0818EFF4 .align 2, 0 .pool -_0818EEA0: +@0818EEA0: ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x1 - bne _0818EF00 + bne @0818EF00 cmp r4, 0 - beq _0818EEDC + beq @0818EEDC ldr r0, =0x03005d90 ldr r3, [r0] ldr r0, =0x020375e4 @@ -769777,10 +769777,10 @@ _0818EEA0: ldrb r2, [r3] movs r0, 0x21 negs r0, r0 - b _0818EFF4 + b @0818EFF4 .align 2, 0 .pool -_0818EEDC: +@0818EEDC: ldr r0, =0x03005d90 ldr r3, [r0] ldr r0, =0x020375e4 @@ -769792,12 +769792,12 @@ _0818EEDC: ldrb r2, [r3] movs r0, 0x11 negs r0, r0 - b _0818EFF4 + b @0818EFF4 .align 2, 0 .pool -_0818EF00: +@0818EF00: cmp r4, 0 - beq _0818EF2C + beq @0818EF2C ldr r0, =0x03005d90 ldr r3, [r0] ldr r0, =0x020375e4 @@ -769810,10 +769810,10 @@ _0818EF00: ldrb r2, [r3] movs r0, 0x3 negs r0, r0 - b _0818EFF4 + b @0818EFF4 .align 2, 0 .pool -_0818EF2C: +@0818EF2C: ldr r0, =0x03005d90 ldr r2, [r0] ldr r0, =0x020375e4 @@ -769825,18 +769825,18 @@ _0818EF2C: ldrb r3, [r2] movs r0, 0x2 negs r0, r0 - b _0818EF74 + b @0818EF74 .align 2, 0 .pool -_0818EF50: +@0818EF50: ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x1 - bne _0818EFB0 + bne @0818EFB0 cmp r4, 0 - beq _0818EF8C + beq @0818EF8C ldr r0, =0x03005d90 ldr r2, [r0] ldr r0, =0x020375e4 @@ -769846,14 +769846,14 @@ _0818EF50: lsls r1, 7 ldrb r3, [r2] movs r0, 0x7F -_0818EF74: +@0818EF74: ands r0, r3 orrs r0, r1 strb r0, [r2] - b _0818F01E + b @0818F01E .align 2, 0 .pool -_0818EF8C: +@0818EF8C: ldr r0, =0x03005d90 ldr r3, [r0] ldr r0, =0x020375e4 @@ -769865,12 +769865,12 @@ _0818EF8C: ldrb r2, [r3] movs r0, 0x41 negs r0, r0 - b _0818EFF4 + b @0818EFF4 .align 2, 0 .pool -_0818EFB0: +@0818EFB0: cmp r4, 0 - beq _0818EFDC + beq @0818EFDC ldr r0, =0x03005d90 ldr r3, [r0] ldr r0, =0x020375e4 @@ -769883,31 +769883,31 @@ _0818EFB0: ldrb r2, [r3] movs r0, 0x9 negs r0, r0 - b _0818EFF4 + b @0818EFF4 .align 2, 0 .pool -_0818EFDC: +@0818EFDC: ldr r0, =0x03005d90 ldr r3, [r0] ldr r0, =0x020375e4 ldrb r0, [r0] ldr r2, =0x00000d08 adds r3, r2 -_0818EFE8: +@0818EFE8: movs r1, 0x1 ands r1, r0 lsls r1, 2 ldrb r2, [r3] movs r0, 0x5 negs r0, r0 -_0818EFF4: +@0818EFF4: ands r0, r2 orrs r0, r1 strb r0, [r3] - b _0818F01E + b @0818F01E .align 2, 0 .pool -_0818F008: +@0818F008: ldr r0, =0x03005d90 ldr r2, [r0] ldr r0, =0x0203cef8 @@ -769919,7 +769919,7 @@ _0818F008: lsls r0, 4 adds r2, r0 strh r1, [r2] -_0818F01E: +@0818F01E: pop {r4,r5} pop {r0} bx r0 @@ -769928,7 +769928,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 @@ -769997,7 +769997,7 @@ sub_818F02C: @ 818F02C ldr r0, =0x02024488 mov r9, r0 movs r4, 0 -_0818F0BA: +@0818F0BA: mov r1, r8 ldr r0, [r1] ldr r2, =0x00000caa @@ -770020,7 +770020,7 @@ _0818F0BA: mov r0, r10 lsls r7, r0, 4 adds r6, r7, 0 -_0818F0E8: +@0818F0E8: mov r1, r8 ldr r0, [r1] ldr r2, =0x00000caa @@ -770043,10 +770043,10 @@ _0818F0E8: adds r6, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble _0818F0E8 + ble @0818F0E8 movs r5, 0 ldr r6, =0x03005d90 -_0818F11C: +@0818F11C: ldr r0, [r6] ldr r1, =0x00000caa adds r0, r1 @@ -770067,7 +770067,7 @@ _0818F11C: strb r0, [r1] adds r5, 0x1 cmp r5, 0x5 - ble _0818F11C + ble @0818F11C mov r5, r8 ldr r0, [r5] ldr r1, =0x00000caa @@ -770088,17 +770088,17 @@ _0818F11C: add r10, r5 mov r7, r10 cmp r7, 0x2 - ble _0818F0BA + ble @0818F0BA mov r10, r5 movs r0, 0x4 str r0, [sp, 0x34] movs r1, 0x6 str r1, [sp, 0x38] -_0818F17E: +@0818F17E: mov r2, r10 cmp r2, 0x5 - ble _0818F22C -_0818F184: + ble @0818F22C +@0818F184: bl sub_81A39C4 lsls r0, 24 lsrs r0, 24 @@ -770108,7 +770108,7 @@ _0818F184: lsrs r4, r0, 16 movs r5, 0x1 cmp r5, r10 - bge _0818F1CA + bge @0818F1CA ldr r3, =0x03005d90 ldr r0, [r3] ldr r7, =0x00000d28 @@ -770118,12 +770118,12 @@ _0818F184: lsrs r0, 22 adds r2, r3, 0 cmp r0, r4 - beq _0818F1CA + beq @0818F1CA ldr r3, =0x00000d24 -_0818F1B2: +@0818F1B2: adds r5, 0x1 cmp r5, r10 - bge _0818F1CA + bge @0818F1CA ldr r0, [r2] lsls r1, r5, 2 adds r0, r1 @@ -770132,10 +770132,10 @@ _0818F1B2: lsls r0, 22 lsrs r0, 22 cmp r0, r4 - bne _0818F1B2 -_0818F1CA: + bne @0818F1B2 +@0818F1CA: cmp r5, r10 - bne _0818F184 + bne @0818F184 ldr r0, =0x03005d90 ldr r3, [r0] ldr r1, [sp, 0x34] @@ -770149,10 +770149,10 @@ _0818F1CA: ldrh r0, [r3] ldr r7, =0xfffffc00 adds r1, r7, 0 - b _0818F292 + b @0818F292 .align 2, 0 .pool -_0818F22C: +@0818F22C: bl sub_81A39C4 adds r0, 0x1 lsls r0, 24 @@ -770163,7 +770163,7 @@ _0818F22C: lsrs r4, r0, 16 movs r5, 0x1 cmp r5, r10 - bge _0818F274 + bge @0818F274 ldr r1, =0x03005d90 ldr r0, [r1] ldr r2, =0x00000d28 @@ -770173,12 +770173,12 @@ _0818F22C: lsrs r0, 22 adds r2, r1, 0 cmp r0, r4 - beq _0818F274 + beq @0818F274 ldr r3, =0x00000d24 -_0818F25C: +@0818F25C: adds r5, 0x1 cmp r5, r10 - bge _0818F274 + bge @0818F274 ldr r0, [r2] lsls r1, r5, 2 adds r0, r1 @@ -770187,10 +770187,10 @@ _0818F25C: lsls r0, 22 lsrs r0, 22 cmp r0, r4 - bne _0818F25C -_0818F274: + bne @0818F25C +@0818F274: cmp r5, r10 - bne _0818F22C + bne @0818F22C ldr r5, =0x03005d90 ldr r3, [r5] ldr r7, [sp, 0x34] @@ -770204,7 +770204,7 @@ _0818F274: ldrh r0, [r3] ldr r5, =0xfffffc00 adds r1, r5, 0 -_0818F292: +@0818F292: ands r0, r1 orrs r0, r2 strh r0, [r3] @@ -770213,14 +770213,14 @@ _0818F292: str r4, [sp, 0x2C] ldr r7, [sp, 0x38] str r7, [sp, 0x20] -_0818F2A2: +@0818F2A2: lsls r0, r5, 1 mov r9, r0 adds r1, r5, 0x1 str r1, [sp, 0x24] lsls r2, r5, 2 str r2, [sp, 0x28] -_0818F2AE: +@0818F2AE: ldr r3, [sp, 0x2C] lsrs r0, r3, 16 bl sub_8163524 @@ -770228,7 +770228,7 @@ _0818F2AE: lsrs r6, r0, 16 movs r7, 0 cmp r7, r5 - bge _0818F300 + bge @0818F300 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, [sp, 0x8] @@ -770239,32 +770239,32 @@ _0818F2AE: adds r0, r3 ldr r1, [sp, 0x20] adds r4, r1, r0 -_0818F2D4: +@0818F2D4: ldrh r3, [r4] cmp r3, r6 - beq _0818F300 + beq @0818F300 ldr r2, =0x0203bc8c ldr r1, [r2] lsls r0, r6, 4 adds r2, r0, r1 ldrh r0, [r2] cmp r8, r0 - beq _0818F300 + beq @0818F300 cmp r12, r0 - beq _0818F300 + beq @0818F300 lsls r0, r3, 4 adds r0, r1 ldrb r0, [r0, 0xA] ldrb r2, [r2, 0xA] cmp r0, r2 - beq _0818F300 + beq @0818F300 adds r4, 0x2 adds r7, 0x1 cmp r7, r5 - blt _0818F2D4 -_0818F300: + blt @0818F2D4 +@0818F300: cmp r7, r5 - bne _0818F2AE + bne @0818F2AE ldr r3, =0x03005d90 ldr r0, [r3] ldr r1, [sp, 0x38] @@ -770284,7 +770284,7 @@ _0818F300: str r0, [r2] ldr r5, [sp, 0x24] cmp r5, 0x2 - ble _0818F2A2 + ble @0818F2A2 ldr r2, [r3] ldr r7, [sp, 0x34] adds r2, r7 @@ -770323,9 +770323,9 @@ _0818F300: add r10, r0 mov r1, r10 cmp r1, 0xF - bgt _0818F37C - b _0818F17E -_0818F37C: + bgt @0818F37C + b @0818F17E +@0818F37C: movs r7, 0 ldr r2, [sp, 0x18] strh r7, [r2] @@ -770333,7 +770333,7 @@ _0818F37C: mov r10, r3 ldr r6, =0x0832a328 ldr r5, =0x083203cc -_0818F38A: +@0818F38A: ldr r0, =0x03005d90 ldr r0, [r0] mov r2, r10 @@ -770425,21 +770425,21 @@ _0818F38A: add r10, r0 mov r1, r10 cmp r1, 0x2 - ble _0818F38A + ble @0818F38A movs r4, 0 movs r1, 0x1 movs r5, 0x1F -_0818F458: +@0818F458: adds r0, r7, 0 ands r0, r1 cmp r0, 0 - beq _0818F462 + beq @0818F462 adds r4, 0x1 -_0818F462: +@0818F462: asrs r7, 1 subs r5, 0x1 cmp r5, 0 - bge _0818F458 + bge @0818F458 bl sub_8165C40 lsls r0, 24 lsrs r0, 24 @@ -770459,7 +770459,7 @@ _0818F462: adds r6, 0x2 movs r7, 0x2 str r7, [sp, 0x30] -_0818F494: +@0818F494: movs r7, 0 strh r7, [r6] ldr r1, =0x03005d90 @@ -770479,7 +770479,7 @@ _0818F494: movs r5, 0 ldr r0, [sp, 0x30] mov r9, r0 -_0818F4BC: +@0818F4BC: ldr r1, =0x03005d90 ldr r0, [r1] mov r4, r9 @@ -770547,21 +770547,21 @@ _0818F4BC: orrs r7, r0 adds r5, 0x1 cmp r5, 0x2 - ble _0818F4BC + ble @0818F4BC movs r4, 0 movs r1, 0x1 movs r5, 0x1F -_0818F54C: +@0818F54C: adds r0, r7, 0 ands r0, r1 cmp r0, 0 - beq _0818F556 + beq @0818F556 adds r4, 0x1 -_0818F556: +@0818F556: asrs r7, 1 subs r5, 0x1 cmp r5, 0 - bge _0818F54C + bge @0818F54C ldr r3, [sp, 0x14] adds r0, r4, 0 muls r0, r3 @@ -770578,30 +770578,30 @@ _0818F556: add r10, r7 mov r0, r10 cmp r0, 0xF - ble _0818F494 + ble @0818F494 movs r1, 0 mov r10, r1 ldr r2, =0x000003ff mov r8, r2 -_0818F58A: +@0818F58A: mov r5, r10 adds r5, 0x1 adds r7, r5, 0 cmp r5, 0xF - bgt _0818F626 + bgt @0818F626 mov r3, r10 lsls r0, r3, 1 ldr r1, [sp, 0x18] adds r6, r0, r1 lsls r0, r5, 1 adds r4, r0, r1 -_0818F5A0: +@0818F5A0: ldrh r1, [r6] ldrh r0, [r4] cmp r1, r0 - bcc _0818F5C2 + bcc @0818F5C2 cmp r1, r0 - bne _0818F61E + bne @0818F61E ldr r0, =0x03005d90 ldr r1, [r0] lsls r0, r5, 2 @@ -770612,18 +770612,18 @@ _0818F5A0: lsls r2, r0, 22 lsrs r0, r2, 22 cmp r0, r8 - bne _0818F602 -_0818F5C2: + bne @0818F602 +@0818F5C2: mov r0, r10 adds r1, r5, 0 ldr r2, [sp, 0x18] bl sub_818F904 - b _0818F600 + b @0818F600 .align 2, 0 .pool -_0818F600: - b _0818F61E -_0818F602: +@0818F600: + b @0818F61E +@0818F602: mov r3, r10 lsls r0, r3, 2 adds r0, r1, r0 @@ -770632,25 +770632,25 @@ _0818F602: ldrh r0, [r0] lsls r0, 22 cmp r0, r2 - bls _0818F61E + bls @0818F61E mov r0, r10 adds r1, r5, 0 ldr r2, [sp, 0x18] bl sub_818F904 -_0818F61E: +@0818F61E: adds r4, 0x2 adds r5, 0x1 cmp r5, 0xF - ble _0818F5A0 -_0818F626: + ble @0818F5A0 +@0818F626: mov r10, r7 mov r2, r10 cmp r2, 0xE - ble _0818F58A + ble @0818F58A bl sub_81A3610 lsls r0, 24 cmp r0, 0 - beq _0818F6EE + beq @0818F6EE movs r3, 0 mov r10, r3 ldr r0, =0x03005d90 @@ -770664,14 +770664,14 @@ _0818F626: adds r2, r0, 0 ldr r6, =0x0860d3f1 cmp r1, r3 - beq _0818F674 + beq @0818F674 adds r5, r2, 0 -_0818F656: +@0818F656: movs r7, 0x1 add r10, r7 mov r0, r10 cmp r0, 0xF - bgt _0818F674 + bgt @0818F674 ldr r0, [r5] mov r7, r10 lsls r1, r7, 2 @@ -770681,14 +770681,14 @@ _0818F656: lsls r0, 22 lsrs r0, 22 cmp r0, r3 - bne _0818F656 -_0818F674: + bne @0818F656 +@0818F674: mov r1, r10 lsls r0, r1, 1 adds r0, r6 ldrb r0, [r0] cmp r0, 0 - beq _0818F6AC + beq @0818F6AC movs r5, 0 ldr r2, [r2] ldr r3, =0x00000d24 @@ -770698,10 +770698,10 @@ _0818F674: ands r0, r1 ldr r7, =0x000003fe adds r1, r7, 0 - b _0818F6BE + b @0818F6BE .align 2, 0 .pool -_0818F6AC: +@0818F6AC: movs r5, 0x1 ldr r2, [r2] ldr r0, =0x00000d28 @@ -770711,7 +770711,7 @@ _0818F6AC: ands r0, r1 ldr r3, =0x000003fe adds r1, r3, 0 -_0818F6BE: +@0818F6BE: orrs r0, r1 strh r0, [r2] movs r7, 0 @@ -770719,7 +770719,7 @@ _0818F6BE: lsls r0, r5, 1 adds r0, r5 lsls r4, r0, 1 -_0818F6CC: +@0818F6CC: mov r1, r10 lsls r0, r1, 24 lsrs r0, 24 @@ -770735,8 +770735,8 @@ _0818F6CC: add r10, r3 mov r5, r10 cmp r5, 0x2 - ble _0818F6CC -_0818F6EE: + ble @0818F6CC +@0818F6EE: ldr r0, [sp, 0x18] bl free ldr r0, [sp, 0x1C] @@ -770754,7 +770754,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 @@ -770777,17 +770777,17 @@ sub_818F720: @ 818F720 adds r4, r5, 0 movs r3, 0x1 movs r2, 0x5 -_0818F74C: +@0818F74C: adds r0, r4, 0 ands r0, r3 cmp r0, 0 - beq _0818F756 + beq @0818F756 adds r1, 0x1 -_0818F756: +@0818F756: lsrs r4, 1 subs r2, 0x1 cmp r2, 0 - bge _0818F74C + bge @0818F74C movs r0, 0xFF lsls r0, 1 bl __divsi3 @@ -770799,29 +770799,29 @@ _0818F756: mov r12, r1 mov r1, sp movs r2, 0x5 -_0818F776: +@0818F776: mov r0, r12 str r0, [r1] adds r0, r5, 0 ands r0, r4 cmp r0, 0 - beq _0818F784 + beq @0818F784 str r3, [r1] -_0818F784: +@0818F784: lsls r0, r4, 25 lsrs r4, r0, 24 adds r1, 0x4 subs r2, 0x1 cmp r2, 0 - bge _0818F776 + bge @0818F776 ldr r0, =0x0000012f cmp r6, r0 - bne _0818F7A0 + bne @0818F7A0 movs r0, 0x1 - b _0818F7CA + b @0818F7CA .align 2, 0 .pool -_0818F7A0: +@0818F7A0: mov r2, r10 subs r0, r2, r6 lsls r0, 2 @@ -770833,9 +770833,9 @@ _0818F7A0: adds r1, r0, r2 ldr r0, [sp] cmp r0, 0 - bge _0818F7BA + bge @0818F7BA adds r0, 0x3 -_0818F7BA: +@0818F7BA: asrs r0, 2 adds r0, r1, r0 muls r0, r7 @@ -770843,7 +770843,7 @@ _0818F7BA: bl __divsi3 adds r0, r7 adds r0, 0xA -_0818F7CA: +@0818F7CA: mov r1, r8 str r0, [r1] mov r2, r10 @@ -770857,9 +770857,9 @@ _0818F7CA: adds r1, r0, r2 ldr r0, [sp, 0x4] cmp r0, 0 - bge _0818F7E8 + bge @0818F7E8 adds r0, 0x3 -_0818F7E8: +@0818F7E8: asrs r0, 2 adds r0, r1, r0 muls r0, r7 @@ -770884,9 +770884,9 @@ _0818F7E8: adds r1, r0, r2 ldr r0, [sp, 0x8] cmp r0, 0 - bge _0818F820 + bge @0818F820 adds r0, 0x3 -_0818F820: +@0818F820: asrs r0, 2 adds r0, r1, r0 muls r0, r7 @@ -770911,9 +770911,9 @@ _0818F820: adds r1, r0, r2 ldr r0, [sp, 0xC] cmp r0, 0 - bge _0818F858 + bge @0818F858 adds r0, 0x3 -_0818F858: +@0818F858: asrs r0, 2 adds r0, r1, r0 muls r0, r7 @@ -770938,9 +770938,9 @@ _0818F858: adds r1, r0, r2 ldr r0, [sp, 0x10] cmp r0, 0 - bge _0818F890 + bge @0818F890 adds r0, 0x3 -_0818F890: +@0818F890: asrs r0, 2 adds r0, r1, r0 muls r0, r7 @@ -770965,9 +770965,9 @@ _0818F890: adds r2, r0, r1 ldr r0, [sp, 0x14] cmp r0, 0 - bge _0818F8C8 + bge @0818F8C8 adds r0, 0x3 -_0818F8C8: +@0818F8C8: asrs r0, 2 adds r0, r2, r0 muls r0, r7 @@ -770999,7 +770999,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 @@ -771056,7 +771056,7 @@ sub_818F904: @ 818F904 lsls r3, r7, 1 ldr r7, =0x00000d64 movs r6, 0x2 -_0818F974: +@0818F974: mov r1, r8 ldr r0, [r1] adds r0, r7 @@ -771070,7 +771070,7 @@ _0818F974: adds r3, 0x2 subs r6, 0x1 cmp r6, 0 - bge _0818F974 + bge @0818F974 pop {r3-r5} mov r8, r3 mov r9, r4 @@ -771083,7 +771083,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, =0x085ccd20 @@ -771103,7 +771103,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, =0x085ccd20 @@ -771127,7 +771127,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 @@ -771162,7 +771162,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 @@ -771242,7 +771242,7 @@ sub_818FA74: @ 818FA74 ldr r3, =0x0203bc8c mov r4, r10 str r4, [sp, 0x20] -_0818FB18: +@0818FB18: ldr r7, =0x03005d90 ldr r1, [r7] ldr r2, [sp, 0x28] @@ -771284,14 +771284,14 @@ _0818FB18: adds r0, r4 ldrh r0, [r0] cmp r0, 0xDA - bne _0818FB74 + bne @0818FB74 movs r1, 0 add r0, sp, 0xC strb r1, [r0] -_0818FB74: +@0818FB74: adds r6, 0x1 cmp r6, 0x3 - ble _0818FB18 + ble @0818FB18 movs r0, 0x64 ldr r1, [sp, 0x10] adds r4, r1, 0 @@ -771334,7 +771334,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} @@ -771361,13 +771361,13 @@ sub_818FBDC: @ 818FBDC lsls r0, 16 lsrs r0, 16 cmp r0, 0x5 - bls _0818FC46 + bls @0818FC46 movs r4, 0 -_0818FC20: +@0818FC20: movs r0, 0x1 ands r0, r5 cmp r0, 0 - beq _0818FC3C + beq @0818FC3C lsls r2, r4, 24 lsrs r2, 24 adds r0, r6, 0 @@ -771377,19 +771377,19 @@ _0818FC20: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_0818FC3C: +@0818FC3C: asrs r5, 1 adds r4, 0x1 cmp r4, 0x2 - ble _0818FC20 - b _0818FC6C -_0818FC46: + ble @0818FC20 + b @0818FC6C +@0818FC46: movs r4, 0x2 -_0818FC48: +@0818FC48: movs r0, 0x4 ands r0, r5 cmp r0, 0 - beq _0818FC64 + beq @0818FC64 lsls r2, r4, 24 lsrs r2, 24 adds r0, r6, 0 @@ -771399,12 +771399,12 @@ _0818FC48: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_0818FC64: +@0818FC64: lsls r5, 1 subs r4, 0x1 cmp r4, 0 - bge _0818FC48 -_0818FC6C: + bge @0818FC48 +@0818FC6C: pop {r3} mov r8, r3 pop {r4-r7} @@ -771413,7 +771413,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 @@ -771422,33 +771422,33 @@ sub_818FC78: @ 818FC78 movs r1, 0x1 ands r1, r0 cmp r1, 0 - beq _0818FCA2 + beq @0818FCA2 adds r0, r4, 0 movs r1, 0 bl sub_818FCBC cmp r0, 0 - bne _0818FCB6 + bne @0818FCB6 adds r0, r4, 0 movs r1, 0x1 bl sub_818FDB8 - b _0818FCB6 -_0818FCA2: + b @0818FCB6 +@0818FCA2: adds r0, r5, 0 movs r1, 0 bl sub_818FDB8 cmp r0, 0 - bne _0818FCB6 + bne @0818FCB6 adds r0, r5, 0 movs r1, 0x1 bl sub_818FCBC -_0818FCB6: +@0818FCB6: pop {r4,r5} pop {r1} bx r1 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 @@ -771466,7 +771466,7 @@ sub_818FCBC: @ 818FCBC mov r1, r8 lsls r1, 2 str r1, [sp, 0x18] -_0818FCDE: +@0818FCDE: mov r2, r9 lsls r0, r2, 2 mov r2, sp @@ -771481,11 +771481,11 @@ _0818FCDE: mov r1, r9 lsls r1, 1 str r1, [sp, 0x10] -_0818FCFA: +@0818FCFA: movs r6, 0 adds r2, r7, 0x1 mov r10, r2 -_0818FD00: +@0818FD00: ldr r0, =0x03005d90 ldr r1, [r0] ldr r2, [sp, 0x18] @@ -771497,7 +771497,7 @@ _0818FD00: lsrs r0, 22 ldr r2, =0x000003fe cmp r0, r2 - bne _0818FD3C + bne @0818FD3C mov r1, r9 lsls r0, r1, 24 lsls r1, r7, 24 @@ -771507,10 +771507,10 @@ _0818FD00: adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - b _0818FD60 + b @0818FD60 .align 2, 0 .pool -_0818FD3C: +@0818FD3C: mov r2, r8 lsls r0, r2, 1 add r0, r8 @@ -771529,7 +771529,7 @@ _0818FD3C: adds r0, 0x2 adds r0, r1 ldrh r4, [r0] -_0818FD60: +@0818FD60: movs r0, 0x64 muls r0, r6 ldr r1, =0x020244ec @@ -771546,14 +771546,14 @@ _0818FD60: str r1, [r5] adds r6, 0x1 cmp r6, 0x2 - ble _0818FD00 + ble @0818FD00 mov r7, r10 cmp r7, 0x3 - ble _0818FCFA + ble @0818FCFA ldr r0, [sp, 0x14] mov r9, r0 cmp r0, 0x2 - ble _0818FCDE + ble @0818FCDE mov r0, sp ldr r1, [sp, 0xC] bl sub_818FEB4 @@ -771570,7 +771570,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 @@ -771588,7 +771588,7 @@ sub_818FDB8: @ 818FDB8 mov r1, r8 lsls r1, 2 str r1, [sp, 0x18] -_0818FDDA: +@0818FDDA: mov r2, r9 lsls r0, r2, 2 mov r2, sp @@ -771603,11 +771603,11 @@ _0818FDDA: mov r1, r9 lsls r1, 1 str r1, [sp, 0x10] -_0818FDF6: +@0818FDF6: movs r6, 0 adds r2, r7, 0x1 mov r10, r2 -_0818FDFC: +@0818FDFC: ldr r0, =0x03005d90 ldr r1, [r0] ldr r2, [sp, 0x18] @@ -771619,7 +771619,7 @@ _0818FDFC: lsrs r0, 22 ldr r2, =0x000003fe cmp r0, r2 - bne _0818FE38 + bne @0818FE38 mov r1, r9 lsls r0, r1, 24 lsls r1, r7, 24 @@ -771629,10 +771629,10 @@ _0818FDFC: adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - b _0818FE5C + b @0818FE5C .align 2, 0 .pool -_0818FE38: +@0818FE38: mov r2, r8 lsls r0, r2, 1 add r0, r8 @@ -771651,7 +771651,7 @@ _0818FE38: adds r0, 0x2 adds r0, r1 ldrh r4, [r0] -_0818FE5C: +@0818FE5C: movs r0, 0x64 muls r0, r6 ldr r1, =0x020244ec @@ -771668,14 +771668,14 @@ _0818FE5C: str r1, [r5] adds r6, 0x1 cmp r6, 0x2 - ble _0818FDFC + ble @0818FDFC mov r7, r10 cmp r7, 0x3 - ble _0818FDF6 + ble @0818FDF6 ldr r0, [sp, 0x14] mov r9, r0 cmp r0, 0x2 - ble _0818FDDA + ble @0818FDDA mov r0, sp ldr r1, [sp, 0xC] bl sub_818FEB4 @@ -771692,7 +771692,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 @@ -771706,57 +771706,57 @@ sub_818FEB4: @ 818FEB4 str r0, [sp, 0xC] movs r3, 0x2 add r0, sp, 0x8 -_0818FECE: +@0818FECE: str r3, [r0] subs r0, 0x4 subs r3, 0x1 cmp r3, 0 - bge _0818FECE + bge @0818FECE mov r3, r10 ldr r2, [r3] ldr r0, [r3, 0x4] cmp r2, r0 - bne _0818FF20 + bne @0818FF20 ldr r0, [r3, 0x8] cmp r2, r0 - bne _0818FF20 + bne @0818FF20 cmp r1, 0 - beq _0818FFAA + beq @0818FFAA movs r3, 0 ldr r4, =0x0832a328 -_0818FEF0: +@0818FEF0: str r3, [sp, 0x14] bl GenerateRandomNumber movs r1, 0x3 ands r1, r0 ldr r3, [sp, 0x14] cmp r1, 0x3 - beq _0818FF16 + beq @0818FF16 lsls r0, r1, 2 adds r0, r4 ldr r1, [r0] ldr r0, [sp, 0xC] ands r0, r1 cmp r0, 0 - bne _0818FF16 + bne @0818FF16 ldr r0, [sp, 0xC] orrs r0, r1 str r0, [sp, 0xC] adds r3, 0x1 -_0818FF16: +@0818FF16: cmp r3, 0x2 - bne _0818FEF0 - b _0818FFAA + bne @0818FEF0 + b @0818FFAA .align 2, 0 .pool -_0818FF20: +@0818FF20: movs r3, 0 mov r9, sp mov r8, r10 -_0818FF26: +@0818FF26: adds r2, r3, 0x1 cmp r2, 0x2 - bgt _0818FF84 + bgt @0818FF84 mov r6, r8 mov r7, r9 lsls r0, r2, 2 @@ -771764,22 +771764,22 @@ _0818FF26: adds r5, r0, r1 mov r1, r10 adds r4, r0, r1 -_0818FF3A: +@0818FF3A: ldr r0, [r6] ldr r1, [r4] cmp r0, r1 - bge _0818FF4E + bge @0818FF4E str r1, [r6] str r0, [r4] ldr r1, [r7] ldr r0, [r5] str r0, [r7] str r1, [r5] -_0818FF4E: +@0818FF4E: ldr r1, [r6] ldr r0, [r4] cmp r1, r0 - bne _0818FF7A + bne @0818FF7A str r2, [sp, 0x10] str r3, [sp, 0x14] bl GenerateRandomNumber @@ -771788,7 +771788,7 @@ _0818FF4E: ldr r2, [sp, 0x10] ldr r3, [sp, 0x14] cmp r1, 0 - beq _0818FF7A + beq @0818FF7A ldr r1, [r6] ldr r0, [r4] str r0, [r6] @@ -771797,23 +771797,23 @@ _0818FF4E: ldr r0, [r5] str r0, [r7] str r1, [r5] -_0818FF7A: +@0818FF7A: adds r5, 0x4 adds r4, 0x4 adds r2, 0x1 cmp r2, 0x2 - ble _0818FF3A -_0818FF84: + ble @0818FF3A +@0818FF84: movs r4, 0x4 add r9, r4 add r8, r4 adds r3, 0x1 cmp r3, 0x1 - ble _0818FF26 + ble @0818FF26 ldr r2, =0x0832a328 mov r1, sp movs r3, 0x1 -_0818FF96: +@0818FF96: ldm r1!, {r0} lsls r0, 2 adds r0, r2 @@ -771823,8 +771823,8 @@ _0818FF96: str r4, [sp, 0xC] subs r3, 0x1 cmp r3, 0 - bge _0818FF96 -_0818FFAA: + bge @0818FF96 +@0818FFAA: ldr r0, [sp, 0xC] add sp, 0x18 pop {r3-r5} @@ -771839,7 +771839,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 @@ -771852,10 +771852,10 @@ sub_818FFC0: @ 818FFC0 movs r6, 0 movs r2, 0x14 cmp r3, 0 - beq _0818FFF0 + beq @0818FFF0 ldr r0, =0x0000ffff cmp r3, r0 - beq _0818FFF0 + beq @0818FFF0 ldr r0, =0x0831c898 lsls r1, r3, 1 adds r1, r3 @@ -771863,13 +771863,13 @@ sub_818FFC0: @ 818FFC0 adds r3, r1, r0 ldrb r0, [r3, 0x1] cmp r0, 0 - bne _0818FFFC -_0818FFF0: + bne @0818FFFC +@0818FFF0: movs r0, 0 - b _08190156 + b @08190156 .align 2, 0 .pool -_0818FFFC: +@0818FFFC: ldr r1, =0x083203cc lsls r0, r4, 3 subs r0, r4 @@ -771884,190 +771884,190 @@ _0818FFFC: ldrb r3, [r3, 0x2] str r3, [sp, 0x4] cmp r0, 0x1A - bne _0819002C + bne @0819002C cmp r3, 0x4 - bne _0819002C + bne @0819002C ldr r0, [sp] cmp r0, 0x1 - bne _081900AA + bne @081900AA movs r2, 0x8 - b _081900A4 + b @081900A4 .align 2, 0 .pool -_0819002C: +@0819002C: ldr r0, =0x0831ace8 adds r1, r6, r0 ldrb r0, [r1] ldr r7, =0x0831ace8 cmp r0, 0xFF - beq _081900A4 + beq @081900A4 adds r4, r1, 0 -_0819003A: +@0819003A: ldrb r0, [r4] cmp r0, 0xFE - beq _08190096 + beq @08190096 ldrb r0, [r4] ldr r1, [sp, 0x4] cmp r0, r1 - bne _08190096 + bne @08190096 ldrb r0, [r4, 0x1] adds r5, r6, 0x1 cmp r0, r10 - bne _0819006C + bne @0819006C adds r1, r6, 0x2 mov r0, r8 cmp r0, 0x19 - bne _0819005E + bne @0819005E ldrb r0, [r4, 0x2] cmp r0, 0x28 - bne _0819006C -_0819005E: + bne @0819006C +@0819005E: adds r0, r1, r7 ldrb r0, [r0] muls r0, r2 movs r1, 0xA bl __divsi3 adds r2, r0, 0 -_0819006C: +@0819006C: adds r0, r5, r7 ldrb r0, [r0] cmp r0, r9 - bne _08190096 + bne @08190096 cmp r10, r9 - beq _08190096 + beq @08190096 adds r1, r6, 0x2 mov r0, r8 cmp r0, 0x19 - bne _08190088 + bne @08190088 adds r0, r1, r7 ldrb r0, [r0] cmp r0, 0x28 - bne _08190096 -_08190088: + bne @08190096 +@08190088: adds r0, r1, r7 ldrb r0, [r0] muls r0, r2 movs r1, 0xA bl __divsi3 adds r2, r0, 0 -_08190096: +@08190096: adds r4, 0x3 adds r6, 0x3 ldr r1, =0x0831ace8 adds r0, r6, r1 ldrb r0, [r0] cmp r0, 0xFF - bne _0819003A -_081900A4: + bne @0819003A +@081900A4: ldr r0, [sp] cmp r0, 0x1 - beq _081900E0 -_081900AA: + beq @081900E0 +@081900AA: ldr r1, [sp] cmp r1, 0x1 - bgt _081900BC + bgt @081900BC cmp r1, 0 - beq _081900C4 - b _08190154 + beq @081900C4 + b @08190154 .align 2, 0 .pool -_081900BC: +@081900BC: ldr r0, [sp] cmp r0, 0x2 - beq _08190114 - b _08190154 -_081900C4: + beq @08190114 + b @08190154 +@081900C4: cmp r2, 0xA - beq _08190146 + beq @08190146 cmp r2, 0xA - ble _08190146 + ble @08190146 cmp r2, 0x28 - beq _0819014A + beq @0819014A cmp r2, 0x28 - bgt _081900DA + bgt @081900DA cmp r2, 0x14 - beq _08190104 - b _08190146 -_081900DA: + beq @08190104 + b @08190146 +@081900DA: cmp r2, 0x50 - bne _08190146 - b _08190100 -_081900E0: + bne @08190146 + b @08190100 +@081900E0: cmp r2, 0xA - beq _08190104 + beq @08190104 cmp r2, 0xA - bgt _081900F2 + bgt @081900F2 cmp r2, 0 - beq _08190100 + beq @08190100 cmp r2, 0x5 - beq _0819014A - b _08190146 -_081900F2: + beq @0819014A + b @08190146 +@081900F2: cmp r2, 0x28 - beq _08190108 + beq @08190108 cmp r2, 0x28 - ble _08190146 + ble @08190146 cmp r2, 0x50 - beq _0819010E - b _08190146 -_08190100: + beq @0819010E + b @08190146 +@08190100: movs r2, 0x8 - b _08190154 -_08190104: + b @08190154 +@08190104: movs r2, 0x2 - b _08190154 -_08190108: + b @08190154 +@08190108: movs r2, 0x2 negs r2, r2 - b _08190154 -_0819010E: + b @08190154 +@0819010E: movs r2, 0x4 negs r2, r2 - b _08190154 -_08190114: + b @08190154 +@08190114: cmp r2, 0xA - beq _08190146 + beq @08190146 cmp r2, 0xA - bgt _08190126 + bgt @08190126 cmp r2, 0 - beq _0819013A + beq @0819013A cmp r2, 0x5 - beq _08190140 - b _08190146 -_08190126: + beq @08190140 + b @08190146 +@08190126: cmp r2, 0x28 - beq _0819014E + beq @0819014E cmp r2, 0x28 - bgt _08190134 + bgt @08190134 cmp r2, 0x14 - beq _0819014A - b _08190146 -_08190134: + beq @0819014A + b @08190146 +@08190134: cmp r2, 0x50 - beq _08190152 - b _08190146 -_0819013A: + beq @08190152 + b @08190146 +@0819013A: movs r2, 0x10 negs r2, r2 - b _08190154 -_08190140: + b @08190154 +@08190140: movs r2, 0x8 negs r2, r2 - b _08190154 -_08190146: + b @08190154 +@08190146: movs r2, 0 - b _08190154 -_0819014A: + b @08190154 +@0819014A: movs r2, 0x4 - b _08190154 -_0819014E: + b @08190154 +@0819014E: movs r2, 0xC - b _08190154 -_08190152: + b @08190154 +@08190152: movs r2, 0x14 -_08190154: +@08190154: adds r0, r2, 0 -_08190156: +@08190156: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -772079,40 +772079,40 @@ _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 movs r1, 0x3 cmp r0, 0x63 - bls _0819019A + bls @0819019A movs r1, 0x6 cmp r0, 0x77 - bls _0819019A + bls @0819019A movs r1, 0x9 cmp r0, 0x8B - bls _0819019A + bls @0819019A movs r1, 0xC cmp r0, 0x9F - bls _0819019A + bls @0819019A movs r1, 0xF cmp r0, 0xB3 - bls _0819019A + bls @0819019A movs r1, 0x12 cmp r0, 0xC7 - bls _0819019A + bls @0819019A movs r1, 0x1F cmp r0, 0xDB - bhi _0819019A + bhi @0819019A movs r1, 0x15 -_0819019A: +@0819019A: adds r0, r1, 0 pop {r1} bx r1 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 @@ -772127,12 +772127,12 @@ sub_81901A0: @ 81901A0 mov r12, r0 ldr r6, =0x0860d10c cmp r1, r2 - beq _081901D8 + beq @081901D8 mov r7, r12 -_081901C0: +@081901C0: adds r5, 0x1 cmp r5, 0xF - bgt _081901D8 + bgt @081901D8 ldr r0, [r7] lsls r1, r5, 2 adds r0, r1 @@ -772141,77 +772141,77 @@ _081901C0: lsls r0, 22 lsrs r0, 22 cmp r0, r2 - bne _081901C0 -_081901D8: + bne @081901C0 +@081901D8: cmp r3, 0 - beq _0819026C + beq @0819026C cmp r3, 0x3 - bne _081901FC + bne @081901FC lsls r0, r5, 2 adds r1, r0, 0x3 adds r1, r6 ldrb r1, [r1] adds r4, r1, 0 adds r4, 0x8 - b _08190206 + b @08190206 .align 2, 0 .pool -_081901FC: +@081901FC: lsls r0, r5, 2 adds r1, r3, r0 adds r1, r6 ldrb r1, [r1] adds r4, r1, 0x4 -_08190206: +@08190206: adds r0, r3, r0 adds r0, r6 ldrb r2, [r0] cmp r2, r4 - bge _08190256 + bge @08190256 ldr r1, =0x0860d14c adds r0, r2, r1 ldrb r3, [r0] adds r6, r1, 0 cmp r3, r5 - beq _08190234 + beq @08190234 mov r1, r12 ldr r0, [r1] lsls r1, r3, 2 adds r0, r1 ldr r3, =0x00000d25 adds r0, r3 - b _0819024E + b @0819024E .align 2, 0 .pool -_08190234: +@08190234: adds r2, 0x1 cmp r2, r4 - bge _08190256 + bge @08190256 adds r0, r2, r6 ldrb r1, [r0] cmp r1, r5 - beq _08190234 + beq @08190234 mov r3, r12 ldr r0, [r3] lsls r1, 2 adds r0, r1 ldr r1, =0x00000d25 adds r0, r1 -_0819024E: +@0819024E: ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt _08190234 -_08190256: + blt @08190234 +@08190256: cmp r2, r4 - beq _08190286 + beq @08190286 ldr r0, =0x0860d14c adds r0, r2, r0 ldrb r0, [r0] - b _08190292 + b @08190292 .align 2, 0 .pool -_0819026C: +@0819026C: mov r3, r12 ldr r1, [r3] lsls r0, r5, 2 @@ -772224,22 +772224,22 @@ _0819026C: ldrb r0, [r1] lsls r0, 29 cmp r0, 0 - bge _08190290 -_08190286: + bge @08190290 +@08190286: movs r0, 0xFF - b _08190292 + b @08190292 .align 2, 0 .pool -_08190290: +@08190290: adds r0, r2, 0 -_08190292: +@08190292: pop {r4-r7} pop {r1} bx r1 thumb_func_end sub_81901A0 thumb_func_start sub_8190298 -sub_8190298: @ 8190298 +sub_8190298: ; 8190298 push {lr} bl sub_81902AC ldr r1, =0x02038bca @@ -772251,7 +772251,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] @@ -772275,7 +772275,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] @@ -772288,7 +772288,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] @@ -772317,7 +772317,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] @@ -772339,20 +772339,20 @@ sub_819033C: @ 819033C ldrh r0, [r1] ldr r2, =0x000003e6 cmp r0, r2 - bhi _0819036E + bhi @0819036E adds r0, 0x1 strh r0, [r1] -_0819036E: +@0819036E: ldr r0, [r5] ldr r1, =0x00000d1c adds r0, r1 adds r1, r0, r4 ldrh r0, [r1] cmp r0, r2 - bhi _08190380 + bhi @08190380 adds r0, 0x1 strh r0, [r1] -_08190380: +@08190380: ldr r0, [r5] adds r1, r0, r3 adds r1, r4 @@ -772362,9 +772362,9 @@ _08190380: ldrh r1, [r1] ldrh r2, [r0] cmp r1, r2 - bls _08190396 + bls @08190396 strh r1, [r0] -_08190396: +@08190396: pop {r4,r5} pop {r0} bx r0 @@ -772373,7 +772373,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 + 1 movs r1, 0 @@ -772404,7 +772404,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 @@ -772429,25 +772429,25 @@ sub_8190400: @ 8190400 movs r1, 0x8 ldrsh r4, [r6, r1] cmp r4, 0x1 - beq _08190508 + beq @08190508 cmp r4, 0x1 - bgt _08190440 + bgt @08190440 cmp r4, 0 - beq _0819044E - b _08190772 + beq @0819044E + b @08190772 .align 2, 0 .pool -_08190440: +@08190440: cmp r4, 0x2 - bne _08190446 - b _08190570 -_08190446: + bne @08190446 + b @08190570 +@08190446: cmp r4, 0x3 - bne _0819044C - b _08190634 -_0819044C: - b _08190772 -_0819044E: + bne @0819044C + b @08190634 +@0819044C: + b @08190772 +@0819044E: movs r0, 0 bl SetHBlankCallback movs r0, 0 @@ -772483,21 +772483,21 @@ _0819044E: strh r4, [r0] mov r2, r9 cmp r2, 0x2 - bne _081904DC + bne @081904DC ldr r0, =0x02022e1c strh r4, [r0] ldr r0, =0x02022e1e strh r4, [r0] - b _081904E6 + b @081904E6 .align 2, 0 .pool -_081904DC: +@081904DC: ldr r0, =0x02022e1c strh r4, [r0] ldr r1, =0x02022e1e movs r0, 0xA0 strh r0, [r1] -_081904E6: +@081904E6: ldr r0, =0x03005e00 mov r2, r10 lsls r1, r2, 2 @@ -772507,10 +772507,10 @@ _081904E6: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _08190772 + b @08190772 .align 2, 0 .pool -_08190508: +@08190508: movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -772547,10 +772547,10 @@ _08190508: ldr r1, =0x0300301c movs r0, 0x4 strb r0, [r1] - b _08190602 + b @08190602 .align 2, 0 .pool -_08190570: +@08190570: ldr r1, =0x08d83d50 movs r5, 0x80 lsls r5, 6 @@ -772593,12 +772593,12 @@ _08190570: bl decompress_palette mov r0, r9 cmp r0, 0x2 - bne _081905DE + bne @081905DE ldr r0, =0x08d854c8 movs r1, 0x50 movs r2, 0x20 bl decompress_palette -_081905DE: +@081905DE: str r7, [sp, 0x8] add r0, sp, 0x8 ldr r1, =0x02037b14 @@ -772612,14 +772612,14 @@ _081905DE: bl gpu_sync_bg_show movs r0, 0x3 bl gpu_sync_bg_show -_08190602: +@08190602: ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] - b _08190772 + b @08190772 .align 2, 0 .pool -_08190634: +@08190634: ldr r0, =sub_8194B70 + 1 bl SetVBlankCallback ldr r4, =0x0203cd78 @@ -772629,7 +772629,7 @@ _08190634: movs r6, 0 lsls r5, 24 movs r2, 0xFF -_0819064A: +@0819064A: ldr r1, [r4] adds r1, r6 ldrb r0, [r1] @@ -772637,7 +772637,7 @@ _0819064A: strb r0, [r1] adds r6, 0x1 cmp r6, 0xF - ble _0819064A + ble @0819064A bl sub_80D2F04 ldr r0, =sub_8190CD4 + 1 movs r1, 0 @@ -772657,7 +772657,7 @@ _0819064A: strh r7, [r0, 0x10] mov r2, r9 cmp r2, 0x2 - bne _081906A8 + bne @081906A8 lsrs r1, r5, 24 movs r0, 0 bl sub_819314C @@ -772665,21 +772665,21 @@ _0819064A: ldr r1, [r0] movs r0, 0x1 strb r0, [r1, 0x10] - b _081906B0 + b @081906B0 .align 2, 0 .pool -_081906A8: +@081906A8: lsrs r1, r5, 24 movs r0, 0 bl sub_81924E0 -_081906B0: +@081906B0: movs r1, 0xFA lsls r1, 5 movs r0, 0 bl lcd_io_set mov r0, r9 cmp r0, 0 - beq _0819076C + beq @0819076C ldr r5, =0x0860d068 adds r0, r5, 0 movs r1, 0x78 @@ -772734,14 +772734,14 @@ _081906B0: strh r0, [r4, 0x30] mov r1, r9 cmp r1, 0x1 - bne _08190746 + bne @08190746 adds r0, r4, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_08190746: +@08190746: adds r0, r5, 0 movs r1, 0xEA movs r2, 0x50 @@ -772759,10 +772759,10 @@ _08190746: strh r6, [r4, 0x2E] movs r0, 0x1 strh r0, [r4, 0x30] -_0819076C: +@0819076C: mov r0, r10 bl remove_task -_08190772: +@08190772: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -772776,7 +772776,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] @@ -772785,13 +772785,13 @@ sub_8190790: @ 8190790 movs r3, 0x2E ldrsh r0, [r2, r3] cmp r0, 0 - beq _081907D4 + beq @081907D4 lsls r0, r1, 16 asrs r0, 16 movs r1, 0x20 negs r1, r1 cmp r0, r1 - blt _081907BC + blt @081907BC adds r3, r2, 0 adds r3, 0x3E ldrb r1, [r3] @@ -772799,24 +772799,24 @@ sub_8190790: @ 8190790 negs r0, r0 ands r0, r1 strb r0, [r3] -_081907BC: +@081907BC: ldrh r0, [r2, 0x30] adds r0, 0x1 strh r0, [r2, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x28 - bne _081907F0 + bne @081907F0 ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] - b _081907F0 + b @081907F0 .align 2, 0 .pool -_081907D4: +@081907D4: lsls r0, r1, 16 asrs r0, 16 cmp r0, 0xBF - ble _081907F0 + ble @081907F0 ldr r0, =0x0203cd78 ldr r0, [r0] movs r3, 0x32 @@ -772826,7 +772826,7 @@ _081907D4: strb r1, [r0] ldrh r0, [r2, 0x34] bl sub_818D8F0 -_081907F0: +@081907F0: pop {r0} bx r0 .align 2, 0 @@ -772834,7 +772834,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] @@ -772843,11 +772843,11 @@ sub_81907F8: @ 81907F8 movs r3, 0x2E ldrsh r0, [r2, r3] cmp r0, 0 - beq _08190838 + beq @08190838 lsls r0, r1, 16 asrs r0, 16 cmp r0, 0xC0 - bgt _08190820 + bgt @08190820 adds r3, r2, 0 adds r3, 0x3E ldrb r1, [r3] @@ -772855,26 +772855,26 @@ sub_81907F8: @ 81907F8 negs r0, r0 ands r0, r1 strb r0, [r3] -_08190820: +@08190820: ldrh r0, [r2, 0x30] adds r0, 0x1 strh r0, [r2, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x28 - bne _08190858 + bne @08190858 ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] - b _08190858 + b @08190858 .align 2, 0 .pool -_08190838: +@08190838: lsls r0, r1, 16 asrs r0, 16 movs r1, 0x20 negs r1, r1 cmp r0, r1 - bgt _08190858 + bgt @08190858 ldr r0, =0x0203cd78 ldr r0, [r0] movs r3, 0x32 @@ -772884,7 +772884,7 @@ _08190838: strb r1, [r0] ldrh r0, [r2, 0x34] bl sub_818D8F0 -_08190858: +@08190858: pop {r0} bx r0 .align 2, 0 @@ -772892,7 +772892,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] @@ -772901,13 +772901,13 @@ sub_8190860: @ 8190860 movs r3, 0x2E ldrsh r0, [r2, r3] cmp r0, 0 - beq _081908A4 + beq @081908A4 lsls r0, r1, 16 asrs r0, 16 movs r1, 0x20 negs r1, r1 cmp r0, r1 - blt _0819088C + blt @0819088C adds r3, r2, 0 adds r3, 0x3E ldrb r1, [r3] @@ -772915,24 +772915,24 @@ sub_8190860: @ 8190860 negs r0, r0 ands r0, r1 strb r0, [r3] -_0819088C: +@0819088C: ldrh r0, [r2, 0x30] adds r0, 0x1 strh r0, [r2, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x40 - bne _081908C0 + bne @081908C0 ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] - b _081908C0 + b @081908C0 .align 2, 0 .pool -_081908A4: +@081908A4: lsls r1, 16 ldr r0, =0x010f0000 cmp r1, r0 - ble _081908C0 + ble @081908C0 ldr r0, =0x0203cd78 ldr r0, [r0] movs r3, 0x32 @@ -772942,7 +772942,7 @@ _081908A4: strb r1, [r0] ldrh r0, [r2, 0x34] bl sub_818D8F0 -_081908C0: +@081908C0: pop {r0} bx r0 .align 2, 0 @@ -772950,7 +772950,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] @@ -772959,12 +772959,12 @@ sub_81908CC: @ 81908CC movs r3, 0x2E ldrsh r0, [r2, r3] cmp r0, 0 - beq _08190910 + beq @08190910 lsls r1, 16 movs r0, 0x88 lsls r0, 17 cmp r1, r0 - bgt _081908F6 + bgt @081908F6 adds r3, r2, 0 adds r3, 0x3E ldrb r1, [r3] @@ -772972,26 +772972,26 @@ sub_81908CC: @ 81908CC negs r0, r0 ands r0, r1 strb r0, [r3] -_081908F6: +@081908F6: ldrh r0, [r2, 0x30] adds r0, 0x1 strh r0, [r2, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x40 - bne _08190930 + bne @08190930 ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] - b _08190930 + b @08190930 .align 2, 0 .pool -_08190910: +@08190910: lsls r0, r1, 16 asrs r0, 16 movs r1, 0x20 negs r1, r1 cmp r0, r1 - bgt _08190930 + bgt @08190930 ldr r0, =0x0203cd78 ldr r0, [r0] movs r3, 0x32 @@ -773001,7 +773001,7 @@ _08190910: strb r1, [r0] ldrh r0, [r2, 0x34] bl sub_818D8F0 -_08190930: +@08190930: pop {r0} bx r0 .align 2, 0 @@ -773009,44 +773009,44 @@ _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 ldrsh r0, [r1, r2] cmp r0, 0 - bne _0819094A + bne @0819094A adds r0, r1, 0 bl sub_80D30DC -_0819094A: +@0819094A: pop {r0} bx r0 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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08190962 + bne @08190962 adds r0, r4, 0 bl sub_80D30DC -_08190962: +@08190962: ldrh r0, [r4, 0x22] adds r1, r0, 0x4 strh r1, [r4, 0x22] movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0 - beq _081909A4 + beq @081909A4 lsls r0, r1, 16 asrs r0, 16 movs r1, 0x10 negs r1, r1 cmp r0, r1 - blt _0819098A + blt @0819098A adds r2, r4, 0 adds r2, 0x3E ldrb r1, [r2] @@ -773054,24 +773054,24 @@ _08190962: negs r0, r0 ands r0, r1 strb r0, [r2] -_0819098A: +@0819098A: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x28 - bne _081909C0 + bne @081909C0 ldr r0, =sub_8190938 + 1 str r0, [r4, 0x1C] - b _081909C0 + b @081909C0 .align 2, 0 .pool -_081909A4: +@081909A4: lsls r0, r1, 16 asrs r0, 16 cmp r0, 0xAF - ble _081909C0 + ble @081909C0 ldr r0, =0x0203cd78 ldr r0, [r0] movs r2, 0x32 @@ -773081,7 +773081,7 @@ _081909A4: strb r1, [r0] adds r0, r4, 0 bl sub_80D2EF8 -_081909C0: +@081909C0: pop {r4} pop {r0} bx r0 @@ -773090,27 +773090,27 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _081909DE + bne @081909DE adds r0, r4, 0 bl sub_80D30DC -_081909DE: +@081909DE: ldrh r0, [r4, 0x22] subs r1, r0, 0x4 strh r1, [r4, 0x22] movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0 - beq _08190A1C + beq @08190A1C lsls r0, r1, 16 asrs r0, 16 cmp r0, 0xB0 - bgt _08190A02 + bgt @08190A02 adds r2, r4, 0 adds r2, 0x3E ldrb r1, [r2] @@ -773118,26 +773118,26 @@ _081909DE: negs r0, r0 ands r0, r1 strb r0, [r2] -_08190A02: +@08190A02: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x28 - bne _08190A3C + bne @08190A3C ldr r0, =sub_8190938 + 1 str r0, [r4, 0x1C] - b _08190A3C + b @08190A3C .align 2, 0 .pool -_08190A1C: +@08190A1C: lsls r0, r1, 16 asrs r0, 16 movs r1, 0x10 negs r1, r1 cmp r0, r1 - bgt _08190A3C + bgt @08190A3C ldr r0, =0x0203cd78 ldr r0, [r0] movs r2, 0x32 @@ -773147,7 +773147,7 @@ _08190A1C: strb r1, [r0] adds r0, r4, 0 bl sub_80D2EF8 -_08190A3C: +@08190A3C: pop {r4} pop {r0} bx r0 @@ -773156,29 +773156,29 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08190A5A + bne @08190A5A adds r0, r4, 0 bl sub_80D30DC -_08190A5A: +@08190A5A: ldrh r0, [r4, 0x20] adds r1, r0, 0x4 strh r1, [r4, 0x20] movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0 - beq _08190A9C + beq @08190A9C lsls r0, r1, 16 asrs r0, 16 movs r1, 0x10 negs r1, r1 cmp r0, r1 - blt _08190A82 + blt @08190A82 adds r2, r4, 0 adds r2, 0x3E ldrb r1, [r2] @@ -773186,24 +773186,24 @@ _08190A5A: negs r0, r0 ands r0, r1 strb r0, [r2] -_08190A82: +@08190A82: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x40 - bne _08190AB8 + bne @08190AB8 ldr r0, =sub_8190938 + 1 str r0, [r4, 0x1C] - b _08190AB8 + b @08190AB8 .align 2, 0 .pool -_08190A9C: +@08190A9C: lsls r0, r1, 16 asrs r0, 16 cmp r0, 0xFF - ble _08190AB8 + ble @08190AB8 ldr r0, =0x0203cd78 ldr r0, [r0] movs r2, 0x32 @@ -773213,7 +773213,7 @@ _08190A9C: strb r1, [r0] adds r0, r4, 0 bl sub_80D2EF8 -_08190AB8: +@08190AB8: pop {r4} pop {r0} bx r0 @@ -773222,28 +773222,28 @@ _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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08190AD6 + bne @08190AD6 adds r0, r4, 0 bl sub_80D30DC -_08190AD6: +@08190AD6: ldrh r0, [r4, 0x20] subs r1, r0, 0x4 strh r1, [r4, 0x20] movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0 - beq _08190B14 + beq @08190B14 lsls r1, 16 movs r0, 0x80 lsls r0, 17 cmp r1, r0 - bgt _08190AFC + bgt @08190AFC adds r2, r4, 0 adds r2, 0x3E ldrb r1, [r2] @@ -773251,26 +773251,26 @@ _08190AD6: negs r0, r0 ands r0, r1 strb r0, [r2] -_08190AFC: +@08190AFC: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x40 - bne _08190B34 + bne @08190B34 ldr r0, =sub_8190938 + 1 str r0, [r4, 0x1C] - b _08190B34 + b @08190B34 .align 2, 0 .pool -_08190B14: +@08190B14: lsls r0, r1, 16 asrs r0, 16 movs r1, 0x10 negs r1, r1 cmp r0, r1 - bgt _08190B34 + bgt @08190B34 ldr r0, =0x0203cd78 ldr r0, [r0] movs r2, 0x32 @@ -773280,7 +773280,7 @@ _08190B14: strb r1, [r0] adds r0, r4, 0 bl sub_80D2EF8 -_08190B34: +@08190B34: pop {r4} pop {r0} bx r0 @@ -773289,7 +773289,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 @@ -773326,11 +773326,11 @@ sub_8190B40: @ 8190B40 mov r9, r2 mov r8, r1 cmp r0, 0x1 - bne _08190C0C + bne @08190C0C movs r1, 0x30 ldrsh r0, [r3, r1] cmp r0, 0 - beq _08190BFC + beq @08190BFC mov r2, r10 lsls r0, r2, 2 adds r1, r5, r0 @@ -773340,7 +773340,7 @@ sub_8190B40: @ 8190B40 lsls r1, r2, 29 adds r4, r0, 0 cmp r1, 0 - bge _08190BB6 + bge @08190BB6 ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r1, [r0, 0x10] @@ -773348,8 +773348,8 @@ sub_8190B40: @ 8190B40 lsls r0, r2, 27 lsrs r0, 30 cmp r1, r0 - blt _08190C32 -_08190BB6: + blt @08190C32 +@08190BB6: mov r1, r8 ldr r0, [r1] adds r0, r4 @@ -773358,54 +773358,54 @@ _08190BB6: ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt _08190BD4 + blt @08190BD4 ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r0, [r0, 0x10] subs r0, 0x1 cmp r0, r12 - blt _08190C32 -_08190BD4: + blt @08190C32 +@08190BD4: lsls r0, r6, 2 adds r0, r6 lsls r0, 3 add r0, r9 movs r7, 0x8 ldrsh r0, [r0, r7] - b _08190C4C + b @08190C4C .align 2, 0 .pool -_08190BFC: +@08190BFC: ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0 - bne _08190C32 - b _08190C48 + bne @08190C32 + b @08190C48 .align 2, 0 .pool -_08190C0C: +@08190C0C: movs r2, 0x30 ldrsh r0, [r3, r2] cmp r0, 0 - beq _08190C28 + beq @08190C28 ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0x1 - bls _08190C32 + bls @08190C32 movs r7, 0x8 ldrsh r0, [r4, r7] - b _08190C4C + b @08190C4C .align 2, 0 .pool -_08190C28: +@08190C28: ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0 - beq _08190C48 -_08190C32: + beq @08190C48 +@08190C32: adds r2, r3, 0 adds r2, 0x3E ldrb r1, [r2] @@ -773413,22 +773413,22 @@ _08190C32: negs r0, r0 ands r0, r1 strb r0, [r2] - b _08190C5C + b @08190C5C .align 2, 0 .pool -_08190C48: +@08190C48: movs r1, 0x8 ldrsh r0, [r4, r1] -_08190C4C: +@08190C4C: cmp r0, 0x2 - bne _08190C5C + bne @08190C5C adds r0, r3, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_08190C5C: +@08190C5C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -773439,7 +773439,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 @@ -773452,36 +773452,36 @@ sub_8190C6C: @ 8190C6C movs r2, 0xE ldrsh r0, [r1, r2] cmp r0, 0x1 - bne _08190C9C + bne @08190C9C ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0 - bne _08190CA6 - b _08190CC0 + bne @08190CA6 + b @08190CC0 .align 2, 0 .pool -_08190C9C: +@08190C9C: ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0x1 - beq _08190CC0 -_08190CA6: + beq @08190CC0 +@08190CA6: movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0x2 - bne _08190CCE + bne @08190CCE adds r0, r3, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] - b _08190CCE + b @08190CCE .align 2, 0 .pool -_08190CC0: +@08190CC0: adds r2, r3, 0 adds r2, 0x3E ldrb r1, [r2] @@ -773489,13 +773489,13 @@ _08190CC0: negs r0, r0 ands r0, r1 strb r0, [r2] -_08190CCE: +@08190CCE: pop {r0} bx r0 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 @@ -773518,28 +773518,28 @@ sub_8190CD4: @ 8190CD4 movs r5, 0x8 ldrsh r0, [r0, r5] cmp r0, 0x8 - bls _08190D06 - bl _08192202 -_08190D06: + bls @08190D06 + bl @08192202 +@08190D06: lsls r0, 2 - ldr r1, =_08190D18 + ldr r1, =@08190D18 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08190D18: - .4byte _08190D3C - .4byte _08190D7C - .4byte _08190DA8 - .4byte _08190E48 - .4byte _08191FF8 - .4byte _08192038 - .4byte _08192078 - .4byte _081920BC - .4byte _08192106 -_08190D3C: +@08190D18: + .4byte @08190D3C + .4byte @08190D7C + .4byte @08190DA8 + .4byte @08190E48 + .4byte @08191FF8 + .4byte @08192038 + .4byte @08192078 + .4byte @081920BC + .4byte @08192106 +@08190D3C: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -773547,9 +773547,9 @@ _08190D3C: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq _08190D50 - bl _08192202 -_08190D50: + beq @08190D50 + bl @08192202 +@08190D50: movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -773565,18 +773565,18 @@ _08190D50: adds r0, r1 movs r1, 0x1 strh r1, [r0, 0x8] - bl _08192202 + bl @08192202 .align 2, 0 .pool -_08190D7C: +@08190D7C: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08190D8C - bl _08192202 -_08190D8C: + beq @08190D8C + bl @08192202 +@08190D8C: mov r1, r8 lsls r0, r1, 2 add r0, r8 @@ -773585,24 +773585,24 @@ _08190D8C: adds r0, r2 movs r1, 0x2 strh r1, [r0, 0x8] - bl _08192202 + bl @08192202 .align 2, 0 .pool -_08190DA8: +@08190DA8: mov r0, r8 bl sub_819221C lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x8 - bgt _08190DBE + bgt @08190DBE cmp r6, 0x1 - bge _08190DF0 - bl _08192202 -_08190DBE: + bge @08190DF0 + bl @08192202 +@08190DBE: cmp r6, 0x9 - beq _08190DC6 - bl _08192202 -_08190DC6: + beq @08190DC6 + bl @08192202 +@08190DC6: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -773618,10 +773618,10 @@ _08190DC6: adds r0, r1 movs r1, 0x8 strh r1, [r0, 0x8] - bl _08192202 + bl @08192202 .align 2, 0 .pool -_08190DF0: +@08190DF0: ldr r1, =0x03005e00 mov r4, r8 lsls r2, r4, 2 @@ -773634,16 +773634,16 @@ _08190DF0: movs r1, 0 mov r9, r2 cmp r0, 0 - beq _08190E0C + beq @08190E0C movs r1, 0x9 -_08190E0C: +@08190E0C: adds r6, r1, 0 adds r0, r6, 0 adds r0, 0x9 cmp r6, r0 - bge _08190E32 + bge @08190E32 adds r5, r0, 0 -_08190E18: +@08190E18: lsls r4, r6, 24 lsrs r4, 24 adds r0, r4, 0 @@ -773654,8 +773654,8 @@ _08190E18: bl Window_FastFillPixels adds r6, 0x1 cmp r6, r5 - blt _08190E18 -_08190E32: + blt @08190E18 +@08190E32: ldr r0, =0x03005e00 mov r1, r9 add r1, r8 @@ -773663,10 +773663,10 @@ _08190E32: adds r1, r0 movs r0, 0x3 strh r0, [r1, 0x8] - bl _08192202 + bl @08192202 .align 2, 0 .pool -_08190E48: +@08190E48: mov r6, r8 lsls r1, r6, 2 adds r0, r1, r6 @@ -773678,27 +773678,27 @@ _08190E48: subs r0, r6, 0x1 mov r9, r1 cmp r0, 0x7 - bls _08190E64 - bl _08192202 -_08190E64: + bls @08190E64 + bl @08192202 +@08190E64: lsls r0, 2 - ldr r1, =_08190E78 + ldr r1, =@08190E78 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08190E78: - .4byte _08190E98 - .4byte _08191234 - .4byte _081915CC - .4byte _08191B08 - .4byte _08190E98 - .4byte _08191234 - .4byte _0819187C - .4byte _08191D68 -_08190E98: +@08190E78: + .4byte @08190E98 + .4byte @08191234 + .4byte @081915CC + .4byte @08191B08 + .4byte @08190E98 + .4byte @08191234 + .4byte @0819187C + .4byte @08191D68 +@08190E98: mov r0, r9 add r0, r8 lsls r0, 3 @@ -773707,7 +773707,7 @@ _08190E98: movs r5, 0xC ldrsh r2, [r0, r5] cmp r2, 0 - beq _08190ED4 + beq @08190ED4 ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] @@ -773718,10 +773718,10 @@ _08190E98: ldr r1, =0x02022e1a movs r0, 0xA0 strh r0, [r1] - b _08190EE6 + b @08190EE6 .align 2, 0 .pool -_08190ED4: +@08190ED4: ldr r0, =0x02022e14 strh r2, [r0] ldr r1, =0x02022e16 @@ -773731,14 +773731,14 @@ _08190ED4: strh r2, [r0] ldr r0, =0x02022e1a strh r2, [r0] -_08190EE6: +@08190EE6: cmp r6, 0x1 - bne _08190F9C + bne @08190F9C ldr r5, =0x0203cd78 ldr r0, [r5] ldrb r1, [r0, 0x10] cmp r1, 0 - bne _08190F50 + bne @08190F50 ldr r0, =0x02022e1c strh r1, [r0] ldr r1, =0x02022e1e @@ -773764,10 +773764,10 @@ _08190EE6: orrs r0, r2 ldrb r1, [r1] bl sub_81924E0 - b _08191084 + b @08191084 .align 2, 0 .pool -_08190F50: +@08190F50: ldr r1, =0x02022e1c movs r6, 0x80 lsls r6, 1 @@ -773796,15 +773796,15 @@ _08190F50: bl sub_81924E0 ldr r0, [r5] strb r4, [r0, 0x10] - b _08191084 + b @08191084 .align 2, 0 .pool -_08190F9C: +@08190F9C: ldr r6, =0x0203cd78 ldr r1, [r6] ldrb r5, [r1, 0x10] cmp r5, 0 - bne _08190FF8 + bne @08190FF8 ldr r4, =0x03005e00 lsls r0, r7, 2 adds r0, r7 @@ -773835,12 +773835,12 @@ _08190F9C: orrs r0, r1 ldrb r1, [r2, 0x11] bl sub_81924E0 - b _08191084 + b @08191084 .align 2, 0 .pool -_08190FF8: +@08190FF8: cmp r5, 0x2 - bne _0819104C + bne @0819104C ldr r4, =0x03005e00 lsls r0, r7, 2 adds r0, r7 @@ -773872,10 +773872,10 @@ _08190FF8: orrs r0, r1 ldrb r1, [r2, 0x12] bl sub_81924E0 - b _08191084 + b @08191084 .align 2, 0 .pool -_0819104C: +@0819104C: ldr r1, =0x02022e1c movs r3, 0x80 lsls r3, 1 @@ -773903,7 +773903,7 @@ _0819104C: lsls r1, r2, 24 lsrs r1, 24 bl sub_819314C -_08191084: +@08191084: movs r6, 0 ldr r5, =0x0203cd78 mov r10, r5 @@ -773917,15 +773917,15 @@ _08191084: adds r4, r3, 0 adds r4, 0x1C movs r7, 0x1 -_0819109E: +@0819109E: cmp r6, 0x1 - bgt _0819110C + bgt @0819110C mov r2, r10 ldr r0, [r2] adds r2, r0, r6 ldrb r0, [r2] cmp r0, 0xFF - beq _08191150 + beq @08191150 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -773960,16 +773960,16 @@ _0819109E: lsls r0, 2 adds r0, r3 strh r1, [r0, 0x34] - b _08191150 + b @08191150 .align 2, 0 .pool -_0819110C: +@0819110C: mov r2, r10 ldr r0, [r2] adds r2, r0, r6 ldrb r0, [r2] cmp r0, 0xFF - beq _08191150 + beq @08191150 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -773998,10 +773998,10 @@ _0819110C: lsls r0, 2 adds r0, r3 strh r6, [r0, 0x32] -_08191150: +@08191150: adds r6, 0x1 cmp r6, 0x7 - ble _0819109E + ble @0819109E movs r6, 0x8 ldr r2, =0x0203cd78 mov r12, r2 @@ -774014,15 +774014,15 @@ _08191150: movs r4, 0 adds r7, r3, 0 adds r7, 0x1C -_0819116E: +@0819116E: cmp r6, 0x9 - bgt _081911D4 + bgt @081911D4 mov r1, r12 ldr r0, [r1] adds r2, r0, r6 ldrb r0, [r2] cmp r0, 0xFF - beq _08191214 + beq @08191214 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -774055,16 +774055,16 @@ _0819116E: lsls r0, 2 adds r0, r3 strh r1, [r0, 0x34] - b _08191214 + b @08191214 .align 2, 0 .pool -_081911D4: +@081911D4: mov r2, r12 ldr r0, [r2] adds r2, r0, r6 ldrb r0, [r2] cmp r0, 0xFF - beq _08191214 + beq @08191214 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -774091,10 +774091,10 @@ _081911D4: lsls r0, 2 adds r0, r3 strh r6, [r0, 0x32] -_08191214: +@08191214: adds r6, 0x1 cmp r6, 0xF - ble _0819116E + ble @0819116E mov r0, r9 add r0, r8 lsls r0, 3 @@ -774102,10 +774102,10 @@ _08191214: adds r0, r3 movs r2, 0 movs r1, 0x4 - bl _08191FE8 + bl @08191FE8 .align 2, 0 .pool -_08191234: +@08191234: mov r0, r9 add r0, r8 lsls r0, 3 @@ -774114,7 +774114,7 @@ _08191234: movs r5, 0xC ldrsh r2, [r0, r5] cmp r2, 0 - beq _08191278 + beq @08191278 ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] @@ -774126,10 +774126,10 @@ _08191234: ldr r2, =0x0000ff60 adds r0, r2, 0 strh r0, [r1] - b _0819128C + b @0819128C .align 2, 0 .pool -_08191278: +@08191278: ldr r0, =0x02022e14 strh r2, [r0] ldr r1, =0x02022e16 @@ -774140,14 +774140,14 @@ _08191278: strh r2, [r0] ldr r0, =0x02022e1a strh r2, [r0] -_0819128C: +@0819128C: cmp r6, 0x2 - bne _0819133C + bne @0819133C ldr r5, =0x0203cd78 ldr r0, [r5] ldrb r1, [r0, 0x10] cmp r1, 0 - bne _081912F4 + bne @081912F4 ldr r0, =0x02022e1c strh r1, [r0] ldr r1, =0x02022e1e @@ -774171,10 +774171,10 @@ _0819128C: orrs r0, r2 ldrb r1, [r1] bl sub_81924E0 - b _0819141C + b @0819141C .align 2, 0 .pool -_081912F4: +@081912F4: ldr r0, =0x02022e1c movs r4, 0 strh r4, [r0] @@ -774200,15 +774200,15 @@ _081912F4: bl sub_81924E0 ldr r0, [r5] strb r4, [r0, 0x10] - b _0819141C + b @0819141C .align 2, 0 .pool -_0819133C: +@0819133C: ldr r6, =0x0203cd78 ldr r1, [r6] ldrb r5, [r1, 0x10] cmp r5, 0 - bne _08191394 + bne @08191394 ldr r4, =0x03005e00 lsls r0, r7, 2 adds r0, r7 @@ -774237,12 +774237,12 @@ _0819133C: orrs r0, r1 ldrb r1, [r2, 0x11] bl sub_81924E0 - b _0819141C + b @0819141C .align 2, 0 .pool -_08191394: +@08191394: cmp r5, 0x2 - bne _081913E4 + bne @081913E4 ldr r4, =0x03005e00 lsls r0, r7, 2 adds r0, r7 @@ -774272,10 +774272,10 @@ _08191394: orrs r0, r1 ldrb r1, [r2, 0x12] bl sub_81924E0 - b _0819141C + b @0819141C .align 2, 0 .pool -_081913E4: +@081913E4: ldr r1, =0x02022e1c movs r4, 0x80 lsls r4, 1 @@ -774303,7 +774303,7 @@ _081913E4: lsls r1, r2, 24 lsrs r1, 24 bl sub_819314C -_0819141C: +@0819141C: movs r6, 0 ldr r0, =0x0203cd78 mov r10, r0 @@ -774317,15 +774317,15 @@ _0819141C: adds r4, r3, 0 adds r4, 0x1C movs r7, 0x1 -_08191436: +@08191436: cmp r6, 0x1 - bgt _081914A4 + bgt @081914A4 mov r2, r10 ldr r0, [r2] adds r2, r0, r6 ldrb r0, [r2] cmp r0, 0xFF - beq _081914E8 + beq @081914E8 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -774360,16 +774360,16 @@ _08191436: lsls r0, 2 adds r0, r3 strh r1, [r0, 0x34] - b _081914E8 + b @081914E8 .align 2, 0 .pool -_081914A4: +@081914A4: mov r2, r10 ldr r0, [r2] adds r2, r0, r6 ldrb r0, [r2] cmp r0, 0xFF - beq _081914E8 + beq @081914E8 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -774398,10 +774398,10 @@ _081914A4: lsls r0, 2 adds r0, r3 strh r6, [r0, 0x32] -_081914E8: +@081914E8: adds r6, 0x1 cmp r6, 0x7 - ble _08191436 + ble @08191436 movs r6, 0x8 ldr r2, =0x0203cd78 mov r12, r2 @@ -774414,15 +774414,15 @@ _081914E8: movs r4, 0 adds r7, r3, 0 adds r7, 0x1C -_08191506: +@08191506: cmp r6, 0x9 - bgt _0819156C + bgt @0819156C mov r1, r12 ldr r0, [r1] adds r2, r0, r6 ldrb r0, [r2] cmp r0, 0xFF - beq _081915AC + beq @081915AC adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -774455,16 +774455,16 @@ _08191506: lsls r0, 2 adds r0, r3 strh r1, [r0, 0x34] - b _081915AC + b @081915AC .align 2, 0 .pool -_0819156C: +@0819156C: mov r2, r12 ldr r0, [r2] adds r2, r0, r6 ldrb r0, [r2] cmp r0, 0xFF - beq _081915AC + beq @081915AC adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -774491,10 +774491,10 @@ _0819156C: lsls r0, 2 adds r0, r3 strh r6, [r0, 0x32] -_081915AC: +@081915AC: adds r6, 0x1 cmp r6, 0xF - ble _08191506 + ble @08191506 mov r0, r9 add r0, r8 lsls r0, 3 @@ -774502,10 +774502,10 @@ _081915AC: adds r0, r3 movs r2, 0 movs r1, 0x5 - bl _08191FE8 + bl @08191FE8 .align 2, 0 .pool -_081915CC: +@081915CC: mov r0, r9 add r0, r8 lsls r0, 3 @@ -774514,7 +774514,7 @@ _081915CC: movs r5, 0xC ldrsh r2, [r0, r5] cmp r2, 0 - beq _0819160C + beq @0819160C ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] @@ -774527,10 +774527,10 @@ _081915CC: strh r0, [r2] ldr r0, =0x02022e1a strh r1, [r0] - b _08191622 + b @08191622 .align 2, 0 .pool -_0819160C: +@0819160C: ldr r1, =0x02022e14 movs r3, 0x80 lsls r3, 1 @@ -774542,12 +774542,12 @@ _0819160C: strh r2, [r0] ldr r0, =0x02022e1a strh r2, [r0] -_08191622: +@08191622: ldr r0, =0x0203cd78 ldr r4, [r0] ldrb r0, [r4, 0x10] cmp r0, 0 - bne _08191688 + bne @08191688 ldr r1, =0x02022e1c movs r4, 0x80 lsls r4, 1 @@ -774574,10 +774574,10 @@ _08191622: orrs r0, r2 ldrb r1, [r1] bl sub_81924E0 - b _081916C6 + b @081916C6 .align 2, 0 .pool -_08191688: +@08191688: ldr r1, =0x02022e1c movs r6, 0x80 lsls r6, 1 @@ -774608,7 +774608,7 @@ _08191688: orrs r0, r2 ldrb r1, [r1] bl sub_819314C -_081916C6: +@081916C6: movs r6, 0 ldr r0, =0x0203cd78 mov r10, r0 @@ -774622,15 +774622,15 @@ _081916C6: adds r4, r3, 0 adds r4, 0x1C movs r7, 0x1 -_081916E0: +@081916E0: cmp r6, 0x1 - bgt _08191754 + bgt @08191754 mov r2, r10 ldr r0, [r2] adds r2, r0, r6 ldrb r0, [r2] cmp r0, 0xFF - beq _08191798 + beq @08191798 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -774665,16 +774665,16 @@ _081916E0: lsls r0, 2 adds r0, r3 strh r1, [r0, 0x34] - b _08191798 + b @08191798 .align 2, 0 .pool -_08191754: +@08191754: mov r2, r10 ldr r0, [r2] adds r2, r0, r6 ldrb r0, [r2] cmp r0, 0xFF - beq _08191798 + beq @08191798 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -774703,10 +774703,10 @@ _08191754: lsls r0, 2 adds r0, r3 strh r6, [r0, 0x32] -_08191798: +@08191798: adds r6, 0x1 cmp r6, 0x7 - ble _081916E0 + ble @081916E0 movs r6, 0x8 ldr r2, =0x0203cd78 mov r12, r2 @@ -774719,15 +774719,15 @@ _08191798: movs r4, 0 adds r7, r3, 0 adds r7, 0x1C -_081917B6: +@081917B6: cmp r6, 0x9 - bgt _0819181C + bgt @0819181C mov r1, r12 ldr r0, [r1] adds r2, r0, r6 ldrb r0, [r2] cmp r0, 0xFF - beq _0819185C + beq @0819185C adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -774760,16 +774760,16 @@ _081917B6: lsls r0, 2 adds r0, r3 strh r1, [r0, 0x34] - b _0819185C + b @0819185C .align 2, 0 .pool -_0819181C: +@0819181C: mov r2, r12 ldr r0, [r2] adds r2, r0, r6 ldrb r0, [r2] cmp r0, 0xFF - beq _0819185C + beq @0819185C adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -774796,10 +774796,10 @@ _0819181C: lsls r0, 2 adds r0, r3 strh r6, [r0, 0x32] -_0819185C: +@0819185C: adds r6, 0x1 cmp r6, 0xF - ble _081917B6 + ble @081917B6 mov r0, r9 add r0, r8 lsls r0, 3 @@ -774807,10 +774807,10 @@ _0819185C: adds r0, r3 movs r2, 0 movs r1, 0x6 - b _08191FE8 + b @08191FE8 .align 2, 0 .pool -_0819187C: +@0819187C: mov r0, r9 add r0, r8 lsls r0, 3 @@ -774819,7 +774819,7 @@ _0819187C: movs r5, 0xC ldrsh r2, [r0, r5] cmp r2, 0 - beq _081918BC + beq @081918BC ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] @@ -774832,10 +774832,10 @@ _0819187C: strh r0, [r2] ldr r0, =0x02022e1a strh r1, [r0] - b _081918D2 + b @081918D2 .align 2, 0 .pool -_081918BC: +@081918BC: ldr r1, =0x02022e14 movs r3, 0x80 lsls r3, 1 @@ -774847,12 +774847,12 @@ _081918BC: strh r2, [r0] ldr r0, =0x02022e1a strh r2, [r0] -_081918D2: +@081918D2: ldr r0, =0x0203cd78 ldr r2, [r0] ldrb r0, [r2, 0x10] cmp r0, 0 - bne _08191924 + bne @08191924 ldr r1, =0x02022e1c movs r4, 0x80 lsls r4, 1 @@ -774871,10 +774871,10 @@ _081918D2: orrs r0, r1 ldrb r1, [r2, 0x11] bl sub_81924E0 - b _08191958 + b @08191958 .align 2, 0 .pool -_08191924: +@08191924: ldr r1, =0x02022e1c movs r0, 0 strh r0, [r1] @@ -774900,7 +774900,7 @@ _08191924: lsls r1, r2, 24 lsrs r1, 24 bl sub_819314C -_08191958: +@08191958: movs r6, 0 ldr r0, =0x0203cd78 mov r10, r0 @@ -774914,15 +774914,15 @@ _08191958: adds r4, r3, 0 adds r4, 0x1C movs r7, 0x1 -_08191972: +@08191972: cmp r6, 0x1 - bgt _081919E0 + bgt @081919E0 mov r2, r10 ldr r0, [r2] adds r2, r0, r6 ldrb r0, [r2] cmp r0, 0xFF - beq _08191A24 + beq @08191A24 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -774957,16 +774957,16 @@ _08191972: lsls r0, 2 adds r0, r3 strh r1, [r0, 0x34] - b _08191A24 + b @08191A24 .align 2, 0 .pool -_081919E0: +@081919E0: mov r2, r10 ldr r0, [r2] adds r2, r0, r6 ldrb r0, [r2] cmp r0, 0xFF - beq _08191A24 + beq @08191A24 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -774995,10 +774995,10 @@ _081919E0: lsls r0, 2 adds r0, r3 strh r6, [r0, 0x32] -_08191A24: +@08191A24: adds r6, 0x1 cmp r6, 0x7 - ble _08191972 + ble @08191972 movs r6, 0x8 ldr r2, =0x0203cd78 mov r12, r2 @@ -775011,15 +775011,15 @@ _08191A24: movs r4, 0 adds r7, r3, 0 adds r7, 0x1C -_08191A42: +@08191A42: cmp r6, 0x9 - bgt _08191AA8 + bgt @08191AA8 mov r1, r12 ldr r0, [r1] adds r2, r0, r6 ldrb r0, [r2] cmp r0, 0xFF - beq _08191AE8 + beq @08191AE8 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -775052,16 +775052,16 @@ _08191A42: lsls r0, 2 adds r0, r3 strh r1, [r0, 0x34] - b _08191AE8 + b @08191AE8 .align 2, 0 .pool -_08191AA8: +@08191AA8: mov r2, r12 ldr r0, [r2] adds r2, r0, r6 ldrb r0, [r2] cmp r0, 0xFF - beq _08191AE8 + beq @08191AE8 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -775088,10 +775088,10 @@ _08191AA8: lsls r0, 2 adds r0, r3 strh r6, [r0, 0x32] -_08191AE8: +@08191AE8: adds r6, 0x1 cmp r6, 0xF - ble _08191A42 + ble @08191A42 mov r0, r9 add r0, r8 lsls r0, 3 @@ -775099,10 +775099,10 @@ _08191AE8: adds r0, r3 movs r2, 0 movs r1, 0x6 - b _08191FE8 + b @08191FE8 .align 2, 0 .pool -_08191B08: +@08191B08: mov r0, r9 add r0, r8 lsls r0, 3 @@ -775111,7 +775111,7 @@ _08191B08: movs r5, 0xC ldrsh r2, [r0, r5] cmp r2, 0 - beq _08191B48 + beq @08191B48 ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] @@ -775124,10 +775124,10 @@ _08191B08: strh r0, [r2] ldr r0, =0x02022e1a strh r1, [r0] - b _08191B5E + b @08191B5E .align 2, 0 .pool -_08191B48: +@08191B48: ldr r1, =0x02022e14 movs r3, 0xFF lsls r3, 8 @@ -775139,28 +775139,28 @@ _08191B48: strh r2, [r0] ldr r0, =0x02022e1a strh r2, [r0] -_08191B5E: +@08191B5E: ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0x1 - bne _08191B94 + bne @08191B94 ldr r1, =0x02022e1c movs r0, 0 strh r0, [r1] ldr r1, =0x02022e1e movs r0, 0xA0 strh r0, [r1] - b _08191B9E + b @08191B9E .align 2, 0 .pool -_08191B94: +@08191B94: ldr r0, =0x02022e1c movs r1, 0 strh r1, [r0] ldr r0, =0x02022e1e strh r1, [r0] -_08191B9E: +@08191B9E: ldr r4, =0x0860d15c ldr r5, =0x0203cd78 ldr r3, [r5] @@ -775191,15 +775191,15 @@ _08191B9E: mov r10, r5 adds r5, r7, 0 adds r5, 0x1C -_08191BDC: +@08191BDC: cmp r6, 0x1 - bgt _08191C50 + bgt @08191C50 mov r1, r10 ldr r0, [r1] adds r3, r0, r6 ldrb r0, [r3] cmp r0, 0xFF - beq _08191C96 + beq @08191C96 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -775235,16 +775235,16 @@ _08191BDC: lsls r0, 2 adds r0, r7 strh r1, [r0, 0x34] - b _08191C96 + b @08191C96 .align 2, 0 .pool -_08191C50: +@08191C50: mov r3, r10 ldr r0, [r3] adds r3, r0, r6 ldrb r0, [r3] cmp r0, 0xFF - beq _08191C96 + beq @08191C96 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -775274,10 +775274,10 @@ _08191C50: lsls r0, 2 adds r0, r7 strh r6, [r0, 0x32] -_08191C96: +@08191C96: adds r6, 0x1 cmp r6, 0x7 - ble _08191BDC + ble @08191BDC movs r6, 0x8 ldr r2, =0x0203cd78 mov r12, r2 @@ -775290,15 +775290,15 @@ _08191C96: movs r4, 0 adds r7, r3, 0 adds r7, 0x1C -_08191CB4: +@08191CB4: cmp r6, 0x9 - bgt _08191D1C + bgt @08191D1C mov r1, r12 ldr r0, [r1] adds r2, r0, r6 ldrb r0, [r2] cmp r0, 0xFF - beq _08191D5C + beq @08191D5C adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -775331,16 +775331,16 @@ _08191CB4: lsls r0, 2 adds r0, r3 strh r1, [r0, 0x34] - b _08191D5C + b @08191D5C .align 2, 0 .pool -_08191D1C: +@08191D1C: mov r2, r12 ldr r0, [r2] adds r2, r0, r6 ldrb r0, [r2] cmp r0, 0xFF - beq _08191D5C + beq @08191D5C adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -775367,14 +775367,14 @@ _08191D1C: lsls r0, 2 adds r0, r3 strh r6, [r0, 0x32] -_08191D5C: +@08191D5C: adds r6, 0x1 cmp r6, 0xF - ble _08191CB4 - b _08191FDA + ble @08191CB4 + b @08191FDA .align 2, 0 .pool -_08191D68: +@08191D68: mov r0, r9 add r0, r8 lsls r0, 3 @@ -775383,7 +775383,7 @@ _08191D68: movs r5, 0xC ldrsh r2, [r0, r5] cmp r2, 0 - beq _08191DA8 + beq @08191DA8 ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] @@ -775396,10 +775396,10 @@ _08191D68: strh r0, [r2] ldr r0, =0x02022e1a strh r1, [r0] - b _08191DBE + b @08191DBE .align 2, 0 .pool -_08191DA8: +@08191DA8: ldr r1, =0x02022e14 movs r3, 0xFF lsls r3, 8 @@ -775411,12 +775411,12 @@ _08191DA8: strh r2, [r0] ldr r0, =0x02022e1a strh r2, [r0] -_08191DBE: +@08191DBE: ldr r0, =0x0203cd78 ldr r2, [r0] ldrb r0, [r2, 0x10] cmp r0, 0x2 - bne _08191E10 + bne @08191E10 ldr r1, =0x02022e1c movs r4, 0x80 lsls r4, 1 @@ -775435,10 +775435,10 @@ _08191DBE: orrs r0, r1 ldrb r1, [r2, 0x12] bl sub_81924E0 - b _08191E44 + b @08191E44 .align 2, 0 .pool -_08191E10: +@08191E10: ldr r1, =0x02022e1c movs r0, 0 strh r0, [r1] @@ -775464,7 +775464,7 @@ _08191E10: lsls r1, r2, 24 lsrs r1, 24 bl sub_819314C -_08191E44: +@08191E44: movs r6, 0 ldr r0, =0x0203cd78 mov r10, r0 @@ -775478,15 +775478,15 @@ _08191E44: adds r4, r3, 0 adds r4, 0x1C movs r7, 0x1 -_08191E5E: +@08191E5E: cmp r6, 0x1 - bgt _08191ECC + bgt @08191ECC mov r2, r10 ldr r0, [r2] adds r2, r0, r6 ldrb r0, [r2] cmp r0, 0xFF - beq _08191F10 + beq @08191F10 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -775521,16 +775521,16 @@ _08191E5E: lsls r0, 2 adds r0, r3 strh r1, [r0, 0x34] - b _08191F10 + b @08191F10 .align 2, 0 .pool -_08191ECC: +@08191ECC: mov r2, r10 ldr r0, [r2] adds r2, r0, r6 ldrb r0, [r2] cmp r0, 0xFF - beq _08191F10 + beq @08191F10 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -775559,10 +775559,10 @@ _08191ECC: lsls r0, 2 adds r0, r3 strh r6, [r0, 0x32] -_08191F10: +@08191F10: adds r6, 0x1 cmp r6, 0x7 - ble _08191E5E + ble @08191E5E movs r6, 0x8 ldr r2, =0x0203cd78 mov r12, r2 @@ -775575,15 +775575,15 @@ _08191F10: movs r4, 0 adds r7, r3, 0 adds r7, 0x1C -_08191F2E: +@08191F2E: cmp r6, 0x9 - bgt _08191F94 + bgt @08191F94 mov r1, r12 ldr r0, [r1] adds r2, r0, r6 ldrb r0, [r2] cmp r0, 0xFF - beq _08191FD4 + beq @08191FD4 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -775616,16 +775616,16 @@ _08191F2E: lsls r0, 2 adds r0, r3 strh r1, [r0, 0x34] - b _08191FD4 + b @08191FD4 .align 2, 0 .pool -_08191F94: +@08191F94: mov r2, r12 ldr r0, [r2] adds r2, r0, r6 ldrb r0, [r2] cmp r0, 0xFF - beq _08191FD4 + beq @08191FD4 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -775652,11 +775652,11 @@ _08191F94: lsls r0, 2 adds r0, r3 strh r6, [r0, 0x32] -_08191FD4: +@08191FD4: adds r6, 0x1 cmp r6, 0xF - ble _08191F2E -_08191FDA: + ble @08191F2E +@08191FDA: mov r0, r9 add r0, r8 lsls r0, 3 @@ -775664,13 +775664,13 @@ _08191FDA: adds r0, r3 movs r2, 0 movs r1, 0x7 -_08191FE8: +@08191FE8: strh r1, [r0, 0x8] strh r2, [r0, 0x12] - b _08192202 + b @08192202 .align 2, 0 .pool -_08191FF8: +@08191FF8: mov r4, r8 lsls r0, r4, 2 add r0, r8 @@ -775683,7 +775683,7 @@ _08191FF8: lsls r0, 16 asrs r0, 16 cmp r0, 0x29 - beq _08192100 + beq @08192100 ldr r1, =0x02022e16 ldrh r0, [r1] subs r0, 0x4 @@ -775693,10 +775693,10 @@ _08191FF8: subs r0, 0x4 strh r0, [r1] ldr r1, =0x02022e1e - b _081920A4 + b @081920A4 .align 2, 0 .pool -_08192038: +@08192038: mov r6, r8 lsls r0, r6, 2 add r0, r8 @@ -775709,7 +775709,7 @@ _08192038: lsls r0, 16 asrs r0, 16 cmp r0, 0x29 - beq _08192100 + beq @08192100 ldr r1, =0x02022e16 ldrh r0, [r1] adds r0, 0x4 @@ -775719,10 +775719,10 @@ _08192038: adds r0, 0x4 strh r0, [r1] ldr r1, =0x02022e1e - b _081920E8 + b @081920E8 .align 2, 0 .pool -_08192078: +@08192078: mov r3, r8 lsls r0, r3, 2 add r0, r8 @@ -775735,7 +775735,7 @@ _08192078: lsls r0, 16 asrs r0, 16 cmp r0, 0x41 - beq _08192100 + beq @08192100 ldr r1, =0x02022e14 ldrh r0, [r1] subs r0, 0x4 @@ -775745,14 +775745,14 @@ _08192078: subs r0, 0x4 strh r0, [r1] ldr r1, =0x02022e1c -_081920A4: +@081920A4: ldrh r0, [r1] subs r0, 0x4 strh r0, [r1] - b _08192202 + b @08192202 .align 2, 0 .pool -_081920BC: +@081920BC: mov r5, r8 lsls r0, r5, 2 add r0, r8 @@ -775765,7 +775765,7 @@ _081920BC: lsls r0, 16 asrs r0, 16 cmp r0, 0x41 - beq _08192100 + beq @08192100 ldr r1, =0x02022e14 ldrh r0, [r1] adds r0, 0x4 @@ -775775,44 +775775,44 @@ _081920BC: adds r0, 0x4 strh r0, [r1] ldr r1, =0x02022e1c -_081920E8: +@081920E8: ldrh r0, [r1] adds r0, 0x4 strh r0, [r1] - b _08192202 + b @08192202 .align 2, 0 .pool -_08192100: +@08192100: movs r0, 0x2 strh r0, [r1, 0x8] - b _08192202 -_08192106: + b @08192202 +@08192106: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08192202 + bne @08192202 movs r6, 0 ldr r4, =0x0203cd78 -_08192116: +@08192116: cmp r6, 0x1 - bgt _08192134 + bgt @08192134 ldr r0, [r4] adds r1, r0, r6 ldrb r0, [r1] cmp r0, 0xFF - beq _0819214E + beq @0819214E bl sub_818D8F0 - b _0819214E + b @0819214E .align 2, 0 .pool -_08192134: +@08192134: ldr r0, [r4] adds r1, r0, r6 ldrb r0, [r1] cmp r0, 0xFF - beq _0819214E + beq @0819214E adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -775820,30 +775820,30 @@ _08192134: ldr r1, =0x02020630 adds r0, r1 bl sub_80D2EF8 -_0819214E: +@0819214E: adds r6, 0x1 cmp r6, 0x7 - ble _08192116 + ble @08192116 movs r6, 0x8 ldr r4, =0x0203cd78 -_08192158: +@08192158: cmp r6, 0x9 - bgt _08192174 + bgt @08192174 ldr r0, [r4] adds r1, r0, r6 ldrb r0, [r1] cmp r0, 0xFF - beq _0819218E + beq @0819218E bl sub_818D8F0 - b _0819218E + b @0819218E .align 2, 0 .pool -_08192174: +@08192174: ldr r0, [r4] adds r1, r0, r6 ldrb r0, [r1] cmp r0, 0xFF - beq _0819218E + beq @0819218E adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -775851,10 +775851,10 @@ _08192174: ldr r1, =0x02020630 adds r0, r1 bl sub_80D2EF8 -_0819218E: +@0819218E: adds r6, 0x1 cmp r6, 0xF - ble _08192158 + ble @08192158 bl sub_80D2F9C ldr r4, =0x0203cd78 ldr r0, [r4] @@ -775864,13 +775864,13 @@ _0819218E: bl Window_FreeMemory mov r0, r9 cmp r0, 0 - bne _081921C4 + bne @081921C4 ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 - b _081921FC + b @081921FC .align 2, 0 .pool -_081921C4: +@081921C4: ldr r0, =sub_8194220 + 1 movs r1, 0 bl AddTask @@ -775898,10 +775898,10 @@ _081921C4: adds r0, r2 ldrh r0, [r0, 0x14] strh r0, [r1, 0x10] -_081921FC: +@081921FC: mov r0, r8 bl remove_task -_08192202: +@08192202: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -775915,7 +775915,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 @@ -775955,85 +775955,85 @@ sub_819221C: @ 819221C ands r0, r4 adds r2, r1, 0 cmp r0, 0 - beq _0819226E + beq @0819226E movs r7, 0x9 -_0819226E: +@0819226E: mov r3, r12 movs r1, 0xE ldrsh r0, [r3, r1] cmp r0, 0 - bne _0819227A - b _081924CC -_0819227A: + bne @0819227A + b @081924CC +@0819227A: cmp r0, 0x1 - beq _08192280 - b _081923B0 -_08192280: + beq @08192280 + b @081923B0 +@08192280: movs r0, 0x40 ands r0, r4 cmp r0, 0 - beq _081922BA + beq @081922BA ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0 - bne _081922BA + bne @081922BA cmp r5, 0 - bne _081922B4 + bne @081922B4 movs r5, 0xF - b _081922B6 + b @081922B6 .align 2, 0 .pool -_081922B4: +@081922B4: subs r5, 0x1 -_081922B6: +@081922B6: movs r7, 0x1 - b _08192360 -_081922BA: + b @08192360 +@081922BA: ldrh r1, [r2, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081922E2 + beq @081922E2 ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0 - bne _081922E2 + bne @081922E2 cmp r5, 0xF - bne _081922DC + bne @081922DC movs r5, 0 - b _081922DE + b @081922DE .align 2, 0 .pool -_081922DC: +@081922DC: adds r5, 0x1 -_081922DE: +@081922DE: movs r7, 0x2 - b _08192360 -_081922E2: + b @08192360 +@081922E2: ldrh r1, [r2, 0x2E] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _08192304 + beq @08192304 ldr r0, =0x0203cd78 ldr r1, [r0] ldrb r0, [r1, 0x10] cmp r0, 0 - beq _08192304 + beq @08192304 subs r0, 0x1 strb r0, [r1, 0x10] movs r7, 0x3 - b _08192360 + b @08192360 .align 2, 0 .pool -_08192304: +@08192304: ldrh r1, [r2, 0x2E] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08192360 + beq @08192360 ldr r2, =0x03005d90 ldr r0, [r2] mov r3, r10 @@ -776045,7 +776045,7 @@ _08192304: lsls r0, r3, 29 mov r12, r1 cmp r0, 0 - bge _0819233C + bge @0819233C ldr r0, =0x0203cd78 ldr r2, [r0] ldrb r4, [r2, 0x10] @@ -776053,11 +776053,11 @@ _08192304: lsls r0, r3, 27 lsrs r0, 30 cmp r1, r0 - bge _0819233C + bge @0819233C adds r0, r4, 0x1 strb r0, [r2, 0x10] movs r7, 0x4 -_0819233C: +@0819233C: ldr r3, =0x03005d90 ldr r0, [r3] add r0, r12 @@ -776066,26 +776066,26 @@ _0819233C: ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt _08192360 + blt @08192360 ldr r0, =0x0203cd78 ldr r3, [r0] ldrb r1, [r3, 0x10] subs r0, r1, 0x1 cmp r0, r8 - bge _08192360 + bge @08192360 adds r0, r1, 0x1 strb r0, [r3, 0x10] movs r7, 0x4 -_08192360: +@08192360: cmp r7, 0x9 - beq _08192366 - b _081924A0 -_08192366: + beq @08192366 + b @081924A0 +@08192366: ldr r0, =0x0203cd78 ldr r3, [r0] ldrb r0, [r3, 0x10] cmp r0, 0 - beq _081923A0 + beq @081923A0 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -776099,105 +776099,105 @@ _08192366: subs r0, 0x1 ldrb r3, [r3, 0x10] adds r0, r3 - b _08192482 + b @08192482 .align 2, 0 .pool -_081923A0: +@081923A0: lsls r0, r6, 2 adds r0, r6 lsls r0, 3 ldr r3, =0x03005e00 adds r0, r3 - b _0819249E + b @0819249E .align 2, 0 .pool -_081923B0: +@081923B0: movs r0, 0x40 ands r0, r4 cmp r0, 0 - beq _081923DE + beq @081923DE ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0x1 - bne _081923DE + bne @081923DE cmp r5, 0x10 - bne _081923D8 + bne @081923D8 ldr r0, =0x0860d19c add r0, r8 ldrb r5, [r0] - b _081923DA + b @081923DA .align 2, 0 .pool -_081923D8: +@081923D8: subs r5, 0x1 -_081923DA: +@081923DA: movs r7, 0x5 - b _08192446 -_081923DE: + b @08192446 +@081923DE: ldrh r1, [r2, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0819240E + beq @0819240E ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0x1 - bne _0819240E + bne @0819240E ldr r0, =0x0860d19c add r0, r8 ldrb r0, [r0] cmp r5, r0 - bne _08192408 + bne @08192408 movs r5, 0x10 - b _0819240A + b @0819240A .align 2, 0 .pool -_08192408: +@08192408: adds r5, 0x1 -_0819240A: +@0819240A: movs r7, 0x6 - b _08192446 -_0819240E: + b @08192446 +@0819240E: ldrh r1, [r2, 0x2E] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0819242C + beq @0819242C ldr r0, =0x0203cd78 ldr r1, [r0] ldrb r0, [r1, 0x10] cmp r0, 0 - beq _0819242C + beq @0819242C movs r7, 0x7 subs r0, 0x1 - b _08192444 + b @08192444 .align 2, 0 .pool -_0819242C: +@0819242C: ldrh r1, [r2, 0x2E] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _08192446 + beq @08192446 ldr r0, =0x0203cd78 ldr r1, [r0] ldrb r0, [r1, 0x10] cmp r0, 0x1 - bhi _08192446 + bhi @08192446 movs r7, 0x8 adds r0, 0x1 -_08192444: +@08192444: strb r0, [r1, 0x10] -_08192446: +@08192446: cmp r7, 0x9 - bne _081924A0 + bne @081924A0 ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r1, [r0, 0x10] cmp r1, 0 - bne _08192470 + bne @08192470 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -776205,12 +776205,12 @@ _08192446: adds r1, r2 ldr r2, =0x0860d1c0 ldrb r0, [r0, 0x11] - b _08192482 + b @08192482 .align 2, 0 .pool -_08192470: +@08192470: cmp r1, 0x2 - bne _08192494 + bne @08192494 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -776218,26 +776218,26 @@ _08192470: adds r1, r3 ldr r2, =0x0860d1c0 ldrb r0, [r0, 0x12] -_08192482: +@08192482: adds r0, r2 ldrb r0, [r0] strh r0, [r1, 0xA] - b _081924A0 + b @081924A0 .align 2, 0 .pool -_08192494: +@08192494: lsls r0, r6, 2 adds r0, r6 lsls r0, 3 ldr r1, =0x03005e00 adds r0, r1 -_0819249E: +@0819249E: strh r5, [r0, 0xA] -_081924A0: +@081924A0: cmp r7, 0 - beq _081924CC + beq @081924CC cmp r7, 0x9 - beq _081924CC + beq @081924CC movs r0, 0x5 bl audio_play ldr r1, =0x03005e00 @@ -776255,7 +776255,7 @@ _081924A0: movs r2, 0x1 eors r1, r2 strh r1, [r0, 0xC] -_081924CC: +@081924CC: adds r0, r7, 0 pop {r3-r5} mov r8, r3 @@ -776269,7 +776269,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 @@ -776308,73 +776308,73 @@ sub_81924E0: @ 81924E0 ldr r3, [sp, 0x1C] ands r0, r3 cmp r0, 0 - beq _08192538 + beq @08192538 movs r5, 0x8 movs r4, 0x9 str r4, [sp, 0x28] movs r4, 0x2 -_08192538: +@08192538: movs r0, 0x2 ldr r2, [sp, 0x1C] ands r0, r2 cmp r0, 0 - beq _08192548 + beq @08192548 movs r3, 0x80 lsls r3, 1 str r3, [sp, 0x2C] -_08192548: +@08192548: movs r0, 0x4 ldr r2, [sp, 0x1C] ands r0, r2 cmp r0, 0 - beq _08192556 + beq @08192556 movs r3, 0xA0 str r3, [sp, 0x30] -_08192556: +@08192556: movs r0, 0x8 ldr r2, [sp, 0x1C] ands r0, r2 cmp r0, 0 - beq _08192564 + beq @08192564 ldr r3, =0xffffff00 str r3, [sp, 0x2C] -_08192564: +@08192564: movs r0, 0x10 ldr r2, [sp, 0x1C] ands r0, r2 cmp r0, 0 - beq _08192574 + beq @08192574 movs r3, 0xA0 negs r3, r3 str r3, [sp, 0x30] -_08192574: +@08192574: ldr r0, =0x000003ff ldr r2, [sp, 0x24] cmp r2, r0 - bne _08192598 + bne @08192598 ldrb r0, [r1, 0x8] bl sub_806F000 lsls r0, 16 lsrs r0, 16 - b _081925B6 + b @081925B6 .align 2, 0 .pool -_08192598: +@08192598: ldr r0, =0x000003fe ldr r3, [sp, 0x24] cmp r3, r0 - bne _081925AC + bne @081925AC bl sub_8195910 - b _081925B2 + b @081925B2 .align 2, 0 .pool -_081925AC: +@081925AC: ldr r0, [sp, 0x24] bl sub_8162AA0 -_081925B2: +@081925B2: lsls r0, 24 lsrs r0, 24 -_081925B6: +@081925B6: ldr r2, [sp, 0x2C] adds r2, 0x30 ldr r3, [sp, 0x30] @@ -776394,7 +776394,7 @@ _081925B6: ldr r4, [sp, 0x1C] ands r0, r4 cmp r0, 0 - beq _081925FC + beq @081925FC ldr r2, =0x02020630 ldr r0, =0x0203cd78 ldr r0, [r0] @@ -776409,7 +776409,7 @@ _081925B6: movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_081925FC: +@081925FC: movs r7, 0 ldr r0, [sp, 0x20] lsls r0, 1 @@ -776430,11 +776430,11 @@ _081925FC: lsls r5, r0, 1 movs r3, 0 mov r9, r3 -_08192624: +@08192624: ldr r0, =0x000003ff ldr r1, [sp, 0x24] cmp r1, r0 - bne _08192660 + bne @08192660 ldr r0, =0x03005d90 ldr r0, [r0] ldr r2, =0x00000d64 @@ -776446,14 +776446,14 @@ _08192624: ldrb r2, [r1] ldr r3, [sp, 0x2C] orrs r2, r3 - b _081926B0 + b @081926B0 .align 2, 0 .pool -_08192660: +@08192660: ldr r0, =0x000003fe ldr r3, [sp, 0x24] cmp r3, r0 - bne _08192690 + bne @08192690 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000d64 @@ -776465,10 +776465,10 @@ _08192660: ldrb r2, [r1] ldr r3, [sp, 0x2C] orrs r2, r3 - b _081926B0 + b @081926B0 .align 2, 0 .pool -_08192690: +@08192690: ldr r0, =0x03005d90 ldr r0, [r0] ldr r3, =0x00000d64 @@ -776485,7 +776485,7 @@ _08192690: ldrb r2, [r1] ldr r1, [sp, 0x2C] orrs r2, r1 -_081926B0: +@081926B0: ldr r1, =0x0860d343 adds r1, r7, r1 ldrb r3, [r1] @@ -776517,7 +776517,7 @@ _081926B0: ldr r3, [sp, 0x1C] ands r0, r3 cmp r0, 0 - beq _0819270A + beq @0819270A ldr r0, [r6] adds r0, r4 ldrb r1, [r0] @@ -776530,12 +776530,12 @@ _081926B0: movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_0819270A: +@0819270A: adds r4, 0x1 adds r5, 0x2 adds r7, 0x1 cmp r7, 0x2 - ble _08192624 + ble @08192624 add r0, sp, 0xC movs r2, 0 movs r3, 0x2 @@ -776571,29 +776571,29 @@ _0819270A: ldr r0, =0x000003ff ldr r4, [sp, 0x24] cmp r4, r0 - bne _08192784 + bne @08192784 ldr r0, =0x0831f5ca adds r0, 0x3C ldrb r5, [r0] - b _081927A2 + b @081927A2 .align 2, 0 .pool -_08192784: +@08192784: ldr r0, =0x000003fe ldr r1, [sp, 0x24] cmp r1, r0 - bne _08192798 + bne @08192798 bl sub_8195924 - b _0819279E + b @0819279E .align 2, 0 .pool -_08192798: +@08192798: ldr r0, [sp, 0x24] bl sub_8162BD8 -_0819279E: +@0819279E: lsls r0, 24 lsrs r5, r0, 24 -_081927A2: +@081927A2: ldr r2, =0x0830fcd4 movs r0, 0xD adds r1, r5, 0 @@ -776602,11 +776602,11 @@ _081927A2: adds r0, r2 ldrb r0, [r0] cmp r0, 0xFF - beq _081927CA + beq @081927CA ldr r3, =0x02021cc4 adds r0, r1, r2 adds r2, r7, r0 -_081927BA: +@081927BA: adds r0, r7, r3 ldrb r1, [r2] strb r1, [r0] @@ -776614,8 +776614,8 @@ _081927BA: adds r7, 0x1 ldrb r0, [r2] cmp r0, 0xFF - bne _081927BA -_081927CA: + bne @081927BA +@081927CA: ldr r5, =0x02021cc4 adds r1, r7, r5 movs r0, 0 @@ -776627,29 +776627,29 @@ _081927CA: ldr r0, =0x000003ff ldr r2, [sp, 0x24] cmp r2, r0 - bne _08192800 + bne @08192800 ldr r0, =0x03005d90 ldr r1, [r0] adds r0, r5, 0 bl gf_strcat - b _08192836 + b @08192836 .align 2, 0 .pool -_08192800: +@08192800: ldr r0, =0x000003fe ldr r3, [sp, 0x24] cmp r3, r0 - bne _08192824 + bne @08192824 ldr r4, =0x02021dc4 adds r0, r4, 0 bl sub_8195938 adds r0, r5, 0 adds r1, r4, 0 bl gf_strcat - b _08192836 + b @08192836 .align 2, 0 .pool -_08192824: +@08192824: ldr r4, =0x02021dc4 ldr r1, [sp, 0x24] adds r0, r4, 0 @@ -776657,7 +776657,7 @@ _08192824: adds r0, r5, 0 adds r1, r4, 0 bl gf_strcat -_08192836: +@08192836: add r0, sp, 0xC ldrb r0, [r0, 0x5] ldr r4, =0x02021cc4 @@ -776696,7 +776696,7 @@ _08192836: mov r9, r0 movs r3, 0xB mov r10, r3 -_0819288A: +@0819288A: ldr r0, =0x0860d346 adds r0, r7, r0 ldrb r0, [r0] @@ -776704,31 +776704,31 @@ _0819288A: ldr r0, =0x000003ff ldr r4, [sp, 0x24] cmp r4, r0 - bne _081928C0 + bne @081928C0 ldr r0, =0x03005d90 ldr r1, [r0] lsls r0, r7, 1 add r0, r9 ldr r2, =0x00000d64 adds r1, r2 - b _081928FA + b @081928FA .align 2, 0 .pool -_081928C0: +@081928C0: ldr r0, =0x000003fe ldr r4, [sp, 0x24] cmp r4, r0 - bne _081928E4 + bne @081928E4 ldr r0, =0x03005d90 ldr r1, [r0] lsls r0, r7, 1 add r0, r9 ldr r2, =0x00000d64 adds r1, r2 - b _081928FA + b @081928FA .align 2, 0 .pool -_081928E4: +@081928E4: ldr r4, =0x03005d90 ldr r1, [r4] lsls r0, r7, 1 @@ -776740,7 +776740,7 @@ _081928E4: ldr r0, =0x0203bc8c ldr r0, [r0] lsls r1, 4 -_081928FA: +@081928FA: adds r1, r0 ldrh r0, [r1] mov r3, r10 @@ -776755,15 +776755,15 @@ _081928FA: movs r1, 0 strb r0, [r6, 0x4] cmp r7, 0x1 - bne _08192930 + bne @08192930 movs r0, 0x7 strb r0, [r6, 0x8] - b _08192932 + b @08192932 .align 2, 0 .pool -_08192930: +@08192930: strb r1, [r6, 0x8] -_08192932: +@08192932: adds r5, r7, 0x1 ldr r0, [sp, 0x28] adds r4, r5, r0 @@ -776780,7 +776780,7 @@ _08192932: bl remo_copy adds r7, r5, 0 cmp r7, 0x2 - ble _0819288A + ble @0819288A ldr r4, [sp, 0x40] adds r0, r4, 0 bl Window_WriteStandardTileMap @@ -776790,19 +776790,19 @@ _08192932: ldr r0, =0x000003fe ldr r1, [sp, 0x24] cmp r1, r0 - bne _08192980 + bne @08192980 ldr r0, =0x0860d1d0 ldr r0, [r0, 0x40] - b _0819298A + b @0819298A .align 2, 0 .pool -_08192980: +@08192980: ldr r0, =0x0860d1d0 ldr r2, [sp, 0x20] lsls r1, r2, 2 adds r1, r0 ldr r0, [r1] -_0819298A: +@0819298A: str r0, [sp, 0xC] add r1, sp, 0xC movs r2, 0 @@ -776820,24 +776820,24 @@ _0819298A: bl remo_copy movs r7, 0 ldr r3, =0x0860b358 -_081929AE: +@081929AE: movs r5, 0 adds r4, r7, 0x1 str r4, [sp, 0x38] lsls r0, r7, 1 str r0, [sp, 0x34] lsls r2, r7, 4 -_081929BA: +@081929BA: movs r6, 0 lsls r1, r5, 1 mov r10, r1 mov r4, r8 mov r9, r2 -_081929C4: +@081929C4: ldr r0, =0x000003fe ldr r1, [sp, 0x24] cmp r1, r0 - bne _08192A00 + bne @08192A00 lsls r0, r7, 24 lsls r1, r5, 24 lsrs r0, 24 @@ -776855,23 +776855,23 @@ _081929C4: adds r1, r0 strh r1, [r4] ldr r2, [sp, 0x48] - b _08192A58 + b @08192A58 .align 2, 0 .pool -_08192A00: +@08192A00: ldr r0, =0x000003ff ldr r1, [sp, 0x24] cmp r1, r0 - bne _08192A20 + bne @08192A20 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000efc adds r0, r1 add r0, r9 - b _08192A48 + b @08192A48 .align 2, 0 .pool -_08192A20: +@08192A20: ldr r0, =0x03005d90 ldr r0, [r0] mov r12, r0 @@ -776892,7 +776892,7 @@ _08192A20: adds r0, r1 adds r0, 0x2 add r0, r10 -_08192A48: +@08192A48: ldrh r0, [r0] lsls r0, 4 adds r0, r6, r0 @@ -776901,24 +776901,24 @@ _08192A48: ldrb r0, [r0] adds r1, r0 strh r1, [r4] -_08192A58: +@08192A58: adds r4, 0x2 adds r6, 0x1 cmp r6, 0xF - ble _081929C4 + ble @081929C4 adds r2, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble _081929BA + ble @081929BA ldr r7, [sp, 0x38] cmp r7, 0x2 - ble _081929AE + ble @081929AE movs r7, 0 ldr r2, =0x0860d214 mov r9, r2 ldr r3, =0x0860c988 mov r10, r3 -_08192A78: +@08192A78: movs r4, 0 movs r6, 0 movs r5, 0 @@ -776926,31 +776926,31 @@ _08192A78: lsls r0, r7, 4 mov r1, r10 adds r2, r0, r1 -_08192A86: +@08192A86: ldrb r0, [r2] cmp r0, 0 - beq _08192A9E + beq @08192A9E adds r4, 0x1 movs r1, 0 ldrsh r0, [r3, r1] cmp r0, 0 - beq _08192A9E + beq @08192A9E ldrb r1, [r2] cmp r0, r1 - blt _08192A9E + blt @08192A9E adds r6, 0x1 -_08192A9E: +@08192A9E: adds r3, 0x2 adds r2, 0x1 adds r5, 0x1 cmp r5, 0xF - ble _08192A86 + ble @08192A86 cmp r4, r6 - beq _08192AB2 + beq @08192AB2 adds r7, 0x1 cmp r7, 0x1E - bls _08192A78 -_08192AB2: + bls @08192A78 +@08192AB2: lsls r0, r7, 2 add r0, r9 ldr r0, [r0] @@ -776965,40 +776965,40 @@ _08192AB2: movs r1, 0 mov r0, r8 adds r0, 0x22 -_08192AD0: +@08192AD0: strh r1, [r0] subs r0, 0x2 cmp r0, r8 - bge _08192AD0 + bge @08192AD0 ldr r2, [sp, 0x24] ldr r3, =0xfffffc02 adds r0, r2, r3 cmp r0, 0x1 - bls _08192AE4 - b _08192C24 -_08192AE4: + bls @08192AE4 + b @08192C24 +@08192AE4: movs r7, 0 movs r4, 0 mov r9, r4 -_08192AEA: +@08192AEA: movs r5, 0 mov r4, r8 mov r6, r9 -_08192AF0: +@08192AF0: ldr r0, =0x000003fe ldr r1, [sp, 0x24] cmp r1, r0 - bne _08192B24 + bne @08192B24 lsls r1, r5, 24 lsrs r1, 24 lsrs r0, r6, 24 bl sub_81A50F0 lsls r0, 24 lsrs r0, 24 - b _08192B34 + b @08192B34 .align 2, 0 .pool -_08192B24: +@08192B24: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r7, 4 @@ -777007,12 +777007,12 @@ _08192B24: adds r0, r2 adds r0, r1 ldrb r0, [r0] -_08192B34: +@08192B34: strh r0, [r4] adds r4, 0x2 adds r5, 0x1 cmp r5, 0x5 - ble _08192AF0 + ble @08192AF0 mov r3, r8 ldrh r0, [r3] ldrh r4, [r3, 0xC] @@ -777020,20 +777020,20 @@ _08192B34: strh r0, [r3, 0xC] movs r5, 0 mov r4, r8 -_08192B4C: +@08192B4C: ldr r0, =0x000003fe ldr r1, [sp, 0x24] cmp r1, r0 - bne _08192B70 + bne @08192B70 mov r2, r9 lsrs r0, r2, 24 bl sub_81A50B0 lsls r0, 24 lsrs r2, r0, 24 - b _08192B7E + b @08192B7E .align 2, 0 .pool -_08192B70: +@08192B70: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r7, 4 @@ -777041,7 +777041,7 @@ _08192B70: ldr r3, =0x00000f0a adds r0, r3 ldrb r2, [r0] -_08192B7E: +@08192B7E: ldr r1, =0x0831e818 lsls r0, r2, 2 adds r0, r2 @@ -777051,7 +777051,7 @@ _08192B7E: lsls r0, 24 asrs r0, 24 cmp r0, 0 - ble _08192BB4 + ble @08192BB4 movs r0, 0x2 ldrsh r1, [r4, r0] movs r0, 0x6E @@ -777061,12 +777061,12 @@ _08192B7E: ldrh r1, [r4, 0xE] adds r1, r0 strh r1, [r4, 0xE] - b _08192BDC + b @08192BDC .align 2, 0 .pool -_08192BB4: +@08192BB4: cmp r0, 0 - bge _08192BD4 + bge @08192BD4 movs r2, 0x2 ldrsh r1, [r4, r2] movs r0, 0x5A @@ -777079,40 +777079,40 @@ _08192BB4: ldrh r0, [r4, 0x1A] adds r0, 0x1 strh r0, [r4, 0x1A] - b _08192BDC -_08192BD4: + b @08192BDC +@08192BD4: ldrh r0, [r4, 0x2] ldrh r3, [r4, 0xE] adds r0, r3 strh r0, [r4, 0xE] -_08192BDC: +@08192BDC: adds r4, 0x2 adds r5, 0x1 cmp r5, 0x4 - ble _08192B4C + ble @08192B4C movs r4, 0x80 lsls r4, 17 add r9, r4 adds r7, 0x1 cmp r7, 0x2 - bgt _08192BF2 - b _08192AEA -_08192BF2: + bgt @08192BF2 + b @08192AEA +@08192BF2: movs r5, 0 mov r1, r8 movs r7, 0x5 -_08192BF8: +@08192BF8: movs r2, 0xC ldrsh r0, [r1, r2] adds r5, r0 adds r1, 0x2 subs r7, 0x1 cmp r7, 0 - bge _08192BF8 + bge @08192BF8 movs r6, 0x64 mov r4, r8 movs r7, 0x5 -_08192C0C: +@08192C0C: movs r3, 0xC ldrsh r0, [r4, r3] muls r0, r6 @@ -777122,9 +777122,9 @@ _08192C0C: adds r4, 0x2 subs r7, 0x1 cmp r7, 0 - bge _08192C0C - b _08192D70 -_08192C24: + bge @08192C0C + b @08192D70 +@08192C24: ldr r4, =0x0203bc8c mov r10, r4 ldr r1, [sp, 0x3C] @@ -777133,7 +777133,7 @@ _08192C24: lsls r0, 1 mov r9, r0 movs r7, 0x2 -_08192C34: +@08192C34: ldr r3, =0x03005d90 ldr r0, [r3] ldr r4, =0x00000d64 @@ -777150,19 +777150,19 @@ _08192C34: movs r3, 0x1 mov r1, r8 movs r5, 0x5 -_08192C54: +@08192C54: strh r4, [r1] adds r0, r2, 0 ands r0, r3 cmp r0, 0 - beq _08192C60 + beq @08192C60 adds r6, 0x1 -_08192C60: +@08192C60: asrs r2, 1 adds r1, 0x2 subs r5, 0x1 cmp r5, 0 - bge _08192C54 + bge @08192C54 movs r0, 0xFF lsls r0, 1 adds r1, r6, 0 @@ -777182,18 +777182,18 @@ _08192C60: movs r3, 0x1 mov r1, r8 movs r5, 0x5 -_08192C92: +@08192C92: adds r0, r2, 0 ands r0, r3 cmp r0, 0 - beq _08192C9C + beq @08192C9C strh r6, [r1] -_08192C9C: +@08192C9C: asrs r2, 1 adds r1, 0x2 subs r5, 0x1 cmp r5, 0 - bge _08192C92 + bge @08192C92 mov r3, r8 ldrh r0, [r3] ldrh r4, [r3, 0xC] @@ -777201,7 +777201,7 @@ _08192C9C: strh r0, [r3, 0xC] movs r5, 0 mov r4, r8 -_08192CB4: +@08192CB4: ldr r1, =0x03005d90 ldr r0, [r1] ldr r2, =0x00000d64 @@ -777222,7 +777222,7 @@ _08192CB4: lsls r0, 24 asrs r0, 24 cmp r0, 0 - ble _08192D04 + ble @08192D04 movs r2, 0x2 ldrsh r1, [r4, r2] movs r0, 0x6E @@ -777232,12 +777232,12 @@ _08192CB4: ldrh r1, [r4, 0xE] adds r1, r0 strh r1, [r4, 0xE] - b _08192D2C + b @08192D2C .align 2, 0 .pool -_08192D04: +@08192D04: cmp r0, 0 - bge _08192D24 + bge @08192D24 movs r3, 0x2 ldrsh r1, [r4, r3] movs r0, 0x5A @@ -777250,39 +777250,39 @@ _08192D04: ldrh r0, [r4, 0x1A] adds r0, 0x1 strh r0, [r4, 0x1A] - b _08192D2C -_08192D24: + b @08192D2C +@08192D24: ldrh r0, [r4, 0x2] ldrh r1, [r4, 0xE] adds r0, r1 strh r0, [r4, 0xE] -_08192D2C: +@08192D2C: adds r4, 0x2 adds r5, 0x1 cmp r5, 0x4 - ble _08192CB4 + ble @08192CB4 movs r2, 0x2 add r9, r2 subs r7, 0x1 cmp r7, 0 - blt _08192D40 - b _08192C34 -_08192D40: + blt @08192D40 + b @08192C34 +@08192D40: movs r5, 0 mov r1, r8 movs r7, 0x5 -_08192D46: +@08192D46: movs r3, 0xC ldrsh r0, [r1, r3] adds r5, r0 adds r1, 0x2 subs r7, 0x1 cmp r7, 0 - bge _08192D46 + bge @08192D46 movs r6, 0x64 mov r4, r8 movs r7, 0x5 -_08192D5A: +@08192D5A: movs r1, 0xC ldrsh r0, [r4, r1] muls r0, r6 @@ -777292,27 +777292,27 @@ _08192D5A: adds r4, 0x2 subs r7, 0x1 cmp r7, 0 - bge _08192D5A -_08192D70: + bge @08192D5A +@08192D70: movs r7, 0 movs r5, 0 movs r6, 0 mov r4, r8 mov r10, r8 mov r9, r8 -_08192D7C: +@08192D7C: movs r2, 0 ldrsh r1, [r4, r2] cmp r1, 0x1D - ble _08192DDE + ble @08192DDE cmp r7, 0x2 - bne _08192DD4 + bne @08192DD4 mov r3, r8 movs r0, 0xC ldrsh r3, [r3, r0] mov r12, r3 cmp r12, r1 - bge _08192DC6 + bge @08192DC6 mov r2, r8 ldrh r2, [r2, 0xE] add r3, sp, 0x54 @@ -777321,52 +777321,52 @@ _08192D7C: movs r3, 0xE ldrsh r0, [r2, r3] cmp r0, r1 - bge _08192DBA + bge @08192DBA cmp r12, r0 - bge _08192DB4 + bge @08192DB4 add r0, sp, 0x54 ldrh r0, [r0] strh r0, [r2, 0xC] strh r6, [r2, 0xE] - b _08192DDE -_08192DB4: + b @08192DDE +@08192DB4: mov r1, r8 strh r6, [r1, 0xE] - b _08192DDE -_08192DBA: + b @08192DDE +@08192DBA: add r2, sp, 0x54 ldrh r3, [r2] mov r2, r8 strh r3, [r2, 0xC] strh r6, [r2, 0xE] - b _08192DDE -_08192DC6: + b @08192DDE +@08192DC6: mov r3, r8 movs r2, 0xE ldrsh r0, [r3, r2] cmp r0, r1 - bge _08192DDE + bge @08192DDE strh r6, [r3, 0xE] - b _08192DDE -_08192DD4: + b @08192DDE +@08192DD4: mov r3, r9 strh r6, [r3, 0xC] movs r0, 0x2 add r9, r0 adds r7, 0x1 -_08192DDE: +@08192DDE: movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0 - bne _08192E64 + bne @08192E64 cmp r5, 0x2 - bne _08192E5A + bne @08192E5A movs r2, 0x18 ldrsh r0, [r4, r2] cmp r0, 0x1 - bgt _08192E18 + bgt @08192E18 cmp r0, 0x1 - bne _08192E64 + bne @08192E64 mov r3, r8 movs r1, 0x10 ldrsh r0, [r3, r1] @@ -777375,7 +777375,7 @@ _08192DDE: movs r2, 0x18 ldrsh r0, [r0, r2] cmp r0, 0 - bne _08192E22 + bne @08192E22 movs r1, 0x12 ldrsh r0, [r3, r1] lsls r0, 1 @@ -777383,18 +777383,18 @@ _08192DDE: movs r2, 0x18 ldrsh r0, [r0, r2] cmp r0, 0 - bne _08192E22 -_08192E18: + bne @08192E22 +@08192E18: mov r3, r8 ldrh r0, [r3, 0x12] strh r0, [r3, 0x10] strh r6, [r3, 0x12] - b _08192E64 -_08192E22: + b @08192E64 +@08192E22: movs r1, 0x18 ldrsh r0, [r4, r1] cmp r0, 0x1 - bne _08192E64 + bne @08192E64 mov r2, r8 movs r3, 0x10 ldrsh r0, [r2, r3] @@ -777403,12 +777403,12 @@ _08192E22: movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08192E44 + bne @08192E44 ldrh r0, [r2, 0x12] strh r0, [r2, 0x10] strh r6, [r2, 0x12] - b _08192E64 -_08192E44: + b @08192E64 +@08192E44: mov r2, r8 movs r3, 0x12 ldrsh r0, [r2, r3] @@ -777417,22 +777417,22 @@ _08192E44: movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 - bne _08192E64 + bne @08192E64 strh r6, [r2, 0x12] - b _08192E64 -_08192E5A: + b @08192E64 +@08192E5A: mov r2, r10 strh r6, [r2, 0x10] movs r3, 0x2 add r10, r3 adds r5, 0x1 -_08192E64: +@08192E64: adds r4, 0x2 adds r6, 0x1 cmp r6, 0x5 - ble _08192D7C + ble @08192D7C cmp r7, 0x2 - bne _08192E8C + bne @08192E8C ldr r0, =0x0860d349 mov r4, r8 movs r1, 0xC @@ -777444,21 +777444,21 @@ _08192E64: subs r1, r2 ldrb r0, [r0] adds r7, r1, r0 - b _08192ED2 + b @08192ED2 .align 2, 0 .pool -_08192E8C: +@08192E8C: cmp r7, 0x1 - bne _08192E9C + bne @08192E9C mov r4, r8 movs r1, 0xC ldrsh r0, [r4, r1] adds r7, r0, 0 adds r7, 0xF - b _08192ED2 -_08192E9C: + b @08192ED2 +@08192E9C: cmp r5, 0x2 - bne _08192EC0 + bne @08192EC0 ldr r0, =0x0860d349 mov r3, r8 movs r4, 0x10 @@ -777472,21 +777472,21 @@ _08192E9C: adds r1, r0 adds r7, r1, 0 adds r7, 0x15 - b _08192ED2 + b @08192ED2 .align 2, 0 .pool -_08192EC0: +@08192EC0: cmp r5, 0x1 - bne _08192ED0 + bne @08192ED0 mov r1, r8 movs r2, 0x10 ldrsh r0, [r1, r2] adds r7, r0, 0 adds r7, 0x24 - b _08192ED2 -_08192ED0: + b @08192ED2 +@08192ED0: movs r7, 0x2A -_08192ED2: +@08192ED2: lsls r0, r7, 2 ldr r3, =0x0860d294 adds r0, r3 @@ -777514,7 +777514,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 @@ -777538,13 +777538,13 @@ sub_8192F08: @ 8192F08 adds r0, r6, r0 adds r3, r2, 0 cmp r6, r0 - bge _08192FD4 + bge @08192FD4 ldr r5, =0x03005d90 ldr r1, =0x000003ff mov r10, r1 ldr r2, =0x000003fe mov r9, r2 -_08192F42: +@08192F42: ldr r0, =0x0860d3b4 adds r0, r6, r0 ldrb r4, [r0] @@ -777556,7 +777556,7 @@ _08192F42: ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt _08192FBE + blt @08192FBE ldr r0, [sp] add r0, r8 strb r4, [r0] @@ -777568,31 +777568,31 @@ _08192F42: lsls r1, r0, 22 lsrs r0, r1, 22 cmp r0, r10 - bne _08192F9C + bne @08192F9C ldr r0, =0x02021cc4 adds r1, r2, 0 bl gf_strcpy - b _08192FB8 + b @08192FB8 .align 2, 0 .pool -_08192F9C: +@08192F9C: lsrs r0, r1, 22 cmp r0, r9 - bne _08192FB0 + bne @08192FB0 ldr r0, =0x02021cc4 bl sub_8195938 - b _08192FB8 + b @08192FB8 .align 2, 0 .pool -_08192FB0: +@08192FB0: lsrs r1, 22 ldr r0, =0x02021cc4 bl sub_8195898 -_08192FB8: +@08192FB8: movs r2, 0x1 add r8, r2 ldr r3, =0x0860d3c4 -_08192FBE: +@08192FBE: adds r6, 0x1 lsls r1, r7, 1 adds r1, r7 @@ -777603,16 +777603,16 @@ _08192FBE: ldrb r0, [r1] adds r2, r0 cmp r6, r2 - blt _08192F42 -_08192FD4: + blt @08192F42 +@08192FD4: mov r5, r8 cmp r5, 0x2 - bne _08192FE8 + bne @08192FE8 movs r0, 0 - b _0819313C + b @0819313C .align 2, 0 .pool -_08192FE8: +@08192FE8: mov r12, r3 lsls r3, r7, 1 adds r0, r3, r7 @@ -777626,14 +777626,14 @@ _08192FE8: adds r0, r6, r0 str r3, [sp, 0x8] cmp r6, r0 - blt _08193006 - b _08193126 -_08193006: + blt @08193006 + b @08193126 +@08193006: ldr r5, =0x03005d90 mov r10, r5 ldr r0, =0x00000d25 mov r9, r0 -_0819300E: +@0819300E: ldr r0, =0x0860d3b4 adds r0, r6, r0 ldrb r4, [r0] @@ -777646,7 +777646,7 @@ _0819300E: ldrb r2, [r0] lsls r0, r2, 29 cmp r0, 0 - bge _08193100 + bge @08193100 lsls r2, 27 adds r1, r3, r7 mov r0, r12 @@ -777655,7 +777655,7 @@ _0819300E: lsrs r2, 30 ldrb r1, [r1] cmp r2, r1 - bcc _08193100 + bcc @08193100 ldr r0, [sp] add r0, r8 strb r4, [r0] @@ -777673,7 +777673,7 @@ _0819300E: lsls r0, 27 lsrs r0, 30 cmp r0, r1 - bne _081930BC + bne @081930BC lsls r4, 1 movs r1, 0xEC lsls r1, 4 @@ -777702,46 +777702,46 @@ _0819300E: adds r1, r4 ldrh r0, [r1] cmp r0, 0 - bne _08193100 + bne @08193100 lsrs r0, r2, 29 cmp r0, 0 - bne _08193100 + bne @08193100 movs r1, 0x4 str r1, [sp, 0x4] - b _08193100 + b @08193100 .align 2, 0 .pool -_081930BC: +@081930BC: ldr r5, =0x00000d24 adds r0, r2, r5 ldrh r0, [r0] lsls r1, r0, 22 ldr r0, =0xffc00000 cmp r1, r0 - bne _081930E0 + bne @081930E0 ldr r0, =0x02021cc4 adds r1, r3, 0 bl gf_strcpy - b _08193100 + b @08193100 .align 2, 0 .pool -_081930E0: +@081930E0: ldr r0, =0xff800000 cmp r1, r0 - bne _081930F8 + bne @081930F8 ldr r0, =0x02021cc4 bl sub_8195938 - b _08193100 + b @08193100 .align 2, 0 .pool -_081930F8: +@081930F8: lsrs r1, 22 ldr r0, =0x02021cc4 bl sub_8195898 -_08193100: +@08193100: mov r0, r8 cmp r0, 0x2 - beq _08193126 + beq @08193126 adds r6, 0x1 ldr r1, =0x0860d3c4 mov r12, r1 @@ -777756,20 +777756,20 @@ _08193100: ldrb r0, [r1] adds r2, r0 cmp r6, r2 - bge _08193126 - b _0819300E -_08193126: + bge @08193126 + b @0819300E +@08193126: cmp r7, 0xE - beq _08193138 + beq @08193138 ldr r0, [sp, 0x4] adds r0, 0x1 - b _0819313C + b @0819313C .align 2, 0 .pool -_08193138: +@08193138: ldr r0, [sp, 0x4] adds r0, 0x2 -_0819313C: +@0819313C: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -777781,7 +777781,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 @@ -777805,47 +777805,47 @@ sub_819314C: @ 819314C ldr r3, [sp, 0x34] ands r0, r3 cmp r0, 0 - beq _08193186 + beq @08193186 movs r7, 0x8 str r7, [sp, 0x3C] movs r7, 0x9 movs r0, 0x2 mov r9, r0 -_08193186: +@08193186: movs r0, 0x2 ldr r1, [sp, 0x34] ands r0, r1 cmp r0, 0 - beq _08193196 + beq @08193196 movs r2, 0x80 lsls r2, 1 str r2, [sp, 0x40] -_08193196: +@08193196: movs r0, 0x4 ldr r3, [sp, 0x34] ands r0, r3 cmp r0, 0 - beq _081931A4 + beq @081931A4 movs r0, 0xA0 str r0, [sp, 0x44] -_081931A4: +@081931A4: movs r0, 0x8 ldr r1, [sp, 0x34] ands r0, r1 cmp r0, 0 - beq _081931B2 + beq @081931B2 ldr r2, =0xffffff00 str r2, [sp, 0x40] -_081931B2: +@081931B2: movs r0, 0x10 ldr r3, [sp, 0x34] ands r0, r3 cmp r0, 0 - beq _081931C2 + beq @081931C2 movs r0, 0xA0 negs r0, r0 str r0, [sp, 0x44] -_081931C2: +@081931C2: ldr r4, =0x0203cd78 ldr r1, [r4] adds r1, 0x11 @@ -777908,7 +777908,7 @@ _081931C2: adds r1, r6 adds r1, r0 ldrb r6, [r1] -_08193240: +@08193240: ldr r1, [sp, 0x48] adds r2, r3, r1 mov r7, r12 @@ -777934,30 +777934,30 @@ _08193240: lsls r0, r1, 27 lsrs r0, 30 cmp r0, r6 - bhi _0819329C + bhi @0819329C lsls r0, r1, 29 cmp r0, 0 - bge _0819329C + bge @0819329C ldr r2, [sp, 0x50] adds r1, r3, r2 movs r0, 0x1 - b _081932A2 + b @081932A2 .align 2, 0 .pool -_0819329C: +@0819329C: ldr r7, [sp, 0x50] adds r1, r3, r7 movs r0, 0 -_081932A2: +@081932A2: str r0, [r1] adds r3, 0x4 adds r5, 0x1 cmp r5, 0x1 - ble _08193240 + ble @08193240 ldr r1, [sp, 0x24] ldr r0, =0x000003ff cmp r1, r0 - bne _081932D4 + bne @081932D4 ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] @@ -777968,29 +777968,29 @@ _081932A2: ldr r3, [sp, 0x78] mov r1, r10 str r1, [sp] - b _081932F8 + b @081932F8 .align 2, 0 .pool -_081932D4: +@081932D4: ldr r0, =0x000003fe cmp r1, r0 - bne _081932E4 + bne @081932E4 bl sub_8195910 - b _081932EC + b @081932EC .align 2, 0 .pool -_081932E4: +@081932E4: lsls r0, r1, 16 lsrs r0, 16 bl sub_8162AA0 -_081932EC: +@081932EC: lsls r0, 24 lsrs r0, 24 mov r2, r8 ldr r3, [sp, 0x78] mov r7, r10 str r7, [sp] -_081932F8: +@081932F8: ldr r1, =0x0000ffff str r1, [sp, 0x4] movs r1, 0x1 @@ -778004,7 +778004,7 @@ _081932F8: ldr r3, [sp, 0x34] ands r0, r3 cmp r0, 0 - beq _08193334 + beq @08193334 ldr r2, =0x02020630 ldr r0, =0x0203cd78 ldr r0, [r0] @@ -778020,10 +778020,10 @@ _081932F8: movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_08193334: +@08193334: ldr r0, [sp, 0x2C] cmp r0, 0 - beq _0819335A + beq @0819335A ldr r2, =0x02020630 ldr r0, =0x0203cd78 ldr r0, [r0] @@ -778040,25 +778040,25 @@ _08193334: movs r2, 0x30 orrs r1, r2 strb r1, [r0, 0x5] -_0819335A: +@0819335A: ldr r2, [sp, 0x4C] ldr r1, [r2, 0x4] ldr r0, =0x000003ff cmp r1, r0 - bne _08193388 + bne @08193388 ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] bl sub_806F000 lsls r0, 16 lsrs r0, 16 - b _081933B0 + b @081933B0 .align 2, 0 .pool -_08193388: +@08193388: ldr r0, =0x000003fe cmp r1, r0 - bne _081933A4 + bne @081933A4 bl sub_8195910 lsls r0, 24 lsrs r0, 24 @@ -778066,21 +778066,21 @@ _08193388: ldr r3, [sp, 0x78] ldr r1, [sp, 0x74] str r1, [sp] - b _081933B8 + b @081933B8 .align 2, 0 .pool -_081933A4: +@081933A4: lsls r0, r1, 16 lsrs r0, 16 bl sub_8162AA0 lsls r0, 24 lsrs r0, 24 -_081933B0: +@081933B0: ldr r2, [sp, 0x7C] ldr r3, [sp, 0x78] ldr r7, [sp, 0x74] str r7, [sp] -_081933B8: +@081933B8: ldr r1, =0x0000ffff str r1, [sp, 0x4] movs r1, 0x1 @@ -778093,7 +778093,7 @@ _081933B8: ldr r1, [sp, 0x34] ands r0, r1 cmp r0, 0 - beq _081933F0 + beq @081933F0 ldr r2, =0x02020630 ldr r0, =0x0203cd78 ldr r0, [r0] @@ -778108,11 +778108,11 @@ _081933B8: movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_081933F0: +@081933F0: ldr r2, [sp, 0x50] ldr r0, [r2, 0x4] cmp r0, 0 - beq _08193416 + beq @08193416 ldr r2, =0x02020630 ldr r0, =0x0203cd78 ldr r0, [r0] @@ -778128,7 +778128,7 @@ _081933F0: movs r2, 0x30 orrs r1, r2 strb r1, [r0, 0x5] -_08193416: +@08193416: movs r5, 0 ldr r3, [sp, 0x38] lsls r3, 2 @@ -778140,11 +778140,11 @@ _08193416: mov r9, r5 movs r0, 0x1 mov r10, r0 -_0819342C: +@0819342C: ldr r1, [sp, 0x24] ldr r0, =0x000003ff cmp r1, r0 - bne _08193464 + bne @08193464 ldr r0, =0x03005d90 ldr r2, [r0] ldr r1, [sp, 0x1C] @@ -778156,13 +778156,13 @@ _0819342C: adds r2, r1 adds r2, r0 ldrh r0, [r2] - b _081934B0 + b @081934B0 .align 2, 0 .pool -_08193464: +@08193464: ldr r0, =0x000003fe cmp r1, r0 - bne _08193490 + bne @08193490 ldr r0, =0x03005d90 ldr r2, [r0] ldr r1, [sp, 0x1C] @@ -778174,10 +778174,10 @@ _08193464: adds r2, r1 adds r2, r0 ldrh r0, [r2] - b _081934B0 + b @081934B0 .align 2, 0 .pool -_08193490: +@08193490: ldr r0, =0x03005d90 ldr r2, [r0] ldr r1, [sp, 0x1C] @@ -778194,7 +778194,7 @@ _08193490: lsls r1, 4 adds r1, r0 ldrh r0, [r1] -_081934B0: +@081934B0: ldr r1, =0x0860d3a8 adds r1, r5, r1 ldrb r2, [r1] @@ -778232,7 +778232,7 @@ _081934B0: ldr r1, [sp, 0x34] ands r0, r1 cmp r0, 0 - beq _08193516 + beq @08193516 ldr r0, [r6] adds r0, r4 ldrb r1, [r0] @@ -778245,10 +778245,10 @@ _081934B0: movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_08193516: +@08193516: ldr r0, [sp, 0x2C] cmp r0, 0 - beq _08193548 + beq @08193548 ldr r0, [r6] adds r0, r4 ldrb r0, [r0] @@ -778271,15 +778271,15 @@ _08193516: adds r0, r7 mov r2, r10 strh r2, [r0, 0x34] -_08193548: +@08193548: adds r4, 0x1 movs r3, 0x2 add r9, r3 adds r5, 0x1 cmp r5, 0x2 - bgt _08193556 - b _0819342C -_08193556: + bgt @08193556 + b @0819342C +@08193556: movs r5, 0 ldr r6, =0x0203cd78 ldr r7, =0x02020630 @@ -778287,12 +778287,12 @@ _08193556: ldr r4, [sp, 0x5C] mov r9, r5 movs r7, 0 -_08193564: +@08193564: ldr r0, [sp, 0x4C] ldr r1, [r0, 0x4] ldr r0, =0x000003ff cmp r1, r0 - bne _081935AC + bne @081935AC ldr r0, =0x03005d90 ldr r2, [r0] ldr r3, [sp, 0x48] @@ -778305,13 +778305,13 @@ _08193564: adds r2, r1 adds r2, r0 ldrh r0, [r2] - b _081935FA + b @081935FA .align 2, 0 .pool -_081935AC: +@081935AC: ldr r0, =0x000003fe cmp r1, r0 - bne _081935D8 + bne @081935D8 ldr r0, =0x03005d90 ldr r2, [r0] ldr r0, [sp, 0x48] @@ -778324,10 +778324,10 @@ _081935AC: adds r2, r1 adds r2, r0 ldrh r0, [r2] - b _081935FA + b @081935FA .align 2, 0 .pool -_081935D8: +@081935D8: ldr r0, =0x03005d90 ldr r2, [r0] ldr r0, [sp, 0x48] @@ -778345,7 +778345,7 @@ _081935D8: lsls r1, 4 adds r1, r0 ldrh r0, [r1] -_081935FA: +@081935FA: ldr r1, =0x0860d3ae adds r1, r5, r1 ldrb r2, [r1] @@ -778382,7 +778382,7 @@ _081935FA: ldr r1, [sp, 0x34] ands r0, r1 cmp r0, 0 - beq _0819365E + beq @0819365E ldr r0, [r6] adds r0, r4 ldrb r1, [r0] @@ -778395,11 +778395,11 @@ _081935FA: movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_0819365E: +@0819365E: ldr r2, [sp, 0x50] ldr r0, [r2, 0x4] cmp r0, 0 - beq _08193692 + beq @08193692 ldr r0, [r6] adds r0, r4 ldrb r0, [r0] @@ -778422,15 +778422,15 @@ _0819365E: add r0, r8 movs r1, 0x1 strh r1, [r0, 0x34] -_08193692: +@08193692: adds r4, 0x1 movs r3, 0x2 add r9, r3 adds r5, 0x1 cmp r5, 0x2 - bgt _081936A0 - b _08193564 -_081936A0: + bgt @081936A0 + b @08193564 +@081936A0: add r0, sp, 0xC movs r5, 0 strb r5, [r0, 0x6] @@ -778494,29 +778494,29 @@ _081936A0: ldr r1, [sp, 0x24] ldr r0, =0x000003ff cmp r1, r0 - bne _0819375C + bne @0819375C ldr r0, =0x02021cc4 ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy - b _0819377E + b @0819377E .align 2, 0 .pool -_0819375C: +@0819375C: ldr r0, =0x000003fe cmp r1, r0 - bne _08193774 + bne @08193774 ldr r0, =0x02021cc4 bl sub_8195938 - b _0819377E + b @0819377E .align 2, 0 .pool -_08193774: +@08193774: ldr r0, =0x02021cc4 lsls r1, 16 lsrs r1, 16 bl sub_8195898 -_0819377E: +@0819377E: add r0, sp, 0xC movs r4, 0x2 strb r4, [r0, 0x5] @@ -778551,29 +778551,29 @@ _0819377E: ldr r1, [r3, 0x4] ldr r0, =0x000003ff cmp r1, r0 - bne _081937E4 + bne @081937E4 ldr r0, =0x03005d90 ldr r1, [r0] adds r0, r5, 0 bl gf_strcpy - b _08193802 + b @08193802 .align 2, 0 .pool -_081937E4: +@081937E4: ldr r0, =0x000003fe cmp r1, r0 - bne _081937F8 + bne @081937F8 adds r0, r5, 0 bl sub_8195938 - b _08193802 + b @08193802 .align 2, 0 .pool -_081937F8: +@081937F8: lsls r1, 16 lsrs r1, 16 adds r0, r5, 0 bl sub_8195898 -_08193802: +@08193802: ldr r0, =0x02021cc4 str r0, [sp, 0xC] add r0, sp, 0xC @@ -778648,7 +778648,7 @@ _08193802: thumb_func_end sub_819314C thumb_func_start sub_81938A4 -sub_81938A4: @ 81938A4 +sub_81938A4: ; 81938A4 push {lr} ldr r0, =sub_8194220 + 1 movs r1, 0 @@ -778675,7 +778675,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 @@ -778726,7 +778726,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 @@ -778742,27 +778742,27 @@ sub_819395C: @ 819395C ldrsh r0, [r0, r2] adds r2, r1, 0 cmp r0, 0x7 - bls _0819397E - b _08193BC2 -_0819397E: + bls @0819397E + b @08193BC2 +@0819397E: lsls r0, 2 - ldr r1, =_08193990 + ldr r1, =@08193990 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08193990: - .4byte _081939B0 - .4byte _08193A00 - .4byte _08193A20 - .4byte _08193AA8 - .4byte _08193BC2 - .4byte _08193B20 - .4byte _08193BC2 - .4byte _08193B84 -_081939B0: +@08193990: + .4byte @081939B0 + .4byte @08193A00 + .4byte @08193A20 + .4byte @08193AA8 + .4byte @08193BC2 + .4byte @08193B20 + .4byte @08193BC2 + .4byte @08193B84 +@081939B0: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -778770,9 +778770,9 @@ _081939B0: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq _081939C2 - b _08193BC2 -_081939C2: + beq @081939C2 + b @08193BC2 +@081939C2: movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -778794,43 +778794,43 @@ _081939C2: adds r0, r1 movs r1, 0x1 bl obj_anim_image_start - b _08193BC2 + b @08193BC2 .align 2, 0 .pool -_08193A00: +@08193A00: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08193A0E - b _08193BC2 -_08193A0E: + beq @08193A0E + b @08193BC2 +@08193A0E: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r2 movs r1, 0x2 strh r1, [r0, 0x8] - b _08193BC2 + b @08193BC2 .align 2, 0 .pool -_08193A20: +@08193A20: adds r0, r5, 0 bl sub_8193BDC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08193A30 - b _08193BC2 -_08193A30: + bne @08193A30 + b @08193BC2 +@08193A30: cmp r0, 0x1 - ble _08193A3C + ble @08193A3C cmp r0, 0x2 - beq _08193A60 + beq @08193A60 cmp r0, 0x3 - beq _08193A84 -_08193A3C: + beq @08193A84 +@08193A3C: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -778845,10 +778845,10 @@ _08193A3C: adds r0, r1 movs r1, 0x7 strh r1, [r0, 0x8] - b _08193BC2 + b @08193BC2 .align 2, 0 .pool -_08193A60: +@08193A60: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -778863,10 +778863,10 @@ _08193A60: adds r0, r1 movs r1, 0x3 strh r1, [r0, 0x8] - b _08193BC2 + b @08193BC2 .align 2, 0 .pool -_08193A84: +@08193A84: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -778881,10 +778881,10 @@ _08193A84: adds r0, r1 movs r1, 0x5 strh r1, [r0, 0x8] - b _08193BC2 + b @08193BC2 .align 2, 0 .pool -_08193AA8: +@08193AA8: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -778892,9 +778892,9 @@ _08193AA8: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - beq _08193ABA - b _08193BC2 -_08193ABA: + beq @08193ABA + b @08193BC2 +@08193ABA: bl Window_FreeMemory bl remove_some_task ldr r4, =0x0203cd7c @@ -778929,10 +778929,10 @@ _08193ABA: ldr r0, =0x0203cd78 ldr r0, [r0] strb r3, [r0, 0x10] - b _08193BC2 + b @08193BC2 .align 2, 0 .pool -_08193B20: +@08193B20: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -778940,7 +778940,7 @@ _08193B20: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - bne _08193BC2 + bne @08193BC2 bl Window_FreeMemory bl remove_some_task ldr r4, =0x0203cd7c @@ -778970,10 +778970,10 @@ _08193B20: adds r0, r2 movs r1, 0x6 strh r1, [r0, 0x8] - b _08193BC2 + b @08193BC2 .align 2, 0 .pool -_08193B84: +@08193B84: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -778981,7 +778981,7 @@ _08193B84: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - bne _08193BC2 + bne @08193BC2 bl Window_FreeMemory bl remove_some_task ldr r4, =0x0203cd7c @@ -778999,7 +778999,7 @@ _08193B84: bl remove_task adds r0, r5, 0 bl remove_task -_08193BC2: +@08193BC2: add sp, 0x4 pop {r4-r7} pop {r0} @@ -779009,7 +779009,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 @@ -779037,38 +779037,38 @@ sub_8193BDC: @ 8193BDC adds r2, r1, 0 adds r3, r0, 0 cmp r2, 0x2 - beq _08193C20 + beq @08193C20 mov r0, r9 ands r0, r1 cmp r0, 0 - beq _08193C58 + beq @08193C58 cmp r5, 0x1F - bne _08193C3C -_08193C20: + bne @08193C3C +@08193C20: movs r0, 0x5 bl audio_play movs r0, 0 mov r9, r0 - b _08193CDE + b @08193CDE .align 2, 0 .pool -_08193C3C: +@08193C3C: cmp r5, 0xF - bgt _08193C4C + bgt @08193C4C movs r0, 0x5 bl audio_play movs r1, 0x2 mov r9, r1 - b _08193CDE -_08193C4C: + b @08193CDE +@08193C4C: movs r0, 0x5 bl audio_play movs r0, 0x3 mov r9, r0 - b _08193CDE -_08193C58: + b @08193CDE +@08193C58: cmp r2, 0x40 - bne _08193C78 + bne @08193C78 ldr r0, =0x0860cbf1 lsls r1, r5, 2 adds r1, r5 @@ -779077,16 +779077,16 @@ _08193C58: adds r1, r0 ldrb r0, [r1] cmp r0, 0xFF - beq _08193C78 + beq @08193C78 movs r1, 0 mov r8, r1 - b _08193CDE + b @08193CDE .align 2, 0 .pool -_08193C78: +@08193C78: ldrh r0, [r3, 0x2E] cmp r0, 0x80 - bne _08193C9C + bne @08193C9C ldr r0, =0x0860cbf1 lsls r1, r5, 2 adds r1, r5 @@ -779096,15 +779096,15 @@ _08193C78: adds r1, r0 ldrb r0, [r1] cmp r0, 0xFF - beq _08193C9C + beq @08193C9C movs r0, 0x1 - b _08193CDC + b @08193CDC .align 2, 0 .pool -_08193C9C: +@08193C9C: ldrh r0, [r3, 0x2E] cmp r0, 0x20 - bne _08193CC0 + bne @08193CC0 ldr r0, =0x0860cbf1 lsls r1, r5, 2 adds r1, r5 @@ -779114,16 +779114,16 @@ _08193C9C: adds r1, r0 ldrb r0, [r1] cmp r0, 0xFF - beq _08193CC0 + beq @08193CC0 movs r1, 0x2 mov r8, r1 - b _08193CDE + b @08193CDE .align 2, 0 .pool -_08193CC0: +@08193CC0: ldrh r0, [r3, 0x2E] cmp r0, 0x10 - bne _08193CDE + bne @08193CDE ldr r0, =0x0860cbf1 lsls r1, r5, 2 adds r1, r5 @@ -779133,14 +779133,14 @@ _08193CC0: adds r1, r0 ldrb r0, [r1] cmp r0, 0xFF - beq _08193CDE + beq @08193CDE movs r0, 0x3 -_08193CDC: +@08193CDC: mov r8, r0 -_08193CDE: +@08193CDE: mov r1, r8 cmp r1, 0x4 - beq _08193D26 + beq @08193D26 movs r0, 0x5 bl audio_play lsls r0, r5, 4 @@ -779171,7 +779171,7 @@ _08193CDE: lsls r0, 3 adds r0, r1 strh r5, [r0, 0xA] -_08193D26: +@08193D26: mov r0, r9 pop {r3,r4} mov r8, r3 @@ -779184,7 +779184,7 @@ _08193D26: thumb_func_end sub_8193BDC thumb_func_start sub_8193D40 -sub_8193D40: @ 8193D40 +sub_8193D40: ; 8193D40 push {lr} ldr r0, =sub_8194220 + 1 movs r1, 0 @@ -779212,14 +779212,14 @@ 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} ldr r7, =0x020375e2 ldrh r0, [r7] cmp r0, 0x1 - bne _08193E10 + bne @08193E10 ldr r5, =0x02038bca ldrh r0, [r5] bl sub_8195358 @@ -779266,14 +779266,14 @@ sub_8193D7C: @ 8193D7C add r2, r8 ldrh r0, [r2] cmp r0, 0x2 - bhi _08193EAE + bhi @08193EAE lsls r0, 24 lsrs r0, 24 bl sub_8195438 - b _08193EAE + b @08193EAE .align 2, 0 .pool -_08193E10: +@08193E10: ldr r5, =0x000003ff adds r0, r5, 0 bl sub_8195358 @@ -779319,11 +779319,11 @@ _08193E10: ldr r0, =0x0202433a ldrb r0, [r0] cmp r0, 0x9 - beq _08193E78 + beq @08193E78 ldrh r0, [r7] cmp r0, 0x9 - bne _08193E92 -_08193E78: + bne @08193E92 +@08193E78: adds r0, r5, 0 bl sub_8195358 ldr r2, [r4] @@ -779336,22 +779336,22 @@ _08193E78: movs r1, 0x20 orrs r0, r1 strb r0, [r2] -_08193E92: +@08193E92: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000cb2 adds r0, r1 ldrh r4, [r0] cmp r4, 0x3 - bgt _08193EAE -_08193EA0: + bgt @08193EAE +@08193EA0: lsls r0, r4, 24 lsrs r0, 24 bl sub_8195438 adds r4, 0x1 cmp r4, 0x3 - ble _08193EA0 -_08193EAE: + ble @08193EA0 +@08193EAE: pop {r3} mov r8, r3 pop {r4-r7} @@ -779362,7 +779362,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 @@ -779387,7 +779387,7 @@ sub_8193ED0: @ 8193ED0 str r5, [sp, 0x70] subs r4, 0x1 str r4, [sp, 0x78] -_08193F02: +@08193F02: movs r0, 0 mov r9, r0 ldr r1, [sp, 0x50] @@ -779399,7 +779399,7 @@ _08193F02: ldr r3, [sp, 0x50] adds r3, 0x1 str r3, [sp, 0x60] -_08193F18: +@08193F18: ldr r4, [sp, 0x74] add r4, r9 lsls r0, r4, 2 @@ -779417,7 +779417,7 @@ _08193F18: lsls r0, 22 ldr r1, =0xff800000 cmp r0, r1 - bne _08193F60 + bne @08193F60 ldr r3, [sp, 0x50] lsls r0, r3, 24 mov r5, r9 @@ -779428,10 +779428,10 @@ _08193F18: lsls r1, r4, 1 add r1, r10 strh r0, [r1] - b _08193F8C + b @08193F8C .align 2, 0 .pool -_08193F60: +@08193F60: lsls r2, r4, 1 add r2, r10 ldr r1, [sp, 0x48] @@ -779454,7 +779454,7 @@ _08193F60: adds r0, r1 ldrh r0, [r0] strh r0, [r2] -_08193F8C: +@08193F8C: ldr r0, =0x0831c898 ldr r1, [sp, 0x74] add r1, r9 @@ -779467,27 +779467,27 @@ _08193F8C: adds r1, r0 ldrb r6, [r1, 0x1] cmp r6, 0 - bne _08193FB8 + bne @08193FB8 movs r6, 0x28 - b _08193FD0 + b @08193FD0 .align 2, 0 .pool -_08193FB8: +@08193FB8: cmp r6, 0x1 - bne _08193FC0 + bne @08193FC0 movs r6, 0x3C - b _08193FD0 -_08193FC0: + b @08193FD0 +@08193FC0: adds r1, r2, 0 cmp r1, 0x78 - beq _08193FCA + beq @08193FCA cmp r1, 0x99 - bne _08193FD0 -_08193FCA: + bne @08193FD0 +@08193FCA: lsrs r0, r6, 31 adds r0, r6, r0 asrs r6, r0, 1 -_08193FD0: +@08193FD0: movs r1, 0 mov r4, r9 adds r4, 0x1 @@ -779497,14 +779497,14 @@ _08193FD0: adds r0, r5, r2 lsls r0, 1 str r0, [sp, 0x5C] -_08193FE2: +@08193FE2: lsls r7, r1, 1 adds r1, 0x1 str r1, [sp, 0x68] ldr r3, [sp, 0x5C] adds r3, r7 mov r8, r3 -_08193FEE: +@08193FEE: bl GenerateRandomNumber adds r4, r0, 0 bl GenerateRandomNumber @@ -779532,7 +779532,7 @@ _08193FEE: ldr r2, [sp, 0x7C] ldr r3, [sp, 0x80] cmp r1, r0 - bne _08193FEE + bne @08193FEE ldr r0, [r2] ldr r2, [sp, 0x5C] adds r1, r7, r2 @@ -779547,24 +779547,24 @@ _08193FEE: movs r0, 0x1 ands r5, r0 cmp r5, 0 - beq _08194068 + beq @08194068 lsls r0, r1, 3 subs r0, r1 lsls r0, 2 ldr r5, =0x083203cc adds r0, r5 ldrb r2, [r0, 0x17] - b _08194074 + b @08194074 .align 2, 0 .pool -_08194068: +@08194068: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 ldr r2, =0x083203cc adds r0, r2 ldrb r2, [r0, 0x16] -_08194074: +@08194074: ldr r4, [sp, 0x74] add r4, r9 lsls r0, r4, 1 @@ -779576,57 +779576,57 @@ _08194074: movs r0, 0x6 ands r0, r5 cmp r0, 0x6 - bne _0819409C + bne @0819409C lsls r0, r4, 2 mov r3, sp adds r1, r3, r0 - b _081940D8 + b @081940D8 .align 2, 0 .pool -_0819409C: +@0819409C: movs r0, 0x29 ands r0, r5 cmp r0, 0 - bne _081940DE + bne @081940DE movs r0, 0x2 ands r0, r5 cmp r0, 0 - beq _081940B6 + beq @081940B6 lsls r0, r4, 2 mov r5, sp adds r2, r5, r0 lsls r1, r6, 1 - b _081940CA -_081940B6: + b @081940CA +@081940B6: movs r0, 0x4 ands r5, r0 cmp r5, 0 - beq _081940D2 + beq @081940D2 lsls r0, r4, 2 mov r1, sp adds r2, r1, r0 lsrs r1, r6, 31 adds r1, r6, r1 asrs r1, 1 -_081940CA: +@081940CA: ldr r0, [r2] adds r0, r1 str r0, [r2] - b _081940DE -_081940D2: + b @081940DE +@081940D2: lsls r0, r4, 2 mov r2, sp adds r1, r2, r0 -_081940D8: +@081940D8: ldr r0, [r1] adds r0, r6 str r0, [r1] -_081940DE: +@081940DE: ldr r1, [sp, 0x68] cmp r1, 0x2 - bgt _081940E6 - b _08193FE2 -_081940E6: + bgt @081940E6 + b @08193FE2 +@081940E6: ldr r2, [sp, 0x74] add r2, r9 lsls r0, r2, 2 @@ -779634,18 +779634,18 @@ _081940E6: ldr r1, [r0] ldr r3, [sp, 0x54] cmp r3, r1 - bge _08194104 + bge @08194104 lsls r0, r2, 16 lsrs r0, 16 str r0, [sp, 0x58] lsls r0, r1, 16 lsrs r0, 16 str r0, [sp, 0x54] - b _08194122 -_08194104: + b @08194122 +@08194104: ldr r4, [sp, 0x54] cmp r4, r1 - bne _08194122 + bne @08194122 ldr r5, [sp, 0x58] lsls r0, r5, 1 add r0, r10 @@ -779654,79 +779654,79 @@ _08194104: ldrh r0, [r0] ldrh r1, [r1] cmp r0, r1 - bcs _08194122 + bcs @08194122 lsls r0, r2, 16 lsrs r0, 16 str r0, [sp, 0x58] -_08194122: +@08194122: ldr r0, [sp, 0x64] mov r9, r0 cmp r0, 0x3 - bgt _0819412C - b _08193F18 -_0819412C: + bgt @0819412C + b @08193F18 +@0819412C: ldr r1, [sp, 0x60] str r1, [sp, 0x50] cmp r1, 0x2 - bgt _08194136 - b _08193F02 -_08194136: + bgt @08194136 + b @08193F02 +@08194136: ldr r2, [sp, 0x58] mov r9, r2 - b _08194182 -_0819413C: + b @08194182 +@0819413C: movs r3, 0 mov r9, r3 movs r1, 0 mov r4, r10 mov r3, r10 mov r2, sp -_08194148: +@08194148: ldr r0, [r2] ldr r5, [sp, 0x54] cmp r5, r0 - bge _0819415A + bge @0819415A mov r9, r1 lsls r0, 16 lsrs r0, 16 str r0, [sp, 0x54] - b _08194170 -_0819415A: + b @08194170 +@0819415A: ldr r5, [sp, 0x54] cmp r5, r0 - bne _08194170 + bne @08194170 mov r5, r9 lsls r0, r5, 1 adds r0, r4, r0 ldrh r0, [r0] ldrh r5, [r3] cmp r0, r5 - bcs _08194170 + bcs @08194170 mov r9, r1 -_08194170: +@08194170: adds r3, 0x2 adds r2, 0x4 adds r1, 0x1 cmp r1, 0xB - ble _08194148 + ble @08194148 ldr r0, [sp, 0x50] ldr r1, [sp, 0x78] cmp r0, r1 - beq _081941F4 -_08194182: + beq @081941F4 +@08194182: movs r2, 0 str r2, [sp, 0x50] mov r3, r9 lsls r7, r3, 2 ldr r4, [sp, 0x78] cmp r2, r4 - bge _081941CA + bge @081941CA lsls r0, r3, 1 mov r5, r10 adds r6, r5, r0 ldr r0, [sp, 0x48] lsls r5, r0, 24 -_0819419A: +@0819419A: ldr r0, =0x03005d90 ldr r4, [r0] ldr r2, [sp, 0x50] @@ -779743,18 +779743,18 @@ _0819419A: ldrh r0, [r4] ldrh r4, [r6] cmp r0, r4 - beq _081941CA + beq @081941CA ldr r0, [sp, 0x50] adds r0, 0x1 str r0, [sp, 0x50] ldr r1, [sp, 0x78] cmp r0, r1 - blt _0819419A -_081941CA: + blt @0819419A +@081941CA: ldr r2, [sp, 0x50] ldr r3, [sp, 0x78] cmp r2, r3 - beq _081941F4 + beq @081941F4 mov r4, sp adds r1, r4, r7 movs r0, 0 @@ -779764,25 +779764,25 @@ _081941CA: mov r9, r5 mov r2, sp movs r1, 0xB -_081941E4: +@081941E4: ldm r2!, {r0} add r9, r0 subs r1, 0x1 cmp r1, 0 - bge _081941E4 + bge @081941E4 mov r0, r9 cmp r0, 0 - bne _0819413C -_081941F4: + bne @0819413C +@081941F4: mov r1, r9 lsls r0, r1, 2 add r0, sp ldr r0, [r0] cmp r0, 0 - bne _08194204 + bne @08194204 ldr r2, [sp, 0x58] mov r9, r2 -_08194204: +@08194204: mov r3, r9 lsls r0, r3, 1 add r0, r10 @@ -779800,7 +779800,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 @@ -779823,25 +779823,25 @@ sub_8194220: @ 8194220 movs r1, 0x8 ldrsh r0, [r0, r1] cmp r0, 0x5 - bls _08194250 - b _081948C2 -_08194250: + bls @08194250 + b @081948C2 +@08194250: lsls r0, 2 - ldr r1, =_08194264 + ldr r1, =@08194264 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08194264: - .4byte _0819427C - .4byte _0819431C - .4byte _0819438C - .4byte _0819447C - .4byte _081944FC - .4byte _081947C8 -_0819427C: +@08194264: + .4byte @0819427C + .4byte @0819431C + .4byte @0819438C + .4byte @0819447C + .4byte @081944FC + .4byte @081947C8 +@0819427C: movs r0, 0 bl SetHBlankCallback movs r0, 0 @@ -779892,10 +779892,10 @@ _0819427C: ldr r1, =0x03005e00 mov r2, r8 lsls r0, r2, 2 - b _0819443C + b @0819443C .align 2, 0 .pool -_0819431C: +@0819431C: movs r0, 0x50 movs r1, 0 bl lcd_io_set @@ -779932,10 +779932,10 @@ _0819431C: ldr r1, =0x03005e00 mov r3, r8 lsls r0, r3, 2 - b _0819443C + b @0819443C .align 2, 0 .pool -_0819438C: +@0819438C: ldr r4, =0x0203cd7c movs r0, 0x80 lsls r0, 4 @@ -780008,17 +780008,17 @@ _0819438C: ldr r1, =0x03005e00 mov r4, r8 lsls r0, r4, 2 -_0819443C: +@0819443C: add r0, r8 lsls r0, 3 adds r0, r1 ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b _081948C2 + b @081948C2 .align 2, 0 .pool -_0819447C: +@0819447C: ldr r0, =0x0860cf50 bl gpu_tile_obj_decompress_and_load mov r0, r8 @@ -780026,10 +780026,10 @@ _0819447C: str r0, [sp, 0x1C] mov r1, r10 cmp r1, 0 - bne _081944E8 + bne @081944E8 movs r5, 0 ldr r4, =0x0860d411 -_08194492: +@08194492: ldrb r1, [r4] ldrb r2, [r4, 0x1] ldr r0, =0x0860cfa8 @@ -780038,7 +780038,7 @@ _08194492: adds r4, 0x2 adds r5, 0x1 cmp r5, 0x1E - bls _08194492 + bls @08194492 ldr r0, =0x03005e00 ldr r1, [sp, 0x1C] add r1, r8 @@ -780047,29 +780047,29 @@ _08194492: movs r2, 0x10 ldrsh r0, [r1, r2] cmp r0, 0 - beq _081944DC + beq @081944DC ldr r0, =0x0860d008 movs r1, 0xDA movs r2, 0xC movs r3, 0 bl obj_add_from_template_forward_search - b _081944E8 + b @081944E8 .align 2, 0 .pool -_081944DC: +@081944DC: ldr r0, =0x0860cfd8 movs r1, 0xDA movs r2, 0xC movs r3, 0 bl obj_add_from_template_forward_search -_081944E8: +@081944E8: ldr r1, =0x00007f40 movs r0, 0 bl lcd_io_set - b _081947A6 + b @081947A6 .align 2, 0 .pool -_081944FC: +@081944FC: add r0, sp, 0x4 movs r2, 0 movs r1, 0x2 @@ -780124,7 +780124,7 @@ _081944FC: str r2, [sp, 0x24] movs r7, 0 movs r5, 0xF -_0819456C: +@0819456C: ldr r3, =0x03005d90 ldr r0, [r3] adds r0, r7 @@ -780137,7 +780137,7 @@ _0819456C: bl sub_8195898 mov r2, r10 cmp r2, 0x1 - bne _081945C4 + bne @081945C4 ldr r3, =0x03005d90 ldr r2, [r3] adds r0, r2, r7 @@ -780146,22 +780146,22 @@ _0819456C: ldrb r1, [r0] lsls r0, r1, 29 cmp r0, 0 - blt _081945DC + blt @081945DC ldr r3, =0x00000cb2 adds r0, r2, r3 ldrh r1, [r0] cmp r1, 0x1 - beq _08194634 + beq @08194634 ldr r2, [sp, 0x24] lsrs r0, r2, 24 subs r1, 0x2 - b _081945EA + b @081945EA .align 2, 0 .pool -_081945C4: +@081945C4: mov r3, r10 cmp r3, 0 - bne _08194634 + bne @08194634 ldr r0, =0x03005d90 ldr r2, [r0] adds r0, r2, r7 @@ -780170,28 +780170,28 @@ _081945C4: ldrb r1, [r0] lsls r0, r1, 29 cmp r0, 0 - bge _081945FC -_081945DC: + bge @081945FC +@081945DC: lsls r1, 27 lsrs r0, r1, 30 cmp r0, 0 - beq _08194634 + beq @08194634 subs r1, r0, 0x1 ldr r2, [sp, 0x24] lsrs r0, r2, 24 -_081945EA: +@081945EA: lsls r1, 24 lsrs r1, 24 bl sub_81948EC - b _08194634 + b @08194634 .align 2, 0 .pool -_081945FC: +@081945FC: ldr r3, =0x00000cb2 adds r1, r2, r3 ldrh r0, [r1] cmp r0, 0 - beq _08194634 + beq @08194634 ldr r0, [sp, 0x1C] add r0, r8 lsls r0, 3 @@ -780200,21 +780200,21 @@ _081945FC: movs r3, 0x10 ldrsh r0, [r0, r3] cmp r0, 0 - beq _08194624 + beq @08194624 ldrh r1, [r1] - b _08194628 + b @08194628 .align 2, 0 .pool -_08194624: +@08194624: ldrh r0, [r1] subs r1, r0, 0x1 -_08194628: +@08194628: ldr r2, [sp, 0x24] lsrs r0, r2, 24 lsls r1, 24 lsrs r1, 24 bl sub_81948EC -_08194634: +@08194634: ldr r0, [sp, 0x1C] add r0, r8 lsls r0, 3 @@ -780223,17 +780223,17 @@ _08194634: movs r1, 0x10 ldrsh r0, [r0, r1] cmp r0, 0 - beq _08194660 + beq @08194660 ldr r2, =0x03005d90 ldr r0, [r2] ldr r3, =0x00000cb2 adds r0, r3 ldrh r3, [r0] adds r6, r2, 0 - b _0819466E + b @0819466E .align 2, 0 .pool -_08194660: +@08194660: ldr r1, =0x03005d90 ldr r0, [r1] ldr r2, =0x00000cb2 @@ -780241,10 +780241,10 @@ _08194660: ldrh r0, [r0] subs r3, r0, 0x1 adds r6, r1, 0 -_0819466E: +@0819466E: mov r0, r10 cmp r0, 0x1 - bne _0819468E + bne @0819468E ldr r2, [r6] adds r0, r2, r7 ldr r1, =0x00000d25 @@ -780257,11 +780257,11 @@ _0819466E: ldrh r0, [r2] subs r0, 0x1 cmp r1, r0 - blt _081946A6 -_0819468E: + blt @081946A6 +@0819468E: mov r1, r10 cmp r1, 0 - bne _081946FA + bne @081946FA ldr r0, [r6] adds r0, r7 ldr r2, =0x00000d25 @@ -780270,8 +780270,8 @@ _0819468E: lsls r0, 27 lsrs r0, 30 cmp r0, r3 - bgt _081946FA -_081946A6: + bgt @081946FA +@081946A6: ldr r0, [r6] adds r1, r0, r7 ldr r3, =0x00000d25 @@ -780279,7 +780279,7 @@ _081946A6: ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - bge _081946FA + bge @081946FA ldr r2, =0x00000d24 adds r0, r1, r2 ldrh r0, [r0] @@ -780287,7 +780287,7 @@ _081946A6: lsrs r0, 22 ldr r3, =0x000003ff cmp r0, r3 - bne _081946F0 + bne @081946F0 ldrb r1, [r4, 0xC] mov r0, r9 ands r0, r1 @@ -780298,16 +780298,16 @@ _081946A6: mov r0, r9 ands r0, r1 movs r1, 0x40 - b _08194740 + b @08194740 .align 2, 0 .pool -_081946F0: +@081946F0: ldrb r1, [r4, 0xC] mov r0, r9 ands r0, r1 movs r1, 0xB0 - b _08194734 -_081946FA: + b @08194734 +@081946FA: ldr r0, [r6] adds r0, r7 ldr r1, =0x00000d24 @@ -780317,7 +780317,7 @@ _081946FA: lsrs r0, 22 ldr r2, =0x000003ff cmp r0, r2 - bne _0819472C + bne @0819472C ldrb r1, [r4, 0xC] mov r0, r9 ands r0, r1 @@ -780328,22 +780328,22 @@ _081946FA: mov r0, r9 ands r0, r1 movs r1, 0x40 - b _08194740 + b @08194740 .align 2, 0 .pool -_0819472C: +@0819472C: ldrb r1, [r4, 0xC] mov r0, r9 ands r0, r1 movs r1, 0xE0 -_08194734: +@08194734: orrs r0, r1 strb r0, [r4, 0xC] ldrb r1, [r4, 0xD] mov r0, r9 ands r0, r1 movs r1, 0xD0 -_08194740: +@08194740: orrs r0, r1 strb r0, [r4, 0xD] ldr r0, =0x0860d3f1 @@ -780351,18 +780351,18 @@ _08194740: adds r0, r3, r0 ldrb r0, [r0] cmp r0, 0 - bne _08194768 + bne @08194768 ldrb r0, [r4, 0x5] ldrb r3, [r4, 0xA] ldr r1, =0x02022e2c movs r2, 0x3D bl sub_81DB384 - b _0819476A + b @0819476A .align 2, 0 .pool -_08194768: +@08194768: movs r0, 0x3 -_0819476A: +@0819476A: strb r0, [r4, 0x8] ldr r0, =0x02022e2c str r0, [sp, 0x4] @@ -780390,9 +780390,9 @@ _0819476A: adds r7, 0x4 subs r5, 0x1 cmp r5, 0 - blt _081947A6 - b _0819456C -_081947A6: + blt @081947A6 + b @0819456C +@081947A6: ldr r0, =0x03005e00 ldr r1, [sp, 0x1C] add r1, r8 @@ -780401,10 +780401,10 @@ _081947A6: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _081948C2 + b @081948C2 .align 2, 0 .pool -_081947C8: +@081947C8: movs r0, 0 bl Window_WriteStandardTileMap movs r0, 0x1 @@ -780425,10 +780425,10 @@ _081947C8: ldr r0, =sub_8194CE4 + 1 bl SetVBlankCallback cmp r4, 0x2 - bne _0819485C + bne @0819485C mov r2, r10 cmp r2, 0 - bne _08194844 + bne @08194844 ldr r0, =sub_819395C + 1 movs r1, 0 bl AddTask @@ -780449,20 +780449,20 @@ _081947C8: adds r0, r2 ldrh r0, [r0, 0x10] strh r0, [r1, 0x14] - b _08194878 + b @08194878 .align 2, 0 .pool -_08194844: +@08194844: ldr r0, =sub_8194950 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r5, r0, 24 ldr r1, =0x03005e00 - b _0819486C + b @0819486C .align 2, 0 .pool -_0819485C: +@0819485C: ldr r1, =0x03005e00 mov r2, r8 lsls r0, r2, 2 @@ -780471,14 +780471,14 @@ _0819485C: adds r0, r1 movs r3, 0xE ldrsh r5, [r0, r3] -_0819486C: +@0819486C: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 movs r1, 0 strh r1, [r0, 0x8] -_08194878: +@08194878: bl dp12_8087EA4 ldr r0, =0x02038c28 ldr r2, =0x00001f0a @@ -780486,14 +780486,14 @@ _08194878: lsls r4, 3 adds r1, r0, r4 movs r5, 0x5A -_08194888: +@08194888: strh r2, [r0] strh r2, [r1] adds r1, 0x2 adds r0, 0x2 subs r5, 0x1 cmp r5, 0 - bge _08194888 + bge @08194888 movs r5, 0x5B ldr r3, =0x0860cf44 ldr r0, =0x02038c28 @@ -780501,21 +780501,21 @@ _08194888: ldr r4, =0x00000836 adds r1, r0, r4 adds r0, 0xB6 -_081948A4: +@081948A4: strh r2, [r0] strh r2, [r1] adds r1, 0x2 adds r0, 0x2 adds r5, 0x1 cmp r5, 0x9F - ble _081948A4 + ble @081948A4 ldr r0, [r3] ldr r1, [r3, 0x4] ldr r2, [r3, 0x8] bl sub_80BA038 mov r0, r8 bl remove_task -_081948C2: +@081948C2: add sp, 0x28 pop {r3-r5} mov r8, r3 @@ -780529,7 +780529,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 @@ -780548,12 +780548,12 @@ sub_81948EC: @ 81948EC adds r1, r2 ldrb r0, [r1] cmp r0, 0 - beq _08194938 + beq @08194938 movs r7, 0x1 adds r4, r3, 0 adds r5, r4, 0x2 adds r6, r0, 0 -_0819491A: +@0819491A: ldrb r2, [r4] ldrb r3, [r4, 0x1] str r7, [sp] @@ -780567,8 +780567,8 @@ _0819491A: adds r5, 0x4 subs r6, 0x1 cmp r6, 0 - bne _0819491A -_08194938: + bne @0819491A +@08194938: movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram add sp, 0xC @@ -780580,7 +780580,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 @@ -780597,24 +780597,24 @@ sub_8194950: @ 8194950 ldrsh r0, [r0, r2] adds r2, r1, 0 cmp r0, 0x4 - bls _08194974 - b _08194B3C -_08194974: + bls @08194974 + b @08194B3C +@08194974: lsls r0, 2 - ldr r1, =_08194988 + ldr r1, =@08194988 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08194988: - .4byte _0819499C - .4byte _081949C0 - .4byte _08194AD4 - .4byte _08194AEE - .4byte _08194B24 -_0819499C: +@08194988: + .4byte @0819499C + .4byte @081949C0 + .4byte @08194AD4 + .4byte @08194AEE + .4byte @08194B24 +@0819499C: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -780629,18 +780629,18 @@ _0819499C: adds r0, r1 movs r1, 0x1 strh r1, [r0, 0x8] - b _08194B3C + b @08194B3C .align 2, 0 .pool -_081949C0: +@081949C0: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081949CE - b _08194B3C -_081949CE: + beq @081949CE + b @08194B3C +@081949CE: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -780680,7 +780680,7 @@ _081949CE: adds r4, r2, 0 ldr r6, =0x0860d3f1 movs r5, 0 -_08194A1C: +@08194A1C: mov r2, r8 ldr r0, [r2] adds r0, r5 @@ -780704,24 +780704,24 @@ _08194A1C: ldrh r0, [r2] subs r0, 0x1 cmp r1, r0 - bne _08194A9E + bne @08194A9E lsls r0, r3, 29 cmp r0, 0 - bge _08194A9E + bge @08194A9E ldrb r0, [r6] cmp r0, 0 - bne _08194A84 + bne @08194A84 ldrb r0, [r4, 0x5] ldrb r3, [r4, 0xA] mov r1, r9 movs r2, 0x3D bl sub_81DB384 - b _08194A86 + b @08194A86 .align 2, 0 .pool -_08194A84: +@08194A84: movs r0, 0x3 -_08194A86: +@08194A86: strb r0, [r4, 0x8] mov r1, r9 str r1, [sp, 0x4] @@ -780733,7 +780733,7 @@ _08194A86: movs r1, 0 movs r2, 0 bl remo_copy -_08194A9E: +@08194A9E: mov r2, r8 ldr r1, [r2] adds r0, r1, r5 @@ -780742,7 +780742,7 @@ _08194A9E: ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt _08194AC4 + blt @08194AC4 subs r2, 0x73 adds r0, r1, r2 ldrh r1, [r0] @@ -780752,16 +780752,16 @@ _08194A9E: lsls r1, 24 lsrs r1, 24 bl sub_81948EC -_08194AC4: +@08194AC4: adds r6, 0x2 adds r5, 0x4 adds r7, 0x1 cmp r7, 0xF - ble _08194A1C - b _08194B3C + ble @08194A1C + b @08194B3C .align 2, 0 .pool -_08194AD4: +@08194AD4: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -780771,17 +780771,17 @@ _08194AD4: strh r0, [r1, 0xE] lsls r0, 16 cmp r0, 0 - bne _08194B3C + bne @08194B3C movs r0, 0x3 strh r0, [r1, 0x8] - b _08194B3C -_08194AEE: + b @08194B3C +@08194AEE: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _08194B3C + beq @08194B3C movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -780796,21 +780796,21 @@ _08194AEE: adds r0, r1 movs r1, 0x4 strh r1, [r0, 0x8] - b _08194B3C + b @08194B3C .align 2, 0 .pool -_08194B24: +@08194B24: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08194B3C + bne @08194B3C ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 adds r0, r4, 0 bl remove_task -_08194B3C: +@08194B3C: add sp, 0x14 pop {r3,r4} mov r8, r3 @@ -780823,7 +780823,7 @@ _08194B3C: thumb_func_end sub_8194950 thumb_func_start sub_8194B54 -sub_8194B54: @ 8194B54 +sub_8194B54: ; 8194B54 push {lr} bl call_obj_callbacks bl obj_sync_something @@ -780835,7 +780835,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 @@ -780879,98 +780879,98 @@ 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] adds r1, r0, 0 cmp r0, 0x29 - bls _08194CC8 + bls @08194CC8 cmp r0, 0x31 - bhi _08194C1C + bhi @08194C1C ldr r1, =0x04000048 ldr r2, =0x00003b3b adds r0, r2, 0 strh r0, [r1] subs r1, 0x8 ldr r0, =0x989b5558 - b _08194CD4 + b @08194CD4 .align 2, 0 .pool -_08194C1C: +@08194C1C: cmp r0, 0x39 - bls _08194CC8 + bls @08194CC8 cmp r0, 0x4A - bhi _08194C40 + bhi @08194C40 ldr r1, =0x04000048 ldr r2, =0x00003b3b adds r0, r2, 0 strh r0, [r1] subs r1, 0x8 ldr r0, =0x90985860 - b _08194CD4 + b @08194CD4 .align 2, 0 .pool -_08194C40: +@08194C40: cmp r0, 0x51 - bhi _08194C60 + bhi @08194C60 ldr r1, =0x04000048 ldr r2, =0x00003b3b adds r0, r2, 0 strh r0, [r1] subs r1, 0x8 ldr r0, =0x989b5558 - b _08194CD4 + b @08194CD4 .align 2, 0 .pool -_08194C60: +@08194C60: cmp r0, 0x5E - bls _08194CC8 + bls @08194CC8 cmp r0, 0x66 - bhi _08194C84 + bhi @08194C84 ldr r1, =0x04000048 ldr r2, =0x00003737 adds r0, r2, 0 strh r0, [r1] subs r1, 0x8 ldr r0, =0x989b5558 - b _08194CD4 + b @08194CD4 .align 2, 0 .pool -_08194C84: +@08194C84: cmp r0, 0x76 - bhi _08194CA4 + bhi @08194CA4 ldr r1, =0x04000048 ldr r2, =0x00003737 adds r0, r2, 0 strh r0, [r1] subs r1, 0x8 ldr r0, =0x90985860 - b _08194CD4 + b @08194CD4 .align 2, 0 .pool -_08194CA4: +@08194CA4: cmp r0, 0x7E - bls _08194CC8 + bls @08194CC8 cmp r1, 0x86 - bhi _08194CC8 + bhi @08194CC8 ldr r1, =0x04000048 ldr r2, =0x00003737 adds r0, r2, 0 strh r0, [r1] subs r1, 0x8 ldr r0, =0x989b5558 - b _08194CD4 + b @08194CD4 .align 2, 0 .pool -_08194CC8: +@08194CC8: ldr r1, =0x04000048 ldr r2, =0x00003f3f adds r0, r2, 0 strh r0, [r1] subs r1, 0x8 movs r0, 0 -_08194CD4: +@08194CD4: str r0, [r1] pop {r0} bx r0 @@ -780979,7 +780979,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] @@ -781016,7 +781016,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, =0x085d97bc str r0, [r1] @@ -781029,7 +781029,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 @@ -781037,7 +781037,7 @@ sub_8194D68: @ 8194D68 push {r5-r7} sub sp, 0x8 movs r3, 0 -_08194D76: +@08194D76: ldr r0, =0x03005d90 ldr r1, [r0] ldr r0, =0x0203cef8 @@ -781063,18 +781063,18 @@ _08194D76: mov r9, r2 adds r7, r3, 0 muls r7, r1 -_08194DA8: +@08194DA8: movs r5, 0 adds r0, r6, 0x1 mov r8, r0 - b _08194DBE + b @08194DBE .align 2, 0 .pool -_08194DBC: +@08194DBC: adds r5, 0x1 -_08194DBE: +@08194DBE: cmp r5, 0x3 - bgt _08194DEA + bgt @08194DEA ldr r1, =0x03005d8c ldr r0, [r1] add r0, r9 @@ -781092,10 +781092,10 @@ _08194DBE: bl pokemon_getattr ldr r3, [sp, 0x4] cmp r4, r0 - bne _08194DBC -_08194DEA: + bne @08194DBC +@08194DEA: cmp r5, 0x4 - bne _08194E00 + bne @08194E00 lsls r2, r6, 24 lsrs r2, 24 ldr r1, =0x020244ec @@ -781104,10 +781104,10 @@ _08194DEA: str r3, [sp, 0x4] bl sub_80691F4 ldr r3, [sp, 0x4] -_08194E00: +@08194E00: mov r6, r8 cmp r6, 0x3 - ble _08194DA8 + ble @08194DA8 ldr r2, =0x03005d8c ldr r0, [r2] movs r2, 0x64 @@ -781125,7 +781125,7 @@ _08194E00: bl memcpy ldr r3, [sp] cmp r3, 0x1 - ble _08194D76 + ble @08194D76 add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -781139,14 +781139,14 @@ _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 ldr r7, =0x03005d8c movs r6, 0x64 movs r5, 0 -_08194E50: +@08194E50: ldr r0, =0x03005d90 ldr r1, [r0] ldr r0, =0x0203cef8 @@ -781179,7 +781179,7 @@ _08194E50: adds r5, 0x64 adds r4, 0x1 cmp r4, 0x1 - ble _08194E50 + ble @08194E50 add sp, 0x4 pop {r4-r7} pop {r0} @@ -781189,7 +781189,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} @@ -781197,7 +781197,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] @@ -781206,16 +781206,16 @@ sub_8194EC0: @ 8194EC0 ldr r0, =0x000003ff bl sub_8195358 cmp r4, r0 - ble _08194EE8 + ble @08194EE8 ldr r1, =0x020375f0 movs r0, 0x1 - b _08194EEC + b @08194EEC .align 2, 0 .pool -_08194EE8: +@08194EE8: ldr r1, =0x020375f0 movs r0, 0x2 -_08194EEC: +@08194EEC: strh r0, [r1] pop {r4} pop {r0} @@ -781225,7 +781225,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 @@ -781236,13 +781236,13 @@ sub_8194EF8: @ 8194EF8 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - bge _08194F2A + bge @08194F2A adds r4, r3, 0 adds r3, r1, 0 -_08194F14: +@08194F14: adds r2, 0x1 cmp r2, 0xF - bgt _08194F2A + bgt @08194F2A ldr r0, [r4] lsls r1, r2, 2 adds r0, r1 @@ -781250,8 +781250,8 @@ _08194F14: ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt _08194F14 -_08194F2A: + blt @08194F14 +@08194F2A: ldr r0, =0x02021cc4 ldr r1, =0x03005d90 ldr r1, [r1] @@ -781271,7 +781271,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 @@ -781291,14 +781291,14 @@ sub_8194F58: @ 8194F58 adds r0, r2, r6 ldrb r0, [r0] cmn r1, r0 - beq _08194F8C + beq @08194F8C ldr r1, =0x00000ca8 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x1 - beq _08194F8C - b _0819533E -_08194F8C: + beq @08194F8C + b @0819533E +@08194F8C: movs r0, 0x20 bl malloc_and_clear str r0, [sp, 0x18] @@ -781329,10 +781329,10 @@ _08194F8C: str r4, [sp, 0x38] movs r5, 0 str r5, [sp, 0x3C] -_08194FCC: +@08194FCC: mov r0, r10 cmp r0, 0x4 - bgt _08194FFC + bgt @08194FFC bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -781340,13 +781340,13 @@ _08194FCC: bl __umodsi3 lsls r0, 16 lsrs r4, r0, 16 - b _08195030 + b @08195030 .align 2, 0 .pool -_08194FFC: +@08194FFC: mov r1, r10 cmp r1, 0xE - bgt _0819501A + bgt @0819501A bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -781356,8 +781356,8 @@ _08194FFC: lsrs r0, 16 adds r4, r0, 0 adds r4, 0xA - b _08195030 -_0819501A: + b @08195030 +@0819501A: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -781367,10 +781367,10 @@ _0819501A: lsrs r0, 16 adds r4, r0, 0 adds r4, 0x1E -_08195030: +@08195030: movs r6, 0 cmp r6, r10 - bge _08195064 + bge @08195064 ldr r2, =0x03005d90 ldr r0, [r2] ldr r3, =0x00000d24 @@ -781379,13 +781379,13 @@ _08195030: lsls r0, 22 lsrs r0, 22 cmp r0, r4 - beq _08195064 + beq @08195064 adds r3, r2, 0 ldr r2, =0x00000d24 -_0819504C: +@0819504C: adds r6, 0x1 cmp r6, r10 - bge _08195064 + bge @08195064 ldr r0, [r3] lsls r1, r6, 2 adds r0, r1 @@ -781394,10 +781394,10 @@ _0819504C: lsls r0, 22 lsrs r0, 22 cmp r0, r4 - bne _0819504C -_08195064: + bne @0819504C +@08195064: cmp r6, r10 - bne _08194FCC + bne @08194FCC ldr r5, =0x03005d90 ldr r3, [r5] ldr r0, [sp, 0x38] @@ -781419,14 +781419,14 @@ _08195064: str r4, [sp, 0x30] ldr r0, [sp, 0x3C] str r0, [sp, 0x20] -_08195092: +@08195092: adds r1, r6, 0x1 str r1, [sp, 0x24] lsls r2, r6, 2 str r2, [sp, 0x2C] lsls r3, r6, 1 str r3, [sp, 0x28] -_0819509E: +@0819509E: ldr r4, [sp, 0x30] lsrs r0, r4, 16 bl sub_8163524 @@ -781434,7 +781434,7 @@ _0819509E: lsrs r5, r0, 16 movs r7, 0 cmp r7, r6 - bge _081950F4 + bge @081950F4 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x0203bc8c @@ -781447,32 +781447,32 @@ _0819509E: adds r0, r4 ldr r1, [sp, 0x20] adds r4, r1, r0 -_081950C8: +@081950C8: ldrh r3, [r4] cmp r3, r5 - beq _081950F4 + beq @081950F4 mov r2, r9 ldr r1, [r2] lsls r0, r5, 4 adds r2, r0, r1 ldrh r0, [r2] cmp r8, r0 - beq _081950F4 + beq @081950F4 cmp r12, r0 - beq _081950F4 + beq @081950F4 lsls r0, r3, 4 adds r0, r1 ldrb r0, [r0, 0xA] ldrb r2, [r2, 0xA] cmp r0, r2 - beq _081950F4 + beq @081950F4 adds r4, 0x2 adds r7, 0x1 cmp r7, r6 - blt _081950C8 -_081950F4: + blt @081950C8 +@081950F4: cmp r7, r6 - bne _0819509E + bne @0819509E ldr r3, =0x03005d90 ldr r0, [r3] ldr r4, [sp, 0x28] @@ -781493,7 +781493,7 @@ _081950F4: str r0, [r2] ldr r6, [sp, 0x24] cmp r6, 0x2 - ble _08195092 + ble @08195092 ldr r4, =0x03005d90 ldr r2, [r4] ldr r5, [sp, 0x38] @@ -781535,15 +781535,15 @@ _081950F4: add r10, r2 mov r4, r10 cmp r4, 0xF - bgt _08195178 - b _08194FCC -_08195178: + bgt @08195178 + b @08194FCC +@08195178: movs r5, 0 mov r10, r5 ldr r5, [sp, 0x18] movs r0, 0 str r0, [sp, 0x34] -_08195182: +@08195182: movs r7, 0 strh r7, [r5] ldr r1, =0x03005d90 @@ -781563,7 +781563,7 @@ _08195182: movs r6, 0 ldr r4, [sp, 0x34] mov r9, r4 -_081951AA: +@081951AA: ldr r1, =0x03005d90 ldr r0, [r1] mov r4, r9 @@ -781631,21 +781631,21 @@ _081951AA: orrs r7, r0 adds r6, 0x1 cmp r6, 0x2 - ble _081951AA + ble @081951AA movs r4, 0 movs r1, 0x1 movs r6, 0x1F -_0819523A: +@0819523A: adds r0, r7, 0 ands r0, r1 cmp r0, 0 - beq _08195244 + beq @08195244 adds r4, 0x1 -_08195244: +@08195244: asrs r7, 1 subs r6, 0x1 cmp r6, 0 - bge _0819523A + bge @0819523A movs r1, 0x32 adds r0, r4, 0 muls r0, r1 @@ -781662,36 +781662,36 @@ _08195244: add r10, r3 mov r4, r10 cmp r4, 0xF - ble _08195182 + ble @08195182 movs r5, 0 mov r10, r5 ldr r7, [sp, 0x18] -_08195276: +@08195276: mov r6, r10 adds r6, 0x1 cmp r6, 0xF - bgt _081952F8 + bgt @081952F8 mov r8, r7 ldr r5, =0x00000d24 lsls r0, r6, 1 ldr r1, [sp, 0x18] adds r4, r0, r1 -_08195288: +@08195288: mov r2, r8 ldrh r1, [r2] ldrh r0, [r4] cmp r1, r0 - bcs _081952C4 + bcs @081952C4 mov r0, r10 adds r1, r6, 0 ldr r2, [sp, 0x18] bl sub_818F904 - b _081952F0 + b @081952F0 .align 2, 0 .pool -_081952C4: +@081952C4: cmp r1, r0 - bne _081952F0 + bne @081952F0 ldr r0, =0x03005d90 ldr r1, [r0] mov r3, r10 @@ -781706,30 +781706,30 @@ _081952C4: ldrh r0, [r1] lsls r0, 22 cmp r2, r0 - bls _081952F0 + bls @081952F0 mov r0, r10 adds r1, r6, 0 ldr r2, [sp, 0x18] bl sub_818F904 -_081952F0: +@081952F0: adds r4, 0x2 adds r6, 0x1 cmp r6, 0xF - ble _08195288 -_081952F8: + ble @08195288 +@081952F8: adds r7, 0x2 movs r4, 0x1 add r10, r4 mov r5, r10 cmp r5, 0xE - ble _08195276 + ble @08195276 ldr r0, [sp, 0x18] bl free ldr r0, [sp, 0x1C] bl free movs r0, 0 mov r10, r0 -_08195314: +@08195314: mov r1, r10 lsls r0, r1, 24 lsrs r0, 24 @@ -781738,7 +781738,7 @@ _08195314: add r10, r2 mov r3, r10 cmp r3, 0x3 - ble _08195314 + ble @08195314 ldr r0, =0x03005d90 ldr r1, [r0] ldr r4, =0x00000ca9 @@ -781750,7 +781750,7 @@ _08195314: ldr r5, [sp, 0x14] orrs r0, r5 strb r0, [r1] -_0819533E: +@0819533E: add sp, 0x40 pop {r3-r5} mov r8, r3 @@ -781764,7 +781764,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 @@ -781777,13 +781777,13 @@ sub_8195358: @ 8195358 lsls r0, 22 lsrs r0, 22 cmp r0, r3 - beq _0819538E + beq @0819538E adds r5, r4, 0 adds r4, r1, 0 -_08195376: +@08195376: adds r2, 0x1 cmp r2, 0xF - bgt _0819538E + bgt @0819538E ldr r0, [r5] lsls r1, r2, 2 adds r0, r1 @@ -781792,8 +781792,8 @@ _08195376: lsls r0, 22 lsrs r0, 22 cmp r0, r3 - bne _08195376 -_0819538E: + bne @08195376 +@0819538E: adds r0, r2, 0 pop {r4,r5} pop {r1} @@ -781803,7 +781803,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 @@ -781816,13 +781816,13 @@ sub_81953A0: @ 81953A0 lsls r0, 22 lsrs r0, 22 cmp r0, r3 - beq _081953D6 + beq @081953D6 adds r5, r4, 0 adds r4, r1, 0 -_081953BE: +@081953BE: adds r2, 0x1 cmp r2, 0xF - bgt _081953D6 + bgt @081953D6 ldr r0, [r5] lsls r1, r2, 2 adds r0, r1 @@ -781831,8 +781831,8 @@ _081953BE: lsls r0, 22 lsrs r0, 22 cmp r0, r3 - bne _081953BE -_081953D6: + bne @081953BE +@081953D6: adds r0, r2, 0 pop {r4,r5} pop {r1} @@ -781842,7 +781842,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 @@ -781867,16 +781867,16 @@ sub_81953E8: @ 81953E8 mov r0, sp ldrb r0, [r0] cmp r4, r0 - beq _0819542C + beq @0819542C mov r0, sp ldrb r0, [r0] - b _08195430 + b @08195430 .align 2, 0 .pool -_0819542C: +@0819542C: mov r0, sp ldrb r0, [r0, 0x1] -_08195430: +@08195430: add sp, 0x4 pop {r4} pop {r1} @@ -781884,7 +781884,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 @@ -781904,7 +781904,7 @@ sub_8195438: @ 8195438 ands r0, r1 lsls r0, 3 str r0, [sp, 0x14] -_0819545E: +@0819545E: ldr r2, =0x03005d90 ldr r0, [r2] lsls r4, r5, 2 @@ -781916,18 +781916,18 @@ _0819545E: adds r2, r5, 0x1 str r2, [sp, 0x24] cmp r0, 0 - bge _08195478 - b _08195876 -_08195478: + bge @08195478 + b @08195876 +@08195478: subs r3, 0x1 adds r0, r1, r3 ldrh r0, [r0] lsls r1, r0, 22 ldr r0, =0xffc00000 cmp r1, r0 - bne _08195488 - b _08195876 -_08195488: + bne @08195488 + b @08195876 +@08195488: str r5, [sp, 0x4] lsrs r1, 22 ldr r0, [sp] @@ -781942,10 +781942,10 @@ _08195488: lsls r0, 22 ldr r1, =0xff800000 cmp r0, r1 - bne _08195504 + bne @08195504 ldr r2, [sp, 0x8] cmp r2, 0xFF - beq _08195504 + beq @08195504 lsls r2, 2 adds r1, r3, r2 ldr r3, =0x00000d25 @@ -781977,10 +781977,10 @@ _08195488: lsls r3, 4 adds r1, r3 adds r1, r2 - b _08195874 + b @08195874 .align 2, 0 .pool -_08195504: +@08195504: ldr r4, =0x03005d90 ldr r3, [r4] ldr r0, [sp, 0x8] @@ -781993,10 +781993,10 @@ _08195504: ldr r1, =0xff800000 str r2, [sp, 0x30] cmp r0, r1 - bne _0819557C + bne @0819557C ldr r2, [sp, 0x4] cmp r2, 0xFF - beq _0819557C + beq @0819557C lsls r2, 2 adds r1, r3, r2 ldr r3, =0x00000d25 @@ -782030,17 +782030,17 @@ _08195504: strh r0, [r1] adds r5, 0x1 str r5, [sp, 0x24] - b _08195876 + b @08195876 .align 2, 0 .pool -_0819557C: +@0819557C: adds r5, 0x1 str r5, [sp, 0x24] ldr r5, [sp, 0x8] cmp r5, 0xFF - bne _08195588 - b _08195876 -_08195588: + bne @08195588 + b @08195876 +@08195588: movs r0, 0 mov r10, r0 lsls r1, r5, 1 @@ -782055,15 +782055,15 @@ _08195588: adds r0, r1, r5 lsls r0, 1 str r0, [sp, 0x18] -_081955A4: +@081955A4: movs r5, 0 mov r0, r9 str r0, [sp, 0x38] -_081955AA: +@081955AA: movs r6, 0 lsls r7, r5, 1 ldr r4, [sp, 0x18] -_081955B0: +@081955B0: ldr r2, =0x03005d90 ldr r1, [r2] ldr r3, =0x00000d64 @@ -782092,10 +782092,10 @@ _081955B0: adds r4, 0x2 adds r6, 0x1 cmp r6, 0x2 - ble _081955B0 + ble @081955B0 adds r5, 0x1 cmp r5, 0x3 - ble _081955AA + ble @081955AA ldr r2, =0x03005d90 ldr r0, [r2] ldr r3, =0x00000d64 @@ -782134,7 +782134,7 @@ _081955B0: add r10, r1 mov r2, r10 cmp r2, 0x2 - ble _081955A4 + ble @081955A4 bl GenerateRandomNumber movs r1, 0x1F ands r1, r0 @@ -782153,7 +782153,7 @@ _081955B0: adds r0, r5, r3 lsls r0, 1 str r0, [sp, 0x20] -_08195668: +@08195668: movs r5, 0 mov r0, r10 lsls r3, r0, 1 @@ -782162,13 +782162,13 @@ _08195668: ldr r2, [sp, 0x1C] adds r2, r3 mov r8, r2 -_08195678: +@08195678: movs r6, 0 lsls r7, r5, 1 adds r5, 0x1 str r5, [sp, 0x3C] ldr r4, [sp, 0x20] -_08195682: +@08195682: ldr r5, =0x03005d90 ldr r1, [r5] ldr r0, =0x00000d64 @@ -782199,10 +782199,10 @@ _08195682: adds r6, 0x1 ldr r3, [sp, 0x34] cmp r6, 0x2 - ble _08195682 + ble @08195682 ldr r5, [sp, 0x3C] cmp r5, 0x3 - ble _08195678 + ble @08195678 ldr r2, =0x03005d90 ldr r0, [r2] ldr r5, [sp, 0x1C] @@ -782239,7 +782239,7 @@ _08195682: str r3, [sp, 0x10] mov r5, r10 cmp r5, 0x2 - ble _08195668 + ble @08195668 bl GenerateRandomNumber movs r1, 0x1F ands r1, r0 @@ -782250,7 +782250,7 @@ _08195682: str r0, [sp, 0x10] ldr r2, [sp, 0xC] cmp r2, r0 - ble _08195784 + ble @08195784 ldr r3, =0x03005d90 ldr r1, [r3] ldr r5, [sp, 0x30] @@ -782283,14 +782283,14 @@ _08195682: adds r1, r5 ldr r2, [sp, 0x2C] adds r1, r2 - b _08195874 + b @08195874 .align 2, 0 .pool -_08195784: +@08195784: ldr r3, [sp, 0xC] ldr r5, [sp, 0x10] cmp r3, r5 - bge _081957DC + bge @081957DC ldr r0, =0x03005d90 ldr r1, [r0] ldr r3, [sp, 0x4] @@ -782324,14 +782324,14 @@ _08195784: adds r1, r5 ldr r2, [sp, 0x28] adds r1, r2 - b _08195874 + b @08195874 .align 2, 0 .pool -_081957DC: +@081957DC: ldr r3, [sp, 0x4] ldr r5, [sp, 0x8] cmp r3, r5 - ble _08195830 + ble @08195830 ldr r0, =0x03005d90 ldr r1, [r0] ldr r2, [sp, 0x30] @@ -782363,10 +782363,10 @@ _081957DC: lsls r2, 4 adds r1, r2 ldr r3, [sp, 0x2C] - b _08195872 + b @08195872 .align 2, 0 .pool -_08195830: +@08195830: ldr r5, =0x03005d90 ldr r1, [r5] ldr r0, [sp, 0x4] @@ -782399,16 +782399,16 @@ _08195830: lsls r2, 4 adds r1, r2 ldr r3, [sp, 0x28] -_08195872: +@08195872: adds r1, r3 -_08195874: +@08195874: strh r0, [r1] -_08195876: +@08195876: ldr r5, [sp, 0x24] cmp r5, 0xF - bgt _0819587E - b _0819545E -_0819587E: + bgt @0819587E + b @0819545E +@0819587E: add sp, 0x40 pop {r3-r5} mov r8, r3 @@ -782422,7 +782422,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 @@ -782431,52 +782431,52 @@ sub_8195898: @ 8195898 bl sub_8165C40 ldr r0, =0x000003fe cmp r5, r0 - bne _081958B8 + bne @081958B8 adds r0, r6, 0 bl sub_8195938 - b _08195902 + b @08195902 .align 2, 0 .pool -_081958B8: +@081958B8: ldr r0, =0x000003ff cmp r5, r0 - bne _081958DC + bne @081958DC ldr r0, =0x03005d90 ldr r2, [r0] -_081958C2: +@081958C2: adds r0, r6, r4 adds r1, r2, r4 ldrb r1, [r1] strb r1, [r0] adds r4, 0x1 cmp r4, 0x6 - ble _081958C2 - b _081958FC + ble @081958C2 + b @081958FC .align 2, 0 .pool -_081958DC: +@081958DC: ldr r0, =0x0000012b cmp r5, r0 - bhi _081958FC + bhi @081958FC ldr r0, =0x0203bc88 ldr r1, [r0] movs r0, 0x34 muls r0, r5 adds r0, r1 adds r2, r0, 0x4 -_081958EE: +@081958EE: adds r0, r6, r4 adds r1, r2, r4 ldrb r1, [r1] strb r1, [r0] adds r4, 0x1 cmp r4, 0x6 - ble _081958EE -_081958FC: + ble @081958EE +@081958FC: adds r1, r6, r4 movs r0, 0xFF strb r0, [r1] -_08195902: +@08195902: pop {r4-r6} pop {r0} bx r0 @@ -782485,7 +782485,7 @@ _08195902: thumb_func_end sub_8195898 thumb_func_start sub_8195910 -sub_8195910: @ 8195910 +sub_8195910: ; 8195910 ldr r0, =0x08310030 ldr r1, =0x00007df3 adds r0, r1 @@ -782496,7 +782496,7 @@ sub_8195910: @ 8195910 thumb_func_end sub_8195910 thumb_func_start sub_8195924 -sub_8195924: @ 8195924 +sub_8195924: ; 8195924 ldr r0, =0x08310030 ldr r1, =0x00007df1 adds r0, r1 @@ -782507,19 +782507,19 @@ 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, =0x08317e24 -_08195940: +@08195940: adds r0, r3, r2 adds r1, r2, r4 ldrb r1, [r1] strb r1, [r0] adds r2, 0x1 cmp r2, 0x6 - ble _08195940 + ble @08195940 adds r1, r3, r2 movs r0, 0xFF strb r0, [r1] @@ -782531,7 +782531,7 @@ _08195940: thumb_func_end sub_8195938 thumb_func_start sub_8195960 -sub_8195960: @ 8195960 +sub_8195960: ; 8195960 push {lr} ldr r1, =0x0860de50 ldr r0, =0x020375e0 @@ -782547,7 +782547,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] @@ -782596,7 +782596,7 @@ sub_8195980: @ 8195980 ldr r1, [r1] ands r0, r1 cmp r0, 0 - bne _081959F2 + bne @081959F2 lsls r0, r5, 1 lsls r1, r7, 2 adds r0, r1 @@ -782604,7 +782604,7 @@ sub_8195980: @ 8195980 adds r1, r4, r2 adds r1, r0 strh r6, [r1] -_081959F2: +@081959F2: ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x4 @@ -782625,7 +782625,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] @@ -782641,29 +782641,29 @@ sub_8195A38: @ 8195A38 ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x1 - beq _08195A90 + beq @08195A90 cmp r0, 0x1 - bgt _08195A74 + bgt @08195A74 cmp r0, 0 - beq _08195A7A - b _08195AD0 + beq @08195A7A + b @08195AD0 .align 2, 0 .pool -_08195A74: +@08195A74: cmp r0, 0x2 - beq _08195AB0 - b _08195AD0 -_08195A7A: + beq @08195AB0 + b @08195AD0 +@08195A7A: ldr r0, =0x020375f0 ldr r1, [r5] ldr r2, =0x00000dc6 adds r1, r2 ldrh r1, [r1] strh r1, [r0] - b _08195AD0 + b @08195AD0 .align 2, 0 .pool -_08195A90: +@08195A90: ldr r3, =0x020375f0 ldr r0, [r5] lsls r1, r7, 1 @@ -782674,10 +782674,10 @@ _08195A90: adds r0, r1 ldrh r0, [r0] strh r0, [r3] - b _08195AD0 + b @08195AD0 .align 2, 0 .pool -_08195AB0: +@08195AB0: ldr r4, =0x020375f0 ldr r2, [r5] ldr r0, =0x00000cdc @@ -782694,7 +782694,7 @@ _08195AB0: orrs r0, r1 lsrs r0, 31 strh r0, [r4] -_08195AD0: +@08195AD0: pop {r4-r7} pop {r0} bx r0 @@ -782703,7 +782703,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] @@ -782719,29 +782719,29 @@ sub_8195AE4: @ 8195AE4 ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x1 - beq _08195B3C + beq @08195B3C cmp r0, 0x1 - bgt _08195B20 + bgt @08195B20 cmp r0, 0 - beq _08195B26 - b _08195BA0 + beq @08195B26 + b @08195BA0 .align 2, 0 .pool -_08195B20: +@08195B20: cmp r0, 0x2 - beq _08195B5C - b _08195BA0 -_08195B26: + beq @08195B5C + b @08195BA0 +@08195B26: ldr r0, [r6] ldr r1, =0x020375e4 ldrh r1, [r1] ldr r2, =0x00000dc6 adds r0, r2 strh r1, [r0] - b _08195BA0 + b @08195BA0 .align 2, 0 .pool -_08195B3C: +@08195B3C: ldr r2, [r6] lsls r0, r5, 1 lsls r1, r4, 2 @@ -782752,14 +782752,14 @@ _08195B3C: ldr r0, =0x020375e4 ldrh r0, [r0] strh r0, [r2] - b _08195BA0 + b @08195BA0 .align 2, 0 .pool -_08195B5C: +@08195B5C: ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0 - beq _08195B88 + beq @08195B88 ldr r2, [r6] ldr r0, =0x00000cdc adds r2, r0 @@ -782771,10 +782771,10 @@ _08195B5C: ldr r0, [r2] ldr r1, [r1] orrs r0, r1 - b _08195B9E + b @08195B9E .align 2, 0 .pool -_08195B88: +@08195B88: ldr r2, [r6] ldr r1, =0x00000cdc adds r2, r1 @@ -782786,9 +782786,9 @@ _08195B88: ldr r0, [r2] ldr r1, [r1] ands r0, r1 -_08195B9E: +@08195B9E: str r0, [r2] -_08195BA0: +@08195BA0: pop {r4-r6} pop {r0} bx r0 @@ -782797,7 +782797,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 var_get @@ -782816,7 +782816,7 @@ sub_8195BB0: @ 8195BB0 adds r2, r1 ldrh r0, [r2] cmp r0, 0x31 - bhi _08195C00 + bhi @08195C00 ldr r4, =0x020375f0 bl GenerateRandomNumber lsls r0, 16 @@ -782824,23 +782824,23 @@ sub_8195BB0: @ 8195BB0 movs r1, 0x3 bl __umodsi3 strh r0, [r4] - b _08195C16 + b @08195C16 .align 2, 0 .pool -_08195C00: +@08195C00: cmp r0, 0x62 - bhi _08195C10 + bhi @08195C10 ldr r1, =0x020375f0 movs r0, 0x3 - b _08195C14 + b @08195C14 .align 2, 0 .pool -_08195C10: +@08195C10: ldr r1, =0x020375f0 movs r0, 0x4 -_08195C14: +@08195C14: strh r0, [r1] -_08195C16: +@08195C16: pop {r4} pop {r0} bx r0 @@ -782849,7 +782849,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 @@ -782874,13 +782874,13 @@ 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] ldr r0, =0x0000012b cmp r1, r0 - bhi _08195C6C + bhi @08195C6C ldr r2, =0x0203bc88 movs r0, 0x34 muls r1, r0 @@ -782888,7 +782888,7 @@ sub_8195C50: @ 8195C50 adds r0, r1 adds r0, 0xC bl sub_81638AC -_08195C6C: +@08195C6C: pop {r0} bx r0 .align 2, 0 @@ -782896,7 +782896,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] @@ -782918,7 +782918,7 @@ sub_8195C7C: @ 8195C7C ldrh r2, [r3] ldr r0, =0x0000270e cmp r2, r0 - bhi _08195CCA + bhi @08195CCA adds r2, 0x1 strh r2, [r3] movs r3, 0xDD @@ -782928,15 +782928,15 @@ sub_8195C7C: @ 8195C7C adds r0, r5, 0 ldrh r3, [r1] cmp r7, r3 - bls _08195CC0 + bls @08195CC0 adds r0, 0x2 -_08195CC0: +@08195CC0: adds r0, r6, r0 ldrh r0, [r0] cmp r0, 0 - beq _08195CCA + beq @08195CCA strh r2, [r1] -_08195CCA: +@08195CCA: pop {r4-r7} pop {r0} bx r0 @@ -782945,7 +782945,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] @@ -782974,7 +782974,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 var_get @@ -782993,7 +782993,7 @@ sub_8195D28: @ 8195D28 adds r2, r1 ldrh r0, [r2] cmp r0, 0x29 - bls _08195D88 + bls @08195D88 bl GenerateRandomNumber ldr r4, [r4] ldr r5, =0x0860de84 @@ -783007,10 +783007,10 @@ sub_8195D28: @ 8195D28 ldrh r0, [r0] ldr r1, =0x00000dc6 adds r4, r1 - b _08195DA6 + b @08195DA6 .align 2, 0 .pool -_08195D88: +@08195D88: bl GenerateRandomNumber ldr r4, [r4] ldr r5, =0x0860de78 @@ -783024,7 +783024,7 @@ _08195D88: ldrh r0, [r0] ldr r3, =0x00000dc6 adds r4, r3 -_08195DA6: +@08195DA6: strh r0, [r4] pop {r4,r5} pop {r0} @@ -783034,7 +783034,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] @@ -783046,7 +783046,7 @@ sub_8195DB8: @ 8195DB8 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x1 - bne _08195E00 + bne @08195E00 ldr r0, [r4] ldr r1, =0x00000dc6 adds r0, r1 @@ -783060,14 +783060,14 @@ sub_8195DB8: @ 8195DB8 strh r1, [r0] ldr r0, =0x020375f0 strh r5, [r0] - b _08195E06 + b @08195E06 .align 2, 0 .pool -_08195E00: +@08195E00: ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] -_08195E06: +@08195E06: pop {r4,r5} pop {r0} bx r0 @@ -783076,7 +783076,7 @@ _08195E06: thumb_func_end sub_8195DB8 thumb_func_start sub_8195E10 -sub_8195E10: @ 8195E10 +sub_8195E10: ; 8195E10 push {lr} bl sub_802F588 ldr r0, =0x03005cf8 @@ -783093,7 +783093,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] @@ -783115,7 +783115,7 @@ sub_8195E34: @ 8195E34 thumb_func_end sub_8195E34 thumb_func_start sub_8195E58 -sub_8195E58: @ 8195E58 +sub_8195E58: ; 8195E58 push {lr} bl sub_802F588 ldr r0, =0x03005cf8 @@ -783124,25 +783124,25 @@ sub_8195E58: @ 8195E58 ldr r2, =0x0203cd80 ldr r0, [r2] cmp r0, r1 - bhi _08195E74 + bhi @08195E74 subs r0, r1, r0 cmp r0, 0x9 - bls _08195E84 -_08195E74: + bls @08195E84 +@08195E74: str r1, [r2] movs r0, 0x1 - b _08195E86 + b @08195E86 .align 2, 0 .pool -_08195E84: +@08195E84: movs r0, 0 -_08195E86: +@08195E86: pop {r1} bx r1 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 @@ -783150,15 +783150,15 @@ sub_8195E8C: @ 8195E8C movs r1, 0x6 bl pokemon_getattr cmp r0, 0 - bne _08195EAE + bne @08195EAE adds r0, r4, 0 bl sub_806B6D8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1F - bne _08195EAE + bne @08195EAE movs r5, 0x2 -_08195EAE: +@08195EAE: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -783169,76 +783169,76 @@ _08195EAE: lsls r1, r5, 1 adds r1, r5 cmp r0, r1 - blt _08195ED0 + blt @08195ED0 movs r0, 0 - b _08195ED2 + b @08195ED2 .align 2, 0 .pool -_08195ED0: +@08195ED0: movs r0, 0x1 -_08195ED2: +@08195ED2: pop {r4,r5} pop {r1} bx r1 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] bl is_light_level_1_2_3_or_6 lsls r0, 24 cmp r0, 0 - beq _08195F30 + beq @08195F30 ldrb r0, [r4, 0x14] cmp r0, 0x39 - beq _08195F30 + beq @08195F30 cmp r0, 0xE - bne _08195F0E + bne @08195F0E movs r0, 0xF9 lsls r0, 2 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08195F0E + bne @08195F0E movs r0, 0xDC bl flag_check lsls r0, 24 cmp r0, 0 - beq _08195F30 -_08195F0E: + beq @08195F30 +@08195F0E: ldr r0, =0x02037318 ldrb r0, [r0, 0x14] cmp r0, 0x38 - bne _08195F38 + bne @08195F38 movs r0, 0xCF bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08195F38 + bne @08195F38 movs r0, 0x8B bl flag_check lsls r0, 24 cmp r0, 0 - bne _08195F38 -_08195F30: + bne @08195F38 +@08195F30: movs r0, 0 - b _08195F3A + b @08195F3A .align 2, 0 .pool -_08195F38: +@08195F38: movs r0, 0x1 -_08195F3A: +@08195F3A: pop {r4} pop {r1} bx r1 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] @@ -783247,27 +783247,27 @@ sub_8195F40: @ 8195F40 lsls r0, 24 lsrs r0, 24 cmp r0, 0x9 - bhi _08195F5C + bhi @08195F5C movs r0, 0 - b _08195F62 + b @08195F62 .align 2, 0 .pool -_08195F5C: +@08195F5C: movs r0, 0 strb r0, [r1, 0x6] movs r0, 0x1 -_08195F62: +@08195F62: pop {r1} bx r1 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 cmp r4, 0 - beq _08195FB8 + beq @08195FB8 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -783281,7 +783281,7 @@ sub_8195F68: @ 8195F68 lsls r0, 16 lsrs r0, 16 cmp r0, 0x4E - beq _08195FB8 + beq @08195FB8 ldrh r0, [r2, 0x4] bl sub_8196844 adds r4, r0, 0 @@ -783291,30 +783291,30 @@ sub_8195F68: @ 8195F68 lsrs r0, 16 ldrb r1, [r1, 0x14] cmp r0, r1 - bne _08195FC4 + bne @08195FC4 adds r0, r4, 0 bl sub_8196710 cmp r0, 0 - bne _08195FC4 -_08195FB8: + bne @08195FC4 +@08195FB8: movs r0, 0 - b _08195FC6 + b @08195FC6 .align 2, 0 .pool -_08195FC4: +@08195FC4: movs r0, 0x1 -_08195FC6: +@08195FC6: pop {r4} pop {r1} bx r1 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 -_08195FD2: +@08195FD2: movs r1, 0xAE lsls r1, 1 adds r0, r4, r1 @@ -783323,12 +783323,12 @@ _08195FD2: bl flag_check lsls r0, 24 cmp r0, 0 - beq _08195FE8 + beq @08195FE8 adds r5, 0x1 -_08195FE8: +@08195FE8: adds r4, 0x1 cmp r4, 0x3F - bls _08195FD2 + bls @08195FD2 adds r0, r5, 0 pop {r4,r5} pop {r1} @@ -783336,12 +783336,12 @@ _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 ldr r6, =0x085500a4 -_08196000: +@08196000: movs r1, 0xAE lsls r1, 1 adds r0, r4, r1 @@ -783350,64 +783350,64 @@ _08196000: bl flag_check lsls r0, 24 cmp r0, 0 - beq _08196022 + beq @08196022 cmp r5, 0 - bne _08196020 + bne @08196020 ldrh r0, [r6] - b _0819602C + b @0819602C .align 2, 0 .pool -_08196020: +@08196020: subs r5, 0x1 -_08196022: +@08196022: adds r6, 0x10 adds r4, 0x1 cmp r4, 0x3F - bls _08196000 + bls @08196000 movs r0, 0x4E -_0819602C: +@0819602C: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_8195FF8 thumb_func_start sub_8196034 -sub_8196034: @ 8196034 +sub_8196034: ; 8196034 push {lr} ldr r0, =0x0000012f bl flag_check lsls r0, 24 cmp r0, 0 - beq _08196078 + beq @08196078 bl sub_8195F40 cmp r0, 0 - beq _08196078 + beq @08196078 bl sub_8195E58 cmp r0, 0 - beq _08196078 + beq @08196078 bl sub_8195E8C cmp r0, 0 - beq _08196078 + beq @08196078 bl sub_8195ED8 cmp r0, 0 - beq _08196078 + beq @08196078 bl sub_8195F68 cmp r0, 0 - beq _08196078 + beq @08196078 bl task_prev_quest movs r0, 0x1 - b _0819607A + b @0819607A .align 2, 0 .pool -_08196078: +@08196078: movs r0, 0 -_0819607A: +@0819607A: pop {r1} bx r1 thumb_func_end sub_8196034 thumb_func_start sub_8196080 -sub_8196080: @ 8196080 +sub_8196080: ; 8196080 push {lr} ldr r1, =0x0203cd80 movs r0, 0x1 @@ -783420,7 +783420,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 + 1 bl is_function_an_active_task @@ -783433,17 +783433,17 @@ 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] cmp r0, 0 - bne _081960C2 + bne @081960C2 bl script_env_2_enable bl player_bitmagic bl sub_808B864 bl sub_808BCF4 -_081960C2: +@081960C2: ldr r0, =0x00000107 bl audio_play ldr r0, =sub_81960E0 + 1 @@ -783456,7 +783456,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 @@ -783474,7 +783474,7 @@ sub_81960E0: @ 81960E0 adds r0, r5, 0 bl _call_via_r1 cmp r0, 0 - beq _0819611E + beq @0819611E ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] @@ -783483,10 +783483,10 @@ sub_81960E0: @ 81960E0 lsls r0, 16 lsrs r0, 16 cmp r0, 0x7 - bls _0819611E + bls @0819611E adds r0, r5, 0 bl remove_task -_0819611E: +@0819611E: pop {r4,r5} pop {r0} bx r0 @@ -783495,7 +783495,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 @@ -783512,12 +783512,12 @@ sub_819612C: @ 819612C lsls r0, 16 asrs r0, 16 cmp r0, 0xFF - bne _0819615C + bne @0819615C adds r0, r4, 0 - b _081961E0 + b @081961E0 .align 2, 0 .pool -_0819615C: +@0819615C: ldr r1, =0x0860ea6c movs r2, 0x80 lsls r2, 1 @@ -783528,14 +783528,14 @@ _0819615C: lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 - bne _08196188 + bne @08196188 ldrb r0, [r5, 0x4] bl Window_Remove adds r0, r4, 0 - b _081961E0 + b @081961E0 .align 2, 0 .pool -_08196188: +@08196188: ldr r1, =0x0860eb8c ldr r3, =0x00000279 movs r0, 0 @@ -783543,7 +783543,7 @@ _08196188: movs r2, 0 bl decompress_and_copy_tile_data_to_vram cmp r0, 0 - beq _081961D8 + beq @081961D8 ldrb r0, [r5, 0x4] movs r1, 0x88 bl Window_FastFillPixels @@ -783560,17 +783560,17 @@ _08196188: movs r2, 0 bl bg_change_y_offset movs r0, 0x1 - b _081961E6 + b @081961E6 .align 2, 0 .pool -_081961D8: +@081961D8: ldrb r0, [r5, 0x4] bl Window_Remove adds r0, r6, 0 -_081961E0: +@081961E0: bl remove_task movs r0, 0 -_081961E6: +@081961E6: add sp, 0x4 pop {r4-r6} pop {r1} @@ -783578,7 +783578,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 @@ -783591,7 +783591,7 @@ sub_81961F0: @ 81961F0 bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - bne _08196268 + bne @08196268 ldrb r0, [r4, 0x4] bl Window_WriteStandardTileMap movs r1, 0x4 @@ -783624,12 +783624,12 @@ sub_81961F0: @ 81961F0 movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x1 - b _0819626A + b @0819626A .align 2, 0 .pool -_08196268: +@08196268: movs r0, 0 -_0819626A: +@0819626A: add sp, 0x10 pop {r4} pop {r1} @@ -783637,7 +783637,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 @@ -783649,18 +783649,18 @@ sub_8196274: @ 8196274 bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _08196298 + beq @08196298 movs r0, 0 - b _081962A4 + b @081962A4 .align 2, 0 .pool -_08196298: +@08196298: movs r1, 0x4 ldrsh r0, [r4, r1] ldr r1, =0x0860ef70 bl sub_81965D8 movs r0, 0x1 -_081962A4: +@081962A4: pop {r4} pop {r1} bx r1 @@ -783669,7 +783669,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 @@ -783677,22 +783677,22 @@ sub_81962B0: @ 81962B0 movs r2, 0x1 bl bg_change_y_offset cmp r0, 0 - bge _081962C6 + bge @081962C6 movs r0, 0 - b _081962D2 -_081962C6: + b @081962D2 +@081962C6: movs r0, 0 movs r1, 0 movs r2, 0 bl bg_change_y_offset movs r0, 0x1 -_081962D2: +@081962D2: pop {r1} bx r1 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 @@ -783705,36 +783705,36 @@ sub_81962D8: @ 81962D8 ldrsh r0, [r4, r1] bl sub_8196648 cmp r0, 0 - bne _08196328 + bne @08196328 ldrb r0, [r4, 0x4] movs r1, 0x88 bl Window_FastFillPixels ldr r1, =0x0203cd80 ldrb r0, [r1, 0x7] cmp r0, 0 - bne _0819630C + bne @0819630C ldrh r0, [r1, 0x4] ldr r1, =0x02021fc4 bl sub_81967AC -_0819630C: +@0819630C: movs r1, 0x4 ldrsh r0, [r4, r1] ldr r1, =0x02021fc4 bl sub_81965D8 movs r0, 0x1 - b _0819632A + b @0819632A .align 2, 0 .pool -_08196328: +@08196328: movs r0, 0 -_0819632A: +@0819632A: pop {r4} pop {r1} bx r1 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 @@ -783747,17 +783747,17 @@ sub_8196330: @ 8196330 ldrsh r0, [r4, r1] bl sub_8196648 cmp r0, 0 - bne _08196388 + bne @08196388 bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - bne _08196388 + bne @08196388 ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _08196388 + beq @08196388 ldrb r0, [r4, 0x4] movs r1, 0x88 bl Window_FastFillPixels @@ -783768,19 +783768,19 @@ sub_8196330: @ 8196330 lsls r0, 1 bl audio_play movs r0, 0x1 - b _0819638A + b @0819638A .align 2, 0 .pool -_08196388: +@08196388: movs r0, 0 -_0819638A: +@0819638A: pop {r4} pop {r1} bx r1 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 @@ -783797,12 +783797,12 @@ sub_8196390: @ 8196390 bl bg_change_y_offset ldr r1, =0xffffe000 cmp r0, r1 - ble _081963C0 + ble @081963C0 movs r0, 0 - b _081963E8 + b @081963E8 .align 2, 0 .pool -_081963C0: +@081963C0: movs r0, 0x1E str r0, [sp] movs r0, 0x6 @@ -783819,7 +783819,7 @@ _081963C0: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x1 -_081963E8: +@081963E8: add sp, 0x8 pop {r4} pop {r1} @@ -783827,16 +783827,16 @@ _081963E8: thumb_func_end sub_8196390 thumb_func_start sub_81963F0 -sub_81963F0: @ 81963F0 +sub_81963F0: ; 81963F0 push {lr} bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _08196454 + bne @08196454 bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 - bne _08196454 + bne @08196454 movs r0, 0 movs r1, 0 movs r2, 0 @@ -783844,7 +783844,7 @@ sub_81963F0: @ 81963F0 ldr r0, =0x0203cd80 ldrb r0, [r0, 0x7] cmp r0, 0 - bne _08196446 + bne @08196446 bl sub_81973A4 movs r0, 0xFF movs r1, 0 @@ -783862,20 +783862,20 @@ sub_81963F0: @ 81963F0 bl sub_80D338C bl sub_809757C bl script_env_2_disable -_08196446: +@08196446: movs r0, 0x1 - b _08196456 + b @08196456 .align 2, 0 .pool -_08196454: +@08196454: movs r0, 0 -_08196456: +@08196456: pop {r1} bx r1 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 @@ -784054,7 +784054,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] @@ -784111,7 +784111,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 @@ -784119,23 +784119,23 @@ sub_8196648: @ 8196648 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0819666C + beq @0819666C ldr r0, =0x03003014 ldrb r1, [r0] movs r2, 0x1 orrs r1, r2 strb r1, [r0] - b _08196678 + b @08196678 .align 2, 0 .pool -_0819666C: +@0819666C: ldr r2, =0x03003014 ldrb r1, [r2] movs r0, 0x2 negs r0, r0 ands r0, r1 strb r0, [r2] -_08196678: +@08196678: bl run_remoboxes lsls r0, r4, 24 lsrs r0, 24 @@ -784150,7 +784150,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 @@ -784166,7 +784166,7 @@ sub_8196694: @ 8196694 lsls r0, 16 asrs r0, 16 cmp r0, 0x8 - ble _081966FC + ble @081966FC movs r1, 0 strh r1, [r2] ldrh r0, [r2, 0x2] @@ -784175,9 +784175,9 @@ sub_8196694: @ 8196694 lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - ble _081966C8 + ble @081966C8 strh r1, [r2, 0x2] -_081966C8: +@081966C8: movs r0, 0x2 ldrsh r1, [r2, r0] lsls r1, 4 @@ -784202,7 +784202,7 @@ _081966C8: bl bg_write_sequence_to_wram_tile_map_rect movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram -_081966FC: +@081966FC: add sp, 0x10 pop {r0} bx r0 @@ -784211,7 +784211,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 @@ -784227,7 +784227,7 @@ sub_8196710: @ 8196710 thumb_func_end sub_8196710 thumb_func_start sub_819672C -sub_819672C: @ 819672C +sub_819672C: ; 819672C push {lr} ldr r1, =0x085500a4 lsls r0, 4 @@ -784244,23 +784244,23 @@ 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 ldr r4, =0x085500a4 -_08196750: +@08196750: ldrh r0, [r4] bl trainer_flag_check lsls r0, 24 cmp r0, 0 - beq _0819675E + beq @0819675E adds r6, 0x1 -_0819675E: +@0819675E: adds r4, 0x10 adds r5, 0x1 cmp r5, 0x3F - bls _08196750 + bls @08196750 adds r0, r6, 0 pop {r4-r6} pop {r1} @@ -784270,40 +784270,40 @@ _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 movs r6, 0 ldr r5, =0x085500a4 -_0819677E: +@0819677E: ldrh r0, [r5] bl trainer_flag_check lsls r0, 24 cmp r0, 0 - beq _0819679A + beq @0819679A cmp r6, r7 - bne _08196798 + bne @08196798 adds r0, r4, 0 - b _081967A4 + b @081967A4 .align 2, 0 .pool -_08196798: +@08196798: adds r6, 0x1 -_0819679A: +@0819679A: adds r5, 0x10 adds r4, 0x1 cmp r4, 0x4D - bls _0819677E + bls @0819677E movs r0, 0x4E -_081967A4: +@081967A4: pop {r4-r7} pop {r1} bx r1 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 @@ -784314,7 +784314,7 @@ sub_81967AC: @ 81967AC adds r0, r5, 0 bl sub_8196710 cmp r0, 0 - beq _081967EC + beq @081967EC adds r0, r5, 0 bl sub_819672C ldr r1, =0x02037318 @@ -784322,18 +784322,18 @@ sub_81967AC: @ 81967AC lsrs r0, 16 ldrb r1, [r1, 0x14] cmp r0, r1 - bne _081967EC + bne @081967EC adds r0, r5, 0 adds r1, r6, 0 bl sub_8196864 - b _08196830 + b @08196830 .align 2, 0 .pool -_081967EC: +@081967EC: adds r0, r5, 0 bl sub_8196D74 cmp r0, 0 - beq _0819680A + beq @0819680A adds r0, r5, 0 adds r1, r6, 0 bl sub_8196890 @@ -784341,8 +784341,8 @@ _081967EC: movs r7, 0x1 adds r0, r5, 0 bl sub_80B1E94 - b _08196832 -_0819680A: + b @08196832 +@0819680A: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -784350,18 +784350,18 @@ _0819680A: bl __umodsi3 lsls r0, 16 cmp r0, 0 - beq _08196828 + beq @08196828 adds r0, r5, 0 adds r1, r6, 0 bl sub_81968BC - b _08196830 -_08196828: + b @08196830 +@08196828: adds r0, r5, 0 adds r1, r6, 0 bl sub_8196910 -_08196830: +@08196830: adds r4, r0, 0 -_08196832: +@08196832: adds r0, r5, 0 adds r1, r4, 0 adds r2, r6, 0 @@ -784373,28 +784373,28 @@ _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 ldr r1, =0x0860deb8 -_0819684C: +@0819684C: ldrh r0, [r1] cmp r0, r3 - beq _0819685C + beq @0819685C adds r1, 0x14 adds r2, 0x1 - b _0819684C + b @0819684C .align 2, 0 .pool -_0819685C: +@0819685C: adds r0, r2, 0 pop {r1} bx r1 thumb_func_end sub_8196844 thumb_func_start sub_8196864 -sub_8196864: @ 8196864 +sub_8196864: ; 8196864 ldr r2, =0x0860deb8 lsls r1, r0, 2 adds r1, r0 @@ -784418,7 +784418,7 @@ sub_8196864: @ 8196864 thumb_func_end sub_8196864 thumb_func_start sub_8196890 -sub_8196890: @ 8196890 +sub_8196890: ; 8196890 ldr r2, =0x0860deb8 lsls r1, r0, 2 adds r1, r0 @@ -784442,7 +784442,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 @@ -784461,10 +784461,10 @@ sub_81968BC: @ 81968BC adds r0, r2 ldrh r4, [r0] cmp r4, 0 - bne _081968EC + bne @081968EC movs r0, 0 bl nullsub_12 -_081968EC: +@081968EC: movs r1, 0xFF lsrs r0, r4, 8 subs r0, 0x1 @@ -784484,7 +784484,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 @@ -784494,11 +784494,11 @@ sub_8196910: @ 8196910 movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _081969AC + bne @081969AC movs r5, 0 movs r4, 0 lsls r7, r6, 2 -_0819692C: +@0819692C: lsls r0, r4, 16 lsrs r0, 16 mov r1, sp @@ -784506,14 +784506,14 @@ _0819692C: lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bls _08196940 + bls @08196940 adds r5, 0x1 -_08196940: +@08196940: adds r4, 0x1 cmp r4, 0x6 - ble _0819692C + ble @0819692C cmp r5, 0 - beq _081969AC + beq @081969AC bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -784521,14 +784521,14 @@ _08196940: bl __modsi3 adds r5, r0, 0 movs r4, 0 - b _08196962 -_0819695E: + b @08196962 +@0819695E: subs r5, 0x1 -_08196960: +@08196960: adds r4, 0x1 -_08196962: +@08196962: cmp r4, 0x6 - bgt _08196980 + bgt @08196980 lsls r0, r4, 16 lsrs r0, 16 mov r1, sp @@ -784538,10 +784538,10 @@ _08196962: lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bls _08196960 + bls @08196960 cmp r5, 0 - bne _0819695E -_08196980: + bne @0819695E +@08196980: ldr r0, =0x0203cd88 strh r4, [r0] ldr r1, =0x0860deb8 @@ -784557,10 +784557,10 @@ _08196980: lsls r1, r2, 3 ldr r0, [r0] adds r0, r1 - b _081969D0 + b @081969D0 .align 2, 0 .pool -_081969AC: +@081969AC: ldr r1, =0x0860deb8 lsls r0, r6, 2 adds r0, r6 @@ -784579,7 +784579,7 @@ _081969AC: lsls r2, 3 ldr r0, [r1] adds r0, r2 -_081969D0: +@081969D0: add sp, 0x4 pop {r4-r7} pop {r1} @@ -784589,7 +784589,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 @@ -784604,27 +784604,27 @@ 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 movs r4, 0 ldr r5, =0x0860efa0 -_08196A06: +@08196A06: adds r1, r6, r4 movs r0, 0 ldrsb r0, [r1, r0] cmp r0, 0 - blt _08196A1A + blt @08196A1A adds r1, r0, 0 ldr r2, [r5] adds r0, r7, 0 bl sub_8196A2C -_08196A1A: +@08196A1A: adds r5, 0x4 adds r4, 0x1 cmp r4, 0x2 - ble _08196A06 + ble @08196A06 pop {r4-r7} pop {r0} bx r0 @@ -784633,7 +784633,7 @@ _08196A1A: thumb_func_end sub_81969FC thumb_func_start sub_8196A2C -sub_8196A2C: @ 8196A2C +sub_8196A2C: ; 8196A2C push {lr} ldr r3, =0x0860efac lsls r1, 2 @@ -784648,7 +784648,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, =0x0860deb8 @@ -784660,24 +784660,24 @@ sub_8196A44: @ 8196A44 movs r2, 0 ldr r3, =0x0860efc4 adds r6, r3, 0 -_08196A5A: +@08196A5A: lsls r1, r2, 3 ldrh r0, [r3] cmp r0, r4 - bne _08196A78 + bne @08196A78 adds r0, r6, 0x4 adds r0, r1, r0 ldr r1, [r0] adds r0, r5, 0 bl gf_strcpy - b _08196A90 + b @08196A90 .align 2, 0 .pool -_08196A78: +@08196A78: adds r3, 0x8 adds r2, 0x1 cmp r2, 0x5 - bls _08196A5A + bls @08196A5A lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -784685,7 +784685,7 @@ _08196A78: adds r1, r0 adds r0, r5, 0 bl gf_strcpy -_08196A90: +@08196A90: pop {r4-r6} pop {r0} bx r0 @@ -784694,7 +784694,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 @@ -784710,7 +784710,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 @@ -784720,86 +784720,86 @@ sub_8196AB8: @ 8196AB8 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x13 - bgt _08196AD4 + bgt @08196AD4 movs r0, 0 - b _08196B4A -_08196AD4: + b @08196B4A +@08196AD4: adds r0, r1, 0 subs r0, 0x14 cmp r0, 0x13 - bhi _08196AE0 + bhi @08196AE0 movs r0, 0x1 - b _08196B4A -_08196AE0: + b @08196B4A +@08196AE0: adds r0, r1, 0 subs r0, 0x28 cmp r0, 0x9 - bhi _08196AEC + bhi @08196AEC movs r0, 0x2 - b _08196B4A -_08196AEC: + b @08196B4A +@08196AEC: adds r0, r1, 0 subs r0, 0x32 cmp r0, 0x9 - bhi _08196AF8 + bhi @08196AF8 movs r0, 0x3 - b _08196B4A -_08196AF8: + b @08196B4A +@08196AF8: adds r0, r1, 0 subs r0, 0x3C cmp r0, 0x9 - bhi _08196B04 + bhi @08196B04 movs r0, 0x4 - b _08196B4A -_08196B04: + b @08196B4A +@08196B04: adds r0, r1, 0 subs r0, 0x46 cmp r0, 0x9 - bhi _08196B10 + bhi @08196B10 movs r0, 0x5 - b _08196B4A -_08196B10: + b @08196B4A +@08196B10: adds r0, r1, 0 subs r0, 0x50 cmp r0, 0x4 - bhi _08196B1C + bhi @08196B1C movs r0, 0x6 - b _08196B4A -_08196B1C: + b @08196B4A +@08196B1C: adds r0, r1, 0 subs r0, 0x55 cmp r0, 0x4 - bhi _08196B28 + bhi @08196B28 movs r0, 0x7 - b _08196B4A -_08196B28: + b @08196B4A +@08196B28: adds r0, r1, 0 subs r0, 0x5A cmp r0, 0x3 - bhi _08196B34 + bhi @08196B34 movs r0, 0x8 - b _08196B4A -_08196B34: + b @08196B4A +@08196B34: adds r0, r1, 0 subs r0, 0x5E cmp r0, 0x3 - bhi _08196B40 + bhi @08196B40 movs r0, 0x9 - b _08196B4A -_08196B40: + b @08196B4A +@08196B40: cmp r1, 0x62 - beq _08196B48 + beq @08196B48 movs r0, 0xB - b _08196B4A -_08196B48: + b @08196B4A +@08196B48: movs r0, 0xA -_08196B4A: +@08196B4A: pop {r1} bx r1 thumb_func_end sub_8196AB8 thumb_func_start sub_8196B50 -sub_8196B50: @ 8196B50 +sub_8196B50: ; 8196B50 push {lr} bl GenerateRandomNumber lsls r0, 16 @@ -784809,39 +784809,39 @@ sub_8196B50: @ 8196B50 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x3B - bgt _08196B6C + bgt @08196B6C movs r0, 0 - b _08196B92 -_08196B6C: + b @08196B92 +@08196B6C: adds r0, r1, 0 subs r0, 0x3C cmp r0, 0x1D - bhi _08196B78 + bhi @08196B78 movs r0, 0x1 - b _08196B92 -_08196B78: + b @08196B92 +@08196B78: adds r0, r1, 0 subs r0, 0x5A cmp r0, 0x4 - bhi _08196B84 + bhi @08196B84 movs r0, 0x2 - b _08196B92 -_08196B84: + b @08196B92 +@08196B84: adds r0, r1, 0 subs r0, 0x5F cmp r0, 0x3 - bls _08196B90 + bls @08196B90 movs r0, 0x4 - b _08196B92 -_08196B90: + b @08196B92 +@08196B90: movs r0, 0x3 -_08196B92: +@08196B92: pop {r1} bx r1 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} @@ -784853,27 +784853,27 @@ sub_8196B98: @ 8196B98 ldrb r1, [r0] adds r7, r0, 0 cmp r1, 0xFF - beq _08196C5C + beq @08196C5C ldr r1, =0x085500a4 lsls r0, r2, 4 adds r2, r0, r1 ldrh r4, [r2, 0xA] adds r1, r7, 0 -_08196BBA: +@08196BBA: ldrb r0, [r1] cmp r0, r4 - bne _08196BC8 + bne @08196BC8 ldrb r0, [r1, 0x1] ldrh r5, [r2, 0xC] cmp r0, r5 - beq _08196BD2 -_08196BC8: + beq @08196BD2 +@08196BC8: adds r1, 0x14 adds r3, 0x1 ldrb r0, [r1] cmp r0, 0xFF - bne _08196BBA -_08196BD2: + bne @08196BBA +@08196BD2: adds r1, r7, 0 lsls r0, r3, 2 adds r0, r3 @@ -784881,13 +784881,13 @@ _08196BD2: adds r0, r5, r1 ldrb r0, [r0] cmp r0, 0xFF - beq _08196C5C + beq @08196C5C movs r6, 0 adds r0, r1, 0x4 adds r0, r5, r0 ldr r4, [r0] cmp r4, 0 - beq _08196C02 + beq @08196C02 bl sub_8196AB8 lsls r0, 24 mov r2, sp @@ -784897,13 +784897,13 @@ _08196BD2: ldrh r0, [r0, 0x2] strh r0, [r2] movs r6, 0x1 -_08196C02: +@08196C02: adds r0, r7, 0 adds r0, 0x8 adds r0, r5, r0 ldr r4, [r0] cmp r4, 0 - beq _08196C26 + beq @08196C26 bl sub_8196B50 lsls r0, 24 lsls r1, r6, 1 @@ -784915,9 +784915,9 @@ _08196C02: ldrh r0, [r0, 0x2] strh r0, [r2] adds r6, 0x1 -_08196C26: +@08196C26: cmp r6, 0 - beq _08196C5C + beq @08196C5C bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -784932,14 +784932,14 @@ _08196C26: adds r1, r0 mov r0, r8 bl gf_strcpy - b _08196C62 + b @08196C62 .align 2, 0 .pool -_08196C5C: +@08196C5C: movs r0, 0xFF mov r5, r8 strb r0, [r5] -_08196C62: +@08196C62: add sp, 0x4 pop {r3} mov r8, r3 @@ -784949,7 +784949,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, =0x0860deb8 @@ -784981,24 +784981,24 @@ sub_8196C70: @ 8196C70 lsrs r0, 24 ldrb r1, [r4] cmp r1, 0x1 - beq _08196CD4 + beq @08196CD4 cmp r1, 0x1 - ble _08196CC2 + ble @08196CC2 cmp r1, 0x2 - beq _08196CD0 + beq @08196CD0 cmp r1, 0x3 - beq _08196CD4 -_08196CC2: + beq @08196CD4 +@08196CC2: lsls r0, 3 - b _08196CD6 + b @08196CD6 .align 2, 0 .pool -_08196CD0: +@08196CD0: lsls r0, 3 - b _08196CD6 -_08196CD4: + b @08196CD6 +@08196CD4: lsls r0, 4 -_08196CD6: +@08196CD6: adds r0, r6 ldrh r1, [r0, 0x4] movs r0, 0xB @@ -785015,7 +785015,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, =0x0860eff4 @@ -785032,7 +785032,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 @@ -785040,16 +785040,16 @@ sub_8196D14: @ 8196D14 ldrh r1, [r0, 0x2] adds r6, r0, 0 cmp r1, 0 - beq _08196D34 -_08196D24: + beq @08196D34 +@08196D24: adds r0, r1, 0 movs r1, 0xA bl __divsi3 adds r1, r0, 0 adds r4, 0x1 cmp r1, 0 - bne _08196D24 -_08196D34: + bne @08196D24 +@08196D34: ldrh r1, [r6, 0x2] lsls r3, r4, 24 lsrs r3, 24 @@ -785064,25 +785064,25 @@ _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, =0x0860f010 - b _08196D5C + b @08196D5C .align 2, 0 .pool -_08196D58: +@08196D58: adds r5, 0x2 adds r4, 0x1 -_08196D5C: +@08196D5C: cmp r4, 0x7 - bhi _08196D6C + bhi @08196D6C ldrh r0, [r5] bl flag_check lsls r0, 24 cmp r0, 0 - bne _08196D58 -_08196D6C: + bne @08196D58 +@08196D6C: adds r0, r4, 0 pop {r4,r5} pop {r1} @@ -785090,7 +785090,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 @@ -785098,7 +785098,7 @@ sub_8196D74: @ 8196D74 adds r7, r0, 0 bl sub_8196D4C cmp r0, 0x4 - ble _08196DF4 + ble @08196DF4 bl sub_802F69C adds r4, r0, 0 ldr r0, =0x03005d90 @@ -785132,17 +785132,17 @@ sub_8196D74: @ 8196D74 mov r1, r8 bl __modsi3 cmp r0, r9 - bge _08196DF4 + bge @08196DF4 bl sub_8196774 cmp r0, r7 - bne _08196DF4 + bne @08196DF4 movs r0, 0x1 - b _08196DF6 + b @08196DF6 .align 2, 0 .pool -_08196DF4: +@08196DF4: movs r0, 0 -_08196DF6: +@08196DF6: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -785152,206 +785152,206 @@ _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 lsrs r0, 16 movs r4, 0 cmp r0, 0x6 - bls _08196E14 - b _08196F7E -_08196E14: + bls @08196E14 + b @08196F7E +@08196E14: lsls r0, 2 - ldr r1, =_08196E24 + ldr r1, =@08196E24 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08196E24: - .4byte _08196E9C - .4byte _08196E40 - .4byte _08196ED0 - .4byte _08196F38 - .4byte _08196E74 - .4byte _08196F04 - .4byte _08196F60 -_08196E40: +@08196E24: + .4byte @08196E9C + .4byte @08196E40 + .4byte @08196ED0 + .4byte @08196F38 + .4byte @08196E74 + .4byte @08196F04 + .4byte @08196F60 +@08196E40: movs r3, 0 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000d14 adds r0, r1 -_08196E4A: +@08196E4A: lsls r1, r3, 2 adds r3, 0x1 adds r1, r0 movs r2, 0x1 -_08196E52: +@08196E52: ldrh r6, [r1] cmp r4, r6 - bcs _08196E5A + bcs @08196E5A ldrh r4, [r1] -_08196E5A: +@08196E5A: adds r1, 0x2 subs r2, 0x1 cmp r2, 0 - bge _08196E52 + bge @08196E52 cmp r3, 0x1 - ble _08196E4A + ble @08196E4A movs r0, 0x3 - b _08196F7C + b @08196F7C .align 2, 0 .pool -_08196E74: +@08196E74: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000e08 adds r0, r1 movs r3, 0x1 -_08196E7E: +@08196E7E: ldrh r6, [r0] cmp r4, r6 - bcs _08196E86 + bcs @08196E86 ldrh r4, [r0] -_08196E86: +@08196E86: adds r0, 0x2 subs r3, 0x1 cmp r3, 0 - bge _08196E7E + bge @08196E7E movs r0, 0x4 - b _08196F7C + b @08196F7C .align 2, 0 .pool -_08196E9C: +@08196E9C: movs r3, 0 ldr r0, =0x03005d90 ldr r0, [r0] movs r1, 0xCF lsls r1, 4 adds r0, r1 -_08196EA8: +@08196EA8: lsls r1, r3, 2 adds r3, 0x1 adds r1, r0 movs r2, 0x1 -_08196EB0: +@08196EB0: ldrh r6, [r1] cmp r4, r6 - bcs _08196EB8 + bcs @08196EB8 ldrh r4, [r1] -_08196EB8: +@08196EB8: adds r1, 0x2 subs r2, 0x1 cmp r2, 0 - bge _08196EB0 + bge @08196EB0 movs r2, 0x2 cmp r3, 0x3 - ble _08196EA8 + ble @08196EA8 str r2, [r5] - b _08196F7E + b @08196F7E .align 2, 0 .pool -_08196ED0: +@08196ED0: movs r3, 0 ldr r0, =0x03005d90 ldr r0, [r0] movs r1, 0xDD lsls r1, 4 adds r0, r1 -_08196EDC: +@08196EDC: lsls r1, r3, 2 adds r3, 0x1 adds r1, r0 movs r2, 0x1 -_08196EE4: +@08196EE4: ldrh r6, [r1] cmp r4, r6 - bcs _08196EEC + bcs @08196EEC ldrh r4, [r1] -_08196EEC: +@08196EEC: adds r1, 0x2 subs r2, 0x1 cmp r2, 0 - bge _08196EE4 + bge @08196EE4 movs r2, 0x2 cmp r3, 0x1 - ble _08196EDC + ble @08196EDC str r2, [r5] - b _08196F7E + b @08196F7E .align 2, 0 .pool -_08196F04: +@08196F04: movs r3, 0 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000dea adds r0, r1 -_08196F0E: +@08196F0E: lsls r1, r3, 2 adds r3, 0x1 adds r1, r0 movs r2, 0x1 -_08196F16: +@08196F16: ldrh r6, [r1] cmp r4, r6 - bcs _08196F1E + bcs @08196F1E ldrh r4, [r1] -_08196F1E: +@08196F1E: adds r1, 0x2 subs r2, 0x1 cmp r2, 0 - bge _08196F16 + bge @08196F16 movs r2, 0x2 cmp r3, 0x1 - ble _08196F0E + ble @08196F0E str r2, [r5] - b _08196F7E + b @08196F7E .align 2, 0 .pool -_08196F38: +@08196F38: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000dde adds r0, r1 movs r3, 0x1 -_08196F42: +@08196F42: ldrh r6, [r0] cmp r4, r6 - bcs _08196F4A + bcs @08196F4A ldrh r4, [r0] -_08196F4A: +@08196F4A: adds r0, 0x2 subs r3, 0x1 cmp r3, 0 - bge _08196F42 + bge @08196F42 movs r3, 0x2 str r3, [r5] - b _08196F7E + b @08196F7E .align 2, 0 .pool -_08196F60: +@08196F60: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000e1e adds r0, r1 movs r3, 0x1 -_08196F6A: +@08196F6A: ldrh r6, [r0] cmp r4, r6 - bcs _08196F72 + bcs @08196F72 ldrh r4, [r0] -_08196F72: +@08196F72: adds r0, 0x2 subs r3, 0x1 cmp r3, 0 - bge _08196F6A + bge @08196F6A movs r0, 0x5 -_08196F7C: +@08196F7C: str r0, [r5] -_08196F7E: +@08196F7E: adds r0, r4, 0 pop {r4-r6} pop {r1} @@ -785361,107 +785361,107 @@ _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 cmp r4, 0x9 - bhi _08196F9E + bhi @08196F9E movs r0, 0 - b _0819707A -_08196F9E: + b @0819707A +@08196F9E: cmp r4, 0x13 - bhi _08196FA6 + bhi @08196FA6 movs r0, 0x1 - b _0819707A -_08196FA6: + b @0819707A +@08196FA6: cmp r4, 0x1D - bhi _08196FAE + bhi @08196FAE movs r0, 0x2 - b _0819707A -_08196FAE: + b @0819707A +@08196FAE: cmp r4, 0x27 - bhi _08196FB6 + bhi @08196FB6 movs r0, 0x3 - b _0819707A -_08196FB6: + b @0819707A +@08196FB6: cmp r4, 0x31 - bhi _08196FBE + bhi @08196FBE movs r0, 0x4 - b _0819707A -_08196FBE: + b @0819707A +@08196FBE: cmp r4, 0x3B - bhi _08196FC6 + bhi @08196FC6 movs r0, 0x5 - b _0819707A -_08196FC6: + b @0819707A +@08196FC6: cmp r4, 0x45 - bhi _08196FCE + bhi @08196FCE movs r0, 0x6 - b _0819707A -_08196FCE: + b @0819707A +@08196FCE: cmp r4, 0x4F - bhi _08196FD6 + bhi @08196FD6 movs r0, 0x7 - b _0819707A -_08196FD6: + b @0819707A +@08196FD6: cmp r4, 0x59 - bhi _08196FDE + bhi @08196FDE movs r0, 0x8 - b _0819707A -_08196FDE: + b @0819707A +@08196FDE: cmp r4, 0x63 - bhi _08196FE6 + bhi @08196FE6 movs r0, 0x9 - b _0819707A -_08196FE6: + b @0819707A +@08196FE6: cmp r4, 0x6D - bhi _08196FEE + bhi @08196FEE movs r0, 0xA - b _0819707A -_08196FEE: + b @0819707A +@08196FEE: cmp r4, 0x77 - bhi _08196FF6 + bhi @08196FF6 movs r0, 0xB - b _0819707A -_08196FF6: + b @0819707A +@08196FF6: cmp r4, 0x81 - bhi _08196FFE + bhi @08196FFE movs r0, 0xC - b _0819707A -_08196FFE: + b @0819707A +@08196FFE: cmp r4, 0x8B - bhi _08197006 + bhi @08197006 movs r0, 0xD - b _0819707A -_08197006: + b @0819707A +@08197006: cmp r4, 0x95 - bhi _0819700E + bhi @0819700E movs r0, 0xE - b _0819707A -_0819700E: + b @0819707A +@0819700E: cmp r4, 0x9F - bhi _08197016 + bhi @08197016 movs r0, 0xF - b _0819707A -_08197016: + b @0819707A +@08197016: cmp r4, 0xA9 - bhi _0819701E + bhi @0819701E movs r0, 0x10 - b _0819707A -_0819701E: + b @0819707A +@0819701E: cmp r4, 0xB3 - bhi _08197026 + bhi @08197026 movs r0, 0x11 - b _0819707A -_08197026: + b @0819707A +@08197026: cmp r4, 0xBD - bhi _0819702E + bhi @0819702E movs r0, 0x12 - b _0819707A -_0819702E: + b @0819707A +@0819702E: cmp r4, 0xC7 - bls _08197078 + bls @08197078 movs r0, 0xCD lsls r0, 1 bl SpeciesToNationalPokedexNum @@ -785471,11 +785471,11 @@ _0819702E: bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - beq _08197050 + beq @08197050 subs r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 -_08197050: +@08197050: ldr r0, =0x00000199 bl SpeciesToNationalPokedexNum lsls r0, 16 @@ -785484,27 +785484,27 @@ _08197050: bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - beq _0819706C + beq @0819706C subs r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 -_0819706C: +@0819706C: cmp r4, 0xC7 - bls _08197078 + bls @08197078 movs r0, 0x14 - b _0819707A + b @0819707A .align 2, 0 .pool -_08197078: +@08197078: movs r0, 0x13 -_0819707A: +@0819707A: pop {r4} pop {r1} bx r1 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 @@ -785516,12 +785516,12 @@ sub_8197080: @ 8197080 bl malloc adds r7, r0, 0 cmp r7, 0 - bne _081970A2 + bne @081970A2 movs r0, 0xFF mov r1, r8 strb r0, [r1] - b _0819715C -_081970A2: + b @0819715C +@081970A2: movs r0, 0 bl sub_80C0844 lsls r0, 16 @@ -785573,7 +785573,7 @@ _081970A2: adds r5, r0, 0 bl sub_809D42C cmp r0, 0 - beq _08197156 + beq @08197156 strb r6, [r5] adds r5, 0x1 movs r0, 0 @@ -785597,10 +785597,10 @@ _081970A2: ldr r1, =0x082a633d adds r0, r5, 0 bl ExpandTextCodes -_08197156: +@08197156: adds r0, r7, 0 bl free -_0819715C: +@0819715C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -785613,7 +785613,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 @@ -785644,7 +785644,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} @@ -785652,7 +785652,7 @@ sub_81971C4: @ 81971C4 thumb_func_end sub_81971C4 thumb_func_start sub_81971D0 -sub_81971D0: @ 81971D0 +sub_81971D0: ; 81971D0 push {lr} ldr r0, =0x0860f098 bl Window_InitFromTemplates @@ -785668,7 +785668,7 @@ sub_81971D0: @ 81971D0 thumb_func_end sub_81971D0 thumb_func_start sub_81971F4 -sub_81971F4: @ 81971F4 +sub_81971F4: ; 81971F4 push {lr} bl Window_FreeMemory pop {r0} @@ -785676,7 +785676,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 @@ -785693,7 +785693,7 @@ sub_8197200: @ 8197200 thumb_func_end sub_8197200 thumb_func_start sub_8197224 -sub_8197224: @ 8197224 +sub_8197224: ; 8197224 push {lr} bl run_remoboxes movs r0, 0 @@ -785705,7 +785705,7 @@ sub_8197224: @ 8197224 thumb_func_end sub_8197224 thumb_func_start text_box_related_one -text_box_related_one: @ 8197238 +text_box_related_one: ; 8197238 push {r4-r7,lr} mov r7, r8 push {r7} @@ -785778,7 +785778,7 @@ text_box_related_one: @ 8197238 thumb_func_end text_box_related_one thumb_func_start get_map_name -get_map_name: @ 81972C4 +get_map_name: ; 81972C4 push {r4,r5,lr} sub sp, 0x10 lsls r0, 24 @@ -785816,7 +785816,7 @@ get_map_name: @ 81972C4 thumb_func_end get_map_name thumb_func_start sub_8197310 -sub_8197310: @ 8197310 +sub_8197310: ; 8197310 push {r4,lr} sub sp, 0x10 lsls r0, 24 @@ -785854,7 +785854,7 @@ sub_8197310: @ 8197310 thumb_func_end sub_8197310 thumb_func_start sub_819735C -sub_819735C: @ 819735C +sub_819735C: ; 819735C push {r4,r5,lr} sub sp, 0x10 adds r3, r1, 0 @@ -785891,7 +785891,7 @@ sub_819735C: @ 819735C thumb_func_end sub_819735C thumb_func_start sub_81973A4 -sub_81973A4: @ 81973A4 +sub_81973A4: ; 81973A4 push {lr} movs r1, 0x80 lsls r1, 2 @@ -785908,7 +785908,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 @@ -785924,11 +785924,11 @@ sub_81973C4: @ 81973C4 adds r0, r5, 0 bl Window_WriteStandardTileMap cmp r4, 0x1 - bne _081973F2 + bne @081973F2 adds r0, r5, 0 movs r1, 0x3 bl Window_CopyToVram -_081973F2: +@081973F2: pop {r4,r5} pop {r0} bx r0 @@ -785937,7 +785937,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 @@ -785953,11 +785953,11 @@ sub_81973FC: @ 81973FC adds r0, r5, 0 bl Window_WriteStandardTileMap cmp r4, 0x1 - bne _0819742A + bne @0819742A adds r0, r5, 0 movs r1, 0x3 bl Window_CopyToVram -_0819742A: +@0819742A: pop {r4,r5} pop {r0} bx r0 @@ -785966,7 +785966,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 @@ -785982,11 +785982,11 @@ sub_8197434: @ 8197434 adds r0, r5, 0 bl Window_FillTileMap cmp r4, 0x1 - bne _08197462 + bne @08197462 adds r0, r5, 0 movs r1, 0x3 bl Window_CopyToVram -_08197462: +@08197462: pop {r4,r5} pop {r0} bx r0 @@ -785995,7 +785995,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 @@ -786011,11 +786011,11 @@ sub_819746C: @ 819746C adds r0, r5, 0 bl Window_FillTileMap cmp r4, 0x1 - bne _0819749A + bne @0819749A adds r0, r5, 0 movs r1, 0x3 bl Window_CopyToVram -_0819749A: +@0819749A: pop {r4,r5} pop {r0} bx r0 @@ -786024,7 +786024,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 @@ -786093,13 +786093,13 @@ sub_81974A4: @ 81974A4 ldr r0, [sp, 0x14] add r0, r9 cmp r9, r0 - bge _08197578 + bge @08197578 mov r3, r8 str r3, [sp, 0x18] movs r6, 0x1 movs r0, 0xE mov r8, r0 -_0819753E: +@0819753E: lsls r4, r5, 24 lsrs r4, 24 str r6, [sp] @@ -786126,8 +786126,8 @@ _0819753E: ldr r0, [sp, 0x14] add r0, r9 cmp r5, r0 - blt _0819753E -_08197578: + blt @0819753E +@08197578: ldr r1, =0x0000021a ldr r2, [sp, 0xC] subs r2, 0x1 @@ -786180,7 +786180,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 @@ -786376,7 +786376,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 @@ -786415,7 +786415,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 @@ -786458,8 +786458,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 @@ -786474,7 +786474,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 @@ -786499,7 +786499,7 @@ sub_819786C: @ 819786C thumb_func_end sub_819786C thumb_func_start sub_819789C -sub_819789C: @ 819789C +sub_819789C: ; 819789C push {lr} ldr r0, =0x0860f074 movs r1, 0xE0 @@ -786512,7 +786512,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 @@ -786527,7 +786527,7 @@ sub_81978B0: @ 81978B0 thumb_func_end sub_81978B0 thumb_func_start sub_81978C8 -sub_81978C8: @ 81978C8 +sub_81978C8: ; 81978C8 ldr r0, =0x0860f074 bx lr .align 2, 0 @@ -786535,14 +786535,14 @@ sub_81978C8: @ 81978C8 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 cmp r1, 0xF - bls _081978DC + bls @081978DC movs r1, 0 -_081978DC: +@081978DC: ldr r0, =0x0860f074 lsls r1, 1 adds r1, r0 @@ -786554,7 +786554,7 @@ _081978DC: thumb_func_end sub_81978D0 thumb_func_start sub_81978EC -sub_81978EC: @ 81978EC +sub_81978EC: ; 81978EC push {r4-r6,lr} sub sp, 0x10 adds r4, r0, 0 @@ -786587,7 +786587,7 @@ sub_81978EC: @ 81978EC thumb_func_end sub_81978EC thumb_func_start sub_8197930 -sub_8197930: @ 8197930 +sub_8197930: ; 8197930 push {lr} ldr r0, =0x0860f0a8 movs r1, 0x85 @@ -786602,7 +786602,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 @@ -786619,31 +786619,31 @@ 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] movs r0, 0x8 ands r0, r1 cmp r0, 0 - bne _08197988 + bne @08197988 ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x14] lsls r0, 29 lsrs r0, 29 - b _0819798A + b @0819798A .align 2, 0 .pool -_08197988: +@08197988: movs r0, 0x1 -_0819798A: +@0819798A: pop {r1} bx r1 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] @@ -786651,14 +786651,14 @@ sav2_get_text_speed: @ 8197990 lsls r0, r1, 29 lsrs r0, 29 cmp r0, 0x2 - bls _081979AC + bls @081979AC movs r0, 0x8 negs r0, r0 ands r0, r1 movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x14] -_081979AC: +@081979AC: bl sub_8197964 ldr r1, =0x0860f094 adds r0, r1 @@ -786670,7 +786670,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 @@ -786678,7 +786678,7 @@ sub_81979C4: @ 81979C4 ldr r4, =0x0203cd8c ldrb r0, [r4] cmp r0, 0xFF - bne _081979F6 + bne @081979F6 lsls r0, r1, 25 movs r1, 0x80 lsls r1, 18 @@ -786695,7 +786695,7 @@ sub_81979C4: @ 81979C4 movs r3, 0x7 bl sub_8198AA4 strb r0, [r4] -_081979F6: +@081979F6: ldrb r0, [r4] add sp, 0xC pop {r4} @@ -786706,7 +786706,7 @@ _081979F6: thumb_func_end sub_81979C4 thumb_func_start sub_8197A08 -sub_8197A08: @ 8197A08 +sub_8197A08: ; 8197A08 ldr r0, =0x0203cd8c ldrb r0, [r0] bx lr @@ -786715,16 +786715,16 @@ sub_8197A08: @ 8197A08 thumb_func_end sub_8197A08 thumb_func_start sub_8197A14 -sub_8197A14: @ 8197A14 +sub_8197A14: ; 8197A14 push {r4,lr} ldr r4, =0x0203cd8c ldrb r0, [r4] cmp r0, 0xFF - beq _08197A26 + beq @08197A26 bl Window_Remove movs r0, 0xFF strb r0, [r4] -_08197A26: +@08197A26: pop {r4} pop {r0} bx r0 @@ -786733,27 +786733,27 @@ _08197A26: thumb_func_end sub_8197A14 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 sub_8197A40 -sub_8197A40: @ 8197A40 +sub_8197A40: ; 8197A40 push {r4,lr} sub sp, 0xC ldr r4, =0x0203cd8d ldrb r0, [r4] cmp r0, 0xFF - bne _08197A66 + bne @08197A66 movs r0, 0x3 str r0, [sp] movs r0, 0xE @@ -786766,7 +786766,7 @@ sub_8197A40: @ 8197A40 movs r3, 0xA bl sub_8198AA4 strb r0, [r4] -_08197A66: +@08197A66: ldrb r0, [r4] add sp, 0xC pop {r4} @@ -786777,7 +786777,7 @@ _08197A66: thumb_func_end sub_8197A40 thumb_func_start rboxid_upload_textbox_1_no_pal -rboxid_upload_textbox_1_no_pal: @ 8197A74 +rboxid_upload_textbox_1_no_pal: ; 8197A74 ldr r0, =0x0203cd8d ldrb r0, [r0] bx lr @@ -786786,16 +786786,16 @@ rboxid_upload_textbox_1_no_pal: @ 8197A74 thumb_func_end rboxid_upload_textbox_1_no_pal thumb_func_start sub_8197A80 -sub_8197A80: @ 8197A80 +sub_8197A80: ; 8197A80 push {r4,lr} ldr r4, =0x0203cd8d ldrb r0, [r4] cmp r0, 0xFF - beq _08197A92 + beq @08197A92 bl Window_Remove movs r0, 0xFF strb r0, [r4] -_08197A92: +@08197A92: pop {r4} pop {r0} bx r0 @@ -786804,7 +786804,7 @@ _08197A92: thumb_func_end sub_8197A80 thumb_func_start sub_8197A9C -sub_8197A9C: @ 8197A9C +sub_8197A9C: ; 8197A9C push {r4,r5,lr} sub sp, 0x10 adds r5, r1, 0 @@ -786842,7 +786842,7 @@ sub_8197A9C: @ 8197A9C thumb_func_end sub_8197A9C thumb_func_start sub_8197AE8 -sub_8197AE8: @ 8197AE8 +sub_8197AE8: ; 8197AE8 push {r4,lr} sub sp, 0xC adds r4, r0, 0 @@ -786859,10 +786859,10 @@ sub_8197AE8: @ 8197AE8 movs r3, 0 bl Bg_FillWramTileMapRectWithTileAndPalette cmp r4, 0x1 - bne _08197B12 + bne @08197B12 movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram -_08197B12: +@08197B12: add sp, 0xC pop {r4} pop {r0} @@ -786870,7 +786870,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 @@ -786890,11 +786890,11 @@ sub_8197B1C: @ 8197B1C adds r0, r5, 0 bl Window_WriteStandardTileMap cmp r4, 0x1 - bne _08197B52 + bne @08197B52 adds r0, r5, 0 movs r1, 0x3 bl Window_CopyToVram -_08197B52: +@08197B52: pop {r4,r5} pop {r0} bx r0 @@ -786903,7 +786903,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 @@ -786926,11 +786926,11 @@ sub_8197B64: @ 8197B64 adds r0, r6, 0 bl Window_WriteStandardTileMap cmp r4, 0x1 - bne _08197BA2 + bne @08197BA2 adds r0, r6, 0 movs r1, 0x3 bl Window_CopyToVram -_08197BA2: +@08197BA2: pop {r4-r6} pop {r0} bx r0 @@ -786939,7 +786939,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 @@ -787207,7 +787207,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 @@ -787223,11 +787223,11 @@ sub_8197DF8: @ 8197DF8 adds r0, r5, 0 bl Window_FillTileMap cmp r4, 0x1 - bne _08197E26 + bne @08197E26 adds r0, r5, 0 movs r1, 0x3 bl Window_CopyToVram -_08197E26: +@08197E26: pop {r4,r5} pop {r0} bx r0 @@ -787236,7 +787236,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 @@ -787278,8 +787278,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 @@ -787299,11 +787299,11 @@ SetWindowBorderStyle: @ 8197E80 adds r0, r5, 0 bl Window_WriteStandardTileMap cmp r4, 0x1 - bne _08197EB6 + bne @08197EB6 adds r0, r5, 0 movs r1, 0x3 bl Window_CopyToVram -_08197EB6: +@08197EB6: pop {r4,r5} pop {r0} bx r0 @@ -787312,7 +787312,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 @@ -787335,11 +787335,11 @@ sub_8197EC8: @ 8197EC8 adds r0, r6, 0 bl Window_WriteStandardTileMap cmp r4, 0x1 - bne _08197F06 + bne @08197F06 adds r0, r6, 0 movs r1, 0x3 bl Window_CopyToVram -_08197F06: +@08197F06: pop {r4-r6} pop {r0} bx r0 @@ -787348,7 +787348,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 @@ -787513,7 +787513,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 @@ -787529,11 +787529,11 @@ sub_8198070: @ 8198070 adds r0, r5, 0 bl Window_FillTileMap cmp r4, 0x1 - bne _0819809E + bne @0819809E adds r0, r5, 0 movs r1, 0x3 bl Window_CopyToVram -_0819809E: +@0819809E: pop {r4,r5} pop {r0} bx r0 @@ -787542,7 +787542,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 @@ -787580,7 +787580,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} @@ -787602,15 +787602,15 @@ sub_81980F0: @ 81980F0 movs r2, 0x8 bl memset cmp r6, 0x3 - bls _08198126 + bls @08198126 movs r1, 0 mov r0, sp strb r1, [r0] - b _0819812A -_08198126: + b @0819812A +@08198126: mov r0, sp strb r6, [r0] -_0819812A: +@0819812A: mov r1, sp mov r0, r8 strb r0, [r1, 0x2] @@ -787627,15 +787627,15 @@ _0819812A: bl Window_AddFromTemplate strb r0, [r4] cmp r5, 0xF - bls _08198158 + bls @08198158 movs r5, 0xF0 - b _0819815C + b @0819815C .align 2, 0 .pool -_08198158: +@08198158: lsls r0, r5, 28 lsrs r5, r0, 24 -_0819815C: +@0819815C: ldr r0, =0x0860f0b0 adds r1, r5, 0 movs r2, 0x20 @@ -787653,7 +787653,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} @@ -787667,7 +787667,7 @@ sub_8198180: @ 8198180 ldr r5, =0x0203cda0 ldrb r0, [r5] cmp r0, 0xFF - beq _081981EE + beq @081981EE bl Window_WriteStandardTileMap ldrb r0, [r5] movs r1, 0xFF @@ -787699,11 +787699,11 @@ sub_8198180: @ 8198180 bl box_print mov r0, r8 cmp r0, 0 - beq _081981EE + beq @081981EE ldrb r0, [r5] movs r1, 0x3 bl Window_CopyToVram -_081981EE: +@081981EE: add sp, 0xC pop {r3} mov r8, r3 @@ -787715,7 +787715,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 @@ -787738,20 +787738,20 @@ sub_8198204: @ 8198204 ldrb r1, [r0] adds r7, r0, 0 cmp r1, 0xFF - beq _081982C8 + beq @081982C8 cmp r2, 0 - beq _08198244 + beq @08198244 add r0, sp, 0x14 strb r4, [r0] adds r1, r0, 0 - b _0819824A + b @0819824A .align 2, 0 .pool -_08198244: +@08198244: add r1, sp, 0x14 movs r0, 0xF strb r0, [r1] -_0819824A: +@0819824A: movs r0, 0x1 strb r0, [r1, 0x1] movs r0, 0x2 @@ -787763,7 +787763,7 @@ _0819824A: movs r1, 0xFF bl Window_FastFillPixels cmp r6, 0 - beq _0819829E + beq @0819829E movs r0, 0 adds r1, r6, 0 movs r2, 0 @@ -787789,7 +787789,7 @@ _0819824A: str r6, [sp, 0x8] movs r3, 0x1 bl box_print -_0819829E: +@0819829E: ldrb r0, [r7] movs r1, 0 str r1, [sp] @@ -787805,11 +787805,11 @@ _0819829E: bl sub_8199EEC mov r2, r9 cmp r2, 0 - beq _081982C8 + beq @081982C8 ldrb r0, [r7] movs r1, 0x3 bl Window_CopyToVram -_081982C8: +@081982C8: add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -787821,15 +787821,15 @@ _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] cmp r0, 0xFF - beq _081982E8 + beq @081982E8 movs r1, 0x3 bl Window_CopyToVram -_081982E8: +@081982E8: pop {r0} bx r0 .align 2, 0 @@ -787837,18 +787837,18 @@ _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] cmp r0, 0xFF - beq _08198308 + beq @08198308 movs r1, 0xFF bl Window_FastFillPixels ldrb r0, [r4] movs r1, 0x3 bl Window_CopyToVram -_08198308: +@08198308: pop {r4} pop {r0} bx r0 @@ -787857,12 +787857,12 @@ _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] cmp r0, 0xFF - beq _0819833C + beq @0819833C movs r1, 0 bl Window_FastFillPixels ldrb r0, [r4] @@ -787874,7 +787874,7 @@ sub_8198314: @ 8198314 bl Window_Remove movs r0, 0xFF strb r0, [r4] -_0819833C: +@0819833C: pop {r4} pop {r0} bx r0 @@ -787883,7 +787883,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} @@ -787911,19 +787911,19 @@ sub_8198348: @ 8198348 mov r4, r12 strb r4, [r5, 0xB] cmp r7, 0 - blt _08198388 + blt @08198388 movs r0, 0x4 ldrsb r0, [r5, r0] cmp r7, r0 - ble _08198390 -_08198388: + ble @08198390 +@08198388: strb r6, [r5, 0x2] - b _08198392 + b @08198392 .align 2, 0 .pool -_08198390: +@08198390: strb r7, [r5, 0x2] -_08198392: +@08198392: movs r0, 0 bl MoveMenuCursor ldr r0, =0x0203cd90 @@ -787938,7 +787938,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] @@ -787973,7 +787973,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} @@ -788021,8 +788021,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 @@ -788092,8 +788092,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] @@ -788106,21 +788106,21 @@ MoveMenuCursor: @ 81984D8 ldrsb r0, [r1, r0] adds r4, r1, 0 cmp r2, r0 - bge _081984FC + bge @081984FC ldrb r0, [r4, 0x4] - b _0819850A + b @0819850A .align 2, 0 .pool -_081984FC: +@081984FC: movs r0, 0x4 ldrsb r0, [r4, r0] cmp r2, r0 - ble _08198508 + ble @08198508 ldrb r0, [r4, 0x3] - b _0819850A -_08198508: + b @0819850A +@08198508: adds r0, r3, r5 -_0819850A: +@0819850A: strb r0, [r4, 0x2] ldrb r1, [r4, 0x2] adds r0, r5, 0 @@ -788132,8 +788132,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] @@ -788146,21 +788146,21 @@ MoveMenuCursorNoWrapAround: @ 819851C ldrsb r0, [r1, r0] adds r4, r1, 0 cmp r2, r0 - bge _08198540 + bge @08198540 ldrb r0, [r4, 0x3] - b _0819854E + b @0819854E .align 2, 0 .pool -_08198540: +@08198540: movs r0, 0x4 ldrsb r0, [r4, r0] cmp r2, r0 - ble _0819854C + ble @0819854C ldrb r0, [r4, 0x4] - b _0819854E -_0819854C: + b @0819854E +@0819854C: adds r0, r3, r5 -_0819854E: +@0819854E: strb r0, [r4, 0x2] ldrb r1, [r4, 0x2] adds r0, r5, 0 @@ -788172,7 +788172,7 @@ _0819854E: thumb_func_end MoveMenuCursorNoWrapAround thumb_func_start GetMenuCursorPos -GetMenuCursorPos: @ 8198560 +GetMenuCursorPos: ; 8198560 ldr r0, =0x0203cd90 ldrb r0, [r0, 0x2] bx lr @@ -788181,66 +788181,66 @@ GetMenuCursorPos: @ 8198560 thumb_func_end GetMenuCursorPos thumb_func_start ProcessMenuInput -ProcessMenuInput: @ 819856C +ProcessMenuInput: ; 819856C push {r4,lr} ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08198598 + beq @08198598 ldr r4, =0x0203cd90 ldrb r0, [r4, 0xB] cmp r0, 0 - bne _08198588 + bne @08198588 movs r0, 0x5 bl audio_play -_08198588: +@08198588: movs r0, 0x2 ldrsb r0, [r4, r0] - b _081985D2 + b @081985D2 .align 2, 0 .pool -_08198598: +@08198598: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081985A6 + beq @081985A6 movs r0, 0x1 negs r0, r0 - b _081985D2 -_081985A6: + b @081985D2 +@081985A6: movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _081985BA + beq @081985BA movs r0, 0x5 bl audio_play movs r0, 0x1 negs r0, r0 - b _081985CA -_081985BA: + b @081985CA +@081985BA: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081985CE + beq @081985CE movs r0, 0x5 bl audio_play movs r0, 0x1 -_081985CA: +@081985CA: bl MoveMenuCursor -_081985CE: +@081985CE: movs r0, 0x2 negs r0, r0 -_081985D2: +@081985D2: pop {r4} pop {r1} bx r1 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] @@ -788250,121 +788250,121 @@ ProcessMenuInputNoWrapAround: @ 81985D8 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08198608 + beq @08198608 ldrb r0, [r4, 0xB] cmp r0, 0 - bne _081985F8 + bne @081985F8 movs r0, 0x5 bl audio_play -_081985F8: +@081985F8: movs r0, 0x2 ldrsb r0, [r4, r0] - b _08198650 + b @08198650 .align 2, 0 .pool -_08198608: +@08198608: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08198616 + beq @08198616 movs r0, 0x1 negs r0, r0 - b _08198650 -_08198616: + b @08198650 +@08198616: movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _08198630 + beq @08198630 movs r0, 0x1 negs r0, r0 bl MoveMenuCursorNoWrapAround lsls r0, 24 lsrs r0, 24 cmp r5, r0 - beq _0819864C - b _08198646 -_08198630: + beq @0819864C + b @08198646 +@08198630: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0819864C + beq @0819864C movs r0, 0x1 bl MoveMenuCursorNoWrapAround lsls r0, 24 lsrs r0, 24 cmp r6, r0 - beq _0819864C -_08198646: + beq @0819864C +@08198646: movs r0, 0x5 bl audio_play -_0819864C: +@0819864C: movs r0, 0x2 negs r0, r0 -_08198650: +@08198650: pop {r4-r6} pop {r1} bx r1 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] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08198684 + beq @08198684 ldr r4, =0x0203cd90 ldrb r0, [r4, 0xB] cmp r0, 0 - bne _08198674 + bne @08198674 movs r0, 0x5 bl audio_play -_08198674: +@08198674: movs r0, 0x2 ldrsb r0, [r4, r0] - b _081986BC + b @081986BC .align 2, 0 .pool -_08198684: +@08198684: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08198692 + beq @08198692 movs r0, 0x1 negs r0, r0 - b _081986BC -_08198692: + b @081986BC +@08198692: ldrh r0, [r2, 0x30] movs r1, 0xF0 ands r1, r0 cmp r1, 0x40 - bne _081986A8 + bne @081986A8 movs r0, 0x5 bl audio_play movs r0, 0x1 negs r0, r0 - b _081986B4 -_081986A8: + b @081986B4 +@081986A8: cmp r1, 0x80 - bne _081986B8 + bne @081986B8 movs r0, 0x5 bl audio_play movs r0, 0x1 -_081986B4: +@081986B4: bl MoveMenuCursor -_081986B8: +@081986B8: movs r0, 0x2 negs r0, r0 -_081986BC: +@081986BC: pop {r4} pop {r1} bx r1 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] @@ -788374,63 +788374,63 @@ ProcessMenuInputNoWrapAround_other: @ 81986C4 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081986F4 + beq @081986F4 ldrb r0, [r4, 0xB] cmp r0, 0 - bne _081986E4 + bne @081986E4 movs r0, 0x5 bl audio_play -_081986E4: +@081986E4: movs r0, 0x2 ldrsb r0, [r4, r0] - b _0819873A + b @0819873A .align 2, 0 .pool -_081986F4: +@081986F4: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08198702 + beq @08198702 movs r0, 0x1 negs r0, r0 - b _0819873A -_08198702: + b @0819873A +@08198702: ldrh r0, [r2, 0x30] movs r1, 0xF0 ands r1, r0 cmp r1, 0x40 - bne _0819871E + bne @0819871E movs r0, 0x1 negs r0, r0 bl MoveMenuCursorNoWrapAround lsls r0, 24 lsrs r0, 24 cmp r5, r0 - beq _08198736 - b _08198730 -_0819871E: + beq @08198736 + b @08198730 +@0819871E: cmp r1, 0x80 - bne _08198736 + bne @08198736 movs r0, 0x1 bl MoveMenuCursorNoWrapAround lsls r0, 24 lsrs r0, 24 cmp r6, r0 - beq _08198736 -_08198730: + beq @08198736 +@08198730: movs r0, 0x5 bl audio_play -_08198736: +@08198736: movs r0, 0x2 negs r0, r0 -_0819873A: +@0819873A: pop {r4-r6} pop {r1} bx r1 thumb_func_end ProcessMenuInputNoWrapAround_other thumb_func_start PrintTextArray -PrintTextArray: @ 8198740 +PrintTextArray: ; 8198740 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -788456,8 +788456,8 @@ PrintTextArray: @ 8198740 lsrs r5, 24 movs r4, 0 cmp r4, r5 - bcs _081987A4 -_08198774: + bcs @081987A4 +@08198774: lsls r0, r4, 3 ldr r1, [sp, 0x34] adds r0, r1 @@ -788480,8 +788480,8 @@ _08198774: lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc _08198774 -_081987A4: + bcc @08198774 +@081987A4: adds r0, r6, 0 movs r1, 0x2 bl Window_CopyToVram @@ -788496,7 +788496,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 @@ -788532,8 +788532,8 @@ sub_81987BC: @ 81987BC lsrs r6, r0, 24 movs r4, 0 cmp r4, r5 - bcs _0819883C -_08198804: + bcs @0819883C +@08198804: lsls r0, r4, 3 ldr r1, [sp, 0x48] adds r0, r1 @@ -788560,8 +788560,8 @@ _08198804: lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc _08198804 -_0819883C: + bcc @08198804 +@0819883C: adds r0, r7, 0 movs r1, 0x2 bl Window_CopyToVram @@ -788576,7 +788576,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} @@ -788617,7 +788617,7 @@ sub_8198854: @ 8198854 thumb_func_end sub_8198854 thumb_func_start sub_81988A4 -sub_81988A4: @ 81988A4 +sub_81988A4: ; 81988A4 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -788712,9 +788712,9 @@ sub_81988A4: @ 81988A4 strb r4, [r0, 0x8] movs r4, 0 cmp r4, r7 - bcs _0819899E + bcs @0819899E mov r5, sp -_0819896E: +@0819896E: ldr r1, [sp, 0x48] adds r0, r1, r4 ldrb r0, [r0] @@ -788737,8 +788737,8 @@ _0819896E: lsls r0, 24 lsrs r4, r0, 24 cmp r4, r7 - bcc _0819896E -_0819899E: + bcc @0819896E +@0819899E: ldr r0, [sp, 0x10] movs r1, 0x2 bl Window_CopyToVram @@ -788753,7 +788753,7 @@ _0819899E: thumb_func_end sub_81988A4 thumb_func_start sub_81989B8 -sub_81989B8: @ 81989B8 +sub_81989B8: ; 81989B8 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -788808,8 +788808,8 @@ sub_81989B8: @ 81989B8 thumb_func_end sub_81989B8 thumb_func_start rbox_template_set -@ void rbox_template_set(rbox_template *template, char bg_id, char x, char y, char w, char h, char a7, s16 a8) -rbox_template_set: @ 8198A24 +; void rbox_template_set(rbox_template *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} @@ -788834,7 +788834,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} @@ -788879,7 +788879,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 @@ -788922,7 +788922,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 @@ -789070,7 +789070,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 @@ -789091,7 +789091,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 @@ -789099,9 +789099,9 @@ sub_8198C58: @ 8198C58 movs r0, 0x2 negs r0, r0 cmp r4, r0 - beq _08198C6E + beq @08198C6E bl sub_8198C78 -_08198C6E: +@08198C6E: adds r0, r4, 0 pop {r4} pop {r1} @@ -789109,7 +789109,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] @@ -789125,7 +789125,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 @@ -789163,13 +789163,13 @@ sub_8198C94: @ 8198C94 mov r9, r0 movs r5, 0 cmp r5, r9 - bcs _08198D3A -_08198CE0: + bcs @08198D3A +@08198CE0: movs r4, 0 adds r1, r5, 0x1 mov r8, r1 cmp r4, r6 - bcs _08198D30 + bcs @08198D30 ldr r7, [sp, 0x1C] adds r0, r7, 0 muls r0, r5 @@ -789177,7 +789177,7 @@ _08198CE0: adds r0, r1, r0 lsls r0, 24 lsrs r7, r0, 24 -_08198CF8: +@08198CF8: adds r0, r5, 0 muls r0, r6 adds r0, r4 @@ -789204,14 +789204,14 @@ _08198CF8: lsls r0, 24 lsrs r4, r0, 24 cmp r4, r6 - bcc _08198CF8 -_08198D30: + bcc @08198CF8 +@08198D30: mov r7, r8 lsls r0, r7, 24 lsrs r5, r0, 24 cmp r5, r9 - bcc _08198CE0 -_08198D3A: + bcc @08198CE0 +@08198D3A: mov r0, r10 movs r1, 0x2 bl Window_CopyToVram @@ -789226,7 +789226,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 @@ -789280,7 +789280,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 @@ -789369,15 +789369,15 @@ sub_8198DBC: @ 8198DBC strb r0, [r1, 0xB] movs r6, 0 cmp r6, r10 - bcs _08198EDE -_08198E7A: + bcs @08198EDE +@08198E7A: movs r5, 0 adds r2, r6, 0x1 mov r9, r2 cmp r5, r8 - bcs _08198ED4 + bcs @08198ED4 mov r4, sp -_08198E86: +@08198E86: mov r0, r8 muls r0, r6 adds r0, r5 @@ -789414,14 +789414,14 @@ _08198E86: lsls r0, 24 lsrs r5, r0, 24 cmp r5, r8 - bcc _08198E86 -_08198ED4: + bcc @08198E86 +@08198ED4: mov r1, r9 lsls r0, r1, 24 lsrs r6, r0, 24 cmp r6, r10 - bcc _08198E7A -_08198EDE: + bcc @08198E7A +@08198EDE: ldr r0, [sp, 0x10] movs r1, 0x2 bl Window_CopyToVram @@ -789436,7 +789436,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} @@ -789485,7 +789485,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 @@ -789523,19 +789523,19 @@ sub_8198F58: @ 8198F58 mov r4, r10 strb r4, [r5, 0xA] cmp r7, 0 - blt _08198FAC + blt @08198FAC movs r0, 0x4 ldrsb r0, [r5, r0] cmp r7, r0 - ble _08198FB4 -_08198FAC: + ble @08198FB4 +@08198FAC: strb r6, [r5, 0x2] - b _08198FB6 + b @08198FB6 .align 2, 0 .pool -_08198FB4: +@08198FB4: strb r7, [r5, 0x2] -_08198FB6: +@08198FB6: movs r0, 0 movs r1, 0 bl sub_8199134 @@ -789553,7 +789553,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 @@ -789624,7 +789624,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 @@ -789724,7 +789724,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 @@ -789739,7 +789739,7 @@ sub_8199134: @ 8199134 asrs r6, r0, 24 adds r5, r1, 0 cmp r6, 0 - beq _0819918A + beq @0819918A movs r7, 0x2 ldrsb r7, [r5, r7] ldrb r4, [r5, 0x9] @@ -789748,32 +789748,32 @@ sub_8199134: @ 8199134 bl __modsi3 adds r0, r6 cmp r0, 0 - bge _08199174 + bge @08199174 adds r0, r4, 0 adds r0, 0xFF add r0, r8 - b _08199188 + b @08199188 .align 2, 0 .pool -_08199174: +@08199174: cmp r0, r4 - blt _08199184 + blt @08199184 adds r0, r7, 0 adds r1, r4, 0 bl __divsi3 muls r0, r4 - b _08199188 -_08199184: + b @08199188 +@08199184: mov r1, r8 adds r0, r6, r1 -_08199188: +@08199188: strb r0, [r5, 0x2] -_0819918A: +@0819918A: mov r2, r9 lsls r0, r2, 24 asrs r6, r0, 24 cmp r6, 0 - beq _081991CE + beq @081991CE movs r0, 0x2 ldrsb r0, [r5, r0] ldrb r4, [r5, 0x9] @@ -789781,45 +789781,45 @@ _0819918A: bl __divsi3 adds r1, r0, r6 cmp r1, 0 - bge _081991B2 + bge @081991B2 ldrb r0, [r5, 0xA] subs r0, 0x1 muls r0, r4 ldrb r1, [r5, 0x2] adds r0, r1 - b _081991CC -_081991B2: + b @081991CC +@081991B2: ldrb r0, [r5, 0xA] cmp r1, r0 - blt _081991C4 + blt @081991C4 subs r0, 0x1 adds r1, r4, 0 muls r1, r0 ldrb r0, [r5, 0x2] subs r0, r1 - b _081991CC -_081991C4: + b @081991CC +@081991C4: adds r0, r4, 0 muls r0, r6 ldrb r2, [r5, 0x2] adds r0, r2 -_081991CC: +@081991CC: strb r0, [r5, 0x2] -_081991CE: +@081991CE: movs r1, 0x2 ldrsb r1, [r5, r1] movs r0, 0x4 ldrsb r0, [r5, r0] cmp r1, r0 - bgt _081991E4 + bgt @081991E4 ldrb r1, [r5, 0x2] mov r0, r8 bl sub_8199060 - b _081991E8 -_081991E4: + b @081991E8 +@081991E4: mov r0, r8 strb r0, [r5, 0x2] -_081991E8: +@081991E8: ldrb r0, [r5, 0x2] pop {r3,r4} mov r8, r3 @@ -789830,7 +789830,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} @@ -789843,7 +789843,7 @@ sub_81991F8: @ 81991F8 asrs r4, r0, 24 adds r5, r1, 0 cmp r4, 0 - beq _0819922C + beq @0819922C movs r0, 0x2 ldrsb r0, [r5, r0] ldrb r6, [r5, 0x9] @@ -789851,17 +789851,17 @@ sub_81991F8: @ 81991F8 bl __modsi3 adds r0, r4 cmp r0, 0 - blt _0819922C + blt @0819922C cmp r0, r6 - bge _0819922C + bge @0819922C adds r0, r4, r7 strb r0, [r5, 0x2] -_0819922C: +@0819922C: mov r1, r8 lsls r0, r1, 24 asrs r4, r0, 24 cmp r4, 0 - beq _08199258 + beq @08199258 movs r0, 0x2 ldrsb r0, [r5, r0] ldrb r6, [r5, 0x9] @@ -789869,31 +789869,31 @@ _0819922C: bl __divsi3 adds r0, r4 cmp r0, 0 - blt _08199258 + blt @08199258 ldrb r1, [r5, 0xA] cmp r0, r1 - bge _08199258 + bge @08199258 adds r0, r6, 0 muls r0, r4 ldrb r1, [r5, 0x2] adds r0, r1 strb r0, [r5, 0x2] -_08199258: +@08199258: movs r1, 0x2 ldrsb r1, [r5, r1] movs r0, 0x4 ldrsb r0, [r5, r0] cmp r1, r0 - bgt _08199274 + bgt @08199274 ldrb r1, [r5, 0x2] adds r0, r7, 0 bl sub_8199060 - b _08199276 + b @08199276 .align 2, 0 .pool -_08199274: +@08199274: strb r7, [r5, 0x2] -_08199276: +@08199276: ldrb r0, [r5, 0x2] pop {r3} mov r8, r3 @@ -789903,98 +789903,98 @@ _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] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081992AC + beq @081992AC movs r0, 0x5 bl audio_play ldr r0, =0x0203cd90 ldrb r0, [r0, 0x2] lsls r0, 24 asrs r0, 24 - b _0819932C + b @0819932C .align 2, 0 .pool -_081992AC: +@081992AC: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081992BA + beq @081992BA movs r0, 0x1 negs r0, r0 - b _0819932C -_081992BA: + b @0819932C +@081992BA: movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _081992D0 + beq @081992D0 movs r0, 0x5 bl audio_play movs r1, 0x1 negs r1, r1 movs r0, 0 - b _08199324 -_081992D0: + b @08199324 +@081992D0: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081992E4 + beq @081992E4 movs r0, 0x5 bl audio_play movs r0, 0 movs r1, 0x1 - b _08199324 -_081992E4: + b @08199324 +@081992E4: movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _081992F8 + bne @081992F8 bl sub_81220D0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08199304 -_081992F8: + bne @08199304 +@081992F8: movs r0, 0x5 bl audio_play movs r0, 0x1 negs r0, r0 - b _08199322 -_08199304: + b @08199322 +@08199304: ldrh r1, [r4, 0x2E] movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _0819931A + bne @0819931A bl sub_81220D0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _08199328 -_0819931A: + bne @08199328 +@0819931A: movs r0, 0x5 bl audio_play movs r0, 0x1 -_08199322: +@08199322: movs r1, 0 -_08199324: +@08199324: bl sub_8199134 -_08199328: +@08199328: movs r0, 0x2 negs r0, r0 -_0819932C: +@0819932C: pop {r4} pop {r1} bx r1 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] @@ -790003,176 +790003,176 @@ sub_8199334: @ 8199334 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _0819935C + beq @0819935C movs r0, 0x5 bl audio_play movs r0, 0x2 ldrsb r0, [r5, r0] - b _081993D2 + b @081993D2 .align 2, 0 .pool -_0819935C: +@0819935C: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0819936A + beq @0819936A movs r0, 0x1 negs r0, r0 - b _081993D2 -_0819936A: + b @081993D2 +@0819936A: movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0819937A + beq @0819937A movs r1, 0x1 negs r1, r1 movs r0, 0 - b _081993BC -_0819937A: + b @081993BC +@0819937A: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08199388 + beq @08199388 movs r0, 0 movs r1, 0x1 - b _081993BC -_08199388: + b @081993BC +@08199388: movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _0819939C + bne @0819939C bl sub_81220D0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081993A2 -_0819939C: + bne @081993A2 +@0819939C: movs r0, 0x1 negs r0, r0 - b _081993BA -_081993A2: + b @081993BA +@081993A2: ldrh r1, [r6, 0x2E] movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _081993B8 + bne @081993B8 bl sub_81220D0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _081993CE -_081993B8: + bne @081993CE +@081993B8: movs r0, 0x1 -_081993BA: +@081993BA: movs r1, 0 -_081993BC: +@081993BC: bl sub_81991F8 lsls r0, 24 lsrs r0, 24 cmp r4, r0 - beq _081993CE + beq @081993CE movs r0, 0x5 bl audio_play -_081993CE: +@081993CE: movs r0, 0x2 negs r0, r0 -_081993D2: +@081993D2: pop {r4-r6} pop {r1} bx r1 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] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08199400 + beq @08199400 movs r0, 0x5 bl audio_play ldr r0, =0x0203cd90 ldrb r0, [r0, 0x2] lsls r0, 24 asrs r0, 24 - b _0819947C + b @0819947C .align 2, 0 .pool -_08199400: +@08199400: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0819940E + beq @0819940E movs r0, 0x1 negs r0, r0 - b _0819947C -_0819940E: + b @0819947C +@0819940E: ldrh r0, [r4, 0x30] movs r5, 0xF0 adds r1, r5, 0 ands r1, r0 cmp r1, 0x40 - bne _08199428 + bne @08199428 movs r0, 0x5 bl audio_play movs r1, 0x1 negs r1, r1 movs r0, 0 - b _08199474 -_08199428: + b @08199474 +@08199428: cmp r1, 0x80 - bne _08199438 + bne @08199438 movs r0, 0x5 bl audio_play movs r0, 0 movs r1, 0x1 - b _08199474 -_08199438: + b @08199474 +@08199438: cmp r1, 0x20 - beq _08199448 + beq @08199448 bl sub_812210C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _08199454 -_08199448: + bne @08199454 +@08199448: movs r0, 0x5 bl audio_play movs r0, 0x1 negs r0, r0 - b _08199472 -_08199454: + b @08199472 +@08199454: ldrh r1, [r4, 0x30] adds r0, r5, 0 ands r0, r1 cmp r0, 0x10 - beq _0819946A + beq @0819946A bl sub_812210C lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _08199478 -_0819946A: + bne @08199478 +@0819946A: movs r0, 0x5 bl audio_play movs r0, 0x1 -_08199472: +@08199472: movs r1, 0 -_08199474: +@08199474: bl sub_8199134 -_08199478: +@08199478: movs r0, 0x2 negs r0, r0 -_0819947C: +@0819947C: pop {r4,r5} pop {r1} bx r1 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] @@ -790181,86 +790181,86 @@ sub_8199484: @ 8199484 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081994AC + beq @081994AC movs r0, 0x5 bl audio_play movs r0, 0x2 ldrsb r0, [r6, r0] - b _0819951E + b @0819951E .align 2, 0 .pool -_081994AC: +@081994AC: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081994BA + beq @081994BA movs r0, 0x1 negs r0, r0 - b _0819951E -_081994BA: + b @0819951E +@081994BA: ldrh r0, [r5, 0x30] movs r6, 0xF0 adds r1, r6, 0 ands r1, r0 cmp r1, 0x40 - bne _081994CE + bne @081994CE movs r1, 0x1 negs r1, r1 movs r0, 0 - b _08199508 -_081994CE: + b @08199508 +@081994CE: cmp r1, 0x80 - bne _081994D8 + bne @081994D8 movs r0, 0 movs r1, 0x1 - b _08199508 -_081994D8: + b @08199508 +@081994D8: cmp r1, 0x20 - beq _081994E8 + beq @081994E8 bl sub_812210C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081994EE -_081994E8: + bne @081994EE +@081994E8: movs r0, 0x1 negs r0, r0 - b _08199506 -_081994EE: + b @08199506 +@081994EE: ldrh r1, [r5, 0x30] adds r0, r6, 0 ands r0, r1 cmp r0, 0x10 - beq _08199504 + beq @08199504 bl sub_812210C lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _0819951A -_08199504: + bne @0819951A +@08199504: movs r0, 0x1 -_08199506: +@08199506: movs r1, 0 -_08199508: +@08199508: bl sub_81991F8 lsls r0, 24 lsrs r0, 24 cmp r4, r0 - beq _0819951A + beq @0819951A movs r0, 0x5 bl audio_play -_0819951A: +@0819951A: movs r0, 0x2 negs r0, r0 -_0819951E: +@0819951E: pop {r4-r6} pop {r1} bx r1 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 @@ -790280,19 +790280,19 @@ InitMenuInUpperLeftCorner: @ 8199524 strb r0, [r4, 0x8] strb r3, [r4, 0xB] cmp r5, 0 - blt _08199554 + blt @08199554 movs r0, 0x4 ldrsb r0, [r4, r0] cmp r5, r0 - ble _0819955C -_08199554: + ble @0819955C +@08199554: strb r6, [r4, 0x2] - b _0819955E + b @0819955E .align 2, 0 .pool -_0819955C: +@0819955C: strb r5, [r4, 0x2] -_0819955E: +@0819955E: movs r0, 0 bl MoveMenuCursor lsls r0, 24 @@ -790303,7 +790303,7 @@ _0819955E: thumb_func_end InitMenuInUpperLeftCorner thumb_func_start InitMenuInUpperLeftCornerPlaySoundWhenAPressed -InitMenuInUpperLeftCornerPlaySoundWhenAPressed: @ 8199570 +InitMenuInUpperLeftCornerPlaySoundWhenAPressed: ; 8199570 push {lr} lsls r0, 24 lsrs r0, 24 @@ -790320,7 +790320,7 @@ InitMenuInUpperLeftCornerPlaySoundWhenAPressed: @ 8199570 thumb_func_end InitMenuInUpperLeftCornerPlaySoundWhenAPressed thumb_func_start PrintMenuTable -PrintMenuTable: @ 819958C +PrintMenuTable: ; 819958C push {r4-r7,lr} mov r7, r8 push {r7} @@ -790332,11 +790332,11 @@ PrintMenuTable: @ 819958C lsrs r7, r1, 24 movs r5, 0 cmp r5, r7 - bcs _081995D0 + bcs @081995D0 movs r6, 0x80 lsls r6, 17 adds r4, r2, 0 -_081995AA: +@081995AA: ldr r2, [r4] lsrs r0, r6, 24 str r0, [sp] @@ -790354,8 +790354,8 @@ _081995AA: adds r4, 0x8 adds r5, 0x1 cmp r5, r7 - bcc _081995AA -_081995D0: + bcc @081995AA +@081995D0: mov r0, r8 movs r1, 0x2 bl Window_CopyToVram @@ -790368,7 +790368,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 @@ -790439,9 +790439,9 @@ sub_81995E4: @ 81995E4 strb r1, [r0, 0x8] movs r4, 0 cmp r4, r7 - bcs _081996A6 + bcs @081996A6 mov r5, sp -_0819967C: +@0819967C: mov r1, r8 adds r0, r1, r4 ldrb r0, [r0] @@ -790461,8 +790461,8 @@ _0819967C: lsls r0, 24 lsrs r4, r0, 24 cmp r4, r7 - bcc _0819967C -_081996A6: + bcc @0819967C +@081996A6: adds r0, r6, 0 movs r1, 0x2 bl Window_CopyToVram @@ -790477,7 +790477,7 @@ _081996A6: thumb_func_end sub_81995E4 thumb_func_start sub_81996C0 -sub_81996C0: @ 81996C0 +sub_81996C0: ; 81996C0 push {r4-r6,lr} mov r6, r9 mov r5, r8 @@ -790589,7 +790589,7 @@ sub_81996C0: @ 81996C0 thumb_func_end sub_81996C0 thumb_func_start sub_81997AC -sub_81997AC: @ 81997AC +sub_81997AC: ; 81997AC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -790609,13 +790609,13 @@ sub_81997AC: @ 81997AC str r3, [sp, 0x10] movs r7, 0 cmp r7, r3 - bcs _08199824 -_081997D4: + bcs @08199824 +@081997D4: movs r4, 0 adds r0, r7, 0x1 mov r9, r0 cmp r4, r6 - bcs _0819981C + bcs @0819981C lsls r0, r7, 4 adds r0, 0x1 lsls r0, 24 @@ -790623,7 +790623,7 @@ _081997D4: mov r8, r0 movs r5, 0x80 lsls r5, 20 -_081997EC: +@081997EC: adds r0, r7, 0 muls r0, r6 adds r0, r4 @@ -790646,13 +790646,13 @@ _081997EC: adds r5, r0 adds r4, 0x1 cmp r4, r6 - bcc _081997EC -_0819981C: + bcc @081997EC +@0819981C: mov r7, r9 ldr r4, [sp, 0x10] cmp r7, r4 - bcc _081997D4 -_08199824: + bcc @081997D4 +@08199824: mov r0, r10 movs r1, 0x2 bl Window_CopyToVram @@ -790667,7 +790667,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 @@ -790740,17 +790740,17 @@ sub_819983C: @ 819983C strb r6, [r0, 0xB] movs r7, 0 cmp r7, r10 - bcs _0819992A -_081998D6: + bcs @0819992A +@081998D6: movs r5, 0 adds r2, r7, 0x1 mov r9, r2 cmp r5, r8 - bcs _08199920 + bcs @08199920 mov r4, sp lsls r0, r7, 4 adds r6, r0, 0x1 -_081998E6: +@081998E6: mov r0, r8 muls r0, r7 adds r0, r5 @@ -790778,14 +790778,14 @@ _081998E6: lsls r0, 24 lsrs r5, r0, 24 cmp r5, r8 - bcc _081998E6 -_08199920: + bcc @081998E6 +@08199920: mov r2, r9 lsls r0, r2, 24 lsrs r7, r0, 24 cmp r7, r10 - bcc _081998D6 -_0819992A: + bcc @081998D6 +@0819992A: ldr r0, [sp, 0x10] movs r1, 0x2 bl Window_CopyToVram @@ -790800,7 +790800,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 @@ -790829,20 +790829,20 @@ sub_8199944: @ 8199944 strb r2, [r6, 0x9] strb r3, [r6, 0xA] cmp r7, 0 - blt _08199986 + blt @08199986 movs r0, 0x4 ldrsb r0, [r6, r0] cmp r7, r0 - ble _08199990 -_08199986: + ble @08199990 +@08199986: mov r0, r12 strb r0, [r6, 0x2] - b _08199992 + b @08199992 .align 2, 0 .pool -_08199990: +@08199990: strb r7, [r6, 0x2] -_08199992: +@08199992: movs r0, 0 movs r1, 0 bl sub_8199134 @@ -790856,8 +790856,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 @@ -790870,8 +790870,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 @@ -790884,42 +790884,42 @@ 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] cmp r0, 0x1 - bne _081999E4 + bne @081999E4 movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0 strb r0, [r4] -_081999E4: +@081999E4: ldrb r0, [r4, 0x1] cmp r0, 0x1 - bne _081999F4 + bne @081999F4 movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0 strb r0, [r4, 0x1] -_081999F4: +@081999F4: ldrb r0, [r4, 0x2] cmp r0, 0x1 - bne _08199A04 + bne @08199A04 movs r0, 0x2 bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0 strb r0, [r4, 0x2] -_08199A04: +@08199A04: ldrb r0, [r4, 0x3] cmp r0, 0x1 - bne _08199A14 + bne @08199A14 movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0 strb r0, [r4, 0x3] -_08199A14: +@08199A14: pop {r4} pop {r0} bx r0 @@ -790928,19 +790928,19 @@ _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 movs r2, 0 adds r0, r1, 0 adds r0, 0x7C -_08199A2C: +@08199A2C: str r2, [r0] subs r0, 0x4 cmp r0, r1 - bge _08199A2C + bge @08199A2C movs r0, 0 strh r0, [r3] pop {r0} @@ -790950,23 +790950,23 @@ _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 is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _08199A88 + bne @08199A88 ldr r1, =0x0203cda8 ldrh r0, [r1] cmp r0, 0 - beq _08199A7C + beq @08199A7C movs r4, 0 ldrh r1, [r1] cmp r4, r1 - bge _08199A76 + bge @08199A76 ldr r5, =0x0203cdac movs r6, 0 -_08199A64: +@08199A64: ldr r0, [r5] bl free stm r5!, {r6} @@ -790974,27 +790974,27 @@ _08199A64: ldr r0, =0x0203cda8 ldrh r0, [r0] cmp r4, r0 - blt _08199A64 -_08199A76: + blt @08199A64 +@08199A76: ldr r1, =0x0203cda8 movs r0, 0 strh r0, [r1] -_08199A7C: +@08199A7C: movs r0, 0 - b _08199A8A + b @08199A8A .align 2, 0 .pool -_08199A88: +@08199A88: movs r0, 0x1 -_08199A8A: +@08199A8A: pop {r4-r6} pop {r1} bx r1 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 @@ -791014,17 +791014,17 @@ decompress_and_copy_tile_data_to_vram: @ 8199A90 ldr r6, =0x0203cda8 ldrh r0, [r6] cmp r0, 0x1F - bhi _08199AF8 + bhi @08199AF8 adds r0, r4, 0 add r1, sp, 0x4 bl malloc_and_decompress adds r4, r0, 0 cmp r5, 0 - bne _08199AC8 + bne @08199AC8 ldr r5, [sp, 0x4] -_08199AC8: +@08199AC8: cmp r4, 0 - beq _08199AEC + beq @08199AEC lsls r2, r5, 16 lsrs r2, 16 str r7, [sp] @@ -791040,14 +791040,14 @@ _08199AC8: lsrs r0, 14 adds r0, r2 str r4, [r0] -_08199AEC: +@08199AEC: adds r0, r4, 0 - b _08199AFA + b @08199AFA .align 2, 0 .pool -_08199AF8: +@08199AF8: movs r0, 0 -_08199AFA: +@08199AFA: add sp, 0x8 pop {r3,r4} mov r8, r3 @@ -791058,8 +791058,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 @@ -791080,11 +791080,11 @@ copy_decompressed_tile_data_to_vram_autofree: @ 8199B08 bl malloc_and_decompress adds r6, r0, 0 cmp r5, 0 - bne _08199B36 + bne @08199B36 ldr r5, [sp, 0x4] -_08199B36: +@08199B36: cmp r6, 0 - beq _08199B6E + beq @08199B6E ldr r0, =task_free_buf_after_copying_tile_data_to_vram + 1 movs r1, 0 bl AddTask @@ -791108,7 +791108,7 @@ _08199B36: movs r1, 0x1 adds r2, r6, 0 bl set_word_task_arg -_08199B6E: +@08199B6E: add sp, 0x8 pop {r3,r4} mov r8, r3 @@ -791121,8 +791121,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 @@ -791136,14 +791136,14 @@ task_free_buf_after_copying_tile_data_to_vram: @ 8199B84 bl CheckForSpaceForDma3Request lsls r0, 16 cmp r0, 0 - bne _08199BB4 + bne @08199BB4 adds r0, r4, 0 movs r1, 0x1 bl get_word_task_arg bl free adds r0, r4, 0 bl remove_task -_08199BB4: +@08199BB4: pop {r4} pop {r0} bx r0 @@ -791152,8 +791152,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] @@ -791168,11 +791168,11 @@ malloc_and_decompress: @ 8199BC0 bl malloc adds r4, r0, 0 cmp r4, 0 - beq _08199BE8 + beq @08199BE8 adds r0, r5, 0 adds r1, r4, 0 bl LZ77UnCompWram -_08199BE8: +@08199BE8: adds r0, r4, 0 pop {r4,r5} pop {r1} @@ -791180,8 +791180,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] @@ -791194,31 +791194,31 @@ copy_decompressed_tile_data_to_vram: @ 8199BF0 lsls r1, 24 lsrs r1, 24 cmp r1, 0 - beq _08199C18 + beq @08199C18 cmp r1, 0x1 - beq _08199C20 + beq @08199C20 ldr r0, =0x0000ffff - b _08199C2A + b @08199C2A .align 2, 0 .pool -_08199C18: +@08199C18: adds r1, r4, 0 bl gpu_copy_bg_tile_pattern_data_to_vram - b _08199C26 -_08199C20: + b @08199C26 +@08199C20: adds r1, r4, 0 bl gpu_copy_bg_tile_map_to_vram -_08199C26: +@08199C26: lsls r0, 16 lsrs r0, 16 -_08199C2A: +@08199C2A: pop {r4} pop {r1} bx r1 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 @@ -791247,22 +791247,22 @@ sub_8199C30: @ 8199C30 mov r8, r0 adds r0, r5, r4 cmp r5, r0 - bge _08199CA8 + bge @08199CA8 mov r9, r0 -_08199C6E: +@08199C6E: ldr r3, [sp] ldr r1, [sp, 0x4] adds r0, r3, r1 adds r7, r5, 0x1 cmp r3, r0 - bge _08199CA0 + bge @08199CA0 lsls r6, r5, 5 ldr r1, =0x00000fff mov r12, r1 mov r1, r10 lsls r5, r1, 12 adds r4, r0, 0 -_08199C86: +@08199C86: adds r1, r6, r3 lsls r1, 1 add r1, r8 @@ -791275,13 +791275,13 @@ _08199C86: lsls r0, 24 lsrs r3, r0, 24 cmp r3, r4 - blt _08199C86 -_08199CA0: + blt @08199C86 +@08199CA0: lsls r0, r7, 24 lsrs r5, r0, 24 cmp r5, r9 - blt _08199C6E -_08199CA8: + blt @08199C6E +@08199CA8: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -791295,7 +791295,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 @@ -791322,18 +791322,18 @@ sub_8199CBC: @ 8199CBC adds r7, r0, 0 movs r0, 0 cmp r0, r8 - bcs _08199D2A -_08199CF4: + bcs @08199D2A +@08199CF4: movs r2, 0 adds r6, r0, 0x1 cmp r2, r5 - bcs _08199D22 + bcs @08199D22 adds r4, r0, 0 muls r4, r5 ldr r1, [sp] adds r0, r1 lsls r3, r0, 5 -_08199D06: +@08199D06: adds r1, r4, r2 lsls r1, 1 add r1, r10 @@ -791347,13 +791347,13 @@ _08199D06: lsls r0, 24 lsrs r2, r0, 24 cmp r2, r5 - bcc _08199D06 -_08199D22: + bcc @08199D06 +@08199D22: lsls r0, r6, 24 lsrs r0, 24 cmp r0, r8 - bcc _08199CF4 -_08199D2A: + bcc @08199CF4 +@08199D2A: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -791365,7 +791365,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 @@ -791373,23 +791373,23 @@ sub_8199D3C: @ 8199D3C adds r4, r2, 0 muls r4, r3 cmp r0, 0x1 - bne _08199D64 + bne @08199D64 adds r3, r6, 0 movs r2, 0 cmp r2, r4 - bge _08199D8C -_08199D54: + bge @08199D8C +@08199D54: adds r1, r3, r2 ldrb r0, [r1] adds r0, r5 strb r0, [r1] adds r2, 0x1 cmp r2, r4 - blt _08199D54 - b _08199D8C -_08199D64: + blt @08199D54 + b @08199D8C +@08199D64: cmp r4, 0 - ble _08199D8C + ble @08199D8C movs r0, 0xFC lsls r0, 8 mov r12, r0 @@ -791397,7 +791397,7 @@ _08199D64: adds r7, r0, 0 adds r3, r6, 0 adds r2, r4, 0 -_08199D76: +@08199D76: ldrh r0, [r3] mov r1, r12 ands r1, r0 @@ -791408,8 +791408,8 @@ _08199D76: adds r3, 0x2 subs r2, 0x1 cmp r2, 0 - bne _08199D76 -_08199D8C: + bne @08199D76 +@08199D8C: pop {r4-r7} pop {r0} bx r0 @@ -791418,7 +791418,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 @@ -791457,7 +791457,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 @@ -791474,9 +791474,9 @@ sub_8199DF0: @ 8199DF0 lsls r0, 16 movs r7, 0x40 cmp r0, 0 - bne _08199E16 + bne @08199E16 movs r7, 0x20 -_08199E16: +@08199E16: adds r0, r5, 0 movs r1, 0x1 bl bg_get_field @@ -791516,7 +791516,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 @@ -791585,7 +791585,7 @@ box_print: @ 8199E64 thumb_func_end box_print thumb_func_start sub_8199EEC -sub_8199EEC: @ 8199EEC +sub_8199EEC: ; 8199EEC push {r4-r6,lr} mov r6, r9 mov r5, r8 @@ -791656,7 +791656,7 @@ sub_8199EEC: @ 8199EEC thumb_func_end sub_8199EEC thumb_func_start sub_8199F74 -sub_8199F74: @ 8199F74 +sub_8199F74: ; 8199F74 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -791743,7 +791743,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 @@ -791758,14 +791758,14 @@ sub_819A024: @ 819A024 ldrb r0, [r3] ldr r6, =0x02021fc4 cmp r0, 0xFF - beq _0819A04C -_0819A042: + beq @0819A04C +@0819A042: adds r2, 0x1 adds r0, r3, r2 ldrb r0, [r0] cmp r0, 0xFF - bne _0819A042 -_0819A04C: + bne @0819A042 +@0819A04C: adds r0, r6, 0 bl ExpandTextCodes lsls r3, r4, 24 @@ -791790,7 +791790,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 @@ -791825,24 +791825,24 @@ sub_819A080: @ 819A080 adds r2, r1, r2 str r2, [sp, 0x10] cmp r0, r1 - bge _0819A0CC + bge @0819A0CC ldr r1, [sp, 0x8] adds r0, r1 str r0, [sp, 0x10] -_0819A0CC: +@0819A0CC: ldr r2, [sp, 0x4] ldrh r1, [r2, 0x6] subs r0, r1, r4 cmp r0, r5 - bge _0819A0DE + bge @0819A0DE adds r0, r3, r1 subs r0, r4 str r0, [sp, 0x14] - b _0819A0E2 -_0819A0DE: + b @0819A0E2 +@0819A0DE: adds r5, r3, r5 str r5, [sp, 0x14] -_0819A0E2: +@0819A0E2: ldr r0, [sp] ldrh r1, [r0, 0x4] movs r2, 0x7 @@ -791862,9 +791862,9 @@ _0819A0E2: mov r8, r4 ldr r1, [sp, 0x14] cmp r12, r1 - blt _0819A10C - b _0819A24A -_0819A10C: + blt @0819A10C + b @0819A24A +@0819A10C: ldr r5, [sp, 0x8] ldr r6, [sp, 0xC] mov r2, r12 @@ -791875,15 +791875,15 @@ _0819A10C: str r0, [sp, 0x24] ldr r1, [sp, 0x10] cmp r5, r1 - blt _0819A124 - b _0819A23A -_0819A124: + blt @0819A124 + b @0819A23A +@0819A124: movs r7, 0x1 movs r2, 0xF0 mov r10, r2 movs r0, 0xF mov r9, r0 -_0819A12E: +@0819A12E: asrs r0, r5, 1 movs r1, 0x3 ands r0, r1 @@ -791925,115 +791925,115 @@ _0819A12E: adds r0, r4, 0 ands r0, r7 cmp r0, 0 - beq _0819A1DA + beq @0819A1DA subs r4, 0x1 adds r0, r6, 0 ands r0, r7 cmp r0, 0 - beq _0819A1B2 + beq @0819A1B2 ldrh r0, [r4] ldr r2, =0x00000fff ands r2, r0 adds r0, r5, 0 ands r0, r7 cmp r0, 0 - beq _0819A1A8 + beq @0819A1A8 ldrb r1, [r3] mov r0, r10 ands r0, r1 lsls r0, 8 - b _0819A22A + b @0819A22A .align 2, 0 .pool -_0819A1A8: +@0819A1A8: ldrb r1, [r3] mov r0, r9 ands r0, r1 lsls r0, 12 - b _0819A22A -_0819A1B2: + b @0819A22A +@0819A1B2: ldrh r0, [r4] ldr r2, =0x0000f0ff ands r2, r0 adds r0, r5, 0 ands r0, r7 cmp r0, 0 - beq _0819A1D0 + beq @0819A1D0 ldrb r1, [r3] mov r0, r10 ands r0, r1 lsls r0, 4 - b _0819A22A + b @0819A22A .align 2, 0 .pool -_0819A1D0: +@0819A1D0: ldrb r1, [r3] mov r0, r9 ands r0, r1 lsls r0, 8 - b _0819A22A -_0819A1DA: + b @0819A22A +@0819A1DA: adds r0, r6, 0 ands r0, r7 cmp r0, 0 - beq _0819A206 + beq @0819A206 ldrh r0, [r4] ldr r2, =0x0000ff0f ands r2, r0 adds r0, r5, 0 ands r0, r7 cmp r0, 0 - beq _0819A1FC + beq @0819A1FC ldrb r1, [r3] mov r0, r10 - b _0819A228 + b @0819A228 .align 2, 0 .pool -_0819A1FC: +@0819A1FC: ldrb r1, [r3] mov r0, r9 ands r0, r1 lsls r0, 4 - b _0819A22A -_0819A206: + b @0819A22A +@0819A206: ldrh r0, [r4] ldr r2, =0x0000fff0 ands r2, r0 adds r0, r5, 0 ands r0, r7 cmp r0, 0 - beq _0819A224 + beq @0819A224 ldrb r1, [r3] mov r0, r10 ands r0, r1 lsrs r0, 4 - b _0819A22A + b @0819A22A .align 2, 0 .pool -_0819A224: +@0819A224: ldrb r1, [r3] mov r0, r9 -_0819A228: +@0819A228: ands r0, r1 -_0819A22A: +@0819A22A: orrs r2, r0 strh r2, [r4] adds r5, 0x1 adds r6, 0x1 ldr r0, [sp, 0x10] cmp r5, r0 - bge _0819A23A - b _0819A12E -_0819A23A: + bge @0819A23A + b @0819A12E +@0819A23A: ldr r1, [sp, 0x20] mov r12, r1 ldr r2, [sp, 0x24] mov r8, r2 ldr r0, [sp, 0x14] cmp r12, r0 - bge _0819A24A - b _0819A10C -_0819A24A: + bge @0819A24A + b @0819A10C +@0819A24A: add sp, 0x28 pop {r3-r5} mov r8, r3 @@ -792045,7 +792045,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 @@ -792063,7 +792063,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 @@ -792096,31 +792096,31 @@ 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 lsls r1, 24 lsrs r1, 24 cmp r1, 0x1 - beq _0819A2DC + beq @0819A2DC cmp r1, 0x1 - ble _0819A2D2 + ble @0819A2D2 cmp r1, 0x2 - beq _0819A2E4 -_0819A2D2: + beq @0819A2E4 +@0819A2D2: ldr r0, =0x08dc4318 - b _0819A2E6 + b @0819A2E6 .align 2, 0 .pool -_0819A2DC: +@0819A2DC: ldr r0, =0x08dc4338 - b _0819A2E6 + b @0819A2E6 .align 2, 0 .pool -_0819A2E4: +@0819A2E4: ldr r0, =0x08dc4358 -_0819A2E6: +@0819A2E6: adds r1, r2, 0 movs r2, 0x20 bl gpu_pal_apply @@ -792131,7 +792131,7 @@ _0819A2E6: thumb_func_end sub_819A2BC thumb_func_start sub_819A2F8 -sub_819A2F8: @ 819A2F8 +sub_819A2F8: ; 819A2F8 push {r4,r5,lr} sub sp, 0x18 lsls r0, 24 @@ -792170,7 +792170,7 @@ sub_819A2F8: @ 819A2F8 thumb_func_end sub_819A2F8 thumb_func_start sub_819A344 -sub_819A344: @ 819A344 +sub_819A344: ; 819A344 push {r4-r7,lr} lsls r0, 24 lsrs r3, r0, 24 @@ -792194,40 +792194,40 @@ sub_819A344: @ 819A344 strb r2, [r5] adds r5, 0x1 cmp r3, 0x4 - bhi _0819A43C + bhi @0819A43C lsls r0, r3, 2 - ldr r1, =_0819A384 + ldr r1, =@0819A384 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0819A384: - .4byte _0819A398 - .4byte _0819A3A8 - .4byte _0819A3D6 - .4byte _0819A404 - .4byte _0819A414 -_0819A398: +@0819A384: + .4byte @0819A398 + .4byte @0819A3A8 + .4byte @0819A3D6 + .4byte @0819A404 + .4byte @0819A414 +@0819A398: ldr r0, =0x03005d90 ldr r1, [r0] adds r0, r5, 0 bl gf_strcpy - b _0819A43C + b @0819A43C .align 2, 0 .pool -_0819A3A8: +@0819A3A8: bl sub_809D42C cmp r0, 0 - beq _0819A3B8 + beq @0819A3B8 movs r0, 0x1 bl pokedex_count - b _0819A3BE -_0819A3B8: + b @0819A3BE +@0819A3B8: movs r0, 0x1 bl sub_80C0844 -_0819A3BE: +@0819A3BE: adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 @@ -792238,8 +792238,8 @@ _0819A3BE: adds r5, r0, 0 movs r0, 0xFF strb r0, [r5] - b _0819A43C -_0819A3D6: + b @0819A43C +@0819A3D6: ldr r4, =0x03005d90 ldr r0, [r4] ldrh r1, [r0, 0xE] @@ -792257,40 +792257,40 @@ _0819A3D6: movs r2, 0x2 movs r3, 0x2 bl decimal_int_to_string - b _0819A43C + b @0819A43C .align 2, 0 .pool -_0819A404: +@0819A404: ldr r0, =0x02037318 ldrb r1, [r0, 0x14] adds r0, r5, 0 bl sub_81245DC - b _0819A43C + b @0819A43C .align 2, 0 .pool -_0819A414: +@0819A414: ldr r4, =0x00000867 movs r6, 0 adds r7, r5, 0x1 -_0819A41A: +@0819A41A: lsls r0, r4, 16 lsrs r0, 16 bl flag_check lsls r0, 24 cmp r0, 0 - beq _0819A42A + beq @0819A42A adds r6, 0x1 -_0819A42A: +@0819A42A: adds r4, 0x1 ldr r0, =0x0000086e cmp r4, r0 - ble _0819A41A + ble @0819A41A adds r0, r6, 0 subs r0, 0x5F strb r0, [r5] movs r0, 0xFF strb r0, [r7] -_0819A43C: +@0819A43C: pop {r4-r7} pop {r0} bx r0 @@ -792299,7 +792299,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] @@ -792311,23 +792311,23 @@ sub_819A44C: @ 819A44C lsrs r4, 16 lsrs r0, 24 cmp r4, r0 - bne _0819A4BA + bne @0819A4BA adds r0, r5, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0819A4B0 + beq @0819A4B0 ldrh r1, [r5, 0x2E] movs r2, 0x2E ldrsh r0, [r5, r2] cmp r0, 0 - beq _0819A484 + beq @0819A484 subs r0, r1, 0x1 strh r0, [r5, 0x2E] - b _0819A4C2 -_0819A484: + b @0819A4C2 +@0819A484: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -792335,35 +792335,35 @@ _0819A484: bl __umodsi3 lsls r0, 16 cmp r0, 0 - bne _0819A4A6 + bne @0819A4A6 adds r0, r5, 0 movs r1, 0 bl obj_anim_image_start movs r0, 0x20 strh r0, [r5, 0x2E] - b _0819A4C2 -_0819A4A6: + b @0819A4C2 +@0819A4A6: adds r0, r5, 0 movs r1, 0x1 bl obj_anim_image_start - b _0819A4C2 -_0819A4B0: + b @0819A4C2 +@0819A4B0: adds r0, r5, 0 movs r1, 0x1 bl obj_anim_image_start_if_different - b _0819A4C2 -_0819A4BA: + b @0819A4C2 +@0819A4BA: adds r0, r5, 0 movs r1, 0 bl obj_anim_image_start_if_different -_0819A4C2: +@0819A4C2: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_819A44C thumb_func_start sub_819A4C8 -sub_819A4C8: @ 819A4C8 +sub_819A4C8: ; 819A4C8 push {lr} bl call_obj_callbacks bl obj_sync_something @@ -792375,7 +792375,7 @@ sub_819A4C8: @ 819A4C8 thumb_func_end sub_819A4C8 thumb_func_start sub_819A4E4 -sub_819A4E4: @ 819A4E4 +sub_819A4E4: ; 819A4E4 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -792385,7 +792385,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 @@ -792399,7 +792399,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 @@ -792408,38 +792408,38 @@ sub_819A514: @ 819A514 adds r0, r1 ldrb r0, [r0] cmp r0, 0xA - bls _0819A528 - b _0819A98E -_0819A528: + bls @0819A528 + b @0819A98E +@0819A528: lsls r0, 2 - ldr r1, =_0819A53C + ldr r1, =@0819A53C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0819A53C: - .4byte _0819A568 - .4byte _0819A5C0 - .4byte _0819A69C - .4byte _0819A77C - .4byte _0819A7CC - .4byte _0819A868 - .4byte _0819A8A4 - .4byte _0819A8AC - .4byte _0819A8C4 - .4byte _0819A8DC - .4byte _0819A8FC -_0819A568: +@0819A53C: + .4byte @0819A568 + .4byte @0819A5C0 + .4byte @0819A69C + .4byte @0819A77C + .4byte @0819A7CC + .4byte @0819A868 + .4byte @0819A8A4 + .4byte @0819A8AC + .4byte @0819A8C4 + .4byte @0819A8DC + .4byte @0819A8FC +@0819A568: ldr r4, =0x0203ce3c ldr r0, [r4] cmp r0, 0 - beq _0819A578 + beq @0819A578 bl free movs r0, 0 str r0, [r4] -_0819A578: +@0819A578: movs r0, 0 bl SetHBlankCallback movs r0, 0 @@ -792460,10 +792460,10 @@ _0819A578: ldr r0, =0x08610434 bl Window_InitFromTemplates bl TextBox_ResetSomeField - b _0819A8E6 + b @0819A8E6 .align 2, 0 .pool -_0819A5C0: +@0819A5C0: ldr r5, =0x0203ce2c movs r4, 0x88 lsls r4, 3 @@ -792542,10 +792542,10 @@ _0819A5C0: movs r3, 0x87 lsls r3, 3 adds r1, r3 - b _0819A8EE + b @0819A8EE .align 2, 0 .pool -_0819A69C: +@0819A69C: bl sub_80A1A74 bl reset_all_obj_data bl clear_tasks @@ -792601,7 +792601,7 @@ _0819A69C: ldr r1, [r0] ldrb r0, [r1, 0x6] cmp r0, 0x1 - bne _0819A738 + bne @0819A738 ldr r0, =0x02037714 movs r2, 0xA9 lsls r2, 2 @@ -792611,7 +792611,7 @@ _0819A69C: lsls r3, 1 adds r0, r3 strh r1, [r0] -_0819A738: +@0819A738: ldr r0, =0x0861039c movs r1, 0x20 movs r2, 0x4 @@ -792620,10 +792620,10 @@ _0819A738: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _0819A8EE + b @0819A8EE .align 2, 0 .pool -_0819A77C: +@0819A77C: ldr r0, =0x0203ce38 ldr r1, [r0] movs r0, 0x3 @@ -792653,10 +792653,10 @@ _0819A77C: bl gpu_copy_to_iwram_tile_map_rect movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - b _0819A8E6 + b @0819A8E6 .align 2, 0 .pool -_0819A7CC: +@0819A7CC: ldr r0, =0x086103f4 bl gpu_pal_obj_alloc_and_load_multiple ldr r0, =0x086103bc @@ -792684,7 +792684,7 @@ _0819A7CC: ldr r0, [r0] ldrb r0, [r0, 0x6] cmp r0, 0x1 - bne _0819A854 + bne @0819A854 movs r0, 0x58 movs r1, 0x98 movs r2, 0x20 @@ -792698,50 +792698,50 @@ _0819A7CC: ldr r1, =0x0000040b movs r0, 0x52 bl lcd_io_set - b _0819A85A + b @0819A85A .align 2, 0 .pool -_0819A854: +@0819A854: movs r0, 0x3 bl gpu_sync_bg_hide -_0819A85A: +@0819A85A: ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 - b _0819A8EE + b @0819A8EE .align 2, 0 .pool -_0819A868: +@0819A868: ldr r4, =0x0300127c ldr r1, [r4] ldrb r0, [r1, 0x6] cmp r0, 0x1 - bne _0819A878 + bne @0819A878 ldr r0, =0x0203cf20 ldrb r0, [r0] strb r0, [r1, 0x3] -_0819A878: +@0819A878: bl sub_819A9AC bl sub_819AA18 ldr r0, [r4] ldrb r0, [r0, 0x6] cmp r0, 0x1 - bne _0819A88C + bne @0819A88C bl sub_819BE34 -_0819A88C: +@0819A88C: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _0819A8EE + b @0819A8EE .align 2, 0 .pool -_0819A8A4: +@0819A8A4: bl sub_819BA64 movs r0, 0x2 - b _0819A8E2 -_0819A8AC: + b @0819A8E2 +@0819A8AC: bl sub_819BCF8 movs r0, 0x5 bl Window_WriteStandardTileMap @@ -792749,10 +792749,10 @@ _0819A8AC: movs r3, 0x87 lsls r3, 3 adds r1, r3 - b _0819A8EE + b @0819A8EE .align 2, 0 .pool -_0819A8C4: +@0819A8C4: bl sub_819B9E8 movs r0, 0x1 bl Window_WriteStandardTileMap @@ -792760,27 +792760,27 @@ _0819A8C4: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _0819A8EE + b @0819A8EE .align 2, 0 .pool -_0819A8DC: +@0819A8DC: bl sub_819B9B4 movs r0, 0 -_0819A8E2: +@0819A8E2: bl Window_WriteStandardTileMap -_0819A8E6: +@0819A8E6: ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 -_0819A8EE: +@0819A8EE: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0819A98E + b @0819A98E .align 2, 0 .pool -_0819A8FC: +@0819A8FC: ldr r0, =sub_819C69C + 1 movs r1, 0 bl AddTask @@ -792792,7 +792792,7 @@ _0819A8FC: ldr r3, [r2] ldrb r5, [r3, 0x6] cmp r5, 0 - bne _0819A954 + bne @0819A954 ldr r4, =0x03005e00 ldr r1, =0x000002a1 adds r0, r3, r1 @@ -792812,10 +792812,10 @@ _0819A8FC: lsls r0, 3 adds r0, r4 strh r5, [r0, 0x8] - b _0819A988 + b @0819A988 .align 2, 0 .pool -_0819A954: +@0819A954: ldr r4, =0x03005e00 ldr r2, =0x000002a1 adds r0, r3, r2 @@ -792841,10 +792841,10 @@ _0819A954: adds r0, r4 movs r1, 0xD strh r1, [r0, 0x8] -_0819A988: +@0819A988: ldr r0, =sub_819A4C8 + 1 bl set_callback2 -_0819A98E: +@0819A98E: add sp, 0xC pop {r4,r5} pop {r0} @@ -792854,12 +792854,12 @@ _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] cmp r4, 0 - bne _0819AA12 + bne @0819AA12 movs r0, 0xAB lsls r0, 2 bl malloc_and_clear @@ -792873,7 +792873,7 @@ sub_819A9AC: @ 819A9AC movs r2, 0 movs r4, 0x6C movs r3, 0 -_0819A9D2: +@0819A9D2: ldr r0, [r5] adds r1, r2, 0 muls r1, r4 @@ -792883,7 +792883,7 @@ _0819A9D2: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x5 - bls _0819A9D2 + bls @0819A9D2 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000ca9 @@ -792892,30 +792892,30 @@ _0819A9D2: movs r0, 0x3 ands r0, r1 cmp r0, 0x2 - beq _0819AA0C + beq @0819AA0C movs r0, 0 bl sub_819B484 - b _0819AA12 + b @0819AA12 .align 2, 0 .pool -_0819AA0C: +@0819AA0C: movs r0, 0 bl sub_819B63C -_0819AA12: +@0819AA12: pop {r4,r5} pop {r0} bx r0 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} movs r4, 0 mov r8, r4 ldr r7, =0x02020630 -_0819AA24: +@0819AA24: lsls r1, r4, 3 adds r1, r4 lsls r1, 2 @@ -792949,7 +792949,7 @@ _0819AA24: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls _0819AA24 + bls @0819AA24 ldr r0, [r6] ldrb r1, [r0, 0x3] ldr r4, =0x02020630 @@ -793046,10 +793046,10 @@ _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: +@0819AB44: ldr r6, =0x0300127c ldr r1, [r6] movs r0, 0x6C @@ -793066,7 +793066,7 @@ _0819AB44: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls _0819AB44 + bls @0819AB44 ldr r0, [r6] ldrb r1, [r0, 0x4] lsls r0, r1, 4 @@ -793096,38 +793096,38 @@ _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 - ble _0819ABC8 + ble @0819ABC8 ldr r0, =0x0300127c ldr r1, [r0] ldrb r3, [r1, 0x3] adds r2, r0, 0 cmp r3, 0x5 - beq _0819ABC4 + beq @0819ABC4 adds r0, r3, 0x1 - b _0819ABDE + b @0819ABDE .align 2, 0 .pool -_0819ABC4: +@0819ABC4: movs r0, 0 - b _0819ABDE -_0819ABC8: + b @0819ABDE +@0819ABC8: ldr r0, =0x0300127c ldr r1, [r0] ldrb r3, [r1, 0x3] adds r2, r0, 0 cmp r3, 0 - beq _0819ABDC + beq @0819ABDC subs r0, r3, 0x1 - b _0819ABDE + b @0819ABDE .align 2, 0 .pool -_0819ABDC: +@0819ABDC: movs r0, 0x5 -_0819ABDE: +@0819ABDE: strb r0, [r1, 0x3] ldr r2, [r2] ldrb r3, [r2, 0x3] @@ -793155,38 +793155,38 @@ _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 - ble _0819AC30 + ble @0819AC30 ldr r0, =0x0300127c ldr r1, [r0] ldrb r3, [r1] adds r2, r0, 0 cmp r3, 0x2 - beq _0819AC2C + beq @0819AC2C adds r0, r3, 0x1 - b _0819AC46 + b @0819AC46 .align 2, 0 .pool -_0819AC2C: +@0819AC2C: movs r0, 0 - b _0819AC46 -_0819AC30: + b @0819AC46 +@0819AC30: ldr r0, =0x0300127c ldr r1, [r0] ldrb r3, [r1] adds r2, r0, 0 cmp r3, 0 - beq _0819AC44 + beq @0819AC44 subs r0, r3, 0x1 - b _0819AC46 + b @0819AC46 .align 2, 0 .pool -_0819AC44: +@0819AC44: movs r0, 0x2 -_0819AC46: +@0819AC46: strb r0, [r1] ldr r3, =0x02020630 ldr r2, [r2] @@ -793215,38 +793215,38 @@ _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 - ble _0819AC98 + ble @0819AC98 ldr r0, =0x0300127c ldr r1, [r0] ldrb r3, [r1, 0x7] adds r2, r0, 0 cmp r3, 0x1 - beq _0819AC94 + beq @0819AC94 adds r0, r3, 0x1 - b _0819ACAE + b @0819ACAE .align 2, 0 .pool -_0819AC94: +@0819AC94: movs r0, 0 - b _0819ACAE -_0819AC98: + b @0819ACAE +@0819AC98: ldr r0, =0x0300127c ldr r1, [r0] ldrb r3, [r1, 0x7] adds r2, r0, 0 cmp r3, 0 - beq _0819ACAC + beq @0819ACAC subs r0, r3, 0x1 - b _0819ACAE + b @0819ACAE .align 2, 0 .pool -_0819ACAC: +@0819ACAC: movs r0, 0x1 -_0819ACAE: +@0819ACAE: strb r0, [r1, 0x7] ldr r3, =0x02020630 ldr r2, [r2] @@ -793275,7 +793275,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] @@ -793286,7 +793286,7 @@ sub_819ACE0: @ 819ACE0 adds r0, r4 ldrb r0, [r0, 0x10] cmp r0, 0 - beq _0819AD60 + beq @0819AD60 movs r0, 0x64 bl gpu_pal_tags_index_of lsls r0, 24 @@ -793294,32 +793294,32 @@ sub_819ACE0: @ 819ACE0 ldr r1, [r5] ldrb r0, [r1, 0x5] cmp r0, 0x3 - bne _0819AD44 + bne @0819AD44 adds r0, r1, r4 ldrb r0, [r0, 0x10] cmp r0, 0x1 - bne _0819AD44 + bne @0819AD44 movs r2, 0 ldrb r0, [r1, 0x10] cmp r0, 0x2 - beq _0819AD32 + beq @0819AD32 movs r4, 0x6C -_0819AD1A: +@0819AD1A: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x5 - bhi _0819AD32 + bhi @0819AD32 ldr r0, [r5] adds r1, r2, 0 muls r1, r4 adds r0, r1 ldrb r0, [r0, 0x10] cmp r0, 0x2 - bne _0819AD1A -_0819AD32: + bne @0819AD1A +@0819AD32: cmp r2, 0x6 - beq _0819AD9C + beq @0819AD9C ldr r0, =0x0300127c ldr r1, [r0] movs r0, 0x6C @@ -793327,7 +793327,7 @@ _0819AD32: adds r1, r0 movs r0, 0x1 strb r0, [r1, 0x10] -_0819AD44: +@0819AD44: ldr r2, =0x0300127c ldr r1, [r2] movs r0, 0x6C @@ -793338,10 +793338,10 @@ _0819AD44: ldr r1, [r2] ldrb r0, [r1, 0x5] subs r0, 0x1 - b _0819AD78 + b @0819AD78 .align 2, 0 .pool -_0819AD60: +@0819AD60: movs r0, 0x65 bl gpu_pal_tags_index_of lsls r0, 24 @@ -793353,7 +793353,7 @@ _0819AD60: ldr r1, [r5] ldrb r0, [r1, 0x5] adds r0, 0x1 -_0819AD78: +@0819AD78: strb r0, [r1, 0x5] ldr r2, =0x02020630 ldr r0, =0x0300127c @@ -793372,7 +793372,7 @@ _0819AD78: ands r0, r2 orrs r0, r3 strb r0, [r1, 0x5] -_0819AD9C: +@0819AD9C: pop {r4-r6} pop {r0} bx r0 @@ -793381,7 +793381,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 @@ -793392,14 +793392,14 @@ sub_819ADAC: @ 819ADAC adds r0, r1 ldrb r0, [r0, 0x10] cmp r0, 0 - beq _0819ADCC + beq @0819ADCC movs r0, 0x65 - b _0819ADCE + b @0819ADCE .align 2, 0 .pool -_0819ADCC: +@0819ADCC: movs r0, 0x64 -_0819ADCE: +@0819ADCE: bl gpu_pal_tags_index_of lsls r0, 24 lsrs r3, r0, 24 @@ -793428,7 +793428,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 @@ -793441,19 +793441,19 @@ sub_819AE08: @ 819AE08 movs r1, 0x8 ldrsh r0, [r6, r1] cmp r0, 0x7 - beq _0819AE64 + beq @0819AE64 cmp r0, 0x7 - bgt _0819AE30 + bgt @0819AE30 cmp r0, 0x6 - beq _0819AE36 - b _0819AF50 + beq @0819AE36 + b @0819AF50 .align 2, 0 .pool -_0819AE30: +@0819AE30: cmp r0, 0x8 - beq _0819AEE8 - b _0819AF50 -_0819AE36: + beq @0819AEE8 + b @0819AF50 +@0819AE36: ldr r1, =0x02037714 ldr r0, =0x02037b14 movs r2, 0xE4 @@ -793471,10 +793471,10 @@ _0819AE36: bl sub_80A1AD4 movs r0, 0x7 strh r0, [r6, 0x8] - b _0819AF50 + b @0819AF50 .align 2, 0 .pool -_0819AE64: +@0819AE64: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -793482,7 +793482,7 @@ _0819AE64: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _0819AF50 + bne @0819AF50 ldr r4, =0x0300127c ldr r0, [r4] ldr r2, =0x000002a1 @@ -793518,10 +793518,10 @@ _0819AE64: bl Window_FreeMemory movs r0, 0x8 strh r0, [r6, 0x8] - b _0819AF50 + b @0819AF50 .align 2, 0 .pool -_0819AEE8: +@0819AEE8: ldr r4, =0x0300127c ldr r1, [r4] ldr r0, =0x02037714 @@ -793545,7 +793545,7 @@ _0819AEE8: bl malloc_and_clear str r0, [r4] movs r4, 0 -_0819AF1A: +@0819AF1A: ldr r5, =0x0203ce3c ldr r1, [r5] movs r0, 0x64 @@ -793563,7 +793563,7 @@ _0819AF1A: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls _0819AF1A + bls @0819AF1A ldr r1, [r5] ldr r0, =sub_819A514 + 1 str r0, [sp] @@ -793571,7 +793571,7 @@ _0819AF1A: adds r2, r6, 0 movs r3, 0x5 bl sub_81BF8EC -_0819AF50: +@0819AF50: add sp, 0x4 pop {r4-r6} pop {r0} @@ -793581,7 +793581,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 @@ -793593,7 +793593,7 @@ bc_exit_to_overworld: @ 819AF68 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - beq _0819B00E + beq @0819B00E ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 @@ -793602,13 +793602,13 @@ bc_exit_to_overworld: @ 819AF68 movs r0, 0x8 ldrsh r1, [r4, r0] cmp r1, 0 - beq _0819AFA0 + beq @0819AFA0 cmp r1, 0x1 - beq _0819AFB8 - b _0819B00E + beq @0819AFB8 + b @0819B00E .align 2, 0 .pool -_0819AFA0: +@0819AFA0: movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -793619,13 +793619,13 @@ _0819AFA0: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0819B00E -_0819AFB8: + b @0819B00E +@0819AFB8: bl fade_and_return_progress_probably lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _0819B00E + bne @0819B00E bl sub_819B764 ldr r0, [r7] ldr r1, =0x000002a1 @@ -793653,7 +793653,7 @@ _0819AFB8: bl set_callback2 adds r0, r6, 0 bl remove_task -_0819B00E: +@0819B00E: add sp, 0x4 pop {r4-r7} pop {r0} @@ -793663,7 +793663,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} @@ -793676,7 +793676,7 @@ sub_819B02C: @ 819B02C adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - beq _0819B11A + beq @0819B11A ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 @@ -793685,27 +793685,27 @@ sub_819B02C: @ 819B02C movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0x5 - beq _0819B084 + beq @0819B084 cmp r0, 0x5 - bgt _0819B06C + bgt @0819B06C cmp r0, 0x4 - beq _0819B07A - b _0819B11A + beq @0819B07A + b @0819B11A .align 2, 0 .pool -_0819B06C: +@0819B06C: cmp r0, 0xA - bne _0819B11A + bne @0819B11A bl sub_819C4B4 movs r0, 0x4 strh r0, [r5, 0x8] - b _0819B11A -_0819B07A: + b @0819B11A +@0819B07A: bl sub_819B8D4 movs r0, 0x5 strh r0, [r5, 0x8] - b _0819B11A -_0819B084: + b @0819B11A +@0819B084: ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x1 @@ -793714,28 +793714,28 @@ _0819B084: adds r0, r6, 0 ands r0, r1 cmp r0, 0 - beq _0819B0B8 + beq @0819B0B8 movs r0, 0x5 bl audio_play ldr r0, [r7] ldrb r4, [r0, 0x7] cmp r4, 0 - bne _0819B0C6 + bne @0819B0C6 bl sub_819C568 strh r4, [r5, 0x8] ldr r0, =bc_exit_to_overworld + 1 str r0, [r5] - b _0819B11A + b @0819B11A .align 2, 0 .pool -_0819B0B8: +@0819B0B8: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0819B0EC + beq @0819B0EC movs r0, 0x5 bl audio_play -_0819B0C6: +@0819B0C6: movs r0, 0x4 bl sub_819B958 bl sub_819BC9C @@ -793747,31 +793747,31 @@ _0819B0C6: strh r6, [r5, 0x8] ldr r0, =sub_819B378 + 1 str r0, [r5] - b _0819B11A + b @0819B11A .align 2, 0 .pool -_0819B0EC: +@0819B0EC: ldrh r1, [r2, 0x30] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0819B106 + beq @0819B106 movs r0, 0x5 bl audio_play movs r0, 0x1 negs r0, r0 bl sub_819AC78 - b _0819B11A -_0819B106: + b @0819B11A +@0819B106: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0819B11A + beq @0819B11A movs r0, 0x5 bl audio_play movs r0, 0x1 bl sub_819AC78 -_0819B11A: +@0819B11A: pop {r3} mov r8, r3 pop {r4-r7} @@ -793780,7 +793780,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 @@ -793795,36 +793795,36 @@ sub_819B124: @ 819B124 asrs r0, 16 adds r6, r1, 0 cmp r0, 0xB - bls _0819B144 - b _0819B36E -_0819B144: + bls @0819B144 + b @0819B36E +@0819B144: lsls r0, 2 - ldr r1, =_0819B158 + ldr r1, =@0819B158 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0819B158: - .4byte _0819B188 - .4byte _0819B1EC - .4byte _0819B36E - .4byte _0819B36E - .4byte _0819B36E - .4byte _0819B36E - .4byte _0819B36E - .4byte _0819B1BC - .4byte _0819B36E - .4byte _0819B36E - .4byte _0819B300 - .4byte _0819B35C -_0819B188: +@0819B158: + .4byte @0819B188 + .4byte @0819B1EC + .4byte @0819B36E + .4byte @0819B36E + .4byte @0819B36E + .4byte @0819B36E + .4byte @0819B36E + .4byte @0819B1BC + .4byte @0819B36E + .4byte @0819B36E + .4byte @0819B300 + .4byte @0819B35C +@0819B188: ldr r0, =0x0300127c ldr r1, [r0] ldrb r0, [r1, 0x6] cmp r0, 0 - bne _0819B1A2 + bne @0819B1A2 ldr r2, =0x00000299 adds r0, r1, r2 movs r7, 0xA8 @@ -793832,17 +793832,17 @@ _0819B188: adds r1, r7 movs r2, 0 bl sub_819F2B4 -_0819B1A2: +@0819B1A2: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 movs r0, 0x9 - b _0819B36C + b @0819B36C .align 2, 0 .pool -_0819B1BC: +@0819B1BC: ldr r4, =0x0300127c ldr r0, [r4] movs r1, 0xA8 @@ -793850,9 +793850,9 @@ _0819B1BC: adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _0819B1CE - b _0819B36E -_0819B1CE: + bne @0819B1CE + b @0819B36E +@0819B1CE: bl sub_819B844 ldr r1, [r4] movs r0, 0 @@ -793862,10 +793862,10 @@ _0819B1CE: adds r0, r5 lsls r0, 3 adds r0, r1 - b _0819B344 + b @0819B344 .align 2, 0 .pool -_0819B1EC: +@0819B1EC: ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r7, 0x1 @@ -793873,7 +793873,7 @@ _0819B1EC: adds r0, r6, 0 ands r0, r1 cmp r0, 0 - beq _0819B27C + beq @0819B27C movs r0, 0x5 bl audio_play bl sub_819BC04 @@ -793881,17 +793881,17 @@ _0819B1EC: lsrs r0, 24 adds r1, r0, 0 cmp r0, 0x1 - bne _0819B228 + bne @0819B228 ldr r0, =0x0300127c ldr r0, [r0] ldr r2, =0x000002a2 adds r0, r2 - b _0819B2AC + b @0819B2AC .align 2, 0 .pool -_0819B228: +@0819B228: cmp r0, 0x2 - bne _0819B248 + bne @0819B248 ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -793901,12 +793901,12 @@ _0819B228: strh r1, [r0, 0x8] ldr r1, =sub_819B02C + 1 str r1, [r0] - b _0819B36E + b @0819B36E .align 2, 0 .pool -_0819B248: +@0819B248: cmp r1, 0x3 - bne _0819B260 + bne @0819B260 ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -793914,10 +793914,10 @@ _0819B248: adds r0, r1 movs r1, 0xB strh r1, [r0, 0x8] - b _0819B2BA + b @0819B2BA .align 2, 0 .pool -_0819B260: +@0819B260: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -793927,14 +793927,14 @@ _0819B260: strh r1, [r0, 0x8] ldr r1, =sub_819AE08 + 1 str r1, [r0] - b _0819B36E + b @0819B36E .align 2, 0 .pool -_0819B27C: +@0819B27C: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0819B2D0 + beq @0819B2D0 movs r0, 0x5 bl audio_play ldr r4, =0x0300127c @@ -793952,7 +793952,7 @@ _0819B27C: ldr r0, [r4] ldr r1, =0x000002a2 adds r0, r1 -_0819B2AC: +@0819B2AC: strb r7, [r0] ldr r1, =0x03005e00 lsls r0, r5, 2 @@ -793960,35 +793960,35 @@ _0819B2AC: lsls r0, 3 adds r0, r1 strh r6, [r0, 0x8] -_0819B2BA: +@0819B2BA: ldr r1, =sub_819B378 + 1 str r1, [r0] - b _0819B36E + b @0819B36E .align 2, 0 .pool -_0819B2D0: +@0819B2D0: ldrh r1, [r2, 0x30] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0819B2EA + beq @0819B2EA movs r0, 0x5 bl audio_play movs r0, 0x1 negs r0, r0 bl sub_819AC10 - b _0819B36E -_0819B2EA: + b @0819B36E +@0819B2EA: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0819B36E + beq @0819B36E movs r0, 0x5 bl audio_play movs r0, 0x1 bl sub_819AC10 - b _0819B36E -_0819B300: + b @0819B36E +@0819B300: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -793996,12 +793996,12 @@ _0819B300: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - bne _0819B36E + bne @0819B36E ldr r4, =0x0300127c ldr r2, [r4] ldrb r0, [r2, 0x6] cmp r0, 0x1 - bne _0819B338 + bne @0819B338 ldr r1, =0x02037b14 movs r7, 0xA9 lsls r7, 2 @@ -794017,20 +794017,20 @@ _0819B300: ldrh r1, [r1] adds r0, r2 strh r1, [r0] -_0819B338: +@0819B338: ldr r0, [r4] strb r3, [r0, 0x6] lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r6 -_0819B344: +@0819B344: movs r1, 0x3 strh r1, [r0, 0x8] - b _0819B36E + b @0819B36E .align 2, 0 .pool -_0819B35C: +@0819B35C: bl sub_819B844 ldr r0, =0x03005e00 lsls r1, r5, 2 @@ -794038,9 +794038,9 @@ _0819B35C: lsls r1, 3 adds r1, r0 movs r0, 0xC -_0819B36C: +@0819B36C: strh r0, [r1, 0x8] -_0819B36E: +@0819B36E: pop {r4-r7} pop {r0} bx r0 @@ -794049,7 +794049,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 @@ -794060,7 +794060,7 @@ sub_819B378: @ 819B378 adds r0, r3, r7 ldrb r0, [r0] cmp r0, 0x1 - beq _0819B476 + beq @0819B476 ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 @@ -794069,40 +794069,40 @@ sub_819B378: @ 819B378 movs r0, 0x8 ldrsh r1, [r4, r0] cmp r1, 0x1 - beq _0819B3DC + beq @0819B3DC cmp r1, 0x1 - bgt _0819B3B4 + bgt @0819B3B4 cmp r1, 0 - beq _0819B3BA - b _0819B476 + beq @0819B3BA + b @0819B476 .align 2, 0 .pool -_0819B3B4: +@0819B3B4: cmp r1, 0xB - beq _0819B440 - b _0819B476 -_0819B3BA: + beq @0819B440 + b @0819B476 +@0819B3BA: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0819B476 + bne @0819B476 movs r0, 0x1 movs r1, 0x1 strh r1, [r4, 0x8] ldr r2, =0x000002a2 adds r1, r3, r2 strb r0, [r1] - b _0819B476 + b @0819B476 .align 2, 0 .pool -_0819B3DC: +@0819B3DC: ldr r2, =0x030022c0 ldrh r0, [r2, 0x2E] ands r1, r0 cmp r1, 0 - beq _0819B40C + beq @0819B40C movs r0, 0x5 bl audio_play ldr r0, [r5] @@ -794114,41 +794114,41 @@ _0819B3DC: strh r0, [r4, 0x8] ldr r0, =sub_819B124 + 1 str r0, [r4] - b _0819B476 + b @0819B476 .align 2, 0 .pool -_0819B40C: +@0819B40C: ldrh r1, [r2, 0x30] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0819B422 + beq @0819B422 movs r0, 0x5 bl audio_play movs r0, 0x1 negs r0, r0 - b _0819B432 -_0819B422: + b @0819B432 +@0819B422: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0819B476 + beq @0819B476 movs r0, 0x5 bl audio_play movs r0, 0x1 -_0819B432: +@0819B432: bl sub_819ABA8 bl sub_819BCF8 bl sub_819B9E8 - b _0819B476 -_0819B440: + b @0819B476 +@0819B440: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r6, 0x1 adds r0, r6, 0 ands r0, r1 cmp r0, 0 - beq _0819B476 + beq @0819B476 movs r0, 0x5 bl audio_play ldr r1, [r5] @@ -794166,7 +794166,7 @@ _0819B440: movs r1, 0x1 strb r1, [r0] strh r6, [r4, 0x8] -_0819B476: +@0819B476: pop {r4-r7} pop {r0} bx r0 @@ -794175,7 +794175,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 @@ -794222,10 +794222,10 @@ sub_819B484: @ 819B484 movs r2, 0x32 str r2, [sp, 0x14] cmp r0, 0 - beq _0819B4EA + beq @0819B4EA movs r3, 0x64 str r3, [sp, 0x14] -_0819B4EA: +@0819B4EA: adds r0, r6, 0 adds r1, r5, 0 bl sub_81A6F70 @@ -794248,7 +794248,7 @@ _0819B4EA: mov r9, r2 movs r3, 0 mov r8, r3 -_0819B518: +@0819B518: ldr r0, =0x03005d90 ldr r1, [r0] mov r2, r8 @@ -794272,17 +794272,17 @@ _0819B518: mov r10, r2 ldr r0, [sp, 0x1C] cmp r8, r0 - bcs _0819B570 + bcs @0819B570 ldr r0, [sp, 0x18] adds r0, 0x1 lsls r0, 24 lsrs r0, 24 - b _0819B572 + b @0819B572 .align 2, 0 .pool -_0819B570: +@0819B570: ldr r0, [sp, 0x18] -_0819B572: +@0819B572: movs r1, 0 bl sub_81A6CA8 lsls r0, 24 @@ -794316,7 +794316,7 @@ _0819B572: movs r3, 0x1 add r8, r3 ldr r3, =0x0300127c -_0819B5B8: +@0819B5B8: ldr r0, [r3] adds r0, r4 adds r0, 0x8 @@ -794335,7 +794335,7 @@ _0819B5B8: lsrs r6, r0, 24 ldr r3, [sp, 0x20] cmp r6, 0x3 - bls _0819B5B8 + bls @0819B5B8 movs r0, 0x6C mov r4, r10 muls r4, r0 @@ -794364,9 +794364,9 @@ _0819B5B8: lsrs r0, 24 mov r8, r0 cmp r0, 0x5 - bhi _0819B620 - b _0819B518 -_0819B620: + bhi @0819B620 + b @0819B518 +@0819B620: add sp, 0x24 pop {r3-r5} mov r8, r3 @@ -794380,7 +794380,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 @@ -794411,7 +794411,7 @@ sub_819B63C: @ 819B63C mov r10, r3 movs r7, 0 mov r9, r7 -_0819B678: +@0819B678: ldr r0, =0x03005d90 ldr r1, [r0] mov r2, r9 @@ -794457,7 +794457,7 @@ _0819B678: strb r3, [r0] movs r0, 0x1 add r9, r0 -_0819B6D4: +@0819B6D4: ldr r1, =0x0300127c ldr r0, [r1] adds r0, r4 @@ -794477,7 +794477,7 @@ _0819B6D4: lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x3 - bls _0819B6D4 + bls @0819B6D4 movs r7, 0x6C adds r4, r6, 0 muls r4, r7 @@ -794507,7 +794507,7 @@ _0819B6D4: lsrs r0, 24 mov r9, r0 cmp r0, 0x5 - bls _0819B678 + bls @0819B678 add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -794521,7 +794521,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 @@ -794532,11 +794532,11 @@ sub_819B764: @ 819B764 mov r10, r0 ldr r1, =0x03005d90 mov r8, r1 -_0819B778: +@0819B778: movs r2, 0 adds r0, r7, 0x1 mov r9, r0 -_0819B77E: +@0819B77E: mov r1, r10 ldr r0, [r1] movs r1, 0x6C @@ -794545,7 +794545,7 @@ _0819B77E: adds r1, r0, r6 ldrb r0, [r1, 0x10] cmp r0, r9 - bne _0819B81C + bne @0819B81C movs r0, 0x64 adds r5, r7, 0 muls r5, r0 @@ -794599,21 +794599,21 @@ _0819B77E: ldr r2, =0x00000e78 adds r1, r2 strb r0, [r1] - b _0819B826 + b @0819B826 .align 2, 0 .pool -_0819B81C: +@0819B81C: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x5 - bls _0819B77E -_0819B826: + bls @0819B77E +@0819B826: mov r1, r9 lsls r0, r1, 24 lsrs r7, r0, 24 cmp r7, 0x2 - bls _0819B778 + bls @0819B778 bl calc_player_party_count pop {r3-r5} mov r8, r3 @@ -794625,15 +794625,15 @@ _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] ldrb r0, [r1, 0x6] cmp r0, 0 - bne _0819B852 + bne @0819B852 strb r0, [r1] -_0819B852: +@0819B852: ldr r4, =0x02020630 ldr r2, [r5] ldrb r1, [r2, 0x1] @@ -794699,7 +794699,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] @@ -794765,7 +794765,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 @@ -794809,7 +794809,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 @@ -794835,7 +794835,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 @@ -794889,7 +794889,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 @@ -794899,24 +794899,24 @@ sub_819BA64: @ 819BA64 ldr r0, [r0] ldrb r0, [r0, 0x5] cmp r0, 0x1 - bne _0819BA88 + bne @0819BA88 ldr r2, =0x085eebc1 - b _0819BA9C + b @0819BA9C .align 2, 0 .pool -_0819BA88: +@0819BA88: cmp r0, 0x2 - bne _0819BA94 + bne @0819BA94 ldr r2, =0x085eebdb - b _0819BA9C + b @0819BA9C .align 2, 0 .pool -_0819BA94: +@0819BA94: ldr r2, =0x085eec2d cmp r0, 0x3 - bne _0819BA9C + bne @0819BA9C ldr r2, =0x085eebf6 -_0819BA9C: +@0819BA9C: movs r0, 0x5 str r0, [sp] movs r0, 0 @@ -794937,7 +794937,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 @@ -794964,7 +794964,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 @@ -794991,7 +794991,7 @@ sub_819BAFC: @ 819BAFC movs r3, 0x1 bl box_print cmp r5, 0 - beq _0819BB60 + beq @0819BB60 str r4, [sp] str r6, [sp, 0x4] ldr r0, =0x085eec24 @@ -795001,10 +795001,10 @@ sub_819BAFC: @ 819BAFC movs r2, 0x7 movs r3, 0x11 bl box_print - b _0819BB74 + b @0819BB74 .align 2, 0 .pool -_0819BB60: +@0819BB60: str r4, [sp] str r5, [sp, 0x4] ldr r0, =0x085eec10 @@ -795014,7 +795014,7 @@ _0819BB60: movs r2, 0x7 movs r3, 0x11 bl box_print -_0819BB74: +@0819BB74: ldr r0, =0x08610476 str r0, [sp] movs r0, 0 @@ -795038,7 +795038,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 @@ -795078,7 +795078,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, =0x0861041c @@ -795099,7 +795099,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] @@ -795110,18 +795110,18 @@ sub_819BC30: @ 819BC30 ldrb r1, [r0, 0x10] ldrh r0, [r0, 0xC] cmp r1, 0 - bne _0819BC60 + bne @0819BC60 bl sub_819C634 cmp r0, 0 - bne _0819BC60 + bne @0819BC60 bl sub_819BAC8 movs r0, 0x3 bl sub_819B958 movs r0, 0x3 - b _0819BC96 + b @0819BC96 .align 2, 0 .pool -_0819BC60: +@0819BC60: ldr r4, =0x0300127c ldr r1, [r4] movs r2, 0xA6 @@ -795139,21 +795139,21 @@ _0819BC60: ldr r0, [r4] ldrb r0, [r0, 0x5] cmp r0, 0x3 - bhi _0819BC94 + bhi @0819BC94 movs r0, 0x1 - b _0819BC96 + b @0819BC96 .align 2, 0 .pool -_0819BC94: +@0819BC94: movs r0, 0x2 -_0819BC96: +@0819BC96: pop {r4} pop {r1} bx r1 thumb_func_end sub_819BC30 thumb_func_start sub_819BC9C -sub_819BC9C: @ 819BC9C +sub_819BC9C: ; 819BC9C push {lr} bl sub_819C568 bl sub_819ACE0 @@ -795164,26 +795164,26 @@ sub_819BC9C: @ 819BC9C ldr r0, [r0] ldrb r0, [r0, 0x5] cmp r0, 0x3 - bhi _0819BCC4 + bhi @0819BCC4 movs r0, 0x1 - b _0819BCC6 + b @0819BCC6 .align 2, 0 .pool -_0819BCC4: +@0819BCC4: movs r0, 0x2 -_0819BCC6: +@0819BCC6: pop {r1} bx r1 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] @@ -795205,14 +795205,14 @@ 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 ldr r0, [r5] ldrb r4, [r0, 0x3] cmp r4, 0x5 - bhi _0819BD64 + bhi @0819BD64 movs r0, 0x5 bl Window_WriteStandardTileMap movs r0, 0x5 @@ -795252,7 +795252,7 @@ sub_819BCF8: @ 819BCF8 movs r0, 0x5 movs r1, 0x2 bl Window_CopyToVram -_0819BD64: +@0819BD64: add sp, 0x2C pop {r4,r5} pop {r0} @@ -795262,7 +795262,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} @@ -795345,7 +795345,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 @@ -795358,7 +795358,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 @@ -795472,7 +795472,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 @@ -795482,13 +795482,13 @@ sub_819BF2C: @ 819BF2C movs r7, 0 ldr r0, =0x0300127c mov r9, r0 -_0819BF3E: +@0819BF3E: movs r2, 0 adds r1, r7, 0x1 mov r10, r1 lsls r0, r7, 2 mov r8, r0 -_0819BF48: +@0819BF48: mov r0, r9 ldr r1, [r0] movs r0, 0x6C @@ -795497,7 +795497,7 @@ _0819BF48: adds r0, r1, r4 ldrb r0, [r0, 0x10] cmp r0, r10 - bne _0819C008 + bne @0819C008 adds r4, r1 adds r4, 0x14 adds r0, r4, 0 @@ -795573,21 +795573,21 @@ _0819BF48: adds r0, 0x29 movs r1, 0 strb r1, [r0] - b _0819C012 + b @0819C012 .align 2, 0 .pool -_0819C008: +@0819C008: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x5 - bls _0819BF48 -_0819C012: + bls @0819BF48 +@0819C012: mov r2, r10 lsls r0, r2, 24 lsrs r7, r0, 24 cmp r7, 0x2 - bls _0819BF3E + bls @0819BF3E ldr r0, =0x0300127c ldr r0, [r0] movs r1, 0xA8 @@ -795608,7 +795608,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 @@ -795616,7 +795616,7 @@ sub_819C040: @ 819C040 movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0819C0DC + beq @0819C0DC ldr r3, =0x02020630 ldr r6, =0x0300127c ldr r2, [r6] @@ -795631,7 +795631,7 @@ sub_819C040: @ 819C040 ldrb r0, [r1] lsls r0, 26 cmp r0, 0 - bge _0819C0DC + bge @0819C0DC ldr r1, =0x0000029d adds r0, r2, r1 ldrb r1, [r0] @@ -795643,7 +795643,7 @@ sub_819C040: @ 819C040 ldrb r0, [r0] lsls r0, 26 cmp r0, 0 - bge _0819C0DC + bge @0819C0DC adds r1, r4, 0 adds r1, 0x3E ldrb r0, [r1] @@ -795685,7 +795685,7 @@ sub_819C040: @ 819C040 bl _call_via_r1 ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] -_0819C0DC: +@0819C0DC: pop {r4-r6} pop {r0} bx r0 @@ -795694,7 +795694,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 @@ -795702,7 +795702,7 @@ sub_819C100: @ 819C100 movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0819C1BA + beq @0819C1BA ldr r6, =0x02020630 ldr r4, =0x0300127c ldr r2, [r4] @@ -795717,7 +795717,7 @@ sub_819C100: @ 819C100 ldrb r0, [r0] lsls r0, 26 cmp r0, 0 - bge _0819C1BA + bge @0819C1BA ldr r1, =0x0000029d adds r0, r2, r1 ldrb r1, [r0] @@ -795729,7 +795729,7 @@ sub_819C100: @ 819C100 ldrb r0, [r0] lsls r0, 26 cmp r0, 0 - bge _0819C1BA + bge @0819C1BA ldrb r0, [r5, 0x3] lsls r0, 26 lsrs r0, 27 @@ -795782,7 +795782,7 @@ sub_819C100: @ 819C100 bl obj_delete_and_free_tiles adds r0, r5, 0 bl obj_delete_and_free_tiles -_0819C1BA: +@0819C1BA: pop {r4-r7} pop {r0} bx r0 @@ -795791,7 +795791,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 @@ -795803,19 +795803,19 @@ sub_819C1D0: @ 819C1D0 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _0819C24E + beq @0819C24E cmp r0, 0x1 - bgt _0819C1F8 + bgt @0819C1F8 cmp r0, 0 - beq _0819C1FE - b _0819C2BA + beq @0819C1FE + b @0819C2BA .align 2, 0 .pool -_0819C1F8: +@0819C1F8: cmp r0, 0x2 - beq _0819C270 - b _0819C2BA -_0819C1FE: + beq @0819C270 + b @0819C2BA +@0819C1FE: movs r0, 0x10 strh r0, [r4, 0xE] movs r0, 0xE0 @@ -795850,8 +795850,8 @@ _0819C1FE: movs r0, 0x4A movs r1, 0x37 bl lcd_io_set - b _0819C2C6 -_0819C24E: + b @0819C2C6 +@0819C24E: movs r0, 0x3 bl gpu_sync_bg_show ldr r1, =0x00001248 @@ -795860,10 +795860,10 @@ _0819C24E: ldr r1, =0x0000040b movs r0, 0x52 bl lcd_io_set - b _0819C2C6 + b @0819C2C6 .align 2, 0 .pool -_0819C270: +@0819C270: ldrh r0, [r4, 0x12] subs r0, 0x4 strh r0, [r4, 0x12] @@ -795873,12 +795873,12 @@ _0819C270: lsls r0, 16 asrs r0, 16 cmp r0, 0x20 - ble _0819C28C + ble @0819C28C lsls r0, r1, 16 asrs r0, 16 cmp r0, 0x5F - ble _0819C29E -_0819C28C: + ble @0819C29E +@0819C28C: movs r0, 0x20 strh r0, [r4, 0x12] movs r0, 0x60 @@ -795887,7 +795887,7 @@ _0819C28C: lsls r1, 6 movs r0, 0 bl lcd_io_clear_bits -_0819C29E: +@0819C29E: ldrh r1, [r4, 0x12] lsls r1, 8 ldrh r0, [r4, 0x18] @@ -795899,25 +795899,25 @@ _0819C29E: movs r1, 0x12 ldrsh r0, [r4, r1] cmp r0, 0x20 - bne _0819C2CC - b _0819C2C6 -_0819C2BA: + bne @0819C2CC + b @0819C2C6 +@0819C2BA: adds r0, r2, 0 bl remove_task bl sub_819BF2C - b _0819C2CC -_0819C2C6: + b @0819C2CC +@0819C2C6: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_0819C2CC: +@0819C2CC: pop {r4} pop {r0} bx r0 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 @@ -795933,13 +795933,13 @@ sub_819C2D4: @ 819C2D4 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - bne _0819C2F6 - b _0819C410 -_0819C2F6: + bne @0819C2F6 + b @0819C410 +@0819C2F6: cmp r0, 0x1 - bne _0819C2FC - b _0819C460 -_0819C2FC: + bne @0819C2FC + b @0819C460 +@0819C2FC: movs r0, 0x3 bl gpu_sync_bg_hide ldr r4, =0x02020630 @@ -796054,10 +796054,10 @@ _0819C2FC: bl lcd_io_clear_bits adds r0, r7, 0 bl remove_task - b _0819C4A4 + b @0819C4A4 .align 2, 0 .pool -_0819C410: +@0819C410: movs r0, 0x10 strh r0, [r4, 0xE] movs r0, 0xE0 @@ -796092,8 +796092,8 @@ _0819C410: movs r0, 0x4A movs r1, 0x37 bl lcd_io_set - b _0819C49E -_0819C460: + b @0819C49E +@0819C460: ldrh r0, [r4, 0x12] adds r0, 0x4 strh r0, [r4, 0x12] @@ -796103,17 +796103,17 @@ _0819C460: lsls r0, 16 asrs r0, 16 cmp r0, 0x3F - bgt _0819C47C + bgt @0819C47C lsls r0, r1, 16 asrs r0, 16 cmp r0, 0x41 - bgt _0819C484 -_0819C47C: + bgt @0819C484 +@0819C47C: movs r0, 0x40 strh r0, [r4, 0x12] movs r0, 0x41 strh r0, [r4, 0x18] -_0819C484: +@0819C484: ldrh r1, [r4, 0x12] lsls r1, 8 ldrh r0, [r4, 0x18] @@ -796125,12 +796125,12 @@ _0819C484: movs r1, 0x12 ldrsh r0, [r4, r1] cmp r0, 0x40 - bne _0819C4A4 -_0819C49E: + bne @0819C4A4 +@0819C49E: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_0819C4A4: +@0819C4A4: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -796141,7 +796141,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} @@ -796217,7 +796217,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] @@ -796264,7 +796264,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} @@ -796313,7 +796313,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 @@ -796326,53 +796326,53 @@ sub_819C634: @ 819C634 ldrb r5, [r0, 0x5] movs r3, 0x1 cmp r3, r5 - bcs _0819C694 + bcs @0819C694 adds r4, r0, 0 movs r0, 0x6C mov r12, r0 adds r7, r2, 0 -_0819C656: +@0819C656: movs r2, 0 -_0819C658: +@0819C658: mov r0, r12 muls r0, r2 adds r1, r4, r0 ldrb r0, [r1, 0x10] cmp r0, r3 - bne _0819C680 + bne @0819C680 ldrh r0, [r1, 0xC] ldr r1, [r7] lsls r0, 4 adds r0, r1 ldrh r0, [r0] cmp r0, r6 - bne _0819C68A + bne @0819C68A movs r0, 0 - b _0819C696 + b @0819C696 .align 2, 0 .pool -_0819C680: +@0819C680: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x5 - bls _0819C658 -_0819C68A: + bls @0819C658 +@0819C68A: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, r5 - bcc _0819C656 -_0819C694: + bcc @0819C656 +@0819C694: movs r0, 0x1 -_0819C696: +@0819C696: pop {r4-r7} pop {r1} bx r1 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 @@ -796384,19 +796384,19 @@ sub_819C69C: @ 819C69C movs r0, 0x8 ldrsh r2, [r5, r0] cmp r2, 0x1 - beq _0819C6F8 + beq @0819C6F8 cmp r2, 0x1 - bgt _0819C6C4 + bgt @0819C6C4 cmp r2, 0 - beq _0819C6CA - b _0819C7D8 + beq @0819C6CA + b @0819C7D8 .align 2, 0 .pool -_0819C6C4: +@0819C6C4: cmp r2, 0x2 - beq _0819C7B4 - b _0819C7D8 -_0819C6CA: + beq @0819C7B4 + b @0819C7D8 +@0819C6CA: ldr r1, =0x0300127c ldr r0, [r1] ldr r3, =0x000002a7 @@ -796412,10 +796412,10 @@ _0819C6CA: movs r1, 0x1 strb r1, [r0] strh r1, [r5, 0x8] - b _0819C7D8 + b @0819C7D8 .align 2, 0 .pool -_0819C6F8: +@0819C6F8: ldr r0, =0x0300127c ldr r3, [r0] ldr r2, =0x000002a2 @@ -796423,18 +796423,18 @@ _0819C6F8: ldrb r1, [r1] adds r7, r0, 0 cmp r1, 0 - beq _0819C7D8 + beq @0819C7D8 ldr r1, =0x000002a9 adds r0, r3, r1 ldrb r4, [r0] cmp r4, 0 - beq _0819C724 + beq @0819C724 movs r0, 0x2 strh r0, [r5, 0x8] - b _0819C7D8 + b @0819C7D8 .align 2, 0 .pool -_0819C724: +@0819C724: ldr r2, =0x000002a7 adds r1, r3, r2 ldrb r0, [r1] @@ -796444,31 +796444,31 @@ _0819C724: adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0x6 - bls _0819C764 + bls @0819C764 strb r4, [r1] ldr r1, [r7] subs r2, 0x1 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - bne _0819C758 + bne @0819C758 movs r3, 0xAA lsls r3, 2 adds r1, r3 ldrb r0, [r1] subs r0, 0x1 - b _0819C762 + b @0819C762 .align 2, 0 .pool -_0819C758: +@0819C758: movs r0, 0xAA lsls r0, 2 adds r1, r0 ldrb r0, [r1] adds r0, 0x1 -_0819C762: +@0819C762: strb r0, [r1] -_0819C764: +@0819C764: movs r0, 0x80 lsls r0, 7 ldr r1, [r7] @@ -796482,16 +796482,16 @@ _0819C764: adds r4, r2, r4 ldrb r0, [r4] cmp r0, 0x5 - bls _0819C790 + bls @0819C790 ldr r3, =0x000002a6 adds r1, r2, r3 movs r0, 0 - b _0819C7D6 + b @0819C7D6 .align 2, 0 .pool -_0819C790: +@0819C790: cmp r0, 0 - bne _0819C7D8 + bne @0819C7D8 ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 @@ -796502,36 +796502,36 @@ _0819C790: ldr r0, =0x000002a6 adds r1, r2, r0 movs r0, 0x1 - b _0819C7D6 + b @0819C7D6 .align 2, 0 .pool -_0819C7B4: +@0819C7B4: ldr r0, =0x0300127c ldr r0, [r0] ldr r2, =0x000002a9 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xE - bls _0819C7D4 + bls @0819C7D4 movs r0, 0 strb r0, [r1] movs r0, 0x1 strh r0, [r5, 0x8] - b _0819C7D8 + b @0819C7D8 .align 2, 0 .pool -_0819C7D4: +@0819C7D4: adds r0, 0x1 -_0819C7D6: +@0819C7D6: strb r0, [r1] -_0819C7D8: +@0819C7D8: pop {r4-r7} pop {r0} bx r0 thumb_func_end sub_819C69C thumb_func_start sub_819C7E0 -sub_819C7E0: @ 819C7E0 +sub_819C7E0: ; 819C7E0 push {lr} bl call_obj_callbacks bl obj_sync_something @@ -796543,7 +796543,7 @@ sub_819C7E0: @ 819C7E0 thumb_func_end sub_819C7E0 thumb_func_start sub_819C7FC -sub_819C7FC: @ 819C7FC +sub_819C7FC: ; 819C7FC push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -796553,7 +796553,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 @@ -796667,7 +796667,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 @@ -796680,19 +796680,19 @@ sub_819C90C: @ 819C90C movs r1, 0x8 ldrsh r0, [r6, r1] cmp r0, 0x7 - beq _0819C950 + beq @0819C950 cmp r0, 0x7 - bgt _0819C934 + bgt @0819C934 cmp r0, 0x6 - beq _0819C93A - b _0819C9F0 + beq @0819C93A + b @0819C9F0 .align 2, 0 .pool -_0819C934: +@0819C934: cmp r0, 0x8 - beq _0819C9C4 - b _0819C9F0 -_0819C93A: + beq @0819C9C4 + b @0819C9F0 +@0819C93A: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -796702,8 +796702,8 @@ _0819C93A: bl sub_80A1AD4 movs r0, 0x7 strh r0, [r6, 0x8] - b _0819C9F0 -_0819C950: + b @0819C9F0 +@0819C950: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -796711,7 +796711,7 @@ _0819C950: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _0819C9F0 + bne @0819C9F0 ldr r4, =0x03001284 ldr r0, [r4] adds r0, 0x21 @@ -796741,10 +796741,10 @@ _0819C950: bl Window_FreeMemory movs r0, 0x8 strh r0, [r6, 0x8] - b _0819C9F0 + b @0819C9F0 .align 2, 0 .pool -_0819C9C4: +@0819C9C4: adds r0, r2, 0 bl remove_task ldr r2, =0x03001284 @@ -796765,7 +796765,7 @@ _0819C9C4: movs r0, 0 movs r3, 0x2 bl sub_81BF8EC -_0819C9F0: +@0819C9F0: add sp, 0x4 pop {r4-r6} pop {r0} @@ -796775,7 +796775,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 @@ -796786,7 +796786,7 @@ sub_819CA08: @ 819CA08 adds r0, 0x30 ldrb r0, [r0] cmp r0, 0x1 - beq _0819CAFE + beq @0819CAFE ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 @@ -796795,54 +796795,54 @@ sub_819CA08: @ 819CA08 movs r0, 0x8 ldrsh r1, [r4, r0] cmp r1, 0x1 - beq _0819CA78 + beq @0819CA78 cmp r1, 0x1 - bgt _0819CA44 + bgt @0819CA44 cmp r1, 0 - beq _0819CA4E - b _0819CAFE + beq @0819CA4E + b @0819CAFE .align 2, 0 .pool -_0819CA44: +@0819CA44: cmp r1, 0x2 - beq _0819CA8C + beq @0819CA8C cmp r1, 0x3 - beq _0819CAA4 - b _0819CAFE -_0819CA4E: + beq @0819CAA4 + b @0819CAFE +@0819CA4E: adds r0, r2, 0 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x1 - bne _0819CA68 + bne @0819CA68 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] ldr r0, =0x020375f0 strh r1, [r0] - b _0819CAFE + b @0819CAFE .align 2, 0 .pool -_0819CA68: +@0819CA68: movs r0, 0x2 strh r0, [r4, 0x8] ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] - b _0819CAFE + b @0819CAFE .align 2, 0 .pool -_0819CA78: +@0819CA78: adds r0, r2, 0 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x1 - bne _0819CA9C + bne @0819CA9C ldrb r0, [r2, 0x3] strb r0, [r2, 0x13] bl sub_819C810 - b _0819CA9C -_0819CA8C: + b @0819CA9C +@0819CA8C: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -796850,17 +796850,17 @@ _0819CA8C: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 -_0819CA9C: +@0819CA9C: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0819CAFE -_0819CAA4: + b @0819CAFE +@0819CAA4: bl fade_and_return_progress_probably lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _0819CAFE + bne @0819CAFE ldr r0, [r7] adds r0, 0x21 ldrb r0, [r0] @@ -796890,7 +796890,7 @@ _0819CAA4: bl set_callback2 adds r0, r6, 0 bl remove_task -_0819CAFE: +@0819CAFE: add sp, 0x4 pop {r4-r7} pop {r0} @@ -796900,7 +796900,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 @@ -796909,7 +796909,7 @@ sub_819CB1C: @ 819CB1C adds r0, 0x30 ldrb r0, [r0] cmp r0, 0x1 - beq _0819CBD6 + beq @0819CBD6 ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 @@ -796918,86 +796918,86 @@ sub_819CB1C: @ 819CB1C movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x4 - beq _0819CB50 + beq @0819CB50 cmp r0, 0x5 - beq _0819CB5A - b _0819CBD6 + beq @0819CB5A + b @0819CBD6 .align 2, 0 .pool -_0819CB50: +@0819CB50: bl sub_819E9E0 movs r0, 0x5 strh r0, [r4, 0x8] - b _0819CBD6 -_0819CB5A: + b @0819CBD6 +@0819CB5A: ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r6, 0x1 adds r5, r6, 0 ands r5, r1 cmp r5, 0 - beq _0819CB86 + beq @0819CB86 movs r0, 0x5 bl audio_play ldr r0, [r7] ldrb r0, [r0, 0x16] cmp r0, 0 - bne _0819CB80 + bne @0819CB80 strh r6, [r4, 0xA] - b _0819CB9C + b @0819CB9C .align 2, 0 .pool -_0819CB80: +@0819CB80: movs r0, 0 strh r0, [r4, 0xA] - b _0819CB96 -_0819CB86: + b @0819CB96 +@0819CB86: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0819CBA8 + beq @0819CBA8 movs r0, 0x5 bl audio_play strh r5, [r4, 0xA] -_0819CB96: +@0819CB96: movs r0, 0x4 bl sub_819EA64 -_0819CB9C: +@0819CB9C: ldrh r0, [r4, 0x14] ldrh r1, [r4, 0x16] lsls r0, 16 orrs r0, r1 str r0, [r4] - b _0819CBD6 -_0819CBA8: + b @0819CBD6 +@0819CBA8: ldrh r1, [r2, 0x30] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0819CBC2 + beq @0819CBC2 movs r0, 0x5 bl audio_play movs r0, 0x1 negs r0, r0 bl sub_819E758 - b _0819CBD6 -_0819CBC2: + b @0819CBD6 +@0819CBC2: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0819CBD6 + beq @0819CBD6 movs r0, 0x5 bl audio_play movs r0, 0x1 bl sub_819E758 -_0819CBD6: +@0819CBD6: pop {r4-r7} pop {r0} bx r0 thumb_func_end sub_819CB1C thumb_func_start sub_819CBDC -sub_819CBDC: @ 819CBDC +sub_819CBDC: ; 819CBDC push {lr} lsls r0, 24 lsrs r0, 24 @@ -797009,14 +797009,14 @@ sub_819CBDC: @ 819CBDC movs r1, 0xA ldrsh r0, [r2, r1] cmp r0, 0x1 - bne _0819CC04 + bne @0819CC04 movs r0, 0 strh r0, [r2, 0x8] ldr r0, =sub_819CA08 + 1 - b _0819CC16 + b @0819CC16 .align 2, 0 .pool -_0819CC04: +@0819CC04: movs r0, 0 strh r0, [r2, 0x8] ldr r1, =sub_819CE40 + 1 @@ -797026,7 +797026,7 @@ _0819CC04: movs r0, 0x1 strh r0, [r2, 0x12] ldr r0, =sub_819D770 + 1 -_0819CC16: +@0819CC16: str r0, [r2] pop {r0} bx r0 @@ -797035,7 +797035,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 @@ -797047,7 +797047,7 @@ sub_819CC24: @ 819CC24 movs r0, 0x8 ldrsh r5, [r4, r0] cmp r5, 0 - bne _0819CC5A + bne @0819CC5A ldr r0, =0x085eecbb bl sub_819EBEC ldr r0, =0x03001284 @@ -797062,7 +797062,7 @@ sub_819CC24: @ 819CC24 strh r1, [r4, 0x16] ldr r0, =sub_819CB1C + 1 str r0, [r4] -_0819CC5A: +@0819CC5A: pop {r4,r5} pop {r0} bx r0 @@ -797071,7 +797071,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 @@ -797090,14 +797090,14 @@ sub_819CC74: @ 819CC74 movs r1, 0xA ldrsh r0, [r2, r1] cmp r0, 0x1 - bne _0819CCB0 + bne @0819CCB0 movs r0, 0 strh r0, [r2, 0x8] ldr r0, =sub_819CA08 + 1 - b _0819CCC2 + b @0819CCC2 .align 2, 0 .pool -_0819CCB0: +@0819CCB0: movs r0, 0 strh r0, [r2, 0x8] ldr r1, =sub_819CE40 + 1 @@ -797107,7 +797107,7 @@ _0819CCB0: movs r0, 0x1 strh r0, [r2, 0x12] ldr r0, =sub_819D770 + 1 -_0819CCC2: +@0819CCC2: str r0, [r2] pop {r4} pop {r0} @@ -797117,7 +797117,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 @@ -797129,7 +797129,7 @@ sub_819CCD4: @ 819CCD4 movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0 - bne _0819CD1A + bne @0819CD1A ldr r4, =0x03001284 ldr r1, [r4] adds r0, r1, 0 @@ -797151,7 +797151,7 @@ sub_819CCD4: @ 819CCD4 strh r1, [r5, 0x16] ldr r0, =sub_819CB1C + 1 str r0, [r5] -_0819CD1A: +@0819CD1A: pop {r4,r5} pop {r0} bx r0 @@ -797160,7 +797160,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} @@ -797174,55 +797174,55 @@ sub_819CD34: @ 819CD34 movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0x3 - beq _0819CDA4 + beq @0819CDA4 cmp r0, 0x3 - bgt _0819CD60 + bgt @0819CD60 cmp r0, 0x2 - beq _0819CD66 - b _0819CE36 + beq @0819CD66 + b @0819CE36 .align 2, 0 .pool -_0819CD60: +@0819CD60: cmp r0, 0x9 - beq _0819CD88 - b _0819CE36 -_0819CD66: + beq @0819CD88 + b @0819CE36 +@0819CD66: ldr r0, =0x03001284 ldr r1, [r0] ldrb r0, [r1, 0x15] cmp r0, 0 - bne _0819CD7C + bne @0819CD7C adds r0, r1, 0 adds r0, 0x2D adds r1, 0x30 movs r2, 0x1 bl sub_819F2B4 -_0819CD7C: +@0819CD7C: movs r0, 0x9 strh r0, [r5, 0x8] - b _0819CE36 + b @0819CE36 .align 2, 0 .pool -_0819CD88: +@0819CD88: ldr r0, =0x03001284 ldr r0, [r0] adds r0, 0x30 ldrb r0, [r0] cmp r0, 0x1 - beq _0819CE36 + beq @0819CE36 bl sub_819E944 movs r0, 0x3 strh r0, [r5, 0x8] - b _0819CE36 + b @0819CE36 .align 2, 0 .pool -_0819CDA4: +@0819CDA4: ldr r7, =0x03001284 ldr r0, [r7] adds r0, 0x30 ldrb r0, [r0] cmp r0, 0x1 - beq _0819CE36 + beq @0819CE36 ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x1 @@ -797230,19 +797230,19 @@ _0819CDA4: mov r4, r8 ands r4, r1 cmp r4, 0 - beq _0819CDD8 + beq @0819CDD8 movs r0, 0x5 bl audio_play adds r0, r6, 0 bl sub_819F0A0 - b _0819CE36 + b @0819CE36 .align 2, 0 .pool -_0819CDD8: +@0819CDD8: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0819CE14 + beq @0819CE14 movs r0, 0x5 bl audio_play ldr r1, [r7] @@ -797261,27 +797261,27 @@ _0819CDD8: strh r1, [r5, 0x12] ldr r0, =sub_819D770 + 1 str r0, [r5] - b _0819CE36 + b @0819CE36 .align 2, 0 .pool -_0819CE14: +@0819CE14: ldrh r1, [r2, 0x30] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0819CE28 + beq @0819CE28 movs r0, 0x1 negs r0, r0 bl sub_819E7C0 - b _0819CE36 -_0819CE28: + b @0819CE36 +@0819CE28: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0819CE36 + beq @0819CE36 movs r0, 0x1 bl sub_819E7C0 -_0819CE36: +@0819CE36: pop {r3} mov r8, r3 pop {r4-r7} @@ -797290,7 +797290,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 @@ -797302,35 +797302,35 @@ sub_819CE40: @ 819CE40 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - beq _0819CE64 + beq @0819CE64 cmp r0, 0x1 - beq _0819CE88 - b _0819CF4C + beq @0819CE88 + b @0819CF4C .align 2, 0 .pool -_0819CE64: +@0819CE64: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0819CF4C + bne @0819CF4C ldr r0, =0x03001284 ldr r0, [r0] adds r0, 0x22 movs r1, 0x1 strb r1, [r0] strh r1, [r4, 0x8] - b _0819CF4C + b @0819CF4C .align 2, 0 .pool -_0819CE88: +@0819CE88: ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] adds r5, r1, 0 ands r5, r0 cmp r5, 0 - beq _0819CEBC + beq @0819CEBC movs r0, 0x5 bl audio_play ldr r0, =0x03001284 @@ -797342,14 +797342,14 @@ _0819CE88: bl sub_819EAC0 adds r0, r6, 0 bl sub_819F184 - b _0819CF4C + b @0819CF4C .align 2, 0 .pool -_0819CEBC: +@0819CEBC: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0819CEF8 + beq @0819CEF8 movs r0, 0x5 bl audio_play ldr r0, =0x03001284 @@ -797366,56 +797366,56 @@ _0819CEBC: strh r5, [r4, 0x12] ldr r0, =sub_819D588 + 1 str r0, [r4] - b _0819CF4C + b @0819CF4C .align 2, 0 .pool -_0819CEF8: +@0819CEF8: ldrh r1, [r2, 0x30] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0819CF0C + beq @0819CF0C movs r0, 0x1 negs r0, r0 bl sub_819E694 - b _0819CF2A -_0819CF0C: + b @0819CF2A +@0819CF0C: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0819CF1C + beq @0819CF1C movs r0, 0x1 bl sub_819E694 - b _0819CF2A -_0819CF1C: + b @0819CF2A +@0819CF1C: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _0819CF34 + beq @0819CF34 movs r0, 0x1 bl sub_819E6E8 -_0819CF2A: +@0819CF2A: bl sub_819EFA8 bl sub_819EB4C - b _0819CF4C -_0819CF34: + b @0819CF4C +@0819CF34: movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0819CF4C + beq @0819CF4C movs r0, 0x1 negs r0, r0 bl sub_819E6E8 bl sub_819EFA8 bl sub_819EB4C -_0819CF4C: +@0819CF4C: pop {r4-r6} pop {r0} bx r0 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 @@ -797427,19 +797427,19 @@ sub_819CF54: @ 819CF54 movs r0, 0x8 ldrsh r2, [r4, r0] cmp r2, 0x1 - beq _0819CFA0 + beq @0819CFA0 cmp r2, 0x1 - bgt _0819CF7C + bgt @0819CF7C cmp r2, 0 - beq _0819CF82 - b _0819D05C + beq @0819CF82 + b @0819D05C .align 2, 0 .pool -_0819CF7C: +@0819CF7C: cmp r2, 0x2 - beq _0819D03C - b _0819D05C -_0819CF82: + beq @0819D03C + b @0819D05C +@0819CF82: ldr r1, =0x03001284 ldr r0, [r1] adds r0, 0x27 @@ -797452,10 +797452,10 @@ _0819CF82: movs r1, 0x1 strb r1, [r0] strh r1, [r4, 0x8] - b _0819D05C + b @0819D05C .align 2, 0 .pool -_0819CFA0: +@0819CFA0: ldr r1, =0x03001284 ldr r2, [r1] adds r0, r2, 0 @@ -797463,18 +797463,18 @@ _0819CFA0: ldrb r0, [r0] adds r6, r1, 0 cmp r0, 0 - beq _0819D05C + beq @0819D05C adds r0, r2, 0 adds r0, 0x29 ldrb r3, [r0] cmp r3, 0 - beq _0819CFC4 + beq @0819CFC4 movs r0, 0x2 strh r0, [r4, 0x8] - b _0819D05C + b @0819D05C .align 2, 0 .pool -_0819CFC4: +@0819CFC4: adds r1, r2, 0 adds r1, 0x27 ldrb r0, [r1] @@ -797485,25 +797485,25 @@ _0819CFC4: adds r1, 0x27 ldrb r0, [r1] cmp r0, 0x6 - bls _0819CFF8 + bls @0819CFF8 strb r3, [r1] ldr r1, [r6] adds r0, r1, 0 adds r0, 0x26 ldrb r0, [r0] cmp r0, 0 - bne _0819CFF0 + bne @0819CFF0 adds r1, 0x28 ldrb r0, [r1] subs r0, 0x1 - b _0819CFF6 -_0819CFF0: + b @0819CFF6 +@0819CFF0: adds r1, 0x28 ldrb r0, [r1] adds r0, 0x1 -_0819CFF6: +@0819CFF6: strb r0, [r1] -_0819CFF8: +@0819CFF8: movs r0, 0x80 lsls r0, 7 ldr r1, [r6] @@ -797516,14 +797516,14 @@ _0819CFF8: adds r0, 0x28 ldrb r0, [r0] cmp r0, 0x5 - bls _0819D01C + bls @0819D01C adds r1, r2, 0 adds r1, 0x26 movs r0, 0 - b _0819D05A -_0819D01C: + b @0819D05A +@0819D01C: cmp r0, 0 - bne _0819D05C + bne @0819D05C ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -797534,36 +797534,36 @@ _0819D01C: adds r1, r2, 0 adds r1, 0x26 movs r0, 0x1 - b _0819D05A + b @0819D05A .align 2, 0 .pool -_0819D03C: +@0819D03C: ldr r0, =0x03001284 ldr r0, [r0] adds r1, r0, 0 adds r1, 0x29 ldrb r0, [r1] cmp r0, 0xE - bls _0819D058 + bls @0819D058 movs r0, 0 strb r0, [r1] movs r0, 0x1 strh r0, [r4, 0x8] - b _0819D05C + b @0819D05C .align 2, 0 .pool -_0819D058: +@0819D058: adds r0, 0x1 -_0819D05A: +@0819D05A: strb r0, [r1] -_0819D05C: +@0819D05C: pop {r4-r6} pop {r0} bx r0 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 @@ -797575,52 +797575,52 @@ sub_819D064: @ 819D064 movs r0, 0x8 ldrsh r1, [r4, r0] cmp r1, 0x1 - beq _0819D0A4 + beq @0819D0A4 cmp r1, 0x1 - bgt _0819D08C + bgt @0819D08C cmp r1, 0 - beq _0819D092 - b _0819D118 + beq @0819D092 + b @0819D118 .align 2, 0 .pool -_0819D08C: +@0819D08C: cmp r1, 0x2 - beq _0819D0BC - b _0819D118 -_0819D092: + beq @0819D0BC + b @0819D118 +@0819D092: ldr r0, =0x03001284 ldr r0, [r0] adds r0, 0x27 strb r1, [r0] strh r1, [r4, 0x10] - b _0819D0AE + b @0819D0AE .align 2, 0 .pool -_0819D0A4: +@0819D0A4: ldr r0, =0x020378f4 movs r1, 0xE0 movs r2, 0xA bl gpu_pal_apply -_0819D0AE: +@0819D0AE: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0819D118 + b @0819D118 .align 2, 0 .pool -_0819D0BC: +@0819D0BC: ldr r2, =0x03001284 ldr r0, [r2] adds r0, 0x28 ldrb r0, [r0] cmp r0, 0xF - bls _0819D0D2 + bls @0819D0D2 movs r0, 0x1 strh r0, [r4, 0x10] ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_0819D0D2: +@0819D0D2: ldr r1, [r2] adds r1, 0x27 ldrb r0, [r1] @@ -797631,7 +797631,7 @@ _0819D0D2: adds r1, 0x27 ldrb r0, [r1] cmp r0, 0x3 - bls _0819D108 + bls @0819D108 movs r0, 0 strb r0, [r1] ldr r1, =0x02037714 @@ -797648,7 +797648,7 @@ _0819D0D2: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_0819D108: +@0819D108: movs r0, 0x80 lsls r0, 7 ldr r1, [r2] @@ -797656,7 +797656,7 @@ _0819D108: ldrb r1, [r1] movs r2, 0 bl sub_80A2A20 -_0819D118: +@0819D118: pop {r4} pop {r0} bx r0 @@ -797665,7 +797665,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 @@ -797684,32 +797684,32 @@ sub_819D12C: @ 819D12C movs r2, 0x8 ldrsh r3, [r4, r2] cmp r3, 0 - beq _0819D15C + beq @0819D15C cmp r3, 0x1 - beq _0819D168 - b _0819D310 + beq @0819D168 + b @0819D310 .align 2, 0 .pool -_0819D15C: +@0819D15C: strh r3, [r4, 0xA] strh r3, [r4, 0xC] strh r3, [r4, 0xE] movs r0, 0x1 strh r0, [r4, 0x8] - b _0819D310 -_0819D168: + b @0819D310 +@0819D168: movs r3, 0 str r3, [sp, 0x4] movs r1, 0x2 str r0, [sp, 0x8] ldr r0, =0x03005e00 str r0, [sp, 0xC] -_0819D174: +@0819D174: lsls r0, r1, 24 asrs r4, r0, 24 mov r9, r0 cmp r4, 0x2 - beq _0819D1F2 + beq @0819D1F2 ldr r2, =0x02020630 ldr r3, =0x03001284 ldr r0, [r3] @@ -797730,7 +797730,7 @@ _0819D174: lsrs r5, r0, 24 mov r10, r2 cmp r5, 0x10 - beq _0819D1BE + beq @0819D1BE adds r0, r4, 0x2 lsls r0, 1 ldr r2, [sp, 0x8] @@ -797741,20 +797741,20 @@ _0819D174: movs r3, 0 ldrsh r0, [r0, r3] cmp r0, 0x1 - bne _0819D1D8 -_0819D1BE: + bne @0819D1D8 +@0819D1BE: lsls r0, r7, 24 lsrs r0, 24 str r0, [sp, 0x4] mov r0, r12 adds r0, 0xA strh r0, [r6, 0x20] - b _0819D210 + b @0819D210 .align 2, 0 .pool -_0819D1D8: +@0819D1D8: cmp r5, 0x10 - bls _0819D210 + bls @0819D210 adds r0, r4, 0x1 add r0, r8 ldrb r1, [r0] @@ -797765,8 +797765,8 @@ _0819D1D8: ldrh r0, [r0, 0x20] subs r0, 0x30 strh r0, [r6, 0x20] - b _0819D210 -_0819D1F2: + b @0819D210 +@0819D1F2: ldr r3, =0x02020630 ldr r4, =0x03001284 ldr r0, [r4] @@ -797782,7 +797782,7 @@ _0819D1F2: adds r2, 0xA strh r2, [r0, 0x20] mov r10, r3 -_0819D210: +@0819D210: mov r0, r9 asrs r2, r0, 24 adds r0, r2, 0x1 @@ -797795,7 +797795,7 @@ _0819D210: movs r3, 0 ldrsh r0, [r0, r3] cmp r0, 0x1 - bne _0819D26A + bne @0819D26A ldr r1, =0x03001284 ldr r0, [r1] adds r0, 0x5 @@ -797813,21 +797813,21 @@ _0819D210: lsls r0, 4 adds r0, 0x48 cmp r3, r0 - ble _0819D260 + ble @0819D260 strh r0, [r1, 0x20] movs r7, 0x1 - b _0819D26C + b @0819D26C .align 2, 0 .pool -_0819D260: +@0819D260: movs r7, 0 cmp r3, r0 - bne _0819D26C + bne @0819D26C movs r7, 0x1 - b _0819D26C -_0819D26A: + b @0819D26C +@0819D26A: movs r7, 0 -_0819D26C: +@0819D26C: mov r6, r10 ldr r5, =0x03001284 ldr r2, [r5] @@ -797844,7 +797844,7 @@ _0819D26C: ldrsh r0, [r1, r3] subs r0, 0x10 cmp r0, 0xF0 - ble _0819D2F8 + ble @0819D2F8 ldrh r0, [r1, 0x20] lsls r0, 24 lsrs r0, 24 @@ -797853,7 +797853,7 @@ _0819D26C: strh r0, [r1, 0x20] ldrb r0, [r2, 0x14] cmp r0, 0x1 - bne _0819D2C0 + bne @0819D2C0 movs r0, 0x65 bl gpu_pal_tags_index_of ldr r1, [r5] @@ -797864,10 +797864,10 @@ _0819D26C: adds r2, r1 lsls r2, 2 adds r2, r6 - b _0819D2D8 + b @0819D2D8 .align 2, 0 .pool -_0819D2C0: +@0819D2C0: movs r0, 0x64 bl gpu_pal_tags_index_of ldr r2, =0x03001284 @@ -797879,7 +797879,7 @@ _0819D2C0: adds r2, r1 lsls r2, 2 add r2, r10 -_0819D2D8: +@0819D2D8: lsls r0, 4 ldrb r3, [r2, 0x5] movs r1, 0xF @@ -797896,20 +797896,20 @@ _0819D2D8: adds r0, r2 movs r1, 0x1 strh r1, [r0] -_0819D2F8: +@0819D2F8: movs r0, 0xFF lsls r0, 24 add r0, r9 lsrs r1, r0, 24 cmp r0, 0 - blt _0819D306 - b _0819D174 -_0819D306: + blt @0819D306 + b @0819D174 +@0819D306: cmp r7, 0x1 - bne _0819D310 + bne @0819D310 ldr r0, [sp] bl remove_task -_0819D310: +@0819D310: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -797923,7 +797923,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 @@ -797943,23 +797943,23 @@ sub_819D324: @ 819D324 ldrsh r5, [r2, r0] mov r10, r1 cmp r5, 0x1 - bne _0819D352 + bne @0819D352 lsls r0, r4, 24 negs r0, r0 lsrs r4, r0, 24 -_0819D352: +@0819D352: movs r1, 0x8 ldrsh r0, [r2, r1] cmp r0, 0 - beq _0819D368 + beq @0819D368 cmp r0, 0x1 - bne _0819D360 - b _0819D480 -_0819D360: - b _0819D570 + bne @0819D360 + b @0819D480 +@0819D360: + b @0819D570 .align 2, 0 .pool -_0819D368: +@0819D368: ldr r3, =0x02020630 ldr r2, =0x03001284 ldr r0, [r2] @@ -797970,7 +797970,7 @@ _0819D368: adds r0, r3 ldrh r0, [r0, 0x20] cmp r5, 0 - bne _0819D39C + bne @0819D39C lsls r0, 16 asrs r0, 16 lsls r2, r4, 24 @@ -797978,13 +797978,13 @@ _0819D368: adds r0, r1 movs r1, 0x1 cmp r0, 0xEF - ble _0819D3B2 + ble @0819D3B2 movs r1, 0 movs r0, 0xF0 - b _0819D3B0 + b @0819D3B0 .align 2, 0 .pool -_0819D39C: +@0819D39C: lsls r0, 16 asrs r0, 16 lsls r2, r4, 24 @@ -797992,22 +797992,22 @@ _0819D39C: adds r0, r1 movs r1, 0x1 cmp r0, 0xA0 - bgt _0819D3B2 + bgt @0819D3B2 movs r1, 0 movs r0, 0xA0 -_0819D3B0: +@0819D3B0: mov r8, r0 -_0819D3B2: +@0819D3B2: cmp r1, 0x1 - bne _0819D3FC + bne @0819D3FC movs r3, 0 ldr r7, =0x02020630 ldr r6, =0x03001284 asrs r5, r2, 24 -_0819D3BE: +@0819D3BE: movs r4, 0 adds r2, r3, 0x1 -_0819D3C2: +@0819D3C2: ldr r1, [r6] lsls r0, r4, 1 adds r0, r4 @@ -798026,15 +798026,15 @@ _0819D3C2: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bls _0819D3C2 + bls @0819D3C2 lsls r0, r2, 24 lsrs r3, r0, 24 cmp r3, 0x2 - bls _0819D3BE - b _0819D570 + bls @0819D3BE + b @0819D570 .align 2, 0 .pool -_0819D3FC: +@0819D3FC: movs r4, 0 lsls r1, r7, 2 mov r12, r1 @@ -798044,7 +798044,7 @@ _0819D3FC: add r0, r8 mov r9, r0 ldr r5, =0x02020630 -_0819D40E: +@0819D40E: ldr r1, =0x03001284 ldr r2, [r1] lsls r3, r4, 1 @@ -798081,7 +798081,7 @@ _0819D40E: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bls _0819D40E + bls @0819D40E mov r1, r12 adds r0, r1, r7 lsls r0, 3 @@ -798095,10 +798095,10 @@ _0819D40E: strh r1, [r0, 0xE] adds r0, r7, 0 bl remove_task - b _0819D570 + b @0819D570 .align 2, 0 .pool -_0819D480: +@0819D480: ldr r2, =0x02020630 ldr r0, =0x03001284 ldr r0, [r0] @@ -798109,7 +798109,7 @@ _0819D480: adds r0, r2 ldrh r0, [r0, 0x20] cmp r5, 0 - bne _0819D4B4 + bne @0819D4B4 lsls r0, 16 asrs r0, 16 lsls r2, r4, 24 @@ -798117,13 +798117,13 @@ _0819D480: adds r0, r1 movs r1, 0x1 cmp r0, 0xEF - ble _0819D4CA + ble @0819D4CA movs r1, 0 movs r0, 0xF0 - b _0819D4C8 + b @0819D4C8 .align 2, 0 .pool -_0819D4B4: +@0819D4B4: lsls r0, 16 asrs r0, 16 lsls r2, r4, 24 @@ -798131,22 +798131,22 @@ _0819D4B4: adds r0, r1 movs r1, 0x1 cmp r0, 0xC0 - bgt _0819D4CA + bgt @0819D4CA movs r1, 0 movs r0, 0xC0 -_0819D4C8: +@0819D4C8: mov r8, r0 -_0819D4CA: +@0819D4CA: cmp r1, 0x1 - bne _0819D510 + bne @0819D510 movs r3, 0 ldr r7, =0x02020630 ldr r6, =0x03001284 asrs r5, r2, 24 -_0819D4D6: +@0819D4D6: movs r4, 0 adds r2, r3, 0x1 -_0819D4DA: +@0819D4DA: ldr r0, [r6] lsls r1, r4, 1 adds r1, r3, r1 @@ -798164,15 +798164,15 @@ _0819D4DA: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bls _0819D4DA + bls @0819D4DA lsls r0, r2, 24 lsrs r3, r0, 24 cmp r3, 0x1 - bls _0819D4D6 - b _0819D570 + bls @0819D4D6 + b @0819D570 .align 2, 0 .pool -_0819D510: +@0819D510: movs r4, 0 lsls r1, r7, 2 mov r12, r1 @@ -798181,7 +798181,7 @@ _0819D510: ldr r5, =0x02020630 ldr r0, =0x03001284 mov r9, r0 -_0819D520: +@0819D520: mov r1, r9 ldr r2, [r1] lsls r3, r4, 1 @@ -798207,7 +798207,7 @@ _0819D520: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bls _0819D520 + bls @0819D520 mov r1, r12 adds r0, r1, r7 lsls r0, 3 @@ -798221,7 +798221,7 @@ _0819D520: strh r1, [r0, 0x10] adds r0, r7, 0 bl remove_task -_0819D570: +@0819D570: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -798234,7 +798234,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} @@ -798250,25 +798250,25 @@ sub_819D588: @ 819D588 ldrsh r0, [r0, r2] mov r8, r1 cmp r0, 0x5 - bls _0819D5AA - b _0819D762 -_0819D5AA: + bls @0819D5AA + b @0819D762 +@0819D5AA: lsls r0, 2 - ldr r1, =_0819D5BC + ldr r1, =@0819D5BC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0819D5BC: - .4byte _0819D5D4 - .4byte _0819D5F0 - .4byte _0819D60C - .4byte _0819D63C - .4byte _0819D6F0 - .4byte _0819D73A -_0819D5D4: +@0819D5BC: + .4byte @0819D5D4 + .4byte @0819D5F0 + .4byte @0819D60C + .4byte @0819D63C + .4byte @0819D6F0 + .4byte @0819D73A +@0819D5D4: ldr r0, =0x08610918 movs r1, 0xE0 movs r2, 0xA @@ -798276,10 +798276,10 @@ _0819D5D4: bl sub_819ED34 movs r0, 0x5 bl Window_WriteStandardTileMap - b _0819D622 + b @0819D622 .align 2, 0 .pool -_0819D5F0: +@0819D5F0: movs r0, 0x3 bl sub_819EA64 ldr r0, =0x03005e00 @@ -798290,10 +798290,10 @@ _0819D5F0: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _0819D762 + b @0819D762 .align 2, 0 .pool -_0819D60C: +@0819D60C: movs r0, 0x80 lsls r0, 7 ldr r1, =0x0860f13c @@ -798304,7 +798304,7 @@ _0819D60C: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 -_0819D622: +@0819D622: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -798313,10 +798313,10 @@ _0819D622: ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b _0819D762 + b @0819D762 .align 2, 0 .pool -_0819D63C: +@0819D63C: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -798324,9 +798324,9 @@ _0819D63C: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - beq _0819D64E - b _0819D762 -_0819D64E: + beq @0819D64E + b @0819D762 +@0819D64E: movs r0, 0x5 movs r1, 0 bl Window_FastFillPixels @@ -798337,7 +798337,7 @@ _0819D64E: ldr r0, [r0] ldrb r0, [r0, 0x14] cmp r0, 0x1 - bne _0819D6B0 + bne @0819D6B0 ldr r0, =sub_819D324 + 1 movs r1, 0 bl AddTask @@ -798363,10 +798363,10 @@ _0819D64E: ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] - b _0819D762 + b @0819D762 .align 2, 0 .pool -_0819D6B0: +@0819D6B0: ldr r0, =sub_819D324 + 1 movs r1, 0 bl AddTask @@ -798392,10 +798392,10 @@ _0819D6B0: ldrh r0, [r2, 0x8] adds r0, 0x2 strh r0, [r2, 0x8] - b _0819D762 + b @0819D762 .align 2, 0 .pool -_0819D6F0: +@0819D6F0: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -798405,7 +798405,7 @@ _0819D6F0: movs r2, 0xC ldrsh r7, [r6, r2] cmp r7, 0 - bne _0819D734 + bne @0819D734 ldr r0, =sub_819D324 + 1 movs r1, 0 bl AddTask @@ -798425,14 +798425,14 @@ _0819D6F0: ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] - b _0819D762 + b @0819D762 .align 2, 0 .pool -_0819D734: +@0819D734: subs r0, 0x1 strh r0, [r6, 0xC] - b _0819D762 -_0819D73A: + b @0819D762 +@0819D73A: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -798441,11 +798441,11 @@ _0819D73A: movs r1, 0xE ldrsh r0, [r2, r1] cmp r0, 0x1 - bne _0819D762 + bne @0819D762 movs r1, 0x10 ldrsh r0, [r2, r1] cmp r0, 0x1 - bne _0819D762 + bne @0819D762 ldrh r0, [r2, 0x12] strh r0, [r2, 0x8] ldrh r0, [r2, 0x14] @@ -798453,7 +798453,7 @@ _0819D73A: lsls r0, 16 orrs r0, r1 str r0, [r2] -_0819D762: +@0819D762: add sp, 0x4 pop {r3} mov r8, r3 @@ -798463,7 +798463,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} @@ -798476,9 +798476,9 @@ sub_819D770: @ 819D770 ldrb r0, [r0] adds r3, r1, 0 cmp r0, 0x1 - bne _0819D78C - b _0819D9D8 -_0819D78C: + bne @0819D78C + b @0819D9D8 +@0819D78C: ldr r0, =0x03005e00 lsls r2, r6, 2 adds r1, r2, r6 @@ -798489,32 +798489,32 @@ _0819D78C: mov r8, r0 adds r5, r2, 0 cmp r1, 0x8 - bls _0819D7A4 - b _0819D9D8 -_0819D7A4: + bls @0819D7A4 + b @0819D9D8 +@0819D7A4: lsls r0, r1, 2 - ldr r1, =_0819D7BC + ldr r1, =@0819D7BC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0819D7BC: - .4byte _0819D7E0 - .4byte _0819D868 - .4byte _0819D8AE - .4byte _0819D8F4 - .4byte _0819D910 - .4byte _0819D928 - .4byte _0819D936 - .4byte _0819D948 - .4byte _0819D9B0 -_0819D7E0: +@0819D7BC: + .4byte @0819D7E0 + .4byte @0819D868 + .4byte @0819D8AE + .4byte @0819D8F4 + .4byte @0819D910 + .4byte @0819D928 + .4byte @0819D936 + .4byte @0819D948 + .4byte @0819D9B0 +@0819D7E0: ldr r0, [r3] ldrb r7, [r0, 0x14] cmp r7, 0x1 - bne _0819D828 + bne @0819D828 ldr r0, =sub_819D324 + 1 movs r1, 0 bl AddTask @@ -798540,10 +798540,10 @@ _0819D7E0: ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] - b _0819D9D8 + b @0819D9D8 .align 2, 0 .pool -_0819D828: +@0819D828: ldr r0, =sub_819D324 + 1 movs r1, 0 bl AddTask @@ -798569,10 +798569,10 @@ _0819D828: ldrh r0, [r2, 0x8] adds r0, 0x2 strh r0, [r2, 0x8] - b _0819D9D8 + b @0819D9D8 .align 2, 0 .pool -_0819D868: +@0819D868: adds r0, r5, r6 lsls r0, 3 mov r1, r8 @@ -798581,7 +798581,7 @@ _0819D868: movs r2, 0xC ldrsh r7, [r5, r2] cmp r7, 0 - bne _0819D8A8 + bne @0819D8A8 ldr r0, =sub_819D324 + 1 movs r1, 0 bl AddTask @@ -798601,14 +798601,14 @@ _0819D868: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] - b _0819D9D8 + b @0819D9D8 .align 2, 0 .pool -_0819D8A8: +@0819D8A8: subs r0, 0x1 strh r0, [r5, 0xC] - b _0819D9D8 -_0819D8AE: + b @0819D9D8 +@0819D8AE: adds r0, r5, r6 lsls r0, 3 mov r1, r8 @@ -798616,15 +798616,15 @@ _0819D8AE: movs r2, 0xE ldrsh r0, [r4, r2] cmp r0, 0x1 - beq _0819D8C0 - b _0819D9D8 -_0819D8C0: + beq @0819D8C0 + b @0819D9D8 +@0819D8C0: movs r1, 0x10 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _0819D8CA - b _0819D9D8 -_0819D8CA: + beq @0819D8CA + b @0819D9D8 +@0819D8CA: ldr r1, =0x02037b14 ldr r0, =0x0860f13c adds r0, 0x4A @@ -798639,10 +798639,10 @@ _0819D8CA: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _0819D9D8 + b @0819D9D8 .align 2, 0 .pool -_0819D8F4: +@0819D8F4: movs r0, 0x80 lsls r0, 7 ldr r1, =0x0860f13c @@ -798653,55 +798653,55 @@ _0819D8F4: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - b _0819D990 + b @0819D990 .align 2, 0 .pool -_0819D910: +@0819D910: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _0819D9D8 + bne @0819D9D8 movs r0, 0 bl sub_819EDBC - b _0819D990 + b @0819D990 .align 2, 0 .pool -_0819D928: +@0819D928: movs r0, 0x1 bl sub_819EDBC movs r0, 0x3 bl Window_WriteStandardTileMap - b _0819D990 -_0819D936: + b @0819D990 +@0819D936: movs r0, 0x5 movs r1, 0 bl Window_FastFillPixels movs r0, 0x5 movs r1, 0x2 bl Window_CopyToVram - b _0819D990 -_0819D948: + b @0819D990 +@0819D948: ldr r0, =0x03001284 ldr r0, [r0] ldrb r0, [r0, 0x14] cmp r0, 0 - bne _0819D964 + bne @0819D964 ldr r0, =0x085eec73 bl sub_819EBEC - b _0819D96A + b @0819D96A .align 2, 0 .pool -_0819D964: +@0819D964: ldr r0, =0x085eec8b bl sub_819EBEC -_0819D96A: +@0819D96A: ldr r0, =0x03001284 ldr r1, [r0] ldrb r0, [r1, 0x3] cmp r0, 0x2 - bhi _0819D98C + bhi @0819D98C ldr r2, =0x02020630 ldrb r1, [r1, 0x4] lsls r0, r1, 4 @@ -798714,9 +798714,9 @@ _0819D96A: negs r1, r1 ands r1, r2 strb r1, [r0] -_0819D98C: +@0819D98C: bl sub_819EFA8 -_0819D990: +@0819D990: ldr r0, =0x03005e00 adds r1, r5, r6 lsls r1, 3 @@ -798724,10 +798724,10 @@ _0819D990: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _0819D9D8 + b @0819D9D8 .align 2, 0 .pool -_0819D9B0: +@0819D9B0: bl sub_819EEF0 bl sub_819EADC ldr r0, =0x03001284 @@ -798746,7 +798746,7 @@ _0819D9B0: lsls r1, 16 orrs r1, r2 str r1, [r0] -_0819D9D8: +@0819D9D8: add sp, 0x4 pop {r3} mov r8, r3 @@ -798758,7 +798758,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 @@ -798767,9 +798767,9 @@ sub_819D9EC: @ 819D9EC adds r0, 0x30 ldrb r0, [r0] cmp r0, 0x1 - bne _0819DA00 - b _0819DBCA -_0819DA00: + bne @0819DA00 + b @0819DBCA +@0819DA00: ldr r0, =0x03005e00 lsls r2, r6, 2 adds r1, r2, r6 @@ -798780,33 +798780,33 @@ _0819DA00: adds r3, r0, 0 adds r7, r2, 0 cmp r1, 0x4 - bls _0819DA18 - b _0819DBCA -_0819DA18: + bls @0819DA18 + b @0819DBCA +@0819DA18: lsls r0, r1, 2 - ldr r1, =_0819DA30 + ldr r1, =@0819DA30 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0819DA30: - .4byte _0819DA44 - .4byte _0819DA58 - .4byte _0819DA8C - .4byte _0819DABC - .4byte _0819DBB0 -_0819DA44: +@0819DA30: + .4byte @0819DA44 + .4byte @0819DA58 + .4byte @0819DA8C + .4byte @0819DABC + .4byte @0819DBB0 +@0819DA44: bl sub_819EEF0 ldr r0, =0x03005e00 adds r1, r7, r6 lsls r1, 3 adds r1, r0 - b _0819DB96 + b @0819DB96 .align 2, 0 .pool -_0819DA58: +@0819DA58: bl sub_819EADC ldr r2, =0x02020630 ldr r0, =0x03001284 @@ -798825,10 +798825,10 @@ _0819DA58: adds r1, r7, r6 lsls r1, 3 adds r1, r0 - b _0819DB96 + b @0819DB96 .align 2, 0 .pool -_0819DA8C: +@0819DA8C: ldr r0, =sub_819D12C + 1 movs r1, 0 bl AddTask @@ -798843,17 +798843,17 @@ _0819DA8C: adds r0, r2 ldr r1, =sub_819D064 + 1 str r1, [r0] - b _0819DB90 + b @0819DB90 .align 2, 0 .pool -_0819DABC: +@0819DABC: ldr r0, =sub_819D12C + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - beq _0819DACA - b _0819DBCA -_0819DACA: + beq @0819DACA + b @0819DBCA +@0819DACA: ldr r2, =0x03005e00 ldr r4, =0x03001284 ldr r0, [r4] @@ -798866,24 +798866,24 @@ _0819DACA: movs r1, 0x10 ldrsh r0, [r0, r1] cmp r0, 0x1 - bne _0819DBCA + bne @0819DBCA bl sub_819EAC0 ldr r0, [r4] ldrb r0, [r0, 0x14] cmp r0, 0 - bne _0819DB04 + bne @0819DB04 movs r0, 0x1 bl sub_819F048 - b _0819DB32 + b @0819DB32 .align 2, 0 .pool -_0819DB04: +@0819DB04: movs r0, 0 bl sub_819F048 movs r2, 0 ldr r5, =0x02020630 movs r3, 0x4 -_0819DB10: +@0819DB10: ldr r0, [r4] adds r0, 0xB adds r0, r2 @@ -798900,8 +798900,8 @@ _0819DB10: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x2 - bls _0819DB10 -_0819DB32: + bls @0819DB10 +@0819DB32: ldr r5, =0x02020630 ldr r4, =0x03001284 ldr r3, [r4] @@ -798949,18 +798949,18 @@ _0819DB32: adds r0, r2 movs r1, 0x1 strh r1, [r0, 0x8] -_0819DB90: +@0819DB90: adds r1, r7, r6 lsls r1, 3 adds r1, r2 -_0819DB96: +@0819DB96: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _0819DBCA + b @0819DBCA .align 2, 0 .pool -_0819DBB0: +@0819DBB0: adds r0, r7, r6 lsls r0, 3 adds r0, r3 @@ -798974,7 +798974,7 @@ _0819DBB0: strh r1, [r0, 0x12] ldr r1, =sub_819D770 + 1 str r1, [r0] -_0819DBCA: +@0819DBCA: pop {r4-r7} pop {r0} bx r0 @@ -798983,12 +798983,12 @@ _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] cmp r4, 0 - bne _0819DBF6 + bne @0819DBF6 movs r0, 0x34 bl malloc_and_clear str r0, [r5] @@ -798998,7 +798998,7 @@ sub_819DBD8: @ 819DBD8 strb r4, [r0] ldr r0, [r5] strb r4, [r0, 0x15] -_0819DBF6: +@0819DBF6: pop {r4,r5} pop {r0} bx r0 @@ -799007,7 +799007,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 @@ -799021,7 +799021,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 @@ -799031,35 +799031,35 @@ sub_819DC1C: @ 819DC1C ldrb r0, [r0] adds r2, r1, 0 cmp r0, 0xF - bls _0819DC32 - b _0819E0AA -_0819DC32: + bls @0819DC32 + b @0819E0AA +@0819DC32: lsls r0, 2 - ldr r1, =_0819DC44 + ldr r1, =@0819DC44 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0819DC44: - .4byte _0819DC84 - .4byte _0819DCD4 - .4byte _0819DDA8 - .4byte _0819DE68 - .4byte _0819DE94 - .4byte _0819DECC - .4byte _0819DEEC - .4byte _0819DF10 - .4byte _0819DF30 - .4byte _0819DF3C - .4byte _0819DF64 - .4byte _0819DF70 - .4byte _0819DF78 - .4byte _0819DF8C - .4byte _0819DFA4 - .4byte _0819E01C -_0819DC84: +@0819DC44: + .4byte @0819DC84 + .4byte @0819DCD4 + .4byte @0819DDA8 + .4byte @0819DE68 + .4byte @0819DE94 + .4byte @0819DECC + .4byte @0819DEEC + .4byte @0819DF10 + .4byte @0819DF30 + .4byte @0819DF3C + .4byte @0819DF64 + .4byte @0819DF70 + .4byte @0819DF78 + .4byte @0819DF8C + .4byte @0819DFA4 + .4byte @0819E01C +@0819DC84: movs r0, 0 bl SetHBlankCallback movs r0, 0 @@ -799084,10 +799084,10 @@ _0819DC84: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _0819E00E + b @0819E00E .align 2, 0 .pool -_0819DCD4: +@0819DCD4: ldr r5, =0x0203ce40 movs r4, 0x88 lsls r4, 3 @@ -799164,10 +799164,10 @@ _0819DCD4: movs r0, 0x4A movs r1, 0 bl lcd_io_set - b _0819E006 + b @0819E006 .align 2, 0 .pool -_0819DDA8: +@0819DDA8: bl sub_80A1A74 bl reset_all_obj_data bl clear_tasks @@ -799228,10 +799228,10 @@ _0819DDA8: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _0819E00E + b @0819E00E .align 2, 0 .pool -_0819DE68: +@0819DE68: ldr r0, =0x0203ce4c ldr r1, [r0] movs r0, 0x3 @@ -799246,10 +799246,10 @@ _0819DE68: bl gpu_copy_to_iwram_tile_map_rect movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - b _0819E006 + b @0819E006 .align 2, 0 .pool -_0819DE94: +@0819DE94: ldr r0, =0x086106b0 bl gpu_pal_obj_alloc_and_load_multiple ldr r0, =0x08610650 @@ -799262,41 +799262,41 @@ _0819DE94: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _0819E00E + b @0819E00E .align 2, 0 .pool -_0819DECC: +@0819DECC: ldr r0, =0x03001284 ldr r1, [r0] ldrb r0, [r1, 0x15] cmp r0, 0x1 - bne _0819DEDC + bne @0819DEDC ldr r0, =0x0203cf20 ldrb r0, [r0] strb r0, [r1, 0x3] -_0819DEDC: +@0819DEDC: movs r0, 0x87 lsls r0, 3 adds r1, r2, r0 - b _0819E00E + b @0819E00E .align 2, 0 .pool -_0819DEEC: +@0819DEEC: bl sub_819DBD8 bl sub_819E0C0 ldr r0, =0x03001284 ldr r0, [r0] ldrb r0, [r0, 0x15] cmp r0, 0x1 - bne _0819DF02 + bne @0819DF02 bl sub_819F304 -_0819DF02: +@0819DF02: movs r0, 0 bl sub_819F048 - b _0819E006 + b @0819E006 .align 2, 0 .pool -_0819DF10: +@0819DF10: ldr r0, =0x085eec73 bl sub_819EBEC movs r0, 0x2 @@ -799305,52 +799305,52 @@ _0819DF10: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _0819E00E + b @0819E00E .align 2, 0 .pool -_0819DF30: +@0819DF30: bl sub_819EFA8 movs r0, 0x8 bl Window_WriteStandardTileMap - b _0819E006 -_0819DF3C: + b @0819E006 +@0819DF3C: ldr r0, =0x03001284 ldr r0, [r0] ldrb r0, [r0, 0x15] cmp r0, 0 - bne _0819DF4A + bne @0819DF4A bl sub_819EB4C -_0819DF4A: +@0819DF4A: movs r0, 0x1 bl Window_WriteStandardTileMap ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _0819E00E + b @0819E00E .align 2, 0 .pool -_0819DF64: +@0819DF64: bl sub_819EB18 movs r0, 0 bl Window_WriteStandardTileMap - b _0819E006 -_0819DF70: + b @0819E006 +@0819DF70: movs r0, 0x87 lsls r0, 3 adds r1, r2, r0 - b _0819E00E -_0819DF78: + b @0819E00E +@0819DF78: ldr r0, =0x03001284 ldr r0, [r0] ldrb r0, [r0, 0x15] cmp r0, 0 - beq _0819E006 + beq @0819E006 bl sub_819EE08 - b _0819E006 + b @0819E006 .align 2, 0 .pool -_0819DF8C: +@0819DF8C: bl sub_819ED78 movs r0, 0x3 bl Window_WriteStandardTileMap @@ -799358,10 +799358,10 @@ _0819DF8C: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _0819E00E + b @0819E00E .align 2, 0 .pool -_0819DFA4: +@0819DFA4: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -799383,7 +799383,7 @@ _0819DFA4: ldr r0, [r0] ldrb r0, [r0, 0x15] cmp r0, 0x1 - bne _0819E000 + bne @0819E000 movs r0, 0x3 bl gpu_sync_bg_show ldr r1, =0x00001248 @@ -799392,25 +799392,25 @@ _0819DFA4: ldr r1, =0x0000040b movs r0, 0x52 bl lcd_io_set - b _0819E006 + b @0819E006 .align 2, 0 .pool -_0819E000: +@0819E000: movs r0, 0x3 bl gpu_sync_bg_hide -_0819E006: +@0819E006: ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 -_0819E00E: +@0819E00E: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _0819E0AA + b @0819E0AA .align 2, 0 .pool -_0819E01C: +@0819E01C: ldr r0, =sub_819CF54 + 1 movs r1, 0 bl AddTask @@ -799421,7 +799421,7 @@ _0819E01C: ldr r0, [r6] ldrb r5, [r0, 0x15] cmp r5, 0 - bne _0819E06C + bne @0819E06C ldr r4, =0x03005e00 adds r0, 0x21 ldrb r1, [r0] @@ -799440,10 +799440,10 @@ _0819E01C: lsls r0, 3 adds r0, r4 strh r5, [r0, 0x8] - b _0819E0A4 + b @0819E0A4 .align 2, 0 .pool -_0819E06C: +@0819E06C: bl sub_819EAF8 ldr r4, =0x03005e00 ldr r2, [r6] @@ -799470,10 +799470,10 @@ _0819E06C: adds r0, r4 movs r1, 0x2 strh r1, [r0, 0x8] -_0819E0A4: +@0819E0A4: ldr r0, =sub_819C7E0 + 1 bl set_callback2 -_0819E0AA: +@0819E0AA: add sp, 0xC pop {r4-r6} pop {r0} @@ -799483,7 +799483,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 @@ -799503,7 +799503,7 @@ sub_819E0C0: @ 819E0C0 ldr r4, =0x03001284 movs r7, 0 ldr r5, =0x02020630 -_0819E0E6: +@0819E0E6: lsls r1, r6, 1 adds r1, r6 lsls r1, 20 @@ -799532,7 +799532,7 @@ _0819E0E6: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x2 - bls _0819E0E6 + bls @0819E0E6 ldr r7, =0x03001284 ldr r1, [r7] adds r0, r1, 0x5 @@ -799626,10 +799626,10 @@ _0819E0E6: movs r1, 0xC0 str r1, [sp, 0x18] cmp r0, 0x1 - bne _0819E1E8 + bne @0819E1E8 movs r2, 0xF0 str r2, [sp, 0x18] -_0819E1E8: +@0819E1E8: mov r1, sp ldr r0, =0x0861084c ldm r0!, {r3-r5} @@ -799784,7 +799784,7 @@ _0819E1E8: movs r7, 0 movs r0, 0x4 mov r10, r0 -_0819E330: +@0819E330: ldr r0, [r4] lsls r3, r6, 1 adds r2, r3, r6 @@ -799962,9 +799962,9 @@ _0819E330: ldr r0, =0x02020630 mov r9, r0 cmp r6, 0x1 - bhi _0819E496 - b _0819E330 -_0819E496: + bhi @0819E496 + b @0819E330 +@0819E496: ldr r0, [r3] ldrb r0, [r0, 0xE] lsls r1, r0, 4 @@ -799976,10 +799976,10 @@ _0819E496: movs r3, 0x5 negs r3, r3 adds r0, r3, 0 - b _0819E4C8 + b @0819E4C8 .align 2, 0 .pool -_0819E4C8: +@0819E4C8: ands r0, r2 strb r0, [r1] mov r1, r8 @@ -800039,10 +800039,10 @@ _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: +@0819E53C: ldr r6, =0x03001284 ldr r0, [r6] adds r0, 0x5 @@ -800058,7 +800058,7 @@ _0819E53C: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x2 - bls _0819E53C + bls @0819E53C ldr r0, [r6] ldrb r1, [r0, 0x4] lsls r0, r1, 4 @@ -800081,10 +800081,10 @@ _0819E53C: adds r0, r4 bl obj_delete_and_free_tiles movs r5, 0 -_0819E590: +@0819E590: movs r4, 0 lsls r6, r5, 1 -_0819E594: +@0819E594: ldr r0, =0x03001284 ldr r0, [r0] adds r1, r6, r5 @@ -800102,18 +800102,18 @@ _0819E594: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _0819E594 + bls @0819E594 adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x1 - bls _0819E590 + bls @0819E590 movs r5, 0 -_0819E5C6: +@0819E5C6: movs r4, 0 adds r7, r5, 0x1 lsls r6, r5, 1 -_0819E5CC: +@0819E5CC: ldr r0, =0x03001284 ldr r0, [r0] adds r1, r4, r6 @@ -800130,11 +800130,11 @@ _0819E5CC: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bls _0819E5CC + bls @0819E5CC lsls r0, r7, 24 lsrs r5, r0, 24 cmp r5, 0x1 - bls _0819E5C6 + bls @0819E5C6 pop {r4-r7} pop {r0} bx r0 @@ -800143,12 +800143,12 @@ _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 cmp r6, 0x2 - bhi _0819E65C + bhi @0819E65C ldr r4, =0x02020630 ldr r5, =0x03001284 ldr r0, [r5] @@ -800179,10 +800179,10 @@ sub_819E608: @ 819E608 adds r0, r4 ldrh r0, [r0, 0x20] strh r0, [r1, 0x20] - b _0819E684 + b @0819E684 .align 2, 0 .pool -_0819E65C: +@0819E65C: ldr r2, =0x02020630 ldr r3, =0x03001284 ldr r0, [r3] @@ -800202,7 +800202,7 @@ _0819E65C: adds r0, r1 ldrb r0, [r0] bl sub_819E838 -_0819E684: +@0819E684: pop {r4-r6} pop {r0} bx r0 @@ -800211,7 +800211,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 @@ -800220,33 +800220,33 @@ sub_819E694: @ 819E694 bl audio_play lsls r4, 24 cmp r4, 0 - ble _0819E6C0 + ble @0819E6C0 ldr r1, =0x03001284 ldr r2, [r1] ldrb r0, [r2, 0x3] adds r0, 0x1 ldrb r3, [r2, 0x17] cmp r0, r3 - bne _0819E6D8 + bne @0819E6D8 movs r0, 0 - b _0819E6D8 + b @0819E6D8 .align 2, 0 .pool -_0819E6C0: +@0819E6C0: ldr r0, =0x03001284 ldr r2, [r0] ldrb r3, [r2, 0x3] adds r1, r0, 0 cmp r3, 0 - beq _0819E6D4 + beq @0819E6D4 subs r0, r3, 0x1 - b _0819E6D8 + b @0819E6D8 .align 2, 0 .pool -_0819E6D4: +@0819E6D4: ldrb r0, [r2, 0x17] subs r0, 0x1 -_0819E6D8: +@0819E6D8: strb r0, [r2, 0x3] ldr r0, [r1] ldrb r0, [r0, 0x3] @@ -800257,7 +800257,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 @@ -800266,50 +800266,50 @@ sub_819E6E8: @ 819E6E8 bl audio_play lsls r4, 24 cmp r4, 0 - ble _0819E728 + ble @0819E728 ldr r0, =0x03001284 ldr r2, [r0] ldrb r1, [r2, 0x3] adds r4, r0, 0 cmp r1, 0x2 - bhi _0819E714 + bhi @0819E714 movs r0, 0x3 strb r0, [r2, 0x3] - b _0819E74A + b @0819E74A .align 2, 0 .pool -_0819E714: +@0819E714: ldrb r0, [r2, 0x3] adds r0, 0x1 ldrb r1, [r2, 0x17] cmp r0, r1 - beq _0819E722 + beq @0819E722 strb r0, [r2, 0x3] - b _0819E74A -_0819E722: + b @0819E74A +@0819E722: movs r0, 0 strb r0, [r2, 0x3] - b _0819E74A -_0819E728: + b @0819E74A +@0819E728: ldr r0, =0x03001284 ldr r1, [r0] ldrb r3, [r1, 0x3] adds r2, r3, 0 adds r4, r0, 0 cmp r2, 0x2 - bls _0819E744 + bls @0819E744 cmp r2, 0 - beq _0819E744 + beq @0819E744 subs r0, r3, 0x1 - b _0819E748 + b @0819E748 .align 2, 0 .pool -_0819E744: +@0819E744: ldrb r0, [r1, 0x17] subs r0, 0x1 -_0819E748: +@0819E748: strb r0, [r1, 0x3] -_0819E74A: +@0819E74A: ldr r0, [r4] ldrb r0, [r0, 0x3] bl sub_819E608 @@ -800319,38 +800319,38 @@ _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 - ble _0819E778 + ble @0819E778 ldr r0, =0x03001284 ldr r1, [r0] ldrb r3, [r1, 0x16] adds r2, r0, 0 cmp r3, 0x1 - beq _0819E774 + beq @0819E774 adds r0, r3, 0x1 - b _0819E78E + b @0819E78E .align 2, 0 .pool -_0819E774: +@0819E774: movs r0, 0 - b _0819E78E -_0819E778: + b @0819E78E +@0819E778: ldr r0, =0x03001284 ldr r1, [r0] ldrb r3, [r1, 0x16] adds r2, r0, 0 cmp r3, 0 - beq _0819E78C + beq @0819E78C subs r0, r3, 0x1 - b _0819E78E + b @0819E78E .align 2, 0 .pool -_0819E78C: +@0819E78C: movs r0, 0x1 -_0819E78E: +@0819E78E: strb r0, [r1, 0x16] ldr r3, =0x02020630 ldr r2, [r2] @@ -800379,7 +800379,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 @@ -800388,34 +800388,34 @@ sub_819E7C0: @ 819E7C0 bl audio_play lsls r4, 24 cmp r4, 0 - ble _0819E7EC + ble @0819E7EC ldr r0, =0x03001284 ldr r1, [r0] ldrb r3, [r1] adds r2, r0, 0 cmp r3, 0x2 - beq _0819E7E8 + beq @0819E7E8 adds r0, r3, 0x1 - b _0819E802 + b @0819E802 .align 2, 0 .pool -_0819E7E8: +@0819E7E8: movs r0, 0 - b _0819E802 -_0819E7EC: + b @0819E802 +@0819E7EC: ldr r0, =0x03001284 ldr r1, [r0] ldrb r3, [r1] adds r2, r0, 0 cmp r3, 0 - beq _0819E800 + beq @0819E800 subs r0, r3, 0x1 - b _0819E802 + b @0819E802 .align 2, 0 .pool -_0819E800: +@0819E800: movs r0, 0x2 -_0819E802: +@0819E802: strb r0, [r1] ldr r3, =0x02020630 ldr r2, [r2] @@ -800445,7 +800445,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 @@ -800461,9 +800461,9 @@ sub_819E838: @ 819E838 ldr r0, =0x02020630 mov r12, r0 ldr r7, =0x03001284 -_0819E856: +@0819E856: cmp r6, 0x2 - bne _0819E898 + bne @0819E898 ldr r5, =0x02020630 ldr r3, =0x03001284 ldr r0, [r3] @@ -800480,7 +800480,7 @@ _0819E856: ands r0, r2 strb r0, [r1] cmp r4, 0x1 - bhi _0819E8D4 + bhi @0819E8D4 ldr r0, [r3] adds r0, 0x10 adds r0, r4 @@ -800489,14 +800489,14 @@ _0819E856: adds r0, r1 lsls r0, 2 adds r0, r5 - b _0819E8CA + b @0819E8CA .align 2, 0 .pool -_0819E898: +@0819E898: cmp r6, 0x3 - bne _0819E8D4 + bne @0819E8D4 cmp r4, 0x1 - bhi _0819E8BA + bhi @0819E8BA ldr r0, [r7] adds r0, 0x10 adds r0, r4 @@ -800510,7 +800510,7 @@ _0819E898: mov r0, r9 ands r0, r2 strb r0, [r1] -_0819E8BA: +@0819E8BA: ldr r0, [r7] adds r0, 0xB adds r0, r4 @@ -800519,18 +800519,18 @@ _0819E8BA: adds r0, r1 lsls r0, 2 add r0, r12 -_0819E8CA: +@0819E8CA: adds r0, 0x3E ldrb r1, [r0] mov r2, r8 orrs r1, r2 strb r1, [r0] -_0819E8D4: +@0819E8D4: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _0819E856 + bls @0819E856 pop {r3,r4} mov r8, r3 mov r9, r4 @@ -800540,14 +800540,14 @@ _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 ldr r4, =0x03001284 adds r6, r5, 0 movs r3, 0x4 -_0819E8F8: +@0819E8F8: ldr r0, [r4] adds r0, 0xB adds r0, r2 @@ -800561,7 +800561,7 @@ _0819E8F8: orrs r1, r3 strb r1, [r0] cmp r2, 0x1 - bhi _0819E92C + bhi @0819E92C ldr r0, [r4] adds r0, 0x10 adds r0, r2 @@ -800574,12 +800574,12 @@ _0819E8F8: ldrb r1, [r0] orrs r1, r3 strb r1, [r0] -_0819E92C: +@0819E92C: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x2 - bls _0819E8F8 + bls @0819E8F8 pop {r4-r6} pop {r0} bx r0 @@ -800588,23 +800588,23 @@ _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] ldrb r1, [r3, 0x15] adds r5, r0, 0 cmp r1, 0x1 - bne _0819E95C + bne @0819E95C movs r0, 0 strb r0, [r3, 0x15] - b _0819E960 + b @0819E960 .align 2, 0 .pool -_0819E95C: +@0819E95C: movs r0, 0 strb r0, [r3] -_0819E960: +@0819E960: ldr r4, =0x02020630 ldr r2, [r5] ldrb r1, [r2, 0x1] @@ -800670,7 +800670,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] @@ -800736,7 +800736,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 @@ -800780,7 +800780,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 Window_WriteStandardTileMap @@ -800795,7 +800795,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 Window_WriteStandardTileMap @@ -800810,7 +800810,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 @@ -800826,7 +800826,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 @@ -800852,7 +800852,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 @@ -800862,29 +800862,29 @@ sub_819EB4C: @ 819EB4C ldr r1, [r0] ldrb r0, [r1, 0x3] cmp r0, 0x2 - bls _0819EB70 + bls @0819EB70 movs r0, 0x1 movs r1, 0x2 bl Window_CopyToVram - b _0819EBD4 + b @0819EBD4 .align 2, 0 .pool -_0819EB70: +@0819EB70: ldrb r2, [r1, 0x3] ldrb r0, [r1, 0x14] cmp r0, 0 - bne _0819EB84 + bne @0819EB84 movs r0, 0x64 muls r0, r2 ldr r1, =0x020244ec - b _0819EB8A + b @0819EB8A .align 2, 0 .pool -_0819EB84: +@0819EB84: movs r0, 0x64 muls r0, r2 ldr r1, =0x02024744 -_0819EB8A: +@0819EB8A: adds r0, r1 movs r1, 0xB movs r2, 0 @@ -800917,7 +800917,7 @@ _0819EB8A: movs r0, 0x1 movs r1, 0x3 bl Window_CopyToVram -_0819EBD4: +@0819EBD4: add sp, 0xC pop {r4} pop {r0} @@ -800927,7 +800927,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 @@ -800954,7 +800954,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 @@ -801003,7 +801003,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 @@ -801043,7 +801043,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 @@ -801078,7 +801078,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 @@ -801087,19 +801087,19 @@ sub_819ED34: @ 819ED34 ldr r0, [r0] ldrb r0, [r0, 0x14] cmp r0, 0 - beq _0819ED56 + beq @0819ED56 cmp r0, 0x1 - bne _0819ED60 + bne @0819ED60 ldr r0, =0x085eecd1 movs r1, 0 movs r2, 0x5 bl sub_819ECF0 -_0819ED56: +@0819ED56: ldr r0, =0x085eecdd movs r1, 0x18 movs r2, 0x5 bl sub_819ECF0 -_0819ED60: +@0819ED60: movs r0, 0x5 movs r1, 0x3 bl Window_CopyToVram @@ -801110,7 +801110,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 @@ -801119,19 +801119,19 @@ sub_819ED78: @ 819ED78 ldr r0, [r0] ldrb r0, [r0, 0x14] cmp r0, 0 - beq _0819ED9A + beq @0819ED9A cmp r0, 0x1 - bne _0819EDA4 + bne @0819EDA4 ldr r0, =0x085eecd1 movs r1, 0x8 movs r2, 0x3 bl sub_819ECF0 -_0819ED9A: +@0819ED9A: ldr r0, =0x085eecdd movs r1, 0x20 movs r2, 0x3 bl sub_819ECF0 -_0819EDA4: +@0819EDA4: movs r0, 0x3 movs r1, 0x3 bl Window_CopyToVram @@ -801142,34 +801142,34 @@ _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 cmp r0, 0 - beq _0819EDCC + beq @0819EDCC cmp r0, 0x1 - beq _0819EDEC - b _0819EDF6 -_0819EDCC: + beq @0819EDEC + b @0819EDF6 +@0819EDCC: ldr r0, =0x03001284 ldr r0, [r0] ldrb r0, [r0, 0x14] cmp r0, 0x1 - bne _0819EDF6 + bne @0819EDF6 ldr r0, =0x085eecd1 movs r1, 0x8 movs r2, 0x3 bl sub_819ECF0 - b _0819EDF6 + b @0819EDF6 .align 2, 0 .pool -_0819EDEC: +@0819EDEC: ldr r0, =0x085eecdd movs r1, 0x20 movs r2, 0x3 bl sub_819ECF0 -_0819EDF6: +@0819EDF6: movs r0, 0x3 movs r1, 0x3 bl Window_CopyToVram @@ -801180,7 +801180,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, =0x08610918 @@ -801191,7 +801191,7 @@ sub_819EE08: @ 819EE08 ldr r2, [r0] ldrb r0, [r2, 0x15] cmp r0, 0 - bne _0819EE3C + bne @0819EE3C add r0, sp, 0xC ldr r1, =0x02037b14 movs r2, 0xE4 @@ -801199,14 +801199,14 @@ sub_819EE08: @ 819EE08 adds r1, r2 ldrh r1, [r1] strh r1, [r0, 0x8] - b _0819EE42 + b @0819EE42 .align 2, 0 .pool -_0819EE3C: +@0819EE3C: add r1, sp, 0xC ldrh r0, [r2, 0x24] strh r0, [r1, 0x8] -_0819EE42: +@0819EE42: add r0, sp, 0xC movs r1, 0xF0 movs r2, 0xA @@ -801220,29 +801220,29 @@ _0819EE42: ldr r1, [r0] ldrb r0, [r1, 0x3] cmp r0, 0x2 - bls _0819EE74 + bls @0819EE74 movs r0, 0x7 movs r1, 0x3 bl Window_CopyToVram - b _0819EED8 + b @0819EED8 .align 2, 0 .pool -_0819EE74: +@0819EE74: ldrb r2, [r1, 0x3] ldrb r0, [r1, 0x14] cmp r0, 0 - bne _0819EE88 + bne @0819EE88 movs r0, 0x64 muls r0, r2 ldr r1, =0x020244ec - b _0819EE8E + b @0819EE8E .align 2, 0 .pool -_0819EE88: +@0819EE88: movs r0, 0x64 muls r0, r2 ldr r1, =0x02024744 -_0819EE8E: +@0819EE8E: adds r0, r1 movs r1, 0xB movs r2, 0 @@ -801275,7 +801275,7 @@ _0819EE8E: movs r0, 0x7 movs r1, 0x3 bl Window_CopyToVram -_0819EED8: +@0819EED8: add sp, 0x18 pop {r4} pop {r0} @@ -801285,7 +801285,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, =0x08610918 @@ -801300,29 +801300,29 @@ sub_819EEF0: @ 819EEF0 ldr r1, [r0] ldrb r0, [r1, 0x3] cmp r0, 0x2 - bls _0819EF2C + bls @0819EF2C movs r0, 0x1 movs r1, 0x2 bl Window_CopyToVram - b _0819EF90 + b @0819EF90 .align 2, 0 .pool -_0819EF2C: +@0819EF2C: ldrb r2, [r1, 0x3] ldrb r0, [r1, 0x14] cmp r0, 0 - bne _0819EF40 + bne @0819EF40 movs r0, 0x64 muls r0, r2 ldr r1, =0x020244ec - b _0819EF46 + b @0819EF46 .align 2, 0 .pool -_0819EF40: +@0819EF40: movs r0, 0x64 muls r0, r2 ldr r1, =0x02024744 -_0819EF46: +@0819EF46: adds r0, r1 movs r1, 0xB movs r2, 0 @@ -801355,7 +801355,7 @@ _0819EF46: movs r0, 0x1 movs r1, 0x3 bl Window_CopyToVram -_0819EF90: +@0819EF90: add sp, 0xC pop {r4} pop {r0} @@ -801365,7 +801365,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 @@ -801376,31 +801376,31 @@ sub_819EFA8: @ 819EFA8 movs r1, 0 bl Window_FastFillPixels cmp r4, 0x2 - bls _0819EFD0 + bls @0819EFD0 movs r0, 0x8 movs r1, 0x2 bl Window_CopyToVram - b _0819F03A + b @0819F03A .align 2, 0 .pool -_0819EFD0: +@0819EFD0: movs r0, 0x8 bl Window_WriteStandardTileMap ldr r0, [r6] ldrb r0, [r0, 0x14] cmp r0, 0 - bne _0819EFEC + bne @0819EFEC movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec - b _0819EFF2 + b @0819EFF2 .align 2, 0 .pool -_0819EFEC: +@0819EFEC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 -_0819EFF2: +@0819EFF2: adds r0, r1 movs r1, 0xB movs r2, 0 @@ -801431,7 +801431,7 @@ _0819EFF2: movs r0, 0x8 movs r1, 0x2 bl Window_CopyToVram -_0819F03A: +@0819F03A: add sp, 0x2C pop {r4-r6} pop {r0} @@ -801441,7 +801441,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 @@ -801449,15 +801449,15 @@ sub_819F048: @ 819F048 ldr r3, [r4] ldrb r0, [r3, 0x15] cmp r0, 0x1 - beq _0819F094 + beq @0819F094 cmp r2, 0 - beq _0819F068 + beq @0819F068 cmp r2, 0x1 - beq _0819F080 - b _0819F094 + beq @0819F080 + b @0819F094 .align 2, 0 .pool -_0819F068: +@0819F068: strb r2, [r3, 0x14] ldr r0, [r4] strb r2, [r0, 0x3] @@ -801466,10 +801466,10 @@ _0819F068: strb r0, [r1, 0x17] ldr r1, [r4] ldr r0, =0x08610928 - b _0819F092 + b @0819F092 .align 2, 0 .pool -_0819F080: +@0819F080: movs r1, 0 strb r2, [r3, 0x14] ldr r0, [r4] @@ -801479,9 +801479,9 @@ _0819F080: strb r0, [r1, 0x17] ldr r1, [r4] ldr r0, =0x08610948 -_0819F092: +@0819F092: str r0, [r1, 0x18] -_0819F094: +@0819F094: pop {r4} pop {r0} bx r0 @@ -801490,7 +801490,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 @@ -801511,7 +801511,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 @@ -801544,7 +801544,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 @@ -801562,7 +801562,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 @@ -801598,7 +801598,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 @@ -801619,7 +801619,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 @@ -801642,7 +801642,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 @@ -801665,7 +801665,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 @@ -801673,7 +801673,7 @@ sub_819F20C: @ 819F20C ldr r1, [r5] ldrb r0, [r1, 0x14] cmp r0, 0 - bne _0819F240 + bne @0819F240 ldr r3, =0x03005e00 lsls r4, r6, 2 adds r0, r4, r6 @@ -801685,16 +801685,16 @@ sub_819F20C: @ 819F20C strh r2, [r0, 0x16] movs r1, 0x2 strh r1, [r0, 0x12] - b _0819F292 + b @0819F292 .align 2, 0 .pool -_0819F240: +@0819F240: ldrb r0, [r1, 0x3] bl sub_819F59C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bne _0819F278 + bne @0819F278 ldr r1, [r5] adds r0, r1, 0 adds r0, 0x2D @@ -801710,10 +801710,10 @@ _0819F240: strh r1, [r0, 0x8] strh r4, [r0, 0x12] ldr r1, =sub_819F488 + 1 - b _0819F29E + b @0819F29E .align 2, 0 .pool -_0819F278: +@0819F278: ldr r4, =0x03005e00 lsls r5, r6, 2 adds r0, r5, r6 @@ -801727,14 +801727,14 @@ _0819F278: strh r3, [r0, 0x12] adds r3, r4, 0 adds r4, r5, 0 -_0819F292: +@0819F292: adds r0, r4, r6 lsls r0, 3 adds r0, r3 movs r1, 0 strh r1, [r0, 0x8] ldr r1, =sub_819D588 + 1 -_0819F29E: +@0819F29E: str r1, [r0] pop {r4-r6} pop {r0} @@ -801744,7 +801744,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 @@ -801782,7 +801782,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 @@ -801894,7 +801894,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 @@ -801930,7 +801930,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 @@ -801964,7 +801964,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 @@ -801974,7 +801974,7 @@ sub_819F488: @ 819F488 ldrb r0, [r0] adds r3, r1, 0 cmp r0, 0x1 - beq _0819F58A + beq @0819F58A ldr r2, =0x03005e00 lsls r1, r4, 2 adds r0, r1, r4 @@ -801984,22 +801984,22 @@ sub_819F488: @ 819F488 ldrsh r0, [r0, r2] adds r5, r1, 0 cmp r0, 0x4 - bhi _0819F58A + bhi @0819F58A lsls r0, 2 - ldr r1, =_0819F4C8 + ldr r1, =@0819F4C8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_0819F4C8: - .4byte _0819F4DC - .4byte _0819F4F8 - .4byte _0819F52C - .4byte _0819F548 - .4byte _0819F568 -_0819F4DC: +@0819F4C8: + .4byte @0819F4DC + .4byte @0819F4F8 + .4byte @0819F52C + .4byte @0819F548 + .4byte @0819F568 +@0819F4DC: ldr r0, =0x085eed0a bl sub_819EBEC ldr r0, =0x03001284 @@ -802007,21 +802007,21 @@ _0819F4DC: adds r0, 0x20 movs r1, 0 strb r1, [r0] - b _0819F54E + b @0819F54E .align 2, 0 .pool -_0819F4F8: +@0819F4F8: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _0819F50C + bne @0819F50C movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _0819F58A -_0819F50C: + beq @0819F58A +@0819F50C: movs r0, 0x5 bl audio_play ldr r0, =0x03001284 @@ -802030,26 +802030,26 @@ _0819F50C: adds r1, 0x30 movs r2, 0x1 bl sub_819F3F8 - b _0819F54E + b @0819F54E .align 2, 0 .pool -_0819F52C: +@0819F52C: ldr r0, [r3] adds r0, 0x30 ldrb r0, [r0] cmp r0, 0x1 - beq _0819F58A + beq @0819F58A movs r0, 0x5 movs r1, 0 bl Window_FastFillPixels movs r0, 0x5 movs r1, 0x2 bl Window_CopyToVram - b _0819F54E -_0819F548: + b @0819F54E +@0819F548: ldr r0, =0x085eec8b bl sub_819EBEC -_0819F54E: +@0819F54E: ldr r0, =0x03005e00 adds r1, r5, r4 lsls r1, 3 @@ -802057,10 +802057,10 @@ _0819F54E: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _0819F58A + b @0819F58A .align 2, 0 .pool -_0819F568: +@0819F568: bl sub_819EEF0 bl sub_819EADC ldr r0, =0x03001284 @@ -802076,7 +802076,7 @@ _0819F568: strh r1, [r0, 0x8] ldr r1, =sub_819CE40 + 1 str r1, [r0] -_0819F58A: +@0819F58A: pop {r4,r5} pop {r0} bx r0 @@ -802085,7 +802085,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 @@ -802099,12 +802099,12 @@ sub_819F59C: @ 819F59C lsls r0, 16 lsrs r5, r0, 16 movs r4, 0 -_0819F5B8: +@0819F5B8: ldr r0, =0x03001284 ldr r0, [r0] ldrb r0, [r0, 0x12] cmp r4, r0 - beq _0819F5EC + beq @0819F5EC movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -802115,26 +802115,26 @@ _0819F5B8: lsls r0, 16 lsrs r0, 16 cmp r0, r5 - bne _0819F5EC + bne @0819F5EC movs r0, 0x1 - b _0819F5F8 + b @0819F5F8 .align 2, 0 .pool -_0819F5EC: +@0819F5EC: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _0819F5B8 + bls @0819F5B8 movs r0, 0 -_0819F5F8: +@0819F5F8: pop {r4,r5} pop {r1} bx r1 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 @@ -802142,7 +802142,7 @@ sub_819F600: @ 819F600 movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0819F640 + beq @0819F640 adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -802165,7 +802165,7 @@ sub_819F600: @ 819F600 bl _call_via_r1 ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] -_0819F640: +@0819F640: pop {r4} pop {r0} bx r0 @@ -802174,7 +802174,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 @@ -802182,7 +802182,7 @@ sub_819F654: @ 819F654 movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _0819F694 + beq @0819F694 ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 @@ -802190,29 +802190,29 @@ sub_819F654: @ 819F654 movs r1, 0x3C ldrsh r0, [r4, r1] cmp r0, 0x1 - bne _0819F688 + bne @0819F688 ldr r0, =0x03001284 ldr r0, [r0] adds r0, 0x30 movs r1, 0 strb r1, [r0] - b _0819F68E + b @0819F68E .align 2, 0 .pool -_0819F688: +@0819F688: movs r0, 0 bl sub_819BE20 -_0819F68E: +@0819F68E: adds r0, r4, 0 bl obj_delete_and_free_tiles -_0819F694: +@0819F694: pop {r4} pop {r0} bx r0 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 @@ -802224,19 +802224,19 @@ sub_819F69C: @ 819F69C movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _0819F71A + beq @0819F71A cmp r0, 0x1 - bgt _0819F6C4 + bgt @0819F6C4 cmp r0, 0 - beq _0819F6CA - b _0819F77C + beq @0819F6CA + b @0819F77C .align 2, 0 .pool -_0819F6C4: +@0819F6C4: cmp r0, 0x2 - beq _0819F73C - b _0819F77C -_0819F6CA: + beq @0819F73C + b @0819F77C +@0819F6CA: movs r0, 0x58 strh r0, [r4, 0xE] movs r0, 0x98 @@ -802271,8 +802271,8 @@ _0819F6CA: movs r0, 0x4A movs r1, 0x37 bl lcd_io_set - b _0819F7A6 -_0819F71A: + b @0819F7A6 +@0819F71A: movs r0, 0x3 bl gpu_sync_bg_show ldr r1, =0x00001248 @@ -802281,10 +802281,10 @@ _0819F71A: ldr r1, =0x0000040b movs r0, 0x52 bl lcd_io_set - b _0819F7A6 + b @0819F7A6 .align 2, 0 .pool -_0819F73C: +@0819F73C: ldrh r0, [r4, 0x12] subs r0, 0x4 strh r0, [r4, 0x12] @@ -802294,17 +802294,17 @@ _0819F73C: lsls r0, 16 asrs r0, 16 cmp r0, 0x20 - ble _0819F758 + ble @0819F758 lsls r0, r1, 16 asrs r0, 16 cmp r0, 0x5F - ble _0819F760 -_0819F758: + ble @0819F760 +@0819F758: movs r0, 0x20 strh r0, [r4, 0x12] movs r0, 0x60 strh r0, [r4, 0x18] -_0819F760: +@0819F760: ldrh r1, [r4, 0x12] lsls r1, 8 ldrh r0, [r4, 0x18] @@ -802316,9 +802316,9 @@ _0819F760: movs r2, 0x12 ldrsh r0, [r4, r2] cmp r0, 0x20 - bne _0819F7AC - b _0819F7A6 -_0819F77C: + bne @0819F7AC + b @0819F7A6 +@0819F77C: adds r0, r5, 0 bl remove_task ldr r0, =0x03005e00 @@ -802329,26 +802329,26 @@ _0819F77C: movs r2, 0x16 ldrsh r0, [r1, r2] cmp r0, 0x1 - bne _0819F7A0 + bne @0819F7A0 bl sub_819F8E0 - b _0819F7AC + b @0819F7AC .align 2, 0 .pool -_0819F7A0: +@0819F7A0: bl sub_819BD70 - b _0819F7AC -_0819F7A6: + b @0819F7AC +@0819F7A6: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_0819F7AC: +@0819F7AC: pop {r4,r5} pop {r0} bx r0 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 @@ -802360,9 +802360,9 @@ sub_819F7B4: @ 819F7B4 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - beq _0819F844 + beq @0819F844 cmp r0, 0x1 - beq _0819F894 + beq @0819F894 movs r0, 0x3 bl gpu_sync_bg_hide ldr r3, =0x02020630 @@ -802410,10 +802410,10 @@ sub_819F7B4: @ 819F7B4 bl lcd_io_clear_bits adds r0, r5, 0 bl remove_task - b _0819F8D8 + b @0819F8D8 .align 2, 0 .pool -_0819F844: +@0819F844: movs r0, 0x58 strh r0, [r4, 0xE] movs r0, 0x98 @@ -802448,8 +802448,8 @@ _0819F844: movs r0, 0x4A movs r1, 0x37 bl lcd_io_set - b _0819F8D2 -_0819F894: + b @0819F8D2 +@0819F894: ldrh r0, [r4, 0x12] adds r0, 0x4 strh r0, [r4, 0x12] @@ -802459,17 +802459,17 @@ _0819F894: lsls r0, 16 asrs r0, 16 cmp r0, 0x3F - bgt _0819F8B0 + bgt @0819F8B0 lsls r0, r1, 16 asrs r0, 16 cmp r0, 0x41 - bgt _0819F8B8 -_0819F8B0: + bgt @0819F8B8 +@0819F8B0: movs r0, 0x40 strh r0, [r4, 0x12] movs r0, 0x41 strh r0, [r4, 0x18] -_0819F8B8: +@0819F8B8: ldrh r1, [r4, 0x12] lsls r1, 8 ldrh r0, [r4, 0x18] @@ -802481,39 +802481,39 @@ _0819F8B8: movs r1, 0x12 ldrsh r0, [r4, r1] cmp r0, 0x40 - bne _0819F8D8 -_0819F8D2: + bne @0819F8D8 +@0819F8D2: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_0819F8D8: +@0819F8D8: pop {r4,r5} pop {r0} bx r0 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 ldr r1, [r0] ldrb r0, [r1, 0x14] cmp r0, 0 - bne _0819F900 + bne @0819F900 ldrb r1, [r1, 0x3] movs r0, 0x64 muls r1, r0 ldr r0, =0x020244ec - b _0819F908 + b @0819F908 .align 2, 0 .pool -_0819F900: +@0819F900: ldrb r1, [r1, 0x3] movs r0, 0x64 muls r1, r0 ldr r0, =0x02024744 -_0819F908: +@0819F908: adds r6, r1, r0 adds r0, r6, 0 movs r1, 0xB @@ -802580,7 +802580,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} @@ -802599,8 +802599,8 @@ sub_819F99C: @ 819F99C ldr r0, =0x02021cc4 mov r8, r0 cmp r1, 0 - beq _0819F9DC -_0819F9C2: + beq @0819F9DC +@0819F9C2: adds r0, r1, 0 movs r1, 0xA bl __udivsi3 @@ -802610,10 +802610,10 @@ _0819F9C2: lsls r0, 24 lsrs r6, r0, 24 cmp r1, 0 - beq _0819F9DC + beq @0819F9DC cmp r6, 0x3 - bls _0819F9C2 -_0819F9DC: + bls @0819F9C2 +@0819F9DC: lsls r4, r5, 4 adds r4, r5 lsls r4, 2 @@ -802660,7 +802660,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} @@ -802668,7 +802668,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 @@ -802676,7 +802676,7 @@ sub_819FA5C: @ 819FA5C adds r4, 0x28 ldr r0, =0x0000ffff adds r5, r0, 0 -_0819FA6A: +@0819FA6A: lsls r0, r2, 1 adds r0, r4, r0 ldrh r1, [r0] @@ -802686,7 +802686,7 @@ _0819FA6A: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x5 - bls _0819FA6A + bls @0819FA6A adds r1, r3, 0 adds r1, 0x38 movs r0, 0xFF @@ -802706,7 +802706,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 @@ -802726,7 +802726,7 @@ sub_819FAA0: @ 819FAA0 mov r8, r0 ldr r1, =0x0000ffff mov r10, r1 -_0819FAC6: +@0819FAC6: movs r2, 0 mov r3, r12 lsls r7, r3, 4 @@ -802735,7 +802735,7 @@ _0819FAC6: mov r9, r4 adds r0, r7, r3 lsls r3, r0, 2 -_0819FAD6: +@0819FAD6: ldr r1, [r5] lsls r0, r2, 1 adds r0, r3 @@ -802751,7 +802751,7 @@ _0819FAD6: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x5 - bls _0819FAD6 + bls @0819FAD6 ldr r2, [r5] mov r0, r12 adds r3, r7, r0 @@ -802793,7 +802793,7 @@ _0819FAD6: ldr r6, =0x03005d90 movs r4, 0x88 lsls r4, 1 -_0819FB48: +@0819FB48: ldr r0, [r6] adds r1, r2, r3 adds r0, r4 @@ -802804,7 +802804,7 @@ _0819FB48: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls _0819FB48 + bls @0819FB48 ldr r0, [r5] mov r3, r12 adds r2, r7, r3 @@ -802827,7 +802827,7 @@ _0819FB48: lsrs r0, 24 mov r12, r0 cmp r0, 0x3 - bls _0819FAC6 + bls @0819FAC6 bl sub_81A087C pop {r3-r5} mov r8, r3 @@ -802841,7 +802841,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 @@ -802857,17 +802857,17 @@ 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] adds r0, 0xDE ldrb r0, [r0] cmp r0, 0 - bne _0819FC10 + bne @0819FC10 adds r4, r2, 0 ldr r5, =0x08611548 -_0819FBDA: +@0819FBDA: bl GenerateRandomNumber ldr r2, [r4] lsls r0, 16 @@ -802888,13 +802888,13 @@ _0819FBDA: ldrb r1, [r1] lsrs r0, 27 cmp r1, r0 - beq _0819FBDA - b _0819FC38 + beq @0819FBDA + b @0819FC38 .align 2, 0 .pool -_0819FC10: +@0819FC10: adds r4, r2, 0 -_0819FC12: +@0819FC12: bl GenerateRandomNumber ldr r2, [r4] lsls r0, 16 @@ -802912,15 +802912,15 @@ _0819FC12: ldrb r1, [r1] lsrs r0, 27 cmp r1, r0 - beq _0819FC12 -_0819FC38: + beq @0819FC12 +@0819FC38: pop {r4,r5} pop {r0} bx r0 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 @@ -802939,11 +802939,11 @@ 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 -_0819FC66: +@0819FC66: mov r1, sp adds r0, r1, r5 strb r5, [r0] @@ -802951,9 +802951,9 @@ _0819FC66: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x9 - bls _0819FC66 + bls @0819FC66 movs r5, 0 -_0819FC78: +@0819FC78: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -802980,11 +802980,11 @@ _0819FC78: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x31 - bls _0819FC78 + bls @0819FC78 movs r5, 0 ldr r6, =0x03005d90 movs r4, 0xF -_0819FCBC: +@0819FCBC: ldr r3, [r6] adds r3, 0xB4 adds r3, r5 @@ -803007,7 +803007,7 @@ _0819FCBC: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x2 - bls _0819FCBC + bls @0819FCBC add sp, 0xC pop {r4-r7} pop {r0} @@ -803017,15 +803017,15 @@ _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 movs r5, 0 cmp r0, 0x2 - bne _0819FD4C + bne @0819FD4C ldr r6, =0x030062ec -_0819FD06: +@0819FD06: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -803040,36 +803040,36 @@ _0819FD06: adds r0, r5 lsls r4, r0, 1 adds r1, 0x2 -_0819FD26: +@0819FD26: lsls r0, r2, 1 adds r0, r4 adds r0, r1, r0 ldrh r0, [r0] cmp r0, 0 - beq _0819FD38 + beq @0819FD38 adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 -_0819FD38: +@0819FD38: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x4 - bls _0819FD26 + bls @0819FD26 cmp r3, 0x3 - bhi _0819FD06 - b _0819FD5A + bhi @0819FD06 + b @0819FD5A .align 2, 0 .pool -_0819FD4C: +@0819FD4C: cmp r0, 0x1 - bne _0819FD5A + bne @0819FD5A ldrb r0, [r2] adds r1, r0 ldrb r5, [r1] adds r0, 0x1 strb r0, [r2] -_0819FD5A: +@0819FD5A: adds r0, r5, 0 pop {r4-r6} pop {r1} @@ -803077,7 +803077,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 @@ -803092,17 +803092,17 @@ sub_819FD64: @ 819FD64 adds r1, 0x10 str r1, [sp, 0x18] adds r1, r0, 0 -_0819FD80: +@0819FD80: adds r0, r1, r5 strb r5, [r0] adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x2 - bls _0819FD80 + bls @0819FD80 movs r5, 0 ldr r6, [sp, 0x14] -_0819FD92: +@0819FD92: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -803127,10 +803127,10 @@ _0819FD92: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x9 - bls _0819FD92 + bls @0819FD92 movs r5, 0 ldr r2, =0x086114d3 -_0819FDD0: +@0819FDD0: mov r4, sp adds r1, r4, r5 adds r0, r5, r2 @@ -803140,9 +803140,9 @@ _0819FDD0: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x9 - bls _0819FDD0 + bls @0819FDD0 movs r5, 0 -_0819FDE6: +@0819FDE6: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -803168,7 +803168,7 @@ _0819FDE6: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x31 - bls _0819FDE6 + bls @0819FDE6 ldr r4, =0x030062ec movs r0, 0x30 bl malloc_and_clear @@ -803177,9 +803177,9 @@ _0819FDE6: strb r1, [r0] movs r5, 0 movs r2, 0x4 -_0819FE34: +@0819FE34: movs r3, 0 -_0819FE36: +@0819FE36: ldr r0, [r4] lsls r1, r3, 2 adds r1, r3 @@ -803191,17 +803191,17 @@ _0819FE36: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x2 - bls _0819FE36 + bls @0819FE36 adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x4 - bls _0819FE34 + bls @0819FE34 movs r0, 0 ldr r7, [sp, 0x18] strb r0, [r7] movs r5, 0 -_0819FE60: +@0819FE60: ldr r0, =0x03005d90 ldr r3, [r0] lsls r4, r5, 2 @@ -803224,7 +803224,7 @@ _0819FE60: str r5, [sp, 0x1C] mov r8, r4 cmp r0, 0x3 - beq _0819FF62 + beq @0819FF62 ldrb r0, [r6] ldr r1, [sp, 0x14] ldr r2, [sp, 0x18] @@ -803252,13 +803252,13 @@ _0819FE60: lsrs r7, r0, 30 ldrb r0, [r6] cmp r0, 0x2 - bne _0819FF62 + bne @0819FF62 lsls r0, r7, 2 adds r0, r7 mov r10, r0 ldr r0, =0x030062ec mov r9, r0 -_0819FED2: +@0819FED2: bl GenerateRandomNumber lsls r0, 16 lsrs r4, r0, 16 @@ -803271,34 +803271,34 @@ _0819FED2: adds r1, r0, 0x1 lsls r5, r7, 2 cmp r3, r1 - bge _0819FF12 + bge @0819FF12 adds r2, 0x20 mov r6, r10 adds r0, r2, r6 ldrb r0, [r0] cmp r0, r4 - beq _0819FF12 + beq @0819FF12 adds r6, r1, 0 adds r1, r5, r7 -_0819FEFE: +@0819FEFE: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, r6 - bge _0819FF12 + bge @0819FF12 adds r0, r3, r1 adds r0, r2, r0 ldrb r0, [r0] cmp r0, r4 - bne _0819FEFE -_0819FF12: + bne @0819FEFE +@0819FF12: mov r1, r9 ldr r0, [r1] ldrb r0, [r0] adds r0, 0x1 ldr r1, =0x030062ec cmp r3, r0 - bne _0819FED2 + bne @0819FED2 ldr r0, [r1] orrs r5, r7 ldrb r2, [r0] @@ -803331,14 +803331,14 @@ _0819FF12: add r1, r8 adds r1, 0xBA strh r0, [r1] -_0819FF62: +@0819FF62: ldr r6, [sp, 0x1C] lsls r0, r6, 24 lsrs r5, r0, 24 cmp r5, 0x8 - bhi _0819FF6E - b _0819FE60 -_0819FF6E: + bhi @0819FF6E + b @0819FE60 +@0819FF6E: ldr r4, =0x030062ec ldr r0, [r4] bl free @@ -803357,7 +803357,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 @@ -803372,7 +803372,7 @@ sub_819FF98: @ 819FF98 movs r7, 0 ldr r1, [sp] cmp r1, 0x2 - bhi _0819FFE0 + bhi @0819FFE0 ldr r2, =0x03005d90 ldr r1, [r2] adds r0, r1, 0 @@ -803391,13 +803391,13 @@ sub_819FF98: @ 819FF98 asrs r4, r0 movs r0, 0xF ands r4, r0 - b _0819FFE4 + b @0819FFE4 .align 2, 0 .pool -_0819FFE0: +@0819FFE0: movs r4, 0 ldr r2, =0x03005d90 -_0819FFE4: +@0819FFE4: ldr r3, =0x08610970 lsls r1, r4, 1 ldr r4, [r2] @@ -803423,23 +803423,23 @@ _0819FFE4: ands r0, r1 movs r5, 0x3C cmp r0, 0x1 - bne _081A001A + bne @081A001A movs r5, 0x32 -_081A001A: +@081A001A: ldrh r1, [r6] ldr r4, =0x0000ffff cmp r1, r4 - beq _081A004C + beq @081A004C movs r2, 0xFE lsls r2, 8 adds r0, r2, 0 ands r0, r1 lsls r1, r5, 9 cmp r0, r1 - bgt _081A004C + bgt @081A004C adds r5, r2, 0 adds r2, r1, 0 -_081A0034: +@081A0034: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 @@ -803447,30 +803447,30 @@ _081A0034: adds r0, r6 ldrh r1, [r0] cmp r1, r4 - beq _081A004C + beq @081A004C adds r0, r5, 0 ands r0, r1 cmp r0, r2 - ble _081A0034 -_081A004C: + ble @081A0034 +@081A004C: adds r5, r3, 0 movs r3, 0 str r3, [sp, 0x4] -_081A0052: +@081A0052: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _081A0068 + beq @081A0068 ldr r0, [sp, 0xC] cmp r0, 0x1 - bne _081A00E0 -_081A0068: + bne @081A00E0 +@081A0068: ldr r1, =0x000001ff mov r8, r1 -_081A006C: +@081A006C: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -803483,7 +803483,7 @@ _081A006C: bl sub_806E064 adds r2, r0, 0 cmp r2, 0 - beq _081A006C + beq @081A006C ldr r2, =0x00000121 adds r0, r4, r2 bl sub_81B6CFC @@ -803491,48 +803491,48 @@ _081A006C: lsrs r7, r0, 16 movs r2, 0x1 cmp r5, 0x4 - bhi _081A00BC + bhi @081A00BC movs r3, 0 - b _081A00C6 + b @081A00C6 .align 2, 0 .pool -_081A00BC: +@081A00BC: subs r0, r5, 0x4 - b _081A00C2 -_081A00C0: + b @081A00C2 +@081A00C0: adds r0, r3, 0x1 -_081A00C2: +@081A00C2: lsls r0, 24 lsrs r3, r0, 24 -_081A00C6: +@081A00C6: cmp r3, r5 - bcs _081A00DA + bcs @081A00DA lsls r0, r3, 1 adds r0, r6 ldrh r0, [r0] mov r1, r8 ands r0, r1 cmp r0, r7 - bne _081A00C0 + bne @081A00C0 movs r2, 0 -_081A00DA: +@081A00DA: cmp r2, 0x1 - bne _081A006C - b _081A0146 -_081A00E0: + bne @081A006C + b @081A0146 +@081A00E0: cmp r5, 0x4 - bhi _081A00EA + bhi @081A00EA movs r2, 0x1 str r2, [sp, 0xC] - b _081A0168 -_081A00EA: + b @081A0168 +@081A00EA: subs r4, r5, 0x4 ldr r3, =0x000001ff mov r10, r3 mov r8, r3 lsls r0, r4, 24 mov r9, r0 -_081A00F6: +@081A00F6: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -803548,55 +803548,55 @@ _081A00F6: mov r1, r9 lsrs r3, r1, 24 cmp r3, r5 - bcs _081A0142 + bcs @081A0142 lsls r0, r3, 1 adds r0, r6 ldrh r1, [r0] mov r0, r8 - b _081A013A + b @081A013A .align 2, 0 .pool -_081A0128: +@081A0128: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, r5 - bcs _081A0142 + bcs @081A0142 lsls r0, r3, 1 adds r0, r6 ldrh r0, [r0] mov r1, r10 -_081A013A: +@081A013A: ands r0, r1 cmp r0, r7 - bne _081A0128 + bne @081A0128 movs r2, 0 -_081A0142: +@081A0142: cmp r2, 0x1 - bne _081A00F6 -_081A0146: + bne @081A00F6 +@081A0146: ldr r0, [sp] adds r1, r7, 0 bl sub_81A0194 lsls r0, 24 cmp r0, 0 - beq _081A0168 + beq @081A0168 ldr r0, =0x08611370 adds r0, r7, r0 ldrb r0, [r0] cmp r0, 0 - bne _081A0170 + bne @081A0170 ldr r0, [sp, 0x4] adds r0, 0x1 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x4] -_081A0168: +@081A0168: ldr r2, [sp, 0x4] cmp r2, 0x4 - bhi _081A0170 - b _081A0052 -_081A0170: + bhi @081A0170 + b @081A0052 +@081A0170: ldr r0, =0x030062ec ldr r1, [r0] ldrb r0, [r1] @@ -803616,7 +803616,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 @@ -803631,23 +803631,23 @@ sub_81A0194: @ 81A0194 lsls r6, r0, 1 adds r2, 0x2 adds r7, r1, 0 -_081A01B0: +@081A01B0: lsls r0, r3, 1 adds r0, r6 adds r0, r2, r0 ldrh r0, [r0] cmp r0, r5 - bne _081A01C4 + bne @081A01C4 movs r0, 0 - b _081A01E2 + b @081A01E2 .align 2, 0 .pool -_081A01C4: +@081A01C4: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x4 - bls _081A01B0 + bls @081A01B0 mov r2, r12 ldr r1, [r2] adds r0, r7, r4 @@ -803658,14 +803658,14 @@ _081A01C4: adds r1, r0 strh r5, [r1] movs r0, 0x1 -_081A01E2: +@081A01E2: pop {r4-r7} pop {r1} bx r1 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 @@ -803678,9 +803678,9 @@ sub_81A01E8: @ 81A01E8 ands r0, r1 movs r4, 0x3C cmp r0, 0x1 - bne _081A0204 + bne @081A0204 movs r4, 0x32 -_081A0204: +@081A0204: ldr r1, =0x0832937c lsls r0, r2, 2 adds r0, r1 @@ -803689,17 +803689,17 @@ _081A0204: ldrh r1, [r6] ldr r3, =0x0000ffff cmp r1, r3 - beq _081A0240 + beq @081A0240 movs r2, 0xFE lsls r2, 8 adds r0, r2, 0 ands r0, r1 lsls r1, r4, 9 cmp r0, r1 - bgt _081A0240 + bgt @081A0240 adds r4, r2, 0 adds r2, r1, 0 -_081A0228: +@081A0228: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -803707,22 +803707,22 @@ _081A0228: adds r0, r6 ldrh r1, [r0] cmp r1, r3 - beq _081A0240 + beq @081A0240 adds r0, r4, 0 ands r0, r1 cmp r0, r2 - ble _081A0228 -_081A0240: + ble @081A0228 +@081A0240: adds r4, r5, 0 cmp r4, 0x4 - bls _081A0248 + bls @081A0248 movs r4, 0x4 -_081A0248: +@081A0248: movs r2, 0 cmp r2, r4 - bcs _081A026C + bcs @081A026C ldr r7, =0x000001ff -_081A0250: +@081A0250: lsls r3, r2, 1 add r3, r12 adds r2, 0x1 @@ -803736,8 +803736,8 @@ _081A0250: lsls r2, 24 lsrs r2, 24 cmp r2, r4 - bcc _081A0250 -_081A026C: + bcc @081A0250 +@081A026C: pop {r4-r7} pop {r0} bx r0 @@ -803746,7 +803746,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 @@ -803768,12 +803768,12 @@ sub_81A0284: @ 81A0284 lsrs r0, 28 adds r7, r1, 0 cmp r0, 0x2 - bhi _081A02B8 + bhi @081A02B8 movs r0, 0 - b _081A037C + b @081A037C .align 2, 0 .pool -_081A02B8: +@081A02B8: movs r4, 0 movs r3, 0 adds r0, r2, 0 @@ -803786,9 +803786,9 @@ _081A02B8: lsls r5, 1 mov r9, r5 cmp r0, 0 - beq _081A02F4 + beq @081A02F4 adds r2, r7, 0 -_081A02D4: +@081A02D4: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -803796,7 +803796,7 @@ _081A02D4: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x8 - bhi _081A02F4 + bhi @081A02F4 ldr r0, [r2] lsls r1, r3, 2 adds r0, r1 @@ -803804,8 +803804,8 @@ _081A02D4: ldrb r0, [r0] lsls r0, 30 cmp r0, 0 - bne _081A02D4 -_081A02F4: + bne @081A02D4 +@081A02F4: ldr r0, [r7] adds r0, 0xB0 ldrb r1, [r0] @@ -803820,7 +803820,7 @@ _081A02F4: bl sub_81A01E8 movs r3, 0 cmp r3, r4 - bcs _081A0376 + bcs @081A0376 ldr r1, [r7] adds r0, r1, 0 adds r0, 0xB1 @@ -803829,10 +803829,10 @@ _081A02F4: lsrs r0, 28 subs r0, 0x3 cmp r3, r0 - bge _081A0376 + bge @081A0376 adds r6, r7, 0 adds r5, r1, 0 -_081A032A: +@081A032A: lsls r0, r3, 2 adds r2, r5, r0 adds r0, r2, 0 @@ -803841,14 +803841,14 @@ _081A032A: lsls r0, r1, 30 lsrs r0, 30 cmp r0, 0x2 - bne _081A035C + bne @081A035C lsls r0, r1, 28 lsrs r0, 30 cmp r0, r8 - bne _081A035C + bne @081A035C lsrs r0, r1, 6 cmp r0, 0 - beq _081A035C + beq @081A035C lsls r0, r1, 26 lsrs r0, 30 lsls r0, 1 @@ -803858,12 +803858,12 @@ _081A032A: adds r0, 0xBA ldrh r0, [r0] strh r0, [r1] -_081A035C: +@081A035C: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, r4 - bcs _081A0376 + bcs @081A0376 ldr r0, [r6] adds r0, 0xB1 ldrb r0, [r0] @@ -803871,12 +803871,12 @@ _081A035C: lsrs r0, 28 subs r0, 0x3 cmp r3, r0 - blt _081A032A -_081A0376: + blt @081A032A +@081A0376: mov r0, sp add r0, r9 ldrh r0, [r0] -_081A037C: +@081A037C: add sp, 0x8 pop {r3,r4} mov r8, r3 @@ -803889,7 +803889,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} @@ -803901,7 +803901,7 @@ sub_81A0390: @ 81A0390 ldr r7, =0x03005d90 adds r6, r7, 0 movs r4, 0 -_081A03A6: +@081A03A6: ldr r0, [r6] lsls r2, r5, 1 adds r2, r5 @@ -803913,7 +803913,7 @@ _081A03A6: adds r0, 0xEA strh r4, [r0] movs r3, 0 -_081A03BC: +@081A03BC: ldr r0, [r6] lsls r1, r3, 1 adds r1, r2 @@ -803924,18 +803924,18 @@ _081A03BC: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3 - bls _081A03BC + bls @081A03BC adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x2 - bls _081A03A6 + bls @081A03A6 ldr r0, [r7] adds r0, 0xB1 ldrb r0, [r0] lsrs r3, r0, 6 movs r5, 0 -_081A03E6: +@081A03E6: lsls r0, r3, 2 mov r1, sp adds r2, r1, r0 @@ -803955,11 +803955,11 @@ _081A03E6: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x2 - bls _081A03E6 + bls @081A03E6 movs r5, 0 ldr r7, =0x03005d90 ldr r6, =0x086109a4 -_081A0416: +@081A0416: ldr r0, [r7] mov r12, r0 adds r0, 0xB4 @@ -803999,12 +803999,12 @@ _081A0416: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x2 - bls _081A0416 + bls @081A0416 movs r5, 0 cmp r5, r8 - bcs _081A04D6 + bcs @081A04D6 ldr r7, =0x03005d90 -_081A0470: +@081A0470: ldr r1, [r7] lsls r0, r5, 2 adds r4, r1, r0 @@ -804017,10 +804017,10 @@ _081A0470: lsrs r3, r0, 30 adds r6, r3, 0 cmp r1, 0x1 - bne _081A04A8 + bne @081A04A8 lsrs r0, r2, 6 cmp r0, 0 - beq _081A04CC + beq @081A04CC lsls r0, r3, 2 add r0, sp ldr r1, [r0] @@ -804028,16 +804028,16 @@ _081A0470: adds r0, 0xBA ldrh r0, [r0] strh r0, [r1, 0xA] - b _081A04CC + b @081A04CC .align 2, 0 .pool -_081A04A8: +@081A04A8: cmp r1, 0x2 - bne _081A04CC + bne @081A04CC lsls r0, r2, 24 lsrs r0, 30 cmp r0, 0 - beq _081A04CC + beq @081A04CC lsls r2, 26 lsrs r2, 30 lsls r0, r6, 2 @@ -804050,13 +804050,13 @@ _081A04A8: adds r0, 0xBA ldrh r0, [r0] strh r0, [r1] -_081A04CC: +@081A04CC: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, r8 - bcc _081A0470 -_081A04D6: + bcc @081A0470 +@081A04D6: add sp, 0xC pop {r3} mov r8, r3 @@ -804066,7 +804066,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 @@ -804077,26 +804077,26 @@ sub_81A04E4: @ 81A04E4 lsrs r0, 24 movs r7, 0x2 cmp r0, 0x6 - bls _081A04FC - b _081A064C -_081A04FC: + bls @081A04FC + b @081A064C +@081A04FC: lsls r0, 2 - ldr r1, =_081A050C + ldr r1, =@081A050C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081A050C: - .4byte _081A0528 - .4byte _081A0540 - .4byte _081A05B4 - .4byte _081A05F4 - .4byte _081A061C - .4byte _081A064C - .4byte _081A0634 -_081A0528: +@081A050C: + .4byte @081A0528 + .4byte @081A0540 + .4byte @081A05B4 + .4byte @081A05F4 + .4byte @081A061C + .4byte @081A064C + .4byte @081A0634 +@081A0528: movs r0, 0x12 mov r10, r0 movs r6, 0x8 @@ -804104,10 +804104,10 @@ _081A0528: str r0, [sp, 0xC] ldr r0, =0x085eaeb8 str r0, [sp, 0x10] - b _081A0652 + b @081A0652 .align 2, 0 .pool -_081A0540: +@081A0540: movs r7, 0x3 movs r1, 0x12 mov r10, r1 @@ -804124,7 +804124,7 @@ _081A0540: adds r5, 0xB0 ldr r0, =0x086109a4 mov r8, r0 -_081A0560: +@081A0560: adds r0, r3, 0 adds r0, 0xB4 adds r0, r4 @@ -804159,11 +804159,11 @@ _081A0560: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _081A0560 - b _081A0652 + bls @081A0560 + b @081A0652 .align 2, 0 .pool -_081A05B4: +@081A05B4: movs r0, 0x12 mov r10, r0 movs r6, 0x8 @@ -804174,9 +804174,9 @@ _081A05B4: lsls r0, 26 lsrs r0, 28 cmp r0, 0x2 - bls _081A05CC - b _081A06FA -_081A05CC: + bls @081A05CC + b @081A06FA +@081A05CC: ldr r0, =0x030062f0 ldr r3, [r0] ldrh r0, [r3, 0x2] @@ -804189,10 +804189,10 @@ _081A05CC: muls r0, r2 adds r0, r1 str r0, [sp, 0xC] - b _081A0652 + b @081A0652 .align 2, 0 .pool -_081A05F4: +@081A05F4: movs r1, 0x11 mov r10, r1 movs r6, 0x8 @@ -804208,10 +804208,10 @@ _081A05F4: muls r0, r2 adds r0, r1 str r0, [sp, 0x10] - b _081A0652 + b @081A0652 .align 2, 0 .pool -_081A061C: +@081A061C: movs r0, 0x12 mov r10, r0 movs r6, 0x8 @@ -804219,10 +804219,10 @@ _081A061C: str r0, [sp, 0xC] ldr r0, =0x085ed198 str r0, [sp, 0x10] - b _081A0652 + b @081A0652 .align 2, 0 .pool -_081A0634: +@081A0634: movs r1, 0x14 mov r10, r1 movs r6, 0x8 @@ -804230,21 +804230,21 @@ _081A0634: str r0, [sp, 0xC] ldr r0, =0x085eae66 str r0, [sp, 0x10] - b _081A0652 + b @081A0652 .align 2, 0 .pool -_081A064C: +@081A064C: movs r0, 0 mov r10, r0 movs r6, 0 -_081A0652: +@081A0652: movs r5, 0 movs r4, 0 lsls r1, r7, 25 mov r8, r1 cmp r4, r7 - bcs _081A067E -_081A065E: + bcs @081A067E +@081A065E: lsls r0, r4, 2 add r0, sp adds r0, 0xC @@ -804253,15 +804253,15 @@ _081A065E: movs r2, 0 bl font_get_width_of_string cmp r0, r5 - ble _081A0674 + ble @081A0674 adds r5, r0, 0 -_081A0674: +@081A0674: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r7 - bcc _081A065E -_081A067E: + bcc @081A065E +@081A067E: adds r0, r5, 0 bl convert_pixel_width_to_tile_width adds r4, r0, 0 @@ -804286,8 +804286,8 @@ _081A067E: bl SetStandardWindowBorderStyle movs r4, 0 cmp r4, r7 - bcs _081A06E6 -_081A06B8: + bcs @081A06E6 +@081A06B8: lsls r0, r4, 2 add r0, sp adds r0, 0xC @@ -804309,8 +804309,8 @@ _081A06B8: lsls r0, 24 lsrs r4, r0, 24 cmp r4, r7 - bcc _081A06B8 -_081A06E6: + bcc @081A06B8 +@081A06E6: adds r0, r5, 0 adds r1, r7, 0 movs r2, 0 @@ -804319,7 +804319,7 @@ _081A06E6: adds r1, r7, 0 adds r2, r5, 0 bl sub_81A0804 -_081A06FA: +@081A06FA: add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -804331,7 +804331,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 @@ -804343,14 +804343,14 @@ sub_81A070C: @ 81A070C movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0 - bne _081A0730 + bne @081A0730 bl ProcessMenuInputNoWrapAround - b _081A0734 + b @081A0734 .align 2, 0 .pool -_081A0730: +@081A0730: bl ProcessMenuInput -_081A0734: +@081A0734: lsls r0, 24 lsrs r0, 24 lsls r0, 24 @@ -804358,32 +804358,32 @@ _081A0734: movs r0, 0x2 negs r0, r0 cmp r1, r0 - beq _081A0778 + beq @081A0778 adds r0, 0x1 cmp r1, r0 - bne _081A0764 + bne @081A0764 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - bne _081A0778 + bne @081A0778 movs r0, 0x5 bl audio_play ldr r1, =0x020375f0 movs r0, 0x7F strh r0, [r1] - b _081A0768 + b @081A0768 .align 2, 0 .pool -_081A0764: +@081A0764: ldr r0, =0x020375f0 strh r1, [r0] -_081A0768: +@081A0768: ldrb r0, [r4, 0xC] bl sub_81A07E8 adds r0, r5, 0 bl remove_task bl script_env_2_enable_and_set_ctx_running -_081A0778: +@081A0778: pop {r4,r5} pop {r0} bx r0 @@ -804392,7 +804392,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 @@ -804442,7 +804442,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 @@ -804458,7 +804458,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 @@ -804480,14 +804480,14 @@ sub_81A0804: @ 81A0804 adds r1, r0, r1 strh r4, [r1, 0x10] cmp r5, 0x3 - bls _081A0840 + bls @081A0840 movs r0, 0x1 - b _081A0842 + b @081A0842 .align 2, 0 .pool -_081A0840: +@081A0840: movs r0, 0 -_081A0842: +@081A0842: strh r0, [r1, 0x12] ldr r1, =0x03005e00 lsls r0, r2, 2 @@ -804503,7 +804503,7 @@ _081A0842: thumb_func_end sub_81A0804 thumb_func_start sub_81A085C -sub_81A085C: @ 81A085C +sub_81A085C: ; 81A085C push {lr} ldr r1, =0x086114e0 ldr r0, =0x020375e0 @@ -804519,7 +804519,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 @@ -804552,7 +804552,7 @@ sub_81A087C: @ 81A087C strb r0, [r1] movs r4, 0 movs r1, 0 -_081A08BE: +@081A08BE: ldr r0, [r3] adds r0, 0xB4 adds r0, r4 @@ -804561,7 +804561,7 @@ _081A08BE: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _081A08BE + bls @081A08BE movs r4, 0 ldr r5, =0x03005d90 movs r0, 0x4 @@ -804571,7 +804571,7 @@ _081A08BE: negs r7, r7 movs r6, 0x31 negs r6, r6 -_081A08E2: +@081A08E2: ldr r1, [r5] lsls r3, r4, 2 adds r1, r3 @@ -804610,7 +804610,7 @@ _081A08E2: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x8 - bls _081A08E2 + bls @081A08E2 pop {r4-r7} pop {r0} bx r0 @@ -804619,23 +804619,23 @@ _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 lsrs r1, r0, 24 cmp r1, 0 - bne _081A0954 + bne @081A0954 ldr r0, =0x020375f0 strh r1, [r0] - b _081A095A + b @081A095A .align 2, 0 .pool -_081A0954: +@081A0954: ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] -_081A095A: +@081A095A: pop {r0} bx r0 .align 2, 0 @@ -804643,7 +804643,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] @@ -804655,7 +804655,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} @@ -804663,7 +804663,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} @@ -804671,7 +804671,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 @@ -804693,7 +804693,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] @@ -804708,7 +804708,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] @@ -804718,20 +804718,20 @@ sub_81A09D0: @ 81A09D0 lsrs r0, 28 subs r1, r0, 0x3 cmp r1, 0 - bge _081A09F4 + bge @081A09F4 ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - b _081A0A1C + b @081A0A1C .align 2, 0 .pool -_081A09F4: +@081A09F4: ldr r2, =0x020375f0 cmp r1, 0x8 - ble _081A09FE + ble @081A09FE movs r0, 0x1 strh r0, [r2] -_081A09FE: +@081A09FE: ldr r0, [r3] lsls r1, 2 adds r0, r1 @@ -804739,22 +804739,22 @@ _081A09FE: ldrb r0, [r0] lsls r0, 30 cmp r0, 0 - bne _081A0A18 + bne @081A0A18 movs r0, 0x1 - b _081A0A1A + b @081A0A1A .align 2, 0 .pool -_081A0A18: +@081A0A18: movs r0, 0 -_081A0A1A: +@081A0A1A: strh r0, [r2] -_081A0A1C: +@081A0A1C: pop {r0} bx r0 thumb_func_end sub_81A09D0 thumb_func_start sub_81A0A20 -sub_81A0A20: @ 81A0A20 +sub_81A0A20: ; 81A0A20 push {lr} ldr r0, =0x020375e2 ldrb r0, [r0] @@ -804766,52 +804766,52 @@ 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 bl sub_8197224 lsls r0, 16 cmp r0, 0 - bne _081A0A68 + bne @081A0A68 adds r0, r4, 0 bl remove_task ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0 - beq _081A0A64 + beq @081A0A64 ldr r0, =script_env_2_enable_and_set_ctx_running + 1 bl sub_81A172C - b _081A0A68 + b @081A0A68 .align 2, 0 .pool -_081A0A64: +@081A0A64: bl script_env_2_enable_and_set_ctx_running -_081A0A68: +@081A0A68: pop {r4} pop {r0} bx r0 thumb_func_end sub_81A0A34 thumb_func_start sub_81A0A70 -sub_81A0A70: @ 81A0A70 +sub_81A0A70: ; 81A0A70 push {lr} ldr r1, =0x020375e4 ldrh r0, [r1] cmp r0, 0x6 - bne _081A0A94 + bne @081A0A94 ldr r1, =0x08610ff0 ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r0, [r0] lsls r0, 3 - b _081A0C66 + b @081A0C66 .align 2, 0 .pool -_081A0A94: +@081A0A94: cmp r0, 0x7 - bne _081A0AB0 + bne @081A0AB0 ldr r1, =0x08610ff0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -804819,24 +804819,24 @@ _081A0A94: ldrb r0, [r0] lsls r0, 3 adds r1, 0x4 - b _081A0C66 + b @081A0C66 .align 2, 0 .pool -_081A0AB0: +@081A0AB0: cmp r0, 0x8 - bne _081A0ACC + bne @081A0ACC ldr r1, =0x086111b0 ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r0, [r0] lsls r0, 3 - b _081A0C66 + b @081A0C66 .align 2, 0 .pool -_081A0ACC: +@081A0ACC: cmp r0, 0x9 - bne _081A0AE8 + bne @081A0AE8 ldr r1, =0x086111b0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -804844,24 +804844,24 @@ _081A0ACC: ldrb r0, [r0] lsls r0, 3 adds r1, 0x4 - b _081A0C66 + b @081A0C66 .align 2, 0 .pool -_081A0AE8: +@081A0AE8: cmp r0, 0x4 - bne _081A0B04 + bne @081A0B04 ldr r1, =0x08611230 ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r0, [r0] lsls r0, 3 - b _081A0C66 + b @081A0C66 .align 2, 0 .pool -_081A0B04: +@081A0B04: cmp r0, 0x5 - bne _081A0B20 + bne @081A0B20 ldr r1, =0x08611230 ldr r0, =0x03005d90 ldr r0, [r0] @@ -804869,12 +804869,12 @@ _081A0B04: ldrb r0, [r0] lsls r0, 3 adds r1, 0x4 - b _081A0C66 + b @081A0C66 .align 2, 0 .pool -_081A0B20: +@081A0B20: cmp r0, 0xA - bne _081A0B40 + bne @081A0B40 ldr r2, =0x08611070 ldr r0, =0x03005d90 ldr r0, [r0] @@ -804883,24 +804883,24 @@ _081A0B20: lsls r0, r1, 2 adds r0, r1 lsls r0, 2 - b _081A0BD6 + b @081A0BD6 .align 2, 0 .pool -_081A0B40: +@081A0B40: cmp r0, 0xB - bne _081A0B5C + bne @081A0B5C ldr r1, =0x086112b0 ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r0, [r0] lsls r0, 3 - b _081A0C66 + b @081A0C66 .align 2, 0 .pool -_081A0B5C: +@081A0B5C: cmp r0, 0xC - bne _081A0B7C + bne @081A0B7C ldr r2, =0x08611070 ldr r0, =0x03005d90 ldr r0, [r0] @@ -804910,12 +804910,12 @@ _081A0B5C: adds r0, r1 lsls r0, 2 adds r2, 0xC - b _081A0BD6 + b @081A0BD6 .align 2, 0 .pool -_081A0B7C: +@081A0B7C: cmp r0, 0xD - bne _081A0B9C + bne @081A0B9C ldr r2, =0x08611070 ldr r0, =0x03005d90 ldr r0, [r0] @@ -804925,13 +804925,13 @@ _081A0B7C: adds r0, r1 lsls r0, 2 adds r2, 0x4 - b _081A0BD6 + b @081A0BD6 .align 2, 0 .pool -_081A0B9C: +@081A0B9C: ldrh r0, [r1] cmp r0, 0x10 - bne _081A0BC0 + bne @081A0BC0 ldr r2, =0x08611070 ldr r0, =0x03005d90 ldr r0, [r0] @@ -804941,12 +804941,12 @@ _081A0B9C: adds r0, r1 lsls r0, 2 adds r2, 0x10 - b _081A0BD6 + b @081A0BD6 .align 2, 0 .pool -_081A0BC0: +@081A0BC0: cmp r0, 0xE - bne _081A0BE4 + bne @081A0BE4 ldr r2, =0x08611070 ldr r0, =0x03005d90 ldr r0, [r0] @@ -804956,15 +804956,15 @@ _081A0BC0: adds r0, r1 lsls r0, 2 adds r2, 0x8 -_081A0BD6: +@081A0BD6: adds r0, r2 ldr r1, [r0] - b _081A0C7A + b @081A0C7A .align 2, 0 .pool -_081A0BE4: +@081A0BE4: cmp r0, 0xF - bne _081A0C00 + bne @081A0C00 ldr r1, =0x086112b0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -804972,24 +804972,24 @@ _081A0BE4: ldrb r0, [r0] lsls r0, 3 adds r1, 0x4 - b _081A0C66 + b @081A0C66 .align 2, 0 .pool -_081A0C00: +@081A0C00: cmp r0, 0 - bne _081A0C1C + bne @081A0C1C ldr r1, =0x08610ef0 ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r0, [r0] lsls r0, 4 - b _081A0C66 + b @081A0C66 .align 2, 0 .pool -_081A0C1C: +@081A0C1C: cmp r0, 0x1 - bne _081A0C38 + bne @081A0C38 ldr r1, =0x08610ef0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -804997,12 +804997,12 @@ _081A0C1C: ldrb r0, [r0] lsls r0, 4 adds r1, 0x4 - b _081A0C66 + b @081A0C66 .align 2, 0 .pool -_081A0C38: +@081A0C38: cmp r0, 0x2 - bne _081A0C54 + bne @081A0C54 ldr r1, =0x08610ef0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -805010,12 +805010,12 @@ _081A0C38: ldrb r0, [r0] lsls r0, 4 adds r1, 0x8 - b _081A0C66 + b @081A0C66 .align 2, 0 .pool -_081A0C54: +@081A0C54: cmp r0, 0x3 - bne _081A0C74 + bne @081A0C74 ldr r1, =0x08610ef0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -805023,16 +805023,16 @@ _081A0C54: ldrb r0, [r0] lsls r0, 4 adds r1, 0xC -_081A0C66: +@081A0C66: adds r0, r1 ldr r1, [r0] - b _081A0C7A + b @081A0C7A .align 2, 0 .pool -_081A0C74: +@081A0C74: bl script_env_2_enable_and_set_ctx_running - b _081A0C8E -_081A0C7A: + b @081A0C8E +@081A0C7A: ldr r0, =0x02021fc4 bl ExpandTextCodes movs r0, 0x1 @@ -805040,7 +805040,7 @@ _081A0C7A: ldr r0, =sub_81A0A34 + 1 movs r1, 0x1 bl AddTask -_081A0C8E: +@081A0C8E: pop {r0} bx r0 .align 2, 0 @@ -805048,7 +805048,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 @@ -805063,7 +805063,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] @@ -805073,16 +805073,16 @@ sub_81A0CC0: @ 81A0CC0 lsls r1, r0, 26 lsrs r0, r1, 28 cmp r0, 0x2 - bhi _081A0CE4 + bhi @081A0CE4 ldr r1, =0x020375f0 movs r0, 0x2 - b _081A0D34 + b @081A0D34 .align 2, 0 .pool -_081A0CE4: +@081A0CE4: lsrs r0, r1, 28 cmp r0, 0xB - bhi _081A0D30 + bhi @081A0D30 lsrs r0, r1, 28 subs r0, 0x3 lsls r0, 2 @@ -805092,38 +805092,38 @@ _081A0CE4: lsls r0, 30 lsrs r0, 30 cmp r0, 0x2 - beq _081A0D18 + beq @081A0D18 cmp r0, 0x2 - bgt _081A0D08 + bgt @081A0D08 cmp r0, 0x1 - beq _081A0D0E - b _081A0D30 -_081A0D08: + beq @081A0D0E + b @081A0D30 +@081A0D08: cmp r0, 0x3 - beq _081A0D24 - b _081A0D30 -_081A0D0E: + beq @081A0D24 + b @081A0D30 +@081A0D0E: ldr r1, =0x020375f0 movs r0, 0x4 - b _081A0D34 + b @081A0D34 .align 2, 0 .pool -_081A0D18: +@081A0D18: ldr r1, =0x020375f0 movs r0, 0x3 - b _081A0D34 + b @081A0D34 .align 2, 0 .pool -_081A0D24: +@081A0D24: ldr r1, =0x020375f0 movs r0, 0x1 - b _081A0D34 + b @081A0D34 .align 2, 0 .pool -_081A0D30: +@081A0D30: ldr r1, =0x020375f0 movs r0, 0x5 -_081A0D34: +@081A0D34: strh r0, [r1] pop {r0} bx r0 @@ -805132,12 +805132,12 @@ _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] cmp r0, 0 - beq _081A0D6E + beq @081A0D6E ldr r4, =0x020375e4 ldr r0, =0x03005d90 ldr r2, [r0] @@ -805156,7 +805156,7 @@ sub_81A0D40: @ 81A0D40 ands r0, r3 orrs r0, r1 strb r0, [r2] -_081A0D6E: +@081A0D6E: pop {r4} pop {r0} bx r0 @@ -805165,7 +805165,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] @@ -805175,14 +805175,14 @@ sub_81A0D80: @ 81A0D80 lsls r1, r0, 26 lsrs r0, r1, 28 cmp r0, 0x2 - bls _081A0DCE + bls @081A0DCE subs r0, 0x3 lsls r0, 24 lsrs r2, r0, 24 ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0 - beq _081A0DC0 + beq @081A0DC0 lsls r2, 2 adds r2, r3, r2 adds r2, 0xB8 @@ -805192,10 +805192,10 @@ sub_81A0D80: @ 81A0D80 movs r1, 0x40 orrs r0, r1 strb r0, [r2] - b _081A0DCE + b @081A0DCE .align 2, 0 .pool -_081A0DC0: +@081A0DC0: lsls r0, r2, 2 adds r0, r3, r0 adds r0, 0xB8 @@ -805203,13 +805203,13 @@ _081A0DC0: movs r1, 0x3F ands r1, r2 strb r1, [r0] -_081A0DCE: +@081A0DCE: pop {r0} bx r0 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 @@ -805224,9 +805224,9 @@ sub_81A0DD4: @ 81A0DD4 ldr r3, =0x030062f0 mov r9, r3 cmp r0, 0 - beq _081A0E14 + beq @081A0E14 adds r3, r1, 0 -_081A0DF4: +@081A0DF4: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 @@ -805234,7 +805234,7 @@ _081A0DF4: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x8 - bhi _081A0E14 + bhi @081A0E14 ldr r0, [r3] lsls r1, r2, 2 adds r0, r1 @@ -805242,8 +805242,8 @@ _081A0DF4: ldrb r0, [r0] lsls r0, 30 cmp r0, 0 - bne _081A0DF4 -_081A0E14: + bne @081A0DF4 +@081A0E14: mov r4, r9 movs r0, 0x8 bl malloc_and_clear @@ -805252,7 +805252,7 @@ _081A0E14: ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x2 - bne _081A0E88 + bne @081A0E88 ldr r0, =0x03005d90 ldr r5, [r0] adds r6, r5, 0 @@ -805261,9 +805261,9 @@ _081A0E14: lsls r1, r0, 26 lsrs r0, r1, 28 cmp r0, 0x2 - bls _081A0E3C - b _081A0FCE -_081A0E3C: + bls @081A0E3C + b @081A0FCE +@081A0E3C: adds r2, r5, 0 adds r2, 0xB4 adds r0, r2, r0 @@ -805292,12 +805292,12 @@ _081A0E3C: muls r1, r4 adds r0, r1 adds r0, r3 - b _081A0FCA + b @081A0FCA .align 2, 0 .pool -_081A0E88: +@081A0E88: cmp r0, 0x3 - bne _081A0F54 + bne @081A0F54 ldr r0, =0x03005d90 mov r8, r0 ldr r5, [r0] @@ -805308,15 +805308,15 @@ _081A0E88: lsls r2, r0, 26 lsrs r0, r2, 28 cmp r0, 0x2 - bhi _081A0EA4 - b _081A0FCE -_081A0EA4: + bhi @081A0EA4 + b @081A0FCE +@081A0EA4: adds r1, r0, 0 adds r0, r6, 0x3 cmp r1, r0 - blt _081A0EAE - b _081A0FCE -_081A0EAE: + blt @081A0EAE + b @081A0FCE +@081A0EAE: adds r0, r1, 0 subs r0, 0x3 lsls r0, 2 @@ -805326,9 +805326,9 @@ _081A0EAE: lsls r0, 30 lsrs r0, 30 cmp r0, 0x2 - beq _081A0EC4 - b _081A0FCE -_081A0EC4: + beq @081A0EC4 + b @081A0FCE +@081A0EC4: adds r0, r1, 0 subs r0, 0x3 lsls r0, 2 @@ -805395,12 +805395,12 @@ _081A0EC4: adds r1, 0xBA ldrh r0, [r1] strh r0, [r2, 0x6] - b _081A0FCE + b @081A0FCE .align 2, 0 .pool -_081A0F54: +@081A0F54: cmp r0, 0x4 - bne _081A0FCE + bne @081A0FCE ldr r0, =0x03005d90 ldr r3, [r0] adds r0, r3, 0 @@ -805409,11 +805409,11 @@ _081A0F54: lsls r2, r0, 26 lsrs r0, r2, 28 cmp r0, 0x2 - bls _081A0FCE + bls @081A0FCE adds r1, r0, 0 adds r0, r6, 0x3 cmp r1, r0 - bge _081A0FCE + bge @081A0FCE adds r0, r1, 0 subs r0, 0x3 lsls r0, 2 @@ -805423,7 +805423,7 @@ _081A0F54: lsls r0, 30 lsrs r0, 30 cmp r0, 0x1 - bne _081A0FCE + bne @081A0FCE adds r0, r1, 0 subs r0, 0x3 lsls r0, 2 @@ -805458,10 +805458,10 @@ _081A0F54: adds r0, r1 adds r2, 0x34 adds r0, r2 -_081A0FCA: +@081A0FCA: ldrh r0, [r0] strh r0, [r7] -_081A0FCE: +@081A0FCE: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -805473,7 +805473,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] @@ -805488,63 +805488,63 @@ 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 ldrh r0, [r0] cmp r0, 0x1 - beq _081A1028 + beq @081A1028 cmp r0, 0x1 - bgt _081A1018 + bgt @081A1018 cmp r0, 0 - beq _081A101E - b _081A11E6 + beq @081A101E + b @081A11E6 .align 2, 0 .pool -_081A1018: +@081A1018: cmp r0, 0x2 - beq _081A1030 - b _081A11E6 -_081A101E: + beq @081A1030 + b @081A11E6 +@081A101E: ldr r5, =0x02021cc4 - b _081A1032 + b @081A1032 .align 2, 0 .pool -_081A1028: +@081A1028: ldr r5, =0x02021dc4 - b _081A1032 + b @081A1032 .align 2, 0 .pool -_081A1030: +@081A1030: ldr r5, =0x02021ec4 -_081A1032: +@081A1032: ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0x9 - bls _081A103C - b _081A11E6 -_081A103C: + bls @081A103C + b @081A11E6 +@081A103C: lsls r0, 2 - ldr r1, =_081A1054 + ldr r1, =@081A1054 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081A1054: - .4byte _081A107C - .4byte _081A1094 - .4byte _081A10AC - .4byte _081A10C4 - .4byte _081A10DC - .4byte _081A10F4 - .4byte _081A1118 - .4byte _081A1164 - .4byte _081A1140 - .4byte _081A1184 -_081A107C: +@081A1054: + .4byte @081A107C + .4byte @081A1094 + .4byte @081A10AC + .4byte @081A10C4 + .4byte @081A10DC + .4byte @081A10F4 + .4byte @081A1118 + .4byte @081A1164 + .4byte @081A1140 + .4byte @081A1184 +@081A107C: ldr r0, =0x030062f0 ldr r0, [r0] ldrh r1, [r0] @@ -805552,10 +805552,10 @@ _081A107C: muls r1, r0 ldr r0, =0x083185c8 adds r1, r0 - b _081A1174 + b @081A1174 .align 2, 0 .pool -_081A1094: +@081A1094: ldr r0, =0x030062f0 ldr r0, [r0] ldrh r1, [r0, 0x2] @@ -805563,10 +805563,10 @@ _081A1094: muls r1, r0 ldr r0, =0x083185c8 adds r1, r0 - b _081A1174 + b @081A1174 .align 2, 0 .pool -_081A10AC: +@081A10AC: ldr r0, =0x030062f0 ldr r0, [r0] ldrh r1, [r0] @@ -805574,10 +805574,10 @@ _081A10AC: muls r1, r0 ldr r0, =0x083185c8 adds r1, r0 - b _081A1174 + b @081A1174 .align 2, 0 .pool -_081A10C4: +@081A10C4: ldr r0, =0x030062f0 ldr r0, [r0] ldrh r1, [r0, 0x4] @@ -805585,10 +805585,10 @@ _081A10C4: muls r1, r0 ldr r0, =0x0831977c adds r1, r0 - b _081A1174 + b @081A1174 .align 2, 0 .pool -_081A10DC: +@081A10DC: ldr r0, =0x030062f0 ldr r0, [r0] ldrh r1, [r0, 0x6] @@ -805596,10 +805596,10 @@ _081A10DC: muls r1, r0 ldr r0, =0x0831977c adds r1, r0 - b _081A1174 + b @081A1174 .align 2, 0 .pool -_081A10F4: +@081A10F4: ldr r0, =0x03005d90 ldr r1, [r0] adds r0, r1, 0 @@ -805614,10 +805614,10 @@ _081A10F4: ldrh r0, [r1] bl itemid_get_item adds r1, r0, 0 - b _081A1174 + b @081A1174 .align 2, 0 .pool -_081A1118: +@081A1118: ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 @@ -805631,10 +805631,10 @@ _081A1118: adds r0, r5, 0 mov r1, sp bl gf_strcpy - b _081A11E6 + b @081A11E6 .align 2, 0 .pool -_081A1140: +@081A1140: ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB1 @@ -805642,17 +805642,17 @@ _081A1140: movs r0, 0x3 ands r0, r1 cmp r0, 0x1 - bne _081A115C + bne @081A115C ldr r1, =0x085eaeb1 - b _081A1174 + b @081A1174 .align 2, 0 .pool -_081A115C: +@081A115C: ldr r1, =0x085eaeb8 - b _081A1174 + b @081A1174 .align 2, 0 .pool -_081A1164: +@081A1164: ldr r0, =0x03005d90 ldr r0, [r0] movs r1, 0x82 @@ -805660,13 +805660,13 @@ _081A1164: adds r0, r1 bl sub_81638AC ldr r1, =0x02021fc4 -_081A1174: +@081A1174: adds r0, r5, 0 bl gf_strcpy - b _081A11E6 + b @081A11E6 .align 2, 0 .pool -_081A1184: +@081A1184: ldr r0, =0x03005d90 ldr r3, [r0] adds r1, r3, 0 @@ -805676,7 +805676,7 @@ _081A1184: lsrs r1, r4, 30 adds r6, r0, 0 cmp r1, 0x2 - bhi _081A11C0 + bhi @081A11C0 adds r0, r3, 0 adds r0, 0xB4 adds r0, r1 @@ -805693,12 +805693,12 @@ _081A1184: asrs r2, r0 movs r0, 0xF ands r2, r0 - b _081A11C2 + b @081A11C2 .align 2, 0 .pool -_081A11C0: +@081A11C0: movs r2, 0 -_081A11C2: +@081A11C2: ldr r3, =0x08610970 lsls r1, r2, 1 ldr r0, [r6] @@ -805716,7 +805716,7 @@ _081A11C2: adds r1, r0 adds r0, r5, 0 bl gf_strcpy -_081A11E6: +@081A11E6: add sp, 0x10 pop {r4-r6} pop {r0} @@ -805726,7 +805726,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 @@ -805744,7 +805744,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} @@ -805752,7 +805752,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 @@ -805766,9 +805766,9 @@ sub_81A1224: @ 81A1224 lsrs r0, 28 adds r7, r1, 0 cmp r0, 0x2 - bhi _081A1242 - b _081A1362 -_081A1242: + bhi @081A1242 + b @081A1362 +@081A1242: movs r5, 0 movs r2, 0 adds r0, r3, 0 @@ -805780,9 +805780,9 @@ _081A1242: ldr r1, =0x020375f0 mov r8, r1 cmp r0, 0 - beq _081A127C + beq @081A127C adds r3, r7, 0 -_081A125C: +@081A125C: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -805790,7 +805790,7 @@ _081A125C: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x8 - bhi _081A127C + bhi @081A127C ldr r0, [r3] lsls r1, r2, 2 adds r0, r1 @@ -805798,11 +805798,11 @@ _081A125C: ldrb r0, [r0] lsls r0, 30 cmp r0, 0 - bne _081A125C -_081A127C: + bne @081A125C +@081A127C: movs r4, 0 cmp r4, r5 - bcs _081A1322 + bcs @081A1322 ldr r0, [r7] adds r0, 0xB1 ldrb r0, [r0] @@ -805810,10 +805810,10 @@ _081A127C: lsrs r0, 28 subs r0, 0x3 cmp r4, r0 - bge _081A1322 + bge @081A1322 adds r6, r7, 0 mov r9, r4 -_081A1296: +@081A1296: ldr r3, [r6] lsls r0, r4, 2 adds r2, r3, r0 @@ -805823,17 +805823,17 @@ _081A1296: lsls r0, r1, 30 lsrs r0, 30 cmp r0, 0x1 - bne _081A1308 + bne @081A1308 lsrs r0, r1, 6 cmp r0, 0 - beq _081A1308 + beq @081A1308 adds r0, r2, 0 adds r0, 0xBA ldrh r0, [r0] mov r2, r12 ldrh r2, [r2] cmp r0, r2 - bne _081A1308 + bne @081A1308 adds r0, r3, 0 adds r0, 0xB1 ldrb r0, [r0] @@ -805863,15 +805863,15 @@ _081A1296: mov r1, r9 mov r0, r8 strh r1, [r0] - b _081A1362 + b @081A1362 .align 2, 0 .pool -_081A1308: +@081A1308: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcs _081A1322 + bcs @081A1322 ldr r0, [r6] adds r0, 0xB1 ldrb r0, [r0] @@ -805879,8 +805879,8 @@ _081A1308: lsrs r0, 28 subs r0, 0x3 cmp r4, r0 - blt _081A1296 -_081A1322: + blt @081A1296 +@081A1322: ldr r2, [r7] adds r0, r2, 0 adds r0, 0xB1 @@ -805913,7 +805913,7 @@ _081A1322: movs r0, 0x1 mov r1, r8 strh r0, [r1] -_081A1362: +@081A1362: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -805923,7 +805923,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 @@ -805937,9 +805937,9 @@ sub_81A1370: @ 81A1370 ldrb r1, [r1] adds r4, r0, 0 cmp r1, 0xFF - beq _081A1422 + beq @081A1422 movs r5, 0 -_081A138E: +@081A138E: ldr r1, [r4] adds r2, r5, 0x1 lsls r0, r2, 4 @@ -805951,19 +805951,19 @@ _081A138E: adds r0, r3, r5 ldrb r0, [r0] cmp r0, 0xFF - bne _081A13B8 + bne @081A13B8 adds r0, r3, 0 adds r0, 0xDC adds r1, 0xDC movs r2, 0x44 bl memcpy - b _081A1422 + b @081A1422 .align 2, 0 .pool -_081A13B8: +@081A13B8: adds r5, r2, 0 cmp r5, 0x2 - ble _081A138E + ble @081A138E ldr r0, =0x0000ffff mov r10, r0 movs r2, 0x1 @@ -805975,7 +805975,7 @@ _081A13B8: lsls r0, 1 mov r8, r0 movs r6, 0x44 -_081A13D4: +@081A13D4: ldr r0, [r7] add r0, r8 adds r0, 0x34 @@ -805985,25 +805985,25 @@ _081A13D4: adds r0, 0xA bl sub_80842DC cmp r4, r0 - bne _081A13FC + bne @081A13FC ldr r0, [r7] adds r0, r6 adds r0, 0xDE ldrb r0, [r0] cmp r0, r10 - bge _081A13FC + bge @081A13FC mov r10, r0 mov r9, r5 -_081A13FC: +@081A13FC: movs r2, 0x44 add r8, r2 adds r6, 0x44 adds r5, 0x1 cmp r5, 0x3 - ble _081A13D4 + ble @081A13D4 mov r5, r9 cmp r5, 0 - ble _081A1422 + ble @081A1422 ldr r0, =0x03005d90 ldr r1, [r0] lsls r0, r5, 4 @@ -806013,7 +806013,7 @@ _081A13FC: adds r0, 0xDC adds r1, 0xDC bl memcpy -_081A1422: +@081A1422: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -806026,7 +806026,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] @@ -806057,25 +806057,25 @@ sub_81A1438: @ 81A1438 strb r0, [r2] movs r2, 0 ldr r0, [r4] - b _081A148C + b @081A148C .align 2, 0 .pool -_081A147C: +@081A147C: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x8 - bhi _081A1496 + bhi @081A1496 ldr r0, [r4] lsls r1, r2, 2 adds r0, r1 -_081A148C: +@081A148C: adds r0, 0xB8 ldrb r0, [r0] lsls r0, 30 cmp r0, 0 - bne _081A147C -_081A1496: + bne @081A147C +@081A1496: ldr r4, =0x03005d90 ldr r0, [r4] adds r0, 0xDD @@ -806085,10 +806085,10 @@ _081A1496: adds r1, 0xDE ldrb r0, [r1] cmp r0, 0xFE - bhi _081A14AE + bhi @081A14AE adds r0, 0x1 strb r0, [r1] -_081A14AE: +@081A14AE: ldr r0, [r4] adds r0, 0xDD ldrb r0, [r0] @@ -806098,7 +806098,7 @@ _081A14AE: movs r4, 0x88 lsls r4, 1 adds r5, r3, 0 -_081A14C2: +@081A14C2: ldr r0, [r3] adds r1, r0, r4 adds r1, r2 @@ -806110,7 +806110,7 @@ _081A14C2: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls _081A14C2 + bls @081A14C2 ldr r1, [r5] movs r2, 0x8A lsls r2, 1 @@ -806133,7 +806133,7 @@ _081A14C2: thumb_func_end sub_81A1438 thumb_func_start sub_81A150C -sub_81A150C: @ 81A150C +sub_81A150C: ; 81A150C push {lr} ldr r2, =0x08610970 ldr r0, =0x03005d90 @@ -806151,53 +806151,53 @@ sub_81A150C: @ 81A150C ldr r3, =0x085dcedc ldrb r0, [r3] cmp r0, r2 - beq _081A1542 -_081A1530: + beq @081A1542 +@081A1530: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x1D - bhi _081A1542 + bhi @081A1542 adds r0, r1, r3 ldrb r0, [r0] cmp r0, r2 - bne _081A1530 -_081A1542: + bne @081A1530 +@081A1542: cmp r1, 0x1E - beq _081A1568 + beq @081A1568 ldr r0, =0x085dcf0e adds r0, r1, r0 ldrb r1, [r0] ldr r0, =0x00004010 bl var_set - b _081A1594 + b @081A1594 .align 2, 0 .pool -_081A1568: +@081A1568: movs r1, 0 ldr r3, =0x085dcefa ldrb r0, [r3] cmp r0, r2 - beq _081A1584 -_081A1572: + beq @081A1584 +@081A1572: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x13 - bhi _081A1584 + bhi @081A1584 adds r0, r1, r3 ldrb r0, [r0] cmp r0, r2 - bne _081A1572 -_081A1584: + bne @081A1572 +@081A1584: cmp r1, 0x14 - beq _081A1594 + beq @081A1594 ldr r0, =0x085dcf2c adds r0, r1, r0 ldrb r1, [r0] ldr r0, =0x00004010 bl var_set -_081A1594: +@081A1594: pop {r0} bx r0 .align 2, 0 @@ -806205,7 +806205,7 @@ _081A1594: thumb_func_end sub_81A150C thumb_func_start sub_81A15A4 -sub_81A15A4: @ 81A15A4 +sub_81A15A4: ; 81A15A4 push {lr} ldr r2, =0x08610970 ldr r0, =0x03005d90 @@ -806221,53 +806221,53 @@ sub_81A15A4: @ 81A15A4 ldr r3, =0x085dcedc ldrb r0, [r3] cmp r0, r2 - beq _081A15D6 -_081A15C4: + beq @081A15D6 +@081A15C4: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x1D - bhi _081A15D6 + bhi @081A15D6 adds r0, r1, r3 ldrb r0, [r0] cmp r0, r2 - bne _081A15C4 -_081A15D6: + bne @081A15C4 +@081A15D6: cmp r1, 0x1E - beq _081A15FC + beq @081A15FC ldr r0, =0x085dcf0e adds r0, r1, r0 ldrb r1, [r0] ldr r0, =0x00004010 bl var_set - b _081A1628 + b @081A1628 .align 2, 0 .pool -_081A15FC: +@081A15FC: movs r1, 0 ldr r3, =0x085dcefa ldrb r0, [r3] cmp r0, r2 - beq _081A1618 -_081A1606: + beq @081A1618 +@081A1606: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x13 - bhi _081A1618 + bhi @081A1618 adds r0, r1, r3 ldrb r0, [r0] cmp r0, r2 - bne _081A1606 -_081A1618: + bne @081A1606 +@081A1618: cmp r1, 0x14 - beq _081A1628 + beq @081A1628 ldr r0, =0x085dcf2c adds r0, r1, r0 ldrb r1, [r0] ldr r0, =0x00004010 bl var_set -_081A1628: +@081A1628: pop {r0} bx r0 .align 2, 0 @@ -806275,7 +806275,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] @@ -806285,7 +806285,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] @@ -806295,7 +806295,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 @@ -806303,52 +806303,52 @@ sub_81A1650: @ 81A1650 adds r2, r0 subs r0, r1, 0x1 cmp r0, 0x6 - bhi _081A16AC + bhi @081A16AC lsls r0, 2 - ldr r1, =_081A1674 + ldr r1, =@081A1674 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081A1674: - .4byte _081A1690 - .4byte _081A1694 - .4byte _081A169A - .4byte _081A16A0 - .4byte _081A16A6 - .4byte _081A16AC - .4byte _081A16AC -_081A1690: +@081A1674: + .4byte @081A1690 + .4byte @081A1694 + .4byte @081A169A + .4byte @081A16A0 + .4byte @081A16A6 + .4byte @081A16AC + .4byte @081A16AC +@081A1690: adds r0, r2, 0 - b _081A16B0 -_081A1694: + b @081A16B0 +@081A1694: adds r0, r2, 0 adds r0, 0x8 - b _081A16B0 -_081A169A: + b @081A16B0 +@081A169A: adds r0, r2, 0 adds r0, 0x10 - b _081A16B0 -_081A16A0: + b @081A16B0 +@081A16A0: adds r0, r2, 0 adds r0, 0x18 - b _081A16B0 -_081A16A6: + b @081A16B0 +@081A16A6: adds r0, r2, 0 adds r0, 0x20 - b _081A16B0 -_081A16AC: + b @081A16B0 +@081A16AC: adds r0, r2, 0 adds r0, 0x28 -_081A16B0: +@081A16B0: pop {r1} bx r1 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 @@ -806357,15 +806357,15 @@ sub_81A16B4: @ 81A16B4 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _081A16CE + bne @081A16CE movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081A16D4 -_081A16CE: + beq @081A16D4 +@081A16CE: adds r0, r2, 0 bl set_task_function_to_args_14_15 -_081A16D4: +@081A16D4: pop {r0} bx r0 .align 2, 0 @@ -806373,7 +806373,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 @@ -806382,12 +806382,12 @@ sub_81A16DC: @ 81A16DC movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _081A16F6 + bne @081A16F6 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081A1718 -_081A16F6: + beq @081A1718 +@081A16F6: ldr r2, =0x030062f4 ldr r1, =0x03005e00 lsls r0, r4, 2 @@ -806403,7 +806403,7 @@ _081A16F6: bl _call_via_r1 adds r0, r4, 0 bl remove_task -_081A1718: +@081A1718: pop {r4} pop {r0} bx r0 @@ -806412,7 +806412,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 + 1 @@ -806436,7 +806436,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 + 1 @@ -806456,7 +806456,7 @@ sub_81A175C: @ 81A175C thumb_func_end sub_81A175C thumb_func_start sub_81A1780 -sub_81A1780: @ 81A1780 +sub_81A1780: ; 81A1780 push {lr} ldr r1, =0x08611c18 ldr r0, =0x020375e0 @@ -806472,7 +806472,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 @@ -806484,30 +806484,30 @@ sub_81A17A0: @ 81A17A0 adds r0, r1 ldrb r0, [r0] cmp r0, 0x4 - bhi _081A1822 + bhi @081A1822 lsls r0, 2 - ldr r1, =_081A17D0 + ldr r1, =@081A17D0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081A17D0: - .4byte _081A1822 - .4byte _081A17E4 - .4byte _081A1810 - .4byte _081A17EC - .4byte _081A17E8 -_081A17E4: +@081A17D0: + .4byte @081A1822 + .4byte @081A17E4 + .4byte @081A1810 + .4byte @081A17EC + .4byte @081A17E8 +@081A17E4: movs r0, 0 - b _081A17EE -_081A17E8: + b @081A17EE +@081A17E8: movs r0, 0 - b _081A17EE -_081A17EC: + b @081A17EE +@081A17EC: movs r0, 0x1 -_081A17EE: +@081A17EE: bl sub_813A878 movs r0, 0x80 lsls r0, 7 @@ -806517,10 +806517,10 @@ _081A17EE: adds r1, r2 ldrb r1, [r1] bl var_set - b _081A1822 + b @081A1822 .align 2, 0 .pool -_081A1810: +@081A1810: movs r0, 0x80 lsls r0, 7 ldr r1, =0x03005d90 @@ -806529,7 +806529,7 @@ _081A1810: adds r1, r2 ldrb r1, [r1] bl var_set -_081A1822: +@081A1822: pop {r0} bx r0 .align 2, 0 @@ -806537,7 +806537,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 var_get @@ -806548,33 +806548,33 @@ sub_81A1830: @ 81A1830 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x2 - bne _081A184C + bne @081A184C movs r5, 0x1 -_081A184C: +@081A184C: ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x7 - bls _081A1856 - b _081A1956 -_081A1856: + bls @081A1856 + b @081A1956 +@081A1856: lsls r0, 2 - ldr r1, =_081A186C + ldr r1, =@081A186C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081A186C: - .4byte _081A188C - .4byte _081A18A8 - .4byte _081A18C8 - .4byte _081A18E4 - .4byte _081A1956 - .4byte _081A1900 - .4byte _081A1918 - .4byte _081A1938 -_081A188C: +@081A186C: + .4byte @081A188C + .4byte @081A18A8 + .4byte @081A18C8 + .4byte @081A18E4 + .4byte @081A1956 + .4byte @081A1900 + .4byte @081A1918 + .4byte @081A1938 +@081A188C: ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -806582,10 +806582,10 @@ _081A188C: adds r0, r2 ldrb r0, [r0] strh r0, [r1] - b _081A1956 + b @081A1956 .align 2, 0 .pool -_081A18A8: +@081A18A8: ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -806595,10 +806595,10 @@ _081A18A8: lsls r0, 30 lsrs r0, 30 strh r0, [r1] - b _081A1956 + b @081A1956 .align 2, 0 .pool -_081A18C8: +@081A18C8: ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -806606,10 +806606,10 @@ _081A18C8: adds r0, r2 ldrh r0, [r0] strh r0, [r1] - b _081A1956 + b @081A1956 .align 2, 0 .pool -_081A18E4: +@081A18E4: ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -806617,20 +806617,20 @@ _081A18E4: adds r0, r2 ldrb r0, [r0] lsls r0, 29 - b _081A1926 + b @081A1926 .align 2, 0 .pool -_081A1900: +@081A1900: ldr r2, =0x020375f0 ldr r1, =0x0202433a ldrb r0, [r1] strh r0, [r2] movs r0, 0 strb r0, [r1] - b _081A1956 + b @081A1956 .align 2, 0 .pool -_081A1918: +@081A1918: ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -806638,13 +806638,13 @@ _081A1918: adds r0, r2 ldrb r0, [r0] lsls r0, 28 -_081A1926: +@081A1926: lsrs r0, 31 strh r0, [r1] - b _081A1956 + b @081A1956 .align 2, 0 .pool -_081A1938: +@081A1938: ldr r4, =0x020375f0 ldr r0, =0x03005d90 ldr r2, [r0] @@ -806660,7 +806660,7 @@ _081A1938: ldrh r0, [r0] ands r0, r1 strh r0, [r4] -_081A1956: +@081A1956: pop {r4-r6} pop {r0} bx r0 @@ -806669,7 +806669,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 var_get @@ -806680,33 +806680,33 @@ sub_81A1968: @ 81A1968 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bne _081A1984 + bne @081A1984 movs r4, 0x1 -_081A1984: +@081A1984: ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x7 - bls _081A198E - b _081A1AC4 -_081A198E: + bls @081A198E + b @081A1AC4 +@081A198E: lsls r0, 2 - ldr r1, =_081A19A4 + ldr r1, =@081A19A4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081A19A4: - .4byte _081A19C4 - .4byte _081A19E0 - .4byte _081A1A0C - .4byte _081A1A28 - .4byte _081A1A50 - .4byte _081A1AC4 - .4byte _081A1A7C - .4byte _081A1AA8 -_081A19C4: +@081A19A4: + .4byte @081A19C4 + .4byte @081A19E0 + .4byte @081A1A0C + .4byte @081A1A28 + .4byte @081A1A50 + .4byte @081A1AC4 + .4byte @081A1A7C + .4byte @081A1AA8 +@081A19C4: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x020375e4 @@ -806714,10 +806714,10 @@ _081A19C4: ldr r2, =0x00000ca8 adds r0, r2 strb r1, [r0] - b _081A1AC4 + b @081A1AC4 .align 2, 0 .pool -_081A19E0: +@081A19E0: ldr r0, =0x03005d90 ldr r2, [r0] ldr r0, =0x020375e4 @@ -806732,10 +806732,10 @@ _081A19E0: ands r0, r3 orrs r0, r1 strb r0, [r2] - b _081A1AC4 + b @081A1AC4 .align 2, 0 .pool -_081A1A0C: +@081A1A0C: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x020375e4 @@ -806743,10 +806743,10 @@ _081A1A0C: ldr r2, =0x00000cb2 adds r0, r2 strh r1, [r0] - b _081A1AC4 + b @081A1AC4 .align 2, 0 .pool -_081A1A28: +@081A1A28: ldr r0, =0x03005d90 ldr r3, [r0] ldr r0, =0x020375e4 @@ -806759,15 +806759,15 @@ _081A1A28: ldrb r2, [r3] movs r0, 0x5 negs r0, r0 - b _081A1A94 + b @081A1A94 .align 2, 0 .pool -_081A1A50: +@081A1A50: movs r2, 0 ldr r5, =0x03005d90 ldr r4, =0x00000caa ldr r3, =0x0203cef8 -_081A1A58: +@081A1A58: ldr r1, [r5] lsls r0, r2, 1 adds r1, r4 @@ -806777,11 +806777,11 @@ _081A1A58: strh r0, [r1] adds r2, 0x1 cmp r2, 0x3 - ble _081A1A58 - b _081A1AC4 + ble @081A1A58 + b @081A1AC4 .align 2, 0 .pool -_081A1A7C: +@081A1A7C: ldr r0, =0x03005d90 ldr r3, [r0] ldr r0, =0x020375e4 @@ -806794,14 +806794,14 @@ _081A1A7C: ldrb r2, [r3] movs r0, 0x9 negs r0, r0 -_081A1A94: +@081A1A94: ands r0, r2 orrs r0, r1 strb r0, [r3] - b _081A1AC4 + b @081A1AC4 .align 2, 0 .pool -_081A1AA8: +@081A1AA8: ldr r0, =0x03005d90 ldr r2, [r0] movs r0, 0xD0 @@ -806816,7 +806816,7 @@ _081A1AA8: ldrh r1, [r1] orrs r0, r1 strh r0, [r2] -_081A1AC4: +@081A1AC4: pop {r4,r5} pop {r0} bx r0 @@ -806825,18 +806825,18 @@ _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 ldr r4, =0x020375e2 ldrh r0, [r4] cmp r3, r0 - bge _081A1B00 + bge @081A1B00 ldr r7, =0x0203cef8 ldr r6, =0x03005d90 ldr r5, =0x00000caa -_081A1AEA: +@081A1AEA: adds r2, r3, r7 ldr r0, [r6] lsls r1, r3, 1 @@ -806847,8 +806847,8 @@ _081A1AEA: adds r3, 0x1 ldrh r0, [r4] cmp r3, r0 - blt _081A1AEA -_081A1B00: + blt @081A1AEA +@081A1B00: bl sub_80F94E8 pop {r4-r7} pop {r0} @@ -806858,7 +806858,7 @@ _081A1B00: thumb_func_end sub_81A1AD4 thumb_func_start sub_81A1B1C -sub_81A1B1C: @ 81A1B1C +sub_81A1B1C: ; 81A1B1C push {lr} bl do_reset pop {r0} @@ -806866,7 +806866,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, =0x085d5acc str r0, [r1] @@ -806876,11 +806876,11 @@ 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 -_081A1B3E: +@081A1B3E: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 @@ -806892,7 +806892,7 @@ _081A1B3E: lsls r0, 16 lsrs r0, 16 cmp r0, 0x5 - bhi _081A1B76 + bhi @081A1B76 ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r1] @@ -806908,12 +806908,12 @@ _081A1B3E: adds r1, r2 movs r2, 0x64 bl memcpy -_081A1B76: +@081A1B76: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _081A1B3E + bls @081A1B3E pop {r4,r5} pop {r0} bx r0 @@ -806922,71 +806922,71 @@ _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] adds r2, r0, 0 cmp r1, 0x3 - bls _081A1BA8 + bls @081A1BA8 movs r0, 0 strh r0, [r2] -_081A1BA8: +@081A1BA8: ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x7 - bhi _081A1C1E + bhi @081A1C1E lsls r0, 2 - ldr r1, =_081A1BC8 + ldr r1, =@081A1BC8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081A1BC8: - .4byte _081A1BE8 - .4byte _081A1BF0 - .4byte _081A1BF8 - .4byte _081A1C0E - .4byte _081A1C06 - .4byte _081A1C00 - .4byte _081A1C14 - .4byte _081A1C1A -_081A1BE8: +@081A1BC8: + .4byte @081A1BE8 + .4byte @081A1BF0 + .4byte @081A1BF8 + .4byte @081A1C0E + .4byte @081A1C06 + .4byte @081A1C00 + .4byte @081A1C14 + .4byte @081A1C1A +@081A1BE8: ldrb r0, [r2] bl sub_81A1EA8 - b _081A1C1E -_081A1BF0: + b @081A1C1E +@081A1BF0: ldrb r0, [r2] bl sub_81A2134 - b _081A1C1E -_081A1BF8: + b @081A1C1E +@081A1BF8: ldrb r0, [r2] bl sub_81A2460 - b _081A1C1E -_081A1C00: + b @081A1C1E +@081A1C00: bl sub_81A2698 - b _081A1C1E -_081A1C06: + b @081A1C1E +@081A1C06: ldrb r0, [r2] bl sub_81A2C94 - b _081A1C1E -_081A1C0E: + b @081A1C1E +@081A1C0E: bl sub_81A2968 - b _081A1C1E -_081A1C14: + b @081A1C1E +@081A1C14: bl sub_81A2F38 - b _081A1C1E -_081A1C1A: + b @081A1C1E +@081A1C1A: bl sub_81A2FF8 -_081A1C1E: +@081A1C1E: pop {r0} bx r0 thumb_func_end sub_81A1B98 thumb_func_start sub_81A1C24 -sub_81A1C24: @ 81A1C24 +sub_81A1C24: ; 81A1C24 push {lr} ldr r1, =0x03005d90 ldr r1, [r1] @@ -806995,20 +806995,20 @@ sub_81A1C24: @ 81A1C24 ldr r1, [r1] ands r1, r0 cmp r1, 0 - bne _081A1C44 + bne @081A1C44 movs r0, 0 - b _081A1C46 + b @081A1C46 .align 2, 0 .pool -_081A1C44: +@081A1C44: movs r0, 0x1 -_081A1C46: +@081A1C46: pop {r1} bx r1 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 @@ -807043,7 +807043,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 @@ -807051,12 +807051,12 @@ sub_81A1C90: @ 81A1C90 movs r1, 0xAE mov r0, sp adds r0, 0x2F -_081A1C9E: +@081A1C9E: strb r1, [r0] subs r0, 0x1 add r4, sp, 0xC cmp r0, r4 - bge _081A1C9E + bge @081A1C9E add r1, sp, 0x30 movs r0, 0xFF strb r0, [r1] @@ -807083,7 +807083,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 @@ -807119,9 +807119,9 @@ sub_81A1CD8: @ 81A1CD8 bl Print ldr r0, =0x0000270f cmp r6, r0 - bls _081A1D24 + bls @081A1D24 adds r6, r0, 0 -_081A1D24: +@081A1D24: ldr r0, =0x02021cc4 adds r1, r6, 0 movs r2, 0x1 @@ -807155,7 +807155,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] @@ -807189,7 +807189,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 @@ -807205,9 +807205,9 @@ sub_81A1DBC: @ 81A1DBC ldrh r0, [r2] ldr r1, =0x0000270f cmp r0, r1 - bls _081A1DDE + bls @081A1DDE adds r0, r1, 0 -_081A1DDE: +@081A1DDE: pop {r1} bx r1 .align 2, 0 @@ -807215,7 +807215,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 @@ -807240,73 +807240,73 @@ sub_81A1DEC: @ 81A1DEC lsls r0, 16 lsrs r4, r0, 16 cmp r5, 0x1 - beq _081A1E38 + beq @081A1E38 cmp r5, 0x1 - ble _081A1E2C + ble @081A1E2C cmp r5, 0x2 - beq _081A1E48 + beq @081A1E48 cmp r5, 0x3 - beq _081A1E58 -_081A1E2C: + beq @081A1E58 +@081A1E2C: cmp r6, 0 - beq _081A1E34 + beq @081A1E34 movs r0, 0x2 - b _081A1E66 -_081A1E34: + b @081A1E66 +@081A1E34: movs r0, 0x1 - b _081A1E66 -_081A1E38: + b @081A1E66 +@081A1E38: cmp r6, 0 - beq _081A1E42 + beq @081A1E42 movs r0, 0x80 lsls r0, 8 - b _081A1E66 -_081A1E42: + b @081A1E66 +@081A1E42: movs r0, 0x80 lsls r0, 7 - b _081A1E66 -_081A1E48: + b @081A1E66 +@081A1E48: cmp r6, 0 - beq _081A1E52 + beq @081A1E52 movs r0, 0x80 lsls r0, 10 - b _081A1E66 -_081A1E52: + b @081A1E66 +@081A1E52: movs r0, 0x80 lsls r0, 9 - b _081A1E66 -_081A1E58: + b @081A1E66 +@081A1E58: cmp r6, 0 - beq _081A1E62 + beq @081A1E62 movs r0, 0x80 lsls r0, 12 - b _081A1E66 -_081A1E62: + b @081A1E66 +@081A1E62: movs r0, 0x80 lsls r0, 11 -_081A1E66: +@081A1E66: bl sub_81A1C24 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081A1E88 + bne @081A1E88 ldr r0, =0x085ee311 str r7, [sp] adds r1, r4, 0 mov r2, r8 mov r3, r9 bl sub_81A1CD8 - b _081A1E96 + b @081A1E96 .align 2, 0 .pool -_081A1E88: +@081A1E88: ldr r0, =0x085ee320 str r7, [sp] adds r1, r4, 0 mov r2, r8 mov r3, r9 bl sub_81A1CD8 -_081A1E96: +@081A1E96: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -807319,7 +807319,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 @@ -807338,36 +807338,36 @@ sub_81A1EA8: @ 81A1EA8 movs r1, 0x11 bl Window_FastFillPixels cmp r7, 0 - bne _081A1EF0 + bne @081A1EF0 ldr r0, =0x02021fc4 ldr r1, =0x085ee158 bl ExpandTextCodes - b _081A1F28 + b @081A1F28 .align 2, 0 .pool -_081A1EF0: +@081A1EF0: cmp r7, 0x1 - bne _081A1F08 + bne @081A1F08 ldr r0, =0x02021fc4 ldr r1, =0x085ee178 bl ExpandTextCodes - b _081A1F28 + b @081A1F28 .align 2, 0 .pool -_081A1F08: +@081A1F08: cmp r7, 0x2 - bne _081A1F20 + bne @081A1F20 ldr r0, =0x02021fc4 ldr r1, =0x085ee198 bl ExpandTextCodes - b _081A1F28 + b @081A1F28 .align 2, 0 .pool -_081A1F20: +@081A1F20: ldr r0, =0x02021fc4 ldr r1, =0x085ee1b7 bl ExpandTextCodes -_081A1F28: +@081A1F28: ldr r0, =0x02021fc4 movs r1, 0x2 bl sub_81A1C4C @@ -807441,7 +807441,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 @@ -807456,9 +807456,9 @@ sub_81A1FD8: @ 81A1FD8 ldrh r0, [r2] ldr r1, =0x0000270f cmp r0, r1 - bls _081A1FF8 + bls @081A1FF8 adds r0, r1, 0 -_081A1FF8: +@081A1FF8: pop {r1} bx r1 .align 2, 0 @@ -807466,7 +807466,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 @@ -807532,7 +807532,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 @@ -807557,32 +807557,32 @@ sub_81A2094: @ 81A2094 lsrs r0, 16 mov r8, r0 cmp r5, 0 - beq _081A20CC + beq @081A20CC cmp r5, 0x1 - beq _081A20D8 -_081A20CC: + beq @081A20D8 +@081A20CC: cmp r6, 0 - beq _081A20D4 + beq @081A20D4 movs r0, 0x8 - b _081A20E6 -_081A20D4: + b @081A20E6 +@081A20D4: movs r0, 0x4 - b _081A20E6 -_081A20D8: + b @081A20E6 +@081A20D8: cmp r6, 0 - beq _081A20E2 + beq @081A20E2 movs r0, 0x80 lsls r0, 14 - b _081A20E6 -_081A20E2: + b @081A20E6 +@081A20E2: movs r0, 0x80 lsls r0, 13 -_081A20E6: +@081A20E6: bl sub_81A1C24 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081A210C + bne @081A210C ldr r0, =0x085ee311 ldr r1, =0x085ee338 str r7, [sp] @@ -807590,10 +807590,10 @@ _081A20E6: mov r2, r8 mov r3, r9 bl sub_81A2008 - b _081A211C + b @081A211C .align 2, 0 .pool -_081A210C: +@081A210C: ldr r0, =0x085ee320 ldr r1, =0x085ee338 str r7, [sp] @@ -807601,7 +807601,7 @@ _081A210C: mov r2, r8 mov r3, r9 bl sub_81A2008 -_081A211C: +@081A211C: add sp, 0x8 pop {r3,r4} mov r8, r3 @@ -807614,7 +807614,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 @@ -807634,18 +807634,18 @@ sub_81A2134: @ 81A2134 movs r1, 0x11 bl Window_FastFillPixels cmp r7, 0 - bne _081A217C + bne @081A217C ldr r0, =0x02021fc4 ldr r1, =0x085ee1db bl ExpandTextCodes - b _081A2184 + b @081A2184 .align 2, 0 .pool -_081A217C: +@081A217C: ldr r0, =0x02021fc4 ldr r1, =0x085ee1fe bl ExpandTextCodes -_081A2184: +@081A2184: ldr r0, =0x02021fc4 movs r1, 0 bl sub_81A1C4C @@ -807764,7 +807764,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 @@ -807800,9 +807800,9 @@ sub_81A22B8: @ 81A22B8 bl Print ldr r0, =0x0000270f cmp r6, r0 - bls _081A2304 + bls @081A2304 adds r6, r0, 0 -_081A2304: +@081A2304: ldr r0, =0x02021cc4 adds r1, r6, 0 movs r2, 0x1 @@ -807836,7 +807836,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] @@ -807870,7 +807870,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 @@ -807885,9 +807885,9 @@ sub_81A239C: @ 81A239C ldrh r0, [r2] ldr r1, =0x0000270f cmp r0, r1 - bls _081A23BC + bls @081A23BC adds r0, r1, 0 -_081A23BC: +@081A23BC: pop {r1} bx r1 .align 2, 0 @@ -807895,7 +807895,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 @@ -807920,49 +807920,49 @@ sub_81A23CC: @ 81A23CC lsls r0, 16 lsrs r4, r0, 16 cmp r5, 0 - beq _081A2404 + beq @081A2404 cmp r5, 0x1 - beq _081A2410 -_081A2404: + beq @081A2410 +@081A2404: cmp r6, 0 - beq _081A240C + beq @081A240C movs r0, 0x20 - b _081A241E -_081A240C: + b @081A241E +@081A240C: movs r0, 0x10 - b _081A241E -_081A2410: + b @081A241E +@081A2410: cmp r6, 0 - beq _081A241A + beq @081A241A movs r0, 0x80 lsls r0, 16 - b _081A241E -_081A241A: + b @081A241E +@081A241A: movs r0, 0x80 lsls r0, 15 -_081A241E: +@081A241E: bl sub_81A1C24 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081A2440 + bne @081A2440 ldr r0, =0x085ee311 str r7, [sp] adds r1, r4, 0 mov r2, r8 mov r3, r9 bl sub_81A22B8 - b _081A244E + b @081A244E .align 2, 0 .pool -_081A2440: +@081A2440: ldr r0, =0x085ee320 str r7, [sp] adds r1, r4, 0 mov r2, r8 mov r3, r9 bl sub_81A22B8 -_081A244E: +@081A244E: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -807975,7 +807975,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 @@ -807994,18 +807994,18 @@ sub_81A2460: @ 81A2460 movs r1, 0x11 bl Window_FastFillPixels cmp r7, 0 - bne _081A24A8 + bne @081A24A8 ldr r0, =0x02021fc4 ldr r1, =0x085ee221 bl ExpandTextCodes - b _081A24B0 + b @081A24B0 .align 2, 0 .pool -_081A24A8: +@081A24A8: ldr r0, =0x02021fc4 ldr r1, =0x085ee241 bl ExpandTextCodes -_081A24B0: +@081A24B0: ldr r0, =0x02021fc4 movs r1, 0x2 bl sub_81A1C4C @@ -808079,7 +808079,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 @@ -808091,9 +808091,9 @@ sub_81A2560: @ 81A2560 ldrh r0, [r1] ldr r1, =0x0000270f cmp r0, r1 - bls _081A257A + bls @081A257A adds r0, r1, 0 -_081A257A: +@081A257A: pop {r1} bx r1 .align 2, 0 @@ -808101,7 +808101,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 @@ -808167,7 +808167,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} @@ -808187,19 +808187,19 @@ sub_81A2618: @ 81A2618 lsls r0, 16 lsrs r7, r0, 16 cmp r4, 0 - beq _081A2648 + beq @081A2648 movs r0, 0x80 lsls r0, 4 - b _081A264C -_081A2648: + b @081A264C +@081A2648: movs r0, 0x80 lsls r0, 3 -_081A264C: +@081A264C: bl sub_81A1C24 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081A2674 + bne @081A2674 ldr r0, =0x085ee311 ldr r1, =0x085ee35b str r5, [sp] @@ -808207,10 +808207,10 @@ _081A264C: adds r2, r7, 0 mov r3, r8 bl sub_81A2008 - b _081A2684 + b @081A2684 .align 2, 0 .pool -_081A2674: +@081A2674: ldr r0, =0x085ee320 ldr r1, =0x085ee35b str r5, [sp] @@ -808218,7 +808218,7 @@ _081A2674: adds r2, r7, 0 mov r3, r8 bl sub_81A2008 -_081A2684: +@081A2684: add sp, 0x8 pop {r3} mov r8, r3 @@ -808230,7 +808230,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 @@ -808357,7 +808357,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 @@ -808393,9 +808393,9 @@ sub_81A27E8: @ 81A27E8 bl Print ldr r0, =0x0000270f cmp r6, r0 - bls _081A2834 + bls @081A2834 adds r6, r0, 0 -_081A2834: +@081A2834: ldr r0, =0x02021cc4 adds r1, r6, 0 movs r2, 0x1 @@ -808429,7 +808429,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 @@ -808462,7 +808462,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 @@ -808474,9 +808474,9 @@ sub_81A28CC: @ 81A28CC ldrh r0, [r1] ldr r1, =0x0000270f cmp r0, r1 - bls _081A28E6 + bls @081A28E6 adds r0, r1, 0 -_081A28E6: +@081A28E6: pop {r1} bx r1 .align 2, 0 @@ -808484,7 +808484,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} @@ -808504,34 +808504,34 @@ sub_81A28F8: @ 81A28F8 lsls r0, 16 lsrs r5, r0, 16 cmp r4, 0 - beq _081A2926 + beq @081A2926 movs r0, 0x80 - b _081A2928 -_081A2926: + b @081A2928 +@081A2926: movs r0, 0x40 -_081A2928: +@081A2928: bl sub_81A1C24 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081A2948 + bne @081A2948 ldr r0, =0x085ee311 str r6, [sp] adds r1, r5, 0 adds r2, r7, 0 mov r3, r8 bl sub_81A27E8 - b _081A2956 + b @081A2956 .align 2, 0 .pool -_081A2948: +@081A2948: ldr r0, =0x085ee320 str r6, [sp] adds r1, r5, 0 adds r2, r7, 0 mov r3, r8 bl sub_81A27E8 -_081A2956: +@081A2956: add sp, 0x4 pop {r3} mov r8, r3 @@ -808543,7 +808543,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 @@ -808619,7 +808619,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 @@ -808661,9 +808661,9 @@ sub_81A2A28: @ 81A2A28 bl Print ldr r0, =0x0000270f cmp r7, r0 - bls _081A2A80 + bls @081A2A80 adds r7, r0, 0 -_081A2A80: +@081A2A80: ldr r5, =0x02021cc4 adds r0, r5, 0 adds r1, r7, 0 @@ -808717,7 +808717,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} @@ -808767,7 +808767,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 @@ -808782,9 +808782,9 @@ sub_81A2B70: @ 81A2B70 ldrh r0, [r2] ldr r1, =0x0000270f cmp r0, r1 - bls _081A2B90 + bls @081A2B90 adds r0, r1, 0 -_081A2B90: +@081A2B90: pop {r1} bx r1 .align 2, 0 @@ -808792,7 +808792,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 @@ -808807,9 +808807,9 @@ sub_81A2BA0: @ 81A2BA0 ldrh r0, [r2] ldr r1, =0x0000270f cmp r0, r1 - bls _081A2BC0 + bls @081A2BC0 adds r0, r1, 0 -_081A2BC0: +@081A2BC0: pop {r1} bx r1 .align 2, 0 @@ -808817,7 +808817,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 @@ -808853,34 +808853,34 @@ sub_81A2BD0: @ 81A2BD0 lsls r0, 16 lsrs r4, r0, 16 cmp r6, 0 - beq _081A2C20 + beq @081A2C20 cmp r6, 0x1 - beq _081A2C30 -_081A2C20: + beq @081A2C30 +@081A2C20: cmp r7, 0 - beq _081A2C2A + beq @081A2C2A movs r0, 0x80 lsls r0, 2 - b _081A2C3E -_081A2C2A: + b @081A2C3E +@081A2C2A: movs r0, 0x80 lsls r0, 1 - b _081A2C3E -_081A2C30: + b @081A2C3E +@081A2C30: cmp r7, 0 - beq _081A2C3A + beq @081A2C3A movs r0, 0x80 lsls r0, 18 - b _081A2C3E -_081A2C3A: + b @081A2C3E +@081A2C3A: movs r0, 0x80 lsls r0, 17 -_081A2C3E: +@081A2C3E: bl sub_81A1C24 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081A2C68 + bne @081A2C68 ldr r0, =0x085ee311 mov r1, r8 str r1, [sp] @@ -808892,10 +808892,10 @@ _081A2C3E: adds r2, r4, 0 ldr r3, [sp, 0xC] bl sub_81A2A28 - b _081A2C80 + b @081A2C80 .align 2, 0 .pool -_081A2C68: +@081A2C68: ldr r0, =0x085ee320 mov r1, r8 str r1, [sp] @@ -808907,7 +808907,7 @@ _081A2C68: adds r2, r4, 0 ldr r3, [sp, 0xC] bl sub_81A2A28 -_081A2C80: +@081A2C80: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -808921,7 +808921,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} @@ -808939,18 +808939,18 @@ sub_81A2C94: @ 81A2C94 movs r1, 0x11 bl Window_FastFillPixels cmp r7, 0 - bne _081A2CD8 + bne @081A2CD8 ldr r0, =0x02021fc4 ldr r1, =0x085ee298 bl ExpandTextCodes - b _081A2CE0 + b @081A2CE0 .align 2, 0 .pool -_081A2CD8: +@081A2CD8: ldr r0, =0x02021fc4 ldr r1, =0x085ee2b8 bl ExpandTextCodes -_081A2CE0: +@081A2CE0: ldr r0, =0x02021fc4 movs r1, 0 bl sub_81A1C4C @@ -809039,7 +809039,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 @@ -809075,9 +809075,9 @@ sub_81A2DB4: @ 81A2DB4 bl Print ldr r0, =0x0000270f cmp r6, r0 - bls _081A2E00 + bls @081A2E00 adds r6, r0, 0 -_081A2E00: +@081A2E00: ldr r0, =0x02021cc4 adds r1, r6, 0 movs r2, 0x1 @@ -809111,7 +809111,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 @@ -809144,7 +809144,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 @@ -809156,9 +809156,9 @@ sub_81A2E98: @ 81A2E98 ldrh r0, [r1] ldr r1, =0x0000270f cmp r0, r1 - bls _081A2EB2 + bls @081A2EB2 adds r0, r1, 0 -_081A2EB2: +@081A2EB2: pop {r1} bx r1 .align 2, 0 @@ -809166,7 +809166,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} @@ -809186,36 +809186,36 @@ sub_81A2EC4: @ 81A2EC4 lsls r0, 16 lsrs r5, r0, 16 cmp r4, 0 - beq _081A2EF4 + beq @081A2EF4 movs r0, 0x80 lsls r0, 6 - b _081A2EF8 -_081A2EF4: + b @081A2EF8 +@081A2EF4: movs r0, 0x80 lsls r0, 5 -_081A2EF8: +@081A2EF8: bl sub_81A1C24 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081A2F18 + bne @081A2F18 ldr r0, =0x085ee311 str r6, [sp] adds r1, r5, 0 adds r2, r7, 0 mov r3, r8 bl sub_81A2DB4 - b _081A2F26 + b @081A2F26 .align 2, 0 .pool -_081A2F18: +@081A2F18: ldr r0, =0x085ee320 str r6, [sp] adds r1, r5, 0 adds r2, r7, 0 mov r3, r8 bl sub_81A2DB4 -_081A2F26: +@081A2F26: add sp, 0x4 pop {r3} mov r8, r3 @@ -809227,7 +809227,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 @@ -809303,7 +809303,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 @@ -809454,7 +809454,7 @@ sub_81A2FF8: @ 81A2FF8 movs r3, 0x6 bl Print movs r1, 0 -_081A314A: +@081A314A: movs r5, 0 adds r0, r1, 0x1 mov r8, r0 @@ -809464,7 +809464,7 @@ _081A314A: adds r0, r2 lsrs r7, r0, 24 lsls r4, r1, 3 -_081A315C: +@081A315C: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000624 @@ -809494,10 +809494,10 @@ _081A315C: adds r4, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble _081A315C + ble @081A315C mov r1, r8 cmp r1, 0x4 - ble _081A314A + ble @081A314A ldrb r0, [r6] bl Window_WriteStandardTileMap ldrb r0, [r6] @@ -809515,7 +809515,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 @@ -809539,26 +809539,26 @@ sub_81A31FC: @ 81A31FC lsrs r0, 16 mov r8, r0 cmp r4, 0x6 - bls _081A3232 - b _081A35CE -_081A3232: + bls @081A3232 + b @081A35CE +@081A3232: lsls r0, r4, 2 - ldr r1, =_081A3250 + ldr r1, =@081A3250 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081A3250: - .4byte _081A326C - .4byte _081A33A8 - .4byte _081A3414 - .4byte _081A347C - .4byte _081A34CC - .4byte _081A354C - .4byte _081A3594 -_081A326C: +@081A3250: + .4byte @081A326C + .4byte @081A33A8 + .4byte @081A3414 + .4byte @081A347C + .4byte @081A34CC + .4byte @081A354C + .4byte @081A3594 +@081A326C: ldr r2, =0x03005d90 mov r9, r2 ldr r0, [r2] @@ -809579,13 +809579,13 @@ _081A326C: ldrh r1, [r1] ldrh r2, [r0] cmp r1, r2 - bhi _081A3298 - b _081A35CE -_081A3298: + bhi @081A3298 + b @081A35CE +@081A3298: strh r1, [r0] mov r3, r8 cmp r3, 0x3 - bne _081A32F2 + bne @081A32F2 ldr r6, =0x02024474 adds r6, 0x25 ldrb r0, [r6] @@ -809623,7 +809623,7 @@ _081A3298: ldr r1, [r3] adds r1, r2 bl write_word_to_mem -_081A32F2: +@081A32F2: mov r7, r9 ldr r0, [r7] movs r1, 0xCE @@ -809633,33 +809633,33 @@ _081A32F2: adds r0, r2 ldrh r0, [r0] cmp r0, 0x1 - bhi _081A3308 - b _081A35CE -_081A3308: + bhi @081A3308 + b @081A35CE +@081A3308: bl sub_80EE818 lsls r0, 24 cmp r0, 0 - bne _081A3314 - b _081A35CE -_081A3314: + bne @081A3314 + b @081A35CE +@081A3314: mov r3, r8 cmp r3, 0x1 - beq _081A335A + beq @081A335A cmp r3, 0x1 - bgt _081A3338 + bgt @081A3338 cmp r3, 0 - beq _081A3344 - b _081A35CE + beq @081A3344 + b @081A35CE .align 2, 0 .pool -_081A3338: +@081A3338: mov r7, r8 cmp r7, 0x2 - beq _081A3374 + beq @081A3374 cmp r7, 0x3 - beq _081A338E - b _081A35CE -_081A3344: + beq @081A338E + b @081A35CE +@081A3344: mov r1, r9 ldr r0, [r1] movs r2, 0xCE @@ -809669,8 +809669,8 @@ _081A3344: ldrh r0, [r0] movs r1, 0x1 bl sub_80EE8C8 - b _081A35CE -_081A335A: + b @081A35CE +@081A335A: mov r3, r9 ldr r0, [r3] mov r1, r10 @@ -809682,8 +809682,8 @@ _081A335A: ldrh r0, [r0] movs r1, 0x2 bl sub_80EE8C8 - b _081A35CE -_081A3374: + b @081A35CE +@081A3374: mov r1, r9 ldr r0, [r1] mov r1, r10 @@ -809695,8 +809695,8 @@ _081A3374: ldrh r0, [r0] movs r1, 0x3 bl sub_80EE8C8 - b _081A35CE -_081A338E: + b @081A35CE +@081A338E: mov r3, r9 ldr r0, [r3] mov r1, r10 @@ -809708,8 +809708,8 @@ _081A338E: ldrh r0, [r0] movs r1, 0x4 bl sub_80EE8C8 - b _081A35CE -_081A33A8: + b @081A35CE +@081A33A8: ldr r6, =0x03005d90 ldr r0, [r6] lsls r7, 1 @@ -809725,42 +809725,42 @@ _081A33A8: ldrh r2, [r1] ldrh r3, [r0] cmp r2, r3 - bhi _081A33CA - b _081A35CE -_081A33CA: + bhi @081A33CA + b @081A35CE +@081A33CA: strh r2, [r0] ldrh r0, [r1] cmp r0, 0x1 - bhi _081A33D4 - b _081A35CE -_081A33D4: + bhi @081A33D4 + b @081A35CE +@081A33D4: bl sub_80EE818 lsls r0, 24 cmp r0, 0 - bne _081A33E0 - b _081A35CE -_081A33E0: + bne @081A33E0 + b @081A35CE +@081A33E0: mov r0, r8 cmp r0, 0 - bne _081A3404 + bne @081A3404 ldr r0, [r6] adds r0, r5 adds r0, r7 ldrh r0, [r0] movs r1, 0x5 bl sub_80EE8C8 - b _081A35CE + b @081A35CE .align 2, 0 .pool -_081A3404: +@081A3404: ldr r0, [r6] adds r0, r5 adds r0, r4 ldrh r0, [r0] movs r1, 0x6 bl sub_80EE8C8 - b _081A35CE -_081A3414: + b @081A35CE +@081A3414: ldr r6, =0x03005d90 ldr r0, [r6] lsls r7, 1 @@ -809777,42 +809777,42 @@ _081A3414: ldrh r2, [r1] ldrh r3, [r0] cmp r2, r3 - bhi _081A3438 - b _081A35CE -_081A3438: + bhi @081A3438 + b @081A35CE +@081A3438: strh r2, [r0] ldrh r0, [r1] cmp r0, 0x1 - bhi _081A3442 - b _081A35CE -_081A3442: + bhi @081A3442 + b @081A35CE +@081A3442: bl sub_80EE818 lsls r0, 24 cmp r0, 0 - bne _081A344E - b _081A35CE -_081A344E: + bne @081A344E + b @081A35CE +@081A344E: mov r0, r8 cmp r0, 0 - bne _081A346C + bne @081A346C ldr r0, [r6] adds r0, r5 adds r0, r7 ldrh r0, [r0] movs r1, 0xB bl sub_80EE8C8 - b _081A35CE + b @081A35CE .align 2, 0 .pool -_081A346C: +@081A346C: ldr r0, [r6] adds r0, r5 adds r0, r4 ldrh r0, [r0] movs r1, 0xC bl sub_80EE8C8 - b _081A35CE -_081A347C: + b @081A35CE +@081A347C: ldr r6, =0x03005d90 ldr r1, [r6] lsls r4, r7, 1 @@ -809825,31 +809825,31 @@ _081A347C: ldrh r2, [r0] ldrh r3, [r1] cmp r2, r3 - bhi _081A3498 - b _081A35CE -_081A3498: + bhi @081A3498 + b @081A35CE +@081A3498: strh r2, [r1] ldrh r0, [r0] cmp r0, 0x1 - bhi _081A34A2 - b _081A35CE -_081A34A2: + bhi @081A34A2 + b @081A35CE +@081A34A2: bl sub_80EE818 lsls r0, 24 cmp r0, 0 - bne _081A34AE - b _081A35CE -_081A34AE: + bne @081A34AE + b @081A35CE +@081A34AE: ldr r0, [r6] adds r0, r5 adds r0, r4 ldrh r0, [r0] movs r1, 0xA bl sub_80EE8C8 - b _081A35CE + b @081A35CE .align 2, 0 .pool -_081A34CC: +@081A34CC: ldr r6, =0x03005d90 ldr r2, [r6] lsls r7, 1 @@ -809867,7 +809867,7 @@ _081A34CC: ldrh r1, [r3] ldrh r7, [r0] cmp r1, r7 - bls _081A35CE + bls @081A35CE strh r1, [r0] ldr r0, =0x00000dfa adds r1, r2, r0 @@ -809879,32 +809879,32 @@ _081A34CC: strh r0, [r1] ldrh r0, [r3] cmp r0, 0x1 - bls _081A35CE + bls @081A35CE bl sub_80EE818 lsls r0, 24 cmp r0, 0 - beq _081A35CE + beq @081A35CE mov r0, r8 cmp r0, 0 - bne _081A353C + bne @081A353C ldr r0, [r6] adds r0, r5 add r0, r9 ldrh r0, [r0] movs r1, 0x7 bl sub_80EE8C8 - b _081A35CE + b @081A35CE .align 2, 0 .pool -_081A353C: +@081A353C: ldr r0, [r6] adds r0, r5 adds r0, r4 ldrh r0, [r0] movs r1, 0x8 bl sub_80EE8C8 - b _081A35CE -_081A354C: + b @081A35CE +@081A354C: ldr r6, =0x03005d90 ldr r1, [r6] lsls r4, r7, 1 @@ -809917,25 +809917,25 @@ _081A354C: ldrh r2, [r0] ldrh r3, [r1] cmp r2, r3 - bls _081A35CE + bls @081A35CE strh r2, [r1] ldrh r0, [r0] cmp r0, 0x1 - bls _081A35CE + bls @081A35CE bl sub_80EE818 lsls r0, 24 cmp r0, 0 - beq _081A35CE + beq @081A35CE ldr r0, [r6] adds r0, r5 adds r0, r4 ldrh r0, [r0] movs r1, 0x9 bl sub_80EE8C8 - b _081A35CE + b @081A35CE .align 2, 0 .pool -_081A3594: +@081A3594: ldr r6, =0x03005d90 ldr r1, [r6] lsls r4, r7, 1 @@ -809948,22 +809948,22 @@ _081A3594: ldrh r2, [r0] ldrh r3, [r1] cmp r2, r3 - bls _081A35CE + bls @081A35CE strh r2, [r1] ldrh r0, [r0] cmp r0, 0x1 - bls _081A35CE + bls @081A35CE bl sub_80EE818 lsls r0, 24 cmp r0, 0 - beq _081A35CE + beq @081A35CE ldr r0, [r6] adds r0, r5 adds r0, r4 ldrh r0, [r0] movs r1, 0xD bl sub_80EE8C8 -_081A35CE: +@081A35CE: add sp, 0x24 pop {r3-r5} mov r8, r3 @@ -809977,7 +809977,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 var_get @@ -809994,7 +809994,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 @@ -810021,67 +810021,67 @@ sub_81A3610: @ 81A3610 ldrb r1, [r1] adds r5, r0, r1 cmp r4, 0 - beq _081A365C + beq @081A365C movs r0, 0 - b _081A36C2 + b @081A36C2 .align 2, 0 .pool -_081A365C: +@081A365C: lsls r0, r6, 24 lsrs r0, 24 bl sub_81A3B30 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - blt _081A3680 + blt @081A3680 cmp r1, 0x1 - bgt _081A3680 + bgt @081A3680 adds r0, r1, r7 add r0, r9 ldrb r0, [r0] cmp r5, r0 - bne _081A36BC + bne @081A36BC adds r1, 0x1 mov r8, r1 - b _081A36BC -_081A3680: + b @081A36BC +@081A3680: ldr r1, =0x08611550 lsls r2, r6, 2 adds r0, r2, r1 ldrb r0, [r0] cmp r5, r0 - bne _081A3694 + bne @081A3694 movs r0, 0x3 - b _081A36BA + b @081A36BA .align 2, 0 .pool -_081A3694: +@081A3694: adds r0, r1, 0x1 adds r0, r2, r0 ldrb r0, [r0] cmp r5, r0 - bne _081A36A4 + bne @081A36A4 movs r1, 0x4 mov r8, r1 - b _081A36BC -_081A36A4: + b @081A36BC +@081A36A4: cmp r5, r0 - ble _081A36BC + ble @081A36BC subs r0, r5, r0 adds r1, 0x2 adds r1, r2, r1 ldrb r1, [r1] bl __modsi3 cmp r0, 0 - bne _081A36BC + bne @081A36BC movs r0, 0x4 -_081A36BA: +@081A36BA: mov r8, r0 -_081A36BC: +@081A36BC: mov r1, r8 lsls r0, r1, 24 lsrs r0, 24 -_081A36C2: +@081A36C2: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -810091,7 +810091,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 @@ -810099,36 +810099,36 @@ sub_81A36D0: @ 81A36D0 lsls r1, 16 lsrs r3, r1, 16 cmp r0, 0x1 - beq _081A3766 + beq @081A3766 cmp r0, 0x1 - bgt _081A36EA + bgt @081A36EA cmp r0, 0 - beq _081A36F2 - b _081A38F8 -_081A36EA: + beq @081A36F2 + b @081A38F8 +@081A36EA: cmp r2, 0x2 - bne _081A36F0 - b _081A3818 -_081A36F0: - b _081A38F8 -_081A36F2: + bne @081A36F0 + b @081A3818 +@081A36F0: + b @081A38F8 +@081A36F2: movs r0, 0xFA lsls r0, 1 cmp r3, r0 - bne _081A370C + bne @081A370C ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000bfc - b _081A38C4 + b @081A38C4 .align 2, 0 .pool -_081A370C: +@081A370C: ldr r0, =0x000003fe cmp r3, r0 - beq _081A3786 + beq @081A3786 ldr r0, =0x0000012b cmp r3, r0 - bhi _081A3738 + bhi @081A3738 ldr r2, =0x0203bc88 movs r0, 0x34 adds r1, r3, 0 @@ -810137,54 +810137,54 @@ _081A370C: adds r0, r1 adds r0, 0xC bl sub_81638AC - b _081A38F8 + b @081A38F8 .align 2, 0 .pool -_081A3738: +@081A3738: ldr r0, =0x0000018f cmp r3, r0 - bhi _081A3758 + bhi @081A3758 ldr r1, =0x03005d90 movs r0, 0xEC muls r0, r3 ldr r1, [r1] adds r0, r1 ldr r1, =0xfffef2b8 - b _081A38C4 + b @081A38C4 .align 2, 0 .pool -_081A3758: +@081A3758: adds r0, r3, 0 adds r0, 0x70 lsls r0, 24 lsrs r0, 24 bl sub_819F99C - b _081A38F8 -_081A3766: + b @081A38F8 +@081A3766: movs r0, 0xFA lsls r0, 1 cmp r3, r0 - bne _081A3780 + bne @081A3780 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000c08 - b _081A38C4 + b @081A38C4 .align 2, 0 .pool -_081A3780: +@081A3780: ldr r0, =0x000003fe cmp r3, r0 - bne _081A3794 -_081A3786: + bne @081A3794 +@081A3786: movs r0, 0 bl sub_81A51A8 - b _081A38F8 + b @081A38F8 .align 2, 0 .pool -_081A3794: +@081A3794: ldr r0, =0x0000012b cmp r3, r0 - bhi _081A37B8 + bhi @081A37B8 ldr r2, =0x0203bc88 movs r0, 0x34 adds r1, r3, 0 @@ -810193,37 +810193,37 @@ _081A3794: adds r0, r1 adds r0, 0x18 bl sub_81638AC - b _081A38F8 + b @081A38F8 .align 2, 0 .pool -_081A37B8: +@081A37B8: ldr r0, =0x0000018f cmp r3, r0 - bhi _081A37EC + bhi @081A37EC ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 - bne _081A387C + bne @081A387C ldr r1, =0x03005d90 movs r0, 0xEC muls r0, r3 ldr r1, [r1] adds r0, r1 ldr r1, =0xfffef2c4 - b _081A38C4 + b @081A38C4 .align 2, 0 .pool -_081A37EC: +@081A37EC: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 - bne _081A387C + bne @081A387C ldr r1, =0x03005d90 lsls r0, r3, 4 adds r0, r3 @@ -810231,33 +810231,33 @@ _081A37EC: ldr r1, [r1] adds r0, r1 ldr r1, =0xffff96c4 - b _081A38C4 + b @081A38C4 .align 2, 0 .pool -_081A3818: +@081A3818: movs r0, 0xFA lsls r0, 1 cmp r3, r0 - bne _081A3830 + bne @081A3830 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000c14 - b _081A38C4 + b @081A38C4 .align 2, 0 .pool -_081A3830: +@081A3830: ldr r0, =0x000003fe cmp r3, r0 - bne _081A3844 + bne @081A3844 movs r0, 0x1 bl sub_81A51A8 - b _081A38F8 + b @081A38F8 .align 2, 0 .pool -_081A3844: +@081A3844: ldr r0, =0x0000012b cmp r3, r0 - bhi _081A3868 + bhi @081A3868 ldr r2, =0x0203bc88 movs r0, 0x34 adds r1, r3, 0 @@ -810266,57 +810266,57 @@ _081A3844: adds r0, r1 adds r0, 0x24 bl sub_81638AC - b _081A38F8 + b @081A38F8 .align 2, 0 .pool -_081A3868: +@081A3868: ldr r0, =0x0000018f cmp r3, r0 - bhi _081A38A8 + bhi @081A38A8 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 - beq _081A3890 -_081A387C: + beq @081A3890 +@081A387C: bl sub_81864E0 bl sub_81638AC - b _081A38F8 + b @081A38F8 .align 2, 0 .pool -_081A3890: +@081A3890: ldr r1, =0x03005d90 movs r0, 0xEC muls r0, r3 ldr r1, [r1] adds r0, r1 ldr r1, =0xfffef2d0 - b _081A38C4 + b @081A38C4 .align 2, 0 .pool -_081A38A8: +@081A38A8: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 - beq _081A38D4 + beq @081A38D4 bl sub_81864A8 lsls r0, 24 lsrs r3, r0, 24 movs r0, 0x58 muls r0, r3 ldr r1, =0x086109ba -_081A38C4: +@081A38C4: adds r0, r1 bl sub_81638AC - b _081A38F8 + b @081A38F8 .align 2, 0 .pool -_081A38D4: +@081A38D4: ldr r0, =0x03005d90 ldr r1, [r0] ldr r0, =0xfffffe70 @@ -810334,7 +810334,7 @@ _081A38D4: ldr r1, =0x086109ba adds r0, r1 bl sub_81638AC -_081A38F8: +@081A38F8: pop {r0} bx r0 .align 2, 0 @@ -810342,7 +810342,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 @@ -810358,13 +810358,13 @@ sub_81A3908: @ 81A3908 mov r9, r0 mov r8, r9 movs r6, 0 -_081A3926: +@081A3926: movs r5, 0 lsls r7, r4, 2 mov r10, r7 adds r0, r4, 0x1 mov r12, r0 -_081A3930: +@081A3930: mov r1, r8 ldr r2, [r1] lsls r3, r5, 1 @@ -810376,7 +810376,7 @@ _081A3930: adds r0, r1 strh r6, [r0] cmp r4, 0x1 - bgt _081A3960 + bgt @081A3960 adds r7, 0x2C adds r0, r2, r7 adds r0, r1 @@ -810389,9 +810389,9 @@ _081A3930: adds r0, r2, r7 adds r0, r1 strh r6, [r0] -_081A3960: +@081A3960: cmp r4, 0 - bne _081A3980 + bne @081A3980 mov r1, r8 ldr r0, [r1] ldr r2, =0x00000dda @@ -810406,23 +810406,23 @@ _081A3960: adds r0, r1 adds r0, r3 strh r4, [r0] -_081A3980: +@081A3980: adds r5, 0x1 cmp r5, 0x1 - ble _081A3930 + ble @081A3930 mov r4, r12 cmp r4, 0x3 - ble _081A3926 + ble @081A3926 mov r2, r9 ldr r0, [r2] ldr r7, =0x00000ca8 adds r1, r0, r7 ldrb r0, [r1] cmp r0, 0 - beq _081A399E + beq @081A399E movs r0, 0x1 strb r0, [r1] -_081A399E: +@081A399E: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -810435,7 +810435,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] @@ -810453,24 +810453,24 @@ sub_81A39C4: @ 81A39C4 lsls r0, 16 lsrs r0, 16 cmp r0, 0x6 - bhi _081A3AC4 + bhi @081A3AC4 lsls r0, 2 - ldr r1, =_081A3A0C + ldr r1, =@081A3A0C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081A3A0C: - .4byte _081A3A28 - .4byte _081A3A3C - .4byte _081A3A54 - .4byte _081A3A6C - .4byte _081A3A80 - .4byte _081A3A98 - .4byte _081A3AAC -_081A3A28: +@081A3A0C: + .4byte @081A3A28 + .4byte @081A3A3C + .4byte @081A3A54 + .4byte @081A3A6C + .4byte @081A3A80 + .4byte @081A3A98 + .4byte @081A3AAC +@081A3A28: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 @@ -810478,84 +810478,84 @@ _081A3A28: adds r1, r2 movs r2, 0xCE lsls r2, 4 - b _081A3AB4 + b @081A3AB4 .align 2, 0 .pool -_081A3A3C: +@081A3A3C: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 lsls r2, r5, 2 adds r1, r2 ldr r2, =0x00000d0c - b _081A3AB4 + b @081A3AB4 .align 2, 0 .pool -_081A3A54: +@081A3A54: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 lsls r2, r5, 2 adds r1, r2 ldr r2, =0x00000dc8 - b _081A3AB4 + b @081A3AB4 .align 2, 0 .pool -_081A3A6C: +@081A3A6C: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 ldr r2, =0x00000dda - b _081A3AB4 + b @081A3AB4 .align 2, 0 .pool -_081A3A80: +@081A3A80: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 lsls r2, r5, 2 adds r1, r2 ldr r2, =0x00000de2 - b _081A3AB4 + b @081A3AB4 .align 2, 0 .pool -_081A3A98: +@081A3A98: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 ldr r2, =0x00000e04 - b _081A3AB4 + b @081A3AB4 .align 2, 0 .pool -_081A3AAC: +@081A3AAC: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 ldr r2, =0x00000e1a -_081A3AB4: +@081A3AB4: adds r0, r2 adds r0, r1 ldrh r0, [r0] - b _081A3AC6 + b @081A3AC6 .align 2, 0 .pool -_081A3AC4: +@081A3AC4: movs r0, 0 -_081A3AC6: +@081A3AC6: pop {r4,r5} pop {r1} bx r1 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 ldr r4, =0x00000cb4 ldr r0, =0x0000ffff adds r3, r0, 0 -_081A3AD8: +@081A3AD8: ldr r0, [r5] lsls r1, r2, 1 adds r0, r4 @@ -810565,7 +810565,7 @@ _081A3AD8: strh r1, [r0] adds r2, 0x1 cmp r2, 0x13 - ble _081A3AD8 + ble @081A3AD8 pop {r4,r5} pop {r0} bx r0 @@ -810574,22 +810574,22 @@ _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] ldr r0, =0x000003fe cmp r1, r0 - bne _081A3B20 + bne @081A3B20 ldr r1, =0x020375f0 movs r0, 0x1 - b _081A3B24 + b @081A3B24 .align 2, 0 .pool -_081A3B20: +@081A3B20: ldr r1, =0x020375f0 movs r0, 0 -_081A3B24: +@081A3B24: strh r0, [r1] pop {r0} bx r0 @@ -810598,7 +810598,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 @@ -810623,7 +810623,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 @@ -810645,24 +810645,24 @@ sub_81A3B64: @ 81A3B64 lsls r0, 16 lsrs r6, r0, 16 cmp r7, 0x6 - bhi _081A3C78 + bhi @081A3C78 lsls r0, r7, 2 - ldr r1, =_081A3BB4 + ldr r1, =@081A3BB4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081A3BB4: - .4byte _081A3BD0 - .4byte _081A3BE4 - .4byte _081A3C00 - .4byte _081A3C18 - .4byte _081A3C2C - .4byte _081A3C44 - .4byte _081A3C60 -_081A3BD0: +@081A3BB4: + .4byte @081A3BD0 + .4byte @081A3BE4 + .4byte @081A3C00 + .4byte @081A3C18 + .4byte @081A3C2C + .4byte @081A3C44 + .4byte @081A3C60 +@081A3BD0: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 @@ -810670,10 +810670,10 @@ _081A3BD0: adds r1, r2 movs r2, 0xCE lsls r2, 4 - b _081A3C68 + b @081A3C68 .align 2, 0 .pool -_081A3BE4: +@081A3BE4: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 @@ -810683,38 +810683,38 @@ _081A3BE4: adds r0, r2 adds r0, r1 ldrh r5, [r0] - b _081A3C78 + b @081A3C78 .align 2, 0 .pool -_081A3C00: +@081A3C00: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 lsls r2, r6, 2 adds r1, r2 ldr r2, =0x00000dc8 - b _081A3C68 + b @081A3C68 .align 2, 0 .pool -_081A3C18: +@081A3C18: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 ldr r2, =0x00000dda - b _081A3C68 + b @081A3C68 .align 2, 0 .pool -_081A3C2C: +@081A3C2C: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 lsls r2, r6, 2 adds r1, r2 ldr r2, =0x00000de2 - b _081A3C68 + b @081A3C68 .align 2, 0 .pool -_081A3C44: +@081A3C44: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 @@ -810723,32 +810723,32 @@ _081A3C44: adds r0, r1 ldrh r0, [r0] movs r1, 0xE - b _081A3C70 + b @081A3C70 .align 2, 0 .pool -_081A3C60: +@081A3C60: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 ldr r2, =0x00000e1a -_081A3C68: +@081A3C68: adds r0, r2 adds r0, r1 ldrh r0, [r0] movs r1, 0x7 -_081A3C70: +@081A3C70: bl __udivsi3 lsls r0, 16 lsrs r5, r0, 16 -_081A3C78: +@081A3C78: cmp r5, 0 - beq _081A3C7E + beq @081A3C7E subs r5, 0x1 -_081A3C7E: +@081A3C7E: cmp r5, 0x1D - bls _081A3C84 + bls @081A3C84 movs r5, 0x1D -_081A3C84: +@081A3C84: ldr r2, =0x086118b4 lsls r1, r7, 2 adds r1, r6, r1 @@ -810764,9 +810764,9 @@ _081A3C84: ldr r1, =0x000003fe mov r8, r1 cmp r0, r8 - bne _081A3CA6 + bne @081A3CA6 adds r5, 0xA -_081A3CA6: +@081A3CA6: ldr r6, =0x03005d90 ldr r1, [r6] ldr r4, =0x00000eb8 @@ -810784,9 +810784,9 @@ _081A3CA6: ldrh r0, [r2] ldr r1, =0x0000270f cmp r0, r1 - bls _081A3CCE + bls @081A3CCE strh r1, [r2] -_081A3CCE: +@081A3CCE: ldr r0, [r6] ldr r4, =0x00000eba adds r0, r4 @@ -810797,16 +810797,16 @@ _081A3CCE: mov r2, r9 ldrh r0, [r2] cmp r0, r8 - bne _081A3CEE + bne @081A3CEE adds r5, 0xA movs r0, 0xA bl sub_80EED60 -_081A3CEE: +@081A3CEE: ldr r0, =0x0000ffff cmp r5, r0 - ble _081A3CF6 + ble @081A3CF6 adds r5, r0, 0 -_081A3CF6: +@081A3CF6: ldr r0, [r6] adds r0, r4 strh r5, [r0] @@ -810821,7 +810821,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 var_get @@ -810840,7 +810840,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 var_get @@ -810851,22 +810851,22 @@ sub_81A3D58: @ 81A3D58 bl sub_81A3B30 lsls r0, 24 cmp r0, 0 - bne _081A3D88 + bne @081A3D88 lsls r0, r4, 17 ldr r1, =0x08c40000 adds r0, r1 lsrs r0, 16 bl flag_set - b _081A3D94 + b @081A3D94 .align 2, 0 .pool -_081A3D88: +@081A3D88: lsls r0, r4, 17 ldr r1, =0x08c50000 adds r0, r1 lsrs r0, 16 bl flag_set -_081A3D94: +@081A3D94: pop {r4} pop {r0} bx r0 @@ -810875,7 +810875,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 @@ -810883,17 +810883,17 @@ sub_81A3DA0: @ 81A3DA0 ldr r2, [r0] ands r2, r1 cmp r2, 0 - beq _081A3DC4 + beq @081A3DC4 ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] - b _081A3DC8 + b @081A3DC8 .align 2, 0 .pool -_081A3DC4: +@081A3DC4: ldr r0, =0x020375f0 strh r2, [r0] -_081A3DC8: +@081A3DC8: pop {r0} bx r0 .align 2, 0 @@ -810901,7 +810901,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 @@ -810916,96 +810916,96 @@ sub_81A3DD0: @ 81A3DD0 bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - beq _081A3ED6 + beq @081A3ED6 adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 subs r0, r4, 0x1 cmp r0, 0xA - bhi _081A3EA0 + bhi @081A3EA0 lsls r0, 2 - ldr r1, =_081A3E0C + ldr r1, =@081A3E0C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081A3E0C: - .4byte _081A3E38 - .4byte _081A3E68 - .4byte _081A3E38 - .4byte _081A3EA0 - .4byte _081A3E38 - .4byte _081A3EA0 - .4byte _081A3E38 - .4byte _081A3EA0 - .4byte _081A3E38 - .4byte _081A3EA0 - .4byte _081A3E38 -_081A3E38: +@081A3E0C: + .4byte @081A3E38 + .4byte @081A3E68 + .4byte @081A3E38 + .4byte @081A3EA0 + .4byte @081A3E38 + .4byte @081A3EA0 + .4byte @081A3E38 + .4byte @081A3EA0 + .4byte @081A3E38 + .4byte @081A3EA0 + .4byte @081A3E38 +@081A3E38: cmp r5, r4 - bne _081A3E50 + bne @081A3E50 ldr r0, =0x02021cc4 ldr r1, =0x085ccb79 bl gf_strcat - b _081A3EC8 + b @081A3EC8 .align 2, 0 .pool -_081A3E50: +@081A3E50: cmp r5, r4 - ble _081A3EC8 + ble @081A3EC8 ldr r0, =0x02021cc4 ldr r1, =0x085ccb7f bl gf_strcat - b _081A3EC8 + b @081A3EC8 .align 2, 0 .pool -_081A3E68: +@081A3E68: cmp r4, r5 - bne _081A3E80 + bne @081A3E80 ldr r0, =0x02021cc4 ldr r1, =0x085ccb79 bl gf_strcat - b _081A3E88 + b @081A3E88 .align 2, 0 .pool -_081A3E80: +@081A3E80: ldr r0, =0x02021cc4 ldr r1, =0x085ccb7f bl gf_strcat -_081A3E88: +@081A3E88: ldr r0, =0x02021cc4 ldr r1, =0x085ccb86 bl gf_strcat - b _081A3EC8 + b @081A3EC8 .align 2, 0 .pool -_081A3EA0: +@081A3EA0: cmp r4, r5 - bne _081A3EB8 + bne @081A3EB8 ldr r0, =0x02021cc4 ldr r1, =0x085ccb79 bl gf_strcat - b _081A3EC0 + b @081A3EC0 .align 2, 0 .pool -_081A3EB8: +@081A3EB8: ldr r0, =0x02021cc4 ldr r1, =0x085ccb7f bl gf_strcat -_081A3EC0: +@081A3EC0: ldr r0, =0x02021cc4 ldr r1, =0x085ccb84 bl gf_strcat -_081A3EC8: +@081A3EC8: ldr r0, =0x02021cc4 movs r1, 0xB muls r1, r6 ldr r2, =0x083185c8 adds r1, r2 bl gf_strcat -_081A3ED6: +@081A3ED6: adds r0, r4, 0 pop {r4-r6} pop {r1} @@ -811015,7 +811015,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 @@ -811041,83 +811041,83 @@ sub_81A3EF0: @ 81A3EF0 movs r0, 0xCE lsls r0, 1 cmp r4, r0 - beq _081A3FBE + beq @081A3FBE cmp r4, 0 - beq _081A3FBE + beq @081A3FBE ldr r0, =0x08611c9a ldrh r1, [r0] ldr r5, =0x0000ffff adds r3, r0, 0 cmp r1, r5 - beq _081A3F54 + beq @081A3F54 cmp r1, r4 - beq _081A3F48 + beq @081A3F48 adds r1, r3, 0 -_081A3F3A: +@081A3F3A: adds r1, 0x2 adds r2, 0x1 ldrh r0, [r1] cmp r0, r5 - beq _081A3F54 + beq @081A3F54 cmp r0, r4 - bne _081A3F3A -_081A3F48: + bne @081A3F3A +@081A3F48: lsls r0, r2, 1 adds r0, r3 ldrh r1, [r0] ldr r0, =0x0000ffff cmp r1, r0 - bne _081A3FBE -_081A3F54: + bne @081A3FBE +@081A3F54: mov r0, r12 cmp r0, 0 - bne _081A3F60 + bne @081A3F60 mov r1, r8 cmp r1, 0x32 - bhi _081A3FBE -_081A3F60: + bhi @081A3FBE +@081A3F60: movs r2, 0 ldrb r3, [r7] cmp r2, r3 - bge _081A3F80 + bge @081A3F80 mov r1, r9 ldrh r0, [r1] cmp r0, r4 - beq _081A3F80 + beq @081A3F80 adds r5, r3, 0 -_081A3F72: +@081A3F72: adds r1, 0x2 adds r2, 0x1 cmp r2, r5 - bge _081A3F80 + bge @081A3F80 ldrh r0, [r1] cmp r0, r4 - bne _081A3F72 -_081A3F80: + bne @081A3F72 +@081A3F80: cmp r2, r3 - bne _081A3FBE + bne @081A3FBE cmp r6, 0 - beq _081A3FAA + beq @081A3FAA movs r2, 0 cmp r2, r3 - bge _081A3FA6 + bge @081A3FA6 mov r1, r10 ldrh r0, [r1] cmp r0, r6 - beq _081A3FA6 + beq @081A3FA6 adds r5, r3, 0 -_081A3F98: +@081A3F98: adds r1, 0x2 adds r2, 0x1 cmp r2, r5 - bge _081A3FA6 + bge @081A3FA6 ldrh r0, [r1] cmp r0, r6 - bne _081A3F98 -_081A3FA6: + bne @081A3F98 +@081A3FA6: cmp r2, r3 - bne _081A3FBE -_081A3FAA: + bne @081A3FBE +@081A3FAA: lsls r0, r3, 1 add r0, r9 strh r4, [r0] @@ -811128,7 +811128,7 @@ _081A3FAA: ldrb r0, [r7] adds r0, 0x1 strb r0, [r7] -_081A3FBE: +@081A3FBE: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -811141,7 +811141,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 @@ -811158,48 +811158,48 @@ sub_81A3FD4: @ 81A3FD4 lsrs r0, 16 mov r10, r4 cmp r0, 0x1 - beq _081A4016 + beq @081A4016 cmp r0, 0x1 - bgt _081A4008 + bgt @081A4008 cmp r0, 0 - beq _081A4010 - b _081A402A + beq @081A4010 + b @081A402A .align 2, 0 .pool -_081A4008: +@081A4008: cmp r0, 0x3 - bgt _081A402A + bgt @081A402A movs r0, 0x2 - b _081A4028 -_081A4010: + b @081A4028 +@081A4010: movs r1, 0x3 str r1, [sp, 0x2C] - b _081A402A -_081A4016: + b @081A402A +@081A4016: ldr r0, =0x000040cf bl var_get lsls r0, 16 movs r1, 0x3 str r1, [sp, 0x2C] cmp r0, 0 - bne _081A402A + bne @081A402A movs r0, 0x4 -_081A4028: +@081A4028: str r0, [sp, 0x2C] -_081A402A: +@081A402A: movs r1, 0 mov r9, r1 - b _081A4040 + b @081A4040 .align 2, 0 .pool -_081A4034: +@081A4034: mov r1, r10 ldrb r0, [r1] ldr r1, [sp, 0x2C] cmp r0, r1 - blt _081A4040 - b _081A41E0 -_081A4040: + blt @081A4040 + b @081A41E0 +@081A4040: mov r5, r9 movs r0, 0 mov r1, r10 @@ -811207,7 +811207,7 @@ _081A4040: mov r0, r9 adds r0, 0x1 str r0, [sp, 0x30] -_081A404E: +@081A404E: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -811239,9 +811239,9 @@ _081A404E: lsls r0, 16 lsrs r0, 16 cmp r0, 0x6 - bne _081A40C8 + bne @081A40C8 cmp r7, 0 - bne _081A40E4 + bne @081A40E4 ldr r0, =0x020375f0 ldrb r3, [r0] str r6, [sp] @@ -811255,10 +811255,10 @@ _081A404E: movs r1, 0 adds r2, r4, 0 bl sub_81A3EF0 - b _081A40E4 + b @081A40E4 .align 2, 0 .pool -_081A40C8: +@081A40C8: ldr r0, =0x020375f0 ldrb r3, [r0] str r6, [sp] @@ -811272,32 +811272,32 @@ _081A40C8: adds r1, r7, 0 adds r2, r4, 0 bl sub_81A3EF0 -_081A40E4: +@081A40E4: adds r5, 0x1 cmp r5, 0x5 - ble _081A40EC + ble @081A40EC movs r5, 0 -_081A40EC: +@081A40EC: cmp r5, r9 - bne _081A404E + bne @081A404E ldr r1, [sp, 0x30] mov r9, r1 cmp r1, 0x5 - ble _081A4034 + ble @081A4034 mov r1, r10 ldrb r0, [r1] ldr r1, [sp, 0x2C] cmp r0, r1 - bge _081A41E0 + bge @081A41E0 movs r6, 0 ldr r0, =0x08611c9a ldrh r2, [r0] ldr r1, =0x0000ffff mov r8, r0 cmp r2, r1 - beq _081A4134 + beq @081A4134 mov r4, r8 -_081A4112: +@081A4112: adds r0, r2, 0 bl SpeciesToNationalPokedexNum lsls r0, 16 @@ -811306,15 +811306,15 @@ _081A4112: bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - beq _081A412A + beq @081A412A adds r6, 0x1 -_081A412A: +@081A412A: adds r4, 0x2 ldrh r2, [r4] ldr r0, =0x0000ffff cmp r2, r0 - bne _081A4112 -_081A4134: + bne @081A4112 +@081A4134: ldr r1, =0x02021cc4 movs r0, 0xFF strb r0, [r1] @@ -811328,11 +811328,11 @@ _081A4134: ldrh r0, [r1] ldr r1, =0x0000ffff cmp r0, r1 - beq _081A416A + beq @081A416A mov r5, r10 adds r7, r1, 0 mov r4, r8 -_081A4156: +@081A4156: ldrh r0, [r4] ldrb r1, [r5] adds r2, r6, 0 @@ -811341,12 +811341,12 @@ _081A4156: adds r4, 0x2 ldrh r0, [r4] cmp r0, r7 - bne _081A4156 -_081A416A: + bne @081A4156 +@081A416A: mov r0, r10 ldrb r4, [r0] cmp r4, 0 - bne _081A41A4 + bne @081A41A4 ldr r4, =0x02021cc4 ldr r1, =0x085ccb82 adds r0, r4, 0 @@ -811354,32 +811354,32 @@ _081A416A: ldr r1, =0x085ccb88 adds r0, r4, 0 bl gf_strcat - b _081A4202 + b @081A4202 .align 2, 0 .pool -_081A41A4: +@081A41A4: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _081A41C0 + beq @081A41C0 ldr r0, =0x02021cc4 ldr r1, =0x085ccb84 bl gf_strcat - b _081A41C8 + b @081A41C8 .align 2, 0 .pool -_081A41C0: +@081A41C0: ldr r0, =0x02021cc4 ldr r1, =0x085ccb82 bl gf_strcat -_081A41C8: +@081A41C8: ldr r0, =0x02021cc4 ldr r1, =0x085ccb8c bl gf_strcat - b _081A4202 + b @081A4202 .align 2, 0 .pool -_081A41E0: +@081A41E0: ldr r1, =0x020375e0 movs r0, 0 strh r0, [r1] @@ -811397,7 +811397,7 @@ _081A41E0: ands r0, r3 orrs r0, r1 strb r0, [r2] -_081A4202: +@081A4202: add sp, 0x34 pop {r3-r5} mov r8, r3 @@ -811411,7 +811411,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} @@ -811419,7 +811419,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] @@ -811437,26 +811437,26 @@ sub_81A4230: @ 81A4230 lsls r0, 16 lsrs r0, 16 cmp r0, 0x6 - bls _081A425A - b _081A4394 -_081A425A: + bls @081A425A + b @081A4394 +@081A425A: lsls r0, 2 - ldr r1, =_081A4278 + ldr r1, =@081A4278 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081A4278: - .4byte _081A4294 - .4byte _081A42DC - .4byte _081A431C - .4byte _081A4338 - .4byte _081A434C - .4byte _081A4368 - .4byte _081A437C -_081A4294: +@081A4278: + .4byte @081A4294 + .4byte @081A42DC + .4byte @081A431C + .4byte @081A4338 + .4byte @081A434C + .4byte @081A4368 + .4byte @081A437C +@081A4294: ldr r7, =0x03005d90 ldr r0, [r7] lsls r4, 1 @@ -811469,11 +811469,11 @@ _081A4294: ldrh r1, [r2] ldr r0, =0x0000270e cmp r1, r0 - bhi _081A4394 + bhi @081A4394 adds r0, r1, 0x1 strh r0, [r2] cmp r5, 0 - bne _081A4394 + bne @081A4394 adds r0, r3, r4 ldrh r1, [r0] movs r0, 0x20 @@ -811484,10 +811484,10 @@ _081A4294: ldrh r0, [r0] ldr r2, =0x00000d02 adds r1, r2 - b _081A4392 + b @081A4392 .align 2, 0 .pool -_081A42DC: +@081A42DC: ldr r6, =0x03005d90 ldr r0, [r6] lsls r2, r4, 1 @@ -811499,22 +811499,22 @@ _081A42DC: ldrh r0, [r3] ldr r2, =0x0000270e cmp r0, r2 - bhi _081A42F8 + bhi @081A42F8 adds r0, 0x1 strh r0, [r3] -_081A42F8: +@081A42F8: ldr r0, [r6] ldr r3, =0x00000d1c adds r0, r3 adds r1, r0, r1 ldrh r0, [r1] cmp r0, r2 - bhi _081A4394 + bhi @081A4394 adds r0, 0x1 - b _081A4392 + b @081A4392 .align 2, 0 .pool -_081A431C: +@081A431C: ldr r0, =0x03005d90 ldr r2, [r0] lsls r0, r4, 1 @@ -811523,19 +811523,19 @@ _081A431C: ldr r1, =0x00000dc8 adds r2, r1 adds r1, r2, r0 - b _081A4388 + b @081A4388 .align 2, 0 .pool -_081A4338: +@081A4338: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 ldr r2, =0x00000dda adds r0, r2 - b _081A4386 + b @081A4386 .align 2, 0 .pool -_081A434C: +@081A434C: ldr r0, =0x03005d90 ldr r2, [r0] lsls r0, r4, 1 @@ -811544,35 +811544,35 @@ _081A434C: ldr r3, =0x00000de2 adds r2, r3 adds r1, r2, r0 - b _081A4388 + b @081A4388 .align 2, 0 .pool -_081A4368: +@081A4368: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 ldr r2, =0x00000e04 adds r0, r2 - b _081A4386 + b @081A4386 .align 2, 0 .pool -_081A437C: +@081A437C: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 ldr r3, =0x00000e1a adds r0, r3 -_081A4386: +@081A4386: adds r1, r0, r1 -_081A4388: +@081A4388: ldrh r3, [r1] ldr r0, =0x0000270e cmp r3, r0 - bhi _081A4394 + bhi @081A4394 adds r0, r3, 0x1 -_081A4392: +@081A4392: strh r0, [r1] -_081A4394: +@081A4394: pop {r4-r7} pop {r0} bx r0 @@ -811581,13 +811581,13 @@ _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 ldr r6, =0x03005d8c movs r5, 0x64 -_081A43B2: +@081A43B2: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 @@ -811596,7 +811596,7 @@ _081A43B2: adds r1, r0, r1 ldrh r0, [r1] cmp r0, 0 - beq _081A43EE + beq @081A43EE adds r1, r0, 0 muls r1, r5 movs r0, 0xEA @@ -811616,12 +811616,12 @@ _081A43B2: movs r1, 0xC mov r2, sp bl pokemon_setattr -_081A43EE: +@081A43EE: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _081A43B2 + bls @081A43B2 add sp, 0x4 pop {r4-r6} pop {r0} @@ -811631,7 +811631,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 @@ -811652,31 +811652,31 @@ 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] cmp r0, 0 - beq _081A4450 + beq @081A4450 cmp r0, 0x1 - beq _081A4464 - b _081A446E + beq @081A4464 + b @081A446E .align 2, 0 .pool -_081A4450: +@081A4450: ldr r0, =0x02021cc4 ldr r1, =0x02038bca ldrh r1, [r1] bl sub_8162E20 - b _081A446E + b @081A446E .align 2, 0 .pool -_081A4464: +@081A4464: ldr r0, =0x02021dc4 ldr r1, =0x02038bca ldrh r1, [r1] bl sub_8162E20 -_081A446E: +@081A446E: pop {r0} bx r0 .align 2, 0 @@ -811684,7 +811684,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 @@ -811693,7 +811693,7 @@ sub_81A447C: @ 81A447C sub sp, 0x8 movs r0, 0 str r0, [sp] -_081A448C: +@081A448C: ldr r1, =0x03005d90 ldr r0, [r1] ldr r2, [sp] @@ -811709,7 +811709,7 @@ _081A448C: adds r2, 0x1 str r2, [sp, 0x4] cmp r0, 0x5 - bhi _081A454E + bhi @081A454E movs r6, 0 ldr r0, [sp] movs r2, 0x64 @@ -811717,14 +811717,14 @@ _081A448C: muls r1, r2 ldr r0, =0x020244ec adds r7, r1, r0 -_081A44BA: +@081A44BA: movs r5, 0 movs r4, 0xD adds r4, r6 mov r8, r4 adds r0, r6, 0x1 mov r10, r0 -_081A44C6: +@081A44C6: ldr r1, =0x03005d90 ldr r0, [r1] ldr r2, =0x00000caa @@ -811750,25 +811750,25 @@ _081A44C6: movs r2, 0 bl pokemon_getattr cmp r4, r0 - beq _081A4508 + beq @081A4508 adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _081A44C6 -_081A4508: + bls @081A44C6 +@081A4508: cmp r5, 0x4 - bne _081A4516 + bne @081A4516 adds r0, r7, 0 movs r1, 0xA6 adds r2, r6, 0 bl sub_80691F4 -_081A4516: +@081A4516: mov r4, r10 lsls r0, r4, 24 lsrs r6, r0, 24 cmp r6, 0x3 - bls _081A44BA + bls @081A44BA ldr r0, =0x03005d8c ldr r0, [r0] ldr r2, =0x03005d90 @@ -811791,13 +811791,13 @@ _081A4516: adds r1, r2 movs r2, 0x64 bl memcpy -_081A454E: +@081A454E: ldr r1, [sp, 0x4] lsls r0, r1, 24 lsrs r0, 24 str r0, [sp] cmp r0, 0x3 - bls _081A448C + bls @081A448C add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -811811,7 +811811,7 @@ _081A454E: thumb_func_end sub_81A447C thumb_func_start sub_81A457C -sub_81A457C: @ 81A457C +sub_81A457C: ; 81A457C push {lr} ldr r0, =0x000040cf bl var_get @@ -811825,7 +811825,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 @@ -811865,7 +811865,7 @@ sub_81A4594: @ 81A4594 strb r0, [r6, 0xD] ldrh r0, [r6, 0x4] cmp r0, 0 - beq _081A465C + beq @081A465C adds r1, r6, 0x6 ldrb r2, [r6, 0xE] add r0, sp, 0xC @@ -811887,9 +811887,9 @@ sub_81A4594: @ 81A4594 ldrh r1, [r6, 0x4] ldr r0, =0x0000270f cmp r1, r0 - bls _081A4618 + bls @081A4618 adds r1, r0, 0 -_081A4618: +@081A4618: ldr r0, =0x02021dc4 movs r2, 0x1 movs r3, 0x4 @@ -811920,7 +811920,7 @@ _081A4618: movs r1, 0x1 adds r2, r5, 0 bl Print -_081A465C: +@081A465C: add sp, 0x2C pop {r3-r5} mov r8, r3 @@ -811934,7 +811934,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 @@ -811974,7 +811974,7 @@ sub_81A4684: @ 81A4684 bl Print ldrh r0, [r5, 0x8] cmp r0, 0 - beq _081A47BC + beq @081A47BC movs r0, 0xFF strb r0, [r5, 0x11] movs r0, 0x1 @@ -812008,19 +812008,19 @@ sub_81A4684: @ 81A4684 adds r0, r4, 0 bl sub_8009228 cmp r0, 0 - beq _081A4734 + beq @081A4734 add r0, sp, 0xC adds r1, r4, 0 movs r2, 0x1 bl sub_81DB5E8 - b _081A473C + b @081A473C .align 2, 0 .pool -_081A4734: +@081A4734: add r0, sp, 0xC adds r1, r4, 0 bl gf_strcpy -_081A473C: +@081A473C: ldr r2, =0x0203ab74 mov r9, r2 ldrb r0, [r2] @@ -812048,9 +812048,9 @@ _081A473C: ldrh r1, [r5, 0x8] ldr r0, =0x0000270f cmp r1, r0 - bls _081A4778 + bls @081A4778 adds r1, r0, 0 -_081A4778: +@081A4778: ldr r0, =0x02021dc4 movs r2, 0x1 movs r3, 0x4 @@ -812081,7 +812081,7 @@ _081A4778: movs r1, 0x1 adds r2, r5, 0 bl Print -_081A47BC: +@081A47BC: add sp, 0x2C pop {r3-r5} mov r8, r3 @@ -812095,7 +812095,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 @@ -812126,7 +812126,7 @@ sub_81A47E0: @ 81A47E0 adds r4, r1, r2 mov r3, sp movs r2, 0x2 -_081A4820: +@081A4820: adds r0, r3, 0 movs r5, 0x87 lsls r5, 2 @@ -812139,7 +812139,7 @@ _081A4820: adds r3, 0x10 subs r2, 0x1 cmp r2, 0 - bge _081A4820 + bge @081A4820 ldr r6, [sp, 0x40] lsls r0, r6, 4 mov r7, r10 @@ -812152,30 +812152,30 @@ _081A4820: ldr r0, [r0] str r0, [r1] movs r2, 0 -_081A4852: +@081A4852: movs r1, 0 movs r4, 0 movs r3, 0 lsls r5, r2, 4 adds r6, r2, 0x1 mov r2, sp -_081A485E: +@081A485E: ldrh r0, [r2, 0x4] cmp r0, r1 - ble _081A4868 + ble @081A4868 adds r4, r3, 0 adds r1, r0, 0 -_081A4868: +@081A4868: adds r2, 0x10 adds r3, 0x1 cmp r3, 0x3 - ble _081A485E + ble @081A485E mov r0, sp ldrh r0, [r0, 0x34] cmp r0, r1 - blt _081A487A + blt @081A487A movs r4, 0x3 -_081A487A: +@081A487A: lsls r0, r4, 4 mov r7, sp adds r2, r7, r0 @@ -812190,7 +812190,7 @@ _081A487A: strh r0, [r2, 0x4] adds r2, r6, 0 cmp r2, 0x2 - ble _081A4852 + ble @081A4852 mov r0, r8 bl free add sp, 0x44 @@ -812206,7 +812206,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 @@ -812234,7 +812234,7 @@ sub_81A48B4: @ 81A48B4 adds r3, r0, r1 mov r2, sp movs r4, 0x2 -_081A48EE: +@081A48EE: adds r0, r2, 0 ldr r5, =0x0000057c adds r1, r3, r5 @@ -812248,7 +812248,7 @@ _081A48EE: adds r2, 0x1C subs r4, 0x1 cmp r4, 0 - bge _081A48EE + bge @081A48EE mov r6, r10 lsls r0, r6, 3 subs r0, r6 @@ -812265,30 +812265,30 @@ _081A48EE: ldr r0, [r0] str r0, [r1] movs r4, 0 -_081A492A: +@081A492A: movs r1, 0 movs r5, 0 movs r3, 0 lsls r6, r4, 3 adds r7, r4, 0x1 mov r2, sp -_081A4936: +@081A4936: ldrh r0, [r2, 0x8] cmp r0, r1 - ble _081A4940 + ble @081A4940 adds r5, r3, 0 adds r1, r0, 0 -_081A4940: +@081A4940: adds r2, 0x1C adds r3, 0x1 cmp r3, 0x2 - ble _081A4936 + ble @081A4936 mov r2, r12 ldrh r0, [r2] cmp r0, r1 - blt _081A4952 + blt @081A4952 movs r5, 0x3 -_081A4952: +@081A4952: subs r1, r6, r4 lsls r1, 2 lsls r0, r5, 3 @@ -812308,7 +812308,7 @@ _081A4952: strh r0, [r2, 0x8] adds r4, r7, 0 cmp r4, 0x2 - ble _081A492A + ble @081A492A mov r0, r8 bl free add sp, 0x74 @@ -812324,7 +812324,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 @@ -812382,7 +812382,7 @@ sub_81A4998: @ 81A4998 adds r2, r4, 0 bl Print cmp r7, 0x9 - bne _081A4A6C + bne @081A4A6C ldr r2, =0x03005d90 ldr r0, [r2] ldr r1, =0x00000ee8 @@ -812400,7 +812400,7 @@ sub_81A4998: @ 81A4998 adds r0, r4, 0 ldr r1, [sp, 0x90] bl sub_81A48B4 -_081A4A3A: +@081A4A3A: adds r0, r5, 0 movs r1, 0x1 movs r2, 0x4 @@ -812409,18 +812409,18 @@ _081A4A3A: adds r4, 0x1C adds r5, 0x1 cmp r5, 0x2 - ble _081A4A3A - b _081A4A90 + ble @081A4A3A + b @081A4A90 .align 2, 0 .pool -_081A4A6C: +@081A4A6C: add r0, sp, 0xC adds r1, r7, 0 ldr r2, [sp, 0x90] bl sub_81A47E0 movs r5, 0 add r4, sp, 0xC -_081A4A7A: +@081A4A7A: str r7, [sp] adds r0, r5, 0 movs r1, 0x1 @@ -812430,8 +812430,8 @@ _081A4A7A: adds r4, 0x10 adds r5, 0x1 cmp r5, 0x2 - ble _081A4A7A -_081A4A90: + ble @081A4A7A +@081A4A90: add sp, 0x94 pop {r3-r5} mov r8, r3 @@ -812443,7 +812443,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, =0x08611c84 @@ -812472,7 +812472,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] @@ -812493,7 +812493,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 @@ -812502,7 +812502,7 @@ sub_81A4B14: @ 81A4B14 sub sp, 0x8 movs r1, 0 ldr r3, =0x03005d90 -_081A4B24: +@081A4B24: movs r6, 0 lsls r0, r1, 1 adds r2, r1, 0x1 @@ -812515,12 +812515,12 @@ _081A4B24: lsls r0, 2 add r0, r8 mov r9, r0 -_081A4B3C: +@081A4B3C: movs r5, 0 adds r2, r7, 0 mov r1, r8 adds r4, r7, r1 -_081A4B44: +@081A4B44: ldr r0, [r3] add r0, r9 adds r0, r2 @@ -812548,21 +812548,21 @@ _081A4B44: adds r5, 0x1 ldr r2, [sp] cmp r5, 0x2 - ble _081A4B44 + ble @081A4B44 adds r7, 0x30 adds r6, 0x1 cmp r6, 0x1 - ble _081A4B3C + ble @081A4B3C mov r1, r10 cmp r1, 0x8 - ble _081A4B24 + ble @081A4B24 movs r6, 0 ldr r7, =0x03005d90 movs r2, 0x54 mov r10, r2 movs r3, 0xFF mov r9, r3 -_081A4B98: +@081A4B98: adds r0, r6, 0x1 mov r8, r0 mov r1, r10 @@ -812574,7 +812574,7 @@ _081A4B98: ldr r3, =0x0000057c adds r6, r1, r3 movs r5, 0x2 -_081A4BAE: +@081A4BAE: ldr r0, [r7] adds r0, r6 adds r0, r2 @@ -812614,10 +812614,10 @@ _081A4BAE: adds r2, 0x1C subs r5, 0x1 cmp r5, 0 - bge _081A4BAE + bge @081A4BAE mov r6, r8 cmp r6, 0x1 - ble _081A4B98 + ble @081A4B98 add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -812631,7 +812631,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} @@ -812646,7 +812646,7 @@ sub_81A4C30: @ 81A4C30 adds r6, r7, r0 ldr r0, =0x020244ec mov r8, r0 -_081A4C4E: +@081A4C4E: mov r0, r8 adds r1, r5, r0 adds r0, r4, 0 @@ -812655,7 +812655,7 @@ _081A4C4E: adds r4, 0x64 adds r5, 0x64 cmp r4, r6 - ble _081A4C4E + ble @081A4C4E ldr r4, =0x020244e9 ldrb r5, [r4] bl copy_player_party_from_sav1 @@ -812669,7 +812669,7 @@ _081A4C4E: movs r0, 0xFA lsls r0, 1 adds r6, r7, r0 -_081A4C84: +@081A4C84: adds r0, r5, 0 adds r1, r4, 0 movs r2, 0x64 @@ -812677,7 +812677,7 @@ _081A4C84: adds r4, 0x64 adds r5, 0x64 cmp r4, r6 - ble _081A4C84 + ble @081A4C84 adds r0, r7, 0 bl free pop {r3} @@ -812690,7 +812690,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] @@ -812698,19 +812698,19 @@ sub_81A4CB0: @ 81A4CB0 lsls r1, 17 ands r0, r1 cmp r0, 0 - beq _081A4CD0 + beq @081A4CD0 bl sub_8185EA0 lsls r0, 24 lsrs r0, 24 - b _081A4CDA + b @081A4CDA .align 2, 0 .pool -_081A4CD0: +@081A4CD0: ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r0, 16 -_081A4CDA: +@081A4CDA: ldr r2, =0x08310030 ldr r1, =0x08611d30 lsls r0, 1 @@ -812728,7 +812728,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] @@ -812736,19 +812736,19 @@ sub_81A4D00: @ 81A4D00 lsls r1, 17 ands r0, r1 cmp r0, 0 - beq _081A4D20 + beq @081A4D20 bl sub_8185EA0 lsls r0, 24 lsrs r0, 24 - b _081A4D2A + b @081A4D2A .align 2, 0 .pool -_081A4D20: +@081A4D20: ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r0, 16 -_081A4D2A: +@081A4D2A: ldr r2, =0x08310030 ldr r1, =0x08611d30 lsls r0, 1 @@ -812766,7 +812766,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 @@ -812775,19 +812775,19 @@ sub_81A4D50: @ 81A4D50 lsls r1, 17 ands r0, r1 cmp r0, 0 - beq _081A4D70 + beq @081A4D70 bl sub_8185EA0 lsls r0, 24 lsrs r0, 24 - b _081A4D7A + b @081A4D7A .align 2, 0 .pool -_081A4D70: +@081A4D70: ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r0, 16 -_081A4D7A: +@081A4D7A: movs r3, 0 lsls r0, 1 ldr r2, =0x08310030 @@ -812799,14 +812799,14 @@ _081A4D7A: lsls r0, 3 adds r2, 0x4 adds r2, r0, r2 -_081A4D90: +@081A4D90: adds r1, r4, r3 ldrb r0, [r2] strb r0, [r1] adds r2, 0x1 adds r3, 0x1 cmp r3, 0x6 - ble _081A4D90 + ble @081A4D90 adds r1, r4, r3 movs r0, 0xFF strb r0, [r1] @@ -812818,7 +812818,7 @@ _081A4D90: thumb_func_end sub_81A4D50 thumb_func_start sub_81A4DB8 -sub_81A4DB8: @ 81A4DB8 +sub_81A4DB8: ; 81A4DB8 push {lr} ldr r0, =0x000040cf bl var_get @@ -812835,7 +812835,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 var_get @@ -812854,7 +812854,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 @@ -812870,19 +812870,19 @@ sub_81A4E04: @ 81A4E04 str r0, [sp, 0x24] ldr r0, [sp, 0x20] cmp r0, 0x1 - bne _081A4E44 + bne @081A4E44 ldr r0, =0x000003fe bl sub_81953A0 lsls r0, 16 lsrs r0, 16 bl sub_818FC78 adds r4, r0, 0 - b _081A4E46 + b @081A4E46 .align 2, 0 .pool -_081A4E44: +@081A4E44: movs r4, 0x7 -_081A4E46: +@081A4E46: bl zero_enemy_party_data movs r1, 0 str r1, [sp, 0x18] @@ -812892,7 +812892,7 @@ _081A4E46: str r0, [sp, 0x1C] movs r2, 0 str r2, [sp, 0x14] -_081A4E5C: +@081A4E5C: movs r0, 0x1 ands r0, r4 asrs r4, 1 @@ -812901,9 +812901,9 @@ _081A4E5C: adds r3, 0x1 str r3, [sp, 0x28] cmp r0, 0 - bne _081A4E70 - b _081A4FC4 -_081A4E70: + bne @081A4E70 + b @081A4FC4 +@081A4E70: ldr r4, [sp, 0x14] lsls r4, 2 mov r9, r4 @@ -812923,7 +812923,7 @@ _081A4E70: add r0, r9 lsls r0, 2 mov r8, r0 -_081A4E96: +@081A4E96: bl GenerateRandomNumber adds r4, r0, 0 bl GenerateRandomNumber @@ -812936,7 +812936,7 @@ _081A4E96: bl sub_806EBD0 lsls r0, 24 cmp r0, 0 - bne _081A4E96 + bne @081A4E96 ldr r4, [sp, 0x38] ldr r1, [sp, 0x24] subs r0, r4, r1 @@ -812956,7 +812956,7 @@ _081A4E96: lsls r0, 24 lsrs r0, 24 cmp r1, r0 - bne _081A4E96 + bne @081A4E96 ldr r4, [sp, 0x18] movs r0, 0x64 adds r3, r4, 0 @@ -812996,7 +812996,7 @@ _081A4E96: movs r7, 0 mov r6, r8 ldr r3, =0x02024744 -_081A4F32: +@081A4F32: adds r1, r7, 0 adds r1, 0x1A ldr r0, [sp, 0x14] @@ -813011,7 +813011,7 @@ _081A4F32: adds r7, 0x1 ldr r3, [sp, 0x40] cmp r7, 0x5 - ble _081A4F32 + ble @081A4F32 movs r1, 0xFF add r0, sp, 0x10 strb r1, [r0] @@ -813024,7 +813024,7 @@ _081A4F32: mov r8, r3 ldr r3, =0x02024744 adds r5, r4, 0 -_081A4F6A: +@081A4F6A: ldr r4, [sp, 0x38] ldr r0, [sp, 0x24] subs r1, r4, r0 @@ -813045,15 +813045,15 @@ _081A4F6A: bl sub_80691F4 ldr r3, [sp, 0x40] cmp r4, 0xDA - bne _081A4F9C + bne @081A4F9C movs r1, 0 add r0, sp, 0x10 strb r1, [r0] -_081A4F9C: +@081A4F9C: adds r5, 0x2 adds r7, 0x1 cmp r7, 0x3 - ble _081A4F6A + ble @081A4F6A ldr r0, [sp, 0x18] movs r1, 0x64 adds r4, r0, 0 @@ -813068,14 +813068,14 @@ _081A4F9C: bl pokemon_calc_effective_stats ldr r2, [sp, 0x2C] str r2, [sp, 0x18] -_081A4FC4: +@081A4FC4: ldr r4, [sp, 0x30] ldr r3, [sp, 0x28] str r3, [sp, 0x14] cmp r3, 0x2 - bgt _081A4FD0 - b _081A4E5C -_081A4FD0: + bgt @081A4FD0 + b @081A4E5C +@081A4FD0: add sp, 0x44 pop {r3-r5} mov r8, r3 @@ -813089,7 +813089,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 @@ -813121,7 +813121,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 @@ -813142,7 +813142,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 @@ -813181,7 +813181,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 @@ -813213,7 +813213,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 @@ -813251,7 +813251,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 var_get @@ -813263,7 +813263,7 @@ sub_81A513C: @ 81A513C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bne _081A51A0 + bne @081A51A0 bl sub_81A39C4 lsls r0, 16 ldr r3, =0x08611550 @@ -813276,29 +813276,29 @@ sub_81A513C: @ 81A513C adds r0, r2, r3 ldrb r0, [r0] cmp r1, r0 - bne _081A5180 + bne @081A5180 movs r4, 0 - b _081A51A0 + b @081A51A0 .align 2, 0 .pool -_081A5180: +@081A5180: adds r0, r3, 0x1 adds r0, r2, r0 ldrb r0, [r0] cmp r1, r0 - beq _081A519E + beq @081A519E cmp r1, r0 - ble _081A51A0 + ble @081A51A0 subs r0, r1, r0 adds r1, r3, 0x2 adds r1, r2, r1 ldrb r1, [r1] bl __modsi3 cmp r0, 0 - bne _081A51A0 -_081A519E: + bne @081A51A0 +@081A519E: movs r4, 0x1 -_081A51A0: +@081A51A0: adds r0, r4, 0 pop {r4,r5} pop {r1} @@ -813306,7 +813306,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 @@ -813316,32 +813316,32 @@ sub_81A51A8: @ 81A51A8 lsls r1, 17 ands r0, r1 cmp r0, 0 - beq _081A51D4 + beq @081A51D4 bl sub_8185EA0 lsls r0, 24 lsrs r4, r0, 24 bl sub_8185EAC lsls r0, 24 lsrs r1, r0, 24 - b _081A51E4 + b @081A51E4 .align 2, 0 .pool -_081A51D4: +@081A51D4: ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r4, r0, 16 bl sub_81A513C adds r1, r0, 0 -_081A51E4: +@081A51E4: cmp r5, 0 - beq _081A51F4 + beq @081A51F4 cmp r5, 0x1 - beq _081A5214 - b _081A5228 + beq @081A5214 + b @081A5228 .align 2, 0 .pool -_081A51F4: +@081A51F4: ldr r0, =0x02021fc4 ldr r2, =0x08611db0 lsls r1, 2 @@ -813351,10 +813351,10 @@ _081A51F4: adds r1, r2 ldr r1, [r1] bl gf_strcpy - b _081A5228 + b @081A5228 .align 2, 0 .pool -_081A5214: +@081A5214: ldr r0, =0x02021fc4 ldr r2, =0x08611db8 lsls r1, 2 @@ -813364,7 +813364,7 @@ _081A5214: adds r1, r2 ldr r1, [r1] bl gf_strcpy -_081A5228: +@081A5228: pop {r4,r5} pop {r0} bx r0 @@ -813373,7 +813373,7 @@ _081A5228: thumb_func_end sub_81A51A8 thumb_func_start sub_81A5238 -sub_81A5238: @ 81A5238 +sub_81A5238: ; 81A5238 push {lr} ldr r1, =0x08611f84 ldr r0, =0x020375e0 @@ -813389,37 +813389,37 @@ 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 movs r6, 0 ldrb r0, [r5] cmp r0, 0xA - bls _081A5268 - b _081A5544 -_081A5268: + bls @081A5268 + b @081A5544 +@081A5268: lsls r0, 2 - ldr r1, =_081A5278 + ldr r1, =@081A5278 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081A5278: - .4byte _081A52A4 - .4byte _081A52F4 - .4byte _081A531C - .4byte _081A53B4 - .4byte _081A540C - .4byte _081A542C - .4byte _081A544C - .4byte _081A5490 - .4byte _081A553E - .4byte _081A54D4 - .4byte _081A5520 -_081A52A4: +@081A5278: + .4byte @081A52A4 + .4byte @081A52F4 + .4byte @081A531C + .4byte @081A53B4 + .4byte @081A540C + .4byte @081A542C + .4byte @081A544C + .4byte @081A5490 + .4byte @081A553E + .4byte @081A54D4 + .4byte @081A5520 +@081A52A4: ldr r0, =0x7fffff1c movs r1, 0 str r1, [sp] @@ -813443,10 +813443,10 @@ _081A52A4: ldr r1, =0x02022e26 movs r0, 0x70 strh r0, [r1] - b _081A553E + b @081A553E .align 2, 0 .pool -_081A52F4: +@081A52F4: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -813454,25 +813454,25 @@ _081A52F4: lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _081A5306 - b _081A5544 -_081A5306: + beq @081A5306 + b @081A5544 +@081A5306: str r0, [sp] movs r0, 0x5 movs r1, 0 movs r2, 0x18 movs r3, 0xD bl sub_8056A3C - b _081A553E + b @081A553E .align 2, 0 .pool -_081A531C: +@081A531C: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _081A5328 - b _081A5544 -_081A5328: + beq @081A5328 + b @081A5544 +@081A5328: ldr r1, =0x02022f58 movs r2, 0xA1 strb r2, [r1] @@ -813511,23 +813511,23 @@ _081A5328: adds r0, r4, 0 movs r1, 0x15 bl battle_show_message_maybe - b _081A553E + b @081A553E .align 2, 0 .pool -_081A53B4: +@081A53B4: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _081A53C0 - b _081A5544 -_081A53C0: + beq @081A53C0 + b @081A5544 +@081A53C0: ldr r1, =0x00003f3f movs r0, 0x48 bl lcd_io_set movs r6, 0x80 lsls r6, 15 movs r4, 0x7 -_081A53CE: +@081A53CE: asrs r1, r6, 16 ldr r0, =0x08611f5c movs r2, 0x54 @@ -813548,11 +813548,11 @@ _081A53CE: adds r6, r0 subs r4, 0x1 cmp r4, 0 - bge _081A53CE - b _081A553C + bge @081A53CE + b @081A553C .align 2, 0 .pool -_081A540C: +@081A540C: ldr r0, =0x00000109 bl audio_play movs r0, 0x50 @@ -813563,10 +813563,10 @@ _081A540C: movs r0, 0xA0 movs r1, 0x28 movs r2, 0 - b _081A5464 + b @081A5464 .align 2, 0 .pool -_081A542C: +@081A542C: ldr r0, =0x00000109 bl audio_play movs r0, 0x50 @@ -813577,10 +813577,10 @@ _081A542C: movs r0, 0xA0 movs r1, 0x38 movs r2, 0x1 - b _081A5464 + b @081A5464 .align 2, 0 .pool -_081A544C: +@081A544C: ldr r0, =0x00000109 bl audio_play movs r0, 0x50 @@ -813591,7 +813591,7 @@ _081A544C: movs r0, 0xA0 movs r1, 0x48 movs r2, 0x2 -_081A5464: +@081A5464: movs r3, 0x1 bl sub_81A5558 ldr r0, =0x085ccdcb @@ -813603,10 +813603,10 @@ _081A5464: adds r0, 0x1 strb r0, [r5] movs r6, 0x1 - b _081A5544 + b @081A5544 .align 2, 0 .pool -_081A5490: +@081A5490: movs r0, 0x85 lsls r0, 1 bl audio_play @@ -813615,28 +813615,28 @@ _081A5490: ldrb r2, [r0] ldrb r0, [r1] cmp r2, r0 - bls _081A54BC + bls @081A54BC movs r6, 0x2 ldr r1, =0x02024474 movs r0, 0 strb r0, [r1, 0x17] - b _081A553E + b @081A553E .align 2, 0 .pool -_081A54BC: +@081A54BC: cmp r2, r0 - bcs _081A54D0 + bcs @081A54D0 movs r6, 0x3 ldr r1, =0x02024474 movs r0, 0x1 strb r0, [r1, 0x17] - b _081A553E + b @081A553E .align 2, 0 .pool -_081A54D0: +@081A54D0: movs r6, 0x4 - b _081A553E -_081A54D4: + b @081A553E +@081A54D4: ldr r1, =0x00003f3e movs r0, 0x48 bl lcd_io_set @@ -813661,29 +813661,29 @@ _081A54D4: movs r2, 0x8 movs r3, 0 bl sub_80A1AD4 - b _081A553E + b @081A553E .align 2, 0 .pool -_081A5520: +@081A5520: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081A5544 + bne @081A5544 ldr r1, =0x00003f3f movs r0, 0x48 bl lcd_io_set movs r0, 0xFA lsls r0, 2 bl gpu_tile_obj_free_by_tag -_081A553C: +@081A553C: movs r6, 0x1 -_081A553E: +@081A553E: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] -_081A5544: +@081A5544: adds r0, r6, 0 add sp, 0x4 pop {r4-r6} @@ -813694,7 +813694,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 @@ -813725,20 +813725,20 @@ sub_81A5558: @ 81A5558 adds r5, r0 mov r8, r5 cmp r2, 0x1 - beq _081A55C4 + beq @081A55C4 cmp r2, 0x1 - bgt _081A55A8 + bgt @081A55A8 cmp r2, 0 - beq _081A55B0 - b _081A5612 + beq @081A55B0 + b @081A5612 .align 2, 0 .pool -_081A55A8: +@081A55A8: mov r0, r9 cmp r0, 0x2 - beq _081A55D8 - b _081A5612 -_081A55B0: + beq @081A55D8 + b @081A5612 +@081A55B0: adds r0, r4, r7 movs r6, 0 ldrsb r6, [r0, r6] @@ -813748,8 +813748,8 @@ _081A55B0: adds r0, r4, r0 movs r1, 0 ldrsb r1, [r0, r1] - b _081A5612 -_081A55C4: + b @081A5612 +@081A55C4: adds r0, r3, r7 movs r6, 0 ldrsb r6, [r0, r6] @@ -813759,8 +813759,8 @@ _081A55C4: adds r0, r3, r0 movs r1, 0 ldrsb r1, [r0, r1] - b _081A5612 -_081A55D8: + b @081A5612 +@081A55D8: ldr r3, =0x02024084 mov r9, r3 movs r5, 0x58 @@ -813788,47 +813788,47 @@ _081A55D8: ldrh r1, [r1] bl __divsi3 adds r1, r0, 0 -_081A5612: +@081A5612: cmp r6, r1 - ble _081A5638 + ble @081A5638 movs r4, 0x2 cmp r7, 0 - beq _081A5628 + beq @081A5628 ldr r1, =0x02022f68 - b _081A562A + b @081A562A .align 2, 0 .pool -_081A5628: +@081A5628: ldr r1, =0x02022f58 -_081A562A: +@081A562A: ldrb r0, [r1] adds r0, 0x2 strb r0, [r1] - b _081A565E + b @081A565E .align 2, 0 .pool -_081A5638: +@081A5638: cmp r6, r1 - bne _081A565C + bne @081A565C movs r4, 0x1 cmp r7, 0 - beq _081A564C + beq @081A564C ldr r1, =0x02022f68 - b _081A564E + b @081A564E .align 2, 0 .pool -_081A564C: +@081A564C: ldr r1, =0x02022f58 -_081A564E: +@081A564E: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _081A565E + b @081A565E .align 2, 0 .pool -_081A565C: +@081A565C: movs r4, 0 -_081A565E: +@081A565E: ldr r0, =0x08611f5c ldr r1, [sp] mov r2, r10 @@ -813856,16 +813856,16 @@ _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 ldrb r0, [r0] cmp r0, 0x8 - bls _081A56AA + bls @081A56AA adds r0, r1, 0 bl obj_delete_and_free_tiles -_081A56AA: +@081A56AA: pop {r0} bx r0 .align 2, 0 @@ -813873,7 +813873,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 @@ -813900,7 +813900,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 @@ -813923,7 +813923,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 @@ -813938,7 +813938,7 @@ sub_81A5718: @ 81A5718 lsls r1, 18 ands r0, r1 cmp r0, 0 - beq _081A57DA + beq @081A57DA ldr r0, =0x000002a2 adds r4, r2, r0 ldrb r2, [r4] @@ -813949,77 +813949,77 @@ sub_81A5718: @ 81A5718 adds r0, r2, 0 ands r0, r1 cmp r0, 0 - beq _081A576C + beq @081A576C bics r2, r1 strb r2, [r4] adds r1, r5, r3 ldrb r0, [r1] subs r0, 0x2 - b _081A57D8 + b @081A57D8 .align 2, 0 .pool -_081A576C: +@081A576C: ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 - beq _081A5798 + beq @081A5798 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081A5788 + beq @081A5788 ldr r0, =0x02024332 ldrb r0, [r0, 0x6] cmp r0, 0x1 - beq _081A57DA -_081A5788: + beq @081A57DA +@081A5788: adds r1, r5, r3 ldrb r0, [r1] subs r0, 0x2 - b _081A57D8 + b @081A57D8 .align 2, 0 .pool -_081A5798: +@081A5798: movs r0, 0x6 ands r0, r1 cmp r0, 0x6 - bne _081A57A4 + bne @081A57A4 adds r1, r5, r3 - b _081A57D4 -_081A57A4: + b @081A57D4 +@081A57A4: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081A57B4 + beq @081A57B4 adds r1, r5, r3 ldrb r0, [r1] adds r0, 0x2 - b _081A57D8 -_081A57B4: + b @081A57D8 +@081A57B4: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _081A57C4 + beq @081A57C4 adds r1, r5, r3 ldrb r0, [r1] subs r0, 0x1 - b _081A57D8 -_081A57C4: + b @081A57D8 +@081A57C4: ldr r0, =0x0202433c lsls r1, r6, 4 adds r1, r0 ldrb r0, [r1] lsls r0, 31 cmp r0, 0 - bne _081A57DA + bne @081A57DA adds r1, r5, r6 -_081A57D4: +@081A57D4: ldrb r0, [r1] adds r0, 0x1 -_081A57D8: +@081A57D8: strb r0, [r1] -_081A57DA: +@081A57DA: pop {r4-r6} pop {r0} bx r0 @@ -814028,7 +814028,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 @@ -814042,66 +814042,66 @@ sub_81A57E4: @ 81A57E4 movs r0, 0x99 lsls r0, 1 cmp r1, r0 - bgt _081A582A + bgt @081A582A subs r0, 0x1 cmp r1, r0 - bge _081A585C + bge @081A585C cmp r1, 0xC5 - bgt _081A581C + bgt @081A581C cmp r1, 0xC3 - bge _081A585C + bge @081A585C cmp r1, 0x77 - beq _081A585C - b _081A5864 + beq @081A585C + b @081A5864 .align 2, 0 .pool -_081A581C: +@081A581C: cmp r1, 0xC7 - blt _081A5864 + blt @081A5864 cmp r1, 0xCC - ble _081A585C + ble @081A585C cmp r1, 0xCE - beq _081A585C - b _081A5864 -_081A582A: + beq @081A585C + b @081A5864 +@081A582A: ldr r0, =0x00000147 cmp r1, r0 - beq _081A585C + beq @081A585C cmp r1, r0 - bgt _081A5848 + bgt @081A5848 subs r0, 0x12 cmp r1, r0 - beq _081A585C + beq @081A585C adds r0, 0x2 cmp r1, r0 - beq _081A585C - b _081A5864 + beq @081A585C + b @081A5864 .align 2, 0 .pool -_081A5848: +@081A5848: movs r0, 0xAD lsls r0, 1 cmp r2, r0 - blt _081A5864 + blt @081A5864 adds r0, 0x1 cmp r2, r0 - ble _081A585C + ble @081A585C adds r0, 0x3 cmp r2, r0 - bne _081A5864 -_081A585C: + bne @081A5864 +@081A585C: adds r1, r3, r4 ldrb r0, [r1] subs r0, 0x3 strb r0, [r1] -_081A5864: +@081A5864: pop {r4,r5} pop {r0} bx r0 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 @@ -814128,9 +814128,9 @@ sub_81A586C: @ 81A586C ldrh r2, [r0, 0x28] ldrh r0, [r1] cmp r0, r2 - bls _081A58A4 + bls @081A58A4 strh r2, [r1] -_081A58A4: +@081A58A4: pop {r4,r5} pop {r0} bx r0 @@ -814139,7 +814139,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] @@ -814170,32 +814170,32 @@ sub_81A58B4: @ 81A58B4 ands r0, r2 strb r0, [r1] cmp r5, 0 - beq _081A5914 + beq @081A5914 ldr r0, [r4] ldr r1, =0x00000cdc adds r0, r1 ldr r2, [r0] movs r0, 0x80 - b _081A591E + b @081A591E .align 2, 0 .pool -_081A5914: +@081A5914: ldr r0, [r4] ldr r3, =0x00000cdc adds r0, r3 ldr r2, [r0] movs r0, 0x40 -_081A591E: +@081A591E: ands r2, r0 cmp r2, 0 - bne _081A5930 + bne @081A5930 ldr r0, [r4] lsls r1, r5, 1 ldr r6, =0x00000dda adds r0, r6 adds r0, r1 strh r2, [r0] -_081A5930: +@081A5930: ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x4 @@ -814217,7 +814217,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] @@ -814229,59 +814229,59 @@ sub_81A5964: @ 81A5964 ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x1 - beq _081A59B0 + beq @081A59B0 cmp r0, 0x1 - bgt _081A5994 + bgt @081A5994 cmp r0, 0 - beq _081A599A - b _081A59EE + beq @081A599A + b @081A59EE .align 2, 0 .pool -_081A5994: +@081A5994: cmp r0, 0x2 - beq _081A59C8 - b _081A59EE -_081A599A: + beq @081A59C8 + b @081A59EE +@081A599A: ldr r0, =0x020375f0 ldr r2, =0x00000dd8 adds r1, r3, r2 ldrh r1, [r1] strh r1, [r0] - b _081A59EE + b @081A59EE .align 2, 0 .pool -_081A59B0: +@081A59B0: ldr r2, =0x020375f0 lsls r1, 1 ldr r4, =0x00000dda adds r0, r3, r4 adds r0, r1 ldrh r0, [r0] - b _081A59EC + b @081A59EC .align 2, 0 .pool -_081A59C8: +@081A59C8: cmp r1, 0 - beq _081A59E0 + beq @081A59E0 ldr r2, =0x020375f0 ldr r1, =0x00000cdc adds r0, r3, r1 ldr r0, [r0] movs r1, 0x80 - b _081A59EA + b @081A59EA .align 2, 0 .pool -_081A59E0: +@081A59E0: ldr r2, =0x020375f0 ldr r4, =0x00000cdc adds r0, r3, r4 ldr r0, [r0] movs r1, 0x40 -_081A59EA: +@081A59EA: ands r0, r1 -_081A59EC: +@081A59EC: strh r0, [r2] -_081A59EE: +@081A59EE: pop {r4} pop {r0} bx r0 @@ -814290,7 +814290,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] @@ -814302,28 +814302,28 @@ sub_81A59FC: @ 81A59FC ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x1 - beq _081A5A48 + beq @081A5A48 cmp r0, 0x1 - bgt _081A5A2C + bgt @081A5A2C cmp r0, 0 - beq _081A5A32 - b _081A5ABA + beq @081A5A32 + b @081A5ABA .align 2, 0 .pool -_081A5A2C: +@081A5A2C: cmp r0, 0x2 - beq _081A5A60 - b _081A5ABA -_081A5A32: + beq @081A5A60 + b @081A5ABA +@081A5A32: ldr r0, =0x020375e4 ldrh r1, [r0] ldr r3, =0x00000dd8 adds r0, r2, r3 strh r1, [r0] - b _081A5ABA + b @081A5ABA .align 2, 0 .pool -_081A5A48: +@081A5A48: lsls r1, 1 ldr r3, =0x00000dda adds r0, r2, r3 @@ -814331,57 +814331,57 @@ _081A5A48: ldr r1, =0x020375e4 ldrh r1, [r1] strh r1, [r0] - b _081A5ABA + b @081A5ABA .align 2, 0 .pool -_081A5A60: +@081A5A60: cmp r1, 0 - beq _081A5A90 + beq @081A5A90 ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0 - beq _081A5A80 + beq @081A5A80 ldr r1, =0x00000cdc adds r0, r2, r1 ldr r1, [r0] movs r2, 0x80 orrs r1, r2 - b _081A5AB8 + b @081A5AB8 .align 2, 0 .pool -_081A5A80: +@081A5A80: ldr r3, =0x00000cdc adds r0, r2, r3 ldr r1, [r0] movs r2, 0x81 negs r2, r2 - b _081A5AB6 + b @081A5AB6 .align 2, 0 .pool -_081A5A90: +@081A5A90: ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0 - beq _081A5AAC + beq @081A5AAC ldr r1, =0x00000cdc adds r0, r2, r1 ldr r1, [r0] movs r2, 0x40 orrs r1, r2 - b _081A5AB8 + b @081A5AB8 .align 2, 0 .pool -_081A5AAC: +@081A5AAC: ldr r3, =0x00000cdc adds r0, r2, r3 ldr r1, [r0] movs r2, 0x41 negs r2, r2 -_081A5AB6: +@081A5AB6: ands r1, r2 -_081A5AB8: +@081A5AB8: str r1, [r0] -_081A5ABA: +@081A5ABA: pop {r0} bx r0 .align 2, 0 @@ -814389,7 +814389,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] @@ -814418,7 +814418,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] @@ -814432,7 +814432,7 @@ sub_81A5B08: @ 81A5B08 adds r1, r0 ldrh r0, [r1] cmp r0, 0x29 - bls _081A5B58 + bls @081A5B58 bl GenerateRandomNumber ldr r4, [r4] ldr r5, =0x08611fac @@ -814446,10 +814446,10 @@ sub_81A5B08: @ 81A5B08 ldrh r0, [r0] ldr r1, =0x00000dd8 adds r4, r1 - b _081A5B76 + b @081A5B76 .align 2, 0 .pool -_081A5B58: +@081A5B58: bl GenerateRandomNumber ldr r4, [r4] ldr r5, =0x08611fa0 @@ -814463,7 +814463,7 @@ _081A5B58: ldrh r0, [r0] ldr r2, =0x00000dd8 adds r4, r2 -_081A5B76: +@081A5B76: strh r0, [r4] pop {r4,r5} pop {r0} @@ -814473,7 +814473,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] @@ -814485,7 +814485,7 @@ sub_81A5B88: @ 81A5B88 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x1 - bne _081A5BD0 + bne @081A5BD0 ldr r0, [r4] ldr r1, =0x00000dd8 adds r0, r1 @@ -814499,14 +814499,14 @@ sub_81A5B88: @ 81A5B88 strh r1, [r0] ldr r0, =0x020375f0 strh r5, [r0] - b _081A5BD6 + b @081A5BD6 .align 2, 0 .pool -_081A5BD0: +@081A5BD0: ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] -_081A5BD6: +@081A5BD6: pop {r4,r5} pop {r0} bx r0 @@ -814515,7 +814515,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 @@ -814528,7 +814528,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} @@ -814675,7 +814675,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} @@ -814816,7 +814816,7 @@ sub_81A5D44: @ 81A5D44 thumb_func_end sub_81A5D44 thumb_func_start sub_81A5E74 -sub_81A5E74: @ 81A5E74 +sub_81A5E74: ; 81A5E74 push {lr} ldr r1, =0x08612120 ldr r0, =0x020375e0 @@ -814832,7 +814832,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] @@ -814879,7 +814879,7 @@ sub_81A5E94: @ 81A5E94 ldr r0, [r0] ands r3, r0 cmp r3, 0 - bne _081A5F0A + bne @081A5F0A lsls r1, r7, 1 lsls r0, r6, 2 adds r1, r0 @@ -814891,7 +814891,7 @@ sub_81A5E94: @ 81A5E94 adds r0, r4, r2 adds r0, r1 strh r3, [r0] -_081A5F0A: +@081A5F0A: ldr r1, =0x03001288 movs r0, 0 strb r0, [r1] @@ -814901,7 +814901,7 @@ _081A5F0A: lsls r4, 4 ldr r0, =0x0000ffff adds r3, r0, 0 -_081A5F1C: +@081A5F1C: ldr r1, [r5] lsls r0, r2, 1 adds r0, r2 @@ -814915,12 +814915,12 @@ _081A5F1C: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x5 - bls _081A5F1C + bls @081A5F1C movs r2, 0 ldr r4, =0x03006298 ldr r1, =0x0000ffff adds r3, r1, 0 -_081A5F40: +@081A5F40: lsls r0, r2, 1 adds r0, r4 ldrh r1, [r0] @@ -814930,7 +814930,7 @@ _081A5F40: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x2 - bls _081A5F40 + bls @081A5F40 ldr r0, [r6] movs r1, 0x4 ldrsb r1, [r0, r1] @@ -814951,7 +814951,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] @@ -814967,29 +814967,29 @@ sub_81A5FA8: @ 81A5FA8 ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x2 - beq _081A6000 + beq @081A6000 cmp r0, 0x2 - bgt _081A5FE4 + bgt @081A5FE4 cmp r0, 0x1 - beq _081A5FEA - b _081A6044 + beq @081A5FEA + b @081A6044 .align 2, 0 .pool -_081A5FE4: +@081A5FE4: cmp r0, 0x3 - beq _081A6030 - b _081A6044 -_081A5FEA: + beq @081A6030 + b @081A6044 +@081A5FEA: ldr r3, =0x020375f0 ldr r0, [r7] lsls r1, r6, 1 lsls r2, r5, 2 adds r1, r2 ldr r2, =0x00000de2 - b _081A603C + b @081A603C .align 2, 0 .pool -_081A6000: +@081A6000: ldr r4, =0x020375f0 ldr r2, [r7] ldr r0, =0x00000cdc @@ -815006,22 +815006,22 @@ _081A6000: orrs r0, r1 lsrs r0, 31 strh r0, [r4] - b _081A6044 + b @081A6044 .align 2, 0 .pool -_081A6030: +@081A6030: ldr r3, =0x020375f0 ldr r0, [r7] lsls r1, r6, 1 lsls r2, r5, 2 adds r1, r2 ldr r2, =0x00000df2 -_081A603C: +@081A603C: adds r0, r2 adds r0, r1 ldrh r0, [r0] strh r0, [r3] -_081A6044: +@081A6044: pop {r4-r7} pop {r0} bx r0 @@ -815030,7 +815030,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] @@ -815046,19 +815046,19 @@ sub_81A6054: @ 81A6054 ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x2 - beq _081A60B4 + beq @081A60B4 cmp r0, 0x2 - bgt _081A6090 + bgt @081A6090 cmp r0, 0x1 - beq _081A6096 - b _081A6128 + beq @081A6096 + b @081A6128 .align 2, 0 .pool -_081A6090: +@081A6090: cmp r0, 0x3 - beq _081A6108 - b _081A6128 -_081A6096: + beq @081A6108 + b @081A6128 +@081A6096: ldr r2, [r6] lsls r0, r5, 1 lsls r1, r4, 2 @@ -815069,14 +815069,14 @@ _081A6096: ldr r0, =0x020375e4 ldrh r0, [r0] strh r0, [r2] - b _081A6128 + b @081A6128 .align 2, 0 .pool -_081A60B4: +@081A60B4: ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0 - beq _081A60E4 + beq @081A60E4 ldr r2, [r6] ldr r0, =0x00000cdc adds r2, r0 @@ -815089,10 +815089,10 @@ _081A60B4: ldr r1, [r1] orrs r0, r1 str r0, [r2] - b _081A6128 + b @081A6128 .align 2, 0 .pool -_081A60E4: +@081A60E4: ldr r2, [r6] ldr r1, =0x00000cdc adds r2, r1 @@ -815105,14 +815105,14 @@ _081A60E4: ldr r1, [r1] ands r0, r1 str r0, [r2] - b _081A6128 + b @081A6128 .align 2, 0 .pool -_081A6108: +@081A6108: ldr r3, =0x03001288 ldrb r0, [r3] cmp r0, 0x1 - bne _081A6128 + bne @081A6128 ldr r2, [r6] lsls r0, r5, 1 lsls r1, r4, 2 @@ -815125,7 +815125,7 @@ _081A6108: movs r1, 0 strh r0, [r2] strb r1, [r3] -_081A6128: +@081A6128: pop {r4-r6} pop {r0} bx r0 @@ -815134,7 +815134,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] @@ -815163,17 +815163,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 @@ -815182,7 +815182,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} @@ -815190,7 +815190,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] @@ -815200,7 +815200,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 @@ -815236,7 +815236,7 @@ sub_81A61B0: @ 81A61B0 lsls r0, 24 str r0, [sp, 0x20] mov r8, r0 -_081A61FA: +@081A61FA: ldr r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -815253,49 +815253,49 @@ _081A61FA: str r6, [sp, 0x1C] ldrh r0, [r0] cmp r7, r0 - bge _081A6244 + bge @081A6244 ldr r2, =0x00000cb4 adds r0, r1, r2 ldrh r0, [r0] ldr r6, =0x03005d90 cmp r0, r3 - beq _081A6244 + beq @081A6244 ldr r1, [r6] ldr r6, =0x00000cb2 adds r0, r1, r6 ldrh r2, [r0] ldr r0, =0x00000cb4 adds r1, r0 -_081A6236: +@081A6236: adds r1, 0x2 adds r7, 0x1 cmp r7, r2 - bge _081A6244 + bge @081A6244 ldrh r0, [r1] cmp r0, r3 - bne _081A6236 -_081A6244: + bne @081A6236 +@081A6244: ldr r0, [r4] ldr r1, =0x00000cb2 adds r0, r1 ldr r6, =0x03005d90 ldrh r0, [r0] cmp r7, r0 - bne _081A61FA + bne @081A61FA ldr r0, =0x02038bca strh r3, [r0] ldr r2, [r6] adds r1, r2, r1 ldrh r0, [r1] cmp r0, 0x5 - bhi _081A626C + bhi @081A626C adds r1, r0, 0 lsls r1, 1 ldr r4, =0x00000cb4 adds r0, r2, r4 adds r0, r1 strh r3, [r0] -_081A626C: +@081A626C: movs r7, 0 mov r10, sp movs r6, 0 @@ -815303,7 +815303,7 @@ _081A626C: str r6, [sp, 0x14] add r6, sp str r6, [sp, 0x18] -_081A627A: +@081A627A: ldr r1, [sp, 0x1C] lsrs r0, r1, 24 ldr r2, [sp, 0x20] @@ -815319,13 +815319,13 @@ _081A627A: adds r0, r1, r2 ldrh r0, [r0] cmp r0, 0xC9 - beq _081A636E + beq @081A636E movs r3, 0 ldr r6, =0x03005d90 mov r8, r1 adds r5, r0, 0 ldr r1, [r6] -_081A62A6: +@081A62A6: movs r4, 0xE7 lsls r4, 4 adds r0, r1, r4 @@ -815334,53 +815334,53 @@ _081A62A6: adds r0, r2 ldrh r0, [r0] cmp r5, r0 - beq _081A62C0 + beq @081A62C0 adds r1, 0xC adds r3, 0x1 cmp r3, 0x5 - ble _081A62A6 -_081A62C0: + ble @081A62A6 +@081A62C0: cmp r3, 0x6 - bne _081A636E + bne @081A636E ldr r6, [sp, 0x10] cmp r6, 0 - bne _081A62D0 + bne @081A62D0 ldr r0, =0x00000351 cmp r9, r0 - bhi _081A636E -_081A62D0: + bhi @081A636E +@081A62D0: movs r2, 0 adds r4, r2, r7 cmp r2, r4 - bge _081A6302 + bge @081A6302 ldr r1, [sp, 0x18] ldrh r0, [r1] cmp r0, r5 - beq _081A6302 + beq @081A6302 adds r6, r4, 0 ldr r3, =0x0203bc8c mov r12, r3 mov r5, r8 ldr r3, [sp, 0x14] add r3, sp -_081A62EC: +@081A62EC: adds r3, 0x2 adds r2, 0x1 cmp r2, r6 - bge _081A6302 + bge @081A6302 mov r1, r12 ldr r0, [r1] adds r0, r5, r0 ldrh r1, [r3] ldrh r0, [r0] cmp r1, r0 - bne _081A62EC -_081A6302: + bne @081A62EC +@081A6302: cmp r2, r4 - bne _081A636E + bne @081A636E movs r2, 0 cmp r2, r4 - bge _081A633E + bge @081A633E ldr r3, =0x085cecb0 mov r12, r3 add r0, sp, 0x8 @@ -815389,10 +815389,10 @@ _081A6302: mov r0, r8 str r0, [sp, 0x24] adds r5, r4, 0 -_081A631C: +@081A631C: ldrh r1, [r3] cmp r1, 0 - beq _081A6336 + beq @081A6336 ldr r6, =0x0203bc8c ldr r0, [r6] ldr r6, [sp, 0x24] @@ -815402,15 +815402,15 @@ _081A631C: add r0, r12 ldrh r0, [r0] cmp r1, r0 - beq _081A633E -_081A6336: + beq @081A633E +@081A6336: adds r3, 0x2 adds r2, 0x1 cmp r2, r5 - blt _081A631C -_081A633E: + blt @081A631C +@081A633E: cmp r2, r4 - bne _081A636E + bne @081A636E lsls r4, r7, 1 ldr r0, =0x0203bc8c ldr r1, [r0] @@ -815433,9 +815433,9 @@ _081A633E: movs r4, 0x2 add r10, r4 adds r7, 0x1 -_081A636E: +@081A636E: cmp r7, 0x3 - bne _081A627A + bne @081A627A add sp, 0x28 pop {r3-r5} mov r8, r3 @@ -815449,7 +815449,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] @@ -815462,7 +815462,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} @@ -815474,21 +815474,21 @@ sub_81A63CC: @ 81A63CC movs r0, 0x3 ands r0, r1 cmp r0, 0x2 - beq _081A63FC + beq @081A63FC ldr r1, =0x0203bc8c ldr r0, =0x085d97bc - b _081A6400 + b @081A6400 .align 2, 0 .pool -_081A63FC: +@081A63FC: ldr r1, =0x0203bc8c ldr r0, =0x085de02c -_081A6400: +@081A6400: str r0, [r1] movs r7, 0 ldr r2, =0x03005d90 mov r8, r2 -_081A6408: +@081A6408: mov r0, r8 ldr r1, [r0] adds r0, r7, 0x3 @@ -815555,7 +815555,7 @@ _081A6408: lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x2 - bls _081A6408 + bls @081A6408 pop {r3} mov r8, r3 pop {r4-r7} @@ -815566,7 +815566,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 @@ -815582,16 +815582,16 @@ sub_81A64C4: @ 81A64C4 adds r0, r3, 0 ands r0, r1 cmp r0, 0x2 - bne _081A6500 + bne @081A6500 ldr r1, =0x0203bc8c ldr r0, =0x085de02c str r0, [r1] movs r2, 0x1E str r2, [sp, 0x14] - b _081A6518 + b @081A6518 .align 2, 0 .pool -_081A6500: +@081A6500: ldr r1, =0x0203bc8c ldr r0, =0x085d97bc str r0, [r1] @@ -815601,16 +815601,16 @@ _081A6500: movs r4, 0x32 str r4, [sp, 0x14] cmp r0, 0 - beq _081A6518 + beq @081A6518 movs r5, 0x64 str r5, [sp, 0x14] -_081A6518: +@081A6518: ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x1 - bls _081A6522 - b _081A666C -_081A6522: + bls @081A6522 + b @081A666C +@081A6522: bl zero_player_party_data movs r0, 0 mov r8, r0 @@ -815619,7 +815619,7 @@ _081A6522: str r1, [sp, 0x1C] ldr r2, =0x0203bc8c mov r9, r2 -_081A6534: +@081A6534: ldr r4, =0x03005d90 ldr r2, [r4] mov r5, r8 @@ -815668,18 +815668,18 @@ _081A6534: adds r5, 0x1 str r5, [sp, 0x18] movs r5, 0x5 -_081A6596: +@081A6596: adds r0, r4, 0 movs r2, 0x1 ands r0, r2 cmp r0, 0 - beq _081A65A2 + beq @081A65A2 adds r1, 0x1 -_081A65A2: +@081A65A2: lsrs r4, 1 subs r5, 0x1 cmp r5, 0 - bge _081A6596 + bge @081A6596 movs r0, 0xFF lsls r0, 1 bl __divsi3 @@ -815692,14 +815692,14 @@ _081A65A2: mov r6, r8 muls r6, r0 ldr r3, =0x020244ec -_081A65C4: +@081A65C4: mov r1, r9 ldr r0, [r1] adds r0, r7, r0 ldrb r0, [r0, 0xB] ands r0, r4 cmp r0, 0 - beq _081A65E2 + beq @081A65E2 adds r1, r5, 0 adds r1, 0x1A adds r0, r6, r3 @@ -815707,12 +815707,12 @@ _081A65C4: str r3, [sp, 0x20] bl pokemon_setattr ldr r3, [sp, 0x20] -_081A65E2: +@081A65E2: lsls r0, r4, 25 lsrs r4, r0, 24 adds r5, 0x1 cmp r5, 0x5 - ble _081A65C4 + ble @081A65C4 movs r2, 0x64 mov r4, r8 muls r4, r2 @@ -815723,7 +815723,7 @@ _081A65E2: ldr r1, [sp, 0x1C] strb r0, [r1] movs r6, 0 -_081A6602: +@081A6602: mov r2, r9 ldr r0, [r2] adds r0, r7, r0 @@ -815737,7 +815737,7 @@ _081A6602: bl sub_81A7024 adds r6, 0x1 cmp r6, 0x3 - ble _081A6602 + ble @081A6602 movs r5, 0x64 mov r4, r8 muls r4, r5 @@ -815771,22 +815771,22 @@ _081A6602: ldr r1, [sp, 0x18] mov r8, r1 cmp r1, 0x2 - bgt _081A666C - b _081A6534 -_081A666C: + bgt @081A666C + b @081A6534 +@081A666C: ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0 - beq _081A667A + beq @081A667A cmp r0, 0x2 - beq _081A667A - b _081A67AE -_081A667A: + beq @081A667A + b @081A67AE +@081A667A: movs r2, 0 mov r8, r2 ldr r4, =0x0203bc8c mov r9, r4 -_081A6682: +@081A6682: ldr r5, =0x03005d90 ldr r3, [r5] mov r0, r8 @@ -815837,18 +815837,18 @@ _081A6682: adds r0, 0x1 str r0, [sp, 0x18] movs r5, 0x5 -_081A66E8: +@081A66E8: adds r0, r4, 0 movs r2, 0x1 ands r0, r2 cmp r0, 0 - beq _081A66F4 + beq @081A66F4 adds r1, 0x1 -_081A66F4: +@081A66F4: lsrs r4, 1 subs r5, 0x1 cmp r5, 0 - bge _081A66E8 + bge @081A66E8 add r4, sp, 0x10 movs r0, 0xFF lsls r0, 1 @@ -815861,14 +815861,14 @@ _081A66F4: mov r6, r8 muls r6, r0 ldr r3, =0x02024744 -_081A6716: +@081A6716: mov r1, r9 ldr r0, [r1] adds r0, r7, r0 ldrb r0, [r0, 0xB] ands r0, r4 cmp r0, 0 - beq _081A6734 + beq @081A6734 adds r1, r5, 0 adds r1, 0x1A adds r0, r6, r3 @@ -815876,12 +815876,12 @@ _081A6716: str r3, [sp, 0x20] bl pokemon_setattr ldr r3, [sp, 0x20] -_081A6734: +@081A6734: lsls r0, r4, 25 lsrs r4, r0, 24 adds r5, 0x1 cmp r5, 0x5 - ble _081A6716 + ble @081A6716 movs r2, 0x64 mov r4, r8 muls r4, r2 @@ -815889,7 +815889,7 @@ _081A6734: adds r0, r4, r5 bl pokemon_calc_effective_stats movs r6, 0 -_081A674E: +@081A674E: mov r1, r9 ldr r0, [r1] adds r0, r7, r0 @@ -815903,7 +815903,7 @@ _081A674E: bl sub_81A7024 adds r6, 0x1 cmp r6, 0x3 - ble _081A674E + ble @081A674E movs r2, 0x64 mov r4, r8 muls r4, r2 @@ -815933,9 +815933,9 @@ _081A674E: ldr r0, [sp, 0x18] mov r8, r0 cmp r0, 0x2 - bgt _081A67AE - b _081A6682 -_081A67AE: + bgt @081A67AE + b @081A6682 +@081A67AE: add sp, 0x24 pop {r3-r5} mov r8, r3 @@ -815949,7 +815949,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 @@ -815973,7 +815973,7 @@ sub_81A67EC: @ 81A67EC mov r0, sp movs r4, 0x5 mov r8, r4 -_081A681A: +@081A681A: strh r2, [r0] strh r2, [r1] strh r2, [r3] @@ -815985,7 +815985,7 @@ _081A681A: add r8, r5 mov r4, r8 cmp r4, 0 - bge _081A681A + bge @081A681A mov r5, r9 ldr r0, [r5] ldr r7, =0x00000ca9 @@ -816016,9 +816016,9 @@ _081A681A: lsrs r0, 16 movs r2, 0 cmp r0, 0x1 - bne _081A6878 + bne @081A6878 movs r2, 0x1 -_081A6878: +@081A6878: ldr r1, =0x0203bc8c ldr r0, =0x085d97bc str r0, [r1] @@ -816029,16 +816029,16 @@ _081A6878: movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _081A68B4 + beq @081A68B4 movs r4, 0x1 str r4, [sp, 0x28] - b _081A68B8 + b @081A68B8 .align 2, 0 .pool -_081A68B4: +@081A68B4: movs r5, 0 str r5, [sp, 0x28] -_081A68B8: +@081A68B8: adds r0, r2, 0 ldr r1, [sp, 0x28] bl sub_81A6F70 @@ -816057,19 +816057,19 @@ _081A68B8: ldr r5, [sp, 0x38] adds r5, r4 str r5, [sp, 0x34] -_081A68DE: +@081A68DE: ldr r0, [sp, 0x2C] cmp r8, r0 - bge _081A68EC + bge @081A68EC ldr r0, [sp, 0x28] ldr r1, [sp, 0x24] movs r2, 0x1 - b _081A68F2 -_081A68EC: + b @081A68F2 +@081A68EC: ldr r0, [sp, 0x28] ldr r1, [sp, 0x24] movs r2, 0 -_081A68F2: +@081A68F2: bl sub_81A6EF0 lsls r0, 16 lsrs r7, r0, 16 @@ -816080,59 +816080,59 @@ _081A68F2: ldrh r1, [r4] mov r9, r2 cmp r1, 0xC9 - beq _081A69E2 + beq @081A69E2 movs r3, 0 mov r2, r8 adds r6, r3, r2 cmp r3, r6 - bge _081A6950 + bge @081A6950 ldr r5, [sp, 0x34] ldrh r0, [r5] cmp r0, r7 - beq _081A6950 + beq @081A6950 mov r12, r4 adds r2, r1, 0 lsls r4, r3, 1 ldr r1, [sp, 0x30] add r1, sp str r6, [sp, 0x48] -_081A6928: +@081A6928: ldrh r0, [r1] cmp r0, r2 - bne _081A693A + bne @081A693A mov r0, r10 cmp r0, 0 - bne _081A6950 + bne @081A6950 mov r5, r12 ldrh r5, [r5] mov r10, r5 -_081A693A: +@081A693A: adds r4, 0x2 adds r1, 0x2 adds r3, 0x1 ldr r0, [sp, 0x48] cmp r3, r0 - bge _081A6950 + bge @081A6950 ldr r5, [sp, 0x38] adds r0, r5, r4 ldrh r0, [r0] cmp r0, r7 - bne _081A6928 -_081A6950: + bne @081A6928 +@081A6950: cmp r3, r6 - bne _081A69E2 + bne @081A69E2 movs r3, 0 cmp r3, r6 - bge _081A699C + bge @081A699C ldr r0, =0x085cecb0 mov r12, r0 ldr r1, [sp, 0x30] ldr r2, [sp, 0x3C] adds r5, r1, r2 -_081A6964: +@081A6964: ldrh r4, [r5] cmp r4, 0 - beq _081A6994 + beq @081A6994 ldr r1, =0x0203bc8c ldr r0, [r1] mov r2, r9 @@ -816142,23 +816142,23 @@ _081A6964: add r0, r12 ldrh r0, [r0] cmp r4, r0 - bne _081A6994 + bne @081A6994 ldrh r0, [r1] cmp r0, r10 - bne _081A699C + bne @081A699C movs r4, 0 mov r10, r4 - b _081A699C + b @081A699C .align 2, 0 .pool -_081A6994: +@081A6994: adds r5, 0x2 adds r3, 0x1 cmp r3, r6 - blt _081A6964 -_081A699C: + blt @081A6964 +@081A699C: cmp r3, r6 - bne _081A69E2 + bne @081A69E2 ldr r0, =0x03005d90 ldr r1, [r0] mov r5, r8 @@ -816192,12 +816192,12 @@ _081A699C: str r4, [sp, 0x44] movs r1, 0x1 add r8, r1 -_081A69E2: +@081A69E2: mov r2, r8 cmp r2, 0x6 - beq _081A69EA - b _081A68DE -_081A69EA: + beq @081A69EA + b @081A68DE +@081A69EA: add sp, 0x4C pop {r3-r5} mov r8, r3 @@ -816211,7 +816211,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} @@ -816223,7 +816223,7 @@ sub_81A6A08: @ 81A6A08 add r5, sp, 0x14 ldr r7, =0x020375f0 movs r1, 0 -_081A6A1E: +@081A6A1E: mov r2, sp adds r0, r2, r4 strb r1, [r0] @@ -816231,7 +816231,7 @@ _081A6A1E: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x11 - bls _081A6A1E + bls @081A6A1E movs r4, 0 ldr r0, =0x03006298 mov r8, r0 @@ -816239,7 +816239,7 @@ _081A6A1E: ldr r6, [r0] ldr r1, =0x083203cc mov r12, r1 -_081A6A3C: +@081A6A3C: lsls r0, r4, 1 add r0, r8 ldrh r0, [r0] @@ -816259,25 +816259,25 @@ _081A6A3C: strb r0, [r1] ldrb r1, [r3, 0x7] cmp r2, r1 - beq _081A6A70 + beq @081A6A70 ldrb r0, [r3, 0x7] mov r2, sp adds r1, r2, r0 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_081A6A70: +@081A6A70: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _081A6A3C + bls @081A6A3C movs r0, 0 strb r0, [r5] strb r0, [r5, 0x1] movs r4, 0x1 adds r3, r5, 0 -_081A6A84: +@081A6A84: ldrb r0, [r3] add r0, sp mov r2, sp @@ -816285,41 +816285,41 @@ _081A6A84: ldrb r2, [r0] ldrb r0, [r1] cmp r2, r0 - bcs _081A6AAC + bcs @081A6AAC strb r4, [r5] - b _081A6AB2 + b @081A6AB2 .align 2, 0 .pool -_081A6AAC: +@081A6AAC: cmp r2, r0 - bne _081A6AB2 + bne @081A6AB2 strb r4, [r3, 0x1] -_081A6AB2: +@081A6AB2: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x11 - bls _081A6A84 + bls @081A6A84 ldrb r1, [r5] mov r4, sp adds r0, r4, r1 ldrb r2, [r0] cmp r2, 0 - beq _081A6ADA + beq @081A6ADA ldrb r3, [r5, 0x1] adds r0, r4, r3 ldrb r0, [r0] cmp r2, r0 - bhi _081A6AD6 + bhi @081A6AD6 cmp r1, r3 - bne _081A6ADA -_081A6AD6: + bne @081A6ADA +@081A6AD6: strh r1, [r7] - b _081A6ADE -_081A6ADA: + b @081A6ADE +@081A6ADA: movs r0, 0x12 strh r0, [r7] -_081A6ADE: +@081A6ADE: add sp, 0x18 pop {r3} mov r8, r3 @@ -816329,7 +816329,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 @@ -816338,7 +816338,7 @@ sub_81A6AEC: @ 81A6AEC str r0, [r1] movs r4, 0 movs r1, 0 -_081A6AFC: +@081A6AFC: mov r2, sp adds r0, r2, r4 strb r1, [r0] @@ -816346,15 +816346,15 @@ _081A6AFC: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bls _081A6AFC + bls @081A6AFC movs r4, 0 -_081A6B0E: +@081A6B0E: ldr r1, =0x03006298 lsls r0, r4, 1 adds r0, r1 ldrh r6, [r0] movs r5, 0 -_081A6B18: +@081A6B18: ldr r0, =0x0203bc8c ldr r1, [r0] lsls r0, r6, 4 @@ -816375,12 +816375,12 @@ _081A6B18: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _081A6B18 + bls @081A6B18 adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _081A6B0E + bls @081A6B0E ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] @@ -816388,7 +816388,7 @@ _081A6B18: adds r5, r1, 0 ldr r3, =0x08611fc0 adds r2, r5, 0 -_081A6B5C: +@081A6B5C: mov r1, sp adds r0, r1, r4 subs r1, r4, 0x1 @@ -816396,22 +816396,22 @@ _081A6B5C: ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bcc _081A6B74 + bcc @081A6B74 strh r4, [r2] adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 -_081A6B74: +@081A6B74: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bls _081A6B5C + bls @081A6B5C cmp r7, 0x2 - bls _081A6B86 + bls @081A6B86 movs r0, 0x8 strh r0, [r5] -_081A6B86: +@081A6B86: add sp, 0x8 pop {r4-r7} pop {r0} @@ -816421,13 +816421,13 @@ _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 movs r2, 0 ldr r6, =0x08612104 -_081A6BAE: +@081A6BAE: movs r3, 0 lsls r0, r2, 2 adds r0, r6 @@ -816435,20 +816435,20 @@ _081A6BAE: ldrh r0, [r1] adds r4, r2, 0x1 cmp r0, 0 - beq _081A6BE4 + beq @081A6BE4 lsls r0, r4, 24 lsrs r2, r0, 24 -_081A6BC2: +@081A6BC2: lsls r0, r3, 1 adds r0, r1 ldrh r0, [r0] cmp r0, r5 - bne _081A6BD4 + bne @081A6BD4 adds r0, r2, 0 - b _081A6BEE + b @081A6BEE .align 2, 0 .pool -_081A6BD4: +@081A6BD4: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 @@ -816456,21 +816456,21 @@ _081A6BD4: adds r0, r1 ldrh r0, [r0] cmp r0, 0 - bne _081A6BC2 -_081A6BE4: + bne @081A6BC2 +@081A6BE4: lsls r0, r4, 24 lsrs r2, r0, 24 cmp r2, 0x6 - bls _081A6BAE + bls @081A6BAE movs r0, 0 -_081A6BEE: +@081A6BEE: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_81A6BA4 thumb_func_start sub_81A6BF4 -sub_81A6BF4: @ 81A6BF4 +sub_81A6BF4: ; 81A6BF4 push {lr} movs r2, 0 ldr r1, =0x02037318 @@ -816481,9 +816481,9 @@ sub_81A6BF4: @ 81A6BF4 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bhi _081A6C0C + bhi @081A6C0C movs r2, 0x1 -_081A6C0C: +@081A6C0C: adds r0, r2, 0 pop {r1} bx r1 @@ -816492,7 +816492,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] @@ -816502,19 +816502,19 @@ sub_81A6C1C: @ 81A6C1C movs r0, 0x3 ands r0, r1 cmp r0, 0x2 - beq _081A6C48 + beq @081A6C48 ldr r1, =0x0203bc8c ldr r0, =0x085d97bc - b _081A6C4C + b @081A6C4C .align 2, 0 .pool -_081A6C48: +@081A6C48: ldr r1, =0x0203bc8c ldr r0, =0x085de02c -_081A6C4C: +@081A6C4C: str r0, [r1] movs r4, 0 -_081A6C50: +@081A6C50: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -816543,7 +816543,7 @@ _081A6C50: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _081A6C50 + bls @081A6C50 pop {r4} pop {r0} bx r0 @@ -816552,7 +816552,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 @@ -816562,9 +816562,9 @@ sub_81A6CA8: @ 81A6CA8 lsrs r2, 31 lsrs r1, r0, 24 cmp r1, 0x8 - bls _081A6CBE + bls @081A6CBE movs r1, 0x7 -_081A6CBE: +@081A6CBE: ldr r0, =0x08612184 lsls r1, 1 adds r1, r2, r1 @@ -816577,7 +816577,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 @@ -816636,7 +816636,7 @@ sub_81A6CD0: @ 81A6CD0 lsls r0, 24 orrs r4, r0 str r4, [sp, 0x28] -_081A6D4C: +@081A6D4C: ldr r0, [sp, 0x2C] ldr r1, [sp, 0x30] movs r2, 0 @@ -816649,17 +816649,17 @@ _081A6D4C: adds r0, r1 ldrh r0, [r0] cmp r0, 0xC9 - bne _081A6D6A - b _081A6EB8 -_081A6D6A: + bne @081A6D6A + b @081A6EB8 +@081A6D6A: ldr r0, [sp, 0x20] cmp r0, 0x32 - bne _081A6D78 + bne @081A6D78 ldr r0, =0x00000351 cmp r5, r0 - bls _081A6D78 - b _081A6EB8 -_081A6D78: + bls @081A6D78 + b @081A6EB8 +@081A6D78: movs r2, 0 ldr r1, =0x03005d90 ldr r0, [r1] @@ -816668,28 +816668,28 @@ _081A6D78: adds r0, r3 ldrh r0, [r0] cmp r5, r0 - beq _081A6DA2 + beq @081A6DA2 adds r4, r1, 0 movs r1, 0 -_081A6D8E: +@081A6D8E: adds r1, 0xC adds r2, 0x1 cmp r2, 0x5 - bgt _081A6DA2 + bgt @081A6DA2 ldr r0, [r4] adds r0, r1 adds r0, r3 ldrh r0, [r0] cmp r5, r0 - bne _081A6D8E -_081A6DA2: + bne @081A6D8E +@081A6DA2: cmp r2, 0x6 - beq _081A6DA8 - b _081A6EB8 -_081A6DA8: + beq @081A6DA8 + b @081A6EB8 +@081A6DA8: movs r4, 0 cmp r4, r9 - bge _081A6DDC + bge @081A6DDC add r2, sp, 0xC ldr r7, =0x0203bc8c ldr r0, [r7] @@ -816699,35 +816699,35 @@ _081A6DA8: adds r7, r1, 0 ldrh r0, [r0] cmp r2, r0 - beq _081A6DDC + beq @081A6DDC ldr r6, =0x0203bc8c adds r3, r7, 0 add r2, sp, 0xC -_081A6DC8: +@081A6DC8: adds r2, 0x2 adds r4, 0x1 cmp r4, r9 - bge _081A6DDC + bge @081A6DDC ldr r0, [r6] adds r0, r3, r0 ldrh r1, [r2] ldrh r0, [r0] cmp r1, r0 - bne _081A6DC8 -_081A6DDC: + bne @081A6DC8 +@081A6DDC: cmp r4, r9 - bne _081A6EB8 + bne @081A6EB8 movs r4, 0 cmp r4, r9 - bge _081A6E0C + bge @081A6E0C ldr r7, =0x085cecb0 ldr r6, =0x0203bc8c add r2, sp, 0x14 lsls r3, r5, 4 -_081A6DEE: +@081A6DEE: ldrh r1, [r2] cmp r1, 0 - beq _081A6E04 + beq @081A6E04 ldr r0, [r6] adds r0, r3, r0 ldrb r0, [r0, 0xA] @@ -816735,15 +816735,15 @@ _081A6DEE: adds r0, r7 ldrh r0, [r0] cmp r1, r0 - beq _081A6E0C -_081A6E04: + beq @081A6E0C +@081A6E04: adds r2, 0x2 adds r4, 0x1 cmp r4, r9 - blt _081A6DEE -_081A6E0C: + blt @081A6DEE +@081A6E0C: cmp r4, r9 - bne _081A6EB8 + bne @081A6EB8 mov r0, r9 lsls r2, r0, 1 mov r1, sp @@ -816790,7 +816790,7 @@ _081A6E0C: movs r0, 0x1 add r0, r9 mov r8, r0 -_081A6E6E: +@081A6E6E: ldr r1, =0x0203bc8c ldr r0, [r1] adds r0, r7, r0 @@ -816804,7 +816804,7 @@ _081A6E6E: bl sub_81A7024 adds r4, 0x1 cmp r4, 0x3 - ble _081A6E6E + ble @081A6E6E movs r0, 0x64 mov r4, r9 muls r4, r0 @@ -816825,12 +816825,12 @@ _081A6E6E: movs r1, 0xC bl pokemon_setattr mov r9, r8 -_081A6EB8: +@081A6EB8: mov r3, r9 cmp r3, 0x3 - beq _081A6EC0 - b _081A6D4C -_081A6EC0: + beq @081A6EC0 + b @081A6D4C +@081A6EC0: add sp, 0x34 pop {r3-r5} mov r8, r3 @@ -816844,7 +816844,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 @@ -816859,30 +816859,30 @@ sub_81A6EF0: @ 81A6EF0 ands r1, r4 adds r4, r1, 0 cmp r3, 0x6 - bhi _081A6F2C + bhi @081A6F2C cmp r2, 0 - beq _081A6F20 + beq @081A6F20 ldr r2, =0x08612194 adds r1, r3 adds r1, 0x1 - b _081A6F38 + b @081A6F38 .align 2, 0 .pool -_081A6F20: +@081A6F20: ldr r2, =0x08612194 adds r1, r3 - b _081A6F38 + b @081A6F38 .align 2, 0 .pool -_081A6F2C: +@081A6F2C: adds r1, r3, 0 cmp r1, 0x7 - beq _081A6F34 + beq @081A6F34 movs r1, 0x7 -_081A6F34: +@081A6F34: ldr r2, =0x08612194 adds r1, r4, r1 -_081A6F38: +@081A6F38: lsls r1, 2 adds r0, r2, 0x2 adds r0, r1, r0 @@ -816911,7 +816911,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 @@ -816926,21 +816926,21 @@ sub_81A6F70: @ 81A6F70 ldrb r1, [r2] movs r0, 0 cmp r1, 0xE - bls _081A6FA8 + bls @081A6FA8 movs r0, 0x1 cmp r1, 0x15 - bls _081A6FA8 + bls @081A6FA8 movs r0, 0x2 cmp r1, 0x1C - bls _081A6FA8 + bls @081A6FA8 movs r0, 0x3 cmp r1, 0x23 - bls _081A6FA8 + bls @081A6FA8 movs r0, 0x5 cmp r1, 0x2A - bhi _081A6FA8 + bhi @081A6FA8 movs r0, 0x4 -_081A6FA8: +@081A6FA8: pop {r1} bx r1 .align 2, 0 @@ -816948,7 +816948,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] @@ -816958,7 +816958,7 @@ sub_81A6FB4: @ 81A6FB4 lsls r0, 30 lsrs r4, r0, 30 cmp r4, 0x2 - beq _081A6FF8 + beq @081A6FF8 ldr r0, =0x000040ce bl var_get lsls r0, 16 @@ -816978,46 +816978,46 @@ sub_81A6FB4: @ 81A6FB4 ldrh r1, [r0] ldr r0, =0x000003fe cmp r1, r0 - beq _081A7018 + beq @081A7018 cmp r2, 0x1 - bgt _081A7014 -_081A6FF8: + bgt @081A7014 +@081A6FF8: movs r0, 0 - b _081A701E + b @081A701E .align 2, 0 .pool -_081A7014: +@081A7014: cmp r2, 0x3 - ble _081A701C -_081A7018: + ble @081A701C +@081A7018: movs r0, 0x7 - b _081A701E -_081A701C: + b @081A701E +@081A701C: movs r0, 0x1 -_081A701E: +@081A701E: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_81A6FB4 thumb_func_start sub_81A7024 -sub_81A7024: @ 81A7024 +sub_81A7024: ; 81A7024 push {lr} lsls r1, 16 lsls r2, 24 lsrs r2, 24 lsrs r1, 16 cmp r1, 0xD8 - bne _081A7034 + bne @081A7034 movs r1, 0xDA -_081A7034: +@081A7034: bl sub_80691F4 pop {r0} bx r0 thumb_func_end sub_81A7024 thumb_func_start sub_81A703C -sub_81A703C: @ 81A703C +sub_81A703C: ; 81A703C push {lr} ldr r1, =0x086125f8 ldr r0, =0x020375e0 @@ -817033,7 +817033,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 @@ -817045,7 +817045,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 @@ -817060,81 +817060,81 @@ sub_81A7070: @ 81A7070 ldr r0, =0x0300128c ldrb r0, [r0] cmp r0, 0x8 - bhi _081A7132 + bhi @081A7132 lsls r0, 2 - ldr r1, =_081A70AC + ldr r1, =@081A70AC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081A70AC: - .4byte _081A70D0 - .4byte _081A70DA - .4byte _081A70DE - .4byte _081A70E8 - .4byte _081A70FC - .4byte _081A70D6 - .4byte _081A7100 - .4byte _081A7108 - .4byte _081A710E -_081A70D0: +@081A70AC: + .4byte @081A70D0 + .4byte @081A70DA + .4byte @081A70DE + .4byte @081A70E8 + .4byte @081A70FC + .4byte @081A70D6 + .4byte @081A7100 + .4byte @081A7108 + .4byte @081A710E +@081A70D0: movs r0, 0 bl sub_81A82A4 -_081A70D6: +@081A70D6: movs r4, 0 - b _081A711A -_081A70DA: + b @081A711A +@081A70DA: movs r5, 0x1C - b _081A711A -_081A70DE: + b @081A711A +@081A70DE: bl sub_81A7B58 lsls r0, 24 lsrs r5, r0, 24 - b _081A711A -_081A70E8: + b @081A711A +@081A70E8: movs r5, 0x30 ldr r0, =0x0300128d ldrb r0, [r0] movs r7, 0xE1 cmp r0, 0x1 - bne _081A7118 + bne @081A7118 movs r7, 0xE2 - b _081A7118 + b @081A7118 .align 2, 0 .pool -_081A70FC: +@081A70FC: movs r5, 0x30 - b _081A711A -_081A7100: + b @081A711A +@081A7100: movs r0, 0x1 bl sub_81A82A4 - b _081A7114 -_081A7108: + b @081A7114 +@081A7108: bl sub_81A8374 - b _081A70D6 -_081A710E: + b @081A70D6 +@081A710E: movs r0, 0x5 bl sub_81A5030 -_081A7114: +@081A7114: movs r7, 0x1C movs r4, 0 -_081A7118: +@081A7118: movs r6, 0x1 -_081A711A: +@081A711A: cmp r4, 0x1 - bne _081A7126 + bne @081A7126 ldr r0, =0x00004010 adds r1, r5, 0 bl var_set -_081A7126: +@081A7126: cmp r6, 0x1 - bne _081A7132 + bne @081A7132 ldr r0, =0x00004011 adds r1, r7, 0 bl var_set -_081A7132: +@081A7132: pop {r4-r7} pop {r0} bx r0 @@ -817143,7 +817143,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] @@ -817156,32 +817156,32 @@ sub_81A7140: @ 81A7140 ldrh r0, [r0] adds r3, r1, 0 cmp r0, 0x4 - bhi _081A723A + bhi @081A723A lsls r0, 2 - ldr r1, =_081A7174 + ldr r1, =@081A7174 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081A7174: - .4byte _081A7188 - .4byte _081A71A0 - .4byte _081A71C4 - .4byte _081A71E8 - .4byte _081A720C -_081A7188: +@081A7174: + .4byte @081A7188 + .4byte @081A71A0 + .4byte @081A71C4 + .4byte @081A71E8 + .4byte @081A720C +@081A7188: ldr r0, =0x020375f0 ldr r1, [r3] ldr r3, =0x00000e02 adds r1, r3 ldrh r1, [r1] strh r1, [r0] - b _081A723A + b @081A723A .align 2, 0 .pool -_081A71A0: +@081A71A0: ldr r2, =0x020375f0 ldr r1, [r3] ldr r3, =0x00000ca9 @@ -817193,10 +817193,10 @@ _081A71A0: adds r1, r3 adds r1, r0 ldrh r0, [r1] - b _081A7238 + b @081A7238 .align 2, 0 .pool -_081A71C4: +@081A71C4: ldr r2, =0x020375f0 ldr r1, [r3] ldr r3, =0x00000ca9 @@ -817208,10 +817208,10 @@ _081A71C4: adds r1, r3 adds r1, r0 ldrh r0, [r1] - b _081A7238 + b @081A7238 .align 2, 0 .pool -_081A71E8: +@081A71E8: ldr r2, =0x020375f0 ldr r1, [r3] ldr r3, =0x00000ca9 @@ -817223,12 +817223,12 @@ _081A71E8: adds r1, r3 adds r1, r0 ldrh r0, [r1] - b _081A7238 + b @081A7238 .align 2, 0 .pool -_081A720C: +@081A720C: cmp r2, 0 - beq _081A7228 + beq @081A7228 ldr r2, =0x020375f0 ldr r0, [r3] ldr r1, =0x00000cdc @@ -817236,10 +817236,10 @@ _081A720C: ldr r0, [r0] movs r1, 0x80 lsls r1, 4 - b _081A7236 + b @081A7236 .align 2, 0 .pool -_081A7228: +@081A7228: ldr r2, =0x020375f0 ldr r0, [r3] ldr r3, =0x00000cdc @@ -817247,11 +817247,11 @@ _081A7228: ldr r0, [r0] movs r1, 0x80 lsls r1, 3 -_081A7236: +@081A7236: ands r0, r1 -_081A7238: +@081A7238: strh r0, [r2] -_081A723A: +@081A723A: pop {r0} bx r0 .align 2, 0 @@ -817259,7 +817259,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] @@ -817272,41 +817272,41 @@ sub_81A7248: @ 81A7248 ldrh r0, [r0] adds r2, r1, 0 cmp r0, 0x4 - bls _081A7264 - b _081A73AA -_081A7264: + bls @081A7264 + b @081A73AA +@081A7264: lsls r0, 2 - ldr r1, =_081A7280 + ldr r1, =@081A7280 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081A7280: - .4byte _081A7294 - .4byte _081A72AC - .4byte _081A72D8 - .4byte _081A7314 - .4byte _081A7344 -_081A7294: +@081A7280: + .4byte @081A7294 + .4byte @081A72AC + .4byte @081A72D8 + .4byte @081A7314 + .4byte @081A7344 +@081A7294: ldr r0, [r2] ldr r1, =0x020375e4 ldrh r1, [r1] ldr r5, =0x00000e02 adds r0, r5 strh r1, [r0] - b _081A73AA + b @081A73AA .align 2, 0 .pool -_081A72AC: +@081A72AC: ldr r0, =0x020375e4 ldrh r3, [r0] ldr r0, =0x0000270f cmp r3, r0 - bls _081A72B8 - b _081A73AA -_081A72B8: + bls @081A72B8 + b @081A73AA +@081A72B8: ldr r0, [r2] ldr r2, =0x00000ca9 adds r1, r0, r2 @@ -817314,16 +817314,16 @@ _081A72B8: lsls r1, 30 lsrs r1, 29 ldr r5, =0x00000e04 - b _081A732C + b @081A732C .align 2, 0 .pool -_081A72D8: +@081A72D8: ldr r0, =0x020375e4 ldrh r4, [r0] adds r3, r4, 0 ldr r0, =0x0000270f cmp r3, r0 - bhi _081A73AA + bhi @081A73AA ldr r1, [r2] ldr r2, =0x00000ca9 adds r0, r1, r2 @@ -817335,19 +817335,19 @@ _081A72D8: adds r0, r1, r0 ldrh r0, [r0] cmp r0, r3 - bcs _081A73AA + bcs @081A73AA lsrs r0, r2, 29 adds r0, r1, r0 strh r4, [r0] - b _081A73AA + b @081A73AA .align 2, 0 .pool -_081A7314: +@081A7314: ldr r0, =0x020375e4 ldrh r3, [r0] ldr r0, =0x0000270f cmp r3, r0 - bhi _081A73AA + bhi @081A73AA ldr r0, [r2] ldr r2, =0x00000ca9 adds r1, r0, r2 @@ -817355,20 +817355,20 @@ _081A7314: lsls r1, 30 lsrs r1, 29 ldr r5, =0x00000e0c -_081A732C: +@081A732C: adds r0, r5 adds r0, r1 strh r3, [r0] - b _081A73AA + b @081A73AA .align 2, 0 .pool -_081A7344: +@081A7344: cmp r3, 0 - beq _081A737C + beq @081A737C ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0 - beq _081A7368 + beq @081A7368 ldr r0, [r2] ldr r1, =0x00000cdc adds r0, r1 @@ -817376,23 +817376,23 @@ _081A7344: movs r2, 0x80 lsls r2, 4 orrs r1, r2 - b _081A73A8 + b @081A73A8 .align 2, 0 .pool -_081A7368: +@081A7368: ldr r0, [r2] ldr r2, =0x00000cdc adds r0, r2 ldr r1, [r0] ldr r2, =0xfffff7ff - b _081A73A6 + b @081A73A6 .align 2, 0 .pool -_081A737C: +@081A737C: ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0 - beq _081A739C + beq @081A739C ldr r0, [r2] ldr r5, =0x00000cdc adds r0, r5 @@ -817400,20 +817400,20 @@ _081A737C: movs r2, 0x80 lsls r2, 3 orrs r1, r2 - b _081A73A8 + b @081A73A8 .align 2, 0 .pool -_081A739C: +@081A739C: ldr r0, [r2] ldr r1, =0x00000cdc adds r0, r1 ldr r1, [r0] ldr r2, =0xfffffbff -_081A73A6: +@081A73A6: ands r1, r2 -_081A73A8: +@081A73A8: str r1, [r0] -_081A73AA: +@081A73AA: pop {r4,r5} pop {r0} bx r0 @@ -817422,7 +817422,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] @@ -817430,16 +817430,16 @@ sub_81A73B8: @ 81A73B8 adds r0, r1 ldrh r0, [r0] cmp r0, 0xE - bls _081A73DC + bls @081A73DC ldr r1, =0x020375f0 movs r0, 0x1 - b _081A73E0 + b @081A73E0 .align 2, 0 .pool -_081A73DC: +@081A73DC: ldr r1, =0x020375f0 movs r0, 0 -_081A73E0: +@081A73E0: strh r0, [r1] pop {r0} bx r0 @@ -817448,7 +817448,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] @@ -817459,7 +817459,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] @@ -817469,7 +817469,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] @@ -817479,7 +817479,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] @@ -817510,67 +817510,67 @@ 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] cmp r0, 0x20 - beq _081A748E + beq @081A748E cmp r0, 0x20 - bhi _081A7484 + bhi @081A7484 cmp r0, 0x7 - beq _081A74BC + beq @081A74BC cmp r0, 0x10 - beq _081A7498 - b _081A74C2 + beq @081A7498 + b @081A74C2 .align 2, 0 .pool -_081A7484: +@081A7484: cmp r0, 0x40 - beq _081A74B0 + beq @081A74B0 cmp r0, 0x80 - beq _081A74A4 - b _081A74C2 -_081A748E: + beq @081A74A4 + b @081A74C2 +@081A748E: ldr r1, =0x020375f0 movs r0, 0 - b _081A74C0 + b @081A74C0 .align 2, 0 .pool -_081A7498: +@081A7498: ldr r1, =0x020375f0 movs r0, 0x1 - b _081A74C0 + b @081A74C0 .align 2, 0 .pool -_081A74A4: +@081A74A4: ldr r1, =0x020375f0 movs r0, 0x2 - b _081A74C0 + b @081A74C0 .align 2, 0 .pool -_081A74B0: +@081A74B0: ldr r1, =0x020375f0 movs r0, 0x3 - b _081A74C0 + b @081A74C0 .align 2, 0 .pool -_081A74BC: +@081A74BC: ldr r1, =0x020375f0 movs r0, 0x4 -_081A74C0: +@081A74C0: strh r0, [r1] -_081A74C2: +@081A74C2: pop {r0} bx r0 .align 2, 0 @@ -817578,7 +817578,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] @@ -817589,7 +817589,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 @@ -817610,7 +817610,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] @@ -817618,36 +817618,36 @@ sub_81A7508: @ 81A7508 adds r0, r1 ldrh r0, [r0] cmp r0, 0x4 - bhi _081A7538 + bhi @081A7538 ldr r1, =0x0861231c ldr r0, =0x03001294 ldrb r0, [r0] lsls r0, 3 adds r0, r1 ldrb r1, [r0, 0x2] - b _081A7560 + b @081A7560 .align 2, 0 .pool -_081A7538: +@081A7538: cmp r0, 0xA - bhi _081A7554 + bhi @081A7554 ldr r1, =0x0861231c ldr r0, =0x03001294 ldrb r0, [r0] lsls r0, 3 adds r0, r1 ldrb r1, [r0, 0x3] - b _081A7560 + b @081A7560 .align 2, 0 .pool -_081A7554: +@081A7554: ldr r1, =0x0861231c ldr r0, =0x03001294 ldrb r0, [r0] lsls r0, 3 adds r0, r1 ldrb r1, [r0, 0x4] -_081A7560: +@081A7560: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 @@ -817661,7 +817661,7 @@ _081A7560: thumb_func_end sub_81A7508 thumb_func_start sub_81A7580 -sub_81A7580: @ 81A7580 +sub_81A7580: ; 81A7580 push {lr} ldr r0, =sub_81A7EE4 + 1 movs r1, 0x2 @@ -817673,13 +817673,13 @@ 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 movs r4, 0 movs r1, 0 -_081A759E: +@081A759E: mov r2, sp adds r0, r2, r4 strb r1, [r0] @@ -817687,7 +817687,7 @@ _081A759E: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _081A759E + bls @081A759E adds r0, r5, 0 movs r1, 0x3A bl pokemon_getattr @@ -817707,7 +817707,7 @@ _081A759E: lsls r0, 24 lsrs r6, r0, 24 movs r4, 0 -_081A75DA: +@081A75DA: adds r1, r4, 0 adds r1, 0xD adds r0, r5, 0 @@ -817728,7 +817728,7 @@ _081A75DA: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _081A75DA + bls @081A75DA mov r0, sp movs r1, 0 strb r1, [r0] @@ -817746,7 +817746,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 sub_806B6D8 @@ -817754,44 +817754,44 @@ sub_81A7628: @ 81A7628 lsrs r0, 24 movs r1, 0 cmp r4, 0x20 - beq _081A7652 + beq @081A7652 cmp r4, 0x20 - bhi _081A7648 + bhi @081A7648 cmp r4, 0x7 - beq _081A7664 + beq @081A7664 cmp r4, 0x10 - beq _081A7658 - b _081A7674 -_081A7648: + beq @081A7658 + b @081A7674 +@081A7648: cmp r4, 0x40 - beq _081A765E + beq @081A765E cmp r4, 0x80 - beq _081A766E - b _081A7674 -_081A7652: + beq @081A766E + b @081A7674 +@081A7652: cmp r0, 0x28 - bne _081A7674 - b _081A7672 -_081A7658: + bne @081A7674 + b @081A7672 +@081A7658: cmp r0, 0x29 - bne _081A7674 - b _081A7672 -_081A765E: + bne @081A7674 + b @081A7672 +@081A765E: cmp r0, 0x7 - bne _081A7674 - b _081A7672 -_081A7664: + bne @081A7674 + b @081A7672 +@081A7664: cmp r0, 0xF - beq _081A7672 + beq @081A7672 cmp r0, 0x48 - bne _081A7674 - b _081A7672 -_081A766E: + bne @081A7674 + b @081A7672 +@081A766E: cmp r0, 0x11 - bne _081A7674 -_081A7672: + bne @081A7674 +@081A7672: movs r1, 0x1 -_081A7674: +@081A7674: adds r0, r1, 0 pop {r4} pop {r1} @@ -817799,25 +817799,25 @@ _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 movs r3, 0 cmp r1, 0x20 - beq _081A76C4 + beq @081A76C4 cmp r1, 0x20 - bhi _081A7696 + bhi @081A7696 cmp r1, 0x7 - beq _081A771C + beq @081A771C cmp r1, 0x10 - beq _081A7704 - b _081A771C -_081A7696: + beq @081A7704 + b @081A771C +@081A7696: cmp r1, 0x40 - beq _081A76E0 + beq @081A76E0 cmp r1, 0x80 - bne _081A771C + bne @081A771C ldr r1, =0x083203cc lsls r0, r2, 3 subs r0, r2 @@ -817825,18 +817825,18 @@ _081A7696: adds r0, r1 ldrb r2, [r0, 0x6] cmp r2, 0x8 - beq _081A771A + beq @081A771A cmp r2, 0x3 - beq _081A771A + beq @081A771A ldrb r0, [r0, 0x7] cmp r0, 0x8 - beq _081A771A + beq @081A771A cmp r0, 0x3 - bne _081A771C - b _081A771A + bne @081A771C + b @081A771A .align 2, 0 .pool -_081A76C4: +@081A76C4: ldr r0, =0x083203cc lsls r1, r2, 3 subs r1, r2 @@ -817844,14 +817844,14 @@ _081A76C4: adds r1, r0 ldrb r0, [r1, 0x6] cmp r0, 0xF - beq _081A771A + beq @081A771A ldrb r0, [r1, 0x7] cmp r0, 0xF - bne _081A771C - b _081A771A + bne @081A771C + b @081A771A .align 2, 0 .pool -_081A76E0: +@081A76E0: ldr r1, =0x083203cc lsls r0, r2, 3 subs r0, r2 @@ -817859,18 +817859,18 @@ _081A76E0: adds r0, r1 ldrb r2, [r0, 0x6] cmp r2, 0x4 - beq _081A771A + beq @081A771A cmp r2, 0xD - beq _081A771A + beq @081A771A ldrb r0, [r0, 0x7] cmp r0, 0x4 - beq _081A771A + beq @081A771A cmp r0, 0xD - bne _081A771C - b _081A771A + bne @081A771C + b @081A771A .align 2, 0 .pool -_081A7704: +@081A7704: ldr r0, =0x083203cc lsls r1, r2, 3 subs r1, r2 @@ -817878,13 +817878,13 @@ _081A7704: adds r1, r0 ldrb r0, [r1, 0x6] cmp r0, 0xA - beq _081A771A + beq @081A771A ldrb r0, [r1, 0x7] cmp r0, 0xA - bne _081A771C -_081A771A: + bne @081A771C +@081A771A: movs r3, 0x1 -_081A771C: +@081A771C: adds r0, r3, 0 pop {r1} bx r1 @@ -817893,7 +817893,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 @@ -817901,7 +817901,7 @@ sub_81A7728: @ 81A7728 push {r5-r7} sub sp, 0x8 movs r6, 0 -_081A7736: +@081A7736: mov r1, sp adds r0, r1, r6 strb r6, [r0] @@ -817909,10 +817909,10 @@ _081A7736: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x2 - bls _081A7736 + bls @081A7736 movs r4, 0 mov r8, r4 -_081A774A: +@081A774A: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -817940,7 +817940,7 @@ _081A774A: lsrs r0, 24 mov r8, r0 cmp r0, 0x9 - bls _081A774A + bls @081A774A ldr r0, =0x03005d90 ldr r0, [r0] ldr r4, =0x00000cb2 @@ -817949,18 +817949,18 @@ _081A774A: movs r1, 0x1 mov r10, r1 cmp r0, 0x4 - bls _081A77A8 + bls @081A77A8 movs r4, 0x3 mov r10, r4 cmp r0, 0x9 - bhi _081A77A8 + bhi @081A77A8 movs r0, 0x2 mov r10, r0 -_081A77A8: +@081A77A8: movs r1, 0 str r1, [sp, 0x4] ldr r7, =0x03001290 -_081A77AE: +@081A77AE: movs r4, 0 mov r9, r4 bl GenerateRandomNumber @@ -817972,44 +817972,44 @@ _081A77AE: lsrs r0, 24 adds r1, r0, 0 cmp r0, 0x22 - bhi _081A77DC + bhi @081A77DC movs r0, 0x80 - b _081A77FC + b @081A77FC .align 2, 0 .pool -_081A77DC: +@081A77DC: cmp r0, 0x3B - bhi _081A77E4 + bhi @081A77E4 movs r0, 0x20 - b _081A77FC -_081A77E4: + b @081A77FC +@081A77E4: cmp r0, 0x4F - bhi _081A77EC + bhi @081A77EC movs r0, 0x40 - b _081A77FC -_081A77EC: + b @081A77FC +@081A77EC: cmp r1, 0x59 - bhi _081A77FA + bhi @081A77FA movs r0, 0x7 - b _081A77FC -_081A77F4: + b @081A77FC +@081A77F4: movs r0, 0x1 mov r9, r0 - b _081A786E -_081A77FA: + b @081A786E +@081A77FA: movs r0, 0x10 -_081A77FC: +@081A77FC: str r0, [r7] ldr r0, =0x03001290 ldr r0, [r0] ldr r1, [sp, 0x4] cmp r1, r0 - beq _081A7874 + beq @081A7874 str r0, [sp, 0x4] movs r4, 0 mov r8, r4 movs r6, 0 -_081A7810: +@081A7810: mov r1, sp adds r0, r1, r6 ldrb r1, [r0] @@ -818023,12 +818023,12 @@ _081A7810: bl pokemon_ailments_get_primary lsls r0, 24 cmp r0, 0 - bne _081A7860 + bne @081A7860 adds r0, r5, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _081A7860 + beq @081A7860 mov r0, r8 adds r0, 0x1 lsls r0, 24 @@ -818044,74 +818044,74 @@ _081A7810: bl sub_81A767C lsls r0, 24 cmp r0, 0 - beq _081A77F4 -_081A7860: + beq @081A77F4 +@081A7860: cmp r8, r10 - beq _081A786E + beq @081A786E adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x2 - bls _081A7810 -_081A786E: + bls @081A7810 +@081A786E: mov r4, r8 cmp r4, 0 - beq _081A78CC -_081A7874: + beq @081A78CC +@081A7874: mov r0, r9 cmp r0, 0 - beq _081A77AE + beq @081A77AE ldr r0, =0x03001290 ldr r0, [r0] cmp r0, 0x20 - beq _081A7898 + beq @081A7898 cmp r0, 0x20 - bhi _081A78D0 + bhi @081A78D0 cmp r0, 0x7 - beq _081A78D0 + beq @081A78D0 cmp r0, 0x10 - beq _081A78A4 - b _081A78D0 + beq @081A78A4 + b @081A78D0 .align 2, 0 .pool -_081A7898: +@081A7898: ldr r1, =0x0300128d movs r0, 0x1 - b _081A78D4 + b @081A78D4 .align 2, 0 .pool -_081A78A4: +@081A78A4: bl GenerateRandomNumber lsls r0, 16 lsrs r1, r0, 16 movs r2, 0x1 ands r1, r2 cmp r1, 0 - beq _081A78C0 + beq @081A78C0 ldr r0, =0x0300128d strb r2, [r0] - b _081A78D6 + b @081A78D6 .align 2, 0 .pool -_081A78C0: +@081A78C0: ldr r0, =0x0300128d strb r1, [r0] - b _081A78D6 + b @081A78D6 .align 2, 0 .pool -_081A78CC: +@081A78CC: movs r0, 0 - b _081A7956 -_081A78D0: + b @081A7956 +@081A78D0: ldr r1, =0x0300128d movs r0, 0 -_081A78D4: +@081A78D4: strb r0, [r1] -_081A78D6: +@081A78D6: movs r1, 0 mov r8, r1 movs r6, 0 -_081A78DC: +@081A78DC: mov r4, sp adds r0, r4, r6 ldrb r1, [r0] @@ -818125,12 +818125,12 @@ _081A78DC: bl pokemon_ailments_get_primary lsls r0, 24 cmp r0, 0 - bne _081A7946 + bne @081A7946 adds r0, r5, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _081A7946 + beq @081A7946 mov r0, r8 adds r0, 0x1 lsls r0, 24 @@ -818147,28 +818147,28 @@ _081A78DC: bl sub_81A7628 lsls r0, 24 cmp r0, 0 - bne _081A7946 + bne @081A7946 ldr r1, [r7] adds r0, r4, 0 bl sub_81A767C lsls r0, 24 cmp r0, 0 - bne _081A7946 + bne @081A7946 adds r0, r5, 0 movs r1, 0x37 adds r2, r7, 0 bl pokemon_setattr -_081A7946: +@081A7946: cmp r8, r10 - beq _081A7954 + beq @081A7954 adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x2 - bls _081A78DC -_081A7954: + bls @081A78DC +@081A7954: movs r0, 0x1 -_081A7956: +@081A7956: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -818182,7 +818182,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] @@ -818191,24 +818191,24 @@ sub_81A7974: @ 81A7974 ldrh r0, [r0] movs r7, 0x1 cmp r0, 0x4 - bls _081A798E + bls @081A798E movs r7, 0x3 cmp r0, 0x9 - bhi _081A798E + bhi @081A798E movs r7, 0x2 -_081A798E: +@081A798E: movs r6, 0 movs r5, 0 - b _081A79A2 + b @081A79A2 .align 2, 0 .pool -_081A799C: +@081A799C: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_081A79A2: +@081A79A2: cmp r5, 0x2 - bhi _081A79D8 + bhi @081A79D8 movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -818220,35 +818220,35 @@ _081A79A2: bl pokemon_ailments_get_primary lsls r0, 24 cmp r0, 0 - bne _081A79D4 + bne @081A79D4 adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _081A79D4 + beq @081A79D4 adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_081A79D4: +@081A79D4: cmp r6, r7 - bne _081A799C -_081A79D8: + bne @081A799C +@081A79D8: cmp r6, 0 - beq _081A79E4 + beq @081A79E4 movs r0, 0x1 - b _081A79E6 + b @081A79E6 .align 2, 0 .pool -_081A79E4: +@081A79E4: movs r0, 0 -_081A79E6: +@081A79E6: pop {r4-r7} pop {r1} bx r1 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 @@ -818261,36 +818261,36 @@ sub_81A79EC: @ 81A79EC ands r3, r2 adds r5, r1, 0 cmp r3, 0x40 - bne _081A7A10 + bne @081A7A10 lsls r0, r2, 25 lsrs r0, 28 - b _081A7B48 + b @081A7B48 .align 2, 0 .pool -_081A7A10: +@081A7A10: ldr r0, =0x020375e6 lsls r1, r2, 29 ldrh r0, [r0] lsrs r1, 29 cmp r0, r1 - bne _081A7A34 + bne @081A7A34 cmp r3, 0x18 - bne _081A7A24 + bne @081A7A24 bl sub_81A7728 -_081A7A24: +@081A7A24: ldr r0, [r5] adds r0, r4 ldrb r0, [r0] lsls r0, 25 lsrs r0, 28 - b _081A7B48 + b @081A7B48 .align 2, 0 .pool -_081A7A34: +@081A7A34: movs r2, 0 ldr r3, =0x0861266c movs r1, 0 -_081A7A3A: +@081A7A3A: mov r4, sp adds r0, r4, r2 strb r1, [r0] @@ -818298,7 +818298,7 @@ _081A7A3A: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x7 - bls _081A7A3A + bls @081A7A3A movs r4, 0x8 ldr r0, [r5] movs r6, 0xE1 @@ -818312,53 +818312,53 @@ _081A7A3A: movs r2, 0 adds r5, r3, 0 movs r3, 0x1 -_081A7A64: +@081A7A64: adds r0, r2, r5 ldrb r0, [r0] cmp r0, r1 - bne _081A7A78 + bne @081A7A78 mov r6, sp adds r0, r6, r2 strb r3, [r0] subs r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_081A7A78: +@081A7A78: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x7 - bls _081A7A64 + bls @081A7A64 mov r0, sp ldrb r0, [r0, 0x7] cmp r0, 0x1 - beq _081A7AA0 + beq @081A7AA0 bl sub_81A8554 lsls r0, 24 cmp r0, 0 - bne _081A7AA0 + bne @081A7AA0 mov r1, sp movs r0, 0x1 strb r0, [r1, 0x7] subs r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_081A7AA0: +@081A7AA0: mov r0, sp ldrb r0, [r0, 0x3] cmp r0, 0x1 - beq _081A7ABE + beq @081A7ABE bl sub_81A7974 lsls r0, 24 cmp r0, 0 - bne _081A7ABE + bne @081A7ABE mov r1, sp movs r0, 0x1 strb r0, [r1, 0x3] subs r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_081A7ABE: +@081A7ABE: ldr r0, =0x03005d90 ldr r0, [r0] movs r1, 0xE1 @@ -818368,52 +818368,52 @@ _081A7ABE: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081A7AFA + beq @081A7AFA mov r0, sp ldrb r0, [r0, 0x1] cmp r0, 0x1 - beq _081A7AE6 + beq @081A7AE6 mov r1, sp movs r0, 0x1 strb r0, [r1, 0x1] subs r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_081A7AE6: +@081A7AE6: mov r0, sp ldrb r0, [r0, 0x4] cmp r0, 0x1 - beq _081A7AFA + beq @081A7AFA mov r1, sp movs r0, 0x1 strb r0, [r1, 0x4] subs r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_081A7AFA: +@081A7AFA: adds r0, r4, 0 bl malloc_and_clear adds r5, r0, 0 movs r3, 0 movs r2, 0 -_081A7B06: +@081A7B06: mov r6, sp adds r0, r6, r2 ldrb r0, [r0] cmp r0, 0 - bne _081A7B1C + bne @081A7B1C adds r1, r3, 0 adds r0, r1, 0x1 lsls r0, 24 lsrs r3, r0, 24 adds r1, r5, r1 strb r2, [r1] -_081A7B1C: +@081A7B1C: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x7 - bls _081A7B06 + bls @081A7B06 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -818424,11 +818424,11 @@ _081A7B1C: adds r0, r5, 0 bl free cmp r4, 0x3 - bne _081A7B46 + bne @081A7B46 bl sub_81A7728 -_081A7B46: +@081A7B46: adds r0, r4, 0 -_081A7B48: +@081A7B48: add sp, 0x8 pop {r4-r6} pop {r1} @@ -818438,7 +818438,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 @@ -818460,7 +818460,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 @@ -818469,7 +818469,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 @@ -818509,11 +818509,11 @@ sub_81A7B90: @ 81A7B90 movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _081A7C1C + beq @081A7C1C bl sub_8165CB4 adds r7, r0, 0 cmp r7, 0x3B - ble _081A7C08 + ble @081A7C08 lsls r0, r6, 2 ldr r1, [sp, 0x4] adds r0, r1 @@ -818525,13 +818525,13 @@ sub_81A7B90: @ 81A7B90 ldrb r0, [r0, 0x2] subs r7, r0 cmp r7, 0x3B - bgt _081A7C32 -_081A7C08: + bgt @081A7C32 +@081A7C08: movs r7, 0x3C - b _081A7C32 + b @081A7C32 .align 2, 0 .pool -_081A7C1C: +@081A7C1C: lsls r0, r6, 2 ldr r2, [sp, 0x4] adds r0, r2 @@ -818543,19 +818543,19 @@ _081A7C1C: ldrb r1, [r0, 0x2] movs r0, 0x32 subs r7, r0, r1 -_081A7C32: +@081A7C32: mov r0, r8 cmp r0, 0x1 - bne _081A7C4A + bne @081A7C4A lsls r0, r7, 24 lsrs r0, 24 bl sub_81A88B0 lsls r0, 24 cmp r0, 0 - bne _081A7C4A + bne @081A7C4A movs r0, 0 - b _081A7CE2 -_081A7C4A: + b @081A7CE2 +@081A7C4A: ldr r0, =0x02024744 ldr r1, =0x083203cc mov r8, r1 @@ -818595,13 +818595,13 @@ _081A7C4A: ldrb r0, [r0, 0x17] mov r7, r9 cmp r0, 0 - beq _081A7CA8 + beq @081A7CA8 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 movs r1, 0x1 ands r0, r1 -_081A7CA8: +@081A7CA8: str r0, [sp] ldr r0, =0x02024744 movs r1, 0x2E @@ -818610,7 +818610,7 @@ _081A7CA8: movs r4, 0 adds r0, r6, r5 lsls r6, r0, 2 -_081A7CBA: +@081A7CBA: ldr r2, [sp, 0x4] adds r0, r7, r2 ldr r0, [r0] @@ -818625,11 +818625,11 @@ _081A7CBA: bl sub_80691F4 adds r4, 0x1 cmp r4, 0x3 - ble _081A7CBA + ble @081A7CBA ldr r0, =0x02024744 bl pokemon_calc_effective_stats movs r0, 0x1 -_081A7CE2: +@081A7CE2: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -818643,7 +818643,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] @@ -818660,33 +818660,33 @@ sub_81A7D00: @ 81A7D00 movs r0, 0x8C lsls r0, 1 cmp r1, r0 - bhi _081A7D34 + bhi @081A7D34 movs r1, 0 - b _081A7D4C + b @081A7D4C .align 2, 0 .pool -_081A7D34: +@081A7D34: movs r0, 0x8C lsls r0, 2 cmp r1, r0 - bhi _081A7D40 + bhi @081A7D40 movs r1, 0x1 - b _081A7D4C -_081A7D40: + b @081A7D4C +@081A7D40: movs r0, 0xD2 lsls r0, 2 movs r1, 0x3 cmp r2, r0 - bhi _081A7D4C + bhi @081A7D4C movs r1, 0x2 -_081A7D4C: +@081A7D4C: adds r0, r1, 0 pop {r1} bx r1 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 @@ -818696,7 +818696,7 @@ sub_81A7D54: @ 81A7D54 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_081A7D66: +@081A7D66: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -818706,7 +818706,7 @@ _081A7D66: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _081A7D66 + bne @081A7D66 pop {r4,r5} pop {r0} bx r0 @@ -818715,20 +818715,20 @@ _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] movs r2, 0x14 ldrsh r0, [r4, r2] cmp r0, 0 - beq _081A7DA4 + beq @081A7DA4 subs r0, r1, 0x1 strh r0, [r4, 0x14] lsls r0, 16 cmp r0, 0 - bne _081A7DC8 -_081A7DA4: + bne @081A7DC8 +@081A7DA4: ldrh r0, [r4, 0xA] strh r0, [r4, 0x14] ldrh r0, [r4, 0x10] @@ -818738,26 +818738,26 @@ _081A7DA4: lsls r0, 16 asrs r0, 16 cmp r0, 0x10 - ble _081A7DBC + ble @081A7DBC movs r0, 0x10 strh r0, [r4, 0x16] -_081A7DBC: +@081A7DBC: movs r0, 0x1 negs r0, r0 ldrb r1, [r4, 0x16] ldr r2, =0x00002d6b bl sub_80A2A20 -_081A7DC8: +@081A7DC8: movs r2, 0x16 ldrsh r0, [r4, r2] cmp r0, 0xF - ble _081A7DDA + ble @081A7DDA ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] ldrh r0, [r4, 0xC] strh r0, [r4, 0x14] -_081A7DDA: +@081A7DDA: movs r0, 0 pop {r4} pop {r1} @@ -818767,20 +818767,20 @@ _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] movs r2, 0x14 ldrsh r0, [r4, r2] cmp r0, 0 - beq _081A7E00 + beq @081A7E00 subs r0, r1, 0x1 strh r0, [r4, 0x14] lsls r0, 16 cmp r0, 0 - bne _081A7E22 -_081A7E00: + bne @081A7E22 +@081A7E00: ldrh r0, [r4, 0xC] strh r0, [r4, 0x14] ldrh r0, [r4, 0x16] @@ -818789,39 +818789,39 @@ _081A7E00: strh r0, [r4, 0x16] lsls r0, 16 cmp r0, 0 - bge _081A7E16 + bge @081A7E16 movs r0, 0 strh r0, [r4, 0x16] -_081A7E16: +@081A7E16: movs r0, 0x1 negs r0, r0 ldrb r1, [r4, 0x16] ldr r2, =0x00002d6b bl sub_80A2A20 -_081A7E22: +@081A7E22: movs r0, 0x16 ldrsh r1, [r4, r0] cmp r1, 0 - bne _081A7E56 + bne @081A7E56 ldrh r0, [r4, 0xE] subs r0, 0x1 strh r0, [r4, 0xE] lsls r0, 16 cmp r0, 0 - bne _081A7E50 + bne @081A7E50 ldr r0, =sub_81A7D54 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task - b _081A7E56 + b @081A7E56 .align 2, 0 .pool -_081A7E50: +@081A7E50: ldrh r0, [r4, 0xA] strh r0, [r4, 0x14] strh r1, [r4, 0x8] -_081A7E56: +@081A7E56: movs r0, 0 pop {r4} pop {r1} @@ -818829,7 +818829,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} @@ -818880,27 +818880,27 @@ 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 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _081A7EDC + beq @081A7EDC movs r0, 0 - b _081A7EDE + b @081A7EDE .align 2, 0 .pool -_081A7EDC: +@081A7EDC: movs r0, 0x1 -_081A7EDE: +@081A7EDE: pop {r1} bx r1 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 @@ -818915,7 +818915,7 @@ sub_81A7EE4: @ 81A7EE4 movs r3, 0x8 ldrsh r0, [r1, r3] cmp r0, 0 - bne _081A7F1C + bne @081A7F1C adds r0, r2, 0x1 strh r0, [r1, 0x8] movs r0, 0x2 @@ -818925,18 +818925,18 @@ sub_81A7EE4: @ 81A7EE4 movs r2, 0x3 movs r3, 0x2 bl sub_81A7E60 - b _081A7F30 + b @081A7F30 .align 2, 0 .pool -_081A7F1C: +@081A7F1C: bl sub_81A7EC4 lsls r0, 24 cmp r0, 0 - beq _081A7F30 + beq @081A7F30 bl script_env_2_enable_and_set_ctx_running adds r0, r4, 0 bl remove_task -_081A7F30: +@081A7F30: add sp, 0x4 pop {r4} pop {r0} @@ -818944,7 +818944,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 @@ -818955,12 +818955,12 @@ sub_81A7F38: @ 81A7F38 lsrs r0, 24 str r0, [sp, 0x4] cmp r0, 0 - bne _081A7F50 - b _081A807A -_081A7F50: + bne @081A7F50 + b @081A807A +@081A7F50: movs r0, 0 mov r8, r0 -_081A7F54: +@081A7F54: mov r0, sp add r0, r8 mov r1, r8 @@ -818971,9 +818971,9 @@ _081A7F54: lsrs r0, 24 mov r8, r0 cmp r0, 0x2 - bls _081A7F54 + bls @081A7F54 movs r5, 0 -_081A7F6C: +@081A7F6C: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -819001,10 +819001,10 @@ _081A7F6C: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x9 - bls _081A7F6C + bls @081A7F6C movs r1, 0 mov r8, r1 -_081A7FB0: +@081A7FB0: movs r0, 0 mov r10, r0 mov r4, sp @@ -819026,20 +819026,20 @@ _081A7FB0: lsrs r6, r0, 16 str r4, [sp, 0x8] cmp r5, r6 - bcc _081A8044 + bcc @081A8044 adds r0, r7, 0 movs r1, 0x37 bl pokemon_getattr bl pokemon_ailments_get_primary lsls r0, 24 cmp r0, 0 - beq _081A7FFC + beq @081A7FFC movs r0, 0x1 mov r10, r0 - b _081A8048 + b @081A8048 .align 2, 0 .pool -_081A7FFC: +@081A7FFC: adds r0, r7, 0 movs r1, 0x15 bl pokemon_getattr @@ -819047,14 +819047,14 @@ _081A7FFC: lsrs r0, 24 mov r9, r0 movs r4, 0 - b _081A8014 -_081A800E: + b @081A8014 +@081A800E: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_081A8014: +@081A8014: cmp r4, 0x3 - bhi _081A8048 + bhi @081A8048 adds r1, r4, 0 adds r1, 0xD adds r0, r7, 0 @@ -819073,14 +819073,14 @@ _081A8014: lsls r0, 16 lsrs r5, r0, 16 cmp r5, r6 - bcs _081A800E -_081A8044: + bcs @081A800E +@081A8044: movs r1, 0x1 mov r10, r1 -_081A8048: +@081A8048: mov r0, r10 cmp r0, 0x1 - bne _081A806C + bne @081A806C ldr r0, [sp, 0x8] ldrb r1, [r0] movs r0, 0x64 @@ -819094,16 +819094,16 @@ _081A8048: lsrs r0, 24 str r0, [sp, 0x4] cmp r0, 0 - beq _081A807A -_081A806C: + beq @081A807A +@081A806C: mov r0, r8 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r8, r0 cmp r0, 0x2 - bls _081A7FB0 -_081A807A: + bls @081A7FB0 +@081A807A: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -819117,7 +819117,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 sub_81A80A8 @@ -819132,7 +819132,7 @@ sub_81A8090: @ 81A8090 thumb_func_end sub_81A8090 thumb_func_start sub_81A80A8 -sub_81A80A8: @ 81A80A8 +sub_81A80A8: ; 81A80A8 push {lr} movs r2, 0 ldr r0, =0x02037318 @@ -819142,17 +819142,17 @@ sub_81A80A8: @ 81A80A8 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bls _081A80CA + bls @081A80CA movs r0, 0xB3 lsls r0, 1 cmp r1, r0 - beq _081A80CA + beq @081A80CA adds r0, 0x1 cmp r1, r0 - bne _081A80CC -_081A80CA: + bne @081A80CC +@081A80CA: movs r2, 0x1 -_081A80CC: +@081A80CC: adds r0, r2, 0 pop {r1} bx r1 @@ -819161,7 +819161,7 @@ _081A80CC: thumb_func_end sub_81A80A8 thumb_func_start sub_81A80DC -sub_81A80DC: @ 81A80DC +sub_81A80DC: ; 81A80DC push {r4-r7,lr} mov r7, r8 push {r7} @@ -819172,7 +819172,7 @@ sub_81A80DC: @ 81A80DC bl sub_81A8590 lsls r0, 24 cmp r0, 0 - beq _081A8138 + beq @081A8138 movs r0, 0x1 strh r0, [r4] bl GenerateRandomNumber @@ -819200,10 +819200,10 @@ sub_81A80DC: @ 81A80DC negs r0, r0 ands r0, r1 movs r1, 0x40 - b _081A8248 + b @081A8248 .align 2, 0 .pool -_081A8138: +@081A8138: bl GenerateRandomNumber ldr r7, =0x03005d90 ldr r4, [r7] @@ -819229,18 +819229,18 @@ _081A8138: ands r0, r1 movs r6, 0x8 cmp r0, 0 - beq _081A8172 + beq @081A8172 movs r6, 0x6 -_081A8172: +@081A8172: adds r0, r6, 0 bl malloc_and_clear adds r5, r0, 0 movs r2, 0 movs r3, 0 cmp r2, r6 - bcs _081A81BE + bcs @081A81BE adds r4, r7, 0 -_081A8184: +@081A8184: ldr r0, [r4] movs r1, 0xE1 lsls r1, 4 @@ -819249,30 +819249,30 @@ _081A8184: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081A81B0 + beq @081A81B0 cmp r2, 0x1 - beq _081A81B4 + beq @081A81B4 cmp r2, 0x4 - beq _081A81B4 + beq @081A81B4 adds r1, r3, 0 adds r0, r1, 0x1 lsls r0, 24 lsrs r3, r0, 24 adds r1, r5, r1 strb r2, [r1] - b _081A81B4 + b @081A81B4 .align 2, 0 .pool -_081A81B0: +@081A81B0: adds r0, r5, r2 strb r2, [r0] -_081A81B4: +@081A81B4: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, r6 - bcc _081A8184 -_081A81BE: + bcc @081A8184 +@081A81BE: bl GenerateRandomNumber ldr r7, =0x03005d90 ldr r4, [r7] @@ -819303,11 +819303,11 @@ _081A81BE: movs r0, 0x78 ands r0, r1 cmp r0, 0x18 - bne _081A821C + bne @081A821C bl sub_81A7974 lsls r0, 24 cmp r0, 0 - bne _081A821C + bne @081A821C ldr r2, [r7] adds r2, r6 ldrb r1, [r2] @@ -819316,7 +819316,7 @@ _081A81BE: movs r1, 0x10 orrs r0, r1 strb r0, [r2] -_081A821C: +@081A821C: ldr r5, =0x03005d90 ldr r0, [r5] movs r4, 0xE1 @@ -819326,11 +819326,11 @@ _081A821C: movs r0, 0x78 ands r0, r1 cmp r0, 0x38 - bne _081A824C + bne @081A824C bl sub_81A8554 lsls r0, 24 cmp r0, 0 - bne _081A824C + bne @081A824C ldr r2, [r5] adds r2, r4 ldrb r1, [r2] @@ -819338,10 +819338,10 @@ _081A821C: negs r0, r0 ands r0, r1 movs r1, 0x10 -_081A8248: +@081A8248: orrs r0, r1 strb r0, [r2] -_081A824C: +@081A824C: pop {r3} mov r8, r3 pop {r4-r7} @@ -819352,7 +819352,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] @@ -819369,7 +819369,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, =0x0861266c ldr r0, =0x03005d90 @@ -819389,14 +819389,14 @@ 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 cmp r0, 0 - bne _081A82B0 + bne @081A82B0 movs r7, 0x1 -_081A82B0: +@081A82B0: ldr r4, =0x03005d90 ldr r1, [r4] ldr r2, =0x00000ca9 @@ -819413,7 +819413,7 @@ _081A82B0: lsls r0, 16 lsrs r6, r0, 16 adds r5, r4, 0 -_081A82D2: +@081A82D2: lsls r0, r6, 24 lsrs r0, 24 adds r1, r7, 0 @@ -819427,29 +819427,29 @@ _081A82D2: ldrh r0, [r0] subs r2, r0, 0x1 cmp r3, r2 - bge _081A831A + bge @081A831A ldr r0, =0x00000cb4 adds r1, r0 - b _081A8314 + b @081A8314 .align 2, 0 .pool -_081A830C: +@081A830C: adds r1, 0x2 adds r3, 0x1 cmp r3, r2 - bge _081A831A -_081A8314: + bge @081A831A +@081A8314: ldrh r0, [r1] cmp r0, r4 - bne _081A830C -_081A831A: + bne @081A830C +@081A831A: ldr r0, [r5] ldr r1, =0x00000cb2 adds r0, r1 ldrh r0, [r0] subs r0, 0x1 cmp r3, r0 - bne _081A82D2 + bne @081A82D2 ldr r5, =0x02038bca strh r4, [r5] ldr r1, =0x0203bc88 @@ -819464,7 +819464,7 @@ _081A831A: adds r2, r1, r0 ldrh r0, [r2] cmp r0, 0xD - bhi _081A8356 + bhi @081A8356 subs r0, 0x1 lsls r0, 1 ldr r2, =0x00000cb4 @@ -819472,7 +819472,7 @@ _081A831A: adds r1, r0 ldrh r0, [r5] strh r0, [r1] -_081A8356: +@081A8356: pop {r4-r7} pop {r0} bx r0 @@ -819481,7 +819481,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] @@ -819503,7 +819503,7 @@ sub_81A8374: @ 81A8374 str r0, [r1] lsls r7, r5, 24 adds r6, r4, 0 -_081A83A0: +@081A83A0: lsls r0, r5, 24 lsrs r0, 24 movs r1, 0x1 @@ -819517,29 +819517,29 @@ _081A83A0: ldrh r0, [r0] subs r2, r0, 0x1 cmp r3, r2 - bge _081A83EE + bge @081A83EE ldr r0, =0x00000cb4 adds r1, r0 - b _081A83E8 + b @081A83E8 .align 2, 0 .pool -_081A83E0: +@081A83E0: adds r1, 0x2 adds r3, 0x1 cmp r3, r2 - bge _081A83EE -_081A83E8: + bge @081A83EE +@081A83E8: ldrh r0, [r1] cmp r0, r4 - bne _081A83E0 -_081A83EE: + bne @081A83E0 +@081A83EE: ldr r0, [r6] ldr r1, =0x00000cb2 adds r0, r1 ldrh r0, [r0] subs r0, 0x1 cmp r3, r0 - bne _081A83A0 + bne @081A83A0 ldr r5, =0x02038bca strh r4, [r5] ldrh r0, [r5] @@ -819551,7 +819551,7 @@ _081A83EE: adds r2, r1, r0 ldrh r0, [r2] cmp r0, 0xE - bhi _081A8424 + bhi @081A8424 subs r0, 0x1 lsls r0, 1 ldr r2, =0x00000cb4 @@ -819559,9 +819559,9 @@ _081A83EE: adds r1, r0 ldrh r0, [r5] strh r0, [r1] -_081A8424: +@081A8424: adds r5, r3, 0 -_081A8426: +@081A8426: lsrs r0, r7, 24 movs r1, 0x1 bl sub_8162548 @@ -819573,12 +819573,12 @@ _081A8426: adds r0, r1, r2 ldrh r0, [r0] cmp r3, r0 - bge _081A8466 + bge @081A8466 adds r2, 0x2 adds r0, r1, r2 ldrh r0, [r0] cmp r0, r4 - beq _081A8466 + beq @081A8466 ldr r0, =0x03005d90 ldr r1, [r0] subs r2, 0x2 @@ -819586,21 +819586,21 @@ _081A8426: ldrh r2, [r0] ldr r0, =0x00000cb4 adds r1, r0 -_081A8458: +@081A8458: adds r1, 0x2 adds r3, 0x1 cmp r3, r2 - bge _081A8466 + bge @081A8466 ldrh r0, [r1] cmp r0, r4 - bne _081A8458 -_081A8466: + bne @081A8458 +@081A8466: ldr r0, [r5] ldr r1, =0x00000cb2 adds r0, r1 ldrh r0, [r0] cmp r3, r0 - bne _081A8426 + bne @081A8426 ldr r5, =0x02038bcc strh r4, [r5] ldrh r0, [r5] @@ -819612,7 +819612,7 @@ _081A8466: adds r2, r1, r0 ldrh r0, [r2] cmp r0, 0xD - bhi _081A849A + bhi @081A849A subs r0, 0x2 lsls r0, 1 ldr r2, =0x00000cb4 @@ -819620,7 +819620,7 @@ _081A8466: adds r1, r0 ldrh r0, [r5] strh r0, [r1] -_081A849A: +@081A849A: pop {r4-r7} pop {r0} bx r0 @@ -819629,14 +819629,14 @@ _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 ldr r4, =0x00000cb4 ldr r0, =0x0000ffff adds r3, r0, 0 -_081A84C0: +@081A84C0: ldr r1, [r5] lsls r0, r2, 1 adds r1, r4 @@ -819648,7 +819648,7 @@ _081A84C0: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xD - bls _081A84C0 + bls @081A84C0 pop {r4,r5} pop {r0} bx r0 @@ -819657,17 +819657,17 @@ _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] cmp r0, 0 - bne _081A8524 + bne @081A8524 ldr r3, =0x02038bca ldrh r1, [r3] ldr r0, =0x0000012b cmp r1, r0 - bhi _081A8542 + bhi @081A8542 ldr r2, =0x0203bc88 movs r0, 0x34 muls r1, r0 @@ -819675,17 +819675,17 @@ sub_81A84EC: @ 81A84EC adds r0, r1 adds r0, 0xC bl sub_81638AC - b _081A8542 + b @081A8542 .align 2, 0 .pool -_081A8524: +@081A8524: cmp r0, 0x1 - bne _081A8542 + bne @081A8542 ldr r3, =0x02038bcc ldrh r1, [r3] ldr r0, =0x0000012b cmp r1, r0 - bhi _081A8542 + bhi @081A8542 ldr r2, =0x0203bc88 movs r0, 0x34 muls r1, r0 @@ -819693,7 +819693,7 @@ _081A8524: adds r0, r1 adds r0, 0xC bl sub_81638AC -_081A8542: +@081A8542: pop {r0} bx r0 .align 2, 0 @@ -819701,43 +819701,43 @@ _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 movs r4, 0 -_081A855C: +@081A855C: adds r0, r5, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - bne _081A856E + bne @081A856E adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_081A856E: +@081A856E: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 adds r5, 0x64 cmp r4, 0x2 - bls _081A855C + bls @081A855C cmp r6, 0x1 - bhi _081A8588 + bhi @081A8588 movs r0, 0x1 - b _081A858A + b @081A858A .align 2, 0 .pool -_081A8588: +@081A8588: movs r0, 0 -_081A858A: +@081A858A: pop {r4-r6} pop {r1} bx r1 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 @@ -819761,9 +819761,9 @@ sub_81A8590: @ 81A8590 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - blt _081A85F0 + blt @081A85F0 cmp r2, 0x1 - bgt _081A85F0 + bgt @081A85F0 ldr r1, =0x086125dc adds r0, r2, 0 adds r0, 0x14 @@ -819772,14 +819772,14 @@ sub_81A8590: @ 81A8590 ldrb r1, [r1, 0x17] subs r0, r1 cmp r4, r0 - bne _081A8634 + bne @081A8634 adds r0, r2, 0x1 lsls r0, 24 lsrs r6, r0, 24 - b _081A8634 + b @081A8634 .align 2, 0 .pool -_081A85F0: +@081A85F0: ldr r5, =0x086125dc movs r0, 0x5 lsls r3, r0, 2 @@ -819790,20 +819790,20 @@ _081A85F0: ldrb r2, [r0] subs r1, r2 cmp r4, r1 - bne _081A8610 + bne @081A8610 movs r6, 0x3 - b _081A8634 + b @081A8634 .align 2, 0 .pool -_081A8610: +@081A8610: adds r0, r5, 0x1 adds r0, r3, r0 ldrb r1, [r0] subs r0, r1, r2 cmp r4, r0 - beq _081A8632 + beq @081A8632 cmp r4, r1 - bls _081A8634 + bls @081A8634 subs r0, r4, r1 adds r0, r2 adds r1, r5, 0x2 @@ -819811,10 +819811,10 @@ _081A8610: ldrb r1, [r1] bl __modsi3 cmp r0, 0 - bne _081A8634 -_081A8632: + bne @081A8634 +@081A8632: movs r6, 0x4 -_081A8634: +@081A8634: adds r0, r6, 0 pop {r4-r6} pop {r1} @@ -819822,7 +819822,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 @@ -819838,7 +819838,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, =0x08612675 ldr r2, =0x020375e6 @@ -819868,7 +819868,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 @@ -819888,7 +819888,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 @@ -819899,7 +819899,7 @@ sub_81A86C0: @ 81A86C0 strh r0, [r1] movs r0, 0 mov r10, r0 -_081A86D4: +@081A86D4: movs r0, 0 mov r9, r0 movs r0, 0x64 @@ -819918,14 +819918,14 @@ _081A86D4: lsls r0, 16 lsrs r5, r0, 16 cmp r4, r5 - bcc _081A8762 + bcc @081A8762 adds r0, r7, 0 movs r1, 0x37 bl pokemon_getattr bl pokemon_ailments_get_primary lsls r0, 24 cmp r0, 0 - bne _081A8762 + bne @081A8762 adds r0, r7, 0 movs r1, 0x15 bl pokemon_getattr @@ -819933,16 +819933,16 @@ _081A86D4: lsrs r0, 24 mov r8, r0 movs r6, 0 - b _081A8732 + b @081A8732 .align 2, 0 .pool -_081A872C: +@081A872C: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_081A8732: +@081A8732: cmp r6, 0x3 - bhi _081A8766 + bhi @081A8766 adds r1, r6, 0 adds r1, 0xD adds r0, r7, 0 @@ -819961,29 +819961,29 @@ _081A8732: lsls r0, 16 lsrs r4, r0, 16 cmp r4, r5 - bcs _081A872C -_081A8762: + bcs @081A872C +@081A8762: movs r0, 0x1 mov r9, r0 -_081A8766: +@081A8766: mov r0, r9 cmp r0, 0x1 - bne _081A8778 + bne @081A8778 ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - b _081A8786 + b @081A8786 .align 2, 0 .pool -_081A8778: +@081A8778: mov r0, r10 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r10, r0 cmp r0, 0x2 - bls _081A86D4 -_081A8786: + bls @081A86D4 +@081A8786: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -819994,12 +819994,12 @@ _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 ldr r6, =0x03005d90 -_081A879C: +@081A879C: ldr r0, [r6] lsls r4, r5, 1 ldr r1, =0x00000caa @@ -820024,7 +820024,7 @@ _081A879C: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x2 - bls _081A879C + bls @081A879C pop {r4-r7} pop {r0} bx r0 @@ -820033,10 +820033,10 @@ _081A879C: thumb_func_end sub_81A8794 thumb_func_start sub_81A87E8 -sub_81A87E8: @ 81A87E8 +sub_81A87E8: ; 81A87E8 push {r4,lr} movs r4, 0 -_081A87EC: +@081A87EC: ldr r0, =0x03005d90 ldr r2, [r0] lsls r3, r4, 1 @@ -820057,7 +820057,7 @@ _081A87EC: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _081A87EC + bls @081A87EC pop {r4} pop {r0} bx r0 @@ -820066,7 +820066,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] @@ -820099,13 +820099,13 @@ sub_81A8830: @ 81A8830 ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne _081A887C + bne @081A887C lsls r1, r5, 1 ldr r2, =0x00000e04 adds r0, r3, r2 adds r0, r1 strh r4, [r0] -_081A887C: +@081A887C: ldr r0, =0x02038bca strh r4, [r0] ldr r1, =0x0202433a @@ -820119,7 +820119,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 @@ -820128,64 +820128,64 @@ sub_81A88B0: @ 81A88B0 movs r1, 0x6 bl pokemon_getattr cmp r0, 0 - bne _081A8904 + bne @081A8904 adds r0, r4, 0 bl sub_806B6D8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x33 - beq _081A88D6 + beq @081A88D6 cmp r0, 0x16 - bne _081A8904 -_081A88D6: + bne @081A8904 +@081A88D6: adds r0, r4, 0 movs r1, 0x38 bl pokemon_getattr lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 - bls _081A8904 + bls @081A8904 subs r0, 0x5 cmp r5, r0 - bgt _081A8904 + bgt @081A8904 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _081A8904 + bne @081A8904 movs r0, 0 - b _081A8906 + b @081A8906 .align 2, 0 .pool -_081A8904: +@081A8904: movs r0, 0x1 -_081A8906: +@081A8906: pop {r4,r5} pop {r1} bx r1 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 ldr r0, =0x0000017b cmp r2, r0 - bne _081A8920 + bne @081A8920 movs r1, 0 - b _081A892A + b @081A892A .align 2, 0 .pool -_081A8920: +@081A8920: ldr r0, =0x00000149 movs r1, 0x2 cmp r2, r0 - bne _081A892A + bne @081A892A movs r1, 0x1 -_081A892A: +@081A892A: adds r0, r1, 0 pop {r1} bx r1 @@ -820194,18 +820194,18 @@ _081A892A: thumb_func_end sub_81A890C thumb_func_start sub_81A8934 -sub_81A8934: @ 81A8934 +sub_81A8934: ; 81A8934 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 ldr r4, =0x0203ce50 ldr r0, [r4] cmp r0, 0 - bne _081A894A + bne @081A894A movs r0, 0x44 bl malloc_and_clear str r0, [r4] -_081A894A: +@081A894A: ldr r0, [r4] adds r0, 0x41 strb r5, [r0] @@ -820217,16 +820217,16 @@ _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] cmp r0, 0 - beq _081A896E + beq @081A896E bl free movs r0, 0 str r0, [r4] -_081A896E: +@081A896E: movs r0, 0xFF movs r1, 0 movs r2, 0 @@ -820249,7 +820249,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 @@ -820268,7 +820268,7 @@ sub_81A89A0: @ 81A89A0 movs r3, 0 mov r10, r3 mov r8, r3 -_081A89C4: +@081A89C4: mov r0, r8 lsls r4, r0, 1 adds r1, r4, r0 @@ -820292,71 +820292,71 @@ _081A89C4: movs r2, 0xA6 lsls r2, 2 cmp r0, 0 - bne _081A89F8 + bne @081A89F8 subs r2, 0x48 -_081A89F8: +@081A89F8: ldr r0, =0x0000024f cmp r1, r0 - bls _081A8AD4 + bls @081A8AD4 subs r1, r2 adds r0, r1, 0 cmp r1, 0 - bge _081A8A08 + bge @081A8A08 adds r0, r1, 0x7 -_081A8A08: +@081A8A08: asrs r2, r0, 3 lsls r0, r2, 24 lsrs r0, 24 cmp r0, 0x4 - bhi _081A8AD4 + bhi @081A8AD4 ldr r3, [sp] cmp r0, r3 - bne _081A8AD4 + bne @081A8AD4 lsls r0, r2, 3 subs r0, r1, r0 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bhi _081A8AD4 + bhi @081A8AD4 movs r1, 0 movs r2, 0 cmp r5, 0x1 - beq _081A8A58 + beq @081A8A58 cmp r5, 0x1 - bgt _081A8A44 + bgt @081A8A44 cmp r5, 0 - beq _081A8A4E - b _081A8AD4 + beq @081A8A4E + b @081A8AD4 .align 2, 0 .pool -_081A8A44: +@081A8A44: cmp r5, 0x2 - beq _081A8A64 + beq @081A8A64 cmp r5, 0x3 - beq _081A8A70 - b _081A8AD4 -_081A8A4E: + beq @081A8A70 + b @081A8AD4 +@081A8A4E: ldr r7, =0x08612698 movs r1, 0x1 - b _081A8A74 + b @081A8A74 .align 2, 0 .pool -_081A8A58: +@081A8A58: ldr r7, =0x0861269c movs r2, 0x1 - b _081A8A74 + b @081A8A74 .align 2, 0 .pool -_081A8A64: +@081A8A64: ldr r7, =0x086126a0 movs r1, 0xFF - b _081A8A74 + b @081A8A74 .align 2, 0 .pool -_081A8A70: +@081A8A70: ldr r7, =0x086126a4 movs r2, 0xFF -_081A8A74: +@081A8A74: mov r3, r8 adds r0, r4, r3 lsls r0, 3 @@ -820381,7 +820381,7 @@ _081A8A74: lsls r0, 24 lsrs r0, 24 cmp r0, 0x10 - beq _081A8ACC + beq @081A8ACC mov r0, r8 adds r1, r5, 0 bl sub_81A8D60 @@ -820393,23 +820393,23 @@ _081A8A74: ldrb r2, [r2, 0x4] adds r3, r7, 0 bl exec_movement - b _081A8AD4 + b @081A8AD4 .align 2, 0 .pool -_081A8ACC: +@081A8ACC: mov r0, r8 adds r1, r5, 0 bl sub_81A8D94 -_081A8AD4: +@081A8AD4: mov r0, r8 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r8, r0 cmp r0, 0x3F - bhi _081A8AE4 - b _081A89C4 -_081A8AE4: + bhi @081A8AE4 + b @081A89C4 +@081A8AE4: mov r0, r10 add sp, 0x4 pop {r3-r5} @@ -820422,7 +820422,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 @@ -820431,9 +820431,9 @@ sub_81A8AF8: @ 81A8AF8 ldr r1, =0x0203ce50 ldr r2, [r1] cmp r2, 0 - bne _081A8B0C - b _081A8D4A -_081A8B0C: + bne @081A8B0C + b @081A8D4A +@081A8B0C: adds r0, r2, 0 adds r0, 0x41 ldrb r0, [r0] @@ -820441,11 +820441,11 @@ _081A8B0C: lsls r3, 2 mov r10, r3 cmp r0, 0 - bne _081A8B22 + bne @081A8B22 movs r0, 0x94 lsls r0, 2 mov r10, r0 -_081A8B22: +@081A8B22: ldr r0, =0x03005d8c ldr r0, [r0] movs r3, 0xC7 @@ -820457,11 +820457,11 @@ _081A8B22: adds r0, 0x40 ldrb r0, [r0] cmp r9, r0 - bcc _081A8B3C - b _081A8D4A -_081A8B3C: + bcc @081A8B3C + b @081A8D4A +@081A8B3C: mov r8, r1 -_081A8B3E: +@081A8B3E: mov r1, r8 ldr r0, [r1] mov r2, r9 @@ -820487,9 +820487,9 @@ _081A8B3E: subs r1, r0, r3 adds r0, r1, 0 cmp r1, 0 - bge _081A8B76 + bge @081A8B76 adds r0, r1, 0x7 -_081A8B76: +@081A8B76: asrs r0, 3 lsls r0, 3 subs r0, r1, r0 @@ -820503,25 +820503,25 @@ _081A8B76: lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - blt _081A8B96 + blt @081A8B96 cmp r1, 0x3 - bne _081A8BAC -_081A8B96: + bne @081A8BAC +@081A8B96: movs r0, 0x3 negs r0, r0 movs r6, 0 cmp r1, r0 - bne _081A8BB4 - b _081A8BB2 + bne @081A8BB4 + b @081A8BB2 .align 2, 0 .pool -_081A8BAC: +@081A8BAC: movs r6, 0x2 cmp r1, 0 - ble _081A8BB4 -_081A8BB2: + ble @081A8BB4 +@081A8BB2: movs r6, 0x1 -_081A8BB4: +@081A8BB4: ldr r5, =0x0203ce50 ldr r0, [r5] adds r0, r4 @@ -820539,9 +820539,9 @@ _081A8BB4: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x10 - bne _081A8BDC - b _081A8D32 -_081A8BDC: + bne @081A8BDC + b @081A8D32 +@081A8BDC: ldr r0, =0x02037350 lsls r1, r2, 3 adds r1, r2 @@ -820552,23 +820552,23 @@ _081A8BDC: lsrs r0, 28 adds r1, r0, 0 cmp r6, 0 - bne _081A8C9C + bne @081A8C9C cmp r0, 0x2 - beq _081A8C60 + beq @081A8C60 cmp r0, 0x2 - bgt _081A8C0C + bgt @081A8C0C cmp r0, 0x1 - beq _081A8C30 - b _081A8D32 + beq @081A8C30 + b @081A8D32 .align 2, 0 .pool -_081A8C0C: +@081A8C0C: cmp r0, 0x3 - beq _081A8C48 + beq @081A8C48 cmp r0, 0x4 - beq _081A8C16 - b _081A8D32 -_081A8C16: + beq @081A8C16 + b @081A8D32 +@081A8C16: ldr r3, =0x086126ae ldr r0, [r5] adds r0, r4 @@ -820578,10 +820578,10 @@ _081A8C16: lsls r0, 3 adds r0, r7 movs r1, 0x7 - b _081A8C72 + b @081A8C72 .align 2, 0 .pool -_081A8C30: +@081A8C30: ldr r3, =0x086126a8 ldr r0, [r5] adds r0, r4 @@ -820591,10 +820591,10 @@ _081A8C30: lsls r0, 3 adds r0, r7 movs r1, 0xA - b _081A8C72 + b @081A8C72 .align 2, 0 .pool -_081A8C48: +@081A8C48: ldr r3, =0x086126aa ldr r0, [r5] adds r0, r4 @@ -820604,10 +820604,10 @@ _081A8C48: lsls r0, 3 adds r0, r7 movs r1, 0x8 - b _081A8C72 + b @081A8C72 .align 2, 0 .pool -_081A8C60: +@081A8C60: ldr r3, =0x086126ac ldr r0, [r5] adds r0, r4 @@ -820617,7 +820617,7 @@ _081A8C60: lsls r0, 3 adds r0, r7 movs r1, 0x9 -_081A8C72: +@081A8C72: strb r1, [r0, 0x9] mov r1, r8 ldr r0, [r1] @@ -820633,24 +820633,24 @@ _081A8C72: ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] bl exec_movement - b _081A8D32 + b @081A8D32 .align 2, 0 .pool -_081A8C9C: +@081A8C9C: cmp r6, 0x1 - bne _081A8D32 + bne @081A8D32 cmp r0, 0x2 - beq _081A8D00 + beq @081A8D00 cmp r0, 0x2 - bgt _081A8CAE + bgt @081A8CAE cmp r0, 0x1 - beq _081A8CD0 - b _081A8D32 -_081A8CAE: + beq @081A8CD0 + b @081A8D32 +@081A8CAE: cmp r1, 0x3 - beq _081A8CE8 + beq @081A8CE8 cmp r1, 0x4 - bne _081A8D32 + bne @081A8D32 ldr r3, =0x086126aa ldr r0, [r5] adds r0, r4 @@ -820660,10 +820660,10 @@ _081A8CAE: lsls r0, 3 adds r0, r7 movs r1, 0x8 - b _081A8D12 + b @081A8D12 .align 2, 0 .pool -_081A8CD0: +@081A8CD0: ldr r3, =0x086126ac ldr r0, [r5] adds r0, r4 @@ -820673,10 +820673,10 @@ _081A8CD0: lsls r0, 3 adds r0, r7 movs r1, 0x9 - b _081A8D12 + b @081A8D12 .align 2, 0 .pool -_081A8CE8: +@081A8CE8: ldr r3, =0x086126ae ldr r0, [r5] adds r0, r4 @@ -820686,10 +820686,10 @@ _081A8CE8: lsls r0, 3 adds r0, r7 movs r1, 0x7 - b _081A8D12 + b @081A8D12 .align 2, 0 .pool -_081A8D00: +@081A8D00: ldr r3, =0x086126a8 ldr r0, [r5] adds r0, r4 @@ -820699,7 +820699,7 @@ _081A8D00: lsls r0, 3 adds r0, r7 movs r1, 0xA -_081A8D12: +@081A8D12: strb r1, [r0, 0x9] mov r2, r8 ldr r0, [r2] @@ -820715,7 +820715,7 @@ _081A8D12: ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] bl exec_movement -_081A8D32: +@081A8D32: mov r0, r9 adds r0, 0x1 lsls r0, 24 @@ -820726,9 +820726,9 @@ _081A8D32: adds r0, 0x40 ldrb r0, [r0] cmp r9, r0 - bcs _081A8D4A - b _081A8B3E -_081A8D4A: + bcs @081A8D4A + b @081A8B3E +@081A8D4A: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -820741,7 +820741,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] @@ -820771,7 +820771,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 @@ -820804,15 +820804,15 @@ sub_81A8D94: @ 81A8D94 movs r1, 0xA6 lsls r1, 2 cmp r0, 0 - bne _081A8DDA + bne @081A8DDA subs r1, 0x48 -_081A8DDA: +@081A8DDA: subs r1, r2, r1 adds r0, r1, 0 cmp r1, 0 - bge _081A8DE4 + bge @081A8DE4 adds r0, r1, 0x7 -_081A8DE4: +@081A8DE4: asrs r0, 3 lsls r0, 3 subs r0, r1, r0 @@ -820822,27 +820822,27 @@ _081A8DE4: lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - blt _081A8DFC + blt @081A8DFC cmp r1, 0x3 - bne _081A8E08 -_081A8DFC: + bne @081A8E08 +@081A8DFC: movs r2, 0 - b _081A8E1A + b @081A8E1A .align 2, 0 .pool -_081A8E08: +@081A8E08: cmp r1, 0 - bgt _081A8E14 + bgt @081A8E14 movs r0, 0x3 negs r0, r0 cmp r1, r0 - bne _081A8E18 -_081A8E14: + bne @081A8E18 +@081A8E14: movs r2, 0x1 - b _081A8E1A -_081A8E18: + b @081A8E1A +@081A8E18: movs r2, 0x2 -_081A8E1A: +@081A8E1A: lsls r0, r4, 1 adds r0, r4 lsls r0, 3 @@ -820850,62 +820850,62 @@ _081A8E1A: ldrb r0, [r1, 0x9] adds r3, r0, 0 cmp r2, 0 - bne _081A8E4C + bne @081A8E4C cmp r0, 0x8 - beq _081A8E72 + beq @081A8E72 cmp r0, 0x8 - bgt _081A8E38 + bgt @081A8E38 cmp r0, 0x7 - beq _081A8E48 - b _081A8E76 -_081A8E38: + beq @081A8E48 + b @081A8E76 +@081A8E38: cmp r0, 0x9 - beq _081A8E44 + beq @081A8E44 cmp r0, 0xA - bne _081A8E76 + bne @081A8E76 movs r0, 0x7 - b _081A8E74 -_081A8E44: + b @081A8E74 +@081A8E44: movs r0, 0x8 - b _081A8E74 -_081A8E48: + b @081A8E74 +@081A8E48: movs r0, 0x9 - b _081A8E74 -_081A8E4C: + b @081A8E74 +@081A8E4C: cmp r2, 0x1 - bne _081A8E76 + bne @081A8E76 cmp r0, 0x8 - beq _081A8E6A + beq @081A8E6A cmp r0, 0x8 - bgt _081A8E5E + bgt @081A8E5E cmp r0, 0x7 - beq _081A8E72 - b _081A8E76 -_081A8E5E: + beq @081A8E72 + b @081A8E76 +@081A8E5E: cmp r3, 0x9 - beq _081A8E6E + beq @081A8E6E cmp r3, 0xA - bne _081A8E76 + bne @081A8E76 movs r0, 0x8 - b _081A8E74 -_081A8E6A: + b @081A8E74 +@081A8E6A: movs r0, 0x9 - b _081A8E74 -_081A8E6E: + b @081A8E74 +@081A8E6E: movs r0, 0x7 - b _081A8E74 -_081A8E72: + b @081A8E74 +@081A8E72: movs r0, 0xA -_081A8E74: +@081A8E74: strb r0, [r1, 0x9] -_081A8E76: +@081A8E76: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_81A8D94 thumb_func_start sub_81A8E7C -sub_81A8E7C: @ 81A8E7C +sub_81A8E7C: ; 81A8E7C push {lr} ldr r1, =0x08613ee0 ldr r0, =0x020375e0 @@ -820921,7 +820921,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] @@ -820945,27 +820945,27 @@ sub_81A8E9C: @ 81A8E9C ands r0, r2 strb r0, [r1] cmp r5, 0 - beq _081A8EF0 + beq @081A8EF0 ldr r0, [r3] ldr r1, =0x00000cdc adds r0, r1 ldr r2, [r0] movs r0, 0x80 lsls r0, 6 - b _081A8EFC + b @081A8EFC .align 2, 0 .pool -_081A8EF0: +@081A8EF0: ldr r0, [r3] ldr r6, =0x00000cdc adds r0, r6 ldr r2, [r0] movs r0, 0x80 lsls r0, 5 -_081A8EFC: +@081A8EFC: ands r2, r0 cmp r2, 0 - bne _081A8F14 + bne @081A8F14 ldr r0, [r3] lsls r1, r5, 1 ldr r3, =0x00000e1a @@ -820974,7 +820974,7 @@ _081A8EFC: strh r2, [r0] adds r0, r5, 0 bl sub_81AAA7C -_081A8F14: +@081A8F14: bl sub_81C4EEC ldr r0, =0x02038bca movs r1, 0 @@ -820989,7 +820989,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] @@ -821002,33 +821002,33 @@ sub_81A8F38: @ 81A8F38 ldrh r0, [r0] adds r3, r1, 0 cmp r0, 0x6 - bls _081A8F54 - b _081A903A -_081A8F54: + bls @081A8F54 + b @081A903A +@081A8F54: lsls r0, 2 - ldr r1, =_081A8F70 + ldr r1, =@081A8F70 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081A8F70: - .4byte _081A8F8C - .4byte _081A8F9C - .4byte _081A8FB4 - .4byte _081A8FE4 - .4byte _081A8FF8 - .4byte _081A9010 - .4byte _081A9028 -_081A8F8C: +@081A8F70: + .4byte @081A8F8C + .4byte @081A8F9C + .4byte @081A8FB4 + .4byte @081A8FE4 + .4byte @081A8FF8 + .4byte @081A9010 + .4byte @081A9028 +@081A8F8C: ldr r0, =0x020375f0 ldr r1, [r3] ldr r3, =0x00000e18 - b _081A8FFE + b @081A8FFE .align 2, 0 .pool -_081A8F9C: +@081A8F9C: ldr r2, =0x020375f0 ldr r0, [r3] lsls r1, r4, 1 @@ -821036,20 +821036,20 @@ _081A8F9C: adds r0, r3 adds r0, r1 ldrh r0, [r0] - b _081A9038 + b @081A9038 .align 2, 0 .pool -_081A8FB4: +@081A8FB4: cmp r4, 0 - beq _081A8FCC + beq @081A8FCC ldr r2, =0x020375f0 ldr r0, [r3] ldr r1, =0x00000cdc adds r0, r1 - b _081A9030 + b @081A9030 .align 2, 0 .pool -_081A8FCC: +@081A8FCC: ldr r2, =0x020375f0 ldr r0, [r3] ldr r3, =0x00000cdc @@ -821057,30 +821057,30 @@ _081A8FCC: ldr r0, [r0] movs r1, 0x80 lsls r1, 5 - b _081A9036 + b @081A9036 .align 2, 0 .pool -_081A8FE4: +@081A8FE4: ldr r0, =0x020375f0 ldr r1, [r3] ldr r2, =0x00000e1a adds r1, r2 - b _081A9000 + b @081A9000 .align 2, 0 .pool -_081A8FF8: +@081A8FF8: ldr r0, =0x020375f0 ldr r1, [r3] ldr r3, =0x00000e1c -_081A8FFE: +@081A8FFE: adds r1, r3 -_081A9000: +@081A9000: ldrh r1, [r1] strh r1, [r0] - b _081A903A + b @081A903A .align 2, 0 .pool -_081A9010: +@081A9010: ldr r2, =0x020375f0 ldr r0, [r3] ldr r1, =0x00000cdc @@ -821088,23 +821088,23 @@ _081A9010: ldr r0, [r0] movs r1, 0x80 lsls r1, 5 - b _081A9036 + b @081A9036 .align 2, 0 .pool -_081A9028: +@081A9028: ldr r2, =0x020375f0 ldr r0, [r3] ldr r3, =0x00000cdc adds r0, r3 -_081A9030: +@081A9030: ldr r0, [r0] movs r1, 0x80 lsls r1, 6 -_081A9036: +@081A9036: ands r0, r1 -_081A9038: +@081A9038: strh r0, [r2] -_081A903A: +@081A903A: pop {r4} pop {r0} bx r0 @@ -821113,7 +821113,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] @@ -821125,30 +821125,30 @@ sub_81A9048: @ 81A9048 ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x1 - beq _081A9098 + beq @081A9098 cmp r0, 0x1 - bgt _081A9078 + bgt @081A9078 cmp r0, 0 - beq _081A9082 - b _081A9126 + beq @081A9082 + b @081A9126 .align 2, 0 .pool -_081A9078: +@081A9078: cmp r0, 0x2 - beq _081A90B0 + beq @081A90B0 cmp r0, 0x7 - beq _081A911C - b _081A9126 -_081A9082: + beq @081A911C + b @081A9126 +@081A9082: ldr r0, =0x020375e4 ldrh r1, [r0] ldr r3, =0x00000e18 adds r0, r2, r3 strh r1, [r0] - b _081A9126 + b @081A9126 .align 2, 0 .pool -_081A9098: +@081A9098: lsls r1, 1 ldr r3, =0x00000e1a adds r0, r2, r3 @@ -821156,66 +821156,66 @@ _081A9098: ldr r1, =0x020375e4 ldrh r1, [r1] strh r1, [r0] - b _081A9126 + b @081A9126 .align 2, 0 .pool -_081A90B0: +@081A90B0: cmp r1, 0 - beq _081A90E4 + beq @081A90E4 ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0 - beq _081A90D0 + beq @081A90D0 ldr r1, =0x00000cdc adds r0, r2, r1 ldr r1, [r0] movs r2, 0x80 lsls r2, 6 - b _081A90F6 + b @081A90F6 .align 2, 0 .pool -_081A90D0: +@081A90D0: ldr r3, =0x00000cdc adds r0, r2, r3 ldr r1, [r0] ldr r2, =0xffffdfff - b _081A910C + b @081A910C .align 2, 0 .pool -_081A90E4: +@081A90E4: ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0 - beq _081A9104 + beq @081A9104 ldr r1, =0x00000cdc adds r0, r2, r1 ldr r1, [r0] movs r2, 0x80 lsls r2, 5 -_081A90F6: +@081A90F6: orrs r1, r2 str r1, [r0] - b _081A9126 + b @081A9126 .align 2, 0 .pool -_081A9104: +@081A9104: ldr r3, =0x00000cdc adds r0, r2, r3 ldr r1, [r0] ldr r2, =0xffffefff -_081A910C: +@081A910C: ands r1, r2 str r1, [r0] - b _081A9126 + b @081A9126 .align 2, 0 .pool -_081A911C: +@081A911C: ldr r0, =0x020375e4 ldrh r1, [r0] ldr r3, =0x00000e2a adds r0, r2, r3 strb r1, [r0] -_081A9126: +@081A9126: pop {r0} bx r0 .align 2, 0 @@ -821223,7 +821223,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] @@ -821254,7 +821254,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] @@ -821268,7 +821268,7 @@ sub_81A917C: @ 81A917C adds r1, r0 ldrh r0, [r1] cmp r0, 0x29 - bls _081A91CC + bls @081A91CC bl GenerateRandomNumber ldr r4, [r4] ldr r5, =0x08613f34 @@ -821282,10 +821282,10 @@ sub_81A917C: @ 81A917C ldrh r0, [r0] ldr r1, =0x00000e18 adds r4, r1 - b _081A91EA + b @081A91EA .align 2, 0 .pool -_081A91CC: +@081A91CC: bl GenerateRandomNumber ldr r4, [r4] ldr r5, =0x08613f28 @@ -821299,7 +821299,7 @@ _081A91CC: ldrh r0, [r0] ldr r2, =0x00000e18 adds r4, r2 -_081A91EA: +@081A91EA: strh r0, [r4] pop {r4,r5} pop {r0} @@ -821309,7 +821309,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] @@ -821321,7 +821321,7 @@ sub_81A91FC: @ 81A91FC lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x1 - bne _081A9244 + bne @081A9244 ldr r0, [r4] ldr r1, =0x00000e18 adds r0, r1 @@ -821335,14 +821335,14 @@ sub_81A91FC: @ 81A91FC strh r1, [r0] ldr r0, =0x020375f0 strh r5, [r0] - b _081A924A + b @081A924A .align 2, 0 .pool -_081A9244: +@081A9244: ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] -_081A924A: +@081A924A: pop {r4,r5} pop {r0} bx r0 @@ -821351,11 +821351,11 @@ _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 -_081A925A: +@081A925A: bl GenerateRandomNumber ldr r1, [r5] lsls r2, r4, 1 @@ -821365,7 +821365,7 @@ _081A925A: strh r0, [r1] adds r4, 0x1 cmp r4, 0x3 - ble _081A925A + ble @081A925A ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000e2a @@ -821380,7 +821380,7 @@ _081A925A: thumb_func_end sub_81A9254 thumb_func_start sub_81A9290 -sub_81A9290: @ 81A9290 +sub_81A9290: ; 81A9290 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -821415,10 +821415,10 @@ sub_81A9290: @ 81A9290 lsrs r0, 16 mov r8, r0 cmp r0, 0x13 - bls _081A92DE + bls @081A92DE movs r0, 0x13 mov r8, r0 -_081A92DE: +@081A92DE: bl sub_81AA9E4 lsls r0, 24 ldr r1, =0x020375f2 @@ -821445,8 +821445,8 @@ _081A92DE: lsls r0, 2 mov r9, r0 cmp r5, r4 - bge _081A9332 -_081A9318: + bge @081A9332 +@081A9318: bl GenerateRandomNumber2 lsls r0, 16 lsrs r0, 16 @@ -821457,8 +821457,8 @@ _081A9318: adds r5, 0x1 adds r0, r7, 0x1 cmp r5, r0 - blt _081A9318 -_081A9332: + blt @081A9318 +@081A9332: ldr r0, =0x08613b3a ldr r1, [sp] adds r0, r1, r0 @@ -821467,32 +821467,32 @@ _081A9332: ldr r3, =0x020375d8 ldr r4, =0x020375da cmp r5, 0x3E - bhi _081A935E + bhi @081A935E lsls r2, r5, 1 adds r0, r2, r1 ldrb r0, [r0] cmp r6, r0 - blt _081A935E + blt @081A935E adds r0, r2, r1 -_081A9350: +@081A9350: adds r0, 0x2 adds r5, 0x1 cmp r5, 0x3E - bhi _081A935E + bhi @081A935E ldrb r2, [r0] cmp r6, r2 - bge _081A9350 -_081A935E: + bge @081A9350 +@081A935E: mov r0, r10 cmp r0, 0 - beq _081A9394 + beq @081A9394 ldr r2, =0x0861392c - b _081A9396 + b @081A9396 .align 2, 0 .pool -_081A9394: +@081A9394: ldr r2, =0x0861379c -_081A9396: +@081A9396: lsls r0, r5, 1 adds r1, 0x1 adds r0, r1 @@ -821520,7 +821520,7 @@ _081A9396: thumb_func_end sub_81A9290 thumb_func_start sub_81A93C8 -sub_81A93C8: @ 81A93C8 +sub_81A93C8: ; 81A93C8 push {r4,r5,lr} ldr r0, =0x03005d8c ldr r0, [r0] @@ -821529,10 +821529,10 @@ sub_81A93C8: @ 81A93C8 adds r3, r0, r1 movs r2, 0 ldr r4, =0x020375f2 - b _081A93F4 + b @081A93F4 .align 2, 0 .pool -_081A93E4: +@081A93E4: adds r2, 0x1 lsls r0, r2, 1 adds r0, r2 @@ -821540,8 +821540,8 @@ _081A93E4: adds r0, r3 ldrb r0, [r0] cmp r0, 0 - beq _081A940A -_081A93F4: + beq @081A940A +@081A93F4: lsls r0, r2, 1 adds r0, r2 lsls r0, 3 @@ -821549,11 +821549,11 @@ _081A93F4: ldrb r0, [r1] ldrh r5, [r4] cmp r0, r5 - bne _081A93E4 + bne @081A93E4 ldr r0, =0x00007fff strh r0, [r1, 0x4] strh r0, [r1, 0x6] -_081A940A: +@081A940A: pop {r4,r5} pop {r0} bx r0 @@ -821562,7 +821562,7 @@ _081A940A: thumb_func_end sub_81A93C8 thumb_func_start sub_81A9414 -sub_81A9414: @ 81A9414 +sub_81A9414: ; 81A9414 ldr r1, =0x0203bc88 ldr r0, =0x085d5acc str r0, [r1] @@ -821572,7 +821572,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 @@ -821608,16 +821608,16 @@ sub_81A9424: @ 81A9424 ldrb r1, [r2] ldrb r0, [r0] cmp r1, r0 - bne _081A9488 + bne @081A9488 ldrb r2, [r2, 0x1] mov r9, r2 - b _081A94AE + b @081A94AE .align 2, 0 .pool -_081A9488: +@081A9488: adds r6, 0x1 cmp r6, 0x31 - bhi _081A94AE + bhi @081A94AE ldr r4, =0x08613c1c lsls r3, r6, 1 adds r2, r3, r4 @@ -821629,12 +821629,12 @@ _081A9488: ldrb r1, [r2] ldrb r0, [r0] cmp r1, r0 - bne _081A9488 + bne @081A9488 adds r0, r4, 0x1 adds r0, r3, r0 ldrb r0, [r0] mov r9, r0 -_081A94AE: +@081A94AE: ldr r3, =0x08613ed8 ldr r2, =0x02037350 ldr r0, =0x03005df0 @@ -821652,75 +821652,75 @@ _081A94AE: mov r3, r9 lsls r3, 2 mov r9, r3 -_081A94D0: +@081A94D0: ldr r0, [sp] cmp r0, 0x8 - bls _081A94D8 - b _081A95E8 -_081A94D8: + bls @081A94D8 + b @081A95E8 +@081A94D8: lsls r0, 2 - ldr r1, =_081A94FC + ldr r1, =@081A94FC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081A94FC: - .4byte _081A9520 - .4byte _081A9530 - .4byte _081A9572 - .4byte _081A95B4 - .4byte _081A95BA - .4byte _081A95C0 - .4byte _081A95C6 - .4byte _081A95D2 - .4byte _081A95DE -_081A9520: +@081A94FC: + .4byte @081A9520 + .4byte @081A9530 + .4byte @081A9572 + .4byte @081A95B4 + .4byte @081A95BA + .4byte @081A95C0 + .4byte @081A95C6 + .4byte @081A95D2 + .4byte @081A95DE +@081A9520: mov r0, sp movs r1, 0x8 movs r2, 0 bl sub_81A9998 lsls r0, 24 lsrs r7, r0, 24 - b _081A95EE -_081A9530: + b @081A95EE +@081A9530: movs r6, 0 ldr r2, =0x7fff0000 mov r4, r8 adds r4, 0x4 mov r5, r8 - b _081A9560 + b @081A9560 .align 2, 0 .pool -_081A9540: +@081A9540: ldrb r0, [r5, 0x1] cmp r0, 0x3B - bne _081A955A + bne @081A955A movs r1, 0 ldrsh r0, [r4, r1] asrs r1, r2, 16 cmp r0, r1 - beq _081A955A + beq @081A955A movs r3, 0x2 ldrsh r0, [r4, r3] cmp r0, r1 - beq _081A955A + beq @081A955A adds r7, 0x1 -_081A955A: +@081A955A: adds r4, 0x18 adds r5, 0x18 adds r6, 0x1 -_081A9560: +@081A9560: str r2, [sp, 0x4] bl sub_81AAA40 lsls r0, 24 lsrs r0, 24 ldr r2, [sp, 0x4] cmp r6, r0 - blt _081A9540 - b _081A95EE -_081A9572: + blt @081A9540 + b @081A95EE +@081A9572: bl sub_81AA9E4 lsls r0, 24 ldr r1, =0x08613650 @@ -821734,56 +821734,56 @@ _081A9572: ldrb r2, [r0] ldr r1, =0x0832a328 movs r6, 0x7 -_081A958E: +@081A958E: ldr r0, [r1] ands r0, r2 cmp r0, 0 - beq _081A9598 + beq @081A9598 subs r7, 0x1 -_081A9598: +@081A9598: adds r1, 0x4 subs r6, 0x1 cmp r6, 0 - bge _081A958E - b _081A95EE + bge @081A958E + b @081A95EE .align 2, 0 .pool -_081A95B4: +@081A95B4: mov r0, sp movs r1, 0x8 - b _081A95D6 -_081A95BA: + b @081A95D6 +@081A95BA: mov r0, sp movs r1, 0x8 - b _081A95CA -_081A95C0: + b @081A95CA +@081A95C0: mov r0, sp movs r1, 0x10 - b _081A95D6 -_081A95C6: + b @081A95D6 +@081A95C6: mov r0, sp movs r1, 0x10 -_081A95CA: +@081A95CA: movs r2, 0x1 bl sub_81A9998 - b _081A95E8 -_081A95D2: + b @081A95E8 +@081A95D2: mov r0, sp movs r1, 0x18 -_081A95D6: +@081A95D6: movs r2, 0x2 bl sub_81A9998 - b _081A95E8 -_081A95DE: + b @081A95E8 +@081A95DE: mov r0, sp movs r1, 0x18 movs r2, 0x1 bl sub_81A9998 -_081A95E8: +@081A95E8: cmp r6, 0 - bne _081A95EE - b _081A94D0 -_081A95EE: + bne @081A95EE + b @081A94D0 +@081A95EE: ldr r1, =0x08613ec0 add r1, r9 ldr r0, [sp] @@ -821807,7 +821807,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] @@ -821822,10 +821822,10 @@ sub_81A9618: @ 81A9618 ldrh r3, [r1] ldr r0, =0x000003e6 cmp r3, r0 - bhi _081A963A + bhi @081A963A adds r0, r3, 0x1 strh r0, [r1] -_081A963A: +@081A963A: ldr r0, [r5] adds r1, r0, r4 adds r1, r2 @@ -821835,9 +821835,9 @@ _081A963A: ldrh r1, [r1] ldrh r2, [r0] cmp r1, r2 - bls _081A9650 + bls @081A9650 strh r1, [r0] -_081A9650: +@081A9650: pop {r4,r5} pop {r0} bx r0 @@ -821846,7 +821846,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 sub_81A9E40 @@ -821861,18 +821861,18 @@ 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] cmp r0, 0 - beq _081A9698 + beq @081A9698 cmp r0, 0x1 - beq _081A96B4 - b _081A9754 + beq @081A96B4 + b @081A9754 .align 2, 0 .pool -_081A9698: +@081A9698: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x020375e2 @@ -821880,53 +821880,53 @@ _081A9698: ldr r2, =0x00000e68 adds r0, r2 strb r1, [r0] - b _081A9754 + b @081A9754 .align 2, 0 .pool -_081A96B4: +@081A96B4: ldr r4, =0x020375f0 ldrh r0, [r4] cmp r0, 0x1 - beq _081A9710 + beq @081A9710 cmp r0, 0x1 - bgt _081A9754 + bgt @081A9754 cmp r0, 0 - bne _081A9754 + bne @081A9754 ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081A9754 + bne @081A9754 ldr r0, =0x03005d90 ldr r0, [r0] ldr r2, =0x00000e68 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0x77 - bls _081A96F4 + bls @081A96F4 movs r0, 0x78 strb r0, [r1] - b _081A96FC + b @081A96FC .align 2, 0 .pool -_081A96F4: +@081A96F4: ldr r0, =0x020375e6 ldrh r0, [r0] bl audio_play -_081A96FC: +@081A96FC: ldr r1, =0x020375f0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _081A9754 + b @081A9754 .align 2, 0 .pool -_081A9710: +@081A9710: ldr r1, =0x020375e2 ldrh r0, [r1] cmp r0, 0 - beq _081A9750 + beq @081A9750 subs r0, 0x1 strh r0, [r1] ldr r3, =0x03005d90 @@ -821940,28 +821940,28 @@ _081A9710: adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0x78 - bls _081A973E + bls @081A973E movs r0, 0x78 strb r0, [r1] ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -_081A973E: +@081A973E: bl door_upload_tiles - b _081A9754 + b @081A9754 .align 2, 0 .pool -_081A9750: +@081A9750: movs r0, 0x2 strh r0, [r4] -_081A9754: +@081A9754: pop {r4} pop {r0} bx r0 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 @@ -821975,12 +821975,12 @@ sub_81A975C: @ 81A975C mov r9, r0 ldr r1, =0x020244ec mov r8, r1 -_081A9776: +@081A9776: movs r4, 0 adds r7, r5, 0x1 mov r6, r9 muls r6, r5 -_081A977E: +@081A977E: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 @@ -821989,22 +821989,22 @@ _081A977E: adds r1, r0, r1 ldrh r0, [r1] cmp r0, 0 - beq _081A97A2 + beq @081A97A2 subs r0, 0x1 cmp r0, r5 - bne _081A97A2 + bne @081A97A2 mov r1, r8 adds r0, r6, r1 movs r1, 0xC mov r2, sp bl pokemon_setattr -_081A97A2: +@081A97A2: adds r4, 0x1 cmp r4, 0x3 - ble _081A977E + ble @081A977E adds r5, r7, 0 cmp r5, 0x5 - ble _081A9776 + ble @081A9776 add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -822017,7 +822017,7 @@ _081A97A2: thumb_func_end sub_81A975C thumb_func_start sub_81A97C8 -sub_81A97C8: @ 81A97C8 +sub_81A97C8: ; 81A97C8 push {lr} ldr r0, =sub_81A97DC + 1 movs r1, 0 @@ -822029,7 +822029,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 @@ -822038,7 +822038,7 @@ sub_81A97DC: @ 81A97DC movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081A980C + beq @081A980C ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000cb2 @@ -822052,7 +822052,7 @@ sub_81A97DC: @ 81A97DC bl CpuSet adds r0, r4, 0 bl remove_task -_081A980C: +@081A980C: pop {r4} pop {r0} bx r0 @@ -822061,7 +822061,7 @@ _081A980C: thumb_func_end sub_81A97DC thumb_func_start sub_81A9828 -sub_81A9828: @ 81A9828 +sub_81A9828: ; 81A9828 push {lr} bl atk17_seteffectuser pop {r0} @@ -822069,7 +822069,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 @@ -822078,7 +822078,7 @@ sub_81A9834: @ 81A9834 sub sp, 0x18 movs r0, 0 str r0, [sp] -_081A9844: +@081A9844: ldr r0, =0x03005d90 ldr r0, [r0] ldr r2, [sp] @@ -822099,7 +822099,7 @@ _081A9844: adds r6, r1, r0 movs r1, 0 str r1, [sp, 0x10] -_081A986C: +@081A986C: ldr r2, =0x03005d8c ldr r0, [r2] adds r0, r6 @@ -822116,7 +822116,7 @@ _081A986C: bl pokemon_getattr ldr r3, [sp, 0x14] cmp r4, r0 - bne _081A993C + bne @081A993C movs r6, 0 adds r2, r5, 0x1 str r2, [sp, 0xC] @@ -822130,18 +822130,18 @@ _081A986C: ldr r7, [sp, 0x4] muls r7, r1 mov r10, r3 -_081A98AC: +@081A98AC: movs r5, 0 adds r0, r6, 0x1 mov r8, r0 - b _081A98C6 + b @081A98C6 .align 2, 0 .pool -_081A98C4: +@081A98C4: adds r5, 0x1 -_081A98C6: +@081A98C6: cmp r5, 0x3 - bgt _081A98EE + bgt @081A98EE ldr r1, =0x03005d8c ldr r0, [r1] add r0, r9 @@ -822157,20 +822157,20 @@ _081A98C6: movs r2, 0 bl pokemon_getattr cmp r4, r0 - bne _081A98C4 -_081A98EE: + bne @081A98C4 +@081A98EE: cmp r5, 0x4 - bne _081A9900 + bne @081A9900 lsls r2, r6, 24 lsrs r2, 24 mov r5, r10 adds r0, r7, r5 movs r1, 0xA6 bl sub_80691F4 -_081A9900: +@081A9900: mov r6, r8 cmp r6, 0x3 - ble _081A98AC + ble @081A98AC ldr r1, =0x03005d8c ldr r0, [r1] ldr r2, [sp, 0x8] @@ -822189,10 +822189,10 @@ _081A9900: mov r1, sp ldrb r1, [r1, 0xC] strb r1, [r0] - b _081A994C + b @081A994C .align 2, 0 .pool -_081A993C: +@081A993C: ldr r2, [sp, 0x10] adds r2, 0x64 str r2, [sp, 0x10] @@ -822200,21 +822200,21 @@ _081A993C: adds r0, 0x1 str r0, [sp, 0x4] cmp r0, 0x2 - ble _081A986C -_081A994C: + ble @081A986C +@081A994C: ldr r1, [sp] adds r1, 0x1 str r1, [sp] cmp r1, 0x2 - bgt _081A9958 - b _081A9844 -_081A9958: + bgt @081A9958 + b @081A9844 +@081A9958: movs r2, 0 str r2, [sp] ldr r4, =0x03005d90 ldr r3, =0x00000caa ldr r2, =0x0203cef8 -_081A9962: +@081A9962: ldr r1, [r4] ldr r5, [sp] lsls r0, r5, 1 @@ -822226,7 +822226,7 @@ _081A9962: adds r5, 0x1 str r5, [sp] cmp r5, 0x2 - ble _081A9962 + ble @081A9962 add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -822240,7 +822240,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 @@ -822267,16 +822267,16 @@ sub_81A9998: @ 81A9998 mov r12, r1 ldr r0, =0x02037350 mov r9, r0 -_081A99CC: +@081A99CC: movs r2, 0 -_081A99CE: +@081A99CE: lsls r0, r2, 1 adds r0, r5 ldrh r1, [r0] mov r0, r8 ands r0, r1 cmp r0, r12 - bne _081A9A8A + bne @081A9A8A adds r2, 0x7 ldr r0, =0x03005df0 ldrb r1, [r0] @@ -822292,87 +822292,87 @@ _081A99CE: ldrsh r0, [r0, r3] subs r3, r1, r0 cmp r2, r6 - bge _081A9A0E + bge @081A9A0E negs r0, r6 cmp r2, r0 - ble _081A9A0E + ble @081A9A0E cmp r3, r6 - bge _081A9A0E + bge @081A9A0E cmp r3, r0 - ble _081A9A0E + ble @081A9A0E cmp r7, 0 - bne _081A9A84 -_081A9A0E: + bne @081A9A84 +@081A9A0E: cmp r2, 0 - ble _081A9A34 + ble @081A9A34 cmp r3, 0 - ble _081A9A34 + ble @081A9A34 movs r4, 0x3 cmp r2, r3 - blt _081A9A7C + blt @081A9A7C movs r4, 0x2 - b _081A9A7C + b @081A9A7C .align 2, 0 .pool -_081A9A34: +@081A9A34: cmp r2, 0 - bge _081A9A46 + bge @081A9A46 cmp r3, 0 - bge _081A9A46 + bge @081A9A46 movs r4, 0x1 cmp r2, r3 - ble _081A9A7C + ble @081A9A7C movs r4, 0 - b _081A9A7C -_081A9A46: + b @081A9A7C +@081A9A46: cmp r2, 0 - bne _081A9A54 + bne @081A9A54 movs r4, 0 cmp r3, 0 - ble _081A9A7C + ble @081A9A7C movs r4, 0x3 - b _081A9A7C -_081A9A54: + b @081A9A7C +@081A9A54: cmp r3, 0 - bne _081A9A62 + bne @081A9A62 movs r4, 0x1 cmp r2, 0 - ble _081A9A7C + ble @081A9A7C movs r4, 0x2 - b _081A9A7C -_081A9A62: + b @081A9A7C +@081A9A62: cmp r2, 0 - bge _081A9A72 + bge @081A9A72 adds r0, r2, r3 movs r4, 0x1 cmp r0, 0 - ble _081A9A7C + ble @081A9A7C movs r4, 0x3 - b _081A9A7C -_081A9A72: + b @081A9A7C +@081A9A72: adds r0, r2, r3 mvns r0, r0 asrs r4, r0, 31 movs r0, 0x2 ands r4, r0 -_081A9A7C: +@081A9A7C: movs r0, 0 mov r5, r10 str r0, [r5] - b _081A9A98 -_081A9A84: + b @081A9A98 +@081A9A84: mov r0, r10 str r7, [r0] - b _081A9A98 -_081A9A8A: + b @081A9A98 +@081A9A8A: adds r2, 0x1 cmp r2, 0x1F - ble _081A99CE + ble @081A99CE adds r5, 0x5E adds r3, 0x1 cmp r3, 0x1F - ble _081A99CC -_081A9A98: + ble @081A99CC +@081A9A98: adds r0, r4, 0 pop {r3-r5} mov r8, r3 @@ -822384,7 +822384,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] @@ -822399,7 +822399,7 @@ sub_81A9AA8: @ 81A9AA8 thumb_func_end sub_81A9AA8 thumb_func_start sub_81A9AC4 -sub_81A9AC4: @ 81A9AC4 +sub_81A9AC4: ; 81A9AC4 push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -822428,7 +822428,7 @@ sub_81A9AC4: @ 81A9AC4 thumb_func_end sub_81A9AC4 thumb_func_start sub_81A9B04 -sub_81A9B04: @ 81A9B04 +sub_81A9B04: ; 81A9B04 push {lr} ldr r0, =0x02038bca ldrh r0, [r0] @@ -822439,7 +822439,7 @@ sub_81A9B04: @ 81A9B04 lsls r1, 8 ands r0, r1 cmp r0, 0 - beq _081A9B2E + beq @081A9B2E movs r0, 0x1 bl sub_80B47E0 ldr r1, =0x03005df0 @@ -822447,7 +822447,7 @@ sub_81A9B04: @ 81A9B04 ldr r0, =0x02038bcc ldrh r0, [r0] bl sub_81A9B44 -_081A9B2E: +@081A9B2E: pop {r0} bx r0 .align 2, 0 @@ -822455,7 +822455,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 @@ -822474,7 +822474,7 @@ sub_81A9B44: @ 81A9B44 ldr r0, =0x00000cb4 mov r8, r0 ldr r4, =0x0832a328 -_081A9B68: +@081A9B68: mov r1, r9 ldr r2, [r1] lsls r0, r3, 1 @@ -822483,18 +822483,18 @@ _081A9B68: adds r1, r0 ldrh r0, [r1] cmp r0, r5 - bne _081A9B86 + bne @081A9B86 ldr r1, =0x00000e2a adds r0, r2, r1 ldr r1, [r4] ldrb r2, [r0] orrs r1, r2 strb r1, [r0] -_081A9B86: +@081A9B86: adds r4, 0x4 adds r3, 0x1 cmp r3, 0x7 - ble _081A9B68 + ble @081A9B68 ldrb r1, [r6] lsls r0, r1, 3 adds r0, r1 @@ -822540,7 +822540,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 @@ -822564,18 +822564,18 @@ sub_81A9C04: @ 81A9C04 lsls r0, 16 lsrs r0, 16 cmp r0, 0x13 - bls _081A9C3A + bls @081A9C3A movs r0, 0x13 -_081A9C3A: +@081A9C3A: cmp r5, 0 - beq _081A9C54 + beq @081A9C54 ldr r1, =0x08613600 - b _081A9C56 + b @081A9C56 .align 2, 0 .pool -_081A9C54: +@081A9C54: ldr r1, =0x08612e30 -_081A9C56: +@081A9C56: lsls r0, 2 adds r0, r1 ldr r6, [r0] @@ -822606,7 +822606,7 @@ _081A9C56: mov r2, sp bl pokemon_setattr cmp r5, 0 - beq _081A9CD4 + beq @081A9CD4 bl sub_8165C40 lsls r0, 24 lsrs r5, r0, 24 @@ -822626,10 +822626,10 @@ _081A9C56: lsrs r0, 16 subs r0, 0x5 adds r5, r0 - b _081A9CF6 + b @081A9CF6 .align 2, 0 .pool -_081A9CD4: +@081A9CD4: bl GenerateRandomNumber ldr r2, [sp, 0x10] lsls r1, r2, 1 @@ -822645,7 +822645,7 @@ _081A9CD4: lsrs r0, 16 subs r0, 0x5 adds r5, r4, r0 -_081A9CF6: +@081A9CF6: ldr r4, =0x02024744 ldr r2, =0x083203cc ldr r1, [sp, 0x10] @@ -822677,14 +822677,14 @@ _081A9CF6: adds r0, r6 ldrb r1, [r0, 0x3] cmp r1, 0 - blt _081A9D4C + blt @081A9D4C cmp r1, 0x1 - bgt _081A9D4C + bgt @081A9D4C adds r2, r0, 0x3 - b _081A9D7C + b @081A9D7C .align 2, 0 .pool -_081A9D4C: +@081A9D4C: ldr r2, =0x083203cc ldr r1, [sp, 0x10] lsls r0, r1, 1 @@ -822698,7 +822698,7 @@ _081A9D4C: adds r0, r2 ldrb r0, [r0, 0x17] cmp r0, 0 - beq _081A9D90 + beq @081A9D90 ldr r4, =0x02024744 adds r0, r4, 0 movs r1, 0 @@ -822708,25 +822708,25 @@ _081A9D4C: ands r1, r0 str r1, [sp, 0xC] add r2, sp, 0xC -_081A9D7C: +@081A9D7C: adds r0, r4, 0 movs r1, 0x2E bl pokemon_setattr - b _081A9D9C + b @081A9D9C .align 2, 0 .pool -_081A9D90: +@081A9D90: str r0, [sp, 0xC] ldr r0, =0x02024744 add r2, sp, 0xC movs r1, 0x2E bl pokemon_setattr -_081A9D9C: +@081A9D9C: movs r0, 0 str r0, [sp, 0xC] movs r2, 0 lsls r4, r5, 1 -_081A9DA4: +@081A9DA4: ldr r1, [sp, 0x10] lsls r0, r1, 1 adds r0, r1 @@ -822745,7 +822745,7 @@ _081A9DA4: str r0, [sp, 0xC] adds r2, r0, 0 cmp r2, 0x3 - ble _081A9DA4 + ble @081A9DA4 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000e1a @@ -822753,7 +822753,7 @@ _081A9DA4: adds r0, r4 ldrh r0, [r0] cmp r0, 0x8B - bls _081A9E0C + bls @081A9E0C bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -822765,7 +822765,7 @@ _081A9DA4: str r0, [sp, 0x10] movs r0, 0 str r0, [sp, 0xC] -_081A9DF6: +@081A9DF6: adds r1, r0, 0 adds r1, 0x27 ldr r0, =0x02024744 @@ -822775,8 +822775,8 @@ _081A9DF6: adds r0, 0x1 str r0, [sp, 0xC] cmp r0, 0x5 - ble _081A9DF6 -_081A9E0C: + ble @081A9DF6 +@081A9E0C: ldr r0, =0x02024744 bl pokemon_calc_effective_stats add sp, 0x14 @@ -822788,7 +822788,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 @@ -822803,46 +822803,46 @@ sub_81A9E28: @ 81A9E28 thumb_func_end sub_81A9E28 thumb_func_start sub_81A9E40 -sub_81A9E40: @ 81A9E40 +sub_81A9E40: ; 81A9E40 push {lr} ldr r0, =0x02037318 ldrh r1, [r0, 0x12] ldr r0, =0x00000169 cmp r1, r0 - bne _081A9E58 + bne @081A9E58 movs r0, 0x1 - b _081A9E66 + b @081A9E66 .align 2, 0 .pool -_081A9E58: +@081A9E58: movs r0, 0xBD lsls r0, 1 cmp r1, r0 - beq _081A9E64 + beq @081A9E64 movs r0, 0 - b _081A9E66 -_081A9E64: + b @081A9E66 +@081A9E64: movs r0, 0x2 -_081A9E66: +@081A9E66: pop {r1} bx r1 thumb_func_end sub_81A9E40 thumb_func_start sub_81A9E6C -sub_81A9E6C: @ 81A9E6C +sub_81A9E6C: ; 81A9E6C push {lr} movs r2, 0 ldr r0, =0x02037318 ldrh r1, [r0, 0x12] ldr r0, =0x00000169 cmp r1, r0 - beq _081A9E80 + beq @081A9E80 adds r0, 0x11 cmp r1, r0 - bne _081A9E82 -_081A9E80: + bne @081A9E82 +@081A9E80: movs r2, 0x1 -_081A9E82: +@081A9E82: adds r0, r2, 0 pop {r1} bx r1 @@ -822851,12 +822851,12 @@ _081A9E82: thumb_func_end sub_81A9E6C thumb_func_start sub_81A9E90 -sub_81A9E90: @ 81A9E90 +sub_81A9E90: ; 81A9E90 push {lr} bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - beq _081A9EB8 + beq @081A9EB8 bl sub_81A9834 ldr r0, =0x03005d90 ldr r0, [r0] @@ -822868,7 +822868,7 @@ sub_81A9E90: @ 81A9E90 movs r1, 0 bl var_set bl copy_player_party_from_sav1 -_081A9EB8: +@081A9EB8: pop {r0} bx r0 .align 2, 0 @@ -822876,20 +822876,20 @@ _081A9EB8: thumb_func_end sub_81A9E90 thumb_func_start sub_81A9EC8 -sub_81A9EC8: @ 81A9EC8 +sub_81A9EC8: ; 81A9EC8 push {lr} bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - beq _081A9ED8 + beq @081A9ED8 bl do_reset -_081A9ED8: +@081A9ED8: pop {r0} bx r0 thumb_func_end sub_81A9EC8 thumb_func_start sub_81A9EDC -sub_81A9EDC: @ 81A9EDC +sub_81A9EDC: ; 81A9EDC push {lr} lsls r0, 16 lsrs r0, 16 @@ -822907,7 +822907,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 @@ -822925,7 +822925,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 @@ -822943,7 +822943,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 @@ -822958,28 +822958,28 @@ sub_81A9F3C: @ 81A9F3C adds r0, r3 ldrb r2, [r0] ldr r1, =0x08613b44 -_081A9F58: +@081A9F58: ldrb r0, [r1] cmp r0, r2 - bne _081A9F70 + bne @081A9F70 ldrb r0, [r1, 0x1] - b _081A9F7A + b @081A9F7A .align 2, 0 .pool -_081A9F70: +@081A9F70: adds r1, 0x4 adds r4, 0x1 cmp r4, 0x35 - bls _081A9F58 + bls @081A9F58 movs r0, 0 -_081A9F7A: +@081A9F7A: pop {r4} pop {r1} bx r1 thumb_func_end sub_81A9F3C thumb_func_start sub_81A9F80 -sub_81A9F80: @ 81A9F80 +sub_81A9F80: ; 81A9F80 push {lr} ldr r0, =0x08252c88 bl script_env_1_execute_new_script @@ -822990,7 +822990,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} @@ -823015,12 +823015,12 @@ sub_81A9F90: @ 81A9F90 adds r4, r1 ldrh r1, [r4] cmp r1, 0x7 - bne _081AA020 + bne @081AA020 adds r0, 0x1 lsls r7, r0, 24 lsls r1, 24 mov r8, r1 -_081A9FCC: +@081A9FCC: lsrs r0, r7, 24 mov r2, r8 lsrs r1, r2, 24 @@ -823029,37 +823029,37 @@ _081A9FCC: lsrs r3, r0, 16 movs r2, 0 cmp r2, r5 - bge _081AA004 + bge @081AA004 ldr r1, =0x03005d90 ldr r0, [r1] ldr r4, =0x00000cb4 adds r0, r4 ldrh r0, [r0] cmp r0, r3 - beq _081AA004 + beq @081AA004 adds r6, r1, 0 -_081A9FF0: +@081A9FF0: adds r2, 0x1 cmp r2, r5 - bge _081AA004 + bge @081AA004 ldr r0, [r6] lsls r1, r2, 1 adds r0, r4 adds r0, r1 ldrh r0, [r0] cmp r0, r3 - bne _081A9FF0 -_081AA004: + bne @081A9FF0 +@081AA004: cmp r2, r5 - bne _081A9FCC - b _081AA062 + bne @081A9FCC + b @081AA062 .align 2, 0 .pool -_081AA020: +@081AA020: lsls r1, 24 mov r8, r1 lsls r7, r0, 24 -_081AA026: +@081AA026: lsrs r0, r7, 24 mov r2, r8 lsrs r1, r2, 24 @@ -823068,30 +823068,30 @@ _081AA026: lsrs r3, r0, 16 movs r2, 0 cmp r2, r5 - bge _081AA05E + bge @081AA05E ldr r1, =0x03005d90 ldr r0, [r1] ldr r4, =0x00000cb4 adds r0, r4 ldrh r0, [r0] cmp r0, r3 - beq _081AA05E + beq @081AA05E adds r6, r1, 0 -_081AA04A: +@081AA04A: adds r2, 0x1 cmp r2, r5 - bge _081AA05E + bge @081AA05E ldr r0, [r6] lsls r1, r2, 1 adds r0, r4 adds r0, r1 ldrh r0, [r0] cmp r0, r3 - bne _081AA04A -_081AA05E: + bne @081AA04A +@081AA05E: cmp r2, r5 - bne _081AA026 -_081AA062: + bne @081AA026 +@081AA062: adds r0, r3, 0 pop {r3} mov r8, r3 @@ -823103,7 +823103,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 @@ -823124,7 +823124,7 @@ sub_81AA078: @ 81AA078 adds r1, r4, 0 bl sub_81AA33C movs r7, 0 -_081AA0A6: +@081AA0A6: ldr r1, [sp, 0xC] adds r0, r1, r7 ldrb r0, [r0] @@ -823152,9 +823152,9 @@ _081AA0A6: mov r9, r0 adds r1, r7, 0 cmp r7, 0 - bge _081AA0E0 + bge @081AA0E0 adds r1, r7, 0x3 -_081AA0E0: +@081AA0E0: asrs r1, 2 ldr r4, [r6, 0x4] adds r0, r1, 0 @@ -823175,44 +823175,44 @@ _081AA0E0: adds r2, r7, 0x1 str r2, [sp, 0x10] cmp r8, r4 - bge _081AA1B6 -_081AA10A: + bge @081AA1B6 +@081AA10A: movs r0, 0 mov r12, r0 mov r1, r8 adds r1, 0x1 str r1, [sp, 0x14] cmp r12, r3 - bge _081AA1A2 + bge @081AA1A2 ldr r2, =0x03005d8c str r2, [sp, 0x18] mov r4, r9 mov r5, r10 -_081AA120: +@081AA120: ldrh r1, [r5] ldr r0, =0x000003ff ands r0, r1 ldr r2, =0x0000028e cmp r0, r2 - bne _081AA194 + bne @081AA194 mov r0, sp ldrb r0, [r0, 0x1] cmp r7, r0 - beq _081AA194 + beq @081AA194 mov r0, sp ldrb r0, [r0] cmp r7, r0 - bne _081AA164 + bne @081AA164 ldr r1, [sp, 0x8] cmp r1, 0 - bne _081AA164 + bne @081AA164 ldr r2, [sp, 0x18] ldr r3, [r2] adds r2, r7, 0 cmp r7, 0 - bge _081AA14E + bge @081AA14E adds r2, r7, 0x3 -_081AA14E: +@081AA14E: asrs r2, 2 lsls r1, r2, 2 subs r1, r7, r1 @@ -823224,7 +823224,7 @@ _081AA14E: muls r0, r2 add r0, r8 strh r0, [r3, 0x2] -_081AA164: +@081AA164: ldrh r0, [r5] movs r1, 0xFC lsls r1, 8 @@ -823234,19 +823234,19 @@ _081AA164: orrs r1, r0 strh r1, [r4] ldr r3, [r6] - b _081AA196 + b @081AA196 .align 2, 0 .pool -_081AA194: +@081AA194: strh r1, [r4] -_081AA196: +@081AA196: adds r4, 0x2 adds r5, 0x2 movs r0, 0x1 add r12, r0 cmp r12, r3 - blt _081AA120 -_081AA1A2: + blt @081AA120 +@081AA1A2: lsls r0, r3, 3 adds r0, 0x1E add r9, r0 @@ -823256,13 +823256,13 @@ _081AA1A2: mov r8, r1 ldr r0, [r6, 0x4] cmp r8, r0 - blt _081AA10A -_081AA1B6: + blt @081AA10A +@081AA1B6: ldr r7, [sp, 0x10] cmp r7, 0xF - bgt _081AA1BE - b _081AA0A6 -_081AA1BE: + bgt @081AA1BE + b @081AA0A6 +@081AA1BE: bl mapheader_run_script_with_tag_x1 ldr r0, [sp, 0xC] bl free @@ -823277,7 +823277,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} @@ -823291,7 +823291,7 @@ sub_81AA1D8: @ 81AA1D8 ldr r3, =0x00000cb4 ldr r0, =0x0000ffff adds r2, r0, 0 -_081AA1F2: +@081AA1F2: ldr r0, [r4] lsls r1, r5, 1 adds r0, r3 @@ -823301,7 +823301,7 @@ _081AA1F2: strh r1, [r0] adds r5, 0x1 cmp r5, 0x7 - ble _081AA1F2 + ble @081AA1F2 bl sub_81AA9E4 lsls r0, 24 lsrs r7, r0, 24 @@ -823319,73 +823319,73 @@ _081AA1F2: mov r0, r8 bl CpuSet movs r5, 0 -_081AA22E: +@081AA22E: cmp r5, 0 - bne _081AA254 + bne @081AA254 ldr r1, =0x08613650 lsls r0, r7, 4 adds r0, r1 ldrb r0, [r0, 0x3] - b _081AA25C + b @081AA25C .align 2, 0 .pool -_081AA254: +@081AA254: ldr r1, =0x08613650 lsls r0, r7, 4 adds r0, r1 ldrb r0, [r0, 0x2] -_081AA25C: +@081AA25C: cmp r0, 0x4 - bhi _081AA2E4 + bhi @081AA2E4 lsls r0, 2 - ldr r1, =_081AA274 + ldr r1, =@081AA274 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081AA274: - .4byte _081AA288 - .4byte _081AA292 - .4byte _081AA2A2 - .4byte _081AA2B0 - .4byte _081AA2CC -_081AA288: +@081AA274: + .4byte @081AA288 + .4byte @081AA292 + .4byte @081AA2A2 + .4byte @081AA2B0 + .4byte @081AA2CC +@081AA288: lsls r0, r5, 24 lsrs r0, 24 bl sub_81AA398 - b _081AA2E4 -_081AA292: + b @081AA2E4 +@081AA292: lsls r0, r5, 24 lsrs r4, r0, 24 mov r0, sp ldrb r1, [r0] adds r0, r4, 0 bl sub_81AA4D8 - b _081AA2BE -_081AA2A2: + b @081AA2BE +@081AA2A2: lsls r0, r5, 24 lsrs r4, r0, 24 ldrb r1, [r6] adds r0, r4, 0 bl sub_81AA4D8 - b _081AA2BE -_081AA2B0: + b @081AA2BE +@081AA2B0: lsls r0, r5, 24 lsrs r4, r0, 24 mov r0, sp ldrb r1, [r0] adds r0, r4, 0 bl sub_81AA648 -_081AA2BE: +@081AA2BE: lsls r0, 24 cmp r0, 0 - beq _081AA2E4 + beq @081AA2E4 adds r0, r4, 0 bl sub_81AA398 - b _081AA2E4 -_081AA2CC: + b @081AA2E4 +@081AA2CC: lsls r0, r5, 24 lsrs r4, r0, 24 ldrb r1, [r6] @@ -823393,13 +823393,13 @@ _081AA2CC: bl sub_81AA648 lsls r0, 24 cmp r0, 0 - beq _081AA2E4 + beq @081AA2E4 adds r0, r4, 0 bl sub_81AA398 -_081AA2E4: +@081AA2E4: adds r5, 0x1 cmp r5, 0x1 - ble _081AA22E + ble @081AA22E add sp, 0x8 pop {r3} mov r8, r3 @@ -823409,7 +823409,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] @@ -823422,29 +823422,29 @@ sub_81AA2F8: @ 81AA2F8 lsls r3, 4 adds r2, r0, r3 movs r3, 0x3F -_081AA310: +@081AA310: ldrb r0, [r2, 0x1] cmp r0, 0x3B - beq _081AA328 + beq @081AA328 str r5, [r1] - b _081AA32A + b @081AA32A .align 2, 0 .pool -_081AA328: +@081AA328: str r4, [r1] -_081AA32A: +@081AA32A: adds r1, 0x18 adds r2, 0x18 subs r3, 0x1 cmp r3, 0 - bge _081AA310 + bge @081AA310 pop {r4,r5} pop {r0} bx r0 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 @@ -823462,7 +823462,7 @@ sub_81AA33C: @ 81AA33C ands r0, r3 strb r0, [r6] cmp r2, r0 - bne _081AA386 + bne @081AA386 ldr r1, [r5] ldr r2, =0x00000e28 adds r0, r1, r2 @@ -823482,7 +823482,7 @@ sub_81AA33C: @ 81AA33C lsls r0, 4 subs r0, r2, r0 strb r0, [r6] -_081AA386: +@081AA386: pop {r4-r7} pop {r0} bx r0 @@ -823491,7 +823491,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 @@ -823518,7 +823518,7 @@ sub_81AA398: @ 81AA398 ands r4, r0 ldr r0, [sp] cmp r0, 0 - bne _081AA3F0 + bne @081AA3F0 ldr r1, =0x08613650 lsls r0, r6, 4 adds r0, r1 @@ -823526,10 +823526,10 @@ sub_81AA398: @ 81AA398 mov r10, r0 movs r1, 0 str r1, [sp, 0x4] - b _081AA3FE + b @081AA3FE .align 2, 0 .pool -_081AA3F0: +@081AA3F0: ldr r1, =0x08613650 lsls r0, r6, 4 adds r0, r1 @@ -823537,19 +823537,19 @@ _081AA3F0: mov r10, r1 ldrb r0, [r0, 0x1] str r0, [sp, 0x4] -_081AA3FE: +@081AA3FE: movs r0, 0 mov r8, r0 cmp r8, r10 - bge _081AA4C0 -_081AA406: + bge @081AA4C0 +@081AA406: movs r1, 0x1 add r1, r8 mov r9, r1 - b _081AA42E + b @081AA42E .align 2, 0 .pool -_081AA414: +@081AA414: lsls r2, r4, 24 lsrs r2, 24 ldr r3, [sp, 0x4] @@ -823561,8 +823561,8 @@ _081AA414: bl sub_81AA760 lsls r0, 24 cmp r0, 0 - beq _081AA4B6 -_081AA42E: + beq @081AA4B6 +@081AA42E: ldr r0, =0x0832a328 mov r12, r0 ldr r6, =0x03005d90 @@ -823571,39 +823571,39 @@ _081AA42E: lsls r0, r4, 2 mov r1, r12 adds r2, r0, r1 -_081AA43E: +@081AA43E: movs r0, 0x1 ands r0, r5 cmp r0, 0 - beq _081AA464 + beq @081AA464 ldr r0, [r6] adds r0, r7 ldrh r1, [r0] ldr r0, [r2] ands r0, r1 cmp r0, 0 - bne _081AA474 - b _081AA472 + bne @081AA474 + b @081AA472 .align 2, 0 .pool -_081AA464: +@081AA464: ldr r0, [r6] adds r0, r7 ldrh r1, [r0] ldr r0, [r2] ands r0, r1 cmp r0, 0 - beq _081AA474 -_081AA472: + beq @081AA474 +@081AA472: orrs r5, r3 -_081AA474: +@081AA474: adds r2, 0x4 adds r4, 0x1 cmp r4, 0xF - ble _081AA480 + ble @081AA480 mov r2, r12 movs r4, 0 -_081AA480: +@081AA480: ldr r0, [r6] ldr r1, =0x00000e26 adds r0, r1 @@ -823611,35 +823611,35 @@ _081AA480: movs r0, 0xF ands r1, r0 cmp r4, r1 - bne _081AA4A6 + bne @081AA4A6 movs r1, 0x1 adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _081AA4A4 + beq @081AA4A4 movs r0, 0x6 orrs r5, r0 - b _081AA4A6 + b @081AA4A6 .align 2, 0 .pool -_081AA4A4: +@081AA4A4: orrs r5, r1 -_081AA4A6: +@081AA4A6: adds r0, r5, 0 ands r0, r3 cmp r0, 0 - beq _081AA43E + beq @081AA43E movs r0, 0x4 ands r0, r5 cmp r0, 0 - beq _081AA414 -_081AA4B6: + beq @081AA414 +@081AA4B6: movs r0, 0x1 ands r5, r0 mov r8, r9 cmp r8, r10 - blt _081AA406 -_081AA4C0: + blt @081AA406 +@081AA4C0: ldr r0, [sp, 0x8] bl free add sp, 0xC @@ -823653,7 +823653,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 @@ -823679,24 +823679,24 @@ sub_81AA4D8: @ 81AA4D8 bl sub_81AA96C ldr r1, [sp] cmp r1, 0 - bne _081AA524 + bne @081AA524 ldr r1, =0x08613650 lsls r0, r4, 4 adds r0, r1 ldrb r0, [r0, 0x1] str r0, [sp, 0x10] movs r0, 0 - b _081AA530 + b @081AA530 .align 2, 0 .pool -_081AA524: +@081AA524: ldr r1, =0x08613650 lsls r0, r4, 4 adds r0, r1 ldrb r2, [r0] str r2, [sp, 0x10] ldrb r0, [r0, 0x1] -_081AA530: +@081AA530: movs r3, 0 str r3, [sp, 0x8] ldr r1, [sp, 0x10] @@ -823704,14 +823704,14 @@ _081AA530: str r1, [sp, 0x18] ldr r2, [sp, 0x10] cmp r3, r2 - bge _081AA622 + bge @081AA622 str r0, [sp, 0x1C] adds r3, r0, 0 lsls r3, 24 mov r9, r3 -_081AA548: +@081AA548: cmp r7, 0 - bne _081AA56E + bne @081AA56E mov r0, r9 lsrs r3, r0, 24 ldr r0, [sp] @@ -823720,20 +823720,20 @@ _081AA548: bl sub_81AA760 lsls r0, 24 cmp r0, 0 - beq _081AA568 + beq @081AA568 movs r7, 0x1 - b _081AA56E + b @081AA56E .align 2, 0 .pool -_081AA568: +@081AA568: ldr r1, [sp, 0xC] adds r1, 0x1 str r1, [sp, 0xC] -_081AA56E: +@081AA56E: movs r0, 0x1 ands r0, r7 cmp r0, 0 - beq _081AA600 + beq @081AA600 ldr r2, =0x08613f46 mov r8, r2 ldr r3, [sp, 0x4] @@ -823751,13 +823751,13 @@ _081AA56E: mov r10, r1 adds r5, r4, 0 cmp r0, 0 - beq _081AA5E8 + beq @081AA5E8 ldr r4, [sp, 0xC] adds r4, 0x1 - b _081AA5C2 + b @081AA5C2 .align 2, 0 .pool -_081AA5A8: +@081AA5A8: adds r0, r6, r5 adds r0, r2 ldrb r2, [r0] @@ -823769,8 +823769,8 @@ _081AA5A8: bl sub_81AA760 lsls r0, 24 cmp r0, 0 - beq _081AA5E0 -_081AA5C2: + beq @081AA5E0 +@081AA5C2: adds r6, 0x1 ldr r0, =0x08613f46 adds r1, r6, r5 @@ -823778,40 +823778,40 @@ _081AA5C2: ldrb r1, [r1] adds r2, r0, 0 cmp r1, 0xFF - beq _081AA5D6 + beq @081AA5D6 cmp r6, 0x3 - ble _081AA5D8 -_081AA5D6: + ble @081AA5D8 +@081AA5D6: movs r6, 0 -_081AA5D8: +@081AA5D8: adds r7, 0x2 asrs r0, r7, 1 cmp r0, 0x4 - bne _081AA5A8 -_081AA5E0: + bne @081AA5A8 +@081AA5E0: str r4, [sp, 0xC] - b _081AA600 + b @081AA600 .align 2, 0 .pool -_081AA5E8: +@081AA5E8: adds r6, 0x1 adds r0, r6, r4 add r0, r8 ldrb r0, [r0] cmp r0, 0xFF - beq _081AA5F8 + beq @081AA5F8 cmp r6, 0x3 - ble _081AA5FA -_081AA5F8: + ble @081AA5FA +@081AA5F8: movs r6, 0 -_081AA5FA: +@081AA5FA: ldr r1, [sp, 0xC] adds r1, 0x1 str r1, [sp, 0xC] -_081AA600: +@081AA600: asrs r0, r7, 1 cmp r0, 0x4 - beq _081AA622 + beq @081AA622 movs r0, 0x1 ands r7, r0 ldr r2, [sp, 0x1C] @@ -823825,8 +823825,8 @@ _081AA600: str r0, [sp, 0x8] ldr r1, [sp, 0x10] cmp r0, r1 - blt _081AA548 -_081AA622: + blt @081AA548 +@081AA622: movs r1, 0 ldr r2, [sp, 0x10] ldr r3, [sp, 0x18] @@ -823834,9 +823834,9 @@ _081AA622: asrs r0, 1 ldr r2, [sp, 0xC] cmp r0, r2 - ble _081AA634 + ble @081AA634 movs r1, 0x1 -_081AA634: +@081AA634: adds r0, r1, 0 add sp, 0x20 pop {r3-r5} @@ -823849,7 +823849,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 @@ -823874,36 +823874,36 @@ sub_81AA648: @ 81AA648 bl sub_81AA96C ldr r1, [sp] cmp r1, 0 - bne _081AA694 + bne @081AA694 ldr r1, =0x08613650 lsls r0, r5, 4 adds r0, r1 ldrb r0, [r0, 0x1] mov r10, r0 movs r0, 0 - b _081AA6A0 + b @081AA6A0 .align 2, 0 .pool -_081AA694: +@081AA694: ldr r1, =0x08613650 lsls r0, r5, 4 adds r0, r1 ldrb r2, [r0] mov r10, r2 ldrb r0, [r0, 0x1] -_081AA6A0: +@081AA6A0: movs r3, 0 str r3, [sp, 0x4] mov r1, r10 asrs r1, 31 str r1, [sp, 0xC] cmp r3, r10 - bge _081AA73E + bge @081AA73E ldr r2, =0x08613f46 mov r9, r2 lsls r5, r6, 2 lsls r6, r0, 24 -_081AA6B6: +@081AA6B6: adds r0, r4, r5 add r0, r9 ldrb r2, [r0] @@ -823913,12 +823913,12 @@ _081AA6B6: bl sub_81AA760 lsls r0, 24 cmp r0, 0 - beq _081AA714 + beq @081AA714 adds r7, 0x1 - b _081AA6EE + b @081AA6EE .align 2, 0 .pool -_081AA6D8: +@081AA6D8: adds r0, r4, r5 adds r0, r1 ldrb r2, [r0] @@ -823928,45 +823928,45 @@ _081AA6D8: bl sub_81AA760 lsls r0, 24 cmp r0, 0 - beq _081AA728 -_081AA6EE: + beq @081AA728 +@081AA6EE: adds r4, 0x1 adds r0, r4, r5 add r0, r9 ldrb r0, [r0] ldr r1, =0x08613f46 cmp r0, 0xFF - beq _081AA700 + beq @081AA700 cmp r4, 0x3 - ble _081AA702 -_081AA700: + ble @081AA702 +@081AA700: movs r4, 0 -_081AA702: +@081AA702: movs r3, 0x1 add r8, r3 mov r0, r8 cmp r0, 0x4 - bne _081AA6D8 - b _081AA728 + bne @081AA6D8 + b @081AA728 .align 2, 0 .pool -_081AA714: +@081AA714: adds r4, 0x1 adds r0, r4, r5 add r0, r9 ldrb r0, [r0] cmp r0, 0xFF - beq _081AA724 + beq @081AA724 cmp r4, 0x3 - ble _081AA726 -_081AA724: + ble @081AA726 +@081AA724: movs r4, 0 -_081AA726: +@081AA726: adds r7, 0x1 -_081AA728: +@081AA728: mov r1, r8 cmp r1, 0x4 - beq _081AA73E + beq @081AA73E movs r2, 0x80 lsls r2, 17 adds r6, r2 @@ -823974,17 +823974,17 @@ _081AA728: adds r3, 0x1 str r3, [sp, 0x4] cmp r3, r10 - blt _081AA6B6 -_081AA73E: + blt @081AA6B6 +@081AA73E: movs r1, 0 mov r2, r10 ldr r3, [sp, 0xC] subs r0, r2, r3 asrs r0, 1 cmp r0, r7 - ble _081AA74E + ble @081AA74E movs r1, 0x1 -_081AA74E: +@081AA74E: adds r0, r1, 0 add sp, 0x10 pop {r3-r5} @@ -823997,7 +823997,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 @@ -824021,12 +824021,12 @@ sub_81AA760: @ 81AA760 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081AA7D0 + beq @081AA7D0 movs r6, 0x7 -_081AA792: +@081AA792: movs r4, 0x7 lsls r5, r6, 24 -_081AA796: +@081AA796: lsls r1, r4, 24 lsrs r1, 24 mov r0, r8 @@ -824038,27 +824038,27 @@ _081AA796: bl sub_81AA810 lsls r0, 24 cmp r0, 0 - beq _081AA7CC + beq @081AA7CC subs r4, 0x1 cmp r4, 0 - bge _081AA796 + bge @081AA796 subs r6, 0x1 movs r1, 0x1 negs r1, r1 cmp r6, r1 - bgt _081AA792 - b _081AA7FC + bgt @081AA792 + b @081AA7FC .align 2, 0 .pool -_081AA7CC: +@081AA7CC: movs r0, 0 - b _081AA7FE -_081AA7D0: + b @081AA7FE +@081AA7D0: movs r6, 0 -_081AA7D2: +@081AA7D2: movs r4, 0 lsls r5, r6, 24 -_081AA7D6: +@081AA7D6: lsls r1, r4, 24 lsrs r1, 24 mov r0, r8 @@ -824070,16 +824070,16 @@ _081AA7D6: bl sub_81AA810 lsls r0, 24 cmp r0, 0 - beq _081AA7CC + beq @081AA7CC adds r4, 0x1 cmp r4, 0x7 - ble _081AA7D6 + ble @081AA7D6 adds r6, 0x1 cmp r6, 0x7 - ble _081AA7D2 -_081AA7FC: + ble @081AA7D2 +@081AA7FC: movs r0, 0x1 -_081AA7FE: +@081AA7FE: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -824091,7 +824091,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 @@ -824130,12 +824130,12 @@ sub_81AA810: @ 81AA810 ldr r1, [r5, 0x4] ldrb r2, [r1] cmp r7, r2 - bge _081AA95A + bge @081AA95A movs r0, 0x3 ands r0, r4 lsls r0, 3 str r0, [sp, 0xC] -_081AA868: +@081AA868: ldr r1, [r1, 0x4] lsls r2, r7, 1 adds r0, r2, r7 @@ -824148,30 +824148,30 @@ _081AA868: mov r9, r2 ldr r2, [sp, 0x4] cmp r0, r2 - bne _081AA950 + bne @081AA950 movs r4, 0x6 ldrsh r0, [r3, r4] cmp r0, r8 - bne _081AA950 + bne @081AA950 ldr r0, [sp] cmp r0, 0 - bne _081AA896 + bne @081AA896 ldrb r0, [r3, 0x1] cmp r0, 0x3B - bne _081AA8A2 -_081AA896: + bne @081AA8A2 +@081AA896: ldr r1, [sp] cmp r1, 0x1 - bne _081AA950 + bne @081AA950 ldrb r0, [r3, 0x1] cmp r0, 0x3B - bne _081AA950 -_081AA8A2: + bne @081AA950 +@081AA8A2: movs r3, 0 ldr r2, [r5, 0x4] mov r12, r2 cmp r3, r6 - bge _081AA8DC + bge @081AA8DC ldr r4, [sp, 0x4] ldr r0, [sp, 0xC] adds r4, r0 @@ -824183,24 +824183,24 @@ _081AA8A2: adds r1, r2, r0 ldr r2, [sp, 0x8] adds r2, 0x4 -_081AA8C2: +@081AA8C2: movs r4, 0 ldrsh r0, [r2, r4] ldr r4, [sp, 0x10] cmp r0, r4 - bne _081AA8D4 + bne @081AA8D4 movs r4, 0x2 ldrsh r0, [r2, r4] cmp r0, r1 - beq _081AA8DC -_081AA8D4: + beq @081AA8DC +@081AA8D4: adds r2, 0x18 adds r3, 0x1 cmp r3, r6 - blt _081AA8C2 -_081AA8DC: + blt @081AA8C2 +@081AA8DC: cmp r3, r6 - bne _081AA950 + bne @081AA950 lsls r0, r6, 1 mov r8, r0 adds r0, r6 @@ -824232,7 +824232,7 @@ _081AA8DC: strb r0, [r5] ldrb r0, [r5, 0x1] cmp r0, 0x3B - beq _081AA940 + beq @081AA940 adds r0, r6, 0 bl sub_81A9F90 lsls r0, 16 @@ -824247,20 +824247,20 @@ _081AA8DC: adds r0, r1 add r0, r8 strh r4, [r0] -_081AA940: +@081AA940: movs r0, 0 - b _081AA95C + b @081AA95C .align 2, 0 .pool -_081AA950: +@081AA950: adds r7, 0x1 mov r1, r12 ldrb r2, [r1] cmp r7, r2 - blt _081AA868 -_081AA95A: + blt @081AA868 +@081AA95A: movs r0, 0x1 -_081AA95C: +@081AA95C: add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -824272,7 +824272,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 @@ -824292,7 +824292,7 @@ sub_81AA96C: @ 81AA96C ldr r2, =0x08613655 mov r12, r2 movs r7, 0x7 -_081AA994: +@081AA994: adds r2, r6, r3 adds r0, r4, 0 ands r0, r7 @@ -824303,7 +824303,7 @@ _081AA994: strb r0, [r2] asrs r4, 3 cmp r3, 0x7 - bne _081AA9C0 + bne @081AA9C0 ldr r0, =0x03005d90 ldr r1, [r0] ldr r2, =0x00000e26 @@ -824315,10 +824315,10 @@ _081AA994: lsls r0, 16 orrs r4, r0 asrs r4, 8 -_081AA9C0: +@081AA9C0: adds r3, 0x1 cmp r3, 0xF - ble _081AA994 + ble @081AA994 pop {r4-r7} pop {r0} bx r0 @@ -824327,7 +824327,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] @@ -824345,33 +824345,33 @@ sub_81AA9E4: @ 81AA9E4 adds r0, r1 ldrb r2, [r0] cmp r2, 0x21 - bhi _081AAA38 + bhi @081AAA38 ldr r1, =0x08613750 lsls r0, r2, 1 adds r0, r1 -_081AAA10: +@081AAA10: ldrb r1, [r0] cmp r3, r1 - bge _081AAA30 + bge @081AAA30 ldrb r0, [r0, 0x1] - b _081AAA3A + b @081AAA3A .align 2, 0 .pool -_081AAA30: +@081AAA30: adds r0, 0x2 adds r2, 0x1 cmp r2, 0x21 - bls _081AAA10 -_081AAA38: + bls @081AAA10 +@081AAA38: movs r0, 0 -_081AAA3A: +@081AAA3A: pop {r4} pop {r1} bx r1 thumb_func_end sub_81AA9E4 thumb_func_start sub_81AAA40 -sub_81AAA40: @ 81AAA40 +sub_81AAA40: ; 81AAA40 push {lr} ldr r0, =0x03005d8c ldr r0, [r0] @@ -824382,31 +824382,31 @@ sub_81AAA40: @ 81AAA40 movs r3, 0xC7 lsls r3, 4 adds r0, r3 - b _081AAA6E + b @081AAA6E .align 2, 0 .pool -_081AAA5C: +@081AAA5C: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xF - bhi _081AAA74 + bhi @081AAA74 lsls r0, r1, 1 adds r0, r1 lsls r0, 3 adds r0, r2 -_081AAA6E: +@081AAA6E: ldrb r0, [r0] cmp r0, 0 - bne _081AAA5C -_081AAA74: + bne @081AAA5C +@081AAA74: adds r0, r1, 0 pop {r1} bx r1 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} @@ -824424,7 +824424,7 @@ sub_81AAA7C: @ 81AAA7C movs r6, 0 ldr r5, =0x00000e54 lsls r2, r1, 2 -_081AAA9E: +@081AAA9E: mov r1, r8 ldr r0, [r1] adds r1, r0, r7 @@ -824438,7 +824438,7 @@ _081AAA9E: adds r2, 0x2 adds r3, 0x1 cmp r3, 0x9 - ble _081AAA9E + ble @081AAA9E movs r0, 0x15 movs r1, 0x1 bl sub_80D7204 @@ -824455,7 +824455,7 @@ _081AAA9E: thumb_func_end sub_81AAA7C thumb_func_start sub_81AAAE0 -sub_81AAAE0: @ 81AAAE0 +sub_81AAAE0: ; 81AAAE0 push {r4-r6,lr} ldr r0, =0x03005d90 ldr r1, [r0] @@ -824474,9 +824474,9 @@ sub_81AAAE0: @ 81AAAE0 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x13 - ble _081AAB0A + ble @081AAB0A movs r4, 0x13 -_081AAB0A: +@081AAB0A: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -824489,30 +824489,30 @@ _081AAB0A: ldrb r0, [r3] lsls r5, r4, 2 cmp r0, r2 - bgt _081AAB36 -_081AAB28: + bgt @081AAB36 +@081AAB28: adds r1, 0x1 cmp r1, 0x9 - bhi _081AAB3A + bhi @081AAB3A adds r0, r1, r3 ldrb r0, [r0] cmp r0, r2 - ble _081AAB28 -_081AAB36: + ble @081AAB28 +@081AAB36: cmp r1, 0x9 - bls _081AAB3C -_081AAB3A: + bls @081AAB3C +@081AAB3A: movs r1, 0x9 -_081AAB3C: +@081AAB3C: cmp r6, 0 - bne _081AAB58 + bne @081AAB58 ldr r2, =0x0861379c - b _081AAB5A + b @081AAB5A .align 2, 0 .pool -_081AAB58: +@081AAB58: ldr r2, =0x0861392c -_081AAB5A: +@081AAB5A: lsls r1, 1 adds r0, r5, r4 lsls r0, 2 @@ -824527,7 +824527,7 @@ _081AAB5A: thumb_func_end sub_81AAAE0 thumb_func_start sub_81AAB70 -sub_81AAB70: @ 81AAB70 +sub_81AAB70: ; 81AAB70 push {r4,lr} ldr r4, =0x0203ce58 movs r0, 0 @@ -824550,8 +824550,8 @@ sub_81AAB70: @ 81AAB70 thumb_func_end sub_81AAB70 thumb_func_start c2_bag -@ void c2_bag() -c2_bag: @ 81AAB9C +; void c2_bag() +c2_bag: ; 81AAB9C push {lr} ldr r2, =sub_8086194 + 1 movs r0, 0 @@ -824564,24 +824564,24 @@ c2_bag: @ 81AAB9C thumb_func_end c2_bag thumb_func_start sub_81AABB0 -sub_81AABB0: @ 81AABB0 +sub_81AABB0: ; 81AABB0 push {lr} bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _081AABCC + bne @081AABCC ldr r2, =sub_8059D50 + 1 movs r0, 0x1 movs r1, 0x5 bl sub_81AAC90 - b _081AABD4 + b @081AABD4 .align 2, 0 .pool -_081AABCC: +@081AABCC: ldr r1, =sub_8059D50 + 1 movs r0, 0x1 bl sub_81C4F98 -_081AABD4: +@081AABD4: pop {r0} bx r0 .align 2, 0 @@ -824589,7 +824589,7 @@ _081AABD4: thumb_func_end sub_81AABB0 thumb_func_start c2_810A554 -c2_810A554: @ 81AABDC +c2_810A554: ; 81AABDC push {lr} ldr r2, =sub_80861B0 + 1 movs r0, 0x4 @@ -824602,7 +824602,7 @@ c2_810A554: @ 81AABDC thumb_func_end c2_810A554 thumb_func_start sub_81AABF0 -sub_81AABF0: @ 81AABF0 +sub_81AABF0: ; 81AABF0 push {lr} adds r2, r0, 0 movs r0, 0x5 @@ -824613,7 +824613,7 @@ sub_81AABF0: @ 81AABF0 thumb_func_end sub_81AABF0 thumb_func_start sub_81AAC00 -sub_81AAC00: @ 81AAC00 +sub_81AAC00: ; 81AAC00 push {lr} ldr r2, =sub_80DFC48 + 1 movs r0, 0x3 @@ -824626,7 +824626,7 @@ sub_81AAC00: @ 81AAC00 thumb_func_end sub_81AAC00 thumb_func_start sub_81AAC14 -sub_81AAC14: @ 81AAC14 +sub_81AAC14: ; 81AAC14 push {lr} ldr r2, =sub_816B31C + 1 movs r0, 0x6 @@ -824639,7 +824639,7 @@ sub_81AAC14: @ 81AAC14 thumb_func_end sub_81AAC14 thumb_func_start sub_81AAC28 -sub_81AAC28: @ 81AAC28 +sub_81AAC28: ; 81AAC28 push {lr} ldr r2, =sub_81ADE6C + 1 movs r0, 0x9 @@ -824657,7 +824657,7 @@ sub_81AAC28: @ 81AAC28 thumb_func_end sub_81AAC28 thumb_func_start sub_81AAC50 -sub_81AAC50: @ 81AAC50 +sub_81AAC50: ; 81AAC50 push {lr} ldr r2, =sub_81ADEBC + 1 movs r0, 0x7 @@ -824673,7 +824673,7 @@ sub_81AAC50: @ 81AAC50 thumb_func_end sub_81AAC50 thumb_func_start sub_81AAC70 -sub_81AAC70: @ 81AAC70 +sub_81AAC70: ; 81AAC70 push {lr} ldr r2, =sub_81ADF00 + 1 movs r0, 0x8 @@ -824689,7 +824689,7 @@ sub_81AAC70: @ 81AAC70 thumb_func_end sub_81AAC70 thumb_func_start sub_81AAC90 -sub_81AAC90: @ 81AAC90 +sub_81AAC90: ; 81AAC90 push {r4-r7,lr} adds r4, r2, 0 lsls r0, 24 @@ -824701,32 +824701,32 @@ sub_81AAC90: @ 81AAC90 bl malloc_and_clear str r0, [r6] cmp r0, 0 - bne _081AACBC + bne @081AACBC adds r0, r4, 0 bl set_callback2 - b _081AAD3A + b @081AAD3A .align 2, 0 .pool -_081AACBC: +@081AACBC: ldr r0, =0x0203ce58 cmp r5, 0xC - beq _081AACC4 + beq @081AACC4 strb r5, [r0, 0x4] -_081AACC4: +@081AACC4: cmp r4, 0 - beq _081AACCA + beq @081AACCA str r4, [r0] -_081AACCA: +@081AACCA: cmp r7, 0x4 - bhi _081AACD0 + bhi @081AACD0 strb r7, [r0, 0x5] -_081AACD0: +@081AACD0: ldrb r0, [r0, 0x4] subs r0, 0x4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _081AACF0 + bhi @081AACF0 ldr r2, [r6] ldr r0, =0x0000081b adds r2, r0 @@ -824737,7 +824737,7 @@ _081AACD0: movs r1, 0x1 orrs r0, r1 strb r0, [r2] -_081AACF0: +@081AACF0: ldr r0, [r6] movs r1, 0 str r1, [r0] @@ -824772,7 +824772,7 @@ _081AACF0: bl memset ldr r0, =c2_bag_2 + 1 bl set_callback2 -_081AAD3A: +@081AAD3A: pop {r4-r7} pop {r0} bx r0 @@ -824781,7 +824781,7 @@ _081AAD3A: thumb_func_end sub_81AAC90 thumb_func_start c2_bag_3 -c2_bag_3: @ 81AAD5C +c2_bag_3: ; 81AAD5C push {lr} bl run_active_tasks bl call_obj_callbacks @@ -824793,7 +824793,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 copy_super_sprites_to_oam bl copy_queue_process @@ -824803,31 +824803,31 @@ vblank_cb_bag_menu: @ 81AAD78 thumb_func_end vblank_cb_bag_menu thumb_func_start c2_bag_2 -c2_bag_2: @ 81AAD8C +c2_bag_2: ; 81AAD8C push {lr} -_081AAD8E: +@081AAD8E: bl sub_81221EC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081AADB2 + beq @081AADB2 bl setup_bag_menu lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081AADB2 + beq @081AADB2 bl sub_81221AC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081AAD8E -_081AADB2: + bne @081AAD8E +@081AADB2: pop {r0} bx r0 thumb_func_end c2_bag_2 thumb_func_start setup_bag_menu -setup_bag_menu: @ 81AADB8 +setup_bag_menu: ; 81AADB8 push {r4,r5,lr} sub sp, 0x4 ldr r1, =0x030022c0 @@ -824837,56 +824837,56 @@ setup_bag_menu: @ 81AADB8 ldrb r0, [r0] adds r2, r1, 0 cmp r0, 0x14 - bls _081AADCE - b _081AB02C -_081AADCE: + bls @081AADCE + b @081AB02C +@081AADCE: lsls r0, 2 - ldr r1, =_081AADE0 + ldr r1, =@081AADE0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081AADE0: - .4byte _081AAE34 - .4byte _081AAE3E - .4byte _081AAE50 - .4byte _081AAE56 - .4byte _081AAE78 - .4byte _081AAE7E - .4byte _081AAE86 - .4byte _081AAEA4 - .4byte _081AAECC - .4byte _081AAEDA - .4byte _081AAEEC - .4byte _081AAEFA - .4byte _081AAF0C - .4byte _081AAF1C - .4byte _081AAF54 - .4byte _081AAFA0 - .4byte _081AAFBC - .4byte _081AAFC2 - .4byte _081AAFD8 - .4byte _081AAFDE - .4byte _081AAFF8 -_081AAE34: +@081AADE0: + .4byte @081AAE34 + .4byte @081AAE3E + .4byte @081AAE50 + .4byte @081AAE56 + .4byte @081AAE78 + .4byte @081AAE7E + .4byte @081AAE86 + .4byte @081AAEA4 + .4byte @081AAECC + .4byte @081AAEDA + .4byte @081AAEEC + .4byte @081AAEFA + .4byte @081AAF0C + .4byte @081AAF1C + .4byte @081AAF54 + .4byte @081AAFA0 + .4byte @081AAFBC + .4byte @081AAFC2 + .4byte @081AAFD8 + .4byte @081AAFDE + .4byte @081AAFF8 +@081AAE34: bl vblank_hblank_handler_set_zero bl clear_scheduled_bg_copies_to_vram - b _081AB012 -_081AAE3E: + b @081AB012 +@081AAE3E: bl remove_some_task ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _081AB01A + b @081AB01A .align 2, 0 .pool -_081AAE50: +@081AAE50: bl gpu_pal_allocator_reset - b _081AB012 -_081AAE56: + b @081AB012 +@081AAE56: bl sub_80A1A74 ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] @@ -824897,32 +824897,32 @@ _081AAE56: movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _081AB01A + b @081AB01A .align 2, 0 .pool -_081AAE78: +@081AAE78: bl reset_all_obj_data - b _081AB012 -_081AAE7E: + b @081AB012 +@081AAE7E: movs r0, 0x87 lsls r0, 3 adds r1, r2, r0 - b _081AB01A -_081AAE86: + b @081AB01A +@081AAE86: bl sub_81221AC lsls r0, 24 cmp r0, 0 - bne _081AAE94 + bne @081AAE94 bl clear_tasks -_081AAE94: +@081AAE94: ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _081AB01A + b @081AB01A .align 2, 0 .pool -_081AAEA4: +@081AAEA4: bl bag_menu_init_bgs ldr r0, =0x0203ce54 ldr r0, [r0] @@ -824934,48 +824934,48 @@ _081AAEA4: movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _081AB01A + b @081AB01A .align 2, 0 .pool -_081AAECC: +@081AAECC: bl load_bag_menu_graphics lsls r0, 24 cmp r0, 0 - bne _081AAED8 - b _081AB044 -_081AAED8: - b _081AB012 -_081AAEDA: + bne @081AAED8 + b @081AB044 +@081AAED8: + b @081AB012 +@081AAEDA: bl setup_bag_menu_textboxes ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _081AB01A + b @081AB01A .align 2, 0 .pool -_081AAEEC: +@081AAEEC: bl sub_81ABA6C bl sub_81ABAC4 bl sub_81ABAE0 - b _081AB012 -_081AAEFA: + b @081AB012 +@081AAEFA: bl allocate_bag_item_list_buffers ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _081AB01A + b @081AB01A .align 2, 0 .pool -_081AAF0C: +@081AAF0C: ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] bl load_bag_item_list_buffers - b _081AB012 + b @081AB012 .align 2, 0 .pool -_081AAF1C: +@081AAF1C: ldr r1, =0x085e91fc ldr r4, =0x0203ce58 ldrb r0, [r4, 0x5] @@ -824993,10 +824993,10 @@ _081AAF1C: movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _081AB01A + b @081AB01A .align 2, 0 .pool -_081AAF54: +@081AAF54: ldr r4, =0x0203ce58 ldrb r0, [r4, 0x4] bl sub_81AB1F0 @@ -825025,10 +825025,10 @@ _081AAF54: strh r0, [r1, 0x8] strh r2, [r1, 0xE] strh r2, [r1, 0x18] - b _081AB012 + b @081AB012 .align 2, 0 .pool -_081AAFA0: +@081AAFA0: ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] bl sub_80D4D00 @@ -825036,26 +825036,26 @@ _081AAFA0: movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _081AB01A + b @081AB01A .align 2, 0 .pool -_081AAFBC: +@081AAFBC: bl sub_80D4FAC - b _081AB012 -_081AAFC2: + b @081AB012 +@081AAFC2: bl sub_81AB7BC bl sub_81AB854 ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _081AB01A + b @081AB01A .align 2, 0 .pool -_081AAFD8: +@081AAFD8: bl sub_81AE2B4 - b _081AB012 -_081AAFDE: + b @081AB012 +@081AAFDE: movs r0, 0x1 negs r0, r0 movs r1, 0x10 @@ -825065,10 +825065,10 @@ _081AAFDE: movs r2, 0x87 lsls r2, 3 adds r1, r2 - b _081AB01A + b @081AB01A .align 2, 0 .pool -_081AAFF8: +@081AAFF8: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -825081,30 +825081,30 @@ _081AAFF8: movs r0, 0x7F ands r0, r1 strb r0, [r2, 0x8] -_081AB012: +@081AB012: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 -_081AB01A: +@081AB01A: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _081AB044 + b @081AB044 .align 2, 0 .pool -_081AB02C: +@081AB02C: ldr r0, =vblank_cb_bag_menu + 1 bl SetVBlankCallback ldr r0, =c2_bag_3 + 1 bl set_callback2 movs r0, 0x1 - b _081AB046 + b @081AB046 .align 2, 0 .pool -_081AB044: +@081AB044: movs r0, 0 -_081AB046: +@081AB046: add sp, 0x4 pop {r4,r5} pop {r1} @@ -825112,7 +825112,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 @@ -825156,7 +825156,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 @@ -825166,24 +825166,24 @@ load_bag_menu_graphics: @ 81AB0BC movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x4 - bls _081AB0D2 - b _081AB1CC -_081AB0D2: + bls @081AB0D2 + b @081AB1CC +@081AB0D2: lsls r0, 2 - ldr r1, =_081AB0E8 + ldr r1, =@081AB0E8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081AB0E8: - .4byte _081AB0FC - .4byte _081AB118 - .4byte _081AB13C - .4byte _081AB174 - .4byte _081AB1A8 -_081AB0FC: +@081AB0E8: + .4byte @081AB0FC + .4byte @081AB118 + .4byte @081AB13C + .4byte @081AB174 + .4byte @081AB1A8 +@081AB0FC: bl reset_temp_tile_data_buffers ldr r1, =0x08d9a620 movs r0, 0 @@ -825192,88 +825192,88 @@ _081AB0FC: movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - b _081AB1AE + b @081AB1AE .align 2, 0 .pool -_081AB118: +@081AB118: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081AB1E4 + beq @081AB1E4 ldr r0, =0x08d9a88c ldr r4, =0x0203ce54 ldr r1, [r4] adds r1, 0x4 bl call_LZZUnCompWram ldr r1, [r4] - b _081AB1B2 + b @081AB1B2 .align 2, 0 .pool -_081AB13C: +@081AB13C: bl sub_81ADC54 lsls r0, 24 cmp r0, 0 - bne _081AB164 + bne @081AB164 ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - beq _081AB164 + beq @081AB164 ldr r0, =0x08d9a5d4 movs r1, 0 movs r2, 0x40 bl decompress_palette - b _081AB1AE + b @081AB1AE .align 2, 0 .pool -_081AB164: +@081AB164: ldr r0, =0x08d9a588 movs r1, 0 movs r2, 0x40 bl decompress_palette - b _081AB1AE + b @081AB1AE .align 2, 0 .pool -_081AB174: +@081AB174: bl sub_81ADC54 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081AB18A + beq @081AB18A ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - bne _081AB19C -_081AB18A: + bne @081AB19C +@081AB18A: ldr r0, =0x0857fb34 bl gpu_tile_obj_decompress_and_load - b _081AB1AE + b @081AB1AE .align 2, 0 .pool -_081AB19C: +@081AB19C: ldr r0, =0x0857fb3c bl gpu_tile_obj_decompress_and_load - b _081AB1AE + b @081AB1AE .align 2, 0 .pool -_081AB1A8: +@081AB1A8: ldr r0, =0x0857fb44 bl gpu_pal_obj_decompress_and_apply -_081AB1AE: +@081AB1AE: ldr r0, =0x0203ce54 ldr r1, [r0] -_081AB1B2: +@081AB1B2: ldr r0, =0x00000834 adds r1, r0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _081AB1E4 + b @081AB1E4 .align 2, 0 .pool -_081AB1CC: +@081AB1CC: bl sub_8122328 ldr r0, [r4] ldr r1, =0x00000834 @@ -825281,12 +825281,12 @@ _081AB1CC: movs r1, 0 strh r1, [r0] movs r0, 0x1 - b _081AB1E6 + b @081AB1E6 .align 2, 0 .pool -_081AB1E4: +@081AB1E4: movs r0, 0 -_081AB1E6: +@081AB1E6: add sp, 0x4 pop {r4} pop {r1} @@ -825294,19 +825294,19 @@ _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 cmp r0, 0xA - bne _081AB204 + bne @081AB204 ldr r0, =sub_81ADD98 + 1 - b _081AB206 + b @081AB206 .align 2, 0 .pool -_081AB204: +@081AB204: ldr r0, =sub_81ABD28 + 1 -_081AB206: +@081AB206: movs r1, 0 bl AddTask lsls r0, 24 @@ -825318,7 +825318,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 @@ -825338,8 +825338,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} @@ -825357,7 +825357,7 @@ load_bag_item_list_buffers: @ 81AB240 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081AB2FC + bne @081AB2FC movs r6, 0 ldr r3, =0x00000829 adds r0, r2, r3 @@ -825365,9 +825365,9 @@ load_bag_item_list_buffers: @ 81AB240 ldrb r0, [r0] subs r0, 0x1 cmp r6, r0 - bge _081AB2B6 + bge @081AB2B6 ldr r5, =0x0203ce78 -_081AB276: +@081AB276: lsls r4, r6, 1 adds r4, r6 lsls r4, 3 @@ -825398,8 +825398,8 @@ _081AB276: ldrb r0, [r0] subs r0, 0x1 cmp r6, r0 - blt _081AB276 -_081AB2B6: + blt @081AB276 +@081AB2B6: ldr r5, =0x0203ce78 lsls r4, r6, 1 adds r4, r6 @@ -825418,19 +825418,19 @@ _081AB2B6: movs r0, 0x2 negs r0, r0 str r0, [r1, 0x4] - b _081AB34A + b @081AB34A .align 2, 0 .pool -_081AB2FC: +@081AB2FC: movs r6, 0 ldr r4, =0x00000829 adds r0, r2, r4 adds r0, r7 ldrb r0, [r0] cmp r6, r0 - bcs _081AB34A + bcs @081AB34A ldr r5, =0x0203ce78 -_081AB30C: +@081AB30C: lsls r4, r6, 1 adds r4, r6 lsls r4, 3 @@ -825460,8 +825460,8 @@ _081AB30C: adds r0, r7 ldrb r0, [r0] cmp r6, r0 - bcc _081AB30C -_081AB34A: + bcc @081AB30C +@081AB34A: ldr r2, =0x03006310 adds r1, r2, 0 ldr r0, =0x08613f9c @@ -825494,8 +825494,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 @@ -825503,16 +825503,16 @@ get_name: @ 81AB39C ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] cmp r0, 0x2 - beq _081AB3C0 + beq @081AB3C0 cmp r0, 0x3 - beq _081AB420 + beq @081AB420 adds r0, r5, 0 adds r1, r6, 0 bl itemid_get_name - b _081AB43E + b @081AB43E .align 2, 0 .pool -_081AB3C0: +@081AB3C0: ldr r4, =0x02021dc4 adds r0, r5, 0 bl sub_81B6CFC @@ -825527,7 +825527,7 @@ _081AB3C0: movs r0, 0xA9 lsls r0, 1 cmp r5, r0 - bls _081AB408 + bls @081AB408 ldr r0, =0x02021cc4 ldr r2, =0xfffffeae adds r1, r5, r2 @@ -825535,20 +825535,20 @@ _081AB3C0: movs r3, 0x1 bl decimal_int_to_string ldr r1, =0x085e921a - b _081AB438 + b @081AB438 .align 2, 0 .pool -_081AB408: +@081AB408: ldr r0, =0x02021cc4 ldr r2, =0xfffffee0 adds r1, r5, r2 movs r2, 0x2 movs r3, 0x2 bl decimal_int_to_string - b _081AB436 + b @081AB436 .align 2, 0 .pool -_081AB420: +@081AB420: ldr r0, =0x02021cc4 adds r1, r5, 0 subs r1, 0x84 @@ -825558,12 +825558,12 @@ _081AB420: ldr r1, =0x02021dc4 adds r0, r5, 0 bl itemid_get_name -_081AB436: +@081AB436: ldr r1, =0x085e9210 -_081AB438: +@081AB438: adds r0, r6, 0 bl ExpandTextCodes -_081AB43E: +@081AB43E: pop {r4-r6} pop {r0} bx r0 @@ -825572,24 +825572,24 @@ _081AB43E: thumb_func_end get_name thumb_func_start sub_81AB450 -sub_81AB450: @ 81AB450 +sub_81AB450: ; 81AB450 push {r4-r6,lr} adds r6, r0, 0 lsls r1, 24 lsrs r1, 24 cmp r1, 0x1 - beq _081AB466 + beq @081AB466 movs r0, 0x5 bl audio_play bl sub_80D4DC4 -_081AB466: +@081AB466: ldr r4, =0x0203ce54 ldr r1, [r4] ldr r2, =0x0000081a adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0xFF - bne _081AB50C + bne @081AB50C adds r2, 0x1 adds r0, r1, r2 ldrb r1, [r0] @@ -825601,7 +825601,7 @@ _081AB466: movs r0, 0x2 negs r0, r0 cmp r6, r0 - beq _081AB4C8 + beq @081AB4C8 ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] adds r0, 0x1 @@ -825619,10 +825619,10 @@ _081AB466: lsls r1, 26 lsrs r1, 30 bl sub_80D4F38 - b _081AB4DA + b @081AB4DA .align 2, 0 .pool -_081AB4C8: +@081AB4C8: ldr r0, =0x0000ffff ldr r1, [r4] ldr r2, =0x0000081b @@ -825631,7 +825631,7 @@ _081AB4C8: lsls r1, 26 lsrs r1, 30 bl sub_80D4F38 -_081AB4DA: +@081AB4DA: ldr r5, =0x0203ce54 ldr r2, [r5] ldr r4, =0x0000081b @@ -825653,10 +825653,10 @@ _081AB4DA: movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _081AB50C + bne @081AB50C adds r0, r6, 0 bl bag_menu_print_description_box_text -_081AB50C: +@081AB50C: pop {r4-r6} pop {r0} bx r0 @@ -825665,8 +825665,8 @@ _081AB50C: thumb_func_end sub_81AB450 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 @@ -825681,31 +825681,31 @@ sub_81AB520: @ 81AB520 movs r0, 0x2 negs r0, r0 cmp r4, r0 - bne _081AB540 - b _081AB696 -_081AB540: + bne @081AB540 + b @081AB696 +@081AB540: ldr r0, =0x0203ce54 ldr r0, [r0] ldr r1, =0x0000081a adds r0, r1 ldrb r1, [r0] cmp r1, 0xFF - beq _081AB570 + beq @081AB570 lsls r0, r4, 24 lsrs r0, 24 cmp r1, r0 - bne _081AB568 + bne @081AB568 adds r0, r7, 0 movs r1, 0x2 bl sub_81AB75C - b _081AB570 + b @081AB570 .align 2, 0 .pool -_081AB568: +@081AB568: adds r0, r7, 0 movs r1, 0xFF bl sub_81AB75C -_081AB570: +@081AB570: ldr r5, =0x0203ce58 ldrb r0, [r5, 0x5] adds r0, 0x1 @@ -825731,7 +825731,7 @@ _081AB570: lsls r0, 16 lsrs r0, 16 cmp r0, 0x7 - bhi _081AB5BE + bhi @081AB5BE ldr r1, =0x08dc6378 subs r3, r7, 0x1 lsls r3, 16 @@ -825742,10 +825742,10 @@ _081AB570: mov r0, r8 movs r2, 0x8 bl Window_CopyWholePixelBlockToWindow -_081AB5BE: +@081AB5BE: ldrb r0, [r5, 0x5] cmp r0, 0x3 - bne _081AB610 + bne @081AB610 ldr r0, =0x02021cc4 adds r1, r4, 0 movs r2, 0x1 @@ -825768,18 +825768,18 @@ _081AB5BE: movs r0, 0xFF str r0, [sp, 0xC] str r1, [sp, 0x10] - b _081AB652 + b @081AB652 .align 2, 0 .pool -_081AB610: +@081AB610: cmp r0, 0x4 - beq _081AB66C + beq @081AB66C adds r0, r6, 0 bl itemid_is_unique lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _081AB66C + bne @081AB66C ldr r0, =0x02021cc4 mov r1, r9 movs r2, 0x1 @@ -825801,24 +825801,24 @@ _081AB610: movs r0, 0xFF str r0, [sp, 0xC] str r5, [sp, 0x10] -_081AB652: +@081AB652: mov r0, r8 movs r1, 0x7 adds r2, r4, 0 bl sub_81AE0BC - b _081AB696 + b @081AB696 .align 2, 0 .pool -_081AB66C: +@081AB66C: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00000496 adds r0, r1 ldrh r0, [r0] cmp r0, 0 - beq _081AB696 + beq @081AB696 cmp r0, r6 - bne _081AB696 + bne @081AB696 ldr r1, =0x086140a4 subs r3, r7, 0x1 lsls r3, 16 @@ -825830,7 +825830,7 @@ _081AB66C: mov r0, r8 movs r2, 0x60 bl Window_CopyWholePixelBlockToWindow -_081AB696: +@081AB696: add sp, 0x14 pop {r3,r4} mov r8, r3 @@ -825843,15 +825843,15 @@ _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 movs r0, 0x2 negs r0, r0 cmp r1, r0 - beq _081AB6E0 + beq @081AB6E0 ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] adds r0, 0x1 @@ -825864,10 +825864,10 @@ bag_menu_print_description_box_text: @ 81AB6B0 lsrs r0, 16 bl itemid_get_description adds r4, r0, 0 - b _081AB6FC + b @081AB6FC .align 2, 0 .pool -_081AB6E0: +@081AB6E0: ldr r0, =0x02021cc4 ldr r2, =0x085e9180 ldr r1, =0x0203ce58 @@ -825880,7 +825880,7 @@ _081AB6E0: ldr r1, =0x085e91c0 adds r0, r4, 0 bl ExpandTextCodes -_081AB6FC: +@081AB6FC: movs r0, 0x1 movs r1, 0 bl Window_FastFillPixels @@ -825905,7 +825905,7 @@ _081AB6FC: thumb_func_end bag_menu_print_description_box_text thumb_func_start sub_81AB73C -sub_81AB73C: @ 81AB73C +sub_81AB73C: ; 81AB73C push {r4,lr} adds r4, r1, 0 lsls r0, 24 @@ -825923,7 +825923,7 @@ sub_81AB73C: @ 81AB73C thumb_func_end sub_81AB73C thumb_func_start sub_81AB75C -sub_81AB75C: @ 81AB75C +sub_81AB75C: ; 81AB75C push {r4,r5,lr} sub sp, 0x14 lsls r0, 24 @@ -825931,7 +825931,7 @@ sub_81AB75C: @ 81AB75C lsls r1, 24 lsrs r1, 24 cmp r1, 0xFF - bne _081AB798 + bne @081AB798 movs r0, 0x1 movs r1, 0 bl GetMenuCursorDimensionByFont @@ -825950,8 +825950,8 @@ sub_81AB75C: @ 81AB75C movs r2, 0 adds r3, r5, 0 bl Window_FillPixelRect - b _081AB7AE -_081AB798: + b @081AB7AE +@081AB798: ldr r2, =0x085e8d60 str r5, [sp] movs r0, 0 @@ -825962,7 +825962,7 @@ _081AB798: movs r1, 0x1 movs r3, 0 bl sub_81AE0BC -_081AB7AE: +@081AB7AE: add sp, 0x14 pop {r4,r5} pop {r0} @@ -825972,7 +825972,7 @@ _081AB7AE: thumb_func_end sub_81AB75C thumb_func_start sub_81AB7BC -sub_81AB7BC: @ 81AB7BC +sub_81AB7BC: ; 81AB7BC push {r4-r6,lr} sub sp, 0x10 ldr r5, =0x0203ce54 @@ -825981,7 +825981,7 @@ sub_81AB7BC: @ 81AB7BC adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0xFF - bne _081AB80A + bne @081AB80A ldr r2, =0x0203ce58 ldrb r3, [r2, 0x5] ldr r6, =0x00000829 @@ -826011,7 +826011,7 @@ sub_81AB7BC: @ 81AB7BC ldr r2, =0x0000081e adds r1, r2 strb r0, [r1] -_081AB80A: +@081AB80A: add sp, 0x10 pop {r4-r6} pop {r0} @@ -826021,7 +826021,7 @@ _081AB80A: thumb_func_end sub_81AB7BC thumb_func_start sub_81AB824 -sub_81AB824: @ 81AB824 +sub_81AB824: ; 81AB824 push {r4,lr} ldr r4, =0x0203ce54 ldr r0, [r4] @@ -826029,14 +826029,14 @@ sub_81AB824: @ 81AB824 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xFF - beq _081AB842 + beq @081AB842 bl sub_81AF620 ldr r0, [r4] ldr r1, =0x0000081e adds r0, r1 movs r1, 0xFF strb r1, [r0] -_081AB842: +@081AB842: bl sub_81AB89C pop {r4} pop {r0} @@ -826046,7 +826046,7 @@ _081AB842: thumb_func_end sub_81AB824 thumb_func_start sub_81AB854 -sub_81AB854: @ 81AB854 +sub_81AB854: ; 81AB854 push {r4,lr} ldr r4, =0x0203ce54 ldr r2, [r4] @@ -826056,12 +826056,12 @@ sub_81AB854: @ 81AB854 movs r0, 0xF ands r0, r1 cmp r0, 0x1 - beq _081AB882 + beq @081AB882 ldr r1, =0x0000081f adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0xFF - bne _081AB882 + bne @081AB882 ldr r0, =0x08614094 ldr r1, =0x0203ce5e bl sub_81AF380 @@ -826069,7 +826069,7 @@ sub_81AB854: @ 81AB854 ldr r2, =0x0000081f adds r1, r2 strb r0, [r1] -_081AB882: +@081AB882: pop {r4} pop {r0} bx r0 @@ -826078,7 +826078,7 @@ _081AB882: thumb_func_end sub_81AB854 thumb_func_start sub_81AB89C -sub_81AB89C: @ 81AB89C +sub_81AB89C: ; 81AB89C push {r4,lr} ldr r4, =0x0203ce54 ldr r0, [r4] @@ -826086,14 +826086,14 @@ sub_81AB89C: @ 81AB89C adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xFF - beq _081AB8BA + beq @081AB8BA bl sub_81AF620 ldr r0, [r4] ldr r1, =0x0000081f adds r0, r1 movs r1, 0xFF strb r1, [r0] -_081AB8BA: +@081AB8BA: pop {r4} pop {r0} bx r0 @@ -826102,7 +826102,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] @@ -826121,7 +826121,7 @@ free_bag_item_list_buffers: @ 81AB8C8 thumb_func_end free_bag_item_list_buffers thumb_func_start task_close_bag_menu_1 -task_close_bag_menu_1: @ 81AB8F8 +task_close_bag_menu_1: ; 81AB8F8 push {r4,lr} sub sp, 0x4 adds r4, r0, 0 @@ -826150,7 +826150,7 @@ task_close_bag_menu_1: @ 81AB8F8 thumb_func_end task_close_bag_menu_1 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 @@ -826164,7 +826164,7 @@ task_close_bag_menu_2: @ 81AB930 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081AB9A0 + bne @081AB9A0 ldrb r0, [r2] ldr r4, =0x0203ce58 ldrb r2, [r4, 0x5] @@ -826180,29 +826180,29 @@ task_close_bag_menu_2: @ 81AB930 ldr r0, [r0] ldr r0, [r0] cmp r0, 0 - beq _081AB984 + beq @081AB984 bl set_callback2 - b _081AB98A + b @081AB98A .align 2, 0 .pool -_081AB984: +@081AB984: ldr r0, [r4] bl set_callback2 -_081AB98A: +@081AB98A: bl sub_81AB824 bl reset_all_obj_data bl gpu_pal_allocator_reset bl free_bag_item_list_buffers adds r0, r5, 0 bl remove_task -_081AB9A0: +@081AB9A0: pop {r4,r5} pop {r0} bx r0 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 @@ -826210,18 +826210,18 @@ sub_81AB9A8: @ 81AB9A8 ldr r0, =0x02039dd8 adds r4, r1, r0 cmp r5, 0x3 - bgt _081AB9C8 + bgt @081AB9C8 cmp r5, 0x2 - blt _081AB9C8 + blt @081AB9C8 adds r0, r4, 0 bl sub_80D6FB4 - b _081AB9CE + b @081AB9CE .align 2, 0 .pool -_081AB9C8: +@081AB9C8: adds r0, r4, 0 bl sub_80D6F64 -_081AB9CE: +@081AB9CE: ldr r0, =0x0203ce54 ldr r1, [r0] ldr r6, =0x00000829 @@ -826232,13 +826232,13 @@ _081AB9CE: adds r3, r0, 0 ldrb r0, [r4, 0x4] cmp r2, r0 - bcs _081ABA12 + bcs @081ABA12 ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 - beq _081ABA12 + beq @081ABA12 adds r7, r3, 0 -_081AB9EE: +@081AB9EE: ldr r0, [r7] adds r0, r6 adds r0, r5 @@ -826250,14 +826250,14 @@ _081AB9EE: lsrs r2, r0, 16 ldrb r1, [r4, 0x4] cmp r2, r1 - bcs _081ABA12 + bcs @081ABA12 ldr r0, [r4] lsls r1, r2, 2 adds r1, r0 ldrh r0, [r1] cmp r0, 0 - bne _081AB9EE -_081ABA12: + bne @081AB9EE +@081ABA12: ldr r2, [r3] ldr r1, =0x0000081b adds r0, r2, r1 @@ -826265,35 +826265,35 @@ _081ABA12: movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081ABA2E + bne @081ABA2E ldr r0, =0x00000829 adds r1, r2, r0 adds r1, r5 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_081ABA2E: +@081ABA2E: ldr r1, [r3] ldr r2, =0x00000829 adds r0, r1, r2 adds r0, r5 ldrb r2, [r0] cmp r2, 0x8 - bls _081ABA58 + bls @081ABA58 ldr r3, =0x0000082e adds r0, r1, r3 adds r0, r5 movs r1, 0x8 strb r1, [r0] - b _081ABA60 + b @081ABA60 .align 2, 0 .pool -_081ABA58: +@081ABA58: ldr r3, =0x0000082e adds r0, r1, r3 adds r0, r5 strb r2, [r0] -_081ABA60: +@081ABA60: pop {r4-r7} pop {r0} bx r0 @@ -826302,24 +826302,24 @@ _081ABA60: thumb_func_end sub_81AB9A8 thumb_func_start sub_81ABA6C -sub_81ABA6C: @ 81ABA6C +sub_81ABA6C: ; 81ABA6C push {r4,lr} movs r4, 0 -_081ABA70: +@081ABA70: adds r0, r4, 0 bl sub_81AB9A8 adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 - bls _081ABA70 + bls @081ABA70 pop {r4} pop {r0} bx r0 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 @@ -826348,31 +826348,31 @@ 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: +@081ABAC8: adds r0, r4, 0 bl sub_81ABA88 adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 - bls _081ABAC8 + bls @081ABAC8 pop {r4} pop {r0} bx r0 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 ldr r6, =0x0203ce6a adds r7, r6, 0 subs r7, 0xA -_081ABAEC: +@081ABAEC: lsls r1, r5, 1 adds r0, r1, r6 adds r1, r7 @@ -826393,7 +826393,7 @@ _081ABAEC: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x4 - bls _081ABAEC + bls @081ABAEC add sp, 0x4 pop {r4-r7} pop {r0} @@ -826403,7 +826403,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 @@ -826423,7 +826423,7 @@ sub_81ABB2C: @ 81ABB2C thumb_func_end sub_81ABB2C thumb_func_start sub_81ABB4C -sub_81ABB4C: @ 81ABB4C +sub_81ABB4C: ; 81ABB4C push {r4-r6,lr} mov r6, r9 mov r5, r8 @@ -826477,7 +826477,7 @@ sub_81ABB4C: @ 81ABB4C thumb_func_end sub_81ABB4C thumb_func_start sub_81ABBBC -sub_81ABBBC: @ 81ABBBC +sub_81ABBBC: ; 81ABBBC push {r4-r7,lr} mov r7, r8 push {r7} @@ -826533,7 +826533,7 @@ sub_81ABBBC: @ 81ABBBC thumb_func_end sub_81ABBBC thumb_func_start sub_81ABC3C -sub_81ABC3C: @ 81ABC3C +sub_81ABC3C: ; 81ABC3C push {lr} lsls r0, 24 lsrs r0, 24 @@ -826547,7 +826547,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 @@ -826558,9 +826558,9 @@ sub_81ABC54: @ 81ABC54 ldrb r0, [r0, 0x5] movs r3, 0x2 cmp r0, 0x3 - bne _081ABC6C + bne @081ABC6C movs r3, 0x3 -_081ABC6C: +@081ABC6C: ldr r0, =0x02021cc4 lsls r1, 16 asrs r1, 16 @@ -826595,7 +826595,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 @@ -826604,9 +826604,9 @@ sub_81ABCC0: @ 81ABCC0 ldrb r0, [r0, 0x5] movs r3, 0x2 cmp r0, 0x3 - bne _081ABCD4 + bne @081ABCD4 movs r3, 0x3 -_081ABCD4: +@081ABCD4: ldr r0, =0x02021cc4 movs r2, 0x2 bl decimal_int_to_string @@ -826642,7 +826642,7 @@ _081ABCD4: thumb_func_end sub_81ABCC0 thumb_func_start sub_81ABD28 -sub_81ABD28: @ 81ABD28 +sub_81ABD28: ; 81ABD28 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -826671,24 +826671,24 @@ sub_81ABD28: @ 81ABD28 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081ABD66 - b _081ABEB2 -_081ABD66: + bne @081ABD66 + b @081ABEB2 +@081ABD66: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081ABD74 - b _081ABEB2 -_081ABD74: + beq @081ABD74 + b @081ABEB2 +@081ABD74: bl sub_81ABF10 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081ABDB8 + beq @081ABDB8 cmp r0, 0x2 - beq _081ABDC0 + beq @081ABDC0 ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x4 @@ -826697,30 +826697,30 @@ _081ABD74: lsrs r0, 16 mov r10, r0 cmp r0, 0 - beq _081ABE10 + beq @081ABE10 bl sub_81AC2C0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081ABDA4 - b _081ABEB2 -_081ABDA4: - b _081ABDCC + beq @081ABDA4 + b @081ABEB2 +@081ABDA4: + b @081ABDCC .align 2, 0 .pool -_081ABDB8: +@081ABDB8: movs r1, 0x1 negs r1, r1 mov r0, r9 - b _081ABDC4 -_081ABDC0: + b @081ABDC4 +@081ABDC0: mov r0, r9 movs r1, 0x1 -_081ABDC4: +@081ABDC4: movs r2, 0 bl sub_81ABFA8 - b _081ABEB2 -_081ABDCC: + b @081ABEB2 +@081ABDCC: ldrb r0, [r6] adds r1, r7, 0 mov r2, r8 @@ -826739,15 +826739,15 @@ _081ABDCC: ldrb r0, [r0] subs r0, 0x1 cmp r2, r0 - beq _081ABEB2 + beq @081ABEB2 movs r0, 0x5 bl audio_play mov r0, r9 bl sub_81AC2E8 - b _081ABEB2 + b @081ABEB2 .align 2, 0 .pool -_081ABE10: +@081ABE10: ldrb r0, [r6] bl sub_81AE604 adds r4, r0, 0 @@ -826758,19 +826758,19 @@ _081ABE10: movs r0, 0x2 negs r0, r0 cmp r4, r0 - beq _081ABE32 + beq @081ABE32 adds r0, 0x1 cmp r4, r0 - bne _081ABE68 - b _081ABEB2 -_081ABE32: + bne @081ABE68 + b @081ABEB2 +@081ABE32: ldrb r0, [r5, 0x4] cmp r0, 0x5 - bne _081ABE40 + bne @081ABE40 movs r0, 0x20 bl audio_play - b _081ABEB2 -_081ABE40: + b @081ABEB2 +@081ABE40: movs r0, 0x5 bl audio_play ldr r0, =0x0203ce7c @@ -826782,10 +826782,10 @@ _081ABE40: adds r0, r3, r0 ldr r1, =task_close_bag_menu_1 + 1 str r1, [r0] - b _081ABEB2 + b @081ABEB2 .align 2, 0 .pool -_081ABE68: +@081ABE68: movs r0, 0x5 bl audio_play bl sub_81AB824 @@ -826817,7 +826817,7 @@ _081ABE68: ldr r1, [r0] mov r0, r9 bl _call_via_r1 -_081ABEB2: +@081ABEB2: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -826831,7 +826831,7 @@ _081ABEB2: thumb_func_end sub_81ABD28 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 @@ -826861,7 +826861,7 @@ set_callback3_to_bag: @ 81ABECC thumb_func_end set_callback3_to_bag thumb_func_start sub_81ABF10 -sub_81ABF10: @ 81ABF10 +sub_81ABF10: ; 81ABF10 push {lr} ldr r0, =0x0203ce54 ldr r0, [r0] @@ -826871,7 +826871,7 @@ sub_81ABF10: @ 81ABF10 movs r0, 0xF ands r0, r1 cmp r0, 0 - bne _081ABF6A + bne @081ABF6A bl sub_81220D0 lsls r0, 24 lsrs r2, r0, 24 @@ -826880,64 +826880,64 @@ sub_81ABF10: @ 81ABF10 movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _081ABF3C + bne @081ABF3C cmp r2, 0x1 - bne _081ABF54 -_081ABF3C: + bne @081ABF54 +@081ABF3C: movs r0, 0x5 bl audio_play movs r0, 0x1 - b _081ABF6C + b @081ABF6C .align 2, 0 .pool -_081ABF54: +@081ABF54: movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _081ABF60 + bne @081ABF60 cmp r2, 0x2 - bne _081ABF6A -_081ABF60: + bne @081ABF6A +@081ABF60: movs r0, 0x5 bl audio_play movs r0, 0x2 - b _081ABF6C -_081ABF6A: + b @081ABF6C +@081ABF6A: movs r0, 0 -_081ABF6C: +@081ABF6C: pop {r1} bx r1 thumb_func_end sub_81ABF10 thumb_func_start sub_81ABF70 -sub_81ABF70: @ 81ABF70 +sub_81ABF70: ; 81ABF70 push {r4,lr} adds r2, r0, 0 lsls r1, 24 lsrs r4, r1, 24 asrs r1, 24 cmp r1, 0x1 - bne _081ABF88 + bne @081ABF88 ldrb r0, [r2] cmp r0, 0x4 - bne _081ABF88 + bne @081ABF88 movs r0, 0 - b _081ABFA0 -_081ABF88: + b @081ABFA0 +@081ABF88: lsls r0, r4, 24 asrs r0, 24 movs r1, 0x1 negs r1, r1 ldrb r3, [r2] cmp r0, r1 - bne _081ABF9E + bne @081ABF9E cmp r3, 0 - bne _081ABF9E + bne @081ABF9E movs r0, 0x4 - b _081ABFA0 -_081ABF9E: + b @081ABFA0 +@081ABF9E: adds r0, r3, r4 -_081ABFA0: +@081ABFA0: strb r0, [r2] pop {r4} pop {r0} @@ -826945,7 +826945,7 @@ _081ABFA0: thumb_func_end sub_81ABF70 thumb_func_start sub_81ABFA8 -sub_81ABFA8: @ 81ABFA8 +sub_81ABFA8: ; 81ABFA8 push {r4-r6,lr} sub sp, 0xC lsls r0, 24 @@ -826963,7 +826963,7 @@ sub_81ABFA8: @ 81ABFA8 strh r0, [r4, 0x18] strh r5, [r4, 0x16] cmp r2, 0 - bne _081AC026 + bne @081AC026 movs r0, 0 bl Window_FillTileMap movs r0, 0x1 @@ -827004,7 +827004,7 @@ sub_81ABFA8: @ 81ABFA8 orrs r1, r2 strb r1, [r0] bl sub_81AB824 -_081AC026: +@081AC026: ldr r4, =0x0203ce58 ldrb r1, [r4, 0x5] add r0, sp, 0x8 @@ -827016,7 +827016,7 @@ _081AC026: asrs r1, r0, 16 adds r5, r0, 0 cmp r1, 0x1 - bne _081AC07C + bne @081AC07C ldr r2, =0x085e91fc ldrb r0, [r4, 0x5] lsls r0, 2 @@ -827030,10 +827030,10 @@ _081AC026: bl sub_81ADF20 movs r0, 0 bl sub_81ADFF8 - b _081AC09A + b @081AC09A .align 2, 0 .pool -_081AC07C: +@081AC07C: ldr r2, =0x085e91fc add r0, sp, 0x8 ldrb r0, [r0] @@ -827047,7 +827047,7 @@ _081AC07C: bl sub_81ADF20 movs r0, 0x8 bl sub_81ADFF8 -_081AC09A: +@081AC09A: ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] movs r1, 0 @@ -827093,7 +827093,7 @@ _081AC09A: thumb_func_end sub_81ABFA8 thumb_func_start sub_81AC10C -sub_81AC10C: @ 81AC10C +sub_81AC10C: ; 81AC10C push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 @@ -827105,22 +827105,22 @@ sub_81AC10C: @ 81AC10C bl sub_81221AC lsls r0, 24 cmp r0, 0 - bne _081AC184 + bne @081AC184 bl sub_81ADC54 lsls r0, 24 cmp r0, 0 - bne _081AC184 + bne @081AC184 bl sub_81ABF10 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081AC148 + beq @081AC148 cmp r0, 0x2 - beq _081AC164 - b _081AC184 + beq @081AC164 + b @081AC184 .align 2, 0 .pool -_081AC148: +@081AC148: ldr r0, =0x0203ce5d movs r1, 0x16 ldrsb r1, [r6, r1] @@ -827130,10 +827130,10 @@ _081AC148: movs r1, 0x1 negs r1, r1 adds r0, r7, 0 - b _081AC178 + b @081AC178 .align 2, 0 .pool -_081AC164: +@081AC164: ldr r0, =0x0203ce5d movs r1, 0x16 ldrsb r1, [r6, r1] @@ -827142,21 +827142,21 @@ _081AC164: bl set_task_function_to_args_14_15 adds r0, r7, 0 movs r1, 0x1 -_081AC178: +@081AC178: movs r2, 0x1 bl sub_81ABFA8 - b _081AC22E + b @081AC22E .align 2, 0 .pool -_081AC184: +@081AC184: movs r1, 0x1A ldrsh r0, [r6, r1] cmp r0, 0 - beq _081AC192 + beq @081AC192 cmp r0, 0x1 - beq _081AC1DC - b _081AC22E -_081AC192: + beq @081AC1DC + b @081AC22E +@081AC192: ldrb r0, [r6, 0x18] bl sub_81AC23C ldrh r0, [r6, 0x18] @@ -827165,18 +827165,18 @@ _081AC192: movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _081AC1CC + bne @081AC1CC movs r2, 0x16 ldrsh r0, [r6, r2] cmp r0, 0x1 - bne _081AC1BC + bne @081AC1BC lsls r0, r1, 16 asrs r0, 17 lsls r0, 24 lsrs r0, 24 bl sub_81ADFF8 - b _081AC1CC -_081AC1BC: + b @081AC1CC +@081AC1BC: lsls r1, 16 asrs r1, 17 movs r0, 0x8 @@ -827184,16 +827184,16 @@ _081AC1BC: lsls r0, 24 lsrs r0, 24 bl sub_81ADFF8 -_081AC1CC: +@081AC1CC: movs r1, 0x18 ldrsh r0, [r6, r1] cmp r0, 0x10 - bne _081AC22E + bne @081AC22E ldrh r0, [r6, 0x1A] adds r0, 0x1 strh r0, [r6, 0x1A] - b _081AC22E -_081AC1DC: + b @081AC22E +@081AC1DC: ldr r4, =0x0203ce5d movs r1, 0x16 ldrsb r1, [r6, r1] @@ -827226,7 +827226,7 @@ _081AC1DC: bl sub_81AB854 adds r0, r7, 0 bl set_task_function_to_args_14_15 -_081AC22E: +@081AC22E: pop {r4-r7} pop {r0} bx r0 @@ -827235,7 +827235,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 @@ -827260,15 +827260,15 @@ 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 lsrs r0, 24 lsls r1, 24 cmp r1, 0 - bne _081AC298 + bne @081AC298 ldr r1, =0x00001017 adds r2, r0, 0x5 lsls r2, 24 @@ -827279,10 +827279,10 @@ bag_menu_draw_pocket_indicator_square: @ 81AC26C movs r0, 0x2 movs r3, 0x3 bl bg_fill_tilemap_rect - b _081AC2AE + b @081AC2AE .align 2, 0 .pool -_081AC298: +@081AC298: ldr r1, =0x0000102b adds r2, r0, 0x5 lsls r2, 24 @@ -827293,7 +827293,7 @@ _081AC298: movs r0, 0x2 movs r3, 0x3 bl bg_fill_tilemap_rect -_081AC2AE: +@081AC2AE: movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram add sp, 0x8 @@ -827304,31 +827304,31 @@ _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] cmp r0, 0x1 - bhi _081AC2E0 + bhi @081AC2E0 ldrb r0, [r1, 0x5] subs r0, 0x2 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bls _081AC2E0 + bls @081AC2E0 movs r0, 0x1 - b _081AC2E2 + b @081AC2E2 .align 2, 0 .pool -_081AC2E0: +@081AC2E0: movs r0, 0 -_081AC2E2: +@081AC2E2: pop {r1} bx r1 thumb_func_end sub_81AC2C0 thumb_func_start sub_81AC2E8 -sub_81AC2E8: @ 81AC2E8 +sub_81AC2E8: ; 81AC2E8 push {r4-r6,lr} mov r6, r9 mov r5, r8 @@ -827416,7 +827416,7 @@ sub_81AC2E8: @ 81AC2E8 thumb_func_end sub_81AC2E8 thumb_func_start sub_81AC3C0 -sub_81AC3C0: @ 81AC3C0 +sub_81AC3C0: ; 81AC3C0 push {r4-r7,lr} mov r7, r8 push {r7} @@ -827431,14 +827431,14 @@ sub_81AC3C0: @ 81AC3C0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081AC48E + beq @081AC48E ldr r0, =0x030022c0 mov r8, r0 ldrh r1, [r0, 0x2E] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _081AC418 + beq @081AC418 movs r0, 0x5 bl audio_play ldrb r0, [r4] @@ -827451,10 +827451,10 @@ sub_81AC3C0: @ 81AC3C0 adds r3, 0x8 adds r2, r3 bl get_coro_args_x18_x1A - b _081AC472 + b @081AC472 .align 2, 0 .pool -_081AC418: +@081AC418: ldrb r0, [r4] bl sub_81AE604 adds r7, r0, 0 @@ -827479,14 +827479,14 @@ _081AC418: movs r0, 0x2 negs r0, r0 cmp r7, r0 - beq _081AC460 + beq @081AC460 adds r0, 0x1 cmp r7, r0 - bne _081AC482 - b _081AC48E + bne @081AC482 + b @081AC48E .align 2, 0 .pool -_081AC460: +@081AC460: movs r0, 0x5 bl audio_play mov r0, r8 @@ -827494,21 +827494,21 @@ _081AC460: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081AC47A -_081AC472: + beq @081AC47A +@081AC472: adds r0, r6, 0 bl sub_81AC498 - b _081AC48E -_081AC47A: + b @081AC48E +@081AC47A: adds r0, r6, 0 bl sub_81AC590 - b _081AC48E -_081AC482: + b @081AC48E +@081AC482: movs r0, 0x5 bl audio_play adds r0, r6, 0 bl sub_81AC498 -_081AC48E: +@081AC48E: pop {r3} mov r8, r3 pop {r4-r7} @@ -827517,7 +827517,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 @@ -827551,17 +827551,17 @@ sub_81AC498: @ 81AC498 movs r1, 0x2 ldrsh r2, [r0, r1] cmp r2, r4 - beq _081AC4E2 + beq @081AC4E2 subs r0, r4, 0x1 cmp r2, r0 - bne _081AC4F8 -_081AC4E2: + bne @081AC4F8 +@081AC4E2: adds r0, r3, 0 bl sub_81AC590 - b _081AC566 + b @081AC566 .align 2, 0 .pool -_081AC4F8: +@081AC4F8: ldr r1, =0x02039dd8 lsls r0, r6, 3 adds r0, r1 @@ -827584,7 +827584,7 @@ _081AC4F8: movs r1, 0x2 ldrsh r0, [r2, r1] cmp r0, r4 - bge _081AC538 + bge @081AC538 ldrb r1, [r5, 0x5] lsls r1, 1 ldr r2, =0x0203ce60 @@ -827592,7 +827592,7 @@ _081AC4F8: ldrh r0, [r1] subs r0, 0x1 strh r0, [r1] -_081AC538: +@081AC538: ldrb r0, [r5, 0x5] bl load_bag_item_list_buffers ldr r0, =0x03006310 @@ -827612,7 +827612,7 @@ _081AC538: add r0, r10 ldr r1, =sub_81ABD28 + 1 str r1, [r0] -_081AC566: +@081AC566: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -827625,7 +827625,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 @@ -827667,14 +827667,14 @@ sub_81AC590: @ 81AC590 ldrh r1, [r5] adds r0, r1 cmp r2, r0 - bge _081AC5F2 + bge @081AC5F2 ldrb r1, [r4, 0x5] lsls r1, 1 add r1, r8 ldrh r0, [r1] subs r0, 0x1 strh r0, [r1] -_081AC5F2: +@081AC5F2: ldrb r0, [r4, 0x5] bl load_bag_item_list_buffers ldr r0, =0x03006310 @@ -827704,42 +827704,42 @@ _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 ldrb r0, [r0, 0x4] subs r0, 0x1 cmp r0, 0x9 - bls _081AC654 - b _081AC82C -_081AC654: + bls @081AC654 + b @081AC82C +@081AC654: lsls r0, 2 - ldr r1, =_081AC668 + ldr r1, =@081AC668 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081AC668: - .4byte _081AC690 - .4byte _081AC82C - .4byte _081AC82C - .4byte _081AC82C - .4byte _081AC6E8 - .4byte _081AC82C - .4byte _081AC76C - .4byte _081AC7CC - .4byte _081AC70C - .4byte _081AC690 -_081AC690: +@081AC668: + .4byte @081AC690 + .4byte @081AC82C + .4byte @081AC82C + .4byte @081AC82C + .4byte @081AC6E8 + .4byte @081AC82C + .4byte @081AC76C + .4byte @081AC7CC + .4byte @081AC70C + .4byte @081AC690 +@081AC690: ldr r0, =0x0203ce7c ldrh r0, [r0] bl itemid_get_usage lsls r0, 24 cmp r0, 0 - beq _081AC6C4 + beq @081AC6C4 ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 @@ -827750,10 +827750,10 @@ _081AC690: ldr r0, =0x00000828 adds r1, r0 movs r0, 0x2 - b _081ACA10 + b @081ACA10 .align 2, 0 .pool -_081AC6C4: +@081AC6C4: ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 @@ -827764,10 +827764,10 @@ _081AC6C4: ldr r0, =0x00000828 adds r1, r0 movs r0, 0x1 - b _081ACA10 + b @081ACA10 .align 2, 0 .pool -_081AC6E8: +@081AC6E8: ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 @@ -827778,19 +827778,19 @@ _081AC6E8: ldr r0, =0x00000828 adds r1, r0 movs r0, 0x4 - b _081ACA10 + b @081ACA10 .align 2, 0 .pool -_081AC70C: +@081AC70C: ldr r4, =0x0203ce7c ldrh r0, [r4] bl itemid_is_unique lsls r0, 24 cmp r0, 0 - bne _081AC748 + bne @081AC748 ldrh r0, [r4] cmp r0, 0xAF - beq _081AC748 + beq @081AC748 ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 @@ -827801,10 +827801,10 @@ _081AC70C: ldr r0, =0x00000828 adds r1, r0 movs r0, 0x2 - b _081ACA10 + b @081ACA10 .align 2, 0 .pool -_081AC748: +@081AC748: ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 @@ -827815,19 +827815,19 @@ _081AC748: ldr r0, =0x00000828 adds r1, r0 movs r0, 0x1 - b _081ACA10 + b @081ACA10 .align 2, 0 .pool -_081AC76C: +@081AC76C: ldr r4, =0x0203ce7c ldrh r0, [r4] bl itemid_is_unique lsls r0, 24 cmp r0, 0 - bne _081AC7A8 + bne @081AC7A8 ldrh r0, [r4] cmp r0, 0xAF - beq _081AC7A8 + beq @081AC7A8 ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 @@ -827838,10 +827838,10 @@ _081AC76C: ldr r0, =0x00000828 adds r1, r0 movs r0, 0x2 - b _081ACA10 + b @081ACA10 .align 2, 0 .pool -_081AC7A8: +@081AC7A8: ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 @@ -827852,19 +827852,19 @@ _081AC7A8: ldr r0, =0x00000828 adds r1, r0 movs r0, 0x1 - b _081ACA10 + b @081ACA10 .align 2, 0 .pool -_081AC7CC: +@081AC7CC: ldr r4, =0x0203ce7c ldrh r0, [r4] bl itemid_is_unique lsls r0, 24 cmp r0, 0 - bne _081AC808 + bne @081AC808 ldrh r0, [r4] cmp r0, 0xAF - beq _081AC808 + beq @081AC808 ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 @@ -827875,10 +827875,10 @@ _081AC7CC: ldr r0, =0x00000828 adds r1, r0 movs r0, 0x2 - b _081ACA10 + b @081ACA10 .align 2, 0 .pool -_081AC808: +@081AC808: ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 @@ -827889,30 +827889,30 @@ _081AC808: ldr r0, =0x00000828 adds r1, r0 movs r0, 0x1 - b _081ACA10 + b @081ACA10 .align 2, 0 .pool -_081AC82C: +@081AC82C: bl sub_81221AC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081AC840 + beq @081AC840 bl in_trade_center cmp r0, 0x1 - bne _081AC8A4 -_081AC840: + bne @081AC8A4 +@081AC840: ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] cmp r0, 0x4 - beq _081AC856 + beq @081AC856 ldr r0, =0x0203ce7c ldrh r0, [r0] bl sub_8122148 lsls r0, 24 cmp r0, 0 - bne _081AC880 -_081AC856: + bne @081AC880 +@081AC856: ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 @@ -827923,10 +827923,10 @@ _081AC856: ldr r0, =0x00000828 adds r1, r0 movs r0, 0x1 - b _081ACA10 + b @081ACA10 .align 2, 0 .pool -_081AC880: +@081AC880: ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 @@ -827937,31 +827937,31 @@ _081AC880: ldr r0, =0x00000828 adds r1, r0 movs r0, 0x2 - b _081ACA10 + b @081ACA10 .align 2, 0 .pool -_081AC8A4: +@081AC8A4: ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] cmp r0, 0x4 - bls _081AC8AE - b _081ACA12 -_081AC8AE: + bls @081AC8AE + b @081ACA12 +@081AC8AE: lsls r0, 2 - ldr r1, =_081AC8C0 + ldr r1, =@081AC8C0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081AC8C0: - .4byte _081AC8D4 - .4byte _081AC9B4 - .4byte _081AC9D8 - .4byte _081AC9FC - .4byte _081AC92C -_081AC8D4: +@081AC8C0: + .4byte @081AC8D4 + .4byte @081AC9B4 + .4byte @081AC9D8 + .4byte @081AC9FC + .4byte @081AC92C +@081AC8D4: ldr r4, =0x0203ce54 ldr r1, [r4] movs r0, 0x82 @@ -827985,18 +827985,18 @@ _081AC8D4: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081AC90A - b _081ACA12 -_081AC90A: + beq @081AC90A + b @081ACA12 +@081AC90A: ldr r0, [r4] ldr r1, =0x00000824 adds r0, r1 movs r1, 0x6 strb r1, [r0] - b _081ACA12 + b @081ACA12 .align 2, 0 .pool -_081AC92C: +@081AC92C: ldr r4, =0x0203ce54 ldr r1, [r4] movs r0, 0x82 @@ -828022,34 +828022,34 @@ _081AC92C: ldrh r0, [r0] ldrh r1, [r2] cmp r0, r1 - bne _081AC96C + bne @081AC96C ldr r0, [r4] ldr r1, =0x00000825 adds r0, r1 movs r1, 0x8 strb r1, [r0] -_081AC96C: +@081AC96C: ldrh r1, [r2] ldr r0, =0x00000103 cmp r1, r0 - beq _081AC97A + beq @081AC97A adds r0, 0xD cmp r1, r0 - bne _081ACA12 -_081AC97A: + bne @081ACA12 +@081AC97A: movs r0, 0x6 bl walkrun_bitfield_and_r0 lsls r0, 24 cmp r0, 0 - beq _081ACA12 + beq @081ACA12 ldr r0, [r4] adds r0, r5 movs r1, 0x7 strb r1, [r0] - b _081ACA12 + b @081ACA12 .align 2, 0 .pool -_081AC9B4: +@081AC9B4: ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 @@ -828060,10 +828060,10 @@ _081AC9B4: ldr r0, =0x00000828 adds r1, r0 movs r0, 0x4 - b _081ACA10 + b @081ACA10 .align 2, 0 .pool -_081AC9D8: +@081AC9D8: ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 @@ -828074,10 +828074,10 @@ _081AC9D8: ldr r0, =0x00000828 adds r1, r0 movs r0, 0x4 - b _081ACA10 + b @081ACA10 .align 2, 0 .pool -_081AC9FC: +@081AC9FC: ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 @@ -828088,13 +828088,13 @@ _081AC9FC: ldr r0, =0x00000828 adds r1, r0 movs r0, 0x6 -_081ACA10: +@081ACA10: strb r0, [r1] -_081ACA12: +@081ACA12: ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] cmp r0, 0x2 - bne _081ACA50 + bne @081ACA50 movs r0, 0x1 bl Window_FillTileMap ldr r0, =0x0203ce7c @@ -828106,10 +828106,10 @@ _081ACA12: bl Window_WriteStandardTileMap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - b _081ACA86 + b @081ACA86 .align 2, 0 .pool -_081ACA50: +@081ACA50: ldr r0, =0x0203ce7c ldrh r0, [r0] ldr r1, =0x02021cc4 @@ -828133,31 +828133,31 @@ _081ACA50: adds r2, r4, 0 movs r3, 0x3 bl sub_81AE0BC -_081ACA86: +@081ACA86: ldr r0, =0x0203ce54 ldr r0, [r0] ldr r1, =0x00000828 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _081ACAB0 + bne @081ACAB0 movs r0, 0 - b _081ACAB6 + b @081ACAB6 .align 2, 0 .pool -_081ACAB0: +@081ACAB0: cmp r0, 0x2 - bne _081ACAC4 + bne @081ACAC4 movs r0, 0x1 -_081ACAB6: +@081ACAB6: bl sub_81AE13C lsls r0, 24 lsrs r0, 24 bl sub_81ACAF8 - b _081ACAEE -_081ACAC4: + b @081ACAEE +@081ACAC4: cmp r0, 0x4 - bne _081ACADC + bne @081ACADC movs r0, 0x2 bl sub_81AE13C lsls r0, 24 @@ -828165,8 +828165,8 @@ _081ACAC4: movs r1, 0x2 movs r2, 0x2 bl sub_81ACB54 - b _081ACAEE -_081ACADC: + b @081ACAEE +@081ACADC: movs r0, 0x3 bl sub_81AE13C lsls r0, 24 @@ -828174,7 +828174,7 @@ _081ACADC: movs r1, 0x2 movs r2, 0x3 bl sub_81ACB54 -_081ACAEE: +@081ACAEE: add sp, 0x14 pop {r4,r5} pop {r0} @@ -828182,7 +828182,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 @@ -828225,7 +828225,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 @@ -828271,7 +828271,7 @@ sub_81ACB54: @ 81ACB54 thumb_func_end sub_81ACB54 thumb_func_start sub_81ACBB0 -sub_81ACBB0: @ 81ACBB0 +sub_81ACBB0: ; 81ACBB0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -828283,24 +828283,24 @@ sub_81ACBB0: @ 81ACBB0 adds r0, r1 ldrb r0, [r0] cmp r0, 0x2 - bhi _081ACBE8 + bhi @081ACBE8 ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 ldr r0, =sub_81ACC04 + 1 - b _081ACBF4 + b @081ACBF4 .align 2, 0 .pool -_081ACBE8: +@081ACBE8: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 ldr r0, =sub_81ACC78 + 1 -_081ACBF4: +@081ACBF4: str r0, [r1] pop {r4} pop {r0} @@ -828310,7 +828310,7 @@ _081ACBF4: thumb_func_end sub_81ACBB0 thumb_func_start sub_81ACC04 -sub_81ACC04: @ 81ACC04 +sub_81ACC04: ; 81ACC04 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -828319,27 +828319,27 @@ sub_81ACC04: @ 81ACC04 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081ACC6A + beq @081ACC6A bl ProcessMenuInputNoWrapAround lsls r0, 24 asrs r4, r0, 24 movs r0, 0x2 negs r0, r0 cmp r4, r0 - beq _081ACC6A + beq @081ACC6A adds r0, 0x1 cmp r4, r0 - bne _081ACC44 + bne @081ACC44 movs r0, 0x5 bl audio_play ldr r0, =0x08613fb4 ldr r1, [r0, 0x24] adds r0, r5, 0 bl _call_via_r1 - b _081ACC6A + b @081ACC6A .align 2, 0 .pool -_081ACC44: +@081ACC44: movs r0, 0x5 bl audio_play ldr r1, =0x08613fb4 @@ -828357,7 +828357,7 @@ _081ACC44: ldr r1, [r0] adds r0, r6, 0 bl _call_via_r1 -_081ACC6A: +@081ACC6A: pop {r4-r6} pop {r0} bx r0 @@ -828366,7 +828366,7 @@ _081ACC6A: thumb_func_end sub_81ACC04 thumb_func_start sub_81ACC78 -sub_81ACC78: @ 81ACC78 +sub_81ACC78: ; 81ACC78 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 @@ -828374,9 +828374,9 @@ sub_81ACC78: @ 81ACC78 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081ACC8C - b _081ACDF0 -_081ACC8C: + bne @081ACC8C + b @081ACDF0 +@081ACC8C: bl GetMenuCursorPos lsls r0, 24 lsrs r4, r0, 24 @@ -828385,36 +828385,36 @@ _081ACC8C: movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _081ACCD4 + beq @081ACCD4 lsls r0, r4, 24 asrs r0, 24 cmp r0, 0 - bgt _081ACCAA - b _081ACDF0 -_081ACCAA: + bgt @081ACCAA + b @081ACDF0 +@081ACCAA: subs r0, 0x2 lsls r0, 24 asrs r0, 24 bl sub_81ACDFC lsls r0, 24 cmp r0, 0 - bne _081ACCBC - b _081ACDF0 -_081ACCBC: + bne @081ACCBC + b @081ACDF0 +@081ACCBC: movs r0, 0x5 bl audio_play movs r1, 0x1 negs r1, r1 movs r0, 0 bl sub_8199134 - b _081ACDF0 + b @081ACDF0 .align 2, 0 .pool -_081ACCD4: +@081ACCD4: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081ACD1C + beq @081ACD1C lsls r0, r4, 24 asrs r1, r0, 24 ldr r0, =0x0203ce54 @@ -828424,91 +828424,91 @@ _081ACCD4: ldrb r0, [r0] subs r0, 0x2 cmp r1, r0 - blt _081ACCF2 - b _081ACDF0 -_081ACCF2: + blt @081ACCF2 + b @081ACDF0 +@081ACCF2: adds r0, r1, 0x2 lsls r0, 24 asrs r0, 24 bl sub_81ACDFC lsls r0, 24 cmp r0, 0 - beq _081ACDF0 + beq @081ACDF0 movs r0, 0x5 bl audio_play movs r0, 0 movs r1, 0x1 bl sub_8199134 - b _081ACDF0 + b @081ACDF0 .align 2, 0 .pool -_081ACD1C: +@081ACD1C: movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _081ACD30 + bne @081ACD30 bl sub_81220D0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081ACD58 -_081ACD30: + bne @081ACD58 +@081ACD30: lsls r0, r4, 24 asrs r1, r0, 24 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081ACDF0 + beq @081ACDF0 subs r0, r1, 0x1 lsls r0, 24 asrs r0, 24 bl sub_81ACDFC lsls r0, 24 cmp r0, 0 - beq _081ACDF0 + beq @081ACDF0 movs r0, 0x5 bl audio_play movs r0, 0x1 negs r0, r0 - b _081ACD92 -_081ACD58: + b @081ACD92 +@081ACD58: ldrh r1, [r5, 0x2E] movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _081ACD6E + bne @081ACD6E bl sub_81220D0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _081ACD9A -_081ACD6E: + bne @081ACD9A +@081ACD6E: lsls r0, r4, 24 asrs r1, r0, 24 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _081ACDF0 + bne @081ACDF0 adds r0, r1, 0x1 lsls r0, 24 asrs r0, 24 bl sub_81ACDFC lsls r0, 24 cmp r0, 0 - beq _081ACDF0 + beq @081ACDF0 movs r0, 0x5 bl audio_play movs r0, 0x1 -_081ACD92: +@081ACD92: movs r1, 0 bl sub_8199134 - b _081ACDF0 -_081ACD9A: + b @081ACDF0 +@081ACD9A: ldrh r1, [r5, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081ACDD8 + beq @081ACDD8 movs r0, 0x5 bl audio_play ldr r2, =0x08613fb4 @@ -828528,21 +828528,21 @@ _081ACD9A: ldr r1, [r0] adds r0, r6, 0 bl _call_via_r1 - b _081ACDF0 + b @081ACDF0 .align 2, 0 .pool -_081ACDD8: +@081ACDD8: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081ACDF0 + beq @081ACDF0 movs r0, 0x5 bl audio_play ldr r0, =0x08613fb4 ldr r1, [r0, 0x24] adds r0, r6, 0 bl _call_via_r1 -_081ACDF0: +@081ACDF0: pop {r4-r6} pop {r0} bx r0 @@ -828551,19 +828551,19 @@ _081ACDF0: thumb_func_end sub_81ACC78 thumb_func_start sub_81ACDFC -sub_81ACDFC: @ 81ACDFC +sub_81ACDFC: ; 81ACDFC push {lr} lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - blt _081ACE30 + blt @081ACE30 ldr r0, =0x0203ce54 ldr r2, [r0] ldr r3, =0x00000828 adds r0, r2, r3 ldrb r0, [r0] cmp r1, r0 - bgt _081ACE30 + bgt @081ACE30 movs r3, 0x82 lsls r3, 4 adds r0, r2, r3 @@ -828571,20 +828571,20 @@ sub_81ACDFC: @ 81ACDFC adds r0, r1 ldrb r0, [r0] cmp r0, 0xE - beq _081ACE30 + beq @081ACE30 movs r0, 0x1 - b _081ACE32 + b @081ACE32 .align 2, 0 .pool -_081ACE30: +@081ACE30: movs r0, 0 -_081ACE32: +@081ACE32: pop {r1} bx r1 thumb_func_end sub_81ACDFC thumb_func_start sub_81ACE38 -sub_81ACE38: @ 81ACE38 +sub_81ACE38: ; 81ACE38 push {lr} ldr r0, =0x0203ce54 ldr r0, [r0] @@ -828592,34 +828592,34 @@ sub_81ACE38: @ 81ACE38 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _081ACE58 + bne @081ACE58 movs r0, 0 bl sub_81AE184 - b _081ACE76 + b @081ACE76 .align 2, 0 .pool -_081ACE58: +@081ACE58: cmp r0, 0x2 - bne _081ACE64 + bne @081ACE64 movs r0, 0x1 bl sub_81AE184 - b _081ACE76 -_081ACE64: + b @081ACE76 +@081ACE64: cmp r0, 0x4 - bne _081ACE70 + bne @081ACE70 movs r0, 0x2 bl sub_81AE184 - b _081ACE76 -_081ACE70: + b @081ACE76 +@081ACE70: movs r0, 0x3 bl sub_81AE184 -_081ACE76: +@081ACE76: pop {r0} bx r0 thumb_func_end sub_81ACE38 thumb_func_start sub_81ACE7C -sub_81ACE7C: @ 81ACE7C +sub_81ACE7C: ; 81ACE7C push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -828627,24 +828627,24 @@ sub_81ACE7C: @ 81ACE7C ldrh r0, [r5] bl itemid_get_overworld_function cmp r0, 0 - beq _081ACEEE + beq @081ACEEE bl sub_81ACE38 bl calc_player_party_count lsls r0, 24 cmp r0, 0 - bne _081ACEB8 + bne @081ACEB8 ldrh r0, [r5] bl itemid_get_type lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081ACEB8 + bne @081ACEB8 adds r0, r4, 0 bl sub_81AD2F0 - b _081ACEEE + b @081ACEEE .align 2, 0 .pool -_081ACEB8: +@081ACEB8: movs r0, 0x1 movs r1, 0 bl Window_FastFillPixels @@ -828653,27 +828653,27 @@ _081ACEB8: ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] cmp r0, 0x3 - beq _081ACEE8 + beq @081ACEE8 ldr r0, =0x0203ce7c ldrh r0, [r0] bl itemid_get_overworld_function adds r1, r0, 0 adds r0, r4, 0 bl _call_via_r1 - b _081ACEEE + b @081ACEEE .align 2, 0 .pool -_081ACEE8: +@081ACEE8: adds r0, r4, 0 bl sub_80FDD10 -_081ACEEE: +@081ACEEE: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_81ACE7C thumb_func_start sub_81ACEF4 -sub_81ACEF4: @ 81ACEF4 +sub_81ACEF4: ; 81ACEF4 push {r4-r7,lr} sub sp, 0x14 lsls r0, 24 @@ -828689,13 +828689,13 @@ sub_81ACEF4: @ 81ACEF4 movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0x1 - bne _081ACF24 + bne @081ACF24 adds r0, r5, 0 bl sub_81ACF88 - b _081ACF6A + b @081ACF6A .align 2, 0 .pool -_081ACF24: +@081ACF24: ldr r0, =0x0203ce7c ldrh r0, [r0] ldr r1, =0x02021cc4 @@ -828726,7 +828726,7 @@ _081ACF24: adds r0, r6, r0 ldr r1, =sub_81AD044 + 1 str r1, [r0] -_081ACF6A: +@081ACF6A: add sp, 0x14 pop {r4-r7} pop {r0} @@ -828736,7 +828736,7 @@ _081ACF6A: thumb_func_end sub_81ACEF4 thumb_func_start sub_81ACF88 -sub_81ACF88: @ 81ACF88 +sub_81ACF88: ; 81ACF88 push {r4,r5,lr} sub sp, 0x14 adds r5, r0, 0 @@ -828789,7 +828789,7 @@ sub_81ACF88: @ 81ACF88 thumb_func_end sub_81ACF88 thumb_func_start sub_81AD010 -sub_81AD010: @ 81AD010 +sub_81AD010: ; 81AD010 push {r4,r5,lr} adds r5, r0, 0 lsls r5, 24 @@ -828815,7 +828815,7 @@ sub_81AD010: @ 81AD010 thumb_func_end sub_81AD010 thumb_func_start sub_81AD044 -sub_81AD044: @ 81AD044 +sub_81AD044: ; 81AD044 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -828832,7 +828832,7 @@ sub_81AD044: @ 81AD044 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081AD088 + bne @081AD088 ldr r0, =0x0203ce54 ldr r0, [r0] ldr r1, =0x00000817 @@ -828841,44 +828841,44 @@ sub_81AD044: @ 81AD044 movs r2, 0x10 ldrsh r1, [r4, r2] bl sub_81ABC54 - b _081AD0C6 + b @081AD0C6 .align 2, 0 .pool -_081AD088: +@081AD088: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081AD0AC + beq @081AD0AC movs r0, 0x5 bl audio_play movs r0, 0x7 bl sub_81AE184 adds r0, r5, 0 bl sub_81ACF88 - b _081AD0C6 + b @081AD0C6 .align 2, 0 .pool -_081AD0AC: +@081AD0AC: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081AD0C6 + beq @081AD0C6 movs r0, 0x5 bl audio_play movs r0, 0x7 bl sub_81AE184 adds r0, r6, 0 bl sub_81AD010 -_081AD0C6: +@081AD0C6: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_81AD044 thumb_func_start display_threw_away_item_str -display_threw_away_item_str: @ 81AD0CC +display_threw_away_item_str: ; 81AD0CC push {r4-r6,lr} sub sp, 0x14 lsls r0, 24 @@ -828930,7 +828930,7 @@ display_threw_away_item_str: @ 81AD0CC thumb_func_end display_threw_away_item_str thumb_func_start sub_81AD150 -sub_81AD150: @ 81AD150 +sub_81AD150: ; 81AD150 push {r4-r7,lr} mov r7, r8 push {r7} @@ -828956,7 +828956,7 @@ sub_81AD150: @ 81AD150 movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _081AD1CE + beq @081AD1CE movs r0, 0x5 bl audio_play ldr r0, =0x0203ce7c @@ -828985,7 +828985,7 @@ sub_81AD150: @ 81AD150 bl schedule_bg_copy_tilemap_to_vram adds r0, r6, 0 bl set_callback3_to_bag -_081AD1CE: +@081AD1CE: pop {r3} mov r8, r3 pop {r4-r7} @@ -828996,7 +828996,7 @@ _081AD1CE: thumb_func_end sub_81AD150 thumb_func_start sub_81AD1EC -sub_81AD1EC: @ 81AD1EC +sub_81AD1EC: ; 81AD1EC push {r4-r7,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -829021,15 +829021,15 @@ sub_81AD1EC: @ 81AD1EC ldrh r2, [r0] ldrh r0, [r1] cmp r0, r2 - bne _081AD238 + bne @081AD238 movs r0, 0 strh r0, [r1] - b _081AD23A + b @081AD23A .align 2, 0 .pool -_081AD238: +@081AD238: strh r2, [r1] -_081AD23A: +@081AD23A: ldrb r0, [r7] adds r1, r6, 0 adds r2, r5, 0 @@ -829056,7 +829056,7 @@ _081AD23A: thumb_func_end sub_81AD1EC thumb_func_start sub_81AD278 -sub_81AD278: @ 81AD278 +sub_81AD278: ; 81AD278 push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -829067,49 +829067,49 @@ sub_81AD278: @ 81AD278 bl itemid_80BF6D8_mail_related lsls r0, 24 cmp r0, 0 - bne _081AD2AC + bne @081AD2AC ldr r2, =0x085e8dce ldr r3, =sub_81AD350 + 1 adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C - b _081AD2EA + b @081AD2EA .align 2, 0 .pool -_081AD2AC: +@081AD2AC: ldrh r0, [r5] bl itemid_is_unique lsls r0, 24 cmp r0, 0 - bne _081AD2E4 + bne @081AD2E4 bl calc_player_party_count lsls r0, 24 cmp r0, 0 - bne _081AD2CA + bne @081AD2CA adds r0, r4, 0 bl sub_81AD2F0 - b _081AD2EA -_081AD2CA: + b @081AD2EA +@081AD2CA: ldr r0, =0x0203ce54 ldr r1, [r0] ldr r0, =sub_81B7F60 + 1 str r0, [r1] adds r0, r4, 0 bl task_close_bag_menu_1 - b _081AD2EA + b @081AD2EA .align 2, 0 .pool -_081AD2E4: +@081AD2E4: adds r0, r6, 0 bl sub_81AD30C -_081AD2EA: +@081AD2EA: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_81AD278 thumb_func_start sub_81AD2F0 -sub_81AD2F0: @ 81AD2F0 +sub_81AD2F0: ; 81AD2F0 push {lr} lsls r0, 24 lsrs r0, 24 @@ -829124,7 +829124,7 @@ sub_81AD2F0: @ 81AD2F0 thumb_func_end sub_81AD2F0 thumb_func_start sub_81AD30C -sub_81AD30C: @ 81AD30C +sub_81AD30C: ; 81AD30C push {r4,r5,lr} adds r4, r0, 0 lsls r4, 24 @@ -829150,7 +829150,7 @@ sub_81AD30C: @ 81AD30C thumb_func_end sub_81AD30C thumb_func_start sub_81AD350 -sub_81AD350: @ 81AD350 +sub_81AD350: ; 81AD350 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -829159,12 +829159,12 @@ sub_81AD350: @ 81AD350 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081AD36E + beq @081AD36E movs r0, 0x5 bl audio_play adds r0, r4, 0 bl sub_81ABBBC -_081AD36E: +@081AD36E: pop {r4} pop {r0} bx r0 @@ -829173,7 +829173,7 @@ _081AD36E: thumb_func_end sub_81AD350 thumb_func_start sub_81AD378 -sub_81AD378: @ 81AD378 +sub_81AD378: ; 81AD378 push {lr} lsls r0, 24 lsrs r0, 24 @@ -829189,7 +829189,7 @@ sub_81AD378: @ 81AD378 thumb_func_end sub_81AD378 thumb_func_start sub_81AD398 -sub_81AD398: @ 81AD398 +sub_81AD398: ; 81AD398 push {r4,r5,lr} adds r5, r0, 0 lsls r5, 24 @@ -829220,7 +829220,7 @@ sub_81AD398: @ 81AD398 thumb_func_end sub_81AD398 thumb_func_start brm_run_item_battle_function -brm_run_item_battle_function: @ 81AD3DC +brm_run_item_battle_function: ; 81AD3DC push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -829228,14 +829228,14 @@ brm_run_item_battle_function: @ 81AD3DC ldrh r0, [r4] bl itemid_get_battle_function cmp r0, 0 - beq _081AD400 + beq @081AD400 bl sub_81ACE38 ldrh r0, [r4] bl itemid_get_battle_function adds r1, r0, 0 adds r0, r5, 0 bl _call_via_r1 -_081AD400: +@081AD400: pop {r4,r5} pop {r0} bx r0 @@ -829244,7 +829244,7 @@ _081AD400: thumb_func_end brm_run_item_battle_function thumb_func_start sub_81AD40C -sub_81AD40C: @ 81AD40C +sub_81AD40C: ; 81AD40C push {lr} movs r0, 0xC movs r1, 0x5 @@ -829255,7 +829255,7 @@ sub_81AD40C: @ 81AD40C thumb_func_end sub_81AD40C thumb_func_start sub_81AD41C -sub_81AD41C: @ 81AD41C +sub_81AD41C: ; 81AD41C push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -829264,21 +829264,21 @@ sub_81AD41C: @ 81AD41C bl itemid_80BF6D8_mail_related lsls r0, 24 cmp r0, 0 - bne _081AD44C + bne @081AD44C ldr r2, =0x085e8dce ldr r3, =sub_81AD350 + 1 adds r0, r5, 0 movs r1, 0x1 bl sub_81ABB4C - b _081AD4AE + b @081AD4AE .align 2, 0 .pool -_081AD44C: +@081AD44C: ldrh r0, [r4] bl sub_8122148 lsls r0, 24 cmp r0, 0 - bne _081AD488 + bne @081AD488 ldrh r0, [r4] ldr r1, =0x02021cc4 bl itemid_get_name @@ -829291,35 +829291,35 @@ _081AD44C: movs r1, 0x1 adds r2, r4, 0 bl sub_81ABB4C - b _081AD4AE + b @081AD4AE .align 2, 0 .pool -_081AD488: +@081AD488: ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] cmp r0, 0x4 - beq _081AD4A8 + beq @081AD4A8 ldrh r0, [r4] bl itemid_is_unique lsls r0, 24 cmp r0, 0 - bne _081AD4A8 + bne @081AD4A8 adds r0, r5, 0 bl task_close_bag_menu_1 - b _081AD4AE + b @081AD4AE .align 2, 0 .pool -_081AD4A8: +@081AD4A8: adds r0, r5, 0 bl sub_81AD30C -_081AD4AE: +@081AD4AE: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_81AD41C thumb_func_start sub_81AD4B4 -sub_81AD4B4: @ 81AD4B4 +sub_81AD4B4: ; 81AD4B4 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -829329,25 +829329,25 @@ sub_81AD4B4: @ 81AD4B4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081AD4E4 + bne @081AD4E4 ldr r2, =0x085e8dce ldr r3, =sub_81AD350 + 1 adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C - b _081AD51A + b @081AD51A .align 2, 0 .pool -_081AD4E4: +@081AD4E4: ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] cmp r0, 0x4 - beq _081AD514 + beq @081AD514 ldrh r0, [r5] bl itemid_is_unique lsls r0, 24 cmp r0, 0 - bne _081AD514 + bne @081AD514 ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -829355,42 +829355,42 @@ _081AD4E4: adds r1, r0 ldr r0, =task_close_bag_menu_1 + 1 str r0, [r1] - b _081AD51A + b @081AD51A .align 2, 0 .pool -_081AD514: +@081AD514: adds r0, r4, 0 bl sub_81AD30C -_081AD51A: +@081AD51A: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_81AD4B4 thumb_func_start sub_81AD520 -sub_81AD520: @ 81AD520 +sub_81AD520: ; 81AD520 push {r4-r7,lr} bl in_trade_center cmp r0, 0x1 - beq _081AD54C + beq @081AD54C bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _081AD54C + bne @081AD54C bl sub_81A80A8 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0 - bne _081AD54C + bne @081AD54C bl sub_813994C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081AD550 -_081AD54C: + bne @081AD550 +@081AD54C: movs r0, 0 - b _081AD5D2 -_081AD550: + b @081AD5D2 +@081AD550: bl call_203AE8C movs r0, 0 movs r1, 0 @@ -829402,13 +829402,13 @@ _081AD550: adds r1, r0, r5 ldrh r0, [r1] cmp r0, 0 - beq _081AD5CA + beq @081AD5CA movs r1, 0x1 bl sub_80D6724 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x1 - bne _081AD5C4 + bne @081AD5C4 bl script_env_2_enable bl player_bitmagic bl sub_808B864 @@ -829430,19 +829430,19 @@ _081AD550: lsls r1, 3 adds r1, r2 strh r6, [r1, 0xE] - b _081AD5D0 + b @081AD5D0 .align 2, 0 .pool -_081AD5C4: +@081AD5C4: ldr r0, [r4] adds r0, r5 strh r7, [r0] -_081AD5CA: +@081AD5CA: ldr r0, =0x082736b3 bl script_env_1_execute_new_script -_081AD5D0: +@081AD5D0: movs r0, 0x1 -_081AD5D2: +@081AD5D2: pop {r4-r7} pop {r1} bx r1 @@ -829451,8 +829451,8 @@ _081AD5D2: thumb_func_end sub_81AD520 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 @@ -829467,7 +829467,7 @@ display_sell_item_ask_str: @ 81AD5DC bl itemid_get_market_price lsls r0, 16 cmp r0, 0 - bne _081AD634 + bne @081AD634 ldrh r0, [r6] ldr r1, =0x02021dc4 bl itemid_get_name @@ -829480,21 +829480,21 @@ display_sell_item_ask_str: @ 81AD5DC movs r1, 0x1 adds r2, r4, 0 bl sub_81ABB4C - b _081AD66A + b @081AD66A .align 2, 0 .pool -_081AD634: +@081AD634: movs r0, 0x1 strh r0, [r4, 0x10] movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0x1 - bne _081AD64C + bne @081AD64C bl sub_81AE268 adds r0, r5, 0 bl sub_81AD680 - b _081AD66A -_081AD64C: + b @081AD66A +@081AD64C: ldrh r0, [r6] ldr r1, =0x02021dc4 bl itemid_get_name @@ -829507,7 +829507,7 @@ _081AD64C: movs r1, 0x1 adds r2, r4, 0 bl sub_81ABB4C -_081AD66A: +@081AD66A: pop {r4-r7} pop {r0} bx r0 @@ -829516,7 +829516,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 @@ -829556,7 +829556,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 @@ -829570,7 +829570,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 @@ -829596,7 +829596,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} @@ -829641,7 +829641,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 @@ -829658,7 +829658,7 @@ sub_81AD794: @ 81AD794 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081AD7F4 + bne @081AD7F4 ldr r0, =0x0203ce54 ldr r0, [r0] ldr r1, =0x00000818 @@ -829678,30 +829678,30 @@ sub_81AD794: @ 81AD794 adds r0, r4, 0 adds r1, r5, 0 bl sub_81ABCC0 - b _081AD844 + b @081AD844 .align 2, 0 .pool -_081AD7F4: +@081AD7F4: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081AD818 + beq @081AD818 movs r0, 0x5 bl audio_play movs r0, 0x8 bl sub_81AE184 adds r0, r4, 0 bl sub_81AD680 - b _081AD844 + b @081AD844 .align 2, 0 .pool -_081AD818: +@081AD818: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081AD844 + beq @081AD844 movs r0, 0x5 bl audio_play ldrb r0, [r6] @@ -829714,14 +829714,14 @@ _081AD818: bl sub_81AE1F8 adds r0, r5, 0 bl set_callback3_to_bag -_081AD844: +@081AD844: pop {r4-r6} pop {r0} bx r0 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} @@ -829769,7 +829769,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 @@ -829871,7 +829871,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 @@ -829880,13 +829880,13 @@ sub_81AD9C0: @ 81AD9C0 movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _081AD9E2 + beq @081AD9E2 movs r0, 0x5 bl audio_play bl sub_81AE2A4 adds r0, r4, 0 bl sub_81ABBBC -_081AD9E2: +@081AD9E2: pop {r4} pop {r0} bx r0 @@ -829895,7 +829895,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 @@ -829910,13 +829910,13 @@ display_deposit_item_ask_str: @ 81AD9EC movs r3, 0x4 ldrsh r0, [r1, r3] cmp r0, 0x1 - bne _081ADA18 + bne @081ADA18 adds r0, r2, 0 bl sub_81ADB14 - b _081ADA5E + b @081ADA5E .align 2, 0 .pool -_081ADA18: +@081ADA18: ldr r0, =0x0203ce7c ldrh r0, [r0] ldr r1, =0x02021cc4 @@ -829947,7 +829947,7 @@ _081ADA18: adds r0, r5, r0 ldr r1, =sub_81ADA7C + 1 str r1, [r0] -_081ADA5E: +@081ADA5E: add sp, 0x14 pop {r4-r6} pop {r0} @@ -829957,7 +829957,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 @@ -829974,7 +829974,7 @@ sub_81ADA7C: @ 81ADA7C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081ADAC0 + bne @081ADAC0 ldr r0, =0x0203ce54 ldr r0, [r0] ldr r1, =0x00000817 @@ -829983,30 +829983,30 @@ sub_81ADA7C: @ 81ADA7C movs r2, 0x10 ldrsh r1, [r5, r2] bl sub_81ABC54 - b _081ADB0E + b @081ADB0E .align 2, 0 .pool -_081ADAC0: +@081ADAC0: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081ADAE4 + beq @081ADAE4 movs r0, 0x5 bl audio_play movs r0, 0x7 bl sub_81AE184 adds r0, r4, 0 bl sub_81ADB14 - b _081ADB0E + b @081ADB0E .align 2, 0 .pool -_081ADAE4: +@081ADAE4: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081ADB0E + beq @081ADB0E movs r0, 0x5 bl audio_play movs r1, 0x2 @@ -830019,14 +830019,14 @@ _081ADAE4: bl sub_81AE184 adds r0, r6, 0 bl set_callback3_to_bag -_081ADB0E: +@081ADB0E: pop {r4-r6} pop {r0} bx r0 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 @@ -830051,7 +830051,7 @@ sub_81ADB14: @ 81ADB14 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - beq _081ADB6C + beq @081ADB6C ldr r2, =0x085e8e8e movs r0, 0x1 str r0, [sp] @@ -830061,10 +830061,10 @@ sub_81ADB14: @ 81ADB14 str r0, [sp, 0xC] str r0, [sp, 0x10] movs r0, 0x1 - b _081ADBE2 + b @081ADBE2 .align 2, 0 .pool -_081ADB6C: +@081ADB6C: ldrh r0, [r4] mov r3, r8 ldrh r1, [r3, 0x10] @@ -830072,7 +830072,7 @@ _081ADB6C: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x1 - bne _081ADBD4 + bne @081ADBD4 ldrh r0, [r4] ldr r1, =0x02021cc4 bl itemid_get_name @@ -830101,10 +830101,10 @@ _081ADB6C: subs r0, 0x8 adds r0, r7, r0 ldr r1, =sub_81AD150 + 1 - b _081ADBF2 + b @081ADBF2 .align 2, 0 .pool -_081ADBD4: +@081ADBD4: ldr r2, =0x085e8e6e movs r0, 0x1 str r0, [sp] @@ -830112,7 +830112,7 @@ _081ADBD4: str r5, [sp, 0x8] str r5, [sp, 0xC] str r5, [sp, 0x10] -_081ADBE2: +@081ADBE2: movs r1, 0x1 movs r3, 0x3 bl sub_81AE0BC @@ -830120,7 +830120,7 @@ _081ADBE2: subs r0, 0x8 adds r0, r7, r0 ldr r1, =sub_81ADC0C + 1 -_081ADBF2: +@081ADBF2: str r1, [r0] add sp, 0x14 pop {r3,r4} @@ -830134,7 +830134,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 @@ -830148,7 +830148,7 @@ sub_81ADC0C: @ 81ADC0C movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _081ADC44 + beq @081ADC44 movs r0, 0x5 bl audio_play movs r1, 0x2 @@ -830159,7 +830159,7 @@ sub_81ADC0C: @ 81ADC0C bl sub_81AB73C adds r0, r4, 0 bl set_callback3_to_bag -_081ADC44: +@081ADC44: pop {r4,r5} pop {r0} bx r0 @@ -830168,25 +830168,25 @@ _081ADC44: thumb_func_end sub_81ADC0C thumb_func_start sub_81ADC54 -sub_81ADC54: @ 81ADC54 +sub_81ADC54: ; 81ADC54 push {lr} ldr r0, =0x0203ce58 ldrb r0, [r0, 0x4] cmp r0, 0xA - beq _081ADC68 + beq @081ADC68 movs r0, 0 - b _081ADC6A + b @081ADC6A .align 2, 0 .pool -_081ADC68: +@081ADC68: movs r0, 0x1 -_081ADC6A: +@081ADC6A: pop {r1} bx r1 thumb_func_end sub_81ADC54 thumb_func_start sub_81ADC70 -sub_81ADC70: @ 81ADC70 +sub_81ADC70: ; 81ADC70 push {r4-r6,lr} ldr r4, =0x0203ce80 movs r0, 0xD0 @@ -830215,7 +830215,7 @@ sub_81ADC70: @ 81ADC70 movs r6, 0 adds r5, r2, 0 adds r5, 0x8 -_081ADCAE: +@081ADCAE: ldr r2, [r4] lsls r3, r6, 1 adds r0, r2, 0 @@ -830230,7 +830230,7 @@ _081ADCAE: adds r5, 0x2 adds r6, 0x1 cmp r6, 0x4 - bls _081ADCAE + bls @081ADCAE ldr r4, =0x03005d8c ldr r0, [r4] movs r1, 0xAC @@ -830253,7 +830253,7 @@ _081ADCAE: thumb_func_end sub_81ADC70 thumb_func_start sub_81ADD00 -sub_81ADD00: @ 81ADD00 +sub_81ADD00: ; 81ADD00 push {r4-r6,lr} ldr r5, =0x03005d8c ldr r0, [r5] @@ -830281,7 +830281,7 @@ sub_81ADD00: @ 81ADD00 adds r6, r4, 0 adds r3, r1, 0 adds r3, 0x8 -_081ADD3A: +@081ADD3A: lsls r2, r5, 1 ldr r1, [r4] adds r0, r1, 0 @@ -830296,7 +830296,7 @@ _081ADD3A: adds r3, 0x2 adds r5, 0x1 cmp r5, 0x4 - bls _081ADD3A + bls @081ADD3A ldr r0, [r6] bl free pop {r4-r6} @@ -830307,7 +830307,7 @@ _081ADD3A: thumb_func_end sub_81ADD00 thumb_func_start sub_81ADD70 -sub_81ADD70: @ 81ADD70 +sub_81ADD70: ; 81ADD70 push {lr} bl sub_81ADC70 movs r0, 0xD @@ -830327,7 +830327,7 @@ sub_81ADD70: @ 81ADD70 thumb_func_end sub_81ADD70 thumb_func_start sub_81ADD98 -sub_81ADD98: @ 81ADD98 +sub_81ADD98: ; 81ADD98 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -830341,33 +830341,33 @@ sub_81ADD98: @ 81ADD98 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081ADE32 + bne @081ADE32 movs r0, 0x10 ldrsh r1, [r4, r0] cmp r1, 0xCC - beq _081ADDEC + beq @081ADDEC cmp r1, 0xCC - bgt _081ADDD0 + bgt @081ADDD0 cmp r1, 0x66 - beq _081ADDDA - b _081ADE2C + beq @081ADDDA + b @081ADE2C .align 2, 0 .pool -_081ADDD0: +@081ADDD0: movs r0, 0x99 lsls r0, 1 cmp r1, r0 - beq _081ADE0C - b _081ADE2C -_081ADDDA: + beq @081ADE0C + b @081ADE2C +@081ADDDA: movs r0, 0x5 bl audio_play adds r0, r5, 0 movs r1, 0x1 movs r2, 0 bl sub_81ABFA8 - b _081ADE2C -_081ADDEC: + b @081ADE2C +@081ADDEC: movs r0, 0x5 bl audio_play ldrb r0, [r4] @@ -830378,10 +830378,10 @@ _081ADDEC: strh r0, [r1] adds r0, r5, 0 bl sub_81AC644 - b _081ADE2C + b @081ADE2C .align 2, 0 .pool -_081ADE0C: +@081ADE0C: movs r0, 0x5 bl audio_play bl sub_81ACE38 @@ -830392,19 +830392,19 @@ _081ADE0C: bl sub_81ADD00 adds r0, r5, 0 bl task_close_bag_menu_1 - b _081ADE32 -_081ADE2C: + b @081ADE32 +@081ADE2C: ldrh r0, [r4, 0x10] adds r0, 0x1 strh r0, [r4, 0x10] -_081ADE32: +@081ADE32: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_81ADD98 thumb_func_start sub_81ADE38 -sub_81ADE38: @ 81ADE38 +sub_81ADE38: ; 81ADE38 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -830427,7 +830427,7 @@ sub_81ADE38: @ 81ADE38 thumb_func_end sub_81ADE38 thumb_func_start sub_81ADE6C -sub_81ADE6C: @ 81ADE6C +sub_81ADE6C: ; 81ADE6C push {lr} ldr r0, =0x03005dac ldr r1, =sub_819FA50 + 1 @@ -830441,7 +830441,7 @@ sub_81ADE6C: @ 81ADE6C thumb_func_end sub_81ADE6C thumb_func_start sub_81ADE8C -sub_81ADE8C: @ 81ADE8C +sub_81ADE8C: ; 81ADE8C push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -830464,7 +830464,7 @@ sub_81ADE8C: @ 81ADE8C thumb_func_end sub_81ADE8C thumb_func_start sub_81ADEBC -sub_81ADEBC: @ 81ADEBC +sub_81ADEBC: ; 81ADEBC push {lr} ldr r0, =0x03005dac ldr r1, =sub_818DEF4 + 1 @@ -830478,7 +830478,7 @@ sub_81ADEBC: @ 81ADEBC thumb_func_end sub_81ADEBC thumb_func_start sub_81ADEDC -sub_81ADEDC: @ 81ADEDC +sub_81ADEDC: ; 81ADEDC push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -830497,7 +830497,7 @@ sub_81ADEDC: @ 81ADEDC thumb_func_end sub_81ADEDC thumb_func_start sub_81ADF00 -sub_81ADF00: @ 81ADF00 +sub_81ADF00: ; 81ADF00 push {lr} ldr r0, =0x03005dac ldr r1, =sub_818E564 + 1 @@ -830511,7 +830511,7 @@ sub_81ADF00: @ 81ADF00 thumb_func_end sub_81ADF00 thumb_func_start sub_81ADF20 -sub_81ADF20: @ 81ADF20 +sub_81ADF20: ; 81ADF20 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -830564,7 +830564,7 @@ sub_81ADF20: @ 81ADF20 bl sub_81AE0BC mov r2, r8 cmp r2, 0 - beq _081ADFBA + beq @081ADFBA movs r0, 0x1 mov r1, r8 movs r2, 0x40 @@ -830583,7 +830583,7 @@ sub_81ADF20: @ 81ADF20 movs r1, 0x1 mov r2, r8 bl sub_81AE0BC -_081ADFBA: +@081ADFBA: adds r0, r6, 0 movs r1, 0x7 bl Window_GetField @@ -830607,13 +830607,13 @@ _081ADFBA: thumb_func_end sub_81ADF20 thumb_func_start sub_81ADFF8 -sub_81ADFF8: @ 81ADFF8 +sub_81ADFF8: ; 81ADFF8 push {r4-r7,lr} adds r7, r0, 0 cmp r7, 0x8 - bls _081AE002 + bls @081AE002 movs r7, 0x8 -_081AE002: +@081AE002: ldr r0, =0x0203ce54 ldr r4, [r0] ldr r0, =0x00000844 @@ -830650,7 +830650,7 @@ _081AE002: thumb_func_end sub_81ADFF8 thumb_func_start setup_bag_menu_textboxes -setup_bag_menu_textboxes: @ 81AE054 +setup_bag_menu_textboxes: ; 81AE054 push {r4,lr} ldr r0, =0x08614174 bl Window_InitFromTemplates @@ -830671,7 +830671,7 @@ setup_bag_menu_textboxes: @ 81AE054 movs r2, 0x20 bl gpu_pal_apply movs r4, 0 -_081AE088: +@081AE088: adds r0, r4, 0 movs r1, 0 bl Window_FastFillPixels @@ -830681,7 +830681,7 @@ _081AE088: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _081AE088 + bls @081AE088 movs r0, 0 bl schedule_bg_copy_tilemap_to_vram movs r0, 0x1 @@ -830694,7 +830694,7 @@ _081AE088: thumb_func_end setup_bag_menu_textboxes thumb_func_start sub_81AE0BC -sub_81AE0BC: @ 81AE0BC +sub_81AE0BC: ; 81AE0BC push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -830749,7 +830749,7 @@ sub_81AE0BC: @ 81AE0BC thumb_func_end sub_81AE0BC thumb_func_start sub_81AE124 -sub_81AE124: @ 81AE124 +sub_81AE124: ; 81AE124 lsls r0, 24 lsrs r0, 24 ldr r1, =0x0203ce54 @@ -830765,7 +830765,7 @@ sub_81AE124: @ 81AE124 thumb_func_end sub_81AE124 thumb_func_start sub_81AE13C -sub_81AE13C: @ 81AE13C +sub_81AE13C: ; 81AE13C push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 @@ -830777,7 +830777,7 @@ sub_81AE13C: @ 81AE13C adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0xFF - bne _081AE172 + bne @081AE172 lsls r0, r2, 3 ldr r1, =0x086141ac adds r0, r1 @@ -830790,7 +830790,7 @@ sub_81AE13C: @ 81AE13C bl SetWindowBorderStyle movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram -_081AE172: +@081AE172: ldrb r0, [r4] pop {r4} pop {r1} @@ -830800,7 +830800,7 @@ _081AE172: thumb_func_end sub_81AE13C thumb_func_start sub_81AE184 -sub_81AE184: @ 81AE184 +sub_81AE184: ; 81AE184 push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -830812,7 +830812,7 @@ sub_81AE184: @ 81AE184 adds r4, r1, r0 ldrb r0, [r4] cmp r0, 0xFF - beq _081AE1B8 + beq @081AE1B8 movs r1, 0 bl sub_8198070 ldrb r0, [r4] @@ -830823,7 +830823,7 @@ sub_81AE184: @ 81AE184 bl schedule_bg_copy_tilemap_to_vram movs r0, 0xFF strb r0, [r4] -_081AE1B8: +@081AE1B8: pop {r4} pop {r0} bx r0 @@ -830832,7 +830832,7 @@ _081AE1B8: thumb_func_end sub_81AE184 thumb_func_start sub_81AE1C4 -sub_81AE1C4: @ 81AE1C4 +sub_81AE1C4: ; 81AE1C4 push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 @@ -830844,13 +830844,13 @@ sub_81AE1C4: @ 81AE1C4 adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0xFF - bne _081AE1E8 + bne @081AE1E8 lsls r0, r2, 3 ldr r1, =0x086141ac adds r0, r1 bl Window_AddFromTemplate strb r0, [r4] -_081AE1E8: +@081AE1E8: ldrb r0, [r4] pop {r4} pop {r1} @@ -830860,7 +830860,7 @@ _081AE1E8: thumb_func_end sub_81AE1C4 thumb_func_start sub_81AE1F8 -sub_81AE1F8: @ 81AE1F8 +sub_81AE1F8: ; 81AE1F8 push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -830872,7 +830872,7 @@ sub_81AE1F8: @ 81AE1F8 adds r4, r1, r0 ldrb r0, [r4] cmp r0, 0xFF - beq _081AE22C + beq @081AE22C movs r1, 0 bl sub_8197DF8 ldrb r0, [r4] @@ -830883,7 +830883,7 @@ sub_81AE1F8: @ 81AE1F8 bl schedule_bg_copy_tilemap_to_vram movs r0, 0xFF strb r0, [r4] -_081AE22C: +@081AE22C: pop {r4} pop {r0} bx r0 @@ -830892,7 +830892,7 @@ _081AE22C: thumb_func_end sub_81AE1F8 thumb_func_start sub_81AE238 -sub_81AE238: @ 81AE238 +sub_81AE238: ; 81AE238 push {lr} sub sp, 0x10 lsls r0, 24 @@ -830919,7 +830919,7 @@ sub_81AE238: @ 81AE238 thumb_func_end sub_81AE238 thumb_func_start sub_81AE268 -sub_81AE268: @ 81AE268 +sub_81AE268: ; 81AE268 push {r4,lr} movs r0, 0x9 bl sub_81AE13C @@ -830948,7 +830948,7 @@ sub_81AE268: @ 81AE268 thumb_func_end sub_81AE268 thumb_func_start sub_81AE2A4 -sub_81AE2A4: @ 81AE2A4 +sub_81AE2A4: ; 81AE2A4 push {lr} movs r0, 0x9 bl sub_81AE184 @@ -830958,7 +830958,7 @@ sub_81AE2A4: @ 81AE2A4 thumb_func_end sub_81AE2A4 thumb_func_start sub_81AE2B4 -sub_81AE2B4: @ 81AE2B4 +sub_81AE2B4: ; 81AE2B4 push {lr} movs r0, 0x3 movs r1, 0 @@ -830991,7 +830991,7 @@ sub_81AE2B4: @ 81AE2B4 thumb_func_end sub_81AE2B4 thumb_func_start sub_81AE2FC -sub_81AE2FC: @ 81AE2FC +sub_81AE2FC: ; 81AE2FC push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -831003,10 +831003,10 @@ sub_81AE2FC: @ 81AE2FC movs r1, 0 bl Window_FastFillPixels cmp r4, 0 - bne _081AE354 + bne @081AE354 movs r4, 0 movs r5, 0 -_081AE31A: +@081AE31A: lsls r0, r4, 1 adds r0, r4 lsls r0, 26 @@ -831026,14 +831026,14 @@ _081AE31A: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _081AE31A + bls @081AE31A movs r0, 0x4 movs r1, 0x2 bl Window_CopyToVram - b _081AE440 + b @081AE440 .align 2, 0 .pool -_081AE354: +@081AE354: adds r0, r4, 0 bl sub_81B6CFC lsls r0, 16 @@ -831053,12 +831053,12 @@ _081AE354: bl sub_819A2F8 ldrb r0, [r5, 0x1] cmp r0, 0x1 - bhi _081AE38C + bhi @081AE38C ldr r2, =0x085e8d45 - b _081AE39C + b @081AE39C .align 2, 0 .pool -_081AE38C: +@081AE38C: ldr r4, =0x02021cc4 ldrb r1, [r5, 0x1] adds r0, r4, 0 @@ -831066,7 +831066,7 @@ _081AE38C: movs r3, 0x3 bl decimal_int_to_string adds r2, r4, 0 -_081AE39C: +@081AE39C: movs r0, 0xC str r0, [sp] movs r0, 0 @@ -831087,12 +831087,12 @@ _081AE39C: ldrb r0, [r2, 0x3] adds r6, r1, 0 cmp r0, 0 - bne _081AE3D8 + bne @081AE3D8 ldr r2, =0x085e8d45 - b _081AE3E8 + b @081AE3E8 .align 2, 0 .pool -_081AE3D8: +@081AE3D8: ldr r4, =0x02021cc4 ldrb r1, [r2, 0x3] adds r0, r4, 0 @@ -831100,7 +831100,7 @@ _081AE3D8: movs r3, 0x3 bl decimal_int_to_string adds r2, r4, 0 -_081AE3E8: +@081AE3E8: movs r0, 0x18 str r0, [sp] movs r4, 0 @@ -831141,7 +831141,7 @@ _081AE3E8: movs r0, 0x4 movs r1, 0x2 bl Window_CopyToVram -_081AE440: +@081AE440: add sp, 0x14 pop {r3,r4} mov r8, r3 @@ -831154,12 +831154,12 @@ _081AE440: thumb_func_end sub_81AE2FC thumb_func_start nullsub_125 -nullsub_125: @ 81AE458 +nullsub_125: ; 81AE458 bx lr thumb_func_end nullsub_125 thumb_func_start sub_81AE45C -sub_81AE45C: @ 81AE45C +sub_81AE45C: ; 81AE45C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -831182,26 +831182,26 @@ sub_81AE45C: @ 81AE45C ldr r5, =0x0203ce84 ldrb r4, [r5, 0x4] cmp r4, 0x1 - beq _081AE4F4 + beq @081AE4F4 cmp r4, 0x1 - ble _081AE492 + ble @081AE492 cmp r4, 0x2 - beq _081AE558 -_081AE492: + beq @081AE558 +@081AE492: mov r0, r12 bl Window_AddFromTemplate strb r0, [r5, 0x5] cmp r6, 0x1 - beq _081AE4B0 + beq @081AE4B0 cmp r6, 0x2 - bne _081AE4C0 + bne @081AE4C0 ldrb r0, [r5, 0x5] mov r1, r9 lsls r2, r1, 24 lsrs r2, 24 adds r1, r7, 0 bl sub_809882C -_081AE4B0: +@081AE4B0: ldrb r0, [r5, 0x5] mov r3, r8 lsrs r2, r3, 20 @@ -831209,7 +831209,7 @@ _081AE4B0: lsrs r2, 24 ldr r1, [sp, 0x4] bl sub_8098858 -_081AE4C0: +@081AE4C0: ldr r0, =0x03006310 adds r2, r0, 0 ldr r1, [sp] @@ -831229,10 +831229,10 @@ _081AE4C0: bl Window_CopyToVram movs r0, 0x1 strb r0, [r4, 0x4] - b _081AE570 + b @081AE570 .align 2, 0 .pool -_081AE4F4: +@081AE4F4: ldrb r0, [r5, 0x6] bl sub_81AE604 str r0, [r5] @@ -831240,49 +831240,49 @@ _081AE4F4: ldrh r0, [r1, 0x2E] ands r4, r0 cmp r4, 0 - beq _081AE50A + beq @081AE50A movs r0, 0x2 strb r0, [r5, 0x4] -_081AE50A: +@081AE50A: ldrh r1, [r1, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081AE51E + beq @081AE51E movs r0, 0x2 negs r0, r0 str r0, [r5] movs r0, 0x2 strb r0, [r5, 0x4] -_081AE51E: +@081AE51E: ldrb r0, [r5, 0x4] cmp r0, 0x2 - bne _081AE570 + bne @081AE570 cmp r6, 0 - bne _081AE534 + bne @081AE534 ldrb r0, [r5, 0x5] bl Window_FillTileMap - b _081AE546 + b @081AE546 .align 2, 0 .pool -_081AE534: +@081AE534: mov r4, r10 cmp r4, 0 - blt _081AE546 + blt @081AE546 cmp r4, 0x2 - bgt _081AE546 + bgt @081AE546 ldrb r0, [r5, 0x5] movs r1, 0 bl sub_819746C -_081AE546: +@081AE546: ldr r0, =0x0203ce84 ldrb r0, [r0, 0x5] movs r1, 0x1 bl Window_CopyToVram - b _081AE570 + b @081AE570 .align 2, 0 .pool -_081AE558: +@081AE558: ldrb r0, [r5, 0x6] movs r1, 0 movs r2, 0 @@ -831292,11 +831292,11 @@ _081AE558: movs r0, 0 strb r0, [r5, 0x4] ldr r0, [r5] - b _081AE574 -_081AE570: + b @081AE574 +@081AE570: movs r0, 0x1 negs r0, r0 -_081AE574: +@081AE574: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -831308,7 +831308,7 @@ _081AE574: thumb_func_end sub_81AE45C thumb_func_start calls_per_item_funcs_in_list_outer -calls_per_item_funcs_in_list_outer: @ 81AE584 +calls_per_item_funcs_in_list_outer: ; 81AE584 push {r4,r5,lr} adds r5, r0, 0 lsls r1, 16 @@ -831331,7 +831331,7 @@ calls_per_item_funcs_in_list_outer: @ 81AE584 thumb_func_end calls_per_item_funcs_in_list_outer thumb_func_start sub_81AE5B0 -sub_81AE5B0: @ 81AE5B0 +sub_81AE5B0: ; 81AE5B0 push {r4-r7,lr} sub sp, 0x8 adds r6, r0, 0 @@ -831347,9 +831347,9 @@ sub_81AE5B0: @ 81AE5B0 lsrs r7, r0, 24 ldrb r0, [r4, 0x4] cmp r0, 0xFF - beq _081AE5F0 + beq @081AE5F0 adds r5, r4, 0 -_081AE5D4: +@081AE5D4: ldrb r0, [r6, 0x10] ldrb r1, [r5] ldrb r2, [r5, 0x1] @@ -831362,8 +831362,8 @@ _081AE5D4: adds r5, 0x8 ldrb r0, [r5, 0x4] cmp r0, 0xFF - bne _081AE5D4 -_081AE5F0: + bne @081AE5D4 +@081AE5F0: ldrb r0, [r6, 0x10] movs r1, 0x2 bl Window_CopyToVram @@ -831375,7 +831375,7 @@ _081AE5F0: thumb_func_end sub_81AE5B0 thumb_func_start sub_81AE604 -sub_81AE604: @ 81AE604 +sub_81AE604: ; 81AE604 push {lr} lsls r0, 24 lsrs r0, 24 @@ -831389,7 +831389,7 @@ sub_81AE604: @ 81AE604 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081AE638 + beq @081AE638 ldrh r0, [r3, 0x18] ldrh r1, [r3, 0x1A] adds r0, r1 @@ -831397,58 +831397,58 @@ sub_81AE604: @ 81AE604 lsls r0, 3 adds r0, r1 ldr r0, [r0, 0x4] - b _081AE6C2 + b @081AE6C2 .align 2, 0 .pool -_081AE638: +@081AE638: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081AE646 + beq @081AE646 movs r0, 0x2 negs r0, r0 - b _081AE6C2 -_081AE646: + b @081AE6C2 +@081AE646: ldrh r1, [r2, 0x30] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _081AE65A + beq @081AE65A adds r0, r3, 0 movs r1, 0x1 movs r2, 0x1 movs r3, 0 - b _081AE6BA -_081AE65A: + b @081AE6BA +@081AE65A: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081AE66A + beq @081AE66A adds r0, r3, 0 movs r1, 0x1 movs r2, 0x1 - b _081AE6B8 -_081AE66A: + b @081AE6B8 +@081AE66A: ldrb r0, [r3, 0x16] lsrs r0, 6 cmp r0, 0x1 - beq _081AE680 + beq @081AE680 cmp r0, 0x1 - ble _081AE67A + ble @081AE67A cmp r0, 0x2 - beq _081AE68C -_081AE67A: + beq @081AE68C +@081AE67A: movs r2, 0 movs r0, 0 - b _081AE6A0 -_081AE680: + b @081AE6A0 +@081AE680: movs r0, 0x20 ands r0, r1 lsls r0, 16 lsrs r2, r0, 16 movs r0, 0x10 - b _081AE69A -_081AE68C: + b @081AE69A +@081AE68C: movs r0, 0x80 lsls r0, 2 ands r0, r1 @@ -831456,38 +831456,38 @@ _081AE68C: lsrs r2, r0, 16 movs r0, 0x80 lsls r0, 1 -_081AE69A: +@081AE69A: ands r0, r1 lsls r0, 16 lsrs r0, 16 -_081AE6A0: +@081AE6A0: cmp r2, 0 - beq _081AE6AE + beq @081AE6AE ldrb r2, [r3, 0xE] adds r0, r3, 0 movs r1, 0x1 movs r3, 0 - b _081AE6BA -_081AE6AE: + b @081AE6BA +@081AE6AE: cmp r0, 0 - beq _081AE6BE + beq @081AE6BE ldrb r2, [r3, 0xE] adds r0, r3, 0 movs r1, 0x1 -_081AE6B8: +@081AE6B8: movs r3, 0x1 -_081AE6BA: +@081AE6BA: bl sub_81AEF28 -_081AE6BE: +@081AE6BE: movs r0, 0x1 negs r0, r0 -_081AE6C2: +@081AE6C2: pop {r1} bx r1 thumb_func_end sub_81AE604 thumb_func_start sub_81AE6C8 -sub_81AE6C8: @ 81AE6C8 +sub_81AE6C8: ; 81AE6C8 push {r4,lr} adds r3, r1, 0 lsls r0, 24 @@ -831499,23 +831499,23 @@ sub_81AE6C8: @ 81AE6C8 ldr r1, =0x03005e08 adds r1, r0, r1 cmp r3, 0 - beq _081AE6E4 + beq @081AE6E4 ldrh r0, [r1, 0x18] strh r0, [r3] -_081AE6E4: +@081AE6E4: cmp r2, 0 - beq _081AE6EC + beq @081AE6EC ldrh r0, [r1, 0x1A] strh r0, [r2] -_081AE6EC: +@081AE6EC: ldrb r0, [r1, 0x1E] cmp r0, 0xFF - beq _081AE6FC + beq @081AE6FC ldrb r1, [r1, 0x17] lsrs r1, 6 subs r1, 0x2 bl sub_81AF6C4 -_081AE6FC: +@081AE6FC: adds r0, r4, 0 bl remove_task pop {r4} @@ -831526,7 +831526,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 @@ -831560,7 +831560,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 @@ -831598,7 +831598,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 @@ -831629,7 +831629,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 @@ -831650,33 +831650,33 @@ sub_81AE7D0: @ 81AE7D0 strb r3, [r0, 0x1C] strb r3, [r0, 0x1D] cmp r4, 0x40 - bne _081AE804 + bne @081AE804 movs r1, 0 movs r2, 0x1 movs r3, 0 bl sub_81AEF28 -_081AE804: +@081AE804: cmp r4, 0x80 - bne _081AE814 + bne @081AE814 mov r0, sp movs r1, 0 movs r2, 0x1 movs r3, 0x1 bl sub_81AEF28 -_081AE814: +@081AE814: cmp r5, 0 - beq _081AE81E + beq @081AE81E mov r0, sp ldrh r0, [r0, 0x18] strh r0, [r5] -_081AE81E: +@081AE81E: ldr r2, [sp, 0x38] cmp r2, 0 - beq _081AE82A + beq @081AE82A mov r0, sp ldrh r0, [r0, 0x1A] strh r0, [r2] -_081AE82A: +@081AE82A: movs r0, 0x1 negs r0, r0 add sp, 0x20 @@ -831686,7 +831686,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 @@ -831697,12 +831697,12 @@ sub_81AE838: @ 81AE838 ldr r0, =0x03005e08 adds r1, r0 cmp r2, 0 - beq _081AE856 + beq @081AE856 ldrh r0, [r1, 0x1A] ldrh r1, [r1, 0x18] adds r0, r1 strh r0, [r2] -_081AE856: +@081AE856: pop {r0} bx r0 .align 2, 0 @@ -831710,7 +831710,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 @@ -831721,15 +831721,15 @@ get_coro_args_x18_x1A: @ 81AE860 ldr r0, =0x03005e08 adds r1, r0 cmp r3, 0 - beq _081AE87A + beq @081AE87A ldrh r0, [r1, 0x18] strh r0, [r3] -_081AE87A: +@081AE87A: cmp r2, 0 - beq _081AE882 + beq @081AE882 ldrh r0, [r1, 0x1A] strh r0, [r2] -_081AE882: +@081AE882: pop {r0} bx r0 .align 2, 0 @@ -831737,7 +831737,7 @@ _081AE882: thumb_func_end get_coro_args_x18_x1A thumb_func_start sub_81AE88C -sub_81AE88C: @ 81AE88C +sub_81AE88C: ; 81AE88C push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -831775,7 +831775,7 @@ sub_81AE88C: @ 81AE88C thumb_func_end sub_81AE88C thumb_func_start calls_per_item_funcs_in_list -calls_per_item_funcs_in_list: @ 81AE8D4 +calls_per_item_funcs_in_list: ; 81AE8D4 push {r4-r7,lr} mov r7, r8 push {r7} @@ -831849,9 +831849,9 @@ calls_per_item_funcs_in_list: @ 81AE8D4 ldrh r0, [r7, 0xC] ldrh r1, [r7, 0xE] cmp r0, r1 - bcs _081AE96C + bcs @081AE96C strh r0, [r7, 0xE] -_081AE96C: +@081AE96C: ldrb r0, [r7, 0x10] ldrb r2, [r7, 0x15] lsls r2, 28 @@ -831880,7 +831880,7 @@ _081AE96C: thumb_func_end calls_per_item_funcs_in_list thumb_func_start sub_81AE9B4 -sub_81AE9B4: @ 81AE9B4 +sub_81AE9B4: ; 81AE9B4 push {r4-r7,lr} sub sp, 0x18 adds r4, r0, 0 @@ -831897,7 +831897,7 @@ sub_81AE9B4: @ 81AE9B4 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq _081AEA20 + beq @081AEA20 add r1, sp, 0x14 ldr r2, [r5] lsls r0, r2, 24 @@ -831930,10 +831930,10 @@ sub_81AE9B4: @ 81AE9B4 movs r0, 0x7F ands r0, r1 strb r0, [r5, 0x3] - b _081AEA5E + b @081AEA5E .align 2, 0 .pool -_081AEA20: +@081AEA20: add r2, sp, 0x14 ldrb r1, [r4, 0x15] lsls r0, r1, 28 @@ -831964,7 +831964,7 @@ _081AEA20: adds r2, r7, 0 mov r3, r12 bl sub_8199EEC -_081AEA5E: +@081AEA5E: add sp, 0x18 pop {r4-r7} pop {r0} @@ -831972,7 +831972,7 @@ _081AEA5E: thumb_func_end sub_81AE9B4 thumb_func_start calls_printshopbuyprice -calls_printshopbuyprice: @ 81AEA68 +calls_printshopbuyprice: ; 81AEA68 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -832004,8 +832004,8 @@ calls_printshopbuyprice: @ 81AEA68 movs r0, 0 mov r8, r0 cmp r8, r10 - bge _081AEB10 -_081AEAAA: + bge @081AEB10 +@081AEAAA: ldr r0, [r4] mov r2, r9 lsls r1, r2, 3 @@ -832015,12 +832015,12 @@ _081AEAAA: negs r0, r0 adds r5, r1, 0 cmp r2, r0 - beq _081AEAC2 + beq @081AEAC2 ldrb r6, [r4, 0x12] - b _081AEAC4 -_081AEAC2: + b @081AEAC4 +@081AEAC2: ldrb r6, [r4, 0x11] -_081AEAC4: +@081AEAC4: ldr r0, [sp] add r0, r8 ldr r2, [sp, 0x4] @@ -832035,13 +832035,13 @@ _081AEAC4: adds r7, r2, 0 ldr r3, [r4, 0x8] cmp r3, 0 - beq _081AEAEE + beq @081AEAEE ldrb r0, [r4, 0x10] ldr r1, [r4] adds r1, r5, r1 ldr r1, [r1, 0x4] bl _call_via_r3 -_081AEAEE: +@081AEAEE: ldr r0, [r4] adds r0, r5, r0 ldr r1, [r0] @@ -832057,8 +832057,8 @@ _081AEAEE: movs r0, 0x1 add r8, r0 cmp r8, r10 - blt _081AEAAA -_081AEB10: + blt @081AEAAA +@081AEB10: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -832070,7 +832070,7 @@ _081AEB10: thumb_func_end calls_printshopbuyprice thumb_func_start sub_81AEB20 -sub_81AEB20: @ 81AEB20 +sub_81AEB20: ; 81AEB20 push {r4-r7,lr} mov r7, r8 push {r7} @@ -832099,36 +832099,36 @@ sub_81AEB20: @ 81AEB20 ldrb r0, [r6, 0x17] lsrs r0, 6 cmp r0, 0x1 - beq _081AEC0C + beq @081AEC0C cmp r0, 0x1 - bgt _081AEB66 + bgt @081AEB66 cmp r0, 0 - beq _081AEB70 - b _081AEC0C -_081AEB66: + beq @081AEB70 + b @081AEC0C +@081AEB66: cmp r0, 0x2 - beq _081AEB84 + beq @081AEB84 cmp r0, 0x3 - beq _081AEBCC - b _081AEC0C -_081AEB70: + beq @081AEBCC + b @081AEC0C +@081AEB70: ldr r1, =0x085e8d60 adds r0, r6, 0 mov r2, r8 adds r3, r7, 0 bl sub_81AE9B4 - b _081AEC0C + b @081AEC0C .align 2, 0 .pool -_081AEB84: +@081AEB84: ldrb r0, [r6, 0x1E] cmp r0, 0xFF - bne _081AEB94 + bne @081AEB94 adds r0, r6, 0 movs r1, 0 bl sub_81AEC18 strb r0, [r6, 0x1E] -_081AEB94: +@081AEB94: ldrb r5, [r6, 0x1E] ldrb r0, [r6, 0x10] movs r1, 0x1 @@ -832151,18 +832151,18 @@ _081AEB94: adds r1, r4, 0 movs r3, 0 bl sub_81AF69C - b _081AEC0C + b @081AEC0C .align 2, 0 .pool -_081AEBCC: +@081AEBCC: ldrb r0, [r6, 0x1E] cmp r0, 0xFF - bne _081AEBDC + bne @081AEBDC adds r0, r6, 0 movs r1, 0x1 bl sub_81AEC18 strb r0, [r6, 0x1E] -_081AEBDC: +@081AEBDC: ldrb r5, [r6, 0x1E] ldrb r0, [r6, 0x10] movs r1, 0x1 @@ -832184,7 +832184,7 @@ _081AEBDC: adds r1, r4, 0 movs r3, 0x1 bl sub_81AF69C -_081AEC0C: +@081AEC0C: pop {r3} mov r8, r3 pop {r4-r7} @@ -832193,7 +832193,7 @@ _081AEC0C: thumb_func_end sub_81AEB20 thumb_func_start sub_81AEC18 -sub_81AEC18: @ 81AEC18 +sub_81AEC18: ; 81AEC18 push {r4,r5,lr} sub sp, 0xC adds r4, r0, 0 @@ -832241,7 +832241,7 @@ sub_81AEC18: @ 81AEC18 thumb_func_end sub_81AEC18 thumb_func_start sub_81AEC78 -sub_81AEC78: @ 81AEC78 +sub_81AEC78: ; 81AEC78 push {r4-r7,lr} mov r7, r8 push {r7} @@ -832253,7 +832253,7 @@ sub_81AEC78: @ 81AEC78 ldrb r1, [r7, 0x17] lsrs r0, r1, 6 cmp r0, 0 - bne _081AECF4 + bne @081AECF4 lsls r0, r1, 26 lsrs r0, 26 movs r1, 0x1 @@ -832300,7 +832300,7 @@ sub_81AEC78: @ 81AEC78 str r0, [sp, 0x4] adds r0, r6, 0 bl Window_FillPixelRect -_081AECF4: +@081AECF4: add sp, 0x8 pop {r3} mov r8, r3 @@ -832310,20 +832310,20 @@ _081AECF4: thumb_func_end sub_81AEC78 thumb_func_start sub_81AED00 -sub_81AED00: @ 81AED00 +sub_81AED00: ; 81AED00 push {r4-r6,lr} adds r4, r0, 0 lsls r1, 24 ldrh r3, [r4, 0x1A] ldrh r5, [r4, 0x18] cmp r1, 0 - bne _081AED74 + bne @081AED74 ldrh r0, [r4, 0xE] cmp r0, 0x1 - bne _081AED18 + bne @081AED18 movs r2, 0 - b _081AED2A -_081AED18: + b @081AED2A +@081AED18: ldrh r0, [r4, 0xE] lsrs r2, r0, 1 movs r1, 0x1 @@ -832333,15 +832333,15 @@ _081AED18: subs r0, 0x1 lsls r0, 16 lsrs r2, r0, 16 -_081AED2A: +@081AED2A: cmp r5, 0 - bne _081AED50 + bne @081AED50 cmp r3, 0 - beq _081AEDB6 + beq @081AEDB6 ldr r1, [r4] movs r2, 0x3 negs r2, r2 -_081AED38: +@081AED38: subs r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 @@ -832350,17 +832350,17 @@ _081AED38: adds r0, r1 ldr r0, [r0, 0x4] cmp r0, r2 - bne _081AEDBA + bne @081AEDBA cmp r3, 0 - bne _081AED38 - b _081AEDB6 -_081AED50: + bne @081AED38 + b @081AEDB6 +@081AED50: cmp r3, r2 - bls _081AED70 + bls @081AED70 ldr r1, [r4] movs r6, 0x3 negs r6, r6 -_081AED5A: +@081AED5A: subs r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 @@ -832369,38 +832369,38 @@ _081AED5A: adds r0, r1 ldr r0, [r0, 0x4] cmp r0, r6 - bne _081AEDBA + bne @081AEDBA cmp r3, r2 - bhi _081AED5A -_081AED70: + bhi @081AED5A +@081AED70: subs r0, r5, 0x1 - b _081AEDE2 -_081AED74: + b @081AEDE2 +@081AED74: ldrh r0, [r4, 0xE] cmp r0, 0x1 - bne _081AED7E + bne @081AED7E movs r2, 0 - b _081AED88 -_081AED7E: + b @081AED88 +@081AED7E: ldrh r0, [r4, 0xE] lsrs r2, r0, 1 movs r1, 0x1 ands r1, r0 adds r2, r1 -_081AED88: +@081AED88: adds r1, r0, 0 ldrh r0, [r4, 0xC] subs r0, r1 cmp r5, r0 - bne _081AEDC0 + bne @081AEDC0 subs r0, r1, 0x1 cmp r3, r0 - bge _081AEDB6 + bge @081AEDB6 ldr r2, [r4] movs r6, 0x3 negs r6, r6 adds r1, r0, 0 -_081AEDA0: +@081AEDA0: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 @@ -832409,23 +832409,23 @@ _081AEDA0: adds r0, r2 ldr r0, [r0, 0x4] cmp r0, r6 - bne _081AEDBA + bne @081AEDBA cmp r3, r1 - blt _081AEDA0 -_081AEDB6: + blt @081AEDA0 +@081AEDB6: movs r0, 0 - b _081AEDE8 -_081AEDBA: + b @081AEDE8 +@081AEDBA: strh r3, [r4, 0x1A] movs r0, 0x1 - b _081AEDE8 -_081AEDC0: + b @081AEDE8 +@081AEDC0: cmp r3, r2 - bcs _081AEDE0 + bcs @081AEDE0 ldr r1, [r4] movs r6, 0x3 negs r6, r6 -_081AEDCA: +@081AEDCA: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 @@ -832434,23 +832434,23 @@ _081AEDCA: adds r0, r1 ldr r0, [r0, 0x4] cmp r0, r6 - bne _081AEDBA + bne @081AEDBA cmp r3, r2 - bcc _081AEDCA -_081AEDE0: + bcc @081AEDCA +@081AEDE0: adds r0, r5, 0x1 -_081AEDE2: +@081AEDE2: strh r2, [r4, 0x1A] strh r0, [r4, 0x18] movs r0, 0x2 -_081AEDE8: +@081AEDE8: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_81AED00 thumb_func_start sub_81AEDF0 -sub_81AEDF0: @ 81AEDF0 +sub_81AEDF0: ; 81AEDF0 push {r4-r7,lr} mov r7, r8 push {r7} @@ -832464,7 +832464,7 @@ sub_81AEDF0: @ 81AEDF0 mov r8, r2 ldrh r0, [r6, 0xE] cmp r5, r0 - bcc _081AEE2A + bcc @081AEE2A ldrb r0, [r6, 0x10] ldrb r2, [r6, 0x15] lsls r2, 28 @@ -832477,8 +832477,8 @@ sub_81AEDF0: @ 81AEDF0 adds r0, r6, 0 movs r2, 0 bl calls_printshopbuyprice - b _081AEF1A -_081AEE2A: + b @081AEF1A +@081AEE2A: ldrb r0, [r6, 0x17] lsls r0, 26 lsrs r0, 26 @@ -832492,7 +832492,7 @@ _081AEE2A: lsrs r4, r0, 24 mov r1, r8 cmp r1, 0 - bne _081AEEBC + bne @081AEEBC ldrb r0, [r6, 0x10] adds r2, r5, 0 muls r2, r4 @@ -832545,8 +832545,8 @@ _081AEE2A: movs r2, 0 adds r3, r4, 0 bl Window_FillPixelRect - b _081AEF1A -_081AEEBC: + b @081AEF1A +@081AEEBC: ldrb r0, [r6, 0x10] adds r2, r7, 0 muls r2, r4 @@ -832590,7 +832590,7 @@ _081AEEBC: movs r2, 0 movs r3, 0 bl Window_FillPixelRect -_081AEF1A: +@081AEF1A: add sp, 0x8 pop {r3} mov r8, r3 @@ -832600,7 +832600,7 @@ _081AEF1A: thumb_func_end sub_81AEDF0 thumb_func_start sub_81AEF28 -sub_81AEF28: @ 81AEF28 +sub_81AEF28: ; 81AEF28 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -832623,11 +832623,11 @@ sub_81AEF28: @ 81AEF28 movs r5, 0 movs r0, 0 cmp r7, r8 - bcs _081AEF90 -_081AEF56: + bcs @081AEF90 +@081AEF56: adds r6, r0, 0x1 - b _081AEF76 -_081AEF5A: + b @081AEF76 +@081AEF5A: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 @@ -832641,8 +832641,8 @@ _081AEF5A: movs r0, 0x3 negs r0, r0 cmp r1, r0 - bne _081AEF88 -_081AEF76: + bne @081AEF88 +@081AEF76: adds r0, r4, 0 mov r1, r9 bl sub_81AED00 @@ -832650,26 +832650,26 @@ _081AEF76: lsrs r0, 24 orrs r5, r0 cmp r0, 0x2 - beq _081AEF5A -_081AEF88: + beq @081AEF5A +@081AEF88: lsls r0, r6, 24 lsrs r0, 24 cmp r0, r8 - bcc _081AEF56 -_081AEF90: + bcc @081AEF56 +@081AEF90: ldr r0, [sp] cmp r0, 0 - beq _081AEFEE + beq @081AEFEE cmp r5, 0x1 - beq _081AEFA6 + beq @081AEFA6 cmp r5, 0x1 - ble _081AEFA2 + ble @081AEFA2 cmp r5, 0x3 - ble _081AEFC6 -_081AEFA2: + ble @081AEFC6 +@081AEFA2: movs r0, 0x1 - b _081AEFF0 -_081AEFA6: + b @081AEFF0 +@081AEFA6: adds r0, r4, 0 mov r1, r10 bl sub_81AEC78 @@ -832681,8 +832681,8 @@ _081AEFA6: ldrb r0, [r4, 0x10] movs r1, 0x2 bl Window_CopyToVram - b _081AEFEE -_081AEFC6: + b @081AEFEE +@081AEFC6: adds r0, r4, 0 mov r1, r10 bl sub_81AEC78 @@ -832698,9 +832698,9 @@ _081AEFC6: ldrb r0, [r4, 0x10] movs r1, 0x2 bl Window_CopyToVram -_081AEFEE: +@081AEFEE: movs r0, 0 -_081AEFF0: +@081AEFF0: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -832712,14 +832712,14 @@ _081AEFF0: thumb_func_end sub_81AEF28 thumb_func_start calls_printshopitemdescription -calls_printshopitemdescription: @ 81AF000 +calls_printshopitemdescription: ; 81AF000 push {r4,lr} adds r2, r0, 0 lsls r1, 24 lsrs r4, r1, 24 ldr r3, [r2, 0x4] cmp r3, 0 - beq _081AF022 + beq @081AF022 ldrh r0, [r2, 0x18] ldrh r1, [r2, 0x1A] adds r0, r1 @@ -832729,14 +832729,14 @@ calls_printshopitemdescription: @ 81AF000 ldr r0, [r0, 0x4] adds r1, r4, 0 bl _call_via_r3 -_081AF022: +@081AF022: pop {r4} pop {r0} bx r0 thumb_func_end calls_printshopitemdescription thumb_func_start sub_81AF028 -sub_81AF028: @ 81AF028 +sub_81AF028: ; 81AF028 push {r4-r7,lr} mov r7, r8 push {r7} @@ -832779,20 +832779,20 @@ 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 - bne _081AF086 + bne @081AF086 movs r0, 0x5 bl audio_play -_081AF086: +@081AF086: pop {r0} bx r0 thumb_func_end sub_81AF078 thumb_func_start sub_81AF08C -sub_81AF08C: @ 81AF08C +sub_81AF08C: ; 81AF08C push {lr} lsls r0, 24 lsrs r0, 24 @@ -832804,104 +832804,104 @@ sub_81AF08C: @ 81AF08C ldr r0, =0x03005e08 adds r2, r1, r0 cmp r3, 0x10 - bhi _081AF154 + bhi @081AF154 lsls r0, r3, 2 - ldr r1, =_081AF0B8 + ldr r1, =@081AF0B8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081AF0B8: - .4byte _081AF0FC - .4byte _081AF0FC - .4byte _081AF100 - .4byte _081AF104 - .4byte _081AF108 - .4byte _081AF10C - .4byte _081AF110 - .4byte _081AF114 - .4byte _081AF118 - .4byte _081AF11C - .4byte _081AF122 - .4byte _081AF12A - .4byte _081AF130 - .4byte _081AF138 - .4byte _081AF140 - .4byte _081AF146 - .4byte _081AF14E -_081AF0FC: +@081AF0B8: + .4byte @081AF0FC + .4byte @081AF0FC + .4byte @081AF100 + .4byte @081AF104 + .4byte @081AF108 + .4byte @081AF10C + .4byte @081AF110 + .4byte @081AF114 + .4byte @081AF118 + .4byte @081AF11C + .4byte @081AF122 + .4byte @081AF12A + .4byte @081AF130 + .4byte @081AF138 + .4byte @081AF140 + .4byte @081AF146 + .4byte @081AF14E +@081AF0FC: ldr r0, [r2, 0x4] - b _081AF158 -_081AF100: + b @081AF158 +@081AF100: ldrh r0, [r2, 0xC] - b _081AF158 -_081AF104: + b @081AF158 +@081AF104: ldrh r0, [r2, 0xE] - b _081AF158 -_081AF108: + b @081AF158 +@081AF108: ldrb r0, [r2, 0x10] - b _081AF158 -_081AF10C: + b @081AF158 +@081AF10C: ldrb r0, [r2, 0x11] - b _081AF158 -_081AF110: + b @081AF158 +@081AF110: ldrb r0, [r2, 0x12] - b _081AF158 -_081AF114: + b @081AF158 +@081AF114: ldrb r0, [r2, 0x13] - b _081AF158 -_081AF118: + b @081AF158 +@081AF118: ldrb r0, [r2, 0x14] - b _081AF124 -_081AF11C: + b @081AF124 +@081AF11C: ldrb r0, [r2, 0x14] lsrs r0, 4 - b _081AF158 -_081AF122: + b @081AF158 +@081AF122: ldrb r0, [r2, 0x15] -_081AF124: +@081AF124: lsls r0, 28 lsrs r0, 28 - b _081AF158 -_081AF12A: + b @081AF158 +@081AF12A: ldrb r0, [r2, 0x15] lsrs r0, 4 - b _081AF158 -_081AF130: + b @081AF158 +@081AF130: ldrb r0, [r2, 0x16] lsls r0, 29 lsrs r0, 29 - b _081AF158 -_081AF138: + b @081AF158 +@081AF138: ldrb r0, [r2, 0x16] lsls r0, 26 lsrs r0, 29 - b _081AF158 -_081AF140: + b @081AF158 +@081AF140: ldrb r0, [r2, 0x16] lsrs r0, 6 - b _081AF158 -_081AF146: + b @081AF158 +@081AF146: ldrb r0, [r2, 0x17] lsls r0, 26 lsrs r0, 26 - b _081AF158 -_081AF14E: + b @081AF158 +@081AF14E: ldrb r0, [r2, 0x17] lsrs r0, 6 - b _081AF158 -_081AF154: + b @081AF158 +@081AF154: movs r0, 0x1 negs r0, r0 -_081AF158: +@081AF158: pop {r1} bx r1 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 @@ -832913,143 +832913,143 @@ sub_81AF15C: @ 81AF15C ldr r0, =0x03005e08 adds r3, r1, r0 cmp r4, 0x10 - bhi _081AF25C + bhi @081AF25C lsls r0, r4, 2 - ldr r1, =_081AF188 + ldr r1, =@081AF188 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081AF188: - .4byte _081AF1CC - .4byte _081AF1CC - .4byte _081AF1D0 - .4byte _081AF1D4 - .4byte _081AF1D8 - .4byte _081AF1DC - .4byte _081AF1E0 - .4byte _081AF1E4 - .4byte _081AF1E8 - .4byte _081AF1F4 - .4byte _081AF202 - .4byte _081AF20E - .4byte _081AF21C - .4byte _081AF228 - .4byte _081AF236 - .4byte _081AF244 - .4byte _081AF250 -_081AF1CC: +@081AF188: + .4byte @081AF1CC + .4byte @081AF1CC + .4byte @081AF1D0 + .4byte @081AF1D4 + .4byte @081AF1D8 + .4byte @081AF1DC + .4byte @081AF1E0 + .4byte @081AF1E4 + .4byte @081AF1E8 + .4byte @081AF1F4 + .4byte @081AF202 + .4byte @081AF20E + .4byte @081AF21C + .4byte @081AF228 + .4byte @081AF236 + .4byte @081AF244 + .4byte @081AF250 +@081AF1CC: str r2, [r3, 0x4] - b _081AF25C -_081AF1D0: + b @081AF25C +@081AF1D0: strh r2, [r3, 0xC] - b _081AF25C -_081AF1D4: + b @081AF25C +@081AF1D4: strh r2, [r3, 0xE] - b _081AF25C -_081AF1D8: + b @081AF25C +@081AF1D8: strb r2, [r3, 0x10] - b _081AF25C -_081AF1DC: + b @081AF25C +@081AF1DC: strb r2, [r3, 0x11] - b _081AF25C -_081AF1E0: + b @081AF25C +@081AF1E0: strb r2, [r3, 0x12] - b _081AF25C -_081AF1E4: + b @081AF25C +@081AF1E4: strb r2, [r3, 0x13] - b _081AF25C -_081AF1E8: + b @081AF25C +@081AF1E8: movs r0, 0xF ands r2, r0 ldrb r1, [r3, 0x14] movs r0, 0x10 negs r0, r0 - b _081AF1FA -_081AF1F4: + b @081AF1FA +@081AF1F4: lsls r2, 4 ldrb r1, [r3, 0x14] movs r0, 0xF -_081AF1FA: +@081AF1FA: ands r0, r1 orrs r0, r2 strb r0, [r3, 0x14] - b _081AF25C -_081AF202: + b @081AF25C +@081AF202: movs r0, 0xF ands r2, r0 ldrb r1, [r3, 0x15] movs r0, 0x10 negs r0, r0 - b _081AF214 -_081AF20E: + b @081AF214 +@081AF20E: lsls r2, 4 ldrb r1, [r3, 0x15] movs r0, 0xF -_081AF214: +@081AF214: ands r0, r1 orrs r0, r2 strb r0, [r3, 0x15] - b _081AF25C -_081AF21C: + b @081AF25C +@081AF21C: movs r0, 0x7 ands r2, r0 ldrb r1, [r3, 0x16] movs r0, 0x8 negs r0, r0 - b _081AF23C -_081AF228: + b @081AF23C +@081AF228: movs r0, 0x7 ands r2, r0 lsls r2, 3 ldrb r1, [r3, 0x16] movs r0, 0x39 negs r0, r0 - b _081AF23C -_081AF236: + b @081AF23C +@081AF236: lsls r2, 6 ldrb r1, [r3, 0x16] movs r0, 0x3F -_081AF23C: +@081AF23C: ands r0, r1 orrs r0, r2 strb r0, [r3, 0x16] - b _081AF25C -_081AF244: + b @081AF25C +@081AF244: movs r0, 0x3F ands r2, r0 ldrb r1, [r3, 0x17] movs r0, 0x40 negs r0, r0 - b _081AF256 -_081AF250: + b @081AF256 +@081AF250: lsls r2, 6 ldrb r1, [r3, 0x17] movs r0, 0x3F -_081AF256: +@081AF256: ands r0, r1 orrs r0, r2 strb r0, [r3, 0x17] -_081AF25C: +@081AF25C: pop {r4} pop {r0} bx r0 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 ldrsh r0, [r4, r1] cmp r0, 0 - beq _081AF276 + beq @081AF276 cmp r0, 0x1 - beq _081AF28A - b _081AF2E4 -_081AF276: + beq @081AF28A + b @081AF2E4 +@081AF276: ldrh r1, [r4, 0x30] lsls r1, 24 lsrs r1, 24 @@ -833058,17 +833058,17 @@ _081AF276: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _081AF2E4 -_081AF28A: + b @081AF2E4 +@081AF28A: movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0 - beq _081AF29A + beq @081AF29A cmp r0, 0x1 - beq _081AF2C0 + beq @081AF2C0 ldrh r2, [r4, 0x38] - b _081AF2DE -_081AF29A: + b @081AF2DE +@081AF29A: movs r0, 0x34 ldrsh r3, [r4, r0] ldr r1, =0x08329f40 @@ -833080,15 +833080,15 @@ _081AF29A: ldrsh r0, [r0, r1] muls r0, r3 cmp r0, 0 - bge _081AF2B4 + bge @081AF2B4 adds r0, 0xFF -_081AF2B4: +@081AF2B4: asrs r0, 8 strh r0, [r4, 0x24] - b _081AF2DE + b @081AF2DE .align 2, 0 .pool -_081AF2C0: +@081AF2C0: movs r0, 0x34 ldrsh r3, [r4, r0] ldr r1, =0x08329f40 @@ -833100,16 +833100,16 @@ _081AF2C0: ldrsh r0, [r0, r1] muls r0, r3 cmp r0, 0 - bge _081AF2DA + bge @081AF2DA adds r0, 0xFF -_081AF2DA: +@081AF2DA: asrs r0, 8 strh r0, [r4, 0x26] -_081AF2DE: +@081AF2DE: ldrh r0, [r4, 0x36] adds r0, r2, r0 strh r0, [r4, 0x38] -_081AF2E4: +@081AF2E4: pop {r4} pop {r0} bx r0 @@ -833118,7 +833118,7 @@ _081AF2E4: thumb_func_end sub_81AF264 thumb_func_start sub_81AF2F0 -sub_81AF2F0: @ 81AF2F0 +sub_81AF2F0: ; 81AF2F0 push {r4-r7,lr} mov r7, r8 push {r7} @@ -833188,7 +833188,7 @@ sub_81AF2F0: @ 81AF2F0 thumb_func_end sub_81AF2F0 thumb_func_start sub_81AF380 -sub_81AF380: @ 81AF380 +sub_81AF380: ; 81AF380 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -833214,7 +833214,7 @@ sub_81AF380: @ 81AF380 bl gpu_tile_obj_decompress_and_load ldrh r2, [r6, 0xC] cmp r2, r4 - bne _081AF3DC + bne @081AF3DC ldr r0, =0x086142a8 ldrb r1, [r6, 0xE] lsls r1, 20 @@ -833224,10 +833224,10 @@ sub_81AF380: @ 81AF380 lsrs r1, 16 movs r2, 0x20 bl gpu_pal_apply - b _081AF3EE + b @081AF3EE .align 2, 0 .pool -_081AF3DC: +@081AF3DC: ldr r0, =0x086142a8 str r0, [sp, 0xC] add r0, sp, 0xC @@ -833236,7 +833236,7 @@ _081AF3DC: orrs r1, r2 str r1, [r0, 0x4] bl gpu_pal_obj_alloc_tag_and_apply -_081AF3EE: +@081AF3EE: ldr r0, =sub_81AF504 + 1 movs r1, 0 bl AddTask @@ -833279,7 +833279,7 @@ _081AF3EE: ldrh r1, [r6, 0xC] ldr r0, =0x0000ffff cmp r1, r0 - bne _081AF47C + bne @081AF47C ldr r5, =0x02020630 ldrb r0, [r7, 0xC] lsls r1, r0, 4 @@ -833305,7 +833305,7 @@ _081AF3EE: ands r2, r3 orrs r2, r1 strb r2, [r0, 0x5] -_081AF47C: +@081AF47C: mov r0, r8 add sp, 0x14 pop {r3,r4} @@ -833319,12 +833319,12 @@ _081AF47C: thumb_func_end sub_81AF380 thumb_func_start sub_81AF4A0 -sub_81AF4A0: @ 81AF4A0 +sub_81AF4A0: ; 81AF4A0 push {r4,lr} adds r4, r1, 0 subs r0, 0x2 cmp r0, 0x1 - bhi _081AF4C4 + bhi @081AF4C4 ldr r0, =0x0203ce8c movs r1, 0x2 strb r1, [r0] @@ -833334,10 +833334,10 @@ sub_81AF4A0: @ 81AF4A0 strb r1, [r0, 0x3] strb r4, [r0, 0x4] strb r3, [r0, 0x5] - b _081AF4D6 + b @081AF4D6 .align 2, 0 .pool -_081AF4C4: +@081AF4C4: ldr r0, =0x0203ce8c movs r1, 0 strb r1, [r0] @@ -833347,7 +833347,7 @@ _081AF4C4: strb r1, [r0, 0x3] strb r3, [r0, 0x4] strb r4, [r0, 0x5] -_081AF4D6: +@081AF4D6: adds r2, r0, 0 movs r1, 0 movs r0, 0 @@ -833372,7 +833372,7 @@ _081AF4D6: thumb_func_end sub_81AF4A0 thumb_func_start sub_81AF504 -sub_81AF504: @ 81AF504 +sub_81AF504: ; 81AF504 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -833385,10 +833385,10 @@ sub_81AF504: @ 81AF504 ldrh r5, [r0] ldrh r0, [r4, 0x8] cmp r5, r0 - bne _081AF548 + bne @081AF548 ldr r0, =0x0000ffff cmp r5, r0 - beq _081AF548 + beq @081AF548 ldr r3, =0x02020630 ldrb r1, [r4, 0xC] lsls r0, r1, 4 @@ -833399,10 +833399,10 @@ sub_81AF504: @ 81AF504 ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 - b _081AF55E + b @081AF55E .align 2, 0 .pool -_081AF548: +@081AF548: ldr r3, =0x02020630 ldrb r1, [r4, 0xC] lsls r0, r1, 4 @@ -833414,11 +833414,11 @@ _081AF548: movs r1, 0x5 negs r1, r1 ands r1, r2 -_081AF55E: +@081AF55E: strb r1, [r0] ldrh r0, [r4, 0xA] cmp r5, r0 - bne _081AF580 + bne @081AF580 ldrb r1, [r4, 0xD] lsls r0, r1, 4 adds r0, r1 @@ -833428,10 +833428,10 @@ _081AF55E: ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 - b _081AF594 + b @081AF594 .align 2, 0 .pool -_081AF580: +@081AF580: ldrb r1, [r4, 0xD] lsls r0, r1, 4 adds r0, r1 @@ -833442,7 +833442,7 @@ _081AF580: movs r1, 0x5 negs r1, r1 ands r1, r2 -_081AF594: +@081AF594: strb r1, [r0] pop {r4,r5} pop {r0} @@ -833450,7 +833450,7 @@ _081AF594: thumb_func_end sub_81AF504 thumb_func_start sub_81AF59C -sub_81AF59C: @ 81AF59C +sub_81AF59C: ; 81AF59C push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -833462,7 +833462,7 @@ sub_81AF59C: @ 81AF59C movs r1, 0x1E ldrsh r0, [r4, r1] cmp r0, 0 - beq _081AF5E8 + beq @081AF5E8 ldr r3, =0x02020630 ldrb r1, [r4, 0xC] lsls r0, r1, 4 @@ -833484,10 +833484,10 @@ sub_81AF59C: @ 81AF59C ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 - b _081AF612 + b @081AF612 .align 2, 0 .pool -_081AF5E8: +@081AF5E8: ldr r3, =0x02020630 ldrb r1, [r4, 0xC] lsls r0, r1, 4 @@ -833509,7 +833509,7 @@ _081AF5E8: movs r1, 0x5 negs r1, r1 ands r1, r2 -_081AF612: +@081AF612: strb r1, [r0] pop {r4} pop {r0} @@ -833519,7 +833519,7 @@ _081AF612: thumb_func_end sub_81AF59C thumb_func_start sub_81AF620 -sub_81AF620: @ 81AF620 +sub_81AF620: ; 81AF620 push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 @@ -833532,14 +833532,14 @@ sub_81AF620: @ 81AF620 ldrh r0, [r5, 0xE] ldr r4, =0x0000ffff cmp r0, r4 - beq _081AF63E + beq @081AF63E bl gpu_tile_obj_free_by_tag -_081AF63E: +@081AF63E: ldrh r0, [r5, 0x10] cmp r0, r4 - beq _081AF648 + beq @081AF648 bl gpu_pal_free_tag -_081AF648: +@081AF648: ldrb r1, [r5, 0xC] lsls r0, r1, 4 adds r0, r1 @@ -833563,18 +833563,18 @@ _081AF648: thumb_func_end sub_81AF620 thumb_func_start sub_81AF680 -sub_81AF680: @ 81AF680 +sub_81AF680: ; 81AF680 push {lr} cmp r1, 0 - beq _081AF68A + beq @081AF68A cmp r1, 0x1 - beq _081AF690 -_081AF68A: + beq @081AF690 +@081AF68A: bl sub_81AF828 - b _081AF694 -_081AF690: + b @081AF694 +@081AF690: bl sub_81AFA60 -_081AF694: +@081AF694: lsls r0, 24 lsrs r0, 24 pop {r1} @@ -833582,7 +833582,7 @@ _081AF694: thumb_func_end sub_81AF680 thumb_func_start sub_81AF69C -sub_81AF69C: @ 81AF69C +sub_81AF69C: ; 81AF69C push {lr} lsls r0, 24 lsrs r0, 24 @@ -833591,47 +833591,47 @@ sub_81AF69C: @ 81AF69C lsls r2, 16 lsrs r2, 16 cmp r3, 0 - beq _081AF6B4 + beq @081AF6B4 cmp r3, 0x1 - beq _081AF6BA - b _081AF6BE -_081AF6B4: + beq @081AF6BA + b @081AF6BE +@081AF6B4: bl sub_81AF994 - b _081AF6BE -_081AF6BA: + b @081AF6BE +@081AF6BA: bl sub_81AFB68 -_081AF6BE: +@081AF6BE: pop {r0} bx r0 thumb_func_end sub_81AF69C thumb_func_start sub_81AF6C4 -sub_81AF6C4: @ 81AF6C4 +sub_81AF6C4: ; 81AF6C4 push {lr} lsls r0, 24 lsrs r0, 24 cmp r1, 0 - beq _081AF6D4 + beq @081AF6D4 cmp r1, 0x1 - beq _081AF6DA - b _081AF6DE -_081AF6D4: + beq @081AF6DA + b @081AF6DE +@081AF6D4: bl sub_81AF9D8 - b _081AF6DE -_081AF6DA: + b @081AF6DE +@081AF6DA: bl sub_81AFBA0 -_081AF6DE: +@081AF6DE: pop {r0} bx r0 thumb_func_end sub_81AF6C4 thumb_func_start nullsub_126 -nullsub_126: @ 81AF6E4 +nullsub_126: ; 81AF6E4 bx lr thumb_func_end nullsub_126 thumb_func_start sub_81AF6E8 -sub_81AF6E8: @ 81AF6E8 +sub_81AF6E8: ; 81AF6E8 push {lr} lsls r0, 16 lsrs r0, 16 @@ -833639,29 +833639,29 @@ sub_81AF6E8: @ 81AF6E8 lsrs r1, 16 movs r3, 0x4 cmp r0, 0x10 - bls _081AF708 + bls @081AF708 movs r2, 0x8 subs r0, 0x8 cmp r2, r0 - bge _081AF708 -_081AF700: + bge @081AF708 +@081AF700: adds r3, 0x2 adds r2, 0x8 cmp r2, r0 - blt _081AF700 -_081AF708: + blt @081AF700 +@081AF708: cmp r1, 0x10 - bls _081AF71C + bls @081AF71C movs r2, 0x8 subs r1, 0x8 cmp r2, r1 - bge _081AF71C -_081AF714: + bge @081AF71C +@081AF714: adds r3, 0x2 adds r2, 0x8 cmp r2, r1 - blt _081AF714 -_081AF71C: + blt @081AF714 +@081AF71C: lsls r0, r3, 24 lsrs r0, 24 pop {r1} @@ -833669,7 +833669,7 @@ _081AF71C: thumb_func_end sub_81AF6E8 thumb_func_start sub_81AF724 -sub_81AF724: @ 81AF724 +sub_81AF724: ; 81AF724 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -833712,12 +833712,12 @@ sub_81AF724: @ 81AF724 mov r12, r0 mov r2, r8 cmp r2, 0x10 - bls _081AF7B8 + bls @081AF7B8 movs r2, 0x8 mov r5, r8 subs r5, 0x8 cmp r2, r5 - bge _081AF7B8 + bge @081AF7B8 ldr r0, =0x08614264 ldr r0, [r0] str r0, [sp] @@ -833727,7 +833727,7 @@ sub_81AF724: @ 81AF724 adds r1, 0x10 movs r7, 0x88 mov r10, r7 -_081AF796: +@081AF796: ldr r0, [sp] str r0, [r1] adds r0, r2, 0 @@ -833744,16 +833744,16 @@ _081AF796: add r12, r0 adds r2, 0x8 cmp r2, r5 - blt _081AF796 -_081AF7B8: + blt @081AF796 +@081AF7B8: mov r2, r9 cmp r2, 0x10 - bls _081AF7F6 + bls @081AF7F6 movs r1, 0x8 mov r4, r9 subs r4, 0x8 cmp r1, r4 - bge _081AF7F6 + bge @081AF7F6 ldr r0, =0x08614268 ldr r6, [r0] ldr r0, =0x0861426c @@ -833764,7 +833764,7 @@ _081AF7B8: movs r7, 0x88 mov r3, r8 adds r3, 0x80 -_081AF7DC: +@081AF7DC: str r6, [r2] strb r7, [r2] adds r0, r1, 0 @@ -833777,8 +833777,8 @@ _081AF7DC: adds r2, 0x4 adds r1, 0x8 cmp r1, r4 - blt _081AF7DC -_081AF7F6: + blt @081AF7DC +@081AF7F6: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -833792,7 +833792,7 @@ _081AF7F6: thumb_func_end sub_81AF724 thumb_func_start sub_81AF828 -sub_81AF828: @ 81AF828 +sub_81AF828: ; 81AF828 push {r4-r7,lr} mov r7, r8 push {r7} @@ -833817,7 +833817,7 @@ sub_81AF828: @ 81AF828 ldrh r2, [r6, 0x8] ldr r7, =0x0000ffff cmp r2, r7 - bne _081AF884 + bne @081AF884 ldr r0, =0x086142a8 ldrb r1, [r6, 0xA] lsls r1, 20 @@ -833827,10 +833827,10 @@ sub_81AF828: @ 81AF828 lsrs r1, 16 movs r2, 0x20 bl gpu_pal_apply - b _081AF896 + b @081AF896 .align 2, 0 .pool -_081AF884: +@081AF884: ldr r0, =0x086142a8 str r0, [sp, 0x20] add r0, sp, 0x20 @@ -833839,7 +833839,7 @@ _081AF884: orrs r1, r2 str r1, [r0, 0x4] bl gpu_pal_obj_alloc_tag_and_apply -_081AF896: +@081AF896: ldr r0, =nullsub_126 + 1 movs r1, 0 bl AddTask @@ -833929,7 +833929,7 @@ _081AF896: ldrh r1, [r6, 0x8] ldr r0, =0x0000ffff cmp r1, r0 - bne _081AF96E + bne @081AF96E ldrb r0, [r5, 0xC] lsls r1, r0, 4 adds r1, r0 @@ -833942,7 +833942,7 @@ _081AF896: ands r0, r3 orrs r0, r2 strb r0, [r1, 0x5] -_081AF96E: +@081AF96E: adds r0, r4, 0 add sp, 0x28 pop {r3} @@ -833955,7 +833955,7 @@ _081AF96E: thumb_func_end sub_81AF828 thumb_func_start sub_81AF994 -sub_81AF994: @ 81AF994 +sub_81AF994: ; 81AF994 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -833991,7 +833991,7 @@ sub_81AF994: @ 81AF994 thumb_func_end sub_81AF994 thumb_func_start sub_81AF9D8 -sub_81AF9D8: @ 81AF9D8 +sub_81AF9D8: ; 81AF9D8 push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 @@ -834006,14 +834006,14 @@ sub_81AF9D8: @ 81AF9D8 ldrh r0, [r4, 0xE] ldr r6, =0x0000ffff cmp r0, r6 - beq _081AF9FC + beq @081AF9FC bl gpu_tile_obj_free_by_tag -_081AF9FC: +@081AF9FC: ldrh r0, [r4, 0x10] cmp r0, r6 - beq _081AFA06 + beq @081AFA06 bl gpu_pal_free_tag -_081AFA06: +@081AFA06: ldrb r1, [r4, 0xC] lsls r0, r1, 4 adds r0, r1 @@ -834031,7 +834031,7 @@ _081AFA06: thumb_func_end sub_81AF9D8 thumb_func_start sub_81AFA30 -sub_81AFA30: @ 81AFA30 +sub_81AFA30: ; 81AFA30 push {lr} adds r2, r0, 0 ldr r1, =0x08329f40 @@ -834042,9 +834042,9 @@ sub_81AFA30: @ 81AFA30 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bge _081AFA48 + bge @081AFA48 adds r0, 0x3F -_081AFA48: +@081AFA48: asrs r0, 6 strh r0, [r2, 0x24] adds r0, r3, 0 @@ -834057,12 +834057,12 @@ _081AFA48: thumb_func_end sub_81AFA30 thumb_func_start nullsub_127 -nullsub_127: @ 81AFA5C +nullsub_127: ; 81AFA5C bx lr thumb_func_end nullsub_127 thumb_func_start sub_81AFA60 -sub_81AFA60: @ 81AFA60 +sub_81AFA60: ; 81AFA60 push {r4-r7,lr} sub sp, 0x28 adds r5, r0, 0 @@ -834083,7 +834083,7 @@ sub_81AFA60: @ 81AFA60 bl gpu_tile_obj_decompress_and_load ldrh r2, [r5, 0x8] cmp r2, r4 - bne _081AFAB4 + bne @081AFAB4 ldr r0, =0x086142a8 ldrb r1, [r5, 0xA] lsls r1, 20 @@ -834093,10 +834093,10 @@ sub_81AFA60: @ 81AFA60 lsrs r1, 16 movs r2, 0x20 bl gpu_pal_apply - b _081AFAC6 + b @081AFAC6 .align 2, 0 .pool -_081AFAB4: +@081AFAB4: ldr r0, =0x086142a8 str r0, [sp, 0x20] add r0, sp, 0x20 @@ -834105,7 +834105,7 @@ _081AFAB4: orrs r1, r2 str r1, [r0, 0x4] bl gpu_pal_obj_alloc_tag_and_apply -_081AFAC6: +@081AFAC6: ldr r0, =nullsub_127 + 1 movs r1, 0 bl AddTask @@ -834155,7 +834155,7 @@ _081AFAC6: ldrh r1, [r5, 0x8] ldr r0, =0x0000ffff cmp r1, r0 - bne _081AFB46 + bne @081AFB46 ldrb r0, [r4] lsls r1, r0, 4 adds r1, r0 @@ -834168,7 +834168,7 @@ _081AFAC6: ands r0, r3 orrs r0, r2 strb r0, [r1, 0x5] -_081AFB46: +@081AFB46: adds r0, r6, 0 add sp, 0x28 pop {r4-r7} @@ -834179,7 +834179,7 @@ _081AFB46: thumb_func_end sub_81AFA60 thumb_func_start sub_81AFB68 -sub_81AFB68: @ 81AFB68 +sub_81AFB68: ; 81AFB68 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -834209,7 +834209,7 @@ sub_81AFB68: @ 81AFB68 thumb_func_end sub_81AFB68 thumb_func_start sub_81AFBA0 -sub_81AFBA0: @ 81AFBA0 +sub_81AFBA0: ; 81AFBA0 push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 @@ -834222,14 +834222,14 @@ sub_81AFBA0: @ 81AFBA0 ldrh r0, [r4, 0x2] ldr r6, =0x0000ffff cmp r0, r6 - beq _081AFBBE + beq @081AFBBE bl gpu_tile_obj_free_by_tag -_081AFBBE: +@081AFBBE: ldrh r0, [r4, 0x4] cmp r0, r6 - beq _081AFBC8 + beq @081AFBC8 bl gpu_pal_free_tag -_081AFBC8: +@081AFBC8: ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -834247,17 +834247,17 @@ _081AFBC8: thumb_func_end sub_81AFBA0 thumb_func_start sub_81AFBF0 -sub_81AFBF0: @ 81AFBF0 +sub_81AFBF0: ; 81AFBF0 push {lr} ldr r1, =0x0203ce9c movs r2, 0 adds r0, r1, 0 adds r0, 0x1C -_081AFBFA: +@081AFBFA: str r2, [r0] subs r0, 0x4 cmp r0, r1 - bge _081AFBFA + bge @081AFBFA pop {r0} bx r0 .align 2, 0 @@ -834265,18 +834265,18 @@ _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 lsrs r0, 24 cmp r0, 0x7 - bhi _081AFC20 + bhi @081AFC20 ldr r1, =0x0203ce9c lsls r0, 2 adds r0, r1 str r2, [r0] -_081AFC20: +@081AFC20: pop {r0} bx r0 .align 2, 0 @@ -834284,43 +834284,43 @@ _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 ldrb r1, [r4] adds r0, r1, 0 cmp r0, 0xFF - beq _081AFC68 + beq @081AFC68 ldr r5, =0x0203ce9c -_081AFC38: +@081AFC38: cmp r1, 0xF7 - beq _081AFC48 + beq @081AFC48 strb r1, [r2] adds r4, 0x1 adds r2, 0x1 - b _081AFC60 + b @081AFC60 .align 2, 0 .pool -_081AFC48: +@081AFC48: adds r4, 0x1 ldrb r0, [r4] lsls r0, 2 adds r0, r5 ldr r1, [r0] cmp r1, 0 - beq _081AFC5E + beq @081AFC5E adds r0, r2, 0 bl gf_strcpy adds r2, r0, 0 -_081AFC5E: +@081AFC5E: adds r4, 0x1 -_081AFC60: +@081AFC60: ldrb r1, [r4] adds r0, r1, 0 cmp r0, 0xFF - bne _081AFC38 -_081AFC68: + bne @081AFC38 +@081AFC68: movs r0, 0xFF strb r0, [r2] adds r0, r2, 0 @@ -834330,7 +834330,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 @@ -834342,7 +834342,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 @@ -834359,32 +834359,32 @@ sav1_are_mapnumbers_in_given_list: @ 81AFC84 ldrh r0, [r2] ldr r1, =0x0000ffff cmp r0, r1 - beq _081AFCC4 + beq @081AFCC4 adds r4, r1, 0 adds r1, r2, 0 -_081AFCAA: +@081AFCAA: ldrh r0, [r1] cmp r0, r3 - bne _081AFCBC + bne @081AFCBC movs r0, 0x1 - b _081AFCC6 + b @081AFCC6 .align 2, 0 .pool -_081AFCBC: +@081AFCBC: adds r1, 0x2 ldrh r0, [r1] cmp r0, r4 - bne _081AFCAA -_081AFCC4: + bne @081AFCAA +@081AFCC4: movs r0, 0 -_081AFCC6: +@081AFCC6: pop {r4} pop {r1} bx r1 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, =0x086143bc bl sav1_are_mapnumbers_in_given_list @@ -834395,7 +834395,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, =0x0861440a bl sav1_are_mapnumbers_in_given_list @@ -834406,7 +834406,7 @@ sub_81AFCDC: @ 81AFCDC thumb_func_end sub_81AFCDC thumb_func_start sub_81AFCEC -sub_81AFCEC: @ 81AFCEC +sub_81AFCEC: ; 81AFCEC push {lr} ldr r0, =0x0861440e bl sav1_are_mapnumbers_in_given_list @@ -834417,26 +834417,26 @@ 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 - bne _081AFD18 + bne @081AFD18 ldr r0, =0x03005d90 ldr r2, [r0] ldrb r1, [r2, 0x9] movs r0, 0xFD ands r0, r1 - b _081AFD22 + b @081AFD22 .align 2, 0 .pool -_081AFD18: +@081AFD18: ldr r0, =0x03005d90 ldr r2, [r0] ldrb r1, [r2, 0x9] movs r0, 0x2 orrs r0, r1 -_081AFD22: +@081AFD22: strb r0, [r2, 0x9] pop {r0} bx r0 @@ -834445,26 +834445,26 @@ _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 - bne _081AFD48 + bne @081AFD48 ldr r0, =0x03005d90 ldr r2, [r0] ldrb r1, [r2, 0x9] movs r0, 0xFB ands r0, r1 - b _081AFD52 + b @081AFD52 .align 2, 0 .pool -_081AFD48: +@081AFD48: ldr r0, =0x03005d90 ldr r2, [r0] ldrb r1, [r2, 0x9] movs r0, 0x4 orrs r0, r1 -_081AFD52: +@081AFD52: strb r0, [r2, 0x9] pop {r0} bx r0 @@ -834473,26 +834473,26 @@ _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 - bne _081AFD78 + bne @081AFD78 ldr r0, =0x03005d90 ldr r2, [r0] ldrb r1, [r2, 0x9] movs r0, 0xF7 ands r0, r1 - b _081AFD82 + b @081AFD82 .align 2, 0 .pool -_081AFD78: +@081AFD78: ldr r0, =0x03005d90 ldr r2, [r0] ldrb r1, [r2, 0x9] movs r0, 0x8 orrs r0, r1 -_081AFD82: +@081AFD82: strb r0, [r2, 0x9] pop {r0} bx r0 @@ -834501,7 +834501,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 @@ -834511,7 +834511,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 @@ -834538,7 +834538,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] @@ -834551,7 +834551,7 @@ sub_81AFDD0: @ 81AFDD0 thumb_func_end sub_81AFDD0 thumb_func_start sub_81AFDE4 -sub_81AFDE4: @ 81AFDE4 +sub_81AFDE4: ; 81AFDE4 push {r4,r5,lr} ldr r5, =0x0203cebc movs r0, 0x90 @@ -834559,31 +834559,31 @@ sub_81AFDE4: @ 81AFDE4 bl malloc str r0, [r5] cmp r0, 0 - beq _081AFE1A + beq @081AFE1A ldr r4, =0x0203cec0 movs r0, 0x80 lsls r0, 2 bl malloc_and_clear str r0, [r4] cmp r0, 0 - beq _081AFE14 + beq @081AFE14 movs r0, 0x1 - b _081AFE1C + b @081AFE1C .align 2, 0 .pool -_081AFE14: +@081AFE14: ldr r0, [r5] bl free -_081AFE1A: +@081AFE1A: movs r0, 0 -_081AFE1C: +@081AFE1C: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_81AFDE4 thumb_func_start sub_81AFE24 -sub_81AFE24: @ 81AFE24 +sub_81AFE24: ; 81AFE24 push {lr} ldr r0, =0x0203cebc ldr r0, [r0] @@ -834598,12 +834598,12 @@ sub_81AFE24: @ 81AFE24 thumb_func_end sub_81AFE24 thumb_func_start sub_81AFE44 -sub_81AFE44: @ 81AFE44 +sub_81AFE44: ; 81AFE44 push {r4-r6,lr} adds r6, r0, 0 adds r5, r1, 0 movs r4, 0 -_081AFE4C: +@081AFE4C: lsls r0, r4, 1 adds r0, r4 lsls r0, 5 @@ -834616,14 +834616,14 @@ _081AFE4C: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _081AFE4C + bls @081AFE4C pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_81AFE44 thumb_func_start AddItemIconObject -AddItemIconObject: @ 81AFE70 +AddItemIconObject: ; 81AFE70 push {r4-r7,lr} sub sp, 0x10 lsls r0, 16 @@ -834635,7 +834635,7 @@ AddItemIconObject: @ 81AFE70 bl sub_81AFDE4 lsls r0, 24 cmp r0, 0 - beq _081AFF28 + beq @081AFF28 adds r0, r5, 0 movs r1, 0 bl GetItemIconPic @@ -834692,12 +834692,12 @@ AddItemIconObject: @ 81AFE70 adds r0, r5, 0 bl free adds r0, r4, 0 - b _081AFF2A + b @081AFF2A .align 2, 0 .pool -_081AFF28: +@081AFF28: movs r0, 0x40 -_081AFF2A: +@081AFF2A: add sp, 0x10 pop {r4-r7} pop {r1} @@ -834705,7 +834705,7 @@ _081AFF2A: thumb_func_end AddItemIconObject thumb_func_start sub_81AFF34 -sub_81AFF34: @ 81AFF34 +sub_81AFF34: ; 81AFF34 push {r4-r7,lr} mov r7, r8 push {r7} @@ -834720,7 +834720,7 @@ sub_81AFF34: @ 81AFF34 bl sub_81AFDE4 lsls r0, 24 cmp r0, 0 - beq _081AFFEC + beq @081AFFEC adds r0, r5, 0 movs r1, 0 bl GetItemIconPic @@ -834777,12 +834777,12 @@ sub_81AFF34: @ 81AFF34 adds r0, r5, 0 bl free adds r0, r4, 0 - b _081AFFEE + b @081AFFEE .align 2, 0 .pool -_081AFFEC: +@081AFFEC: movs r0, 0x40 -_081AFFEE: +@081AFFEE: add sp, 0x10 pop {r3} mov r8, r3 @@ -834792,7 +834792,7 @@ _081AFFEE: thumb_func_end sub_81AFF34 thumb_func_start GetItemIconPic -GetItemIconPic: @ 81AFFFC +GetItemIconPic: ; 81AFFFC push {lr} lsls r0, 16 lsrs r3, r0, 16 @@ -834800,18 +834800,18 @@ GetItemIconPic: @ 81AFFFC lsrs r1, 24 ldr r0, =0x0000ffff cmp r3, r0 - bne _081B0018 + bne @081B0018 ldr r3, =0x00000179 - b _081B0022 + b @081B0022 .align 2, 0 .pool -_081B0018: +@081B0018: movs r0, 0xBC lsls r0, 1 cmp r3, r0 - bls _081B0022 + bls @081B0022 movs r3, 0 -_081B0022: +@081B0022: ldr r2, =0x08614410 lsls r0, r1, 2 lsls r1, r3, 3 @@ -834825,7 +834825,7 @@ _081B0022: thumb_func_end GetItemIconPic thumb_func_start sub_81B0038 -sub_81B0038: @ 81B0038 +sub_81B0038: ; 81B0038 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -834856,13 +834856,13 @@ sub_81B0038: @ 81B0038 mov r1, r10 str r5, [r1] cmp r5, 0 - bne _081B0088 + bne @081B0088 ldr r0, [sp, 0x2C] bl set_callback2 - b _081B0194 + b @081B0194 .align 2, 0 .pool -_081B0088: +@081B0088: ldr r3, =0x0203cec8 movs r1, 0xF mov r4, r8 @@ -834907,23 +834907,23 @@ _081B0088: adds r6, r3, 0 mov r5, r8 cmp r5, 0x4 - bne _081B00F0 + bne @081B00F0 ldrb r0, [r2, 0x8] movs r1, 0x1 orrs r0, r1 - b _081B00F8 + b @081B00F8 .align 2, 0 .pool -_081B00F0: +@081B00F0: ldrb r1, [r2, 0x8] movs r0, 0x2 negs r0, r0 ands r0, r1 -_081B00F8: +@081B00F8: strb r0, [r2, 0x8] mov r0, r9 cmp r0, 0xFF - beq _081B0114 + beq @081B0114 movs r0, 0x3 mov r1, r9 ands r0, r1 @@ -834934,13 +834934,13 @@ _081B00F8: ands r1, r2 orrs r1, r0 strb r1, [r6, 0x8] -_081B0114: +@081B0114: movs r2, 0 ldr r5, =0x0203cec4 movs r4, 0x86 lsls r4, 2 movs r3, 0 -_081B011E: +@081B011E: ldr r0, [r5] lsls r1, r2, 1 adds r0, r4 @@ -834950,11 +834950,11 @@ _081B011E: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0xF - bls _081B011E + bls @081B011E movs r2, 0 ldr r4, =0x0203cec4 movs r3, 0xFF -_081B0138: +@081B0138: ldr r0, [r4] adds r0, 0xC adds r0, r2 @@ -834965,20 +834965,20 @@ _081B0138: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x2 - bls _081B0138 + bls @081B0138 ldr r4, [sp] cmp r4, 0 - bne _081B015C + bne @081B015C strb r4, [r6, 0x9] - b _081B017E + b @081B017E .align 2, 0 .pool -_081B015C: +@081B015C: adds r1, r6, 0 movs r0, 0x9 ldrsb r0, [r1, r0] cmp r0, 0x5 - bgt _081B017A + bgt @081B017A adds r1, r0, 0 movs r0, 0x64 muls r0, r1 @@ -834987,11 +834987,11 @@ _081B015C: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - bne _081B017E -_081B017A: + bne @081B017E +@081B017A: movs r0, 0 strb r0, [r6, 0x9] -_081B017E: +@081B017E: ldr r2, =0x03003014 ldrb r1, [r2] movs r0, 0x5 @@ -835001,7 +835001,7 @@ _081B017E: bl calc_player_party_count ldr r0, =c2_811EBD0 + 1 bl set_callback2 -_081B0194: +@081B0194: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -835015,7 +835015,7 @@ _081B0194: thumb_func_end sub_81B0038 thumb_func_start sub_81B01B0 -sub_81B01B0: @ 81B01B0 +sub_81B01B0: ; 81B01B0 push {lr} bl run_active_tasks bl call_obj_callbacks @@ -835027,7 +835027,7 @@ sub_81B01B0: @ 81B01B0 thumb_func_end sub_81B01B0 thumb_func_start sub_81B01CC -sub_81B01CC: @ 81B01CC +sub_81B01CC: ; 81B01CC push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -835037,31 +835037,31 @@ sub_81B01CC: @ 81B01CC thumb_func_end sub_81B01CC thumb_func_start c2_811EBD0 -c2_811EBD0: @ 81B01E0 +c2_811EBD0: ; 81B01E0 push {lr} -_081B01E2: +@081B01E2: bl sub_81221EC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B0206 + beq @081B0206 bl sub_81B020C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B0206 + beq @081B0206 bl sub_81221AC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081B01E2 -_081B0206: + bne @081B01E2 +@081B0206: pop {r0} bx r0 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 @@ -835071,42 +835071,42 @@ sub_81B020C: @ 81B020C ldrb r0, [r0] adds r2, r1, 0 cmp r0, 0x16 - bls _081B0222 - b _081B0498 -_081B0222: + bls @081B0222 + b @081B0498 +@081B0222: lsls r0, 2 - ldr r1, =_081B0234 + ldr r1, =@081B0234 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081B0234: - .4byte _081B0290 - .4byte _081B02AC - .4byte _081B02B2 - .4byte _081B02D4 - .4byte _081B02DA - .4byte _081B02EC - .4byte _081B02FE - .4byte _081B0310 - .4byte _081B0338 - .4byte _081B0354 - .4byte _081B0368 - .4byte _081B038C - .4byte _081B03A0 - .4byte _081B03A6 - .4byte _081B03B8 - .4byte _081B03BE - .4byte _081B03E0 - .4byte _081B0400 - .4byte _081B0414 - .4byte _081B0428 - .4byte _081B0430 - .4byte _081B044C - .4byte _081B0474 -_081B0290: +@081B0234: + .4byte @081B0290 + .4byte @081B02AC + .4byte @081B02B2 + .4byte @081B02D4 + .4byte @081B02DA + .4byte @081B02EC + .4byte @081B02FE + .4byte @081B0310 + .4byte @081B0338 + .4byte @081B0354 + .4byte @081B0368 + .4byte @081B038C + .4byte @081B03A0 + .4byte @081B03A6 + .4byte @081B03B8 + .4byte @081B03BE + .4byte @081B03E0 + .4byte @081B0400 + .4byte @081B0414 + .4byte @081B0428 + .4byte @081B0430 + .4byte @081B044C + .4byte @081B0474 +@081B0290: bl vblank_hblank_handler_set_zero bl sub_8121DA0 bl clear_scheduled_bg_copies_to_vram @@ -835114,13 +835114,13 @@ _081B0290: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _081B048C + b @081B048C .align 2, 0 .pool -_081B02AC: +@081B02AC: bl remove_some_task - b _081B0484 -_081B02B2: + b @081B0484 +@081B02B2: bl sub_80A1A74 ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] @@ -835131,48 +835131,48 @@ _081B02B2: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _081B048C + b @081B048C .align 2, 0 .pool -_081B02D4: +@081B02D4: bl reset_all_obj_data - b _081B0484 -_081B02DA: + b @081B0484 +@081B02DA: bl gpu_pal_allocator_reset ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _081B048C + b @081B048C .align 2, 0 .pool -_081B02EC: +@081B02EC: bl sub_81221AC lsls r0, 24 cmp r0, 0 - beq _081B02F8 - b _081B0484 -_081B02F8: + beq @081B02F8 + b @081B0484 +@081B02F8: bl clear_tasks - b _081B0484 -_081B02FE: + b @081B0484 +@081B02FE: bl sub_81B209C ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _081B048C + b @081B048C .align 2, 0 .pool -_081B0310: +@081B0310: bl sub_81B0550 lsls r0, 24 cmp r0, 0 - bne _081B0322 + bne @081B0322 bl sub_81B04BC movs r0, 0x1 - b _081B04B2 -_081B0322: + b @081B04B2 +@081B0322: ldr r0, =0x0203cec4 ldr r0, [r0] movs r1, 0x86 @@ -835180,33 +835180,33 @@ _081B0322: adds r0, r1 movs r1, 0 strh r1, [r0] - b _081B0484 + b @081B0484 .align 2, 0 .pool -_081B0338: +@081B0338: bl sub_81B05C8 lsls r0, 24 cmp r0, 0 - bne _081B0344 - b _081B04B0 -_081B0344: + bne @081B0344 + b @081B04B0 +@081B0344: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _081B048C + b @081B048C .align 2, 0 .pool -_081B0354: +@081B0354: ldr r0, =0x0203cec8 ldrb r0, [r0, 0x8] lsls r0, 26 lsrs r0, 30 bl sub_81B239C - b _081B0484 + b @081B0484 .align 2, 0 .pool -_081B0368: +@081B0368: ldr r0, =0x0203cec8 ldrb r0, [r0, 0x8] lsls r0, 26 @@ -835219,40 +835219,40 @@ _081B0368: adds r0, r1 movs r1, 0 strh r1, [r0] - b _081B0484 + b @081B0484 .align 2, 0 .pool -_081B038C: +@081B038C: bl sub_81B5D30 ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _081B048C + b @081B048C .align 2, 0 .pool -_081B03A0: +@081B03A0: bl sub_81B6040 - b _081B0484 -_081B03A6: + b @081B0484 +@081B03A6: bl sub_81B6160 ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _081B048C + b @081B048C .align 2, 0 .pool -_081B03B8: +@081B03B8: bl sub_80D2F04 - b _081B0484 -_081B03BE: + b @081B0484 +@081B03BE: bl sub_81B0EF4 lsls r0, 24 cmp r0, 0 - bne _081B03CA - b _081B04B0 -_081B03CA: + bne @081B03CA + b @081B04B0 +@081B03CA: ldr r0, =0x0203cec4 ldr r0, [r0] movs r1, 0x86 @@ -835260,14 +835260,14 @@ _081B03CA: adds r0, r1 movs r1, 0 strh r1, [r0] - b _081B0484 + b @081B0484 .align 2, 0 .pool -_081B03E0: +@081B03E0: bl sub_81B0DA0 lsls r0, 24 cmp r0, 0 - beq _081B04B0 + beq @081B04B0 ldr r0, =0x0203cec4 ldr r0, [r0] movs r1, 0x86 @@ -835275,34 +835275,34 @@ _081B03E0: adds r0, r1 movs r1, 0 strh r1, [r0] - b _081B0484 + b @081B0484 .align 2, 0 .pool -_081B0400: +@081B0400: bl sub_81B0F28 ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _081B048C + b @081B048C .align 2, 0 .pool -_081B0414: +@081B0414: ldr r0, =0x0203cec4 ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 31 lsrs r0, 31 bl sub_81B2428 - b _081B0484 + b @081B0484 .align 2, 0 .pool -_081B0428: +@081B0428: movs r0, 0x87 lsls r0, 3 adds r1, r2, r0 - b _081B048C -_081B0430: + b @081B048C +@081B0430: ldr r4, =0x0203cec4 ldr r0, [r4] ldr r0, [r0] @@ -835312,10 +835312,10 @@ _081B0430: ldrh r0, [r0, 0xA] lsrs r0, 2 bl sub_81B3054 - b _081B0484 + b @081B0484 .align 2, 0 .pool -_081B044C: +@081B044C: movs r0, 0x1 negs r0, r0 movs r1, 0x10 @@ -835330,10 +835330,10 @@ _081B044C: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _081B048C + b @081B048C .align 2, 0 .pool -_081B0474: +@081B0474: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -835341,30 +835341,30 @@ _081B0474: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 -_081B0484: +@081B0484: ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 -_081B048C: +@081B048C: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _081B04B0 + b @081B04B0 .align 2, 0 .pool -_081B0498: +@081B0498: ldr r0, =sub_81B01CC + 1 bl SetVBlankCallback ldr r0, =sub_81B01B0 + 1 bl set_callback2 movs r0, 0x1 - b _081B04B2 + b @081B04B2 .align 2, 0 .pool -_081B04B0: +@081B04B0: movs r0, 0 -_081B04B2: +@081B04B2: add sp, 0x4 pop {r4} pop {r1} @@ -835372,7 +835372,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 @@ -835397,7 +835397,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 @@ -835406,14 +835406,14 @@ sub_81B04F8: @ 81B04F8 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081B051C + bne @081B051C ldr r0, =0x0203cec8 ldr r0, [r0] bl set_callback2 bl sub_81B06F4 adds r0, r4, 0 bl remove_task -_081B051C: +@081B051C: pop {r4} pop {r0} bx r0 @@ -835422,7 +835422,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] @@ -835438,7 +835438,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 @@ -835447,7 +835447,7 @@ sub_81B0550: @ 81B0550 bl malloc str r0, [r5] cmp r0, 0 - beq _081B05C0 + beq @081B05C0 movs r1, 0 adds r2, r4, 0 bl memset @@ -835477,19 +835477,19 @@ sub_81B0550: @ 81B0550 movs r0, 0x2 bl gpu_sync_bg_show movs r0, 0x1 - b _081B05C2 + b @081B05C2 .align 2, 0 .pool -_081B05C0: +@081B05C0: movs r0, 0 -_081B05C2: +@081B05C2: pop {r4,r5} pop {r1} bx r1 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 @@ -835500,25 +835500,25 @@ sub_81B05C8: @ 81B05C8 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x7 - bhi _081B06B0 + bhi @081B06B0 lsls r0, 2 - ldr r1, =_081B05F0 + ldr r1, =@081B05F0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081B05F0: - .4byte _081B0610 - .4byte _081B0638 - .4byte _081B0658 - .4byte _081B0684 - .4byte _081B0688 - .4byte _081B068C - .4byte _081B0690 - .4byte _081B0694 -_081B0610: +@081B05F0: + .4byte @081B0610 + .4byte @081B0638 + .4byte @081B0658 + .4byte @081B0684 + .4byte @081B0688 + .4byte @081B068C + .4byte @081B0690 + .4byte @081B0694 +@081B0610: ldr r4, =0x0203cee0 ldr r0, =0x08d967ec mov r1, sp @@ -835531,22 +835531,22 @@ _081B0610: movs r0, 0x1 movs r3, 0 bl gpu_copy_bg_tile_pattern_data_to_vram - b _081B069A + b @081B069A .align 2, 0 .pool -_081B0638: +@081B0638: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _081B06B4 + bne @081B06B4 ldr r0, =0x08d96ba0 ldr r1, =0x0203cee4 ldr r1, [r1] bl call_LZZUnCompWram - b _081B069A + b @081B069A .align 2, 0 .pool -_081B0658: +@081B0658: ldr r0, =0x08d96ab4 movs r2, 0xB0 lsls r2, 1 @@ -835559,44 +835559,44 @@ _081B0658: movs r2, 0xB0 bl CpuSet ldr r1, [r4] - b _081B069E + b @081B069E .align 2, 0 .pool -_081B0684: +@081B0684: movs r0, 0x4 - b _081B0696 -_081B0688: + b @081B0696 +@081B0688: movs r0, 0x5 - b _081B0696 -_081B068C: + b @081B0696 +@081B068C: movs r0, 0x6 - b _081B0696 -_081B0690: + b @081B0696 +@081B0690: movs r0, 0x7 - b _081B0696 -_081B0694: + b @081B0696 +@081B0694: movs r0, 0x8 -_081B0696: +@081B0696: bl sub_81B06C0 -_081B069A: +@081B069A: ldr r0, =0x0203cec4 ldr r1, [r0] -_081B069E: +@081B069E: movs r0, 0x86 lsls r0, 2 adds r1, r0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _081B06B4 + b @081B06B4 .align 2, 0 .pool -_081B06B0: +@081B06B0: movs r0, 0x1 - b _081B06B6 -_081B06B4: + b @081B06B6 +@081B06B4: movs r0, 0 -_081B06B6: +@081B06B6: add sp, 0x4 pop {r4} pop {r1} @@ -835604,7 +835604,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 @@ -835630,32 +835630,32 @@ 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] cmp r0, 0 - beq _081B0702 + beq @081B0702 bl free -_081B0702: +@081B0702: ldr r0, =0x0203cee4 ldr r0, [r0] cmp r0, 0 - beq _081B070E + beq @081B070E bl free -_081B070E: +@081B070E: ldr r0, =0x0203cee0 ldr r0, [r0] cmp r0, 0 - beq _081B071A + beq @081B071A bl free -_081B071A: +@081B071A: ldr r0, =0x0203cedc ldr r0, [r0] cmp r0, 0 - beq _081B0726 + beq @081B0726 bl free -_081B0726: +@081B0726: bl Window_FreeMemory pop {r0} bx r0 @@ -835664,7 +835664,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 @@ -835682,7 +835682,7 @@ sub_81B0740: @ 81B0740 mov r8, r0 movs r6, 0xFF mov r9, r4 -_081B0764: +@081B0764: ldr r2, [r4] lsls r3, r5, 4 adds r2, r3, r2 @@ -835719,23 +835719,23 @@ _081B0764: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls _081B0764 + bls @081B0764 mov r1, r9 ldr r0, [r1] mov r1, r12 subs r1, 0x20 str r1, [r0] cmp r7, 0x3 - bne _081B07CC + bne @081B07CC str r1, [r0, 0x30] - b _081B07D2 + b @081B07D2 .align 2, 0 .pool -_081B07CC: +@081B07CC: cmp r7, 0 - beq _081B07D2 + beq @081B07D2 str r1, [r0, 0x10] -_081B07D2: +@081B07D2: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -835745,7 +835745,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 @@ -835754,9 +835754,9 @@ sub_81B07E0: @ 81B07E0 movs r0, 0xF ands r0, r1 cmp r0, 0x5 - bne _081B085C + bne @081B085C cmp r5, 0x2 - bls _081B085C + bls @081B085C adds r0, r5, 0 bl sub_81B0CEC ldr r0, =0x02022ff8 @@ -835765,24 +835765,24 @@ sub_81B07E0: @ 81B07E0 adds r1, r0 ldrh r0, [r1] cmp r0, 0 - bne _081B0828 + bne @081B0828 ldr r0, =0x0203cedc lsls r4, r5, 4 ldr r0, [r0] adds r0, r4 movs r1, 0x40 bl sub_81B2748 - b _081B0836 + b @081B0836 .align 2, 0 .pool -_081B0828: +@081B0828: ldr r0, =0x0203cedc lsls r4, r5, 4 ldr r0, [r0] adds r0, r4 movs r1, 0x8 bl sub_81B2748 -_081B0836: +@081B0836: adds r5, r4, 0 ldr r4, =0x0203cedc ldr r0, [r4] @@ -835796,10 +835796,10 @@ _081B0836: bl Window_WriteStandardTileMap movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - b _081B093E + b @081B093E .align 2, 0 .pool -_081B085C: +@081B085C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -835807,7 +835807,7 @@ _081B085C: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - bne _081B089C + bne @081B089C ldr r4, =0x0203cedc ldr r0, [r4] lsls r5, 4 @@ -835823,82 +835823,82 @@ _081B085C: ldrb r0, [r0, 0x8] movs r1, 0x2 bl Window_CopyToVram - b _081B092C + b @081B092C .align 2, 0 .pool -_081B089C: +@081B089C: ldr r0, =0x0203cec8 ldrb r0, [r0, 0x8] movs r1, 0xF ands r1, r0 cmp r1, 0x7 - bne _081B08B4 + bne @081B08B4 adds r0, r5, 0 bl sub_81B0B60 - b _081B08F6 + b @081B08F6 .align 2, 0 .pool -_081B08B4: +@081B08B4: cmp r1, 0x2 - bne _081B08C0 + bne @081B08C0 adds r0, r5, 0 bl sub_81B0B08 - b _081B08F6 -_081B08C0: + b @081B08F6 +@081B08C0: cmp r1, 0x4 - bne _081B08CC + bne @081B08CC adds r0, r5, 0 bl sub_81B0A9C - b _081B08F6 -_081B08CC: + b @081B08F6 +@081B08CC: cmp r1, 0xB - bne _081B08D8 + bne @081B08D8 adds r0, r5, 0 bl sub_81B0B98 - b _081B08F6 -_081B08D8: + b @081B08F6 +@081B08D8: cmp r1, 0xC - bne _081B08E4 + bne @081B08E4 adds r0, r5, 0 bl sub_81B0BC4 - b _081B08F6 -_081B08E4: + b @081B08F6 +@081B08E4: adds r0, r5, 0 bl sub_81B0BFC lsls r0, 24 cmp r0, 0 - bne _081B08F6 + bne @081B08F6 adds r0, r5, 0 bl sub_81B0948 -_081B08F6: +@081B08F6: ldr r2, =0x0203cec8 ldrb r1, [r2, 0x8] movs r0, 0xF ands r0, r1 cmp r0, 0x5 - bne _081B0910 + bne @081B0910 adds r0, r5, 0 movs r1, 0 bl sub_81B0FCC - b _081B092A + b @081B092A .align 2, 0 .pool -_081B0910: +@081B0910: movs r0, 0x9 ldrsb r0, [r2, r0] cmp r0, r5 - bne _081B0922 + bne @081B0922 adds r0, r5, 0 movs r1, 0x1 bl sub_81B0FCC - b _081B092A -_081B0922: + b @081B092A +@081B0922: adds r0, r5, 0 movs r1, 0 bl sub_81B0FCC -_081B092A: +@081B092A: lsls r5, 4 -_081B092C: +@081B092C: ldr r0, =0x0203cedc ldr r0, [r0] adds r0, r5, r0 @@ -835906,7 +835906,7 @@ _081B092C: bl Window_WriteStandardTileMap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram -_081B093E: +@081B093E: pop {r4,r5} pop {r0} bx r0 @@ -835915,7 +835915,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 @@ -835930,7 +835930,7 @@ sub_81B0948: @ 81B0948 bl pokemon_getattr adds r2, r0, 0 cmp r2, 0 - beq _081B09A0 + beq @081B09A0 ldr r6, =0x0203cedc ldr r0, [r6] lsls r5, r4, 4 @@ -835951,10 +835951,10 @@ sub_81B0948: @ 81B0948 adds r0, r7, 0 movs r2, 0 bl sub_81B2A70 - b _081B0A02 + b @081B0A02 .align 2, 0 .pool -_081B09A0: +@081B09A0: ldr r5, =0x0203cedc ldr r0, [r5] lsls r4, 4 @@ -835997,7 +835997,7 @@ _081B09A0: adds r1, r4 adds r0, r7, 0 bl sub_81B2E28 -_081B0A02: +@081B0A02: add sp, 0x8 pop {r4-r7} pop {r0} @@ -836007,7 +836007,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} @@ -836046,7 +836046,7 @@ sub_81B0A10: @ 81B0A10 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _081B0A7C + bne @081B0A7C ldr r1, [r7] adds r1, r5 adds r0, r6, 0 @@ -836057,7 +836057,7 @@ sub_81B0A10: @ 81B0A10 adds r0, r6, 0 movs r2, 0 bl sub_81B2B8C -_081B0A7C: +@081B0A7C: ldr r1, [r7] adds r1, r5 mov r0, r8 @@ -836074,7 +836074,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 @@ -836086,52 +836086,52 @@ sub_81B0A9C: @ 81B0A9C bl sub_81B85AC lsls r0, 24 cmp r0, 0 - bne _081B0AD6 + bne @081B0AD6 adds r0, r5, 0 movs r1, 0x7 bl sub_81B0A10 - b _081B0B02 + b @081B0B02 .align 2, 0 .pool -_081B0AC8: +@081B0AC8: adds r1, r4, 0x2 lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 bl sub_81B0A10 - b _081B0B02 -_081B0AD6: + b @081B0B02 +@081B0AD6: movs r4, 0 - b _081B0AEE -_081B0ADA: + b @081B0AEE +@081B0ADA: adds r1, r6, r4 ldrb r0, [r1] cmp r0, 0 - beq _081B0AE8 + beq @081B0AE8 subs r0, 0x1 cmp r0, r5 - beq _081B0AC8 -_081B0AE8: + beq @081B0AC8 +@081B0AE8: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_081B0AEE: +@081B0AEE: bl sub_81B8830 lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bcc _081B0ADA + bcc @081B0ADA adds r0, r5, 0 movs r1, 0x1 bl sub_81B0A10 -_081B0B02: +@081B0B02: pop {r4-r6} pop {r0} bx r0 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 @@ -836143,38 +836143,38 @@ sub_81B0B08: @ 81B0B08 lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bhi _081B0B5A + bhi @081B0B5A lsls r0, 2 - ldr r1, =_081B0B34 + ldr r1, =@081B0B34 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081B0B34: - .4byte _081B0B48 - .4byte _081B0B52 - .4byte _081B0B52 - .4byte _081B0B48 - .4byte _081B0B48 -_081B0B48: +@081B0B34: + .4byte @081B0B48 + .4byte @081B0B52 + .4byte @081B0B52 + .4byte @081B0B48 + .4byte @081B0B48 +@081B0B48: adds r0, r4, 0 movs r1, 0x7 bl sub_81B0A10 - b _081B0B5A -_081B0B52: + b @081B0B5A +@081B0B52: adds r0, r4, 0 movs r1, 0x6 bl sub_81B0A10 -_081B0B5A: +@081B0B5A: pop {r4} pop {r0} bx r0 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 @@ -836185,25 +836185,25 @@ sub_81B0B60: @ 81B0B60 bl sub_806E25C lsls r0, 24 cmp r0, 0 - bne _081B0B88 + bne @081B0B88 adds r0, r4, 0 movs r1, 0x9 bl sub_81B0A10 - b _081B0B90 + b @081B0B90 .align 2, 0 .pool -_081B0B88: +@081B0B88: adds r0, r4, 0 movs r1, 0x8 bl sub_81B0A10 -_081B0B90: +@081B0B90: pop {r4} pop {r0} bx r0 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 @@ -836212,23 +836212,23 @@ sub_81B0B98: @ 81B0B98 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081B0BB6 + bne @081B0BB6 adds r0, r4, 0 movs r1, 0x6 bl sub_81B0A10 - b _081B0BBE -_081B0BB6: + b @081B0BBE +@081B0BB6: adds r0, r4, 0 movs r1, 0x7 bl sub_81B0A10 -_081B0BBE: +@081B0BBE: pop {r4} pop {r0} bx r0 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 @@ -836239,25 +836239,25 @@ sub_81B0BC4: @ 81B0BC4 movs r1, 0xC bl pokemon_getattr cmp r0, 0 - beq _081B0BEC + beq @081B0BEC adds r0, r4, 0 movs r1, 0xB bl sub_81B0A10 - b _081B0BF4 + b @081B0BF4 .align 2, 0 .pool -_081B0BEC: +@081B0BEC: adds r0, r4, 0 movs r1, 0xC bl sub_81B0A10 -_081B0BF4: +@081B0BF4: pop {r4} pop {r0} bx r0 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 @@ -836271,7 +836271,7 @@ sub_81B0BFC: @ 81B0BFC ldr r0, =0x0203cec8 ldrb r0, [r0, 0xB] cmp r0, 0xC - bne _081B0C40 + bne @081B0C40 ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] @@ -836280,56 +836280,56 @@ sub_81B0BFC: @ 81B0BFC adds r0, r5, 0 movs r1, 0 bl sub_81B0C94 - b _081B0C8A + b @081B0C8A .align 2, 0 .pool -_081B0C40: +@081B0C40: cmp r0, 0x3 - bne _081B0C56 + bne @081B0C56 adds r0, r4, 0 bl sub_80FD21C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B0C5A + beq @081B0C5A cmp r0, 0x2 - beq _081B0C66 -_081B0C56: + beq @081B0C66 +@081B0C56: movs r0, 0 - b _081B0C8C -_081B0C5A: + b @081B0C8C +@081B0C5A: adds r0, r5, 0 adds r1, r4, 0 movs r2, 0 bl sub_81B0C94 - b _081B0C8A -_081B0C66: + b @081B0C8A +@081B0C66: adds r0, r6, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _081B0C82 + bne @081B0C82 adds r0, r6, 0 movs r1, 0x3 adds r2, r4, 0 bl GetEvolutionTargetSpecies lsls r0, 16 cmp r0, 0 - bne _081B0C56 -_081B0C82: + bne @081B0C56 +@081B0C82: adds r0, r5, 0 movs r1, 0 bl sub_81B0A10 -_081B0C8A: +@081B0C8A: movs r0, 0x1 -_081B0C8C: +@081B0C8C: pop {r4-r6} pop {r1} bx r1 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 @@ -836345,39 +836345,39 @@ sub_81B0C94: @ 81B0C94 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - beq _081B0CD2 + beq @081B0CD2 cmp r0, 0x2 - bgt _081B0CC4 + bgt @081B0CC4 cmp r0, 0x1 - beq _081B0CC8 - b _081B0CDC + beq @081B0CC8 + b @081B0CDC .align 2, 0 .pool -_081B0CC4: +@081B0CC4: cmp r0, 0x3 - bne _081B0CDC -_081B0CC8: + bne @081B0CDC +@081B0CC8: adds r0, r4, 0 movs r1, 0x9 bl sub_81B0A10 - b _081B0CE4 -_081B0CD2: + b @081B0CE4 +@081B0CD2: adds r0, r4, 0 movs r1, 0xA bl sub_81B0A10 - b _081B0CE4 -_081B0CDC: + b @081B0CE4 +@081B0CDC: adds r0, r4, 0 movs r1, 0x8 bl sub_81B0A10 -_081B0CE4: +@081B0CE4: pop {r4} pop {r0} bx r0 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} @@ -836396,13 +836396,13 @@ sub_81B0CEC: @ 81B0CEC adds r7, r0, r5 ldrh r0, [r7] cmp r0, 0 - bne _081B0D24 + bne @081B0D24 ldrb r0, [r6, 0x8] bl sub_81B2720 - b _081B0D8E + b @081B0D8E .align 2, 0 .pool -_081B0D24: +@081B0D24: ldr r2, [r6] ldrb r0, [r6, 0x8] movs r1, 0 @@ -836446,7 +836446,7 @@ _081B0D24: ldrh r1, [r7, 0x12] adds r2, r6, 0 bl sub_81B2E64 -_081B0D8E: +@081B0D8E: add sp, 0x8 pop {r3} mov r8, r3 @@ -836458,7 +836458,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] @@ -836475,21 +836475,21 @@ sub_81B0DA0: @ 81B0DA0 lsls r0, 16 asrs r0, 16 cmp r0, 0x6 - beq _081B0DCC + beq @081B0DCC movs r0, 0 - b _081B0DCE + b @081B0DCE .align 2, 0 .pool -_081B0DCC: +@081B0DCC: movs r0, 0x1 -_081B0DCE: +@081B0DCE: pop {r4,r5} pop {r1} bx r1 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 @@ -836502,7 +836502,7 @@ sub_81B0DD4: @ 81B0DD4 thumb_func_end sub_81B0DD4 thumb_func_start sub_81B0DE8 -sub_81B0DE8: @ 81B0DE8 +sub_81B0DE8: ; 81B0DE8 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -836516,9 +836516,9 @@ sub_81B0DE8: @ 81B0DE8 movs r0, 0xF ands r0, r1 cmp r0, 0x5 - bne _081B0E98 + bne @081B0E98 cmp r7, 0x2 - bls _081B0E98 + bls @081B0E98 subs r0, r7, 0x3 lsls r0, 24 lsrs r0, 24 @@ -836532,7 +836532,7 @@ sub_81B0DE8: @ 81B0DE8 add r6, r9 ldrh r0, [r6] cmp r0, 0 - beq _081B0EDC + beq @081B0EDC mov r1, r9 adds r1, 0x18 add r1, r8 @@ -836555,12 +836555,12 @@ sub_81B0DE8: @ 81B0DE8 bl sub_81B5EF4 ldrh r0, [r6, 0x10] cmp r0, 0 - bne _081B0E68 + bne @081B0E68 movs r3, 0x7 - b _081B0E78 + b @081B0E78 .align 2, 0 .pool -_081B0E68: +@081B0E68: mov r0, r9 adds r0, 0x14 add r0, r8 @@ -836568,7 +836568,7 @@ _081B0E68: bl pokemon_ailments_get_primary lsls r0, 24 lsrs r3, r0, 24 -_081B0E78: +@081B0E78: ldr r1, =0x02022ff8 mov r2, r10 lsls r0, r2, 5 @@ -836579,10 +836579,10 @@ _081B0E78: adds r2, r5 adds r1, r3, 0 bl sub_81B6098 - b _081B0EDC + b @081B0EDC .align 2, 0 .pool -_081B0E98: +@081B0E98: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 @@ -836592,7 +836592,7 @@ _081B0E98: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _081B0EDC + beq @081B0EDC ldr r4, =0x0203cedc lsls r5, r7, 4 ldr r1, [r4] @@ -836612,7 +836612,7 @@ _081B0E98: adds r1, r5 adds r0, r6, 0 bl sub_81B6064 -_081B0EDC: +@081B0EDC: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -836626,7 +836626,7 @@ _081B0EDC: thumb_func_end sub_81B0DE8 thumb_func_start sub_81B0EF4 -sub_81B0EF4: @ 81B0EF4 +sub_81B0EF4: ; 81B0EF4 push {r4,r5,lr} ldr r5, =0x0203cec4 ldr r0, [r5] @@ -836643,21 +836643,21 @@ sub_81B0EF4: @ 81B0EF4 lsls r0, 16 asrs r0, 16 cmp r0, 0x6 - beq _081B0F20 + beq @081B0F20 movs r0, 0 - b _081B0F22 + b @081B0F22 .align 2, 0 .pool -_081B0F20: +@081B0F20: movs r0, 0x1 -_081B0F22: +@081B0F22: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_81B0EF4 thumb_func_start sub_81B0F28 -sub_81B0F28: @ 81B0F28 +sub_81B0F28: ; 81B0F28 push {r4,lr} sub sp, 0xC ldr r0, =0x0203cec8 @@ -836665,7 +836665,7 @@ sub_81B0F28: @ 81B0F28 movs r0, 0xF ands r0, r1 cmp r0, 0x5 - bne _081B0F54 + bne @081B0F54 movs r0, 0x7 str r0, [sp] movs r0, 0x2 @@ -836676,16 +836676,16 @@ sub_81B0F28: @ 81B0F28 movs r2, 0x17 movs r3, 0x11 bl Bg_FillWramTileMapRectWithTileAndPalette - b _081B0FBC + b @081B0FBC .align 2, 0 .pool -_081B0F54: +@081B0F54: ldr r4, =0x0203cec4 ldr r0, [r4] ldrb r0, [r0, 0x8] lsls r0, 31 cmp r0, 0 - beq _081B0F94 + beq @081B0F94 movs r0, 0xBF movs r1, 0x88 bl sub_81B5F74 @@ -836704,14 +836704,14 @@ _081B0F54: movs r0, 0xBF movs r1, 0x98 bl sub_81B5F74 - b _081B0F9C + b @081B0F9C .align 2, 0 .pool -_081B0F94: +@081B0F94: movs r0, 0xC6 movs r1, 0x94 bl sub_81B5F34 -_081B0F9C: +@081B0F9C: ldr r3, [r4] lsls r0, 24 lsrs r0, 24 @@ -836727,7 +836727,7 @@ _081B0F9C: ldrb r0, [r0, 0x9] movs r1, 0x1 bl sub_81B0FCC -_081B0FBC: +@081B0FBC: add sp, 0xC pop {r4} pop {r0} @@ -836737,7 +836737,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} @@ -836748,9 +836748,9 @@ sub_81B0FCC: @ 81B0FCC lsrs r1, 24 mov r8, r1 cmp r7, 0x6 - beq _081B1038 + beq @081B1038 cmp r7, 0x7 - beq _081B1074 + beq @081B1074 movs r0, 0x64 muls r0, r7 ldr r1, =0x020244ec @@ -836758,7 +836758,7 @@ sub_81B0FCC: @ 81B0FCC movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _081B10E8 + beq @081B10E8 ldr r6, =0x0203cedc lsls r5, r7, 4 ldr r4, [r6] @@ -836781,13 +836781,13 @@ sub_81B0FCC: @ 81B0FCC ldrb r0, [r5, 0xB] mov r1, r8 bl sub_81B5F98 - b _081B10E8 + b @081B10E8 .align 2, 0 .pool -_081B1038: +@081B1038: mov r0, r8 cmp r0, 0 - bne _081B1052 + bne @081B1052 movs r0, 0x2 str r0, [sp] movs r0, 0x1 @@ -836796,8 +836796,8 @@ _081B1038: movs r2, 0x10 movs r3, 0x7 bl sub_8199C30 - b _081B1064 -_081B1052: + b @081B1064 +@081B1052: movs r0, 0x2 str r0, [sp] str r0, [sp, 0x4] @@ -836806,56 +836806,56 @@ _081B1052: movs r2, 0x10 movs r3, 0x7 bl sub_8199C30 -_081B1064: +@081B1064: ldr r0, =0x0203cec4 ldr r0, [r0] ldrh r0, [r0, 0x8] lsls r0, 21 - b _081B10DA + b @081B10DA .align 2, 0 .pool -_081B1074: +@081B1074: ldr r0, =0x0203cec4 ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 31 cmp r0, 0 - bne _081B10A6 + bne @081B10A6 mov r0, r8 cmp r0, 0 - bne _081B1098 + bne @081B1098 movs r0, 0x2 str r0, [sp] movs r0, 0x1 str r0, [sp, 0x4] movs r1, 0x17 movs r2, 0x11 - b _081B10B8 + b @081B10B8 .align 2, 0 .pool -_081B1098: +@081B1098: movs r0, 0x2 str r0, [sp] str r0, [sp, 0x4] movs r0, 0x1 movs r1, 0x17 movs r2, 0x11 - b _081B10B8 -_081B10A6: + b @081B10B8 +@081B10A6: mov r0, r8 cmp r0, 0 - bne _081B10C0 + bne @081B10C0 movs r0, 0x2 str r0, [sp] movs r0, 0x1 str r0, [sp, 0x4] movs r1, 0x17 movs r2, 0x12 -_081B10B8: +@081B10B8: movs r3, 0x7 bl sub_8199C30 - b _081B10D2 -_081B10C0: + b @081B10D2 +@081B10C0: movs r0, 0x2 str r0, [sp] str r0, [sp, 0x4] @@ -836864,18 +836864,18 @@ _081B10C0: movs r2, 0x12 movs r3, 0x7 bl sub_8199C30 -_081B10D2: +@081B10D2: ldr r0, =0x0203cec4 ldr r0, [r0] ldr r0, [r0, 0x8] lsls r0, 14 -_081B10DA: +@081B10DA: lsrs r0, 25 mov r1, r8 bl sub_81B5F98 movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram -_081B10E8: +@081B10E8: add sp, 0x8 pop {r3} mov r8, r3 @@ -836887,7 +836887,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 @@ -836895,9 +836895,9 @@ sub_81B10F8: @ 81B10F8 lsrs r1, 24 movs r4, 0 cmp r1, 0x1 - bne _081B110A + bne @081B110A movs r4, 0x1 -_081B110A: +@081B110A: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -836905,59 +836905,59 @@ _081B110A: movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - bne _081B1120 + bne @081B1120 movs r0, 0x2 orrs r4, r0 -_081B1120: +@081B1120: adds r0, r5, 0 bl sub_81B118C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081B1136 + bne @081B1136 movs r0, 0x8 orrs r4, r0 lsls r0, r4, 24 lsrs r4, r0, 24 -_081B1136: +@081B1136: ldr r0, =0x0203cec8 ldrb r1, [r0, 0xB] adds r2, r0, 0 cmp r1, 0x9 - bne _081B1148 + bne @081B1148 movs r0, 0x10 orrs r4, r0 lsls r0, r4, 24 lsrs r4, r0, 24 -_081B1148: +@081B1148: cmp r1, 0x8 - bne _081B1164 + bne @081B1164 movs r0, 0x9 ldrsb r0, [r2, r0] cmp r5, r0 - beq _081B115C + beq @081B115C movs r0, 0xA ldrsb r0, [r2, r0] cmp r5, r0 - bne _081B1164 -_081B115C: + bne @081B1164 +@081B115C: movs r0, 0x4 orrs r4, r0 lsls r0, r4, 24 lsrs r4, r0, 24 -_081B1164: +@081B1164: ldrb r0, [r2, 0xB] cmp r0, 0xA - bne _081B117A + bne @081B117A movs r0, 0x9 ldrsb r0, [r2, r0] cmp r5, r0 - bne _081B117A + bne @081B117A movs r0, 0x20 orrs r4, r0 lsls r0, r4, 24 lsrs r4, r0, 24 -_081B117A: +@081B117A: adds r0, r4, 0 pop {r4,r5} pop {r1} @@ -836967,7 +836967,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 @@ -836976,28 +836976,28 @@ sub_81B118C: @ 81B118C movs r0, 0x30 ands r0, r1 cmp r0, 0x20 - bne _081B11B4 + bne @081B11B4 cmp r2, 0x1 - beq _081B11AA + beq @081B11AA cmp r2, 0x4 - beq _081B11AA + beq @081B11AA cmp r2, 0x5 - bne _081B11B4 -_081B11AA: + bne @081B11B4 +@081B11AA: movs r0, 0x1 - b _081B11F8 + b @081B11F8 .align 2, 0 .pool -_081B11B4: +@081B11B4: cmp r2, 0x2 - bhi _081B11F6 + bhi @081B11F6 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 11 ands r0, r1 cmp r0, 0 - beq _081B11F6 + beq @081B11F6 ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -837005,7 +837005,7 @@ _081B11B4: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081B11F6 + beq @081B11F6 adds r0, r2, 0 bl sub_81B8F38 ldr r1, =0x0202449c @@ -837020,10 +837020,10 @@ _081B11B4: movs r0, 0x1 ands r1, r0 cmp r1, 0 - bne _081B11F8 -_081B11F6: + bne @081B11F8 +@081B11F6: movs r0, 0 -_081B11F8: +@081B11F8: pop {r1} bx r1 .align 2, 0 @@ -837031,7 +837031,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, =0x086157c4 @@ -837064,14 +837064,14 @@ 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] movs r1, 0x49 ands r0, r1 cmp r0, 0x49 - bne _081B1280 + bne @081B1280 ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -837079,20 +837079,20 @@ sub_81B1250: @ 81B1250 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081B1280 + beq @081B1280 movs r0, 0x1 - b _081B1282 + b @081B1282 .align 2, 0 .pool -_081B1280: +@081B1280: movs r0, 0 -_081B1282: +@081B1282: pop {r1} bx r1 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 @@ -837118,7 +837118,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 @@ -837147,7 +837147,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 @@ -837156,40 +837156,40 @@ c3_0811FAB4: @ 81B12F8 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081B134C + bne @081B134C ldr r4, =0x0203cec8 ldrb r1, [r4, 0x8] movs r0, 0xF ands r0, r1 cmp r0, 0x1 - bne _081B131A + bne @081B131A bl sub_81B9080 -_081B131A: +@081B131A: ldr r0, =0x0203cec4 ldr r0, [r0] ldr r0, [r0, 0x4] cmp r0, 0 - beq _081B1338 + beq @081B1338 bl set_callback2 - b _081B133E + b @081B133E .align 2, 0 .pool -_081B1338: +@081B1338: ldr r0, [r4] bl set_callback2 -_081B133E: +@081B133E: bl reset_all_obj_data bl sub_81B06F4 adds r0, r5, 0 bl remove_task -_081B134C: +@081B134C: pop {r4,r5} pop {r0} bx r0 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 @@ -837198,7 +837198,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 @@ -837209,7 +837209,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 @@ -837219,51 +837219,51 @@ sub_81B1370: @ 81B1370 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081B13E0 + bne @081B13E0 bl sub_81221EC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B13E0 + beq @081B13E0 bl sub_81B13EC adds r4, r0, 0 bl sub_81B1760 lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - beq _081B13C0 + beq @081B13C0 cmp r0, 0x2 - bgt _081B13B0 + bgt @081B13B0 cmp r0, 0x1 - beq _081B13B6 - b _081B13E0 + beq @081B13B6 + b @081B13E0 .align 2, 0 .pool -_081B13B0: +@081B13B0: cmp r0, 0x8 - beq _081B13CA - b _081B13E0 -_081B13B6: + beq @081B13CA + b @081B13E0 +@081B13B6: adds r0, r5, 0 adds r1, r4, 0 bl sub_81B140C - b _081B13E0 -_081B13C0: + b @081B13E0 +@081B13C0: adds r0, r6, 0 adds r1, r4, 0 bl sub_81B15D0 - b _081B13E0 -_081B13CA: + b @081B13E0 +@081B13CA: ldr r0, =0x0203cec4 ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 31 cmp r0, 0 - beq _081B13E0 + beq @081B13E0 movs r0, 0x5 bl audio_play bl sub_81B4F88 -_081B13E0: +@081B13E0: pop {r4-r6} pop {r0} bx r0 @@ -837272,28 +837272,28 @@ _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] cmp r1, 0x8 - beq _081B13FA + beq @081B13FA cmp r1, 0xA - bne _081B1404 -_081B13FA: + bne @081B1404 +@081B13FA: adds r0, 0xA - b _081B1406 + b @081B1406 .align 2, 0 .pool -_081B1404: +@081B1404: adds r0, 0x9 -_081B1406: +@081B1406: pop {r1} bx r1 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 @@ -837301,78 +837301,78 @@ sub_81B140C: @ 81B140C movs r0, 0 ldrsb r0, [r4, r0] cmp r0, 0x6 - bne _081B142C + bne @081B142C ldr r0, =0x0203cec8 ldr r1, [r0, 0x4] adds r0, r5, 0 bl _call_via_r1 - b _081B159E + b @081B159E .align 2, 0 .pool -_081B142C: +@081B142C: ldr r0, =0x0203cec8 ldrb r0, [r0, 0xB] subs r0, 0x3 cmp r0, 0xA - bls _081B1438 - b _081B1592 -_081B1438: + bls @081B1438 + b @081B1592 +@081B1438: lsls r0, 2 - ldr r1, =_081B144C + ldr r1, =@081B144C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081B144C: - .4byte _081B149C - .4byte _081B1592 - .4byte _081B1538 - .4byte _081B1538 - .4byte _081B1510 - .4byte _081B1560 - .4byte _081B1592 - .4byte _081B1478 - .4byte _081B156E - .4byte _081B14E8 - .4byte _081B157C -_081B1478: +@081B144C: + .4byte @081B149C + .4byte @081B1592 + .4byte @081B1538 + .4byte @081B1538 + .4byte @081B1510 + .4byte @081B1560 + .4byte @081B1592 + .4byte @081B1478 + .4byte @081B156E + .4byte @081B14E8 + .4byte @081B157C +@081B1478: adds r0, r4, 0 bl sub_81B15A4 lsls r0, 24 cmp r0, 0 - bne _081B1486 - b _081B159E -_081B1486: + bne @081B1486 + b @081B159E +@081B1486: ldr r0, =0x0203cec4 ldr r0, [r0] adds r0, 0xD bl sub_81B302C adds r0, r5, 0 bl sub_81615A8 - b _081B159E + b @081B159E .align 2, 0 .pool -_081B149C: +@081B149C: adds r0, r4, 0 bl sub_81B15A4 lsls r0, 24 cmp r0, 0 - bne _081B14AA - b _081B159E -_081B14AA: + bne @081B14AA + b @081B159E +@081B14AA: ldr r0, =0x0203cec8 ldrb r1, [r0, 0x8] movs r0, 0xF ands r0, r1 ldr r2, =0x0203cec4 cmp r0, 0x1 - bne _081B14BE + bne @081B14BE ldr r1, [r2] ldr r0, =sub_81B9140 + 1 str r0, [r1, 0x4] -_081B14BE: +@081B14BE: ldr r0, [r2] adds r0, 0xD bl sub_81B302C @@ -837381,15 +837381,15 @@ _081B14BE: ldr r2, [r0] adds r0, r5, 0 bl _call_via_r2 - b _081B159E + b @081B159E .align 2, 0 .pool -_081B14E8: +@081B14E8: adds r0, r4, 0 bl sub_81B15A4 lsls r0, 24 cmp r0, 0 - beq _081B159E + beq @081B159E movs r0, 0x5 bl audio_play ldr r0, =0x0203cec4 @@ -837398,15 +837398,15 @@ _081B14E8: bl sub_81B302C adds r0, r5, 0 bl sub_81B7E4C - b _081B159E + b @081B159E .align 2, 0 .pool -_081B1510: +@081B1510: adds r0, r4, 0 bl sub_81B15A4 lsls r0, 24 cmp r0, 0 - beq _081B159E + beq @081B159E movs r0, 0x5 bl audio_play ldr r0, =0x0203cec4 @@ -837415,15 +837415,15 @@ _081B1510: bl sub_81B302C adds r0, r5, 0 bl sub_81B8474 - b _081B159E + b @081B159E .align 2, 0 .pool -_081B1538: +@081B1538: adds r0, r4, 0 bl sub_81B15A4 lsls r0, 24 cmp r0, 0 - beq _081B159E + beq @081B159E movs r0, 0x5 bl audio_play ldr r0, =0x0203cec4 @@ -837432,44 +837432,44 @@ _081B1538: bl sub_81B302C adds r0, r5, 0 bl sub_81B7FAC - b _081B159E + b @081B159E .align 2, 0 .pool -_081B1560: +@081B1560: movs r0, 0x5 bl audio_play adds r0, r5, 0 bl sub_81B3938 - b _081B159E -_081B156E: + b @081B159E +@081B156E: movs r0, 0x5 bl audio_play adds r0, r5, 0 bl sub_81B12C0 - b _081B159E -_081B157C: + b @081B159E +@081B157C: adds r0, r4, 0 bl sub_81B15A4 lsls r0, 24 cmp r0, 0 - beq _081B159E + beq @081B159E ldrb r1, [r4] adds r0, r5, 0 bl sub_81B21AC - b _081B159E -_081B1592: + b @081B159E +@081B1592: movs r0, 0x5 bl audio_play adds r0, r5, 0 bl sub_81B36FC -_081B159E: +@081B159E: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_81B140C thumb_func_start sub_81B15A4 -sub_81B15A4: @ 81B15A4 +sub_81B15A4: ; 81B15A4 push {lr} ldrb r1, [r0] movs r0, 0x64 @@ -837479,22 +837479,22 @@ sub_81B15A4: @ 81B15A4 movs r1, 0x2D bl pokemon_getattr cmp r0, 0x1 - beq _081B15C4 + beq @081B15C4 movs r0, 0x1 - b _081B15CC + b @081B15CC .align 2, 0 .pool -_081B15C4: +@081B15C4: movs r0, 0x20 bl audio_play movs r0, 0 -_081B15CC: +@081B15CC: pop {r1} bx r1 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 @@ -837502,37 +837502,37 @@ sub_81B15D0: @ 81B15D0 ldr r0, =0x0203cec8 ldrb r0, [r0, 0xB] cmp r0, 0x8 - beq _081B1602 + beq @081B1602 cmp r0, 0x8 - bgt _081B15F0 + bgt @081B15F0 cmp r0, 0x1 - beq _081B15FA - b _081B161E + beq @081B15FA + b @081B161E .align 2, 0 .pool -_081B15F0: +@081B15F0: cmp r0, 0xA - beq _081B1602 + beq @081B1602 cmp r0, 0xD - beq _081B1610 - b _081B161E -_081B15FA: + beq @081B1610 + b @081B161E +@081B15FA: movs r0, 0x20 bl audio_play - b _081B1652 -_081B1602: + b @081B1652 +@081B1602: movs r0, 0x5 bl audio_play adds r0, r4, 0 bl sub_81B407C - b _081B1652 -_081B1610: + b @081B1652 +@081B1610: movs r0, 0x5 bl audio_play adds r0, r4, 0 bl sub_81B2210 - b _081B1652 -_081B161E: + b @081B1652 +@081B161E: movs r0, 0x5 bl audio_play adds r0, r4, 0 @@ -837540,15 +837540,15 @@ _081B161E: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B1652 + beq @081B1652 bl sub_81221AC lsls r0, 24 cmp r0, 0 - bne _081B1642 + bne @081B1642 ldr r1, =0x020375e0 movs r0, 0x7 strh r0, [r1] -_081B1642: +@081B1642: ldr r0, =0x0203cee8 movs r1, 0 strb r1, [r0] @@ -837556,7 +837556,7 @@ _081B1642: strb r0, [r5] adds r0, r4, 0 bl sub_81B12C0 -_081B1652: +@081B1652: pop {r4,r5} pop {r0} bx r0 @@ -837565,7 +837565,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 @@ -837575,19 +837575,19 @@ sub_81B1660: @ 81B1660 movs r1, 0xF ands r1, r0 cmp r1, 0x2 - bne _081B1680 + bne @081B1680 ldr r5, =0x085ea110 - b _081B168A + b @081B168A .align 2, 0 .pool -_081B1680: +@081B1680: cmp r1, 0x4 - bne _081B168A + bne @081B168A bl sub_81B88BC adds r5, r0, 0 -_081B168A: +@081B168A: cmp r5, 0 - beq _081B16CC + beq @081B16CC ldr r0, =0x0203cec4 ldr r0, [r0] adds r0, 0xD @@ -837607,19 +837607,19 @@ _081B168A: ldr r1, =sub_81B16D4 + 1 str r1, [r0] movs r0, 0x1 - b _081B16CE + b @081B16CE .align 2, 0 .pool -_081B16CC: +@081B16CC: movs r0, 0 -_081B16CE: +@081B16CE: pop {r4-r6} pop {r1} bx r1 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 @@ -837627,7 +837627,7 @@ sub_81B16D4: @ 81B16D4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B16F8 + beq @081B16F8 bl sub_81B334C ldr r0, =0x03005e00 lsls r1, r4, 2 @@ -837636,7 +837636,7 @@ sub_81B16D4: @ 81B16D4 adds r1, r0 ldr r0, =sub_81B1708 + 1 str r0, [r1] -_081B16F8: +@081B16F8: pop {r4} pop {r0} bx r0 @@ -837645,7 +837645,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 @@ -837653,19 +837653,19 @@ sub_81B1708: @ 81B1708 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _081B172E + beq @081B172E cmp r1, 0 - bgt _081B1728 + bgt @081B1728 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _081B174C - b _081B1758 -_081B1728: + beq @081B174C + b @081B1758 +@081B1728: cmp r1, 0x1 - beq _081B1752 - b _081B1758 -_081B172E: + beq @081B1752 + b @081B1758 +@081B172E: ldr r0, =0x0203cee8 strb r1, [r0] ldr r1, =0x0203cec8 @@ -837674,114 +837674,114 @@ _081B172E: bl sub_81B8558 adds r0, r4, 0 bl sub_81B12C0 - b _081B1758 + b @081B1758 .align 2, 0 .pool -_081B174C: +@081B174C: movs r0, 0x5 bl audio_play -_081B1752: +@081B1752: adds r0, r4, 0 bl sub_81B1C1C -_081B1758: +@081B1758: pop {r4} pop {r0} bx r0 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 ldrh r1, [r0, 0x30] adds r3, r0, 0 cmp r1, 0x20 - beq _081B178E + beq @081B178E cmp r1, 0x20 - bgt _081B177C + bgt @081B177C cmp r1, 0x10 - beq _081B1792 - b _081B1796 + beq @081B1792 + b @081B1796 .align 2, 0 .pool -_081B177C: +@081B177C: cmp r1, 0x40 - beq _081B1786 + beq @081B1786 cmp r1, 0x80 - beq _081B178A - b _081B1796 -_081B1786: + beq @081B178A + b @081B1796 +@081B1786: movs r1, 0xFF - b _081B17B2 -_081B178A: + b @081B17B2 +@081B178A: movs r1, 0x1 - b _081B17B2 -_081B178E: + b @081B17B2 +@081B178E: movs r1, 0xFE - b _081B17B2 -_081B1792: + b @081B17B2 +@081B1792: movs r1, 0x2 - b _081B17B2 -_081B1796: + b @081B17B2 +@081B1796: bl sub_812210C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B17AA + beq @081B17AA cmp r0, 0x2 - beq _081B17AE + beq @081B17AE movs r1, 0 - b _081B17B0 -_081B17AA: + b @081B17B0 +@081B17AA: movs r1, 0xFF - b _081B17B0 -_081B17AE: + b @081B17B0 +@081B17AE: movs r1, 0x1 -_081B17B0: +@081B17B0: ldr r3, =0x030022c0 -_081B17B2: +@081B17B2: ldrh r2, [r3, 0x2E] movs r0, 0x8 ands r0, r2 cmp r0, 0 - beq _081B17C4 + beq @081B17C4 movs r0, 0x8 - b _081B17F0 + b @081B17F0 .align 2, 0 .pool -_081B17C4: +@081B17C4: lsls r0, r1, 24 asrs r1, r0, 24 cmp r1, 0 - beq _081B17D6 + beq @081B17D6 adds r0, r4, 0 bl sub_81B17F8 movs r0, 0 - b _081B17F0 -_081B17D6: + b @081B17F0 +@081B17D6: movs r0, 0x1 ands r0, r2 cmp r0, 0 - beq _081B17EA + beq @081B17EA movs r0, 0 ldrsb r0, [r4, r0] cmp r0, 0x7 - bne _081B17EA + bne @081B17EA movs r0, 0x2 - b _081B17F0 -_081B17EA: + b @081B17F0 +@081B17EA: ldrh r1, [r3, 0x2E] movs r0, 0x3 ands r0, r1 -_081B17F0: +@081B17F0: pop {r4} pop {r1} bx r1 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 @@ -837792,26 +837792,26 @@ sub_81B17F8: @ 81B17F8 lsls r0, 26 lsrs r0, 30 cmp r0, 0 - bne _081B1820 + bne @081B1820 lsls r1, 24 asrs r1, 24 adds r0, r5, 0 bl sub_81B1854 - b _081B182A + b @081B182A .align 2, 0 .pool -_081B1820: +@081B1820: lsls r1, 24 asrs r1, 24 adds r0, r5, 0 bl sub_81B195C -_081B182A: +@081B182A: movs r1, 0 ldrsb r1, [r5, r1] lsls r4, 24 asrs r0, r4, 24 cmp r1, r0 - beq _081B184C + beq @081B184C movs r0, 0x5 bl audio_play lsrs r0, r4, 24 @@ -837820,14 +837820,14 @@ _081B182A: ldrb r0, [r5] movs r1, 0x1 bl sub_81B0FCC -_081B184C: +@081B184C: pop {r4,r5} pop {r0} bx r0 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 @@ -837835,117 +837835,117 @@ sub_81B1854: @ 81B1854 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _081B187A + beq @081B187A cmp r1, r0 - bgt _081B1870 + bgt @081B1870 subs r0, 0x1 cmp r1, r0 - beq _081B1924 - b _081B1952 -_081B1870: + beq @081B1924 + b @081B1952 +@081B1870: cmp r1, 0x1 - beq _081B18C0 + beq @081B18C0 cmp r1, 0x2 - beq _081B18F8 - b _081B1952 -_081B187A: + beq @081B18F8 + b @081B1952 +@081B187A: ldrb r0, [r4] movs r1, 0 ldrsb r1, [r4, r1] cmp r1, 0 - bne _081B1888 + bne @081B1888 movs r0, 0x7 - b _081B1950 -_081B1888: + b @081B1950 +@081B1888: cmp r1, 0x6 - bne _081B1898 + bne @081B1898 ldr r0, =0x020244e9 ldrb r0, [r0] subs r0, 0x1 - b _081B1950 + b @081B1950 .align 2, 0 .pool -_081B1898: +@081B1898: cmp r1, 0x7 - bne _081B18BC + bne @081B18BC ldr r0, =0x0203cec4 ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 31 cmp r0, 0 - beq _081B18B0 + beq @081B18B0 movs r0, 0x6 - b _081B1950 + b @081B1950 .align 2, 0 .pool -_081B18B0: +@081B18B0: ldr r0, =0x020244e9 ldrb r0, [r0] subs r0, 0x1 - b _081B1950 + b @081B1950 .align 2, 0 .pool -_081B18BC: +@081B18BC: subs r0, 0x1 - b _081B1950 -_081B18C0: + b @081B1950 +@081B18C0: ldrb r2, [r4] movs r0, 0 ldrsb r0, [r4, r0] cmp r0, 0x7 - beq _081B194E + beq @081B194E movs r1, 0 ldrsb r1, [r4, r1] ldr r0, =0x020244e9 ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 - bne _081B18F4 + bne @081B18F4 ldr r0, =0x0203cec4 ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 31 cmp r0, 0 - beq _081B18F0 + beq @081B18F0 movs r0, 0x6 - b _081B1950 + b @081B1950 .align 2, 0 .pool -_081B18F0: +@081B18F0: movs r0, 0x7 - b _081B1950 -_081B18F4: + b @081B1950 +@081B18F4: adds r0, r2, 0x1 - b _081B1950 -_081B18F8: + b @081B1950 +@081B18F8: ldr r0, =0x020244e9 ldrb r0, [r0] cmp r0, 0x1 - beq _081B1952 + beq @081B1952 movs r0, 0 ldrsb r0, [r4, r0] cmp r0, 0 - bne _081B1952 + bne @081B1952 ldr r0, =0x0203cec4 ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 28 lsrs r0, 29 cmp r0, 0 - bne _081B1950 + bne @081B1950 movs r0, 0x1 - b _081B1950 + b @081B1950 .align 2, 0 .pool -_081B1924: +@081B1924: movs r0, 0 ldrsb r0, [r4, r0] cmp r0, 0 - beq _081B1952 + beq @081B1952 cmp r0, 0x6 - beq _081B1952 + beq @081B1952 cmp r0, 0x7 - beq _081B1952 + beq @081B1952 ldr r0, =0x0203cec4 ldr r3, [r0] movs r1, 0 @@ -837959,11 +837959,11 @@ _081B1924: ands r0, r2 orrs r0, r1 strb r0, [r3, 0x8] -_081B194E: +@081B194E: movs r0, 0 -_081B1950: +@081B1950: strb r0, [r4] -_081B1952: +@081B1952: pop {r4} pop {r0} bx r0 @@ -837972,7 +837972,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 @@ -837981,56 +837981,56 @@ sub_81B195C: @ 81B195C movs r6, 0x1 negs r6, r6 cmp r5, r6 - beq _081B1988 + beq @081B1988 cmp r5, r6 - bgt _081B197E + bgt @081B197E movs r0, 0x2 negs r0, r0 cmp r5, r0 - bne _081B197C - b _081B1A9C -_081B197C: - b _081B1AF4 -_081B197E: + bne @081B197C + b @081B1A9C +@081B197C: + b @081B1AF4 +@081B197E: cmp r5, 0x1 - beq _081B19E4 + beq @081B19E4 cmp r5, 0x2 - beq _081B1A24 - b _081B1AF4 -_081B1988: + beq @081B1A24 + b @081B1AF4 +@081B1988: ldrb r1, [r4] movs r0, 0 ldrsb r0, [r4, r0] cmp r0, 0 - bne _081B1996 + bne @081B1996 movs r0, 0x7 - b _081B1AF2 -_081B1996: + b @081B1AF2 +@081B1996: cmp r0, 0x6 - bne _081B19A8 + bne @081B19A8 ldr r0, =0x020244e9 ldrb r0, [r0] subs r0, 0x1 - b _081B1AF2 + b @081B1AF2 .align 2, 0 .pool -_081B19A8: +@081B19A8: cmp r0, 0x7 - bne _081B19C4 + bne @081B19C4 ldr r0, =0x0203cec4 ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 31 cmp r0, 0 - beq _081B19C0 + beq @081B19C0 movs r0, 0x6 - b _081B1AF2 + b @081B1AF2 .align 2, 0 .pool -_081B19C0: +@081B19C0: subs r0, r1, 0x1 strb r0, [r4] -_081B19C4: +@081B19C4: movs r0, 0 ldrsb r0, [r4, r0] lsls r1, r2, 24 @@ -838042,24 +838042,24 @@ _081B19C4: movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _081B19E0 - b _081B1AF4 -_081B19E0: + bne @081B19E0 + b @081B1AF4 +@081B19E0: strb r2, [r4] - b _081B1AF4 -_081B19E4: + b @081B1AF4 +@081B19E4: movs r0, 0 ldrsb r0, [r4, r0] cmp r0, 0x6 - bne _081B19F0 + bne @081B19F0 movs r0, 0x7 - b _081B1AF2 -_081B19F0: + b @081B1AF2 +@081B19F0: cmp r0, 0x7 - bne _081B19F8 + bne @081B19F8 movs r0, 0 - b _081B1AF2 -_081B19F8: + b @081B1AF2 +@081B19F8: movs r0, 0 ldrsb r0, [r4, r0] movs r1, 0x1 @@ -838068,83 +838068,83 @@ _081B19F8: lsrs r2, r0, 24 asrs r0, 24 cmp r0, r6 - bne _081B19E0 + bne @081B19E0 ldr r0, =0x0203cec4 ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 31 cmp r0, 0 - beq _081B1A20 + beq @081B1A20 movs r0, 0x6 - b _081B1AF2 + b @081B1AF2 .align 2, 0 .pool -_081B1A20: +@081B1A20: movs r0, 0x7 - b _081B1AF2 -_081B1A24: + b @081B1AF2 +@081B1A24: movs r0, 0 ldrsb r0, [r4, r0] cmp r0, 0 - bne _081B1A5C + bne @081B1A5C ldr r0, =0x0203cec4 ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 28 lsrs r6, r0, 29 cmp r6, 0x3 - bne _081B1A54 + bne @081B1A54 ldr r0, =0x02024618 movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _081B1AF4 + beq @081B1AF4 strb r6, [r4] - b _081B1AF4 + b @081B1AF4 .align 2, 0 .pool -_081B1A54: +@081B1A54: ldr r0, =0x020245b4 - b _081B1A70 + b @081B1A70 .align 2, 0 .pool -_081B1A5C: +@081B1A5C: cmp r0, 0x1 - bne _081B1AF4 + bne @081B1AF4 ldr r0, =0x0203cec4 ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 28 lsrs r5, r0, 29 cmp r5, 0x5 - bne _081B1A88 + bne @081B1A88 ldr r0, =0x020246e0 -_081B1A70: +@081B1A70: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _081B1AF4 + beq @081B1AF4 strb r5, [r4] - b _081B1AF4 + b @081B1AF4 .align 2, 0 .pool -_081B1A88: +@081B1A88: ldr r0, =0x0202467c movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _081B1AF4 + beq @081B1AF4 movs r0, 0x4 - b _081B1AF2 + b @081B1AF2 .align 2, 0 .pool -_081B1A9C: +@081B1A9C: ldrb r1, [r4] subs r0, r1, 0x2 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _081B1ACC + bhi @081B1ACC ldr r0, =0x0203cec4 ldr r3, [r0] movs r1, 0 @@ -838159,15 +838159,15 @@ _081B1A9C: orrs r0, r1 strb r0, [r3, 0x8] movs r0, 0 - b _081B1AF2 + b @081B1AF2 .align 2, 0 .pool -_081B1ACC: +@081B1ACC: subs r0, r1, 0x4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _081B1AF4 + bhi @081B1AF4 ldr r0, =0x0203cec4 ldr r3, [r0] movs r1, 0 @@ -838182,9 +838182,9 @@ _081B1ACC: orrs r0, r1 strb r0, [r3, 0x8] movs r0, 0x1 -_081B1AF2: +@081B1AF2: strb r0, [r4] -_081B1AF4: +@081B1AF4: pop {r4-r6} pop {r0} bx r0 @@ -838193,13 +838193,13 @@ _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 lsls r1, 24 asrs r6, r1, 24 -_081B1B0A: +@081B1B0A: lsls r0, r5, 24 asrs r0, 24 adds r0, r6 @@ -838208,7 +838208,7 @@ _081B1B0A: lsls r1, r5, 24 lsrs r0, r1, 24 cmp r0, 0x5 - bhi _081B1B38 + bhi @081B1B38 asrs r4, r1, 24 movs r0, 0x64 muls r0, r4 @@ -838217,22 +838217,22 @@ _081B1B0A: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _081B1B0A + beq @081B1B0A adds r0, r4, 0 - b _081B1B3C + b @081B1B3C .align 2, 0 .pool -_081B1B38: +@081B1B38: movs r0, 0x1 negs r0, r0 -_081B1B3C: +@081B1B3C: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_81B1B00 thumb_func_start sub_81B1B44 -sub_81B1B44: @ 81B1B44 +sub_81B1B44: ; 81B1B44 push {r4,lr} adds r4, r1, 0 movs r1, 0x2 @@ -838246,7 +838246,7 @@ sub_81B1B44: @ 81B1B44 thumb_func_end sub_81B1B44 thumb_func_start sub_81B1B5C -sub_81B1B5C: @ 81B1B5C +sub_81B1B5C: ; 81B1B5C push {r4,lr} lsls r4, r1, 24 lsrs r4, 24 @@ -838270,7 +838270,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 @@ -838280,7 +838280,7 @@ sub_81B1B8C: @ 81B1B8C lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - beq _081B1BC8 + beq @081B1BC8 ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -838289,16 +838289,16 @@ sub_81B1B8C: @ 81B1B8C movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0 - bne _081B1BC2 + bne @081B1BC2 movs r0, 0x6 movs r1, 0 bl sub_8198070 movs r0, 0x6 bl Window_FillTileMap -_081B1BC2: +@081B1BC2: adds r0, r5, 0 bl remove_task -_081B1BC8: +@081B1BC8: pop {r4,r5} pop {r0} bx r0 @@ -838307,7 +838307,7 @@ _081B1BC8: thumb_func_end sub_81B1B8C thumb_func_start sub_81B1BD4 -sub_81B1BD4: @ 81B1BD4 +sub_81B1BD4: ; 81B1BD4 push {lr} ldr r0, =sub_81B1B8C + 1 bl is_function_an_active_task @@ -838320,7 +838320,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 @@ -838328,7 +838328,7 @@ sub_81B1BE8: @ 81B1BE8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B1C0E + beq @081B1C0E movs r0, 0 bl sub_81B3054 ldr r0, =0x03005e00 @@ -838338,7 +838338,7 @@ sub_81B1BE8: @ 81B1BE8 adds r1, r0 ldr r0, =sub_81B1370 + 1 str r0, [r1] -_081B1C0E: +@081B1C0E: pop {r4} pop {r0} bx r0 @@ -838347,7 +838347,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 @@ -838356,7 +838356,7 @@ sub_81B1C1C: @ 81B1C1C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B1C74 + beq @081B1C74 movs r0, 0x6 movs r1, 0 bl sub_8198070 @@ -838366,17 +838366,17 @@ sub_81B1C1C: @ 81B1C1C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081B1C60 + bne @081B1C60 ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 ldr r0, =sub_81B1BE8 + 1 - b _081B1C72 + b @081B1C72 .align 2, 0 .pool -_081B1C60: +@081B1C60: movs r0, 0 bl sub_81B3054 ldr r0, =0x03005e00 @@ -838385,9 +838385,9 @@ _081B1C60: lsls r1, 3 adds r1, r0 ldr r0, =sub_81B1370 + 1 -_081B1C72: +@081B1C72: str r0, [r1] -_081B1C74: +@081B1C74: pop {r4,r5} pop {r0} bx r0 @@ -838396,7 +838396,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 @@ -838426,7 +838426,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 @@ -838456,7 +838456,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 @@ -838486,7 +838486,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 @@ -838518,7 +838518,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 @@ -838530,15 +838530,15 @@ sub_81B1DB8: @ 81B1DB8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081B1DE2 + bne @081B1DE2 adds r0, r6, 0 adds r1, r4, 0 bl sub_80D4420 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _081B1DF6 -_081B1DE2: + beq @081B1DF6 +@081B1DE2: mov r0, sp strb r7, [r0] mov r1, sp @@ -838548,7 +838548,7 @@ _081B1DE2: movs r1, 0xC mov r2, sp bl pokemon_setattr -_081B1DF6: +@081B1DF6: add sp, 0x4 pop {r4-r7} pop {r0} @@ -838556,7 +838556,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 @@ -838567,15 +838567,15 @@ sub_81B1E00: @ 81B1E00 mov r1, sp strh r0, [r1] cmp r0, 0 - bne _081B1E1C + bne @081B1E1C movs r0, 0 - b _081B1E3E -_081B1E1C: + b @081B1E3E +@081B1E1C: movs r1, 0x1 bl bag_add_item lsls r0, 24 cmp r0, 0 - beq _081B1E3C + beq @081B1E3C movs r1, 0 mov r0, sp strh r1, [r0] @@ -838584,10 +838584,10 @@ _081B1E1C: mov r2, sp bl pokemon_setattr movs r0, 0x2 - b _081B1E3E -_081B1E3C: + b @081B1E3E +@081B1E3C: movs r0, 0x1 -_081B1E3E: +@081B1E3E: add sp, 0x4 pop {r4} pop {r1} @@ -838595,7 +838595,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, =0x085e9a69 @@ -838607,7 +838607,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} @@ -838658,22 +838658,22 @@ sub_81B1E60: @ 81B1E60 movs r1, 0x6 ldrsh r0, [r7, r1] cmp r0, 0 - beq _081B1EDC + beq @081B1EDC movs r2, 0 ldrsh r1, [r7, r2] cmp r1, 0 - beq _081B1EDC + beq @081B1EDC movs r3, 0x2 ldrsh r0, [r7, r3] cmp r1, r0 - bne _081B1EFE -_081B1EDC: + bne @081B1EFE +@081B1EDC: movs r0, 0 ldrsh r1, [r7, r0] movs r2, 0xA ldrsh r0, [r7, r2] cmp r1, r0 - ble _081B1EF8 + ble @081B1EF8 ldr r0, =0x02021dc4 movs r3, 0xA ldrsh r2, [r7, r3] @@ -838681,10 +838681,10 @@ _081B1EDC: movs r2, 0 movs r3, 0x3 bl decimal_int_to_string -_081B1EF8: +@081B1EF8: mov r0, r8 bl set_task_function_to_args_14_15 -_081B1EFE: +@081B1EFE: pop {r3} mov r8, r3 pop {r4-r7} @@ -838695,7 +838695,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 @@ -838763,7 +838763,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 @@ -838775,43 +838775,43 @@ sub_81B1FA8: @ 81B1FA8 ldr r1, =0x03005e08 adds r3, r0, r1 cmp r5, 0x5 - bhi _081B200A + bhi @081B200A lsls r0, r5, 2 - ldr r1, =_081B1FD4 + ldr r1, =@081B1FD4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081B1FD4: - .4byte _081B1FEC - .4byte _081B1FF2 - .4byte _081B1FF6 - .4byte _081B1FFA - .4byte _081B1FFE - .4byte _081B2002 -_081B1FEC: +@081B1FD4: + .4byte @081B1FEC + .4byte @081B1FF2 + .4byte @081B1FF6 + .4byte @081B1FFA + .4byte @081B1FFE + .4byte @081B2002 +@081B1FEC: strh r2, [r3] strh r2, [r3, 0xA] - b _081B200A -_081B1FF2: + b @081B200A +@081B1FF2: strh r2, [r3, 0x2] - b _081B200A -_081B1FF6: + b @081B200A +@081B1FF6: strh r2, [r3, 0x4] - b _081B200A -_081B1FFA: + b @081B200A +@081B1FFA: strh r2, [r3, 0x6] - b _081B200A -_081B1FFE: + b @081B200A +@081B1FFE: strh r2, [r3, 0x8] - b _081B200A -_081B2002: + b @081B200A +@081B2002: ldr r1, =sub_81B1E60 + 1 adds r0, r4, 0 bl set_task_function_and_args_14_15 -_081B200A: +@081B200A: pop {r4,r5} pop {r0} bx r0 @@ -838820,61 +838820,61 @@ _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 ands r0, r1 cmp r0, 0 - beq _081B2024 + beq @081B2024 movs r0, 0x1 - b _081B2056 -_081B2024: + b @081B2056 +@081B2024: movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _081B2030 + beq @081B2030 movs r0, 0x2 - b _081B2056 -_081B2030: + b @081B2056 +@081B2030: movs r0, 0x7 ands r0, r1 cmp r0, 0 - beq _081B203C + beq @081B203C movs r0, 0x3 - b _081B2056 -_081B203C: + b @081B2056 +@081B203C: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _081B2048 + beq @081B2048 movs r0, 0x4 - b _081B2056 -_081B2048: + b @081B2056 +@081B2048: movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _081B2054 + bne @081B2054 movs r0, 0 - b _081B2056 -_081B2054: + b @081B2056 +@081B2054: movs r0, 0x5 -_081B2056: +@081B2056: pop {r1} bx r1 thumb_func_end pokemon_ailments_get_primary thumb_func_start sub_81B205C -sub_81B205C: @ 81B205C +sub_81B205C: ; 81B205C push {r4,lr} adds r4, r0, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - bne _081B206E + bne @081B206E movs r0, 0x7 - b _081B2096 -_081B206E: + b @081B2096 +@081B206E: adds r0, r4, 0 movs r1, 0x37 bl pokemon_getattr @@ -838882,32 +838882,32 @@ _081B206E: lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _081B2096 + bne @081B2096 adds r0, r4, 0 movs r1, 0 bl sub_806DD7C lsls r0, 24 cmp r0, 0 - bne _081B2094 + bne @081B2094 movs r0, 0 - b _081B2096 -_081B2094: + b @081B2096 +@081B2094: movs r0, 0x6 -_081B2096: +@081B2096: pop {r4} pop {r1} bx r1 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] movs r0, 0xF ands r0, r1 cmp r0, 0xB - bne _081B2126 + bne @081B2126 adds r5, r2, 0 adds r5, 0xE movs r0, 0 @@ -838915,13 +838915,13 @@ sub_81B209C: @ 81B209C ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0 - bne _081B20FC + bne @081B20FC movs r4, 0 ldr r0, =0x020244e9 ldrb r0, [r0] cmp r4, r0 - bcs _081B2126 -_081B20C4: + bcs @081B2126 +@081B20C4: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -838939,14 +838939,14 @@ _081B20C4: ldr r0, =0x020244e9 ldrb r0, [r0] cmp r4, r0 - bcc _081B20C4 - b _081B2126 + bcc @081B20C4 + b @081B2126 .align 2, 0 .pool -_081B20FC: +@081B20FC: movs r4, 0 - b _081B211E -_081B2100: + b @081B211E +@081B2100: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -838961,12 +838961,12 @@ _081B2100: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_081B211E: +@081B211E: ldr r0, =0x020244e9 ldrb r0, [r0] cmp r4, r0 - bcc _081B2100 -_081B2126: + bcc @081B2100 +@081B2126: pop {r4,r5} pop {r0} bx r0 @@ -838975,13 +838975,13 @@ _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 bl pokemon_getattr cmp r0, 0x1 - beq _081B215A + beq @081B215A adds r0, r4, 0 movs r1, 0xB bl pokemon_getattr @@ -838989,42 +838989,42 @@ sub_81B2134: @ 81B2134 lsrs r0, 16 bl sub_802C908 cmp r0, 0 - beq _081B215A + beq @081B215A movs r0, 0x1 - b _081B215C -_081B215A: + b @081B215C +@081B215A: movs r0, 0 -_081B215C: +@081B215C: pop {r4} pop {r1} bx r1 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 bl pokemon_getattr cmp r0, 0x1 - beq _081B2182 + beq @081B2182 adds r0, r4, 0 movs r1, 0xB bl pokemon_getattr cmp r0, 0x55 - bne _081B2182 + bne @081B2182 movs r0, 0x1 - b _081B2184 -_081B2182: + b @081B2184 +@081B2182: movs r0, 0 -_081B2184: +@081B2184: pop {r4} pop {r1} bx r1 thumb_func_end sub_81B2164 thumb_func_start sub_81B218C -sub_81B218C: @ 81B218C +sub_81B218C: ; 81B218C push {lr} lsls r0, 24 lsrs r0, 24 @@ -839035,9 +839035,9 @@ sub_81B218C: @ 81B218C movs r0, 0x1 ands r1, r0 cmp r1, 0 - bne _081B21A4 + bne @081B21A4 movs r0, 0 -_081B21A4: +@081B21A4: pop {r1} bx r1 .align 2, 0 @@ -839045,7 +839045,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 @@ -839056,17 +839056,17 @@ sub_81B21AC: @ 81B21AC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081B21DC + bne @081B21DC movs r0, 0x5 bl audio_play ldr r0, =0x020375e0 strh r5, [r0] adds r0, r4, 0 bl sub_81B12C0 - b _081B21FE + b @081B21FE .align 2, 0 .pool -_081B21DC: +@081B21DC: movs r0, 0x20 bl audio_play ldr r0, =0x085ea0ee @@ -839081,7 +839081,7 @@ _081B21DC: adds r0, r1 ldr r1, =sub_81B1C1C + 1 str r1, [r0] -_081B21FE: +@081B21FE: pop {r4,r5} pop {r0} bx r0 @@ -839090,7 +839090,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 @@ -839115,7 +839115,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 @@ -839123,7 +839123,7 @@ sub_81B2248: @ 81B2248 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B226C + beq @081B226C bl sub_81B334C ldr r0, =0x03005e00 lsls r1, r4, 2 @@ -839132,7 +839132,7 @@ sub_81B2248: @ 81B2248 adds r1, r0 ldr r0, =sub_81B227C + 1 str r0, [r1] -_081B226C: +@081B226C: pop {r4} pop {r0} bx r0 @@ -839141,7 +839141,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 @@ -839149,31 +839149,31 @@ sub_81B227C: @ 81B227C lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _081B22A2 + beq @081B22A2 cmp r1, 0 - bgt _081B229C + bgt @081B229C movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _081B22B4 - b _081B22C8 -_081B229C: + beq @081B22B4 + b @081B22C8 +@081B229C: cmp r1, 0x1 - beq _081B22BA - b _081B22C8 -_081B22A2: + beq @081B22BA + b @081B22C8 +@081B22A2: ldr r1, =0x020375e0 movs r0, 0x7 strh r0, [r1] adds r0, r4, 0 bl sub_81B12C0 - b _081B22C8 + b @081B22C8 .align 2, 0 .pool -_081B22B4: +@081B22B4: movs r0, 0x5 bl audio_play -_081B22BA: +@081B22BA: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -839181,7 +839181,7 @@ _081B22BA: adds r1, r0 ldr r0, =sub_81B1C1C + 1 str r0, [r1] -_081B22C8: +@081B22C8: pop {r4} pop {r0} bx r0 @@ -839190,7 +839190,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} @@ -839204,14 +839204,14 @@ sub_81B22D8: @ 81B22D8 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - beq _081B22FA + beq @081B22FA movs r0, 0x3 - b _081B2356 -_081B22FA: + b @081B2356 +@081B22FA: movs r0, 0x90 lsls r0, 1 cmp r4, r0 - bls _081B231C + bls @081B231C adds r1, r4, 0 subs r1, 0x21 lsls r1, 24 @@ -839219,11 +839219,11 @@ _081B22FA: adds r0, r5, 0 bl sub_806E00C cmp r0, 0 - beq _081B2334 + beq @081B2334 adds r0, r7, 0 bl sub_81B6CFC - b _081B233E -_081B231C: + b @081B233E +@081B231C: adds r0, r5, 0 movs r1, 0xB bl pokemon_getattr @@ -839233,14 +839233,14 @@ _081B231C: bl sub_81B2370 lsls r0, 24 cmp r0, 0 - bne _081B2338 -_081B2334: + bne @081B2338 +@081B2334: movs r0, 0x1 - b _081B2356 -_081B2338: + b @081B2356 +@081B2338: mov r0, r8 bl sub_81B2360 -_081B233E: +@081B233E: lsls r0, 16 lsrs r1, r0, 16 adds r0, r5, 0 @@ -839248,12 +839248,12 @@ _081B233E: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B2354 + beq @081B2354 movs r0, 0 - b _081B2356 -_081B2354: + b @081B2356 +@081B2354: movs r0, 0x2 -_081B2356: +@081B2356: pop {r3} mov r8, r3 pop {r4-r7} @@ -839262,7 +839262,7 @@ _081B2356: thumb_func_end sub_81B22D8 thumb_func_start sub_81B2360 -sub_81B2360: @ 81B2360 +sub_81B2360: ; 81B2360 lsls r0, 24 ldr r1, =0x0861500c lsrs r0, 23 @@ -839274,7 +839274,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 @@ -839287,60 +839287,60 @@ sub_81B2370: @ 81B2370 ldr r0, [r0] ands r0, r2 cmp r0, 0 - bne _081B2394 + bne @081B2394 movs r0, 0 - b _081B2396 + b @081B2396 .align 2, 0 .pool -_081B2394: +@081B2394: movs r0, 0x1 -_081B2396: +@081B2396: pop {r1} bx r1 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 adds r1, r0, 0 cmp r0, 0x1 - beq _081B23C4 + beq @081B23C4 cmp r0, 0x1 - bgt _081B23B2 + bgt @081B23B2 cmp r0, 0 - beq _081B23B8 - b _081B23DC -_081B23B2: + beq @081B23B8 + b @081B23DC +@081B23B2: cmp r1, 0x2 - beq _081B23D0 - b _081B23DC -_081B23B8: + beq @081B23D0 + b @081B23DC +@081B23B8: ldr r0, =0x08615810 bl Window_InitFromTemplates - b _081B23E2 + b @081B23E2 .align 2, 0 .pool -_081B23C4: +@081B23C4: ldr r0, =0x08615850 bl Window_InitFromTemplates - b _081B23E2 + b @081B23E2 .align 2, 0 .pool -_081B23D0: +@081B23D0: ldr r0, =0x08615890 bl Window_InitFromTemplates - b _081B23E2 + b @081B23E2 .align 2, 0 .pool -_081B23DC: +@081B23DC: ldr r0, =0x086158d0 bl Window_InitFromTemplates -_081B23E2: +@081B23E2: bl TextBox_ResetSomeField movs r4, 0 -_081B23E8: +@081B23E8: adds r0, r4, 0 movs r1, 0 bl Window_FastFillPixels @@ -839348,7 +839348,7 @@ _081B23E8: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls _081B23E8 + bls @081B23E8 movs r0, 0 movs r1, 0x4F movs r2, 0xD0 @@ -839369,7 +839369,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 @@ -839379,11 +839379,11 @@ sub_81B2428: @ 81B2428 movs r0, 0xF ands r0, r1 cmp r0, 0x5 - bne _081B243E - b _081B2554 -_081B243E: + bne @081B243E + b @081B2554 +@081B243E: cmp r2, 0x1 - bne _081B24B4 + bne @081B24B4 ldr r0, =0x08615918 bl Window_AddFromTemplate adds r4, r0, 0 @@ -839422,16 +839422,16 @@ _081B243E: lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - b _081B24C0 + b @081B24C0 .align 2, 0 .pool -_081B24B4: +@081B24B4: ldr r0, =0x08615908 bl Window_AddFromTemplate lsls r0, 24 lsrs r5, r0, 24 movs r6, 0x3 -_081B24C0: +@081B24C0: adds r0, r5, 0 movs r1, 0 bl Window_FastFillPixels @@ -839440,7 +839440,7 @@ _081B24C0: movs r0, 0xF ands r0, r1 cmp r0, 0xA - beq _081B2514 + beq @081B2514 ldr r4, =0x085e8cf0 movs r0, 0 adds r1, r4, 0 @@ -839461,10 +839461,10 @@ _081B24C0: movs r1, 0 movs r3, 0x1 bl box_print - b _081B2540 + b @081B2540 .align 2, 0 .pool -_081B2514: +@081B2514: ldr r4, =0x085e8cf7 movs r0, 0 adds r1, r4, 0 @@ -839485,7 +839485,7 @@ _081B2514: movs r1, 0 movs r3, 0x1 bl box_print -_081B2540: +@081B2540: adds r0, r5, 0 bl Window_WriteStandardTileMap adds r0, r5, 0 @@ -839493,7 +839493,7 @@ _081B2540: bl Window_CopyToVram movs r0, 0 bl schedule_bg_copy_tilemap_to_vram -_081B2554: +@081B2554: add sp, 0x14 pop {r4-r6} pop {r0} @@ -839503,7 +839503,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 @@ -839517,7 +839517,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 @@ -839551,7 +839551,7 @@ sub_81B2578: @ 81B2578 bl malloc_and_clear mov r9, r0 cmp r0, 0 - beq _081B2646 + beq @081B2646 movs r5, 0 ldr r0, [sp, 0x14] lsls r0, 19 @@ -839565,20 +839565,20 @@ sub_81B2578: @ 81B2578 lsls r0, 19 str r0, [sp, 0x28] cmp r5, r10 - bcs _081B2624 -_081B25DA: + bcs @081B2624 +@081B25DA: movs r4, 0 adds r1, r5, 0x1 mov r8, r1 cmp r4, r6 - bcs _081B261A + bcs @081B261A ldr r2, [sp, 0x18] adds r0, r2, r5 ldr r2, [sp, 0x10] adds r1, r0, 0 muls r1, r2 adds r7, r1, 0 -_081B25F0: +@081B25F0: ldr r1, [sp, 0x14] adds r0, r1, r4 adds r0, r7 @@ -839597,14 +839597,14 @@ _081B25F0: lsls r0, 24 lsrs r4, r0, 24 cmp r4, r6 - bcc _081B25F0 -_081B261A: + bcc @081B25F0 +@081B261A: mov r1, r8 lsls r0, r1, 24 lsrs r5, r0, 24 cmp r5, r10 - bcc _081B25DA -_081B2624: + bcc @081B25DA +@081B2624: ldr r0, [sp, 0x1C] lsrs r2, r0, 16 ldr r1, [sp, 0x20] @@ -839620,7 +839620,7 @@ _081B2624: bl Window_CopyWholePixelBlockToWindow mov r0, r9 bl free -_081B2646: +@081B2646: add sp, 0x2C pop {r3-r5} mov r8, r3 @@ -839632,7 +839632,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] @@ -839650,14 +839650,14 @@ sub_81B2658: @ 81B2658 lsls r5, 24 lsrs r5, 24 cmp r3, 0 - bne _081B2684 + bne @081B2684 cmp r4, 0 - bne _081B2684 + bne @081B2684 movs r3, 0xA movs r4, 0x7 -_081B2684: +@081B2684: cmp r5, 0 - bne _081B26A0 + bne @081B26A0 ldr r1, =0x08615988 str r2, [sp] str r3, [sp, 0x4] @@ -839665,10 +839665,10 @@ _081B2684: movs r2, 0xA adds r3, r6, 0 bl sub_81B2578 - b _081B26B0 + b @081B26B0 .align 2, 0 .pool -_081B26A0: +@081B26A0: ldr r1, =0x086159ce str r2, [sp] str r3, [sp, 0x4] @@ -839676,7 +839676,7 @@ _081B26A0: movs r2, 0xA adds r3, r6, 0 bl sub_81B2578 -_081B26B0: +@081B26B0: add sp, 0xC pop {r4-r6} pop {r0} @@ -839686,7 +839686,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] @@ -839704,14 +839704,14 @@ sub_81B26BC: @ 81B26BC lsls r5, 24 lsrs r5, 24 cmp r3, 0 - bne _081B26E8 + bne @081B26E8 cmp r4, 0 - bne _081B26E8 + bne @081B26E8 movs r3, 0x12 movs r4, 0x3 -_081B26E8: +@081B26E8: cmp r5, 0 - bne _081B2704 + bne @081B2704 ldr r1, =0x08615a14 str r2, [sp] str r3, [sp, 0x4] @@ -839719,10 +839719,10 @@ _081B26E8: movs r2, 0x12 adds r3, r6, 0 bl sub_81B2578 - b _081B2714 + b @081B2714 .align 2, 0 .pool -_081B2704: +@081B2704: ldr r1, =0x08615a4a str r2, [sp] str r3, [sp, 0x4] @@ -839730,7 +839730,7 @@ _081B2704: movs r2, 0x12 adds r3, r6, 0 bl sub_81B2578 -_081B2714: +@081B2714: add sp, 0xC pop {r4-r6} pop {r0} @@ -839740,7 +839740,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 @@ -839763,7 +839763,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 @@ -839777,28 +839777,28 @@ sub_81B2748: @ 81B2748 movs r0, 0x40 ands r0, r4 cmp r0, 0 - beq _081B277C + beq @081B277C ldr r5, =0x08615af1 ldrb r0, [r5] bl sub_81B2564 ldr r4, =0x08615ac0 - b _081B297E + b @081B297E .align 2, 0 .pool -_081B277C: +@081B277C: movs r0, 0x20 ands r0, r4 cmp r0, 0 - beq _081B27D8 + beq @081B27D8 movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _081B2794 + beq @081B2794 ldr r5, =0x08615adf - b _081B2942 + b @081B2942 .align 2, 0 .pool -_081B2794: +@081B2794: ldr r5, =0x08615adf ldrb r0, [r5] bl sub_81B2564 @@ -839820,14 +839820,14 @@ _081B2794: movs r2, 0x2 bl gpu_pal_apply ldr r5, =0x08615aee - b _081B2976 + b @081B2976 .align 2, 0 .pool -_081B27D8: +@081B27D8: movs r0, 0x10 ands r0, r4 cmp r0, 0 - beq _081B2824 + beq @081B2824 ldr r5, =0x08615adf ldrb r0, [r5] bl sub_81B2564 @@ -839849,23 +839849,23 @@ _081B27D8: movs r2, 0x2 bl gpu_pal_apply ldr r5, =0x08615aee - b _081B2976 + b @081B2976 .align 2, 0 .pool -_081B2824: +@081B2824: movs r0, 0x4 ands r0, r4 cmp r0, 0 - beq _081B2880 + beq @081B2880 movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _081B283C + beq @081B283C ldr r5, =0x08615adf - b _081B2942 + b @081B2942 .align 2, 0 .pool -_081B283C: +@081B283C: ldr r5, =0x08615adf ldrb r0, [r5] bl sub_81B2564 @@ -839887,23 +839887,23 @@ _081B283C: movs r2, 0x2 bl gpu_pal_apply ldr r5, =0x08615aee - b _081B2976 + b @081B2976 .align 2, 0 .pool -_081B2880: +@081B2880: movs r0, 0x2 ands r0, r4 cmp r0, 0 - beq _081B28DC + beq @081B28DC movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _081B2898 + beq @081B2898 ldr r5, =0x08615adc - b _081B2942 + b @081B2942 .align 2, 0 .pool -_081B2898: +@081B2898: ldr r5, =0x08615ad3 ldrb r0, [r5] bl sub_81B2564 @@ -839925,23 +839925,23 @@ _081B2898: movs r2, 0x2 bl gpu_pal_apply ldr r5, =0x08615ae8 - b _081B2976 + b @081B2976 .align 2, 0 .pool -_081B28DC: +@081B28DC: movs r0, 0x8 ands r0, r4 cmp r0, 0 - beq _081B2938 + beq @081B2938 movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _081B28F4 + beq @081B28F4 ldr r5, =0x08615ad9 - b _081B2942 + b @081B2942 .align 2, 0 .pool -_081B28F4: +@081B28F4: ldr r5, =0x08615ad0 ldrb r0, [r5] bl sub_81B2564 @@ -839963,16 +839963,16 @@ _081B28F4: movs r2, 0x2 bl gpu_pal_apply ldr r5, =0x08615ae5 - b _081B2976 + b @081B2976 .align 2, 0 .pool -_081B2938: +@081B2938: movs r0, 0x1 ands r5, r0 cmp r5, 0 - beq _081B29BC + beq @081B29BC ldr r5, =0x08615ad6 -_081B2942: +@081B2942: ldrb r0, [r5] bl sub_81B2564 ldr r4, =0x08615aba @@ -839993,11 +839993,11 @@ _081B2942: movs r2, 0x2 bl gpu_pal_apply ldr r5, =0x08615aeb -_081B2976: +@081B2976: ldrb r0, [r5] bl sub_81B2564 ldr r4, =0x08615abd -_081B297E: +@081B297E: ldrb r1, [r4] adds r1, r6 movs r2, 0x2 @@ -840014,10 +840014,10 @@ _081B297E: adds r1, r6 movs r2, 0x2 bl gpu_pal_apply - b _081B2A24 + b @081B2A24 .align 2, 0 .pool -_081B29BC: +@081B29BC: ldr r5, =0x08615acd ldrb r0, [r5] bl sub_81B2564 @@ -840058,7 +840058,7 @@ _081B29BC: adds r1, r7 movs r2, 0x2 bl gpu_pal_apply -_081B2A24: +@081B2A24: pop {r4-r7} pop {r0} bx r0 @@ -840067,7 +840067,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 @@ -840096,7 +840096,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 @@ -840106,9 +840106,9 @@ sub_81B2A70: @ 81B2A70 movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _081B2AC0 + beq @081B2AC0 cmp r4, 0x1 - bne _081B2AAA + bne @081B2AAA ldr r5, [r6] ldrb r0, [r6, 0x8] ldrb r1, [r5, 0x4] @@ -840124,7 +840124,7 @@ sub_81B2A70: @ 81B2A70 str r4, [sp, 0x4] ldr r4, [r5] bl _call_via_r4 -_081B2AAA: +@081B2AAA: adds r0, r7, 0 add r1, sp, 0x8 bl sub_81B1B44 @@ -840134,7 +840134,7 @@ _081B2AAA: add r1, sp, 0x8 movs r2, 0 bl sub_81B2A3C -_081B2AC0: +@081B2AC0: add sp, 0x14 pop {r4-r7} pop {r0} @@ -840142,7 +840142,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} @@ -840155,18 +840155,18 @@ sub_81B2AC8: @ 81B2AC8 movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _081B2B34 + beq @081B2B34 adds r0, r6, 0 bl sub_81B205C lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _081B2AF6 + beq @081B2AF6 cmp r0, 0x6 - bne _081B2B34 -_081B2AF6: + bne @081B2B34 +@081B2AF6: cmp r4, 0 - beq _081B2B1C + beq @081B2B1C ldr r5, [r7] ldrb r0, [r7, 0x8] ldrb r1, [r5, 0x8] @@ -840183,10 +840183,10 @@ _081B2AF6: str r4, [sp, 0x4] ldr r4, [r5] bl _call_via_r4 -_081B2B1C: +@081B2B1C: mov r0, r8 cmp r0, 0x2 - beq _081B2B34 + beq @081B2B34 adds r0, r6, 0 movs r1, 0x38 bl pokemon_getattr @@ -840194,7 +840194,7 @@ _081B2B1C: lsrs r0, 24 adds r1, r7, 0 bl sub_81B2B40 -_081B2B34: +@081B2B34: add sp, 0x8 pop {r3} mov r8, r3 @@ -840204,7 +840204,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 @@ -840237,7 +840237,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 @@ -840245,7 +840245,7 @@ sub_81B2B8C: @ 81B2B8C lsls r2, 24 lsrs r2, 24 cmp r2, 0x1 - bne _081B2BBE + bne @081B2BBE ldr r5, [r7] ldrb r0, [r7, 0x8] ldrb r1, [r5, 0xC] @@ -840262,7 +840262,7 @@ sub_81B2B8C: @ 81B2B8C str r4, [sp, 0x4] ldr r4, [r5] bl _call_via_r4 -_081B2BBE: +@081B2BBE: adds r0, r6, 0 add r1, sp, 0x8 bl sub_81B1B44 @@ -840288,7 +840288,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 @@ -840307,12 +840307,12 @@ sub_81B2BF4: @ 81B2BF4 lsls r0, 28 lsrs r6, r0, 24 cmp r4, 0 - beq _081B2CBA + beq @081B2CBA cmp r4, 0x20 - beq _081B2C24 + beq @081B2C24 cmp r4, 0x1D - bne _081B2C38 -_081B2C24: + bne @081B2C38 +@081B2C24: movs r0, 0xB adds r1, r5, 0 muls r1, r0 @@ -840321,17 +840321,17 @@ _081B2C24: mov r0, r9 bl sub_8008C44 cmp r0, 0 - beq _081B2CBA -_081B2C38: + beq @081B2CBA +@081B2C38: mov r0, r8 cmp r0, 0 - beq _081B2C48 + beq @081B2C48 cmp r0, 0xFE - beq _081B2C88 - b _081B2CBA + beq @081B2C88 + b @081B2CBA .align 2, 0 .pool -_081B2C48: +@081B2C48: ldr r5, =0x08615ac3 ldrb r0, [r5] bl sub_81B2564 @@ -840352,10 +840352,10 @@ _081B2C48: adds r3, 0xC movs r2, 0x2 bl sub_81B2A3C - b _081B2CBA + b @081B2CBA .align 2, 0 .pool -_081B2C88: +@081B2C88: ldr r5, =0x08615ac5 ldrb r0, [r5] bl sub_81B2564 @@ -840376,7 +840376,7 @@ _081B2C88: adds r3, 0xC movs r2, 0x2 bl sub_81B2A3C -_081B2CBA: +@081B2CBA: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -840388,7 +840388,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} @@ -840401,9 +840401,9 @@ sub_81B2CD4: @ 81B2CD4 movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _081B2D2E + beq @081B2D2E cmp r4, 0 - beq _081B2D16 + beq @081B2D16 ldr r5, [r6] ldrb r0, [r6, 0x8] ldrb r1, [r5, 0x10] @@ -840420,10 +840420,10 @@ sub_81B2CD4: @ 81B2CD4 str r4, [sp, 0x4] ldr r4, [r5] bl _call_via_r4 -_081B2D16: +@081B2D16: mov r0, r8 cmp r0, 0x2 - beq _081B2D2E + beq @081B2D2E adds r0, r7, 0 movs r1, 0x39 bl pokemon_getattr @@ -840431,7 +840431,7 @@ _081B2D16: lsrs r0, 16 adds r1, r6, 0 bl sub_81B2D3C -_081B2D2E: +@081B2D2E: add sp, 0x8 pop {r3} mov r8, r3 @@ -840441,7 +840441,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 @@ -840471,7 +840471,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} @@ -840484,9 +840484,9 @@ sub_81B2D74: @ 81B2D74 movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _081B2DD0 + beq @081B2DD0 cmp r4, 0 - beq _081B2DB8 + beq @081B2DB8 ldr r5, [r6] ldrb r0, [r6, 0x8] ldrb r1, [r5, 0x14] @@ -840504,10 +840504,10 @@ sub_81B2D74: @ 81B2D74 str r4, [sp, 0x4] ldr r4, [r5] bl _call_via_r4 -_081B2DB8: +@081B2DB8: mov r0, r8 cmp r0, 0x2 - beq _081B2DD0 + beq @081B2DD0 adds r0, r7, 0 movs r1, 0x3A bl pokemon_getattr @@ -840515,7 +840515,7 @@ _081B2DB8: lsrs r0, 16 adds r1, r6, 0 bl sub_81B2DDC -_081B2DD0: +@081B2DD0: add sp, 0x8 pop {r3} mov r8, r3 @@ -840525,7 +840525,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 @@ -840558,14 +840558,14 @@ 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 movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _081B2E5C + beq @081B2E5C adds r0, r5, 0 movs r1, 0x39 bl pokemon_getattr @@ -840581,14 +840581,14 @@ sub_81B2E28: @ 81B2E28 adds r0, r4, 0 adds r2, r6, 0 bl sub_81B2E64 -_081B2E5C: +@081B2E5C: pop {r4-r6} pop {r0} bx r0 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 @@ -840616,18 +840616,18 @@ sub_81B2E64: @ 81B2E64 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - beq _081B2EB0 + beq @081B2EB0 cmp r0, 0x2 - blt _081B2EE0 + blt @081B2EE0 cmp r0, 0x4 - bgt _081B2EE0 + bgt @081B2EE0 ldr r5, =0x08615ac7 - b _081B2EB2 + b @081B2EB2 .align 2, 0 .pool -_081B2EB0: +@081B2EB0: ldr r5, =0x08615ac9 -_081B2EB2: +@081B2EB2: ldrb r0, [r5] bl sub_81B2564 ldr r4, =0x08615ab8 @@ -840641,10 +840641,10 @@ _081B2EB2: adds r1, r7 movs r2, 0x2 bl gpu_pal_apply - b _081B2F04 + b @081B2F04 .align 2, 0 .pool -_081B2EE0: +@081B2EE0: ldr r5, =0x08615acb ldrb r0, [r5] bl sub_81B2564 @@ -840659,7 +840659,7 @@ _081B2EE0: adds r1, r7 movs r2, 0x2 bl gpu_pal_apply -_081B2F04: +@081B2F04: mov r1, r8 lsls r0, r1, 16 asrs r0, 16 @@ -840694,7 +840694,7 @@ _081B2F04: ldr r1, [r6] ldrb r0, [r1, 0x1A] cmp r5, r0 - beq _081B2F88 + beq @081B2F88 ldrb r0, [r6, 0x8] ldrb r2, [r1, 0x18] adds r2, r5 @@ -840721,7 +840721,7 @@ _081B2F04: str r4, [sp, 0x4] movs r1, 0x2 bl Window_FillPixelRect -_081B2F88: +@081B2F88: ldrb r0, [r6, 0x8] movs r1, 0x2 bl Window_CopyToVram @@ -840737,7 +840737,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} @@ -840749,7 +840749,7 @@ sub_81B2FA8: @ 81B2FA8 lsls r2, 24 lsrs r7, r2, 24 cmp r7, 0 - beq _081B2FF2 + beq @081B2FF2 ldr r5, [r6] ldrb r1, [r5, 0x1C] movs r4, 0x7 @@ -840774,9 +840774,9 @@ sub_81B2FA8: @ 81B2FA8 str r4, [sp, 0x4] ldr r4, [r5] bl _call_via_r4 -_081B2FF2: +@081B2FF2: cmp r7, 0x2 - beq _081B3018 + beq @081B3018 ldrb r0, [r6, 0x8] ldr r1, [r6] ldrb r2, [r1, 0x1C] @@ -840793,7 +840793,7 @@ _081B2FF2: str r1, [sp, 0x8] movs r1, 0x1 bl box_print -_081B3018: +@081B3018: add sp, 0xC pop {r3} mov r8, r3 @@ -840805,12 +840805,12 @@ _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] cmp r0, 0xFF - beq _081B304C + beq @081B304C movs r1, 0 bl sub_8198070 ldrb r0, [r4] @@ -840819,14 +840819,14 @@ sub_81B302C: @ 81B302C strb r0, [r4] movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram -_081B304C: +@081B304C: pop {r4} pop {r0} bx r0 thumb_func_end sub_81B302C thumb_func_start sub_81B3054 -sub_81B3054: @ 81B3054 +sub_81B3054: ; 81B3054 push {r4-r6,lr} sub sp, 0xC adds r6, r0, 0 @@ -840836,83 +840836,83 @@ sub_81B3054: @ 81B3054 adds r5, 0xD ldrb r0, [r4, 0xD] cmp r0, 0xFF - beq _081B306E + beq @081B306E adds r0, r5, 0 bl sub_81B302C -_081B306E: +@081B306E: cmp r6, 0x7F - beq _081B313C + beq @081B313C adds r0, r6, 0 subs r0, 0x15 cmp r0, 0x5 - bhi _081B30D4 + bhi @081B30D4 lsls r0, 2 - ldr r1, =_081B308C + ldr r1, =@081B308C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081B308C: - .4byte _081B30A4 - .4byte _081B30BC - .4byte _081B30BC - .4byte _081B30AC - .4byte _081B30B4 - .4byte _081B30C4 -_081B30A4: +@081B308C: + .4byte @081B30A4 + .4byte @081B30BC + .4byte @081B30BC + .4byte @081B30AC + .4byte @081B30B4 + .4byte @081B30C4 +@081B30A4: ldr r0, =0x08615928 - b _081B30C6 + b @081B30C6 .align 2, 0 .pool -_081B30AC: +@081B30AC: ldr r0, =0x08615930 - b _081B30C6 + b @081B30C6 .align 2, 0 .pool -_081B30B4: +@081B30B4: ldr r0, =0x08615938 - b _081B30C6 + b @081B30C6 .align 2, 0 .pool -_081B30BC: +@081B30BC: ldr r0, =0x08615940 - b _081B30C6 + b @081B30C6 .align 2, 0 .pool -_081B30C4: +@081B30C4: ldr r0, =0x08615948 -_081B30C6: +@081B30C6: bl Window_AddFromTemplate strb r0, [r5] - b _081B30DC + b @081B30DC .align 2, 0 .pool -_081B30D4: +@081B30D4: ldr r0, =0x08615920 bl Window_AddFromTemplate strb r0, [r4, 0xD] -_081B30DC: +@081B30DC: cmp r6, 0 - bne _081B3104 + bne @081B3104 ldr r0, =0x0203cec4 ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 31 cmp r0, 0 - beq _081B30F8 + beq @081B30F8 movs r6, 0x2 - b _081B3104 + b @081B3104 .align 2, 0 .pool -_081B30F8: +@081B30F8: bl sub_81B314C lsls r0, 24 cmp r0, 0 - bne _081B3104 + bne @081B3104 movs r6, 0x1 -_081B3104: +@081B3104: ldrb r0, [r5] movs r1, 0 movs r2, 0x4F @@ -840937,7 +840937,7 @@ _081B3104: bl Print movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram -_081B313C: +@081B313C: add sp, 0xC pop {r4-r6} pop {r0} @@ -840947,22 +840947,22 @@ _081B313C: thumb_func_end sub_81B3054 thumb_func_start sub_81B314C -sub_81B314C: @ 81B314C +sub_81B314C: ; 81B314C push {r4-r7,lr} ldr r7, =0x020244ec movs r6, 0 ldr r0, =0x0203cec8 ldrb r0, [r0, 0xB] cmp r0, 0x1 - bne _081B3168 -_081B315A: + bne @081B3168 +@081B315A: movs r0, 0x1 - b _081B31AA + b @081B31AA .align 2, 0 .pool -_081B3168: +@081B3168: movs r5, 0 -_081B316A: +@081B316A: movs r0, 0x64 muls r0, r5 adds r4, r7, r0 @@ -840970,38 +840970,38 @@ _081B316A: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _081B319A + beq @081B319A adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - bne _081B3194 + bne @081B3194 adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - beq _081B319A -_081B3194: + beq @081B319A +@081B3194: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -_081B319A: +@081B319A: cmp r6, 0x1 - bhi _081B315A + bhi @081B315A adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls _081B316A + bls @081B316A movs r0, 0 -_081B31AA: +@081B31AA: pop {r4-r7} pop {r1} bx r1 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 @@ -841010,17 +841010,17 @@ sub_81B31B0: @ 81B31B0 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - beq _081B320C + beq @081B320C cmp r4, 0x1 - bgt _081B31CC + bgt @081B31CC cmp r4, 0 - beq _081B31D2 - b _081B321C -_081B31CC: + beq @081B31D2 + b @081B321C +@081B31CC: cmp r4, 0x2 - beq _081B3214 - b _081B321C -_081B31D2: + beq @081B3214 + b @081B321C +@081B31D2: ldr r0, =0x0203cec4 ldr r1, [r0] ldrb r0, [r1, 0x17] @@ -841043,27 +841043,27 @@ _081B31D2: movs r1, 0x2 movs r2, 0x13 bl rbox_template_set - b _081B3226 + b @081B3226 .align 2, 0 .pool -_081B320C: +@081B320C: ldr r0, =0x08615950 - b _081B321E + b @081B321E .align 2, 0 .pool -_081B3214: +@081B3214: ldr r0, =0x08615958 - b _081B321E + b @081B321E .align 2, 0 .pool -_081B321C: +@081B321C: ldr r0, =0x08615960 -_081B321E: +@081B321E: ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp, 0x14] str r1, [sp, 0x18] -_081B3226: +@081B3226: add r0, sp, 0x14 bl Window_AddFromTemplate ldr r6, =0x0203cec4 @@ -841076,12 +841076,12 @@ _081B3226: movs r3, 0xD bl SetWindowBorderStyle cmp r4, 0x3 - bne _081B3250 + bne @081B3250 ldr r0, [r6] - b _081B32E2 + b @081B32E2 .align 2, 0 .pool -_081B3250: +@081B3250: movs r0, 0x1 movs r1, 0 bl GetMenuCursorDimensionByFont @@ -841098,10 +841098,10 @@ _081B3250: ldr r0, [r6] ldrb r0, [r0, 0x17] cmp r5, r0 - bcs _081B32CA + bcs @081B32CA adds r7, r6, 0 movs r6, 0 -_081B327A: +@081B327A: ldr r1, [r7] adds r0, r1, 0 adds r0, 0xF @@ -841109,9 +841109,9 @@ _081B327A: ldrb r0, [r4] movs r2, 0x3 cmp r0, 0x12 - bls _081B328C + bls @081B328C movs r2, 0x4 -_081B328C: +@081B328C: ldrb r0, [r1, 0xC] lsls r3, r5, 4 adds r3, 0x1 @@ -841141,8 +841141,8 @@ _081B328C: ldr r0, [r7] ldrb r0, [r0, 0x17] cmp r5, r0 - bcc _081B327A -_081B32CA: + bcc @081B327A +@081B32CA: ldr r4, =0x0203cec4 ldr r1, [r4] ldrb r0, [r1, 0xC] @@ -841153,7 +841153,7 @@ _081B32CA: movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram ldr r0, [r4] -_081B32E2: +@081B32E2: ldrb r0, [r0, 0xC] add sp, 0x1C pop {r3,r4} @@ -841167,7 +841167,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 @@ -841206,7 +841206,7 @@ sub_81B3300: @ 81B3300 thumb_func_end sub_81B3300 thumb_func_start sub_81B334C -sub_81B334C: @ 81B334C +sub_81B334C: ; 81B334C push {lr} ldr r0, =0x08615968 movs r1, 0x4F @@ -841220,7 +841220,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, =0x08615970 bl Window_AddFromTemplate @@ -841243,7 +841243,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] @@ -841260,17 +841260,17 @@ 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 lsls r2, 24 lsrs r2, 24 cmp r2, 0 - bne _081B33C8 + bne @081B33C8 bl sub_81B3414 - b _081B3400 -_081B33C8: + b @081B3400 +@081B33C8: ldr r4, =0x0203cec4 ldr r1, [r4] ldr r0, =0x08615d70 @@ -841281,11 +841281,11 @@ _081B33C8: ldr r0, [r4] ldrb r0, [r0, 0x17] cmp r3, r0 - bcs _081B3400 + bcs @081B3400 ldr r1, =0x08615d38 lsls r0, r2, 2 adds r2, r0, r1 -_081B33E4: +@081B33E4: ldr r1, [r4] adds r1, 0xF adds r1, r3 @@ -841299,8 +841299,8 @@ _081B33E4: ldr r0, [r4] ldrb r0, [r0, 0x17] cmp r3, r0 - bcc _081B33E4 -_081B3400: + bcc @081B33E4 +@081B3400: pop {r4} pop {r0} bx r0 @@ -841309,7 +841309,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 @@ -841334,18 +841334,18 @@ sub_81B3414: @ 81B3414 ldr r0, =0x08615d7e ldrh r0, [r0] str r0, [sp] -_081B3446: +@081B3446: movs r4, 0 adds r0, r7, 0x1 mov r8, r0 ldr r1, [sp] cmp r1, 0xE - beq _081B34A0 + beq @081B34A0 movs r0, 0x64 mov r6, r10 muls r6, r0 ldr r5, =0x08615d7e -_081B345A: +@081B345A: mov r1, r9 adds r0, r1, r6 adds r1, r7, 0 @@ -841355,7 +841355,7 @@ _081B345A: adds r1, r5 ldrh r1, [r1] cmp r0, r1 - bne _081B3490 + bne @081B3490 ldr r0, =0x0203cec4 ldr r1, [r0] adds r0, r1, 0 @@ -841366,10 +841366,10 @@ _081B345A: lsls r2, 24 lsrs r2, 24 bl append_byte - b _081B34A0 + b @081B34A0 .align 2, 0 .pool -_081B3490: +@081B3490: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -841377,23 +841377,23 @@ _081B3490: adds r0, r5 ldrh r0, [r0] cmp r0, 0xE - bne _081B345A -_081B34A0: + bne @081B345A +@081B34A0: mov r1, r8 lsls r0, r1, 24 lsrs r7, r0, 24 cmp r7, 0x3 - bls _081B3446 + bls @081B3446 bl sub_81A80A8 lsls r0, 24 cmp r0, 0 - bne _081B3518 + bne @081B3518 mov r0, r9 adds r0, 0x64 movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _081B34D2 + beq @081B34D2 ldr r0, =0x0203cec4 ldr r1, [r0] adds r0, r1, 0 @@ -841401,7 +841401,7 @@ _081B34A0: adds r1, 0x17 movs r2, 0x1 bl append_byte -_081B34D2: +@081B34D2: movs r0, 0x64 mov r1, r10 muls r1, r0 @@ -841414,7 +841414,7 @@ _081B34D2: bl itemid_is_mail lsls r0, 24 cmp r0, 0 - beq _081B3508 + beq @081B3508 ldr r0, =0x0203cec4 ldr r1, [r0] adds r0, r1, 0 @@ -841422,10 +841422,10 @@ _081B34D2: adds r1, 0x17 movs r2, 0x6 bl append_byte - b _081B3518 + b @081B3518 .align 2, 0 .pool -_081B3508: +@081B3508: ldr r0, =0x0203cec4 ldr r1, [r0] adds r0, r1, 0 @@ -841433,7 +841433,7 @@ _081B3508: adds r1, 0x17 movs r2, 0x3 bl append_byte -_081B3518: +@081B3518: ldr r0, =0x0203cec4 ldr r1, [r0] adds r0, r1, 0 @@ -841454,7 +841454,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 @@ -841463,91 +841463,91 @@ sub_81B353C: @ 81B353C lsrs r0, 28 adds r2, r1, 0 cmp r0, 0xC - bhi _081B35FE + bhi @081B35FE lsls r0, 2 - ldr r1, =_081B3560 + ldr r1, =@081B3560 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081B3560: - .4byte _081B3594 - .4byte _081B35B0 - .4byte _081B35FE - .4byte _081B35FE - .4byte _081B35BC - .4byte _081B35FE - .4byte _081B35DC - .4byte _081B35FE - .4byte _081B35EE - .4byte _081B35F2 - .4byte _081B35F6 - .4byte _081B35FE - .4byte _081B35FA -_081B3594: +@081B3560: + .4byte @081B3594 + .4byte @081B35B0 + .4byte @081B35FE + .4byte @081B35FE + .4byte @081B35BC + .4byte @081B35FE + .4byte @081B35DC + .4byte @081B35FE + .4byte @081B35EE + .4byte @081B35F2 + .4byte @081B35F6 + .4byte @081B35FE + .4byte @081B35FA +@081B3594: bl sub_813994C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B35AC + beq @081B35AC adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - beq _081B35FE -_081B35AC: + beq @081B35FE +@081B35AC: movs r1, 0x1 - b _081B3600 -_081B35B0: + b @081B3600 +@081B35B0: adds r0, r4, 0 bl sub_81B8A2C lsls r0, 24 lsrs r1, r0, 24 - b _081B3600 -_081B35BC: + b @081B3600 +@081B35BC: movs r0, 0x9 ldrsb r0, [r2, r0] bl sub_81B856C lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _081B35D4 + beq @081B35D4 cmp r0, 0x1 - beq _081B35D8 + beq @081B35D8 movs r1, 0x7 - b _081B3600 -_081B35D4: + b @081B3600 +@081B35D4: movs r1, 0x4 - b _081B3600 -_081B35D8: + b @081B3600 +@081B35D8: movs r1, 0x5 - b _081B3600 -_081B35DC: + b @081B3600 +@081B35DC: adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr movs r1, 0x6 cmp r0, 0 - beq _081B3600 + beq @081B3600 movs r1, 0x7 - b _081B3600 -_081B35EE: + b @081B3600 +@081B35EE: movs r1, 0xA - b _081B3600 -_081B35F2: + b @081B3600 +@081B35F2: movs r1, 0xB - b _081B3600 -_081B35F6: + b @081B3600 +@081B35F6: movs r1, 0xC - b _081B3600 -_081B35FA: + b @081B3600 +@081B35FA: movs r1, 0xD - b _081B3600 -_081B35FE: + b @081B3600 +@081B35FE: movs r1, 0 -_081B3600: +@081B3600: adds r0, r1, 0 pop {r4} pop {r1} @@ -841555,7 +841555,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} @@ -841580,7 +841580,7 @@ sub_81B3608: @ 81B3608 movs r0, 0xF ands r0, r1 cmp r0, 0xC - beq _081B3674 + beq @081B3674 ldrb r4, [r4, 0x9] adds r0, r5, 0 bl sub_81B353C @@ -841594,17 +841594,17 @@ sub_81B3608: @ 81B3608 bl sub_81B31B0 movs r0, 0x15 bl sub_81B3054 - b _081B36EA + b @081B36EA .align 2, 0 .pool -_081B3674: +@081B3674: adds r0, r5, 0 movs r1, 0xC bl pokemon_getattr lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0 - bne _081B36C0 + bne @081B36C0 ldr r4, =0x02021fc4 ldr r1, =0x085e9980 adds r0, r4, 0 @@ -841623,10 +841623,10 @@ _081B3674: ldr r1, =sub_81B469C + 1 str r1, [r0] movs r0, 0 - b _081B36EC + b @081B36EC .align 2, 0 .pool -_081B36C0: +@081B36C0: ldrb r4, [r4, 0x9] adds r0, r5, 0 bl sub_81B353C @@ -841643,9 +841643,9 @@ _081B36C0: bl itemid_get_name movs r0, 0x1A bl sub_81B3054 -_081B36EA: +@081B36EA: movs r0, 0x1 -_081B36EC: +@081B36EC: pop {r3} mov r8, r3 pop {r4-r7} @@ -841656,7 +841656,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 @@ -841664,7 +841664,7 @@ sub_81B36FC: @ 81B36FC bl sub_81B3608 lsls r0, 24 cmp r0, 0 - beq _081B3720 + beq @081B3720 ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -841674,7 +841674,7 @@ sub_81B36FC: @ 81B36FC strh r1, [r0, 0x8] ldr r1, =sub_81B3730 + 1 str r1, [r0] -_081B3720: +@081B3720: pop {r4} pop {r0} bx r0 @@ -841683,7 +841683,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 @@ -841692,12 +841692,12 @@ sub_81B3730: @ 81B3730 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081B37EE + bne @081B37EE bl sub_81221EC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B37EE + beq @081B37EE lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -841707,14 +841707,14 @@ sub_81B3730: @ 81B3730 ldr r0, [r0] ldrb r0, [r0, 0x17] cmp r0, 0x3 - bhi _081B3774 + bhi @081B3774 bl ProcessMenuInputNoWrapAround_other - b _081B3778 + b @081B3778 .align 2, 0 .pool -_081B3774: +@081B3774: bl ProcessMenuInput_other -_081B3778: +@081B3778: lsls r0, 24 lsrs r4, r0, 24 bl GetMenuCursorPos @@ -841726,10 +841726,10 @@ _081B3778: movs r0, 0x2 negs r0, r0 cmp r5, r0 - beq _081B37EE + beq @081B37EE adds r0, 0x1 cmp r5, r0 - bne _081B37CC + bne @081B37CC movs r0, 0x5 bl audio_play ldr r4, =0x0203cec4 @@ -841747,10 +841747,10 @@ _081B3778: ldr r1, [r0] adds r0, r6, 0 bl _call_via_r1 - b _081B37EE + b @081B37EE .align 2, 0 .pool -_081B37CC: +@081B37CC: ldr r4, =0x0203cec4 ldr r0, [r4] adds r0, 0xE @@ -841766,7 +841766,7 @@ _081B37CC: ldr r1, [r0] adds r0, r6, 0 bl _call_via_r1 -_081B37EE: +@081B37EE: pop {r4-r6} pop {r0} bx r0 @@ -841775,7 +841775,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 @@ -841796,7 +841796,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 @@ -841804,7 +841804,7 @@ sub_81B3828: @ 81B3828 movs r0, 0xF ands r0, r1 cmp r0, 0x1 - bne _081B3868 + bne @081B3868 bl pokemon_change_order ldr r1, =0x020244ec ldrb r2, [r4, 0x9] @@ -841817,10 +841817,10 @@ sub_81B3828: @ 81B3828 str r0, [sp] movs r0, 0x1 bl sub_81BF8EC - b _081B3880 + b @081B3880 .align 2, 0 .pool -_081B3868: +@081B3868: ldr r1, =0x020244ec ldrb r2, [r4, 0x9] ldr r0, =0x020244e9 @@ -841832,7 +841832,7 @@ _081B3868: str r0, [sp] movs r0, 0 bl sub_81BF8EC -_081B3880: +@081B3880: add sp, 0x4 pop {r4} pop {r0} @@ -841842,7 +841842,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 @@ -841875,7 +841875,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 @@ -841914,7 +841914,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 @@ -841930,13 +841930,13 @@ sub_81B3938: @ 81B3938 movs r0, 0x9 ldrsb r0, [r3, r0] cmp r1, r0 - bne _081B3968 + bne @081B3968 adds r0, r7, 0 bl sub_81B407C - b _081B3ABA + b @081B3ABA .align 2, 0 .pool -_081B3968: +@081B3968: add r2, sp, 0x8 movs r0, 0x9 ldrsb r0, [r3, r0] @@ -841971,16 +841971,16 @@ _081B3968: movs r1, 0x4 ldrsh r0, [r6, r1] cmp r0, 0xA - bne _081B39C4 + bne @081B39C4 movs r2, 0x1 negs r2, r2 adds r0, r2, 0 - b _081B39C6 + b @081B39C6 .align 2, 0 .pool -_081B39C4: +@081B39C4: movs r0, 0x1 -_081B39C6: +@081B39C6: strh r0, [r6, 0x14] add r2, sp, 0x8 ldr r0, =0x0203cec8 @@ -842018,16 +842018,16 @@ _081B39C6: movs r1, 0xC ldrsh r0, [r6, r1] cmp r0, 0xA - bne _081B3A2C + bne @081B3A2C movs r2, 0x1 negs r2, r2 adds r0, r2, 0 - b _081B3A2E + b @081B3A2E .align 2, 0 .pool -_081B3A2C: +@081B3A2C: movs r0, 0x1 -_081B3A2E: +@081B3A2E: strh r0, [r6, 0x16] ldr r4, =0x0203cef0 movs r0, 0x4 @@ -842089,7 +842089,7 @@ _081B3A2E: adds r0, r1 ldr r1, =sub_81B3D48 + 1 str r1, [r0] -_081B3ABA: +@081B3ABA: add sp, 0xC pop {r4-r7} pop {r0} @@ -842099,7 +842099,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} @@ -842118,15 +842118,15 @@ sub_81B3AD8: @ 81B3AD8 asrs r0, 16 adds r4, r1, r0 cmp r4, 0 - blt _081B3B02 + blt @081B3B02 cmp r1, 0x1F - ble _081B3B06 -_081B3B02: + ble @081B3B06 +@081B3B02: movs r0, 0 - b _081B3B34 -_081B3B06: + b @081B3B34 +@081B3B06: cmp r1, 0 - bge _081B3B1A + bge @081B3B1A negs r0, r1 strb r0, [r6] movs r0, 0 @@ -842134,24 +842134,24 @@ _081B3B06: strb r0, [r1] adds r0, r2, r3 strb r0, [r7] - b _081B3B32 -_081B3B1A: + b @081B3B32 +@081B3B1A: movs r0, 0 strb r0, [r6] mov r0, r12 strb r5, [r0] cmp r4, 0x1F - ble _081B3B2E + ble @081B3B2E movs r0, 0x20 subs r0, r5 strb r0, [r7] - b _081B3B32 -_081B3B2E: + b @081B3B32 +@081B3B2E: mov r1, r8 strb r1, [r7] -_081B3B32: +@081B3B32: movs r0, 0x1 -_081B3B34: +@081B3B34: pop {r3} mov r8, r3 pop {r4-r7} @@ -842160,7 +842160,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 @@ -842198,7 +842198,7 @@ sub_81B3B40: @ 81B3B40 bl sub_81B3AD8 lsls r0, 24 cmp r0, 0 - beq _081B3BFA + beq @081B3BFA ldrb r2, [r5] mov r1, r9 lsls r0, r1, 24 @@ -842227,7 +842227,7 @@ sub_81B3B40: @ 81B3B40 bl sub_81B3AD8 lsls r0, 24 cmp r0, 0 - beq _081B3BFA + beq @081B3BFA add r0, sp, 0x24 ldrb r2, [r0] ldr r1, [sp, 0x2C] @@ -842250,7 +842250,7 @@ sub_81B3B40: @ 81B3B40 ldr r1, [sp, 0x28] movs r3, 0 bl bg_copy_tilemap_rect -_081B3BFA: +@081B3BFA: add sp, 0x34 pop {r3-r5} mov r8, r3 @@ -842262,7 +842262,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] @@ -842307,7 +842307,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 @@ -842319,7 +842319,7 @@ sub_81B3C60: @ 81B3C60 movs r1, 0x14 ldrsh r0, [r4, r1] cmp r0, 0 - beq _081B3C8E + beq @081B3C8E ldr r2, =0x0203cedc ldr r0, =0x0203cec8 movs r1, 0x9 @@ -842330,11 +842330,11 @@ sub_81B3C60: @ 81B3C60 movs r2, 0x14 ldrsh r1, [r4, r2] bl sub_81B3C0C -_081B3C8E: +@081B3C8E: movs r1, 0x16 ldrsh r0, [r4, r1] cmp r0, 0 - beq _081B3CAC + beq @081B3CAC ldr r2, =0x0203cedc ldr r0, =0x0203cec8 movs r1, 0xA @@ -842345,7 +842345,7 @@ _081B3C8E: movs r2, 0x16 ldrsh r1, [r4, r2] bl sub_81B3C0C -_081B3CAC: +@081B3CAC: pop {r4} pop {r0} bx r0 @@ -842354,7 +842354,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 @@ -842367,7 +842367,7 @@ sub_81B3CC0: @ 81B3CC0 movs r1, 0x14 ldrsh r0, [r5, r1] cmp r0, 0 - beq _081B3D00 + beq @081B3D00 ldr r0, =0x0203cef0 ldr r0, [r0] ldrh r1, [r5, 0x10] @@ -842386,11 +842386,11 @@ sub_81B3CC0: @ 81B3CC0 ldrsh r4, [r5, r6] str r4, [sp, 0x4] bl sub_81B3B40 -_081B3D00: +@081B3D00: movs r1, 0x16 ldrsh r0, [r5, r1] cmp r0, 0 - beq _081B3D2E + beq @081B3D2E ldr r0, =0x0203cef4 ldr r0, [r0] ldrh r1, [r5, 0x12] @@ -842409,7 +842409,7 @@ _081B3D00: ldrsh r4, [r5, r6] str r4, [sp, 0x4] bl sub_81B3B40 -_081B3D2E: +@081B3D2E: movs r0, 0 bl schedule_bg_copy_tilemap_to_vram add sp, 0x8 @@ -842421,7 +842421,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} @@ -842459,11 +842459,11 @@ sub_81B3D48: @ 81B3D48 adds r0, r1, 0 ldrh r0, [r0] cmp r0, 0x21 - bls _081B3E3A + bls @081B3E3A lsls r0, r2, 16 lsrs r0, 16 cmp r0, 0x21 - bls _081B3E3A + bls @081B3E3A movs r1, 0x14 ldrsh r0, [r6, r1] negs r0, r0 @@ -842532,7 +842532,7 @@ sub_81B3D48: @ 81B3D48 adds r0, r7, r0 ldr r1, =sub_81B3E60 + 1 str r1, [r0] -_081B3E3A: +@081B3E3A: add sp, 0xC pop {r3} mov r8, r3 @@ -842544,7 +842544,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 @@ -842560,11 +842560,11 @@ sub_81B3E60: @ 81B3E60 movs r1, 0x14 ldrsh r0, [r4, r1] cmp r0, 0 - bne _081B3EE4 + bne @081B3EE4 movs r2, 0x16 ldrsh r0, [r4, r2] cmp r0, 0 - bne _081B3EE4 + bne @081B3EE4 ldr r5, =0x0203cec8 movs r0, 0x9 ldrsb r0, [r5, r0] @@ -842591,10 +842591,10 @@ sub_81B3E60: @ 81B3E60 bl free adds r0, r6, 0 bl sub_81B407C - b _081B3F08 + b @081B3F08 .align 2, 0 .pool -_081B3EE4: +@081B3EE4: ldrh r1, [r4, 0x14] ldrh r0, [r4, 0x10] adds r1, r0 @@ -842606,22 +842606,22 @@ _081B3EE4: lsls r1, 16 asrs r1, 16 cmp r1, 0 - bne _081B3EFE + bne @081B3EFE strh r1, [r4, 0x14] -_081B3EFE: +@081B3EFE: movs r1, 0x12 ldrsh r0, [r4, r1] cmp r0, 0 - bne _081B3F08 + bne @081B3F08 strh r0, [r4, 0x16] -_081B3F08: +@081B3F08: pop {r4-r6} pop {r0} bx r0 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 @@ -842726,7 +842726,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 @@ -842796,7 +842796,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 @@ -842833,7 +842833,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 @@ -842851,16 +842851,16 @@ brm_cancel_1: @ 81B40D4 movs r0, 0xF ands r0, r1 cmp r0, 0x6 - bne _081B4110 + bne @081B4110 movs r0, 0xF bl sub_81B3054 - b _081B4116 + b @081B4116 .align 2, 0 .pool -_081B4110: +@081B4110: movs r0, 0 bl sub_81B3054 -_081B4116: +@081B4116: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -842876,7 +842876,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 @@ -842916,7 +842916,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 @@ -842937,24 +842937,24 @@ sub_81B4198: @ 81B4198 thumb_func_end sub_81B4198 thumb_func_start sub_81B41C4 -sub_81B41C4: @ 81B41C4 +sub_81B41C4: ; 81B41C4 push {lr} bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _081B41E0 + bne @081B41E0 ldr r2, =c2_8123744 + 1 movs r0, 0x2 movs r1, 0x5 bl sub_81AAC90 - b _081B41E8 + b @081B41E8 .align 2, 0 .pool -_081B41E0: +@081B41E0: ldr r1, =c2_8123744 + 1 movs r0, 0x2 bl sub_81C4F98 -_081B41E8: +@081B41E8: pop {r0} bx r0 .align 2, 0 @@ -842962,7 +842962,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} @@ -842970,7 +842970,7 @@ c2_8123744: @ 81B41F0 ldr r6, =0x0203ce7c ldrh r0, [r6] cmp r0, 0 - bne _081B4224 + bne @081B4224 ldr r3, =0x0203cec8 ldrb r0, [r3, 0x8] lsls r0, 28 @@ -842981,10 +842981,10 @@ c2_8123744: @ 81B41F0 ldr r1, =sub_81B36FC + 1 str r1, [sp, 0x4] ldr r1, [r3] - b _081B425A + b @081B425A .align 2, 0 .pool -_081B4224: +@081B4224: ldr r4, =0x0203cefc ldr r5, =0x0203cec8 movs r0, 0x9 @@ -843001,7 +843001,7 @@ _081B4224: strh r0, [r4] lsls r0, 16 cmp r0, 0 - beq _081B4278 + beq @081B4278 ldrb r0, [r5, 0x8] lsls r0, 28 lsrs r0, 28 @@ -843011,20 +843011,20 @@ _081B4224: ldr r1, =sub_81B4350 + 1 str r1, [sp, 0x4] ldr r1, [r5] -_081B425A: +@081B425A: str r1, [sp, 0x8] movs r1, 0xFF movs r3, 0x1 bl sub_81B0038 - b _081B42C0 + b @081B42C0 .align 2, 0 .pool -_081B4278: +@081B4278: ldrh r0, [r6] bl itemid_is_mail lsls r0, 24 cmp r0, 0 - beq _081B42A4 + beq @081B42A4 ldrh r0, [r6] movs r1, 0x1 bl sub_80D6AA4 @@ -843037,8 +843037,8 @@ _081B4278: ldrh r1, [r6] bl sub_81B1DB8 bl sub_81B452C - b _081B42C0 -_081B42A4: + b @081B42C0 +@081B42A4: ldrb r0, [r5, 0x8] lsls r0, 28 lsrs r0, 28 @@ -843052,7 +843052,7 @@ _081B42A4: movs r1, 0xFF movs r3, 0x1 bl sub_81B0038 -_081B42C0: +@081B42C0: add sp, 0xC pop {r3} mov r8, r3 @@ -843064,7 +843064,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} @@ -843075,7 +843075,7 @@ sub_81B42D0: @ 81B42D0 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081B432C + bne @081B432C ldr r0, =0x0203ce7c ldrh r4, [r0] ldr r0, =0x0203cec8 @@ -843108,7 +843108,7 @@ sub_81B42D0: @ 81B42D0 adds r0, r1 ldr r1, =sub_81B469C + 1 str r1, [r0] -_081B432C: +@081B432C: pop {r3} mov r8, r3 pop {r4-r7} @@ -843119,7 +843119,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 @@ -843128,7 +843128,7 @@ sub_81B4350: @ 81B4350 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081B4388 + bne @081B4388 ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] @@ -843147,7 +843147,7 @@ sub_81B4350: @ 81B4350 adds r0, r1 ldr r1, =sub_81B43A8 + 1 str r1, [r0] -_081B4388: +@081B4388: pop {r4} pop {r0} bx r0 @@ -843156,7 +843156,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 @@ -843164,7 +843164,7 @@ sub_81B43A8: @ 81B43A8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B43CC + beq @081B43CC bl sub_81B334C ldr r0, =0x03005e00 lsls r1, r4, 2 @@ -843173,7 +843173,7 @@ sub_81B43A8: @ 81B43A8 adds r1, r0 ldr r0, =sub_81B43DC + 1 str r0, [r1] -_081B43CC: +@081B43CC: pop {r4} pop {r0} bx r0 @@ -843182,7 +843182,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 @@ -843190,19 +843190,19 @@ sub_81B43DC: @ 81B43DC lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _081B4402 + beq @081B4402 cmp r1, 0 - bgt _081B43FC + bgt @081B43FC movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _081B44D8 - b _081B44EC -_081B43FC: + beq @081B44D8 + b @081B44EC +@081B43FC: cmp r1, 0x1 - beq _081B44DE - b _081B44EC -_081B4402: + beq @081B44DE + b @081B44EC +@081B4402: ldr r5, =0x0203ce7c ldrh r0, [r5] movs r1, 0x1 @@ -843213,7 +843213,7 @@ _081B4402: bl bag_add_item lsls r0, 24 cmp r0, 0 - bne _081B4458 + bne @081B4458 ldrh r0, [r5] movs r1, 0x1 bl bag_add_item @@ -843229,15 +843229,15 @@ _081B4402: adds r0, r1 ldr r1, =sub_81B1C1C + 1 str r1, [r0] - b _081B44EC + b @081B44EC .align 2, 0 .pool -_081B4458: +@081B4458: ldrh r0, [r5] bl itemid_is_mail lsls r0, 24 cmp r0, 0 - beq _081B4498 + beq @081B4498 ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] @@ -843254,10 +843254,10 @@ _081B4458: adds r0, r1 ldr r1, =sub_81B44FC + 1 str r1, [r0] - b _081B44EC + b @081B44EC .align 2, 0 .pool -_081B4498: +@081B4498: ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] @@ -843278,13 +843278,13 @@ _081B4498: adds r0, r1 ldr r1, =sub_81B469C + 1 str r1, [r0] - b _081B44EC + b @081B44EC .align 2, 0 .pool -_081B44D8: +@081B44D8: movs r0, 0x5 bl audio_play -_081B44DE: +@081B44DE: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -843292,7 +843292,7 @@ _081B44DE: adds r1, r0 ldr r0, =sub_81B1C1C + 1 str r0, [r1] -_081B44EC: +@081B44EC: pop {r4-r6} pop {r0} bx r0 @@ -843301,7 +843301,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 @@ -843309,14 +843309,14 @@ sub_81B44FC: @ 81B44FC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B451C + beq @081B451C ldr r0, =0x0203cec4 ldr r1, [r0] ldr r0, =sub_81B452C + 1 str r0, [r1, 0x4] adds r0, r4, 0 bl sub_81B12C0 -_081B451C: +@081B451C: pop {r4} pop {r0} bx r0 @@ -843325,7 +843325,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 @@ -843357,7 +843357,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} @@ -843378,7 +843378,7 @@ sub_81B4578: @ 81B4578 ldr r0, =0x020375f0 ldrh r7, [r0] cmp r7, 0 - bne _081B45F8 + bne @081B45F8 adds r0, r5, 0 bl sub_80D4680 ldr r4, =0x0203cefc @@ -843404,10 +843404,10 @@ sub_81B4578: @ 81B4578 movs r1, 0xFF movs r3, 0x1 bl sub_81B0038 - b _081B4614 + b @081B4614 .align 2, 0 .pool -_081B45F8: +@081B45F8: ldrb r0, [r6, 0x8] lsls r0, 28 lsrs r0, 28 @@ -843421,7 +843421,7 @@ _081B45F8: movs r1, 0xFF movs r3, 0x1 bl sub_81B0038 -_081B4614: +@081B4614: add sp, 0xC pop {r3} mov r8, r3 @@ -843433,7 +843433,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 @@ -843442,11 +843442,11 @@ sub_81B4624: @ 81B4624 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081B468A + bne @081B468A ldr r1, =0x0203cefc ldrh r0, [r1] cmp r0, 0 - bne _081B4670 + bne @081B4670 ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] @@ -843459,16 +843459,16 @@ sub_81B4624: @ 81B4624 movs r2, 0 movs r3, 0 bl sub_81B1C84 - b _081B467C + b @081B467C .align 2, 0 .pool -_081B4670: +@081B4670: ldr r0, =0x0203ce7c ldrh r0, [r0] ldrh r1, [r1] movs r2, 0 bl sub_81B1D68 -_081B467C: +@081B467C: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -843476,7 +843476,7 @@ _081B467C: adds r1, r0 ldr r0, =sub_81B469C + 1 str r0, [r1] -_081B468A: +@081B468A: pop {r4} pop {r0} bx r0 @@ -843485,7 +843485,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 @@ -843500,7 +843500,7 @@ sub_81B469C: @ 81B469C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B471C + beq @081B471C ldr r5, =0x0203cedc movs r0, 0x9 ldrsb r0, [r4, r0] @@ -843513,12 +843513,12 @@ sub_81B469C: @ 81B469C movs r0, 0xF ands r0, r1 cmp r0, 0xC - bne _081B4716 + bne @081B4716 adds r0, r6, 0 movs r1, 0xC bl pokemon_getattr cmp r0, 0 - beq _081B4704 + beq @081B4704 movs r0, 0x9 ldrsb r0, [r4, r0] lsls r0, 4 @@ -843527,10 +843527,10 @@ sub_81B469C: @ 81B469C movs r0, 0xB movs r2, 0x1 bl sub_81B2FA8 - b _081B4716 + b @081B4716 .align 2, 0 .pool -_081B4704: +@081B4704: movs r0, 0x9 ldrsb r0, [r4, r0] lsls r0, 4 @@ -843539,17 +843539,17 @@ _081B4704: movs r0, 0xC movs r2, 0x1 bl sub_81B2FA8 -_081B4716: +@081B4716: adds r0, r7, 0 bl sub_81B1C1C -_081B471C: +@081B471C: pop {r4-r7} pop {r0} bx r0 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 @@ -843579,17 +843579,17 @@ sub_81B4724: @ 81B4724 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _081B4788 + beq @081B4788 cmp r0, 0x1 - beq _081B47AC + beq @081B47AC adds r0, r5, 0 adds r1, r6, 0 movs r2, 0x1 bl sub_81B1CD0 - b _081B47BA + b @081B47BA .align 2, 0 .pool -_081B4788: +@081B4788: ldr r1, =0x02021cc4 adds r0, r5, 0 bl sub_81B1B44 @@ -843598,17 +843598,17 @@ _081B4788: adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 - b _081B47B4 + b @081B47B4 .align 2, 0 .pool -_081B47AC: +@081B47AC: adds r0, r6, 0 bl pokemon_item_not_removed ldr r0, =0x02021fc4 -_081B47B4: +@081B47B4: movs r1, 0x1 bl sub_81B1B5C -_081B47BA: +@081B47BA: movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram ldr r0, =0x03005e00 @@ -843626,7 +843626,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 @@ -843652,7 +843652,7 @@ sub_81B47E0: @ 81B47E0 adds r0, 0xD bl sub_81B302C cmp r5, 0 - bne _081B4864 + bne @081B4864 ldr r1, =0x02021cc4 adds r0, r7, 0 bl sub_81B1B44 @@ -843669,10 +843669,10 @@ sub_81B47E0: @ 81B47E0 lsls r0, 3 adds r0, r1 ldr r1, =sub_81B469C + 1 - b _081B488A + b @081B488A .align 2, 0 .pool -_081B4864: +@081B4864: ldr r1, =0x02021cc4 adds r0, r5, 0 bl itemid_get_name @@ -843689,7 +843689,7 @@ _081B4864: lsls r0, 3 adds r0, r1 ldr r1, =sub_81B48A8 + 1 -_081B488A: +@081B488A: str r1, [r0] pop {r4-r7} pop {r0} @@ -843699,7 +843699,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 @@ -843707,7 +843707,7 @@ sub_81B48A8: @ 81B48A8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B48CC + beq @081B48CC bl sub_81B334C ldr r0, =0x03005e00 lsls r1, r4, 2 @@ -843716,7 +843716,7 @@ sub_81B48A8: @ 81B48A8 adds r1, r0 ldr r0, =sub_81B48DC + 1 str r0, [r1] -_081B48CC: +@081B48CC: pop {r4} pop {r0} bx r0 @@ -843725,7 +843725,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 @@ -843740,21 +843740,21 @@ sub_81B48DC: @ 81B48DC lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _081B491A + beq @081B491A cmp r1, 0 - bgt _081B4914 + bgt @081B4914 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _081B4964 - b _081B4978 + beq @081B4964 + b @081B4978 .align 2, 0 .pool -_081B4914: +@081B4914: cmp r1, 0x1 - beq _081B496A - b _081B4978 -_081B491A: + beq @081B496A + b @081B4978 +@081B491A: adds r0, r4, 0 movs r1, 0xC bl pokemon_getattr @@ -843776,13 +843776,13 @@ _081B491A: adds r0, r1 ldr r1, =sub_81B4988 + 1 str r1, [r0] - b _081B4978 + b @081B4978 .align 2, 0 .pool -_081B4964: +@081B4964: movs r0, 0x5 bl audio_play -_081B496A: +@081B496A: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -843790,7 +843790,7 @@ _081B496A: adds r1, r0 ldr r0, =sub_81B1C1C + 1 str r0, [r1] -_081B4978: +@081B4978: pop {r4,r5} pop {r0} bx r0 @@ -843799,7 +843799,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 @@ -843815,7 +843815,7 @@ sub_81B4988: @ 81B4988 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B49EC + beq @081B49EC movs r1, 0 mov r0, sp strh r1, [r0] @@ -843846,7 +843846,7 @@ sub_81B4988: @ 81B4988 adds r0, r1 ldr r1, =sub_81B1C1C + 1 str r1, [r0] -_081B49EC: +@081B49EC: add sp, 0x4 pop {r4-r7} pop {r0} @@ -843856,7 +843856,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 @@ -843896,7 +843896,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 @@ -843917,7 +843917,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 @@ -843946,7 +843946,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 @@ -843976,7 +843976,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 @@ -844008,7 +844008,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 @@ -844016,7 +844016,7 @@ sub_81B4B6C: @ 81B4B6C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B4B90 + beq @081B4B90 bl sub_81B334C ldr r0, =0x03005e00 lsls r1, r4, 2 @@ -844025,7 +844025,7 @@ sub_81B4B6C: @ 81B4B6C adds r1, r0 ldr r0, =sub_81B4BA0 + 1 str r0, [r1] -_081B4B90: +@081B4B90: pop {r4} pop {r0} bx r0 @@ -844034,7 +844034,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 @@ -844042,19 +844042,19 @@ sub_81B4BA0: @ 81B4BA0 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _081B4BC6 + beq @081B4BC6 cmp r1, 0 - bgt _081B4BC0 + bgt @081B4BC0 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _081B4C30 - b _081B4C4C -_081B4BC0: + beq @081B4C30 + b @081B4C4C +@081B4BC0: cmp r1, 0x1 - beq _081B4C36 - b _081B4C4C -_081B4BC6: + beq @081B4C36 + b @081B4C4C +@081B4BC6: ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] @@ -844066,7 +844066,7 @@ _081B4BC6: lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _081B4C0C + beq @081B4C0C ldr r0, =0x085e9877 movs r1, 0 bl sub_81B1B5C @@ -844076,10 +844076,10 @@ _081B4BC6: lsls r0, 3 adds r0, r1 ldr r1, =sub_81B469C + 1 - b _081B4C4A + b @081B4C4A .align 2, 0 .pool -_081B4C0C: +@081B4C0C: ldr r0, =0x085e9897 movs r1, 0 bl sub_81B1B5C @@ -844089,13 +844089,13 @@ _081B4C0C: lsls r0, 3 adds r0, r1 ldr r1, =sub_81B1C1C + 1 - b _081B4C4A + b @081B4C4A .align 2, 0 .pool -_081B4C30: +@081B4C30: movs r0, 0x5 bl audio_play -_081B4C36: +@081B4C36: ldr r0, =0x085e98b4 movs r1, 0x1 bl sub_81B1B5C @@ -844105,9 +844105,9 @@ _081B4C36: lsls r0, 3 adds r0, r1 ldr r1, =sub_81B4C60 + 1 -_081B4C4A: +@081B4C4A: str r1, [r0] -_081B4C4C: +@081B4C4C: pop {r4} pop {r0} bx r0 @@ -844116,7 +844116,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 @@ -844124,7 +844124,7 @@ sub_81B4C60: @ 81B4C60 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B4C84 + beq @081B4C84 bl sub_81B334C ldr r0, =0x03005e00 lsls r1, r4, 2 @@ -844133,7 +844133,7 @@ sub_81B4C60: @ 81B4C60 adds r1, r0 ldr r0, =sub_81B4C94 + 1 str r0, [r1] -_081B4C84: +@081B4C84: pop {r4} pop {r0} bx r0 @@ -844142,7 +844142,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} @@ -844152,19 +844152,19 @@ sub_81B4C94: @ 81B4C94 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _081B4CBE + beq @081B4CBE cmp r1, 0 - bgt _081B4CB8 + bgt @081B4CB8 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _081B4D50 - b _081B4D64 -_081B4CB8: + beq @081B4D50 + b @081B4D64 +@081B4CB8: cmp r1, 0x1 - beq _081B4D56 - b _081B4D64 -_081B4CBE: + beq @081B4D56 + b @081B4D64 +@081B4CBE: ldr r0, =0x0203cec8 mov r8, r0 ldrb r0, [r0, 0x9] @@ -844184,7 +844184,7 @@ _081B4CBE: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081B4D24 + bne @081B4D24 mov r1, r8 movs r0, 0x9 ldrsb r0, [r1, r0] @@ -844201,10 +844201,10 @@ _081B4CBE: adds r0, r1 ldr r1, =sub_81B469C + 1 str r1, [r0] - b _081B4D64 + b @081B4D64 .align 2, 0 .pool -_081B4D24: +@081B4D24: adds r0, r4, 0 bl pokemon_item_not_removed ldr r0, =0x02021fc4 @@ -844217,13 +844217,13 @@ _081B4D24: adds r0, r1 ldr r1, =sub_81B1C1C + 1 str r1, [r0] - b _081B4D64 + b @081B4D64 .align 2, 0 .pool -_081B4D50: +@081B4D50: movs r0, 0x5 bl audio_play -_081B4D56: +@081B4D56: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -844231,7 +844231,7 @@ _081B4D56: adds r1, r0 ldr r0, =sub_81B1C1C + 1 str r0, [r1] -_081B4D64: +@081B4D64: pop {r3} mov r8, r3 pop {r4-r7} @@ -844242,7 +844242,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} @@ -844278,15 +844278,15 @@ sub_81B4D78: @ 81B4D78 movs r0, 0xF ands r0, r1 cmp r0, 0xC - beq _081B4DE4 + beq @081B4DE4 movs r0, 0 bl sub_81B31B0 movs r0, 0x15 bl sub_81B3054 - b _081B4E02 + b @081B4E02 .align 2, 0 .pool -_081B4DE4: +@081B4DE4: movs r0, 0x1 bl sub_81B31B0 adds r0, r7, 0 @@ -844298,7 +844298,7 @@ _081B4DE4: bl itemid_get_name movs r0, 0x1A bl sub_81B3054 -_081B4E02: +@081B4E02: ldr r1, =0x03005e00 mov r2, r8 lsls r0, r2, 2 @@ -844319,7 +844319,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 @@ -844333,13 +844333,13 @@ brm_shift_sendout: @ 81B4E2C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081B4E5C + bne @081B4E5C adds r0, r4, 0 bl sub_81B12C0 - b _081B4E7A + b @081B4E7A .align 2, 0 .pool -_081B4E5C: +@081B4E5C: ldr r0, [r5] adds r0, 0xD bl sub_81B302C @@ -844353,7 +844353,7 @@ _081B4E5C: adds r0, r1 ldr r1, =sub_81B1C1C + 1 str r1, [r0] -_081B4E7A: +@081B4E7A: pop {r4,r5} pop {r0} bx r0 @@ -844362,7 +844362,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} @@ -844381,7 +844381,7 @@ sub_81B4E8C: @ 81B4E8C lsrs r6, r0, 24 movs r5, 0 cmp r5, r6 - bcs _081B4F36 + bcs @081B4F36 ldr r2, =0x0203cec8 ldr r1, =0x03005e00 lsls r0, r7, 2 @@ -844389,12 +844389,12 @@ sub_81B4E8C: @ 81B4E8C lsls r0, 3 adds r0, r1 mov r8, r0 -_081B4EC6: +@081B4EC6: ldr r0, =0x0203cef8 adds r4, r5, r0 ldrb r0, [r4] cmp r0, 0 - bne _081B4F2C + bne @081B4F2C movs r0, 0x5 str r2, [sp] bl audio_play @@ -844416,24 +844416,24 @@ _081B4EC6: bl sub_81B2FA8 subs r0, r6, 0x1 cmp r5, r0 - bne _081B4F04 + bne @081B4F04 bl sub_81B4F88 -_081B4F04: +@081B4F04: movs r0, 0 bl sub_81B3054 ldr r0, =sub_81B1370 + 1 mov r1, r8 str r0, [r1] - b _081B4F68 + b @081B4F68 .align 2, 0 .pool -_081B4F2C: +@081B4F2C: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, r6 - bcc _081B4EC6 -_081B4F36: + bcc @081B4EC6 +@081B4F36: ldr r0, =0x02021cc4 adds r1, r6, 0 movs r2, 0 @@ -844455,7 +844455,7 @@ _081B4F36: adds r0, r1 ldr r1, =sub_81B1C1C + 1 str r1, [r0] -_081B4F68: +@081B4F68: add sp, 0x4 pop {r3} mov r8, r3 @@ -844467,7 +844467,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] @@ -844485,7 +844485,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} @@ -844506,25 +844506,25 @@ sub_81B4FA8: @ 81B4FA8 lsrs r5, r0, 24 movs r4, 0 cmp r4, r5 - bcs _081B502A + bcs @081B502A ldr r6, =0x0203cef8 subs r2, r5, 0x1 adds r7, r6, 0 ldr r3, =0x0203cec8 -_081B4FE2: +@081B4FE2: adds r0, r4, r6 ldrb r1, [r0] movs r0, 0x9 ldrsb r0, [r3, r0] adds r0, 0x1 cmp r1, r0 - bne _081B5020 + bne @081B5020 adds r0, r4, 0 adds r4, r2, 0 cmp r0, r4 - bge _081B500C + bge @081B500C adds r3, r7, 0 -_081B4FFA: +@081B4FFA: adds r2, r0, r3 adds r1, r0, 0x1 adds r0, r1, r3 @@ -844533,21 +844533,21 @@ _081B4FFA: lsls r1, 24 lsrs r0, r1, 24 cmp r0, r4 - blt _081B4FFA -_081B500C: + blt @081B4FFA +@081B500C: adds r1, r0, r6 movs r0, 0 strb r0, [r1] - b _081B502A + b @081B502A .align 2, 0 .pool -_081B5020: +@081B5020: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc _081B4FE2 -_081B502A: + bcc @081B4FE2 +@081B502A: ldr r6, =0x0203cedc ldr r0, =0x0203cec8 ldrb r0, [r0, 0x9] @@ -844564,13 +844564,13 @@ _081B502A: mov r0, r8 lsls r7, r0, 2 cmp r4, r5 - bge _081B5078 -_081B504E: + bge @081B5078 +@081B504E: ldr r0, =0x0203cef8 adds r1, r4, r0 ldrb r0, [r1] cmp r0, 0 - beq _081B506E + beq @081B506E adds r0, r4, 0x2 lsls r0, 24 lsrs r0, 24 @@ -844581,13 +844581,13 @@ _081B504E: adds r1, r2 movs r2, 0x1 bl sub_81B2FA8 -_081B506E: +@081B506E: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - blt _081B504E -_081B5078: + blt @081B504E +@081B5078: movs r0, 0 bl sub_81B3054 ldr r0, =0x03005e00 @@ -844607,7 +844607,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 @@ -844622,7 +844622,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 @@ -844677,28 +844677,28 @@ sub_81B50C8: @ 81B50C8 adds r3, r4, 0 bl sub_807A8D0 cmp r0, 0x1 - beq _081B515C + beq @081B515C cmp r0, 0x2 - beq _081B5170 + beq @081B5170 movs r0, 0x5 bl audio_play adds r0, r7, 0 bl sub_81B12C0 - b _081B51B0 + b @081B51B0 .align 2, 0 .pool -_081B515C: +@081B515C: ldr r0, =0x02021fc4 ldr r1, =0x085ea210 bl ExpandTextCodes - b _081B5178 + b @081B5178 .align 2, 0 .pool -_081B5170: +@081B5170: ldr r0, =0x02021fc4 ldr r1, =0x085ea234 bl ExpandTextCodes -_081B5178: +@081B5178: movs r0, 0x20 bl audio_play ldr r4, =0x0203cec4 @@ -844722,7 +844722,7 @@ _081B5178: adds r0, r1 ldr r1, =sub_81B1C1C + 1 str r1, [r0] -_081B51B0: +@081B51B0: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -844734,7 +844734,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 @@ -844792,7 +844792,7 @@ brm_trade_1: @ 81B51D4 mov r2, r9 bl sub_807A7E0 cmp r0, 0 - beq _081B52C8 + beq @081B52C8 ldr r5, =0x02021fc4 ldr r1, =0x08615e0c subs r0, 0x1 @@ -844823,15 +844823,15 @@ brm_trade_1: @ 81B51D4 adds r0, r1 ldr r1, =sub_81B1C1C + 1 str r1, [r0] - b _081B52D4 + b @081B52D4 .align 2, 0 .pool -_081B52C8: +@081B52C8: movs r0, 0x5 bl audio_play adds r0, r7, 0 bl sub_81B12C0 -_081B52D4: +@081B52D4: add sp, 0xC pop {r3,r4} mov r8, r3 @@ -844842,7 +844842,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 @@ -844862,40 +844862,40 @@ sub_81B52E4: @ 81B52E4 lsrs r1, 16 bl sub_807A918 cmp r0, 0x2 - beq _081B5340 + beq @081B5340 cmp r0, 0x2 - bgt _081B5328 + bgt @081B5328 cmp r0, 0x1 - beq _081B532E - b _081B5368 + beq @081B532E + b @081B5368 .align 2, 0 .pool -_081B5328: +@081B5328: cmp r0, 0x3 - beq _081B5354 - b _081B5368 -_081B532E: + beq @081B5354 + b @081B5368 +@081B532E: ldr r0, =0x02021fc4 ldr r1, =0x085ea1e8 bl ExpandTextCodes - b _081B53C0 + b @081B53C0 .align 2, 0 .pool -_081B5340: +@081B5340: ldr r0, =0x02021fc4 ldr r1, =0x085ea210 bl ExpandTextCodes - b _081B53C0 + b @081B53C0 .align 2, 0 .pool -_081B5354: +@081B5354: ldr r0, =0x02021fc4 ldr r1, =0x085ea234 bl ExpandTextCodes - b _081B53C0 + b @081B53C0 .align 2, 0 .pool -_081B5368: +@081B5368: movs r0, 0x5 bl audio_play ldr r0, =0x0203cec8 @@ -844920,10 +844920,10 @@ _081B5368: lsls r0, 3 adds r0, r1 ldr r1, =sub_81B53FC + 1 - b _081B53E4 + b @081B53E4 .align 2, 0 .pool -_081B53C0: +@081B53C0: movs r0, 0x20 bl audio_play ldr r4, =0x02021fc4 @@ -844939,7 +844939,7 @@ _081B53C0: lsls r0, 3 adds r0, r1 ldr r1, =sub_81B1C1C + 1 -_081B53E4: +@081B53E4: str r1, [r0] pop {r4,r5} pop {r0} @@ -844949,7 +844949,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 @@ -844957,7 +844957,7 @@ sub_81B53FC: @ 81B53FC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B5420 + beq @081B5420 bl sub_81B334C ldr r0, =0x03005e00 lsls r1, r4, 2 @@ -844966,7 +844966,7 @@ sub_81B53FC: @ 81B53FC adds r1, r0 ldr r0, =sub_81B5430 + 1 str r0, [r1] -_081B5420: +@081B5420: pop {r4} pop {r0} bx r0 @@ -844975,7 +844975,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 @@ -844983,36 +844983,36 @@ sub_81B5430: @ 81B5430 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _081B5456 + beq @081B5456 cmp r1, 0 - bgt _081B5450 + bgt @081B5450 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _081B545E - b _081B546A -_081B5450: + beq @081B545E + b @081B546A +@081B5450: cmp r1, 0x1 - beq _081B5464 - b _081B546A -_081B5456: + beq @081B5464 + b @081B546A +@081B5456: adds r0, r4, 0 bl sub_81B12C0 - b _081B546A -_081B545E: + b @081B546A +@081B545E: movs r0, 0x5 bl audio_play -_081B5464: +@081B5464: adds r0, r4, 0 bl sub_81B1C1C -_081B546A: +@081B546A: pop {r4} pop {r0} bx r0 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 @@ -845034,9 +845034,9 @@ sub_81B5470: @ 81B5470 adds r7, r0, r1 ldr r0, [r7] cmp r0, 0 - bne _081B54A2 - b _081B5664 -_081B54A2: + bne @081B54A2 + b @081B5664 +@081B54A2: ldr r0, [r5] adds r0, 0xC bl sub_81B302C @@ -845047,35 +845047,35 @@ _081B54A2: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B54C6 + beq @081B54C6 bl in_trade_center cmp r0, 0x1 - bne _081B54E8 -_081B54C6: + bne @081B54E8 +@081B54C6: adds r0, r4, 0 subs r0, 0xB lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _081B54E4 + bhi @081B54E4 movs r0, 0xD bl sub_81B3054 - b _081B5656 + b @081B5656 .align 2, 0 .pool -_081B54E4: +@081B54E4: ldrb r0, [r7, 0x4] - b _081B5652 -_081B54E8: + b @081B5652 +@081B54E8: cmp r4, 0x7 - bhi _081B5524 + bhi @081B5524 ldr r1, =0x00000867 adds r0, r4, r1 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B5524 + beq @081B5524 ldr r0, =0x085e97fc movs r1, 0x1 bl sub_81B1B5C @@ -845086,10 +845086,10 @@ _081B54E8: adds r0, r1 ldr r1, =sub_81B1C1C + 1 str r1, [r0] - b _081B5664 + b @081B5664 .align 2, 0 .pool -_081B5524: +@081B5524: ldr r1, =0x08615d9c lsls r0, r4, 3 adds r5, r0, r1 @@ -845098,34 +845098,34 @@ _081B5524: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B553A - b _081B563C -_081B553A: + beq @081B553A + b @081B563C +@081B553A: subs r0, r4, 0x5 cmp r0, 0x7 - bhi _081B5624 + bhi @081B5624 lsls r0, 2 - ldr r1, =_081B5554 + ldr r1, =@081B5554 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081B5554: - .4byte _081B5614 - .4byte _081B5624 - .4byte _081B5624 - .4byte _081B557C - .4byte _081B55B8 - .4byte _081B5624 - .4byte _081B5574 - .4byte _081B5574 -_081B5574: +@081B5554: + .4byte @081B5614 + .4byte @081B5624 + .4byte @081B5624 + .4byte @081B557C + .4byte @081B55B8 + .4byte @081B5624 + .4byte @081B5574 + .4byte @081B5574 +@081B5574: adds r0, r6, 0 bl sub_8161560 - b _081B5664 -_081B557C: + b @081B5664 +@081B557C: ldr r0, =0x03005d8c ldr r1, [r0] movs r0, 0x1C @@ -845144,10 +845144,10 @@ _081B557C: bl sub_81245DC ldr r0, =0x02021fc4 ldr r1, =0x085ea196 - b _081B55E8 + b @081B55E8 .align 2, 0 .pool -_081B55B8: +@081B55B8: ldr r0, =0x03005d8c ldr r1, [r0] adds r0, r1, 0 @@ -845170,7 +845170,7 @@ _081B55B8: bl sub_81245DC ldr r0, =0x02021fc4 ldr r1, =0x085ea16b -_081B55E8: +@081B55E8: bl ExpandTextCodes adds r0, r6, 0 bl sub_81B5674 @@ -845180,40 +845180,40 @@ _081B55E8: lsls r1, 2 adds r0, r1 strh r4, [r0] - b _081B5664 + b @081B5664 .align 2, 0 .pool -_081B5614: +@081B5614: ldr r1, =0x0203cec8 ldr r0, =sub_8124690 + 1 - b _081B5628 + b @081B5628 .align 2, 0 .pool -_081B5624: +@081B5624: ldr r1, =0x0203cec8 ldr r0, =c2_exit_to_overworld_2_switch + 1 -_081B5628: +@081B5628: str r0, [r1] adds r0, r6, 0 bl sub_81B12C0 - b _081B5664 + b @081B5664 .align 2, 0 .pool -_081B563C: +@081B563C: cmp r4, 0x1 - beq _081B564A + beq @081B564A cmp r4, 0x4 - bne _081B5650 + bne @081B5650 bl sub_81B5864 - b _081B5656 -_081B564A: + b @081B5656 +@081B564A: bl sub_81B57DC - b _081B5656 -_081B5650: + b @081B5656 +@081B5650: ldrb r0, [r5, 0x4] -_081B5652: +@081B5652: bl sub_81B3054 -_081B5656: +@081B5656: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -845221,7 +845221,7 @@ _081B5656: adds r1, r0 ldr r0, =task_brm_cancel_1_on_keypad_a_or_b + 1 str r0, [r1] -_081B5664: +@081B5664: pop {r4-r7} pop {r0} bx r0 @@ -845230,7 +845230,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 @@ -845253,7 +845253,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 @@ -845261,7 +845261,7 @@ sub_81B56A4: @ 81B56A4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B56C8 + beq @081B56C8 bl sub_81B334C ldr r0, =0x03005e00 lsls r1, r4, 2 @@ -845270,7 +845270,7 @@ sub_81B56A4: @ 81B56A4 adds r1, r0 ldr r0, =sub_81B56D8 + 1 str r0, [r1] -_081B56C8: +@081B56C8: pop {r4} pop {r0} bx r0 @@ -845279,7 +845279,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 @@ -845287,31 +845287,31 @@ sub_81B56D8: @ 81B56D8 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _081B56FE + beq @081B56FE cmp r1, 0 - bgt _081B56F8 + bgt @081B56F8 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _081B5714 - b _081B572A -_081B56F8: + beq @081B5714 + b @081B572A +@081B56F8: cmp r1, 0x1 - beq _081B571A - b _081B572A -_081B56FE: + beq @081B571A + b @081B572A +@081B56FE: ldr r1, =0x0203cec8 ldr r0, =c2_exit_to_overworld_2_switch + 1 str r0, [r1] adds r0, r4, 0 bl sub_81B12C0 - b _081B572A + b @081B572A .align 2, 0 .pool -_081B5714: +@081B5714: movs r0, 0x5 bl audio_play -_081B571A: +@081B571A: ldr r0, =0x03005db0 movs r1, 0 str r1, [r0] @@ -845319,7 +845319,7 @@ _081B571A: str r1, [r0] adds r0, r4, 0 bl sub_81B1C1C -_081B572A: +@081B572A: pop {r4} pop {r0} bx r0 @@ -845328,7 +845328,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 + 1 @@ -845342,7 +845342,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 @@ -845350,7 +845350,7 @@ task_launch_hm_phase_2: @ 81B5750 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081B577C + bne @081B577C bl brm_get_selected_species ldr r1, =0x02038c08 lsls r0, 16 @@ -845361,7 +845361,7 @@ task_launch_hm_phase_2: @ 81B5750 bl _call_via_r0 adds r0, r4, 0 bl remove_task -_081B577C: +@081B577C: pop {r4} pop {r0} bx r0 @@ -845370,7 +845370,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 @@ -845390,7 +845390,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 @@ -845399,15 +845399,15 @@ task_brm_cancel_1_on_keypad_a_or_b: @ 81B57B4 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _081B57CE + bne @081B57CE movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081B57D4 -_081B57CE: + beq @081B57D4 +@081B57CE: adds r0, r2, 0 bl brm_cancel_1 -_081B57D4: +@081B57D4: pop {r0} bx r0 .align 2, 0 @@ -845415,29 +845415,29 @@ _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 flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081B57F8 + bne @081B57F8 movs r0, 0xC bl sub_81B3054 - b _081B57FE + b @081B57FE .align 2, 0 .pool -_081B57F8: +@081B57F8: movs r0, 0xD bl sub_81B3054 -_081B57FE: +@081B57FE: pop {r0} bx r0 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 @@ -845453,18 +845453,18 @@ 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 party_has_pokemon_with_surf lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081B585C + bne @081B585C bl sub_808BE74 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081B585C + bne @081B585C ldr r1, =0x03005db0 ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] @@ -845472,37 +845472,37 @@ sub_81B5820: @ 81B5820 ldr r0, =hm_surf_run_dp02scr + 1 str r0, [r1] movs r0, 0x1 - b _081B585E + b @081B585E .align 2, 0 .pool -_081B585C: +@081B585C: movs r0, 0 -_081B585E: +@081B585E: pop {r1} bx r1 thumb_func_end sub_81B5820 thumb_func_start sub_81B5864 -sub_81B5864: @ 81B5864 +sub_81B5864: ; 81B5864 push {lr} movs r0, 0x8 bl walkrun_bitfield_and_r0 lsls r0, 24 cmp r0, 0 - beq _081B587A + beq @081B587A movs r0, 0x9 bl sub_81B3054 - b _081B5880 -_081B587A: + b @081B5880 +@081B587A: movs r0, 0x8 bl sub_81B3054 -_081B5880: +@081B5880: pop {r0} bx r0 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] @@ -845510,20 +845510,20 @@ sub_81B5884: @ 81B5884 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B58A0 + beq @081B58A0 movs r0, 0 - b _081B58A2 + b @081B58A2 .align 2, 0 .pool -_081B58A0: +@081B58A0: movs r0, 0x1 -_081B58A2: +@081B58A2: pop {r1} bx r1 thumb_func_end sub_81B5884 thumb_func_start sub_81B58A8 -sub_81B58A8: @ 81B58A8 +sub_81B58A8: ; 81B58A8 push {lr} sub sp, 0xC movs r0, 0 @@ -845545,7 +845545,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 @@ -845561,7 +845561,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 @@ -845581,12 +845581,12 @@ hm_prepare_waterfall: @ 81B58F0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081B594C + bne @081B594C bl sub_808BE50 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081B594C + bne @081B594C ldr r1, =0x03005db0 ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] @@ -845594,12 +845594,12 @@ hm_prepare_waterfall: @ 81B58F0 ldr r0, =hm2_waterfall + 1 str r0, [r1] movs r0, 0x1 - b _081B594E + b @081B594E .align 2, 0 .pool -_081B594C: +@081B594C: movs r0, 0 -_081B594E: +@081B594E: add sp, 0x4 pop {r4} pop {r1} @@ -845607,7 +845607,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 @@ -845623,7 +845623,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 @@ -845631,12 +845631,12 @@ sub_81B5974: @ 81B5974 lsrs r0, 24 str r0, [r1, 0x4] cmp r0, 0 - bne _081B5990 + bne @081B5990 movs r0, 0 - b _081B599E + b @081B599E .align 2, 0 .pool -_081B5990: +@081B5990: ldr r1, =0x03005db0 ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] @@ -845644,7 +845644,7 @@ _081B5990: ldr r0, =sub_81B5958 + 1 str r0, [r1] movs r0, 0x1 -_081B599E: +@081B599E: pop {r1} bx r1 .align 2, 0 @@ -845652,7 +845652,7 @@ _081B599E: thumb_func_end sub_81B5974 thumb_func_start sub_81B59B4 -sub_81B59B4: @ 81B59B4 +sub_81B59B4: ; 81B59B4 push {r4-r7,lr} sub sp, 0x4 adds r5, r0, 0 @@ -845663,7 +845663,7 @@ sub_81B59B4: @ 81B59B4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081B59EA + bne @081B59EA ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -845671,7 +845671,7 @@ sub_81B59B4: @ 81B59B4 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081B59EA + beq @081B59EA ldr r0, =0x08616020 adds r0, r4, r0 ldrb r1, [r0] @@ -845679,7 +845679,7 @@ sub_81B59B4: @ 81B59B4 negs r0, r1 orrs r0, r1 lsrs r6, r0, 31 -_081B59EA: +@081B59EA: adds r0, r5, 0 movs r1, 0x41 bl pokemon_getattr @@ -845707,7 +845707,7 @@ _081B59EA: thumb_func_end sub_81B59B4 thumb_func_start sub_81B5A2C -sub_81B5A2C: @ 81B5A2C +sub_81B5A2C: ; 81B5A2C push {r4-r7,lr} sub sp, 0xC adds r6, r1, 0 @@ -845717,7 +845717,7 @@ sub_81B5A2C: @ 81B5A2C lsls r3, 24 lsrs r7, r3, 24 cmp r5, 0 - beq _081B5A7A + beq @081B5A7A ldr r1, =sub_80D3014 + 1 ldr r0, [r4, 0x4] ldrb r2, [r0] @@ -845746,7 +845746,7 @@ sub_81B5A2C: @ 81B5A2C ands r0, r3 orrs r0, r2 strb r0, [r1, 0x5] -_081B5A7A: +@081B5A7A: add sp, 0xC pop {r4-r7} pop {r0} @@ -845756,7 +845756,7 @@ _081B5A7A: thumb_func_end sub_81B5A2C thumb_func_start sub_81B5A8C -sub_81B5A8C: @ 81B5A8C +sub_81B5A8C: ; 81B5A8C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -845770,17 +845770,17 @@ sub_81B5A8C: @ 81B5A8C lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - beq _081B5AEC + beq @081B5AEC cmp r0, 0x2 - bgt _081B5AB4 + bgt @081B5AB4 cmp r0, 0x1 - beq _081B5B04 - b _081B5B1C -_081B5AB4: + beq @081B5B04 + b @081B5B1C +@081B5AB4: cmp r0, 0x3 - beq _081B5AD4 + beq @081B5AD4 cmp r0, 0x4 - bne _081B5B1C + bne @081B5B1C lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -845788,10 +845788,10 @@ _081B5AB4: adds r0, r1 movs r1, 0 bl sub_80D32C8 - b _081B5B2C + b @081B5B2C .align 2, 0 .pool -_081B5AD4: +@081B5AD4: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -845799,10 +845799,10 @@ _081B5AD4: adds r0, r1 movs r1, 0x1 bl sub_80D32C8 - b _081B5B2C + b @081B5B2C .align 2, 0 .pool -_081B5AEC: +@081B5AEC: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -845810,10 +845810,10 @@ _081B5AEC: adds r0, r1 movs r1, 0x2 bl sub_80D32C8 - b _081B5B2C + b @081B5B2C .align 2, 0 .pool -_081B5B04: +@081B5B04: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -845821,10 +845821,10 @@ _081B5B04: adds r0, r1 movs r1, 0x3 bl sub_80D32C8 - b _081B5B2C + b @081B5B2C .align 2, 0 .pool -_081B5B1C: +@081B5B1C: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -845832,7 +845832,7 @@ _081B5B1C: adds r0, r1 movs r1, 0x4 bl sub_80D32C8 -_081B5B2C: +@081B5B2C: pop {r4} pop {r0} bx r0 @@ -845841,7 +845841,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 @@ -845868,7 +845868,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 @@ -845883,22 +845883,22 @@ sub_81B5B6C: @ 81B5B6C strh r3, [r2, 0x2E] mov r12, r5 cmp r1, 0 - bne _081B5BC4 + bne @081B5BC4 movs r1, 0x20 ldrsh r0, [r2, r1] cmp r0, 0x10 - bne _081B5BA4 + bne @081B5BA4 strh r3, [r2, 0x24] ldr r0, =0x0000fffc strh r0, [r2, 0x26] - b _081B5BAA + b @081B5BAA .align 2, 0 .pool -_081B5BA4: +@081B5BA4: ldr r0, =0x0000fffc strh r0, [r2, 0x24] strh r3, [r2, 0x26] -_081B5BAA: +@081B5BAA: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -845906,17 +845906,17 @@ _081B5BAA: adds r1, 0x1C adds r0, r1 ldr r1, =sub_81B5C08 + 1 - b _081B5BD0 + b @081B5BD0 .align 2, 0 .pool -_081B5BC4: +@081B5BC4: strh r3, [r2, 0x24] strh r3, [r2, 0x26] adds r0, r5, 0 adds r0, 0x1C adds r0, r6, r0 ldr r1, =sub_81B5BDC + 1 -_081B5BD0: +@081B5BD0: str r1, [r0] pop {r4-r7} pop {r0} @@ -845926,33 +845926,33 @@ _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 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _081B5C02 + beq @081B5C02 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _081B5C00 + beq @081B5C00 ldr r0, =0x0000fffd strh r0, [r4, 0x26] - b _081B5C02 + b @081B5C02 .align 2, 0 .pool -_081B5C00: +@081B5C00: strh r1, [r4, 0x26] -_081B5C02: +@081B5C02: pop {r4} pop {r0} bx r0 thumb_func_end sub_81B5BDC thumb_func_start sub_81B5C08 -sub_81B5C08: @ 81B5C08 +sub_81B5C08: ; 81B5C08 push {lr} bl sub_80D30DC pop {r0} @@ -845960,14 +845960,14 @@ sub_81B5C08: @ 81B5C08 thumb_func_end sub_81B5C08 thumb_func_start sub_81B5C14 -sub_81B5C14: @ 81B5C14 +sub_81B5C14: ; 81B5C14 push {r4,r5,lr} adds r5, r0, 0 adds r4, r1, 0 movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _081B5C3C + beq @081B5C3C ldr r0, =0x08615ec0 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x2] @@ -845978,7 +845978,7 @@ sub_81B5C14: @ 81B5C14 adds r0, r5, 0 adds r1, r4, 0 bl sub_81B5C94 -_081B5C3C: +@081B5C3C: pop {r4,r5} pop {r0} bx r0 @@ -845987,14 +845987,14 @@ _081B5C3C: thumb_func_end sub_81B5C14 thumb_func_start sub_81B5C48 -sub_81B5C48: @ 81B5C48 +sub_81B5C48: ; 81B5C48 push {r4,r5,lr} adds r4, r2, 0 lsls r0, 16 lsls r1, 16 lsrs r5, r1, 16 cmp r0, 0 - beq _081B5C84 + beq @081B5C84 ldr r0, =0x08615ec0 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x2] @@ -846016,7 +846016,7 @@ sub_81B5C48: @ 81B5C48 adds r0, r5, 0 adds r1, r4, 0 bl sub_81B5CB0 -_081B5C84: +@081B5C84: pop {r4,r5} pop {r0} bx r0 @@ -846025,7 +846025,7 @@ _081B5C84: thumb_func_end sub_81B5C48 thumb_func_start sub_81B5C94 -sub_81B5C94: @ 81B5C94 +sub_81B5C94: ; 81B5C94 push {r4,lr} adds r4, r1, 0 movs r1, 0xC @@ -846040,13 +846040,13 @@ 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 lsrs r0, 16 cmp r0, 0 - bne _081B5CD8 + bne @081B5CD8 ldr r2, =0x02020630 ldrb r1, [r4, 0xA] lsls r0, r1, 4 @@ -846057,14 +846057,14 @@ sub_81B5CB0: @ 81B5CB0 ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 - b _081B5D24 + b @081B5D24 .align 2, 0 .pool -_081B5CD8: +@081B5CD8: bl itemid_is_mail lsls r0, 24 cmp r0, 0 - beq _081B5CFC + beq @081B5CFC ldrb r1, [r4, 0xA] lsls r0, r1, 4 adds r0, r1 @@ -846073,10 +846073,10 @@ _081B5CD8: adds r0, r1 movs r1, 0x1 bl obj_anim_image_start - b _081B5D0E + b @081B5D0E .align 2, 0 .pool -_081B5CFC: +@081B5CFC: ldrb r1, [r4, 0xA] lsls r0, r1, 4 adds r0, r1 @@ -846085,7 +846085,7 @@ _081B5CFC: adds r0, r1 movs r1, 0 bl obj_anim_image_start -_081B5D0E: +@081B5D0E: ldr r2, =0x02020630 ldrb r1, [r4, 0xA] lsls r0, r1, 4 @@ -846097,7 +846097,7 @@ _081B5D0E: movs r1, 0x5 negs r1, r1 ands r1, r2 -_081B5D24: +@081B5D24: strb r1, [r0] pop {r4} pop {r0} @@ -846107,7 +846107,7 @@ _081B5D24: thumb_func_end sub_81B5CB0 thumb_func_start sub_81B5D30 -sub_81B5D30: @ 81B5D30 +sub_81B5D30: ; 81B5D30 push {lr} ldr r0, =0x08615eb0 bl gpu_tile_obj_alloc_tag_and_copy_to_vram @@ -846120,23 +846120,23 @@ 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 lsls r2, 24 lsrs r2, 24 cmp r2, 0 - beq _081B5D60 + beq @081B5D60 cmp r2, 0x1 - beq _081B5DA8 - b _081B5DE4 -_081B5D60: + beq @081B5DA8 + b @081B5DE4 +@081B5D60: movs r5, 0 ldrb r0, [r6] cmp r5, r0 - bcs _081B5DE4 -_081B5D68: + bcs @081B5DE4 +@081B5D68: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -846146,7 +846146,7 @@ _081B5D68: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - beq _081B5D94 + beq @081B5D94 adds r0, r7, r5 ldrb r4, [r0] adds r0, r1, 0 @@ -846156,20 +846156,20 @@ _081B5D68: lsrs r1, 24 adds r0, r4, 0 bl sub_81B5DF0 -_081B5D94: +@081B5D94: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 ldrb r0, [r6] cmp r5, r0 - bcc _081B5D68 - b _081B5DE4 + bcc @081B5D68 + b @081B5DE4 .align 2, 0 .pool -_081B5DA8: +@081B5DA8: movs r5, 0 - b _081B5DDE -_081B5DAC: + b @081B5DDE +@081B5DAC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -846179,7 +846179,7 @@ _081B5DAC: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - beq _081B5DD8 + beq @081B5DD8 adds r0, r5, r7 ldrb r4, [r0, 0x6] adds r0, r1, 0 @@ -846189,15 +846189,15 @@ _081B5DAC: lsrs r1, 24 adds r0, r4, 0 bl sub_81B5DF0 -_081B5DD8: +@081B5DD8: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 -_081B5DDE: +@081B5DDE: ldrb r0, [r6, 0x1] cmp r5, r0 - bcc _081B5DAC -_081B5DE4: + bcc @081B5DAC +@081B5DE4: pop {r4-r7} pop {r0} bx r0 @@ -846206,7 +846206,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 @@ -846268,7 +846268,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] @@ -846284,17 +846284,17 @@ sub_81B5E74: @ 81B5E74 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - bge _081B5EA8 + bge @081B5EA8 adds r0, r4, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] - b _081B5EC6 + b @081B5EC6 .align 2, 0 .pool -_081B5EA8: +@081B5EA8: adds r3, r4, 0 adds r3, 0x3E ldrb r1, [r3] @@ -846310,20 +846310,20 @@ _081B5EA8: ldrh r2, [r2, 0x22] adds r0, r2 strh r0, [r4, 0x22] -_081B5EC6: +@081B5EC6: pop {r4} pop {r0} bx r0 thumb_func_end sub_81B5E74 thumb_func_start sub_81B5ECC -sub_81B5ECC: @ 81B5ECC +sub_81B5ECC: ; 81B5ECC push {r4,lr} adds r4, r1, 0 movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _081B5EEA + beq @081B5EEA ldr r0, =0x08615f08 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x6] @@ -846331,7 +846331,7 @@ sub_81B5ECC: @ 81B5ECC movs r3, 0x8 bl obj_add_from_template_forward_search strb r0, [r4, 0xB] -_081B5EEA: +@081B5EEA: pop {r4} pop {r0} bx r0 @@ -846340,12 +846340,12 @@ _081B5EEA: thumb_func_end sub_81B5ECC thumb_func_start sub_81B5EF4 -sub_81B5EF4: @ 81B5EF4 +sub_81B5EF4: ; 81B5EF4 push {r4,lr} adds r4, r1, 0 lsls r0, 16 cmp r0, 0 - beq _081B5F24 + beq @081B5F24 ldr r0, =0x08615f08 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x6] @@ -846364,7 +846364,7 @@ sub_81B5EF4: @ 81B5EF4 negs r0, r0 ands r0, r2 strb r0, [r1, 0x5] -_081B5F24: +@081B5F24: pop {r4} pop {r0} bx r0 @@ -846373,7 +846373,7 @@ _081B5F24: thumb_func_end sub_81B5EF4 thumb_func_start sub_81B5F34 -sub_81B5F34: @ 81B5F34 +sub_81B5F34: ; 81B5F34 push {lr} adds r3, r0, 0 adds r2, r1, 0 @@ -846406,7 +846406,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 @@ -846427,7 +846427,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 @@ -846447,7 +846447,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} @@ -846458,7 +846458,7 @@ sub_81B5FBC: @ 81B5FBC lsls r2, 24 lsrs r6, r2, 24 cmp r6, 0 - bne _081B6000 + bne @081B6000 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -846477,10 +846477,10 @@ sub_81B5FBC: @ 81B5FBC bl obj_anim_image_start strh r6, [r4, 0x26] strh r6, [r5, 0x26] - b _081B602C + b @081B602C .align 2, 0 .pool -_081B6000: +@081B6000: lsls r5, r0, 4 adds r5, r0 lsls r5, 2 @@ -846501,7 +846501,7 @@ _081B6000: strh r0, [r5, 0x26] movs r0, 0x4 strh r0, [r4, 0x26] -_081B602C: +@081B602C: pop {r3} mov r8, r3 pop {r4-r7} @@ -846512,7 +846512,7 @@ _081B602C: thumb_func_end sub_81B5FBC thumb_func_start sub_81B6040 -sub_81B6040: @ 81B6040 +sub_81B6040: ; 81B6040 push {lr} ldr r0, =0x08615ef8 bl gpu_tile_obj_decompress_and_load @@ -846527,14 +846527,14 @@ sub_81B6040: @ 81B6040 thumb_func_end sub_81B6040 thumb_func_start sub_81B6064 -sub_81B6064: @ 81B6064 +sub_81B6064: ; 81B6064 push {r4,r5,lr} adds r5, r0, 0 adds r4, r1, 0 movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _081B608C + beq @081B608C ldr r0, =0x08616008 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x4] @@ -846545,7 +846545,7 @@ sub_81B6064: @ 81B6064 adds r0, r5, 0 adds r1, r4, 0 bl sub_81B60E4 -_081B608C: +@081B608C: pop {r4,r5} pop {r0} bx r0 @@ -846554,14 +846554,14 @@ _081B608C: thumb_func_end sub_81B6064 thumb_func_start sub_81B6098 -sub_81B6098: @ 81B6098 +sub_81B6098: ; 81B6098 push {r4,r5,lr} adds r4, r2, 0 lsls r0, 16 lsls r1, 24 lsrs r5, r1, 24 cmp r0, 0 - beq _081B60D4 + beq @081B60D4 ldr r0, =0x08616008 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x4] @@ -846583,7 +846583,7 @@ sub_81B6098: @ 81B6098 negs r0, r0 ands r0, r2 strb r0, [r1, 0x5] -_081B60D4: +@081B60D4: pop {r4,r5} pop {r0} bx r0 @@ -846592,7 +846592,7 @@ _081B60D4: thumb_func_end sub_81B6098 thumb_func_start sub_81B60E4 -sub_81B60E4: @ 81B60E4 +sub_81B60E4: ; 81B60E4 push {r4,lr} adds r4, r1, 0 bl sub_81B205C @@ -846606,16 +846606,16 @@ sub_81B60E4: @ 81B60E4 thumb_func_end sub_81B60E4 thumb_func_start sub_81B60FC -sub_81B60FC: @ 81B60FC +sub_81B60FC: ; 81B60FC push {r4,r5,lr} adds r5, r1, 0 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - beq _081B610C + beq @081B610C cmp r2, 0x6 - bne _081B6128 -_081B610C: + bne @081B6128 +@081B610C: ldr r2, =0x02020630 ldrb r1, [r5, 0xC] lsls r0, r1, 4 @@ -846626,10 +846626,10 @@ _081B610C: ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 - b _081B6152 + b @081B6152 .align 2, 0 .pool -_081B6128: +@081B6128: ldrb r1, [r5, 0xC] lsls r0, r1, 4 adds r0, r1 @@ -846650,7 +846650,7 @@ _081B6128: movs r1, 0x5 negs r1, r1 ands r1, r2 -_081B6152: +@081B6152: strb r1, [r0] pop {r4,r5} pop {r0} @@ -846660,7 +846660,7 @@ _081B6152: thumb_func_end sub_81B60FC thumb_func_start sub_81B6160 -sub_81B6160: @ 81B6160 +sub_81B6160: ; 81B6160 push {lr} ldr r0, =0x08615ff8 bl gpu_tile_obj_decompress_and_load @@ -846673,7 +846673,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} @@ -846687,36 +846687,36 @@ sub_81B617C: @ 81B617C movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081B61BC + beq @081B61BC movs r7, 0x1 bl sub_81B8984 lsls r0, 24 lsrs r6, r0, 24 - b _081B61C0 + b @081B61C0 .align 2, 0 .pool -_081B61B0: +@081B61B0: ldr r0, =0x0203cec8 strb r5, [r0, 0x9] - b _081B6204 + b @081B6204 .align 2, 0 .pool -_081B61BC: +@081B61BC: movs r7, 0 movs r6, 0 -_081B61C0: +@081B61C0: ldr r4, =0x0203ce7c ldrh r0, [r4] bl sub_81B7CEC lsls r0, 24 lsrs r0, 24 cmp r0, 0xA - bne _081B621C + bne @081B621C ldr r1, =0x0203cec8 movs r0, 0 strb r0, [r1, 0x9] movs r5, 0 -_081B61D8: +@081B61D8: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -846726,36 +846726,36 @@ _081B61D8: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _081B61FA + beq @081B61FA adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _081B61B0 -_081B61FA: + beq @081B61B0 +@081B61FA: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls _081B61D8 -_081B6204: + bls @081B61D8 +@081B6204: ldr r0, =sub_81B6280 + 1 movs r1, 0x7F - b _081B6230 + b @081B6230 .align 2, 0 .pool -_081B621C: +@081B621C: ldrh r0, [r4] bl sub_80D6C68 lsls r0, 24 lsrs r0, 24 movs r1, 0x5 cmp r0, 0x3 - bne _081B622E + bne @081B622E movs r1, 0x4 -_081B622E: +@081B622E: ldr r0, =sub_81B1370 + 1 -_081B6230: +@081B6230: str r1, [sp] str r0, [sp, 0x4] mov r0, r8 @@ -846776,23 +846776,23 @@ _081B6230: thumb_func_end sub_81B617C thumb_func_start c2_815ABFC -c2_815ABFC: @ 81B6254 +c2_815ABFC: ; 81B6254 push {lr} bl sub_81A9E40 lsls r0, 24 cmp r0, 0 - bne _081B626C + bne @081B626C movs r0, 0xC movs r1, 0x5 movs r2, 0 bl sub_81AAC90 - b _081B6276 -_081B626C: + b @081B6276 +@081B626C: ldr r0, =0x0203cf30 ldr r1, [r0] movs r0, 0x4 bl sub_81C4F98 -_081B6276: +@081B6276: pop {r0} bx r0 .align 2, 0 @@ -846800,7 +846800,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 @@ -846809,24 +846809,24 @@ sub_81B6280: @ 81B6280 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081B62B2 + bne @081B62B2 ldr r0, =0x0203cec8 ldrb r1, [r0, 0x8] movs r0, 0xF ands r0, r1 cmp r0, 0x1 - bne _081B62A6 + bne @081B62A6 ldr r0, =0x0203cec4 ldr r1, [r0] ldr r0, =sub_81B9140 + 1 str r0, [r1, 0x4] -_081B62A6: +@081B62A6: ldr r0, =0x03006328 ldr r1, =sub_81B6794 + 1 ldr r2, [r0] adds r0, r3, 0 bl _call_via_r2 -_081B62B2: +@081B62B2: pop {r0} bx r0 .align 2, 0 @@ -846834,44 +846834,44 @@ _081B62B2: thumb_func_end sub_81B6280 thumb_func_start sub_81B62D0 -sub_81B62D0: @ 81B62D0 +sub_81B62D0: ; 81B62D0 push {lr} lsls r0, 16 lsrs r0, 16 cmp r0, 0xAF - bne _081B62EC + bne @081B62EC ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00003214 adds r0, r1 - b _081B62F6 + b @081B62F6 .align 2, 0 .pool -_081B62EC: +@081B62EC: ldr r1, =0x0831e58c subs r0, 0xD lsls r0, 2 adds r0, r1 ldr r0, [r0] -_081B62F6: +@081B62F6: ldrb r1, [r0, 0x4] movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne _081B6308 + bne @081B6308 movs r0, 0 - b _081B630A + b @081B630A .align 2, 0 .pool -_081B6308: +@081B6308: movs r0, 0x1 -_081B630A: +@081B630A: pop {r1} bx r1 thumb_func_end sub_81B62D0 thumb_func_start sub_81B6310 -sub_81B6310: @ 81B6310 +sub_81B6310: ; 81B6310 push {lr} lsls r0, 16 lsrs r0, 16 @@ -846880,153 +846880,153 @@ sub_81B6310: @ 81B6310 lsrs r0, 24 subs r0, 0x3 cmp r0, 0x12 - bls _081B6326 - b _081B64BC -_081B6326: + bls @081B6326 + b @081B64BC +@081B6326: lsls r0, 2 - ldr r1, =_081B6334 + ldr r1, =@081B6334 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081B6334: - .4byte _081B6380 - .4byte _081B6394 - .4byte _081B63A8 - .4byte _081B63BC - .4byte _081B63D0 - .4byte _081B63E4 - .4byte _081B63F8 - .4byte _081B64BC - .4byte _081B640C - .4byte _081B6430 - .4byte _081B6420 - .4byte _081B6460 - .4byte _081B6470 - .4byte _081B6450 - .4byte _081B6440 - .4byte _081B64BC - .4byte _081B6494 - .4byte _081B6494 - .4byte _081B64A8 -_081B6380: +@081B6334: + .4byte @081B6380 + .4byte @081B6394 + .4byte @081B63A8 + .4byte @081B63BC + .4byte @081B63D0 + .4byte @081B63E4 + .4byte @081B63F8 + .4byte @081B64BC + .4byte @081B640C + .4byte @081B6430 + .4byte @081B6420 + .4byte @081B6460 + .4byte @081B6470 + .4byte @081B6450 + .4byte @081B6440 + .4byte @081B64BC + .4byte @081B6494 + .4byte @081B6494 + .4byte @081B64A8 +@081B6380: ldr r0, =0x02021fc4 ldr r1, =0x085e9c3e bl ExpandTextCodes - b _081B64C4 + b @081B64C4 .align 2, 0 .pool -_081B6394: +@081B6394: ldr r0, =0x02021fc4 ldr r1, =0x085e9c7c bl ExpandTextCodes - b _081B64C4 + b @081B64C4 .align 2, 0 .pool -_081B63A8: +@081B63A8: ldr r0, =0x02021fc4 ldr r1, =0x085e9c8a bl ExpandTextCodes - b _081B64C4 + b @081B64C4 .align 2, 0 .pool -_081B63BC: +@081B63BC: ldr r0, =0x02021fc4 ldr r1, =0x085e9ca2 bl ExpandTextCodes - b _081B64C4 + b @081B64C4 .align 2, 0 .pool -_081B63D0: +@081B63D0: ldr r0, =0x02021fc4 ldr r1, =0x085e9c5f bl ExpandTextCodes - b _081B64C4 + b @081B64C4 .align 2, 0 .pool -_081B63E4: +@081B63E4: ldr r0, =0x02021fc4 ldr r1, =0x085e9dbe bl ExpandTextCodes - b _081B64C4 + b @081B64C4 .align 2, 0 .pool -_081B63F8: +@081B63F8: ldr r0, =0x02021fc4 ldr r1, =0x085e9de1 bl ExpandTextCodes - b _081B64C4 + b @081B64C4 .align 2, 0 .pool -_081B640C: +@081B640C: ldr r0, =0x02021fc4 ldr r1, =0x085e9ce0 bl ExpandTextCodes - b _081B64C4 + b @081B64C4 .align 2, 0 .pool -_081B6420: +@081B6420: ldr r0, =0x02021dc4 ldr r1, =0x085e96e3 - b _081B6474 + b @081B6474 .align 2, 0 .pool -_081B6430: +@081B6430: ldr r0, =0x02021dc4 ldr r1, =0x085ea33c - b _081B6474 + b @081B6474 .align 2, 0 .pool -_081B6440: +@081B6440: ldr r0, =0x02021dc4 ldr r1, =0x085ea343 - b _081B6474 + b @081B6474 .align 2, 0 .pool -_081B6450: +@081B6450: ldr r0, =0x02021dc4 ldr r1, =0x085ea35b - b _081B6474 + b @081B6474 .align 2, 0 .pool -_081B6460: +@081B6460: ldr r0, =0x02021dc4 ldr r1, =0x085e96e6 - b _081B6474 + b @081B6474 .align 2, 0 .pool -_081B6470: +@081B6470: ldr r0, =0x02021dc4 ldr r1, =0x085e96ee -_081B6474: +@081B6474: bl gf_strcpy ldr r0, =0x02021fc4 ldr r1, =0x085e9d25 bl ExpandTextCodes - b _081B64C4 + b @081B64C4 .align 2, 0 .pool -_081B6494: +@081B6494: ldr r0, =0x02021fc4 ldr r1, =0x085e9cf5 bl ExpandTextCodes - b _081B64C4 + b @081B64C4 .align 2, 0 .pool -_081B64A8: +@081B64A8: ldr r0, =0x02021fc4 ldr r1, =0x085e9cb7 bl ExpandTextCodes - b _081B64C4 + b @081B64C4 .align 2, 0 .pool -_081B64BC: +@081B64BC: ldr r0, =0x02021fc4 ldr r1, =0x085e96f6 bl ExpandTextCodes -_081B64C4: +@081B64C4: pop {r0} bx r0 .align 2, 0 @@ -847034,7 +847034,7 @@ _081B64C4: thumb_func_end sub_81B6310 thumb_func_start sub_81B64D0 -sub_81B64D0: @ 81B64D0 +sub_81B64D0: ; 81B64D0 push {r4,lr} adds r4, r0, 0 lsls r0, r1, 16 @@ -847043,48 +847043,48 @@ sub_81B64D0: @ 81B64D0 lsls r0, 24 lsrs r0, 24 cmp r0, 0xD - bne _081B64FC + bne @081B64FC adds r0, r4, 0 movs r1, 0xB bl pokemon_getattr ldr r1, =0x0000012f cmp r0, r1 - bne _081B64FC + bne @081B64FC movs r0, 0 - b _081B64FE + b @081B64FE .align 2, 0 .pool -_081B64FC: +@081B64FC: movs r0, 0x1 -_081B64FE: +@081B64FE: pop {r4} pop {r1} bx r1 thumb_func_end sub_81B64D0 thumb_func_start sub_81B6504 -sub_81B6504: @ 81B6504 +sub_81B6504: ; 81B6504 push {lr} lsls r0, 16 lsrs r0, 16 cmp r0, 0x27 - beq _081B6516 + beq @081B6516 cmp r0, 0x29 - beq _081B6516 + beq @081B6516 cmp r0, 0x28 - bne _081B651A -_081B6516: + bne @081B651A +@081B6516: movs r0, 0x1 - b _081B651C -_081B651A: + b @081B651C +@081B651A: movs r0, 0 -_081B651C: +@081B651C: pop {r1} bx r1 thumb_func_end sub_81B6504 thumb_func_start sub_81B6520 -sub_81B6520: @ 81B6520 +sub_81B6520: ; 81B6520 push {r4-r6,lr} lsls r0, 24 lsrs r3, r0, 24 @@ -847099,17 +847099,17 @@ sub_81B6520: @ 81B6520 movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _081B6558 + bne @081B6558 movs r0, 0x64 muls r0, r3 ldr r1, =0x020244ec adds r0, r1 adds r1, r5, 0 adds r2, r3, 0 - b _081B6572 + b @081B6572 .align 2, 0 .pool -_081B6558: +@081B6558: movs r0, 0x64 adds r4, r3, 0 muls r4, r0 @@ -847122,7 +847122,7 @@ _081B6558: lsrs r2, 24 adds r0, r4, 0 adds r1, r5, 0 -_081B6572: +@081B6572: adds r3, r6, 0 bl sub_806BD04 lsls r0, 24 @@ -847135,7 +847135,7 @@ _081B6572: thumb_func_end sub_81B6520 thumb_func_start sub_81B6588 -sub_81B6588: @ 81B6588 +sub_81B6588: ; 81B6588 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -847162,14 +847162,14 @@ sub_81B6588: @ 81B6588 bl sub_81B64D0 lsls r0, 24 cmp r0, 0 - beq _081B6600 + beq @081B6600 adds r0, r6, 0 bl sub_81B62D0 lsls r0, 24 lsrs r0, 24 mov r8, r0 cmp r0, 0x1 - bne _081B65EE + bne @081B65EE adds r0, r5, 0 movs r1, 0x39 bl pokemon_getattr @@ -847180,10 +847180,10 @@ sub_81B6588: @ 81B6588 movs r1, 0x3A bl pokemon_getattr cmp r10, r0 - bne _081B65EE + bne @081B65EE movs r1, 0 mov r8, r1 -_081B65EE: +@081B65EE: ldr r4, =0x0203cec8 ldrb r0, [r4, 0x9] adds r1, r6, 0 @@ -847191,18 +847191,18 @@ _081B65EE: bl sub_81B6520 lsls r0, 24 cmp r0, 0 - beq _081B6624 -_081B6600: + beq @081B6624 +@081B6600: ldr r1, =0x0203cee8 movs r0, 0 strb r0, [r1] movs r0, 0x5 bl audio_play ldr r0, =0x085e96f6 - b _081B66F4 + b @081B66F4 .align 2, 0 .pool -_081B6624: +@081B6624: ldr r1, =0x0203cee8 movs r0, 0x1 strb r0, [r1] @@ -847210,22 +847210,22 @@ _081B6624: bl sub_81B6504 lsls r0, 24 cmp r0, 0 - bne _081B6650 + bne @081B6650 movs r0, 0x1 bl audio_play ldrb r0, [r4, 0xB] cmp r0, 0xE - beq _081B6656 + beq @081B6656 adds r0, r6, 0 movs r1, 0x1 bl sub_80D6AA4 - b _081B6656 + b @081B6656 .align 2, 0 .pool -_081B6650: +@081B6650: movs r0, 0x75 bl audio_play -_081B6656: +@081B6656: ldr r4, =0x0203cedc ldr r7, =0x0203cec8 movs r0, 0x9 @@ -847250,22 +847250,22 @@ _081B6656: ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - bge _081B6694 + bge @081B6694 adds r0, r5, 0 adds r1, r3, 0 movs r2, 0x1 bl sub_81B2AC8 -_081B6694: +@081B6694: mov r2, r8 cmp r2, 0x1 - bne _081B66E4 + bne @081B66E4 mov r0, r10 cmp r0, 0 - bne _081B66A8 + bne @081B66A8 ldrb r0, [r7, 0x9] movs r1, 0x1 bl sub_81B0FCC -_081B66A8: +@081B66A8: adds r0, r5, 0 movs r1, 0x39 bl pokemon_getattr @@ -847284,17 +847284,17 @@ _081B66A8: movs r1, 0 mov r2, r10 bl sub_81B1FA8 - b _081B6710 + b @081B6710 .align 2, 0 .pool -_081B66E4: +@081B66E4: ldr r1, =0x02021cc4 adds r0, r5, 0 bl sub_81B1B44 adds r0, r6, 0 bl sub_81B6310 ldr r0, =0x02021fc4 -_081B66F4: +@081B66F4: movs r1, 0x1 bl sub_81B1B5C movs r0, 0x2 @@ -847307,7 +847307,7 @@ _081B66F4: adds r0, r1 ldr r1, [sp, 0x4] str r1, [r0] -_081B6710: +@081B6710: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -847321,7 +847321,7 @@ _081B6710: thumb_func_end sub_81B6588 thumb_func_start sub_81B672C -sub_81B672C: @ 81B672C +sub_81B672C: ; 81B672C push {r4,r5,lr} adds r5, r0, 0 lsls r5, 24 @@ -847360,7 +847360,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 @@ -847368,18 +847368,18 @@ sub_81B6794: @ 81B6794 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B67BA + beq @081B67BA ldr r0, =0x0203cee8 ldrb r1, [r0] cmp r1, 0 - bne _081B67B4 + bne @081B67B4 ldr r0, =0x0203cec4 ldr r0, [r0] str r1, [r0, 0x4] -_081B67B4: +@081B67B4: adds r0, r4, 0 bl sub_81B12C0 -_081B67BA: +@081B67BA: pop {r4} pop {r0} bx r0 @@ -847388,7 +847388,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 @@ -847444,24 +847444,24 @@ sub_81B67C8: @ 81B67C8 lsrs r0, 16 mov r8, r0 cmp r4, 0 - bne _081B6850 + bne @081B6850 ldr r0, [sp, 0x4] cmp r0, r9 - bne _081B6874 + bne @081B6874 ldr r1, [sp, 0x8] cmp r1, r8 - bne _081B6874 -_081B6850: + bne @081B6874 +@081B6850: ldr r1, =0x0203cee8 movs r0, 0 strb r0, [r1] movs r0, 0x5 bl audio_play ldr r0, =0x085e96f6 - b _081B68E2 + b @081B68E2 .align 2, 0 .pool -_081B6874: +@081B6874: ldr r1, =0x0203cee8 movs r0, 0x1 strb r0, [r1] @@ -847478,30 +847478,30 @@ _081B6874: bl option_menu_get_string ldr r2, [sp, 0x4] cmp r2, r9 - beq _081B68D8 + beq @081B68D8 ldr r0, [sp, 0x8] cmp r0, r8 - beq _081B68C4 + beq @081B68C4 ldr r0, =0x02021fc4 ldr r1, =0x085e9d45 bl ExpandTextCodes - b _081B68E0 + b @081B68E0 .align 2, 0 .pool -_081B68C4: +@081B68C4: ldr r0, =0x02021fc4 ldr r1, =0x085e9d90 bl ExpandTextCodes - b _081B68E0 + b @081B68E0 .align 2, 0 .pool -_081B68D8: +@081B68D8: ldr r0, =0x02021fc4 ldr r1, =0x085e9d6d bl ExpandTextCodes -_081B68E0: +@081B68E0: ldr r0, =0x02021fc4 -_081B68E2: +@081B68E2: movs r1, 0x1 bl sub_81B1B5C movs r0, 0x2 @@ -847527,7 +847527,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 @@ -847535,123 +847535,123 @@ sub_81B691C: @ 81B691C adds r0, r1, 0 subs r0, 0xC cmp r0, 0x5 - bhi _081B6992 + bhi @081B6992 lsls r0, 2 - ldr r1, =_081B693C + ldr r1, =@081B693C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081B693C: - .4byte _081B696C - .4byte _081B6954 - .4byte _081B697E - .4byte _081B6984 - .4byte _081B6978 - .4byte _081B6972 -_081B6954: +@081B693C: + .4byte @081B696C + .4byte @081B6954 + .4byte @081B697E + .4byte @081B6984 + .4byte @081B6978 + .4byte @081B6972 +@081B6954: adds r0, r4, 0 movs r1, 0xB bl pokemon_getattr ldr r1, =0x0000012f cmp r0, r1 - beq _081B6992 + beq @081B6992 adds r0, r4, 0 movs r1, 0x1A - b _081B6988 + b @081B6988 .align 2, 0 .pool -_081B696C: +@081B696C: adds r0, r4, 0 movs r1, 0x1B - b _081B6988 -_081B6972: + b @081B6988 +@081B6972: adds r0, r4, 0 movs r1, 0x1C - b _081B6988 -_081B6978: + b @081B6988 +@081B6978: adds r0, r4, 0 movs r1, 0x1D - b _081B6988 -_081B697E: + b @081B6988 +@081B697E: adds r0, r4, 0 movs r1, 0x1E - b _081B6988 -_081B6984: + b @081B6988 +@081B6984: adds r0, r4, 0 movs r1, 0x1F -_081B6988: +@081B6988: bl pokemon_getattr lsls r0, 16 lsrs r0, 16 - b _081B6994 -_081B6992: + b @081B6994 +@081B6992: movs r0, 0 -_081B6994: +@081B6994: pop {r4} pop {r1} bx r1 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 lsrs r0, 24 subs r0, 0xC cmp r0, 0x5 - bhi _081B6A08 + bhi @081B6A08 lsls r0, 2 - ldr r1, =_081B69B8 + ldr r1, =@081B69B8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081B69B8: - .4byte _081B69D8 - .4byte _081B69D0 - .4byte _081B69F0 - .4byte _081B6A00 - .4byte _081B69E8 - .4byte _081B69E0 -_081B69D0: +@081B69B8: + .4byte @081B69D8 + .4byte @081B69D0 + .4byte @081B69F0 + .4byte @081B6A00 + .4byte @081B69E8 + .4byte @081B69E0 +@081B69D0: ldr r1, =0x085e96e3 - b _081B69F2 + b @081B69F2 .align 2, 0 .pool -_081B69D8: +@081B69D8: ldr r1, =0x085ea33c - b _081B69F2 + b @081B69F2 .align 2, 0 .pool -_081B69E0: +@081B69E0: ldr r1, =0x085ea343 - b _081B69F2 + b @081B69F2 .align 2, 0 .pool -_081B69E8: +@081B69E8: ldr r1, =0x085ea35b - b _081B69F2 + b @081B69F2 .align 2, 0 .pool -_081B69F0: +@081B69F0: ldr r1, =0x085e96e6 -_081B69F2: +@081B69F2: adds r0, r2, 0 bl gf_strcpy - b _081B6A08 + b @081B6A08 .align 2, 0 .pool -_081B6A00: +@081B6A00: ldr r1, =0x085e96ee adds r0, r2, 0 bl gf_strcpy -_081B6A08: +@081B6A08: pop {r0} bx r0 .align 2, 0 @@ -847659,7 +847659,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 @@ -847683,7 +847683,7 @@ sub_81B6A10: @ 81B6A10 mov r8, r1 ldr r0, =0x020244ec mov r9, r0 -_081B6A40: +@081B6A40: adds r1, r5, 0 adds r1, 0xD mov r0, r8 @@ -847711,16 +847711,16 @@ _081B6A40: movs r3, 0x8 bl Print cmp r4, 0 - beq _081B6A82 + beq @081B6A82 adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 -_081B6A82: +@081B6A82: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _081B6A40 + bls @081B6A40 adds r0, r6, 0 adds r1, r7, 0 movs r2, 0 @@ -847740,7 +847740,7 @@ _081B6A82: thumb_func_end sub_81B6A10 thumb_func_start sub_81B6AB4 -sub_81B6AB4: @ 81B6AB4 +sub_81B6AB4: ; 81B6AB4 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -847751,23 +847751,23 @@ sub_81B6AB4: @ 81B6AB4 movs r0, 0x2 negs r0, r0 cmp r1, r0 - beq _081B6AF0 + beq @081B6AF0 adds r0, 0x1 cmp r1, r0 - bne _081B6AE0 + bne @081B6AE0 movs r0, 0x5 bl audio_play adds r0, r4, 0 bl sub_81B6BB4 - b _081B6AF0 -_081B6AE0: + b @081B6AF0 +@081B6AE0: ldr r0, =0x0203cec4 ldr r0, [r0] adds r0, 0xD bl sub_81B302C adds r0, r5, 0 bl sub_81B6B80 -_081B6AF0: +@081B6AF0: pop {r4,r5} pop {r0} bx r0 @@ -847776,43 +847776,43 @@ _081B6AF0: thumb_func_end sub_81B6AB4 thumb_func_start dp05_ether -dp05_ether: @ 81B6AFC +dp05_ether: ; 81B6AFC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 ldr r0, =0x0203ce7c ldrh r0, [r0] cmp r0, 0xAF - bne _081B6B20 + bne @081B6B20 ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00003214 adds r0, r1 - b _081B6B2A + b @081B6B2A .align 2, 0 .pool -_081B6B20: +@081B6B20: ldr r1, =0x0831e58c subs r0, 0xD lsls r0, 2 adds r0, r1 ldr r0, [r0] -_081B6B2A: +@081B6B2A: ldrb r1, [r0, 0x4] movs r0, 0x10 ands r0, r1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _081B6B4C + bne @081B6B4C ldr r0, =0x0203cec8 strh r1, [r0, 0xE] adds r0, r4, 0 bl sub_81B6BEC - b _081B6B6E + b @081B6B6E .align 2, 0 .pool -_081B6B4C: +@081B6B4C: movs r0, 0x5 bl audio_play movs r0, 0x16 @@ -847827,7 +847827,7 @@ _081B6B4C: adds r0, r1 ldr r1, =sub_81B6AB4 + 1 str r1, [r0] -_081B6B6E: +@081B6B6E: pop {r4} pop {r0} bx r0 @@ -847836,7 +847836,7 @@ _081B6B6E: thumb_func_end dp05_ether thumb_func_start sub_81B6B80 -sub_81B6B80: @ 81B6B80 +sub_81B6B80: ; 81B6B80 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -847860,7 +847860,7 @@ sub_81B6B80: @ 81B6B80 thumb_func_end sub_81B6B80 thumb_func_start sub_81B6BB4 -sub_81B6BB4: @ 81B6BB4 +sub_81B6BB4: ; 81B6BB4 push {lr} lsls r0, 24 lsrs r0, 24 @@ -847886,7 +847886,7 @@ sub_81B6BB4: @ 81B6BB4 thumb_func_end sub_81B6BB4 thumb_func_start sub_81B6BEC -sub_81B6BEC: @ 81B6BEC +sub_81B6BEC: ; 81B6BEC push {r4-r7,lr} mov r7, r8 push {r7} @@ -847906,16 +847906,16 @@ sub_81B6BEC: @ 81B6BEC bl sub_81B6520 lsls r0, 24 cmp r0, 0 - beq _081B6C34 + beq @081B6C34 ldr r0, =0x0203cee8 strb r4, [r0] movs r0, 0x5 bl audio_play ldr r0, =0x085e96f6 - b _081B6C7E + b @081B6C7E .align 2, 0 .pool -_081B6C34: +@081B6C34: ldr r1, =0x0203cee8 movs r0, 0x1 strb r0, [r1] @@ -847948,7 +847948,7 @@ _081B6C34: adds r0, r5, 0 bl sub_81B6310 ldr r0, =0x02021fc4 -_081B6C7E: +@081B6C7E: movs r1, 0x1 bl sub_81B1B5C movs r0, 0x2 @@ -847970,7 +847970,7 @@ _081B6C7E: thumb_func_end sub_81B6BEC thumb_func_start dp05_pp_up -dp05_pp_up: @ 81B6CC0 +dp05_pp_up: ; 81B6CC0 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -847997,7 +847997,7 @@ dp05_pp_up: @ 81B6CC0 thumb_func_end dp05_pp_up thumb_func_start sub_81B6CFC -sub_81B6CFC: @ 81B6CFC +sub_81B6CFC: ; 81B6CFC lsls r0, 16 ldr r1, =0xfedf0000 adds r0, r1 @@ -848011,67 +848011,67 @@ sub_81B6CFC: @ 81B6CFC thumb_func_end sub_81B6CFC thumb_func_start sub_81B6D14 -sub_81B6D14: @ 81B6D14 +sub_81B6D14: ; 81B6D14 push {lr} lsls r0, 16 lsrs r2, r0, 16 movs r1, 0 ldr r3, =0x08616040 -_081B6D1E: +@081B6D1E: adds r0, r1, 0 adds r0, 0x32 lsls r0, 1 adds r0, r3 ldrh r0, [r0] cmp r0, r2 - bne _081B6D34 + bne @081B6D34 movs r0, 0x1 - b _081B6D40 + b @081B6D40 .align 2, 0 .pool -_081B6D34: +@081B6D34: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x7 - bls _081B6D1E + bls @081B6D1E movs r0, 0 -_081B6D40: +@081B6D40: pop {r1} bx r1 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 lsrs r5, r1, 16 movs r4, 0 -_081B6D4E: +@081B6D4E: adds r1, r4, 0 adds r1, 0xD adds r0, r6, 0 bl pokemon_getattr cmp r0, r5 - bne _081B6D60 + bne @081B6D60 movs r0, 0x1 - b _081B6D6C -_081B6D60: + b @081B6D6C +@081B6D60: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _081B6D4E + bls @081B6D4E movs r0, 0 -_081B6D6C: +@081B6D6C: pop {r4-r6} pop {r1} bx r1 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 @@ -848090,7 +848090,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 @@ -848112,7 +848112,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} @@ -848156,16 +848156,16 @@ sub_81B6DC4: @ 81B6DC4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B6E70 + beq @081B6E70 cmp r0, 0x2 - beq _081B6E78 + beq @081B6E78 ldrh r1, [r7, 0xE] adds r0, r5, 0 bl pokemon_moveset_pad_ lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 - beq _081B6E88 + beq @081B6E88 ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -848173,23 +848173,23 @@ sub_81B6DC4: @ 81B6DC4 adds r1, r0 ldr r0, =sub_81B6EB4 + 1 str r0, [r1] - b _081B6E9C + b @081B6E9C .align 2, 0 .pool -_081B6E70: +@081B6E70: ldr r1, =0x085e9ab4 - b _081B6E7A + b @081B6E7A .align 2, 0 .pool -_081B6E78: +@081B6E78: ldr r1, =0x085e9c00 -_081B6E7A: +@081B6E7A: adds r0, r6, 0 bl sub_81B6D98 - b _081B6E9C + b @081B6E9C .align 2, 0 .pool -_081B6E88: +@081B6E88: ldr r0, =0x085e9ae9 bl sub_81B6D74 ldr r1, =0x03005e00 @@ -848199,7 +848199,7 @@ _081B6E88: adds r0, r1 ldr r1, =sub_81B6FF4 + 1 str r1, [r0] -_081B6E9C: +@081B6E9C: pop {r3} mov r8, r3 pop {r4-r7} @@ -848210,7 +848210,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 @@ -848228,18 +848228,18 @@ sub_81B6EB4: @ 81B6EB4 movs r1, 0x2 ldrsh r0, [r6, r1] cmp r0, 0 - bne _081B6EF0 + bne @081B6EF0 adds r0, r5, 0 movs r1, 0x4 bl happiness_algorithm movs r0, 0xA9 lsls r0, 1 cmp r4, r0 - bhi _081B6EF0 + bhi @081B6EF0 adds r0, r4, 0 movs r1, 0x1 bl sub_80D6AA4 -_081B6EF0: +@081B6EF0: ldr r1, =0x02021cc4 adds r0, r5, 0 bl sub_81B1B44 @@ -848275,7 +848275,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 @@ -848283,7 +848283,7 @@ sub_81B6F60: @ 81B6F60 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B6F86 + beq @081B6F86 ldr r0, =0x0000016f bl fanfare_play ldr r1, =0x03005e00 @@ -848293,7 +848293,7 @@ sub_81B6F60: @ 81B6F60 adds r0, r1 ldr r1, =sub_81B6F98 + 1 str r1, [r0] -_081B6F86: +@081B6F86: pop {r4} pop {r0} bx r0 @@ -848302,7 +848302,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 @@ -848310,38 +848310,38 @@ sub_81B6F98: @ 81B6F98 bl task_is_not_running_overworld_fanfare lsls r0, 24 cmp r0, 0 - beq _081B6FEA + beq @081B6FEA ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r2, 0x1 adds r0, r2, 0 ands r0, r1 cmp r0, 0 - bne _081B6FC0 + bne @081B6FC0 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081B6FEA -_081B6FC0: + beq @081B6FEA +@081B6FC0: ldr r0, =0x0203cec8 movs r1, 0x10 ldrsh r0, [r0, r1] cmp r0, 0x1 - bne _081B6FDC + bne @081B6FDC adds r0, r4, 0 bl sub_81B77AC - b _081B6FEA + b @081B6FEA .align 2, 0 .pool -_081B6FDC: +@081B6FDC: cmp r0, 0x2 - bne _081B6FE4 + bne @081B6FE4 ldr r0, =0x020375f0 strh r2, [r0] -_081B6FE4: +@081B6FE4: adds r0, r5, 0 bl sub_81B12C0 -_081B6FEA: +@081B6FEA: pop {r4,r5} pop {r0} bx r0 @@ -848350,7 +848350,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 @@ -848358,7 +848358,7 @@ sub_81B6FF4: @ 81B6FF4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B7018 + beq @081B7018 bl sub_81B334C ldr r0, =0x03005e00 lsls r1, r4, 2 @@ -848367,7 +848367,7 @@ sub_81B6FF4: @ 81B6FF4 adds r1, r0 ldr r0, =sub_81B7028 + 1 str r0, [r1] -_081B7018: +@081B7018: pop {r4} pop {r0} bx r0 @@ -848376,7 +848376,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 @@ -848384,19 +848384,19 @@ sub_81B7028: @ 81B7028 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _081B704E + beq @081B704E cmp r1, 0 - bgt _081B7048 + bgt @081B7048 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _081B7074 - b _081B7080 -_081B7048: + beq @081B7074 + b @081B7080 +@081B7048: cmp r1, 0x1 - beq _081B707A - b _081B7080 -_081B704E: + beq @081B707A + b @081B7080 +@081B704E: ldr r0, =0x085e9b96 movs r1, 0x1 bl sub_81B1B5C @@ -848407,23 +848407,23 @@ _081B704E: adds r0, r1 ldr r1, =sub_81B7088 + 1 str r1, [r0] - b _081B7080 + b @081B7080 .align 2, 0 .pool -_081B7074: +@081B7074: movs r0, 0x5 bl audio_play -_081B707A: +@081B707A: adds r0, r4, 0 bl sub_81B7230 -_081B7080: +@081B7080: pop {r4} pop {r0} bx r0 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 @@ -848431,14 +848431,14 @@ sub_81B7088: @ 81B7088 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B70A8 + beq @081B70A8 ldr r0, =0x0203cec4 ldr r1, [r0] ldr r0, =sub_81B70B8 + 1 str r0, [r1, 0x4] adds r0, r4, 0 bl sub_81B12C0 -_081B70A8: +@081B70A8: pop {r4} pop {r0} bx r0 @@ -848447,7 +848447,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 @@ -848471,7 +848471,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 @@ -848494,7 +848494,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 @@ -848504,28 +848504,28 @@ sub_81B711C: @ 81B711C movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081B714E + bne @081B714E bl sub_81C1B94 lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - beq _081B7148 + beq @081B7148 adds r0, r4, 0 bl sub_81B7154 - b _081B714E + b @081B714E .align 2, 0 .pool -_081B7148: +@081B7148: adds r0, r5, 0 bl sub_81B7230 -_081B714E: +@081B714E: pop {r4,r5} pop {r0} bx r0 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 @@ -848574,7 +848574,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 @@ -848582,7 +848582,7 @@ sub_81B71D4: @ 81B71D4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B7220 + beq @081B7220 ldr r5, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r5, r1] @@ -848607,7 +848607,7 @@ sub_81B71D4: @ 81B71D4 bl sub_80691F4 adds r0, r6, 0 bl sub_81B6EB4 -_081B7220: +@081B7220: pop {r4-r6} pop {r0} bx r0 @@ -848616,7 +848616,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 @@ -848654,7 +848654,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 @@ -848662,7 +848662,7 @@ sub_81B7294: @ 81B7294 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B72B8 + beq @081B72B8 bl sub_81B334C ldr r0, =0x03005e00 lsls r1, r4, 2 @@ -848671,7 +848671,7 @@ sub_81B7294: @ 81B7294 adds r1, r0 ldr r0, =sub_81B72C8 + 1 str r0, [r1] -_081B72B8: +@081B72B8: pop {r4} pop {r0} bx r0 @@ -848680,7 +848680,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 @@ -848695,21 +848695,21 @@ sub_81B72C8: @ 81B72C8 lsls r0, 24 asrs r5, r0, 24 cmp r5, 0 - beq _081B7306 + beq @081B7306 cmp r5, 0 - bgt _081B7300 + bgt @081B7300 movs r0, 0x1 negs r0, r0 cmp r5, r0 - beq _081B738C - b _081B73C2 + beq @081B738C + b @081B73C2 .align 2, 0 .pool -_081B7300: +@081B7300: cmp r5, 0x1 - beq _081B7392 - b _081B73C2 -_081B7306: + beq @081B7392 + b @081B73C2 +@081B7306: ldr r1, =0x02021cc4 adds r0, r4, 0 bl sub_81B1B44 @@ -848731,7 +848731,7 @@ _081B7306: movs r3, 0x10 ldrsh r0, [r7, r3] cmp r0, 0x1 - bne _081B7368 + bne @081B7368 ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -848739,15 +848739,15 @@ _081B7306: adds r1, r0 ldr r0, =sub_81B73E4 + 1 str r0, [r1] - b _081B73C2 + b @081B73C2 .align 2, 0 .pool -_081B7368: +@081B7368: cmp r0, 0x2 - bne _081B7370 + bne @081B7370 ldr r0, =0x020375f0 strh r5, [r0] -_081B7370: +@081B7370: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -848755,13 +848755,13 @@ _081B7370: adds r1, r0 ldr r0, =sub_81B6794 + 1 str r0, [r1] - b _081B73C2 + b @081B73C2 .align 2, 0 .pool -_081B738C: +@081B738C: movs r0, 0x5 bl audio_play -_081B7392: +@081B7392: ldr r1, =0x02021cc4 adds r0, r4, 0 bl sub_81B1B44 @@ -848783,7 +848783,7 @@ _081B7392: adds r0, r1 ldr r1, =sub_81B6FF4 + 1 str r1, [r0] -_081B73C2: +@081B73C2: pop {r4-r7} pop {r0} bx r0 @@ -848792,7 +848792,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 @@ -848800,17 +848800,17 @@ sub_81B73E4: @ 81B73E4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B73FC + beq @081B73FC adds r0, r4, 0 bl sub_81B77AC -_081B73FC: +@081B73FC: pop {r4} pop {r0} bx r0 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 @@ -848838,7 +848838,7 @@ dp05_rare_candy: @ 81B7404 movs r1, 0x38 bl pokemon_getattr cmp r0, 0x64 - beq _081B7478 + beq @081B7478 adds r0, r5, 0 adds r1, r4, 0 bl sub_81B79A0 @@ -848855,16 +848855,16 @@ dp05_rare_candy: @ 81B7404 adds r1, r6, r0 adds r0, r5, 0 bl sub_81B79A0 - b _081B747A + b @081B747A .align 2, 0 .pool -_081B7478: +@081B7478: movs r4, 0x1 -_081B747A: +@081B747A: movs r0, 0x5 bl audio_play cmp r4, 0 - beq _081B74B4 + beq @081B74B4 ldr r1, =0x0203cee8 movs r0, 0 strb r0, [r1] @@ -848879,10 +848879,10 @@ _081B747A: lsls r0, 3 adds r0, r1 mov r1, r10 - b _081B7516 + b @081B7516 .align 2, 0 .pool -_081B74B4: +@081B74B4: ldr r1, =0x0203cee8 movs r0, 0x1 strb r0, [r1] @@ -848923,7 +848923,7 @@ _081B74B4: lsls r0, 3 adds r0, r1 ldr r1, =sub_81B75D4 + 1 -_081B7516: +@081B7516: str r1, [r0] pop {r3-r5} mov r8, r3 @@ -848937,7 +848937,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 @@ -848961,12 +848961,12 @@ sub_81B754C: @ 81B754C ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - bge _081B7588 + bge @081B7588 adds r0, r5, 0 adds r1, r3, 0 movs r2, 0x1 bl sub_81B2AC8 -_081B7588: +@081B7588: ldr r1, [r6] adds r1, r4 adds r0, r5, 0 @@ -848999,7 +848999,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 @@ -849007,23 +849007,23 @@ sub_81B75D4: @ 81B75D4 bl ducking_tick lsls r0, 24 cmp r0, 0 - beq _081B7620 + beq @081B7620 bl sub_81B1BD4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B7620 + beq @081B7620 ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _081B7606 + bne @081B7606 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081B7620 -_081B7606: + beq @081B7620 +@081B7606: movs r0, 0x5 bl audio_play adds r0, r4, 0 @@ -849035,7 +849035,7 @@ _081B7606: adds r1, r0 ldr r0, =sub_81B7634 + 1 str r0, [r1] -_081B7620: +@081B7620: pop {r4} pop {r0} bx r0 @@ -849044,7 +849044,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 @@ -849053,12 +849053,12 @@ sub_81B7634: @ 81B7634 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _081B764E + bne @081B764E movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081B7668 -_081B764E: + beq @081B7668 +@081B764E: movs r0, 0x5 bl audio_play adds r0, r4, 0 @@ -849070,7 +849070,7 @@ _081B764E: adds r1, r0 ldr r0, =sub_81B7704 + 1 str r0, [r1] -_081B7668: +@081B7668: pop {r4} pop {r0} bx r0 @@ -849079,7 +849079,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 @@ -849116,7 +849116,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 @@ -849147,7 +849147,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 @@ -849155,19 +849155,19 @@ sub_81B7704: @ 81B7704 bl ducking_tick lsls r0, 24 cmp r0, 0 - beq _081B77A6 + beq @081B77A6 ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r6, 0x1 adds r0, r6, 0 ands r0, r1 cmp r0, 0 - bne _081B772C + bne @081B772C movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081B77A6 -_081B772C: + beq @081B77A6 +@081B772C: bl sub_81B3394 ldr r4, =0x0203cec8 movs r1, 0x9 @@ -849183,30 +849183,30 @@ _081B772C: strh r6, [r4, 0x10] ldr r0, =0x0000fffe cmp r1, r0 - beq _081B7788 + beq @081B7788 cmp r1, r0 - bgt _081B776C + bgt @081B776C cmp r1, 0 - beq _081B7778 - b _081B77A0 + beq @081B7778 + b @081B77A0 .align 2, 0 .pool -_081B776C: +@081B776C: ldr r0, =0x0000ffff cmp r1, r0 - beq _081B7780 - b _081B77A0 + beq @081B7780 + b @081B77A0 .align 2, 0 .pool -_081B7778: +@081B7778: adds r0, r5, 0 bl sub_81B7810 - b _081B77A6 -_081B7780: + b @081B77A6 +@081B7780: adds r0, r5, 0 bl sub_81B787C - b _081B77A6 -_081B7788: + b @081B77A6 +@081B7788: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -849214,20 +849214,20 @@ _081B7788: adds r1, r0 ldr r0, =sub_81B77AC + 1 str r0, [r1] - b _081B77A6 + b @081B77A6 .align 2, 0 .pool -_081B77A0: +@081B77A0: adds r0, r5, 0 bl sub_81B7910 -_081B77A6: +@081B77A6: pop {r4-r6} pop {r0} bx r0 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 @@ -849244,40 +849244,40 @@ sub_81B77AC: @ 81B77AC lsrs r1, r0, 16 ldr r0, =0x0000fffe cmp r1, r0 - beq _081B780A + beq @081B780A cmp r1, r0 - bgt _081B77E8 + bgt @081B77E8 cmp r1, 0 - beq _081B77F4 - b _081B7804 + beq @081B77F4 + b @081B7804 .align 2, 0 .pool -_081B77E8: +@081B77E8: ldr r0, =0x0000ffff cmp r1, r0 - beq _081B77FC - b _081B7804 + beq @081B77FC + b @081B7804 .align 2, 0 .pool -_081B77F4: +@081B77F4: adds r0, r4, 0 bl sub_81B7810 - b _081B780A -_081B77FC: + b @081B780A +@081B77FC: adds r0, r4, 0 bl sub_81B787C - b _081B780A -_081B7804: + b @081B780A +@081B7804: adds r0, r4, 0 bl sub_81B7910 -_081B780A: +@081B780A: pop {r4} pop {r0} bx r0 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 @@ -849295,7 +849295,7 @@ sub_81B7810: @ 81B7810 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq _081B7860 + beq @081B7860 bl sub_81B06F4 ldr r0, =0x030061e8 ldr r1, [r6] @@ -849307,10 +849307,10 @@ sub_81B7810: @ 81B7810 bl sub_813DA40 adds r0, r5, 0 bl remove_task - b _081B786E + b @081B786E .align 2, 0 .pool -_081B7860: +@081B7860: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -849318,7 +849318,7 @@ _081B7860: adds r1, r0 ldr r0, =sub_81B6794 + 1 str r0, [r1] -_081B786E: +@081B786E: pop {r4-r7} pop {r0} bx r0 @@ -849327,7 +849327,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} @@ -849381,7 +849381,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} @@ -849435,7 +849435,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 @@ -849468,7 +849468,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 @@ -849499,7 +849499,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} @@ -849518,7 +849518,7 @@ sub_81B7A28: @ 81B7A28 movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _081B7A6E + beq @081B7A6E adds r0, r5, 0 movs r1, 0x39 bl pokemon_getattr @@ -849531,8 +849531,8 @@ sub_81B7A28: @ 81B7A28 bl sub_81B6520 lsls r0, 24 cmp r0, 0 - beq _081B7A94 -_081B7A6E: + beq @081B7A94 +@081B7A6E: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -849540,10 +849540,10 @@ _081B7A6E: adds r1, r0 ldr r0, =task_intro_gamefreak + 1 str r0, [r1] - b _081B7B2A + b @081B7B2A .align 2, 0 .pool -_081B7A94: +@081B7A94: movs r0, 0x1 bl audio_play ldr r4, =0x0203cedc @@ -849569,12 +849569,12 @@ _081B7A94: ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - bge _081B7AD6 + bge @081B7AD6 adds r0, r5, 0 adds r1, r3, 0 movs r2, 0x1 bl sub_81B2AC8 -_081B7AD6: +@081B7AD6: ldr r4, =0x0203cec4 ldr r0, [r4] movs r1, 0x87 @@ -849612,7 +849612,7 @@ _081B7AD6: ldr r1, =0x0000021a adds r0, r1 strh r2, [r0] -_081B7B2A: +@081B7B2A: add sp, 0x4 pop {r3} mov r8, r3 @@ -849624,7 +849624,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 @@ -849632,7 +849632,7 @@ task_intro_gamefreak: @ 81B7B4C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B7C0A + beq @081B7C0A ldr r5, =0x0203cec4 ldr r2, [r5] movs r0, 0x86 @@ -849642,7 +849642,7 @@ task_intro_gamefreak: @ 81B7B4C ldrsh r0, [r1, r3] ldr r3, =0x0203cec8 cmp r0, 0x1 - bne _081B7B82 + bne @081B7B82 movs r0, 0 strh r0, [r1] movs r1, 0x9 @@ -849651,21 +849651,21 @@ task_intro_gamefreak: @ 81B7B4C lsls r6, 2 adds r0, r2, r6 strh r1, [r0] -_081B7B82: +@081B7B82: ldrb r0, [r3, 0x9] adds r0, 0x1 strb r0, [r3, 0x9] lsls r0, 24 asrs r0, 24 cmp r0, 0x6 - bne _081B7C04 + bne @081B7C04 ldr r0, [r5] ldr r1, =0x0000021a adds r0, r1 movs r2, 0 ldrsh r1, [r0, r2] cmp r1, 0 - bne _081B7BC8 + bne @081B7BC8 ldr r0, =0x0203cee8 strb r1, [r0] ldr r0, =0x085e96f6 @@ -849673,10 +849673,10 @@ _081B7B82: bl sub_81B1B5C movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - b _081B7BD8 + b @081B7BD8 .align 2, 0 .pool -_081B7BC8: +@081B7BC8: ldr r1, =0x0203cee8 movs r0, 0x1 strb r0, [r1] @@ -849684,7 +849684,7 @@ _081B7BC8: ldrh r0, [r0] movs r1, 0x1 bl sub_80D6AA4 -_081B7BD8: +@081B7BD8: ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -849695,20 +849695,20 @@ _081B7BD8: ldr r1, =0x0203cec8 movs r0, 0 strb r0, [r1, 0x9] - b _081B7C0A + b @081B7C0A .align 2, 0 .pool -_081B7C04: +@081B7C04: adds r0, r4, 0 bl sub_81B7A28 -_081B7C0A: +@081B7C0A: pop {r4-r6} pop {r0} bx r0 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 @@ -849746,7 +849746,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 @@ -849764,7 +849764,7 @@ sub_81B7C74: @ 81B7C74 bl sub_81B6520 lsls r0, 24 cmp r0, 0 - beq _081B7CD8 + beq @081B7CD8 ldr r1, =0x0203cee8 movs r0, 0 strb r0, [r1] @@ -849779,22 +849779,22 @@ sub_81B7C74: @ 81B7C74 lsls r0, 3 adds r0, r1 str r6, [r0] - b _081B7CE4 + b @081B7CE4 .align 2, 0 .pool -_081B7CD8: +@081B7CD8: ldrh r0, [r4] movs r1, 0x1 bl sub_80D6AA4 bl sub_81B06F4 -_081B7CE4: +@081B7CE4: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_81B7C74 thumb_func_start sub_81B7CEC -sub_81B7CEC: @ 81B7CEC +sub_81B7CEC: ; 81B7CEC push {r4,r5,lr} lsls r0, 16 lsrs r1, r0, 16 @@ -849803,203 +849803,203 @@ sub_81B7CEC: @ 81B7CEC lsls r0, r2, 16 lsrs r0, 16 cmp r0, 0xA5 - bls _081B7D00 - b _081B7E40 -_081B7D00: + bls @081B7D00 + b @081B7E40 +@081B7D00: cmp r1, 0xAF - bne _081B7D18 + bne @081B7D18 ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00003214 adds r4, r0, r1 - b _081B7D20 + b @081B7D20 .align 2, 0 .pool -_081B7D18: +@081B7D18: ldr r1, =0x0831e58c lsls r0, r2, 2 adds r0, r1 ldr r4, [r0] -_081B7D20: +@081B7D20: ldrb r1, [r4] movs r5, 0x3F adds r0, r5, 0 ands r0, r1 cmp r0, 0 - bne _081B7D42 + bne @081B7D42 ldrb r0, [r4, 0x1] cmp r0, 0 - bne _081B7D42 + bne @081B7D42 ldrb r0, [r4, 0x2] cmp r0, 0 - bne _081B7D42 + bne @081B7D42 ldrb r3, [r4, 0x3] movs r0, 0x80 ands r0, r3 cmp r0, 0 - beq _081B7D4C -_081B7D42: + beq @081B7D4C +@081B7D42: movs r0, 0 - b _081B7E46 + b @081B7E46 .align 2, 0 .pool -_081B7D4C: +@081B7D4C: movs r2, 0x40 adds r0, r2, 0 ands r0, r1 cmp r0, 0 - beq _081B7D5A + beq @081B7D5A movs r0, 0xA - b _081B7E46 -_081B7D5A: + b @081B7E46 +@081B7D5A: adds r0, r2, 0 ands r0, r3 cmp r0, 0 - beq _081B7D66 + beq @081B7D66 movs r0, 0x1 - b _081B7E46 -_081B7D66: + b @081B7E46 +@081B7D66: adds r2, r5, 0 ands r2, r3 cmp r2, 0 - bne _081B7D74 + bne @081B7D74 lsrs r0, r1, 7 cmp r0, 0 - beq _081B7DB6 -_081B7D74: + beq @081B7DB6 +@081B7D74: cmp r2, 0x20 - bne _081B7D7C + bne @081B7D7C movs r0, 0x4 - b _081B7E46 -_081B7D7C: + b @081B7E46 +@081B7D7C: cmp r2, 0x10 - bne _081B7D84 + bne @081B7D84 movs r0, 0x3 - b _081B7E46 -_081B7D84: + b @081B7E46 +@081B7D84: cmp r2, 0x8 - bne _081B7D8C + bne @081B7D8C movs r0, 0x5 - b _081B7E46 -_081B7D8C: + b @081B7E46 +@081B7D8C: cmp r2, 0x4 - bne _081B7D94 + bne @081B7D94 movs r0, 0x6 - b _081B7E46 -_081B7D94: + b @081B7E46 +@081B7D94: cmp r2, 0x2 - bne _081B7D9C + bne @081B7D9C movs r0, 0x7 - b _081B7E46 -_081B7D9C: + b @081B7E46 +@081B7D9C: cmp r2, 0x1 - bne _081B7DA4 + bne @081B7DA4 movs r0, 0x8 - b _081B7E46 -_081B7DA4: + b @081B7E46 +@081B7DA4: lsrs r0, r1, 7 cmp r0, 0 - beq _081B7DB2 + beq @081B7DB2 cmp r2, 0 - bne _081B7DB2 + bne @081B7DB2 movs r0, 0x9 - b _081B7E46 -_081B7DB2: + b @081B7E46 +@081B7DB2: movs r0, 0xB - b _081B7E46 -_081B7DB6: + b @081B7E46 +@081B7DB6: ldrb r1, [r4, 0x4] movs r0, 0x44 ands r0, r1 adds r2, r1, 0 cmp r0, 0 - beq _081B7DC6 + beq @081B7DC6 movs r0, 0x2 - b _081B7E46 -_081B7DC6: + b @081B7E46 +@081B7DC6: movs r5, 0x2 adds r0, r5, 0 ands r0, r2 cmp r0, 0 - beq _081B7DD4 + beq @081B7DD4 movs r0, 0xC - b _081B7E46 -_081B7DD4: + b @081B7E46 +@081B7DD4: movs r3, 0x1 adds r0, r3, 0 ands r0, r2 cmp r0, 0 - beq _081B7DE2 + beq @081B7DE2 movs r0, 0xD - b _081B7E46 -_081B7DE2: + b @081B7E46 +@081B7DE2: ldrb r1, [r4, 0x5] movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _081B7DF0 + beq @081B7DF0 movs r0, 0xE - b _081B7E46 -_081B7DF0: + b @081B7E46 +@081B7DF0: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _081B7DFC + beq @081B7DFC movs r0, 0xF - b _081B7E46 -_081B7DFC: + b @081B7E46 +@081B7DFC: adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _081B7E08 + beq @081B7E08 movs r0, 0x10 - b _081B7E46 -_081B7E08: + b @081B7E46 +@081B7E08: adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _081B7E14 + beq @081B7E14 movs r0, 0x11 - b _081B7E46 -_081B7E14: + b @081B7E46 +@081B7E14: movs r0, 0x80 ands r0, r2 cmp r0, 0 - beq _081B7E20 + beq @081B7E20 movs r0, 0x12 - b _081B7E46 -_081B7E20: + b @081B7E46 +@081B7E20: movs r0, 0x20 ands r0, r2 cmp r0, 0 - beq _081B7E2C + beq @081B7E2C movs r0, 0x13 - b _081B7E46 -_081B7E2C: + b @081B7E46 +@081B7E2C: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _081B7E38 + beq @081B7E38 movs r0, 0x14 - b _081B7E46 -_081B7E38: + b @081B7E46 +@081B7E38: movs r0, 0x18 ands r0, r2 cmp r0, 0 - bne _081B7E44 -_081B7E40: + bne @081B7E44 +@081B7E40: movs r0, 0x16 - b _081B7E46 -_081B7E44: + b @081B7E46 +@081B7E44: movs r0, 0x15 -_081B7E46: +@081B7E46: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_81B7CEC thumb_func_start sub_81B7E4C -sub_81B7E4C: @ 81B7E4C +sub_81B7E4C: ; 81B7E4C push {r4-r7,lr} mov r7, r8 push {r7} @@ -850010,7 +850010,7 @@ sub_81B7E4C: @ 81B7E4C movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081B7F1C + bne @081B7F1C ldr r7, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r7, r1] @@ -850046,35 +850046,35 @@ sub_81B7E4C: @ 81B7E4C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B7EF0 + beq @081B7EF0 cmp r0, 0x2 - beq _081B7EF8 + beq @081B7EF8 ldrh r1, [r7, 0xE] adds r0, r5, 0 bl pokemon_moveset_pad_ lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 - beq _081B7F08 + beq @081B7F08 adds r0, r6, 0 bl sub_81B6EB4 - b _081B7F1C + b @081B7F1C .align 2, 0 .pool -_081B7EF0: +@081B7EF0: ldr r1, =0x085e9ab4 - b _081B7EFA + b @081B7EFA .align 2, 0 .pool -_081B7EF8: +@081B7EF8: ldr r1, =0x085e9c00 -_081B7EFA: +@081B7EFA: adds r0, r6, 0 bl sub_81B6D98 - b _081B7F1C + b @081B7F1C .align 2, 0 .pool -_081B7F08: +@081B7F08: ldr r0, =0x085e9ae9 bl sub_81B6D74 ldr r1, =0x03005e00 @@ -850084,7 +850084,7 @@ _081B7F08: adds r0, r1 ldr r1, =sub_81B6FF4 + 1 str r1, [r0] -_081B7F1C: +@081B7F1C: pop {r3} mov r8, r3 pop {r4-r7} @@ -850095,7 +850095,7 @@ _081B7F1C: thumb_func_end sub_81B7E4C thumb_func_start sub_81B7F34 -sub_81B7F34: @ 81B7F34 +sub_81B7F34: ; 81B7F34 push {lr} sub sp, 0xC movs r0, 0 @@ -850117,16 +850117,16 @@ sub_81B7F34: @ 81B7F34 thumb_func_end sub_81B7F34 thumb_func_start sub_81B7F60 -sub_81B7F60: @ 81B7F60 +sub_81B7F60: ; 81B7F60 push {lr} sub sp, 0xC bl sub_81A9E40 lsls r0, 24 ldr r1, =sub_81C4F84 + 1 cmp r0, 0 - bne _081B7F72 + bne @081B7F72 ldr r1, =c2_815ABFC + 1 -_081B7F72: +@081B7F72: movs r0, 0x6 str r0, [sp] ldr r0, =sub_81B1370 + 1 @@ -850149,7 +850149,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 @@ -850175,22 +850175,22 @@ sub_81B7FAC: @ 81B7FAC strh r0, [r5] lsls r0, 16 cmp r0, 0 - bne _081B7FF8 + bne @081B7FF8 adds r0, r4, 0 bl sub_81B8044 - b _081B8030 + b @081B8030 .align 2, 0 .pool -_081B7FF8: +@081B7FF8: ldrh r0, [r5] bl itemid_is_mail lsls r0, 24 cmp r0, 0 - beq _081B800C + beq @081B800C adds r0, r4, 0 bl sub_81B83B8 - b _081B8030 -_081B800C: + b @081B8030 +@081B800C: mov r1, r9 movs r0, 0x9 ldrsb r0, [r1, r0] @@ -850208,7 +850208,7 @@ _081B800C: adds r0, r1 ldr r1, =sub_81B82A0 + 1 str r1, [r0] -_081B8030: +@081B8030: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -850220,7 +850220,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 @@ -850229,7 +850229,7 @@ sub_81B8044: @ 81B8044 bl itemid_is_mail lsls r0, 24 cmp r0, 0 - beq _081B807C + beq @081B807C ldrh r0, [r5, 0xC] bl sub_81B83F0 ldr r0, =0x0203cec4 @@ -850238,20 +850238,20 @@ sub_81B8044: @ 81B8044 str r0, [r1, 0x4] adds r0, r4, 0 bl sub_81B12C0 - b _081B8082 + b @081B8082 .align 2, 0 .pool -_081B807C: +@081B807C: adds r0, r4, 0 bl sub_81B8088 -_081B8082: +@081B8082: pop {r4,r5} pop {r0} bx r0 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} @@ -850262,7 +850262,7 @@ sub_81B8088: @ 81B8088 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081B80E4 + bne @081B80E4 ldr r4, =0x0203cec8 ldrh r5, [r4, 0xC] movs r0, 0x9 @@ -850295,7 +850295,7 @@ sub_81B8088: @ 81B8088 adds r0, r1 ldr r1, =sub_81B8104 + 1 str r1, [r0] -_081B80E4: +@081B80E4: pop {r3} mov r8, r3 pop {r4-r7} @@ -850306,7 +850306,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 @@ -850316,7 +850316,7 @@ sub_81B8104: @ 81B8104 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B8138 + beq @081B8138 lsls r2, r4, 24 asrs r2, 24 movs r0, 0x64 @@ -850330,7 +850330,7 @@ sub_81B8104: @ 81B8104 bl sub_81B5C94 adds r0, r5, 0 bl sub_81B12C0 -_081B8138: +@081B8138: pop {r4,r5} pop {r0} bx r0 @@ -850339,7 +850339,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 @@ -850378,7 +850378,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 @@ -850396,7 +850396,7 @@ sub_81B81A8: @ 81B81A8 ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 - bne _081B8208 + bne @081B8208 adds r0, r5, 0 bl sub_80D4680 ldr r4, =0x0203cefc @@ -850411,10 +850411,10 @@ sub_81B81A8: @ 81B81A8 bl sub_81B841C ldr r0, [r6] bl set_callback2 - b _081B8224 + b @081B8224 .align 2, 0 .pool -_081B8208: +@081B8208: ldrb r0, [r6, 0x8] lsls r0, 28 lsrs r0, 28 @@ -850428,7 +850428,7 @@ _081B8208: movs r1, 0xFF movs r3, 0x1 bl sub_81B0038 -_081B8224: +@081B8224: add sp, 0xC pop {r4-r7} pop {r0} @@ -850438,7 +850438,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 @@ -850447,20 +850447,20 @@ sub_81B8230: @ 81B8230 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081B828A + bne @081B828A ldr r1, =0x0203cefc ldrh r0, [r1] cmp r0, 0 - beq _081B8264 + beq @081B8264 ldr r0, =0x0203cec8 ldrh r0, [r0, 0xC] ldrh r1, [r1] movs r2, 0 bl sub_81B1D68 - b _081B827C + b @081B827C .align 2, 0 .pool -_081B8264: +@081B8264: ldr r2, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r2, r1] @@ -850472,7 +850472,7 @@ _081B8264: movs r2, 0 movs r3, 0x1 bl sub_81B1C84 -_081B827C: +@081B827C: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -850480,7 +850480,7 @@ _081B827C: adds r1, r0 ldr r0, =sub_81B8104 + 1 str r0, [r1] -_081B828A: +@081B828A: pop {r4} pop {r0} bx r0 @@ -850489,7 +850489,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 @@ -850497,7 +850497,7 @@ sub_81B82A0: @ 81B82A0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B82C4 + beq @081B82C4 bl sub_81B334C ldr r0, =0x03005e00 lsls r1, r4, 2 @@ -850506,7 +850506,7 @@ sub_81B82A0: @ 81B82A0 adds r1, r0 ldr r0, =sub_81B82D4 + 1 str r0, [r1] -_081B82C4: +@081B82C4: pop {r4} pop {r0} bx r0 @@ -850515,7 +850515,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 @@ -850523,19 +850523,19 @@ sub_81B82D4: @ 81B82D4 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - beq _081B82FA + beq @081B82FA cmp r1, 0 - bgt _081B82F4 + bgt @081B82F4 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _081B8394 - b _081B83A8 -_081B82F4: + beq @081B8394 + b @081B83A8 +@081B82F4: cmp r1, 0x1 - beq _081B839A - b _081B83A8 -_081B82FA: + beq @081B839A + b @081B83A8 +@081B82FA: ldr r7, =0x0203cec8 ldrh r4, [r7, 0xC] adds r0, r4, 0 @@ -850546,7 +850546,7 @@ _081B82FA: bl bag_add_item lsls r0, 24 cmp r0, 0 - bne _081B8338 + bne @081B8338 adds r0, r4, 0 bl sub_81B841C ldrh r0, [r6] @@ -850554,25 +850554,25 @@ _081B82FA: ldr r0, =0x02021fc4 movs r1, 0 bl sub_81B1B5C - b _081B8378 + b @081B8378 .align 2, 0 .pool -_081B8338: +@081B8338: adds r0, r4, 0 bl itemid_is_mail lsls r0, 24 cmp r0, 0 - beq _081B835C + beq @081B835C ldr r0, =0x0203cec4 ldr r1, [r0] ldr r0, =sub_81B814C + 1 str r0, [r1, 0x4] adds r0, r5, 0 bl sub_81B12C0 - b _081B83A8 + b @081B83A8 .align 2, 0 .pool -_081B835C: +@081B835C: movs r1, 0x9 ldrsb r1, [r7, r1] movs r0, 0x64 @@ -850585,7 +850585,7 @@ _081B835C: adds r0, r4, 0 movs r2, 0x1 bl sub_81B1D68 -_081B8378: +@081B8378: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -850593,13 +850593,13 @@ _081B8378: adds r0, r1 ldr r1, =sub_81B8104 + 1 str r1, [r0] - b _081B83A8 + b @081B83A8 .align 2, 0 .pool -_081B8394: +@081B8394: movs r0, 0x5 bl audio_play -_081B839A: +@081B839A: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -850607,7 +850607,7 @@ _081B839A: adds r1, r0 ldr r0, =sub_81B8104 + 1 str r0, [r1] -_081B83A8: +@081B83A8: pop {r4-r7} pop {r0} bx r0 @@ -850616,7 +850616,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 @@ -850641,50 +850641,50 @@ 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 ldr r0, =0x0203cec8 ldrb r0, [r0, 0xB] cmp r0, 0x6 - bne _081B8410 + bne @081B8410 lsls r0, r1, 24 lsrs r0, 24 movs r1, 0x1 bl sub_80D6E48 - b _081B8418 + b @081B8418 .align 2, 0 .pool -_081B8410: +@081B8410: adds r0, r1, 0 movs r1, 0x1 bl sub_80D6AA4 -_081B8418: +@081B8418: pop {r0} bx r0 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 ldr r0, =0x0203cec8 ldrb r0, [r0, 0xB] cmp r0, 0x5 - beq _081B8438 + beq @081B8438 adds r0, r1, 0 movs r1, 0x1 bl sub_80D6D70 - b _081B8440 + b @081B8440 .align 2, 0 .pool -_081B8438: +@081B8438: adds r0, r1, 0 movs r1, 0x1 bl bag_add_item -_081B8440: +@081B8440: lsls r0, 24 lsrs r0, 24 pop {r1} @@ -850692,7 +850692,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 @@ -850714,7 +850714,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 @@ -850745,14 +850745,14 @@ sub_81B8474: @ 81B8474 movs r1, 0xC bl pokemon_getattr cmp r0, 0 - beq _081B84DC + beq @081B84DC ldr r0, =0x085e9a08 movs r1, 0x1 bl sub_81B1B5C - b _081B84F2 + b @081B84F2 .align 2, 0 .pool -_081B84DC: +@081B84DC: adds r0, r5, 0 adds r1, r4, 0 bl sub_80D460C @@ -850761,7 +850761,7 @@ _081B84DC: ldr r0, =0x085e9a40 movs r1, 0x1 bl sub_81B1B5C -_081B84F2: +@081B84F2: movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram ldr r0, =0x03005e00 @@ -850779,7 +850779,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 @@ -850806,7 +850806,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 @@ -850819,7 +850819,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 @@ -850830,12 +850830,12 @@ sub_81B856C: @ 81B856C bl sub_81B85AC lsls r0, 24 cmp r0, 0 - bne _081B858C + bne @081B858C movs r0, 0x2 - b _081B85A4 + b @081B85A4 .align 2, 0 .pool -_081B858C: +@081B858C: adds r0, r4, 0x1 lsls r0, 24 lsrs r0, 24 @@ -850843,26 +850843,26 @@ _081B858C: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B85A2 + beq @081B85A2 movs r0, 0 - b _081B85A4 -_081B85A2: + b @081B85A4 +@081B85A2: movs r0, 0x1 -_081B85A4: +@081B85A4: pop {r4} pop {r1} bx r1 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 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _081B8608 + bne @081B8608 adds r0, r5, 0 movs r1, 0x38 bl pokemon_getattr @@ -850871,38 +850871,38 @@ sub_81B85AC: @ 81B85AC lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bhi _081B8608 + bhi @081B8608 ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] ldr r0, =0x0000191a cmp r1, r0 - bne _081B85EA + bne @081B85EA adds r0, r5, 0 movs r1, 0xC bl pokemon_getattr cmp r0, 0 - bne _081B8608 -_081B85EA: + bne @081B8608 +@081B85EA: ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x8 - beq _081B864A + beq @081B864A cmp r0, 0x9 - bne _081B8618 + bne @081B8618 adds r0, r5, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - bne _081B864A -_081B8608: + bne @081B864A +@081B8608: movs r0, 0 - b _081B864C + b @081B864C .align 2, 0 .pool -_081B8618: +@081B8618: adds r0, r5, 0 movs r1, 0xB bl pokemon_getattr @@ -850914,12 +850914,12 @@ _081B8618: ldrh r0, [r0] ldr r2, =0x0000ffff cmp r0, r2 - beq _081B864A -_081B8632: + beq @081B864A +@081B8632: adds r0, r1, r3 ldrh r0, [r0] cmp r0, r4 - beq _081B8608 + beq @081B8608 adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 @@ -850927,10 +850927,10 @@ _081B8632: adds r0, r1, r3 ldrh r0, [r0] cmp r0, r2 - bne _081B8632 -_081B864A: + bne @081B8632 +@081B864A: movs r0, 0x1 -_081B864C: +@081B864C: pop {r4-r6} pop {r1} bx r1 @@ -850939,7 +850939,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 @@ -850954,23 +850954,23 @@ sub_81B865C: @ 81B865C subs r0, 0x1 ldrb r0, [r0] cmp r0, 0 - bne _081B869C + bne @081B869C cmp r2, 0x1 - bne _081B8688 + bne @081B8688 movs r0, 0xE - b _081B8758 + b @081B8758 .align 2, 0 .pool -_081B8688: +@081B8688: ldr r0, =0x02021cc4 movs r2, 0 movs r3, 0x1 bl decimal_int_to_string movs r0, 0x11 - b _081B8758 + b @081B8758 .align 2, 0 .pool -_081B869C: +@081B869C: ldr r0, =0x000040cf bl var_get lsls r0, 24 @@ -850979,24 +850979,24 @@ _081B869C: adds r0, r1 lsrs r0, 24 cmp r0, 0x1 - bhi _081B86C0 - b _081B8756 + bhi @081B86C0 + b @081B8756 .align 2, 0 .pool -_081B86B8: +@081B86B8: movs r0, 0x12 - b _081B8758 -_081B86BC: + b @081B8758 +@081B86BC: movs r0, 0x13 - b _081B8758 -_081B86C0: + b @081B8758 +@081B86C0: bl sub_81B8830 lsls r0, 24 lsrs r0, 24 mov r8, r0 movs r5, 0 - b _081B8750 -_081B86CE: + b @081B8750 +@081B86CE: ldr r3, =0x0203cef8 adds r4, r3, r5 ldrb r0, [r4] @@ -851025,9 +851025,9 @@ _081B86CE: lsrs r4, r0, 24 mov r9, r1 cmp r4, r8 - bcs _081B8748 + bcs @081B8748 movs r7, 0x64 -_081B870E: +@081B870E: ldr r0, =0x0203cef8 adds r5, r0, r4 ldrb r0, [r5] @@ -851038,9 +851038,9 @@ _081B870E: movs r1, 0xB bl pokemon_getattr cmp r10, r0 - beq _081B86B8 + beq @081B86B8 cmp r6, 0 - beq _081B873E + beq @081B873E ldrb r0, [r5] muls r0, r7 subs r0, 0x64 @@ -851049,25 +851049,25 @@ _081B870E: movs r1, 0xC bl pokemon_getattr cmp r6, r0 - beq _081B86BC -_081B873E: + beq @081B86BC +@081B873E: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r8 - bcc _081B870E -_081B8748: + bcc @081B870E +@081B8748: mov r1, r9 lsls r0, r1, 24 lsrs r5, r0, 24 mov r0, r8 -_081B8750: +@081B8750: subs r0, 0x1 cmp r5, r0 - blt _081B86CE -_081B8756: + blt @081B86CE +@081B8756: movs r0, 0xFF -_081B8758: +@081B8758: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -851080,35 +851080,35 @@ _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 movs r1, 0 ldr r3, =0x0203cef8 -_081B877A: +@081B877A: adds r0, r1, r3 ldrb r0, [r0] cmp r0, r2 - bne _081B878C + bne @081B878C movs r0, 0x1 - b _081B8798 + b @081B8798 .align 2, 0 .pool -_081B878C: +@081B878C: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x3 - bls _081B877A + bls @081B877A movs r0, 0 -_081B8798: +@081B8798: pop {r1} bx r1 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 @@ -851116,7 +851116,7 @@ sub_81B879C: @ 81B879C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xFF - beq _081B87D4 + beq @081B87D4 movs r0, 0x20 bl audio_play adds r0, r4, 0 @@ -851128,22 +851128,22 @@ sub_81B879C: @ 81B879C adds r1, r0 ldr r0, =sub_81B87E8 + 1 str r0, [r1] - b _081B87E0 + b @081B87E0 .align 2, 0 .pool -_081B87D4: +@081B87D4: movs r0, 0x5 bl audio_play adds r0, r5, 0 bl sub_81B12C0 -_081B87E0: +@081B87E0: pop {r4,r5} pop {r0} bx r0 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 @@ -851152,12 +851152,12 @@ sub_81B87E8: @ 81B87E8 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _081B8802 + bne @081B8802 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081B881C -_081B8802: + beq @081B881C +@081B8802: movs r0, 0x5 bl audio_play movs r0, 0 @@ -851169,7 +851169,7 @@ _081B8802: adds r1, r0 ldr r0, =sub_81B1370 + 1 str r0, [r1] -_081B881C: +@081B881C: pop {r4} pop {r0} bx r0 @@ -851178,27 +851178,27 @@ _081B881C: thumb_func_end sub_81B87E8 thumb_func_start sub_81B8830 -sub_81B8830: @ 81B8830 +sub_81B8830: ; 81B8830 push {lr} ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x8 - beq _081B884C + beq @081B884C cmp r0, 0x9 - bne _081B8850 + bne @081B8850 movs r0, 0x3 - b _081B8854 + b @081B8854 .align 2, 0 .pool -_081B884C: +@081B884C: movs r0, 0x2 - b _081B8854 -_081B8850: + b @081B8854 +@081B8850: ldr r0, =0x020375e2 ldrb r0, [r0] -_081B8854: +@081B8854: pop {r1} bx r1 .align 2, 0 @@ -851206,27 +851206,27 @@ _081B8854: thumb_func_end sub_81B8830 thumb_func_start sub_81B885C -sub_81B885C: @ 81B885C +sub_81B885C: ; 81B885C push {lr} ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x8 - beq _081B8878 + beq @081B8878 cmp r0, 0x9 - bne _081B887C + bne @081B887C movs r0, 0x1 - b _081B8880 + b @081B8880 .align 2, 0 .pool -_081B8878: +@081B8878: movs r0, 0x2 - b _081B8880 -_081B887C: + b @081B8880 +@081B887C: ldr r0, =0x020375e2 ldrb r0, [r0] -_081B8880: +@081B8880: pop {r1} bx r1 .align 2, 0 @@ -851234,31 +851234,31 @@ _081B8880: thumb_func_end sub_81B885C thumb_func_start sub_81B8888 -sub_81B8888: @ 81B8888 +sub_81B8888: ; 81B8888 push {lr} ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x8 - beq _081B88A4 + beq @081B88A4 cmp r0, 0x9 - bne _081B88A8 -_081B889C: + bne @081B88A8 +@081B889C: movs r0, 0x64 - b _081B88B2 + b @081B88B2 .align 2, 0 .pool -_081B88A4: +@081B88A4: movs r0, 0x1E - b _081B88B2 -_081B88A8: + b @081B88B2 +@081B88A8: ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 - bne _081B889C + bne @081B889C movs r0, 0x32 -_081B88B2: +@081B88B2: pop {r1} bx r1 .align 2, 0 @@ -851266,7 +851266,7 @@ _081B88B2: thumb_func_end sub_81B8888 thumb_func_start sub_81B88BC -sub_81B88BC: @ 81B88BC +sub_81B88BC: ; 81B88BC push {lr} ldr r0, =0x000040cf bl var_get @@ -851277,25 +851277,25 @@ sub_81B88BC: @ 81B88BC adds r0, r2 lsrs r0, 24 cmp r0, 0x1 - bhi _081B88E0 + bhi @081B88E0 ldr r0, =0x085ea126 - b _081B88FA + b @081B88FA .align 2, 0 .pool -_081B88E0: +@081B88E0: cmp r1, 0x1 - bne _081B88F8 + bne @081B88F8 ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x2 - bne _081B88F8 + bne @081B88F8 ldr r0, =0x085ea139 - b _081B88FA + b @081B88FA .align 2, 0 .pool -_081B88F8: +@081B88F8: ldr r0, =0x085ea155 -_081B88FA: +@081B88FA: pop {r1} bx r1 .align 2, 0 @@ -851303,7 +851303,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 @@ -851325,7 +851325,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 @@ -851347,7 +851347,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 @@ -851369,31 +851369,31 @@ 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 cmp r0, 0 - bne _081B8994 + bne @081B8994 movs r0, 0 - b _081B89A6 -_081B8994: + b @081B89A6 +@081B8994: bl sub_81B1250 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081B89A4 + beq @081B89A4 movs r0, 0x1 - b _081B89A6 -_081B89A4: + b @081B89A6 +@081B89A4: movs r0, 0x2 -_081B89A6: +@081B89A6: pop {r1} bx r1 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 @@ -851424,7 +851424,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 @@ -851451,49 +851451,49 @@ 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 movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _081B8A74 + beq @081B8A74 adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _081B8A74 + bne @081B8A74 ldr r0, =0x0203cec8 ldrb r0, [r0, 0xB] cmp r0, 0x1 - bne _081B8A5C + bne @081B8A5C movs r0, 0x3 - b _081B8A76 + b @081B8A76 .align 2, 0 .pool -_081B8A5C: +@081B8A5C: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 11 ands r0, r1 cmp r0, 0 - bne _081B8A74 + bne @081B8A74 movs r0, 0x2 - b _081B8A76 + b @081B8A76 .align 2, 0 .pool -_081B8A74: +@081B8A74: movs r0, 0x7 -_081B8A76: +@081B8A76: pop {r4} pop {r1} bx r1 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} @@ -851504,14 +851504,14 @@ sub_81B8A7C: @ 81B8A7C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081B8AC4 + bne @081B8AC4 cmp r5, 0x1 - beq _081B8AA2 + beq @081B8AA2 cmp r5, 0x4 - beq _081B8AA2 + beq @081B8AA2 cmp r5, 0x5 - bne _081B8AC4 -_081B8AA2: + bne @081B8AC4 +@081B8AA2: ldr r4, =0x02021cc4 bl sub_806EBF8 adds r1, r0, 0 @@ -851519,10 +851519,10 @@ _081B8AA2: bl gf_strcpy ldr r0, =0x02021fc4 ldr r1, =0x085e97b2 - b _081B8C42 + b @081B8C42 .align 2, 0 .pool -_081B8AC4: +@081B8AC4: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -851532,24 +851532,24 @@ _081B8AC4: movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - bne _081B8AF8 + bne @081B8AF8 ldr r1, =0x02021cc4 adds r0, r4, 0 bl sub_81B1B44 ldr r0, =0x02021fc4 ldr r1, =0x085e978f - b _081B8C42 + b @081B8C42 .align 2, 0 .pool -_081B8AF8: +@081B8AF8: movs r4, 0 - b _081B8B24 -_081B8AFC: + b @081B8B24 +@081B8AFC: adds r0, r4, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _081B8B1E + bne @081B8B1E adds r0, r5, 0 bl sub_81B8F38 lsls r0, 24 @@ -851559,16 +851559,16 @@ _081B8AFC: lsrs r0, 24 ldrh r1, [r1] cmp r0, r1 - beq _081B8BFC -_081B8B1E: + beq @081B8BFC +@081B8B1E: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_081B8B24: +@081B8B24: ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - bcc _081B8AFC + bcc @081B8AFC movs r7, 0x64 adds r0, r5, 0 muls r0, r7 @@ -851579,13 +851579,13 @@ _081B8B24: movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - beq _081B8B60 + beq @081B8B60 ldr r0, =0x02021fc4 ldr r1, =0x085e97e5 - b _081B8C42 + b @081B8C42 .align 2, 0 .pool -_081B8B60: +@081B8B60: adds r0, r5, 0 bl sub_81B8F38 ldr r1, =0x0202449c @@ -851595,27 +851595,27 @@ _081B8B60: lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bne _081B8B94 + bne @081B8B94 ldr r1, =0x02021cc4 adds r0, r6, 0 bl sub_81B1B44 ldr r0, =0x02021fc4 ldr r1, =0x085e976f - b _081B8C42 + b @081B8C42 .align 2, 0 .pool -_081B8B94: +@081B8B94: ldr r0, =0x0203cec8 ldrb r0, [r0, 0xB] cmp r0, 0x4 - bne _081B8BA8 + bne @081B8BA8 bl sub_806E994 - b _081B8C46 + b @081B8C46 .align 2, 0 .pool -_081B8BA8: +@081B8BA8: cmp r0, 0x2 - beq _081B8C20 + beq @081B8C20 adds r0, r5, 0 bl sub_81B8F38 ldr r1, =0x0203cee9 @@ -851642,10 +851642,10 @@ _081B8BA8: adds r1, r6, 0 bl sub_81B1288 movs r0, 0x1 - b _081B8C48 + b @081B8C48 .align 2, 0 .pool -_081B8BFC: +@081B8BFC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -851654,10 +851654,10 @@ _081B8BFC: bl sub_81B1B44 ldr r0, =0x02021fc4 ldr r1, =0x085e9754 - b _081B8C42 + b @081B8C42 .align 2, 0 .pool -_081B8C20: +@081B8C20: ldr r0, =0x020244b8 ldrb r0, [r0] ldr r1, =0x0202406e @@ -851673,11 +851673,11 @@ _081B8C20: bl sub_81B1B44 ldr r0, =0x02021fc4 ldr r1, =0x085e9738 -_081B8C42: +@081B8C42: bl ExpandTextCodes -_081B8C46: +@081B8C46: movs r0, 0 -_081B8C48: +@081B8C48: pop {r3} mov r8, r3 pop {r4-r7} @@ -851688,7 +851688,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 @@ -851705,7 +851705,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 @@ -851715,29 +851715,29 @@ sub_81B8C88: @ 81B8C88 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081B8CBE + bne @081B8CBE cmp r4, 0 - beq _081B8CB0 + beq @081B8CB0 movs r0, 0x30 strb r0, [r6] movs r0, 0x45 strb r0, [r6, 0x1] movs r0, 0x12 strb r0, [r6, 0x2] - b _081B8D58 -_081B8CB0: + b @081B8D58 +@081B8CB0: movs r0, 0x3 strb r0, [r6] movs r0, 0x12 strb r0, [r6, 0x1] movs r0, 0x45 strb r0, [r6, 0x2] - b _081B8D58 -_081B8CBE: + b @081B8D58 +@081B8CBE: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - bne _081B8CFC + bne @081B8CFC movs r5, 0x1 movs r0, 0 bl battle_get_side_with_given_state @@ -851750,22 +851750,22 @@ _081B8CBE: strb r0, [r2] movs r4, 0 mov r1, sp -_081B8CE2: +@081B8CE2: ldrb r0, [r1] cmp r4, r0 - beq _081B8CF0 + beq @081B8CF0 mov r2, sp adds r0, r2, r5 strb r4, [r0] adds r5, 0x1 -_081B8CF0: +@081B8CF0: adds r4, 0x1 cmp r4, 0x5 - ble _081B8CE2 - b _081B8D40 + ble @081B8CE2 + b @081B8D40 .align 2, 0 .pool -_081B8CFC: +@081B8CFC: movs r5, 0x2 movs r0, 0 bl battle_get_side_with_given_state @@ -851785,25 +851785,25 @@ _081B8CFC: ldrh r0, [r0] strb r0, [r1, 0x1] movs r4, 0 -_081B8D26: +@081B8D26: ldrb r0, [r1] cmp r4, r0 - beq _081B8D3A + beq @081B8D3A ldrb r0, [r1, 0x1] cmp r4, r0 - beq _081B8D3A + beq @081B8D3A mov r2, sp adds r0, r2, r5 strb r4, [r0] adds r5, 0x1 -_081B8D3A: +@081B8D3A: adds r4, 0x1 cmp r4, 0x5 - ble _081B8D26 -_081B8D40: + ble @081B8D26 +@081B8D40: movs r4, 0 mov r3, sp -_081B8D44: +@081B8D44: adds r0, r6, r4 ldrb r1, [r3] lsls r1, 4 @@ -851813,8 +851813,8 @@ _081B8D44: adds r3, 0x2 adds r4, 0x1 cmp r4, 0x2 - ble _081B8D44 -_081B8D58: + ble @081B8D44 +@081B8D58: add sp, 0x8 pop {r4-r6} pop {r0} @@ -851824,7 +851824,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 @@ -851845,7 +851845,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 @@ -851857,20 +851857,20 @@ sub_81B8D88: @ 81B8D88 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _081B8DB0 + bne @081B8DB0 movs r0, 0 bl battle_get_side_with_given_state lsls r0, 24 lsrs r4, r0, 24 movs r0, 0x2 - b _081B8DBC -_081B8DB0: + b @081B8DBC +@081B8DB0: movs r0, 0x1 bl battle_get_side_with_given_state lsls r0, 24 lsrs r4, r0, 24 movs r0, 0x3 -_081B8DBC: +@081B8DBC: bl battle_get_side_with_given_state lsls r0, 24 lsrs r6, r0, 24 @@ -851878,29 +851878,29 @@ _081B8DBC: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081B8DF0 + bne @081B8DF0 cmp r7, 0 - beq _081B8DE2 + beq @081B8DE2 movs r0, 0x30 strb r0, [r5] movs r0, 0x45 strb r0, [r5, 0x1] movs r0, 0x12 strb r0, [r5, 0x2] - b _081B8E72 -_081B8DE2: + b @081B8E72 +@081B8DE2: movs r0, 0x3 strb r0, [r5] movs r0, 0x12 strb r0, [r5, 0x1] movs r0, 0x45 strb r0, [r5, 0x2] - b _081B8E72 -_081B8DF0: + b @081B8E72 +@081B8DF0: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - bne _081B8E28 + bne @081B8E28 movs r3, 0x1 mov r2, sp ldr r1, =0x0202406e @@ -851910,22 +851910,22 @@ _081B8DF0: strb r0, [r2] movs r4, 0 mov r1, sp -_081B8E0C: +@081B8E0C: ldrb r0, [r1] cmp r4, r0 - beq _081B8E1A + beq @081B8E1A mov r2, sp adds r0, r2, r3 strb r4, [r0] adds r3, 0x1 -_081B8E1A: +@081B8E1A: adds r4, 0x1 cmp r4, 0x5 - ble _081B8E0C - b _081B8E5A + ble @081B8E0C + b @081B8E5A .align 2, 0 .pool -_081B8E28: +@081B8E28: movs r3, 0x2 mov r1, sp ldr r2, =0x0202406e @@ -851938,25 +851938,25 @@ _081B8E28: ldrh r0, [r0] strb r0, [r1, 0x1] movs r4, 0 -_081B8E40: +@081B8E40: ldrb r0, [r1] cmp r4, r0 - beq _081B8E54 + beq @081B8E54 ldrb r0, [r1, 0x1] cmp r4, r0 - beq _081B8E54 + beq @081B8E54 mov r2, sp adds r0, r2, r3 strb r4, [r0] adds r3, 0x1 -_081B8E54: +@081B8E54: adds r4, 0x1 cmp r4, 0x5 - ble _081B8E40 -_081B8E5A: + ble @081B8E40 +@081B8E5A: movs r4, 0 mov r3, sp -_081B8E5E: +@081B8E5E: adds r0, r5, r4 ldrb r1, [r3] lsls r1, 4 @@ -851966,8 +851966,8 @@ _081B8E5E: adds r3, 0x2 adds r4, 0x1 cmp r4, 0x2 - ble _081B8E5E -_081B8E72: + ble @081B8E5E +@081B8E72: add sp, 0x8 pop {r4-r7} pop {r0} @@ -851977,7 +851977,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 @@ -851990,7 +851990,7 @@ sub_81B8E80: @ 81B8E80 bl sub_81B1250 lsls r0, 24 cmp r0, 0 - beq _081B8F2E + beq @081B8F2E ldr r0, =0x0202449c lsls r1, r4, 1 adds r1, r4 @@ -852002,7 +852002,7 @@ sub_81B8E80: @ 81B8E80 mov r12, r6 movs r6, 0xF mov r3, sp -_081B8EB2: +@081B8EB2: adds r1, r4, r2 ldrb r0, [r1] lsrs r0, 4 @@ -852015,34 +852015,34 @@ _081B8EB2: adds r3, 0x1 adds r2, 0x1 cmp r2, 0x2 - ble _081B8EB2 + ble @081B8EB2 mov r0, r12 ldrb r3, [r0] movs r2, 0 mov r0, sp ldrb r0, [r0] cmp r0, r5 - bne _081B8EE8 + bne @081B8EE8 mov r0, sp ldrb r7, [r0] strb r3, [r0] - b _081B8EFC + b @081B8EFC .align 2, 0 .pool -_081B8EE8: +@081B8EE8: adds r2, 0x1 cmp r2, 0x5 - bgt _081B8EFC + bgt @081B8EFC mov r0, sp adds r1, r0, r2 ldrb r0, [r1] cmp r0, r5 - bne _081B8EE8 + bne @081B8EE8 adds r7, r0, 0 strb r3, [r1] -_081B8EFC: +@081B8EFC: cmp r2, 0x6 - beq _081B8F2E + beq @081B8F2E mov r0, r12 strb r7, [r0] mov r0, sp @@ -852066,7 +852066,7 @@ _081B8EFC: ldrb r1, [r1, 0x5] orrs r0, r1 strb r0, [r4, 0x2] -_081B8F2E: +@081B8F2E: add sp, 0x8 pop {r4-r7} pop {r0} @@ -852074,7 +852074,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 @@ -852082,21 +852082,21 @@ sub_81B8F38: @ 81B8F38 ands r1, r2 lsrs r2, r0, 25 cmp r1, 0 - beq _081B8F58 + beq @081B8F58 ldr r0, =0x0203cf00 adds r0, r2, r0 ldrb r0, [r0] movs r1, 0xF ands r1, r0 - b _081B8F60 + b @081B8F60 .align 2, 0 .pool -_081B8F58: +@081B8F58: ldr r0, =0x0203cf00 adds r0, r2, r0 ldrb r0, [r0] lsrs r1, r0, 4 -_081B8F60: +@081B8F60: adds r0, r1, 0 pop {r1} bx r1 @@ -852105,7 +852105,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 @@ -852115,7 +852115,7 @@ sub_81B8F6C: @ 81B8F6C ands r1, r3 lsrs r3, r0, 25 cmp r1, 0 - beq _081B8F94 + beq @081B8F94 ldr r0, =0x0203cf00 adds r0, r3, r0 ldrb r2, [r0] @@ -852123,10 +852123,10 @@ sub_81B8F6C: @ 81B8F6C ands r1, r2 orrs r1, r4 strb r1, [r0] - b _081B8FA4 + b @081B8FA4 .align 2, 0 .pool -_081B8F94: +@081B8F94: ldr r2, =0x0203cf00 adds r2, r3, r2 ldrb r1, [r2] @@ -852135,7 +852135,7 @@ _081B8F94: lsls r1, r4, 4 orrs r0, r1 strb r0, [r2] -_081B8FA4: +@081B8FA4: pop {r4} pop {r0} bx r0 @@ -852144,7 +852144,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 @@ -852173,32 +852173,32 @@ 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 movs r3, 0 movs r2, 0 ldr r5, =0x0203cf00 -_081B8FF8: +@081B8FF8: adds r0, r3, r5 ldrb r1, [r0] lsrs r0, r1, 4 cmp r0, r4 - beq _081B9010 + beq @081B9010 adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 movs r0, 0xF ands r0, r1 cmp r0, r4 - bne _081B9018 -_081B9010: + bne @081B9018 +@081B9010: adds r0, r2, 0 - b _081B902A + b @081B902A .align 2, 0 .pool -_081B9018: +@081B9018: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 @@ -852206,16 +852206,16 @@ _081B9018: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x2 - bls _081B8FF8 + bls @081B8FF8 movs r0, 0 -_081B902A: +@081B902A: pop {r4,r5} pop {r1} bx r1 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 @@ -852227,7 +852227,7 @@ pokemon_change_order: @ 81B9030 bl memcpy movs r4, 0 movs r6, 0x64 -_081B904A: +@081B904A: adds r0, r4, 0 bl pokemon_order_func lsls r0, 24 @@ -852244,7 +852244,7 @@ _081B904A: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls _081B904A + bls @081B904A adds r0, r5, 0 bl free pop {r4-r6} @@ -852255,7 +852255,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 @@ -852267,7 +852267,7 @@ sub_81B9080: @ 81B9080 bl memcpy movs r4, 0 movs r6, 0x64 -_081B909A: +@081B909A: adds r0, r4, 0 bl sub_81B8F38 lsls r0, 24 @@ -852284,7 +852284,7 @@ _081B909A: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls _081B909A + bls @081B909A adds r0, r5, 0 bl free pop {r4-r6} @@ -852295,7 +852295,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} @@ -852303,7 +852303,7 @@ sub_81B90D0: @ 81B90D0 movs r7, 0x64 ldr r0, =0x020244ec mov r8, r0 -_081B90DE: +@081B90DE: adds r0, r6, 0 bl sub_81B8F38 lsls r0, 24 @@ -852315,12 +852315,12 @@ _081B90DE: movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq _081B912C + beq @081B912C adds r0, r5, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _081B912C + beq @081B912C movs r0, 0 bl sub_81B8F38 adds r4, r0, 0 @@ -852334,16 +852334,16 @@ _081B90DE: add r0, r8 adds r1, r5, 0 bl sub_81B1288 - b _081B9136 + b @081B9136 .align 2, 0 .pool -_081B912C: +@081B912C: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x5 - bls _081B90DE -_081B9136: + bls @081B90DE +@081B9136: pop {r3} mov r8, r3 pop {r4-r7} @@ -852352,7 +852352,7 @@ _081B9136: thumb_func_end sub_81B90D0 thumb_func_start sub_81B9140 -sub_81B9140: @ 81B9140 +sub_81B9140: ; 81B9140 push {lr} ldr r0, =sub_8059D40 + 1 bl set_callback2 @@ -852363,7 +852363,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 @@ -852386,7 +852386,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 @@ -852414,7 +852414,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 @@ -852428,7 +852428,7 @@ sub_81B91B4: @ 81B91B4 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081B9220 + bne @081B9220 ldrh r0, [r4] subs r0, 0x8 strh r0, [r4] @@ -852437,16 +852437,16 @@ sub_81B91B4: @ 81B91B4 movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0 - bne _081B9220 + bne @081B9220 movs r4, 0x3 ldr r7, =0x02022ff8 -_081B91E8: +@081B91E8: subs r0, r4, 0x3 lsls r0, 5 adds r0, r7 ldrh r0, [r0] cmp r0, 0 - beq _081B9204 + beq @081B9204 ldr r0, =0x0203cedc ldr r1, [r0] lsls r0, r4, 4 @@ -852454,12 +852454,12 @@ _081B91E8: ldrb r0, [r0, 0x9] movs r1, 0 bl sub_81B5B6C -_081B9204: +@081B9204: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls _081B91E8 + bls @081B91E8 movs r0, 0x78 bl audio_play ldr r0, =0x03005e00 @@ -852468,7 +852468,7 @@ _081B9204: adds r1, r0 ldr r0, =sub_81B9240 + 1 str r0, [r1] -_081B9220: +@081B9220: pop {r4-r7} pop {r0} bx r0 @@ -852477,7 +852477,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 @@ -852493,10 +852493,10 @@ sub_81B9240: @ 81B9240 movs r0, 0x80 lsls r0, 17 cmp r1, r0 - bne _081B9266 + bne @081B9266 adds r0, r2, 0 bl sub_81B12C0 -_081B9266: +@081B9266: pop {r0} bx r0 .align 2, 0 @@ -852504,21 +852504,21 @@ _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 lsls r1, 16 lsrs r3, r1, 16 cmp r1, 0 - blt _081B928A + blt @081B928A ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 adds r0, r1 strh r3, [r0, 0x24] -_081B928A: +@081B928A: pop {r0} bx r0 .align 2, 0 @@ -852526,7 +852526,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 @@ -852537,14 +852537,14 @@ sub_81B9294: @ 81B9294 adds r5, r1, r0 movs r6, 0x3 ldr r7, =0x0203cedc -_081B92A8: +@081B92A8: ldr r0, =0x02022ff8 subs r1, r6, 0x3 lsls r1, 5 adds r1, r0 ldrh r0, [r1] cmp r0, 0 - beq _081B9300 + beq @081B9300 ldr r0, [r7] lsls r4, r6, 4 adds r0, r4, r0 @@ -852578,12 +852578,12 @@ _081B92A8: lsls r1, 16 asrs r1, 16 bl sub_81B9270 -_081B9300: +@081B9300: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x5 - bls _081B92A8 + bls @081B92A8 movs r1, 0x80 lsls r1, 4 movs r0, 0x2 @@ -852597,7 +852597,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 @@ -852619,7 +852619,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 @@ -852645,7 +852645,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 @@ -852653,10 +852653,10 @@ sub_81B9390: @ 81B9390 lsrs r0, 24 strh r0, [r4] cmp r0, 0x5 - bls _081B93A6 + bls @081B93A6 movs r0, 0xFF strh r0, [r4] -_081B93A6: +@081B93A6: ldr r0, =0x03005db0 ldr r1, =hm_add_c3_without_phase_2 + 1 str r1, [r0] @@ -852670,7 +852670,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 + 1 @@ -852684,26 +852684,26 @@ 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 bl sub_80ABDFC lsls r0, 24 cmp r0, 0 - beq _081B93FE + beq @081B93FE adds r0, r4, 0 bl remove_task bl script_env_2_disable bl script_env_2_enable_and_set_ctx_running -_081B93FE: +@081B93FE: pop {r4} pop {r0} bx r0 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 @@ -852719,7 +852719,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 @@ -852731,7 +852731,7 @@ sub_81B9424: @ 81B9424 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _081B945C + bne @081B945C bl overworld_free_bg_tilemaps str r4, [sp] ldr r0, =sub_81B1370 + 1 @@ -852745,7 +852745,7 @@ sub_81B9424: @ 81B9424 bl sub_81B0038 adds r0, r5, 0 bl remove_task -_081B945C: +@081B945C: add sp, 0xC pop {r4,r5} pop {r0} @@ -852755,7 +852755,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 @@ -852763,10 +852763,10 @@ sub_81B9470: @ 81B9470 lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 - bls _081B9486 + bls @081B9486 movs r0, 0xFF strb r0, [r2] -_081B9486: +@081B9486: ldr r1, =0x020375e0 ldrb r0, [r2] strh r0, [r1] @@ -852782,7 +852782,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 @@ -852798,7 +852798,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 @@ -852810,7 +852810,7 @@ sub_81B94D0: @ 81B94D0 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _081B9508 + bne @081B9508 bl overworld_free_bg_tilemaps str r4, [sp] ldr r0, =sub_81B1370 + 1 @@ -852824,7 +852824,7 @@ sub_81B94D0: @ 81B94D0 bl sub_81B0038 adds r0, r5, 0 bl remove_task -_081B9508: +@081B9508: add sp, 0xC pop {r4,r5} pop {r0} @@ -852834,7 +852834,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 @@ -852850,7 +852850,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 @@ -852862,7 +852862,7 @@ sub_81B953C: @ 81B953C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _081B9574 + bne @081B9574 bl overworld_free_bg_tilemaps str r4, [sp] ldr r0, =sub_81B1370 + 1 @@ -852876,7 +852876,7 @@ sub_81B953C: @ 81B953C bl sub_81B0038 adds r0, r5, 0 bl remove_task -_081B9574: +@081B9574: add sp, 0xC pop {r4,r5} pop {r0} @@ -852886,7 +852886,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 @@ -852894,13 +852894,13 @@ sub_81B9588: @ 81B9588 lsrs r0, 24 strh r0, [r5] cmp r0, 0x5 - bls _081B95A4 + bls @081B95A4 movs r0, 0xFF strh r0, [r5] - b _081B95BA + b @081B95BA .align 2, 0 .pool -_081B95A4: +@081B95A4: ldr r4, =0x020375e2 ldrh r1, [r5] movs r0, 0x64 @@ -852911,7 +852911,7 @@ _081B95A4: lsls r0, 24 lsrs r0, 24 strh r0, [r4] -_081B95BA: +@081B95BA: ldr r0, =0x03005db0 ldr r1, =hm_add_c3_without_phase_2 + 1 str r1, [r0] @@ -852925,23 +852925,23 @@ _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 strh r0, [r1] movs r4, 0 adds r5, r1, 0 - b _081B95FA + b @081B95FA .align 2, 0 .pool -_081B95F4: +@081B95F4: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_081B95FA: +@081B95FA: cmp r4, 0x2 - bhi _081B9614 + bhi @081B9614 movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -852949,10 +852949,10 @@ _081B95FA: movs r1, 0xC bl pokemon_getattr cmp r0, 0 - beq _081B95F4 + beq @081B95F4 movs r0, 0x1 strh r0, [r5] -_081B9614: +@081B9614: pop {r4,r5} pop {r0} bx r0 @@ -852961,7 +852961,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 @@ -852977,7 +852977,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 @@ -852989,7 +852989,7 @@ sub_81B9640: @ 81B9640 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _081B9678 + bne @081B9678 bl overworld_free_bg_tilemaps str r4, [sp] ldr r0, =sub_81B1370 + 1 @@ -853003,7 +853003,7 @@ sub_81B9640: @ 81B9640 bl sub_81B0038 adds r0, r5, 0 bl remove_task -_081B9678: +@081B9678: add sp, 0xC pop {r4,r5} pop {r0} @@ -853013,7 +853013,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 @@ -853039,14 +853039,14 @@ 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 strh r0, [r1] movs r4, 0 adds r5, r1, 0 -_081B96DC: +@081B96DC: ldr r0, =0x020375e0 ldrh r1, [r0] movs r0, 0x64 @@ -853057,16 +853057,16 @@ _081B96DC: adds r1, 0xD bl pokemon_getattr cmp r0, 0 - beq _081B96FA + beq @081B96FA ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] -_081B96FA: +@081B96FA: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _081B96DC + bls @081B96DC pop {r4,r5} pop {r0} bx r0 @@ -853075,7 +853075,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] @@ -853109,7 +853109,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} @@ -853132,8 +853132,8 @@ sub_81B9770: @ 81B9770 bl sub_806B9A8 ldrh r4, [r4] cmp r4, 0x2 - bhi _081B97C4 -_081B97A2: + bhi @081B97C4 +@081B97A2: ldr r0, =0x020375e0 ldrh r1, [r0] movs r0, 0x64 @@ -853149,8 +853149,8 @@ _081B97A2: lsls r4, 16 lsrs r4, 16 cmp r4, 0x2 - bls _081B97A2 -_081B97C4: + bls @081B97A2 +@081B97C4: pop {r3} mov r8, r3 pop {r4-r6} @@ -853161,7 +853161,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 @@ -853283,7 +853283,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] @@ -853295,17 +853295,17 @@ sub_81B98DC: @ 81B98DC bl pokemon_getattr adds r1, r0, 0 cmp r1, 0 - beq _081B990C + beq @081B990C ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] - b _081B9910 + b @081B9910 .align 2, 0 .pool -_081B990C: +@081B990C: ldr r0, =0x020375f0 strh r1, [r0] -_081B9910: +@081B9910: pop {r0} bx r0 .align 2, 0 @@ -853313,7 +853313,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} @@ -853334,47 +853334,47 @@ sub_81B9918: @ 81B9918 lsrs r0, 16 mov r8, r0 cmp r0, 0x39 - bne _081B999C + bne @081B999C movs r6, 0 - b _081B9980 + b @081B9980 .align 2, 0 .pool -_081B9958: +@081B9958: ldr r0, =0x020375e0 ldrh r0, [r0] cmp r6, r0 - beq _081B997E + beq @081B997E movs r4, 0 movs r0, 0x64 adds r5, r6, 0 muls r5, r0 ldr r7, =0x020244ec -_081B996A: +@081B996A: adds r1, r4, 0 adds r1, 0xD adds r0, r5, r7 bl pokemon_getattr cmp r0, 0x39 - beq _081B999C + beq @081B999C adds r4, 0x1 cmp r4, 0x3 - bls _081B996A -_081B997E: + bls @081B996A +@081B997E: adds r6, 0x1 -_081B9980: +@081B9980: bl calc_player_party_count lsls r0, 24 lsrs r0, 24 cmp r6, r0 - bcc _081B9958 + bcc @081B9958 mov r0, r8 bl sub_80D23A8 cmp r0, 0x1 - beq _081B999C + beq @081B999C ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] -_081B999C: +@081B999C: pop {r3} mov r8, r3 pop {r4-r7} @@ -853385,7 +853385,7 @@ _081B999C: thumb_func_end sub_81B9918 thumb_func_start sub_81B99B4 -sub_81B99B4: @ 81B99B4 +sub_81B99B4: ; 81B99B4 push {lr} ldr r1, =0x086160b4 ldr r0, =0x020375e0 @@ -853401,7 +853401,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] @@ -853437,7 +853437,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] @@ -853451,7 +853451,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 @@ -853465,7 +853465,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 @@ -853490,13 +853490,13 @@ 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] ldr r0, =0x0000012b cmp r1, r0 - bhi _081B9AAC + bhi @081B9AAC ldr r2, =0x0203bc88 movs r0, 0x34 muls r1, r0 @@ -853504,7 +853504,7 @@ sub_81B9A90: @ 81B9A90 adds r0, r1 adds r0, 0xC bl sub_81638AC -_081B9AAC: +@081B9AAC: pop {r0} bx r0 .align 2, 0 @@ -853512,7 +853512,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] @@ -853541,7 +853541,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] @@ -853559,7 +853559,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] @@ -853571,7 +853571,7 @@ sub_81B9B28: @ 81B9B28 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x1 - bne _081B9B70 + bne @081B9B70 ldr r0, [r4] ldr r1, =0x00000e6a adds r0, r1 @@ -853585,14 +853585,14 @@ sub_81B9B28: @ 81B9B28 strh r1, [r0] ldr r0, =0x020375f0 strh r5, [r0] - b _081B9B76 + b @081B9B76 .align 2, 0 .pool -_081B9B70: +@081B9B70: ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] -_081B9B76: +@081B9B76: pop {r4,r5} pop {r0} bx r0 @@ -853601,7 +853601,7 @@ _081B9B76: thumb_func_end sub_81B9B28 thumb_func_start sub_81B9B80 -sub_81B9B80: @ 81B9B80 +sub_81B9B80: ; 81B9B80 push {lr} ldr r1, =0x086160d8 ldr r0, =0x020375e0 @@ -853617,7 +853617,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] @@ -853653,7 +853653,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] @@ -853667,7 +853667,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 @@ -853681,7 +853681,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] @@ -853710,7 +853710,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] @@ -853728,7 +853728,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] @@ -853740,7 +853740,7 @@ sub_81B9C98: @ 81B9C98 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x1 - bne _081B9CE0 + bne @081B9CE0 ldr r0, [r4] ldr r1, =0x00000e6c adds r0, r1 @@ -853754,14 +853754,14 @@ sub_81B9C98: @ 81B9C98 strh r1, [r0] ldr r0, =0x020375f0 strh r5, [r0] - b _081B9CE6 + b @081B9CE6 .align 2, 0 .pool -_081B9CE0: +@081B9CE0: ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] -_081B9CE6: +@081B9CE6: pop {r4,r5} pop {r0} bx r0 @@ -853770,7 +853770,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 @@ -853783,7 +853783,7 @@ sub_81B9CF0: @ 81B9CF0 thumb_func_end sub_81B9CF0 thumb_func_start sub_81B9D08 -sub_81B9D08: @ 81B9D08 +sub_81B9D08: ; 81B9D08 push {lr} ldr r1, =0x086160f8 ldr r0, =0x020375e0 @@ -853799,7 +853799,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] @@ -853835,7 +853835,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] @@ -853849,7 +853849,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 @@ -853863,7 +853863,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] @@ -853892,7 +853892,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] @@ -853910,7 +853910,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] @@ -853922,7 +853922,7 @@ sub_81B9E20: @ 81B9E20 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x1 - bne _081B9E68 + bne @081B9E68 ldr r0, [r4] ldr r1, =0x00000e6e adds r0, r1 @@ -853936,14 +853936,14 @@ sub_81B9E20: @ 81B9E20 strh r1, [r0] ldr r0, =0x020375f0 strh r5, [r0] - b _081B9E6E + b @081B9E6E .align 2, 0 .pool -_081B9E68: +@081B9E68: ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] -_081B9E6E: +@081B9E6E: pop {r4,r5} pop {r0} bx r0 @@ -853952,7 +853952,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 @@ -853961,7 +853961,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} @@ -853969,13 +853969,13 @@ 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 ldrb r0, [r1, 0x14] cmp r0, 0x8 - bne _081B9EB2 + bne @081B9EB2 ldr r3, =0xfffffe7f adds r0, r3, 0 ldrh r1, [r1, 0x12] @@ -853983,9 +853983,9 @@ sub_81B9E94: @ 81B9E94 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bhi _081B9EB2 + bhi @081B9EB2 movs r2, 0x1 -_081B9EB2: +@081B9EB2: adds r0, r2, 0 pop {r1} bx r1 @@ -853994,7 +853994,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 @@ -854017,7 +854017,7 @@ sub_81B9EC0: @ 81B9EC0 mov r0, sp movs r6, 0x5 mov r8, r6 -_081B9EEC: +@081B9EEC: strh r2, [r0] strh r2, [r1] strh r2, [r3] @@ -854029,7 +854029,7 @@ _081B9EEC: add r8, r7 mov r6, r8 cmp r6, 0 - bge _081B9EEC + bge @081B9EEC str r4, [r5] movs r7, 0 mov r10, r7 @@ -854043,7 +854043,7 @@ _081B9EEC: str r6, [sp, 0x24] add r6, r9 str r6, [sp, 0x28] -_081B9F1E: +@081B9F1E: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -854055,11 +854055,11 @@ _081B9F1E: mov r7, r8 adds r6, r2, r7 cmp r2, r6 - bge _081B9F7C + bge @081B9F7C ldr r1, [sp, 0x28] ldrh r0, [r1] cmp r0, r5 - beq _081B9F7C + beq @081B9F7C ldr r0, =0x0203bc8c ldr r1, [r0] lsls r0, r5, 4 @@ -854070,43 +854070,43 @@ _081B9F1E: ldr r1, [sp, 0x24] add r1, sp str r6, [sp, 0x38] -_081B9F56: +@081B9F56: ldrh r0, [r1] cmp r0, r12 - bne _081B9F66 + bne @081B9F66 mov r0, r10 cmp r0, 0 - bne _081B9F7C + bne @081B9F7C ldrh r7, [r4] mov r10, r7 -_081B9F66: +@081B9F66: adds r3, 0x2 adds r1, 0x2 adds r2, 0x1 ldr r0, [sp, 0x38] cmp r2, r0 - bge _081B9F7C + bge @081B9F7C mov r7, r9 adds r0, r7, r3 ldrh r0, [r0] cmp r0, r5 - bne _081B9F56 -_081B9F7C: + bne @081B9F56 +@081B9F7C: cmp r2, r6 - bne _081BA01C + bne @081BA01C movs r2, 0 cmp r2, r6 - bge _081B9FD4 + bge @081B9FD4 ldr r0, =0x085cecb0 mov r12, r0 ldr r7, =0x0203bc8c ldr r1, [sp, 0x24] ldr r0, [sp, 0x2C] adds r4, r1, r0 -_081B9F92: +@081B9F92: ldrh r3, [r4] cmp r3, 0 - beq _081B9FCC + beq @081B9FCC ldr r1, [r7] lsls r0, r5, 4 adds r1, r0, r1 @@ -854115,23 +854115,23 @@ _081B9F92: add r0, r12 ldrh r0, [r0] cmp r3, r0 - bne _081B9FCC + bne @081B9FCC ldrh r0, [r1] cmp r0, r10 - bne _081B9FD4 + bne @081B9FD4 movs r1, 0 mov r10, r1 - b _081B9FD4 + b @081B9FD4 .align 2, 0 .pool -_081B9FCC: +@081B9FCC: adds r4, 0x2 adds r2, 0x1 cmp r2, r6 - blt _081B9F92 -_081B9FD4: + blt @081B9F92 +@081B9FD4: cmp r2, r6 - bne _081BA01C + bne @081BA01C ldr r0, =0x03005d90 ldr r1, [r0] mov r2, r8 @@ -854166,12 +854166,12 @@ _081B9FD4: str r2, [sp, 0x34] movs r6, 0x1 add r8, r6 -_081BA01C: +@081BA01C: mov r7, r8 cmp r7, 0x6 - beq _081BA024 - b _081B9F1E -_081BA024: + beq @081BA024 + b @081B9F1E +@081BA024: add sp, 0x3C pop {r3-r5} mov r8, r3 @@ -854185,7 +854185,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 @@ -854203,10 +854203,10 @@ sub_81BA040: @ 81BA040 ldr r7, =0x03005d90 ldr r1, =0x0000ffff mov r8, r1 -_081BA062: +@081BA062: mov r2, r10 lsls r6, r2, 1 -_081BA066: +@081BA066: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -854220,33 +854220,33 @@ _081BA066: adds r0, r1, r4 ldrh r0, [r0] cmp r5, r0 - bge _081BA0AA + bge @081BA0AA ldr r2, =0x00000cb4 adds r0, r1, r2 ldrh r0, [r0] cmp r0, r3 - beq _081BA0AA + beq @081BA0AA ldr r0, =0x03005d90 ldr r1, [r0] adds r0, r1, r4 ldrh r2, [r0] adds r4, 0x2 adds r1, r4 -_081BA09C: +@081BA09C: adds r1, 0x2 adds r5, 0x1 cmp r5, r2 - bge _081BA0AA + bge @081BA0AA ldrh r0, [r1] cmp r0, r3 - bne _081BA09C -_081BA0AA: + bne @081BA09C +@081BA0AA: ldr r0, [r7] ldr r1, =0x00000cb2 adds r0, r1 ldrh r0, [r0] cmp r5, r0 - bne _081BA066 + bne @081BA066 ldr r2, =0x02038bca strh r3, [r2] ldrh r3, [r2] @@ -854259,39 +854259,39 @@ _081BA0AA: adds r1, r6, r0 ldrh r0, [r1] cmp r0, r8 - beq _081BA0DE + beq @081BA0DE ldr r3, =0x0000ffff -_081BA0D2: +@081BA0D2: adds r1, 0x2 movs r6, 0x1 add r10, r6 ldrh r0, [r1] cmp r0, r3 - bne _081BA0D2 -_081BA0DE: + bne @081BA0D2 +@081BA0DE: mov r0, r10 cmp r0, 0x8 - bgt _081BA110 + bgt @081BA110 movs r1, 0 mov r10, r1 - b _081BA062 + b @081BA062 .align 2, 0 .pool -_081BA110: +@081BA110: ldr r0, =0x03005d90 ldr r1, [r0] ldr r6, =0x00000cb2 adds r3, r1, r6 ldrh r0, [r3] cmp r0, 0x1 - bhi _081BA12A + bhi @081BA12A lsls r0, 1 ldr r3, =0x00000cb4 adds r1, r3 adds r1, r0 ldrh r0, [r2] strh r0, [r1] -_081BA12A: +@081BA12A: ldrh r1, [r2] ldr r2, [r4] movs r0, 0x34 @@ -854302,7 +854302,7 @@ _081BA12A: movs r5, 0 ldr r7, =0x03001298 mov r8, sp -_081BA13E: +@081BA13E: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -854321,7 +854321,7 @@ _081BA13E: ldr r1, =0x03005d90 ldrh r6, [r0] ldr r1, [r1] -_081BA166: +@081BA166: movs r4, 0xE7 lsls r4, 4 adds r0, r1, r4 @@ -854330,29 +854330,29 @@ _081BA166: adds r0, r3 ldrh r0, [r0] cmp r6, r0 - beq _081BA180 + beq @081BA180 adds r1, 0xC adds r2, 0x1 cmp r2, 0x5 - ble _081BA166 -_081BA180: + ble @081BA166 +@081BA180: cmp r2, 0x6 - bne _081BA220 + bne @081BA220 movs r4, 0 cmp r4, r5 - bge _081BA1B0 + bge @081BA1B0 mov r0, sp ldrh r0, [r0] cmp r0, r6 - beq _081BA1B0 + beq @081BA1B0 ldr r6, =0x03001298 ldr r3, =0x0203bc8c mov r2, sp -_081BA198: +@081BA198: adds r2, 0x2 adds r4, 0x1 cmp r4, r5 - bge _081BA1B0 + bge @081BA1B0 ldrh r0, [r6] ldr r1, [r3] lsls r0, 4 @@ -854360,20 +854360,20 @@ _081BA198: ldrh r1, [r2] ldrh r0, [r0] cmp r1, r0 - bne _081BA198 -_081BA1B0: + bne @081BA198 +@081BA1B0: cmp r4, r5 - bne _081BA220 + bne @081BA220 movs r4, 0 cmp r4, r5 - bge _081BA1E6 + bge @081BA1E6 ldr r6, =0x085cecb0 mov r12, r6 add r3, sp, 0x8 -_081BA1C0: +@081BA1C0: ldrh r2, [r3] cmp r2, 0 - beq _081BA1DE + beq @081BA1DE ldr r1, =0x03001298 ldrh r0, [r1] ldr r6, =0x0203bc8c @@ -854385,15 +854385,15 @@ _081BA1C0: add r0, r12 ldrh r0, [r0] cmp r2, r0 - beq _081BA1E6 -_081BA1DE: + beq @081BA1E6 +@081BA1DE: adds r3, 0x2 adds r4, 0x1 cmp r4, r5 - blt _081BA1C0 -_081BA1E6: + blt @081BA1C0 +@081BA1E6: cmp r4, r5 - bne _081BA220 + bne @081BA220 lsls r2, r5, 1 ldrh r0, [r7] ldr r1, =0x0203bc8c @@ -854421,9 +854421,9 @@ _081BA1E6: movs r4, 0x2 add r8, r4 adds r5, 0x1 -_081BA220: +@081BA220: cmp r5, 0x3 - bne _081BA13E + bne @081BA13E add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -854437,54 +854437,54 @@ _081BA220: thumb_func_end sub_81BA040 thumb_func_start Font6Func -@ int Font6Func(struct TextBox *x) -Font6Func: @ 81BA250 +; int Font6Func(struct TextBox *x) +Font6Func: ; 81BA250 push {r4-r6,lr} adds r6, r0, 0 adds r4, r6, 0 adds r4, 0x14 ldrb r0, [r6, 0x1C] cmp r0, 0x6 - bls _081BA260 - b _081BA660 -_081BA260: + bls @081BA260 + b @081BA660 +@081BA260: lsls r0, 2 - ldr r1, =_081BA270 + ldr r1, =@081BA270 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081BA270: - .4byte _081BA28C - .4byte _081BA554 - .4byte _081BA566 - .4byte _081BA590 - .4byte _081BA5C8 - .4byte _081BA63C - .4byte _081BA64E -_081BA28C: +@081BA270: + .4byte @081BA28C + .4byte @081BA554 + .4byte @081BA566 + .4byte @081BA590 + .4byte @081BA5C8 + .4byte @081BA63C + .4byte @081BA64E +@081BA28C: ldr r2, =0x030022c0 ldrh r1, [r2, 0x2C] movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _081BA2A6 + beq @081BA2A6 ldrb r1, [r4] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _081BA2A6 + beq @081BA2A6 movs r0, 0 strb r0, [r6, 0x1E] -_081BA2A6: +@081BA2A6: ldrb r1, [r6, 0x1E] cmp r1, 0 - beq _081BA2E8 + beq @081BA2E8 ldrb r0, [r6, 0x1D] cmp r0, 0 - beq _081BA2E8 + beq @081BA2E8 subs r0, r1, 0x1 strb r0, [r6, 0x1E] ldr r0, =0x03003014 @@ -854492,39 +854492,39 @@ _081BA2A6: movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _081BA2C4 - b _081BA50E -_081BA2C4: + bne @081BA2C4 + b @081BA50E +@081BA2C4: ldrh r1, [r2, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne _081BA2D0 - b _081BA50E -_081BA2D0: + bne @081BA2D0 + b @081BA50E +@081BA2D0: ldrb r0, [r4] movs r1, 0x10 orrs r0, r1 strb r0, [r4] movs r0, 0 strb r0, [r6, 0x1E] - b _081BA50E + b @081BA50E .align 2, 0 .pool -_081BA2E8: +@081BA2E8: ldr r2, =0x03003014 ldrb r1, [r2] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _081BA2FC + beq @081BA2FC movs r0, 0x3 - b _081BA2FE + b @081BA2FE .align 2, 0 .pool -_081BA2FC: +@081BA2FC: ldrb r0, [r6, 0x1D] -_081BA2FE: +@081BA2FE: strb r0, [r6, 0x1E] ldr r0, [r6] ldrb r3, [r0] @@ -854533,27 +854533,27 @@ _081BA2FE: adds r0, r3, 0 subs r0, 0xF8 cmp r0, 0x7 - bls _081BA312 - b _081BA52E -_081BA312: + bls @081BA312 + b @081BA52E +@081BA312: lsls r0, 2 - ldr r1, =_081BA320 + ldr r1, =@081BA320 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081BA320: - .4byte _081BA524 - .4byte _081BA512 - .4byte _081BA504 - .4byte _081BA500 - .4byte _081BA36E - .4byte _081BA368 - .4byte _081BA340 - .4byte _081BA660 -_081BA340: +@081BA320: + .4byte @081BA524 + .4byte @081BA512 + .4byte @081BA504 + .4byte @081BA500 + .4byte @081BA36E + .4byte @081BA368 + .4byte @081BA340 + .4byte @081BA660 +@081BA340: ldrb r0, [r6, 0x6] strb r0, [r6, 0x8] ldrb r1, [r6, 0x5] @@ -854569,51 +854569,51 @@ _081BA340: ldrb r0, [r6, 0x9] adds r0, r1 strb r0, [r6, 0x9] -_081BA35E: +@081BA35E: movs r0, 0x2 - b _081BA662 + b @081BA662 .align 2, 0 .pool -_081BA368: +@081BA368: ldr r0, [r6] adds r0, 0x1 - b _081BA4C4 -_081BA36E: + b @081BA4C4 +@081BA36E: ldr r0, [r6] ldrb r3, [r0] adds r0, 0x1 str r0, [r6] subs r0, r3, 0x1 cmp r0, 0xF - bls _081BA37E - b _081BA52E -_081BA37E: + bls @081BA37E + b @081BA52E +@081BA37E: lsls r0, 2 - ldr r1, =_081BA38C + ldr r1, =@081BA38C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081BA38C: - .4byte _081BA3CC - .4byte _081BA3EE - .4byte _081BA412 - .4byte _081BA42C - .4byte _081BA478 - .4byte _081BA47E - .4byte _081BA35E - .4byte _081BA498 - .4byte _081BA4A8 - .4byte _081BA4BC - .4byte _081BA4C0 - .4byte _081BA4C8 - .4byte _081BA4D2 - .4byte _081BA4DE - .4byte _081BA4EE - .4byte _081BA4C0 -_081BA3CC: +@081BA38C: + .4byte @081BA3CC + .4byte @081BA3EE + .4byte @081BA412 + .4byte @081BA42C + .4byte @081BA478 + .4byte @081BA47E + .4byte @081BA35E + .4byte @081BA498 + .4byte @081BA4A8 + .4byte @081BA4BC + .4byte @081BA4C0 + .4byte @081BA4C8 + .4byte @081BA4D2 + .4byte @081BA4DE + .4byte @081BA4EE + .4byte @081BA4C0 +@081BA3CC: ldr r2, [r6] ldrb r1, [r2] lsls r1, 4 @@ -854630,8 +854630,8 @@ _081BA3CC: lsls r1, r2, 28 lsrs r1, 28 lsrs r2, 4 - b _081BA472 -_081BA3EE: + b @081BA472 +@081BA3EE: ldr r1, [r6] ldrb r2, [r1] movs r0, 0xF @@ -854649,8 +854649,8 @@ _081BA3EE: lsls r1, r2, 28 lsrs r1, 28 lsrs r2, 4 - b _081BA472 -_081BA412: + b @081BA472 +@081BA412: ldr r1, [r6] ldrb r0, [r1] lsls r0, 4 @@ -854663,8 +854663,8 @@ _081BA412: str r1, [r6] ldrb r0, [r6, 0xC] lsrs r0, 4 - b _081BA46A -_081BA42C: + b @081BA46A +@081BA42C: ldr r3, [r6] ldrb r1, [r3] lsls r1, 4 @@ -854696,19 +854696,19 @@ _081BA42C: str r4, [r6] lsls r0, 24 lsrs r0, 28 -_081BA46A: +@081BA46A: lsls r1, r2, 28 lsrs r1, 28 lsls r2, 24 lsrs r2, 28 -_081BA472: +@081BA472: bl GenerateFontHalfRowLut - b _081BA35E -_081BA478: + b @081BA35E +@081BA478: ldr r0, [r6] adds r0, 0x1 - b _081BA4C4 -_081BA47E: + b @081BA4C4 +@081BA47E: ldr r0, [r6] ldrb r0, [r0] movs r1, 0xF @@ -854721,8 +854721,8 @@ _081BA47E: strb r0, [r4] ldr r0, [r6] adds r0, 0x1 - b _081BA4C4 -_081BA498: + b @081BA4C4 +@081BA498: ldr r0, [r6] ldrb r1, [r0] strb r1, [r6, 0x1E] @@ -854730,51 +854730,51 @@ _081BA498: str r0, [r6] movs r0, 0x6 strb r0, [r6, 0x1C] - b _081BA35E -_081BA4A8: + b @081BA35E +@081BA4A8: movs r0, 0x1 strb r0, [r6, 0x1C] ldrb r1, [r2] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _081BA50E + beq @081BA50E movs r0, 0 strb r0, [r4, 0x2] - b _081BA50E -_081BA4BC: + b @081BA50E +@081BA4BC: movs r0, 0x5 - b _081BA64A -_081BA4C0: + b @081BA64A +@081BA4C0: ldr r0, [r6] adds r0, 0x2 -_081BA4C4: +@081BA4C4: str r0, [r6] - b _081BA35E -_081BA4C8: + b @081BA35E +@081BA4C8: ldr r1, [r6] adds r0, r1, 0x1 str r0, [r6] ldrb r3, [r1, 0x1] - b _081BA52E -_081BA4D2: + b @081BA52E +@081BA4D2: ldr r1, [r6] ldrb r0, [r1] ldrb r2, [r6, 0x6] adds r0, r2 strb r0, [r6, 0x8] - b _081BA4E8 -_081BA4DE: + b @081BA4E8 +@081BA4DE: ldr r1, [r6] ldrb r0, [r1] ldrb r2, [r6, 0x7] adds r0, r2 strb r0, [r6, 0x9] -_081BA4E8: +@081BA4E8: adds r1, 0x1 str r1, [r6] - b _081BA35E -_081BA4EE: + b @081BA35E +@081BA4EE: ldrb r0, [r6, 0x4] ldrb r2, [r6, 0xD] lsls r2, 28 @@ -854782,20 +854782,20 @@ _081BA4EE: orrs r1, r2 lsrs r1, 24 bl Window_FastFillPixels - b _081BA35E -_081BA500: + b @081BA35E +@081BA500: movs r0, 0x2 - b _081BA506 -_081BA504: + b @081BA506 +@081BA504: movs r0, 0x3 -_081BA506: +@081BA506: strb r0, [r6, 0x1C] adds r0, r6, 0 bl sub_80054F8 -_081BA50E: +@081BA50E: movs r0, 0x3 - b _081BA662 -_081BA512: + b @081BA662 +@081BA512: ldr r0, [r6] ldrb r3, [r0] movs r2, 0x80 @@ -854804,14 +854804,14 @@ _081BA512: orrs r3, r1 adds r0, 0x1 str r0, [r6] - b _081BA52E -_081BA524: + b @081BA52E +@081BA524: ldr r0, [r6] adds r0, 0x1 str r0, [r6] movs r0, 0 - b _081BA662 -_081BA52E: + b @081BA662 +@081BA52E: adds r0, r3, 0 bl DecompressGlyphFont6 adds r0, r6, 0 @@ -854825,24 +854825,24 @@ _081BA52E: adds r0, r1 strb r0, [r6, 0x8] movs r0, 0 - b _081BA662 + b @081BA662 .align 2, 0 .pool -_081BA554: +@081BA554: adds r0, r6, 0 bl remo_is_it_time_to_continue lsls r0, 16 cmp r0, 0 - beq _081BA50E + beq @081BA50E movs r0, 0 strb r0, [r6, 0x1C] - b _081BA50E -_081BA566: + b @081BA50E +@081BA566: adds r0, r6, 0 bl remo_is_it_time_to_continue_plus_down_arrow lsls r0, 16 cmp r0, 0 - beq _081BA50E + beq @081BA50E ldrb r0, [r6, 0x4] ldrb r2, [r6, 0xD] lsls r2, 28 @@ -854856,13 +854856,13 @@ _081BA566: ldrb r0, [r6, 0x7] strb r0, [r6, 0x9] strb r1, [r6, 0x1C] - b _081BA50E -_081BA590: + b @081BA50E +@081BA590: adds r0, r6, 0 bl remo_is_it_time_to_continue_plus_down_arrow lsls r0, 16 cmp r0, 0 - beq _081BA50E + beq @081BA50E adds r0, r6, 0 bl remo_clear_down_arrow ldrb r1, [r6, 0x5] @@ -854880,13 +854880,13 @@ _081BA590: strb r0, [r6, 0x8] movs r0, 0x4 strb r0, [r6, 0x1C] - b _081BA50E + b @081BA50E .align 2, 0 .pool -_081BA5C8: +@081BA5C8: ldrb r2, [r6, 0x1F] cmp r2, 0 - beq _081BA638 + beq @081BA638 ldr r4, =0x08616124 ldr r5, =0x03005d90 ldr r0, [r5] @@ -854896,7 +854896,7 @@ _081BA5C8: adds r0, r4 ldrb r0, [r0] cmp r2, r0 - bcs _081BA604 + bcs @081BA604 ldrb r0, [r6, 0x4] ldrb r1, [r6, 0xD] lsls r1, 28 @@ -854907,10 +854907,10 @@ _081BA5C8: bl Window_ScrollVertically movs r0, 0 strb r0, [r6, 0x1F] - b _081BA62E + b @081BA62E .align 2, 0 .pool -_081BA604: +@081BA604: ldrb r0, [r6, 0x4] lsrs r1, 29 adds r1, r4 @@ -854931,45 +854931,45 @@ _081BA604: ldrb r0, [r0] subs r1, r0 strb r1, [r6, 0x1F] -_081BA62E: +@081BA62E: ldrb r0, [r6, 0x4] movs r1, 0x2 bl Window_CopyToVram - b _081BA50E -_081BA638: + b @081BA50E +@081BA638: strb r2, [r6, 0x1C] - b _081BA50E -_081BA63C: + b @081BA50E +@081BA63C: bl mplay_has_finished_maybe lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _081BA64A - b _081BA50E -_081BA64A: + beq @081BA64A + b @081BA50E +@081BA64A: strb r0, [r6, 0x1C] - b _081BA50E -_081BA64E: + b @081BA50E +@081BA64E: ldrb r0, [r6, 0x1E] adds r1, r0, 0 cmp r1, 0 - beq _081BA65C + beq @081BA65C subs r0, 0x1 strb r0, [r6, 0x1E] - b _081BA50E -_081BA65C: + b @081BA50E +@081BA65C: strb r1, [r6, 0x1C] - b _081BA50E -_081BA660: + b @081BA50E +@081BA660: movs r0, 0x1 -_081BA662: +@081BA662: pop {r4-r6} pop {r1} bx r1 thumb_func_end Font6Func thumb_func_start DecompressGlyphFont6 -DecompressGlyphFont6: @ 81BA668 +DecompressGlyphFont6: ; 81BA668 push {r4,r5,lr} lsls r0, 16 lsrs r2, r0, 19 @@ -855016,13 +855016,13 @@ DecompressGlyphFont6: @ 81BA668 thumb_func_end DecompressGlyphFont6 thumb_func_start GetGlyphWidthFont6 -GetGlyphWidthFont6: @ 81BA6CC +GetGlyphWidthFont6: ; 81BA6CC movs r0, 0x10 bx lr thumb_func_end GetGlyphWidthFont6 thumb_func_start sub_81BA6D0 -sub_81BA6D0: @ 81BA6D0 +sub_81BA6D0: ; 81BA6D0 adds r2, r0, 0 movs r1, 0 strb r1, [r2, 0x1E] @@ -855050,7 +855050,7 @@ sub_81BA6D0: @ 81BA6D0 thumb_func_end sub_81BA6D0 thumb_func_start sub_81BA70C -sub_81BA70C: @ 81BA70C +sub_81BA70C: ; 81BA70C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -855059,25 +855059,25 @@ sub_81BA70C: @ 81BA70C adds r7, r0, 0 bl sub_81BAC30 cmp r0, 0 - beq _081BA722 - b _081BAAEA -_081BA722: + beq @081BA722 + b @081BAAEA +@081BA722: adds r0, r7, 0 adds r0, 0x4A ldrb r1, [r0] mov r10, r0 cmp r1, 0xF - bls _081BA736 + bls @081BA736 subs r0, r1, 0x1 mov r1, r10 strb r0, [r1] - b _081BAAEA -_081BA736: + b @081BAAEA +@081BA736: adds r1, r7, 0 adds r1, 0x48 ldrb r0, [r1] cmp r0, 0 - beq _081BA760 + beq @081BA760 movs r0, 0 strb r0, [r1] ldr r0, =0x04000128 @@ -855085,80 +855085,80 @@ _081BA736: movs r5, 0xFC ands r5, r0 cmp r5, 0x8 - beq _081BA760 + beq @081BA760 adds r0, r7, 0 bl sub_81BA6D0 movs r0, 0x8 eors r0, r5 - b _081BAAEC + b @081BAAEC .align 2, 0 .pool -_081BA760: +@081BA760: ldrb r0, [r7, 0x18] cmp r0, 0xDF - bls _081BA7B2 + bls @081BA7B2 adds r0, r7, 0 bl sub_81BAC44 adds r5, r0, 0 cmp r5, 0 - beq _081BA774 - b _081BAAEC -_081BA774: + beq @081BA774 + b @081BAAEC +@081BA774: adds r0, r7, 0 adds r0, 0x4B ldrb r0, [r0] cmp r0, 0x1 - bne _081BA790 + bne @081BA790 ldrb r0, [r7, 0x18] cmp r0, 0xE1 - bls _081BA790 + bls @081BA790 adds r0, r7, 0 bl sub_81BAC30 cmp r0, 0 - bne _081BA790 - b _081BAADA -_081BA790: + bne @081BA790 + b @081BAADA +@081BA790: adds r0, r7, 0 bl sub_81BAC30 cmp r0, 0 - beq _081BA79C - b _081BAAEA -_081BA79C: + beq @081BA79C + b @081BAAEA +@081BA79C: ldrh r0, [r7, 0x16] cmp r0, 0 - bne _081BA7AC + bne @081BA7AC adds r0, r7, 0 bl sub_81BA6D0 movs r0, 0x71 - b _081BAAEC -_081BA7AC: + b @081BAAEC +@081BA7AC: subs r0, 0x1 strh r0, [r7, 0x16] - b _081BAAEA -_081BA7B2: + b @081BAAEA +@081BA7B2: ldrb r0, [r7, 0x18] cmp r0, 0x2 - bne _081BA7BA - b _081BA8F0 -_081BA7BA: + bne @081BA7BA + b @081BA8F0 +@081BA7BA: cmp r0, 0x2 - bgt _081BA7C8 + bgt @081BA7C8 cmp r0, 0 - beq _081BA7D6 + beq @081BA7D6 cmp r0, 0x1 - beq _081BA892 - b _081BAA28 -_081BA7C8: + beq @081BA892 + b @081BAA28 +@081BA7C8: cmp r0, 0xD0 - bne _081BA7CE - b _081BA93C -_081BA7CE: + bne @081BA7CE + b @081BA93C +@081BA7CE: cmp r0, 0xD1 - bne _081BA7D4 - b _081BA9D6 -_081BA7D4: - b _081BAA28 -_081BA7D6: + bne @081BA7D4 + b @081BA9D6 +@081BA7D4: + b @081BAA28 +@081BA7D6: movs r3, 0xE movs r5, 0x3 ldr r0, =0x04000120 @@ -855168,19 +855168,19 @@ _081BA7D6: ldrb r2, [r7, 0x1E] adds r6, r2, 0 cmp r1, r0 - bne _081BA7FE + bne @081BA7FE adds r4, r1, 0 ldr r1, =0x04000126 -_081BA7EE: +@081BA7EE: asrs r3, 1 subs r1, 0x2 subs r5, 0x1 cmp r5, 0 - beq _081BA7FE + beq @081BA7FE ldrh r0, [r1] cmp r0, r4 - beq _081BA7EE -_081BA7FE: + beq @081BA7EE +@081BA7FE: movs r0, 0xE ands r3, r0 strb r3, [r7, 0x1D] @@ -855192,15 +855192,15 @@ _081BA7FE: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _081BA82C + beq @081BA82C ldr r0, =0x00007208 - b _081BA852 + b @081BA852 .align 2, 0 .pool -_081BA82C: +@081BA82C: subs r5, 0x1 cmp r5, 0 - beq _081BA858 + beq @081BA858 lsls r0, r5, 1 ldr r1, =0x04000120 adds r0, r1 @@ -855211,49 +855211,49 @@ _081BA82C: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _081BA82C + beq @081BA82C adds r0, r1, 0 lsls r0, r5 movs r1, 0xE4 lsls r1, 7 orrs r0, r1 -_081BA852: +@081BA852: cmp r4, r0 - beq _081BA82C + beq @081BA82C movs r3, 0 -_081BA858: +@081BA858: adds r0, r3, 0 ands r0, r6 strb r0, [r7, 0x1E] cmp r3, 0 - bne _081BA868 + bne @081BA868 movs r0, 0xF mov r2, r10 strb r0, [r2] -_081BA868: +@081BA868: mov r1, r10 ldrb r0, [r1] cmp r0, 0 - bne _081BA884 + bne @081BA884 ldrb r0, [r7, 0x1D] ldrb r2, [r7, 0x1E] cmp r0, r2 - beq _081BA88A + beq @081BA88A adds r0, r7, 0 bl sub_81BAB48 - b _081BA892 + b @081BA892 .align 2, 0 .pool -_081BA884: +@081BA884: subs r0, 0x1 mov r1, r10 strb r0, [r1] -_081BA88A: +@081BA88A: ldrb r1, [r7, 0x1E] movs r2, 0xC4 lsls r2, 7 - b _081BA992 -_081BA892: + b @081BA992 +@081BA892: adds r1, r7, 0 adds r1, 0x49 movs r0, 0 @@ -855261,7 +855261,7 @@ _081BA892: movs r5, 0x3 mov r12, r1 ldr r3, =0x0300129c -_081BA8A0: +@081BA8A0: lsls r0, r5, 1 ldr r2, =0x04000120 adds r0, r2 @@ -855270,7 +855270,7 @@ _081BA8A0: asrs r0, r4, 8 subs r2, r5, 0x1 cmp r0, 0x72 - bne _081BA8CA + bne @081BA8CA lsls r0, r2, 1 adds r0, r3 strh r4, [r0] @@ -855279,29 +855279,29 @@ _081BA8A0: movs r0, 0x1 lsls r0, r5 cmp r4, r0 - bne _081BA8CA + bne @081BA8CA ldrb r0, [r1] orrs r4, r0 strb r4, [r1] -_081BA8CA: +@081BA8CA: adds r5, r2, 0 cmp r5, 0 - bne _081BA8A0 + bne @081BA8A0 ldrb r0, [r7, 0x1D] mov r1, r12 ldrb r1, [r1] cmp r0, r1 - bne _081BA88A + bne @081BA88A movs r0, 0x2 strb r0, [r7, 0x18] mov r2, r12 ldrb r1, [r2] movs r2, 0xC2 lsls r2, 7 - b _081BA992 + b @081BA992 .align 2, 0 .pool -_081BA8F0: +@081BA8F0: movs r5, 0x3 movs r0, 0x49 adds r0, r7 @@ -855312,14 +855312,14 @@ _081BA8F0: mov r9, r1 ldr r2, =0x04000120 mov r8, r2 -_081BA904: +@081BA904: ldrb r3, [r4] adds r0, r3, 0 asrs r0, r5 ands r0, r6 subs r2, r5, 0x1 cmp r0, 0 - beq _081BA92A + beq @081BA92A lsls r0, r5, 1 add r0, r8 ldrh r1, [r0] @@ -855327,19 +855327,19 @@ _081BA904: add r0, r9 ldrh r0, [r0] cmp r1, r0 - beq _081BA92A + beq @081BA92A adds r0, r6, 0 lsls r0, r5 eors r3, r0 strb r3, [r4] -_081BA92A: +@081BA92A: adds r5, r2, 0 cmp r5, 0 - bne _081BA904 - b _081BAA90 + bne @081BA904 + b @081BAA90 .align 2, 0 .pool -_081BA93C: +@081BA93C: movs r3, 0x1 movs r5, 0x3 movs r0, 0x49 @@ -855349,7 +855349,7 @@ _081BA93C: adds r6, 0x19 ldr r1, =0x0300129c mov r8, r1 -_081BA94E: +@081BA94E: lsls r0, r5, 1 ldr r2, =0x04000120 adds r0, r2 @@ -855364,49 +855364,49 @@ _081BA94E: movs r0, 0x1 ands r1, r0 cmp r1, 0 - beq _081BA982 + beq @081BA982 asrs r0, r4, 8 subs r0, 0x72 cmp r0, 0x1 - bls _081BA976 - b _081BAAE0 -_081BA976: + bls @081BA976 + b @081BAAE0 +@081BA976: lsls r0, r2, 1 add r0, r8 ldrh r0, [r0] cmp r4, r0 - bne _081BA982 + bne @081BA982 movs r3, 0 -_081BA982: +@081BA982: adds r5, r2, 0 cmp r5, 0 - bne _081BA94E + bne @081BA94E cmp r3, 0 - bne _081BA9A8 + bne @081BA9A8 ldrb r1, [r7, 0x1C] movs r2, 0xC6 lsls r2, 7 -_081BA992: +@081BA992: adds r0, r2, 0 orrs r1, r0 adds r0, r7, 0 bl sub_81BAAFC - b _081BAAEC + b @081BAAEC .align 2, 0 .pool -_081BA9A8: +@081BA9A8: movs r0, 0xD1 strb r0, [r7, 0x18] movs r3, 0x11 movs r5, 0x3 adds r1, r6, 0x2 -_081BA9B2: +@081BA9B2: ldrb r0, [r1] adds r3, r0 subs r1, 0x1 subs r5, 0x1 cmp r5, 0 - bne _081BA9B2 + bne @081BA9B2 strb r3, [r7, 0x14] movs r0, 0xFF ands r3, r0 @@ -855417,50 +855417,50 @@ _081BA9B2: adds r0, r7, 0 adds r1, r3, 0 bl sub_81BAAFC - b _081BAAEC -_081BA9D6: + b @081BAAEC +@081BA9D6: movs r5, 0x3 movs r2, 0x49 ldrb r1, [r2, r7] ldr r2, =0x04000126 movs r3, 0x1 -_081BA9E0: +@081BA9E0: ldrh r0, [r2] adds r4, r0, 0 adds r0, r1, 0 asrs r0, r5 ands r0, r3 cmp r0, 0 - beq _081BA9F4 + beq @081BA9F4 asrs r0, r4, 8 cmp r0, 0x73 - bne _081BAAE0 -_081BA9F4: + bne @081BAAE0 +@081BA9F4: subs r2, 0x2 subs r5, 0x1 cmp r5, 0 - bne _081BA9E0 + bne @081BA9E0 adds r0, r7, 0 bl MultiBoot adds r5, r0, 0 cmp r5, 0 - bne _081BAA18 + bne @081BAA18 movs r0, 0xE0 strb r0, [r7, 0x18] adds r0, 0xB0 strh r0, [r7, 0x16] - b _081BAAEA + b @081BAAEA .align 2, 0 .pool -_081BAA18: +@081BAA18: adds r0, r7, 0 bl sub_81BA6D0 movs r0, 0x1E mov r1, r10 strb r0, [r1] movs r0, 0x70 - b _081BAAEC -_081BAA28: + b @081BAAEC +@081BAA28: movs r5, 0x3 movs r2, 0x49 adds r2, r7 @@ -855468,7 +855468,7 @@ _081BAA28: mov r8, r12 movs r0, 0x1 mov r9, r0 -_081BAA36: +@081BAA36: mov r1, r8 ldrb r6, [r1] adds r0, r6, 0 @@ -855476,7 +855476,7 @@ _081BAA36: mov r2, r9 ands r0, r2 cmp r0, 0 - beq _081BAA70 + beq @081BAA70 lsls r0, r5, 1 ldr r1, =0x04000120 adds r0, r1 @@ -855490,50 +855490,50 @@ _081BAA36: mov r3, r9 lsls r3, r5 cmp r2, r1 - bne _081BAA6A + bne @081BAA6A movs r0, 0xFF ands r4, r0 cmp r4, r3 - beq _081BAA70 -_081BAA6A: + beq @081BAA70 +@081BAA6A: eors r6, r3 mov r2, r8 strb r6, [r2] -_081BAA70: +@081BAA70: subs r5, 0x1 cmp r5, 0 - bne _081BAA36 + bne @081BAA36 ldrb r0, [r7, 0x18] cmp r0, 0xC4 - bne _081BAA90 + bne @081BAA90 mov r0, r12 ldrb r1, [r0] movs r0, 0xE ands r0, r1 strb r0, [r7, 0x1E] strb r5, [r7, 0x18] - b _081BA88A + b @081BA88A .align 2, 0 .pool -_081BAA90: +@081BAA90: mov r1, r12 ldrb r0, [r1] cmp r0, 0 - bne _081BAAA2 + bne @081BAAA2 adds r0, r7, 0 bl sub_81BA6D0 movs r0, 0x50 - b _081BAAEC -_081BAAA2: + b @081BAAEC +@081BAAA2: ldrb r0, [r7, 0x18] adds r0, 0x2 strb r0, [r7, 0x18] lsls r0, 24 lsrs r0, 24 cmp r0, 0xC4 - bne _081BAAB2 - b _081BA88A -_081BAAB2: + bne @081BAAB2 + b @081BA88A +@081BAAB2: ldrb r0, [r7, 0x18] ldr r1, [r7, 0x28] adds r0, r1 @@ -855547,23 +855547,23 @@ _081BAAB2: bl sub_81BAAFC adds r5, r0, 0 cmp r5, 0 - bne _081BAAEC + bne @081BAAEC adds r0, r7, 0 adds r0, 0x4B ldrb r0, [r0] cmp r0, 0x1 - bne _081BAAEA -_081BAADA: + bne @081BAAEA +@081BAADA: bl sub_81BAD48 - b _081BA736 -_081BAAE0: + b @081BA736 +@081BAAE0: adds r0, r7, 0 bl sub_81BA6D0 movs r0, 0x60 - b _081BAAEC -_081BAAEA: + b @081BAAEC +@081BAAEA: movs r0, 0 -_081BAAEC: +@081BAAEC: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -855574,7 +855574,7 @@ _081BAAEC: thumb_func_end sub_81BA70C thumb_func_start sub_81BAAFC -sub_81BAAFC: @ 81BAAFC +sub_81BAAFC: ; 81BAAFC push {r4,lr} adds r2, r0, 0 lsls r1, 16 @@ -855584,7 +855584,7 @@ sub_81BAAFC: @ 81BAAFC movs r4, 0x8C ands r4, r0 cmp r4, 0x8 - bne _081BAB34 + bne @081BAB34 ldr r0, =0x0400012a strh r1, [r0] ldr r1, =0x00002083 @@ -855595,45 +855595,45 @@ sub_81BAAFC: @ 81BAAFC movs r0, 0x1 strb r0, [r1] movs r0, 0 - b _081BAB40 + b @081BAB40 .align 2, 0 .pool -_081BAB34: +@081BAB34: adds r0, r2, 0 bl sub_81BA6D0 movs r0, 0x8 eors r4, r0 adds r0, r4, 0 -_081BAB40: +@081BAB40: pop {r4} pop {r1} bx r1 thumb_func_end sub_81BAAFC thumb_func_start sub_81BAB48 -sub_81BAB48: @ 81BAB48 +sub_81BAB48: ; 81BAB48 push {lr} adds r1, r0, 0 ldrb r0, [r1, 0x18] cmp r0, 0 - beq _081BAB5A + beq @081BAB5A adds r0, r1, 0 bl sub_81BA6D0 - b _081BAB66 -_081BAB5A: + b @081BAB66 +@081BAB5A: adds r2, r1, 0 adds r2, 0x4A strb r0, [r2] strb r0, [r1, 0x1E] movs r0, 0x1 strb r0, [r1, 0x18] -_081BAB66: +@081BAB66: pop {r0} bx r0 thumb_func_end sub_81BAB48 thumb_func_start sub_81BAB6C -sub_81BAB6C: @ 81BAB6C +sub_81BAB6C: ; 81BAB6C push {r4-r7,lr} adds r4, r0, 0 adds r6, r1, 0 @@ -855645,15 +855645,15 @@ sub_81BAB6C: @ 81BAB6C movs r3, 0 ldrb r0, [r4, 0x18] cmp r0, 0 - bne _081BABA8 + bne @081BABA8 ldrb r0, [r4, 0x1E] cmp r0, 0 - beq _081BABA8 + beq @081BABA8 adds r0, r4, 0 adds r0, 0x4A ldrb r0, [r0] cmp r0, 0 - bne _081BABA8 + bne @081BABA8 str r6, [r4, 0x20] adds r2, 0xF movs r0, 0x10 @@ -855663,14 +855663,14 @@ sub_81BAB6C: @ 81BAB6C adds r1, r2, r0 ldr r0, =0x0003ff00 cmp r1, r0 - bls _081BABB4 -_081BABA8: + bls @081BABB4 +@081BABA8: adds r0, r4, 0 bl sub_81BA6D0 - b _081BAC28 + b @081BAC28 .align 2, 0 .pool -_081BABB4: +@081BABB4: adds r0, r6, r2 str r0, [r4, 0x24] lsls r1, r7, 24 @@ -855680,42 +855680,42 @@ _081BABB4: asrs r0, 24 adds r2, r1, 0 cmp r0, 0x8 - bhi _081BAC14 + bhi @081BAC14 lsls r0, 2 - ldr r1, =_081BABD8 + ldr r1, =@081BABD8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081BABD8: - .4byte _081BABFC - .4byte _081BABFC - .4byte _081BABFC - .4byte _081BABFC - .4byte _081BAC06 - .4byte _081BAC0C - .4byte _081BAC0C - .4byte _081BAC0C - .4byte _081BAC0C -_081BABFC: +@081BABD8: + .4byte @081BABFC + .4byte @081BABFC + .4byte @081BABFC + .4byte @081BABFC + .4byte @081BAC06 + .4byte @081BAC0C + .4byte @081BAC0C + .4byte @081BAC0C + .4byte @081BAC0C +@081BABFC: lsls r3, r5, 3 asrs r1, r2, 24 movs r0, 0x3 subs r0, r1 - b _081BAC12 -_081BAC06: + b @081BAC12 +@081BAC06: movs r0, 0x38 adds r3, r5, 0 - b _081BAC12 -_081BAC0C: + b @081BAC12 +@081BAC0C: lsls r3, r5, 3 asrs r0, r2, 24 subs r0, 0x1 -_081BAC12: +@081BAC12: orrs r3, r0 -_081BAC14: +@081BAC14: movs r0, 0x3F ands r3, r0 lsls r0, r3, 1 @@ -855726,44 +855726,44 @@ _081BAC14: strb r0, [r4, 0x1C] movs r0, 0xD0 strb r0, [r4, 0x18] -_081BAC28: +@081BAC28: pop {r4-r7} pop {r0} bx r0 thumb_func_end sub_81BAB6C thumb_func_start sub_81BAC30 -sub_81BAC30: @ 81BAC30 +sub_81BAC30: ; 81BAC30 push {lr} ldrb r0, [r0, 0x18] cmp r0, 0xE9 - beq _081BAC3C + beq @081BAC3C movs r0, 0 - b _081BAC3E -_081BAC3C: + b @081BAC3E +@081BAC3C: movs r0, 0x1 -_081BAC3E: +@081BAC3E: pop {r1} bx r1 thumb_func_end sub_81BAC30 thumb_func_start sub_81BAC44 -sub_81BAC44: @ 81BAC44 +sub_81BAC44: ; 81BAC44 push {r4-r6,lr} adds r3, r0, 0 ldrb r0, [r3, 0x18] cmp r0, 0xE0 - beq _081BAC60 + beq @081BAC60 cmp r0, 0xE0 - blt _081BAC70 + blt @081BAC70 cmp r0, 0xE8 - bgt _081BAC70 + bgt @081BAC70 cmp r0, 0xE7 - blt _081BAC70 + blt @081BAC70 movs r4, 0x3 ldrb r5, [r3, 0x1E] - b _081BACD0 -_081BAC60: + b @081BACD0 +@081BAC60: movs r1, 0 movs r0, 0xE1 strb r0, [r3, 0x18] @@ -855771,28 +855771,28 @@ _081BAC60: movs r0, 0x80 lsls r0, 13 str r0, [r3] - b _081BACC2 -_081BAC70: + b @081BACC2 +@081BAC70: movs r4, 0x3 ldrb r5, [r3, 0x1E] movs r6, 0x1 ldr r1, =0x04000126 -_081BAC78: +@081BAC78: ldrh r0, [r1] adds r2, r0, 0 adds r0, r5, 0 asrs r0, r4 ands r0, r6 cmp r0, 0 - beq _081BAC8C + beq @081BAC8C ldr r0, [r3, 0x4] cmp r2, r0 - bne _081BAC60 -_081BAC8C: + bne @081BAC60 +@081BAC8C: subs r1, 0x2 subs r4, 0x1 cmp r4, 0 - bne _081BAC78 + bne @081BAC78 ldrb r0, [r3, 0x18] adds r0, 0x1 strb r0, [r3, 0x18] @@ -855800,7 +855800,7 @@ _081BAC8C: ldrh r0, [r3] str r0, [r3, 0x4] cmp r1, 0 - bne _081BACBA + bne @081BACBA ldr r0, [r3, 0x28] adds r1, r0, 0 adds r1, 0xAC @@ -855812,19 +855812,19 @@ _081BAC8C: str r1, [r3, 0x4] lsls r1, 5 str r1, [r3] -_081BACBA: +@081BACBA: ldr r0, [r3] lsrs r0, 5 str r0, [r3] -_081BACC0: +@081BACC0: ldrh r1, [r3] -_081BACC2: +@081BACC2: adds r0, r3, 0 bl sub_81BAAFC - b _081BAD28 + b @081BAD28 .align 2, 0 .pool -_081BACD0: +@081BACD0: lsls r0, r4, 1 ldr r1, =0x04000120 adds r0, r1 @@ -855835,21 +855835,21 @@ _081BACD0: movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _081BACEC + beq @081BACEC ldr r0, [r3, 0x4] cmp r2, r0 - bne _081BAD1C -_081BACEC: + bne @081BAD1C +@081BACEC: subs r4, 0x1 cmp r4, 0 - bne _081BACD0 + bne @081BACD0 ldrb r0, [r3, 0x18] adds r0, 0x1 strb r0, [r3, 0x18] lsls r0, 24 lsrs r0, 24 cmp r0, 0xE9 - beq _081BAD26 + beq @081BAD26 ldr r0, [r3, 0x28] adds r1, r0, 0 adds r1, 0xAE @@ -855860,41 +855860,41 @@ _081BACEC: orrs r1, r0 str r1, [r3] str r1, [r3, 0x4] - b _081BACC0 + b @081BACC0 .align 2, 0 .pool -_081BAD1C: +@081BAD1C: adds r0, r3, 0 bl sub_81BA6D0 movs r0, 0x71 - b _081BAD28 -_081BAD26: + b @081BAD28 +@081BAD26: movs r0, 0 -_081BAD28: +@081BAD28: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_81BAC44 thumb_func_start sub_81BAD30 -sub_81BAD30: @ 81BAD30 +sub_81BAD30: ; 81BAD30 mov r2, pc lsrs r2, 24 movs r1, 0xC cmp r2, 0x2 - beq _081BAD42 + beq @081BAD42 movs r1, 0xD cmp r2, 0x8 - beq _081BAD42 + beq @081BAD42 movs r1, 0x4 -_081BAD42: +@081BAD42: subs r0, r1 - bgt _081BAD42 + bgt @081BAD42 bx lr thumb_func_end sub_81BAD30 thumb_func_start sub_81BAD48 -sub_81BAD48: @ 81BAD48 +sub_81BAD48: ; 81BAD48 push {r4,r5,lr} movs r2, 0 ldr r3, =0x04000128 @@ -855902,19 +855902,19 @@ sub_81BAD48: @ 81BAD48 movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081BAD6C + beq @081BAD6C ldr r5, =0x0000795c movs r4, 0x80 -_081BAD5C: +@081BAD5C: adds r2, 0x1 cmp r2, r5 - bgt _081BAD6C + bgt @081BAD6C ldrh r1, [r3] adds r0, r4, 0 ands r0, r1 cmp r0, 0 - bne _081BAD5C -_081BAD6C: + bne @081BAD5C +@081BAD6C: movs r0, 0x96 lsls r0, 2 bl sub_81BAD30 @@ -855926,7 +855926,7 @@ _081BAD6C: thumb_func_end sub_81BAD48 thumb_func_start sub_81BAD84 -sub_81BAD84: @ 81BAD84 +sub_81BAD84: ; 81BAD84 push {r4-r6,lr} movs r6, 0x80 lsls r6, 19 @@ -855975,12 +855975,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] @@ -855994,7 +855994,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, =0x0832a328 @@ -856006,31 +856006,31 @@ bx_exec_buffer_A_ch0_tbl3: @ 81BAE10 ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _081BAE5C + beq @081BAE5C ldr r0, =0x02023064 lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] cmp r0, 0x38 - bhi _081BAE58 + bhi @081BAE58 ldr r0, =0x08617170 ldrb r1, [r1] lsls r1, 2 adds r1, r0 ldr r0, [r1] bl _call_via_r0 - b _081BAE5C + b @081BAE5C .align 2, 0 .pool -_081BAE58: +@081BAE58: bl dp01_tbl3_exec_completed -_081BAE5C: +@081BAE5C: pop {r0} bx r0 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 @@ -856046,9 +856046,9 @@ sub_81BAE60: @ 81BAE60 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _081BAE84 + bne @081BAE84 bl dp01_tbl3_exec_completed -_081BAE84: +@081BAE84: pop {r0} bx r0 .align 2, 0 @@ -856056,7 +856056,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 @@ -856073,7 +856073,7 @@ sub_81BAE98: @ 81BAE98 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _081BAEE8 + bne @081BAEE8 movs r0, 0 bl nullsub_25 ldrb r0, [r4] @@ -856093,7 +856093,7 @@ sub_81BAE98: @ 81BAE98 adds r0, r6 bl obj_delete_and_free_tiles bl dp01_tbl3_exec_completed -_081BAEE8: +@081BAEE8: pop {r4-r6} pop {r0} bx r0 @@ -856102,7 +856102,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] @@ -856119,7 +856119,7 @@ sub_81BAF00: @ 81BAF00 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _081BAF38 + bne @081BAF38 ldr r0, [r4] ldrb r1, [r3] ldr r2, [r0, 0x4] @@ -856130,7 +856130,7 @@ sub_81BAF00: @ 81BAF00 movs r1, 0 strb r1, [r0, 0x9] bl dp01_tbl3_exec_completed -_081BAF38: +@081BAF38: pop {r4} pop {r0} bx r0 @@ -856139,24 +856139,24 @@ _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 lsls r0, 24 cmp r0, 0 - beq _081BAF6C + beq @081BAF6C bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _081BAFA0 + beq @081BAFA0 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _081BAFA0 -_081BAF6C: + beq @081BAFA0 +@081BAF6C: ldr r2, =0x02020630 ldr r1, =0x03005d70 ldr r0, =0x02024064 @@ -856171,11 +856171,11 @@ _081BAF6C: ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _081BAFD8 - b _081BAFD6 + bne @081BAFD8 + b @081BAFD6 .align 2, 0 .pool -_081BAFA0: +@081BAFA0: ldr r2, =0x02020630 ldr r5, =0x03005d70 ldr r0, =0x02024064 @@ -856191,7 +856191,7 @@ _081BAFA0: ldr r2, [r0] ldr r0, =nullsub_12 + 1 cmp r2, r0 - bne _081BAFD8 + bne @081BAFD8 movs r0, 0x2 eors r3, r0 adds r0, r3, r5 @@ -856202,18 +856202,18 @@ _081BAFA0: adds r0, r4 ldr r0, [r0] cmp r0, r2 - bne _081BAFD8 -_081BAFD6: + bne @081BAFD8 +@081BAFD6: movs r6, 0x1 -_081BAFD8: +@081BAFD8: bl sub_80A36C8 lsls r0, 24 cmp r0, 0 - beq _081BAFE4 + beq @081BAFE4 movs r6, 0 -_081BAFE4: +@081BAFE4: cmp r6, 0 - beq _081BB00A + beq @081BB00A ldr r0, =0x020244d0 ldr r0, [r0] ldr r3, =0x02024064 @@ -856231,7 +856231,7 @@ _081BAFE4: adds r0, r1 ldr r1, =sub_81BAF00 + 1 str r1, [r0] -_081BB00A: +@081BB00A: pop {r4-r6} pop {r0} bx r0 @@ -856240,7 +856240,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 @@ -856261,9 +856261,9 @@ sub_81BB02C: @ 81BB02C adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _081BB058 - b _081BB196 -_081BB058: + beq @081BB058 + b @081BB196 +@081BB058: movs r1, 0x2 mov r8, r1 adds r1, r2, 0 @@ -856279,9 +856279,9 @@ _081BB058: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - beq _081BB07A - b _081BB196 -_081BB07A: + beq @081BB07A + b @081BB196 +@081BB07A: ldr r1, =0x02020630 mov r10, r1 ldr r0, =0x03005d7c @@ -856297,7 +856297,7 @@ _081BB07A: ldr r3, [r0] ldr r0, =nullsub_12 + 1 cmp r3, r0 - bne _081BB196 + bne @081BB196 ldr r0, =0x020241e4 adds r0, r2, r0 ldrb r1, [r0] @@ -856307,14 +856307,14 @@ _081BB07A: adds r0, r5 ldr r0, [r0] cmp r0, r3 - bne _081BB196 + bne @081BB196 ldrb r0, [r4, 0x9] adds r0, 0x1 strb r0, [r4, 0x9] lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081BB196 + beq @081BB196 mov r1, r12 ldr r0, [r1] ldrb r1, [r7] @@ -856327,13 +856327,13 @@ _081BB07A: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _081BB134 + beq @081BB134 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - bne _081BB134 + bne @081BB134 ldrb r0, [r7] mov r1, r8 eors r0, r1 @@ -856370,7 +856370,7 @@ _081BB07A: adds r0, r4 ldrb r0, [r0] bl sub_80729D0 -_081BB134: +@081BB134: ldr r1, =0x03005d7c ldr r4, =0x02024064 ldrb r0, [r4] @@ -856416,7 +856416,7 @@ _081BB134: adds r0, r1 ldr r1, =sub_81BAF48 + 1 str r1, [r0] -_081BB196: +@081BB196: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -856429,7 +856429,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 @@ -856446,13 +856446,13 @@ sub_81BB1D4: @ 81BB1D4 ldrb r0, [r0] lsls r0, 27 cmp r0, 0 - bge _081BB202 + bge @081BB202 movs r2, 0x24 ldrsh r0, [r1, r2] cmp r0, 0 - bne _081BB202 + bne @081BB202 bl dp01_tbl3_exec_completed -_081BB202: +@081BB202: pop {r0} bx r0 .align 2, 0 @@ -856460,7 +856460,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] @@ -856482,16 +856482,16 @@ bx_t3_healthbar_update: @ 81BB214 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _081BB25C + beq @081BB25C ldrb r0, [r5] adds r0, r6 ldrb r0, [r0] movs r2, 0 bl heathbar_draw_hp - b _081BB276 + b @081BB276 .align 2, 0 .pool -_081BB25C: +@081BB25C: ldr r2, =0x0202406e ldrb r1, [r5] lsls r0, r1, 1 @@ -856503,7 +856503,7 @@ _081BB25C: adds r0, r2 bl sub_805E990 bl dp01_tbl3_exec_completed -_081BB276: +@081BB276: pop {r4-r6} pop {r0} bx r0 @@ -856512,21 +856512,21 @@ _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 a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _081BB296 + bne @081BB296 bl dp01_tbl3_exec_completed -_081BB296: +@081BB296: pop {r0} bx r0 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 @@ -856553,15 +856553,15 @@ sub_81BB29C: @ 81BB29C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081BB2E2 + beq @081BB2E2 ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] cmp r10, r0 - bne _081BB2E2 - b _081BB3F8 -_081BB2E2: + bne @081BB2E2 + b @081BB3F8 +@081BB2E2: movs r0, 0x64 mov r1, r10 muls r1, r0 @@ -856604,7 +856604,7 @@ _081BB2E2: asrs r1, 16 adds r0, r1 cmp r0, r2 - bcc _081BB3D0 + bcc @081BB3D0 adds r0, r6, 0 movs r1, 0x19 mov r2, sp @@ -856630,27 +856630,27 @@ _081BB2E2: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081BB3B8 + bne @081BB3B8 ldr r2, =0x0202406e lsls r0, r7, 1 adds r0, r2 mov r1, r10 ldrh r0, [r0] cmp r1, r0 - beq _081BB396 + beq @081BB396 movs r0, 0x2 eors r7, r0 lsls r0, r7, 1 adds r0, r2 ldrh r0, [r0] cmp r1, r0 - bne _081BB3B8 -_081BB396: + bne @081BB3B8 +@081BB396: ldr r0, =sub_81BB628 + 1 - b _081BB3FA + b @081BB3FA .align 2, 0 .pool -_081BB3B8: +@081BB3B8: ldr r0, =0x03005e00 mov r2, r9 lsls r1, r2, 2 @@ -856658,10 +856658,10 @@ _081BB3B8: lsls r1, 3 adds r1, r0 ldr r0, =sub_81BB740 + 1 - b _081BB3FC + b @081BB3FC .align 2, 0 .pool -_081BB3D0: +@081BB3D0: str r0, [sp, 0x4] add r2, sp, 0x4 adds r0, r6, 0 @@ -856675,16 +856675,16 @@ _081BB3D0: str r1, [r0] mov r0, r9 bl remove_task - b _081BB3FE + b @081BB3FE .align 2, 0 .pool -_081BB3F8: +@081BB3F8: ldr r0, =sub_81BB414 + 1 -_081BB3FA: +@081BB3FA: mov r1, r8 -_081BB3FC: +@081BB3FC: str r0, [r1] -_081BB3FE: +@081BB3FE: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -856698,7 +856698,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 @@ -856791,7 +856791,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 @@ -856810,13 +856810,13 @@ sub_81BB4E4: @ 81BB4E4 movs r2, 0x1C ldrsh r0, [r6, r2] cmp r0, 0xC - bgt _081BB514 + bgt @081BB514 adds r0, r1, 0x1 strh r0, [r6, 0x1C] - b _081BB610 + b @081BB610 .align 2, 0 .pool -_081BB514: +@081BB514: ldrb r0, [r6, 0x8] mov r9, r0 ldrh r2, [r6, 0xA] @@ -856839,7 +856839,7 @@ _081BB514: movs r0, 0x1 negs r0, r0 cmp r4, r0 - bne _081BB610 + bne @081BB610 movs r0, 0x21 bl m4aSongNumStop movs r0, 0x64 @@ -856884,7 +856884,7 @@ _081BB514: ldr r0, [sp, 0x4] adds r0, r4 cmp r0, r1 - blt _081BB5F4 + blt @081BB5F4 adds r0, r5, 0 movs r1, 0x19 mov r2, sp @@ -856907,10 +856907,10 @@ _081BB514: strb r5, [r4] ldr r0, =sub_81BB628 + 1 str r0, [r6] - b _081BB610 + b @081BB610 .align 2, 0 .pool -_081BB5F4: +@081BB5F4: str r0, [sp, 0x4] add r2, sp, 0x4 adds r0, r5, 0 @@ -856923,7 +856923,7 @@ _081BB5F4: str r1, [r0] mov r0, r8 bl remove_task -_081BB610: +@081BB610: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -856937,7 +856937,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 @@ -856952,7 +856952,7 @@ sub_81BB628: @ 81BB628 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081BB65C + bne @081BB65C ldr r1, =0x0202406e movs r0, 0x2 adds r2, r4, 0 @@ -856961,9 +856961,9 @@ sub_81BB628: @ 81BB628 adds r0, r1 ldrh r0, [r0] cmp r6, r0 - bne _081BB65C + bne @081BB65C adds r4, r2, 0 -_081BB65C: +@081BB65C: adds r0, r4, 0 adds r1, r4, 0 adds r2, r4, 0 @@ -856984,7 +856984,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 @@ -857005,7 +857005,7 @@ sub_81BB688: @ 81BB688 movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _081BB72A + bne @081BB72A ldrb r4, [r2, 0x8] movs r0, 0x64 adds r1, r4, 0 @@ -857019,7 +857019,7 @@ sub_81BB688: @ 81BB688 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081BB708 + bne @081BB708 ldr r1, =0x0202406e movs r0, 0x2 adds r2, r5, 0 @@ -857028,17 +857028,17 @@ sub_81BB688: @ 81BB688 adds r0, r1 ldrh r0, [r0] cmp r4, r0 - bne _081BB708 + bne @081BB708 ldr r0, =0x03005d70 adds r0, r2, r0 ldrb r0, [r0] adds r1, r7, 0 movs r2, 0 bl healthbar_draw_field_maybe - b _081BB71C + b @081BB71C .align 2, 0 .pool -_081BB708: +@081BB708: ldr r0, =0x03005d70 adds r0, r5, r0 ldrb r0, [r0] @@ -857048,7 +857048,7 @@ _081BB708: adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe -_081BB71C: +@081BB71C: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -857056,7 +857056,7 @@ _081BB71C: adds r1, r0 ldr r0, =sub_81BB740 + 1 str r0, [r1] -_081BB72A: +@081BB72A: pop {r4-r7} pop {r0} bx r0 @@ -857065,7 +857065,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 @@ -857098,7 +857098,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 @@ -857116,7 +857116,7 @@ sub_81BB78C: @ 81BB78C ldrsh r0, [r0, r3] adds r1, r0 cmp r1, 0xA0 - ble _081BB808 + ble @081BB808 ldr r1, =0x0202406e lsls r0, r2, 1 adds r0, r1 @@ -857155,7 +857155,7 @@ sub_81BB78C: @ 81BB78C ldrb r0, [r0] bl sub_8072984 bl dp01_tbl3_exec_completed -_081BB808: +@081BB808: pop {r4-r6} pop {r0} bx r0 @@ -857164,7 +857164,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] @@ -857179,7 +857179,7 @@ sub_81BB828: @ 81BB828 movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _081BB87C + bne @081BB87C ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] @@ -857203,7 +857203,7 @@ sub_81BB828: @ 81BB828 ldrb r0, [r0] bl sub_8072984 bl dp01_tbl3_exec_completed -_081BB87C: +@081BB87C: pop {r4-r6} pop {r0} bx r0 @@ -857212,21 +857212,21 @@ _081BB87C: thumb_func_end sub_81BB828 thumb_func_start sub_81BB898 -sub_81BB898: @ 81BB898 +sub_81BB898: ; 81BB898 push {lr} movs r0, 0 bl a_pressed_maybe lsls r0, 16 cmp r0, 0 - bne _081BB8AA + bne @081BB8AA bl dp01_tbl3_exec_completed -_081BB8AA: +@081BB8AA: pop {r0} bx r0 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 @@ -857241,7 +857241,7 @@ bx_blink_t3: @ 81BB8B0 movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0x20 - bne _081BB8FC + bne @081BB8FC movs r3, 0 movs r0, 0 strh r0, [r4, 0x30] @@ -857254,15 +857254,15 @@ bx_blink_t3: @ 81BB8B0 ldr r0, =0x020244b9 strb r3, [r0] bl dp01_tbl3_exec_completed - b _081BB926 + b @081BB926 .align 2, 0 .pool -_081BB8FC: +@081BB8FC: ldrh r0, [r4, 0x30] movs r1, 0x3 ands r0, r1 cmp r0, 0 - bne _081BB920 + bne @081BB920 adds r3, r4, 0 adds r3, 0x3E ldrb r2, [r3] @@ -857276,18 +857276,18 @@ _081BB8FC: ands r0, r2 orrs r0, r1 strb r0, [r3] -_081BB920: +@081BB920: ldrh r0, [r4, 0x30] adds r0, 0x1 strh r0, [r4, 0x30] -_081BB926: +@081BB926: pop {r4} pop {r0} bx r0 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 @@ -857303,7 +857303,7 @@ sub_81BB92C: @ 81BB92C ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _081BB97E + bne @081BB97E adds r0, r3, 0 bl sub_805E408 ldr r0, =0x020244d0 @@ -857316,19 +857316,19 @@ sub_81BB92C: @ 81BB92C movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _081BB972 + beq @081BB972 adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x6 bl move_anim_start_t4 -_081BB972: +@081BB972: ldr r0, =0x03005d60 ldrb r1, [r4] lsls r1, 2 adds r1, r0 ldr r0, =dp01t_35_3_free_vram + 1 str r0, [r1] -_081BB97E: +@081BB97E: pop {r4} pop {r0} bx r0 @@ -857337,7 +857337,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] @@ -857352,7 +857352,7 @@ dp01t_35_3_free_vram: @ 81BB9A0 movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _081BB9DC + bne @081BB9DC ldr r2, =0x02020630 ldr r0, =0x020241e4 adds r0, r3, r0 @@ -857365,9 +857365,9 @@ dp01t_35_3_free_vram: @ 81BB9A0 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _081BB9DC + bne @081BB9DC bl dp01_tbl3_exec_completed -_081BB9DC: +@081BB9DC: pop {r0} bx r0 .align 2, 0 @@ -857375,7 +857375,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} @@ -857392,7 +857392,7 @@ sub_81BB9F4: @ 81BB9F4 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081BBAB0 + beq @081BBAB0 ldrb r1, [r2] movs r0, 0x7F ands r0, r1 @@ -857462,7 +857462,7 @@ sub_81BB9F4: @ 81BB9F4 adds r0, r1 ldr r1, =sub_81BB92C + 1 str r1, [r0] -_081BBAB0: +@081BBAB0: pop {r3} mov r8, r3 pop {r4-r7} @@ -857473,7 +857473,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] @@ -857488,7 +857488,7 @@ sub_81BBAE8: @ 81BBAE8 movs r0, 0x88 ands r0, r1 cmp r0, 0 - bne _081BBB1A + bne @081BBB1A ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] @@ -857498,7 +857498,7 @@ sub_81BBAE8: @ 81BBAE8 adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 -_081BBB1A: +@081BBB1A: ldr r5, =0x02020630 ldr r0, =0x03005d7c ldrb r2, [r4] @@ -857513,7 +857513,7 @@ _081BBB1A: ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _081BBB60 + bne @081BBB60 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -857524,7 +857524,7 @@ _081BBB1A: movs r0, 0x8 ands r0, r1 cmp r0, 0 - bne _081BBB60 + bne @081BBB60 adds r0, r3, r5 bl obj_delete_and_free_tiles ldr r1, =0x03005d60 @@ -857533,7 +857533,7 @@ _081BBB1A: adds r0, r1 ldr r1, =sub_81BB9F4 + 1 str r1, [r0] -_081BBB60: +@081BBB60: pop {r4-r6} pop {r0} bx r0 @@ -857542,7 +857542,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 @@ -857557,7 +857557,7 @@ dp01_tbl3_exec_completed: @ 81BBB8C movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq _081BBBE0 + beq @081BBBE0 bl link_get_multiplayer_id mov r1, sp strb r0, [r1] @@ -857571,10 +857571,10 @@ dp01_tbl3_exec_completed: @ 81BBB8C adds r0, r1 movs r1, 0x38 strb r1, [r0] - b _081BBBF2 + b @081BBBF2 .align 2, 0 .pool -_081BBBE0: +@081BBBE0: ldr r2, =0x02024068 ldr r1, =0x0832a328 ldrb r0, [r4] @@ -857584,7 +857584,7 @@ _081BBBE0: ldr r0, [r2] bics r0, r1 str r0, [r2] -_081BBBF2: +@081BBBF2: add sp, 0x4 pop {r4} pop {r0} @@ -857594,7 +857594,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] @@ -857609,9 +857609,9 @@ sub_81BBC04: @ 81BBC04 movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _081BBC26 + bne @081BBC26 bl dp01_tbl3_exec_completed -_081BBC26: +@081BBC26: pop {r0} bx r0 .align 2, 0 @@ -857619,7 +857619,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] @@ -857634,9 +857634,9 @@ bx_80E8A6C: @ 81BBC34 movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _081BBC56 + bne @081BBC56 bl dp01_tbl3_exec_completed -_081BBC56: +@081BBC56: pop {r0} bx r0 .align 2, 0 @@ -857644,7 +857644,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 @@ -857656,7 +857656,7 @@ dp01t_00_3_getattr: @ 81BBC64 adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0 - bne _081BBC9C + bne @081BBC9C ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 @@ -857664,29 +857664,29 @@ dp01t_00_3_getattr: @ 81BBC64 mov r1, sp bl dp01_getattr_by_ch1_for_player_pokemon adds r6, r0, 0 - b _081BBCBE + b @081BBCBE .align 2, 0 .pool -_081BBC9C: +@081BBC9C: ldrb r4, [r1] movs r5, 0 -_081BBCA0: +@081BBCA0: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _081BBCB6 + beq @081BBCB6 lsls r0, r5, 24 lsrs r0, 24 mov r2, sp adds r1, r2, r6 bl dp01_getattr_by_ch1_for_player_pokemon adds r6, r0 -_081BBCB6: +@081BBCB6: lsrs r4, 1 adds r5, 0x1 cmp r5, 0x5 - ble _081BBCA0 -_081BBCBE: + ble @081BBCA0 +@081BBCBE: lsls r1, r6, 16 lsrs r1, 16 movs r0, 0x1 @@ -857700,7 +857700,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 @@ -857719,79 +857719,79 @@ dp01_getattr_by_ch1_for_player_pokemon: @ 81BBCD8 adds r0, r1 ldrb r0, [r0] cmp r0, 0x3B - bls _081BBD02 - bl _081BC46E -_081BBD02: + bls @081BBD02 + bl @081BC46E +@081BBD02: lsls r0, 2 - ldr r1, =_081BBD18 + ldr r1, =@081BBD18 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081BBD18: - .4byte _081BBE08 - .4byte _081BC02C - .4byte _081BC03C - .4byte _081BC04C - .4byte _081BC0B4 - .4byte _081BC0B4 - .4byte _081BC0B4 - .4byte _081BC0B4 - .4byte _081BC0D0 - .4byte _081BC10C - .4byte _081BC10C - .4byte _081BC10C - .4byte _081BC10C - .4byte _081BC46E - .4byte _081BC46E - .4byte _081BC46E - .4byte _081BC46E - .4byte _081BC128 - .4byte _081BC138 - .4byte _081BC168 - .4byte _081BC178 - .4byte _081BC188 - .4byte _081BC198 - .4byte _081BC1A8 - .4byte _081BC1B8 - .4byte _081BC1C8 - .4byte _081BC1D8 - .4byte _081BC1E8 - .4byte _081BC1F8 - .4byte _081BC208 - .4byte _081BC218 - .4byte _081BC228 - .4byte _081BC278 - .4byte _081BC288 - .4byte _081BC298 - .4byte _081BC2A8 - .4byte _081BC2B8 - .4byte _081BC2C8 - .4byte _081BC2D8 - .4byte _081BC2E8 - .4byte _081BC2F8 - .4byte _081BC32C - .4byte _081BC33C - .4byte _081BC34C - .4byte _081BC35C - .4byte _081BC36C - .4byte _081BC37C - .4byte _081BC38C - .4byte _081BC39C - .4byte _081BC3BC - .4byte _081BC3CC - .4byte _081BC3DC - .4byte _081BC3EC - .4byte _081BC3FC - .4byte _081BC40C - .4byte _081BC41C - .4byte _081BC42C - .4byte _081BC43C - .4byte _081BC44C - .4byte _081BC45C -_081BBE08: +@081BBD18: + .4byte @081BBE08 + .4byte @081BC02C + .4byte @081BC03C + .4byte @081BC04C + .4byte @081BC0B4 + .4byte @081BC0B4 + .4byte @081BC0B4 + .4byte @081BC0B4 + .4byte @081BC0D0 + .4byte @081BC10C + .4byte @081BC10C + .4byte @081BC10C + .4byte @081BC10C + .4byte @081BC46E + .4byte @081BC46E + .4byte @081BC46E + .4byte @081BC46E + .4byte @081BC128 + .4byte @081BC138 + .4byte @081BC168 + .4byte @081BC178 + .4byte @081BC188 + .4byte @081BC198 + .4byte @081BC1A8 + .4byte @081BC1B8 + .4byte @081BC1C8 + .4byte @081BC1D8 + .4byte @081BC1E8 + .4byte @081BC1F8 + .4byte @081BC208 + .4byte @081BC218 + .4byte @081BC228 + .4byte @081BC278 + .4byte @081BC288 + .4byte @081BC298 + .4byte @081BC2A8 + .4byte @081BC2B8 + .4byte @081BC2C8 + .4byte @081BC2D8 + .4byte @081BC2E8 + .4byte @081BC2F8 + .4byte @081BC32C + .4byte @081BC33C + .4byte @081BC34C + .4byte @081BC35C + .4byte @081BC36C + .4byte @081BC37C + .4byte @081BC38C + .4byte @081BC39C + .4byte @081BC3BC + .4byte @081BC3CC + .4byte @081BC3DC + .4byte @081BC3EC + .4byte @081BC3FC + .4byte @081BC40C + .4byte @081BC41C + .4byte @081BC42C + .4byte @081BC43C + .4byte @081BC44C + .4byte @081BC45C +@081BBE08: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -857828,7 +857828,7 @@ _081BBE08: str r0, [sp, 0x88] mov r8, r4 add r4, sp, 0xC -_081BBE54: +@081BBE54: adds r1, r6, 0 adds r1, 0xD mov r0, r8 @@ -857844,7 +857844,7 @@ _081BBE54: adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble _081BBE54 + ble @081BBE54 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -858022,36 +858022,36 @@ _081BBE54: bl pokemon_getattr mov r2, sp movs r6, 0 -_081BC00C: +@081BC00C: adds r0, r7, r6 adds r1, r2, r6 ldrb r1, [r1] strb r1, [r0] adds r6, 0x1 cmp r6, 0x57 - bls _081BC00C - b _081BC46E + bls @081BC00C + b @081BC46E .align 2, 0 .pool -_081BC02C: +@081BC02C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB - b _081BC3A6 + b @081BC3A6 .align 2, 0 .pool -_081BC03C: +@081BC03C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC - b _081BC3A6 + b @081BC3A6 .align 2, 0 .pool -_081BC04C: +@081BC04C: movs r6, 0 add r2, sp, 0x58 mov r9, r2 @@ -858063,7 +858063,7 @@ _081BC04C: ldr r0, =0x020244ec adds r4, r1, r0 mov r8, r9 -_081BC062: +@081BC062: adds r1, r6, 0 adds r1, 0xD adds r0, r4, 0 @@ -858081,7 +858081,7 @@ _081BC062: add r8, r0 adds r6, 0x1 cmp r6, 0x3 - ble _081BC062 + ble @081BC062 movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -858092,18 +858092,18 @@ _081BC062: strb r0, [r1, 0xC] mov r2, r9 movs r6, 0 -_081BC0A0: +@081BC0A0: adds r0, r7, r6 adds r1, r2, r6 ldrb r1, [r1] strb r1, [r0] adds r6, 0x1 cmp r6, 0xF - bls _081BC0A0 - b _081BC46E + bls @081BC0A0 + b @081BC46E .align 2, 0 .pool -_081BC0B4: +@081BC0B4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -858114,17 +858114,17 @@ _081BC0B4: adds r1, r2 ldrb r1, [r1] adds r1, 0x9 - b _081BC3A6 + b @081BC3A6 .align 2, 0 .pool -_081BC0D0: +@081BC0D0: movs r6, 0 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 ldr r2, =0x020244ec mov r8, r2 -_081BC0DC: +@081BC0DC: adds r1, r6, 0 adds r1, 0x11 mov r2, r8 @@ -858134,7 +858134,7 @@ _081BC0DC: strb r0, [r1] adds r6, 0x1 cmp r6, 0x3 - ble _081BC0DC + ble @081BC0DC movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -858144,10 +858144,10 @@ _081BC0DC: adds r1, r7, r6 strb r0, [r1] adds r6, 0x1 - b _081BC46E + b @081BC46E .align 2, 0 .pool -_081BC10C: +@081BC10C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -858158,25 +858158,25 @@ _081BC10C: adds r1, r2 ldrb r1, [r1] adds r1, 0x8 - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC128: +@081BC128: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1 - b _081BC142 + b @081BC142 .align 2, 0 .pool -_081BC138: +@081BC138: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x19 -_081BC142: +@081BC142: bl pokemon_getattr adds r1, r0, 0 strb r1, [r7] @@ -858191,118 +858191,118 @@ _081BC142: lsrs r0, 16 strb r0, [r7, 0x2] movs r6, 0x3 - b _081BC46E + b @081BC46E .align 2, 0 .pool -_081BC168: +@081BC168: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1A - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC178: +@081BC178: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1B - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC188: +@081BC188: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1C - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC198: +@081BC198: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1D - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC1A8: +@081BC1A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1E - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC1B8: +@081BC1B8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1F - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC1C8: +@081BC1C8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x20 - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC1D8: +@081BC1D8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x22 - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC1E8: +@081BC1E8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x23 - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC1F8: +@081BC1F8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x24 - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC208: +@081BC208: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x25 - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC218: +@081BC218: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x26 - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC228: +@081BC228: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -858333,88 +858333,88 @@ _081BC228: bl pokemon_getattr strb r0, [r7, 0x5] movs r6, 0x6 - b _081BC46E + b @081BC46E .align 2, 0 .pool -_081BC278: +@081BC278: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x27 - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC288: +@081BC288: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x28 - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC298: +@081BC298: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x29 - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC2A8: +@081BC2A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2A - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC2B8: +@081BC2B8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2B - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC2C8: +@081BC2C8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2C - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC2D8: +@081BC2D8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0 - b _081BC302 + b @081BC302 .align 2, 0 .pool -_081BC2E8: +@081BC2E8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x9 - b _081BC3A6 + b @081BC3A6 .align 2, 0 .pool -_081BC2F8: +@081BC2F8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x37 -_081BC302: +@081BC302: bl pokemon_getattr adds r1, r0, 0 strb r1, [r7] @@ -858431,79 +858431,79 @@ _081BC302: lsrs r0, r1, 24 strb r0, [r7, 0x3] movs r6, 0x4 - b _081BC46E + b @081BC46E .align 2, 0 .pool -_081BC32C: +@081BC32C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x38 - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC33C: +@081BC33C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x39 - b _081BC3A6 + b @081BC3A6 .align 2, 0 .pool -_081BC34C: +@081BC34C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3A - b _081BC3A6 + b @081BC3A6 .align 2, 0 .pool -_081BC35C: +@081BC35C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3B - b _081BC3A6 + b @081BC3A6 .align 2, 0 .pool -_081BC36C: +@081BC36C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3C - b _081BC3A6 + b @081BC3A6 .align 2, 0 .pool -_081BC37C: +@081BC37C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3D - b _081BC3A6 + b @081BC3A6 .align 2, 0 .pool -_081BC38C: +@081BC38C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3E - b _081BC3A6 + b @081BC3A6 .align 2, 0 .pool -_081BC39C: +@081BC39C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3F -_081BC3A6: +@081BC3A6: bl pokemon_getattr lsls r0, 16 lsrs r0, 16 @@ -858511,110 +858511,110 @@ _081BC3A6: lsrs r0, 8 strb r0, [r7, 0x1] movs r6, 0x2 - b _081BC46E + b @081BC46E .align 2, 0 .pool -_081BC3BC: +@081BC3BC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x16 - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC3CC: +@081BC3CC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x17 - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC3DC: +@081BC3DC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x18 - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC3EC: +@081BC3EC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x21 - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC3FC: +@081BC3FC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2F - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC40C: +@081BC40C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x30 - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC41C: +@081BC41C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x32 - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC42C: +@081BC42C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x33 - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC43C: +@081BC43C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x34 - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC44C: +@081BC44C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x35 - b _081BC466 + b @081BC466 .align 2, 0 .pool -_081BC45C: +@081BC45C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x36 -_081BC466: +@081BC466: bl pokemon_getattr strb r0, [r7] movs r6, 0x1 -_081BC46E: +@081BC46E: adds r0, r6, 0 add sp, 0x90 pop {r3-r5} @@ -858629,7 +858629,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} @@ -858637,7 +858637,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 @@ -858647,33 +858647,33 @@ sub_81BC490: @ 81BC490 adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0 - bne _081BC4C0 + bne @081BC4C0 ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] bl sub_81BC4E8 - b _081BC4DE + b @081BC4DE .align 2, 0 .pool -_081BC4C0: +@081BC4C0: ldrb r4, [r1] movs r5, 0 -_081BC4C4: +@081BC4C4: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq _081BC4D2 + beq @081BC4D2 adds r0, r5, 0 bl sub_81BC4E8 -_081BC4D2: +@081BC4D2: lsrs r4, 1 adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls _081BC4C4 -_081BC4DE: + bls @081BC4C4 +@081BC4DE: bl dp01_tbl3_exec_completed pop {r4,r5} pop {r0} @@ -858681,7 +858681,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 @@ -858701,79 +858701,79 @@ sub_81BC4E8: @ 81BC4E8 ldrb r0, [r0] adds r7, r2, 0 cmp r0, 0x3B - bls _081BC514 - bl _081BCEAE -_081BC514: + bls @081BC514 + bl @081BCEAE +@081BC514: lsls r0, 2 - ldr r1, =_081BC52C + ldr r1, =@081BC52C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081BC52C: - .4byte _081BC61C - .4byte _081BC7B4 - .4byte _081BC7D4 - .4byte _081BC7F4 - .4byte _081BC84C - .4byte _081BC84C - .4byte _081BC84C - .4byte _081BC84C - .4byte _081BC874 - .4byte _081BC8D8 - .4byte _081BC8D8 - .4byte _081BC8D8 - .4byte _081BC8D8 - .4byte _081BCEAE - .4byte _081BCEAE - .4byte _081BCEAE - .4byte _081BCEAE - .4byte _081BC908 - .4byte _081BC928 - .4byte _081BC948 - .4byte _081BC968 - .4byte _081BC988 - .4byte _081BC9A8 - .4byte _081BC9C8 - .4byte _081BC9E8 - .4byte _081BCA08 - .4byte _081BCA28 - .4byte _081BCA48 - .4byte _081BCA68 - .4byte _081BCA88 - .4byte _081BCAA8 - .4byte _081BCAC8 - .4byte _081BCB38 - .4byte _081BCB58 - .4byte _081BCB78 - .4byte _081BCB98 - .4byte _081BCBB8 - .4byte _081BCBD8 - .4byte _081BCBF8 - .4byte _081BCC18 - .4byte _081BCC38 - .4byte _081BCC58 - .4byte _081BCC78 - .4byte _081BCC98 - .4byte _081BCCB8 - .4byte _081BCCD8 - .4byte _081BCCF8 - .4byte _081BCD18 - .4byte _081BCD38 - .4byte _081BCD58 - .4byte _081BCD78 - .4byte _081BCD98 - .4byte _081BCDB8 - .4byte _081BCDD8 - .4byte _081BCDF8 - .4byte _081BCE18 - .4byte _081BCE38 - .4byte _081BCE58 - .4byte _081BCE78 - .4byte _081BCE98 -_081BC61C: +@081BC52C: + .4byte @081BC61C + .4byte @081BC7B4 + .4byte @081BC7D4 + .4byte @081BC7F4 + .4byte @081BC84C + .4byte @081BC84C + .4byte @081BC84C + .4byte @081BC84C + .4byte @081BC874 + .4byte @081BC8D8 + .4byte @081BC8D8 + .4byte @081BC8D8 + .4byte @081BC8D8 + .4byte @081BCEAE + .4byte @081BCEAE + .4byte @081BCEAE + .4byte @081BCEAE + .4byte @081BC908 + .4byte @081BC928 + .4byte @081BC948 + .4byte @081BC968 + .4byte @081BC988 + .4byte @081BC9A8 + .4byte @081BC9C8 + .4byte @081BC9E8 + .4byte @081BCA08 + .4byte @081BCA28 + .4byte @081BCA48 + .4byte @081BCA68 + .4byte @081BCA88 + .4byte @081BCAA8 + .4byte @081BCAC8 + .4byte @081BCB38 + .4byte @081BCB58 + .4byte @081BCB78 + .4byte @081BCB98 + .4byte @081BCBB8 + .4byte @081BCBD8 + .4byte @081BCBF8 + .4byte @081BCC18 + .4byte @081BCC38 + .4byte @081BCC58 + .4byte @081BCC78 + .4byte @081BCC98 + .4byte @081BCCB8 + .4byte @081BCCD8 + .4byte @081BCCF8 + .4byte @081BCD18 + .4byte @081BCD38 + .4byte @081BCD58 + .4byte @081BCD78 + .4byte @081BCD98 + .4byte @081BCDB8 + .4byte @081BCDD8 + .4byte @081BCDF8 + .4byte @081BCE18 + .4byte @081BCE38 + .4byte @081BCE58 + .4byte @081BCE78 + .4byte @081BCE98 +@081BC61C: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -858823,7 +858823,7 @@ _081BC61C: adds r7, 0x24 adds r4, r6, 0 adds r4, 0xC -_081BC682: +@081BC682: mov r1, r8 adds r1, 0xD mov r0, r9 @@ -858840,7 +858840,7 @@ _081BC682: add r8, r0 mov r0, r8 cmp r0, 0x3 - ble _081BC682 + ble @081BC682 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -858952,10 +858952,10 @@ _081BC682: movs r1, 0x3F ldr r2, [sp, 0x14] bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BC7B4: +@081BC7B4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -858966,10 +858966,10 @@ _081BC7B4: adds r2, r7 movs r1, 0xB bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BC7D4: +@081BC7D4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -858980,10 +858980,10 @@ _081BC7D4: adds r2, r7 movs r1, 0xC bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BC7F4: +@081BC7F4: movs r0, 0 mov r8, r0 movs r0, 0xC @@ -858997,7 +858997,7 @@ _081BC7F4: adds r6, r3, 0 adds r6, 0x8 adds r4, r3, 0 -_081BC80E: +@081BC80E: mov r1, r8 adds r1, 0xD adds r0, r7, 0 @@ -859014,7 +859014,7 @@ _081BC80E: add r8, r0 mov r0, r8 cmp r0, 0x3 - ble _081BC80E + ble @081BC80E movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859022,10 +859022,10 @@ _081BC80E: movs r1, 0x15 mov r2, r9 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BC84C: +@081BC84C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859038,10 +859038,10 @@ _081BC84C: adds r1, r2, r1 ldrb r1, [r1] adds r1, 0x9 - b _081BC8F0 + b @081BC8F0 .align 2, 0 .pool -_081BC874: +@081BC874: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -859082,10 +859082,10 @@ _081BC874: adds r0, r4, 0 movs r1, 0x15 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BC8D8: +@081BC8D8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859098,14 +859098,14 @@ _081BC8D8: adds r1, r2, r1 ldrb r1, [r1] adds r1, 0x8 -_081BC8F0: +@081BC8F0: adds r3, 0x3 adds r2, r3 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BC908: +@081BC908: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859116,10 +859116,10 @@ _081BC908: adds r2, r7 movs r1, 0x1 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BC928: +@081BC928: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859130,10 +859130,10 @@ _081BC928: adds r2, r7 movs r1, 0x19 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BC948: +@081BC948: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859144,10 +859144,10 @@ _081BC948: adds r2, r7 movs r1, 0x1A bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BC968: +@081BC968: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859158,10 +859158,10 @@ _081BC968: adds r2, r7 movs r1, 0x1B bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BC988: +@081BC988: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859172,10 +859172,10 @@ _081BC988: adds r2, r7 movs r1, 0x1C bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BC9A8: +@081BC9A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859186,10 +859186,10 @@ _081BC9A8: adds r2, r7 movs r1, 0x1D bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BC9C8: +@081BC9C8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859200,10 +859200,10 @@ _081BC9C8: adds r2, r7 movs r1, 0x1E bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BC9E8: +@081BC9E8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859214,10 +859214,10 @@ _081BC9E8: adds r2, r7 movs r1, 0x1F bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCA08: +@081BCA08: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859228,10 +859228,10 @@ _081BCA08: adds r2, r7 movs r1, 0x20 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCA28: +@081BCA28: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859242,10 +859242,10 @@ _081BCA28: adds r2, r7 movs r1, 0x22 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCA48: +@081BCA48: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859256,10 +859256,10 @@ _081BCA48: adds r2, r7 movs r1, 0x23 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCA68: +@081BCA68: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859270,10 +859270,10 @@ _081BCA68: adds r2, r7 movs r1, 0x24 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCA88: +@081BCA88: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859284,10 +859284,10 @@ _081BCA88: adds r2, r7 movs r1, 0x25 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCAA8: +@081BCAA8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859298,10 +859298,10 @@ _081BCAA8: adds r2, r7 movs r1, 0x26 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCAC8: +@081BCAC8: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -859347,10 +859347,10 @@ _081BCAC8: adds r0, r7, 0x5 adds r2, r0 adds r0, r4, 0 - b _081BCBE8 + b @081BCBE8 .align 2, 0 .pool -_081BCB38: +@081BCB38: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859361,10 +859361,10 @@ _081BCB38: adds r2, r7 movs r1, 0x27 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCB58: +@081BCB58: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859375,10 +859375,10 @@ _081BCB58: adds r2, r7 movs r1, 0x28 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCB78: +@081BCB78: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859389,10 +859389,10 @@ _081BCB78: adds r2, r7 movs r1, 0x29 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCB98: +@081BCB98: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859403,10 +859403,10 @@ _081BCB98: adds r2, r7 movs r1, 0x2A bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCBB8: +@081BCBB8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859417,10 +859417,10 @@ _081BCBB8: adds r2, r7 movs r1, 0x2B bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCBD8: +@081BCBD8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859429,13 +859429,13 @@ _081BCBD8: ldrb r2, [r1] lsls r2, 9 adds r2, r7 -_081BCBE8: +@081BCBE8: movs r1, 0x2C bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCBF8: +@081BCBF8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859446,10 +859446,10 @@ _081BCBF8: adds r2, r7 movs r1, 0 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCC18: +@081BCC18: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859460,10 +859460,10 @@ _081BCC18: adds r2, r7 movs r1, 0x9 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCC38: +@081BCC38: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859474,10 +859474,10 @@ _081BCC38: adds r2, r7 movs r1, 0x37 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCC58: +@081BCC58: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859488,10 +859488,10 @@ _081BCC58: adds r2, r7 movs r1, 0x38 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCC78: +@081BCC78: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859502,10 +859502,10 @@ _081BCC78: adds r2, r7 movs r1, 0x39 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCC98: +@081BCC98: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859516,10 +859516,10 @@ _081BCC98: adds r2, r7 movs r1, 0x3A bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCCB8: +@081BCCB8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859530,10 +859530,10 @@ _081BCCB8: adds r2, r7 movs r1, 0x3B bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCCD8: +@081BCCD8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859544,10 +859544,10 @@ _081BCCD8: adds r2, r7 movs r1, 0x3C bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCCF8: +@081BCCF8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859558,10 +859558,10 @@ _081BCCF8: adds r2, r7 movs r1, 0x3D bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCD18: +@081BCD18: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859572,10 +859572,10 @@ _081BCD18: adds r2, r7 movs r1, 0x3E bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCD38: +@081BCD38: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859586,10 +859586,10 @@ _081BCD38: adds r2, r7 movs r1, 0x3F bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCD58: +@081BCD58: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859600,10 +859600,10 @@ _081BCD58: adds r2, r7 movs r1, 0x16 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCD78: +@081BCD78: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859614,10 +859614,10 @@ _081BCD78: adds r2, r7 movs r1, 0x17 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCD98: +@081BCD98: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859628,10 +859628,10 @@ _081BCD98: adds r2, r7 movs r1, 0x18 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCDB8: +@081BCDB8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859642,10 +859642,10 @@ _081BCDB8: adds r2, r7 movs r1, 0x21 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCDD8: +@081BCDD8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859656,10 +859656,10 @@ _081BCDD8: adds r2, r7 movs r1, 0x2F bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCDF8: +@081BCDF8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859670,10 +859670,10 @@ _081BCDF8: adds r2, r7 movs r1, 0x30 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCE18: +@081BCE18: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859684,10 +859684,10 @@ _081BCE18: adds r2, r7 movs r1, 0x32 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCE38: +@081BCE38: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859698,10 +859698,10 @@ _081BCE38: adds r2, r7 movs r1, 0x33 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCE58: +@081BCE58: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859712,10 +859712,10 @@ _081BCE58: adds r2, r7 movs r1, 0x34 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCE78: +@081BCE78: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859726,10 +859726,10 @@ _081BCE78: adds r2, r7 movs r1, 0x35 bl pokemon_setattr - b _081BCEAE + b @081BCEAE .align 2, 0 .pool -_081BCE98: +@081BCE98: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -859740,7 +859740,7 @@ _081BCE98: adds r2, r7 movs r1, 0x36 bl pokemon_setattr -_081BCEAE: +@081BCEAE: ldr r2, =0x0202406e ldr r0, =0x02024064 ldrb r1, [r0] @@ -859765,7 +859765,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 @@ -859789,11 +859789,11 @@ sub_81BCEE4: @ 81BCEE4 adds r2, r0 ldrb r2, [r2] cmp r3, r2 - bcs _081BCF3C + bcs @081BCF3C adds r6, r4, 0 adds r2, r7, 0 adds r4, r0, 0 -_081BCF1A: +@081BCF1A: adds r1, r5, r3 ldrb r0, [r2] lsls r0, 9 @@ -859810,8 +859810,8 @@ _081BCF1A: adds r0, r4 ldrb r0, [r0] cmp r3, r0 - bcc _081BCF1A -_081BCF3C: + bcc @081BCF1A +@081BCF3C: bl dp01_tbl3_exec_completed pop {r4-r7} pop {r0} @@ -859821,7 +859821,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} @@ -859939,7 +859939,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] @@ -859986,7 +859986,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 @@ -860150,7 +860150,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 @@ -860160,7 +860160,7 @@ sub_81BD260: @ 81BD260 adds r0, r1 ldrb r3, [r0] cmp r3, 0 - bne _081BD2A8 + bne @081BD2A8 ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -860175,10 +860175,10 @@ sub_81BD260: @ 81BD260 adds r0, r1 ldr r1, =sub_81BD2F0 + 1 str r1, [r0] - b _081BD2DE + b @081BD2DE .align 2, 0 .pool -_081BD2A8: +@081BD2A8: ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] @@ -860202,7 +860202,7 @@ _081BD2A8: ldrb r0, [r0] bl sub_8072984 bl dp01_tbl3_exec_completed -_081BD2DE: +@081BD2DE: pop {r4-r6} pop {r0} bx r0 @@ -860211,7 +860211,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] @@ -860224,13 +860224,13 @@ sub_81BD2F0: @ 81BD2F0 adds r3, r0, r1 ldrb r0, [r3, 0x4] cmp r0, 0 - beq _081BD318 + beq @081BD318 cmp r0, 0x1 - beq _081BD346 - b _081BD36E + beq @081BD346 + b @081BD36E .align 2, 0 .pool -_081BD318: +@081BD318: ldr r1, [r4] lsls r0, r2, 2 adds r0, r1 @@ -860238,12 +860238,12 @@ _081BD318: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _081BD332 + beq @081BD332 adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -_081BD332: +@081BD332: ldr r0, [r6] ldrb r1, [r5] ldr r2, [r0, 0x4] @@ -860253,15 +860253,15 @@ _081BD332: adds r0, r2 movs r1, 0x1 strb r1, [r0, 0x4] - b _081BD36E -_081BD346: + b @081BD36E +@081BD346: ldrb r1, [r3] movs r0, 0x40 ands r0, r1 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _081BD36E + bne @081BD36E strb r0, [r3, 0x4] ldrb r2, [r5] adds r0, r2, 0 @@ -860274,7 +860274,7 @@ _081BD346: adds r0, r1 ldr r1, =sub_81BB828 + 1 str r1, [r0] -_081BD36E: +@081BD36E: pop {r4-r6} pop {r0} bx r0 @@ -860283,7 +860283,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 @@ -860292,16 +860292,16 @@ sub_81BD37C: @ 81BD37C ldrh r1, [r2] ldr r0, =0x00000c03 cmp r1, r0 - bne _081BD3A8 + bne @081BD3A8 movs r4, 0x7 movs r0, 0x5A mov r9, r0 ldr r0, =0x08305d2c ldrb r1, [r0, 0x1C] - b _081BD3BE + b @081BD3BE .align 2, 0 .pool -_081BD3A8: +@081BD3A8: ldrh r0, [r2] bl sub_8162AA0 lsls r0, 24 @@ -860312,7 +860312,7 @@ _081BD3A8: lsls r0, r4, 2 adds r0, r1 ldrb r1, [r0] -_081BD3BE: +@081BD3BE: movs r0, 0x8 subs r0, r1 lsls r0, 18 @@ -860324,7 +860324,7 @@ _081BD3BE: ldrh r1, [r0] ldr r0, =0x00000c03 cmp r1, r0 - bne _081BD494 + bne @081BD494 ldr r5, =0x02024064 ldrb r1, [r5] adds r0, r4, 0 @@ -860395,10 +860395,10 @@ _081BD3BE: adds r0, r4 ldr r1, =sub_805D7AC + 1 str r1, [r0] - b _081BD57C + b @081BD57C .align 2, 0 .pool -_081BD494: +@081BD494: adds r5, r4, 0 ldr r6, =0x02024064 ldrb r1, [r6] @@ -860509,7 +860509,7 @@ _081BD494: movs r2, 0x1 orrs r1, r2 strb r1, [r0] -_081BD57C: +@081BD57C: ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -860528,7 +860528,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} @@ -860536,7 +860536,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 @@ -860610,7 +860610,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] @@ -860623,7 +860623,7 @@ sub_81BD674: @ 81BD674 adds r3, r1, r0 ldrb r0, [r3, 0x4] cmp r0, 0 - bne _081BD6C8 + bne @081BD6C8 ldr r1, [r4] lsls r0, r2, 2 adds r0, r1 @@ -860631,12 +860631,12 @@ sub_81BD674: @ 81BD674 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _081BD6A8 + beq @081BD6A8 adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -_081BD6A8: +@081BD6A8: ldr r0, [r6] ldrb r1, [r5] ldr r2, [r0, 0x4] @@ -860647,17 +860647,17 @@ _081BD6A8: ldrb r1, [r0, 0x4] adds r1, 0x1 strb r1, [r0, 0x4] - b _081BD73E + b @081BD73E .align 2, 0 .pool -_081BD6C8: +@081BD6C8: ldrb r1, [r3] movs r0, 0x40 ands r0, r1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _081BD73E + bne @081BD73E strb r4, [r3, 0x4] ldr r2, =0x0202406e ldrb r1, [r5] @@ -860708,7 +860708,7 @@ _081BD6C8: adds r0, r1 ldr r1, =sub_81BB78C + 1 str r1, [r0] -_081BD73E: +@081BD73E: pop {r4-r6} pop {r0} bx r0 @@ -860717,7 +860717,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} @@ -860725,7 +860725,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} @@ -860733,7 +860733,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} @@ -860741,7 +860741,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} @@ -860749,16 +860749,16 @@ 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] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - beq _081BD7A2 - b _081BD8B6 -_081BD7A2: + beq @081BD7A2 + b @081BD8B6 +@081BD7A2: ldr r0, =0x02023064 mov r12, r0 ldrb r2, [r6] @@ -860858,12 +860858,12 @@ _081BD7A2: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq _081BD898 + beq @081BD898 bl dp01_tbl3_exec_completed - b _081BD8B6 + b @081BD8B6 .align 2, 0 .pool -_081BD898: +@081BD898: ldr r0, =0x020244d0 ldr r0, [r0] ldrb r1, [r6] @@ -860879,7 +860879,7 @@ _081BD898: adds r0, r1 ldr r1, =bx_move_anim_3 + 1 str r1, [r0] -_081BD8B6: +@081BD8B6: pop {r4-r6} pop {r0} bx r0 @@ -860888,7 +860888,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 @@ -860921,21 +860921,21 @@ bx_move_anim_3: @ 81BD8C8 adds r0, r1 ldrb r2, [r0, 0x4] cmp r2, 0x1 - beq _081BD960 + beq @081BD960 cmp r2, 0x1 - bgt _081BD920 + bgt @081BD920 cmp r2, 0 - beq _081BD92A - b _081BDA3C + beq @081BD92A + b @081BDA3C .align 2, 0 .pool -_081BD920: +@081BD920: cmp r2, 0x2 - beq _081BD98A + beq @081BD98A cmp r2, 0x3 - beq _081BDA00 - b _081BDA3C -_081BD92A: + beq @081BDA00 + b @081BDA3C +@081BD92A: ldr r1, [r5] lsls r0, r3, 2 adds r1, r0, r1 @@ -860943,7 +860943,7 @@ _081BD92A: movs r0, 0xC ands r0, r2 cmp r0, 0x4 - bne _081BD94C + bne @081BD94C movs r0, 0x8 orrs r0, r2 strb r0, [r1] @@ -860952,7 +860952,7 @@ _081BD92A: adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -_081BD94C: +@081BD94C: ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -860962,13 +860962,13 @@ _081BD94C: adds r0, r2 movs r1, 0x1 strb r1, [r0, 0x4] - b _081BDA3C -_081BD960: + b @081BDA3C +@081BD960: ldrb r1, [r0] movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _081BDA3C + bne @081BDA3C movs r0, 0 bl sub_805EB9C adds r0, r4, 0 @@ -860982,15 +860982,15 @@ _081BD960: adds r0, r2 movs r1, 0x2 strb r1, [r0, 0x4] - b _081BDA3C -_081BD98A: + b @081BDA3C +@081BD98A: ldr r0, =0x020383f8 ldr r0, [r0] bl _call_via_r0 ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 - bne _081BDA3C + bne @081BDA3C movs r0, 0x1 bl sub_805EB9C ldr r0, [r7] @@ -861002,10 +861002,10 @@ _081BD98A: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _081BD9D8 + beq @081BD9D8 mov r0, r8 cmp r0, 0x1 - bhi _081BD9D8 + bhi @081BD9D8 adds r0, r2, 0 adds r1, r2, 0 movs r3, 0x6 @@ -861020,7 +861020,7 @@ _081BD98A: negs r0, r0 ands r0, r2 strb r0, [r1] -_081BD9D8: +@081BD9D8: ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -861032,17 +861032,17 @@ _081BD9D8: adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x4] - b _081BDA3C + b @081BDA3C .align 2, 0 .pool -_081BDA00: +@081BDA00: ldrb r1, [r0] movs r0, 0x40 ands r0, r1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _081BDA3C + bne @081BDA3C bl sub_805E394 ldrb r0, [r6] lsls r2, r0, 9 @@ -861063,7 +861063,7 @@ _081BDA00: adds r0, r2 strb r4, [r0, 0x4] bl dp01_tbl3_exec_completed -_081BDA3C: +@081BDA3C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -861074,7 +861074,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 @@ -861105,7 +861105,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} @@ -861113,7 +861113,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 @@ -861122,7 +861122,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} @@ -861130,7 +861130,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] @@ -861154,11 +861154,11 @@ sub_81BDAC8: @ 81BDAC8 movs r0, 0x12 ands r0, r1 cmp r0, 0 - beq _081BDB02 + beq @081BDB02 ldr r1, =0x0202420c ldrb r0, [r6] strb r0, [r1] -_081BDB02: +@081BDB02: ldrh r1, [r4] lsls r0, r1, 1 adds r0, r1 @@ -861168,7 +861168,7 @@ _081BDB02: movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _081BDB3C + beq @081BDB3C movs r0, 0x1 bl battle_get_side_with_given_state ldr r4, =0x0202420c @@ -861182,11 +861182,11 @@ _081BDB02: ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq _081BDB3C + beq @081BDB3C movs r0, 0x3 bl battle_get_side_with_given_state strb r0, [r4] -_081BDB3C: +@081BDB3C: ldr r0, =0x0202420c ldrb r2, [r0] lsls r2, 8 @@ -861203,7 +861203,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} @@ -861211,13 +861211,13 @@ 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 lsrs r4, r0, 24 cmp r4, 0x6 - bne _081BDBD0 + bne @081BDBD0 movs r0, 0 bl battle_get_side_with_given_state lsls r0, 24 @@ -861227,12 +861227,12 @@ sub_81BDB7C: @ 81BDB7C lsls r0, 24 lsrs r5, r0, 24 movs r4, 0x3 - b _081BDBA4 -_081BDBA2: + b @081BDBA4 +@081BDBA2: adds r4, 0x1 -_081BDBA4: +@081BDBA4: cmp r4, 0x5 - bgt _081BDBD0 + bgt @081BDBD0 movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -861240,19 +861240,19 @@ _081BDBA4: movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq _081BDBA2 + beq @081BDBA2 ldr r1, =0x0202406e lsls r0, r6, 1 adds r0, r1 ldrh r0, [r0] cmp r4, r0 - beq _081BDBA2 + beq @081BDBA2 lsls r0, r5, 1 adds r0, r1 ldrh r0, [r0] cmp r4, r0 - beq _081BDBA2 -_081BDBD0: + beq @081BDBA2 +@081BDBD0: ldr r0, =0x02024064 ldrb r0, [r0] ldr r1, =0x0202449c @@ -861274,7 +861274,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} @@ -861282,7 +861282,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 @@ -861307,7 +861307,7 @@ sub_81BDC10: @ 81BDC10 asrs r7, r1, 16 ldr r0, =0x00007fff cmp r7, r0 - beq _081BDCA0 + beq @081BDCA0 ldr r6, =0x0202406e lsls r0, r4, 1 adds r0, r6 @@ -861337,10 +861337,10 @@ sub_81BDC10: @ 81BDC10 str r7, [sp] mov r2, r8 bl sub_807294C - b _081BDCCA + b @081BDCCA .align 2, 0 .pool -_081BDCA0: +@081BDCA0: ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -861360,7 +861360,7 @@ _081BDCA0: str r7, [sp] movs r3, 0 bl sub_807294C -_081BDCCA: +@081BDCCA: ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -861380,7 +861380,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 @@ -861398,12 +861398,12 @@ sub_81BDD00: @ 81BDD00 movs r1, 0x38 bl pokemon_getattr cmp r0, 0x63 - bls _081BDD38 + bls @081BDD38 bl dp01_tbl3_exec_completed - b _081BDD84 + b @081BDD84 .align 2, 0 .pool -_081BDD38: +@081BDD38: movs r0, 0x1 bl load_gfxc_health_bar adds r0, r4, 0 @@ -861439,7 +861439,7 @@ _081BDD38: adds r0, r1 ldr r1, =nullsub_21 + 1 str r1, [r0] -_081BDD84: +@081BDD84: pop {r4-r7} pop {r0} bx r0 @@ -861448,14 +861448,14 @@ _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] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne _081BDDF0 + bne @081BDDF0 ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 @@ -861489,7 +861489,7 @@ sub_81BDD9C: @ 81BDD9C adds r0, r1 ldr r1, =sub_81BBC04 + 1 str r1, [r0] -_081BDDF0: +@081BDDF0: pop {r4} pop {r0} bx r0 @@ -861498,14 +861498,14 @@ _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] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne _081BDE64 + bne @081BDE64 ldr r4, =0x02023064 ldrb r3, [r5] lsls r3, 9 @@ -861537,7 +861537,7 @@ sub_81BDE14: @ 81BDE14 adds r0, r1 ldr r1, =sub_81BBC04 + 1 str r1, [r0] -_081BDE64: +@081BDE64: pop {r4,r5} pop {r0} bx r0 @@ -861546,7 +861546,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} @@ -861554,7 +861554,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} @@ -861562,7 +861562,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} @@ -861570,7 +861570,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} @@ -861578,7 +861578,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} @@ -861586,7 +861586,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} @@ -861594,7 +861594,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} @@ -861602,7 +861602,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} @@ -861610,7 +861610,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} @@ -861618,7 +861618,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] @@ -861634,7 +861634,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 @@ -861660,7 +861660,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] @@ -861675,7 +861675,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] @@ -861697,7 +861697,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 @@ -861713,12 +861713,12 @@ dp01t_29_3_blink: @ 81BDF7C ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - bge _081BDFB0 + bge @081BDFB0 bl dp01_tbl3_exec_completed - b _081BDFDA + b @081BDFDA .align 2, 0 .pool -_081BDFB0: +@081BDFB0: ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] @@ -861739,7 +861739,7 @@ _081BDFB0: adds r0, r1 ldr r1, =bx_blink_t3 + 1 str r1, [r0] -_081BDFDA: +@081BDFDA: pop {r4} pop {r0} bx r0 @@ -861748,7 +861748,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} @@ -861756,7 +861756,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] @@ -861764,9 +861764,9 @@ sub_81BDFF8: @ 81BDFF8 lsls r0, 24 movs r3, 0x3F cmp r0, 0 - bne _081BE00C + bne @081BE00C movs r3, 0xC0 -_081BE00C: +@081BE00C: ldr r2, =0x02023064 ldrb r1, [r4] lsls r1, 9 @@ -861790,7 +861790,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 @@ -861800,7 +861800,7 @@ sub_81BE03C: @ 81BE03C adds r0, r3, r0 ldrb r0, [r0] cmp r0, 0 - beq _081BE078 + beq @081BE078 bl sub_805EA60 ldrb r1, [r5] lsls r1, 9 @@ -861813,10 +861813,10 @@ sub_81BE03C: @ 81BE03C lsls r1, 8 orrs r0, r1 bl song_play_for_text - b _081BE08C + b @081BE08C .align 2, 0 .pool -_081BE078: +@081BE078: adds r0, r4, 0x1 adds r0, r3, r0 ldrb r0, [r0] @@ -861826,7 +861826,7 @@ _081BE078: lsls r1, 8 orrs r0, r1 bl fanfare_play -_081BE08C: +@081BE08C: bl dp01_tbl3_exec_completed pop {r4,r5} pop {r0} @@ -861834,7 +861834,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 @@ -861862,7 +861862,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 @@ -861885,7 +861885,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 @@ -861970,7 +861970,7 @@ sub_81BE10C: @ 81BE10C ldrh r1, [r2] ldr r0, =0x00000c03 cmp r1, r0 - bne _081BE1FC + bne @081BE1FC ldr r0, =0x08305d8c ldr r0, [r0, 0x38] lsls r4, 4 @@ -861979,10 +861979,10 @@ sub_81BE10C: @ 81BE10C adds r1, r4, r2 movs r2, 0x20 bl decompress_palette - b _081BE21A + b @081BE21A .align 2, 0 .pool -_081BE1FC: +@081BE1FC: ldrh r0, [r2] bl sub_8162AA0 lsls r0, 24 @@ -861996,7 +861996,7 @@ _081BE1FC: adds r1, r4, r2 movs r2, 0x20 bl decompress_palette -_081BE21A: +@081BE21A: ldr r2, =0x02020630 ldr r1, =0x020241e4 ldr r5, =0x02024064 @@ -862036,7 +862036,7 @@ _081BE21A: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081BE27E + beq @081BE27E ldr r0, =0x020244b4 adds r0, r2, r0 ldrb r1, [r0] @@ -862046,7 +862046,7 @@ _081BE21A: adds r0, r4 ldr r1, =sub_8073C30 + 1 str r1, [r0] -_081BE27E: +@081BE27E: ldr r0, [r3] ldr r2, [r0, 0x8] ldrb r0, [r2, 0x9] @@ -862067,7 +862067,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 @@ -862084,13 +862084,13 @@ sub_81BE2C8: @ 81BE2C8 movs r3, 0xA ldrsh r0, [r1, r3] cmp r0, 0x17 - bgt _081BE2F4 + bgt @081BE2F4 adds r0, r2, 0x1 strh r0, [r1, 0xA] - b _081BE3B0 + b @081BE3B0 .align 2, 0 .pool -_081BE2F4: +@081BE2F4: ldr r7, =0x02024064 ldrb r0, [r7] mov r9, r0 @@ -862099,14 +862099,14 @@ _081BE2F4: bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq _081BE314 + beq @081BE314 ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq _081BE344 -_081BE314: + beq @081BE344 +@081BE314: ldr r0, =0x02023064 ldrb r1, [r7] lsls r2, r1, 9 @@ -862120,10 +862120,10 @@ _081BE314: ldrb r0, [r7] movs r1, 0 bl sub_81BD0E4 - b _081BE398 + b @081BE398 .align 2, 0 .pool -_081BE344: +@081BE344: ldr r4, =0x02023064 ldrb r0, [r7] lsls r1, r0, 9 @@ -862163,7 +862163,7 @@ _081BE344: ldrb r0, [r7] eors r0, r6 strb r0, [r7] -_081BE398: +@081BE398: ldr r1, =0x03005d60 ldr r2, =0x02024064 ldrb r0, [r2] @@ -862175,7 +862175,7 @@ _081BE398: strb r3, [r2] mov r0, r8 bl remove_task -_081BE3B0: +@081BE3B0: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -862187,7 +862187,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 @@ -862197,17 +862197,17 @@ dp01t_30_3_80EB11C: @ 81BE3D4 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _081BE404 + beq @081BE404 adds r0, r2, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne _081BE404 + bne @081BE404 bl dp01_tbl3_exec_completed - b _081BE478 + b @081BE478 .align 2, 0 .pool -_081BE404: +@081BE404: ldr r6, =0x020244d0 ldr r0, [r6] ldr r5, =0x02024064 @@ -862250,7 +862250,7 @@ _081BE404: adds r0, r4 ldrb r0, [r0] cmp r0, 0 - beq _081BE46C + beq @081BE46C ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -862259,14 +862259,14 @@ _081BE404: adds r0, r1 movs r1, 0x5D strb r1, [r0, 0x5] -_081BE46C: +@081BE46C: ldr r0, =0x03005d60 ldrb r1, [r5] lsls r1, 2 adds r1, r0 ldr r0, =sub_81BE498 + 1 str r0, [r1] -_081BE478: +@081BE478: pop {r4-r6} pop {r0} bx r0 @@ -862275,7 +862275,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] @@ -862292,7 +862292,7 @@ sub_81BE498: @ 81BE498 lsls r1, 24 lsrs r1, 24 cmp r1, 0x5C - bls _081BE4D0 + bls @081BE4D0 ldr r0, [r4] ldrb r1, [r3] ldr r2, [r0, 0x4] @@ -862303,7 +862303,7 @@ sub_81BE498: @ 81BE498 movs r1, 0 strb r1, [r0, 0x5] bl dp01_tbl3_exec_completed -_081BE4D0: +@081BE4D0: pop {r4} pop {r0} bx r0 @@ -862312,7 +862312,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] @@ -862327,7 +862327,7 @@ sub_81BE4E0: @ 81BE4E0 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081BE512 + beq @081BE512 ldr r2, =0x03005e00 ldr r0, =0x020244b4 adds r0, r3, r0 @@ -862338,7 +862338,7 @@ sub_81BE4E0: @ 81BE4E0 adds r0, r2 ldr r1, =sub_8073C30 + 1 str r1, [r0] -_081BE512: +@081BE512: bl dp01_tbl3_exec_completed pop {r0} bx r0 @@ -862347,7 +862347,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} @@ -862355,14 +862355,14 @@ 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] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 - beq _081BE582 + beq @081BE582 ldr r3, =0x02020630 ldr r0, =0x020241e4 ldrb r1, [r4] @@ -862389,7 +862389,7 @@ sub_81BE53C: @ 81BE53C strb r0, [r2] ldrb r0, [r4] bl sub_805E408 -_081BE582: +@081BE582: bl dp01_tbl3_exec_completed pop {r4} pop {r0} @@ -862399,7 +862399,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 @@ -862407,7 +862407,7 @@ sub_81BE59C: @ 81BE59C bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne _081BE5F4 + bne @081BE5F4 ldr r5, =0x02023064 ldrb r2, [r6] lsls r1, r2, 9 @@ -862428,19 +862428,19 @@ sub_81BE59C: @ 81BE59C bl move_anim_start_t3 lsls r0, 24 cmp r0, 0 - beq _081BE5E8 + beq @081BE5E8 bl dp01_tbl3_exec_completed - b _081BE5F4 + b @081BE5F4 .align 2, 0 .pool -_081BE5E8: +@081BE5E8: ldr r0, =0x03005d60 ldrb r1, [r6] lsls r1, 2 adds r1, r0 ldr r0, =bx_80E8A6C + 1 str r0, [r1] -_081BE5F4: +@081BE5F4: add sp, 0x4 pop {r4-r6} pop {r0} @@ -862450,7 +862450,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} @@ -862458,7 +862458,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} @@ -862466,7 +862466,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 @@ -862496,12 +862496,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] @@ -862509,24 +862509,24 @@ sub_81BE66C: @ 81BE66C movs r0, 0xD0 lsls r0, 5 cmp r1, r0 - bne _081BE690 + bne @081BE690 movs r0, 0xA7 lsls r0, 1 bl flag_check lsls r0, 24 lsrs r0, 24 - b _081BE692 + b @081BE692 .align 2, 0 .pool -_081BE690: +@081BE690: movs r0, 0 -_081BE692: +@081BE692: pop {r1} bx r1 thumb_func_end sub_81BE66C thumb_func_start sub_81BE698 -sub_81BE698: @ 81BE698 +sub_81BE698: ; 81BE698 push {lr} ldr r0, =0x0203cf18 ldr r0, [r0] @@ -862539,7 +862539,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] @@ -862549,31 +862549,31 @@ 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] cmp r0, 0 - beq _081BE6CC + beq @081BE6CC movs r0, 0 str r0, [r4] - b _081BE718 + b @081BE718 .align 2, 0 .pool -_081BE6CC: +@081BE6CC: ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] movs r0, 0xD0 lsls r0, 5 cmp r1, r0 - bne _081BE718 + bne @081BE718 movs r0, 0xA7 lsls r0, 1 bl flag_check lsls r0, 24 cmp r0, 0 - beq _081BE718 + beq @081BE718 movs r0, 0xC8 bl malloc_and_clear str r0, [r4] @@ -862593,7 +862593,7 @@ _081BE6CC: bl AddTask ldr r1, [r4] strb r0, [r1] -_081BE718: +@081BE718: pop {r4} pop {r0} bx r0 @@ -862602,7 +862602,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] @@ -862610,26 +862610,26 @@ sub_81BE72C: @ 81BE72C movs r0, 0xD0 lsls r0, 5 cmp r1, r0 - bne _081BE788 + bne @081BE788 movs r0, 0xA7 lsls r0, 1 bl flag_check lsls r0, 24 cmp r0, 0 - beq _081BE788 + beq @081BE788 ldr r4, =0x0203cf18 ldr r0, [r4] cmp r0, 0 - beq _081BE788 + beq @081BE788 ldr r0, =sub_81BE698 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - beq _081BE766 + beq @081BE766 ldr r0, [r4] ldrb r0, [r0] bl remove_task -_081BE766: +@081BE766: ldr r0, [r4] adds r0, 0x4 movs r1, 0x1 @@ -862644,7 +862644,7 @@ _081BE766: bl free movs r0, 0 str r0, [r4] -_081BE788: +@081BE788: pop {r4} pop {r0} bx r0 @@ -862653,20 +862653,20 @@ _081BE788: thumb_func_end sub_81BE72C thumb_func_start sub_81BE79C -sub_81BE79C: @ 81BE79C +sub_81BE79C: ; 81BE79C push {r4,lr} ldr r0, =0x000040cb bl var_get lsls r0, 16 cmp r0, 0 - beq _081BE7B8 + beq @081BE7B8 movs r0, 0xA7 lsls r0, 1 bl flag_clear - b _081BE7EE + b @081BE7EE .align 2, 0 .pool -_081BE7B8: +@081BE7B8: bl GenerateRandomNumber lsls r0, 16 lsrs r4, r0, 16 @@ -862677,28 +862677,28 @@ _081BE7B8: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081BE7D4 + bne @081BE7D4 movs r4, 0x1 -_081BE7D4: +@081BE7D4: cmp r4, 0 - beq _081BE7E6 + beq @081BE7E6 movs r0, 0xA7 lsls r0, 1 bl flag_set bl sub_81BE6B8 - b _081BE7EE -_081BE7E6: + b @081BE7EE +@081BE7E6: movs r0, 0xA7 lsls r0, 1 bl flag_clear -_081BE7EE: +@081BE7EE: pop {r4} pop {r0} bx r0 thumb_func_end sub_81BE79C thumb_func_start sub_81BE7F4 -sub_81BE7F4: @ 81BE7F4 +sub_81BE7F4: ; 81BE7F4 push {lr} ldr r0, =sub_81BE808 + 1 movs r1, 0x8 @@ -862710,7 +862710,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 @@ -862765,11 +862765,11 @@ sub_81BE808: @ 81BE808 ldrsh r0, [r0, r4] adds r1, r0 cmp r2, r1 - blt _081BE882 + blt @081BE882 adds r0, r5, 0 bl remove_task bl script_env_2_enable_and_set_ctx_running -_081BE882: +@081BE882: add sp, 0x4 pop {r4,r5} pop {r0} @@ -862779,7 +862779,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} @@ -862827,7 +862827,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 @@ -862845,7 +862845,7 @@ sub_81BE900: @ 81BE900 ldrsh r1, [r4, r2] bl __modsi3 cmp r0, 0 - bne _081BE95C + bne @081BE95C strh r0, [r4, 0x2] ldrh r0, [r4, 0x4] subs r0, 0x1 @@ -862864,12 +862864,12 @@ sub_81BE900: @ 81BE900 movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0 - bne _081BE95C + bne @081BE95C bl sub_81BE968 adds r0, r5, 0 bl remove_task bl sub_808A2E4 -_081BE95C: +@081BE95C: pop {r4,r5} pop {r0} bx r0 @@ -862878,14 +862878,14 @@ _081BE95C: thumb_func_end sub_81BE900 thumb_func_start sub_81BE968 -sub_81BE968: @ 81BE968 +sub_81BE968: ; 81BE968 push {lr} ldr r0, =sub_81BE9C0 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq _081BE988 + beq @081BE988 ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -862894,7 +862894,7 @@ sub_81BE968: @ 81BE968 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_081BE988: +@081BE988: pop {r0} bx r0 .align 2, 0 @@ -862902,7 +862902,7 @@ _081BE988: thumb_func_end sub_81BE968 thumb_func_start sub_81BE994 -sub_81BE994: @ 81BE994 +sub_81BE994: ; 81BE994 push {lr} ldr r0, =0x08617d94 bl gpu_tile_obj_alloc_and_load_multiple @@ -862922,7 +862922,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 @@ -862938,17 +862938,17 @@ sub_81BE9C0: @ 81BE9C0 movs r1, 0xFA lsls r1, 18 cmp r0, r1 - beq _081BE9E6 + beq @081BE9E6 ldrh r0, [r2] cmp r0, 0x11 - bne _081BE9F0 -_081BE9E6: + bne @081BE9F0 +@081BE9E6: adds r0, r4, 0 subs r0, 0x8 adds r0, r3, r0 ldr r1, =sub_81BEA00 + 1 str r1, [r0] -_081BE9F0: +@081BE9F0: pop {r4} pop {r0} bx r0 @@ -862957,7 +862957,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 @@ -862974,13 +862974,13 @@ 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, =0x08617d64 adds r7, r5, 0x2 ldr r6, =0x02020630 -_081BEA2A: +@081BEA2A: lsls r0, r4, 1 adds r0, r4 lsls r0, 1 @@ -863014,12 +863014,12 @@ _081BEA2A: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bls _081BEA2A + bls @081BEA2A movs r4, 0 ldr r5, =0x08617d64 adds r7, r5, 0x2 ldr r6, =0x02020630 -_081BEA78: +@081BEA78: lsls r0, r4, 1 adds r0, r4 lsls r0, 1 @@ -863055,7 +863055,7 @@ _081BEA78: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bls _081BEA78 + bls @081BEA78 pop {r4-r7} pop {r0} bx r0 @@ -863064,7 +863064,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] @@ -863092,11 +863092,11 @@ sub_81BEAD8: @ 81BEAD8 movs r1, 0 ldrsh r0, [r0, r1] cmp r3, r0 - ble _081BEB1A + ble @081BEB1A adds r0, r4, 0 bl obj_delete_and_free_tiles bl sub_81BE968 -_081BEB1A: +@081BEB1A: pop {r4} pop {r0} bx r0 @@ -863105,11 +863105,11 @@ _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, =0x08617da4 -_081BEB2A: +@081BEB2A: lsls r2, r4, 2 adds r2, r5 ldrb r0, [r2] @@ -863122,7 +863122,7 @@ _081BEB2A: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x11 - bls _081BEB2A + bls @081BEB2A bl cur_mapdata_full_redraw pop {r4,r5} pop {r0} @@ -863132,7 +863132,7 @@ _081BEB2A: thumb_func_end sub_81BEB24 thumb_func_start sub_81BEB54 -sub_81BEB54: @ 81BEB54 +sub_81BEB54: ; 81BEB54 push {lr} ldr r0, =sub_81BED50 + 1 movs r1, 0x9 @@ -863144,7 +863144,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 + 1 movs r1, 0x9 @@ -863156,7 +863156,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 + 1 movs r1, 0x9 @@ -863168,7 +863168,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] @@ -863187,7 +863187,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 @@ -863200,7 +863200,7 @@ sub_81BEBB4: @ 81BEBB4 movs r3, 0x8 ldrsh r0, [r2, r3] cmp r0, 0 - bne _081BEBEC + bne @081BEBEC ldr r0, =0x0203cf14 ldr r1, [r0] ldrh r0, [r1] @@ -863209,19 +863209,19 @@ sub_81BEBB4: @ 81BEBB4 movs r0, 0x2 strh r0, [r2, 0x8] bl sub_81BEB90 - b _081BEBF0 + b @081BEBF0 .align 2, 0 .pool -_081BEBEC: +@081BEBEC: subs r0, r1, 0x1 strh r0, [r2, 0x8] -_081BEBF0: +@081BEBF0: pop {r0} bx r0 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 @@ -863234,33 +863234,33 @@ sub_81BEBF4: @ 81BEBF4 movs r1, 0x8 ldrsh r0, [r0, r1] cmp r0, 0x6 - bls _081BEC10 - b _081BED40 -_081BEC10: + bls @081BEC10 + b @081BED40 +@081BEC10: lsls r0, 2 - ldr r1, =_081BEC24 + ldr r1, =@081BEC24 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081BEC24: - .4byte _081BEC40 - .4byte _081BEC50 - .4byte _081BEC88 - .4byte _081BECB0 - .4byte _081BECF8 - .4byte _081BED00 - .4byte _081BED1C -_081BEC40: +@081BEC24: + .4byte @081BEC40 + .4byte @081BEC50 + .4byte @081BEC88 + .4byte @081BECB0 + .4byte @081BECF8 + .4byte @081BED00 + .4byte @081BED1C +@081BEC40: bl Window_FreeMemory movs r0, 0 movs r1, 0x7 movs r2, 0x2 bl gpu_bg_config_set_field - b _081BED04 -_081BEC50: + b @081BED04 +@081BEC50: ldr r4, =0x0203cf04 movs r0, 0x92 lsls r0, 4 @@ -863279,10 +863279,10 @@ _081BEC50: movs r1, 0 movs r2, 0 bl bg_change_y_offset - b _081BECD8 + b @081BECD8 .align 2, 0 .pool -_081BEC88: +@081BEC88: ldr r0, =0x08617274 ldr r4, =0x0203cf04 ldr r1, [r4] @@ -863295,10 +863295,10 @@ _081BEC88: movs r0, 0 movs r3, 0 bl gpu_copy_bg_tile_pattern_data_to_vram - b _081BECD8 + b @081BECD8 .align 2, 0 .pool -_081BECB0: +@081BECB0: ldr r0, =0x0203cf08 ldr r1, [r0] movs r0, 0 @@ -863316,7 +863316,7 @@ _081BECB0: bl bg_copy_tilemap_rect_simple movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram -_081BECD8: +@081BECD8: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -863325,16 +863325,16 @@ _081BECD8: ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b _081BED40 + b @081BED40 .align 2, 0 .pool -_081BECF8: +@081BECF8: movs r0, 0 bl gpu_sync_bg_show - b _081BED04 -_081BED00: + b @081BED04 +@081BED00: bl sub_81BEB24 -_081BED04: +@081BED04: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -863343,10 +863343,10 @@ _081BED04: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b _081BED40 + b @081BED40 .align 2, 0 .pool -_081BED1C: +@081BED1C: ldr r4, =0x0203cf14 movs r0, 0x4 bl malloc @@ -863361,7 +863361,7 @@ _081BED1C: adds r0, r5, 0 bl remove_task bl script_env_2_enable_and_set_ctx_running -_081BED40: +@081BED40: add sp, 0xC pop {r4,r5} pop {r0} @@ -863371,7 +863371,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 @@ -863392,36 +863392,36 @@ sub_81BED50: @ 81BED50 asrs r0, 16 adds r6, r1, 0 cmp r0, 0x7 - bls _081BED7C - b _081BF002 -_081BED7C: + bls @081BED7C + b @081BF002 +@081BED7C: lsls r0, 2 - ldr r1, =_081BED90 + ldr r1, =@081BED90 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081BED90: - .4byte _081BEDB0 - .4byte _081BF002 - .4byte _081BEDC4 - .4byte _081BEF64 - .4byte _081BEF94 - .4byte _081BEFD0 - .4byte _081BEFF0 - .4byte _081BEFF8 -_081BEDB0: +@081BED90: + .4byte @081BEDB0 + .4byte @081BF002 + .4byte @081BEDC4 + .4byte @081BEF64 + .4byte @081BEF94 + .4byte @081BEFD0 + .4byte @081BEFF0 + .4byte @081BEFF8 +@081BEDB0: ldr r4, =0x0203cf10 movs r0, 0xC0 lsls r0, 2 bl malloc_and_clear str r0, [r4] - b _081BF002 + b @081BF002 .align 2, 0 .pool -_081BEDC4: +@081BEDC4: mov r1, r10 lsls r0, r1, 2 adds r1, r0, r1 @@ -863432,11 +863432,11 @@ _081BEDC4: ldrsh r1, [r2, r4] str r0, [sp, 0x8] cmp r1, 0x5F - bgt _081BEE8A + bgt @081BEE8A movs r1, 0xA ldrsh r0, [r2, r1] cmp r0, 0x1 - ble _081BEE7C + ble @081BEE7C lsls r0, r3, 24 lsrs r4, r0, 24 movs r0, 0x30 @@ -863448,7 +863448,7 @@ _081BEDC4: str r0, [r1] movs r5, 0 adds r4, r2, 0 -_081BEDFA: +@081BEDFA: ldr r0, [r3] adds r0, r4, r0 ldr r0, [r0] @@ -863458,11 +863458,11 @@ _081BEDFA: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x2F - bls _081BEDFA + bls @081BEDFA movs r5, 0 ldr r7, =0x0203cf10 adds r6, r2, 0 -_081BEE14: +@081BEE14: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -863495,7 +863495,7 @@ _081BEE14: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x2F - bls _081BEE14 + bls @081BEE14 ldr r0, =0x03005e00 ldr r1, [sp, 0x8] add r1, r10 @@ -863506,13 +863506,13 @@ _081BEE14: ldrsh r1, [r2, r4] adds r6, r0, 0 cmp r1, 0x5F - bgt _081BEE78 + bgt @081BEE78 adds r0, r3, 0x1 strh r0, [r2, 0xE] -_081BEE78: +@081BEE78: movs r0, 0 strh r0, [r2, 0xA] -_081BEE7C: +@081BEE7C: ldr r1, [sp, 0x8] add r1, r10 lsls r1, 3 @@ -863520,7 +863520,7 @@ _081BEE7C: ldrh r0, [r1, 0xA] adds r0, 0x1 strh r0, [r1, 0xA] -_081BEE8A: +@081BEE8A: ldr r0, [sp, 0x8] add r0, r10 lsls r0, 3 @@ -863529,9 +863529,9 @@ _081BEE8A: ldrb r5, [r0, 0xC] lsls r0, r4, 16 cmp r5, r4 - bcs _081BEF32 + bcs @081BEF32 str r0, [sp, 0xC] -_081BEE9E: +@081BEE9E: movs r6, 0 adds r0, r5, 0x1 str r0, [sp, 0x4] @@ -863542,7 +863542,7 @@ _081BEE9E: adds r0, r1 lsls r0, 4 mov r9, r0 -_081BEEB2: +@081BEEB2: ldr r0, =0x0203cf04 ldr r0, [r0] ldr r7, =0x0203cf10 @@ -863569,12 +863569,12 @@ _081BEEB2: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - beq _081BEEB2 + beq @081BEEB2 ldr r0, [r7] adds r1, r4, r0 ldrb r0, [r1, 0x4] cmp r0, 0x2F - bls _081BEF24 + bls @081BEF24 ldr r0, [r1] bl free ldr r0, [r7] @@ -863592,21 +863592,21 @@ _081BEEB2: mov r0, r8 ands r5, r0 cmp r5, 0x1 - bne _081BEF24 + bne @081BEF24 ldr r0, =0x0203cf14 ldr r1, [r0] ldrh r0, [r1, 0x2] subs r0, 0x1 strh r0, [r1, 0x2] -_081BEF24: +@081BEF24: ldr r1, [sp, 0x4] lsls r0, r1, 16 lsrs r5, r0, 16 ldr r2, [sp, 0xC] lsrs r0, r2, 16 cmp r5, r0 - bcc _081BEE9E -_081BEF32: + bcc @081BEE9E +@081BEF32: ldr r0, =0x0203cf04 ldr r1, [r0] movs r2, 0x92 @@ -863621,11 +863621,11 @@ _081BEF32: adds r0, r4 ldrb r0, [r0, 0x4] cmp r0, 0x2F - bhi _081BF002 - b _081BF014 + bhi @081BF002 + b @081BF014 .align 2, 0 .pool -_081BEF64: +@081BEF64: movs r0, 0 bl bg_unset_tilemap ldr r0, =sub_81BEBB4 + 1 @@ -863633,19 +863633,19 @@ _081BEF64: lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq _081BEF7C + beq @081BEF7C bl remove_task -_081BEF7C: +@081BEF7C: ldr r0, =0x0203cf14 ldr r1, [r0] movs r0, 0 strh r0, [r1] strh r0, [r1, 0x2] bl sub_81BEB90 - b _081BF002 + b @081BF002 .align 2, 0 .pool -_081BEF94: +@081BEF94: ldr r4, =0x0203cf14 ldr r0, [r4] bl free @@ -863663,10 +863663,10 @@ _081BEF94: ldr r0, [r4] bl free str r5, [r4] - b _081BF002 + b @081BF002 .align 2, 0 .pool -_081BEFD0: +@081BEFD0: movs r0, 0xC movs r1, 0x2 bl lcd_io_set_bits @@ -863678,16 +863678,16 @@ _081BEFD0: movs r2, 0 bl gpu_bg_config_set_field bl sub_81971D0 - b _081BF002 -_081BEFF0: + b @081BF002 +@081BEFF0: movs r0, 0 bl gpu_sync_bg_show - b _081BF002 -_081BEFF8: + b @081BF002 +@081BEFF8: mov r0, r10 bl remove_task bl script_env_2_enable_and_set_ctx_running -_081BF002: +@081BF002: ldr r0, =0x03005e00 mov r2, r10 lsls r1, r2, 2 @@ -863697,7 +863697,7 @@ _081BF002: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_081BF014: +@081BF014: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -863711,7 +863711,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} @@ -863728,27 +863728,27 @@ sub_81BF028: @ 81BF028 lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - bls _081BF04C - b _081BF228 -_081BF04C: + bls @081BF04C + b @081BF228 +@081BF04C: lsls r0, 2 - ldr r1, =_081BF060 + ldr r1, =@081BF060 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081BF060: - .4byte _081BF080 - .4byte _081BF0B4 - .4byte _081BF0DC - .4byte _081BF0F0 - .4byte _081BF148 - .4byte _081BF170 - .4byte _081BF1CC - .4byte _081BF224 -_081BF080: +@081BF060: + .4byte @081BF080 + .4byte @081BF0B4 + .4byte @081BF0DC + .4byte @081BF0F0 + .4byte @081BF148 + .4byte @081BF170 + .4byte @081BF1CC + .4byte @081BF224 +@081BF080: ldr r4, =0x0203cf0c movs r0, 0x14 bl malloc_and_clear @@ -863768,16 +863768,16 @@ _081BF080: str r0, [r1, 0xC] movs r0, 0 strh r0, [r1, 0x10] - b _081BF228 + b @081BF228 .align 2, 0 .pool -_081BF0B4: +@081BF0B4: ldr r0, =0x0203cf0c ldr r0, [r0] ldr r1, [r0] movs r5, 0 ldr r2, =0x08617c44 -_081BF0BE: +@081BF0BE: adds r0, r5, r2 ldrb r0, [r0] strb r0, [r1] @@ -863786,11 +863786,11 @@ _081BF0BE: lsrs r5, r0, 16 adds r1, 0x1 cmp r5, 0x7F - bls _081BF0BE - b _081BF228 + bls @081BF0BE + b @081BF228 .align 2, 0 .pool -_081BF0DC: +@081BF0DC: ldr r0, =0x0203cf0c ldr r0, [r0] ldr r1, [r0, 0x4] @@ -863798,10 +863798,10 @@ _081BF0DC: str r0, [r1] movs r0, 0x80 strh r0, [r1, 0x4] - b _081BF228 + b @081BF228 .align 2, 0 .pool -_081BF0F0: +@081BF0F0: mov r1, sp ldr r0, =0x08617e00 ldm r0!, {r2-r4} @@ -863845,10 +863845,10 @@ _081BF0F0: adds r0, r2 movs r1, 0x1 strh r1, [r0, 0x30] -_081BF148: +@081BF148: movs r5, 0 ldr r2, =0x0203cf0c -_081BF14C: +@081BF14C: ldr r0, [r2] ldr r1, [r0, 0xC] lsls r0, r5, 1 @@ -863858,16 +863858,16 @@ _081BF14C: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0xFF - bls _081BF14C - b _081BF228 + bls @081BF14C + b @081BF228 .align 2, 0 .pool -_081BF170: +@081BF170: movs r5, 0 movs r6, 0xFF ldr r0, =0x000001ff mov r8, r0 -_081BF178: +@081BF178: bl GenerateRandomNumber adds r4, r6, 0 ands r4, r0 @@ -863889,7 +863889,7 @@ _081BF178: lsls r0, 16 lsrs r5, r0, 16 cmp r5, r8 - bls _081BF178 + bls @081BF178 ldr r2, =0x02020630 ldrb r1, [r3, 0x8] lsls r0, r1, 4 @@ -863899,10 +863899,10 @@ _081BF178: adds r0, r2 ldr r1, =sub_81BF248 + 1 str r1, [r0] - b _081BF228 + b @081BF228 .align 2, 0 .pool -_081BF1CC: +@081BF1CC: ldr r3, =0x02020630 ldr r5, =0x0203cf0c ldr r0, [r5] @@ -863916,7 +863916,7 @@ _081BF1CC: ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - bne _081BF238 + bne @081BF238 adds r0, r2, r3 bl obj_delete_and_free_tiles ldr r0, [r5] @@ -863935,12 +863935,12 @@ _081BF1CC: str r4, [r0] bl free str r4, [r5] - b _081BF228 + b @081BF228 .align 2, 0 .pool -_081BF224: +@081BF224: bl script_env_2_enable_and_set_ctx_running -_081BF228: +@081BF228: ldr r0, =0x03005e00 lsls r1, r7, 2 adds r1, r7 @@ -863949,7 +863949,7 @@ _081BF228: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_081BF238: +@081BF238: add sp, 0x18 pop {r3} mov r8, r3 @@ -863961,7 +863961,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 @@ -863969,20 +863969,20 @@ sub_81BF248: @ 81BF248 ldr r0, [r0] ldrh r0, [r0, 0x10] cmp r0, 0xFF - bls _081BF268 + bls @081BF268 ldr r0, =nullsub_12 + 1 str r0, [r5, 0x1C] - b _081BF2B0 + b @081BF2B0 .align 2, 0 .pool -_081BF268: +@081BF268: ldrh r1, [r5, 0x22] movs r2, 0x22 ldrsh r0, [r5, r2] cmp r0, 0x5F - ble _081BF2AC + ble @081BF2AC movs r4, 0 -_081BF274: +@081BF274: ldr r0, =0x0203cf0c ldr r3, [r0] ldr r0, [r3] @@ -864002,17 +864002,17 @@ _081BF274: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bls _081BF274 + bls @081BF274 adds r0, r5, 0 movs r1, 0 bl obj_anim_image_start - b _081BF2B0 + b @081BF2B0 .align 2, 0 .pool -_081BF2AC: +@081BF2AC: adds r0, r1, 0x1 strh r0, [r5, 0x22] -_081BF2B0: +@081BF2B0: add sp, 0x4 pop {r4,r5} pop {r0} @@ -864020,7 +864020,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 @@ -864124,7 +864124,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 disable_irqs @@ -864158,7 +864158,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 @@ -864166,83 +864166,83 @@ sub_81BF3DC: @ 81BF3DC ldrb r0, [r0] adds r5, r1, 0 cmp r0, 0x7 - bls _081BF3EE - b _081BF592 -_081BF3EE: + bls @081BF3EE + b @081BF592 +@081BF3EE: lsls r0, 2 - ldr r1, =_081BF400 + ldr r1, =@081BF400 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081BF400: - .4byte _081BF420 - .4byte _081BF430 - .4byte _081BF45C - .4byte _081BF488 - .4byte _081BF4BC - .4byte _081BF514 - .4byte _081BF552 - .4byte _081BF574 -_081BF420: +@081BF400: + .4byte @081BF420 + .4byte @081BF430 + .4byte @081BF45C + .4byte @081BF488 + .4byte @081BF4BC + .4byte @081BF514 + .4byte @081BF552 + .4byte @081BF574 +@081BF420: bl sub_81BF5A4 ldr r0, =0x030012b8 ldr r1, [r0] movs r0, 0x1 - b _081BF590 + b @081BF590 .align 2, 0 .pool -_081BF430: +@081BF430: movs r0, 0x5 bl sub_81BF7A4 cmp r0, 0x5 - beq _081BF43C - b _081BF592 -_081BF43C: + beq @081BF43C + b @081BF592 +@081BF43C: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _081BF44A - b _081BF592 -_081BF44A: + bne @081BF44A + b @081BF592 +@081BF44A: ldr r0, =0x030012b8 ldr r1, [r0] movs r0, 0x2 - b _081BF590 + b @081BF590 .align 2, 0 .pool -_081BF45C: +@081BF45C: movs r0, 0 bl sub_81BF7A4 cmp r0, 0 - beq _081BF468 - b _081BF592 -_081BF468: + beq @081BF468 + b @081BF592 +@081BF468: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _081BF476 - b _081BF592 -_081BF476: + bne @081BF476 + b @081BF592 +@081BF476: ldr r0, =0x030012b8 ldr r1, [r0] movs r0, 0x3 - b _081BF590 + b @081BF590 .align 2, 0 .pool -_081BF488: +@081BF488: movs r0, 0x1 bl sub_81BF7A4 cmp r0, 0x1 - beq _081BF494 - b _081BF592 -_081BF494: + beq @081BF494 + b @081BF592 +@081BF494: ldr r4, =0x030012b8 ldr r0, [r4] ldr r1, =0x089a6550 @@ -864256,10 +864256,10 @@ _081BF494: ldr r1, [r4] strh r5, [r1, 0x2] movs r0, 0x4 - b _081BF590 + b @081BF590 .align 2, 0 .pool -_081BF4BC: +@081BF4BC: adds r4, r5, 0 ldr r0, [r4] adds r0, 0x4 @@ -864267,26 +864267,26 @@ _081BF4BC: ldr r4, [r4] ldrb r0, [r4, 0x1C] cmp r0, 0 - bne _081BF4D8 + bne @081BF4D8 ldr r0, [r4, 0x20] ldr r1, =0x00020200 ands r0, r1 cmp r0, r1 - beq _081BF4E4 -_081BF4D8: + beq @081BF4E4 +@081BF4D8: movs r0, 0 strh r0, [r4, 0x2] - b _081BF592 + b @081BF592 .align 2, 0 .pool -_081BF4E4: +@081BF4E4: ldrh r0, [r4, 0x2] adds r0, 0x1 strh r0, [r4, 0x2] lsls r0, 16 lsrs r0, 16 cmp r0, 0xB4 - bls _081BF592 + bls @081BF592 adds r0, r4, 0x4 ldr r1, =0x089a6610 ldr r2, =0x089aa144 @@ -864297,15 +864297,15 @@ _081BF4E4: bl sub_81BAB6C ldr r1, [r5] movs r0, 0x5 - b _081BF590 + b @081BF590 .align 2, 0 .pool -_081BF514: +@081BF514: movs r0, 0x2 bl sub_81BF7A4 adds r4, r0, 0 cmp r4, 0x2 - bne _081BF592 + bne @081BF592 ldr r5, =0x030012b8 ldr r0, [r5] adds r0, 0x4 @@ -864314,54 +864314,54 @@ _081BF514: adds r0, 0x4 bl sub_81BAC30 cmp r0, 0 - beq _081BF540 + beq @081BF540 ldr r1, [r5] movs r0, 0x6 - b _081BF590 + b @081BF590 .align 2, 0 .pool -_081BF540: +@081BF540: ldr r1, [r5] adds r0, r1, 0 adds r0, 0x22 ldrb r0, [r0] ands r4, r0 cmp r4, 0 - bne _081BF592 + bne @081BF592 movs r0, 0x7 - b _081BF590 -_081BF552: + b @081BF590 +@081BF552: movs r0, 0x3 bl sub_81BF7A4 cmp r0, 0x3 - bne _081BF592 + bne @081BF592 ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081BF592 + beq @081BF592 bl do_reset - b _081BF592 + b @081BF592 .align 2, 0 .pool -_081BF574: +@081BF574: movs r0, 0x4 bl sub_81BF7A4 cmp r0, 0x4 - bne _081BF592 + bne @081BF592 ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081BF592 + beq @081BF592 ldr r0, =0x030012b8 ldr r1, [r0] movs r0, 0x1 -_081BF590: +@081BF590: strb r0, [r1] -_081BF592: +@081BF592: add sp, 0x4 pop {r4,r5} pop {r0} @@ -864371,7 +864371,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} @@ -864577,36 +864577,36 @@ 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 ldr r0, [r5] ldrb r0, [r0, 0x1] cmp r0, r4 - bne _081BF7BC + bne @081BF7BC adds r0, r4, 0 - b _081BF7DC + b @081BF7DC .align 2, 0 .pool -_081BF7BC: +@081BF7BC: cmp r0, 0x6 - bne _081BF7CC + bne @081BF7CC adds r0, r4, 0 bl sub_81BF7E8 ldr r0, [r5] strb r4, [r0, 0x1] - b _081BF7D6 -_081BF7CC: + b @081BF7D6 +@081BF7CC: bl sub_81BF8D8 ldr r1, [r5] movs r0, 0x6 strb r0, [r1, 0x1] -_081BF7D6: +@081BF7D6: ldr r0, =0x030012b8 ldr r0, [r0] ldrb r0, [r0, 0x1] -_081BF7DC: +@081BF7DC: pop {r4,r5} pop {r1} bx r1 @@ -864615,7 +864615,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 @@ -864651,33 +864651,33 @@ sub_81BF7E8: @ 81BF7E8 movs r1, 0x2 bl Window_CopyToVram cmp r6, 0x5 - bhi _081BF87E - ldr r0, =_081BF850 + bhi @081BF87E + ldr r0, =@081BF850 adds r0, r4, r0 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081BF850: - .4byte _081BF868 - .4byte _081BF870 - .4byte _081BF868 - .4byte _081BF868 - .4byte _081BF868 - .4byte _081BF878 -_081BF868: +@081BF850: + .4byte @081BF868 + .4byte @081BF870 + .4byte @081BF868 + .4byte @081BF868 + .4byte @081BF868 + .4byte @081BF878 +@081BF868: movs r0, 0x2 bl Window_WriteStandardTileMap - b _081BF87E -_081BF870: + b @081BF87E +@081BF870: movs r0, 0x3 bl Window_WriteStandardTileMap - b _081BF87E -_081BF878: + b @081BF87E +@081BF878: movs r0, 0 bl Window_WriteStandardTileMap -_081BF87E: +@081BF87E: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram ldr r5, =0x08618178 @@ -864713,7 +864713,7 @@ _081BF87E: thumb_func_end sub_81BF7E8 thumb_func_start sub_81BF8D8 -sub_81BF8D8: @ 81BF8D8 +sub_81BF8D8: ; 81BF8D8 push {lr} movs r0, 0 bl gpu_sync_bg_hide @@ -864724,7 +864724,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} @@ -864758,39 +864758,39 @@ sub_81BF8EC: @ 81BF8EC ldr r0, [sp, 0x18] str r0, [r1, 0x4] cmp r7, 0x2 - bne _081BF94C + bne @081BF94C subs r2, 0x2 adds r1, r2 movs r0, 0x1 - b _081BF952 + b @081BF952 .align 2, 0 .pool -_081BF94C: +@081BF94C: ldr r0, =0x000040bd adds r1, r0 movs r0, 0 -_081BF952: +@081BF952: strb r0, [r1] cmp r7, 0x1 - beq _081BF9A0 + beq @081BF9A0 cmp r7, 0x1 - bgt _081BF96C + bgt @081BF96C cmp r7, 0 - beq _081BF97C + beq @081BF97C ldr r2, =0x0203cf1c - b _081BF9EE + b @081BF9EE .align 2, 0 .pool -_081BF96C: +@081BF96C: cmp r7, 0x2 - beq _081BF97C + beq @081BF97C cmp r7, 0x3 - beq _081BF9D0 + beq @081BF9D0 ldr r2, =0x0203cf1c - b _081BF9EE + b @081BF9EE .align 2, 0 .pool -_081BF97C: +@081BF97C: ldr r2, =0x0203cf1c ldr r0, [r2] ldr r1, =0x000040c1 @@ -864801,10 +864801,10 @@ _081BF97C: ldr r1, =0x000040c2 adds r0, r1 movs r1, 0x3 - b _081BF9EC + b @081BF9EC .align 2, 0 .pool -_081BF9A0: +@081BF9A0: ldr r2, =0x0203cf1c ldr r0, [r2] ldr r1, =0x000040c1 @@ -864820,10 +864820,10 @@ _081BF9A0: ldr r1, =0x000040c8 adds r0, r1 strb r7, [r0] - b _081BF9EE + b @081BF9EE .align 2, 0 .pool -_081BF9D0: +@081BF9D0: ldr r2, =0x0203cf1c ldr r0, [r2] ldr r1, =0x000040c1 @@ -864838,9 +864838,9 @@ _081BF9D0: adds r1, 0x1 adds r0, r1 movs r1, 0x1 -_081BF9EC: +@081BF9EC: strb r1, [r0] -_081BF9EE: +@081BF9EE: ldr r0, [r2] ldr r2, =0x000040c1 adds r1, r0, r2 @@ -864853,11 +864853,11 @@ _081BF9EE: ldr r0, =0x020244d4 ldr r0, [r0] cmp r0, 0 - bne _081BFA12 + bne @081BFA12 movs r0, 0 movs r1, 0 bl sub_806F2AC -_081BFA12: +@081BFA12: ldr r0, =sub_81BFAE4 + 1 bl set_callback2 pop {r3} @@ -864870,7 +864870,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} @@ -864907,7 +864907,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] @@ -864934,7 +864934,7 @@ sub_81BFA80: @ 81BFA80 thumb_func_end sub_81BFA80 thumb_func_start sub_81BFAB4 -sub_81BFAB4: @ 81BFAB4 +sub_81BFAB4: ; 81BFAB4 push {lr} bl run_active_tasks bl call_obj_callbacks @@ -864946,7 +864946,7 @@ sub_81BFAB4: @ 81BFAB4 thumb_func_end sub_81BFAB4 thumb_func_start sub_81BFAD0 -sub_81BFAD0: @ 81BFAD0 +sub_81BFAD0: ; 81BFAD0 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -864956,31 +864956,31 @@ sub_81BFAD0: @ 81BFAD0 thumb_func_end sub_81BFAD0 thumb_func_start sub_81BFAE4 -sub_81BFAE4: @ 81BFAE4 +sub_81BFAE4: ; 81BFAE4 push {lr} -_081BFAE6: +@081BFAE6: bl sub_81221EC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081BFB0A + beq @081BFB0A bl sub_81BFB10 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081BFB0A + beq @081BFB0A bl sub_81221AC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081BFAE6 -_081BFB0A: + bne @081BFAE6 +@081BFB0A: pop {r0} bx r0 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 @@ -864989,79 +864989,79 @@ sub_81BFB10: @ 81BFB10 adds r0, r1 ldrb r0, [r0] cmp r0, 0x18 - bls _081BFB24 - b _081BFE00 -_081BFB24: + bls @081BFB24 + b @081BFE00 +@081BFB24: lsls r0, 2 - ldr r1, =_081BFB38 + ldr r1, =@081BFB38 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081BFB38: - .4byte _081BFB9C - .4byte _081BFBAA - .4byte _081BFBBC - .4byte _081BFBD0 - .4byte _081BFBE4 - .4byte _081BFBEA - .4byte _081BFC04 - .4byte _081BFC20 - .4byte _081BFC26 - .4byte _081BFC38 - .4byte _081BFC58 - .4byte _081BFC7C - .4byte _081BFC82 - .4byte _081BFC94 - .4byte _081BFCAC - .4byte _081BFCC0 - .4byte _081BFCD8 - .4byte _081BFCF8 - .4byte _081BFD34 - .4byte _081BFD50 - .4byte _081BFD60 - .4byte _081BFD74 - .4byte _081BFD7A - .4byte _081BFDB0 - .4byte _081BFDCC -_081BFB9C: +@081BFB38: + .4byte @081BFB9C + .4byte @081BFBAA + .4byte @081BFBBC + .4byte @081BFBD0 + .4byte @081BFBE4 + .4byte @081BFBEA + .4byte @081BFC04 + .4byte @081BFC20 + .4byte @081BFC26 + .4byte @081BFC38 + .4byte @081BFC58 + .4byte @081BFC7C + .4byte @081BFC82 + .4byte @081BFC94 + .4byte @081BFCAC + .4byte @081BFCC0 + .4byte @081BFCD8 + .4byte @081BFCF8 + .4byte @081BFD34 + .4byte @081BFD50 + .4byte @081BFD60 + .4byte @081BFD74 + .4byte @081BFD7A + .4byte @081BFDB0 + .4byte @081BFDCC +@081BFB9C: bl vblank_hblank_handler_set_zero bl sub_8121DA0 bl clear_scheduled_bg_copies_to_vram - b _081BFDE6 -_081BFBAA: + b @081BFDE6 +@081BFBAA: bl remove_some_task ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _081BFDEE + b @081BFDEE .align 2, 0 .pool -_081BFBBC: +@081BFBBC: bl sub_80A1A74 ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 - b _081BFDE4 + b @081BFDE4 .align 2, 0 .pool -_081BFBD0: +@081BFBD0: bl reset_all_obj_data ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _081BFDEE + b @081BFDEE .align 2, 0 .pool -_081BFBE4: +@081BFBE4: bl gpu_pal_allocator_reset - b _081BFDE6 -_081BFBEA: + b @081BFDE6 +@081BFBEA: bl sub_81BFE24 ldr r0, =0x0203cf1c ldr r0, [r0] @@ -865069,36 +865069,36 @@ _081BFBEA: adds r0, r1 movs r1, 0 strh r1, [r0] - b _081BFDE6 + b @081BFDE6 .align 2, 0 .pool -_081BFC04: +@081BFC04: bl sub_81BFEB0 lsls r0, 24 cmp r0, 0 - bne _081BFC10 - b _081BFE18 -_081BFC10: + bne @081BFC10 + b @081BFE18 +@081BFC10: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _081BFDEE + b @081BFDEE .align 2, 0 .pool -_081BFC20: +@081BFC20: bl sub_81C2554 - b _081BFDE6 -_081BFC26: + b @081BFDE6 +@081BFC26: bl sub_81C1BA0 ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _081BFDEE + b @081BFDEE .align 2, 0 .pool -_081BFC38: +@081BFC38: ldr r4, =0x0203cf1c ldr r0, [r4] adds r0, 0xC @@ -865108,68 +865108,68 @@ _081BFC38: adds r0, r1 movs r1, 0 strh r1, [r0] - b _081BFDE6 + b @081BFDE6 .align 2, 0 .pool -_081BFC58: +@081BFC58: ldr r0, =0x0203cf1c ldr r0, [r0] adds r0, 0xC bl sub_81C00F0 lsls r0, 24 cmp r0, 0 - bne _081BFC6A - b _081BFE18 -_081BFC6A: + bne @081BFC6A + b @081BFE18 +@081BFC6A: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _081BFDEE + b @081BFDEE .align 2, 0 .pool -_081BFC7C: +@081BFC7C: bl sub_81C25E8 - b _081BFDE6 -_081BFC82: + b @081BFDE6 +@081BFC82: bl sub_81C286C ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _081BFDEE + b @081BFDEE .align 2, 0 .pool -_081BFC94: +@081BFC94: ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040c0 adds r0, r1 ldrb r0, [r0] bl sub_81C2D9C - b _081BFDE6 + b @081BFDE6 .align 2, 0 .pool -_081BFCAC: +@081BFCAC: bl sub_81C0348 ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _081BFDEE + b @081BFDEE .align 2, 0 .pool -_081BFCC0: +@081BFCC0: ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040c0 adds r0, r1 ldrb r0, [r0] bl sub_81C2AFC - b _081BFDE6 + b @081BFDE6 .align 2, 0 .pool -_081BFCD8: +@081BFCD8: bl sub_81C4190 bl sub_81C42C8 ldr r0, =0x0203cf1c @@ -865178,10 +865178,10 @@ _081BFCD8: adds r0, r1 movs r1, 0 strh r1, [r0] - b _081BFDE6 + b @081BFDE6 .align 2, 0 .pool -_081BFCF8: +@081BFCF8: ldr r4, =0x0203cf1c ldr r1, [r4] adds r0, r1, 0 @@ -865197,17 +865197,17 @@ _081BFCF8: adds r2, r1, r2 ldrb r0, [r2] cmp r0, 0xFF - bne _081BFD1C - b _081BFE18 -_081BFD1C: + bne @081BFD1C + b @081BFE18 +@081BFD1C: ldr r0, =0x000040f0 adds r1, r0 movs r0, 0 strh r0, [r1] - b _081BFDE6 + b @081BFDE6 .align 2, 0 .pool -_081BFD34: +@081BFD34: ldr r0, =0x0203cf1c ldr r0, [r0] adds r0, 0xC @@ -865216,51 +865216,51 @@ _081BFD34: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _081BFDEE + b @081BFDEE .align 2, 0 .pool -_081BFD50: +@081BFD50: ldr r0, =0x0203cf1c ldr r0, [r0] adds r0, 0xC bl sub_81C4A08 - b _081BFDE6 + b @081BFDE6 .align 2, 0 .pool -_081BFD60: +@081BFD60: bl sub_81C4A88 ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _081BFDEE + b @081BFDEE .align 2, 0 .pool -_081BFD74: +@081BFD74: bl sub_81C4280 - b _081BFDE6 -_081BFD7A: + b @081BFDE6 +@081BFD7A: ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040bc adds r0, r1 ldrb r0, [r0] cmp r0, 0x3 - beq _081BFDA0 + beq @081BFDA0 ldr r0, =sub_81C0510 + 1 movs r1, 0 bl AddTask - b _081BFDE6 + b @081BFDE6 .align 2, 0 .pool -_081BFDA0: +@081BFDA0: ldr r0, =sub_81C171C + 1 movs r1, 0 bl AddTask - b _081BFDE6 + b @081BFDE6 .align 2, 0 .pool -_081BFDB0: +@081BFDB0: movs r0, 0x1 negs r0, r0 movs r1, 0x10 @@ -865270,10 +865270,10 @@ _081BFDB0: movs r0, 0x87 lsls r0, 3 adds r1, r0 - b _081BFDEE + b @081BFDEE .align 2, 0 .pool -_081BFDCC: +@081BFDCC: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -865285,32 +865285,32 @@ _081BFDCC: ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 -_081BFDE4: +@081BFDE4: strb r0, [r2, 0x8] -_081BFDE6: +@081BFDE6: ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 -_081BFDEE: +@081BFDEE: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _081BFE18 + b @081BFE18 .align 2, 0 .pool -_081BFE00: +@081BFE00: ldr r0, =sub_81BFAD0 + 1 bl SetVBlankCallback ldr r0, =sub_81BFAB4 + 1 bl set_callback2 movs r0, 0x1 - b _081BFE1A + b @081BFE1A .align 2, 0 .pool -_081BFE18: +@081BFE18: movs r0, 0 -_081BFE1A: +@081BFE1A: add sp, 0x4 pop {r4} pop {r1} @@ -865318,7 +865318,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 gpu_reset_bgs_and_dma3_busy_flags @@ -865371,7 +865371,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 @@ -865382,32 +865382,32 @@ sub_81BFEB0: @ 81BFEB0 ldrsh r0, [r0, r2] adds r4, r1, 0 cmp r0, 0xC - bls _081BFEC8 - b _081C008C -_081BFEC8: + bls @081BFEC8 + b @081C008C +@081BFEC8: lsls r0, 2 - ldr r1, =_081BFEE0 + ldr r1, =@081BFEE0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081BFEE0: - .4byte _081BFF14 - .4byte _081BFF30 - .4byte _081BFF60 - .4byte _081BFF78 - .4byte _081BFF90 - .4byte _081BFFA8 - .4byte _081BFFC0 - .4byte _081BFFF0 - .4byte _081BFFFC - .4byte _081C0018 - .4byte _081C0024 - .4byte _081C0040 - .4byte _081C0064 -_081BFF14: +@081BFEE0: + .4byte @081BFF14 + .4byte @081BFF30 + .4byte @081BFF60 + .4byte @081BFF78 + .4byte @081BFF90 + .4byte @081BFFA8 + .4byte @081BFFC0 + .4byte @081BFFF0 + .4byte @081BFFFC + .4byte @081C0018 + .4byte @081C0024 + .4byte @081C0040 + .4byte @081C0064 +@081BFF14: bl reset_temp_tile_data_buffers ldr r1, =0x08d97d0c movs r0, 0 @@ -865416,17 +865416,17 @@ _081BFF14: movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - b _081C0046 + b @081C0046 .align 2, 0 .pool -_081BFF30: +@081BFF30: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081BFF3E - b _081C008C -_081BFF3E: + bne @081BFF3E + b @081C008C +@081BFF3E: ldr r0, =0x08d9862c ldr r4, =0x0203cf1c ldr r1, [r4] @@ -865435,50 +865435,50 @@ _081BFF3E: ldr r1, [r4] ldr r2, =0x000040f0 adds r1, r2 - b _081C004E + b @081C004E .align 2, 0 .pool -_081BFF60: +@081BFF60: ldr r0, =0x08d98cc8 ldr r1, [r4] ldr r2, =0x000008bc adds r1, r2 bl call_LZZUnCompWram ldr r1, [r4] - b _081C004A + b @081C004A .align 2, 0 .pool -_081BFF78: +@081BFF78: ldr r0, =0x08d987fc ldr r1, [r4] ldr r2, =0x000018bc adds r1, r2 bl call_LZZUnCompWram ldr r1, [r4] - b _081C004A + b @081C004A .align 2, 0 .pool -_081BFF90: +@081BFF90: ldr r0, =0x08d9898c ldr r1, [r4] ldr r2, =0x000028bc adds r1, r2 bl call_LZZUnCompWram ldr r1, [r4] - b _081C004A + b @081C004A .align 2, 0 .pool -_081BFFA8: +@081BFFA8: ldr r0, =0x08d98b28 ldr r1, [r4] ldr r2, =0x000038bc adds r1, r2 bl call_LZZUnCompWram ldr r1, [r4] - b _081C004A + b @081C004A .align 2, 0 .pool -_081BFFC0: +@081BFFC0: ldr r0, =0x08d9853c movs r2, 0x80 lsls r2, 1 @@ -865492,58 +865492,58 @@ _081BFFC0: ldr r1, [r0] ldr r2, =0x000040f0 adds r1, r2 - b _081C004E + b @081C004E .align 2, 0 .pool -_081BFFF0: +@081BFFF0: ldr r0, =0x0861cfbc bl gpu_tile_obj_decompress_and_load - b _081C0046 + b @081C0046 .align 2, 0 .pool -_081BFFFC: +@081BFFFC: ldr r0, =0x0861d074 bl gpu_tile_obj_decompress_and_load ldr r0, =0x0203cf1c ldr r1, [r0] ldr r2, =0x000040f0 adds r1, r2 - b _081C004E + b @081C004E .align 2, 0 .pool -_081C0018: +@081C0018: ldr r0, =0x0861d0f8 bl gpu_tile_obj_decompress_and_load - b _081C0046 + b @081C0046 .align 2, 0 .pool -_081C0024: +@081C0024: ldr r0, =0x0861d100 bl gpu_pal_obj_decompress_and_apply ldr r0, =0x0203cf1c ldr r1, [r0] ldr r2, =0x000040f0 adds r1, r2 - b _081C004E + b @081C004E .align 2, 0 .pool -_081C0040: +@081C0040: ldr r0, =0x0861d07c bl gpu_pal_obj_decompress_and_apply -_081C0046: +@081C0046: ldr r0, =0x0203cf1c ldr r1, [r0] -_081C004A: +@081C004A: ldr r0, =0x000040f0 adds r1, r0 -_081C004E: +@081C004E: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _081C008C + b @081C008C .align 2, 0 .pool -_081C0064: +@081C0064: ldr r0, =0x08d97b84 movs r1, 0xE8 lsls r1, 1 @@ -865556,12 +865556,12 @@ _081C0064: movs r1, 0 strh r1, [r0] movs r0, 0x1 - b _081C008E + b @081C008E .align 2, 0 .pool -_081C008C: +@081C008C: movs r0, 0 -_081C008E: +@081C008E: add sp, 0x4 pop {r4} pop {r1} @@ -865569,7 +865569,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 @@ -865578,7 +865578,7 @@ sub_81C0098: @ 81C0098 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - bne _081C00D0 + bne @081C00D0 ldr r2, [r1] ldr r4, =0x000040be adds r0, r1, r4 @@ -865589,10 +865589,10 @@ sub_81C0098: @ 81C0098 adds r0, r3, 0 movs r2, 0x64 bl memcpy - b _081C00E6 + b @081C00E6 .align 2, 0 .pool -_081C00D0: +@081C00D0: ldr r0, [r1] ldr r2, =0x000040be adds r1, r2 @@ -865603,7 +865603,7 @@ _081C00D0: adds r0, r1 adds r1, r3, 0 bl sub_8069004 -_081C00E6: +@081C00E6: pop {r4} pop {r0} bx r0 @@ -865612,7 +865612,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 @@ -865627,23 +865627,23 @@ sub_81C00F0: @ 81C00F0 movs r2, 0 ldrsh r0, [r0, r2] cmp r0, 0x1 - beq _081C0198 + beq @081C0198 cmp r0, 0x1 - bgt _081C0120 + bgt @081C0120 cmp r0, 0 - beq _081C012C - b _081C0314 + beq @081C012C + b @081C0314 .align 2, 0 .pool -_081C0120: +@081C0120: cmp r0, 0x2 - beq _081C01DC + beq @081C01DC cmp r0, 0x3 - bne _081C012A - b _081C02A8 -_081C012A: - b _081C0314 -_081C012C: + bne @081C012A + b @081C02A8 +@081C012A: + b @081C0314 +@081C012C: adds r0, r5, 0 movs r1, 0xB bl pokemon_getattr @@ -865680,17 +865680,17 @@ _081C012C: strb r0, [r1] lsls r0, 24 cmp r0, 0 - beq _081C018C + beq @081C018C movs r0, 0x1 strb r0, [r6, 0x4] - b _081C0322 -_081C018C: + b @081C0322 +@081C018C: adds r0, r5, 0 movs r1, 0x2D bl pokemon_getattr strb r0, [r6, 0x4] - b _081C0322 -_081C0198: + b @081C0322 +@081C0198: movs r4, 0 movs r0, 0x8C adds r0, r7 @@ -865700,7 +865700,7 @@ _081C0198: mov r9, r1 adds r6, r7, 0 adds r6, 0x84 -_081C01AA: +@081C01AA: adds r1, r4, 0 adds r1, 0xD adds r0, r5, 0 @@ -865716,29 +865716,29 @@ _081C01AA: adds r6, 0x2 adds r4, 0x1 cmp r4, 0x3 - bls _081C01AA + bls @081C01AA adds r0, r5, 0 movs r1, 0x15 bl pokemon_getattr mov r1, r9 strb r0, [r1] - b _081C0322 -_081C01DC: + b @081C0322 +@081C01DC: ldr r1, [r7] ldr r0, =0x020244ec cmp r1, r0 - beq _081C01F8 + beq @081C01F8 ldr r2, =0x000040bc adds r0, r7, r2 ldrb r0, [r0] cmp r0, 0x2 - beq _081C01F8 + beq @081C01F8 ldr r1, =0x000040ef adds r0, r7, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _081C0254 -_081C01F8: + bne @081C0254 +@081C01F8: adds r0, r5, 0 bl GetNature adds r1, r6, 0 @@ -865770,10 +865770,10 @@ _081C01F8: strh r0, [r6, 0x2A] adds r0, r5, 0 movs r1, 0x3D - b _081C02A0 + b @081C02A0 .align 2, 0 .pool -_081C0254: +@081C0254: adds r0, r5, 0 bl GetNature adds r1, r7, 0 @@ -865805,11 +865805,11 @@ _081C0254: strh r0, [r6, 0x2A] adds r0, r5, 0 movs r1, 0x56 -_081C02A0: +@081C02A0: bl pokemon_getattr strh r0, [r6, 0x2C] - b _081C0322 -_081C02A8: + b @081C0322 +@081C02A8: adds r4, r7, 0 adds r4, 0xA6 adds r0, r5, 0 @@ -865853,15 +865853,15 @@ _081C02A8: movs r1, 0x20 bl pokemon_getattr strh r0, [r6, 0x30] - b _081C0322 -_081C0314: + b @081C0322 +@081C0314: adds r0, r5, 0 movs r1, 0x52 bl pokemon_getattr strb r0, [r6, 0x6] movs r0, 0x1 - b _081C0332 -_081C0322: + b @081C0332 +@081C0322: ldr r0, =0x0203cf1c ldr r1, [r0] ldr r2, =0x000040f0 @@ -865870,7 +865870,7 @@ _081C0322: adds r0, 0x1 strh r0, [r1] movs r0, 0 -_081C0332: +@081C0332: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -865882,7 +865882,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] @@ -865893,7 +865893,7 @@ sub_81C0348: @ 81C0348 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bls _081C037C + bls @081C037C movs r0, 0 movs r1, 0xFF bl sub_81C1DA4 @@ -865901,10 +865901,10 @@ sub_81C0348: @ 81C0348 movs r1, 0xFF movs r2, 0 bl sub_81C1EFC - b _081C03D8 + b @081C03D8 .align 2, 0 .pool -_081C037C: +@081C037C: ldr r1, =0x000040c6 adds r0, r2, r1 ldrb r1, [r0] @@ -865943,21 +865943,21 @@ _081C037C: bl Window_FillTileMap movs r0, 0xD bl Window_FillTileMap -_081C03D8: +@081C03D8: ldr r0, =0x0203cf1c ldr r1, [r0] adds r0, r1, 0 adds r0, 0x77 ldrb r0, [r0] cmp r0, 0 - bne _081C0400 + bne @081C0400 movs r0, 0 movs r1, 0xFF bl sub_81C2074 - b _081C0416 + b @081C0416 .align 2, 0 .pool -_081C0400: +@081C0400: ldr r2, =0x000040c0 adds r0, r1, r2 ldrb r0, [r0] @@ -865965,10 +865965,10 @@ _081C0400: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bls _081C0416 + bls @081C0416 movs r0, 0xD bl Window_WriteStandardTileMap -_081C0416: +@081C0416: bl sub_81C2524 ldr r0, =0x0203cf1c ldr r0, [r0] @@ -865982,7 +865982,7 @@ _081C0416: thumb_func_end sub_81C0348 thumb_func_start sub_81C0434 -sub_81C0434: @ 81C0434 +sub_81C0434: ; 81C0434 push {lr} bl Window_FreeMemory ldr r0, =0x0203cf1c @@ -865995,7 +865995,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 @@ -866024,7 +866024,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 @@ -866032,13 +866032,13 @@ sub_81C0484: @ 81C0484 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081C04EC + beq @081C04EC ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081C04EC + bne @081C04EC ldr r4, =0x0203cf1c ldr r0, [r4] ldr r0, [r0, 0x4] @@ -866061,14 +866061,14 @@ sub_81C0484: @ 81C0484 ldr r0, =0x020244d4 ldr r0, [r0] cmp r0, 0 - bne _081C04E2 + bne @081C04E2 movs r0, 0 bl sub_806F47C -_081C04E2: +@081C04E2: bl sub_81C0434 adds r0, r5, 0 bl remove_task -_081C04EC: +@081C04EC: pop {r4,r5} pop {r0} bx r0 @@ -866077,7 +866077,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 @@ -866085,115 +866085,115 @@ sub_81C0510: @ 81C0510 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081C05FE + beq @081C05FE ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r2, 0x80 adds r0, r2, 0 ands r0, r1 cmp r0, 0 - bne _081C05FE + bne @081C05FE ldr r5, =0x030022c0 ldrh r1, [r5, 0x2E] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _081C0550 + beq @081C0550 movs r1, 0x1 negs r1, r1 adds r0, r4, 0 bl sub_81C0604 - b _081C05FE + b @081C05FE .align 2, 0 .pool -_081C0550: +@081C0550: adds r0, r2, 0 ands r0, r1 cmp r0, 0 - beq _081C0562 + beq @081C0562 adds r0, r4, 0 movs r1, 0x1 bl sub_81C0604 - b _081C05FE -_081C0562: + b @081C05FE +@081C0562: movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _081C0576 + bne @081C0576 bl sub_81220D0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081C0582 -_081C0576: + bne @081C0582 +@081C0576: movs r1, 0x1 negs r1, r1 adds r0, r4, 0 bl sub_81C0A8C - b _081C05FE -_081C0582: + b @081C05FE +@081C0582: ldrh r1, [r5, 0x2E] movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _081C0598 + bne @081C0598 bl sub_81220D0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _081C05A2 -_081C0598: + bne @081C05A2 +@081C0598: adds r0, r4, 0 movs r1, 0x1 bl sub_81C0A8C - b _081C05FE -_081C05A2: + b @081C05FE +@081C05A2: ldrh r1, [r5, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081C05E6 + beq @081C05E6 ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040c0 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - beq _081C05FE + beq @081C05FE cmp r0, 0 - bne _081C05D8 + bne @081C05D8 bl sub_81C48F0 movs r0, 0x5 bl audio_play adds r0, r4, 0 bl sub_81C044C - b _081C05FE + b @081C05FE .align 2, 0 .pool -_081C05D8: +@081C05D8: movs r0, 0x5 bl audio_play adds r0, r4, 0 bl sub_81C0E48 - b _081C05FE -_081C05E6: + b @081C05FE +@081C05E6: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081C05FE + beq @081C05FE bl sub_81C48F0 movs r0, 0x5 bl audio_play adds r0, r4, 0 bl sub_81C044C -_081C05FE: +@081C05FE: pop {r4,r5} pop {r0} bx r0 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 @@ -866207,17 +866207,17 @@ sub_81C0604: @ 81C0604 ldrb r0, [r0] adds r6, r1, 0 cmp r0, 0 - bne _081C06EE + bne @081C06EE ldr r1, =0x000040bd adds r0, r3, r1 ldrb r2, [r0] cmp r2, 0x1 - bne _081C0678 + bne @081C0678 adds r1, 0x3 adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0 - beq _081C0654 + beq @081C0654 lsls r1, r5, 24 asrs r1, 24 movs r4, 0x2 @@ -866226,15 +866226,15 @@ sub_81C0604: @ 81C0604 orrs r0, r1 asrs r0, 31 ands r4, r0 - b _081C065C + b @081C065C .align 2, 0 .pool -_081C0654: +@081C0654: movs r4, 0x3 cmp r5, 0x1 - bne _081C065C + bne @081C065C movs r4, 0x1 -_081C065C: +@081C065C: ldr r2, [r6] ldr r0, [r2] ldr r3, =0x000040be @@ -866245,24 +866245,24 @@ _081C065C: ldrb r2, [r2] adds r3, r4, 0 bl sub_80D214C - b _081C0696 + b @081C0696 .align 2, 0 .pool -_081C0678: +@081C0678: bl sub_81B1250 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081C068E + bne @081C068E lsls r0, r5, 24 asrs r0, 24 bl sub_81C09B4 - b _081C0696 -_081C068E: + b @081C0696 +@081C068E: lsls r0, r4, 24 asrs r0, 24 bl sub_81C08F8 -_081C0696: +@081C0696: lsls r0, 24 lsrs r4, r0, 24 lsls r0, r4, 24 @@ -866270,7 +866270,7 @@ _081C0696: movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _081C06EE + beq @081C06EE movs r0, 0x5 bl audio_play ldr r5, =0x0203cf1c @@ -866278,7 +866278,7 @@ _081C0696: adds r0, 0x77 ldrb r0, [r0] cmp r0, 0 - beq _081C06D4 + beq @081C06D4 movs r0, 0x2 movs r1, 0x1 bl sub_81C4204 @@ -866289,7 +866289,7 @@ _081C0696: movs r0, 0 movs r1, 0x2 bl sub_81C2074 -_081C06D4: +@081C06D4: ldr r0, [r5] ldr r1, =0x000040be adds r0, r1 @@ -866303,7 +866303,7 @@ _081C06D4: strh r2, [r0, 0x8] ldr r1, =sub_81C0704 + 1 str r1, [r0] -_081C06EE: +@081C06EE: pop {r4-r7} pop {r0} bx r0 @@ -866312,7 +866312,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 @@ -866324,47 +866324,47 @@ sub_81C0704: @ 81C0704 movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0xC - bls _081C071E - b _081C08BC -_081C071E: + bls @081C071E + b @081C08BC +@081C071E: lsls r0, 2 - ldr r1, =_081C0730 + ldr r1, =@081C0730 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081C0730: - .4byte _081C0764 - .4byte _081C076A - .4byte _081C0780 - .4byte _081C07A8 - .4byte _081C07C8 - .4byte _081C07E0 - .4byte _081C07F0 - .4byte _081C0800 - .4byte _081C0828 - .4byte _081C086C - .4byte _081C0872 - .4byte _081C0878 - .4byte _081C0894 -_081C0764: +@081C0730: + .4byte @081C0764 + .4byte @081C076A + .4byte @081C0780 + .4byte @081C07A8 + .4byte @081C07C8 + .4byte @081C07E0 + .4byte @081C07F0 + .4byte @081C0800 + .4byte @081C0828 + .4byte @081C086C + .4byte @081C0872 + .4byte @081C0878 + .4byte @081C0894 +@081C0764: bl sub_80A369C - b _081C08EC -_081C076A: + b @081C08EC +@081C076A: bl sub_81C4898 ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040d3 - b _081C0786 + b @081C0786 .align 2, 0 .pool -_081C0780: +@081C0780: ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040d4 -_081C0786: +@081C0786: adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -866373,10 +866373,10 @@ _081C0786: ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_resources - b _081C08EC + b @081C08EC .align 2, 0 .pool -_081C07A8: +@081C07A8: ldr r4, =0x0203cf1c ldr r0, [r4] adds r0, 0xC @@ -866386,59 +866386,59 @@ _081C07A8: adds r0, r1 movs r1, 0 strh r1, [r0] - b _081C08EC + b @081C08EC .align 2, 0 .pool -_081C07C8: +@081C07C8: ldr r0, =0x0203cf1c ldr r0, [r0] adds r0, 0xC bl sub_81C00F0 lsls r0, 24 cmp r0, 0 - bne _081C07DA - b _081C08F2 -_081C07DA: - b _081C08EC + bne @081C07DA + b @081C08F2 +@081C07DA: + b @081C08EC .align 2, 0 .pool -_081C07E0: +@081C07E0: ldr r0, =0x0203cf1c ldr r0, [r0] adds r0, 0xC bl sub_81C49E0 - b _081C08EC + b @081C08EC .align 2, 0 .pool -_081C07F0: +@081C07F0: ldr r0, =0x0203cf1c ldr r0, [r0] adds r0, 0xC bl sub_81C4A08 - b _081C08EC + b @081C08EC .align 2, 0 .pool -_081C0800: +@081C0800: ldr r4, =0x0203cf1c ldr r0, [r4] adds r0, 0x77 ldrb r0, [r0] cmp r0, 0 - beq _081C0816 + beq @081C0816 movs r1, 0x2 negs r1, r1 movs r0, 0xA bl sub_81C2074 -_081C0816: +@081C0816: ldr r0, [r4] adds r0, 0xC bl sub_81C2228 movs r0, 0 strh r0, [r5, 0x2] - b _081C08EC + b @081C08EC .align 2, 0 .pool -_081C0828: +@081C0828: ldr r4, =0x0203cf1c ldr r0, [r4] adds r0, 0xC @@ -866452,7 +866452,7 @@ _081C0828: adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xFF - beq _081C08F2 + beq @081C08F2 ldr r2, =0x02020630 adds r1, r0, 0 lsls r0, r1, 4 @@ -866464,16 +866464,16 @@ _081C0828: bl sub_81C0E24 movs r0, 0 strh r0, [r5, 0x2] - b _081C08EC + b @081C08EC .align 2, 0 .pool -_081C086C: +@081C086C: bl sub_81C4280 - b _081C08EC -_081C0872: + b @081C08EC +@081C0872: bl sub_81C25E8 - b _081C08EC -_081C0878: + b @081C08EC +@081C0878: ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040c0 @@ -866481,10 +866481,10 @@ _081C0878: ldrb r0, [r0] bl sub_81C2D9C bl sub_81C2524 - b _081C08EC + b @081C08EC .align 2, 0 .pool -_081C0894: +@081C0894: ldr r2, =0x02020630 ldr r0, =0x0203cf1c ldr r0, [r0] @@ -866497,41 +866497,41 @@ _081C0894: adds r0, r2 movs r1, 0 strh r1, [r0, 0x32] - b _081C08EC + b @081C08EC .align 2, 0 .pool -_081C08BC: +@081C08BC: bl sub_81221EC lsls r0, 24 cmp r0, 0 - bne _081C08F2 + bne @081C08F2 ldr r0, =sub_81C20F0 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _081C08F2 + bne @081C08F2 strh r0, [r5] adds r0, r6, 0 subs r0, 0x8 adds r0, r4, r0 ldr r1, =sub_81C0510 + 1 str r1, [r0] - b _081C08F2 + b @081C08F2 .align 2, 0 .pool -_081C08EC: +@081C08EC: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] -_081C08F2: +@081C08F2: pop {r4-r6} pop {r0} bx r0 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 @@ -866543,23 +866543,23 @@ sub_81C08F8: @ 81C08F8 ldrb r0, [r0] adds r5, r1, 0 cmp r0, 0 - bne _081C0960 + bne @081C0960 lsls r0, r4, 24 asrs r3, r0, 24 movs r1, 0x1 negs r1, r1 adds r6, r0, 0 cmp r3, r1 - bne _081C0928 + bne @081C0928 ldr r1, =0x000040be adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 - beq _081C0988 -_081C0928: + beq @081C0988 +@081C0928: asrs r0, r6, 24 cmp r0, 0x1 - bne _081C0940 + bne @081C0940 ldr r0, [r5] ldr r2, =0x000040be adds r1, r0, r2 @@ -866568,8 +866568,8 @@ _081C0928: ldrb r1, [r1] ldrb r0, [r0] cmp r1, r0 - bcs _081C0988 -_081C0940: + bcs @081C0988 +@081C0940: ldr r0, [r5] ldr r1, =0x000040be adds r0, r1 @@ -866577,15 +866577,15 @@ _081C0940: adds r0, r4 lsls r0, 24 asrs r0, 24 - b _081C09AE + b @081C09AE .align 2, 0 .pool -_081C0960: +@081C0960: ldr r3, =0x000040be adds r0, r2, r3 ldrb r5, [r0] lsls r6, r4, 24 -_081C0968: +@081C0968: lsls r0, r5, 24 asrs r0, 24 asrs r1, r6, 24 @@ -866594,37 +866594,37 @@ _081C0968: lsrs r5, r0, 24 asrs r4, r0, 24 cmp r4, 0 - blt _081C0988 + blt @081C0988 ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040bf adds r0, r1 ldrb r0, [r0] cmp r4, r0 - ble _081C099C -_081C0988: + ble @081C099C +@081C0988: movs r0, 0x1 negs r0, r0 - b _081C09AE + b @081C09AE .align 2, 0 .pool -_081C099C: +@081C099C: movs r0, 0x64 muls r0, r4 adds r0, r7, r0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _081C0968 + bne @081C0968 adds r0, r4, 0 -_081C09AE: +@081C09AE: pop {r4-r7} pop {r1} bx r1 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} @@ -866644,15 +866644,15 @@ sub_81C09B4: @ 81C09B4 adds r0, r4 ldrb r0, [r0] cmp r1, r0 - beq _081C09FC + beq @081C09FC adds r7, r3, 0 adds r3, r4, 0 -_081C09E0: +@081C09E0: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x5 - bhi _081C09FC + bhi @081C09FC adds r0, r2, r7 movs r1, 0 ldrsb r1, [r0, r1] @@ -866660,13 +866660,13 @@ _081C09E0: adds r0, r3 ldrb r0, [r0] cmp r1, r0 - bne _081C09E0 + bne @081C09E0 adds r5, r2, 0 -_081C09FC: +@081C09FC: mov r0, r12 lsls r6, r0, 24 ldr r7, =0x0861cc1c -_081C0A02: +@081C0A02: lsls r0, r5, 24 asrs r0, 24 asrs r1, r6, 24 @@ -866676,7 +866676,7 @@ _081C0A02: lsls r1, r5, 24 lsrs r0, r1, 24 cmp r0, 0x5 - bhi _081C0A40 + bhi @081C0A40 asrs r0, r1, 24 adds r0, r7 movs r4, 0 @@ -866688,15 +866688,15 @@ _081C0A02: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081C0A02 + bne @081C0A02 adds r0, r4, 0 - b _081C0A44 + b @081C0A44 .align 2, 0 .pool -_081C0A40: +@081C0A40: movs r0, 0x1 negs r0, r0 -_081C0A44: +@081C0A44: pop {r3} mov r8, r3 pop {r4-r7} @@ -866705,40 +866705,40 @@ _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 bl pokemon_getattr cmp r0, 0 - beq _081C0A84 + beq @081C0A84 ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040be adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _081C0A78 + bne @081C0A78 adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne _081C0A84 -_081C0A78: + bne @081C0A84 +@081C0A78: movs r0, 0x1 - b _081C0A86 + b @081C0A86 .align 2, 0 .pool -_081C0A84: +@081C0A84: movs r0, 0 -_081C0A86: +@081C0A86: pop {r4} pop {r1} bx r1 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 @@ -866766,13 +866766,13 @@ sub_81C0A8C: @ 81C0A8C ldrb r1, [r1, 0x4] mov r10, r1 cmp r1, 0 - bne _081C0B6E + bne @081C0B6E lsls r0, r3, 24 asrs r5, r0, 24 movs r0, 0x1 negs r0, r0 cmp r5, r0 - bne _081C0AE0 + bne @081C0AE0 ldr r1, =0x000040c0 adds r0, r2, r1 ldr r3, =0x000040c1 @@ -866780,10 +866780,10 @@ sub_81C0A8C: @ 81C0A8C ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - beq _081C0B6E -_081C0AE0: + beq @081C0B6E +@081C0AE0: cmp r5, 0x1 - bne _081C0AF4 + bne @081C0AF4 ldr r1, =0x000040c0 adds r0, r2, r1 ldr r3, =0x000040c2 @@ -866791,8 +866791,8 @@ _081C0AE0: ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - beq _081C0B6E -_081C0AF4: + beq @081C0B6E +@081C0AF4: movs r0, 0x5 bl audio_play mov r1, r8 @@ -866812,7 +866812,7 @@ _081C0AF4: ldr r0, [sp, 0x8] strh r1, [r0] cmp r5, 0x1 - bne _081C0B4C + bne @081C0B4C ldr r1, =sub_81C0B8C + 1 mov r0, r9 subs r0, 0x8 @@ -866820,10 +866820,10 @@ _081C0AF4: ldr r2, [r0] adds r0, r6, 0 bl set_task_function_and_args_14_15 - b _081C0B5C + b @081C0B5C .align 2, 0 .pool -_081C0B4C: +@081C0B4C: ldr r1, =sub_81C0CC4 + 1 mov r0, r9 subs r0, 0x8 @@ -866831,7 +866831,7 @@ _081C0B4C: ldr r2, [r0] ldr r0, [sp] bl set_task_function_and_args_14_15 -_081C0B5C: +@081C0B5C: ldr r0, =0x0203cf1c ldr r0, [r0] ldr r2, =0x000040c0 @@ -866839,7 +866839,7 @@ _081C0B5C: ldrb r0, [r0] bl sub_81C2DE4 bl sub_81C424C -_081C0B6E: +@081C0B6E: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -866853,7 +866853,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 @@ -866865,14 +866865,14 @@ sub_81C0B8C: @ 81C0B8C movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0 - bne _081C0C2A + bne @081C0C2A ldr r0, =0x0203cf1c ldr r0, [r0] ldr r3, =0x000040c9 adds r0, r3 ldrb r0, [r0] cmp r0, 0 - bne _081C0BE0 + bne @081C0BE0 movs r0, 0x1 strh r0, [r4, 0x2] movs r0, 0x1 @@ -866885,10 +866885,10 @@ sub_81C0B8C: @ 81C0B8C bl gpu_bg_config_set_field movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram - b _081C0BFE + b @081C0BFE .align 2, 0 .pool -_081C0BE0: +@081C0BE0: movs r0, 0x2 strh r0, [r4, 0x2] movs r0, 0x2 @@ -866901,7 +866901,7 @@ _081C0BE0: bl gpu_bg_config_set_field movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram -_081C0BFE: +@081C0BFE: ldrb r0, [r4, 0x2] movs r1, 0 movs r2, 0 @@ -866920,7 +866920,7 @@ _081C0BFE: bl gpu_sync_bg_show movs r0, 0x2 bl gpu_sync_bg_show -_081C0C2A: +@081C0C2A: ldrb r0, [r4, 0x2] movs r1, 0x80 lsls r1, 6 @@ -866932,7 +866932,7 @@ _081C0C2A: lsls r0, 16 asrs r0, 16 cmp r0, 0xFF - ble _081C0C52 + ble @081C0C52 ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -866940,7 +866940,7 @@ _081C0C2A: adds r1, r0 ldr r0, =sub_81C0C68 + 1 str r0, [r1] -_081C0C52: +@081C0C52: pop {r4,r5} pop {r0} bx r0 @@ -866949,7 +866949,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 @@ -866988,7 +866988,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 @@ -867000,28 +867000,28 @@ sub_81C0CC4: @ 81C0CC4 movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0 - bne _081C0D0C + bne @081C0D0C ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040c9 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _081C0CFC + bne @081C0CFC movs r0, 0x2 - b _081C0CFE + b @081C0CFE .align 2, 0 .pool -_081C0CFC: +@081C0CFC: movs r0, 0x1 -_081C0CFE: +@081C0CFE: strh r0, [r4, 0x2] ldrb r0, [r4, 0x2] movs r1, 0x80 lsls r1, 9 movs r2, 0 bl bg_change_x_offset -_081C0D0C: +@081C0D0C: ldrb r0, [r4, 0x2] movs r1, 0x80 lsls r1, 6 @@ -867033,7 +867033,7 @@ _081C0D0C: lsls r0, 16 asrs r0, 16 cmp r0, 0xFF - ble _081C0D34 + ble @081C0D34 ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -867041,7 +867041,7 @@ _081C0D0C: adds r1, r0 ldr r0, =sub_81C0D44 + 1 str r0, [r1] -_081C0D34: +@081C0D34: pop {r4,r5} pop {r0} bx r0 @@ -867050,7 +867050,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 @@ -867065,7 +867065,7 @@ sub_81C0D44: @ 81C0D44 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _081C0D8C + bne @081C0D8C movs r0, 0x1 movs r1, 0x7 movs r2, 0x1 @@ -867076,10 +867076,10 @@ sub_81C0D44: @ 81C0D44 bl gpu_bg_config_set_field movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - b _081C0DA6 + b @081C0DA6 .align 2, 0 .pool -_081C0D8C: +@081C0D8C: movs r0, 0x2 movs r1, 0x7 movs r2, 0x1 @@ -867090,14 +867090,14 @@ _081C0D8C: bl gpu_bg_config_set_field movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram -_081C0DA6: +@081C0DA6: ldr r6, =0x0203cf1c ldr r2, [r6] ldr r7, =0x000040c0 adds r1, r2, r7 ldrb r0, [r1] cmp r0, 0x1 - bls _081C0DD0 + bls @081C0DD0 ldrb r0, [r4, 0x2] ldrb r1, [r1] lsls r1, 12 @@ -867110,7 +867110,7 @@ _081C0DA6: lsls r1, 9 movs r2, 0 bl bg_change_x_offset -_081C0DD0: +@081C0DD0: movs r0, 0x1 bl gpu_sync_bg_show movs r0, 0x2 @@ -867142,7 +867142,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] @@ -867150,11 +867150,11 @@ sub_81C0E24: @ 81C0E24 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x1 - bne _081C0E3C + bne @081C0E3C adds r0, r1, 0 adds r0, 0xC bl sub_81C22CC -_081C0E3C: +@081C0E3C: pop {r0} bx r0 .align 2, 0 @@ -867162,7 +867162,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} @@ -867197,10 +867197,10 @@ sub_81C0E48: @ 81C0E48 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt _081C0E96 + blt @081C0E96 movs r0, 0xD bl Window_FillTileMap -_081C0E96: +@081C0E96: movs r4, 0x3 negs r4, r4 movs r0, 0x9 @@ -867215,12 +867215,12 @@ _081C0E96: adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _081C0EC4 + bne @081C0EC4 movs r0, 0x5 bl Window_FillTileMap movs r0, 0x6 bl Window_WriteStandardTileMap -_081C0EC4: +@081C0EC4: ldr r0, [r5] ldr r1, =0x000020bc adds r0, r1 @@ -867262,7 +867262,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 @@ -867276,13 +867276,13 @@ sub_81C0F44: @ 81C0F44 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081C103A + beq @081C103A ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _081C0F98 + beq @081C0F98 movs r0, 0x4 strh r0, [r4] movs r1, 0x1 @@ -867293,14 +867293,14 @@ sub_81C0F44: @ 81C0F44 adds r2, r0 adds r0, r4, 0 bl sub_81C1070 - b _081C103A + b @081C103A .align 2, 0 .pool -_081C0F98: +@081C0F98: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081C0FC0 + beq @081C0FC0 movs r0, 0x4 strh r0, [r4] ldr r0, =0x0203cf1c @@ -867310,21 +867310,21 @@ _081C0F98: adds r0, r4, 0 movs r1, 0x1 bl sub_81C1070 - b _081C103A + b @081C103A .align 2, 0 .pool -_081C0FC0: +@081C0FC0: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081C1026 + beq @081C1026 ldr r0, =0x0203cf1c ldr r1, [r0] ldr r2, =0x000040c8 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x1 - beq _081C0FE8 + beq @081C0FE8 subs r2, 0x4 adds r0, r1, r2 ldr r0, [r0] @@ -867333,77 +867333,77 @@ _081C0FC0: movs r1, 0x80 lsls r1, 11 cmp r0, r1 - bne _081C1004 -_081C0FE8: + bne @081C1004 +@081C0FE8: movs r0, 0x5 bl audio_play adds r0, r5, 0 bl sub_81C11F4 - b _081C103A + b @081C103A .align 2, 0 .pool -_081C1004: +@081C1004: bl sub_81C1040 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081C101E + bne @081C101E movs r0, 0x5 bl audio_play adds r0, r5, 0 bl sub_81C129C - b _081C103A -_081C101E: + b @081C103A +@081C101E: movs r0, 0x20 bl audio_play - b _081C103A -_081C1026: + b @081C103A +@081C1026: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081C103A + beq @081C103A movs r0, 0x5 bl audio_play adds r0, r6, 0 bl sub_81C11F4 -_081C103A: +@081C103A: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_81C0F44 thumb_func_start sub_81C1040 -sub_81C1040: @ 81C1040 +sub_81C1040: ; 81C1040 push {lr} movs r1, 0x1 ldr r0, =0x0203cf1c ldr r0, [r0] adds r2, r0, 0 adds r2, 0x84 -_081C104C: +@081C104C: lsls r0, r1, 1 adds r0, r2, r0 ldrh r0, [r0] cmp r0, 0 - beq _081C1060 + beq @081C1060 movs r0, 0x1 - b _081C106C + b @081C106C .align 2, 0 .pool -_081C1060: +@081C1060: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x3 - bls _081C104C + bls @081C104C movs r0, 0 -_081C106C: +@081C106C: pop {r1} bx r1 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 @@ -867425,7 +867425,7 @@ sub_81C1070: @ 81C1070 ldrsh r4, [r7, r1] ldrb r0, [r7] lsls r3, r0, 24 -_081C109C: +@081C109C: lsls r0, r6, 24 asrs r0, 24 add r0, r12 @@ -867433,21 +867433,21 @@ _081C109C: lsrs r6, r0, 24 asrs r0, 24 cmp r0, r4 - ble _081C10B0 + ble @081C10B0 movs r6, 0 - b _081C10B6 -_081C10B0: + b @081C10B6 +@081C10B0: cmp r0, 0 - bge _081C10B6 + bge @081C10B6 lsrs r6, r3, 24 -_081C10B6: +@081C10B6: lsls r0, r6, 24 asrs r1, r0, 24 mov r9, r0 cmp r1, 0x4 - bne _081C10C2 - b _081C11CC -_081C10C2: + bne @081C10C2 + b @081C11CC +@081C10C2: ldr r0, =0x0203cf1c ldr r0, [r0] lsls r1, 1 @@ -867455,7 +867455,7 @@ _081C10C2: adds r0, r1 ldrh r5, [r0] cmp r5, 0 - bne _081C10E2 + bne @081C10E2 lsls r0, r2, 24 movs r1, 0x80 lsls r1, 17 @@ -867463,8 +867463,8 @@ _081C10C2: lsrs r2, r0, 24 asrs r0, 24 cmp r0, 0x3 - ble _081C109C -_081C10E2: + ble @081C109C +@081C10E2: adds r0, r5, 0 bl sub_81C240C movs r0, 0x1 @@ -867476,20 +867476,20 @@ _081C10E2: mov r1, r8 ldrb r0, [r1] cmp r0, 0x4 - bne _081C1110 + bne @081C1110 ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040c4 adds r0, r1 ldrh r0, [r0] cmp r0, 0 - beq _081C1118 -_081C1110: + beq @081C1118 +@081C1110: movs r1, 0x2 ldrsh r0, [r7, r1] cmp r0, 0x1 - bne _081C115E -_081C1118: + bne @081C115E +@081C1118: movs r0, 0x13 bl Window_FillTileMap ldr r2, =0x02020630 @@ -867506,10 +867506,10 @@ _081C1118: ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt _081C1142 + blt @081C1142 movs r0, 0xD bl Window_FillTileMap -_081C1142: +@081C1142: movs r0, 0 bl schedule_bg_copy_tilemap_to_vram movs r4, 0x3 @@ -867521,22 +867521,22 @@ _081C1142: adds r1, r4, 0 adds r2, r5, 0 bl sub_81C1EFC -_081C115E: +@081C115E: mov r1, r8 ldrb r0, [r1] cmp r0, 0x4 - beq _081C11A0 + beq @081C11A0 mov r1, r9 asrs r0, r1, 24 cmp r0, 0x4 - bne _081C11A0 + bne @081C11A0 ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040c4 adds r0, r1 ldrh r0, [r0] cmp r0, 0 - bne _081C11A0 + bne @081C11A0 movs r0, 0xE bl Window_FillTileMap movs r0, 0xF @@ -867550,7 +867550,7 @@ _081C115E: movs r1, 0x3 movs r2, 0 bl sub_81C1EFC -_081C11A0: +@081C11A0: mov r0, r8 strb r6, [r0] ldr r0, =0x0203cf1c @@ -867558,25 +867558,25 @@ _081C11A0: ldr r1, =0x000040c6 adds r0, r1 cmp r8, r0 - bne _081C11E0 + bne @081C11E0 movs r0, 0x8 bl sub_81C4D18 - b _081C11E6 + b @081C11E6 .align 2, 0 .pool -_081C11CC: +@081C11CC: ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040c4 adds r0, r1 ldrh r5, [r0] - b _081C10E2 + b @081C10E2 .align 2, 0 .pool -_081C11E0: +@081C11E0: movs r0, 0x12 bl sub_81C4D18 -_081C11E6: +@081C11E6: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -867586,7 +867586,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 @@ -867617,7 +867617,7 @@ sub_81C11F4: @ 81C11F4 adds r0, r1 ldrb r0, [r0] cmp r0, 0x4 - beq _081C125E + beq @081C125E movs r0, 0xE bl Window_FillTileMap movs r0, 0xF @@ -867629,7 +867629,7 @@ sub_81C11F4: @ 81C11F4 movs r1, 0x3 movs r2, 0 bl sub_81C1EFC -_081C125E: +@081C125E: movs r0, 0 bl schedule_bg_copy_tilemap_to_vram movs r0, 0x1 @@ -867651,7 +867651,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 @@ -867683,7 +867683,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 @@ -867697,13 +867697,13 @@ sub_81C12E4: @ 81C12E4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081C13AA + beq @081C13AA ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _081C1338 + beq @081C1338 movs r0, 0x3 strh r0, [r4] movs r1, 0x1 @@ -867714,14 +867714,14 @@ sub_81C12E4: @ 81C12E4 adds r2, r0 adds r0, r4, 0 bl sub_81C1070 - b _081C13AA + b @081C13AA .align 2, 0 .pool -_081C1338: +@081C1338: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081C1360 + beq @081C1360 movs r0, 0x3 strh r0, [r4] ldr r0, =0x0203cf1c @@ -867731,14 +867731,14 @@ _081C1338: adds r0, r4, 0 movs r1, 0x1 bl sub_81C1070 - b _081C13AA + b @081C13AA .align 2, 0 .pool -_081C1360: +@081C1360: movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081C139A + beq @081C139A ldr r0, =0x0203cf1c ldr r0, [r0] ldr r2, =0x000040c6 @@ -867748,34 +867748,34 @@ _081C1360: ldrb r1, [r1] ldrb r0, [r0] cmp r1, r0 - bne _081C1390 + bne @081C1390 adds r0, r5, 0 movs r1, 0 bl sub_81C13B0 - b _081C13AA + b @081C13AA .align 2, 0 .pool -_081C1390: +@081C1390: adds r0, r5, 0 movs r1, 0x1 bl sub_81C13B0 - b _081C13AA -_081C139A: + b @081C13AA +@081C139A: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081C13AA + beq @081C13AA adds r0, r6, 0 movs r1, 0 bl sub_81C13B0 -_081C13AA: +@081C13AA: pop {r4-r6} pop {r0} bx r0 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 @@ -867789,14 +867789,14 @@ sub_81C13B0: @ 81C13B0 movs r0, 0x12 bl sub_81C4C60 cmp r4, 0x1 - bne _081C1464 + bne @081C1464 ldr r0, =0x0203cf1c ldr r3, [r0] ldr r1, =0x000040bd adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0 - bne _081C1410 + bne @081C1410 ldr r0, [r3] ldr r2, =0x000040be adds r1, r3, r2 @@ -867811,10 +867811,10 @@ sub_81C13B0: @ 81C13B0 adds r2, r3, r4 ldrb r2, [r2] bl sub_81C14BC - b _081C1430 + b @081C1430 .align 2, 0 .pool -_081C1410: +@081C1410: ldr r0, [r3] ldr r2, =0x000040be adds r1, r3, r2 @@ -867830,7 +867830,7 @@ _081C1410: adds r2, r3, r4 ldrb r2, [r2] bl sub_81C15EC -_081C1430: +@081C1430: ldr r5, =0x0203cf1c ldr r0, [r5] adds r0, 0xC @@ -867854,7 +867854,7 @@ _081C1430: ldrb r1, [r4] adds r0, r6 strb r1, [r0] -_081C1464: +@081C1464: ldr r0, =0x0203cf1c ldr r1, [r0] ldr r2, =0x000040c6 @@ -867887,7 +867887,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 @@ -868036,7 +868036,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 @@ -868185,7 +868185,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 @@ -868208,7 +868208,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 @@ -868221,24 +868221,24 @@ sub_81C174C: @ 81C174C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081C176A - b _081C189A -_081C176A: + bne @081C176A + b @081C189A +@081C176A: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r2, 0x80 adds r0, r2, 0 ands r0, r1 cmp r0, 0 - beq _081C177A - b _081C189A -_081C177A: + beq @081C177A + b @081C189A +@081C177A: ldr r6, =0x030022c0 ldrh r1, [r6, 0x2E] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _081C17B4 + beq @081C17B4 movs r0, 0x4 strh r0, [r4] movs r1, 0x1 @@ -868249,14 +868249,14 @@ _081C177A: adds r2, r0 adds r0, r4, 0 bl sub_81C1070 - b _081C189A + b @081C189A .align 2, 0 .pool -_081C17B4: +@081C17B4: adds r0, r2, 0 ands r0, r1 cmp r0, 0 - beq _081C17DC + beq @081C17DC movs r0, 0x4 strh r0, [r4] ldr r0, =0x0203cf1c @@ -868266,52 +868266,52 @@ _081C17B4: adds r0, r4, 0 movs r1, 0x1 bl sub_81C1070 - b _081C189A + b @081C189A .align 2, 0 .pool -_081C17DC: +@081C17DC: movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _081C17F0 + bne @081C17F0 bl sub_81220D0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081C17FC -_081C17F0: + bne @081C17FC +@081C17F0: movs r1, 0x1 negs r1, r1 adds r0, r5, 0 bl sub_81C0A8C - b _081C189A -_081C17FC: + b @081C189A +@081C17FC: ldrh r1, [r6, 0x2E] movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _081C1812 + bne @081C1812 bl sub_81220D0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _081C181C -_081C1812: + bne @081C181C +@081C1812: adds r0, r5, 0 movs r1, 0x1 bl sub_81C0A8C - b _081C189A -_081C181C: + b @081C189A +@081C181C: ldrh r1, [r6, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081C1876 + beq @081C1876 bl sub_81C18A8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081C1868 + bne @081C1868 bl sub_81C48F0 movs r0, 0x5 bl audio_play @@ -868327,20 +868327,20 @@ _081C181C: strh r0, [r1] adds r0, r5, 0 bl sub_81C044C - b _081C189A + b @081C189A .align 2, 0 .pool -_081C1868: +@081C1868: movs r0, 0x20 bl audio_play adds r0, r5, 0 bl sub_81C18F4 - b _081C189A -_081C1876: + b @081C189A +@081C1876: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081C189A + beq @081C189A bl sub_81C48F0 movs r0, 0x5 bl audio_play @@ -868352,7 +868352,7 @@ _081C1876: strh r0, [r1] adds r0, r5, 0 bl sub_81C044C -_081C189A: +@081C189A: pop {r4-r6} pop {r0} bx r0 @@ -868361,7 +868361,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] @@ -868369,12 +868369,12 @@ sub_81C18A8: @ 81C18A8 adds r1, r2, r0 ldrb r0, [r1] cmp r0, 0x4 - beq _081C18DA + beq @081C18DA ldr r3, =0x000040c4 adds r0, r2, r3 ldrh r0, [r0] cmp r0, 0 - beq _081C18DA + beq @081C18DA ldrb r1, [r1] lsls r1, 1 adds r0, r2, 0 @@ -868385,21 +868385,21 @@ sub_81C18A8: @ 81C18A8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081C18EC -_081C18DA: + beq @081C18EC +@081C18DA: movs r0, 0x1 - b _081C18EE + b @081C18EE .align 2, 0 .pool -_081C18EC: +@081C18EC: movs r0, 0 -_081C18EE: +@081C18EE: pop {r1} bx r1 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 @@ -868433,7 +868433,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 @@ -868453,9 +868453,9 @@ sub_81C1940: @ 81C1940 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081C196C - b _081C1B74 -_081C196C: + bne @081C196C + b @081C1B74 +@081C196C: ldr r6, =0x030022c0 ldrh r1, [r6, 0x2E] movs r0, 0x40 @@ -868463,7 +868463,7 @@ _081C196C: lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - beq _081C19B0 + beq @081C19B0 movs r0, 0x1 strh r0, [r4, 0x2] movs r0, 0x4 @@ -868478,14 +868478,14 @@ _081C196C: bl sub_81C1070 movs r0, 0 strh r0, [r4, 0x2] - b _081C1B6A + b @081C1B6A .align 2, 0 .pool -_081C19B0: +@081C19B0: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081C19DC + beq @081C19DC movs r0, 0x1 strh r0, [r4, 0x2] movs r0, 0x4 @@ -868498,29 +868498,29 @@ _081C19B0: movs r1, 0x1 bl sub_81C1070 strh r5, [r4, 0x2] - b _081C1B6A + b @081C1B6A .align 2, 0 .pool -_081C19DC: +@081C19DC: movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _081C19F0 + bne @081C19F0 bl sub_81220D0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081C1A64 -_081C19F0: + bne @081C1A64 +@081C19F0: ldr r4, =0x0203cf1c ldr r0, [r4] ldr r2, =0x000040c0 adds r0, r2 ldrb r0, [r0] cmp r0, 0x2 - bne _081C1A00 - b _081C1B74 -_081C1A00: + bne @081C1A00 + b @081C1B74 +@081C1A00: movs r0, 0x13 bl Window_FillTileMap ldr r2, =0x02020630 @@ -868536,10 +868536,10 @@ _081C1A00: ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt _081C1A28 + blt @081C1A28 movs r0, 0xD bl Window_FillTileMap -_081C1A28: +@081C1A28: ldr r1, [r4] ldr r2, =0x000040c6 adds r0, r1, r2 @@ -868556,28 +868556,28 @@ _081C1A28: movs r1, 0x1 negs r1, r1 adds r0, r7, 0 - b _081C1ACE + b @081C1ACE .align 2, 0 .pool -_081C1A64: +@081C1A64: ldrh r1, [r6, 0x2E] movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _081C1A7A + bne @081C1A7A bl sub_81220D0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _081C1B04 -_081C1A7A: + bne @081C1B04 +@081C1A7A: ldr r4, =0x0203cf1c ldr r0, [r4] ldr r1, =0x000040c0 adds r0, r1 ldrb r0, [r0] cmp r0, 0x3 - beq _081C1B74 + beq @081C1B74 movs r0, 0x13 bl Window_FillTileMap ldr r2, =0x02020630 @@ -868593,10 +868593,10 @@ _081C1A7A: ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt _081C1AB0 + blt @081C1AB0 movs r0, 0xD bl Window_FillTileMap -_081C1AB0: +@081C1AB0: ldr r1, [r4] ldr r2, =0x000040c6 adds r0, r1, r2 @@ -868612,7 +868612,7 @@ _081C1AB0: str r1, [r0] adds r0, r7, 0 movs r1, 0x1 -_081C1ACE: +@081C1ACE: bl sub_81C0A8C movs r4, 0x2 negs r4, r4 @@ -868623,15 +868623,15 @@ _081C1ACE: adds r1, r4, 0 adds r2, r5, 0 bl sub_81C1EFC - b _081C1B74 + b @081C1B74 .align 2, 0 .pool -_081C1B04: +@081C1B04: ldrh r1, [r6, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _081C1B74 + beq @081C1B74 movs r0, 0x13 bl Window_FillTileMap ldr r2, =0x02020630 @@ -868648,10 +868648,10 @@ _081C1B04: ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt _081C1B38 + blt @081C1B38 movs r0, 0xD bl Window_FillTileMap -_081C1B38: +@081C1B38: ldr r1, [r4] ldr r2, =0x000040c6 adds r0, r1, r2 @@ -868673,13 +868673,13 @@ _081C1B38: adds r1, r4, 0 adds r2, r5, 0 bl sub_81C1EFC -_081C1B6A: +@081C1B6A: mov r0, r9 subs r0, 0x8 add r0, r8 ldr r1, =sub_81C174C + 1 str r1, [r0] -_081C1B74: +@081C1B74: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -868691,7 +868691,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 @@ -868700,14 +868700,14 @@ 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 bl malloc adds r4, r0, 0 movs r5, 0 -_081C1BAE: +@081C1BAE: lsls r0, r5, 25 lsrs r1, r0, 24 adds r6, r1, 0 @@ -868717,40 +868717,40 @@ _081C1BAE: adds r0, r3, r2 ldrb r0, [r0] cmp r5, r0 - bcs _081C1BD8 + bcs @081C1BD8 lsls r0, r1, 1 adds r0, r4 movs r1, 0x40 strh r1, [r0] strh r1, [r0, 0x2] movs r1, 0x50 - b _081C1BEE + b @081C1BEE .align 2, 0 .pool -_081C1BD8: +@081C1BD8: ldr r7, =0x000040c2 adds r0, r3, r7 ldrb r2, [r0] cmp r5, r2 - bls _081C1BF8 + bls @081C1BF8 lsls r0, r1, 1 adds r0, r4 movs r1, 0x4A strh r1, [r0] strh r1, [r0, 0x2] movs r1, 0x5A -_081C1BEE: +@081C1BEE: strh r1, [r0, 0x10] strh r1, [r0, 0x12] - b _081C1C78 + b @081C1C78 .align 2, 0 .pool -_081C1BF8: +@081C1BF8: ldr r7, =0x000040c0 adds r0, r3, r7 ldrb r0, [r0] cmp r5, r0 - bcs _081C1C1C + bcs @081C1C1C lsls r1, 1 adds r1, r4 movs r0, 0x46 @@ -868760,14 +868760,14 @@ _081C1BF8: movs r0, 0x56 strh r0, [r1, 0x10] movs r0, 0x57 - b _081C1C76 + b @081C1C76 .align 2, 0 .pool -_081C1C1C: +@081C1C1C: cmp r5, r0 - bne _081C1C4C + bne @081C1C4C cmp r5, r2 - beq _081C1C38 + beq @081C1C38 lsls r1, 1 adds r1, r4 movs r0, 0x41 @@ -868777,8 +868777,8 @@ _081C1C1C: movs r0, 0x51 strh r0, [r1, 0x10] movs r0, 0x52 - b _081C1C76 -_081C1C38: + b @081C1C76 +@081C1C38: lsls r1, 1 adds r1, r4 movs r0, 0x4B @@ -868788,10 +868788,10 @@ _081C1C38: movs r0, 0x5B strh r0, [r1, 0x10] movs r0, 0x5C - b _081C1C76 -_081C1C4C: + b @081C1C76 +@081C1C4C: cmp r5, r2 - beq _081C1C64 + beq @081C1C64 lsls r1, 1 adds r1, r4 movs r0, 0x43 @@ -868801,8 +868801,8 @@ _081C1C4C: movs r0, 0x53 strh r0, [r1, 0x10] movs r0, 0x54 - b _081C1C76 -_081C1C64: + b @081C1C76 +@081C1C64: lsls r1, r6, 1 adds r1, r4 movs r0, 0x48 @@ -868812,14 +868812,14 @@ _081C1C64: movs r0, 0x58 strh r0, [r1, 0x10] movs r0, 0x59 -_081C1C76: +@081C1C76: strh r0, [r1, 0x12] -_081C1C78: +@081C1C78: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls _081C1BAE + bls @081C1BAE movs r0, 0x8 str r0, [sp] movs r0, 0x2 @@ -868842,7 +868842,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} @@ -868874,14 +868874,14 @@ sub_81C1CB0: @ 81C1CB0 bl CpuSet ldrb r0, [r4, 0x6] cmp r0, r6 - beq _081C1D60 + beq @081C1D60 cmp r5, 0 - bne _081C1D30 + bne @081C1D30 movs r5, 0 ldrb r0, [r4, 0x7] cmp r5, r0 - bcs _081C1D60 -_081C1D00: + bcs @081C1D60 +@081C1D00: ldrb r2, [r4, 0x6] adds r1, r2, 0 muls r1, r5 @@ -868900,16 +868900,16 @@ _081C1D00: lsrs r5, r0, 16 ldrb r3, [r4, 0x7] cmp r5, r3 - bcc _081C1D00 - b _081C1D60 + bcc @081C1D00 + b @081C1D60 .align 2, 0 .pool -_081C1D30: +@081C1D30: movs r5, 0 ldrb r0, [r4, 0x7] cmp r5, r0 - bcs _081C1D60 -_081C1D38: + bcs @081C1D60 +@081C1D38: ldrb r2, [r4, 0x6] adds r1, r2, 0 muls r1, r5 @@ -868928,13 +868928,13 @@ _081C1D38: lsrs r5, r0, 16 ldrb r3, [r4, 0x7] cmp r5, r3 - bcc _081C1D38 -_081C1D60: + bcc @081C1D38 +@081C1D60: movs r5, 0 - b _081C1D8A + b @081C1D8A .align 2, 0 .pool -_081C1D68: +@081C1D68: ldrb r2, [r4, 0x6] adds r0, r2, 0 muls r0, r5 @@ -868951,10 +868951,10 @@ _081C1D68: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 -_081C1D8A: +@081C1D8A: ldrb r0, [r4, 0x7] cmp r5, r0 - bcc _081C1D68 + bcc @081C1D68 adds r0, r7, 0 bl free add sp, 0x4 @@ -868966,7 +868966,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 @@ -868976,16 +868976,16 @@ sub_81C1DA4: @ 81C1DA4 ldr r3, =0x0861cc04 ldrb r2, [r3, 0x6] cmp r1, r2 - ble _081C1DBA + ble @081C1DBA adds r4, r2, 0 -_081C1DBA: +@081C1DBA: lsls r0, r4, 16 asrs r0, 16 cmp r0, 0 - beq _081C1DC6 + beq @081C1DC6 cmp r0, r2 - bne _081C1DE8 -_081C1DC6: + bne @081C1DE8 +@081C1DC6: ldr r0, =0x0203cf1c ldr r1, [r0] ldr r0, =0x000020bc @@ -868995,23 +868995,23 @@ _081C1DC6: adds r0, r3, 0 movs r3, 0x1 bl sub_81C1CB0 - b _081C1E12 + b @081C1E12 .align 2, 0 .pool -_081C1DE8: +@081C1DE8: ldr r5, =sub_81C1E20 + 1 adds r0, r5, 0 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - bne _081C1E04 + bne @081C1E04 adds r0, r5, 0 movs r1, 0x8 bl AddTask lsls r0, 24 lsrs r2, r0, 24 -_081C1E04: +@081C1E04: ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 @@ -869019,7 +869019,7 @@ _081C1E04: adds r0, r1 strh r4, [r0, 0x8] strh r6, [r0, 0xA] -_081C1E12: +@081C1E12: pop {r4-r6} pop {r0} bx r0 @@ -869028,7 +869028,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 @@ -869043,23 +869043,23 @@ sub_81C1E20: @ 81C1E20 strh r0, [r4, 0x2] lsls r0, 16 cmp r0, 0 - bge _081C1E50 + bge @081C1E50 movs r0, 0 strh r0, [r4, 0x2] ldr r7, =0x0861cc04 - b _081C1E60 + b @081C1E60 .align 2, 0 .pool -_081C1E50: +@081C1E50: movs r0, 0x2 ldrsh r1, [r4, r0] ldr r0, =0x0861cc04 ldrb r2, [r0, 0x6] adds r7, r0, 0 cmp r1, r2 - ble _081C1E60 + ble @081C1E60 strh r2, [r4, 0x2] -_081C1E60: +@081C1E60: ldr r5, =0x0203cf1c ldr r1, [r5] ldr r0, =0x000020bc @@ -869071,27 +869071,27 @@ _081C1E60: movs r1, 0x2 ldrsh r0, [r4, r1] cmp r0, 0 - ble _081C1E80 + ble @081C1E80 ldrb r7, [r7, 0x6] cmp r0, r7 - blt _081C1EE0 -_081C1E80: + blt @081C1EE0 +@081C1E80: movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0 - bge _081C1EAC + bge @081C1EAC ldr r0, [r5] ldr r1, =0x000040c0 adds r0, r1 ldrb r0, [r0] cmp r0, 0x2 - bne _081C1ED4 + bne @081C1ED4 movs r0, 0xE bl Window_WriteStandardTileMap - b _081C1ED4 + b @081C1ED4 .align 2, 0 .pool -_081C1EAC: +@081C1EAC: ldr r2, =0x02020630 ldr r0, [r5] ldr r1, =0x000040d5 @@ -869105,18 +869105,18 @@ _081C1EAC: ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt _081C1ECE + blt @081C1ECE movs r0, 0xD bl Window_WriteStandardTileMap -_081C1ECE: +@081C1ECE: movs r0, 0x13 bl Window_WriteStandardTileMap -_081C1ED4: +@081C1ED4: movs r0, 0 bl schedule_bg_copy_tilemap_to_vram adds r0, r6, 0 bl remove_task -_081C1EE0: +@081C1EE0: movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram movs r0, 0x2 @@ -869129,7 +869129,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 @@ -869141,16 +869141,16 @@ sub_81C1EFC: @ 81C1EFC ldr r3, =0x0861cc10 ldrb r2, [r3, 0x6] cmp r1, r2 - ble _081C1F16 + ble @081C1F16 adds r4, r2, 0 -_081C1F16: +@081C1F16: lsls r0, r4, 16 asrs r0, 16 cmp r0, 0 - beq _081C1F22 + beq @081C1F22 cmp r0, r2 - bne _081C1F44 -_081C1F22: + bne @081C1F44 +@081C1F22: ldr r0, =0x0203cf1c ldr r1, [r0] ldr r0, =0x000030bc @@ -869160,23 +869160,23 @@ _081C1F22: adds r0, r3, 0 movs r3, 0x1 bl sub_81C1CB0 - b _081C1F70 + b @081C1F70 .align 2, 0 .pool -_081C1F44: +@081C1F44: ldr r5, =sub_81C1F80 + 1 adds r0, r5, 0 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - bne _081C1F60 + bne @081C1F60 adds r0, r5, 0 movs r1, 0x8 bl AddTask lsls r0, 24 lsrs r2, r0, 24 -_081C1F60: +@081C1F60: ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 @@ -869185,7 +869185,7 @@ _081C1F60: strh r4, [r0, 0x8] strh r7, [r0, 0xA] strh r6, [r0, 0xC] -_081C1F70: +@081C1F70: pop {r4-r7} pop {r0} bx r0 @@ -869194,7 +869194,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 @@ -869209,23 +869209,23 @@ sub_81C1F80: @ 81C1F80 strh r0, [r4, 0x2] lsls r0, 16 cmp r0, 0 - bge _081C1FB0 + bge @081C1FB0 movs r0, 0 strh r0, [r4, 0x2] ldr r7, =0x0861cc10 - b _081C1FC0 + b @081C1FC0 .align 2, 0 .pool -_081C1FB0: +@081C1FB0: movs r0, 0x2 ldrsh r1, [r4, r0] ldr r0, =0x0861cc10 ldrb r2, [r0, 0x6] adds r7, r0, 0 cmp r1, r2 - ble _081C1FC0 + ble @081C1FC0 strh r2, [r4, 0x2] -_081C1FC0: +@081C1FC0: ldr r5, =0x0203cf1c ldr r1, [r5] ldr r0, =0x000030bc @@ -869237,35 +869237,35 @@ _081C1FC0: movs r1, 0x2 ldrsh r0, [r4, r1] cmp r0, 0 - ble _081C1FE0 + ble @081C1FE0 ldrb r7, [r7, 0x6] cmp r0, r7 - blt _081C2058 -_081C1FE0: + blt @081C2058 +@081C1FE0: movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0 - bge _081C2024 + bge @081C2024 ldr r0, [r5] ldr r1, =0x000040c0 adds r0, r1 ldrb r0, [r0] cmp r0, 0x3 - bne _081C2006 + bne @081C2006 ldr r0, =sub_81C0B8C + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne _081C2006 + bne @081C2006 movs r0, 0xF bl Window_WriteStandardTileMap -_081C2006: +@081C2006: ldrh r0, [r4, 0x4] bl sub_81C240C - b _081C204C + b @081C204C .align 2, 0 .pool -_081C2024: +@081C2024: ldr r2, =0x02020630 ldr r0, [r5] ldr r1, =0x000040d5 @@ -869279,18 +869279,18 @@ _081C2024: ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt _081C2046 + blt @081C2046 movs r0, 0xD bl Window_WriteStandardTileMap -_081C2046: +@081C2046: movs r0, 0x13 bl Window_WriteStandardTileMap -_081C204C: +@081C204C: movs r0, 0 bl schedule_bg_copy_tilemap_to_vram adds r0, r6, 0 bl remove_task -_081C2058: +@081C2058: movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram movs r0, 0x2 @@ -869303,7 +869303,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 @@ -869313,16 +869313,16 @@ sub_81C2074: @ 81C2074 ldr r3, =0x0861cbec ldrb r2, [r3, 0x6] cmp r1, r2 - ble _081C208A + ble @081C208A adds r4, r2, 0 -_081C208A: +@081C208A: lsls r0, r4, 16 asrs r0, 16 cmp r0, 0 - beq _081C2096 + beq @081C2096 cmp r0, r2 - bne _081C20C8 -_081C2096: + bne @081C20C8 +@081C2096: ldr r5, =0x0203cf1c ldr r1, [r5] adds r1, 0xBC @@ -869338,10 +869338,10 @@ _081C2096: adds r2, r4, 0 movs r3, 0 bl sub_81C1CB0 - b _081C20E2 + b @081C20E2 .align 2, 0 .pool -_081C20C8: +@081C20C8: ldr r0, =sub_81C20F0 + 1 movs r1, 0x8 bl AddTask @@ -869354,7 +869354,7 @@ _081C20C8: adds r1, r2 strh r4, [r1, 0x8] strh r5, [r1, 0xA] -_081C20E2: +@081C20E2: pop {r4,r5} pop {r0} bx r0 @@ -869363,7 +869363,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 @@ -869378,23 +869378,23 @@ sub_81C20F0: @ 81C20F0 strh r0, [r5, 0x2] lsls r0, 16 cmp r0, 0 - bge _081C2120 + bge @081C2120 movs r0, 0 strh r0, [r5, 0x2] ldr r7, =0x0861cbec - b _081C2130 + b @081C2130 .align 2, 0 .pool -_081C2120: +@081C2120: movs r0, 0x2 ldrsh r1, [r5, r0] ldr r0, =0x0861cbec ldrb r2, [r0, 0x6] adds r7, r0, 0 cmp r1, r2 - ble _081C2130 + ble @081C2130 strh r2, [r5, 0x2] -_081C2130: +@081C2130: ldr r4, =0x0203cf1c ldr r1, [r4] adds r1, 0xBC @@ -869413,24 +869413,24 @@ _081C2130: movs r1, 0x2 ldrsh r0, [r5, r1] cmp r0, 0 - ble _081C2162 + ble @081C2162 ldrb r7, [r7, 0x6] cmp r0, r7 - blt _081C2180 -_081C2162: + blt @081C2180 +@081C2162: movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0 - bge _081C217A + bge @081C217A bl sub_81C4A88 movs r0, 0xD bl Window_WriteStandardTileMap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram -_081C217A: +@081C217A: adds r0, r6, 0 bl remove_task -_081C2180: +@081C2180: pop {r4-r7} pop {r0} bx r0 @@ -869439,7 +869439,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 @@ -869447,10 +869447,10 @@ sub_81C2194: @ 81C2194 lsrs r4, r1, 16 ldr r7, =0x0000056a cmp r2, 0 - bne _081C21E4 + bne @081C21E4 movs r3, 0 ldr r5, =0x08dc3cd4 -_081C21A8: +@081C21A8: adds r2, r7, r3 lsls r2, 1 adds r2, r6 @@ -869474,14 +869474,14 @@ _081C21A8: lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x13 - bls _081C21A8 - b _081C221C + bls @081C21A8 + b @081C221C .align 2, 0 .pool -_081C21E4: +@081C21E4: movs r3, 0 ldr r5, =0x08dc3cd4 -_081C21E8: +@081C21E8: adds r1, r7, r3 lsls r1, 1 adds r1, r6 @@ -869507,8 +869507,8 @@ _081C21E8: lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x13 - bls _081C21E8 -_081C221C: + bls @081C21E8 +@081C221C: pop {r4-r7} pop {r0} bx r0 @@ -869517,35 +869517,35 @@ _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 bl sub_806DD7C lsls r0, 24 cmp r0, 0 - bne _081C225C + bne @081C225C adds r0, r4, 0 movs r1, 0 bl sub_806DDE4 lsls r0, 24 cmp r0, 0 - beq _081C225C + beq @081C225C ldr r0, =0x0203cf1c ldr r0, [r0] ldr r2, =0x00000502 adds r1, r0, r2 movs r2, 0x2C - b _081C2266 + b @081C2266 .align 2, 0 .pool -_081C225C: +@081C225C: ldr r0, =0x0203cf1c ldr r0, [r0] ldr r2, =0x00000502 adds r1, r0, r2 ldr r2, =0x0000081a -_081C2266: +@081C2266: strh r2, [r1] ldr r1, =0x00000d02 adds r0, r1 @@ -869560,13 +869560,13 @@ _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 lsrs r1, r0, 24 cmp r1, 0 - bne _081C22AC + bne @081C22AC movs r0, 0x8 str r0, [sp] str r1, [sp, 0x4] @@ -869575,8 +869575,8 @@ sub_81C228C: @ 81C228C movs r2, 0x4 movs r3, 0x8 bl sub_8199C30 - b _081C22C0 -_081C22AC: + b @081C22C0 +@081C22AC: movs r0, 0x8 str r0, [sp] movs r0, 0x5 @@ -869586,7 +869586,7 @@ _081C22AC: movs r2, 0x4 movs r3, 0x8 bl sub_8199C30 -_081C22C0: +@081C22C0: movs r0, 0x3 bl schedule_bg_copy_tilemap_to_vram add sp, 0x8 @@ -869595,7 +869595,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 @@ -869608,7 +869608,7 @@ sub_81C22CC: @ 81C22CC ldrb r1, [r6, 0x5] mov r8, r0 cmp r1, 0x63 - bhi _081C2340 + bhi @081C2340 ldr r5, =0x0831f72c adds r2, r1, 0 adds r1, r2, 0x1 @@ -869640,18 +869640,18 @@ sub_81C22CC: @ 81C22CC adds r0, r7, 0 orrs r0, r6 cmp r0, 0 - bne _081C2344 + bne @081C2344 cmp r4, 0 - beq _081C2344 + beq @081C2344 movs r6, 0x1 movs r7, 0 - b _081C2344 + b @081C2344 .align 2, 0 .pool -_081C2340: +@081C2340: movs r6, 0 movs r7, 0 -_081C2344: +@081C2344: mov r1, r8 ldr r0, [r1] ldr r2, =0x00001d66 @@ -869661,24 +869661,24 @@ _081C2344: mov r12, r0 ldr r1, =0x00002062 mov r10, r1 -_081C2356: +@081C2356: cmp r7, 0 - bgt _081C2362 + bgt @081C2362 cmp r7, 0 - bne _081C237C + bne @081C237C cmp r6, 0x7 - bls _081C237C -_081C2362: + bls @081C237C +@081C2362: mov r2, r12 lsls r0, r2, 1 add r0, r9 ldr r2, =0x0000206a adds r1, r2, 0 strh r1, [r0] - b _081C23B6 + b @081C23B6 .align 2, 0 .pool -_081C237C: +@081C237C: mov r1, r12 lsls r0, r1, 1 add r0, r9 @@ -869686,12 +869686,12 @@ _081C237C: adds r5, r7, 0 adds r4, r6, 0 cmp r7, 0 - bge _081C2394 + bge @081C2394 movs r4, 0x7 movs r5, 0 adds r4, r6 adcs r5, r7 -_081C2394: +@081C2394: lsls r3, r5, 29 lsrs r2, r4, 3 adds r0, r3, 0 @@ -869709,24 +869709,24 @@ _081C2394: add r0, r10 mov r2, r8 strh r0, [r2] -_081C23B6: +@081C23B6: movs r0, 0x8 negs r0, r0 asrs r1, r0, 31 adds r6, r0 adcs r7, r1 cmp r7, 0 - bge _081C23C8 + bge @081C23C8 movs r6, 0 movs r7, 0 -_081C23C8: +@081C23C8: mov r0, r12 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r12, r0 cmp r0, 0x7 - bls _081C2356 + bls @081C2356 movs r0, 0x1 bl bg_get_tilemap ldr r1, =0x0203cf1c @@ -869734,16 +869734,16 @@ _081C23C8: ldr r2, =0x000010bc adds r1, r2 cmp r0, r1 - bne _081C23F8 + bne @081C23F8 movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram - b _081C23FE + b @081C23FE .align 2, 0 .pool -_081C23F8: +@081C23F8: movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram -_081C23FE: +@081C23FE: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -869754,7 +869754,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 @@ -869767,7 +869767,7 @@ sub_81C240C: @ 81C240C ldr r1, =0x000038bc adds r5, r0, r1 cmp r3, 0 - beq _081C2510 + beq @081C2510 ldr r1, =0x0858cdcc ldr r2, =0x0858c2b4 lsls r3, 3 @@ -869780,22 +869780,22 @@ sub_81C240C: @ 81C240C mov r8, r2 mov r10, r3 cmp r4, 0xFF - beq _081C244C + beq @081C244C adds r0, r4, 0 movs r1, 0xA bl __udivsi3 lsls r0, 24 lsrs r4, r0, 24 -_081C244C: +@081C244C: movs r2, 0 movs r6, 0x3 movs r3, 0xF3 lsls r3, 2 -_081C2454: +@081C2454: cmp r4, 0xFF - beq _081C2484 + beq @081C2484 cmp r2, r4 - bcs _081C2484 + bcs @081C2484 lsrs r0, r2, 2 adds r1, r2, 0 ands r1, r6 @@ -869805,10 +869805,10 @@ _081C2454: adds r0, r5 adds r0, r3 ldr r7, =0x0000103a - b _081C2496 + b @081C2496 .align 2, 0 .pool -_081C2484: +@081C2484: lsrs r0, r2, 2 adds r1, r2, 0 ands r1, r6 @@ -869818,14 +869818,14 @@ _081C2484: adds r0, r5 adds r0, r3 ldr r7, =0x00001039 -_081C2496: +@081C2496: adds r1, r7, 0 strh r1, [r0] adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x7 - bls _081C2454 + bls @081C2454 mov r0, r10 add r0, r8 ldrb r0, [r0] @@ -869833,21 +869833,21 @@ _081C2496: add r0, r9 ldrb r4, [r0, 0x2] cmp r4, 0xFF - beq _081C24C0 + beq @081C24C0 adds r0, r4, 0 movs r1, 0xA bl __udivsi3 lsls r0, 24 lsrs r4, r0, 24 -_081C24C0: +@081C24C0: movs r2, 0 movs r6, 0x3 ldr r3, =0x0000044c -_081C24C6: +@081C24C6: cmp r4, 0xFF - beq _081C24F0 + beq @081C24F0 cmp r2, r4 - bcs _081C24F0 + bcs @081C24F0 lsrs r0, r2, 2 adds r1, r2, 0 ands r1, r6 @@ -869857,10 +869857,10 @@ _081C24C6: adds r0, r5 adds r0, r3 ldr r7, =0x0000103c - b _081C2502 + b @081C2502 .align 2, 0 .pool -_081C24F0: +@081C24F0: lsrs r0, r2, 2 adds r1, r2, 0 ands r1, r6 @@ -869870,15 +869870,15 @@ _081C24F0: adds r0, r5 adds r0, r3 ldr r7, =0x0000103d -_081C2502: +@081C2502: adds r1, r7, 0 strh r1, [r0] adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x7 - bls _081C24C6 -_081C2510: + bls @081C24C6 +@081C2510: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -869891,40 +869891,40 @@ _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] adds r0, 0x74 ldrb r0, [r0] cmp r0, 0 - beq _081C2544 + beq @081C2544 movs r1, 0x80 lsls r1, 9 movs r0, 0x3 movs r2, 0 bl bg_change_x_offset - b _081C254E + b @081C254E .align 2, 0 .pool -_081C2544: +@081C2544: movs r0, 0x3 movs r1, 0 movs r2, 0 bl bg_change_x_offset -_081C254E: +@081C254E: pop {r0} bx r0 thumb_func_end sub_81C2524 thumb_func_start sub_81C2554 -sub_81C2554: @ 81C2554 +sub_81C2554: ; 81C2554 push {r4,r5,lr} ldr r0, =0x0861cc24 bl Window_InitFromTemplates bl TextBox_ResetSomeField movs r4, 0 -_081C2562: +@081C2562: adds r0, r4, 0 movs r1, 0 bl Window_FastFillPixels @@ -869932,12 +869932,12 @@ _081C2562: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x13 - bls _081C2562 + bls @081C2562 movs r4, 0 ldr r5, =0x0203cf1c ldr r3, =0x000040cb movs r2, 0xFF -_081C257C: +@081C257C: ldr r0, [r5] adds r0, r3 adds r0, r4 @@ -869948,7 +869948,7 @@ _081C257C: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bls _081C257C + bls @081C257C pop {r4,r5} pop {r0} bx r0 @@ -869957,7 +869957,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] @@ -869993,7 +869993,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 @@ -870009,14 +870009,14 @@ sub_81C25E8: @ 81C25E8 adds r0, 0x74 ldrb r0, [r0] cmp r0, 0 - bne _081C2618 + bne @081C2618 bl sub_81C2628 - b _081C261C + b @081C261C .align 2, 0 .pool -_081C2618: +@081C2618: bl sub_81C2794 -_081C261C: +@081C261C: movs r0, 0 bl schedule_bg_copy_tilemap_to_vram pop {r0} @@ -870024,7 +870024,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} @@ -870042,7 +870042,7 @@ sub_81C2628: @ 81C2628 lsrs r5, r0, 16 ldr r0, =0x0000ffff cmp r5, r0 - beq _081C26CE + beq @081C26CE ldr r6, =0x02021cc4 ldr r1, =0x085e8d4f adds r0, r6, 0 @@ -870061,7 +870061,7 @@ sub_81C2628: @ 81C2628 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne _081C26AC + bne @081C26AC str r0, [sp] movs r0, 0x1 str r0, [sp, 0x4] @@ -870072,10 +870072,10 @@ sub_81C2628: @ 81C2628 bl sub_81C25A4 movs r0, 0 bl sub_81C228C - b _081C26C6 + b @081C26C6 .align 2, 0 .pool -_081C26AC: +@081C26AC: movs r0, 0 str r0, [sp] movs r0, 0x7 @@ -870087,25 +870087,25 @@ _081C26AC: bl sub_81C25A4 movs r0, 0x1 bl sub_81C228C -_081C26C6: +@081C26C6: movs r0, 0x11 bl Window_WriteStandardTileMap - b _081C26EE -_081C26CE: + b @081C26EE +@081C26CE: movs r0, 0x11 bl Window_FillTileMap mov r0, r8 bl sub_806EBA4 lsls r0, 24 cmp r0, 0 - bne _081C26E8 + bne @081C26E8 movs r0, 0 bl sub_81C228C - b _081C26EE -_081C26E8: + b @081C26EE +@081C26E8: movs r0, 0x1 bl sub_81C228C -_081C26EE: +@081C26EE: ldr r4, =0x02021cc4 ldr r1, =0x085e8d4d adds r0, r4, 0 @@ -870174,7 +870174,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 @@ -870207,24 +870207,24 @@ 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 lsrs r1, 16 cmp r1, 0x20 - beq _081C282C + beq @081C282C cmp r1, 0x1D - beq _081C282C + beq @081C282C bl pokemon_get_gender lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _081C27FE + beq @081C27FE cmp r0, 0xFE - beq _081C2818 - b _081C282C -_081C27FE: + beq @081C2818 + b @081C282C +@081C27FE: ldr r1, =0x085e8d49 str r0, [sp] movs r0, 0x3 @@ -870233,10 +870233,10 @@ _081C27FE: movs r2, 0x39 movs r3, 0x11 bl sub_81C25A4 - b _081C282C + b @081C282C .align 2, 0 .pool -_081C2818: +@081C2818: ldr r1, =0x085e8d4b movs r0, 0 str r0, [sp] @@ -870246,7 +870246,7 @@ _081C2818: movs r2, 0x39 movs r3, 0x11 bl sub_81C25A4 -_081C282C: +@081C282C: add sp, 0x8 pop {r0} bx r0 @@ -870255,7 +870255,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 @@ -870263,9 +870263,9 @@ sub_81C2838: @ 81C2838 lsls r1, 24 ldr r3, =0x0861cdd3 cmp r1, 0 - bne _081C284A + bne @081C284A subs r3, 0x80 -_081C284A: +@081C284A: lsls r2, 16 lsrs r2, 16 movs r0, 0x10 @@ -870284,7 +870284,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, =0x085ea3cf @@ -870326,9 +870326,9 @@ sub_81C286C: @ 81C286C adds r2, r4, 0 subs r2, 0x10 cmp r2, 0 - bge _081C28CC + bge @081C28CC movs r2, 0 -_081C28CC: +@081C28CC: movs r0, 0x4 movs r1, 0 bl sub_81C2838 @@ -870349,9 +870349,9 @@ _081C28CC: adds r2, r4, 0 subs r2, 0x10 cmp r2, 0 - bge _081C28FE + bge @081C28FE movs r2, 0 -_081C28FE: +@081C28FE: movs r0, 0x5 movs r1, 0 bl sub_81C2838 @@ -870372,9 +870372,9 @@ _081C28FE: adds r2, r4, 0 subs r2, 0x10 cmp r2, 0 - bge _081C2930 + bge @081C2930 movs r2, 0 -_081C2930: +@081C2930: movs r0, 0x6 movs r1, 0 bl sub_81C2838 @@ -870542,7 +870542,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 @@ -870556,19 +870556,19 @@ sub_81C2AFC: @ 81C2AFC movs r0, 0x3 bl Window_FillTileMap cmp r4, 0x1 - beq _081C2B66 + beq @081C2B66 cmp r4, 0x1 - bgt _081C2B2A + bgt @081C2B2A cmp r4, 0 - beq _081C2B34 - b _081C2C06 -_081C2B2A: + beq @081C2B34 + b @081C2C06 +@081C2B2A: cmp r5, 0x2 - beq _081C2B80 + beq @081C2B80 cmp r5, 0x3 - beq _081C2BC4 - b _081C2C06 -_081C2B34: + beq @081C2BC4 + b @081C2C06 +@081C2B34: movs r0, 0 bl Window_WriteStandardTileMap movs r0, 0x4 @@ -870577,20 +870577,20 @@ _081C2B34: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081C2B58 + beq @081C2B58 bl sub_81B9E94 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081C2B5E -_081C2B58: + bne @081C2B5E +@081C2B58: movs r0, 0x8 bl Window_WriteStandardTileMap -_081C2B5E: +@081C2B5E: movs r0, 0x9 bl Window_WriteStandardTileMap - b _081C2C06 -_081C2B66: + b @081C2C06 +@081C2B66: movs r0, 0x1 bl Window_WriteStandardTileMap movs r0, 0xA @@ -870599,8 +870599,8 @@ _081C2B66: bl Window_WriteStandardTileMap movs r0, 0xC bl Window_WriteStandardTileMap - b _081C2C06 -_081C2B80: + b @081C2C06 +@081C2B80: movs r0, 0x2 bl Window_WriteStandardTileMap ldr r0, =0x0203cf1c @@ -870609,7 +870609,7 @@ _081C2B80: adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x3 - bne _081C2BBC + bne @081C2BBC adds r2, 0x8 adds r0, r1, r2 ldr r0, [r0] @@ -870618,17 +870618,17 @@ _081C2B80: movs r1, 0x80 lsls r1, 11 cmp r0, r1 - beq _081C2C06 + beq @081C2C06 movs r0, 0xE bl Window_WriteStandardTileMap - b _081C2C06 + b @081C2C06 .align 2, 0 .pool -_081C2BBC: +@081C2BBC: movs r0, 0x5 bl Window_WriteStandardTileMap - b _081C2C06 -_081C2BC4: + b @081C2C06 +@081C2BC4: movs r0, 0x3 bl Window_WriteStandardTileMap ldr r0, =0x0203cf1c @@ -870637,7 +870637,7 @@ _081C2BC4: adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x3 - bne _081C2C00 + bne @081C2C00 adds r2, 0x8 adds r0, r1, r2 ldr r0, [r0] @@ -870646,19 +870646,19 @@ _081C2BC4: movs r1, 0x80 lsls r1, 11 cmp r0, r1 - beq _081C2C06 + beq @081C2C06 movs r0, 0xF bl Window_WriteStandardTileMap - b _081C2C06 + b @081C2C06 .align 2, 0 .pool -_081C2C00: +@081C2C00: movs r0, 0x5 bl Window_WriteStandardTileMap -_081C2C06: +@081C2C06: movs r4, 0 ldr r5, =0x0203cf1c -_081C2C0A: +@081C2C0A: ldr r0, [r5] ldr r1, =0x000040cb adds r0, r1 @@ -870669,7 +870669,7 @@ _081C2C0A: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bls _081C2C0A + bls @081C2C0A movs r0, 0 bl schedule_bg_copy_tilemap_to_vram pop {r4,r5} @@ -870680,60 +870680,60 @@ _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 adds r1, r0, 0 cmp r0, 0x1 - beq _081C2C84 + beq @081C2C84 cmp r0, 0x1 - bgt _081C2C4E + bgt @081C2C4E cmp r0, 0 - beq _081C2C58 - b _081C2D0E -_081C2C4E: + beq @081C2C58 + b @081C2D0E +@081C2C4E: cmp r1, 0x2 - beq _081C2C98 + beq @081C2C98 cmp r1, 0x3 - beq _081C2CD4 - b _081C2D0E -_081C2C58: + beq @081C2CD4 + b @081C2D0E +@081C2C58: movs r0, 0x4 bl Window_FillTileMap bl sub_81A6BF4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081C2C76 + beq @081C2C76 bl sub_81B9E94 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081C2C7C -_081C2C76: + bne @081C2C7C +@081C2C76: movs r0, 0x8 bl Window_FillTileMap -_081C2C7C: +@081C2C7C: movs r0, 0x9 bl Window_FillTileMap - b _081C2D0E -_081C2C84: + b @081C2D0E +@081C2C84: movs r0, 0xA bl Window_FillTileMap movs r0, 0xB bl Window_FillTileMap movs r0, 0xC bl Window_FillTileMap - b _081C2D0E -_081C2C98: + b @081C2D0E +@081C2C98: ldr r0, =0x0203cf1c ldr r1, [r0] ldr r2, =0x000040bc adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x3 - bne _081C2CCC + bne @081C2CCC adds r2, 0x8 adds r0, r1, r2 ldr r0, [r0] @@ -870742,24 +870742,24 @@ _081C2C98: movs r1, 0x80 lsls r1, 11 cmp r0, r1 - beq _081C2D0E + beq @081C2D0E movs r0, 0xE bl Window_FillTileMap - b _081C2D0E + b @081C2D0E .align 2, 0 .pool -_081C2CCC: +@081C2CCC: movs r0, 0x5 bl Window_FillTileMap - b _081C2D0E -_081C2CD4: + b @081C2D0E +@081C2CD4: ldr r0, =0x0203cf1c ldr r1, [r0] ldr r2, =0x000040bc adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x3 - bne _081C2D08 + bne @081C2D08 adds r2, 0x8 adds r0, r1, r2 ldr r0, [r0] @@ -870768,25 +870768,25 @@ _081C2CD4: movs r1, 0x80 lsls r1, 11 cmp r0, r1 - beq _081C2D0E + beq @081C2D0E movs r0, 0xF bl Window_FillTileMap - b _081C2D0E + b @081C2D0E .align 2, 0 .pool -_081C2D08: +@081C2D08: movs r0, 0x5 bl Window_FillTileMap -_081C2D0E: +@081C2D0E: movs r4, 0 -_081C2D10: +@081C2D10: adds r0, r4, 0 bl sub_81C2D68 adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bls _081C2D10 + bls @081C2D10 movs r0, 0 bl schedule_bg_copy_tilemap_to_vram pop {r4} @@ -870795,7 +870795,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 @@ -870807,7 +870807,7 @@ sub_81C2D2C: @ 81C2D2C adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0xFF - bne _081C2D56 + bne @081C2D56 lsls r0, r2, 3 adds r0, r3, r0 bl Window_AddFromTemplate @@ -870815,7 +870815,7 @@ sub_81C2D2C: @ 81C2D2C ldrb r0, [r4] movs r1, 0 bl Window_FastFillPixels -_081C2D56: +@081C2D56: ldrb r0, [r4] pop {r4} pop {r1} @@ -870825,7 +870825,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 @@ -870836,13 +870836,13 @@ sub_81C2D68: @ 81C2D68 adds r4, r1, r0 ldrb r0, [r4] cmp r0, 0xFF - beq _081C2D8C + beq @081C2D8C bl Window_FillTileMap ldrb r0, [r4] bl Window_Remove movs r0, 0xFF strb r0, [r4] -_081C2D8C: +@081C2D8C: pop {r4} pop {r0} bx r0 @@ -870851,12 +870851,12 @@ _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 movs r4, 0 -_081C2DA4: +@081C2DA4: ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040cb @@ -870864,15 +870864,15 @@ _081C2DA4: adds r1, r0, r4 ldrb r0, [r1] cmp r0, 0xFF - beq _081C2DBA + beq @081C2DBA movs r1, 0 bl Window_FastFillPixels -_081C2DBA: +@081C2DBA: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x7 - bls _081C2DA4 + bls @081C2DA4 ldr r0, =0x0861ce54 lsls r1, r5, 2 adds r1, r0 @@ -870886,7 +870886,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, =0x0861ce64 @@ -870902,35 +870902,35 @@ 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] adds r0, 0x74 ldrb r0, [r0] cmp r0, 0 - beq _081C2E24 + beq @081C2E24 bl sub_81C335C bl sub_81C33CC bl sub_81C3428 bl sub_81C349C - b _081C2E3C + b @081C2E3C .align 2, 0 .pool -_081C2E24: +@081C2E24: bl sub_81C2EC4 bl sub_81C2F5C bl sub_81C2FD8 bl sub_81C302C bl sub_81C307C bl sub_81C3194 -_081C2E3C: +@081C2E3C: pop {r0} bx r0 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 @@ -870944,69 +870944,69 @@ sub_81C2E40: @ 81C2E40 lsls r0, 16 asrs r0, 16 cmp r0, 0x6 - bhi _081C2EB8 + bhi @081C2EB8 lsls r0, 2 - ldr r1, =_081C2E70 + ldr r1, =@081C2E70 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081C2E70: - .4byte _081C2E8C - .4byte _081C2E92 - .4byte _081C2E98 - .4byte _081C2E9E - .4byte _081C2EA4 - .4byte _081C2EAA - .4byte _081C2EB0 -_081C2E8C: +@081C2E70: + .4byte @081C2E8C + .4byte @081C2E92 + .4byte @081C2E98 + .4byte @081C2E9E + .4byte @081C2EA4 + .4byte @081C2EAA + .4byte @081C2EB0 +@081C2E8C: bl sub_81C2EC4 - b _081C2EB8 -_081C2E92: + b @081C2EB8 +@081C2E92: bl sub_81C2F5C - b _081C2EB8 -_081C2E98: + b @081C2EB8 +@081C2E98: bl sub_81C2FD8 - b _081C2EB8 -_081C2E9E: + b @081C2EB8 +@081C2E9E: bl sub_81C302C - b _081C2EB8 -_081C2EA4: + b @081C2EB8 +@081C2EA4: bl sub_81C307C - b _081C2EB8 -_081C2EAA: + b @081C2EB8 +@081C2EAA: bl sub_81C3194 - b _081C2EB8 -_081C2EB0: + b @081C2EB8 +@081C2EB0: adds r0, r2, 0 bl remove_task - b _081C2EBE -_081C2EB8: + b @081C2EBE +@081C2EB8: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -_081C2EBE: +@081C2EBE: pop {r4} pop {r0} bx r0 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 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081C2F54 + beq @081C2F54 bl sub_81B9E94 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081C2F54 + beq @081C2F54 ldr r0, =0x0861cccc movs r1, 0 bl sub_81C2D2C @@ -871033,7 +871033,7 @@ sub_81C2EC4: @ 81C2EC4 adds r0, 0xA2 ldrb r0, [r0] cmp r0, 0 - bne _081C2F40 + bne @081C2F40 adds r1, 0xA6 lsls r2, 24 lsrs r2, 24 @@ -871043,10 +871043,10 @@ sub_81C2EC4: @ 81C2EC4 adds r0, r5, 0 movs r3, 0x1 bl sub_81C25A4 - b _081C2F54 + b @081C2F54 .align 2, 0 .pool -_081C2F40: +@081C2F40: adds r1, 0xA6 lsls r2, 24 lsrs r2, 24 @@ -871056,7 +871056,7 @@ _081C2F40: adds r0, r5, 0 movs r3, 0x1 bl sub_81C25A4 -_081C2F54: +@081C2F54: add sp, 0x8 pop {r4-r6} pop {r0} @@ -871064,19 +871064,19 @@ _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 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081C2FC0 + beq @081C2FC0 bl sub_81B9E94 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081C2FC0 + beq @081C2FC0 ldr r5, =0x02021cc4 ldr r1, =0x085e8d59 adds r0, r5, 0 @@ -871108,7 +871108,7 @@ sub_81C2F5C: @ 81C2F5C adds r2, r4, 0 movs r3, 0x1 bl sub_81C25A4 -_081C2FC0: +@081C2FC0: add sp, 0x8 pop {r4,r5} pop {r0} @@ -871118,7 +871118,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 @@ -871157,7 +871157,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 @@ -871194,7 +871194,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] @@ -871212,25 +871212,25 @@ sub_81C307C: @ 81C307C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081C30C2 + beq @081C30C2 bl sub_81B9E94 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081C30C2 + beq @081C30C2 bl sub_81C3304 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081C30E0 -_081C30C2: + bne @081C30E0 +@081C30C2: ldr r0, =0x02021fc4 ldr r1, =0x085ea5db bl sub_81AFC28 - b _081C3182 + b @081C3182 .align 2, 0 .pool -_081C30E0: +@081C30E0: movs r0, 0x20 bl malloc adds r6, r0, 0 @@ -871241,68 +871241,68 @@ _081C30E0: bl sub_81C31F0 ldrb r0, [r4, 0x9] cmp r0, 0xD4 - bhi _081C310C + bhi @081C310C adds r1, r0, 0 adds r0, r5, 0 bl sub_8124610 movs r0, 0x4 adds r1, r5, 0 bl sub_81AFC0C -_081C310C: +@081C310C: bl sub_81C3220 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081C3148 + bne @081C3148 ldrb r0, [r4, 0xA] cmp r0, 0 - bne _081C3134 + bne @081C3134 ldrb r0, [r4, 0x9] ldr r1, =0x085ea516 cmp r0, 0xD4 - bls _081C3170 + bls @081C3170 ldr r1, =0x085ea617 - b _081C3170 + b @081C3170 .align 2, 0 .pool -_081C3134: +@081C3134: ldrb r0, [r4, 0x9] ldr r1, =0x085ea4ec cmp r0, 0xD4 - bls _081C3170 + bls @081C3170 ldr r1, =0x085ea5eb - b _081C3170 + b @081C3170 .align 2, 0 .pool -_081C3148: +@081C3148: ldrb r0, [r4, 0x9] cmp r0, 0xFF - bne _081C3158 + bne @081C3158 ldr r1, =0x085ea56a - b _081C3170 + b @081C3170 .align 2, 0 .pool -_081C3158: +@081C3158: cmp r0, 0xFE - beq _081C316E + beq @081C316E bl sub_81C32BC lsls r0, 24 cmp r0, 0 - beq _081C316E + beq @081C316E ldrb r0, [r4, 0x9] ldr r1, =0x085ea5a8 cmp r0, 0xD4 - bls _081C3170 -_081C316E: + bls @081C3170 +@081C316E: ldr r1, =0x085ea544 -_081C3170: +@081C3170: ldr r0, =0x02021fc4 bl sub_81AFC28 adds r0, r6, 0 bl free adds r0, r5, 0 bl free -_081C3182: +@081C3182: pop {r4-r6} pop {r0} bx r0 @@ -871311,7 +871311,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, =0x0861cccc @@ -871333,7 +871333,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] @@ -871355,7 +871355,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 @@ -871363,9 +871363,9 @@ sub_81C31F0: @ 81C31F0 adds r0, 0x7A ldrb r1, [r0] cmp r1, 0 - bne _081C3202 + bne @081C3202 movs r1, 0x5 -_081C3202: +@081C3202: adds r0, r4, 0 movs r2, 0 movs r3, 0x3 @@ -871381,7 +871381,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] @@ -871390,7 +871390,7 @@ sub_81C3220: @ 81C3220 ldr r1, [r0] ldr r0, =0x02024744 cmp r1, r0 - bne _081C326C + bne @081C326C bl link_get_multiplayer_id movs r1, 0x1 eors r0, r1 @@ -871409,10 +871409,10 @@ sub_81C3220: @ 81C3220 adds r2, 0x8 adds r1, r2 bl gf_strcpy - b _081C3282 + b @081C3282 .align 2, 0 .pool -_081C326C: +@081C326C: bl sub_80F0020 adds r4, r0, 0 ldr r0, =0x0000ffff @@ -871422,38 +871422,38 @@ _081C326C: ldrb r5, [r1, 0x8] ldr r0, =0x02021cc4 bl gf_strcpy -_081C3282: +@081C3282: adds r0, r6, 0 adds r0, 0x32 ldrb r0, [r0] cmp r5, r0 - bne _081C32A4 + bne @081C32A4 ldr r0, [r6, 0x48] ldr r1, =0x0000ffff ands r0, r1 cmp r4, r0 - bne _081C32A4 + bne @081C32A4 ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x36 bl sub_80092BC cmp r0, 0 - beq _081C32B4 -_081C32A4: + beq @081C32B4 +@081C32A4: movs r0, 0 - b _081C32B6 + b @081C32B6 .align 2, 0 .pool -_081C32B4: +@081C32B4: movs r0, 0x1 -_081C32B6: +@081C32B6: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_81C3220 thumb_func_start sub_81C32BC -sub_81C32BC: @ 81C32BC +sub_81C32BC: ; 81C32BC push {lr} ldr r0, =0x0203cf1c ldr r0, [r0] @@ -871463,20 +871463,20 @@ sub_81C32BC: @ 81C32BC lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bls _081C32D8 + bls @081C32D8 movs r0, 0 - b _081C32DA + b @081C32DA .align 2, 0 .pool -_081C32D8: +@081C32D8: movs r0, 0x1 -_081C32DA: +@081C32DA: pop {r1} bx r1 thumb_func_end sub_81C32BC thumb_func_start sub_81C32E0 -sub_81C32E0: @ 81C32E0 +sub_81C32E0: ; 81C32E0 push {lr} ldr r0, =0x0203cf1c ldr r0, [r0] @@ -871486,20 +871486,20 @@ sub_81C32E0: @ 81C32E0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bls _081C32FC + bls @081C32FC movs r0, 0 - b _081C32FE + b @081C32FE .align 2, 0 .pool -_081C32FC: +@081C32FC: movs r0, 0x1 -_081C32FE: +@081C32FE: pop {r1} bx r1 thumb_func_end sub_81C32E0 thumb_func_start sub_81C3304 -sub_81C3304: @ 81C3304 +sub_81C3304: ; 81C3304 push {lr} ldr r0, =0x02022fec ldr r0, [r0] @@ -871507,7 +871507,7 @@ sub_81C3304: @ 81C3304 lsls r1, 15 ands r0, r1 cmp r0, 0 - beq _081C3354 + beq @081C3354 ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -871515,32 +871515,32 @@ sub_81C3304: @ 81C3304 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081C3354 + beq @081C3354 ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040be adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - beq _081C333A + beq @081C333A cmp r0, 0x4 - beq _081C333A + beq @081C333A cmp r0, 0x5 - bne _081C3354 -_081C333A: + bne @081C3354 +@081C333A: movs r0, 0x1 - b _081C3356 + b @081C3356 .align 2, 0 .pool -_081C3354: +@081C3354: movs r0, 0 -_081C3356: +@081C3356: pop {r1} bx r1 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 @@ -871591,7 +871591,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 @@ -871630,7 +871630,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 @@ -871640,32 +871640,32 @@ sub_81C3428: @ 81C3428 adds r0, 0xA5 ldrb r0, [r0] cmp r0, 0x1 - bne _081C3448 + bne @081C3448 ldr r4, =0x085ea40b - b _081C346C + b @081C346C .align 2, 0 .pool -_081C3448: +@081C3448: ldrh r0, [r1, 0x30] cmp r0, 0x5 - bhi _081C3458 + bhi @081C3458 ldr r4, =0x085ea4a2 - b _081C346C + b @081C346C .align 2, 0 .pool -_081C3458: +@081C3458: cmp r0, 0xA - bhi _081C3464 + bhi @081C3464 ldr r4, =0x085ea475 - b _081C346C + b @081C346C .align 2, 0 .pool -_081C3464: +@081C3464: ldr r4, =0x085ea40b cmp r0, 0x28 - bhi _081C346C + bhi @081C346C ldr r4, =0x085ea442 -_081C346C: +@081C346C: ldr r0, =0x0861cccc movs r1, 0x2 bl sub_81C2D2C @@ -871687,7 +871687,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 @@ -871697,45 +871697,45 @@ sub_81C349C: @ 81C349C adds r0, 0xA5 ldrb r0, [r0] cmp r0, 0x1 - beq _081C3500 + beq @081C3500 ldrb r0, [r4, 0x9] cmp r0, 0xFF - bne _081C34C4 + bne @081C34C4 ldr r4, =0x085ea678 - b _081C3502 + b @081C3502 .align 2, 0 .pool -_081C34C4: +@081C34C4: bl sub_81C32BC lsls r0, 24 cmp r0, 0 - beq _081C34D8 + beq @081C34D8 bl sub_81C3220 lsls r0, 24 cmp r0, 0 - bne _081C34E0 -_081C34D8: + bne @081C34E0 +@081C34D8: ldr r4, =0x085ea6ab - b _081C3502 + b @081C3502 .align 2, 0 .pool -_081C34E0: +@081C34E0: ldrb r0, [r4, 0x9] cmp r0, 0xFD - bne _081C3500 + bne @081C3500 bl sub_81C32E0 lsls r0, 24 lsrs r0, 24 ldr r4, =0x085ea702 cmp r0, 0x1 - bne _081C3502 + bne @081C3502 ldr r4, =0x085ea6d7 - b _081C3502 + b @081C3502 .align 2, 0 .pool -_081C3500: +@081C3500: ldr r4, =0x085ea647 -_081C3502: +@081C3502: ldr r0, =0x0861cccc movs r1, 0x3 bl sub_81C2D2C @@ -871757,7 +871757,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 @@ -871771,7 +871771,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 @@ -871785,61 +871785,61 @@ sub_81C3554: @ 81C3554 lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - bhi _081C35D6 + bhi @081C35D6 lsls r0, 2 - ldr r1, =_081C3584 + ldr r1, =@081C3584 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081C3584: - .4byte _081C35A4 - .4byte _081C35AA - .4byte _081C35B0 - .4byte _081C35B6 - .4byte _081C35BC - .4byte _081C35C2 - .4byte _081C35C8 - .4byte _081C35CE -_081C35A4: +@081C3584: + .4byte @081C35A4 + .4byte @081C35AA + .4byte @081C35B0 + .4byte @081C35B6 + .4byte @081C35BC + .4byte @081C35C2 + .4byte @081C35C8 + .4byte @081C35CE +@081C35A4: bl sub_81C35E4 - b _081C35D6 -_081C35AA: + b @081C35D6 +@081C35AA: bl sub_81C3690 - b _081C35D6 -_081C35B0: + b @081C35D6 +@081C35B0: bl sub_81C3710 - b _081C35D6 -_081C35B6: + b @081C35D6 +@081C35B6: bl sub_81C37D8 - b _081C35D6 -_081C35BC: + b @081C35D6 +@081C35BC: bl sub_81C3808 - b _081C35D6 -_081C35C2: + b @081C35D6 +@081C35C2: bl sub_81C3890 - b _081C35D6 -_081C35C8: + b @081C35D6 +@081C35C8: bl sub_81C38C0 - b _081C35D6 -_081C35CE: + b @081C35D6 +@081C35CE: adds r0, r2, 0 bl remove_task - b _081C35DC -_081C35D6: + b @081C35DC +@081C35D6: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -_081C35DC: +@081C35DC: pop {r4} pop {r0} bx r0 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 @@ -871847,48 +871847,48 @@ sub_81C35E4: @ 81C35E4 adds r0, 0x9E ldrh r0, [r0] cmp r0, 0xAF - bne _081C3628 + bne @081C3628 bl sub_81B1250 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081C3628 + bne @081C3628 ldr r0, [r4] ldr r1, =0x000040be adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - beq _081C3614 + beq @081C3614 cmp r0, 0x4 - beq _081C3614 + beq @081C3614 cmp r0, 0x5 - bne _081C3628 -_081C3614: + bne @081C3628 +@081C3614: movs r0, 0xAF bl itemid_get_item adds r5, r0, 0 - b _081C3650 + b @081C3650 .align 2, 0 .pool -_081C3628: +@081C3628: ldr r0, =0x0203cf1c ldr r0, [r0] adds r1, r0, 0 adds r1, 0x9E ldrh r0, [r1] cmp r0, 0 - bne _081C3644 + bne @081C3644 ldr r5, =0x085e8d26 - b _081C3650 + b @081C3650 .align 2, 0 .pool -_081C3644: +@081C3644: ldrh r0, [r1] ldr r4, =0x02021cc4 adds r1, r4, 0 bl itemid_get_name adds r5, r4, 0 -_081C3650: +@081C3650: movs r0, 0x1 adds r1, r5, 0 movs r2, 0x48 @@ -871918,7 +871918,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 @@ -871927,12 +871927,12 @@ sub_81C3690: @ 81C3690 adds r1, 0x76 ldrb r0, [r1] cmp r0, 0 - bne _081C36B0 + bne @081C36B0 ldr r5, =0x085e8d26 - b _081C36C8 + b @081C36C8 .align 2, 0 .pool -_081C36B0: +@081C36B0: ldr r0, =0x02021cc4 ldrb r1, [r1] movs r2, 0x1 @@ -871943,7 +871943,7 @@ _081C36B0: adds r0, r4, 0 bl ExpandTextCodes adds r5, r4, 0 -_081C36C8: +@081C36C8: movs r0, 0x1 adds r1, r5, 0 movs r2, 0x46 @@ -871973,7 +871973,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 @@ -872054,7 +872054,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, =0x0861ccec @@ -872077,7 +872077,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} @@ -872130,7 +872130,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, =0x0861ccec @@ -872153,7 +872153,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 @@ -872187,7 +872187,7 @@ sub_81C38C0: @ 81C38C0 bl sub_81C25A4 ldrb r0, [r5, 0x5] cmp r0, 0x63 - bhi _081C3948 + bhi @081C3948 ldr r4, =0x0831f72c adds r1, r0, 0 adds r1, 0x1 @@ -872207,12 +872207,12 @@ sub_81C38C0: @ 81C38C0 ldr r1, [r1] ldr r0, [r5, 0x10] subs r1, r0 - b _081C394A + b @081C394A .align 2, 0 .pool -_081C3948: +@081C3948: movs r1, 0 -_081C394A: +@081C394A: ldr r4, =0x02021cc4 adds r0, r4, 0 movs r2, 0x1 @@ -872241,7 +872241,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 @@ -872257,38 +872257,38 @@ sub_81C3984: @ 81C3984 adds r0, r1 ldrb r0, [r0] cmp r0, 0x3 - bne _081C39EA + bne @081C39EA bl sub_81C3F44 ldr r1, [r4] ldr r0, =0x000040c6 adds r2, r1, r0 ldrb r0, [r2] cmp r0, 0x4 - bne _081C39DC + bne @081C39DC ldr r0, =0x000040c4 adds r1, r0 ldrh r0, [r1] cmp r0, 0 - beq _081C39EA + beq @081C39EA bl sub_81C3E9C - b _081C39EA + b @081C39EA .align 2, 0 .pool -_081C39DC: +@081C39DC: ldrb r0, [r2] lsls r0, 1 adds r1, 0x84 adds r1, r0 ldrh r0, [r1] bl sub_81C3E9C -_081C39EA: +@081C39EA: pop {r4} pop {r0} bx r0 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 @@ -872302,88 +872302,88 @@ sub_81C39F0: @ 81C39F0 lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - bhi _081C3AFC + bhi @081C3AFC lsls r0, 2 - ldr r1, =_081C3A20 + ldr r1, =@081C3A20 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081C3A20: - .4byte _081C3A40 - .4byte _081C3A48 - .4byte _081C3A50 - .4byte _081C3A58 - .4byte _081C3A60 - .4byte _081C3A7C - .4byte _081C3ABE - .4byte _081C3AF4 -_081C3A40: +@081C3A20: + .4byte @081C3A40 + .4byte @081C3A48 + .4byte @081C3A50 + .4byte @081C3A58 + .4byte @081C3A60 + .4byte @081C3A7C + .4byte @081C3ABE + .4byte @081C3AF4 +@081C3A40: movs r0, 0 bl sub_81C3B08 - b _081C3AFC -_081C3A48: + b @081C3AFC +@081C3A48: movs r0, 0x1 bl sub_81C3B08 - b _081C3AFC -_081C3A50: + b @081C3AFC +@081C3A50: movs r0, 0x2 bl sub_81C3B08 - b _081C3AFC -_081C3A58: + b @081C3AFC +@081C3A58: movs r0, 0x3 bl sub_81C3B08 - b _081C3AFC -_081C3A60: + b @081C3AFC +@081C3A60: ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040bc adds r0, r1 ldrb r0, [r0] cmp r0, 0x3 - bne _081C3AFC + bne @081C3AFC bl sub_81C3F44 - b _081C3AFC + b @081C3AFC .align 2, 0 .pool -_081C3A7C: +@081C3A7C: ldr r0, =0x0203cf1c ldr r1, [r0] ldr r2, =0x000040bc adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x3 - bne _081C3AFC + bne @081C3AFC ldr r0, =0x000040c6 adds r2, r1, r0 ldrb r0, [r2] cmp r0, 0x4 - bne _081C3AB0 + bne @081C3AB0 ldr r2, =0x000040c4 adds r0, r1, r2 ldrh r0, [r0] strh r0, [r4, 0x2] - b _081C3AFC + b @081C3AFC .align 2, 0 .pool -_081C3AB0: +@081C3AB0: ldrb r0, [r2] lsls r0, 1 adds r1, 0x84 adds r1, r0 ldrh r0, [r1] strh r0, [r4, 0x2] - b _081C3AFC -_081C3ABE: + b @081C3AFC +@081C3ABE: ldr r0, =0x0203cf1c ldr r1, [r0] ldr r2, =0x000040bc adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x3 - bne _081C3AFC + bne @081C3AFC adds r2, 0x8 adds r0, r1, r2 ldr r0, [r0] @@ -872392,28 +872392,28 @@ _081C3ABE: movs r1, 0x80 lsls r1, 11 cmp r0, r1 - beq _081C3AFC + beq @081C3AFC ldrh r0, [r4, 0x2] bl sub_81C3E9C - b _081C3AFC + b @081C3AFC .align 2, 0 .pool -_081C3AF4: +@081C3AF4: adds r0, r2, 0 bl remove_task - b _081C3B02 -_081C3AFC: + b @081C3B02 +@081C3AFC: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -_081C3B02: +@081C3B02: pop {r4} pop {r0} bx r0 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 @@ -872444,7 +872444,7 @@ sub_81C3B08: @ 81C3B08 adds r0, r1 ldrh r5, [r0] cmp r5, 0 - beq _081C3C00 + beq @081C3C00 mov r0, r10 adds r0, 0xA4 ldrb r1, [r0] @@ -872511,10 +872511,10 @@ sub_81C3B08: @ 81C3B08 movs r2, 0x2C bl sub_81DB368 mov r4, r9 - b _081C3C26 + b @081C3C26 .align 2, 0 .pool -_081C3C00: +@081C3C00: ldr r1, =0x085e8d40 lsls r4, r7, 4 adds r3, r4, 0x1 @@ -872532,7 +872532,7 @@ _081C3C00: adds r1, r7, 0 movs r2, 0x2C bl sub_81DB35C -_081C3C26: +@081C3C26: lsls r2, r0, 24 lsrs r2, 24 adds r3, r4, 0x1 @@ -872559,13 +872559,13 @@ _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 lsrs r5, r0, 16 cmp r5, 0 - beq _081C3CFC + beq @081C3CFC movs r0, 0x13 str r0, [sp] movs r0, 0x20 @@ -872583,12 +872583,12 @@ sub_81C3C5C: @ 81C3C5C ldrb r0, [r2, 0x1] adds r6, r1, 0 cmp r0, 0x1 - bhi _081C3C9C + bhi @081C3C9C ldr r1, =0x085e8d45 - b _081C3CAC + b @081C3CAC .align 2, 0 .pool -_081C3C9C: +@081C3C9C: ldr r4, =0x02021cc4 ldrb r1, [r2, 0x1] adds r0, r4, 0 @@ -872596,7 +872596,7 @@ _081C3C9C: movs r3, 0x3 bl decimal_int_to_string adds r1, r4, 0 -_081C3CAC: +@081C3CAC: movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -872610,12 +872610,12 @@ _081C3CAC: adds r1, r0, r1 ldrb r0, [r1, 0x3] cmp r0, 0 - bne _081C3CDC + bne @081C3CDC ldr r1, =0x085e8d45 - b _081C3CEC + b @081C3CEC .align 2, 0 .pool -_081C3CDC: +@081C3CDC: ldr r4, =0x02021cc4 ldrb r1, [r1, 0x3] adds r0, r4, 0 @@ -872623,7 +872623,7 @@ _081C3CDC: movs r3, 0x3 bl decimal_int_to_string adds r1, r4, 0 -_081C3CEC: +@081C3CEC: movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -872631,7 +872631,7 @@ _081C3CEC: movs r2, 0x35 movs r3, 0x11 bl sub_81C25A4 -_081C3CFC: +@081C3CFC: add sp, 0x8 pop {r4-r6} pop {r0} @@ -872641,7 +872641,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 @@ -872657,14 +872657,14 @@ sub_81C3D08: @ 81C3D08 adds r0, r1 ldrb r0, [r0] cmp r0, 0x3 - bne _081C3D40 + bne @081C3D40 bl sub_81C3F44 ldr r0, [r4] ldr r1, =0x000040c6 adds r0, r1 ldrb r0, [r0] bl sub_81C3E2C -_081C3D40: +@081C3D40: pop {r4} pop {r0} bx r0 @@ -872673,7 +872673,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 @@ -872687,59 +872687,59 @@ sub_81C3D54: @ 81C3D54 lsls r0, 16 asrs r0, 16 cmp r0, 0x6 - bhi _081C3E20 + bhi @081C3E20 lsls r0, 2 - ldr r1, =_081C3D84 + ldr r1, =@081C3D84 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081C3D84: - .4byte _081C3DA0 - .4byte _081C3DA8 - .4byte _081C3DB0 - .4byte _081C3DB8 - .4byte _081C3DC0 - .4byte _081C3DDC - .4byte _081C3E18 -_081C3DA0: +@081C3D84: + .4byte @081C3DA0 + .4byte @081C3DA8 + .4byte @081C3DB0 + .4byte @081C3DB8 + .4byte @081C3DC0 + .4byte @081C3DDC + .4byte @081C3E18 +@081C3DA0: movs r0, 0 bl sub_81C3B08 - b _081C3E20 -_081C3DA8: + b @081C3E20 +@081C3DA8: movs r0, 0x1 bl sub_81C3B08 - b _081C3E20 -_081C3DB0: + b @081C3E20 +@081C3DB0: movs r0, 0x2 bl sub_81C3B08 - b _081C3E20 -_081C3DB8: + b @081C3E20 +@081C3DB8: movs r0, 0x3 bl sub_81C3B08 - b _081C3E20 -_081C3DC0: + b @081C3E20 +@081C3DC0: ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040bc adds r0, r1 ldrb r0, [r0] cmp r0, 0x3 - bne _081C3E20 + bne @081C3E20 bl sub_81C3F44 - b _081C3E20 + b @081C3E20 .align 2, 0 .pool -_081C3DDC: +@081C3DDC: ldr r0, =0x0203cf1c ldr r2, [r0] ldr r1, =0x000040bc adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x3 - bne _081C3E20 + bne @081C3E20 adds r1, 0x8 adds r0, r2, r1 ldr r0, [r0] @@ -872748,52 +872748,52 @@ _081C3DDC: movs r1, 0x80 lsls r1, 11 cmp r0, r1 - beq _081C3E20 + beq @081C3E20 ldr r1, =0x000040c6 adds r0, r2, r1 ldrb r0, [r0] bl sub_81C3E2C - b _081C3E20 + b @081C3E20 .align 2, 0 .pool -_081C3E18: +@081C3E18: adds r0, r2, 0 bl remove_task - b _081C3E26 -_081C3E20: + b @081C3E26 +@081C3E20: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -_081C3E26: +@081C3E26: pop {r4} pop {r0} bx r0 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 lsrs r1, r0, 24 cmp r1, 0x4 - bne _081C3E48 + bne @081C3E48 ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040c4 - b _081C3E50 + b @081C3E50 .align 2, 0 .pool -_081C3E48: +@081C3E48: ldr r0, =0x0203cf1c ldr r0, [r0] lsls r1, 1 adds r0, 0x84 -_081C3E50: +@081C3E50: adds r0, r1 ldrh r4, [r0] cmp r4, 0 - beq _081C3E82 + beq @081C3E82 ldr r0, =0x0861cd14 movs r1, 0x2 bl sub_81C2D2C @@ -872813,7 +872813,7 @@ _081C3E50: movs r2, 0x6 movs r3, 0x1 bl sub_81C25A4 -_081C3E82: +@081C3E82: add sp, 0x8 pop {r4} pop {r0} @@ -872823,7 +872823,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 @@ -872838,14 +872838,14 @@ sub_81C3E9C: @ 81C3E9C movs r1, 0 bl Window_FastFillPixels cmp r4, 0 - beq _081C3F30 + beq @081C3F30 ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040c0 adds r0, r1 ldrb r0, [r0] cmp r0, 0x2 - bne _081C3F00 + bne @081C3F00 adds r0, r4, 0 bl sub_81C3C5C ldr r1, =0x0861c524 @@ -872860,10 +872860,10 @@ sub_81C3E9C: @ 81C3E9C movs r2, 0x6 movs r3, 0x1 bl sub_81C25A4 - b _081C3F20 + b @081C3F20 .align 2, 0 .pool -_081C3F00: +@081C3F00: ldr r2, =0x08587c50 ldr r1, =0x0858c2b4 lsls r0, r6, 3 @@ -872879,16 +872879,16 @@ _081C3F00: movs r2, 0x6 movs r3, 0x1 bl sub_81C25A4 -_081C3F20: +@081C3F20: adds r0, r5, 0 bl Window_WriteStandardTileMap - b _081C3F36 + b @081C3F36 .align 2, 0 .pool -_081C3F30: +@081C3F30: adds r0, r5, 0 bl Window_FillTileMap -_081C3F36: +@081C3F36: movs r0, 0 bl schedule_bg_copy_tilemap_to_vram add sp, 0x8 @@ -872898,7 +872898,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} @@ -872922,7 +872922,7 @@ sub_81C3F44: @ 81C3F44 adds r0, r1, r2 ldrh r2, [r0] cmp r2, 0 - bne _081C3F9C + bne @081C3F9C ldr r1, =0x085e8cf0 str r2, [sp] movs r0, 0x1 @@ -872931,16 +872931,16 @@ sub_81C3F44: @ 81C3F44 movs r2, 0 movs r3, 0x41 bl sub_81C25A4 - b _081C4044 + b @081C4044 .align 2, 0 .pool -_081C3F9C: +@081C3F9C: ldrh r5, [r0] ldr r2, =0x000040c0 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x2 - bne _081C3FD0 + bne @081C3FD0 movs r0, 0xD adds r1, r5, 0 muls r1, r0 @@ -872954,10 +872954,10 @@ _081C3F9C: movs r2, 0 movs r3, 0x41 bl sub_81C25A4 - b _081C3FEC + b @081C3FEC .align 2, 0 .pool -_081C3FD0: +@081C3FD0: movs r0, 0xD adds r1, r5, 0 muls r1, r0 @@ -872971,7 +872971,7 @@ _081C3FD0: movs r2, 0 movs r3, 0x41 bl sub_81C25A4 -_081C3FEC: +@081C3FEC: ldr r4, =0x02021cc4 ldr r1, =0x0831c898 lsls r0, r5, 1 @@ -873009,7 +873009,7 @@ _081C3FEC: adds r1, r4, 0 movs r3, 0x41 bl sub_81C25A4 -_081C4044: +@081C4044: add sp, 0x8 pop {r3} mov r8, r3 @@ -873021,7 +873021,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, =0x0861cd14 @@ -873051,7 +873051,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 @@ -873137,7 +873137,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, =0x0861cd14 @@ -873166,13 +873166,13 @@ 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 ldr r4, =0x000040d3 movs r3, 0xFF -_081C419A: +@081C419A: ldr r0, [r5] adds r0, r4 adds r0, r2 @@ -873183,7 +873183,7 @@ _081C419A: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x1B - bls _081C419A + bls @081C419A pop {r4,r5} pop {r0} bx r0 @@ -873192,7 +873192,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 @@ -873203,7 +873203,7 @@ sub_81C41C0: @ 81C41C0 adds r1, r0, r4 ldrb r0, [r1] cmp r0, 0xFF - beq _081C41F2 + beq @081C41F2 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -873217,7 +873217,7 @@ sub_81C41C0: @ 81C41C0 adds r0, r4 movs r1, 0xFF strb r1, [r0] -_081C41F2: +@081C41F2: pop {r4,r5} pop {r0} bx r0 @@ -873226,7 +873226,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 @@ -873261,10 +873261,10 @@ 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: +@081C4250: ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040d3 @@ -873272,16 +873272,16 @@ _081C4250: adds r0, r4 ldrb r0, [r0] cmp r0, 0xFF - beq _081C4268 + beq @081C4268 adds r0, r4, 0 movs r1, 0x1 bl sub_81C4204 -_081C4268: +@081C4268: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1B - bls _081C4250 + bls @081C4250 pop {r4} pop {r0} bx r0 @@ -873290,7 +873290,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] @@ -873298,46 +873298,46 @@ sub_81C4280: @ 81C4280 adds r0, r1 ldrb r0, [r0] cmp r0, 0x2 - beq _081C42B0 + beq @081C42B0 cmp r0, 0x2 - bgt _081C42A4 + bgt @081C42A4 cmp r0, 0 - beq _081C42AA - b _081C42C2 + beq @081C42AA + b @081C42C2 .align 2, 0 .pool -_081C42A4: +@081C42A4: cmp r0, 0x3 - beq _081C42BA - b _081C42C2 -_081C42AA: + beq @081C42BA + b @081C42C2 +@081C42AA: bl sub_81C43A0 - b _081C42C2 -_081C42B0: + b @081C42C2 +@081C42B0: bl sub_81C4420 bl sub_81C44F0 - b _081C42C2 -_081C42BA: + b @081C42C2 +@081C42BA: bl sub_81C4484 bl sub_81C44F0 -_081C42C2: +@081C42C2: pop {r0} bx r0 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 -_081C42CE: +@081C42CE: ldr r0, [r5] ldr r1, =0x000040d3 adds r0, r1 adds r0, r4 ldrb r0, [r0] cmp r0, 0xFF - bne _081C42F2 + bne @081C42F2 ldr r0, =0x0861cfc4 movs r1, 0 movs r2, 0 @@ -873348,7 +873348,7 @@ _081C42CE: adds r1, r2 adds r1, r4 strb r0, [r1] -_081C42F2: +@081C42F2: adds r0, r4, 0 movs r1, 0x1 bl sub_81C4204 @@ -873356,7 +873356,7 @@ _081C42F2: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bls _081C42CE + bls @081C42CE pop {r4,r5} pop {r0} bx r0 @@ -873365,7 +873365,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} @@ -873428,7 +873428,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] @@ -873436,7 +873436,7 @@ sub_81C43A0: @ 81C43A0 adds r5, 0x70 ldrb r0, [r5, 0x4] cmp r0, 0 - beq _081C43CC + beq @081C43CC movs r0, 0x9 movs r1, 0x78 movs r2, 0x30 @@ -873445,10 +873445,10 @@ sub_81C43A0: @ 81C43A0 movs r0, 0x4 movs r1, 0x1 bl sub_81C4204 - b _081C4418 + b @081C4418 .align 2, 0 .pool -_081C43CC: +@081C43CC: ldr r4, =0x083203cc ldrh r1, [r5] lsls r0, r1, 3 @@ -873468,7 +873468,7 @@ _081C43CC: ldrb r0, [r1, 0x6] ldrb r2, [r1, 0x7] cmp r0, r2 - beq _081C4410 + beq @081C4410 ldrb r0, [r1, 0x7] movs r1, 0xA0 movs r2, 0x30 @@ -873477,21 +873477,21 @@ _081C43CC: movs r0, 0x4 movs r1, 0 bl sub_81C4204 - b _081C4418 + b @081C4418 .align 2, 0 .pool -_081C4410: +@081C4410: movs r0, 0x4 movs r1, 0x1 bl sub_81C4204 -_081C4418: +@081C4418: pop {r4,r5} pop {r0} bx r0 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] @@ -873499,14 +873499,14 @@ sub_81C4420: @ 81C4420 adds r5, 0x70 movs r4, 0 ldr r6, =0x0831c898 -_081C442E: +@081C442E: lsls r0, r4, 1 adds r1, r5, 0 adds r1, 0x14 adds r1, r0 ldrh r0, [r1] cmp r0, 0 - beq _081C4468 + beq @081C4468 adds r1, r0, 0 lsls r0, r1, 1 adds r0, r1 @@ -873523,42 +873523,42 @@ _081C442E: lsrs r3, 24 movs r1, 0x55 bl sub_81C4318 - b _081C4474 + b @081C4474 .align 2, 0 .pool -_081C4468: +@081C4468: adds r0, r4, 0x3 lsls r0, 24 lsrs r0, 24 movs r1, 0x1 bl sub_81C4204 -_081C4474: +@081C4474: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _081C442E + bls @081C442E pop {r4-r6} pop {r0} bx r0 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] adds r5, r0, 0 adds r5, 0x70 movs r4, 0 -_081C4490: +@081C4490: lsls r0, r4, 1 adds r1, r5, 0 adds r1, 0x14 adds r2, r1, r0 ldrh r0, [r2] cmp r0, 0 - beq _081C44D4 + beq @081C44D4 ldr r1, =0x0858c2b4 lsls r0, 3 adds r0, r1 @@ -873579,28 +873579,28 @@ _081C4490: lsrs r3, 24 movs r1, 0x55 bl sub_81C4318 - b _081C44E0 + b @081C44E0 .align 2, 0 .pool -_081C44D4: +@081C44D4: adds r0, r4, 0x3 lsls r0, 24 lsrs r0, 24 movs r1, 0x1 bl sub_81C4204 -_081C44E0: +@081C44E0: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _081C4490 + bls @081C4490 pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_81C4484 thumb_func_start sub_81C44F0 -sub_81C44F0: @ 81C44F0 +sub_81C44F0: ; 81C44F0 push {lr} ldr r0, =0x0203cf1c ldr r1, [r0] @@ -873608,19 +873608,19 @@ sub_81C44F0: @ 81C44F0 adds r3, r1, r0 ldrh r0, [r3] cmp r0, 0 - bne _081C4514 + bne @081C4514 movs r0, 0x7 movs r1, 0x1 bl sub_81C4204 - b _081C4560 + b @081C4560 .align 2, 0 .pool -_081C4514: +@081C4514: ldr r2, =0x000040c0 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x2 - bne _081C4540 + bne @081C4540 ldr r2, =0x0831c898 ldrh r1, [r3] lsls r0, r1, 1 @@ -873632,10 +873632,10 @@ _081C4514: movs r2, 0x60 movs r3, 0x7 bl sub_81C4318 - b _081C4560 + b @081C4560 .align 2, 0 .pool -_081C4540: +@081C4540: ldr r1, =0x0858c2b4 ldrh r0, [r3] lsls r0, 3 @@ -873651,7 +873651,7 @@ _081C4540: movs r2, 0x60 movs r3, 0x7 bl sub_81C4318 -_081C4560: +@081C4560: pop {r0} bx r0 .align 2, 0 @@ -873659,7 +873659,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 @@ -873728,7 +873728,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 @@ -873739,19 +873739,19 @@ sub_81C45F4: @ 81C45F4 movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 - beq _081C4620 + beq @081C4620 cmp r0, 0x1 - bne _081C4610 - b _081C4750 -_081C4610: + bne @081C4610 + b @081C4750 +@081C4610: adds r0, r3, 0 bl sub_81C47B4 lsls r0, 24 lsrs r0, 24 - b _081C4770 + b @081C4770 .align 2, 0 .pool -_081C4620: +@081C4620: ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -873759,7 +873759,7 @@ _081C4620: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081C4680 + beq @081C4680 ldr r1, =0x000040be adds r0, r2, r1 ldrb r1, [r0] @@ -873767,7 +873767,7 @@ _081C4620: bl sub_80688F8 lsls r0, 24 cmp r0, 0 - beq _081C4668 + beq @081C4668 ldrh r2, [r5, 0x2] lsls r0, r2, 3 ldr r1, =0x0830a18c @@ -873775,80 +873775,80 @@ _081C4620: ldr r1, =0x020244d4 ldr r1, [r1] ldr r1, [r1, 0x8] - b _081C46D6 + b @081C46D6 .align 2, 0 .pool -_081C4668: +@081C4668: ldrh r2, [r5, 0x2] lsls r0, r2, 3 ldr r1, =0x0830a18c adds r0, r1 ldr r1, =0x020244d4 ldr r1, [r1] - b _081C46B0 + b @081C46B0 .align 2, 0 .pool -_081C4680: +@081C4680: ldr r0, =0x020244d4 ldr r3, [r0] adds r4, r0, 0 cmp r3, 0 - beq _081C46E4 + beq @081C46E4 ldr r1, [r2] ldr r0, =0x020244ec cmp r1, r0 - beq _081C46A6 + beq @081C46A6 ldr r1, =0x000040bc adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x2 - beq _081C46A6 + beq @081C46A6 adds r1, 0x33 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _081C46CC -_081C46A6: + bne @081C46CC +@081C46A6: ldrh r2, [r5, 0x2] lsls r0, r2, 3 ldr r1, =0x0830a18c adds r0, r1 ldr r1, [r4] -_081C46B0: +@081C46B0: ldr r1, [r1, 0x8] ldr r3, [r5, 0xC] bl help_system_enable_unless_flashback__sp199 - b _081C4768 + b @081C4768 .align 2, 0 .pool -_081C46CC: +@081C46CC: ldrh r2, [r5, 0x2] lsls r0, r2, 3 ldr r1, =0x0830a18c adds r0, r1 ldr r1, [r3, 0x8] -_081C46D6: +@081C46D6: ldr r3, [r5, 0xC] bl sub_8034B50 - b _081C4768 + b @081C4768 .align 2, 0 .pool -_081C46E4: +@081C46E4: ldr r1, [r2] ldr r0, =0x020244ec cmp r1, r0 - beq _081C4700 + beq @081C4700 ldr r1, =0x000040bc adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x2 - beq _081C4700 + beq @081C4700 adds r1, 0x33 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _081C472C -_081C4700: + bne @081C472C +@081C4700: ldrh r4, [r5, 0x2] lsls r4, 3 ldr r0, =0x0830a18c @@ -873861,10 +873861,10 @@ _081C4700: ldr r3, [r5, 0xC] adds r0, r4, 0 bl help_system_enable_unless_flashback__sp199 - b _081C4768 + b @081C4768 .align 2, 0 .pool -_081C472C: +@081C472C: ldrh r4, [r5, 0x2] lsls r4, 3 ldr r0, =0x0830a18c @@ -873877,10 +873877,10 @@ _081C472C: ldr r3, [r5, 0xC] adds r0, r4, 0 bl sub_8034B50 - b _081C4768 + b @081C4768 .align 2, 0 .pool -_081C4750: +@081C4750: ldrh r0, [r5, 0x2] ldr r1, [r5, 0x48] ldr r2, [r5, 0xC] @@ -873890,19 +873890,19 @@ _081C4750: ldrh r0, [r4, 0x4] movs r1, 0x1 bl sub_806A068 -_081C4768: +@081C4768: ldrh r0, [r6] adds r0, 0x1 strh r0, [r6] movs r0, 0xFF -_081C4770: +@081C4770: pop {r4-r6} pop {r1} bx r1 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] @@ -873910,32 +873910,32 @@ sub_81C4778: @ 81C4778 adds r4, 0x70 ldrb r0, [r4, 0x4] cmp r0, 0 - bne _081C47AE + bne @081C47AE adds r0, r1, 0 adds r0, 0xC bl sub_805F110 cmp r0, 0x1 - bne _081C47A4 + bne @081C47A4 ldrh r0, [r4, 0x2] movs r1, 0 movs r2, 0 bl sub_80A32E4 - b _081C47AE + b @081C47AE .align 2, 0 .pool -_081C47A4: +@081C47A4: ldrh r0, [r4, 0x2] movs r1, 0 movs r2, 0xB bl sub_80A32E4 -_081C47AE: +@081C47AE: pop {r4} pop {r0} bx r0 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} @@ -873974,17 +873974,17 @@ sub_81C47B4: @ 81C47B4 bl sub_806E840 lsls r0, 24 cmp r0, 0 - bne _081C4828 + bne @081C4828 adds r0, r7, 0 adds r0, 0x3F ldrb r1, [r0] movs r2, 0x1 orrs r1, r2 strb r1, [r0] - b _081C4836 + b @081C4836 .align 2, 0 .pool -_081C4828: +@081C4828: adds r2, r7, 0 adds r2, 0x3F ldrb r1, [r2] @@ -873992,7 +873992,7 @@ _081C4828: negs r0, r0 ands r0, r1 strb r0, [r2] -_081C4836: +@081C4836: mov r0, r8 pop {r3} mov r8, r3 @@ -874002,7 +874002,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 @@ -874014,11 +874014,11 @@ sub_81C4844: @ 81C4844 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081C487E + bne @081C487E movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0x1 - beq _081C487E + beq @081C487E ldrh r0, [r4, 0x2E] bl sub_806E840 lsls r0, 24 @@ -874029,7 +874029,7 @@ sub_81C4844: @ 81C4844 ldrb r2, [r5, 0x4] adds r0, r4, 0 bl sub_806EE0C -_081C487E: +@081C487E: pop {r4,r5} pop {r0} bx r0 @@ -874038,7 +874038,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 @@ -874047,16 +874047,16 @@ 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] cmp r0, 0xFF - beq _081C48AA + beq @081C48AA bl remove_task movs r0, 0xFF strb r0, [r4] -_081C48AA: +@081C48AA: pop {r4} pop {r0} bx r0 @@ -874065,7 +874065,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 @@ -874081,20 +874081,20 @@ sub_81C48B4: @ 81C48B4 ldr r1, [r0] ldr r0, =nullsub_12 + 1 cmp r1, r0 - beq _081C48E8 + beq @081C48E8 movs r0, 0x1 - b _081C48EA + b @081C48EA .align 2, 0 .pool -_081C48E8: +@081C48E8: movs r0, 0 -_081C48EA: +@081C48EA: pop {r1} bx r1 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 @@ -874140,7 +874140,7 @@ sub_81C48F0: @ 81C48F0 movs r2, 0 ldr r5, =0x02037714 ldr r4, =0x02037b14 -_081C494C: +@081C494C: adds r0, r2, r3 lsls r0, 16 lsrs r0, 15 @@ -874152,7 +874152,7 @@ _081C494C: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0xF - bls _081C494C + bls @081C494C pop {r4-r6} pop {r0} bx r0 @@ -874161,7 +874161,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 @@ -874173,7 +874173,7 @@ sub_81C4984: @ 81C4984 ldr r0, [r6] str r4, [r0, 0x8] cmp r4, 0 - beq _081C49CE + beq @081C49CE adds r0, r5, 0 movs r1, 0x8 bl pokemon_getattr @@ -874196,7 +874196,7 @@ sub_81C4984: @ 81C4984 movs r1, 0x4 orrs r0, r1 strb r0, [r2, 0x5] -_081C49CE: +@081C49CE: pop {r4-r6} pop {r0} bx r0 @@ -874205,7 +874205,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 @@ -874224,7 +874224,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 @@ -874279,7 +874279,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] @@ -874287,21 +874287,21 @@ sub_81C4A88: @ 81C4A88 adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0xFF - bne _081C4AA6 + bne @081C4AA6 ldr r0, =0x0861d108 movs r1, 0x40 movs r2, 0x98 movs r3, 0 bl obj_add_from_template_forward_search strb r0, [r4] -_081C4AA6: +@081C4AA6: ldr r0, [r5] adds r0, 0xC bl sub_81B205C lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - beq _081C4AE8 + beq @081C4AE8 ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -874315,21 +874315,21 @@ _081C4AA6: movs r0, 0x2 movs r1, 0 bl sub_81C4204 - b _081C4AF0 + b @081C4AF0 .align 2, 0 .pool -_081C4AE8: +@081C4AE8: movs r0, 0x2 movs r1, 0x1 bl sub_81C4204 -_081C4AF0: +@081C4AF0: pop {r4,r5} pop {r0} bx r0 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 @@ -874347,19 +874347,19 @@ sub_81C4AF8: @ 81C4AF8 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - bls _081C4BD2 + bls @081C4BD2 movs r0, 0 mov r9, r0 mov r1, r8 cmp r1, 0x8 - bne _081C4B2A + bne @081C4B2A movs r0, 0x1 mov r9, r0 -_081C4B2A: +@081C4B2A: movs r5, 0 ldr r6, =0x02020630 mov r10, r5 -_081C4B30: +@081C4B30: lsls r1, r5, 20 movs r0, 0xB2 lsls r0, 15 @@ -874373,7 +874373,7 @@ _081C4B30: strb r0, [r1] adds r4, r1, 0 cmp r5, 0 - bne _081C4B74 + bne @081C4B74 ldrb r1, [r7] lsls r0, r1, 4 adds r0, r1 @@ -874381,12 +874381,12 @@ _081C4B30: adds r0, r6 movs r1, 0x4 bl obj_anim_image_start - b _081C4B9A + b @081C4B9A .align 2, 0 .pool -_081C4B74: +@081C4B74: cmp r5, 0x9 - bne _081C4B8A + bne @081C4B8A ldrb r1, [r7, 0x9] lsls r0, r1, 4 adds r0, r1 @@ -874394,8 +874394,8 @@ _081C4B74: adds r0, r6 movs r1, 0x5 bl obj_anim_image_start - b _081C4B9A -_081C4B8A: + b @081C4B9A +@081C4B8A: ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -874403,7 +874403,7 @@ _081C4B8A: adds r0, r6 movs r1, 0x6 bl obj_anim_image_start -_081C4B9A: +@081C4B9A: ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -874431,8 +874431,8 @@ _081C4B9A: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x9 - bls _081C4B30 -_081C4BD2: + bls @081C4B30 +@081C4BD2: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -874445,7 +874445,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 @@ -874454,53 +874454,53 @@ sub_81C4BE4: @ 81C4BE4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bhi _081C4C1C + bhi @081C4C1C ldrh r0, [r3, 0x30] adds r0, 0x1 movs r1, 0x1F ands r0, r1 strh r0, [r3, 0x30] cmp r0, 0x18 - ble _081C4C10 + ble @081C4C10 adds r2, r3, 0 adds r2, 0x3E ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 - b _081C4C2A -_081C4C10: + b @081C4C2A +@081C4C10: adds r2, r3, 0 adds r2, 0x3E ldrb r1, [r2] movs r0, 0x5 negs r0, r0 - b _081C4C28 -_081C4C1C: + b @081C4C28 +@081C4C1C: movs r0, 0 strh r0, [r3, 0x30] adds r2, r3, 0 adds r2, 0x3E ldrb r1, [r2] subs r0, 0x5 -_081C4C28: +@081C4C28: ands r0, r1 -_081C4C2A: +@081C4C2A: strb r0, [r2] movs r1, 0x2E ldrsh r0, [r3, r1] cmp r0, 0x8 - bne _081C4C44 + bne @081C4C44 ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040c6 - b _081C4C4A + b @081C4C4A .align 2, 0 .pool -_081C4C44: +@081C4C44: ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040c7 -_081C4C4A: +@081C4C4A: adds r0, r1 ldrb r0, [r0] lsls r0, 4 @@ -874512,12 +874512,12 @@ _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 movs r4, 0 -_081C4C68: +@081C4C68: adds r0, r5, r4 lsls r0, 24 lsrs r0, 24 @@ -874526,14 +874526,14 @@ _081C4C68: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x9 - bls _081C4C68 + bls @081C4C68 pop {r4,r5} pop {r0} bx r0 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 @@ -874558,32 +874558,32 @@ sub_81C4C84: @ 81C4C84 lsls r1, 19 adds r1, r0 mov r8, r1 -_081C4CB4: +@081C4CB4: cmp r4, 0 - bne _081C4CD4 + bne @081C4CD4 ldrb r1, [r5] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r7 mov r2, r9 - b _081C4CE4 + b @081C4CE4 .align 2, 0 .pool -_081C4CD4: +@081C4CD4: cmp r4, 0x9 - bne _081C4CEC + bne @081C4CEC ldrb r1, [r5, 0x9] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r7 mov r2, r8 -_081C4CE4: +@081C4CE4: lsrs r1, r2, 24 bl obj_anim_image_start - b _081C4D02 -_081C4CEC: + b @081C4D02 +@081C4CEC: adds r0, r5, r4 ldrb r1, [r0] lsls r0, r1, 4 @@ -874594,12 +874594,12 @@ _081C4CEC: lsls r1, 24 lsrs r1, 24 bl obj_anim_image_start -_081C4D02: +@081C4D02: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x9 - bls _081C4CB4 + bls @081C4CB4 pop {r3,r4} mov r8, r3 mov r9, r4 @@ -874609,7 +874609,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 @@ -874623,7 +874623,7 @@ sub_81C4D18: @ 81C4D18 movs r7, 0x5 negs r7, r7 movs r6, 0 -_081C4D32: +@081C4D32: adds r2, r5, r3 ldrb r1, [r2] lsls r0, r1, 4 @@ -874645,7 +874645,7 @@ _081C4D32: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x9 - bls _081C4D32 + bls @081C4D32 pop {r4-r7} pop {r0} bx r0 @@ -874654,7 +874654,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 @@ -874666,7 +874666,7 @@ sub_81C4D70: @ 81C4D70 lsls r0, r1, 20 lsrs r4, r0, 30 cmp r4, 0 - bne _081C4DDC + bne @081C4DDC lsls r0, r1, 30 lsrs r0, 30 movs r1, 0x8 @@ -874697,10 +874697,10 @@ sub_81C4D70: @ 81C4D70 movs r2, 0x20 movs r3, 0x20 bl sub_8199D3C - b _081C4E2E + b @081C4E2E .align 2, 0 .pool -_081C4DDC: +@081C4DDC: lsls r0, r1, 30 lsrs r0, 30 movs r1, 0x8 @@ -874737,7 +874737,7 @@ _081C4DDC: movs r2, 0x40 movs r3, 0x40 bl sub_8199D3C -_081C4E2E: +@081C4E2E: ldr r0, [r5] lsls r0, 30 lsrs r0, 30 @@ -874775,21 +874775,21 @@ _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 cmp r0, 0 - beq _081C4EA0 + beq @081C4EA0 movs r0, 0x1 - b _081C4EAC -_081C4EA0: + b @081C4EAC +@081C4EA0: ldr r0, =0x0203cf28 ldr r0, [r0] ldrb r0, [r0] bl gpu_sync_bg_show movs r0, 0 -_081C4EAC: +@081C4EAC: pop {r1} bx r1 .align 2, 0 @@ -874797,16 +874797,16 @@ _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] cmp r0, 0 - beq _081C4EC6 + beq @081C4EC6 bl free movs r0, 0 str r0, [r4] -_081C4EC6: +@081C4EC6: pop {r4} pop {r0} bx r0 @@ -874815,7 +874815,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 @@ -874831,7 +874831,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] @@ -874842,7 +874842,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 + 1 movs r0, 0 @@ -874854,7 +874854,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 + 1 movs r0, 0x1 @@ -874866,7 +874866,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 @@ -874882,7 +874882,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 @@ -874891,7 +874891,7 @@ sub_81C4F44: @ 81C4F44 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081C4F6E + bne @081C4F6E bl overworld_free_bg_tilemaps ldr r0, =0x03005db0 ldr r1, =hm_add_c3_without_phase_2 + 1 @@ -874901,7 +874901,7 @@ sub_81C4F44: @ 81C4F44 bl sub_81C4F98 adds r0, r4, 0 bl remove_task -_081C4F6E: +@081C4F6E: pop {r4} pop {r0} bx r0 @@ -874910,7 +874910,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] @@ -874923,7 +874923,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 @@ -874933,15 +874933,15 @@ sub_81C4F98: @ 81C4F98 bl malloc_and_clear str r0, [r6] cmp r4, 0x4 - beq _081C4FB2 + beq @081C4FB2 ldr r0, =0x0203cf30 strb r4, [r0, 0x4] -_081C4FB2: +@081C4FB2: cmp r5, 0 - beq _081C4FBA + beq @081C4FBA ldr r0, =0x0203cf30 str r5, [r0] -_081C4FBA: +@081C4FBA: ldr r0, [r6] movs r1, 0 str r1, [r0] @@ -874977,7 +874977,7 @@ _081C4FBA: thumb_func_end sub_81C4F98 thumb_func_start sub_81C501C -sub_81C501C: @ 81C501C +sub_81C501C: ; 81C501C push {lr} bl run_active_tasks bl call_obj_callbacks @@ -874989,7 +874989,7 @@ sub_81C501C: @ 81C501C thumb_func_end sub_81C501C thumb_func_start sub_81C5038 -sub_81C5038: @ 81C5038 +sub_81C5038: ; 81C5038 push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -874999,31 +874999,31 @@ sub_81C5038: @ 81C5038 thumb_func_end sub_81C5038 thumb_func_start sub_81C504C -sub_81C504C: @ 81C504C +sub_81C504C: ; 81C504C push {lr} -_081C504E: +@081C504E: bl sub_81221EC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081C5072 + beq @081C5072 bl sub_81C5078 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081C5072 + beq @081C5072 bl sub_81221AC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081C504E -_081C5072: + bne @081C504E +@081C5072: pop {r0} bx r0 thumb_func_end sub_81C504C thumb_func_start sub_81C5078 -sub_81C5078: @ 81C5078 +sub_81C5078: ; 81C5078 push {lr} sub sp, 0x4 ldr r0, =0x030022c0 @@ -875032,65 +875032,65 @@ sub_81C5078: @ 81C5078 adds r0, r1 ldrb r0, [r0] cmp r0, 0x10 - bls _081C508C - b _081C51BC -_081C508C: + bls @081C508C + b @081C51BC +@081C508C: lsls r0, 2 - ldr r1, =_081C50A0 + ldr r1, =@081C50A0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081C50A0: - .4byte _081C50E4 - .4byte _081C50EE - .4byte _081C50F4 - .4byte _081C50FA - .4byte _081C510C - .4byte _081C5112 - .4byte _081C5122 - .4byte _081C513C - .4byte _081C5148 - .4byte _081C514E - .4byte _081C515C - .4byte _081C5162 - .4byte _081C5168 - .4byte _081C516E - .4byte _081C5174 - .4byte _081C517A - .4byte _081C5188 -_081C50E4: +@081C50A0: + .4byte @081C50E4 + .4byte @081C50EE + .4byte @081C50F4 + .4byte @081C50FA + .4byte @081C510C + .4byte @081C5112 + .4byte @081C5122 + .4byte @081C513C + .4byte @081C5148 + .4byte @081C514E + .4byte @081C515C + .4byte @081C5162 + .4byte @081C5168 + .4byte @081C516E + .4byte @081C5174 + .4byte @081C517A + .4byte @081C5188 +@081C50E4: bl vblank_hblank_handler_set_zero bl clear_scheduled_bg_copies_to_vram - b _081C51A2 -_081C50EE: + b @081C51A2 +@081C50EE: bl remove_some_task - b _081C51A2 -_081C50F4: + b @081C51A2 +@081C50F4: bl gpu_pal_allocator_reset - b _081C51A2 -_081C50FA: + b @081C51A2 +@081C50FA: bl sub_80A1A74 ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 - b _081C51A0 + b @081C51A0 .align 2, 0 .pool -_081C510C: +@081C510C: bl reset_all_obj_data - b _081C51A2 -_081C5112: + b @081C51A2 +@081C5112: bl sub_81221AC lsls r0, 24 cmp r0, 0 - bne _081C51A2 + bne @081C51A2 bl clear_tasks - b _081C51A2 -_081C5122: + b @081C51A2 +@081C5122: bl sub_81C51DC ldr r0, =0x0203cf2c ldr r0, [r0] @@ -875098,46 +875098,46 @@ _081C5122: adds r0, r1 movs r1, 0 strh r1, [r0] - b _081C51A2 + b @081C51A2 .align 2, 0 .pool -_081C513C: +@081C513C: bl sub_81C5238 lsls r0, 24 cmp r0, 0 - beq _081C51D4 - b _081C51A2 -_081C5148: + beq @081C51D4 + b @081C51A2 +@081C5148: bl sub_81C6BD8 - b _081C51A2 -_081C514E: + b @081C51A2 +@081C514E: bl sub_81C5924 bl sub_81C59BC bl sub_81C5A20 - b _081C51A2 -_081C515C: + b @081C51A2 +@081C515C: bl sub_81C5314 - b _081C51A2 -_081C5162: + b @081C51A2 +@081C5162: bl sub_81C56F8 - b _081C51A2 -_081C5168: + b @081C51A2 +@081C5168: bl sub_81C6EF4 - b _081C51A2 -_081C516E: + b @081C51A2 +@081C516E: bl sub_81C5674 - b _081C51A2 -_081C5174: + b @081C51A2 +@081C5174: bl sub_81C700C - b _081C51A2 -_081C517A: + b @081C51A2 +@081C517A: movs r0, 0x1 negs r0, r0 movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - b _081C51A2 -_081C5188: + b @081C51A2 +@081C5188: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -875149,9 +875149,9 @@ _081C5188: ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 -_081C51A0: +@081C51A0: strb r0, [r2, 0x8] -_081C51A2: +@081C51A2: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -875159,28 +875159,28 @@ _081C51A2: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _081C51D4 + b @081C51D4 .align 2, 0 .pool -_081C51BC: +@081C51BC: ldr r0, =sub_81C5038 + 1 bl SetVBlankCallback ldr r0, =sub_81C501C + 1 bl set_callback2 movs r0, 0x1 - b _081C51D6 + b @081C51D6 .align 2, 0 .pool -_081C51D4: +@081C51D4: movs r0, 0 -_081C51D6: +@081C51D6: add sp, 0x4 pop {r1} bx r1 thumb_func_end sub_81C5078 thumb_func_start sub_81C51DC -sub_81C51DC: @ 81C51DC +sub_81C51DC: ; 81C51DC push {lr} bl sub_8121DA0 movs r0, 0 @@ -875217,7 +875217,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 @@ -875227,22 +875227,22 @@ sub_81C5238: @ 81C5238 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x4 - bhi _081C52F0 + bhi @081C52F0 lsls r0, 2 - ldr r1, =_081C5264 + ldr r1, =@081C5264 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081C5264: - .4byte _081C5278 - .4byte _081C5294 - .4byte _081C52B8 - .4byte _081C52C8 - .4byte _081C52D4 -_081C5278: +@081C5264: + .4byte @081C5278 + .4byte @081C5294 + .4byte @081C52B8 + .4byte @081C52C8 + .4byte @081C52D4 +@081C5278: bl reset_temp_tile_data_buffers ldr r1, =0x08d9a620 movs r0, 0 @@ -875251,53 +875251,53 @@ _081C5278: movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - b _081C52D8 + b @081C52D8 .align 2, 0 .pool -_081C5294: +@081C5294: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081C5308 + beq @081C5308 ldr r0, =0x08d9ae04 ldr r4, =0x0203cf2c ldr r1, [r4] adds r1, 0x4 bl call_LZZUnCompWram ldr r1, [r4] - b _081C52DC + b @081C52DC .align 2, 0 .pool -_081C52B8: +@081C52B8: ldr r0, =0x08d9af44 movs r1, 0 movs r2, 0x20 bl decompress_palette - b _081C52D8 + b @081C52D8 .align 2, 0 .pool -_081C52C8: +@081C52C8: ldr r0, =0x0861f3cc bl gpu_tile_obj_decompress_and_load - b _081C52D8 + b @081C52D8 .align 2, 0 .pool -_081C52D4: +@081C52D4: bl sub_81C6E98 -_081C52D8: +@081C52D8: ldr r0, =0x0203cf2c ldr r1, [r0] -_081C52DC: +@081C52DC: ldr r0, =0x00000984 adds r1, r0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b _081C5308 + b @081C5308 .align 2, 0 .pool -_081C52F0: +@081C52F0: bl sub_8122328 ldr r0, [r4] ldr r1, =0x00000984 @@ -875305,12 +875305,12 @@ _081C52F0: movs r1, 0 strh r1, [r0] movs r0, 0x1 - b _081C530A + b @081C530A .align 2, 0 .pool -_081C5308: +@081C5308: movs r0, 0 -_081C530A: +@081C530A: add sp, 0x4 pop {r4} pop {r1} @@ -875318,7 +875318,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] @@ -875341,9 +875341,9 @@ sub_81C5314: @ 81C5314 ldrb r0, [r0] subs r0, 0x1 cmp r6, r0 - bge _081C5382 + bge @081C5382 adds r5, r1, 0 -_081C5344: +@081C5344: lsls r1, r6, 1 adds r4, r1, r6 lsls r4, 3 @@ -875373,8 +875373,8 @@ _081C5344: ldrb r0, [r1] subs r0, 0x1 cmp r6, r0 - blt _081C5344 -_081C5382: + blt @081C5344 +@081C5382: ldr r5, =0x0203cf2c lsls r4, r6, 1 adds r4, r6 @@ -875424,7 +875424,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 @@ -875434,7 +875434,7 @@ sub_81C540C: @ 81C540C lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bne _081C5450 + bne @081C5450 ldr r0, =0x02021cc4 adds r1, r4, 0 subs r1, 0x84 @@ -875447,38 +875447,38 @@ sub_81C540C: @ 81C540C ldr r1, =0x085e9210 adds r0, r5, 0 bl ExpandTextCodes - b _081C5458 + b @081C5458 .align 2, 0 .pool -_081C5450: +@081C5450: adds r0, r4, 0 adds r1, r5, 0 bl itemid_get_name -_081C5458: +@081C5458: pop {r4,r5} pop {r0} bx r0 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 lsrs r1, 24 cmp r1, 0x1 - beq _081C5476 + beq @081C5476 movs r0, 0x5 bl audio_play bl sub_81C6F20 -_081C5476: +@081C5476: ldr r5, =0x0203cf2c ldr r1, [r5] ldr r2, =0x00000814 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0xFF - bne _081C5504 + bne @081C5504 adds r2, 0x1 adds r0, r1, r2 ldrb r1, [r0] @@ -875488,7 +875488,7 @@ _081C5476: movs r0, 0x2 negs r0, r0 cmp r4, r0 - beq _081C54E0 + beq @081C54E0 ldr r0, =0x03005d90 ldr r2, [r0] lsls r3, r4, 1 @@ -875510,17 +875510,17 @@ _081C5476: adds r1, r2 ldrb r1, [r1] bl sub_81C6F90 - b _081C54EE + b @081C54EE .align 2, 0 .pool -_081C54E0: +@081C54E0: ldr r0, =0x0000ffff ldr r1, [r5] ldr r2, =0x00000815 adds r1, r2 ldrb r1, [r1] bl sub_81C6F90 -_081C54EE: +@081C54EE: ldr r0, =0x0203cf2c ldr r1, [r0] ldr r0, =0x00000815 @@ -875531,7 +875531,7 @@ _081C54EE: strb r0, [r1] adds r0, r4, 0 bl sub_81C55D8 -_081C5504: +@081C5504: pop {r4,r5} pop {r0} bx r0 @@ -875540,7 +875540,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 @@ -875551,29 +875551,29 @@ sub_81C5518: @ 81C5518 movs r0, 0x2 negs r0, r0 cmp r4, r0 - beq _081C55B8 + beq @081C55B8 ldr r0, =0x0203cf2c ldr r0, [r0] ldr r1, =0x00000814 adds r0, r1 ldrb r1, [r0] cmp r1, 0xFF - beq _081C5560 + beq @081C5560 lsls r0, r4, 24 lsrs r0, 24 cmp r1, r0 - bne _081C5558 + bne @081C5558 adds r0, r5, 0 movs r1, 0x1 bl sub_81C5AB8 - b _081C5560 + b @081C5560 .align 2, 0 .pool -_081C5558: +@081C5558: adds r0, r5, 0 movs r1, 0xFF bl sub_81C5AB8 -_081C5560: +@081C5560: ldr r0, =0x02021cc4 ldr r1, =0x03005d90 ldr r3, [r1] @@ -875614,7 +875614,7 @@ _081C5560: adds r1, r4, 0 adds r3, r5, 0 bl sub_81C6C94 -_081C55B8: +@081C55B8: add sp, 0x10 pop {r4-r6} pop {r0} @@ -875624,14 +875624,14 @@ _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 movs r0, 0x2 negs r0, r0 cmp r3, r0 - beq _081C561C + beq @081C561C ldr r0, =0x03005d90 ldr r2, [r0] lsls r3, 1 @@ -875650,10 +875650,10 @@ sub_81C55D8: @ 81C55D8 ldrh r0, [r2] bl itemid_get_description adds r4, r0, 0 - b _081C5638 + b @081C5638 .align 2, 0 .pool -_081C561C: +@081C561C: ldr r0, =0x02021cc4 ldr r2, =0x085e91b0 ldr r1, =0x0203cf30 @@ -875666,7 +875666,7 @@ _081C561C: ldr r1, =0x085e91c0 adds r0, r4, 0 bl ExpandTextCodes -_081C5638: +@081C5638: movs r0, 0x1 movs r1, 0 bl Window_FastFillPixels @@ -875689,7 +875689,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 @@ -875698,7 +875698,7 @@ sub_81C5674: @ 81C5674 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0xFF - bne _081C56B4 + bne @081C56B4 adds r2, 0xB adds r0, r1, r2 ldrb r0, [r0] @@ -875721,7 +875721,7 @@ sub_81C5674: @ 81C5674 ldr r2, =0x00000816 adds r1, r2 strb r0, [r1] -_081C56B4: +@081C56B4: add sp, 0x10 pop {r4} pop {r0} @@ -875731,7 +875731,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] @@ -875739,14 +875739,14 @@ sub_81C56CC: @ 81C56CC adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xFF - beq _081C56EA + beq @081C56EA bl sub_81AF620 ldr r0, [r4] ldr r1, =0x00000816 adds r0, r1 movs r1, 0xFF strb r1, [r0] -_081C56EA: +@081C56EA: pop {r4} pop {r0} bx r0 @@ -875755,7 +875755,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 + 1 movs r1, 0 @@ -875783,7 +875783,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} @@ -875837,7 +875837,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} @@ -875867,7 +875867,7 @@ sub_81C57A8: @ 81C57A8 adds r0, r1 adds r3, r0 cmp r4, r5 - beq _081C5862 + beq @081C5862 lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] @@ -875876,14 +875876,14 @@ sub_81C57A8: @ 81C57A8 ldrb r0, [r0] mov r8, r0 cmp r5, r4 - bls _081C5830 + bls @081C5830 subs r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 lsls r2, r4, 16 cmp r4, r5 - bge _081C5854 -_081C5802: + bge @081C5854 +@081C5802: asrs r2, 16 lsls r0, r2, 1 adds r0, r6 @@ -875896,15 +875896,15 @@ _081C5802: lsls r2, 16 asrs r0, r2, 16 cmp r0, r5 - blt _081C5802 - b _081C5854 + blt @081C5802 + b @081C5854 .align 2, 0 .pool -_081C5830: +@081C5830: lsls r2, r7, 16 cmp r7, r5 - ble _081C5854 -_081C5836: + ble @081C5854 +@081C5836: asrs r2, 16 lsls r1, r2, 1 adds r1, r6 @@ -875919,8 +875919,8 @@ _081C5836: lsls r2, 16 asrs r0, r2, 16 cmp r0, r5 - bgt _081C5836 -_081C5854: + bgt @081C5836 +@081C5854: lsls r0, r5, 1 adds r0, r6 mov r2, r12 @@ -875928,7 +875928,7 @@ _081C5854: adds r0, r3, r5 mov r1, r8 strb r1, [r0] -_081C5862: +@081C5862: pop {r3} mov r8, r3 pop {r4-r7} @@ -875937,7 +875937,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 @@ -875966,7 +875966,7 @@ sub_81C586C: @ 81C586C mov r8, r3 movs r5, 0 movs r3, 0 -_081C58A4: +@081C58A4: lsls r0, r5, 1 mov r1, r9 adds r2, r0, r1 @@ -875974,54 +875974,54 @@ _081C58A4: mov r4, r8 adds r1, r4, r5 cmp r0, 0 - beq _081C58BA + beq @081C58BA ldrb r0, [r1] cmp r0, 0 - bne _081C58BE -_081C58BA: + bne @081C58BE +@081C58BA: strh r3, [r2] strb r3, [r1] -_081C58BE: +@081C58BE: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x9 - bls _081C58A4 + bls @081C58A4 movs r5, 0 -_081C58CA: +@081C58CA: adds r1, r5, 0x1 lsls r0, r1, 24 lsrs r4, r0, 24 adds r7, r1, 0 cmp r4, 0x9 - bhi _081C58FE + bhi @081C58FE lsls r0, r5, 1 mov r1, r9 adds r6, r0, r1 -_081C58DC: +@081C58DC: ldrh r0, [r6] cmp r0, 0 - beq _081C58EC + beq @081C58EC mov r2, r8 adds r0, r2, r5 ldrb r0, [r0] cmp r0, 0 - bne _081C58F4 -_081C58EC: + bne @081C58F4 +@081C58EC: adds r0, r5, 0 adds r1, r4, 0 bl sub_81C5738 -_081C58F4: +@081C58F4: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x9 - bls _081C58DC -_081C58FE: + bls @081C58DC +@081C58FE: lsls r0, r7, 24 lsrs r5, r0, 24 cmp r5, 0x8 - bls _081C58CA + bls @081C58CA pop {r3,r4} mov r8, r3 mov r9, r4 @@ -876033,7 +876033,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] @@ -876057,24 +876057,24 @@ sub_81C5924: @ 81C5924 strb r1, [r0] movs r4, 0 adds r6, r3, 0 -_081C5954: +@081C5954: lsls r0, r4, 1 adds r0, r5 ldrh r0, [r0] ldr r3, =0x0203cf2c cmp r0, 0 - beq _081C596A + beq @081C596A ldr r1, [r6] adds r1, r2 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -_081C596A: +@081C596A: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x9 - bls _081C5954 + bls @081C5954 ldr r0, [r3] ldr r2, =0x00000821 adds r0, r2 @@ -876085,19 +876085,19 @@ _081C596A: adds r2, r0, r2 ldrb r2, [r2] cmp r2, 0x8 - bls _081C59AC + bls @081C59AC ldr r2, =0x00000822 adds r1, r0, r2 movs r0, 0x8 strb r0, [r1] - b _081C59B2 + b @081C59B2 .align 2, 0 .pool -_081C59AC: +@081C59AC: ldr r1, =0x00000822 adds r0, r1 strb r2, [r0] -_081C59B2: +@081C59B2: pop {r4-r6} pop {r0} bx r0 @@ -876106,14 +876106,14 @@ _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] adds r3, r0, 0 ldr r4, =0x0203cf2c cmp r1, 0 - beq _081C59E4 + beq @081C59E4 ldrh r0, [r3, 0x8] ldr r1, [r4] ldr r5, =0x00000822 @@ -876124,10 +876124,10 @@ sub_81C59BC: @ 81C59BC adds r1, r5 ldrb r1, [r1] cmp r0, r1 - ble _081C59E4 + ble @081C59E4 subs r0, r1, r2 strh r0, [r3, 0x8] -_081C59E4: +@081C59E4: adds r2, r3, 0 ldrh r1, [r2, 0x8] ldrh r0, [r2, 0x6] @@ -876137,36 +876137,36 @@ _081C59E4: adds r0, r4 ldrb r0, [r0] cmp r1, r0 - blt _081C5A18 + blt @081C5A18 adds r1, r0, 0 cmp r1, 0 - bne _081C5A14 + bne @081C5A14 strh r1, [r2, 0x6] - b _081C5A18 + b @081C5A18 .align 2, 0 .pool -_081C5A14: +@081C5A14: subs r0, 0x1 strh r0, [r3, 0x6] -_081C5A18: +@081C5A18: pop {r4,r5} pop {r0} bx r0 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] adds r5, r0, 0 cmp r1, 0x4 - bls _081C5A80 + bls @081C5A80 movs r4, 0 ldrh r0, [r5, 0x6] subs r0, 0x4 cmp r4, r0 - bgt _081C5A80 + bgt @081C5A80 ldrh r2, [r5, 0x8] ldr r6, =0x0203cf2c ldr r0, [r6] @@ -876178,9 +876178,9 @@ sub_81C5A20: @ 81C5A20 adds r0, r7 ldrb r0, [r0] cmp r2, r0 - beq _081C5A80 + beq @081C5A80 adds r3, r5, 0 -_081C5A50: +@081C5A50: ldrh r0, [r3, 0x6] subs r0, 0x1 strh r0, [r3, 0x6] @@ -876193,7 +876193,7 @@ _081C5A50: ldrh r0, [r3, 0x6] subs r0, 0x4 cmp r4, r0 - bgt _081C5A80 + bgt @081C5A80 ldrh r2, [r5, 0x8] ldr r1, [r6] ldr r7, =0x00000822 @@ -876204,8 +876204,8 @@ _081C5A50: adds r1, r0 ldrb r1, [r1] cmp r2, r1 - bne _081C5A50 -_081C5A80: + bne @081C5A50 +@081C5A80: pop {r4-r7} pop {r0} bx r0 @@ -876214,7 +876214,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 @@ -876232,7 +876232,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 @@ -876240,7 +876240,7 @@ sub_81C5AB8: @ 81C5AB8 lsls r1, 24 lsrs r2, r1, 24 cmp r2, 0xFF - bne _081C5AF4 + bne @081C5AF4 movs r0, 0x1 movs r1, 0 bl GetMenuCursorDimensionByFont @@ -876259,8 +876259,8 @@ sub_81C5AB8: @ 81C5AB8 movs r2, 0 adds r3, r5, 0 bl Window_FillPixelRect - b _081C5B08 -_081C5AF4: + b @081C5B08 +@081C5AF4: ldr r1, =0x085e8d60 movs r0, 0 str r0, [sp] @@ -876270,7 +876270,7 @@ _081C5AF4: movs r2, 0 adds r3, r5, 0 bl sub_81C6C3C -_081C5B08: +@081C5B08: add sp, 0x10 pop {r4,r5} pop {r0} @@ -876280,7 +876280,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 @@ -876309,7 +876309,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 @@ -876323,7 +876323,7 @@ sub_81C5B4C: @ 81C5B4C movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081C5BBC + bne @081C5BBC ldrb r0, [r2] ldr r4, =0x0203cf38 subs r2, r4, 0x2 @@ -876333,17 +876333,17 @@ sub_81C5B4C: @ 81C5B4C ldr r0, [r0] ldr r0, [r0] cmp r0, 0 - beq _081C5B94 + beq @081C5B94 bl set_callback2 - b _081C5B9E + b @081C5B9E .align 2, 0 .pool -_081C5B94: +@081C5B94: adds r0, r4, 0 subs r0, 0x8 ldr r0, [r0] bl set_callback2 -_081C5B9E: +@081C5B9E: bl sub_81C56CC bl reset_all_obj_data bl gpu_pal_allocator_reset @@ -876353,7 +876353,7 @@ _081C5B9E: bl free adds r0, r5, 0 bl remove_task -_081C5BBC: +@081C5BBC: pop {r4,r5} pop {r0} bx r0 @@ -876362,7 +876362,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} @@ -876377,17 +876377,17 @@ sub_81C5BC8: @ 81C5BC8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081C5BEA - b _081C5D16 -_081C5BEA: + bne @081C5BEA + b @081C5D16 +@081C5BEA: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081C5BF8 - b _081C5D16 -_081C5BF8: + beq @081C5BF8 + b @081C5D16 +@081C5BF8: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x4 @@ -876395,13 +876395,13 @@ _081C5BF8: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq _081C5C5C + beq @081C5C5C ldr r4, =0x0203cf30 ldrb r0, [r4, 0x4] cmp r0, 0x2 - bne _081C5C12 - b _081C5D16 -_081C5C12: + bne @081C5C12 + b @081C5D16 +@081C5C12: ldrb r0, [r7] adds r1, r4, 0 adds r1, 0x8 @@ -876417,15 +876417,15 @@ _081C5C12: ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 - beq _081C5D16 + beq @081C5D16 movs r0, 0x5 bl audio_play adds r0, r5, 0 bl sub_81C67CC - b _081C5D16 + b @081C5D16 .align 2, 0 .pool -_081C5C5C: +@081C5C5C: ldrb r0, [r7] bl sub_81AE604 adds r6, r0, 0 @@ -876438,24 +876438,24 @@ _081C5C5C: movs r0, 0x2 negs r0, r0 cmp r6, r0 - beq _081C5C88 + beq @081C5C88 adds r0, 0x1 cmp r6, r0 - bne _081C5CA0 - b _081C5D16 + bne @081C5CA0 + b @081C5D16 .align 2, 0 .pool -_081C5C88: +@081C5C88: movs r0, 0x5 bl audio_play ldr r0, =0x0203ce7c strh r4, [r0] adds r0, r5, 0 bl sub_81C5B14 - b _081C5D16 + b @081C5D16 .align 2, 0 .pool -_081C5CA0: +@081C5CA0: movs r0, 0x5 bl audio_play ldr r2, =0x0203ce7c @@ -876495,16 +876495,16 @@ _081C5CA0: subs r0, 0x8 ldrb r0, [r0, 0x4] cmp r0, 0x2 - bne _081C5D10 + bne @081C5D10 adds r0, r5, 0 bl sub_81C674C - b _081C5D16 + b @081C5D16 .align 2, 0 .pool -_081C5D10: +@081C5D10: adds r0, r5, 0 bl sub_81C5D20 -_081C5D16: +@081C5D16: pop {r3} mov r8, r3 pop {r4-r7} @@ -876513,7 +876513,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 @@ -876530,9 +876530,9 @@ sub_81C5D20: @ 81C5D20 ldr r0, =0x0203cf30 ldrb r4, [r0, 0x4] cmp r4, 0x1 - beq _081C5D74 + beq @081C5D74 cmp r4, 0x3 - beq _081C5DC4 + beq @081C5DC4 ldr r0, =0x0203cf2c ldr r1, [r0] ldr r0, =0x00000818 @@ -876543,25 +876543,25 @@ sub_81C5D20: @ 81C5D20 lsls r0, 4 adds r1, r0 movs r0, 0x4 - b _081C5DD8 + b @081C5DD8 .align 2, 0 .pool -_081C5D74: +@081C5D74: ldr r0, =0x0203ce7c ldrh r0, [r0] bl itemid_get_usage lsls r0, 24 cmp r0, 0 - beq _081C5DA0 + beq @081C5DA0 ldr r0, =0x0203cf2c ldr r1, [r0] ldr r0, =0x00000818 adds r2, r1, r0 ldr r0, =0x0861f30e - b _081C5DCE + b @081C5DCE .align 2, 0 .pool -_081C5DA0: +@081C5DA0: ldr r0, =0x0203cf2c ldr r0, [r0] ldr r1, =0x00000818 @@ -876572,24 +876572,24 @@ _081C5DA0: lsls r1, 4 adds r0, r1 strb r4, [r0] - b _081C5DDA + b @081C5DDA .align 2, 0 .pool -_081C5DC4: +@081C5DC4: ldr r0, =0x0203cf2c ldr r1, [r0] ldr r0, =0x00000818 adds r2, r1, r0 ldr r0, =0x0861f30c -_081C5DCE: +@081C5DCE: str r0, [r2] movs r0, 0x82 lsls r0, 4 adds r1, r0 movs r0, 0x2 -_081C5DD8: +@081C5DD8: strb r0, [r1] -_081C5DDA: +@081C5DDA: ldr r0, =0x0203ce7c ldrh r0, [r0] ldr r1, =0x02021cc4 @@ -876618,22 +876618,22 @@ _081C5DDA: adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _081C5E3C + bne @081C5E3C movs r0, 0 - b _081C5E42 + b @081C5E42 .align 2, 0 .pool -_081C5E3C: +@081C5E3C: cmp r0, 0x2 - bne _081C5E50 + bne @081C5E50 movs r0, 0x1 -_081C5E42: +@081C5E42: bl sub_81C6D24 lsls r0, 24 lsrs r0, 24 bl sub_81C5EAC - b _081C5E62 -_081C5E50: + b @081C5E62 +@081C5E50: movs r0, 0x2 bl sub_81C6D24 lsls r0, 24 @@ -876641,7 +876641,7 @@ _081C5E50: movs r1, 0x2 movs r2, 0x2 bl sub_81C5F08 -_081C5E62: +@081C5E62: ldr r0, =0x0203cf2c ldr r0, [r0] movs r1, 0x82 @@ -876649,24 +876649,24 @@ _081C5E62: adds r0, r1 ldrb r0, [r0] cmp r0, 0x4 - bne _081C5E8C + bne @081C5E8C ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 ldr r0, =sub_81C5FE4 + 1 - b _081C5E98 + b @081C5E98 .align 2, 0 .pool -_081C5E8C: +@081C5E8C: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 ldr r0, =sub_81C5F68 + 1 -_081C5E98: +@081C5E98: str r0, [r1] add sp, 0x10 pop {r4,r5} @@ -876677,7 +876677,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 @@ -876720,7 +876720,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 @@ -876765,7 +876765,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 @@ -876774,27 +876774,27 @@ sub_81C5F68: @ 81C5F68 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081C5FD0 + beq @081C5FD0 bl ProcessMenuInputNoWrapAround lsls r0, 24 asrs r4, r0, 24 movs r0, 0x2 negs r0, r0 cmp r4, r0 - beq _081C5FD0 + beq @081C5FD0 adds r0, 0x1 cmp r4, r0 - bne _081C5FA8 + bne @081C5FA8 movs r0, 0x5 bl audio_play ldr r0, =0x0861f2d8 ldr r1, [r0, 0x1C] adds r0, r5, 0 bl _call_via_r1 - b _081C5FD0 + b @081C5FD0 .align 2, 0 .pool -_081C5FA8: +@081C5FA8: movs r0, 0x5 bl audio_play ldr r1, =0x0861f2d8 @@ -876810,10 +876810,10 @@ _081C5FA8: adds r0, r1 ldr r1, [r0] cmp r1, 0 - beq _081C5FD0 + beq @081C5FD0 adds r0, r6, 0 bl _call_via_r1 -_081C5FD0: +@081C5FD0: pop {r4-r6} pop {r0} bx r0 @@ -876822,7 +876822,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 @@ -876830,9 +876830,9 @@ sub_81C5FE4: @ 81C5FE4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081C5FF8 - b _081C6160 -_081C5FF8: + bne @081C5FF8 + b @081C6160 +@081C5FF8: bl GetMenuCursorPos lsls r0, 24 lsrs r4, r0, 24 @@ -876841,36 +876841,36 @@ _081C5FF8: movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _081C6040 + beq @081C6040 lsls r0, r4, 24 asrs r0, 24 cmp r0, 0 - bgt _081C6016 - b _081C6160 -_081C6016: + bgt @081C6016 + b @081C6160 +@081C6016: subs r0, 0x2 lsls r0, 24 asrs r0, 24 bl sub_81C616C lsls r0, 24 cmp r0, 0 - bne _081C6028 - b _081C6160 -_081C6028: + bne @081C6028 + b @081C6160 +@081C6028: movs r0, 0x5 bl audio_play movs r1, 0x1 negs r1, r1 movs r0, 0 bl sub_8199134 - b _081C6160 + b @081C6160 .align 2, 0 .pool -_081C6040: +@081C6040: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081C6084 + beq @081C6084 lsls r0, r4, 24 asrs r1, r0, 24 ldr r0, =0x0203cf2c @@ -876881,91 +876881,91 @@ _081C6040: ldrb r0, [r0] subs r0, 0x2 cmp r1, r0 - blt _081C6060 - b _081C6160 -_081C6060: + blt @081C6060 + b @081C6160 +@081C6060: adds r0, r1, 0x2 lsls r0, 24 asrs r0, 24 bl sub_81C616C lsls r0, 24 cmp r0, 0 - beq _081C6160 + beq @081C6160 movs r0, 0x5 bl audio_play movs r0, 0 movs r1, 0x1 bl sub_8199134 - b _081C6160 + b @081C6160 .align 2, 0 .pool -_081C6084: +@081C6084: movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne _081C6098 + bne @081C6098 bl sub_81220D0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081C60C0 -_081C6098: + bne @081C60C0 +@081C6098: lsls r0, r4, 24 asrs r1, r0, 24 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081C6160 + beq @081C6160 subs r0, r1, 0x1 lsls r0, 24 asrs r0, 24 bl sub_81C616C lsls r0, 24 cmp r0, 0 - beq _081C6160 + beq @081C6160 movs r0, 0x5 bl audio_play movs r0, 0x1 negs r0, r0 - b _081C60FA -_081C60C0: + b @081C60FA +@081C60C0: ldrh r1, [r5, 0x2E] movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne _081C60D6 + bne @081C60D6 bl sub_81220D0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _081C6102 -_081C60D6: + bne @081C6102 +@081C60D6: lsls r0, r4, 24 asrs r1, r0, 24 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _081C6160 + bne @081C6160 adds r0, r1, 0x1 lsls r0, 24 asrs r0, 24 bl sub_81C616C lsls r0, 24 cmp r0, 0 - beq _081C6160 + beq @081C6160 movs r0, 0x5 bl audio_play movs r0, 0x1 -_081C60FA: +@081C60FA: movs r1, 0 bl sub_8199134 - b _081C6160 -_081C6102: + b @081C6160 +@081C6102: ldrh r1, [r5, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081C6148 + beq @081C6148 movs r0, 0x5 bl audio_play ldr r2, =0x0861f2d8 @@ -876983,24 +876983,24 @@ _081C6102: adds r0, r2 ldr r1, [r0] cmp r1, 0 - beq _081C6160 + beq @081C6160 adds r0, r6, 0 bl _call_via_r1 - b _081C6160 + b @081C6160 .align 2, 0 .pool -_081C6148: +@081C6148: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081C6160 + beq @081C6160 movs r0, 0x5 bl audio_play ldr r0, =0x0861f2d8 ldr r1, [r0, 0x1C] adds r0, r6, 0 bl _call_via_r1 -_081C6160: +@081C6160: pop {r4-r6} pop {r0} bx r0 @@ -877009,12 +877009,12 @@ _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 cmp r1, 0 - blt _081C61A0 + blt @081C61A0 ldr r0, =0x0203cf2c ldr r2, [r0] movs r3, 0x82 @@ -877022,27 +877022,27 @@ sub_81C616C: @ 81C616C adds r0, r2, r3 ldrb r0, [r0] cmp r1, r0 - bgt _081C61A0 + bgt @081C61A0 ldr r3, =0x00000818 adds r0, r2, r3 ldr r0, [r0] adds r0, r1 ldrb r0, [r0] cmp r0, 0x5 - beq _081C61A0 + beq @081C61A0 movs r0, 0x1 - b _081C61A2 + b @081C61A2 .align 2, 0 .pool -_081C61A0: +@081C61A0: movs r0, 0 -_081C61A2: +@081C61A2: pop {r1} bx r1 thumb_func_end sub_81C616C thumb_func_start sub_81C61A8 -sub_81C61A8: @ 81C61A8 +sub_81C61A8: ; 81C61A8 push {lr} ldr r0, =0x0203cf2c ldr r0, [r0] @@ -877051,28 +877051,28 @@ sub_81C61A8: @ 81C61A8 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - bne _081C61C8 + bne @081C61C8 movs r0, 0 bl sub_81C6D6C - b _081C61DA + b @081C61DA .align 2, 0 .pool -_081C61C8: +@081C61C8: cmp r0, 0x2 - bne _081C61D4 + bne @081C61D4 movs r0, 0x1 bl sub_81C6D6C - b _081C61DA -_081C61D4: + b @081C61DA +@081C61D4: movs r0, 0x2 bl sub_81C6D6C -_081C61DA: +@081C61DA: pop {r0} bx r0 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 @@ -877082,31 +877082,31 @@ sub_81C61E0: @ 81C61E0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 - beq _081C620C + beq @081C620C cmp r0, 0x2 - beq _081C620C + beq @081C620C cmp r0, 0x3 - beq _081C620C + beq @081C620C ldrh r0, [r4] bl itemid_is_mail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081C6228 -_081C620C: + bne @081C6228 +@081C620C: bl sub_81C61A8 ldr r1, =0x085e8f31 ldr r2, =sub_81C6714 + 1 adds r0, r5, 0 bl sub_81C6DD8 - b _081C6252 + b @081C6252 .align 2, 0 .pool -_081C6228: +@081C6228: ldrh r0, [r4] bl itemid_get_overworld_function cmp r0, 0 - beq _081C6252 + beq @081C6252 bl sub_81C61A8 movs r0, 0x1 movs r1, 0 @@ -877118,14 +877118,14 @@ _081C6228: adds r1, r0, 0 adds r0, r5, 0 bl _call_via_r1 -_081C6252: +@081C6252: pop {r4,r5} pop {r0} bx r0 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 @@ -877156,7 +877156,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 @@ -877177,7 +877177,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 @@ -877193,13 +877193,13 @@ sub_81C62C4: @ 81C62C4 movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0x1 - bne _081C62F4 + bne @081C62F4 adds r0, r5, 0 bl sub_81C6350 - b _081C6334 + b @081C6334 .align 2, 0 .pool -_081C62F4: +@081C62F4: ldr r0, =0x0203ce7c ldrh r0, [r0] ldr r1, =0x02021cc4 @@ -877227,7 +877227,7 @@ _081C62F4: adds r0, r6, r0 ldr r1, =sub_81C64B4 + 1 str r1, [r0] -_081C6334: +@081C6334: add sp, 0x10 pop {r4-r7} pop {r0} @@ -877237,7 +877237,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 @@ -877287,7 +877287,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 @@ -877313,7 +877313,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 @@ -877352,7 +877352,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 @@ -877391,7 +877391,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 @@ -877408,20 +877408,20 @@ sub_81C64B4: @ 81C64B4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081C64E8 + bne @081C64E8 movs r1, 0x10 ldrsh r0, [r4, r1] bl sub_81C645C - b _081C6544 + b @081C6544 .align 2, 0 .pool -_081C64E8: +@081C64E8: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081C651C + beq @081C651C movs r0, 0x5 bl audio_play movs r0, 0x3 @@ -877433,14 +877433,14 @@ _081C64E8: bl schedule_bg_copy_tilemap_to_vram adds r0, r5, 0 bl sub_81C6350 - b _081C6544 + b @081C6544 .align 2, 0 .pool -_081C651C: +@081C651C: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081C6544 + beq @081C6544 movs r0, 0x5 bl audio_play movs r0, 0x3 @@ -877452,14 +877452,14 @@ _081C651C: bl schedule_bg_copy_tilemap_to_vram adds r0, r6, 0 bl sub_81C63D0 -_081C6544: +@081C6544: pop {r4-r6} pop {r0} bx r0 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 @@ -877509,7 +877509,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 @@ -877525,7 +877525,7 @@ sub_81C65CC: @ 81C65CC movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _081C662E + beq @081C662E movs r0, 0x5 bl audio_play ldr r0, =0x0203ce7c @@ -877550,7 +877550,7 @@ sub_81C65CC: @ 81C65CC bl schedule_bg_copy_tilemap_to_vram adds r0, r5, 0 bl sub_81C629C -_081C662E: +@081C662E: pop {r4-r7} pop {r0} bx r0 @@ -877559,7 +877559,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 @@ -877571,40 +877571,40 @@ sub_81C6648: @ 81C6648 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081C667C + bne @081C667C ldr r1, =0x085e8dce ldr r2, =sub_81C66EC + 1 adds r0, r4, 0 bl sub_81C6DD8 - b _081C66A6 + b @081C66A6 .align 2, 0 .pool -_081C667C: +@081C667C: ldrh r0, [r5] bl itemid_is_unique lsls r0, 24 cmp r0, 0 - bne _081C66A0 + bne @081C66A0 ldr r0, =0x0203cf2c ldr r1, [r0] ldr r0, =sub_81B7F60 + 1 str r0, [r1] adds r0, r4, 0 bl sub_81C5B14 - b _081C66A6 + b @081C66A6 .align 2, 0 .pool -_081C66A0: +@081C66A0: adds r0, r6, 0 bl sub_81C66AC -_081C66A6: +@081C66A6: pop {r4-r6} pop {r0} bx r0 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 @@ -877629,7 +877629,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 @@ -877638,12 +877638,12 @@ sub_81C66EC: @ 81C66EC movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081C670A + beq @081C670A movs r0, 0x5 bl audio_play adds r0, r4, 0 bl sub_81C6714 -_081C670A: +@081C670A: pop {r4} pop {r0} bx r0 @@ -877652,7 +877652,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 @@ -877679,7 +877679,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 @@ -877689,34 +877689,34 @@ sub_81C674C: @ 81C674C bl itemid_80BF6D8_mail_related lsls r0, 24 cmp r0, 0 - bne _081C677C + bne @081C677C ldr r1, =0x085e8dce ldr r2, =sub_81C66EC + 1 adds r0, r4, 0 bl sub_81C6DD8 - b _081C6796 + b @081C6796 .align 2, 0 .pool -_081C677C: +@081C677C: ldrh r0, [r5] bl itemid_is_unique lsls r0, 24 cmp r0, 0 - bne _081C6790 + bne @081C6790 adds r0, r4, 0 bl sub_81C5B14 - b _081C6796 -_081C6790: + b @081C6796 +@081C6790: adds r0, r6, 0 bl sub_81C66AC -_081C6796: +@081C6796: pop {r4-r6} pop {r0} bx r0 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 @@ -877724,14 +877724,14 @@ sub_81C679C: @ 81C679C ldrh r0, [r4] bl itemid_get_battle_function cmp r0, 0 - beq _081C67C0 + beq @081C67C0 bl sub_81C61A8 ldrh r0, [r4] bl itemid_get_battle_function adds r1, r0, 0 adds r0, r5, 0 bl _call_via_r1 -_081C67C0: +@081C67C0: pop {r4,r5} pop {r0} bx r0 @@ -877740,7 +877740,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 @@ -877830,7 +877830,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 @@ -877843,23 +877843,23 @@ sub_81C68B0: @ 81C68B0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081C695C + beq @081C695C ldr r7, =0x030022c0 ldrh r1, [r7, 0x2E] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _081C68F8 + beq @081C68F8 movs r0, 0x5 bl audio_play ldrb r0, [r4] ldr r1, =0x0203cf38 subs r2, r1, 0x2 bl get_coro_args_x18_x1A - b _081C6940 + b @081C6940 .align 2, 0 .pool -_081C68F8: +@081C68F8: ldrb r0, [r4] bl sub_81AE604 adds r6, r0, 0 @@ -877876,42 +877876,42 @@ _081C68F8: movs r0, 0x2 negs r0, r0 cmp r6, r0 - beq _081C6930 + beq @081C6930 adds r0, 0x1 cmp r6, r0 - bne _081C6950 - b _081C695C + bne @081C6950 + b @081C695C .align 2, 0 .pool -_081C6930: +@081C6930: movs r0, 0x5 bl audio_play ldrh r1, [r7, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081C6948 -_081C6940: + beq @081C6948 +@081C6940: adds r0, r5, 0 bl sub_81C6964 - b _081C695C -_081C6948: + b @081C695C +@081C6948: adds r0, r5, 0 bl sub_81C6A14 - b _081C695C -_081C6950: + b @081C695C +@081C6950: movs r0, 0x5 bl audio_play adds r0, r5, 0 bl sub_81C6964 -_081C695C: +@081C695C: pop {r4-r7} pop {r0} bx r0 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} @@ -877933,17 +877933,17 @@ sub_81C6964: @ 81C6964 movs r3, 0x2 ldrsh r1, [r5, r3] cmp r1, r4 - beq _081C6996 + beq @081C6996 subs r0, r4, 0x1 cmp r1, r0 - bne _081C69A8 -_081C6996: + bne @081C69A8 +@081C6996: adds r0, r6, 0 bl sub_81C6A14 - b _081C69FC + b @081C69FC .align 2, 0 .pool -_081C69A8: +@081C69A8: ldrb r0, [r5, 0x2] lsls r1, r4, 24 lsrs r1, 24 @@ -877963,13 +877963,13 @@ _081C69A8: movs r3, 0x2 ldrsh r0, [r5, r3] cmp r0, r4 - bge _081C69E0 + bge @081C69E0 adds r1, r7, 0 subs r1, 0x8 ldrh r0, [r1, 0x6] subs r0, 0x1 strh r0, [r1, 0x6] -_081C69E0: +@081C69E0: bl sub_81C5314 ldr r0, =0x03006310 ldrh r1, [r7] @@ -877981,7 +877981,7 @@ _081C69E0: strh r0, [r5] adds r0, r6, 0 bl sub_81C629C -_081C69FC: +@081C69FC: pop {r3} mov r8, r3 pop {r4-r7} @@ -877992,7 +877992,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 @@ -878022,13 +878022,13 @@ sub_81C6A14: @ 81C6A14 ldrh r1, [r7] adds r0, r1 cmp r2, r0 - bge _081C6A5E + bge @081C6A5E adds r1, r5, 0 subs r1, 0x8 ldrh r0, [r1, 0x6] subs r0, 0x1 strh r0, [r1, 0x6] -_081C6A5E: +@081C6A5E: bl sub_81C5314 ldr r0, =0x03006310 ldrh r1, [r5] @@ -878047,7 +878047,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 @@ -878094,7 +878094,7 @@ sub_81C6A94: @ 81C6A94 movs r2, 0xA bl memcpy movs r6, 0 -_081C6AF8: +@081C6AF8: movs r0, 0x64 muls r0, r6 add r0, r9 @@ -878105,12 +878105,12 @@ _081C6AF8: mov r1, sp strh r0, [r1] cmp r0, 0 - beq _081C6B88 + beq @081C6B88 movs r1, 0x1 bl bag_add_item lsls r0, 24 cmp r0, 0 - bne _081C6B88 + bne @081C6B88 mov r1, r8 ldr r2, [r1] adds r0, r2, r4 @@ -878148,21 +878148,21 @@ _081C6AF8: ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] - b _081C6BC6 + b @081C6BC6 .align 2, 0 .pool -_081C6B88: +@081C6B88: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x2 - bls _081C6AF8 + bls @081C6AF8 movs r1, 0 mov r0, sp strh r1, [r0] movs r6, 0 movs r4, 0x64 -_081C6B9C: +@081C6B9C: adds r0, r6, 0 muls r0, r4 add r0, r9 @@ -878173,7 +878173,7 @@ _081C6B9C: lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x2 - bls _081C6B9C + bls @081C6B9C ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] @@ -878181,7 +878181,7 @@ _081C6B9C: bl free adds r0, r5, 0 bl free -_081C6BC6: +@081C6BC6: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -878194,7 +878194,7 @@ _081C6BC6: thumb_func_end sub_81C6A94 thumb_func_start sub_81C6BD8 -sub_81C6BD8: @ 81C6BD8 +sub_81C6BD8: ; 81C6BD8 push {r4,lr} ldr r0, =0x0861f328 bl Window_InitFromTemplates @@ -878212,7 +878212,7 @@ sub_81C6BD8: @ 81C6BD8 movs r2, 0x20 bl gpu_pal_apply movs r4, 0 -_081C6C04: +@081C6C04: adds r0, r4, 0 movs r1, 0 bl Window_FastFillPixels @@ -878220,7 +878220,7 @@ _081C6C04: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 - bls _081C6C04 + bls @081C6C04 movs r0, 0 bl Window_WriteStandardTileMap movs r0, 0x1 @@ -878237,7 +878237,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} @@ -878284,7 +878284,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} @@ -878331,7 +878331,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 @@ -878346,7 +878346,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 @@ -878361,7 +878361,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 @@ -878372,7 +878372,7 @@ sub_81C6D24: @ 81C6D24 adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0xFF - bne _081C6D58 + bne @081C6D58 lsls r0, r2, 3 ldr r1, =0x0861f350 adds r0, r1 @@ -878385,7 +878385,7 @@ sub_81C6D24: @ 81C6D24 bl SetWindowBorderStyle movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram -_081C6D58: +@081C6D58: ldrb r0, [r4] pop {r4} pop {r1} @@ -878395,7 +878395,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 @@ -878406,7 +878406,7 @@ sub_81C6D6C: @ 81C6D6C adds r4, r1, r0 ldrb r0, [r4] cmp r0, 0xFF - beq _081C6D9E + beq @081C6D9E movs r1, 0 bl sub_8198070 ldrb r0, [r4] @@ -878417,7 +878417,7 @@ sub_81C6D6C: @ 81C6D6C bl schedule_bg_copy_tilemap_to_vram movs r0, 0xFF strb r0, [r4] -_081C6D9E: +@081C6D9E: pop {r4} pop {r0} bx r0 @@ -878426,7 +878426,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 @@ -878451,7 +878451,7 @@ sub_81C6DAC: @ 81C6DAC thumb_func_end sub_81C6DAC thumb_func_start sub_81C6DD8 -sub_81C6DD8: @ 81C6DD8 +sub_81C6DD8: ; 81C6DD8 push {r4-r6,lr} sub sp, 0x10 adds r4, r0, 0 @@ -878484,7 +878484,7 @@ sub_81C6DD8: @ 81C6DD8 thumb_func_end sub_81C6DD8 thumb_func_start sub_81C6E1C -sub_81C6E1C: @ 81C6E1C +sub_81C6E1C: ; 81C6E1C push {lr} movs r0, 0x2 movs r1, 0 @@ -878498,7 +878498,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 @@ -878509,7 +878509,7 @@ sub_81C6E38: @ 81C6E38 adds r5, r0, r1 ldrb r0, [r5] cmp r0, 0xFF - beq _081C6E80 + beq @081C6E80 ldr r0, =0x00001024 adds r4, r0 adds r0, r4, 0 @@ -878531,7 +878531,7 @@ sub_81C6E38: @ 81C6E38 bl obj_delete_and_free_tiles movs r0, 0xFF strb r0, [r5] -_081C6E80: +@081C6E80: pop {r4,r5} pop {r0} bx r0 @@ -878540,7 +878540,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 @@ -878577,7 +878577,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] @@ -878597,7 +878597,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] @@ -878615,13 +878615,13 @@ sub_81C6F20: @ 81C6F20 movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _081C6F50 + beq @081C6F50 adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 ldr r0, =sub_81C6F68 + 1 str r0, [r4, 0x1C] -_081C6F50: +@081C6F50: pop {r4} pop {r0} bx r0 @@ -878630,7 +878630,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 @@ -878638,13 +878638,13 @@ sub_81C6F68: @ 81C6F68 movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _081C6F84 + beq @081C6F84 adds r0, r4, 0 movs r1, 0 bl sub_8008258 ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] -_081C6F84: +@081C6F84: pop {r4} pop {r0} bx r0 @@ -878653,7 +878653,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 @@ -878666,7 +878666,7 @@ sub_81C6F90: @ 81C6F90 adds r5, r0, r1 ldrb r0, [r5] cmp r0, 0xFF - bne _081C6FE0 + bne @081C6FE0 ldr r0, =0x00001025 adds r4, r0 adds r0, r4, 0 @@ -878680,7 +878680,7 @@ sub_81C6F90: @ 81C6F90 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq _081C6FE0 + beq @081C6FE0 strb r2, [r5] ldr r1, =0x02020630 lsls r0, r2, 4 @@ -878691,7 +878691,7 @@ sub_81C6F90: @ 81C6F90 strh r1, [r0, 0x24] movs r1, 0x58 strh r1, [r0, 0x26] -_081C6FE0: +@081C6FE0: pop {r4-r6} pop {r0} bx r0 @@ -878700,7 +878700,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 @@ -878713,7 +878713,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] @@ -878728,7 +878728,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 @@ -878746,7 +878746,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 @@ -878769,20 +878769,20 @@ 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 bl is_c1_link_related_active cmp r0, 0 - bne _081C7090 + bne @081C7090 ldr r0, =sub_81C7170 + 1 - b _081C7092 + b @081C7092 .align 2, 0 .pool -_081C7090: +@081C7090: ldr r0, =sub_81C71E4 + 1 -_081C7092: +@081C7092: lsls r1, r4, 24 lsrs r1, 24 bl AddTask @@ -878814,7 +878814,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 @@ -878826,72 +878826,72 @@ sub_81C70D8: @ 81C70D8 adds r1, r0, r2 ldrb r0, [r1, 0x4] cmp r0, 0 - beq _081C711C + beq @081C711C ldr r2, [r1] ldr r0, =sub_81C7170 + 1 cmp r2, r0 - beq _081C70FE + beq @081C70FE ldr r0, =sub_81C71E4 + 1 cmp r2, r0 - bne _081C711C -_081C70FE: + bne @081C711C +@081C70FE: movs r2, 0xE ldrsh r0, [r1, r2] cmp r0, r3 - bne _081C711C + bne @081C711C movs r0, 0x1 - b _081C711E + b @081C711E .align 2, 0 .pool -_081C711C: +@081C711C: movs r0, 0 -_081C711E: +@081C711E: pop {r1} bx r1 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 ldr r4, =0x03005e00 -_081C712C: +@081C712C: ldrb r0, [r4, 0x4] cmp r0, 0 - beq _081C7160 + beq @081C7160 ldr r1, [r4] ldr r0, =sub_81C7170 + 1 cmp r1, r0 - beq _081C7140 + beq @081C7140 ldr r0, =sub_81C71E4 + 1 cmp r1, r0 - bne _081C7160 -_081C7140: + bne @081C7160 +@081C7140: lsls r0, r5, 24 lsrs r0, 24 movs r1, 0x1 bl get_word_task_arg cmp r0, r6 - bne _081C7160 + bne @081C7160 movs r0, 0x1 - b _081C716A + b @081C716A .align 2, 0 .pool -_081C7160: +@081C7160: adds r4, 0x28 adds r5, 0x1 cmp r5, 0xF - ble _081C712C + ble @081C712C movs r0, 0 -_081C716A: +@081C716A: pop {r4-r6} pop {r1} bx r1 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 @@ -878905,60 +878905,60 @@ sub_81C7170: @ 81C7170 ldr r1, =0x03005e08 adds r4, r0, r1 movs r7, 0 -_081C718C: +@081C718C: movs r1, 0 ldrsh r0, [r4, r1] bl _call_via_r6 cmp r0, 0x4 - bhi _081C71D6 + bhi @081C71D6 lsls r0, 2 - ldr r1, =_081C71AC + ldr r1, =@081C71AC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081C71AC: - .4byte _081C71C6 - .4byte _081C71C0 - .4byte _081C71DE - .4byte _081C71DA - .4byte _081C71CE -_081C71C0: +@081C71AC: + .4byte @081C71C6 + .4byte @081C71C0 + .4byte @081C71DE + .4byte @081C71DA + .4byte @081C71CE +@081C71C0: ldrh r0, [r4] adds r0, 0x1 - b _081C71D8 -_081C71C6: + b @081C71D8 +@081C71C6: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - b _081C71DE -_081C71CE: + b @081C71DE +@081C71CE: adds r0, r5, 0 bl remove_task - b _081C71DE -_081C71D6: + b @081C71DE +@081C71D6: subs r0, 0x5 -_081C71D8: +@081C71D8: strh r0, [r4] -_081C71DA: +@081C71DA: cmp r7, 0 - beq _081C718C -_081C71DE: + beq @081C718C +@081C71DE: pop {r4-r7} pop {r0} bx r0 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 bl sub_8087598 cmp r0, 0 - bne _081C724A + bne @081C724A adds r0, r5, 0 movs r1, 0x1 bl get_word_task_arg @@ -878972,54 +878972,54 @@ sub_81C71E4: @ 81C71E4 ldrsh r0, [r4, r1] bl _call_via_r2 cmp r0, 0x4 - bhi _081C7246 + bhi @081C7246 lsls r0, 2 - ldr r1, =_081C7224 + ldr r1, =@081C7224 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081C7224: - .4byte _081C7238 - .4byte _081C7238 - .4byte _081C724A - .4byte _081C724A - .4byte _081C723E -_081C7238: +@081C7224: + .4byte @081C7238 + .4byte @081C7238 + .4byte @081C724A + .4byte @081C724A + .4byte @081C723E +@081C7238: ldrh r0, [r4] adds r0, 0x1 - b _081C7248 -_081C723E: + b @081C7248 +@081C723E: adds r0, r5, 0 bl remove_task - b _081C724A -_081C7246: + b @081C724A +@081C7246: subs r0, 0x5 -_081C7248: +@081C7248: strh r0, [r4] -_081C724A: +@081C724A: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_81C71E4 thumb_func_start sub_81C7250 -sub_81C7250: @ 81C7250 +sub_81C7250: ; 81C7250 push {r4,lr} ldr r4, =0x0203cf40 movs r0, 0x5C bl malloc str r0, [r4] cmp r0, 0 - bne _081C7270 + bne @081C7270 ldr r0, =sub_8086194 + 1 bl set_callback2 - b _081C7292 + b @081C7292 .align 2, 0 .pool -_081C7270: +@081C7270: bl sub_81C7360 bl clear_tasks movs r0, 0 @@ -879031,7 +879031,7 @@ _081C7270: bl set_callback2 ldr r0, =sub_81C7418 + 1 bl SetVBlankCallback -_081C7292: +@081C7292: pop {r4} pop {r0} bx r0 @@ -879040,7 +879040,7 @@ _081C7292: thumb_func_end sub_81C7250 thumb_func_start sub_81C72A4 -sub_81C72A4: @ 81C72A4 +sub_81C72A4: ; 81C72A4 push {lr} ldr r0, =sub_81C72BC + 1 bl set_callback2 @@ -879054,7 +879054,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 @@ -879062,19 +879062,19 @@ sub_81C72BC: @ 81C72BC movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081C7320 + bne @081C7320 ldr r4, =0x0203cf40 movs r0, 0x5C bl malloc str r0, [r4] cmp r0, 0 - bne _081C72F0 + bne @081C72F0 ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 - b _081C7320 + b @081C7320 .align 2, 0 .pool -_081C72F0: +@081C72F0: bl sub_81C7360 ldr r1, [r4] movs r0, 0x1 @@ -879091,7 +879091,7 @@ _081C72F0: bl set_callback2 ldr r0, =sub_81C7418 + 1 bl SetVBlankCallback -_081C7320: +@081C7320: pop {r4} pop {r0} bx r0 @@ -879100,15 +879100,15 @@ _081C7320: thumb_func_end sub_81C72BC thumb_func_start sub_81C7334 -sub_81C7334: @ 81C7334 +sub_81C7334: ; 81C7334 push {r4,lr} movs r4, 0 -_081C7338: +@081C7338: adds r0, r4, 0 bl sub_81C7650 adds r4, 0x1 cmp r4, 0x12 - ble _081C7338 + ble @081C7338 ldr r4, =0x0203cf40 ldr r0, [r4] bl free @@ -879123,18 +879123,18 @@ _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 movs r1, 0x12 adds r0, 0x58 -_081C736A: +@081C736A: str r2, [r0] subs r0, 0x4 subs r1, 0x1 cmp r1, 0 - bge _081C736A + bge @081C736A movs r4, 0 strh r4, [r5, 0x8] str r4, [r5, 0x4] @@ -879147,10 +879147,10 @@ _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: +@081C738C: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -879160,59 +879160,59 @@ _081C738C: movs r1, 0x5 bl pokemon_getattr cmp r0, 0 - beq _081C73BA + beq @081C73BA adds r0, r4, 0 movs r1, 0x6 bl pokemon_getattr cmp r0, 0 - bne _081C73BA + bne @081C73BA adds r0, r4, 0 movs r1, 0x52 bl pokemon_getattr cmp r0, 0 - bne _081C73E2 -_081C73BA: + bne @081C73E2 +@081C73BA: adds r5, 0x1 cmp r5, 0x5 - ble _081C738C + ble @081C738C movs r4, 0 -_081C73C2: +@081C73C2: movs r5, 0 lsls r6, r4, 24 -_081C73C6: +@081C73C6: adds r0, r4, 0 adds r1, r5, 0 bl sub_80D2270 cmp r0, 0 - beq _081C73EC + beq @081C73EC lsls r1, r5, 24 lsrs r1, 24 lsrs r0, r6, 24 movs r2, 0x52 bl get_pokemon_data_from_any_box cmp r0, 0 - beq _081C73EC -_081C73E2: + beq @081C73EC +@081C73E2: movs r0, 0x1 - b _081C73FA + b @081C73FA .align 2, 0 .pool -_081C73EC: +@081C73EC: adds r5, 0x1 cmp r5, 0x1D - ble _081C73C6 + ble @081C73C6 adds r4, 0x1 cmp r4, 0xD - ble _081C73C2 + ble @081C73C2 movs r0, 0 -_081C73FA: +@081C73FA: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_81C7388 thumb_func_start sub_81C7400 -sub_81C7400: @ 81C7400 +sub_81C7400: ; 81C7400 push {lr} bl run_active_tasks bl call_obj_callbacks @@ -879223,7 +879223,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 copy_super_sprites_to_oam @@ -879233,7 +879233,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 @@ -879245,54 +879245,54 @@ sub_81C742C: @ 81C742C movs r1, 0 ldrsh r0, [r7, r1] cmp r0, 0x5 - bls _081C7446 - b _081C7562 -_081C7446: + bls @081C7446 + b @081C7562 +@081C7446: lsls r0, 2 - ldr r1, =_081C7458 + ldr r1, =@081C7458 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081C7458: - .4byte _081C7470 - .4byte _081C747A - .4byte _081C7490 - .4byte _081C749C - .4byte _081C751E - .4byte _081C752C -_081C7470: +@081C7458: + .4byte @081C7470 + .4byte @081C747A + .4byte @081C7490 + .4byte @081C749C + .4byte @081C751E + .4byte @081C752C +@081C7470: bl sub_81C76C4 movs r0, 0x1 strh r0, [r7] - b _081C7562 -_081C747A: + b @081C7562 +@081C747A: bl sub_81C76FC cmp r0, 0 - bne _081C7562 + bne @081C7562 ldr r0, =0x000186a0 bl sub_81C756C - b _081C74E8 + b @081C74E8 .align 2, 0 .pool -_081C7490: +@081C7490: bl sub_81C786C cmp r0, 0 - bne _081C7562 + bne @081C7562 movs r0, 0x3 strh r0, [r7] -_081C749C: +@081C749C: bl sub_81C75E0 adds r6, r0, 0 movs r0, 0x1 negs r0, r0 cmp r6, r0 - beq _081C74FC + beq @081C74FC ldr r0, =0x0001869f cmp r6, r0 - bls _081C7506 + bls @081C7506 ldr r4, =0x0861f3ec ldr r5, =0x0203cf40 ldr r0, [r5] @@ -879317,40 +879317,40 @@ _081C749C: adds r0, r6, 0 bl sub_81C756C cmp r0, 0 - beq _081C74FC -_081C74E8: + beq @081C74FC +@081C74E8: movs r0, 0x4 strh r0, [r7] - b _081C7562 + b @081C7562 .align 2, 0 .pool -_081C74FC: +@081C74FC: bl sub_81C7710 movs r0, 0x5 strh r0, [r7] - b _081C7562 -_081C7506: + b @081C7562 +@081C7506: cmp r6, 0 - beq _081C7562 + beq @081C7562 adds r0, r6, 0 bl sub_81C7850 bl sub_81C786C cmp r0, 0 - beq _081C7562 + beq @081C7562 movs r0, 0x2 strh r0, [r7] - b _081C7562 -_081C751E: + b @081C7562 +@081C751E: bl sub_81C75D4 cmp r0, 0 - bne _081C7562 + bne @081C7562 movs r0, 0x3 strh r0, [r7] - b _081C7562 -_081C752C: + b @081C7562 +@081C752C: bl sub_81C7738 cmp r0, 0 - bne _081C7562 + bne @081C7562 ldr r0, =0x0203cf40 ldr r0, [r0] ldrh r0, [r0, 0x8] @@ -879360,16 +879360,16 @@ _081C752C: bl sub_81C9430 bl sub_81C7334 cmp r4, 0 - beq _081C755C + beq @081C755C ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 - b _081C7562 + b @081C7562 .align 2, 0 .pool -_081C755C: +@081C755C: ldr r0, =sub_8086194 + 1 bl set_callback2 -_081C7562: +@081C7562: pop {r4-r7} pop {r0} bx r0 @@ -879378,7 +879378,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 @@ -879391,14 +879391,14 @@ sub_81C756C: @ 81C756C ldr r0, [r0] bl _call_via_r0 cmp r0, 0 - beq _081C75CC + beq @081C75CC adds r0, r5, 0 adds r0, 0x8 adds r0, r4, r0 ldr r0, [r0] bl _call_via_r0 cmp r0, 0 - beq _081C75CC + beq @081C75CC adds r0, r5, 0 adds r0, 0xC adds r0, r4, r0 @@ -879416,19 +879416,19 @@ sub_81C756C: @ 81C756C str r0, [r1] str r6, [r1, 0x4] movs r0, 0x1 - b _081C75CE + b @081C75CE .align 2, 0 .pool -_081C75CC: +@081C75CC: movs r0, 0 -_081C75CE: +@081C75CE: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_81C756C thumb_func_start sub_81C75D4 -sub_81C75D4: @ 81C75D4 +sub_81C75D4: ; 81C75D4 push {lr} bl sub_81C786C pop {r1} @@ -879436,7 +879436,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] @@ -879449,7 +879449,7 @@ sub_81C75E0: @ 81C75E0 thumb_func_end sub_81C75E0 thumb_func_start sub_81C75F4 -sub_81C75F4: @ 81C75F4 +sub_81C75F4: ; 81C75F4 push {lr} bl init_keypad_data pop {r0} @@ -879457,7 +879457,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} @@ -879465,7 +879465,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 + 1 bl SetVBlankCallback @@ -879476,7 +879476,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 @@ -879495,7 +879495,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 @@ -879508,7 +879508,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] @@ -879517,14 +879517,14 @@ sub_81C7650: @ 81C7650 adds r1, r4 ldr r0, [r1] cmp r0, 0 - beq _081C7670 + beq @081C7670 bl free ldr r0, [r5] adds r0, 0x10 adds r0, r4 movs r1, 0 str r1, [r0] -_081C7670: +@081C7670: pop {r4,r5} pop {r0} bx r0 @@ -879533,7 +879533,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] @@ -879543,7 +879543,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] @@ -879553,13 +879553,13 @@ 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 - bls _081C769E + bls @081C769E movs r1, 0 -_081C769E: +@081C769E: ldr r0, =0x0203cf40 ldr r0, [r0] strh r1, [r0, 0xA] @@ -879570,7 +879570,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] @@ -879580,7 +879580,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] @@ -879590,14 +879590,14 @@ 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 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq _081C76F4 + beq @081C76F4 bl reset_all_obj_data bl gpu_pal_allocator_reset ldr r0, =sub_81C7764 + 1 @@ -879605,19 +879605,19 @@ sub_81C76C4: @ 81C76C4 bl sub_81C7078 str r0, [r4, 0xC] movs r0, 0x1 - b _081C76F6 + b @081C76F6 .align 2, 0 .pool -_081C76F4: +@081C76F4: movs r0, 0 -_081C76F6: +@081C76F6: pop {r4} pop {r1} bx r1 thumb_func_end sub_81C76C4 thumb_func_start sub_81C76FC -sub_81C76FC: @ 81C76FC +sub_81C76FC: ; 81C76FC push {lr} movs r0, 0 bl sub_81C763C @@ -879628,7 +879628,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 @@ -879648,46 +879648,46 @@ 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] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081C7750 + beq @081C7750 movs r0, 0x1 - b _081C775E + b @081C775E .align 2, 0 .pool -_081C7750: +@081C7750: bl sub_81C99D4 bl sub_81C7C94 bl Window_FreeMemory movs r0, 0 -_081C775E: +@081C775E: pop {r1} bx r1 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 - beq _081C77B0 + beq @081C77B0 cmp r0, 0x1 - bgt _081C7776 + bgt @081C7776 cmp r0, 0 - beq _081C7780 - b _081C782A -_081C7776: + beq @081C7780 + b @081C782A +@081C7776: cmp r0, 0x2 - beq _081C77FC + beq @081C77FC cmp r0, 0x3 - beq _081C780E - b _081C782A -_081C7780: + beq @081C780E + b @081C782A +@081C7780: movs r1, 0x82 lsls r1, 5 movs r0, 0 @@ -879702,10 +879702,10 @@ _081C7780: bl sub_8199D98 bl reset_temp_tile_data_buffers movs r0, 0x1 - b _081C782C + b @081C782C .align 2, 0 .pool -_081C77B0: +@081C77B0: movs r0, 0 bl sub_81C763C adds r4, r0, 0 @@ -879731,33 +879731,33 @@ _081C77B0: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0 - b _081C782C + b @081C782C .align 2, 0 .pool -_081C77FC: +@081C77FC: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - bne _081C7818 + bne @081C7818 bl sub_81C7B74 movs r0, 0 - b _081C782C -_081C780E: + b @081C782C +@081C780E: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _081C781C -_081C7818: + beq @081C781C +@081C7818: movs r0, 0x2 - b _081C782C -_081C781C: + b @081C782C +@081C781C: bl sub_81C7C28 bl sub_81C7D28 movs r0, 0 bl gpu_sync_bg_show -_081C782A: +@081C782A: movs r0, 0x4 -_081C782C: +@081C782C: add sp, 0x4 pop {r4} pop {r1} @@ -879765,7 +879765,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 @@ -879781,7 +879781,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 @@ -879797,7 +879797,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 @@ -879808,7 +879808,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 @@ -879825,7 +879825,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 @@ -879842,7 +879842,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 @@ -879853,23 +879853,23 @@ 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 + beq @081C78EA cmp r0, 0x1 - bgt _081C78E4 + bgt @081C78E4 cmp r0, 0 - beq _081C78EA - b _081C7914 -_081C78E4: + beq @081C78EA + b @081C7914 +@081C78E4: cmp r0, 0x2 - beq _081C78EE - b _081C7914 -_081C78EA: + beq @081C78EE + b @081C7914 +@081C78EA: movs r0, 0 - b _081C7916 -_081C78EE: + b @081C7916 +@081C78EE: movs r1, 0xC0 lsls r1, 1 movs r0, 0 @@ -879877,26 +879877,26 @@ _081C78EE: bl bg_change_y_offset ldr r1, =0x00001fff cmp r0, r1 - bhi _081C7908 + bhi @081C7908 movs r0, 0x2 - b _081C7916 + b @081C7916 .align 2, 0 .pool -_081C7908: +@081C7908: movs r1, 0x80 lsls r1, 6 movs r0, 0 movs r2, 0 bl bg_change_y_offset -_081C7914: +@081C7914: movs r0, 0x4 -_081C7916: +@081C7916: pop {r1} bx r1 thumb_func_end atk47_cmd47 thumb_func_start sub_81C791C -sub_81C791C: @ 81C791C +sub_81C791C: ; 81C791C push {lr} movs r1, 0xC0 lsls r1, 1 @@ -879904,22 +879904,22 @@ sub_81C791C: @ 81C791C movs r2, 0x2 bl bg_change_y_offset cmp r0, 0 - ble _081C7932 + ble @081C7932 movs r0, 0x2 - b _081C793E -_081C7932: + b @081C793E +@081C7932: movs r0, 0 movs r1, 0 movs r2, 0 bl bg_change_y_offset movs r0, 0x4 -_081C793E: +@081C793E: pop {r1} bx r1 thumb_func_end sub_81C791C thumb_func_start sub_81C7944 -sub_81C7944: @ 81C7944 +sub_81C7944: ; 81C7944 push {lr} lsls r1, 1 ldr r3, =0x02037714 @@ -879934,11 +879934,11 @@ 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 -_081C7962: + b @081C7974 +@081C7962: lsls r0, r1, 4 movs r2, 0x80 lsls r2, 1 @@ -879947,24 +879947,24 @@ _081C7962: movs r2, 0x20 bl sub_81C7944 adds r4, 0x8 -_081C7974: +@081C7974: ldr r0, [r4] cmp r0, 0 - beq _081C7988 + beq @081C7988 ldrh r0, [r4, 0x4] bl gpu_pal_alloc_new lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xFF - bne _081C7962 -_081C7988: + bne @081C7962 +@081C7988: pop {r4} pop {r0} bx r0 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 @@ -879987,7 +879987,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 @@ -880000,35 +880000,35 @@ sub_81C79BC: @ 81C79BC str r3, [sp, 0x8] ldr r0, [sp, 0x2C] cmp r0, 0 - bne _081C79E4 + bne @081C79E4 ldr r2, =0x001fffff mov r1, r10 ands r2, r1 ldr r0, [sp] - b _081C79F4 + b @081C79F4 .align 2, 0 .pool -_081C79E4: +@081C79E4: ldr r2, [sp, 0x2C] ldr r0, [sp, 0x8] cmp r2, r0 - blt _081C7A00 + blt @081C7A00 ldr r2, =0x001fffff mov r1, r10 ands r2, r1 ldr r0, [sp, 0x4] -_081C79F4: +@081C79F4: ldr r1, [sp, 0x30] bl CpuSet - b _081C7AAE + b @081C7AAE .align 2, 0 .pool -_081C7A00: +@081C7A00: movs r2, 0x1 negs r2, r2 add r10, r2 - b _081C7AA6 -_081C7A08: + b @081C7AA6 +@081C7A08: ldr r1, [sp] ldrh r0, [r1] movs r2, 0x1F @@ -880105,12 +880105,12 @@ _081C7A08: movs r1, 0x1 negs r1, r1 add r10, r1 -_081C7AA6: +@081C7AA6: movs r0, 0x1 negs r0, r0 cmp r10, r0 - bne _081C7A08 -_081C7AAE: + bne @081C7A08 +@081C7AAE: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -880122,33 +880122,33 @@ _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 movs r0, 0 bl sub_81C763C cmp r4, 0x1 - beq _081C7AF0 + beq @081C7AF0 cmp r4, 0x1 - bgt _081C7ADA + bgt @081C7ADA cmp r4, 0 - beq _081C7AE4 - b _081C7B2C -_081C7ADA: + beq @081C7AE4 + b @081C7B2C +@081C7ADA: cmp r4, 0x2 - beq _081C7B04 + beq @081C7B04 cmp r4, 0x3 - beq _081C7B18 - b _081C7B2C -_081C7AE4: + beq @081C7B18 + b @081C7B2C +@081C7AE4: ldr r0, [r0, 0x14] movs r1, 0x2 negs r1, r1 str r4, [sp] movs r2, 0 - b _081C7B10 -_081C7AF0: + b @081C7B10 +@081C7AF0: ldr r0, [r0, 0x14] movs r1, 0x2 negs r1, r1 @@ -880157,19 +880157,19 @@ _081C7AF0: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - b _081C7B2C -_081C7B04: + b @081C7B2C +@081C7B04: movs r0, 0x1 negs r0, r0 movs r1, 0x2 negs r1, r1 movs r2, 0 str r2, [sp] -_081C7B10: +@081C7B10: movs r3, 0x10 bl sub_80A1AD4 - b _081C7B2C -_081C7B18: + b @081C7B2C +@081C7B18: movs r0, 0x1 negs r0, r0 movs r1, 0x2 @@ -880179,7 +880179,7 @@ _081C7B18: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 -_081C7B2C: +@081C7B2C: add sp, 0x4 pop {r4} pop {r0} @@ -880187,7 +880187,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 @@ -880197,7 +880197,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 @@ -880210,27 +880210,27 @@ 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 - ble _081C7B6C + ble @081C7B6C adds r4, r1, 0 -_081C7B5E: +@081C7B5E: adds r0, r5, 0 adds r5, 0x4 bl bg_init_bg_config_2_from_bg_config_3 subs r4, 0x1 cmp r4, 0 - bne _081C7B5E -_081C7B6C: + bne @081C7B5E +@081C7B6C: pop {r4,r5} pop {r0} bx r0 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 @@ -880253,7 +880253,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 @@ -880285,7 +880285,7 @@ sub_81C7BA4: @ 81C7BA4 thumb_func_end sub_81C7BA4 thumb_func_start sub_81C7BE8 -sub_81C7BE8: @ 81C7BE8 +sub_81C7BE8: ; 81C7BE8 push {lr} bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -880295,7 +880295,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 @@ -880320,20 +880320,20 @@ 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 adds r6, r0, 0 movs r5, 0 ldr r4, =0x0861fa4c -_081C7C36: +@081C7C36: adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load adds r4, 0x8 adds r5, 0x1 cmp r5, 0 - beq _081C7C36 + beq @081C7C36 ldr r0, =0x0861fa54 bl sub_81C795C movs r0, 0 @@ -880368,7 +880368,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 @@ -880383,7 +880383,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 @@ -880397,7 +880397,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 @@ -880411,7 +880411,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 @@ -880448,7 +880448,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} @@ -880465,7 +880465,7 @@ sub_81C7D28: @ 81C7D28 ldr r0, =0x02020630 mov r8, r0 movs r7, 0x4 -_081C7D50: +@081C7D50: ldr r0, =0x0861fb2c movs r1, 0 movs r2, 0 @@ -880531,7 +880531,7 @@ _081C7D50: strh r2, [r3, 0x4] adds r5, 0x1 cmp r5, 0x1 - ble _081C7D50 + ble @081C7D50 pop {r3} mov r8, r3 pop {r4-r7} @@ -880542,40 +880542,40 @@ _081C7D50: thumb_func_end sub_81C7D28 thumb_func_start sub_81C7DFC -sub_81C7DFC: @ 81C7DFC +sub_81C7DFC: ; 81C7DFC push {lr} cmp r0, 0x5 - bhi _081C7E08 + bhi @081C7E08 bl sub_81C7E58 - b _081C7E0E -_081C7E08: + b @081C7E0E +@081C7E08: subs r0, 0x6 bl sub_81C7F24 -_081C7E0E: +@081C7E0E: pop {r0} bx r0 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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x4 - bne _081C7E30 + bne @081C7E30 movs r0, 0x2 bl gpu_tile_obj_tag_get_range_start ldr r3, [r5, 0x20] adds r0, 0x20 - b _081C7E3A -_081C7E30: + b @081C7E3A +@081C7E30: movs r0, 0x2 bl gpu_tile_obj_tag_get_range_start ldr r3, [r5, 0x20] adds r0, 0x40 -_081C7E3A: +@081C7E3A: ldr r2, =0x000003ff adds r1, r2, 0 ands r0, r1 @@ -880592,14 +880592,14 @@ _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 push {r6,r7} mov r9, r0 cmp r0, 0x5 - bhi _081C7F16 + bhi @081C7F16 movs r0, 0 bl sub_81C763C adds r7, r0, 0 @@ -880661,18 +880661,18 @@ sub_81C7E58: @ 81C7E58 mov r0, r9 subs r0, 0x4 cmp r0, 0x1 - bhi _081C7F10 + bhi @081C7F10 ldr r1, [r7, 0x20] movs r0, 0x38 - b _081C7F14 + b @081C7F14 .align 2, 0 .pool -_081C7F10: +@081C7F10: ldr r1, [r7, 0x20] movs r0, 0x40 -_081C7F14: +@081C7F14: strh r0, [r1, 0x24] -_081C7F16: +@081C7F16: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -880682,10 +880682,10 @@ _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 + bhi @081C7F8A ldr r2, =0x0861fa9c lsls r1, r0, 3 adds r0, r2, 0x4 @@ -880728,7 +880728,7 @@ sub_81C7F24: @ 81C7F24 adds r2, r5, 0 movs r3, 0x1 bl RequestDma3Copy -_081C7F8A: +@081C7F8A: pop {r4-r6} pop {r0} bx r0 @@ -880737,45 +880737,45 @@ _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 cmp r1, 0 - bne _081C7FAC + bne @081C7FAC movs r0, 0x30 -_081C7FAC: +@081C7FAC: cmp r3, 0x5 - bhi _081C7FB8 + bhi @081C7FB8 adds r1, r2, 0 bl sub_81C803C - b _081C7FBE -_081C7FB8: + b @081C7FBE +@081C7FB8: adds r1, r2, 0 bl sub_81C8088 -_081C7FBE: +@081C7FBE: pop {r0} bx r0 thumb_func_end sub_81C7FA0 thumb_func_start sub_81C7FC4 -sub_81C7FC4: @ 81C7FC4 +sub_81C7FC4: ; 81C7FC4 push {lr} cmp r0, 0x5 - bhi _081C7FD2 + bhi @081C7FD2 adds r0, r1, 0 bl sub_81C80D4 - b _081C7FD8 -_081C7FD2: + b @081C7FD8 +@081C7FD2: adds r0, r1, 0 bl sub_81C8110 -_081C7FD8: +@081C7FD8: pop {r0} bx r0 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 @@ -880783,7 +880783,7 @@ sub_81C7FDC: @ 81C7FDC adds r2, r0, 0 adds r2, 0x1C movs r3, 0x1 -_081C7FEC: +@081C7FEC: ldr r1, [r2] adds r1, 0x3E ldrb r0, [r1] @@ -880797,14 +880797,14 @@ _081C7FEC: adds r2, 0x4 subs r3, 0x1 cmp r3, 0 - bge _081C7FEC + bge @081C7FEC pop {r4} pop {r0} bx r0 thumb_func_end sub_81C7FDC thumb_func_start sub_81C8010 -sub_81C8010: @ 81C8010 +sub_81C8010: ; 81C8010 push {lr} movs r0, 0 bl sub_81C763C @@ -880813,24 +880813,24 @@ sub_81C8010: @ 81C8010 ldr r2, [r0, 0x1C] ldr r0, =nullsub_12 + 1 cmp r2, r0 - bne _081C8034 + bne @081C8034 ldr r0, [r1, 0x24] ldr r0, [r0, 0x1C] cmp r0, r2 - bne _081C8034 + bne @081C8034 movs r0, 0 - b _081C8036 + b @081C8036 .align 2, 0 .pool -_081C8034: +@081C8034: movs r0, 0x1 -_081C8036: +@081C8036: pop {r1} bx r1 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} @@ -880839,20 +880839,20 @@ sub_81C803C: @ 81C803C movs r0, 0 bl sub_81C763C cmp r4, 0 - bne _081C8058 + bne @081C8058 movs r7, 0x60 negs r7, r7 movs r6, 0x20 - b _081C805E -_081C8058: + b @081C805E +@081C8058: movs r7, 0x80 lsls r7, 1 movs r6, 0xA0 -_081C805E: +@081C805E: adds r4, r0, 0 adds r4, 0x1C movs r5, 0x1 -_081C8064: +@081C8064: ldr r0, [r4] mov r1, r8 strh r1, [r0, 0x22] @@ -880863,7 +880863,7 @@ _081C8064: bl sub_81C814C subs r5, 0x1 cmp r5, 0 - bge _081C8064 + bge @081C8064 pop {r3} mov r8, r3 pop {r4-r7} @@ -880872,7 +880872,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} @@ -880881,20 +880881,20 @@ sub_81C8088: @ 81C8088 movs r0, 0 bl sub_81C763C cmp r4, 0 - bne _081C80A4 + bne @081C80A4 movs r7, 0x60 negs r7, r7 movs r6, 0x10 - b _081C80AA -_081C80A4: + b @081C80AA +@081C80A4: movs r7, 0x80 lsls r7, 1 movs r6, 0xC0 -_081C80AA: +@081C80AA: adds r4, r0, 0 adds r4, 0x24 movs r5, 0x1 -_081C80B0: +@081C80B0: ldr r0, [r4] mov r1, r8 strh r1, [r0, 0x22] @@ -880905,7 +880905,7 @@ _081C80B0: bl sub_81C814C subs r5, 0x1 cmp r5, 0 - bge _081C80B0 + bge @081C80B0 pop {r3} mov r8, r3 pop {r4-r7} @@ -880914,26 +880914,26 @@ _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 bl sub_81C763C cmp r4, 0 - bne _081C80EA + bne @081C80EA movs r6, 0x20 movs r5, 0x60 negs r5, r5 - b _081C80F0 -_081C80EA: + b @081C80F0 +@081C80EA: movs r6, 0xC0 movs r5, 0x80 lsls r5, 1 -_081C80F0: +@081C80F0: adds r7, r0, 0 adds r7, 0x1C movs r4, 0x1 -_081C80F6: +@081C80F6: ldm r7!, {r0} adds r1, r6, 0 adds r2, r5, 0 @@ -880941,33 +880941,33 @@ _081C80F6: bl sub_81C814C subs r4, 0x1 cmp r4, 0 - bge _081C80F6 + bge @081C80F6 pop {r4-r7} pop {r0} bx r0 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 bl sub_81C763C cmp r4, 0 - bne _081C8126 + bne @081C8126 movs r6, 0x10 movs r5, 0x60 negs r5, r5 - b _081C812C -_081C8126: + b @081C812C +@081C8126: movs r6, 0xC0 movs r5, 0x80 lsls r5, 1 -_081C812C: +@081C812C: adds r7, r0, 0 adds r7, 0x24 movs r4, 0x1 -_081C8132: +@081C8132: ldm r7!, {r0} adds r1, r6, 0 adds r2, r5, 0 @@ -880975,14 +880975,14 @@ _081C8132: bl sub_81C814C subs r4, 0x1 cmp r4, 0 - bge _081C8132 + bge @081C8132 pop {r4-r7} pop {r0} bx r0 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 @@ -881008,14 +881008,14 @@ 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] movs r3, 0x32 ldrsh r0, [r2, r3] cmp r0, 0 - beq _081C81C4 + beq @081C81C4 subs r0, r1, 0x1 strh r0, [r2, 0x32] ldrh r0, [r2, 0x30] @@ -881030,28 +881030,28 @@ sub_81C817C: @ 81C817C movs r1, 0x88 lsls r1, 17 cmp r0, r1 - bls _081C81B6 + bls @081C81B6 adds r0, r2, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] - b _081C81CC -_081C81B6: + b @081C81CC +@081C81B6: adds r2, 0x3E ldrb r1, [r2] movs r0, 0x5 negs r0, r0 ands r0, r1 strb r0, [r2] - b _081C81CC -_081C81C4: + b @081C81CC +@081C81C4: ldrh r0, [r2, 0x3C] strh r0, [r2, 0x20] ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] -_081C81CC: +@081C81CC: pop {r0} bx r0 .align 2, 0 @@ -881059,7 +881059,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 @@ -881069,7 +881069,7 @@ sub_81C81D4: @ 81C81D4 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq _081C821C + beq @081C821C ldr r1, =0x00000888 adds r0, r4, r1 adds r1, r5, 0 @@ -881080,24 +881080,24 @@ sub_81C81D4: @ 81C81D4 adds r3, r7, 0 bl sub_81C91AC cmp r0, 0 - beq _081C821C + beq @081C821C ldr r0, =sub_81C8254 + 1 movs r1, 0x6 bl sub_81C7078 movs r0, 0x1 - b _081C821E + b @081C821E .align 2, 0 .pool -_081C821C: +@081C821C: movs r0, 0 -_081C821E: +@081C821E: pop {r4-r7} pop {r1} bx r1 thumb_func_end sub_81C81D4 thumb_func_start sub_81C8224 -sub_81C8224: @ 81C8224 +sub_81C8224: ; 81C8224 push {lr} ldr r0, =sub_81C8254 + 1 bl sub_81C7124 @@ -881108,7 +881108,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 @@ -881124,70 +881124,70 @@ 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 is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _081C82C0 + bne @081C82C0 movs r0, 0x11 bl sub_81C763C adds r2, r0, 0 cmp r4, 0x4 - bhi _081C82D6 + bhi @081C82D6 lsls r0, r4, 2 - ldr r1, =_081C827C + ldr r1, =@081C827C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081C827C: - .4byte _081C8290 - .4byte _081C829A - .4byte _081C82A4 - .4byte _081C82B8 - .4byte _081C82CC -_081C8290: +@081C827C: + .4byte @081C8290 + .4byte @081C829A + .4byte @081C82A4 + .4byte @081C82B8 + .4byte @081C82CC +@081C8290: adds r0, r2, 0 bl sub_81C82E4 movs r0, 0 - b _081C82D8 -_081C829A: + b @081C82D8 +@081C829A: adds r0, r2, 0 bl sub_81C835C movs r0, 0 - b _081C82D8 -_081C82A4: + b @081C82D8 +@081C82A4: ldr r1, =0x00000888 adds r0, r2, r1 adds r1, r2, 0 bl sub_81C837C movs r0, 0 - b _081C82D8 + b @081C82D8 .align 2, 0 .pool -_081C82B8: +@081C82B8: bl sub_81C83E0 cmp r0, 0 - beq _081C82C4 -_081C82C0: + beq @081C82C4 +@081C82C0: movs r0, 0x2 - b _081C82D8 -_081C82C4: + b @081C82D8 +@081C82C4: bl sub_81C8ED0 movs r0, 0x1 - b _081C82D8 -_081C82CC: + b @081C82D8 +@081C82CC: ldr r1, =0x00000888 adds r0, r2, r1 adds r1, r2, 0 bl sub_81C8EF8 -_081C82D6: +@081C82D6: movs r0, 0x4 -_081C82D8: +@081C82D8: pop {r4} pop {r1} bx r1 @@ -881196,7 +881196,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 @@ -881251,7 +881251,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] @@ -881268,7 +881268,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 @@ -881278,9 +881278,9 @@ sub_81C837C: @ 81C837C subs r2, r0, r4 ldrh r0, [r3, 0x8] cmp r2, r0 - ble _081C8392 + ble @081C8392 adds r2, r0, 0 -_081C8392: +@081C8392: ldr r0, [r3, 0x10] ldr r3, [r3, 0xC] movs r1, 0 @@ -881295,13 +881295,13 @@ _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 ldr r1, [sp, 0x10] cmp r2, 0 - beq _081C83D6 + beq @081C83D6 adds r0, r5, 0 muls r0, r3 adds r0, r4, r0 @@ -881316,7 +881316,7 @@ sub_81C83AC: @ 81C83AC ldr r0, =sub_81C83F0 + 1 movs r1, 0x5 bl sub_81C7078 -_081C83D6: +@081C83D6: pop {r4,r5} pop {r0} bx r0 @@ -881325,7 +881325,7 @@ _081C83D6: thumb_func_end sub_81C83AC thumb_func_start sub_81C83E0 -sub_81C83E0: @ 81C83E0 +sub_81C83E0: ; 81C83E0 push {lr} ldr r0, =sub_81C83F0 + 1 bl sub_81C7124 @@ -881336,7 +881336,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 @@ -881344,11 +881344,11 @@ sub_81C83F0: @ 81C83F0 bl sub_81C763C adds r4, r0, 0 cmp r6, 0 - beq _081C8408 + beq @081C8408 cmp r6, 0x1 - beq _081C848C - b _081C849A -_081C8408: + beq @081C848C + b @081C849A +@081C8408: ldrh r0, [r4, 0xA] ldrh r1, [r4, 0xC] adds r0, r1 @@ -881364,12 +881364,12 @@ _081C8408: bl _call_via_r2 ldr r3, [r4, 0x38] cmp r3, 0 - beq _081C8434 + beq @081C8434 ldrh r0, [r4, 0x8] ldr r1, [r4, 0x14] adds r2, r5, 0 bl _call_via_r3 -_081C8434: +@081C8434: ldrb r0, [r4, 0x8] ldrb r1, [r4, 0x5] lsls r2, r5, 4 @@ -881389,22 +881389,22 @@ _081C8434: lsrs r0, 16 ldrh r1, [r4, 0xE] cmp r0, r1 - bcc _081C847A + bcc @081C847A ldr r0, [r4, 0x38] cmp r0, 0 - beq _081C846E + beq @081C846E ldrb r0, [r4, 0x8] movs r1, 0x3 bl Window_CopyToVram - b _081C8476 -_081C846E: + b @081C8476 +@081C846E: ldrb r0, [r4, 0x8] movs r1, 0x2 bl Window_CopyToVram -_081C8476: +@081C8476: movs r0, 0 - b _081C849C -_081C847A: + b @081C849C +@081C847A: ldr r0, [r4, 0x1C] ldr r1, [r4, 0x18] adds r0, r1 @@ -881413,17 +881413,17 @@ _081C847A: adds r0, 0x1 str r0, [r4, 0x14] movs r0, 0x3 - b _081C849C -_081C848C: + b @081C849C +@081C848C: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _081C849A + beq @081C849A movs r0, 0x2 - b _081C849C -_081C849A: + b @081C849C +@081C849A: movs r0, 0x4 -_081C849C: +@081C849C: add sp, 0xC pop {r4-r7} pop {r1} @@ -881431,7 +881431,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 @@ -881448,7 +881448,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 @@ -881460,9 +881460,9 @@ sub_81C84C0: @ 81C84C0 adds r1, r2 ldrh r0, [r0, 0x2] cmp r1, r0 - bge _081C84DC + bge @081C84DC movs r3, 0x1 -_081C84DC: +@081C84DC: adds r0, r3, 0 pop {r1} bx r1 @@ -881471,7 +881471,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 @@ -881482,15 +881482,15 @@ sub_81C84E8: @ 81C84E8 ldr r0, =0x00000888 adds r5, r7, r0 cmp r6, 0 - bge _081C8524 + bge @081C8524 ldrh r1, [r5] adds r0, r1, r6 cmp r0, 0 - bge _081C850A + bge @081C850A negs r6, r1 -_081C850A: +@081C850A: cmp r4, 0 - beq _081C854E + beq @081C854E ldr r0, [r5, 0x10] adds r1, r6 negs r2, r6 @@ -881498,12 +881498,12 @@ _081C850A: str r6, [sp] str r7, [sp, 0x4] bl sub_81C83AC - b _081C854E + b @081C854E .align 2, 0 .pool -_081C8524: +@081C8524: cmp r4, 0 - beq _081C854E + beq @081C854E ldr r2, =0x0203cf44 ldrh r1, [r5] ldrh r0, [r5, 0x8] @@ -881512,9 +881512,9 @@ _081C8524: adds r0, r4, r6 ldrh r1, [r5, 0x2] cmp r0, r1 - blt _081C853C + blt @081C853C subs r6, r1, r4 -_081C853C: +@081C853C: ldr r0, [r5, 0x10] ldr r3, [r5, 0xC] ldrh r1, [r5, 0x8] @@ -881523,7 +881523,7 @@ _081C853C: adds r1, r4, 0 adds r2, r6, 0 bl sub_81C83AC -_081C854E: +@081C854E: adds r0, r6, 0 adds r1, r7, 0 bl sub_81C8568 @@ -881539,7 +881539,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 @@ -881550,12 +881550,12 @@ sub_81C8568: @ 81C8568 adds r0, r1 str r0, [r4, 0x24] cmp r5, 0 - ble _081C8584 + ble @081C8584 movs r0, 0x1 - b _081C8586 -_081C8584: + b @081C8586 +@081C8584: movs r0, 0x2 -_081C8586: +@081C8586: str r0, [r4, 0x30] str r5, [r4, 0x2C] ldr r0, =sub_81C85A0 + 1 @@ -881570,25 +881570,25 @@ _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 bl sub_81C763C adds r4, r0, 0 cmp r5, 0 - beq _081C85B8 + beq @081C85B8 cmp r5, 0x1 - beq _081C85C4 + beq @081C85C4 movs r0, 0x4 - b _081C862A -_081C85B8: + b @081C862A +@081C85B8: bl sub_81C83E0 cmp r0, 0 - bne _081C8628 + bne @081C8628 movs r0, 0x1 - b _081C862A -_081C85C4: + b @081C862A +@081C85C4: movs r6, 0 ldrb r0, [r4] bl bg_get_y_offset @@ -881603,32 +881603,32 @@ _081C85C4: adds r1, r0, 0 ldr r0, [r4, 0x30] cmp r0, 0x2 - bne _081C85F8 + bne @081C85F8 ldr r2, [r4, 0x24] cmp r5, r2 - bgt _081C85F2 + bgt @081C85F2 ldr r0, [r4, 0x20] cmp r5, r0 - bgt _081C860A -_081C85F2: + bgt @081C860A +@081C85F2: cmp r1, r2 - bgt _081C860A - b _081C860E -_081C85F8: + bgt @081C860A + b @081C860E +@081C85F8: ldr r2, [r4, 0x24] cmp r5, r2 - blt _081C8604 + blt @081C8604 ldr r0, [r4, 0x20] cmp r5, r0 - blt _081C860A -_081C8604: + blt @081C860A +@081C8604: cmp r1, r2 - blt _081C860A + blt @081C860A movs r6, 0x1 -_081C860A: +@081C860A: cmp r6, 0 - beq _081C8628 -_081C860E: + beq @081C8628 +@081C860E: ldr r1, [r4, 0x2C] ldrh r0, [r4, 0xA] adds r0, r1 @@ -881640,17 +881640,17 @@ _081C860E: movs r2, 0 bl bg_change_y_offset movs r0, 0x4 - b _081C862A -_081C8628: + b @081C862A +@081C8628: movs r0, 0x2 -_081C862A: +@081C862A: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_81C85A0 thumb_func_start sub_81C8630 -sub_81C8630: @ 81C8630 +sub_81C8630: ; 81C8630 push {lr} movs r0, 0x11 bl sub_81C763C @@ -881661,7 +881661,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 @@ -881674,36 +881674,36 @@ 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 ldrh r0, [r1, 0x6] cmp r0, 0 - beq _081C866E + beq @081C866E subs r0, 0x1 strh r0, [r1, 0x6] movs r0, 0x1 - b _081C8686 -_081C866E: + b @081C8686 +@081C866E: bl sub_81C84A4 cmp r0, 0 - bne _081C867A + bne @081C867A movs r0, 0 - b _081C8686 -_081C867A: + b @081C8686 +@081C867A: movs r0, 0x1 negs r0, r0 movs r1, 0x1 bl sub_81C84E8 movs r0, 0x2 -_081C8686: +@081C8686: pop {r1} bx r1 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 @@ -881713,119 +881713,119 @@ sub_81C868C: @ 81C868C ldrh r0, [r2, 0x2] subs r0, 0x1 cmp r1, r0 - bge _081C86BA + bge @081C86BA ldrh r0, [r2, 0x8] subs r0, 0x1 cmp r3, r0 - bge _081C86B2 + bge @081C86B2 adds r0, r3, 0x1 strh r0, [r2, 0x6] movs r0, 0x1 - b _081C86C8 -_081C86B2: + b @081C86C8 +@081C86B2: bl sub_81C84C0 cmp r0, 0 - bne _081C86BE -_081C86BA: + bne @081C86BE +@081C86BA: movs r0, 0 - b _081C86C8 -_081C86BE: + b @081C86C8 +@081C86BE: movs r0, 0x1 movs r1, 0x1 bl sub_81C84E8 movs r0, 0x2 -_081C86C8: +@081C86C8: pop {r1} bx r1 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 bl sub_81C84A4 adds r1, r0, 0 cmp r1, 0 - beq _081C86F8 + beq @081C86F8 ldrh r0, [r4] ldrh r1, [r4, 0x8] cmp r0, r1 - bcc _081C86EA + bcc @081C86EA ldrh r0, [r4, 0x8] - b _081C86EC -_081C86EA: + b @081C86EC +@081C86EA: ldrh r0, [r4] -_081C86EC: +@081C86EC: negs r0, r0 movs r1, 0x1 bl sub_81C84E8 movs r0, 0x2 - b _081C8706 -_081C86F8: + b @081C8706 +@081C86F8: ldrh r0, [r4, 0x6] cmp r0, 0 - bne _081C8702 + bne @081C8702 movs r0, 0 - b _081C8706 -_081C8702: + b @081C8706 +@081C8702: strh r1, [r4, 0x6] movs r0, 0x1 -_081C8706: +@081C8706: pop {r4} pop {r1} bx r1 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 bl sub_81C84C0 cmp r0, 0 - beq _081C8736 + beq @081C8736 ldrh r0, [r4] ldrh r3, [r4, 0x8] adds r2, r0, r3 ldrh r1, [r4, 0x4] subs r0, r1, r0 cmp r2, r1 - bgt _081C872C + bgt @081C872C adds r0, r3, 0 -_081C872C: +@081C872C: movs r1, 0x1 bl sub_81C84E8 movs r0, 0x2 - b _081C8756 -_081C8736: + b @081C8756 +@081C8736: ldrh r0, [r4, 0x2] ldrh r1, [r4, 0x8] cmp r0, r1 - bcc _081C8744 + bcc @081C8744 ldrh r1, [r4, 0x6] ldrh r0, [r4, 0x8] - b _081C8748 -_081C8744: + b @081C8748 +@081C8744: ldrh r1, [r4, 0x6] ldrh r0, [r4, 0x2] -_081C8748: +@081C8748: subs r0, 0x1 cmp r1, r0 - bge _081C8754 + bge @081C8754 strh r0, [r4, 0x6] movs r0, 0x1 - b _081C8756 -_081C8754: + b @081C8756 +@081C8754: movs r0, 0 -_081C8756: +@081C8756: pop {r4} pop {r1} bx r1 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 @@ -881837,7 +881837,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] @@ -881846,7 +881846,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 @@ -881870,7 +881870,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 @@ -881902,7 +881902,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 @@ -881926,7 +881926,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 @@ -881940,7 +881940,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 @@ -881968,33 +881968,33 @@ 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 bl sub_81C763C adds r4, r0, 0 cmp r5, 0x4 - bhi _081C894C + bhi @081C894C lsls r0, r5, 2 - ldr r1, =_081C8890 + ldr r1, =@081C8890 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081C8890: - .4byte _081C88A4 - .4byte _081C88AC - .4byte _081C88D8 - .4byte _081C8918 - .4byte _081C8938 -_081C88A4: +@081C8890: + .4byte @081C88A4 + .4byte @081C88AC + .4byte @081C88D8 + .4byte @081C8918 + .4byte @081C8938 +@081C88A4: adds r0, r4, 0 movs r1, 0x1 bl sub_81C9008 -_081C88AC: +@081C88AC: ldr r0, =0x0000089c adds r5, r4, r0 ldr r1, =0x0000088e @@ -882002,24 +882002,24 @@ _081C88AC: ldr r1, [r5] ldrh r0, [r0] cmp r1, r0 - beq _081C88C4 + beq @081C88C4 adds r0, r4, 0 movs r2, 0x1 bl sub_81C8B70 -_081C88C4: +@081C88C4: ldr r0, [r5] adds r0, 0x1 str r0, [r5] -_081C88CA: +@081C88CA: movs r0, 0 - b _081C894E + b @081C894E .align 2, 0 .pool -_081C88D8: +@081C88D8: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _081C8942 + bne @081C8942 ldr r2, =0x0000089c adds r0, r4, r2 subs r2, 0xC @@ -882027,54 +882027,54 @@ _081C88D8: ldr r3, [r0] ldrh r1, [r1] cmp r3, r1 - beq _081C88FC + beq @081C88FC movs r0, 0x6 - b _081C894E + b @081C894E .align 2, 0 .pool -_081C88FC: +@081C88FC: ldr r0, =0x0000088e adds r1, r4, r0 ldrh r0, [r1] cmp r0, 0 - beq _081C88CA + beq @081C88CA adds r2, r0, 0 adds r0, r4, 0 adds r1, r3, 0 bl sub_81C8B70 - b _081C88CA + b @081C88CA .align 2, 0 .pool -_081C8918: +@081C8918: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _081C8942 + bne @081C8942 ldr r2, =0x0000088e adds r1, r4, r2 ldrh r0, [r1] cmp r0, 0 - beq _081C894C + beq @081C894C movs r1, 0 bl sub_81C84E8 - b _081C88CA + b @081C88CA .align 2, 0 .pool -_081C8938: +@081C8938: bl sub_81C8630 adds r1, r0, 0 cmp r1, 0 - beq _081C8946 -_081C8942: + beq @081C8946 +@081C8942: movs r0, 0x2 - b _081C894E -_081C8946: + b @081C894E +@081C8946: ldr r2, =0x0000088e adds r0, r4, r2 strh r1, [r0] -_081C894C: +@081C894C: movs r0, 0x4 -_081C894E: +@081C894E: pop {r4,r5} pop {r1} bx r1 @@ -882083,7 +882083,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 @@ -882092,108 +882092,108 @@ sub_81C8958: @ 81C8958 bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _081C8972 + beq @081C8972 movs r0, 0x2 - b _081C8A22 -_081C8972: + b @081C8A22 +@081C8972: cmp r5, 0x7 - bhi _081C8A1C + bhi @081C8A1C lsls r0, r5, 2 - ldr r1, =_081C8984 + ldr r1, =@081C8984 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081C8984: - .4byte _081C89A4 - .4byte _081C89B4 - .4byte _081C89BE - .4byte _081C89D0 - .4byte _081C89DA - .4byte _081C89EC - .4byte _081C89F6 - .4byte _081C8A08 -_081C89A4: +@081C8984: + .4byte @081C89A4 + .4byte @081C89B4 + .4byte @081C89BE + .4byte @081C89D0 + .4byte @081C89DA + .4byte @081C89EC + .4byte @081C89F6 + .4byte @081C8A08 +@081C89A4: ldr r1, =0x00000888 adds r0, r4, r1 adds r1, r4, 0 bl sub_81C8CB4 - b _081C8A20 + b @081C8A20 .align 2, 0 .pool -_081C89B4: +@081C89B4: adds r0, r4, 0 movs r1, 0 bl sub_81C8DBC - b _081C8A20 -_081C89BE: + b @081C8A20 +@081C89BE: ldr r1, =0x00000888 adds r0, r4, r1 adds r1, r4, 0 movs r2, 0 bl sub_81C8E54 - b _081C8A20 + b @081C8A20 .align 2, 0 .pool -_081C89D0: +@081C89D0: adds r0, r4, 0 movs r1, 0x1 bl sub_81C8DBC - b _081C8A20 -_081C89DA: + b @081C8A20 +@081C89DA: ldr r1, =0x00000888 adds r0, r4, r1 adds r1, r4, 0 movs r2, 0x1 bl sub_81C8E54 - b _081C8A20 + b @081C8A20 .align 2, 0 .pool -_081C89EC: +@081C89EC: adds r0, r4, 0 movs r1, 0x2 bl sub_81C8DBC - b _081C8A20 -_081C89F6: + b @081C8A20 +@081C89F6: ldr r1, =0x00000888 adds r0, r4, r1 adds r1, r4, 0 movs r2, 0x2 bl sub_81C8E54 - b _081C8A20 + b @081C8A20 .align 2, 0 .pool -_081C8A08: +@081C8A08: ldr r1, =0x00000888 adds r0, r4, r1 adds r1, r4, 0 movs r2, 0x3 bl sub_81C8E54 - b _081C8A20 + b @081C8A20 .align 2, 0 .pool -_081C8A1C: +@081C8A1C: movs r0, 0x4 - b _081C8A22 -_081C8A20: + b @081C8A22 +@081C8A20: movs r0, 0 -_081C8A22: +@081C8A22: pop {r4,r5} pop {r1} bx r1 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 bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _081C8AA6 + bne @081C8AA6 movs r0, 0x11 bl sub_81C763C adds r4, r0, 0 @@ -882201,32 +882201,32 @@ sub_81C8A28: @ 81C8A28 adds r6, r4, r0 adds r2, r4, 0 cmp r5, 0x6 - bls _081C8A4C - b _081C8B64 -_081C8A4C: + bls @081C8A4C + b @081C8B64 +@081C8A4C: lsls r0, r5, 2 - ldr r1, =_081C8A60 + ldr r1, =@081C8A60 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081C8A60: - .4byte _081C8A7C - .4byte _081C8A88 - .4byte _081C8AE8 - .4byte _081C8AFC - .4byte _081C8B14 - .4byte _081C8B34 - .4byte _081C8B5C -_081C8A7C: +@081C8A60: + .4byte @081C8A7C + .4byte @081C8A88 + .4byte @081C8AE8 + .4byte @081C8AFC + .4byte @081C8B14 + .4byte @081C8B34 + .4byte @081C8B5C +@081C8A7C: adds r0, r6, 0 adds r1, r2, 0 bl sub_81C8D4C movs r0, 0 - b _081C8B66 -_081C8A88: + b @081C8B66 +@081C8A88: ldr r1, =0x0000089c adds r7, r4, r1 ldr r0, [r7] @@ -882237,36 +882237,36 @@ _081C8A88: adds r0, r4, r3 ldrh r0, [r0] cmp r1, r0 - bge _081C8AB0 + bge @081C8AB0 adds r0, r2, 0 movs r2, 0x1 bl sub_81C8B70 -_081C8AA6: +@081C8AA6: movs r0, 0x2 - b _081C8B66 + b @081C8B66 .align 2, 0 .pool -_081C8AB0: +@081C8AB0: movs r0, 0 str r0, [r7] ldrh r0, [r6, 0x2] ldrh r1, [r6, 0x8] cmp r0, r1 - bhi _081C8AC6 + bhi @081C8AC6 ldrh r0, [r6] cmp r0, 0 - beq _081C8B52 + beq @081C8B52 adds r4, r0, 0 - b _081C8AD4 -_081C8AC6: + b @081C8AD4 +@081C8AC6: ldrh r1, [r6] ldrh r0, [r6, 0x8] adds r4, r1, r0 ldrh r1, [r6, 0x2] cmp r4, r1 - ble _081C8B52 + ble @081C8B52 subs r4, r1 -_081C8AD4: +@081C8AD4: negs r5, r4 adds r0, r2, 0 adds r1, r5, 0 @@ -882275,31 +882275,31 @@ _081C8AD4: strh r4, [r6, 0x6] str r5, [r7] movs r0, 0 - b _081C8B66 -_081C8AE8: + b @081C8B66 +@081C8AE8: ldr r2, =0x0000089c adds r0, r4, r2 ldr r0, [r0] movs r1, 0 bl sub_81C84E8 movs r0, 0 - b _081C8B66 + b @081C8B66 .align 2, 0 .pool -_081C8AFC: +@081C8AFC: bl sub_81C8630 adds r1, r0, 0 cmp r1, 0 - bne _081C8AA6 + bne @081C8AA6 ldr r3, =0x0000089c adds r0, r4, r3 str r1, [r0] -_081C8B0C: +@081C8B0C: movs r0, 0x1 - b _081C8B66 + b @081C8B66 .align 2, 0 .pool -_081C8B14: +@081C8B14: ldr r0, [r6, 0x10] ldrh r1, [r6] ldr r3, =0x0000089c @@ -882312,13 +882312,13 @@ _081C8B14: movs r2, 0x1 bl sub_81C83AC movs r0, 0 - b _081C8B66 + b @081C8B66 .align 2, 0 .pool -_081C8B34: +@081C8B34: bl sub_81C83E0 cmp r0, 0 - bne _081C8AA6 + bne @081C8AA6 ldr r0, =0x0000089c adds r1, r4, r0 ldr r0, [r1] @@ -882326,22 +882326,22 @@ _081C8B34: str r0, [r1] ldrh r1, [r6, 0x2] cmp r0, r1 - bge _081C8B0C + bge @081C8B0C ldrh r6, [r6, 0x8] cmp r0, r6 - bge _081C8B0C -_081C8B52: + bge @081C8B0C +@081C8B52: movs r0, 0x9 - b _081C8B66 + b @081C8B66 .align 2, 0 .pool -_081C8B5C: +@081C8B5C: adds r0, r2, 0 movs r1, 0 bl sub_81C9008 -_081C8B64: +@081C8B64: movs r0, 0x4 -_081C8B66: +@081C8B66: add sp, 0x8 pop {r4-r7} pop {r1} @@ -882349,7 +882349,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 @@ -882372,7 +882372,7 @@ sub_81C8B70: @ 81C8B70 ands r7, r0 adds r0, r7, r6 cmp r0, 0x10 - bgt _081C8BD4 + bgt @081C8BD4 ldr r0, =0x11111111 str r0, [sp] adds r1, r7, 0 @@ -882392,10 +882392,10 @@ sub_81C8B70: @ 81C8B70 ldrb r0, [r1, 0x8] movs r1, 0x2 bl Window_CopyToVram - b _081C8C1E + b @081C8C1E .align 2, 0 .pool -_081C8BD4: +@081C8BD4: movs r2, 0x10 subs r2, r7 subs r0, r6, r2 @@ -882430,15 +882430,15 @@ _081C8BD4: ldrb r0, [r1, 0x8] movs r1, 0x2 bl Window_CopyToVram -_081C8C1E: +@081C8C1E: subs r6, 0x1 movs r0, 0x1 negs r0, r0 cmp r6, r0 - beq _081C8C40 + beq @081C8C40 movs r5, 0xF adds r4, r0, 0 -_081C8C2C: +@081C8C2C: mov r1, r9 ldrh r0, [r1, 0x8] adds r1, r7, 0 @@ -882447,8 +882447,8 @@ _081C8C2C: ands r7, r5 subs r6, 0x1 cmp r6, r4 - bne _081C8C2C -_081C8C40: + bne @081C8C2C +@081C8C40: mov r1, r9 ldrb r0, [r1, 0x8] movs r1, 0x1 @@ -882466,7 +882466,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 @@ -882485,17 +882485,17 @@ sub_81C8C64: @ 81C8C64 subs r0, 0x2 adds r2, r0 cmp r4, 0 - beq _081C8C98 + beq @081C8C98 ldrb r0, [r5, 0x1] lsls r0, 12 ldrh r1, [r5, 0x6] adds r1, 0x1 - b _081C8C9E -_081C8C98: + b @081C8C9E +@081C8C98: ldrb r0, [r5, 0x1] lsls r0, 12 ldrh r1, [r5, 0x6] -_081C8C9E: +@081C8C9E: orrs r0, r1 lsls r0, 16 lsrs r1, r0, 16 @@ -882509,7 +882509,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 @@ -882582,7 +882582,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 @@ -882636,7 +882636,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 @@ -882710,7 +882710,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} @@ -882728,7 +882728,7 @@ sub_81C8E54: @ 81C8E54 bl sub_81CAFD8 adds r5, r0, 0 cmp r5, 0 - beq _081C8EC0 + beq @081C8EC0 ldrh r0, [r7, 0x8] lsls r4, r6, 1 ldrb r3, [r7, 0x4] @@ -882761,7 +882761,7 @@ sub_81C8E54: @ 81C8E54 movs r2, 0 adds r3, r4, 0 bl Window_CopyRectToVram -_081C8EC0: +@081C8EC0: add sp, 0xC pop {r3} mov r8, r3 @@ -882773,17 +882773,17 @@ _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, =0x0861fbfc -_081C8ED6: +@081C8ED6: adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load adds r4, 0x8 adds r5, 0x1 cmp r5, 0 - beq _081C8ED6 + beq @081C8ED6 ldr r0, =0x0861fc04 bl sub_81C795C pop {r4,r5} @@ -882794,7 +882794,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 @@ -882899,7 +882899,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] @@ -882918,12 +882918,12 @@ 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 cmp r4, 0 - beq _081C9028 + beq @081C9028 ldr r2, [r5, 0x3C] ldr r1, =nullsub_12 + 1 str r1, [r2, 0x1C] @@ -882931,10 +882931,10 @@ sub_81C9008: @ 81C9008 str r1, [r0, 0x1C] ldr r0, [r5, 0x44] str r1, [r0, 0x1C] - b _081C903A + b @081C903A .align 2, 0 .pool -_081C9028: +@081C9028: ldr r2, [r5, 0x3C] ldr r0, =sub_81C9080 + 1 str r0, [r2, 0x1C] @@ -882944,7 +882944,7 @@ _081C9028: ldr r1, [r5, 0x44] ldr r0, =sub_81C90A0 + 1 str r0, [r1, 0x1C] -_081C903A: +@081C903A: adds r3, r2, 0 adds r3, 0x3E movs r0, 0x1 @@ -882978,7 +882978,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 @@ -882996,30 +882996,30 @@ 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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _081C90C2 + bne @081C90C2 bl sub_81C84C0 cmp r0, 0 - beq _081C90C2 + beq @081C90C2 adds r2, r4, 0 adds r2, 0x3E ldrb r1, [r2] movs r0, 0x5 negs r0, r0 ands r0, r1 - b _081C90CC -_081C90C2: + b @081C90CC +@081C90C2: adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 -_081C90CC: +@081C90CC: strb r0, [r2] ldrh r0, [r4, 0x2E] adds r0, 0x1 @@ -883027,7 +883027,7 @@ _081C90CC: lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble _081C90EC + ble @081C90EC movs r0, 0 strh r0, [r4, 0x2E] ldrh r0, [r4, 0x30] @@ -883036,37 +883036,37 @@ _081C90CC: ands r0, r1 strh r0, [r4, 0x30] strh r0, [r4, 0x26] -_081C90EC: +@081C90EC: pop {r4} pop {r0} bx r0 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 ldrsh r0, [r4, r1] cmp r0, 0 - bne _081C9116 + bne @081C9116 bl sub_81C84A4 cmp r0, 0 - beq _081C9116 + beq @081C9116 adds r2, r4, 0 adds r2, 0x3E ldrb r1, [r2] movs r0, 0x5 negs r0, r0 ands r0, r1 - b _081C9120 -_081C9116: + b @081C9120 +@081C9116: adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 -_081C9120: +@081C9120: strb r0, [r2] ldrh r0, [r4, 0x2E] adds r0, 0x1 @@ -883074,7 +883074,7 @@ _081C9120: lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble _081C9142 + ble @081C9142 movs r0, 0 strh r0, [r4, 0x2E] ldrh r0, [r4, 0x30] @@ -883084,14 +883084,14 @@ _081C9120: strh r0, [r4, 0x30] negs r0, r0 strh r0, [r4, 0x26] -_081C9142: +@081C9142: pop {r4} pop {r0} bx r0 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 @@ -883106,7 +883106,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] @@ -883123,12 +883123,12 @@ sub_81C9160: @ 81C9160 lsls r0, r3, 16 lsrs r0, 16 cmp r1, r0 - bcc _081C918A + bcc @081C918A strh r5, [r2] strh r5, [r2, 0x4] strh r4, [r2, 0x6] - b _081C91A6 -_081C918A: + b @081C91A6 +@081C918A: subs r0, r3, r1 strh r0, [r2, 0x4] ldrh r1, [r2] @@ -883136,22 +883136,22 @@ _081C918A: adds r1, r0 ldrh r0, [r2, 0x2] cmp r1, r0 - ble _081C91A4 + ble @081C91A4 subs r0, r1, r0 strh r0, [r2, 0x6] subs r0, r4, r0 strh r0, [r2] - b _081C91A6 -_081C91A4: + b @081C91A6 +@081C91A4: strh r5, [r2, 0x6] -_081C91A6: +@081C91A6: pop {r4,r5} pop {r0} bx r0 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 @@ -883218,7 +883218,7 @@ sub_81C91AC: @ 81C91AC lsls r0, 16 lsrs r0, 16 cmp r0, 0xFF - beq _081C9258 + beq @081C9258 mov r2, r9 strh r2, [r7, 0xA] mov r0, r9 @@ -883226,12 +883226,12 @@ sub_81C91AC: @ 81C91AC str r0, [r7, 0x40] str r0, [r7, 0x44] movs r0, 0x1 - b _081C925A + b @081C925A .align 2, 0 .pool -_081C9258: +@081C9258: movs r0, 0 -_081C925A: +@081C925A: add sp, 0x8 pop {r3,r4} mov r8, r3 @@ -883242,7 +883242,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 @@ -883250,15 +883250,15 @@ sub_81C9268: @ 81C9268 bl flag_check lsls r0, 24 cmp r0, 0 - beq _081C928A + beq @081C928A movs r4, 0x1 ldr r0, =0x0000089b bl flag_check lsls r0, 24 cmp r0, 0 - beq _081C928A + beq @081C928A movs r4, 0x2 -_081C928A: +@081C928A: adds r0, r4, 0 pop {r4} pop {r1} @@ -883268,14 +883268,14 @@ _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 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq _081C92C4 + beq @081C92C4 bl sub_81C9268 lsls r0, 24 lsrs r0, 24 @@ -883287,24 +883287,24 @@ sub_81C9298: @ 81C9298 adds r0, r4, 0 bl sub_81C939C movs r0, 0x1 - b _081C92C6 -_081C92C4: + b @081C92C6 +@081C92C4: movs r0, 0 -_081C92C6: +@081C92C6: pop {r4} pop {r1} bx r1 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 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq _081C92FA + beq @081C92FA bl sub_81C9268 lsls r0, 24 lsrs r0, 24 @@ -883317,24 +883317,24 @@ sub_81C92CC: @ 81C92CC adds r0, r4, 0 bl sub_81C939C movs r0, 0x1 - b _081C92FC -_081C92FA: + b @081C92FC +@081C92FA: movs r0, 0 -_081C92FC: +@081C92FC: pop {r4} pop {r1} bx r1 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 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq _081C932E + beq @081C932E bl sub_81C9268 lsls r0, 24 lsrs r0, 24 @@ -883345,24 +883345,24 @@ sub_81C9304: @ 81C9304 adds r0, r4, 0 bl sub_81C939C movs r0, 0x1 - b _081C9330 -_081C932E: + b @081C9330 +@081C932E: movs r0, 0 -_081C9330: +@081C9330: pop {r4} pop {r1} bx r1 thumb_func_end sub_81C9304 thumb_func_start sub_81C9338 -sub_81C9338: @ 81C9338 +sub_81C9338: ; 81C9338 push {lr} movs r0, 0x1 movs r1, 0x10 bl sub_81C761C adds r2, r0, 0 cmp r2, 0 - beq _081C9360 + beq @081C9360 movs r0, 0 movs r1, 0x3 strh r1, [r2] @@ -883373,23 +883373,23 @@ sub_81C9338: @ 81C9338 adds r0, r2, 0 bl sub_81C939C movs r0, 0x1 - b _081C9362 -_081C9360: + b @081C9362 +@081C9360: movs r0, 0 -_081C9362: +@081C9362: pop {r1} bx r1 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 bl sub_81C761C adds r5, r0, 0 cmp r5, 0 - beq _081C9394 + beq @081C9394 movs r4, 0 movs r0, 0x4 strh r0, [r5] @@ -883401,52 +883401,52 @@ sub_81C9368: @ 81C9368 adds r0, r5, 0 bl sub_81C939C movs r0, 0x1 - b _081C9396 -_081C9394: + b @081C9396 +@081C9394: movs r0, 0 -_081C9396: +@081C9396: pop {r4,r5} pop {r1} bx r1 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] cmp r0, 0x4 - bhi _081C93E0 + bhi @081C93E0 lsls r0, 2 - ldr r1, =_081C93B4 + ldr r1, =@081C93B4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081C93B4: - .4byte _081C93C8 - .4byte _081C93CE - .4byte _081C93CE - .4byte _081C93D4 - .4byte _081C93DC -_081C93C8: +@081C93B4: + .4byte @081C93C8 + .4byte @081C93CE + .4byte @081C93CE + .4byte @081C93D4 + .4byte @081C93DC +@081C93C8: movs r0, 0 bl sub_81C7688 -_081C93CE: +@081C93CE: bl sub_81C93EC - b _081C93DE -_081C93D4: + b @081C93DE +@081C93D4: ldr r0, =sub_81C963C + 1 - b _081C93DE + b @081C93DE .align 2, 0 .pool -_081C93DC: +@081C93DC: ldr r0, =sub_81C96FC + 1 -_081C93DE: +@081C93DE: str r0, [r4, 0xC] -_081C93E0: +@081C93E0: pop {r4} pop {r0} bx r0 @@ -883455,28 +883455,28 @@ _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 - beq _081C9408 + beq @081C9408 cmp r0, 0x1 - bcc _081C93FE + bcc @081C93FE cmp r0, 0x2 - beq _081C9410 -_081C93FE: + beq @081C9410 +@081C93FE: ldr r0, =sub_81C943C + 1 - b _081C9412 + b @081C9412 .align 2, 0 .pool -_081C9408: +@081C9408: ldr r0, =sub_81C9520 + 1 - b _081C9412 + b @081C9412 .align 2, 0 .pool -_081C9410: +@081C9410: ldr r0, =c2_pre_battle_1 + 1 -_081C9412: +@081C9412: pop {r1} bx r1 .align 2, 0 @@ -883484,7 +883484,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 @@ -883495,7 +883495,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 @@ -883504,22 +883504,22 @@ 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 cmp r0, 0 - beq _081C944C + beq @081C944C movs r0, 0x1 - b _081C951A -_081C944C: + b @081C951A +@081C944C: ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 adds r5, r2, 0 cmp r0, 0 - beq _081C9508 + beq @081C9508 ldr r3, =0x0861fc59 movs r0, 0x2 ldrsh r1, [r4, r0] @@ -883531,22 +883531,22 @@ _081C944C: adds r1, r3 ldrb r0, [r1] cmp r0, 0x4 - bhi _081C9508 + bhi @081C9508 lsls r0, 2 - ldr r1, =_081C9488 + ldr r1, =@081C9488 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081C9488: - .4byte _081C949C - .4byte _081C94BC - .4byte _081C94D4 - .4byte _081C94E0 - .4byte _081C9516 -_081C949C: +@081C9488: + .4byte @081C949C + .4byte @081C94BC + .4byte @081C94D4 + .4byte @081C94E0 + .4byte @081C9516 +@081C949C: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r1, [r0, 0x15] @@ -883554,15 +883554,15 @@ _081C949C: ands r0, r1 movs r1, 0x1 cmp r0, 0 - beq _081C94AE + beq @081C94AE movs r1, 0x2 -_081C94AE: +@081C94AE: strh r1, [r4, 0x6] ldr r1, =0x000186a6 - b _081C94EE + b @081C94EE .align 2, 0 .pool -_081C94BC: +@081C94BC: movs r1, 0 movs r0, 0x3 strh r0, [r4] @@ -883572,70 +883572,70 @@ _081C94BC: ldr r0, =sub_81C963C + 1 str r0, [r4, 0xC] movs r0, 0x2 - b _081C951A + b @081C951A .align 2, 0 .pool -_081C94D4: +@081C94D4: movs r0, 0x6 strh r0, [r4, 0x6] ldr r1, =0x000186ab - b _081C94EE + b @081C94EE .align 2, 0 .pool -_081C94E0: +@081C94E0: bl sub_81C76B8 cmp r0, 0 - beq _081C94FC + beq @081C94FC movs r0, 0x9 strh r0, [r4, 0x6] ldr r1, =0x000186ac -_081C94EE: +@081C94EE: adds r0, r4, 0 bl sub_81C97B0 movs r0, 0x8 - b _081C951A + b @081C951A .align 2, 0 .pool -_081C94FC: +@081C94FC: ldr r0, =sub_81C9600 + 1 str r0, [r4, 0xC] movs r0, 0x6 - b _081C951A + b @081C951A .align 2, 0 .pool -_081C9508: +@081C9508: ldrh r1, [r5, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _081C9516 + bne @081C9516 movs r0, 0 - b _081C951A -_081C9516: + b @081C951A +@081C9516: movs r0, 0x1 negs r0, r0 -_081C951A: +@081C951A: pop {r4,r5} pop {r1} bx r1 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 cmp r0, 0 - beq _081C9530 + beq @081C9530 movs r0, 0x1 - b _081C9580 -_081C9530: + b @081C9580 +@081C9530: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081C9570 + beq @081C9570 ldr r3, =0x0861fc59 movs r0, 0x2 ldrsh r1, [r4, r0] @@ -883647,48 +883647,48 @@ _081C9530: adds r1, r3 ldrb r0, [r1] cmp r0, 0x2 - bne _081C9578 + bne @081C9578 movs r0, 0x6 strh r0, [r4, 0x6] ldr r1, =0x000186ab adds r0, r4, 0 bl sub_81C97B0 movs r0, 0x8 - b _081C9580 + b @081C9580 .align 2, 0 .pool -_081C9570: +@081C9570: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081C957E -_081C9578: + beq @081C957E +@081C9578: movs r0, 0x20 bl audio_play -_081C957E: +@081C957E: movs r0, 0 -_081C9580: +@081C9580: pop {r4} pop {r1} bx r1 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 cmp r0, 0 - beq _081C9598 + beq @081C9598 movs r0, 0x1 - b _081C95F8 -_081C9598: + b @081C95F8 +@081C9598: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081C95E8 + beq @081C95E8 ldr r3, =0x0861fc59 movs r0, 0x2 ldrsh r1, [r4, r0] @@ -883700,91 +883700,91 @@ _081C9598: adds r1, r3 ldrb r0, [r1] cmp r0, 0x2 - beq _081C95D4 + beq @081C95D4 cmp r0, 0x4 - beq _081C95F4 + beq @081C95F4 movs r0, 0x20 bl audio_play movs r0, 0 - b _081C95F8 + b @081C95F8 .align 2, 0 .pool -_081C95D4: +@081C95D4: movs r0, 0x6 strh r0, [r4, 0x6] ldr r1, =0x000186ab adds r0, r4, 0 bl sub_81C97B0 movs r0, 0x8 - b _081C95F8 + b @081C95F8 .align 2, 0 .pool -_081C95E8: +@081C95E8: movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _081C95F4 + bne @081C95F4 movs r0, 0 - b _081C95F8 -_081C95F4: + b @081C95F8 +@081C95F4: movs r0, 0x1 negs r0, r0 -_081C95F8: +@081C95F8: pop {r4} pop {r1} bx r1 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 cmp r0, 0 - beq _081C9616 + beq @081C9616 bl sub_81C93EC str r0, [r4, 0xC] movs r0, 0x1 - b _081C9634 -_081C9616: + b @081C9634 +@081C9616: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne _081C962C + bne @081C962C movs r0, 0 - b _081C9634 + b @081C9634 .align 2, 0 .pool -_081C962C: +@081C962C: bl sub_81C93EC str r0, [r4, 0xC] movs r0, 0x7 -_081C9634: +@081C9634: pop {r4} pop {r1} bx r1 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 adds r3, r0, 0 cmp r3, 0 - beq _081C964E + beq @081C964E movs r0, 0x1 - b _081C96F6 -_081C964E: + b @081C96F6 +@081C964E: ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 adds r6, r2, 0 cmp r0, 0 - beq _081C96B8 + beq @081C96B8 ldr r5, =0x0861fc59 movs r1, 0x2 ldrsh r0, [r4, r1] @@ -883796,19 +883796,19 @@ _081C964E: adds r0, r5 ldrb r0, [r0] cmp r0, 0x6 - beq _081C968E + beq @081C968E cmp r0, 0x6 - bgt _081C9688 + bgt @081C9688 cmp r0, 0x5 - beq _081C96A4 - b _081C96B8 + beq @081C96A4 + b @081C96B8 .align 2, 0 .pool -_081C9688: +@081C9688: cmp r0, 0x7 - beq _081C96E4 - b _081C96B8 -_081C968E: + beq @081C96E4 + b @081C96B8 +@081C968E: movs r0, 0x4 strh r0, [r4] strh r3, [r4, 0x2] @@ -883817,24 +883817,24 @@ _081C968E: ldr r0, =sub_81C96FC + 1 str r0, [r4, 0xC] movs r0, 0x4 - b _081C96F6 + b @081C96F6 .align 2, 0 .pool -_081C96A4: +@081C96A4: strh r3, [r4, 0x6] ldr r1, =0x000186a7 adds r0, r4, 0 bl sub_81C97B0 movs r0, 0x8 - b _081C96F6 + b @081C96F6 .align 2, 0 .pool -_081C96B8: +@081C96B8: ldrh r1, [r6, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081C96F4 + beq @081C96F4 movs r0, 0x2 ldrsh r2, [r4, r0] ldr r1, =0x0861fc54 @@ -883842,45 +883842,45 @@ _081C96B8: adds r0, r1 ldrb r0, [r0] cmp r2, r0 - beq _081C96E4 + beq @081C96E4 strh r0, [r4, 0x2] ldr r0, =sub_81C9798 + 1 str r0, [r4, 0xC] movs r0, 0x1 - b _081C96F6 + b @081C96F6 .align 2, 0 .pool -_081C96E4: +@081C96E4: movs r0, 0x5 bl audio_play adds r0, r4, 0 bl sub_81C97C0 movs r0, 0x3 - b _081C96F6 -_081C96F4: + b @081C96F6 +@081C96F4: movs r0, 0 -_081C96F6: +@081C96F6: pop {r4-r6} pop {r1} bx r1 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 cmp r0, 0 - beq _081C970C + beq @081C970C movs r0, 0x1 - b _081C9792 -_081C970C: + b @081C9792 +@081C970C: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081C9754 + beq @081C9754 ldr r3, =0x0861fc59 movs r0, 0x2 ldrsh r1, [r4, r0] @@ -883892,7 +883892,7 @@ _081C970C: adds r1, r3 ldrb r0, [r1] cmp r0, 0xD - beq _081C9780 + beq @081C9780 subs r0, 0x8 bl sub_81C7694 ldr r1, =0x000186a8 @@ -883901,14 +883901,14 @@ _081C970C: movs r0, 0x3 strh r0, [r4, 0x6] movs r0, 0x8 - b _081C9792 + b @081C9792 .align 2, 0 .pool -_081C9754: +@081C9754: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081C9790 + beq @081C9790 movs r0, 0x2 ldrsh r2, [r4, r0] ldr r1, =0x0861fc54 @@ -883916,31 +883916,31 @@ _081C9754: adds r0, r1 ldrb r0, [r0] cmp r2, r0 - beq _081C9780 + beq @081C9780 strh r0, [r4, 0x2] ldr r0, =sub_81C97A4 + 1 str r0, [r4, 0xC] movs r0, 0x1 - b _081C9792 + b @081C9792 .align 2, 0 .pool -_081C9780: +@081C9780: movs r0, 0x5 bl audio_play adds r0, r4, 0 bl sub_81C97F8 movs r0, 0x5 - b _081C9792 -_081C9790: + b @081C9792 +@081C9790: movs r0, 0 -_081C9792: +@081C9792: pop {r4} pop {r1} bx r1 thumb_func_end sub_81C96FC thumb_func_start sub_81C9798 -sub_81C9798: @ 81C9798 +sub_81C9798: ; 81C9798 push {lr} bl sub_81C97C0 movs r0, 0x3 @@ -883949,7 +883949,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 @@ -883958,7 +883958,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 + 1 str r1, [r0, 0xC] @@ -883968,13 +883968,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 @@ -884002,7 +884002,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 @@ -884018,7 +884018,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 @@ -884028,26 +884028,26 @@ sub_81C9814: @ 81C9814 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - beq _081C9848 + beq @081C9848 ldrh r0, [r4, 0x2] subs r0, 0x1 strh r0, [r4, 0x2] lsls r0, 16 ldrh r3, [r4] cmp r0, 0 - bge _081C986A + bge @081C986A ldr r0, =0x0861fc54 adds r0, r3, r0 ldrb r0, [r0] strh r0, [r4, 0x2] - b _081C986A + b @081C986A .align 2, 0 .pool -_081C9848: +@081C9848: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081C988C + beq @081C988C ldrh r0, [r4, 0x2] adds r0, 0x1 strh r0, [r4, 0x2] @@ -884059,9 +884059,9 @@ _081C9848: adds r3, r1, 0 ldrb r0, [r0] cmp r2, r0 - ble _081C986A + ble @081C986A strh r5, [r4, 0x2] -_081C986A: +@081C986A: ldr r2, =0x0861fc59 movs r0, 0x2 ldrsh r1, [r4, r0] @@ -884073,19 +884073,19 @@ _081C986A: ldrb r0, [r1] strh r0, [r4, 0x4] movs r0, 0x1 - b _081C988E + b @081C988E .align 2, 0 .pool -_081C988C: +@081C988C: movs r0, 0 -_081C988E: +@081C988E: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_81C9814 thumb_func_start sub_81C9894 -sub_81C9894: @ 81C9894 +sub_81C9894: ; 81C9894 push {lr} movs r0, 0x1 bl sub_81C763C @@ -884095,7 +884095,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 @@ -884106,7 +884106,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 @@ -884116,7 +884116,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 @@ -884126,10 +884126,10 @@ 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: +@081C98D8: adds r0, r4, 0 bl sub_81CB0C8 ldr r1, =0x02037318 @@ -884137,11 +884137,11 @@ _081C98D8: lsrs r0, 24 ldrb r1, [r1, 0x14] cmp r0, r1 - bne _081C9914 + bne @081C9914 adds r0, r4, 0 bl sub_81CAE08 cmp r0, 0 - beq _081C9914 + beq @081C9914 ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000009ca @@ -884149,66 +884149,66 @@ _081C98D8: adds r0, r4 ldrb r0, [r0] cmp r0, 0 - beq _081C9914 + beq @081C9914 movs r0, 0x1 - b _081C991C + b @081C991C .align 2, 0 .pool -_081C9914: +@081C9914: adds r4, 0x1 cmp r4, 0x4D - ble _081C98D8 + ble @081C98D8 movs r0, 0 -_081C991C: +@081C991C: pop {r4} pop {r1} bx r1 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 cmp r1, 0 - beq _081C9938 + beq @081C9938 movs r0, 0 strb r0, [r1, 0xD] movs r0, 0x1 - b _081C993A -_081C9938: + b @081C993A +@081C9938: movs r0, 0 -_081C993A: +@081C993A: pop {r1} bx r1 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 cmp r1, 0 - beq _081C9952 + beq @081C9952 movs r0, 0x1 strb r0, [r1, 0xD] - b _081C9954 -_081C9952: + b @081C9954 +@081C9952: movs r0, 0 -_081C9954: +@081C9954: pop {r1} bx r1 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 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq _081C997A + beq @081C997A movs r0, 0 strb r0, [r4, 0xC] ldr r0, =sub_81C9A10 + 1 @@ -884217,7 +884217,7 @@ sub_81C9958: @ 81C9958 str r0, [r4, 0x4] ldr r0, =sub_81C99FC + 1 str r0, [r4] -_081C997A: +@081C997A: adds r0, r4, 0 pop {r4} pop {r1} @@ -884227,7 +884227,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 @@ -884250,7 +884250,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 @@ -884261,7 +884261,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 @@ -884279,7 +884279,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 @@ -884290,7 +884290,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 @@ -884298,29 +884298,29 @@ sub_81C9A10: @ 81C9A10 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x9 - bls _081C9A24 - b _081C9C60 -_081C9A24: + bls @081C9A24 + b @081C9C60 +@081C9A24: lsls r0, r4, 2 - ldr r1, =_081C9A34 + ldr r1, =@081C9A34 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081C9A34: - .4byte _081C9A5C - .4byte _081C9AEC - .4byte _081C9B30 - .4byte _081C9B88 - .4byte _081C9B9E - .4byte _081C9BA4 - .4byte _081C9BB6 - .4byte _081C9BC0 - .4byte _081C9C0E - .4byte _081C9C4C -_081C9A5C: +@081C9A34: + .4byte @081C9A5C + .4byte @081C9AEC + .4byte @081C9B30 + .4byte @081C9B88 + .4byte @081C9B9E + .4byte @081C9BA4 + .4byte @081C9BB6 + .4byte @081C9BC0 + .4byte @081C9C0E + .4byte @081C9C4C +@081C9A5C: ldr r0, =0x08620194 movs r1, 0x3 bl sub_81C7B54 @@ -884370,19 +884370,19 @@ _081C9A5C: movs r1, 0 movs r2, 0 bl bg_change_y_offset -_081C9AD6: +@081C9AD6: movs r0, 0 - b _081C9C62 + b @081C9C62 .align 2, 0 .pool -_081C9AEC: +@081C9AEC: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _081C9AFA - b _081C9C5C -_081C9AFA: + beq @081C9AFA + b @081C9C5C +@081C9AFA: ldr r1, =0x0861fd6c str r0, [sp] movs r0, 0x2 @@ -884400,17 +884400,17 @@ _081C9AFA: movs r1, 0x20 movs r2, 0x20 bl sub_81C7944 - b _081C9AD6 + b @081C9AD6 .align 2, 0 .pool -_081C9B30: +@081C9B30: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _081C9B3E - b _081C9C5C -_081C9B3E: + beq @081C9B3E + b @081C9C5C +@081C9B3E: ldr r1, =0x0861fc98 str r0, [sp] movs r0, 0x3 @@ -884430,40 +884430,40 @@ _081C9B3E: bl sub_81C7944 bl sub_81C9894 cmp r0, 0x3 - beq _081C9B76 + beq @081C9B76 bl sub_81C9894 cmp r0, 0x4 - bne _081C9AD6 -_081C9B76: + bne @081C9AD6 +@081C9B76: bl sub_81CA850 - b _081C9AD6 + b @081C9AD6 .align 2, 0 .pool -_081C9B88: +@081C9B88: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - bne _081C9C5C + bne @081C9C5C bl sub_81CA6E0 bl sub_81CA7D4 -_081C9B9A: +@081C9B9A: movs r0, 0x1 - b _081C9C62 -_081C9B9E: + b @081C9C62 +@081C9B9E: bl sub_81C9FC4 - b _081C9B9A -_081C9BA4: + b @081C9B9A +@081C9BA4: bl sub_81CA714 bl sub_81CA02C bl sub_81CA640 bl sub_81CA0C8 - b _081C9AD6 -_081C9BB6: + b @081C9AD6 +@081C9BB6: bl sub_81CA7C4 cmp r0, 0 - bne _081C9C5C - b _081C9B9A -_081C9BC0: + bne @081C9C5C + b @081C9B9A +@081C9BC0: movs r0, 0x1 bl gpu_sync_bg_show movs r0, 0x2 @@ -884472,72 +884472,72 @@ _081C9BC0: bl gpu_sync_bg_show ldrb r0, [r5, 0xD] cmp r0, 0 - beq _081C9BE0 + beq @081C9BE0 movs r0, 0x1 bl sub_81C7AC0 - b _081C9BEC -_081C9BE0: + b @081C9BEC +@081C9BE0: movs r0, 0x6E bl audio_play movs r0, 0x3 bl sub_81C7AC0 -_081C9BEC: +@081C9BEC: bl sub_81C9894 cmp r0, 0x3 - beq _081C9BFE + beq @081C9BFE cmp r0, 0x4 - bne _081C9C06 + bne @081C9C06 movs r0, 0x7 bl sub_81C7DFC -_081C9BFE: +@081C9BFE: movs r0, 0x1 bl sub_81C7DFC - b _081C9AD6 -_081C9C06: + b @081C9AD6 +@081C9C06: movs r0, 0 bl sub_81C7DFC - b _081C9AD6 -_081C9C0E: + b @081C9AD6 +@081C9C0E: bl sub_81C7B34 cmp r0, 0 - bne _081C9C5C + bne @081C9C5C bl sub_81C9894 cmp r0, 0x3 - beq _081C9C2C + beq @081C9C2C cmp r0, 0x4 - bne _081C9C38 + bne @081C9C38 movs r0, 0x7 movs r1, 0 movs r2, 0 bl sub_81C7FA0 -_081C9C2C: +@081C9C2C: movs r0, 0x1 movs r1, 0 movs r2, 0 bl sub_81C7FA0 - b _081C9C42 -_081C9C38: + b @081C9C42 +@081C9C38: movs r0, 0 movs r1, 0 movs r2, 0 bl sub_81C7FA0 -_081C9C42: +@081C9C42: bl sub_81CA20C bl titlescreen_0 - b _081C9B9A -_081C9C4C: + b @081C9B9A +@081C9C4C: bl sub_81CA324 cmp r0, 0 - bne _081C9C5C + bne @081C9C5C bl sub_81C8010 cmp r0, 0 - beq _081C9C60 -_081C9C5C: + beq @081C9C60 +@081C9C5C: movs r0, 0x2 - b _081C9C62 -_081C9C60: + b @081C9C62 +@081C9C60: movs r0, 0x4 -_081C9C62: +@081C9C62: add sp, 0x4 pop {r4,r5} pop {r1} @@ -884545,55 +884545,55 @@ _081C9C62: thumb_func_end sub_81C9A10 thumb_func_start sub_81C9C6C -sub_81C9C6C: @ 81C9C6C +sub_81C9C6C: ; 81C9C6C push {lr} cmp r0, 0 - beq _081C9C78 + beq @081C9C78 cmp r0, 0x1 - beq _081C9C8E - b _081C9CA2 -_081C9C78: + beq @081C9C8E + b @081C9CA2 +@081C9C78: bl sub_81CAA3C bl sub_81CA278 bl sub_81CA714 movs r0, 0x5 bl audio_play movs r0, 0 - b _081C9CA4 -_081C9C8E: + b @081C9CA4 +@081C9C8E: bl sub_81CA324 cmp r0, 0 - bne _081C9C9E + bne @081C9C9E bl sub_81CA7C4 cmp r0, 0 - beq _081C9CA2 -_081C9C9E: + beq @081C9CA2 +@081C9C9E: movs r0, 0x2 - b _081C9CA4 -_081C9CA2: + b @081C9CA4 +@081C9CA2: movs r0, 0x4 -_081C9CA4: +@081C9CA4: pop {r1} bx r1 thumb_func_end sub_81C9C6C thumb_func_start sub_81C9CA8 -sub_81C9CA8: @ 81C9CA8 +sub_81C9CA8: ; 81C9CA8 push {lr} cmp r0, 0x1 - beq _081C9CDC + beq @081C9CDC cmp r0, 0x1 - bgt _081C9CB8 + bgt @081C9CB8 cmp r0, 0 - beq _081C9CC2 - b _081C9D3C -_081C9CB8: + beq @081C9CC2 + b @081C9D3C +@081C9CB8: cmp r0, 0x2 - beq _081C9CFA + beq @081C9CFA cmp r0, 0x3 - beq _081C9D14 - b _081C9D3C -_081C9CC2: + beq @081C9D14 + b @081C9D3C +@081C9CC2: bl sub_81CA9C8 bl sub_81CA2DC movs r0, 0 @@ -884602,20 +884602,20 @@ _081C9CC2: movs r0, 0x5 bl audio_play movs r0, 0 - b _081C9D3E -_081C9CDC: + b @081C9D3E +@081C9CDC: bl sub_81CA324 cmp r0, 0 - bne _081C9D34 + bne @081C9D34 bl sub_81C8010 cmp r0, 0 - bne _081C9D34 + bne @081C9D34 bl sub_81CA0C8 movs r0, 0x1 bl sub_81C7DFC movs r0, 0 - b _081C9D3E -_081C9CFA: + b @081C9D3E +@081C9CFA: bl sub_81CA20C movs r0, 0x1 movs r1, 0 @@ -884624,69 +884624,69 @@ _081C9CFA: bl sub_81CA818 bl sub_81CA714 movs r0, 0 - b _081C9D3E -_081C9D14: + b @081C9D3E +@081C9D14: bl sub_81CA324 cmp r0, 0 - bne _081C9D34 + bne @081C9D34 bl sub_81C8010 cmp r0, 0 - bne _081C9D34 + bne @081C9D34 bl sub_81CA89C cmp r0, 0 - bne _081C9D34 + bne @081C9D34 bl sub_81CA7C4 cmp r0, 0 - beq _081C9D38 -_081C9D34: + beq @081C9D38 +@081C9D34: movs r0, 0x2 - b _081C9D3E -_081C9D38: + b @081C9D3E +@081C9D38: bl sub_81CA9D8 -_081C9D3C: +@081C9D3C: movs r0, 0x4 -_081C9D3E: +@081C9D3E: pop {r1} bx r1 thumb_func_end sub_81C9CA8 thumb_func_start sub_81C9D44 -sub_81C9D44: @ 81C9D44 +sub_81C9D44: ; 81C9D44 push {lr} cmp r0, 0x1 - beq _081C9D72 + beq @081C9D72 cmp r0, 0x1 - bgt _081C9D54 + bgt @081C9D54 cmp r0, 0 - beq _081C9D5E - b _081C9DD2 -_081C9D54: + beq @081C9D5E + b @081C9DD2 +@081C9D54: cmp r0, 0x2 - beq _081C9D90 + beq @081C9D90 cmp r0, 0x3 - beq _081C9DAA - b _081C9DD2 -_081C9D5E: + beq @081C9DAA + b @081C9DD2 +@081C9D5E: bl sub_81CA9C8 bl sub_81CA2DC movs r0, 0x1 movs r1, 0 bl sub_81C7FC4 movs r0, 0 - b _081C9DD4 -_081C9D72: + b @081C9DD4 +@081C9D72: bl sub_81CA324 cmp r0, 0 - bne _081C9DCA + bne @081C9DCA bl sub_81C8010 cmp r0, 0 - bne _081C9DCA + bne @081C9DCA bl sub_81CA0C8 movs r0, 0 bl sub_81C7DFC movs r0, 0 - b _081C9DD4 -_081C9D90: + b @081C9DD4 +@081C9D90: bl sub_81CA20C movs r0, 0 movs r1, 0 @@ -884695,65 +884695,65 @@ _081C9D90: bl sub_81CA864 bl sub_81CA714 movs r0, 0 - b _081C9DD4 -_081C9DAA: + b @081C9DD4 +@081C9DAA: bl sub_81CA324 cmp r0, 0 - bne _081C9DCA + bne @081C9DCA bl sub_81C8010 cmp r0, 0 - bne _081C9DCA + bne @081C9DCA bl sub_81CA89C cmp r0, 0 - bne _081C9DCA + bne @081C9DCA bl sub_81CA7C4 cmp r0, 0 - beq _081C9DCE -_081C9DCA: + beq @081C9DCE +@081C9DCA: movs r0, 0x2 - b _081C9DD4 -_081C9DCE: + b @081C9DD4 +@081C9DCE: bl sub_81CA9D8 -_081C9DD2: +@081C9DD2: movs r0, 0x4 -_081C9DD4: +@081C9DD4: pop {r1} bx r1 thumb_func_end sub_81C9D44 thumb_func_start sub_81C9DD8 -sub_81C9DD8: @ 81C9DD8 +sub_81C9DD8: ; 81C9DD8 push {lr} cmp r0, 0x1 - beq _081C9E04 + beq @081C9E04 cmp r0, 0x1 - bgt _081C9DE8 + bgt @081C9DE8 cmp r0, 0 - beq _081C9DF2 - b _081C9E50 -_081C9DE8: + beq @081C9DF2 + b @081C9E50 +@081C9DE8: cmp r0, 0x2 - beq _081C9E1A + beq @081C9E1A cmp r0, 0x3 - beq _081C9E30 - b _081C9E50 -_081C9DF2: + beq @081C9E30 + b @081C9E50 +@081C9DF2: bl sub_81CA9C8 bl sub_81CA2DC movs r0, 0x5 bl audio_play movs r0, 0 - b _081C9E52 -_081C9E04: + b @081C9E52 +@081C9E04: bl sub_81CA324 cmp r0, 0 - bne _081C9E48 + bne @081C9E48 movs r0, 0x7 bl sub_81C7DFC bl sub_81CA0C8 movs r0, 0 - b _081C9E52 -_081C9E1A: + b @081C9E52 +@081C9E1A: bl sub_81CA20C movs r0, 0x7 movs r1, 0 @@ -884761,232 +884761,232 @@ _081C9E1A: bl sub_81C7FA0 bl sub_81CA714 movs r0, 0 - b _081C9E52 -_081C9E30: + b @081C9E52 +@081C9E30: bl sub_81CA324 cmp r0, 0 - bne _081C9E48 + bne @081C9E48 bl sub_81C8010 cmp r0, 0 - bne _081C9E48 + bne @081C9E48 bl sub_81CA89C cmp r0, 0 - beq _081C9E4C -_081C9E48: + beq @081C9E4C +@081C9E48: movs r0, 0x2 - b _081C9E52 -_081C9E4C: + b @081C9E52 +@081C9E4C: bl sub_81CA9D8 -_081C9E50: +@081C9E50: movs r0, 0x4 -_081C9E52: +@081C9E52: pop {r1} bx r1 thumb_func_end sub_81C9DD8 thumb_func_start sub_81C9E58 -sub_81C9E58: @ 81C9E58 +sub_81C9E58: ; 81C9E58 push {lr} cmp r0, 0x1 - beq _081C9E86 + beq @081C9E86 cmp r0, 0x1 - bgt _081C9E68 + bgt @081C9E68 cmp r0, 0 - beq _081C9E72 - b _081C9EC2 -_081C9E68: + beq @081C9E72 + b @081C9EC2 +@081C9E68: cmp r0, 0x2 - beq _081C9E9E + beq @081C9E9E cmp r0, 0x3 - beq _081C9EAA - b _081C9EC2 -_081C9E72: + beq @081C9EAA + b @081C9EC2 +@081C9E72: bl sub_81CA9C8 bl sub_81CA2DC movs r0, 0x7 movs r1, 0 bl sub_81C7FC4 movs r0, 0 - b _081C9EC4 -_081C9E86: + b @081C9EC4 +@081C9E86: bl sub_81CA324 cmp r0, 0 - bne _081C9EBA + bne @081C9EBA bl sub_81C8010 cmp r0, 0 - bne _081C9EBA + bne @081C9EBA bl sub_81CA0C8 movs r0, 0 - b _081C9EC4 -_081C9E9E: + b @081C9EC4 +@081C9E9E: bl sub_81CA20C bl sub_81CA714 movs r0, 0 - b _081C9EC4 -_081C9EAA: + b @081C9EC4 +@081C9EAA: bl sub_81CA324 cmp r0, 0 - bne _081C9EBA + bne @081C9EBA bl sub_81CA89C cmp r0, 0 - beq _081C9EBE -_081C9EBA: + beq @081C9EBE +@081C9EBA: movs r0, 0x2 - b _081C9EC4 -_081C9EBE: + b @081C9EC4 +@081C9EBE: bl sub_81CA9D8 -_081C9EC2: +@081C9EC2: movs r0, 0x4 -_081C9EC4: +@081C9EC4: pop {r1} bx r1 thumb_func_end sub_81C9E58 thumb_func_start sub_81C9EC8 -sub_81C9EC8: @ 81C9EC8 +sub_81C9EC8: ; 81C9EC8 push {lr} cmp r0, 0 - beq _081C9ED4 + beq @081C9ED4 cmp r0, 0x1 - beq _081C9EE2 - b _081C9EF0 -_081C9ED4: + beq @081C9EE2 + b @081C9EF0 +@081C9ED4: movs r0, 0x20 bl audio_play bl sub_81CA770 movs r0, 0 - b _081C9EF2 -_081C9EE2: + b @081C9EF2 +@081C9EE2: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _081C9EF0 + beq @081C9EF0 movs r0, 0x2 - b _081C9EF2 -_081C9EF0: + b @081C9EF2 +@081C9EF0: movs r0, 0x4 -_081C9EF2: +@081C9EF2: pop {r1} bx r1 thumb_func_end sub_81C9EC8 thumb_func_start sub_81C9EF8 -sub_81C9EF8: @ 81C9EF8 +sub_81C9EF8: ; 81C9EF8 push {lr} cmp r0, 0 - beq _081C9F04 + beq @081C9F04 cmp r0, 0x1 - beq _081C9F12 - b _081C9F20 -_081C9F04: + beq @081C9F12 + b @081C9F20 +@081C9F04: movs r0, 0x5 bl audio_play bl sub_81CA714 movs r0, 0 - b _081C9F22 -_081C9F12: + b @081C9F22 +@081C9F12: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _081C9F20 + beq @081C9F20 movs r0, 0x2 - b _081C9F22 -_081C9F20: + b @081C9F22 +@081C9F20: movs r0, 0x4 -_081C9F22: +@081C9F22: pop {r1} bx r1 thumb_func_end sub_81C9EF8 thumb_func_start sub_81C9F28 -sub_81C9F28: @ 81C9F28 +sub_81C9F28: ; 81C9F28 push {lr} cmp r0, 0x1 - beq _081C9F52 + beq @081C9F52 cmp r0, 0x1 - bgt _081C9F38 + bgt @081C9F38 cmp r0, 0 - beq _081C9F42 - b _081C9FBC -_081C9F38: + beq @081C9F42 + b @081C9FBC +@081C9F38: cmp r0, 0x2 - beq _081C9F96 + beq @081C9F96 cmp r0, 0x3 - beq _081C9FB0 - b _081C9FBC -_081C9F42: + beq @081C9FB0 + b @081C9FBC +@081C9F42: bl sub_81C98C4 lsls r0, 16 lsrs r0, 16 bl sub_81C7BA4 movs r0, 0 - b _081C9FBE -_081C9F52: + b @081C9FBE +@081C9F52: bl sub_81C7BE8 cmp r0, 0 - bne _081C9FB8 + bne @081C9FB8 bl sub_81C7880 bl sub_81CA9C8 bl sub_81CA2DC bl sub_81C9894 cmp r0, 0x3 - beq _081C9F7A + beq @081C9F7A cmp r0, 0x4 - bne _081C9F84 + bne @081C9F84 movs r0, 0x7 movs r1, 0 bl sub_81C7FC4 -_081C9F7A: +@081C9F7A: movs r0, 0x1 movs r1, 0 bl sub_81C7FC4 - b _081C9F8C -_081C9F84: + b @081C9F8C +@081C9F84: movs r0, 0 movs r1, 0 bl sub_81C7FC4 -_081C9F8C: +@081C9F8C: movs r0, 0x5 bl audio_play movs r0, 0 - b _081C9FBE -_081C9F96: + b @081C9FBE +@081C9F96: bl sub_81CA324 cmp r0, 0 - bne _081C9FB8 + bne @081C9FB8 bl sub_81C8010 cmp r0, 0 - bne _081C9FB8 + bne @081C9FB8 movs r0, 0 bl sub_81C7AC0 movs r0, 0 - b _081C9FBE -_081C9FB0: + b @081C9FBE +@081C9FB0: bl sub_81C7B34 cmp r0, 0 - beq _081C9FBC -_081C9FB8: + beq @081C9FBC +@081C9FB8: movs r0, 0x2 - b _081C9FBE -_081C9FBC: + b @081C9FBE +@081C9FBC: movs r0, 0x4 -_081C9FBE: +@081C9FBE: pop {r1} bx r1 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, =0x086201c4 -_081C9FCA: +@081C9FCA: adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load adds r4, 0x8 adds r5, 0x1 cmp r5, 0x1 - bls _081C9FCA + bls @081C9FCA ldr r0, =0x086201d4 bl sub_81C795C pop {r4,r5} @@ -884997,7 +884997,7 @@ _081C9FCA: thumb_func_end sub_81C9FC4 thumb_func_start sub_81C9FEC -sub_81C9FEC: @ 81C9FEC +sub_81C9FEC: ; 81C9FEC push {lr} movs r0, 0x3 bl gpu_tile_obj_free_by_tag @@ -885022,7 +885022,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} @@ -885031,7 +885031,7 @@ sub_81CA02C: @ 81CA02C movs r2, 0 adds r0, 0x2C mov r8, r0 -_081CA03E: +@081CA03E: movs r4, 0 lsls r0, r2, 2 lsls r1, r2, 4 @@ -885043,7 +885043,7 @@ _081CA03E: adds r5, r0, r2 mov r0, r8 adds r6, r1, r0 -_081CA054: +@081CA054: ldr r0, =0x0862034c movs r1, 0x8C asrs r2, r5, 16 @@ -885061,10 +885061,10 @@ _081CA054: strh r0, [r1, 0x24] adds r4, 0x1 cmp r4, 0x3 - ble _081CA054 + ble @081CA054 adds r2, r7, 0 cmp r2, 0x5 - ble _081CA03E + ble @081CA03E pop {r3} mov r8, r3 pop {r4-r7} @@ -885075,36 +885075,36 @@ _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 movs r1, 0 adds r7, r0, 0 adds r7, 0x2C -_081CA0A2: +@081CA0A2: lsls r0, r1, 4 adds r6, r1, 0x1 adds r4, r0, r7 movs r5, 0x3 -_081CA0AA: +@081CA0AA: ldr r0, [r4] bl obj_free_rotscale_entry ldm r4!, {r0} bl obj_delete_and_free_tiles subs r5, 0x1 cmp r5, 0 - bge _081CA0AA + bge @081CA0AA adds r1, r6, 0 cmp r1, 0x5 - ble _081CA0A2 + ble @081CA0A2 pop {r4-r7} pop {r0} bx r0 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 @@ -885124,7 +885124,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 @@ -885143,10 +885143,10 @@ sub_81CA0EC: @ 81CA0EC lsrs r0, 16 str r0, [sp, 0x4] movs r1, 0 -_081CA114: +@081CA114: ldr r0, [r6] cmp r0, 0 - beq _081CA1B0 + beq @081CA1B0 movs r5, 0 lsls r2, r1, 4 mov r0, r10 @@ -885165,7 +885165,7 @@ _081CA114: adds r1, 0x1 str r1, [sp, 0x10] adds r4, r2, r0 -_081CA13E: +@081CA13E: ldr r3, [r4] ldr r0, [r6] ldrh r2, [r0] @@ -885213,14 +885213,14 @@ _081CA13E: strh r0, [r1, 0x24] adds r5, 0x1 cmp r5, 0x3 - ble _081CA13E + ble @081CA13E mov r1, r8 add r1, r9 movs r0, 0x1 - b _081CA1EC + b @081CA1EC .align 2, 0 .pool -_081CA1B0: +@081CA1B0: lsls r2, r1, 4 mov r0, r10 adds r0, 0x2C @@ -885240,7 +885240,7 @@ _081CA1B0: movs r3, 0x4 adds r2, r0 movs r5, 0x3 -_081CA1D6: +@081CA1D6: ldm r2!, {r1} adds r1, 0x3E ldrb r0, [r1] @@ -885248,18 +885248,18 @@ _081CA1D6: strb r0, [r1] subs r5, 0x1 cmp r5, 0 - bge _081CA1D6 + bge @081CA1D6 mov r1, r8 add r1, r9 movs r0, 0 -_081CA1EC: +@081CA1EC: str r0, [r1] ldr r6, [sp, 0xC] ldr r4, [sp, 0x8] str r4, [sp, 0x14] ldr r1, [sp, 0x10] cmp r1, 0x5 - ble _081CA114 + ble @081CA114 add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -885271,7 +885271,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} @@ -885284,24 +885284,24 @@ sub_81CA20C: @ 81CA20C movs r5, 0 adds r4, r6, 0 adds r4, 0x2C -_081CA228: +@081CA228: lsls r0, r5, 2 adds r1, r6, 0 adds r1, 0x10 adds r1, r0 ldr r0, [r1] cmp r0, 0 - beq _081CA25C + beq @081CA25C adds r0, r7, 0 adds r7, 0x1 cmp r0, r8 - bne _081CA244 + bne @081CA244 movs r2, 0x82 strb r5, [r6, 0xB] - b _081CA246 -_081CA244: + b @081CA246 +@081CA244: movs r2, 0x8C -_081CA246: +@081CA246: adds r0, r4, 0 movs r1, 0x80 lsls r1, 1 @@ -885310,16 +885310,16 @@ _081CA246: adds r0, r4, 0 movs r1, 0 bl sub_81CA448 - b _081CA264 -_081CA25C: + b @081CA264 +@081CA25C: adds r0, r4, 0 movs r1, 0x1 bl sub_81CA448 -_081CA264: +@081CA264: adds r4, 0x10 adds r5, 0x1 cmp r5, 0x5 - ble _081CA228 + ble @081CA228 pop {r3} mov r8, r3 pop {r4-r7} @@ -885328,7 +885328,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 @@ -885339,26 +885339,26 @@ sub_81CA278: @ 81CA278 movs r5, 0 ldr r0, [r4, 0x10] cmp r0, 0 - beq _081CA298 + beq @081CA298 cmp r5, r3 - beq _081CA2B2 -_081CA296: + beq @081CA2B2 +@081CA296: adds r5, 0x1 -_081CA298: +@081CA298: adds r2, 0x1 cmp r2, 0x5 - bgt _081CA2B2 + bgt @081CA2B2 lsls r0, r2, 2 adds r1, r4, 0 adds r1, 0x10 adds r1, r0 ldr r0, [r1] cmp r0, 0 - beq _081CA298 + beq @081CA298 cmp r5, r3 - bne _081CA296 + bne @081CA296 adds r5, r2, 0 -_081CA2B2: +@081CA2B2: ldrb r0, [r4, 0xB] lsls r0, 4 adds r0, 0x2C @@ -885381,7 +885381,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 @@ -885389,39 +885389,39 @@ sub_81CA2DC: @ 81CA2DC movs r5, 0 adds r4, r6, 0 adds r4, 0x2C -_081CA2EC: +@081CA2EC: lsls r0, r5, 2 adds r1, r6, 0 adds r1, 0x10 adds r1, r0 ldr r0, [r1] cmp r0, 0 - beq _081CA316 + beq @081CA316 ldrb r0, [r6, 0xB] cmp r0, r5 - beq _081CA310 + beq @081CA310 adds r0, r4, 0 movs r1, 0x8C movs r2, 0x80 lsls r2, 1 movs r3, 0x8 bl sub_81CA35C - b _081CA316 -_081CA310: + b @081CA316 +@081CA310: adds r0, r4, 0 bl sub_81CA3B4 -_081CA316: +@081CA316: adds r4, 0x10 adds r5, 0x1 cmp r5, 0x5 - ble _081CA2EC + ble @081CA2EC pop {r4-r6} pop {r0} bx r0 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 @@ -885430,32 +885430,32 @@ sub_81CA324: @ 81CA324 ldr r4, =nullsub_12 + 1 adds r1, r3, 0 adds r1, 0x2C -_081CA336: +@081CA336: ldr r0, [r1] ldr r0, [r0, 0x1C] cmp r0, r4 - bne _081CA354 + bne @081CA354 adds r1, 0x10 adds r2, 0x1 cmp r2, 0x5 - ble _081CA336 + ble @081CA336 ldrb r0, [r3, 0xC] cmp r0, 0 - bne _081CA354 + bne @081CA354 movs r0, 0 - b _081CA356 + b @081CA356 .align 2, 0 .pool -_081CA354: +@081CA354: movs r0, 0x1 -_081CA356: +@081CA356: pop {r4} pop {r1} bx r1 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 @@ -885473,7 +885473,7 @@ sub_81CA35C: @ 81CA35C adds r3, r0, 0 movs r1, 0x3 lsls r2, r5, 4 -_081CA380: +@081CA380: ldr r0, [r4] strh r5, [r0, 0x20] ldr r0, [r4] @@ -885490,7 +885490,7 @@ _081CA380: str r7, [r0, 0x1C] subs r1, 0x1 cmp r1, 0 - bge _081CA380 + bge @081CA380 pop {r3,r4} mov r8, r3 mov r9, r4 @@ -885502,7 +885502,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} @@ -885512,7 +885512,7 @@ sub_81CA3B4: @ 81CA3B4 adds r7, r0, 0 movs r5, 0 mov r8, r5 -_081CA3C8: +@081CA3C8: ldr r2, [r4] ldrb r1, [r2, 0x1] movs r3, 0xD @@ -885544,7 +885544,7 @@ _081CA3C8: bl sub_8008258 adds r5, 0x1 cmp r5, 0x3 - ble _081CA3C8 + ble @081CA3C8 movs r0, 0x52 movs r1, 0x10 bl lcd_io_set @@ -885572,7 +885572,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 @@ -885581,7 +885581,7 @@ sub_81CA448: @ 81CA448 movs r6, 0x5 negs r6, r6 movs r3, 0x3 -_081CA458: +@081CA458: ldm r5!, {r0} adds r0, 0x3E ldrb r2, [r0] @@ -885591,14 +885591,14 @@ _081CA458: strb r1, [r0] subs r3, 0x1 cmp r3, 0 - bge _081CA458 + bge @081CA458 pop {r4-r6} pop {r0} bx r0 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] @@ -885609,7 +885609,7 @@ sub_81CA474: @ 81CA474 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _081CA49A + beq @081CA49A ldrh r0, [r2, 0x30] ldrh r1, [r2, 0x32] adds r0, r1 @@ -885617,13 +885617,13 @@ sub_81CA474: @ 81CA474 lsls r0, 16 asrs r0, 20 strh r0, [r2, 0x20] - b _081CA4A2 -_081CA49A: + b @081CA4A2 +@081CA49A: ldrh r0, [r2, 0x3C] strh r0, [r2, 0x20] ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] -_081CA4A2: +@081CA4A2: pop {r0} bx r0 .align 2, 0 @@ -885631,18 +885631,18 @@ _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] movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0 - bne _081CA574 + bne @081CA574 movs r0, 0x30 ldrsh r5, [r4, r0] cmp r5, 0 - bne _081CA4E2 + bne @081CA4E2 adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 @@ -885657,8 +885657,8 @@ sub_81CA4AC: @ 81CA4AC adds r0, r1 strh r0, [r4, 0x20] strh r5, [r4, 0x24] - b _081CA578 -_081CA4E2: + b @081CA578 +@081CA4E2: ldrh r0, [r4, 0x32] adds r0, 0x10 strh r0, [r4, 0x32] @@ -885673,40 +885673,40 @@ _081CA4E2: movs r2, 0x3C ldrsh r0, [r4, r2] cmp r0, 0x1 - beq _081CA518 + beq @081CA518 cmp r0, 0x1 - bgt _081CA50A + bgt @081CA50A cmp r0, 0 - beq _081CA514 - b _081CA526 -_081CA50A: + beq @081CA514 + b @081CA526 +@081CA50A: cmp r0, 0x2 - beq _081CA51C + beq @081CA51C cmp r0, 0x3 - beq _081CA520 - b _081CA526 -_081CA514: + beq @081CA520 + b @081CA526 +@081CA514: negs r1, r1 - b _081CA520 -_081CA518: + b @081CA520 +@081CA518: negs r0, r1 - b _081CA524 -_081CA51C: + b @081CA524 +@081CA51C: strh r1, [r4, 0x24] - b _081CA526 -_081CA520: + b @081CA526 +@081CA520: lsls r0, r1, 1 adds r0, r1 -_081CA524: +@081CA524: strh r0, [r4, 0x24] -_081CA526: +@081CA526: adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _081CA578 + beq @081CA578 adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -885734,20 +885734,20 @@ _081CA526: strb r0, [r4, 0x1] ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] - b _081CA578 + b @081CA578 .align 2, 0 .pool -_081CA574: +@081CA574: subs r0, r1, 0x1 strh r0, [r4, 0x2E] -_081CA578: +@081CA578: pop {r4,r5} pop {r0} bx r0 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 @@ -885760,17 +885760,17 @@ sub_81CA580: @ 81CA580 movs r1, 0 ldrsh r2, [r4, r1] cmp r2, 0 - bne _081CA634 + bne @081CA634 movs r0, 0x2 ldrsh r1, [r4, r0] cmp r1, 0 - beq _081CA5AC + beq @081CA5AC cmp r1, 0x1 - beq _081CA5CC - b _081CA638 + beq @081CA5CC + b @081CA638 .align 2, 0 .pool -_081CA5AC: +@081CA5AC: movs r0, 0x10 strh r0, [r4, 0x4] strh r2, [r4, 0x6] @@ -885784,31 +885784,31 @@ _081CA5AC: ldrh r0, [r4, 0x2] adds r0, 0x1 strh r0, [r4, 0x2] - b _081CA638 -_081CA5CC: + b @081CA638 +@081CA5CC: ldrh r0, [r4, 0x8] ands r1, r0 cmp r1, 0 - beq _081CA5E4 + beq @081CA5E4 ldrh r0, [r4, 0x4] subs r0, 0x3 strh r0, [r4, 0x4] lsls r0, 16 cmp r0, 0 - bge _081CA5F6 + bge @081CA5F6 strh r2, [r4, 0x4] - b _081CA5F6 -_081CA5E4: + b @081CA5F6 +@081CA5E4: ldrh r0, [r4, 0x6] adds r0, 0x3 strh r0, [r4, 0x6] lsls r0, 16 asrs r0, 16 cmp r0, 0x10 - ble _081CA5F6 + ble @081CA5F6 movs r0, 0x10 strh r0, [r4, 0x6] -_081CA5F6: +@081CA5F6: ldrh r1, [r4, 0x6] lsls r1, 8 ldrh r0, [r4, 0x4] @@ -885823,7 +885823,7 @@ _081CA5F6: lsls r0, 16 asrs r0, 16 cmp r0, 0xC - bne _081CA638 + bne @081CA638 movs r0, 0x2 bl sub_81C763C ldrb r1, [r0, 0xC] @@ -885835,18 +885835,18 @@ _081CA5F6: bl lcd_io_set adds r0, r5, 0 bl remove_task - b _081CA638 -_081CA634: + b @081CA638 +@081CA634: subs r0, 0x1 strh r0, [r4] -_081CA638: +@081CA638: pop {r4,r5} pop {r0} bx r0 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 @@ -885866,28 +885866,28 @@ sub_81CA640: @ 81CA640 str r1, [r4, 0x28] bl sub_81C98D4 cmp r0, 0 - beq _081CA684 + beq @081CA684 ldr r1, [r4, 0x28] ldr r0, =sub_81CA6AC + 1 str r0, [r1, 0x1C] - b _081CA690 + b @081CA690 .align 2, 0 .pool -_081CA684: +@081CA684: ldr r0, [r4, 0x28] adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] -_081CA690: +@081CA690: pop {r4} pop {r0} bx r0 thumb_func_end sub_81CA640 thumb_func_start sub_81CA698 -sub_81CA698: @ 81CA698 +sub_81CA698: ; 81CA698 push {lr} movs r0, 0x2 bl sub_81C763C @@ -885898,7 +885898,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] @@ -885907,7 +885907,7 @@ sub_81CA6AC: @ 81CA6AC lsls r0, 16 asrs r0, 16 cmp r0, 0x8 - ble _081CA6DA + ble @081CA6DA movs r0, 0 strh r0, [r3, 0x2E] adds r3, 0x3E @@ -885922,13 +885922,13 @@ sub_81CA6AC: @ 81CA6AC ands r0, r2 orrs r0, r1 strb r0, [r3] -_081CA6DA: +@081CA6DA: pop {r0} bx r0 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 @@ -885953,7 +885953,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 @@ -885996,7 +885996,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 @@ -886035,7 +886035,7 @@ sub_81CA770: @ 81CA770 thumb_func_end sub_81CA770 thumb_func_start sub_81CA7C4 -sub_81CA7C4: @ 81CA7C4 +sub_81CA7C4: ; 81CA7C4 push {lr} bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -886045,7 +886045,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 @@ -886062,7 +886062,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 @@ -886073,7 +886073,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 @@ -886084,7 +886084,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 + 1 movs r1, 0x3 @@ -886110,7 +886110,7 @@ sub_81CA818: @ 81CA818 thumb_func_end sub_81CA818 thumb_func_start sub_81CA850 -sub_81CA850: @ 81CA850 +sub_81CA850: ; 81CA850 push {lr} ldr r0, =0x0861fc86 movs r1, 0x31 @@ -886123,7 +886123,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 + 1 movs r1, 0x3 @@ -886149,7 +886149,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 + 1 bl is_function_an_active_task @@ -886162,7 +886162,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 @@ -886199,10 +886199,10 @@ sub_81CA8B0: @ 81CA8B0 movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0xC - bne _081CA908 + bne @081CA908 adds r0, r6, 0 bl remove_task -_081CA908: +@081CA908: add sp, 0xC pop {r4-r6} pop {r0} @@ -886212,7 +886212,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 copy_super_sprites_to_oam @@ -886223,7 +886223,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 @@ -886263,7 +886263,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 @@ -886286,7 +886286,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 @@ -886296,7 +886296,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 @@ -886307,7 +886307,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 @@ -886321,7 +886321,7 @@ sub_81CA9EC: @ 81CA9EC strh r0, [r2] lsls r0, 16 cmp r0, 0 - ble _081CAA30 + ble @081CAA30 movs r0, 0 strh r0, [r2] ldrh r0, [r2, 0x2] @@ -886341,7 +886341,7 @@ sub_81CA9EC: @ 81CA9EC lsrs r1, 16 movs r0, 0x54 bl lcd_io_set -_081CAA30: +@081CAA30: pop {r0} bx r0 .align 2, 0 @@ -886349,7 +886349,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 @@ -886418,7 +886418,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} @@ -886426,7 +886426,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 @@ -886434,7 +886434,7 @@ sub_81CAAE8: @ 81CAAE8 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq _081CAB1C + beq @081CAB1C ldr r0, =sub_81CAB44 + 1 str r0, [r4, 0x18] movs r0, 0 @@ -886445,19 +886445,19 @@ sub_81CAAE8: @ 81CAAE8 bl sub_81C7078 str r0, [r4, 0x14] movs r0, 0x1 - b _081CAB1E + b @081CAB1E .align 2, 0 .pool -_081CAB1C: +@081CAB1C: movs r0, 0 -_081CAB1E: +@081CAB1E: pop {r4} pop {r1} bx r1 thumb_func_end sub_81CAAE8 thumb_func_start sub_81CAB24 -sub_81CAB24: @ 81CAB24 +sub_81CAB24: ; 81CAB24 push {lr} movs r0, 0x5 bl sub_81C763C @@ -886468,7 +886468,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 @@ -886477,7 +886477,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 @@ -886485,41 +886485,41 @@ sub_81CAB44: @ 81CAB44 movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _081CAB5C + beq @081CAB5C movs r0, 0x2 - b _081CABF4 + b @081CABF4 .align 2, 0 .pool -_081CAB5C: +@081CAB5C: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081CAB68 + beq @081CAB68 movs r0, 0x1 - b _081CABF4 -_081CAB68: + b @081CABF4 +@081CAB68: movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _081CAB74 + beq @081CAB74 movs r0, 0x4 - b _081CABF4 -_081CAB74: + b @081CABF4 +@081CAB74: movs r0, 0x10 ands r0, r1 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0 - beq _081CAB84 + beq @081CAB84 movs r0, 0x3 - b _081CABF4 -_081CAB84: + b @081CABF4 +@081CAB84: ldrh r1, [r3, 0x2E] movs r5, 0x1 adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq _081CABD0 + beq @081CABD0 ldr r0, =sub_81CAC04 + 1 str r0, [r4, 0x18] strh r2, [r4] @@ -886528,55 +886528,55 @@ _081CAB84: adds r1, r4, r0 ldrb r0, [r1, 0x1C] cmp r0, 0 - beq _081CABAE + beq @081CABAE ldrh r0, [r1, 0x1E] bl sub_81D17E8 cmp r0, 0 - beq _081CABC0 -_081CABAE: + beq @081CABC0 +@081CABAE: ldr r0, =0x0862250a str r0, [r4, 0x4] movs r0, 0x2 strh r0, [r4, 0x2] - b _081CABC6 + b @081CABC6 .align 2, 0 .pool -_081CABC0: +@081CABC0: ldr r0, =0x08622508 str r0, [r4, 0x4] strh r5, [r4, 0x2] -_081CABC6: +@081CABC6: movs r0, 0x5 - b _081CABF4 + b @081CABF4 .align 2, 0 .pool -_081CABD0: +@081CABD0: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081CABF2 + beq @081CABF2 bl sub_81C767C cmp r0, 0x1 - beq _081CABEC + beq @081CABEC ldr r0, =sub_81CABFC + 1 str r0, [r4, 0x18] movs r0, 0xF - b _081CABF4 + b @081CABF4 .align 2, 0 .pool -_081CABEC: +@081CABEC: movs r0, 0x20 bl audio_play -_081CABF2: +@081CABF2: movs r0, 0 -_081CABF4: +@081CABF4: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_81CAB44 thumb_func_start sub_81CABFC -sub_81CABFC: @ 81CABFC +sub_81CABFC: ; 81CABFC ldr r0, =0x000186a4 bx lr .align 2, 0 @@ -886584,7 +886584,7 @@ sub_81CABFC: @ 81CABFC 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 @@ -886592,89 +886592,89 @@ sub_81CAC04: @ 81CAC04 movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _081CAC24 + beq @081CAC24 ldrh r0, [r4] cmp r0, 0 - beq _081CAC24 + beq @081CAC24 subs r0, 0x1 - b _081CAC38 + b @081CAC38 .align 2, 0 .pool -_081CAC24: +@081CAC24: ldrh r1, [r2, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081CAC3E + beq @081CAC3E ldrh r0, [r4] ldrh r1, [r4, 0x2] cmp r0, r1 - bcs _081CAC3E + bcs @081CAC3E adds r0, 0x1 -_081CAC38: +@081CAC38: strh r0, [r4] movs r0, 0x6 - b _081CACAC -_081CAC3E: + b @081CACAC +@081CAC3E: ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081CAC98 + beq @081CAC98 ldrh r1, [r4] ldr r0, [r4, 0x4] adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - beq _081CAC8C + beq @081CAC8C cmp r0, 0x1 - bgt _081CAC5E + bgt @081CAC5E cmp r0, 0 - beq _081CAC64 - b _081CAC98 -_081CAC5E: + beq @081CAC64 + b @081CAC98 +@081CAC5E: cmp r0, 0x2 - bne _081CAC98 - b _081CACA6 -_081CAC64: + bne @081CAC98 + b @081CACA6 +@081CAC64: bl sub_81C767C cmp r0, 0x1 - bne _081CAC72 + bne @081CAC72 movs r0, 0x2 bl sub_81C7688 -_081CAC72: +@081CAC72: ldr r0, =sub_81CACF8 + 1 str r0, [r4, 0x18] bl sub_81CB1D0 cmp r0, 0 - beq _081CAC88 + beq @081CAC88 movs r0, 0x9 - b _081CACAC + b @081CACAC .align 2, 0 .pool -_081CAC88: +@081CAC88: movs r0, 0x8 - b _081CACAC -_081CAC8C: + b @081CACAC +@081CAC8C: ldr r0, =sub_81CACB8 + 1 str r0, [r4, 0x18] movs r0, 0xB - b _081CACAC + b @081CACAC .align 2, 0 .pool -_081CAC98: +@081CAC98: ldrh r1, [r2, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _081CACA6 + bne @081CACA6 movs r0, 0 - b _081CACAC -_081CACA6: + b @081CACAC +@081CACA6: ldr r0, =sub_81CAB44 + 1 str r0, [r4, 0x18] movs r0, 0x7 -_081CACAC: +@081CACAC: pop {r4} pop {r1} bx r1 @@ -886683,7 +886683,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 @@ -886691,31 +886691,31 @@ sub_81CACB8: @ 81CACB8 movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _081CACD0 + beq @081CACD0 movs r0, 0xC - b _081CACF0 + b @081CACF0 .align 2, 0 .pool -_081CACD0: +@081CACD0: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081CACDC + beq @081CACDC movs r0, 0xD - b _081CACF0 -_081CACDC: + b @081CACF0 +@081CACDC: ldrh r1, [r2, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _081CACEA + bne @081CACEA movs r0, 0 - b _081CACF0 -_081CACEA: + b @081CACF0 +@081CACEA: ldr r0, =sub_81CAB44 + 1 str r0, [r3, 0x18] movs r0, 0xE -_081CACF0: +@081CACF0: pop {r1} bx r1 .align 2, 0 @@ -886723,7 +886723,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 @@ -886731,16 +886731,16 @@ sub_81CACF8: @ 81CACF8 movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne _081CAD10 + bne @081CAD10 movs r0, 0 - b _081CAD16 + b @081CAD16 .align 2, 0 .pool -_081CAD10: +@081CAD10: ldr r0, =sub_81CAB44 + 1 str r0, [r2, 0x18] movs r0, 0xA -_081CAD16: +@081CAD16: pop {r1} bx r1 .align 2, 0 @@ -886748,39 +886748,39 @@ _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 bl sub_81C763C adds r4, r0, 0 cmp r5, 0x1 - beq _081CAD4C + beq @081CAD4C cmp r5, 0x1 - bgt _081CAD3A + bgt @081CAD3A cmp r5, 0 - beq _081CAD44 - b _081CAE00 -_081CAD3A: + beq @081CAD44 + b @081CAE00 +@081CAD3A: cmp r5, 0x2 - beq _081CAD9C + beq @081CAD9C cmp r5, 0x3 - beq _081CADFC - b _081CAE00 -_081CAD44: + beq @081CADFC + b @081CAE00 +@081CAD44: strh r5, [r4, 0x8] strh r5, [r4, 0xA] -_081CAD48: +@081CAD48: movs r0, 0x1 - b _081CAE02 -_081CAD4C: + b @081CAE02 +@081CAD4C: movs r6, 0 ldrh r5, [r4, 0x8] -_081CAD50: +@081CAD50: adds r0, r5, 0 bl sub_81D15F4 cmp r0, 0 - beq _081CAD80 + beq @081CAD80 ldrh r0, [r4, 0xA] lsls r0, 2 adds r0, r4, r0 @@ -886799,7 +886799,7 @@ _081CAD50: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] -_081CAD80: +@081CAD80: ldrh r0, [r4, 0x8] adds r1, r0, 0x1 movs r2, 0 @@ -886807,26 +886807,26 @@ _081CAD80: lsls r0, r1, 16 lsrs r0, 16 cmp r0, 0x14 - bhi _081CADF6 + bhi @081CADF6 adds r6, 0x1 adds r5, 0x1 cmp r6, 0x1D - ble _081CAD50 + ble @081CAD50 movs r0, 0x3 - b _081CAE02 -_081CAD9C: + b @081CAE02 +@081CAD9C: movs r6, 0 ldrh r5, [r4, 0x8] movs r7, 0 -_081CADA2: +@081CADA2: ldrh r0, [r4, 0x8] bl sub_81D1BF8 cmp r0, 0 - bne _081CADDC + bne @081CADDC ldrh r0, [r4, 0x8] bl sub_81CAE08 cmp r0, 0 - beq _081CADDC + beq @081CADDC ldrh r0, [r4, 0xA] lsls r0, 2 adds r0, r4, r0 @@ -886845,43 +886845,43 @@ _081CADA2: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] -_081CADDC: +@081CADDC: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] lsls r0, 16 lsrs r0, 16 cmp r0, 0x4D - bhi _081CAD48 + bhi @081CAD48 adds r6, 0x1 adds r5, 0x1 cmp r6, 0x1D - ble _081CADA2 + ble @081CADA2 movs r0, 0x3 - b _081CAE02 -_081CADF6: + b @081CAE02 +@081CADF6: strh r1, [r4, 0xC] strh r2, [r4, 0x8] - b _081CAD48 -_081CADFC: + b @081CAD48 +@081CADFC: movs r0, 0x1 str r0, [r4, 0x10] -_081CAE00: +@081CAE00: movs r0, 0x4 -_081CAE02: +@081CAE02: pop {r4-r7} pop {r1} bx r1 thumb_func_end sub_81CAD20 thumb_func_start sub_81CAE08 -sub_81CAE08: @ 81CAE08 +sub_81CAE08: ; 81CAE08 push {lr} cmp r0, 0x4D - ble _081CAE12 + ble @081CAE12 movs r0, 0 - b _081CAE24 -_081CAE12: + b @081CAE24 +@081CAE12: movs r1, 0xAE lsls r1, 1 adds r0, r1 @@ -886890,13 +886890,13 @@ _081CAE12: bl flag_check lsls r0, 24 lsrs r0, 24 -_081CAE24: +@081CAE24: pop {r1} bx r1 thumb_func_end sub_81CAE08 thumb_func_start sub_81CAE28 -sub_81CAE28: @ 81CAE28 +sub_81CAE28: ; 81CAE28 push {lr} movs r0, 0x5 bl sub_81C763C @@ -886906,7 +886906,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 @@ -886916,7 +886916,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 @@ -886926,7 +886926,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 @@ -886939,7 +886939,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 @@ -886949,21 +886949,21 @@ sub_81CAE6C: @ 81CAE6C adds r4, r0 ldrh r0, [r1, 0xA] cmp r4, r0 - bge _081CAE8A + bge @081CAE8A lsls r0, r4, 2 adds r0, r1, r0 ldrh r0, [r0, 0x1E] - b _081CAE8C -_081CAE8A: + b @081CAE8C +@081CAE8A: movs r0, 0x4E -_081CAE8C: +@081CAE8C: pop {r4} pop {r1} bx r1 thumb_func_end sub_81CAE6C thumb_func_start sub_81CAE94 -sub_81CAE94: @ 81CAE94 +sub_81CAE94: ; 81CAE94 push {lr} movs r0, 0x5 bl sub_81C763C @@ -886973,7 +886973,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 @@ -886987,7 +886987,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 @@ -886996,16 +886996,16 @@ sub_81CAEBC: @ 81CAEBC adds r1, r0, r1 ldrb r0, [r1, 0x1C] cmp r0, 0 - bne _081CAED4 + bne @081CAED4 ldrh r4, [r1, 0x1E] - b _081CAEDC -_081CAED4: + b @081CAEDC +@081CAED4: ldrh r0, [r1, 0x1E] bl sub_81D1854 adds r4, r0, 0 -_081CAEDC: +@081CAEDC: cmp r4, 0x4E - beq _081CAEFC + beq @081CAEFC ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000009ca @@ -887015,19 +887015,19 @@ _081CAEDC: negs r0, r1 orrs r0, r1 lsrs r0, 31 - b _081CAEFE + b @081CAEFE .align 2, 0 .pool -_081CAEFC: +@081CAEFC: movs r0, 0 -_081CAEFE: +@081CAEFE: pop {r4} pop {r1} bx r1 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 @@ -887036,7 +887036,7 @@ sub_81CAF04: @ 81CAF04 adds r1, r0, r1 ldrb r0, [r1, 0x1C] cmp r0, 0 - bne _081CAF34 + bne @081CAF34 ldrh r0, [r1, 0x1E] bl sub_81D15BC adds r4, r0, 0 @@ -887046,26 +887046,26 @@ sub_81CAF04: @ 81CAF04 lsls r0, 3 adds r0, r1 ldrb r0, [r0, 0x3] - b _081CAF6C + b @081CAF6C .align 2, 0 .pool -_081CAF34: +@081CAF34: ldrh r5, [r1, 0x1E] adds r0, r5, 0 bl sub_81D1854 adds r4, r0, 0 cmp r4, 0x4E - bne _081CAF58 + bne @081CAF58 adds r0, r5, 0 bl sub_81D1BD0 adds r4, r0, 0 ldr r0, =0x0831f578 adds r0, r4, r0 ldrb r0, [r0] - b _081CAF6C + b @081CAF6C .align 2, 0 .pool -_081CAF58: +@081CAF58: adds r0, r4, 0 bl sub_81D15BC adds r4, r0, 0 @@ -887075,7 +887075,7 @@ _081CAF58: lsls r1, 3 adds r1, r0 ldrb r0, [r1, 0x3] -_081CAF6C: +@081CAF6C: pop {r4,r5} pop {r1} bx r1 @@ -887084,7 +887084,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 @@ -887098,32 +887098,32 @@ sub_81CAF78: @ 81CAF78 bl is_light_level_1_2_3_or_6 lsls r0, 24 cmp r0, 0 - bne _081CAFA4 + bne @081CAFA4 ldr r0, =0x085eeb0b - b _081CAFCE + b @081CAFCE .align 2, 0 .pool -_081CAFA4: +@081CAFA4: lsls r0, r5, 2 adds r1, r4, r0 ldrb r0, [r1, 0x1C] cmp r0, 0 - bne _081CAFC4 + bne @081CAFC4 ldrh r0, [r1, 0x1E] bl sub_81D15BC ldr r1, =0x02021fc4 bl sub_81967AC strb r0, [r6] - b _081CAFCC + b @081CAFCC .align 2, 0 .pool -_081CAFC4: +@081CAFC4: ldrh r0, [r1, 0x1E] ldr r1, =0x02021fc4 bl sub_81D189C -_081CAFCC: +@081CAFCC: ldr r0, =0x02021fc4 -_081CAFCE: +@081CAFCE: pop {r4-r6} pop {r1} bx r1 @@ -887132,7 +887132,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 @@ -887142,26 +887142,26 @@ sub_81CAFD8: @ 81CAFD8 adds r4, r0, r4 ldrb r0, [r4, 0x1C] cmp r0, 0 - beq _081CB004 + beq @081CB004 ldrh r0, [r4, 0x1E] bl sub_81D1854 adds r1, r0, 0 cmp r1, 0x4E - bne _081CB006 + bne @081CB006 ldrh r0, [r4, 0x1E] adds r1, r5, 0 bl sub_81D1B40 - b _081CB012 -_081CB004: + b @081CB012 +@081CB004: ldrh r1, [r4, 0x1E] -_081CB006: +@081CB006: ldr r2, =0x08622028 lsls r0, r5, 2 lsls r1, 4 adds r0, r1 adds r0, r2 ldr r0, [r0] -_081CB012: +@081CB012: pop {r4,r5} pop {r1} bx r1 @@ -887170,7 +887170,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 @@ -887180,7 +887180,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 @@ -887188,28 +887188,28 @@ sub_81CB02C: @ 81CB02C adds r1, r0, 0 ldrh r0, [r1, 0x2] cmp r0, r4 - blt _081CB046 + blt @081CB046 ldr r0, [r1, 0x4] adds r0, r4 ldrb r0, [r0] - b _081CB048 -_081CB046: + b @081CB048 +@081CB046: movs r0, 0x3 -_081CB048: +@081CB048: pop {r4} pop {r1} bx r1 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 adds r4, r1, 0 ldrb r0, [r2] cmp r0, 0 - bne _081CB088 + bne @081CB088 ldrh r0, [r2, 0x2] bl sub_81D15BC lsls r1, r0, 2 @@ -887225,21 +887225,21 @@ sub_81CB050: @ 81CB050 str r0, [sp] adds r1, 0x4 str r1, [sp, 0x4] - b _081CB092 + b @081CB092 .align 2, 0 .pool -_081CB088: +@081CB088: ldrh r0, [r2, 0x2] add r2, sp, 0x4 mov r1, sp bl sub_81D1A78 -_081CB092: +@081CB092: ldr r2, [sp] cmp r2, 0 - beq _081CB0B4 + beq @081CB0B4 ldr r0, [sp, 0x4] cmp r0, 0 - beq _081CB0B4 + beq @081CB0B4 adds r0, r4, 0 movs r1, 0x7 movs r3, 0x45 @@ -887248,14 +887248,14 @@ _081CB092: movs r1, 0x7 movs r3, 0x33 bl sub_81DB494 - b _081CB0C0 -_081CB0B4: + b @081CB0C0 +@081CB0B4: adds r0, r4, 0 movs r1, 0x7 movs r2, 0 movs r3, 0x78 bl sub_81DB494 -_081CB0C0: +@081CB0C0: add sp, 0x8 pop {r4} pop {r0} @@ -887263,7 +887263,7 @@ _081CB0C0: thumb_func_end sub_81CB050 thumb_func_start sub_81CB0C8 -sub_81CB0C8: @ 81CB0C8 +sub_81CB0C8: ; 81CB0C8 push {lr} ldr r1, =0x085500a4 lsls r0, 4 @@ -887280,7 +887280,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 @@ -887290,38 +887290,38 @@ sub_81CB0E4: @ 81CB0E4 adds r5, 0x1 ldrh r0, [r7, 0xA] cmp r5, r0 - bge _081CB120 + bge @081CB120 lsls r0, r5, 2 adds r0, 0x1C adds r4, r0, r7 -_081CB100: +@081CB100: ldrb r0, [r4] cmp r0, 0 - beq _081CB110 + beq @081CB110 ldrh r0, [r4, 0x2] bl sub_81D17E8 cmp r0, 0 - beq _081CB114 -_081CB110: + beq @081CB114 +@081CB110: adds r0, r6, 0 - b _081CB122 -_081CB114: + b @081CB122 +@081CB114: adds r6, 0x1 adds r4, 0x4 adds r5, 0x1 ldrh r0, [r7, 0xA] cmp r5, r0 - blt _081CB100 -_081CB120: + blt @081CB100 +@081CB120: movs r0, 0 -_081CB122: +@081CB122: pop {r4-r7} pop {r1} bx r1 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 @@ -887331,44 +887331,44 @@ sub_81CB128: @ 81CB128 negs r6, r6 subs r5, 0x1 cmp r5, 0 - blt _081CB162 + blt @081CB162 lsls r0, r5, 2 adds r0, 0x1C adds r4, r0, r1 -_081CB144: +@081CB144: ldrb r0, [r4] cmp r0, 0 - beq _081CB154 + beq @081CB154 ldrh r0, [r4, 0x2] bl sub_81D17E8 cmp r0, 0 - beq _081CB158 -_081CB154: + beq @081CB158 +@081CB154: adds r0, r6, 0 - b _081CB164 -_081CB158: + b @081CB164 +@081CB158: subs r6, 0x1 subs r4, 0x4 subs r5, 0x1 cmp r5, 0 - bge _081CB144 -_081CB162: + bge @081CB144 +@081CB162: movs r0, 0 -_081CB164: +@081CB164: pop {r4-r6} pop {r1} bx r1 thumb_func_end sub_81CB128 thumb_func_start sub_81CB16C -sub_81CB16C: @ 81CB16C +sub_81CB16C: ; 81CB16C push {r4,lr} movs r4, 0 -_081CB170: +@081CB170: adds r0, r4, 0 bl sub_81CAE08 cmp r0, 0 - beq _081CB18A + beq @081CB18A ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000009ca @@ -887376,17 +887376,17 @@ _081CB170: adds r0, r4 ldrb r0, [r0] cmp r0, 0 - bne _081CB1B2 -_081CB18A: + bne @081CB1B2 +@081CB18A: adds r4, 0x1 cmp r4, 0x4D - ble _081CB170 + ble @081CB170 movs r4, 0 -_081CB192: +@081CB192: adds r0, r4, 0 bl sub_81D15F4 cmp r0, 0 - beq _081CB1C0 + beq @081CB1C0 adds r0, r4, 0 bl sub_81D1854 ldr r1, =0x03005d8c @@ -887396,25 +887396,25 @@ _081CB192: adds r1, r0 ldrb r0, [r1] cmp r0, 0 - beq _081CB1C0 -_081CB1B2: + beq @081CB1C0 +@081CB1B2: movs r0, 0x1 - b _081CB1C8 + b @081CB1C8 .align 2, 0 .pool -_081CB1C0: +@081CB1C0: adds r4, 0x1 cmp r4, 0x14 - ble _081CB192 + ble @081CB192 movs r0, 0 -_081CB1C8: +@081CB1C8: pop {r4} pop {r1} bx r1 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 @@ -887425,7 +887425,7 @@ sub_81CB1D0: @ 81CB1D0 adds r4, r0 ldrb r0, [r4, 0x1C] cmp r0, 0 - bne _081CB218 + bne @081CB218 adds r0, r1, 0 bl sub_81CAEA4 ldr r1, =0x02037318 @@ -887433,7 +887433,7 @@ sub_81CB1D0: @ 81CB1D0 lsrs r0, 16 ldrb r1, [r1, 0x14] cmp r0, r1 - bne _081CB258 + bne @081CB258 ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000009ca @@ -887441,13 +887441,13 @@ sub_81CB1D0: @ 81CB1D0 ldrh r4, [r4, 0x1E] adds r0, r4 ldrb r0, [r0] - b _081CB246 + b @081CB246 .align 2, 0 .pool -_081CB218: +@081CB218: ldrh r0, [r4, 0x1E] cmp r0, 0xB - bne _081CB258 + bne @081CB258 adds r0, r1, 0 bl sub_81CAEA4 ldr r1, =0x02037318 @@ -887455,40 +887455,40 @@ _081CB218: lsrs r0, 16 ldrb r1, [r1, 0x14] cmp r0, r1 - bne _081CB258 + bne @081CB258 ldr r0, =0x0000086b bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081CB258 + bne @081CB258 movs r0, 0x5B bl flag_check lsls r0, 24 -_081CB246: +@081CB246: cmp r0, 0 - bne _081CB258 + bne @081CB258 movs r0, 0x1 - b _081CB25A + b @081CB25A .align 2, 0 .pool -_081CB258: +@081CB258: movs r0, 0 -_081CB25A: +@081CB25A: pop {r4} pop {r1} bx r1 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 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq _081CB294 + beq @081CB294 movs r0, 0 strb r0, [r4, 0x19] ldr r0, =sub_81CB324 + 1 @@ -887498,19 +887498,19 @@ sub_81CB260: @ 81CB260 ldr r0, =sub_81CB310 + 1 str r0, [r4] movs r0, 0x1 - b _081CB296 + b @081CB296 .align 2, 0 .pool -_081CB294: +@081CB294: movs r0, 0 -_081CB296: +@081CB296: pop {r4} pop {r1} bx r1 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 @@ -887533,7 +887533,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 @@ -887544,7 +887544,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 @@ -887565,7 +887565,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 @@ -887576,7 +887576,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 @@ -887584,27 +887584,27 @@ sub_81CB324: @ 81CB324 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x7 - bls _081CB338 - b _081CB504 -_081CB338: + bls @081CB338 + b @081CB504 +@081CB338: lsls r0, r4, 2 - ldr r1, =_081CB348 + ldr r1, =@081CB348 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081CB348: - .4byte _081CB368 - .4byte _081CB3D4 - .4byte _081CB424 - .4byte _081CB468 - .4byte _081CB482 - .4byte _081CB494 - .4byte _081CB4A6 - .4byte _081CB4EA -_081CB368: +@081CB348: + .4byte @081CB368 + .4byte @081CB3D4 + .4byte @081CB424 + .4byte @081CB468 + .4byte @081CB482 + .4byte @081CB494 + .4byte @081CB4A6 + .4byte @081CB4EA +@081CB368: ldr r0, =0x0862278c movs r1, 0x3 bl sub_81C7B54 @@ -887639,16 +887639,16 @@ _081CB368: movs r2, 0x20 bl sub_81C7944 movs r0, 0x2 - b _081CB418 + b @081CB418 .align 2, 0 .pool -_081CB3D4: +@081CB3D4: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - beq _081CB3E0 - b _081CB4FA -_081CB3E0: + beq @081CB3E0 + b @081CB4FA +@081CB3E0: movs r0, 0x1 movs r1, 0 movs r2, 0 @@ -887673,18 +887673,18 @@ _081CB3E0: movs r2, 0x20 bl sub_81C7944 movs r0, 0x1 -_081CB418: +@081CB418: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0 - b _081CB506 + b @081CB506 .align 2, 0 .pool -_081CB424: +@081CB424: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _081CB4FA + bne @081CB4FA adds r0, r5, 0 bl sub_81CC034 ldr r1, =0x08622760 @@ -887702,37 +887702,37 @@ _081CB424: movs r2, 0x20 bl sub_81C7944 movs r0, 0 - b _081CB506 + b @081CB506 .align 2, 0 .pool -_081CB468: +@081CB468: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - bne _081CB4FA + bne @081CB4FA bl sub_81CAE28 cmp r0, 0 - beq _081CB4FA + beq @081CB4FA bl sub_81CBBB8 movs r0, 0 - b _081CB506 -_081CB482: + b @081CB506 +@081CB482: bl sub_81C8224 cmp r0, 0 - bne _081CB4FA + bne @081CB4FA adds r0, r5, 0 bl sub_81CBD78 movs r0, 0 - b _081CB506 -_081CB494: + b @081CB506 +@081CB494: adds r0, r5, 0 bl sub_81CBDC0 adds r0, r5, 0 movs r1, 0 bl sub_81CBEF8 movs r0, 0 - b _081CB506 -_081CB4A6: + b @081CB506 +@081CB4A6: movs r0, 0x1 movs r1, 0 movs r2, 0 @@ -887757,23 +887757,23 @@ _081CB4A6: movs r0, 0x1 bl sub_81C7AC0 movs r0, 0 - b _081CB506 -_081CB4EA: + b @081CB506 +@081CB4EA: bl sub_81C7B34 cmp r0, 0 - bne _081CB4FA + bne @081CB4FA bl sub_81C8010 cmp r0, 0 - beq _081CB4FE -_081CB4FA: + beq @081CB4FE +@081CB4FA: movs r0, 0x2 - b _081CB506 -_081CB4FE: + b @081CB506 +@081CB4FE: movs r0, 0x1 bl sub_81CBC38 -_081CB504: +@081CB504: movs r0, 0x4 -_081CB506: +@081CB506: add sp, 0x8 pop {r4,r5} pop {r1} @@ -887781,294 +887781,294 @@ _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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x1 - beq _081CB55E + beq @081CB55E cmp r4, 0x1 - bgt _081CB52A + bgt @081CB52A cmp r4, 0 - beq _081CB534 - b _081CB580 -_081CB52A: + beq @081CB534 + b @081CB580 +@081CB52A: cmp r4, 0x2 - beq _081CB566 + beq @081CB566 cmp r4, 0x3 - beq _081CB572 - b _081CB580 -_081CB534: + beq @081CB572 + b @081CB580 +@081CB534: bl sub_81C868C cmp r0, 0x1 - beq _081CB54C + beq @081CB54C cmp r0, 0x1 - bgt _081CB546 + bgt @081CB546 cmp r0, 0 - beq _081CB580 - b _081CB56E -_081CB546: + beq @081CB580 + b @081CB56E +@081CB546: cmp r0, 0x2 - beq _081CB556 - b _081CB56E -_081CB54C: + beq @081CB556 + b @081CB56E +@081CB54C: movs r0, 0x5 bl audio_play movs r0, 0x7 - b _081CB582 -_081CB556: + b @081CB582 +@081CB556: movs r0, 0x5 bl audio_play - b _081CB56E -_081CB55E: + b @081CB56E +@081CB55E: bl sub_81C8630 cmp r0, 0 - bne _081CB57C -_081CB566: + bne @081CB57C +@081CB566: adds r0, r5, 0 movs r1, 0 bl sub_81CBEF8 -_081CB56E: +@081CB56E: movs r0, 0 - b _081CB582 -_081CB572: + b @081CB582 +@081CB572: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _081CB580 -_081CB57C: + beq @081CB580 +@081CB57C: movs r0, 0x2 - b _081CB582 -_081CB580: + b @081CB582 +@081CB580: movs r0, 0x4 -_081CB582: +@081CB582: pop {r4,r5} pop {r1} bx r1 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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x1 - beq _081CB5D6 + beq @081CB5D6 cmp r4, 0x1 - bgt _081CB5A2 + bgt @081CB5A2 cmp r4, 0 - beq _081CB5AC - b _081CB5F8 -_081CB5A2: + beq @081CB5AC + b @081CB5F8 +@081CB5A2: cmp r4, 0x2 - beq _081CB5DE + beq @081CB5DE cmp r4, 0x3 - beq _081CB5EA - b _081CB5F8 -_081CB5AC: + beq @081CB5EA + b @081CB5F8 +@081CB5AC: bl sub_81C8658 cmp r0, 0x1 - beq _081CB5C4 + beq @081CB5C4 cmp r0, 0x1 - bgt _081CB5BE + bgt @081CB5BE cmp r0, 0 - beq _081CB5F8 - b _081CB5E6 -_081CB5BE: + beq @081CB5F8 + b @081CB5E6 +@081CB5BE: cmp r0, 0x2 - beq _081CB5CE - b _081CB5E6 -_081CB5C4: + beq @081CB5CE + b @081CB5E6 +@081CB5C4: movs r0, 0x5 bl audio_play movs r0, 0x7 - b _081CB5FA -_081CB5CE: + b @081CB5FA +@081CB5CE: movs r0, 0x5 bl audio_play - b _081CB5E6 -_081CB5D6: + b @081CB5E6 +@081CB5D6: bl sub_81C8630 cmp r0, 0 - bne _081CB5F4 -_081CB5DE: + bne @081CB5F4 +@081CB5DE: adds r0, r5, 0 movs r1, 0 bl sub_81CBEF8 -_081CB5E6: +@081CB5E6: movs r0, 0 - b _081CB5FA -_081CB5EA: + b @081CB5FA +@081CB5EA: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _081CB5F8 -_081CB5F4: + beq @081CB5F8 +@081CB5F4: movs r0, 0x2 - b _081CB5FA -_081CB5F8: + b @081CB5FA +@081CB5F8: movs r0, 0x4 -_081CB5FA: +@081CB5FA: pop {r4,r5} pop {r1} bx r1 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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x1 - beq _081CB64E + beq @081CB64E cmp r4, 0x1 - bgt _081CB61A + bgt @081CB61A cmp r4, 0 - beq _081CB624 - b _081CB670 -_081CB61A: + beq @081CB624 + b @081CB670 +@081CB61A: cmp r4, 0x2 - beq _081CB656 + beq @081CB656 cmp r4, 0x3 - beq _081CB662 - b _081CB670 -_081CB624: + beq @081CB662 + b @081CB670 +@081CB624: bl sub_81C870C cmp r0, 0x1 - beq _081CB63C + beq @081CB63C cmp r0, 0x1 - bgt _081CB636 + bgt @081CB636 cmp r0, 0 - beq _081CB670 - b _081CB65E -_081CB636: + beq @081CB670 + b @081CB65E +@081CB636: cmp r0, 0x2 - beq _081CB646 - b _081CB65E -_081CB63C: + beq @081CB646 + b @081CB65E +@081CB63C: movs r0, 0x5 bl audio_play movs r0, 0x7 - b _081CB672 -_081CB646: + b @081CB672 +@081CB646: movs r0, 0x5 bl audio_play - b _081CB65E -_081CB64E: + b @081CB65E +@081CB64E: bl sub_81C8630 cmp r0, 0 - bne _081CB66C -_081CB656: + bne @081CB66C +@081CB656: adds r0, r5, 0 movs r1, 0 bl sub_81CBEF8 -_081CB65E: +@081CB65E: movs r0, 0 - b _081CB672 -_081CB662: + b @081CB672 +@081CB662: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _081CB670 -_081CB66C: + beq @081CB670 +@081CB66C: movs r0, 0x2 - b _081CB672 -_081CB670: + b @081CB672 +@081CB670: movs r0, 0x4 -_081CB672: +@081CB672: pop {r4,r5} pop {r1} bx r1 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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x1 - beq _081CB6C6 + beq @081CB6C6 cmp r4, 0x1 - bgt _081CB692 + bgt @081CB692 cmp r4, 0 - beq _081CB69C - b _081CB6E8 -_081CB692: + beq @081CB69C + b @081CB6E8 +@081CB692: cmp r4, 0x2 - beq _081CB6CE + beq @081CB6CE cmp r4, 0x3 - beq _081CB6DA - b _081CB6E8 -_081CB69C: + beq @081CB6DA + b @081CB6E8 +@081CB69C: bl sub_81C86CC cmp r0, 0x1 - beq _081CB6B4 + beq @081CB6B4 cmp r0, 0x1 - bgt _081CB6AE + bgt @081CB6AE cmp r0, 0 - beq _081CB6E8 - b _081CB6D6 -_081CB6AE: + beq @081CB6E8 + b @081CB6D6 +@081CB6AE: cmp r0, 0x2 - beq _081CB6BE - b _081CB6D6 -_081CB6B4: + beq @081CB6BE + b @081CB6D6 +@081CB6B4: movs r0, 0x5 bl audio_play movs r0, 0x7 - b _081CB6EA -_081CB6BE: + b @081CB6EA +@081CB6BE: movs r0, 0x5 bl audio_play - b _081CB6D6 -_081CB6C6: + b @081CB6D6 +@081CB6C6: bl sub_81C8630 cmp r0, 0 - bne _081CB6E4 -_081CB6CE: + bne @081CB6E4 +@081CB6CE: adds r0, r5, 0 movs r1, 0 bl sub_81CBEF8 -_081CB6D6: +@081CB6D6: movs r0, 0 - b _081CB6EA -_081CB6DA: + b @081CB6EA +@081CB6DA: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _081CB6E8 -_081CB6E4: + beq @081CB6E8 +@081CB6E4: movs r0, 0x2 - b _081CB6EA -_081CB6E8: + b @081CB6EA +@081CB6E8: movs r0, 0x4 -_081CB6EA: +@081CB6EA: pop {r4,r5} pop {r1} bx r1 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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0 - beq _081CB706 + beq @081CB706 cmp r4, 0x1 - beq _081CB71C - b _081CB72A -_081CB706: + beq @081CB71C + b @081CB72A +@081CB706: movs r0, 0x5 bl audio_play adds r0, r5, 0 @@ -888076,24 +888076,24 @@ _081CB706: movs r0, 0x7 bl sub_81C7BA4 movs r0, 0 - b _081CB72C -_081CB71C: + b @081CB72C +@081CB71C: adds r0, r5, 0 bl sub_81CBFC4 cmp r0, 0 - beq _081CB72A + beq @081CB72A movs r0, 0x2 - b _081CB72C -_081CB72A: + b @081CB72C +@081CB72A: movs r0, 0x4 -_081CB72C: +@081CB72C: pop {r4,r5} pop {r1} bx r1 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 @@ -888113,18 +888113,18 @@ 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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0 - beq _081CB772 + beq @081CB772 cmp r4, 0x1 - beq _081CB788 - b _081CB796 -_081CB772: + beq @081CB788 + b @081CB796 +@081CB772: movs r0, 0x5 bl audio_play adds r0, r5, 0 @@ -888132,108 +888132,108 @@ _081CB772: movs r0, 0x6 bl sub_81C7BA4 movs r0, 0 - b _081CB798 -_081CB788: + b @081CB798 +@081CB788: adds r0, r5, 0 bl sub_81CC004 cmp r0, 0 - beq _081CB796 + beq @081CB796 movs r0, 0x2 - b _081CB798 -_081CB796: + b @081CB798 +@081CB796: movs r0, 0x4 -_081CB798: +@081CB798: pop {r4,r5} pop {r1} bx r1 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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x1 - beq _081CB7D4 + beq @081CB7D4 cmp r4, 0x1 - bgt _081CB7BA + bgt @081CB7BA cmp r4, 0 - beq _081CB7C4 - b _081CB81A -_081CB7BA: + beq @081CB7C4 + b @081CB81A +@081CB7BA: cmp r4, 0x2 - beq _081CB7F8 + beq @081CB7F8 cmp r4, 0x3 - beq _081CB80C - b _081CB81A -_081CB7C4: + beq @081CB80C + b @081CB81A +@081CB7C4: movs r0, 0x1 bl sub_81C9148 adds r0, r5, 0 bl sub_81CC058 movs r0, 0 - b _081CB81C -_081CB7D4: + b @081CB81C +@081CB7D4: adds r0, r5, 0 bl sub_81CC0D0 adds r4, r0, 0 cmp r4, 0 - bne _081CB816 + bne @081CB816 adds r0, r5, 0 bl sub_81CC0E0 ldr r0, =0x00000107 bl audio_play strb r4, [r5, 0xE] movs r0, 0 - b _081CB81C + b @081CB81C .align 2, 0 .pool -_081CB7F8: +@081CB7F8: adds r0, r5, 0 bl sub_81CC104 cmp r0, 0 - bne _081CB816 + bne @081CB816 adds r0, r5, 0 bl sub_81CC158 movs r0, 0 - b _081CB81C -_081CB80C: + b @081CB81C +@081CB80C: adds r0, r5, 0 bl sub_81CC194 cmp r0, 0 - beq _081CB81A -_081CB816: + beq @081CB81A +@081CB816: movs r0, 0x2 - b _081CB81C -_081CB81A: + b @081CB81C +@081CB81A: movs r0, 0x4 -_081CB81C: +@081CB81C: pop {r4,r5} pop {r1} bx r1 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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x1 - beq _081CB85E + beq @081CB85E cmp r4, 0x1 - bgt _081CB83E + bgt @081CB83E cmp r4, 0 - beq _081CB844 - b _081CB880 -_081CB83E: + beq @081CB844 + b @081CB880 +@081CB83E: cmp r4, 0x2 - beq _081CB872 - b _081CB880 -_081CB844: + beq @081CB872 + b @081CB880 +@081CB844: movs r0, 0x5 bl audio_play adds r0, r5, 0 @@ -888243,34 +888243,34 @@ _081CB844: movs r0, 0x1 strb r0, [r5, 0xE] movs r0, 0 - b _081CB882 -_081CB85E: + b @081CB882 +@081CB85E: adds r0, r5, 0 bl sub_81CC0D0 cmp r0, 0 - bne _081CB87C + bne @081CB87C adds r0, r5, 0 bl sub_81CC11C movs r0, 0 - b _081CB882 -_081CB872: + b @081CB882 +@081CB872: adds r0, r5, 0 bl sub_81CC140 cmp r0, 0 - beq _081CB880 -_081CB87C: + beq @081CB880 +@081CB87C: movs r0, 0x2 - b _081CB882 -_081CB880: + b @081CB882 +@081CB880: movs r0, 0x4 -_081CB882: +@081CB882: pop {r4,r5} pop {r1} bx r1 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 @@ -888278,80 +888278,80 @@ sub_81CB888: @ 81CB888 adds r4, r0, 0 movs r6, 0 cmp r5, 0x6 - bhi _081CB934 + bhi @081CB934 lsls r0, r5, 2 - ldr r1, =_081CB8A8 + ldr r1, =@081CB8A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081CB8A8: - .4byte _081CB8C4 - .4byte _081CB8DA - .4byte _081CB8E2 - .4byte _081CB8F0 - .4byte _081CB8F8 - .4byte _081CB90C - .4byte _081CB922 -_081CB8C4: +@081CB8A8: + .4byte @081CB8C4 + .4byte @081CB8DA + .4byte @081CB8E2 + .4byte @081CB8F0 + .4byte @081CB8F8 + .4byte @081CB90C + .4byte @081CB922 +@081CB8C4: ldrb r0, [r4, 0xE] cmp r0, 0 - bne _081CB8D2 + bne @081CB8D2 movs r0, 0x84 lsls r0, 1 bl audio_play -_081CB8D2: +@081CB8D2: movs r0, 0x5 bl audio_play - b _081CB934 -_081CB8DA: + b @081CB934 +@081CB8DA: adds r0, r4, 0 bl sub_81CC1DC - b _081CB934 -_081CB8E2: + b @081CB934 +@081CB8E2: adds r0, r4, 0 bl sub_81CC204 cmp r0, 0 - beq _081CB934 -_081CB8EC: + beq @081CB934 +@081CB8EC: movs r6, 0x2 - b _081CB934 -_081CB8F0: + b @081CB934 +@081CB8F0: adds r0, r4, 0 bl sub_81CBFF0 - b _081CB934 -_081CB8F8: + b @081CB934 +@081CB8F8: adds r0, r4, 0 bl sub_81CC004 cmp r0, 0 - beq _081CB904 + beq @081CB904 movs r6, 0x2 -_081CB904: +@081CB904: movs r0, 0x6 bl sub_81C7BA4 - b _081CB934 -_081CB90C: + b @081CB934 +@081CB90C: bl sub_81C7BE8 cmp r0, 0 - bne _081CB8EC + bne @081CB8EC ldrb r0, [r4, 0xF] cmp r0, 0 - beq _081CB92C + beq @081CB92C bl sub_81C8838 movs r6, 0x1 - b _081CB934 -_081CB922: + b @081CB934 +@081CB922: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _081CB8EC -_081CB92C: + bne @081CB8EC +@081CB92C: movs r0, 0 bl sub_81C9148 movs r6, 0x4 -_081CB934: +@081CB934: adds r0, r6, 0 pop {r4-r6} pop {r1} @@ -888359,293 +888359,293 @@ _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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x1 - beq _081CB974 + beq @081CB974 cmp r4, 0x1 - bgt _081CB956 + bgt @081CB956 cmp r4, 0 - beq _081CB960 - b _081CB9BE -_081CB956: + beq @081CB960 + b @081CB9BE +@081CB956: cmp r4, 0x2 - beq _081CB990 + beq @081CB990 cmp r4, 0x3 - beq _081CB9A0 - b _081CB9BE -_081CB960: + beq @081CB9A0 + b @081CB9BE +@081CB960: movs r0, 0x5 bl audio_play bl sub_81C877C adds r0, r5, 0 bl sub_81CC014 movs r0, 0 - b _081CB9C0 -_081CB974: + b @081CB9C0 +@081CB974: bl sub_81C8820 cmp r0, 0 - bne _081CB9BA + bne @081CB9BA adds r0, r5, 0 bl sub_81CC004 cmp r0, 0 - bne _081CB9BA + bne @081CB9BA movs r0, 0x8 bl sub_81C7BA4 movs r0, 0 - b _081CB9C0 -_081CB990: + b @081CB9C0 +@081CB990: movs r0, 0 bl sub_81C87AC adds r0, r5, 0 bl sub_81CC39C movs r0, 0 - b _081CB9C0 -_081CB9A0: + b @081CB9C0 +@081CB9A0: bl sub_81C8820 cmp r0, 0 - bne _081CB9BA + bne @081CB9BA adds r0, r5, 0 bl sub_81CC42C cmp r0, 0 - bne _081CB9BA + bne @081CB9BA bl sub_81C7BE8 cmp r0, 0 - beq _081CB9BE -_081CB9BA: + beq @081CB9BE +@081CB9BA: movs r0, 0x2 - b _081CB9C0 -_081CB9BE: + b @081CB9C0 +@081CB9BE: movs r0, 0x4 -_081CB9C0: +@081CB9C0: pop {r4,r5} pop {r1} bx r1 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 bl sub_81C763C adds r4, r0, 0 cmp r5, 0x4 - bhi _081CBA60 + bhi @081CBA60 lsls r0, r5, 2 - ldr r1, =_081CB9E8 + ldr r1, =@081CB9E8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081CB9E8: - .4byte _081CB9FC - .4byte _081CBA1C - .4byte _081CBA34 - .4byte _081CBA40 - .4byte _081CBA4A -_081CB9FC: +@081CB9E8: + .4byte @081CB9FC + .4byte @081CBA1C + .4byte @081CBA34 + .4byte @081CBA40 + .4byte @081CBA4A +@081CB9FC: bl sub_81C8770 bl sub_81CB0E4 adds r5, r0, 0 cmp r5, 0 - beq _081CBA60 + beq @081CBA60 movs r0, 0x5 bl audio_play strh r5, [r4, 0x16] adds r0, r4, 0 bl sub_81CC420 movs r0, 0 - b _081CBA62 -_081CBA1C: + b @081CBA62 +@081CBA1C: adds r0, r4, 0 bl sub_81CC42C cmp r0, 0 - bne _081CBA5C + bne @081CBA5C movs r0, 0x16 ldrsh r1, [r4, r0] adds r0, r4, 0 bl sub_81CBEF8 movs r0, 0 - b _081CBA62 -_081CBA34: + b @081CBA62 +@081CBA34: movs r1, 0x16 ldrsh r0, [r4, r1] bl sub_81C87AC movs r0, 0 - b _081CBA62 -_081CBA40: + b @081CBA62 +@081CBA40: adds r0, r4, 0 bl sub_81CC39C movs r0, 0 - b _081CBA62 -_081CBA4A: + b @081CBA62 +@081CBA4A: bl sub_81C8820 cmp r0, 0 - bne _081CBA5C + bne @081CBA5C adds r0, r4, 0 bl sub_81CC42C cmp r0, 0 - beq _081CBA60 -_081CBA5C: + beq @081CBA60 +@081CBA5C: movs r0, 0x2 - b _081CBA62 -_081CBA60: + b @081CBA62 +@081CBA60: movs r0, 0x4 -_081CBA62: +@081CBA62: pop {r4,r5} pop {r1} bx r1 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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x1 - beq _081CBA9C + beq @081CBA9C cmp r4, 0x1 - bgt _081CBA82 + bgt @081CBA82 cmp r4, 0 - beq _081CBA88 - b _081CBACC -_081CBA82: + beq @081CBA88 + b @081CBACC +@081CBA82: cmp r4, 0x2 - beq _081CBABE - b _081CBACC -_081CBA88: + beq @081CBABE + b @081CBACC +@081CBA88: movs r0, 0x5 bl audio_play adds r0, r5, 0 bl sub_81CC420 bl sub_81C87F0 movs r0, 0 - b _081CBACE -_081CBA9C: + b @081CBACE +@081CBA9C: bl sub_81C8820 cmp r0, 0 - bne _081CBAC8 + bne @081CBAC8 adds r0, r5, 0 bl sub_81CC42C cmp r0, 0 - bne _081CBAC8 + bne @081CBAC8 movs r0, 0x6 bl sub_81C7BA4 adds r0, r5, 0 bl sub_81CBDC0 movs r0, 0 - b _081CBACE -_081CBABE: + b @081CBACE +@081CBABE: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _081CBACC -_081CBAC8: + beq @081CBACC +@081CBAC8: movs r0, 0x2 - b _081CBACE -_081CBACC: + b @081CBACE +@081CBACC: movs r0, 0x4 -_081CBACE: +@081CBACE: pop {r4,r5} pop {r1} bx r1 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 bl sub_81C763C adds r4, r0, 0 cmp r5, 0x4 - bhi _081CBB6C + bhi @081CBB6C lsls r0, r5, 2 - ldr r1, =_081CBAF4 + ldr r1, =@081CBAF4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081CBAF4: - .4byte _081CBB08 - .4byte _081CBB28 - .4byte _081CBB40 - .4byte _081CBB4C - .4byte _081CBB56 -_081CBB08: +@081CBAF4: + .4byte @081CBB08 + .4byte @081CBB28 + .4byte @081CBB40 + .4byte @081CBB4C + .4byte @081CBB56 +@081CBB08: bl sub_81C8770 bl sub_81CB128 adds r5, r0, 0 cmp r5, 0 - beq _081CBB6C + beq @081CBB6C movs r0, 0x5 bl audio_play strh r5, [r4, 0x16] adds r0, r4, 0 bl sub_81CC420 movs r0, 0 - b _081CBB6E -_081CBB28: + b @081CBB6E +@081CBB28: adds r0, r4, 0 bl sub_81CC42C cmp r0, 0 - bne _081CBB68 + bne @081CBB68 movs r0, 0x16 ldrsh r1, [r4, r0] adds r0, r4, 0 bl sub_81CBEF8 movs r0, 0 - b _081CBB6E -_081CBB40: + b @081CBB6E +@081CBB40: movs r1, 0x16 ldrsh r0, [r4, r1] bl sub_81C87AC movs r0, 0 - b _081CBB6E -_081CBB4C: + b @081CBB6E +@081CBB4C: adds r0, r4, 0 bl sub_81CC39C movs r0, 0 - b _081CBB6E -_081CBB56: + b @081CBB6E +@081CBB56: bl sub_81C8820 cmp r0, 0 - bne _081CBB68 + bne @081CBB68 adds r0, r4, 0 bl sub_81CC42C cmp r0, 0 - beq _081CBB6C -_081CBB68: + beq @081CBB6C +@081CBB68: movs r0, 0x2 - b _081CBB6E -_081CBB6C: + b @081CBB6E +@081CBB6C: movs r0, 0x4 -_081CBB6E: +@081CBB6E: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_81CBAD4 thumb_func_start sub_81CBB74 -sub_81CBB74: @ 81CBB74 +sub_81CBB74: ; 81CBB74 push {lr} cmp r0, 0 - beq _081CBB80 + beq @081CBB80 cmp r0, 0x1 - beq _081CBB9A - b _081CBBB2 -_081CBB80: + beq @081CBB9A + b @081CBBB2 +@081CBB80: movs r0, 0x5 bl audio_play movs r0, 0 @@ -888654,28 +888654,28 @@ _081CBB80: bl sub_81C7AC0 bl sub_81C78A0 movs r0, 0 - b _081CBBB4 -_081CBB9A: + b @081CBBB4 +@081CBB9A: bl sub_81C7B34 cmp r0, 0 - bne _081CBBAA + bne @081CBBAA bl sub_81C78C0 cmp r0, 0 - beq _081CBBAE -_081CBBAA: + beq @081CBBAE +@081CBBAA: movs r0, 0x2 - b _081CBBB4 -_081CBBAE: + b @081CBBB4 +@081CBBAE: bl sub_81C7FDC -_081CBBB2: +@081CBBB2: movs r0, 0x4 -_081CBBB4: +@081CBBB4: pop {r1} bx r1 thumb_func_end sub_81CBB74 thumb_func_start sub_81CBBB8 -sub_81CBBB8: @ 81CBBB8 +sub_81CBBB8: ; 81CBBB8 push {lr} sub sp, 0x18 bl sub_81CAE94 @@ -888718,7 +888718,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 + 1 @@ -888733,7 +888733,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 + 1 @@ -888741,14 +888741,14 @@ sub_81CBC38: @ 81CBC38 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq _081CBC56 + beq @081CBC56 ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 adds r0, r1 strh r4, [r0, 0x26] -_081CBC56: +@081CBC56: pop {r4} pop {r0} bx r0 @@ -888757,7 +888757,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 @@ -888770,7 +888770,7 @@ sub_81CBC64: @ 81CBC64 movs r1, 0x1E ldrsh r0, [r2, r1] cmp r0, 0 - beq _081CBCC8 + beq @081CBCC8 ldrh r0, [r2] adds r0, 0x4 movs r1, 0x7F @@ -888801,12 +888801,12 @@ sub_81CBC64: @ 81CBC64 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081CBCC8 + bne @081CBCC8 ldr r1, =0x02037bb4 ldr r2, =0x04000008 adds r0, r4, 0 bl CpuSet -_081CBCC8: +@081CBCC8: add sp, 0x8 pop {r4} pop {r0} @@ -888816,7 +888816,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 @@ -888834,7 +888834,7 @@ sub_81CBCEC: @ 81CBCEC adds r0, r5, 0 bl sub_81CAEBC cmp r0, 0 - beq _081CBD30 + beq @081CBD30 movs r1, 0xA0 lsls r1, 7 adds r0, r1, 0 @@ -888844,17 +888844,17 @@ sub_81CBCEC: @ 81CBCEC ldr r2, =0x00005001 adds r0, r2, 0 strh r0, [r1] - b _081CBD3C + b @081CBD3C .align 2, 0 .pool -_081CBD30: +@081CBD30: ldr r0, =0x00005002 adds r1, r0, 0 strh r1, [r6] adds r0, r6, 0 adds r0, 0x40 strh r1, [r0] -_081CBD3C: +@081CBD3C: pop {r4-r6} pop {r0} bx r0 @@ -888863,7 +888863,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 @@ -888889,7 +888889,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, =0x086227d8 @@ -888919,7 +888919,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] @@ -888942,7 +888942,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 @@ -888956,7 +888956,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 @@ -888979,7 +888979,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 @@ -888993,7 +888993,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 @@ -889003,9 +889003,9 @@ sub_81CBE50: @ 81CBE50 adds r1, r0, 0 ldr r0, =0x0001869f cmp r1, r0 - ble _081CBE68 + ble @081CBE68 adds r1, r0, 0 -_081CBE68: +@081CBE68: mov r0, sp movs r2, 0 movs r3, 0x5 @@ -889023,7 +889023,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 @@ -889048,7 +889048,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 @@ -889084,7 +889084,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 @@ -889095,16 +889095,16 @@ sub_81CBEF8: @ 81CBEF8 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0xD5 - beq _081CBF1C + beq @081CBF1C add r0, sp, 0xC movs r2, 0 bl GetMapName - b _081CBF24 -_081CBF1C: + b @081CBF24 +@081CBF1C: ldr r1, =0x085ec00f add r0, sp, 0xC bl gf_strcpy -_081CBF24: +@081CBF24: movs r0, 0x7 add r1, sp, 0xC movs r2, 0x58 @@ -889134,7 +889134,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 @@ -889144,8 +889144,8 @@ sub_81CBF60: @ 81CBF60 movs r4, 0 movs r6, 0x80 lsls r6, 17 - b _081CBF9C -_081CBF76: + b @081CBF9C +@081CBF76: ldrb r0, [r5, 0x12] ldr r2, =0x086227e8 lsls r1, 2 @@ -889164,16 +889164,16 @@ _081CBF76: lsls r0, 21 adds r6, r0 adds r4, 0x1 -_081CBF9C: +@081CBF9C: cmp r4, 0x2 - bhi _081CBFAE + bhi @081CBFAE adds r0, r4, 0 bl sub_81CB02C lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x3 - bne _081CBF76 -_081CBFAE: + bne @081CBF76 +@081CBFAE: ldrb r0, [r5, 0x12] movs r1, 0x2 bl Window_CopyToVram @@ -889186,16 +889186,16 @@ _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 is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _081CBFD6 + beq @081CBFD6 movs r0, 0x1 - b _081CBFE8 -_081CBFD6: + b @081CBFE8 +@081CBFD6: bl sub_81CB01C adds r1, r0, 0 lsls r1, 16 @@ -889203,14 +889203,14 @@ _081CBFD6: adds r0, r4, 0 bl sub_81CC2F0 movs r0, 0 -_081CBFE8: +@081CBFE8: pop {r4} pop {r1} bx r1 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 @@ -889222,7 +889222,7 @@ sub_81CBFF0: @ 81CBFF0 thumb_func_end sub_81CBFF0 thumb_func_start sub_81CC004 -sub_81CC004: @ 81CC004 +sub_81CC004: ; 81CC004 push {lr} bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -889232,7 +889232,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 @@ -889248,7 +889248,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, =0x08622808 @@ -889267,7 +889267,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] @@ -889299,7 +889299,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] @@ -889324,7 +889324,7 @@ sub_81CC09C: @ 81CC09C thumb_func_end sub_81CC09C thumb_func_start sub_81CC0D0 -sub_81CC0D0: @ 81CC0D0 +sub_81CC0D0: ; 81CC0D0 push {lr} bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -889334,7 +889334,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] @@ -889355,7 +889355,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 run_remoboxes @@ -889369,7 +889369,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] @@ -889390,7 +889390,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 run_remoboxes @@ -889404,7 +889404,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 @@ -889433,7 +889433,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 @@ -889441,23 +889441,23 @@ sub_81CC194: @ 81CC194 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081CC1B8 + beq @081CC1B8 ldr r0, =0x03003014 ldrb r1, [r0] movs r2, 0x1 orrs r1, r2 strb r1, [r0] - b _081CC1C4 + b @081CC1C4 .align 2, 0 .pool -_081CC1B8: +@081CC1B8: ldr r2, =0x03003014 ldrb r1, [r2] movs r0, 0x2 negs r0, r0 ands r0, r1 strb r0, [r2] -_081CC1C4: +@081CC1C4: bl run_remoboxes ldrb r0, [r4, 0x14] bl a_pressed_maybe @@ -889471,7 +889471,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 @@ -889492,7 +889492,7 @@ sub_81CC1DC: @ 81CC1DC thumb_func_end sub_81CC1DC thumb_func_start sub_81CC204 -sub_81CC204: @ 81CC204 +sub_81CC204: ; 81CC204 push {lr} bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -889502,7 +889502,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 @@ -889510,13 +889510,13 @@ sub_81CC214: @ 81CC214 adds r6, r0, 0 movs r5, 0 ldr r4, =0x08622810 -_081CC224: +@081CC224: adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load adds r4, 0x8 adds r5, 0x1 cmp r5, 0 - beq _081CC224 + beq @081CC224 ldr r0, =0x08622818 bl sub_81C795C movs r0, 0 @@ -889569,21 +889569,21 @@ _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 adds r4, r0, 0 ldr r0, [r4, 0x1C] cmp r0, 0 - beq _081CC2C8 + beq @081CC2C8 bl obj_delete_and_free_tiles -_081CC2C8: +@081CC2C8: ldr r0, [r4, 0x20] cmp r0, 0 - beq _081CC2D2 + beq @081CC2D2 bl obj_delete_and_free_tiles -_081CC2D2: +@081CC2D2: movs r0, 0x8 bl gpu_tile_obj_free_by_tag movs r0, 0x7 @@ -889598,13 +889598,13 @@ _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 ldr r0, [r4, 0x1C] cmp r0, 0 - bne _081CC320 + bne @081CC320 ldr r0, =0x08622830 movs r1, 0x4 movs r2, 0x50 @@ -889621,7 +889621,7 @@ sub_81CC2F0: @ 81CC2F0 adds r0, r4, 0 adds r1, r5, 0 bl sub_81CC344 -_081CC320: +@081CC320: pop {r4,r5} pop {r0} bx r0 @@ -889630,7 +889630,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] @@ -889643,7 +889643,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] @@ -889651,7 +889651,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] @@ -889660,7 +889660,7 @@ sub_81CC34C: @ 81CC34C lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble _081CC36C + ble @081CC36C movs r0, 0 strh r0, [r2, 0x2E] ldrh r0, [r2, 0x24] @@ -889668,13 +889668,13 @@ sub_81CC34C: @ 81CC34C movs r1, 0x7 ands r0, r1 strh r0, [r2, 0x24] -_081CC36C: +@081CC36C: pop {r0} bx r0 thumb_func_end sub_81CC34C thumb_func_start sub_81CC370 -sub_81CC370: @ 81CC370 +sub_81CC370: ; 81CC370 push {lr} ldr r0, =0x08622850 movs r1, 0x2C @@ -889696,13 +889696,13 @@ 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 bl sub_81CAF04 cmp r0, 0 - blt _081CC400 + blt @081CC400 lsls r4, r0, 3 ldr r0, =0x08305654 adds r0, r4, r0 @@ -889741,7 +889741,7 @@ sub_81CC39C: @ 81CC39C ldr r1, [r7, 0x20] ldr r0, =sub_81CC440 + 1 str r0, [r1, 0x1C] -_081CC400: +@081CC400: pop {r4-r7} pop {r0} bx r0 @@ -889750,7 +889750,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 + 1 str r0, [r1, 0x1C] @@ -889760,7 +889760,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, =nullsub_12 + 1 @@ -889774,17 +889774,17 @@ 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 ldrsh r0, [r4, r1] cmp r0, 0 - beq _081CC452 + beq @081CC452 cmp r0, 0x1 - beq _081CC484 - b _081CC498 -_081CC452: + beq @081CC484 + b @081CC498 +@081CC452: movs r1, 0x3C ldrsh r0, [r4, r1] bl CheckForSpaceForDma3Request @@ -889793,7 +889793,7 @@ _081CC452: movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq _081CC498 + beq @081CC498 ldr r0, =0x0000ffb0 strh r0, [r4, 0x24] adds r2, r4, 0 @@ -889806,21 +889806,21 @@ _081CC452: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b _081CC498 + b @081CC498 .align 2, 0 .pool -_081CC484: +@081CC484: ldrh r0, [r4, 0x24] adds r0, 0x8 strh r0, [r4, 0x24] lsls r0, 16 cmp r0, 0 - blt _081CC498 + blt @081CC498 movs r0, 0 strh r0, [r4, 0x24] ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] -_081CC498: +@081CC498: pop {r4} pop {r0} bx r0 @@ -889829,7 +889829,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] @@ -889840,7 +889840,7 @@ sub_81CC4A4: @ 81CC4A4 movs r1, 0x50 negs r1, r1 cmp r0, r1 - bgt _081CC4CA + bgt @081CC4CA adds r2, r3, 0 adds r2, 0x3E ldrb r0, [r2] @@ -889849,7 +889849,7 @@ sub_81CC4A4: @ 81CC4A4 strb r0, [r2] ldr r0, =nullsub_12 + 1 str r0, [r3, 0x1C] -_081CC4CA: +@081CC4CA: pop {r0} bx r0 .align 2, 0 @@ -889857,41 +889857,41 @@ _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 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq _081CC4F0 + beq @081CC4F0 ldr r1, =0x00000884 movs r0, 0x10 bl sub_81C761C cmp r0, 0 - bne _081CC4F8 -_081CC4F0: + bne @081CC4F8 +@081CC4F0: movs r0, 0 - b _081CC51A + b @081CC51A .align 2, 0 .pool -_081CC4F8: +@081CC4F8: ldr r0, =0x02037318 ldrb r0, [r0, 0x14] bl sub_8124668 str r0, [r4, 0xC] cmp r0, 0 - bne _081CC514 + bne @081CC514 ldr r0, =sub_81CC568 + 1 - b _081CC516 + b @081CC516 .align 2, 0 .pool -_081CC514: +@081CC514: ldr r0, =sub_81CC5B4 + 1 -_081CC516: +@081CC516: str r0, [r4, 0x10] movs r0, 0x1 -_081CC51A: +@081CC51A: pop {r4} pop {r1} bx r1 @@ -889900,7 +889900,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 @@ -889925,7 +889925,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 @@ -889936,53 +889936,53 @@ 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 lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - beq _081CC58C + beq @081CC58C cmp r0, 0x4 - bgt _081CC582 + bgt @081CC582 cmp r0, 0x3 - beq _081CC588 - b _081CC5AC -_081CC582: + beq @081CC588 + b @081CC5AC +@081CC582: cmp r0, 0x5 - beq _081CC59E - b _081CC5AC -_081CC588: + beq @081CC59E + b @081CC5AC +@081CC588: movs r0, 0x1 - b _081CC5AE -_081CC58C: + b @081CC5AE +@081CC58C: bl sub_8124658 lsls r0, 24 cmp r0, 0 - bne _081CC59A + bne @081CC59A movs r0, 0x3 - b _081CC5AE -_081CC59A: + b @081CC5AE +@081CC59A: movs r0, 0x2 - b _081CC5AE -_081CC59E: + b @081CC5AE +@081CC59E: ldr r0, =sub_81CC5DC + 1 str r0, [r4, 0x10] movs r0, 0x4 - b _081CC5AE + b @081CC5AE .align 2, 0 .pool -_081CC5AC: +@081CC5AC: movs r0, 0 -_081CC5AE: +@081CC5AE: pop {r4} pop {r1} bx r1 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 @@ -889990,16 +889990,16 @@ sub_81CC5B4: @ 81CC5B4 movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _081CC5CC + bne @081CC5CC movs r0, 0 - b _081CC5D2 + b @081CC5D2 .align 2, 0 .pool -_081CC5CC: +@081CC5CC: ldr r0, =sub_81CC5DC + 1 str r0, [r2, 0x10] movs r0, 0x4 -_081CC5D2: +@081CC5D2: pop {r1} bx r1 .align 2, 0 @@ -890007,7 +890007,7 @@ _081CC5D2: thumb_func_end sub_81CC5B4 thumb_func_start sub_81CC5DC -sub_81CC5DC: @ 81CC5DC +sub_81CC5DC: ; 81CC5DC ldr r0, =0x000186a1 bx lr .align 2, 0 @@ -890015,7 +890015,7 @@ sub_81CC5DC: @ 81CC5DC thumb_func_end sub_81CC5DC thumb_func_start sub_81CC5E4 -sub_81CC5E4: @ 81CC5E4 +sub_81CC5E4: ; 81CC5E4 push {lr} movs r0, 0x3 bl sub_81C763C @@ -890025,14 +890025,14 @@ 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 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq _081CC624 + beq @081CC624 ldr r0, =sub_81CC6F4 + 1 movs r1, 0x1 bl sub_81C7078 @@ -890040,19 +890040,19 @@ sub_81CC5F4: @ 81CC5F4 ldr r0, =sub_81CC6BC + 1 str r0, [r4] movs r0, 0x1 - b _081CC626 + b @081CC626 .align 2, 0 .pool -_081CC624: +@081CC624: movs r0, 0 -_081CC626: +@081CC626: pop {r4} pop {r1} bx r1 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 @@ -890075,7 +890075,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 @@ -890086,7 +890086,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 @@ -890108,7 +890108,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 copy_super_sprites_to_oam @@ -890119,7 +890119,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 @@ -890130,56 +890130,56 @@ 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 - bne _081CC6EC + bne @081CC6EC ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x15] lsrs r0, 3 movs r1, 0x1 ands r0, r1 - b _081CC6EE + b @081CC6EE .align 2, 0 .pool -_081CC6EC: +@081CC6EC: movs r0, 0 -_081CC6EE: +@081CC6EE: pop {r1} bx r1 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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x7 - bls _081CC706 - b _081CC83E -_081CC706: + bls @081CC706 + b @081CC83E +@081CC706: lsls r0, r4, 2 - ldr r1, =_081CC714 + ldr r1, =@081CC714 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081CC714: - .4byte _081CC734 - .4byte _081CC784 - .4byte _081CC7B6 - .4byte _081CC7BE - .4byte _081CC7CE - .4byte _081CC7E2 - .4byte _081CC804 - .4byte _081CC82A -_081CC734: +@081CC714: + .4byte @081CC734 + .4byte @081CC784 + .4byte @081CC7B6 + .4byte @081CC7BE + .4byte @081CC7CE + .4byte @081CC7E2 + .4byte @081CC804 + .4byte @081CC82A +@081CC734: movs r0, 0 bl c3args_set_0toR1_1to0 movs r0, 0x1 @@ -890206,19 +890206,19 @@ _081CC734: adds r1, r4, 0 bl sub_8122CF8 bl sub_81CC9C0 -_081CC77C: +@081CC77C: movs r0, 0 - b _081CC840 + b @081CC840 .align 2, 0 .pool -_081CC784: +@081CC784: bl sub_8122DB0 lsls r0, 24 cmp r0, 0 - bne _081CC83A + bne @081CC83A bl sub_81CC5E4 cmp r0, 0 - bne _081CC7AC + bne @081CC7AC movs r0, 0x4 movs r1, 0x9 bl sub_8124288 @@ -890226,54 +890226,54 @@ _081CC784: movs r1, 0xA bl sub_81240D4 bl sub_812454C - b _081CC77C -_081CC7AC: + b @081CC77C +@081CC7AC: movs r0, 0 movs r1, 0x6 bl sub_8123030 - b _081CC77C -_081CC7B6: + b @081CC77C +@081CC7B6: bl sub_81CCD10 -_081CC7BA: +@081CC7BA: movs r0, 0x1 - b _081CC840 -_081CC7BE: + b @081CC840 +@081CC7BE: bl sub_81CCD24 cmp r0, 0 - bne _081CC83A + bne @081CC83A adds r0, r5, 0 bl sub_81CCA1C - b _081CC7BA -_081CC7CE: + b @081CC7BA +@081CC7CE: bl sub_81CCAFC cmp r0, 0 - bne _081CC83A + bne @081CC83A adds r0, r5, 0 bl sub_81CCB0C bl sub_81C7B40 - b _081CC77C -_081CC7E2: + b @081CC77C +@081CC7E2: adds r0, r5, 0 bl sub_81CCC4C cmp r0, 0 - bne _081CC83A + bne @081CC83A movs r0, 0x1 bl gpu_sync_bg_show movs r0, 0x2 bl gpu_sync_bg_show ldr r0, =sub_81CC6A4 + 1 bl c3args_set_0toR1_1to0 - b _081CC77C + b @081CC77C .align 2, 0 .pool -_081CC804: +@081CC804: bl sub_81CC6D0 lsls r0, 24 movs r4, 0x5 cmp r0, 0 - bne _081CC812 + bne @081CC812 movs r4, 0x4 -_081CC812: +@081CC812: adds r0, r4, 0 bl sub_81C7DFC adds r0, r4, 0 @@ -890282,209 +890282,209 @@ _081CC812: bl sub_81C7FA0 movs r0, 0x1 bl sub_81C7AC0 - b _081CC77C -_081CC82A: + b @081CC77C +@081CC82A: bl sub_81C7B34 cmp r0, 0 - bne _081CC83A + bne @081CC83A bl sub_81C8010 cmp r0, 0 - beq _081CC7BA -_081CC83A: + beq @081CC7BA +@081CC83A: movs r0, 0x2 - b _081CC840 -_081CC83E: + b @081CC840 +@081CC83E: movs r0, 0x4 -_081CC840: +@081CC840: pop {r4,r5} pop {r1} bx r1 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 bl sub_81C763C cmp r4, 0 - beq _081CC85C + beq @081CC85C cmp r4, 0x1 - beq _081CC864 - b _081CC870 -_081CC85C: + beq @081CC864 + b @081CC870 +@081CC85C: bl sub_81CCB0C movs r0, 0 - b _081CC872 -_081CC864: + b @081CC872 +@081CC864: bl sub_81CCC4C cmp r0, 0 - beq _081CC870 + beq @081CC870 movs r0, 0x2 - b _081CC872 -_081CC870: + b @081CC872 +@081CC870: movs r0, 0x4 -_081CC872: +@081CC872: pop {r4} pop {r1} bx r1 thumb_func_end sub_81CC848 thumb_func_start sub_81CC878 -sub_81CC878: @ 81CC878 +sub_81CC878: ; 81CC878 push {lr} cmp r0, 0x1 - beq _081CC8A2 + beq @081CC8A2 cmp r0, 0x1 - bgt _081CC888 + bgt @081CC888 cmp r0, 0 - beq _081CC88E - b _081CC8D0 -_081CC888: + beq @081CC88E + b @081CC8D0 +@081CC888: cmp r0, 0x2 - beq _081CC8BE - b _081CC8D0 -_081CC88E: + beq @081CC8BE + b @081CC8D0 +@081CC88E: movs r0, 0x5 bl audio_play movs r0, 0 bl sub_81CCC5C bl sub_8123418 movs r0, 0 - b _081CC8D2 -_081CC8A2: + b @081CC8D2 +@081CC8A2: bl sub_8123514 lsls r0, 24 cmp r0, 0 - bne _081CC8C6 + bne @081CC8C6 bl sub_81CCC88 cmp r0, 0 - bne _081CC8C6 + bne @081CC8C6 movs r0, 0x1 bl sub_81C7BA4 movs r0, 0 - b _081CC8D2 -_081CC8BE: + b @081CC8D2 +@081CC8BE: bl sub_81C7BE8 cmp r0, 0 - beq _081CC8CA -_081CC8C6: + beq @081CC8CA +@081CC8C6: movs r0, 0x2 - b _081CC8D2 -_081CC8CA: + b @081CC8D2 +@081CC8CA: movs r0, 0x4 bl sub_81C7E14 -_081CC8D0: +@081CC8D0: movs r0, 0x4 -_081CC8D2: +@081CC8D2: pop {r1} bx r1 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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x1 - beq _081CC90C + beq @081CC90C cmp r4, 0x1 - bgt _081CC8F2 + bgt @081CC8F2 cmp r4, 0 - beq _081CC8FC - b _081CC952 -_081CC8F2: + beq @081CC8FC + b @081CC952 +@081CC8F2: cmp r4, 0x2 - beq _081CC924 + beq @081CC924 cmp r4, 0x3 - beq _081CC940 - b _081CC952 -_081CC8FC: + beq @081CC940 + b @081CC952 +@081CC8FC: movs r0, 0x5 bl audio_play adds r0, r5, 0 bl sub_81CCB0C movs r0, 0 - b _081CC954 -_081CC90C: + b @081CC954 +@081CC90C: adds r0, r5, 0 bl sub_81CCC4C cmp r0, 0 - bne _081CC948 + bne @081CC948 movs r0, 0x1 bl sub_81CCC5C bl sub_8123418 movs r0, 0 - b _081CC954 -_081CC924: + b @081CC954 +@081CC924: bl sub_8123514 lsls r0, 24 cmp r0, 0 - bne _081CC948 + bne @081CC948 bl sub_81CCC88 cmp r0, 0 - bne _081CC948 + bne @081CC948 movs r0, 0x2 bl sub_81C7BA4 movs r0, 0 - b _081CC954 -_081CC940: + b @081CC954 +@081CC940: bl sub_81C7BE8 cmp r0, 0 - beq _081CC94C -_081CC948: + beq @081CC94C +@081CC948: movs r0, 0x2 - b _081CC954 -_081CC94C: + b @081CC954 +@081CC94C: movs r0, 0x5 bl sub_81C7E14 -_081CC952: +@081CC952: movs r0, 0x4 -_081CC954: +@081CC954: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_81CC8D8 thumb_func_start sub_81CC95C -sub_81CC95C: @ 81CC95C +sub_81CC95C: ; 81CC95C push {lr} cmp r0, 0x1 - beq _081CC982 + beq @081CC982 cmp r0, 0x1 - bgt _081CC96C + bgt @081CC96C cmp r0, 0 - beq _081CC972 - b _081CC9B8 -_081CC96C: + beq @081CC972 + b @081CC9B8 +@081CC96C: cmp r0, 0x2 - beq _081CC996 - b _081CC9B8 -_081CC972: + beq @081CC996 + b @081CC9B8 +@081CC972: movs r0, 0x5 bl audio_play movs r0, 0 bl sub_81C7AC0 movs r0, 0 - b _081CC9BA -_081CC982: + b @081CC9BA +@081CC982: bl sub_81C7B34 cmp r0, 0 - bne _081CC99E + bne @081CC99E bl sub_81C7FDC bl sub_81C78A0 movs r0, 0 - b _081CC9BA -_081CC996: + b @081CC9BA +@081CC996: bl sub_81C78C0 cmp r0, 0 - beq _081CC9A2 -_081CC99E: + beq @081CC9A2 +@081CC99E: movs r0, 0x2 - b _081CC9BA -_081CC9A2: + b @081CC9BA +@081CC9A2: movs r0, 0x1 bl gpu_sync_bg_hide movs r0, 0x2 @@ -890492,26 +890492,26 @@ _081CC9A2: movs r0, 0x3 bl gpu_sync_bg_hide movs r0, 0 - b _081CC9BA -_081CC9B8: + b @081CC9BA +@081CC9B8: movs r0, 0x4 -_081CC9BA: +@081CC9BA: pop {r1} bx r1 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, =0x086230f8 -_081CC9C6: +@081CC9C6: adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load adds r4, 0x8 adds r5, 0x1 cmp r5, 0 - beq _081CC9C6 + beq @081CC9C6 ldr r0, =0x08623100 bl sub_81C795C bl sub_81CCE58 @@ -890523,7 +890523,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 @@ -890535,19 +890535,19 @@ sub_81CC9EC: @ 81CC9EC adds r5, r4, 0 adds r5, 0xC movs r4, 0x2 -_081CCA08: +@081CCA08: ldm r5!, {r0} bl obj_delete_and_free_tiles subs r4, 0x1 cmp r4, 0 - bge _081CCA08 + bge @081CCA08 pop {r4,r5} pop {r0} bx r0 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 @@ -890613,20 +890613,20 @@ sub_81CCA1C: @ 81CCA1C bl sub_8124658 lsls r0, 24 cmp r0, 0 - bne _081CCAE0 + bne @081CCAE0 ldr r1, =0xffffa000 movs r0, 0x1 movs r2, 0 bl bg_change_y_offset - b _081CCAEA + b @081CCAEA .align 2, 0 .pool -_081CCAE0: +@081CCAE0: movs r0, 0x1 movs r1, 0 movs r2, 0 bl bg_change_y_offset -_081CCAEA: +@081CCAEA: movs r0, 0x1 movs r1, 0 movs r2, 0 @@ -890638,7 +890638,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 @@ -890648,7 +890648,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 @@ -890657,24 +890657,24 @@ sub_81CCB0C: @ 81CCB0C adds r5, r0, 0 ldrb r0, [r5, 0x2] cmp r0, 0x4 - bls _081CCB22 - b _081CCC40 -_081CCB22: + bls @081CCB22 + b @081CCC40 +@081CCB22: lsls r0, 2 - ldr r1, =_081CCB30 + ldr r1, =@081CCB30 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081CCB30: - .4byte _081CCC1C - .4byte _081CCBDC - .4byte _081CCB44 - .4byte _081CCB8E - .4byte _081CCBDC -_081CCB44: +@081CCB30: + .4byte @081CCC1C + .4byte @081CCBDC + .4byte @081CCB44 + .4byte @081CCB8E + .4byte @081CCBDC +@081CCB44: ldrb r0, [r4, 0x8] movs r1, 0x11 bl Window_FastFillPixels @@ -890705,8 +890705,8 @@ _081CCB44: bl Window_CopyToVram movs r0, 0 bl sub_81CCFA4 - b _081CCC40 -_081CCB8E: + b @081CCC40 +@081CCB8E: ldrb r0, [r4, 0x8] movs r1, 0x11 bl Window_FastFillPixels @@ -890739,10 +890739,10 @@ _081CCB8E: movs r2, 0x11 movs r3, 0x6 bl Bg_FillWramTileMapRectWithTileAndPalette - b _081CCC0C + b @081CCC0C .align 2, 0 .pool -_081CCBDC: +@081CCBDC: ldrb r0, [r4, 0x8] movs r1, 0x11 bl Window_FastFillPixels @@ -890763,14 +890763,14 @@ _081CCBDC: ldrb r2, [r5, 0x3] adds r0, r4, 0 bl sub_81CCDE8 -_081CCC0C: +@081CCC0C: ldrb r0, [r4, 0x8] movs r1, 0x3 bl Window_CopyToVram movs r0, 0x1 bl sub_81CCFA4 - b _081CCC40 -_081CCC1C: + b @081CCC40 +@081CCC1C: ldr r1, =0x00001041 movs r0, 0xC str r0, [sp] @@ -890786,7 +890786,7 @@ _081CCC1C: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x1 bl sub_81CCFA4 -_081CCC40: +@081CCC40: add sp, 0xC pop {r4,r5} pop {r0} @@ -890796,7 +890796,7 @@ _081CCC40: thumb_func_end sub_81CCB0C thumb_func_start sub_81CCC4C -sub_81CCC4C: @ 81CCC4C +sub_81CCC4C: ; 81CCC4C push {lr} bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -890806,7 +890806,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 + 1 @@ -890828,7 +890828,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 + 1 bl is_function_an_active_task @@ -890841,7 +890841,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 @@ -890854,26 +890854,26 @@ sub_81CCC9C: @ 81CCC9C movs r1, 0x8 ldrsh r0, [r0, r1] cmp r0, 0 - beq _081CCCE0 + beq @081CCCE0 movs r1, 0x90 lsls r1, 3 movs r0, 0x1 movs r2, 0x1 bl bg_change_y_offset cmp r0, 0 - blt _081CCCD6 + blt @081CCCD6 movs r0, 0x1 movs r1, 0 movs r2, 0 bl bg_change_y_offset adds r0, r4, 0 bl remove_task -_081CCCD6: +@081CCCD6: bl sub_81CCF78 - b _081CCD04 + b @081CCD04 .align 2, 0 .pool -_081CCCE0: +@081CCCE0: movs r1, 0x90 lsls r1, 3 movs r0, 0x1 @@ -890881,15 +890881,15 @@ _081CCCE0: bl bg_change_y_offset ldr r1, =0xffffa000 cmp r0, r1 - bgt _081CCD00 + bgt @081CCD00 movs r0, 0x1 movs r2, 0 bl bg_change_y_offset adds r0, r5, 0 bl remove_task -_081CCD00: +@081CCD00: bl sub_81CCF78 -_081CCD04: +@081CCD04: pop {r4,r5} pop {r0} bx r0 @@ -890898,7 +890898,7 @@ _081CCD04: thumb_func_end sub_81CCC9C thumb_func_start sub_81CCD10 -sub_81CCD10: @ 81CCD10 +sub_81CCD10: ; 81CCD10 push {lr} ldr r0, =sub_81CCD34 + 1 movs r1, 0x1 @@ -890910,7 +890910,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 + 1 bl sub_81C7124 @@ -890921,17 +890921,17 @@ 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 bl sub_81C763C adds r2, r0, 0 cmp r4, 0x15 - ble _081CCD48 + ble @081CCD48 movs r0, 0x4 - b _081CCD62 -_081CCD48: + b @081CCD62 +@081CCD48: ldr r0, =0x08623118 lsls r1, r4, 3 adds r0, 0x4 @@ -890944,7 +890944,7 @@ _081CCD48: adds r1, r2, r1 bl LZ77UnCompWram movs r0, 0x1 -_081CCD62: +@081CCD62: pop {r4} pop {r1} bx r1 @@ -890953,7 +890953,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 @@ -890963,25 +890963,25 @@ sub_81CCD70: @ 81CCD70 ldrh r1, [r0] adds r5, r0, 0 cmp r1, r3 - bne _081CCD8A + bne @081CCD8A ldrh r0, [r5, 0x2] cmp r0, r2 - beq _081CCDA0 -_081CCD8A: + beq @081CCDA0 +@081CCD8A: adds r4, 0x1 cmp r4, 0x15 - bgt _081CCDA0 + bgt @081CCDA0 lsls r0, r4, 3 adds r1, r0, r5 ldrh r0, [r1] cmp r0, r3 - bne _081CCD8A + bne @081CCD8A ldrh r0, [r1, 0x2] cmp r0, r2 - bne _081CCD8A -_081CCDA0: + bne @081CCD8A +@081CCDA0: cmp r4, 0x16 - beq _081CCDD4 + beq @081CCDD4 ldr r1, =0x00001041 movs r0, 0xC str r0, [sp] @@ -891004,7 +891004,7 @@ _081CCDA0: movs r2, 0x12 movs r3, 0x6 bl gpu_copy_to_iwram_tile_map_rect -_081CCDD4: +@081CCDD4: add sp, 0x8 pop {r4-r6} pop {r0} @@ -891014,7 +891014,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 @@ -891028,10 +891028,10 @@ sub_81CCDE8: @ 81CCDE8 lsls r1, 24 mov r8, r1 lsls r7, r2, 24 - b _081CCE34 + b @081CCE34 .align 2, 0 .pool -_081CCE08: +@081CCE08: adds r0, r6, 0 movs r2, 0 movs r3, 0xC @@ -891052,7 +891052,7 @@ _081CCE08: lsls r0, 21 adds r4, r0 adds r5, 0x1 -_081CCE34: +@081CCE34: lsls r2, r5, 24 lsrs r2, 24 mov r1, r8 @@ -891061,7 +891061,7 @@ _081CCE34: bl sub_8145CF4 adds r1, r0, 0 cmp r1, 0 - bne _081CCE08 + bne @081CCE08 add sp, 0xC pop {r3,r4} mov r8, r3 @@ -891072,7 +891072,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} @@ -891083,16 +891083,16 @@ sub_81CCE58: @ 81CCE58 lsls r0, 24 movs r2, 0x84 cmp r0, 0 - bne _081CCE74 + bne @081CCE74 movs r2, 0xE4 -_081CCE74: +@081CCE74: movs r5, 0 lsls r7, r2, 16 adds r4, 0xC mov r8, r4 movs r6, 0x98 lsls r6, 16 -_081CCE80: +@081CCE80: asrs r1, r6, 16 ldr r0, =0x086231d0 asrs r2, r7, 16 @@ -891136,7 +891136,7 @@ _081CCE80: adds r6, r4 adds r5, 0x1 cmp r5, 0x2 - ble _081CCE80 + ble @081CCE80 pop {r3} mov r8, r3 pop {r4-r7} @@ -891147,35 +891147,35 @@ _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] movs r1, 0x34 ldrsh r4, [r3, r1] cmp r4, 0 - beq _081CCF06 + beq @081CCF06 subs r0, 0x1 - b _081CCF6E -_081CCF06: + b @081CCF6E +@081CCF06: ldrh r0, [r3, 0x2E] adds r0, 0x1 strh r0, [r3, 0x2E] lsls r0, 16 asrs r0, 16 cmp r0, 0xB - ble _081CCF16 + ble @081CCF16 strh r4, [r3, 0x2E] -_081CCF16: +@081CCF16: ldrh r0, [r3, 0x30] adds r0, 0x1 strh r0, [r3, 0x30] lsls r0, 16 asrs r0, 16 cmp r0, 0x3C - ble _081CCF26 + ble @081CCF26 strh r4, [r3, 0x30] -_081CCF26: +@081CCF26: ldrh r5, [r3, 0x30] ldrh r2, [r3, 0x32] adds r1, r5, r2 @@ -891191,37 +891191,37 @@ _081CCF26: movs r2, 0x38 ldrsh r0, [r3, r2] cmp r0, 0x3 - bgt _081CCF5C + bgt @081CCF5C movs r2, 0x2E ldrsh r0, [r3, r2] cmp r0, 0 - bne _081CCF70 + bne @081CCF70 adds r0, r1, 0x1 strh r0, [r3, 0x38] - b _081CCF6C + b @081CCF6C .align 2, 0 .pool -_081CCF5C: +@081CCF5C: lsls r0, r5, 16 asrs r0, 16 movs r2, 0x36 ldrsh r1, [r3, r2] cmp r0, r1 - bne _081CCF70 + bne @081CCF70 strh r4, [r3, 0x38] strh r4, [r3, 0x2E] -_081CCF6C: +@081CCF6C: movs r0, 0x78 -_081CCF6E: +@081CCF6E: strh r0, [r3, 0x34] -_081CCF70: +@081CCF70: pop {r4,r5} pop {r0} bx r0 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 @@ -891233,19 +891233,19 @@ sub_81CCF78: @ 81CCF78 subs r1, r0 adds r4, 0xC movs r2, 0x2 -_081CCF92: +@081CCF92: ldm r4!, {r0} strh r1, [r0, 0x22] subs r2, 0x1 cmp r2, 0 - bge _081CCF92 + bge @081CCF92 pop {r4} pop {r0} bx r0 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 @@ -891258,7 +891258,7 @@ sub_81CCFA4: @ 81CCFA4 adds r4, r0, 0 adds r4, 0xC movs r3, 0x2 -_081CCFBE: +@081CCFBE: ldm r4!, {r0} adds r0, 0x3E ldrb r2, [r0] @@ -891268,21 +891268,21 @@ _081CCFBE: strb r1, [r0] subs r3, 0x1 cmp r3, 0 - bge _081CCFBE + bge @081CCFBE pop {r4-r6} pop {r0} bx r0 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 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq _081CD01C + beq @081CD01C ldr r1, =0x00006428 adds r0, r4, r1 bl sub_81D1ED4 @@ -891295,26 +891295,26 @@ sub_81CCFD8: @ 81CCFD8 ldr r0, =sub_81CD08C + 1 str r0, [r1] movs r0, 0x1 - b _081CD01E + b @081CD01E .align 2, 0 .pool -_081CD01C: +@081CD01C: movs r0, 0 -_081CD01E: +@081CD01E: pop {r4} pop {r1} bx r1 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 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq _081CD068 + beq @081CD068 ldr r1, =0x00006428 adds r0, r4, r1 bl sub_81D1ED4 @@ -891327,19 +891327,19 @@ sub_81CD024: @ 81CD024 ldr r0, =sub_81CD08C + 1 str r0, [r1] movs r0, 0x1 - b _081CD06A + b @081CD06A .align 2, 0 .pool -_081CD068: +@081CD068: movs r0, 0 -_081CD06A: +@081CD06A: pop {r4} pop {r1} bx r1 thumb_func_end sub_81CD024 thumb_func_start sub_81CD070 -sub_81CD070: @ 81CD070 +sub_81CD070: ; 81CD070 push {lr} movs r0, 0xB bl sub_81C763C @@ -891354,7 +891354,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 @@ -891365,29 +891365,29 @@ sub_81CD08C: @ 81CD08C lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - bne _081CD100 + bne @081CD100 ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _081CD0D0 + bne @081CD0D0 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _081CD100 + beq @081CD100 movs r1, 0xC6 lsls r1, 7 adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0 - bne _081CD0F0 + bne @081CD0F0 ldrh r1, [r5, 0x2] ldrh r0, [r5] subs r0, 0x1 cmp r1, r0 - bne _081CD100 -_081CD0D0: + bne @081CD100 +@081CD0D0: movs r0, 0x5 bl audio_play ldr r0, =0x00006304 @@ -891395,10 +891395,10 @@ _081CD0D0: ldr r0, =sub_81CD19C + 1 str r0, [r1] movs r2, 0x2 - b _081CD100 + b @081CD100 .align 2, 0 .pool -_081CD0F0: +@081CD0F0: movs r0, 0x5 bl audio_play movs r2, 0x5 @@ -891406,7 +891406,7 @@ _081CD0F0: adds r1, r4, r0 ldr r0, =sub_81CD110 + 1 str r0, [r1] -_081CD100: +@081CD100: adds r0, r2, 0 pop {r4,r5} pop {r1} @@ -891416,7 +891416,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 @@ -891424,7 +891424,7 @@ sub_81CD110: @ 81CD110 bl sub_811FBA4 lsls r0, 24 cmp r0, 0 - bne _081CD18A + bne @081CD18A bl sub_81CEF14 ldr r1, =0x00006786 adds r5, r6, r1 @@ -891448,7 +891448,7 @@ sub_81CD110: @ 81CD110 mov r0, sp strb r1, [r0] cmp r2, 0xE - bne _081CD174 + bne @081CD174 movs r0, 0x64 muls r0, r3 ldr r1, =0x020244ec @@ -891456,22 +891456,22 @@ sub_81CD110: @ 81CD110 movs r1, 0x8 mov r2, sp bl pokemon_setattr - b _081CD180 + b @081CD180 .align 2, 0 .pool -_081CD174: +@081CD174: adds r0, r2, 0 adds r1, r3, 0 movs r2, 0x8 mov r3, sp bl set_pokemon_data_from_any_box -_081CD180: +@081CD180: ldr r0, =0x00006304 adds r1, r6, r0 ldr r0, =sub_81CD08C + 1 str r0, [r1] movs r4, 0x6 -_081CD18A: +@081CD18A: adds r0, r4, 0 add sp, 0x4 pop {r4-r6} @@ -891482,21 +891482,21 @@ _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 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq _081CD1B4 + beq @081CD1B4 ldr r0, =0x000186aa - b _081CD1B6 + b @081CD1B6 .align 2, 0 .pool -_081CD1B4: +@081CD1B4: ldr r0, =0x000186a2 -_081CD1B6: +@081CD1B6: pop {r1} bx r1 .align 2, 0 @@ -891504,7 +891504,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 @@ -891513,10 +891513,10 @@ sub_81CD1C0: @ 81CD1C0 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _081CD1DA + bne @081CD1DA movs r0, 0x12 bl sub_81C7650 -_081CD1DA: +@081CD1DA: movs r0, 0xB bl sub_81C7650 pop {r0} @@ -891524,7 +891524,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 @@ -891536,48 +891536,48 @@ sub_81CD1E4: @ 81CD1E4 movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _081CD220 + beq @081CD220 movs r1, 0xC6 lsls r1, 7 adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0 - beq _081CD210 + beq @081CD210 ldrh r0, [r2, 0x2] cmp r0, 0 - beq _081CD24E -_081CD210: + beq @081CD24E +@081CD210: movs r0, 0x5 bl audio_play movs r0, 0x1 - b _081CD246 + b @081CD246 .align 2, 0 .pool -_081CD220: +@081CD220: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081CD24E + beq @081CD24E movs r1, 0xC6 lsls r1, 7 adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0 - beq _081CD23E + beq @081CD23E ldrh r1, [r2, 0x2] ldrh r0, [r2] subs r0, 0x1 cmp r1, r0 - bge _081CD24E -_081CD23E: + bge @081CD24E +@081CD23E: movs r0, 0x5 bl audio_play movs r0, 0 -_081CD246: +@081CD246: bl sub_81CD258 lsls r0, 24 lsrs r3, r0, 24 -_081CD24E: +@081CD24E: adds r0, r3, 0 pop {r4} pop {r1} @@ -891585,7 +891585,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} @@ -891600,16 +891600,16 @@ sub_81CD258: @ 81CD258 adds r5, r0, 0 mov r0, r8 cmp r0, 0 - beq _081CD284 + beq @081CD284 ldr r1, =0x00006788 adds r0, r4, r1 - b _081CD288 + b @081CD288 .align 2, 0 .pool -_081CD284: +@081CD284: ldr r2, =0x00006787 adds r0, r4, r2 -_081CD288: +@081CD288: ldrb r0, [r0] lsls r0, 24 asrs r0, 24 @@ -891637,15 +891637,15 @@ _081CD288: ldrh r6, [r5, 0x2] bl sub_81CDD5C cmp r0, 0 - beq _081CD2D8 + beq @081CD2D8 ldrh r1, [r5] - b _081CD2DC + b @081CD2DC .align 2, 0 .pool -_081CD2D8: +@081CD2D8: ldrh r1, [r5] subs r1, 0x1 -_081CD2DC: +@081CD2DC: eors r1, r6 negs r0, r1 orrs r0, r1 @@ -891653,7 +891653,7 @@ _081CD2DC: adds r6, r0, 0 mov r0, r8 cmp r0, 0 - beq _081CD332 + beq @081CD332 ldr r1, =0x00006787 adds r2, r4, r1 ldrb r0, [r2] @@ -891671,23 +891671,23 @@ _081CD2DC: strb r1, [r0] ldrh r0, [r5, 0x2] cmp r0, 0 - bne _081CD312 + bne @081CD312 ldrh r0, [r5] -_081CD312: +@081CD312: subs r1, r0, 0x1 strh r1, [r5, 0x2] lsls r0, r1, 16 cmp r0, 0 - beq _081CD32C + beq @081CD32C subs r1, 0x1 - b _081CD384 + b @081CD384 .align 2, 0 .pool -_081CD32C: +@081CD32C: ldrh r0, [r5] subs r1, r0, 0x1 - b _081CD384 -_081CD332: + b @081CD384 +@081CD332: ldr r0, =0x00006788 adds r2, r4, r0 ldrb r0, [r2] @@ -891707,56 +891707,56 @@ _081CD332: ldrh r0, [r5] subs r0, 0x1 cmp r1, r0 - bge _081CD370 + bge @081CD370 adds r0, r1, 0x1 - b _081CD372 + b @081CD372 .align 2, 0 .pool -_081CD370: +@081CD370: movs r0, 0 -_081CD372: +@081CD372: strh r0, [r5, 0x2] ldrh r1, [r5, 0x2] ldrh r0, [r5] subs r0, 0x1 cmp r1, r0 - bge _081CD382 + bge @081CD382 adds r1, 0x1 - b _081CD384 -_081CD382: + b @081CD384 +@081CD382: movs r1, 0 -_081CD384: +@081CD384: ldr r2, =0x00006302 adds r0, r4, r2 strh r1, [r0] ldrh r4, [r5, 0x2] bl sub_81CDD5C cmp r0, 0 - beq _081CD39C + beq @081CD39C ldrh r1, [r5] - b _081CD3A0 + b @081CD3A0 .align 2, 0 .pool -_081CD39C: +@081CD39C: ldrh r1, [r5] subs r1, 0x1 -_081CD3A0: +@081CD3A0: eors r1, r4 negs r0, r1 orrs r0, r1 lsrs r0, 31 cmp r6, 0 - bne _081CD3B0 + bne @081CD3B0 movs r0, 0x3 - b _081CD3BA -_081CD3B0: + b @081CD3BA +@081CD3B0: cmp r0, 0 - beq _081CD3B8 + beq @081CD3B8 movs r0, 0x1 - b _081CD3BA -_081CD3B8: + b @081CD3BA +@081CD3B8: movs r0, 0x4 -_081CD3BA: +@081CD3BA: pop {r3} mov r8, r3 pop {r4-r7} @@ -891765,7 +891765,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 @@ -891777,50 +891777,50 @@ sub_81CD3C4: @ 81CD3C4 adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0x9 - bls _081CD3E2 - b _081CD530 -_081CD3E2: + bls @081CD3E2 + b @081CD530 +@081CD3E2: lsls r0, 2 - ldr r1, =_081CD3F4 + ldr r1, =@081CD3F4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081CD3F4: - .4byte _081CD41C - .4byte _081CD428 - .4byte _081CD434 - .4byte _081CD440 - .4byte _081CD490 - .4byte _081CD4A8 - .4byte _081CD4C0 - .4byte _081CD4D8 - .4byte _081CD4F0 - .4byte _081CD508 -_081CD41C: +@081CD3F4: + .4byte @081CD41C + .4byte @081CD428 + .4byte @081CD434 + .4byte @081CD440 + .4byte @081CD490 + .4byte @081CD4A8 + .4byte @081CD4C0 + .4byte @081CD4D8 + .4byte @081CD4F0 + .4byte @081CD508 +@081CD41C: movs r1, 0x2 ldrsh r0, [r2, r1] movs r1, 0 bl sub_81CD824 - b _081CD530 -_081CD428: + b @081CD530 +@081CD428: movs r1, 0x2 ldrsh r0, [r2, r1] movs r1, 0 bl sub_81CDA1C - b _081CD530 -_081CD434: + b @081CD530 +@081CD434: movs r1, 0x2 ldrsh r0, [r2, r1] movs r1, 0 bl sub_81CDB98 - b _081CD530 -_081CD440: + b @081CD530 +@081CD440: ldrh r0, [r2] cmp r0, 0x1 - bne _081CD468 + bne @081CD468 ldr r2, =0x00006786 adds r0, r4, r2 movs r1, 0 @@ -891835,10 +891835,10 @@ _081CD440: adds r0, r4, r2 strb r1, [r0] movs r0, 0x1 - b _081CD53C + b @081CD53C .align 2, 0 .pool -_081CD468: +@081CD468: ldr r0, =0x00006786 adds r1, r4, r0 movs r0, 0 @@ -891851,82 +891851,82 @@ _081CD468: adds r1, r4, r0 movs r0, 0x2 strb r0, [r1] - b _081CD530 + b @081CD530 .align 2, 0 .pool -_081CD490: +@081CD490: ldrh r0, [r2, 0x2] adds r0, 0x1 ldrh r2, [r2] cmp r0, r2 - blt _081CD49C + blt @081CD49C movs r0, 0 -_081CD49C: +@081CD49C: lsls r0, 16 asrs r0, 16 movs r1, 0x1 bl sub_81CD824 - b _081CD530 -_081CD4A8: + b @081CD530 +@081CD4A8: ldrh r0, [r2, 0x2] adds r0, 0x1 ldrh r2, [r2] cmp r0, r2 - blt _081CD4B4 + blt @081CD4B4 movs r0, 0 -_081CD4B4: +@081CD4B4: lsls r0, 16 asrs r0, 16 movs r1, 0x1 bl sub_81CDA1C - b _081CD530 -_081CD4C0: + b @081CD530 +@081CD4C0: ldrh r0, [r2, 0x2] adds r0, 0x1 ldrh r2, [r2] cmp r0, r2 - blt _081CD4CC + blt @081CD4CC movs r0, 0 -_081CD4CC: +@081CD4CC: lsls r0, 16 asrs r0, 16 movs r1, 0x1 bl sub_81CDB98 - b _081CD530 -_081CD4D8: + b @081CD530 +@081CD4D8: ldrh r0, [r2, 0x2] subs r0, 0x1 cmp r0, 0 - bge _081CD4E4 + bge @081CD4E4 ldrh r0, [r2] subs r0, 0x1 -_081CD4E4: +@081CD4E4: lsls r0, 16 asrs r0, 16 movs r1, 0x2 bl sub_81CD824 - b _081CD530 -_081CD4F0: + b @081CD530 +@081CD4F0: ldrh r0, [r2, 0x2] subs r0, 0x1 cmp r0, 0 - bge _081CD4FC + bge @081CD4FC ldrh r0, [r2] subs r0, 0x1 -_081CD4FC: +@081CD4FC: lsls r0, 16 asrs r0, 16 movs r1, 0x2 bl sub_81CDA1C - b _081CD530 -_081CD508: + b @081CD530 +@081CD508: ldrh r0, [r2, 0x2] subs r0, 0x1 cmp r0, 0 - bge _081CD514 + bge @081CD514 ldrh r0, [r2] subs r0, 0x1 -_081CD514: +@081CD514: lsls r0, 16 asrs r0, 16 movs r1, 0x2 @@ -891936,17 +891936,17 @@ _081CD514: movs r0, 0 strb r0, [r1] movs r0, 0x1 - b _081CD53C + b @081CD53C .align 2, 0 .pool -_081CD530: +@081CD530: ldr r0, =0x0000678a adds r1, r4, r0 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] movs r0, 0 -_081CD53C: +@081CD53C: pop {r4} pop {r1} bx r1 @@ -891955,7 +891955,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 @@ -891964,17 +891964,17 @@ sub_81CD548: @ 81CD548 bl sub_81C763C adds r1, r0, 0 cmp r4, 0x1 - beq _081CD588 + beq @081CD588 cmp r4, 0x1 - bgt _081CD566 + bgt @081CD566 cmp r4, 0 - beq _081CD56C - b _081CD5C4 -_081CD566: + beq @081CD56C + b @081CD5C4 +@081CD566: cmp r5, 0x2 - beq _081CD5A4 - b _081CD5C4 -_081CD56C: + beq @081CD5A4 + b @081CD5C4 +@081CD56C: ldr r2, =0x00006302 adds r0, r1, r2 movs r2, 0 @@ -891983,10 +891983,10 @@ _081CD56C: adds r1, r2 ldrb r1, [r1] bl sub_81CD824 - b _081CD5C4 + b @081CD5C4 .align 2, 0 .pool -_081CD588: +@081CD588: ldr r2, =0x00006302 adds r0, r1, r2 movs r2, 0 @@ -891995,10 +891995,10 @@ _081CD588: adds r1, r2 ldrb r1, [r1] bl sub_81CDA1C - b _081CD5C4 + b @081CD5C4 .align 2, 0 .pool -_081CD5A4: +@081CD5A4: ldr r2, =0x00006302 adds r0, r1, r2 movs r2, 0 @@ -892008,25 +892008,25 @@ _081CD5A4: ldrb r1, [r1] bl sub_81CDB98 movs r0, 0x1 - b _081CD5C6 + b @081CD5C6 .align 2, 0 .pool -_081CD5C4: +@081CD5C4: movs r0, 0 -_081CD5C6: +@081CD5C6: pop {r4,r5} pop {r1} bx r1 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 lsrs r2, 16 - b _081CD5E4 -_081CD5D6: + b @081CD5E4 +@081CD5D6: strb r3, [r4] adds r1, 0x1 adds r4, 0x1 @@ -892034,11 +892034,11 @@ _081CD5D6: ldr r2, =0xffff0000 adds r0, r2 lsrs r2, r0, 16 -_081CD5E4: +@081CD5E4: ldrb r3, [r1] adds r0, r3, 0 cmp r0, 0xFF - bne _081CD5D6 + bne @081CD5D6 adds r1, r2, 0 lsls r0, r1, 16 ldr r2, =0xffff0000 @@ -892046,9 +892046,9 @@ _081CD5E4: lsrs r2, r0, 16 lsls r1, 16 cmp r1, 0 - ble _081CD612 + ble @081CD612 movs r3, 0 -_081CD5FE: +@081CD5FE: strb r3, [r4] adds r4, 0x1 adds r1, r2, 0 @@ -892058,8 +892058,8 @@ _081CD5FE: lsrs r2, r0, 16 lsls r1, 16 cmp r1, 0 - bgt _081CD5FE -_081CD612: + bgt @081CD5FE +@081CD612: movs r0, 0xFF strb r0, [r4] adds r0, r4, 0 @@ -892071,7 +892071,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 @@ -892113,16 +892113,16 @@ sub_81CD624: @ 81CD624 movs r3, 0 bl sub_81D2C68 cmp r0, 0 - beq _081CD690 + beq @081CD690 ldr r1, =0x085e8264 adds r0, r5, 0 movs r2, 0 movs r3, 0xC bl sub_8009128 - b _081CD80E + b @081CD80E .align 2, 0 .pool -_081CD690: +@081CD690: adds r0, r4, 0 adds r1, r6, 0 movs r2, 0x2 @@ -892138,7 +892138,7 @@ _081CD690: lsls r0, 16 lsrs r7, r0, 16 cmp r4, 0xE - bne _081CD6E0 + bne @081CD6E0 movs r0, 0x64 adds r4, r6, 0 muls r4, r0 @@ -892154,10 +892154,10 @@ _081CD690: bl pokemon_get_gender lsls r0, 24 lsrs r6, r0, 24 - b _081CD6FE + b @081CD6FE .align 2, 0 .pool -_081CD6E0: +@081CD6E0: mov r0, r8 mov r1, r9 bl get_pokemon_by_box_and_pos @@ -892170,12 +892170,12 @@ _081CD6E0: lsls r0, 24 lsrs r0, 24 mov r8, r0 -_081CD6FE: +@081CD6FE: cmp r7, 0x1D - beq _081CD706 + beq @081CD706 cmp r7, 0x20 - bne _081CD71C -_081CD706: + bne @081CD71C +@081CD706: movs r0, 0xB adds r1, r7, 0 muls r1, r0 @@ -892184,19 +892184,19 @@ _081CD706: adds r0, r5, 0 bl sub_8008C44 cmp r0, 0 - bne _081CD71C + bne @081CD71C movs r6, 0xFF -_081CD71C: +@081CD71C: adds r3, r5, 0 - b _081CD726 + b @081CD726 .align 2, 0 .pool -_081CD724: +@081CD724: adds r3, 0x1 -_081CD726: +@081CD726: ldrb r0, [r3] cmp r0, 0xFF - bne _081CD724 + bne @081CD724 movs r1, 0xFC strb r1, [r3] adds r3, 0x1 @@ -892207,12 +892207,12 @@ _081CD726: strb r0, [r3] adds r3, 0x1 cmp r6, 0 - beq _081CD74A + beq @081CD74A cmp r6, 0xFE - beq _081CD76E + beq @081CD76E movs r0, 0x77 - b _081CD790 -_081CD74A: + b @081CD790 +@081CD74A: strb r1, [r3] adds r3, 0x1 movs r0, 0x1 @@ -892230,8 +892230,8 @@ _081CD74A: strb r0, [r3] adds r3, 0x1 movs r0, 0xB5 - b _081CD790 -_081CD76E: + b @081CD790 +@081CD76E: strb r1, [r3] adds r3, 0x1 movs r0, 0x1 @@ -892249,7 +892249,7 @@ _081CD76E: strb r0, [r3] adds r3, 0x1 movs r0, 0xB6 -_081CD790: +@081CD790: strb r0, [r3] adds r3, 0x1 movs r0, 0xFC @@ -892290,7 +892290,7 @@ _081CD790: adds r3, 0x1 mov r0, r10 cmp r0, 0 - bne _081CD808 + bne @081CD808 movs r0, 0x3 subs r0, r4 lsls r0, 16 @@ -892299,22 +892299,22 @@ _081CD790: lsrs r4, r0, 16 ldr r0, =0x0000ffff cmp r4, r0 - beq _081CD808 + beq @081CD808 movs r2, 0 adds r1, r0, 0 -_081CD7FA: +@081CD7FA: strb r2, [r3] adds r3, 0x1 subs r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, r1 - bne _081CD7FA -_081CD808: + bne @081CD7FA +@081CD808: movs r0, 0xFF strb r0, [r3] adds r0, r3, 0 -_081CD80E: +@081CD80E: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -892327,7 +892327,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} @@ -892347,17 +892347,17 @@ sub_81CD824: @ 81CD824 asrs r4, r0, 16 bl sub_81CDD5C cmp r0, 0 - beq _081CD85A + beq @081CD85A ldrh r2, [r7] cmp r4, r2 - bne _081CD862 - b _081CD900 -_081CD85A: + bne @081CD862 + b @081CD900 +@081CD85A: ldrh r0, [r7] subs r0, 0x1 cmp r4, r0 - beq _081CD900 -_081CD862: + beq @081CD900 +@081CD862: lsls r0, r6, 6 ldr r1, =0x00006368 adds r0, r1 @@ -892399,15 +892399,15 @@ _081CD862: movs r1, 0x9 strb r1, [r0] cmp r3, 0xE - bne _081CD8E4 + bne @081CD8E4 adds r0, r4, r5 ldr r1, =0x00006325 adds r0, r1 ldr r1, =0x085ebfce - b _081CD8F4 + b @081CD8F4 .align 2, 0 .pool -_081CD8E4: +@081CD8E4: adds r4, r5 ldr r2, =0x00006325 adds r4, r2 @@ -892415,13 +892415,13 @@ _081CD8E4: bl sav3_get_box_name adds r1, r0, 0 adds r0, r4, 0 -_081CD8F4: +@081CD8F4: movs r2, 0x8 bl sub_81CD5CC - b _081CD95C + b @081CD95C .align 2, 0 .pool -_081CD900: +@081CD900: movs r1, 0 lsls r4, r6, 6 lsls r0, r6, 1 @@ -892430,7 +892430,7 @@ _081CD900: ldr r0, =0x00006368 adds r2, r5, r0 movs r7, 0 -_081CD910: +@081CD910: adds r0, r1, r3 adds r0, r2, r0 strb r7, [r0] @@ -892438,7 +892438,7 @@ _081CD910: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0xB - bls _081CD910 + bls @081CD910 adds r1, r4 ldr r2, =0x00006368 adds r0, r5, r2 @@ -892452,7 +892452,7 @@ _081CD910: ldr r0, =0x00006320 adds r2, r5, r0 movs r4, 0 -_081CD93A: +@081CD93A: adds r0, r1, r3 adds r0, r2, r0 strb r4, [r0] @@ -892460,7 +892460,7 @@ _081CD93A: lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x7 - bls _081CD93A + bls @081CD93A mov r2, r8 adds r0, r2, r6 lsls r0, 3 @@ -892470,7 +892470,7 @@ _081CD93A: adds r1, r0 movs r0, 0xFF strb r0, [r1] -_081CD95C: +@081CD95C: pop {r3} mov r8, r3 pop {r4-r7} @@ -892481,7 +892481,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 @@ -892497,10 +892497,10 @@ sub_81CD970: @ 81CD970 strb r0, [r1] movs r4, 0 movs r5, 0 - b _081CD9C4 + b @081CD9C4 .align 2, 0 .pool -_081CD998: +@081CD998: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -892509,7 +892509,7 @@ _081CD998: bl pokemon_getattr adds r2, r0, 0 cmp r2, 0 - bne _081CD9BE + bne @081CD9BE lsls r1, r5, 2 adds r1, r6, r1 movs r0, 0xE @@ -892519,16 +892519,16 @@ _081CD998: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 -_081CD9BE: +@081CD9BE: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 -_081CD9C4: +@081CD9C4: bl calc_player_party_count lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bcc _081CD998 + bcc @081CD998 lsls r0, r5, 2 adds r0, r6, r0 movs r1, 0 @@ -892550,7 +892550,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 @@ -892570,7 +892570,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 @@ -892590,17 +892590,17 @@ sub_81CDA1C: @ 81CDA1C asrs r5, r0, 16 bl sub_81CDD5C cmp r0, 0 - beq _081CDA52 + beq @081CDA52 ldrh r0, [r4] cmp r5, r0 - bne _081CDA5A - b _081CDB48 -_081CDA52: + bne @081CDA5A + b @081CDB48 +@081CDA52: ldrh r0, [r4] subs r0, 0x1 cmp r5, r0 - beq _081CDB48 -_081CDA5A: + beq @081CDB48 +@081CDA5A: lsls r0, r6, 16 asrs r0, 14 adds r0, r4, r0 @@ -892665,7 +892665,7 @@ _081CDA5A: movs r3, 0 bl sub_81D2C68 cmp r0, 0xFF - beq _081CDB10 + beq @081CDB10 adds r0, r6, 0 adds r1, r7, 0 movs r2, 0x30 @@ -892673,12 +892673,12 @@ _081CDA5A: bl sub_81D2C68 movs r1, 0x1D bl __udivsi3 - b _081CDB12 + b @081CDB12 .align 2, 0 .pool -_081CDB10: +@081CDB10: movs r0, 0x9 -_081CDB12: +@081CDB12: strb r0, [r4] adds r0, r6, 0 adds r1, r7, 0 @@ -892699,10 +892699,10 @@ _081CDB12: adds r1, r2 add r1, r8 bl sub_81D2754 - b _081CDB80 + b @081CDB80 .align 2, 0 .pool -_081CDB48: +@081CDB48: movs r2, 0 mov r0, r9 lsls r5, r0, 2 @@ -892713,7 +892713,7 @@ _081CDB48: mov r9, r2 ldr r7, =0x0000643c movs r6, 0x9B -_081CDB5C: +@081CDB5C: adds r0, r2, r5 adds r0, r4, r0 mov r1, r9 @@ -892731,8 +892731,8 @@ _081CDB5C: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x4 - bls _081CDB5C -_081CDB80: + bls @081CDB5C +@081CDB80: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -892744,7 +892744,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 @@ -892765,15 +892765,15 @@ sub_81CDB98: @ 81CDB98 asrs r5, r0, 16 bl sub_81CDD5C cmp r0, 0 - beq _081CDBCC + beq @081CDBCC ldrh r0, [r4] - b _081CDBD0 -_081CDBCC: + b @081CDBD0 +@081CDBCC: ldrh r0, [r4] subs r0, 0x1 -_081CDBD0: +@081CDBD0: cmp r5, r0 - beq _081CDC3E + beq @081CDC3E lsls r0, r6, 16 asrs r0, 14 adds r0, r4, r0 @@ -892821,7 +892821,7 @@ _081CDBD0: lsls r1, r2, 7 adds r1, r7, r1 bl LZ77UnCompWram -_081CDC3E: +@081CDC3E: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -892834,7 +892834,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 @@ -892844,7 +892844,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 @@ -892854,7 +892854,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 @@ -892867,7 +892867,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 @@ -892881,7 +892881,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 @@ -892895,7 +892895,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 @@ -892913,7 +892913,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 @@ -892928,7 +892928,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 @@ -892942,7 +892942,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 @@ -892961,7 +892961,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 @@ -892982,7 +892982,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 @@ -892995,7 +892995,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 @@ -893004,18 +893004,18 @@ sub_81CDD5C: @ 81CDD5C adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - beq _081CDD74 + beq @081CDD74 movs r0, 0 - b _081CDD76 -_081CDD74: + b @081CDD76 +@081CDD74: movs r0, 0x1 -_081CDD76: +@081CDD76: pop {r1} bx r1 thumb_func_end sub_81CDD5C thumb_func_start sub_81CDD7C -sub_81CDD7C: @ 81CDD7C +sub_81CDD7C: ; 81CDD7C push {lr} movs r0, 0xB bl sub_81C763C @@ -893025,10 +893025,10 @@ sub_81CDD7C: @ 81CDD7C adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x1 - beq _081CDD96 + beq @081CDD96 movs r0, 0 - b _081CDDA6 -_081CDD96: + b @081CDDA6 +@081CDD96: ldr r3, =0x00006786 adds r0, r2, r3 movs r1, 0 @@ -893037,7 +893037,7 @@ _081CDD96: adds r0, r2, r3 adds r0, r1 ldrb r0, [r0] -_081CDDA6: +@081CDDA6: pop {r1} bx r1 .align 2, 0 @@ -893045,7 +893045,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 @@ -893065,14 +893065,14 @@ 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 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq _081CDE24 + beq @081CDE24 ldr r0, =0x00001816 adds r1, r4, r0 movs r0, 0xFF @@ -893090,19 +893090,19 @@ sub_81CDDD4: @ 81CDDD4 movs r0, 0 strb r0, [r1] movs r0, 0x1 - b _081CDE26 + b @081CDE26 .align 2, 0 .pool -_081CDE24: +@081CDE24: movs r0, 0 -_081CDE26: +@081CDE26: pop {r4} pop {r1} bx r1 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 @@ -893127,7 +893127,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 @@ -893142,7 +893142,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 @@ -893153,7 +893153,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 @@ -893161,47 +893161,47 @@ sub_81CDE94: @ 81CDE94 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x14 - bls _081CDEA8 - b _081CE2C4 -_081CDEA8: + bls @081CDEA8 + b @081CE2C4 +@081CDEA8: lsls r0, r4, 2 - ldr r1, =_081CDEB8 + ldr r1, =@081CDEB8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081CDEB8: - .4byte _081CDF0C - .4byte _081CDF18 - .4byte _081CDF94 - .4byte _081CDFB8 - .4byte _081CE030 - .4byte _081CE074 - .4byte _081CE0B0 - .4byte _081CE118 - .4byte _081CE120 - .4byte _081CE126 - .4byte _081CE136 - .4byte _081CE146 - .4byte _081CE156 - .4byte _081CE16C - .4byte _081CE1C8 - .4byte _081CE1EC - .4byte _081CE218 - .4byte _081CE23C - .4byte _081CE24A - .4byte _081CE25A - .4byte _081CE262 -_081CDF0C: +@081CDEB8: + .4byte @081CDF0C + .4byte @081CDF18 + .4byte @081CDF94 + .4byte @081CDFB8 + .4byte @081CE030 + .4byte @081CE074 + .4byte @081CE0B0 + .4byte @081CE118 + .4byte @081CE120 + .4byte @081CE126 + .4byte @081CE136 + .4byte @081CE146 + .4byte @081CE156 + .4byte @081CE16C + .4byte @081CE1C8 + .4byte @081CE1EC + .4byte @081CE218 + .4byte @081CE23C + .4byte @081CE24A + .4byte @081CE25A + .4byte @081CE262 +@081CDF0C: bl sub_81CD3C4 cmp r0, 0x1 - beq _081CDF16 - b _081CE2C0 -_081CDF16: - b _081CDFB0 -_081CDF18: + beq @081CDF16 + b @081CE2C0 +@081CDF16: + b @081CDFB0 +@081CDF18: ldr r0, =0x08623358 movs r1, 0x3 bl sub_81C7B54 @@ -893242,36 +893242,36 @@ _081CDF18: movs r0, 0 str r0, [sp] movs r0, 0x3 - b _081CDFA8 + b @081CDFA8 .align 2, 0 .pool -_081CDF94: +@081CDF94: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _081CDFA2 - b _081CE2C0 -_081CDFA2: + beq @081CDFA2 + b @081CE2C0 +@081CDFA2: ldr r1, =0x08623228 str r0, [sp] movs r0, 0x2 -_081CDFA8: +@081CDFA8: movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram -_081CDFB0: +@081CDFB0: movs r0, 0 - b _081CE2C6 + b @081CE2C6 .align 2, 0 .pool -_081CDFB8: +@081CDFB8: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - beq _081CDFC4 - b _081CE2C0 -_081CDFC4: + beq @081CDFC4 + b @081CE2C0 +@081CDFC4: ldr r0, =0x08dc6dfc adds r4, r5, 0x4 adds r1, r4, 0 @@ -893281,7 +893281,7 @@ _081CDFC4: bl bg_set_tilemap bl sub_81CDD5C cmp r0, 0x1 - bne _081CDFF2 + bne @081CDFF2 ldr r1, =0x08dc7070 movs r0, 0x9 str r0, [sp] @@ -893291,7 +893291,7 @@ _081CDFC4: movs r2, 0 movs r3, 0x5 bl gpu_copy_to_iwram_tile_map_rect -_081CDFF2: +@081CDFF2: movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram ldr r0, =0x08dc6528 @@ -893306,16 +893306,16 @@ _081CDFF2: adds r1, r5, r0 ldr r0, =0x0000ffb0 strh r0, [r1] - b _081CDFB0 + b @081CDFB0 .align 2, 0 .pool -_081CE030: +@081CE030: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - beq _081CE03C - b _081CE2C0 -_081CE03C: + beq @081CE03C + b @081CE2C0 +@081CE03C: ldr r0, =0x0862323c ldr r1, =0x00001004 adds r4, r5, r1 @@ -893332,10 +893332,10 @@ _081CE03C: bl sub_81C7944 movs r0, 0x2 bl sub_81D21DC - b _081CDFB0 + b @081CDFB0 .align 2, 0 .pool -_081CE074: +@081CE074: movs r0, 0x1 movs r1, 0 movs r2, 0 @@ -893357,16 +893357,16 @@ _081CE074: movs r0, 0x1 adds r1, r4, 0 bl bg_set_tilemap - b _081CDFB0 + b @081CDFB0 .align 2, 0 .pool -_081CE0B0: +@081CE0B0: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - beq _081CE0BC - b _081CE2C0 -_081CE0BC: + beq @081CE0BC + b @081CE2C0 +@081CE0BC: ldr r0, =0x08623364 bl Window_AddFromTemplate movs r2, 0xC1 @@ -893375,7 +893375,7 @@ _081CE0BC: strb r0, [r1] bl sub_81CDD5C cmp r0, 0x1 - bne _081CE0F6 + bne @081CE0F6 ldr r0, =0x0862336c bl Window_AddFromTemplate ldr r2, =0x00001821 @@ -893391,54 +893391,54 @@ _081CE0BC: ldr r2, =0x00001823 adds r1, r5, r2 strb r0, [r1] -_081CE0F6: +@081CE0F6: bl TextBox_ResetSomeField - b _081CDFB0 + b @081CDFB0 .align 2, 0 .pool -_081CE118: +@081CE118: movs r0, 0 bl sub_81CED30 - b _081CDFB0 -_081CE120: + b @081CDFB0 +@081CE120: bl sub_81CE9E4 - b _081CDFB0 -_081CE126: + b @081CDFB0 +@081CE126: bl sub_81CDD5C cmp r0, 0x1 - beq _081CE130 - b _081CDFB0 -_081CE130: + beq @081CE130 + b @081CDFB0 +@081CE130: bl sub_81CE934 - b _081CDFB0 -_081CE136: + b @081CDFB0 +@081CE136: bl sub_81CDC84 adds r1, r0, 0 lsls r1, 24 asrs r1, 8 lsrs r1, 16 movs r0, 0 - b _081CE164 -_081CE146: + b @081CE164 +@081CE146: bl sub_81CDC84 adds r1, r0, 0 lsls r1, 24 asrs r1, 8 lsrs r1, 16 movs r0, 0x1 - b _081CE164 -_081CE156: + b @081CE164 +@081CE156: bl sub_81CDC84 adds r1, r0, 0 lsls r1, 24 asrs r1, 8 lsrs r1, 16 movs r0, 0x2 -_081CE164: +@081CE164: movs r2, 0x1 bl sub_81CE754 - b _081CDFB0 -_081CE16C: + b @081CDFB0 +@081CE16C: bl sub_81CDC84 adds r1, r0, 0 lsls r1, 24 @@ -893448,9 +893448,9 @@ _081CE16C: movs r2, 0x1 bl sub_81CE754 cmp r0, 0x1 - beq _081CE186 - b _081CE2C0 -_081CE186: + beq @081CE186 + b @081CE2C0 +@081CE186: movs r1, 0xC1 lsls r1, 5 adds r0, r5, r1 @@ -893458,9 +893458,9 @@ _081CE186: bl Window_WriteStandardTileMap bl sub_81CDD5C cmp r0, 0x1 - beq _081CE19C - b _081CDFB0 -_081CE19C: + beq @081CE19C + b @081CDFB0 +@081CE19C: ldr r2, =0x00001821 adds r0, r5, r2 ldrb r0, [r0] @@ -893473,10 +893473,10 @@ _081CE19C: adds r0, r5, r2 ldrb r0, [r0] bl Window_WriteStandardTileMap - b _081CDFB0 + b @081CDFB0 .align 2, 0 .pool -_081CE1C8: +@081CE1C8: movs r0, 0x1 bl gpu_sync_bg_show movs r0, 0x2 @@ -893485,20 +893485,20 @@ _081CE1C8: bl gpu_sync_bg_show bl sub_81CDD5C cmp r0, 0x1 - beq _081CE1E4 - b _081CDFB0 -_081CE1E4: + beq @081CE1E4 + b @081CDFB0 +@081CE1E4: movs r0, 0x4 bl sub_81C7BA4 - b _081CDFB0 -_081CE1EC: + b @081CDFB0 +@081CE1EC: movs r0, 0x1 bl sub_81C7AC0 bl sub_81CDD5C cmp r0, 0 - beq _081CE1FC - b _081CDFB0 -_081CE1FC: + beq @081CE1FC + b @081CDFB0 +@081CE1FC: movs r0, 0x6 bl sub_81C7DFC movs r0, 0x1 @@ -893509,62 +893509,62 @@ _081CE1FC: movs r1, 0x1 movs r2, 0 bl sub_81C7FA0 - b _081CDFB0 -_081CE218: + b @081CDFB0 +@081CE218: bl sub_81C7B34 cmp r0, 0 - bne _081CE2C0 + bne @081CE2C0 bl sub_81CDD5C cmp r0, 0 - bne _081CE230 + bne @081CE230 bl sub_81C8010 cmp r0, 0 - bne _081CE2C0 -_081CE230: + bne @081CE2C0 +@081CE230: ldr r0, =sub_81CEE44 + 1 bl c3args_set_0toR1_1to0 - b _081CDFB0 + b @081CDFB0 .align 2, 0 .pool -_081CE23C: +@081CE23C: bl sub_81CEE90 bl sub_81CDC70 bl sub_81D20AC - b _081CDFB0 -_081CE24A: + b @081CDFB0 +@081CE24A: bl sub_81CDC70 bl sub_81D20BC lsls r0, 24 cmp r0, 0 - bne _081CE2C0 - b _081CDFB0 -_081CE25A: + bne @081CE2C0 + b @081CDFB0 +@081CE25A: movs r0, 0x1 bl sub_81CEE74 - b _081CDFB0 -_081CE262: + b @081CDFB0 +@081CE262: bl sub_81CDC70 ldr r2, =0x00001814 adds r1, r5, r2 bl sub_81D3178 lsls r0, 24 cmp r0, 0 - bne _081CE2C0 + bne @081CE2C0 ldr r0, =0x000028e0 adds r6, r5, r0 adds r0, r6, 0 bl sub_81D3464 bl sub_81CDD5C cmp r0, 0x1 - beq _081CE298 + beq @081CE298 bl sub_81CDC60 adds r4, r0, 0 bl sub_81CDC50 lsls r4, 16 lsls r0, 16 cmp r4, r0 - beq _081CE2C4 -_081CE298: + beq @081CE2C4 +@081CE298: ldr r1, =0x00001816 adds r0, r5, r1 ldrb r4, [r0] @@ -893575,15 +893575,15 @@ _081CE298: adds r0, r6, 0 adds r1, r4, 0 bl sub_81D3480 - b _081CE2C4 + b @081CE2C4 .align 2, 0 .pool -_081CE2C0: +@081CE2C0: movs r0, 0x2 - b _081CE2C6 -_081CE2C4: + b @081CE2C6 +@081CE2C4: movs r0, 0x4 -_081CE2C6: +@081CE2C6: add sp, 0xC pop {r4-r6} pop {r1} @@ -893591,69 +893591,69 @@ _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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x1 - beq _081CE308 + beq @081CE308 cmp r4, 0x1 - bgt _081CE2EA + bgt @081CE2EA cmp r4, 0 - beq _081CE2F4 - b _081CE374 -_081CE2EA: + beq @081CE2F4 + b @081CE374 +@081CE2EA: cmp r4, 0x2 - beq _081CE328 + beq @081CE328 cmp r4, 0x3 - beq _081CE33E - b _081CE374 -_081CE2F4: + beq @081CE33E + b @081CE374 +@081CE2F4: bl sub_81CEEC8 ldr r1, =0x000028e0 adds r0, r5, r1 bl sub_81D3520 movs r0, 0x1 - b _081CE376 + b @081CE376 .align 2, 0 .pool -_081CE308: +@081CE308: bl sub_81CDC70 ldr r2, =0x00001814 adds r1, r5, r2 bl sub_81D31A4 lsls r0, 24 cmp r0, 0 - bne _081CE34E + bne @081CE34E movs r0, 0 bl sub_81CEE74 movs r0, 0x1 - b _081CE376 + b @081CE376 .align 2, 0 .pool -_081CE328: +@081CE328: movs r0, 0 bl sub_81C7AC0 bl sub_81CDD5C cmp r0, 0 - bne _081CE33A + bne @081CE33A bl sub_81C78A0 -_081CE33A: +@081CE33A: movs r0, 0 - b _081CE376 -_081CE33E: + b @081CE376 +@081CE33E: bl sub_81C7B34 cmp r0, 0 - bne _081CE34E + bne @081CE34E bl sub_81C78C0 cmp r0, 0 - beq _081CE352 -_081CE34E: + beq @081CE352 +@081CE34E: movs r0, 0x2 - b _081CE376 -_081CE352: + b @081CE376 +@081CE352: ldr r1, =0x000028e0 adds r0, r5, r1 bl sub_81D354C @@ -893664,19 +893664,19 @@ _081CE352: movs r0, 0x3 bl gpu_sync_bg_hide movs r0, 0x1 - b _081CE376 + b @081CE376 .align 2, 0 .pool -_081CE374: +@081CE374: movs r0, 0x4 -_081CE376: +@081CE376: pop {r4,r5} pop {r1} bx r1 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 @@ -893685,93 +893685,93 @@ sub_81CE37C: @ 81CE37C bl sub_81CDC70 adds r2, r0, 0 cmp r4, 0x9 - bls _081CE394 - b _081CE4D0 -_081CE394: + bls @081CE394 + b @081CE4D0 +@081CE394: lsls r0, r4, 2 - ldr r1, =_081CE3A4 + ldr r1, =@081CE3A4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081CE3A4: - .4byte _081CE3CC - .4byte _081CE3D0 - .4byte _081CE3DA - .4byte _081CE3F0 - .4byte _081CE3F8 - .4byte _081CE418 - .4byte _081CE428 - .4byte _081CE438 - .4byte _081CE44E - .4byte _081CE468 -_081CE3CC: +@081CE3A4: + .4byte @081CE3CC + .4byte @081CE3D0 + .4byte @081CE3DA + .4byte @081CE3F0 + .4byte @081CE3F8 + .4byte @081CE418 + .4byte @081CE428 + .4byte @081CE438 + .4byte @081CE44E + .4byte @081CE468 +@081CE3CC: movs r0, 0 - b _081CE3D2 -_081CE3D0: + b @081CE3D2 +@081CE3D0: movs r0, 0x1 -_081CE3D2: +@081CE3D2: bl sub_81CD548 -_081CE3D6: +@081CE3D6: movs r0, 0x1 - b _081CE4D2 -_081CE3DA: + b @081CE4D2 +@081CE3DA: movs r0, 0x2 bl sub_81CD548 ldr r1, =0x000028e0 adds r0, r6, r1 bl sub_81D3520 - b _081CE3D6 + b @081CE3D6 .align 2, 0 .pool -_081CE3F0: +@081CE3F0: adds r0, r2, 0 bl sub_81D2074 - b _081CE3D6 -_081CE3F8: + b @081CE3D6 +@081CE3F8: ldr r1, =0x00001814 adds r0, r6, r1 bl sub_81D3150 lsls r0, 24 cmp r0, 0 - bne _081CE4CC + bne @081CE4CC bl sub_81CDC84 lsls r0, 24 lsrs r0, 24 bl sub_81CED30 - b _081CE3D6 + b @081CE3D6 .align 2, 0 .pool -_081CE418: +@081CE418: bl sub_81CDC84 adds r1, r0, 0 lsls r1, 24 asrs r1, 8 lsrs r1, 16 movs r0, 0 - b _081CE446 -_081CE428: + b @081CE446 +@081CE428: bl sub_81CDC84 adds r1, r0, 0 lsls r1, 24 asrs r1, 8 lsrs r1, 16 movs r0, 0x1 - b _081CE446 -_081CE438: + b @081CE446 +@081CE438: bl sub_81CDC84 adds r1, r0, 0 lsls r1, 24 asrs r1, 8 lsrs r1, 16 movs r0, 0x2 -_081CE446: +@081CE446: movs r2, 0 bl sub_81CE754 - b _081CE3D6 -_081CE44E: + b @081CE3D6 +@081CE44E: bl sub_81CDC84 adds r1, r0, 0 lsls r1, 24 @@ -893781,9 +893781,9 @@ _081CE44E: movs r2, 0 bl sub_81CE754 cmp r0, 0x1 - beq _081CE3D6 - b _081CE4CC -_081CE468: + beq @081CE3D6 + b @081CE4CC +@081CE468: bl sub_81CDC70 adds r2, r0, 0 ldr r0, =0x00001814 @@ -893792,21 +893792,21 @@ _081CE468: bl sub_81D3178 lsls r0, 24 cmp r0, 0 - bne _081CE4CC + bne @081CE4CC ldr r1, =0x000028e0 adds r0, r6, r1 bl sub_81D3464 bl sub_81CDD5C cmp r0, 0x1 - beq _081CE4A0 + beq @081CE4A0 bl sub_81CDC60 adds r4, r0, 0 bl sub_81CDC50 lsls r4, 16 lsls r0, 16 cmp r4, r0 - beq _081CE3D6 -_081CE4A0: + beq @081CE3D6 +@081CE4A0: ldr r0, =0x000028e0 adds r5, r6, r0 ldr r1, =0x00001816 @@ -893819,95 +893819,95 @@ _081CE4A0: adds r0, r5, 0 adds r1, r4, 0 bl sub_81D3480 - b _081CE3D6 + b @081CE3D6 .align 2, 0 .pool -_081CE4CC: +@081CE4CC: movs r0, 0x2 - b _081CE4D2 -_081CE4D0: + b @081CE4D2 +@081CE4D0: movs r0, 0x4 -_081CE4D2: +@081CE4D2: pop {r4-r6} pop {r1} bx r1 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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x8 - bhi _081CE5DC + bhi @081CE5DC lsls r0, r4, 2 - ldr r1, =_081CE4F8 + ldr r1, =@081CE4F8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081CE4F8: - .4byte _081CE51C - .4byte _081CE520 - .4byte _081CE524 - .4byte _081CE52E - .4byte _081CE53E - .4byte _081CE54E - .4byte _081CE55E - .4byte _081CE576 - .4byte _081CE592 -_081CE51C: +@081CE4F8: + .4byte @081CE51C + .4byte @081CE520 + .4byte @081CE524 + .4byte @081CE52E + .4byte @081CE53E + .4byte @081CE54E + .4byte @081CE55E + .4byte @081CE576 + .4byte @081CE592 +@081CE51C: movs r0, 0 - b _081CE526 -_081CE520: + b @081CE526 +@081CE520: movs r0, 0x1 - b _081CE526 -_081CE524: + b @081CE526 +@081CE524: movs r0, 0x2 -_081CE526: +@081CE526: bl sub_81CD548 movs r0, 0x1 - b _081CE5DE -_081CE52E: + b @081CE5DE +@081CE52E: bl sub_81CDC84 lsls r0, 24 lsrs r0, 24 bl sub_81CED30 movs r0, 0x1 - b _081CE5DE -_081CE53E: + b @081CE5DE +@081CE53E: bl sub_81CDC84 adds r1, r0, 0 lsls r1, 24 asrs r1, 8 lsrs r1, 16 movs r0, 0 - b _081CE56C -_081CE54E: + b @081CE56C +@081CE54E: bl sub_81CDC84 adds r1, r0, 0 lsls r1, 24 asrs r1, 8 lsrs r1, 16 movs r0, 0x1 - b _081CE56C -_081CE55E: + b @081CE56C +@081CE55E: bl sub_81CDC84 adds r1, r0, 0 lsls r1, 24 asrs r1, 8 lsrs r1, 16 movs r0, 0x2 -_081CE56C: +@081CE56C: movs r2, 0 bl sub_81CE754 movs r0, 0x1 - b _081CE5DE -_081CE576: + b @081CE5DE +@081CE576: bl sub_81CDC84 adds r1, r0, 0 lsls r1, 24 @@ -893917,17 +893917,17 @@ _081CE576: movs r2, 0 bl sub_81CE754 cmp r0, 0x1 - bne _081CE5D8 + bne @081CE5D8 movs r0, 0x1 - b _081CE5DE -_081CE592: + b @081CE5DE +@081CE592: bl sub_81CDC70 ldr r2, =0x00001814 adds r1, r5, r2 bl sub_81D3178 lsls r0, 24 cmp r0, 0 - bne _081CE5D8 + bne @081CE5D8 ldr r0, =0x000028e0 adds r4, r5, r0 adds r0, r4, 0 @@ -893943,104 +893943,104 @@ _081CE592: adds r1, r5, 0 bl sub_81D3480 movs r0, 0x1 - b _081CE5DE + b @081CE5DE .align 2, 0 .pool -_081CE5D8: +@081CE5D8: movs r0, 0x2 - b _081CE5DE -_081CE5DC: + b @081CE5DE +@081CE5DC: movs r0, 0x4 -_081CE5DE: +@081CE5DE: pop {r4,r5} pop {r1} bx r1 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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x7 - bhi _081CE6B2 + bhi @081CE6B2 lsls r0, r4, 2 - ldr r1, =_081CE604 + ldr r1, =@081CE604 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081CE604: - .4byte _081CE624 - .4byte _081CE628 - .4byte _081CE632 - .4byte _081CE648 - .4byte _081CE660 - .4byte _081CE670 - .4byte _081CE680 - .4byte _081CE696 -_081CE624: +@081CE604: + .4byte @081CE624 + .4byte @081CE628 + .4byte @081CE632 + .4byte @081CE648 + .4byte @081CE660 + .4byte @081CE670 + .4byte @081CE680 + .4byte @081CE696 +@081CE624: movs r0, 0 - b _081CE62A -_081CE628: + b @081CE62A +@081CE628: movs r0, 0x1 -_081CE62A: +@081CE62A: bl sub_81CD548 -_081CE62E: +@081CE62E: movs r0, 0x1 - b _081CE6B4 -_081CE632: + b @081CE6B4 +@081CE632: movs r0, 0x2 bl sub_81CD548 ldr r1, =0x000028e0 adds r0, r5, r1 bl sub_81D3520 - b _081CE62E + b @081CE62E .align 2, 0 .pool -_081CE648: +@081CE648: bl sub_81CDC70 ldr r2, =0x00001814 adds r1, r5, r2 bl sub_81D31A4 lsls r0, 24 cmp r0, 0 - beq _081CE62E - b _081CE6AE + beq @081CE62E + b @081CE6AE .align 2, 0 .pool -_081CE660: +@081CE660: bl sub_81CDC84 adds r1, r0, 0 lsls r1, 24 asrs r1, 8 lsrs r1, 16 movs r0, 0 - b _081CE68E -_081CE670: + b @081CE68E +@081CE670: bl sub_81CDC84 adds r1, r0, 0 lsls r1, 24 asrs r1, 8 lsrs r1, 16 movs r0, 0x1 - b _081CE68E -_081CE680: + b @081CE68E +@081CE680: bl sub_81CDC84 adds r1, r0, 0 lsls r1, 24 asrs r1, 8 lsrs r1, 16 movs r0, 0x2 -_081CE68E: +@081CE68E: movs r2, 0 bl sub_81CE754 - b _081CE62E -_081CE696: + b @081CE62E +@081CE696: bl sub_81CDC84 adds r1, r0, 0 lsls r1, 24 @@ -894050,97 +894050,97 @@ _081CE696: movs r2, 0 bl sub_81CE754 cmp r0, 0x1 - beq _081CE62E -_081CE6AE: + beq @081CE62E +@081CE6AE: movs r0, 0x2 - b _081CE6B4 -_081CE6B2: + b @081CE6B4 +@081CE6B2: movs r0, 0x4 -_081CE6B4: +@081CE6B4: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_81CE5E4 thumb_func_start sub_81CE6BC -sub_81CE6BC: @ 81CE6BC +sub_81CE6BC: ; 81CE6BC push {lr} cmp r0, 0x1 - beq _081CE6E6 + beq @081CE6E6 cmp r0, 0x1 - bgt _081CE6CC + bgt @081CE6CC cmp r0, 0 - beq _081CE6D2 - b _081CE6FA -_081CE6CC: + beq @081CE6D2 + b @081CE6FA +@081CE6CC: cmp r0, 0x2 - beq _081CE6EE - b _081CE6FA -_081CE6D2: + beq @081CE6EE + b @081CE6FA +@081CE6D2: bl sub_81CDD7C lsls r0, 24 lsrs r0, 24 movs r1, 0xB0 movs r2, 0x20 bl sub_811FAA4 -_081CE6E2: +@081CE6E2: movs r0, 0x1 - b _081CE6FC -_081CE6E6: + b @081CE6FC +@081CE6E6: movs r0, 0x5 bl sub_81C7BA4 - b _081CE6E2 -_081CE6EE: + b @081CE6E2 +@081CE6EE: bl sub_81C7BE8 cmp r0, 0x1 - bne _081CE6E2 + bne @081CE6E2 movs r0, 0x2 - b _081CE6FC -_081CE6FA: + b @081CE6FC +@081CE6FA: movs r0, 0x4 -_081CE6FC: +@081CE6FC: pop {r1} bx r1 thumb_func_end sub_81CE6BC thumb_func_start sub_81CE700 -sub_81CE700: @ 81CE700 +sub_81CE700: ; 81CE700 push {lr} cmp r0, 0x1 - beq _081CE71E + beq @081CE71E cmp r0, 0x1 - bgt _081CE710 + bgt @081CE710 cmp r0, 0 - beq _081CE716 - b _081CE732 -_081CE710: + beq @081CE716 + b @081CE732 +@081CE710: cmp r0, 0x2 - beq _081CE726 - b _081CE732 -_081CE716: + beq @081CE726 + b @081CE732 +@081CE716: bl sub_811FAF8 -_081CE71A: +@081CE71A: movs r0, 0x1 - b _081CE734 -_081CE71E: + b @081CE734 +@081CE71E: movs r0, 0x4 bl sub_81C7BA4 - b _081CE71A -_081CE726: + b @081CE71A +@081CE726: bl sub_81C7BE8 cmp r0, 0x1 - bne _081CE71A + bne @081CE71A movs r0, 0x2 - b _081CE734 -_081CE732: + b @081CE734 +@081CE732: movs r0, 0x4 -_081CE734: +@081CE734: pop {r1} bx r1 thumb_func_end sub_81CE700 thumb_func_start sub_81CE738 -sub_81CE738: @ 81CE738 +sub_81CE738: ; 81CE738 push {lr} lsls r1, 16 lsrs r1, 16 @@ -894156,7 +894156,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} @@ -894173,21 +894173,21 @@ sub_81CE754: @ 81CE754 bl sub_81C763C adds r6, r0, 0 cmp r4, 0x1 - beq _081CE7B8 + beq @081CE7B8 cmp r4, 0x1 - bgt _081CE782 + bgt @081CE782 cmp r4, 0 - beq _081CE78E - b _081CE924 -_081CE782: + beq @081CE78E + b @081CE924 +@081CE782: cmp r4, 0x2 - beq _081CE800 + beq @081CE800 cmp r4, 0x3 - bne _081CE78C - b _081CE89C -_081CE78C: - b _081CE924 -_081CE78E: + bne @081CE78C + b @081CE89C +@081CE78C: + b @081CE924 +@081CE78E: movs r1, 0xC1 lsls r1, 5 adds r0, r6, r1 @@ -894196,18 +894196,18 @@ _081CE78E: bl Window_FastFillPixels bl sub_81CDD5C cmp r0, 0x1 - beq _081CE7A6 - b _081CE924 -_081CE7A6: + beq @081CE7A6 + b @081CE924 +@081CE7A6: ldr r1, =0x00001821 adds r0, r6, r1 ldrb r0, [r0] movs r1, 0 bl Window_FastFillPixels - b _081CE924 + b @081CE924 .align 2, 0 .pool -_081CE7B8: +@081CE7B8: bl sub_81CDC60 adds r4, r0, 0 lsls r4, 16 @@ -894217,12 +894217,12 @@ _081CE7B8: lsrs r0, 16 subs r0, 0x1 cmp r4, r0 - bne _081CE7DA + bne @081CE7DA bl sub_81CDD5C cmp r0, 0x1 - beq _081CE7DA - b _081CE924 -_081CE7DA: + beq @081CE7DA + b @081CE924 +@081CE7DA: mov r1, r8 lsls r0, r1, 24 lsrs r0, 24 @@ -894239,14 +894239,14 @@ _081CE7DA: movs r1, 0x1 movs r3, 0 bl Print - b _081CE924 -_081CE800: + b @081CE924 +@081CE800: bl sub_81CDD5C adds r7, r0, 0 cmp r7, 0x1 - beq _081CE80C - b _081CE924 -_081CE80C: + beq @081CE80C + b @081CE924 +@081CE80C: mov r1, r8 lsls r0, r1, 24 lsrs r0, 24 @@ -894306,78 +894306,78 @@ _081CE80C: add r2, sp, 0xC movs r3, 0x1C bl Print - b _081CE924 + b @081CE924 .align 2, 0 .pool -_081CE89C: +@081CE89C: ldr r1, =0x00002908 adds r0, r6, r1 ldrb r0, [r0] cmp r0, 0 - beq _081CE8B0 + beq @081CE8B0 cmp r0, 0x1 - beq _081CE8EC - b _081CE924 + beq @081CE8EC + b @081CE924 .align 2, 0 .pool -_081CE8B0: +@081CE8B0: cmp r5, 0 - beq _081CE8C4 + beq @081CE8C4 movs r1, 0xC1 lsls r1, 5 adds r0, r6, r1 ldrb r0, [r0] movs r1, 0x3 bl Window_CopyToVram - b _081CE8D2 -_081CE8C4: + b @081CE8D2 +@081CE8C4: movs r1, 0xC1 lsls r1, 5 adds r0, r6, r1 ldrb r0, [r0] movs r1, 0x2 bl Window_CopyToVram -_081CE8D2: +@081CE8D2: bl sub_81CDD5C cmp r0, 0x1 - bne _081CE910 + bne @081CE910 ldr r0, =0x00002908 adds r1, r6, r0 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _081CE924 + b @081CE924 .align 2, 0 .pool -_081CE8EC: +@081CE8EC: cmp r5, 0 - beq _081CE904 + beq @081CE904 ldr r1, =0x00001821 adds r0, r6, r1 ldrb r0, [r0] movs r1, 0x3 bl Window_CopyToVram - b _081CE910 + b @081CE910 .align 2, 0 .pool -_081CE904: +@081CE904: ldr r1, =0x00001821 adds r0, r6, r1 ldrb r0, [r0] movs r1, 0x2 bl Window_CopyToVram -_081CE910: +@081CE910: ldr r0, =0x00002908 adds r1, r6, r0 movs r0, 0 strb r0, [r1] movs r0, 0x1 - b _081CE926 + b @081CE926 .align 2, 0 .pool -_081CE924: +@081CE924: movs r0, 0 -_081CE926: +@081CE926: add sp, 0x2C pop {r3} mov r8, r3 @@ -894387,7 +894387,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 @@ -894410,7 +894410,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 @@ -894419,23 +894419,23 @@ sub_81CE964: @ 81CE964 lsls r0, 16 lsrs r0, 16 cmp r4, r0 - bne _081CE982 + bne @081CE982 adds r0, r5, 0 movs r1, 0 bl obj_anim_image_start - b _081CE98A -_081CE982: + b @081CE98A +@081CE982: adds r0, r5, 0 movs r1, 0x1 bl obj_anim_image_start -_081CE98A: +@081CE98A: pop {r4,r5} pop {r0} bx r0 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 @@ -894447,12 +894447,12 @@ sub_81CE990: @ 81CE990 lsrs r0, 16 subs r0, 0x1 cmp r4, r0 - bne _081CE9B0 + bne @081CE9B0 movs r0, 0x65 - b _081CE9B2 -_081CE9B0: + b @081CE9B2 +@081CE9B0: movs r0, 0x66 -_081CE9B2: +@081CE9B2: bl gpu_pal_tags_index_of lsls r0, 4 ldrb r2, [r5, 0x5] @@ -894466,7 +894466,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 @@ -894481,7 +894481,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 @@ -894501,7 +894501,7 @@ sub_81CE9E4: @ 81CE9E4 adds r7, r4, 0 mov r10, r5 cmp r0, 0x1 - bne _081CEA78 + bne @081CEA78 ldr r1, =0x00001824 adds r0, r6, r1 movs r2, 0x6A @@ -894536,10 +894536,10 @@ sub_81CE9E4: @ 81CE9E4 bl sub_81C7990 add r3, sp, 0x50 mov r8, r3 - b _081CEBC6 + b @081CEBC6 .align 2, 0 .pool -_081CEA78: +@081CEA78: mov r0, sp bl gpu_tile_obj_alloc_and_load_multiple mov r0, r10 @@ -894547,8 +894547,8 @@ _081CEA78: movs r4, 0 add r0, sp, 0x50 mov r8, r0 - b _081CEAE8 -_081CEA8C: + b @081CEAE8 +@081CEA8C: lsls r2, r4, 2 adds r2, r4 lsls r2, 18 @@ -894563,7 +894563,7 @@ _081CEA8C: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 - beq _081CEAD8 + beq @081CEAD8 ldr r2, =0x00001806 adds r0, r6, r2 adds r0, r4 @@ -894578,37 +894578,37 @@ _081CEA8C: adds r0, r2 ldr r1, =sub_81CE964 + 1 str r1, [r0] - b _081CEAE2 + b @081CEAE2 .align 2, 0 .pool -_081CEAD8: +@081CEAD8: ldr r3, =0x00001806 adds r0, r6, r3 adds r0, r4 movs r1, 0xFF strb r1, [r0] -_081CEAE2: +@081CEAE2: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 -_081CEAE8: +@081CEAE8: bl sub_81CDC50 lsls r0, 16 lsrs r0, 16 subs r0, 0x1 cmp r4, r0 - blt _081CEA8C + blt @081CEA8C movs r0, 0x67 strh r0, [r7] ldr r0, =nullsub_12 + 1 str r0, [r7, 0x14] cmp r4, 0x5 - bhi _081CEB5C + bhi @081CEB5C ldr r0, =0x00001806 adds r5, r6, r0 ldr r1, =0x02020630 mov r9, r1 -_081CEB0A: +@081CEB0A: lsls r2, r4, 2 adds r2, r4 lsls r2, 18 @@ -894623,7 +894623,7 @@ _081CEB0A: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 - beq _081CEB4C + beq @081CEB4C adds r0, r5, r4 strb r3, [r0] lsls r1, r3, 4 @@ -894634,20 +894634,20 @@ _081CEB0A: movs r0, 0x3F ands r0, r2 strb r0, [r1, 0x3] - b _081CEB52 + b @081CEB52 .align 2, 0 .pool -_081CEB4C: +@081CEB4C: adds r1, r5, r4 movs r0, 0xFF strb r0, [r1] -_081CEB52: +@081CEB52: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x5 - bls _081CEB0A -_081CEB5C: + bls @081CEB0A +@081CEB5C: movs r0, 0x66 strh r0, [r7] ldr r0, =sub_81CE990 + 1 @@ -894666,7 +894666,7 @@ _081CEB5C: lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 - beq _081CEBBC + beq @081CEBBC ldr r1, =0x00001806 adds r0, r6, r1 adds r0, r4 @@ -894688,16 +894688,16 @@ _081CEB5C: movs r0, 0x80 orrs r1, r0 strb r1, [r2, 0x3] - b _081CEBC6 + b @081CEBC6 .align 2, 0 .pool -_081CEBBC: +@081CEBBC: ldr r2, =0x00001806 adds r0, r6, r2 adds r0, r4 movs r1, 0xFF strb r1, [r0] -_081CEBC6: +@081CEBC6: mov r0, r8 mov r1, r10 bl sub_81D32B0 @@ -894721,12 +894721,12 @@ _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 cmp r0, 0x1 - bne _081CEC28 + bne @081CEC28 ldr r1, =0x000028dc adds r0, r5, r1 ldr r0, [r0] @@ -894739,12 +894739,12 @@ sub_81CEBF4: @ 81CEBF4 bl gpu_pal_free_tag movs r0, 0x69 bl gpu_pal_free_tag - b _081CEC68 + b @081CEC68 .align 2, 0 .pool -_081CEC28: +@081CEC28: movs r4, 0 -_081CEC2A: +@081CEC2A: ldr r1, =0x00001806 adds r0, r5, r1 adds r0, r4 @@ -894759,7 +894759,7 @@ _081CEC2A: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x6 - bls _081CEC2A + bls @081CEC2A movs r0, 0x65 bl gpu_tile_obj_free_by_tag movs r0, 0x66 @@ -894770,12 +894770,12 @@ _081CEC2A: bl gpu_pal_free_tag movs r0, 0x66 bl gpu_pal_free_tag -_081CEC68: +@081CEC68: ldr r0, =0x00001816 adds r1, r5, r0 ldrb r0, [r1] cmp r0, 0xFF - beq _081CEC8E + beq @081CEC8E adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -894787,7 +894787,7 @@ _081CEC68: bl gpu_tile_obj_free_by_tag movs r0, 0x64 bl gpu_pal_free_tag -_081CEC8E: +@081CEC8E: pop {r4,r5} pop {r0} bx r0 @@ -894796,7 +894796,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 @@ -894808,7 +894808,7 @@ sub_81CECA0: @ 81CECA0 bl Window_Remove bl sub_81CDD5C cmp r0, 0x1 - bne _081CECEC + bne @081CECEC ldr r1, =0x00001821 adds r0, r4, r1 ldrb r0, [r0] @@ -894821,12 +894821,12 @@ sub_81CECA0: @ 81CECA0 adds r0, r4, r1 ldrb r0, [r0] bl Window_Remove - b _081CECF0 + b @081CECF0 .align 2, 0 .pool -_081CECEC: +@081CECEC: bl sub_81C7FDC -_081CECF0: +@081CECF0: movs r1, 0x8A lsls r1, 5 movs r0, 0 @@ -894842,7 +894842,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 @@ -894860,7 +894860,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} @@ -894874,7 +894874,7 @@ sub_81CED30: @ 81CED30 add r7, r8 ldrb r0, [r7] cmp r0, 0xFF - bne _081CEDFC + bne @081CEDFC add r5, sp, 0x18 add r4, sp, 0x20 adds r0, r5, 0 @@ -894908,17 +894908,17 @@ sub_81CED30: @ 81CED30 lsrs r0, 24 strb r0, [r7] cmp r0, 0x40 - bne _081CEDBC + bne @081CEDBC movs r0, 0x64 bl gpu_tile_obj_free_by_tag movs r0, 0x64 bl gpu_pal_free_tag movs r0, 0xFF strb r0, [r7] - b _081CEE26 + b @081CEE26 .align 2, 0 .pool -_081CEDBC: +@081CEDBC: strb r0, [r7] ldr r2, =0x02020630 ldrb r1, [r7] @@ -894942,10 +894942,10 @@ _081CEDBC: lsls r1, 1 adds r0, r1 strh r0, [r4] - b _081CEE26 + b @081CEE26 .align 2, 0 .pool -_081CEDFC: +@081CEDFC: adds r0, r6, 0 bl sub_81CDCB4 ldr r1, =0x0000181c @@ -894964,7 +894964,7 @@ _081CEDFC: ldrh r1, [r1] movs r2, 0x20 bl gpu_pal_apply -_081CEE26: +@081CEE26: add sp, 0x28 pop {r3} mov r8, r3 @@ -894976,7 +894976,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 @@ -894992,7 +894992,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} @@ -895000,24 +895000,24 @@ 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 - beq _081CEE84 + beq @081CEE84 movs r0, 0x2 bl gpu_sync_bg_show - b _081CEE8A -_081CEE84: + b @081CEE8A +@081CEE84: movs r0, 0x2 bl gpu_sync_bg_hide -_081CEE8A: +@081CEE8A: pop {r0} bx r0 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 @@ -895045,13 +895045,13 @@ 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 bl sub_81CDD5C cmp r0, 0 - bne _081CEEF0 + bne @081CEEF0 bl sub_81CDC60 adds r4, r0, 0 lsls r4, 16 @@ -895061,8 +895061,8 @@ sub_81CEEC8: @ 81CEEC8 lsrs r0, 16 subs r0, 0x1 cmp r4, r0 - beq _081CEF0C -_081CEEF0: + beq @081CEF0C +@081CEEF0: bl sub_81CDC84 lsls r0, 24 asrs r0, 24 @@ -895075,28 +895075,28 @@ _081CEEF0: adds r2, 0x50 adds r0, r5, 0 bl sub_81D1F84 -_081CEF0C: +@081CEF0C: pop {r4,r5} pop {r0} bx r0 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 adds r4, r0, 0 bl sub_81CDD5C cmp r0, 0x1 - beq _081CEF2A + beq @081CEF2A movs r0, 0 - b _081CEF30 -_081CEF2A: + b @081CEF30 +@081CEF2A: ldr r1, =0x00001828 adds r0, r4, r1 ldrb r0, [r0] -_081CEF30: +@081CEF30: pop {r4} pop {r1} bx r1 @@ -895105,20 +895105,20 @@ _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 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq _081CEF90 + beq @081CEF90 ldr r1, =0x000006ac movs r0, 0x12 bl sub_81C761C str r0, [r4, 0x20] cmp r0, 0 - beq _081CEF90 + beq @081CEF90 ldr r0, =sub_81CF010 + 1 str r0, [r4] ldr r0, =sub_81CF11C + 1 @@ -895134,26 +895134,26 @@ sub_81CEF3C: @ 81CEF3C ldr r0, [r0] str r0, [r4, 0x14] movs r0, 0x1 - b _081CEF92 + b @081CEF92 .align 2, 0 .pool -_081CEF90: +@081CEF90: movs r0, 0 -_081CEF92: +@081CEF92: pop {r4} pop {r1} bx r1 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 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq _081CEFD4 + beq @081CEFD4 movs r0, 0x12 bl sub_81C763C str r0, [r4, 0x20] @@ -895168,19 +895168,19 @@ sub_81CEF98: @ 81CEF98 ldr r0, [r0] str r0, [r4, 0x14] movs r0, 0x1 - b _081CEFD6 + b @081CEFD6 .align 2, 0 .pool -_081CEFD4: +@081CEFD4: movs r0, 0 -_081CEFD6: +@081CEFD6: pop {r4} pop {r1} bx r1 thumb_func_end sub_81CEF98 thumb_func_start sub_81CEFDC -sub_81CEFDC: @ 81CEFDC +sub_81CEFDC: ; 81CEFDC push {lr} movs r0, 0x7 bl sub_81C763C @@ -895191,16 +895191,16 @@ 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 ldr r0, [r0, 0x1C] cmp r0, 0 - bne _081CF004 + bne @081CF004 movs r0, 0x12 bl sub_81C7650 -_081CF004: +@081CF004: movs r0, 0x7 bl sub_81C7650 pop {r0} @@ -895208,16 +895208,16 @@ _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] bl sub_81C70D8 cmp r0, 0 - bne _081CF022 + bne @081CF022 ldr r0, =sub_81CF030 + 1 str r0, [r4] -_081CF022: +@081CF022: movs r0, 0 pop {r4} pop {r1} @@ -895227,7 +895227,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 @@ -895235,56 +895235,56 @@ sub_81CF030: @ 81CF030 movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _081CF048 + beq @081CF048 movs r0, 0x1 - b _081CF0A6 + b @081CF0A6 .align 2, 0 .pool -_081CF048: +@081CF048: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081CF054 + beq @081CF054 movs r0, 0x2 - b _081CF0A6 -_081CF054: + b @081CF0A6 +@081CF054: ldrh r1, [r2, 0x2E] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _081CF062 + beq @081CF062 movs r0, 0x3 - b _081CF0A6 -_081CF062: + b @081CF0A6 +@081CF062: movs r0, 0x10 ands r0, r1 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0 - beq _081CF072 + beq @081CF072 movs r0, 0x4 - b _081CF0A6 -_081CF072: + b @081CF0A6 +@081CF072: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081CF088 + beq @081CF088 str r2, [r4, 0x1C] ldr r0, =sub_81CF0B0 + 1 str r0, [r4] movs r0, 0x5 - b _081CF0A6 + b @081CF0A6 .align 2, 0 .pool -_081CF088: +@081CF088: movs r5, 0x1 adds r0, r5, 0 ands r0, r1 cmp r0, 0 - bne _081CF096 + bne @081CF096 movs r0, 0 - b _081CF0A6 -_081CF096: + b @081CF0A6 +@081CF096: bl sub_81C875C ldr r1, [r4, 0x20] strh r0, [r1, 0x2] @@ -895292,7 +895292,7 @@ _081CF096: ldr r0, =sub_81CF0B8 + 1 str r0, [r4] movs r0, 0x6 -_081CF0A6: +@081CF0A6: pop {r4,r5} pop {r1} bx r1 @@ -895301,7 +895301,7 @@ _081CF0A6: thumb_func_end sub_81CF030 thumb_func_start sub_81CF0B0 -sub_81CF0B0: @ 81CF0B0 +sub_81CF0B0: ; 81CF0B0 ldr r0, =0x000186a3 bx lr .align 2, 0 @@ -895309,7 +895309,7 @@ sub_81CF0B0: @ 81CF0B0 thumb_func_end sub_81CF0B0 thumb_func_start sub_81CF0B8 -sub_81CF0B8: @ 81CF0B8 +sub_81CF0B8: ; 81CF0B8 ldr r0, =0x000186a9 bx lr .align 2, 0 @@ -895317,7 +895317,7 @@ sub_81CF0B8: @ 81CF0B8 thumb_func_end sub_81CF0B8 thumb_func_start sub_81CF0C0 -sub_81CF0C0: @ 81CF0C0 +sub_81CF0C0: ; 81CF0C0 push {lr} movs r0, 0x7 bl sub_81C763C @@ -895327,7 +895327,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 @@ -895338,7 +895338,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 @@ -895349,7 +895349,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 @@ -895365,7 +895365,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 @@ -895376,7 +895376,7 @@ sub_81CF10C: @ 81CF10C thumb_func_end sub_81CF10C thumb_func_start sub_81CF11C -sub_81CF11C: @ 81CF11C +sub_81CF11C: ; 81CF11C push {lr} ldr r2, =0x086233b4 lsls r1, r0, 2 @@ -895390,7 +895390,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 @@ -895408,7 +895408,7 @@ sub_81CF134: @ 81CF134 orrs r0, r1 str r0, [sp] movs r5, 0 -_081CF158: +@081CF158: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -895418,12 +895418,12 @@ _081CF158: movs r1, 0x5 bl pokemon_getattr cmp r0, 0 - beq _081CF1AA + beq @081CF1AA adds r0, r4, 0 movs r1, 0x6 bl pokemon_getattr cmp r0, 0 - bne _081CF1A4 + bne @081CF1A4 lsls r1, r5, 24 lsrs r1, 16 ldr r2, =0xffff00ff @@ -895443,11 +895443,11 @@ _081CF158: adds r0, r6, 0 mov r1, sp bl sub_81CF2C4 -_081CF1A4: +@081CF1A4: adds r5, 0x1 cmp r5, 0x5 - ble _081CF158 -_081CF1AA: + ble @081CF158 +@081CF1AA: movs r0, 0x1 add sp, 0x4 pop {r4-r6} @@ -895458,7 +895458,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 @@ -895471,7 +895471,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} @@ -895484,18 +895484,18 @@ sub_81CF1D8: @ 81CF1D8 movs r0, 0 mov r8, r0 cmp r5, 0xD - bgt _081CF268 -_081CF1F4: + bgt @081CF268 +@081CF1F4: cmp r4, 0x1D - bgt _081CF260 + bgt @081CF260 lsls r0, r5, 24 lsrs r7, r0, 24 -_081CF1FC: +@081CF1FC: adds r0, r5, 0 adds r1, r4, 0 bl sub_80D2270 cmp r0, 0 - beq _081CF23A + beq @081CF23A ldr r1, =0xffffff00 ldr r0, [sp] ands r0, r1 @@ -895519,30 +895519,30 @@ _081CF1FC: adds r0, r6, 0 mov r1, sp bl sub_81CF2C4 -_081CF23A: +@081CF23A: movs r0, 0x1 add r8, r0 adds r4, 0x1 mov r0, r8 cmp r0, 0xE - ble _081CF25C + ble @081CF25C str r5, [r6, 0xC] str r4, [r6, 0x10] movs r0, 0x3 - b _081CF26A + b @081CF26A .align 2, 0 .pool -_081CF25C: +@081CF25C: cmp r4, 0x1D - ble _081CF1FC -_081CF260: + ble @081CF1FC +@081CF260: movs r4, 0 adds r5, 0x1 cmp r5, 0xD - ble _081CF1F4 -_081CF268: + ble @081CF1F4 +@081CF268: movs r0, 0x1 -_081CF26A: +@081CF26A: add sp, 0x4 pop {r3} mov r8, r3 @@ -895552,7 +895552,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 @@ -895564,30 +895564,30 @@ sub_81CF278: @ 81CF278 strh r1, [r0, 0x6] movs r3, 0x1 cmp r3, r6 - bge _081CF2B8 -_081CF292: + bge @081CF2B8 +@081CF292: ldr r2, [r5, 0x20] lsls r0, r3, 2 adds r1, r2, r0 ldrh r0, [r1, 0x6] cmp r0, r4 - bne _081CF2AC + bne @081CF2AC subs r0, r3, 0x1 lsls r0, 2 adds r0, r2, r0 ldrh r0, [r0, 0x6] strh r0, [r1, 0x6] adds r0, r3, 0x1 - b _081CF2B2 -_081CF2AC: + b @081CF2B2 +@081CF2AC: adds r4, r0, 0 adds r0, r3, 0x1 strh r0, [r1, 0x6] -_081CF2B2: +@081CF2B2: adds r3, r0, 0 cmp r3, r6 - blt _081CF292 -_081CF2B8: + blt @081CF292 +@081CF2B8: movs r0, 0x1 str r0, [r5, 0x18] movs r0, 0x4 @@ -895597,7 +895597,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 @@ -895606,34 +895606,34 @@ sub_81CF2C4: @ 81CF2C4 ldrh r2, [r0] lsrs r3, r2, 1 cmp r2, r3 - beq _081CF2F4 + beq @081CF2F4 adds r6, r0, 0 ldrh r4, [r7, 0x2] -_081CF2DA: +@081CF2DA: lsls r0, r3, 2 adds r0, r6, r0 ldrh r0, [r0, 0x6] cmp r4, r0 - bls _081CF2E8 + bls @081CF2E8 adds r2, r3, 0 - b _081CF2EA -_081CF2E8: + b @081CF2EA +@081CF2E8: adds r1, r3, 0x1 -_081CF2EA: +@081CF2EA: subs r0, r2, r1 lsrs r0, 1 adds r3, r1, r0 cmp r2, r3 - bne _081CF2DA -_081CF2F4: + bne @081CF2DA +@081CF2F4: ldr r0, [r5, 0x20] ldrh r2, [r0] lsls r6, r3, 2 cmp r2, r3 - bls _081CF318 + bls @081CF318 lsls r0, r2, 2 subs r4, r0, 0x4 -_081CF302: +@081CF302: ldr r0, [r5, 0x20] lsls r1, r2, 2 adds r0, 0x4 @@ -895644,8 +895644,8 @@ _081CF302: subs r4, 0x4 subs r2, 0x1 cmp r2, r3 - bhi _081CF302 -_081CF318: + bhi @081CF302 +@081CF318: ldr r0, [r5, 0x20] adds r0, 0x4 adds r0, r6 @@ -895661,7 +895661,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 @@ -895669,7 +895669,7 @@ sub_81CF330: @ 81CF330 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq _081CF360 + beq @081CF360 ldr r0, =sub_81CF418 + 1 movs r1, 0x1 bl sub_81C7078 @@ -895679,19 +895679,19 @@ sub_81CF330: @ 81CF330 movs r0, 0 str r0, [r4, 0xC] movs r0, 0x1 - b _081CF362 + b @081CF362 .align 2, 0 .pool -_081CF360: +@081CF360: movs r0, 0 -_081CF362: +@081CF362: pop {r4} pop {r1} bx r1 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 @@ -895699,7 +895699,7 @@ sub_81CF368: @ 81CF368 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq _081CF398 + beq @081CF398 ldr r0, =sub_81CF418 + 1 movs r1, 0x1 bl sub_81C7078 @@ -895708,19 +895708,19 @@ sub_81CF368: @ 81CF368 str r0, [r4] movs r0, 0x1 str r0, [r4, 0xC] - b _081CF39A + b @081CF39A .align 2, 0 .pool -_081CF398: +@081CF398: movs r0, 0 -_081CF39A: +@081CF39A: pop {r4} pop {r1} bx r1 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 @@ -895743,7 +895743,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 @@ -895754,7 +895754,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 @@ -895765,7 +895765,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 @@ -895781,7 +895781,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 @@ -895789,25 +895789,25 @@ sub_81CF418: @ 81CF418 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x5 - bls _081CF42C - b _081CF56E -_081CF42C: + bls @081CF42C + b @081CF56E +@081CF42C: lsls r0, r4, 2 - ldr r1, =_081CF43C + ldr r1, =@081CF43C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081CF43C: - .4byte _081CF454 - .4byte _081CF4AC - .4byte _081CF4C0 - .4byte _081CF4E0 - .4byte _081CF4F6 - .4byte _081CF55A -_081CF454: +@081CF43C: + .4byte @081CF454 + .4byte @081CF4AC + .4byte @081CF4C0 + .4byte @081CF4E0 + .4byte @081CF4F6 + .4byte @081CF55A +@081CF454: ldr r0, =0x08623590 movs r1, 0x2 bl sub_81C7B54 @@ -895835,47 +895835,47 @@ _081CF454: bl sub_81C7944 movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram -_081CF498: +@081CF498: movs r0, 0 - b _081CF570 + b @081CF570 .align 2, 0 .pool -_081CF4AC: +@081CF4AC: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - bne _081CF56A + bne @081CF56A bl sub_81CF0C0 cmp r0, 0 - beq _081CF56A - b _081CF498 -_081CF4C0: + beq @081CF56A + b @081CF498 +@081CF4C0: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - bne _081CF56A + bne @081CF56A ldr r0, =0x08623570 movs r1, 0x20 movs r2, 0x20 bl sub_81C7944 bl sub_81CF88C - b _081CF498 + b @081CF498 .align 2, 0 .pool -_081CF4E0: +@081CF4E0: bl sub_81C8224 cmp r0, 0 - bne _081CF56A + bne @081CF56A adds r0, r5, 0 bl sub_81CF7C8 movs r0, 0x3 bl sub_81C7BA4 - b _081CF498 -_081CF4F6: + b @081CF498 +@081CF4F6: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - bne _081CF56A + bne @081CF56A movs r0, 0x1 movs r1, 0 movs r2, 0 @@ -895892,7 +895892,7 @@ _081CF4F6: bl gpu_sync_bg_hide ldr r0, [r5, 0xC] cmp r0, 0 - bne _081CF552 + bne @081CF552 bl sub_81C76AC adds r4, r0, 0 adds r4, 0x8 @@ -895908,23 +895908,23 @@ _081CF4F6: movs r1, 0x1 movs r2, 0 bl sub_81C7FA0 -_081CF552: +@081CF552: movs r0, 0x1 bl sub_81C7AC0 - b _081CF498 -_081CF55A: + b @081CF498 +@081CF55A: bl sub_81C7B34 cmp r0, 0 - bne _081CF56A + bne @081CF56A bl sub_81C8010 cmp r0, 0 - beq _081CF56E -_081CF56A: + beq @081CF56E +@081CF56A: movs r0, 0x2 - b _081CF570 -_081CF56E: + b @081CF570 +@081CF56E: movs r0, 0x4 -_081CF570: +@081CF570: add sp, 0x4 pop {r4,r5} pop {r1} @@ -895932,342 +895932,342 @@ _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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x1 - beq _081CF5C6 + beq @081CF5C6 cmp r4, 0x1 - bgt _081CF592 + bgt @081CF592 cmp r4, 0 - beq _081CF59C - b _081CF5E6 -_081CF592: + beq @081CF59C + b @081CF5E6 +@081CF592: cmp r4, 0x2 - beq _081CF5CE + beq @081CF5CE cmp r4, 0x3 - beq _081CF5D8 - b _081CF5E6 -_081CF59C: + beq @081CF5D8 + b @081CF5E6 +@081CF59C: bl sub_81C8658 cmp r0, 0x1 - beq _081CF5B4 + beq @081CF5B4 cmp r0, 0x1 - bgt _081CF5AE + bgt @081CF5AE cmp r0, 0 - beq _081CF5E6 - b _081CF5D4 -_081CF5AE: + beq @081CF5E6 + b @081CF5D4 +@081CF5AE: cmp r0, 0x2 - beq _081CF5BE - b _081CF5D4 -_081CF5B4: + beq @081CF5BE + b @081CF5D4 +@081CF5B4: movs r0, 0x5 bl audio_play movs r0, 0x7 - b _081CF5E8 -_081CF5BE: + b @081CF5E8 +@081CF5BE: movs r0, 0x5 bl audio_play - b _081CF5D4 -_081CF5C6: + b @081CF5D4 +@081CF5C6: bl sub_81C8630 cmp r0, 0 - bne _081CF5E2 -_081CF5CE: + bne @081CF5E2 +@081CF5CE: adds r0, r5, 0 bl sub_81CF7F4 -_081CF5D4: +@081CF5D4: movs r0, 0 - b _081CF5E8 -_081CF5D8: + b @081CF5E8 +@081CF5D8: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _081CF5E6 -_081CF5E2: + beq @081CF5E6 +@081CF5E2: movs r0, 0x2 - b _081CF5E8 -_081CF5E6: + b @081CF5E8 +@081CF5E6: movs r0, 0x4 -_081CF5E8: +@081CF5E8: pop {r4,r5} pop {r1} bx r1 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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x1 - beq _081CF63E + beq @081CF63E cmp r4, 0x1 - bgt _081CF60A + bgt @081CF60A cmp r4, 0 - beq _081CF614 - b _081CF65E -_081CF60A: + beq @081CF614 + b @081CF65E +@081CF60A: cmp r4, 0x2 - beq _081CF646 + beq @081CF646 cmp r4, 0x3 - beq _081CF650 - b _081CF65E -_081CF614: + beq @081CF650 + b @081CF65E +@081CF614: bl sub_81C868C cmp r0, 0x1 - beq _081CF62C + beq @081CF62C cmp r0, 0x1 - bgt _081CF626 + bgt @081CF626 cmp r0, 0 - beq _081CF65E - b _081CF64C -_081CF626: + beq @081CF65E + b @081CF64C +@081CF626: cmp r0, 0x2 - beq _081CF636 - b _081CF64C -_081CF62C: + beq @081CF636 + b @081CF64C +@081CF62C: movs r0, 0x5 bl audio_play movs r0, 0x7 - b _081CF660 -_081CF636: + b @081CF660 +@081CF636: movs r0, 0x5 bl audio_play - b _081CF64C -_081CF63E: + b @081CF64C +@081CF63E: bl sub_81C8630 cmp r0, 0 - bne _081CF65A -_081CF646: + bne @081CF65A +@081CF646: adds r0, r5, 0 bl sub_81CF7F4 -_081CF64C: +@081CF64C: movs r0, 0 - b _081CF660 -_081CF650: + b @081CF660 +@081CF650: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _081CF65E -_081CF65A: + beq @081CF65E +@081CF65A: movs r0, 0x2 - b _081CF660 -_081CF65E: + b @081CF660 +@081CF65E: movs r0, 0x4 -_081CF660: +@081CF660: pop {r4,r5} pop {r1} bx r1 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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x1 - beq _081CF6B6 + beq @081CF6B6 cmp r4, 0x1 - bgt _081CF682 + bgt @081CF682 cmp r4, 0 - beq _081CF68C - b _081CF6D6 -_081CF682: + beq @081CF68C + b @081CF6D6 +@081CF682: cmp r4, 0x2 - beq _081CF6BE + beq @081CF6BE cmp r4, 0x3 - beq _081CF6C8 - b _081CF6D6 -_081CF68C: + beq @081CF6C8 + b @081CF6D6 +@081CF68C: bl sub_81C86CC cmp r0, 0x1 - beq _081CF6A4 + beq @081CF6A4 cmp r0, 0x1 - bgt _081CF69E + bgt @081CF69E cmp r0, 0 - beq _081CF6D6 - b _081CF6C4 -_081CF69E: + beq @081CF6D6 + b @081CF6C4 +@081CF69E: cmp r0, 0x2 - beq _081CF6AE - b _081CF6C4 -_081CF6A4: + beq @081CF6AE + b @081CF6C4 +@081CF6A4: movs r0, 0x5 bl audio_play movs r0, 0x7 - b _081CF6D8 -_081CF6AE: + b @081CF6D8 +@081CF6AE: movs r0, 0x5 bl audio_play - b _081CF6C4 -_081CF6B6: + b @081CF6C4 +@081CF6B6: bl sub_81C8630 cmp r0, 0 - bne _081CF6D2 -_081CF6BE: + bne @081CF6D2 +@081CF6BE: adds r0, r5, 0 bl sub_81CF7F4 -_081CF6C4: +@081CF6C4: movs r0, 0 - b _081CF6D8 -_081CF6C8: + b @081CF6D8 +@081CF6C8: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _081CF6D6 -_081CF6D2: + beq @081CF6D6 +@081CF6D2: movs r0, 0x2 - b _081CF6D8 -_081CF6D6: + b @081CF6D8 +@081CF6D6: movs r0, 0x4 -_081CF6D8: +@081CF6D8: pop {r4,r5} pop {r1} bx r1 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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x1 - beq _081CF72E + beq @081CF72E cmp r4, 0x1 - bgt _081CF6FA + bgt @081CF6FA cmp r4, 0 - beq _081CF704 - b _081CF74E -_081CF6FA: + beq @081CF704 + b @081CF74E +@081CF6FA: cmp r4, 0x2 - beq _081CF736 + beq @081CF736 cmp r4, 0x3 - beq _081CF740 - b _081CF74E -_081CF704: + beq @081CF740 + b @081CF74E +@081CF704: bl sub_81C870C cmp r0, 0x1 - beq _081CF71C + beq @081CF71C cmp r0, 0x1 - bgt _081CF716 + bgt @081CF716 cmp r0, 0 - beq _081CF74E - b _081CF73C -_081CF716: + beq @081CF74E + b @081CF73C +@081CF716: cmp r0, 0x2 - beq _081CF726 - b _081CF73C -_081CF71C: + beq @081CF726 + b @081CF73C +@081CF71C: movs r0, 0x5 bl audio_play movs r0, 0x7 - b _081CF750 -_081CF726: + b @081CF750 +@081CF726: movs r0, 0x5 bl audio_play - b _081CF73C -_081CF72E: + b @081CF73C +@081CF72E: bl sub_81C8630 cmp r0, 0 - bne _081CF74A -_081CF736: + bne @081CF74A +@081CF736: adds r0, r5, 0 bl sub_81CF7F4 -_081CF73C: +@081CF73C: movs r0, 0 - b _081CF750 -_081CF740: + b @081CF750 +@081CF740: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _081CF74E -_081CF74A: + beq @081CF74E +@081CF74A: movs r0, 0x2 - b _081CF750 -_081CF74E: + b @081CF750 +@081CF74E: movs r0, 0x4 -_081CF750: +@081CF750: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_81CF6E0 thumb_func_start sub_81CF758 -sub_81CF758: @ 81CF758 +sub_81CF758: ; 81CF758 push {lr} cmp r0, 0 - beq _081CF764 + beq @081CF764 cmp r0, 0x1 - beq _081CF778 - b _081CF790 -_081CF764: + beq @081CF778 + b @081CF790 +@081CF764: movs r0, 0x5 bl audio_play movs r0, 0 bl sub_81C7AC0 bl sub_81C78A0 movs r0, 0 - b _081CF792 -_081CF778: + b @081CF792 +@081CF778: bl sub_81C7B34 cmp r0, 0 - bne _081CF788 + bne @081CF788 bl sub_81C78C0 cmp r0, 0 - beq _081CF78C -_081CF788: + beq @081CF78C +@081CF788: movs r0, 0x2 - b _081CF792 -_081CF78C: + b @081CF792 +@081CF78C: bl sub_81C7FDC -_081CF790: +@081CF790: movs r0, 0x4 -_081CF792: +@081CF792: pop {r1} bx r1 thumb_func_end sub_81CF758 thumb_func_start sub_81CF798 -sub_81CF798: @ 81CF798 +sub_81CF798: ; 81CF798 push {lr} cmp r0, 0 - beq _081CF7A4 + beq @081CF7A4 cmp r0, 0x1 - beq _081CF7B4 - b _081CF7C0 -_081CF7A4: + beq @081CF7B4 + b @081CF7C0 +@081CF7A4: movs r0, 0x5 bl audio_play movs r0, 0 bl sub_81C7AC0 movs r0, 0 - b _081CF7C2 -_081CF7B4: + b @081CF7C2 +@081CF7B4: bl sub_81C7B34 cmp r0, 0 - beq _081CF7C0 + beq @081CF7C0 movs r0, 0x2 - b _081CF7C2 -_081CF7C0: + b @081CF7C2 +@081CF7C0: movs r0, 0x4 -_081CF7C2: +@081CF7C2: pop {r1} bx r1 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, =0x086235b4 @@ -896289,7 +896289,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 @@ -896357,7 +896357,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 @@ -896399,13 +896399,13 @@ 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 ldrb r0, [r2] cmp r0, 0xE - bne _081CF924 + bne @081CF924 ldrb r1, [r2, 0x1] movs r0, 0x64 adds r4, r1, 0 @@ -896424,10 +896424,10 @@ sub_81CF8E4: @ 81CF8E4 adds r0, r4, 0 movs r1, 0x2 bl pokemon_getattr - b _081CF94A + b @081CF94A .align 2, 0 .pool -_081CF924: +@081CF924: ldrb r0, [r2] ldrb r1, [r2, 0x1] bl get_pokemon_by_box_and_pos @@ -896443,7 +896443,7 @@ _081CF924: adds r0, r4, 0 movs r1, 0x2 bl pokemon_getattr_encrypted -_081CF94A: +@081CF94A: ldr r4, =0x02021ec4 adds r0, r4, 0 bl get_end_of_string_ptr_limit_10_chars @@ -896454,21 +896454,21 @@ _081CF94A: bl sub_81DB494 adds r6, r0, 0 cmp r5, 0 - beq _081CF974 + beq @081CF974 cmp r5, 0xFE - beq _081CF97C + beq @081CF97C ldr r1, =0x086235d4 - b _081CF97E + b @081CF97E .align 2, 0 .pool -_081CF974: +@081CF974: ldr r1, =0x086235bc - b _081CF97E + b @081CF97E .align 2, 0 .pool -_081CF97C: +@081CF97C: ldr r1, =0x086235c8 -_081CF97E: +@081CF97E: ldr r4, =0x02021cc4 adds r0, r4, 0 bl gf_strcpy @@ -896498,20 +896498,20 @@ _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 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq _081CF9FC + beq @081CF9FC ldr r1, =0x000006ac movs r0, 0x12 bl sub_81C761C str r0, [r4, 0x1C] cmp r0, 0 - beq _081CF9FC + beq @081CF9FC ldr r0, =sub_81CFA68 + 1 str r0, [r4] ldr r0, =sub_81CFB74 + 1 @@ -896521,26 +896521,26 @@ sub_81CF9BC: @ 81CF9BC movs r0, 0 str r0, [r4, 0x14] movs r0, 0x1 - b _081CF9FE + b @081CF9FE .align 2, 0 .pool -_081CF9FC: +@081CF9FC: movs r0, 0 -_081CF9FE: +@081CF9FE: pop {r4} pop {r1} bx r1 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 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq _081CFA2C + beq @081CFA2C movs r0, 0x12 bl sub_81C763C str r0, [r4, 0x1C] @@ -896548,19 +896548,19 @@ sub_81CFA04: @ 81CFA04 str r0, [r4] movs r0, 0x1 str r0, [r4, 0x14] - b _081CFA2E + b @081CFA2E .align 2, 0 .pool -_081CFA2C: +@081CFA2C: movs r0, 0 -_081CFA2E: +@081CFA2E: pop {r4} pop {r1} bx r1 thumb_func_end sub_81CFA04 thumb_func_start sub_81CFA34 -sub_81CFA34: @ 81CFA34 +sub_81CFA34: ; 81CFA34 push {lr} movs r0, 0x9 bl sub_81C763C @@ -896571,16 +896571,16 @@ 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 ldr r0, [r0, 0x18] cmp r0, 0 - bne _081CFA5C + bne @081CFA5C movs r0, 0x12 bl sub_81C7650 -_081CFA5C: +@081CFA5C: movs r0, 0x9 bl sub_81C7650 pop {r0} @@ -896588,16 +896588,16 @@ _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] bl sub_81C70D8 cmp r0, 0 - bne _081CFA7A + bne @081CFA7A ldr r0, =sub_81CFA88 + 1 str r0, [r4] -_081CFA7A: +@081CFA7A: movs r0, 0 pop {r4} pop {r1} @@ -896607,7 +896607,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 @@ -896615,56 +896615,56 @@ sub_81CFA88: @ 81CFA88 movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _081CFAA0 + beq @081CFAA0 movs r0, 0x1 - b _081CFAFE + b @081CFAFE .align 2, 0 .pool -_081CFAA0: +@081CFAA0: movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081CFAAC + beq @081CFAAC movs r0, 0x2 - b _081CFAFE -_081CFAAC: + b @081CFAFE +@081CFAAC: ldrh r1, [r2, 0x2E] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _081CFABA + beq @081CFABA movs r0, 0x3 - b _081CFAFE -_081CFABA: + b @081CFAFE +@081CFABA: movs r0, 0x10 ands r0, r1 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0 - beq _081CFACA + beq @081CFACA movs r0, 0x4 - b _081CFAFE -_081CFACA: + b @081CFAFE +@081CFACA: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081CFAE0 + beq @081CFAE0 str r2, [r4, 0x18] ldr r0, =sub_81CFB08 + 1 str r0, [r4] movs r0, 0x5 - b _081CFAFE + b @081CFAFE .align 2, 0 .pool -_081CFAE0: +@081CFAE0: movs r5, 0x1 adds r0, r5, 0 ands r0, r1 cmp r0, 0 - bne _081CFAEE + bne @081CFAEE movs r0, 0 - b _081CFAFE -_081CFAEE: + b @081CFAFE +@081CFAEE: bl sub_81C875C ldr r1, [r4, 0x1C] strh r0, [r1, 0x2] @@ -896672,7 +896672,7 @@ _081CFAEE: ldr r0, =sub_81CFB10 + 1 str r0, [r4] movs r0, 0x6 -_081CFAFE: +@081CFAFE: pop {r4,r5} pop {r1} bx r1 @@ -896681,7 +896681,7 @@ _081CFAFE: thumb_func_end sub_81CFA88 thumb_func_start sub_81CFB08 -sub_81CFB08: @ 81CFB08 +sub_81CFB08: ; 81CFB08 ldr r0, =0x000186a5 bx lr .align 2, 0 @@ -896689,7 +896689,7 @@ sub_81CFB08: @ 81CFB08 thumb_func_end sub_81CFB08 thumb_func_start sub_81CFB10 -sub_81CFB10: @ 81CFB10 +sub_81CFB10: ; 81CFB10 ldr r0, =0x000186ad bx lr .align 2, 0 @@ -896697,7 +896697,7 @@ sub_81CFB10: @ 81CFB10 thumb_func_end sub_81CFB10 thumb_func_start sub_81CFB18 -sub_81CFB18: @ 81CFB18 +sub_81CFB18: ; 81CFB18 push {lr} movs r0, 0x9 bl sub_81C763C @@ -896707,7 +896707,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 @@ -896718,7 +896718,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 @@ -896729,7 +896729,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 @@ -896745,7 +896745,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 @@ -896756,7 +896756,7 @@ sub_81CFB64: @ 81CFB64 thumb_func_end sub_81CFB64 thumb_func_start sub_81CFB74 -sub_81CFB74: @ 81CFB74 +sub_81CFB74: ; 81CFB74 push {lr} ldr r2, =0x086235d8 lsls r1, r0, 2 @@ -896770,7 +896770,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 @@ -896788,7 +896788,7 @@ sub_81CFB8C: @ 81CFB8C orrs r0, r1 str r0, [sp] movs r5, 0 -_081CFBB0: +@081CFBB0: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -896798,23 +896798,23 @@ _081CFBB0: movs r1, 0x5 bl pokemon_getattr cmp r0, 0 - beq _081CFC10 + beq @081CFC10 adds r0, r4, 0 movs r1, 0x6 bl pokemon_getattr cmp r0, 0 - bne _081CFC0A + bne @081CFC0A adds r0, r4, 0 movs r1, 0x4 bl pokemon_getattr cmp r0, 0 - bne _081CFC0A + bne @081CFC0A adds r0, r4, 0 movs r1, 0x52 bl pokemon_getattr adds r3, r0, 0 cmp r3, 0 - beq _081CFC0A + beq @081CFC0A lsls r1, r5, 24 lsrs r1, 16 ldr r2, =0xffff00ff @@ -896829,11 +896829,11 @@ _081CFBB0: adds r0, r6, 0 mov r1, sp bl sub_81CFCEC -_081CFC0A: +@081CFC0A: adds r5, 0x1 cmp r5, 0x5 - ble _081CFBB0 -_081CFC10: + ble @081CFBB0 +@081CFC10: movs r0, 0x1 add sp, 0x4 pop {r4-r6} @@ -896844,7 +896844,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 @@ -896857,7 +896857,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 @@ -896871,14 +896871,14 @@ sub_81CFC40: @ 81CFC40 movs r0, 0 mov r9, r0 cmp r7, 0xD - bgt _081CFCD4 - b _081CFCC8 -_081CFC60: + bgt @081CFCD4 + b @081CFCC8 +@081CFC60: adds r0, r7, 0 adds r1, r6, 0 bl sub_80D2270 cmp r0, 0 - beq _081CFCA6 + beq @081CFCA6 lsls r0, r7, 24 lsrs r5, r0, 24 lsls r0, r6, 24 @@ -896889,7 +896889,7 @@ _081CFC60: bl get_pokemon_data_from_any_box adds r3, r0, 0 cmp r3, 0 - beq _081CFCA6 + beq @081CFCA6 ldr r1, =0xffffff00 ldr r0, [sp] ands r0, r1 @@ -896906,33 +896906,33 @@ _081CFC60: mov r0, r8 mov r1, sp bl sub_81CFCEC -_081CFCA6: +@081CFCA6: movs r1, 0x1 add r9, r1 adds r6, 0x1 mov r0, r9 cmp r0, 0xE - ble _081CFCC8 + ble @081CFCC8 mov r1, r8 str r7, [r1, 0xC] str r6, [r1, 0x10] movs r0, 0x3 - b _081CFCDC + b @081CFCDC .align 2, 0 .pool -_081CFCC8: +@081CFCC8: cmp r6, 0x1D - ble _081CFC60 + ble @081CFC60 movs r6, 0 adds r7, 0x1 cmp r7, 0xD - ble _081CFCC8 -_081CFCD4: + ble @081CFCC8 +@081CFCD4: movs r0, 0x1 mov r1, r8 str r0, [r1, 0x14] movs r0, 0x4 -_081CFCDC: +@081CFCDC: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -896943,7 +896943,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 @@ -896952,34 +896952,34 @@ sub_81CFCEC: @ 81CFCEC ldrh r2, [r0] lsrs r3, r2, 1 cmp r2, r3 - beq _081CFD1C + beq @081CFD1C adds r6, r0, 0 ldrh r4, [r7, 0x2] -_081CFD02: +@081CFD02: lsls r0, r3, 2 adds r0, r6, r0 ldrh r0, [r0, 0x6] cmp r4, r0 - bls _081CFD10 + bls @081CFD10 adds r2, r3, 0 - b _081CFD12 -_081CFD10: + b @081CFD12 +@081CFD10: adds r1, r3, 0x1 -_081CFD12: +@081CFD12: subs r0, r2, r1 lsrs r0, 1 adds r3, r1, r0 cmp r2, r3 - bne _081CFD02 -_081CFD1C: + bne @081CFD02 +@081CFD1C: ldr r0, [r5, 0x1C] ldrh r2, [r0] lsls r6, r3, 2 cmp r2, r3 - bls _081CFD40 + bls @081CFD40 lsls r0, r2, 2 subs r4, r0, 0x4 -_081CFD2A: +@081CFD2A: ldr r0, [r5, 0x1C] lsls r1, r2, 2 adds r0, 0x4 @@ -896990,8 +896990,8 @@ _081CFD2A: subs r4, 0x4 subs r2, 0x1 cmp r2, r3 - bhi _081CFD2A -_081CFD40: + bhi @081CFD2A +@081CFD40: ldr r0, [r5, 0x1C] adds r0, 0x4 adds r0, r6 @@ -897007,10 +897007,10 @@ _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: +@081CFD5C: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -897020,59 +897020,59 @@ _081CFD5C: movs r1, 0x5 bl pokemon_getattr cmp r0, 0 - beq _081CFD8A + beq @081CFD8A adds r0, r4, 0 movs r1, 0x6 bl pokemon_getattr cmp r0, 0 - bne _081CFD8A + bne @081CFD8A adds r0, r4, 0 movs r1, 0x53 bl pokemon_getattr cmp r0, 0 - bne _081CFDB2 -_081CFD8A: + bne @081CFDB2 +@081CFD8A: adds r5, 0x1 cmp r5, 0x5 - ble _081CFD5C + ble @081CFD5C movs r5, 0 -_081CFD92: +@081CFD92: movs r4, 0 lsls r6, r5, 24 -_081CFD96: +@081CFD96: adds r0, r5, 0 adds r1, r4, 0 bl sub_80D2270 cmp r0, 0 - beq _081CFDBC + beq @081CFDBC lsls r1, r4, 24 lsrs r1, 24 lsrs r0, r6, 24 movs r2, 0x53 bl get_pokemon_data_from_any_box cmp r0, 0 - beq _081CFDBC -_081CFDB2: + beq @081CFDBC +@081CFDB2: movs r0, 0x1 - b _081CFDCA + b @081CFDCA .align 2, 0 .pool -_081CFDBC: +@081CFDBC: adds r4, 0x1 cmp r4, 0x1D - ble _081CFD96 + ble @081CFD96 adds r5, 0x1 cmp r5, 0xD - ble _081CFD92 + ble @081CFD92 movs r0, 0 -_081CFDCA: +@081CFDCA: pop {r4-r6} pop {r1} bx r1 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 @@ -897080,7 +897080,7 @@ sub_81CFDD0: @ 81CFDD0 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq _081CFE00 + beq @081CFE00 ldr r0, =sub_81CFEB8 + 1 movs r1, 0x1 bl sub_81C7078 @@ -897090,19 +897090,19 @@ sub_81CFDD0: @ 81CFDD0 movs r0, 0 str r0, [r4, 0xC] movs r0, 0x1 - b _081CFE02 + b @081CFE02 .align 2, 0 .pool -_081CFE00: +@081CFE00: movs r0, 0 -_081CFE02: +@081CFE02: pop {r4} pop {r1} bx r1 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 @@ -897110,7 +897110,7 @@ sub_81CFE08: @ 81CFE08 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq _081CFE38 + beq @081CFE38 ldr r0, =sub_81CFEB8 + 1 movs r1, 0x1 bl sub_81C7078 @@ -897119,19 +897119,19 @@ sub_81CFE08: @ 81CFE08 str r0, [r4] movs r0, 0x1 str r0, [r4, 0xC] - b _081CFE3A + b @081CFE3A .align 2, 0 .pool -_081CFE38: +@081CFE38: movs r0, 0 -_081CFE3A: +@081CFE3A: pop {r4} pop {r1} bx r1 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 @@ -897154,7 +897154,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 @@ -897165,7 +897165,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 @@ -897176,7 +897176,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 @@ -897192,7 +897192,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 @@ -897200,25 +897200,25 @@ sub_81CFEB8: @ 81CFEB8 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x5 - bls _081CFECC - b _081CFFF2 -_081CFECC: + bls @081CFECC + b @081CFFF2 +@081CFECC: lsls r0, r4, 2 - ldr r1, =_081CFEDC + ldr r1, =@081CFEDC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081CFEDC: - .4byte _081CFEF4 - .4byte _081CFF48 - .4byte _081CFF76 - .4byte _081CFF94 - .4byte _081CFFA4 - .4byte _081CFFDE -_081CFEF4: +@081CFEDC: + .4byte @081CFEF4 + .4byte @081CFF48 + .4byte @081CFF76 + .4byte @081CFF94 + .4byte @081CFFA4 + .4byte @081CFFDE +@081CFEF4: ldr r0, =0x086237b0 movs r1, 0x2 bl sub_81C7B54 @@ -897244,19 +897244,19 @@ _081CFEF4: bl sub_81C7944 movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram -_081CFF32: +@081CFF32: movs r0, 0 - b _081CFFF4 + b @081CFFF4 .align 2, 0 .pool -_081CFF48: +@081CFF48: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - bne _081CFFEE + bne @081CFFEE bl sub_81CFB18 cmp r0, 0 - beq _081CFFEE + beq @081CFFEE movs r0, 0x1 movs r1, 0 movs r2, 0 @@ -897267,32 +897267,32 @@ _081CFF48: bl bg_change_y_offset movs r0, 0x1 bl gpu_sync_bg_show - b _081CFF32 -_081CFF76: + b @081CFF32 +@081CFF76: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - bne _081CFFEE + bne @081CFFEE ldr r0, =0x08623790 movs r1, 0x20 movs r2, 0x20 bl sub_81C7944 bl sub_81D0304 - b _081CFF32 + b @081CFF32 .align 2, 0 .pool -_081CFF94: +@081CFF94: bl sub_81C8224 cmp r0, 0 - bne _081CFFEE + bne @081CFFEE adds r0, r5, 0 bl sub_81D024C - b _081CFF32 -_081CFFA4: + b @081CFF32 +@081CFFA4: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - bne _081CFFEE + bne @081CFFEE movs r0, 0x2 bl gpu_sync_bg_show movs r0, 0x3 @@ -897303,27 +897303,27 @@ _081CFFA4: bl sub_81C7AC0 ldr r0, [r5, 0xC] cmp r0, 0 - bne _081CFF32 + bne @081CFF32 movs r0, 0x2 bl sub_81C7DFC movs r0, 0x2 movs r1, 0x1 movs r2, 0 bl sub_81C7FA0 - b _081CFF32 -_081CFFDE: + b @081CFF32 +@081CFFDE: bl sub_81C7B34 cmp r0, 0 - bne _081CFFEE + bne @081CFFEE bl sub_81C8010 cmp r0, 0 - beq _081CFFF2 -_081CFFEE: + beq @081CFFF2 +@081CFFEE: movs r0, 0x2 - b _081CFFF4 -_081CFFF2: + b @081CFFF4 +@081CFFF2: movs r0, 0x4 -_081CFFF4: +@081CFFF4: add sp, 0x4 pop {r4,r5} pop {r1} @@ -897331,342 +897331,342 @@ _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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x1 - beq _081D004A + beq @081D004A cmp r4, 0x1 - bgt _081D0016 + bgt @081D0016 cmp r4, 0 - beq _081D0020 - b _081D006A -_081D0016: + beq @081D0020 + b @081D006A +@081D0016: cmp r4, 0x2 - beq _081D0052 + beq @081D0052 cmp r4, 0x3 - beq _081D005C - b _081D006A -_081D0020: + beq @081D005C + b @081D006A +@081D0020: bl sub_81C8658 cmp r0, 0x1 - beq _081D0038 + beq @081D0038 cmp r0, 0x1 - bgt _081D0032 + bgt @081D0032 cmp r0, 0 - beq _081D006A - b _081D0058 -_081D0032: + beq @081D006A + b @081D0058 +@081D0032: cmp r0, 0x2 - beq _081D0042 - b _081D0058 -_081D0038: + beq @081D0042 + b @081D0058 +@081D0038: movs r0, 0x5 bl audio_play movs r0, 0x7 - b _081D006C -_081D0042: + b @081D006C +@081D0042: movs r0, 0x5 bl audio_play - b _081D0058 -_081D004A: + b @081D0058 +@081D004A: bl sub_81C8630 cmp r0, 0 - bne _081D0066 -_081D0052: + bne @081D0066 +@081D0052: adds r0, r5, 0 bl sub_81D0288 -_081D0058: +@081D0058: movs r0, 0 - b _081D006C -_081D005C: + b @081D006C +@081D005C: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _081D006A -_081D0066: + beq @081D006A +@081D0066: movs r0, 0x2 - b _081D006C -_081D006A: + b @081D006C +@081D006A: movs r0, 0x4 -_081D006C: +@081D006C: pop {r4,r5} pop {r1} bx r1 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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x1 - beq _081D00C2 + beq @081D00C2 cmp r4, 0x1 - bgt _081D008E + bgt @081D008E cmp r4, 0 - beq _081D0098 - b _081D00E2 -_081D008E: + beq @081D0098 + b @081D00E2 +@081D008E: cmp r4, 0x2 - beq _081D00CA + beq @081D00CA cmp r4, 0x3 - beq _081D00D4 - b _081D00E2 -_081D0098: + beq @081D00D4 + b @081D00E2 +@081D0098: bl sub_81C868C cmp r0, 0x1 - beq _081D00B0 + beq @081D00B0 cmp r0, 0x1 - bgt _081D00AA + bgt @081D00AA cmp r0, 0 - beq _081D00E2 - b _081D00D0 -_081D00AA: + beq @081D00E2 + b @081D00D0 +@081D00AA: cmp r0, 0x2 - beq _081D00BA - b _081D00D0 -_081D00B0: + beq @081D00BA + b @081D00D0 +@081D00B0: movs r0, 0x5 bl audio_play movs r0, 0x7 - b _081D00E4 -_081D00BA: + b @081D00E4 +@081D00BA: movs r0, 0x5 bl audio_play - b _081D00D0 -_081D00C2: + b @081D00D0 +@081D00C2: bl sub_81C8630 cmp r0, 0 - bne _081D00DE -_081D00CA: + bne @081D00DE +@081D00CA: adds r0, r5, 0 bl sub_81D0288 -_081D00D0: +@081D00D0: movs r0, 0 - b _081D00E4 -_081D00D4: + b @081D00E4 +@081D00D4: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _081D00E2 -_081D00DE: + beq @081D00E2 +@081D00DE: movs r0, 0x2 - b _081D00E4 -_081D00E2: + b @081D00E4 +@081D00E2: movs r0, 0x4 -_081D00E4: +@081D00E4: pop {r4,r5} pop {r1} bx r1 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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x1 - beq _081D013A + beq @081D013A cmp r4, 0x1 - bgt _081D0106 + bgt @081D0106 cmp r4, 0 - beq _081D0110 - b _081D015A -_081D0106: + beq @081D0110 + b @081D015A +@081D0106: cmp r4, 0x2 - beq _081D0142 + beq @081D0142 cmp r4, 0x3 - beq _081D014C - b _081D015A -_081D0110: + beq @081D014C + b @081D015A +@081D0110: bl sub_81C86CC cmp r0, 0x1 - beq _081D0128 + beq @081D0128 cmp r0, 0x1 - bgt _081D0122 + bgt @081D0122 cmp r0, 0 - beq _081D015A - b _081D0148 -_081D0122: + beq @081D015A + b @081D0148 +@081D0122: cmp r0, 0x2 - beq _081D0132 - b _081D0148 -_081D0128: + beq @081D0132 + b @081D0148 +@081D0128: movs r0, 0x5 bl audio_play movs r0, 0x7 - b _081D015C -_081D0132: + b @081D015C +@081D0132: movs r0, 0x5 bl audio_play - b _081D0148 -_081D013A: + b @081D0148 +@081D013A: bl sub_81C8630 cmp r0, 0 - bne _081D0156 -_081D0142: + bne @081D0156 +@081D0142: adds r0, r5, 0 bl sub_81D0288 -_081D0148: +@081D0148: movs r0, 0 - b _081D015C -_081D014C: + b @081D015C +@081D014C: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _081D015A -_081D0156: + beq @081D015A +@081D0156: movs r0, 0x2 - b _081D015C -_081D015A: + b @081D015C +@081D015A: movs r0, 0x4 -_081D015C: +@081D015C: pop {r4,r5} pop {r1} bx r1 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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x1 - beq _081D01B2 + beq @081D01B2 cmp r4, 0x1 - bgt _081D017E + bgt @081D017E cmp r4, 0 - beq _081D0188 - b _081D01D2 -_081D017E: + beq @081D0188 + b @081D01D2 +@081D017E: cmp r4, 0x2 - beq _081D01BA + beq @081D01BA cmp r4, 0x3 - beq _081D01C4 - b _081D01D2 -_081D0188: + beq @081D01C4 + b @081D01D2 +@081D0188: bl sub_81C870C cmp r0, 0x1 - beq _081D01A0 + beq @081D01A0 cmp r0, 0x1 - bgt _081D019A + bgt @081D019A cmp r0, 0 - beq _081D01D2 - b _081D01C0 -_081D019A: + beq @081D01D2 + b @081D01C0 +@081D019A: cmp r0, 0x2 - beq _081D01AA - b _081D01C0 -_081D01A0: + beq @081D01AA + b @081D01C0 +@081D01A0: movs r0, 0x5 bl audio_play movs r0, 0x7 - b _081D01D4 -_081D01AA: + b @081D01D4 +@081D01AA: movs r0, 0x5 bl audio_play - b _081D01C0 -_081D01B2: + b @081D01C0 +@081D01B2: bl sub_81C8630 cmp r0, 0 - bne _081D01CE -_081D01BA: + bne @081D01CE +@081D01BA: adds r0, r5, 0 bl sub_81D0288 -_081D01C0: +@081D01C0: movs r0, 0 - b _081D01D4 -_081D01C4: + b @081D01D4 +@081D01C4: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _081D01D2 -_081D01CE: + beq @081D01D2 +@081D01CE: movs r0, 0x2 - b _081D01D4 -_081D01D2: + b @081D01D4 +@081D01D2: movs r0, 0x4 -_081D01D4: +@081D01D4: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_81D0164 thumb_func_start sub_81D01DC -sub_81D01DC: @ 81D01DC +sub_81D01DC: ; 81D01DC push {lr} cmp r0, 0 - beq _081D01E8 + beq @081D01E8 cmp r0, 0x1 - beq _081D01FC - b _081D0214 -_081D01E8: + beq @081D01FC + b @081D0214 +@081D01E8: movs r0, 0x5 bl audio_play movs r0, 0 bl sub_81C7AC0 bl sub_81C78A0 movs r0, 0 - b _081D0216 -_081D01FC: + b @081D0216 +@081D01FC: bl sub_81C7B34 cmp r0, 0 - bne _081D020C + bne @081D020C bl sub_81C78C0 cmp r0, 0 - beq _081D0210 -_081D020C: + beq @081D0210 +@081D020C: movs r0, 0x2 - b _081D0216 -_081D0210: + b @081D0216 +@081D0210: bl sub_81C7FDC -_081D0214: +@081D0214: movs r0, 0x4 -_081D0216: +@081D0216: pop {r1} bx r1 thumb_func_end sub_81D01DC thumb_func_start sub_81D021C -sub_81D021C: @ 81D021C +sub_81D021C: ; 81D021C push {lr} cmp r0, 0 - beq _081D0228 + beq @081D0228 cmp r0, 0x1 - beq _081D0238 - b _081D0244 -_081D0228: + beq @081D0238 + b @081D0244 +@081D0228: movs r0, 0x5 bl audio_play movs r0, 0 bl sub_81C7AC0 movs r0, 0 - b _081D0246 -_081D0238: + b @081D0246 +@081D0238: bl sub_81C7B34 cmp r0, 0 - beq _081D0244 + beq @081D0244 movs r0, 0x2 - b _081D0246 -_081D0244: + b @081D0246 +@081D0244: movs r0, 0x4 -_081D0246: +@081D0246: pop {r1} bx r1 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, =0x086237d4 @@ -897693,7 +897693,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 @@ -897713,7 +897713,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 @@ -897755,7 +897755,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 @@ -897797,7 +897797,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} @@ -897805,7 +897805,7 @@ sub_81D035C: @ 81D035C adds r7, r0, 0 ldrb r0, [r7] cmp r0, 0xE - bne _081D03A4 + bne @081D03A4 ldrb r1, [r7, 0x1] movs r0, 0x64 adds r4, r1, 0 @@ -897825,10 +897825,10 @@ sub_81D035C: @ 81D035C adds r0, r4, 0 movs r1, 0x2 bl pokemon_getattr - b _081D03CC + b @081D03CC .align 2, 0 .pool -_081D03A4: +@081D03A4: ldrb r0, [r7] ldrb r1, [r7, 0x1] bl get_pokemon_by_box_and_pos @@ -897845,7 +897845,7 @@ _081D03A4: adds r0, r4, 0 movs r1, 0x2 bl pokemon_getattr_encrypted -_081D03CC: +@081D03CC: ldr r4, =0x02021ec4 adds r0, r4, 0 bl get_end_of_string_ptr_limit_10_chars @@ -897856,21 +897856,21 @@ _081D03CC: bl sub_81DB494 adds r6, r0, 0 cmp r5, 0 - beq _081D03F8 + beq @081D03F8 cmp r5, 0xFE - beq _081D0400 + beq @081D0400 ldr r1, =0x086237f4 - b _081D0402 + b @081D0402 .align 2, 0 .pool -_081D03F8: +@081D03F8: ldr r1, =0x086237dc - b _081D0402 + b @081D0402 .align 2, 0 .pool -_081D0400: +@081D0400: ldr r1, =0x086237e8 -_081D0402: +@081D0402: ldr r4, =0x02021cc4 adds r0, r4, 0 bl gf_strcpy @@ -897907,19 +897907,19 @@ _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 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq _081D0498 + beq @081D0498 movs r0, 0x12 bl sub_81C763C str r0, [r4, 0x8] cmp r0, 0 - beq _081D0498 + beq @081D0498 adds r0, r4, 0 bl sub_81D0814 adds r1, r4, 0 @@ -897933,19 +897933,19 @@ sub_81D0450: @ 81D0450 movs r0, 0xA strh r0, [r1] movs r0, 0x1 - b _081D049A + b @081D049A .align 2, 0 .pool -_081D0498: +@081D0498: movs r0, 0 -_081D049A: +@081D049A: pop {r4} pop {r1} bx r1 thumb_func_end sub_81D0450 thumb_func_start sub_81D04A0 -sub_81D04A0: @ 81D04A0 +sub_81D04A0: ; 81D04A0 push {lr} movs r0, 0xD bl sub_81C763C @@ -897958,7 +897958,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 @@ -897967,7 +897967,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 @@ -897975,64 +897975,64 @@ sub_81D04C4: @ 81D04C4 movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _081D04E4 + beq @081D04E4 ldr r3, [r4, 0x8] ldrh r0, [r3, 0x2] cmp r0, 0 - beq _081D04E4 + beq @081D04E4 subs r0, 0x1 - b _081D04FC + b @081D04FC .align 2, 0 .pool -_081D04E4: +@081D04E4: ldrh r1, [r2, 0x30] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081D050C + beq @081D050C ldr r3, [r4, 0x8] ldrh r1, [r3, 0x2] ldrh r0, [r3] subs r0, 0x1 cmp r1, r0 - bge _081D050C + bge @081D050C adds r0, r1, 0x1 -_081D04FC: +@081D04FC: movs r1, 0 strh r0, [r3, 0x2] strh r1, [r4, 0xC] adds r0, r4, 0 bl sub_81D0814 movs r0, 0x1 - b _081D053E -_081D050C: + b @081D053E +@081D050C: ldrh r2, [r2, 0x2E] movs r0, 0x1 ands r0, r2 cmp r0, 0 - beq _081D0528 + beq @081D0528 adds r1, r4, 0 adds r1, 0x98 ldr r0, =sub_81D0548 + 1 str r0, [r1] movs r0, 0x2 - b _081D053E + b @081D053E .align 2, 0 .pool -_081D0528: +@081D0528: movs r0, 0x2 ands r0, r2 cmp r0, 0 - bne _081D0534 + bne @081D0534 movs r0, 0 - b _081D053E -_081D0534: + b @081D053E +@081D0534: adds r1, r4, 0 adds r1, 0x98 ldr r0, =sub_81D05D4 + 1 str r0, [r1] movs r0, 0x5 -_081D053E: +@081D053E: pop {r4} pop {r1} bx r1 @@ -898041,7 +898041,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 @@ -898049,67 +898049,67 @@ sub_81D0548: @ 81D0548 movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _081D0562 + beq @081D0562 adds r0, r4, 0 bl sub_81D05DC cmp r0, 0 - bne _081D05A4 -_081D0562: + bne @081D05A4 +@081D0562: ldr r0, =0x030022c0 ldrh r1, [r0, 0x30] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _081D0578 + beq @081D0578 adds r0, r4, 0 bl sub_81D061C cmp r0, 0 - bne _081D05A4 -_081D0578: + bne @081D05A4 +@081D0578: ldr r0, =0x030022c0 ldrh r1, [r0, 0x30] movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _081D058E + beq @081D058E adds r0, r4, 0 bl sub_81D0664 cmp r0, 0 - bne _081D05A4 -_081D058E: + bne @081D05A4 +@081D058E: ldr r0, =0x030022c0 ldrh r1, [r0, 0x30] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _081D05AC + beq @081D05AC adds r0, r4, 0 bl sub_81D0688 cmp r0, 0 - beq _081D05AC -_081D05A4: + beq @081D05AC +@081D05A4: movs r0, 0x3 - b _081D05CA + b @081D05CA .align 2, 0 .pool -_081D05AC: +@081D05AC: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _081D05C0 + bne @081D05C0 movs r0, 0 - b _081D05CA + b @081D05CA .align 2, 0 .pool -_081D05C0: +@081D05C0: adds r1, r4, 0 adds r1, 0x98 ldr r0, =sub_81D04C4 + 1 str r0, [r1] movs r0, 0x4 -_081D05CA: +@081D05CA: pop {r4} pop {r1} bx r1 @@ -898118,7 +898118,7 @@ _081D05CA: thumb_func_end sub_81D0548 thumb_func_start sub_81D05D4 -sub_81D05D4: @ 81D05D4 +sub_81D05D4: ; 81D05D4 ldr r0, =0x000186ae bx lr .align 2, 0 @@ -898126,22 +898126,22 @@ sub_81D05D4: @ 81D05D4 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] adds r2, r0, 0 cmp r2, 0x18 - bhi _081D05F0 + bhi @081D05F0 cmp r2, 0x8 - bls _081D0612 + bls @081D0612 subs r0, 0x9 - b _081D060C -_081D05F0: + b @081D060C +@081D05F0: ldrh r3, [r1, 0x10] adds r2, r3, 0 cmp r2, 0 - beq _081D0612 + beq @081D0612 ldrh r0, [r1, 0xC] subs r0, 0x1B ldrh r4, [r1, 0xE] @@ -898150,68 +898150,68 @@ _081D05F0: lsls r0, 16 lsrs r0, 16 cmp r0, r2 - bcc _081D060E + bcc @081D060E subs r0, r3, 0x1 -_081D060C: +@081D060C: strh r0, [r1, 0xC] -_081D060E: +@081D060E: movs r0, 0x1 - b _081D0614 -_081D0612: + b @081D0614 +@081D0612: movs r0, 0 -_081D0614: +@081D0614: pop {r4} pop {r1} bx r1 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] adds r1, r0, 0 cmp r1, 0x18 - bhi _081D065C + bhi @081D065C ldrh r3, [r2, 0xE] cmp r1, r3 - bcs _081D0640 + bcs @081D0640 adds r0, 0x9 strh r0, [r2, 0xC] ldrh r1, [r2, 0x10] lsls r0, 16 lsrs r0, 16 cmp r0, r1 - bcc _081D0658 + bcc @081D0658 subs r0, r1, 0x1 - b _081D0656 -_081D0640: + b @081D0656 +@081D0640: ldrh r0, [r2, 0x12] cmp r0, 0 - beq _081D065C + beq @081D065C ldrh r1, [r2, 0xC] ldrh r0, [r2, 0xE] subs r0, r1, r0 ldrh r1, [r2, 0x12] cmp r0, r1 - blt _081D0654 + blt @081D0654 subs r0, r1, 0x1 -_081D0654: +@081D0654: adds r0, 0x1B -_081D0656: +@081D0656: strh r0, [r2, 0xC] -_081D0658: +@081D0658: movs r0, 0x1 - b _081D065E -_081D065C: + b @081D065E +@081D065C: movs r0, 0 -_081D065E: +@081D065E: pop {r1} bx r1 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] @@ -898220,21 +898220,21 @@ sub_81D0664: @ 81D0664 bl __umodsi3 lsls r0, 16 cmp r0, 0 - bne _081D067C + bne @081D067C movs r0, 0 - b _081D0682 -_081D067C: + b @081D0682 +@081D067C: subs r0, r4, 0x1 strh r0, [r5, 0xC] movs r0, 0x1 -_081D0682: +@081D0682: pop {r4,r5} pop {r1} bx r1 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] @@ -898244,34 +898244,34 @@ sub_81D0688: @ 81D0688 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x7 - bgt _081D06BC + bgt @081D06BC cmp r4, 0x1A - bhi _081D06AC + bhi @081D06AC ldrh r0, [r5, 0x10] subs r0, 0x1 cmp r4, r0 - bge _081D06BC - b _081D06B4 -_081D06AC: + bge @081D06BC + b @081D06B4 +@081D06AC: ldrh r0, [r5, 0x12] subs r0, 0x1 cmp r1, r0 - bge _081D06BC -_081D06B4: + bge @081D06BC +@081D06B4: adds r0, r4, 0x1 strh r0, [r5, 0xC] movs r0, 0x1 - b _081D06BE -_081D06BC: + b @081D06BE +@081D06BC: movs r0, 0 -_081D06BE: +@081D06BE: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_81D0688 thumb_func_start sub_81D06C4 -sub_81D06C4: @ 81D06C4 +sub_81D06C4: ; 81D06C4 push {lr} movs r0, 0xD bl sub_81C763C @@ -898282,7 +898282,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 @@ -898293,7 +898293,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 @@ -898307,7 +898307,7 @@ sub_81D06E4: @ 81D06E4 adds r1, r0 ldrb r0, [r1] cmp r0, 0xE - bne _081D0730 + bne @081D0730 ldrb r1, [r1, 0x1] movs r0, 0x64 adds r4, r1, 0 @@ -898324,10 +898324,10 @@ sub_81D06E4: @ 81D06E4 adds r0, r4, 0 bl pokemon_get_gender strb r0, [r6] - b _081D0752 + b @081D0752 .align 2, 0 .pool -_081D0730: +@081D0730: ldrb r0, [r1] ldrb r1, [r1, 0x1] bl get_pokemon_by_box_and_pos @@ -898341,7 +898341,7 @@ _081D0730: movs r1, 0x2 adds r2, r5, 0 bl pokemon_getattr_encrypted -_081D0752: +@081D0752: adds r0, r5, 0 bl get_end_of_string_ptr_limit_10_chars pop {r4-r7} @@ -898350,7 +898350,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 @@ -898364,7 +898364,7 @@ sub_81D0760: @ 81D0760 adds r1, r0 ldrb r0, [r1] cmp r0, 0xE - bne _081D07AC + bne @081D07AC ldrb r1, [r1, 0x1] movs r0, 0x64 adds r4, r1, 0 @@ -898382,10 +898382,10 @@ sub_81D0760: @ 81D0760 adds r0, r4, 0 movs r1, 0x1 bl pokemon_getattr - b _081D07D0 + b @081D07D0 .align 2, 0 .pool -_081D07AC: +@081D07AC: ldrb r0, [r1] ldrb r1, [r1, 0x1] bl get_pokemon_by_box_and_pos @@ -898400,7 +898400,7 @@ _081D07AC: adds r0, r4, 0 movs r1, 0x1 bl pokemon_getattr_encrypted -_081D07D0: +@081D07D0: str r0, [r7] pop {r4-r7} pop {r0} @@ -898408,7 +898408,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 @@ -898419,12 +898419,12 @@ sub_81D07D8: @ 81D07D8 adds r1, r0 ldrb r0, [r1] cmp r0, 0xE - beq _081D07FA + beq @081D07FA ldrb r1, [r1, 0x1] movs r2, 0x52 bl get_pokemon_data_from_any_box - b _081D080A -_081D07FA: + b @081D080A +@081D07FA: ldrb r1, [r1, 0x1] movs r0, 0x64 muls r0, r1 @@ -898432,7 +898432,7 @@ _081D07FA: adds r0, r1 movs r1, 0x52 bl pokemon_getattr -_081D080A: +@081D080A: pop {r1} bx r1 .align 2, 0 @@ -898440,7 +898440,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 @@ -898454,7 +898454,7 @@ sub_81D0814: @ 81D0814 adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0xE - bne _081D0848 + bne @081D0848 ldrb r1, [r1, 0x1] movs r0, 0x64 muls r0, r1 @@ -898462,15 +898462,15 @@ sub_81D0814: @ 81D0814 adds r0, r1 movs r1, 0x53 bl pokemon_getattr - b _081D0852 + b @081D0852 .align 2, 0 .pool -_081D0848: +@081D0848: ldrb r0, [r1] ldrb r1, [r1, 0x1] movs r2, 0x53 bl get_pokemon_data_from_any_box -_081D0852: +@081D0852: mov r12, r0 movs r0, 0 strh r0, [r5, 0x10] @@ -898479,7 +898479,7 @@ _081D0852: ldr r0, =0x086237f8 mov r9, r0 mov r10, r9 -_081D0862: +@081D0862: lsls r2, r6, 2 mov r3, r9 adds r1, r2, r3 @@ -898492,18 +898492,18 @@ _081D0862: ldrb r0, [r1, 0x3] adds r7, r2, 0 cmp r0, 0 - bne _081D08AC + bne @081D08AC movs r3, 0 adds r6, 0x1 mov r8, r6 cmp r3, r4 - bge _081D08D6 + bge @081D08D6 adds r6, r5, 0 adds r6, 0x14 mov r1, r10 adds r0, r7, r1 ldrb r2, [r0, 0x2] -_081D0890: +@081D0890: ldrh r0, [r5, 0x10] adds r1, r0, 0x1 strh r1, [r5, 0x10] @@ -898514,22 +898514,22 @@ _081D0890: str r1, [r0] adds r3, 0x1 cmp r3, r4 - blt _081D0890 - b _081D08D6 + blt @081D0890 + b @081D08D6 .align 2, 0 .pool -_081D08AC: +@081D08AC: movs r3, 0 adds r6, 0x1 mov r8, r6 cmp r3, r4 - bge _081D08D6 + bge @081D08D6 adds r6, r5, 0 adds r6, 0x78 mov r1, r10 adds r0, r7, r1 ldrb r2, [r0, 0x2] -_081D08C0: +@081D08C0: ldrh r0, [r5, 0x12] adds r1, r0, 0x1 strh r1, [r5, 0x12] @@ -898540,8 +898540,8 @@ _081D08C0: str r1, [r0] adds r3, 0x1 cmp r3, r4 - blt _081D08C0 -_081D08D6: + blt @081D08C0 +@081D08D6: mov r3, r9 adds r0, r7, r3 mov r1, r12 @@ -898550,10 +898550,10 @@ _081D08D6: mov r12, r1 mov r6, r8 cmp r6, 0x10 - bls _081D0862 + bls @081D0862 ldrh r0, [r5, 0x10] cmp r0, 0 - beq _081D0900 + beq @081D0900 subs r0, 0x1 movs r1, 0x9 bl __divsi3 @@ -898561,11 +898561,11 @@ _081D08D6: adds r1, r0 movs r0, 0 strh r1, [r5, 0xE] - b _081D0904 -_081D0900: + b @081D0904 +@081D0900: strh r0, [r5, 0xE] movs r0, 0x1B -_081D0904: +@081D0904: strh r0, [r5, 0xC] pop {r3-r5} mov r8, r3 @@ -898577,7 +898577,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 @@ -898591,7 +898591,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 @@ -898605,7 +898605,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 @@ -898615,22 +898615,22 @@ 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 adds r1, r0, 0 ldrh r0, [r1, 0xC] cmp r0, 0x18 - ble _081D096C + ble @081D096C subs r0, 0x1B lsls r0, 2 adds r1, 0x78 - b _081D0970 -_081D096C: + b @081D0970 +@081D096C: lsls r0, 2 adds r1, 0x14 -_081D0970: +@081D0970: adds r1, r0 ldr r0, [r1] pop {r1} @@ -898638,14 +898638,14 @@ _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 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq _081D09A8 + beq @081D09A8 ldr r0, =sub_81D0A6C + 1 movs r1, 0x1 bl sub_81C7078 @@ -898653,19 +898653,19 @@ sub_81D0978: @ 81D0978 ldr r0, =sub_81D0A58 + 1 str r0, [r4] movs r0, 0x1 - b _081D09AA + b @081D09AA .align 2, 0 .pool -_081D09A8: +@081D09A8: movs r0, 0 -_081D09AA: +@081D09AA: pop {r4} pop {r1} bx r1 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 @@ -898688,7 +898688,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 @@ -898699,7 +898699,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 @@ -898738,7 +898738,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 @@ -898749,7 +898749,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 @@ -898757,29 +898757,29 @@ sub_81D0A6C: @ 81D0A6C bl sub_81C763C adds r5, r0, 0 cmp r4, 0x9 - bls _081D0A80 - b _081D0C48 -_081D0A80: + bls @081D0A80 + b @081D0C48 +@081D0A80: lsls r0, r4, 2 - ldr r1, =_081D0A90 + ldr r1, =@081D0A90 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081D0A90: - .4byte _081D0AB8 - .4byte _081D0B04 - .4byte _081D0B74 - .4byte _081D0B88 - .4byte _081D0B9C - .4byte _081D0BB0 - .4byte _081D0BC4 - .4byte _081D0BD8 - .4byte _081D0BE8 - .4byte _081D0C3C -_081D0AB8: +@081D0A90: + .4byte @081D0AB8 + .4byte @081D0B04 + .4byte @081D0B74 + .4byte @081D0B88 + .4byte @081D0B9C + .4byte @081D0BB0 + .4byte @081D0BC4 + .4byte @081D0BD8 + .4byte @081D0BE8 + .4byte @081D0C3C +@081D0AB8: ldr r0, =0x08624b98 movs r1, 0x2 bl sub_81C7B54 @@ -898803,17 +898803,17 @@ _081D0AB8: movs r1, 0x10 movs r2, 0x20 bl sub_81C7944 - b _081D0BBA + b @081D0BBA .align 2, 0 .pool -_081D0B04: +@081D0B04: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq _081D0B12 - b _081D0C44 -_081D0B12: + beq @081D0B12 + b @081D0C44 +@081D0B12: movs r0, 0x1 movs r1, 0 movs r2, 0 @@ -898847,68 +898847,68 @@ _081D0B12: movs r2, 0x20 bl sub_81C7944 movs r0, 0x1 - b _081D0BBC + b @081D0BBC .align 2, 0 .pool -_081D0B74: +@081D0B74: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - bne _081D0C44 + bne @081D0C44 adds r0, r5, 0 bl sub_81D0E60 movs r0, 0 - b _081D0C4A -_081D0B88: + b @081D0C4A +@081D0B88: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - bne _081D0C44 + bne @081D0C44 adds r0, r5, 0 bl sub_81D0FCC movs r0, 0 - b _081D0C4A -_081D0B9C: + b @081D0C4A +@081D0B9C: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - bne _081D0C44 + bne @081D0C44 adds r0, r5, 0 bl sub_81D10A4 movs r0, 0 - b _081D0C4A -_081D0BB0: + b @081D0C4A +@081D0BB0: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _081D0C44 -_081D0BBA: + bne @081D0C44 +@081D0BBA: movs r0, 0x2 -_081D0BBC: +@081D0BBC: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0 - b _081D0C4A -_081D0BC4: + b @081D0C4A +@081D0BC4: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _081D0C44 + bne @081D0C44 adds r0, r5, 0 bl sub_81D1148 movs r0, 0x1 - b _081D0C4A -_081D0BD8: + b @081D0C4A +@081D0BD8: adds r0, r5, 0 bl sub_81D12D8 movs r0, 0xA bl sub_81C7BA4 movs r0, 0 - b _081D0C4A -_081D0BE8: + b @081D0C4A +@081D0BE8: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _081D0C44 + bne @081D0C44 adds r0, r5, 0 bl sub_81D13FC movs r0, 0x1 @@ -898936,17 +898936,17 @@ _081D0BE8: movs r0, 0x1 bl sub_81C7AC0 movs r0, 0 - b _081D0C4A -_081D0C3C: + b @081D0C4A +@081D0C3C: bl sub_81C7B34 cmp r0, 0 - beq _081D0C48 -_081D0C44: + beq @081D0C48 +@081D0C44: movs r0, 0x2 - b _081D0C4A -_081D0C48: + b @081D0C4A +@081D0C48: movs r0, 0x4 -_081D0C4A: +@081D0C4A: add sp, 0x8 pop {r4,r5} pop {r1} @@ -898954,281 +898954,281 @@ _081D0C4A: thumb_func_end sub_81D0A6C thumb_func_start sub_81D0C54 -sub_81D0C54: @ 81D0C54 +sub_81D0C54: ; 81D0C54 push {lr} cmp r0, 0 - beq _081D0C60 + beq @081D0C60 cmp r0, 0x1 - beq _081D0C70 - b _081D0C7C -_081D0C60: + beq @081D0C70 + b @081D0C7C +@081D0C60: movs r0, 0x5 bl audio_play movs r0, 0 bl sub_81C7AC0 movs r0, 0 - b _081D0C7E -_081D0C70: + b @081D0C7E +@081D0C70: bl sub_81C7B34 cmp r0, 0 - beq _081D0C7C + beq @081D0C7C movs r0, 0x2 - b _081D0C7E -_081D0C7C: + b @081D0C7E +@081D0C7C: movs r0, 0x4 -_081D0C7E: +@081D0C7E: pop {r1} bx r1 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 bl sub_81C763C adds r4, r0, 0 cmp r5, 0x6 - bhi _081D0D24 + bhi @081D0D24 lsls r0, r5, 2 - ldr r1, =_081D0CA4 + ldr r1, =@081D0CA4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081D0CA4: - .4byte _081D0CC0 - .4byte _081D0CD0 - .4byte _081D0CE4 - .4byte _081D0CEE - .4byte _081D0CF8 - .4byte _081D0D02 - .4byte _081D0D16 -_081D0CC0: +@081D0CA4: + .4byte @081D0CC0 + .4byte @081D0CD0 + .4byte @081D0CE4 + .4byte @081D0CEE + .4byte @081D0CF8 + .4byte @081D0D02 + .4byte @081D0D16 +@081D0CC0: movs r0, 0x5 bl audio_play adds r0, r4, 0 bl sub_81D11D8 movs r0, 0 - b _081D0D26 -_081D0CD0: + b @081D0D26 +@081D0CD0: adds r0, r4, 0 bl sub_81D1234 cmp r0, 0 - bne _081D0D20 + bne @081D0D20 adds r0, r4, 0 bl sub_81D0FF0 movs r0, 0x1 - b _081D0D26 -_081D0CE4: + b @081D0D26 +@081D0CE4: adds r0, r4, 0 bl sub_81D12D8 movs r0, 0x1 - b _081D0D26 -_081D0CEE: + b @081D0D26 +@081D0CEE: adds r0, r4, 0 bl sub_81D10D0 movs r0, 0x1 - b _081D0D26 -_081D0CF8: + b @081D0D26 +@081D0CF8: adds r0, r4, 0 bl sub_81D0E84 movs r0, 0x1 - b _081D0D26 -_081D0D02: + b @081D0D26 +@081D0D02: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - bne _081D0D20 + bne @081D0D20 adds r0, r4, 0 bl sub_81D11FC movs r0, 0 - b _081D0D26 -_081D0D16: + b @081D0D26 +@081D0D16: adds r0, r4, 0 bl sub_81D1234 cmp r0, 0 - beq _081D0D24 -_081D0D20: + beq @081D0D24 +@081D0D20: movs r0, 0x2 - b _081D0D26 -_081D0D24: + b @081D0D26 +@081D0D24: movs r0, 0x4 -_081D0D26: +@081D0D26: pop {r4,r5} pop {r1} bx r1 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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x1 - beq _081D0D5C + beq @081D0D5C cmp r4, 0x1 - bgt _081D0D46 + bgt @081D0D46 cmp r4, 0 - beq _081D0D4C - b _081D0D84 -_081D0D46: + beq @081D0D4C + b @081D0D84 +@081D0D46: cmp r4, 0x2 - beq _081D0D76 - b _081D0D84 -_081D0D4C: + beq @081D0D76 + b @081D0D84 +@081D0D4C: movs r0, 0x5 bl audio_play adds r0, r5, 0 bl sub_81D1448 movs r0, 0 - b _081D0D86 -_081D0D5C: + b @081D0D86 +@081D0D5C: adds r0, r5, 0 bl sub_81D1524 cmp r0, 0 - bne _081D0D80 + bne @081D0D80 adds r0, r5, 0 bl sub_81D0EFC movs r0, 0xB bl sub_81C7BA4 movs r0, 0 - b _081D0D86 -_081D0D76: + b @081D0D86 +@081D0D76: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _081D0D84 -_081D0D80: + beq @081D0D84 +@081D0D80: movs r0, 0x2 - b _081D0D86 -_081D0D84: + b @081D0D86 +@081D0D84: movs r0, 0x4 -_081D0D86: +@081D0D86: pop {r4,r5} pop {r1} bx r1 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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x1 - beq _081D0DC0 + beq @081D0DC0 cmp r4, 0x1 - bgt _081D0DA6 + bgt @081D0DA6 cmp r4, 0 - beq _081D0DB0 - b _081D0DF6 -_081D0DA6: + beq @081D0DB0 + b @081D0DF6 +@081D0DA6: cmp r4, 0x2 - beq _081D0DD4 + beq @081D0DD4 cmp r4, 0x3 - beq _081D0DE8 - b _081D0DF6 -_081D0DB0: + beq @081D0DE8 + b @081D0DF6 +@081D0DB0: movs r0, 0x5 bl audio_play adds r0, r5, 0 bl sub_81D1500 movs r0, 0 - b _081D0DF8 -_081D0DC0: + b @081D0DF8 +@081D0DC0: adds r0, r5, 0 bl sub_81D1524 cmp r0, 0 - bne _081D0DF2 + bne @081D0DF2 adds r0, r5, 0 bl sub_81D1448 movs r0, 0 - b _081D0DF8 -_081D0DD4: + b @081D0DF8 +@081D0DD4: adds r0, r5, 0 bl sub_81D1524 cmp r0, 0 - bne _081D0DF2 + bne @081D0DF2 adds r0, r5, 0 bl sub_81D0EFC movs r0, 0 - b _081D0DF8 -_081D0DE8: + b @081D0DF8 +@081D0DE8: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _081D0DF6 -_081D0DF2: + beq @081D0DF6 +@081D0DF2: movs r0, 0x2 - b _081D0DF8 -_081D0DF6: + b @081D0DF8 +@081D0DF6: movs r0, 0x4 -_081D0DF8: +@081D0DF8: pop {r4,r5} pop {r1} bx r1 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 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x1 - beq _081D0E30 + beq @081D0E30 cmp r4, 0x1 - bgt _081D0E1A + bgt @081D0E1A cmp r4, 0 - beq _081D0E20 - b _081D0E58 -_081D0E1A: + beq @081D0E20 + b @081D0E58 +@081D0E1A: cmp r4, 0x2 - beq _081D0E4A - b _081D0E58 -_081D0E20: + beq @081D0E4A + b @081D0E58 +@081D0E20: movs r0, 0x5 bl audio_play adds r0, r5, 0 bl sub_81D1500 movs r0, 0 - b _081D0E5A -_081D0E30: + b @081D0E5A +@081D0E30: adds r0, r5, 0 bl sub_81D1524 cmp r0, 0 - bne _081D0E54 + bne @081D0E54 adds r0, r5, 0 bl sub_81D0E84 movs r0, 0xA bl sub_81C7BA4 movs r0, 0 - b _081D0E5A -_081D0E4A: + b @081D0E5A +@081D0E4A: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 - beq _081D0E58 -_081D0E54: + beq @081D0E58 +@081D0E54: movs r0, 0x2 - b _081D0E5A -_081D0E58: + b @081D0E5A +@081D0E58: movs r0, 0x4 -_081D0E5A: +@081D0E5A: pop {r4,r5} pop {r1} bx r1 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, =0x08624bb8 @@ -899247,7 +899247,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 @@ -899296,7 +899296,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} @@ -899312,14 +899312,14 @@ sub_81D0EFC: @ 81D0EFC movs r1, 0x44 bl Window_FastFillPixels cmp r5, 0x18 - bhi _081D0F60 + bhi @081D0F60 lsls r1, r5, 3 ldr r0, =0x086239ac adds r6, r1, r0 movs r5, 0x80 lsls r5, 17 movs r4, 0x1 -_081D0F2E: +@081D0F2E: ldrb r0, [r7, 0xA] lsrs r3, r5, 24 add r1, sp, 0xC @@ -899337,11 +899337,11 @@ _081D0F2E: adds r5, r0 subs r4, 0x1 cmp r4, 0 - bge _081D0F2E - b _081D0FAA + bge @081D0F2E + b @081D0FAA .align 2, 0 .pool -_081D0F60: +@081D0F60: ldr r0, =0x03005d8c ldr r0, [r0] adds r0, r5 @@ -899349,14 +899349,14 @@ _081D0F60: adds r0, r1 ldrb r5, [r0] cmp r5, 0 - beq _081D0FB2 + beq @081D0FB2 subs r5, 0x1 movs r4, 0 ldr r0, =0x08623df8 mov r8, r0 movs r6, 0x80 lsls r6, 17 -_081D0F7C: +@081D0F7C: ldrb r0, [r7, 0xA] lsrs r3, r6, 24 add r1, sp, 0xC @@ -899378,12 +899378,12 @@ _081D0F7C: adds r6, r0 adds r4, 0x1 cmp r4, 0x1 - ble _081D0F7C -_081D0FAA: + ble @081D0F7C +@081D0FAA: ldrb r0, [r7, 0xA] movs r1, 0x2 bl Window_CopyToVram -_081D0FB2: +@081D0FB2: add sp, 0x10 pop {r3} mov r8, r3 @@ -899395,7 +899395,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, =0x08624bc4 @@ -899414,7 +899414,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] @@ -899442,21 +899442,21 @@ sub_81D0FF0: @ 81D0FF0 bl Print ldrb r0, [r6] cmp r0, 0 - beq _081D1040 + beq @081D1040 cmp r0, 0xFE - beq _081D1048 + beq @081D1048 ldr r1, =0x08624be4 - b _081D104A + b @081D104A .align 2, 0 .pool -_081D1040: +@081D1040: ldr r1, =0x08624bcc - b _081D104A + b @081D104A .align 2, 0 .pool -_081D1048: +@081D1048: ldr r1, =0x08624bd8 -_081D104A: +@081D104A: ldr r5, =0x02021cc4 adds r0, r5, 0 bl gf_strcpy @@ -899499,7 +899499,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, =0x08624be8 @@ -899521,7 +899521,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} @@ -899578,7 +899578,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 @@ -899601,7 +899601,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 @@ -899610,7 +899610,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 @@ -899651,7 +899651,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 @@ -899671,7 +899671,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] @@ -899700,7 +899700,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 @@ -899720,7 +899720,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 @@ -899745,14 +899745,14 @@ 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] movs r3, 0x32 ldrsh r0, [r2, r3] cmp r0, 0 - beq _081D12C8 + beq @081D12C8 subs r0, r1, 0x1 strh r0, [r2, 0x32] ldrh r0, [r2, 0x30] @@ -899765,28 +899765,28 @@ sub_81D1284: @ 81D1284 movs r1, 0x20 negs r1, r1 cmp r0, r1 - bgt _081D12BA + bgt @081D12BA adds r0, r2, 0 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 strb r1, [r0] - b _081D12D0 -_081D12BA: + b @081D12D0 +@081D12BA: adds r2, 0x3E ldrb r1, [r2] movs r0, 0x5 negs r0, r0 ands r0, r1 strb r0, [r2] - b _081D12D0 -_081D12C8: + b @081D12D0 +@081D12C8: ldrh r0, [r2, 0x34] strh r0, [r2, 0x20] ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] -_081D12D0: +@081D12D0: pop {r0} bx r0 .align 2, 0 @@ -899794,7 +899794,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 @@ -899806,9 +899806,9 @@ sub_81D12D8: @ 81D12D8 str r1, [r2] ldr r0, [r5] cmp r1, r0 - bcs _081D130A + bcs @081D130A adds r4, r2, 0 -_081D12F6: +@081D12F6: ldr r0, [r4] ldm r6!, {r1} bl sub_81D1370 @@ -899817,8 +899817,8 @@ _081D12F6: str r1, [r4] ldr r0, [r5] cmp r1, r0 - bcc _081D12F6 -_081D130A: + bcc @081D12F6 +@081D130A: ldr r4, =0x030012c0 adds r0, r4, 0 bl sub_81D092C @@ -899828,9 +899828,9 @@ _081D130A: str r1, [r2] ldr r0, [r4] cmp r1, r0 - bcs _081D133A + bcs @081D133A adds r4, r2, 0 -_081D1322: +@081D1322: ldr r0, [r4] adds r0, 0x1B ldm r6!, {r1} @@ -899841,8 +899841,8 @@ _081D1322: ldr r0, =0x030012c0 ldr r0, [r0] cmp r1, r0 - bcc _081D1322 -_081D133A: + bcc @081D1322 +@081D133A: movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram pop {r4-r6} @@ -899853,7 +899853,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 @@ -899871,7 +899871,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 @@ -899909,7 +899909,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, =0x08624bf8 lsls r1, 2 @@ -899944,7 +899944,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, =0x08624c78 @@ -899977,7 +899977,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} @@ -900060,7 +900060,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] @@ -900080,7 +900080,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, =nullsub_12 + 1 @@ -900094,7 +900094,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 @@ -900102,7 +900102,7 @@ sub_81D1538: @ 81D1538 movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq _081D156A + beq @081D156A movs r0, 0x3E adds r0, r3 mov r12, r0 @@ -900120,7 +900120,7 @@ sub_81D1538: @ 81D1538 strb r0, [r1] ldr r0, =nullsub_12 + 1 str r0, [r3, 0x1C] -_081D156A: +@081D156A: pop {r0} bx r0 .align 2, 0 @@ -900128,47 +900128,47 @@ _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 - bhi _081D15A4 + bhi @081D15A4 lsls r0, 2 - ldr r1, =_081D158C + ldr r1, =@081D158C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081D158C: - .4byte _081D15A4 - .4byte _081D15A8 - .4byte _081D15AC - .4byte _081D15B4 - .4byte _081D15B0 - .4byte _081D15A8 -_081D15A4: +@081D158C: + .4byte @081D15A4 + .4byte @081D15A8 + .4byte @081D15AC + .4byte @081D15B4 + .4byte @081D15B0 + .4byte @081D15A8 +@081D15A4: movs r0, 0 - b _081D15B6 -_081D15A8: + b @081D15B6 +@081D15A8: movs r0, 0x1 - b _081D15B6 -_081D15AC: + b @081D15B6 +@081D15AC: movs r0, 0x2 - b _081D15B6 -_081D15B0: + b @081D15B6 +@081D15B0: movs r0, 0x3 - b _081D15B6 -_081D15B4: + b @081D15B6 +@081D15B4: movs r0, 0x4 -_081D15B6: +@081D15B6: pop {r1} bx r1 thumb_func_end sub_81D1574 thumb_func_start sub_81D15BC -sub_81D15BC: @ 81D15BC +sub_81D15BC: ; 81D15BC ldr r1, =0x085500a4 lsls r0, 4 adds r0, r1 @@ -900179,36 +900179,36 @@ 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 ldr r2, =0x085500a4 -_081D15D4: +@081D15D4: ldrh r0, [r2] cmp r0, r3 - bne _081D15E4 + bne @081D15E4 adds r0, r1, 0 - b _081D15F0 + b @081D15F0 .align 2, 0 .pool -_081D15E4: +@081D15E4: adds r2, 0x10 adds r1, 0x1 cmp r1, 0x4D - ble _081D15D4 + ble @081D15D4 movs r0, 0x1 negs r0, r0 -_081D15F0: +@081D15F0: pop {r1} bx r1 thumb_func_end sub_81D15CC thumb_func_start sub_81D15F4 -sub_81D15F4: @ 81D15F4 +sub_81D15F4: ; 81D15F4 push {r4,lr} cmp r0, 0x14 - bhi _081D1620 + bhi @081D1620 ldr r1, =0x086252a8 lsls r0, 2 adds r0, r1 @@ -900221,85 +900221,85 @@ sub_81D15F4: @ 81D15F4 ldr r1, [r0] adds r0, r4, 0 bl _call_via_r1 - b _081D1622 + b @081D1622 .align 2, 0 .pool -_081D1620: +@081D1620: movs r0, 0 -_081D1622: +@081D1622: pop {r4} pop {r1} bx r1 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] ldr r0, =0x0000ffff cmp r1, r0 - beq _081D1644 + beq @081D1644 adds r0, r1, 0 bl flag_check lsls r0, 24 lsrs r0, 24 - b _081D1646 + b @081D1646 .align 2, 0 .pool -_081D1644: +@081D1644: movs r0, 0x1 -_081D1646: +@081D1646: pop {r1} bx r1 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] ldr r0, =0x0000ffff cmp r1, r0 - beq _081D1668 + beq @081D1668 adds r0, r1, 0 bl flag_check lsls r0, 24 lsrs r0, 24 - b _081D166A + b @081D166A .align 2, 0 .pool -_081D1668: +@081D1668: movs r0, 0x1 -_081D166A: +@081D166A: pop {r1} bx r1 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] ldr r0, =0x0000ffff cmp r1, r0 - beq _081D168C + beq @081D168C adds r0, r1, 0 bl flag_check lsls r0, 24 lsrs r0, 24 - b _081D168E + b @081D168E .align 2, 0 .pool -_081D168C: +@081D168C: movs r0, 0x1 -_081D168E: +@081D168E: pop {r1} bx r1 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 @@ -900307,32 +900307,32 @@ sub_81D1694: @ 81D1694 ldrb r0, [r2, 0x1] ldrb r1, [r1, 0x8] cmp r0, r1 - beq _081D16AC + beq @081D16AC movs r0, 0 - b _081D16C6 + b @081D16C6 .align 2, 0 .pool -_081D16AC: +@081D16AC: ldrh r1, [r2, 0x2] ldr r0, =0x0000ffff cmp r1, r0 - beq _081D16C4 + beq @081D16C4 adds r0, r1, 0 bl flag_check lsls r0, 24 lsrs r0, 24 - b _081D16C6 + b @081D16C6 .align 2, 0 .pool -_081D16C4: +@081D16C4: movs r0, 0x1 -_081D16C6: +@081D16C6: pop {r1} bx r1 thumb_func_end sub_81D1694 thumb_func_start sub_81D16CC -sub_81D16CC: @ 81D16CC +sub_81D16CC: ; 81D16CC push {lr} ldrh r0, [r0, 0x2] bl flag_check @@ -900343,10 +900343,10 @@ 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 + bhi @081D170C ldr r1, =0x086252a8 lsls r0, 2 adds r0, r1 @@ -900361,52 +900361,52 @@ sub_81D16DC: @ 81D16DC bl _call_via_r1 lsls r0, 24 lsrs r0, 24 - b _081D170E + b @081D170E .align 2, 0 .pool -_081D170C: +@081D170C: movs r0, 0 -_081D170E: +@081D170E: pop {r4} pop {r1} bx r1 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 ldr r7, =0x0000ffff - b _081D172E + b @081D172E .align 2, 0 .pool -_081D172C: +@081D172C: adds r6, 0x1 -_081D172E: +@081D172E: ldr r0, [r5, 0x10] lsls r4, r6, 2 adds r1, r4, r0 ldrh r0, [r1] cmp r0, r7 - beq _081D1744 + beq @081D1744 bl flag_check lsls r0, 24 cmp r0, 0 - bne _081D172C -_081D1744: + bne @081D172C +@081D1744: ldr r0, [r5, 0x10] adds r0, r4, r0 ldrb r0, [r0, 0x2] @@ -900416,22 +900416,22 @@ _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 + bhi @081D1784 ldr r1, =0x086252a8 lsls r0, 2 adds r0, r1 @@ -900444,30 +900444,30 @@ sub_81D1758: @ 81D1758 ldr r1, [r0] adds r0, r4, 0 bl _call_via_r1 - b _081D1786 + b @081D1786 .align 2, 0 .pool -_081D1784: +@081D1784: movs r0, 0 -_081D1786: +@081D1786: pop {r4} pop {r1} bx r1 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] cmp r0, 0x48 - bhi _081D17B8 + bhi @081D17B8 ldr r0, =0x03005d8c ldr r0, [r0] ldr r2, =0x000009ca @@ -900478,18 +900478,18 @@ sub_81D1790: @ 81D1790 negs r0, r1 orrs r0, r1 lsrs r0, 31 - b _081D17BA + b @081D17BA .align 2, 0 .pool -_081D17B8: +@081D17B8: movs r0, 0 -_081D17BA: +@081D17BA: pop {r1} bx r1 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 @@ -900506,23 +900506,23 @@ 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 - bhi _081D1832 + bhi @081D1832 ldr r1, =0x086252a8 lsls r0, r5, 2 adds r0, r1 @@ -900537,26 +900537,26 @@ sub_81D17E8: @ 81D17E8 adds r0, r4, 0 bl _call_via_r1 cmp r0, 0 - beq _081D1820 -_081D1812: + beq @081D1820 +@081D1812: movs r0, 0x1 - b _081D1834 + b @081D1834 .align 2, 0 .pool -_081D1820: +@081D1820: movs r2, 0 ldr r1, =0x08625388 -_081D1824: +@081D1824: ldrh r0, [r1] cmp r0, r5 - beq _081D1812 + beq @081D1812 adds r1, 0x18 adds r2, 0x1 cmp r2, 0x3 - bls _081D1824 -_081D1832: + bls @081D1824 +@081D1832: movs r0, 0 -_081D1834: +@081D1834: pop {r4,r5} pop {r1} bx r1 @@ -900565,40 +900565,40 @@ _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 + bhi @081D1880 ldr r1, =0x086252a8 lsls r0, 2 adds r0, r1 @@ -900611,53 +900611,53 @@ sub_81D1854: @ 81D1854 ldr r1, [r0] adds r0, r4, 0 bl _call_via_r1 - b _081D1882 + b @081D1882 .align 2, 0 .pool -_081D1880: +@081D1880: movs r0, 0x4E -_081D1882: +@081D1882: pop {r4} pop {r1} bx r1 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 - bhi _081D18C2 + bhi @081D18C2 ldr r1, =0x086252a8 lsls r0, 2 adds r0, r1 @@ -900671,7 +900671,7 @@ sub_81D189C: @ 81D189C adds r0, r4, 0 adds r1, r5, 0 bl _call_via_r2 -_081D18C2: +@081D18C2: pop {r4,r5} pop {r0} bx r0 @@ -900680,7 +900680,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 @@ -900689,27 +900689,27 @@ 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 ldrb r0, [r3] cmp r0, 0x5 - beq _081D18F0 + beq @081D18F0 ldr r0, [r3, 0x10] bl sub_81D1920 - b _081D18F8 -_081D18F0: + b @081D18F8 +@081D18F0: ldr r0, [r3, 0x10] ldrh r1, [r3, 0x4] bl sub_81D199C -_081D18F8: +@081D18F8: pop {r0} bx r0 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 @@ -900718,7 +900718,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 @@ -900727,7 +900727,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 @@ -900736,7 +900736,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 @@ -900746,51 +900746,51 @@ sub_81D1920: @ 81D1920 movs r5, 0 ldr r0, [r6] cmp r0, 0 - beq _081D1940 + beq @081D1940 adds r1, r6, 0 -_081D1936: +@081D1936: adds r1, 0x8 adds r5, 0x1 ldr r0, [r1] cmp r0, 0 - bne _081D1936 -_081D1940: + bne @081D1936 +@081D1940: cmp r5, 0 - beq _081D1946 + beq @081D1946 subs r5, 0x1 -_081D1946: +@081D1946: ldr r0, =0x0000ffff mov r8, r0 lsls r0, r5, 3 adds r0, 0x4 adds r4, r0, r6 - b _081D195C + b @081D195C .align 2, 0 .pool -_081D1958: +@081D1958: subs r4, 0x8 subs r5, 0x1 -_081D195C: +@081D195C: lsls r7, r5, 3 cmp r5, 0 - beq _081D1974 + beq @081D1974 ldrh r0, [r4] cmp r0, r8 - beq _081D1958 + beq @081D1958 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081D1958 -_081D1974: + bne @081D1958 +@081D1974: adds r4, r7, r6 ldrh r1, [r4, 0x6] ldr r0, =0x0000ffff cmp r1, r0 - beq _081D1984 + beq @081D1984 adds r0, r1, 0 bl flag_set -_081D1984: +@081D1984: ldr r1, [r4] mov r0, r9 bl ExpandTextCodes @@ -900805,7 +900805,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 @@ -900818,70 +900818,70 @@ sub_81D199C: @ 81D199C movs r5, 0 ldr r0, [r6] cmp r0, 0 - beq _081D19E6 + beq @081D19E6 ldrh r0, [r6, 0x4] ldr r1, =0x0000fffe cmp r0, r1 - beq _081D1A24 + beq @081D1A24 ldr r0, =0x0000ffff mov r9, r0 mov r8, r1 adds r4, r6, 0 -_081D19C6: +@081D19C6: ldrh r0, [r4, 0x4] cmp r0, r9 - beq _081D19D6 + beq @081D19D6 bl flag_check lsls r0, 24 cmp r0, 0 - beq _081D19E6 -_081D19D6: + beq @081D19E6 +@081D19D6: adds r4, 0x8 adds r5, 0x1 ldr r0, [r4] cmp r0, 0 - beq _081D19E6 + beq @081D19E6 ldrh r0, [r4, 0x4] cmp r0, r8 - bne _081D19C6 -_081D19E6: + bne @081D19C6 +@081D19E6: lsls r0, r5, 3 adds r0, r6 ldrh r1, [r0, 0x4] ldr r0, =0x0000fffe cmp r1, r0 - beq _081D1A24 + beq @081D1A24 cmp r5, 0 - beq _081D19F8 + beq @081D19F8 subs r5, 0x1 -_081D19F8: +@081D19F8: lsls r0, r5, 3 adds r4, r0, r6 ldrh r1, [r4, 0x6] ldr r0, =0x0000ffff cmp r1, r0 - beq _081D1A0A + beq @081D1A0A adds r0, r1, 0 bl flag_set -_081D1A0A: +@081D1A0A: ldr r1, [r4] mov r0, r10 bl ExpandTextCodes - b _081D1A5C + b @081D1A5C .align 2, 0 .pool -_081D1A1C: +@081D1A1C: adds r5, 0x2 - b _081D1A50 -_081D1A20: + b @081D1A50 +@081D1A20: adds r5, 0x3 - b _081D1A50 -_081D1A24: + b @081D1A50 +@081D1A24: ldr r0, =0x00000864 bl flag_check lsls r0, 24 cmp r0, 0 - beq _081D1A50 + beq @081D1A50 ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000009ca @@ -900889,21 +900889,21 @@ _081D1A24: adds r0, r7 ldrb r0, [r0] cmp r0, 0 - bne _081D1A1C + bne @081D1A1C adds r0, r7, 0 bl sub_80B2318 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bhi _081D1A20 + bhi @081D1A20 adds r5, 0x1 -_081D1A50: +@081D1A50: lsls r0, r5, 3 adds r0, r6 ldr r1, [r0] mov r0, r10 bl ExpandTextCodes -_081D1A5C: +@081D1A5C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -900916,12 +900916,12 @@ _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 cmp r0, 0x14 - bhi _081D1AA2 + bhi @081D1AA2 ldr r1, =0x086252a8 lsls r0, 2 adds r0, r1 @@ -900936,7 +900936,7 @@ sub_81D1A78: @ 81D1A78 adds r1, r5, 0 adds r2, r6, 0 bl _call_via_r3 -_081D1AA2: +@081D1AA2: pop {r4-r6} pop {r0} bx r0 @@ -900945,7 +900945,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] @@ -900954,19 +900954,19 @@ 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 ldr r0, [r4, 0xC] cmp r0, 0 - bne _081D1AD0 + bne @081D1AD0 ldrh r0, [r4, 0x4] bl sub_81D1B0C - b _081D1AD2 -_081D1AD0: + b @081D1AD2 +@081D1AD0: str r0, [r2] -_081D1AD2: +@081D1AD2: ldr r0, [r4, 0x8] str r0, [r5] pop {r4,r5} @@ -900975,7 +900975,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 @@ -900989,7 +900989,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] @@ -900998,7 +900998,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] @@ -901007,7 +901007,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 @@ -901033,7 +901033,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 @@ -901044,28 +901044,28 @@ sub_81D1B40: @ 81D1B40 movs r0, 0x8 adds r0, r2 mov r9, r0 -_081D1B54: +@081D1B54: lsls r0, r5, 1 adds r0, r5 lsls r0, 3 adds r0, r2 ldrh r0, [r0] cmp r0, r6 - bne _081D1BBC + bne @081D1BBC adds r4, r5, 0x1 lsls r1, 2 mov r8, r1 cmp r4, 0x3 - bhi _081D1BA8 + bhi @081D1BA8 lsls r0, r4, 1 adds r0, r4 lsls r0, 3 adds r0, r2 ldrh r0, [r0] cmp r0, r6 - bne _081D1BA8 + bne @081D1BA8 ldr r7, =0x08625388 -_081D1B7C: +@081D1B7C: lsls r0, r4, 1 adds r0, r4 lsls r0, 3 @@ -901075,34 +901075,34 @@ _081D1B7C: bl flag_check lsls r0, 24 cmp r0, 0 - beq _081D1BA8 + beq @081D1BA8 adds r5, r4, 0 adds r4, r5, 0x1 cmp r4, 0x3 - bhi _081D1BA8 + bhi @081D1BA8 lsls r0, r4, 1 adds r0, r4 lsls r0, 3 adds r0, r7 ldrh r0, [r0] cmp r0, r6 - beq _081D1B7C -_081D1BA8: + beq @081D1B7C +@081D1BA8: lsls r0, r5, 1 adds r0, r5 lsls r0, 3 add r0, r8 add r0, r9 ldr r0, [r0] - b _081D1BC4 + b @081D1BC4 .align 2, 0 .pool -_081D1BBC: +@081D1BBC: adds r5, 0x1 cmp r5, 0x3 - bls _081D1B54 + bls @081D1B54 movs r0, 0 -_081D1BC4: +@081D1BC4: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -901112,71 +901112,71 @@ _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 ldr r1, =0x08625388 -_081D1BD8: +@081D1BD8: ldrh r0, [r1] cmp r0, r3 - bne _081D1BE8 + bne @081D1BE8 ldrh r0, [r1, 0x2] - b _081D1BF4 + b @081D1BF4 .align 2, 0 .pool -_081D1BE8: +@081D1BE8: adds r1, 0x18 adds r2, 0x1 cmp r2, 0x3 - bls _081D1BD8 + bls @081D1BD8 movs r0, 0x1 negs r0, r0 -_081D1BF4: +@081D1BF4: pop {r1} bx r1 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 -_081D1BFE: +@081D1BFE: adds r0, r4, 0 bl sub_81D1854 cmp r0, 0x4E - beq _081D1C10 + beq @081D1C10 cmp r0, r5 - bne _081D1C10 + bne @081D1C10 movs r0, 0x1 - b _081D1C18 -_081D1C10: + b @081D1C18 +@081D1C10: adds r4, 0x1 cmp r4, 0x14 - ble _081D1BFE + ble @081D1BFE movs r0, 0 -_081D1C18: +@081D1C18: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_81D1BF8 thumb_func_start sub_81D1C20 -sub_81D1C20: @ 81D1C20 +sub_81D1C20: ; 81D1C20 push {lr} ldr r0, =0x020375e0 ldrh r0, [r0] bl sub_81D15CC cmp r0, 0 - blt _081D1C3C + blt @081D1C3C movs r1, 0xAE lsls r1, 1 adds r0, r1 lsls r0, 16 lsrs r0, 16 bl flag_set -_081D1C3C: +@081D1C3C: pop {r0} bx r0 .align 2, 0 @@ -901184,7 +901184,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 @@ -901193,16 +901193,16 @@ sub_81D1C44: @ 81D1C44 bl malloc str r0, [r4] cmp r0, 0 - bne _081D1C60 + bne @081D1C60 movs r0, 0 - b _081D1C7A + b @081D1C7A .align 2, 0 .pool -_081D1C60: +@081D1C60: movs r2, 0 ldr r4, =0x0203cf48 movs r3, 0xFF -_081D1C66: +@081D1C66: adds r0, r2, r4 ldrb r1, [r0] orrs r1, r3 @@ -901211,9 +901211,9 @@ _081D1C66: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x2 - bls _081D1C66 + bls @081D1C66 movs r0, 0x1 -_081D1C7A: +@081D1C7A: pop {r4} pop {r1} bx r1 @@ -901222,7 +901222,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 @@ -901231,9 +901231,9 @@ sub_81D1C84: @ 81D1C84 adds r5, r4, r6 ldrb r0, [r5] cmp r0, 0xFF - bne _081D1CEC + bne @081D1CEC cmp r4, 0x2 - bne _081D1CD4 + bne @081D1CD4 ldr r0, =0x086253e8 ldr r1, [r0, 0x14] ldr r0, [r0, 0x10] @@ -901251,22 +901251,22 @@ sub_81D1C84: @ 81D1C84 mov r0, sp bl Window_AddFromTemplate strb r0, [r6, 0x2] - b _081D1CE0 + b @081D1CE0 .align 2, 0 .pool -_081D1CD4: +@081D1CD4: lsls r0, r4, 3 ldr r1, =0x086253e8 adds r0, r1 bl Window_AddFromTemplate strb r0, [r5] -_081D1CE0: +@081D1CE0: ldr r0, =0x0203cf48 adds r0, r4, r0 ldrb r0, [r0] movs r1, 0 bl SetStandardWindowBorderStyle -_081D1CEC: +@081D1CEC: ldr r0, =0x0203cf48 adds r0, r4, r0 ldrb r0, [r0] @@ -901279,7 +901279,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 @@ -901303,7 +901303,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 @@ -901315,7 +901315,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 @@ -901326,7 +901326,7 @@ sub_81D1D44: @ 81D1D44 movs r0, 0x2 negs r0, r0 cmp r3, r0 - beq _081D1DAC + beq @081D1DAC ldr r0, =0x03005d8c lsls r1, r3, 3 adds r1, r3 @@ -901344,11 +901344,11 @@ sub_81D1D44: @ 81D1D44 lsls r0, 16 lsrs r0, 16 cmp r0, 0x5 - bhi _081D1D8C + bhi @081D1D8C add r0, sp, 0x14 movs r1, 0x1 bl sub_8009308 -_081D1D8C: +@081D1D8C: movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -901364,7 +901364,7 @@ _081D1D8C: movs r2, 0x8 adds r3, r5, 0 bl sub_8199EEC -_081D1DAC: +@081D1DAC: add sp, 0x34 pop {r4,r5} pop {r0} @@ -901374,7 +901374,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 @@ -901394,10 +901394,10 @@ sub_81D1DC0: @ 81D1DC0 mov r10, r0 ldrb r1, [r5, 0x5] cmp r3, r1 - bcs _081D1E02 + bcs @081D1E02 adds r6, r7, 0 ldr r2, =0x08625403 -_081D1DEC: +@081D1DEC: ldr r1, [r6] lsls r0, r3, 3 adds r0, r1 @@ -901408,8 +901408,8 @@ _081D1DEC: lsrs r3, r0, 16 ldrb r0, [r5, 0x5] cmp r3, r0 - bcc _081D1DEC -_081D1E02: + bcc @081D1DEC +@081D1E02: ldr r2, [r7] lsls r0, r3, 3 adds r0, r2 @@ -901461,21 +901461,21 @@ _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 cmp r1, 0x1 - beq _081D1E8C + beq @081D1E8C movs r0, 0x5 bl audio_play -_081D1E8C: +@081D1E8C: pop {r0} bx r0 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 @@ -901502,7 +901502,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] @@ -901514,7 +901514,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 @@ -901524,13 +901524,13 @@ sub_81D1ED4: @ 81D1ED4 adds r3, r0, 0 movs r6, 0 movs r7, 0 -_081D1EE6: +@081D1EE6: movs r2, 0 lsls r5, r6, 2 adds r0, r6, 0x1 mov r10, r0 adds r4, r5, 0 -_081D1EF0: +@081D1EF0: lsls r0, r2, 2 adds r0, r2 lsls r0, 2 @@ -901545,7 +901545,7 @@ _081D1EF0: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x9 - bls _081D1EF0 + bls @081D1EF0 movs r2, 0 mov r9, r2 str r5, [sp] @@ -901553,7 +901553,7 @@ _081D1EF0: mov r8, r1 movs r4, 0x5B mov r12, r4 -_081D1F1C: +@081D1F1C: lsls r0, r2, 2 adds r0, r2 adds r1, r6, r0 @@ -901572,7 +901572,7 @@ _081D1F1C: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls _081D1F1C + bls @081D1F1C adds r1, r3, r5 movs r2, 0x96 lsls r2, 1 @@ -901586,7 +901586,7 @@ _081D1F1C: lsls r0, r1, 24 lsrs r6, r0, 24 cmp r6, 0x4 - bls _081D1EE6 + bls @081D1EE6 movs r2, 0xD5 lsls r2, 2 adds r0, r3, r2 @@ -901608,7 +901608,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 @@ -901619,7 +901619,7 @@ sub_81D1F84: @ 81D1F84 str r1, [sp] mov r9, r2 movs r7, 0 -_081D1F98: +@081D1F98: lsls r4, r7, 2 ldr r1, [sp] adds r0, r4, r1 @@ -901637,7 +901637,7 @@ _081D1F98: adds r7, 0x1 mov r10, r7 mov r12, r4 -_081D1FBC: +@081D1FBC: lsls r0, r3, 2 adds r0, r3 lsls r0, 2 @@ -901655,7 +901655,7 @@ _081D1FBC: lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x8 - bls _081D1FBC + bls @081D1FBC lsls r0, r3, 2 adds r0, r3 lsls r0, 2 @@ -901680,7 +901680,7 @@ _081D1FBC: str r4, [sp, 0x4] movs r0, 0x1 mov r12, r0 -_081D2012: +@081D2012: lsls r0, r3, 2 adds r0, r3 lsls r0, 2 @@ -901699,7 +901699,7 @@ _081D2012: lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x8 - bls _081D2012 + bls @081D2012 lsls r0, r3, 2 adds r0, r3 lsls r0, 2 @@ -901714,7 +901714,7 @@ _081D2012: lsls r0, r7, 16 lsrs r7, r0, 16 cmp r7, 0x4 - bls _081D1F98 + bls @081D1F98 ldr r1, =0x00000352 add r1, r8 movs r0, 0 @@ -901732,19 +901732,19 @@ _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 adds r4, r1, r0 ldrh r0, [r4] cmp r0, 0x9 - bls _081D208C + bls @081D208C movs r0, 0 - b _081D20A6 + b @081D20A6 .align 2, 0 .pool -_081D208C: +@081D208C: adds r0, r1, 0 bl sub_81D2230 ldrh r1, [r4] @@ -901757,14 +901757,14 @@ _081D208C: negs r0, r1 orrs r0, r1 lsrs r0, 31 -_081D20A6: +@081D20A6: pop {r4} pop {r1} bx r1 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 @@ -901775,27 +901775,27 @@ 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 adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0 - beq _081D20D4 + beq @081D20D4 cmp r0, 0x1 - beq _081D20E2 - b _081D20FA + beq @081D20E2 + b @081D20FA .align 2, 0 .pool -_081D20D4: +@081D20D4: bl dp12_8087EA4 ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] movs r0, 0x1 - b _081D20FC -_081D20E2: + b @081D20FC +@081D20E2: mov r0, sp ldr r1, =0x08625404 ldm r1!, {r2,r3,r5} @@ -901807,9 +901807,9 @@ _081D20E2: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] -_081D20FA: +@081D20FA: movs r0, 0 -_081D20FC: +@081D20FC: add sp, 0xC pop {r4,r5} pop {r1} @@ -901819,7 +901819,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 @@ -901832,7 +901832,7 @@ sub_81D2108: @ 81D2108 adds r0, r6, r1 ldrb r0, [r0] cmp r0, 0 - beq _081D21BE + beq @081D21BE adds r0, r6, 0 bl sub_81D24A4 adds r0, r6, 0 @@ -901861,7 +901861,7 @@ sub_81D2108: @ 81D2108 ldr r5, =0x0000024a adds r5, r6 mov r10, r5 -_081D215E: +@081D215E: adds r2, r7, 0 adds r2, 0x37 lsls r3, r2, 2 @@ -901904,13 +901904,13 @@ _081D215E: lsls r0, 16 lsrs r7, r0, 16 cmp r7, 0x41 - bls _081D215E + bls @081D215E movs r0, 0xD5 lsls r0, 2 adds r1, r6, r0 movs r0, 0 strb r0, [r1] -_081D21BE: +@081D21BE: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -901924,14 +901924,14 @@ _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 cmp r1, 0x3 - bls _081D21E8 + bls @081D21E8 movs r1, 0 -_081D21E8: +@081D21E8: movs r0, 0x1 lsls r0, r1 movs r5, 0x1F @@ -901963,7 +901963,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 @@ -901974,7 +901974,7 @@ sub_81D2230: @ 81D2230 add r6, r12 mov r5, r12 adds r5, 0x64 -_081D2244: +@081D2244: lsls r2, r4, 2 adds r3, r7, r2 ldrh r1, [r6] @@ -901989,7 +901989,7 @@ _081D2244: lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x4 - bls _081D2244 + bls @081D2244 movs r1, 0xD5 lsls r1, 2 add r1, r12 @@ -902003,7 +902003,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 @@ -902024,7 +902024,7 @@ sub_81D2278: @ 81D2278 ldrh r0, [r5, 0x2] ldrh r1, [r3, 0x2] cmp r0, r1 - bcs _081D22B2 + bcs @081D22B2 adds r2, r0, 0 mov r10, r2 ldrh r0, [r3, 0x2] @@ -902032,8 +902032,8 @@ sub_81D2278: @ 81D2278 lsls r4, r1, 10 ldrh r3, [r3] str r3, [sp, 0x8] - b _081D22C6 -_081D22B2: + b @081D22C6 +@081D22B2: ldrh r0, [r5, 0x2] ldr r1, [sp, 0x4] ldrh r1, [r1, 0x2] @@ -902044,26 +902044,26 @@ _081D22B2: ldrh r3, [r5] str r3, [sp, 0x8] mov r2, r10 -_081D22C6: +@081D22C6: subs r0, r2 lsls r0, 16 lsrs r0, 16 mov r8, r0 cmp r0, 0 - beq _081D22DE + beq @081D22DE subs r0, r3, r1 lsls r0, 10 mov r1, r8 bl __divsi3 str r0, [sp, 0xC] -_081D22DE: +@081D22DE: mov r0, r8 adds r0, 0x1 lsls r0, 16 lsrs r0, 16 mov r8, r0 cmp r7, 0 - bne _081D2328 + bne @081D2328 mov r0, r10 subs r0, 0x38 lsls r0, 2 @@ -902076,9 +902076,9 @@ _081D22DE: add r0, r9 str r0, [sp, 0x10] cmp r7, r8 - bcs _081D23B6 + bcs @081D23B6 movs r7, 0x1 -_081D2308: +@081D2308: adds r2, r3, r6 asrs r1, r4, 10 asrs r0, r4, 9 @@ -902093,12 +902093,12 @@ _081D2308: lsls r0, 16 lsrs r5, r0, 16 cmp r5, r8 - bcc _081D2308 - b _081D23B6 -_081D2328: + bcc @081D2308 + b @081D23B6 +@081D2328: ldr r2, [sp, 0xC] cmp r2, 0 - ble _081D23C0 + ble @081D23C0 mov r0, r10 subs r0, 0x38 lsls r0, 2 @@ -902111,13 +902111,13 @@ _081D2328: add r0, r9 str r0, [sp, 0x10] cmp r5, r8 - bcs _081D237A + bcs @081D237A ldr r0, =0x00026bff cmp r4, r0 - bgt _081D237A + bgt @081D237A mov r1, r12 str r1, [sp, 0x14] -_081D2352: +@081D2352: ldr r3, [sp, 0x14] adds r2, r3, r7 asrs r1, r4, 10 @@ -902134,11 +902134,11 @@ _081D2352: lsls r0, 16 lsrs r5, r0, 16 cmp r5, r8 - bcs _081D237A + bcs @081D237A ldr r1, =0x00026bff cmp r4, r1 - ble _081D2352 -_081D237A: + ble @081D2352 +@081D237A: mov r2, r10 adds r1, r2, r5 ldr r3, [sp] @@ -902151,10 +902151,10 @@ _081D237A: lsls r0, 2 adds r6, r0 cmp r5, r8 - bcs _081D23B6 + bcs @081D23B6 mov r3, r12 movs r7, 0x1 -_081D2398: +@081D2398: adds r2, r3, r6 asrs r1, r4, 10 asrs r0, r4, 9 @@ -902169,16 +902169,16 @@ _081D2398: lsls r0, 16 lsrs r5, r0, 16 cmp r5, r8 - bcc _081D2398 -_081D23B6: + bcc @081D2398 +@081D23B6: subs r0, r6, 0x4 - b _081D248C + b @081D248C .align 2, 0 .pool -_081D23C0: +@081D23C0: ldr r1, [sp, 0xC] cmp r1, 0 - bge _081D2464 + bge @081D2464 mov r0, r10 subs r0, 0x38 lsls r0, 2 @@ -902191,7 +902191,7 @@ _081D23C0: add r3, r9 str r3, [sp, 0x10] cmp r5, r8 - bcs _081D241E + bcs @081D241E adds r3, r2, r6 asrs r1, r4, 10 asrs r0, r4, 9 @@ -902200,8 +902200,8 @@ _081D23C0: adds r1, r0 add r1, r9 strh r1, [r3] - b _081D2414 -_081D23F2: + b @081D2414 +@081D23F2: ldr r0, [sp, 0xC] adds r4, r0 adds r6, 0x4 @@ -902209,7 +902209,7 @@ _081D23F2: lsls r0, 16 lsrs r5, r0, 16 cmp r5, r8 - bcs _081D241E + bcs @081D241E mov r1, r12 adds r3, r1, r6 asrs r2, r4, 10 @@ -902219,13 +902219,13 @@ _081D23F2: adds r2, r0 add r2, r9 strh r2, [r3] -_081D2414: +@081D2414: ldr r0, =0x00026bff cmp r4, r0 - bgt _081D23F2 + bgt @081D23F2 movs r0, 0x9B strh r0, [r3] -_081D241E: +@081D241E: mov r2, r10 adds r1, r2, r5 ldr r3, [sp] @@ -902238,10 +902238,10 @@ _081D241E: lsls r0, 2 adds r7, r0 cmp r5, r8 - bcs _081D245A + bcs @081D245A mov r3, r12 movs r6, 0x1 -_081D243C: +@081D243C: adds r2, r3, r7 asrs r1, r4, 10 asrs r0, r4, 9 @@ -902256,13 +902256,13 @@ _081D243C: lsls r0, 16 lsrs r5, r0, 16 cmp r5, r8 - bcc _081D243C -_081D245A: + bcc @081D243C +@081D245A: subs r0, r7, 0x4 - b _081D248C + b @081D248C .align 2, 0 .pool -_081D2464: +@081D2464: ldr r1, [sp] movs r2, 0xD4 lsls r2, 2 @@ -902282,13 +902282,13 @@ _081D2464: strh r0, [r7] movs r0, 0x9B strh r0, [r7, 0x2] - b _081D2494 -_081D248C: + b @081D2494 +@081D248C: add r0, r12 mov r2, sp ldrh r2, [r2, 0x10] strh r2, [r0] -_081D2494: +@081D2494: add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -902300,7 +902300,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 @@ -902313,7 +902313,7 @@ sub_81D24A4: @ 81D24A4 ldrh r0, [r2] ldrh r3, [r1] cmp r0, r3 - bcs _081D24E0 + bcs @081D24E0 adds r7, r0, 0 movs r0, 0xA0 lsls r0, 1 @@ -902329,8 +902329,8 @@ sub_81D24A4: @ 81D24A4 str r0, [sp, 0x4] adds r0, r4, 0 bl sub_81D2278 - b _081D2500 -_081D24E0: + b @081D2500 +@081D24E0: ldrh r7, [r1] movs r2, 0xA0 lsls r2, 1 @@ -902346,7 +902346,7 @@ _081D24E0: str r0, [sp, 0x4] adds r0, r4, 0 bl sub_81D2278 -_081D2500: +@081D2500: movs r1, 0xA0 lsls r1, 1 adds r5, r4, r1 @@ -902374,9 +902374,9 @@ _081D2500: ldrh r0, [r0] ldrh r1, [r1] cmp r0, r1 - bhi _081D253C + bhi @081D253C movs r2, 0x1 -_081D253C: +@081D253C: movs r0, 0x9C lsls r0, 1 adds r3, r4, r0 @@ -902391,13 +902391,13 @@ _081D253C: bl sub_81D2278 movs r2, 0x38 cmp r2, r7 - bcs _081D257E + bcs @081D257E adds r6, r5, 0 movs r3, 0 movs r0, 0xA1 lsls r0, 1 adds r5, r4, r0 -_081D2566: +@081D2566: adds r0, r2, 0 subs r0, 0x38 lsls r0, 2 @@ -902409,8 +902409,8 @@ _081D2566: lsls r0, 16 lsrs r2, r0, 16 cmp r2, r7 - bcc _081D2566 -_081D257E: + bcc @081D2566 +@081D257E: movs r1, 0x97 lsls r1, 1 adds r0, r4, r1 @@ -902420,13 +902420,13 @@ _081D257E: adds r0, r4, r3 ldrh r1, [r0] cmp r2, r1 - bhi _081D25B2 + bhi @081D25B2 movs r1, 0xA0 lsls r1, 1 adds r3, r4, r1 movs r5, 0x9B adds r1, r0, 0 -_081D259C: +@081D259C: adds r0, r2, 0 subs r0, 0x38 lsls r0, 2 @@ -902437,8 +902437,8 @@ _081D259C: lsrs r2, r0, 16 ldrh r0, [r1] cmp r2, r0 - bls _081D259C -_081D25B2: + bls @081D259C +@081D25B2: movs r2, 0x9B lsls r2, 1 adds r1, r4, r2 @@ -902448,14 +902448,14 @@ _081D25B2: ldrh r0, [r0] ldrh r1, [r1] cmp r0, r1 - bcs _081D25C8 + bcs @081D25C8 adds r0, r1, 0 -_081D25C8: +@081D25C8: adds r0, 0x1 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x79 - bhi _081D25F8 + bhi @081D25F8 movs r0, 0xA0 lsls r0, 1 adds r6, r4, r0 @@ -902463,7 +902463,7 @@ _081D25C8: movs r1, 0xA1 lsls r1, 1 adds r5, r4, r1 -_081D25E0: +@081D25E0: adds r0, r2, 0 subs r0, 0x38 lsls r0, 2 @@ -902475,8 +902475,8 @@ _081D25E0: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x79 - bls _081D25E0 -_081D25F8: + bls @081D25E0 +@081D25F8: movs r2, 0x38 movs r3, 0xA0 lsls r3, 1 @@ -902485,25 +902485,25 @@ _081D25F8: lsls r0, 1 adds r4, r0 movs r6, 0x9B -_081D2608: +@081D2608: adds r0, r2, 0 subs r0, 0x38 lsls r1, r0, 2 adds r3, r5, r1 ldrh r0, [r3] cmp r0, 0 - bne _081D2620 + bne @081D2620 adds r0, r4, r1 ldrh r0, [r0] cmp r0, 0 - beq _081D2620 + beq @081D2620 strh r6, [r3] -_081D2620: +@081D2620: adds r0, r2, 0x1 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x79 - bls _081D2608 + bls @081D2608 add sp, 0x8 pop {r4-r7} pop {r0} @@ -902511,7 +902511,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 @@ -902524,7 +902524,7 @@ sub_81D2634: @ 81D2634 ldrh r0, [r2] ldrh r5, [r1] cmp r0, r5 - bcs _081D266E + bcs @081D266E adds r6, r0, 0 movs r0, 0x92 lsls r0, 2 @@ -902539,8 +902539,8 @@ sub_81D2634: @ 81D2634 str r0, [sp, 0x4] adds r0, r4, 0 bl sub_81D2278 - b _081D2690 -_081D266E: + b @081D2690 +@081D266E: ldrh r6, [r1] movs r0, 0x92 lsls r0, 2 @@ -902557,7 +902557,7 @@ _081D266E: str r0, [sp, 0x4] adds r0, r4, 0 bl sub_81D2278 -_081D2690: +@081D2690: movs r0, 0x92 lsls r0, 2 adds r5, r4, r0 @@ -902574,19 +902574,19 @@ _081D2690: adds r1, r5, 0 bl sub_81D2278 cmp r6, 0x38 - ble _081D26C8 + ble @081D26C8 movs r0, 0 adds r1, r5, 0 adds r2, r6, 0 subs r2, 0x38 -_081D26BC: +@081D26BC: strh r0, [r1] strh r0, [r1, 0x2] adds r1, 0x4 subs r2, 0x1 cmp r2, 0 - bne _081D26BC -_081D26C8: + bne @081D26BC +@081D26C8: movs r1, 0x97 lsls r1, 1 adds r0, r4, r1 @@ -902596,7 +902596,7 @@ _081D26C8: adds r0, r4, r3 ldrh r5, [r0] cmp r2, r5 - bgt _081D26F6 + bgt @081D26F6 movs r3, 0x9B adds r1, r0, 0 lsls r0, r2, 2 @@ -902604,14 +902604,14 @@ _081D26C8: lsls r5, 1 adds r0, r5 adds r0, r4 -_081D26EA: +@081D26EA: strh r3, [r0] adds r0, 0x4 adds r2, 0x1 ldrh r5, [r1] cmp r2, r5 - ble _081D26EA -_081D26F6: + ble @081D26EA +@081D26F6: movs r1, 0x9D lsls r1, 1 adds r0, r4, r1 @@ -902622,43 +902622,43 @@ _081D26F6: adds r0, r4, r2 ldrh r0, [r0] cmp r0, r1 - bge _081D270E + bge @081D270E adds r0, r1, 0 -_081D270E: +@081D270E: adds r2, r0, 0 cmp r2, 0x79 - bgt _081D272C + bgt @081D272C movs r1, 0 lsls r0, r2, 2 movs r3, 0xB4 lsls r3, 1 adds r0, r3 adds r0, r4 -_081D2720: +@081D2720: strh r1, [r0] strh r1, [r0, 0x2] adds r0, 0x4 adds r2, 0x1 cmp r2, 0x79 - ble _081D2720 -_081D272C: + ble @081D2720 +@081D272C: movs r3, 0 movs r5, 0x92 lsls r5, 2 adds r1, r4, r5 movs r2, 0x41 -_081D2736: +@081D2736: ldrh r0, [r1] ldrh r4, [r1, 0x2] cmp r0, r4 - bcc _081D2742 + bcc @081D2742 strh r3, [r1, 0x2] strh r3, [r1] -_081D2742: +@081D2742: adds r1, 0x4 subs r2, 0x1 cmp r2, 0 - bge _081D2736 + bge @081D2736 add sp, 0x8 pop {r4-r6} pop {r0} @@ -902666,7 +902666,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 @@ -902692,7 +902692,7 @@ sub_81D2754: @ 81D2754 mov r9, r2 ldr r3, =0x08329f40 mov r10, r3 -_081D2786: +@081D2786: adds r0, r7, 0 adds r0, 0x33 lsls r0, 24 @@ -902705,19 +902705,19 @@ _081D2786: lsrs r3, r0, 24 mov r12, r3 cmp r0, 0 - bge _081D27A4 + bge @081D27A4 movs r0, 0x4 mov r12, r0 -_081D27A4: +@081D27A4: mov r1, r12 lsls r0, r1, 24 asrs r4, r0, 24 cmp r4, 0x2 - bne _081D27B4 + bne @081D27B4 adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 -_081D27B4: +@081D27B4: ldrb r0, [r6] ldr r2, =0x08625410 adds r0, r2 @@ -902748,23 +902748,23 @@ _081D27B4: subs r0, r1 strh r0, [r3, 0x2] cmp r4, 0x2 - bgt _081D2800 + bgt @081D2800 cmp r2, 0x20 - bne _081D27FA + bne @081D27FA cmp r4, 0x2 - beq _081D2800 -_081D27FA: + beq @081D2800 +@081D27FA: adds r0, r5, 0 adds r0, 0x9C strh r0, [r3] -_081D2800: +@081D2800: mov r0, r9 adds r0, 0x1 lsls r0, 16 lsrs r0, 16 mov r9, r0 cmp r0, 0x4 - bls _081D2786 + bls @081D2786 pop {r3-r5} mov r8, r3 mov r9, r4 @@ -902777,7 +902777,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 @@ -902793,7 +902793,7 @@ sub_81D2824: @ 81D2824 movs r2, 0x20 bl gpu_pal_apply movs r4, 0 -_081D284A: +@081D284A: adds r0, r4, 0 movs r1, 0x11 bl Window_FastFillPixels @@ -902801,9 +902801,9 @@ _081D284A: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 - bls _081D284A + bls @081D284A cmp r5, 0 - bne _081D287C + bne @081D287C movs r0, 0 bl Window_WriteStandardTileMap movs r0, 0 @@ -902811,10 +902811,10 @@ _081D284A: movs r2, 0x1 movs r3, 0xE bl SetWindowBorderStyle - b _081D288E + b @081D288E .align 2, 0 .pool -_081D287C: +@081D287C: movs r0, 0x1 bl Window_WriteStandardTileMap movs r0, 0x1 @@ -902822,7 +902822,7 @@ _081D287C: movs r2, 0x1 movs r3, 0xE bl SetWindowBorderStyle -_081D288E: +@081D288E: movs r0, 0x2 bl Window_WriteStandardTileMap movs r0, 0x3 @@ -902846,12 +902846,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 @@ -902865,15 +902865,15 @@ sub_81D28C8: @ 81D28C8 strh r4, [r3, 0xC] str r0, [r3] cmp r4, 0x5 - bhi _081D28F0 + bhi @081D28F0 strh r4, [r3, 0xE] - b _081D28F4 + b @081D28F4 .align 2, 0 .pool -_081D28F0: +@081D28F0: movs r0, 0x6 strh r0, [r3, 0xE] -_081D28F4: +@081D28F4: ldrb r0, [r3, 0xE] pop {r4-r7} pop {r1} @@ -902881,7 +902881,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 @@ -902960,14 +902960,14 @@ sub_81D28FC: @ 81D28FC movs r0, 0x2 negs r0, r0 cmp r9, r0 - bne _081D29C4 + bne @081D29C4 movs r0, 0 movs r1, 0x2 bl Window_CopyToVram - b _081D2AB6 + b @081D2AB6 .align 2, 0 .pool -_081D29C4: +@081D29C4: mov r1, r9 lsls r0, r1, 1 add r0, r9 @@ -903012,19 +903012,19 @@ _081D29C4: bl Print ldrb r0, [r6, 0x1] cmp r0, 0x1 - bhi _081D2A3C + bhi @081D2A3C ldr r5, =0x085e8d45 - b _081D2A4A + b @081D2A4A .align 2, 0 .pool -_081D2A3C: +@081D2A3C: ldrb r1, [r6, 0x1] add r0, sp, 0xC movs r2, 0 movs r3, 0x3 bl decimal_int_to_string add r5, sp, 0xC -_081D2A4A: +@081D2A4A: movs r0, 0x19 str r0, [sp] movs r0, 0xFF @@ -903037,19 +903037,19 @@ _081D2A4A: bl Print ldrb r0, [r6, 0x3] cmp r0, 0 - bne _081D2A70 + bne @081D2A70 ldr r5, =0x085e8d45 - b _081D2A7E + b @081D2A7E .align 2, 0 .pool -_081D2A70: +@081D2A70: ldrb r1, [r6, 0x3] add r0, sp, 0xC movs r2, 0 movs r3, 0x3 bl decimal_int_to_string add r5, sp, 0xC -_081D2A7E: +@081D2A7E: movs r0, 0x29 str r0, [sp] movs r0, 0xFF @@ -903076,7 +903076,7 @@ _081D2A7E: adds r2, r5, 0 movs r3, 0 bl Print -_081D2AB6: +@081D2AB6: add sp, 0x2C pop {r3-r5} mov r8, r3 @@ -903090,7 +903090,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} @@ -903150,14 +903150,14 @@ sub_81D2ACC: @ 81D2ACC movs r0, 0x2 negs r0, r0 cmp r4, r0 - bne _081D2B6C + bne @081D2B6C movs r0, 0x1 movs r1, 0x2 bl Window_CopyToVram - b _081D2BB8 + b @081D2BB8 .align 2, 0 .pool -_081D2B6C: +@081D2B6C: lsls r4, 3 ldr r0, =0x0858c2b4 adds r4, r0 @@ -903193,7 +903193,7 @@ _081D2B6C: movs r0, 0x1 movs r1, 0x2 bl Window_CopyToVram -_081D2BB8: +@081D2BB8: add sp, 0xC pop {r3} mov r8, r3 @@ -903205,16 +903205,16 @@ _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 lsrs r1, 24 cmp r1, 0x1 - beq _081D2BE2 + beq @081D2BE2 movs r0, 0x5 bl audio_play -_081D2BE2: +@081D2BE2: adds r0, r4, 0 bl sub_81D28FC adds r0, r4, 0 @@ -903225,7 +903225,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 @@ -903261,7 +903261,7 @@ sub_81D2BF4: @ 81D2BF4 thumb_func_end sub_81D2BF4 thumb_func_start sub_81D2C3C -sub_81D2C3C: @ 81D2C3C +sub_81D2C3C: ; 81D2C3C push {lr} bl run_remoboxes movs r0, 0x3 @@ -903273,7 +903273,7 @@ sub_81D2C3C: @ 81D2C3C thumb_func_end sub_81D2C3C thumb_func_start sub_81D2C50 -sub_81D2C50: @ 81D2C50 +sub_81D2C50: ; 81D2C50 push {lr} ldr r0, =0x08625540 movs r1, 0x1 @@ -903287,19 +903287,19 @@ 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 lsls r1, 16 lsrs r1, 16 cmp r0, 0xE - bne _081D2CA8 + bne @081D2CA8 cmp r2, 0x2 - beq _081D2C7E + beq @081D2C7E cmp r2, 0x7 - bne _081D2C94 -_081D2C7E: + bne @081D2C94 +@081D2C7E: movs r0, 0x64 muls r0, r1 ldr r1, =0x020244ec @@ -903307,44 +903307,44 @@ _081D2C7E: adds r1, r2, 0 adds r2, r3, 0 bl pokemon_getattr - b _081D2CCA + b @081D2CCA .align 2, 0 .pool -_081D2C94: +@081D2C94: movs r0, 0x64 muls r0, r1 ldr r1, =0x020244ec adds r0, r1 adds r1, r2, 0 bl pokemon_getattr - b _081D2CCA + b @081D2CCA .align 2, 0 .pool -_081D2CA8: +@081D2CA8: cmp r2, 0x2 - beq _081D2CB0 + beq @081D2CB0 cmp r2, 0x7 - bne _081D2CBE -_081D2CB0: + bne @081D2CBE +@081D2CB0: lsls r0, 24 lsrs r0, 24 lsls r1, 24 lsrs r1, 24 bl sub_80D1ED0 - b _081D2CCA -_081D2CBE: + b @081D2CCA +@081D2CBE: lsls r0, 24 lsrs r0, 24 lsls r1, 24 lsrs r1, 24 bl get_pokemon_data_from_any_box -_081D2CCA: +@081D2CCA: pop {r1} bx r1 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} @@ -903374,16 +903374,16 @@ sub_81D2CD0: @ 81D2CD0 movs r3, 0 bl sub_81D2C68 cmp r0, 0 - beq _081D2D20 + beq @081D2D20 ldr r1, =0x085e8264 adds r0, r5, 0 movs r2, 0 movs r3, 0xC bl sub_8009128 - b _081D2E70 + b @081D2E70 .align 2, 0 .pool -_081D2D20: +@081D2D20: adds r0, r4, 0 adds r1, r6, 0 movs r2, 0x2 @@ -903399,7 +903399,7 @@ _081D2D20: lsls r0, 16 lsrs r7, r0, 16 cmp r4, 0xE - bne _081D2D70 + bne @081D2D70 movs r0, 0x64 adds r4, r6, 0 muls r4, r0 @@ -903415,10 +903415,10 @@ _081D2D20: bl pokemon_get_gender lsls r0, 24 lsrs r6, r0, 24 - b _081D2D92 + b @081D2D92 .align 2, 0 .pool -_081D2D70: +@081D2D70: lsls r0, r4, 24 lsrs r0, 24 lsls r1, r6, 24 @@ -903433,12 +903433,12 @@ _081D2D70: lsls r0, 24 lsrs r0, 24 mov r8, r0 -_081D2D92: +@081D2D92: cmp r7, 0x1D - beq _081D2D9A + beq @081D2D9A cmp r7, 0x20 - bne _081D2DB0 -_081D2D9A: + bne @081D2DB0 +@081D2D9A: movs r0, 0xB adds r1, r7, 0 muls r1, r0 @@ -903447,19 +903447,19 @@ _081D2D9A: adds r0, r5, 0 bl sub_8008C44 cmp r0, 0 - bne _081D2DB0 + bne @081D2DB0 movs r6, 0xFF -_081D2DB0: +@081D2DB0: adds r3, r5, 0 - b _081D2DBA + b @081D2DBA .align 2, 0 .pool -_081D2DB8: +@081D2DB8: adds r3, 0x1 -_081D2DBA: +@081D2DBA: ldrb r0, [r3] cmp r0, 0xFF - bne _081D2DB8 + bne @081D2DB8 movs r1, 0xFC strb r1, [r3] adds r3, 0x1 @@ -903470,12 +903470,12 @@ _081D2DBA: strb r0, [r3] adds r3, 0x1 cmp r6, 0 - beq _081D2DDE + beq @081D2DDE cmp r6, 0xFE - beq _081D2E02 + beq @081D2E02 movs r0, 0 - b _081D2E24 -_081D2DDE: + b @081D2E24 +@081D2DDE: strb r1, [r3] adds r3, 0x1 movs r0, 0x1 @@ -903493,8 +903493,8 @@ _081D2DDE: strb r0, [r3] adds r3, 0x1 movs r0, 0xB5 - b _081D2E24 -_081D2E02: + b @081D2E24 +@081D2E02: strb r1, [r3] adds r3, 0x1 movs r0, 0x1 @@ -903512,7 +903512,7 @@ _081D2E02: strb r0, [r3] adds r3, 0x1 movs r0, 0xB6 -_081D2E24: +@081D2E24: strb r0, [r3] adds r3, 0x1 movs r0, 0xFC @@ -903550,7 +903550,7 @@ _081D2E24: movs r0, 0xFF strb r0, [r3] adds r0, r3, 0 -_081D2E70: +@081D2E70: pop {r3} mov r8, r3 pop {r4-r7} @@ -903559,13 +903559,13 @@ _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 lsrs r2, 16 - b _081D2E94 -_081D2E86: + b @081D2E94 +@081D2E86: strb r3, [r4] adds r1, 0x1 adds r4, 0x1 @@ -903573,11 +903573,11 @@ _081D2E86: ldr r2, =0xffff0000 adds r0, r2 lsrs r2, r0, 16 -_081D2E94: +@081D2E94: ldrb r3, [r1] adds r0, r3, 0 cmp r0, 0xFF - bne _081D2E86 + bne @081D2E86 adds r1, r2, 0 lsls r0, r1, 16 ldr r2, =0xffff0000 @@ -903585,9 +903585,9 @@ _081D2E94: lsrs r2, r0, 16 lsls r1, 16 cmp r1, 0 - ble _081D2EC2 + ble @081D2EC2 movs r3, 0 -_081D2EAE: +@081D2EAE: strb r3, [r4] adds r4, 0x1 adds r1, r2, 0 @@ -903597,8 +903597,8 @@ _081D2EAE: lsrs r2, r0, 16 lsls r1, 16 cmp r1, 0 - bgt _081D2EAE -_081D2EC2: + bgt @081D2EAE +@081D2EC2: movs r0, 0xFF strb r0, [r4] adds r0, r4, 0 @@ -903610,7 +903610,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 @@ -903627,13 +903627,13 @@ sub_81D2ED4: @ 81D2ED4 lsrs r0, r1, 16 lsls r4, 24 cmp r4, 0 - bne _081D2EFC + bne @081D2EFC subs r0, 0x1 lsls r0, 16 lsrs r0, 16 -_081D2EFC: +@081D2EFC: cmp r2, r0 - beq _081D2F42 + beq @081D2F42 adds r0, r6, 0 adds r1, r7, 0 adds r2, r3, 0 @@ -903649,58 +903649,58 @@ _081D2EFC: movs r0, 0x9 strb r0, [r5, 0x4] cmp r7, 0xE - bne _081D2F2C + bne @081D2F2C adds r0, r5, 0x5 ldr r1, =0x085ebfce - b _081D2F3A + b @081D2F3A .align 2, 0 .pool -_081D2F2C: +@081D2F2C: adds r4, r5, 0x5 lsls r0, r7, 24 lsrs r0, 24 bl sav3_get_box_name adds r1, r0, 0 adds r0, r4, 0 -_081D2F3A: +@081D2F3A: movs r2, 0x8 bl sub_81D2E7C - b _081D2F72 -_081D2F42: + b @081D2F72 +@081D2F42: movs r1, 0 movs r2, 0 -_081D2F46: +@081D2F46: adds r0, r6, r1 strb r2, [r0] adds r0, r1, 0x1 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0xB - bls _081D2F46 + bls @081D2F46 adds r1, r6, r1 movs r0, 0xFF strb r0, [r1] movs r1, 0 movs r2, 0 -_081D2F5E: +@081D2F5E: adds r0, r5, r1 strb r2, [r0] adds r0, r1, 0x1 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x7 - bls _081D2F5E + bls @081D2F5E adds r1, r5, r1 movs r0, 0xFF strb r0, [r1] -_081D2F72: +@081D2F72: pop {r4-r7} pop {r0} bx r0 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 @@ -903725,13 +903725,13 @@ sub_81D2F78: @ 81D2F78 lsrs r0, r4, 16 lsls r5, 24 cmp r5, 0 - bne _081D2FB0 + bne @081D2FB0 subs r0, 0x1 lsls r0, 16 lsrs r0, 16 -_081D2FB0: +@081D2FB0: cmp r2, r0 - beq _081D305C + beq @081D305C adds r0, r7, 0 adds r1, r6, 0 movs r2, 0x16 @@ -903787,7 +903787,7 @@ _081D2FB0: movs r3, 0 bl sub_81D2C68 cmp r0, 0xFF - beq _081D3044 + beq @081D3044 adds r0, r7, 0 adds r1, r6, 0 movs r2, 0x30 @@ -903795,10 +903795,10 @@ _081D2FB0: bl sub_81D2C68 movs r1, 0x1D bl __udivsi3 - b _081D3046 -_081D3044: + b @081D3046 +@081D3044: movs r0, 0x9 -_081D3046: +@081D3046: strb r0, [r4] mov r0, r9 adds r1, r5, r0 @@ -903808,8 +903808,8 @@ _081D3046: adds r1, 0x14 add r1, r8 bl sub_81D2754 - b _081D3086 -_081D305C: + b @081D3086 +@081D305C: movs r2, 0 mov r0, r9 lsls r5, r0, 2 @@ -903818,7 +903818,7 @@ _081D305C: lsls r3, r1, 2 movs r5, 0x9B movs r4, 0x5B -_081D306C: +@081D306C: adds r0, r2, r1 add r0, r8 strb r6, [r0] @@ -903831,8 +903831,8 @@ _081D306C: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x4 - bls _081D306C -_081D3086: + bls @081D306C +@081D3086: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -903843,7 +903843,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 @@ -903864,13 +903864,13 @@ sub_81D3094: @ 81D3094 lsrs r0, r1, 16 lsls r4, 24 cmp r4, 0 - bne _081D30C4 + bne @081D30C4 subs r0, 0x1 lsls r0, 16 lsrs r0, 16 -_081D30C4: +@081D30C4: cmp r2, r0 - beq _081D311A + beq @081D311A adds r0, r7, 0 adds r1, r5, 0 movs r2, 0x41 @@ -903906,7 +903906,7 @@ _081D30C4: bl species_and_otid_get_pal mov r1, r9 bl LZ77UnCompWram -_081D311A: +@081D311A: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -903919,7 +903919,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] @@ -903927,10 +903927,10 @@ sub_81D312C: @ 81D312C strh r0, [r1] lsls r0, 16 cmp r0, 0 - ble _081D3140 + ble @081D3140 movs r0, 0 strh r0, [r1] -_081D3140: +@081D3140: movs r0, 0 ldrsh r1, [r1, r0] negs r0, r1 @@ -903941,7 +903941,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] @@ -903952,9 +903952,9 @@ sub_81D3150: @ 81D3150 movs r2, 0x50 negs r2, r2 cmp r0, r2 - bge _081D3168 + bge @081D3168 strh r2, [r1] -_081D3168: +@081D3168: movs r0, 0 ldrsh r1, [r1, r0] eors r1, r2 @@ -903966,7 +903966,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 @@ -903979,12 +903979,12 @@ sub_81D3178: @ 81D3178 lsrs r0, 24 movs r1, 0 cmp r4, 0 - bne _081D319A + bne @081D319A cmp r0, 0 - beq _081D319C -_081D319A: + beq @081D319C +@081D319A: movs r1, 0x1 -_081D319C: +@081D319C: adds r0, r1, 0 pop {r4,r5} pop {r1} @@ -903992,7 +903992,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 @@ -904005,12 +904005,12 @@ sub_81D31A4: @ 81D31A4 lsrs r0, 24 movs r1, 0 cmp r4, 0 - bne _081D31C6 + bne @081D31C6 cmp r0, 0 - beq _081D31C8 -_081D31C6: + beq @081D31C8 +@081D31C6: movs r1, 0x1 -_081D31C8: +@081D31C8: adds r0, r1, 0 pop {r4,r5} pop {r1} @@ -904018,7 +904018,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, =0x08625a48 @@ -904055,7 +904055,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} @@ -904086,7 +904086,7 @@ sub_81D321C: @ 81D321C ldm r0!, {r4,r6,r7} stm r1!, {r4,r6,r7} movs r4, 0 -_081D3258: +@081D3258: lsls r0, r4, 3 add r0, sp ldr r1, [r0, 0x4] @@ -904096,7 +904096,7 @@ _081D3258: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _081D3258 + bls @081D3258 mov r1, r12 adds r0, r2, 0 ldm r0!, {r2,r4,r5} @@ -904104,7 +904104,7 @@ _081D3258: ldm r0!, {r2,r6,r7} stm r1!, {r2,r6,r7} movs r4, 0 -_081D327A: +@081D327A: lsls r0, r4, 3 adds r0, r3, r0 ldr r1, [r0, 0x4] @@ -904118,7 +904118,7 @@ _081D327A: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls _081D327A + bls @081D327A add sp, 0x50 pop {r3} mov r8, r3 @@ -904130,7 +904130,7 @@ _081D327A: thumb_func_end sub_81D321C thumb_func_start sub_81D32B0 -sub_81D32B0: @ 81D32B0 +sub_81D32B0: ; 81D32B0 push {r4,r5,lr} ldr r2, =0x08625ac0 ldr r4, [r2] @@ -904150,7 +904150,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] @@ -904159,18 +904159,18 @@ sub_81D32D4: @ 81D32D4 lsls r0, 16 asrs r0, 16 cmp r0, 0x3C - ble _081D32F0 + ble @081D32F0 movs r0, 0 strh r0, [r1, 0x30] adds r0, r1, 0 bl sub_81D3408 -_081D32F0: +@081D32F0: pop {r0} bx r0 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 @@ -904178,12 +904178,12 @@ sub_81D32F4: @ 81D32F4 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _081D330C + beq @081D330C movs r0, 0 strh r0, [r2, 0x30] ldr r0, =sub_81D32D4 + 1 str r0, [r2, 0x1C] -_081D330C: +@081D330C: pop {r0} bx r0 .align 2, 0 @@ -904191,7 +904191,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 @@ -904202,7 +904202,7 @@ sub_81D3314: @ 81D3314 ldr r0, =0x02020630 adds r3, r1, r0 cmp r3, 0 - beq _081D3360 + beq @081D3360 ldrh r1, [r3, 0x24] ldrh r2, [r3, 0x20] adds r1, r2 @@ -904224,10 +904224,10 @@ sub_81D3314: @ 81D3314 adds r0, r2 ldrh r0, [r0] adds r0, r1 - b _081D337E + b @081D337E .align 2, 0 .pool -_081D3360: +@081D3360: ldr r1, =0x08625b2c movs r5, 0x2E ldrsh r0, [r4, r5] @@ -904243,7 +904243,7 @@ _081D3360: adds r0, r1 ldrh r0, [r0] adds r0, 0x68 -_081D337E: +@081D337E: strh r0, [r4, 0x22] pop {r4,r5} pop {r0} @@ -904253,7 +904253,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} @@ -904263,13 +904263,13 @@ sub_81D338C: @ 81D338C lsls r1, 24 lsrs r7, r1, 24 movs r5, 0 -_081D339E: +@081D339E: lsls r0, r5, 2 mov r1, r8 adds r4, r0, r1 ldr r0, [r4] cmp r0, 0 - beq _081D33F0 + beq @081D33F0 strh r5, [r0, 0x2E] ldr r1, [r4] lsls r0, r5, 4 @@ -904280,17 +904280,17 @@ _081D339E: ldr r0, [r4] strh r5, [r0, 0x34] cmp r7, 0 - beq _081D33C4 + beq @081D33C4 cmp r6, 0x9 - beq _081D33D0 -_081D33C4: + beq @081D33D0 +@081D33C4: ldr r1, [r4] ldr r0, =sub_81D3564 + 1 str r0, [r1, 0x1C] - b _081D33F0 + b @081D33F0 .align 2, 0 .pool -_081D33D0: +@081D33D0: ldr r0, [r4] bl sub_81D3314 ldr r0, [r4] @@ -904305,12 +904305,12 @@ _081D33D0: adds r1, r3, 0 ands r0, r1 strb r0, [r2] -_081D33F0: +@081D33F0: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x9 - bls _081D339E + bls @081D339E pop {r3} mov r8, r3 pop {r4-r7} @@ -904321,7 +904321,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] @@ -904332,13 +904332,13 @@ sub_81D3408: @ 81D3408 ldrsh r0, [r4, r1] adds r0, 0x1 cmp r3, r0 - bge _081D3454 + bge @081D3454 ldr r5, =0x02020630 movs r7, 0x1C adds r7, r5 mov r12, r7 ldr r6, =sub_81D3564 + 1 -_081D3428: +@081D3428: lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -904360,8 +904360,8 @@ _081D3428: ldrsh r0, [r4, r1] adds r0, 0x1 cmp r3, r0 - blt _081D3428 -_081D3454: + blt @081D3428 +@081D3454: pop {r4-r7} pop {r0} bx r0 @@ -904370,12 +904370,12 @@ _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 movs r3, 0 -_081D346C: +@081D346C: lsls r0, r1, 2 adds r0, r2 str r3, [r0] @@ -904383,13 +904383,13 @@ _081D346C: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x9 - bls _081D346C + bls @081D346C pop {r0} bx r0 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 @@ -904406,8 +904406,8 @@ sub_81D3480: @ 81D3480 movs r5, 0 adds r0, r7, 0x1 cmp r9, r0 - bge _081D34FE -_081D34A2: + bge @081D34FE +@081D34A2: ldr r0, =0x08625b14 movs r1, 0 movs r2, 0 @@ -904417,7 +904417,7 @@ _081D34A2: lsrs r3, r0, 24 adds r6, r3, 0 cmp r3, 0x40 - beq _081D34FE + beq @081D34FE lsls r0, r5, 2 mov r1, r8 adds r4, r0, r1 @@ -904436,23 +904436,23 @@ _081D34A2: mov r1, r10 strh r1, [r0, 0x36] cmp r5, 0 - beq _081D34F0 + beq @081D34F0 subs r0, r4, 0x4 ldr r0, [r0] strh r3, [r0, 0x38] - b _081D34F2 + b @081D34F2 .align 2, 0 .pool -_081D34F0: +@081D34F0: mov r9, r6 -_081D34F2: +@081D34F2: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 adds r0, r7, 0x1 cmp r5, r0 - blt _081D34A2 -_081D34FE: + blt @081D34A2 +@081D34FE: lsls r0, r7, 2 add r0, r8 ldr r0, [r0] @@ -904472,33 +904472,33 @@ _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 -_081D3526: +@081D3526: cmp r5, 0x9 - bhi _081D3544 + bhi @081D3544 lsls r0, r5, 2 adds r4, r0, r6 ldr r0, [r4] cmp r0, 0 - beq _081D3544 + beq @081D3544 bl obj_delete_and_free_tiles movs r0, 0 str r0, [r4] adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 - b _081D3526 -_081D3544: + b @081D3526 +@081D3544: pop {r4-r6} pop {r0} bx r0 thumb_func_end sub_81D3520 thumb_func_start sub_81D354C -sub_81D354C: @ 81D354C +sub_81D354C: ; 81D354C push {lr} bl sub_81D3520 movs r0, 0x68 @@ -904510,19 +904510,19 @@ 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] movs r2, 0x30 ldrsh r0, [r4, r2] cmp r0, 0 - beq _081D3592 + beq @081D3592 subs r0, r1, 0x1 strh r0, [r4, 0x30] lsls r0, 16 cmp r0, 0 - bne _081D35DC + bne @081D35DC adds r0, r4, 0 movs r1, 0 bl obj_anim_image_seek @@ -904533,7 +904533,7 @@ sub_81D3564: @ 81D3564 negs r0, r0 ands r0, r1 strb r0, [r2] -_081D3592: +@081D3592: adds r0, r4, 0 bl sub_81D3314 adds r0, r4, 0 @@ -904542,7 +904542,7 @@ _081D3592: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _081D35DC + beq @081D35DC adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -904554,25 +904554,25 @@ _081D3592: movs r2, 0x32 ldrsh r0, [r4, r2] cmp r1, r0 - bne _081D35D8 + bne @081D35D8 cmp r1, 0x9 - bne _081D35D0 + bne @081D35D0 adds r0, r4, 0 bl sub_81D35E8 ldr r0, =sub_81D32F4 + 1 - b _081D35DA + b @081D35DA .align 2, 0 .pool -_081D35D0: +@081D35D0: ldr r0, =sub_81D32D4 + 1 - b _081D35DA + b @081D35DA .align 2, 0 .pool -_081D35D8: +@081D35D8: ldr r0, =nullsub_12 + 1 -_081D35DA: +@081D35DA: str r0, [r4, 0x1C] -_081D35DC: +@081D35DC: pop {r4} pop {r0} bx r0 @@ -904581,7 +904581,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] @@ -904592,11 +904592,11 @@ sub_81D35E8: @ 81D35E8 ldrsh r0, [r6, r2] adds r0, 0x1 cmp r5, r0 - bge _081D3636 + bge @081D3636 movs r0, 0x5 negs r0, r0 adds r7, r0, 0 -_081D3604: +@081D3604: lsls r4, r1, 4 adds r4, r1 lsls r4, 2 @@ -904620,8 +904620,8 @@ _081D3604: ldrsh r0, [r6, r2] adds r0, 0x1 cmp r5, r0 - blt _081D3604 -_081D3636: + blt @081D3604 +@081D3636: pop {r4-r7} pop {r0} bx r0 @@ -904630,7 +904630,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 @@ -904699,7 +904699,7 @@ sub_81D3640: @ 81D3640 negs r0, r0 mov r9, r0 add r6, sp, 0x18 -_081D36CA: +@081D36CA: lsls r0, r7, 4 subs r0, r7 lsls r0, 24 @@ -904726,9 +904726,9 @@ _081D36CA: ldrsh r0, [r4, r1] ldr r1, =0x085eea76 cmp r0, 0 - blt _081D3704 + blt @081D3704 ldr r1, =0x085eea73 -_081D3704: +@081D3704: adds r0, r6, 0 bl gf_strcpy mov r0, r10 @@ -904745,18 +904745,18 @@ _081D3704: ldrsh r1, [r4, r0] adds r0, r1, 0 cmp r1, 0 - bge _081D372C + bge @081D372C negs r0, r1 -_081D372C: +@081D372C: movs r4, 0xC cmp r0, 0x9 - bgt _081D3734 + bgt @081D3734 movs r4, 0x12 -_081D3734: +@081D3734: cmp r1, 0 - bge _081D373A + bge @081D373A negs r1, r1 -_081D373A: +@081D373A: adds r0, r6, 0 movs r2, 0 movs r3, 0x2 @@ -904776,7 +904776,7 @@ _081D373A: lsls r0, 16 lsrs r7, r0, 16 cmp r7, 0x5 - bls _081D36CA + bls @081D36CA add sp, 0x2C pop {r3-r5} mov r8, r3 @@ -904790,7 +904790,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 @@ -904843,7 +904843,7 @@ sub_81D3784: @ 81D3784 movs r2, 0x1 negs r2, r2 mov r8, r2 -_081D37EE: +@081D37EE: lsls r1, r6, 1 mov r0, sp adds r0, r1 @@ -904852,12 +904852,12 @@ _081D37EE: ldrsh r0, [r0, r2] movs r4, 0x3 cmp r0, 0x63 - bgt _081D3808 + bgt @081D3808 movs r4, 0x1 cmp r0, 0x9 - ble _081D3808 + ble @081D3808 movs r4, 0x2 -_081D3808: +@081D3808: mov r0, sp adds r0, r1 adds r0, 0xC @@ -904909,7 +904909,7 @@ _081D3808: lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x5 - bls _081D37EE + bls @081D37EE add sp, 0x2C pop {r3-r5} mov r8, r3 @@ -904923,7 +904923,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 @@ -904956,7 +904956,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] @@ -904977,7 +904977,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 @@ -904987,42 +904987,42 @@ sub_81D38FC: @ 81D38FC adds r4, r5 ldr r1, [r4] cmp r0, r1 - bne _081D3916 + bne @081D3916 movs r0, 0x1 - b _081D3918 -_081D3916: + b @081D3918 +@081D3916: movs r0, 0 -_081D3918: +@081D3918: pop {r4,r5} pop {r1} bx r1 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] subs r0, r6, 0x1 cmp r0, 0x7 - bhi _081D3964 + bhi @081D3964 movs r5, 0 cmp r5, r6 - bcs _081D394C + bcs @081D394C adds r4, r7, 0 adds r4, 0x8 -_081D3936: +@081D3936: adds r0, r4, 0 bl sub_81D38FC cmp r0, 0 - beq _081D3964 + beq @081D3964 movs r0, 0x9D lsls r0, 2 adds r4, r0 adds r5, 0x1 cmp r5, r6 - bcc _081D3936 -_081D394C: + bcc @081D3936 +@081D394C: adds r0, r7, 0 adds r0, 0x8 movs r1, 0x9D @@ -905031,25 +905031,25 @@ _081D394C: bl sub_806F96C ldr r1, [r7, 0x4] cmp r0, r1 - bne _081D3964 + bne @081D3964 movs r0, 0x1 - b _081D3966 -_081D3964: + b @081D3966 +@081D3964: movs r0, 0 -_081D3966: +@081D3966: pop {r4-r7} pop {r1} bx r1 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] subs r0, 0x1 cmp r0, 0x7 - bhi _081D398E + bhi @081D398E adds r0, r4, 0 adds r0, 0x8 movs r1, 0xEE @@ -905057,19 +905057,19 @@ sub_81D396C: @ 81D396C bl sub_806F96C ldr r1, [r4, 0x4] cmp r0, r1 - bne _081D398E + bne @081D398E movs r0, 0x1 - b _081D3990 -_081D398E: + b @081D3990 +@081D398E: movs r0, 0 -_081D3990: +@081D3990: pop {r4} pop {r1} bx r1 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} @@ -905091,12 +905091,12 @@ sub_81D3998: @ 81D3998 asrs r0, 1 strb r0, [r2, 0x2] movs r6, 0 - b _081D3A42 -_081D39C8: + b @081D3A42 +@081D39C8: movs r0, 0x1 ands r0, r6 cmp r0, 0 - bne _081D3A14 + bne @081D3A14 lsrs r0, r6, 31 adds r0, r6, r0 asrs r0, 1 @@ -905128,8 +905128,8 @@ _081D39C8: movs r2, 0xA4 lsls r2, 1 bl memcpy - b _081D3A40 -_081D3A14: + b @081D3A40 +@081D3A14: lsrs r1, r6, 31 adds r1, r6, r1 asrs r1, 1 @@ -905151,16 +905151,16 @@ _081D3A14: adds r1, 0xC subs r2, 0xC bl memcpy -_081D3A40: +@081D3A40: adds r6, 0x1 -_081D3A42: +@081D3A42: ldrb r0, [r7] cmp r6, r0 - blt _081D39C8 + blt @081D39C8 movs r0, 0x1 ands r0, r6 cmp r0, 0 - beq _081D3A7E + beq @081D3A7E lsrs r2, r6, 31 adds r2, r6, r2 asrs r2, 1 @@ -905183,7 +905183,7 @@ _081D3A42: movs r2, 0xA4 lsls r2, 1 bl memcpy -_081D3A7E: +@081D3A7E: mov r0, r8 adds r0, 0x8 movs r1, 0xEE @@ -905195,14 +905195,14 @@ _081D3A7E: mov r1, r8 bl sub_8153634 cmp r0, 0x1 - bne _081D3AA4 + bne @081D3AA4 movs r0, 0x1 - b _081D3AA6 + b @081D3AA6 .align 2, 0 .pool -_081D3AA4: +@081D3AA4: movs r0, 0 -_081D3AA6: +@081D3AA6: pop {r3} mov r8, r3 pop {r4-r7} @@ -905211,7 +905211,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 @@ -905231,14 +905231,14 @@ 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 movs r0, 0x1E bl sub_81535DC cmp r0, 0x1 - bne _081D3B04 + bne @081D3B04 ldr r2, =0x00000ee8 adds r0, r5, 0 adds r1, r4, 0 @@ -905246,21 +905246,21 @@ sub_81D3AD8: @ 81D3AD8 adds r0, r5, 0 bl sub_81D396C cmp r0, 0 - beq _081D3B04 + beq @081D3B04 movs r0, 0x1 - b _081D3B06 + b @081D3B06 .align 2, 0 .pool -_081D3B04: +@081D3B04: movs r0, 0 -_081D3B06: +@081D3B06: pop {r4,r5} pop {r1} bx r1 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 @@ -905280,7 +905280,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 @@ -905297,7 +905297,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 @@ -905305,16 +905305,16 @@ sub_81D3B54: @ 81D3B54 bl sub_81D41A0 movs r7, 0x2 ldr r4, =0x03003144 -_081D3B64: +@081D3B64: bl sub_81D4170 ldr r0, =0x030012e2 ldrh r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081D3B76 + beq @081D3B76 strb r7, [r4] -_081D3B76: +@081D3B76: movs r0, 0x1 adds r1, r6, 0 adds r2, r5, 0 @@ -905326,31 +905326,31 @@ _081D3B76: movs r0, 0x13 ands r0, r1 cmp r0, 0x10 - bne _081D3BA0 + bne @081D3BA0 movs r4, 0 - b _081D3BC2 + b @081D3BC2 .align 2, 0 .pool -_081D3BA0: +@081D3BA0: movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _081D3BAC + beq @081D3BAC movs r4, 0x1 - b _081D3BC2 -_081D3BAC: + b @081D3BC2 +@081D3BAC: movs r0, 0x4 ands r0, r1 lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne _081D3BC0 + bne @081D3BC0 strb r0, [r4] bl VBlankIntrWait - b _081D3B64 -_081D3BC0: + b @081D3B64 +@081D3BC0: movs r4, 0x2 -_081D3BC2: +@081D3BC2: movs r0, 0 str r0, [sp] ldr r1, =0x030012c8 @@ -905368,23 +905368,23 @@ _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 bl sub_81D41A0 movs r6, 0x2 ldr r4, =0x03003144 -_081D3BF6: +@081D3BF6: bl sub_81D4170 ldr r0, =0x030012e2 ldrh r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081D3C08 + beq @081D3C08 strb r6, [r4] -_081D3C08: +@081D3C08: movs r0, 0 movs r1, 0 movs r2, 0 @@ -905396,31 +905396,31 @@ _081D3C08: movs r0, 0x13 ands r0, r1 cmp r0, 0x10 - bne _081D3C34 + bne @081D3C34 movs r4, 0 - b _081D3C56 + b @081D3C56 .align 2, 0 .pool -_081D3C34: +@081D3C34: movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _081D3C40 + beq @081D3C40 movs r4, 0x1 - b _081D3C56 -_081D3C40: + b @081D3C56 +@081D3C40: movs r0, 0x4 ands r0, r1 lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne _081D3C54 + bne @081D3C54 strb r0, [r4] bl VBlankIntrWait - b _081D3BF6 -_081D3C54: + b @081D3BF6 +@081D3C54: movs r4, 0x2 -_081D3C56: +@081D3C56: movs r0, 0 str r0, [sp] ldr r1, =0x030012c8 @@ -905438,7 +905438,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 @@ -905465,7 +905465,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 @@ -905499,12 +905499,12 @@ sub_81D3CBC: @ 81D3CBC ldr r1, =0x030012c8 ldrb r0, [r1, 0x1] cmp r0, 0 - bne _081D3D0A + bne @081D3D0A str r0, [sp] ldr r2, =0x05000006 mov r0, sp bl CpuSet -_081D3D0A: +@081D3D0A: add sp, 0x4 pop {r4-r7} pop {r0} @@ -905514,7 +905514,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] @@ -905540,7 +905540,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 @@ -905550,52 +905550,52 @@ sub_81D3D70: @ 81D3D70 ldr r0, =0x030012c8 ldrb r0, [r0, 0x1] cmp r0, 0x6 - bls _081D3D86 - b _081D3ECC -_081D3D86: + bls @081D3D86 + b @081D3ECC +@081D3D86: lsls r0, 2 - ldr r1, =_081D3D98 + ldr r1, =@081D3D98 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081D3D98: - .4byte _081D3DB4 - .4byte _081D3DC8 - .4byte _081D3DE8 - .4byte _081D3DFC - .4byte _081D3E74 - .4byte _081D3E84 - .4byte _081D3EBC -_081D3DB4: +@081D3D98: + .4byte @081D3DB4 + .4byte @081D3DC8 + .4byte @081D3DE8 + .4byte @081D3DFC + .4byte @081D3E74 + .4byte @081D3E84 + .4byte @081D3EBC +@081D3DB4: bl sub_81D3CBC ldr r1, =0x030012c8 movs r0, 0x1 strb r0, [r1, 0x2] strb r0, [r1, 0x1] - b _081D3ECC + b @081D3ECC .align 2, 0 .pool -_081D3DC8: +@081D3DC8: adds r0, r2, 0 bl sub_81D3EE8 lsls r0, 16 cmp r0, 0 - beq _081D3DD8 + beq @081D3DD8 bl sub_81D413C -_081D3DD8: +@081D3DD8: ldr r0, =0x03003144 ldrb r0, [r0] cmp r0, 0x2 - beq _081D3DE2 - b _081D3ECC -_081D3DE2: - b _081D3E04 + beq @081D3DE2 + b @081D3ECC +@081D3DE2: + b @081D3E04 .align 2, 0 .pool -_081D3DE8: +@081D3DE8: bl sub_81D3D34 adds r0, r4, 0 adds r1, r5, 0 @@ -905604,20 +905604,20 @@ _081D3DE8: ldr r1, =0x030012c8 movs r0, 0x3 strb r0, [r1, 0x1] -_081D3DFC: +@081D3DFC: ldr r0, =0x03003144 ldrb r0, [r0] cmp r0, 0x2 - bne _081D3E18 -_081D3E04: + bne @081D3E18 +@081D3E04: ldr r1, =0x030012c8 strb r0, [r1, 0x4] movs r0, 0x6 strb r0, [r1, 0x1] - b _081D3ECC + b @081D3ECC .align 2, 0 .pool -_081D3E18: +@081D3E18: ldr r2, =0x030012e6 ldrh r0, [r2] adds r0, 0x1 @@ -905629,56 +905629,56 @@ _081D3E18: ldr r1, =0x030012c8 ldrb r0, [r1] cmp r0, 0 - bne _081D3E3C + bne @081D3E3C cmp r3, 0x3C - bls _081D3E3C + bls @081D3E3C movs r0, 0x1 strb r0, [r1, 0x4] movs r0, 0x6 strb r0, [r1, 0x1] -_081D3E3C: +@081D3E3C: ldr r4, =0x030012c8 ldrb r0, [r4, 0x2] cmp r0, 0x2 - beq _081D3ECC + beq @081D3ECC ldrb r0, [r4] cmp r0, 0 - beq _081D3E64 + beq @081D3E64 ldrh r0, [r2] cmp r0, 0x2 - bls _081D3E64 + bls @081D3E64 bl sub_81D413C movs r0, 0x2 - b _081D3ECA + b @081D3ECA .align 2, 0 .pool -_081D3E64: +@081D3E64: bl sub_81D413C ldr r1, =0x030012c8 movs r0, 0x2 strb r0, [r1, 0x2] - b _081D3ECC + b @081D3ECC .align 2, 0 .pool -_081D3E74: +@081D3E74: bl sub_81D3CBC ldr r1, =0x030012c8 movs r0, 0x5 strb r0, [r1, 0x1] - b _081D3ECC + b @081D3ECC .align 2, 0 .pool -_081D3E84: +@081D3E84: ldr r0, =0x030012c8 ldrb r0, [r0] cmp r0, 0x1 - bne _081D3E98 + bne @081D3E98 ldr r0, =0x030012e6 ldrh r0, [r0] cmp r0, 0x2 - bls _081D3E98 + bls @081D3E98 bl sub_81D413C -_081D3E98: +@081D3E98: ldr r1, =0x030012e6 ldrh r0, [r1] adds r0, 0x1 @@ -905686,25 +905686,25 @@ _081D3E98: lsls r0, 16 lsrs r0, 16 cmp r0, 0x3C - bls _081D3ECC + bls @081D3ECC ldr r0, =0x030012c8 movs r1, 0x1 strb r1, [r0, 0x4] movs r1, 0x6 strb r1, [r0, 0x1] - b _081D3ECC + b @081D3ECC .align 2, 0 .pool -_081D3EBC: +@081D3EBC: ldr r4, =0x030012c8 ldrb r0, [r4, 0x2] cmp r0, 0 - beq _081D3ECC + beq @081D3ECC bl sub_81D3C7C movs r0, 0 -_081D3ECA: +@081D3ECA: strb r0, [r4, 0x2] -_081D3ECC: +@081D3ECC: ldr r2, =0x030012c8 ldrb r0, [r2, 0x2] ldrb r1, [r2, 0x4] @@ -905721,7 +905721,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 @@ -905730,18 +905730,18 @@ sub_81D3EE8: @ 81D3EE8 movs r1, 0xC ands r0, r1 cmp r0, 0x8 - bne _081D3F0C + bne @081D3F0C cmp r2, 0 - beq _081D3F0C + beq @081D3F0C ldr r1, =0x030012c8 movs r0, 0x1 - b _081D3F10 + b @081D3F10 .align 2, 0 .pool -_081D3F0C: +@081D3F0C: ldr r1, =0x030012c8 movs r0, 0 -_081D3F10: +@081D3F10: strb r0, [r1] pop {r1} bx r1 @@ -905750,14 +905750,14 @@ _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 ldr r3, =0x030012c8 ldrb r0, [r3] cmp r0, 0 - beq _081D3F54 + beq @081D3F54 ldr r2, =0x04000128 ldrh r0, [r2] movs r1, 0x1 @@ -905770,15 +905770,15 @@ sub_81D3F1C: @ 81D3F1C adds r0, 0x1 str r0, [r3, 0x10] bl sub_81D3F68 - b _081D3F5C + b @081D3F5C .align 2, 0 .pool -_081D3F54: +@081D3F54: ldr r1, =0x04000128 ldrh r0, [r1] strh r0, [r1] str r2, [r3, 0x8] -_081D3F5C: +@081D3F5C: pop {r4,r5} pop {r0} bx r0 @@ -905787,7 +905787,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 @@ -905810,7 +905810,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 @@ -905819,28 +905819,28 @@ 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 ldrb r0, [r2, 0x1] adds r3, r2, 0 cmp r0, 0x3 - beq _081D4034 + beq @081D4034 cmp r0, 0x3 - bgt _081D3FC8 + bgt @081D3FC8 cmp r0, 0x1 - beq _081D3FD0 - b _081D412A + beq @081D3FD0 + b @081D412A .align 2, 0 .pool -_081D3FC8: +@081D3FC8: cmp r0, 0x5 - bne _081D3FCE - b _081D40FC -_081D3FCE: - b _081D412A -_081D3FD0: + bne @081D3FCE + b @081D40FC +@081D3FCE: + b @081D412A +@081D3FD0: ldr r1, =0x0400012a ldr r2, =0x0000ccd0 adds r0, r2, 0 @@ -905855,60 +905855,60 @@ _081D3FD0: movs r4, 0 ldr r6, =0x0000ccd0 ldr r5, =0x0000ffff -_081D3FEC: +@081D3FEC: lsls r0, r1, 1 add r0, sp ldrh r0, [r0] cmp r0, r6 - bne _081D4010 + bne @081D4010 adds r0, r2, 0x1 lsls r0, 16 lsrs r2, r0, 16 - b _081D401A + b @081D401A .align 2, 0 .pool -_081D4010: +@081D4010: cmp r0, r5 - beq _081D401A + beq @081D401A adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 -_081D401A: +@081D401A: adds r0, r1, 0x1 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x3 - bls _081D3FEC + bls @081D3FEC cmp r2, 0x2 - beq _081D402A - b _081D412A -_081D402A: + beq @081D402A + b @081D412A +@081D402A: cmp r4, 0 - beq _081D4030 - b _081D412A -_081D4030: + beq @081D4030 + b @081D412A +@081D4030: strb r2, [r3, 0x1] - b _081D412A -_081D4034: + b @081D412A +@081D4034: ldr r0, =0x04000120 ldr r4, [r0] ldr r0, [r2, 0xC] cmp r0, 0 - bne _081D404A + bne @081D404A ldrb r0, [r2] cmp r0, 0 - bne _081D404A + bne @081D404A lsrs r0, r4, 2 adds r0, 0x1 str r0, [r2, 0x10] -_081D404A: +@081D404A: ldrb r0, [r3] cmp r0, 0x1 - bne _081D4080 + bne @081D4080 ldr r1, [r3, 0xC] ldr r0, [r3, 0x10] cmp r1, r0 - bge _081D4074 + bge @081D4074 ldr r2, =0x04000120 ldr r0, [r3, 0x8] lsls r1, 2 @@ -905919,23 +905919,23 @@ _081D404A: ldr r1, [r1] adds r0, r1 str r0, [r3, 0x14] - b _081D40BA + b @081D40BA .align 2, 0 .pool -_081D4074: +@081D4074: ldr r1, =0x04000120 ldr r0, [r3, 0x14] - b _081D40B8 + b @081D40B8 .align 2, 0 .pool -_081D4080: +@081D4080: ldr r1, [r3, 0xC] cmp r1, 0 - ble _081D40A0 + ble @081D40A0 ldr r0, [r3, 0x10] adds r0, 0x1 cmp r1, r0 - bge _081D40A0 + bge @081D40A0 ldr r0, [r3, 0x8] lsls r1, 2 adds r1, r0 @@ -905944,64 +905944,64 @@ _081D4080: ldr r0, [r3, 0x14] adds r0, r4 str r0, [r3, 0x14] - b _081D40B4 -_081D40A0: + b @081D40B4 +@081D40A0: ldr r0, [r3, 0xC] cmp r0, 0 - beq _081D40B4 + beq @081D40B4 ldr r0, [r3, 0x14] cmp r0, r4 - bne _081D40B0 + bne @081D40B0 movs r0, 0x1 - b _081D40B2 -_081D40B0: + b @081D40B2 +@081D40B0: movs r0, 0x2 -_081D40B2: +@081D40B2: strb r0, [r3, 0x3] -_081D40B4: +@081D40B4: ldr r1, =0x030012e8 movs r0, 0 -_081D40B8: +@081D40B8: str r0, [r1] -_081D40BA: +@081D40BA: ldr r1, [r3, 0xC] adds r1, 0x1 str r1, [r3, 0xC] ldr r0, [r3, 0x10] adds r0, 0x2 cmp r1, r0 - bge _081D40EA + bge @081D40EA ldrb r0, [r3] cmp r0, 0 - beq _081D40E4 + beq @081D40E4 ldr r0, =0x0400010e ldrh r1, [r0] movs r2, 0x80 orrs r1, r2 strh r1, [r0] - b _081D412A + b @081D412A .align 2, 0 .pool -_081D40E4: +@081D40E4: bl sub_81D413C - b _081D412A -_081D40EA: + b @081D412A +@081D40EA: movs r0, 0 movs r1, 0x4 strb r1, [r3, 0x1] ldr r1, =0x030012e6 strh r0, [r1] - b _081D412A + b @081D412A .align 2, 0 .pool -_081D40FC: +@081D40FC: ldrb r3, [r2] cmp r3, 0 - bne _081D4108 + bne @081D4108 ldr r1, =0x0400012a ldrb r0, [r2, 0x3] strh r0, [r1] -_081D4108: +@081D4108: ldr r0, =0x04000120 ldr r1, [r0, 0x4] ldr r0, [r0] @@ -906013,14 +906013,14 @@ _081D4108: lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bhi _081D412A + bhi @081D412A cmp r3, 0x1 - bne _081D4126 + bne @081D4126 strb r1, [r2, 0x3] -_081D4126: +@081D4126: movs r0, 0x6 strb r0, [r2, 0x1] -_081D412A: +@081D412A: add sp, 0x8 pop {r4-r6} pop {r0} @@ -906030,7 +906030,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 @@ -906042,7 +906042,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 @@ -906058,7 +906058,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] @@ -906080,7 +906080,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] @@ -906107,7 +906107,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] @@ -906134,7 +906134,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 @@ -906151,7 +906151,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 @@ -906171,7 +906171,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 @@ -906210,7 +906210,7 @@ sub_81D427C: @ 81D427C mov r8, r0 ldr r2, =0x030012fc movs r1, 0 -_081D42CA: +@081D42CA: mov r3, r8 adds r0, r3, r2 strb r1, [r0] @@ -906220,7 +906220,7 @@ _081D42CA: lsrs r0, 24 mov r8, r0 cmp r0, 0x3 - bls _081D42CA + bls @081D42CA ldr r2, =0x02037350 ldr r0, =0x02037590 ldrb r1, [r0, 0x5] @@ -906233,14 +906233,14 @@ _081D42CA: movs r6, 0x10 ldrsh r0, [r2, r6] cmp r1, r0 - bne _081D4304 + bne @081D4304 movs r0, 0x16 ldrsh r1, [r2, r0] movs r3, 0x12 ldrsh r0, [r2, r3] cmp r1, r0 - beq _081D4356 -_081D4304: + beq @081D4356 +@081D4304: ldr r0, =0x0000403a bl var_get lsls r0, 16 @@ -906248,19 +906248,19 @@ _081D4304: lsls r1, 11 ands r1, r0 cmp r1, 0 - bne _081D4338 + bne @081D4338 ldrb r1, [r5, 0x1] movs r0, 0x21 negs r0, r0 ands r0, r1 - b _081D433E + b @081D433E .align 2, 0 .pool -_081D4338: +@081D4338: ldrb r0, [r5, 0x1] movs r1, 0x20 orrs r0, r1 -_081D433E: +@081D433E: strb r0, [r5, 0x1] ldr r0, =0x0000403a bl var_get @@ -906270,18 +906270,18 @@ _081D433E: bl __umodsi3 lsls r0, 16 cmp r0, 0 - bne _081D4360 -_081D4356: + bne @081D4360 +@081D4356: movs r0, 0 - b _081D4816 + b @081D4816 .align 2, 0 .pool -_081D4360: +@081D4360: movs r4, 0 mov r8, r4 ldr r6, =0x02037350 mov r10, r6 -_081D4368: +@081D4368: ldr r3, =0x02037590 ldrb r1, [r3, 0x5] lsls r0, r1, 3 @@ -906302,9 +906302,9 @@ _081D4368: mov r12, r3 adds r7, r1, 0 cmp r2, r0 - beq _081D4394 - b _081D449E -_081D4394: + beq @081D4394 + b @081D449E +@081D4394: movs r3, 0 ldr r1, =0x0862608e adds r0, r7, r1 @@ -906313,28 +906313,28 @@ _081D4394: movs r4, 0 ldrsh r2, [r0, r4] cmp r1, r2 - bge _081D43C0 + bge @081D43C0 movs r6, 0x12 ldrsh r0, [r5, r6] cmp r0, r2 - bgt _081D43CA - b _081D449E + bgt @081D43CA + b @081D449E .align 2, 0 .pool -_081D43C0: +@081D43C0: movs r1, 0x12 ldrsh r0, [r5, r1] cmp r0, r2 - blt _081D43CA + blt @081D43CA movs r3, 0x1 -_081D43CA: +@081D43CA: cmp r3, 0 - bne _081D449E + bne @081D449E ldr r0, =0x030012f8 movs r2, 0 ldrsh r0, [r0, r2] cmp r0, 0 - ble _081D4410 + ble @081D4410 movs r3, 0x10 ldrsh r2, [r5, r3] adds r2, 0x1 @@ -906347,7 +906347,7 @@ _081D43CA: movs r6, 0x14 ldrsh r0, [r0, r6] cmp r2, r0 - bne _081D4446 + bne @081D4446 ldrh r0, [r5, 0x10] adds r0, 0x1 lsls r0, 16 @@ -906357,15 +906357,15 @@ _081D43CA: bl sub_81D4834 lsls r0, 24 cmp r0, 0 - beq _081D4446 -_081D4408: + beq @081D4446 +@081D4408: movs r0, 0x4 - b _081D4816 + b @081D4816 .align 2, 0 .pool -_081D4410: +@081D4410: cmp r0, 0 - bge _081D4446 + bge @081D4446 movs r3, 0x10 ldrsh r2, [r5, r3] subs r2, 0x1 @@ -906378,7 +906378,7 @@ _081D4410: movs r6, 0x14 ldrsh r0, [r0, r6] cmp r2, r0 - bne _081D4446 + bne @081D4446 ldrh r0, [r5, 0x10] subs r0, 0x1 lsls r0, 16 @@ -906388,9 +906388,9 @@ _081D4410: bl sub_81D4834 lsls r0, 24 cmp r0, 0 - beq _081D4446 - b _081D45AA -_081D4446: + beq @081D4446 + b @081D45AA +@081D4446: ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -906402,12 +906402,12 @@ _081D4446: movs r4, 0x14 ldrsh r0, [r0, r4] cmp r1, r0 - bne _081D449E + bne @081D449E ldr r0, =0x030012fa movs r6, 0 ldrsh r0, [r0, r6] cmp r0, 0 - ble _081D4488 + ble @081D4488 adds r0, r1, 0 ldrh r1, [r5, 0x12] subs r1, 0x1 @@ -906416,13 +906416,13 @@ _081D4446: bl sub_81D4834 lsls r0, 24 cmp r0, 0 - beq _081D449E -_081D447C: + beq @081D449E +@081D447C: movs r0, 0x2 - b _081D4816 + b @081D4816 .align 2, 0 .pool -_081D4488: +@081D4488: movs r2, 0x10 ldrsh r0, [r5, r2] ldrh r1, [r5, 0x12] @@ -906432,8 +906432,8 @@ _081D4488: bl sub_81D4834 lsls r0, 24 cmp r0, 0 - bne _081D4538 -_081D449E: + bne @081D4538 +@081D449E: ldr r2, =0x02037590 ldrb r1, [r2, 0x5] lsls r0, r1, 3 @@ -906452,9 +906452,9 @@ _081D449E: mov r9, r3 mov r12, r2 cmp r1, r0 - beq _081D44C6 - b _081D45D0 -_081D44C6: + beq @081D44C6 + b @081D45D0 +@081D44C6: movs r3, 0 adds r0, r7, r6 movs r6, 0x14 @@ -906462,28 +906462,28 @@ _081D44C6: movs r4, 0 ldrsh r2, [r0, r4] cmp r1, r2 - bge _081D44F0 + bge @081D44F0 movs r6, 0x10 ldrsh r0, [r5, r6] cmp r0, r2 - bgt _081D44FA - b _081D45D0 + bgt @081D44FA + b @081D45D0 .align 2, 0 .pool -_081D44F0: +@081D44F0: movs r1, 0x10 ldrsh r0, [r5, r1] cmp r0, r2 - blt _081D44FA + blt @081D44FA movs r3, 0x1 -_081D44FA: +@081D44FA: cmp r3, 0 - bne _081D45D0 + bne @081D45D0 ldr r0, =0x030012fa movs r2, 0 ldrsh r0, [r0, r2] cmp r0, 0 - ble _081D4540 + ble @081D4540 movs r3, 0x12 ldrsh r2, [r5, r3] adds r2, 0x1 @@ -906496,7 +906496,7 @@ _081D44FA: movs r6, 0x16 ldrsh r0, [r0, r6] cmp r2, r0 - bne _081D4576 + bne @081D4576 movs r1, 0x10 ldrsh r0, [r5, r1] ldrh r1, [r5, 0x12] @@ -906506,15 +906506,15 @@ _081D44FA: bl sub_81D4834 lsls r0, 24 cmp r0, 0 - beq _081D4576 -_081D4538: + beq @081D4576 +@081D4538: movs r0, 0x1 - b _081D4816 + b @081D4816 .align 2, 0 .pool -_081D4540: +@081D4540: cmp r0, 0 - bge _081D4576 + bge @081D4576 movs r3, 0x12 ldrsh r2, [r5, r3] subs r2, 0x1 @@ -906527,7 +906527,7 @@ _081D4540: movs r6, 0x16 ldrsh r0, [r0, r6] cmp r2, r0 - bne _081D4576 + bne @081D4576 movs r1, 0x10 ldrsh r0, [r5, r1] ldrh r1, [r5, 0x12] @@ -906537,9 +906537,9 @@ _081D4540: bl sub_81D4834 lsls r0, 24 cmp r0, 0 - beq _081D4576 - b _081D447C -_081D4576: + beq @081D4576 + b @081D447C +@081D4576: ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -906551,12 +906551,12 @@ _081D4576: movs r3, 0x16 ldrsh r0, [r0, r3] cmp r1, r0 - bne _081D45D0 + bne @081D45D0 ldr r0, =0x030012f8 movs r4, 0 ldrsh r0, [r0, r4] cmp r0, 0 - ble _081D45B8 + ble @081D45B8 ldrh r0, [r5, 0x10] subs r0, 0x1 lsls r0, 16 @@ -906564,13 +906564,13 @@ _081D4576: bl sub_81D4834 lsls r0, 24 cmp r0, 0 - beq _081D45D0 -_081D45AA: + beq @081D45D0 +@081D45AA: movs r0, 0x3 - b _081D4816 + b @081D4816 .align 2, 0 .pool -_081D45B8: +@081D45B8: ldrh r0, [r5, 0x10] adds r0, 0x1 lsls r0, 16 @@ -906580,135 +906580,135 @@ _081D45B8: bl sub_81D4834 lsls r0, 24 cmp r0, 0 - beq _081D45D0 - b _081D4408 -_081D45D0: + beq @081D45D0 + b @081D4408 +@081D45D0: mov r0, r8 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r8, r0 cmp r0, 0x3 - bhi _081D45E0 - b _081D4368 -_081D45E0: + bhi @081D45E0 + b @081D4368 +@081D45E0: adds r0, r5, 0 movs r1, 0 bl sub_81D4C14 lsls r0, 24 cmp r0, 0 - beq _081D461C + beq @081D461C adds r0, r5, 0 movs r1, 0x1 bl sub_81D4C58 lsls r0, 24 cmp r0, 0 - beq _081D4604 + beq @081D4604 movs r0, 0x2 bl sub_81D4D24 - b _081D4812 -_081D4604: + b @081D4812 +@081D4604: adds r0, r5, 0 movs r1, 0x1 bl sub_81D4CE0 lsls r0, 24 cmp r0, 0 - bne _081D4614 - b _081D447C -_081D4614: + bne @081D4614 + b @081D447C +@081D4614: movs r0, 0x2 bl sub_81D4D24 - b _081D4812 -_081D461C: + b @081D4812 +@081D461C: adds r0, r5, 0 movs r1, 0 bl sub_81D4C9C lsls r0, 24 cmp r0, 0 - beq _081D4658 + beq @081D4658 adds r0, r5, 0 movs r1, 0x1 bl sub_81D4C58 lsls r0, 24 cmp r0, 0 - beq _081D4640 + beq @081D4640 movs r0, 0x2 bl sub_81D4D24 - b _081D4812 -_081D4640: + b @081D4812 +@081D4640: adds r0, r5, 0 movs r1, 0x1 bl sub_81D4CE0 lsls r0, 24 cmp r0, 0 - bne _081D4650 - b _081D4538 -_081D4650: + bne @081D4650 + b @081D4538 +@081D4650: movs r0, 0x2 bl sub_81D4D24 - b _081D4812 -_081D4658: + b @081D4812 +@081D4658: adds r0, r5, 0 movs r1, 0 bl sub_81D4C58 lsls r0, 24 cmp r0, 0 - beq _081D4694 + beq @081D4694 adds r0, r5, 0 movs r1, 0x1 bl sub_81D4C14 lsls r0, 24 cmp r0, 0 - beq _081D467C + beq @081D467C movs r0, 0x2 bl sub_81D4D24 - b _081D4812 -_081D467C: + b @081D4812 +@081D467C: adds r0, r5, 0 movs r1, 0x1 bl sub_81D4C9C lsls r0, 24 cmp r0, 0 - bne _081D468C - b _081D4408 -_081D468C: + bne @081D468C + b @081D4408 +@081D468C: movs r0, 0x2 bl sub_81D4D24 - b _081D4812 -_081D4694: + b @081D4812 +@081D4694: adds r0, r5, 0 movs r1, 0 bl sub_81D4CE0 lsls r0, 24 cmp r0, 0 - beq _081D46D0 + beq @081D46D0 adds r0, r5, 0 movs r1, 0x1 bl sub_81D4C14 lsls r0, 24 cmp r0, 0 - beq _081D46B8 + beq @081D46B8 movs r0, 0x2 bl sub_81D4D24 - b _081D4812 -_081D46B8: + b @081D4812 +@081D46B8: adds r0, r5, 0 movs r1, 0x1 bl sub_81D4C9C lsls r0, 24 cmp r0, 0 - bne _081D46C8 - b _081D45AA -_081D46C8: + bne @081D46C8 + b @081D45AA +@081D46C8: movs r0, 0x2 bl sub_81D4D24 - b _081D4812 -_081D46D0: + b @081D4812 +@081D46D0: ldr r0, =0x030012fa movs r3, 0 ldrsh r0, [r0, r3] cmp r0, 0 - bne _081D476E + bne @081D476E ldr r2, =0x02037350 ldr r0, =0x02037590 ldrb r1, [r0, 0x5] @@ -906722,7 +906722,7 @@ _081D46D0: movs r6, 0x12 ldrsh r0, [r5, r6] cmp r1, r0 - ble _081D470C + ble @081D470C movs r1, 0x10 ldrsh r0, [r5, r1] subs r1, r2, 0x1 @@ -906731,9 +906731,9 @@ _081D46D0: bl sub_81D4834 lsls r0, 24 cmp r0, 0 - beq _081D470C - b _081D447C -_081D470C: + beq @081D470C + b @081D447C +@081D470C: ldr r2, =0x02037350 ldr r0, =0x02037590 ldrb r1, [r0, 0x5] @@ -906747,7 +906747,7 @@ _081D470C: movs r3, 0x12 ldrsh r0, [r5, r3] cmp r1, r0 - bge _081D473E + bge @081D473E movs r4, 0x10 ldrsh r0, [r5, r4] adds r1, r2, 0x1 @@ -906756,9 +906756,9 @@ _081D470C: bl sub_81D4834 lsls r0, 24 cmp r0, 0 - beq _081D473E - b _081D4538 -_081D473E: + beq @081D473E + b @081D4538 +@081D473E: movs r6, 0x10 ldrsh r0, [r5, r6] ldrh r1, [r5, 0x12] @@ -906768,9 +906768,9 @@ _081D473E: bl sub_81D4834 lsls r0, 24 cmp r0, 0 - beq _081D4756 - b _081D447C -_081D4756: + beq @081D4756 + b @081D447C +@081D4756: movs r1, 0x10 ldrsh r0, [r5, r1] ldrh r1, [r5, 0x12] @@ -906780,14 +906780,14 @@ _081D4756: bl sub_81D4834 lsls r0, 24 cmp r0, 0 - beq _081D476E - b _081D4538 -_081D476E: + beq @081D476E + b @081D4538 +@081D476E: ldr r0, =0x030012f8 movs r2, 0 ldrsh r0, [r0, r2] cmp r0, 0 - bne _081D480C + bne @081D480C ldr r2, =0x02037350 ldr r0, =0x02037590 ldrb r1, [r0, 0x5] @@ -906801,7 +906801,7 @@ _081D476E: movs r4, 0x10 ldrsh r0, [r5, r4] cmp r1, r0 - ble _081D47AA + ble @081D47AA subs r0, r2, 0x1 lsls r0, 16 asrs r0, 16 @@ -906810,9 +906810,9 @@ _081D476E: bl sub_81D4834 lsls r0, 24 cmp r0, 0 - beq _081D47AA - b _081D45AA -_081D47AA: + beq @081D47AA + b @081D45AA +@081D47AA: ldr r2, =0x02037350 ldr r0, =0x02037590 ldrb r1, [r0, 0x5] @@ -906826,7 +906826,7 @@ _081D47AA: movs r3, 0x10 ldrsh r0, [r5, r3] cmp r1, r0 - bge _081D47DC + bge @081D47DC adds r0, r2, 0x1 lsls r0, 16 asrs r0, 16 @@ -906835,9 +906835,9 @@ _081D47AA: bl sub_81D4834 lsls r0, 24 cmp r0, 0 - beq _081D47DC - b _081D4408 -_081D47DC: + beq @081D47DC + b @081D4408 +@081D47DC: ldrh r0, [r5, 0x10] adds r0, 0x1 lsls r0, 16 @@ -906847,9 +906847,9 @@ _081D47DC: bl sub_81D4834 lsls r0, 24 cmp r0, 0 - beq _081D47F4 - b _081D4408 -_081D47F4: + beq @081D47F4 + b @081D4408 +@081D47F4: ldrh r0, [r5, 0x10] subs r0, 0x1 lsls r0, 16 @@ -906859,15 +906859,15 @@ _081D47F4: bl sub_81D4834 lsls r0, 24 cmp r0, 0 - beq _081D480C - b _081D45AA -_081D480C: + beq @081D480C + b @081D45AA +@081D480C: movs r0, 0 bl sub_81D4890 -_081D4812: +@081D4812: lsls r0, 24 lsrs r0, 24 -_081D4816: +@081D4816: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -906880,7 +906880,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 @@ -906897,18 +906897,18 @@ sub_81D4834: @ 81D4834 lsrs r3, r0, 16 asrs r0, 16 cmp r1, r0 - bne _081D4870 + bne @081D4870 movs r0, 0x12 ldrsh r1, [r2, r0] lsls r0, r4, 16 asrs r0, 16 cmp r1, r0 - bne _081D4870 + bne @081D4870 movs r0, 0 - b _081D4888 + b @081D4888 .align 2, 0 .pool -_081D4870: +@081D4870: lsls r0, r3, 16 asrs r0, 16 lsls r1, r4, 16 @@ -906919,14 +906919,14 @@ _081D4870: bl sub_8088E64 lsls r0, 24 lsrs r0, 24 -_081D4888: +@081D4888: pop {r4} pop {r1} bx r1 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 @@ -906942,14 +906942,14 @@ sub_81D4890: @ 81D4890 movs r1, 0 ldr r3, =0x030012fc movs r2, 0 -_081D48B0: +@081D48B0: adds r0, r1, r3 strb r2, [r0] adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x3 - bls _081D48B0 + bls @081D48B0 movs r1, 0x10 ldrsh r0, [r4, r1] ldrh r1, [r4, 0x12] @@ -906960,9 +906960,9 @@ _081D48B0: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081D48E8 + bne @081D48E8 cmp r6, 0x2 - beq _081D48E8 + beq @081D48E8 ldr r0, =0x030012fc adds r0, r5, r0 movs r1, 0x2 @@ -906970,7 +906970,7 @@ _081D48B0: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_081D48E8: +@081D48E8: ldrh r0, [r4, 0x10] adds r0, 0x1 lsls r0, 16 @@ -906981,9 +906981,9 @@ _081D48E8: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081D4912 + bne @081D4912 cmp r6, 0x4 - beq _081D4912 + beq @081D4912 ldr r0, =0x030012fc adds r0, r5, r0 movs r1, 0x4 @@ -906991,7 +906991,7 @@ _081D48E8: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_081D4912: +@081D4912: movs r1, 0x10 ldrsh r0, [r4, r1] ldrh r1, [r4, 0x12] @@ -907002,16 +907002,16 @@ _081D4912: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x1 - bne _081D493A + bne @081D493A cmp r6, 0x1 - beq _081D493A + beq @081D493A ldr r0, =0x030012fc adds r0, r5, r0 strb r1, [r0] adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_081D493A: +@081D493A: ldrh r0, [r4, 0x10] subs r0, 0x1 lsls r0, 16 @@ -907022,9 +907022,9 @@ _081D493A: lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081D4964 + bne @081D4964 cmp r6, 0x3 - beq _081D4964 + beq @081D4964 ldr r0, =0x030012fc adds r0, r5, r0 movs r1, 0x3 @@ -907032,14 +907032,14 @@ _081D493A: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_081D4964: +@081D4964: cmp r5, 0x1 - bhi _081D4974 + bhi @081D4974 ldr r0, =0x030012fc - b _081D4988 + b @081D4988 .align 2, 0 .pool -_081D4974: +@081D4974: ldr r4, =0x030012fc ldr r0, =0x0000403a bl var_get @@ -907048,7 +907048,7 @@ _081D4974: adds r1, r5, 0 bl __modsi3 adds r0, r4 -_081D4988: +@081D4988: ldrb r0, [r0] pop {r4-r6} pop {r1} @@ -907058,7 +907058,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 @@ -907070,31 +907070,31 @@ sub_81D4998: @ 81D4998 ldrh r1, [r0, 0x4] ldr r0, =0x0000391a cmp r1, r0 - bne _081D49E0 + bne @081D49E0 adds r0, r2, 0x1 lsls r0, 16 lsrs r2, r0, 16 ldr r0, =0x0000270e cmp r2, r0 - bls _081D49D8 + bls @081D49D8 adds r0, r4, 0 movs r1, 0 bl var_set - b _081D49E0 + b @081D49E0 .align 2, 0 .pool -_081D49D8: +@081D49D8: adds r0, r4, 0 adds r1, r2, 0 bl var_set -_081D49E0: +@081D49E0: pop {r4} pop {r0} bx r0 thumb_func_end sub_81D4998 thumb_func_start sub_81D49E8 -sub_81D49E8: @ 81D49E8 +sub_81D49E8: ; 81D49E8 push {lr} adds r2, r0, 0 ldr r0, =0x03005d8c @@ -907102,56 +907102,56 @@ sub_81D49E8: @ 81D49E8 ldrh r1, [r0, 0x4] ldr r0, =0x0000391a cmp r1, r0 - bne _081D4A0C + bne @081D4A0C ldrb r0, [r2, 0x5] cmp r0, 0xE5 - bne _081D4A0C + bne @081D4A0C movs r0, 0x1 - b _081D4A0E + b @081D4A0E .align 2, 0 .pool -_081D4A0C: +@081D4A0C: movs r0, 0 -_081D4A0E: +@081D4A0E: pop {r1} bx r1 thumb_func_end sub_81D49E8 thumb_func_start unown_chamber_related -unown_chamber_related: @ 81D4A14 +unown_chamber_related: ; 81D4A14 push {lr} ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] ldr r0, =0x0000391a cmp r1, r0 - bne _081D4A50 + bne @081D4A50 movs r0, 0xE5 lsls r0, 1 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081D4A50 + beq @081D4A50 ldr r0, =0x000002ce bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq _081D4A50 + beq @081D4A50 movs r0, 0x1 - b _081D4A52 + b @081D4A52 .align 2, 0 .pool -_081D4A50: +@081D4A50: movs r0, 0 -_081D4A52: +@081D4A52: pop {r1} bx r1 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 @@ -907159,7 +907159,7 @@ sub_81D4A58: @ 81D4A58 lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 - beq _081D4A88 + beq @081D4A88 adds r0, r4, 0 bl var_get lsls r0, 16 @@ -907167,21 +907167,21 @@ sub_81D4A58: @ 81D4A58 lsls r1, 10 ands r1, r0 cmp r1, 0 - bne _081D4A88 + bne @081D4A88 movs r0, 0x1 - b _081D4A8A + b @081D4A8A .align 2, 0 .pool -_081D4A88: +@081D4A88: movs r0, 0 -_081D4A8A: +@081D4A8A: pop {r4} pop {r1} bx r1 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 @@ -907200,7 +907200,7 @@ sub_81D4A90: @ 81D4A90 ldr r0, =0x020375e0 ldrh r4, [r0] cmp r4, 0x1 - bne _081D4AF8 + bne @081D4AF8 ldrb r0, [r5, 0x3] movs r1, 0x4 orrs r0, r1 @@ -907225,10 +907225,10 @@ sub_81D4A90: @ 81D4A90 adds r0, r3 adds r0, 0x43 strb r4, [r0] - b _081D4BC4 + b @081D4BC4 .align 2, 0 .pool -_081D4AF8: +@081D4AF8: ldr r0, =0x0000403a ldr r1, =0x0000ffff bl var_set @@ -907252,7 +907252,7 @@ _081D4AF8: ldr r0, =0x020375f4 ldrh r0, [r0] cmp r0, 0x2 - beq _081D4B3A + beq @081D4B3A ldrb r0, [r5, 0x4] lsls r1, r0, 4 adds r1, r0 @@ -907261,7 +907261,7 @@ _081D4AF8: adds r1, 0x43 movs r0, 0x1 strb r0, [r1] -_081D4B3A: +@081D4B3A: ldr r4, =0x0850c9c8 adds r0, r4, 0 bl gpu_pal_obj_alloc_tag_and_apply @@ -907305,7 +907305,7 @@ _081D4B3A: lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq _081D4BC4 + beq @081D4BC4 ldrb r0, [r1] lsls r1, r0, 4 adds r1, r0 @@ -907326,7 +907326,7 @@ _081D4B3A: strb r0, [r1, 0x5] ldr r0, =nullsub_12 + 1 str r0, [r1, 0x1C] -_081D4BC4: +@081D4BC4: add sp, 0x4 pop {r4-r6} pop {r0} @@ -907336,12 +907336,12 @@ _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] cmp r0, 0x40 - beq _081D4C06 + beq @081D4C06 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -907349,7 +907349,7 @@ sub_81D4BEC: @ 81D4BEC ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles -_081D4C06: +@081D4C06: pop {r0} bx r0 .align 2, 0 @@ -907357,7 +907357,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 @@ -907366,7 +907366,7 @@ sub_81D4C14: @ 81D4C14 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - ble _081D4C50 + ble @081D4C50 movs r1, 0x10 ldrsh r0, [r2, r1] ldrh r1, [r2, 0x12] @@ -907376,25 +907376,25 @@ sub_81D4C14: @ 81D4C14 bl sub_81D4834 lsls r0, 24 cmp r0, 0 - beq _081D4C50 + beq @081D4C50 ldr r0, =0x030012fc adds r0, r4, r0 movs r1, 0x2 strb r1, [r0] movs r0, 0x1 - b _081D4C52 + b @081D4C52 .align 2, 0 .pool -_081D4C50: +@081D4C50: movs r0, 0 -_081D4C52: +@081D4C52: pop {r4} pop {r1} bx r1 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 @@ -907403,7 +907403,7 @@ sub_81D4C58: @ 81D4C58 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bge _081D4C94 + bge @081D4C94 ldrh r0, [r2, 0x10] adds r0, 0x1 lsls r0, 16 @@ -907413,25 +907413,25 @@ sub_81D4C58: @ 81D4C58 bl sub_81D4834 lsls r0, 24 cmp r0, 0 - beq _081D4C94 + beq @081D4C94 ldr r0, =0x030012fc adds r0, r4, r0 movs r1, 0x4 strb r1, [r0] movs r0, 0x1 - b _081D4C96 + b @081D4C96 .align 2, 0 .pool -_081D4C94: +@081D4C94: movs r0, 0 -_081D4C96: +@081D4C96: pop {r4} pop {r1} bx r1 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 @@ -907440,7 +907440,7 @@ sub_81D4C9C: @ 81D4C9C movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bge _081D4CD8 + bge @081D4CD8 movs r1, 0x10 ldrsh r0, [r2, r1] ldrh r1, [r2, 0x12] @@ -907450,25 +907450,25 @@ sub_81D4C9C: @ 81D4C9C bl sub_81D4834 lsls r0, 24 cmp r0, 0 - beq _081D4CD8 + beq @081D4CD8 ldr r0, =0x030012fc adds r0, r4, r0 movs r1, 0x1 strb r1, [r0] movs r0, 0x1 - b _081D4CDA + b @081D4CDA .align 2, 0 .pool -_081D4CD8: +@081D4CD8: movs r0, 0 -_081D4CDA: +@081D4CDA: pop {r4} pop {r1} bx r1 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 @@ -907477,7 +907477,7 @@ sub_81D4CE0: @ 81D4CE0 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - ble _081D4D1C + ble @081D4D1C ldrh r0, [r2, 0x10] subs r0, 0x1 lsls r0, 16 @@ -907487,25 +907487,25 @@ sub_81D4CE0: @ 81D4CE0 bl sub_81D4834 lsls r0, 24 cmp r0, 0 - beq _081D4D1C + beq @081D4D1C ldr r0, =0x030012fc adds r0, r4, r0 movs r1, 0x3 strb r1, [r0] movs r0, 0x1 - b _081D4D1E + b @081D4D1E .align 2, 0 .pool -_081D4D1C: +@081D4D1C: movs r0, 0 -_081D4D1E: +@081D4D1E: pop {r4} pop {r1} bx r1 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 @@ -907527,7 +907527,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} @@ -907572,7 +907572,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 @@ -907596,7 +907596,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 @@ -907610,21 +907610,21 @@ sub_81D4DE8: @ 81D4DE8 movs r0, 0x13 ands r0, r1 cmp r0, 0x10 - bne _081D4E08 + bne @081D4E08 movs r5, 0x1 -_081D4E08: +@081D4E08: movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _081D4E12 + beq @081D4E12 movs r5, 0x2 -_081D4E12: +@081D4E12: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _081D4E1C + beq @081D4E1C movs r5, 0x3 -_081D4E1C: +@081D4E1C: ldr r1, =0x03003144 movs r0, 0 strb r0, [r1] @@ -907637,7 +907637,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 @@ -907658,7 +907658,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 @@ -907679,53 +907679,53 @@ sub_81D4E60: @ 81D4E60 ldrh r1, [r2] ldr r0, =0x0000b9a0 cmp r1, r0 - bne _081D4EB8 + bne @081D4EB8 ldrh r1, [r2, 0x2] ldr r0, =0x0000ccd0 cmp r1, r0 - bne _081D4EB8 + bne @081D4EB8 ldrh r1, [r2, 0x4] ldr r0, =0x0000ffff cmp r1, r0 - bne _081D4EB8 + bne @081D4EB8 ldrh r0, [r2, 0x6] cmp r0, r1 - bne _081D4EB8 + bne @081D4EB8 movs r0, 0x1 - b _081D4EBA + b @081D4EBA .align 2, 0 .pool -_081D4EB8: +@081D4EB8: movs r0, 0 -_081D4EBA: +@081D4EBA: add sp, 0xC pop {r1} bx r1 thumb_func_end sub_81D4E60 thumb_func_start sub_81D4EC0 -sub_81D4EC0: @ 81D4EC0 +sub_81D4EC0: ; 81D4EC0 push {lr} bl sub_800ABBC lsls r0, 24 cmp r0, 0 - beq _081D4EDC + beq @081D4EDC bl sub_800ABAC lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _081D4EDC + bne @081D4EDC movs r0, 0x1 - b _081D4EDE -_081D4EDC: + b @081D4EDE +@081D4EDC: movs r0, 0 -_081D4EDE: +@081D4EDE: pop {r1} bx r1 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 @@ -907734,152 +907734,152 @@ sub_81D4EE4: @ 81D4EE4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bhi _081D4F08 + bhi @081D4F08 bl sub_800B33C lsls r0, 24 cmp r0, 0 - beq _081D4F08 + beq @081D4F08 movs r0, 0 strb r0, [r4] movs r0, 0x3 - b _081D500E -_081D4F08: + b @081D500E +@081D4F08: ldrb r0, [r4] cmp r0, 0x5 - bls _081D4F10 - b _081D500C -_081D4F10: + bls @081D4F10 + b @081D500C +@081D4F10: lsls r0, 2 - ldr r1, =_081D4F20 + ldr r1, =@081D4F20 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081D4F20: - .4byte _081D4F38 - .4byte _081D4F54 - .4byte _081D4F6C - .4byte _081D4FA0 - .4byte _081D4FEC - .4byte _081D4FF8 -_081D4F38: +@081D4F20: + .4byte @081D4F38 + .4byte @081D4F54 + .4byte @081D4F6C + .4byte @081D4FA0 + .4byte @081D4FEC + .4byte @081D4FF8 +@081D4F38: bl sub_800ABBC lsls r0, 24 cmp r0, 0 - beq _081D4F88 + beq @081D4F88 bl sub_800ABAC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bls _081D4F88 + bls @081D4F88 movs r0, 0x1 strb r0, [r4] - b _081D500C -_081D4F54: + b @081D500C +@081D4F54: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] lsls r0, 16 lsrs r0, 16 cmp r0, 0x5 - bls _081D500C + bls @081D500C movs r0, 0 strh r0, [r5] movs r0, 0x2 strb r0, [r4] - b _081D500C -_081D4F6C: + b @081D500C +@081D4F6C: bl sub_800ABAC lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne _081D4F88 + bne @081D4F88 movs r0, 0x49 bl audio_play bl sub_800A620 movs r0, 0 strh r0, [r5] - b _081D4FE6 -_081D4F88: + b @081D4FE6 +@081D4F88: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081D500C + beq @081D500C movs r0, 0 strb r0, [r4] movs r0, 0x1 - b _081D500E + b @081D500E .align 2, 0 .pool -_081D4FA0: +@081D4FA0: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] lsls r0, 16 lsrs r0, 16 cmp r0, 0x1E - bls _081D4FB6 + bls @081D4FB6 movs r0, 0 strb r0, [r4] movs r0, 0x5 - b _081D500E -_081D4FB6: + b @081D500E +@081D4FB6: bl sub_800B320 lsls r0, 24 cmp r0, 0 - beq _081D500C + beq @081D500C ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq _081D4FE6 + beq @081D4FE6 bl sub_800A23C lsls r0, 24 cmp r0, 0 - beq _081D4FE0 + beq @081D4FE0 movs r0, 0 strb r0, [r4] movs r0, 0x2 - b _081D500E + b @081D500E .align 2, 0 .pool -_081D4FE0: +@081D4FE0: movs r0, 0x4 strb r0, [r4] - b _081D500C -_081D4FE6: + b @081D500C +@081D4FE6: movs r0, 0x3 strb r0, [r4] - b _081D500C -_081D4FEC: + b @081D500C +@081D4FEC: movs r0, 0 bl sub_800ABF4 movs r0, 0x5 strb r0, [r4] - b _081D500C -_081D4FF8: + b @081D500C +@081D4FF8: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _081D500C + bne @081D500C strb r0, [r4] movs r0, 0x4 - b _081D500E + b @081D500E .align 2, 0 .pool -_081D500C: +@081D500C: movs r0, 0 -_081D500E: +@081D500E: pop {r4,r5} pop {r1} bx r1 thumb_func_end sub_81D4EE4 thumb_func_start sub_81D5014 -sub_81D5014: @ 81D5014 +sub_81D5014: ; 81D5014 push {r4,lr} ldr r0, =sub_81D5084 + 1 movs r1, 0 @@ -907915,14 +907915,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 @@ -907931,20 +907931,20 @@ sub_81D5064: @ 81D5064 strh r0, [r2] lsls r0, 16 cmp r0, r1 - bhi _081D507A + bhi @081D507A movs r0, 0 - b _081D5080 -_081D507A: + b @081D5080 +@081D507A: movs r0, 0 strh r0, [r2] movs r0, 0x1 -_081D5080: +@081D5080: pop {r1} bx r1 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 @@ -907955,160 +907955,160 @@ sub_81D5084: @ 81D5084 adds r4, r0, r1 ldrb r0, [r4, 0x8] cmp r0, 0x1A - bls _081D509C - b _081D548A -_081D509C: + bls @081D509C + b @081D548A +@081D509C: lsls r0, 2 - ldr r1, =_081D50B0 + ldr r1, =@081D50B0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081D50B0: - .4byte _081D511C - .4byte _081D5138 - .4byte _081D5148 - .4byte _081D515C - .4byte _081D516C - .4byte _081D5198 - .4byte _081D51D0 - .4byte _081D524C - .4byte _081D5268 - .4byte _081D5290 - .4byte _081D52AC - .4byte _081D52DC - .4byte _081D52F2 - .4byte _081D5308 - .4byte _081D536A - .4byte _081D5390 - .4byte _081D53A8 - .4byte _081D53C6 - .4byte _081D53F2 - .4byte _081D5418 - .4byte _081D5448 - .4byte _081D5454 - .4byte _081D5460 - .4byte _081D5430 - .4byte _081D548A - .4byte _081D548A - .4byte _081D5478 -_081D511C: +@081D50B0: + .4byte @081D511C + .4byte @081D5138 + .4byte @081D5148 + .4byte @081D515C + .4byte @081D516C + .4byte @081D5198 + .4byte @081D51D0 + .4byte @081D524C + .4byte @081D5268 + .4byte @081D5290 + .4byte @081D52AC + .4byte @081D52DC + .4byte @081D52F2 + .4byte @081D5308 + .4byte @081D536A + .4byte @081D5390 + .4byte @081D53A8 + .4byte @081D53C6 + .4byte @081D53F2 + .4byte @081D5418 + .4byte @081D5448 + .4byte @081D5454 + .4byte @081D5460 + .4byte @081D5430 + .4byte @081D548A + .4byte @081D548A + .4byte @081D5478 +@081D511C: adds r0, r4, 0 adds r0, 0x9 ldr r1, =0x085edfd6 bl mevent_0814257C cmp r0, 0 - bne _081D512C - b _081D548A -_081D512C: + bne @081D512C + b @081D548A +@081D512C: movs r0, 0x1 strb r0, [r4, 0x8] - b _081D548A + b @081D548A .align 2, 0 .pool -_081D5138: +@081D5138: bl sub_81D4E30 adds r0, r4, 0 bl sub_81D505C movs r0, 0x2 strb r0, [r4, 0x8] - b _081D548A -_081D5148: + b @081D548A +@081D5148: adds r0, r4, 0 movs r1, 0xA bl sub_81D5064 cmp r0, 0 - bne _081D5156 - b _081D548A -_081D5156: + bne @081D5156 + b @081D548A +@081D5156: movs r0, 0x3 strb r0, [r4, 0x8] - b _081D548A -_081D515C: + b @081D548A +@081D515C: bl sub_81D4EC0 cmp r0, 0 - beq _081D5166 - b _081D52FC -_081D5166: + beq @081D5166 + b @081D52FC +@081D5166: bl sub_80097E8 - b _081D525C -_081D516C: + b @081D525C +@081D516C: adds r0, r4, 0 adds r0, 0x9 ldr r1, =0x085edff5 bl mevent_0814257C cmp r0, 0 - bne _081D517C - b _081D548A -_081D517C: + bne @081D517C + b @081D548A +@081D517C: ldr r0, =0x085ee014 bl sub_8018884 adds r0, r4, 0 bl sub_81D505C movs r0, 0x5 strb r0, [r4, 0x8] - b _081D548A + b @081D548A .align 2, 0 .pool -_081D5198: +@081D5198: adds r0, r4, 0 movs r1, 0x5A bl sub_81D5064 cmp r0, 0 - beq _081D51AE + beq @081D51AE bl sub_81D4E30 movs r0, 0x6 strb r0, [r4, 0x8] - b _081D548A -_081D51AE: + b @081D548A +@081D51AE: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne _081D51BC - b _081D548A -_081D51BC: + bne @081D51BC + b @081D548A +@081D51BC: adds r0, r4, 0 bl sub_81D505C movs r0, 0x5 bl audio_play - b _081D535A + b @081D535A .align 2, 0 .pool -_081D51D0: +@081D51D0: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _081D51F4 + beq @081D51F4 movs r0, 0x5 bl audio_play bl sub_80097E8 adds r0, r4, 0 bl sub_81D505C - b _081D535A + b @081D535A .align 2, 0 .pool -_081D51F4: +@081D51F4: bl sub_800ABAC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bls _081D5210 + bls @081D5210 adds r0, r4, 0 bl sub_81D505C bl sub_80097E8 movs r0, 0x7 strb r0, [r4, 0x8] - b _081D548A -_081D5210: + b @081D548A +@081D5210: bl sub_81D4E60 cmp r0, 0 - beq _081D522E + beq @081D522E movs r0, 0x5 bl audio_play bl sub_80097E8 @@ -908116,35 +908116,35 @@ _081D5210: bl sub_81D505C movs r0, 0x8 strb r0, [r4, 0x8] - b _081D548A -_081D522E: + b @081D548A +@081D522E: adds r0, r4, 0 movs r1, 0xA bl sub_81D5064 cmp r0, 0 - bne _081D523C - b _081D548A -_081D523C: + bne @081D523C + b @081D548A +@081D523C: bl sub_80097E8 bl sub_81D4E30 adds r0, r4, 0 bl sub_81D505C - b _081D548A -_081D524C: + b @081D548A +@081D524C: adds r0, r4, 0 adds r0, 0x9 ldr r1, =0x085ee05c bl mevent_0814257C cmp r0, 0 - bne _081D525C - b _081D548A -_081D525C: + bne @081D525C + b @081D548A +@081D525C: movs r0, 0x4 strb r0, [r4, 0x8] - b _081D548A + b @081D548A .align 2, 0 .pool -_081D5268: +@081D5268: ldr r0, =0x085ee097 bl sub_8018884 ldr r0, =0x03006370 @@ -908154,131 +908154,131 @@ _081D5268: bl sub_81D4D50 movs r0, 0x9 strb r0, [r4, 0x8] - b _081D548A + b @081D548A .align 2, 0 .pool -_081D5290: +@081D5290: ldr r0, =0x03006370 bl sub_81D4DE8 strb r0, [r4, 0xE] lsls r0, 24 cmp r0, 0 - bne _081D52A0 - b _081D548A -_081D52A0: + bne @081D52A0 + b @081D548A +@081D52A0: movs r0, 0xA strb r0, [r4, 0x8] - b _081D548A + b @081D548A .align 2, 0 .pool -_081D52AC: +@081D52AC: ldr r0, =0x03006370 bl sub_81D4DB8 ldrb r0, [r4, 0xE] cmp r0, 0x3 - bne _081D52BA - b _081D53C0 -_081D52BA: + bne @081D52BA + b @081D53C0 +@081D52BA: cmp r0, 0x1 - beq _081D52C0 - b _081D546E -_081D52C0: + beq @081D52C0 + b @081D546E +@081D52C0: adds r0, r4, 0 bl sub_81D505C ldr r0, =0x085ee120 bl sub_8018884 movs r0, 0xB strb r0, [r4, 0x8] - b _081D548A + b @081D548A .align 2, 0 .pool -_081D52DC: +@081D52DC: movs r1, 0xD2 lsls r1, 2 adds r0, r4, 0 bl sub_81D5064 cmp r0, 0 - bne _081D52EC - b _081D548A -_081D52EC: + bne @081D52EC + b @081D548A +@081D52EC: movs r0, 0xC strb r0, [r4, 0x8] - b _081D548A -_081D52F2: + b @081D548A +@081D52F2: bl sub_81D4E30 ldr r0, =0x085ee0dc bl sub_8018884 -_081D52FC: +@081D52FC: movs r0, 0xD strb r0, [r4, 0x8] - b _081D548A + b @081D548A .align 2, 0 .pool -_081D5308: +@081D5308: adds r0, r4, 0 adds r0, 0x9 adds r1, r4, 0 bl sub_81D4EE4 cmp r0, 0x5 - bls _081D5318 - b _081D548A -_081D5318: + bls @081D5318 + b @081D548A +@081D5318: lsls r0, 2 - ldr r1, =_081D5328 + ldr r1, =@081D5328 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081D5328: - .4byte _081D548A - .4byte _081D5350 - .4byte _081D5340 - .4byte _081D5374 - .4byte _081D5374 - .4byte _081D5360 -_081D5340: +@081D5328: + .4byte @081D548A + .4byte @081D5350 + .4byte @081D5340 + .4byte @081D5374 + .4byte @081D5374 + .4byte @081D5360 +@081D5340: ldr r0, =0x085ee097 bl sub_8018884 movs r0, 0xE strb r0, [r4, 0x8] - b _081D548A + b @081D548A .align 2, 0 .pool -_081D5350: +@081D5350: movs r0, 0x5 bl audio_play bl sub_80097E8 -_081D535A: +@081D535A: movs r0, 0x17 strb r0, [r4, 0x8] - b _081D548A -_081D5360: + b @081D548A +@081D5360: bl sub_80097E8 movs r0, 0x15 strb r0, [r4, 0x8] - b _081D548A -_081D536A: + b @081D548A +@081D536A: bl sub_800B33C lsls r0, 24 cmp r0, 0 - beq _081D537A -_081D5374: + beq @081D537A +@081D5374: bl sub_80097E8 - b _081D53C0 -_081D537A: + b @081D53C0 +@081D537A: bl sub_800A550 lsls r0, 24 cmp r0, 0 - bne _081D5386 - b _081D548A -_081D5386: + bne @081D5386 + b @081D548A +@081D5386: bl sub_800A5B4 movs r0, 0xF strb r0, [r4, 0x8] - b _081D548A -_081D5390: + b @081D548A +@081D5390: ldr r0, =0x0201c000 bl sub_81D3920 strb r0, [r4, 0xE] @@ -908286,50 +908286,50 @@ _081D5390: bl sub_800ABF4 movs r0, 0x10 strb r0, [r4, 0x8] - b _081D548A + b @081D548A .align 2, 0 .pool -_081D53A8: +@081D53A8: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne _081D548A + bne @081D548A ldrb r0, [r4, 0xE] cmp r0, 0x1 - bne _081D53C0 + bne @081D53C0 movs r0, 0x11 strb r0, [r4, 0x8] - b _081D548A + b @081D548A .align 2, 0 .pool -_081D53C0: +@081D53C0: movs r0, 0x14 strb r0, [r4, 0x8] - b _081D548A -_081D53C6: + b @081D548A +@081D53C6: ldr r0, =0x0201c000 bl sub_81D3AB0 cmp r0, 0 - beq _081D53EC + beq @081D53EC ldr r0, =0x085ee0fa bl sub_8018884 adds r0, r4, 0 bl sub_81D505C movs r0, 0x12 strb r0, [r4, 0x8] - b _081D548A + b @081D548A .align 2, 0 .pool -_081D53EC: +@081D53EC: movs r0, 0x16 strb r0, [r4, 0x8] - b _081D548A -_081D53F2: + b @081D548A +@081D53F2: adds r0, r4, 0 movs r1, 0x78 bl sub_81D5064 cmp r0, 0 - beq _081D548A + beq @081D548A ldr r0, =0x085ee107 bl sub_8018884 movs r0, 0xB9 @@ -908337,70 +908337,70 @@ _081D53F2: bl fanfare_play movs r0, 0x13 strb r0, [r4, 0x8] - b _081D548A + b @081D548A .align 2, 0 .pool -_081D5418: +@081D5418: bl task_is_not_running_overworld_fanfare lsls r0, 24 cmp r0, 0 - beq _081D548A + beq @081D548A ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 - b _081D543A + b @081D543A .align 2, 0 .pool -_081D5430: +@081D5430: adds r0, r4, 0 adds r0, 0x9 ldr r1, =0x085ee06b bl mevent_0814257C -_081D543A: +@081D543A: cmp r0, 0 - beq _081D548A + beq @081D548A movs r0, 0x1A strb r0, [r4, 0x8] - b _081D548A + b @081D548A .align 2, 0 .pool -_081D5448: +@081D5448: adds r0, r4, 0 adds r0, 0x9 ldr r1, =0x085ee0a3 - b _081D5466 + b @081D5466 .align 2, 0 .pool -_081D5454: +@081D5454: adds r0, r4, 0 adds r0, 0x9 ldr r1, =0x085ee0bf - b _081D5466 + b @081D5466 .align 2, 0 .pool -_081D5460: +@081D5460: adds r0, r4, 0 adds r0, 0x9 ldr r1, =0x085ee12d -_081D5466: +@081D5466: bl mevent_0814257C cmp r0, 0 - beq _081D548A -_081D546E: + beq @081D548A +@081D546E: movs r0, 0 strb r0, [r4, 0x8] - b _081D548A + b @081D548A .align 2, 0 .pool -_081D5478: +@081D5478: ldr r0, [r4, 0x10] bl free adds r0, r5, 0 bl remove_task ldr r0, =sub_80186A4 + 1 bl set_callback2 -_081D548A: +@081D548A: pop {r4,r5} pop {r0} bx r0 @@ -908409,7 +908409,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, =0x0862a618 @@ -908427,7 +908427,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] @@ -908453,7 +908453,7 @@ sub_81D54BC: @ 81D54BC adds r6, r2, 0 ldr r5, =0x00003718 movs r4, 0x3 -_081D54EE: +@081D54EE: ldr r0, [r6] adds r0, r5 ldr r1, =0x00034bbf @@ -908461,7 +908461,7 @@ _081D54EE: adds r5, 0x4 subs r4, 0x1 cmp r4, 0 - bge _081D54EE + bge @081D54EE pop {r4-r6} pop {r0} bx r0 @@ -908470,7 +908470,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 @@ -908482,7 +908482,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 @@ -908502,7 +908502,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 @@ -908516,14 +908516,14 @@ sub_81D5554: @ 81D5554 movs r0, 0xB muls r0, r1 adds r2, r0, r2 -_081D556E: +@081D556E: adds r1, r4, r3 ldrb r0, [r2] strb r0, [r1] adds r2, 0x1 adds r3, 0x1 cmp r3, 0xA - ble _081D556E + ble @081D556E pop {r4} pop {r0} bx r0 @@ -908532,7 +908532,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 @@ -908568,7 +908568,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 @@ -908582,7 +908582,7 @@ sub_81D55D0: @ 81D55D0 movs r6, 0 ldr r0, =0x0203cf54 mov r10, r0 -_081D55EE: +@081D55EE: movs r5, 0 lsls r1, r6, 2 mov r8, r1 @@ -908597,7 +908597,7 @@ _081D55EE: lsls r0, 3 adds r0, r6 lsls r7, r0, 3 -_081D560A: +@081D560A: ldr r0, =0x0203cf58 ldr r4, [r0] mov r1, r12 @@ -908619,7 +908619,7 @@ _081D560A: strb r0, [r4] adds r5, 0x1 cmp r5, 0xA - ble _081D560A + ble @081D560A ldr r1, =0x0203cf58 ldr r4, [r1] adds r4, 0x16 @@ -908642,7 +908642,7 @@ _081D560A: strb r0, [r4] mov r6, r9 cmp r6, 0x1 - ble _081D55EE + ble @081D55EE ldr r1, =0x03005d8c ldr r0, [r1] ldr r1, =0x00003d64 @@ -908661,16 +908661,16 @@ _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] cmp r0, 0 - beq _081D56A6 + beq @081D56A6 bl free movs r0, 0 str r0, [r4] -_081D56A6: +@081D56A6: pop {r4} pop {r0} bx r0 @@ -908679,12 +908679,12 @@ _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] cmp r0, 0 - bne _081D56EC + bne @081D56EC ldr r0, =0x00000eec bl malloc_and_clear str r0, [r4] @@ -908707,7 +908707,7 @@ sub_81D56B0: @ 81D56B0 ldr r2, =0x040003ba bl CpuSet bl nullsub_2 -_081D56EC: +@081D56EC: pop {r4} pop {r0} bx r0 @@ -908716,16 +908716,16 @@ _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] cmp r0, 0 - beq _081D5722 + beq @081D5722 bl free movs r0, 0 str r0, [r4] -_081D5722: +@081D5722: pop {r4} pop {r0} bx r0 @@ -908734,7 +908734,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 @@ -908750,19 +908750,19 @@ sub_81D572C: @ 81D572C lsls r4, 24 lsrs r4, 24 cmp r5, 0x3 - beq _081D5790 + beq @081D5790 cmp r5, 0x3 - bgt _081D575A + bgt @081D575A cmp r5, 0x2 - beq _081D5764 - b _081D580E -_081D575A: + beq @081D5764 + b @081D580E +@081D575A: cmp r6, 0x4 - beq _081D57BC + beq @081D57BC cmp r6, 0x5 - beq _081D57E8 - b _081D580E -_081D5764: + beq @081D57E8 + b @081D580E +@081D5764: ldr r0, =0x0203cf54 lsls r1, r2, 4 subs r1, r2 @@ -908781,10 +908781,10 @@ _081D5764: adds r0, r1 adds r0, 0x10 bl sub_81638AC - b _081D580E + b @081D580E .align 2, 0 .pool -_081D5790: +@081D5790: ldr r0, =0x0203cf54 lsls r1, r2, 4 subs r1, r2 @@ -908803,10 +908803,10 @@ _081D5790: adds r0, r1 adds r0, 0x1C bl sub_81638AC - b _081D580E + b @081D580E .align 2, 0 .pool -_081D57BC: +@081D57BC: ldr r0, =0x0203cf54 lsls r1, r2, 4 subs r1, r2 @@ -908825,10 +908825,10 @@ _081D57BC: adds r0, r1 adds r0, 0x28 bl sub_81638AC - b _081D580E + b @081D580E .align 2, 0 .pool -_081D57E8: +@081D57E8: ldr r0, =0x0203cf54 lsls r1, r2, 4 subs r1, r2 @@ -908847,7 +908847,7 @@ _081D57E8: adds r0, r1 adds r0, 0x34 bl sub_81638AC -_081D580E: +@081D580E: bl sub_81D5710 pop {r4-r6} pop {r0} @@ -908857,12 +908857,12 @@ _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 cmp r0, 0 - bne _081D5844 + bne @081D5844 ldr r3, =0x03005d8c ldr r1, [r3] ldr r0, =0x00003d6e @@ -908870,10 +908870,10 @@ sub_81D581C: @ 81D581C ldrb r0, [r1] movs r2, 0x20 orrs r0, r2 - b _081D5854 + b @081D5854 .align 2, 0 .pool -_081D5844: +@081D5844: ldr r3, =0x03005d8c ldr r1, [r3] ldr r0, =0x00003d6e @@ -908882,7 +908882,7 @@ _081D5844: movs r0, 0x21 negs r0, r0 ands r0, r2 -_081D5854: +@081D5854: strb r0, [r1] adds r6, r3, 0 ldr r0, [r6] @@ -908941,7 +908941,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 @@ -908955,19 +908955,19 @@ sub_81D58D8: @ 81D58D8 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _081D58FA + beq @081D58FA movs r0, 0x1 strh r0, [r3] -_081D58FA: +@081D58FA: ldrb r1, [r2] movs r0, 0x3 ands r0, r1 cmp r0, 0x3 - bne _081D590A + bne @081D590A ldrh r0, [r3] adds r0, 0x1 strh r0, [r3] -_081D590A: +@081D590A: ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 @@ -908979,7 +908979,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} @@ -908990,7 +908990,7 @@ sub_81D5924: @ 81D5924 ldr r0, [r0] ldrb r0, [r0, 0x6] cmp r0, 0x4 - bne _081D5952 + bne @081D5952 ldr r0, =0x03005d8c mov r8, r0 ldr r0, [r0] @@ -909001,22 +909001,22 @@ sub_81D5924: @ 81D5924 adds r4, r6, 0 ands r4, r0 cmp r4, 0 - beq _081D596C -_081D5952: + beq @081D596C +@081D5952: ldr r1, =0x020375f0 movs r0, 0x2 strh r0, [r1] - b _081D59C0 + b @081D59C0 .align 2, 0 .pool -_081D596C: +@081D596C: adds r0, r5, 0 movs r1, 0x1 bl bag_add_item lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081D59BC + bne @081D59BC ldr r1, =0x02021dc4 adds r0, r5, 0 bl itemid_get_name @@ -909038,13 +909038,13 @@ _081D596C: strb r0, [r1] ldr r0, =0x020375f0 strh r4, [r0] - b _081D59C0 + b @081D59C0 .align 2, 0 .pool -_081D59BC: +@081D59BC: ldr r0, =0x020375f0 strh r6, [r0] -_081D59C0: +@081D59C0: pop {r3} mov r8, r3 pop {r4-r7} @@ -909055,7 +909055,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] @@ -909068,13 +909068,13 @@ sub_81D59D0: @ 81D59D0 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - beq _081D59FC + beq @081D59FC ldr r0, =0x020375f0 strh r3, [r0] - b _081D5A4E + b @081D5A4E .align 2, 0 .pool -_081D59FC: +@081D59FC: ldr r1, =0x00003d68 adds r0, r2, r1 bl free_203F458 @@ -909083,7 +909083,7 @@ _081D59FC: adds r1, r2, r3 ldr r1, [r1] cmp r0, r1 - bls _081D5A48 + bls @081D5A48 adds r3, 0x4 adds r0, r2, r3 bl sub_81D5DF4 @@ -909101,14 +909101,14 @@ _081D59FC: str r0, [r1] ldr r0, =0x020375f0 strh r5, [r0] - b _081D5A4E + b @081D5A4E .align 2, 0 .pool -_081D5A48: +@081D5A48: ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] -_081D5A4E: +@081D5A4E: ldr r0, =0x03005d8c ldr r1, [r0] ldr r3, =0x00003d6e @@ -909125,7 +909125,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] @@ -909135,28 +909135,28 @@ sub_81D5A70: @ 81D5A70 movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne _081D5AAE + bne @081D5AAE ldr r0, =0x00003d64 adds r2, r0 ldr r1, [r2] ldr r0, =0x00034bbe cmp r1, r0 - bls _081D5AA8 + bls @081D5AA8 adds r0, 0x1 str r0, [r2] - b _081D5AAE + b @081D5AAE .align 2, 0 .pool -_081D5AA8: +@081D5AA8: adds r0, r2, 0 bl sub_80008DC -_081D5AAE: +@081D5AAE: pop {r0} bx r0 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 @@ -909171,7 +909171,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] @@ -909181,34 +909181,34 @@ sub_81D5AD0: @ 81D5AD0 movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _081D5B00 + beq @081D5B00 movs r0, 0x9 negs r0, r0 ands r0, r1 strb r0, [r2] ldr r1, =0x020375f0 movs r0, 0 - b _081D5B20 + b @081D5B20 .align 2, 0 .pool -_081D5B00: +@081D5B00: movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _081D5B1C + beq @081D5B1C movs r0, 0x11 negs r0, r0 ands r0, r1 strb r0, [r2] ldr r1, =0x020375f0 movs r0, 0x1 - b _081D5B20 + b @081D5B20 .align 2, 0 .pool -_081D5B1C: +@081D5B1C: ldr r1, =0x020375f0 movs r0, 0x2 -_081D5B20: +@081D5B20: strh r0, [r1] pop {r0} bx r0 @@ -909217,7 +909217,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] @@ -909226,9 +909226,9 @@ sub_81D5B2C: @ 81D5B2C ldr r7, [r0] ldr r0, =0x00034bbe cmp r7, r0 - ble _081D5B40 + ble @081D5B40 ldr r7, =0x00034bbf -_081D5B40: +@081D5B40: movs r4, 0xE1 lsls r4, 4 adds r0, r7, 0 @@ -909274,14 +909274,14 @@ _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 ldr r1, [r0] ldrb r0, [r1, 0x6] cmp r0, 0x4 - beq _081D5BEC + beq @081D5BEC ldr r0, =0x02021cc4 ldrb r1, [r1, 0x6] movs r2, 0 @@ -909289,13 +909289,13 @@ sub_81D5BBC: @ 81D5BBC bl decimal_int_to_string ldr r1, =0x020375f0 movs r0, 0 - b _081D5BF0 + b @081D5BF0 .align 2, 0 .pool -_081D5BEC: +@081D5BEC: ldr r1, =0x020375f0 movs r0, 0x1 -_081D5BF0: +@081D5BF0: strh r0, [r1] bl sub_81D5710 pop {r0} @@ -909305,7 +909305,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 @@ -909319,13 +909319,13 @@ 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 var_get lsls r0, 16 cmp r0, 0 - beq _081D5C42 + beq @081D5C42 ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00003d6e @@ -909334,41 +909334,41 @@ sub_81D5C18: @ 81D5C18 movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne _081D5C42 + bne @081D5C42 bl sub_81D609C lsls r0, 24 cmp r0, 0 - bne _081D5C54 -_081D5C42: + bne @081D5C54 +@081D5C42: movs r0, 0 - b _081D5C56 + b @081D5C56 .align 2, 0 .pool -_081D5C54: +@081D5C54: movs r0, 0x1 -_081D5C56: +@081D5C56: pop {r1} bx r1 thumb_func_end sub_81D5C18 thumb_func_start sub_81D5C5C -sub_81D5C5C: @ 81D5C5C +sub_81D5C5C: ; 81D5C5C push {lr} bl sub_81D5C18 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _081D5C74 + bne @081D5C74 ldr r0, =0x020375f0 strh r1, [r0] - b _081D5C7A + b @081D5C7A .align 2, 0 .pool -_081D5C74: +@081D5C74: ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] -_081D5C7A: +@081D5C7A: pop {r0} bx r0 .align 2, 0 @@ -909376,17 +909376,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 @@ -909420,7 +909420,7 @@ sub_81D5C8C: @ 81D5C8C mov r10, r4 ldr r1, =0x02021fc4 mov r9, r1 -_081D5CD6: +@081D5CD6: lsls r3, r7, 24 lsrs r3, 24 ldr r0, =0x0862a5f4 @@ -909508,7 +909508,7 @@ _081D5CD6: add r8, r1 mov r0, r8 cmp r0, 0x3 - ble _081D5CD6 + ble @081D5CD6 movs r0, 0 bl Window_WriteStandardTileMap movs r0, 0 @@ -909528,19 +909528,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 @@ -909555,14 +909555,14 @@ sub_81D5DF8: @ 81D5DF8 str r1, [sp, 0x4] bl sub_81D5F48 cmp r0, 0 - beq _081D5F0E + beq @081D5F0E bl sub_81D56B0 movs r7, 0 ldr r4, =0x03005d90 ldr r3, =0x00000cb4 ldr r0, =0x0000ffff adds r2, r0, 0 -_081D5E26: +@081D5E26: ldr r1, [r4] lsls r0, r7, 1 adds r1, r3 @@ -909574,7 +909574,7 @@ _081D5E26: lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x1 - bls _081D5E26 + bls @081D5E26 movs r0, 0 str r0, [sp] ldr r0, =0x03005d8c @@ -909592,7 +909592,7 @@ _081D5E26: movs r7, 0 ldr r3, =0x0203cf54 mov r10, r3 -_081D5E64: +@081D5E64: lsls r4, r7, 1 mov r8, r4 adds r5, r4, r7 @@ -909674,9 +909674,9 @@ _081D5E64: lsls r6, 24 lsrs r7, r6, 24 cmp r7, 0x1 - bls _081D5E64 + bls @081D5E64 bl sub_81D5710 -_081D5F0E: +@081D5F0E: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -909690,7 +909690,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 @@ -909700,7 +909700,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 @@ -909749,7 +909749,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 @@ -909760,18 +909760,18 @@ sub_81D5FB4: @ 81D5FB4 lsrs r0, 24 mov r9, r0 cmp r0, 0x6 - bne _081D5FD2 + bne @081D5FD2 bl sub_8087D74 - b _081D605E -_081D5FD2: + b @081D605E +@081D5FD2: bl sub_81D56B0 mov r0, r9 cmp r0, 0x5 - bne _081D5FE6 + bne @081D5FE6 bl sub_8087D74 bl sub_81D5710 - b _081D605E -_081D5FE6: + b @081D605E +@081D5FE6: bl sub_81D5520 lsls r0, 24 lsrs r0, 24 @@ -909789,33 +909789,33 @@ _081D5FE6: lsls r0, 1 adds r3, r4, r0 movs r6, 0x4 -_081D600A: +@081D600A: adds r4, r2, 0 adds r4, 0x20 adds r1, r3, 0 movs r5, 0xF -_081D6012: +@081D6012: ldrh r0, [r2] strh r0, [r1] adds r2, 0x2 adds r1, 0x2 subs r5, 0x1 cmp r5, 0 - bge _081D6012 + bge @081D6012 adds r3, 0x3E adds r2, r4, 0 subs r6, 0x1 cmp r6, 0 - bge _081D600A + bge @081D600A movs r6, 0 -_081D602C: +@081D602C: movs r5, 0 adds r7, r3, 0 adds r7, 0x3E adds r0, r6, 0x1 mov r8, r0 adds r4, r3, 0 -_081D6038: +@081D6038: mov r0, r9 adds r1, r5, 0 adds r2, r6, 0 @@ -909825,14 +909825,14 @@ _081D6038: adds r4, 0x2 adds r5, 0x1 cmp r5, 0xF - ble _081D6038 + ble @081D6038 adds r3, r7, 0 mov r6, r8 cmp r6, 0xF - ble _081D602C + ble @081D602C bl mapheader_run_script_with_tag_x1 bl sub_81D5710 -_081D605E: +@081D605E: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -909844,7 +909844,7 @@ _081D605E: thumb_func_end sub_81D5FB4 thumb_func_start sub_81D6074 -sub_81D6074: @ 81D6074 +sub_81D6074: ; 81D6074 push {lr} ldr r1, =0x02037318 ldr r2, =0xfffffe61 @@ -909855,9 +909855,9 @@ sub_81D6074: @ 81D6074 lsrs r0, 16 movs r1, 0 cmp r0, 0x3 - bhi _081D608C + bhi @081D608C movs r1, 0x1 -_081D608C: +@081D608C: adds r0, r1, 0 pop {r1} bx r1 @@ -909866,71 +909866,71 @@ _081D608C: thumb_func_end sub_81D6074 thumb_func_start sub_81D609C -sub_81D609C: @ 81D609C +sub_81D609C: ; 81D609C push {lr} ldr r0, =0x02037318 ldrh r2, [r0, 0x12] ldr r0, =0x0000019f cmp r2, r0 - bne _081D60B4 + bne @081D60B4 movs r1, 0x1 - b _081D60F8 + b @081D60F8 .align 2, 0 .pool -_081D60B4: +@081D60B4: movs r0, 0xD0 lsls r0, 1 cmp r2, r0 - bne _081D60C0 + bne @081D60C0 movs r1, 0x2 - b _081D60F8 -_081D60C0: + b @081D60F8 +@081D60C0: ldr r0, =0x000001a1 cmp r2, r0 - bne _081D60D0 + bne @081D60D0 movs r1, 0x3 - b _081D60F8 + b @081D60F8 .align 2, 0 .pool -_081D60D0: +@081D60D0: movs r0, 0xD1 lsls r0, 1 cmp r2, r0 - bne _081D60DC + bne @081D60DC movs r1, 0x4 - b _081D60F8 -_081D60DC: + b @081D60F8 +@081D60DC: ldr r0, =0x000001a3 cmp r2, r0 - bne _081D60EC + bne @081D60EC movs r1, 0x5 - b _081D60F8 + b @081D60F8 .align 2, 0 .pool -_081D60EC: +@081D60EC: movs r0, 0xCF lsls r0, 1 movs r1, 0 cmp r2, r0 - bne _081D60F8 + bne @081D60F8 movs r1, 0x6 -_081D60F8: +@081D60F8: adds r0, r1, 0 pop {r1} bx r1 thumb_func_end sub_81D609C thumb_func_start sub_81D6100 -sub_81D6100: @ 81D6100 +sub_81D6100: ; 81D6100 push {lr} ldr r0, =0x02037318 ldrh r1, [r0, 0x12] ldr r0, =0x000001a3 movs r2, 0 cmp r1, r0 - bne _081D6110 + bne @081D6110 movs r2, 0x1 -_081D6110: +@081D6110: adds r0, r2, 0 pop {r1} bx r1 @@ -909939,7 +909939,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 @@ -909952,20 +909952,20 @@ 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 cmp r0, 0x1 - bne _081D614C + bne @081D614C ldr r0, =0x02037318 ldr r0, [r0, 0x4] ldr r0, [r0, 0x8] adds r0, 0x8 - b _081D6176 + b @081D6176 .align 2, 0 .pool -_081D614C: +@081D614C: bl sub_81D6490 lsls r0, 24 lsrs r2, r0, 24 @@ -909974,9 +909974,9 @@ _081D614C: adds r0, r1 lsrs r0, 24 cmp r0, 0x3 - bls _081D6162 + bls @081D6162 movs r2, 0x4 -_081D6162: +@081D6162: ldr r1, =0x0862a688 subs r0, r2, 0x1 lsls r0, 2 @@ -909986,7 +909986,7 @@ _081D6162: bl get_mapheader_by_bank_and_number ldr r0, [r0, 0x4] ldr r0, [r0, 0x8] -_081D6176: +@081D6176: pop {r1} bx r1 .align 2, 0 @@ -909994,7 +909994,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] @@ -910009,7 +910009,7 @@ battle_init: @ 81D6180 thumb_func_end battle_init thumb_func_start sub_81D619C -sub_81D619C: @ 81D619C +sub_81D619C: ; 81D619C push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -910045,7 +910045,7 @@ sub_81D619C: @ 81D619C thumb_func_end sub_81D619C thumb_func_start sub_81D61E8 -sub_81D61E8: @ 81D61E8 +sub_81D61E8: ; 81D61E8 push {r4-r7,lr} mov r7, r8 push {r7} @@ -910059,7 +910059,7 @@ sub_81D61E8: @ 81D61E8 ldr r1, =0x0832a328 mov r12, r1 adds r5, r6, 0 -_081D6204: +@081D6204: ldr r2, [r5] lsls r0, r3, 1 ldr r7, =0x00000cb4 @@ -910069,7 +910069,7 @@ _081D6204: mov r1, r8 ldrh r1, [r1] cmp r0, r1 - bne _081D6240 + bne @081D6240 movs r7, 0xEE lsls r7, 4 adds r2, r7 @@ -910080,28 +910080,28 @@ _081D6204: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - b _081D624A + b @081D624A .align 2, 0 .pool -_081D6240: +@081D6240: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x1 - bls _081D6204 -_081D624A: + bls @081D6204 +@081D624A: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 8 ands r0, r1 cmp r0, 0 - beq _081D62A2 + beq @081D62A2 movs r3, 0 ldr r5, =0x02038bcc ldr r0, =0x0832a328 mov r8, r0 -_081D6260: +@081D6260: ldr r2, [r6] lsls r0, r3, 1 ldr r7, =0x00000cb4 @@ -910110,7 +910110,7 @@ _081D6260: ldrh r0, [r1] ldrh r1, [r5] cmp r0, r1 - bne _081D6298 + bne @081D6298 movs r7, 0xEE lsls r7, 4 adds r2, r7 @@ -910121,16 +910121,16 @@ _081D6260: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - b _081D62A2 + b @081D62A2 .align 2, 0 .pool -_081D6298: +@081D6298: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x1 - bls _081D6260 -_081D62A2: + bls @081D6260 +@081D62A2: pop {r3} mov r8, r3 pop {r4-r7} @@ -910139,7 +910139,7 @@ _081D62A2: thumb_func_end sub_81D61E8 thumb_func_start sub_81D62AC -sub_81D62AC: @ 81D62AC +sub_81D62AC: ; 81D62AC ldr r0, =0x082c83f0 bx lr .align 2, 0 @@ -910147,7 +910147,7 @@ sub_81D62AC: @ 81D62AC thumb_func_end sub_81D62AC thumb_func_start sub_81D62B4 -sub_81D62B4: @ 81D62B4 +sub_81D62B4: ; 81D62B4 push {lr} ldr r0, =0x020375f2 ldrh r1, [r0] @@ -910161,7 +910161,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 @@ -910176,7 +910176,7 @@ sub_81D62CC: @ 81D62CC lsls r0, r1, 16 lsrs r0, 16 cmp r0, 0x1 - bhi _081D636A + bhi @081D636A lsls r0, r1, 24 lsrs r6, r0, 24 bl sub_81D56B0 @@ -910191,12 +910191,12 @@ sub_81D62CC: @ 81D62CC mov r5, r9 adds r0, r5, 0x3 cmp r5, r0 - bge _081D6366 + bge @081D6366 ldr r1, =0x0862a698 lsls r0, r6, 1 adds r0, r6 adds r7, r0, r1 -_081D6316: +@081D6316: ldrb r2, [r7] movs r0, 0x64 adds r4, r5, 0 @@ -910234,10 +910234,10 @@ _081D6316: mov r0, r9 adds r0, 0x3 cmp r5, r0 - blt _081D6316 -_081D6366: + blt @081D6316 +@081D6366: bl sub_81D5710 -_081D636A: +@081D636A: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -910250,7 +910250,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 @@ -910264,7 +910264,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 @@ -910282,13 +910282,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 @@ -910318,28 +910318,28 @@ sub_81D63C8: @ 81D63C8 adds r4, r0 ldrb r3, [r4] ldr r1, =0x0862a3b4 -_081D6406: +@081D6406: ldrb r0, [r1] cmp r0, r3 - bne _081D641C + bne @081D641C ldrb r0, [r1, 0x1] - b _081D6426 + b @081D6426 .align 2, 0 .pool -_081D641C: +@081D641C: adds r1, 0x4 adds r2, 0x1 cmp r2, 0x35 - bls _081D6406 + bls @081D6406 movs r0, 0 -_081D6426: +@081D6426: pop {r4} pop {r1} bx r1 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 @@ -910387,7 +910387,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 @@ -910403,7 +910403,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 @@ -910417,16 +910417,16 @@ 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 - bne _081D64D4 + bne @081D64D4 ldr r0, =0x0862a5d4 movs r1, 0x70 movs r2, 0x20 bl gpu_pal_apply -_081D64D4: +@081D64D4: pop {r0} bx r0 .align 2, 0 @@ -910434,7 +910434,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] @@ -910449,7 +910449,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 @@ -910464,7 +910464,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 @@ -910479,35 +910479,35 @@ 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 cmp r0, 0 - beq _081D6560 + beq @081D6560 bl sub_81D609C lsls r0, 24 lsrs r0, 24 cmp r0, 0x6 - beq _081D6560 + beq @081D6560 bl sub_81D5C00 ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 - beq _081D6560 + beq @081D6560 movs r0, 0x1 - b _081D6562 + b @081D6562 .align 2, 0 .pool -_081D6560: +@081D6560: movs r0, 0 -_081D6562: +@081D6562: pop {r1} bx r1 thumb_func_end sub_81D6534 thumb_func_start sub_81D6568 -sub_81D6568: @ 81D6568 +sub_81D6568: ; 81D6568 push {lr} ldr r0, =0x03005d8c ldr r0, [r0] @@ -910517,16 +910517,16 @@ sub_81D6568: @ 81D6568 movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq _081D6590 + beq @081D6590 ldr r1, =0x020375f0 movs r0, 0 - b _081D6594 + b @081D6594 .align 2, 0 .pool -_081D6590: +@081D6590: ldr r1, =0x020375f0 movs r0, 0x1 -_081D6594: +@081D6594: strh r0, [r1] pop {r0} bx r0 @@ -910535,7 +910535,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] @@ -910567,7 +910567,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 @@ -910576,7 +910576,7 @@ sub_81D65E8: @ 81D65E8 ldr r0, =0x0203cf54 ldr r6, [r0] movs r5, 0x1F -_081D65F8: +@081D65F8: lsls r1, r4, 4 subs r1, r4 lsls r1, 3 @@ -910597,12 +910597,12 @@ _081D65F8: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls _081D65F8 + bls @081D65F8 movs r1, 0x5 cmp r7, 0 - beq _081D662A + beq @081D662A movs r1, 0xA -_081D662A: +@081D662A: adds r0, r3, 0 bl __umodsi3 lsls r0, 24 @@ -910616,13 +910616,13 @@ _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 ldr r0, =0x0203cf54 ldr r4, [r0] -_081D664A: +@081D664A: lsls r0, r2, 4 subs r0, r2 lsls r0, 3 @@ -910637,12 +910637,12 @@ _081D664A: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls _081D664A + bls @081D664A adds r0, r3, 0 cmp r0, 0 - bge _081D6670 + bge @081D6670 adds r0, 0xFF -_081D6670: +@081D6670: asrs r4, r0, 8 lsrs r0, 31 adds r0, r4, r0 @@ -910653,19 +910653,19 @@ _081D6670: bl flag_check lsls r0, 24 cmp r0, 0 - beq _081D66A0 + beq @081D66A0 ldr r0, =0x0203cf54 ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r0, 0x8 - bne _081D66A0 + bne @081D66A0 movs r0, 0x1 - b _081D66A2 + b @081D66A2 .align 2, 0 .pool -_081D66A0: +@081D66A0: movs r0, 0 -_081D66A2: +@081D66A2: bl sub_81D65E8 lsls r0, 24 lsrs r2, r0, 24 @@ -910677,13 +910677,13 @@ _081D66A2: movs r0, 0xC0 ands r0, r1 cmp r0, 0xC0 - bne _081D66C8 + bne @081D66C8 adds r0, r2, 0x1 movs r1, 0xA bl __modsi3 lsls r0, 24 lsrs r2, r0, 24 -_081D66C8: +@081D66C8: ldr r1, =0x0862a5cc lsls r0, r4, 2 adds r0, r1 @@ -910699,21 +910699,21 @@ _081D66C8: bl __divsi3 movs r1, 0 cmp r0, 0xB - ble _081D6704 + ble @081D6704 movs r1, 0x1 cmp r0, 0xC - ble _081D6704 + ble @081D6704 movs r1, 0x2 cmp r0, 0xD - ble _081D6704 + ble @081D6704 movs r1, 0x3 cmp r0, 0xF - ble _081D6704 + ble @081D6704 movs r1, 0x5 cmp r0, 0x11 - bgt _081D6704 + bgt @081D6704 movs r1, 0x4 -_081D6704: +@081D6704: lsls r0, r1, 1 adds r0, r4 ldrh r0, [r0] @@ -910725,7 +910725,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} @@ -910761,7 +910761,7 @@ sub_81D6720: @ 81D6720 thumb_func_end sub_81D6720 thumb_func_start sub_81D6774 -sub_81D6774: @ 81D6774 +sub_81D6774: ; 81D6774 push {lr} bl vblank_hblank_handler_set_zero bl clear_scheduled_bg_copies_to_vram @@ -910794,7 +910794,7 @@ sub_81D6774: @ 81D6774 thumb_func_end sub_81D6774 thumb_func_start sub_81D67D0 -sub_81D67D0: @ 81D67D0 +sub_81D67D0: ; 81D67D0 push {lr} bl run_active_tasks bl call_obj_callbacks @@ -910806,7 +910806,7 @@ sub_81D67D0: @ 81D67D0 thumb_func_end sub_81D67D0 thumb_func_start sub_81D67EC -sub_81D67EC: @ 81D67EC +sub_81D67EC: ; 81D67EC push {lr} bl copy_super_sprites_to_oam bl copy_queue_process @@ -910816,7 +910816,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 @@ -910825,7 +910825,7 @@ sub_81D6800: @ 81D6800 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081D6830 + bne @081D6830 bl reset_all_obj_data bl gpu_pal_allocator_reset ldr r4, =0x0203cf60 @@ -910836,7 +910836,7 @@ sub_81D6800: @ 81D6800 bl free adds r0, r5, 0 bl remove_task -_081D6830: +@081D6830: pop {r4,r5} pop {r0} bx r0 @@ -910845,7 +910845,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 @@ -910857,24 +910857,24 @@ sub_81D6840: @ 81D6840 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _081D68B2 + bne @081D68B2 ldr r2, =0x0203cf60 ldr r1, [r2] ldr r4, =0x00002007 adds r0, r1, r4 ldrb r0, [r0] cmp r0, 0x1 - bne _081D6888 + bne @081D6888 ldr r0, =0x03005e00 lsls r1, r3, 2 adds r1, r3 lsls r1, 3 adds r1, r0 ldr r0, =sub_81D6800 + 1 - b _081D68B0 + b @081D68B0 .align 2, 0 .pool -_081D6888: +@081D6888: ldr r4, =0x00002006 adds r1, r4 ldrb r0, [r1] @@ -910895,9 +910895,9 @@ _081D6888: lsls r0, 2 adds r0, r3 ldr r0, [r0] -_081D68B0: +@081D68B0: str r0, [r1] -_081D68B2: +@081D68B2: pop {r4-r6} pop {r0} bx r0 @@ -910906,7 +910906,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 @@ -910932,7 +910932,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 @@ -910945,7 +910945,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 @@ -910961,45 +910961,45 @@ sub_81D691C: @ 81D691C movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081D697E + bne @081D697E movs r0, 0 ldrsh r1, [r5, r0] cmp r1, 0x40 - bne _081D6954 + bne @081D6954 bl sub_81D7438 - b _081D6978 + b @081D6978 .align 2, 0 .pool -_081D6954: +@081D6954: cmp r1, 0x90 - bne _081D695E + bne @081D695E bl sub_81D7480 - b _081D6978 -_081D695E: + b @081D6978 +@081D695E: cmp r1, 0x94 - beq _081D6974 + beq @081D6974 movs r0, 0xA4 lsls r0, 1 cmp r1, r0 - bne _081D6978 + bne @081D6978 adds r0, r4, 0 movs r1, 0 bl sub_81D75B4 - b _081D697E -_081D6974: + b @081D697E +@081D6974: bl sub_81D74C8 -_081D6978: +@081D6978: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] -_081D697E: +@081D697E: pop {r4,r5} pop {r0} bx r0 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} @@ -911067,7 +911067,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 @@ -911080,12 +911080,12 @@ sub_81D6A20: @ 81D6A20 mov r1, r12 strh r0, [r1, 0xA] cmp r0, 0 - bne _081D6A84 + bne @081D6A84 ldrh r1, [r3, 0x20] movs r2, 0x20 ldrsh r0, [r3, r2] cmp r0, 0x48 - beq _081D6A84 + beq @081D6A84 subs r0, r1, 0x1 strh r0, [r3, 0x20] ldr r2, =0x02020630 @@ -911118,26 +911118,26 @@ sub_81D6A20: @ 81D6A20 ldrh r1, [r0, 0x20] subs r1, 0x1 strh r1, [r0, 0x20] -_081D6A84: +@081D6A84: adds r0, r3, 0 adds r0, 0x2B ldrb r3, [r0] cmp r3, 0x1 - beq _081D6AE4 + beq @081D6AE4 cmp r3, 0x1 - bgt _081D6A9C + bgt @081D6A9C cmp r3, 0 - beq _081D6AA6 - b _081D6B68 + beq @081D6AA6 + b @081D6B68 .align 2, 0 .pool -_081D6A9C: +@081D6A9C: cmp r3, 0x2 - beq _081D6B24 + beq @081D6B24 cmp r3, 0x3 - beq _081D6AE4 - b _081D6B68 -_081D6AA6: + beq @081D6AE4 + b @081D6B68 +@081D6AA6: ldr r2, =0x02020630 mov r0, r12 movs r4, 0x2 @@ -911166,10 +911166,10 @@ _081D6AA6: mov r0, r12 movs r4, 0x4 ldrsh r1, [r0, r4] - b _081D6B5E + b @081D6B5E .align 2, 0 .pool -_081D6AE4: +@081D6AE4: ldr r2, =0x02020630 mov r0, r12 movs r3, 0x2 @@ -911197,10 +911197,10 @@ _081D6AE4: adds r0, r2 movs r1, 0x1 negs r1, r1 - b _081D6B58 + b @081D6B58 .align 2, 0 .pool -_081D6B24: +@081D6B24: ldr r2, =0x02020630 mov r3, r12 movs r4, 0x2 @@ -911227,17 +911227,17 @@ _081D6B24: lsls r0, 2 adds r0, r2 ldr r1, =0x0000fffe -_081D6B58: +@081D6B58: strh r1, [r0, 0x24] movs r0, 0x4 ldrsh r1, [r4, r0] -_081D6B5E: +@081D6B5E: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r2 strh r3, [r0, 0x26] -_081D6B68: +@081D6B68: pop {r4} pop {r0} bx r0 @@ -911246,7 +911246,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} @@ -911433,7 +911433,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 @@ -911445,12 +911445,12 @@ sub_81D6D20: @ 81D6D20 strh r0, [r3, 0xA] ldr r7, =0x02020630 cmp r0, 0 - bne _081D6E0E + bne @081D6E0E ldrh r1, [r4, 0x20] movs r2, 0x20 ldrsh r0, [r4, r2] cmp r0, 0x98 - beq _081D6E0E + beq @081D6E0E adds r0, r1, 0x1 strh r0, [r4, 0x20] ldrh r1, [r4, 0x2E] @@ -911553,7 +911553,7 @@ sub_81D6D20: @ 81D6D20 ldrh r1, [r0, 0x20] adds r1, 0x1 strh r1, [r0, 0x20] -_081D6E0E: +@081D6E0E: adds r6, r7, 0 movs r5, 0xFF ldrb r1, [r3, 0x4] @@ -911564,23 +911564,23 @@ _081D6E0E: adds r0, 0x2B ldrb r2, [r0] cmp r2, 0x1 - beq _081D6EE0 + beq @081D6EE0 cmp r2, 0x1 - bgt _081D6E34 + bgt @081D6E34 cmp r2, 0 - beq _081D6E40 - b _081D6FC8 + beq @081D6E40 + b @081D6FC8 .align 2, 0 .pool -_081D6E34: +@081D6E34: cmp r2, 0x2 - bne _081D6E3A - b _081D6F68 -_081D6E3A: + bne @081D6E3A + b @081D6F68 +@081D6E3A: cmp r2, 0x3 - beq _081D6EE0 - b _081D6FC8 -_081D6E40: + beq @081D6EE0 + b @081D6FC8 +@081D6E40: strh r2, [r4, 0x26] ldrh r1, [r3] lsls r1, 16 @@ -911660,8 +911660,8 @@ _081D6E40: adds r0, r1 lsls r0, 2 adds r0, r6 - b _081D6FC6 -_081D6EE0: + b @081D6FC6 +@081D6EE0: movs r2, 0x1 strh r2, [r4, 0x26] ldrh r1, [r3] @@ -911729,8 +911729,8 @@ _081D6EE0: adds r0, r7 strh r2, [r0, 0x26] ldrb r1, [r3, 0x8] - b _081D6FBE -_081D6F68: + b @081D6FBE +@081D6F68: strh r2, [r4, 0x26] ldrh r1, [r3] lsls r1, 16 @@ -911774,21 +911774,21 @@ _081D6F68: strh r2, [r0, 0x26] ldrh r1, [r3, 0x8] ands r1, r5 -_081D6FBE: +@081D6FBE: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r7 -_081D6FC6: +@081D6FC6: strh r2, [r0, 0x26] -_081D6FC8: +@081D6FC8: pop {r4-r7} pop {r0} bx r0 thumb_func_end sub_81D6D20 thumb_func_start sub_81D6FD0 -sub_81D6FD0: @ 81D6FD0 +sub_81D6FD0: ; 81D6FD0 push {lr} bl sub_81D67EC bl sub_80BA0A8 @@ -911797,7 +911797,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 @@ -911849,7 +911849,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 @@ -911859,11 +911859,11 @@ sub_81D706C: @ 81D706C movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram -_081D7082: +@081D7082: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - bne _081D7082 + bne @081D7082 ldr r0, =0x08da3988 ldr r4, =0x0203cf60 ldr r1, [r4] @@ -911908,7 +911908,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 @@ -911945,7 +911945,7 @@ task_add_00_WIN0V_open_close_above_and_more: @ 81D7134 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _081D71CC + bne @081D71CC bl sub_81D6984 lsls r0, 24 lsrs r0, 24 @@ -911959,10 +911959,10 @@ task_add_00_WIN0V_open_close_above_and_more: @ 81D7134 adds r0, r6, r0 ldr r1, =sub_81D691C + 1 str r1, [r0] - b _081D71EE + b @081D71EE .align 2, 0 .pool -_081D71CC: +@081D71CC: bl sub_81D7664 lsls r0, 24 lsrs r0, 24 @@ -911977,7 +911977,7 @@ _081D71CC: ldr r1, =sub_81D736C + 1 str r1, [r0] bl sub_80A2F30 -_081D71EE: +@081D71EE: movs r4, 0x1 negs r4, r4 adds r0, r4, 0 @@ -912004,7 +912004,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 @@ -912019,12 +912019,12 @@ sub_81D7228: @ 81D7228 movs r0, 0xF0 lsls r0, 3 adds r5, r4, r0 -_081D7244: +@081D7244: lsls r0, r1, 16 asrs r1, r0, 16 adds r6, r0, 0 cmp r1, 0x2F - bgt _081D726C + bgt @081D726C lsls r1, 1 adds r2, r1, r4 ldrh r0, [r3] @@ -912032,12 +912032,12 @@ _081D7244: strh r0, [r2] adds r1, r5 ldrh r0, [r3] - b _081D72CA + b @081D72CA .align 2, 0 .pool -_081D726C: +@081D726C: cmp r1, 0x3F - bgt _081D7280 + bgt @081D7280 lsls r1, 1 adds r2, r1, r4 ldrh r0, [r3, 0x2] @@ -912045,10 +912045,10 @@ _081D726C: strh r0, [r2] adds r1, r5 ldrh r0, [r3, 0x2] - b _081D72CA -_081D7280: + b @081D72CA +@081D7280: cmp r1, 0x4B - bgt _081D7294 + bgt @081D7294 lsls r1, 1 adds r2, r1, r4 ldrh r0, [r3, 0x4] @@ -912056,10 +912056,10 @@ _081D7280: strh r0, [r2] adds r1, r5 ldrh r0, [r3, 0x4] - b _081D72CA -_081D7294: + b @081D72CA +@081D7294: cmp r1, 0x53 - bgt _081D72A8 + bgt @081D72A8 lsls r1, 1 adds r2, r1, r4 ldrh r0, [r3, 0x6] @@ -912067,10 +912067,10 @@ _081D7294: strh r0, [r2] adds r1, r5 ldrh r0, [r3, 0x6] - b _081D72CA -_081D72A8: + b @081D72CA +@081D72A8: cmp r1, 0x57 - bgt _081D72BC + bgt @081D72BC lsls r1, 1 adds r2, r1, r4 ldrh r0, [r3, 0x8] @@ -912078,8 +912078,8 @@ _081D72A8: strh r0, [r2] adds r1, r5 ldrh r0, [r3, 0x8] - b _081D72CA -_081D72BC: + b @081D72CA +@081D72BC: lsls r1, 1 adds r2, r1, r4 ldrh r0, [r3, 0xA] @@ -912087,7 +912087,7 @@ _081D72BC: strh r0, [r2] adds r1, r5 ldrh r0, [r3, 0xA] -_081D72CA: +@081D72CA: lsrs r0, 8 strh r0, [r1] movs r1, 0x80 @@ -912096,13 +912096,13 @@ _081D72CA: lsrs r1, r0, 16 asrs r0, 16 cmp r0, 0x5B - ble _081D7244 + ble @081D7244 ldr r0, [r7] ldr r1, =0x00002006 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _081D7324 + bne @081D7324 movs r1, 0xE0 lsls r1, 1 adds r0, r1, 0 @@ -912129,10 +912129,10 @@ _081D72CA: strh r0, [r3, 0x6] ldrh r0, [r3, 0x8] adds r0, 0xC0 - b _081D735E + b @081D735E .align 2, 0 .pool -_081D7324: +@081D7324: movs r1, 0xC0 lsls r1, 2 adds r0, r1, 0 @@ -912162,7 +912162,7 @@ _081D7324: adds r0, r1, 0 ldrh r1, [r3, 0x8] adds r0, r1 -_081D735E: +@081D735E: strh r0, [r3, 0x8] ldrh r0, [r3, 0xA] adds r0, 0x80 @@ -912173,7 +912173,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 @@ -912190,41 +912190,41 @@ sub_81D736C: @ 81D736C lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - bne _081D742E + bne @081D742E movs r0, 0 ldrsh r1, [r4, r0] cmp r1, 0x20 - beq _081D739C + beq @081D739C cmp r1, 0x70 - bne _081D73AC -_081D739C: + bne @081D73AC +@081D739C: bl sub_81D7438 - b _081D7428 + b @081D7428 .align 2, 0 .pool -_081D73AC: +@081D73AC: cmp r1, 0xD8 - bne _081D73B6 + bne @081D73B6 bl sub_81D7480 - b _081D7428 -_081D73B6: + b @081D7428 +@081D73B6: cmp r1, 0xDC - bne _081D73C0 + bne @081D73C0 bl sub_81D74C8 - b _081D7428 -_081D73C0: + b @081D7428 +@081D73C0: movs r0, 0xBE lsls r0, 1 cmp r1, r0 - beq _081D73D8 + beq @081D73D8 adds r0, 0x20 cmp r1, r0 - bne _081D7428 + bne @081D7428 adds r0, r5, 0 movs r1, 0x2 bl sub_81D75B4 - b _081D742E -_081D73D8: + b @081D742E +@081D73D8: movs r1, 0x91 lsls r1, 2 movs r0, 0x50 @@ -912263,11 +912263,11 @@ _081D73D8: ldrh r1, [r4, 0x6] strh r1, [r0, 0xE] bl remove_some_task -_081D7428: +@081D7428: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -_081D742E: +@081D742E: pop {r4-r7} pop {r0} bx r0 @@ -912276,7 +912276,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 @@ -912309,7 +912309,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 @@ -912342,7 +912342,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 @@ -912373,7 +912373,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 @@ -912390,7 +912390,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 @@ -912421,23 +912421,23 @@ sub_81D752C: @ 81D752C movs r0, 0x1 bl bg_get_y_offset cmp r0, 0 - beq _081D757A + beq @081D757A movs r0, 0x80 lsls r0, 8 cmp r4, r0 - bls _081D7586 -_081D757A: + bls @081D7586 +@081D757A: movs r1, 0x80 lsls r1, 3 movs r0, 0x1 movs r2, 0x2 bl bg_change_y_offset -_081D7586: +@081D7586: ldrh r2, [r5] movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0x10 - beq _081D75A6 + beq @081D75A6 adds r2, 0x1 strh r2, [r5] lsls r1, r2, 8 @@ -912448,7 +912448,7 @@ _081D7586: lsrs r1, 16 movs r0, 0x52 bl lcd_io_set -_081D75A6: +@081D75A6: pop {r4,r5} pop {r0} bx r0 @@ -912457,7 +912457,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 @@ -912494,7 +912494,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 @@ -912511,7 +912511,7 @@ sub_81D7600: @ 81D7600 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne _081D7652 + bne @081D7652 ldrb r0, [r5, 0x2] bl remove_task movs r0, 0x1 @@ -912529,7 +912529,7 @@ sub_81D7600: @ 81D7600 adds r0, r6, r0 ldr r1, =sub_81D6840 + 1 str r1, [r0] -_081D7652: +@081D7652: pop {r4-r7} pop {r0} bx r0 @@ -912538,7 +912538,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} @@ -912606,7 +912606,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 @@ -912621,12 +912621,12 @@ sub_81D7700: @ 81D7700 movs r1, 0x7 ands r1, r0 cmp r1, 0 - bne _081D7768 + bne @081D7768 ldrh r1, [r3, 0x20] movs r2, 0x20 ldrsh r0, [r3, r2] cmp r0, 0x48 - beq _081D7768 + beq @081D7768 subs r0, r1, 0x1 strh r0, [r3, 0x20] ldr r2, =0x02020630 @@ -912659,26 +912659,26 @@ sub_81D7700: @ 81D7700 ldrh r1, [r0, 0x20] subs r1, 0x1 strh r1, [r0, 0x20] -_081D7768: +@081D7768: adds r0, r3, 0 adds r0, 0x2B ldrb r3, [r0] cmp r3, 0x1 - beq _081D77C8 + beq @081D77C8 cmp r3, 0x1 - bgt _081D7780 + bgt @081D7780 cmp r3, 0 - beq _081D778A - b _081D784C + beq @081D778A + b @081D784C .align 2, 0 .pool -_081D7780: +@081D7780: cmp r3, 0x2 - beq _081D7808 + beq @081D7808 cmp r3, 0x3 - beq _081D77C8 - b _081D784C -_081D778A: + beq @081D77C8 + b @081D784C +@081D778A: ldr r2, =0x02020630 mov r0, r12 movs r4, 0x2 @@ -912707,10 +912707,10 @@ _081D778A: mov r0, r12 movs r4, 0x4 ldrsh r1, [r0, r4] - b _081D7842 + b @081D7842 .align 2, 0 .pool -_081D77C8: +@081D77C8: ldr r2, =0x02020630 mov r0, r12 movs r3, 0x2 @@ -912738,10 +912738,10 @@ _081D77C8: adds r0, r2 movs r1, 0x1 negs r1, r1 - b _081D783C + b @081D783C .align 2, 0 .pool -_081D7808: +@081D7808: ldr r2, =0x02020630 mov r3, r12 movs r4, 0x2 @@ -912768,17 +912768,17 @@ _081D7808: lsls r0, 2 adds r0, r2 ldr r1, =0x0000fffe -_081D783C: +@081D783C: strh r1, [r0, 0x24] movs r0, 0x4 ldrsh r1, [r4, r0] -_081D7842: +@081D7842: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r2 strh r3, [r0, 0x26] -_081D784C: +@081D784C: pop {r4} pop {r0} bx r0 @@ -912787,7 +912787,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 @@ -912796,7 +912796,7 @@ sub_81D7860: @ 81D7860 movs r4, 0x22 ldrsh r0, [r1, r4] cmp r0, 0xA0 - bgt _081D78B0 + bgt @081D78B0 adds r0, r2, 0 adds r0, 0x8 strh r0, [r1, 0x22] @@ -912828,7 +912828,7 @@ sub_81D7860: @ 81D7860 ldrh r1, [r0, 0x22] adds r1, 0x8 strh r1, [r0, 0x22] -_081D78B0: +@081D78B0: pop {r4} pop {r0} bx r0 @@ -912837,7 +912837,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} @@ -913024,7 +913024,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 @@ -913038,12 +913038,12 @@ sub_81D7A60: @ 81D7A60 ands r1, r0 ldr r7, =0x02020630 cmp r1, 0 - bne _081D7B52 + bne @081D7B52 ldrh r1, [r4, 0x20] movs r2, 0x20 ldrsh r0, [r4, r2] cmp r0, 0x98 - beq _081D7B52 + beq @081D7B52 adds r0, r1, 0x1 strh r0, [r4, 0x20] ldrh r1, [r4, 0x2E] @@ -913146,7 +913146,7 @@ sub_81D7A60: @ 81D7A60 ldrh r1, [r0, 0x20] adds r1, 0x1 strh r1, [r0, 0x20] -_081D7B52: +@081D7B52: adds r6, r7, 0 movs r5, 0xFF ldrb r1, [r3, 0x4] @@ -913157,23 +913157,23 @@ _081D7B52: adds r0, 0x2B ldrb r2, [r0] cmp r2, 0x1 - beq _081D7C24 + beq @081D7C24 cmp r2, 0x1 - bgt _081D7B78 + bgt @081D7B78 cmp r2, 0 - beq _081D7B84 - b _081D7D0C + beq @081D7B84 + b @081D7D0C .align 2, 0 .pool -_081D7B78: +@081D7B78: cmp r2, 0x2 - bne _081D7B7E - b _081D7CAC -_081D7B7E: + bne @081D7B7E + b @081D7CAC +@081D7B7E: cmp r2, 0x3 - beq _081D7C24 - b _081D7D0C -_081D7B84: + beq @081D7C24 + b @081D7D0C +@081D7B84: strh r2, [r4, 0x26] ldrh r1, [r3] lsls r1, 16 @@ -913253,8 +913253,8 @@ _081D7B84: adds r0, r1 lsls r0, 2 adds r0, r6 - b _081D7D0A -_081D7C24: + b @081D7D0A +@081D7C24: movs r2, 0x1 strh r2, [r4, 0x26] ldrh r1, [r3] @@ -913322,8 +913322,8 @@ _081D7C24: adds r0, r7 strh r2, [r0, 0x26] ldrb r1, [r3, 0x8] - b _081D7D02 -_081D7CAC: + b @081D7D02 +@081D7CAC: strh r2, [r4, 0x26] ldrh r1, [r3] lsls r1, 16 @@ -913367,21 +913367,21 @@ _081D7CAC: strh r2, [r0, 0x26] ldrh r1, [r3, 0x8] ands r1, r5 -_081D7D02: +@081D7D02: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r7 -_081D7D0A: +@081D7D0A: strh r2, [r0, 0x26] -_081D7D0C: +@081D7D0C: pop {r4-r7} pop {r0} bx r0 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 @@ -913391,7 +913391,7 @@ sub_81D7D14: @ 81D7D14 movs r3, 0x22 ldrsh r0, [r2, r3] cmp r0, 0xA0 - bgt _081D7E08 + bgt @081D7E08 adds r0, r1, 0 adds r0, 0x8 strh r0, [r2, 0x22] @@ -913504,7 +913504,7 @@ sub_81D7D14: @ 81D7D14 ldrh r1, [r0, 0x22] adds r1, 0x8 strh r1, [r0, 0x22] -_081D7E08: +@081D7E08: pop {r0} bx r0 .align 2, 0 @@ -913512,7 +913512,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 @@ -913564,7 +913564,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 @@ -913587,11 +913587,11 @@ sub_81D7E9C: @ 81D7E9C movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram -_081D7ED0: +@081D7ED0: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - bne _081D7ED0 + bne @081D7ED0 ldr r0, =0x08da3988 ldr r4, =0x0203cf60 ldr r1, [r4] @@ -913624,7 +913624,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 @@ -913670,7 +913670,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 @@ -913683,28 +913683,28 @@ sub_81D7FC0: @ 81D7FC0 movs r0, 0 ldrsh r5, [r4, r0] cmp r5, 0x1 - beq _081D802A + beq @081D802A cmp r5, 0x1 - bgt _081D7FE8 + bgt @081D7FE8 cmp r5, 0 - beq _081D7FF4 - b _081D815A + beq @081D7FF4 + b @081D815A .align 2, 0 .pool -_081D7FE8: +@081D7FE8: cmp r5, 0x2 - beq _081D80A4 + beq @081D80A4 cmp r5, 0x3 - bne _081D7FF2 - b _081D8124 -_081D7FF2: - b _081D815A -_081D7FF4: + bne @081D7FF2 + b @081D8124 +@081D7FF2: + b @081D815A +@081D7FF4: ldrh r1, [r4, 0x2] movs r2, 0x2 ldrsh r0, [r4, r2] cmp r0, 0x8 - bne _081D8024 + bne @081D8024 movs r0, 0x1 negs r0, r0 str r5, [sp] @@ -913722,12 +913722,12 @@ _081D7FF4: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - b _081D815A -_081D8024: + b @081D815A +@081D8024: adds r0, r1, 0x1 strh r0, [r4, 0x2] - b _081D815A -_081D802A: + b @081D815A +@081D802A: ldrh r1, [r4, 0x6] ldrh r3, [r4, 0x4] adds r0, r1, r3 @@ -913739,20 +913739,20 @@ _081D802A: lsls r0, r1, 16 asrs r0, 16 cmp r0, 0x3 - ble _081D8046 + ble @081D8046 subs r0, r1, 0x3 strh r0, [r4, 0x6] -_081D8046: +@081D8046: lsls r0, r2, 16 cmp r0, 0 - beq _081D8050 + beq @081D8050 subs r0, r2, 0x1 strh r0, [r4, 0xA] -_081D8050: +@081D8050: movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0xFF - ble _081D8078 + ble @081D8078 movs r2, 0x80 lsls r2, 1 adds r0, r2, 0 @@ -913769,7 +913769,7 @@ _081D8050: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -_081D8078: +@081D8078: movs r1, 0xF0 lsls r1, 7 movs r2, 0xC0 @@ -913790,8 +913790,8 @@ _081D8078: movs r0, 0x2 movs r3, 0x78 bl call_gpu_bg_affine_set - b _081D815A -_081D80A4: + b @081D815A +@081D80A4: ldrh r0, [r4, 0x2] adds r0, 0x1 strh r0, [r4, 0x2] @@ -913826,12 +913826,12 @@ _081D80A4: lsls r0, 16 asrs r1, r0, 16 cmp r1, 0xC - beq _081D80F4 + beq @081D80F4 movs r0, 0xC negs r0, r0 cmp r1, r0 - bne _081D815A -_081D80F4: + bne @081D815A +@081D80F4: movs r2, 0xE ldrsh r0, [r4, r2] negs r0, r0 @@ -913840,7 +913840,7 @@ _081D80F4: ldrsh r1, [r4, r3] ldr r0, =0x00000127 cmp r1, r0 - ble _081D815A + ble @081D815A ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] @@ -913851,10 +913851,10 @@ _081D80F4: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - b _081D815A + b @081D815A .align 2, 0 .pool -_081D8124: +@081D8124: ldrh r0, [r4, 0x4] adds r0, 0x10 strh r0, [r4, 0x4] @@ -913880,7 +913880,7 @@ _081D8124: bl call_gpu_bg_affine_set adds r0, r6, 0 bl sub_81D8164 -_081D815A: +@081D815A: add sp, 0x10 pop {r4-r6} pop {r0} @@ -913888,7 +913888,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 @@ -913897,7 +913897,7 @@ sub_81D8164: @ 81D8164 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081D8192 + bne @081D8192 movs r0, 0 bl SetVBlankCallback bl reset_all_obj_data @@ -913909,7 +913909,7 @@ sub_81D8164: @ 81D8164 adds r1, r0 ldr r0, =sub_81D6840 + 1 str r0, [r1] -_081D8192: +@081D8192: pop {r4} pop {r0} bx r0 @@ -913918,7 +913918,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 @@ -913931,7 +913931,7 @@ sub_81D81A4: @ 81D81A4 movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne _081D8254 + bne @081D8254 ldr r0, =0x0862aaa0 ldr r3, =0x0862aab8 movs r1, 0 @@ -913989,36 +913989,36 @@ sub_81D81A4: @ 81D81A4 movs r6, 0 ldrsh r0, [r4, r6] cmp r0, 0x9 - bne _081D8250 + bne @081D8250 adds r0, r5, 0 bl remove_task - b _081D825A + b @081D825A .align 2, 0 .pool -_081D8250: +@081D8250: adds r0, r1, 0x1 strh r0, [r4] -_081D8254: +@081D8254: ldrh r0, [r4, 0x2] adds r0, 0x1 strh r0, [r4, 0x2] -_081D825A: +@081D825A: pop {r4-r6} pop {r0} bx r0 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 ldrsh r0, [r2, r1] cmp r0, 0 - bne _081D8270 + bne @081D8270 strh r0, [r2, 0x24] - b _081D829A -_081D8270: + b @081D829A +@081D8270: ldr r1, =0x0862aab8 movs r3, 0x2E ldrsh r0, [r2, r3] @@ -914040,7 +914040,7 @@ _081D8270: asrs r0, 24 ldrh r1, [r2, 0x26] adds r0, r1 -_081D829A: +@081D829A: strh r0, [r2, 0x26] ldrh r0, [r2, 0x30] adds r0, 0x1 @@ -914054,7 +914054,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 @@ -914115,7 +914115,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 @@ -914133,12 +914133,12 @@ sub_81D8358: @ 81D8358 movs r3, 0 bl decompress_and_copy_tile_data_to_vram add r7, sp, 0x8 -_081D8380: +@081D8380: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - bne _081D8380 + bne @081D8380 ldr r0, =0x08da7aac ldr r5, =0x0203cf60 ldr r1, [r5] @@ -914195,7 +914195,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 lcd_io_get @@ -914206,7 +914206,7 @@ sub_81D844C: @ 81D844C lsls r0, r1, 16 lsrs r0, 16 cmp r0, 0x6F - bhi _081D848C + bhi @081D848C ldr r0, =0x0203cf60 ldr r0, [r0] ldr r3, =0x00002008 @@ -914214,21 +914214,21 @@ sub_81D844C: @ 81D844C movs r3, 0 ldrsh r0, [r0, r3] cmp r1, r0 - bgt _081D848C + bgt @081D848C ldr r1, =0x04000052 ldr r3, =0x00000d08 - b _081D8492 + b @081D8492 .align 2, 0 .pool -_081D848C: +@081D848C: ldr r1, =0x04000052 movs r3, 0x80 lsls r3, 5 -_081D8492: +@081D8492: adds r0, r3, 0 strh r0, [r1] cmp r2, 0 - bne _081D84E0 + bne @081D84E0 ldr r0, =0x0203cf60 ldr r1, [r0] ldr r2, =0x00002008 @@ -914239,30 +914239,30 @@ _081D8492: ldr r1, =0x00001fff adds r5, r0, 0 cmp r2, r1 - bgt _081D84D4 + bgt @081D84D4 cmp r2, 0x27 - bgt _081D84C8 + bgt @081D84C8 adds r0, r4, 0x4 - b _081D84D2 + b @081D84D2 .align 2, 0 .pool -_081D84C8: +@081D84C8: cmp r2, 0x4F - bgt _081D84D0 + bgt @081D84D0 adds r0, r4, 0x2 - b _081D84D2 -_081D84D0: + b @081D84D2 +@081D84D0: adds r0, r4, 0x1 -_081D84D2: +@081D84D2: strh r0, [r3] -_081D84D4: +@081D84D4: ldr r1, [r5] ldr r2, =0x0000200a adds r1, r2 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -_081D84E0: +@081D84E0: pop {r4,r5} pop {r0} bx r0 @@ -914271,7 +914271,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} @@ -914329,7 +914329,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 @@ -914342,27 +914342,27 @@ sub_81D857C: @ 81D857C movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0x4 - bhi _081D8674 + bhi @081D8674 lsls r0, 2 - ldr r1, =_081D85A8 + ldr r1, =@081D85A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081D85A8: - .4byte _081D85BC - .4byte _081D85DC - .4byte _081D861A - .4byte _081D863A - .4byte _081D8656 -_081D85BC: +@081D85A8: + .4byte @081D85BC + .4byte @081D85DC + .4byte @081D861A + .4byte @081D863A + .4byte @081D8656 +@081D85BC: ldrh r1, [r5, 0x2] movs r2, 0x2 ldrsh r0, [r5, r2] cmp r0, 0x8 - bne _081D8634 + bne @081D8634 movs r0, 0x1 negs r0, r0 movs r4, 0 @@ -914372,8 +914372,8 @@ _081D85BC: movs r3, 0 bl sub_80A1AD4 strh r4, [r5, 0x2] - b _081D864E -_081D85DC: + b @081D864E +@081D85DC: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -914381,12 +914381,12 @@ _081D85DC: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne _081D8674 + bne @081D8674 ldrh r2, [r5, 0x2] movs r3, 0x2 ldrsh r0, [r5, r3] cmp r0, 0xA - bne _081D8614 + bne @081D8614 strh r1, [r5, 0x2] ldrh r0, [r5] adds r0, 0x1 @@ -914395,31 +914395,31 @@ _081D85DC: bl SetHBlankCallback movs r0, 0x3 bl enable_irqs - b _081D8674 + b @081D8674 .align 2, 0 .pool -_081D8614: +@081D8614: adds r0, r2, 0x1 strh r0, [r5, 0x2] - b _081D8674 -_081D861A: + b @081D8674 +@081D861A: ldrh r1, [r5, 0x2] movs r2, 0x2 ldrsh r0, [r5, r2] cmp r0, 0x50 - bne _081D8634 + bne @081D8634 movs r0, 0 strh r0, [r5, 0x2] ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] bl sub_81D86CC - b _081D8674 -_081D8634: + b @081D8674 +@081D8634: adds r0, r1, 0x1 strh r0, [r5, 0x2] - b _081D8674 -_081D863A: + b @081D8674 +@081D863A: ldrh r0, [r5, 0x2] adds r0, 0x1 strh r0, [r5, 0x2] @@ -914427,15 +914427,15 @@ _081D863A: movs r1, 0xB8 lsls r1, 17 cmp r0, r1 - bne _081D8674 + bne @081D8674 movs r0, 0 strh r0, [r5, 0x2] -_081D864E: +@081D864E: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] - b _081D8674 -_081D8656: + b @081D8674 +@081D8656: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -914450,7 +914450,7 @@ _081D8656: adds r0, r1 ldr r1, =sub_81D8684 + 1 str r1, [r0] -_081D8674: +@081D8674: add sp, 0x4 pop {r4,r5} pop {r0} @@ -914460,7 +914460,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 @@ -914469,7 +914469,7 @@ sub_81D8684: @ 81D8684 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081D86B8 + bne @081D86B8 movs r0, 0 bl SetVBlankCallback movs r0, 0 @@ -914483,7 +914483,7 @@ sub_81D8684: @ 81D8684 adds r1, r0 ldr r0, =sub_81D6840 + 1 str r0, [r1] -_081D86B8: +@081D86B8: pop {r4} pop {r0} bx r0 @@ -914492,7 +914492,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} @@ -914551,7 +914551,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 @@ -914559,74 +914559,74 @@ sub_81D874C: @ 81D874C movs r0, 0x4 ldrsh r1, [r4, r0] cmp r1, 0 - bne _081D8764 + bne @081D8764 movs r0, 0xC strh r0, [r4, 0x6] movs r0, 0x8 - b _081D87C2 -_081D8764: + b @081D87C2 +@081D8764: movs r0, 0x80 lsls r0, 1 cmp r1, r0 - bne _081D8774 + bne @081D8774 movs r0, 0x9 strh r0, [r4, 0x6] movs r0, 0x7 - b _081D87C2 -_081D8774: + b @081D87C2 +@081D8774: movs r0, 0x86 lsls r0, 1 cmp r1, r0 - bne _081D8784 + bne @081D8784 movs r0, 0x8 strh r0, [r4, 0x6] movs r0, 0x6 - b _081D87C2 -_081D8784: + b @081D87C2 +@081D8784: movs r0, 0x8C lsls r0, 1 cmp r1, r0 - bne _081D8794 + bne @081D8794 movs r0, 0x7 strh r0, [r4, 0x6] movs r0, 0x5 - b _081D87C2 -_081D8794: + b @081D87C2 +@081D8794: movs r0, 0x92 lsls r0, 1 cmp r1, r0 - bne _081D87A4 + bne @081D87A4 movs r0, 0x6 strh r0, [r4, 0x6] movs r0, 0x4 - b _081D87C2 -_081D87A4: + b @081D87C2 +@081D87A4: movs r0, 0x98 lsls r0, 1 cmp r1, r0 - bne _081D87B4 + bne @081D87B4 movs r0, 0x5 strh r0, [r4, 0x6] movs r0, 0x3 - b _081D87C2 -_081D87B4: + b @081D87C2 +@081D87B4: movs r0, 0xA0 lsls r0, 1 cmp r1, r0 - bne _081D87C4 + bne @081D87C4 movs r0, 0x4 strh r0, [r4, 0x6] movs r0, 0x2 -_081D87C2: +@081D87C2: strh r0, [r4, 0x8] -_081D87C4: +@081D87C4: movs r1, 0x4 ldrsh r0, [r4, r1] movs r2, 0x6 ldrsh r1, [r4, r2] bl __modsi3 cmp r0, 0 - bne _081D87EE + bne @081D87EE ldrh r0, [r5, 0x24] subs r0, 0x1 strh r0, [r5, 0x24] @@ -914640,14 +914640,14 @@ _081D87C4: ldrh r1, [r0, 0x24] subs r1, 0x1 strh r1, [r0, 0x24] -_081D87EE: +@081D87EE: movs r1, 0x4 ldrsh r0, [r4, r1] movs r2, 0x8 ldrsh r1, [r4, r2] bl __modsi3 cmp r0, 0 - bne _081D8818 + bne @081D8818 ldrh r0, [r5, 0x26] adds r0, 0x1 strh r0, [r5, 0x26] @@ -914661,7 +914661,7 @@ _081D87EE: ldrh r1, [r0, 0x26] adds r1, 0x1 strh r1, [r0, 0x26] -_081D8818: +@081D8818: ldrh r0, [r4, 0x4] adds r0, 0x1 strh r0, [r4, 0x4] @@ -914673,7 +914673,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 @@ -914734,7 +914734,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 @@ -914757,11 +914757,11 @@ sub_81D88D0: @ 81D88D0 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram -_081D8904: +@081D8904: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - bne _081D8904 + bne @081D8904 ldr r0, =0x08da8d6c ldr r4, =0x0203cf60 ldr r1, [r4] @@ -914795,7 +914795,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 @@ -914835,7 +914835,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 @@ -914850,44 +914850,44 @@ sub_81D89E0: @ 81D89E0 movs r0, 0x7 ands r0, r1 cmp r0, 0 - bne _081D8A16 + bne @081D8A16 movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0x1 - bgt _081D8A16 + bgt @081D8A16 movs r2, 0x2 ldrsh r0, [r4, r2] cmp r0, 0x59 - bgt _081D8A16 + bgt @081D8A16 movs r0, 0x67 bl audio_play -_081D8A16: +@081D8A16: ldrh r0, [r4, 0x6] adds r0, 0x1 strh r0, [r4, 0x6] movs r0, 0 ldrsh r5, [r4, r0] cmp r5, 0x1 - beq _081D8A5C + beq @081D8A5C cmp r5, 0x1 - bgt _081D8A34 + bgt @081D8A34 cmp r5, 0 - beq _081D8A3E - b _081D8AC6 + beq @081D8A3E + b @081D8AC6 .align 2, 0 .pool -_081D8A34: +@081D8A34: cmp r5, 0x2 - beq _081D8A8C + beq @081D8A8C cmp r5, 0x3 - beq _081D8AA8 - b _081D8AC6 -_081D8A3E: + beq @081D8AA8 + b @081D8AC6 +@081D8A3E: ldrh r1, [r4, 0x2] movs r2, 0x2 ldrsh r0, [r4, r2] cmp r0, 0x8 - bne _081D8AA2 + bne @081D8AA2 movs r0, 0x1 negs r0, r0 str r5, [sp] @@ -914896,13 +914896,13 @@ _081D8A3E: movs r3, 0 bl sub_80A1AD4 strh r5, [r4, 0x2] - b _081D8A9A -_081D8A5C: + b @081D8A9A +@081D8A5C: ldrh r1, [r4, 0x2] movs r2, 0x2 ldrsh r0, [r4, r2] cmp r0, 0x7F - bne _081D8AA2 + bne @081D8AA2 movs r0, 0 strh r0, [r4, 0x2] ldrh r0, [r4] @@ -914916,27 +914916,27 @@ _081D8A5C: lsls r0, 3 adds r0, r2 ldr r1, =sub_81D8B2C + 1 - b _081D8AC4 + b @081D8AC4 .align 2, 0 .pool -_081D8A8C: +@081D8A8C: ldrh r1, [r4, 0x2] movs r2, 0x2 ldrsh r0, [r4, r2] cmp r0, 0xC - bne _081D8AA2 + bne @081D8AA2 movs r0, 0 strh r0, [r4, 0x2] -_081D8A9A: +@081D8A9A: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - b _081D8AC6 -_081D8AA2: + b @081D8AC6 +@081D8AA2: adds r0, r1, 0x1 strh r0, [r4, 0x2] - b _081D8AC6 -_081D8AA8: + b @081D8AC6 +@081D8AA8: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -914950,9 +914950,9 @@ _081D8AA8: lsls r0, 3 adds r0, r1 ldr r1, =sub_81D8BEC + 1 -_081D8AC4: +@081D8AC4: str r1, [r0] -_081D8AC6: +@081D8AC6: add sp, 0x4 pop {r4-r6} pop {r0} @@ -914962,7 +914962,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 @@ -914975,7 +914975,7 @@ sub_81D8AD8: @ 81D8AD8 movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne _081D8B1C + bne @081D8B1C bl GenerateRandomNumber movs r4, 0x7 adds r1, r4, 0 @@ -914993,7 +914993,7 @@ sub_81D8AD8: @ 81D8AD8 adds r1, r4, 0 movs r2, 0 bl bg_change_y_offset -_081D8B1C: +@081D8B1C: ldrh r0, [r5, 0x1E] adds r0, 0x1 strh r0, [r5, 0x1E] @@ -915005,7 +915005,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 @@ -915017,7 +915017,7 @@ sub_81D8B2C: @ 81D8B2C movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0 - bne _081D8B70 + bne @081D8B70 movs r0, 0x1 movs r1, 0 movs r2, 0 @@ -915034,12 +915034,12 @@ sub_81D8B2C: @ 81D8B2C movs r1, 0x1 negs r1, r1 adds r0, r1, 0 - b _081D8BAA + b @081D8BAA .align 2, 0 .pool -_081D8B70: +@081D8B70: cmp r0, 0x1 - bne _081D8BAC + bne @081D8BAC movs r0, 0x2 ldrsh r1, [r4, r0] lsls r1, 8 @@ -915061,20 +915061,20 @@ _081D8B70: movs r1, 0xA negs r1, r1 cmp r0, r1 - bne _081D8BAC + bne @081D8BAC movs r1, 0x4 ldrsh r0, [r4, r1] negs r0, r0 -_081D8BAA: +@081D8BAA: strh r0, [r4, 0x4] -_081D8BAC: +@081D8BAC: pop {r4} pop {r0} bx r0 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 @@ -915102,7 +915102,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 @@ -915117,7 +915117,7 @@ sub_81D8BEC: @ 81D8BEC movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081D8C26 + bne @081D8C26 movs r0, 0 bl SetVBlankCallback bl sub_81D6904 @@ -915128,7 +915128,7 @@ sub_81D8BEC: @ 81D8BEC adds r0, r5, r0 ldr r1, =sub_81D6840 + 1 str r1, [r0] -_081D8C26: +@081D8C26: pop {r4-r6} pop {r0} bx r0 @@ -915137,7 +915137,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 @@ -915189,7 +915189,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 @@ -915206,11 +915206,11 @@ sub_81D8CC4: @ 81D8CC4 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram -_081D8CEA: +@081D8CEA: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - bne _081D8CEA + bne @081D8CEA ldr r0, =0x08daae54 ldr r4, =0x0203cf60 ldr r1, [r4] @@ -915259,7 +915259,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 @@ -915346,7 +915346,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} @@ -915362,26 +915362,26 @@ sub_81D8E80: @ 81D8E80 movs r1, 0 ldrsh r5, [r4, r1] cmp r5, 0x1 - beq _081D8EDE + beq @081D8EDE cmp r5, 0x1 - bgt _081D8EB0 + bgt @081D8EB0 cmp r5, 0 - beq _081D8EBA - b _081D8FA0 + beq @081D8EBA + b @081D8FA0 .align 2, 0 .pool -_081D8EB0: +@081D8EB0: cmp r5, 0x2 - beq _081D8F1E + beq @081D8F1E cmp r5, 0x3 - beq _081D8F84 - b _081D8FA0 -_081D8EBA: + beq @081D8F84 + b @081D8FA0 +@081D8EBA: ldrh r1, [r4, 0x2] movs r2, 0x2 ldrsh r0, [r4, r2] cmp r0, 0x8 - bne _081D8F18 + bne @081D8F18 adds r0, r6, 0 bl sub_81D90A8 movs r0, 0x1 @@ -915392,8 +915392,8 @@ _081D8EBA: movs r3, 0 bl sub_80A1AD4 strh r5, [r4, 0x2] - b _081D8F30 -_081D8EDE: + b @081D8F30 +@081D8EDE: ldr r2, =0x02020630 movs r0, 0xA ldrsh r1, [r4, r0] @@ -915405,40 +915405,40 @@ _081D8EDE: ldr r1, [r0] ldr r0, =sub_81D97E0 + 1 cmp r1, r0 - bne _081D8FA0 + bne @081D8FA0 ldrh r1, [r4, 0x2] movs r2, 0x2 ldrsh r0, [r4, r2] cmp r0, 0x40 - bne _081D8F18 + bne @081D8F18 adds r0, r6, 0 bl sub_81D94D4 adds r0, r6, 0 bl sub_81D93D8 - b _081D8F2C + b @081D8F2C .align 2, 0 .pool -_081D8F18: +@081D8F18: adds r0, r1, 0x1 strh r0, [r4, 0x2] - b _081D8FA0 -_081D8F1E: + b @081D8FA0 +@081D8F1E: ldrh r2, [r4, 0x2] movs r0, 0x2 ldrsh r1, [r4, r0] movs r0, 0xE0 lsls r0, 1 cmp r1, r0 - bne _081D8F38 -_081D8F2C: + bne @081D8F38 +@081D8F2C: movs r0, 0 strh r0, [r4, 0x2] -_081D8F30: +@081D8F30: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - b _081D8FA0 -_081D8F38: + b @081D8FA0 +@081D8F38: adds r0, r2, 0x1 strh r0, [r4, 0x2] movs r1, 0x2 @@ -915448,7 +915448,7 @@ _081D8F38: lsls r0, 16 asrs r4, r0, 16 cmp r4, 0 - bne _081D8FA0 + bne @081D8FA0 ldr r0, =0x0000fffe ldr r1, =0x0000ffff str r1, [sp] @@ -915467,10 +915467,10 @@ _081D8F38: movs r2, 0x10 movs r3, 0 bl sub_80A2C44 - b _081D8FA0 + b @081D8FA0 .align 2, 0 .pool -_081D8F84: +@081D8F84: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -915484,7 +915484,7 @@ _081D8F84: adds r0, r7, r0 ldr r1, =sub_81D9034 + 1 str r1, [r0] -_081D8FA0: +@081D8FA0: add sp, 0xC pop {r3} mov r8, r3 @@ -915496,7 +915496,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 @@ -915509,7 +915509,7 @@ sub_81D8FB0: @ 81D8FB0 movs r0, 0xF ands r0, r1 cmp r0, 0 - bne _081D9024 + bne @081D9024 ldrh r1, [r4, 0x2] adds r1, 0xE lsls r1, 8 @@ -915537,27 +915537,27 @@ sub_81D8FB0: @ 81D8FB0 movs r0, 0x3 negs r0, r0 cmp r1, r0 - beq _081D9008 + beq @081D9008 cmp r1, 0 - bne _081D9010 -_081D9008: + bne @081D9010 +@081D9008: movs r1, 0x6 ldrsh r0, [r4, r1] negs r0, r0 strh r0, [r4, 0x6] -_081D9010: +@081D9010: movs r2, 0x4 ldrsh r0, [r4, r2] cmp r0, 0x3 - beq _081D901C + beq @081D901C cmp r0, 0 - bne _081D9024 -_081D901C: + bne @081D9024 +@081D901C: movs r1, 0x8 ldrsh r0, [r4, r1] negs r0, r0 strh r0, [r4, 0x8] -_081D9024: +@081D9024: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] @@ -915569,7 +915569,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 @@ -915585,12 +915585,12 @@ sub_81D9034: @ 81D9034 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _081D90A0 + bne @081D90A0 bl sub_80A2F30 movs r1, 0x2 ldrsh r0, [r4, r1] cmp r0, 0 - bne _081D9078 + bne @081D9078 movs r0, 0 bl SetVBlankCallback bl sub_81D6904 @@ -915598,32 +915598,32 @@ sub_81D9034: @ 81D9034 bl gpu_pal_allocator_reset ldrb r0, [r4, 0x4] bl remove_task -_081D9078: +@081D9078: ldrh r1, [r4, 0x2] movs r2, 0x2 ldrsh r0, [r4, r2] cmp r0, 0x20 - bne _081D909C + bne @081D909C strh r5, [r4, 0x2] adds r0, r7, 0 subs r0, 0x8 adds r0, r6, r0 ldr r1, =sub_81D6840 + 1 str r1, [r0] - b _081D90A0 + b @081D90A0 .align 2, 0 .pool -_081D909C: +@081D909C: adds r0, r1, 0x1 strh r0, [r4, 0x2] -_081D90A0: +@081D90A0: pop {r4-r7} pop {r0} bx r0 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 @@ -915835,7 +915835,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} @@ -915932,18 +915932,18 @@ 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] movs r0, 0x7 ands r0, r1 cmp r0, 0 - bne _081D93CC + bne @081D93CC movs r1, 0x3C ldrsh r0, [r4, r1] cmp r0, 0 - bne _081D9370 + bne @081D9370 ldrh r0, [r4, 0x20] ldrh r3, [r4, 0x3A] subs r0, r3 @@ -915957,10 +915957,10 @@ pokemon_alive_on_battle_side: @ 81D9338 adds r0, r2 ldrh r1, [r0, 0x20] subs r1, r3 - b _081D939E + b @081D939E .align 2, 0 .pool -_081D9370: +@081D9370: ldrh r2, [r4, 0x3A] ldrh r1, [r4, 0x20] adds r0, r2, r1 @@ -915984,7 +915984,7 @@ _081D9370: ldrh r1, [r4, 0x3A] ldrh r2, [r0, 0x20] adds r1, r2 -_081D939E: +@081D939E: strh r1, [r0, 0x20] ldrh r1, [r4, 0x38] adds r1, 0x1 @@ -915996,27 +915996,27 @@ _081D939E: lsls r1, 16 asrs r1, 16 cmp r1, 0x3 - bne _081D93CC + bne @081D93CC strh r2, [r4, 0x36] strh r2, [r4, 0x38] strh r2, [r4, 0x3A] ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] - b _081D93D2 + b @081D93D2 .align 2, 0 .pool -_081D93CC: +@081D93CC: ldrh r0, [r4, 0x36] adds r0, 0x1 strh r0, [r4, 0x36] -_081D93D2: +@081D93D2: pop {r4} pop {r0} bx r0 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 @@ -916051,25 +916051,25 @@ 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 ldrb r0, [r0] cmp r0, 0x1 - beq _081D9488 + beq @081D9488 cmp r0, 0x1 - bgt _081D9436 + bgt @081D9436 cmp r0, 0 - beq _081D9440 - b _081D94C4 -_081D9436: + beq @081D9440 + b @081D94C4 +@081D9436: cmp r0, 0x2 - beq _081D9440 + beq @081D9440 cmp r0, 0x3 - beq _081D9488 - b _081D94C4 -_081D9440: + beq @081D9488 + b @081D94C4 +@081D9440: adds r0, r4, 0 adds r0, 0x2C ldrb r0, [r0] @@ -916080,7 +916080,7 @@ _081D9440: lsls r0, 24 ldr r2, =0x02020630 cmp r0, 0 - bne _081D9470 + bne @081D9470 ldrh r0, [r4, 0x20] subs r0, 0x2 strh r0, [r4, 0x20] @@ -916093,7 +916093,7 @@ _081D9440: ldrh r1, [r0, 0x20] subs r1, 0x2 strh r1, [r0, 0x20] -_081D9470: +@081D9470: movs r1, 0x2E ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -916102,10 +916102,10 @@ _081D9470: adds r1, r2 movs r0, 0 strh r0, [r1, 0x26] - b _081D94C4 + b @081D94C4 .align 2, 0 .pool -_081D9488: +@081D9488: ldr r2, =0x02020630 movs r0, 0x2E ldrsh r1, [r4, r0] @@ -916123,7 +916123,7 @@ _081D9488: movs r0, 0xF ands r0, r1 cmp r0, 0 - bne _081D94C4 + bne @081D94C4 ldrh r0, [r4, 0x22] adds r0, 0x1 strh r0, [r4, 0x22] @@ -916136,7 +916136,7 @@ _081D9488: ldrh r1, [r0, 0x22] adds r1, 0x1 strh r1, [r0, 0x22] -_081D94C4: +@081D94C4: pop {r4} pop {r0} bx r0 @@ -916145,7 +916145,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 @@ -916187,7 +916187,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} @@ -916196,25 +916196,25 @@ sub_81D9528: @ 81D9528 movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne _081D9550 + bne @081D9550 ldrh r1, [r7, 0x24] movs r2, 0x24 ldrsh r0, [r7, r2] cmp r0, 0x1 - bne _081D954C + bne @081D954C ldr r0, =0x0000ffff - b _081D954E + b @081D954E .align 2, 0 .pool -_081D954C: +@081D954C: movs r0, 0x1 -_081D954E: +@081D954E: strh r0, [r7, 0x24] -_081D9550: +@081D9550: movs r1, 0x38 ldrsh r0, [r7, r1] cmp r0, 0x80 - bne _081D95CE + bne @081D95CE ldr r2, =0x0862acf0 mov r8, r2 mov r0, r8 @@ -916272,37 +916272,37 @@ _081D9550: ldrh r0, [r7, 0x38] adds r0, 0x1 strh r0, [r7, 0x38] -_081D95CE: +@081D95CE: ldrh r1, [r7, 0x38] movs r2, 0x38 ldrsh r0, [r7, r2] cmp r0, 0x7F - ble _081D95F8 + ble @081D95F8 movs r1, 0x26 ldrsh r0, [r7, r1] cmp r0, 0x20 - beq _081D95FC + beq @081D95FC ldrh r0, [r7, 0x3A] adds r0, 0x1 strh r0, [r7, 0x3A] lsls r0, 16 asrs r0, 20 strh r0, [r7, 0x26] - b _081D95FC + b @081D95FC .align 2, 0 .pool -_081D95F8: +@081D95F8: adds r0, r1, 0x1 strh r0, [r7, 0x38] -_081D95FC: +@081D95FC: ldrh r0, [r7, 0x36] movs r1, 0x3F ands r0, r1 cmp r0, 0 - bne _081D960C + bne @081D960C movs r0, 0xA5 bl audio_play -_081D960C: +@081D960C: ldrh r0, [r7, 0x36] adds r0, 0x1 strh r0, [r7, 0x36] @@ -916314,13 +916314,13 @@ _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 ldrsh r1, [r4, r0] cmp r1, 0x40 - bgt _081D968C + bgt @081D968C ldrh r0, [r4, 0x26] adds r0, 0x2 strh r0, [r4, 0x26] @@ -916337,9 +916337,9 @@ sub_81D961C: @ 81D961C movs r1, 0x3C ldrsh r0, [r4, r1] cmp r0, 0x40 - beq _081D964C - b _081D979E -_081D964C: + beq @081D964C + b @081D979E +@081D964C: movs r3, 0x30 negs r3, r3 adds r0, r4, 0 @@ -916365,36 +916365,36 @@ _081D964C: lsls r0, 2 adds r0, r5 strh r2, [r0, 0x38] - b _081D979E + b @081D979E .align 2, 0 .pool -_081D968C: +@081D968C: cmp r1, 0x6F - bgt _081D96BE + bgt @081D96BE adds r0, r4, 0 bl sub_81D97E0 movs r1, 0x36 ldrsh r0, [r4, r1] cmp r0, 0 - bne _081D96A4 + bne @081D96A4 movs r0, 0x68 bl audio_play -_081D96A4: +@081D96A4: movs r0, 0x36 ldrsh r1, [r4, r0] movs r0, 0x3 negs r0, r0 cmp r1, r0 - bne _081D979E + bne @081D979E adds r0, r4, 0 movs r1, 0x2 movs r2, 0x30 movs r3, 0x10 bl sub_81D9868 - b _081D979E -_081D96BE: + b @081D979E +@081D96BE: cmp r1, 0x70 - bne _081D96EC + bne @081D96EC ldr r2, =0x02020630 movs r0, 0x2E ldrsh r1, [r4, r0] @@ -916412,24 +916412,24 @@ _081D96BE: adds r0, r2 movs r1, 0x3 strh r1, [r0, 0x38] - b _081D96F2 + b @081D96F2 .align 2, 0 .pool -_081D96EC: +@081D96EC: ldr r0, =0x00000147 cmp r1, r0 - bgt _081D9700 -_081D96F2: + bgt @081D9700 +@081D96F2: adds r0, r4, 0 bl sub_81D97E0 - b _081D979E + b @081D979E .align 2, 0 .pool -_081D9700: +@081D9700: movs r0, 0xA4 lsls r0, 1 cmp r1, r0 - bne _081D974C + bne @081D974C adds r0, r4, 0 bl sub_81D97E0 adds r0, r4, 0 @@ -916454,17 +916454,17 @@ _081D9700: ldr r0, =sub_81D98B4 + 1 movs r1, 0 bl AddTask - b _081D979E + b @081D979E .align 2, 0 .pool -_081D974C: +@081D974C: movs r0, 0xB0 lsls r0, 1 cmp r1, r0 - beq _081D9790 + beq @081D9790 adds r0, 0x18 cmp r1, r0 - bne _081D979E + bne @081D979E movs r3, 0 strh r3, [r4, 0x24] ldr r2, =0x02020630 @@ -916484,27 +916484,27 @@ _081D974C: bl sub_81D9868 ldr r0, =sub_81D97E0 + 1 str r0, [r4, 0x1C] - b _081D97D2 + b @081D97D2 .align 2, 0 .pool -_081D9790: +@081D9790: ldr r0, =sub_81D8E80 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl sub_81D9274 -_081D979E: +@081D979E: ldrh r2, [r4, 0x3C] movs r0, 0x3C ldrsh r1, [r4, r0] movs r0, 0xA4 lsls r0, 1 cmp r1, r0 - ble _081D97CC + ble @081D97CC movs r0, 0x1 ands r0, r2 cmp r0, 0 - bne _081D97CC + bne @081D97CC movs r1, 0x24 ldrsh r2, [r4, r1] negs r2, r2 @@ -916517,11 +916517,11 @@ _081D979E: lsls r0, 2 adds r0, r3 strh r2, [r0, 0x24] -_081D97CC: +@081D97CC: ldrh r0, [r4, 0x3C] adds r0, 0x1 strh r0, [r4, 0x3C] -_081D97D2: +@081D97D2: pop {r4,r5} pop {r0} bx r0 @@ -916530,7 +916530,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 @@ -916544,7 +916544,7 @@ sub_81D97E0: @ 81D97E0 ldrh r0, [r4, 0x36] ands r0, r1 cmp r0, 0 - bne _081D985C + bne @081D985C ldrh r2, [r3, 0x36] ldrh r1, [r3, 0x26] adds r0, r2, r1 @@ -916568,34 +916568,34 @@ sub_81D97E0: @ 81D97E0 movs r7, 0x38 ldrsh r2, [r4, r7] cmp r5, r2 - bge _081D9836 + bge @081D9836 movs r0, 0x36 ldrsh r1, [r3, r0] adds r0, r2, 0 cmn r1, r0 - bgt _081D985C -_081D9836: + bgt @081D985C +@081D9836: cmp r5, r2 - ble _081D9844 + ble @081D9844 strh r6, [r3, 0x36] - b _081D9854 + b @081D9854 .align 2, 0 .pool -_081D9844: +@081D9844: movs r0, 0x36 ldrsh r1, [r3, r0] movs r2, 0x38 ldrsh r0, [r4, r2] cmn r1, r0 - bge _081D9854 + bge @081D9854 negs r0, r6 strh r0, [r3, 0x36] -_081D9854: +@081D9854: movs r7, 0x38 ldrsh r0, [r3, r7] negs r0, r0 strh r0, [r3, 0x38] -_081D985C: +@081D985C: ldrh r0, [r3, 0x3A] adds r0, 0x1 strh r0, [r3, 0x3A] @@ -916605,7 +916605,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 @@ -916644,7 +916644,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 @@ -916657,19 +916657,19 @@ sub_81D98B4: @ 81D98B4 movs r0, 0 ldrsh r1, [r4, r0] cmp r1, 0x1 - beq _081D990C + beq @081D990C cmp r1, 0x1 - bgt _081D98DC + bgt @081D98DC cmp r1, 0 - beq _081D98E2 - b _081D99B4 + beq @081D98E2 + b @081D99B4 .align 2, 0 .pool -_081D98DC: +@081D98DC: cmp r1, 0x2 - beq _081D99A4 - b _081D99B4 -_081D98E2: + beq @081D99A4 + b @081D99B4 +@081D98E2: movs r2, 0x80 lsls r2, 7 movs r0, 0x40 @@ -916688,25 +916688,25 @@ _081D98E2: bl lcd_io_set_bits movs r0, 0x10 strh r0, [r4, 0x8] - b _081D9922 -_081D990C: + b @081D9922 +@081D990C: movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0x8 - bne _081D991A + bne @081D991A movs r0, 0x12 bl audio_play -_081D991A: +@081D991A: movs r3, 0x4 ldrsh r0, [r4, r3] cmp r0, 0x2 - bne _081D992A -_081D9922: + bne @081D992A +@081D9922: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - b _081D99B4 -_081D992A: + b @081D99B4 +@081D992A: ldrh r5, [r4, 0x8] ldrh r1, [r4, 0x2] adds r0, r5, r1 @@ -916720,14 +916720,14 @@ _081D992A: bl __modsi3 lsls r0, 16 cmp r0, 0 - bne _081D9954 + bne @081D9954 lsls r0, r5, 16 asrs r0, 16 cmp r0, 0x4 - beq _081D9954 + beq @081D9954 subs r0, r5, 0x2 strh r0, [r4, 0x8] -_081D9954: +@081D9954: ldrh r0, [r4, 0x6] adds r0, 0x1 strh r0, [r4, 0x6] @@ -916757,7 +916757,7 @@ _081D9954: movs r1, 0x2 ldrsh r0, [r4, r1] cmp r0, 0xFF - ble _081D99B4 + ble @081D99B4 strh r5, [r4, 0x2] strh r5, [r4, 0x6] strh r5, [r4, 0xA] @@ -916766,15 +916766,15 @@ _081D9954: ldrh r0, [r4, 0x4] adds r0, 0x1 strh r0, [r4, 0x4] - b _081D99B4 -_081D99A4: + b @081D99B4 +@081D99A4: movs r1, 0x80 lsls r1, 3 movs r0, 0 bl lcd_io_clear_bits adds r0, r5, 0 bl remove_task -_081D99B4: +@081D99B4: add sp, 0x10 pop {r4,r5} pop {r0} @@ -916782,30 +916782,30 @@ _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 - bne _081D99DC + bne @081D99DC ldr r4, =0x02021cc4 bl sub_80D2548 adds r1, r0, 0 adds r0, r4, 0 bl gf_strcpy movs r0, 0x1 - b _081D99DE + b @081D99DE .align 2, 0 .pool -_081D99DC: +@081D99DC: movs r0, 0 -_081D99DE: +@081D99DE: pop {r4} pop {r1} bx r1 thumb_func_end sub_81D99BC thumb_func_start sub_81D99E4 -sub_81D99E4: @ 81D99E4 +sub_81D99E4: ; 81D99E4 push {r4,lr} sub sp, 0x8 ldr r4, =0x02021dc4 @@ -916831,7 +916831,7 @@ sub_81D99E4: @ 81D99E4 thumb_func_end sub_81D99E4 thumb_func_start sub_81D9A1C -sub_81D9A1C: @ 81D9A1C +sub_81D9A1C: ; 81D9A1C push {r4,r5,lr} ldr r4, =0x020375e0 ldr r5, =0x02021dc4 @@ -916840,33 +916840,33 @@ sub_81D9A1C: @ 81D9A1C strh r0, [r4] ldrh r0, [r4] cmp r0, 0x1 - beq _081D9A68 + beq @081D9A68 cmp r0, 0x1 - bgt _081D9A44 + bgt @081D9A44 cmp r0, 0 - beq _081D9A62 - b _081D9A68 + beq @081D9A62 + b @081D9A68 .align 2, 0 .pool -_081D9A44: +@081D9A44: cmp r0, 0x2 - bne _081D9A68 + bne @081D9A68 bl sub_80D2578 cmp r0, 0 - beq _081D9A5C + beq @081D9A5C ldr r0, =0x085ee49a bl sub_80D255C - b _081D9A68 + b @081D9A68 .align 2, 0 .pool -_081D9A5C: +@081D9A5C: movs r0, 0x1 strh r0, [r4] - b _081D9A68 -_081D9A62: + b @081D9A68 +@081D9A62: adds r0, r5, 0 bl sub_80D255C -_081D9A68: +@081D9A68: ldr r4, =0x02021cc4 bl sub_80D2548 adds r1, r0, 0 @@ -916885,33 +916885,33 @@ _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] cmp r0, 0xFF - bne _081D9AA6 + bne @081D9AA6 movs r0, 0x2 - b _081D9ABC -_081D9AA6: + b @081D9ABC +@081D9AA6: bl sub_80D2548 adds r1, r0, 0 adds r0, r4, 0 bl sub_8008C44 cmp r0, 0 - beq _081D9ABA + beq @081D9ABA movs r0, 0 - b _081D9ABC -_081D9ABA: + b @081D9ABC +@081D9ABA: movs r0, 0x1 -_081D9ABC: +@081D9ABC: pop {r4} pop {r1} bx r1 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} @@ -916942,7 +916942,7 @@ sub_81D9AC4: @ 81D9AC4 strh r0, [r1] lsls r0, 16 cmp r0, 0 - beq _081D9B1E + beq @081D9B1E ldrb r0, [r5] bl sub_80D24BC ldrb r0, [r6] @@ -916951,7 +916951,7 @@ sub_81D9AC4: @ 81D9AC4 ldrh r0, [r0] ldrh r1, [r7] bl sub_80D2524 -_081D9B1E: +@081D9B1E: mov r1, r8 ldrh r0, [r1] bl sub_80D2480 @@ -916968,34 +916968,34 @@ _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 movs r1, 0 ldr r3, =0x0862ad14 -_081D9B4A: +@081D9B4A: adds r0, r1, r3 ldrb r0, [r0] cmp r0, r2 - bne _081D9B5C + bne @081D9B5C lsls r0, r1, 24 lsrs r0, 24 - b _081D9B64 + b @081D9B64 .align 2, 0 .pool -_081D9B5C: +@081D9B5C: adds r1, 0x1 cmp r1, 0x1F - bls _081D9B4A + bls @081D9B4A movs r0, 0x20 -_081D9B64: +@081D9B64: pop {r1} bx r1 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 @@ -917016,10 +917016,10 @@ sub_81D9B68: @ 81D9B68 lsls r0, 16 lsrs r0, 16 cmp r0, 0xF - bne _081D9C7E + bne @081D9C7E movs r4, 0 add r7, sp, 0x10 -_081D9B98: +@081D9B98: adds r0, r5, r4 ldrb r0, [r0] bl sub_81D9B40 @@ -917028,16 +917028,16 @@ _081D9B98: lsls r0, 24 lsrs r0, 24 cmp r0, 0x20 - beq _081D9C7E + beq @081D9C7E adds r4, 0x1 cmp r4, 0xE - ble _081D9B98 + ble @081D9B98 movs r6, 0x3 movs r5, 0 movs r0, 0x5 mov r8, r0 movs r4, 0xD -_081D9BBC: +@081D9BBC: mov r1, r8 str r1, [sp] add r0, sp, 0x4 @@ -917049,7 +917049,7 @@ _081D9BBC: adds r5, 0x5 subs r4, 0x1 cmp r4, 0 - bge _081D9BBC + bge @081D9BBC movs r0, 0x2 str r0, [sp] add r0, sp, 0x4 @@ -917067,7 +917067,7 @@ _081D9BBC: movs r2, 0x3 bl sub_81D9DAC cmp r4, r0 - bne _081D9C7E + bne @081D9C7E add r0, sp, 0x4 movs r1, 0x9 movs r2, 0x15 @@ -917097,7 +917097,7 @@ _081D9BBC: lsrs r1, r3, 8 eors r0, r1 cmp r2, r0 - bne _081D9C7E + bne @081D9C7E add r0, sp, 0x4 ldrb r3, [r0, 0x7] adds r2, r0, 0 @@ -917112,7 +917112,7 @@ _081D9BBC: ands r0, r5 eors r1, r0 cmp r3, r1 - bne _081D9C7E + bne @081D9C7E add r0, sp, 0x4 ldrh r0, [r0] mov r1, r10 @@ -917127,10 +917127,10 @@ _081D9BBC: ldr r0, [sp, 0x28] strb r2, [r0] movs r0, 0x1 - b _081D9C80 -_081D9C7E: + b @081D9C80 +@081D9C7E: movs r0, 0 -_081D9C80: +@081D9C80: add sp, 0x2C pop {r3-r5} mov r8, r3 @@ -917142,14 +917142,14 @@ _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 subs r3, r2, 0x1 cmp r2, 0 - beq _081D9CD6 -_081D9C9C: + beq @081D9CD6 +@081D9C9C: ldrb r1, [r7] movs r0, 0x80 ands r0, r1 @@ -917159,10 +917159,10 @@ _081D9C9C: subs r2, 0x1 subs r5, r3, 0x1 cmp r2, 0 - blt _081D9CCC + blt @081D9CCC movs r6, 0x80 adds r3, r2, r7 -_081D9CB4: +@081D9CB4: ldrb r1, [r3] adds r0, r6, 0 ands r0, r1 @@ -917174,21 +917174,21 @@ _081D9CB4: subs r3, 0x1 subs r2, 0x1 cmp r2, 0 - bge _081D9CB4 -_081D9CCC: + bge @081D9CB4 +@081D9CCC: adds r3, r5, 0 movs r0, 0x1 negs r0, r0 cmp r3, r0 - bne _081D9C9C -_081D9CD6: + bne @081D9C9C +@081D9CD6: pop {r4-r7} pop {r0} bx r0 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 @@ -917200,8 +917200,8 @@ sub_81D9CDC: @ 81D9CDC lsrs r3, r0, 24 movs r4, 0 cmp r4, r5 - bcs _081D9D04 -_081D9CF4: + bcs @081D9D04 +@081D9CF4: adds r2, r6, r4 ldrb r1, [r2] adds r0, r3, 0 @@ -917209,15 +917209,15 @@ _081D9CF4: strb r0, [r2] adds r4, 0x1 cmp r4, r5 - bcc _081D9CF4 -_081D9D04: + bcc @081D9CF4 +@081D9D04: pop {r4-r6} pop {r0} bx r0 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 @@ -917228,15 +917228,15 @@ sub_81D9D0C: @ 81D9D0C ldrb r0, [r0] ands r0, r1 cmp r0, 0 - beq _081D9D24 + beq @081D9D24 movs r0, 0x1 -_081D9D24: +@081D9D24: pop {r1} bx r1 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 @@ -917252,7 +917252,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 @@ -917269,7 +917269,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 @@ -917281,30 +917281,30 @@ sub_81D9D5C: @ 81D9D5C ldr r7, [sp, 0x1C] movs r5, 0 cmp r5, r7 - bcs _081D9DA0 + bcs @081D9DA0 adds r4, r1, 0 -_081D9D76: +@081D9D76: mov r0, r8 adds r1, r0, r5 mov r0, r9 bl sub_81D9D0C lsls r0, 24 cmp r0, 0 - beq _081D9D90 + beq @081D9D90 adds r0, r6, 0 adds r1, r4, 0 bl sub_81D9D28 - b _081D9D98 -_081D9D90: + b @081D9D98 +@081D9D90: adds r0, r6, 0 adds r1, r4, 0 bl sub_81D9D40 -_081D9D98: +@081D9D98: adds r4, 0x1 adds r5, 0x1 cmp r5, r7 - bcc _081D9D76 -_081D9DA0: + bcc @081D9D76 +@081D9DA0: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -917314,7 +917314,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} @@ -917324,8 +917324,8 @@ sub_81D9DAC: @ 81D9DAC movs r4, 0 movs r5, 0 cmp r4, r6 - bcs _081D9DD6 -_081D9DC0: + bcs @081D9DD6 +@081D9DC0: lsls r4, 1 adds r1, r7, r5 mov r0, r8 @@ -917335,8 +917335,8 @@ _081D9DC0: orrs r4, r0 adds r5, 0x1 cmp r5, r6 - bcc _081D9DC0 -_081D9DD6: + bcc @081D9DC0 +@081D9DD6: adds r0, r4, 0 pop {r3} mov r8, r3 @@ -917346,7 +917346,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 @@ -917358,22 +917358,22 @@ sub_81D9DE4: @ 81D9DE4 movs r1, 0x1A ldrsh r0, [r0, r1] cmp r0, 0x4 - bhi _081D9EA4 + bhi @081D9EA4 lsls r0, 2 - ldr r1, =_081D9E10 + ldr r1, =@081D9E10 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_081D9E10: - .4byte _081D9E24 - .4byte _081D9E44 - .4byte _081D9E64 - .4byte _081D9E84 - .4byte _081D9EA4 -_081D9E24: +@081D9E10: + .4byte @081D9E24 + .4byte @081D9E44 + .4byte @081D9E64 + .4byte @081D9E84 + .4byte @081D9EA4 +@081D9E24: ldr r4, =0x02039f31 ldr r0, =0x02039f24 ldrb r1, [r0] @@ -917382,10 +917382,10 @@ _081D9E24: ldr r1, =0x020244ec adds r0, r1 movs r1, 0x32 - b _081D9EB4 + b @081D9EB4 .align 2, 0 .pool -_081D9E44: +@081D9E44: ldr r4, =0x02039f31 ldr r0, =0x02039f24 ldrb r1, [r0] @@ -917394,10 +917394,10 @@ _081D9E44: ldr r1, =0x020244ec adds r0, r1 movs r1, 0x33 - b _081D9EB4 + b @081D9EB4 .align 2, 0 .pool -_081D9E64: +@081D9E64: ldr r4, =0x02039f31 ldr r0, =0x02039f24 ldrb r1, [r0] @@ -917406,10 +917406,10 @@ _081D9E64: ldr r1, =0x020244ec adds r0, r1 movs r1, 0x34 - b _081D9EB4 + b @081D9EB4 .align 2, 0 .pool -_081D9E84: +@081D9E84: ldr r4, =0x02039f31 ldr r0, =0x02039f24 ldrb r1, [r0] @@ -917418,10 +917418,10 @@ _081D9E84: ldr r1, =0x020244ec adds r0, r1 movs r1, 0x35 - b _081D9EB4 + b @081D9EB4 .align 2, 0 .pool -_081D9EA4: +@081D9EA4: ldr r4, =0x02039f31 ldr r0, =0x02039f24 ldrb r1, [r0] @@ -917430,7 +917430,7 @@ _081D9EA4: ldr r1, =0x020244ec adds r0, r1 movs r1, 0x36 -_081D9EB4: +@081D9EB4: bl pokemon_getattr strb r0, [r4] ldr r5, =0x02039e00 @@ -917465,7 +917465,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 @@ -917479,7 +917479,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 @@ -917493,7 +917493,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 @@ -917507,7 +917507,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 @@ -917527,12 +917527,12 @@ sub_81D9F68: @ 81D9F68 mov r9, r1 ldrb r4, [r5] cmp r3, r4 - bcs _081D9FB2 + bcs @081D9FB2 lsls r0, r6, 2 adds r0, r6 lsls r4, r0, 3 ldr r7, =0x03005e08 -_081D9F98: +@081D9F98: mov r0, sp adds r2, r0, r3 adds r1, r3, 0x1 @@ -917545,55 +917545,55 @@ _081D9F98: lsrs r3, r1, 24 ldrb r1, [r5] cmp r3, r1 - bcc _081D9F98 -_081D9FB2: + bcc @081D9F98 +@081D9FB2: movs r3, 0 mov r4, r8 ldrb r0, [r4] cmp r3, r0 - bcs _081D9FD6 + bcs @081D9FD6 adds r4, r0, 0 mov r2, sp -_081D9FC0: +@081D9FC0: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, r4 - bcs _081D9FD6 + bcs @081D9FD6 mov r7, sp adds r1, r7, r3 ldrb r0, [r2] ldrb r1, [r1] cmp r0, r1 - beq _081D9FC0 -_081D9FD6: + beq @081D9FC0 +@081D9FD6: mov r0, r8 ldrb r0, [r0] cmp r3, r0 - bne _081D9FF4 + bne @081D9FF4 movs r0, 0 mov r1, r12 strh r0, [r1] - b _081D9FFA + b @081D9FFA .align 2, 0 .pool -_081D9FF4: +@081D9FF4: movs r0, 0x1 mov r4, r12 strh r0, [r4] -_081D9FFA: +@081D9FFA: movs r3, 0 mov r7, r8 mov r0, r8 ldrb r0, [r0] cmp r3, r0 - bcs _081DA02A + bcs @081DA02A mov r4, r9 lsls r0, r6, 2 adds r0, r6 lsls r2, r0, 3 ldr r5, =0x03005e08 -_081DA010: +@081DA010: adds r1, r4, r3 adds r0, r3, 0x5 lsls r0, 1 @@ -917606,16 +917606,16 @@ _081DA010: lsrs r3, r0, 24 ldrb r1, [r7] cmp r3, r1 - bcc _081DA010 -_081DA02A: + bcc @081DA010 +@081DA02A: mov r4, r8 ldrb r0, [r4] cmp r0, 0x4 - beq _081DA0B8 + beq @081DA0B8 bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - bne _081DA0B8 + bne @081DA0B8 ldr r0, =0x02039e00 adds r1, r0, 0 adds r1, 0x2C @@ -917624,64 +917624,64 @@ _081DA02A: ldrb r1, [r4] adds r5, r0, 0 cmp r3, r1 - bcs _081DA06C + bcs @081DA06C adds r4, r5, 0 mov r7, r8 ldrb r1, [r7] -_081DA054: +@081DA054: lsls r0, r3, 6 adds r0, r4 adds r0, 0x2C ldrb r7, [r0] cmp r2, r7 - bcs _081DA062 + bcs @081DA062 ldrb r2, [r0] -_081DA062: +@081DA062: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, r1 - bcc _081DA054 -_081DA06C: + bcc @081DA054 +@081DA06C: cmp r2, 0 - beq _081DA076 + beq @081DA076 subs r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 -_081DA076: +@081DA076: movs r4, 0x1 movs r3, 0 mov r0, r8 ldrb r0, [r0] cmp r3, r0 - bcs _081DA0AC + bcs @081DA0AC adds r0, r5, 0 - b _081DA0A2 + b @081DA0A2 .align 2, 0 .pool -_081DA090: +@081DA090: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 mov r1, r8 ldrb r1, [r1] cmp r3, r1 - bcs _081DA0AC + bcs @081DA0AC lsls r0, r3, 6 adds r0, r5 -_081DA0A2: +@081DA0A2: adds r0, 0x2D ldrb r0, [r0] cmp r0, 0 - bne _081DA090 + bne @081DA090 movs r4, 0 -_081DA0AC: +@081DA0AC: mov r0, sp ldrb r0, [r0] adds r1, r2, 0 adds r2, r4, 0 bl sub_80DACBC -_081DA0B8: +@081DA0B8: mov r0, r9 bl sub_80F86E0 ldr r1, =0x02039f2b @@ -917689,15 +917689,15 @@ _081DA0B8: ldr r0, =0x02039f30 ldrb r0, [r0] cmp r0, 0x3 - bhi _081DA0E8 + bhi @081DA0E8 ldr r1, =sub_81DA488 + 1 ldr r2, =sub_81DA10C + 1 adds r0, r6, 0 bl set_task_function_and_args_14_15 - b _081DA0F6 + b @081DA0F6 .align 2, 0 .pool -_081DA0E8: +@081DA0E8: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -917705,7 +917705,7 @@ _081DA0E8: adds r1, r0 ldr r0, =sub_81DA10C + 1 str r0, [r1] -_081DA0F6: +@081DA0F6: add sp, 0x8 pop {r3,r4} mov r8, r3 @@ -917718,7 +917718,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 @@ -917738,7 +917738,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 @@ -917757,7 +917757,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} @@ -917771,29 +917771,29 @@ sub_81DA160: @ 81DA160 adds r0, 0x18 bl sub_80FC670 cmp r0, 0 - beq _081DA224 + beq @081DA224 adds r0, r5, 0 subs r0, 0x8 adds r4, r0 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - beq _081DA1A4 + beq @081DA1A4 cmp r0, 0x1 - beq _081DA1D4 + beq @081DA1D4 movs r0, 0 strh r0, [r4, 0x8] strh r0, [r4, 0x20] adds r0, r7, 0 bl set_task_function_to_args_14_15 - b _081DA224 + b @081DA224 .align 2, 0 .pool -_081DA1A4: +@081DA1A4: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _081DA224 + beq @081DA224 ldr r0, =0x02039f25 ldrb r0, [r0] lsls r0, 6 @@ -917802,26 +917802,26 @@ _081DA1A4: movs r1, 0x40 bl sub_80FC4F4 cmp r0, 0x1 - bne _081DA224 + bne @081DA224 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _081DA224 + b @081DA224 .align 2, 0 .pool -_081DA1D4: +@081DA1D4: bl sub_80FC55C lsls r0, 24 cmp r0, 0 - beq _081DA224 + beq @081DA224 movs r5, 0 ldr r0, =0x02039f30 mov r8, r6 ldrb r0, [r0] cmp r5, r0 - bge _081DA214 + bge @081DA214 ldr r6, =0x020229e8 -_081DA1EC: +@081DA1EC: lsls r4, r5, 6 ldr r0, =0x02039e00 adds r4, r0 @@ -917839,8 +917839,8 @@ _081DA1EC: ldr r0, =0x02039f30 ldrb r0, [r0] cmp r5, r0 - blt _081DA1EC -_081DA214: + blt @081DA1EC +@081DA214: ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 @@ -917849,7 +917849,7 @@ _081DA214: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_081DA224: +@081DA224: pop {r3} mov r8, r3 pop {r4-r7} @@ -917860,7 +917860,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 @@ -917872,47 +917872,47 @@ sub_81DA244: @ 81DA244 adds r0, 0x18 bl sub_80FC670 cmp r0, 0 - beq _081DA2D4 + beq @081DA2D4 adds r0, r6, 0 subs r0, 0x8 adds r5, r0 movs r1, 0x8 ldrsh r0, [r5, r1] cmp r0, 0 - beq _081DA284 + beq @081DA284 cmp r0, 0x1 - beq _081DA2AC + beq @081DA2AC movs r0, 0 strh r0, [r5, 0x8] strh r0, [r5, 0x20] adds r0, r4, 0 bl set_task_function_to_args_14_15 - b _081DA2D4 + b @081DA2D4 .align 2, 0 .pool -_081DA284: +@081DA284: bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - bne _081DA2CE + bne @081DA2CE bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _081DA2D4 + beq @081DA2D4 ldr r0, =0x03005d80 movs r1, 0x4 bl sub_80FC4F4 cmp r0, 0x1 - bne _081DA2D4 - b _081DA2CE + bne @081DA2D4 + b @081DA2CE .align 2, 0 .pool -_081DA2AC: +@081DA2AC: movs r0, 0 bl sub_80FC530 lsls r0, 24 cmp r0, 0 - beq _081DA2D4 + beq @081DA2D4 ldr r0, =0x03005d80 ldr r4, =0x020223c4 adds r1, r4, 0 @@ -917922,11 +917922,11 @@ _081DA2AC: adds r1, r4, 0 movs r2, 0x4 bl memcpy -_081DA2CE: +@081DA2CE: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] -_081DA2D4: +@081DA2D4: pop {r4-r6} pop {r0} bx r0 @@ -917935,7 +917935,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 @@ -917954,7 +917954,7 @@ sub_81DA2E8: @ 81DA2E8 adds r0, 0x18 bl sub_80FC670 cmp r0, 0 - beq _081DA39E + beq @081DA39E movs r0, 0x8 negs r0, r0 add r0, r8 @@ -917963,43 +917963,43 @@ sub_81DA2E8: @ 81DA2E8 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - beq _081DA338 + beq @081DA338 cmp r0, 0x1 - beq _081DA35A + beq @081DA35A movs r0, 0 strh r0, [r4, 0x8] strh r0, [r4, 0x20] adds r0, r6, 0 bl set_task_function_to_args_14_15 - b _081DA39E + b @081DA39E .align 2, 0 .pool -_081DA338: +@081DA338: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _081DA39E + beq @081DA39E add r0, sp, 0x8 movs r1, 0x6E strh r1, [r0] movs r1, 0x2 bl sub_80FC4F4 cmp r0, 0x1 - bne _081DA39E + bne @081DA39E ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _081DA39E -_081DA35A: + b @081DA39E +@081DA35A: bl sub_80FC55C lsls r0, 24 cmp r0, 0 - beq _081DA39E + beq @081DA39E movs r1, 0 ldr r7, =0x02039f30 ldrb r0, [r7] cmp r1, r0 - bge _081DA390 + bge @081DA390 mov r0, r8 adds r0, 0xA adds r3, r5, r0 @@ -918007,7 +918007,7 @@ _081DA35A: mov r2, sp movs r5, 0x80 lsls r5, 1 -_081DA37C: +@081DA37C: ldrh r0, [r4] strh r0, [r2] strh r0, [r3] @@ -918017,8 +918017,8 @@ _081DA37C: adds r1, 0x1 ldrb r0, [r7] cmp r1, r0 - blt _081DA37C -_081DA390: + blt @081DA37C +@081DA390: mov r0, r9 adds r1, r0, r6 lsls r1, 3 @@ -918026,7 +918026,7 @@ _081DA390: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_081DA39E: +@081DA39E: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -918040,7 +918040,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 @@ -918059,7 +918059,7 @@ sub_81DA3B8: @ 81DA3B8 adds r0, 0x18 bl sub_80FC670 cmp r0, 0 - beq _081DA46E + beq @081DA46E movs r0, 0x8 negs r0, r0 add r0, r8 @@ -918068,43 +918068,43 @@ sub_81DA3B8: @ 81DA3B8 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - beq _081DA408 + beq @081DA408 cmp r0, 0x1 - beq _081DA42A + beq @081DA42A movs r0, 0 strh r0, [r4, 0x8] strh r0, [r4, 0x20] adds r0, r6, 0 bl set_task_function_to_args_14_15 - b _081DA46E + b @081DA46E .align 2, 0 .pool -_081DA408: +@081DA408: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _081DA46E + beq @081DA46E ldrh r1, [r4, 0x1A] add r0, sp, 0x8 strh r1, [r0] movs r1, 0x2 bl sub_80FC4F4 cmp r0, 0x1 - bne _081DA46E + bne @081DA46E ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _081DA46E -_081DA42A: + b @081DA46E +@081DA42A: bl sub_80FC55C lsls r0, 24 cmp r0, 0 - beq _081DA46E + beq @081DA46E movs r1, 0 ldr r7, =0x02039f30 ldrb r0, [r7] cmp r1, r0 - bge _081DA460 + bge @081DA460 mov r0, r8 adds r0, 0x2 adds r3, r5, r0 @@ -918112,7 +918112,7 @@ _081DA42A: mov r2, sp movs r5, 0x80 lsls r5, 1 -_081DA44C: +@081DA44C: ldrh r0, [r4] strh r0, [r2] strh r0, [r3] @@ -918122,8 +918122,8 @@ _081DA44C: adds r1, 0x1 ldrb r0, [r7] cmp r1, r0 - blt _081DA44C -_081DA460: + blt @081DA44C +@081DA460: mov r0, r9 adds r1, r0, r6 lsls r1, 3 @@ -918131,7 +918131,7 @@ _081DA460: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_081DA46E: +@081DA46E: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -918145,7 +918145,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} @@ -918159,33 +918159,33 @@ sub_81DA488: @ 81DA488 adds r0, 0x18 bl sub_80FC670 cmp r0, 0 - beq _081DA55C + beq @081DA55C adds r0, r5, 0 subs r0, 0x8 adds r4, r0 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - beq _081DA4CC + beq @081DA4CC cmp r0, 0x1 - beq _081DA50C + beq @081DA50C movs r0, 0 strh r0, [r4, 0x8] strh r0, [r4, 0x20] adds r0, r6, 0 bl set_task_function_to_args_14_15 - b _081DA55C + b @081DA55C .align 2, 0 .pool -_081DA4CC: +@081DA4CC: bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 - bne _081DA4FA + bne @081DA4FA bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq _081DA55C + beq @081DA55C ldr r0, =0x02039f30 ldrb r2, [r0] lsls r0, r2, 6 @@ -918197,20 +918197,20 @@ _081DA4CC: lsrs r1, 16 bl sub_80FC4F4 cmp r0, 0x1 - bne _081DA55C -_081DA4FA: + bne @081DA55C +@081DA4FA: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _081DA55C + b @081DA55C .align 2, 0 .pool -_081DA50C: +@081DA50C: movs r0, 0 bl sub_80FC530 lsls r0, 24 cmp r0, 0 - beq _081DA55C + beq @081DA55C ldr r4, =0x02039f30 ldrb r3, [r4] lsls r0, r3, 6 @@ -918224,19 +918224,19 @@ _081DA50C: ldrb r4, [r4] mov r8, r7 cmp r4, 0x3 - bgt _081DA54C + bgt @081DA54C lsls r0, r4, 6 adds r5, r0, r5 ldr r7, =0x020229e8 -_081DA53C: +@081DA53C: ldrh r1, [r7, 0x1A] adds r0, r5, 0 bl sub_80DFA08 adds r5, 0x40 adds r4, 0x1 cmp r4, 0x3 - ble _081DA53C -_081DA54C: + ble @081DA53C +@081DA54C: ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r6 @@ -918245,7 +918245,7 @@ _081DA54C: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -_081DA55C: +@081DA55C: pop {r3} mov r8, r3 pop {r4-r7} @@ -918256,13 +918256,13 @@ _081DA55C: thumb_func_end sub_81DA488 thumb_func_start sub_81DA57C -sub_81DA57C: @ 81DA57C +sub_81DA57C: ; 81DA57C push {lr} ldr r0, =0x00000864 bl flag_check lsls r0, 24 cmp r0, 0 - beq _081DA5CA + beq @081DA5CA bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -918271,25 +918271,25 @@ sub_81DA57C: @ 81DA57C lsls r0, 16 lsrs r0, 16 cmp r0, 0x1E - bhi _081DA5CA + bhi @081DA5CA movs r0, 0x5B bl flag_check lsls r0, 24 cmp r0, 0 - beq _081DA5C0 + beq @081DA5C0 ldr r0, =0x0862ad34 movs r1, 0x8 movs r2, 0x5 bl sub_81DA5D4 - b _081DA5CA + b @081DA5CA .align 2, 0 .pool -_081DA5C0: +@081DA5C0: ldr r0, =0x0862ad44 movs r1, 0x7 movs r2, 0x1 bl sub_81DA5D4 -_081DA5CA: +@081DA5CA: pop {r0} bx r0 .align 2, 0 @@ -918297,7 +918297,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 @@ -918312,9 +918312,9 @@ sub_81DA5D4: @ 81DA5D4 mov r8, r0 movs r5, 0 cmp r5, r7 - bcs _081DA61C + bcs @081DA61C mov r4, r9 -_081DA5F4: +@081DA5F4: ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r4] @@ -918323,30 +918323,30 @@ _081DA5F4: adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _081DA614 + bne @081DA614 adds r0, r1, 0 bl sub_81DA6CC cmp r8, r0 - ble _081DA612 + ble @081DA612 mov r8, r0 -_081DA612: +@081DA612: adds r6, 0x1 -_081DA614: +@081DA614: adds r4, 0x2 adds r5, 0x1 cmp r5, r7 - bcc _081DA5F4 -_081DA61C: + bcc @081DA5F4 +@081DA61C: cmp r6, 0 - beq _081DA6BA + beq @081DA6BA cmp r8, r10 - bhi _081DA6BA + bhi @081DA6BA movs r6, 0 movs r5, 0 cmp r5, r7 - bcs _081DA654 + bcs @081DA654 mov r4, r9 -_081DA62E: +@081DA62E: ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r4] @@ -918355,20 +918355,20 @@ _081DA62E: adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _081DA64C + bne @081DA64C adds r0, r1, 0 bl sub_81DA6CC cmp r0, r8 - bne _081DA64C + bne @081DA64C adds r6, 0x1 -_081DA64C: +@081DA64C: adds r4, 0x2 adds r5, 0x1 cmp r5, r7 - bcc _081DA62E -_081DA654: + bcc @081DA62E +@081DA654: cmp r6, 0 - beq _081DA6BA + beq @081DA6BA bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -918377,18 +918377,18 @@ _081DA654: adds r6, r0, 0 movs r5, 0 cmp r5, r7 - bcs _081DA6BA + bcs @081DA6BA ldr r2, =0x03005d8c ldr r3, =0x000009ca mov r4, r9 -_081DA674: +@081DA674: ldr r0, [r2] ldrh r1, [r4] adds r0, r3 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne _081DA6B2 + bne @081DA6B2 adds r0, r1, 0 str r2, [sp] str r3, [sp, 0x4] @@ -918396,26 +918396,26 @@ _081DA674: ldr r2, [sp] ldr r3, [sp, 0x4] cmp r0, r8 - bne _081DA6B2 + bne @081DA6B2 cmp r6, 0 - bne _081DA6B0 + bne @081DA6B0 ldr r0, [r2] adds r0, r3 ldrh r4, [r4] adds r0, r4 mov r1, r8 strb r1, [r0] - b _081DA6BA + b @081DA6BA .align 2, 0 .pool -_081DA6B0: +@081DA6B0: subs r6, 0x1 -_081DA6B2: +@081DA6B2: adds r4, 0x2 adds r5, 0x1 cmp r5, r7 - bcc _081DA674 -_081DA6BA: + bcc @081DA674 +@081DA6BA: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -918427,12 +918427,12 @@ _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 ldr r6, =0x085500a4 -_081DA6D4: +@081DA6D4: lsls r0, r4, 1 lsls r1, r5, 4 adds r0, r1 @@ -918441,24 +918441,24 @@ _081DA6D4: bl trainer_flag_check lsls r0, 24 cmp r0, 0 - bne _081DA6F0 + bne @081DA6F0 adds r0, r4, 0 - b _081DA6F8 + b @081DA6F8 .align 2, 0 .pool -_081DA6F0: +@081DA6F0: adds r4, 0x1 cmp r4, 0x4 - ble _081DA6D4 + ble @081DA6D4 movs r0, 0x5 -_081DA6F8: +@081DA6F8: pop {r4-r6} pop {r1} bx r1 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 @@ -918486,7 +918486,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 @@ -918524,24 +918524,24 @@ sub_81DA74C: @ 81DA74C lsls r0, 24 lsrs r5, r0, 24 cmp r7, 0x1 - beq _081DA7D0 + beq @081DA7D0 cmp r7, 0x1 - bgt _081DA7A8 + bgt @081DA7A8 cmp r7, 0 - beq _081DA7B8 - b _081DA7AC + beq @081DA7B8 + b @081DA7AC .align 2, 0 .pool -_081DA7A8: +@081DA7A8: cmp r7, 0x2 - beq _081DA7E4 -_081DA7AC: + beq @081DA7E4 +@081DA7AC: ldr r6, =0x02020630 lsls r3, r5, 4 - b _081DA7F8 + b @081DA7F8 .align 2, 0 .pool -_081DA7B8: +@081DA7B8: ldr r2, =0x02020630 lsls r3, r5, 4 adds r0, r3, r5 @@ -918550,33 +918550,33 @@ _081DA7B8: movs r1, 0x78 strh r1, [r0, 0x2E] movs r1, 0x2D - b _081DA7F4 + b @081DA7F4 .align 2, 0 .pool -_081DA7D0: +@081DA7D0: ldr r2, =0x02020630 lsls r3, r5, 4 adds r0, r3, r5 lsls r0, 2 adds r0, r2 movs r1, 0x59 - b _081DA7F0 + b @081DA7F0 .align 2, 0 .pool -_081DA7E4: +@081DA7E4: ldr r2, =0x02020630 lsls r3, r5, 4 adds r0, r3, r5 lsls r0, 2 adds r0, r2 movs r1, 0x97 -_081DA7F0: +@081DA7F0: strh r1, [r0, 0x2E] movs r1, 0x61 -_081DA7F4: +@081DA7F4: strh r1, [r0, 0x30] adds r6, r2, 0 -_081DA7F8: +@081DA7F8: adds r4, r3, r5 lsls r4, 2 adds r0, r4, r6 @@ -918617,7 +918617,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 @@ -918627,62 +918627,62 @@ sub_81DA848: @ 81DA848 movs r4, 0x2E ldrsh r0, [r3, r4] cmp r1, r0 - bne _081DA874 + bne @081DA874 movs r5, 0x22 ldrsh r1, [r3, r5] movs r4, 0x2 ldrsh r0, [r2, r4] cmp r1, r0 - bne _081DA874 + bne @081DA874 ldr r0, =nullsub_12 + 1 str r0, [r3, 0x1C] - b _081DA8B4 + b @081DA8B4 .align 2, 0 .pool -_081DA874: +@081DA874: ldrh r4, [r2, 0x8] movs r5, 0x8 ldrsh r1, [r2, r5] movs r5, 0xC ldrsh r0, [r2, r5] cmp r1, r0 - bne _081DA890 + bne @081DA890 ldrh r0, [r2, 0x4] ldrh r1, [r3, 0x20] adds r0, r1 movs r1, 0 strh r0, [r3, 0x20] strh r1, [r2, 0x8] - b _081DA894 -_081DA890: + b @081DA894 +@081DA890: adds r0, r4, 0x1 strh r0, [r2, 0x8] -_081DA894: +@081DA894: ldrh r4, [r2, 0xA] movs r5, 0xA ldrsh r1, [r2, r5] movs r5, 0xE ldrsh r0, [r2, r5] cmp r1, r0 - bne _081DA8B0 + bne @081DA8B0 ldrh r0, [r2, 0x6] ldrh r1, [r3, 0x22] adds r0, r1 movs r1, 0 strh r0, [r3, 0x22] strh r1, [r2, 0xA] - b _081DA8B4 -_081DA8B0: + b @081DA8B4 +@081DA8B0: adds r0, r4, 0x1 strh r0, [r2, 0xA] -_081DA8B4: +@081DA8B4: pop {r4,r5} pop {r0} bx r0 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 @@ -918725,24 +918725,24 @@ sub_81DA8BC: @ 81DA8BC lsls r0, 24 lsrs r6, r0, 24 cmp r5, 0x1 - beq _081DA94C + beq @081DA94C cmp r5, 0x1 - bgt _081DA924 + bgt @081DA924 cmp r5, 0 - beq _081DA934 - b _081DA928 + beq @081DA934 + b @081DA928 .align 2, 0 .pool -_081DA924: +@081DA924: cmp r5, 0x2 - beq _081DA960 -_081DA928: + beq @081DA960 +@081DA928: ldr r2, =0x02020630 lsls r3, r6, 4 - b _081DA972 + b @081DA972 .align 2, 0 .pool -_081DA934: +@081DA934: ldr r2, =0x02020630 lsls r3, r6, 4 adds r0, r3, r6 @@ -918751,32 +918751,32 @@ _081DA934: movs r1, 0x78 strh r1, [r0, 0x2E] movs r1, 0x2D - b _081DA970 + b @081DA970 .align 2, 0 .pool -_081DA94C: +@081DA94C: ldr r2, =0x02020630 lsls r3, r6, 4 adds r0, r3, r6 lsls r0, 2 adds r0, r2 movs r1, 0x59 - b _081DA96C + b @081DA96C .align 2, 0 .pool -_081DA960: +@081DA960: ldr r2, =0x02020630 lsls r3, r6, 4 adds r0, r3, r6 lsls r0, 2 adds r0, r2 movs r1, 0x97 -_081DA96C: +@081DA96C: strh r1, [r0, 0x2E] movs r1, 0x61 -_081DA970: +@081DA970: strh r1, [r0, 0x30] -_081DA972: +@081DA972: adds r4, r3, r6 lsls r4, 2 adds r0, r4, r2 @@ -918814,7 +918814,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] @@ -918850,15 +918850,15 @@ sub_81DA9BC: @ 81DA9BC movs r3, 0x38 ldrsh r0, [r4, r3] cmp r1, r0 - beq _081DAA12 + beq @081DAA12 ldrh r0, [r4, 0x3A] adds r0, r2, r0 strh r0, [r4, 0x36] - b _081DAA16 -_081DAA12: + b @081DAA16 +@081DAA12: ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] -_081DAA16: +@081DAA16: pop {r4} pop {r0} bx r0 @@ -918867,7 +918867,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 @@ -918905,7 +918905,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 @@ -918920,7 +918920,7 @@ sub_81DAA74: @ 81DAA74 ldr r4, [r0] ldr r0, =nullsub_12 + 1 cmp r4, r0 - bne _081DAAC4 + bne @081DAAC4 movs r0, 0x12 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -918929,7 +918929,7 @@ sub_81DAA74: @ 81DAA74 adds r0, r5 ldr r2, [r0] cmp r2, r4 - bne _081DAAC4 + bne @081DAAC4 movs r1, 0x14 ldrsh r0, [r3, r1] lsls r1, r0, 4 @@ -918938,27 +918938,27 @@ sub_81DAA74: @ 81DAA74 adds r1, r5 ldr r0, [r1] cmp r0, r2 - bne _081DAAC4 + bne @081DAAC4 movs r0, 0x1 - b _081DAAC6 + b @081DAAC6 .align 2, 0 .pool -_081DAAC4: +@081DAAC4: movs r0, 0 -_081DAAC6: +@081DAAC6: pop {r4,r5} pop {r1} bx r1 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 ldrsh r0, [r4, r1] cmp r0, 0 - beq _081DAB20 + beq @081DAB20 bl sub_81DA700 ldr r1, =0x00003f41 movs r0, 0x50 @@ -918986,10 +918986,10 @@ sub_81DAACC: @ 81DAACC adds r0, 0x1 strh r0, [r4, 0x8] movs r0, 0x1 - b _081DAB46 + b @081DAB46 .align 2, 0 .pool -_081DAB20: +@081DAB20: movs r1, 0x80 lsls r1, 6 movs r0, 0 @@ -919006,36 +919006,36 @@ _081DAB20: adds r0, 0x1 strh r0, [r4, 0xA] movs r0, 0 -_081DAB46: +@081DAB46: pop {r4} pop {r1} bx r1 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 movs r1, 0xC ldrsh r0, [r4, r1] cmp r0, 0 - bne _081DAB64 + bne @081DAB64 movs r1, 0x80 lsls r1, 1 movs r0, 0 bl lcd_io_set_bits -_081DAB64: +@081DAB64: ldrh r1, [r4, 0xC] movs r2, 0xC ldrsh r0, [r4, r2] cmp r0, 0x10 - bne _081DAB98 + bne @081DAB98 ldrh r1, [r4, 0xE] movs r2, 0xE ldrsh r0, [r4, r2] cmp r0, 0x1F - bne _081DAB92 + bne @081DAB92 movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -919047,12 +919047,12 @@ _081DAB64: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b _081DABB0 -_081DAB92: + b @081DABB0 +@081DAB92: adds r0, r1, 0x1 strh r0, [r4, 0xE] - b _081DABB0 -_081DAB98: + b @081DABB0 +@081DAB98: adds r0, r1, 0x1 strh r0, [r4, 0xC] ldrh r1, [r4, 0xC] @@ -919064,7 +919064,7 @@ _081DAB98: lsrs r1, 16 movs r0, 0x52 bl lcd_io_set -_081DABB0: +@081DABB0: movs r0, 0 add sp, 0x4 pop {r4} @@ -919073,18 +919073,18 @@ _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 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne _081DABD2 + bne @081DABD2 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_081DABD2: +@081DABD2: movs r0, 0 pop {r4} pop {r1} @@ -919092,7 +919092,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 @@ -919102,7 +919102,7 @@ sub_81DABDC: @ 81DABDC adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_081DABEE: +@081DABEE: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -919112,7 +919112,7 @@ _081DABEE: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _081DABEE + bne @081DABEE pop {r4,r5} pop {r0} bx r0 @@ -919121,7 +919121,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 @@ -919176,7 +919176,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 @@ -919184,7 +919184,7 @@ sub_81DAC80: @ 81DAC80 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081DACA4 + bne @081DACA4 adds r0, r2, 0 bl sub_81DAA20 ldr r0, =sub_81DABDC + 1 @@ -919192,7 +919192,7 @@ sub_81DAC80: @ 81DAC80 lsls r0, 24 lsrs r0, 24 bl remove_task -_081DACA4: +@081DACA4: movs r0, 0 pop {r1} bx r1 @@ -919201,7 +919201,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 @@ -919211,7 +919211,7 @@ sub_81DACB4: @ 81DACB4 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_081DACC6: +@081DACC6: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -919221,7 +919221,7 @@ _081DACC6: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _081DACC6 + bne @081DACC6 pop {r4,r5} pop {r0} bx r0 @@ -919230,7 +919230,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 @@ -919285,7 +919285,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 @@ -919293,7 +919293,7 @@ sub_81DAD58: @ 81DAD58 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081DAD7C + bne @081DAD7C adds r0, r2, 0 bl sub_81DAA20 ldr r0, =sub_81DACB4 + 1 @@ -919301,7 +919301,7 @@ sub_81DAD58: @ 81DAD58 lsls r0, 24 lsrs r0, 24 bl remove_task -_081DAD7C: +@081DAD7C: movs r0, 0 pop {r1} bx r1 @@ -919310,7 +919310,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 @@ -919320,7 +919320,7 @@ sub_81DAD8C: @ 81DAD8C adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_081DAD9E: +@081DAD9E: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -919330,7 +919330,7 @@ _081DAD9E: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _081DAD9E + bne @081DAD9E pop {r4,r5} pop {r0} bx r0 @@ -919339,7 +919339,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} @@ -919403,7 +919403,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 @@ -919411,7 +919411,7 @@ sub_81DAE44: @ 81DAE44 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081DAE68 + bne @081DAE68 adds r0, r2, 0 bl sub_81DAA20 ldr r0, =sub_81DAD8C + 1 @@ -919419,7 +919419,7 @@ sub_81DAE44: @ 81DAE44 lsls r0, 24 lsrs r0, 24 bl remove_task -_081DAE68: +@081DAE68: movs r0, 0 pop {r1} bx r1 @@ -919428,7 +919428,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 @@ -919438,7 +919438,7 @@ sub_81DAE78: @ 81DAE78 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_081DAE8A: +@081DAE8A: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -919448,7 +919448,7 @@ _081DAE8A: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _081DAE8A + bne @081DAE8A pop {r4,r5} pop {r0} bx r0 @@ -919457,7 +919457,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} @@ -919523,7 +919523,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 @@ -919531,7 +919531,7 @@ sub_81DAF34: @ 81DAF34 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081DAF58 + bne @081DAF58 adds r0, r2, 0 bl sub_81DAA20 ldr r0, =sub_81DAE78 + 1 @@ -919539,7 +919539,7 @@ sub_81DAF34: @ 81DAF34 lsls r0, 24 lsrs r0, 24 bl remove_task -_081DAF58: +@081DAF58: movs r0, 0 pop {r1} bx r1 @@ -919548,7 +919548,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 @@ -919558,7 +919558,7 @@ sub_81DAF68: @ 81DAF68 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_081DAF7A: +@081DAF7A: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -919568,7 +919568,7 @@ _081DAF7A: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _081DAF7A + bne @081DAF7A pop {r4,r5} pop {r0} bx r0 @@ -919577,14 +919577,14 @@ _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 movs r0, 0xA ldrsh r2, [r4, r0] cmp r2, 0 - bne _081DAFCC + bne @081DAFCC movs r1, 0x33 negs r1, r1 str r2, [sp] @@ -919598,10 +919598,10 @@ sub_81DAFA0: @ 81DAFA0 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x10] - b _081DB01A -_081DAFCC: + b @081DB01A +@081DAFCC: cmp r2, 0x10 - bne _081DAFF2 + bne @081DAFF2 movs r0, 0x7 negs r0, r0 movs r1, 0x4 @@ -919617,10 +919617,10 @@ _081DAFCC: lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x12] - b _081DB01A -_081DAFF2: + b @081DB01A +@081DAFF2: cmp r2, 0x20 - bne _081DB01A + bne @081DB01A movs r0, 0x4 negs r0, r0 str r0, [sp] @@ -919638,7 +919638,7 @@ _081DAFF2: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_081DB01A: +@081DB01A: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] @@ -919650,7 +919650,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 @@ -919658,7 +919658,7 @@ sub_81DB02C: @ 81DB02C movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081DB050 + bne @081DB050 adds r0, r2, 0 bl sub_81DAA20 ldr r0, =sub_81DAF68 + 1 @@ -919666,7 +919666,7 @@ sub_81DB02C: @ 81DB02C lsls r0, 24 lsrs r0, 24 bl remove_task -_081DB050: +@081DB050: movs r0, 0 pop {r1} bx r1 @@ -919675,7 +919675,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 @@ -919685,7 +919685,7 @@ sub_81DB060: @ 81DB060 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_081DB072: +@081DB072: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -919695,7 +919695,7 @@ _081DB072: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _081DB072 + bne @081DB072 pop {r4,r5} pop {r0} bx r0 @@ -919704,14 +919704,14 @@ _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 movs r0, 0xA ldrsh r1, [r4, r0] cmp r1, 0 - bne _081DB0C4 + bne @081DB0C4 str r1, [sp] movs r0, 0x8 negs r0, r0 @@ -919725,10 +919725,10 @@ sub_81DB098: @ 81DB098 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x10] - b _081DB112 -_081DB0C4: + b @081DB112 +@081DB0C4: cmp r1, 0x10 - bne _081DB0E8 + bne @081DB0E8 movs r0, 0x8 negs r0, r0 str r0, [sp] @@ -919743,10 +919743,10 @@ _081DB0C4: lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x12] - b _081DB112 -_081DB0E8: + b @081DB112 +@081DB0E8: cmp r1, 0x20 - bne _081DB112 + bne @081DB112 movs r0, 0x1 negs r0, r0 movs r1, 0x8 @@ -919765,7 +919765,7 @@ _081DB0E8: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_081DB112: +@081DB112: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] @@ -919777,7 +919777,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 @@ -919785,7 +919785,7 @@ sub_81DB124: @ 81DB124 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081DB148 + bne @081DB148 adds r0, r2, 0 bl sub_81DAA20 ldr r0, =sub_81DB060 + 1 @@ -919793,7 +919793,7 @@ sub_81DB124: @ 81DB124 lsls r0, 24 lsrs r0, 24 bl remove_task -_081DB148: +@081DB148: movs r0, 0 pop {r1} bx r1 @@ -919802,7 +919802,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 @@ -919812,7 +919812,7 @@ sub_81DB158: @ 81DB158 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_081DB16A: +@081DB16A: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -919822,7 +919822,7 @@ _081DB16A: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _081DB16A + bne @081DB16A pop {r4,r5} pop {r0} bx r0 @@ -919831,14 +919831,14 @@ _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 movs r0, 0xA ldrsh r1, [r4, r0] cmp r1, 0 - bne _081DB1BE + bne @081DB1BE movs r0, 0x80 str r0, [sp] str r1, [sp, 0x4] @@ -919853,10 +919853,10 @@ sub_81DB190: @ 81DB190 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x10] - b _081DB212 -_081DB1BE: + b @081DB212 +@081DB1BE: cmp r1, 0x10 - bne _081DB1E6 + bne @081DB1E6 movs r0, 0x80 str r0, [sp] movs r0, 0 @@ -919873,10 +919873,10 @@ _081DB1BE: lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x12] - b _081DB212 -_081DB1E6: + b @081DB212 +@081DB1E6: cmp r1, 0x20 - bne _081DB212 + bne @081DB212 movs r0, 0x80 str r0, [sp] movs r0, 0 @@ -919896,7 +919896,7 @@ _081DB1E6: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_081DB212: +@081DB212: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] @@ -919908,7 +919908,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 @@ -919916,7 +919916,7 @@ sub_81DB224: @ 81DB224 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081DB248 + bne @081DB248 adds r0, r2, 0 bl sub_81DAA20 ldr r0, =sub_81DB158 + 1 @@ -919924,7 +919924,7 @@ sub_81DB224: @ 81DB224 lsls r0, 24 lsrs r0, 24 bl remove_task -_081DB248: +@081DB248: movs r0, 0 pop {r1} bx r1 @@ -919933,7 +919933,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 @@ -919943,7 +919943,7 @@ sub_81DB258: @ 81DB258 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -_081DB26A: +@081DB26A: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -919953,7 +919953,7 @@ _081DB26A: bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne _081DB26A + bne @081DB26A pop {r4,r5} pop {r0} bx r0 @@ -919962,14 +919962,14 @@ _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 movs r0, 0xA ldrsh r1, [r4, r0] cmp r1, 0 - bne _081DB2C2 + bne @081DB2C2 movs r2, 0x8E lsls r2, 1 movs r0, 0x83 @@ -919986,10 +919986,10 @@ sub_81DB290: @ 81DB290 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x10] - b _081DB316 -_081DB2C2: + b @081DB316 +@081DB2C2: cmp r1, 0x10 - bne _081DB2EA + bne @081DB2EA movs r0, 0x83 str r0, [sp] movs r0, 0x23 @@ -920006,10 +920006,10 @@ _081DB2C2: lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x12] - b _081DB316 -_081DB2EA: + b @081DB316 +@081DB2EA: cmp r1, 0x20 - bne _081DB316 + bne @081DB316 movs r0, 0x83 str r0, [sp] movs r0, 0x23 @@ -920029,7 +920029,7 @@ _081DB2EA: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -_081DB316: +@081DB316: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] @@ -920041,7 +920041,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 @@ -920049,7 +920049,7 @@ sub_81DB328: @ 81DB328 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _081DB34C + bne @081DB34C adds r0, r2, 0 bl sub_81DAA20 ldr r0, =sub_81DB258 + 1 @@ -920057,7 +920057,7 @@ sub_81DB328: @ 81DB328 lsls r0, 24 lsrs r0, 24 bl remove_task -_081DB34C: +@081DB34C: movs r0, 0 pop {r1} bx r1 @@ -920066,7 +920066,7 @@ _081DB34C: thumb_func_end sub_81DB328 thumb_func_start sub_81DB35C -sub_81DB35C: @ 81DB35C +sub_81DB35C: ; 81DB35C push {lr} movs r3, 0 bl sub_81DB374 @@ -920075,7 +920075,7 @@ sub_81DB35C: @ 81DB35C thumb_func_end sub_81DB35C thumb_func_start sub_81DB368 -sub_81DB368: @ 81DB368 +sub_81DB368: ; 81DB368 push {lr} movs r3, 0 bl sub_81DB384 @@ -920084,7 +920084,7 @@ sub_81DB368: @ 81DB368 thumb_func_end sub_81DB368 thumb_func_start sub_81DB374 -sub_81DB374: @ 81DB374 +sub_81DB374: ; 81DB374 push {lr} bl sub_81DB384 lsrs r1, r0, 31 @@ -920095,7 +920095,7 @@ sub_81DB374: @ 81DB374 thumb_func_end sub_81DB374 thumb_func_start sub_81DB384 -sub_81DB384: @ 81DB384 +sub_81DB384: ; 81DB384 push {r4,lr} adds r4, r2, 0 adds r2, r3, 0 @@ -920105,39 +920105,39 @@ sub_81DB384: @ 81DB384 asrs r2, 16 bl font_get_width_of_string cmp r4, r0 - bgt _081DB39E + bgt @081DB39E movs r0, 0 - b _081DB3A0 -_081DB39E: + b @081DB3A0 +@081DB39E: subs r0, r4, r0 -_081DB3A0: +@081DB3A0: pop {r4} pop {r1} bx r1 thumb_func_end sub_81DB384 thumb_func_start GetMaxWidthInMenuTable -GetMaxWidthInMenuTable: @ 81DB3A8 +GetMaxWidthInMenuTable: ; 81DB3A8 push {r4-r6,lr} movs r6, 0 cmp r6, r1 - bge _081DB3CC + bge @081DB3CC adds r5, r0, 0 adds r4, r1, 0 -_081DB3B4: +@081DB3B4: ldr r1, [r5] movs r0, 0x1 movs r2, 0 bl font_get_width_of_string cmp r0, r6 - ble _081DB3C4 + ble @081DB3C4 adds r6, r0, 0 -_081DB3C4: +@081DB3C4: adds r5, 0x8 subs r4, 0x1 cmp r4, 0 - bne _081DB3B4 -_081DB3CC: + bne @081DB3B4 +@081DB3CC: adds r0, r6, 0 bl convert_pixel_width_to_tile_width pop {r4-r6} @@ -920146,7 +920146,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} @@ -920156,8 +920156,8 @@ sub_81DB3D8: @ 81DB3D8 movs r6, 0 movs r4, 0 cmp r6, r5 - bge _081DB40A -_081DB3EC: + bge @081DB40A +@081DB3EC: adds r0, r7, r4 ldrb r0, [r0] lsls r0, 3 @@ -920167,13 +920167,13 @@ _081DB3EC: movs r2, 0 bl font_get_width_of_string cmp r0, r6 - ble _081DB404 + ble @081DB404 adds r6, r0, 0 -_081DB404: +@081DB404: adds r4, 0x1 cmp r4, r5 - blt _081DB3EC -_081DB40A: + blt @081DB3EC +@081DB40A: adds r0, r6, 0 bl convert_pixel_width_to_tile_width pop {r3} @@ -920184,7 +920184,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] @@ -920192,9 +920192,9 @@ sub_81DB41C: @ 81DB41C movs r6, 0 ldrh r0, [r4, 0xC] cmp r7, r0 - bge _081DB44C + bge @081DB44C adds r5, r1, 0 -_081DB42E: +@081DB42E: ldrb r0, [r4, 0x17] lsls r0, 26 lsrs r0, 26 @@ -920202,35 +920202,35 @@ _081DB42E: movs r2, 0 bl font_get_width_of_string cmp r0, r7 - ble _081DB442 + ble @081DB442 adds r7, r0, 0 -_081DB442: +@081DB442: adds r5, 0x8 adds r6, 0x1 ldrh r0, [r4, 0xC] cmp r6, r0 - blt _081DB42E -_081DB44C: + blt @081DB42E +@081DB44C: ldrb r0, [r4, 0x12] adds r1, r7, r0 adds r0, r1, 0 adds r0, 0x9 cmp r0, 0 - bge _081DB45A + bge @081DB45A adds r0, 0x7 -_081DB45A: +@081DB45A: asrs r0, 3 cmp r0, 0x1C - ble _081DB462 + ble @081DB462 movs r0, 0x1C -_081DB462: +@081DB462: pop {r4-r7} pop {r1} bx r1 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 @@ -920251,13 +920251,13 @@ 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 adds r7, r3, 0 cmp r5, 0 - beq _081DB4B6 + beq @081DB4B6 adds r1, r5, 0 bl gf_strcpy adds r4, r0, 0 @@ -920266,14 +920266,14 @@ sub_81DB494: @ 81DB494 adds r1, r5, 0 movs r2, 0 bl font_get_width_of_string - b _081DB4BA -_081DB4B6: + b @081DB4BA +@081DB4B6: adds r4, r0, 0 movs r0, 0 -_081DB4BA: +@081DB4BA: subs r3, r7, r0 cmp r3, 0 - ble _081DB4D4 + ble @081DB4D4 movs r0, 0xFC strb r0, [r4] adds r4, 0x1 @@ -920284,7 +920284,7 @@ _081DB4BA: adds r4, 0x1 movs r0, 0xFF strb r0, [r4] -_081DB4D4: +@081DB4D4: adds r0, r4, 0 pop {r4-r7} pop {r1} @@ -920292,7 +920292,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 @@ -920303,12 +920303,12 @@ sub_81DB4DC: @ 81DB4DC lsls r0, 24 lsrs r1, r0, 24 cmp r5, 0xFC - bne _081DB51A + bne @081DB51A cmp r1, 0x5 - bhi _081DB51E + bhi @081DB51E movs r3, 0xFC movs r2, 0x7 -_081DB4FE: +@081DB4FE: adds r0, r4, r1 strb r3, [r0] strb r2, [r0, 0x1] @@ -920316,18 +920316,18 @@ _081DB4FE: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x5 - bls _081DB4FE - b _081DB51E -_081DB510: + bls @081DB4FE + b @081DB51E +@081DB510: adds r0, r4, r1 strb r5, [r0] adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 -_081DB51A: +@081DB51A: cmp r1, 0x5 - bls _081DB510 -_081DB51E: + bls @081DB510 +@081DB51E: adds r1, r4, r1 movs r0, 0xFF strb r0, [r1] @@ -920337,29 +920337,29 @@ _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 sub_8008C24 lsls r0, 16 lsrs r0, 16 cmp r0, 0x5 - bhi _081DB546 + bhi @081DB546 adds r0, r4, 0 movs r1, 0x1 bl sub_8009308 - b _081DB54C -_081DB546: + b @081DB54C +@081DB546: adds r0, r4, 0 bl sub_8009370 -_081DB54C: +@081DB54C: pop {r4} pop {r0} bx r0 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 @@ -920368,72 +920368,72 @@ sub_81DB554: @ 81DB554 lsls r0, 16 lsrs r0, 16 cmp r0, 0x5 - bhi _081DB572 + bhi @081DB572 adds r0, r4, 0 movs r1, 0x1 bl sub_8009308 - b _081DB5A4 -_081DB572: + b @081DB5A4 +@081DB572: cmp r5, 0xFC - bne _081DB57E + bne @081DB57E adds r0, r4, 0 bl sub_8009370 - b _081DB5A4 -_081DB57E: + b @081DB5A4 +@081DB57E: adds r1, r4, 0 - b _081DB584 -_081DB582: + b @081DB584 +@081DB582: adds r1, 0x1 -_081DB584: +@081DB584: ldrb r0, [r1, 0x1] cmp r0, 0xFF - bne _081DB582 + bne @081DB582 cmp r1, r4 - bcc _081DB5A4 + bcc @081DB5A4 ldrb r0, [r1] cmp r0, r5 - bne _081DB5A4 + bne @081DB5A4 movs r2, 0xFF -_081DB596: +@081DB596: strb r2, [r1] subs r1, 0x1 cmp r1, r4 - bcc _081DB5A4 + bcc @081DB5A4 ldrb r0, [r1] cmp r0, r5 - beq _081DB596 -_081DB5A4: + beq @081DB596 +@081DB5A4: pop {r4,r5} pop {r0} bx r0 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] adds r2, 0x1 cmp r0, 0xFC - bne _081DB5E4 + bne @081DB5E4 ldrb r0, [r2] adds r2, 0x1 cmp r0, 0x15 - bne _081DB5E4 - b _081DB5CE -_081DB5C2: + bne @081DB5E4 + b @081DB5CE +@081DB5C2: cmp r1, 0xFC - bne _081DB5CC + bne @081DB5CC ldrb r0, [r2, 0x1] cmp r0, 0x16 - beq _081DB5E4 -_081DB5CC: + beq @081DB5E4 +@081DB5CC: adds r2, 0x1 -_081DB5CE: +@081DB5CE: ldrb r1, [r2] adds r0, r1, 0 cmp r0, 0xFF - bne _081DB5C2 + bne @081DB5C2 movs r0, 0xFC strb r0, [r2] adds r2, 0x1 @@ -920441,13 +920441,13 @@ _081DB5CE: strb r0, [r2] movs r0, 0xFF strb r0, [r2, 0x1] -_081DB5E4: +@081DB5E4: pop {r0} bx r0 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 @@ -920463,26 +920463,26 @@ 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] cmp r0, 0xFC - bne _081DB618 + bne @081DB618 ldrb r0, [r1, 0x1] cmp r0, 0x15 - bne _081DB618 + bne @081DB618 movs r0, 0x1 - b _081DB61A -_081DB618: + b @081DB61A +@081DB618: movs r0, 0x2 -_081DB61A: +@081DB61A: pop {r1} bx r1 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 @@ -920500,16 +920500,16 @@ sub_81DB620: @ 81DB620 adds r5, r0, r1 ldr r0, [sp, 0x18] cmp r0, 0 - ble _081DB66C + ble @081DB66C adds r4, r0, 0 -_081DB646: +@081DB646: ldr r0, =0x11111111 str r0, [sp] adds r2, r7, 0 cmp r2, 0 - bge _081DB652 + bge @081DB652 adds r2, 0x3 -_081DB652: +@081DB652: lsls r2, 9 lsrs r2, 11 movs r0, 0x80 @@ -920521,8 +920521,8 @@ _081DB652: adds r5, r6 subs r4, 0x1 cmp r4, 0 - bne _081DB646 -_081DB66C: + bne @081DB646 +@081DB66C: add sp, 0x4 pop {r4-r7} pop {r0} diff --git a/asm/gpu_bg.s b/asm/gpu_bg.s index e304bb9ef..3e7f9cdf0 100644 --- a/asm/gpu_bg.s +++ b/asm/gpu_bg.s @@ -1,6 +1,6 @@ thumb_func_start gpu_init_bgs -@ void gpu_init_bgs() -gpu_init_bgs: @ 80012F0 +; void gpu_init_bgs() +gpu_init_bgs: ; 80012F0 push {lr} bl gpu_reset_bg_configs ldr r1, =0x030008e0 @@ -14,8 +14,8 @@ gpu_init_bgs: @ 80012F0 thumb_func_end gpu_init_bgs thumb_func_start gpu_set_bg_mode -@ void gpu_set_bg_mode(u8 bg_mode) -gpu_set_bg_mode: @ 8001308 +; void gpu_set_bg_mode(u8 bg_mode) +gpu_set_bg_mode: ; 8001308 lsls r0, 24 lsrs r0, 24 ldr r3, =0x030008e0 @@ -30,8 +30,8 @@ gpu_set_bg_mode: @ 8001308 thumb_func_end gpu_set_bg_mode thumb_func_start gpu_get_bg_mode -@ u8 gpu_get_bg_mode() -gpu_get_bg_mode: @ 8001324 +; u8 gpu_get_bg_mode() +gpu_get_bg_mode: ; 8001324 ldr r0, =0x030008e0 ldrb r1, [r0, 0x10] movs r0, 0x7 @@ -42,19 +42,19 @@ gpu_get_bg_mode: @ 8001324 thumb_func_end gpu_get_bg_mode thumb_func_start gpu_reset_bg_configs -@ void gpu_reset_bg_configs() -gpu_reset_bg_configs: @ 8001334 +; void gpu_reset_bg_configs() +gpu_reset_bg_configs: ; 8001334 push {lr} ldr r2, =0x030008e0 ldr r0, =gBgConfigZeroValue ldr r0, [r0] adds r1, r2, 0 adds r1, 0xC -_08001340: +@08001340: str r0, [r1] subs r1, 0x4 cmp r1, r2 - bge _08001340 + bge @08001340 pop {r0} bx r0 .align 2, 0 @@ -62,7 +62,7 @@ _08001340: thumb_func_end gpu_reset_bg_configs thumb_func_start sub_8001354 -sub_8001354: @ 8001354 +sub_8001354: ; 8001354 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -70,14 +70,14 @@ sub_8001354: @ 8001354 bl is_invalid_bg_id lsls r0, 24 cmp r0, 0 - bne _08001372 + bne @08001372 ldr r1, =0x030008e0 lsls r0, r4, 2 adds r0, r1 ldr r1, =gBgConfigZeroValue ldr r1, [r1] str r1, [r0] -_08001372: +@08001372: pop {r4} pop {r0} bx r0 @@ -86,8 +86,8 @@ _08001372: thumb_func_end sub_8001354 thumb_func_start gpu_bg_config_set_fields -@ void gpu_bg_config_set_fields(u8 bg_id, u8 character_base_block, u8 screen_base_block, u8 screen_size, u8 palette_size_select, u8 priority, u8 mosaic, u8 wraparound) -gpu_bg_config_set_fields: @ 8001380 +; void gpu_bg_config_set_fields(u8 bg_id, u8 character_base_block, u8 screen_base_block, u8 screen_size, u8 palette_size_select, u8 priority, u8 mosaic, u8 wraparound) +gpu_bg_config_set_fields: ; 8001380 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -129,12 +129,12 @@ gpu_bg_config_set_fields: @ 8001380 lsrs r0, 24 mov r12, r0 cmp r0, 0 - bne _08001498 + bne @08001498 ldr r2, =0x030008e0 mov r8, r2 mov r0, r10 cmp r0, 0xFF - beq _080013F4 + beq @080013F4 lsls r2, r7, 2 add r2, r8 movs r1, 0x3 @@ -145,9 +145,9 @@ gpu_bg_config_set_fields: @ 8001380 ands r0, r3 orrs r0, r1 strb r0, [r2, 0x1] -_080013F4: +@080013F4: cmp r6, 0xFF - beq _0800140C + beq @0800140C lsls r1, r7, 2 add r1, r8 movs r0, 0x1F @@ -158,10 +158,10 @@ _080013F4: ands r0, r2 orrs r0, r3 strb r0, [r1, 0x1] -_0800140C: +@0800140C: mov r1, r9 cmp r1, 0xFF - beq _08001428 + beq @08001428 lsls r1, r7, 2 add r1, r8 movs r0, 0x3 @@ -173,10 +173,10 @@ _0800140C: ands r0, r2 orrs r0, r3 strb r0, [r1] -_08001428: +@08001428: ldr r6, [sp, 0x4] cmp r6, 0xFF - beq _0800143E + beq @0800143E lsls r1, r7, 2 add r1, r8 lsls r3, r6, 7 @@ -185,9 +185,9 @@ _08001428: ands r0, r2 orrs r0, r3 strb r0, [r1, 0x1] -_0800143E: +@0800143E: cmp r5, 0xFF - beq _08001456 + beq @08001456 lsls r1, r7, 2 add r1, r8 movs r0, 0x3 @@ -198,9 +198,9 @@ _0800143E: ands r0, r2 orrs r0, r3 strb r0, [r1] -_08001456: +@08001456: cmp r4, 0xFF - beq _0800146E + beq @0800146E lsls r1, r7, 2 add r1, r8 movs r0, 0x1 @@ -211,10 +211,10 @@ _08001456: ands r0, r2 orrs r0, r3 strb r0, [r1] -_0800146E: +@0800146E: ldr r0, [sp, 0xC] cmp r0, 0xFF - beq _08001484 + beq @08001484 lsls r1, r7, 2 add r1, r8 lsls r3, r0, 7 @@ -223,7 +223,7 @@ _0800146E: ands r0, r2 orrs r0, r3 strb r0, [r1] -_08001484: +@08001484: ldr r1, [sp] lsls r0, r1, 2 add r0, r8 @@ -234,7 +234,7 @@ _08001484: movs r2, 0x1 orrs r1, r2 strb r1, [r0] -_08001498: +@08001498: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -248,8 +248,8 @@ _08001498: thumb_func_end gpu_bg_config_set_fields thumb_func_start gpu_bg_config_get_field -@ int gpu_bg_config_get_field(u8 bg_id, u8 field_id) -gpu_bg_config_get_field: @ 80014AC +; int gpu_bg_config_get_field(u8 bg_id, u8 field_id) +gpu_bg_config_get_field: ; 80014AC push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -259,7 +259,7 @@ gpu_bg_config_get_field: @ 80014AC bl is_invalid_bg_id lsls r0, 24 cmp r0, 0 - bne _08001558 + bne @08001558 ldr r1, =0x030008e0 lsls r2, r4, 2 adds r0, r2, r1 @@ -267,84 +267,84 @@ gpu_bg_config_get_field: @ 80014AC lsls r0, 31 adds r3, r1, 0 cmp r0, 0 - beq _08001558 + beq @08001558 subs r0, r5, 0x1 cmp r0, 0x7 - bhi _08001558 + bhi @08001558 lsls r0, 2 - ldr r1, =_080014EC + ldr r1, =@080014EC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080014EC: - .4byte _0800150C - .4byte _08001516 - .4byte _08001520 - .4byte _0800152A - .4byte _08001534 - .4byte _0800153C - .4byte _08001546 - .4byte _08001550 -_0800150C: +@080014EC: + .4byte @0800150C + .4byte @08001516 + .4byte @08001520 + .4byte @0800152A + .4byte @08001534 + .4byte @0800153C + .4byte @08001546 + .4byte @08001550 +@0800150C: adds r0, r2, r3 ldrb r0, [r0] lsls r0, 31 lsrs r0, 31 - b _0800155A -_08001516: + b @0800155A +@08001516: adds r0, r2, r3 ldrb r0, [r0, 0x1] lsls r0, 30 lsrs r0, 30 - b _0800155A -_08001520: + b @0800155A +@08001520: adds r0, r2, r3 ldrb r0, [r0, 0x1] lsls r0, 25 lsrs r0, 27 - b _0800155A -_0800152A: + b @0800155A +@0800152A: adds r0, r2, r3 ldrb r0, [r0] lsls r0, 28 lsrs r0, 30 - b _0800155A -_08001534: + b @0800155A +@08001534: adds r0, r2, r3 ldrb r0, [r0, 0x1] lsrs r0, 7 - b _0800155A -_0800153C: + b @0800155A +@0800153C: adds r0, r2, r3 ldrb r0, [r0] lsls r0, 26 lsrs r0, 30 - b _0800155A -_08001546: + b @0800155A +@08001546: adds r0, r2, r3 ldrb r0, [r0] lsls r0, 25 lsrs r0, 31 - b _0800155A -_08001550: + b @0800155A +@08001550: adds r0, r2, r3 ldrb r0, [r0] lsrs r0, 7 - b _0800155A -_08001558: + b @0800155A +@08001558: movs r0, 0xFF -_0800155A: +@0800155A: pop {r4,r5} pop {r1} bx r1 thumb_func_end gpu_bg_config_get_field thumb_func_start gpu_copy_to_vram_by_bg_id -@ s8 gpu_copy_to_vram_by_bg_id(u8 bg_id, int src, u16 byte_count, u16 dest_offset, gpu_copy_to_vram_type type) -gpu_copy_to_vram_by_bg_id: @ 8001560 +; s8 gpu_copy_to_vram_by_bg_id(u8 bg_id, int src, u16 byte_count, u16 dest_offset, gpu_copy_to_vram_type type) +gpu_copy_to_vram_by_bg_id: ; 8001560 push {r4-r7,lr} mov r7, r8 push {r7} @@ -362,33 +362,33 @@ gpu_copy_to_vram_by_bg_id: @ 8001560 bl is_invalid_bg_id lsls r0, 24 cmp r0, 0 - bne _080015D8 + bne @080015D8 ldr r1, =0x030008e0 lsls r0, r4, 2 adds r1, r0, r1 ldrb r0, [r1] lsls r0, 31 cmp r0, 0 - beq _080015D8 + beq @080015D8 cmp r5, 0x1 - beq _080015A4 + beq @080015A4 cmp r5, 0x2 - beq _080015AC + beq @080015AC movs r2, 0xFF - b _080015DC + b @080015DC .align 2, 0 .pool -_080015A4: +@080015A4: ldrb r0, [r1, 0x1] lsls r0, 30 lsrs r0, 16 - b _080015B4 -_080015AC: + b @080015B4 +@080015AC: ldrb r0, [r1, 0x1] lsls r0, 25 lsrs r0, 27 lsls r0, 11 -_080015B4: +@080015B4: adds r0, r6, r0 lsls r0, 16 lsrs r0, 16 @@ -405,13 +405,13 @@ _080015B4: movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne _080015DC -_080015D8: + bne @080015DC +@080015D8: movs r0, 0xFF - b _080015DE -_080015DC: + b @080015DE +@080015DC: adds r0, r2, 0 -_080015DE: +@080015DE: pop {r3} mov r8, r3 pop {r4-r7} @@ -420,8 +420,8 @@ _080015DE: thumb_func_end gpu_copy_to_vram_by_bg_id thumb_func_start gpu_bg_show -@ void gpu_bg_show(u8 bg_id) -gpu_bg_show: @ 80015E8 +; void gpu_bg_show(u8 bg_id) +gpu_bg_show: ; 80015E8 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -429,14 +429,14 @@ gpu_bg_show: @ 80015E8 bl is_invalid_bg_id lsls r0, 24 cmp r0, 0 - bne _08001656 + bne @08001656 ldr r5, =0x030008e0 lsls r0, r4, 2 adds r2, r0, r5 ldrb r3, [r2] lsls r0, r3, 31 cmp r0, 0 - beq _08001656 + beq @08001656 lsls r1, r3, 26 lsrs r1, 30 ldrb r2, [r2, 0x1] @@ -475,7 +475,7 @@ gpu_bg_show: @ 80015E8 ldr r1, =0x00000f07 ands r0, r1 strh r0, [r5, 0x10] -_08001656: +@08001656: pop {r4,r5} pop {r0} bx r0 @@ -484,8 +484,8 @@ _08001656: thumb_func_end gpu_bg_show thumb_func_start gpu_bg_hide -@ void gpu_bg_hide(u8 bg_id) -gpu_bg_hide: @ 8001664 +; void gpu_bg_hide(u8 bg_id) +gpu_bg_hide: ; 8001664 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -493,7 +493,7 @@ gpu_bg_hide: @ 8001664 bl is_invalid_bg_id lsls r0, 24 cmp r0, 0 - bne _0800168A + bne @0800168A ldr r2, =0x030008e0 adds r0, r4, 0 adds r0, 0x8 @@ -504,7 +504,7 @@ gpu_bg_hide: @ 8001664 ldr r1, =0x00000f07 ands r0, r1 strh r0, [r2, 0x10] -_0800168A: +@0800168A: pop {r4} pop {r0} bx r0 @@ -513,8 +513,8 @@ _0800168A: thumb_func_end gpu_bg_hide thumb_func_start gpu_sync_bg_visibility_and_mode -@ void gpu_sync_bg_visibility_and_mode() -gpu_sync_bg_visibility_and_mode: @ 8001698 +; void gpu_sync_bg_visibility_and_mode() +gpu_sync_bg_visibility_and_mode: ; 8001698 push {lr} movs r0, 0 bl lcd_io_get @@ -532,8 +532,8 @@ gpu_sync_bg_visibility_and_mode: @ 8001698 thumb_func_end gpu_sync_bg_visibility_and_mode thumb_func_start gpu_sync_text_mode_and_hide_bgs -@ void gpu_sync_text_mode_and_hide_bgs() -gpu_sync_text_mode_and_hide_bgs: @ 80016BC +; void gpu_sync_text_mode_and_hide_bgs() +gpu_sync_text_mode_and_hide_bgs: ; 80016BC push {lr} movs r0, 0 bl lcd_io_get @@ -548,8 +548,8 @@ gpu_sync_text_mode_and_hide_bgs: @ 80016BC thumb_func_end gpu_sync_text_mode_and_hide_bgs thumb_func_start gpu_bg_affine_set -@ void gpu_bg_affine_set(u8 bg_id, int bg_center_x, int bg_center_y, u16 display_center_x, s16 display_center_y, s16 scale_x, s16 scale_y, s16 rotation_angle) -gpu_bg_affine_set: @ 80016D8 +; void gpu_bg_affine_set(u8 bg_id, int bg_center_x, int bg_center_y, u16 display_center_x, s16 display_center_y, s16 scale_x, s16 scale_y, s16 rotation_angle) +gpu_bg_affine_set: ; 80016D8 push {r4-r7,lr} mov r7, r8 push {r7} @@ -577,25 +577,25 @@ gpu_bg_affine_set: @ 80016D8 movs r1, 0x7 ands r1, r0 cmp r1, 0x1 - beq _08001720 + beq @08001720 cmp r1, 0x1 - ble _08001796 + ble @08001796 cmp r1, 0x2 - beq _08001726 - b _08001796 + beq @08001726 + b @08001796 .align 2, 0 .pool -_08001720: +@08001720: cmp r6, 0x2 - bne _08001796 - b _08001730 -_08001726: + bne @08001796 + b @08001730 +@08001726: subs r0, r6, 0x2 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi _08001796 -_08001730: + bhi @08001796 +@08001730: mov r0, r12 str r0, [sp] mov r0, r8 @@ -637,7 +637,7 @@ _08001730: ldrh r1, [r4, 0xE] movs r0, 0x2E bl lcd_io_set -_08001796: +@08001796: add sp, 0x24 pop {r3} mov r8, r3 @@ -647,32 +647,32 @@ _08001796: thumb_func_end gpu_bg_affine_set thumb_func_start is_invalid_bg_id -@ _BOOL1 is_invalid_bg_id(u8 bg_id) -is_invalid_bg_id: @ 80017A4 +; _BOOL1 is_invalid_bg_id(u8 bg_id) +is_invalid_bg_id: ; 80017A4 push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bhi _080017B2 + bhi @080017B2 movs r0, 0 - b _080017B4 -_080017B2: + b @080017B4 +@080017B2: movs r0, 0x1 -_080017B4: +@080017B4: pop {r1} bx r1 thumb_func_end is_invalid_bg_id thumb_func_start do_nothing -@ int do_nothing() -do_nothing: @ 80017B8 +; int do_nothing() +do_nothing: ; 80017B8 movs r0, 0 bx lr thumb_func_end do_nothing thumb_func_start gpu_reset_bgs_and_dma3_busy_flags -@ void gpu_reset_bgs_and_dma3_busy_flags(int a1) -gpu_reset_bgs_and_dma3_busy_flags: @ 80017BC +; void gpu_reset_bgs_and_dma3_busy_flags(int a1) +gpu_reset_bgs_and_dma3_busy_flags: ; 80017BC push {r4,lr} adds r4, r0, 0 bl gpu_init_bgs @@ -680,11 +680,11 @@ gpu_reset_bgs_and_dma3_busy_flags: @ 80017BC movs r2, 0 adds r0, r1, 0 adds r0, 0xC -_080017CC: +@080017CC: str r2, [r0] subs r0, 0x4 cmp r0, r1 - bge _080017CC + bge @080017CC ldr r0, =0x03002f54 str r4, [r0] pop {r4} @@ -695,8 +695,8 @@ _080017CC: thumb_func_end gpu_reset_bgs_and_dma3_busy_flags thumb_func_start bg_vram_setup -@ void bg_vram_setup(u8 bg_mode, struct bg_config3 *bg_config3s, u8 entry_count) -bg_vram_setup: @ 80017E8 +; void bg_vram_setup(u8 bg_mode, struct bg_config3 *bg_config3s, u8 entry_count) +bg_vram_setup: ; 80017E8 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -711,7 +711,7 @@ bg_vram_setup: @ 80017E8 bl gpu_set_bg_mode bl gpu_reset_bg_configs cmp r4, 0 - beq _08001894 + beq @08001894 movs r7, 0 ldr r0, =0x030008f8 mov r9, r0 @@ -720,12 +720,12 @@ bg_vram_setup: @ 80017E8 mov r10, r2 adds r6, r5, 0 mov r8, r4 -_0800181A: +@0800181A: ldr r4, [r6] lsls r0, r4, 30 lsrs r5, r0, 30 cmp r5, 0x3 - bhi _08001886 + bhi @08001886 lsls r1, r4, 28 lsrs r1, 30 lsls r2, r4, 23 @@ -774,15 +774,15 @@ _0800181A: str r7, [r0] add r4, r10 str r7, [r4] -_08001886: +@08001886: adds r6, 0x4 movs r5, 0x1 negs r5, r5 add r8, r5 mov r0, r8 cmp r0, 0 - bne _0800181A -_08001894: + bne @0800181A +@08001894: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -796,8 +796,8 @@ _08001894: thumb_func_end bg_vram_setup thumb_func_start bg_init_bg_config_2_from_bg_config_3 -@ void bg_init_bg_config_2_from_bg_config_3(struct bg_config_3 *bg) -bg_init_bg_config_2_from_bg_config_3: @ 80018B0 +; void bg_init_bg_config_2_from_bg_config_3(struct bg_config_3 *bg) +bg_init_bg_config_2_from_bg_config_3: ; 80018B0 push {r4-r7,lr} sub sp, 0x10 adds r7, r0, 0 @@ -805,7 +805,7 @@ bg_init_bg_config_2_from_bg_config_3: @ 80018B0 lsls r0, r4, 30 lsrs r5, r0, 30 cmp r5, 0x3 - bhi _08001920 + bhi @08001920 lsls r1, r4, 28 lsrs r1, 30 lsls r2, r4, 23 @@ -853,7 +853,7 @@ bg_init_bg_config_2_from_bg_config_3: @ 80018B0 adds r4, 0xC adds r5, r4 str r6, [r5] -_08001920: +@08001920: add sp, 0x10 pop {r4-r7} pop {r0} @@ -863,8 +863,8 @@ _08001920: thumb_func_end bg_init_bg_config_2_from_bg_config_3 thumb_func_start call_gpu_set_bg_mode -@ void call_gpu_set_bg_mode(u8 bg_id) -call_gpu_set_bg_mode: @ 8001934 +; void call_gpu_set_bg_mode(u8 bg_id) +call_gpu_set_bg_mode: ; 8001934 push {lr} lsls r0, 24 lsrs r0, 24 @@ -874,8 +874,8 @@ call_gpu_set_bg_mode: @ 8001934 thumb_func_end call_gpu_set_bg_mode thumb_func_start gpu_copy_bg_tile_pattern_data_to_vram -@ s16 gpu_copy_bg_tile_pattern_data_to_vram(u8 bg_id, int src, u16 size, u16 offset) -gpu_copy_bg_tile_pattern_data_to_vram: @ 8001944 +; s16 gpu_copy_bg_tile_pattern_data_to_vram(u8 bg_id, int src, u16 size, u16 offset) +gpu_copy_bg_tile_pattern_data_to_vram: ; 8001944 push {r4-r7,lr} mov r7, r8 push {r7} @@ -893,7 +893,7 @@ gpu_copy_bg_tile_pattern_data_to_vram: @ 8001944 bl gpu_bg_config_get_field lsls r0, 16 cmp r0, 0 - bne _08001980 + bne @08001980 ldr r1, =0x030008f8 lsls r0, r5, 4 adds r0, r1 @@ -902,10 +902,10 @@ gpu_copy_bg_tile_pattern_data_to_vram: @ 8001944 lsrs r0, 22 adds r0, r4 lsls r0, 21 - b _08001990 + b @08001990 .align 2, 0 .pool -_08001980: +@08001980: ldr r1, =0x030008f8 lsls r0, r5, 4 adds r0, r1 @@ -914,7 +914,7 @@ _08001980: lsrs r0, 22 adds r0, r4 lsls r0, 22 -_08001990: +@08001990: lsrs r4, r0, 16 movs r6, 0x1 str r6, [sp] @@ -927,12 +927,12 @@ _08001990: lsrs r1, r2, 24 adds r7, r1, 0 cmp r1, 0xFF - bne _080019B8 + bne @080019B8 ldr r0, =0x0000ffff - b _080019E6 + b @080019E6 .align 2, 0 .pool -_080019B8: +@080019B8: ldr r0, =0x03000938 lsrs r2, 29 lsls r2, 2 @@ -947,16 +947,16 @@ _080019B8: ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 - bne _080019E4 + bne @080019E4 lsrs r1, r4, 5 mov r0, r8 lsrs r2, r0, 5 adds r0, r5, 0 movs r3, 0x1 bl do_nothing -_080019E4: +@080019E4: adds r0, r7, 0 -_080019E6: +@080019E6: add sp, 0x4 pop {r3} mov r8, r3 @@ -968,7 +968,7 @@ _080019E6: thumb_func_end gpu_copy_bg_tile_pattern_data_to_vram thumb_func_start gpu_copy_bg_tile_map_to_vram -gpu_copy_bg_tile_map_to_vram: @ 80019FC +gpu_copy_bg_tile_map_to_vram: ; 80019FC push {r4,lr} sub sp, 0x4 lsls r0, 24 @@ -983,7 +983,7 @@ gpu_copy_bg_tile_map_to_vram: @ 80019FC lsls r2, r0, 24 lsrs r3, r2, 24 cmp r3, 0xFF - beq _08001A3C + beq @08001A3C ldr r0, =0x03000938 lsrs r2, 29 lsls r2, 2 @@ -996,12 +996,12 @@ gpu_copy_bg_tile_map_to_vram: @ 80019FC orrs r0, r1 str r0, [r2] adds r0, r3, 0 - b _08001A3E + b @08001A3E .align 2, 0 .pool -_08001A3C: +@08001A3C: ldr r0, =0x0000ffff -_08001A3E: +@08001A3E: add sp, 0x4 pop {r4} pop {r1} @@ -1011,7 +1011,7 @@ _08001A3E: thumb_func_end gpu_copy_bg_tile_map_to_vram thumb_func_start unused_copy_palette -unused_copy_palette: @ 8001A4C +unused_copy_palette: ; 8001A4C push {r4-r7,lr} adds r7, r1, 0 lsls r0, 24 @@ -1023,7 +1023,7 @@ unused_copy_palette: @ 8001A4C adds r0, r4, 0 bl is_invalid_bg_id_2 cmp r0, 0 - bne _08001A98 + bne @08001A98 ldr r1, =0x030008f8 lsls r0, r4, 4 adds r0, r1 @@ -1047,19 +1047,19 @@ unused_copy_palette: @ 8001A4C movs r0, 0x1 negs r0, r0 cmp r1, r0 - bne _08001AA4 -_08001A98: + bne @08001AA4 +@08001A98: ldr r0, =0x0000ffff - b _08001AC8 + b @08001AC8 .align 2, 0 .pool -_08001AA4: +@08001AA4: ldr r4, =0x03000938 adds r0, r1, 0 cmp r1, 0 - bge _08001AAE + bge @08001AAE adds r0, 0x1F -_08001AAE: +@08001AAE: asrs r0, 5 lsls r2, r0, 2 adds r2, r4 @@ -1073,7 +1073,7 @@ _08001AAE: orrs r0, r1 str r0, [r2] lsrs r0, r3, 24 -_08001AC8: +@08001AC8: pop {r4-r7} pop {r1} bx r1 @@ -1082,18 +1082,18 @@ _08001AC8: thumb_func_end unused_copy_palette thumb_func_start is_dma3_queue_busy_with_gpu_copy -@ int is_dma3_queue_busy_with_gpu_copy() -is_dma3_queue_busy_with_gpu_copy: @ 8001AD4 +; int is_dma3_queue_busy_with_gpu_copy() +is_dma3_queue_busy_with_gpu_copy: ; 8001AD4 push {r4-r7,lr} movs r5, 0 movs r7, 0x1 negs r7, r7 -_08001ADC: +@08001ADC: adds r0, r5, 0 cmp r5, 0 - bge _08001AE4 + bge @08001AE4 adds r0, 0x1F -_08001AE4: +@08001AE4: asrs r0, 5 lsls r2, r0, 24 lsls r0, 5 @@ -1108,36 +1108,36 @@ _08001AE4: ldr r0, [r4] ands r0, r6 cmp r0, 0 - beq _08001B22 + beq @08001B22 lsls r0, r5, 16 asrs r0, 16 bl CheckForSpaceForDma3Request lsls r0, 24 asrs r0, 24 cmp r0, r7 - bne _08001B1C + bne @08001B1C movs r0, 0x1 - b _08001B2A + b @08001B2A .align 2, 0 .pool -_08001B1C: +@08001B1C: ldr r0, [r4] bics r0, r6 str r0, [r4] -_08001B22: +@08001B22: adds r5, 0x1 cmp r5, 0x7F - ble _08001ADC + ble @08001ADC movs r0, 0 -_08001B2A: +@08001B2A: pop {r4-r7} pop {r1} bx r1 thumb_func_end is_dma3_queue_busy_with_gpu_copy thumb_func_start gpu_sync_bg_show -@ void gpu_sync_bg_show(u8 bg_id) -gpu_sync_bg_show: @ 8001B30 +; void gpu_sync_bg_show(u8 bg_id) +gpu_sync_bg_show: ; 8001B30 push {lr} lsls r0, 24 lsrs r0, 24 @@ -1148,8 +1148,8 @@ gpu_sync_bg_show: @ 8001B30 thumb_func_end gpu_sync_bg_show thumb_func_start gpu_sync_bg_hide -@ void gpu_sync_bg_hide(u8 bg_id) -gpu_sync_bg_hide: @ 8001B44 +; void gpu_sync_bg_hide(u8 bg_id) +gpu_sync_bg_hide: ; 8001B44 push {lr} lsls r0, 24 lsrs r0, 24 @@ -1160,8 +1160,8 @@ gpu_sync_bg_hide: @ 8001B44 thumb_func_end gpu_sync_bg_hide thumb_func_start gpu_bg_config_set_field -@ int gpu_bg_config_set_field(u8 bg_id, bg_config_get_field field_id, u8 value) -gpu_bg_config_set_field: @ 8001B58 +; int gpu_bg_config_set_field(u8 bg_id, bg_config_get_field field_id, u8 value) +gpu_bg_config_set_field: ; 8001B58 push {r4,lr} sub sp, 0x10 lsls r0, 24 @@ -1172,24 +1172,24 @@ gpu_bg_config_set_field: @ 8001B58 lsrs r3, r2, 24 subs r0, r1, 0x1 cmp r0, 0x6 - bhi _08001C12 + bhi @08001C12 lsls r0, 2 - ldr r1, =_08001B7C + ldr r1, =@08001B7C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08001B7C: - .4byte _08001B98 - .4byte _08001BA8 - .4byte _08001BBA - .4byte _08001BD0 - .4byte _08001BE4 - .4byte _08001BFC - .4byte _08001BDA -_08001B98: +@08001B7C: + .4byte @08001B98 + .4byte @08001BA8 + .4byte @08001BBA + .4byte @08001BD0 + .4byte @08001BE4 + .4byte @08001BFC + .4byte @08001BDA +@08001B98: movs r0, 0xFF str r0, [sp] str r0, [sp, 0x4] @@ -1197,8 +1197,8 @@ _08001B98: str r0, [sp, 0xC] adds r0, r4, 0 adds r1, r3, 0 - b _08001BF2 -_08001BA8: + b @08001BF2 +@08001BA8: movs r0, 0xFF str r0, [sp] str r0, [sp, 0x4] @@ -1207,8 +1207,8 @@ _08001BA8: adds r0, r4, 0 movs r1, 0xFF adds r2, r3, 0 - b _08001BF4 -_08001BBA: + b @08001BF4 +@08001BBA: movs r0, 0xFF str r0, [sp] str r0, [sp, 0x4] @@ -1218,35 +1218,35 @@ _08001BBA: movs r1, 0xFF movs r2, 0xFF bl gpu_bg_config_set_fields - b _08001C12 -_08001BD0: + b @08001C12 +@08001BD0: str r3, [sp] movs r0, 0xFF str r0, [sp, 0x4] str r0, [sp, 0x8] - b _08001BEC -_08001BDA: + b @08001BEC +@08001BDA: movs r0, 0xFF str r0, [sp] str r3, [sp, 0x4] str r0, [sp, 0x8] - b _08001BEC -_08001BE4: + b @08001BEC +@08001BE4: movs r0, 0xFF str r0, [sp] str r0, [sp, 0x4] str r3, [sp, 0x8] -_08001BEC: +@08001BEC: str r0, [sp, 0xC] adds r0, r4, 0 movs r1, 0xFF -_08001BF2: +@08001BF2: movs r2, 0xFF -_08001BF4: +@08001BF4: movs r3, 0xFF bl gpu_bg_config_set_fields - b _08001C12 -_08001BFC: + b @08001C12 +@08001BFC: movs r0, 0xFF str r0, [sp] str r0, [sp, 0x4] @@ -1257,7 +1257,7 @@ _08001BFC: movs r2, 0xFF movs r3, 0xFF bl gpu_bg_config_set_fields -_08001C12: +@08001C12: add sp, 0x10 pop {r4} pop {r0} @@ -1265,7 +1265,7 @@ _08001C12: thumb_func_end gpu_bg_config_set_field thumb_func_start bg_get_field -bg_get_field: @ 8001C1C +bg_get_field: ; 8001C1C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -1273,104 +1273,104 @@ bg_get_field: @ 8001C1C lsrs r1, 24 subs r0, r1, 0x1 cmp r0, 0x9 - bhi _08001CF8 + bhi @08001CF8 lsls r0, 2 - ldr r1, =_08001C3C + ldr r1, =@08001C3C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08001C3C: - .4byte _08001C64 - .4byte _08001C6E - .4byte _08001C78 - .4byte _08001C82 - .4byte _08001C96 - .4byte _08001CA0 - .4byte _08001C8C - .4byte _08001CAA - .4byte _08001CD8 - .4byte _08001CE4 -_08001C64: +@08001C3C: + .4byte @08001C64 + .4byte @08001C6E + .4byte @08001C78 + .4byte @08001C82 + .4byte @08001C96 + .4byte @08001CA0 + .4byte @08001C8C + .4byte @08001CAA + .4byte @08001CD8 + .4byte @08001CE4 +@08001C64: adds r0, r4, 0 movs r1, 0x2 bl gpu_bg_config_get_field - b _08001CDE -_08001C6E: + b @08001CDE +@08001C6E: adds r0, r4, 0 movs r1, 0x3 bl gpu_bg_config_get_field - b _08001CDE -_08001C78: + b @08001CDE +@08001C78: adds r0, r4, 0 movs r1, 0x4 bl gpu_bg_config_get_field - b _08001CDE -_08001C82: + b @08001CDE +@08001C82: adds r0, r4, 0 movs r1, 0x5 bl gpu_bg_config_get_field - b _08001CDE -_08001C8C: + b @08001CDE +@08001C8C: adds r0, r4, 0 movs r1, 0x6 bl gpu_bg_config_get_field - b _08001CDE -_08001C96: + b @08001CDE +@08001C96: adds r0, r4, 0 movs r1, 0x7 bl gpu_bg_config_get_field - b _08001CDE -_08001CA0: + b @08001CDE +@08001CA0: adds r0, r4, 0 movs r1, 0x8 bl gpu_bg_config_get_field - b _08001CDE -_08001CAA: + b @08001CDE +@08001CAA: adds r0, r4, 0 bl bg_get_type_by_bg_id cmp r0, 0 - beq _08001CBC + beq @08001CBC cmp r0, 0x1 - beq _08001CCA + beq @08001CCA movs r0, 0 - b _08001CFA -_08001CBC: + b @08001CFA +@08001CBC: adds r0, r4, 0 movs r1, 0 bl bg_get_screen_size_in_regular_mode lsls r0, 27 lsrs r0, 16 - b _08001CFA -_08001CCA: + b @08001CFA +@08001CCA: adds r0, r4, 0 movs r1, 0 bl bg_get_screen_size_in_affine_mode lsls r0, 24 lsrs r0, 16 - b _08001CFA -_08001CD8: + b @08001CFA +@08001CD8: adds r0, r4, 0 bl bg_get_type_by_bg_id -_08001CDE: +@08001CDE: lsls r0, 16 lsrs r0, 16 - b _08001CFA -_08001CE4: + b @08001CFA +@08001CE4: ldr r0, =0x030008f8 lsls r1, r4, 4 adds r1, r0 ldrh r0, [r1] lsls r0, 22 lsrs r0, 22 - b _08001CFA + b @08001CFA .align 2, 0 .pool -_08001CF8: +@08001CF8: ldr r0, =0x0000ffff -_08001CFA: +@08001CFA: pop {r4} pop {r1} bx r1 @@ -1379,8 +1379,8 @@ _08001CFA: thumb_func_end bg_get_field thumb_func_start bg_change_x_offset -@ int bg_change_x_offset(u8 bg_id, int offset, u8 operation) -bg_change_x_offset: @ 8001D04 +; int bg_change_x_offset(u8 bg_id, int offset, u8 operation) +bg_change_x_offset: ; 8001D04 push {r4-r6,lr} adds r6, r1, 0 lsls r0, 24 @@ -1390,106 +1390,106 @@ bg_change_x_offset: @ 8001D04 adds r0, r4, 0 bl is_invalid_bg_id_2 cmp r0, 0 - bne _08001D28 + bne @08001D28 adds r0, r4, 0 movs r1, 0x1 bl gpu_bg_config_get_field lsls r0, 16 cmp r0, 0 - bne _08001D2E -_08001D28: + bne @08001D2E +@08001D28: movs r0, 0x1 negs r0, r0 - b _08001E34 -_08001D2E: + b @08001E34 +@08001D2E: cmp r5, 0x1 - beq _08001D4C + beq @08001D4C cmp r5, 0x1 - ble _08001D3A + ble @08001D3A cmp r5, 0x2 - beq _08001D60 -_08001D3A: + beq @08001D60 +@08001D3A: ldr r0, =0x030008f8 lsls r1, r4, 4 adds r0, 0x8 adds r0, r1, r0 str r6, [r0] adds r5, r1, 0 - b _08001D70 + b @08001D70 .align 2, 0 .pool -_08001D4C: +@08001D4C: ldr r0, =0x030008f8 lsls r2, r4, 4 adds r0, 0x8 adds r0, r2, r0 ldr r1, [r0] adds r1, r6 - b _08001D6C + b @08001D6C .align 2, 0 .pool -_08001D60: +@08001D60: ldr r0, =0x030008f8 lsls r2, r4, 4 adds r0, 0x8 adds r0, r2, r0 ldr r1, [r0] subs r1, r6 -_08001D6C: +@08001D6C: str r1, [r0] adds r5, r2, 0 -_08001D70: +@08001D70: bl gpu_get_bg_mode lsls r0, 24 lsrs r0, 24 cmp r4, 0x1 - beq _08001DAC + beq @08001DAC cmp r4, 0x1 - bgt _08001D8C + bgt @08001D8C cmp r4, 0 - beq _08001D96 - b _08001E2C + beq @08001D96 + b @08001E2C .align 2, 0 .pool -_08001D8C: +@08001D8C: cmp r4, 0x2 - beq _08001DC0 + beq @08001DC0 cmp r4, 0x3 - beq _08001DF8 - b _08001E2C -_08001D96: + beq @08001DF8 + b @08001E2C +@08001D96: ldr r0, =0x030008f8 ldr r0, [r0, 0x8] lsls r0, 8 lsrs r1, r0, 16 movs r0, 0x10 bl lcd_io_set - b _08001E2C + b @08001E2C .align 2, 0 .pool -_08001DAC: +@08001DAC: ldr r0, =0x030008f8 ldr r0, [r0, 0x18] lsls r0, 8 lsrs r1, r0, 16 movs r0, 0x14 bl lcd_io_set - b _08001E2C + b @08001E2C .align 2, 0 .pool -_08001DC0: +@08001DC0: cmp r0, 0 - bne _08001DD8 + bne @08001DD8 ldr r0, =0x030008f8 ldr r0, [r0, 0x28] lsls r0, 8 lsrs r1, r0, 16 movs r0, 0x18 bl lcd_io_set - b _08001E2C + b @08001E2C .align 2, 0 .pool -_08001DD8: +@08001DD8: ldr r0, =0x030008f8 ldr r0, [r0, 0x28] lsrs r1, r0, 16 @@ -1500,24 +1500,24 @@ _08001DD8: movs r0, 0x28 adds r1, r4, 0 bl lcd_io_set - b _08001E2C + b @08001E2C .align 2, 0 .pool -_08001DF8: +@08001DF8: cmp r0, 0 - bne _08001E10 + bne @08001E10 ldr r0, =0x030008f8 ldr r0, [r0, 0x38] lsls r0, 8 lsrs r1, r0, 16 movs r0, 0x1C bl lcd_io_set - b _08001E2C + b @08001E2C .align 2, 0 .pool -_08001E10: +@08001E10: cmp r0, 0x2 - bne _08001E2C + bne @08001E2C ldr r0, =0x030008f8 ldr r0, [r0, 0x38] lsrs r1, r0, 16 @@ -1528,12 +1528,12 @@ _08001E10: movs r0, 0x38 adds r1, r4, 0 bl lcd_io_set -_08001E2C: +@08001E2C: ldr r0, =0x030008f8 adds r0, 0x8 adds r0, r5, r0 ldr r0, [r0] -_08001E34: +@08001E34: pop {r4-r6} pop {r1} bx r1 @@ -1542,41 +1542,41 @@ _08001E34: thumb_func_end bg_change_x_offset thumb_func_start bg_get_x_offset -@ int bg_get_x_offset(u8 bg_id) -bg_get_x_offset: @ 8001E40 +; int bg_get_x_offset(u8 bg_id) +bg_get_x_offset: ; 8001E40 push {r4,lr} lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 bl is_invalid_bg_id_2 cmp r0, 0 - bne _08001E70 + bne @08001E70 adds r0, r4, 0 movs r1, 0x1 bl gpu_bg_config_get_field lsls r0, 16 cmp r0, 0 - beq _08001E70 + beq @08001E70 ldr r0, =0x030008f8 lsls r1, r4, 4 adds r0, 0x8 adds r1, r0 ldr r0, [r1] - b _08001E74 + b @08001E74 .align 2, 0 .pool -_08001E70: +@08001E70: movs r0, 0x1 negs r0, r0 -_08001E74: +@08001E74: pop {r4} pop {r1} bx r1 thumb_func_end bg_get_x_offset thumb_func_start bg_change_y_offset -@ int bg_change_y_offset(u8 bg_id, int offset, u8 operation) -bg_change_y_offset: @ 8001E7C +; int bg_change_y_offset(u8 bg_id, int offset, u8 operation) +bg_change_y_offset: ; 8001E7C push {r4-r6,lr} adds r6, r1, 0 lsls r0, 24 @@ -1586,106 +1586,106 @@ bg_change_y_offset: @ 8001E7C adds r0, r4, 0 bl is_invalid_bg_id_2 cmp r0, 0 - bne _08001EA0 + bne @08001EA0 adds r0, r4, 0 movs r1, 0x1 bl gpu_bg_config_get_field lsls r0, 16 cmp r0, 0 - bne _08001EA6 -_08001EA0: + bne @08001EA6 +@08001EA0: movs r0, 0x1 negs r0, r0 - b _08001FAC -_08001EA6: + b @08001FAC +@08001EA6: cmp r5, 0x1 - beq _08001EC4 + beq @08001EC4 cmp r5, 0x1 - ble _08001EB2 + ble @08001EB2 cmp r5, 0x2 - beq _08001ED8 -_08001EB2: + beq @08001ED8 +@08001EB2: ldr r0, =0x030008f8 lsls r1, r4, 4 adds r0, 0xC adds r0, r1, r0 str r6, [r0] adds r5, r1, 0 - b _08001EE8 + b @08001EE8 .align 2, 0 .pool -_08001EC4: +@08001EC4: ldr r0, =0x030008f8 lsls r2, r4, 4 adds r0, 0xC adds r0, r2, r0 ldr r1, [r0] adds r1, r6 - b _08001EE4 + b @08001EE4 .align 2, 0 .pool -_08001ED8: +@08001ED8: ldr r0, =0x030008f8 lsls r2, r4, 4 adds r0, 0xC adds r0, r2, r0 ldr r1, [r0] subs r1, r6 -_08001EE4: +@08001EE4: str r1, [r0] adds r5, r2, 0 -_08001EE8: +@08001EE8: bl gpu_get_bg_mode lsls r0, 24 lsrs r0, 24 cmp r4, 0x1 - beq _08001F24 + beq @08001F24 cmp r4, 0x1 - bgt _08001F04 + bgt @08001F04 cmp r4, 0 - beq _08001F0E - b _08001FA4 + beq @08001F0E + b @08001FA4 .align 2, 0 .pool -_08001F04: +@08001F04: cmp r4, 0x2 - beq _08001F38 + beq @08001F38 cmp r4, 0x3 - beq _08001F70 - b _08001FA4 -_08001F0E: + beq @08001F70 + b @08001FA4 +@08001F0E: ldr r0, =0x030008f8 ldr r0, [r0, 0xC] lsls r0, 8 lsrs r1, r0, 16 movs r0, 0x12 bl lcd_io_set - b _08001FA4 + b @08001FA4 .align 2, 0 .pool -_08001F24: +@08001F24: ldr r0, =0x030008f8 ldr r0, [r0, 0x1C] lsls r0, 8 lsrs r1, r0, 16 movs r0, 0x16 bl lcd_io_set - b _08001FA4 + b @08001FA4 .align 2, 0 .pool -_08001F38: +@08001F38: cmp r0, 0 - bne _08001F50 + bne @08001F50 ldr r0, =0x030008f8 ldr r0, [r0, 0x2C] lsls r0, 8 lsrs r1, r0, 16 movs r0, 0x1A bl lcd_io_set - b _08001FA4 + b @08001FA4 .align 2, 0 .pool -_08001F50: +@08001F50: ldr r0, =0x030008f8 ldr r0, [r0, 0x2C] lsrs r1, r0, 16 @@ -1696,24 +1696,24 @@ _08001F50: movs r0, 0x2C adds r1, r4, 0 bl lcd_io_set - b _08001FA4 + b @08001FA4 .align 2, 0 .pool -_08001F70: +@08001F70: cmp r0, 0 - bne _08001F88 + bne @08001F88 ldr r0, =0x030008f8 ldr r0, [r0, 0x3C] lsls r0, 8 lsrs r1, r0, 16 movs r0, 0x1E bl lcd_io_set - b _08001FA4 + b @08001FA4 .align 2, 0 .pool -_08001F88: +@08001F88: cmp r0, 0x2 - bne _08001FA4 + bne @08001FA4 ldr r0, =0x030008f8 ldr r0, [r0, 0x3C] lsrs r1, r0, 16 @@ -1724,12 +1724,12 @@ _08001F88: movs r0, 0x3C adds r1, r4, 0 bl lcd_io_set -_08001FA4: +@08001FA4: ldr r0, =0x030008f8 adds r0, 0xC adds r0, r5, r0 ldr r0, [r0] -_08001FAC: +@08001FAC: pop {r4-r6} pop {r1} bx r1 @@ -1738,8 +1738,8 @@ _08001FAC: thumb_func_end bg_change_y_offset thumb_func_start bg_change_y_offset_to_copy_queue -@ int bg_change_y_offset_to_copy_queue(u8 bg_id, int a2, u8 a3) -bg_change_y_offset_to_copy_queue: @ 8001FB8 +; int bg_change_y_offset_to_copy_queue(u8 bg_id, int a2, u8 a3) +bg_change_y_offset_to_copy_queue: ; 8001FB8 push {r4-r6,lr} adds r6, r1, 0 lsls r0, 24 @@ -1749,106 +1749,106 @@ bg_change_y_offset_to_copy_queue: @ 8001FB8 adds r0, r4, 0 bl is_invalid_bg_id_2 cmp r0, 0 - bne _08001FDC + bne @08001FDC adds r0, r4, 0 movs r1, 0x1 bl gpu_bg_config_get_field lsls r0, 16 cmp r0, 0 - bne _08001FE2 -_08001FDC: + bne @08001FE2 +@08001FDC: movs r0, 0x1 negs r0, r0 - b _080020E8 -_08001FE2: + b @080020E8 +@08001FE2: cmp r5, 0x1 - beq _08002000 + beq @08002000 cmp r5, 0x1 - ble _08001FEE + ble @08001FEE cmp r5, 0x2 - beq _08002014 -_08001FEE: + beq @08002014 +@08001FEE: ldr r0, =0x030008f8 lsls r1, r4, 4 adds r0, 0xC adds r0, r1, r0 str r6, [r0] adds r5, r1, 0 - b _08002024 + b @08002024 .align 2, 0 .pool -_08002000: +@08002000: ldr r0, =0x030008f8 lsls r2, r4, 4 adds r0, 0xC adds r0, r2, r0 ldr r1, [r0] adds r1, r6 - b _08002020 + b @08002020 .align 2, 0 .pool -_08002014: +@08002014: ldr r0, =0x030008f8 lsls r2, r4, 4 adds r0, 0xC adds r0, r2, r0 ldr r1, [r0] subs r1, r6 -_08002020: +@08002020: str r1, [r0] adds r5, r2, 0 -_08002024: +@08002024: bl gpu_get_bg_mode lsls r0, 24 lsrs r0, 24 cmp r4, 0x1 - beq _08002060 + beq @08002060 cmp r4, 0x1 - bgt _08002040 + bgt @08002040 cmp r4, 0 - beq _0800204A - b _080020E0 + beq @0800204A + b @080020E0 .align 2, 0 .pool -_08002040: +@08002040: cmp r4, 0x2 - beq _08002074 + beq @08002074 cmp r4, 0x3 - beq _080020AC - b _080020E0 -_0800204A: + beq @080020AC + b @080020E0 +@0800204A: ldr r0, =0x030008f8 ldr r0, [r0, 0xC] lsls r0, 8 lsrs r1, r0, 16 movs r0, 0x12 bl lcd_io_set_forced_blank - b _080020E0 + b @080020E0 .align 2, 0 .pool -_08002060: +@08002060: ldr r0, =0x030008f8 ldr r0, [r0, 0x1C] lsls r0, 8 lsrs r1, r0, 16 movs r0, 0x16 bl lcd_io_set_forced_blank - b _080020E0 + b @080020E0 .align 2, 0 .pool -_08002074: +@08002074: cmp r0, 0 - bne _0800208C + bne @0800208C ldr r0, =0x030008f8 ldr r0, [r0, 0x2C] lsls r0, 8 lsrs r1, r0, 16 movs r0, 0x1A bl lcd_io_set_forced_blank - b _080020E0 + b @080020E0 .align 2, 0 .pool -_0800208C: +@0800208C: ldr r0, =0x030008f8 ldr r0, [r0, 0x2C] lsrs r1, r0, 16 @@ -1859,24 +1859,24 @@ _0800208C: movs r0, 0x2C adds r1, r4, 0 bl lcd_io_set_forced_blank - b _080020E0 + b @080020E0 .align 2, 0 .pool -_080020AC: +@080020AC: cmp r0, 0 - bne _080020C4 + bne @080020C4 ldr r0, =0x030008f8 ldr r0, [r0, 0x3C] lsls r0, 8 lsrs r1, r0, 16 movs r0, 0x1E bl lcd_io_set_forced_blank - b _080020E0 + b @080020E0 .align 2, 0 .pool -_080020C4: +@080020C4: cmp r0, 0x2 - bne _080020E0 + bne @080020E0 ldr r0, =0x030008f8 ldr r0, [r0, 0x3C] lsrs r1, r0, 16 @@ -1887,12 +1887,12 @@ _080020C4: movs r0, 0x3C adds r1, r4, 0 bl lcd_io_set_forced_blank -_080020E0: +@080020E0: ldr r0, =0x030008f8 adds r0, 0xC adds r0, r5, r0 ldr r0, [r0] -_080020E8: +@080020E8: pop {r4-r6} pop {r1} bx r1 @@ -1901,41 +1901,41 @@ _080020E8: thumb_func_end bg_change_y_offset_to_copy_queue thumb_func_start bg_get_y_offset -@ int bg_get_y_offset(u8 bg_id) -bg_get_y_offset: @ 80020F4 +; int bg_get_y_offset(u8 bg_id) +bg_get_y_offset: ; 80020F4 push {r4,lr} lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 bl is_invalid_bg_id_2 cmp r0, 0 - bne _08002124 + bne @08002124 adds r0, r4, 0 movs r1, 0x1 bl gpu_bg_config_get_field lsls r0, 16 cmp r0, 0 - beq _08002124 + beq @08002124 ldr r0, =0x030008f8 lsls r1, r4, 4 adds r0, 0xC adds r1, r0 ldr r0, [r1] - b _08002128 + b @08002128 .align 2, 0 .pool -_08002124: +@08002124: movs r0, 0x1 negs r0, r0 -_08002128: +@08002128: pop {r4} pop {r1} bx r1 thumb_func_end bg_get_y_offset thumb_func_start call_gpu_bg_affine_set -@ void call_gpu_bg_affine_set(u8 a1, int a2, int a3, u16 a4, s16 a5, s16 a6, s16 a7, s16 a8) -call_gpu_bg_affine_set: @ 8002130 +; void call_gpu_bg_affine_set(u8 a1, int a2, int a3, u16 a4, s16 a5, s16 a6, s16 a7, s16 a8) +call_gpu_bg_affine_set: ; 8002130 push {r4-r7,lr} mov r7, r8 push {r7} @@ -1970,7 +1970,7 @@ call_gpu_bg_affine_set: @ 8002130 thumb_func_end call_gpu_bg_affine_set thumb_func_start mosaic_something -mosaic_something: @ 8002170 +mosaic_something: ; 8002170 push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -1989,86 +1989,86 @@ mosaic_something: @ 8002170 lsls r0, 8 ands r5, r0 cmp r6, 0x6 - bhi _080021C4 + bhi @080021C4 lsls r0, r6, 2 - ldr r1, =_080021A8 + ldr r1, =@080021A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080021A8: - .4byte _080021C4 - .4byte _080021CC - .4byte _080021D2 - .4byte _080021E4 - .4byte _080021FA - .4byte _08002200 - .4byte _08002212 -_080021C4: +@080021A8: + .4byte @080021C4 + .4byte @080021CC + .4byte @080021D2 + .4byte @080021E4 + .4byte @080021FA + .4byte @08002200 + .4byte @08002212 +@080021C4: movs r3, 0xF ands r3, r4 lsrs r2, r4, 4 - b _08002226 -_080021CC: + b @08002226 +@080021CC: movs r3, 0xF ands r3, r4 - b _08002226 -_080021D2: + b @08002226 +@080021D2: lsls r0, r3, 16 asrs r0, 16 adds r0, r4 cmp r0, 0xF - ble _080021E0 + ble @080021E0 movs r3, 0xF - b _08002226 -_080021E0: + b @08002226 +@080021E0: adds r0, r3, r4 - b _080021F4 -_080021E4: + b @080021F4 +@080021E4: lsls r0, r3, 16 asrs r0, 16 subs r0, r4 cmp r0, 0 - bge _080021F2 + bge @080021F2 movs r3, 0 - b _08002226 -_080021F2: + b @08002226 +@080021F2: subs r0, r3, r4 -_080021F4: +@080021F4: lsls r0, 16 lsrs r3, r0, 16 - b _08002226 -_080021FA: + b @08002226 +@080021FA: movs r2, 0xF ands r2, r4 - b _08002226 -_08002200: + b @08002226 +@08002200: lsls r0, r2, 16 asrs r0, 16 adds r0, r4 cmp r0, 0xF - ble _0800220E + ble @0800220E movs r2, 0xF - b _08002226 -_0800220E: + b @08002226 +@0800220E: adds r0, r2, r4 - b _08002222 -_08002212: + b @08002222 +@08002212: lsls r0, r2, 16 asrs r0, 16 subs r0, r4 cmp r0, 0 - bge _08002220 + bge @08002220 movs r2, 0 - b _08002226 -_08002220: + b @08002226 +@08002220: subs r0, r2, r4 -_08002222: +@08002222: lsls r0, 16 lsrs r2, r0, 16 -_08002226: +@08002226: lsls r0, r2, 16 asrs r0, 12 movs r1, 0xF0 @@ -2092,8 +2092,8 @@ _08002226: thumb_func_end mosaic_something thumb_func_start bg_set_tilemap -@ void bg_set_tilemap(u8 bg_id, int tilemap) -bg_set_tilemap: @ 8002250 +; void bg_set_tilemap(u8 bg_id, int tilemap) +bg_set_tilemap: ; 8002250 push {r4,r5,lr} adds r5, r1, 0 lsls r0, 24 @@ -2101,19 +2101,19 @@ bg_set_tilemap: @ 8002250 adds r0, r4, 0 bl is_invalid_bg_id_2 cmp r0, 0 - bne _0800227A + bne @0800227A adds r0, r4, 0 movs r1, 0x1 bl gpu_bg_config_get_field lsls r0, 16 cmp r0, 0 - beq _0800227A + beq @0800227A ldr r0, =0x030008f8 lsls r1, r4, 4 adds r0, 0x4 adds r1, r0 str r5, [r1] -_0800227A: +@0800227A: pop {r4,r5} pop {r0} bx r0 @@ -2122,8 +2122,8 @@ _0800227A: thumb_func_end bg_set_tilemap thumb_func_start bg_unset_tilemap -@ void bg_unset_tilemap(u8 bg_id) -bg_unset_tilemap: @ 8002284 +; void bg_unset_tilemap(u8 bg_id) +bg_unset_tilemap: ; 8002284 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -2131,19 +2131,19 @@ bg_unset_tilemap: @ 8002284 bl is_invalid_bg_id_2 adds r5, r0, 0 cmp r5, 0 - bne _080022AE + bne @080022AE adds r0, r4, 0 movs r1, 0x1 bl gpu_bg_config_get_field lsls r0, 16 cmp r0, 0 - beq _080022AE + beq @080022AE ldr r0, =0x030008f8 lsls r1, r4, 4 adds r0, 0x4 adds r1, r0 str r5, [r1] -_080022AE: +@080022AE: pop {r4,r5} pop {r0} bx r0 @@ -2152,40 +2152,40 @@ _080022AE: thumb_func_end bg_unset_tilemap thumb_func_start bg_get_tilemap -@ int bg_get_tilemap(u8 bg_id) -bg_get_tilemap: @ 80022B8 +; int bg_get_tilemap(u8 bg_id) +bg_get_tilemap: ; 80022B8 push {r4,lr} lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 bl is_invalid_bg_id_2 cmp r0, 0 - bne _080022E8 + bne @080022E8 adds r0, r4, 0 movs r1, 0x1 bl gpu_bg_config_get_field lsls r0, 16 cmp r0, 0 - beq _080022E8 + beq @080022E8 ldr r0, =0x030008f8 lsls r1, r4, 4 adds r0, 0x4 adds r1, r0 ldr r0, [r1] - b _080022EA + b @080022EA .align 2, 0 .pool -_080022E8: +@080022E8: movs r0, 0 -_080022EA: +@080022EA: pop {r4} pop {r1} bx r1 thumb_func_end bg_get_tilemap thumb_func_start gpu_copy_to_wram_bg_tile_map -@ void gpu_copy_to_wram_bg_tile_map(u8 bg_id, void *src, int mode, int dest_offset) -gpu_copy_to_wram_bg_tile_map: @ 80022F0 +; void gpu_copy_to_wram_bg_tile_map(u8 bg_id, void *src, int mode, int dest_offset) +gpu_copy_to_wram_bg_tile_map: ; 80022F0 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2203,13 +2203,13 @@ gpu_copy_to_wram_bg_tile_map: @ 80022F0 adds r0, r4, 0 bl is_invalid_bg_id_2 cmp r0, 0 - bne _08002358 + bne @08002358 adds r0, r4, 0 bl IsTileMapOutsideWram cmp r0, 0 - bne _08002358 + bne @08002358 cmp r6, 0 - beq _08002340 + beq @08002340 ldr r0, =0x030008f8 lsls r1, r4, 4 adds r0, 0x4 @@ -2220,10 +2220,10 @@ gpu_copy_to_wram_bg_tile_map: @ 80022F0 lsrs r2, r7, 17 mov r0, r10 bl CpuSet - b _08002358 + b @08002358 .align 2, 0 .pool -_08002340: +@08002340: ldr r0, =0x030008f8 mov r2, r9 lsls r1, r2, 4 @@ -2235,7 +2235,7 @@ _08002340: adds r1, r0 mov r0, r10 bl LZ77UnCompWram -_08002358: +@08002358: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -2248,8 +2248,8 @@ _08002358: thumb_func_end gpu_copy_to_wram_bg_tile_map thumb_func_start gpu_copy_wram_bg_tilemap_to_vram -@ void gpu_copy_wram_bg_tilemap_to_vram(int bg_id) -gpu_copy_wram_bg_tilemap_to_vram: @ 800236C +; void gpu_copy_wram_bg_tilemap_to_vram(int bg_id) +gpu_copy_wram_bg_tilemap_to_vram: ; 800236C push {r4,lr} sub sp, 0x4 lsls r0, 24 @@ -2257,33 +2257,33 @@ gpu_copy_wram_bg_tilemap_to_vram: @ 800236C adds r0, r4, 0 bl is_invalid_bg_id_2 cmp r0, 0 - bne _080023C8 + bne @080023C8 adds r0, r4, 0 bl IsTileMapOutsideWram cmp r0, 0 - bne _080023C8 + bne @080023C8 adds r0, r4, 0 bl bg_get_type_by_bg_id cmp r0, 0 - beq _0800239A + beq @0800239A cmp r0, 0x1 - beq _080023A6 + beq @080023A6 movs r2, 0 - b _080023B2 -_0800239A: + b @080023B2 +@0800239A: adds r0, r4, 0 movs r1, 0 bl bg_get_screen_size_in_regular_mode lsls r0, 27 - b _080023B0 -_080023A6: + b @080023B0 +@080023A6: adds r0, r4, 0 movs r1, 0 bl bg_get_screen_size_in_affine_mode lsls r0, 24 -_080023B0: +@080023B0: lsrs r2, r0, 16 -_080023B2: +@080023B2: ldr r0, =0x030008f8 lsls r1, r4, 4 adds r0, 0x4 @@ -2294,7 +2294,7 @@ _080023B2: adds r0, r4, 0 movs r3, 0 bl gpu_copy_to_vram_by_bg_id -_080023C8: +@080023C8: add sp, 0x4 pop {r4} pop {r0} @@ -2304,8 +2304,8 @@ _080023C8: thumb_func_end gpu_copy_wram_bg_tilemap_to_vram thumb_func_start gpu_copy_to_iwram_tile_map_rect -@ void gpu_copy_to_iwram_tile_map_rect(u8 bg_id, int first_tile_num, u8 tilemap_x, u8 tilemap_y, u8 width_in_tiles, u8 height_in_tiles) -gpu_copy_to_iwram_tile_map_rect: @ 80023D4 +; void gpu_copy_to_iwram_tile_map_rect(u8 bg_id, int first_tile_num, u8 tilemap_x, u8 tilemap_y, u8 width_in_tiles, u8 height_in_tiles) +gpu_copy_to_iwram_tile_map_rect: ; 80023D4 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2330,41 +2330,41 @@ gpu_copy_to_iwram_tile_map_rect: @ 80023D4 adds r0, r5, 0 bl is_invalid_bg_id_2 cmp r0, 0 - bne _080024C4 + bne @080024C4 adds r0, r5, 0 bl IsTileMapOutsideWram cmp r0, 0 - bne _080024C4 + bne @080024C4 adds r0, r5, 0 bl bg_get_type_by_bg_id cmp r0, 0 - beq _08002422 + beq @08002422 cmp r0, 0x1 - beq _08002470 - b _080024C4 -_08002422: + beq @08002470 + b @080024C4 +@08002422: mov r4, r8 adds r3, r7, 0 adds r0, r3, r6 cmp r3, r0 - bge _080024C4 + bge @080024C4 mov r12, r0 lsls r1, r5, 4 ldr r0, =0x030008fc adds r1, r0 mov r8, r1 -_08002436: +@08002436: mov r2, r10 mov r1, r9 adds r0, r2, r1 adds r7, r3, 0x1 cmp r2, r0 - bge _08002460 + bge @08002460 mov r1, r8 ldr r6, [r1] lsls r5, r3, 5 adds r3, r0, 0 -_0800244A: +@0800244A: adds r0, r5, r2 lsls r0, 1 adds r0, r6 @@ -2375,16 +2375,16 @@ _0800244A: lsls r0, 16 lsrs r2, r0, 16 cmp r2, r3 - blt _0800244A -_08002460: + blt @0800244A +@08002460: lsls r0, r7, 16 lsrs r3, r0, 16 cmp r3, r12 - blt _08002436 - b _080024C4 + blt @08002436 + b @080024C4 .align 2, 0 .pool -_08002470: +@08002470: mov r4, r8 adds r0, r5, 0 movs r1, 0x1 @@ -2395,24 +2395,24 @@ _08002470: adds r3, r7, 0 adds r0, r3, r6 cmp r3, r0 - bge _080024C4 + bge @080024C4 mov r12, r0 lsls r5, 4 mov r8, r5 -_0800248E: +@0800248E: mov r2, r10 mov r1, r9 adds r0, r2, r1 adds r7, r3, 0x1 cmp r2, r0 - bge _080024BC + bge @080024BC ldr r6, =0x030008fc add r6, r8 ldr r1, [sp] adds r5, r3, 0 muls r5, r1 adds r3, r0, 0 -_080024A6: +@080024A6: ldr r1, [r6] adds r0, r5, r2 adds r1, r0 @@ -2423,13 +2423,13 @@ _080024A6: lsls r0, 16 lsrs r2, r0, 16 cmp r2, r3 - blt _080024A6 -_080024BC: + blt @080024A6 +@080024BC: lsls r0, r7, 16 lsrs r3, r0, 16 cmp r3, r12 - blt _0800248E -_080024C4: + blt @0800248E +@080024C4: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -2443,8 +2443,8 @@ _080024C4: thumb_func_end gpu_copy_to_iwram_tile_map_rect thumb_func_start bg_copy_tilemap_rect_simple -@ void bg_copy_tilemap_rect_simple(u8 bg_id, void *src, u8 dest_x, u8 dest_y, u8 w, u8 h, u8 a7) -bg_copy_tilemap_rect_simple: @ 80024D8 +; void bg_copy_tilemap_rect_simple(u8 bg_id, void *src, u8 dest_x, u8 dest_y, u8 w, u8 h, u8 a7) +bg_copy_tilemap_rect_simple: ; 80024D8 push {r4-r6,lr} sub sp, 0x24 ldr r4, [sp, 0x34] @@ -2481,8 +2481,8 @@ bg_copy_tilemap_rect_simple: @ 80024D8 thumb_func_end bg_copy_tilemap_rect_simple thumb_func_start bg_copy_tilemap_rect -@ void bg_copy_tilemap_rect(u8 bg_id, void *src, u8 src_x, u8 src_y, u8 src_w, int src_h, u8 dest_x, u8 dest_y, u8 dest_w, u8 dest_h, u8 a11, int tile_num_delta, s16 a13) -bg_copy_tilemap_rect: @ 800251C +; void bg_copy_tilemap_rect(u8 bg_id, void *src, u8 src_x, u8 src_y, u8 src_w, int src_h, u8 dest_x, u8 dest_y, u8 dest_w, u8 dest_h, u8 a11, int tile_num_delta, s16 a13) +bg_copy_tilemap_rect: ; 800251C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2539,15 +2539,15 @@ bg_copy_tilemap_rect: @ 800251C ldr r0, [sp, 0x4] bl is_invalid_bg_id_2 cmp r0, 0 - beq _08002592 - b _080026EE -_08002592: + beq @08002592 + b @080026EE +@08002592: ldr r0, [sp, 0x4] bl IsTileMapOutsideWram cmp r0, 0 - beq _0800259E - b _080026EE -_0800259E: + beq @0800259E + b @080026EE +@0800259E: ldr r0, [sp, 0x4] movs r1, 0x4 bl gpu_bg_config_get_field @@ -2569,11 +2569,11 @@ _0800259E: ldr r0, [sp, 0x4] bl bg_get_type_by_bg_id cmp r0, 0 - beq _080025D8 + beq @080025D8 cmp r0, 0x1 - beq _08002674 - b _080026EE -_080025D8: + beq @08002674 + b @080026EE +@080025D8: ldr r1, [sp, 0x10] adds r0, r1, 0 muls r0, r7 @@ -2584,21 +2584,21 @@ _080025D8: adds r6, r1, r0 adds r0, r5, r4 cmp r5, r0 - blt _080025F0 - b _080026EE -_080025F0: + blt @080025F0 + b @080026EE +@080025F0: ldr r2, [sp, 0x18] subs r2, r7, r2 str r2, [sp, 0x34] str r0, [sp, 0x38] -_080025F8: +@080025F8: ldr r4, [sp, 0x14] ldr r7, [sp, 0x18] adds r0, r4, r7 adds r1, r5, 0x1 str r1, [sp, 0x3C] cmp r4, r0 - bge _0800265A + bge @0800265A ldr r2, [sp, 0x4] lsls r0, r2, 4 ldr r1, =0x030008fc @@ -2611,7 +2611,7 @@ _080025F8: lsls r0, r1, 16 asrs r0, 16 mov r8, r0 -_0800261E: +@0800261E: ldr r2, [sp, 0x2C] str r2, [sp] adds r0, r4, 0 @@ -2639,8 +2639,8 @@ _0800261E: ldr r2, [sp, 0x18] adds r0, r1, r2 cmp r4, r0 - blt _0800261E -_0800265A: + blt @0800261E +@0800265A: ldr r5, [sp, 0x34] lsls r0, r5, 1 adds r6, r0 @@ -2649,11 +2649,11 @@ _0800265A: lsrs r5, r0, 16 ldr r0, [sp, 0x38] cmp r5, r0 - blt _080025F8 - b _080026EE + blt @080025F8 + b @080026EE .align 2, 0 .pool -_08002674: +@08002674: ldr r1, [sp, 0x10] adds r0, r1, 0 muls r0, r7 @@ -2669,7 +2669,7 @@ _08002674: mov r9, r0 adds r0, r5, r4 cmp r5, r0 - bge _080026EE + bge @080026EE ldr r2, [sp, 0x18] subs r2, r7, r2 str r2, [sp, 0x34] @@ -2679,21 +2679,21 @@ _08002674: ldr r0, [sp, 0x4] lsls r0, 4 mov r8, r0 -_080026A8: +@080026A8: ldr r4, [sp, 0x14] ldr r1, [sp, 0x18] adds r0, r4, r1 adds r2, r5, 0x1 str r2, [sp, 0x3C] cmp r4, r0 - bge _080026DE + bge @080026DE mov r3, r8 add r3, r10 mov r7, r9 muls r7, r5 mov r12, r7 adds r2, r0, 0 -_080026C2: +@080026C2: ldr r1, [r3] mov r5, r12 adds r0, r5, r4 @@ -2707,8 +2707,8 @@ _080026C2: lsls r0, 16 lsrs r4, r0, 16 cmp r4, r2 - blt _080026C2 -_080026DE: + blt @080026C2 +@080026DE: ldr r0, [sp, 0x34] adds r6, r0 ldr r1, [sp, 0x3C] @@ -2716,8 +2716,8 @@ _080026DE: lsrs r5, r0, 16 ldr r2, [sp, 0x38] cmp r5, r2 - blt _080026A8 -_080026EE: + blt @080026A8 +@080026EE: add sp, 0x40 pop {r3-r5} mov r8, r3 @@ -2731,8 +2731,8 @@ _080026EE: thumb_func_end bg_copy_tilemap_rect thumb_func_start bg_fill_tilemap_rect -@ void bg_fill_tilemap_rect(u8 bg_id, s16 tile, u8 x, u8 y, u8 w, u8 h) -bg_fill_tilemap_rect: @ 8002704 +; void bg_fill_tilemap_rect(u8 bg_id, s16 tile, u8 x, u8 y, u8 w, u8 h) +bg_fill_tilemap_rect: ; 8002704 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2759,40 +2759,40 @@ bg_fill_tilemap_rect: @ 8002704 adds r0, r6, 0 bl is_invalid_bg_id_2 cmp r0, 0 - bne _080027F0 + bne @080027F0 adds r0, r6, 0 bl IsTileMapOutsideWram cmp r0, 0 - bne _080027F0 + bne @080027F0 adds r0, r6, 0 bl bg_get_type_by_bg_id cmp r0, 0 - beq _08002756 + beq @08002756 cmp r0, 0x1 - beq _080027A0 - b _080027F0 -_08002756: + beq @080027A0 + b @080027F0 +@08002756: adds r3, r7, 0 adds r5, r3, r5 cmp r3, r5 - bge _080027F0 + bge @080027F0 adds r7, r5, 0 lsls r1, r6, 4 ldr r0, =0x030008fc adds r1, r0 mov r12, r1 -_08002768: +@08002768: mov r2, r10 mov r1, r9 adds r0, r2, r1 adds r6, r3, 0x1 cmp r2, r0 - bge _08002790 + bge @08002790 mov r5, r12 ldr r4, [r5] lsls r3, 5 adds r1, r0, 0 -_0800277C: +@0800277C: adds r0, r3, r2 lsls r0, 1 adds r0, r4 @@ -2802,16 +2802,16 @@ _0800277C: lsls r0, 16 lsrs r2, r0, 16 cmp r2, r1 - blt _0800277C -_08002790: + blt @0800277C +@08002790: lsls r0, r6, 16 lsrs r3, r0, 16 cmp r3, r7 - blt _08002768 - b _080027F0 + blt @08002768 + b @080027F0 .align 2, 0 .pool -_080027A0: +@080027A0: adds r0, r6, 0 movs r1, 0x1 bl bg_get_screen_size_in_affine_mode @@ -2821,24 +2821,24 @@ _080027A0: adds r3, r7, 0 adds r5, r3, r5 cmp r3, r5 - bge _080027F0 + bge @080027F0 adds r7, r5, 0 lsls r6, 4 mov r12, r6 -_080027BC: +@080027BC: mov r2, r10 mov r1, r9 adds r0, r2, r1 adds r6, r3, 0x1 cmp r2, r0 - bge _080027E8 + bge @080027E8 ldr r5, =0x030008fc add r5, r12 ldr r1, [sp] adds r4, r3, 0 muls r4, r1 adds r3, r0, 0 -_080027D4: +@080027D4: ldr r0, [r5] adds r1, r4, r2 adds r0, r1 @@ -2848,13 +2848,13 @@ _080027D4: lsls r0, 16 lsrs r2, r0, 16 cmp r2, r3 - blt _080027D4 -_080027E8: + blt @080027D4 +@080027E8: lsls r0, r6, 16 lsrs r3, r0, 16 cmp r3, r7 - blt _080027BC -_080027F0: + blt @080027BC +@080027F0: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -2868,8 +2868,8 @@ _080027F0: thumb_func_end bg_fill_tilemap_rect thumb_func_start Bg_FillWramTileMapRectWithTileAndPalette -@ void Bg_FillWramTileMapRectWithTileAndPalette(u8 bg_id, s16 tile_num, u8 tilemap_x, u8 tilemap_y, u8 width_in_tiles, u8 height_in_tiles, u8 palette) -Bg_FillWramTileMapRectWithTileAndPalette: @ 8002804 +; void Bg_FillWramTileMapRectWithTileAndPalette(u8 bg_id, s16 tile_num, u8 tilemap_x, u8 tilemap_y, u8 width_in_tiles, u8 height_in_tiles, u8 palette) +Bg_FillWramTileMapRectWithTileAndPalette: ; 8002804 push {r4-r6,lr} sub sp, 0x10 ldr r4, [sp, 0x20] @@ -2902,8 +2902,8 @@ Bg_FillWramTileMapRectWithTileAndPalette: @ 8002804 thumb_func_end Bg_FillWramTileMapRectWithTileAndPalette thumb_func_start bg_write_sequence_to_wram_tile_map_rect -@ void bg_write_sequence_to_wram_tile_map_rect(u8 bg_id, s16 first_tile_num, u8 tilemap_x, u8 tilemap_y, u8 width_in_tiles, u8 height_in_tiles, u8 palette, u16 tile_num_inc_amount) -bg_write_sequence_to_wram_tile_map_rect: @ 8002840 +; void bg_write_sequence_to_wram_tile_map_rect(u8 bg_id, s16 first_tile_num, u8 tilemap_x, u8 tilemap_y, u8 width_in_tiles, u8 height_in_tiles, u8 palette, u16 tile_num_inc_amount) +bg_write_sequence_to_wram_tile_map_rect: ; 8002840 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2940,15 +2940,15 @@ bg_write_sequence_to_wram_tile_map_rect: @ 8002840 mov r0, r9 bl is_invalid_bg_id_2 cmp r0, 0 - beq _0800288E - b _080029D4 -_0800288E: + beq @0800288E + b @080029D4 +@0800288E: mov r0, r9 bl IsTileMapOutsideWram cmp r0, 0 - beq _0800289A - b _080029D4 -_0800289A: + beq @0800289A + b @080029D4 +@0800289A: mov r0, r9 movs r1, 0x4 bl gpu_bg_config_get_field @@ -2970,30 +2970,30 @@ _0800289A: mov r0, r9 bl bg_get_type_by_bg_id cmp r0, 0 - beq _080028D4 + beq @080028D4 cmp r0, 0x1 - beq _0800295C - b _080029D4 -_080028D4: + beq @0800295C + b @080029D4 +@080028D4: adds r5, r7, 0 adds r0, r5, r4 cmp r5, r0 - bge _080029D4 + bge @080029D4 str r0, [sp, 0x24] add r7, sp, 0x4 -_080028E0: +@080028E0: ldr r4, [sp, 0x8] mov r1, r10 adds r0, r4, r1 adds r2, r5, 0x1 mov r8, r2 cmp r4, r0 - bge _08002944 + bge @08002944 mov r3, r9 lsls r1, r3, 4 ldr r0, =0x030008fc adds r6, r1, r0 -_080028F6: +@080028F6: ldr r0, [sp, 0x18] str r0, [sp] adds r0, r4, 0 @@ -3030,18 +3030,18 @@ _080028F6: ldr r0, [sp, 0x8] add r0, r10 cmp r4, r0 - blt _080028F6 -_08002944: + blt @080028F6 +@08002944: mov r1, r8 lsls r0, r1, 16 lsrs r5, r0, 16 ldr r2, [sp, 0x24] cmp r5, r2 - blt _080028E0 - b _080029D4 + blt @080028E0 + b @080029D4 .align 2, 0 .pool -_0800295C: +@0800295C: mov r0, r9 movs r1, 0x1 bl bg_get_screen_size_in_affine_mode @@ -3051,19 +3051,19 @@ _0800295C: adds r5, r7, 0 adds r0, r5, r4 cmp r5, r0 - bge _080029D4 + bge @080029D4 str r0, [sp, 0x24] mov r3, r9 lsls r3, 4 mov r12, r3 -_0800297A: +@0800297A: ldr r4, [sp, 0x8] mov r7, r10 adds r0, r4, r7 adds r1, r5, 0x1 mov r8, r1 cmp r4, r0 - bge _080029C8 + bge @080029C8 ldr r2, =0x030008fc add r2, r12 str r2, [sp, 0x28] @@ -3077,7 +3077,7 @@ _0800297A: ldr r7, =0x000003ff adds r5, r7, 0 adds r6, r0, 0 -_080029A2: +@080029A2: ldr r0, [sp, 0x28] ldr r1, [r0] adds r0, r3, r4 @@ -3096,15 +3096,15 @@ _080029A2: lsls r0, 16 lsrs r4, r0, 16 cmp r4, r6 - blt _080029A2 -_080029C8: + blt @080029A2 +@080029C8: mov r1, r8 lsls r0, r1, 16 lsrs r5, r0, 16 ldr r2, [sp, 0x24] cmp r5, r2 - blt _0800297A -_080029D4: + blt @0800297A +@080029D4: add sp, 0x2C pop {r3-r5} mov r8, r3 @@ -3118,8 +3118,8 @@ _080029D4: thumb_func_end bg_write_sequence_to_wram_tile_map_rect thumb_func_start bg_get_screen_size_in_regular_mode -@ int bg_get_screen_size_in_regular_mode(u8 bg_id, int mode) -bg_get_screen_size_in_regular_mode: @ 80029EC +; int bg_get_screen_size_in_regular_mode(u8 bg_id, int mode) +bg_get_screen_size_in_regular_mode: ; 80029EC push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -3131,65 +3131,65 @@ bg_get_screen_size_in_regular_mode: @ 80029EC lsls r0, 24 lsrs r0, 24 cmp r4, 0x1 - beq _08002A2C + beq @08002A2C cmp r4, 0x1 - bgt _08002A10 + bgt @08002A10 cmp r4, 0 - beq _08002A16 - b _08002A52 -_08002A10: + beq @08002A16 + b @08002A52 +@08002A10: cmp r5, 0x2 - beq _08002A3E - b _08002A52 -_08002A16: + beq @08002A3E + b @08002A52 +@08002A16: cmp r0, 0x2 - bgt _08002A24 + bgt @08002A24 cmp r0, 0x1 - bge _08002A4E -_08002A1E: + bge @08002A4E +@08002A1E: cmp r0, 0 - beq _08002A46 - b _08002A52 -_08002A24: + beq @08002A46 + b @08002A52 +@08002A24: cmp r0, 0x3 - bne _08002A52 + bne @08002A52 movs r0, 0x4 - b _08002A54 -_08002A2C: + b @08002A54 +@08002A2C: cmp r0, 0x1 - beq _08002A4E + beq @08002A4E cmp r0, 0x1 - ble _08002A1E + ble @08002A1E cmp r0, 0x2 - beq _08002A46 + beq @08002A46 cmp r0, 0x3 - bne _08002A52 - b _08002A4E -_08002A3E: + bne @08002A52 + b @08002A4E +@08002A3E: cmp r0, 0 - blt _08002A52 + blt @08002A52 cmp r0, 0x1 - bgt _08002A4A -_08002A46: + bgt @08002A4A +@08002A46: movs r0, 0x1 - b _08002A54 -_08002A4A: + b @08002A54 +@08002A4A: cmp r0, 0x3 - bgt _08002A52 -_08002A4E: + bgt @08002A52 +@08002A4E: movs r0, 0x2 - b _08002A54 -_08002A52: + b @08002A54 +@08002A52: movs r0, 0 -_08002A54: +@08002A54: pop {r4,r5} pop {r1} bx r1 thumb_func_end bg_get_screen_size_in_regular_mode thumb_func_start bg_get_screen_size_in_affine_mode -@ int bg_get_screen_size_in_affine_mode(u8 bg_id, u8 a2) -bg_get_screen_size_in_affine_mode: @ 8002A5C +; int bg_get_screen_size_in_affine_mode(u8 bg_id, u8 a2) +bg_get_screen_size_in_affine_mode: ; 8002A5C push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -3201,51 +3201,51 @@ bg_get_screen_size_in_affine_mode: @ 8002A5C lsrs r1, r0, 24 adds r0, r1, 0 cmp r4, 0 - beq _08002A84 + beq @08002A84 cmp r4, 0 - blt _08002AAC + blt @08002AAC cmp r4, 0x2 - bgt _08002AAC + bgt @08002AAC movs r0, 0x10 lsls r0, r1 - b _08002AAE -_08002A84: + b @08002AAE +@08002A84: cmp r1, 0x1 - beq _08002AA0 + beq @08002AA0 cmp r1, 0x1 - bgt _08002A92 + bgt @08002A92 cmp r1, 0 - beq _08002A9C - b _08002AAC -_08002A92: + beq @08002A9C + b @08002AAC +@08002A92: cmp r0, 0x2 - beq _08002AA4 + beq @08002AA4 cmp r0, 0x3 - beq _08002AA8 - b _08002AAC -_08002A9C: + beq @08002AA8 + b @08002AAC +@08002A9C: movs r0, 0x1 - b _08002AAE -_08002AA0: + b @08002AAE +@08002AA0: movs r0, 0x4 - b _08002AAE -_08002AA4: + b @08002AAE +@08002AA4: movs r0, 0x10 - b _08002AAE -_08002AA8: + b @08002AAE +@08002AA8: movs r0, 0x40 - b _08002AAE -_08002AAC: + b @08002AAE +@08002AAC: movs r0, 0 -_08002AAE: +@08002AAE: pop {r4} pop {r1} bx r1 thumb_func_end bg_get_screen_size_in_affine_mode thumb_func_start bg_get_index_from_tile_coords -@ int bg_get_index_from_tile_coords(int tilemap_x, int tilemap_y, int screen_size, int tilemap_w, int tilemap_h) -bg_get_index_from_tile_coords: @ 8002AB4 +; int bg_get_index_from_tile_coords(int tilemap_x, int tilemap_y, int screen_size, int tilemap_w, int tilemap_h) +bg_get_index_from_tile_coords: ; 8002AB4 push {r4,lr} adds r4, r0, 0 ldr r0, [sp, 0x8] @@ -3254,22 +3254,22 @@ bg_get_index_from_tile_coords: @ 8002AB4 subs r0, 0x1 ands r1, r0 cmp r2, 0x1 - beq _08002AD8 + beq @08002AD8 cmp r2, 0x1 - ble _08002AE0 + ble @08002AE0 cmp r2, 0x2 - beq _08002AE0 + beq @08002AE0 cmp r2, 0x3 - bne _08002AE0 + bne @08002AE0 cmp r1, 0x1F - ble _08002AD8 + ble @08002AD8 adds r1, 0x20 -_08002AD8: +@08002AD8: cmp r4, 0x1F - ble _08002AE0 + ble @08002AE0 subs r4, 0x20 adds r1, 0x20 -_08002AE0: +@08002AE0: lsls r0, r1, 5 adds r0, r4 pop {r4} @@ -3278,18 +3278,18 @@ _08002AE0: thumb_func_end bg_get_index_from_tile_coords thumb_func_start bg_copy_tilemap_entry_not_rotscale_mode -@ void bg_copy_tilemap_entry_not_rotscale_mode(u16 *tile_src, u16 *tile_dest, signed int palette, s16 a4, int a5) -bg_copy_tilemap_entry_not_rotscale_mode: @ 8002AEC +; void bg_copy_tilemap_entry_not_rotscale_mode(u16 *tile_src, u16 *tile_dest, signed int palette, s16 a4, int a5) +bg_copy_tilemap_entry_not_rotscale_mode: ; 8002AEC push {r4-r6,lr} adds r4, r0, 0 adds r6, r1, 0 ldr r5, [sp, 0x10] cmp r2, 0x10 - beq _08002B14 + beq @08002B14 cmp r2, 0x10 - bgt _08002B34 + bgt @08002B34 cmp r2, 0 - blt _08002B34 + blt @08002B34 ldrh r0, [r4] adds r0, r3 ldr r3, =0x00000fff @@ -3297,10 +3297,10 @@ bg_copy_tilemap_entry_not_rotscale_mode: @ 8002AEC ands r0, r1 adds r1, r2, r5 lsls r1, 12 - b _08002B3A + b @08002B3A .align 2, 0 .pool -_08002B14: +@08002B14: ldrh r1, [r6] movs r0, 0xFC lsls r0, 8 @@ -3313,16 +3313,16 @@ _08002B14: adds r1, r3, 0 ands r0, r1 orrs r0, r2 - b _08002B3C + b @08002B3C .align 2, 0 .pool -_08002B34: +@08002B34: ldrh r0, [r4] adds r0, r3 lsls r1, r5, 12 -_08002B3A: +@08002B3A: adds r0, r1 -_08002B3C: +@08002B3C: lsls r0, 16 lsrs r1, r0, 16 strh r1, [r6] @@ -3332,8 +3332,8 @@ _08002B3C: thumb_func_end bg_copy_tilemap_entry_not_rotscale_mode thumb_func_start bg_get_type_by_bg_id -@ u16 bg_get_type_by_bg_id(u8 bg_id) -bg_get_type_by_bg_id: @ 8002B48 +; u16 bg_get_type_by_bg_id(u8 bg_id) +bg_get_type_by_bg_id: ; 8002B48 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -3342,40 +3342,40 @@ bg_get_type_by_bg_id: @ 8002B48 lsls r0, 24 lsrs r0, 24 cmp r4, 0x2 - beq _08002B76 + beq @08002B76 cmp r4, 0x2 - ble _08002B66 + ble @08002B66 cmp r4, 0x3 - beq _08002B86 - b _08002B8E -_08002B66: + beq @08002B86 + b @08002B8E +@08002B66: cmp r5, 0 - blt _08002B8E + blt @08002B8E cmp r0, 0x1 - bgt _08002B8E + bgt @08002B8E cmp r0, 0 - blt _08002B8E -_08002B72: + blt @08002B8E +@08002B72: movs r0, 0 - b _08002B90 -_08002B76: + b @08002B90 +@08002B76: cmp r0, 0 - beq _08002B72 + beq @08002B72 cmp r0, 0 - blt _08002B8E + blt @08002B8E cmp r0, 0x2 - bgt _08002B8E -_08002B82: + bgt @08002B8E +@08002B82: movs r0, 0x1 - b _08002B90 -_08002B86: + b @08002B90 +@08002B86: cmp r0, 0 - beq _08002B72 + beq @08002B72 cmp r0, 0x2 - beq _08002B82 -_08002B8E: + beq @08002B82 +@08002B8E: ldr r0, =0x0000ffff -_08002B90: +@08002B90: pop {r4,r5} pop {r1} bx r1 @@ -3384,25 +3384,25 @@ _08002B90: thumb_func_end bg_get_type_by_bg_id thumb_func_start is_invalid_bg_id_2 -@ int is_invalid_bg_id_2(u8 bg_id) -is_invalid_bg_id_2: @ 8002B9C +; int is_invalid_bg_id_2(u8 bg_id) +is_invalid_bg_id_2: ; 8002B9C push {lr} lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bhi _08002BAA + bhi @08002BAA movs r0, 0 - b _08002BAC -_08002BAA: + b @08002BAC +@08002BAA: movs r0, 0x1 -_08002BAC: +@08002BAC: pop {r1} bx r1 thumb_func_end is_invalid_bg_id_2 thumb_func_start IsTileMapOutsideWram -@ bool IsTileMapOutsideWram(u8 bg_id) -IsTileMapOutsideWram: @ 8002BB0 +; bool IsTileMapOutsideWram(u8 bg_id) +IsTileMapOutsideWram: ; 8002BB0 push {lr} lsls r0, 24 ldr r1, =0x030008f8 @@ -3412,16 +3412,16 @@ IsTileMapOutsideWram: @ 8002BB0 ldr r1, [r0] ldr r0, =0x03008000 cmp r1, r0 - bhi _08002BD4 + bhi @08002BD4 cmp r1, 0 - beq _08002BD4 + beq @08002BD4 movs r0, 0 - b _08002BD6 + b @08002BD6 .align 2, 0 .pool -_08002BD4: +@08002BD4: movs r0, 0x1 -_08002BD6: +@08002BD6: pop {r1} bx r1 thumb_func_end IsTileMapOutsideWram diff --git a/asm/gpu_obj.s b/asm/gpu_obj.s index cb6ebbc30..79644d2c2 100644 --- a/asm/gpu_obj.s +++ b/asm/gpu_obj.s @@ -1,5 +1,5 @@ thumb_func_start reset_all_obj_data -reset_all_obj_data: @ 8006974 +reset_all_obj_data: ; 8006974 push {r4,lr} movs r0, 0 movs r1, 0x80 @@ -28,12 +28,12 @@ reset_all_obj_data: @ 8006974 thumb_func_end reset_all_obj_data thumb_func_start call_obj_callbacks -@ void call_obj_callbacks() -call_obj_callbacks: @ 80069C0 +; void call_obj_callbacks() +call_obj_callbacks: ; 80069C0 push {r4-r7,lr} movs r6, 0 movs r7, 0x1 -_080069C6: +@080069C6: lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -45,7 +45,7 @@ _080069C6: adds r0, r7, 0 ands r0, r1 cmp r0, 0 - beq _080069F6 + beq @080069F6 ldr r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -53,15 +53,15 @@ _080069C6: adds r0, r7, 0 ands r0, r1 cmp r0, 0 - beq _080069F6 + beq @080069F6 adds r0, r4, 0 bl obj_anim_step -_080069F6: +@080069F6: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x3F - bls _080069C6 + bls @080069C6 pop {r4-r7} pop {r0} bx r0 @@ -70,8 +70,8 @@ _080069F6: thumb_func_end call_obj_callbacks thumb_func_start obj_sync_something -@ void obj_sync_something() -obj_sync_something: @ 8006A0C +; void obj_sync_something() +obj_sync_something: ; 8006A0C push {r4,r5,lr} bl update_obj_oam_coords bl do_something_with_obj_priorites @@ -104,14 +104,14 @@ obj_sync_something: @ 8006A0C thumb_func_end obj_sync_something thumb_func_start update_obj_oam_coords -update_obj_oam_coords: @ 8006A58 +update_obj_oam_coords: ; 8006A58 push {r4-r7,lr} movs r4, 0 ldr r7, =0x02020630 ldr r0, =0x000001ff adds r5, r0, 0 ldr r6, =0xfffffe00 -_08006A64: +@08006A64: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -122,11 +122,11 @@ _08006A64: movs r0, 0x5 ands r0, r1 cmp r0, 0x1 - bne _08006B0A + bne @08006B0A movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _08006AD8 + beq @08006AD8 movs r2, 0x20 ldrsh r1, [r3, r2] movs r2, 0x24 @@ -158,10 +158,10 @@ _08006A64: adds r0, r1 ldrb r2, [r2] adds r0, r2 - b _08006B08 + b @08006B08 .align 2, 0 .pool -_08006AD8: +@08006AD8: movs r2, 0x20 ldrsh r1, [r3, r2] movs r2, 0x24 @@ -186,26 +186,26 @@ _08006AD8: adds r0, 0x29 ldrb r0, [r0] adds r0, r1 -_08006B08: +@08006B08: strb r0, [r3] -_08006B0A: +@08006B0A: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3F - bls _08006A64 + bls @08006A64 pop {r4-r7} pop {r0} bx r0 thumb_func_end update_obj_oam_coords thumb_func_start do_something_with_obj_priorites -do_something_with_obj_priorites: @ 8006B1C +do_something_with_obj_priorites: ; 8006B1C push {r4,lr} movs r2, 0 ldr r4, =0x02020630 ldr r3, =0x02021774 -_08006B24: +@08006B24: lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -225,7 +225,7 @@ _08006B24: lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x3F - bls _08006B24 + bls @08006B24 pop {r4} pop {r0} bx r0 @@ -234,7 +234,7 @@ _08006B24: thumb_func_end do_something_with_obj_priorites thumb_func_start determine_visible_sprites_maybe -determine_visible_sprites_maybe: @ 8006B5C +determine_visible_sprites_maybe: ; 8006B5C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -249,7 +249,7 @@ determine_visible_sprites_maybe: @ 8006B5C mov r9, r3 ldr r6, =0xc0000300 mov r8, r6 -_08006B78: +@08006B78: mov r5, r12 mov r0, r12 subs r0, 0x1 @@ -279,72 +279,72 @@ _08006B78: ldrb r2, [r4] adds r0, r1, 0 cmp r0, 0x9F - ble _08006BBA + ble @08006BBA add r0, r9 lsls r0, 16 lsrs r1, r0, 16 -_08006BBA: +@08006BBA: lsls r0, r2, 16 asrs r0, 16 cmp r0, 0x9F - ble _08006BC8 + ble @08006BC8 add r0, r9 lsls r0, 16 lsrs r2, r0, 16 -_08006BC8: +@08006BC8: ldr r0, [r3] mov r7, r8 ands r0, r7 cmp r0, r8 - bne _08006BEC + bne @08006BEC ldrb r0, [r3, 0x1] lsrs r0, 6 cmp r0, 0 - beq _08006BDE + beq @08006BDE cmp r0, 0x2 - bne _08006BEC -_08006BDE: + bne @08006BEC +@08006BDE: lsls r0, r1, 16 asrs r0, 16 cmp r0, 0x80 - ble _08006BEC + ble @08006BEC add r0, r9 lsls r0, 16 lsrs r1, r0, 16 -_08006BEC: +@08006BEC: ldr r0, [r4] mov r3, r8 ands r0, r3 cmp r0, r8 - bne _08006C10 + bne @08006C10 ldrb r0, [r4, 0x1] lsrs r0, 6 cmp r0, 0 - beq _08006C02 + beq @08006C02 cmp r0, 0x2 - bne _08006C10 -_08006C02: + bne @08006C10 +@08006C02: lsls r0, r2, 16 asrs r0, 16 cmp r0, 0x80 - ble _08006C10 + ble @08006C10 add r0, r9 lsls r0, 16 lsrs r2, r0, 16 -_08006C10: +@08006C10: movs r7, 0x1 add r12, r7 cmp r5, 0 - beq _08006CF6 + beq @08006CF6 ldr r0, [sp] cmp r0, r6 - bhi _08006C38 + bhi @08006C38 cmp r0, r6 - bne _08006CF6 - b _08006CEE + bne @08006CF6 + b @08006CEE .align 2, 0 .pool -_08006C38: +@08006C38: mov r1, r10 adds r3, r5, r1 ldrb r4, [r3] @@ -382,80 +382,80 @@ _08006C38: ldrb r2, [r4] adds r0, r1, 0 cmp r0, 0x9F - ble _08006C8A + ble @08006C8A add r0, r9 lsls r0, 16 lsrs r1, r0, 16 -_08006C8A: +@08006C8A: lsls r0, r2, 16 asrs r0, 16 cmp r0, 0x9F - ble _08006C98 + ble @08006C98 add r0, r9 lsls r0, 16 lsrs r2, r0, 16 -_08006C98: +@08006C98: ldr r0, [r3] mov r7, r8 ands r0, r7 cmp r0, r8 - bne _08006CBC + bne @08006CBC ldrb r0, [r3, 0x1] lsrs r0, 6 cmp r0, 0 - beq _08006CAE + beq @08006CAE cmp r0, 0x2 - bne _08006CBC -_08006CAE: + bne @08006CBC +@08006CAE: lsls r0, r1, 16 asrs r0, 16 cmp r0, 0x80 - ble _08006CBC + ble @08006CBC add r0, r9 lsls r0, 16 lsrs r1, r0, 16 -_08006CBC: +@08006CBC: ldr r0, [r4] mov r3, r8 ands r0, r3 cmp r0, r8 - bne _08006CE0 + bne @08006CE0 ldrb r0, [r4, 0x1] lsrs r0, 6 cmp r0, 0 - beq _08006CD2 + beq @08006CD2 cmp r0, 0x2 - bne _08006CE0 -_08006CD2: + bne @08006CE0 +@08006CD2: lsls r0, r2, 16 asrs r0, 16 cmp r0, 0x80 - ble _08006CE0 + ble @08006CE0 add r0, r9 lsls r0, 16 lsrs r2, r0, 16 -_08006CE0: +@08006CE0: cmp r5, 0 - beq _08006CF6 + beq @08006CF6 ldr r7, [sp] cmp r7, r6 - bhi _08006C38 + bhi @08006C38 cmp r7, r6 - bne _08006CF6 -_08006CEE: + bne @08006CF6 +@08006CEE: lsls r1, 16 lsls r0, r2, 16 cmp r1, r0 - blt _08006C38 -_08006CF6: + blt @08006C38 +@08006CF6: mov r1, r12 lsls r0, r1, 24 lsrs r0, 24 mov r12, r0 cmp r0, 0x3F - bhi _08006D04 - b _08006B78 -_08006D04: + bhi @08006D04 + b @08006B78 +@08006D04: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -469,13 +469,13 @@ _08006D04: thumb_func_end determine_visible_sprites_maybe thumb_func_start copy_rotscale_coeffs_to_super_sprites -@ void copy_rotscale_coeffs_to_super_sprites() -copy_rotscale_coeffs_to_super_sprites: @ 8006D1C +; void copy_rotscale_coeffs_to_super_sprites() +copy_rotscale_coeffs_to_super_sprites: ; 8006D1C push {r4-r6,lr} movs r4, 0 ldr r5, =0x030022c0 ldr r6, =0x02021bc0 -_08006D24: +@08006D24: lsls r2, r4, 2 lsls r1, r4, 5 adds r1, r5 @@ -502,7 +502,7 @@ _08006D24: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1F - bls _08006D24 + bls @08006D24 pop {r4-r6} pop {r0} bx r0 @@ -511,14 +511,14 @@ _08006D24: thumb_func_end copy_rotscale_coeffs_to_super_sprites thumb_func_start super_sprites_fill -@ void super_sprites_fill() -super_sprites_fill: @ 8006D68 +; void super_sprites_fill() +super_sprites_fill: ; 8006D68 push {r4-r6,lr} sub sp, 0x4 movs r4, 0 mov r0, sp strb r4, [r0] -_08006D72: +@08006D72: ldr r0, =0x020217f4 adds r0, r4, r0 ldrb r1, [r0] @@ -533,31 +533,31 @@ _08006D72: movs r0, 0x5 ands r0, r1 cmp r0, 0x1 - bne _08006D9E + bne @08006D9E adds r0, r2, 0 mov r1, sp bl super_sprite_add lsls r0, 24 cmp r0, 0 - bne _08006DD8 -_08006D9E: + bne @08006DD8 +@08006D9E: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3F - bls _08006D72 + bls @08006D72 mov r0, sp ldr r4, =0x02021b38 ldrb r0, [r0] ldrb r1, [r4] cmp r0, r1 - bcs _08006DD8 + bcs @08006DD8 mov r1, sp ldr r5, =0x030022f8 ldr r0, =0x082ec690 ldr r2, [r0] ldr r3, [r0, 0x4] -_08006DBE: +@08006DBE: ldrb r0, [r1] lsls r0, 3 adds r0, r5 @@ -570,8 +570,8 @@ _08006DBE: lsrs r0, 24 ldrb r6, [r4] cmp r0, r6 - bcc _08006DBE -_08006DD8: + bcc @08006DBE +@08006DD8: add sp, 0x4 pop {r4-r6} pop {r0} @@ -581,8 +581,8 @@ _08006DD8: thumb_func_end super_sprites_fill thumb_func_start obj_add_from_template_forward_search -@ int obj_add_from_template_forward_search(struct objtemplate *template, s16 x, s16 y, u8 y_height_related) -obj_add_from_template_forward_search: @ 8006DF4 +; int obj_add_from_template_forward_search(struct objtemplate *template, s16 x, s16 y, u8 y_height_related) +obj_add_from_template_forward_search: ; 8006DF4 push {r4-r7,lr} sub sp, 0x4 adds r7, r0, 0 @@ -593,7 +593,7 @@ obj_add_from_template_forward_search: @ 8006DF4 mov r12, r0 lsls r5, r1, 16 lsls r6, r2, 16 -_08006E08: +@08006E08: lsls r0, r3, 4 adds r0, r3 lsls r0, 2 @@ -602,7 +602,7 @@ _08006E08: ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - bne _08006E34 + bne @08006E34 str r4, [sp] adds r0, r3, 0 adds r1, r7, 0 @@ -611,17 +611,17 @@ _08006E08: bl template_read lsls r0, 24 lsrs r0, 24 - b _08006E40 + b @08006E40 .align 2, 0 .pool -_08006E34: +@08006E34: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3F - bls _08006E08 + bls @08006E08 movs r0, 0x40 -_08006E40: +@08006E40: add sp, 0x4 pop {r4-r7} pop {r1} @@ -629,8 +629,8 @@ _08006E40: thumb_func_end obj_add_from_template_forward_search thumb_func_start obj_add_from_template_backward_search -@ int obj_add_from_template_backward_search(struct objtemplate *template, s16 x, s16 y, u8 y_height_related) -obj_add_from_template_backward_search: @ 8006E48 +; int obj_add_from_template_backward_search(struct objtemplate *template, s16 x, s16 y, u8 y_height_related) +obj_add_from_template_backward_search: ; 8006E48 push {r4-r7,lr} mov r7, r8 push {r7} @@ -646,7 +646,7 @@ obj_add_from_template_backward_search: @ 8006E48 mov r12, r0 lsls r4, r1, 16 lsls r5, r2, 16 -_08006E66: +@08006E66: lsls r0, r3, 16 asrs r1, r0, 16 lsls r0, r1, 4 @@ -657,7 +657,7 @@ _08006E66: ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - bne _08006E98 + bne @08006E98 lsls r0, r3, 24 lsrs r0, 24 str r6, [sp] @@ -667,18 +667,18 @@ _08006E66: bl template_read lsls r0, 24 lsrs r0, 24 - b _08006EA6 + b @08006EA6 .align 2, 0 .pool -_08006E98: +@08006E98: subs r0, r1, 0x1 lsls r0, 16 lsrs r3, r0, 16 asrs r0, 16 cmp r0, r12 - bgt _08006E66 + bgt @08006E66 movs r0, 0x40 -_08006EA6: +@08006EA6: add sp, 0x4 pop {r3} mov r8, r3 @@ -688,8 +688,8 @@ _08006EA6: thumb_func_end obj_add_from_template_backward_search 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, =0x082ec6ac @@ -700,7 +700,7 @@ obj_add_empty_with_callback: @ 8006EB4 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 - beq _08006EF4 + beq @08006EF4 ldr r4, =0x02020630 lsls r1, r5, 4 adds r1, r5 @@ -715,20 +715,20 @@ obj_add_empty_with_callback: @ 8006EB4 adds r1, r4 str r6, [r1] adds r0, r5, 0 - b _08006EF6 + b @08006EF6 .align 2, 0 .pool -_08006EF4: +@08006EF4: movs r0, 0x40 -_08006EF6: +@08006EF6: pop {r4-r6} pop {r1} bx r1 thumb_func_end obj_add_empty_with_callback thumb_func_start template_read -@ int template_read(u8 obj_id, struct objtemplate *a2, s16 x, s16 y, u8 y_height_related) -template_read: @ 8006EFC +; int template_read(u8 obj_id, struct objtemplate *a2, s16 x, s16 y, u8 y_height_related) +template_read: ; 8006EFC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -804,7 +804,7 @@ template_read: @ 8006EFC ldr r4, =0xffff0000 lsrs r0, r4, 16 cmp r1, r0 - bne _08006FF8 + bne @08006FF8 mov r1, r8 ldr r0, [r1, 0xC] str r0, [r7, 0xC] @@ -818,14 +818,14 @@ template_read: @ 8006EFC asrs r0, 16 asrs r1, r4, 16 cmp r0, r1 - bne _08006FC8 + bne @08006FC8 adds r0, r7, 0 bl obj_delete movs r0, 0x40 - b _08007040 + b @08007040 .align 2, 0 .pool -_08006FC8: +@08006FC8: ldr r1, =0x000003ff adds r0, r1, 0 ands r2, r0 @@ -845,10 +845,10 @@ _08006FC8: adds r1, 0x40 movs r0, 0 strh r0, [r1] - b _0800700C + b @0800700C .align 2, 0 .pool -_08006FF8: +@08006FF8: mov r1, r8 ldrh r0, [r1] bl gpu_tile_obj_tag_get_range_start @@ -857,22 +857,22 @@ _08006FF8: strh r0, [r1] adds r0, r7, 0 bl sub_8008324 -_0800700C: +@0800700C: ldrb r0, [r7, 0x1] lsls r0, 30 lsrs r0, 30 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08007020 + beq @08007020 adds r0, r7, 0 bl obj_alloc_rotscale_entry -_08007020: +@08007020: mov r0, r8 ldrh r1, [r0, 0x2] ldr r0, =0x0000ffff cmp r1, r0 - beq _0800703E + beq @0800703E mov r1, r8 ldrh r0, [r1, 0x2] bl gpu_pal_tags_index_of @@ -882,9 +882,9 @@ _08007020: ands r1, r2 orrs r1, r0 strb r1, [r7, 0x5] -_0800703E: +@0800703E: mov r0, r10 -_08007040: +@08007040: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -897,8 +897,8 @@ _08007040: thumb_func_end template_read thumb_func_start obj_add_from_template_call_callback_once -@ int obj_add_from_template_call_callback_once(struct objtemplate *template, s16 x, s16 y, u8 y_height_related) -obj_add_from_template_call_callback_once: @ 8007054 +; int obj_add_from_template_call_callback_once(struct objtemplate *template, s16 x, s16 y, u8 y_height_related) +obj_add_from_template_call_callback_once: ; 8007054 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -915,7 +915,7 @@ obj_add_from_template_call_callback_once: @ 8007054 mov r12, r1 lsls r2, 16 mov r8, r2 -_08007074: +@08007074: lsls r0, r3, 4 adds r0, r3 lsls r6, r0, 2 @@ -925,7 +925,7 @@ _08007074: ldrb r0, [r7] lsls r0, 31 cmp r0, 0 - bne _080070CC + bne @080070CC mov r0, r9 str r0, [sp] adds r0, r3, 0 @@ -939,7 +939,7 @@ _08007074: lsrs r0, 24 adds r5, r0, 0 cmp r5, 0x40 - beq _080070D6 + beq @080070D6 ldr r1, =0x0202064c adds r0, r6, r1 ldr r1, [r0] @@ -948,23 +948,23 @@ _08007074: ldrb r0, [r7] lsls r0, 31 cmp r0, 0 - beq _080070C0 + beq @080070C0 adds r0, r4, 0 bl obj_anim_step -_080070C0: +@080070C0: adds r0, r5, 0 - b _080070D8 + b @080070D8 .align 2, 0 .pool -_080070CC: +@080070CC: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3F - bls _08007074 -_080070D6: + bls @08007074 +@080070D6: movs r0, 0x40 -_080070D8: +@080070D8: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -976,8 +976,8 @@ _080070D8: thumb_func_end obj_add_from_template_call_callback_once thumb_func_start obj_delete_and_free_tiles -@ void obj_delete_and_free_tiles(struct obj *obj) -obj_delete_and_free_tiles: @ 80070E8 +; void obj_delete_and_free_tiles(struct obj *obj) +obj_delete_and_free_tiles: ; 80070E8 push {r4-r7,lr} adds r5, r0, 0 adds r0, 0x3E @@ -985,14 +985,14 @@ obj_delete_and_free_tiles: @ 80070E8 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08007144 + beq @08007144 adds r0, r5, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _0800713E + bne @0800713E ldr r0, [r5, 0xC] ldrh r2, [r0, 0x4] lsrs r2, 5 @@ -1002,12 +1002,12 @@ obj_delete_and_free_tiles: @ 80070E8 adds r4, r1, r2 adds r3, r1, 0 cmp r3, r4 - bcs _0800713E + bcs @0800713E ldr r0, =0x02021b3c mov r12, r0 movs r6, 0x7 movs r7, 0x1 -_08007122: +@08007122: lsrs r2, r3, 3 add r2, r12 adds r0, r3, 0 @@ -1021,11 +1021,11 @@ _08007122: lsls r0, 16 lsrs r3, r0, 16 cmp r3, r4 - bcc _08007122 -_0800713E: + bcc @08007122 +@0800713E: adds r0, r5, 0 bl obj_delete -_08007144: +@08007144: pop {r4-r7} pop {r0} bx r0 @@ -1034,18 +1034,18 @@ _08007144: thumb_func_end obj_delete_and_free_tiles thumb_func_start reset_super_sprites -@ void reset_super_sprites(u8 a1, u8 a2) -reset_super_sprites: @ 8007150 +; void reset_super_sprites(u8 a1, u8 a2) +reset_super_sprites: ; 8007150 push {r4-r6,lr} lsls r0, 24 lsls r1, 24 lsrs r4, r1, 24 lsrs r3, r0, 24 cmp r3, r4 - bcs _08007178 + bcs @08007178 ldr r6, =0x030022f8 ldr r5, =0x082ec690 -_08007162: +@08007162: lsls r0, r3, 3 adds r0, r6 ldr r1, [r5] @@ -1056,8 +1056,8 @@ _08007162: lsls r0, 24 lsrs r3, r0, 24 cmp r3, r4 - bcc _08007162 -_08007178: + bcc @08007162 +@08007178: pop {r4-r6} pop {r0} bx r0 @@ -1066,8 +1066,8 @@ _08007178: thumb_func_end reset_super_sprites thumb_func_start copy_super_sprites_to_oam -@ void copy_super_sprites_to_oam() -copy_super_sprites_to_oam: @ 8007188 +; void copy_super_sprites_to_oam() +copy_super_sprites_to_oam: ; 8007188 push {lr} ldr r2, =0x030022c0 ldr r1, =0x00000439 @@ -1076,14 +1076,14 @@ copy_super_sprites_to_oam: @ 8007188 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080071A8 + bne @080071A8 adds r0, r2, 0 adds r0, 0x38 movs r1, 0xE0 lsls r1, 19 ldr r2, =0x04000100 bl CpuSet -_080071A8: +@080071A8: pop {r0} bx r0 .align 2, 0 @@ -1091,7 +1091,7 @@ _080071A8: thumb_func_end copy_super_sprites_to_oam thumb_func_start copy_queue_clear -copy_queue_clear: @ 80071B8 +copy_queue_clear: ; 80071B8 push {r4,r5,lr} ldr r0, =0x02021834 movs r1, 0 @@ -1102,7 +1102,7 @@ copy_queue_clear: @ 80071B8 ldr r4, =0x02021838 movs r3, 0 adds r5, r4, 0x4 -_080071CC: +@080071CC: lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -1115,7 +1115,7 @@ _080071CC: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3F - bls _080071CC + bls @080071CC pop {r4,r5} pop {r0} bx r0 @@ -1124,14 +1124,14 @@ _080071CC: thumb_func_end copy_queue_clear thumb_func_start reset_rotscale_coeffs -reset_rotscale_coeffs: @ 80071F8 +reset_rotscale_coeffs: ; 80071F8 push {r4,lr} movs r1, 0 ldr r4, =0x02021bc0 movs r3, 0 movs r2, 0x80 lsls r2, 1 -_08007204: +@08007204: lsls r0, r1, 3 adds r0, r4 strh r2, [r0] @@ -1142,7 +1142,7 @@ _08007204: lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x1F - bls _08007204 + bls @08007204 pop {r4} pop {r0} bx r0 @@ -1151,7 +1151,7 @@ _08007204: thumb_func_end reset_rotscale_coeffs thumb_func_start rotscale_set_direct -rotscale_set_direct: @ 8007224 +rotscale_set_direct: ; 8007224 push {r4,r5,lr} ldr r5, [sp, 0xC] lsls r0, 24 @@ -1170,8 +1170,8 @@ rotscale_set_direct: @ 8007224 thumb_func_end rotscale_set_direct thumb_func_start obj_delete -@ void obj_delete(struct obj *obj) -obj_delete: @ 8007244 +; void obj_delete(struct obj *obj) +obj_delete: ; 8007244 push {lr} ldr r1, =0x082ec64c movs r2, 0x44 @@ -1183,7 +1183,7 @@ obj_delete: @ 8007244 thumb_func_end obj_delete thumb_func_start oam_center -oam_center: @ 8007258 +oam_center: ; 8007258 push {r4-r6,lr} adds r6, r0, 0 lsls r1, 24 @@ -1202,12 +1202,12 @@ oam_center: @ 8007258 movs r0, 0x2 ands r3, r0 cmp r3, 0 - beq _08007286 + beq @08007286 lsls r0, r5, 25 lsrs r5, r0, 24 lsls r0, r1, 25 lsrs r1, r0, 24 -_08007286: +@08007286: adds r0, r6, 0 adds r0, 0x28 strb r5, [r0] @@ -1221,8 +1221,8 @@ _08007286: thumb_func_end oam_center thumb_func_start gpu_tile_obj_alloc -@ int gpu_tile_obj_alloc(u16 tile_count) -gpu_tile_obj_alloc: @ 800729C +; int gpu_tile_obj_alloc(u16 tile_count) +gpu_tile_obj_alloc: ; 800729C push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -1230,17 +1230,17 @@ gpu_tile_obj_alloc: @ 800729C lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - bne _080072F2 + bne @080072F2 ldr r0, =0x02021b3a ldrh r3, [r0] ldr r0, =0x000003ff cmp r3, r0 - bhi _080072DA + bhi @080072DA ldr r7, =0x02021b3c movs r6, 0x7 adds r4, r0, 0 movs r5, 0x1 -_080072BE: +@080072BE: lsrs r2, r3, 3 adds r2, r7 adds r0, r3, 0 @@ -1254,24 +1254,24 @@ _080072BE: lsls r0, 16 lsrs r3, r0, 16 cmp r3, r4 - bls _080072BE -_080072DA: + bls @080072BE +@080072DA: movs r0, 0 - b _080073A4 + b @080073A4 .align 2, 0 .pool -_080072EC: +@080072EC: movs r0, 0x1 negs r0, r0 - b _080073A4 -_080072F2: + b @080073A4 +@080072F2: ldr r0, =0x02021b3a ldrh r3, [r0] ldr r0, =0x02021b3c mov r9, r0 movs r7, 0x7 movs r6, 0x1 -_080072FE: +@080072FE: lsrs r0, r3, 3 add r0, r9 ldrb r1, [r0] @@ -1280,16 +1280,16 @@ _080072FE: asrs r1, r0 ands r1, r6 cmp r1, 0 - beq _08007332 + beq @08007332 movs r5, 0x80 lsls r5, 3 ldr r2, =0x02021b3c -_08007316: +@08007316: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, r5 - beq _080072EC + beq @080072EC lsrs r0, 19 adds r0, r2 ldrb r1, [r0] @@ -1298,22 +1298,22 @@ _08007316: asrs r1, r0 ands r1, r6 cmp r1, 0 - bne _08007316 -_08007332: + bne @08007316 +@08007332: mov r8, r3 movs r2, 0x1 cmp r2, r4 - beq _0800736C + beq @0800736C movs r1, 0x80 lsls r1, 3 mov r12, r1 ldr r5, =0x02021b3c -_08007342: +@08007342: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 cmp r3, r12 - beq _080072EC + beq @080072EC lsrs r0, 19 adds r0, r5 ldrb r1, [r0] @@ -1322,16 +1322,16 @@ _08007342: asrs r1, r0 ands r1, r6 cmp r1, 0 - bne _08007368 + bne @08007368 adds r0, r2, 0x1 lsls r0, 16 lsrs r2, r0, 16 cmp r2, r4 - bne _08007342 -_08007368: + bne @08007342 +@08007368: cmp r2, r4 - bne _080072FE -_0800736C: + bne @080072FE +@0800736C: mov r1, r8 lsls r0, r1, 16 lsrs r3, r0, 16 @@ -1339,13 +1339,13 @@ _0800736C: adds r1, r4, r1 adds r6, r0, 0 cmp r3, r1 - bge _080073A2 + bge @080073A2 ldr r0, =0x02021b3c mov r8, r0 movs r7, 0x7 adds r4, r1, 0 movs r5, 0x1 -_08007386: +@08007386: lsrs r2, r3, 3 add r2, r8 adds r1, r3, 0 @@ -1359,10 +1359,10 @@ _08007386: lsls r0, 16 lsrs r3, r0, 16 cmp r3, r4 - blt _08007386 -_080073A2: + blt @08007386 +@080073A2: asrs r0, r6, 16 -_080073A4: +@080073A4: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -1374,8 +1374,8 @@ _080073A4: thumb_func_end gpu_tile_obj_alloc thumb_func_start gpu_tile_obj_alloc_map_bit_op -@ unsigned int gpu_tile_obj_alloc_map_bit_op(int tile_id, bit_operation operation) -gpu_tile_obj_alloc_map_bit_op: @ 80073B8 +; unsigned int gpu_tile_obj_alloc_map_bit_op(int tile_id, bit_operation operation) +gpu_tile_obj_alloc_map_bit_op: ; 80073B8 push {r4-r6,lr} lsls r0, 16 lsrs r2, r0, 16 @@ -1390,7 +1390,7 @@ gpu_tile_obj_alloc_map_bit_op: @ 80073B8 adds r4, r2, 0 movs r5, 0 cmp r1, 0 - bne _080073F0 + bne @080073F0 movs r0, 0x1 lsls r0, r2 mvns r0, r0 @@ -1401,12 +1401,12 @@ gpu_tile_obj_alloc_map_bit_op: @ 80073B8 ldrb r1, [r0] ands r2, r1 strb r2, [r0] - b _0800741C + b @0800741C .align 2, 0 .pool -_080073F0: +@080073F0: cmp r1, 0x1 - bne _0800740C + bne @0800740C lsls r1, r2 lsls r0, r1, 24 lsrs r2, r0, 24 @@ -1415,10 +1415,10 @@ _080073F0: ldrb r1, [r0] orrs r2, r1 strb r2, [r0] - b _0800741C + b @0800741C .align 2, 0 .pool -_0800740C: +@0800740C: movs r0, 0x80 lsls r0, 17 lsls r0, r4 @@ -1427,7 +1427,7 @@ _0800740C: adds r0, r6, r0 ldrb r0, [r0] ands r5, r0 -_0800741C: +@0800741C: adds r0, r5, 0 pop {r4-r6} pop {r1} @@ -1437,27 +1437,27 @@ _0800741C: thumb_func_end gpu_tile_obj_alloc_map_bit_op thumb_func_start nullsub_12 -nullsub_12: @ 8007428 +nullsub_12: ; 8007428 bx lr thumb_func_end nullsub_12 thumb_func_start copy_queue_process -@ void copy_queue_process() -copy_queue_process: @ 800742C +; void copy_queue_process() +copy_queue_process: ; 800742C push {r4-r7,lr} ldr r0, =0x02021834 ldrb r0, [r0] cmp r0, 0 - beq _08007474 + beq @08007474 movs r4, 0 ldr r1, =0x02021835 ldrb r0, [r1] cmp r0, 0 - beq _0800746E + beq @0800746E ldr r6, =0x02021838 adds r7, r6, 0x4 adds r5, r1, 0 -_08007446: +@08007446: lsls r1, r4, 1 adds r1, r4 lsls r1, 2 @@ -1476,12 +1476,12 @@ _08007446: lsrs r4, r0, 24 lsls r1, 24 cmp r1, 0 - bne _08007446 -_0800746E: + bne @08007446 +@0800746E: ldr r1, =0x02021834 movs r0, 0 strb r0, [r1] -_08007474: +@08007474: pop {r4-r7} pop {r0} bx r0 @@ -1490,7 +1490,7 @@ _08007474: thumb_func_end copy_queue_process thumb_func_start copy_queue_add_oam_frame -copy_queue_add_oam_frame: @ 8007488 +copy_queue_add_oam_frame: ; 8007488 push {r4-r6,lr} adds r5, r2, 0 lsls r0, 16 @@ -1500,7 +1500,7 @@ copy_queue_add_oam_frame: @ 8007488 ldr r4, =0x02021835 ldrb r0, [r4] cmp r0, 0x3F - bhi _080074D8 + bhi @080074D8 ldr r3, =0x02021838 adds r1, r0, 0 lsls r0, r1, 1 @@ -1531,7 +1531,7 @@ copy_queue_add_oam_frame: @ 8007488 ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] -_080074D8: +@080074D8: pop {r4-r6} pop {r0} bx r0 @@ -1540,8 +1540,8 @@ _080074D8: thumb_func_end copy_queue_add_oam_frame thumb_func_start copy_queue_add -@ void copy_queue_add(void *src, void *dest, u16 len) -copy_queue_add: @ 80074EC +; void copy_queue_add(void *src, void *dest, u16 len) +copy_queue_add: ; 80074EC push {r4-r6,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -1550,7 +1550,7 @@ copy_queue_add: @ 80074EC ldr r3, =0x02021835 ldrb r0, [r3] cmp r0, 0x3F - bhi _0800752C + bhi @0800752C ldr r2, =0x02021838 adds r1, r0, 0 lsls r0, r1, 1 @@ -1574,7 +1574,7 @@ copy_queue_add: @ 80074EC ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] -_0800752C: +@0800752C: pop {r4-r6} pop {r0} bx r0 @@ -1583,21 +1583,21 @@ _0800752C: thumb_func_end copy_queue_add thumb_func_start copy_all_from_objects -@ void copy_all_from_objects(void *dest) -copy_all_from_objects: @ 800753C +; void copy_all_from_objects(void *dest) +copy_all_from_objects: ; 800753C push {r4,lr} adds r1, r0, 0 ldr r3, =0x02020630 movs r2, 0 ldr r4, =0x000010ff -_08007546: +@08007546: ldrb r0, [r3] strb r0, [r1] adds r1, 0x1 adds r3, 0x1 adds r2, 0x1 cmp r2, r4 - bls _08007546 + bls @08007546 pop {r4} pop {r0} bx r0 @@ -1606,21 +1606,21 @@ _08007546: thumb_func_end copy_all_from_objects thumb_func_start copy_all_to_objects -@ void copy_all_to_objects(void *src) -copy_all_to_objects: @ 8007564 +; void copy_all_to_objects(void *src) +copy_all_to_objects: ; 8007564 push {r4,lr} adds r1, r0, 0 ldr r3, =0x02020630 movs r2, 0 ldr r4, =0x000010ff -_0800756E: +@0800756E: ldrb r0, [r1] strb r0, [r3] adds r1, 0x1 adds r3, 0x1 adds r2, 0x1 cmp r2, r4 - bls _0800756E + bls @0800756E pop {r4} pop {r0} bx r0 @@ -1629,11 +1629,11 @@ _0800756E: thumb_func_end copy_all_to_objects thumb_func_start obj_delete_all -@ void obj_delete_all() -obj_delete_all: @ 800758C +; void obj_delete_all() +obj_delete_all: ; 800758C push {r4,r5,lr} movs r4, 0 -_08007590: +@08007590: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -1647,7 +1647,7 @@ _08007590: lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3F - bls _08007590 + bls @08007590 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -1661,17 +1661,17 @@ _08007590: thumb_func_end obj_delete_all thumb_func_start obj_free_tiles -@ void obj_free_tiles(struct obj *obj) -obj_free_tiles: @ 80075C8 +; void obj_free_tiles(struct obj *obj) +obj_free_tiles: ; 80075C8 push {lr} ldr r2, [r0, 0x14] ldrh r1, [r2] ldr r0, =0x0000ffff cmp r1, r0 - beq _080075DA + beq @080075DA adds r0, r1, 0 bl gpu_tile_obj_free_by_tag -_080075DA: +@080075DA: pop {r0} bx r0 .align 2, 0 @@ -1679,8 +1679,8 @@ _080075DA: thumb_func_end obj_free_tiles thumb_func_start obj_free_pal -@ void obj_free_pal(struct obj *obj) -obj_free_pal: @ 80075E4 +; void obj_free_pal(struct obj *obj) +obj_free_pal: ; 80075E4 push {lr} ldr r0, [r0, 0x14] ldrh r0, [r0, 0x2] @@ -1690,8 +1690,8 @@ obj_free_pal: @ 80075E4 thumb_func_end obj_free_pal 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] @@ -1700,7 +1700,7 @@ obj_free_rotscale_entry: @ 80075F4 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _0800761A + beq @0800761A ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 @@ -1710,15 +1710,15 @@ obj_free_rotscale_entry: @ 80075F4 negs r0, r0 ands r0, r1 strb r0, [r4, 0x1] -_0800761A: +@0800761A: pop {r4} pop {r0} bx r0 thumb_func_end obj_free_rotscale_entry thumb_func_start obj_delete_and_free_resources -@ void obj_delete_and_free_resources(struct obj *obj) -obj_delete_and_free_resources: @ 8007620 +; void obj_delete_and_free_resources(struct obj *obj) +obj_delete_and_free_resources: ; 8007620 push {r4,lr} adds r4, r0, 0 bl obj_free_tiles @@ -1734,8 +1734,8 @@ obj_delete_and_free_resources: @ 8007620 thumb_func_end obj_delete_and_free_resources thumb_func_start obj_anim_step -@ void obj_anim_step(struct obj *obj) -obj_anim_step: @ 8007640 +; void obj_anim_step(struct obj *obj) +obj_anim_step: ; 8007640 push {r4,r5,lr} adds r4, r0, 0 ldr r2, =0x082ec6c4 @@ -1751,7 +1751,7 @@ obj_anim_step: @ 8007640 ldr r0, =0x02021cc0 ldrb r0, [r0] cmp r0, 0 - bne _08007676 + bne @08007676 ldr r0, =0x082ec6cc ldrb r1, [r5] lsls r1, 28 @@ -1761,7 +1761,7 @@ obj_anim_step: @ 8007640 ldr r1, [r1] adds r0, r4, 0 bl _call_via_r1 -_08007676: +@08007676: pop {r4,r5} pop {r0} bx r0 @@ -1770,8 +1770,8 @@ _08007676: thumb_func_end obj_anim_step thumb_func_start obj_anim_image_begin -@ void obj_anim_image_begin(struct obj *obj) -obj_anim_image_begin: @ 8007688 +; void obj_anim_image_begin(struct obj *obj) +obj_anim_image_begin: ; 8007688 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -1809,7 +1809,7 @@ obj_anim_image_begin: @ 8007688 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq _0800776C + beq @0800776C ldrb r1, [r5] subs r0, 0x4 ands r0, r1 @@ -1830,11 +1830,11 @@ obj_anim_image_begin: @ 8007688 lsls r0, 8 lsrs r6, r0, 31 cmp r3, 0 - beq _08007704 + beq @08007704 subs r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 -_08007704: +@08007704: adds r2, r4, 0 adds r2, 0x2C movs r0, 0x3F @@ -1850,17 +1850,17 @@ _08007704: movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _0800772E + bne @0800772E adds r0, r4, 0 adds r1, r7, 0 adds r2, r6, 0 bl obj_set_horizonal_and_vertical_flip -_0800772E: +@0800772E: ldrb r1, [r5] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0800775C + beq @0800775C adds r0, r4, 0 adds r0, 0x40 ldrh r1, [r0] @@ -1873,10 +1873,10 @@ _0800772E: ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] - b _0800776C + b @0800776C .align 2, 0 .pool -_0800775C: +@0800775C: mov r1, r8 lsrs r0, r1, 16 ldrh r1, [r4, 0x4] @@ -1884,7 +1884,7 @@ _0800775C: lsrs r1, 22 ldr r2, [r4, 0xC] bl copy_queue_add_oam_frame -_0800776C: +@0800776C: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -1894,8 +1894,8 @@ _0800776C: thumb_func_end obj_anim_image_begin thumb_func_start obj_anim_image_continue -@ void obj_anim_image_continue(struct obj *obj) -obj_anim_image_continue: @ 8007778 +; void obj_anim_image_continue(struct obj *obj) +obj_anim_image_continue: ; 8007778 push {r4,lr} adds r4, r0, 0 adds r0, 0x2C @@ -1903,7 +1903,7 @@ obj_anim_image_continue: @ 8007778 movs r0, 0x3F ands r0, r1 cmp r0, 0 - beq _080077C8 + beq @080077C8 adds r0, r4, 0 bl obj_anim_image_delay_progress adds r0, r4, 0 @@ -1929,16 +1929,16 @@ obj_anim_image_continue: @ 8007778 movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _0800780E + bne @0800780E adds r0, r4, 0 adds r1, r3, 0 bl obj_set_horizonal_and_vertical_flip - b _0800780E -_080077C8: + b @0800780E +@080077C8: movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne _0800780E + bne @0800780E adds r2, r4, 0 adds r2, 0x2B ldrb r0, [r2] @@ -1958,11 +1958,11 @@ _080077C8: movs r3, 0 ldrsh r0, [r1, r3] cmp r0, 0 - bge _080077FE + bge @080077FE adds r0, 0x3 lsls r0, 16 lsrs r2, r0, 16 -_080077FE: +@080077FE: ldr r0, =0x082ec6d4 lsls r1, r2, 16 asrs r1, 14 @@ -1970,7 +1970,7 @@ _080077FE: ldr r1, [r1] adds r0, r4, 0 bl _call_via_r1 -_0800780E: +@0800780E: pop {r4} pop {r0} bx r0 @@ -1979,8 +1979,8 @@ _0800780E: thumb_func_end obj_anim_image_continue thumb_func_start anim_image_3 -@ void anim_image_3(struct obj *obj) -anim_image_3: @ 8007818 +; void anim_image_3(struct obj *obj) +anim_image_3: ; 8007818 push {r4-r7,lr} mov r7, r8 push {r7} @@ -2006,11 +2006,11 @@ anim_image_3: @ 8007818 lsls r0, 8 lsrs r5, r0, 31 cmp r3, 0 - beq _08007852 + beq @08007852 subs r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 -_08007852: +@08007852: adds r2, r4, 0 adds r2, 0x2C movs r0, 0x3F @@ -2026,19 +2026,19 @@ _08007852: movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _0800787C + bne @0800787C adds r0, r4, 0 adds r1, r6, 0 adds r2, r5, 0 bl obj_set_horizonal_and_vertical_flip -_0800787C: +@0800787C: adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _080078AC + beq @080078AC adds r0, r4, 0 adds r0, 0x40 ldrh r1, [r0] @@ -2051,17 +2051,17 @@ _0800787C: ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] - b _080078BA + b @080078BA .align 2, 0 .pool -_080078AC: +@080078AC: mov r0, r8 ldrh r1, [r4, 0x4] lsls r1, 22 lsrs r1, 22 ldr r2, [r4, 0xC] bl copy_queue_add_oam_frame -_080078BA: +@080078BA: pop {r3} mov r8, r3 pop {r4-r7} @@ -2070,8 +2070,8 @@ _080078BA: thumb_func_end anim_image_3 thumb_func_start anim_image_2 -@ void anim_image_2(struct obj *obj) -anim_image_2: @ 80078C4 +; void anim_image_2(struct obj *obj) +anim_image_2: ; 80078C4 adds r2, r0, 0 adds r2, 0x2B ldrb r1, [r2] @@ -2086,8 +2086,8 @@ anim_image_2: @ 80078C4 thumb_func_end anim_image_2 thumb_func_start anim_image_1 -@ void anim_image_1(struct obj *obj) -anim_image_1: @ 80078DC +; void anim_image_1(struct obj *obj) +anim_image_1: ; 80078DC push {r4-r7,lr} mov r7, r8 push {r7} @@ -2126,11 +2126,11 @@ anim_image_1: @ 80078DC lsls r0, 8 lsrs r5, r0, 31 cmp r3, 0 - beq _08007930 + beq @08007930 subs r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 -_08007930: +@08007930: adds r2, r4, 0 adds r2, 0x2C movs r0, 0x3F @@ -2146,19 +2146,19 @@ _08007930: movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne _0800795A + bne @0800795A adds r0, r4, 0 adds r1, r6, 0 adds r2, r5, 0 bl obj_set_horizonal_and_vertical_flip -_0800795A: +@0800795A: adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _0800798C + beq @0800798C adds r0, r4, 0 adds r0, 0x40 ldrh r1, [r0] @@ -2171,17 +2171,17 @@ _0800795A: ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] - b _0800799A + b @0800799A .align 2, 0 .pool -_0800798C: +@0800798C: mov r0, r8 ldrh r1, [r4, 0x4] lsls r1, 22 lsrs r1, 22 ldr r2, [r4, 0xC] bl copy_queue_add_oam_frame -_0800799A: +@0800799A: pop {r3} mov r8, r3 pop {r4-r7} @@ -2190,28 +2190,28 @@ _0800799A: thumb_func_end anim_image_1 thumb_func_start anim_image_0 -@ void anim_image_0(struct obj *obj) -anim_image_0: @ 80079A4 +; void anim_image_0(struct obj *obj) +anim_image_0: ; 80079A4 push {lr} adds r1, r0, 0 adds r0, 0x2D ldrb r0, [r0] cmp r0, 0 - beq _080079B8 + beq @080079B8 adds r0, r1, 0 bl sub_80079FC - b _080079BE -_080079B8: + b @080079BE +@080079B8: adds r0, r1, 0 bl sub_80079C4 -_080079BE: +@080079BE: pop {r0} bx r0 thumb_func_end anim_image_0 thumb_func_start sub_80079C4 -@ void sub_80079C4(struct obj *obj) -sub_80079C4: @ 80079C4 +; void sub_80079C4(struct obj *obj) +sub_80079C4: ; 80079C4 push {r4,lr} adds r4, r0, 0 adds r0, 0x2A @@ -2241,8 +2241,8 @@ sub_80079C4: @ 80079C4 thumb_func_end sub_80079C4 thumb_func_start sub_80079FC -@ void sub_80079FC(struct obj *obj) -sub_80079FC: @ 80079FC +; void sub_80079FC(struct obj *obj) +sub_80079FC: ; 80079FC push {r4,lr} adds r4, r0, 0 adds r1, r4, 0 @@ -2260,14 +2260,14 @@ sub_80079FC: @ 80079FC thumb_func_end sub_80079FC thumb_func_start obj_anim_rewind_to_cmd00 -@ void obj_anim_rewind_to_cmd00(struct obj *obj) -obj_anim_rewind_to_cmd00: @ 8007A1C +; void obj_anim_rewind_to_cmd00(struct obj *obj) +obj_anim_rewind_to_cmd00: ; 8007A1C push {r4-r7,lr} mov r12, r0 adds r0, 0x2D ldrb r0, [r0] cmp r0, 0 - beq _08007A88 + beq @08007A88 mov r3, r12 adds r3, 0x2B ldrb r0, [r3] @@ -2291,13 +2291,13 @@ obj_anim_rewind_to_cmd00: @ 8007A1C negs r1, r1 adds r4, r3, 0 cmp r0, r1 - beq _08007A82 + beq @08007A82 adds r6, r1, 0 adds r2, r4, 0 -_08007A5C: +@08007A5C: ldrb r0, [r2] cmp r0, 0 - beq _08007A82 + beq @08007A82 subs r0, 0x1 strb r0, [r3] ldrb r1, [r5] @@ -2313,19 +2313,19 @@ _08007A5C: movs r1, 0 ldrsh r0, [r0, r1] cmp r0, r6 - bne _08007A5C -_08007A82: + bne @08007A5C +@08007A82: ldrb r0, [r4] subs r0, 0x1 strb r0, [r4] -_08007A88: +@08007A88: pop {r4-r7} pop {r0} bx r0 thumb_func_end obj_anim_rewind_to_cmd00 thumb_func_start obj_anim_rotscale_begin -obj_anim_rotscale_begin: @ 8007A90 +obj_anim_rotscale_begin: ; 8007A90 push {r4-r7,lr} sub sp, 0x8 adds r6, r0, 0 @@ -2335,14 +2335,14 @@ obj_anim_rotscale_begin: @ 8007A90 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08007B12 + beq @08007B12 ldr r0, [r6, 0x10] ldr r0, [r0] movs r2, 0 ldrsh r1, [r0, r2] ldr r0, =0x00007fff cmp r1, r0 - beq _08007B12 + beq @08007B12 adds r0, r6, 0 bl obj_get_rotscale_entry_index adds r4, r0, 0 @@ -2379,14 +2379,14 @@ obj_anim_rotscale_begin: @ 8007A90 movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08007B12 + beq @08007B12 movs r0, 0x3A ldrsh r1, [r6, r0] movs r0, 0x3C ldrsh r2, [r6, r0] adds r0, r6, 0 bl obj_update_pos2 -_08007B12: +@08007B12: add sp, 0x8 pop {r4-r7} pop {r0} @@ -2396,7 +2396,7 @@ _08007B12: thumb_func_end obj_anim_rotscale_begin thumb_func_start obj_anim_rotscale_continue -obj_anim_rotscale_continue: @ 8007B24 +obj_anim_rotscale_continue: ; 8007B24 push {r4,r5,lr} adds r4, r0, 0 ldrb r0, [r4, 0x1] @@ -2405,7 +2405,7 @@ obj_anim_rotscale_continue: @ 8007B24 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08007BC6 + beq @08007BC6 adds r0, r4, 0 bl obj_get_rotscale_entry_index lsls r0, 24 @@ -2418,21 +2418,21 @@ obj_anim_rotscale_continue: @ 8007B24 adds r3, r0, r1 ldrb r0, [r3, 0x2] cmp r0, 0 - beq _08007B60 + beq @08007B60 adds r0, r2, 0 adds r1, r4, 0 bl sub_8007BD8 - b _08007BAA + b @08007BAA .align 2, 0 .pool -_08007B60: +@08007B60: adds r0, r4, 0 adds r0, 0x2C ldrb r1, [r0] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08007BC6 + bne @08007BC6 ldrb r0, [r3, 0x1] adds r0, 0x1 strb r0, [r3, 0x1] @@ -2449,12 +2449,12 @@ _08007B60: ldrsh r1, [r1, r0] ldr r0, =0x00007ffc cmp r1, r0 - ble _08007B98 + ble @08007B98 ldr r2, =0xffff8003 adds r0, r1, r2 lsls r0, 16 lsrs r2, r0, 16 -_08007B98: +@08007B98: ldr r0, =0x082ec6e4 lsls r1, r2, 16 asrs r1, 14 @@ -2463,21 +2463,21 @@ _08007B98: adds r0, r5, 0 adds r1, r4, 0 bl _call_via_r2 -_08007BAA: +@08007BAA: adds r0, r4, 0 adds r0, 0x3F ldrb r1, [r0] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08007BC6 + beq @08007BC6 movs r0, 0x3A ldrsh r1, [r4, r0] movs r0, 0x3C ldrsh r2, [r4, r0] adds r0, r4, 0 bl obj_update_pos2 -_08007BC6: +@08007BC6: pop {r4,r5} pop {r0} bx r0 @@ -2486,7 +2486,7 @@ _08007BC6: thumb_func_end obj_anim_rotscale_continue thumb_func_start sub_8007BD8 -sub_8007BD8: @ 8007BD8 +sub_8007BD8: ; 8007BD8 push {r4,r5,lr} sub sp, 0x8 adds r5, r1, 0 @@ -2497,7 +2497,7 @@ sub_8007BD8: @ 8007BD8 bl obj_anim_rotscale_delay_progress lsls r0, 24 cmp r0, 0 - bne _08007C02 + bne @08007C02 adds r0, r4, 0 adds r1, r5, 0 mov r2, sp @@ -2505,7 +2505,7 @@ sub_8007BD8: @ 8007BD8 adds r0, r4, 0 mov r1, sp bl rotscale_frame_apply_relative_and_sync -_08007C02: +@08007C02: add sp, 0x8 pop {r4,r5} pop {r0} @@ -2513,7 +2513,7 @@ _08007C02: thumb_func_end sub_8007BD8 thumb_func_start anim_rotscale_0 -anim_rotscale_0: @ 8007C0C +anim_rotscale_0: ; 8007C0C push {lr} adds r3, r1, 0 lsls r0, 24 @@ -2525,24 +2525,24 @@ anim_rotscale_0: @ 8007C0C adds r0, r1 ldrb r0, [r0, 0x3] cmp r0, 0 - beq _08007C34 + beq @08007C34 adds r0, r2, 0 adds r1, r3, 0 bl sub_8007C7C - b _08007C3C + b @08007C3C .align 2, 0 .pool -_08007C34: +@08007C34: adds r0, r2, 0 adds r1, r3, 0 bl sub_8007C40 -_08007C3C: +@08007C3C: pop {r0} bx r0 thumb_func_end anim_rotscale_0 thumb_func_start sub_8007C40 -sub_8007C40: @ 8007C40 +sub_8007C40: ; 8007C40 push {r4,lr} adds r4, r1, 0 lsls r0, 24 @@ -2574,7 +2574,7 @@ sub_8007C40: @ 8007C40 thumb_func_end sub_8007C40 thumb_func_start sub_8007C7C -sub_8007C7C: @ 8007C7C +sub_8007C7C: ; 8007C7C push {r4,lr} adds r4, r1, 0 lsls r0, 24 @@ -2599,7 +2599,7 @@ sub_8007C7C: @ 8007C7C thumb_func_end sub_8007C7C thumb_func_start obj_anim_rotscale_rewind_to_cmd00_maybe -obj_anim_rotscale_rewind_to_cmd00_maybe: @ 8007CAC +obj_anim_rotscale_rewind_to_cmd00_maybe: ; 8007CAC push {r4-r7,lr} mov r12, r1 lsls r0, 24 @@ -2612,20 +2612,20 @@ obj_anim_rotscale_rewind_to_cmd00_maybe: @ 8007CAC ldrb r0, [r2, 0x3] adds r6, r1, 0 cmp r0, 0 - beq _08007D0C + beq @08007D0C ldrb r0, [r2, 0x1] subs r0, 0x1 strb r0, [r2, 0x1] adds r4, r3, 0 - b _08007CDC + b @08007CDC .align 2, 0 .pool -_08007CD4: +@08007CD4: cmp r2, 0 - beq _08007D00 + beq @08007D00 subs r0, r2, 0x1 strb r0, [r3, 0x1] -_08007CDC: +@08007CDC: adds r0, r4, r5 lsls r0, 2 adds r3, r0, r6 @@ -2643,15 +2643,15 @@ _08007CDC: ldrsh r1, [r0, r7] ldr r0, =0x00007ffd cmp r1, r0 - bne _08007CD4 -_08007D00: + bne @08007CD4 +@08007D00: adds r1, r4, r5 lsls r1, 2 adds r1, r6 ldrb r0, [r1, 0x1] subs r0, 0x1 strb r0, [r1, 0x1] -_08007D0C: +@08007D0C: pop {r4-r7} pop {r0} bx r0 @@ -2660,7 +2660,7 @@ _08007D0C: thumb_func_end obj_anim_rotscale_rewind_to_cmd00_maybe thumb_func_start anim_rotscale_1 -anim_rotscale_1: @ 8007D18 +anim_rotscale_1: ; 8007D18 push {r4-r6,lr} sub sp, 0x8 adds r5, r0, 0 @@ -2699,7 +2699,7 @@ anim_rotscale_1: @ 8007D18 thumb_func_end anim_rotscale_1 thumb_func_start anim_rotscale_2 -anim_rotscale_2: @ 8007D64 +anim_rotscale_2: ; 8007D64 push {lr} sub sp, 0x8 lsls r0, 24 @@ -2731,7 +2731,7 @@ anim_rotscale_2: @ 8007D64 thumb_func_end anim_rotscale_2 thumb_func_start anim_rotscale_3 -anim_rotscale_3: @ 8007DA0 +anim_rotscale_3: ; 8007DA0 push {r4,r5,lr} sub sp, 0x8 adds r4, r0, 0 @@ -2760,8 +2760,8 @@ anim_rotscale_3: @ 8007DA0 thumb_func_end anim_rotscale_3 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 @@ -2780,8 +2780,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 @@ -2791,19 +2791,19 @@ obj_get_rotscale_entry_index: @ 8007DF8 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq _08007E12 + beq @08007E12 ldrb r0, [r2, 0x3] lsls r0, 26 lsrs r3, r0, 27 -_08007E12: +@08007E12: adds r0, r3, 0 pop {r1} bx r1 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 @@ -2815,21 +2815,21 @@ 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 subs r0, r1, r3 cmp r0, 0 - bge _08007E3A + bge @08007E3A negs r0, r0 asrs r4, r0, 9 - b _08007E3E -_08007E3A: + b @08007E3E +@08007E3A: asrs r0, 9 negs r4, r0 -_08007E3E: +@08007E3E: adds r0, r5, 0 muls r0, r1 adds r1, r3, 0 @@ -2842,8 +2842,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 @@ -2858,7 +2858,7 @@ obj_update_pos2: @ 8007E54 lsls r0, 4 mov r9, r0 cmp r6, r9 - beq _08007EA2 + beq @08007EA2 ldr r2, =0x082ec6f4 lsrs r1, 6 lsls r1, 3 @@ -2881,9 +2881,9 @@ obj_update_pos2: @ 8007E54 adds r2, r6, 0 bl sub_8007E28 strh r0, [r5, 0x24] -_08007EA2: +@08007EA2: cmp r8, r9 - beq _08007EDA + beq @08007EDA ldr r2, =0x082ec6f4 ldrb r1, [r5, 0x3] lsrs r1, 6 @@ -2908,7 +2908,7 @@ _08007EA2: mov r2, r8 bl sub_8007E28 strh r0, [r5, 0x26] -_08007EDA: +@08007EDA: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -2920,8 +2920,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} @@ -2982,8 +2982,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 @@ -3001,8 +3001,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) -rotscale_reset_full_1: @ 8007F80 +; void rotscale_reset_full_1(u8 index) +rotscale_reset_full_1: ; 8007F80 lsls r0, 24 lsrs r0, 24 ldr r3, =0x03000b70 @@ -3026,8 +3026,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 @@ -3051,8 +3051,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 @@ -3073,7 +3073,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 @@ -3081,7 +3081,7 @@ obj_anim_image_delay_progress: @ 8007FF4 movs r0, 0x40 ands r0, r2 cmp r0, 0 - bne _08008018 + bne @08008018 lsls r0, r2, 26 lsrs r0, 26 subs r0, 0x1 @@ -3092,13 +3092,13 @@ obj_anim_image_delay_progress: @ 8007FF4 ands r1, r2 orrs r1, r0 strb r1, [r3] -_08008018: +@08008018: pop {r0} bx r0 thumb_func_end obj_anim_image_delay_progress thumb_func_start obj_anim_rotscale_delay_progress -obj_anim_rotscale_delay_progress: @ 800801C +obj_anim_rotscale_delay_progress: ; 800801C push {lr} lsls r1, 24 lsrs r2, r1, 24 @@ -3108,7 +3108,7 @@ obj_anim_rotscale_delay_progress: @ 800801C movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08008040 + bne @08008040 ldr r0, =0x03000b70 lsls r1, r2, 1 adds r1, r2 @@ -3117,7 +3117,7 @@ obj_anim_rotscale_delay_progress: @ 800801C ldrb r0, [r1, 0x2] subs r0, 0x1 strb r0, [r1, 0x2] -_08008040: +@08008040: ldrb r0, [r3] lsrs r0, 7 pop {r1} @@ -3127,8 +3127,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 @@ -3184,7 +3184,7 @@ rotscale_frame_apply_relative_and_sync: @ 800804C adds r1, r4, 0 movs r2, 0x1 movs r3, 0x2 - bl _082E709C + bl ObjAffineSet adds r0, r5, 0 adds r1, r4, 0 bl rotscale_set_indirect @@ -3197,8 +3197,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 @@ -3213,8 +3213,8 @@ divide_0x10000_by: @ 80080E4 thumb_func_end divide_0x10000_by thumb_func_start rotscale_load_frame -@ void rotscale_load_frame(u8 index, int a2, int a3) -rotscale_load_frame: @ 80080FC +; void rotscale_load_frame(u8 index, int a2, int a3) +rotscale_load_frame: ; 80080FC push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -3271,7 +3271,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 @@ -3283,21 +3283,21 @@ sub_8008168: @ 8008168 str r1, [sp, 0x4] ldrb r0, [r2, 0x5] cmp r0, 0 - beq _0800818E + beq @0800818E subs r0, 0x1 strb r0, [r2, 0x5] adds r0, r4, 0 adds r1, r2, 0 bl rotscale_frame_apply_relative_and_sync - b _0800819E -_0800818E: + b @0800819E +@0800818E: adds r0, r4, 0 adds r1, r2, 0 bl rotscale_frame_apply_absolute adds r0, r4, 0 mov r1, sp bl rotscale_frame_apply_relative_and_sync -_0800819E: +@0800819E: add sp, 0x8 pop {r4} pop {r0} @@ -3305,7 +3305,7 @@ _0800819E: thumb_func_end sub_8008168 thumb_func_start obj_anim_image_start -obj_anim_image_start: @ 80081A8 +obj_anim_image_start: ; 80081A8 adds r2, r0, 0 adds r2, 0x2A strb r1, [r2] @@ -3321,7 +3321,7 @@ obj_anim_image_start: @ 80081A8 thumb_func_end obj_anim_image_start thumb_func_start obj_anim_image_start_if_different -obj_anim_image_start_if_different: @ 80081C0 +obj_anim_image_start_if_different: ; 80081C0 push {lr} adds r2, r0, 0 lsls r1, 24 @@ -3329,16 +3329,16 @@ obj_anim_image_start_if_different: @ 80081C0 adds r0, 0x2A ldrb r0, [r0] cmp r0, r1 - beq _080081D6 + beq @080081D6 adds r0, r2, 0 bl obj_anim_image_start -_080081D6: +@080081D6: pop {r0} bx r0 thumb_func_end obj_anim_image_start_if_different thumb_func_start obj_anim_image_seek -obj_anim_image_seek: @ 80081DC +obj_anim_image_seek: ; 80081DC push {r4-r7,lr} adds r3, r0, 0 lsls r1, 24 @@ -3380,7 +3380,7 @@ obj_anim_image_seek: @ 80081DC movs r0, 0x3F ands r0, r2 cmp r0, 0 - beq _08008244 + beq @08008244 lsls r0, r2, 26 lsrs r0, 26 adds r0, 0x1 @@ -3390,7 +3390,7 @@ obj_anim_image_seek: @ 80081DC ands r1, r2 orrs r1, r0 strb r1, [r4] -_08008244: +@08008244: lsls r2, r6, 6 ldrb r1, [r4] adds r0, r5, 0 @@ -3403,7 +3403,7 @@ _08008244: thumb_func_end obj_anim_image_seek thumb_func_start sub_8008258 -sub_8008258: @ 8008258 +sub_8008258: ; 8008258 push {r4,r5,lr} adds r5, r0, 0 lsls r4, r1, 24 @@ -3427,7 +3427,7 @@ sub_8008258: @ 8008258 thumb_func_end sub_8008258 thumb_func_start sub_8008284 -sub_8008284: @ 8008284 +sub_8008284: ; 8008284 push {r4,r5,lr} adds r5, r0, 0 lsls r1, 24 @@ -3442,11 +3442,11 @@ sub_8008284: @ 8008284 adds r1, r2 ldrb r0, [r1] cmp r0, r4 - beq _080082AC + beq @080082AC adds r0, r5, 0 adds r1, r4, 0 bl sub_8008258 -_080082AC: +@080082AC: pop {r4,r5} pop {r0} bx r0 @@ -3455,7 +3455,7 @@ _080082AC: thumb_func_end sub_8008284 thumb_func_start sub_80082B8 -sub_80082B8: @ 80082B8 +sub_80082B8: ; 80082B8 push {r4,r5,lr} adds r5, r0, 0 lsls r4, r1, 24 @@ -3485,7 +3485,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 @@ -3500,11 +3500,11 @@ sub_80082F0: @ 80082F0 adds r1, r2 ldrb r0, [r1] cmp r0, r4 - beq _08008318 + beq @08008318 adds r0, r5, 0 adds r1, r4, 0 bl sub_80082B8 -_08008318: +@08008318: pop {r4,r5} pop {r0} bx r0 @@ -3513,7 +3513,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 @@ -3521,7 +3521,7 @@ sub_8008324: @ 8008324 movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq _08008370 + beq @08008370 adds r0, r3, 0 adds r0, 0x2A ldrb r1, [r0] @@ -3538,9 +3538,9 @@ sub_8008324: @ 8008324 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bge _08008358 + bge @08008358 movs r2, 0 -_08008358: +@08008358: adds r0, r3, 0 adds r0, 0x40 ldrh r1, [r0] @@ -3553,7 +3553,7 @@ _08008358: ands r0, r2 orrs r0, r1 strh r0, [r3, 0x4] -_08008370: +@08008370: pop {r0} bx r0 .align 2, 0 @@ -3561,8 +3561,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 @@ -3572,14 +3572,14 @@ rotscale_reset_all: @ 800837C str r0, [r1] bl reset_rotscale_coeffs movs r4, 0 -_08008390: +@08008390: adds r0, r4, 0 bl rotscale_reset_full_2 adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1F - bls _08008390 + bls @08008390 pop {r4} pop {r0} bx r0 @@ -3588,43 +3588,43 @@ _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 ldr r0, =0x03003018 ldr r4, [r0] adds r3, r0, 0 -_080083BC: +@080083BC: adds r0, r4, 0 ands r0, r1 cmp r0, 0 - bne _080083D4 + bne @080083D4 ldr r0, [r3] orrs r0, r1 str r0, [r3] adds r0, r2, 0 - b _080083E2 + b @080083E2 .align 2, 0 .pool -_080083D4: +@080083D4: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 lsls r1, 1 cmp r2, 0x1F - bls _080083BC + bls @080083BC movs r0, 0xFF -_080083E2: +@080083E2: pop {r4} pop {r1} bx r1 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 @@ -3633,15 +3633,15 @@ rotscale_free_entry: @ 80083E8 movs r1, 0x1 ldr r3, =0x03003018 cmp r0, r2 - bcs _08008406 -_080083FA: + bcs @08008406 +@080083FA: adds r0, 0x1 lsls r0, 24 lsrs r0, 24 lsls r1, 1 cmp r0, r2 - bcc _080083FA -_08008406: + bcc @080083FA +@08008406: ldr r0, [r3] bics r0, r1 str r0, [r3] @@ -3660,15 +3660,15 @@ _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 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0xFF - beq _08008470 + beq @08008470 ldrb r3, [r4, 0x1] lsrs r1, r3, 6 ldrb r2, [r4, 0x3] @@ -3695,14 +3695,14 @@ obj_alloc_rotscale_entry: @ 8008428 strb r0, [r2] adds r0, r5, 0 bl rotscale_reset_full_2 -_08008470: +@08008470: pop {r4,r5} pop {r0} bx r0 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} @@ -3749,7 +3749,7 @@ sub_8008478: @ 8008478 adds r1, r4, 0 movs r2, 0x1 movs r3, 0x2 - bl _082E709C + bl ObjAffineSet adds r0, r6, 0 adds r1, r4, 0 bl rotscale_set_indirect @@ -3764,8 +3764,8 @@ sub_8008478: @ 8008478 thumb_func_end sub_8008478 thumb_func_start gpu_tile_obj_alloc_tag_and_copy_to_vram -@ int gpu_tile_obj_alloc_tag_and_copy_to_vram(struct rom_obj_tile_data *x) -gpu_tile_obj_alloc_tag_and_copy_to_vram: @ 80084F8 +; int gpu_tile_obj_alloc_tag_and_copy_to_vram(struct rom_obj_tile_data *x) +gpu_tile_obj_alloc_tag_and_copy_to_vram: ; 80084F8 push {r4-r6,lr} adds r5, r0, 0 ldrh r0, [r5, 0x4] @@ -3774,7 +3774,7 @@ gpu_tile_obj_alloc_tag_and_copy_to_vram: @ 80084F8 lsls r4, r0, 16 asrs r6, r4, 16 cmp r6, 0 - blt _08008534 + blt @08008534 ldrh r0, [r5, 0x6] lsrs r4, 16 ldrh r2, [r5, 0x4] @@ -3789,27 +3789,27 @@ gpu_tile_obj_alloc_tag_and_copy_to_vram: @ 80084F8 lsrs r2, 1 bl CpuSet adds r0, r4, 0 - b _08008536 + b @08008536 .align 2, 0 .pool -_08008534: +@08008534: movs r0, 0 -_08008536: +@08008536: pop {r4-r6} pop {r1} bx r1 thumb_func_end gpu_tile_obj_alloc_tag_and_copy_to_vram thumb_func_start gpu_tile_obj_alloc_and_load_multiple -@ void gpu_tile_obj_alloc_and_load_multiple(struct rom_obj_tile_data[]) -gpu_tile_obj_alloc_and_load_multiple: @ 800853C +; void gpu_tile_obj_alloc_and_load_multiple(struct rom_obj_tile_data[]) +gpu_tile_obj_alloc_and_load_multiple: ; 800853C push {r4,r5,lr} adds r5, r0, 0 movs r4, 0 ldr r0, [r5] cmp r0, 0 - beq _08008560 -_08008548: + beq @08008560 +@08008548: lsls r0, r4, 3 adds r0, r5, r0 bl gpu_tile_obj_alloc_tag_and_copy_to_vram @@ -3820,16 +3820,16 @@ _08008548: adds r0, r5 ldr r0, [r0] cmp r0, 0 - bne _08008548 -_08008560: + bne @08008548 +@08008560: pop {r4,r5} pop {r0} bx r0 thumb_func_end gpu_tile_obj_alloc_and_load_multiple thumb_func_start gpu_tile_obj_free_by_tag -@ void gpu_tile_obj_free_by_tag(int tag) -gpu_tile_obj_free_by_tag: @ 8008568 +; void gpu_tile_obj_free_by_tag(int tag) +gpu_tile_obj_free_by_tag: ; 8008568 push {r4-r7,lr} mov r7, r8 push {r7} @@ -3839,7 +3839,7 @@ gpu_tile_obj_free_by_tag: @ 8008568 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xFF - beq _080085C6 + beq @080085C6 ldr r0, =0x03000a70 lsls r1, r4, 2 adds r2, r1, r0 @@ -3852,13 +3852,13 @@ gpu_tile_obj_free_by_tag: @ 8008568 mov r8, r1 lsls r5, r4, 1 cmp r3, r0 - bge _080085BE + bge @080085BE ldr r1, =0x02021b3c mov r12, r1 movs r6, 0x7 movs r7, 0x1 adds r4, r0, 0 -_080085A2: +@080085A2: lsrs r2, r3, 3 add r2, r12 adds r0, r3, 0 @@ -3872,13 +3872,13 @@ _080085A2: lsls r0, 16 lsrs r3, r0, 16 cmp r3, r4 - blt _080085A2 -_080085BE: + blt @080085A2 +@080085BE: mov r0, r8 adds r1, r5, r0 ldr r0, =0x0000ffff strh r0, [r1] -_080085C6: +@080085C6: pop {r3} mov r8, r3 pop {r4-r7} @@ -3889,8 +3889,8 @@ _080085C6: thumb_func_end gpu_tile_obj_free_by_tag thumb_func_start gpu_tile_obj_tags_reset -@ void gpu_tile_obj_tags_reset() -gpu_tile_obj_tags_reset: @ 80085E0 +; void gpu_tile_obj_tags_reset() +gpu_tile_obj_tags_reset: ; 80085E0 push {r4-r7,lr} movs r2, 0 ldr r7, =0x030009f0 @@ -3899,7 +3899,7 @@ gpu_tile_obj_tags_reset: @ 80085E0 ldr r4, =0x03000a70 movs r3, 0 adds r5, r4, 0x2 -_080085F0: +@080085F0: lsls r1, r2, 1 adds r1, r7 ldrh r0, [r1] @@ -3914,7 +3914,7 @@ _080085F0: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3F - bls _080085F0 + bls @080085F0 pop {r4-r7} pop {r0} bx r0 @@ -3923,8 +3923,8 @@ _080085F0: thumb_func_end gpu_tile_obj_tags_reset thumb_func_start gpu_tile_obj_tag_get_range_start -@ int gpu_tile_obj_tag_get_range_start(int tag) -gpu_tile_obj_tag_get_range_start: @ 8008620 +; int gpu_tile_obj_tag_get_range_start(int tag) +gpu_tile_obj_tag_get_range_start: ; 8008620 push {lr} lsls r0, 16 lsrs r0, 16 @@ -3932,17 +3932,17 @@ gpu_tile_obj_tag_get_range_start: @ 8008620 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xFF - beq _08008640 + beq @08008640 ldr r0, =0x03000a70 lsls r1, 2 adds r1, r0 ldrh r0, [r1] - b _08008642 + b @08008642 .align 2, 0 .pool -_08008640: +@08008640: ldr r0, =0x0000ffff -_08008642: +@08008642: pop {r1} bx r1 .align 2, 0 @@ -3950,36 +3950,36 @@ _08008642: thumb_func_end gpu_tile_obj_tag_get_range_start thumb_func_start gpu_tile_obj_tag_index_of -gpu_tile_obj_tag_index_of: @ 800864C +gpu_tile_obj_tag_index_of: ; 800864C push {lr} lsls r0, 16 lsrs r2, r0, 16 movs r1, 0 ldr r3, =0x030009f0 -_08008656: +@08008656: lsls r0, r1, 1 adds r0, r3 ldrh r0, [r0] cmp r0, r2 - bne _08008668 + bne @08008668 adds r0, r1, 0 - b _08008674 + b @08008674 .align 2, 0 .pool -_08008668: +@08008668: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x3F - bls _08008656 + bls @08008656 movs r0, 0xFF -_08008674: +@08008674: pop {r1} bx r1 thumb_func_end gpu_tile_obj_tag_index_of thumb_func_start gpu_tile_obj_tag_get_by_range_start -gpu_tile_obj_tag_get_by_range_start: @ 8008678 +gpu_tile_obj_tag_get_by_range_start: ; 8008678 push {r4-r6,lr} lsls r0, 16 lsrs r3, r0, 16 @@ -3987,29 +3987,29 @@ gpu_tile_obj_tag_get_by_range_start: @ 8008678 ldr r6, =0x030009f0 ldr r5, =0x0000ffff ldr r4, =0x03000a70 -_08008686: +@08008686: lsls r0, r2, 1 adds r1, r0, r6 ldrh r0, [r1] cmp r0, r5 - beq _080086AC + beq @080086AC lsls r0, r2, 2 adds r0, r4 ldrh r0, [r0] cmp r0, r3 - bne _080086AC + bne @080086AC ldrh r0, [r1] - b _080086B8 + b @080086B8 .align 2, 0 .pool -_080086AC: +@080086AC: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3F - bls _08008686 + bls @08008686 ldr r0, =0x0000ffff -_080086B8: +@080086B8: pop {r4-r6} pop {r1} bx r1 @@ -4018,8 +4018,8 @@ _080086B8: thumb_func_end gpu_tile_obj_tag_get_by_range_start thumb_func_start gpu_tile_obj_tag_add -@ void gpu_tile_obj_tag_add(u16 tag, u16 start, u16 count) -gpu_tile_obj_tag_add: @ 80086C4 +; void gpu_tile_obj_tag_add(u16 tag, u16 start, u16 count) +gpu_tile_obj_tag_add: ; 80086C4 push {r4-r6,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -4053,7 +4053,7 @@ gpu_tile_obj_tag_add: @ 80086C4 thumb_func_end gpu_tile_obj_tag_add thumb_func_start gpu_pal_allocator_reset -gpu_pal_allocator_reset: @ 800870C +gpu_pal_allocator_reset: ; 800870C push {r4,lr} ldr r1, =0x0300301c movs r0, 0 @@ -4062,7 +4062,7 @@ gpu_pal_allocator_reset: @ 800870C ldr r4, =0x03000cf0 ldr r0, =0x0000ffff adds r3, r0, 0 -_0800871C: +@0800871C: lsls r0, r2, 1 adds r0, r4 ldrh r1, [r0] @@ -4072,7 +4072,7 @@ _0800871C: lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xF - bls _0800871C + bls @0800871C pop {r4} pop {r0} bx r0 @@ -4081,8 +4081,8 @@ _0800871C: thumb_func_end gpu_pal_allocator_reset thumb_func_start gpu_pal_obj_alloc_tag_and_apply -@ s8 gpu_pal_obj_alloc_tag_and_apply(struct rom_obj_pal_data *data) -gpu_pal_obj_alloc_tag_and_apply: @ 8008744 +; s8 gpu_pal_obj_alloc_tag_and_apply(struct rom_obj_pal_data *data) +gpu_pal_obj_alloc_tag_and_apply: ; 8008744 push {r4,r5,lr} adds r5, r0, 0 ldrh r0, [r5, 0x4] @@ -4090,16 +4090,16 @@ gpu_pal_obj_alloc_tag_and_apply: @ 8008744 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xFF - beq _0800875A + beq @0800875A adds r0, r4, 0 - b _0800878A -_0800875A: + b @0800878A +@0800875A: ldr r0, =0x0000ffff bl gpu_pal_tags_index_of lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xFF - beq _08008788 + beq @08008788 ldr r1, =0x03000cf0 lsls r0, r4, 1 adds r0, r1 @@ -4109,48 +4109,48 @@ _0800875A: lsls r1, r4, 4 bl gpu_pal_obj_load adds r0, r4, 0 - b _0800878A + b @0800878A .align 2, 0 .pool -_08008788: +@08008788: movs r0, 0xFF -_0800878A: +@0800878A: pop {r4,r5} pop {r1} bx r1 thumb_func_end gpu_pal_obj_alloc_tag_and_apply thumb_func_start gpu_pal_obj_alloc_and_load_multiple -gpu_pal_obj_alloc_and_load_multiple: @ 8008790 +gpu_pal_obj_alloc_and_load_multiple: ; 8008790 push {r4,r5,lr} adds r5, r0, 0 movs r4, 0 - b _0800879E -_08008798: + b @0800879E +@08008798: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 -_0800879E: +@0800879E: lsls r0, r4, 3 adds r1, r0, r5 ldr r0, [r1] cmp r0, 0 - beq _080087B6 + beq @080087B6 adds r0, r1, 0 bl gpu_pal_obj_alloc_tag_and_apply lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne _08008798 -_080087B6: + bne @08008798 +@080087B6: pop {r4,r5} pop {r0} bx r0 thumb_func_end gpu_pal_obj_alloc_and_load_multiple thumb_func_start gpu_pal_obj_load -@ void gpu_pal_obj_load(palette *pal, u16 offset) -gpu_pal_obj_load: @ 80087BC +; void gpu_pal_obj_load(palette *pal, u16 offset) +gpu_pal_obj_load: ; 80087BC push {lr} lsls r1, 16 movs r2, 0x80 @@ -4164,8 +4164,8 @@ gpu_pal_obj_load: @ 80087BC thumb_func_end gpu_pal_obj_load thumb_func_start gpu_pal_alloc_new -@ int gpu_pal_alloc_new(u16 tag) -gpu_pal_alloc_new: @ 80087D4 +; int gpu_pal_alloc_new(u16 tag) +gpu_pal_alloc_new: ; 80087D4 push {r4,lr} lsls r0, 16 lsrs r4, r0, 16 @@ -4174,59 +4174,59 @@ gpu_pal_alloc_new: @ 80087D4 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq _080087FC + beq @080087FC ldr r1, =0x03000cf0 lsls r0, r2, 1 adds r0, r1 strh r4, [r0] adds r0, r2, 0 - b _080087FE + b @080087FE .align 2, 0 .pool -_080087FC: +@080087FC: movs r0, 0xFF -_080087FE: +@080087FE: pop {r4} pop {r1} bx r1 thumb_func_end gpu_pal_alloc_new thumb_func_start gpu_pal_tags_index_of -@ int gpu_pal_tags_index_of(u16 a1) -gpu_pal_tags_index_of: @ 8008804 +; int gpu_pal_tags_index_of(u16 a1) +gpu_pal_tags_index_of: ; 8008804 push {lr} lsls r0, 16 lsrs r2, r0, 16 ldr r0, =0x0300301c ldrb r1, [r0] cmp r1, 0xF - bhi _08008836 + bhi @08008836 ldr r3, =0x03000cf0 -_08008814: +@08008814: lsls r0, r1, 1 adds r0, r3 ldrh r0, [r0] cmp r0, r2 - bne _0800882C + bne @0800882C adds r0, r1, 0 - b _08008838 + b @08008838 .align 2, 0 .pool -_0800882C: +@0800882C: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xF - bls _08008814 -_08008836: + bls @08008814 +@08008836: movs r0, 0xFF -_08008838: +@08008838: pop {r1} bx r1 thumb_func_end gpu_pal_tags_index_of thumb_func_start gpu_pal_tag_by_index -gpu_pal_tag_by_index: @ 800883C +gpu_pal_tag_by_index: ; 800883C lsls r0, 24 ldr r1, =0x03000cf0 lsrs r0, 23 @@ -4238,8 +4238,8 @@ gpu_pal_tag_by_index: @ 800883C thumb_func_end gpu_pal_tag_by_index thumb_func_start gpu_pal_free_tag -@ void gpu_pal_free_tag(int tag) -gpu_pal_free_tag: @ 800884C +; void gpu_pal_free_tag(int tag) +gpu_pal_free_tag: ; 800884C push {lr} lsls r0, 16 lsrs r0, 16 @@ -4247,13 +4247,13 @@ gpu_pal_free_tag: @ 800884C lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xFF - beq _08008868 + beq @08008868 ldr r0, =0x03000cf0 lsls r1, 1 adds r1, r0 ldr r0, =0x0000ffff strh r0, [r1] -_08008868: +@08008868: pop {r0} bx r0 .align 2, 0 @@ -4261,8 +4261,8 @@ _08008868: thumb_func_end gpu_pal_free_tag thumb_func_start obj_set_f18_to_r0_f42_to_40 -@ void obj_set_f18_to_r0_f42_to_40(struct obj *obj, int a2) -obj_set_f18_to_r0_f42_to_40: @ 8008874 +; void obj_set_f18_to_r0_f42_to_40(struct obj *obj, int a2) +obj_set_f18_to_r0_f42_to_40: ; 8008874 str r1, [r0, 0x18] adds r0, 0x42 movs r1, 0x40 @@ -4271,8 +4271,8 @@ obj_set_f18_to_r0_f42_to_40: @ 8008874 thumb_func_end obj_set_f18_to_r0_f42_to_40 thumb_func_start super_sprite_add -@ int super_sprite_add(struct obj *obj, u8 *index) -super_sprite_add: @ 8008880 +; int super_sprite_add(struct obj *obj, u8 *index) +super_sprite_add: ; 8008880 push {r4,lr} adds r4, r0, 0 adds r3, r1, 0 @@ -4280,23 +4280,23 @@ super_sprite_add: @ 8008880 ldrb r0, [r3] ldrb r1, [r1] cmp r0, r1 - bcc _08008898 + bcc @08008898 movs r0, 0x1 - b _080088E0 + b @080088E0 .align 2, 0 .pool -_08008898: +@08008898: ldr r0, [r4, 0x18] cmp r0, 0 - beq _080088AC + beq @080088AC adds r0, r4, 0 adds r0, 0x42 ldrb r1, [r0] movs r0, 0xC0 ands r0, r1 cmp r0, 0 - bne _080088CC -_080088AC: + bne @080088CC +@080088AC: ldr r0, =0x030022c0 ldrb r2, [r3] lsls r2, 3 @@ -4310,10 +4310,10 @@ _080088AC: adds r0, 0x1 strb r0, [r3] movs r0, 0 - b _080088E0 + b @080088E0 .align 2, 0 .pool -_080088CC: +@080088CC: ldrb r1, [r3] lsls r1, 3 ldr r0, =0x030022f8 @@ -4323,7 +4323,7 @@ _080088CC: bl sub_80088EC lsls r0, 24 lsrs r0, 24 -_080088E0: +@080088E0: pop {r4} pop {r1} bx r1 @@ -4332,8 +4332,8 @@ _080088E0: thumb_func_end super_sprite_add thumb_func_start sub_80088EC -@ int sub_80088EC(struct obj *obj, int a2, int a3) -sub_80088EC: @ 80088EC +; int sub_80088EC(struct obj *obj, int a2, int a3) +sub_80088EC: ; 80088EC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -4347,13 +4347,13 @@ sub_80088EC: @ 80088EC ldrb r1, [r2] ldrb r0, [r0] cmp r1, r0 - bcc _08008910 -_08008908: + bcc @08008910 +@08008908: movs r0, 0x1 - b _08008AE6 + b @08008AE6 .align 2, 0 .pool -_08008910: +@08008910: adds r0, r3, 0 adds r0, 0x42 ldrb r1, [r0] @@ -4364,11 +4364,11 @@ _08008910: mov r12, r3 str r0, [sp, 0x18] cmp r7, 0 - beq _0800892C + beq @0800892C ldr r0, [r7, 0x4] cmp r0, 0 - bne _08008942 -_0800892C: + bne @08008942 +@0800892C: mov r2, r12 ldr r0, [r2] ldr r1, [r2, 0x4] @@ -4379,8 +4379,8 @@ _0800892C: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b _08008AE4 -_08008942: + b @08008AE4 +@08008942: mov r2, r12 ldrh r0, [r2, 0x4] lsls r0, 22 @@ -4426,19 +4426,19 @@ _08008942: mov r9, r0 ldr r1, [sp, 0xC] cmp r9, r1 - bcc _080089A0 - b _08008AE4 -_080089A0: + bcc @080089A0 + b @08008AE4 +@080089A0: lsls r0, r2, 16 asrs r0, 16 str r0, [sp, 0x14] -_080089A6: +@080089A6: mov r2, r8 ldrb r0, [r2] ldr r1, =0x02021b38 ldrb r1, [r1] cmp r0, r1 - bcs _08008908 + bcs @08008908 ldr r0, [r7, 0x4] mov r2, r9 lsls r6, r2, 2 @@ -4453,7 +4453,7 @@ _080089A6: lsrs r5, r0, 16 ldr r0, [sp, 0x10] cmp r0, 0 - beq _080089FC + beq @080089FC ldr r0, [r2] lsls r1, r0, 12 lsrs r1, 30 @@ -4476,10 +4476,10 @@ _080089A6: adds r0, 0x1 lsls r0, 16 lsrs r4, r0, 16 -_080089FC: +@080089FC: mov r1, r10 cmp r1, 0 - beq _08008A2E + beq @08008A2E ldr r0, [r2] lsls r1, r0, 12 lsrs r1, 30 @@ -4502,7 +4502,7 @@ _080089FC: adds r0, 0x1 lsls r0, 16 lsrs r5, r0, 16 -_08008A2E: +@08008A2E: mov r1, r9 lsls r0, r1, 3 ldr r2, [sp] @@ -4569,7 +4569,7 @@ _08008A2E: movs r0, 0xC0 ands r0, r1 cmp r0, 0x80 - beq _08008ACA + beq @08008ACA ldr r0, [r7, 0x4] adds r0, r6, r0 ldr r1, [r0] @@ -4581,7 +4581,7 @@ _08008A2E: ands r0, r2 orrs r0, r1 strb r0, [r3, 0x5] -_08008ACA: +@08008ACA: mov r0, r9 adds r0, 0x1 lsls r0, 24 @@ -4593,11 +4593,11 @@ _08008ACA: strb r0, [r1] ldr r2, [sp, 0xC] cmp r9, r2 - bcs _08008AE4 - b _080089A6 -_08008AE4: + bcs @08008AE4 + b @080089A6 +@08008AE4: movs r0, 0 -_08008AE6: +@08008AE6: add sp, 0x1C pop {r3-r5} mov r8, r3 diff --git a/asm/gpu_reg_manager.s b/asm/gpu_reg_manager.s index 7cd842e53..f6362ae7f 100644 --- a/asm/gpu_reg_manager.s +++ b/asm/gpu_reg_manager.s @@ -1,6 +1,6 @@ thumb_func_start lcd_io_copy_queue_clean -@ void lcd_io_copy_queue_clean() -lcd_io_copy_queue_clean: @ 8000FE4 +; void lcd_io_copy_queue_clean() +lcd_io_copy_queue_clean: ; 8000FE4 push {r4-r7,lr} mov r7, r8 push {r7} @@ -14,7 +14,7 @@ lcd_io_copy_queue_clean: @ 8000FE4 movs r5, 0 ldr r4, =0x03000878 movs r3, 0xFF -_08000FFE: +@08000FFE: adds r0, r2, r6 strb r5, [r0] adds r1, r2, r4 @@ -23,7 +23,7 @@ _08000FFE: strb r0, [r1] adds r2, 0x1 cmp r2, 0x5F - ble _08000FFE + ble @08000FFE movs r0, 0 strb r0, [r7] mov r1, r12 @@ -41,13 +41,13 @@ _08000FFE: thumb_func_end lcd_io_copy_queue_clean thumb_func_start lcd_io_buffer_to_hardware -@ void lcd_io_buffer_to_hardware(u8 reg) -lcd_io_buffer_to_hardware: @ 800103C +; void lcd_io_buffer_to_hardware(u8 reg) +lcd_io_buffer_to_hardware: ; 800103C push {lr} lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x4 - bne _08001068 + bne @08001068 ldr r2, =0x04000004 ldrh r1, [r2] ldr r0, =0x0000ffe7 @@ -58,10 +58,10 @@ lcd_io_buffer_to_hardware: @ 800103C ldrh r1, [r1] orrs r0, r1 strh r0, [r2] - b _08001076 + b @08001076 .align 2, 0 .pool -_08001068: +@08001068: movs r0, 0x80 lsls r0, 19 adds r0, r2, r0 @@ -69,7 +69,7 @@ _08001068: adds r1, r2, r1 ldrh r1, [r1] strh r1, [r0] -_08001076: +@08001076: pop {r0} bx r0 .align 2, 0 @@ -77,27 +77,27 @@ _08001076: thumb_func_end lcd_io_buffer_to_hardware thumb_func_start lcd_io_copy_queue_process -@ void lcd_io_copy_queue_process() -lcd_io_copy_queue_process: @ 8001080 +; void lcd_io_copy_queue_process() +lcd_io_copy_queue_process: ; 8001080 push {r4,r5,lr} ldr r0, =0x030008d8 ldrb r0, [r0] cmp r0, 0 - bne _080010A4 + bne @080010A4 movs r5, 0 -_0800108C: +@0800108C: ldr r0, =0x03000878 adds r4, r5, r0 ldrb r0, [r4] cmp r0, 0xFF - beq _080010A4 + beq @080010A4 bl lcd_io_buffer_to_hardware movs r0, 0xFF strb r0, [r4] adds r5, 0x1 cmp r5, 0x5F - ble _0800108C -_080010A4: + ble @0800108C +@080010A4: pop {r4,r5} pop {r0} bx r0 @@ -106,15 +106,15 @@ _080010A4: thumb_func_end lcd_io_copy_queue_process thumb_func_start lcd_io_set -@ void lcd_io_set(u8 reg, u16 value) -lcd_io_set: @ 80010B4 +; void lcd_io_set(u8 reg, u16 value) +lcd_io_set: ; 80010B4 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 lsls r1, 16 lsrs r1, 16 cmp r4, 0x5F - bhi _08001130 + bhi @08001130 ldr r0, =0x03000818 adds r0, r4, r0 strh r1, [r0] @@ -126,25 +126,25 @@ lcd_io_set: @ 80010B4 lsls r0, 16 lsrs r0, 16 cmp r0, 0x40 - bls _080010E8 + bls @080010E8 movs r0, 0x80 lsls r0, 19 ldrh r1, [r0] movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _080010FE -_080010E8: + beq @080010FE +@080010E8: adds r0, r4, 0 bl lcd_io_buffer_to_hardware - b _08001130 + b @08001130 .align 2, 0 .pool -_080010F8: +@080010F8: movs r0, 0 strb r0, [r5] - b _08001130 -_080010FE: + b @08001130 +@080010FE: ldr r2, =0x030008d8 movs r0, 0x1 strb r0, [r2] @@ -154,25 +154,25 @@ _080010FE: adds r5, r2, 0 adds r2, r0, 0 cmp r1, 0xFF - beq _08001128 + beq @08001128 adds r1, r2, 0 -_08001114: +@08001114: ldrb r0, [r1] cmp r0, r4 - beq _080010F8 + beq @080010F8 adds r1, 0x1 adds r3, 0x1 cmp r3, 0x5F - bgt _08001128 + bgt @08001128 ldrb r0, [r1] cmp r0, 0xFF - bne _08001114 -_08001128: + bne @08001114 +@08001128: adds r0, r3, r2 movs r1, 0 strb r4, [r0] strb r1, [r5] -_08001130: +@08001130: pop {r4,r5} pop {r0} bx r0 @@ -181,15 +181,15 @@ _08001130: thumb_func_end lcd_io_set thumb_func_start lcd_io_set_forced_blank -@ void lcd_io_set_forced_blank(u8 reg, u16 value) -lcd_io_set_forced_blank: @ 8001140 +; void lcd_io_set_forced_blank(u8 reg, u16 value) +lcd_io_set_forced_blank: ; 8001140 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 lsls r1, 16 lsrs r1, 16 cmp r4, 0x5F - bhi _080011A8 + bhi @080011A8 ldr r0, =0x03000818 adds r0, r4, r0 strh r1, [r0] @@ -199,17 +199,17 @@ lcd_io_set_forced_blank: @ 8001140 movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq _08001176 + beq @08001176 adds r0, r4, 0 bl lcd_io_buffer_to_hardware - b _080011A8 + b @080011A8 .align 2, 0 .pool -_08001170: +@08001170: movs r0, 0 strb r0, [r5] - b _080011A8 -_08001176: + b @080011A8 +@08001176: ldr r2, =0x030008d8 movs r0, 0x1 strb r0, [r2] @@ -219,25 +219,25 @@ _08001176: adds r5, r2, 0 adds r2, r0, 0 cmp r1, 0xFF - beq _080011A0 + beq @080011A0 adds r1, r2, 0 -_0800118C: +@0800118C: ldrb r0, [r1] cmp r0, r4 - beq _08001170 + beq @08001170 adds r1, 0x1 adds r3, 0x1 cmp r3, 0x5F - bgt _080011A0 + bgt @080011A0 ldrb r0, [r1] cmp r0, 0xFF - bne _0800118C -_080011A0: + bne @0800118C +@080011A0: adds r0, r3, r2 movs r1, 0 strb r4, [r0] strb r1, [r5] -_080011A8: +@080011A8: pop {r4,r5} pop {r0} bx r0 @@ -246,32 +246,32 @@ _080011A8: thumb_func_end lcd_io_set_forced_blank thumb_func_start lcd_io_get -@ u16 lcd_io_get(u8 reg) -lcd_io_get: @ 80011B8 +; u16 lcd_io_get(u8 reg) +lcd_io_get: ; 80011B8 push {lr} lsls r0, 24 lsrs r0, 24 adds r1, r0, 0 cmp r1, 0x4 - bne _080011CC + bne @080011CC ldr r0, =0x04000004 - b _080011DE + b @080011DE .align 2, 0 .pool -_080011CC: +@080011CC: cmp r1, 0x6 - beq _080011DC + beq @080011DC ldr r0, =0x03000818 adds r0, r1, r0 ldrh r0, [r0] - b _080011E0 + b @080011E0 .align 2, 0 .pool -_080011DC: +@080011DC: ldr r0, =0x04000006 -_080011DE: +@080011DE: ldrh r0, [r0] -_080011E0: +@080011E0: pop {r1} bx r1 .align 2, 0 @@ -279,8 +279,8 @@ _080011E0: thumb_func_end lcd_io_get thumb_func_start lcd_io_set_bits -@ void lcd_io_set_bits(u8 reg, u16 mask) -lcd_io_set_bits: @ 80011E8 +; void lcd_io_set_bits(u8 reg, u16 mask) +lcd_io_set_bits: ; 80011E8 push {lr} adds r2, r1, 0 lsls r0, 24 @@ -299,8 +299,8 @@ lcd_io_set_bits: @ 80011E8 thumb_func_end lcd_io_set_bits thumb_func_start lcd_io_clear_bits -@ void lcd_io_clear_bits(u8 reg, u16 mask) -lcd_io_clear_bits: @ 8001208 +; void lcd_io_clear_bits(u8 reg, u16 mask) +lcd_io_clear_bits: ; 8001208 push {lr} adds r2, r1, 0 lsls r0, 24 @@ -319,13 +319,13 @@ lcd_io_clear_bits: @ 8001208 thumb_func_end lcd_io_clear_bits thumb_func_start update_hardware_IE -@ void update_hardware_IE() -update_hardware_IE: @ 8001228 +; void update_hardware_IE() +update_hardware_IE: ; 8001228 push {r4,r5,lr} ldr r5, =0x030008d9 ldrb r0, [r5] cmp r0, 0 - beq _08001246 + beq @08001246 ldr r2, =0x04000208 ldrh r1, [r2] movs r4, 0 @@ -336,7 +336,7 @@ update_hardware_IE: @ 8001228 strh r0, [r3] strh r1, [r2] strb r4, [r5] -_08001246: +@08001246: pop {r4,r5} pop {r0} bx r0 @@ -345,8 +345,8 @@ _08001246: thumb_func_end update_hardware_IE thumb_func_start enable_irqs -@ void enable_irqs(u16 value) -enable_irqs: @ 800125C +; void enable_irqs(u16 value) +enable_irqs: ; 800125C push {r4,lr} lsls r0, 16 lsrs r0, 16 @@ -368,8 +368,8 @@ enable_irqs: @ 800125C thumb_func_end enable_irqs thumb_func_start disable_irqs -@ void disable_irqs(u16 value) -disable_irqs: @ 8001288 +; void disable_irqs(u16 value) +disable_irqs: ; 8001288 push {r4,lr} lsls r0, 16 lsrs r0, 16 @@ -391,8 +391,8 @@ disable_irqs: @ 8001288 thumb_func_end disable_irqs thumb_func_start dispstat_set_vblank_hblank_irqs -@ void dispstat_set_vblank_hblank_irqs(u16 value) -dispstat_set_vblank_hblank_irqs: @ 80012B4 +; void dispstat_set_vblank_hblank_irqs(u16 value) +dispstat_set_vblank_hblank_irqs: ; 80012B4 push {r4,lr} adds r4, r0, 0 lsls r4, 16 @@ -411,15 +411,15 @@ dispstat_set_vblank_hblank_irqs: @ 80012B4 movs r0, 0x2 ands r0, r4 cmp r0, 0 - beq _080012E0 + beq @080012E0 movs r0, 0x10 orrs r1, r0 -_080012E0: +@080012E0: cmp r2, r1 - beq _080012EA + beq @080012EA movs r0, 0x4 bl lcd_io_set -_080012EA: +@080012EA: pop {r4} pop {r0} bx r0 diff --git a/asm/libagbbackup.s b/asm/libagbbackup.s index e09323ab6..86c42898f 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, _082E1878 @@ -20,8 +20,8 @@ _082E187C: .4byte 0x0e002aaa 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 @@ -96,8 +96,8 @@ _082E1908: thumb_func_end ReadFlashID thumb_func_start FlashTimerIntr -@ void FlashTimerIntr() -FlashTimerIntr: @ 82E191C +; void FlashTimerIntr() +FlashTimerIntr: ; 82E191C push {lr} ldr r1, _082E193C ldrh r0, [r1] @@ -121,8 +121,8 @@ _082E1940: .4byte 0x03007840 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 @@ -154,7 +154,7 @@ _082E197A: thumb_func_end SetFlashTimerIntr thumb_func_start StartFlashTimer -StartFlashTimer: @ 82E1980 +StartFlashTimer: ; 82E1980 push {r4-r6,lr} mov r6, r10 mov r5, r9 @@ -233,7 +233,7 @@ _082E1A24: .4byte 0x04000202 thumb_func_end StartFlashTimer thumb_func_start StopFlashTimer -StopFlashTimer: @ 82E1A28 +StopFlashTimer: ; 82E1A28 ldr r3, _082E1A58 movs r1, 0 strh r1, [r3] @@ -266,15 +266,15 @@ _082E1A68: .4byte 0x03001a78 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, _082E1A8C @@ -308,7 +308,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 @@ -331,7 +331,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 @@ -409,7 +409,7 @@ _082E1B6C: .4byte 0x03007850 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 @@ -440,7 +440,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 @@ -515,7 +515,7 @@ _082E1C34: .4byte 0x03007850 thumb_func_end VerifyFlashSector thumb_func_start VerifyFlashSectorFirstNBytes -VerifyFlashSectorFirstNBytes: @ 82E1C38 +VerifyFlashSectorFirstNBytes: ; 82E1C38 push {r4-r6,lr} sub sp, 0x100 adds r5, r1, 0 @@ -591,7 +591,7 @@ _082E1CCC: .4byte 0x03007850 thumb_func_end VerifyFlashSectorFirstNBytes thumb_func_start ProgramFlashSectorsAndVerify -ProgramFlashSectorsAndVerify: @ 82E1CD0 +ProgramFlashSectorsAndVerify: ; 82E1CD0 push {r4-r6,lr} adds r5, r1, 0 lsls r0, 16 @@ -630,7 +630,7 @@ _082E1D10: .4byte 0x0300784c thumb_func_end ProgramFlashSectorsAndVerify thumb_func_start ProgramFlashSectorsVerifyFirstNBytes -ProgramFlashSectorsVerifyFirstNBytes: @ 82E1D14 +ProgramFlashSectorsVerifyFirstNBytes: ; 82E1D14 push {r4-r7,lr} adds r5, r1, 0 adds r7, r2, 0 @@ -671,8 +671,8 @@ _082E1D58: .4byte 0x0300784c thumb_func_end ProgramFlashSectorsVerifyFirstNBytes thumb_func_start IdentifyFlash -@ _BOOL2 IdentifyFlash() -IdentifyFlash: @ 82E1D5C +; _BOOL2 IdentifyFlash() +IdentifyFlash: ; 82E1D5C push {r4,lr} ldr r2, _082E1D7C ldrh r0, [r2] @@ -748,7 +748,7 @@ _082E1DF8: .4byte 0x03007850 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 @@ -830,7 +830,7 @@ _082E1E88: thumb_func_end PollingSR_COMMON thumb_func_start EraseFlashChip -EraseFlashChip: @ 82E1E9C +EraseFlashChip: ; 82E1E9C push {r4-r6,lr} sub sp, 0x40 ldr r5, _082E1EF8 @@ -884,7 +884,7 @@ _082E1F0C: .4byte 0x03007848 thumb_func_end EraseFlashChip thumb_func_start EraseFlashSector -EraseFlashSector: @ 82E1F10 +EraseFlashSector: ; 82E1F10 push {r4-r7,lr} sub sp, 0x40 lsls r0, 16 @@ -984,7 +984,7 @@ _082E1FDC: .4byte 0x0000fffc thumb_func_end EraseFlashSector thumb_func_start ProgramFlashByte -ProgramFlashByte: @ 82E1FE0 +ProgramFlashByte: ; 82E1FE0 push {r4-r7,lr} sub sp, 0x40 adds r6, r1, 0 @@ -1056,7 +1056,7 @@ _082E206C: thumb_func_end ProgramFlashByte thumb_func_start ProgramFlashByteInternal -ProgramFlashByteInternal: @ 82E2074 +ProgramFlashByteInternal: ; 82E2074 push {r4,lr} ldr r4, _082E20A0 movs r2, 0xAA @@ -1085,7 +1085,7 @@ _082E20A8: .4byte 0x03007848 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 668044ef7..a67820378 100644 --- a/asm/libagbsyscall.s +++ b/asm/libagbsyscall.s @@ -1,86 +1,85 @@ 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 -MultiBoot: @ 82E7094 +MultiBoot: ; 82E7094 movs r1, 0x1 swi 0x25 bx lr thumb_func_end MultiBoot thumb_func_start ObjAffineSet -ObjAffineSet: @ 82E709A -_082E709C: +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, _082E70BC movs r2, 0 strb r2, [r3] @@ -94,15 +93,15 @@ _082E70C0: .4byte 0x03007f00 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 35fcbfe2b..fa913b059 100644 --- a/asm/libgcc.s +++ b/asm/libgcc.s @@ -1,97 +1,97 @@ 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 -@ void __usercall_call_via_r2(void ( *func)()) -_call_via_r2: @ 82E70D8 +; void __usercall_call_via_r2(void ( *func)()) +_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 -@ void __usercall_call_via_r5(void ( *func)()) -_call_via_r5: @ 82E70E4 +; void __usercall_call_via_r5(void ( *func)()) +_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 @@ -645,8 +645,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} @@ -735,12 +735,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 @@ -774,7 +774,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 @@ -801,7 +801,7 @@ _082E764C: .4byte 0xcf000000 thumb_func_end __fixunssfsi thumb_func_start __modsi3 -__modsi3: @ 82E7650 +__modsi3: ; 82E7650 movs r3, 0x1 cmp r1, 0 beq _082E7714 @@ -923,7 +923,7 @@ _082E7714: thumb_func_end __modsi3 thumb_func_start __muldi3 -__muldi3: @ 82E7720 +__muldi3: ; 82E7720 push {r4-r7,lr} sub sp, 0x10 str r0, [sp] @@ -984,7 +984,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 @@ -1487,8 +1487,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 @@ -1561,8 +1561,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 @@ -1676,7 +1676,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 @@ -1849,7 +1849,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 @@ -1965,7 +1965,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 @@ -2307,8 +2307,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] @@ -2332,7 +2332,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] @@ -2360,7 +2360,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 @@ -2722,7 +2722,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] @@ -2939,7 +2939,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 @@ -3096,7 +3096,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] @@ -3118,7 +3118,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] @@ -3161,7 +3161,7 @@ _082E8736: thumb_func_end __eqdf2 thumb_func_start __nedf2 -__nedf2: @ 82E873C +__nedf2: ; 82E873C push {r4,lr} sub sp, 0x38 str r0, [sp, 0x28] @@ -3204,7 +3204,7 @@ _082E8782: thumb_func_end __nedf2 thumb_func_start __gtdf2 -__gtdf2: @ 82E8788 +__gtdf2: ; 82E8788 push {r4,lr} sub sp, 0x38 str r0, [sp, 0x28] @@ -3248,8 +3248,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] @@ -3293,7 +3293,7 @@ _082E881C: thumb_func_end __gedf2 thumb_func_start __ltdf2 -__ltdf2: @ 82E8820 +__ltdf2: ; 82E8820 push {r4,lr} sub sp, 0x38 str r0, [sp, 0x28] @@ -3336,7 +3336,7 @@ _082E8866: thumb_func_end __ltdf2 thumb_func_start __ledf2 -__ledf2: @ 82E886C +__ledf2: ; 82E886C push {r4,lr} sub sp, 0x38 str r0, [sp, 0x28] @@ -3379,7 +3379,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 @@ -3449,8 +3449,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] @@ -3517,7 +3517,7 @@ _082E89A2: thumb_func_end __fixdfsi thumb_func_start __negdf2 -__negdf2: @ 82E89A8 +__negdf2: ; 82E89A8 push {lr} sub sp, 0x1C str r0, [sp, 0x14] @@ -3539,7 +3539,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 @@ -3561,7 +3561,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] @@ -3598,7 +3598,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] @@ -3704,7 +3704,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] @@ -3777,7 +3777,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} @@ -4000,7 +4000,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] @@ -4022,7 +4022,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] @@ -4048,7 +4048,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 @@ -4251,7 +4251,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] @@ -4387,7 +4387,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 @@ -4530,7 +4530,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] @@ -4550,7 +4550,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] @@ -4591,7 +4591,7 @@ _082E90EA: thumb_func_end __eqsf2 thumb_func_start __nesf2 -__nesf2: @ 82E90F0 +__nesf2: ; 82E90F0 push {r4,lr} sub sp, 0x28 str r0, [sp, 0x20] @@ -4632,7 +4632,7 @@ _082E9132: thumb_func_end __nesf2 thumb_func_start __gtsf2 -__gtsf2: @ 82E9138 +__gtsf2: ; 82E9138 push {r4,lr} sub sp, 0x28 str r0, [sp, 0x20] @@ -4674,7 +4674,7 @@ _082E917C: thumb_func_end __gtsf2 thumb_func_start __gesf2 -__gesf2: @ 82E9180 +__gesf2: ; 82E9180 push {r4,lr} sub sp, 0x28 str r0, [sp, 0x20] @@ -4716,7 +4716,7 @@ _082E91C4: thumb_func_end __gesf2 thumb_func_start __ltsf2 -__ltsf2: @ 82E91C8 +__ltsf2: ; 82E91C8 push {r4,lr} sub sp, 0x28 str r0, [sp, 0x20] @@ -4757,7 +4757,7 @@ _082E920A: thumb_func_end __ltsf2 thumb_func_start __lesf2 -__lesf2: @ 82E9210 +__lesf2: ; 82E9210 push {r4,lr} sub sp, 0x28 str r0, [sp, 0x20] @@ -4798,7 +4798,7 @@ _082E9252: thumb_func_end __lesf2 thumb_func_start __floatsisf -__floatsisf: @ 82E9258 +__floatsisf: ; 82E9258 push {lr} sub sp, 0x10 adds r1, r0, 0 @@ -4855,7 +4855,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] @@ -4919,7 +4919,7 @@ _082E931C: thumb_func_end __fixsfsi thumb_func_start __negsf2 -__negsf2: @ 82E9320 +__negsf2: ; 82E9320 push {lr} sub sp, 0x14 str r0, [sp, 0x10] @@ -4940,7 +4940,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] @@ -4954,7 +4954,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] @@ -4978,7 +4978,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 @@ -5010,7 +5010,7 @@ _082E93B8: thumb_func_end __lshrdi3 thumb_func_start __negdi2 -__negdi2: @ 82E93BC +__negdi2: ; 82E93BC push {r4,lr} negs r2, r0 adds r3, r2, 0 @@ -5026,8 +5026,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 @@ -5084,8 +5084,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 @@ -5135,8 +5135,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 @@ -5190,7 +5190,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/libmks4agb.s b/asm/libmks4agb.s index 49acba179..de34dfe2b 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 @@ -11,7 +11,7 @@ _082DF050: .thumb thumb_func_start SoundMain -SoundMain: @ 82DF05C +SoundMain: ; 82DF05C ldr r0, _082DF0C8 ldr r0, [r0] ldr r2, _082DF0CC @@ -78,7 +78,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 @@ -457,7 +457,7 @@ _082DF498: .4byte 0x68736d53 .arm arm_func_start sub_82DF49C -sub_82DF49C: @ 82DF49C +sub_82DF49C: ; 82DF49C ldr r6, [r4, 0x24] ldrb r0, [r4] tst r0, 0x20 @@ -657,7 +657,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] @@ -701,7 +701,7 @@ _082DF7E0: .4byte 0x08675a70 .thumb thumb_func_start SoundMainBTM -SoundMainBTM: @ 82DF7E4 +SoundMainBTM: ; 82DF7E4 mov r12, r4 movs r1, 0 movs r2, 0 @@ -716,7 +716,7 @@ SoundMainBTM: @ 82DF7E4 thumb_func_end SoundMainBTM thumb_func_start ClearChain -ClearChain: @ 82DF7FC +ClearChain: ; 82DF7FC ldr r3, [r0, 0x2C] cmp r3, 0 beq _082DF81A @@ -740,7 +740,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] @@ -769,7 +769,7 @@ _082DF840: thumb_func_end ply_fine thumb_func_start MPlyJmpTblCopy -MPlyJmpTblCopy: @ 82DF84C +MPlyJmpTblCopy: ; 82DF84C mov r12, lr movs r1, 0x24 ldr r2, _082DF87C @@ -784,12 +784,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 @@ -808,7 +808,7 @@ _082DF87C: .4byte 0x086759e0 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 @@ -818,7 +818,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] @@ -838,7 +838,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 @@ -856,7 +856,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 @@ -871,7 +871,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] @@ -899,7 +899,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] @@ -907,7 +907,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 @@ -920,7 +920,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] @@ -932,7 +932,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] @@ -956,7 +956,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] @@ -968,7 +968,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 @@ -981,7 +981,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 @@ -994,7 +994,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] @@ -1006,7 +1006,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] @@ -1014,7 +1014,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] @@ -1030,7 +1030,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 @@ -1043,7 +1043,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] @@ -1058,7 +1058,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 @@ -1101,7 +1101,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 @@ -1438,7 +1438,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] @@ -1479,7 +1479,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] @@ -1509,7 +1509,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 @@ -1791,7 +1791,7 @@ _082DFF38: .4byte 0x08675c64 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] @@ -1832,7 +1832,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] @@ -1851,7 +1851,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] @@ -1860,7 +1860,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] @@ -1872,7 +1872,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] @@ -1884,7 +1884,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 @@ -1936,12 +1936,12 @@ _082E002C: .4byte 0x08675b34 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 @@ -1959,8 +1959,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 @@ -1980,7 +1980,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 @@ -2058,7 +2058,7 @@ _082E0120: .4byte 0x03007670 thumb_func_end m4aSoundInit thumb_func_start m4aSoundMain -m4aSoundMain: @ 82E0124 +m4aSoundMain: ; 82E0124 push {lr} bl SoundMain pop {r0} @@ -2066,7 +2066,7 @@ m4aSoundMain: @ 82E0124 thumb_func_end m4aSoundMain thumb_func_start m4aSongNumStart -m4aSongNumStart: @ 82E0130 +m4aSongNumStart: ; 82E0130 push {lr} lsls r0, 16 ldr r2, _082E0154 @@ -2090,7 +2090,7 @@ _082E0158: .4byte 0x086b49f0 thumb_func_end m4aSongNumStart thumb_func_start m4aSongNumStartOrChange -m4aSongNumStartOrChange: @ 82E015C +m4aSongNumStartOrChange: ; 82E015C push {lr} lsls r0, 16 ldr r2, _082E0188 @@ -2131,7 +2131,7 @@ _082E01A4: thumb_func_end m4aSongNumStartOrChange thumb_func_start m4aSongNumStartOrContinue -m4aSongNumStartOrContinue: @ 82E01A8 +m4aSongNumStartOrContinue: ; 82E01A8 push {lr} lsls r0, 16 ldr r2, _082E01D4 @@ -2175,7 +2175,7 @@ _082E01F8: thumb_func_end m4aSongNumStartOrContinue thumb_func_start m4aSongNumStop -m4aSongNumStop: @ 82E01FC +m4aSongNumStop: ; 82E01FC push {lr} lsls r0, 16 ldr r2, _082E0228 @@ -2203,7 +2203,7 @@ _082E022C: .4byte 0x086b49f0 thumb_func_end m4aSongNumStop thumb_func_start m4aSongNumContinue -m4aSongNumContinue: @ 82E0230 +m4aSongNumContinue: ; 82E0230 push {lr} lsls r0, 16 ldr r2, _082E025C @@ -2231,7 +2231,7 @@ _082E0260: .4byte 0x086b49f0 thumb_func_end m4aSongNumContinue thumb_func_start m4aMPlayAllStop -m4aMPlayAllStop: @ 82E0264 +m4aMPlayAllStop: ; 82E0264 push {r4,r5,lr} ldr r0, _082E029C lsls r0, 16 @@ -2267,7 +2267,7 @@ _082E02A4: .4byte 0x030073a0 thumb_func_end m4aMPlayAllStop thumb_func_start m4aMPlayContinue -m4aMPlayContinue: @ 82E02A8 +m4aMPlayContinue: ; 82E02A8 push {lr} bl MPlayContinue pop {r0} @@ -2275,7 +2275,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 @@ -2311,8 +2311,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 @@ -2322,7 +2322,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 @@ -2342,7 +2342,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 @@ -2366,7 +2366,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] @@ -2408,8 +2408,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 @@ -2534,13 +2534,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] @@ -2552,7 +2552,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] @@ -2564,8 +2564,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 @@ -2677,7 +2677,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 @@ -2751,7 +2751,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 @@ -2834,7 +2834,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] @@ -2882,7 +2882,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 @@ -2943,7 +2943,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] @@ -2975,7 +2975,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 @@ -3040,7 +3040,7 @@ _082E0890: .4byte MPlayMain_rev01 + 1 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} @@ -3164,7 +3164,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] @@ -3202,7 +3202,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] @@ -3314,7 +3314,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 @@ -3415,7 +3415,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 @@ -3507,7 +3507,7 @@ _082E0BD8: .4byte 0x08675c00 thumb_func_end MidiKey2CgbFr thumb_func_start CgbOscOff -CgbOscOff: @ 82E0BDC +CgbOscOff: ; 82E0BDC lsls r0, 24 lsrs r0, 24 adds r1, r0, 0 @@ -3557,7 +3557,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 @@ -3627,7 +3627,7 @@ _082E0C8C: thumb_func_end CgbModVol thumb_func_start CgbSound -CgbSound: @ 82E0CA8 +CgbSound: ; 82E0CA8 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -4211,7 +4211,7 @@ _082E10E2: thumb_func_end CgbSound thumb_func_start MPlayTempoControl -MPlayTempoControl: @ 82E10F4 +MPlayTempoControl: ; 82E10F4 push {r4,lr} adds r2, r0, 0 lsls r1, 16 @@ -4235,7 +4235,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 @@ -4295,7 +4295,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 @@ -4361,7 +4361,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 @@ -4421,7 +4421,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 @@ -4442,7 +4442,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 @@ -4506,7 +4506,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 @@ -4570,7 +4570,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 @@ -4749,7 +4749,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] @@ -4767,7 +4767,7 @@ _082E14DC: .4byte 0x08675ccc thumb_func_end ply_xcmd thumb_func_start ply_xxx -ply_xxx: @ 82E14E0 +ply_xxx: ; 82E14E0 push {lr} ldr r2, _082E14F0 ldr r2, [r2] @@ -4779,7 +4779,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 @@ -4815,7 +4815,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 @@ -4828,7 +4828,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 @@ -4841,7 +4841,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 @@ -4854,7 +4854,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 @@ -4867,7 +4867,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 @@ -4880,7 +4880,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] @@ -4890,7 +4890,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] @@ -4900,7 +4900,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 @@ -4913,7 +4913,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 @@ -4926,7 +4926,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] @@ -4966,7 +4966,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 @@ -5002,12 +5002,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 @@ -5112,7 +5112,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 @@ -5125,7 +5125,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 @@ -5140,7 +5140,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 @@ -5172,7 +5172,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 @@ -5181,7 +5181,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] @@ -5191,7 +5191,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 @@ -5200,7 +5200,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 @@ -5217,7 +5217,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 @@ -5244,7 +5244,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 @@ -5278,7 +5278,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 0ba27165b..8fada1f10 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 @@ -1554,7 +1554,7 @@ _082E3550: .4byte 0x00005003 .arm arm_func_start IntrSIO32 -IntrSIO32: @ 82E3554 +IntrSIO32: ; 82E3554 mov r12, sp stmdb sp!, {r11,r12,lr,pc} ldr r3, _082E35B4 @@ -1586,7 +1586,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 @@ -1768,7 +1768,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 @@ -2052,7 +2052,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 @@ -2085,7 +2085,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 @@ -2165,7 +2165,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 @@ -2190,7 +2190,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 @@ -2230,23 +2230,23 @@ _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 thumb_func_start rfu_initializeAPI -rfu_initializeAPI: @ 82E3EB4 +rfu_initializeAPI: ; 82E3EB4 push {r4-r7,lr} adds r4, r0, 0 mov r12, r2 @@ -2398,7 +2398,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 @@ -2464,7 +2464,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 @@ -2476,7 +2476,7 @@ _082E4074: .4byte rfu_STC_REQ_callback + 1 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 @@ -2521,7 +2521,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 @@ -2534,7 +2534,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 @@ -2545,7 +2545,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} @@ -2553,7 +2553,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 @@ -2570,7 +2570,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 @@ -2598,7 +2598,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 @@ -2631,7 +2631,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 @@ -2690,7 +2690,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 @@ -2703,7 +2703,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 @@ -2715,7 +2715,7 @@ _082E420C: .4byte rfu_STC_REQ_callback + 1 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 @@ -2751,7 +2751,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 @@ -2762,7 +2762,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 @@ -2817,7 +2817,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] @@ -2895,7 +2895,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 @@ -2921,7 +2921,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] @@ -2955,7 +2955,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 @@ -2967,7 +2967,7 @@ _082E43E4: .4byte rfu_CB_reset + 1 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 @@ -2987,7 +2987,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 @@ -3040,7 +3040,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 @@ -3116,7 +3116,7 @@ _082E44FC: .4byte rfu_CB_configGameData + 1 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 @@ -3201,7 +3201,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 @@ -3254,7 +3254,7 @@ _082E4608: .4byte rfu_CB_startSearchChild + 1 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 @@ -3278,7 +3278,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 @@ -3331,7 +3331,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 @@ -3343,7 +3343,7 @@ _082E46A8: .4byte rfu_CB_pollAndEndSearchChild + 1 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 @@ -3355,7 +3355,7 @@ _082E46BC: .4byte rfu_CB_pollAndEndSearchChild + 1 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 @@ -3422,7 +3422,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} @@ -3521,7 +3521,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 @@ -3533,7 +3533,7 @@ _082E4814: .4byte rfu_CB_startSearchParent + 1 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 @@ -3554,7 +3554,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 @@ -3566,7 +3566,7 @@ _082E484C: .4byte sub_82E4850 + 1 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 @@ -3586,7 +3586,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 @@ -3598,7 +3598,7 @@ _082E4884: .4byte rfu_STC_REQ_callback + 1 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} @@ -3742,7 +3742,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 @@ -3797,7 +3797,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 @@ -3809,7 +3809,7 @@ _082E4A10: .4byte rfu_CB_pollConnectParent + 1 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 @@ -3954,7 +3954,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 @@ -3986,7 +3986,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 @@ -4015,7 +4015,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 @@ -4134,7 +4134,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 @@ -4643,7 +4643,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} @@ -4742,7 +4742,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 @@ -4811,7 +4811,7 @@ _082E51B8: .4byte rfu_CB_disconnect + 1 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 @@ -4921,7 +4921,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 @@ -4968,7 +4968,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 @@ -4980,7 +4980,7 @@ _082E5308: .4byte rfu_CB_CHILD_pollConnectRecovery + 1 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} @@ -5065,7 +5065,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 @@ -5094,7 +5094,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 @@ -5106,7 +5106,7 @@ _082E53F0: .4byte rfu_CB_CHILD_pollConnectRecovery + 1 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 @@ -5121,7 +5121,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 @@ -5138,7 +5138,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 @@ -5162,7 +5162,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 @@ -5195,7 +5195,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} @@ -5271,7 +5271,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 @@ -5330,7 +5330,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 @@ -5559,7 +5559,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 @@ -5614,7 +5614,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 @@ -5639,7 +5639,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 @@ -5673,7 +5673,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 @@ -5702,7 +5702,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 @@ -5980,7 +5980,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 @@ -6169,7 +6169,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 @@ -6234,7 +6234,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 @@ -6314,7 +6314,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 @@ -6339,7 +6339,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 @@ -6359,7 +6359,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 @@ -6516,7 +6516,7 @@ _082E5E54: .4byte rfu_CB_sendData2 + 1 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} @@ -6595,7 +6595,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 @@ -6606,7 +6606,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 @@ -6629,7 +6629,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 @@ -6790,7 +6790,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 @@ -7028,7 +7028,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} @@ -7142,7 +7142,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] @@ -7174,7 +7174,7 @@ _082E6330: .4byte rfu_CB_recvData + 1 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 @@ -7292,7 +7292,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 @@ -7375,7 +7375,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] @@ -7423,7 +7423,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 @@ -7718,7 +7718,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 @@ -7811,7 +7811,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 @@ -8063,7 +8063,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 @@ -8253,7 +8253,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 @@ -8331,7 +8331,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 @@ -8426,7 +8426,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] @@ -8509,7 +8509,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 @@ -8523,7 +8523,7 @@ _082E6D68: .4byte rfu_STC_REQ_callback + 1 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} @@ -8612,7 +8612,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 @@ -8667,7 +8667,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] @@ -8790,7 +8790,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] @@ -8807,7 +8807,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/macros.s b/asm/macros.s index 9ea9009f5..64b77383d 100644 --- a/asm/macros.s +++ b/asm/macros.s @@ -59,7 +59,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 1e6e8b426..cab084eb7 100644 --- a/asm/main.s +++ b/asm/main.s @@ -37,10 +37,10 @@ Main: ldr r0, =0x03005d88 ldr r0, [r0] cmp r0, 0x1 - beq _08000414 + beq @08000414 movs r0, 0 bl set_callback2 -_08000414: +@08000414: ldr r2, =0x030022b4 strb r4, [r2] ldr r1, =0x03000000 @@ -52,36 +52,36 @@ _08000414: movs r0, 0 mov r8, r0 adds r6, r2, 0 -_0800042A: +@0800042A: bl load_keys ldr r0, =0x03002700 ldrb r0, [r0] cmp r0, 0 - bne _08000454 + bne @08000454 ldrh r1, [r7, 0x28] movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq _08000454 + beq @08000454 movs r0, 0xE ands r0, r1 cmp r0, 0xE - bne _08000454 + bne @08000454 bl rfu_REQ_stopMode bl rfu_waitREQComplete bl do_reset -_08000454: +@08000454: bl sub_8087634 cmp r0, 0x1 - bne _0800048C + bne @0800048C strb r0, [r6] bl call_callbacks_wrapper movs r0, 0 strb r0, [r6] - b _080004B2 + b @080004B2 .align 2, 0 .pool -_0800048C: +@0800048C: ldr r5, =0x030022b4 movs r0, 0 strb r0, [r5] @@ -89,7 +89,7 @@ _0800048C: bl sub_80875C8 adds r4, r0, 0 cmp r4, 0x1 - bne _080004B2 + bne @080004B2 movs r0, 0 strh r0, [r7, 0x2E] bl copy_queue_clear @@ -97,32 +97,32 @@ _0800048C: bl call_callbacks_wrapper mov r2, r8 strb r2, [r5] -_080004B2: +@080004B2: bl gametime_increment bl sound_something bl wait_for_vblank - b _0800042A + b @0800042A .align 2, 0 .pool thumb_func_end Main thumb_func_start call_callbacks_wrapper -@ void call_callbacks_wrapper() -call_callbacks_wrapper: @ 80004C4 +; void call_callbacks_wrapper() +call_callbacks_wrapper: ; 80004C4 push {lr} bl sub_800B40C lsls r0, 24 cmp r0, 0 - bne _080004D4 + bne @080004D4 bl call_callbacks -_080004D4: +@080004D4: pop {r0} bx r0 thumb_func_end call_callbacks_wrapper thumb_func_start init_saveblock_ptrs_and_set_copyright_callback2 -@ void init_saveblock_ptrs_and_set_copyright_callback2() -init_saveblock_ptrs_and_set_copyright_callback2: @ 80004D8 +; void init_saveblock_ptrs_and_set_copyright_callback2() +init_saveblock_ptrs_and_set_copyright_callback2: ; 80004D8 push {lr} ldr r2, =0x030022c0 movs r0, 0 @@ -146,20 +146,20 @@ init_saveblock_ptrs_and_set_copyright_callback2: @ 80004D8 thumb_func_end init_saveblock_ptrs_and_set_copyright_callback2 thumb_func_start call_callbacks -@ void call_callbacks() -call_callbacks: @ 800051C +; void call_callbacks() +call_callbacks: ; 800051C push {r4,lr} ldr r4, =0x030022c0 ldr r0, [r4] cmp r0, 0 - beq _0800052A + beq @0800052A bl _call_via_r0 -_0800052A: +@0800052A: ldr r0, [r4, 0x4] cmp r0, 0 - beq _08000534 + beq @08000534 bl _call_via_r0 -_08000534: +@08000534: pop {r4} pop {r0} bx r0 @@ -168,8 +168,8 @@ _08000534: thumb_func_end call_callbacks thumb_func_start set_callback2 -@ void set_callback2(void ( *func)()) -set_callback2: @ 8000540 +; void set_callback2(void ( *func)()) +set_callback2: ; 8000540 ldr r1, =0x030022c0 str r0, [r1, 0x4] movs r0, 0x87 @@ -183,8 +183,8 @@ set_callback2: @ 8000540 thumb_func_end set_callback2 thumb_func_start start_timer1 -@ void start_timer1() -start_timer1: @ 8000554 +; void start_timer1() +start_timer1: ; 8000554 ldr r1, =0x04000106 movs r0, 0x80 strh r0, [r1] @@ -194,8 +194,8 @@ start_timer1: @ 8000554 thumb_func_end start_timer1 thumb_func_start set_rand_seed_and_trainer_id_hi -@ void set_rand_seed_and_trainer_id_hi() -set_rand_seed_and_trainer_id_hi: @ 8000560 +; void set_rand_seed_and_trainer_id_hi() +set_rand_seed_and_trainer_id_hi: ; 8000560 push {r4,lr} ldr r0, =0x04000104 ldrh r4, [r0] @@ -214,8 +214,8 @@ set_rand_seed_and_trainer_id_hi: @ 8000560 thumb_func_end set_rand_seed_and_trainer_id_hi thumb_func_start get_trainer_id_hi -@ u16 get_trainer_id_hi() -get_trainer_id_hi: @ 8000588 +; u16 get_trainer_id_hi() +get_trainer_id_hi: ; 8000588 ldr r0, =0x02020000 ldrh r0, [r0] bx lr @@ -224,8 +224,8 @@ get_trainer_id_hi: @ 8000588 thumb_func_end get_trainer_id_hi thumb_func_start lcd_enable_vcount_irq_at_150px -@ void lcd_enable_vcount_irq_at_150px() -lcd_enable_vcount_irq_at_150px: @ 8000594 +; void lcd_enable_vcount_irq_at_150px() +lcd_enable_vcount_irq_at_150px: ; 8000594 push {lr} movs r0, 0x4 bl lcd_io_get @@ -246,8 +246,8 @@ lcd_enable_vcount_irq_at_150px: @ 8000594 thumb_func_end lcd_enable_vcount_irq_at_150px thumb_func_start init_keypad_data -@ void init_keypad_data() -init_keypad_data: @ 80005BC +; void init_keypad_data() +init_keypad_data: ; 80005BC ldr r1, =0x030026fc movs r0, 0x5 strh r0, [r1] @@ -267,8 +267,8 @@ init_keypad_data: @ 80005BC thumb_func_end init_keypad_data thumb_func_start load_keys -@ void load_keys() -load_keys: @ 80005E4 +; void load_keys() +load_keys: ; 80005E4 push {lr} ldr r0, =0x04000130 ldrh r1, [r0] @@ -285,62 +285,62 @@ load_keys: @ 80005E4 strh r0, [r1, 0x30] adds r2, r1, 0 cmp r3, 0 - beq _08000630 + beq @08000630 ldrh r0, [r2, 0x2C] cmp r0, r3 - bne _08000630 + bne @08000630 ldrh r0, [r2, 0x32] subs r0, 0x1 strh r0, [r2, 0x32] lsls r0, 16 cmp r0, 0 - bne _08000636 + bne @08000636 strh r3, [r2, 0x30] ldr r0, =0x030026fc - b _08000632 + b @08000632 .align 2, 0 .pool -_08000630: +@08000630: ldr r0, =0x030022b0 -_08000632: +@08000632: ldrh r0, [r0] strh r0, [r2, 0x32] -_08000636: +@08000636: strh r3, [r2, 0x28] strh r3, [r2, 0x2C] ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x2 - bne _08000668 + bne @08000668 ldrh r1, [r2, 0x2E] movs r3, 0x80 lsls r3, 2 adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _08000658 + beq @08000658 movs r0, 0x1 orrs r0, r1 strh r0, [r2, 0x2E] -_08000658: +@08000658: ldrh r1, [r2, 0x2C] adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _08000668 + beq @08000668 movs r0, 0x1 orrs r0, r1 strh r0, [r2, 0x2C] -_08000668: +@08000668: ldrh r1, [r2, 0x2E] ldrh r0, [r2, 0x36] ands r0, r1 cmp r0, 0 - beq _08000676 + beq @08000676 movs r0, 0x1 strh r0, [r2, 0x34] -_08000676: +@08000676: pop {r0} bx r0 .align 2, 0 @@ -348,20 +348,20 @@ _08000676: thumb_func_end load_keys thumb_func_start init_irq_handler -@ void init_irq_handler() -init_irq_handler: @ 8000684 +; void init_irq_handler() +init_irq_handler: ; 8000684 push {r4,r5,lr} ldr r5, =InterruptMain ldr r4, =0x03002750 ldr r3, =gRomInterruptTable ldr r2, =0x03002710 movs r1, 0xD -_08000690: +@08000690: ldm r3!, {r0} stm r2!, {r0} subs r1, 0x1 cmp r1, 0 - bge _08000690 + bge @08000690 ldr r0, =0x040000d4 str r5, [r0] str r4, [r0, 0x4] @@ -389,8 +389,8 @@ _08000690: thumb_func_end init_irq_handler thumb_func_start SetVBlankCallback -@ void SetVBlankCallback(void ( *func)()) -SetVBlankCallback: @ 80006F0 +; void SetVBlankCallback(void ( *func)()) +SetVBlankCallback: ; 80006F0 ldr r1, =0x030022c0 str r0, [r1, 0xC] bx lr @@ -399,8 +399,8 @@ SetVBlankCallback: @ 80006F0 thumb_func_end SetVBlankCallback thumb_func_start SetHBlankCallback -@ void SetHBlankCallback(void ( *func)()) -SetHBlankCallback: @ 80006FC +; void SetHBlankCallback(void ( *func)()) +SetHBlankCallback: ; 80006FC ldr r1, =0x030022c0 str r0, [r1, 0x10] bx lr @@ -409,7 +409,7 @@ SetHBlankCallback: @ 80006FC thumb_func_end SetHBlankCallback thumb_func_start SetVCountCallback -SetVCountCallback: @ 8000708 +SetVCountCallback: ; 8000708 ldr r1, =0x030022c0 str r0, [r1, 0x14] bx lr @@ -418,8 +418,8 @@ SetVCountCallback: @ 8000708 thumb_func_end SetVCountCallback thumb_func_start restore_serial_timer3_irq_handlers -@ void restore_serial_timer3_irq_handlers() -restore_serial_timer3_irq_handlers: @ 8000714 +; void restore_serial_timer3_irq_handlers() +restore_serial_timer3_irq_handlers: ; 8000714 ldr r0, =0x03002710 ldr r1, =irq_serial + 1 str r1, [r0, 0x4] @@ -431,8 +431,8 @@ restore_serial_timer3_irq_handlers: @ 8000714 thumb_func_end restore_serial_timer3_irq_handlers thumb_func_start set_serial_callback -@ void set_serial_callback(void ( *func)()) -set_serial_callback: @ 800072C +; void set_serial_callback(void ( *func)()) +set_serial_callback: ; 800072C ldr r1, =0x030022c0 str r0, [r1, 0x18] bx lr @@ -441,24 +441,24 @@ set_serial_callback: @ 800072C thumb_func_end set_serial_callback thumb_func_start irq_vblank -@ void irq_vblank() -irq_vblank: @ 8000738 +; void irq_vblank() +irq_vblank: ; 8000738 push {r4,lr} ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq _0800074C + beq @0800074C bl rfu_syncVBlank__ - b _08000758 + b @08000758 .align 2, 0 .pool -_0800074C: +@0800074C: ldr r0, =0x03002748 ldrb r0, [r0] cmp r0, 0 - bne _08000758 + bne @08000758 bl sub_800B9B8 -_08000758: +@08000758: ldr r0, =0x030022c0 ldr r1, [r0, 0x20] adds r1, 0x1 @@ -467,20 +467,20 @@ _08000758: ldr r1, [r1] adds r4, r0, 0 cmp r1, 0 - beq _08000778 + beq @08000778 ldr r2, [r1] movs r0, 0x2 negs r0, r0 cmp r2, r0 - bhi _08000778 + bhi @08000778 adds r0, r2, 0x1 str r0, [r1] -_08000778: +@08000778: ldr r0, [r4, 0xC] cmp r0, 0 - beq _08000782 + beq @08000782 bl _call_via_r0 -_08000782: +@08000782: ldr r0, [r4, 0x24] adds r0, 0x1 str r0, [r4, 0x24] @@ -498,16 +498,16 @@ _08000782: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq _080007BA + beq @080007BA ldr r0, =0x02022fec ldr r0, [r0] ldr r1, =0x013f0102 ands r0, r1 cmp r0, 0 - bne _080007BE -_080007BA: + bne @080007BE +@080007BA: bl GenerateRandomNumber -_080007BE: +@080007BE: bl sub_800E174 ldr r2, =0x03007ff8 ldrh r0, [r2] @@ -527,8 +527,8 @@ _080007BE: thumb_func_end irq_vblank thumb_func_start flash_timeout_start_on_timer_2 -@ void flash_timeout_start_on_timer_2() -flash_timeout_start_on_timer_2: @ 8000800 +; void flash_timeout_start_on_timer_2() +flash_timeout_start_on_timer_2: ; 8000800 push {lr} ldr r1, =0x0300272c movs r0, 0x2 @@ -540,15 +540,15 @@ flash_timeout_start_on_timer_2: @ 8000800 thumb_func_end flash_timeout_start_on_timer_2 thumb_func_start irq_hblank -@ void irq_hblank() -irq_hblank: @ 8000814 +; void irq_hblank() +irq_hblank: ; 8000814 push {r4,lr} ldr r4, =0x030022c0 ldr r0, [r4, 0x10] cmp r0, 0 - beq _08000822 + beq @08000822 bl _call_via_r0 -_08000822: +@08000822: ldr r2, =0x03007ff8 ldrh r0, [r2] movs r1, 0x2 @@ -566,15 +566,15 @@ _08000822: thumb_func_end irq_hblank thumb_func_start irq_vcount -@ void irq_vcount() -irq_vcount: @ 8000844 +; void irq_vcount() +irq_vcount: ; 8000844 push {r4,lr} ldr r4, =0x030022c0 ldr r0, [r4, 0x14] cmp r0, 0 - beq _08000852 + beq @08000852 bl _call_via_r0 -_08000852: +@08000852: bl SoundVSync_rev01 ldr r2, =0x03007ff8 ldrh r0, [r2] @@ -593,15 +593,15 @@ _08000852: thumb_func_end irq_vcount thumb_func_start irq_serial -@ void irq_serial() -irq_serial: @ 8000878 +; void irq_serial() +irq_serial: ; 8000878 push {r4,lr} ldr r4, =0x030022c0 ldr r0, [r4, 0x18] cmp r0, 0 - beq _08000886 + beq @08000886 bl _call_via_r0 -_08000886: +@08000886: ldr r2, =0x03007ff8 ldrh r0, [r2] movs r1, 0x80 @@ -619,14 +619,14 @@ _08000886: thumb_func_end irq_serial thumb_func_start irq_other -@ void irq_other() -irq_other: @ 80008A8 +; void irq_other() +irq_other: ; 80008A8 bx lr thumb_func_end irq_other thumb_func_start wait_for_vblank -@ void wait_for_vblank() -wait_for_vblank: @ 80008AC +; void wait_for_vblank() +wait_for_vblank: ; 80008AC push {lr} ldr r2, =0x030022c0 ldrh r1, [r2, 0x1C] @@ -638,15 +638,15 @@ wait_for_vblank: @ 80008AC movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _080008D0 + bne @080008D0 movs r3, 0x1 -_080008C6: +@080008C6: ldrh r1, [r2, 0x1C] adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq _080008C6 -_080008D0: + beq @080008C6 +@080008D0: pop {r0} bx r0 .align 2, 0 @@ -654,7 +654,7 @@ _080008D0: thumb_func_end wait_for_vblank thumb_func_start sub_80008DC -sub_80008DC: @ 80008DC +sub_80008DC: ; 80008DC ldr r1, =0x0203cf5c str r0, [r1] bx lr @@ -663,7 +663,7 @@ sub_80008DC: @ 80008DC thumb_func_end sub_80008DC thumb_func_start sub_80008E8 -sub_80008E8: @ 80008E8 +sub_80008E8: ; 80008E8 ldr r1, =0x0203cf5c movs r0, 0 str r0, [r1] @@ -673,8 +673,8 @@ sub_80008E8: @ 80008E8 thumb_func_end sub_80008E8 thumb_func_start do_reset -@ void do_reset() -do_reset: @ 80008F4 +; void do_reset() +do_reset: ; 80008F4 push {r4,lr} ldr r1, =0x04000208 movs r0, 0 @@ -722,7 +722,7 @@ do_reset: @ 80008F4 thumb_func_end do_reset thumb_func_start sub_8000964 -sub_8000964: @ 8000964 +sub_8000964: ; 8000964 push {lr} sub sp, 0x4 mov r1, sp diff --git a/asm/malloc.s b/asm/malloc.s index 511f979a1..901aebe05 100644 --- a/asm/malloc.s +++ b/asm/malloc.s @@ -1,6 +1,6 @@ thumb_func_start malloc_header -@ void malloc_header(struct memblk *blk, struct memblk *prev, struct memblk *next, u32 size) -malloc_header: @ 8000988 +; void malloc_header(struct memblk *blk, struct memblk *prev, struct memblk *next, u32 size) +malloc_header: ; 8000988 push {r4,lr} movs r4, 0 strh r4, [r0] @@ -17,8 +17,8 @@ malloc_header: @ 8000988 thumb_func_end malloc_header thumb_func_start malloc_unlinked_header -@ void malloc_unlinked_header(struct memblk *blk, u32 size) -malloc_unlinked_header: @ 80009A4 +; void malloc_unlinked_header(struct memblk *blk, u32 size) +malloc_unlinked_header: ; 80009A4 push {lr} adds r2, r0, 0 adds r3, r1, 0 @@ -30,33 +30,33 @@ malloc_unlinked_header: @ 80009A4 thumb_func_end malloc_unlinked_header thumb_func_start malloc_core -@ void *malloc_core(struct memblk *head, u32 size) -malloc_core: @ 80009B8 +; void *malloc_core(struct memblk *head, u32 size) +malloc_core: ; 80009B8 push {r4-r6,lr} adds r4, r0, 0 adds r6, r4, 0 movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _080009CC + beq @080009CC lsrs r0, r1, 2 adds r0, 0x1 lsls r1, r0, 2 -_080009CC: +@080009CC: movs r2, 0x1 -_080009CE: +@080009CE: ldrh r0, [r4] cmp r0, 0 - bne _08000A0C + bne @08000A0C ldr r3, [r4, 0x4] cmp r3, r1 - bcc _08000A0C + bcc @08000A0C subs r0, r3, r1 cmp r0, 0x1F - bhi _080009E4 + bhi @080009E4 strh r2, [r4] - b _08000A06 -_080009E4: + b @08000A06 +@080009E4: subs r3, 0x10 subs r3, r1 adds r0, r1, 0 @@ -71,32 +71,32 @@ _080009E4: str r5, [r4, 0xC] ldr r0, [r5, 0xC] cmp r0, r6 - beq _08000A06 + beq @08000A06 str r5, [r0, 0x8] -_08000A06: +@08000A06: adds r0, r4, 0 adds r0, 0x10 - b _08000A18 -_08000A0C: + b @08000A18 +@08000A0C: ldr r0, [r4, 0xC] cmp r0, r6 - beq _08000A16 + beq @08000A16 adds r4, r0, 0 - b _080009CE -_08000A16: + b @080009CE +@08000A16: movs r0, 0 -_08000A18: +@08000A18: pop {r4-r6} pop {r1} bx r1 thumb_func_end malloc_core thumb_func_start free_core -@ void free_core(struct memblk *head, struct memblk *node) -free_core: @ 8000A20 +; void free_core(struct memblk *head, struct memblk *node) +free_core: ; 8000A20 push {r4,r5,lr} cmp r1, 0 - beq _08000A7C + beq @08000A7C adds r5, r0, 0 adds r2, r1, 0 subs r2, 0x10 @@ -104,10 +104,10 @@ free_core: @ 8000A20 strh r0, [r2] ldr r3, [r2, 0xC] cmp r3, r5 - beq _08000A54 + beq @08000A54 ldrh r4, [r3] cmp r4, 0 - bne _08000A54 + bne @08000A54 ldr r0, [r2, 0x4] adds r0, 0x10 ldr r1, [r3, 0x4] @@ -118,23 +118,23 @@ free_core: @ 8000A20 ldr r0, [r0, 0xC] str r0, [r2, 0xC] cmp r0, r5 - beq _08000A54 + beq @08000A54 str r2, [r0, 0x8] -_08000A54: +@08000A54: cmp r2, r5 - beq _08000A7C + beq @08000A7C ldr r1, [r2, 0x8] ldrh r3, [r1] cmp r3, 0 - bne _08000A7C + bne @08000A7C ldr r0, [r2, 0xC] str r0, [r1, 0xC] ldr r1, [r2, 0xC] cmp r1, r5 - beq _08000A6E + beq @08000A6E ldr r0, [r2, 0x8] str r0, [r1, 0x8] -_08000A6E: +@08000A6E: strh r3, [r2, 0x2] ldr r0, [r2, 0x8] ldr r1, [r0, 0x4] @@ -142,30 +142,30 @@ _08000A6E: ldr r2, [r2, 0x4] adds r1, r2 str r1, [r0, 0x4] -_08000A7C: +@08000A7C: pop {r4,r5} pop {r0} bx r0 thumb_func_end free_core thumb_func_start malloc_core_and_clear -@ void *malloc_core_and_clear(struct memblk *head, unsigned int size) -malloc_core_and_clear: @ 8000A84 +; void *malloc_core_and_clear(struct memblk *head, unsigned int size) +malloc_core_and_clear: ; 8000A84 push {r4,r5,lr} sub sp, 0x4 adds r4, r1, 0 bl malloc_core adds r5, r0, 0 cmp r5, 0 - beq _08000AB8 + beq @08000AB8 movs r0, 0x3 ands r0, r4 cmp r0, 0 - beq _08000AA2 + beq @08000AA2 lsrs r0, r4, 2 adds r0, 0x1 lsls r4, r0, 2 -_08000AA2: +@08000AA2: movs r0, 0 str r0, [sp] lsls r2, r4, 9 @@ -176,7 +176,7 @@ _08000AA2: mov r0, sp adds r1, r5, 0 bl CpuSet -_08000AB8: +@08000AB8: adds r0, r5, 0 add sp, 0x4 pop {r4,r5} @@ -185,8 +185,8 @@ _08000AB8: thumb_func_end malloc_core_and_clear thumb_func_start check_memblk_core -@ _BOOL4 check_memblk_core(struct memblk *head, struct memblk *node) -check_memblk_core: @ 8000AC4 +; _BOOL4 check_memblk_core(struct memblk *head, struct memblk *node) +check_memblk_core: ; 8000AC4 push {r4,r5,lr} adds r5, r0, 0 adds r3, r1, 0 @@ -194,52 +194,52 @@ check_memblk_core: @ 8000AC4 ldrh r2, [r3, 0x2] ldr r0, =0x0000a3a3 cmp r2, r0 - bne _08000B0A + bne @08000B0A ldr r0, [r3, 0xC] ldrh r1, [r0, 0x2] adds r4, r0, 0 cmp r1, r2 - bne _08000B0A + bne @08000B0A cmp r4, r5 - beq _08000AE8 + beq @08000AE8 ldr r0, [r4, 0x8] cmp r0, r3 - bne _08000B0A -_08000AE8: + bne @08000B0A +@08000AE8: ldr r2, [r3, 0x8] ldrh r1, [r2, 0x2] ldr r0, =0x0000a3a3 cmp r1, r0 - bne _08000B0A + bne @08000B0A cmp r2, r5 - beq _08000AFC + beq @08000AFC ldr r0, [r2, 0xC] cmp r0, r3 - bne _08000B0A -_08000AFC: + bne @08000B0A +@08000AFC: cmp r4, r5 - beq _08000B14 + beq @08000B14 ldr r0, [r3, 0x4] adds r0, 0x10 adds r0, r3, r0 cmp r4, r0 - beq _08000B14 -_08000B0A: + beq @08000B14 +@08000B0A: movs r0, 0 - b _08000B16 + b @08000B16 .align 2, 0 .pool -_08000B14: +@08000B14: movs r0, 0x1 -_08000B16: +@08000B16: pop {r4,r5} pop {r1} bx r1 thumb_func_end check_memblk_core thumb_func_start init_malloc -@ void init_malloc(u32 heapStart, u32 heapSize) -init_malloc: @ 8000B1C +; void init_malloc(u32 heapStart, u32 heapSize) +init_malloc: ; 8000B1C push {lr} ldr r2, =0x03000004 str r0, [r2] @@ -253,8 +253,8 @@ init_malloc: @ 8000B1C thumb_func_end init_malloc thumb_func_start malloc -@ void *malloc(u32 size) -malloc: @ 8000B38 +; void *malloc(u32 size) +malloc: ; 8000B38 push {lr} adds r1, r0, 0 ldr r0, =0x03000004 @@ -267,8 +267,8 @@ malloc: @ 8000B38 thumb_func_end malloc thumb_func_start malloc_and_clear -@ void *malloc_and_clear(u32 size) -malloc_and_clear: @ 8000B4C +; void *malloc_and_clear(u32 size) +malloc_and_clear: ; 8000B4C push {lr} adds r1, r0, 0 ldr r0, =0x03000004 @@ -281,8 +281,8 @@ malloc_and_clear: @ 8000B4C thumb_func_end malloc_and_clear thumb_func_start free -@ void free(void *ptr) -free: @ 8000B60 +; void free(void *ptr) +free: ; 8000B60 push {lr} adds r1, r0, 0 ldr r0, =0x03000004 @@ -295,8 +295,8 @@ free: @ 8000B60 thumb_func_end free thumb_func_start check_memblk -@ _BOOL4 check_memblk(struct memblk *node) -check_memblk: @ 8000B74 +; _BOOL4 check_memblk(struct memblk *node) +check_memblk: ; 8000B74 push {lr} adds r1, r0, 0 ldr r0, =0x03000004 @@ -309,30 +309,30 @@ check_memblk: @ 8000B74 thumb_func_end check_memblk thumb_func_start check_all_memblks -@ _BOOL4 check_all_memblks() -check_all_memblks: @ 8000B88 +; _BOOL4 check_all_memblks() +check_all_memblks: ; 8000B88 push {r4,r5,lr} ldr r0, =0x03000004 ldr r4, [r0] adds r5, r0, 0 -_08000B90: +@08000B90: ldr r0, [r5] adds r1, r4, 0 adds r1, 0x10 bl check_memblk_core cmp r0, 0 - beq _08000BB0 + beq @08000BB0 ldr r4, [r4, 0xC] ldr r0, [r5] cmp r4, r0 - bne _08000B90 + bne @08000B90 movs r0, 0x1 - b _08000BB2 + b @08000BB2 .align 2, 0 .pool -_08000BB0: +@08000BB0: movs r0, 0 -_08000BB2: +@08000BB2: pop {r4,r5} pop {r1} bx r1 diff --git a/asm/pixel_buffer.s b/asm/pixel_buffer.s index 65ac15099..207372f19 100644 --- a/asm/pixel_buffer.s +++ b/asm/pixel_buffer.s @@ -1,5 +1,5 @@ thumb_func_start sub_8002BDC -sub_8002BDC: @ 8002BDC +sub_8002BDC: ; 8002BDC push {r4-r7,lr} mov r7, r8 push {r7} @@ -36,8 +36,8 @@ sub_8002BDC: @ 8002BDC thumb_func_end sub_8002BDC thumb_func_start PixelBlock_CopyRect4Bpp -@ void PixelBlock_CopyRect4Bpp(struct PixelBlock *src_pixels_data, struct PixelBlock *dest_pixels_data, u16 src_x, u16 src_y, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h, u8 a9) -PixelBlock_CopyRect4Bpp: @ 8002C20 +; void PixelBlock_CopyRect4Bpp(struct PixelBlock *src_pixels_data, struct PixelBlock *dest_pixels_data, u16 src_x, u16 src_y, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h, u8 a9) +PixelBlock_CopyRect4Bpp: ; 8002C20 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -76,11 +76,11 @@ PixelBlock_CopyRect4Bpp: @ 8002C20 adds r2, r4 mov r8, r2 cmp r0, r4 - bge _08002C74 + bge @08002C74 ldr r2, [sp, 0x8] adds r0, r2 mov r8, r0 -_08002C74: +@08002C74: ldr r4, [sp, 0x4] ldrh r0, [r4, 0x6] mov r1, r9 @@ -88,10 +88,10 @@ _08002C74: adds r2, r5, r7 str r2, [sp, 0x14] cmp r0, r5 - bge _08002C88 + bge @08002C88 adds r0, r7 str r0, [sp, 0x14] -_08002C88: +@08002C88: ldr r4, [sp] ldrh r1, [r4, 0x4] movs r2, 0x7 @@ -107,14 +107,14 @@ _08002C88: str r0, [sp, 0x1C] ldr r0, [sp, 0x10] cmp r0, 0xFF - bne _08002D46 + bne @08002D46 adds r3, r7, 0 mov r1, r9 ldr r2, [sp, 0x14] cmp r3, r2 - blt _08002CB4 - b _08002DEE -_08002CB4: + blt @08002CB4 + b @08002DEE +@08002CB4: ldr r5, [sp, 0x8] ldr r6, [sp, 0xC] adds r4, r3, 0x1 @@ -122,7 +122,7 @@ _08002CB4: adds r0, r1, 0x1 str r0, [sp, 0x28] cmp r5, r8 - bge _08002D3A + bge @08002D3A movs r7, 0x3 asrs r0, r3, 3 ldr r2, [sp, 0x18] @@ -139,7 +139,7 @@ _08002CB4: mov r12, r0 lsls r0, r1, 29 lsrs r3, r0, 27 -_08002CE4: +@08002CE4: asrs r0, r5, 1 ands r0, r7 ldr r2, [sp] @@ -182,21 +182,21 @@ _08002CE4: adds r5, 0x1 adds r6, 0x1 cmp r5, r8 - blt _08002CE4 -_08002D3A: + blt @08002CE4 +@08002D3A: ldr r3, [sp, 0x24] ldr r1, [sp, 0x28] ldr r2, [sp, 0x14] cmp r3, r2 - blt _08002CB4 - b _08002DEE -_08002D46: + blt @08002CB4 + b @08002DEE +@08002D46: adds r3, r7, 0 mov r1, r9 ldr r4, [sp, 0x14] cmp r3, r4 - bge _08002DEE -_08002D50: + bge @08002DEE +@08002D50: ldr r5, [sp, 0x8] ldr r6, [sp, 0xC] adds r0, r3, 0x1 @@ -204,7 +204,7 @@ _08002D50: adds r2, r1, 0x1 str r2, [sp, 0x28] cmp r5, r8 - bge _08002DE4 + bge @08002DE4 movs r4, 0x3 mov r9, r4 asrs r0, r3, 3 @@ -223,7 +223,7 @@ _08002D50: mov r12, r0 lsls r0, r1, 29 lsrs r7, r0, 27 -_08002D84: +@08002D84: asrs r0, r5, 1 mov r1, r9 ands r0, r1 @@ -257,7 +257,7 @@ _08002D84: ands r2, r0 ldr r0, [sp, 0x10] cmp r2, r0 - beq _08002DDC + beq @08002DDC adds r0, r6, 0 ands r0, r3 lsls r1, r0, 2 @@ -268,18 +268,18 @@ _08002D84: ands r0, r1 orrs r2, r0 strb r2, [r4] -_08002DDC: +@08002DDC: adds r5, 0x1 adds r6, 0x1 cmp r5, r8 - blt _08002D84 -_08002DE4: + blt @08002D84 +@08002DE4: ldr r3, [sp, 0x24] ldr r1, [sp, 0x28] ldr r2, [sp, 0x14] cmp r3, r2 - blt _08002D50 -_08002DEE: + blt @08002D50 +@08002DEE: add sp, 0x2C pop {r3-r5} mov r8, r3 @@ -291,8 +291,8 @@ _08002DEE: thumb_func_end PixelBlock_CopyRect4Bpp thumb_func_start PixelBlock_FillRect4Bpp -@ int PixelBlock_FillRect4Bpp(struct PixelBlock *pixels_data, u16 x, u16 y, u16 w, u16 h, u8 fill_value) -PixelBlock_FillRect4Bpp: @ 8002E00 +; int PixelBlock_FillRect4Bpp(struct PixelBlock *pixels_data, u16 x, u16 y, u16 w, u16 h, u8 fill_value) +PixelBlock_FillRect4Bpp: ; 8002E00 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -318,17 +318,17 @@ PixelBlock_FillRect4Bpp: @ 8002E00 mov r3, r9 ldrh r1, [r3, 0x4] cmp r4, r1 - ble _08002E36 + ble @08002E36 adds r4, r1, 0 -_08002E36: +@08002E36: adds r2, r0 mov r12, r2 mov r2, r9 ldrh r0, [r2, 0x6] cmp r12, r0 - ble _08002E44 + ble @08002E44 mov r12, r0 -_08002E44: +@08002E44: movs r0, 0x7 ands r0, r1 adds r0, r1, r0 @@ -344,19 +344,19 @@ _08002E44: mov r10, r0 adds r1, r6, 0 cmp r1, r12 - bge _08002EB6 -_08002E64: + bge @08002EB6 +@08002E64: ldr r3, [sp] adds r7, r1, 0x1 cmp r3, r4 - bge _08002EB0 + bge @08002EB0 asrs r0, r1, 3 ldr r2, [sp, 0x4] muls r0, r2 lsls r6, r0, 5 lsls r0, r1, 29 lsrs r5, r0, 27 -_08002E78: +@08002E78: asrs r2, r3, 1 movs r0, 0x3 ands r2, r0 @@ -370,28 +370,28 @@ _08002E78: adds r2, r1, r5 lsls r0, r3, 31 cmp r0, 0 - beq _08002E9E + beq @08002E9E ldrb r1, [r2] movs r0, 0xF ands r0, r1 mov r1, r8 - b _08002EA6 -_08002E9E: + b @08002EA6 +@08002E9E: ldrb r1, [r2] movs r0, 0xF0 ands r0, r1 mov r1, r10 -_08002EA6: +@08002EA6: orrs r0, r1 strb r0, [r2] adds r3, 0x1 cmp r3, r4 - blt _08002E78 -_08002EB0: + blt @08002E78 +@08002EB0: adds r1, r7, 0 cmp r1, r12 - blt _08002E64 -_08002EB6: + blt @08002E64 +@08002EB6: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -403,8 +403,8 @@ _08002EB6: thumb_func_end PixelBlock_FillRect4Bpp thumb_func_start PixelBlock_CopyRect4BppTo8Bpp -@ void PixelBlock_CopyRect4BppTo8Bpp(struct PixelBlock *src_pixels_data, struct PixelBlock *dest_pixels_data, u16 src_x, u16 src_y, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h, int a9, int a10) -PixelBlock_CopyRect4BppTo8Bpp: @ 8002EC8 +; void PixelBlock_CopyRect4BppTo8Bpp(struct PixelBlock *src_pixels_data, struct PixelBlock *dest_pixels_data, u16 src_x, u16 src_y, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h, int a9, int a10) +PixelBlock_CopyRect4BppTo8Bpp: ; 8002EC8 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -452,24 +452,24 @@ PixelBlock_CopyRect4BppTo8Bpp: @ 8002EC8 adds r1, r5, r1 str r1, [sp, 0x18] cmp r0, r5 - bge _08002F2E + bge @08002F2E ldr r2, [sp, 0x8] adds r0, r2 str r0, [sp, 0x18] -_08002F2E: +@08002F2E: ldr r5, [sp, 0x4] ldrh r1, [r5, 0x6] subs r0, r1, r7 cmp r0, r4 - bge _08002F40 + bge @08002F40 adds r0, r3, r1 subs r0, r7 str r0, [sp, 0x1C] - b _08002F44 -_08002F40: + b @08002F44 +@08002F40: adds r4, r3, r4 str r4, [sp, 0x1C] -_08002F44: +@08002F44: ldr r0, [sp] ldrh r1, [r0, 0x4] movs r2, 0x7 @@ -487,14 +487,14 @@ _08002F44: str r1, [sp, 0x24] ldr r0, [sp, 0x10] cmp r0, 0xFF - bne _08003024 + bne @08003024 adds r2, r3, 0 adds r5, r7, 0 ldr r1, [sp, 0x1C] cmp r2, r1 - blt _08002F74 - b _08003106 -_08002F74: + blt @08002F74 + b @08003106 +@08002F74: ldr r3, [sp, 0x8] lsrs r3, 1 str r3, [sp, 0x2C] @@ -505,7 +505,7 @@ _08002F74: lsrs r0, r7, 3 lsls r0, 5 str r0, [sp, 0x30] -_08002F88: +@08002F88: ldr r0, [sp] ldr r1, [r0] ldr r3, [sp, 0x2C] @@ -529,7 +529,7 @@ _08002F88: str r0, [sp, 0x38] ldr r1, [sp, 0x18] cmp r3, r1 - bge _08003018 + bge @08003018 asrs r0, r5, 3 ldr r2, [sp, 0x24] muls r0, r2 @@ -538,7 +538,7 @@ _08002F88: lsls r0, r5, 29 lsrs r0, 26 mov r9, r0 -_08002FC8: +@08002FC8: movs r0, 0x7 ands r0, r4 ldr r5, [sp, 0x4] @@ -553,11 +553,11 @@ _08002FC8: movs r0, 0x1 ands r0, r3 cmp r0, 0 - beq _08002FEC + beq @08002FEC ldrb r0, [r6] lsrs r0, 4 - b _08003008 -_08002FEC: + b @08003008 +@08002FEC: asrs r2, r3, 1 movs r0, 0x3 ands r2, r0 @@ -572,7 +572,7 @@ _08002FEC: ldrb r1, [r6] movs r0, 0xF ands r0, r1 -_08003008: +@08003008: ldr r1, [sp, 0x14] adds r0, r1, r0 strb r0, [r5] @@ -580,20 +580,20 @@ _08003008: adds r4, 0x1 ldr r2, [sp, 0x18] cmp r3, r2 - blt _08002FC8 -_08003018: + blt @08002FC8 +@08003018: mov r2, r10 ldr r5, [sp, 0x38] ldr r3, [sp, 0x1C] cmp r2, r3 - blt _08002F88 - b _08003106 -_08003024: + blt @08002F88 + b @08003106 +@08003024: adds r2, r3, 0 adds r5, r7, 0 ldr r7, [sp, 0x1C] cmp r2, r7 - bge _08003106 + bge @08003106 ldr r0, [sp, 0x8] lsrs r0, 1 str r0, [sp, 0x34] @@ -601,7 +601,7 @@ _08003024: ldr r1, [sp, 0x34] ands r1, r0 str r1, [sp, 0x34] -_0800303C: +@0800303C: ldr r3, [sp] ldr r1, [r3] ldr r7, [sp, 0x34] @@ -626,7 +626,7 @@ _0800303C: str r0, [sp, 0x38] ldr r1, [sp, 0x18] cmp r3, r1 - bge _080030FC + bge @080030FC asrs r0, r5, 3 ldr r2, [sp, 0x24] muls r0, r2 @@ -635,17 +635,17 @@ _0800303C: lsls r0, r5, 29 lsrs r0, 26 mov r12, r0 -_0800307E: +@0800307E: movs r0, 0x1 ands r0, r3 cmp r0, 0 - beq _080030B2 + beq @080030B2 ldrb r2, [r6] movs r0, 0xF0 ands r0, r2 ldr r5, [sp, 0x28] cmp r0, r5 - beq _080030F2 + beq @080030F2 adds r0, r4, 0 movs r1, 0x7 ands r0, r1 @@ -661,8 +661,8 @@ _0800307E: lsrs r0, r2, 4 ldr r1, [sp, 0x14] adds r0, r1, r0 - b _080030F0 -_080030B2: + b @080030F0 +@080030B2: asrs r2, r3, 1 movs r0, 0x3 ands r2, r0 @@ -679,7 +679,7 @@ _080030B2: ands r2, r0 ldr r0, [sp, 0x10] cmp r2, r0 - beq _080030F2 + beq @080030F2 adds r0, r4, 0 movs r1, 0x7 ands r0, r1 @@ -694,21 +694,21 @@ _080030B2: adds r5, r1, r0 ldr r1, [sp, 0x14] adds r0, r1, r2 -_080030F0: +@080030F0: strb r0, [r5] -_080030F2: +@080030F2: adds r3, 0x1 adds r4, 0x1 ldr r2, [sp, 0x18] cmp r3, r2 - blt _0800307E -_080030FC: + blt @0800307E +@080030FC: mov r2, r10 ldr r5, [sp, 0x38] ldr r3, [sp, 0x1C] cmp r2, r3 - blt _0800303C -_08003106: + blt @0800303C +@08003106: add sp, 0x3C pop {r3-r5} mov r8, r3 @@ -720,8 +720,8 @@ _08003106: thumb_func_end PixelBlock_CopyRect4BppTo8Bpp thumb_func_start PixelBlock_FillRect8Bpp -@ void PixelBlock_FillRect8Bpp(struct PixelBlock *pixels_data, u16 x, u16 y, u16 w, u16 h, char fill_value) -PixelBlock_FillRect8Bpp: @ 8003118 +; void PixelBlock_FillRect8Bpp(struct PixelBlock *pixels_data, u16 x, u16 y, u16 w, u16 h, char fill_value) +PixelBlock_FillRect8Bpp: ; 8003118 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -748,16 +748,16 @@ PixelBlock_FillRect8Bpp: @ 8003118 mov r3, r8 ldrh r1, [r3, 0x4] cmp r5, r1 - ble _08003150 + ble @08003150 adds r5, r1, 0 -_08003150: +@08003150: adds r7, r2, r0 mov r2, r8 ldrh r0, [r2, 0x6] cmp r7, r0 - ble _0800315C + ble @0800315C adds r7, r0, 0 -_0800315C: +@0800315C: movs r0, 0x7 ands r0, r1 adds r0, r1, r0 @@ -765,13 +765,13 @@ _0800315C: str r0, [sp] adds r1, r6, 0 cmp r1, r7 - bge _080031AC -_0800316C: + bge @080031AC +@0800316C: mov r3, r10 adds r6, r1, 0x1 str r6, [sp, 0x4] cmp r3, r5 - bge _080031A6 + bge @080031A6 movs r0, 0x7 mov r12, r0 asrs r0, r1, 3 @@ -780,7 +780,7 @@ _0800316C: lsls r4, r0, 6 lsls r0, r1, 29 lsrs r2, r0, 26 -_08003186: +@08003186: adds r0, r3, 0 mov r6, r12 ands r0, r6 @@ -796,12 +796,12 @@ _08003186: strb r0, [r1] adds r3, 0x1 cmp r3, r5 - blt _08003186 -_080031A6: + blt @08003186 +@080031A6: ldr r1, [sp, 0x4] cmp r1, r7 - blt _0800316C -_080031AC: + blt @0800316C +@080031AC: add sp, 0x8 pop {r3-r5} mov r8, r3 diff --git a/asm/task.s b/asm/task.s index f1e605d0b..e714b406b 100644 --- a/asm/task.s +++ b/asm/task.s @@ -1,12 +1,12 @@ 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 adds r7, r6, 0 adds r7, 0x8 -_080A8F5A: +@080A8F5A: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -30,7 +30,7 @@ _080A8F5A: lsls r4, 24 lsrs r4, 24 cmp r4, 0xF - bls _080A8F5A + bls @080A8F5A ldr r0, =0x03005e00 movs r1, 0xFE strb r1, [r0, 0x5] @@ -47,22 +47,22 @@ _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 lsrs r1, 24 movs r6, 0 ldr r7, =0x03005e00 -_080A8FBC: +@080A8FBC: lsls r0, r6, 2 adds r0, r6 lsls r5, r0, 3 adds r4, r5, r7 ldrb r0, [r4, 0x4] cmp r0, 0 - bne _080A8FF0 + bne @080A8FF0 str r2, [r4] strb r1, [r4, 0x7] adds r0, r6, 0 @@ -76,25 +76,25 @@ _080A8FBC: movs r0, 0x1 strb r0, [r4, 0x4] adds r0, r6, 0 - b _080A8FFC + b @080A8FFC .align 2, 0 .pool -_080A8FF0: +@080A8FF0: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0xF - bls _080A8FBC + bls @080A8FBC movs r0, 0 -_080A8FFC: +@080A8FFC: pop {r4-r7} pop {r1} bx r1 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} @@ -104,7 +104,7 @@ insert_task_in_order_by_priority: @ 80A9004 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x10 - bne _080A9034 + bne @080A9034 ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -114,10 +114,10 @@ insert_task_in_order_by_priority: @ 80A9004 strb r1, [r0, 0x5] movs r1, 0xFF strb r1, [r0, 0x6] - b _080A9090 + b @080A9090 .align 2, 0 .pool -_080A9034: +@080A9034: ldr r6, =0x03005e00 lsls r0, r4, 2 mov r12, r0 @@ -125,7 +125,7 @@ _080A9034: adds r0, r4 lsls r0, 3 adds r2, r0, r6 -_080A9042: +@080A9042: lsls r0, r1, 2 adds r0, r1 lsls r5, r0, 3 @@ -134,31 +134,31 @@ _080A9042: ldrb r0, [r2, 0x7] ldrb r7, [r3, 0x7] cmp r0, r7 - bcs _080A9074 + bcs @080A9074 ldrb r0, [r3, 0x5] strb r0, [r2, 0x5] strb r1, [r2, 0x6] ldrb r0, [r3, 0x5] cmp r0, 0xFE - beq _080A906C + beq @080A906C adds r1, r0, 0 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 add r0, r8 strb r4, [r0, 0x6] -_080A906C: +@080A906C: strb r4, [r3, 0x5] - b _080A9090 + b @080A9090 .align 2, 0 .pool -_080A9074: +@080A9074: ldrb r0, [r3, 0x6] cmp r0, 0xFF - beq _080A907E + beq @080A907E adds r1, r0, 0 - b _080A9042 -_080A907E: + b @080A9042 +@080A907E: mov r2, r12 adds r0, r2, r4 lsls r0, 3 @@ -168,7 +168,7 @@ _080A907E: ldrb r1, [r2, 0x6] strb r1, [r0, 0x6] strb r4, [r2, 0x6] -_080A9090: +@080A9090: pop {r3} mov r8, r3 pop {r4-r7} @@ -177,8 +177,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 @@ -189,29 +189,29 @@ remove_task: @ 80A909C adds r2, r1, r4 ldrb r0, [r2, 0x4] cmp r0, 0 - beq _080A9106 + beq @080A9106 movs r0, 0 strb r0, [r2, 0x4] ldrb r3, [r2, 0x5] cmp r3, 0xFE - bne _080A90D4 + bne @080A90D4 ldrb r0, [r2, 0x6] cmp r0, 0xFF - beq _080A9106 + beq @080A9106 adds r1, r0, 0 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 adds r0, r4 strb r3, [r0, 0x5] - b _080A9106 + b @080A9106 .align 2, 0 .pool -_080A90D4: +@080A90D4: ldrb r3, [r2, 0x6] adds r0, r3, 0 cmp r0, 0xFF - bne _080A90EC + bne @080A90EC ldrb r0, [r2, 0x5] lsls r1, r0, 2 adds r1, r0 @@ -219,8 +219,8 @@ _080A90D4: adds r1, r4 movs r0, 0xFF strb r0, [r1, 0x6] - b _080A9106 -_080A90EC: + b @080A9106 +@080A90EC: ldrb r1, [r2, 0x5] lsls r0, r1, 2 adds r0, r1 @@ -234,23 +234,23 @@ _080A90EC: adds r0, r4 ldrb r1, [r2, 0x5] strb r1, [r0, 0x5] -_080A9106: +@080A9106: pop {r4} pop {r0} bx r0 thumb_func_end remove_task thumb_func_start run_active_tasks -@ void run_active_tasks() -run_active_tasks: @ 80A910C +; void run_active_tasks() +run_active_tasks: ; 80A910C push {r4,r5,lr} bl get_first_active_task lsls r0, 24 lsrs r0, 24 cmp r0, 0x10 - beq _080A9130 + beq @080A9130 ldr r5, =0x03005e00 -_080A911C: +@080A911C: lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -259,8 +259,8 @@ _080A911C: bl _call_via_r1 ldrb r0, [r4, 0x6] cmp r0, 0xFF - bne _080A911C -_080A9130: + bne @080A911C +@080A9130: pop {r4,r5} pop {r0} bx r0 @@ -269,35 +269,35 @@ _080A9130: thumb_func_end run_active_tasks 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 ldrb r1, [r0, 0x4] adds r3, r0, 0 cmp r1, 0x1 - bne _080A9150 + bne @080A9150 ldrb r0, [r3, 0x5] cmp r0, 0xFE - beq _080A916E -_080A9150: + beq @080A916E +@080A9150: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xF - bhi _080A916E + bhi @080A916E lsls r0, r2, 2 adds r0, r2 lsls r0, 3 adds r1, r0, r3 ldrb r0, [r1, 0x4] cmp r0, 0x1 - bne _080A9150 + bne @080A9150 ldrb r0, [r1, 0x5] cmp r0, 0xFE - bne _080A9150 -_080A916E: + bne @080A9150 +@080A916E: adds r0, r2, 0 pop {r1} bx r1 @@ -306,12 +306,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 @@ -340,7 +340,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 @@ -369,93 +369,93 @@ 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 ldr r4, =0x03005e00 -_080A91EC: +@080A91EC: lsls r0, r2, 2 adds r0, r2 lsls r0, 3 adds r1, r0, r4 ldrb r0, [r1, 0x4] cmp r0, 0x1 - bne _080A9208 + bne @080A9208 ldr r0, [r1] cmp r0, r3 - bne _080A9208 + bne @080A9208 movs r0, 0x1 - b _080A9214 + b @080A9214 .align 2, 0 .pool -_080A9208: +@080A9208: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xF - bls _080A91EC + bls @080A91EC movs r0, 0 -_080A9214: +@080A9214: pop {r4} pop {r1} bx r1 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 ldr r1, =0x03005e00 -_080A9224: +@080A9224: ldrb r0, [r1, 0x4] cmp r0, 0x1 - bne _080A923C + bne @080A923C ldr r0, [r1] cmp r0, r3 - bne _080A923C + bne @080A923C lsls r0, r2, 24 lsrs r0, 24 - b _080A9246 + b @080A9246 .align 2, 0 .pool -_080A923C: +@080A923C: adds r1, 0x28 adds r2, 0x1 cmp r2, 0xF - ble _080A9224 + ble @080A9224 movs r0, 0xFF -_080A9246: +@080A9246: pop {r1} bx r1 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 ldr r3, =0x03005e00 -_080A9254: +@080A9254: lsls r0, r1, 2 adds r0, r1 lsls r0, 3 adds r0, r3 ldrb r0, [r0, 0x4] cmp r0, 0x1 - bne _080A9268 + bne @080A9268 adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 -_080A9268: +@080A9268: adds r0, r1, 0x1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xF - bls _080A9254 + bls @080A9254 adds r0, r2, 0 pop {r1} bx r1 @@ -464,7 +464,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 @@ -472,7 +472,7 @@ set_word_task_arg: @ 80A927C lsls r1, 24 lsrs r3, r1, 24 cmp r3, 0xE - bhi _080A92AA + bhi @080A92AA ldr r2, =0x03005e00 lsls r0, r3, 1 lsls r1, r4, 2 @@ -488,7 +488,7 @@ set_word_task_arg: @ 80A927C adds r0, r2 lsrs r1, r5, 16 strh r1, [r0] -_080A92AA: +@080A92AA: pop {r4,r5} pop {r0} bx r0 @@ -497,17 +497,17 @@ _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 lsls r1, 24 lsrs r1, 24 cmp r1, 0xE - bls _080A92C6 + bls @080A92C6 movs r0, 0 - b _080A92E8 -_080A92C6: + b @080A92E8 +@080A92C6: ldr r3, =0x03005e00 lsls r0, r1, 1 lsls r2, r4, 2 @@ -525,7 +525,7 @@ _080A92C6: ldrsh r1, [r1, r2] lsls r1, 16 orrs r0, r1 -_080A92E8: +@080A92E8: pop {r4} pop {r1} bx r1 diff --git a/asm/text_renderer.s b/asm/text_renderer.s index ead79ede9..4301addaf 100644 --- a/asm/text_renderer.s +++ b/asm/text_renderer.s @@ -1,6 +1,6 @@ thumb_func_start fboxes_set_ptr -@ void fboxes_set_ptr(struct fbox *ptr) -fboxes_set_ptr: @ 80045A4 +; void fboxes_set_ptr(struct fbox *ptr) +fboxes_set_ptr: ; 80045A4 ldr r1, =0x03002f80 str r0, [r1] bx lr @@ -9,18 +9,18 @@ fboxes_set_ptr: @ 80045A4 thumb_func_end fboxes_set_ptr thumb_func_start TextBox_ResetSomeField -@ void TextBox_ResetSomeField() -TextBox_ResetSomeField: @ 80045B0 +; void TextBox_ResetSomeField() +TextBox_ResetSomeField: ; 80045B0 push {lr} ldr r1, =0x020201b0 movs r2, 0 ldr r3, =0x0000045c adds r0, r1, r3 -_080045BA: +@080045BA: strb r2, [r0, 0x1B] subs r0, 0x24 cmp r0, r1 - bge _080045BA + bge @080045BA pop {r0} bx r0 .align 2, 0 @@ -28,8 +28,8 @@ _080045BA: thumb_func_end TextBox_ResetSomeField thumb_func_start Print -@ int Print(u8 windowId, u8 fontId, int char_cursor, char x, char y, u8 a6, int a7) -Print: @ 80045D0 +; int Print(u8 windowId, u8 fontId, int char_cursor, char x, char y, u8 a6, int a7) +Print: ; 80045D0 push {r4-r7,lr} mov r7, r8 push {r7} @@ -118,8 +118,8 @@ Print: @ 80045D0 thumb_func_end Print thumb_func_start remo_copy -@ int remo_copy(struct TextBox *x, u8 text_speed, int a3) -remo_copy: @ 800467C +; int remo_copy(struct TextBox *x, u8 text_speed, int a3) +remo_copy: ; 800467C push {r4-r7,lr} adds r6, r0, 0 mov r12, r2 @@ -128,12 +128,12 @@ remo_copy: @ 800467C ldr r0, =0x03002f80 ldr r0, [r0] cmp r0, 0 - bne _08004698 + bne @08004698 movs r0, 0 - b _08004766 + b @08004766 .align 2, 0 .pool -_08004698: +@08004698: ldr r0, =0x0202018c movs r2, 0 movs r1, 0x1 @@ -145,12 +145,12 @@ _08004698: adds r4, r0, 0 movs r1, 0x6 adds r0, 0x1A -_080046AE: +@080046AE: strb r2, [r0] subs r0, 0x1 subs r1, 0x1 cmp r1, 0 - bge _080046AE + bge @080046AE adds r1, r4, 0 adds r0, r6, 0 ldm r0!, {r2,r3,r7} @@ -173,9 +173,9 @@ _080046AE: lsrs r2, 4 bl GenerateFontHalfRowLut cmp r5, 0xFF - beq _08004718 + beq @08004718 cmp r5, 0 - beq _08004718 + beq @08004718 ldrb r0, [r4, 0x1D] subs r0, 0x1 strb r0, [r4, 0x1D] @@ -192,37 +192,37 @@ _080046AE: stm r1!, {r2,r3,r7} ldm r0!, {r2,r4,r7} stm r1!, {r2,r4,r7} - b _0800475E + b @0800475E .align 2, 0 .pool -_08004718: +@08004718: ldr r1, =0x0202018c movs r0, 0 strb r0, [r1, 0x1D] movs r4, 0 ldr r7, =0x000003ff - b _08004732 + b @08004732 .align 2, 0 .pool -_0800472C: +@0800472C: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 -_08004732: +@08004732: cmp r4, r7 - bhi _08004740 + bhi @08004740 ldr r0, =0x0202018c bl fbox_exec cmp r0, 0x1 - bne _0800472C -_08004740: + bne @0800472C +@08004740: cmp r5, 0xFF - beq _0800474E + beq @0800474E ldr r0, =0x0202018c ldrb r0, [r0, 0x4] movs r1, 0x2 bl Window_CopyToVram -_0800474E: +@0800474E: ldr r2, =0x020201b0 ldrb r1, [r6, 0x4] lsls r0, r1, 3 @@ -231,12 +231,12 @@ _0800474E: adds r0, r2 movs r1, 0 strb r1, [r0, 0x1B] -_0800475E: +@0800475E: ldr r1, =0x03002f84 movs r0, 0 strb r0, [r1] movs r0, 0x1 -_08004766: +@08004766: pop {r4-r7} pop {r1} bx r1 @@ -245,71 +245,71 @@ _08004766: thumb_func_end remo_copy thumb_func_start run_remoboxes -@ void run_remoboxes() -run_remoboxes: @ 8004778 +; void run_remoboxes() +run_remoboxes: ; 8004778 push {r4-r7,lr} mov r7, r8 push {r7} ldr r0, =0x03002f84 ldrb r0, [r0] cmp r0, 0 - bne _080047F6 + bne @080047F6 ldr r0, =0x020201b0 movs r6, 0 adds r5, r0, 0x4 mov r8, r0 movs r7, 0x1F -_08004790: +@08004790: ldrb r0, [r5, 0x17] cmp r0, 0 - beq _080047E8 + beq @080047E8 mov r0, r8 bl fbox_exec lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x1 - beq _080047E4 + beq @080047E4 cmp r4, 0x1 - bgt _080047B8 + bgt @080047B8 cmp r4, 0 - beq _080047BE - b _080047E8 + beq @080047BE + b @080047E8 .align 2, 0 .pool -_080047B8: +@080047B8: cmp r4, 0x3 - beq _080047C6 - b _080047E8 -_080047BE: + beq @080047C6 + b @080047E8 +@080047BE: ldrb r0, [r5] movs r1, 0x2 bl Window_CopyToVram -_080047C6: +@080047C6: ldr r1, =0x020201b0 adds r0, r1, 0 adds r0, 0x10 adds r0, r6, r0 ldr r2, [r0] cmp r2, 0 - beq _080047E8 + beq @080047E8 adds r0, r6, r1 adds r1, r4, 0 bl _call_via_r2 - b _080047E8 + b @080047E8 .align 2, 0 .pool -_080047E4: +@080047E4: movs r0, 0 strb r0, [r5, 0x17] -_080047E8: +@080047E8: adds r6, 0x24 adds r5, 0x24 movs r0, 0x24 add r8, r0 subs r7, 0x1 cmp r7, 0 - bge _08004790 -_080047F6: + bge @08004790 +@080047F6: pop {r3} mov r8, r3 pop {r4-r7} @@ -318,7 +318,7 @@ _080047F6: thumb_func_end run_remoboxes thumb_func_start a_pressed_maybe -a_pressed_maybe: @ 8004800 +a_pressed_maybe: ; 8004800 lsls r0, 24 lsrs r0, 24 ldr r2, =0x020201b0 @@ -333,11 +333,11 @@ a_pressed_maybe: @ 8004800 thumb_func_end a_pressed_maybe thumb_func_start fbox_exec -@ int fbox_exec(struct TextBox *x) -fbox_exec: @ 8004818 +; int fbox_exec(struct TextBox *x) +fbox_exec: ; 8004818 push {r4,lr} adds r4, r0, 0 -_0800481C: +@0800481C: ldrb r1, [r4, 0x5] ldr r0, =0x03002f80 ldr r2, [r0] @@ -351,7 +351,7 @@ _0800481C: lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - beq _0800481C + beq @0800481C pop {r4} pop {r1} bx r1 @@ -360,7 +360,7 @@ _0800481C: thumb_func_end fbox_exec thumb_func_start GenerateFontHalfRowLut -GenerateFontHalfRowLut: @ 8004844 +GenerateFontHalfRowLut: ; 8004844 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -820,7 +820,7 @@ GenerateFontHalfRowLut: @ 8004844 thumb_func_end GenerateFontHalfRowLut thumb_func_start save_remo_colors -save_remo_colors: @ 8004BE0 +save_remo_colors: ; 8004BE0 ldr r3, =0x030009ea ldrh r3, [r3] strb r3, [r1] @@ -836,7 +836,7 @@ save_remo_colors: @ 8004BE0 thumb_func_end save_remo_colors thumb_func_start restore_remo_colors -restore_remo_colors: @ 8004C00 +restore_remo_colors: ; 8004C00 push {lr} ldrb r0, [r0] ldrb r1, [r1] @@ -847,8 +847,8 @@ restore_remo_colors: @ 8004C00 thumb_func_end restore_remo_colors 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} @@ -1013,50 +1013,50 @@ DecompressGlyphTile: @ 8004C10 thumb_func_end DecompressGlyphTile thumb_func_start sub_8004D58 -sub_8004D58: @ 8004D58 +sub_8004D58: ; 8004D58 push {lr} lsls r0, 24 lsrs r0, 24 adds r1, r0, 0 cmp r0, 0x1 - beq _08004D8C + beq @08004D8C cmp r0, 0x1 - bgt _08004D6E + bgt @08004D6E cmp r0, 0 - beq _08004D74 - b _08004D98 -_08004D6E: + beq @08004D74 + b @08004D98 +@08004D6E: cmp r1, 0x2 - beq _08004D80 - b _08004D98 -_08004D74: + beq @08004D80 + b @08004D98 +@08004D74: ldr r0, =0x030009ec ldrb r0, [r0] - b _08004D9A + b @08004D9A .align 2, 0 .pool -_08004D80: +@08004D80: ldr r0, =0x030009ea ldrb r0, [r0] - b _08004D9A + b @08004D9A .align 2, 0 .pool -_08004D8C: +@08004D8C: ldr r0, =0x030009ee ldrb r0, [r0] - b _08004D9A + b @08004D9A .align 2, 0 .pool -_08004D98: +@08004D98: movs r0, 0 -_08004D9A: +@08004D9A: pop {r1} bx r1 thumb_func_end sub_8004D58 thumb_func_start CopyGlyphToWindow -@ int CopyGlyphToWindow(struct TextBox *x) -CopyGlyphToWindow: @ 8004DA0 +; int CopyGlyphToWindow(struct TextBox *x) +CopyGlyphToWindow: ; 8004DA0 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -1080,9 +1080,9 @@ CopyGlyphToWindow: @ 8004DA0 adds r0, 0x80 ldrb r0, [r0] cmp r4, r0 - ble _08004DD2 + ble @08004DD2 adds r4, r0, 0 -_08004DD2: +@08004DD2: ldrb r0, [r1, 0x4] lsls r0, 3 ldrb r3, [r3, 0x9] @@ -1091,9 +1091,9 @@ _08004DD2: adds r1, 0x81 ldrb r1, [r1] cmp r0, r1 - ble _08004DE6 + ble @08004DE6 adds r0, r1, 0 -_08004DE6: +@08004DE6: str r6, [sp] mov r8, r3 adds r3, r5, 0 @@ -1102,11 +1102,11 @@ _08004DE6: lsls r1, r7, 5 str r1, [sp, 0x4] cmp r4, 0x8 - ble _08004DFA - b _08004F94 -_08004DFA: + ble @08004DFA + b @08004F94 +@08004DFA: cmp r0, 0x8 - bgt _08004E84 + bgt @08004E84 mov r1, r8 str r3, [sp, 0x8] adds r2, r6, 0 @@ -1116,9 +1116,9 @@ _08004DFA: str r0, [sp, 0xC] str r6, [sp, 0x10] cmp r1, r0 - bcc _08004E14 - b _080052AA -_08004E14: + bcc @08004E14 + b @080052AA +@08004E14: ldr r3, [sp, 0x8] ldm r3!, {r5} str r3, [sp, 0x8] @@ -1126,7 +1126,7 @@ _08004E14: adds r0, r1, 0x1 mov r10, r0 cmp r4, r8 - bcs _08004E72 + bcs @08004E72 movs r2, 0x7 mov r12, r2 lsrs r0, r1, 3 @@ -1137,12 +1137,12 @@ _08004E14: mov r3, r12 ands r1, r3 lsls r6, r1, 2 -_08004E38: +@08004E38: adds r3, r5, 0 movs r0, 0xF ands r3, r0 cmp r3, 0 - beq _08004E6A + beq @08004E6A lsrs r2, r4, 3 lsls r2, 5 add r2, r9 @@ -1163,20 +1163,20 @@ _08004E38: ands r0, r1 orrs r3, r0 strb r3, [r2] -_08004E6A: +@08004E6A: lsrs r5, 4 adds r4, 0x1 cmp r4, r8 - bcc _08004E38 -_08004E72: + bcc @08004E38 +@08004E72: mov r1, r10 ldr r2, [sp, 0xC] cmp r1, r2 - bcc _08004E14 - b _080052AA + bcc @08004E14 + b @080052AA .align 2, 0 .pool -_08004E84: +@08004E84: mov r1, r8 str r3, [sp, 0x14] ldr r3, [sp] @@ -1194,8 +1194,8 @@ _08004E84: subs r0, 0x8 str r0, [sp, 0x80] cmp r1, r3 - bcs _08004F0E -_08004EA8: + bcs @08004F0E +@08004EA8: ldr r0, [sp, 0x14] ldm r0!, {r5} str r0, [sp, 0x14] @@ -1203,7 +1203,7 @@ _08004EA8: adds r2, r1, 0x1 mov r8, r2 cmp r4, r12 - bcs _08004F06 + bcs @08004F06 movs r3, 0x7 mov r10, r3 lsrs r0, r1, 3 @@ -1214,12 +1214,12 @@ _08004EA8: mov r0, r10 ands r1, r0 lsls r6, r1, 2 -_08004ECC: +@08004ECC: adds r3, r5, 0 movs r1, 0xF ands r3, r1 cmp r3, 0 - beq _08004EFE + beq @08004EFE lsrs r2, r4, 3 lsls r2, 5 add r2, r9 @@ -1240,17 +1240,17 @@ _08004ECC: ands r0, r1 orrs r3, r0 strb r3, [r2] -_08004EFE: +@08004EFE: lsrs r5, 4 adds r4, 0x1 cmp r4, r12 - bcc _08004ECC -_08004F06: + bcc @08004ECC +@08004F06: mov r1, r8 ldr r2, [sp, 0x18] cmp r1, r2 - bcc _08004EA8 -_08004F0E: + bcc @08004EA8 +@08004F0E: ldr r1, [sp, 0x88] ldr r3, =0x03002fd0 str r3, [sp, 0x20] @@ -1262,9 +1262,9 @@ _08004F0E: ldr r3, [sp] str r3, [sp, 0x28] cmp r1, r2 - bcc _08004F28 - b _080052AA -_08004F28: + bcc @08004F28 + b @080052AA +@08004F28: ldr r0, [sp, 0x20] ldm r0!, {r5} str r0, [sp, 0x20] @@ -1272,7 +1272,7 @@ _08004F28: adds r2, r1, 0x1 mov r10, r2 cmp r4, r8 - bcs _08004F86 + bcs @08004F86 movs r3, 0x7 mov r12, r3 lsrs r0, r1, 3 @@ -1283,12 +1283,12 @@ _08004F28: mov r0, r12 ands r1, r0 lsls r6, r1, 2 -_08004F4C: +@08004F4C: adds r3, r5, 0 movs r1, 0xF ands r3, r1 cmp r3, 0 - beq _08004F7E + beq @08004F7E lsrs r2, r4, 3 lsls r2, 5 add r2, r9 @@ -1309,24 +1309,24 @@ _08004F4C: ands r0, r1 orrs r3, r0 strb r3, [r2] -_08004F7E: +@08004F7E: lsrs r5, 4 adds r4, 0x1 cmp r4, r8 - bcc _08004F4C -_08004F86: + bcc @08004F4C +@08004F86: mov r1, r10 ldr r2, [sp, 0x24] cmp r1, r2 - bcc _08004F28 - b _080052AA + bcc @08004F28 + b @080052AA .align 2, 0 .pool -_08004F94: +@08004F94: cmp r0, 0x8 - ble _08004F9A - b _080050A4 -_08004F9A: + ble @08004F9A + b @080050A4 +@08004F9A: mov r1, r8 str r3, [sp, 0x2C] ldr r3, [sp] @@ -1342,8 +1342,8 @@ _08004F9A: subs r4, 0x8 str r4, [sp, 0x7C] cmp r8, r2 - bcs _0800501C -_08004FBA: + bcs @0800501C +@08004FBA: ldr r0, [sp, 0x2C] ldm r0!, {r5} str r0, [sp, 0x2C] @@ -1351,7 +1351,7 @@ _08004FBA: adds r2, r1, 0x1 mov r10, r2 cmp r4, r12 - bcs _08005014 + bcs @08005014 lsrs r0, r1, 3 ldr r2, [sp, 0x4] adds r3, r0, 0 @@ -1360,12 +1360,12 @@ _08004FBA: movs r3, 0x7 ands r1, r3 lsls r6, r1, 2 -_08004FDA: +@08004FDA: adds r3, r5, 0 movs r0, 0xF ands r3, r0 cmp r3, 0 - beq _0800500C + beq @0800500C lsrs r2, r4, 3 lsls r2, 5 add r2, r9 @@ -1386,17 +1386,17 @@ _08004FDA: ands r0, r1 orrs r3, r0 strb r3, [r2] -_0800500C: +@0800500C: lsrs r5, 4 adds r4, 0x1 cmp r4, r12 - bcc _08004FDA -_08005014: + bcc @08004FDA +@08005014: mov r1, r10 ldr r2, [sp, 0x30] cmp r1, r2 - bcc _08004FBA -_0800501C: + bcc @08004FBA +@0800501C: mov r1, r8 ldr r3, =0x03002fb0 str r3, [sp, 0x38] @@ -1409,9 +1409,9 @@ _0800501C: ldr r0, [sp, 0x84] str r0, [sp, 0x40] cmp r1, r3 - bcc _08005038 - b _080052AA -_08005038: + bcc @08005038 + b @080052AA +@08005038: ldr r2, [sp, 0x38] ldm r2!, {r5} str r2, [sp, 0x38] @@ -1419,7 +1419,7 @@ _08005038: adds r3, r1, 0x1 mov r10, r3 cmp r4, r8 - bcs _08005096 + bcs @08005096 movs r0, 0x7 mov r12, r0 lsrs r0, r1, 3 @@ -1430,12 +1430,12 @@ _08005038: mov r0, r12 ands r1, r0 lsls r6, r1, 2 -_0800505C: +@0800505C: adds r3, r5, 0 movs r1, 0xF ands r3, r1 cmp r3, 0 - beq _0800508E + beq @0800508E lsrs r2, r4, 3 lsls r2, 5 add r2, r9 @@ -1456,20 +1456,20 @@ _0800505C: ands r0, r1 orrs r3, r0 strb r3, [r2] -_0800508E: +@0800508E: lsrs r5, 4 adds r4, 0x1 cmp r4, r8 - bcc _0800505C -_08005096: + bcc @0800505C +@08005096: mov r1, r10 ldr r2, [sp, 0x3C] cmp r1, r2 - bcc _08005038 - b _080052AA + bcc @08005038 + b @080052AA .align 2, 0 .pool -_080050A4: +@080050A4: mov r1, r8 str r5, [sp, 0x44] ldr r3, [sp] @@ -1488,8 +1488,8 @@ _080050A4: subs r4, 0x8 str r4, [sp, 0x7C] cmp r8, r2 - bcs _0800512C -_080050CA: + bcs @0800512C +@080050CA: ldr r2, [sp, 0x44] ldm r2!, {r5} str r2, [sp, 0x44] @@ -1497,7 +1497,7 @@ _080050CA: adds r3, r1, 0x1 mov r10, r3 cmp r4, r12 - bcs _08005124 + bcs @08005124 lsrs r0, r1, 3 ldr r3, [sp, 0x4] adds r2, r0, 0 @@ -1506,12 +1506,12 @@ _080050CA: movs r0, 0x7 ands r1, r0 lsls r6, r1, 2 -_080050EA: +@080050EA: adds r3, r5, 0 movs r1, 0xF ands r3, r1 cmp r3, 0 - beq _0800511C + beq @0800511C lsrs r2, r4, 3 lsls r2, 5 add r2, r9 @@ -1532,17 +1532,17 @@ _080050EA: ands r0, r1 orrs r3, r0 strb r3, [r2] -_0800511C: +@0800511C: lsrs r5, 4 adds r4, 0x1 cmp r4, r12 - bcc _080050EA -_08005124: + bcc @080050EA +@08005124: mov r1, r10 ldr r2, [sp, 0x48] cmp r1, r2 - bcc _080050CA -_0800512C: + bcc @080050CA +@0800512C: mov r1, r8 ldr r3, =0x03002fb0 str r3, [sp, 0x50] @@ -1555,8 +1555,8 @@ _0800512C: ldr r0, [sp, 0x84] str r0, [sp, 0x58] cmp r1, r3 - bcs _080051AC -_08005146: + bcs @080051AC +@08005146: ldr r2, [sp, 0x50] ldm r2!, {r5} str r2, [sp, 0x50] @@ -1564,7 +1564,7 @@ _08005146: adds r3, r1, 0x1 mov r10, r3 cmp r4, r8 - bcs _080051A4 + bcs @080051A4 movs r0, 0x7 mov r12, r0 lsrs r0, r1, 3 @@ -1575,12 +1575,12 @@ _08005146: mov r0, r12 ands r1, r0 lsls r6, r1, 2 -_0800516A: +@0800516A: adds r3, r5, 0 movs r1, 0xF ands r3, r1 cmp r3, 0 - beq _0800519C + beq @0800519C lsrs r2, r4, 3 lsls r2, 5 add r2, r9 @@ -1601,17 +1601,17 @@ _0800516A: ands r0, r1 orrs r3, r0 strb r3, [r2] -_0800519C: +@0800519C: lsrs r5, 4 adds r4, 0x1 cmp r4, r8 - bcc _0800516A -_080051A4: + bcc @0800516A +@080051A4: mov r1, r10 ldr r2, [sp, 0x54] cmp r1, r2 - bcc _08005146 -_080051AC: + bcc @08005146 +@080051AC: ldr r1, [sp, 0x88] ldr r3, =0x03002fd0 str r3, [sp, 0x5C] @@ -1623,8 +1623,8 @@ _080051AC: ldr r3, [sp] str r3, [sp, 0x64] cmp r1, r2 - bcs _0800522A -_080051C4: + bcs @0800522A +@080051C4: ldr r0, [sp, 0x5C] ldm r0!, {r5} str r0, [sp, 0x5C] @@ -1632,7 +1632,7 @@ _080051C4: adds r2, r1, 0x1 mov r10, r2 cmp r4, r8 - bcs _08005222 + bcs @08005222 movs r3, 0x7 mov r12, r3 lsrs r0, r1, 3 @@ -1643,12 +1643,12 @@ _080051C4: mov r0, r12 ands r1, r0 lsls r6, r1, 2 -_080051E8: +@080051E8: adds r3, r5, 0 movs r1, 0xF ands r3, r1 cmp r3, 0 - beq _0800521A + beq @0800521A lsrs r2, r4, 3 lsls r2, 5 add r2, r9 @@ -1669,17 +1669,17 @@ _080051E8: ands r0, r1 orrs r3, r0 strb r3, [r2] -_0800521A: +@0800521A: lsrs r5, 4 adds r4, 0x1 cmp r4, r8 - bcc _080051E8 -_08005222: + bcc @080051E8 +@08005222: mov r1, r10 ldr r2, [sp, 0x60] cmp r1, r2 - bcc _080051C4 -_0800522A: + bcc @080051C4 +@0800522A: ldr r4, [sp, 0x84] ldr r1, [sp, 0x88] ldr r3, =0x03002ff0 @@ -1692,8 +1692,8 @@ _0800522A: str r2, [sp, 0x6C] str r4, [sp, 0x70] cmp r1, r2 - bcs _080052AA -_08005244: + bcs @080052AA +@08005244: ldr r3, [sp, 0x68] ldm r3!, {r5} str r3, [sp, 0x68] @@ -1701,7 +1701,7 @@ _08005244: adds r0, r1, 0x1 mov r10, r0 cmp r4, r8 - bcs _080052A2 + bcs @080052A2 movs r2, 0x7 mov r12, r2 lsrs r0, r1, 3 @@ -1712,12 +1712,12 @@ _08005244: mov r3, r12 ands r1, r3 lsls r6, r1, 2 -_08005268: +@08005268: adds r3, r5, 0 movs r0, 0xF ands r3, r0 cmp r3, 0 - beq _0800529A + beq @0800529A lsrs r2, r4, 3 lsls r2, 5 add r2, r9 @@ -1738,17 +1738,17 @@ _08005268: ands r0, r1 orrs r3, r0 strb r3, [r2] -_0800529A: +@0800529A: lsrs r5, 4 adds r4, 0x1 cmp r4, r8 - bcc _08005268 -_080052A2: + bcc @08005268 +@080052A2: mov r1, r10 ldr r2, [sp, 0x6C] cmp r1, r2 - bcc _08005244 -_080052AA: + bcc @08005244 +@080052AA: add sp, 0x8C pop {r3-r5} mov r8, r3 @@ -1762,8 +1762,8 @@ _080052AA: thumb_func_end CopyGlyphToWindow thumb_func_start Text_ClearHorizontalSpan -@ void Text_ClearHorizontalSpan(TextBox *textBox, int width) -Text_ClearHorizontalSpan: @ 80052C8 +; void Text_ClearHorizontalSpan(TextBox *textBox, int width) +Text_ClearHorizontalSpan: ; 80052C8 push {r4-r6,lr} sub sp, 0x10 adds r4, r0, 0 @@ -1771,7 +1771,7 @@ Text_ClearHorizontalSpan: @ 80052C8 ldr r0, =0x030009ea ldrh r5, [r0] cmp r5, 0 - beq _0800531E + beq @0800531E ldrb r1, [r4, 0x4] lsls r0, r1, 1 adds r0, r1 @@ -1806,7 +1806,7 @@ Text_ClearHorizontalSpan: @ 80052C8 str r0, [sp, 0x4] add r0, sp, 0x8 bl PixelBlock_FillRect4Bpp -_0800531E: +@0800531E: add sp, 0x10 pop {r4-r6} pop {r0} @@ -1816,8 +1816,8 @@ _0800531E: thumb_func_end Text_ClearHorizontalSpan thumb_func_start Font0Func -@ int Font0Func(struct TextBox *x) -Font0Func: @ 800533C +; int Font0Func(struct TextBox *x) +Font0Func: ; 800533C push {lr} adds r2, r0, 0 adds r3, r2, 0 @@ -1826,7 +1826,7 @@ Font0Func: @ 800533C movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08005360 + bne @08005360 ldrb r1, [r2, 0x14] movs r0, 0x10 negs r0, r0 @@ -1836,7 +1836,7 @@ Font0Func: @ 800533C movs r1, 0x80 orrs r0, r1 strb r0, [r3, 0x1] -_08005360: +@08005360: adds r0, r2, 0 bl font_render_b lsls r0, 16 @@ -1846,8 +1846,8 @@ _08005360: thumb_func_end Font0Func thumb_func_start Font1Func -@ int Font1Func(struct TextBox *x) -Font1Func: @ 8005370 +; int Font1Func(struct TextBox *x) +Font1Func: ; 8005370 push {lr} adds r2, r0, 0 adds r3, r2, 0 @@ -1856,7 +1856,7 @@ Font1Func: @ 8005370 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08005398 + bne @08005398 ldrb r1, [r2, 0x14] movs r0, 0x10 negs r0, r0 @@ -1868,7 +1868,7 @@ Font1Func: @ 8005370 movs r1, 0x80 orrs r0, r1 strb r0, [r3, 0x1] -_08005398: +@08005398: adds r0, r2, 0 bl font_render_b lsls r0, 16 @@ -1878,8 +1878,8 @@ _08005398: thumb_func_end Font1Func thumb_func_start Font2Func -@ int Font2Func(struct TextBox *x) -Font2Func: @ 80053A8 +; int Font2Func(struct TextBox *x) +Font2Func: ; 80053A8 push {lr} adds r2, r0, 0 adds r3, r2, 0 @@ -1888,7 +1888,7 @@ Font2Func: @ 80053A8 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080053D0 + bne @080053D0 ldrb r1, [r2, 0x14] movs r0, 0x10 negs r0, r0 @@ -1900,7 +1900,7 @@ Font2Func: @ 80053A8 movs r1, 0x80 orrs r0, r1 strb r0, [r3, 0x1] -_080053D0: +@080053D0: adds r0, r2, 0 bl font_render_b lsls r0, 16 @@ -1910,8 +1910,8 @@ _080053D0: thumb_func_end Font2Func thumb_func_start Font3Func -@ int Font3Func(struct TextBox *x) -Font3Func: @ 80053E0 +; int Font3Func(struct TextBox *x) +Font3Func: ; 80053E0 push {lr} adds r2, r0, 0 adds r3, r2, 0 @@ -1920,7 +1920,7 @@ Font3Func: @ 80053E0 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08005408 + bne @08005408 ldrb r1, [r2, 0x14] movs r0, 0x10 negs r0, r0 @@ -1932,7 +1932,7 @@ Font3Func: @ 80053E0 movs r1, 0x80 orrs r0, r1 strb r0, [r3, 0x1] -_08005408: +@08005408: adds r0, r2, 0 bl font_render_b lsls r0, 16 @@ -1942,8 +1942,8 @@ _08005408: thumb_func_end Font3Func thumb_func_start Font4Func -@ int Font4Func(struct TextBox *x) -Font4Func: @ 8005418 +; int Font4Func(struct TextBox *x) +Font4Func: ; 8005418 push {lr} adds r2, r0, 0 adds r3, r2, 0 @@ -1952,7 +1952,7 @@ Font4Func: @ 8005418 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08005440 + bne @08005440 ldrb r1, [r2, 0x14] movs r0, 0x10 negs r0, r0 @@ -1964,7 +1964,7 @@ Font4Func: @ 8005418 movs r1, 0x80 orrs r0, r1 strb r0, [r3, 0x1] -_08005440: +@08005440: adds r0, r2, 0 bl font_render_b lsls r0, 16 @@ -1974,8 +1974,8 @@ _08005440: thumb_func_end Font4Func thumb_func_start Font5Func -@ int Font5Func(struct TextBox *x) -Font5Func: @ 8005450 +; int Font5Func(struct TextBox *x) +Font5Func: ; 8005450 push {lr} adds r2, r0, 0 adds r3, r2, 0 @@ -1984,7 +1984,7 @@ Font5Func: @ 8005450 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _08005478 + bne @08005478 ldrb r1, [r2, 0x14] movs r0, 0x10 negs r0, r0 @@ -1996,7 +1996,7 @@ Font5Func: @ 8005450 movs r1, 0x80 orrs r0, r1 strb r0, [r3, 0x1] -_08005478: +@08005478: adds r0, r2, 0 bl font_render_b lsls r0, 16 @@ -2006,8 +2006,8 @@ _08005478: thumb_func_end Font5Func thumb_func_start Font7Func -@ int Font7Func(struct TextBox *x) -Font7Func: @ 8005488 +; int Font7Func(struct TextBox *x) +Font7Func: ; 8005488 push {lr} adds r2, r0, 0 adds r3, r2, 0 @@ -2016,7 +2016,7 @@ Font7Func: @ 8005488 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080054B0 + bne @080054B0 ldrb r1, [r2, 0x14] movs r0, 0x10 negs r0, r0 @@ -2028,7 +2028,7 @@ Font7Func: @ 8005488 movs r1, 0x80 orrs r0, r1 strb r0, [r3, 0x1] -_080054B0: +@080054B0: adds r0, r2, 0 bl font_render_b lsls r0, 16 @@ -2038,8 +2038,8 @@ _080054B0: thumb_func_end Font7Func thumb_func_start Font8Func -@ int Font8Func(struct TextBox *x) -Font8Func: @ 80054C0 +; int Font8Func(struct TextBox *x) +Font8Func: ; 80054C0 push {lr} adds r2, r0, 0 adds r3, r2, 0 @@ -2048,7 +2048,7 @@ Font8Func: @ 80054C0 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne _080054E8 + bne @080054E8 ldrb r1, [r2, 0x14] movs r0, 0x10 negs r0, r0 @@ -2060,7 +2060,7 @@ Font8Func: @ 80054C0 movs r1, 0x80 orrs r0, r1 strb r0, [r3, 0x1] -_080054E8: +@080054E8: adds r0, r2, 0 bl font_render_b lsls r0, 16 @@ -2070,8 +2070,8 @@ _080054E8: thumb_func_end Font8Func thumb_func_start sub_80054F8 -@ void sub_80054F8(TextBox *textBox) -sub_80054F8: @ 80054F8 +; void sub_80054F8(TextBox *textBox) +sub_80054F8: ; 80054F8 push {lr} adds r2, r0, 0 adds r2, 0x14 @@ -2080,13 +2080,13 @@ sub_80054F8: @ 80054F8 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08005514 + beq @08005514 movs r0, 0 strb r0, [r2, 0x2] - b _08005524 + b @08005524 .align 2, 0 .pool -_08005514: +@08005514: ldrb r0, [r2, 0x1] movs r1, 0x61 negs r1, r1 @@ -2095,14 +2095,14 @@ _08005514: negs r0, r0 ands r1, r0 strb r1, [r2, 0x1] -_08005524: +@08005524: pop {r0} bx r0 thumb_func_end sub_80054F8 thumb_func_start remo_draw_bouncing_down_arrow -@ int remo_draw_bouncing_down_arrow(TextBox *x) -remo_draw_bouncing_down_arrow: @ 8005528 +; int remo_draw_bouncing_down_arrow(TextBox *x) +remo_draw_bouncing_down_arrow: ; 8005528 push {r4-r7,lr} sub sp, 0x18 adds r5, r0, 0 @@ -2113,12 +2113,12 @@ remo_draw_bouncing_down_arrow: @ 8005528 movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne _080055EE + bne @080055EE ldrb r2, [r6, 0x1] movs r0, 0x1F ands r0, r2 cmp r0, 0 - beq _08005560 + beq @08005560 ldr r0, [r5, 0x14] lsls r0, 19 lsrs r0, 27 @@ -2127,10 +2127,10 @@ remo_draw_bouncing_down_arrow: @ 8005528 ands r0, r1 movs r1, 0x20 negs r1, r1 - b _080055E8 + b @080055E8 .align 2, 0 .pool -_08005560: +@08005560: ldrb r0, [r5, 0x4] ldrb r2, [r5, 0xD] lsls r2, 28 @@ -2148,17 +2148,17 @@ _08005560: lsls r0, 30 lsrs r0, 31 cmp r0, 0 - beq _0800558A + beq @0800558A cmp r0, 0x1 - beq _08005594 -_0800558A: + beq @08005594 +@0800558A: ldr r7, =gDownArrowTiles - b _08005596 + b @08005596 .align 2, 0 .pool -_08005594: +@08005594: ldr r7, =gDarkDownArrowTiles -_08005596: +@08005596: ldrb r0, [r5, 0x4] ldr r2, =gDownArrowYCoords ldr r1, [r6] @@ -2198,11 +2198,11 @@ _08005596: lsls r0, 5 movs r2, 0x61 negs r2, r2 -_080055E8: +@080055E8: ands r1, r2 orrs r1, r0 strb r1, [r6, 0x1] -_080055EE: +@080055EE: add sp, 0x18 pop {r4-r7} pop {r0} @@ -2212,8 +2212,8 @@ _080055EE: thumb_func_end remo_draw_bouncing_down_arrow thumb_func_start remo_clear_down_arrow -@ int remo_clear_down_arrow(TextBox *x) -remo_clear_down_arrow: @ 8005600 +; int remo_clear_down_arrow(TextBox *x) +remo_clear_down_arrow: ; 8005600 push {r4,r5,lr} sub sp, 0x8 adds r5, r0, 0 @@ -2240,27 +2240,27 @@ remo_clear_down_arrow: @ 8005600 thumb_func_end remo_clear_down_arrow thumb_func_start remo_is_it_time_to_continue_autopilot -@ int remo_is_it_time_to_continue_autopilot(struct TextBox *x) -remo_is_it_time_to_continue_autopilot: @ 8005634 +; int remo_is_it_time_to_continue_autopilot(struct TextBox *x) +remo_is_it_time_to_continue_autopilot: ; 8005634 push {lr} adds r1, r0, 0 adds r1, 0x14 ldrb r0, [r1, 0x2] cmp r0, 0x31 - beq _08005648 + beq @08005648 adds r0, 0x1 strb r0, [r1, 0x2] movs r0, 0 - b _0800564A -_08005648: + b @0800564A +@08005648: movs r0, 0x1 -_0800564A: +@0800564A: pop {r1} bx r1 thumb_func_end remo_is_it_time_to_continue_autopilot thumb_func_start remo_is_it_time_to_continue_plus_down_arrow -remo_is_it_time_to_continue_plus_down_arrow: @ 8005650 +remo_is_it_time_to_continue_plus_down_arrow: ; 8005650 push {r4,lr} adds r2, r0, 0 movs r4, 0 @@ -2269,15 +2269,15 @@ remo_is_it_time_to_continue_plus_down_arrow: @ 8005650 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08005674 + beq @08005674 adds r0, r2, 0 bl remo_is_it_time_to_continue_autopilot lsls r0, 24 lsrs r4, r0, 24 - b _0800568E + b @0800568E .align 2, 0 .pool -_08005674: +@08005674: adds r0, r2, 0 bl remo_draw_bouncing_down_arrow ldr r0, =0x030022c0 @@ -2285,11 +2285,11 @@ _08005674: movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _0800568E + beq @0800568E movs r4, 0x1 movs r0, 0x5 bl audio_play -_0800568E: +@0800568E: adds r0, r4, 0 pop {r4} pop {r1} @@ -2299,7 +2299,7 @@ _0800568E: thumb_func_end remo_is_it_time_to_continue_plus_down_arrow thumb_func_start remo_is_it_time_to_continue -remo_is_it_time_to_continue: @ 800569C +remo_is_it_time_to_continue: ; 800569C push {r4,lr} adds r2, r0, 0 movs r4, 0 @@ -2308,25 +2308,25 @@ remo_is_it_time_to_continue: @ 800569C movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _080056C0 + beq @080056C0 adds r0, r2, 0 bl remo_is_it_time_to_continue_autopilot lsls r0, 24 lsrs r4, r0, 24 - b _080056D4 + b @080056D4 .align 2, 0 .pool -_080056C0: +@080056C0: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _080056D4 + beq @080056D4 movs r4, 0x1 movs r0, 0x5 bl audio_play -_080056D4: +@080056D4: adds r0, r4, 0 pop {r4} pop {r1} @@ -2336,7 +2336,7 @@ _080056D4: thumb_func_end remo_is_it_time_to_continue thumb_func_start draw_bouncing_down_arrow_2 -draw_bouncing_down_arrow_2: @ 80056E0 +draw_bouncing_down_arrow_2: ; 80056E0 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2362,11 +2362,11 @@ draw_bouncing_down_arrow_2: @ 80056E0 mov r1, r9 ldrb r0, [r1] cmp r0, 0 - beq _0800571A + beq @0800571A subs r0, 0x1 strb r0, [r1] - b _0800579A -_0800571A: + b @0800579A +@0800571A: lsls r1, r3, 4 orrs r1, r3 lsls r1, 24 @@ -2380,23 +2380,23 @@ _0800571A: adds r3, r7, 0 bl Window_FillPixelRect cmp r4, 0 - bne _0800579A + bne @0800579A ldr r0, =0x03003014 ldr r0, [r0] lsls r0, 30 lsrs r0, 31 cmp r0, 0 - beq _08005748 + beq @08005748 cmp r0, 0x1 - beq _08005754 -_08005748: + beq @08005754 +@08005748: ldr r6, =gDownArrowTiles - b _08005756 + b @08005756 .align 2, 0 .pool -_08005754: +@08005754: ldr r6, =gDarkDownArrowTiles -_08005756: +@08005756: ldr r2, =gDownArrowYCoords mov r0, r10 ldrb r1, [r0] @@ -2429,7 +2429,7 @@ _08005756: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] -_0800579A: +@0800579A: add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -2443,54 +2443,54 @@ _0800579A: thumb_func_end draw_bouncing_down_arrow_2 thumb_func_start font_render_b -@ int font_render_b(struct TextBox *x) -font_render_b: @ 80057B4 +; int font_render_b(struct TextBox *x) +font_render_b: ; 80057B4 push {r4-r6,lr} adds r6, r0, 0 adds r4, r6, 0 adds r4, 0x14 ldrb r0, [r6, 0x1C] cmp r0, 0x6 - bls _080057C4 - b _08005D6C -_080057C4: + bls @080057C4 + b @08005D6C +@080057C4: lsls r0, 2 - ldr r1, =_080057D4 + ldr r1, =@080057D4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080057D4: - .4byte _080057F0 - .4byte _08005C78 - .4byte _08005C8C - .4byte _08005CB8 - .4byte _08005CF0 - .4byte _08005D48 - .4byte _08005D5A -_080057F0: +@080057D4: + .4byte @080057F0 + .4byte @08005C78 + .4byte @08005C8C + .4byte @08005CB8 + .4byte @08005CF0 + .4byte @08005D48 + .4byte @08005D5A +@080057F0: ldr r2, =0x030022c0 ldrh r1, [r2, 0x2C] movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq _0800580A + beq @0800580A ldrb r1, [r4] movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq _0800580A + beq @0800580A movs r0, 0 strb r0, [r6, 0x1E] -_0800580A: +@0800580A: ldrb r1, [r6, 0x1E] cmp r1, 0 - beq _0800584C + beq @0800584C ldrb r0, [r6, 0x1D] cmp r0, 0 - beq _0800584C + beq @0800584C subs r0, r1, 0x1 strb r0, [r6, 0x1E] ldr r0, =0x03003014 @@ -2498,46 +2498,46 @@ _0800580A: movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne _08005828 - b _08005B56 -_08005828: + bne @08005828 + b @08005B56 +@08005828: ldrh r1, [r2, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne _08005834 - b _08005B56 -_08005834: + bne @08005834 + b @08005B56 +@08005834: ldrb r0, [r4] movs r1, 0x10 orrs r0, r1 strb r0, [r4] movs r0, 0 strb r0, [r6, 0x1E] - b _08005B56 + b @08005B56 .align 2, 0 .pool -_0800584C: +@0800584C: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 - bne _08005874 + bne @08005874 ldr r0, =0x03003014 ldrb r1, [r0] movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq _08005874 + beq @08005874 movs r0, 0x3 - b _08005876 + b @08005876 .align 2, 0 .pool -_08005874: +@08005874: ldrb r0, [r6, 0x1D] -_08005876: +@08005876: strb r0, [r6, 0x1E] ldr r0, [r6] ldrb r3, [r0] @@ -2546,27 +2546,27 @@ _08005876: adds r0, r3, 0 subs r0, 0xF8 cmp r0, 0x7 - bls _0800588A - b _08005B90 -_0800588A: + bls @0800588A + b @08005B90 +@0800588A: lsls r0, 2 - ldr r1, =_08005898 + ldr r1, =@08005898 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08005898: - .4byte _08005B6C - .4byte _08005B5A - .4byte _08005B4C - .4byte _08005B48 - .4byte _080058E0 - .4byte _080058DC - .4byte _080058B8 - .4byte _08005D6C -_080058B8: +@08005898: + .4byte @08005B6C + .4byte @08005B5A + .4byte @08005B4C + .4byte @08005B48 + .4byte @080058E0 + .4byte @080058DC + .4byte @080058B8 + .4byte @08005D6C +@080058B8: ldrb r0, [r6, 0x6] strb r0, [r6, 0x8] ldrb r1, [r6, 0x5] @@ -2581,56 +2581,56 @@ _080058B8: adds r1, r0 ldrb r0, [r6, 0x9] adds r0, r1 - b _08005ABA + b @08005ABA .align 2, 0 .pool -_080058DC: +@080058DC: ldr r0, [r6] - b _08005B30 -_080058E0: + b @08005B30 +@080058E0: ldr r0, [r6] ldrb r3, [r0] adds r0, 0x1 str r0, [r6] subs r0, r3, 0x1 cmp r0, 0x17 - bls _080058F0 - b _08005B90 -_080058F0: + bls @080058F0 + b @08005B90 +@080058F0: lsls r0, 2 - ldr r1, =_08005900 + ldr r1, =@08005900 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08005900: - .4byte _08005960 - .4byte _08005982 - .4byte _080059A6 - .4byte _080059C0 - .4byte _08005A0E - .4byte _08005A12 - .4byte _08005A0A - .4byte _08005A2A - .4byte _08005A3A - .4byte _08005A58 - .4byte _08005A5C - .4byte _08005B5A - .4byte _08005A90 - .4byte _08005A98 - .4byte _08005AA4 - .4byte _08005A76 - .4byte _08005AD8 - .4byte _08005AF2 - .4byte _08005B02 - .4byte _08005B26 - .4byte _08005B36 - .4byte _08005B3E - .4byte _08005ABE - .4byte _08005ACC -_08005960: +@08005900: + .4byte @08005960 + .4byte @08005982 + .4byte @080059A6 + .4byte @080059C0 + .4byte @08005A0E + .4byte @08005A12 + .4byte @08005A0A + .4byte @08005A2A + .4byte @08005A3A + .4byte @08005A58 + .4byte @08005A5C + .4byte @08005B5A + .4byte @08005A90 + .4byte @08005A98 + .4byte @08005AA4 + .4byte @08005A76 + .4byte @08005AD8 + .4byte @08005AF2 + .4byte @08005B02 + .4byte @08005B26 + .4byte @08005B36 + .4byte @08005B3E + .4byte @08005ABE + .4byte @08005ACC +@08005960: ldr r2, [r6] ldrb r1, [r2] lsls r1, 4 @@ -2647,8 +2647,8 @@ _08005960: lsls r1, r2, 28 lsrs r1, 28 lsrs r2, 4 - b _08005A06 -_08005982: + b @08005A06 +@08005982: ldr r1, [r6] ldrb r2, [r1] movs r0, 0xF @@ -2666,8 +2666,8 @@ _08005982: lsls r1, r2, 28 lsrs r1, 28 lsrs r2, 4 - b _08005A06 -_080059A6: + b @08005A06 +@080059A6: ldr r1, [r6] ldrb r0, [r1] lsls r0, 4 @@ -2680,8 +2680,8 @@ _080059A6: str r1, [r6] ldrb r0, [r6, 0xC] lsrs r0, 4 - b _080059FE -_080059C0: + b @080059FE +@080059C0: ldr r3, [r6] ldrb r1, [r3] lsls r1, 4 @@ -2713,20 +2713,20 @@ _080059C0: str r4, [r6] lsls r0, 24 lsrs r0, 28 -_080059FE: +@080059FE: lsls r1, r2, 28 lsrs r1, 28 lsls r2, 24 lsrs r2, 28 -_08005A06: +@08005A06: bl GenerateFontHalfRowLut -_08005A0A: +@08005A0A: movs r0, 0x2 - b _08005D6E -_08005A0E: + b @08005D6E +@08005A0E: ldr r0, [r6] - b _08005B30 -_08005A12: + b @08005B30 +@08005A12: ldr r0, [r6] ldrb r0, [r0] movs r1, 0xF @@ -2738,8 +2738,8 @@ _08005A12: orrs r0, r1 strb r0, [r4] ldr r0, [r6] - b _08005B30 -_08005A2A: + b @08005B30 +@08005A2A: ldr r0, [r6] ldrb r1, [r0] strb r1, [r6, 0x1E] @@ -2747,8 +2747,8 @@ _08005A2A: str r0, [r6] movs r0, 0x6 strb r0, [r6, 0x1C] - b _08005A0A -_08005A3A: + b @08005A0A +@08005A3A: movs r0, 0x1 strb r0, [r6, 0x1C] ldr r0, =0x03003014 @@ -2756,18 +2756,18 @@ _08005A3A: movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne _08005A4C - b _08005B56 -_08005A4C: + bne @08005A4C + b @08005B56 +@08005A4C: movs r0, 0 strb r0, [r4, 0x2] - b _08005B56 + b @08005B56 .align 2, 0 .pool -_08005A58: +@08005A58: movs r0, 0x5 - b _08005D56 -_08005A5C: + b @08005D56 +@08005A5C: ldr r0, [r6] ldrb r3, [r0] adds r1, r0, 0x1 @@ -2779,8 +2779,8 @@ _08005A5C: str r1, [r6] adds r0, r3, 0 bl song_play_for_text - b _08005A0A -_08005A76: + b @08005A0A +@08005A76: ldr r0, [r6] ldrb r3, [r0] adds r1, r0, 0x1 @@ -2792,20 +2792,20 @@ _08005A76: str r1, [r6] adds r0, r3, 0 bl audio_play - b _08005A0A -_08005A90: + b @08005A0A +@08005A90: ldr r1, [r6] ldrb r0, [r1] ldrb r3, [r6, 0x6] - b _08005AF8 -_08005A98: + b @08005AF8 +@08005A98: ldr r1, [r6] ldrb r0, [r1] ldrb r2, [r6, 0x7] adds r0, r2 strb r0, [r6, 0x9] - b _08005AFC -_08005AA4: + b @08005AFC +@08005AA4: ldrb r0, [r6, 0x4] ldrb r2, [r6, 0xD] lsls r2, 28 @@ -2816,46 +2816,46 @@ _08005AA4: ldrb r0, [r6, 0x6] strb r0, [r6, 0x8] ldrb r0, [r6, 0x7] -_08005ABA: +@08005ABA: strb r0, [r6, 0x9] - b _08005A0A -_08005ABE: + b @08005A0A +@08005ABE: ldr r0, =0x03007420 bl MPlayStop_rev01 - b _08005A0A + b @08005A0A .align 2, 0 .pool -_08005ACC: +@08005ACC: ldr r0, =0x03007420 bl m4aMPlayContinue - b _08005A0A + b @08005A0A .align 2, 0 .pool -_08005AD8: +@08005AD8: ldr r0, [r6] ldrb r4, [r0] adds r0, 0x1 str r0, [r6] cmp r4, 0 - ble _08005A0A + ble @08005A0A adds r0, r6, 0 adds r1, r4, 0 bl Text_ClearHorizontalSpan ldrb r0, [r6, 0x8] adds r0, r4 - b _08005C6E -_08005AF2: + b @08005C6E +@08005AF2: ldr r1, [r6] ldrb r0, [r6, 0x6] ldrb r3, [r1] -_08005AF8: +@08005AF8: adds r0, r3 strb r0, [r6, 0x8] -_08005AFC: +@08005AFC: adds r1, 0x1 str r1, [r6] - b _08005A0A -_08005B02: + b @08005A0A +@08005B02: ldr r0, [r6] ldrb r2, [r0] ldrb r1, [r6, 0x6] @@ -2865,50 +2865,50 @@ _08005B02: ldrb r0, [r6, 0x8] subs r4, r2, r0 cmp r4, 0 - bgt _08005B18 - b _08005A0A -_08005B18: + bgt @08005B18 + b @08005A0A +@08005B18: adds r0, r6, 0 adds r1, r4, 0 bl Text_ClearHorizontalSpan ldrb r0, [r6, 0x8] adds r0, r4 - b _08005C6E -_08005B26: + b @08005C6E +@08005B26: ldr r0, [r6] ldrb r2, [r0] adds r1, r6, 0 adds r1, 0x20 strb r2, [r1] -_08005B30: +@08005B30: adds r0, 0x1 str r0, [r6] - b _08005A0A -_08005B36: + b @08005A0A +@08005B36: adds r1, r6, 0 adds r1, 0x21 movs r0, 0x1 - b _08005B44 -_08005B3E: + b @08005B44 +@08005B3E: adds r1, r6, 0 adds r1, 0x21 movs r0, 0 -_08005B44: +@08005B44: strb r0, [r1] - b _08005A0A -_08005B48: + b @08005A0A +@08005B48: movs r0, 0x2 - b _08005B4E -_08005B4C: + b @08005B4E +@08005B4C: movs r0, 0x3 -_08005B4E: +@08005B4E: strb r0, [r6, 0x1C] adds r0, r6, 0 bl sub_80054F8 -_08005B56: +@08005B56: movs r0, 0x3 - b _08005D6E -_08005B5A: + b @08005D6E +@08005B5A: ldr r0, [r6] ldrb r3, [r0] movs r2, 0x80 @@ -2917,8 +2917,8 @@ _08005B5A: orrs r3, r1 adds r0, 0x1 str r0, [r6] - b _08005B90 -_08005B6C: + b @08005B90 +@08005B6C: ldr r0, [r6] ldrb r3, [r0] adds r0, 0x1 @@ -2933,75 +2933,75 @@ _08005B6C: strb r0, [r1] ldrb r3, [r6, 0xA] adds r0, r3 - b _08005C6A + b @08005C6A .align 2, 0 .pool -_08005B90: +@08005B90: ldr r0, [r4] lsls r0, 28 lsrs r0, 28 cmp r0, 0x8 - bhi _08005C10 + bhi @08005C10 lsls r0, 2 - ldr r1, =_08005BA8 + ldr r1, =@08005BA8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08005BA8: - .4byte _08005BCC - .4byte _08005BDA - .4byte _08005BE8 - .4byte _08005BE8 - .4byte _08005BE8 - .4byte _08005BE8 - .4byte _08005C10 - .4byte _08005BF6 - .4byte _08005C04 -_08005BCC: +@08005BA8: + .4byte @08005BCC + .4byte @08005BDA + .4byte @08005BE8 + .4byte @08005BE8 + .4byte @08005BE8 + .4byte @08005BE8 + .4byte @08005C10 + .4byte @08005BF6 + .4byte @08005C04 +@08005BCC: adds r0, r6, 0 adds r0, 0x21 ldrb r1, [r0] adds r0, r3, 0 bl DecompressGlyphFont0 - b _08005C10 -_08005BDA: + b @08005C10 +@08005BDA: adds r0, r6, 0 adds r0, 0x21 ldrb r1, [r0] adds r0, r3, 0 bl DecompressGlyphFont1 - b _08005C10 -_08005BE8: + b @08005C10 +@08005BE8: adds r0, r6, 0 adds r0, 0x21 ldrb r1, [r0] adds r0, r3, 0 bl DecompressGlyphFont2 - b _08005C10 -_08005BF6: + b @08005C10 +@08005BF6: adds r0, r6, 0 adds r0, 0x21 ldrb r1, [r0] adds r0, r3, 0 bl DecompressGlyphFont7 - b _08005C10 -_08005C04: + b @08005C10 +@08005C04: adds r0, r6, 0 adds r0, 0x21 ldrb r1, [r0] adds r0, r3, 0 bl DecompressGlyphFont8 -_08005C10: +@08005C10: adds r0, r6, 0 bl CopyGlyphToWindow adds r2, r6, 0 adds r2, 0x20 ldrb r0, [r2] cmp r0, 0 - beq _08005C48 + beq @08005C48 ldr r1, =0x03002f90 adds r1, 0x80 ldrb r0, [r1] @@ -3012,64 +3012,64 @@ _08005C10: ldrb r0, [r1] subs r4, r2, r0 cmp r4, 0 - ble _08005C70 + ble @08005C70 adds r0, r6, 0 adds r1, r4, 0 bl Text_ClearHorizontalSpan ldrb r0, [r6, 0x8] adds r0, r4 - b _08005C6E + b @08005C6E .align 2, 0 .pool -_08005C48: +@08005C48: adds r0, r6, 0 adds r0, 0x21 ldrb r0, [r0] cmp r0, 0 - beq _08005C64 + beq @08005C64 ldr r0, =0x03002f90 adds r0, 0x80 ldrb r1, [r6, 0xA] ldrb r0, [r0] adds r1, r0 ldrb r0, [r6, 0x8] - b _08005C6C + b @08005C6C .align 2, 0 .pool -_08005C64: +@08005C64: ldr r0, =0x03002f90 adds r0, 0x80 ldrb r0, [r0] -_08005C6A: +@08005C6A: ldrb r1, [r6, 0x8] -_08005C6C: +@08005C6C: adds r0, r1 -_08005C6E: +@08005C6E: strb r0, [r6, 0x8] -_08005C70: +@08005C70: movs r0, 0 - b _08005D6E + b @08005D6E .align 2, 0 .pool -_08005C78: +@08005C78: adds r0, r6, 0 bl remo_is_it_time_to_continue lsls r0, 16 cmp r0, 0 - bne _08005C86 - b _08005B56 -_08005C86: + bne @08005C86 + b @08005B56 +@08005C86: movs r0, 0 strb r0, [r6, 0x1C] - b _08005B56 -_08005C8C: + b @08005B56 +@08005C8C: adds r0, r6, 0 bl remo_is_it_time_to_continue_plus_down_arrow lsls r0, 16 cmp r0, 0 - bne _08005C9A - b _08005B56 -_08005C9A: + bne @08005C9A + b @08005B56 +@08005C9A: ldrb r0, [r6, 0x4] ldrb r2, [r6, 0xD] lsls r2, 28 @@ -3083,15 +3083,15 @@ _08005C9A: ldrb r0, [r6, 0x7] strb r0, [r6, 0x9] strb r1, [r6, 0x1C] - b _08005B56 -_08005CB8: + b @08005B56 +@08005CB8: adds r0, r6, 0 bl remo_is_it_time_to_continue_plus_down_arrow lsls r0, 16 cmp r0, 0 - bne _08005CC6 - b _08005B56 -_08005CC6: + bne @08005CC6 + b @08005B56 +@08005CC6: adds r0, r6, 0 bl remo_clear_down_arrow ldrb r1, [r6, 0x5] @@ -3109,20 +3109,20 @@ _08005CC6: strb r0, [r6, 0x8] movs r0, 0x4 strb r0, [r6, 0x1C] - b _08005B56 + b @08005B56 .align 2, 0 .pool -_08005CF0: +@08005CF0: ldrb r0, [r6, 0x1F] cmp r0, 0 - beq _08005D44 + beq @08005D44 bl sub_8197964 ldr r1, =gWindowVerticalScrollSpeeds adds r0, r1 ldrb r4, [r0] ldrb r2, [r6, 0x1F] cmp r2, r4 - bge _08005D20 + bge @08005D20 ldrb r0, [r6, 0x4] ldrb r1, [r6, 0xD] lsls r1, 28 @@ -3132,10 +3132,10 @@ _08005CF0: movs r1, 0 bl Window_ScrollVertically movs r0, 0 - b _08005D38 + b @08005D38 .align 2, 0 .pool -_08005D20: +@08005D20: ldrb r0, [r6, 0x4] ldrb r1, [r6, 0xD] lsls r1, 28 @@ -3147,46 +3147,46 @@ _08005D20: bl Window_ScrollVertically ldrb r0, [r6, 0x1F] subs r0, r4 -_08005D38: +@08005D38: strb r0, [r6, 0x1F] ldrb r0, [r6, 0x4] movs r1, 0x2 bl Window_CopyToVram - b _08005B56 -_08005D44: + b @08005B56 +@08005D44: strb r0, [r6, 0x1C] - b _08005B56 -_08005D48: + b @08005B56 +@08005D48: bl mplay_has_finished_maybe lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq _08005D56 - b _08005B56 -_08005D56: + beq @08005D56 + b @08005B56 +@08005D56: strb r0, [r6, 0x1C] - b _08005B56 -_08005D5A: + b @08005B56 +@08005D5A: ldrb r0, [r6, 0x1E] adds r1, r0, 0 cmp r1, 0 - beq _08005D68 + beq @08005D68 subs r0, 0x1 strb r0, [r6, 0x1E] - b _08005B56 -_08005D68: + b @08005B56 +@08005D68: strb r1, [r6, 0x1C] - b _08005B56 -_08005D6C: + b @08005B56 +@08005D6C: movs r0, 0x1 -_08005D6E: +@08005D6E: pop {r4-r6} pop {r1} bx r1 thumb_func_end font_render_b thumb_func_start sub_8005D74 -sub_8005D74: @ 8005D74 +sub_8005D74: ; 8005D74 push {r4-r7,lr} mov r7, r8 push {r7} @@ -3199,42 +3199,42 @@ sub_8005D74: @ 8005D74 movs r2, 0 mov r1, sp adds r1, 0x7 -_08005D8C: +@08005D8C: strb r2, [r1] subs r1, 0x1 cmp r1, sp - bge _08005D8C + bge @08005D8C movs r5, 0 movs r6, 0 adds r4, r0, 0 movs r2, 0 -_08005D9C: +@08005D9C: adds r0, r4, r2 ldrb r3, [r0] adds r2, 0x1 adds r0, r3, 0 subs r0, 0xF7 cmp r0, 0x8 - bhi _08005E6A + bhi @08005E6A lsls r0, 2 - ldr r1, =_08005DB8 + ldr r1, =@08005DB8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08005DB8: - .4byte _08005E64 - .4byte _08005E68 - .4byte _08005E68 - .4byte _08005E70 - .4byte _08005E70 - .4byte _08005DEC - .4byte _08005E64 - .4byte _08005DDC - .4byte _08005DDC -_08005DDC: +@08005DB8: + .4byte @08005E64 + .4byte @08005E68 + .4byte @08005E68 + .4byte @08005E70 + .4byte @08005E70 + .4byte @08005DEC + .4byte @08005E64 + .4byte @08005DDC + .4byte @08005DDC +@08005DDC: mov r1, sp adds r0, r1, r6 strb r5, [r0] @@ -3242,74 +3242,74 @@ _08005DDC: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 - b _08005E70 -_08005DEC: + b @08005E70 +@08005DEC: adds r0, r4, r2 ldrb r0, [r0] adds r2, 0x1 subs r0, 0x1 cmp r0, 0x15 - bhi _08005E70 + bhi @08005E70 lsls r0, 2 - ldr r1, =_08005E08 + ldr r1, =@08005E08 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08005E08: - .4byte _08005E64 - .4byte _08005E64 - .4byte _08005E64 - .4byte _08005E60 - .4byte _08005E64 - .4byte _08005E64 - .4byte _08005E70 - .4byte _08005E64 - .4byte _08005E70 - .4byte _08005E70 - .4byte _08005E62 - .4byte _08005E64 - .4byte _08005E64 - .4byte _08005E64 - .4byte _08005E70 - .4byte _08005E62 - .4byte _08005E64 - .4byte _08005E64 - .4byte _08005E64 - .4byte _08005E64 - .4byte _08005E70 - .4byte _08005E70 -_08005E60: +@08005E08: + .4byte @08005E64 + .4byte @08005E64 + .4byte @08005E64 + .4byte @08005E60 + .4byte @08005E64 + .4byte @08005E64 + .4byte @08005E70 + .4byte @08005E64 + .4byte @08005E70 + .4byte @08005E70 + .4byte @08005E62 + .4byte @08005E64 + .4byte @08005E64 + .4byte @08005E64 + .4byte @08005E70 + .4byte @08005E62 + .4byte @08005E64 + .4byte @08005E64 + .4byte @08005E64 + .4byte @08005E64 + .4byte @08005E70 + .4byte @08005E70 +@08005E60: adds r2, 0x1 -_08005E62: +@08005E62: adds r2, 0x1 -_08005E64: +@08005E64: adds r2, 0x1 - b _08005E70 -_08005E68: + b @08005E70 +@08005E68: adds r2, 0x1 -_08005E6A: +@08005E6A: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -_08005E70: +@08005E70: cmp r3, 0xFF - bne _08005D9C + bne @08005D9C movs r5, 0 movs r2, 0 -_08005E78: +@08005E78: mov r1, sp adds r0, r1, r2 ldrb r1, [r0] cmp r5, r1 - bcs _08005E84 + bcs @08005E84 ldrb r5, [r0] -_08005E84: +@08005E84: adds r2, 0x1 cmp r2, 0x7 - ble _08005E78 + ble @08005E78 adds r0, r7, 0 movs r1, 0 bl fbox_get_field @@ -3326,7 +3326,7 @@ _08005E84: thumb_func_end sub_8005D74 thumb_func_start GetFontWidthFunc -GetFontWidthFunc: @ 8005EA8 +GetFontWidthFunc: ; 8005EA8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -3334,30 +3334,30 @@ GetFontWidthFunc: @ 8005EA8 ldr r0, =gGlyphWidthFuncs adds r2, r0, 0x4 adds r1, r0, 0 -_08005EB6: +@08005EB6: ldr r0, [r1] cmp r4, r0 - bne _08005EC4 + bne @08005EC4 ldr r0, [r2] - b _08005ED0 + b @08005ED0 .align 2, 0 .pool -_08005EC4: +@08005EC4: adds r2, 0x8 adds r1, 0x8 adds r3, 0x1 cmp r3, 0x8 - bls _08005EB6 + bls @08005EB6 movs r0, 0 -_08005ED0: +@08005ED0: pop {r4} pop {r1} bx r1 thumb_func_end GetFontWidthFunc thumb_func_start font_get_width_of_string -@ unsigned int font_get_width_of_string(u8 a1, u8 *s, u16 a3) -font_get_width_of_string: @ 8005ED8 +; unsigned int font_get_width_of_string(u8 a1, u8 *s, u16 a3) +font_get_width_of_string: ; 8005ED8 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -3377,231 +3377,231 @@ font_get_width_of_string: @ 8005ED8 bl GetFontWidthFunc mov r8, r0 cmp r0, 0 - bne _08005F06 -_08005F02: + bne @08005F06 +@08005F02: movs r0, 0 - b _0800612E -_08005F06: + b @0800612E +@08005F06: lsls r0, r5, 16 asrs r2, r0, 16 movs r1, 0x1 negs r1, r1 str r0, [sp, 0x4] cmp r2, r1 - bne _08005F24 + bne @08005F24 adds r0, r6, 0 movs r1, 0x2 bl fbox_get_field lsls r0, 24 lsrs r0, 24 mov r10, r0 - b _08005F26 -_08005F24: + b @08005F26 +@08005F24: mov r10, r2 -_08005F26: +@08005F26: movs r2, 0 str r2, [sp] movs r5, 0 movs r6, 0 - b _0800611E -_08005F30: + b @0800611E +@08005F30: ldrb r1, [r4] adds r0, r1, 0 subs r0, 0xF7 cmp r0, 0x7 - bls _08005F3C - b _080060F8 -_08005F3C: + bls @08005F3C + b @080060F8 +@08005F3C: lsls r0, 2 - ldr r1, =_08005F4C + ldr r1, =@08005F4C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08005F4C: - .4byte _08005FA2 - .4byte _080060BC - .4byte _080060BC - .4byte _0800611C - .4byte _0800611C - .4byte _08005FEA - .4byte _08005F78 - .4byte _08005F6C -_08005F6C: +@08005F4C: + .4byte @08005FA2 + .4byte @080060BC + .4byte @080060BC + .4byte @0800611C + .4byte @0800611C + .4byte @08005FEA + .4byte @08005F78 + .4byte @08005F6C +@08005F6C: ldr r0, [sp] cmp r5, r0 - bls _08005F74 + bls @08005F74 str r5, [sp] -_08005F74: +@08005F74: movs r5, 0 - b _0800611C -_08005F78: + b @0800611C +@08005F78: adds r4, 0x1 ldrb r0, [r4] cmp r0, 0x3 - beq _08005F98 + beq @08005F98 cmp r0, 0x3 - bgt _08005F8A + bgt @08005F8A cmp r0, 0x2 - beq _08005F90 - b _08005F02 -_08005F8A: + beq @08005F90 + b @08005F02 +@08005F8A: cmp r0, 0x4 - beq _08005FA0 - b _08005F02 -_08005F90: + beq @08005FA0 + b @08005F02 +@08005F90: ldr r6, =0x02021cc4 - b _08005FA2 + b @08005FA2 .align 2, 0 .pool -_08005F98: +@08005F98: ldr r6, =0x02021dc4 - b _08005FA2 + b @08005FA2 .align 2, 0 .pool -_08005FA0: +@08005FA0: ldr r6, =0x02021ec4 -_08005FA2: +@08005FA2: cmp r6, 0 - bne _08005FE0 + bne @08005FE0 adds r4, 0x1 ldrb r0, [r4] bl sub_81AFC74 adds r6, r0, 0 - b _08005FE0 + b @08005FE0 .align 2, 0 .pool -_08005FB8: +@08005FB8: ldrb r0, [r6] adds r6, 0x1 mov r1, r9 bl _call_via_r8 cmp r7, 0 - ble _08005FD0 + ble @08005FD0 cmp r0, r7 - bge _08005FCC + bge @08005FCC adds r0, r7, 0 -_08005FCC: +@08005FCC: adds r5, r0 - b _08005FE0 -_08005FD0: + b @08005FE0 +@08005FD0: adds r5, r0 mov r2, r9 cmp r2, 0 - beq _08005FE0 + beq @08005FE0 ldrb r0, [r4, 0x1] cmp r0, 0xFF - beq _08005FE0 + beq @08005FE0 add r5, r10 -_08005FE0: +@08005FE0: ldrb r0, [r6] cmp r0, 0xFF - bne _08005FB8 + bne @08005FB8 movs r6, 0 - b _0800611C -_08005FEA: + b @0800611C +@08005FEA: adds r4, 0x1 ldrb r0, [r4] subs r0, 0x1 cmp r0, 0x15 - bls _08005FF6 - b _0800611C -_08005FF6: + bls @08005FF6 + b @0800611C +@08005FF6: lsls r0, 2 - ldr r1, =_08006004 + ldr r1, =@08006004 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08006004: - .4byte _08006060 - .4byte _08006060 - .4byte _08006060 - .4byte _0800605C - .4byte _08006060 - .4byte _08006064 - .4byte _0800611C - .4byte _08006060 - .4byte _0800611C - .4byte _0800611C - .4byte _0800605E - .4byte _08006060 - .4byte _08006060 - .4byte _08006060 - .4byte _0800611C - .4byte _0800605E - .4byte _08006090 - .4byte _08006098 - .4byte _0800609E - .4byte _080060AA - .4byte _080060B0 - .4byte _080060B6 -_0800605C: +@08006004: + .4byte @08006060 + .4byte @08006060 + .4byte @08006060 + .4byte @0800605C + .4byte @08006060 + .4byte @08006064 + .4byte @0800611C + .4byte @08006060 + .4byte @0800611C + .4byte @0800611C + .4byte @0800605E + .4byte @08006060 + .4byte @08006060 + .4byte @08006060 + .4byte @0800611C + .4byte @0800605E + .4byte @08006090 + .4byte @08006098 + .4byte @0800609E + .4byte @080060AA + .4byte @080060B0 + .4byte @080060B6 +@0800605C: adds r4, 0x1 -_0800605E: +@0800605E: adds r4, 0x1 -_08006060: +@08006060: adds r4, 0x1 - b _0800611C -_08006064: + b @0800611C +@08006064: adds r4, 0x1 ldrb r0, [r4] bl GetFontWidthFunc mov r8, r0 cmp r0, 0 - bne _08006074 - b _08005F02 -_08006074: + bne @08006074 + b @08005F02 +@08006074: ldr r0, [sp, 0x4] asrs r1, r0, 16 movs r0, 0x1 negs r0, r0 cmp r1, r0 - bne _0800611C + bne @0800611C ldrb r0, [r4] movs r1, 0x2 bl fbox_get_field lsls r0, 24 lsrs r0, 24 mov r10, r0 - b _0800611C -_08006090: + b @0800611C +@08006090: adds r4, 0x1 ldrb r0, [r4] -_08006094: +@08006094: adds r5, r0 - b _0800611C -_08006098: + b @0800611C +@08006098: adds r4, 0x1 ldrb r5, [r4] - b _0800611C -_0800609E: + b @0800611C +@0800609E: adds r4, 0x1 ldrb r0, [r4] cmp r0, r5 - bls _0800611C + bls @0800611C adds r5, r0, 0 - b _0800611C -_080060AA: + b @0800611C +@080060AA: adds r4, 0x1 ldrb r7, [r4] - b _0800611C -_080060B0: + b @0800611C +@080060B0: movs r2, 0x1 mov r9, r2 - b _0800611C -_080060B6: + b @0800611C +@080060B6: movs r0, 0 mov r9, r0 - b _0800611C -_080060BC: + b @0800611C +@080060BC: ldrb r0, [r4] cmp r0, 0xF9 - bne _080060D6 + bne @080060D6 adds r4, 0x1 ldrb r0, [r4] movs r2, 0x80 @@ -3610,59 +3610,59 @@ _080060BC: orrs r0, r1 mov r1, r9 bl _call_via_r8 - b _080060E2 -_080060D6: + b @080060E2 +@080060D6: adds r4, 0x1 ldrb r0, [r4] bl Font_ReturnsValueFromLUT lsls r0, 24 lsrs r0, 24 -_080060E2: +@080060E2: cmp r7, 0 - ble _080060EE + ble @080060EE cmp r0, r7 - bge _08006094 + bge @08006094 adds r0, r7, 0 - b _08006094 -_080060EE: + b @08006094 +@080060EE: adds r5, r0 mov r0, r9 cmp r0, 0 - beq _0800611C - b _08006114 -_080060F8: + beq @0800611C + b @08006114 +@080060F8: adds r0, r1, 0 mov r1, r9 bl _call_via_r8 cmp r7, 0 - ble _0800610C + ble @0800610C cmp r0, r7 - bge _08006094 + bge @08006094 adds r0, r7, 0 - b _08006094 -_0800610C: + b @08006094 +@0800610C: adds r5, r0 mov r2, r9 cmp r2, 0 - beq _0800611C -_08006114: + beq @0800611C +@08006114: ldrb r0, [r4, 0x1] cmp r0, 0xFF - beq _0800611C + beq @0800611C add r5, r10 -_0800611C: +@0800611C: adds r4, 0x1 -_0800611E: +@0800611E: ldrb r0, [r4] cmp r0, 0xFF - beq _08006126 - b _08005F30 -_08006126: + beq @08006126 + b @08005F30 +@08006126: ldr r0, [sp] cmp r5, r0 - bls _0800612E + bls @0800612E adds r0, r5, 0 -_0800612E: +@0800612E: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -3674,8 +3674,8 @@ _0800612E: thumb_func_end font_get_width_of_string thumb_func_start font_render_some -@ int font_render_some(char *pixels, u8 font, int a3) -font_render_some: @ 8006140 +; int font_render_some(char *pixels, u8 font, int a3) +font_render_some: ; 8006140 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -3707,71 +3707,71 @@ font_render_some: @ 8006140 bl GenerateFontHalfRowLut adds r7, r6, 0 movs r6, 0 -_08006182: +@08006182: adds r0, r7, r6 ldrb r0, [r0] mov r8, r0 adds r6, 0x1 subs r0, 0xF7 cmp r0, 0x8 - bhi _0800627E + bhi @0800627E lsls r0, 2 - ldr r1, =_080061A0 + ldr r1, =@080061A0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080061A0: - .4byte _08006276 - .4byte _08006276 - .4byte _08006276 - .4byte _080062B8 - .4byte _080062B8 - .4byte _080061C4 - .4byte _08006276 - .4byte _080062B8 - .4byte _080062B8 -_080061C4: +@080061A0: + .4byte @08006276 + .4byte @08006276 + .4byte @08006276 + .4byte @080062B8 + .4byte @080062B8 + .4byte @080061C4 + .4byte @08006276 + .4byte @080062B8 + .4byte @080062B8 +@080061C4: adds r0, r7, r6 ldrb r0, [r0] adds r6, 0x1 subs r0, 0x1 cmp r0, 0x15 - bhi _080062B8 + bhi @080062B8 lsls r0, 2 - ldr r1, =_080061E0 + ldr r1, =@080061E0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080061E0: - .4byte _0800624A - .4byte _08006254 - .4byte _0800625C - .4byte _08006238 - .4byte _08006276 - .4byte _08006270 - .4byte _080062B8 - .4byte _08006276 - .4byte _080062B8 - .4byte _080062B8 - .4byte _0800627A - .4byte _08006276 - .4byte _08006276 - .4byte _08006276 - .4byte _080062B8 - .4byte _0800627A - .4byte _08006276 - .4byte _08006276 - .4byte _08006276 - .4byte _08006276 - .4byte _080062B8 - .4byte _080062B8 -_08006238: +@080061E0: + .4byte @0800624A + .4byte @08006254 + .4byte @0800625C + .4byte @08006238 + .4byte @08006276 + .4byte @08006270 + .4byte @080062B8 + .4byte @08006276 + .4byte @080062B8 + .4byte @080062B8 + .4byte @0800627A + .4byte @08006276 + .4byte @08006276 + .4byte @08006276 + .4byte @080062B8 + .4byte @0800627A + .4byte @08006276 + .4byte @08006276 + .4byte @08006276 + .4byte @08006276 + .4byte @080062B8 + .4byte @080062B8 +@08006238: adds r0, r7, r6 ldrb r0, [r0] str r0, [sp, 0x8] @@ -3780,54 +3780,54 @@ _08006238: ldrb r0, [r0] str r0, [sp, 0xC] adds r6, 0x1 - b _0800625C -_0800624A: + b @0800625C +@0800624A: adds r0, r7, r6 ldrb r0, [r0] str r0, [sp, 0x8] adds r6, 0x1 - b _08006266 -_08006254: + b @08006266 +@08006254: adds r0, r7, r6 ldrb r0, [r0] str r0, [sp, 0xC] - b _08006262 -_0800625C: + b @08006262 +@0800625C: adds r0, r7, r6 ldrb r0, [r0] mov r10, r0 -_08006262: +@08006262: adds r6, 0x1 ldr r0, [sp, 0x8] -_08006266: +@08006266: ldr r1, [sp, 0xC] mov r2, r10 bl GenerateFontHalfRowLut - b _080062B8 -_08006270: + b @080062B8 +@08006270: adds r0, r7, r6 ldrb r0, [r0] str r0, [sp, 0x4] -_08006276: +@08006276: adds r6, 0x1 - b _080062B8 -_0800627A: + b @080062B8 +@0800627A: adds r6, 0x1 - b _08006276 -_0800627E: + b @08006276 +@0800627E: ldr r0, [sp, 0x4] cmp r0, 0x1 - beq _08006290 + beq @08006290 cmp r0, 0x9 - bne _08006290 + bne @08006290 mov r0, r8 bl DecompressGlyphFont9 - b _08006298 -_08006290: + b @08006298 +@08006290: mov r0, r8 movs r1, 0x1 bl DecompressGlyphFont1 -_08006298: +@08006298: ldr r4, =0x03002f90 ldr r5, =0x04000008 adds r0, r4, 0 @@ -3842,12 +3842,12 @@ _08006298: bl CpuSet movs r0, 0x40 add r9, r0 -_080062B8: +@080062B8: mov r0, r8 cmp r0, 0xFF - beq _080062C0 - b _08006182 -_080062C0: + beq @080062C0 + b @08006182 +@080062C0: mov r0, sp mov r1, sp adds r1, 0x1 @@ -3868,7 +3868,7 @@ _080062C0: thumb_func_end font_render_some thumb_func_start TextBox_DrawKeypadIcon -TextBox_DrawKeypadIcon: @ 80062E8 +TextBox_DrawKeypadIcon: ; 80062E8 push {r4,r5,lr} sub sp, 0x18 lsls r0, 24 @@ -3908,7 +3908,7 @@ TextBox_DrawKeypadIcon: @ 80062E8 thumb_func_end TextBox_DrawKeypadIcon thumb_func_start sub_8006338 -sub_8006338: @ 8006338 +sub_8006338: ; 8006338 lsls r0, 24 ldr r1, =gKeypadIcons lsrs r0, 22 @@ -3920,7 +3920,7 @@ sub_8006338: @ 8006338 thumb_func_end sub_8006338 thumb_func_start Font_ReturnsValueFromLUT -Font_ReturnsValueFromLUT: @ 8006348 +Font_ReturnsValueFromLUT: ; 8006348 lsls r0, 24 ldr r1, =gKeypadIcons lsrs r0, 22 @@ -3932,7 +3932,7 @@ Font_ReturnsValueFromLUT: @ 8006348 thumb_func_end Font_ReturnsValueFromLUT thumb_func_start sub_8006358 -sub_8006358: @ 8006358 +sub_8006358: ; 8006358 lsls r0, 24 ldr r1, =gKeypadIcons lsrs r0, 22 @@ -3944,7 +3944,7 @@ sub_8006358: @ 8006358 thumb_func_end sub_8006358 thumb_func_start fboxes_set_default_ptr -fboxes_set_default_ptr: @ 8006368 +fboxes_set_default_ptr: ; 8006368 push {lr} ldr r0, =gFontInfos bl fboxes_set_ptr @@ -3955,7 +3955,7 @@ fboxes_set_default_ptr: @ 8006368 thumb_func_end fboxes_set_default_ptr thumb_func_start fbox_get_field -fbox_get_field: @ 8006378 +fbox_get_field: ; 8006378 push {lr} lsls r0, 24 lsrs r2, r0, 24 @@ -3963,107 +3963,107 @@ fbox_get_field: @ 8006378 lsrs r1, 24 movs r0, 0 cmp r1, 0x7 - bhi _08006456 + bhi @08006456 lsls r0, r1, 2 - ldr r1, =_08006398 + ldr r1, =@08006398 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08006398: - .4byte _080063B8 - .4byte _080063CC - .4byte _080063E0 - .4byte _080063F4 - .4byte _08006408 - .4byte _0800641C - .4byte _08006430 - .4byte _08006448 -_080063B8: +@08006398: + .4byte @080063B8 + .4byte @080063CC + .4byte @080063E0 + .4byte @080063F4 + .4byte @08006408 + .4byte @0800641C + .4byte @08006430 + .4byte @08006448 +@080063B8: ldr r1, =gFontInfos lsls r0, r2, 1 adds r0, r2 lsls r0, 2 adds r0, r1 ldrb r0, [r0, 0x4] - b _08006456 + b @08006456 .align 2, 0 .pool -_080063CC: +@080063CC: ldr r1, =gFontInfos lsls r0, r2, 1 adds r0, r2 lsls r0, 2 adds r0, r1 ldrb r0, [r0, 0x5] - b _08006456 + b @08006456 .align 2, 0 .pool -_080063E0: +@080063E0: ldr r1, =gFontInfos lsls r0, r2, 1 adds r0, r2 lsls r0, 2 adds r0, r1 ldrb r0, [r0, 0x6] - b _08006456 + b @08006456 .align 2, 0 .pool -_080063F4: +@080063F4: ldr r1, =gFontInfos lsls r0, r2, 1 adds r0, r2 lsls r0, 2 adds r0, r1 ldrb r0, [r0, 0x7] - b _08006456 + b @08006456 .align 2, 0 .pool -_08006408: +@08006408: ldr r0, =gFontInfos lsls r1, r2, 1 adds r1, r2 lsls r1, 2 adds r1, r0 ldrb r0, [r1, 0x8] - b _0800643C + b @0800643C .align 2, 0 .pool -_0800641C: +@0800641C: ldr r0, =gFontInfos lsls r1, r2, 1 adds r1, r2 lsls r1, 2 adds r1, r0 ldrb r0, [r1, 0x8] - b _08006454 + b @08006454 .align 2, 0 .pool -_08006430: +@08006430: ldr r0, =gFontInfos lsls r1, r2, 1 adds r1, r2 lsls r1, 2 adds r1, r0 ldrb r0, [r1, 0x9] -_0800643C: +@0800643C: lsls r0, 28 lsrs r0, 28 - b _08006456 + b @08006456 .align 2, 0 .pool -_08006448: +@08006448: ldr r0, =gFontInfos lsls r1, r2, 1 adds r1, r2 lsls r1, 2 adds r1, r0 ldrb r0, [r1, 0x9] -_08006454: +@08006454: lsrs r0, 4 -_08006456: +@08006456: pop {r1} bx r1 .align 2, 0 @@ -4071,8 +4071,8 @@ _08006456: thumb_func_end fbox_get_field 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 @@ -4087,12 +4087,12 @@ GetMenuCursorDimensionByFont: @ 8006460 thumb_func_end GetMenuCursorDimensionByFont thumb_func_start DecompressGlyphFont0 -DecompressGlyphFont0: @ 8006478 +DecompressGlyphFont0: ; 8006478 push {r4,r5,lr} lsls r0, 16 lsrs r3, r0, 16 cmp r1, 0x1 - bne _080064C4 + bne @080064C4 lsrs r2, r0, 20 lsls r2, 9 movs r0, 0xF @@ -4118,10 +4118,10 @@ DecompressGlyphFont0: @ 8006478 adds r4, 0x81 movs r0, 0xC strb r0, [r4] - b _08006534 + b @08006534 .align 2, 0 .pool -_080064C4: +@080064C4: lsls r1, r3, 6 ldr r0, =gFont0LatinGlyphs adds r5, r1, r0 @@ -4133,7 +4133,7 @@ _080064C4: adds r0, 0x80 strb r1, [r0] cmp r1, 0x8 - bhi _08006500 + bhi @08006500 adds r0, r5, 0 adds r1, r4, 0 bl DecompressGlyphTile @@ -4142,10 +4142,10 @@ _080064C4: adds r1, r4, 0 adds r1, 0x40 bl DecompressGlyphTile - b _0800652C + b @0800652C .align 2, 0 .pool -_08006500: +@08006500: adds r0, r5, 0 adds r1, r4, 0 bl DecompressGlyphTile @@ -4164,12 +4164,12 @@ _08006500: adds r1, r4, 0 adds r1, 0x60 bl DecompressGlyphTile -_0800652C: +@0800652C: ldr r0, =0x03002f90 adds r0, 0x81 movs r1, 0xD strb r1, [r0] -_08006534: +@08006534: pop {r4,r5} pop {r0} bx r0 @@ -4178,32 +4178,32 @@ _08006534: thumb_func_end DecompressGlyphFont0 thumb_func_start GetGlyphWidthFont0 -GetGlyphWidthFont0: @ 8006540 +GetGlyphWidthFont0: ; 8006540 push {lr} lsls r0, 16 lsrs r2, r0, 16 cmp r1, 0x1 - beq _08006558 + beq @08006558 ldr r0, =gFont0LatinGlyphWidths adds r0, r2, r0 ldrb r0, [r0] - b _0800655A + b @0800655A .align 2, 0 .pool -_08006558: +@08006558: movs r0, 0x8 -_0800655A: +@0800655A: pop {r1} bx r1 thumb_func_end GetGlyphWidthFont0 thumb_func_start DecompressGlyphFont7 -DecompressGlyphFont7: @ 8006560 +DecompressGlyphFont7: ; 8006560 push {r4-r6,lr} lsls r0, 16 lsrs r3, r0, 16 cmp r1, 0x1 - bne _080065AC + bne @080065AC lsrs r2, r0, 20 lsls r2, 9 movs r5, 0xF @@ -4229,10 +4229,10 @@ DecompressGlyphFont7: @ 8006560 strb r0, [r1] adds r4, 0x81 strb r5, [r4] - b _0800661C + b @0800661C .align 2, 0 .pool -_080065AC: +@080065AC: lsls r1, r3, 6 ldr r0, =gFont7LatinGlyphs adds r6, r1, r0 @@ -4244,7 +4244,7 @@ _080065AC: adds r0, 0x80 strb r1, [r0] cmp r1, 0x8 - bhi _080065E8 + bhi @080065E8 adds r0, r6, 0 adds r1, r4, 0 bl DecompressGlyphTile @@ -4253,10 +4253,10 @@ _080065AC: adds r1, r4, 0 adds r1, 0x40 bl DecompressGlyphTile - b _08006614 + b @08006614 .align 2, 0 .pool -_080065E8: +@080065E8: adds r0, r6, 0 adds r1, r4, 0 bl DecompressGlyphTile @@ -4275,12 +4275,12 @@ _080065E8: adds r1, r4, 0 adds r1, 0x60 bl DecompressGlyphTile -_08006614: +@08006614: ldr r0, =0x03002f90 adds r0, 0x81 movs r1, 0xF strb r1, [r0] -_0800661C: +@0800661C: pop {r4-r6} pop {r0} bx r0 @@ -4289,33 +4289,33 @@ _0800661C: thumb_func_end DecompressGlyphFont7 thumb_func_start GetGlyphWidthFont7 -GetGlyphWidthFont7: @ 8006628 +GetGlyphWidthFont7: ; 8006628 push {lr} lsls r0, 16 lsrs r2, r0, 16 cmp r1, 0x1 - beq _08006640 + beq @08006640 ldr r0, =gFont7LatinGlyphWidths adds r0, r2, r0 ldrb r0, [r0] - b _08006642 + b @08006642 .align 2, 0 .pool -_08006640: +@08006640: movs r0, 0x8 -_08006642: +@08006642: pop {r1} bx r1 thumb_func_end GetGlyphWidthFont7 thumb_func_start DecompressGlyphFont8 -@ void DecompressGlyphFont8(u16 glyphIndex, bool japanese) -DecompressGlyphFont8: @ 8006648 +; void DecompressGlyphFont8(u16 glyphIndex, bool japanese) +DecompressGlyphFont8: ; 8006648 push {r4,r5,lr} lsls r0, 16 lsrs r3, r0, 16 cmp r1, 0x1 - bne _08006694 + bne @08006694 lsrs r2, r0, 20 lsls r2, 9 movs r0, 0xF @@ -4341,10 +4341,10 @@ DecompressGlyphFont8: @ 8006648 adds r4, 0x81 movs r0, 0xC strb r0, [r4] - b _08006704 + b @08006704 .align 2, 0 .pool -_08006694: +@08006694: lsls r1, r3, 6 ldr r0, =gFont8LatinGlyphs adds r5, r1, r0 @@ -4356,7 +4356,7 @@ _08006694: adds r0, 0x80 strb r1, [r0] cmp r1, 0x8 - bhi _080066D0 + bhi @080066D0 adds r0, r5, 0 adds r1, r4, 0 bl DecompressGlyphTile @@ -4365,10 +4365,10 @@ _08006694: adds r1, r4, 0 adds r1, 0x40 bl DecompressGlyphTile - b _080066FC + b @080066FC .align 2, 0 .pool -_080066D0: +@080066D0: adds r0, r5, 0 adds r1, r4, 0 bl DecompressGlyphTile @@ -4387,12 +4387,12 @@ _080066D0: adds r1, r4, 0 adds r1, 0x60 bl DecompressGlyphTile -_080066FC: +@080066FC: ldr r0, =0x03002f90 adds r0, 0x81 movs r1, 0xC strb r1, [r0] -_08006704: +@08006704: pop {r4,r5} pop {r0} bx r0 @@ -4401,32 +4401,32 @@ _08006704: thumb_func_end DecompressGlyphFont8 thumb_func_start GetGlyphWidthFont8 -GetGlyphWidthFont8: @ 8006710 +GetGlyphWidthFont8: ; 8006710 push {lr} lsls r0, 16 lsrs r2, r0, 16 cmp r1, 0x1 - beq _08006728 + beq @08006728 ldr r0, =gFont8LatinGlyphWidths adds r0, r2, r0 ldrb r0, [r0] - b _0800672A + b @0800672A .align 2, 0 .pool -_08006728: +@08006728: movs r0, 0x8 -_0800672A: +@0800672A: pop {r1} bx r1 thumb_func_end GetGlyphWidthFont8 thumb_func_start DecompressGlyphFont2 -DecompressGlyphFont2: @ 8006730 +DecompressGlyphFont2: ; 8006730 push {r4-r6,lr} lsls r0, 16 lsrs r6, r0, 16 cmp r1, 0x1 - bne _080067A0 + bne @080067A0 lsrs r2, r0, 19 lsls r2, 9 movs r0, 0x7 @@ -4466,10 +4466,10 @@ DecompressGlyphFont2: @ 8006730 adds r1, 0x81 movs r0, 0xE strb r0, [r1] - b _08006810 + b @08006810 .align 2, 0 .pool -_080067A0: +@080067A0: lsls r1, r6, 6 ldr r0, =gFont2LatinGlyphs adds r4, r1, r0 @@ -4481,7 +4481,7 @@ _080067A0: adds r0, 0x80 strb r1, [r0] cmp r1, 0x8 - bhi _080067DC + bhi @080067DC adds r0, r4, 0 adds r1, r5, 0 bl DecompressGlyphTile @@ -4490,10 +4490,10 @@ _080067A0: adds r1, r5, 0 adds r1, 0x40 bl DecompressGlyphTile - b _08006808 + b @08006808 .align 2, 0 .pool -_080067DC: +@080067DC: adds r0, r4, 0 adds r1, r5, 0 bl DecompressGlyphTile @@ -4512,12 +4512,12 @@ _080067DC: adds r1, r5, 0 adds r1, 0x60 bl DecompressGlyphTile -_08006808: +@08006808: ldr r0, =0x03002f90 adds r0, 0x81 movs r1, 0xE strb r1, [r0] -_08006810: +@08006810: pop {r4-r6} pop {r0} bx r0 @@ -4526,19 +4526,19 @@ _08006810: thumb_func_end DecompressGlyphFont2 thumb_func_start GetGlyphWidthFont2 -GetGlyphWidthFont2: @ 800681C +GetGlyphWidthFont2: ; 800681C push {lr} lsls r0, 16 lsrs r2, r0, 16 cmp r1, 0x1 - beq _08006830 + beq @08006830 ldr r0, =gFont2LatinGlyphWidths - b _08006832 + b @08006832 .align 2, 0 .pool -_08006830: +@08006830: ldr r0, =gFont2JapaneseGlyphWidths -_08006832: +@08006832: adds r0, r2, r0 ldrb r0, [r0] pop {r1} @@ -4548,13 +4548,13 @@ _08006832: thumb_func_end GetGlyphWidthFont2 thumb_func_start DecompressGlyphFont1 -@ void DecompressGlyphFont1(int a1, int japanese) -DecompressGlyphFont1: @ 8006840 +; void DecompressGlyphFont1(int a1, int japanese) +DecompressGlyphFont1: ; 8006840 push {r4-r6,lr} lsls r0, 16 lsrs r3, r0, 16 cmp r1, 0x1 - bne _0800688C + bne @0800688C lsrs r2, r0, 20 lsls r2, 9 movs r5, 0xF @@ -4580,10 +4580,10 @@ DecompressGlyphFont1: @ 8006840 strb r0, [r1] adds r4, 0x81 strb r5, [r4] - b _080068FC + b @080068FC .align 2, 0 .pool -_0800688C: +@0800688C: lsls r1, r3, 6 ldr r0, =gFont1LatinGlyphs adds r6, r1, r0 @@ -4595,7 +4595,7 @@ _0800688C: adds r0, 0x80 strb r1, [r0] cmp r1, 0x8 - bhi _080068C8 + bhi @080068C8 adds r0, r6, 0 adds r1, r4, 0 bl DecompressGlyphTile @@ -4604,10 +4604,10 @@ _0800688C: adds r1, r4, 0 adds r1, 0x40 bl DecompressGlyphTile - b _080068F4 + b @080068F4 .align 2, 0 .pool -_080068C8: +@080068C8: adds r0, r6, 0 adds r1, r4, 0 bl DecompressGlyphTile @@ -4626,12 +4626,12 @@ _080068C8: adds r1, r4, 0 adds r1, 0x60 bl DecompressGlyphTile -_080068F4: +@080068F4: ldr r0, =0x03002f90 adds r0, 0x81 movs r1, 0xF strb r1, [r0] -_080068FC: +@080068FC: pop {r4-r6} pop {r0} bx r0 @@ -4640,27 +4640,27 @@ _080068FC: thumb_func_end DecompressGlyphFont1 thumb_func_start GetGlyphWidthFont1 -GetGlyphWidthFont1: @ 8006908 +GetGlyphWidthFont1: ; 8006908 push {lr} lsls r0, 16 lsrs r2, r0, 16 cmp r1, 0x1 - beq _08006920 + beq @08006920 ldr r0, =gFont1LatinGlyphWidths adds r0, r2, r0 ldrb r0, [r0] - b _08006922 + b @08006922 .align 2, 0 .pool -_08006920: +@08006920: movs r0, 0x8 -_08006922: +@08006922: pop {r1} bx r1 thumb_func_end GetGlyphWidthFont1 thumb_func_start DecompressGlyphFont9 -DecompressGlyphFont9: @ 8006928 +DecompressGlyphFont9: ; 8006928 push {r4,r5,lr} lsls r0, 16 lsrs r4, r0, 20 diff --git a/asm/unknown_lib_1.s b/asm/unknown_lib_1.s index ae53b2a1b..6270dc9e7 100644 --- a/asm/unknown_lib_1.s +++ b/asm/unknown_lib_1.s @@ -1,5 +1,5 @@ thumb_func_start sub_82DED70 -sub_82DED70: @ 82DED70 +sub_82DED70: ; 82DED70 push {r4,lr} ldr r4, _082DEE78 eors r3, r1 @@ -15,7 +15,7 @@ _082DED7E: thumb_func_end sub_82DED70 thumb_func_start sub_82DED84 -sub_82DED84: @ 82DED84 +sub_82DED84: ; 82DED84 ldr r1, [r0, 0x28] cmp r1, 0 beq _082DEDAA @@ -155,7 +155,7 @@ _082DEE80: .4byte RomHeaderNintendoLogo thumb_func_end sub_82DED84 thumb_func_start sub_82DEE84 -sub_82DEE84: @ 82DEE84 +sub_82DEE84: ; 82DEE84 ldrb r1, [r0, 0x2] cmp r1, 0x2 bne _082DEE96 @@ -170,7 +170,7 @@ _082DEE96: thumb_func_end sub_82DEE84 thumb_func_start sub_82DEE98 -sub_82DEE98: @ 82DEE98 +sub_82DEE98: ; 82DEE98 ldr r3, _082DF038 ldrh r2, [r3, 0x8] movs r1, 0 @@ -212,7 +212,7 @@ _082DEEB0: thumb_func_end sub_82DEE98 non_word_aligned_thumb_func_start sub_82DEEE2 -sub_82DEEE2: @ 82DEEE2 +sub_82DEEE2: ; 82DEEE2 ldr r3, _082DF03C ldrh r1, [r3, 0x20] strh r1, [r3, 0x20] @@ -249,23 +249,23 @@ _082DEF06: ldr r1, _082DF048 str r1, [r0, 0x20] str r1, [r0, 0x24] - adr r2, .Lsub_82DEF24 + adr r2, .L082DEF24 b _082DEEFC thumb_func_end sub_82DEEE2 thumb_func_start sub_82DEF24 -.Lsub_82DEF24: -sub_82DEF24: @ 82DEF24 +.L082DEF24: +sub_82DEF24: ; 82DEF24 lsls r1, 31 bcc _082DEEF8 bmi _082DEF34 - adr r2, .Lsub_82DEF30 + adr r2, .L082DEF30 b _082DEEFC thumb_func_end sub_82DEF24 thumb_func_start sub_82DEF30 -.Lsub_82DEF30: -sub_82DEF30: @ 82DEF30 +.L082DEF30: +sub_82DEF30: ; 82DEF30 lsrs r1, 1 bcc _082DEEF8 _082DEF34: @@ -275,13 +275,13 @@ _082DEF34: bne _082DEEF8 ldrb r1, [r0, 0x3] strb r1, [r0, 0xB] - adr r2, .Lsub_82DEF44 + adr r2, .L082DEF44 b _082DEEFC thumb_func_end sub_82DEF30 thumb_func_start sub_82DEF44 -.Lsub_82DEF44: -sub_82DEF44: @ 82DEF44 +.L082DEF44: +sub_82DEF44: ; 82DEF44 lsrs r1, 1 bcc _082DEEF8 ldr r1, [r3, 0x30] @@ -314,23 +314,23 @@ _082DEF72: str r1, [r3, 0x34] movs r1, 0x30 strh r1, [r3, 0x38] - adr r2, .Lsub_82DEF84 + adr r2, .L082DEF84 b _082DEEFC thumb_func_end sub_82DEF44 thumb_func_start sub_82DEF84 -.Lsub_82DEF84: -sub_82DEF84: @ 82DEF84 +.L082DEF84: +sub_82DEF84: ; 82DEF84 lsls r1, 31 bcc _082DEEF8 bmi _082DEF94 - adr r2, .Lsub_82DEF90 + adr r2, .L082DEF90 b _082DEEFC thumb_func_end sub_82DEF84 thumb_func_start sub_82DEF90 -.Lsub_82DEF90: -sub_82DEF90: @ 82DEF90 +.L082DEF90: +sub_82DEF90: ; 82DEF90 lsrs r1, 1 bcc _082DEEF8 _082DEF94: @@ -348,13 +348,13 @@ _082DEFA6: ldr r1, _082DF048 str r1, [r0, 0x20] str r1, [r0, 0x24] - adr r2, .Lsub_82DEFB4 + adr r2, .L082DEFB4 b _082DEEFC thumb_func_end sub_82DEF90 thumb_func_start sub_82DEFB4 -.Lsub_82DEFB4: -sub_82DEFB4: @ 82DEFB4 +.L082DEFB4: +sub_82DEFB4: ; 82DEFB4 lsrs r1, 1 bcc _082DEEF8 ldr r2, [r0, 0x24] @@ -386,20 +386,20 @@ _082DEFE2: cmp r1, 0 beq _082DEFD2 str r1, [r3, 0x34] - adr r2, .Lsub_82DEFF0 + adr r2, .L082DEFF0 b _082DEEFC thumb_func_end sub_82DEFB4 thumb_func_start sub_82DEFF0 -.Lsub_82DEFF0: -sub_82DEFF0: @ 82DEFF0 +.L082DEFF0: +sub_82DEFF0: ; 82DEFF0 lsls r1, 31 bcc _082DEFE2 bmi _082DF000 - adr r2, .L_082DEFFC + adr r2, .L082DEFFC b _082DEEFC .align 2, 0 -.L_082DEFFC: +.L082DEFFC: _082DEFFC: lsrs r1, 1 bcc _082DEFE2 @@ -409,18 +409,18 @@ _082DF000: cmp r2, 0xBB bne _082DEFA6 strh r1, [r0, 0x10] - adr r2, .Lsub_82DF010 + adr r2, .L082DF010 b _082DEEFC thumb_func_end sub_82DEFF0 thumb_func_start sub_82DF010 -.Lsub_82DF010: -sub_82DF010: @ 82DF010 +.L082DF010: +sub_82DF010: ; 82DF010 b _082DEEF8 thumb_func_end sub_82DF010 non_word_aligned_thumb_func_start sub_82DF012 -sub_82DF012: @ 82DF012 +sub_82DF012: ; 82DF012 ldr r3, _082DF038 ldrh r2, [r3, 0x8] movs r1, 0 diff --git a/asm/unknown_lib_2.s b/asm/unknown_lib_2.s index 915b87ebb..e72ead396 100644 --- a/asm/unknown_lib_2.s +++ b/asm/unknown_lib_2.s @@ -1,5 +1,5 @@ thumb_func_start sub_82E2150 -sub_82E2150: @ 82E2150 +sub_82E2150: ; 82E2150 push {r7,lr} mov r7, sp bl sub_82E29F0 @@ -14,7 +14,7 @@ _082E2164: .4byte 0x03001a7e thumb_func_end sub_82E2150 thumb_func_start sub_82E2168 -sub_82E2168: @ 82E2168 +sub_82E2168: ; 82E2168 push {r7,lr} mov r7, sp bl sub_82E2A04 @@ -29,7 +29,7 @@ _082E217C: .4byte 0x03001a7e thumb_func_end sub_82E2168 thumb_func_start sub_82E2180 -sub_82E2180: @ 82E2180 +sub_82E2180: ; 82E2180 push {r7,lr} sub sp, 0x10 mov r7, sp @@ -143,7 +143,7 @@ _082E224E: thumb_func_end sub_82E2180 thumb_func_start sub_82E2258 -sub_82E2258: @ 82E2258 +sub_82E2258: ; 82E2258 push {r7,lr} sub sp, 0x10 mov r7, sp @@ -210,7 +210,7 @@ _082E22D4: thumb_func_end sub_82E2258 thumb_func_start sub_82E22DC -sub_82E22DC: @ 82E22DC +sub_82E22DC: ; 82E22DC push {r4,r7,lr} sub sp, 0x8 mov r7, sp @@ -314,7 +314,7 @@ _082E23A0: thumb_func_end sub_82E22DC thumb_func_start sub_82E23A8 -sub_82E23A8: @ 82E23A8 +sub_82E23A8: ; 82E23A8 push {r4,r7,lr} sub sp, 0x8 mov r7, sp @@ -399,7 +399,7 @@ _082E2448: thumb_func_end sub_82E23A8 thumb_func_start sub_82E2450 -sub_82E2450: @ 82E2450 +sub_82E2450: ; 82E2450 push {r7,lr} sub sp, 0x8 mov r7, sp @@ -491,7 +491,7 @@ _082E24F8: thumb_func_end sub_82E2450 thumb_func_start sub_82E2500 -sub_82E2500: @ 82E2500 +sub_82E2500: ; 82E2500 push {r7,lr} sub sp, 0x8 mov r7, sp @@ -571,7 +571,7 @@ _082E2594: thumb_func_end sub_82E2500 thumb_func_start sub_82E259C -sub_82E259C: @ 82E259C +sub_82E259C: ; 82E259C push {r7,lr} sub sp, 0x8 mov r7, sp @@ -664,7 +664,7 @@ _082E2648: thumb_func_end sub_82E259C thumb_func_start sub_82E2650 -sub_82E2650: @ 82E2650 +sub_82E2650: ; 82E2650 push {r7,lr} sub sp, 0x8 mov r7, sp @@ -745,7 +745,7 @@ _082E26E4: thumb_func_end sub_82E2650 thumb_func_start sub_82E26EC -sub_82E26EC: @ 82E26EC +sub_82E26EC: ; 82E26EC push {r4,r7,lr} sub sp, 0xC mov r7, sp @@ -904,7 +904,7 @@ _082E2818: thumb_func_end sub_82E26EC thumb_func_start sub_82E2820 -sub_82E2820: @ 82E2820 +sub_82E2820: ; 82E2820 push {r4,r5,r7,lr} sub sp, 0x4 mov r7, sp @@ -993,7 +993,7 @@ _082E28BC: thumb_func_end sub_82E2820 thumb_func_start sub_82E28C4 -sub_82E28C4: @ 82E28C4 +sub_82E28C4: ; 82E28C4 push {r4,r7,lr} sub sp, 0x4 mov r7, sp @@ -1080,7 +1080,7 @@ _082E295C: thumb_func_end sub_82E28C4 thumb_func_start sub_82E2964 -sub_82E2964: @ 82E2964 +sub_82E2964: ; 82E2964 push {r7,lr} sub sp, 0x4 mov r7, sp @@ -1157,7 +1157,7 @@ _082E29E8: thumb_func_end sub_82E2964 thumb_func_start sub_82E29F0 -sub_82E29F0: @ 82E29F0 +sub_82E29F0: ; 82E29F0 push {r7,lr} mov r7, sp ldr r0, _082E2A00 @@ -1171,7 +1171,7 @@ _082E2A00: .4byte _080000C8 thumb_func_end sub_82E29F0 thumb_func_start sub_82E2A04 -sub_82E2A04: @ 82E2A04 +sub_82E2A04: ; 82E2A04 push {r7,lr} mov r7, sp ldr r0, _082E2A14 diff --git a/asm/window.s b/asm/window.s index 657c5389c..a74b8d2c1 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 Window_InitFromTemplates -@ int Window_InitFromTemplates(struct rbox_template *template) -Window_InitFromTemplates: @ 80031C0 +; int Window_InitFromTemplates(struct rbox_template *template) +Window_InitFromTemplates: ; 80031C0 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -16,22 +16,22 @@ Window_InitFromTemplates: @ 80031C0 movs r0, 0 mov r8, r0 ldr r4, =0x03002f70 -_080031D4: +@080031D4: mov r1, r8 lsls r0, r1, 24 lsrs r0, 24 bl bg_get_tilemap cmp r0, 0 - beq _080031E4 + beq @080031E4 ldr r0, =nullsub_8 + 1 -_080031E4: +@080031E4: str r0, [r4] adds r4, 0x4 movs r2, 0x1 add r8, r2 mov r0, r8 cmp r0, 0x3 - ble _080031D4 + ble @080031D4 ldr r0, =gDummyWindowTemplate ldr r2, [r0] ldr r3, [r0, 0x4] @@ -39,7 +39,7 @@ _080031E4: movs r0, 0 movs r4, 0x1F mov r8, r4 -_08003200: +@08003200: str r2, [r1] str r3, [r1, 0x4] str r0, [r1, 0x8] @@ -49,24 +49,24 @@ _08003200: add r8, r4 mov r4, r8 cmp r4, 0 - bge _08003200 + bge @08003200 movs r0, 0 mov r8, r0 movs r1, 0 str r1, [sp] ldrb r7, [r5] cmp r7, 0xFF - bne _08003224 - b _0800335C -_08003224: + bne @08003224 + b @0800335C +@08003224: adds r6, r5, 0 movs r2, 0 str r2, [sp, 0x4] -_0800322A: +@0800322A: ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 - bne _08003268 + bne @08003268 ldrb r1, [r6, 0x3] ldrb r0, [r6, 0x4] adds r2, r1, 0 @@ -80,13 +80,13 @@ _0800322A: negs r0, r0 ldr r4, [sp] cmp r4, r0 - bne _08003268 -_08003250: + bne @08003268 +@08003250: movs r0, 0 - b _08003364 + b @08003364 .align 2, 0 .pool -_08003268: +@08003268: ldr r0, =0x03002f70 mov r9, r0 lsls r0, r7, 2 @@ -95,7 +95,7 @@ _08003268: ldr r1, [r1] mov r10, r0 cmp r1, 0 - bne _080032CA + bne @080032CA adds r0, r7, 0 movs r1, 0x8 bl bg_get_field @@ -103,36 +103,36 @@ _08003268: lsrs r5, r0, 16 ldr r0, =0x0000ffff cmp r5, r0 - beq _080032CA + beq @080032CA adds r0, r5, 0 bl malloc_and_clear adds r4, r0, 0 cmp r4, 0 - bne _080032A8 + bne @080032A8 bl Window_FreeMemory - b _08003250 + b @08003250 .align 2, 0 .pool -_080032A8: +@080032A8: movs r1, 0 mov r3, r9 cmp r1, r5 - bge _080032BC + bge @080032BC movs r2, 0 -_080032B2: +@080032B2: adds r0, r4, r1 strb r2, [r0] adds r1, 0x1 cmp r1, r5 - blt _080032B2 -_080032BC: + blt @080032B2 +@080032BC: mov r1, r10 adds r0, r1, r3 str r4, [r0] adds r0, r7, 0 adds r1, r4, 0 bl bg_set_tilemap -_080032CA: +@080032CA: ldrb r1, [r6, 0x3] ldrb r0, [r6, 0x4] muls r0, r1 @@ -141,26 +141,26 @@ _080032CA: bl malloc_and_clear adds r4, r0, 0 cmp r4, 0 - bne _0800330C + bne @0800330C adds r0, r7, 0 bl GetNumActiveWindowsOnBg lsls r0, 24 cmp r0, 0 - bne _08003250 + bne @08003250 ldr r0, =0x03002f70 mov r2, r10 adds r5, r2, r0 ldr r1, [r5] ldr r0, =nullsub_8 + 1 cmp r1, r0 - beq _08003250 + beq @08003250 adds r0, r1, 0 bl free str r4, [r5] - b _08003250 + b @08003250 .align 2, 0 .pool -_0800330C: +@0800330C: ldr r1, =0x02020004 adds r0, r1, 0 adds r0, 0x8 @@ -175,7 +175,7 @@ _0800330C: ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 - bne _08003342 + bne @08003342 mov r4, sp ldrh r4, [r4] strh r4, [r2, 0x6] @@ -187,7 +187,7 @@ _0800330C: ldr r1, [sp] movs r3, 0x1 bl do_nothing -_08003342: +@08003342: adds r6, 0x8 ldr r0, [sp, 0x4] adds r0, 0xC @@ -196,17 +196,17 @@ _08003342: add r8, r1 ldrb r7, [r6] cmp r7, 0xFF - beq _0800335C + beq @0800335C mov r2, r8 cmp r2, 0x1F - bgt _0800335C - b _0800322A -_0800335C: + bgt @0800335C + b @0800322A +@0800335C: ldr r1, =0x03002f60 movs r0, 0 strb r0, [r1] movs r0, 0x1 -_08003364: +@08003364: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -220,8 +220,8 @@ _08003364: thumb_func_end Window_InitFromTemplates thumb_func_start Window_AddFromTemplate -@ int Window_AddFromTemplate(struct rbox_template *template) -Window_AddFromTemplate: @ 8003380 +; int Window_AddFromTemplate(struct rbox_template *template) +Window_AddFromTemplate: ; 8003380 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -233,23 +233,23 @@ Window_AddFromTemplate: @ 8003380 ldr r1, =0x02020004 ldrb r0, [r1] cmp r0, 0xFF - beq _080033B0 -_08003398: + beq @080033B0 +@08003398: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x1F - bhi _080033B0 + bhi @080033B0 lsls r0, r6, 1 adds r0, r6 lsls r0, 2 adds r0, r1 ldrb r0, [r0] cmp r0, 0xFF - bne _08003398 -_080033B0: + bne @08003398 +@080033B0: cmp r6, 0x20 - beq _0800346A + beq @0800346A mov r0, r8 ldrb r7, [r0] movs r1, 0 @@ -257,7 +257,7 @@ _080033B0: ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 - bne _080033E2 + bne @080033E2 mov r2, r8 ldrb r1, [r2, 0x3] ldrb r0, [r2, 0x4] @@ -271,8 +271,8 @@ _080033B0: movs r0, 0x1 negs r0, r0 cmp r9, r0 - beq _0800346A -_080033E2: + beq @0800346A +@080033E2: ldr r3, =0x03002f70 mov r10, r3 lsls r0, r7, 2 @@ -280,7 +280,7 @@ _080033E2: ldr r1, [r1] str r0, [sp] cmp r1, 0 - bne _08003432 + bne @08003432 adds r0, r7, 0 movs r1, 0x8 bl bg_get_field @@ -288,31 +288,31 @@ _080033E2: lsrs r5, r0, 16 ldr r0, =0x0000ffff cmp r5, r0 - beq _08003432 + beq @08003432 adds r0, r5, 0 bl malloc_and_clear adds r4, r0, 0 cmp r4, 0 - beq _0800346A + beq @0800346A movs r1, 0 mov r3, r10 cmp r1, r5 - bge _08003424 + bge @08003424 movs r2, 0 -_0800341A: +@0800341A: adds r0, r4, r1 strb r2, [r0] adds r1, 0x1 cmp r1, r5 - blt _0800341A -_08003424: + blt @0800341A +@08003424: ldr r1, [sp] adds r0, r1, r3 str r4, [r0] adds r0, r7, 0 adds r1, r4, 0 bl bg_set_tilemap -_08003432: +@08003432: mov r2, r8 ldrb r1, [r2, 0x3] ldrb r0, [r2, 0x4] @@ -322,28 +322,28 @@ _08003432: bl malloc_and_clear adds r4, r0, 0 cmp r4, 0 - bne _08003484 + bne @08003484 adds r0, r7, 0 bl GetNumActiveWindowsOnBg lsls r0, 24 cmp r0, 0 - bne _0800346A + bne @0800346A ldr r0, =0x03002f70 ldr r3, [sp] adds r5, r3, r0 ldr r1, [r5] ldr r0, =nullsub_8 + 1 cmp r1, r0 - beq _0800346A + beq @0800346A adds r0, r1, 0 bl free str r4, [r5] -_0800346A: +@0800346A: movs r0, 0xFF - b _080034C0 + b @080034C0 .align 2, 0 .pool -_08003484: +@08003484: ldr r2, =0x02020004 lsls r1, r6, 1 adds r1, r6 @@ -361,7 +361,7 @@ _08003484: ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 - bne _080034BE + bne @080034BE mov r0, r9 strh r0, [r2, 0x6] ldrb r0, [r2, 0x3] @@ -372,9 +372,9 @@ _08003484: mov r1, r9 movs r3, 0x1 bl do_nothing -_080034BE: +@080034BE: adds r0, r6, 0 -_080034C0: +@080034C0: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -388,37 +388,37 @@ _080034C0: thumb_func_end Window_AddFromTemplate thumb_func_start Window_AddFromTemplateWithoutAllocatingMemory -@ int Window_AddFromTemplateWithoutAllocatingMemory(struct rbox_template *template) -Window_AddFromTemplateWithoutAllocatingMemory: @ 80034D8 +; int Window_AddFromTemplateWithoutAllocatingMemory(struct rbox_template *template) +Window_AddFromTemplateWithoutAllocatingMemory: ; 80034D8 push {r4-r6,lr} adds r5, r0, 0 movs r4, 0 ldr r1, =0x02020004 ldrb r0, [r1] cmp r0, 0xFF - beq _080034FE -_080034E6: + beq @080034FE +@080034E6: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x1F - bhi _080034FE + bhi @080034FE lsls r0, r4, 1 adds r0, r4 lsls r0, 2 adds r0, r1 ldrb r0, [r0] cmp r0, 0xFF - bne _080034E6 -_080034FE: + bne @080034E6 +@080034FE: cmp r4, 0x20 - beq _08003528 + beq @08003528 ldrb r6, [r5] movs r3, 0 ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 - bne _08003534 + bne @08003534 ldrb r1, [r5, 0x3] ldrb r0, [r5, 0x4] adds r2, r1, 0 @@ -430,13 +430,13 @@ _080034FE: movs r0, 0x1 negs r0, r0 cmp r3, r0 - bne _08003534 -_08003528: + bne @08003534 +@08003528: movs r0, 0xFF - b _08003564 + b @08003564 .align 2, 0 .pool -_08003534: +@08003534: ldr r1, =0x02020004 lsls r0, r4, 1 adds r0, r4 @@ -449,7 +449,7 @@ _08003534: ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 - bne _08003562 + bne @08003562 strh r3, [r2, 0x6] ldrb r0, [r2, 0x3] ldrb r1, [r2, 0x4] @@ -459,9 +459,9 @@ _08003534: adds r1, r3, 0 movs r3, 0x1 bl do_nothing -_08003562: +@08003562: adds r0, r4, 0 -_08003564: +@08003564: pop {r4-r6} pop {r1} bx r1 @@ -470,8 +470,8 @@ _08003564: thumb_func_end Window_AddFromTemplateWithoutAllocatingMemory thumb_func_start Window_Remove -@ int Window_Remove(int rbox_id) -Window_Remove: @ 8003574 +; int Window_Remove(int rbox_id) +Window_Remove: ; 8003574 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 @@ -485,7 +485,7 @@ Window_Remove: @ 8003574 ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 - bne _080035A0 + bne @080035A0 ldrh r1, [r4, 0x6] ldrb r2, [r4, 0x3] ldrb r0, [r4, 0x4] @@ -493,7 +493,7 @@ Window_Remove: @ 8003574 adds r0, r3, 0 movs r3, 0x2 bl do_nothing -_080035A0: +@080035A0: ldr r0, =gDummyWindowTemplate ldr r1, [r0, 0x4] ldr r0, [r0] @@ -504,18 +504,18 @@ _080035A0: lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne _080035CE + bne @080035CE ldr r0, =0x03002f70 lsls r1, r7, 2 adds r4, r1, r0 ldr r1, [r4] ldr r0, =nullsub_8 + 1 cmp r1, r0 - beq _080035CE + beq @080035CE adds r0, r1, 0 bl free str r5, [r4] -_080035CE: +@080035CE: ldr r1, =0x02020004 lsls r0, r6, 1 adds r0, r6 @@ -524,11 +524,11 @@ _080035CE: adds r4, r0, r1 ldr r0, [r4] cmp r0, 0 - beq _080035E8 + beq @080035E8 bl free movs r0, 0 str r0, [r4] -_080035E8: +@080035E8: pop {r4-r7} pop {r0} bx r0 @@ -537,43 +537,43 @@ _080035E8: thumb_func_end Window_Remove thumb_func_start Window_FreeMemory -@ void Window_FreeMemory() -Window_FreeMemory: @ 8003604 +; void Window_FreeMemory() +Window_FreeMemory: ; 8003604 push {r4-r6,lr} ldr r4, =0x03002f70 movs r5, 0x3 -_0800360A: +@0800360A: ldr r1, [r4] cmp r1, 0 - beq _08003620 + beq @08003620 ldr r0, =nullsub_8 + 1 cmp r1, r0 - beq _08003620 + beq @08003620 adds r0, r1, 0 bl free movs r0, 0 str r0, [r4] -_08003620: +@08003620: adds r4, 0x4 subs r5, 0x1 cmp r5, 0 - bge _0800360A + bge @0800360A ldr r0, =0x02020004 adds r4, r0, 0 adds r4, 0x8 movs r6, 0 movs r5, 0x1F -_08003632: +@08003632: ldr r0, [r4] cmp r0, 0 - beq _0800363E + beq @0800363E bl free str r6, [r4] -_0800363E: +@0800363E: adds r4, 0xC subs r5, 0x1 cmp r5, 0 - bge _08003632 + bge @08003632 pop {r4-r6} pop {r0} bx r0 @@ -582,8 +582,8 @@ _0800363E: thumb_func_end Window_FreeMemory thumb_func_start Window_CopyToVram -@ void Window_CopyToVram(u8 rbox_id, u8 mode) -Window_CopyToVram: @ 8003658 +; void Window_CopyToVram(u8 rbox_id, u8 mode) +Window_CopyToVram: ; 8003658 push {r4-r6,lr} sub sp, 0xC lsls r0, 24 @@ -606,24 +606,24 @@ Window_CopyToVram: @ 8003658 lsls r0, 21 lsrs r4, r0, 16 cmp r3, 0x2 - beq _080036A4 + beq @080036A4 cmp r3, 0x2 - bgt _08003694 + bgt @08003694 cmp r3, 0x1 - beq _0800369A - b _080036CE + beq @0800369A + b @080036CE .align 2, 0 .pool -_08003694: +@08003694: cmp r5, 0x3 - beq _080036B6 - b _080036CE -_0800369A: + beq @080036B6 + b @080036CE +@0800369A: mov r0, sp ldrb r0, [r0] bl gpu_copy_wram_bg_tilemap_to_vram - b _080036CE -_080036A4: + b @080036CE +@080036A4: mov r0, sp ldrb r0, [r0] ldr r1, [sp, 0x8] @@ -631,8 +631,8 @@ _080036A4: ldrh r3, [r2, 0x6] adds r2, r4, 0 bl gpu_copy_bg_tile_pattern_data_to_vram - b _080036CE -_080036B6: + b @080036CE +@080036B6: mov r0, sp ldrb r0, [r0] ldr r1, [sp, 0x8] @@ -643,7 +643,7 @@ _080036B6: mov r0, sp ldrb r0, [r0] bl gpu_copy_wram_bg_tilemap_to_vram -_080036CE: +@080036CE: add sp, 0xC pop {r4-r6} pop {r0} @@ -651,8 +651,8 @@ _080036CE: thumb_func_end Window_CopyToVram thumb_func_start Window_CopyRectToVram -@ void Window_CopyRectToVram(int rbox_id, int mode, int x, int y, int w, int h) -Window_CopyRectToVram: @ 80036D8 +; void Window_CopyRectToVram(int rbox_id, int mode, int x, int y, int w, int h) +Window_CopyRectToVram: ; 80036D8 push {r4-r7,lr} sub sp, 0xC adds r6, r0, 0 @@ -662,9 +662,9 @@ Window_CopyRectToVram: @ 80036D8 ldr r3, [sp, 0x24] ldr r0, [sp, 0x20] cmp r0, 0 - beq _08003782 + beq @08003782 cmp r3, 0 - beq _08003782 + beq @08003782 ldr r2, =0x02020004 lsls r0, r6, 1 adds r0, r6 @@ -689,24 +689,24 @@ Window_CopyRectToVram: @ 80036D8 muls r0, r1 adds r4, r0, r4 cmp r5, 0x2 - beq _08003740 + beq @08003740 cmp r5, 0x2 - bhi _08003730 + bhi @08003730 cmp r5, 0x1 - beq _08003736 - b _08003782 + beq @08003736 + b @08003782 .align 2, 0 .pool -_08003730: +@08003730: cmp r5, 0x3 - beq _0800375E - b _08003782 -_08003736: + beq @0800375E + b @08003782 +@08003736: mov r0, sp ldrb r0, [r0] bl gpu_copy_wram_bg_tilemap_to_vram - b _08003782 -_08003740: + b @08003782 +@08003740: mov r0, sp ldrb r0, [r0] lsls r2, r4, 5 @@ -720,8 +720,8 @@ _08003740: lsls r3, 16 lsrs r3, 16 bl gpu_copy_bg_tile_pattern_data_to_vram - b _08003782 -_0800375E: + b @08003782 +@0800375E: mov r0, sp ldrb r0, [r0] lsls r2, r4, 5 @@ -738,7 +738,7 @@ _0800375E: mov r0, sp ldrb r0, [r0] bl gpu_copy_wram_bg_tilemap_to_vram -_08003782: +@08003782: add sp, 0xC pop {r4-r7} pop {r0} @@ -746,8 +746,8 @@ _08003782: thumb_func_end Window_CopyRectToVram thumb_func_start Window_WriteStandardTileMap -@ void Window_WriteStandardTileMap(int rbox_id) -Window_WriteStandardTileMap: @ 800378C +; void Window_WriteStandardTileMap(int rbox_id) +Window_WriteStandardTileMap: ; 800378C push {r4,lr} sub sp, 0x1C lsls r0, 24 @@ -797,8 +797,8 @@ Window_WriteStandardTileMap: @ 800378C thumb_func_end Window_WriteStandardTileMap thumb_func_start Window_WriteStandardTileMapRectOverridePalette -@ void Window_WriteStandardTileMapRectOverridePalette(u8 rbox_id, u8 x, u8 y, u8 w, u8 h, u8 palette) -Window_WriteStandardTileMapRectOverridePalette: @ 80037EC +; void Window_WriteStandardTileMapRectOverridePalette(u8 rbox_id, u8 x, u8 y, u8 w, u8 h, u8 palette) +Window_WriteStandardTileMapRectOverridePalette: ; 80037EC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -850,10 +850,10 @@ Window_WriteStandardTileMapRectOverridePalette: @ 80037EC lsrs r6, r0, 16 movs r5, 0 cmp r5, r8 - bge _0800388E + bge @0800388E add r4, sp, 0x10 movs r7, 0x1 -_0800385A: +@0800385A: ldrb r0, [r4] ldrb r2, [r4, 0x1] add r2, r10 @@ -878,8 +878,8 @@ _0800385A: lsrs r6, r0, 16 adds r5, 0x1 cmp r5, r8 - blt _0800385A -_0800388E: + blt @0800385A +@0800388E: add sp, 0x24 pop {r3-r5} mov r8, r3 @@ -893,8 +893,8 @@ _0800388E: thumb_func_end Window_WriteStandardTileMapRectOverridePalette thumb_func_start Window_FillTileMap -@ void Window_FillTileMap(int rbox_id) -Window_FillTileMap: @ 80038A4 +; void Window_FillTileMap(int rbox_id) +Window_FillTileMap: ; 80038A4 push {r4,lr} sub sp, 0x18 lsls r0, 24 @@ -934,8 +934,8 @@ Window_FillTileMap: @ 80038A4 thumb_func_end Window_FillTileMap thumb_func_start Window_WriteStandardTileMapRect -@ void Window_WriteStandardTileMapRect(u8 rbox_id, u8 x, u8 y, u8 w, u8 h) -Window_WriteStandardTileMapRect: @ 80038F4 +; void Window_WriteStandardTileMapRect(u8 rbox_id, u8 x, u8 y, u8 w, u8 h) +Window_WriteStandardTileMapRect: ; 80038F4 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -983,10 +983,10 @@ Window_WriteStandardTileMapRect: @ 80038F4 lsrs r6, r0, 16 movs r5, 0 cmp r5, r8 - bge _0800398E + bge @0800398E add r4, sp, 0x10 movs r7, 0x1 -_0800395A: +@0800395A: ldrb r0, [r4] ldrb r2, [r4, 0x1] add r2, r10 @@ -1011,8 +1011,8 @@ _0800395A: lsrs r6, r0, 16 adds r5, 0x1 cmp r5, r8 - blt _0800395A -_0800398E: + blt @0800395A +@0800398E: add sp, 0x20 pop {r3-r5} mov r8, r3 @@ -1026,8 +1026,8 @@ _0800398E: thumb_func_end Window_WriteStandardTileMapRect thumb_func_start Window_CopyWholePixelBlockToWindow -@ void Window_CopyWholePixelBlockToWindow(u8 rbox_id, int a2, u16 x, u16 y, u16 w, u16 h) -Window_CopyWholePixelBlockToWindow: @ 80039A4 +; void Window_CopyWholePixelBlockToWindow(u8 rbox_id, int a2, u16 x, u16 y, u16 w, u16 h) +Window_CopyWholePixelBlockToWindow: ; 80039A4 push {r4,r5,lr} sub sp, 0x18 ldr r4, [sp, 0x24] @@ -1058,8 +1058,8 @@ Window_CopyWholePixelBlockToWindow: @ 80039A4 thumb_func_end Window_CopyWholePixelBlockToWindow thumb_func_start Window_CopyPixelRectToWindow -@ void Window_CopyPixelRectToWindow(u8 rbox_id, void *pixels, u16 src_x, u16 src_y, u16 src_w, int src_h, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h) -Window_CopyPixelRectToWindow: @ 80039DC +; void Window_CopyPixelRectToWindow(u8 rbox_id, void *pixels, u16 src_x, u16 src_y, u16 src_w, int src_h, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h) +Window_CopyPixelRectToWindow: ; 80039DC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -1153,8 +1153,8 @@ Window_CopyPixelRectToWindow: @ 80039DC thumb_func_end Window_CopyPixelRectToWindow thumb_func_start Window_copy_pixels_rect_3 -@ void Window_copy_pixels_rect_3(u8 rbox_id, void *pixels, u16 src_x, u16 src_y, u16 src_w, int src_h, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h, u8 a11) -Window_copy_pixels_rect_3: @ 8003A9C +; void Window_copy_pixels_rect_3(u8 rbox_id, void *pixels, u16 src_x, u16 src_y, u16 src_w, int src_h, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h, u8 a11) +Window_copy_pixels_rect_3: ; 8003A9C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -1252,8 +1252,8 @@ Window_copy_pixels_rect_3: @ 8003A9C thumb_func_end Window_copy_pixels_rect_3 thumb_func_start Window_FillPixelRect -@ void Window_FillPixelRect(u8 rbox_id, char fill_value, u16 x, u16 y, u16 w, u16 h) -Window_FillPixelRect: @ 8003B64 +; void Window_FillPixelRect(u8 rbox_id, char fill_value, u16 x, u16 y, u16 w, u16 h) +Window_FillPixelRect: ; 8003B64 push {r4-r6,lr} mov r6, r9 mov r5, r8 @@ -1321,7 +1321,7 @@ Window_FillPixelRect: @ 8003B64 thumb_func_end Window_FillPixelRect thumb_func_start Window_CopyToPixels -Window_CopyToPixels: @ 8003BF0 +Window_CopyToPixels: ; 8003BF0 push {r4-r6,lr} adds r6, r1, 0 lsls r0, 24 @@ -1330,7 +1330,7 @@ Window_CopyToPixels: @ 8003BF0 lsls r3, 16 lsrs r2, r3, 16 cmp r5, 0 - beq _08003C24 + beq @08003C24 ldr r1, =0x02020004 lsls r0, r4, 1 adds r0, r4 @@ -1343,10 +1343,10 @@ Window_CopyToPixels: @ 8003BF0 lsrs r2, r5, 17 adds r0, r6, 0 bl CpuSet - b _08003C3C + b @08003C3C .align 2, 0 .pool -_08003C24: +@08003C24: ldr r1, =0x02020004 lsls r0, r4, 1 adds r0, r4 @@ -1358,7 +1358,7 @@ _08003C24: adds r1, r2 adds r0, r6, 0 bl LZ77UnCompWram -_08003C3C: +@08003C3C: pop {r4-r6} pop {r0} bx r0 @@ -1367,8 +1367,8 @@ _08003C3C: thumb_func_end Window_CopyToPixels thumb_func_start Window_FastFillPixels -@ void Window_FastFillPixels(u8 rbox_id, int value) -Window_FastFillPixels: @ 8003C48 +; void Window_FastFillPixels(u8 rbox_id, int value) +Window_FastFillPixels: ; 8003C48 push {r4,r5,lr} sub sp, 0x4 lsls r0, 24 @@ -1408,8 +1408,8 @@ Window_FastFillPixels: @ 8003C48 thumb_func_end Window_FastFillPixels thumb_func_start Window_ScrollVertically -@ int Window_ScrollVertically(u8 a1, u8 mode, u8 a3, int a4) -Window_ScrollVertically: @ 8003C94 +; int Window_ScrollVertically(u8 a1, u8 mode, u8 a3, int a4) +Window_ScrollVertically: ; 8003C94 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -1450,29 +1450,29 @@ Window_ScrollVertically: @ 8003C94 mov r12, r1 mov r0, r8 cmp r0, 0x1 - bne _08003CE8 - b _08003E9E -_08003CE8: + bne @08003CE8 + b @08003E9E +@08003CE8: cmp r0, 0x1 - ble _08003CEE - b _08004046 -_08003CEE: + ble @08003CEE + b @08004046 +@08003CEE: cmp r0, 0 - beq _08003CF4 - b _08004046 -_08003CF4: + beq @08003CF4 + b @08004046 +@08003CF4: movs r4, 0 cmp r4, r6 - blt _08003CFC - b _08004046 -_08003CFC: + blt @08003CFC + b @08004046 +@08003CFC: movs r1, 0x8 negs r1, r1 mov r9, r1 movs r2, 0x7 mov r8, r2 mov r10, r5 -_08003D08: +@08003D08: ldr r3, [sp] adds r0, r3, 0 mov r1, r9 @@ -1486,18 +1486,18 @@ _08003D08: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003D34 + bge @08003D34 adds r0, r5, r1 ldr r0, [r0] mov r1, r10 str r0, [r1] - b _08003D38 + b @08003D38 .align 2, 0 .pool -_08003D34: +@08003D34: mov r2, r10 str r7, [r2] -_08003D38: +@08003D38: adds r3, 0x1 adds r2, r4, 0x4 adds r0, r3, 0 @@ -1514,16 +1514,16 @@ _08003D38: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003D64 + bge @08003D64 adds r0, r5, r2 adds r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08003D68 -_08003D64: + b @08003D68 +@08003D64: adds r0, r5, r2 str r7, [r0] -_08003D68: +@08003D68: adds r3, 0x1 adds r2, r4, 0 adds r2, 0x8 @@ -1541,16 +1541,16 @@ _08003D68: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003D96 + bge @08003D96 adds r0, r5, r2 adds r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08003D9A -_08003D96: + b @08003D9A +@08003D96: adds r0, r5, r2 str r7, [r0] -_08003D9A: +@08003D9A: adds r3, 0x1 adds r2, r4, 0 adds r2, 0xC @@ -1568,16 +1568,16 @@ _08003D9A: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003DC8 + bge @08003DC8 adds r0, r5, r2 adds r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08003DCC -_08003DC8: + b @08003DCC +@08003DC8: adds r0, r5, r2 str r7, [r0] -_08003DCC: +@08003DCC: adds r3, 0x1 adds r2, r4, 0 adds r2, 0x10 @@ -1595,16 +1595,16 @@ _08003DCC: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003DFA + bge @08003DFA adds r0, r5, r2 adds r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08003DFE -_08003DFA: + b @08003DFE +@08003DFA: adds r0, r5, r2 str r7, [r0] -_08003DFE: +@08003DFE: adds r3, 0x1 adds r2, r4, 0 adds r2, 0x14 @@ -1622,16 +1622,16 @@ _08003DFE: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003E2C + bge @08003E2C adds r0, r5, r2 adds r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08003E30 -_08003E2C: + b @08003E30 +@08003E2C: adds r0, r5, r2 str r7, [r0] -_08003E30: +@08003E30: adds r3, 0x1 adds r2, r4, 0 adds r2, 0x18 @@ -1649,16 +1649,16 @@ _08003E30: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003E5E + bge @08003E5E adds r0, r5, r2 adds r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08003E62 -_08003E5E: + b @08003E62 +@08003E5E: adds r0, r5, r2 str r7, [r0] -_08003E62: +@08003E62: adds r3, 0x1 adds r2, r4, 0 adds r2, 0x1C @@ -1674,39 +1674,39 @@ _08003E62: lsls r0, 2 adds r1, r4, r0 cmp r1, r6 - bge _08003E8C + bge @08003E8C adds r0, r5, r2 adds r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08003E90 -_08003E8C: + b @08003E90 +@08003E8C: adds r0, r5, r2 str r7, [r0] -_08003E90: +@08003E90: movs r2, 0x20 add r10, r2 adds r4, 0x20 cmp r4, r6 - bge _08003E9C - b _08003D08 -_08003E9C: - b _08004046 -_08003E9E: + bge @08003E9C + b @08003D08 +@08003E9C: + b @08004046 +@08003E9E: subs r0, r6, 0x4 adds r5, r0 movs r4, 0 cmp r4, r6 - blt _08003EAA - b _08004046 -_08003EAA: + blt @08003EAA + b @08004046 +@08003EAA: movs r0, 0x8 negs r0, r0 mov r9, r0 movs r1, 0x7 mov r8, r1 mov r10, r5 -_08003EB6: +@08003EB6: ldr r3, [sp] adds r0, r3, 0 mov r2, r9 @@ -1720,16 +1720,16 @@ _08003EB6: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003EDC + bge @08003EDC subs r0, r5, r1 ldr r0, [r0] mov r1, r10 str r0, [r1] - b _08003EE0 -_08003EDC: + b @08003EE0 +@08003EDC: mov r2, r10 str r7, [r2] -_08003EE0: +@08003EE0: adds r3, 0x1 adds r2, r4, 0x4 adds r0, r3, 0 @@ -1746,16 +1746,16 @@ _08003EE0: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003F0C + bge @08003F0C subs r0, r5, r2 subs r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08003F10 -_08003F0C: + b @08003F10 +@08003F0C: subs r0, r5, r2 str r7, [r0] -_08003F10: +@08003F10: adds r3, 0x1 adds r2, r4, 0 adds r2, 0x8 @@ -1773,16 +1773,16 @@ _08003F10: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003F3E + bge @08003F3E subs r0, r5, r2 subs r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08003F42 -_08003F3E: + b @08003F42 +@08003F3E: subs r0, r5, r2 str r7, [r0] -_08003F42: +@08003F42: adds r3, 0x1 adds r2, r4, 0 adds r2, 0xC @@ -1800,16 +1800,16 @@ _08003F42: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003F70 + bge @08003F70 subs r0, r5, r2 subs r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08003F74 -_08003F70: + b @08003F74 +@08003F70: subs r0, r5, r2 str r7, [r0] -_08003F74: +@08003F74: adds r3, 0x1 adds r2, r4, 0 adds r2, 0x10 @@ -1827,16 +1827,16 @@ _08003F74: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003FA2 + bge @08003FA2 subs r0, r5, r2 subs r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08003FA6 -_08003FA2: + b @08003FA6 +@08003FA2: subs r0, r5, r2 str r7, [r0] -_08003FA6: +@08003FA6: adds r3, 0x1 adds r2, r4, 0 adds r2, 0x14 @@ -1854,16 +1854,16 @@ _08003FA6: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08003FD4 + bge @08003FD4 subs r0, r5, r2 subs r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08003FD8 -_08003FD4: + b @08003FD8 +@08003FD4: subs r0, r5, r2 str r7, [r0] -_08003FD8: +@08003FD8: adds r3, 0x1 adds r2, r4, 0 adds r2, 0x18 @@ -1881,16 +1881,16 @@ _08003FD8: lsls r1, 2 adds r1, r4, r1 cmp r1, r6 - bge _08004006 + bge @08004006 subs r0, r5, r2 subs r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _0800400A -_08004006: + b @0800400A +@08004006: subs r0, r5, r2 str r7, [r0] -_0800400A: +@0800400A: adds r3, 0x1 adds r2, r4, 0 adds r2, 0x1C @@ -1906,24 +1906,24 @@ _0800400A: lsls r0, 2 adds r1, r4, r0 cmp r1, r6 - bge _08004034 + bge @08004034 subs r0, r5, r2 subs r1, r5, r1 ldr r1, [r1] str r1, [r0] - b _08004038 -_08004034: + b @08004038 +@08004034: subs r0, r5, r2 str r7, [r0] -_08004038: +@08004038: movs r2, 0x20 negs r2, r2 add r10, r2 adds r4, 0x20 cmp r4, r6 - bge _08004046 - b _08003EB6 -_08004046: + bge @08004046 + b @08003EB6 +@08004046: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -1935,8 +1935,8 @@ _08004046: thumb_func_end Window_ScrollVertically thumb_func_start CallWindowFunction -@ void CallWindowFunction(u8 windowId, void ( *functionPointer)(s8, s8, s8, s8)) -CallWindowFunction: @ 8004058 +; void CallWindowFunction(u8 windowId, void ( *functionPointer)(s8, s8, s8, s8)) +CallWindowFunction: ; 8004058 push {r4-r6,lr} mov r6, r8 push {r6} @@ -1978,32 +1978,32 @@ CallWindowFunction: @ 8004058 thumb_func_end CallWindowFunction thumb_func_start Window_SetField -Window_SetField: @ 80040A8 +Window_SetField: ; 80040A8 push {lr} lsls r0, 24 lsrs r3, r0, 24 lsls r1, 24 lsrs r0, r1, 24 cmp r0, 0x7 - bhi _08004142 + bhi @08004142 lsls r0, 2 - ldr r1, =_080040C4 + ldr r1, =@080040C4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_080040C4: - .4byte _08004142 - .4byte _080040E4 - .4byte _080040F8 - .4byte _08004142 - .4byte _08004142 - .4byte _0800410C - .4byte _08004120 - .4byte _08004134 -_080040E4: +@080040C4: + .4byte @08004142 + .4byte @080040E4 + .4byte @080040F8 + .4byte @08004142 + .4byte @08004142 + .4byte @0800410C + .4byte @08004120 + .4byte @08004134 +@080040E4: ldr r1, =0x02020004 lsls r0, r3, 1 adds r0, r3 @@ -2011,10 +2011,10 @@ _080040E4: adds r0, r1 strb r2, [r0, 0x1] movs r0, 0 - b _08004144 + b @08004144 .align 2, 0 .pool -_080040F8: +@080040F8: ldr r1, =0x02020004 lsls r0, r3, 1 adds r0, r3 @@ -2022,10 +2022,10 @@ _080040F8: adds r0, r1 strb r2, [r0, 0x2] movs r0, 0 - b _08004144 + b @08004144 .align 2, 0 .pool -_0800410C: +@0800410C: ldr r1, =0x02020004 lsls r0, r3, 1 adds r0, r3 @@ -2033,10 +2033,10 @@ _0800410C: adds r0, r1 strb r2, [r0, 0x5] movs r0, 0 - b _08004144 + b @08004144 .align 2, 0 .pool -_08004120: +@08004120: ldr r1, =0x02020004 lsls r0, r3, 1 adds r0, r3 @@ -2044,10 +2044,10 @@ _08004120: adds r0, r1 strh r2, [r0, 0x6] movs r0, 0 - b _08004144 + b @08004144 .align 2, 0 .pool -_08004134: +@08004134: ldr r1, =0x02020004 lsls r0, r3, 1 adds r0, r3 @@ -2055,9 +2055,9 @@ _08004134: adds r1, 0x8 adds r0, r1 str r2, [r0] -_08004142: +@08004142: movs r0, 0x1 -_08004144: +@08004144: pop {r1} bx r1 .align 2, 0 @@ -2065,102 +2065,102 @@ _08004144: thumb_func_end Window_SetField thumb_func_start Window_GetField -Window_GetField: @ 800414C +Window_GetField: ; 800414C push {lr} lsls r0, 24 lsrs r2, r0, 24 lsls r1, 24 lsrs r0, r1, 24 cmp r0, 0x7 - bhi _08004228 + bhi @08004228 lsls r0, 2 - ldr r1, =_08004168 + ldr r1, =@08004168 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 .pool .align 2, 0 -_08004168: - .4byte _08004188 - .4byte _0800419C - .4byte _080041B0 - .4byte _080041C4 - .4byte _080041D8 - .4byte _080041EC - .4byte _08004200 - .4byte _08004214 -_08004188: +@08004168: + .4byte @08004188 + .4byte @0800419C + .4byte @080041B0 + .4byte @080041C4 + .4byte @080041D8 + .4byte @080041EC + .4byte @08004200 + .4byte @08004214 +@08004188: ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 adds r1, r0 ldrb r0, [r1] - b _0800422A + b @0800422A .align 2, 0 .pool -_0800419C: +@0800419C: ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 adds r1, r0 ldrb r0, [r1, 0x1] - b _0800422A + b @0800422A .align 2, 0 .pool -_080041B0: +@080041B0: ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 adds r1, r0 ldrb r0, [r1, 0x2] - b _0800422A + b @0800422A .align 2, 0 .pool -_080041C4: +@080041C4: ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 adds r1, r0 ldrb r0, [r1, 0x3] - b _0800422A + b @0800422A .align 2, 0 .pool -_080041D8: +@080041D8: ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 adds r1, r0 ldrb r0, [r1, 0x4] - b _0800422A + b @0800422A .align 2, 0 .pool -_080041EC: +@080041EC: ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 adds r1, r0 ldrb r0, [r1, 0x5] - b _0800422A + b @0800422A .align 2, 0 .pool -_08004200: +@08004200: ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 adds r1, r0 ldrh r0, [r1, 0x6] - b _0800422A + b @0800422A .align 2, 0 .pool -_08004214: +@08004214: ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 @@ -2168,37 +2168,37 @@ _08004214: adds r0, 0x8 adds r1, r0 ldr r0, [r1] - b _0800422A + b @0800422A .align 2, 0 .pool -_08004228: +@08004228: movs r0, 0 -_0800422A: +@0800422A: pop {r1} bx r1 thumb_func_end Window_GetField thumb_func_start GetNumActiveWindowsOnBg -@ int GetNumActiveWindowsOnBg(int bg_id) -GetNumActiveWindowsOnBg: @ 8004230 +; int GetNumActiveWindowsOnBg(int bg_id) +GetNumActiveWindowsOnBg: ; 8004230 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 movs r3, 0 ldr r2, =0x02020004 movs r1, 0x1F -_0800423C: +@0800423C: ldrb r0, [r2] cmp r0, r4 - bne _08004248 + bne @08004248 adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 -_08004248: +@08004248: adds r2, 0xC subs r1, 0x1 cmp r1, 0 - bge _0800423C + bge @0800423C adds r0, r3, 0 pop {r4} pop {r1} @@ -2208,13 +2208,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 Window_AddFromTemplate8Bpp -@ int Window_AddFromTemplate8Bpp(struct rbox_template *template) -Window_AddFromTemplate8Bpp: @ 8004260 +; int Window_AddFromTemplate8Bpp(struct rbox_template *template) +Window_AddFromTemplate8Bpp: ; 8004260 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2225,23 +2225,23 @@ Window_AddFromTemplate8Bpp: @ 8004260 ldr r1, =0x02020004 ldrb r0, [r1] cmp r0, 0xFF - beq _0800428E -_08004276: + beq @0800428E +@08004276: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x1F - bhi _0800428E + bhi @0800428E lsls r0, r6, 1 adds r0, r6 lsls r0, 2 adds r0, r1 ldrb r0, [r0] cmp r0, 0xFF - bne _08004276 -_0800428E: + bne @08004276 +@0800428E: cmp r6, 0x20 - beq _08004322 + beq @08004322 mov r0, r9 ldrb r7, [r0] ldr r1, =0x03002f70 @@ -2252,7 +2252,7 @@ _0800428E: add r0, r10 ldr r0, [r0] cmp r0, 0 - bne _080042EA + bne @080042EA adds r0, r7, 0 movs r1, 0x8 bl bg_get_field @@ -2260,32 +2260,32 @@ _0800428E: lsrs r5, r0, 16 ldr r0, =0x0000ffff cmp r5, r0 - beq _080042EA + beq @080042EA adds r0, r5, 0 bl malloc adds r4, r0, 0 cmp r4, 0 - beq _08004322 + beq @08004322 movs r1, 0 mov r12, r10 mov r3, r8 cmp r1, r5 - bge _080042DC + bge @080042DC movs r2, 0 -_080042D2: +@080042D2: adds r0, r4, r1 strb r2, [r0] adds r1, 0x1 cmp r1, r5 - blt _080042D2 -_080042DC: + blt @080042D2 +@080042DC: mov r1, r12 adds r0, r3, r1 str r4, [r0] adds r0, r7, 0 adds r1, r4, 0 bl bg_set_tilemap -_080042EA: +@080042EA: mov r2, r9 ldrb r1, [r2, 0x3] ldrb r0, [r2, 0x4] @@ -2295,28 +2295,28 @@ _080042EA: bl malloc adds r4, r0, 0 cmp r4, 0 - bne _08004338 + bne @08004338 adds r0, r7, 0 bl GetNumActiveWindowsOnBgDuplicate lsls r0, 24 cmp r0, 0 - bne _08004322 + bne @08004322 ldr r0, =0x03002f70 lsls r1, r7, 2 adds r5, r1, r0 ldr r1, [r5] ldr r0, =nullsub_9 + 1 cmp r1, r0 - beq _08004322 + beq @08004322 adds r0, r1, 0 bl free str r4, [r5] -_08004322: +@08004322: movs r0, 0xFF - b _08004356 + b @08004356 .align 2, 0 .pool -_08004338: +@08004338: ldr r1, =0x02020004 lsls r2, r6, 1 adds r2, r6 @@ -2332,7 +2332,7 @@ _08004338: str r0, [r2] str r1, [r2, 0x4] adds r0, r6, 0 -_08004356: +@08004356: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -2345,8 +2345,8 @@ _08004356: thumb_func_end Window_AddFromTemplate8Bpp thumb_func_start Window_FillPixels8Bpp -@ void Window_FillPixels8Bpp(u8 rbox_id, char value) -Window_FillPixels8Bpp: @ 8004368 +; void Window_FillPixels8Bpp(u8 rbox_id, char value) +Window_FillPixels8Bpp: ; 8004368 push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 @@ -2364,18 +2364,18 @@ Window_FillPixels8Bpp: @ 8004368 lsrs r3, r0, 16 movs r2, 0 cmp r2, r3 - bge _0800439E + bge @0800439E adds r0, r6, 0 adds r0, 0x8 adds r1, r4, r0 -_08004392: +@08004392: ldr r0, [r1] adds r0, r2 strb r5, [r0] adds r2, 0x1 cmp r2, r3 - blt _08004392 -_0800439E: + blt @08004392 +@0800439E: pop {r4-r6} pop {r0} bx r0 @@ -2384,8 +2384,8 @@ _0800439E: thumb_func_end Window_FillPixels8Bpp thumb_func_start Window_FillPixelRect8Bpp -@ void Window_FillPixelRect8Bpp(u8 a1, char fill_value, u16 x, u16 y, u16 w, u16 h) -Window_FillPixelRect8Bpp: @ 80043A8 +; void Window_FillPixelRect8Bpp(u8 a1, char fill_value, u16 x, u16 y, u16 w, u16 h) +Window_FillPixelRect8Bpp: ; 80043A8 push {r4-r6,lr} mov r6, r9 mov r5, r8 @@ -2453,8 +2453,8 @@ Window_FillPixelRect8Bpp: @ 80043A8 thumb_func_end Window_FillPixelRect8Bpp thumb_func_start Window_CopyPixelRectToWindow4BppTo8Bpp -@ void Window_CopyPixelRectToWindow4BppTo8Bpp(u8 rbox_id, void *pixels, u16 src_x, u16 src_y, u16 src_w, int src_h, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h, u8 a11) -Window_CopyPixelRectToWindow4BppTo8Bpp: @ 8004434 +; void Window_CopyPixelRectToWindow4BppTo8Bpp(u8 rbox_id, void *pixels, u16 src_x, u16 src_y, u16 src_w, int src_h, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h, u8 a11) +Window_CopyPixelRectToWindow4BppTo8Bpp: ; 8004434 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2554,7 +2554,7 @@ Window_CopyPixelRectToWindow4BppTo8Bpp: @ 8004434 thumb_func_end Window_CopyPixelRectToWindow4BppTo8Bpp thumb_func_start Window_CopyToVram8Bpp -Window_CopyToVram8Bpp: @ 8004500 +Window_CopyToVram8Bpp: ; 8004500 push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 @@ -2575,30 +2575,30 @@ Window_CopyToVram8Bpp: @ 8004500 lsls r0, 6 strh r0, [r4] cmp r2, 0x2 - beq _0800454E + beq @0800454E cmp r2, 0x2 - bgt _08004540 + bgt @08004540 cmp r2, 0x1 - beq _08004546 - b _08004570 + beq @08004546 + b @08004570 .align 2, 0 .pool -_08004540: +@08004540: cmp r5, 0x3 - beq _0800455C - b _08004570 -_08004546: + beq @0800455C + b @08004570 +@08004546: ldrb r0, [r3] bl gpu_copy_wram_bg_tilemap_to_vram - b _08004570 -_0800454E: + b @08004570 +@0800454E: ldrb r0, [r3] ldr r1, [r3, 0x8] ldrh r2, [r4] ldrh r3, [r3, 0x6] bl gpu_copy_bg_tile_pattern_data_to_vram - b _08004570 -_0800455C: + b @08004570 +@0800455C: ldrb r0, [r3] ldr r1, [r3, 0x8] ldrh r2, [r4] @@ -2607,33 +2607,33 @@ _0800455C: ldr r0, [r6] ldrb r0, [r0] bl gpu_copy_wram_bg_tilemap_to_vram -_08004570: +@08004570: pop {r4-r6} pop {r0} bx r0 thumb_func_end Window_CopyToVram8Bpp thumb_func_start GetNumActiveWindowsOnBgDuplicate -@ int GetNumActiveWindowsOnBgDuplicate(int bg_id) -GetNumActiveWindowsOnBgDuplicate: @ 8004578 +; int GetNumActiveWindowsOnBgDuplicate(int bg_id) +GetNumActiveWindowsOnBgDuplicate: ; 8004578 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 movs r3, 0 ldr r2, =0x02020004 movs r1, 0x1F -_08004584: +@08004584: ldrb r0, [r2] cmp r0, r4 - bne _08004590 + bne @08004590 adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 -_08004590: +@08004590: adds r2, 0xC subs r1, 0x1 cmp r1, 0 - bge _08004584 + bge @08004584 adds r0, r3, 0 pop {r4} pop {r1} diff --git a/data/data1.s b/data/data1.s index 315445340..6f9bd5d5b 100644 --- a/data/data1.s +++ b/data/data1.s @@ -1,2 +1,2 @@ -@ the first big chunk of data +; the first big chunk of data .incbin "base_emerald.gba", 0x1db67c, 0x2ded70 - 0x1db67c diff --git a/data/data2.s b/data/data2.s index ceea67fb0..8e7d74fcb 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1,21 +1,21 @@ -@ the second big chunk of data +; the second big chunk of data .align 2, 0 -gUnknown_82E9530: @ 82E9530 +gUnknown_82E9530: ; 82E9530 .byte 3 -gUnknown_82E9531: @ 82E9531 +gUnknown_82E9531: ; 82E9531 .byte 2 .align 2, 0 -@ compile time +; compile time .asciz "2005 02 21 11:10" .align 2, 0 -gRomInterruptTable: @ 82E9548 +gRomInterruptTable: ; 82E9548 .4byte irq_vcount+1 .4byte irq_serial+1 .4byte irq_timer3+1 @@ -31,13 +31,13 @@ gRomInterruptTable: @ 82E9548 .4byte irq_other+1 .4byte irq_other+1 -gBgConfigZeroValue: @ 82E9580 +gBgConfigZeroValue: ; 82E9580 .4byte 0 -gDummyWindowTemplate: @ 82E9584 +gDummyWindowTemplate: ; 82E9584 window_template -1, 0, 0, 0, 0, 0, 0 -gFontHalfRowOffsets: @ 82E958C +gFontHalfRowOffsets: ; 82E958C .byte 0x00,0x01,0x02,0x00,0x03,0x04,0x05,0x03,0x06,0x07,0x08,0x06,0x00,0x01,0x02,0x00 .byte 0x09,0x0a,0x0b,0x09,0x0c,0x0d,0x0e,0x0c,0x0f,0x10,0x11,0x0f,0x09,0x0a,0x0b,0x09 .byte 0x12,0x13,0x14,0x12,0x15,0x16,0x17,0x15,0x18,0x19,0x1a,0x18,0x12,0x13,0x14,0x12 @@ -55,22 +55,22 @@ gFontHalfRowOffsets: @ 82E958C .byte 0x12,0x13,0x14,0x12,0x15,0x16,0x17,0x15,0x18,0x19,0x1a,0x18,0x12,0x13,0x14,0x12 .byte 0x00,0x01,0x02,0x00,0x03,0x04,0x05,0x03,0x06,0x07,0x08,0x06,0x00,0x01,0x02,0x00 -gDownArrowTiles: @ 82E968C +gDownArrowTiles: ; 82E968C .incbin "base_emerald.gba", 0x2e968c, 0xc0 -gDarkDownArrowTiles: @ 82E974C +gDarkDownArrowTiles: ; 82E974C .incbin "base_emerald.gba", 0x2e974c, 0xc0 -@ Seemingly unreferenced data. It contains some kind of arrow graphics. +; Seemingly unreferenced data. It contains some kind of arrow graphics. .incbin "base_emerald.gba", 0x2e980c, 0x500 -gDownArrowYCoords: @ 82E9D0C +gDownArrowYCoords: ; 82E9D0C .byte 0, 1, 2, 1 -gWindowVerticalScrollSpeeds: @ 82E9D10 +gWindowVerticalScrollSpeeds: ; 82E9D10 .byte 1, 2, 4, 0 -gGlyphWidthFuncs: @ 82E9D14 +gGlyphWidthFuncs: ; 82E9D14 glyph_width_func 0, GetGlyphWidthFont0+1 glyph_width_func 1, GetGlyphWidthFont1+1 glyph_width_func 2, GetGlyphWidthFont2+1 @@ -81,7 +81,7 @@ gGlyphWidthFuncs: @ 82E9D14 glyph_width_func 7, GetGlyphWidthFont7+1 glyph_width_func 8, GetGlyphWidthFont8+1 -gKeypadIcons: @ 82E9D5C +gKeypadIcons: ; 82E9D5C keypad_icon 0x0, 8, 12 keypad_icon 0x1, 8, 12 keypad_icon 0x2, 16, 12 @@ -96,10 +96,10 @@ gKeypadIcons: @ 82E9D5C keypad_icon 0x21, 8, 12 keypad_icon 0x22, 8, 12 -gKeypadIconTiles: @ 82E9D90 +gKeypadIconTiles: ; 82E9D90 .incbin "base_emerald.gba", 0x2e9d90, 0x800 -gFontInfos: @ 82EA590 +gFontInfos: ; 82EA590 font_info Font0Func+1, 5, 12, 0, 0, 2, 3, 1 font_info Font1Func+1, 6, 16, 0, 0, 2, 3, 1 font_info Font2Func+1, 6, 14, 0, 0, 2, 3, 1 @@ -111,7 +111,7 @@ gFontInfos: @ 82EA590 font_info Font8Func+1, 5, 8, 0, 0, 2, 3, 1 font_info 0, 8, 8, 0, 0, 1, 15, 2 -gMenuCursorDimensions: @ 82EA608 +gMenuCursorDimensions: ; 82EA608 .byte 8, 12 .byte 8, 15 .byte 8, 14 @@ -123,23 +123,23 @@ gMenuCursorDimensions: @ 82EA608 .byte 8, 8 .byte 0, 0 -gFont9JapaneseGlyphs: @ 82EA61C +gFont9JapaneseGlyphs: ; 82EA61C .incbin "base_emerald.gba", 0x2ea61c, 0x2000 -@ Unreferenced data. This also comes before the gpu_bg.s data in Ruby and seems -@ to be unreferenced there too. +; Unreferenced data. This also comes before the gpu_bg.s data in Ruby and seems +; to be unreferenced there too. .incbin "base_emerald.gba", 0x2ec61c, 0x18 -@ TODO: gpu_obj.s data +; TODO: gpu_obj.s data include_range 0x2ec634, 0x2ec7c4 -gUnknown_82EC7C4: @ 82EC7C4 +gUnknown_82EC7C4: ; 82EC7C4 .2byte 0x0100 .2byte 0x0200 .2byte 0x0400 .2byte 0x0800 -gUnknown_82EC7CC: @ 82EC7CC +gUnknown_82EC7CC: ; 82EC7CC .2byte 0x0001 .2byte 0x0002 .2byte 0x0004 @@ -153,63 +153,63 @@ gUnknown_82EC7CC: @ 82EC7CC include_range 0x31e2f0, 0x616128 -gFont6BrailleGlyphs: @ 8616128 +gFont6BrailleGlyphs: ; 8616128 .incbin "base_emerald.gba", 0x616128, 0x1000 include_range 0x617128, 0x62bae4 -gFont8LatinGlyphs: @ 862BAE4 +gFont8LatinGlyphs: ; 862BAE4 .incbin "base_emerald.gba", 0x62bae4, 0x8000 -gFont8LatinGlyphWidths: @ 8633AE4 +gFont8LatinGlyphWidths: ; 8633AE4 .incbin "base_emerald.gba", 0x633ae4, 0x200 -gFont0LatinGlyphs: @ 8633CE4 +gFont0LatinGlyphs: ; 8633CE4 .incbin "base_emerald.gba", 0x633ce4, 0x8000 -gFont0LatinGlyphWidths: @ 863BCE4 +gFont0LatinGlyphWidths: ; 863BCE4 .incbin "base_emerald.gba", 0x63bce4, 0x200 -gFont7LatinGlyphs: @ 863BEE4 +gFont7LatinGlyphs: ; 863BEE4 .incbin "base_emerald.gba", 0x63bee4, 0x8000 -gFont7LatinGlyphWidths: @ 8643EE4 +gFont7LatinGlyphWidths: ; 8643EE4 .incbin "base_emerald.gba", 0x643ee4, 0x200 -gFont2LatinGlyphs: @ 86440E4 +gFont2LatinGlyphs: ; 86440E4 .incbin "base_emerald.gba", 0x6440e4, 0x8000 -gFont2LatinGlyphWidths: @ 864C0E4 +gFont2LatinGlyphWidths: ; 864C0E4 .incbin "base_emerald.gba", 0x64c0e4, 0x200 -gFont1LatinGlyphs: @ 864C2E4 +gFont1LatinGlyphs: ; 864C2E4 .incbin "base_emerald.gba", 0x64c2e4, 0x8000 -gFont1LatinGlyphWidths: @ 86542E4 +gFont1LatinGlyphWidths: ; 86542E4 .incbin "base_emerald.gba", 0x6542e4, 0x200 -gFont0JapaneseGlyphs: @ 86544E4 +gFont0JapaneseGlyphs: ; 86544E4 .incbin "base_emerald.gba", 0x6544e4, 0x4000 -gFont1JapaneseGlyphs: @ 86584E4 +gFont1JapaneseGlyphs: ; 86584E4 .incbin "base_emerald.gba", 0x6584e4, 0x4000 -gUnusedFullwidthJapaneseFontGlyphs: @ 865C4E4 +gUnusedFullwidthJapaneseFontGlyphs: ; 865C4E4 .incbin "base_emerald.gba", 0x65c4e4, 0x8000 -gUnusedFullwidthJapaneseFontGlyphWidths: @ 86644E4 +gUnusedFullwidthJapaneseFontGlyphWidths: ; 86644E4 .incbin "base_emerald.gba", 0x6644e4, 0x200 -gUnusedFullwidthJapaneseFont2Glyphs: @ 86646E4 +gUnusedFullwidthJapaneseFont2Glyphs: ; 86646E4 .incbin "base_emerald.gba", 0x6646e4, 0x8000 -gUnusedFullwidthJapaneseFont2GlyphWidths: @ 866C6E4 +gUnusedFullwidthJapaneseFont2GlyphWidths: ; 866C6E4 .incbin "base_emerald.gba", 0x66c6e4, 0x200 -gFont2JapaneseGlyphs: @ 866C8E4 +gFont2JapaneseGlyphs: ; 866C8E4 .incbin "base_emerald.gba", 0x66c8e4, 0x8000 -gFont2JapaneseGlyphWidths: @ 86748E4 +gFont2JapaneseGlyphWidths: ; 86748E4 .incbin "base_emerald.gba", 0x6748e4, 0x200 .incbin "base_emerald.gba", 0x674ae4 diff --git a/data/pokedex_order.s b/data/pokedex_order.s index 9696661b5..8d37b959c 100644 --- a/data/pokedex_order.s +++ b/data/pokedex_order.s @@ -1,4 +1,4 @@ -gSpeciesToHoennPokedexNum: @ 831D94C +gSpeciesToHoennPokedexNum: ; 831D94C .2byte 203 .2byte 204 .2byte 205 @@ -411,7 +411,7 @@ gSpeciesToHoennPokedexNum: @ 831D94C .2byte 202 .2byte 151 -gSpeciesToNationalPokedexNum: @ 831DC82 +gSpeciesToNationalPokedexNum: ; 831DC82 .2byte 1 .2byte 2 .2byte 3 @@ -824,7 +824,7 @@ gSpeciesToNationalPokedexNum: @ 831DC82 .2byte 386 .2byte 358 -gHoennToNationalOrder: @ 831DFB8 +gHoennToNationalOrder: ; 831DFB8 .2byte 252 .2byte 253 .2byte 254